diff --git a/.changes/next-release/Bug Fix-19fd655d-6194-4ec1-954a-1a0124a8de36.json b/.changes/next-release/Bug Fix-19fd655d-6194-4ec1-954a-1a0124a8de36.json
deleted file mode 100644
index 2b6cb1f746c..00000000000
--- a/.changes/next-release/Bug Fix-19fd655d-6194-4ec1-954a-1a0124a8de36.json	
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"type": "Bug Fix",
-	"description": "Bump amazon-states-language-service dependency to ^1.8.0 to allow state machines to be created with the new intrinsic functions and Map state"
-}
\ No newline at end of file
diff --git a/.changes/next-release/Bug Fix-77137e24-593d-4859-a15f-e029edf843a7.json b/.changes/next-release/Bug Fix-77137e24-593d-4859-a15f-e029edf843a7.json
new file mode 100644
index 00000000000..2af1555a690
--- /dev/null
+++ b/.changes/next-release/Bug Fix-77137e24-593d-4859-a15f-e029edf843a7.json	
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Resource Explorer: S3 tree view now shows bucket contents correctly, even when restricted to root prefix."
+}
diff --git a/.changes/next-release/Feature-3082756c-79f7-4341-88be-d2f583a93686.json b/.changes/next-release/Feature-3082756c-79f7-4341-88be-d2f583a93686.json
deleted file mode 100644
index 65c3c3a9512..00000000000
--- a/.changes/next-release/Feature-3082756c-79f7-4341-88be-d2f583a93686.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"type": "Feature",
-	"description": "CloudWatch Logs: one click to list log streams for a log group"
-}
\ No newline at end of file
diff --git a/.dependency-cruiser.js b/.dependency-cruiser.js
new file mode 100644
index 00000000000..1976385c872
--- /dev/null
+++ b/.dependency-cruiser.js
@@ -0,0 +1,466 @@
+/**
+ * This file was generated using the `dependency-cruiser` npm package.
+ *
+ * The initial purpose for this file is to find transitive dependencies for Browser
+ * incompatible modules (eg `fs-extra`). See `browser.md` explaining how this is used.
+ */
+
+/** @type {import('dependency-cruiser').IConfiguration} */
+module.exports = {
+    forbidden: [
+        {
+            name: 'no-circular',
+            severity: 'warn',
+            comment:
+                'This dependency is part of a circular relationship. You might want to revise ' +
+                'your solution (i.e. use dependency inversion, make sure the modules have a single responsibility) ',
+            from: {},
+            to: {
+                circular: true,
+            },
+        },
+        {
+            name: 'no-orphans',
+            comment:
+                "This is an orphan module - it's likely not used (anymore?). Either use it or " +
+                "remove it. If it's logical this module is an orphan (i.e. it's a config file), " +
+                'add an exception for it in your dependency-cruiser configuration. By default ' +
+                'this rule does not scrutinize dot-files (e.g. .eslintrc.js), TypeScript declaration ' +
+                'files (.d.ts), tsconfig.json and some of the babel and webpack configs.',
+            severity: 'warn',
+            from: {
+                orphan: true,
+                pathNot: [
+                    '(^|/)[.][^/]+[.](js|cjs|mjs|ts|json)$', // dot files
+                    '[.]d[.]ts$', // TypeScript declaration files
+                    '(^|/)tsconfig[.]json$', // TypeScript config
+                    '(^|/)(babel|webpack)[.]config[.](js|cjs|mjs|ts|json)$', // other configs
+                ],
+            },
+            to: {},
+        },
+        {
+            name: 'no-deprecated-core',
+            comment:
+                'A module depends on a node core module that has been deprecated. Find an alternative - these are ' +
+                "bound to exist - node doesn't deprecate lightly.",
+            severity: 'warn',
+            from: {},
+            to: {
+                dependencyTypes: ['core'],
+                path: [
+                    '^(v8/tools/codemap)$',
+                    '^(v8/tools/consarray)$',
+                    '^(v8/tools/csvparser)$',
+                    '^(v8/tools/logreader)$',
+                    '^(v8/tools/profile_view)$',
+                    '^(v8/tools/profile)$',
+                    '^(v8/tools/SourceMap)$',
+                    '^(v8/tools/splaytree)$',
+                    '^(v8/tools/tickprocessor-driver)$',
+                    '^(v8/tools/tickprocessor)$',
+                    '^(node-inspect/lib/_inspect)$',
+                    '^(node-inspect/lib/internal/inspect_client)$',
+                    '^(node-inspect/lib/internal/inspect_repl)$',
+                    '^(async_hooks)$',
+                    '^(punycode)$',
+                    '^(domain)$',
+                    '^(constants)$',
+                    '^(sys)$',
+                    '^(_linklist)$',
+                    '^(_stream_wrap)$',
+                ],
+            },
+        },
+        {
+            name: 'not-to-deprecated',
+            comment:
+                'This module uses a (version of an) npm module that has been deprecated. Either upgrade to a later ' +
+                'version of that module, or find an alternative. Deprecated modules are a security risk.',
+            severity: 'warn',
+            from: {},
+            to: {
+                dependencyTypes: ['deprecated'],
+            },
+        },
+        {
+            name: 'no-non-package-json',
+            severity: 'error',
+            comment:
+                "This module depends on an npm package that isn't in the 'dependencies' section of your package.json. " +
+                "That's problematic as the package either (1) won't be available on live (2 - worse) will be " +
+                'available on live with an non-guaranteed version. Fix it by adding the package to the dependencies ' +
+                'in your package.json.',
+            from: {},
+            to: {
+                dependencyTypes: ['npm-no-pkg', 'npm-unknown'],
+            },
+        },
+        {
+            name: 'not-to-unresolvable',
+            comment:
+                "This module depends on a module that cannot be found ('resolved to disk'). If it's an npm " +
+                'module: add it to your package.json. In all other cases you likely already know what to do.',
+            severity: 'error',
+            from: {},
+            to: {
+                couldNotResolve: true,
+            },
+        },
+        {
+            name: 'no-duplicate-dep-types',
+            comment:
+                "Likely this module depends on an external ('npm') package that occurs more than once " +
+                'in your package.json i.e. bot as a devDependencies and in dependencies. This will cause ' +
+                'maintenance problems later on.',
+            severity: 'warn',
+            from: {},
+            to: {
+                moreThanOneDependencyType: true,
+                // as it's pretty common to have a type import be a type only import
+                // _and_ (e.g.) a devDependency - don't consider type-only dependency
+                // types for this rule
+                dependencyTypesNot: ['type-only'],
+            },
+        },
+
+        /* rules you might want to tweak for your specific situation: */
+
+        {
+            name: 'not-to-spec',
+            comment:
+                'This module depends on a spec (test) file. The sole responsibility of a spec file is to test code. ' +
+                "If there's something in a spec that's of use to other modules, it doesn't have that single " +
+                'responsibility anymore. Factor it out into (e.g.) a separate utility/ helper or a mock.',
+            severity: 'error',
+            from: {},
+            to: {
+                path: '[.](spec|test)[.](js|mjs|cjs|ts|ls|coffee|litcoffee|coffee[.]md)$',
+            },
+        },
+        {
+            name: 'not-to-dev-dep',
+            severity: 'error',
+            comment:
+                "This module depends on an npm package from the 'devDependencies' section of your " +
+                'package.json. It looks like something that ships to production, though. To prevent problems ' +
+                "with npm packages that aren't there on production declare it (only!) in the 'dependencies'" +
+                'section of your package.json. If this module is development only - add it to the ' +
+                'from.pathNot re of the not-to-dev-dep rule in the dependency-cruiser configuration',
+            from: {
+                path: '^(src)',
+                pathNot: '[.](spec|test)[.](js|mjs|cjs|ts|ls|coffee|litcoffee|coffee[.]md)$',
+            },
+            to: {
+                dependencyTypes: ['npm-dev'],
+                // type only dependencies are not a problem as they don't end up in the
+                // production code or are ignored by the runtime.
+                dependencyTypesNot: ['type-only'],
+                pathNot: ['node_modules/@types/'],
+            },
+        },
+        {
+            name: 'optional-deps-used',
+            severity: 'info',
+            comment:
+                'This module depends on an npm package that is declared as an optional dependency ' +
+                "in your package.json. As this makes sense in limited situations only, it's flagged here. " +
+                "If you're using an optional dependency here by design - add an exception to your" +
+                'dependency-cruiser configuration.',
+            from: {},
+            to: {
+                dependencyTypes: ['npm-optional'],
+            },
+        },
+        {
+            name: 'peer-deps-used',
+            comment:
+                'This module depends on an npm package that is declared as a peer dependency ' +
+                'in your package.json. This makes sense if your package is e.g. a plugin, but in ' +
+                'other cases - maybe not so much. If the use of a peer dependency is intentional ' +
+                'add an exception to your dependency-cruiser configuration.',
+            severity: 'warn',
+            from: {},
+            to: {
+                dependencyTypes: ['npm-peer'],
+            },
+        },
+    ],
+    options: {
+        /* conditions specifying which files not to follow further when encountered:
+       - path: a regular expression to match
+       - dependencyTypes: see https://github.com/sverweij/dependency-cruiser/blob/main/doc/rules-reference.md#dependencytypes-and-dependencytypesnot
+       for a complete list
+    */
+        doNotFollow: {
+            path: 'node_modules',
+        },
+
+        /* conditions specifying which dependencies to exclude
+       - path: a regular expression to match
+       - dynamic: a boolean indicating whether to ignore dynamic (true) or static (false) dependencies.
+          leave out if you want to exclude neither (recommended!)
+    */
+        // exclude : {
+        //   path: '',
+        //   dynamic: true
+        // },
+
+        /* pattern specifying which files to include (regular expression)
+       dependency-cruiser will skip everything not matching this pattern
+    */
+        // includeOnly : '',
+
+        /* dependency-cruiser will include modules matching against the focus
+       regular expression in its output, as well as their neighbours (direct
+       dependencies and dependents)
+    */
+        // focus : '',
+
+        /* List of module systems to cruise. 
+       When left out dependency-cruiser will fall back to the list of _all_ 
+       module systems it knows of. It's the default because it's the safe option
+       It might come at a performance penalty, though.
+       moduleSystems: ['amd', 'cjs', 'es6', 'tsd']
+      
+       As in practice only commonjs ('cjs') and ecmascript modules ('es6')
+       are widely used, you can limit the moduleSystems to those.
+     */
+
+        // moduleSystems: ['cjs', 'es6'],
+
+        /* prefix for links in html and svg output (e.g. 'https://github.com/you/yourrepo/blob/develop/'
+       to open it on your online repo or `vscode://file/${process.cwd()}/` to 
+       open it in visual studio code),
+     */
+        // prefix: '',
+
+        /* false (the default): ignore dependencies that only exist before typescript-to-javascript compilation
+       true: also detect dependencies that only exist before typescript-to-javascript compilation
+       "specify": for each dependency identify whether it only exists before compilation or also after
+     */
+        // tsPreCompilationDeps: false,
+
+        /* 
+       list of extensions to scan that aren't javascript or compile-to-javascript. 
+       Empty by default. Only put extensions in here that you want to take into
+       account that are _not_ parsable. 
+    */
+        // extraExtensionsToScan: [".json", ".jpg", ".png", ".svg", ".webp"],
+
+        /* if true combines the package.jsons found from the module up to the base
+       folder the cruise is initiated from. Useful for how (some) mono-repos
+       manage dependencies & dependency definitions.
+     */
+        // combinedDependencies: false,
+
+        /* if true leave symlinks untouched, otherwise use the realpath */
+        // preserveSymlinks: false,
+
+        /* TypeScript project file ('tsconfig.json') to use for
+       (1) compilation and
+       (2) resolution (e.g. with the paths property)
+
+       The (optional) fileName attribute specifies which file to take (relative to
+       dependency-cruiser's current working directory). When not provided
+       defaults to './tsconfig.json'.
+     */
+        tsConfig: {
+            fileName: 'tsconfig.json',
+        },
+
+        /* Webpack configuration to use to get resolve options from.
+
+       The (optional) fileName attribute specifies which file to take (relative
+       to dependency-cruiser's current working directory. When not provided defaults
+       to './webpack.conf.js'.
+
+       The (optional) `env` and `arguments` attributes contain the parameters to be passed if
+       your webpack config is a function and takes them (see webpack documentation
+       for details)
+     */
+        // webpackConfig: {
+        //  fileName: 'webpack.config.js',
+        //  env: {},
+        //  arguments: {}
+        // },
+
+        /* Babel config ('.babelrc', '.babelrc.json', '.babelrc.json5', ...) to use
+      for compilation (and whatever other naughty things babel plugins do to
+      source code). This feature is well tested and usable, but might change
+      behavior a bit over time (e.g. more precise results for used module 
+      systems) without dependency-cruiser getting a major version bump.
+     */
+        // babelConfig: {
+        //   fileName: '.babelrc',
+        // },
+
+        /* List of strings you have in use in addition to cjs/ es6 requires
+       & imports to declare module dependencies. Use this e.g. if you've
+       re-declared require, use a require-wrapper or use window.require as
+       a hack.
+    */
+        // exoticRequireStrings: [],
+        /* options to pass on to enhanced-resolve, the package dependency-cruiser
+       uses to resolve module references to disk. You can set most of these
+       options in a webpack.conf.js - this section is here for those
+       projects that don't have a separate webpack config file.
+
+       Note: settings in webpack.conf.js override the ones specified here.
+     */
+        enhancedResolveOptions: {
+            /* List of strings to consider as 'exports' fields in package.json. Use
+         ['exports'] when you use packages that use such a field and your environment
+         supports it (e.g. node ^12.19 || >=14.7 or recent versions of webpack).
+
+         If you have an `exportsFields` attribute in your webpack config, that one
+         will have precedence over the one specified here.
+      */
+            exportsFields: ['exports'],
+            /* List of conditions to check for in the exports field. e.g. use ['imports']
+         if you're only interested in exposed es6 modules, ['require'] for commonjs,
+         or all conditions at once `(['import', 'require', 'node', 'default']`)
+         if anything goes for you. Only works when the 'exportsFields' array is
+         non-empty.
+
+        If you have a 'conditionNames' attribute in your webpack config, that one will
+        have precedence over the one specified here.
+      */
+            conditionNames: ['import', 'require', 'node', 'default'],
+            /*
+         The extensions, by default are the same as the ones dependency-cruiser
+         can access (run `npx depcruise --info` to see which ones that are in
+         _your_ environment. If that list is larger than what you need (e.g. 
+         it contains .js, .jsx, .ts, .tsx, .cts, .mts - but you don't use 
+         TypeScript you can pass just the extensions you actually use (e.g. 
+         [".js", ".jsx"]). This can speed up the most expensive step in 
+         dependency cruising (module resolution) quite a bit.
+       */
+            // extensions: [".js", ".jsx", ".ts", ".tsx", ".d.ts"],
+            /* 
+         If your TypeScript project makes use of types specified in 'types'
+         fields in package.jsons of external dependencies, specify "types"
+         in addition to "main" in here, so enhanced-resolve (the resolver
+         dependency-cruiser uses) knows to also look there. You can also do
+         this if you're not sure, but still use TypeScript. In a future version
+         of dependency-cruiser this will likely become the default.
+       */
+            mainFields: ['main', 'types', 'typings'],
+            /*
+         A list of alias fields in manifests (package.jsons).
+         Specify a field, such as browser, to be parsed according to
+         [this specification](https://github.com/defunctzombie/package-browser-field-spec).
+         Also see [resolve.alias](https://webpack.js.org/configuration/resolve/#resolvealiasfields)
+         in the webpack docs. 
+         
+         Defaults to an empty array (don't use any alias fields).
+       */
+            // aliasFields: ["browser"],
+        },
+        reporterOptions: {
+            dot: {
+                /* pattern of modules that can be consolidated in the detailed
+           graphical dependency graph. The default pattern in this configuration
+           collapses everything in node_modules to one folder deep so you see
+           the external modules, but not the innards your app depends upon.
+         */
+                collapsePattern: 'node_modules/(@[^/]+/[^/]+|[^/]+)',
+
+                /* Options to tweak the appearance of your graph.See
+           https://github.com/sverweij/dependency-cruiser/blob/main/doc/options-reference.md#reporteroptions
+           for details and some examples. If you don't specify a theme
+           don't worry - dependency-cruiser will fall back to the default one.
+        */
+                // theme: {
+                //   graph: {
+                //     /* use splines: "ortho" for straight lines. Be aware though
+                //       graphviz might take a long time calculating ortho(gonal)
+                //       routings.
+                //    */
+                //     splines: "true"
+                //   },
+                //   modules: [
+                //     {
+                //       criteria: { matchesFocus: true },
+                //       attributes: {
+                //         fillcolor: "lime",
+                //         penwidth: 2,
+                //       },
+                //     },
+                //     {
+                //       criteria: { matchesFocus: false },
+                //       attributes: {
+                //         fillcolor: "lightgrey",
+                //       },
+                //     },
+                //     {
+                //       criteria: { matchesReaches: true },
+                //       attributes: {
+                //         fillcolor: "lime",
+                //         penwidth: 2,
+                //       },
+                //     },
+                //     {
+                //       criteria: { matchesReaches: false },
+                //       attributes: {
+                //         fillcolor: "lightgrey",
+                //       },
+                //     },
+                //     {
+                //       criteria: { source: "^src/model" },
+                //       attributes: { fillcolor: "#ccccff" }
+                //     },
+                //     {
+                //       criteria: { source: "^src/view" },
+                //       attributes: { fillcolor: "#ccffcc" }
+                //     },
+                //   ],
+                //   dependencies: [
+                //     {
+                //       criteria: { "rules[0].severity": "error" },
+                //       attributes: { fontcolor: "red", color: "red" }
+                //     },
+                //     {
+                //       criteria: { "rules[0].severity": "warn" },
+                //       attributes: { fontcolor: "orange", color: "orange" }
+                //     },
+                //     {
+                //       criteria: { "rules[0].severity": "info" },
+                //       attributes: { fontcolor: "blue", color: "blue" }
+                //     },
+                //     {
+                //       criteria: { resolved: "^src/model" },
+                //       attributes: { color: "#0000ff77" }
+                //     },
+                //     {
+                //       criteria: { resolved: "^src/view" },
+                //       attributes: { color: "#00770077" }
+                //     }
+                //   ]
+                // }
+            },
+            archi: {
+                /* pattern of modules that can be consolidated in the high level
+          graphical dependency graph. If you use the high level graphical
+          dependency graph reporter (`archi`) you probably want to tweak
+          this collapsePattern to your situation.
+        */
+                collapsePattern:
+                    '^(packages|src|lib|app|bin|test(s?)|spec(s?))/[^/]+|node_modules/(@[^/]+/[^/]+|[^/]+)',
+
+                /* Options to tweak the appearance of your graph.See
+           https://github.com/sverweij/dependency-cruiser/blob/main/doc/options-reference.md#reporteroptions
+           for details and some examples. If you don't specify a theme
+           for 'archi' dependency-cruiser will use the one specified in the
+           dot section (see above), if any, and otherwise use the default one.
+         */
+                // theme: {
+                // },
+            },
+            text: {
+                highlightFocused: true,
+            },
+        },
+    },
+}
+// generated: dependency-cruiser@16.0.0 on 2024-01-05T15:20:51.138Z
diff --git a/.editorconfig b/.editorconfig
index 5533ce9b3a5..c6cf2790c3e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,13 +8,10 @@ end_of_line = lf
 insert_final_newline = true
 indent_size = 4
 indent_style = space
+max_line_length = 100
 
-[*.{js,py}]
+[*.{js,ts,py}]
 charset = utf-8
 
-# 4 space indentation
-[*.py]
-indent_style = space
-
 [Makefile]
 indent_style = tab
diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index 133b72c995e..00000000000
--- a/.eslintignore
+++ /dev/null
@@ -1,9 +0,0 @@
-node_modules/**
-**/*.json
-src/shared/telemetry/clienttelemetry.d.ts
-src/codewhisperer/client/codewhispererclient.d.ts
-src/codewhisperer/client/codewhispereruserclient.d.ts
-**/*.gen.ts
-src/testFixtures/workspaceFolder/ts-plain-sam-app/
-dist/**
-types/*.d.ts
diff --git a/.eslintrc.js b/.eslintrc.js
index 370942c8aed..026366245b9 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -2,20 +2,25 @@ module.exports = {
     root: true,
     parser: '@typescript-eslint/parser',
     parserOptions: {
-        project: './tsconfig.json',
+        ecmaVersion: 'latest',
+        sourceType: 'module',
+        project: ['./packages/*/tsconfig.json', './plugins/*/tsconfig.json'],
         tsconfigRootDir: __dirname,
     },
     env: {
         node: true,
         mocha: true,
+        es2024: true,
     },
-    plugins: ['@typescript-eslint', 'header', 'no-null'],
+    plugins: ['@typescript-eslint', '@stylistic', 'unicorn', 'header', 'security-node', 'aws-toolkits'],
     extends: [
         'eslint:recommended',
         'plugin:@typescript-eslint/eslint-recommended',
         'plugin:@typescript-eslint/recommended-requiring-type-checking',
         'plugin:@typescript-eslint/recommended',
-        'prettier',
+        // "Add this as the _last_ item in the extends array, so that eslint-config-prettier has the
+        // opportunity to override other configs." https://github.com/prettier/eslint-plugin-prettier
+        'plugin:prettier/recommended',
     ],
     rules: {
         curly: 2, // Enforce braces on "if"/"for"/etc.
@@ -50,6 +55,8 @@ module.exports = {
                 // modifiers: ['requiresQuotes'],
             },
         ],
+        // Avoid accidental use of "==" instead of "===".
+        eqeqeq: 'error',
         // TODO reenable this rule (by removing this off)
         'no-async-promise-executor': 'off',
         // TODO reenable this rule (by removing this off)
@@ -85,37 +92,130 @@ module.exports = {
         // TODO reenable this rule, tests mostly break this one (by changing off to error)
         // This currently produces 700 non fixable by --fix errors
         'sort-imports': 'off',
-        // TODO rennable this rule (by removing this off)
-        // namespaces are not great and we should stop using them
-        '@typescript-eslint/no-namespace': 'off',
-        // Turn this on by removing off when we fix namespaces
-        'no-inner-declarations': 'off',
+        '@typescript-eslint/no-namespace': 'error',
         // This is off because prettier takes care of it
         'no-extra-semi': 'off',
-        'no-null/no-null': 'error',
         '@typescript-eslint/no-empty-function': 'off',
+        // Disallows returning e.g. Promise<…|never> which signals that an exception may be thrown.
+        // https://stackoverflow.com/q/64230626/152142
+        '@typescript-eslint/no-redundant-type-constituents': 'off',
         '@typescript-eslint/no-unused-vars': 'off',
-        // New rules --> New TODOs
+        '@typescript-eslint/no-floating-promises': 'error', // Promises must catch errors or be awaited.
         '@typescript-eslint/no-var-requires': 'off', // Should be able to remove with the full migration of SDK v3
         '@typescript-eslint/no-unsafe-member-access': 'off', // use typeguard before accessing a member
         '@typescript-eslint/no-unsafe-assignment': 'off', // 112 errors, similar to above
         '@typescript-eslint/no-unsafe-return': 'off', // 26 errors, similar to above
         '@typescript-eslint/no-unsafe-call': 'off', // 24 errors, need types for imported constructors
         '@typescript-eslint/restrict-template-expressions': 'off', // 294 errors, forces template literals to be a certain type
-        '@typescript-eslint/no-floating-promises': 'off', // 274 errors, promises should catch errors or be awaited
         '@typescript-eslint/ban-ts-comment': 'off', // 27 errors, bans compiler error exceptions
         '@typescript-eslint/explicit-module-boundary-types': 'off', // Remove this once 'explicit-function-return-type' is on
         // Do not check loops so while(true) works. Potentially reevalute this.
         'no-constant-condition': ['error', { checkLoops: false }],
         'no-empty': 'off',
+
+        // https://eslint.style/rules/default/spaced-comment
+        // Require space after // comment.
+        '@stylistic/spaced-comment': [
+            'error',
+            'always',
+            {
+                block: {
+                    markers: ['!'], // Allow the /*!…*/ license header.
+                    // exceptions: ['*'],
+                    // balanced: true
+                },
+            },
+        ],
+
+        // Rules from https://github.com/sindresorhus/eslint-plugin-unicorn
+        // TODO: 'unicorn/no-useless-promise-resolve-reject': 'error',
+        // TODO: 'unicorn/prefer-at': 'error',
+        // TODO: 'unicorn/prefer-event-target': 'error',
+        // TODO: 'unicorn/prefer-negative-index': 'error',
+        // TODO: 'unicorn/prefer-string-slice': 'error',
+        // TODO: 'unicorn/prefer-regexp-test': 'error',
+        // TODO: 'unicorn/prefer-ternary': 'error',
+        // TODO(?): 'unicorn/custom-error-definition': 'error',
+        // TODO(?): 'unicorn/prefer-json-parse-buffer': 'error',
+        // TODO: ESM modules https://github.com/sindresorhus/eslint-plugin-unicorn/blob/main/docs/rules/prefer-module.md
+        // 'unicorn/prefer-module': 'error',
+        'unicorn/no-abusive-eslint-disable': 'error',
+        'unicorn/no-null': 'error',
+        'unicorn/no-unnecessary-polyfills': 'error',
+        'unicorn/no-useless-spread': 'error',
+        'unicorn/prefer-array-some': 'error',
+        'unicorn/prefer-blob-reading-methods': 'error',
+        'unicorn/prefer-code-point': 'error',
+        'unicorn/prefer-date-now': 'error',
+        'unicorn/prefer-dom-node-text-content': 'error',
+        'unicorn/prefer-includes': 'error',
+        'unicorn/prefer-keyboard-event-key': 'error',
+        'unicorn/prefer-modern-dom-apis': 'error',
+        'unicorn/prefer-modern-math-apis': 'error',
+        'unicorn/prefer-native-coercion-functions': 'error',
+        // 'unicorn/prefer-node-protocol': 'error',
+        // 'unicorn/prefer-object-from-entries': 'error',
+        'unicorn/prefer-reflect-apply': 'error',
+        'unicorn/prefer-string-trim-start-end': 'error',
+        'unicorn/prefer-type-error': 'error',
+        // Discourage `.forEach` because it can lead to accidental, incorrect use of async callbacks.
+        'unicorn/no-array-for-each': 'error',
+        'security-node/detect-child-process': 'error',
+
         'header/header': [
             'error',
             'block',
             {
                 pattern:
-                    'Copyright ([0-9]{4}[-,]{0,1}[ ]{0,1}){1,} Amazon.com, Inc. or its affiliates. All Rights Reserved.\\r?\\n \\* SPDX-License-Identifier: Apache-2.0',
+                    'Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\\r?\\n \\* SPDX-License-Identifier: Apache-2.0',
             },
             { lineEndings: 'unix' },
         ],
+
+        'aws-toolkits/no-only-in-tests': 'error',
+        'aws-toolkits/no-await-on-vscode-msg': 'error',
+        'aws-toolkits/no-banned-usages': 'error',
+        'aws-toolkits/no-incorrect-once-usage': 'error',
+        'aws-toolkits/no-string-exec-for-child-process': 'error',
+        'aws-toolkits/no-console-log': 'error',
+        'aws-toolkits/no-json-stringify-in-log': 'error',
+        'aws-toolkits/no-printf-mismatch': 'error',
+        'aws-toolkits/no-index-import': 'error',
+        'no-restricted-imports': [
+            'error',
+            {
+                patterns: [
+                    {
+                        group: ['**/core/dist/*'],
+                        message:
+                            "Avoid importing from the core lib's dist/ folders; please use directly from the core lib defined exports.",
+                    },
+                ],
+                // The following will place an error on the `fs-extra` import since we do not want it to be used for browser compatibility reasons.
+                paths: [
+                    {
+                        name: 'fs-extra',
+                        message:
+                            'Avoid fs-extra, use shared/fs/fs.ts. Notify the Toolkit team if your required functionality is not available.',
+                    },
+                    {
+                        name: 'fs',
+                        message: 'Avoid node:fs and use shared/fs/fs.ts when possible.',
+                    },
+                    {
+                        name: 'child_process',
+                        message:
+                            'Avoid child_process, use ChildProcess from `shared/utilities/processUtils.ts` instead.',
+                    },
+                    {
+                        name: '..',
+                        message:
+                            'Avoid importing from index.ts files as it can lead to circular dependencies. Import from the module directly instead.',
+                    },
+                ],
+            },
+        ],
+
+        'prettier/prettier': ['error', { endOfLine: 'auto' }],
     },
 }
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index f34129fb4d4..68e055e6886 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,4 @@
 * @aws/aws-ides-team
-src/codewhisperer/ @aws/codewhisperer-team
+packages/core/src/codewhisperer/ @aws/codewhisperer-team
+packages/core/src/amazonqFeatureDev/ @aws/earlybird
+packages/core/src/awsService/accessanalyzer/ @aws/access-analyzer
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 0105f354bcf..8854d20a194 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -16,8 +16,9 @@ labels: bug
 
 ## Expected behavior
 
-## System details (run the `AWS: About Toolkit` command)
+## System details (run `AWS: About` and/or `Amazon Q: About`)
 
 -   OS:
 -   Visual Studio Code version:
 -   AWS Toolkit version:
+-   Amazon Q version:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 7e740fa52a1..fd8bb78fb8c 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,6 +1,6 @@
 ---
 name: Feature request
-about: Suggest an idea for AWS Toolkit
+about: Suggest an idea for AWS Toolkit or Amazon Q
 labels: feature-request
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/guidance_request.md b/.github/ISSUE_TEMPLATE/guidance_request.md
index acbc67fa384..24eae4b2ac8 100644
--- a/.github/ISSUE_TEMPLATE/guidance_request.md
+++ b/.github/ISSUE_TEMPLATE/guidance_request.md
@@ -4,11 +4,12 @@ about: Ask for guidance, "how to", or other questions
 labels: guidance
 ---
 
-## System details (run the `AWS: About Toolkit` command)
+## System details (run `AWS: About` and/or `Amazon Q: About`)
 
 -   OS:
 -   Visual Studio Code version:
 -   AWS Toolkit version:
+-   Amazon Q version:
 
 ## Question
 
diff --git a/.github/ISSUE_TEMPLATE/unreliable_test_report.md b/.github/ISSUE_TEMPLATE/unreliable_test_report.md
new file mode 100644
index 00000000000..a1981703b69
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/unreliable_test_report.md
@@ -0,0 +1,17 @@
+---
+name: unreliable test
+about: Help us monitor our test suite by reporting flaky tests.
+labels: tests-ci-cd
+---
+
+## Test Details
+
+-   Name of test:
+-   OS of failure:
+-   VSCode version of failure (minimum/insider/stable):
+-   Link to failing run:
+-   Link to failing test:
+
+## Log of Test Failure
+
+## Additional Information
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 30277038e28..3b891b24003 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,17 +1,11 @@
 ## Problem
 
+
 ## Solution
 
-<!---
-    REMINDER:
-    - Read CONTRIBUTING.md first.
-    - Add test coverage for your changes.
-    - Update the changelog using `npm run newChange`.
-    - Link to related issues/commits.
-    - Testing: how did you test your changes?
-    - Screenshots
--->
 
-## License
+---
 
-By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
+- 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.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index af36f718161..c9ffbf03153 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,10 +1,45 @@
 # Documentation for configuration options:
-# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+#
+# Troubleshooting: Insights tab > Dependency Graph > Dependabot
+# https://github.com/aws/aws-toolkit-vscode/network/updates
 
 version: 2
 updates:
     - package-ecosystem: 'npm'
-      directory: '/' # Location of package manifests.
+      directory: './src.gen'
+      target-branch: 'master'
+      schedule:
+          interval: 'monthly'
+      ignore:
+          - dependency-name: '*' # roundabout way to ignore this entire directory, see https://github.com/dependabot/dependabot-core/issues/4364#issuecomment-2002406602
+    - package-ecosystem: 'npm'
+      directory: './' # Location of package manifests.
+      target-branch: 'master' # Avoid updates to "staging".
+      versioning-strategy: 'increase'
+      commit-message:
+          prefix: 'deps'
+      schedule:
+          interval: 'daily'
+      groups:
+          aws-sdk:
+              patterns:
+                  - '@aws-sdk/*'
+          vscode-lsp:
+              patterns:
+                  - 'vscode-lang*'
+          smithy:
+              patterns:
+                  - '@smithy*'
+                  - 'smithy*'
+    - package-ecosystem: 'github-actions'
+      directory: './'
       target-branch: 'master' # Avoid updates to "staging".
+      commit-message:
+          prefix: 'deps'
       schedule:
           interval: 'daily'
+      groups:
+          github-actions:
+              patterns:
+                  - '*'
diff --git a/.github/workflows/filterDuplicates.js b/.github/workflows/filterDuplicates.js
new file mode 100644
index 00000000000..148c8cf0ac0
--- /dev/null
+++ b/.github/workflows/filterDuplicates.js
@@ -0,0 +1,297 @@
+/**
+ * Filters the report produced by jscpd to only include clones that involve changes from the given git diff.
+ * If the filtered report is non-empty, i.e. there exists a clone in the changes,
+ * the program exits with an error and logs the filtered report to console.
+ *
+ * Usage:
+ *      node filterDuplicates.js run [path_to_git_diff] [path_to_jscpd_report] [commit_hash] [repo_name]
+ *
+ * Tests:
+ *      node filterDuplicates.js test
+ */
+
+const fs = require('fs/promises')
+const path = require('path')
+
+function parseDiffFilePath(filePathLine) {
+    return filePathLine.split(' ')[2].split('/').slice(1).join('/')
+}
+
+function parseDiffRange(rangeLine) {
+    const [_fromRange, toRange] = rangeLine.split(' ').slice(1, 3)
+    const [startLine, numLines] = toRange.slice(1).split(',').map(Number)
+    const range = [startLine, startLine + numLines]
+    return range
+}
+
+async function parseDiff(diffPath) {
+    const diff = await fs.readFile(diffPath, 'utf8')
+    const lines = diff.split('\n')
+    let currentFile = null
+    let currentFileChanges = []
+    const fileChanges = new Map()
+
+    for (const line of lines) {
+        if (line.startsWith('diff')) {
+            if (currentFile) {
+                fileChanges.set(currentFile, currentFileChanges)
+            }
+            currentFile = parseDiffFilePath(line)
+            currentFileChanges = []
+        }
+        if (line.startsWith('@@')) {
+            currentFileChanges.push(parseDiffRange(line))
+        }
+    }
+
+    fileChanges.set(currentFile, currentFileChanges)
+
+    return fileChanges
+}
+
+function doesOverlap(range1, range2) {
+    const [start1, end1] = range1
+    const [start2, end2] = range2
+    return (
+        (start1 >= start2 && start1 <= end2) || (end1 >= start2 && end1 <= end2) || (start2 >= start1 && end2 <= end1)
+    )
+}
+
+function isCloneInChanges(changes, cloneInstance) {
+    const fileName = cloneInstance.name
+    const cloneStart = cloneInstance.start
+    const cloneEnd = cloneInstance.end
+    const lineChangeRanges = changes.get(fileName)
+
+    if (!lineChangeRanges) {
+        return false
+    }
+
+    return lineChangeRanges.some((range) => doesOverlap([cloneStart, cloneEnd], range))
+}
+
+function isInChanges(changes, dupe) {
+    return isCloneInChanges(changes, dupe.firstFile) || isCloneInChanges(changes, dupe.secondFile)
+}
+
+function filterDuplicates(report, changes) {
+    duplicates = []
+    for (const dupe of report.duplicates) {
+        if (isInChanges(changes, dupe)) {
+            duplicates.push(dupe)
+        }
+    }
+    return duplicates
+}
+
+function formatDuplicates(duplicates, commitHash, repoName) {
+    const baseUrl = `https://github.com/${repoName}`
+    return duplicates.map((dupe) => {
+        return {
+            first: formUrl(dupe.firstFile, commitHash),
+            second: formUrl(dupe.secondFile, commitHash),
+            numberOfLines: dupe.lines,
+        }
+    })
+    function formUrl(file, commitHash) {
+        return `${baseUrl}/blob/${commitHash}/${file.name}#L${file.start}-L${file.end}`
+    }
+}
+
+async function run() {
+    const rawDiffPath = process.argv[3]
+    const jscpdReportPath = process.argv[4]
+    const commitHash = process.argv[5]
+    const repoName = process.argv[6]
+    const changes = await parseDiff(rawDiffPath)
+    const jscpdReport = JSON.parse(await fs.readFile(jscpdReportPath, 'utf8'))
+    const filteredDuplicates = filterDuplicates(jscpdReport, changes)
+
+    console.log('%s files changes', changes.size)
+    console.log('%s duplicates found', filteredDuplicates.length)
+    if (filteredDuplicates.length > 0) {
+        console.log(formatDuplicates(filteredDuplicates, commitHash, repoName))
+        console.log(
+            '* Hint: if these duplicates appear unrelated to the changes, rebase onto or merge in the latest target branch.'
+        )
+        process.exit(1)
+    }
+}
+
+/**
+ * Mini-test Suite
+ */
+const testDiffFile = path.resolve(__dirname, 'test/test_diff.txt')
+let testCounter = 0
+function assertEqual(actual, expected) {
+    if (actual !== expected) {
+        throw new Error(`Expected ${expected} but got ${actual}`)
+    }
+    testCounter += 1
+}
+
+async function test() {
+    test_parseDiffFilePath()
+    test_parseDiffRange()
+    test_doesOverlap()
+    await test_parseDiff()
+    await test_isCloneInChanges()
+    await test_isInChanges()
+    await test_filterDuplicates()
+    console.log('All tests passed (%s)', testCounter)
+}
+
+function test_parseDiffFilePath() {
+    assertEqual(
+        parseDiffFilePath(
+            'diff --git a/.github/workflows/copyPasteDetection.yml b/.github/workflows/copyPasteDetection.yml'
+        ),
+        '.github/workflows/copyPasteDetection.yml'
+    )
+    assertEqual(
+        parseDiffFilePath('diff --git a/.github/workflows/filterDuplicates.js b/.github/workflows/filterDuplicates.js'),
+        '.github/workflows/filterDuplicates.js'
+    )
+}
+
+function test_parseDiffRange() {
+    assertEqual(parseDiffRange('@@ -1,4 +1,4 @@').join(','), '1,5')
+    assertEqual(parseDiffRange('@@ -10,4 +10,4 @@').join(','), '10,14')
+    assertEqual(parseDiffRange('@@ -10,4 +10,5 @@').join(','), '10,15')
+}
+
+function test_doesOverlap() {
+    assertEqual(doesOverlap([1, 5], [2, 4]), true)
+    assertEqual(doesOverlap([2, 3], [2, 4]), true)
+    assertEqual(doesOverlap([2, 3], [1, 4]), true)
+    assertEqual(doesOverlap([1, 5], [5, 6]), true)
+    assertEqual(doesOverlap([1, 5], [6, 7]), false)
+    assertEqual(doesOverlap([6, 7], [1, 5]), false)
+    assertEqual(doesOverlap([2, 5], [4, 5]), true)
+}
+
+async function test_parseDiff() {
+    const changes = await parseDiff(testDiffFile)
+    assertEqual(changes.size, 2)
+    assertEqual(changes.get('.github/workflows/copyPasteDetection.yml').length, 1)
+    assertEqual(changes.get('.github/workflows/filterDuplicates.js').length, 1)
+    assertEqual(changes.get('.github/workflows/filterDuplicates.js')[0].join(','), '1,86')
+    assertEqual(changes.get('.github/workflows/copyPasteDetection.yml')[0].join(','), '26,73')
+}
+
+async function test_isCloneInChanges() {
+    const changes = await parseDiff(testDiffFile)
+    assertEqual(
+        isCloneInChanges(changes, {
+            name: '.github/workflows/filterDuplicates.js',
+            start: 1,
+            end: 86,
+        }),
+        true
+    )
+    assertEqual(
+        isCloneInChanges(changes, {
+            name: '.github/workflows/filterDuplicates.js',
+            start: 80,
+            end: 95,
+        }),
+        true
+    )
+    assertEqual(
+        isCloneInChanges(changes, {
+            name: '.github/workflows/filterDuplicates.js',
+            start: 87,
+            end: 95,
+        }),
+        false
+    )
+    assertEqual(
+        isCloneInChanges(changes, {
+            name: 'some-fake-file',
+            start: 1,
+            end: 100,
+        }),
+        false
+    )
+}
+
+async function test_isInChanges() {
+    const changes = await parseDiff(testDiffFile)
+    const dupe = {
+        firstFile: {
+            name: '.github/workflows/filterDuplicates.js',
+            start: 1,
+            end: 86,
+        },
+        secondFile: {
+            name: '.github/workflows/filterDuplicates.js',
+            start: 80,
+            end: 95,
+        },
+    }
+    assertEqual(isInChanges(changes, dupe), true)
+    dupe.secondFile.start = 87
+    assertEqual(isInChanges(changes, dupe), true)
+    dupe.firstFile.name = 'some-fake-file'
+    assertEqual(isInChanges(changes, dupe), false)
+}
+
+async function test_filterDuplicates() {
+    assertEqual(
+        filterDuplicates(
+            {
+                duplicates: [
+                    {
+                        firstFile: {
+                            name: '.github/workflows/filterDuplicates.js',
+                            start: 1,
+                            end: 86,
+                        },
+                        secondFile: {
+                            name: '.github/workflows/filterDuplicates.js',
+                            start: 80,
+                            end: 95,
+                        },
+                    },
+                ],
+            },
+            await parseDiff(testDiffFile)
+        ).length,
+        1
+    )
+    assertEqual(
+        filterDuplicates(
+            {
+                duplicates: [
+                    {
+                        firstFile: {
+                            name: 'some-other-file',
+                            start: 1,
+                            end: 86,
+                        },
+                        secondFile: {
+                            name: '.github/workflows/filterDuplicates.js',
+                            start: 90,
+                            end: 95,
+                        },
+                    },
+                ],
+            },
+            await parseDiff(testDiffFile)
+        ).length,
+        0
+    )
+}
+
+async function main() {
+    const mode = process.argv[2]
+    if (mode === 'run') {
+        await run()
+    } else if (mode === 'test') {
+        await test()
+    } else {
+        throw new Error('Invalid mode')
+    }
+}
+
+void main()
diff --git a/.github/workflows/jscpd.json b/.github/workflows/jscpd.json
new file mode 100644
index 00000000000..dd5faa12b30
--- /dev/null
+++ b/.github/workflows/jscpd.json
@@ -0,0 +1,9 @@
+{
+    "pattern": "packages/**/*.ts",
+    "ignore": ["**node_modules**", "**dist**", "**/scripts/**"],
+    "gitignore": true,
+    "threshold": 3.0,
+    "minLines": 10,
+    "output": "./",
+    "reporters": ["json"]
+}
diff --git a/.github/workflows/lintbranch.js b/.github/workflows/lintbranch.js
new file mode 100644
index 00000000000..05fc677dac5
--- /dev/null
+++ b/.github/workflows/lintbranch.js
@@ -0,0 +1,67 @@
+// Check that branch name conforms to GitHub naming convention:
+// https://docs.github.com/en/get-started/using-git/dealing-with-special-characters-in-branch-and-tag-names#naming-branches-and-tags
+
+// To run self-tests,
+// node lintbranch.js test
+// TODO: deduplicate code from lintbranch.js and lintcommit.js.
+
+function isValid(branchName) {
+    const branchNameRegex = /^[a-zA-Z][a-zA-Z0-9._/-]*$/
+
+    return branchNameRegex.test(branchName)
+}
+
+function run(branchName) {
+    if (isValid(branchName)) {
+        console.log(`Branch name "${branchName}" is valid.`)
+        process.exit(0)
+    } else {
+        const helpUrl =
+            'https://docs.github.com/en/get-started/using-git/dealing-with-special-characters-in-branch-and-tag-names#naming-branches-and-tags'
+        console.log(`Branch name "${branchName}" is invalid see ${helpUrl} for more information.`)
+        process.exit(1)
+    }
+}
+
+function _test() {
+    const tests = {
+        'feature/branch-name': true,
+        feature_123: true,
+        'my-branch': true,
+        '123invalid-start': false,
+        '!invalid@start': false,
+        '': false,
+        'another/valid-name134': true,
+        'feature/123";id;{echo,Y2F0IC9ldGMvcGFzc3dk}|{base64,-d}|{bash,-i};#': false,
+    }
+
+    let passed = 0
+    let failed = 0
+
+    for (const [branchName, expected] of Object.entries(tests)) {
+        const result = isValid(branchName)
+        if (result === expected) {
+            console.log(`✅ Test passed for "${branchName}"`)
+            passed++
+        } else {
+            console.log(`❌ Test failed for "${branchName}" (expected "${expected}", got "${result}")`)
+            failed++
+        }
+    }
+
+    console.log(`\n${passed} tests passed, ${failed} tests failed`)
+}
+
+function main() {
+    const mode = process.argv[2]
+
+    if (mode === 'test') {
+        _test()
+    } else if (mode === 'run') {
+        run(process.argv[3])
+    } else {
+        throw new Error(`Unknown mode: ${mode}`)
+    }
+}
+
+main()
diff --git a/.github/workflows/lintcommit.js b/.github/workflows/lintcommit.js
new file mode 100644
index 00000000000..47e194653a3
--- /dev/null
+++ b/.github/workflows/lintcommit.js
@@ -0,0 +1,211 @@
+// Checks that a PR title conforms to our custom flavor of "conventional commits"
+// (https://www.conventionalcommits.org/).
+//
+// To run self-tests, simply run this script:
+//
+//     node lintcommit.js test
+//
+// TODO: "PR must describe Problem in a concise way, and Solution".
+// TODO: this script intentionally avoids github APIs so that it is locally-debuggable, but if those
+// are needed, use actions/github-script as described in: https://github.com/actions/github-script?tab=readme-ov-file#run-a-separate-file
+//
+
+const fs = require('fs')
+// This script intentionally avoids github APIs so that:
+//   1. it is locally-debuggable
+//   2. the CI job is fast ("npm install" is slow)
+// But if we still want to use github API, we can keep it fast by using `actions/github-script` as
+// described in: https://github.com/actions/github-script?tab=readme-ov-file#run-a-separate-file
+//
+// const core = require('@actions/core')
+// const github = require('@actions/github')
+
+const types = new Set([
+    'build',
+    // Don't allow "chore" because it's over-used.
+    // Instead, add a new type if absolutely needed (if the existing ones can't possibly apply).
+    // 'chore',
+    'ci',
+    'config',
+    'deps',
+    'docs',
+    'feat',
+    'fix',
+    'perf',
+    'refactor',
+    'revert',
+    'style',
+    'telemetry',
+    'test',
+    'types',
+])
+
+// TODO: Validate against this once we are satisfied with this list.
+const scopes = new Set([
+    'amazonq',
+    'core',
+    'explorer',
+    'lambda',
+    'logs',
+    'redshift',
+    'q-chat',
+    'q-featuredev',
+    'q-inlinechat',
+    'q-transform',
+    'sam',
+    's3',
+    'telemetry',
+    'toolkit',
+    'ui',
+    'sagemakerunifiedstudio',
+])
+void scopes
+
+/**
+ * Checks that a pull request title, or commit message subject, follows the expected format:
+ *
+ *      type(scope): message
+ *
+ * Returns undefined if `title` is valid, else an error message.
+ */
+function validateTitle(title) {
+    const parts = title.split(':')
+    const subject = parts.slice(1).join(':').trim()
+
+    if (title.startsWith('Merge')) {
+        return undefined
+    }
+
+    if (parts.length < 2) {
+        return 'missing colon (:) char'
+    }
+
+    const typeScope = parts[0]
+
+    const [type, scope] = typeScope.split(/\(([^)]+)\)$/)
+
+    if (/\s+/.test(type)) {
+        return `type contains whitespace: "${type}"`
+    } else if (type === 'chore') {
+        return 'Do not use "chore" as a type. If the existing valid types are insufficent, add a new type to the `lintcommit.js` script.'
+    } else if (!types.has(type)) {
+        return `invalid type "${type}"`
+    } else if (!scope && typeScope.includes('(')) {
+        return `must be formatted like type(scope):`
+    } else if (!scope && ['feat', 'fix'].includes(type)) {
+        return `"${type}" type must include a scope (example: "${type}(amazonq)")`
+    } else if (scope && scope.length > 30) {
+        return 'invalid scope (must be <=30 chars)'
+    } else if (scope && /[^- a-z0-9]+/.test(scope)) {
+        return `invalid scope (must be lowercase, ascii only): "${scope}"`
+    } else if (subject.length === 0) {
+        return 'empty subject'
+    } else if (subject.length > 100) {
+        return 'invalid subject (must be <=100 chars)'
+    }
+
+    return undefined
+}
+
+function run() {
+    const eventData = JSON.parse(fs.readFileSync(process.env.GITHUB_EVENT_PATH, 'utf8'))
+    const pullRequest = eventData.pull_request
+
+    // console.log(eventData)
+
+    if (!pullRequest) {
+        console.info('No pull request found in the context')
+        return
+    }
+
+    const title = pullRequest.title
+
+    const failReason = validateTitle(title)
+    const msg = failReason
+        ? `
+Invalid pull request title: \`${title}\`
+
+* Problem: ${failReason}
+* Expected format: \`type(scope): subject...\`
+    * type: one of (${Array.from(types).join(', ')})
+    * scope: lowercase, <30 chars
+    * subject: must be <100 chars
+    * documentation: https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#pull-request-title
+* Hint: *close and re-open the PR* to re-trigger CI (after fixing the PR title).
+`
+        : `Pull request title matches the [expected format](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#pull-request-title).`
+
+    if (process.env.GITHUB_STEP_SUMMARY) {
+        fs.appendFileSync(process.env.GITHUB_STEP_SUMMARY, msg)
+    }
+
+    if (failReason) {
+        console.error(msg)
+        process.exit(1)
+    } else {
+        console.info(msg)
+    }
+}
+
+function _test() {
+    const tests = {
+        ' foo(scope): bar': 'type contains whitespace: " foo"',
+        'build: update build process': undefined,
+        'chore: update dependencies':
+            'Do not use "chore" as a type. If the existing valid types are insufficent, add a new type to the `lintcommit.js` script.',
+        'ci: configure CI/CD': undefined,
+        'config: update configuration files': undefined,
+        'deps: bump the aws-sdk group across 1 directory with 5 updates': undefined,
+        'docs: update documentation': undefined,
+        'feat(foo): add new feature': undefined,
+        'feat(foo):': 'empty subject',
+        'feat foo):': 'type contains whitespace: "feat foo)"',
+        'feat(foo)): sujet': 'invalid type "feat(foo))"',
+        'feat(foo: sujet': 'invalid type "feat(foo"',
+        'feat(Q Foo Bar): bar': 'invalid scope (must be lowercase, ascii only): "Q Foo Bar"',
+        'feat(scope):': 'empty subject',
+        'feat(q foo bar): bar': undefined,
+        'feat(foo): x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x ':
+            'invalid subject (must be <=100 chars)',
+        'feat: foo': '"feat" type must include a scope (example: "feat(amazonq)")',
+        'fix: foo': '"fix" type must include a scope (example: "fix(amazonq)")',
+        'fix(a-b-c): resolve issue': undefined,
+        'foo (scope): bar': 'type contains whitespace: "foo "',
+        'invalid title': 'missing colon (:) char',
+        'perf: optimize performance': undefined,
+        'refactor: improve code structure': undefined,
+        'revert: feat: add new feature': undefined,
+        'style: format code': undefined,
+        'test: add new tests': undefined,
+        'types: add type definitions': undefined,
+        'Merge staging into feature/lambda-get-started': undefined,
+    }
+
+    let passed = 0
+    let failed = 0
+
+    for (const [title, expected] of Object.entries(tests)) {
+        const result = validateTitle(title)
+        if (result === expected) {
+            console.log(`✅ Test passed for "${title}"`)
+            passed++
+        } else {
+            console.log(`❌ Test failed for "${title}" (expected "${expected}", got "${result}")`)
+            failed++
+        }
+    }
+
+    console.log(`\n${passed} tests passed, ${failed} tests failed`)
+}
+
+function main() {
+    const mode = process.argv[2]
+
+    if (mode === 'test') {
+        _test()
+    } else {
+        run()
+    }
+}
+
+main()
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
index 48f7fae3ea0..da8d0c6ea54 100644
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -1,75 +1,216 @@
-# github actions: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+# github actions: https://docs.github.com/en/actions/use-cases-and-examples/building-and-testing/building-and-testing-nodejs
 # setup-node: https://github.com/actions/setup-node
 
 name: CI
 
 on:
     push:
-        branches: [master]
+        branches: [master, staging]
     pull_request:
-        branches: [master, feature/*]
+        # By default, CI will trigger on opened/synchronize/reopened event types.
+        # https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#pull_request
+        # Note: To re-run `lint-commits` after fixing the PR title, close-and-reopen the PR.
+        branches: [master, feature/*, staging]
+
+# Cancel old jobs when a pull request is updated.
+concurrency:
+    group: ${{ github.head_ref || github.run_id }}
+    cancel-in-progress: true
 
 jobs:
+    lint-commits:
+        # Note: To re-run `lint-commits` after fixing the PR title, close-and-reopen the PR.
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+              with:
+                  fetch-depth: 20
+            - uses: actions/setup-node@v4
+              with:
+                  node-version: '20'
+            - name: Validate Branch name
+              if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.ref != ''}}
+              env:
+                  BRANCH_NAME: ${{ github.event.pull_request.head.ref }}
+              run: |
+                  node "$GITHUB_WORKSPACE/.github/workflows/lintbranch.js" run "$BRANCH_NAME"
+            - name: Check PR title
+              run: |
+                  node "$GITHUB_WORKSPACE/.github/workflows/lintcommit.js"
+
+    lint:
+        needs: lint-commits
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                node-version: [18.x]
+                vscode-version: [stable]
+        env:
+            NODE_OPTIONS: '--max-old-space-size=8192'
+        steps:
+            - uses: actions/checkout@v4
+            - name: Use Node.js ${{ matrix.node-version }}
+              uses: actions/setup-node@v4
+              with:
+                  node-version: ${{ matrix.node-version }}
+            - run: npm ci
+            - run: npm run testCompile
+            - run: npm run lint
+
+    lint-duplicate-code:
+        needs: lint-commits
+        if: ${{ github.event_name == 'pull_request'}}
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                node-version: [18.x]
+        env:
+            NODE_OPTIONS: '--max-old-space-size=8192'
+
+        steps:
+            - uses: actions/checkout@v4
+              with:
+                  fetch-depth: 0
+
+            - name: Use Node.js ${{ matrix.node-version }}
+              uses: actions/setup-node@v4
+              with:
+                  node-version: ${{ matrix.node-version }}
+
+            - name: Fetch fork upstream
+              env:
+                  REPO_NAME: ${{ github.event.pull_request.head.repo.full_name }}
+              run: |
+                  git remote add forkUpstream https://github.com/$REPO_NAME  # URL of the fork
+                  git fetch forkUpstream  # Fetch fork
+
+            - name: Merge in target branch to avoid false negatives.
+              env:
+                  TARGET_BRANCH: ${{ github.event.pull_request.base.ref }}
+              # Note: "git merge" should always succeed here, because GHA won't
+              # start the job if there are merge conflicts. https://github.com/orgs/community/discussions/11265
+              # Also, because `git merge` makes a commit, we need to establish an identity to avoid 'Committer identity unknown' error
+              run: |
+                  git config --global user.name "aws-toolkit-automation"
+                  git config --global user.email "<>"
+                  git merge origin/$TARGET_BRANCH
+
+            - name: Compute git diff
+              env:
+                  CURRENT_BRANCH: ${{ github.head_ref }}
+                  TARGET_BRANCH: ${{ github.event.pull_request.base.ref }}
+              run: git diff origin/$TARGET_BRANCH forkUpstream/$CURRENT_BRANCH > diff_output.txt
+
+            - run: npm install -g jscpd
+
+            - run: jscpd --config "$GITHUB_WORKSPACE/.github/workflows/jscpd.json"
+
+            - if: always()
+              uses: actions/upload-artifact@v4
+              with:
+                  name: unfiltered-jscpd-report
+                  path: ./jscpd-report.json
+
+            - name: Check for Duplicates
+              env:
+                  COMMIT_HASH: ${{ github.sha}}
+                  REPO_NAME: ${{ github.repository }}
+              run: node "$GITHUB_WORKSPACE/.github/workflows/filterDuplicates.js" run diff_output.txt jscpd-report.json $COMMIT_HASH $REPO_NAME
+
     macos:
-        name: macOS nodejs
+        needs: lint-commits
+        name: test macOS
         runs-on: macos-latest
         strategy:
+            fail-fast: false
             matrix:
-                node-version: [16.x]
+                node-version: [18.x]
                 vscode-version: [minimum, stable, insiders]
+                package: [amazonq, toolkit]
         env:
             VSCODE_TEST_VERSION: ${{ matrix.vscode-version }}
             NODE_OPTIONS: '--max-old-space-size=8192'
+            AWS_TOOLKIT_TEST_CACHE_DIR: '/tmp/.vscode-test/'
+            AWS_TOOLKIT_TEST_USER_DIR: '/tmp/.vscode-test/user-data/'
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
             - name: Use Node.js ${{ matrix.node-version }}
-              uses: actions/setup-node@v2
+              uses: actions/setup-node@v4
               with:
                   node-version: ${{ matrix.node-version }}
             - run: npm ci
-            - run: npm run vscode:prepublish
             - name: Tests
-              uses: GabrielBB/xvfb-action@v1
+              uses: coactions/setup-xvfb@v1
               with:
-                  run: npm test
-            - name: Code coverage
+                  run: npm run test -w packages/${{ matrix.package }}
+            - name: Code coverage for ${{ matrix.package }}
               env:
                   # Unset NODE_OPTIONS because of https://github.com/codecov/uploader/issues/475
                   NODE_OPTIONS: ''
-              if: ${{ github.repository == 'aws/aws-toolkit-vscode' && ( github.ref == 'master' || github.event_name == 'pull_request' ) }}
-              uses: codecov/codecov-action@v2
+              if: ${{ github.repository == 'aws/aws-toolkit-vscode' && github.event_name == 'pull_request' && github.base_ref == 'master' }}
+              uses: codecov/codecov-action@v5
               with:
+                  flags: macos-${{ matrix.package }}-unittests
                   verbose: true
-                  file: ./coverage/coverage-final.json
-                  flags: macos-unittests
+                  file: ./coverage/${{ matrix.package }}/lcov.info
+                  token: ${{ secrets.CODECOV_TOKEN }}
+
+    web:
+        needs: lint-commits
+        name: test Web
+        runs-on: ubuntu-latest
+        strategy:
+            fail-fast: true
+            matrix:
+                node-version: [18.x]
+                vscode-version: [stable, insiders]
+        env:
+            VSCODE_TEST_VERSION: ${{ matrix.vscode-version }}
+            NODE_OPTIONS: '--max-old-space-size=8192'
+            AWS_TOOLKIT_TEST_CACHE_DIR: '/tmp/.vscode-test/'
+            AWS_TOOLKIT_TEST_USER_DIR: '/tmp/.vscode-test/user-data/'
+        steps:
+            - uses: actions/checkout@v4
+            - name: Use Node.js ${{ matrix.node-version }}
+              uses: actions/setup-node@v4
+              with:
+                  node-version: ${{ matrix.node-version }}
+            - run: npm ci
+            - name: Tests
+              uses: coactions/setup-xvfb@v1
+              with:
+                  run: npm run testWeb
 
     windows:
-        name: Windows nodejs
-        runs-on: windows-2019
+        needs: lint-commits
+        name: test Windows
+        runs-on: windows-latest
         strategy:
+            fail-fast: false
             matrix:
-                node-version: [16.x]
+                node-version: [18.x]
                 vscode-version: [stable, insiders]
+                package: [amazonq, toolkit]
         env:
             VSCODE_TEST_VERSION: ${{ matrix.vscode-version }}
             NODE_OPTIONS: '--max-old-space-size=8192'
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
             - name: Use Node.js ${{ matrix.node-version }}
-              uses: actions/setup-node@v2
+              uses: actions/setup-node@v4
               with:
                   node-version: ${{ matrix.node-version }}
             - run: npm ci
-            - run: npm run vscode:prepublish
             - name: Tests
-              run: npm test
-            - name: Code coverage
+              run: npm run test -w packages/${{ matrix.package }}
+            - name: Code coverage for ${{ matrix.package }}
               env:
                   # Unset NODE_OPTIONS because of https://github.com/codecov/uploader/issues/475
                   NODE_OPTIONS: ''
-              if: ${{ github.repository == 'aws/aws-toolkit-vscode' && ( github.ref == 'master' || github.event_name == 'pull_request' ) }}
-              uses: codecov/codecov-action@v2
+              if: ${{ github.repository == 'aws/aws-toolkit-vscode' && github.event_name == 'pull_request' && github.base_ref == 'master' }}
+              uses: codecov/codecov-action@v5
               with:
+                  flags: windows-${{ matrix.package }}-unittests
                   verbose: true
-                  file: ./coverage/coverage-final.json
-                  flags: windows-unittests
+                  file: ./coverage/${{ matrix.package }}/lcov.info
+                  token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/notification.yml b/.github/workflows/notification.yml
new file mode 100644
index 00000000000..17f0327e5c1
--- /dev/null
+++ b/.github/workflows/notification.yml
@@ -0,0 +1,41 @@
+# github actions: https://docs.github.com/en/actions/use-cases-and-examples/building-and-testing/building-and-testing-nodejs
+# setup-node: https://github.com/actions/setup-node
+
+name: Notifications
+
+on:
+    # `pull_request_target` (as opposed to `pull_request`) gives permissions to comment on PRs.
+    pull_request_target:
+        # By default, CI will trigger on opened/synchronize/reopened event types.
+        # https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#pull_request
+        # Note: To re-run `lint-commits` after fixing the PR title, close-and-reopen the PR.
+        branches: [master, feature/*, staging]
+
+# Cancel old jobs when a pull request is updated.
+concurrency:
+    group: ${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: true
+
+jobs:
+    notify:
+        if: github.repository == 'aws/aws-toolkit-vscode'
+        runs-on: ubuntu-latest
+        permissions:
+            pull-requests: write
+            issues: read
+        steps:
+            - uses: actions/checkout@v4
+              if: github.event_name == 'pull_request_target'
+              with:
+                  fetch-depth: 20
+            - uses: actions/setup-node@v4
+              if: github.event_name == 'pull_request_target'
+              with:
+                  node-version: '20'
+            - name: Comment about contribution guidelines
+              uses: actions/github-script@v7
+              if: github.event_name == 'pull_request_target'
+              with:
+                  script: |
+                      const notify = require('.github/workflows/notify.js')
+                      await notify({github, context})
diff --git a/.github/workflows/notify.js b/.github/workflows/notify.js
new file mode 100644
index 00000000000..835acddf706
--- /dev/null
+++ b/.github/workflows/notify.js
@@ -0,0 +1,96 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+const { hasPath, dedupComment } = require('./utils')
+
+const testFilesMessage =
+    '- This pull request modifies code in `src/*` but no tests were added/updated.\n    - Confirm whether tests should be added or ensure the PR description explains why tests are not required.\n'
+
+const changelogMessage =
+    '- This pull request implements a `feat` or `fix`, so it must include a changelog entry (unless the fix is for an *unreleased* feature). Review the [changelog guidelines](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#changelog).\n    - Note: beta or "experiment" features that have active users *should* announce fixes in the changelog.\n    - If this is not a feature or fix, use an appropriate type from the [title guidelines](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#pull-request-title). For example, telemetry-only changes should use the `telemetry` type.\n'
+
+/**
+ * Remind partner teams that tests are required. We don't need to remind them if:
+ *  1. They did not change anything in a src directory
+ *  2. They already have test files in the PR
+ *  3. We've already told them in a previous PR comment
+ */
+module.exports = async ({ github, context }) => {
+    const owner = context.repo.owner
+    const repo = context.repo.repo
+    const author = context.payload.pull_request.head.repo.owner.login
+    const pullRequestId = context.payload.pull_request.number
+
+    const response = await github.rest.repos.compareCommitsWithBasehead({
+        owner,
+        repo,
+        basehead: `${owner}:${context.payload.pull_request.base.ref}...${author}:${context.payload.pull_request.head.ref}`,
+    })
+
+    const filenames = response.data.files.map((file) => file.filename)
+
+    const shouldAddTestFileMessage = requiresTestFilesMessage(filenames)
+    const shouldAddChangelogMessage = requiresChangelogMessage(filenames, context.payload.pull_request.title)
+
+    if (!shouldAddTestFileMessage && !shouldAddChangelogMessage) {
+        return
+    }
+
+    // Check for prior comments on the PR
+    const comments = await github.rest.issues.listComments({
+        owner,
+        repo,
+        issue_number: pullRequestId,
+    })
+
+    let msg = ''
+    if (shouldAddTestFileMessage) {
+        msg += testFilesMessage
+    }
+    if (shouldAddChangelogMessage) {
+        msg += changelogMessage
+    }
+
+    if (shouldAddTestFileMessage || shouldAddChangelogMessage) {
+        await dedupComment({ github, comments, owner, repo, pullRequestId, message: msg })
+    }
+}
+
+/**
+ * Require the changelog message if the scope is fix/feat AND there is no changelog item
+ */
+function requiresChangelogMessage(filenames, title) {
+    try {
+        return !hasPath(filenames, '.changes') && (title.startsWith('fix') || title.startsWith('feat'))
+    } catch (e) {
+        console.log(e)
+        return undefined
+    }
+}
+
+/**
+ * Require the test files message if there are changes to source files but aren't any
+ * changes to the test files
+ */
+function requiresTestFilesMessage(filenames, title) {
+    if (/^\s*[mM]erge/.test(title)) {
+        console.log('"Merge" pull request')
+        return
+    }
+
+    // Check if src directory changed
+    if (!hasPath(filenames, 'src/')) {
+        console.log('Did not find src files in the code changes')
+        return
+    }
+
+    // Check if test files were added or modified
+    if (hasPath(filenames, '.test.ts')) {
+        console.log('Found test files in the code changes')
+        return
+    }
+
+    return true
+}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000000..60863f3b5a4
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,126 @@
+# This job performs the following:
+# - Publish prerelease (not release) artifacts for feature/x branches and "nightly" mainline.
+
+name: Prerelease
+on:
+    # schedule:
+    #     - cron: '5 5 * * *'
+    workflow_dispatch:
+        inputs:
+            tag_name:
+                description: 'Tag name for release'
+                required: false
+                default: prerelease
+    push:
+        branches: [master, feature/*, release/*]
+        # tags:
+        #   - v[0-9]+.[0-9]+.[0-9]+
+
+jobs:
+    package:
+        runs-on: ubuntu-latest
+        env:
+            NODE_OPTIONS: '--max-old-space-size=8192'
+        outputs:
+            feature: ${{ steps.build.outputs.feature }}
+            tagname: ${{ steps.build.outputs.tagname }}
+            toolkit_version: ${{ steps.build.outputs.toolkit_version }}
+            amazonq_version: ${{ steps.build.outputs.amazonq_version }}
+            toolkit_changes: ${{ steps.build.outputs.toolkit_changes }}
+            amazonq_changes: ${{ steps.build.outputs.amazonq_changes }}
+        steps:
+            - uses: actions/checkout@v4
+              with:
+                  fetch-depth: 0
+            - name: Use Node.js ${{ matrix.node-version }}
+              uses: actions/setup-node@v4
+              with:
+                  node-version: ${{ matrix.node-version }}
+            # - if: github.event_name == 'schedule'
+            #   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: startsWith(github.ref_name, 'feature/')
+              run: |
+                  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
+                  echo "TAG_NAME=prerelease" >> $GITHUB_ENV
+            - run: npm ci
+            - name: vsix
+              run: |
+                  npm run createRelease -w packages/toolkit -w packages/amazonq  # Generate CHANGELOG.md
+                  npm run -w packages/toolkit package -- --feature "$FEAT_NAME"
+                  npm run -w packages/amazonq package -- --feature "$FEAT_NAME"
+            - uses: actions/upload-artifact@v4
+              with:
+                  name: artifacts
+                  path: '*.vsix'
+                  retention-days: 10
+            - name: Export outputs
+              id: build
+              run: |
+                  write_package_info() {
+                      PKG_NAME=$1
+                      PKG_DISPLAY_NAME=$(grep -m 1 displayName packages/${PKG_NAME}/package.json | grep -o '[a-zA-z][^\"]\+' | tail -n1)
+                      echo "${PKG_NAME}_version=$(grep -m 1 version packages/${PKG_NAME}/package.json | grep -o '[0-9][^\"]\+' | sed 's/-SNAPSHOT//')" >> $GITHUB_OUTPUT
+                      echo "${PKG_NAME}_changes<<EOF" >> $GITHUB_OUTPUT
+                      # Add extension display name to the topmost changelog section.
+                      cat packages/${PKG_NAME}/CHANGELOG.md | perl -ne 'BEGIN{$/="\n\n"} print; exit if $. == 2' | sed -e "1 s/## /## ${PKG_DISPLAY_NAME} - /" >> $GITHUB_OUTPUT
+                      echo 'EOF' >> $GITHUB_OUTPUT
+                  }
+                  echo "feature=$FEAT_NAME" >> $GITHUB_OUTPUT
+                  echo "tagname=$TAG_NAME" >> $GITHUB_OUTPUT
+                  write_package_info toolkit
+                  write_package_info amazonq
+
+    publish:
+        needs: [package]
+        runs-on: ubuntu-latest
+        env:
+            #
+            # For `gh`.
+            #
+            GH_REPO: ${{ github.repository }}
+            GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            FEAT_NAME: ${{ needs.package.outputs.feature }}
+            TAG_NAME: ${{ needs.package.outputs.tagname }}
+            AWS_TOOLKIT_VERSION: ${{ needs.package.outputs.toolkit_version }}
+            AMAZON_Q_VERSION: ${{ needs.package.outputs.amazonq_version }}
+            #
+            # Used in release_notes.md
+            #
+            BRANCH: ${{ github.ref_name }}
+            AWS_TOOLKIT_CHANGES: ${{ needs.package.outputs.toolkit_changes }}
+            AMAZON_Q_CHANGES: ${{ needs.package.outputs.amazonq_changes }}
+        permissions:
+            contents: write
+        steps:
+            # Must perform checkout first, it deletes the target directory
+            # before running, thus would delete the downloaded artifacts.
+            - uses: actions/checkout@v4
+            - uses: actions/download-artifact@v4
+            - name: Delete existing prerelease
+              # "prerelease" (main branch), "pre-<feature>", or "rc-<date>"
+              if: env.TAG_NAME == 'prerelease' || startsWith(env.TAG_NAME, 'pre-') || startsWith(env.TAG_NAME, 'rc-')
+              run: |
+                  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
+              run: |
+                  # AWS_TOOLKIT_CHANGES="$(head -14 CHANGELOG.md)"
+                  envsubst < "$GITHUB_WORKSPACE/.github/workflows/release_notes.md" > "$RUNNER_TEMP/release_notes.md"
+                  gh release create $TAG_NAME --prerelease --notes-file "$RUNNER_TEMP/release_notes.md" --title "$SUBJECT" --target $GITHUB_SHA artifacts/*
diff --git a/.github/workflows/release_notes.md b/.github/workflows/release_notes.md
new file mode 100644
index 00000000000..8a044acd831
--- /dev/null
+++ b/.github/workflows/release_notes.md
@@ -0,0 +1,19 @@
+This is an **unsupported preview build** of the `${BRANCH}` branch of AWS IDE Extensions for VSCode.
+
+# Install
+
+1. Download the vsix file(s) from "Assets" below.
+    - Amazon Q $AMAZON_Q_VERSION is provided by `amazon-q-vscode….vsix`
+    - AWS Toolkit $AWS_TOOLKIT_VERSION is provided by `aws-toolkit-vscode….vsix`
+2. Run `Extensions: Install from VSIX...` from the VSCode [command palette](https://code.visualstudio.com/docs/getstarted/userinterface#_command-palette) and choose the vsix file(s).
+
+# Changes
+
+${AWS_TOOLKIT_CHANGES}
+
+${AMAZON_Q_CHANGES}
+
+## Previous changes
+
+-   [AWS Toolkit changelog](/packages/toolkit/CHANGELOG.md)
+-   [Amazon Q changelog](/packages/amazonq/CHANGELOG.md)
diff --git a/.github/workflows/setup-release-candidate.yml b/.github/workflows/setup-release-candidate.yml
new file mode 100644
index 00000000000..390669d22af
--- /dev/null
+++ b/.github/workflows/setup-release-candidate.yml
@@ -0,0 +1,56 @@
+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: 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 }}
+              run: |
+                  git config user.name "aws-toolkit-automation"
+                  git config user.email "<>"
+
+                  # Create RC branch from specified commit
+                  git checkout -b $BRANCH_NAME
+
+                  # Add generated license files
+                  git add LICENSE-THIRD-PARTY
+                  # If there are no changes, then we don't need a new attribution commit
+                  git commit -m "Update third-party license attribution for $BRANCH_NAME" || true
+
+                  # Push RC branch
+                  git push origin $BRANCH_NAME
diff --git a/.github/workflows/test/test_diff.txt b/.github/workflows/test/test_diff.txt
new file mode 100644
index 00000000000..9614e902a5e
--- /dev/null
+++ b/.github/workflows/test/test_diff.txt
@@ -0,0 +1,185 @@
+diff --git a/.github/workflows/copyPasteDetection.yml b/.github/workflows/copyPasteDetection.yml
+index 793337de5..746b3cecd 100644
+--- a/.github/workflows/copyPasteDetection.yml
++++ b/.github/workflows/copyPasteDetection.yml
+@@ -26,61 +26,47 @@ jobs:
+               with:
+                   node-version: ${{ matrix.node-version }}
+ 
++            - name: Determine if local
++              run: echo "IS_LOCAL=false" >> $GITHUB_ENV
++
+             - name: Fetch fork upstream
++              if: ${{ env.IS_LOCAL == 'false' }}
+               run: |
+                   git remote add forkUpstream https://github.com/${{ github.event.pull_request.head.repo.full_name }}  # URL of the fork
+                   git fetch forkUpstream  # Fetch fork
+ 
+             - name: Determine base and target branches for comparison.
+               run: |
+-                  echo "CURRENT_BRANCH=${{ github.head_ref }}" >> $GITHUB_ENV
+-                  echo "TARGET_BRANCH=${{ github.event.pull_request.base.ref }}" >> $GITHUB_ENV
+-            - run: git diff --name-only origin/$TARGET_BRANCH forkUpstream/$CURRENT_BRANCH > diff_output.txt
+-            - run: |
+-                  npm install -g jscpd
++                  if [[ $IS_LOCAL == 'false' ]]; then 
++                    echo "CURRENT_BRANCH=${{ github.head_ref }}" >> $GITHUB_ENV
++                    echo "TARGET_BRANCH=${{ github.event.pull_request.base.ref }}" >> $GITHUB_ENV
++                  else
++                    echo "CURRENT_BRANCH=${{ github.ref_name }}" >> $GITHUB_ENV
++                    echo "TARGET_BRANCH=master" >> $GITHUB_ENV
++                  fi
++
++            - name: Print base and target branches for comparison.
++              run: |
++                  echo "CURRENT_BRANCH=$CURRENT_BRANCH"
++                  echo "TARGET_BRANCH=$TARGET_BRANCH"
++
++            - name: Compare target and current branches.
++              run: |
++                  if [[ $IS_LOCAL == 'false' ]]; then 
++                      git diff origin/$TARGET_BRANCH forkUpstream/$CURRENT_BRANCH > diff_output.txt
++                    else
++                      git diff origin/$TARGET_BRANCH $CURRENT_BRANCH > diff_output.txt
++                    fi
++
++            - run: npm install -g jscpd
+ 
+             - run: jscpd --config "$GITHUB_WORKSPACE/.github/workflows/jscpd.json"
+ 
+-            - if: always()
++            - if: ${{ env.IS_LOCAL == 'false' }}
+               uses: actions/upload-artifact@v4
+               with:
+                   name: unfiltered-jscpd-report
+                   path: ./jscpd-report.json
+ 
+-            - name: Filter jscpd report for changed files
+-              run: |
+-                  if [ ! -f ./jscpd-report.json ]; then
+-                    echo "jscpd-report.json not found"
+-                    exit 1
+-                  fi
+-                  echo "Filtering jscpd report for changed files..."
+-                  CHANGED_FILES=$(jq -R -s -c 'split("\n")[:-1]' diff_output.txt)
+-                  echo "Changed files: $CHANGED_FILES"
+-                  jq --argjson changed_files "$CHANGED_FILES" '
+-                  .duplicates | map(select(
+-                      (.firstFile?.name as $fname | $changed_files | any(. == $fname)) or
+-                      (.secondFile?.name as $sname | $changed_files | any(. == $sname))
+-                  ))
+-                  ' ./jscpd-report.json > filtered-jscpd-report.json
+-                  cat filtered-jscpd-report.json
+-
+             - name: Check for duplicates
+-              run: |
+-                  if [ $(wc -l < ./filtered-jscpd-report.json) -gt 1 ]; then
+-                    echo "filtered_report_exists=true" >> $GITHUB_ENV
+-                  else
+-                    echo "filtered_report_exists=false" >> $GITHUB_ENV
+-                  fi
+-            - name: upload filtered report (if applicable)
+-              if: env.filtered_report_exists == 'true'
+-              uses: actions/upload-artifact@v4
+-              with:
+-                  name: filtered-jscpd-report
+-                  path: ./filtered-jscpd-report.json
+-
+-            - name: Fail and log found duplicates.
+-              if: env.filtered_report_exists == 'true'
+-              run: |
+-                  cat ./filtered-jscpd-report.json
+-                  echo "Duplications found, failing the check."
+-                  exit 1
++              run: node "$GITHUB_WORKSPACE/.github/workflows/filterDuplicates.js" diff_output.txt jscpd-report.json
+diff --git a/.github/workflows/filterDuplicates.js b/.github/workflows/filterDuplicates.js
+new file mode 100644
+index 000000000..b2f1e913e
+--- /dev/null
++++ b/.github/workflows/filterDuplicates.js
+@@ -0,0 +1,85 @@
++const fs = require('fs/promises')
++
++function parseDiffFilePath(filePathLine) {
++    return filePathLine.split(' ')[2].split('/').slice(1).join('/')
++}
++
++function parseDiffRange(rangeLine) {
++    const [_fromRange, toRange] = rangeLine.split(' ').slice(1, 3)
++    const [startLine, numLines] = toRange.slice(1).split(',').map(Number)
++    const range = [startLine, startLine + numLines]
++    return range
++}
++
++async function parseDiff(diffPath) {
++    const diff = await fs.readFile(diffPath, 'utf8')
++    const lines = diff.split('\n')
++    let currentFile = null
++    let currentFileChanges = []
++    const fileChanges = new Map()
++
++    for (const line of lines) {
++        if (line.startsWith('diff')) {
++            if (currentFile) {
++                fileChanges.set(currentFile, currentFileChanges)
++            }
++            currentFile = parseDiffFilePath(line)
++            currentFileChanges = []
++        }
++        if (line.startsWith('@@')) {
++            currentFileChanges.push(parseDiffRange(line))
++        }
++    }
++
++    return fileChanges
++}
++
++function doesOverlap(range1, range2) {
++    const [start1, end1] = range1
++    const [start2, end2] = range2
++    return (start1 >= start2 && start1 <= end2) || (end1 >= start2 && end1 <= end2)
++}
++
++function isCloneInChanges(changes, cloneInstance) {
++    const fileName = cloneInstance.name
++    const cloneStart = cloneInstance.start
++    const cloneEnd = cloneInstance.end
++    const lineChangeRanges = changes.get(fileName)
++
++    if (!lineChangeRanges) {
++        return false
++    }
++
++    return lineChangeRanges.some((range) => doesOverlap([cloneStart, cloneEnd], range))
++}
++
++function isInChanges(changes, dupe) {
++    return isCloneInChanges(changes, dupe.firstFile) || isCloneInChanges(changes, dupe.secondFile)
++}
++
++function filterDuplicates(report, changes) {
++    duplicates = []
++    for (const dupe of report.duplicates) {
++        if (isInChanges(changes, dupe)) {
++            duplicates.push(dupe)
++        }
++    }
++    return duplicates
++}
++
++async function main() {
++    const rawDiffPath = process.argv[2]
++    const jscpdReportPath = process.argv[3]
++    const changes = await parseDiff(rawDiffPath)
++    const jscpdReport = JSON.parse(await fs.readFile(jscpdReportPath, 'utf8'))
++    const filteredDuplicates = filterDuplicates(jscpdReport, changes)
++
++    console.log(filteredDuplicates)
++    console.log('%s files changes', changes.size)
++    console.log('%s duplicates found', filteredDuplicates.length)
++    if (filteredDuplicates.length > 0) {
++        process.exit(1)
++    }
++}
++
++void main()
diff --git a/.github/workflows/utils.js b/.github/workflows/utils.js
new file mode 100644
index 00000000000..1a0e91ed210
--- /dev/null
+++ b/.github/workflows/utils.js
@@ -0,0 +1,32 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Create a comment on a PR if one does not already exist
+ */
+async function dedupComment({ github, pullRequestId, owner, repo, comments, message }) {
+    if (comments.data.some((comment) => comment.body.includes(message))) {
+        return
+    }
+
+    await github.rest.issues.createComment({
+        issue_number: pullRequestId,
+        owner,
+        repo,
+        body: message,
+    })
+}
+
+/*
+ * Check if path is included in at least one of the filename paths
+ */
+function hasPath(filenames, path) {
+    return filenames.some((file) => file.includes(path))
+}
+
+module.exports = {
+    dedupComment,
+    hasPath,
+}
diff --git a/.gitignore b/.gitignore
index f22af4996bd..fb06d810f42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,38 +1,62 @@
+# Note: also used for `eslint --ignore-path`.
+
 out
 dist
 node_modules
-.vscode-test/
-.nyc_output/
-coverage/
+.vscode-test
+coverage
 *.vsix
+*.zip
 *.bk
 **/.DS_Store
 .idea
 telemetryCache
 quickStart*.html
-README.quickstart.cloud9.md
-README.quickstart.vscode.md
 .gitcommit
-resources/debugger/__pycache__
+__pycache__
+
+# Generated if running the `depcruise` command from the documentation example
+/dependency-graph.svg
 
 # Auto generated definitions
-src/**/*.gen.ts
-# Telemetry definition for testing adding telemetry
-src/shared/telemetry/vscodeTelemetry.json
+packages/*/src/**/*.gen.ts
+!packages/core/src/**/awsSamDebugConfiguration.gen.ts
+!packages/core/src/shared/settings-*.gen.ts
+src.gen/*
 
 # Test reports
-.test-reports/
+.test-reports
 
 # Auto generated type definitions
-src/shared/telemetry/clienttelemetry.d.ts
-src/codewhisperer/client/codewhispererclient.d.ts
-src/codewhisperer/client/codewhispereruserclient.d.ts
+**/src/shared/telemetry/clienttelemetry.d.ts
+**/src/codewhisperer/client/codewhispererclient.d.ts
+**/src/codewhisperer/client/codewhispereruserclient.d.ts
+**/src/auth/sso/oidcclientpkce.d.ts
+**/src/sagemakerunifiedstudio/shared/client/gluecatalogapi.d.ts
+**/src/sagemakerunifiedstudio/shared/client/sqlworkbench.d.ts
 
 # Generated by tests
-src/testFixtures/**/bin
-src/testFixtures/**/obj
+**/src/testFixtures/**/bin
+**/src/testFixtures/**/obj
+
+# Generated by copyFiles.ts
+packages/*/LICENSE
+packages/*/NOTICE
+packages/toolkit/package.nls.json
+packages/toolkit/resources
+packages/amazonq/package.nls.json
+packages/amazonq/resources
 
 # Icons
-resources/icons/cloud9/generated/**
-resources/fonts/aws-toolkit-icons.woff
-resources/css/icons.css
+packages/*/resources/fonts/aws-toolkit-icons.woff
+packages/*/resources/css/icons.css
+
+# local configuration
+.local.env
+*.config.local.json
+
+# Created by `npm run webRun` when testing extension in web mode
+.vscode-test-web
+
+# License scanning output
+licenses-full.json
diff --git a/.husky/pre-commit b/.husky/pre-commit
index e12da904cc5..465dc0a8ba8 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 git secrets --register-aws || (echo 'Please install git-secrets https://github.com/awslabs/git-secrets to check for accidentally commited secrets!' && exit 1)
 git secrets --pre_commit_hook -- ""
 node_modules/.bin/pretty-quick --staged
diff --git a/.npmrc b/.npmrc
new file mode 100644
index 00000000000..190ede5ed35
--- /dev/null
+++ b/.npmrc
@@ -0,0 +1,5 @@
+# ensure that the project uses the public npm registry see: https://docs.npmjs.com/cli/v8/configuring-npm/npmrc
+registry = "https://registry.npmjs.org/"
+# `engine-strict=true` prevents dependabot from working, because _transitive_ deps can set "engines"
+# more restrictive than our own package.json. https://github.com/dependabot/dependabot-core/issues/4072
+engine-strict=false
diff --git a/.nycrc.json b/.nycrc.json
deleted file mode 100644
index a0ea888c8bc..00000000000
--- a/.nycrc.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "all": true,
-    "include": ["src/**", "dist/src/**"],
-    "exclude": ["test/**", "integrationTest/**", "testFixtures/**"]
-}
diff --git a/.prettierignore b/.prettierignore
index c97e66064a4..f3696615413 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,6 +1,16 @@
 out
-resources/endpoints.json
 CHANGELOG.md
-src/shared/telemetry/service-2.json
+.github/PULL_REQUEST_TEMPLATE.md
 .changes
+*.d.ts
+*.gen.ts
+dist
+src.gen/**
+
+# Duplicate entries because prettier can be ran from root or within the workspace/subpackage.
+# TODO: Avoid this.
+src/shared/telemetry/service-2.json
 src/testFixtures/**
+
+packages/core/src/shared/telemetry/service-2.json
+packages/core/src/testFixtures/**
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 4135216c6d0..c5faaa009d6 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,5 +1,3 @@
 {
-    // See http://go.microsoft.com/fwlink/?LinkId=827846
-    // for the documentation about the extensions.json format
-    "recommendations": ["dbaeumer.vscode-eslint", "eg2.vscode-npm-script"]
+    "recommendations": ["amodio.tsl-problem-matcher", "dbaeumer.vscode-eslint"]
 }
diff --git a/.vscode/launch.json b/.vscode/launch.json
deleted file mode 100644
index fa24e09328d..00000000000
--- a/.vscode/launch.json
+++ /dev/null
@@ -1,130 +0,0 @@
-// A launch configuration that compiles the extension and then opens it inside a new window
-// Use IntelliSense to learn about possible attributes.
-// Hover to view descriptions of existing attributes.
-// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Extension",
-            "type": "extensionHost",
-            "request": "launch",
-            "debugWebviews": true,
-            "rendererDebugOptions": {
-                "urlFilter": "*amazonwebservices.aws-toolkit-vscode*",
-                "webRoot": "${workspaceFolder}"
-            },
-            "runtimeExecutable": "${execPath}",
-            "args": ["--extensionDevelopmentPath=${workspaceFolder}"],
-            "env": {
-                "SSMDOCUMENT_LANGUAGESERVER_PORT": "6010",
-                "WEBPACK_DEVELOPER_SERVER": "http://localhost:8080"
-            },
-            "outFiles": ["${workspaceFolder}/dist/**/*.js"],
-            "preLaunchTask": "watch"
-        },
-        {
-            "name": "Attach to ASL Server",
-            "type": "node",
-            "request": "attach",
-            "port": 6009,
-            "restart": true,
-            "outFiles": ["${workspaceRoot}/dist/src/stepFunctions/asl/**.js"]
-        },
-        {
-            "name": "Attach to SSM Document Language Server",
-            "type": "node",
-            "request": "attach",
-            "port": 6010,
-            "restart": true,
-            "outFiles": ["${workspaceRoot}/dist/src/ssmDocument/ssm/ssmServer.js"]
-        },
-        {
-            "name": "Extension (webpack)",
-            "type": "extensionHost",
-            "request": "launch",
-            "runtimeExecutable": "${execPath}",
-            "args": ["--extensionDevelopmentPath=${workspaceFolder}"],
-            "outFiles": ["${workspaceFolder}/dist/**/*.js"],
-            "preLaunchTask": "npm: compile"
-        },
-        {
-            "name": "Extension Tests",
-            "type": "extensionHost",
-            "request": "launch",
-            "runtimeExecutable": "${execPath}",
-            "args": [
-                "--disable-extensions",
-                "--extensionDevelopmentPath=${workspaceFolder}",
-                "--extensionTestsPath=${workspaceFolder}/dist/src/test/index",
-                "${workspaceRoot}/dist/src/testFixtures/workspaceFolder"
-            ],
-            "env": {
-                "DEVELOPMENT_PATH": "${workspaceFolder}",
-                "AWS_TOOLKIT_AUTOMATION": "local"
-            },
-            "outFiles": ["${workspaceFolder}/dist/**/*.js"],
-            "preLaunchTask": "${defaultBuildTask}"
-        },
-        {
-            "name": "Extension Tests (current file)",
-            "type": "extensionHost",
-            "request": "launch",
-            "runtimeExecutable": "${execPath}",
-            "args": [
-                "--disable-extensions",
-                "--extensionDevelopmentPath=${workspaceFolder}",
-                "--extensionTestsPath=${workspaceFolder}/dist/src/test/index.js",
-                "${workspaceRoot}/dist/src/testFixtures/workspaceFolder"
-            ],
-            "env": {
-                "TEST_FILE": "${relativeFile}",
-                "DEVELOPMENT_PATH": "${workspaceFolder}",
-                "AWS_TOOLKIT_AUTOMATION": "local"
-            },
-            "outFiles": ["${workspaceFolder}/dist/**/*.js"],
-            "preLaunchTask": "${defaultBuildTask}"
-        },
-        {
-            "name": "Integration Tests",
-            "type": "extensionHost",
-            "request": "launch",
-            "runtimeExecutable": "${execPath}",
-            "args": [
-                "${workspaceFolder}/dist/src/testFixtures/workspaceFolder",
-                "--extensionDevelopmentPath=${workspaceFolder}",
-                "--extensionTestsPath=${workspaceFolder}/dist/src/integrationTest/index.js"
-            ],
-            "env": {
-                "DEVELOPMENT_PATH": "${workspaceFolder}",
-                "AWS_TOOLKIT_AUTOMATION": "local"
-            },
-            "outFiles": ["${workspaceFolder}/dist/**/*.js"],
-            "preLaunchTask": "${defaultBuildTask}"
-        },
-        {
-            "name": "Integration Tests (current file)",
-            "type": "extensionHost",
-            "request": "launch",
-            "runtimeExecutable": "${execPath}",
-            "args": [
-                "${workspaceFolder}/dist/src/testFixtures/workspaceFolder",
-                "--extensionDevelopmentPath=${workspaceFolder}",
-                "--extensionTestsPath=${workspaceFolder}/dist/src/integrationTest/index.js"
-            ],
-            "env": {
-                "TEST_FILE": "${relativeFile}",
-                "DEVELOPMENT_PATH": "${workspaceFolder}",
-                "AWS_TOOLKIT_AUTOMATION": "local"
-            },
-            "outFiles": ["${workspaceFolder}/dist/**/*.js"],
-            "preLaunchTask": "${defaultBuildTask}"
-        }
-    ],
-    "compounds": [
-        {
-            "name": "Extension + Attach to SSM Document Language Server",
-            "configurations": ["Extension", "Attach to SSM Document Language Server"]
-        }
-    ]
-}
diff --git a/.vscode/settings.json b/.vscode/settings.json
index d5240393191..f954c48cf36 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -11,5 +11,6 @@
     },
     "typescript.preferences.importModuleSpecifier": "relative",
     "javascript.preferences.importModuleSpecifier": "relative",
-    "typescript.tsdk": "node_modules/typescript/lib"
+    "typescript.tsdk": "node_modules/typescript/lib",
+    "npm.packageManager": "npm"
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
deleted file mode 100644
index 1ffa27b1082..00000000000
--- a/.vscode/tasks.json
+++ /dev/null
@@ -1,76 +0,0 @@
-// See https://go.microsoft.com/fwlink/?LinkId=733558
-// for the documentation about the tasks.json format
-{
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "watch",
-            "type": "npm",
-            "script": "watch",
-            "problemMatcher": "$tsc-watch",
-            "isBackground": true,
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
-            "dependsOn": ["serve"]
-        },
-        {
-            "label": "serve",
-            "type": "npm",
-            "script": "serve",
-            "group": "build",
-            "isBackground": true,
-            "problemMatcher": {
-                "owner": "custom",
-                "pattern": {
-                    "regexp": ".",
-                    "file": 1,
-                    "location": 2,
-                    "message": 3
-                },
-                "background": {
-                    "activeOnStart": true,
-                    "beginsPattern": "Project is running at",
-                    "endsPattern": "compiled successfully"
-                }
-            }
-        },
-        {
-            "type": "npm",
-            "script": "lint",
-            "problemMatcher": "$eslint-stylish"
-        },
-        {
-            "type": "npm",
-            "script": "lintfix",
-            "problemMatcher": "$eslint-stylish"
-        },
-        {
-            "type": "npm",
-            "script": "compile",
-            "dependsOn": ["Kill Tasks"],
-            "problemMatcher": "$tsc"
-        },
-        {
-            "type": "npm",
-            "script": "clean",
-            "dependsOn": ["Kill Tasks"],
-            "problemMatcher": []
-        },
-        {
-            "label": "Kill Tasks",
-            "type": "process",
-            "command": "${input:killTasks}",
-            "problemMatcher": []
-        }
-    ],
-    "inputs": [
-        {
-            "id": "killTasks",
-            "type": "command",
-            "command": "workbench.action.tasks.terminate",
-            "args": "terminateAll"
-        }
-    ]
-}
diff --git a/.vscodeignore b/.vscodeignore
deleted file mode 100644
index 86b0cff0376..00000000000
--- a/.vscodeignore
+++ /dev/null
@@ -1,20 +0,0 @@
-# Ignore everything by default. #1899
-*
-*/**
-
-# Allowlist
-!dist/*
-!dist/libs
-!dist/*/!(testFixtures|test)/**/!(*.*.map)
-!dist/*/!(*.*.map)
-!resources/**
-!syntaxes/**
-!templates/**
-!types/**
-!LICENSE
-!NOTICE
-!package.json
-!package.nls.json
-!quickStart**
-!README.**
-!CHANGELOG.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index eb12dc02d35..00000000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,534 +0,0 @@
-## 1.62.0 2023-01-31
-
-- **Bug Fix** SAM template.yaml syntax support for PayloadFormatVersion, HttpApi event source, HttpApiFunctionAuth #2867
-- **Bug Fix** iam: ignore permission check when denial comes from organization csp policy
-- **Bug Fix** Improve extension start-up performance, especially on devices with slower file systems
-- **Bug Fix** Duplicate resource type definitions break the "Resources" node (#3132)
-- **Bug Fix** SAM template.yaml syntax support for FunctionResponseTypes #2924
-- **Feature** SAM: run/debug now works for a larger variety of TypeScript projects
-- **Feature** Upload Lambda wizard will skip prompts and auto select parent directory when invoked from a template file.
-
-## 1.61.0 2023-01-12
-
-- **Bug Fix** AWS regions are not dynamically fetched by the Toolkit
-- **Bug Fix** S3: saving files from the editor overwrites existing content types
-- **Bug Fix** S3: file editor fails on binary files with no file extension
-- **Feature** CodeWhisperer: more responsive Auto-Suggestions
-- **Feature** Copy Lambda Function URL in AWS Explorer
-
-## 1.60.0 2022-12-16
-
-- **Bug Fix** CodeWhisperer: fix potential undefined reference
-
-## 1.59.0 2022-12-15
-
-- **Bug Fix** Help button on the "save connection" prompt does nothing
-- **Bug Fix** CodeWhisperer may alter editor.hover.enabled configuration
-- **Feature** CodeWhisperer: Add 'Do not show again' button to authentication migration prompt
-
-## 1.58.0 2022-12-06
-
-- **Feature** S3: "Download As" action defaults to the last-used download path.
-- **Feature** Amazon CodeCatalyst: faster listing of repositories and Dev Environments
-- **Feature** Cloud9: browse and generate code for EventBridge Schemas from AWS Explorer
-- **Feature** Amazon CodeCatalyst: Connecting to AWS Builder ID when coming from the browser has been made easier
-
-## 1.57.0 2022-12-01
-
-- **Feature** Amazon CodeCatalyst: Connect VS Code to your remote Dev Environments.
-- **Feature** Amazon CodeCatalyst: Clone your repositories to your local workspace.
-- **Feature** Amazon CodeCatalyst: Connect using your AWS Builder ID.
-
-## 1.56.0 2022-11-28
-
-- **Feature** Amazon CodeWhisperer now adds new access methods with AWS Builder ID and AWS IAM Identity Center to enable and get started. 
-- **Feature** Amazon CodeWhisperer recommendations are more context aware. We are removing the overlaps from CodeWhisperer suggestions specifically when the cursor is inside a code block.
-- **Feature** Amazon CodeWhisperer now supports TypeScript and C# programming languages.
-- **Feature** Amazon CodeWhisperer is now available as a supported feature and no longer an experimental feature.
-- **Feature** Amazon CodeWhisperer now supports JavaScript for Security Scan to catch security vulnerabilities.
-
-## 1.55.0 2022-11-23
-
-- **Bug Fix** logging: `aws.viewLogsAtMessage` no longer fails when the log message cannot be found
-- **Feature** SAM: the `Sync SAM Application` command remembers your most recent selections per-region.
-- **Feature** SAM: deployment of CloudFormation templates now uses `sam sync` by default, reducing the amount of time it takes to deploy to AWS. The `aws.samcli.legacyDeploy` setting can be used to revert to the old experience.
-
-## 1.54.0 2022-11-19
-
-- **Bug Fix** JSON-schemas download logic is brittle #2957
-- **Bug Fix** "Connect" and "Choose Profile" open create credentials wizard/profile selector when credentials aren't present in aws configs
-- **Feature** SAM: create, run and debug nodejs18.x Lambdas
-- **Feature** New credentials experience. Includes the ability to set up SSO ("IAM Identity Center") from AWS Toolkit (`AWS: Connect to AWS` > `Add New Connection`)
-
-## 1.53.0 2022-10-24
-
-- **Bug Fix** Execessive CodeWhisperer latency caused by unnecessary refreshing of credentials
-- **Bug Fix** CodeWhisperer auto trigger not working correctly in certain circumstances
-
-## 1.52.0 2022-10-20
-
-- **Bug Fix** CodeWhisperer left/right arrow keybinding conflict with other plugins
-- **Feature** Enable syntax features for untitled (unsaved) cloudformation/sam yaml files
-
-## 1.51.0 2022-10-01
-
-- **Bug Fix** styling issue in CodeWhisperer reference log
-- **Bug Fix** CodeWhisperer duplicate closing bracket when using recommendation inside brackets
-- **Bug Fix** CodeWhisperer triggered by React plugin generated code snippets
-- **Bug Fix** cached ECS/EC2 credentials not refreshed when expired
-- **Bug Fix** malformed ECS icons on recent versions of VS Code
-- **Bug Fix** CodeWhisperer sometimes edits user's code
-- **Feature** running commands on ECS tasks can now be cancelled
-- **Feature** "AWS (Developer)" menu now includes a "Show Global State" item
-- **Feature** Resources (in AWS Explorer) can list more resource types for EC2, IoT, RDS, Redshift, NetworkManager, and other services
-- **Feature** Prompt users to install YAML plugin when AWSTemplateFormatVersion becomes available in their YAML document
-- **Feature** ECS tasks can be opened up in the terminal
-- **Feature** Improved CodeWhisperer inline suggestion experience
-
-## 1.50.0 2022-09-13
-
-- **Bug Fix** Debugging Python image-based lambdas fails with `Init failed error=exec: "-m": executable file not found`
-- **Feature** if "Create Credentials Profile" fails, error message now shows "Edit Credentials" button
-- **Feature** Decrease the amount of space SAM/CFN schemas take on the status bar
-- **Feature** CodeWhisperer now supports .jsx files
-
-## 1.49.0 2022-08-29
-
-- **Bug Fix** CodeWhisperer adds redundant closing brackets/parens/braces
-- **Feature** Don't open webviews in a split window (except SAM debug configuration editor).
-- **Removal** Python 3.6 is no longer supported
-
-## 1.48.0 2022-08-15
-
-- **Bug Fix** "API proposal" error on vscode 1.63 or older
-
-## 1.47.0 2022-08-06
-
-- **Bug Fix** Delve debugger installation fails for Go Lambdas on MacOS
-- **Bug Fix** restored `Connect to AWS` command (alias to the `Choose AWS Profile` command)
-- **Bug Fix** CodeWhisperer: when pressing up or down does not move cursor when suggestion is active
-- **Bug Fix** CodeWhisperer access token validation may sometimes fail
-- **Bug Fix** "Connect to AWS" does not handle missing credentials file
-- **Feature** basic syntax highlighting for ~/.aws/credentials and ~/.aws/config files
-- **Feature** `Choose AWS Profile` quickpick now includes an `Edit Credentials` action
-- **Feature** Add `Edit Credentials` command which opens all known credential files
-- **Feature** CodeWhisperer: References include a link to the source repository if possible.
-- **Feature** Auto-connect tries a maximum of one non-default profile instead of three
-
-## 1.46.0 2022-07-25
-
-- **Bug Fix** "Read-only file system" error when deploying or debugging a SAM project #2395
-
-## 1.45.0 2022-07-07
-
-- **Bug Fix** `Add SAM Debug Configuration` codelenses in source files are now disabled by default. (To enable the codelenses, use the `AWS: Toggle SAM hints in source files` command or the `Enable SAM hints` setting.)
-- **Bug Fix** CodeWhisperer features were not fully disabled if the experiment was disabled
-- **Bug Fix** 'security token expired' errors when using CodeWhisperer in Cloud9 with managed credentials
-
-## 1.44.0 2022-06-30
-
-- **Bug Fix** Fixed a bug where CodeWhisperer incorrectly changes the `snippetSuggestions` setting in VSCode
-
-## 1.42.0 2022-06-23
-
-- **Feature** [CodeWhisperer](https://aws.amazon.com/codewhisperer) uses machine learning to generate code suggestions from the existing code and comments in your IDE. Supported languages include: Java, Python, and JavaScript.
-
-## 1.41.0 2022-06-22
-
-- **Bug Fix** Credentials are now automatically refreshed on certain AWS API errors
-
-## 1.40.0 2022-06-17
-
-- **Bug Fix** The `Upload Lambda` command now automatically causes the Toolkit to login
-- **Bug Fix** S3 "Presigned URL" feature may silently fail #2687
-- **Bug Fix** Fix issue where some http errors were logging undefined on error
-- **Feature** UI: buttons for Lambda invoke, API invoke, and other forms are now always visible at the top of the form
-
-## 1.39.0 2022-06-06
-
-- **Bug Fix** StepFunctions: allow state machines with non-object values for Parameters property
-- **Bug Fix** Fix incorrect use of Markdown in new SAM application READMEs
-- **Bug Fix** Fix: syntax support (JSON schemas) for CloudFormation/SAM yaml sometimes doesn't work
-- **Bug Fix** Credential profiles that do not require user-input now correctly refresh when expired
-- **Feature** "Upload Lambda" from any folder in VS Code File Explorer
-- **Feature** "Send Feedback" form always enables Send button and doesn't require text input
-- **Feature** SAM: create, run and debug nodejs16.x Lambdas
-- **Feature** CDK features are now found in the _Developer Tools_ view. This view will contain more ways to work with local project resources in future releases.
-
-## 1.38.0 2022-05-12
-
-- **Breaking Change** Removed the `aws.onDefaultRegionMissing` setting
-- **Bug Fix** SAM template.yaml syntax support for condition, requestmodel, requestparameters, custom resources, SSMParameterReadPolicy and AWSSecretsManagerGetSecretValuePolicy
-- **Bug Fix** Fixed issue with API Gateway 'Invoke on AWS' resource names always showing 'resource.path'
-- **Bug Fix** S3 File Viewer: file paths containing reserved URI characters are now handled correctly
-- **Feature** `Edit SAM Debug Configuration` and `View Toolkit Logs` commands are now shown in the AWS Explorer main menu
-- **Feature** Lambda: Use Upload Lambda from a folder, template file, or the command palette.
-- **Feature** renamed `SAM Debug Configuration Editor` command to `Edit SAM Debug Configuration`
-- **Feature** SAM run/debug now uses the current active credentials (if the `aws.credentials` launch-config field is not set)
-- **Feature** Show "Add Debug Config" codelens in JS/TS files even if package.json is missing #2579
-- **Feature** "Show or Hide Regions" is now one command that supports multiple selections
-- **Feature** added `Show AWS Commands...` command to AWS Explorer menu
-- **Feature** Open schemas directly when clicking on schema item nodes
-
-## 1.37.0 2022-03-25
-
-- **Bug Fix** SAM run/debug: slow debugger attachment for API configurations now shows a cancellable notification instead of automatically failing
-- **Feature** "Adding Go (Golang) as a supported language for code binding generation through the EventBridge Schemas service"
-
-## 1.36.0 2022-03-03
-
-- **Bug Fix** Step Functions: fixed issue with opening a graph render from the editor
-- **Bug Fix** ECS: avoid null reference error when loading nodes #2441
-- **Feature** SAM/Lambda: add support for .NET 6 (dotnet6)
-- **Feature** ECS: Container node displays when there is no running containers
-- **Feature** Cloud9: user can choose which Resources to show
-- **Feature** ECS: Toolkit checks if the current credentials have permissions for "Run Command in Container"
-
-## 1.35.0 2022-01-13
-
-- **Bug Fix** Schemas: handle errors for invalid settings configurations on activation
-- **Bug Fix** Logging: Toolkit logs are now cleaned up automatically by the extension to prevent excessive storage consumption
-- **Bug Fix** fix newline in 'About Toolkit' command
-- **Bug Fix** S3: fix 'Upload to Parent...' command
-- **Bug Fix** Credentials: profile field names no longer need to be all lowercase
-- **Feature** ECS Exec: only show tasks that have the ECS Exec agent. #2416
-- **Feature** IoT: add attached policies in Things subtree
-
-## 1.34.0 2021-11-22
-
-- **Bug Fix** Improve auto-connect reliability
-- **Bug Fix** Toolkit appeared stuck at "Connecting..."
-- **Bug Fix** CDK: fixed performance issue with project detection. Detection is no longer limited to a depth of two directories.
-- **Feature** S3: Upload now supports multiple files
-- **Feature** Add AWS IoT Explorer
-- **Feature** AWS Explorer shows ECS resources and supports "Run command in container"
-
-## 1.33.0 2021-11-04
-
-- **Breaking Change** Bumping VS Code minimum version: 1.42.0 => 1.44.2
-- **Bug Fix** Credentials: Handle case when running in an ECS container but no credentials are available.
-- **Bug Fix** Resources: Avoid redundant close of active editor when resource documents are explicitly closed
-
-## 1.32.0 2021-10-21
-
-- **Breaking Change** DEPRECATION: SAM actions using `dotnetcore2.1` runtime (Phase 2 Lambda deprecation)
-- **Bug Fix** Resources: Better handling of unsupported resource actions
-- **Bug Fix** Resources: Filter S3 bucket resources by region in list view
-- **Bug Fix** Resources: Exclude resource types that do not support LIST in Cloud9
-- **Bug Fix** Resources: Handle undefined type schema properties
-
-## 1.31.0 2021-10-14
-
-- **Bug Fix** StepFunctions: "Publish" command now asks for target region
-- **Feature** SAM "Edit Debug Configuration" UI is no longer "Beta"
-- **Feature** Surface read-only support for hundreds of resources under the Resources node in the AWS Explorer
-- **Feature** Create new Step Functions state machine template from AWS Explorer
-
-## 1.30.0 2021-10-04
-
-- **Breaking Change** DEPRECATION:  SAM actions using `python2.7` and `nodejs10.x` runtimes (Phase 2 Lambda deprecation)
-- **Breaking Change** SAM run/debug: The launch configuration options 'timeoutSec' and 'memoryMb' no longer apply to template or API targets
-- **Bug Fix** SAM/nodejs: do not check for "tsc" (typescript compiler) for plain javascript projects
-- **Bug Fix** SAM Debug Configuration Editor: All fields will persist after Save or Invoke action.
-- **Bug Fix** SAM: refresh timeout timer during build step
-- **Bug Fix** SAM/typescript: fix run/debug for target=code if source dir name has special chars
-- **Bug Fix** App Runner: fix issue with create wizard failing at the end after backing out of the select file dialog
-- **Feature** SAM: `arm64` support (through SAM CLI's Architectures property) on select runtimes
-- **Feature** Step Functions: Adds ability to render state machine graph from AWS Explorer.
-- **Feature** Credentials: SSO profiles will reconnect on startup if the token is still valid
-- **Feature** SAM run/debug: You can now change where SAM CLI builds your lambda by adding a 'buildDir' field to your launch configuration's "sam" section
-- **Feature** UI: Toolkit statusbar now shows on the left and takes less space
-- **Feature** Step Functions: enable visualizing ASL files in YAML (not asl-yaml) mode.
-- **Feature** SAM/CFN schema support: avoid changes to user settings, improve reliability.
-- **Feature** Adds Command Palette and CDK Explorer tree visualization capability for Step Functions state machines defined using the AWS CDK
-- **Feature** SAM/typescript: search node_modules in the workspace for "tsc" typescript compiler
-- **Feature** SAM Debug Configuration Editor: The UI has been updated to more closely match VS Code's style
-
-## 1.29.0 2021-08-19
-
-- **Bug Fix** SAM: the Toolkit now correctly skips sending '--env-vars' when no environment variables are present in the launch config
-- **Bug Fix** Credentials: correctly handle different `source_profile` combinations
-- **Bug Fix** SAM/CFN: fix JSON schema path causing a symlink on some operating systems
-- **Bug Fix** SAM/CFN JSON schema: schemas now load correctly on first-load
-- **Bug Fix** SAM/CFN JSON schema: write yaml.customTags to user-global settings (instead of workspace-local)
-- **Feature** SAM Application support for the python3.9 runtime
-
-## 1.28.0 2021-08-09
-
-- **Bug Fix** SAM Invoke Webview: fix 'Show All Fields' causing a blank page
-- **Bug Fix** CloudWatch Logs: show a placeholder message instead of an error when no logs exist
-- **Feature** Credentials: support for ECS container provided credentials
-- **Feature** Credentials: Improved guidance during new credential profile creation
-- **Feature** Added Getting Started walkthroughs to aid in configuring the Toolkit
-- **Feature** S3: new command/action: 'Generate Presigned URL'
-- **Feature** App Runner: You can now create, pause, resume, deploy, and delete App Runner services within the AWS explorer.
-- **Feature** New SAM applications come with toolkit-specific instructions
-- **Feature** Apply JSON schemas to Cloudformation and SAM templates (must be named `template.yaml`)
-
-## 1.27.0 2021-07-01
-
-- **Bug Fix** SAM: fixed issue with downloading deployed lambdas
-- **Bug Fix** Credentials: Validate attached IAM role when deciding if EC2 instance credentials are available
-
-## 1.26.0 2021-06-30
-
-- **Bug Fix** S3: improved performance in private VPC (via getBucketLocation)
-- **Bug Fix** Add new setting `aws.samcli.lambda.timeout` and remove `aws.samcli.debug.attach.timeout.millis` setting. The new setting sets the maximum time to wait for a local Lambda to start.
-- **Bug Fix** CloudWatch Logs: timestamps were incorrectly shown in 12 hour notation instead of 24 hour notation
-- **Bug Fix** Settings: write 'recently used buckets' setting as JSON object
-- **Feature** Renamed "Import Lambda" -> "Download Lambda" for clarity
-- **Feature** New command: `AWS: Upload current file to S3`
-- **Feature** File Explorer: "Deploy SAM Application" is available from the context-menu for template.yaml files #263
-- **Feature** SAM run/debug: support TypeScript SAM Lambda projects #1845
-- **Feature** credentials: support for credentials provided by EC2 instance metadata and environment variables
-
-## 1.25.0 2021-05-10
-
-- **Bug Fix** Credentials: cannot access 'canAutoConnect' of undefined
-- **Feature** UX: Add progress notification when connecting to AWS
-- **Feature** SAM run/debug: fail early so that build/invoke errors are more obvious #1689
-- **Feature** CDK: search for CDK projects up to 2 levels deep (previously 1)
-- **Feature** CDK: menu includes standard items if AWS view is hidden
-- **Feature** Skip auto-connect until AWS Explorer is shown #1433
-- **Feature** Toggle CodeLenses via "AWS: Toggle SAM hints in source files" command
-- **Feature** SAM run/debug: Add support for Go 1.x
-- **Feature** UX: write logs to extension's 'globalStoragePath' for all operating systems #1692
-- **Feature** Create aws-sam debug configurations via Command Palette using the `AWS: Add SAM Debug Configuration` command
-- **Removal** Settings: remove "Enable CDK Explorer" option (VSCode has built-in support for showing/hiding panels already)
-
-## 1.24.0 2021-04-22
-
-- **Bug Fix** SAM Python debugging: restore retry to ensure successful attach #1666
-- **Feature** SAM run/debug: Add support for Java 8, Java 8.al2, and Java 11 runtimes using Maven and Gradle
-- **Feature** CDK panel now appears below the AWS Explorer instead of the VSCode File Explorer
-- **Feature** UI: Refresh AWS Explorer after performing "Deploy SAM application"
-
-## 1.23.0 2021-04-16
-
-- **Feature** Beta UI for editing and directly invoking AWS SAM debug configurations
-- **Feature** AWS Explorer: clicking "Failed to load" node navigates to failure details #1569
-- **Feature** SAM Deploy wizard: show recently-used S3 buckets; ability to input S3 bucket name manually #1527
-- **Feature** SAM run/debug: Add support for Java 8, Java 8.al2, and Java 11 runtimes using Maven and Gradle
-- **Feature** Step Functions: adds ability to publish/update state machine from ASL YAML files.
-- **Feature** SAM run/debug: improve display of partial lines #1581
-- **Feature** "Create Lambda SAM Application": navigate to README.md instead of template.yaml #1574
-
-## 1.22.0 2021-03-19
-
-- **Bug Fix** fix unwanted "invalid SAM CLI" error on startup
-- **Feature** StepFunctions: show "View Logs" button on failure
-
-## 1.21.0 2021-03-17
-
-- **Breaking Change** SAM debug: remove nodejs8.10 support
-- **Bug Fix** Toolkit correctly handles failures when importing Lambdas for supported language families that have not been added explicitly as importable
-- **Bug Fix** Launch configurations created by the Toolkit use correct relative paths
-- **Feature** Support ${workspaceFolder} in aws-sam debug configs
-- **Feature** Renaming "Create new SAM Application" to "Create Lambda SAM Application" to make it clear that this is an entrypoint for creating a Lambda function
-- **Feature** SAM deploy wizard: optionally create a new S3 bucket
-
-## 1.20.0 2021-02-04
-
-- **Feature** SAM templates handle Global values correctly when Resource-level fields are missing.
-- **Feature** Support for SAM CLI 1.17: SAM create/run nodejs14.x
-
-## 1.19.0 2021-02-01
-
-- **Bug Fix** Schemas: download failure would not trigger code generation under certain conditions
-- **Feature** "Create new SAM Application" command suggests a more-intuitive name
-- **Feature** Support for SAM CLI 1.16: SAM create/run dotnet5.0
-- **Feature** List API Gateway names with their ID (so Toolkit can list APIs with identical names)
-- **Feature** Improved validation when searching for SAM CLI #1465
-
-## 1.18.0 2021-01-07
-
-- **Bug Fix** WatchedFiles improvements (Windows) #1416
-- **Bug Fix** SAM debug: Fix deployment for image based lambdas in sam cli 1.14+ #1448
-- **Bug Fix** SAM debug: fix payload JSON validation #1440
-- **Feature** Adds ASL YAML linting and visualization support.
-- **Feature** SAM debug: use debugpy instead of ptvsd #1365
-- **Feature** SAM debug: Ignore build failures and attempt to continue invoke/deploy
-- **Feature** SAM debug: detect & surface "low disk space"
-- **Feature** Adds Amazon States Language (YAML) format to the ASL Language Server. Adds option to choose YAML format when creating new Step Functions state machine from a template.
-
-## 1.17.0 2020-12-11
-
-- **Bug Fix** Automatically add runtime to the autogenerated launch configuration for Image-based Lambdas
-- **Feature** API Gateway support: debug local SAM resources, list and run remote resources
-
-## 1.16.0 2020-12-01
-
-- **Bug Fix** Fix showing templates from .aws-sam in Sam Deploy (#1380)
-- **Bug Fix** Fix creating S3 buckets in us-east-1
-- **Bug Fix** Retain view state for Step Functions and Lambda when changing tabs
-- **Feature** Container Image Support in Lambda
-- **Feature** Add an explorer node for managing ECR repositories
-- **Feature** NodeJS and Python Lambda functions can be imported from an AWS account into a local workspace
-- **Feature** Lambda functions can be updated with code from ZIP files and directories containing built or unbuilt code
-- **Feature** Codelenses in source files can create launch configurations that reference template.yaml resources.
-- **Feature** "Create new SAM Application" action is available from the context menu of Lambda nodes in the AWS Explorer
-- **Feature** The amount of CloudWatch Logs entries retrieved per request is now configurable.
-- **Feature** "Deploy SAM Application" action is available from the context menu of Lambda, CloudFormation, and Region nodes in the AWS Explorer
-
-## 1.15.0 2020-10-06
-
-- **Bug Fix** Fix issues which prevented SAM debugging in WSL #1300
-- **Feature** Add support for debugging dotnet 3.1 local lambdas (requires minimum SAM CLI version of 1.4.0)
-- **Feature** Add Arn and Region to Lambda invoke view
-
-## 1.14.0 2020-09-30
-
-- **Bug Fix** Fix ASL validation bug marking states as unreachable when defined before a Choice state
-- **Feature** Add AWS Systems Manager integration to allow users to view, create and publish Automation documents. Support for code completion and validation with templates and code snippets to help users author their Automation documents.
-- **Feature** When deploying a SAM application, the S3 bucket is now chosen from a list. Previously, the bucket name had to be typed in.
-
-## 1.13.0 2020-08-24
-
-- **Feature** Toolkit automatically adds a launch configuration to the workspace when creating SAM applications
-- **Feature** CloudWatch Logs functionality
-- **Feature** Amazon States Language Server: Add validation for new ASL specification released on August 11.
-
-## 1.12.0 2020-07-30
-
-- **Feature** A new experience for locally Running/Debugging Lambdas with SAM that uses VS Code launch configurations (PR #1215)
-- **Feature** SAM Apps that are in SAM Templates are now run/debugged through the Run panel via `aws-sam` Launch Configurations.
-- **Feature** Add S3 integration to allow users to create buckets, list buckets, list files and folders, upload files, download files, delete files, delete buckets, and more!
-
-## 1.11.0 2020-07-18
-
-- **Breaking Change** Bumped minimum (inclusive) supported SAM CLI version from 0.38.0 to 0.47.0.
-- **Bug Fix** Amazon States Language Server: Replaces "True" strings of End with boolean in snippets.
-- **Bug Fix** Makes the ItemsPath property of Map state optional in ASL linter.
-- **Bug Fix** Amazon States Language Server: Adds validation of next property for Catch of Map state.
-- **Bug Fix** Amazon States Language Server: Adds missing "Comment" property for ChoiceRules, Catcher and Retrier.
-- **Feature** Amazon States Language Server: Adds validation of JSON Paths within Parameters.
-- **Feature** Added `dotnetcore3.1` app creation and local run support. Local debug is not currently supported.
-- **Feature** support SAM CLI version 1.x
-
-## 1.10.0 2020-05-27
-
-- **Feature** Add basic visualisation capability for step function state machines defined in YAML.
-- **Feature** Step Functions Linter: Resource property of Task state will accept any string instead of just arn. Additional disallowed properties will be marked as invalid.
-- **Feature** If a file conflict is detected when downloading event schemas code bindings, a confirmation prompt is shown
-
-## 1.9.0 2020-04-29
-
-- **Breaking Change** Bumping VS Code minimum version: 1.31.1 => 1.42.0
-- **Bug Fix** Bug fixes for step functions language server.: One is related to the error when there is "Default" property missing on "Choice" state.  Second,  “Unreachable state” error when the default state is declared before being referenced by “Choice” state.
-- **Bug Fix** Fixed a validation issue with VS Code's `settings.json` and `launch.json` files (#1027)
-- **Feature** Add context menu command to copy ARNs from the AWS Explorer
-- **Feature** Bumped maximum (exclusive) supported SAM CLI version from 0.50.0 to 0.60.0.
-- **Feature** Users are shown a notification reflecting changes to how usage data is gathered. Usage data can still be configured through the editor's settings.
-- **Feature** Visualising of step functions step machines will be allowed when ARN strings within ASL definition are invalid.
-
-## 1.8.0 2020-03-31
-
-- **Bug Fix** SAM applications deployed through the toolkit now support IAM resources with custom names
-- **Bug Fix** Fix issue where CodeLenses appeared on wrong lines in .js files when adding or removing lines
-- **Feature** Toolkit dynamically chooses an available port when debugging SAM applications, starting at port 5858 and counting upwards until one is found
-- **Feature** Rebranding the toolkit as the "AWS Toolkit"
-- **Feature** New Step Function capabilities: Step Function state machine resources are now shown in the AWS Explorer. Language support (auto-completion, validation) for authoring state machine files. State machines can be created from starting templates. State machines can be downloaded from, published to, and executed within an account.
-
-## 1.7.0 2020-02-18
-
-- **Feature** The Toolkit now supports China and GovCloud regions. If you have a shared credentials profile based in one of these regions, you can add a "region" property to that profile, and the Toolkit will know to use a different region set.
-- **Feature** Added the 'About AWS Toolkit' command and menu option to show AWS Toolkit versioning details that are useful to include with bug reports.
-
-## 1.6.1 2020-02-10
-
-- **Bug Fix** Fixed an issue related to toolkit metrics
-
-## 1.6.0 2020-02-06
-
-- **Breaking Change** Minimum version of SAM CLI has been adjusted from 0.32.0 to 0.38.0 to accommodate new SAM application support for EventBridge Schemas
-- **Bug Fix** AWS Explorer no longer shows service nodes under regions where the service is not available (#850)
-- **Bug Fix** Fixed an issue where invalid credentials were reused until VS Code was closed and re-opened, even if the credentials source was updated. It is no longer necessary to restart VS Code. (#705)
-- **Feature** The MFA prompt now shows which MFA Device a code is being asked for.
-- **Feature** When credentials are invalid a notification is shown. To help diagnose these situations, a button was added to the notification that can open the logs.
-- **Feature** Removed the ability to create node.js 8.10 SAM Applications. This runtime has been deprecated. See https://docs.aws.amazon.com/lambda/latest/dg/runtime-support-policy.html for more information.
-- **Feature** When changes are made to Shared Credentials files, they will be picked up by the Toolkit the next time credentials are selected during the 'Connect to AWS' command.
-- **Feature** Added support to locally run SAM applications in containers.
-- **Feature** AWS Explorer now sorts region nodes by the region name
-- **Feature** Credentials were previously shown by their Shared Credentials profile names. They are now displayed in a "type:name" format, to better indicate the type of Credentials being used, and to support additional Credentials types in the future. Shared Credentials are shown with the type "profile".
-- **Feature** Added the ability to create new Serverless Applications with EventBridge Schemas support.
-
-## 1.5.0 2020-01-06
-
-- **Breaking Change** Minimum version of SAM CLI has been adjusted from 0.16.0 to 0.32.0 to accommodate new runtime support
-- **Feature** Bumped maximum (exclusive) supported SAM CLI version from 0.40.0 to 0.50.0.
-- **Feature** SAM Application support for the python3.8 runtime
-- **Feature** Reduced plugin size and startup time significantly
-- **Feature** SAM Application support for the nodejs12.x runtime
-- **Feature** The StatusBar item displaying the current credentials used by the toolkit now shows when no credentials are being used. It can also be clicked to change the Toolkit's active credentials.
-- **Feature** The Toolkit now applies configuration changes to the log level when it changes instead of the next time the toolkit is started (#860)
-- **Feature** The folder depth within a workspace that SAM Template files are searched for is now configurable. Previously, this was fixed at 2.
-
-## 1.4.0 2019-12-02
-
-- **Feature** Added support for Amazon EventBridge schema registry, making it easy to discover and write code for events in EventBridge
-
-## 1.3.0 2019-11-22
-
-- **Bug Fix** AWS Explorer now shows a node indicating when CloudFormation Stacks cannot be found in a region
-- **Bug Fix** AWS Explorer now sorts the resources that belong to each CloudFormation Stack
-- **Bug Fix** AWS Explorer now shows a node indicating when Lambda Functions cannot be found in a region
-- **Feature** CDK projects can now be visualized with the CDK Explorer
-
-## 1.2.0 2019-10-17
-
-- **Bug Fix** Add '--no-interactive' flag to 'sam init' calls when SAM CLI version is greater than or equal to 0.30.0
-- **Feature** Added docker network option support for invoking sam applications
-- **Feature** Ansi codes are removed from text shown in the Output tab when Locally Invoking Lambda handlers
-- **Feature** Adding support for SAM CLI 0.30.0 features in `sam init`: --app-template and --dependency-manager
-- **Feature** Bumped maximum (exclusive) supported SAM CLI version from 0.30.0 to 0.40.0.
-
-## 1.1.0 2019-09-20
-
-- **Bug Fix** Creating SAM Applications into a different folder than the current VS Code workspaces will now open an application file after app creation (#678)
-- **Feature** Support credential_process (#317)
-- **Feature** Improved the description of the selection item when picking a location for a new SAM Application (#673, #675)
-- **Feature** Added JSON validation for ECS task definition intellisense
-- **Feature** Bumped maximum (exclusive) supported SAM CLI version from 0.23.0 to 0.30.0.
-
-## 1.0.0
-
-* A toast greets the user upon launching a new version of the toolkit for the first time which provides a link to a quick start page. This quick start page can be re-accessed through the explorer's context menu. (#610-612)
-* Local Run/Debug now honors MemorySize values from SAM Template file (#509)
-* Local Run/Debug now honors Timeout values from SAM Template file (#510)
-* Local Run/Debug now honors the Globals section from SAM Template file
-* Fixed issue preventing users from connecting with assumed roles (#620)
-* Added ability to report an issue from the AWS Explorer menu (#613)
-* Added SAM Application-related commands to the AWS Explorer menu
-* Removed support for nodejs6.10 SAM Applications
-* Regions that are not in the standard AWS partition have been removed from the UI until proper partition support can be added
-
-## 0.2.1 (Developer Preview)
-
-* Fixed issue preventing users from connecting with assumed roles (#620)
-
-## 0.2.0 (Developer Preview)
-
-* Local Run/Debug is now available for .NET Core 2.1 functions within SAM Applications
-* Local Run/Debug is now available for Python 2.7, 3.6, and 3.7 functions within SAM Applications
-* Local Run/Debug is now available for NodeJS 10.x functions within SAM Applications
-* Local Run/Debug of SAM Lambda Functions now outputs to the Output and Debug Console, and reduces timing issues for attaching the debugger
-* Removed Lambda view that showed the Lambda Policy
-* Removed Lambda view that showed the Lambda Configuration
-* Removed unsupported Lambda runtimes from the 'Create New SAM Application' wizard.
-* The AWS Explorer menu items no longer appear on other VS Code panel menus
-* When creating a new SAM Application, the toolkit now checks for a valid SAM CLI version before prompting the user for inputs
-* When deploying a SAM Application, the toolkit now checks for a valid SAM CLI version before prompting the user for inputs
-* Telemetry now sends AWS account data
-* Minimum SAM CLI version has been bumped to 0.16.0
-
-## 0.1.2 (Developer Preview)
-
-* Bumped maximum (exclusive) supported SAM CLI version from 0.16.0 to 0.23.0.
-
-## 0.1.1 (Developer Preview)
-
-* Updated Marketplace page to display information on how to use the Toolkit once installed
-
-## 0.1.0 (Developer Preview)
-
-* Initial release
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ac024ddc915..9992cd16dcf 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,6 +8,11 @@ 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 subprojects [`packages/toolkit/`](./packages/toolkit/) and [`packages/core/`](./packages/core/).
+See [arch_develop.md](./docs/arch_develop.md#monorepo-structure) to understand the
+structure of this package before contributing.
+
 ### Find things to do
 
 If you're looking for ideas about where to contribute, consider
@@ -24,6 +29,8 @@ To develop this project, install these dependencies:
 -   [Git](https://git-scm.com/downloads)
     -   (optional) Set `git blame` to ignore noise-commits: `git config blame.ignoreRevsFile .git-blame-ignore-revs`
 -   [AWS `git secrets`](https://github.com/awslabs/git-secrets)
+-   [TypeScript + Webpack Problem Matcher](https://marketplace.visualstudio.com/items?itemName=amodio.tsl-problem-matcher)
+    -   Not installing will result in the following error during building: `Error: Invalid problemMatcher reference: $ts-webpack-watch`
 -   (optional) [AWS SAM CLI](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html)
 -   (optional) [Docker](https://docs.docker.com/get-docker/)
 
@@ -35,15 +42,27 @@ Then clone the repository and install NPM packages:
 
 ### Run
 
-You can run the extension from Visual Studio Code:
+Due to the monorepo structure of the project, you must open the project using the
+`aws-toolkit-vscode.code-workspace` project file.
+
+1. Run the `File: Open Workspace from File...` command in vscode.
+2. Select the `aws-toolkit-vscode.code-workspace` project file.
+
+To run the extension from VSCode as a Node.js app:
 
 1. Select the Run panel from the sidebar.
 2. From the dropdown at the top of the Run pane, choose `Extension`.
-3. Press `F5` to launch a new instance of Visual Studio Code with the extension installed and the debugger attached.
+3. Press `F5` to launch a new instance of VSCode with the extension installed and the debugger attached.
+
+To run the extension from VSCode in "web mode" (a browser app, or "PWA"):
+
+1. Select the Run panel from the sidebar.
+2. From the dropdown at the top of the Run pane, choose `Extension (web)`.
+3. Press `F5` to launch a new instance of VSCode (web mode) with the extension installed and the debugger attached.
 
 ### Build
 
-When you launch the extension or run tests from Visual Studio Code, it will automatically build the extension and watch for changes.
+When you launch the extension or run tests from VSCode, it will automatically build the extension and watch for changes.
 
 You can also use these NPM tasks (see `npm run` for the full list):
 
@@ -73,11 +92,31 @@ You can also use these NPM tasks (see `npm run` for the full list):
 
 ### Guidelines
 
+-   Architecture: [arch_overview.md](./docs/arch_overview.md)
 -   Project patterns and practices: [CODE_GUIDELINES.md](./docs/CODE_GUIDELINES.md)
 -   [VS Code Extension Guidelines](https://code.visualstudio.com/api/references/extension-guidelines)
+    -   [Webview guidance](https://code.visualstudio.com/api/ux-guidelines/webviews)
 -   [VS Code API Documentation](https://code.visualstudio.com/api/references/vscode-api)
 -   [VS Code Extension Capabilities](https://code.visualstudio.com/api/extension-capabilities/common-capabilities)
 
+### Prerelease artifacts
+
+-   CI automatically publishes GitHub [prereleases](https://github.com/aws/aws-toolkit-vscode/releases)
+    for `master` and `feature/x` branches, including `.vsix` artifacts which can
+    be used to test the latest build for that branch. Each prerelease and its
+    artifact are continually updated from the HEAD of its branch.
+-   PR artifacts: each pull request is processed by an AWS CodeBuild job which
+    runs all tests and provides the build result via the _Details_ link as shown
+    below.
+    -   <img src="./docs/images/ci-artifact.png" alt="CI artifact" width="512"/>
+
+### Debug failing integration tests
+
+-   Check for recent changes in each of these projects:
+    -   https://github.com/microsoft/vscode-python (releases)
+    -   https://github.com/aws/aws-sam-cli/releases
+    -   https://github.com/aws/aws-sam-cli-app-templates/ (`master` branch, not releases!)
+
 ### Technical notes
 
 -   VSCode extensions have a [100MB](https://github.com/Microsoft/vscode-vsce/issues/179) file size limit.
@@ -96,8 +135,8 @@ You can also use these NPM tasks (see `npm run` for the full list):
 
     1. Declare a global unhandledRejection handler.
         ```ts
-        process.on('unhandledRejection', e => {
-            getLogger('channel').error(
+        process.on('unhandledRejection', (e) => {
+            getLogger().error(
                 localize(
                     'AWS.channel.aws.toolkit.activation.error',
                     'Error Activating {0} Toolkit: {1}',
@@ -113,12 +152,22 @@ You can also use these NPM tasks (see `npm run` for the full list):
     2. Put a breakpoint on it.
     3. Run all tests.
 
+---
+
+### Web Mode
+
+The AWS Toolkit VSCode extension has a support (with limited functionality) for running in a web browser, eg [vscode.dev](https://vscode.dev).
+
+See [web.md](./docs/web.md) for working with the web mode implementation of the extension.
+
+---
+
 ### Test
 
 See [TESTPLAN.md](./docs/TESTPLAN.md) to understand the project's test
 structure, mechanics and philosophy.
 
-You can run tests directly from Visual Studio Code:
+You can run tests directly from VSCode. Due to the monorepo structure of the project, you must [open the project via the `aws-toolkit-vscode.code-workspace` project file](#run).
 
 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.
@@ -127,41 +176,61 @@ You can run tests directly from Visual Studio Code:
 You can also run tests from the command line:
 
     npm run test
-    npm run integrationTest
+    npm run testInteg
 
 Tests will write logs to `./.test-reports/testLog.log`.
 
 #### Run a specific test
 
-To run a single test in VSCode, do any one of:
+To run a single test in VSCode, do any _one_ of the following:
 
 -   Run the _Extension Tests (current file)_ launch-config.
--   Use Mocha's [it.only()](https://mochajs.org/#exclusive-tests) or `describe.only()`.
--   Run in your terminal:
-
+    -   Note: if you don't see this in the vscode debug menu, confirm that you opened the project
+        [via the `aws-toolkit-vscode.code-workspace` project file](#run).
+-   or... Use Mocha's [it.only()](https://mochajs.org/#exclusive-tests) or `describe.only()`.
+-   or... Run in your terminal:
     -   Unix/macOS/POSIX shell:
         ```
-        TEST_FILE=src/test/foo.test npm run test
+        TEST_FILE=../core/src/test/foo.test.ts npm run test
         ```
     -   Powershell:
         ```
-        $Env:TEST_FILE = "src/test/foo.test"; npm run test
+        $Env:TEST_FILE = "../core/src/test/foo.test.ts"; npm run test
         ```
-
--   To run all tests in a particular subdirectory, you can edit
+-   or... To run all tests in a particular subdirectory, you can edit
     `src/test/index.ts:rootTestsPath` to point to a subdirectory:
     ```
     rootTestsPath: __dirname + '/shared/sam/debugger/'
     ```
 
-### Coverage report
+#### Run all tests in a specific folder
+
+To run tests against a specific folder in VSCode, do any one of:
+
+-   Add the TEST_DIR environment variable to one of the testing launch configs and run it
+-   Run in your terminal
+    -   Unix/macOS/POSIX shell:
+        ```
+        TEST_DIR=../core/src/test/foo npm run test
+        ```
+    -   Powershell:
+        ```
+        $Env:TEST_DIR = "../core/src/test/foo"; npm run test
+        ```
+
+#### Run jscpd ("Copy-Paste Detection")
+
+If the "Copy-Paste Detection" CI job fails, you will find it useful to check things locally. To
+check a specific file:
 
-You can find the coverage report at `./coverage/index.html` after running the tests. Tests ran from the workspace launch config won't generate a coverage report automatically because it can break file watching. A few manual steps are needed instead:
+    npx jscpd --config .github/workflows/jscpd.json --pattern packages/…/src/foo.ts
 
--   Run the command `Tasks: Run Build Task` if not already active
--   Instrument built code with `npm run instrument`
--   Exercise the code (`Extension Tests`, `Integration Tests`, etc.)
--   Generate a report with `npm run report`
+See the [jscpd cli documentation](https://github.com/kucherenko/jscpd/tree/master/apps/jscpd) for
+more options.
+
+### Coverage report
+
+You can find the coverage report at `./coverage/amazonq/lcov-report/index.html` and `./coverage/toolkit/lcov-report/index.html` after running the tests. Tests ran from the workspace launch config won't generate a coverage report automatically because it can break file watching.
 
 ### CodeCatalyst Blueprints
 
@@ -171,9 +240,12 @@ You can find documentation to create VSCode IDE settings for CodeCatalyst bluepr
 
 Before sending a pull request:
 
+1. Treat all work as PUBLIC. Private `feature/x` branches will _not_ be squash-merged at release time. This has several benefits:
+    - Avoids mistakes (accidental exposure to public)!
+    - Avoids needing to erase (squash-merge) history.
 1. Check that you are working against the latest source on the `master` branch.
-2. Check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
-3. Open an issue to discuss any significant work.
+1. Check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
+1. Open an issue to discuss any significant work.
 
 To send a pull request:
 
@@ -181,47 +253,91 @@ To send a pull request:
 2. Modify the source; focus on the specific change you are contributing. If you also reformat all the code, it will be hard for us to focus on your change.
     - Read the [project guidelines](#guidelines), this is very important for non-trivial changes.
 3. Commit to your fork [using clear commit messages](#commit-messages).
-4. Update the changelog by running `npm run newChange`.
-    - Note: the main purpose of the `newChange` task is to avoid merge conflicts.
+4. Update the [changelog](#changelog).
 5. [Create a pull request](https://help.github.com/articles/creating-a-pull-request/).
 6. Pay attention to any CI failures reported in the pull request.
 
-### Commit messages
+### Changelog
 
-Generally your PR description should be a copy-paste of your commit message(s).
-If your PR description provides insight and context, that also should exist in
-the commit message. Source control (Git) is our source-of-truth, not GitHub.
+Pull requests that change **customer-impacting behavior** must include a changelog item(s). Run one
+or both of the following commands:
 
-Follow these [commit message guidelines](https://cbea.ms/git-commit/):
-
--   Subject: single line up to 50-72 characters
-    -   Imperative voice ("Fix bug", not "Fixed"/"Fixes"/"Fixing").
--   Body: for non-trivial or uncommon changes, explain your motivation for the
-    change and contrast your implementation with previous behavior.
+-   For changes relevant to Amazon Q:
+    ```
+    npm run newChange -w packages/amazonq
+    ```
+-   For changes relevant to AWS Toolkit:
+    ```
+    npm run newChange -w packages/toolkit
+    ```
 
-    -   Often you can save a _lot_ of words by using this simple template:
-        ```
-        Problem: …
-        Solution: …
-        ```
+The audience for the changelog is _the user_. The changelog is presented to users by VSCode and the
+marketplace. It is a "micro-blog" for advertising improvements to users. It is the _primary_ way of
+communicating changes to customers. Please consider this when writing changelog entries.
+
+Mentioning low-level details like "function x now takes argument y", will not be useful, because it
+doesn't say what that means in terms of the user experience. Instead, describe the effect from the
+user's point of view.
+
+> [!TIP]
+>
+> -   Describe the change in a way that is _meaningful to the customer_. If you can't describe the _customer impact_ then it probably shouldn't be in the changelog.
+>     -   ✅ `Connection wizard sometimes shows the old (stale) connection`
+>     -   ✅ `Faster startup after VSCode restarts`
+>     -   ❌ `Remove the cache when the connection wizard is re-launched` (code internals are not relevant to customers)
+>     -   ❌ `Update telemetry definitions` (not customer-impacting)
+> -   "Bug Fix" changes should describe the _problem being fixed_. Don't say "Fixed" in the
+>     description, it's redundant. Example:
+>     -   ❌ `Fixed S3 bug which caused filenames to be uppercase`
+>     -   ✅ `S3 filenames are always uppercase`
+> -   To update an _existing_ changelog item, just edit its `.changes/next-release/….json` file, you don't need to re-run `npm run newChange`.
+> -   If there are multiple unrelated changes, run `npm run newChange` for each change.
+> -   Include the feature that the change affects, Q, CodeWhisperer, etc.
+
+### Pull request title
+
+The title of your pull request must follow this format (checked by [lintcommit.js](.github/workflows/lintcommit.js)):
+
+-   format: `type(scope): subject...`
+-   type: must be a valid type (`build`, `ci`, `config`, `deps`, `docs`, `feat`, `fix`, `perf`, `refactor`, `style`, `telemetry`, `test`, `types`)
+    -   see [lintcommit.js](.github/workflows/lintcommit.js))
+    -   "chore" is intentionally rejected because it tends to be over-used.
+    -   user-facing changes should always choose "feat" or "fix", and include a [changelog](#changelog) item.
+-   scope: lowercase, <30 chars
+-   subject: must be <100 chars
+
+### Pull request description
+
+Your PR description should provide a brief "Problem" and "Solution" pair. This
+structure often gives much more clarity, more concisely, than a typical
+paragraph of explanation.
+
+    Problem:
+    Foo does nothing when user clicks it.
+
+    Solution:
+    - Listen to the click event.
+    - Emit telemetry on success/failure.
 
-A [good commit message](https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project)
-has a short subject line and unlimited detail in the body.
 [Good explanations](https://nav.al/explanations) are acts of creativity. The
 "tiny subject line" constraint reminds you to clarify the essence of the
 commit, and makes the log easy for humans to scan. The commit log is an
 artifact that will outlive most code.
 
-Prefix the subject with `type(topic):` ([conventional
-commits](https://www.conventionalcommits.org/) format): this again helps humans
-(and scripts) scan and omit ranges of the history at a glance.
+### Commit messages
 
-### CI artifact
+Source control (Git) is our source-of-truth, not GitHub. However since most PRs
+are squash-merged, it's most important that your [pull request description](#pull-request-description)
+is well-formed so that the merged commit has the relevant info.
 
-Each commit and pull request is processed by an automated system which runs
-all tests and provides the build result via the _Details_ link as shown below.
+If you expect your commits to be preserved ("regular merge"), then follow [these
+guidelines](https://cbea.ms/git-commit/):
 
-<img src="./docs/images/ci-artifact.png" alt="CI artifact" width="512"/>
+-   Subject: single line up to 50-72 characters
+    -   Imperative voice ("Fix bug", not "Fixed"/"Fixes"/"Fixing").
+    -   [Formatted as `type(scope): subject...`](#pull-request-title).
+        -   Helps humans _and_ scripts scan and omit ranges of the history at a glance.
+-   Body: describe the change as a [Problem/Solution pair](#pull-request-description).
 
 ## Tooling
 
@@ -231,10 +347,54 @@ generating SDKs, etc.
 
 ### Toolkit developer settings (`aws.dev.*`)
 
-The [DevSettngs](https://github.com/aws/aws-toolkit-vscode/blob/479b9d45b5f5ad30fc10567e649b59801053aeba/src/shared/settings.ts#L553) class defines various developer-only settings that change the behavior of the
+The [DevSettings](https://github.com/aws/aws-toolkit-vscode/blob/479b9d45b5f5ad30fc10567e649b59801053aeba/src/shared/settings.ts#L553) class defines various developer-only settings that change the behavior of the
 Toolkit for testing and development purposes. To use a setting just add it to
 your `settings.json`. At runtime, if the Toolkit reads any of these settings,
-the "AWS" statusbar item will [change its color](https://github.com/aws/aws-toolkit-vscode/blob/479b9d45b5f5ad30fc10567e649b59801053aeba/src/credentials/awsCredentialsStatusBarItem.ts#L45). Use the setting `aws.dev.forceDevMode` to trigger this effect on start-up.
+the "AWS" statusbar item will [change its color](https://github.com/aws/aws-toolkit-vscode/blob/479b9d45b5f5ad30fc10567e649b59801053aeba/src/credentials/awsCredentialsStatusBarItem.ts#L45).
+
+The `aws.dev.forceDevMode` setting enables or disables Toolkit "dev mode". Without this setting, the presence of any other `aws.dev.*` setting defined in `DevSettings` implicitly enables "dev mode".
+
+### Logging
+
+-   Use `getLogger()` to log debugging messages, warnings, etc.
+    -   Example: `getLogger().error('topic: widget failed: %O', { foo: 'bar', baz: 42 })`
+-   Log messages are written to the extension Output channel, which you can view in vscode by visiting the "Output" panel and selecting `AWS Toolkit Logs` or `Amazon Q Logs`.
+-   Use the `aws.dev.logfile` setting to set the logfile path to a fixed location, so you can follow
+    and filter logs using shell tools like `tail` and `grep`.
+    -   Note: this always logs at **debug log-level** (though you can temporarily override that from the `AWS Toolkit Logs` UI).
+    -   Example `settings.json`:
+        ```
+        "aws.dev.logfile": "~/awstoolkit.log",
+        ```
+        then you can tail the logfile in your terminal:
+        ```
+        tail -F ~/awstoolkit.log
+        ```
+-   Use the Output panel to watch and filter Toolkit logs (including telemetry) in VSCode.
+    -   Enter text in the Output panel filter box to show only log messages with that text.
+
+#### Enabling Debug Logs
+
+How to enable more detailed debug logs in the extensions.
+If you need to report an issue attach these to give the most detailed information.
+
+1. Open the Command Palette (`cmd/ctrl` + `shift` + `p`), then search for "View Logs". Choose either `AWS: View Logs` or `Amazon Q: View Logs`.
+    - ![](./docs/images/logsView.png)
+2. Click the gear icon on the bottom right and select `Debug`
+    - ![](./docs/images/logsSetDebug.png)
+3. Click the gear icon again and select `Set As Default`. This will ensure we stay in `Debug` until explicitly changed.
+    - ![](./docs/images/logsSetDefault.png)
+4. Open the Command Palette again and select `Reload Window`.
+5. Now you should see additional `[debug]` prefixed logs in the output.
+    - ![](./docs/images/logsDebugLog.png)
+6. To export logs, click the kebab (`...`), select `Export Logs`, and then select the appropriate channel (`Amazon Q Logs` for Amazon Q)
+    - ![](./docs/images/openExportLogs.png)
+    - ![](./docs/images/exportAmazonQLogs.png)
+
+### Telemetry
+
+-   See [docs/telemetry.md](./docs/telemetry.md) for guidelines on developing telemetry in this project.
+-   To watch Toolkit telemetry events, use the `Amazon Q: View Logs` command (see [Logging](#logging) above) and enter "telemetry" in the filter box.
 
 ### Service Endpoints
 
@@ -248,12 +408,136 @@ Example:
 }
 ```
 
-### Telemetry and Automation
+<a name="codecatalyst-settings">Overrides specifically for CodeCatalyst can be set using the `aws.dev.codecatalystService` setting. This is a JSON object consisting of keys/values required to override API calls to CodeCatalyst: `region`, `endpoint`, `hostname`, and `gitHostname`. If this setting is present, then all keys need to be explicitly provided.</a>
 
-Metrics are only emitted if the extension is assumed to be ran from an actual user rather than automation scripts.
-This condition is checked through an environment variable `AWS_TOOLKIT_AUTOMATION` which is set by test entry points.
-If any truthy value is present, telemetry will be dropped if the current build is not a release version. Utility functions,
-such as `assertTelemetry`, can be used to test specific telemetry emits even in automation.
+Example:
+
+```json
+"aws.dev.codecatalystService": {
+    "region": "us-west-2",
+    "endpoint": "https://codecatalyst-gamma.example.com",
+    "hostname": "integ.stage.example.com",
+    "gitHostname": "git.gamma.source.example.com",
+}
+```
+
+<a name="codewhisperer-settings">Overrides specifically for CodeWhisperer/Amazon Q can be set using the `aws.dev.codewhispererService` setting. This is a JSON object consisting of keys/values required to override API calls to CodeWhisperer/Amazon Q: `region` and `endpoint`. If this setting is present, then all keys need to be explicitly provided.</a>
+
+Example:
+
+```json
+"aws.dev.codewhispererService": {
+    "region": "us-west-2",
+    "endpoint": "https://codewhisperer-gamma.example.com"
+}
+```
+
+<a name="amazonqLsp-settings">Overrides specifically for the Amazon Q language server</a> can be set using the `aws.dev.amazonqLsp` setting. This is a JSON object consisting of keys/values required to override language server: `manifestUrl`, `supportedVersions`, `id`, and `path`.
+
+Example:
+
+```json
+"aws.dev.amazonqLsp": {
+    "manifestUrl": "https://custom.url/manifest.json",
+    "supportedVersions": "4.0.0",
+    "id": "AmazonQ",
+    "path": "/custom/path/to/local/lsp/folder",
+    "ui": "/custom/path/to/chat-client/ui"
+}
+```
+
+<a name="amazonqWorkspaceLsp-settings">Overrides specifically for the Amazon Q Workspace Context language server</a> can be set using the `aws.dev.amazonqWorkspaceLsp` setting. This is a JSON object consisting of keys/values required to override language server: `manifestUrl`, `supportedVersions`, `id`, and `path`.
+
+Example:
+
+```json
+"aws.dev.amazonqWorkspaceLsp": {
+    "manifestUrl": "https://custom.url/manifest.json",
+    "supportedVersions": "4.0.0",
+    "id": "AmazonQ",
+    "path": "/custom/path/to/local/lsp/folder",
+}
+```
+
+### Environment variables
+
+Environment variables can be used to modify the behaviour of VSCode. The following are environment variables that can be used to configure the extension:
+
+#### General AWS
+
+-   `AWS_ACCESS_KEY_ID`: The AWS access key associated with an IAM account. If defined, this environment variable overrides the value for the profile setting aws_access_key_id. For more information see [environment variables to configure the AWS CLI](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-envvars.html)
+-   `AWS_SECRET_ACCESS_KEY`: The secret key associated with the access key. This is essentially the "password" for the access key. If defined, this environment variable overrides the value for the profile setting aws_secret_access_key. For more information see [environment variables to configure the AWS CLI](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-envvars.html)
+-   `AWS_REGION`: The AWS Region to send the request to. If defined, this environment variable overrides the values in the environment variable AWS_DEFAULT_REGION and the profile setting region. For more information see [environment variables to configure the AWS CLI](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-envvars.html)
+-   `AWS_SDK_LOAD_CONFIG`: Controls how the AWS SDK for javascript loads it's configuration when initialized. If the AWS_SDK_LOAD_CONFIG environment variable has been set to a truthy value, the SDK for JavaScript automatically searches for a config file when it loads. For more information see [the shared config file documentation](https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/setting-region.html#setting-region-config-file)
+-   `AWS_SHARED_CREDENTIALS_FILE`: The location of the file that the AWS CLI uses to store access keys. The default path is `~/.aws/credentials`
+-   `AWS_CONFIG_FILE`: The location of the file that the AWS CLI uses to store configuration profiles. The default path is `~/.aws/config`
+
+#### General OS
+
+-   `HOME`: The home directory location for the current user in Linux and other Unix-like operating systems.
+-   `SSH_AUTH_SOCK`: The location of a UNIX domain socket used by ssh-agent and SSH clients for agent-based authentication
+-   `USERPROFILE`: The absolute path to the profile folder for the current user in Windows
+-   `HOMEPATH`: The path to the home directory for the current user in Windows, without including the drive letter
+-   `PROGRAMFILES/PROGRAMFILES(X86)`: The default installation directory for Windows
+-   `WINDIR`: The location of the Windows installation directory
+-   `PATH`: The set of directories where executable programs live
+
+#### Codecatalyst
+
+-   `__DEV_ENVIRONMENT_ID`: The ID of the running development environment. Automatically set when running the toolkit in Codecatalyst
+-   `__DEV_ENVIRONMENT_PROJECT_NAME`: The project name associated with the running development environment. Automatically set when running the toolkit in Codecatalyst
+-   `__DEV_ENVIRONMENT_SPACE_NAME`: The space name associated with the running development environment. Automatically set when running the toolkit in Codecatalyst
+-   `__DEV_ENVIRONMENT_ORGANIZATION_NAME`: The organization name associated with the running development environment. Automatically set when running the toolkit in Codecatalyst
+
+The following are environment variable versions of the user `settings.json` overrides mentioned [here](#codecatalyst-settings). These will always override the toolkit defaults and those defined in `settings.json`.
+Unlike the user setting overrides, not all of these environment variables have to be set to make use of them.
+
+-   `__CODECATALYST_REGION`: for aws.dev.codecatalystService.region
+-   `__CODECATALYST_ENDPOINT`: for aws.dev.codecatalystService.endpoint
+-   `__CODECATALYST_HOSTNAME`: for aws.dev.codecatalystService.hostname
+-   `__CODECATALYST_GIT_HOSTNAME`: for aws.dev.codecatalystService.gitHostname
+
+#### Codewhisperer/Amazon Q
+
+The following are environment variable versions of the user `settings.json` overrides mentioned [here](#codewhisperer-settings). These will always override the toolkit defaults and those defined in `settings.json`.
+Unlike the user setting overrides, not all of these environment variables have to be set to make use of them.
+
+-   `__CODEWHISPERER_REGION`: for aws.dev.codewhispererService.region
+-   `__CODEWHISPERER_ENDPOINT`: for aws.dev.codewhispererService.endpoint
+-   `__AMAZONQLSP_MANIFEST_URL`: for aws.dev.amazonqLsp.manifestUrl
+-   `__AMAZONQLSP_SUPPORTED_VERSIONS`: for aws.dev.amazonqLsp.supportedVersions
+-   `__AMAZONQLSP_ID`: for aws.dev.amazonqLsp.id
+-   `__AMAZONQLSP_PATH`: for aws.dev.amazonqLsp.path
+-   `__AMAZONQLSP_UI`: for aws.dev.amazonqLsp.ui
+-   `__AMAZONQWORKSPACELSP_MANIFEST_URL`: for aws.dev.amazonqWorkspaceLsp.manifestUrl
+-   `__AMAZONQWORKSPACELSP_SUPPORTED_VERSIONS`: for aws.dev.amazonqWorkspaceLsp.supportedVersions
+-   `__AMAZONQWORKSPACELSP_ID`: for aws.dev.amazonqWorkspaceLsp.id
+-   `__AMAZONQWORKSPACELSP_PATH`: for aws.dev.amazonqWorkspaceLsp.path
+
+#### Lambda
+
+-   `AUTH_UTIL_LAMBDA_ARN`: The Auth Util Lambda is used to log into using Builder ID/IdC automatically when running e2e tests. This is the arn that points to the auth util lambda.
+
+#### ECS
+
+-   `AWS_CONTAINER_CREDENTIALS_RELATIVE_URI`: The relative HTTP URL endpoint for the SDK to use when making a request for credentials. The value is appended to the default Amazon ECS hostname of 169.254.170.2. For more information see [container credential provider](https://docs.aws.amazon.com/sdkref/latest/guide/feature-container-credentials.html)
+-   `AWS_CONTAINER_CREDENTIALS_FULL_URI`: The full HTTP URL endpoint for the SDK to use when making a request for credentials. This includes both the scheme and the host. For more information see [container credential provider](https://docs.aws.amazon.com/sdkref/latest/guide/feature-container-credentials.html)
+
+#### Step functions
+
+-   `SSMDOCUMENT_LANGUAGESERVER_PORT`: The port the ssm document language server should start debugging on
+
+#### CI/Testing
+
+-   `GITHUB_ACTION`: The name of the current GitHub Action workflow step that is running
+-   `CODEBUILD_BUILD_ID`: The unique ID of the current CodeBuild build that is executing
+-   `AWS_TOOLKIT_AUTOMATION`: If tests are currently being ran
+-   `TEST_SSO_STARTURL`: The start url you want to use on E2E tests
+-   `TEST_SSO_REGION`: The region for the start url you want to use on E2E tests
+-   `AWS_TOOLKIT_TEST_NO_COLOR`: If the tests should include colour in their output
+-   `DEVELOPMENT_PATH`: The path to the aws toolkit vscode project
+-   `TEST_DIR` - The directory where the test runner should find the tests
+-   `AMAZONQ_FEATUREDEV_ITERATION_TEST` - Controls whether to enable multiple iteration testing for Amazon Q feature development
 
 ### SAM/CFN ("goformation") JSON schema
 
@@ -261,6 +545,17 @@ See [docs/cfn-schema-support.md](./docs/cfn-schema-support.md) for how to fix
 and improve the JSON schema that provides auto-completion and syntax checking
 of SAM and CloudFormation `template.yaml` files.
 
+### Custom Lint Rules
+
+The package.json 'devDependencies' includes `eslint-plugin-aws-toolkits`. This is a local eslint plugin where we define custom lint rules. Additional lint rules and tests for lint rules can be added to this plugin:
+
+1. Define a new rule in `plugins/eslint-plugin-aws-toolkits/lib/rules`.
+2. Create a test for your rule in `plugins/eslint-plugin-aws-toolkits/test/rules` and run with `npm run test` in the root directory of `eslint-plugin-aws-toolkits`.
+3. Register your rule in `plugins/eslint-plugin-aws-toolkits/index.ts`.
+4. Enable your rule in `.eslintrc`.
+
+Writing lint rules can be tricky if you are unfamiliar with the process. Use an AST viewer such as https://astexplorer.net/
+
 ### AWS SDK generator
 
 When the AWS SDK does not (yet) support a service but you have an API
@@ -321,29 +616,44 @@ requests just from the model/types.
 
 ### Webview dev-server
 
-Webviews can be hot-reloaded (updated without restarting the extension) by running a developer server provided by webpack. This server is started automatically when running the `Extension` launch configuration. You can also start it by running `npm serve`. Note that only frontend components will be updated; if you change backend code you will still need to restart the development extension.
+Webviews can be refreshed to show changes to `.vue` code when running in Debug mode. You do not have to
+reload the Debug VS Code window.
+
+-   Use `Command Palette` -> `Reload Webviews`
+-   Only the frontend `.vue` changes will be reflected. If changing any backend code you must restart Debug mode.
+
+This works by continuously building the final Vue webview files (`webpack watch`) and then serving them through a local server (`webpack serve`). Whenever a webview is loaded it will grab the latest build from the server.
 
 ### Font generation
 
-For extensions to contribute their own codicons, VS Code requires a font file as well as how that font maps to codicon IDs. The mapping is found in `package.json` under the `icons` contribution point. Icons located in `resources/icons` are stitched together at build-time into a single font, automatically adding mappings to `package.json`. More information can be found [here](docs/icons.md).
+For extensions to contribute their own codicons, VSCode requires a font file as well as how that font maps to codicon IDs. The mapping is found in `package.json` under the `icons` contribution point. Icons located in `resources/icons` are stitched together at build-time into a single font, automatically adding mappings to `package.json`. More information can be found [here](docs/icons.md).
 
 As a simple example, let's say I wanted to add a new icon for CloudWatch log streams. I would do the following:
 
 1. Place the icon in `resources/icons/aws/cloudwatch`. I'l name the icon `log-stream.svg`.
-1. Use `npm run generatePackage` to update `package.json`. Commit this change with the new icon.
+1. Use `npm run generateIcons` to update `package.json`. Commit this change with the new icon.
 1. You can now use the icon in the Toolkit:
 
     ```ts
     getIcon('aws-cloudwatch-log-stream')
     ```
 
-### Beta artifacts
+### VSCode Marketplace
+
+The [marketplace page](https://marketplace.visualstudio.com/itemdetails?itemName=AmazonWebServices.aws-toolkit-vscode)
+is defined in `packages/toolkit/README.md`. The `vsce` package tool always [replaces relative image paths](https://github.com/microsoft/vscode-vsce/blob/9478dbd11ea2e7adb23ec72923e889c7bb215263/src/package.ts#L885)
+with URLs pointing to `HEAD` on GitHub (`https://github.com/aws/aws-toolkit-vscode/raw/HEAD/…/foo.gif`).
+
+Note therefore:
 
-The Toolkit codebase contains logic in `src/dev/beta.ts` to support development during private betas. Creating a beta artifact requires a _stable_ URL to source Toolkit builds from. This URL should be added to `src/dev/config.ts`. Subsequent Toolkit artifacts will have their version set to `1.999.0` with a commit hash. Builds will automatically query the URL to check for a new build once a day and on every reload.
+1. Don't delete images from `docs/marketplace/` unless the _current published_
+   AWS Toolkit release doesn't depend on them.
+2. `HEAD` implies that the URL depends on the current _default branch_ (i.e.
+   `master`). Changes to other branches won't affect the marketplace page.
 
-## Importing icons from other open source repos
+### Importing icons from other projects
 
-If you are contribuing visual assets from other open source repos, the source repo must have a compatible license (such as MIT), and we need to document the source of the images. Follow these steps:
+If you are contribuing visual assets from other open source repos, the source repo must have a compatible license (such as MIT), and we need to document the source of the images. Follow these steps ([example: #227](https://github.com/aws/aws-toolkit-vscode/pull/227)):
 
 1. Use a separate location in this repo for every repo/organization where images are sourced from. See `resources/icons/vscode` as an example.
 1. Copy the source repo's licence into this destination location's LICENSE.txt file
@@ -359,7 +669,41 @@ If you are contribuing visual assets from other open source repos, the source re
 
 1. Add an entry [here](docs/icons.md#third-party) summarizing the new destination location, where the assets were sourced from, and a brief rationale.
 
-[PR #227](https://github.com/aws/aws-toolkit-vscode/pull/227) shows an example.
+## Using new vscode APIs
+
+The minimum required vscode version specified in [package.json](https://github.com/aws/aws-toolkit-vscode/blob/07119655109bb06105a3f53bbcd86b812b32cdbe/package.json#L16)
+is decided by the version of vscode running in other supported vscode-compatible targets (e.g. web).
+
+But you can still use the latest vscode APIs, by checking the current running vscode version. For example, to use a vscode 1.64 API:
+
+1. Check the vscode version: `semver.gte(vscode.version, '1.64.0')`
+2. Disable the feature if is too old. That could mean just skipping the code entirely, or showing a different UI.
+
+Full example: https://github.com/aws/aws-toolkit-vscode/blob/7cb97a2ef0a765862d21842693967070b0dcdd49/src/shared/credentials/defaultCredentialSelectionDataProvider.ts#L54-L76
+
+## Preview Releases and Experiments
+
+There are several ways to make pre-production changes available on a "preview" or "experimental" basis:
+
+-   **Experimental features:** settings defined in [aws.experiments](https://github.com/aws/aws-toolkit-vscode/blob/4dcee33931693380739eaa5d44e92fa4545a9666/package.json#L228-L241)
+    are available in the vscode settings UI so that customers **can discover and enable them.**
+    This mechanism is intended for non-production features which are ready for
+    early access / preview feedback from interested customers.
+-   **Developer-only features:** the `aws.dev.forceDevMode` setting can be used as
+    a condition to enable features only for users who have
+    `"aws.dev.forceDevMode": true` in their settings. These features are intended
+    to be part of the mainline branch, but are _not_ presented to customers in the
+    VSCode settings UI. Example: [EC2 commands were gated on `aws.isDevMode`](https://github.com/aws/aws-toolkit-vscode/blob/4dcee33931693380739eaa5d44e92fa4545a9666/package.json#L1115-L1126)
+    so the functionality could be merged to mainline while it was under development.
+-   **Beta artifacts:** For a "private beta" launch, `src/dev/beta.ts` contains
+    logic to check a hardcoded, stable URL serving the latest `.vsix` build for
+    the private beta. The hardcoded URL defined in [`dev/config.ts:betaUrl`](https://github.com/aws/aws-toolkit-vscode/blob/d9c27234c0732b021d07e184a865213d6efde8ec/src/dev/config.ts#L9)
+    also forces the Toolkit to declare version `99.0` (since "private beta" has no semver and to
+    avoid unwanted auto-updating from VSCode marketplace). Beta builds of the Toolkit automatically
+    query the URL once per session per day.
+    -   Beta users may want to run the `Extensions: Disable Auto Update for All Extensions` command
+        [disable VSCode's auto-update feature](https://code.visualstudio.com/docs/editor/extension-marketplace#_extension-autoupdate),
+        to avoid ovewriting the beta Toolkit with the marketplace release.
 
 ## Code of Conduct
 
diff --git a/LICENSE-THIRD-PARTY b/LICENSE-THIRD-PARTY
new file mode 100644
index 00000000000..efdb4af3017
--- /dev/null
+++ b/LICENSE-THIRD-PARTY
@@ -0,0 +1,10428 @@
+@aws/language-server-runtimes
+0.2.128 <https://github.com/aws/language-server-runtimes>
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+
+******************************
+
+@aws/language-server-runtimes-types
+0.1.56 <https://github.com/aws/language-server-runtimes>
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+
+******************************
+
+@opentelemetry/api
+1.9.0 <https://github.com/open-telemetry/opentelemetry-js>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+******************************
+
+@opentelemetry/api-logs
+0.200.0 <https://github.com/open-telemetry/opentelemetry-js>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+******************************
+
+@opentelemetry/core
+2.0.1 <https://github.com/open-telemetry/opentelemetry-js>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+******************************
+
+@opentelemetry/exporter-logs-otlp-http
+0.200.0 <https://github.com/open-telemetry/opentelemetry-js>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+******************************
+
+@opentelemetry/exporter-metrics-otlp-http
+0.200.0 <https://github.com/open-telemetry/opentelemetry-js>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+******************************
+
+@opentelemetry/otlp-exporter-base
+0.200.0 <https://github.com/open-telemetry/opentelemetry-js>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+******************************
+
+@opentelemetry/otlp-transformer
+0.200.0 <https://github.com/open-telemetry/opentelemetry-js>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+******************************
+
+@opentelemetry/resources
+2.0.1 <https://github.com/open-telemetry/opentelemetry-js>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+******************************
+
+@opentelemetry/sdk-logs
+0.200.0 <https://github.com/open-telemetry/opentelemetry-js>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+******************************
+
+@opentelemetry/sdk-metrics
+2.0.1 <https://github.com/open-telemetry/opentelemetry-js>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+******************************
+
+@opentelemetry/sdk-trace-base
+2.0.0 <https://github.com/open-telemetry/opentelemetry-js>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+******************************
+
+@opentelemetry/semantic-conventions
+1.33.0 <https://github.com/open-telemetry/opentelemetry-js>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+******************************
+
+@protobufjs/aspromise
+1.1.2 <https://github.com/dcodeIO/protobuf.js>
+Copyright (c) 2016, Daniel Wirtz  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of its author, nor the names of its contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+******************************
+
+@protobufjs/base64
+1.1.2 <https://github.com/dcodeIO/protobuf.js>
+Copyright (c) 2016, Daniel Wirtz  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of its author, nor the names of its contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+******************************
+
+@protobufjs/codegen
+2.0.4 <https://github.com/dcodeIO/protobuf.js>
+Copyright (c) 2016, Daniel Wirtz  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of its author, nor the names of its contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+******************************
+
+@protobufjs/eventemitter
+1.1.0 <https://github.com/dcodeIO/protobuf.js>
+Copyright (c) 2016, Daniel Wirtz  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of its author, nor the names of its contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+******************************
+
+@protobufjs/fetch
+1.1.0 <https://github.com/dcodeIO/protobuf.js>
+Copyright (c) 2016, Daniel Wirtz  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of its author, nor the names of its contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+******************************
+
+@protobufjs/float
+1.0.2 <https://github.com/dcodeIO/protobuf.js>
+Copyright (c) 2016, Daniel Wirtz  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of its author, nor the names of its contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+******************************
+
+@protobufjs/inquire
+1.1.0 <https://github.com/dcodeIO/protobuf.js>
+Copyright (c) 2016, Daniel Wirtz  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of its author, nor the names of its contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+******************************
+
+@protobufjs/path
+1.1.2 <https://github.com/dcodeIO/protobuf.js>
+Copyright (c) 2016, Daniel Wirtz  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of its author, nor the names of its contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+******************************
+
+@protobufjs/pool
+1.1.0 <https://github.com/dcodeIO/protobuf.js>
+Copyright (c) 2016, Daniel Wirtz  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of its author, nor the names of its contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+******************************
+
+@protobufjs/utf8
+1.1.0 <https://github.com/dcodeIO/protobuf.js>
+Copyright (c) 2016, Daniel Wirtz  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of its author, nor the names of its contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+******************************
+
+@smithy/abort-controller
+4.0.2 <https://github.com/smithy-lang/smithy-typescript>
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+******************************
+
+@smithy/node-http-handler
+4.0.4 <https://github.com/smithy-lang/smithy-typescript>
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+******************************
+
+@smithy/protocol-http
+5.1.0 <https://github.com/smithy-lang/smithy-typescript>
+                                Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+******************************
+
+@smithy/querystring-builder
+4.0.2 <https://github.com/smithy-lang/smithy-typescript>
+                                Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+******************************
+
+@smithy/types
+4.2.0 <https://github.com/smithy-lang/smithy-typescript>
+                                Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+******************************
+
+@smithy/util-uri-escape
+4.0.0 <https://github.com/awslabs/smithy-typescript>
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+******************************
+
+@types/node
+22.8.4 <https://github.com/DefinitelyTyped/DefinitelyTyped>
+    MIT License
+
+    Copyright (c) Microsoft Corporation.
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE
+
+
+******************************
+
+ajv
+8.17.1 <https://github.com/ajv-validator/ajv>
+The MIT License (MIT)
+
+Copyright (c) 2015-2021 Evgeny Poberezkin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+
+******************************
+
+ansi-colors
+4.1.1 <https://github.com/doowb/ansi-colors>
+The MIT License (MIT)
+
+Copyright (c) 2015-present, Brian Woodward.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+******************************
+
+ansi-gray
+0.1.1 <https://github.com/jonschlinkert/ansi-gray>
+The MIT License (MIT)
+
+Copyright (c) <%= year() %>, Jon Schlinkert.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+******************************
+
+ansi-regex
+5.0.1 <https://github.com/chalk/ansi-regex>
+MIT License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+ansi-styles
+4.3.0 <https://github.com/chalk/ansi-styles>
+MIT License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+ansi-wrap
+0.1.0 <https://github.com/jonschlinkert/ansi-wrap>
+The MIT License (MIT)
+
+Copyright (c) 2015, Jon Schlinkert.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+******************************
+
+aproba
+1.2.0 <https://github.com/iarna/aproba>
+Copyright (c) 2015, Rebecca Turner <me@re-becca.org>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+
+******************************
+
+are-we-there-yet
+1.1.7 <https://github.com/iarna/are-we-there-yet>
+Copyright (c) 2015, Rebecca Turner
+
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+******************************
+
+available-typed-arrays
+1.0.5 <https://github.com/inspect-js/available-typed-arrays>
+MIT License
+
+Copyright (c) 2020 Inspect JS
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+aws-sdk
+2.1692.0 <https://github.com/aws/aws-sdk-js>
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+******************************
+
+balanced-match
+1.0.2 <https://github.com/juliangruber/balanced-match>
+(MIT)
+
+Copyright (c) 2013 Julian Gruber &lt;julian@juliangruber.com&gt;
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+base64-js
+1.5.1 <https://github.com/beatgammit/base64-js>
+The MIT License (MIT)
+
+Copyright (c) 2014 Jameson Little
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+******************************
+
+bl
+4.1.0 <https://github.com/rvagg/bl>
+The MIT License (MIT)
+=====================
+
+Copyright (c) 2013-2019 bl contributors
+----------------------------------
+
+*bl contributors listed at <https://github.com/rvagg/bl#contributors>*
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+brace-expansion
+1.1.11 <https://github.com/juliangruber/brace-expansion>
+MIT License
+
+Copyright (c) 2013 Julian Gruber <julian@juliangruber.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+buffer
+5.7.1 <https://github.com/feross/buffer>
+The MIT License (MIT)
+
+Copyright (c) Feross Aboukhadijeh, and other contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+******************************
+
+call-bind
+1.0.7 <https://github.com/ljharb/call-bind>
+MIT License
+
+Copyright (c) 2020 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+chownr
+1.1.4 <https://github.com/isaacs/chownr>
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+******************************
+
+cliui
+8.0.1 <https://github.com/yargs/cliui>
+Copyright (c) 2015, Contributors
+
+Permission to use, copy, modify, and/or distribute this software
+for any purpose with or without fee is hereby granted, provided
+that the above copyright notice and this permission notice
+appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE
+LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+******************************
+
+clone
+2.1.2 <https://github.com/pvorb/node-clone>
+Copyright © 2011-2015 Paul Vorbach <paul@vorba.ch>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the “Software”), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+clone-buffer
+1.0.0 <https://github.com/gulpjs/clone-buffer>
+The MIT License (MIT)
+
+Copyright (c) 2016 Blaine Bublitz <blaine.bublitz@gmail.com>, Eric Schoffstall <yo@contra.io> and other contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+clone-stats
+1.0.0 <https://github.com/hughsk/clone-stats>
+## The MIT License (MIT) ##
+
+Copyright (c) 2014 Hugh Kennedy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+******************************
+
+cloneable-readable
+1.1.3 <https://github.com/mcollina/cloneable-readable>
+The MIT License (MIT)
+
+Copyright (c) 2016 Matteo Collina
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+code-point-at
+1.1.0 <https://github.com/sindresorhus/code-point-at>
+The MIT License (MIT)
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+******************************
+
+color-convert
+2.0.1 <https://github.com/Qix-/color-convert>
+Copyright (c) 2011-2016 Heather Arthur <fayearthur@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+
+******************************
+
+color-name
+1.1.4 <https://github.com/colorjs/color-name>
+The MIT License (MIT)
+Copyright (c) 2015 Dmitry Ivanov
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+******************************
+
+color-support
+1.1.3 <https://github.com/isaacs/color-support>
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+******************************
+
+concat-map
+0.0.1 <https://github.com/substack/node-concat-map>
+This software is released under the MIT license:
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+console-control-strings
+1.1.0 <https://github.com/iarna/console-control-strings>
+Copyright (c) 2014, Rebecca Turner <me@re-becca.org>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+******************************
+
+core-util-is
+1.0.3 <https://github.com/isaacs/core-util-is>
+Copyright Node.js contributors. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
+
+
+******************************
+
+decompress-response
+4.2.1 <https://github.com/sindresorhus/decompress-response>
+MIT License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+deep-extend
+0.6.0 <https://github.com/unclechu/node-deep-extend>
+The MIT License (MIT)
+
+Copyright (c) 2013-2018, Viacheslav Lotsmanov
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+define-data-property
+1.1.4 <https://github.com/ljharb/define-data-property>
+MIT License
+
+Copyright (c) 2023 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+define-properties
+1.1.4 <https://github.com/ljharb/define-properties>
+The MIT License (MIT)
+
+Copyright (C) 2015 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+******************************
+
+delegates
+1.0.0 <https://github.com/visionmedia/node-delegates>
+Copyright (c) 2015 TJ Holowaychuk <tj@vision-media.ca>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+detect-libc
+1.0.3 <https://github.com/lovell/detect-libc>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+******************************
+
+duplexer
+0.1.2 <https://github.com/Raynos/duplexer>
+license: MIT
+authors: Raynos <raynos2@gmail.com>
+
+******************************
+
+emoji-regex
+8.0.0 <https://github.com/mathiasbynens/emoji-regex>
+license: MIT
+authors: Mathias Bynens <https://mathiasbynens.be/>
+
+******************************
+
+end-of-stream
+1.4.4 <https://github.com/mafintosh/end-of-stream>
+The MIT License (MIT)
+
+Copyright (c) 2014 Mathias Buus
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+******************************
+
+es-abstract
+1.20.2 <https://github.com/ljharb/es-abstract>
+The MIT License (MIT)
+
+Copyright (C) 2015 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+******************************
+
+es-define-property
+1.0.0 <https://github.com/ljharb/es-define-property>
+MIT License
+
+Copyright (c) 2024 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+es-errors
+1.3.0 <https://github.com/ljharb/es-errors>
+MIT License
+
+Copyright (c) 2024 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+es-to-primitive
+1.2.1 <https://github.com/ljharb/es-to-primitive>
+The MIT License (MIT)
+
+Copyright (c) 2015 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+
+******************************
+
+escalade
+3.1.2 <https://github.com/lukeed/escalade>
+MIT License
+
+Copyright (c) Luke Edwards <luke.edwards05@gmail.com> (lukeed.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+event-stream
+3.3.5 <https://github.com/dominictarr/event-stream>
+license: MIT
+authors: Dominic Tarr <dominic.tarr@gmail.com> (http://bit.ly/dominictarr)
+
+******************************
+
+events
+1.1.1 <https://github.com/Gozala/events>
+MIT
+
+Copyright Joyent, Inc. and other Node contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons to whom the Software is furnished to do so, subject to the
+following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+expand-template
+2.0.3 <https://github.com/ralphtheninja/expand-template>
+The MIT License (MIT)
+
+Copyright (c) 2018 Lars-Magnus Skog
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+******************************
+
+fancy-log
+1.3.3 <https://github.com/gulpjs/fancy-log>
+The MIT License (MIT)
+
+Copyright (c) 2014, 2015, 2018 Blaine Bublitz <blaine.bublitz@gmail.com> and Eric Schoffstall <yo@contra.io>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+
+******************************
+
+fast-deep-equal
+3.1.3 <https://github.com/epoberezkin/fast-deep-equal>
+MIT License
+
+Copyright (c) 2017 Evgeny Poberezkin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+fast-uri
+3.0.6 <https://github.com/fastify/fast-uri>
+Copyright (c) 2021 The Fastify Team
+Copyright (c) 2011-2021, Gary Court until https://github.com/garycourt/uri-js/commit/a1acf730b4bba3f1097c9f52e7d9d3aba8cdcaae
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * The names of any contributors may not be used to endorse or promote
+      products derived from this software without specific prior written
+      permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+                                  *   *   *
+
+The complete list of contributors can be found at:
+- https://github.com/garycourt/uri-js/graphs/contributors
+
+******************************
+
+for-each
+0.3.3 <https://github.com/Raynos/for-each>
+The MIT License (MIT)
+
+Copyright (c) 2012 Raynos.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+
+******************************
+
+from
+0.1.7 <https://github.com/dominictarr/from>
+Apache License, Version 2.0
+
+Copyright (c) 2011 Dominic Tarr
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+
+******************************
+
+fs-constants
+1.0.0 <https://github.com/mafintosh/fs-constants>
+The MIT License (MIT)
+
+Copyright (c) 2018 Mathias Buus
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+******************************
+
+fs.realpath
+1.0.0 <https://github.com/isaacs/fs.realpath>
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+----
+
+This library bundles a version of the `fs.realpath` and `fs.realpathSync`
+methods from Node.js v0.10 under the terms of the Node.js MIT license.
+
+Node's license follows, also included at the header of `old.js` which contains
+the licensed code:
+
+  Copyright Joyent, Inc. and other Node contributors.
+
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+function-bind
+1.1.2 <https://github.com/Raynos/function-bind>
+Copyright (c) 2013 Raynos.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+
+******************************
+
+function.prototype.name
+1.1.5 <https://github.com/es-shims/Function.prototype.name>
+The MIT License (MIT)
+
+Copyright (c) 2016 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+functions-have-names
+1.2.3 <https://github.com/inspect-js/functions-have-names>
+MIT License
+
+Copyright (c) 2019 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+gauge
+2.7.4 <https://github.com/iarna/gauge>
+Copyright (c) 2014, Rebecca Turner <me@re-becca.org>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+******************************
+
+get-caller-file
+2.0.5 <https://github.com/stefanpenner/get-caller-file>
+ISC License (ISC)
+Copyright 2018 Stefan Penner
+
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+******************************
+
+get-intrinsic
+1.2.4 <https://github.com/ljharb/get-intrinsic>
+MIT License
+
+Copyright (c) 2020 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+get-symbol-description
+1.0.0 <https://github.com/inspect-js/get-symbol-description>
+MIT License
+
+Copyright (c) 2021 Inspect JS
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+github-from-package
+0.0.0 <https://github.com/substack/github-from-package>
+This software is released under the MIT license:
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+glob
+7.2.3 <https://github.com/isaacs/node-glob>
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+## Glob Logo
+
+Glob's logo created by Tanya Brassie <http://tanyabrassie.com/>, licensed
+under a Creative Commons Attribution-ShareAlike 4.0 International License
+https://creativecommons.org/licenses/by-sa/4.0/
+
+
+******************************
+
+gopd
+1.0.1 <https://github.com/ljharb/gopd>
+MIT License
+
+Copyright (c) 2022 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+has
+1.0.3 <https://github.com/tarruda/has>
+license: MIT
+authors: Thiago de Arruda <tpadilha84@gmail.com>
+
+******************************
+
+has-bigints
+1.0.2 <https://github.com/ljharb/has-bigints>
+MIT License
+
+Copyright (c) 2019 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+has-property-descriptors
+1.0.2 <https://github.com/inspect-js/has-property-descriptors>
+MIT License
+
+Copyright (c) 2022 Inspect JS
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+has-proto
+1.0.3 <https://github.com/inspect-js/has-proto>
+MIT License
+
+Copyright (c) 2022 Inspect JS
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+has-symbols
+1.0.3 <https://github.com/inspect-js/has-symbols>
+MIT License
+
+Copyright (c) 2016 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+has-tostringtag
+1.0.0 <https://github.com/inspect-js/has-tostringtag>
+MIT License
+
+Copyright (c) 2021 Inspect JS
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+has-unicode
+2.0.1 <https://github.com/iarna/has-unicode>
+Copyright (c) 2014, Rebecca Turner <me@re-becca.org>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+
+******************************
+
+hasown
+2.0.2 <https://github.com/inspect-js/hasOwn>
+MIT License
+
+Copyright (c) Jordan Harband and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+hpagent
+1.2.0 <https://github.com/delvedor/hpagent>
+MIT License
+
+Copyright (c) 2020 Tomas Della Vedova
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+iconv-lite
+0.6.3 <https://github.com/ashtuchkin/iconv-lite>
+Copyright (c) 2011 Alexander Shtuchkin
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+
+******************************
+
+ieee754
+1.1.13 <https://github.com/feross/ieee754>
+Copyright 2008 Fair Oaks Labs, Inc.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+******************************
+
+inflight
+1.0.6 <https://github.com/npm/inflight>
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+******************************
+
+inherits
+2.0.4 <https://github.com/isaacs/inherits>
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+
+
+******************************
+
+ini
+1.3.8 <https://github.com/isaacs/ini>
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+******************************
+
+internal-slot
+1.0.3 <https://github.com/ljharb/internal-slot>
+MIT License
+
+Copyright (c) 2019 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+is
+3.3.0 <https://github.com/enricomarino/is>
+(The MIT License)
+
+Copyright (c) 2013 Enrico Marino  
+Copyright (c) 2014 Enrico Marino and Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+is-arguments
+1.1.1 <https://github.com/inspect-js/is-arguments>
+The MIT License (MIT)
+
+Copyright (c) 2014 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+is-bigint
+1.0.4 <https://github.com/inspect-js/is-bigint>
+MIT License
+
+Copyright (c) 2018 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+is-boolean-object
+1.1.2 <https://github.com/inspect-js/is-boolean-object>
+The MIT License (MIT)
+
+Copyright (c) 2015 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+
+******************************
+
+is-callable
+1.2.4 <https://github.com/inspect-js/is-callable>
+The MIT License (MIT)
+
+Copyright (c) 2015 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+
+******************************
+
+is-date-object
+1.0.5 <https://github.com/inspect-js/is-date-object>
+The MIT License (MIT)
+
+Copyright (c) 2015 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+
+******************************
+
+is-electron
+2.2.2 <https://github.com/cheton/is-electron>
+The MIT License (MIT)
+
+Copyright (c) 2016-2018 Cheton Wu
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+is-fullwidth-code-point
+3.0.0 <https://github.com/sindresorhus/is-fullwidth-code-point>
+MIT License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+is-generator-function
+1.0.10 <https://github.com/inspect-js/is-generator-function>
+The MIT License (MIT)
+
+Copyright (c) 2014 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+is-negative-zero
+2.0.2 <https://github.com/inspect-js/is-negative-zero>
+The MIT License (MIT)
+
+Copyright (c) 2014 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+is-number-object
+1.0.7 <https://github.com/inspect-js/is-number-object>
+The MIT License (MIT)
+
+Copyright (c) 2015 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+
+******************************
+
+is-regex
+1.1.4 <https://github.com/inspect-js/is-regex>
+The MIT License (MIT)
+
+Copyright (c) 2014 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+is-shared-array-buffer
+1.0.2 <https://github.com/inspect-js/is-shared-array-buffer>
+MIT License
+
+Copyright (c) 2021 Inspect JS
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+is-string
+1.0.7 <https://github.com/ljharb/is-string>
+The MIT License (MIT)
+
+Copyright (c) 2015 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+
+******************************
+
+is-symbol
+1.0.4 <https://github.com/inspect-js/is-symbol>
+The MIT License (MIT)
+
+Copyright (c) 2015 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+
+******************************
+
+is-typed-array
+1.1.9 <https://github.com/inspect-js/is-typed-array>
+The MIT License (MIT)
+
+Copyright (c) 2015 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+
+******************************
+
+is-weakref
+1.0.2 <https://github.com/inspect-js/is-weakref>
+MIT License
+
+Copyright (c) 2020 Inspect JS
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+isarray
+1.0.0 <https://github.com/juliangruber/isarray>
+license: MIT
+authors: Julian Gruber <mail@juliangruber.com>
+
+******************************
+
+jaro-winkler
+0.2.8 <https://github.com/jordanthomas/jaro-winkler>
+The MIT License (MIT)
+
+Copyright (c) 2015 Jordan Thomas
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+
+******************************
+
+jmespath
+0.16.0 <https://github.com/jmespath/jmespath.js>
+Copyright 2014 James Saryerwinnie
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+
+******************************
+
+jose
+5.10.0 <https://github.com/panva/jose>
+The MIT License (MIT)
+
+Copyright (c) 2018 Filip Skokan
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+json-schema-traverse
+1.0.0 <https://github.com/epoberezkin/json-schema-traverse>
+MIT License
+
+Copyright (c) 2017 Evgeny Poberezkin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+long
+5.3.1 <https://github.com/dcodeIO/long.js>
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+******************************
+
+mac-ca
+3.1.1 <https://github.com/jfromaniello/mac-ca>
+BSD 3-Clause License
+
+Copyright (c) 2018, José F. Romaniello
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+******************************
+
+make-dir
+1.3.0 <https://github.com/sindresorhus/make-dir>
+MIT License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+map-stream
+0.0.7 <https://github.com/dominictarr/map-stream>
+license: MIT
+authors: Dominic Tarr <dominic.tarr@gmail.com> (http://dominictarr.com)
+
+******************************
+
+mimic-response
+2.1.0 <https://github.com/sindresorhus/mimic-response>
+MIT License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+minimatch
+3.1.2 <https://github.com/isaacs/minimatch>
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+******************************
+
+minimist
+1.2.8 <https://github.com/minimistjs/minimist>
+This software is released under the MIT license:
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+mkdirp-classic
+0.5.3 <https://github.com/mafintosh/mkdirp-classic>
+The MIT License (MIT)
+
+Copyright (c) 2020 James Halliday (mail@substack.net) and Mathias Buus
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+******************************
+
+napi-build-utils
+1.0.2 <https://github.com/inspiredware/napi-build-utils>
+MIT License
+
+Copyright (c) 2018 inspiredware
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+node-abi
+2.30.1 <https://github.com/lgeiger/node-abi>
+MIT License
+
+Copyright (c) 2016 Lukas Geiger
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+node-addon-api
+3.2.1 <https://github.com/nodejs/node-addon-api>
+The MIT License (MIT)
+=====================
+
+Copyright (c) 2017 Node.js API collaborators
+-----------------------------------
+
+*Node.js API collaborators listed at <https://github.com/nodejs/node-addon-api#collaborators>*
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+******************************
+
+node-forge
+1.3.1 <https://github.com/digitalbazaar/forge>
+You may use the Forge project under the terms of either the BSD License or the
+GNU General Public License (GPL) Version 2.
+
+The BSD License is recommended for most projects. It is simple and easy to
+understand and it places almost no restrictions on what you can do with the
+Forge project.
+
+If the GPL suits your project better you are also free to use Forge under
+that license.
+
+You don't have to do anything special to choose one license or the other and
+you don't have to notify anyone which license you are using. You are free to
+use this project in commercial projects as long as the copyright header is
+left intact.
+
+If you are a commercial entity and use this set of libraries in your
+commercial software then reasonable payment to Digital Bazaar, if you can
+afford it, is not required but is expected and would be appreciated. If this
+library saves you time, then it's saving you money. The cost of developing
+the Forge software was on the order of several hundred hours and tens of
+thousands of dollars. We are attempting to strike a balance between helping
+the development community while not being taken advantage of by lucrative
+commercial entities for our efforts.
+
+-------------------------------------------------------------------------------
+New BSD License (3-clause)
+Copyright (c) 2010, Digital Bazaar, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Digital Bazaar, Inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL DIGITAL BAZAAR BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+-------------------------------------------------------------------------------
+        GNU GENERAL PUBLIC LICENSE
+           Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+          Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+        GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+          NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+
+
+******************************
+
+noop-logger
+0.1.1 <https://github.com/segmentio/noop-logger>
+license: MIT
+authors: undefined
+
+******************************
+
+npmlog
+4.1.2 <https://github.com/npm/npmlog>
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+******************************
+
+number-is-nan
+1.0.1 <https://github.com/sindresorhus/number-is-nan>
+The MIT License (MIT)
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+******************************
+
+object-assign
+4.1.1 <https://github.com/sindresorhus/object-assign>
+The MIT License (MIT)
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+******************************
+
+object-inspect
+1.13.2 <https://github.com/inspect-js/object-inspect>
+MIT License
+
+Copyright (c) 2013 James Halliday
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+object-keys
+1.1.1 <https://github.com/ljharb/object-keys>
+The MIT License (MIT)
+
+Copyright (C) 2013 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+******************************
+
+object.assign
+4.1.4 <https://github.com/ljharb/object.assign>
+The MIT License (MIT)
+
+Copyright (c) 2014 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+******************************
+
+once
+1.4.0 <https://github.com/isaacs/once>
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+******************************
+
+parse-node-version
+1.0.1 <https://github.com/gulpjs/parse-node-version>
+The MIT License (MIT)
+
+Copyright (c) 2018 Blaine Bublitz <blaine.bublitz@gmail.com> and Eric Schoffstall <yo@contra.io>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+
+******************************
+
+path-is-absolute
+1.0.1 <https://github.com/sindresorhus/path-is-absolute>
+The MIT License (MIT)
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+******************************
+
+pause-stream
+0.0.11 <https://github.com/dominictarr/pause-stream>
+Dual Licensed MIT and Apache 2
+
+The MIT License
+
+Copyright (c) 2013 Dominic Tarr
+
+Permission is hereby granted, free of charge, 
+to any person obtaining a copy of this software and 
+associated documentation files (the "Software"), to 
+deal in the Software without restriction, including 
+without limitation the rights to use, copy, modify, 
+merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom 
+the Software is furnished to do so, 
+subject to the following conditions:
+
+The above copyright notice and this permission notice 
+shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR 
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+    -----------------------------------------------------------------------
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright (c) 2013 Dominic Tarr
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+******************************
+
+pify
+3.0.0 <https://github.com/sindresorhus/pify>
+MIT License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+prebuild-install
+5.3.6 <https://github.com/prebuild/prebuild-install>
+The MIT License (MIT)
+
+Copyright (c) 2015 Mathias Buus
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+******************************
+
+process-nextick-args
+2.0.1 <https://github.com/calvinmetcalf/process-nextick-args>
+# Copyright (c) 2015 Calvin Metcalf
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+**THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.**
+
+
+******************************
+
+protobufjs
+7.4.0 <https://github.com/protobufjs/protobuf.js>
+This license applies to all parts of protobuf.js except those files
+either explicitly including or referencing a different license or
+located in a directory containing a different LICENSE file.
+
+---
+
+Copyright (c) 2016, Daniel Wirtz  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of its author, nor the names of its contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+---
+
+Code generated by the command line utilities is owned by the owner
+of the input file used when generating it. This code is not
+standalone and requires a support library to be linked with it. This
+support library is itself covered by the above license.
+
+
+******************************
+
+pump
+3.0.0 <https://github.com/mafintosh/pump>
+The MIT License (MIT)
+
+Copyright (c) 2014 Mathias Buus
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+******************************
+
+punycode
+1.3.2 <https://github.com/bestiejs/punycode.js>
+license: MIT
+authors: Mathias Bynens <https://mathiasbynens.be/>
+
+******************************
+
+querystring
+0.2.0 <https://github.com/Gozala/querystring>
+
+Copyright 2012 Irakli Gozalishvili. All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
+
+
+******************************
+
+rc
+1.2.8 <https://github.com/dominictarr/rc>
+Apache License, Version 2.0
+
+Copyright (c) 2011 Dominic Tarr
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+
+******************************
+
+readable-stream
+3.6.2 <https://github.com/nodejs/readable-stream>
+Node.js is licensed for use as follows:
+
+"""
+Copyright Node.js contributors. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
+"""
+
+This license applies to parts of Node.js originating from the
+https://github.com/joyent/node repository:
+
+"""
+Copyright Joyent, Inc. and other Node contributors. All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
+"""
+
+
+******************************
+
+regexp.prototype.flags
+1.4.3 <https://github.com/es-shims/RegExp.prototype.flags>
+The MIT License (MIT)
+
+Copyright (C) 2014 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+
+******************************
+
+registry-js
+1.16.1 <https://github.com/desktop/registry-js>
+MIT License
+
+Copyright (c) 2017 GitHub Desktop
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+remove-trailing-separator
+1.1.0 <https://github.com/darsain/remove-trailing-separator>
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+******************************
+
+replace-ext
+1.0.1 <https://github.com/gulpjs/replace-ext>
+The MIT License (MIT)
+
+Copyright (c) 2014 Blaine Bublitz <blaine.bublitz@gmail.com>, Eric Schoffstall <yo@contra.io> and other contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+require-directory
+2.1.1 <https://github.com/troygoode/node-require-directory>
+The MIT License (MIT)
+
+Copyright (c) 2011 Troy Goode <troygoode@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+require-from-string
+2.0.2 <https://github.com/floatdrop/require-from-string>
+The MIT License (MIT)
+
+Copyright (c) Vsevolod Strukchinsky <floatdrop@gmail.com> (github.com/floatdrop)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+******************************
+
+rxjs
+7.8.2 <https://github.com/reactivex/rxjs>
+                               Apache License
+                         Version 2.0, January 2004
+                      http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+    "License" shall mean the terms and conditions for use, reproduction,
+    and distribution as defined by Sections 1 through 9 of this document.
+
+    "Licensor" shall mean the copyright owner or entity authorized by
+    the copyright owner that is granting the License.
+
+    "Legal Entity" shall mean the union of the acting entity and all
+    other entities that control, are controlled by, or are under common
+    control with that entity. For the purposes of this definition,
+    "control" means (i) the power, direct or indirect, to cause the
+    direction or management of such entity, whether by contract or
+    otherwise, or (ii) ownership of fifty percent (50%) or more of the
+    outstanding shares, or (iii) beneficial ownership of such entity.
+
+    "You" (or "Your") shall mean an individual or Legal Entity
+    exercising permissions granted by this License.
+
+    "Source" form shall mean the preferred form for making modifications,
+    including but not limited to software source code, documentation
+    source, and configuration files.
+
+    "Object" form shall mean any form resulting from mechanical
+    transformation or translation of a Source form, including but
+    not limited to compiled object code, generated documentation,
+    and conversions to other media types.
+
+    "Work" shall mean the work of authorship, whether in Source or
+    Object form, made available under the License, as indicated by a
+    copyright notice that is included in or attached to the work
+    (an example is provided in the Appendix below).
+
+    "Derivative Works" shall mean any work, whether in Source or Object
+    form, that is based on (or derived from) the Work and for which the
+    editorial revisions, annotations, elaborations, or other modifications
+    represent, as a whole, an original work of authorship. For the purposes
+    of this License, Derivative Works shall not include works that remain
+    separable from, or merely link (or bind by name) to the interfaces of,
+    the Work and Derivative Works thereof.
+
+    "Contribution" shall mean any work of authorship, including
+    the original version of the Work and any modifications or additions
+    to that Work or Derivative Works thereof, that is intentionally
+    submitted to Licensor for inclusion in the Work by the copyright owner
+    or by an individual or Legal Entity authorized to submit on behalf of
+    the copyright owner. For the purposes of this definition, "submitted"
+    means any form of electronic, verbal, or written communication sent
+    to the Licensor or its representatives, including but not limited to
+    communication on electronic mailing lists, source code control systems,
+    and issue tracking systems that are managed by, or on behalf of, the
+    Licensor for the purpose of discussing and improving the Work, but
+    excluding communication that is conspicuously marked or otherwise
+    designated in writing by the copyright owner as "Not a Contribution."
+
+    "Contributor" shall mean Licensor and any individual or Legal Entity
+    on behalf of whom a Contribution has been received by Licensor and
+    subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+    this License, each Contributor hereby grants to You a perpetual,
+    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+    copyright license to reproduce, prepare Derivative Works of,
+    publicly display, publicly perform, sublicense, and distribute the
+    Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+    this License, each Contributor hereby grants to You a perpetual,
+    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+    (except as stated in this section) patent license to make, have made,
+    use, offer to sell, sell, import, and otherwise transfer the Work,
+    where such license applies only to those patent claims licensable
+    by such Contributor that are necessarily infringed by their
+    Contribution(s) alone or by combination of their Contribution(s)
+    with the Work to which such Contribution(s) was submitted. If You
+    institute patent litigation against any entity (including a
+    cross-claim or counterclaim in a lawsuit) alleging that the Work
+    or a Contribution incorporated within the Work constitutes direct
+    or contributory patent infringement, then any patent licenses
+    granted to You under this License for that Work shall terminate
+    as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+    Work or Derivative Works thereof in any medium, with or without
+    modifications, and in Source or Object form, provided that You
+    meet the following conditions:
+
+    (a) You must give any other recipients of the Work or
+        Derivative Works a copy of this License; and
+
+    (b) You must cause any modified files to carry prominent notices
+        stating that You changed the files; and
+
+    (c) You must retain, in the Source form of any Derivative Works
+        that You distribute, all copyright, patent, trademark, and
+        attribution notices from the Source form of the Work,
+        excluding those notices that do not pertain to any part of
+        the Derivative Works; and
+
+    (d) If the Work includes a "NOTICE" text file as part of its
+        distribution, then any Derivative Works that You distribute must
+        include a readable copy of the attribution notices contained
+        within such NOTICE file, excluding those notices that do not
+        pertain to any part of the Derivative Works, in at least one
+        of the following places: within a NOTICE text file distributed
+        as part of the Derivative Works; within the Source form or
+        documentation, if provided along with the Derivative Works; or,
+        within a display generated by the Derivative Works, if and
+        wherever such third-party notices normally appear. The contents
+        of the NOTICE file are for informational purposes only and
+        do not modify the License. You may add Your own attribution
+        notices within Derivative Works that You distribute, alongside
+        or as an addendum to the NOTICE text from the Work, provided
+        that such additional attribution notices cannot be construed
+        as modifying the License.
+
+    You may add Your own copyright statement to Your modifications and
+    may provide additional or different license terms and conditions
+    for use, reproduction, or distribution of Your modifications, or
+    for any such Derivative Works as a whole, provided Your use,
+    reproduction, and distribution of the Work otherwise complies with
+    the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+    any Contribution intentionally submitted for inclusion in the Work
+    by You to the Licensor shall be under the terms and conditions of
+    this License, without any additional terms or conditions.
+    Notwithstanding the above, nothing herein shall supersede or modify
+    the terms of any separate license agreement you may have executed
+    with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+    names, trademarks, service marks, or product names of the Licensor,
+    except as required for reasonable and customary use in describing the
+    origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+    agreed to in writing, Licensor provides the Work (and each
+    Contributor provides its Contributions) on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+    implied, including, without limitation, any warranties or conditions
+    of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+    PARTICULAR PURPOSE. You are solely responsible for determining the
+    appropriateness of using or redistributing the Work and assume any
+    risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+    whether in tort (including negligence), contract, or otherwise,
+    unless required by applicable law (such as deliberate and grossly
+    negligent acts) or agreed to in writing, shall any Contributor be
+    liable to You for damages, including any direct, indirect, special,
+    incidental, or consequential damages of any character arising as a
+    result of this License or out of the use or inability to use the
+    Work (including but not limited to damages for loss of goodwill,
+    work stoppage, computer failure or malfunction, or any and all
+    other commercial damages or losses), even if such Contributor
+    has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+    the Work or Derivative Works thereof, You may choose to offer,
+    and charge a fee for, acceptance of support, warranty, indemnity,
+    or other liability obligations and/or rights consistent with this
+    License. However, in accepting such obligations, You may act only
+    on Your own behalf and on Your sole responsibility, not on behalf
+    of any other Contributor, and only if You agree to indemnify,
+    defend, and hold each Contributor harmless for any liability
+    incurred by, or claims asserted against, such Contributor by reason
+    of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+    To apply the Apache License to your work, attach the following
+    boilerplate notice, with the fields enclosed by brackets "[]"
+    replaced with your own identifying information. (Don't include
+    the brackets!)  The text should be enclosed in the appropriate
+    comment syntax for the file format. We also recommend that a
+    file or class name and description of purpose be included on the
+    same "printed page" as the copyright notice for easier
+    identification within third-party archives.
+
+ Copyright (c) 2015-2018 Google, Inc., Netflix, Inc., Microsoft Corp. and contributors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ 
+
+
+******************************
+
+safe-buffer
+5.2.1 <https://github.com/feross/safe-buffer>
+The MIT License (MIT)
+
+Copyright (c) Feross Aboukhadijeh
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+******************************
+
+safer-buffer
+2.1.2 <https://github.com/ChALkeR/safer-buffer>
+MIT License
+
+Copyright (c) 2018 Nikita Skovoroda <chalkerx@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+sax
+1.2.1 <https://github.com/isaacs/sax-js>
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+====
+
+`String.fromCodePoint` by Mathias Bynens used according to terms of MIT
+License, as follows:
+
+    Copyright Mathias Bynens <https://mathiasbynens.be/>
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+semver
+5.7.2 <https://github.com/npm/node-semver>
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+******************************
+
+set-blocking
+2.0.0 <https://github.com/yargs/set-blocking>
+Copyright (c) 2016, Contributors
+
+Permission to use, copy, modify, and/or distribute this software
+for any purpose with or without fee is hereby granted, provided
+that the above copyright notice and this permission notice
+appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE
+LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+******************************
+
+set-function-length
+1.2.2 <https://github.com/ljharb/set-function-length>
+MIT License
+
+Copyright (c) Jordan Harband and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+side-channel
+1.0.6 <https://github.com/ljharb/side-channel>
+MIT License
+
+Copyright (c) 2019 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+signal-exit
+3.0.7 <https://github.com/tapjs/signal-exit>
+The ISC License
+
+Copyright (c) 2015, Contributors
+
+Permission to use, copy, modify, and/or distribute this software
+for any purpose with or without fee is hereby granted, provided
+that the above copyright notice and this permission notice
+appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE
+LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+******************************
+
+simple-concat
+1.0.1 <https://github.com/feross/simple-concat>
+The MIT License (MIT)
+
+Copyright (c) Feross Aboukhadijeh
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+simple-get
+3.1.1 <https://github.com/feross/simple-get>
+The MIT License (MIT)
+
+Copyright (c) Feross Aboukhadijeh
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+source-map
+0.6.1 <https://github.com/mozilla/source-map>
+
+Copyright (c) 2009-2011, Mozilla Foundation and contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the names of the Mozilla Foundation nor the names of project
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+******************************
+
+split
+1.0.1 <https://github.com/dominictarr/split>
+license: MIT
+authors: Dominic Tarr <dominic.tarr@gmail.com> (http://bit.ly/dominictarr)
+
+******************************
+
+stream-combiner
+0.2.2 <https://github.com/dominictarr/stream-combiner>
+Copyright (c) 2012 'Dominic Tarr'
+
+Permission is hereby granted, free of charge, 
+to any person obtaining a copy of this software and 
+associated documentation files (the "Software"), to 
+deal in the Software without restriction, including 
+without limitation the rights to use, copy, modify, 
+merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom 
+the Software is furnished to do so, 
+subject to the following conditions:
+
+The above copyright notice and this permission notice 
+shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR 
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+string-width
+4.2.3 <https://github.com/sindresorhus/string-width>
+MIT License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+string.prototype.trimend
+1.0.5 <https://github.com/es-shims/String.prototype.trimEnd>
+MIT License
+
+Copyright (c) 2017 Khaled Al-Ansari
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+string.prototype.trimstart
+1.0.5 <https://github.com/es-shims/String.prototype.trimStart>
+MIT License
+
+Copyright (c) 2017 Khaled Al-Ansari
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+string_decoder
+1.3.0 <https://github.com/nodejs/string_decoder>
+Node.js is licensed for use as follows:
+
+"""
+Copyright Node.js contributors. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
+"""
+
+This license applies to parts of Node.js originating from the
+https://github.com/joyent/node repository:
+
+"""
+Copyright Joyent, Inc. and other Node contributors. All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
+"""
+
+
+
+******************************
+
+strip-ansi
+6.0.1 <https://github.com/chalk/strip-ansi>
+MIT License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+strip-json-comments
+2.0.1 <https://github.com/sindresorhus/strip-json-comments>
+The MIT License (MIT)
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+******************************
+
+tar-fs
+2.1.1 <https://github.com/mafintosh/tar-fs>
+The MIT License (MIT)
+
+Copyright (c) 2014 Mathias Buus
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+******************************
+
+tar-stream
+2.2.0 <https://github.com/mafintosh/tar-stream>
+The MIT License (MIT)
+
+Copyright (c) 2014 Mathias Buus
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+******************************
+
+through
+2.3.8 <https://github.com/dominictarr/through>
+Apache License, Version 2.0
+
+Copyright (c) 2011 Dominic Tarr
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+
+******************************
+
+time-stamp
+1.1.0 <https://github.com/jonschlinkert/time-stamp>
+The MIT License (MIT)
+
+Copyright (c) 2015-2017, Jon Schlinkert
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+******************************
+
+tslib
+2.8.1 <https://github.com/Microsoft/tslib>
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+******************************
+
+tunnel-agent
+0.6.0 <https://github.com/mikeal/tunnel-agent>
+Apache License
+
+Version 2.0, January 2004
+
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of this License; and
+
+You must cause any modified files to carry prominent notices stating that You changed the files; and
+
+You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+
+If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+******************************
+
+typescript
+4.9.5 <https://github.com/Microsoft/TypeScript>
+Apache License
+
+Version 2.0, January 2004
+
+http://www.apache.org/licenses/ 
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of this License; and
+
+You must cause any modified files to carry prominent notices stating that You changed the files; and
+
+You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+
+If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+
+******************************
+
+unbox-primitive
+1.0.2 <https://github.com/ljharb/unbox-primitive>
+MIT License
+
+Copyright (c) 2019 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+undici
+6.21.2 <https://github.com/nodejs/undici>
+MIT License
+
+Copyright (c) Matteo Collina and Undici contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+undici-types
+6.19.8 <https://github.com/nodejs/undici>
+MIT License
+
+Copyright (c) Matteo Collina and Undici contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+url
+0.10.3 <https://github.com/defunctzombie/node-url>
+The MIT License (MIT)
+
+Copyright Joyent, Inc. and other Node contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+util
+0.12.5 <https://github.com/browserify/node-util>
+Copyright Joyent, Inc. and other Node contributors. All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
+
+
+******************************
+
+util-deprecate
+1.0.2 <https://github.com/TooTallNate/util-deprecate>
+(The MIT License)
+
+Copyright (c) 2014 Nathan Rajlich <nathan@tootallnate.net>
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+uuid
+8.0.0 <https://github.com/uuidjs/uuid>
+The MIT License (MIT)
+
+Copyright (c) 2010-2020 Robert Kieffer and other contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+vinyl
+2.2.1 <https://github.com/gulpjs/vinyl>
+The MIT License (MIT)
+
+Copyright (c) 2013 Blaine Bublitz <blaine.bublitz@gmail.com>, Eric Schoffstall <yo@contra.io> and other contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+vscode-jsonrpc
+8.2.0 <https://github.com/Microsoft/vscode-languageserver-node>
+Copyright (c) Microsoft Corporation
+
+All rights reserved.
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+vscode-languageserver
+9.0.1 <https://github.com/Microsoft/vscode-languageserver-node>
+Copyright (c) Microsoft Corporation
+
+All rights reserved.
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+vscode-languageserver-protocol
+3.17.5 <https://github.com/Microsoft/vscode-languageserver-node>
+Copyright (c) Microsoft Corporation
+
+All rights reserved.
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+vscode-languageserver-textdocument
+1.0.12 <https://github.com/Microsoft/vscode-languageserver-node>
+Copyright (c) Microsoft Corporation
+
+All rights reserved.
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+vscode-languageserver-types
+3.17.5 <https://github.com/Microsoft/vscode-languageserver-node>
+Copyright (c) Microsoft Corporation
+
+All rights reserved.
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+vscode-nls
+5.2.0 <https://github.com/Microsoft/vscode-nls>
+The MIT License (MIT)
+
+Copyright (c) Microsoft Corporation
+
+All rights reserved. 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation 
+files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, 
+modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software 
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT 
+OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+vscode-nls-dev
+4.0.4 <https://github.com/Microsoft/vscode-nls-dev>
+The MIT License (MIT)
+
+Copyright (c) Microsoft Corporation
+
+All rights reserved. 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation 
+files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, 
+modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software 
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS 
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT 
+OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+vscode-uri
+3.1.0 <https://github.com/microsoft/vscode-uri>
+The MIT License (MIT)
+
+Copyright (c) Microsoft
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+******************************
+
+which-boxed-primitive
+1.0.2 <https://github.com/inspect-js/which-boxed-primitive>
+MIT License
+
+Copyright (c) 2019 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+which-pm-runs
+1.1.0 <https://github.com/zkochan/packages/tree/main/which-pm-runs>
+The MIT License (MIT)
+
+Copyright (c) 2017-2022 Zoltan Kochan <z@kochan.io>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+which-typed-array
+1.1.8 <https://github.com/inspect-js/which-typed-array>
+The MIT License (MIT)
+
+Copyright (c) 2015 Jordan Harband
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+
+******************************
+
+wide-align
+1.1.5 <https://github.com/iarna/wide-align>
+Copyright (c) 2015, Rebecca Turner <me@re-becca.org>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+
+******************************
+
+win-ca
+3.5.1 <https://github.com/ukoloff/win-ca>
+MIT License
+
+Copyright (c) 2020 Stas Ukolov
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+******************************
+
+wrap-ansi
+7.0.0 <https://github.com/chalk/wrap-ansi>
+MIT License
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+******************************
+
+wrappy
+1.0.2 <https://github.com/npm/wrappy>
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+******************************
+
+xml2js
+0.6.2 <https://github.com/Leonidas-from-XIV/node-xml2js>
+Copyright 2010, 2011, 2012, 2013. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
+
+
+******************************
+
+xmlbuilder
+11.0.1 <https://github.com/oozcitak/xmlbuilder-js>
+The MIT License (MIT)
+
+Copyright (c) 2013 Ozgur Ozcitak
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+******************************
+
+y18n
+5.0.8 <https://github.com/yargs/y18n>
+Copyright (c) 2015, Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright notice
+and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+THIS SOFTWARE.
+
+
+******************************
+
+yargs
+17.7.2 <https://github.com/yargs/yargs>
+MIT License
+
+Copyright 2010 James Halliday (mail@substack.net); Modified work Copyright 2014 Contributors (ben@npmjs.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+******************************
+
+yargs-parser
+21.1.1 <https://github.com/yargs/yargs-parser>
+Copyright (c) 2016, Contributors
+
+Permission to use, copy, modify, and/or distribute this software
+for any purpose with or without fee is hereby granted, provided
+that the above copyright notice and this permission notice
+appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE
+LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/README.md b/README.md
index aa208edd9a2..b841f69ec0c 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,50 @@
-# AWS Toolkit for Visual Studio Code
+# AWS Extensions for Visual Studio Code
 
-| System                                                                                                  | Status                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-| ------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| Build ([main branch](https://github.com/aws/aws-toolkit-vscode/commits/master))                         | [![GitHub CI status](https://github.com/aws/aws-toolkit-vscode/workflows/CI/badge.svg?branch=master)](https://github.com/aws/aws-toolkit-vscode/actions?query=branch%3Amaster) ![CodeBuild Build Status - main branch](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiMlluaDRTMnZLdmMvcFREQVQ4RjFoK0FUSTZPdlRVcWJlQ2gwRElLT2gxZDhMeno5MThZZnlXdURDVFFjOWdqSEQ5QjVBYm0xSURoU3E1RTVHejltcnZrPSIsIml2UGFyYW1ldGVyU3BlYyI6IkY3SE9CaG1oMHhJUmsyakkiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=master) [![Coverage](https://img.shields.io/codecov/c/github/aws/aws-toolkit-vscode/master.svg)](https://codecov.io/gh/aws/aws-toolkit-vscode/branch/master) [![LGTM Grade](https://img.shields.io/lgtm/grade/javascript/github/aws/aws-toolkit-vscode)](https://lgtm.com/projects/g/aws/aws-toolkit-vscode/) |
-| [Marketplace](https://marketplace.visualstudio.com/items?itemName=AmazonWebServices.aws-toolkit-vscode) | [![Marketplace Version](https://img.shields.io/vscode-marketplace/v/AmazonWebServices.aws-toolkit-vscode.svg) ![Marketplace Downloads](https://img.shields.io/vscode-marketplace/d/AmazonWebServices.aws-toolkit-vscode.svg)](https://marketplace.visualstudio.com/items?itemName=AmazonWebServices.aws-toolkit-vscode)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
+[![Coverage](https://img.shields.io/codecov/c/github/aws/aws-toolkit-vscode/master.svg)](https://codecov.io/gh/aws/aws-toolkit-vscode/branch/master)
 
-The AWS Toolkit for Visual Studio Code is an extension for working with AWS services such as AWS Lambda.
+This project is open source. We encourage issues, feature requests, code reviews, pull requests or
+any positive contribution. See [CONTRIBUTING.md](CONTRIBUTING.md) to get started.
 
-The Toolkit is available from the [Visual Studio Marketplace](https://marketplace.visualstudio.com/itemdetails?itemName=AmazonWebServices.aws-toolkit-vscode).
+### Amazon Q
 
-This is an open source project because we want you to be involved. We love issues, feature requests, code reviews, pull
-requests or any positive contribution. See [CONTRIBUTING.md](CONTRIBUTING.md).
+[![Marketplace Version](https://img.shields.io/vscode-marketplace/v/AmazonWebServices.amazon-q-vscode.svg) ![Marketplace Downloads](https://img.shields.io/vscode-marketplace/d/AmazonWebServices.amazon-q-vscode.svg)](https://marketplace.visualstudio.com/items?itemName=AmazonWebServices.amazon-q-vscode)
+
+Amazon Q for VS Code is a [VS Code extension](https://marketplace.visualstudio.com/items?itemName=AmazonWebServices.amazon-q-vscode) for connecting your IDE to [Amazon Q](https://aws.amazon.com/q/developer/) and leveraging generative AI to accelerate your software development.
+
+-   Code faster with inline code suggestions as you type
+-   Chat with [Amazon Q](https://aws.amazon.com/q/developer/) to generate code, explain code, and get answers to questions about software development
+-   Analyze and fix security vulnerabilities in your project
+-   Upgrade your Java applications
+
+[Project Directory](https://github.com/aws/aws-toolkit-vscode/tree/master/packages/amazonq)
+
+### AWS Toolkit
+
+[![Marketplace Version](https://img.shields.io/vscode-marketplace/v/AmazonWebServices.aws-toolkit-vscode.svg) ![Marketplace Downloads](https://img.shields.io/vscode-marketplace/d/AmazonWebServices.aws-toolkit-vscode.svg)](https://marketplace.visualstudio.com/items?itemName=AmazonWebServices.aws-toolkit-vscode)
+
+AWS Toolkit is a [VS Code extension](https://marketplace.visualstudio.com/itemdetails?itemName=AmazonWebServices.aws-toolkit-vscode) for connecting your IDE to your AWS resources:
+
+-   Connect with [IAM credentials](https://docs.aws.amazon.com/sdkref/latest/guide/access-users.html),
+    [IAM Identity Center (SSO)](https://docs.aws.amazon.com/singlesignon/latest/userguide/what-is.html),
+    or [AWS Builder ID](https://docs.aws.amazon.com/signin/latest/userguide/differences-aws_builder_id.html)
+-   Connect VSCode to your EC2 instances
+-   Connect to your [CodeCatalyst](https://codecatalyst.aws/) Dev Environments
+-   Debug your Lambda functions using [SAM CLI](https://github.com/aws/aws-sam-cli)
+-   Check and autocomplete code in SAM/CFN (CloudFormation) `template.yaml` files
+-   `Open Terminal` on your EC2 instances or ECS tasks
+-   `Search Log Group` on your CloudWatch logs
+-   Browse your AWS resources
+
+[Project Directory](https://github.com/aws/aws-toolkit-vscode/tree/master/packages/toolkit)
 
 ## Documentation
 
--   The [Quick Start Guide](README.quickstart.vscode.md) provides an overview
-    of common Toolkit tasks.
--   The [User Guide](https://docs.aws.amazon.com/console/toolkit-for-vscode/welcome)
-    contains detailed instructions for getting up and running with the Toolkit.
+-   Quick Start Guides for...
+    -   [Amazon Q](https://marketplace.visualstudio.com/itemdetails?itemName=AmazonWebServices.amazon-q-vscode)
+    -   [AWS Toolkit](https://marketplace.visualstudio.com/itemdetails?itemName=AmazonWebServices.aws-toolkit-vscode)
+-   [FAQ / Troubleshooting](./docs/faq-credentials.md)
+-   [User Guide](https://docs.aws.amazon.com/console/toolkit-for-vscode/welcome)
+-   General info about [AWS SDKs and Tools](https://docs.aws.amazon.com/sdkref/latest/guide/overview.html)
 
 ## Feedback
 
@@ -27,7 +54,24 @@ We want your feedback!
 -   [Ask a question](https://github.com/aws/aws-toolkit-vscode/issues/new?labels=guidance&template=guidance_request.md)
 -   [Request a new feature](https://github.com/aws/aws-toolkit-vscode/issues/new?labels=feature-request&template=feature_request.md)
 -   [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
 
-The **AWS Toolkit for Visual Studio Code** is distributed under the [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0).
+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/README.quickstart.cloud9.md b/README.quickstart.cloud9.md
deleted file mode 100644
index e17daefce07..00000000000
--- a/README.quickstart.cloud9.md
+++ /dev/null
@@ -1,146 +0,0 @@
-# <a id="top"></a>AWS Toolkit
-
-The AWS Toolkit extension for AWS Cloud9 that enables you to interact with [Amazon Web Services (AWS)](https://aws.amazon.com/what-is-aws/).
-See the [user guide](https://docs.aws.amazon.com/cloud9/latest/user-guide/toolkit-welcome.html) for complete documentation.
-
-Try the [AWS Code Sample Catalog](https://docs.aws.amazon.com/code-samples/latest/catalog/welcome.html) to start coding with the AWS SDK.
-
-# <a id="features"></a>Features
-
--   [AWS Explorer](#ui-components-aws-expl)
-    -   API Gateway
-    -   App Runner
-    -   CloudFormation stacks
-    -   [CloudWatch Logs](https://docs.aws.amazon.com/cloud9/latest/user-guide/cloudwatch-logs-toolkit.html)
-    -   ECR
-    -   [ECS](https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/ecs-exec.html)
-    -   IoT explorer
-    -   Lambda functions
-    -   S3 explorer
--   [Developer Tools](#ui-components-dev-tools)
-    -   [CDK Explorer](#ui-components-cdk-expl)
-    -   [CodeWhisperer](#codewhisperer)
--   [AWS Serverless Applications (SAM)](#sam-and-lambda)
--   [`AWS:` Commands](#aws-commands)
-
----
-
-## <a id="ui-components-aws-expl"></a>AWS Explorer
-
-The **AWS Explorer** provides access to the AWS services that you can work with when using the Toolkit. To see the **AWS Explorer**, choose the **AWS** icon in the **Activity bar**.
-
-## ![Overview, AWS Explorer](./resources/marketplace/cloud9/overview-aws-explorer-en.png)
-
-## <a id="ui-components-dev-tools"></a>Developer Tools
-
-The **Developer Tools** panel is a section for developer-focused tooling curated for working in an IDE. The **Developer Tools** panel can be found underneath the **AWS Explorer** when the **AWS icon** is selected in the **Activity bar**.
-
-## { [Return to Top](#top) }
-
-## <a id="ui-components-cdk-expl"></a>CDK Explorer
-
-The **AWS CDK Explorer** enables you to work with [AWS Cloud Development Kit (CDK)](https://aws.amazon.com/cdk/) applications. It shows a top-level view of your CDK applications that have been sythesized in your workspace.
-
-With the CDK explorer, you can navigate the CDK application's infrastructure stacks, resources, and policies.
-
-For full details see the [AWS CDK Explorer](https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/cdk-explorer.html) in the user guide.
-
-{ [Return to Top](#top) }
-
-## <a id="codewhisperer"></a>Amazon CodeWhisperer
-
-**Amazon CodeWhisperer** provides inline code suggestions using machine learning and natural language processing on the contents of your current file. Supported languages include: Java, Python and Javascript.
-
-Once enabled, CodeWhisperer will provide code suggestions automatically and can also be requested manually using option+c (mac) / alt+c (PC). To accept a suggestion and add it to your file, press Tab, Enter or click on it. To dismiss a suggestion, press escape or keep typing.
-
-For more information, see [Amazon CodeWhisperer](https://aws.amazon.com/codewhisperer) in our user guide.
-
-## { [Return to Top](#top) }
-
-## <a id="sam-and-lambda"></a> AWS Serverless Applications
-
-The AWS Toolkit enables you to develop [AWS serverless applications](https://aws.amazon.com/serverless/) locally. It also provides _Inline Actions_ in Cloud9 to do the following:
-
--   Use SAM (serverless application model) templates to build and debug your locally developed AWS serverless applications.
--   Run selected [AWS Lambda](https://aws.amazon.com/lambda/) functions.
-
-To start debugging with a SAM template, click the `Add Debug Configuration` _Inline Action_ in the template file.
-
-![Add Debug Configuration Template](./resources/marketplace/cloud9/Codelens-YAML-template.png)
-
-###### The _Inline Action_ indicator in the SAM template allows you to add a debug configuration for the serverless application.</h6>
-
-Alternatively, you can run and debug just the AWS Lambda function and exclude other resources defined by the SAM template. Again, use an _Inline Action_ indicator for an AWS Lambda-function handler. (A _handler_ is a function that Lambda calls to start execution of a Lambda function.)
-
-![Add Debug Configuration Direct](./resources/marketplace/cloud9/Codelens-direct-function.png)
-
-###### The _Inline Action_ indicator in the application file lets you add a debug configuration for a selected AWS Lambda function.
-
-When you run a debug session, the status and results are shown in the **AWS Toolkit** output channel. If the toolkit does not have an open **AWS Toolkit** output channel, one can be created with the New Tab button.
-
-![Configure and Run](./resources/marketplace/cloud9/sam-configure-and-run-still-en.png)
-
-###### After a local run is complete, the output appears in the **OUTPUT** tab.
-
-When you're satisfied with performance, you can [deploy your serverless application](https://docs.aws.amazon.com/cloud9/latest/user-guide/deploy-serverless-app.html). The SAM template is converted to a CloudFormation template, which is then used to deploy all the application's assets to the AWS Cloud.
-
-### Supported runtimes
-
-The Toolkit _local SAM debugging_ feature supports these runtimes:
-
--   JavaScript (Node.js 12.x, 14.x)
--   Python (3.7, 3.8, 3.9)
-
-For more information see [Working with AWS Serverless Applications](https://docs.aws.amazon.com/cloud9/latest/user-guide/serverless-apps-toolkit.html) in the user guide.
-
-{ [Return to Top](#top) }
-
----
-
-## <a id="aws-commands"></a>`AWS:` Commands
-
-The Toolkit provides commands (prefixed with `AWS:`) to the AWS Cloud9 _Go to Anything panel_, available by clicking the search bar and typing "." or via hotkey.
-
-| OS      | Hotkey   |
-| :------ | :------- |
-| Windows | `CTRL-.` |
-| macOS   | `CMD-.`  |
-
-![Go to Anything panel](./resources/marketplace/cloud9/open-commands-en.png)
-
-| AWS Command                               | Description                                                                                                                                                                                                                                |
-| :---------------------------------------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `AWS: About Toolkit`                      | Displays information about the AWS Toolkit.                                                                                                                                                                                                |
-| `AWS: Add SAM Debug Configuration`        | Creates an `aws-sam` Debug Configuration from a function in the given source file                                                                                                                                                          |
-| `AWS: Connect to AWS`                     | Select or create a connection to AWS.                                                                                                                                                                                                      |
-| `AWS: Create a new Issue on Github`       | Opens the AWS Toolkit's [New Issue page on Github](https://github.com/aws/aws-toolkit-vscode/issues/new/choose).                                                                                                                           |
-| `AWS: Create Credentials Profile`         | Creates an AWS credentials profile.                                                                                                                                                                                                        |
-| `AWS: Create Lambda SAM Application`      | Generates code files for a new AWS serverless Lambda application. For more information, see [Creating a Serverless Application](https://docs.aws.amazon.com/cloud9/latest/user-guide/latest/user-guide/create-sam.html) in the user guide. |
-| `AWS: Create new CloudFormation Template` | Creates a new starter Cloudformation Template                                                                                                                                                                                              |
-| `AWS: Create new SAM Template`            | Creates a new starter SAM Template                                                                                                                                                                                                         |
-| `AWS: Deploy SAM Application`             | Deploys a local serverless application to an AWS account. For more information, see [Deploying a Serverless Application](https://docs.aws.amazon.com/cloud9/latest/user-guide/deploy-serverless-app.html) in the user guide.               |
-| `AWS: Edit Credentials`                   | Opens the `~/.aws/credentials` or `~/.aws/config` file for editing.                                                                                                                                                                        |
-| `AWS: Edit SAM Debug Configuration`       | Shows a tool that helps you create, edit, run, and debug a SAM _launch config_ (`type:aws-sam`).                                                                                                                                           |
-| `AWS: Detect SAM CLI`                     | Checks whether the Toolkit can communicate correctly with the AWS SAM CLI that is installed.                                                                                                                                               |
-| `AWS: Show or Hide Regions`               | Adds or removes AWS Regions in the **AWS Explorer**.                                                                                                                                                                                       |
-| `AWS: Sign out`                           | Disconnect the Toolkit from the current AWS connection.                                                                                                                                                                                    |
-| `AWS: Submit Quick Feedback...`           | Submit a private, one-way message and sentiment to the AWS Toolkit dev team. For larger issues that warrant conversations or bugfixes, please submit an issue in Github with the **AWS: Create a New Issue on Github** command.            |
-| `AWS: Toggle SAM hints in source files`   | Toggles AWS SAM-related Inline Actions in source files                                                                                                                                                                                     |
-| `AWS: View Toolkit Logs`                  | Displays log files that contain general Toolkit diagnostic information.                                                                                                                                                                    |
-| `AWS: View Quick Start`                   | Open this quick-start guide.                                                                                                                                                                                                               |
-| `AWS: View Toolkit Documentation`         | Opens the [user guide](https://docs.aws.amazon.com/cloud9/latest/user-guide/toolkit-welcome.html) for the Toolkit.                                                                                                                         |
-| `AWS: View Source on GitHub`              | Opens the [GitHub repository](https://github.com/aws/aws-toolkit-vscode) for the Toolkit.                                                                                                                                                  |
-
-{ [Return to Top](#top) }
-
----
-
-# <a id="get-help"></a>Get help
-
-For additional details on how to use the AWS Toolkit, see the [user guide](https://docs.aws.amazon.com/cloud9/latest/user-guide/toolkit-welcome.html).
-
-To report issues with the Toolkit or to propose Toolkit code changes, see the [aws/aws-toolkit-vscode](https://github.com/aws/aws-toolkit-vscode) repository on GitHub.
-
-You can also [contact AWS](https://aws.amazon.com/contact-us/) directly.
-
-{ [Return to Top](#top) }
diff --git a/README.quickstart.vscode.md b/README.quickstart.vscode.md
deleted file mode 100644
index e82b091080f..00000000000
--- a/README.quickstart.vscode.md
+++ /dev/null
@@ -1,313 +0,0 @@
-# <a id="top"></a>AWS Toolkit
-
-The AWS Toolkit extension for Visual Studio Code enables you to interact with [Amazon Web Services (AWS)](https://aws.amazon.com/what-is-aws/).
-See the [user guide](https://docs.aws.amazon.com/console/toolkit-for-vscode/welcome) for complete documentation.
-
-Try the [AWS Code Sample Catalog](https://docs.aws.amazon.com/code-samples/latest/catalog/welcome.html) to start coding with the AWS SDK.
-
-See [Setup](#additional-setup-steps) for prerequisites. If you run into a problem, try [support](#get-help).
-
-# <a id="features"></a>Features
-
--   [AWS Explorer](#ui-components-aws-expl)
-    -   API Gateway
-    -   [App Runner](https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/using-apprunner.html)
-    -   CloudFormation stacks
-    -   CloudWatch Logs
-    -   ECR
-    -   [ECS](https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/ecs-exec.html)
-    -   EventBridge schemas
-    -   [IoT explorer](https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/iot-start.html)
-    -   Lambda functions
-    -   S3 explorer
-    -   Step Functions
--   [Developer Tools](#ui-components-dev-tools)
-    -   [CDK Explorer](#ui-components-cdk-expl)
-    -   [CodeWhisperer](#codewhisperer)
--   [AWS Serverless Applications (SAM)](#sam-and-lambda)
--   [Amazon CloudWatch Logs](#cloudwatchlogs)
--   [Amazon EventBridge Schemas](#eventbridge)
--   [Amazon ECS task definition files](#ecs-files)
--   [AWS Step Functions](#sfn-files)
--   [AWS Systems Manager](#ssm-files)
--   [`AWS:` Commands](#aws-commands)
--   [Experimental Features](#experimental-features)
-
----
-
-## <a id="ui-components-aws-expl"></a>AWS Explorer
-
-The **AWS Explorer** provides access to the AWS services that you can work with when using the Toolkit. To see the **AWS Explorer**, choose the **AWS** icon in the **Activity bar**.
-
-![Overview, AWS Explorer](./resources/marketplace/vscode/overview-aws-explorer.png)
-
-{ [Return to Top](#top) }
-
-## <a id="ui-components-dev-tools"></a>Developer Tools
-
-The **Developer Tools** panel is a section for developer-focused tooling curated for working in an IDE. The **Developer Tools** panel can be found underneath the **AWS Explorer** when the **AWS icon** is selected in the **Activity bar**.
-
-![Overview, Developer Tools](./resources/marketplace/vscode/overview-codewhisperer.png)
-
-## { [Return to Top](#top) }
-
-## <a id="ui-components-cdk-expl"></a>CDK Explorer
-
-The **AWS CDK Explorer** enables you to work with [AWS Cloud Development Kit (CDK)](https://aws.amazon.com/cdk/) applications. It shows a top-level view of your CDK applications that have been sythesized in your workspace.
-
-![Overview, AWS CDK Explorer](./resources/marketplace/vscode/overview-cdk.png)
-
-With the CDK explorer, you can navigate the CDK application's infrastructure stacks, resources, and policies.
-
-![AWS CDK Tree View](./resources/marketplace/vscode/cdk-tree-view.png)
-
-For full details see the [AWS CDK Explorer](https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/cdk-explorer.html) in the user guide.
-
-{ [Return to Top](#top) }
-
-## <a id="codewhisperer"></a>Amazon CodeWhisperer
-
-**Amazon CodeWhisperer** provides inline code suggestions using machine learning and natural language processing on the contents of your current file. Supported languages include: Java, Python and Javascript.
-
-Once enabled, CodeWhisperer will provide code suggestions automatically and can also be requested manually using option+c (mac) / alt+c (PC). CodeWhisperer may provide multiple suggestions; use the left- and right-arrow to navigate between suggestions. To accept a suggestion and add it to your file, press Tab. To dismiss a suggestion, press escape or keep typing.
-
-In addition to providing code suggestions within your current file, CodeWhisperer can scan your entire package to identify security issues. To initiate a security scan, go to the CodeWhisperer section in the **Developer Tools** panel and select “Run security scan”. Results will be listed in the Problems panel.
-
-![CodeWhisperer](./resources/marketplace/vscode/overview-codewhisperer.png)
-
-For more information, see [Amazon CodeWhisperer](https://aws.amazon.com/codewhisperer) in our user guide.
-
-{ [Return to Top](#top) }
-
-## <a id="sam-and-lambda"></a> AWS Serverless Applications
-
-The AWS Toolkit enables you to develop [AWS serverless applications](https://aws.amazon.com/serverless/) locally. It also provides _CodeLenses_ in VS Code to do the following:
-
--   Use SAM (serverless application model) templates to build and debug your locally developed AWS serverless applications.
--   Run selected [AWS Lambda](https://aws.amazon.com/lambda/) functions.
-
-To start debugging with a SAM template, click the `Add Debug Configuration` _CodeLens_ in the template file.
-
-![Add Debug Configuration Template](./resources/marketplace/vscode/Codelens-YAML-template.png)
-
-###### The _CodeLens_ indicator in the SAM template allows you to add a debug configuration for the serverless application.</h6>
-
-Alternatively, you can run and debug just the AWS Lambda function and exclude other resources defined by the SAM template. Again, use a _CodeLens_ indicator for an AWS Lambda-function handler. (A _handler_ is a function that Lambda calls to start execution of a Lambda function.)
-
-![Add Debug Configuration Direct](./resources/marketplace/vscode/Codelens-direct-function.png)
-
-###### The _CodeLens_ indicator in the application file lets you add a debug configuration for a selected AWS Lambda function.
-
-When you run a debug session, the status and results are shown in the **OUTPUT** panel when the **AWS Toolkit** output channel is selected.
-
-![Configure and Run](./resources/marketplace/vscode/sam-configure-and-run-still.png)
-
-###### After a local run is complete, the output appears in the **OUTPUT** tab.
-
-When you're satisfied with performance, you can [deploy your serverless application](https://docs.aws.amazon.com/console/toolkit-for-vscode/deploy-serverless-app). The SAM template is converted to a CloudFormation template, which is then used to deploy all the application's assets to the AWS Cloud.
-
-### Launch config auto-completion ("IntelliSense")
-
-The `Add Debug Configuration` _CodeLens_ creates launch configs of type
-`aws-sam` in the VS Code `launch.json` file. You can also create these entries
-by hand.
-
-When editing `launch.json` configs, AWS Toolkit provides auto-completion and
-contextual documentation, as shown below.
-
-<img src="./resources/marketplace/vscode/sam-launch-config.png" alt="Debug Configuration inline documentation" width="640"/>
-
-### Supported runtimes
-
-The Toolkit _local SAM debugging_ feature supports these Lambda runtimes:
-
--   C# (.NET Core 2.1, 3.1; .NET 5.0, .NET 6.0)
--   Go (1.x)
--   Java (8, 8.al2, 11)
--   JavaScript/TypeScript (Node.js 12.x, 14.x)
--   Python (3.6, 3.7, 3.8, 3.9)
-
-For more information see [Working with AWS Serverless Applications](https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/serverless-apps.html) in the user guide. To get setup for local debugging, see [Configuring your toolchain](https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/setup-toolchain.html).
-
-{ [Return to Top](#top) }
-
----
-
-## <a id="cloudwatchlogs"></a>Amazon CloudWatch Logs
-
-The AWS Toolkit provides support for [Amazon CloudWatch Logs](https://aws.amazon.com/cloudwatch/). Using the [AWS Explorer](#ui-components-aws-expl) of the Toolkit, you can perform the following operations on Log Groups:
-
--   List CloudWatch Log Groups
--   View Log Streams for a Log Group
-
-Viewing a Log Stream will immediately load the most recent 10,000 lines or 1 MB of data (whichever is smaller), and their timestamps. From this view, users can access the following actions:
-
--   Load older or newer log events
--   Save currently-loaded Log Stream to a log file
--   Copy Log Stream name
-
-Example:
-
-![View Log Groups](./resources/marketplace/vscode/cloudwatch-logs.png)
-
-For full details, see [Working with CloudWatch Logs](https://docs.aws.amazon.com/console/toolkit-for-vscode/latest/userguide/cloudwatchlogs.html) in the Toolkit's user guide.
-
-{ [Return to Top](#top) }
-
----
-
-## <a id="eventbridge"></a>Amazon EventBridge Schemas
-
-The AWS Toolkit provides support for [Amazon EventBridge](https://aws.amazon.com/eventbridge) schemas. Using the [AWS Explorer](#ui-components-aws-expl) of the Toolkit, you can perform the following operations on these schemas:
-
--   View an available schema
--   Search for an available schema
--   Generate code for an available schema
-
-Example:
-
-![View Amazon EventBridge Schemas](./resources/marketplace/vscode/eventbridge-search.png)
-
-For full details, see [Working with Amazon EventBridge Schemas](https://docs.aws.amazon.com/console/toolkit-for-vscode/eventbridge-schemas) in the Toolkit's user guide.
-
-{ [Return to Top](#top) }
-
----
-
-## <a id="ecs-files"></a>Amazon ECS task definition files
-
-The AWS Toolkit provides support for [Amazon Elastic Container Service (Amazon ECS)](https://aws.amazon.com/ecs). With the Toolkit installed in VS Code, IntelliSense functionality is provided for Amazon ECS task-definition files that you are updating in the editor.
-
-Example:
-
-![Amazon ECS IntelliSense for Task Definition Files](./resources/marketplace/vscode/ecs-task-def-intellisense.png)
-
-For full details, see [Working with Amazon Elastic Container Service](https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/ecs.html) in the Toolkit's user guide.
-
-{ [Return to Top](#top) }
-
----
-
-## <a id="ssm-files"></a>AWS Systems Manager Documents
-
-The AWS Toolkit provides support for [AWS Systems Manager Documents](https://docs.aws.amazon.com/systems-manager/latest/userguide/automation-documents.html). With the Toolkit installed in VS Code, you have access to the following features when working on Automation Documents:
-
--   Download, edit, and publish your Automation documents
--   Code completion and validation for both formats of documents: YAML and JSON
--   Templates and code snippets to help kickstart your Automation document
-
-Example:
-
-![AWS Systems Manager](./resources/marketplace/vscode/ssm-snippets.png)
-
-For full details, see [Working with AWS Systems Manager Documents](https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/ssmDocuments.html) in the Toolkit's user guide.
-
-{ [Return to Top](#top) }
-
----
-
-## <a id="sfn-files"></a>AWS Step Functions
-
-The AWS Toolkit provides support for [AWS Step Functions](https://docs.aws.amazon.com/step-functions). With the Toolkit installed in VS Code, working with state machines is a more streamlined process.
-
--   Create, update, execute, and download state machines.
--   See live graph visualizations of your state machine.
--   Take advantage of features such as code completion and validation, and code snippets.
-
-Example:
-
-![AWS Step Functions](./resources/marketplace/vscode/sfn-state-machine.png)
-
-For full details, see [Working with AWS Step Functions](https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/stepfunctions.html) in the Toolkit's user guide.
-
-{ [Return to Top](#top) }
-
----
-
-## <a id="aws-commands"></a>`AWS:` Commands
-
-The Toolkit provides commands (prefixed with `AWS:`) to the VS Code _command
-palette_, available by selecting _View > Command Palette_ or by typing
-`CTRL-SHIFT-p` (macOS: `CMD-SHIFT-p`).
-
-![Command Palette](./resources/marketplace/vscode/open-command-palette.gif)
-
-| AWS Command                                          | Description                                                                                                                                                                                                                                                                                                    |
-| :--------------------------------------------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `AWS: About Toolkit`                                 | Displays information about the AWS Toolkit.                                                                                                                                                                                                                                                                    |
-| `AWS: Add SAM Debug Configuration`                   | Creates an `aws-sam` Debug Configuration from a function in the current source file                                                                                                                                                                                                                            |
-| `AWS: Connect to AWS`                                | Select or create a connection to AWS. For more information, see [Connecting to AWS](https://docs.aws.amazon.com/console/toolkit-for-vscode/connect).                                                                                                                                                           |
-| `AWS: Copy Log Stream Name`                          | Copies the name of the active CloudWatch Log Stream                                                                                                                                                                                                                                                            |
-| `AWS: Create a new Step Functions state machine`     | Generates a new Amazon States Language definition to use as the definition for a new Step Functions state machine. For more information, see [State Machine Templates](https://docs.aws.amazon.com//toolkit-for-vscode/latest/userguide/bulding-stepfunctions.html#templates-stepfunctions) in the user guide. |
-| `AWS: Create a new Issue on Github`                  | Opens the AWS Toolkit's [New Issue page on Github](https://github.com/aws/aws-toolkit-vscode/issues/new/choose).                                                                                                                                                                                               |
-| `AWS: Create a new Systems Manager Document locally` | Creates a new Systems Manager Document from a template in either YAML or JSON                                                                                                                                                                                                                                  |
-| `AWS: Create Credentials Profile`                    | Creates an AWS credentials profile. For more information, see [Setting Up Your AWS Credentials](https://docs.aws.amazon.com/console/toolkit-for-vscode/setup-credentials) in the user guide.                                                                                                                   |
-| `AWS: Create Lambda SAM Application`                 | Generates code files for a new AWS serverless Lambda application. For more information, see [Creating a Serverless Application](https://docs.aws.amazon.com/console/toolkit-for-vscode/create-sam) in the user guide.                                                                                          |
-| `AWS: Create new CloudFormation Template`            | Creates a new starter Cloudformation Template                                                                                                                                                                                                                                                                  |
-| `AWS: Create new SAM Template`                       | Creates a new starter SAM Template                                                                                                                                                                                                                                                                             |
-| `AWS: Deploy SAM Application`                        | Deploys a local serverless application to an AWS account. For more information, see [Deploying a Serverless Application](https://docs.aws.amazon.com/console/toolkit-for-vscode/deploy-serverless-app) in the user guide.                                                                                      |
-| `AWS: Detect SAM CLI`                                | Checks whether the Toolkit can communicate correctly with the AWS SAM CLI that is installed.                                                                                                                                                                                                                   |
-| `AWS: Edit Credentials`                              | Opens the `~/.aws/credentials` or `~/.aws/config` file for editing.                                                                                                                                                                                                                                            |
-| `AWS: Edit SAM Debug Configuration`                  | Shows a tool that helps you create, edit, run, and debug a SAM _launch config_ (`type:aws-sam`).                                                                                                                                                                                                               |
-| `AWS: Focus on Explorer View`                        | Opens the **AWS** panel and focuses the [_Explorer_](#ui-components-aws-expl).                                                                                                                                                                                                                                 |
-| `AWS: Publish state machine to Step Functions`       | Creates or updates a remote state machine using the local Amazon States Language definition file. For more information, see [Work With State Machines in VS Code](https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/bulding-stepfunctions.html#starting-stepfunctions) in the user guide.        |
-| `AWS: Publish a Systems Manager Document`            | Creates a new document or updates an existing document in your account using the currently open document.                                                                                                                                                                                                      |
-| `AWS: Render state machine graph`                    | Renders the state machine definition into a graph visualization. For more information, see [State Machine Graph Visualization](https://docs.aws.amazon.com//toolkit-for-vscode/latest/userguide/bulding-stepfunctions.html#bulding-stepfunctions-visualizations) in the user guide.                            |
-| `AWS: Report an Issue`                               | In the [GitHub repository](https://github.com/aws/aws-toolkit-vscode) for the Toolkit, opens the page to [create a new issue](https://github.com/aws/aws-toolkit-vscode/issues/new/choose).                                                                                                                    |
-| `AWS: Save Current Log Content To File`              | Saves currently-loaded CloudWatch Log Stream data to a local `.log` file.                                                                                                                                                                                                                                      |
-| `AWS: Show or Hide Regions`                          | Adds or removes AWS Regions in the **AWS Explorer**.                                                                                                                                                                                                                                                           |
-| `AWS: Sign out`                                      | Disconnect the Toolkit from the current AWS connection.                                                                                                                                                                                                                                                        |
-| `AWS: Submit Quick Feedback...`                      | Submit a private, one-way message and sentiment to the AWS Toolkit dev team. For larger issues that warrant conversations or bugfixes, please submit an issue in Github with the **AWS: Create a New Issue on Github** command.                                                                                |
-| `AWS: Toggle SAM hints in source files`              | Toggles AWS SAM-related Codelenses in source files                                                                                                                                                                                                                                                             |
-| `AWS: View Toolkit Logs`                             | Displays log files that contain general Toolkit diagnostic information.                                                                                                                                                                                                                                        |
-| `AWS: View Quick Start`                              | Open this quick-start guide.                                                                                                                                                                                                                                                                                   |
-| `AWS: View CDK Documentation`                        | Opens the [user guide](https://docs.aws.amazon.com/console/toolkit-for-vscode/aws-cdk-apps) for the CDK portion of the Toolkit.                                                                                                                                                                                |
-| `AWS: View Toolkit Documentation`                    | Opens the [user guide](https://docs.aws.amazon.com/console/toolkit-for-vscode/welcome) for the Toolkit.                                                                                                                                                                                                        |
-| `AWS: View Source on GitHub`                         | Opens the [GitHub repository](https://github.com/aws/aws-toolkit-vscode) for the Toolkit.                                                                                                                                                                                                                      |
-| `AWS: Focus on CDK (Preview) View`                   | Opens the **AWS** panel and focuses the **CDK** view.                                                                                                                                                                                                                                                          |
-
-{ [Return to Top](#top) }
-
----
-
-# <a id="experimental-features"></a>Experimental Features
-
-Sometimes we'll introduce experimental features that we're trying out. These may have bugs, usability problems or may not be fully functional, and because these
-aren't ready for prime-time we'll hide them behind an experimental feature flag.
-
-Experimental features can be enabled in the extension preferences
-(`Preferences -> Settings -> Extensions -> AWS Configuration -> Experiments`).
-
-Please note that experimental features may be disabled or removed at any time.
-
-{ [Return to Top](#top) }
-
----
-
-# <a id="additional-setup-steps"></a>Setup
-
-To access most features of the AWS Toolkit, complete the [Setting Up](https://docs.aws.amazon.com/console/toolkit-for-vscode/getting-started) steps from the user guide.
-
-1. [Create an AWS account](https://aws.amazon.com/premiumsupport/knowledge-center/create-and-activate-aws-account/) (see also [Prerequisites](https://docs.aws.amazon.com/console/toolkit-for-vscode/setup-toolkit#setup-prereq)).
-1. [Create and configure](https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/establish-credentials.html) your AWS credentials.
-1. [Connect the Toolkit](https://docs.aws.amazon.com/console/toolkit-for-vscode/connect) to AWS with those credentials.
-
-To develop [serverless applications](https://aws.amazon.com/serverless/) with the Toolkit, you must [set up your toolchain](https://docs.aws.amazon.com/console/toolkit-for-vscode/setup-toolchain) and do the following on the local machine where the Toolkit is installed:
-
-1. Install the [AWS CLI](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-install.html) (Command Line Interface).
-1. Install and start [Docker](https://docs.docker.com/install/).
-1. Install the AWS [SAM CLI](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-install.html).
-
-{ [Return to Top](#top) }
-
----
-
-# <a id="get-help"></a>Get help
-
-For additional details on how to use the AWS Toolkit, see the [user guide](https://docs.aws.amazon.com/console/toolkit-for-vscode/welcome).
-
-To report issues with the Toolkit or to propose Toolkit code changes, see the [aws/aws-toolkit-vscode](https://github.com/aws/aws-toolkit-vscode) repository on GitHub.
-
-You can also [contact AWS](https://aws.amazon.com/contact-us/) directly.
-
-{ [Return to Top](#top) }
diff --git a/aws-toolkit-vscode.code-workspace b/aws-toolkit-vscode.code-workspace
new file mode 100644
index 00000000000..f03aafae2fe
--- /dev/null
+++ b/aws-toolkit-vscode.code-workspace
@@ -0,0 +1,19 @@
+{
+    "folders": [
+        {
+            "path": ".",
+        },
+        {
+            "path": "packages/toolkit",
+        },
+        {
+            "path": "packages/core",
+        },
+        {
+            "path": "packages/amazonq",
+        },
+    ],
+    "settings": {
+        "typescript.tsdk": "node_modules/typescript/lib",
+    },
+}
diff --git a/buildspec/lint.yml b/buildspec/lint.yml
new file mode 100644
index 00000000000..d44799d1186
--- /dev/null
+++ b/buildspec/lint.yml
@@ -0,0 +1,40 @@
+version: 0.2
+
+# Run unprivileged for most phases (except those marked "run-as: root").
+run-as: codebuild-user
+
+env:
+    variables:
+        # Implicitly passed by the AWS automation pipeline:
+        # VSCODE_TEST_VERSION
+        # GITHUB_READONLY_TOKEN
+        AWS_TOOLKIT_TEST_NO_COLOR: '1'
+
+phases:
+    install:
+        run-as: root
+        runtime-versions:
+            nodejs: 16
+        commands:
+            - bash buildspec/shared/linux-install.sh
+
+    pre_build:
+        commands:
+            - export HOME=/home/codebuild-user
+            - bash buildspec/shared/linux-pre_build.sh
+
+    build:
+        commands:
+            - export HOME=/home/codebuild-user
+            - npm run compile -w packages/core
+            - npm run testCompile -w packages/ --if-present
+            - npm run lint
+            - VCS_COMMIT_ID="${CODEBUILD_RESOLVED_SOURCE_VERSION}"
+            - CI_BUILD_URL=$(echo $CODEBUILD_BUILD_URL | sed 's/#/%23/g') # Encode `#` in the URL because otherwise the url is clipped in the Codecov.io site
+            - CI_BUILD_ID="${CODEBUILD_BUILD_ID}"
+
+reports:
+    unit-test:
+        files:
+            - '*'
+        base-directory: '.test-reports'
diff --git a/buildspec/linuxE2ETests.yml b/buildspec/linuxE2ETests.yml
new file mode 100644
index 00000000000..4cb2f08f03d
--- /dev/null
+++ b/buildspec/linuxE2ETests.yml
@@ -0,0 +1,53 @@
+version: 0.2
+
+# Run unprivileged for most phases (except those marked "run-as: root").
+run-as: codebuild-user
+
+env:
+    variables:
+        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:
+        run-as: root
+        runtime-versions:
+            nodejs: 16
+        commands:
+            # - '>/dev/null add-apt-repository universe'
+            # - '>/dev/null apt-get -qq install -y apt-transport-https'
+            # - '>/dev/null apt-get -qq update'
+            # - '>/dev/null apt-get -qq install -y ca-certificates'
+            # - 'apt-get install --reinstall ca-certificates'
+            - bash buildspec/shared/linux-install.sh
+            # increase file watcher count (ENOSPC error)
+            - sysctl fs.inotify.max_user_watches=524288
+
+    pre_build:
+        commands:
+            - export HOME=/home/codebuild-user
+            - bash buildspec/shared/setup-github-token.sh
+            - bash buildspec/shared/linux-pre_build.sh
+
+    build:
+        commands:
+            - export HOME=/home/codebuild-user
+            # Ignore failure until throttling issues are fixed.
+            - xvfb-run npm run testE2E; npm run mergeReports -- "$?"
+            - VCS_COMMIT_ID="${CODEBUILD_RESOLVED_SOURCE_VERSION}"
+            - CI_BUILD_URL=$(echo $CODEBUILD_BUILD_URL | sed 's/#/%23/g')
+            - CI_BUILD_ID="${CODEBUILD_BUILD_ID}"
+            - test -n "${CODECOV_TOKEN}" && [ "$TARGET_BRANCH" = "master" ] && ./codecov --token=${CODECOV_TOKEN} --branch=${CODEBUILD_RESOLVED_SOURCE_VERSION} --repository=${CODEBUILD_SOURCE_REPO_URL} --file=./coverage/amazonq/lcov.info --file=./coverage/toolkit/lcov.info
+        finally:
+            - rm -rf ~/.aws/sso/cache || true
+reports:
+    e2e-test:
+        files:
+            - '*'
+        base-directory: '.test-reports'
diff --git a/buildspec/linuxIntegrationTests.yml b/buildspec/linuxIntegrationTests.yml
index c7652f841f8..dacab125b89 100644
--- a/buildspec/linuxIntegrationTests.yml
+++ b/buildspec/linuxIntegrationTests.yml
@@ -1,74 +1,106 @@
 version: 0.2
 
+# Run unprivileged for most phases (except those marked "run-as: root").
+run-as: codebuild-user
+
 env:
     variables:
-        AWS_TOOLKIT_TEST_USER_DIR: '/tmp/'
+        # Implicitly passed by the AWS automation pipeline:
+        # VSCODE_TEST_VERSION
+        # GITHUB_READONLY_TOKEN
         AWS_TOOLKIT_TEST_NO_COLOR: '1'
-        NO_COVERAGE: 'true'
         # 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:
+        run-as: root
         runtime-versions:
-            nodejs: 16
+            nodejs: 18
             dotnet: 6.0
             java: latest
 
         commands:
+            - bash buildspec/shared/linux-install.sh
             - '>/dev/null add-apt-repository universe'
             - '>/dev/null apt-get -qq install -y apt-transport-https'
             - '>/dev/null apt-get -qq update'
             - '>/dev/null apt-get -qq install -y ca-certificates'
             - 'apt-get install --reinstall ca-certificates'
-            - 'add-apt-repository -y ppa:deadsnakes/ppa'
             # Other dependencies.
-            - 'apt-get -qq install -y jq python3.7 python3.8 python3-pip'
-            # Fail early if any of these not found.
-            - 'python3.7 --version'
-            - 'python3.8 --version'
-            # Dependencies for running vscode.
-            - '>/dev/null apt-get -yqq install libatk1.0-0 libgtk-3-dev libxss1 xvfb libnss3-dev libasound2 libasound2-plugins libsecret-1-0'
-            - '>/dev/null pip3 install --upgrade aws-sam-cli'
-            # Print info about sam (version, location, …).
-            - 'pip3 show aws-sam-cli'
-            - '>/dev/null pip3 install --upgrade awscli'
-            - '>/dev/null pip3 install pylint'
-            # Install latest version of Go (known to 'goenv')
-            - '>/dev/null VERSION=$(goenv install --list | tail -n 1) && 2>/dev/null goenv install $VERSION'
-            - '>/dev/null goenv global $VERSION && go env -w GOPROXY=direct'
-            - go version
+            - 'apt-get -qq install -y jq'
+            - |
+                curl --silent -LO https://github.com/aws/aws-sam-cli/releases/latest/download/aws-sam-cli-linux-x86_64.zip
+                unzip -q aws-sam-cli-linux-x86_64.zip -d samcli
+                sudo ./samcli/install
+                rm -rf samcli
             # login to DockerHub so we don't get throttled
-            - docker login --username $(echo $DOCKER_HUB_TOKEN | jq -r '.username') --password $(echo $DOCKER_HUB_TOKEN | jq -r '.password') || true
+            # - docker login --username $(echo $DOCKER_HUB_TOKEN | jq -r '.username') --password $(echo $DOCKER_HUB_TOKEN | jq -r '.password') || true
             # increase file watcher count so CodeLens tests do not fail unexpectedly (ENOSPC error)
             - sysctl fs.inotify.max_user_watches=524288
+            # start Docker
+            # - nohup /usr/local/bin/dockerd --host=unix:///var/run/docker.sock --host=tcp://127.0.0.1:2375 --storage-driver=overlay&
+            - timeout 15 sh -c "until docker info; do echo .; sleep 1; done"
+            # Add user to "docker" group.
+            # - usermod -aG docker codebuild-user
+            # Ensure that "docker" group has permissions to the socket.
+            # - chown codebuild-user /var/run/docker.sock
+            - chmod 666 /var/run/docker.sock
+            # Pull Docker Images for SAM tests
+
+            # Nodejs
+            - |
+                docker pull public.ecr.aws/sam/build-nodejs18.x:latest
+                docker pull public.ecr.aws/sam/build-nodejs20.x:latest
+                docker pull public.ecr.aws/sam/build-nodejs22.x:latest
+            # Java
+            - |
+                docker pull public.ecr.aws/sam/build-java8.al2:latest
+                docker pull public.ecr.aws/sam/build-java11:latest
+                docker pull public.ecr.aws/sam/build-java17:latest
+            # Python
+            - |
+                docker pull public.ecr.aws/sam/build-python3.10:latest
+                docker pull public.ecr.aws/sam/build-python3.11:latest
+                docker pull public.ecr.aws/sam/build-python3.12:latest
+                docker pull public.ecr.aws/sam/build-python3.13:latest
+            # Dotnet
+            - |
+                docker pull public.ecr.aws/sam/build-dotnet6:latest
 
     pre_build:
         commands:
-            # If present, log into CodeArtifact. Provides a nice safety net in case NPM is down.
-            # Should only affect tests run through IDEs team-hosted CodeBuild.
+            - export HOME=/home/codebuild-user
+            - bash buildspec/shared/setup-github-token.sh
+            - bash buildspec/shared/linux-pre_build.sh
+            # Print info (version, location, …) or fail early.
             - |
-                if [ "$TOOLKITS_CODEARTIFACT_DOMAIN" ] && [ "$TOOLKITS_CODEARTIFACT_REPO" ] && [ "TOOLKITS_$ACCOUNT_ID" ]; then
-                    if aws codeartifact login --tool npm --domain "$TOOLKITS_CODEARTIFACT_DOMAIN" --domain-owner "$TOOLKITS_ACCOUNT_ID" --repository "$TOOLKITS_CODEARTIFACT_REPO" > /dev/null 2>&1; then
-                        echo "Connected to CodeArtifact"
-                    else
-                        echo "CodeArtifact connection failed. Falling back to npm"
-                    fi
-                fi
-            # make sure that SAM is in the path, is not automatically done on CodeBuild
-            - USER_BASE_PATH=$(python -m site --user-base) && export PATH=$PATH:$USER_BASE_PATH/bin
-            # start Docker
-            - nohup /usr/local/bin/dockerd --host=unix:///var/run/docker.sock --host=tcp://127.0.0.1:2375 --storage-driver=overlay&
-            - timeout 15 sh -c "until docker info; do echo .; sleep 1; done"
+                python3 --version
+                sam --version
+            # Install latest version of Go (known to 'goenv')
+            # - eval "$(goenv init -)"
+            # - 'export PATH="$GOROOT/bin:$PATH:$GOPATH/bin"'
+            # - '>/dev/null VERSION=$(goenv install --list | tail -n 1) && 2>/dev/null goenv install $VERSION'
+            # - '>/dev/null goenv global $VERSION && go env -w GOPROXY=direct'
+            # - go version
 
     build:
         commands:
-            - npm ci --unsafe-perm
-            - xvfb-run npm run integrationTest
+            - export HOME=/home/codebuild-user
+            - xvfb-run npm run testInteg; npm run mergeReports -- "$?"
             - VCS_COMMIT_ID="${CODEBUILD_RESOLVED_SOURCE_VERSION}"
             - CI_BUILD_URL=$(echo $CODEBUILD_BUILD_URL | sed 's/#/%23/g')
             - CI_BUILD_ID="${CODEBUILD_BUILD_ID}"
-
+            - test -n "${CODECOV_TOKEN}" && [ "$TARGET_BRANCH" = "master" ] && ./codecov --token=${CODECOV_TOKEN} --branch=${CODEBUILD_RESOLVED_SOURCE_VERSION} --repository=${CODEBUILD_SOURCE_REPO_URL} --file=./coverage/amazonq/lcov.info --file=./coverage/toolkit/lcov.info
+    post_build:
+        commands:
+            # Destroy .netrc to avoid leaking $GITHUB_READONLY_TOKEN.
+            - rm "$HOME/.netrc"
 reports:
     integ-test:
         files:
diff --git a/buildspec/linuxTests.yml b/buildspec/linuxTests.yml
index e3b444c129d..241b5bb193a 100644
--- a/buildspec/linuxTests.yml
+++ b/buildspec/linuxTests.yml
@@ -1,43 +1,54 @@
 version: 0.2
 
+# Run unprivileged for most phases (except those marked "run-as: root").
+run-as: codebuild-user
+
 env:
+    # For "pipefail".
+    shell: bash
     variables:
-        AWS_TOOLKIT_TEST_USER_DIR: '/tmp/'
         AWS_TOOLKIT_TEST_NO_COLOR: '1'
+        # 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:
+        run-as: root
         runtime-versions:
-            nodejs: 16
-
+            nodejs: 18
         commands:
-            # Without this, "Unable to locate package libatk1.0-0".
-            - '>/dev/null apt-get -yqq update'
-            # Dependencies for running vscode.
-            - '>/dev/null apt-get -yqq install libatk1.0-0 libgtk-3-dev libxss1 xvfb libnss3-dev libasound2 libasound2-plugins libsecret-1-0'
+            - bash buildspec/shared/linux-install.sh
 
     pre_build:
         commands:
-            # If present, log into CodeArtifact. Provides a nice safety net in case NPM is down.
-            # Should only affect tests run through IDEs team-hosted CodeBuild.
-            - |
-                if [ "$TOOLKITS_CODEARTIFACT_DOMAIN" ] && [ "$TOOLKITS_CODEARTIFACT_REPO" ] && [ "$TOOLKITS_ACCOUNT_ID" ]; then
-                    if aws codeartifact login --tool npm --domain "$TOOLKITS_CODEARTIFACT_DOMAIN" --domain-owner "$TOOLKITS_ACCOUNT_ID" --repository "$TOOLKITS_CODEARTIFACT_REPO" > /dev/null 2>&1; then
-                        echo "Connected to CodeArtifact"
-                    else
-                        echo "CodeArtifact connection failed. Falling back to npm"
-                    fi
-                fi
-            - npm ci --unsafe-perm
+            - export HOME=/home/codebuild-user
+            - bash buildspec/shared/linux-pre_build.sh
 
     build:
         commands:
-            - npm run testCompile
-            - npm run lint
-            - xvfb-run npm test --silent
+            - export HOME=/home/codebuild-user
+            # TODO: Enable if we run into issues with GHA linting or remove.
+            # - |
+            #     if [ "$VSCODE_TEST_VERSION" = 'insiders' ] ; then
+            #         npm run testCompile
+            #         npm run lint
+            #     fi
+            - |
+                {
+                    # Ensure that "foo | run_and_report" fails correctly.
+                    set -o pipefail
+                    . buildspec/shared/common.sh
+                    { 2>&1 xvfb-run npm test --silent; npm run mergeReports -- "$?"; } | run_and_report 2 \
+                        'rejected promise not handled' \
+                        'This typically indicates a bug. Read https://developer.mozilla.org/docs/Web/JavaScript/Guide/Using_promises#error_handling'
+                }
             - VCS_COMMIT_ID="${CODEBUILD_RESOLVED_SOURCE_VERSION}"
             - CI_BUILD_URL=$(echo $CODEBUILD_BUILD_URL | sed 's/#/%23/g') # Encode `#` in the URL because otherwise the url is clipped in the Codecov.io site
             - CI_BUILD_ID="${CODEBUILD_BUILD_ID}"
+            - test -n "${CODECOV_TOKEN}" && [ "$TARGET_BRANCH" = "master" ] && ./codecov --token=${CODECOV_TOKEN} --branch=${CODEBUILD_RESOLVED_SOURCE_VERSION} --repository=${CODEBUILD_SOURCE_REPO_URL} --file=./coverage/amazonq/lcov.info --file=./coverage/toolkit/lcov.info || true
 
 reports:
     unit-test:
diff --git a/buildspec/packageTestVsix.yml b/buildspec/packageTestVsix.yml
index a70f2493b3c..73f15c0ba10 100644
--- a/buildspec/packageTestVsix.yml
+++ b/buildspec/packageTestVsix.yml
@@ -1,5 +1,8 @@
 version: 0.2
 
+# Run unprivileged for most phases (except those marked "run-as: root").
+run-as: codebuild-user
+
 env:
     variables:
         AWS_TOOLKIT_TEST_USER_DIR: '/tmp/'
@@ -8,33 +11,24 @@ env:
 
 phases:
     install:
+        run-as: root
         runtime-versions:
-            nodejs: 16
+            nodejs: 18
+        commands:
+            - bash buildspec/shared/linux-install.sh
 
     pre_build:
         commands:
-            # If present, log into CodeArtifact. Provides a nice safety net in case NPM is down.
-            # Should only affect tests run through IDEs team-hosted CodeBuild.
-            - |
-                if [ "$TOOLKITS_CODEARTIFACT_DOMAIN" ] && [ "$TOOLKITS_CODEARTIFACT_REPO" ] && [ "$TOOLKITS_ACCOUNT_ID" ]; then
-                    if aws codeartifact login --tool npm --domain "$TOOLKITS_CODEARTIFACT_DOMAIN" --domain-owner "$TOOLKITS_ACCOUNT_ID" --repository "$TOOLKITS_CODEARTIFACT_REPO" > /dev/null 2>&1; then
-                        echo "Connected to CodeArtifact"
-                    else
-                        echo "CodeArtifact connection failed. Falling back to npm"
-                    fi
-                fi
-            # --unsafe-perm is needed because CodeBuild/CodePipeline runs as root
-            - npm ci --unsafe-perm
+            - export HOME=/home/codebuild-user
+            - bash buildspec/shared/linux-pre_build.sh
 
     build:
         commands:
+            - export HOME=/home/codebuild-user
             # Generate CHANGELOG.md
-            - npm run createRelease
-            - npm run generateNonCodeFiles
-            - cp ./README.quickstart.vscode.md ./README.md
-            - npm run package
+            - npm run createRelease -w packages/toolkit -w packages/amazonq
+            - npm run package -w packages/toolkit -w packages/amazonq
 
 artifacts:
     files:
-        - aws-toolkit-vscode*
-    discard-paths: true
+        - '*.vsix'
diff --git a/buildspec/shared/common.sh b/buildspec/shared/common.sh
new file mode 100644
index 00000000000..a0dbc2e5837
--- /dev/null
+++ b/buildspec/shared/common.sh
@@ -0,0 +1,49 @@
+#!/bin/env bash
+
+# Common functions used by other CI scripts.
+# "Include" this file by sourcing (not executing) it:
+#     . buildspec/shared/common.sh
+
+# Ignore these patterns when deciding if the build should fail.
+#   - "waiting for browser": from `ssoAccessTokenProvider.test.ts`, unclear how to fix it.
+#   - "HTTPError: Response code …": caused by github rate-limiting.
+#   - "npm WARN deprecated querystring": transitive dep of aws sdk v2 (check `npm ls querystring`), so that's blocked until we migrate to v3.
+_ignore_pat='HTTPError: Response code 403\|HTTPError: Response code 404\|npm WARN deprecated querystring\|npm WARN deprecated'
+
+# Do not print (noisy) lines matching these patterns.
+#   - "ERROR:bus… Failed to connect to the bus": noise related to "xvfb". https://github.com/cypress-io/cypress/issues/19299
+_discard_pat='ERROR:bus.cc\|ERROR:viz_main_impl.cc\|ERROR:command_buffer_proxy_impl.cc'
+
+# Expects stdin + two args:
+#   1: error code to return on failure
+#   2: grep pattern
+#   3: message shown at end of report, if pattern was found in stdin.
+# Usage:
+#   echo foo | run_and_report 1 '.*' 'You must fix this. See https://example.com'
+run_and_report() {
+    set -o pipefail
+    local errcode="${1}"
+    local pat="${2}"
+    local msg="${3}"
+    local r=0
+    mkfifo testout
+    (grep -v "$_discard_pat" testout &)
+    # Capture messages that we may want to fail (or report) later.
+    tee testout \
+        | { grep > testout-err --line-buffered -E "$pat" || true; }
+
+    echo ''
+
+    if grep -v "${_ignore_pat}" testout-err | grep "$pat" | sort; then
+        printf '\nERROR: Test output matched this pattern %s times:\n       "%s"\n%s\n\n' \
+            "$(grep -c "${pat}" testout-err)" \
+            "$pat" \
+            "       ${msg}"
+        r=${errcode}
+    else
+        printf '\nOK: Not found in test output: "%s"\n' "$pat"
+    fi
+
+    rm -f testout testout-err
+    return "$r"
+}
diff --git a/buildspec/shared/linux-install.sh b/buildspec/shared/linux-install.sh
new file mode 100644
index 00000000000..e50c363bf84
--- /dev/null
+++ b/buildspec/shared/linux-install.sh
@@ -0,0 +1,29 @@
+#!/bin/env bash
+
+# Common code for "install" phase of linux codebuild CI job.
+
+set -e
+
+set +x
+test -n "$VSCODE_TEST_VERSION" || {
+    echo 'missing $VSCODE_TEST_VERSION'
+    exit 1
+}
+set -x
+
+# Without this, "Unable to locate package libatk1.0-0".
+apt-get > /dev/null -yqq update
+# Dependencies for running vscode.
+apt-get > /dev/null -yqq install libatk1.0-0 libgtk-3-dev libxss1 xvfb libasound2 libasound2-plugins
+
+#
+# Prepare env for unprivileged user. We cannot run vscode as root.
+#
+# "codebuild-user": https://github.com/aws/aws-codebuild-docker-images/blob/2f796bb9c81fcfbc8585832b99a5f780ae2b2f52/ubuntu/standard/6.0/Dockerfile#L56
+mkdir -p ~codebuild-user
+chown -R codebuild-user:codebuild-user /tmp ~codebuild-user .
+chmod +x ~codebuild-user
+ls -ld ~codebuild-user
+
+curl -Os https://uploader.codecov.io/latest/linux/codecov 
+chmod +x codecov
diff --git a/buildspec/shared/linux-pre_build.sh b/buildspec/shared/linux-pre_build.sh
new file mode 100644
index 00000000000..102103ff30c
--- /dev/null
+++ b/buildspec/shared/linux-pre_build.sh
@@ -0,0 +1,26 @@
+#!/bin/env bash
+
+# Common code for "pre_build" phase of linux codebuild CI job.
+
+set -e
+# Ensure that "foo | run_and_report" fails correctly.
+set -o pipefail
+
+_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+# Include common functions.
+. "${_SCRIPT_DIR}/common.sh"
+
+# If present, log into CodeArtifact. Provides a fallback in case NPM is down.
+# Should only affect tests run through Toolkits-hosted CodeBuild.
+if [ "$TOOLKITS_CODEARTIFACT_DOMAIN" ] && [ "$TOOLKITS_CODEARTIFACT_REPO" ] && [ "$TOOLKITS_ACCOUNT_ID" ]; then
+    if aws codeartifact login --tool npm --domain "$TOOLKITS_CODEARTIFACT_DOMAIN" --domain-owner "$TOOLKITS_ACCOUNT_ID" --repository "$TOOLKITS_CODEARTIFACT_REPO" > /dev/null 2>&1; then
+        echo "Connected to CodeArtifact"
+    else
+        echo "CodeArtifact connection failed. Falling back to npm"
+    fi
+fi
+
+# TODO: move this to the "install" phase?
+export NODE_OPTIONS='--max-old-space-size=8192'
+npm 2>&1 ci | run_and_report 2 'npm WARN deprecated' 'Deprecated dependencies must be updated.'
diff --git a/buildspec/shared/setup-github-token.sh b/buildspec/shared/setup-github-token.sh
new file mode 100755
index 00000000000..7279a757d15
--- /dev/null
+++ b/buildspec/shared/setup-github-token.sh
@@ -0,0 +1,21 @@
+#!/bin/env bash
+
+set -e
+
+test -n "$GITHUB_READONLY_TOKEN" || {
+    echo 'missing $GITHUB_READONLY_TOKEN'
+    exit 1
+}
+
+# Authenticate all "git" (and "curl --netrc") github calls, to avoid rate-limiting.
+# NOTE: the "login" value is arbitrary.
+printf "machine github.com         login oauth password ${GITHUB_READONLY_TOKEN:-unknown}\n" >> "$HOME/.netrc"
+printf "machine api.github.com     login oauth password ${GITHUB_READONLY_TOKEN:-unknown}\n" >> "$HOME/.netrc"
+printf "machine uploads.github.com login oauth password ${GITHUB_READONLY_TOKEN:-unknown}\n" >> "$HOME/.netrc"
+# Print ratelimit info.
+curl 2> /dev/null --netrc -L -I https://api.github.com/ | grep x-ratelimit | sed 's/\(.*\)/    \1/'
+# Validate ratelimit.
+curl 2> /dev/null --netrc -L -I https://api.github.com/ | grep > /dev/null 'x-ratelimit-limit: *[0-9][0-9][0-9][0-9]\+' || {
+    echo 'invalid github token, or rate limit too low (expected 5000+)'
+    exit 1
+}
diff --git a/buildspec/windowsTests.yml b/buildspec/windowsTests.yml
index ef81fb7a837..4b19dec5eb2 100644
--- a/buildspec/windowsTests.yml
+++ b/buildspec/windowsTests.yml
@@ -5,10 +5,10 @@ env:
 phases:
     install:
         runtime-versions:
-            nodejs: 16
+            nodejs: 18
         commands:
             - |
-                if(-Not($Env:CODE_COV_TOKEN -eq $null)) {
+                if(-Not($Env:CODECOV_TOKEN -eq $null)) {
                     choco install -y --no-progress codecov
                 }
 
@@ -30,15 +30,16 @@ phases:
 
     build:
         commands:
-            - npm run testCompile
+            - npm run compile -w packages/core
+            - npm run testCompile -w packages/ --if-present
             - npm run lint
             - $env:TEST_REPORT_DIR="$env:CODEBUILD_SRC_DIR/.test_reports"; npm run test
             - |
-                if(-Not($Env:CODEBUILD_BUILD_SUCCEEDING -eq "0" -Or $Env:CODE_COV_TOKEN -eq $null)) {
+                if(-Not($Env:CODEBUILD_BUILD_SUCCEEDING -eq "0" -Or $Env:CODECOV_TOKEN -eq $null)) {
                   $env:VCS_COMMIT_ID=$Env:CODEBUILD_RESOLVED_SOURCE_VERSION;
                   $env:CI_BUILD_URL=[uri]::EscapeUriString($Env:CODEBUILD_BUILD_URL);
                   $env:CI_BUILD_ID=$Env:CODEBUILD_BUILD_ID;
-                  codecov -t $Env:CODE_COV_TOKEN `
+                  codecov -t $Env:CODECOV_TOKEN `
                     --flag unittest `
                     -f "build/reports/jacoco/coverageReport/coverageReport.xml" `
                     -c $Env:CODEBUILD_RESOLVED_SOURCE_VERSION
diff --git a/cloud9-toolkit-install.sh b/cloud9-toolkit-install.sh
deleted file mode 100644
index 8b85a56a63a..00000000000
--- a/cloud9-toolkit-install.sh
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/bin/env bash
-
-# By default, this script gets the latest VSIX from:
-#     https://github.com/aws/aws-toolkit-vscode/releases/
-# else the first argument must be a URL or file pointing to a toolkit VSIX or
-# ZIP (containing a VSIX).
-#
-# USAGE:
-#     cloud9-toolkit-install.sh [URL|FILE]
-#     curl -LO https://raw.githubusercontent.com/aws/aws-toolkit-vscode/master/cloud9-toolkit-install.sh && bash cloud9-toolkit-install.sh
-# EXAMPLES:
-#     cloud9-toolkit-install.sh https://github.com/aws/aws-toolkit-vscode/releases/download/v1.24.0/aws-toolkit-vscode-1.24.0.vsix
-#     cloud9-toolkit-install.sh toolkit.zip
-
-set -eu
-
-# Script currently depends on $HOME so running as root is not supported.
-if [ "$(whoami)" = root ]; then
-    echo "cannot run as root"
-    exit 1
-fi
-
-_log() {
-    echo >&2 "$@"
-}
-
-# Runs whatever is passed.
-#
-# On failure:
-#   - prints the command output
-#   - exits the script
-_run() {
-    local out
-    if ! out="$("$@" 2>&1)"; then
-        _log "Command failed (output below): '${*}'"
-        echo "$out" | sed 's/^/    /'
-        _log "Command failed (output above): '${*}'"
-        exit 1
-    fi
-}
-
-# Gets the first existing directory, or exits if none are found.
-_any_dir() {
-    for d in "$@"; do
-        if test -d "$d"; then
-            echo "$d"
-            return
-        fi
-    done
-
-    _log "error: None of the expected dirs exist:"
-    for d in "$@"; do
-        _log "    $d"
-    done
-    exit 1
-}
-
-_setglobals() {
-    # Example:
-    #     https://github.com/aws/aws-toolkit-vscode/releases/tag/v1.24.0
-    TOOLKIT_LATEST_RELEASE_URL="$(curl -Ls -o /dev/null -w '%{url_effective}' 'https://github.com/aws/aws-toolkit-vscode/releases/latest')"
-    # Example:
-    #     1.24.0
-    TOOLKIT_LATEST_VERSION="$(echo "$TOOLKIT_LATEST_RELEASE_URL" | grep -oh '[0-9]\+\.[0-9]\+\.[0-9]\+$')"
-    # Example:
-    #     https://github.com/aws/aws-toolkit-vscode/releases/download/v1.24.0/aws-toolkit-vscode-1.24.0.vsix
-    TOOLKIT_LATEST_ARTIFACT_URL="https://github.com/aws/aws-toolkit-vscode/releases/download/v${TOOLKIT_LATEST_VERSION}/aws-toolkit-vscode-${TOOLKIT_LATEST_VERSION}.vsix"
-    # URL or local filepath pointing to toolkit VSIX or ZIP (containing a VSIX).
-    TOOLKIT_FILE=${1:-}
-    TOOLKIT_INSTALL_PARENT="$(_any_dir "/projects/.c9/aws-toolkit-vscode" "$HOME/.c9/dependencies/aws-toolkit-vscode" "$HOME/environment/.c9/extensions" "$HOME/.c9/aws-toolkit-vscode")"
-    # Hash name is 128 chars long.
-    TOOLKIT_INSTALL_DIR="$(_any_dir "$(realpath ${TOOLKIT_INSTALL_PARENT}/????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????)" "$(realpath ${TOOLKIT_INSTALL_PARENT}/extension)")"
-    SCRIPT_WORKDIR="$HOME/toolkit"
-}
-
-_main() {
-    (
-        if test -f "$TOOLKIT_FILE"; then
-            # Ensure full path (before `cd` below).
-            TOOLKIT_FILE="$(readlink -f "$TOOLKIT_FILE")"
-        fi
-
-        echo "Script will DELETE these directories:"
-        echo "    ${TOOLKIT_INSTALL_DIR}"
-        echo "    ${SCRIPT_WORKDIR}"
-        read -n1 -r -p "ENTER to continue, CTRL-c to cancel"
-        rm -rf "${TOOLKIT_INSTALL_DIR}.old"
-        mv "$TOOLKIT_INSTALL_DIR" "${TOOLKIT_INSTALL_DIR}.old"
-        rm -rf "$SCRIPT_WORKDIR"
-
-        cd "$HOME/"
-        mkdir -p "$SCRIPT_WORKDIR"
-        mkdir -p "$TOOLKIT_INSTALL_PARENT"
-        cd "${SCRIPT_WORKDIR}"
-
-        # Set default URL if no argument was provided.
-        if test -z "$TOOLKIT_FILE"; then
-            _log "Latest release:"
-            _log "    URL    : $TOOLKIT_LATEST_RELEASE_URL"
-            _log "    version: $TOOLKIT_LATEST_VERSION"
-            _log "    VSIX   : $TOOLKIT_LATEST_ARTIFACT_URL"
-            TOOLKIT_FILE="$TOOLKIT_LATEST_ARTIFACT_URL"
-        fi
-
-        TOOLKIT_FILE_EXTENSION="${TOOLKIT_FILE: -4}"
-        if test -f "$TOOLKIT_FILE"; then
-            _log "Local file (not URL): ${TOOLKIT_FILE}"
-            if [ "$TOOLKIT_FILE_EXTENSION" = ".zip" ] || [ "$TOOLKIT_FILE_EXTENSION" = ".ZIP" ]; then
-                _log 'File is a .zip file'
-                _run unzip -- "$TOOLKIT_FILE"
-                _run unzip -- *.vsix
-            else
-                _log 'File is not .zip file, assuming .vsix'
-                _run unzip -- "$TOOLKIT_FILE"
-            fi
-        else
-            _log "URL: ${TOOLKIT_FILE}"
-            _log 'Deleting toolkit.zip'
-            rm -rf toolkit.zip
-            _log 'Downloading...'
-            curl -o toolkit.zip -L "$TOOLKIT_FILE"
-            if [ "$TOOLKIT_FILE_EXTENSION" = ".zip" ] || [ "$TOOLKIT_FILE_EXTENSION" = ".ZIP" ]; then
-                _log 'File is a .zip file'
-                _run unzip -- toolkit.zip
-                _run unzip -- *.vsix
-            else
-                _log 'File is not .zip file, assuming .vsix'
-                _run unzip -- toolkit.zip
-            fi
-        fi
-
-        mv extension "$TOOLKIT_INSTALL_DIR"
-        _log "Toolkit installed to: $TOOLKIT_INSTALL_DIR"
-        _log "Refresh Cloud9 to load it"
-    )
-}
-
-_setglobals "$@"
-_main
diff --git a/codecov.yml b/codecov.yml
index 266a3af1d18..1e348859f11 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -5,6 +5,12 @@ codecov:
     notify:
         require_ci_to_pass: no
 
+ignore:
+    - 'node_modules/'
+    - 'plugins/'
+    - 'scripts/'
+    - 'src.gen/'
+
 coverage:
     precision: 2
     round: down
@@ -12,13 +18,93 @@ coverage:
 
     status:
         project:
+            # Note: `default` measures the entire project.
+            # It does NOT define defaults "inherited" by other `project` items.
+            # https://docs.codecov.com/docs/commit-status
+            default:
+                informational: true # Always pass. Ignore `target`, `threshold`, etc.
+                target: 80
+                threshold: 5
+                only_pulls: true
+            codewhisperer:
+                informational: true # Always pass. Ignore `target`, `threshold`, etc.
+                paths:
+                    - 'packages/core/src/codewhisperer/'
+                    - 'packages/core/src/amazonq*/*'
+                    - 'packages/amazonq/src/'
+                flags:
+                    - 'codewhisperer'
+                target: 80
+                threshold: 5
+                only_pulls: true
+            amazonqFeatureDev:
+                informational: true # Always pass. Ignore `target`, `threshold`, etc.
+                paths:
+                    - 'packages/core/src/amazonqFeatureDev/*'
+                flags:
+                    - 'amazonqFeatureDev'
+                target: 80
+                threshold: 5
+                only_pulls: true
+            amazonqGumby:
+                informational: true # Always pass. Ignore `target`, `threshold`, etc.
+                paths:
+                    - 'packages/core/src/amazonqGumby/*'
+                target: 80
+                threshold: 5
+                only_pulls: true
+            codewhispererChat:
+                informational: true # Always pass. Ignore `target`, `threshold`, etc.
+                paths:
+                    - 'packages/core/src/codewhispererChat/*'
+                target: 80
+                threshold: 5
+                only_pulls: true
+            applicationcomposer:
+                informational: true # Always pass. Ignore `target`, `threshold`, etc.
+                paths:
+                    - 'packages/core/src/applicationcomposer/*'
+                target: 80
+                threshold: 5
+                only_pulls: true
+            stepFunctions:
+                informational: true # Always pass. Ignore `target`, `threshold`, etc.
+                paths:
+                    - 'packages/core/src/stepFunctions/*'
+                target: 50
+                threshold: 10
+                only_pulls: true
+            threatComposer:
+                informational: true # Always pass. Ignore `target`, `threshold`, etc.
+                paths:
+                    - 'packages/core/src/threatComposer/*'
+                target: 80
+                threshold: 5
+                only_pulls: true
+        patch:
             default:
-                threshold: 1
-                informational: true
-        patch: no
-        changes: no
+                # Note: `default` measures the entire project.
+                # It does NOT define defaults "inherited" by other `project` items.
+                # https://docs.codecov.com/docs/commit-status
+                target: 90
+                threshold: 5
+                only_pulls: true
+                informational: false # Fail if PR changes are not covered.
+                # branches:
+                #     - master
+        changes: false
 
-comment: off
+comment: false
 
 github_checks:
     annotations: false
+
+flags:
+    codewhisperer:
+        paths:
+            - 'packages/core/src/codewhisperer/'
+            - 'packages/core/src/amazonq*/*'
+            - 'packages/amazonq/src/'
+    amazonqFeatureDev:
+        paths:
+            - 'packages/core/src/amazonqFeatureDev/'
diff --git a/designs/credentials/credentials-management.md b/designs/credentials/credentials-management.md
index 3c9daf2e4a3..a0d53b92318 100644
--- a/designs/credentials/credentials-management.md
+++ b/designs/credentials/credentials-management.md
@@ -31,11 +31,11 @@ A formatted version of the Credentials Provider Id may be surfaced to users, how
 
 When the user connects to AWS in the Toolkit, a Credentials Provider is requested, which is then used to obtain credentials. The toolkit requests a Credentials Provider by checking which credentials provider factories support the provider's credentials type. The factories of interest are queried to see which (if any) have the requested Credentials Provider.
 
-At the time this document was written, Shared Credentials are the only supported Credentials. Additional credentials providers will reside at [/src/credentials/providers](/src/credentials/providers) as they are implemented.
+At the time this document was written, Shared Credentials are the only supported Credentials. Additional credentials providers will reside at [/src/credentials/providers](/packages/core/src/credentials/providers) as they are implemented.
 
 ### Shared Credentials Profiles
 
-Profiles are retrieved from the user's shared credentials files. The profile is handled and validated differently based on which fields are present. Handling and validation logic can be found in [sharedCredentialsProvider.ts](/src/credentials/providers/sharedCredentialsProvider.ts).
+Profiles are retrieved from the user's shared credentials files. The profile is handled and validated differently based on which fields are present. Handling and validation logic can be found in [sharedCredentialsProvider.ts](/packages/core/src/credentials/providers/sharedCredentialsProvider.ts).
 
 Only profiles that are considered valid are provided to the toolkit. When validation issues are detected, they are written to the logs to help users understand why the toolkit is having difficulties with a profile. Users running the 'Connect to AWS' command will not see invalid profiles in the list of Credentials.
 
diff --git a/designs/modify-resources-attached-to-code-pipeline.md b/designs/modify-resources-attached-to-code-pipeline.md
index 8b8960ac471..312377449e9 100644
--- a/designs/modify-resources-attached-to-code-pipeline.md
+++ b/designs/modify-resources-attached-to-code-pipeline.md
@@ -150,7 +150,7 @@ The confirmation prompt can be implemented using one of two UI facilities:
 
 ### API Client
 
-The `ResourceGroupsTaggingAPI` service client will be used. The client will be set up in a manner consistent with the Lambda and CloudFormation clients, allowing the clients to be stubbed out in unit tests. See the Toolkit's Lambda Client [Interface](/src/shared/clients/lambdaClient.ts) and [Implementation](/src/shared/clients/defaultLambdaClient.ts) as an example. A new client factory will be added to [ToolkitClientBuilder](/src/shared/clients/toolkitClientBuilder.ts) and [DefaultToolkitClientBuilder](/src/shared/clients/defaultToolkitClientBuilder.ts).
+The `ResourceGroupsTaggingAPI` service client will be used. The client will be set up in a manner consistent with the Lambda and CloudFormation clients, allowing the clients to be stubbed out in unit tests. See the Toolkit's Lambda Client [Interface](/packages/core/src/shared/clients/lambdaClient.ts) and [Implementation](/packages/core/src/shared/clients/defaultLambdaClient.ts) as an example. A new client factory will be added to [ToolkitClientBuilder](/packages/core/src/shared/clients/toolkitClientBuilder.ts) and [DefaultToolkitClientBuilder](/packages/core/src/shared/clients/defaultToolkitClientBuilder.ts).
 
 ### <a id="fallback-handling"></a>Fallback Handling
 
diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md
index 47b44de3660..179ad9d4833 100644
--- a/docs/ARCHITECTURE.md
+++ b/docs/ARCHITECTURE.md
@@ -1,355 +1 @@
-# Architecture
-
-An overview of the architecture for various components within the Toolkit.
-
-## Commands
-
-Many parts of the VS Code API relies on the use of 'commands' which are simply functions bound to a global ID. For small projects, this simplicity is great. But the base API doesn't offer a lot of common functionality that a large project might want: logging, error handling, etc.
-
-For the Toolkit, common command functionality is implemented in [Commands](../src/shared/vscode/commands2.ts). The goal with this abstraction is to increase consistency across the Toolkit for anything related to commands.
-
-### Examples
-
--   Registering and execution:
-
-    ```ts
-    const command = Commands.register('helloWorld', () => console.log('Hello, World!'))
-    command.execute()
-    ```
-
--   Using parameters:
-
-    ```ts
-    const showMessage = async (message: string) => vscode.window.showInformationMessage(message)
-    const command = Commands.register('aws.showMessage', showMessage)
-    command.execute('Hello, World!')
-    ```
-
--   Creating a CodeLens:
-
-    ```ts
-    // The built CodeLens should be returned through a `vscode.CodeLensProvider` implementation
-    const range = new vscode.Range(0, 0, 0, 0)
-    const lens = command.build('Hello, World!').asCodeLens(range, { title: 'Click me!' })
-    ```
-
--   Creating a tree node:
-
-    ```ts
-    // `node` will execute the command when clicked in the explorer tree
-    // This object should be returned as a child of some other tree node
-    const node = command.build('Hello, World!').asTreeNode({ label: 'Click me!' })
-    ```
-
-### Advanced Uses
-
-Complex programs often require more than just simple functions to act as entry-points. Large amounts of state may be involved, which can be very difficult to test and reason about without proper management. One way to make it easier to isolate state from a given command is by 'declaring' it. This associates a command with all the required dependencies while still making it look like any other command.
-
--   Command declaration and registration:
-
-    ```ts
-    const command = Commands.declare('aws.showMessage2', (state: Record<string, string>) => (key: string) => {
-        return showMessage(state[key] ?? 'Message not found')
-    })
-
-    command.register({ hello: 'Hello, World!', goodbye: 'Goodbye, World!' })
-    command.execute('goodbye')
-    ```
-
--   Prototype binding:
-
-    ```ts
-    // This class won't show duplicate messages that use the same key unlike the previous example
-    class Messages {
-        private readonly shown = new Map<string, Promise<unknown>>()
-        public constructor(private readonly state: Record<string, string>) {}
-
-        public showMessage(key: string) {
-            const promise = this.shown.get(key) ?? showMessage(this.state[key] ?? 'Message not found')
-            this.shown.set(
-                key,
-                promise.finally(() => this.shown.delete(key))
-            )
-
-            return promise
-        }
-    }
-
-    const command = Commands.from(Messages).declareShowMessage('aws.showMessage3')
-    const messages = new Messages({ hello: 'Hello, World!', goodbye: 'Goodbye, World!' })
-
-    command.register(messages)
-    command.execute('goodbye')
-    command.execute('hello')
-    command.execute('goodbye')
-    ```
-
-## Exceptions
-
-Large applications often have a correspondingly large number of failure points. For feature-level logic, these failures are often non-recoverable. The best we can do is show the user that something went wrong and maybe offer guidance on how to fix it.
-
-Because this is such a common pattern, shared error handling logic is defined by `ToolkitError` found [here](../src/shared/errors.ts). This class provides the basic structure for errors throughout the Toolkit.
-
-### Chaining
-
-Exceptions that occur deep in a call stack often do not contain enough context to correctly diagnose the problem. A stack trace is helpful, but only if the reader has access to both the source code and source map.
-
-By adding additional information as the exception bubbles up, we can create a better view of the program state when the problem occured. This is done via `ToolkitError.chain`. The `chain` function serves as a standard way to establish a clear cause-and-effect relationship for errors.
-
-### Handlers
-
-Any code paths exercised via `Commands` will have errors handled by `handleError` in [extensions.ts](../src/extension.ts). A better API for error handling across more than just commands will be added in a future PR.
-
-### Best Practices
-
-Implementations still need to adhere to some basic principles for this to work nicely:
-
--   Do not catch errors unless something meaningful can be added.
--   Do not swallow errors unless the functionality is non-critical to the feature.
--   Do not directly show the user an error message for failed actions. Use `ToolkitError` instead.
--   Use `chain` when re-throwing errors with additional information.
--   Use `CancellationError` for explicit workflow cancellations.
--   Define meaninful error codes when creating new errors.
-
-## Webviews (Vue framework)
-
-The current implementation uses Vue 3 with Single File Components (SFCs) for modularity. Each webview
-is bundled into a single file and packaged into the toolkit at release time. Vue applications may be composed
-of individual components in a parent/child heiracrchy. Each component is able to act independently within an
-application, however, they must respect the following principles:
-
-1. State can only be stored in a child component if it is not being used for two-way communication (via events)
-2. If there is two-way communication, store state in the parent
-3. Data should flow down, actions should flow up
-
-Be very mindful about state managment; violating these principles will lead to buggy and hard-to-debug software.
-
-### Bundling
-
-Each webview is bundled into a single file to speed up load times as well as isolate the 'web' modules from the 'node' modules. Webview bundles are automatically generated on compilation by targeting `index.ts` files when located under a `vue` directory. All bundles are placed under `dist` in the same relative location.
-
-Generated bundle names map based off their path relative to `src`: `src/foo/vue/bar/index.ts` -> `dist/src/foo/vue/bar/index.js`
-
-Running the extension in development mode (e.g. via the `Extension` launch task) starts a local server to automatically rebuild and serve webviews in real-time via hot-module reloading. It's assumed that the server runs on port `8080`, so make sure that nothing is already using that port. Otherwise webviews will not be displayed during development.
-
-### Client/Server
-
-The VS Code API restricts our Webviews to a single `postMessage` function. To simplify developing Webviews, we use a client/server architecture to handle message passing between the view and the extension. This does not mean that clients are restricted to 1 message = 1 response, rather, the frontend ("client") needs to send the first message.
-
-Webview (frontend) clients can be created via `WebviewClientFactory`. This generates a simple Proxy to send messages to the extension, mapping the function name to the command name. Unique IDs are also generated to stop requests from receiving extraneous responses. It is **highly** recommended to use the [Volar](https://marketplace.visualstudio.com/items?itemName=johnsoncodehk.volar) extension for syntax highlighting and type-checking when working with SFCs. Keep in mind that this is purely a development tool: users of the toolkits do not require Volar to view webviews.
-
-Commands and events are defined on the backend via sub-classes of `VueWebview`. Classes define all the functions and events that will be available to the frontend. These sub-classes can be turned into a fully-resolved class by using either `VueWeview.compilePanel` or `VueWebview.compileView`. The resulting classes can finally be used to instantiate webview panels or view. Panels are shown by calling `show`, while views must be registered before they can be seen.
-
-### Examples
-
--   Creating and executing a webview:
-
-    ```ts
-    // Export the class so the frontend code can use it for types
-    export class MyVueWebview extends VueWebview {
-        public readonly id = 'my.view'
-        public readonly source = 'myView.js'
-        public readonly onBar = new vscode.EventEmitter<number>()
-
-        public constructor(private readonly myData: string) {}
-
-        public init() {
-            return this.myData
-        }
-
-        public foo() {
-            return 'foo'
-        }
-
-        public bar() {
-            this.onBar.fire(0)
-        }
-    }
-
-    // Create panel bindings using our class
-    const Panel = VueWebview.compilePanel(MyVueWebview)
-
-    // `context` is `ExtContext` provided on activation
-    const view = new Panel(context, 'hello')
-    view.show({ title: 'My title' })
-    view.server.onFoo.fire(1)
-    ```
-
--   Creating the client on the frontend:
-
-    ```ts
-    import { MyView } from './backend.ts'
-    const client = WebviewClientFactory.create<MyView>()
-    ```
-
--   A basic request/response with error handling:
-
-    ```ts
-    client
-        .foo()
-        .then(response => console.log(response))
-        .catch(err => console.log(err))
-    ```
-
-    The backend protocol is allowed to throw errors. These result in rejected Promises on the frontend.
-
--   Registering for events:
-
-    ```ts
-    client.onBar(num => console.log(num))
-    ```
-
--   Methods called `init` will only return data on the initial webview load:
-
-    ```ts
-    client.init(data => (this.data = data ?? this.data))
-    ```
-
-### Testing
-
-Currently only manual testing is done. Future work will include setting up some basic unit testing capacity via `JSDOM` and `Vue Testing Library`. Strict type-checking may also be enforced on SFCs; currently the type-checking only exists locally due to gaps in the type definitions for the DOM provided by Vue/TypeScript.
-
-## Prompters
-
-A 'prompter' can be thought of as any UI element that displays ('prompts') the user to make some choice or selection, returning their response. This interface is captured with the abstract base class `Prompter` which also contains some extra logic for convenience. Instances of the class can be used alone by calling the async method `prompt`, or by feeding them into a `Wizard`.
-
-```ts
-const prompter = createInputBox()
-const response = await prompter.prompt()
-
-// Verify that the user did not cancel the prompt
-if (isValidResponse(response)) {
-    // `response` is now typed as `string`
-}
-```
-
-### Quick Picks
-
-Pickers can be constructed by using the `createQuickPick` factory function. This currently takes two parameters: a collection of 'items' (required), and an object defining additional options. The items can be an array, a Promise for an array, or an `AsyncIterable`. All collections should resolve to the `DataQuickPickItem` interface. Extra configuration options are derived from valid properties on VS Code's `QuickPick` interface, e.g. `title` sets the title of the resulting picker. Some extra options are also present that change or enhance the default behavior of the picker. For example, using `filterBoxInputSettings` causes the picker to create a new quick pick item based off the user's input.
-
-#### Items
-
-A picker item is simply an extension of VS Code's `QuickPickItem` interface, encapsulating the data it represents in the aptly named `data` field:
-
-```ts
-// This can be typed as `DataQuickPickItem<string>`
-const item = {
-    label: 'An item'
-    data: 'some data'
-}
-```
-
-If the user selects this item, then 'some data' should be returned. Note that the type of data (and therefore type of `Prompter`) can largely be inferred; explicit typing, if done at all, should be limited to item definitions:
-
-```ts
-// Results in `QuickPickPrompter<string>`
-const prompter = createQuickPick([item])
-
-// Results in `QuickPickPrompter<number>`
-const prompter = createQuickPick([{ label: 'Another item', data: 0 }])
-```
-
-Often we deal with items derived asychronously (usually by API calls). `createQuickPick` can handle this scenario, showing a loading bar while items load in. For example, consider a scenario where we want to show the user a list of CloudWatch log groups to select. In this case the API is _paginated_, so we should use the `pageableToCollection` utility method to make it easier to map:
-
-```ts
-interface LogGroup extends CloudWatchLogs.LogGroup {
-    logGroupName: string
-    storedBytes: number
-}
-function isValidLogGroup(obj?: CloudWatchLogs.LogGroup): obj is LogGroup {
-    return !!obj && typeof obj.logGroupName === 'string' && typeof obj.storedBytes === 'number'
-}
-
-const requester = (request: CloudWatchLogs.DescribeLogGroupsRequest) =>
-    client.invokeDescribeLogGroups(request, sdkClient)
-const collection = pageableToCollection(requester, request, 'nextToken', 'logGroups')
-
-const groupToItem = (group: LogGroup) => ({ label: group.logGroupName, data: group })
-const items = collection.flatten().filter(isValidLogGroup).map(groupToItem)
-const prompter = createQuickPick(items) // Results in `QuickPickPrompter<LogGroup>`
-```
-
-If we did not care about pagination, we could call the `promise` method on `collection`, causing all items to load in at once:
-
-```ts
-const items = collection.flatten().filter(isValidLogGroup).map(groupToItem).promise()
-const prompter = createQuickPick(items) // Results in `QuickPickPrompter<LogGroup>`
-```
-
-### Input Box
-
-A new input box prompter can be created using the `createInputBox` factory function. Like `createQuickPick`, the input is derived from the properties of VS Code's `InputBox` interface.
-
-### Testing
-
-Quick pick prompters can be tested using `createQuickPickTester`, returning an interface that executes actions on the picker. This currently acts on the real VS Code API, meaning the actions happen asynchronously. Very basic example:
-
-```ts
-const items = [
-    { label: '1', data: 1 },
-    { label: '2', data: 2 },
-]
-const tester = createQuickPickTester(createQuickPick(items))
-
-tester.assertItems(['1', '2']) // Assert that the prompt displays exactly two items with labels '1' and '2'.
-tester.acceptItem('1') // Accept an item with label '1'. This will fail if no item is found.
-await tester.result(items[0].data) // Execute the actions, asserting the final result is equivalent to the first item's data
-```
-
-## Wizards
-
-Abstractly, a 'wizard' is a collection of discrete, linear steps (subroutines), where each step can potentially be dependent on prior steps, that results in some final state. Wizards are extremely common in top-level flows such as creating a new resource, deployments, or confirmation messages. For these kinds of flows, we have a shared `Wizard` class that handles the bulk of control flow and state management logic for us.
-
-### Creating a Wizard (Quick Picks)
-
-A new wizard can be created by extending off the base `Wizard` class, using the template type to specify the shape of the wizard state. All wizards have an internal 'form' property that is used to assign steps. We can assign UI elements (namely, quick picks) using the `bindPrompter` method on form elements. This method accepts a callback that should return a `Prompter` given the current state. For this example, we will use `createQuickPick` and `createInputBox` for our prompters:
-
-```ts
-interface ExampleState {
-    foo: string
-    bar?: number
-}
-
-class ExampleWizard extends Wizard<ExampleState> {
-    public constructor() {
-        super()
-
-        // Note that steps should only be assigned in the constructor by convention
-        // This first step will always be shown as we did not specify any dependencies
-        this.form.foo.bindPrompter(() => createInputBox({ title: 'Enter a string' }))
-
-        // Our second step is only shown if the length of `foo` is greater than 5
-        // Because of this, we typed `bar` as potentially being `undefined` in `ExampleState`
-        const items = [
-            { label: '1', data: 1 },
-            { label: '2', data: 2 },
-        ]
-        this.form.bar.bindPrompter(state => createQuickPick(items, { title: `Select a number (${state.foo})` }), {
-            showWhen: state => state.foo?.length > 5,
-        })
-    }
-}
-```
-
-### Executing
-
-Wizards can be ran by calling the async `run` method:
-
-```ts
-const wizard = new ExampleWizard()
-const result = await wizard.run()
-```
-
-Note that all wizards can potentially return `undefined` if the workflow was cancelled.
-
-### Testing
-
-Use `createWizardTester` on an instance of a wizard. Tests can then be constructed by asserting both the user-defined and internal state. Using the above `ExampleWizard`:
-
-```ts
-const tester = createWizardTester(new ExampleWizard())
-tester.foo.assertShowFirst() // Fails if `foo` is not shown (or not shown first)
-tester.bar.assertDoesNotShow() // True since `foo` is not assigned an explicit value
-tester.foo.applyInput('Hello, world!') // Manipulate 'user' state
-tester.bar.assertShow() // True since 'foo' has a defined value
-```
+This document was renamed to [arch_overview.md](./arch_overview.md)
diff --git a/docs/CODE_GUIDELINES.md b/docs/CODE_GUIDELINES.md
index fb9c6c8ca53..90153905b12 100644
--- a/docs/CODE_GUIDELINES.md
+++ b/docs/CODE_GUIDELINES.md
@@ -11,6 +11,27 @@ that cannot be enforced by a `lint` build-task.
     instead of inventing new conventions.
 -   Convention: provide global editor commands as an alternative to browsing items in the Explorer.
     -   Instead of needing to visit service _Foo_ in the Explorer to _View_ its items, consider also providing a `AWS: Foo: View Item` command.
+-   [Webview guidance](https://code.visualstudio.com/api/ux-guidelines/webviews)
+-   Webview costs:
+    -   Webviews very easily lead to the [inner-platform effect](https://en.wikipedia.org/wiki/Inner-platform_effect).
+        Because they are fully isolated from vscode and its extensions, they must include any code
+        and frameworks.
+    -   Leads to extra dependencies.
+    -   Webviews inherit none of vscode's standard features. This means features like keyboard
+        shortcuts, syntax highlighting, and editor navigation, are not available to users. Instead
+        users must learn the custom _web application_ embedded in the webview.
+
+## Dependencies
+
+Dependencies can be very high-leverage if they solve a difficult problem.
+Dependencies are also a [maintenance burden](https://github.com/aws/aws-toolkit-vscode/pulls?q=is%3Apr+author%3Aapp%2Fdependabot+is%3Aclosed) and security risk
+Copy-pasting or "inlining" a dependency doesn't solve that, of course--it only hides the problem (another cost).
+So before taking on a new dependency, ask:
+
+-   is this solving a problem that is worth the cost?
+-   could the problem be solved in some other way that involves a smaller cost? For example, using
+    an isolated function with good test coverage, or a native vscode feature such as a TreeView or
+    quickpick menu.
 
 ## Naming
 
@@ -60,13 +81,10 @@ that is a net cost.
 -   Telemetry: "active" vs "passive"
     -   Active (`passive:false`) metrics are those intended to appear in DAU count.
 -   Icons:
-    -   Where possible, use IDE-specific standard icons (e.g. standard VSCode
-        standard icons in VSCode, and Cloud9 standard icons in Cloud9). The typical
-        (maintainable) way to do this is to use _named_ icons (what VSCode calls
+    -   Where possible, use standard VSCode icons. The typical (maintainable)
+        way to do this is to use _named_ icons (what VSCode calls
         [codicons](https://microsoft.github.io/vscode-codicons/)) as opposed to
         icons shipped with the Toolkit build and referenced by _path_.
-    -   For cases where icons must be statically defined (package.json), if Cloud9
-        does not support the VSCode standard icon, use the Cloud9 icon.
 -   Changelog guidelines
     -   Prefer active voice: "You can do X" instead of "X can be done"
 -   Avoid unnecessary use of `lodash` (which we may remove in the future).
@@ -91,6 +109,13 @@ that is a net cost.
     -   Localize UI messages. Do _not_ localize log and exception messages.
     -   Use `extensionUtilities.getIdeProperties()` to automatically match IDE
         terminology (e.g. VS Code : CodeLens :: AWS Cloud9 : Inline Action)
+-   Refactoring tools allow us to avoid "premature abstraction". Avoid wrappers
+    or other abstractions until the need is clear and obvious.
+
+### Exceptions
+
+_See also [arch_develop.md](./arch_develop.md#exceptions)._
+
 -   Bubble-up error conditions, do not sink them to random hidden places (such as
     logs only), expecting callers to figure out the failure mode. If a caller
     spawns a process that fails, the caller should get an exception, callback, or
@@ -101,10 +126,22 @@ that is a net cost.
     attaching metadata to the error, or retrying the failed action. Do not just
     log and rethrow the error without additional context as to where the error occured.
 -   Do not log a stack trace unless it's truly a fatal exception. Stack traces are
-    noisy and mostly useless in production because the extension is 'bundled', removing
-    anything useful from the trace.
--   Refactoring tools allow us to avoid "premature abstraction". Avoid wrappers
-    until the need is clear and obvious.
+    noisy and mostly useless in production because the extension is bundled
+    (webpacked), removing anything useful from the trace.
+    -   When _debugging_ the extension, you can tell the debugger to break on
+        exceptions, so logging the stacktrace is unnecessary there.
+-   Do not use multiple logger calls to log what is semantically a single
+    message. Use a string template or printf-style syntax (`%s` ) to format the
+    message:
+    -   GOOD:
+        ```
+        getLogger().error(`Failed to create %s: %s`, foo, (err as Error).message)
+        ```
+    -   BAD:
+        ```
+        getLogger().error(`Failed to create %s`, foo)
+        getLogger().error(err)
+        ```
 
 ## Test guidelines
 
@@ -143,7 +180,7 @@ that is a net cost.
 
     -   [Testing Refresh Button](https://github.com/aws/aws-toolkit-vscode/blob/b34c8f7650c862c388992781844695b014b5d974/src/test/shared/ui/prompters/rolePrompter.test.ts#L58-L65)
 
--   Use [`testCommand`](../src/test/shared/vscode/testUtils.ts) for testing commands created by `Commands.declare`
+-   Use [`testCommand`](../packages/core/src/test/shared/vscode/testUtils.ts) for testing commands created by `Commands.declare`
     -   Prefer executing the real command directly when possible
 
 ## Code guidelines
@@ -200,11 +237,11 @@ that is a net cost.
 
     -   PREFER:
         ```ts
-        things.filter(o => o.isFoo)
+        things.filter((o) => o.isFoo)
         ```
     -   INSTEAD OF:
         ```ts
-        things.filter(thing => thing.isFoo)
+        things.filter((thing) => thing.isFoo)
         ```
 
 ## User settings
diff --git a/docs/TESTPLAN.md b/docs/TESTPLAN.md
index 15cc6fce378..56a299c9a5b 100644
--- a/docs/TESTPLAN.md
+++ b/docs/TESTPLAN.md
@@ -15,31 +15,48 @@ Ratio of unit to integ tests: 90% unit tests, 10% system/acceptance tests.
 
 ## Test categories
 
-The test suite has two categories of tests:
+The test suite has the following categories of tests:
 
 -   Unit Tests: **fast** tests
     -   Live in `src/test/`
     -   The `vscode` API is available.
+        -   Use `getTestWindow()` to inspect or manipulate `vscode.window`
     -   The Toolkit code is invoked as a library, not as an extension activated in VSCode's typical lifecycle.
     -   Call functions and create objects directly.
     -   May mock state where needed, though this is discouraged in favor of "fake" data/objects/files.
     -   May use the filesystem.
     -   Main property is that [the test is fast](https://pycon-2012-notes.readthedocs.io/en/latest/fast_tests_slow_tests.html).
     -   Global state is shared across tests, thus there is a risk that later tests are polluted by earlier tests.
+-   Lint Tests:
+    -   Live in `src/testLint`
+    -   Can run from CLI with `npm run lint`
+    -   Any type of test related to the format/quality/content of the code
+    -   Does not have context of the `vscode` api
 -   Integration Tests: **slow** tests
-    -   Live in `src/integrationTest/`
+    -   Live in `src/testInteg/`
     -   Use a full instance of VSCode with an activated instance of the extension.
     -   Global state is shared across tests, thus there is a risk that later tests are polluted by earlier tests.
     -   Trigger VSCode commands and UI elements to test codepaths as from an actual user session, instead of invoking functions directly.
     -   Do not use mocks.
+-   E2E Tests: **slow** tests
+    -   Live in `src/testE2E`
+    -   These tests are heavier than Integration tests.
+    -   Some E2E tests have a more complicated architecture, described in [TEST_E2E](./TEST_E2E.md)
+-   Performance Tests: **slow** tests
+    -   Live in `src/testInteg/perf`.
+    -   A subset of integration tests focused on catching performance regressions.
+    -   Use a combination of operation counting and system usage statistics such as cpu usage, memory usage, and duration.
+    -   Each test is often repeated 10 or more times for less variant system usage statistics, then median of runs is used.
 
 ## Test files
 
+Currently, most testing code lives in the subproject `packages/core/` due to the move to monorepo. See [arch_develop.md](./arch_develop.md#monorepo-structure).
+
 -   `src/test/` : unit tests
     -   `src/test/globalSetup.test.ts` :
         -   defines global setup functions run before and after each test
         -   defines global utility functions such as `getTestLogger()`
--   `src/integrationTest/` : integration tests
+-   `src/testInteg/` : integration tests
 -   `src/test/testRunner.ts` : used by _both_ the unit tests and integration
     tests to discover tests, setup the test framework, and run tests.
 -   `src/testFixtures/` : test data (sample projects, SAM templates, ...)
@@ -47,6 +64,8 @@ The test suite has two categories of tests:
 -   `.vscode/launch.json` : defines VSCode launch configs useful for Toolkit
     developers, e.g. the `Extension Tests` config runs all tests in `src/test/`.
 
+Many tests required running in an activated extension environment, but the core-lib is just a library and does not have any extension to activate itself. Core-lib tests are run from `packages/toolkit`, and web tests are run from `packages/amazonq`.
+
 ## How we test
 
 VSCode documentation describes an [extension testing](https://code.visualstudio.com/api/working-with-extensions/testing-extension)
@@ -65,10 +84,52 @@ modifications/workarounds in `src/test/testRunner.ts`.
 -   Many failure modes (as opposed to the "happy path") are not tested.
 -   No performance/benchmark regression tests.
 -   No UI tests (to exercise webviews).
-    - https://github.com/redhat-developer/vscode-extension-tester
+    -   https://github.com/redhat-developer/vscode-extension-tester
 -   Missing acceptance tests:
     -   Connect to AWS
     -   Fixed credentials and fixed credentials with assume roles
 -   Testing AWS SDK client functionality is cumbersome, verbose, and low-yield.
 -   Test code uses multiple “mocking” frameworks, which is confusing, error-prone, hard to onboard, and hard to use.
 -   Coverage not counted for integ tests (because of unresolved tooling issue).
+-   [Backlog](https://github.com/aws/aws-toolkit-vscode/blob/0f3685ab0dc8af3a214136ebfa233829d5d72b2c/src/shared/telemetry/exemptMetrics.ts) of metrics that do not pass validation but are temporarily exempted to not fail CI.
+
+## Window
+
+Certain VS Code API calls are not easily controlled programtically. `vscode.window` is a major source of these functions as it is closely related to the UI. To facilitate some semblance of UI testing, all unit tests have access to a proxied `vscode.window` object via `getTestWindow()`.
+
+### Inspecting State
+
+The test window will capture relevant UI state that can be inspected at test time. For example, you can check to see if any messages were shown by looking at `getTestWindow().shownMessages` which is an array of message objects.
+
+Some VS Code API operations do not expose "native" UI elements that can be inspected. In these cases, in-memory test versions have been created. In every other case the native VS Code API is used directly and extended to make them more testable.
+
+### Event-Driven Interactions
+
+Checking the state works well if user interactions are not required by the code being tested. But many times the code will be waiting for the user's response.
+
+To handle this, test code can register event handler that listen for when a certain type of UI element is shown. For example, if we wanted to always accept the first item of a quick pick we can do this:
+
+```ts
+getTestWindow().onDidShowQuickPick(async (picker) => {
+    // Some pickers load items asychronously
+    // Wait until the picker is not busy before accepting an item
+    await picker.untilReady()
+    picker.acceptItem(picker.items[0])
+})
+```
+
+Utility functions related to events can be used to iterate over captured UI elements:
+
+```ts
+const pickers = captureEvent(getTestWindow().onDidShowQuickPick)
+const firstPicker = await pickers.next()
+const secondPicker = await pickers.next()
+```
+
+Exceptions thrown within one of these handlers will cause the current test to fail. This allows you to make assertions within the callback without worrying about causing the test to hang.
+
+## Common issues
+
+### Stubbing VSCode outside of core
+
+-   Stubbing VSCode imports (like executeCommand) does not work outside of core. For now you will need to put any tests that require spying/stubbing VSCode imports in core until we move more source files into the amazon q package
diff --git a/docs/TEST_E2E.md b/docs/TEST_E2E.md
new file mode 100644
index 00000000000..10927c098e3
--- /dev/null
+++ b/docs/TEST_E2E.md
@@ -0,0 +1,43 @@
+### Test E2E
+
+This document describes the testing architecture specifically for more complicated E2E tests running the toolkits.
+
+#### Amazon Q E2E Tests
+
+Since VSCode does not have native support for writing E2E/UI tests for components occuring inside of a webview, we have taken a slightly different approach to write E2E tests for Amazon Q.
+
+The E2E tests for Amazon Q follow the following flow: ![Amazon Q E2E flow](./images/amazon_q_e2e.png)
+
+This means instead of running the E2E tests inside of the webview, we hoist the Mynah UI package into the test structure using JSDOM. This allows us to directly interface with Mynah UI allowing us to not rely on any DOM elements, making tests a lot easier to create and simple to maintain.
+
+The downsides are that we technically aren't testing any of the actual contents of the webview to make sure things are behaving correctly. Instead, we are testing that when we programatically send a message to the UI that the Mynah UI <-> Amazon Q VSCode code interacts successfully.
+
+With this approach, the follow things can be tested:
+
+-   Whether or not certain features show/not show depending on the status of the users auth
+-   Run requests directly against the backend and see if we get results back
+-   Clicking any follow up buttons (including examples)
+
+## Flare Chat E2E Test flow (Not implemented yet)
+
+This is the new flow that should be introduced when we moved to Flare chat.
+
+```mermaid
+sequenceDiagram
+    participant test as Test
+    participant framework as Test Framework
+    participant ui as Virtual DOM
+    participant lsp as Language Server
+    participant mynah as Mynah UI
+
+    test->>test: starts
+    test->>framework: creates test framework
+    framework->>ui: adds mynah ui to virtual dom
+    test->>lsp: waits for language server activation
+    test->>mynah: triggers action on mynah ui
+    mynah->>framework: sends message
+    framework->>lsp: sends message
+    lsp->>framework: gets response
+    framework->>ui: displays response
+    test->>ui: assert test expectations
+```
diff --git a/docs/api.md b/docs/api.md
new file mode 100644
index 00000000000..ffb08bf88c5
--- /dev/null
+++ b/docs/api.md
@@ -0,0 +1,35 @@
+# AWS Toolkit API
+
+Details about any publicly accessible functionalities exposed through [extension commands](https://code.visualstudio.com/api/references/vscode-api#commands) or [exported APIs](https://code.visualstudio.com/api/references/vscode-api#extensions).
+
+## Pseudo (Internal-only) API
+
+### Commands
+
+#### `aws.codeWhisperer.connect`
+
+**Signature**: _async (source: string, startUrl?: string, region?: string, customizationArn?: string, customizationNamePrefix?: string) => Promise<void>_
+
+Shortcut command to directly connect to Identity Center or prompt start URL entry, as well as set a customization for CodeWhisperer requests.
+
+This command supports the following arguments:
+
+-   source: An identifier of the caller of this command. This can be used for something like telemetry.
+-   startUrl and region. If both arguments are provided they will be used, otherwise the command prompts for them interactively.
+-   customizationArn: select customization by ARN. If provided, `customizationNamePrefix` is ignored.
+-   customizationNamePrefix: select customization by prefix, if `customizationArn` is `undefined`.
+
+### Extension API
+
+#### `listConnections`
+
+**Signature**: _async () => Promise<AwsConnection>_
+
+This is an API that exposes the metadata of SSO connections of AWS Toolkit. It returns a list of `AwsConnection` which contains below fields:
+
+-   id: string that presents the id of the connection
+-   label: label of the connection
+-   type: type of the connection, currently only 'sso' is returned
+-   ssoRegion: region of the connection, e.g: us-west-2
+-   startUrl: start url of the connection
+-   scopes?: list of the scopes of the connection
diff --git a/docs/arch_develop.md b/docs/arch_develop.md
new file mode 100644
index 00000000000..a3ad998d3e1
--- /dev/null
+++ b/docs/arch_develop.md
@@ -0,0 +1,621 @@
+# Architecture: structure
+
+> Describes the codebase structure and shared modules, and how to work with it.
+> Corresponds to the "Development view" of the [4+1 architectural views](https://en.wikipedia.org/wiki/4%2B1_architectural_view_model).
+
+## Monorepo Structure
+
+**The easiest way to open the project for running/debugging:** File > Open Workspace from File > choose `aws-toolkit-vscode/aws-toolkit-vscode.code-workspace`
+
+This project is currently set up as a typescript monorepo with the following subprojects:
+
+-   [`packages/core/`](./packages/core/)
+    -   Currently, this package contains almost all of the functionality required for the extension.
+        It was created by moving all of the code from `packages/tookit/` to here.
+        We are currently working on separating non-shareable code out of the core library into the relevant
+        subproject. Running tests for most of the toolkit extension logic occurs in this subproject.
+-   [`packages/toolkit/`](./packages/toolkit/)
+    -   Currently, this package is a barebones wrapper that calls activation functions from the core library.
+        As we discover what code cannot be shared across other projects, it will be moved to this package.
+        Running and packaging the extension occurs from this subproject.
+
+If you are considering contributing, please consider whether your implementation should live in the core
+library or in `packages/toolkit`. If your work could be re-used by other packages (e.g. auth mechanisms,
+utilities), then it may belong in the core library. If instead you are adding something toolkit specific
+(eg. an integration to a new AWS service in the Explorer Tree), consider putting it in `packages/toolkit`.
+To import from the core library, please export your desired code using `index.ts` files and add an appropriate `exports` statement
+in `packages/core/package.json`.
+
+Unless otherwise stated, the documentation throughout this project is referring to the code and
+functionality in `packages/core/` and `packages/toolkit`.
+
+Current quirks of the current monorepo status that should be resolved/evaluated in later versions (TODO):
+
+-   [**Running the test suites in VSCode has changed**](../CONTRIBUTING.md#test)
+-   The [root package.json](../package.json) contains common dependencies for subprojects, and workspace
+    entries for each of the subprojects.
+    -   This package contains shortcuts to some of the `npm` scripts found in the subproject(s).
+    -   `createRelease` and `newChange` run at the subproject level only, e.g. from root level, try npm run createRelease -w packages/toolkit
+    -   To run a script not present in the root `package.json`, use `npm run -w packages/toolkit <script>`
+-   `coverage/`, `.test-reports/`, `node_modules/` are hoisted to the project root.
+    -   `dist/` however remains at the subproject level, along with a local `node_modules/`. See [`npm workspaces`](https://docs.npmjs.com/cli/v8/using-npm/workspaces)
+        for more info on how `node_modules/` hoisting works.
+    -   Because of `node_modules/` hoisting, references to this folder in code access the root project modules folder. This may be
+        an issue if more subprojects are added and the contents of the root and local modules folders differ.
+-   [`globalSetup.test.ts`](../packages/core/src/test/globalSetup.test.ts) should be configured to work as a library/run tests for all subprojects.
+-   Subproject `tsconfig.json`s should extend a root `tsconfig.packages.json`.
+-   `packages/*/scripts/` should be generalized and moved to the root of the project as needed.
+-   Linting tests should run at the root level, not subproject level.
+-   LICENSE, README.md, and other non-code artifacts that must be packaged into the .vsix are currently
+    being copied into the packaging subproject directory from the root project directory as part of the `copyFiles` task.
+-   Pre-release only publishes packages/toolkit extension directly. It should be extended to other added extensions. See [`release.yml`](../.github/workflows/release.yml)
+-   VSCode does not support inheriting/extending `.vscode/` settings: https://github.com/microsoft/vscode/issues/15909
+
+### Contributes and Settings
+
+`packages/toolkit/` and `packages/amazonq` have independent extension packageJSON files. They do not rely on `packages/core/package.json`. However, to get typed icons in the core-lib we require a place to store the icon entries. This currently happens in `packages/core/package.json`. See [`icons.md`](./icons.md) for more information.
+
+If you are modifying or registering new debuggers in VS Code via the `debuggers` contribution point, you may need to regenerate the [definitions file](../packages/core/src/shared/sam/debugger/awsSamDebugConfiguration.gen.ts). After updating ['toolkit/package.json'](../packages/toolkit/package.json), run `npm run generateConfigurationAttributes -w packages/toolkit`
+
+## `web`, `node`, `common`, `shared` naming conventions
+
+This project can run in different environments, eg Web mode (in the browser with no compute backend), or in Node.js on your desktop (the most common way).
+A problem arises when we use code that is exclusive to one environment, an example being Node.js' Filesystem module which will fail in Web mode.
+
+To ensure developers use compatible code for their environment we have subfolders in each topic which contains environment specific code in a single place.
+
+Using this file tree as reference, here are the rules:
+
+```
+src/
+├── myTopic/
+│   ├── {file}.ts
+│   ├── node/
+│   │   └── {file}.ts
+│   └── web/
+│       └── {file}.ts
+└── shared/
+```
+
+-   `myTopic/` is the general name of the folder, eg `request` for http requests.
+-   `myTopic/{file}.ts` is for code that works in any environment, we refer to this as `"common"` code.
+-   `node/{file}.ts` is for code that works exclusively in Node.js.
+-   `web/{file}.ts` is for code that works exclusively in Web mode.
+-   `shared/` is for code that is intended to be reused, i.e general purpose utils.
+    -   Note environment specific code should be place in to a `web/` or `node/` subfolder.
+    -   If the code is not in a subfolder then it is considered `shared common` code.
+
+> IMPORTANT: The current codebase does not fully follow this convention yet, the transition is being done incrementally. Due to this, code that is `"common"` may not actually be common yet. If you run in to this, please move that code to the appropriate subfolder.
+
+## Commands
+
+Many parts of the VS Code API relies on the use of 'commands' which are simply functions bound to a global ID. For small projects, this simplicity is great. But the base API doesn't offer a lot of common functionality that a large project might want: logging, error handling, etc.
+
+For the Toolkit, common command functionality is implemented in [Commands](../packages/core/src/shared/vscode/commands2.ts). The goal with this abstraction is to increase consistency across the Toolkit for anything related to commands.
+
+### Examples
+
+-   Registering and execution:
+
+    ```ts
+    const command = Commands.register('helloWorld', () => console.log('Hello, World!'))
+    command.execute()
+    ```
+
+-   Using parameters:
+
+    ```ts
+    const showMessage = async (message: string) => vscode.window.showInformationMessage(message)
+    const command = Commands.register('aws.showMessage', showMessage)
+    command.execute('Hello, World!')
+    ```
+
+-   Creating a CodeLens:
+
+    ```ts
+    // The built CodeLens should be returned through a `vscode.CodeLensProvider` implementation
+    const range = new vscode.Range(0, 0, 0, 0)
+    const lens = command.build('Hello, World!').asCodeLens(range, { title: 'Click me!' })
+    ```
+
+-   Creating a tree node:
+
+    ```ts
+    // `node` will execute the command when clicked in the explorer tree
+    // This object should be returned as a child of some other tree node
+    const node = command.build('Hello, World!').asTreeNode({ label: 'Click me!' })
+    ```
+
+### Advanced Uses
+
+Complex programs often require more than just simple functions to act as entry-points. Large amounts of state may be involved, which can be very difficult to test and reason about without proper management. One way to make it easier to isolate state from a given command is by 'declaring' it. This associates a command with all the required dependencies while still making it look like any other command.
+
+-   Command declaration and registration:
+
+    ```ts
+    const command = Commands.declare('aws.showMessage2', (state: Record<string, string>) => (key: string) => {
+        return showMessage(state[key] ?? 'Message not found')
+    })
+
+    command.register({ hello: 'Hello, World!', goodbye: 'Goodbye, World!' })
+    command.execute('goodbye')
+    ```
+
+-   Prototype binding:
+
+    ```ts
+    // This class won't show duplicate messages that use the same key unlike the previous example
+    class Messages {
+        private readonly shown = new Map<string, Promise<unknown>>()
+        public constructor(private readonly state: Record<string, string>) {}
+
+        public showMessage(key: string) {
+            const promise = this.shown.get(key) ?? showMessage(this.state[key] ?? 'Message not found')
+            this.shown.set(
+                key,
+                promise.finally(() => this.shown.delete(key))
+            )
+
+            return promise
+        }
+    }
+
+    const command = Commands.from(Messages).declareShowMessage('aws.showMessage3')
+    const messages = new Messages({ hello: 'Hello, World!', goodbye: 'Goodbye, World!' })
+
+    command.register(messages)
+    command.execute('goodbye')
+    command.execute('hello')
+    command.execute('goodbye')
+    ```
+
+## Exceptions
+
+_See also [CODE_GUIDELINES.md](./CODE_GUIDELINES.md#exceptions)._
+
+Large applications often have a correspondingly large number of failure points. For feature-level logic, these failures are often non-recoverable. The best we can do is show the user that something went wrong and maybe offer guidance on how to fix it.
+
+Because this is such a common pattern, shared error handling logic is defined by `ToolkitError` found [here](../packages/core/src/shared/errors.ts). This class provides the basic structure for errors throughout the Toolkit.
+
+### Chaining
+
+Exceptions that occur deep in a call stack often do not contain enough context to correctly diagnose the problem. A stack trace is helpful, but only if the reader has access to both the source code and source map.
+
+By adding additional information as the exception bubbles up, we can create a better view of the program state when the problem occured. This is done via `ToolkitError.chain`. The `chain` function serves as a standard way to establish a clear cause-and-effect relationship for errors.
+
+### Handlers
+
+Any code paths exercised via `Commands` will have errors handled by `handleError` in [extensions.ts](../packages/core/src/extension.ts). A better API for error handling across more than just commands will be added in a future PR.
+
+### Best Practices
+
+Implementations still need to adhere to some basic principles for this to work nicely:
+
+-   Do not catch errors unless something meaningful can be added.
+-   Do not swallow errors unless the functionality is non-critical to the feature.
+-   Do not directly show the user an error message for failed actions. Use `ToolkitError` instead.
+-   Use `chain` when re-throwing errors with additional information.
+-   Use `CancellationError` for explicit workflow cancellations.
+-   Define meaninful error codes when creating new errors.
+
+## Webviews (Vue framework)
+
+The current implementation uses Vue 3 with Single File Components (SFCs) for modularity. Each webview
+is bundled into a single file and packaged into the toolkit at release time. Vue applications may be composed
+of individual components in a parent/child heiracrchy. Each component is able to act independently within an
+application, however, they must respect the following principles:
+
+1. State can only be stored in a child component if it is not being used for two-way communication (via events)
+2. If there is two-way communication, store state in the parent
+3. Data should flow down, actions should flow up
+
+Be very mindful about state managment; violating these principles will lead to buggy and hard-to-debug software.
+
+### Bundling
+
+Each webview is bundled into a single file to speed up load times as well as isolate the 'web' modules from the 'node' modules. Webview bundles are automatically generated on compilation by targeting `index.ts` files when located under a `vue` directory. All bundles are placed under `dist` in the same relative location.
+
+Generated bundle names map based off their path relative to `src`: `src/foo/vue/bar/index.ts` -> `dist/src/foo/vue/bar/index.js`
+
+Running the extension in development mode (e.g. via the `Extension` launch task) starts a local server to automatically rebuild and serve webviews in real-time via hot-module reloading. It's assumed that the server runs on port `8080`, so make sure that nothing is already using that port. Otherwise webviews will not be displayed during development.
+
+### Client/Server
+
+The VS Code API restricts our Webviews to a single `postMessage` function. To simplify developing Webviews, we use a client/server architecture to handle message passing between the view and the extension. This does not mean that clients are restricted to 1 message = 1 response, rather, the frontend ("client") needs to send the first message.
+
+Webview (frontend) clients can be created via `WebviewClientFactory`. This generates a simple Proxy to send messages to the extension, mapping the function name to the command name. Unique IDs are also generated to stop requests from receiving extraneous responses. It is **highly** recommended to use the [Volar](https://marketplace.visualstudio.com/items?itemName=johnsoncodehk.volar) extension for syntax highlighting and type-checking when working with SFCs. Keep in mind that this is purely a development tool: users of the toolkits do not require Volar to view webviews.
+
+Commands and events are defined on the backend via sub-classes of `VueWebview`. Classes define all the functions and events that will be available to the frontend. These sub-classes can be turned into a fully-resolved class by using either `VueWeview.compilePanel` or `VueWebview.compileView`. The resulting classes can finally be used to instantiate webview panels or view. Panels are shown by calling `show`, while views must be registered before they can be seen.
+
+### Examples
+
+-   Creating and executing a webview:
+
+    ```ts
+    // Export the class so the frontend code can use it for types
+    export class MyVueWebview extends VueWebview {
+        public readonly id = 'my.view'
+        public readonly source = 'myView.js'
+        public readonly onBar = new vscode.EventEmitter<number>()
+
+        public constructor(private readonly myData: string) {}
+
+        public init() {
+            return this.myData
+        }
+
+        public foo() {
+            return 'foo'
+        }
+
+        public bar() {
+            this.onBar.fire(0)
+        }
+    }
+
+    // Create panel bindings using our class
+    const Panel = VueWebview.compilePanel(MyVueWebview)
+
+    // `context` is `ExtContext` provided on activation
+    const view = new Panel(context, 'hello')
+    view.show({ title: 'My title' })
+    view.server.onFoo.fire(1)
+    ```
+
+-   Creating the client on the frontend:
+
+    ```ts
+    import { MyView } from './backend.ts'
+    const client = WebviewClientFactory.create<MyView>()
+    ```
+
+-   A basic request/response with error handling:
+
+    ```ts
+    client
+        .foo()
+        .then((response) => console.log(response))
+        .catch((err) => console.log(err))
+    ```
+
+    The backend protocol is allowed to throw errors. These result in rejected Promises on the frontend.
+
+-   Registering for events:
+
+    ```ts
+    client.onBar((num) => console.log(num))
+    ```
+
+-   Methods called `init` will only return data on the initial webview load:
+
+    ```ts
+    client.init((data) => (this.data = data ?? this.data))
+    ```
+
+## Webviews (non Vue)
+
+Some webviews (amazon q chat view, codewhisperer security panel) rely on the native vscode webview implementation using the `vscode.WebviewViewProvider` and the `vscode.window.registerWebviewViewProvider(viewType, panel)` extension APIs. They follow the standard structure given by the webview documentation: https://code.visualstudio.com/api/extension-guides/webview.
+
+### Importing css
+
+css imports for non vue webviews should be imported when generating the webview provider html, rather than loaded inside of the javascript otherwise you will get "Error: Cannot find module 'some/path/to/my.css'" when running the e2e tests:
+
+e.g. when creating the html do:
+
+```ts
+// foo.js
+export function foo() {
+    // some javascript actions
+}
+
+// webview.ts
+const myCSS = webviewView.webview.asWebviewUri(
+    vscode.Uri.joinPath(globals.context.extensionUri, 'resources', 'mycss.css')
+)
+
+webviewView.webview.html = `
+<html>
+    <head>
+        <link rel="stylesheet" href="${myCSS.toString()}">
+    </head>
+    <body>
+        <script src="./foo.js">
+            foo()
+        </script>
+    </body>
+</html>
+`
+```
+
+rather than:
+
+```ts
+// foo.js
+import 'resources/mycss.css'
+
+export function foo() {
+    // some javascript actions
+}
+
+// webview.ts
+webviewView.webview.html = `
+<html>
+    <body>
+        <script src="./foo.js">
+            foo()
+        </script>
+    </body>
+</html>
+`
+```
+
+### Testing
+
+Currently only manual testing is done. Future work will include setting up some basic unit testing capacity via `JSDOM` and `Vue Testing Library`. Strict type-checking may also be enforced on SFCs; currently the type-checking only exists locally due to gaps in the type definitions for the DOM provided by Vue/TypeScript.
+
+## Prompters
+
+A 'prompter' can be thought of as any UI element that displays ('prompts') the user to make some choice or selection, returning their response. This interface is captured with the abstract base class `Prompter` which also contains some extra logic for convenience. Instances of the class can be used alone by calling the async method `prompt`, or by feeding them into a `Wizard`.
+
+```ts
+const prompter = createInputBox()
+const response = await prompter.prompt()
+
+// Verify that the user did not cancel the prompt
+if (isValidResponse(response)) {
+    // `response` is now typed as `string`
+}
+```
+
+### Quick Picks
+
+Pickers can be constructed by using the `createQuickPick` factory function. This currently takes two parameters: a collection of 'items' (required), and an object defining additional options. The items can be an array, a Promise for an array, or an `AsyncIterable`. All collections should resolve to the `DataQuickPickItem` interface. Extra configuration options are derived from valid properties on VS Code's `QuickPick` interface, e.g. `title` sets the title of the resulting picker. Some extra options are also present that change or enhance the default behavior of the picker. For example, using `filterBoxInputSettings` causes the picker to create a new quick pick item based off the user's input.
+
+#### Items
+
+A picker item is simply an extension of VS Code's `QuickPickItem` interface, encapsulating the data it represents in the aptly named `data` field:
+
+```ts
+// This can be typed as `DataQuickPickItem<string>`
+const item = {
+    label: 'An item'
+    data: 'some data'
+}
+```
+
+If the user selects this item, then 'some data' should be returned. Note that the type of data (and therefore type of `Prompter`) can largely be inferred; explicit typing, if done at all, should be limited to item definitions:
+
+```ts
+// Results in `QuickPickPrompter<string>`
+const prompter = createQuickPick([item])
+
+// Results in `QuickPickPrompter<number>`
+const prompter = createQuickPick([{ label: 'Another item', data: 0 }])
+```
+
+Often we deal with items derived asychronously (usually by API calls). `createQuickPick` can handle this scenario, showing a loading bar while items load in. For example, consider a scenario where we want to show the user a list of CloudWatch log groups to select. In this case the API is _paginated_, so we should use the `pageableToCollection` utility method to make it easier to map:
+
+```ts
+interface LogGroup extends CloudWatchLogs.LogGroup {
+    logGroupName: string
+    storedBytes: number
+}
+function isValidLogGroup(obj?: CloudWatchLogs.LogGroup): obj is LogGroup {
+    return !!obj && typeof obj.logGroupName === 'string' && typeof obj.storedBytes === 'number'
+}
+
+const requester = (request: CloudWatchLogs.DescribeLogGroupsRequest) =>
+    client.invokeDescribeLogGroups(request, sdkClient)
+const collection = pageableToCollection(requester, request, 'nextToken', 'logGroups')
+
+const groupToItem = (group: LogGroup) => ({ label: group.logGroupName, data: group })
+const items = collection.flatten().filter(isValidLogGroup).map(groupToItem)
+const prompter = createQuickPick(items) // Results in `QuickPickPrompter<LogGroup>`
+```
+
+If we did not care about pagination, we could call the `promise` method on `collection`, causing all items to load in at once:
+
+```ts
+const items = collection.flatten().filter(isValidLogGroup).map(groupToItem).promise()
+const prompter = createQuickPick(items) // Results in `QuickPickPrompter<LogGroup>`
+```
+
+### Input Box
+
+A new input box prompter can be created using the `createInputBox` factory function. Like `createQuickPick`, the input is derived from the properties of VS Code's `InputBox` interface.
+
+### Testing
+
+Quick pick prompters can be tested using `createQuickPickTester`, returning an interface that executes actions on the picker. This currently acts on the real VS Code API, meaning the actions happen asynchronously. Very basic example:
+
+```ts
+const items = [
+    { label: '1', data: 1 },
+    { label: '2', data: 2 },
+]
+const tester = createQuickPickTester(createQuickPick(items))
+
+tester.assertItems(['1', '2']) // Assert that the prompt displays exactly two items with labels '1' and '2'.
+tester.acceptItem('1') // Accept an item with label '1'. This will fail if no item is found.
+await tester.result(items[0].data) // Execute the actions, asserting the final result is equivalent to the first item's data
+```
+
+## Wizards
+
+Abstractly, a 'wizard' is a collection of discrete, linear steps (subroutines), where each step can potentially be dependent on prior steps, that results in some final state. Wizards are extremely common in top-level flows such as creating a new resource, deployments, or confirmation messages. For these kinds of flows, we have a shared `Wizard` class that handles the bulk of control flow and state management logic for us.
+
+### 1. `Wizard` Class
+
+Create a new wizard by extending the base `Wizard` class, using the template type to specify the
+shape of the wizard state. All wizards have an internal `form` property that is used to assign
+steps. You can assign UI elements (namely, quickpicks) using the `bindPrompter` method on form
+elements. This method accepts a callback that should return a `Prompter` given the current state.
+For this example, we will use `createQuickPick` and `createInputBox` for our prompters:
+
+If you need to call async functions to construct your `Wizard` subclass, define your init logic in
+the `init()` method instead of the constructor.
+
+```ts
+interface ExampleState {
+    foo: string
+    bar?: number
+}
+
+class ExampleWizard extends Wizard<ExampleState> {
+    public constructor() {
+        super()
+
+        // Note that steps should only be assigned in the constructor by convention
+        // This first step will always be shown as we did not specify any dependencies
+        this.form.foo.bindPrompter(() => createInputBox({ title: 'Enter a string' }))
+
+        // Our second step is only shown if the length of `foo` is greater than 5
+        // Because of this, we typed `bar` as potentially being `undefined` in `ExampleState`
+        const items = [
+            { label: '1', data: 1 },
+            { label: '2', data: 2 },
+        ]
+        this.form.bar.bindPrompter((state) => createQuickPick(items, { title: `Select a number (${state.foo})` }), {
+            showWhen: (state) => state.foo?.length > 5,
+        })
+    }
+}
+```
+
+### 2. `CompositeWizard` Class
+
+`CompositeWizard` extends `Wizard` to create and manage a collection of nested/child wizards.
+
+Extend this class to create a wizard that contains other wizards as part of a prompter flow.
+Use `this.createWizardPrompter()` to use a wizard as a prompter in the `CompositeWizard`.
+
+Example:
+
+```ts
+
+// Child wizard
+class ChildWizard extends Wizard<ChildWizardForm> {...}
+
+
+// Composite wizard
+interface SingleNestedWizardForm {
+    ...
+    singleNestedWizardNestedProp: string
+    ...
+}
+
+class SingleNestedWizard extends CompositeWizard<SingleNestedWizardForm> {
+    constructor() {
+        super()
+        ...
+        this.form.singleNestedWizardNestedProp.bindPrompter(() =>
+            this.createWizardPrompter<ChildWizard, ChildWizardForm>(ChildWizard)
+        )
+        ...
+    }
+}
+
+```
+
+### Executing
+
+Wizards can be ran by calling the async `run` method:
+
+```ts
+const wizard = new ExampleWizard()
+const result = await wizard.run()
+```
+
+Note that all wizards can potentially return `undefined` if the workflow was cancelled.
+
+### Testing
+
+#### Using `WizardTester`
+
+Use `createWizardTester` on an instance of a wizard. Tests can then be constructed by asserting both the user-defined and internal state. Using the above `ExampleWizard`:
+
+```ts
+const tester = await createWizardTester(new ExampleWizard())
+tester.foo.assertShowFirst() // Fails if `foo` is not shown (or not shown first)
+tester.bar.assertDoesNotShow() // True since `foo` is not assigned an explicit value
+tester.foo.applyInput('Hello, world!') // Manipulate 'user' state
+tester.bar.assertShow() // True since 'foo' has a defined value
+```
+
+#### Using `PrompterTester`
+
+Use `PrompterTester` to simulate user behavior (click, input and selection) on prompters to test end-to-end flow of a wizard.
+
+Example:
+
+```ts
+// 1. Register PrompterTester handlers
+const prompterTester = PrompterTester.init()
+    .handleInputBox('Input Prompter title 1', (inputBox) => {
+        // Register Input Prompter handler
+        inputBox.acceptValue('my-source-bucket-name')
+    })
+    .handleQuickPick('Quick Pick Prompter title 2', (quickPick) => {
+        // Register Quick Pick Prompter handler
+
+        // Optional assertion can be added as part of the handler function
+        assert.strictEqual(quickPick.items.length, 2)
+        assert.strictEqual(quickPick.items[0].label, 'Specify required parameters and save as defaults')
+        assert.strictEqual(quickPick.items[1].label, 'Specify required parameters')
+        // Choose item
+        quickPick.acceptItem(quickPick.items[0])
+    })
+    .handleQuickPick(
+        'Quick Pick Prompter with various handler behavior title 3',
+        (() => {
+            // Register handler with dynamic behavior
+            const generator = (function* () {
+                // First call, choose '**'
+                yield async (picker: TestQuickPick) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items[1].label, '**')
+                    picker.acceptItem(picker.items[1])
+                }
+                // Second call, choose BACK button
+                yield async (picker: TestQuickPick) => {
+                    await picker.untilReady()
+                    picker.pressButton(vscode.QuickInputButtons.Back)
+                }
+                // Third and subsequent call
+                while (true) {
+                    yield async (picker: TestQuickPick) => {
+                        await picker.untilReady()
+                        picker.acceptItem(picker.items[1])
+                    }
+                }
+            })()
+
+            return (picker: TestQuickPick) => {
+                const next = generator.next().value
+                return next(picker)
+            }
+        })()
+    )
+    .build()
+
+// 2. Run your wizard class
+const result = await wizard.run()
+
+// 3. Assert your tests
+prompterTester.assertCallAll()
+prompterTester.assertCallOrder('Input Prompter title 1', 1)
+```
+
+## Module path debugging
+
+Node has an environment variable `NODE_DEBUG=module` that helps to debug module imports. This can be helpful on windows, which can load node modules into uppercase or lower case drive letters, depending on the drive letter of the parent module.
+
+You can enable this by adding `"NODE_DEBUG": "module"` into the env of your launch config that you are using.
+
+When enabled you can see the file that the import is looking for, the module load request, and the relative file requested.
+
+```
+MODULE 88184: looking for ["/aws-toolkit-vscode/packages/core/dist/src"]
+MODULE 88184: Module._load REQUEST ./codewhisperer/commands/basicCommands parent: /aws-toolkit-vscode/packages/core/dist/src/extension.js
+MODULE 88184: RELATIVE: requested: ./codewhisperer/commands/basicCommands from parent.id /aws-toolkit-vscode/packages/core/dist/src/extension.js
+```
diff --git a/docs/arch_features.md b/docs/arch_features.md
new file mode 100644
index 00000000000..7a9c239d584
--- /dev/null
+++ b/docs/arch_features.md
@@ -0,0 +1,59 @@
+# Architecture: design and implementation of product features
+
+> How the main end-user features are designed and where (in code) they are implemented.
+> Corresponds to the "Logical view" of the [4+1 architectural views](https://en.wikipedia.org/wiki/4%2B1_architectural_view_model).
+
+## Explorer
+
+TODO
+
+## Local debugging of SAM Lambdas
+
+TODO
+
+## Remote connect
+
+Toolkit provides "remote connect" for CodeCatalyst, EC2, and ECS (terminal only). This means
+customers can connect (1) a new VSCode instance and (2) a VSCode Terminal to remote machines in AWS
+and CodeCatalyst.
+
+### Design of remote connect
+
+For connecting a new VSCode instance, remote connect works like this:
+
+1. User chooses the machine they want to connect to (CodeCatalyst dev env, or EC2 machine)
+1. Toolkit ensures that the [vscode remote-ssh extension](https://code.visualstudio.com/docs/remote/ssh) is installed.
+1. Toolkit automatically downloads a private copy of `session-manager-plugin`, or uses its previous copy.
+1. Toolkit ensures that the user's `~/.ssh/config` file contains a special host-name pattern.
+    - The SSH config item defines a `ProxyCommand` that invokes a Toolkit-provided shell script [codecatalyst_connect](/packages/core/resources/codecatalyst_connect) or [ec2_connect](/packages/core/resources/ec2_connect).
+1. Toolkit starts a SSM session using the service API.
+1. Toolkit starts a new instance of VSCode with environment variables containing values needed to connect (SSM session id, etc).
+1. VSCode invokes `ssh` which invokes the Toolkit-defined `ProxyCommand` mentioned above, which uses the environment variables to invoke `session-manager-plugin` to create an SSH connection.
+1. VSCode's remote-ssh feature uses the SSH connection to provide remote VSCode session on the remote machine.
+
+For connecting a new VSCode _terminal_, remote connect works like this:
+
+1. User chooses the machine they want to connect to (CodeCatalyst dev env, EC2, or ECS machine)
+1. Toolkit automatically downloads a private copy of `session-manager-plugin`, or uses its previous copy.
+1. Toolkit starts a SSM session using the service API.
+1. Toolkit [builds a session-manager-plugin command](https://github.com/aws/aws-toolkit-vscode/blob/c77fc076fd0ed837d077bc0318716b711a2854c8/packages/core/src/ecs/util.ts#L92-L104) and [passes it to a new VSCode Terminal](https://github.com/aws/aws-toolkit-vscode/blob/c77fc076fd0ed837d077bc0318716b711a2854c8/packages/core/src/ecs/commands.ts#L141-L147).
+1. VSCode displays the terminal, so the user can enter shell commands on the remote machine.
+
+For EC2 specifically, there are a few additional steps:
+
+1. Remote window connections are only supported for EC2 instances running a linux based OS such as Amazon Linux or Ubuntu. However, the terminal option is supported by all OS, and will open a Powershell-based terminal for Windows instances.
+1. If connecting to EC2 instance via remote window, the toolkit generates temporary SSH keys (30 second lifetime), with the public key sent to the remote instance.
+    - Key type is ed25519 if supported, or RSA otherwise.
+    - Lines in `.ssh/authorized_keys` marked with the comment `#AWSToolkitForVSCode` will be removed by AWS Toolkit.
+    - Assumes `.sss/authorized_keys` can be found under `/home/ec2-user/` on Amazon Linux and `/home/ubuntu/` on Ubuntu.
+1. If insufficient permissions are detected on the attached IAM role, toolkit will prompt to add an inline policy with the necessary actions.
+1. If SSM sessions remain open after closing the window/terminal, the toolkit will terminate them on-shutdown, or when starting another session to the same instance.
+
+### Implementation of remote connect
+
+These modules show how to use and extend the "remote connect" functionality:
+
+-   [shared/remoteSession.ts](/packages/core/src/shared/remoteSession.ts)
+-   CodeCatalyst: [openDevEnv()](https://github.com/aws/aws-toolkit-vscode/blob/c77fc076fd0ed837d077bc0318716b711a2854c8/packages/core/src/codecatalyst/model.ts#L252)
+-   EC2: [openSessionInTerminal()](https://github.com/aws/aws-toolkit-vscode/blob/c77fc076fd0ed837d077bc0318716b711a2854c8/packages/core/src/ec2/model.ts#L147)
+-   ECS: [openTaskInTerminal()](https://github.com/aws/aws-toolkit-vscode/blob/c77fc076fd0ed837d077bc0318716b711a2854c8/packages/core/src/ecs/commands.ts#L133)
diff --git a/docs/arch_overview.md b/docs/arch_overview.md
new file mode 100644
index 00000000000..76e9ce2e3f1
--- /dev/null
+++ b/docs/arch_overview.md
@@ -0,0 +1,13 @@
+# Architecture: overview
+
+> Learn about the architectural goals and constraints of this codebase (AWS
+> Toolkit and Amazon Q extensions, and the "core" package shared by both).
+
+The architecture is described from these [views](https://en.wikipedia.org/wiki/4%2B1_architectural_view_model):
+
+-   [Guidelines](./CODE_GUIDELINES.md)
+-   [Structure ("Development" view)](./arch_develop.md)
+-   [Features ("Logical" view)](./arch_features.md)
+-   [Runtime behavior ("Process view")](./arch_runtime.md)
+-   [Target ("Physical" view)](./arch_target.md)
+-   [User stories ("Scenarios" view)](./arch_user_stories.md)
diff --git a/docs/arch_runtime.md b/docs/arch_runtime.md
new file mode 100644
index 00000000000..e1cbfd01661
--- /dev/null
+++ b/docs/arch_runtime.md
@@ -0,0 +1,54 @@
+# Architecture: runtime behavior and communication
+
+> Describes the _runtime_ behavior and design of AWS Toolkit.
+> Corresponds to the "Process view" of the [4+1 architectural views](https://en.wikipedia.org/wiki/4%2B1_architectural_view_model).
+
+## Environment variables
+
+TODO: move from CONTRIBUTING.md
+
+## VSCode context keys
+
+VScode extensions can use vscode 'setContext' command to set special context keys which are
+available in `package.json`. Use this only if there is no other alternative (it's shared, global,
+mutable state).
+
+### Defining a new setContext key
+
+If you must define a new key (is it _really_ necessary?), follow these guidelines:
+
+-   Choose a prefix as follows (as [recommended](https://code.visualstudio.com/api/extension-guides/command#using-a-custom-when-clause-context)):
+    -   `packages/core/` should use `aws.` prefix
+    -   `packages/toolkit/` should use `aws.toolkit.` prefix
+    -   `packages/amazonq/` should use `amazonq.` prefix
+-   Use brevity. Less is more.
+-   Document it in the list below.
+
+### setContext keys
+
+#### setContext keys owned by packages/core/
+
+These keys are currently set by the core/ package, but many of them may eventually be migrated to
+toolkit/ or amazonq/ if appropriate.
+
+-   `aws.codecatalyst.connected`: CodeCatalyst connection is active.
+-   `aws.codewhisperer.connected`: CodeWhisperer connection is active.
+-   `aws.codewhisperer.connectionExpired`: CodeWhisperer connection is active, but the connection is expired.
+-   `aws.isDevMode`: AWS Toolkit is running in "developer mode".
+-   `aws.isWebExtHost`: true when the _extension host_ is running in a web browser, as opposed to
+    nodejs (i.e. the environment has no "compute").
+    -   Compare to `isWeb`, which vscode defines when the _UI_ is web, but says nothing about the
+        _extension host_.
+-   `aws.isSageMaker`: AWS Toolkit is running in the SageMaker Code Editor.
+
+#### setContext keys owned by packages/toolkit/
+
+-   TODO
+
+#### setContext keys owned by packages/amazonq/
+
+-   TODO
+
+## How our components communicate
+
+TODO: vscode events; the "globals" module; activate(); EventEmitters; ...?
diff --git a/docs/arch_target.md b/docs/arch_target.md
new file mode 100644
index 00000000000..e8c38dae348
--- /dev/null
+++ b/docs/arch_target.md
@@ -0,0 +1,33 @@
+# Architecture: target requirements
+
+> Describes the expected environment when the product is running on a user's machine.
+> Corresponds to the "Physical view" of the [4+1 architectural views](https://en.wikipedia.org/wiki/4%2B1_architectural_view_model).
+
+## Requirements / supported platforms
+
+TODO
+
+Software dependencies: Any external software components, libraries, or frameworks that the desktop
+application depends on, such as runtime environments (e.g., .NET Framework, Java Runtime
+Environment), database management systems, or third-party libraries.
+
+Installation and deployment: The process of installing and deploying the desktop application on the
+target hardware platforms. This may include details about installation packages (e.g., MSI, EXE,
+DMG), installation scripts, deployment tools, and any specific configuration steps required.
+
+System files and directories: The physical layout and structure of the application files on the
+target system, including the location of executable files, libraries, configuration files, data
+files, and log files.
+
+Network configuration (if applicable): If the desktop application requires network connectivity for
+certain features or services, the Physical View may describe the network protocols, ports, and any
+specific network configurations required.
+
+Hardware peripherals and devices: Any specific hardware peripherals or devices that the desktop
+application interacts with, such as printers, scanners, cameras, or external storage devices.
+
+Security considerations: Any physical security measures or considerations related to the deployment
+environment, such as data encryption, secure storage, or access control mechanisms.
+
+Monitoring and logging: The mechanisms and tools used for monitoring the application's performance,
+logging application events, and collecting diagnostic information on the target hardware platforms.
diff --git a/docs/arch_user_stories.md b/docs/arch_user_stories.md
new file mode 100644
index 00000000000..5e61e4965fe
--- /dev/null
+++ b/docs/arch_user_stories.md
@@ -0,0 +1,6 @@
+# User stories (scenarios)
+
+> Describes the main "user stories" of AWS Toolkit.
+> Corresponds to the "Scenarios view" of the [4+1 architectural views](https://en.wikipedia.org/wiki/4%2B1_architectural_view_model).
+
+TODO
diff --git a/docs/build.md b/docs/build.md
new file mode 100644
index 00000000000..ffa9e1a8a81
--- /dev/null
+++ b/docs/build.md
@@ -0,0 +1,27 @@
+# Build
+
+The AmazonQ features rely on the `codewhisperer-streaming` service, to support both Sigv4 and Bearer token modes of this service,
+two clients are generated from the service's smithy models and placed in
+`src.gen/@amzn/amazon-q-developer-streaming-client` and `src.gen/@amzn/codewhisperer-streaming` respectively (For more
+information about these clients and how they are generated, please see this
+[quip document](https://quip-amazon.com/2dAWAvTIYXXr/Build-instructions-for-AWS-CodeWhisperer-Streaming-Typescript-client)).
+
+## @amzn/amazon-q-developer-streaming client
+
+This client is a standalone npm project in typescript, and it is added to
+the project as a workspace in the project's root `package.json` with the line `"workspaces": [ ..., "src.gen/@amzn/amazon-q-developer-streaming" ]`.
+The client may be manually built using `npm run build -w @amzn/amazon-q-developer-streaming"`.
+The `generateClients` run script ensures that this dependency is
+built before the toolkit project itself. Workspaces are automatically ready to
+be imported in the root toolkit project by their declared package.json name,
+(`@amzn/amazon-q-developer-streaming` in this case).
+
+## @amzn/codewhisperer-streaming client
+
+This client is a standalone npm project in typescript, and it is added to
+the project as a workspace in the project's root `package.json` with the line `"workspaces": [ ..., "src.gen/@amzn/codewhisperer-streaming" ]`.
+The client may be manually built using `npm run build -w @amzn/codewhisperer-streaming"`.
+The `generateClients` run script ensures that this dependency is
+built before the toolkit project itself. Workspaces are automatically ready to
+be imported in the root toolkit project by their declared package.json name,
+(`@amzn/codewhisperer-streaming` in this case).
diff --git a/docs/faq-credentials.md b/docs/faq-credentials.md
new file mode 100644
index 00000000000..d38b09b66ae
--- /dev/null
+++ b/docs/faq-credentials.md
@@ -0,0 +1,19 @@
+# FAQ / Troubleshooting - Auth/SSO/Credentials
+
+### AWS Builder ID "Invalid client provided"
+
+During AWS Builder ID sign in, some users ran in to this error in the browser.
+This is due to a stale state in `~/.aws/sso`.
+
+Issue [aws-toolkit-vscode#3667](https://github.com/aws/aws-toolkit-vscode/issues/3667)
+
+#### Solution
+
+1. Rename the current folder: `mv ~/.aws/sso ~/.aws/sso-OLD`
+2. Attempt to sign in again with AWS Builder ID
+3. If sign is is successful you can remove the old folder: `rm -rf ~/.aws/sso-OLD`
+    1. Or revert the change: `mv ~/.aws/sso-OLD ~/.aws/sso`
+
+### AWS Shared Credentials File
+
+When authenticating with IAM credentials, the profile name, access key, and secret key will be stored on disk at a default location of `~/.aws/credentials` on Linux and MacOS, and `%USERPROFILE%\.aws\credentials` on Windows machines. The toolkit also supports editting this file manually, with the format specified [here](https://docs.aws.amazon.com/sdkref/latest/guide/file-format.html#file-format-creds). The credentials files also supports [role assumption](https://docs.aws.amazon.com/sdkref/latest/guide/access-assume-role.html) and [MFA](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_mfa.html). Note that this credentials file is shared between all local AWS development tools. For more information, see the full documentation [here](https://docs.aws.amazon.com/sdkref/latest/guide/file-format.html).
diff --git a/docs/faq-debug.md b/docs/faq-debug.md
new file mode 100644
index 00000000000..df35fb7d800
--- /dev/null
+++ b/docs/faq-debug.md
@@ -0,0 +1,5 @@
+# FAQ / Troubleshooting - Debugging/Development
+
+### Enabling Debug Logs
+
+[See steps here to enable more detailed debug logs for the extension.](../CONTRIBUTING.md#enabling-debug-logs)
diff --git a/docs/icons.md b/docs/icons.md
index 56636aa32a2..46e252d5dac 100644
--- a/docs/icons.md
+++ b/docs/icons.md
@@ -1,15 +1,16 @@
 # Icons
 
-All icons that are used in the Toolkit can be found in `resources/icons`.
+All icons that are used in the extensions can be found in `resources/icons`.
 
-A [build script](../../scripts/build/generateIcons.ts) generates Toolkit artifacts:
+A [build script](../scripts/generateIcons.ts) generates extension artifacts in [core/](../packages/core/):
 
--   `resources/icons/cloud9/generated`
 -   `resources/fonts/aws-toolkit-icons.woff`
 -   `resources/css/icons.css`
--   `contributes.icons` in [package.json](../../package.json)
+-   `contributes.icons` in [amazonq package.json](../packages/amazonq/package.json) and [toolkit package.json](../packages/toolkit/package.json)
 
-This script should be ran using `npm run generatePackage` after making updates. Any changes made to `package.json` should be committed with the relevant icons.
+This script should be ran using `npm run generateIcons` after making updates. Any changes made to `package.json` should be committed with the relevant icons. Type checking in `core/` relies on the entries in `core/package.json`. However, the individual extensions require entries in their `package.json`s as well. Currently, resources (including icons) are shared between `core/` and the individual extensions. If `contributes.icons` in each of the extensions does not match the entry in `core/`, then CI will fail.
+
+To sync the icons to the individual extensions, run `npm run copyFiles && npm run generateIcons` for each extension.
 
 ## Fonts
 
@@ -29,7 +30,7 @@ If your desired icon does not work well as a font, see [Theme Overrides](#theme-
 
 ## Identifiers
 
-Icons (except those in `cloud9`) can be referenced within the Toolkit by concatenating the icon path with hyphens, omitting the 'theme' if applicable.
+Icons can be referenced within the Toolkit by concatenating the icon path with hyphens, omitting the 'theme' if applicable.
 
 Examples:
 
@@ -48,11 +49,6 @@ For example, if I wanted to use a special App Runner service icon, then I need t
 -   `resources/icons/aws/dark/apprunner-service.svg`
 -   `resources/icons/aws/light/apprunner-service.svg`
 
-A similar format is used for overriding icons only on Cloud9:
-
--   `resources/icons/cloud9/dark/aws-apprunner-service.svg`
--   `resources/icons/cloud9/light/aws-apprunner-service.svg`
-
 These icons will **not** be usuable as Codicons or as font icons.
 
 ## Third Party
diff --git a/docs/images/amazon_q_e2e.png b/docs/images/amazon_q_e2e.png
new file mode 100644
index 00000000000..9e5ad7f5729
Binary files /dev/null and b/docs/images/amazon_q_e2e.png differ
diff --git a/docs/images/dependency-graph-small.svg b/docs/images/dependency-graph-small.svg
new file mode 100644
index 00000000000..30c43a4bb80
--- /dev/null
+++ b/docs/images/dependency-graph-small.svg
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generated by graphviz version 9.0.0 (20230911.1827)
+ -->
+<!-- Title: dependency&#45;cruiser output Pages: 1 -->
+<svg width="419pt" height="110pt"
+ viewBox="0.00 0.00 419.25 110.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 106)">
+<title>dependency&#45;cruiser output</title>
+<polygon fill="white" stroke="none" points="-4,4 -4,-106 415.25,-106 415.25,4 -4,4"/>
+<g id="clust1" class="cluster">
+<title>cluster_node_modules</title>
+<path fill="#ffffff" stroke="black" stroke-width="2" d="M341.25,-16C341.25,-16 396.25,-16 396.25,-16 402.25,-16 408.25,-22 408.25,-28 408.25,-28 408.25,-56 408.25,-56 408.25,-62 402.25,-68 396.25,-68 396.25,-68 341.25,-68 341.25,-68 335.25,-68 329.25,-62 329.25,-56 329.25,-56 329.25,-28 329.25,-28 329.25,-22 335.25,-16 341.25,-16"/>
+<text text-anchor="middle" x="368.75" y="-55.45" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="9.00">node_modules</text>
+</g>
+<g id="clust2" class="cluster">
+<title>cluster_src</title>
+<path fill="#ffffff" stroke="black" stroke-width="2" d="M20,-8C20,-8 309.25,-8 309.25,-8 315.25,-8 321.25,-14 321.25,-20 321.25,-20 321.25,-82 321.25,-82 321.25,-88 315.25,-94 309.25,-94 309.25,-94 20,-94 20,-94 14,-94 8,-88 8,-82 8,-82 8,-20 8,-20 8,-14 14,-8 20,-8"/>
+<text text-anchor="middle" x="164.62" y="-81.45" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="9.00">src</text>
+</g>
+<g id="clust3" class="cluster">
+<title>cluster_src/shared</title>
+<path fill="#ffffff" stroke="black" stroke-width="2" d="M106,-16C106,-16 301.25,-16 301.25,-16 307.25,-16 313.25,-22 313.25,-28 313.25,-28 313.25,-56 313.25,-56 313.25,-62 307.25,-68 301.25,-68 301.25,-68 106,-68 106,-68 100,-68 94,-62 94,-56 94,-56 94,-28 94,-28 94,-22 100,-16 106,-16"/>
+<text text-anchor="middle" x="203.62" y="-55.45" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="9.00">shared</text>
+</g>
+<g id="clust4" class="cluster">
+<title>cluster_src/srcShared</title>
+<path fill="#ffffff" stroke="black" stroke-width="2" d="M28,-16C28,-16 74,-16 74,-16 80,-16 86,-22 86,-28 86,-28 86,-56 86,-56 86,-62 80,-68 74,-68 74,-68 28,-68 28,-68 22,-68 16,-62 16,-56 16,-56 16,-28 16,-28 16,-22 22,-16 28,-16"/>
+<text text-anchor="middle" x="51" y="-55.45" font-family="Helvetica,sans-Serif" font-weight="bold" font-size="9.00">srcShared</text>
+</g>
+<!-- node_modules/fs&#45;extra -->
+<g id="node1" class="node">
+<title>node_modules/fs&#45;extra</title>
+<g id="a_node1"><a xlink:href="https://www.npmjs.com/package/fs-extra" xlink:title="fs&#45;extra">
+<polygon fill="#c40b0a" fill-opacity="0.101961" stroke="black" points="395.25,-41.88 343.22,-41.88 341.25,-39.9 341.25,-24.12 393.28,-24.12 395.25,-26.1 395.25,-41.88"/>
+<polyline fill="none" stroke="black" points="393.28,-39.9 341.25,-39.9"/>
+<polyline fill="none" stroke="black" points="393.28,-39.9 393.28,-24.12"/>
+<polyline fill="none" stroke="black" points="393.28,-39.9 395.25,-41.88"/>
+<text text-anchor="start" x="353.25" y="-29.32" font-family="Helvetica,sans-Serif" font-size="9.00" fill="#c40b0a">fs&#45;extra</text>
+</a>
+</g>
+</g>
+<!-- src/shared/extensionUtilities.ts -->
+<g id="node2" class="node">
+<title>src/shared/extensionUtilities.ts</title>
+<g id="a_node2"><a xlink:href="src/shared/extensionUtilities.ts" xlink:title="extensionUtilities.ts">
+<path fill="#ddfeff" stroke="black" d="M190.83,-41.88C190.83,-41.88 107.92,-41.88 107.92,-41.88 104.96,-41.88 102,-38.92 102,-35.96 102,-35.96 102,-30.04 102,-30.04 102,-27.08 104.96,-24.12 107.92,-24.12 107.92,-24.12 190.83,-24.12 190.83,-24.12 193.79,-24.12 196.75,-27.08 196.75,-30.04 196.75,-30.04 196.75,-35.96 196.75,-35.96 196.75,-38.92 193.79,-41.88 190.83,-41.88"/>
+<text text-anchor="start" x="110" y="-29.32" font-family="Helvetica,sans-Serif" font-size="9.00">extensionUtilities.ts</text>
+</a>
+</g>
+</g>
+<!-- src/shared/filesystemUtilities.ts -->
+<g id="node3" class="node">
+<title>src/shared/filesystemUtilities.ts</title>
+<g id="a_node3"><a xlink:href="src/shared/filesystemUtilities.ts" xlink:title="filesystemUtilities.ts">
+<path fill="#ddfeff" stroke="black" d="M299.33,-41.88C299.33,-41.88 215.67,-41.88 215.67,-41.88 212.71,-41.88 209.75,-38.92 209.75,-35.96 209.75,-35.96 209.75,-30.04 209.75,-30.04 209.75,-27.08 212.71,-24.12 215.67,-24.12 215.67,-24.12 299.33,-24.12 299.33,-24.12 302.29,-24.12 305.25,-27.08 305.25,-30.04 305.25,-30.04 305.25,-35.96 305.25,-35.96 305.25,-38.92 302.29,-41.88 299.33,-41.88"/>
+<text text-anchor="start" x="217.75" y="-29.32" font-family="Helvetica,sans-Serif" font-size="9.00">filesystemUtilities.ts</text>
+</a>
+</g>
+</g>
+<!-- src/shared/extensionUtilities.ts&#45;&gt;src/shared/filesystemUtilities.ts -->
+<g id="edge1" class="edge">
+<title>src/shared/extensionUtilities.ts&#45;&gt;src/shared/filesystemUtilities.ts</title>
+<path fill="none" stroke="#000000" stroke-width="2" stroke-opacity="0.200000" d="M197.23,-33C198.36,-33 199.48,-33 200.61,-33"/>
+<polygon fill="#000000" fill-opacity="0.200000" stroke="#000000" stroke-width="2" stroke-opacity="0.200000" points="200.25,-35.1 206.25,-33 200.25,-30.9 200.25,-35.1"/>
+</g>
+<!-- src/shared/filesystemUtilities.ts&#45;&gt;node_modules/fs&#45;extra -->
+<g id="edge2" class="edge">
+<title>src/shared/filesystemUtilities.ts&#45;&gt;node_modules/fs&#45;extra</title>
+<path fill="none" stroke="#000000" stroke-opacity="0.200000" d="M305.57,-33C314.89,-33 324.51,-33 333.29,-33"/>
+<polygon fill="#000000" fill-opacity="0.200000" stroke="#000000" stroke-opacity="0.200000" points="333.25,-35.1 339.25,-33 333.25,-30.9 333.25,-35.1"/>
+</g>
+<!-- src/srcShared/fs.ts -->
+<g id="node4" class="node">
+<title>src/srcShared/fs.ts</title>
+<g id="a_node4"><a xlink:href="src/srcShared/fs.ts" xlink:title="fs.ts">
+<path fill="#ddfeff" stroke="black" d="M72.08,-41.88C72.08,-41.88 29.92,-41.88 29.92,-41.88 26.96,-41.88 24,-38.92 24,-35.96 24,-35.96 24,-30.04 24,-30.04 24,-27.08 26.96,-24.12 29.92,-24.12 29.92,-24.12 72.08,-24.12 72.08,-24.12 75.04,-24.12 78,-27.08 78,-30.04 78,-30.04 78,-35.96 78,-35.96 78,-38.92 75.04,-41.88 72.08,-41.88"/>
+<text text-anchor="start" x="43.12" y="-29.32" font-family="Helvetica,sans-Serif" font-size="9.00">fs.ts</text>
+</a>
+</g>
+</g>
+<!-- src/srcShared/fs.ts&#45;&gt;src/shared/extensionUtilities.ts -->
+<g id="edge3" class="edge">
+<title>src/srcShared/fs.ts&#45;&gt;src/shared/extensionUtilities.ts</title>
+<path fill="none" stroke="#000000" stroke-width="2" stroke-opacity="0.200000" d="M78.33,-33C82.86,-33 87.72,-33 92.68,-33"/>
+<polygon fill="#000000" fill-opacity="0.200000" stroke="#000000" stroke-width="2" stroke-opacity="0.200000" points="92.66,-35.1 98.66,-33 92.66,-30.9 92.66,-35.1"/>
+</g>
+</g>
+</svg>
diff --git a/docs/images/exportAmazonQLogs.png b/docs/images/exportAmazonQLogs.png
new file mode 100644
index 00000000000..ae74b3c7df1
Binary files /dev/null and b/docs/images/exportAmazonQLogs.png differ
diff --git a/docs/images/logsDebugLog.png b/docs/images/logsDebugLog.png
new file mode 100644
index 00000000000..625353dab55
Binary files /dev/null and b/docs/images/logsDebugLog.png differ
diff --git a/docs/images/logsSetDebug.png b/docs/images/logsSetDebug.png
new file mode 100644
index 00000000000..2bf736279ee
Binary files /dev/null and b/docs/images/logsSetDebug.png differ
diff --git a/docs/images/logsSetDefault.png b/docs/images/logsSetDefault.png
new file mode 100644
index 00000000000..1b7de39b9ce
Binary files /dev/null and b/docs/images/logsSetDefault.png differ
diff --git a/docs/images/logsView.png b/docs/images/logsView.png
new file mode 100644
index 00000000000..1222169a5c5
Binary files /dev/null and b/docs/images/logsView.png differ
diff --git a/docs/images/openExportLogs.png b/docs/images/openExportLogs.png
new file mode 100644
index 00000000000..4a9902f8c28
Binary files /dev/null and b/docs/images/openExportLogs.png differ
diff --git a/docs/lsp.md b/docs/lsp.md
new file mode 100644
index 00000000000..49a6ad00b87
--- /dev/null
+++ b/docs/lsp.md
@@ -0,0 +1,137 @@
+# Flare Language Server
+
+## Chat Activation flow
+
+```mermaid
+sequenceDiagram
+    participant user as User
+    participant ext as Extension
+    participant webview as Chat Webview
+    participant flare as Amazon Q LSP
+    participant backend as Amazon Q Backend
+
+    user->>ext: opens IDE
+    ext->>ext: activates
+    ext->>webview: loads UI
+    ext->>flare: initialize process
+    flare->>flare: starts and waits
+    user->>webview: interacts
+    webview->>ext: sends message
+    ext->>flare: sends message
+    flare->>backend: call api
+    backend->>flare: returns
+    flare->>ext: display
+    ext->>webview: display
+```
+
+## Language Server Debugging
+
+If you want to connect a local version of language-servers to aws-toolkit-vscode, follow these steps:
+
+1. Clone https://github.com/aws/language-servers.git and set it up in the same workspace as this project by cmd+shift+p and "add folder to workspace" and selecting the language-servers folder that you just cloned. Your VS code folder structure should look like below.
+
+    ```
+    /aws-toolkit-vscode
+    /toolkit
+    /core
+    /amazonq
+    /language-servers
+    ```
+
+2. Inside of the language-servers project run:
+    ```
+    npm install
+    npm run compile
+    npm run package
+    ```
+    to get the project setup
+3. You need to open VScode user settings (Cmd+Shift+P and Search "Open User Settings (JSON)") and add the lines below at the bottom of the settings to enable the lsp experiment:
+    ```
+    "aws.experiments": {
+      "amazonqLSP": true,
+      "amazonqLSPInline": true, // optional: enables inline completion from flare
+      "amazonqLSPChat": true // optional: enables chat from flare
+    }
+    ```
+4. Uncomment the `__AMAZONQLSP_PATH` and `__AMAZONQLSP_UI` variables in the `amazonq/.vscode/launch.json` extension configuration
+5. Use the `Launch LSP with Debugging` configuration and set breakpoints in VSCode or the language server, Once you run "Launch LSP with Debugging" a new window should start, wait for the plugin to show up there. Then go to the run menu again and run "Attach to Language Server (amazonq)" after this you should be able to add breakpoints in the LSP code.
+6. (Optional): Enable `"amazonq.trace.server": "on"` or `"amazonq.trace.server": "verbose"` in your VSCode settings to view detailed log messages sent to/from the language server. These log messages will show up in the "Amazon Q Language Server" output channel
+
+### Breakpoints Work-Around
+
+If the breakpoints in your language-servers project remain greyed out and do not trigger when you run `Launch LSP with Debugging`, your debugger may be attaching to the language server before it has launched. You can follow the work-around below to avoid this problem. If anyone fixes this issue, please remove this section.
+
+1. Set your breakpoints and click `Launch LSP with Debugging`
+2. Once the debugging session has started, click `Launch LSP with Debugging` again, then `Cancel` on any pop-ups that appear
+3. On the debug panel, click `Attach to Language Server (amazonq)` next to the red stop button
+4. Click `Launch LSP with Debugging` again, then `Cancel` on any pop-ups that appear
+
+## Language Server Runtimes Debugging
+
+If you want to connect a local version of language-server-runtimes to aws-toolkit-vscode, follow these steps:
+
+1. Clone https://github.com/aws/language-server-runtimes.git and set it up in the same workspace as this project by cmd+shift+p and "add folder to workspace" and selecting the language-server-runtimes folder that you just cloned. Your VS code folder structure should look like below.
+
+    ```
+    /aws-toolkit-vscode
+    /toolkit
+    /core
+    /amazonq
+    /language-servers
+    /language-server-runtimes
+    ```
+
+2. Inside of the language-server-runtimes project run:
+
+    ```
+    npm install
+    npm run compile
+    cd runtimes
+    npm run prepub
+    cd out
+    ```
+
+    If you get an error running `npm run prepub`, you can instead run `npm run prepub:copyFiles` to skip cleaning and testing.
+
+3. Choose one of the following approaches:
+
+### Option A: Using npm pack (Recommended)
+
+3a. Create a package file:
+
+    npm pack
+
+You will see a file created like this: `aws-language-server-runtimes-0.*.*.tgz`
+
+4a. Inside of language-servers, find the package where you need the change.
+
+For example, if you would like the change in `language-servers/app/aws-lsp-codewhisperer-runtimes`, you would run:
+
+    cd language-servers/app/aws-lsp-codewhisperer-runtimes
+
+    npm install ../../../language-server-runtimes/runtimes/out/aws-language-server-runtimes-0.*.*.tgz
+
+    npm run compile
+
+5a. If you need the change in aws-toolkit-vscode run:
+
+    cd aws-toolkit-vscode
+
+    npm install ../language-server-runtimes/runtimes/out/aws-language-server-runtimes-0.*.*.tgz
+
+### Option B: Using npm link (Alternative)
+
+3b. Create npm links:
+
+    npm link
+    cd ../../types
+    npm link
+
+4b. Inside of aws-toolkit-vscode run:
+
+    npm install
+    npm link @aws/language-server-runtimes @aws/language-server-runtimes-types
+
+## Amazon Q Inline Activation
+
+-   In order to get inline completion working you must open a supported file type defined in CodewhispererInlineCompletionLanguages in `packages/amazonq/src/app/inline/completion.ts`
diff --git a/docs/marketplace/vscode/CC_dev_env.gif b/docs/marketplace/vscode/CC_dev_env.gif
new file mode 100644
index 00000000000..eccaff663b8
Binary files /dev/null and b/docs/marketplace/vscode/CC_dev_env.gif differ
diff --git a/docs/marketplace/vscode/Lambda_step_through_debugging.gif b/docs/marketplace/vscode/Lambda_step_through_debugging.gif
new file mode 100644
index 00000000000..a6f8a6f62d0
Binary files /dev/null and b/docs/marketplace/vscode/Lambda_step_through_debugging.gif differ
diff --git a/docs/marketplace/vscode/S3.gif b/docs/marketplace/vscode/S3.gif
new file mode 100644
index 00000000000..7d67c78f3c6
Binary files /dev/null and b/docs/marketplace/vscode/S3.gif differ
diff --git a/docs/marketplace/vscode/amazonq/auth-Q.gif b/docs/marketplace/vscode/amazonq/auth-Q.gif
new file mode 100644
index 00000000000..e4713fcd352
Binary files /dev/null and b/docs/marketplace/vscode/amazonq/auth-Q.gif differ
diff --git a/docs/marketplace/vscode/amazonq/chat.gif b/docs/marketplace/vscode/amazonq/chat.gif
new file mode 100644
index 00000000000..61201a04b3c
Binary files /dev/null and b/docs/marketplace/vscode/amazonq/chat.gif differ
diff --git a/docs/marketplace/vscode/amazonq/dev.gif b/docs/marketplace/vscode/amazonq/dev.gif
new file mode 100644
index 00000000000..f4e5c0e5488
Binary files /dev/null and b/docs/marketplace/vscode/amazonq/dev.gif differ
diff --git a/docs/marketplace/vscode/amazonq/inline.gif b/docs/marketplace/vscode/amazonq/inline.gif
new file mode 100644
index 00000000000..fe43870a7d3
Binary files /dev/null and b/docs/marketplace/vscode/amazonq/inline.gif differ
diff --git a/docs/marketplace/vscode/amazonq/security-scan.gif b/docs/marketplace/vscode/amazonq/security-scan.gif
new file mode 100644
index 00000000000..af3f8cc4b8c
Binary files /dev/null and b/docs/marketplace/vscode/amazonq/security-scan.gif differ
diff --git a/docs/marketplace/vscode/amazonq/transform.png b/docs/marketplace/vscode/amazonq/transform.png
new file mode 100644
index 00000000000..915cc801283
Binary files /dev/null and b/docs/marketplace/vscode/amazonq/transform.png differ
diff --git a/docs/marketplace/vscode/appComposer.gif b/docs/marketplace/vscode/appComposer.gif
new file mode 100644
index 00000000000..1647611c3c1
Binary files /dev/null and b/docs/marketplace/vscode/appComposer.gif differ
diff --git a/docs/marketplace/vscode/auth-Toolkit.gif b/docs/marketplace/vscode/auth-Toolkit.gif
new file mode 100644
index 00000000000..e08d4f06959
Binary files /dev/null and b/docs/marketplace/vscode/auth-Toolkit.gif differ
diff --git a/docs/marketplace/vscode/awsExplorer.gif b/docs/marketplace/vscode/awsExplorer.gif
new file mode 100644
index 00000000000..c489ceae7f5
Binary files /dev/null and b/docs/marketplace/vscode/awsExplorer.gif differ
diff --git a/docs/marketplace/vscode/cfn_autocompletion.gif b/docs/marketplace/vscode/cfn_autocompletion.gif
new file mode 100644
index 00000000000..efa5f8144d2
Binary files /dev/null and b/docs/marketplace/vscode/cfn_autocompletion.gif differ
diff --git a/docs/marketplace/vscode/codewhisperer.gif b/docs/marketplace/vscode/codewhisperer.gif
new file mode 100644
index 00000000000..d6cca9f983a
Binary files /dev/null and b/docs/marketplace/vscode/codewhisperer.gif differ
diff --git a/docs/marketplace/vscode/codewhispererChat.gif b/docs/marketplace/vscode/codewhispererChat.gif
new file mode 100644
index 00000000000..4d82f29eb7f
Binary files /dev/null and b/docs/marketplace/vscode/codewhispererChat.gif differ
diff --git a/docs/marketplace/vscode/creds.gif b/docs/marketplace/vscode/creds.gif
new file mode 100644
index 00000000000..40d1fb29364
Binary files /dev/null and b/docs/marketplace/vscode/creds.gif differ
diff --git a/docs/marketplace/vscode/cw_logs.gif b/docs/marketplace/vscode/cw_logs.gif
new file mode 100644
index 00000000000..74f6aa6e239
Binary files /dev/null and b/docs/marketplace/vscode/cw_logs.gif differ
diff --git a/docs/marketplace/vscode/download-Lambda.gif b/docs/marketplace/vscode/download-Lambda.gif
new file mode 100644
index 00000000000..7a049822013
Binary files /dev/null and b/docs/marketplace/vscode/download-Lambda.gif differ
diff --git a/docs/marketplace/vscode/ecs-terminal.gif b/docs/marketplace/vscode/ecs-terminal.gif
new file mode 100644
index 00000000000..e3ca93da20d
Binary files /dev/null and b/docs/marketplace/vscode/ecs-terminal.gif differ
diff --git a/docs/marketplace/vscode/getting-started.gif b/docs/marketplace/vscode/getting-started.gif
new file mode 100644
index 00000000000..2b6bc4a98d3
Binary files /dev/null and b/docs/marketplace/vscode/getting-started.gif differ
diff --git a/docs/marketplace/vscode/infraComposer.webp b/docs/marketplace/vscode/infraComposer.webp
new file mode 100644
index 00000000000..ff417f35537
Binary files /dev/null and b/docs/marketplace/vscode/infraComposer.webp differ
diff --git a/docs/marketplace/vscode/stepFunctions.gif b/docs/marketplace/vscode/stepFunctions.gif
new file mode 100644
index 00000000000..069ced6411d
Binary files /dev/null and b/docs/marketplace/vscode/stepFunctions.gif differ
diff --git a/docs/marketplace/vscode/threatComposer.gif b/docs/marketplace/vscode/threatComposer.gif
new file mode 100644
index 00000000000..11b8b96a56d
Binary files /dev/null and b/docs/marketplace/vscode/threatComposer.gif differ
diff --git a/docs/telemetry-perf.md b/docs/telemetry-perf.md
new file mode 100644
index 00000000000..892ba8f6a57
--- /dev/null
+++ b/docs/telemetry-perf.md
@@ -0,0 +1,613 @@
+# Telemetry Performance Metrics
+
+Visual representations of performance telemetry metrics
+
+## Amazon Q Inline
+
+### codewhispererFirstCompletionLatency
+
+How long it took to receive the first suggestion after we started calling the getRecommendations API
+
+```mermaid
+    sequenceDiagram
+        participant User
+        participant invoke as Inline invoked
+        participant rService as Recommendation Service
+        participant rHandler as Recommendation Handler
+        participant backend as CWSPR backend
+        participant sdk as Create CWSPR SDK
+        participant token as Toolkit auth
+
+
+        User->>invoke: Finished typing
+        invoke->>rService: calls
+        rService->>rHandler: calls
+        rHandler->>sdk: calls
+
+        sdk->>token: Start getting bearer token
+        token->>sdk: Finished getting bearer token
+
+        sdk->>rHandler: Return client
+        note over rHandler, backend: codewhispererFirstCompletionLatency
+        rect rgb(230, 230, 230, 0.5)
+        loop Get paginated recommendations
+            rHandler->>backend: calls
+        end
+        backend->>rHandler: first response received
+        end
+        rHandler->>User: show results
+        backend->>rHandler: all the other responses
+        rHandler->>User: add to already shown results
+```
+
+### codewhispererEndToEndLatency
+
+How long it took from when we started calling the getRecommendations API to when the first suggestion was shown
+
+```mermaid
+    sequenceDiagram
+        participant User
+        participant invoke as Inline invoked
+        participant rService as Recommendation Service
+        participant rHandler as Recommendation Handler
+        participant backend as CWSPR backend
+        participant sdk as Create CWSPR SDK
+        participant token as Toolkit auth
+
+        User->>invoke: Finished typing
+        invoke->>rService: calls
+        rService->>rHandler: calls
+        rHandler->>sdk: calls
+
+        sdk->>token: Start getting bearer token
+        token->>sdk: Finished getting bearer token
+
+        sdk->>rHandler: Return client
+        note over User, backend: codewhispererEndToEndLatency
+        rect rgb(230, 230, 230, 0.5)
+            loop Get paginated recommendations
+                rHandler->>backend: calls
+            end
+            backend->>rHandler: first response received
+            rHandler->>User: show results
+        end
+
+        backend->>rHandler: all the other responses
+        rHandler->>User: add to already shown results
+```
+
+### codewhispererAllCompletionsLatency
+
+How long it took to complete all paginated calls
+
+```mermaid
+    sequenceDiagram
+        participant User
+        participant invoke as Inline invoked
+        participant rService as Recommendation Service
+        participant rHandler as Recommendation Handler
+        participant backend as CWSPR backend
+        participant sdk as Create CWSPR SDK
+        participant token as Toolkit auth
+
+
+        User->>invoke: Finished typing
+        invoke->>rService: calls
+        rService->>rHandler: calls
+        rHandler->>sdk: calls
+
+        sdk->>token: Start getting bearer token
+        token->>sdk: Finished getting bearer token
+
+        sdk->>rHandler: Return client
+        note over User, backend: codewhispererAllCompletionsLatency
+        rect rgb(230, 230, 230, 0.5)
+            loop Get paginated recommendations
+                rHandler->>backend: calls
+            end
+            backend->>rHandler: first response received
+            rHandler->>User: show results
+            backend->>rHandler: all the other responses
+        end
+
+
+        rHandler->>User: add to already shown results
+```
+
+### codewhispererPostprocessingLatency
+
+How long it took to display the first suggestion after it received the first response from the API
+
+```mermaid
+    sequenceDiagram
+        participant User
+        participant invoke as Inline invoked
+        participant rService as Recommendation Service
+        participant rHandler as Recommendation Handler
+        participant backend as CWSPR backend
+        participant sdk as Create CWSPR SDK
+        participant token as Toolkit auth
+
+
+        User->>invoke: Finished typing
+        invoke->>rService: calls
+        rService->>rHandler: calls
+        rHandler->>sdk: calls
+
+        sdk->>token: Start getting bearer token
+        token->>sdk: Finished getting bearer token
+
+        sdk->>rHandler: Return client
+        loop Get paginated recommendations
+            rHandler->>backend: calls
+        end
+        note over User, backend: codewhispererPostprocessingLatency
+        rect rgb(230, 230, 230, 0.5)
+            backend->>rHandler: first response received
+            rHandler->>User: show results
+        end
+
+        backend->>rHandler: all the other responses
+        rHandler->>User: add to already shown results
+```
+
+### codewhispererCredentialFetchingLatency
+
+How long it took to get the bearer token
+
+```mermaid
+    sequenceDiagram
+        participant User
+        participant invoke as Inline invoked
+        participant rService as Recommendation Service
+        participant rHandler as Recommendation Handler
+        participant backend as CWSPR backend
+        participant sdk as Create CWSPR SDK
+        participant token as Toolkit auth
+
+        User->>invoke: Finished typing
+        invoke->>rService: calls
+        rService->>rHandler: calls
+        rHandler->>sdk: calls
+
+        note over sdk, token: codewhispererCredentialFetchingLatency
+        rect rgb(230, 230, 230, 0.5)
+            sdk->>token: Start getting bearer token
+            token->>sdk: Finished getting bearer token
+        end
+        sdk->>rHandler: Return client
+        loop Get paginated recommendations
+            rHandler->>backend: calls
+        end
+
+        backend->>rHandler: first response received
+        rHandler->>User: show results
+
+        backend->>rHandler: all the other responses
+        rHandler->>User: add to already shown results
+```
+
+### codewhispererPreprocessingLatency
+
+How long it took to create the client and get ready to start sending getRecommendation API calls
+
+```mermaid
+    sequenceDiagram
+        participant User
+        participant invoke as Inline invoked
+        participant rService as Recommendation Service
+        participant rHandler as Recommendation Handler
+        participant backend as CWSPR backend
+        participant sdk as Create CWSPR SDK
+        participant token as Toolkit auth
+
+        User->>invoke: Finished typing
+        invoke->>rService: calls
+        rService->>rHandler: calls
+        rHandler->>sdk: calls
+
+        note over rHandler, token: codewhispererPreprocessingLatency
+        rect rgb(230, 230, 230, 0.5)
+            sdk->>token: Start getting bearer token
+            token->>sdk: Finished getting bearer token
+            sdk->>rHandler: Return client
+        end
+        loop Get paginated recommendations
+            rHandler->>backend: calls
+        end
+
+        backend->>rHandler: first response received
+        rHandler->>User: show results
+
+        backend->>rHandler: all the other responses
+        rHandler->>User: add to already shown results
+```
+
+### codewhisperer_perceivedLatency duration
+
+How long it took from when the user stopped pressing a key to when they were shown a response
+
+```mermaid
+    sequenceDiagram
+        participant User
+        participant invoke as Inline invoked
+        participant rService as Recommendation Service
+        participant rHandler as Recommendation Handler
+        participant backend as CWSPR backend
+        participant sdk as Create CWSPR SDK
+        participant token as Toolkit auth
+
+        User->>invoke: Finished typing
+        note over User, token: codewhisperer_perceivedLatency duration
+        rect rgb(230, 230, 230, 0.5)
+        invoke->>rService: calls
+        rService->>rHandler: calls
+        rHandler->>sdk: calls
+            sdk->>token: Start getting bearer token
+            token->>sdk: Finished getting bearer token
+            sdk->>rHandler: Return client
+
+        loop Get paginated recommendations
+            rHandler->>backend: calls
+        end
+
+        backend->>rHandler: first response received
+        rHandler->>User: show results
+
+        backend->>rHandler: all the other responses
+        rHandler->>User: add to already shown results
+        end
+```
+
+## Amazon Q Chat
+
+### amazonq_chatRoundTrip
+
+Measures sequential response times in Q chat, from user input to message display. Tracks time intervals between key events: editor receiving the message, feature processing, and final message rendering
+
+```mermaid
+    sequenceDiagram
+        participant User
+        participant chat as Chat UI
+        participant vscode as VSCode
+        participant event as Event Recorder
+        participant partner as Partner team code
+        participant telemetry
+
+        User->>chat: Write chat message and press enter
+        chat->>vscode: send message with timestamp
+        vscode->>event: record chatMessageSent/editorReceivedMessage timestamps
+        vscode->>partner: forward chat message
+        partner->>event: record featureReceivedMessage timestamp
+        partner->>partner: call backend/get response
+        partner->>vscode: forward response contents
+        vscode->>chat: display message
+        chat->>vscode: send stop-chat-message-telemetry event
+        vscode->>event: record messageDisplayed timestamp
+        event->>vscode: get the telemetry timestamps
+        vscode->>telemetry: emit amazonq_chatRoundTrip with telemetry timestamps
+```
+
+### cwsprChatTimeToFirstChunk
+
+The time between when the conversation stream is created and when we got back the first usable result
+
+```mermaid
+    sequenceDiagram
+        participant user as User
+        participant chat as Chat UI
+        participant vscode as VSCode extension host
+        participant generateResponse as Generate response
+        participant backend as Q service backend
+
+        user->>chat: Presses enter with message
+        chat->>vscode: Tell VSCode to generate a response
+        vscode->>generateResponse: start generating
+        generateResponse->>backend: start stream
+        backend->>backend: create conversation id
+        backend->>generateResponse: get conversation id
+        note over backend, generateResponse: cwsprChatTimeToFirstChunk
+        rect rgb(230, 230, 230, 0.5)
+            backend->>backend: generate first chunk
+            backend->>generateResponse: chunk received
+        end
+        generateResponse->>vscode: send chunk to display
+        vscode->>chat: display chunk
+        loop for each subsequent chunk
+            backend->>backend: generate next chunk
+            backend->>generateResponse: chunk received
+            generateResponse->>vscode: send chunk to display
+            vscode->>chat: display chunk
+        end
+```
+
+### cwsprChatTimeBetweenChunks
+
+An array of time when successive pieces of data are received from the server
+
+```mermaid
+    sequenceDiagram
+        participant user as User
+        participant chat as Chat UI
+        participant vscode as VSCode extension host
+        participant generateResponse as Generate response
+        participant backend as Q service backend
+
+        user->>chat: Presses enter with message
+        chat->>vscode: Tell VSCode to generate a response
+        vscode->>generateResponse: start generating
+        generateResponse->>backend: start stream
+        backend->>backend: create conversation id
+        backend->>generateResponse: get conversation id
+
+        loop for each subsequent chunk
+            note over backend, generateResponse: cwsprChatTimeBetweenChunks
+            rect rgb(230, 230, 230, 0.5)
+                backend->>backend: generate next chunk
+                backend->>generateResponse: chunk received
+                generateResponse->>generateResponse: record timestamp
+            end
+
+            generateResponse->>vscode: send chunk to display
+            vscode->>chat: display chunk
+        end
+```
+
+### cwsprChatFullResponseLatency
+
+The time between when the conversation id was created and the final response from the server was received
+
+```mermaid
+    sequenceDiagram
+        participant user as User
+        participant chat as Chat UI
+        participant vscode as VSCode extension host
+        participant generateResponse as Generate response
+        participant backend as Q service backend
+
+        user->>chat: Presses enter with message
+        chat->>vscode: Tell VSCode to generate a response
+        vscode->>generateResponse: start generating
+        generateResponse->>backend: start stream
+        backend->>backend: create conversation id
+        backend->>generateResponse: get conversation id
+
+        note over backend, chat: cwsprChatFullResponseLatency
+        rect rgb(230, 230, 230, 0.5)
+            loop for each subsequent chunk
+                backend->>backend: generate next chunk
+                backend->>generateResponse: chunk received
+                generateResponse->>vscode: send chunk to display
+                vscode->>chat: display chunk
+            end
+            backend->>generateResponse: final chunk received
+        end
+        generateResponse->>vscode: send chunk to display
+        vscode->>chat: display chunk
+```
+
+### cwsprChatTimeToFirstUsableChunk
+
+The time between the initial server request, including creating the conversation stream, and the first usable result
+
+```mermaid
+    sequenceDiagram
+        participant user as User
+        participant chat as Chat UI
+        participant vscode as VSCode extension host
+        participant generateResponse as Generate response
+        participant backend as Q service backend
+
+        user->>chat: Presses enter with message
+        chat->>vscode: Tell VSCode to generate a response
+        vscode->>generateResponse: start generating
+        note over backend, generateResponse: cwsprChatTimeToFirstUsableChunk
+        rect rgb(230, 230, 230, 0.5)
+        generateResponse->>backend: start stream
+            backend->>backend: create conversation id
+            backend->>generateResponse: get conversation id
+            backend->>backend: generate first chunk
+            backend->>generateResponse: chunk received
+        end
+        generateResponse->>vscode: send chunk to display
+        vscode->>chat: display chunk
+        loop for each subsequent chunk
+            backend->>backend: generate next chunk
+            backend->>generateResponse: chunk received
+            generateResponse->>vscode: send chunk to display
+            vscode->>chat: display chunk
+        end
+```
+
+### cwsprChatFullServerResponseLatency
+
+The time between the initial server request, including creating the conversation stream, and the final response from the server
+
+```mermaid
+    sequenceDiagram
+        participant user as User
+        participant chat as Chat UI
+        participant vscode as VSCode extension host
+        participant generateResponse as Generate response
+        participant backend as Q service backend
+
+        user->>chat: Presses enter with message
+        chat->>vscode: Tell VSCode to generate a response
+        vscode->>generateResponse: start generating
+        note over backend, chat: cwsprChatFullServerResponseLatency
+        rect rgb(230, 230, 230, 0.5)
+            generateResponse->>backend: start stream
+            backend->>backend: create conversation id
+            backend->>generateResponse: get conversation id
+            loop for each subsequent chunk
+                backend->>backend: generate next chunk
+                backend->>generateResponse: chunk received
+                generateResponse->>vscode: send chunk to display
+                vscode->>chat: display chunk
+            end
+            backend->>generateResponse: final chunk received
+        end
+        generateResponse->>vscode: send chunk to display
+        vscode->>chat: display chunk
+```
+
+### cwsprChatTimeToFirstDisplay
+
+The time between the user pressing enter and when the first piece of data is displayed to the user
+
+```mermaid
+    sequenceDiagram
+        participant user as User
+        participant chat as Chat UI
+        participant vscode as VSCode extension host
+        participant generateResponse as Generate response
+        participant backend as Q service backend
+        note over backend, user: cwsprChatTimeToFirstDisplay
+        rect rgb(230, 230, 230, 0.5)
+            user->>chat: Presses enter with message
+            chat->>vscode: Tell VSCode to generate a response
+            vscode->>generateResponse: start generating
+            generateResponse->>backend: start stream
+            backend->>backend: create conversation id
+            backend->>generateResponse: get conversation id
+            backend->>backend: generate first chunk
+            backend->>generateResponse: chunk received
+            generateResponse->>vscode: send chunk to display
+            vscode->>chat: display chunk
+        end
+        loop for each subsequent chunk
+            backend->>backend: generate next chunk
+            backend->>generateResponse: chunk received
+            generateResponse->>vscode: send chunk to display
+            vscode->>chat: display chunk
+        end
+```
+
+### cwsprChatTimeBetweenDisplays
+
+An array of time when successive pieces of server responses are displayed to the user
+
+```mermaid
+    sequenceDiagram
+        participant user as User
+        participant chat as Chat UI
+        participant vscode as VSCode extension host
+        participant generateResponse as Generate response
+        participant backend as Q service backend
+
+        user->>chat: Presses enter with message
+        chat->>vscode: Tell VSCode to generate a response
+        vscode->>generateResponse: start generating
+        generateResponse->>backend: start stream
+        backend->>backend: create conversation id
+        backend->>generateResponse: get conversation id
+
+        note over backend, chat: cwsprChatTimeBetweenDisplays
+        rect rgb(230, 230, 230, 0.5)
+            loop for each subsequent chunk
+                backend->>backend: generate next chunk
+                backend->>generateResponse: chunk received
+                generateResponse->>vscode: send chunk to display
+                vscode->>chat: display chunk
+                chat->>vscode: record display timestamp
+            end
+        end
+```
+
+### cwsprChatFullDisplayLatency
+
+The time between the user pressing enter and the entire response being rendered
+
+```mermaid
+    sequenceDiagram
+        participant user as User
+        participant chat as Chat UI
+        participant vscode as VSCode extension host
+        participant generateResponse as Generate response
+        participant backend as Q service backend
+
+        note over backend, user: cwsprChatFullDisplayLatency
+        rect rgb(230, 230, 230, 0.5)
+            user->>chat: Presses enter with message
+            chat->>vscode: Tell VSCode to generate a response
+            vscode->>generateResponse: start generating
+            generateResponse->>backend: start stream
+            backend->>backend: create conversation id
+            backend->>generateResponse: get conversation id
+            generateResponse->>backend: start stream
+            backend->>backend: create conversation id
+            loop for each subsequent chunk
+                backend->>backend: generate next chunk
+                backend->>vscode: send chunk to display
+                vscode->>chat: display chunk
+            end
+        end
+
+```
+
+## Crash Monitoring
+
+We make an attempt to gather information regarding when the IDE crashes, then report it to telemetry. This is the diagram of the steps that take place.
+
+### Sequence Diagram
+
+> Keep in mind that the entire sequence below is duplicated for each instance of our extension.
+> They all work together to "crash check" on behalf of the other crashed extension instance.
+
+`Crash Service`: The high level "service" that starts the heartbeats and crash checks
+
+`Heartbeat`: Sends heartbeats which signal that the extension is still running and has not crashed
+
+`Crash Checker`: Observes the heartbeats, reporting a telemetry event if a crash is detected
+
+`File System State`: The user's file system where we store the heartbeat files from each extension instance
+
+```mermaid
+%%{init: {'theme':'default'}}%%
+sequenceDiagram
+  autonumber
+
+  participant VSC as VS Code
+  participant Service as Crash Service
+  participant Checker as Crash Checker
+  participant Heartbeat as Heartbeat
+  participant State as File System State
+  participant Telemetry as Telemetry
+
+  rect rgb(121, 210, 121)
+    alt Extension Startup
+        VSC ->> Service: activate() - Start Service
+
+        Service ->> Heartbeat: Start Heartbeats
+        Heartbeat ->> State: Send Initial Heartbeat <br/> (in a folder add a unique file w/ timestamp)
+        rect rgb(64, 191, 64)
+            par every N minutes
+                Heartbeat ->> State: Send Heartbeat <br/> (overwrite the unique file w/ new timestamp)
+            end
+        end
+
+        Service ->> Checker: Start Crash Checking
+        rect rgb(64, 191, 64)
+            par every N*2 minutes
+                Checker ->> Checker: If computer went to sleep, skip this iteration (gives time for a heartbeat)
+                Checker ->> State: Request all heartbeat timestamps (readdir all heartbeat files)
+                State ->> Checker: Receive all heartbeat timestamps
+                loop for each crashed extension (it's timestamp >= N*2 minutes)
+                    Checker ->> State: Delete heartbeat file
+                    Checker ->> Telemetry: Send metric representing a crash: session_end
+                end
+            end
+        end
+    end
+  end
+
+  rect rgb(255, 128, 128)
+    alt Graceful Shutdown
+        VSC ->> Service: deactivate() - Stop Service
+        Service ->> Checker: Stop
+        Service ->> Heartbeat: Stop
+        Heartbeat ->> State: Delete timestamp file <br/> (This is missed when a crash happens)
+    end
+  end
+
+```
diff --git a/docs/telemetry.md b/docs/telemetry.md
new file mode 100644
index 00000000000..7750750c967
--- /dev/null
+++ b/docs/telemetry.md
@@ -0,0 +1,344 @@
+# Telemetry
+
+## Development
+
+See [aws-toolkit-common/telemetry](https://github.com/aws/aws-toolkit-common/tree/main/telemetry#telemetry) for full details about defining telemetry metrics.
+
+-   You can define new metrics during development by adding items to
+    [telemetry/vscodeTelemetry.json](https://github.com/aws/aws-toolkit-vscode/blob/21ca0fca26d677f105caef81de2638b2e4796804/src/shared/telemetry/vscodeTelemetry.json).
+    -   The `generateClients` build task generates new symbols in `shared/telemetry/telemetry`, which you can import via:
+        ```
+        import { telemetry } from '/shared/telemetry/telemetry'
+        ```
+    -   When your feature is released, the "development" metrics you defined in `vscodeTelemetry.json` should be upstreamed to [aws-toolkit-common](https://github.com/aws/aws-toolkit-common/blob/main/telemetry/definitions/commonDefinitions.json).
+-   Metrics are dropped (not posted to the service) if the extension is running in [CI or other
+    automation tasks](https://github.com/aws/aws-toolkit-vscode/blob/21ca0fca26d677f105caef81de2638b2e4796804/src/shared/vscode/env.ts#L71-L73).
+    -   You can always _test_ telemetry via [assertTelemetry()](https://github.com/aws/aws-toolkit-vscode/blob/21ca0fca26d677f105caef81de2638b2e4796804/src/test/testUtil.ts#L164), regardless of the current environment.
+
+## Guidelines
+
+-   Use `run()` where possible. It automatically sets the `result` and `reason` fields. See below for details.
+    -   `run()` gets the `reason` value from the `Error.code` property of any exception that is thrown.
+    -   Your code can throw `ToolkitError` with a `code` field to communicate errors, validation issues, or [cancellation](https://github.com/aws/aws-toolkit-vscode/blob/06661f84530c6b5331579871d685515700b7767e/src/auth/sso/model.ts#L138). See below.
+-   The `reason` and `result` fields are standard metric fields shared by all Toolkits (VSCode, JetBrains, VisualStudio).
+    They should be used instead of special-purpose metrics or fields.
+-   `result` allows the Toolkits team to monitor all features for potential regressions.
+-   `reason` gives insight into the cause of a `result=Failed` metric.
+-   `telemetry.record()` called during a `telemetry.foo.run(…)` context will automatically annotate the current `foo` metric.
+    -   For example, the cloudwatch logs feature adds `hasTimeFilter` info its metrics by [calling telemetry.record()](https://github.com/aws/aws-toolkit-vscode/blob/06661f84530c6b5331579871d685515700b7767e/src/cloudWatchLogs/cloudWatchLogsUtils.ts#L21-L24).
+
+## Incrementally Building a Metric
+
+User actions or other features may have multiple stages/steps, called a "workflow" or just "flow". A telemetry ["trace"](https://opentelemetry.io/docs/concepts/signals/traces/) captures a flow as tree of ["spans"](https://opentelemetry.io/docs/concepts/signals/traces/#spans).
+
+For example, `setupThing()` has multiple steps until it is completed, ending with `lastSetupStep()`.
+
+```typescript
+function setupThing() {
+    setupStep1()
+    setupStep2()
+    ...
+    lastSetupStep()
+}
+```
+
+<br>
+
+If we want to send a metric event, lets call it `metric_setupThing`, then the code could look something like this:
+
+```typescript
+function setupThing() {
+    try {
+        ...
+        lastSetupStep()
+        telemetry.metric_setupThing.emit({result: 'Succeeded', ...})
+    }
+    catch (e) {
+        telemetry.metric_setupThing.emit({result: 'Failed', reason: 'Not Really Sure Why' ...})
+    }
+}
+```
+
+Here we emitted a final metric based on the failure or success of the entire execution. Each metric is discrete and immediately gets sent to the telemetry service.
+
+<br>
+
+But usually code is not flat and there are many nested calls. If something goes wrong during the execution it would be useful to have more specific information at the area of failure. For that we can use `run()` along with `telemetry.record()`.
+
+`run()` accepts a callback, and when the callback is executed, any uses of `telemetry.record()` at _any nesting level_ during execution of that callback, will update the
+attributes of the ["current metric"](https://github.com/aws/aws-toolkit-vscode/blob/13cb98d5315092ddc9eb5ba898e5f26810dada25/src/shared/telemetry/spans.ts#L233).
+And at the end (that is, when `run()` returns) we will emit a single metric with the last updated attributes.
+[Example](https://github.com/aws/aws-toolkit-vscode/blob/06661f84530c6b5331579871d685515700b7767e/src/cloudWatchLogs/cloudWatchLogsUtils.ts#L21-L24)
+
+When an exception is thrown from a `run()` context, `run()` will [automatically set](https://github.com/aws/aws-toolkit-vscode/blob/a583825bec6cb68c4942fa60d185644833528532/src/shared/errors.ts#L273-L289)
+the `reason` field based on the Error `code` field. You can explicitly set `code` when throwing
+a `ToolkitError`, for [example](https://github.com/aws/aws-toolkit-vscode/blob/d08e59952a6c75a5c6c00fdc464e26750c0e85f5/src/auth/auth.ts#L530):
+
+    throw new ToolkitError('No sso-session name found in ~/.aws/config', { code: 'NoSsoSessionName' })
+
+Note: prefer reason codes with a format similar to existing codes (not sentences). You can find existing codes by searching the codebase:
+
+    git grep 'code: '
+
+### Example
+
+```typescript
+setupThing()
+
+function setupThing() {
+    // Start the run() for metric_setupThing
+    telemetry.metric_setupThing.run(span => {
+        // Update the metric with initial attributes
+        span.record({sessionId: '123456'}) // now no matter where the control flow exits after this line in this method, this attribute will always be set
+        ...
+        setupStep2()
+        ...
+
+        if (userInput.CancelSelected) {
+            // By setting the `cancelled` attribute to true, the `result` attribute will be set to Cancelled
+            throw new ToolkitError("Thing has been cancelled", { cancelled: true})
+        }
+    })
+    // At this point the final values from the `record()` calls are used to emit a the final metric.
+    // If no exceptions have been thrown, the `result` attribute is automatically set to Success.
+}
+
+function setupStep2() {
+    try {
+        // Do work
+    }
+    catch (e) {
+        // Here we can update the metric with more specific information regarding the failure.
+
+        // Also notice we are able to use `telemetry.metric_setupThing` versus `span`.
+        // This is due to `metric_setupThing` being added to the "context" from the above run()
+        // callback argument. So when we use record() below it will update the same
+        // thing that span.record() does.
+
+        // Keep in mind record() must be run inside the callback argument of run() for
+        // the attributes of that specific metric to be updated.
+        telemetry.metric_setupThing.record({
+            workDone: // ...
+        })
+        // If this exception is allowed to propogate to the `run()`, then the `result` will be automatically set to Failed and the `reason` to the `code` set here
+        throw new ToolkitError(e as Error, { code: "SomethingWentWrongInStep2"})
+    }
+}
+```
+
+<br>
+
+Finally, if `setupStep2()` was the thing that failed we would see a metric like:
+
+```
+{
+    "metadata.metricName": "metric_setupThing",
+    "sessionId": "123456",
+    "result": "Failed",
+    "reason": "SomethingWentWrongInStep2",
+    ...
+}
+```
+
+## Adding a "Stack Trace" to your metric
+
+When errors are thrown we do not attach the stack trace in telemetry. We only know about the error itself, but
+not the path it took to get there. We sometimes need this stack trace to debug, and only have telemetry to get insight on what happened since we do not have access to logs.
+
+### Scenario
+
+Common example: _"I have a function, `thisFailsSometimes()` that is called in multiple places. The function sometimes fails, I know from telemetry, but I do not know if it is failing when it is a specific caller. If I knew the call stack/trace that it took to call my function that would help me debug."_
+
+```typescript
+function runsSuccessfully() {
+    thisFailsSometimes(1) // this succeeds
+}
+
+function thisThrows() {
+    thisFailsSometimes(0) // this fails
+}
+
+function failsDependingOnInput(num: number) {
+    return telemetry.my_Metric.run(() => {
+        if (number === 0) {
+            throw Error('Cannot be 0')
+        }
+        ...
+    })
+}
+```
+
+### Solution
+
+On class methods, use the `@withTelemetryContext()` decorator to add context to the execution. Depending on the args set, it provides features like emitting the result, or adding it's context to errors.
+
+> NOTE: Decorators are currently only supported for methods and not functions
+
+```typescript
+class MyClass {
+    @withTelemetryContext({ name: 'runsSuccessfully', class: 'MyClass' })
+    public runsSuccessfully() {
+        failsDependingOnInput(1)
+    }
+
+    @withTelemetryContext({ name: 'thisThrows', class: 'MyClass', errorCtx: true })
+    public thisThrows() {
+        failsDependingOnInput(0)
+    }
+
+    @withTelemetryContext({ name: 'failsDependingOnInput' class: 'MyClass', emit: true, errorCtx: true})
+    private failsDependingOnInput(num: number) {
+        if (number === 0) {
+            throw Error('Cannot be 0')
+        }
+        ...
+    }
+}
+
+// Results in a metric: { source: 'MyClass#thisThrows,failsDependingOnInput', result: 'Failed' }
+// Results in an error that has context about the methods that lead up to it.
+new MyClass().thisThrows()
+```
+
+Separately if you must use a function, add a value to `function` in the options of a `run()`. This will result in a stack of functions identifiers that were previously called
+before `failsDependingOnInput()` was run. You can then retrieve the stack in the `run()` of your final metric using `getFunctionStack()`.
+
+```typescript
+function runsSuccessfully() {
+    telemetry.my_Metric.run(() => failsDependingOnInput(1), { functionId: { name: 'runsSuccessfully' }})
+}
+
+function thisThrows() {
+    telemetry.my_Metric.run(() => failsDependingOnInput(0), { functionId: { source: 'thisThrows' }})
+}
+
+function failsDependingOnInput(num: number) {
+    return telemetry.my_Metric.run(() => {
+        telemetry.record({ theCallStack: asStringifiedStack(telemetry.getFunctionStack())})
+        if (number === 0) {
+            throw Error('Cannot be 0')
+        }
+        ...
+    }, { functionId: { name: 'failsDependingOnInput' }})
+}
+
+// Results in a metric: { theCallStack: 'thisThrows:failsDependingOnInput', result: 'Failed' }
+// { theCallStack: 'thisThrows:failsDependingOnInput' } implies 'thisThrows' was run first, then 'failsDependingOnInput'. See docstrings for more info.
+thisThrows()
+```
+
+### Important Notes
+
+-   If a nested function does not use a `run()` then it will not be part of the call stack.
+
+    ```typescript
+    function a() {
+        return telemetry.my_Metric.run(() => b(), { functionId: { name: 'a' } })
+    }
+
+    function b() {
+        return c()
+    }
+
+    function c() {
+        return telemetry.my_Metric.run(() => asStringifiedStack(telemetry.getFunctionStack()), {
+            functionId: { name: 'c' },
+        })
+    }
+
+    c() // result: 'a:c', note that 'b' is not included
+    ```
+
+-   If you do not want your `run()` to emit telemetry, set `emit: false` in the options
+
+    ```typescript
+    function a() {
+        return telemetry.my_Metric.run(() => b(), { functionId: { name: 'a' }, emit: false })
+    }
+    ```
+
+-   If you want to add to the function stack, but don't have a specific metric to use,
+    use the metric named `function_call`. Also look to set `emit: false` if you do not
+    want it to emit telemetry.
+
+    ```typescript
+    function a() {
+        return telemetry.function_call.run(() => b(), { functionId: { name: 'a' }, emit: false })
+    }
+    ```
+
+-   If your function name is generic, look to make it unique so there is no confusion.
+
+    ```typescript
+    function a() {
+        return telemetry.my_Metric.run(() => b(), { functionId: { name: 'aButMoreUnique' } })
+    }
+    ```
+
+## Tracing Telemetry Events
+
+All telemetry events include a traceId in addition to other attributes. Traceids allow for improved tracking and correlation of related events across a single operation or user flow.
+
+### What is a traceId?
+
+A traceId is a unique identifier that is generated for the top-level telemetry event in a flow and then propagated to all subsequent related events. This allows us to group and analyze all events associated with a particular operation.
+
+### How it works
+
+1. When a top-level telemetry event is created (e.g., `vscode_executeCommand`), a new traceId is generated.
+2. This traceId is then attached to all subsequent related telemetry events that occur as part of the same operation or flow.
+3. The traceId remains consistent for all events within the same flow
+
+### Example
+
+Consider a flow where `vscode_executeCommand` triggers `amazonq_enterFocusChat` and `amazonq_openChat`. The resulting telemetry events would look like this:
+
+```
+vscode_executeCommand:
+traceId: 'aaaaa-aaaaa-aaaaa-aaaaa-aaaaa'
+
+amazonq_enterFocusChat
+traceId: 'aaaaa-aaaaa-aaaaa-aaaaa-aaaaa'
+
+amazonq_openChat
+traceId: 'aaaaa-aaaaa-aaaaa-aaaaa-aaaaa'
+```
+
+allowing us to look up `traceId=aaaaa-aaaaa-aaaaa-aaaaa-aaaaa` in our telemetry instance and find all the related events.
+
+For more information visit the OpenTelemetry documentation on traces: https://opentelemetry.io/docs/concepts/signals/traces/
+
+### Manual Trace ID Instrumentation
+
+In certain scenarios you may need to manually instrument disjoint flows to track how a `traceId` propagates through them. e.g.
+
+1. Measuring the time it takes for a message to travel from Amazon Q chat, through VS Code, and back to the customer.
+2. Determining the duration for Amazon Q inline to display a message to the user.
+
+In these cases, where there isn't a direct hierarchy of function calls, manual instrumentation of the `traceId` is necessary.
+
+#### Implementation Options
+
+#### 1. When not currently running in a span
+
+If you're not within an active span and you know the `traceId` you want to use:
+
+```javascript
+telemetry.withTraceId(() => {
+    // Code to be executed within this trace
+}, 'myTraceId')
+```
+
+This method wraps the provided function with the specified traceId
+
+#### 2. When currently running in a span
+
+If you're already executing within a span (e.g., vscode_executeCommand) and you know the traceId you want to use:
+
+```javascript
+telemetry.record({
+    traceId: 'myTraceId',
+})
+```
+
+This approach records the traceId for the current span and all future spans within the same execution context.
diff --git a/docs/vscode_behaviors.md b/docs/vscode_behaviors.md
new file mode 100644
index 00000000000..6d2dca2546a
--- /dev/null
+++ b/docs/vscode_behaviors.md
@@ -0,0 +1,31 @@
+# VS Code Behaviors
+
+Many VS Code behavoirs for certain APIs or user interactions with the IDE are not clearly documented,
+or documented at all. Please add any findings to this document.
+
+## `deactivate()` - extension shutdown
+
+This method is defined as part of the VS Code extension API, and is run on a **graceful** shutdown
+for each extension.
+
+-   Our extension and its `deactivate()` function are in the Extension Host process [1]
+-   The Extension Host process has at most 5 seconds to shut down, after which it will exit. [1]
+-   The vscode API will be unreliable at deactivation time. So certain VSC APIs like the filesystem may not work. [1]
+    -   The VSC Filesystem API has been confirmed to not work
+-   In `Run & Debug` mode, closing the Debug IDE instance behaves differently depending on how it is closed
+    -   The regular close button in the Debug IDE instance results in a graceful shutdown
+    -   The red square in the root IDE instance to stop the debugging session results on a non-graceful shutdown, meaning `deactivate()` is not run.
+-   `Reload Window` triggers `deactivate()`
+
+Sources:
+
+-   [[1]](https://github.com/Microsoft/vscode/issues/47881#issuecomment-381910587)
+-   [[2]](https://github.com/microsoft/vscode/issues/122825#issuecomment-814218149)
+
+## State (`globalState`, `Memento`)
+
+TODO:
+
+-   How it behaves between remote (ssh) and local
+-   How it is not completely reliable. Reads/writes have no guarantee to work (though we are fine in most cases)
+-   How it can break as observed with crash monitoring work. At a certain point writes were seemingly succeeding, but did not actually propagate to all IDE instances.
diff --git a/docs/web.md b/docs/web.md
new file mode 100644
index 00000000000..1540ddf8134
--- /dev/null
+++ b/docs/web.md
@@ -0,0 +1,174 @@
+# Web Mode
+
+This extension can run in a web browser (eg: [vscode.dev](https://vscode.dev)), but with limited functionality compared to
+the desktop version.
+
+## Running the Web mode implementation
+
+You can run the Web mode implementation of the extension in the following ways.
+
+## Pre-requisites
+
+[See the CONTRIBUTING document.](../CONTRIBUTING.md#setup)
+
+### General Notes
+
+-   To see logs, using the Command Palette search: `Toggle Developer Tools`. Then go to the `Console` tab. In web mode VS Code seems to duplicate log messages, idk how to fix this.
+-   The difference between web mode and Node.js/desktop is that in web mode everything runs in browser environment so certain things like Node.js modules will **not** be available.
+
+## Running in an actual Browser (Recommended)
+
+The following steps will result in a Chrome window running with VS Code
+and the web version of the AWS Toolkit extension installed:
+
+1. (Recommended) To have the Chrome window save your VS Code state after closing it, you need to modify the node module which executes the playwright method that opens it. In `node_modules/@vscode/test-web/out/index.js#openBrowser()` make the following change:
+
+    Before:
+
+    ```typescript
+    const browser = await browserType.launch({ headless, args, devtools: options.devTools })
+    const context = await browser.newContext({ viewport: null })
+    ```
+
+    After:
+
+    ```typescript
+    const tempContextDir = path.join(process.cwd(), '.vscode-test-web/aws-toolkit-user-dir')
+    const browser = await browserType.launchPersistentContext(tempContextDir, {
+        headless,
+        args,
+        devtools: options.devTools,
+        viewport: null,
+    })
+    const context = browser
+    ```
+
+2. In the `Run & Debug` menu select the `Extension Web` option
+
+> Note: To stop the debug session, you need to click the read `Disconnect` button multiple times
+
+> Note: Setting breakpoints in VS Code works
+
+#### (OPTIONAL) Enabling CORS
+
+By default, we disable CORS in web mode since certain endpoints
+such as telemetry or auth do not support CORS (at the moment of writing) for the VSCode origin.
+
+In the case you want to enable CORS in the browser to test CORS compatibility
+do the following:
+
+-   In `package.json` find the `webRun` script
+-   Temporarily remove `--browserOption=--disable-web-security`
+
+Now when you run the extension in the browser it will do CORS checks.
+
+### Troubleshooting
+
+-   `Extension Web` fails to launch
+    -   Update `@vscode/test-web` by running `$ npm install @vscode/test-web@latest`
+    -   Update/install playwright with `$ npx playwright install`. This will be mentioned in one of the build tasks outputs.
+
+## Running in [vscode.dev](https://vscode.dev)
+
+The following will explain how to get your latest local development changes running in the actual `vscode.dev`. Use this if you want to test on an actual VS Code Web instance.
+
+1. Build the extension. We need the Web mode entrypoint file to exist.
+2. OPTIONAL: Start up your browser with security disabled. Certain functionalities do not support CORS and will fail otherwise.
+    - On MacOS from the CLI is similar to `/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome --disable-web-security`
+3. `cd` to the extension you want to test in `packages/`. Eg: `packages/amazonq/`.
+    - We need to do this since the following command hosts your build from the `cwd`.
+4. Follow the [VS Code documentation](https://code.visualstudio.com/api/extension-guides/web-extensions#test-your-web-extension-in-vscode.dev) for setting up certs, serving your the latest changes, and installing the extension to `vscode.dev`.
+
+## Testing in VSCode Web Mode
+
+The following steps will result in a VSCode Extension window running
+with the AWS Toolkit extension installed. While it looks the same as a typical
+VS Code window, in the background it is running in a Browser context.
+
+-   In the `Run & Debug` menu run: `Extension Tests (web)`
+
+> NOTE: Tests do not spin up an actual browser window, but if we find a good reason to switch it will require some additional work. The current way does not require dowloading a separate browser like Chromium.
+
+## Adding Web mode specific npm modules
+
+If you need to manage npm modules required for Web mode, such as a [browserfied module](https://www.npmjs.com/package/os-browserify), see [the documentation here](../packages/core/src/web/README.md#packagejson).
+
+## Finding incompatible transitive dependencies
+
+For example, if I have a Typescript module, `myFile.ts`, that imports a module which imports another module (transitive dependency) such as `fs-extra`,
+when I execute `myFile.ts` in the browser it will break due to `fs-extra` not being browser compatible.
+
+> INFO: A common error is `Cannot read properties of undefined (reading 'native')` caused by `fs-extra`
+
+It may be difficult to determine which module imported `fs-extra` due to a nested chain of transitive dependencies.
+
+As a solution, we can use [`dependency-cruiser`](https://www.npmjs.com/package/dependency-cruiser) to generate a dependency diagram
+to help us visualize the imports and determine which module is importing a certain module.
+
+### How to use
+
+1. Install the `graphviz` cli, this provides the `dot` cli command
+    - Mac: `brew install graphviz`
+    - Others: [See documentation](https://www.graphviz.org/download/)
+2. Temporarily install `dependency-cruiser`
+    - IMPORTANT: You will want to revert this install when done
+    - `npm i dependency-cruiser`
+3. Run `npx depcruise {RELATIVE_PATH_TO_FILE}  --reaches "{YOUR_MODULE}" --output-type dot | dot -T svg > dependency-graph.svg`
+    - For example `npx depcruise src/shared/fs/fs.ts --reaches "fs-extra" --output-type dot | dot -T svg > dependency-graph.svg`, generates the following which shows that `fs-extra` is imported by `fileSystemUtilities.ts`:
+      ![Dependency Graph](./images/dependency-graph-small.svg)
+
+## Behavior of module exports in tests
+
+-   **In Web mode**, state is not shared between the actual extension code and the unit test code. I.e you cannot modify an exported module variable in the extension code and see that change from the tests.
+-   However, state stored in `globalThis` is observable from the tests.
+
+When running web tests, the context between the extension code and test code is not shared.
+Though it is shared in the Node version of the extension.
+
+-   Does NOT work in Web mode tests:
+    -   Module code:
+        ```typescript
+        export let myGlobal = 'A'
+        function activate() {
+            // Change the exported module variable.
+            myGlobal = 'B'
+        }
+        ```
+    -   Test code:
+        ```typescript
+        // Web unit test
+        import { myGlobal } from '../src/extension.ts'
+        describe('test', function () {
+            it('test', function () {
+                assert.strictEqual(myGlobal, 'B') // Fails in Web (but not Node.js). The value is 'A'.
+            })
+        })
+        ```
+-   DOES work in Web mode tests:
+    -   Module code:
+        ```typescript
+        ;(globalThis as any).myGlobal = 'A'
+        function activate() {
+            ;(globalThis as any).myGlobal = 'B'
+        }
+        ```
+    -   Test code:
+        ```typescript
+        // Web unit test
+        describe('test', function () {
+            it('test', function () {
+                assert.strictEqual((globalThis as any).myGlobal, 'B') // Passes in Web and Node.js.
+            })
+        })
+        ```
+
+### Web Worker
+
+The assumption for the behavior is due to how Web Workers work. We (VS Code) use them to run our extension and test code in the browser. The scripts share module exports differently compared to a different environment such as Node.js.
+
+-   [`WorkerGlobalScope`](https://developer.mozilla.org/en-US/docs/Web/API/WorkerGlobalScope)
+    -   The context of the executing code is contained within itself and is not accessible to other scripts (tests).
+    -   VS Code uses Dedicated Workers since `globalThis` is indicated as a [`DedicatedWorkerGlobalScope`](https://developer.mozilla.org/en-US/docs/Web/API/DedicatedWorkerGlobalScope) when debugging
+    -   `globalThis` is one object (that I could find so far) which **is shared** between our extension and test scripts. A guess to why is that the main script spawns another web worker (for unit tests) and passes on the `DedicatedWorkerGlobalScope`. See [`"Workers can also spawn other workers"`](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Functions_and_classes_available_to_workers).
+    -   `globalThis` returns `global` in Node.js, or a `WorkerGlobalScope` in the browser
+    -   NOTE: `globalThis` is shared across all of VS Code, including all extensions.
diff --git a/package-lock.json b/package-lock.json
index 553a7269356..ef7e8c05e28 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,1773 +1,2650 @@
 {
-    "name": "aws-toolkit-vscode",
-    "version": "1.63.0-SNAPSHOT",
-    "lockfileVersion": 2,
+    "name": "root",
+    "version": "0.0.1",
+    "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
-            "name": "aws-toolkit-vscode",
-            "version": "1.63.0-SNAPSHOT",
+            "name": "root",
+            "version": "0.0.1",
             "hasInstallScript": true,
             "license": "Apache-2.0",
+            "workspaces": [
+                "packages/core/src/web",
+                "packages/*",
+                "plugins/*"
+            ],
             "dependencies": {
-                "@aws-sdk/client-sso": "^3.181.0",
-                "@aws-sdk/client-sso-oidc": "^3.181.0",
-                "@aws-sdk/credential-provider-ini": "^3.46.0",
-                "@aws-sdk/credential-provider-process": "^3.15.0",
-                "@aws-sdk/credential-provider-sso": "^3.38.0",
-                "@aws-sdk/util-arn-parser": "^3.46.0",
-                "@iarna/toml": "^2.2.5",
-                "adm-zip": "^0.5.9",
-                "amazon-states-language-service": "^1.8.0",
-                "async-lock": "^1.3.0",
-                "aws-sdk": "^2.1267.0",
-                "aws-ssm-document-language-service": "^1.0.0",
-                "bytes": "^3.1.2",
-                "cross-spawn": "^7.0.3",
-                "fast-json-patch": "^3.1.1",
-                "fs-extra": "^10.0.1",
-                "got": "^11.8.5",
-                "immutable": "^4.0.0",
-                "js-yaml": "^4.1.0",
-                "jsonc-parser": "^3.0.0",
-                "lodash": "^4.17.21",
-                "mime-types": "^2.1.32",
-                "moment": "^2.29.4",
-                "portfinder": "^1.0.25",
-                "semver": "^7.3.5",
-                "strip-ansi": "^5.2.0",
-                "tcp-port-used": "^1.0.1",
-                "typescript": "^4.8.4",
-                "uuid": "^8.3.2",
-                "vscode-languageclient": "^6.1.4",
-                "vscode-languageserver": "^6.1.1",
-                "vscode-languageserver-textdocument": "^1.0.3",
-                "vscode-nls": "^5.0.0",
-                "vue": "^3.2.31",
-                "winston": "^3.7.1",
-                "winston-transport": "^4.5.0",
-                "xml2js": "^0.4.19",
-                "yaml": "^1.9.2",
-                "yaml-cfn": "^0.3.1"
+                "@aws/language-server-runtimes": "^0.2.128",
+                "@types/node": "^22.7.5",
+                "jaro-winkler": "^0.2.8",
+                "vscode-nls": "^5.2.0",
+                "vscode-nls-dev": "^4.0.4"
             },
             "devDependencies": {
-                "@aws-toolkits/telemetry": "^1.0.87",
-                "@cspotcode/source-map-support": "^0.8.1",
-                "@sinonjs/fake-timers": "^8.1.0",
-                "@types/adm-zip": "^0.4.34",
-                "@types/async-lock": "^1.1.3",
-                "@types/bytes": "^3.1.0",
-                "@types/cross-spawn": "^6.0.0",
-                "@types/fs-extra": "^9.0.11",
-                "@types/glob": "^7.1.1",
-                "@types/js-yaml": "^4.0.5",
-                "@types/lodash": "^4.14.180",
-                "@types/marked": "^4.0.2",
-                "@types/mime-types": "^2.1.1",
-                "@types/mocha": "^10.0.0",
-                "@types/node": "^14.18.5",
-                "@types/readline-sync": "^1.4.3",
-                "@types/semver": "^7.3.6",
-                "@types/sinon": "^10.0.5",
-                "@types/sinonjs__fake-timers": "^8.1.1",
-                "@types/tcp-port-used": "^1.0.1",
-                "@types/uuid": "^8.3.3",
-                "@types/vscode": "1.50.0",
-                "@types/vscode-webview": "^1.57.0",
-                "@types/xml2js": "^0.4.8",
-                "@typescript-eslint/eslint-plugin": "^5.38.0",
-                "@typescript-eslint/parser": "^5.38.0",
-                "@vscode/codicons": "^0.0.32",
-                "@vscode/test-electron": "^2.2.3",
-                "@vue/compiler-sfc": "^3.2.40",
-                "circular-dependency-plugin": "^5.2.2",
-                "css-loader": "^6.5.1",
-                "esbuild-loader": "2.20.0",
-                "eslint": "^8.26.0",
-                "eslint-config-prettier": "8.3",
+                "@aws-toolkits/telemetry": "^1.0.329",
+                "@playwright/browser-chromium": "^1.43.1",
+                "@stylistic/eslint-plugin": "^2.11.0",
+                "@types/he": "^1.2.3",
+                "@types/jaro-winkler": "^0.2.4",
+                "@types/vscode": "^1.68.0",
+                "@types/vscode-webview": "^1.57.1",
+                "@types/webpack-env": "^1.18.5",
+                "@typescript-eslint/eslint-plugin": "^7.14.1",
+                "@typescript-eslint/parser": "^7.14.1",
+                "@vscode/codicons": "^0.0.33",
+                "@vscode/test-electron": "^2.3.8",
+                "@vscode/test-web": "^0.0.65",
+                "@vscode/vsce": "^2.19.0",
+                "eslint": "^8.56.0",
+                "eslint-config-prettier": "^9.1.0",
+                "eslint-plugin-aws-toolkits": "file:plugins/eslint-plugin-aws-toolkits",
                 "eslint-plugin-header": "^3.1.1",
-                "eslint-plugin-no-null": "^1.0.2",
-                "glob": "^7.1.7",
-                "husky": "^7.0.2",
-                "json-schema-to-typescript": "^11.0.2",
-                "marked": "^4.0.10",
-                "mocha": "^10.1.0",
-                "mocha-junit-reporter": "^2.0.0",
-                "mocha-multi-reporters": "^1.5.1",
-                "nyc": "^15.1.0",
-                "prettier": "^2.7.1",
-                "prettier-plugin-sh": "^0.8.1",
-                "pretty-quick": "^3.1.0",
-                "readline-sync": "^1.4.9",
-                "sinon": "^14.0.0",
-                "ts-mockito": "^2.5.0",
-                "ts-node": "^10.7.0",
-                "umd-compat-loader": "^2.1.2",
-                "vsce": "^2.6.3",
-                "vscode-nls-dev": "^3.3.1",
-                "vue-loader": "^16.8.1",
-                "vue-style-loader": "^4.1.3",
-                "webfont": "^11.2.26",
-                "webpack": "^5.65.0",
-                "webpack-cli": "^4.9.1",
-                "webpack-dev-server": "^4.9.2"
-            },
+                "eslint-plugin-prettier": "^5.1.3",
+                "eslint-plugin-security-node": "^1.1.4",
+                "eslint-plugin-unicorn": "^54.0.0",
+                "husky": "^9.0.7",
+                "prettier": "^3.3.3",
+                "prettier-plugin-sh": "^0.14.0",
+                "pretty-quick": "^4.0.0",
+                "ts-node": "^10.9.1",
+                "typescript": "^5.0.4",
+                "webpack": "^5.95.0",
+                "webpack-cli": "^5.1.4",
+                "webpack-dev-server": "^4.15.2",
+                "webpack-merge": "^5.10.0"
+            }
+        },
+        "node_modules/@aashutoshrathi/word-wrap": {
+            "version": "1.2.6",
+            "dev": true,
+            "license": "MIT",
             "engines": {
-                "vscode": "^1.50.1"
+                "node": ">=0.10.0"
             }
         },
-        "node_modules/@ampproject/remapping": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz",
-            "integrity": "sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==",
-            "dev": true,
-            "dependencies": {
-                "@jridgewell/trace-mapping": "^0.3.0"
+        "node_modules/@amzn/amazon-q-developer-streaming-client": {
+            "resolved": "src.gen/@amzn/amazon-q-developer-streaming-client",
+            "link": true
+        },
+        "node_modules/@amzn/codewhisperer-streaming": {
+            "resolved": "src.gen/@amzn/codewhisperer-streaming",
+            "link": true
+        },
+        "node_modules/@amzn/sagemaker-client": {
+            "version": "1.0.0",
+            "resolved": "file:src.gen/@amzn/sagemaker-client/1.0.0.tgz",
+            "integrity": "sha512-rNMUzeACaCiIqR8aQo3G99xR+Qy6zhbGi9+6XRG5proUKetO3584dclmSnIUvDvzLWosFcl4GyP8tFqiahc6Jg==",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "3.0.0",
+                "@aws-crypto/sha256-js": "3.0.0",
+                "@aws-sdk/client-sts": "3.363.0",
+                "@aws-sdk/credential-provider-node": "3.363.0",
+                "@aws-sdk/middleware-host-header": "3.363.0",
+                "@aws-sdk/middleware-logger": "3.363.0",
+                "@aws-sdk/middleware-recursion-detection": "3.363.0",
+                "@aws-sdk/middleware-signing": "3.363.0",
+                "@aws-sdk/middleware-user-agent": "3.363.0",
+                "@aws-sdk/types": "3.357.0",
+                "@aws-sdk/util-user-agent-browser": "3.363.0",
+                "@aws-sdk/util-user-agent-node": "3.363.0",
+                "@smithy/config-resolver": "^1.0.1",
+                "@smithy/fetch-http-handler": "^1.0.1",
+                "@smithy/hash-node": "^1.0.1",
+                "@smithy/invalid-dependency": "^1.0.1",
+                "@smithy/middleware-content-length": "^1.0.1",
+                "@smithy/middleware-retry": "^1.0.3",
+                "@smithy/middleware-serde": "^1.0.1",
+                "@smithy/middleware-stack": "^1.0.1",
+                "@smithy/node-config-provider": "^1.0.1",
+                "@smithy/node-http-handler": "^1.0.2",
+                "@smithy/protocol-http": "^1.1.0",
+                "@smithy/smithy-client": "^1.0.3",
+                "@smithy/types": "^1.1.0",
+                "@smithy/url-parser": "^1.0.1",
+                "@smithy/util-base64": "^1.0.1",
+                "@smithy/util-body-length-browser": "^1.0.1",
+                "@smithy/util-body-length-node": "^1.0.1",
+                "@smithy/util-defaults-mode-browser": "^1.0.1",
+                "@smithy/util-defaults-mode-node": "^1.0.1",
+                "@smithy/util-retry": "^1.0.3",
+                "@smithy/util-utf8": "^1.0.1",
+                "@smithy/util-waiter": "^1.0.1",
+                "tslib": "^2.5.0",
+                "uuid": "^8.3.2"
             },
             "engines": {
-                "node": ">=6.0.0"
-            }
-        },
-        "node_modules/@aws-crypto/ie11-detection": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-2.0.0.tgz",
-            "integrity": "sha512-pkVXf/dq6PITJ0jzYZ69VhL8VFOFoPZLZqtU/12SGnzYuJOOGNfF41q9GxdI1yqC8R13Rq3jOLKDFpUJFT5eTA==",
-            "dependencies": {
-                "tslib": "^1.11.1"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-crypto/ie11-detection/node_modules/tslib": {
-            "version": "1.14.1",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-            "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-        },
-        "node_modules/@aws-crypto/sha256-browser": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-2.0.0.tgz",
-            "integrity": "sha512-rYXOQ8BFOaqMEHJrLHul/25ckWH6GTJtdLSajhlqGMx0PmSueAuvboCuZCTqEKlxR8CQOwRarxYMZZSYlhRA1A==",
-            "dependencies": {
-                "@aws-crypto/ie11-detection": "^2.0.0",
-                "@aws-crypto/sha256-js": "^2.0.0",
-                "@aws-crypto/supports-web-crypto": "^2.0.0",
-                "@aws-crypto/util": "^2.0.0",
-                "@aws-sdk/types": "^3.1.0",
+        "node_modules/@amzn/sagemaker-client/node_modules/@aws-crypto/sha256-browser": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-3.0.0.tgz",
+            "integrity": "sha512-8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ==",
+            "dependencies": {
+                "@aws-crypto/ie11-detection": "^3.0.0",
+                "@aws-crypto/sha256-js": "^3.0.0",
+                "@aws-crypto/supports-web-crypto": "^3.0.0",
+                "@aws-crypto/util": "^3.0.0",
+                "@aws-sdk/types": "^3.222.0",
                 "@aws-sdk/util-locate-window": "^3.0.0",
                 "@aws-sdk/util-utf8-browser": "^3.0.0",
                 "tslib": "^1.11.1"
             }
         },
-        "node_modules/@aws-crypto/sha256-browser/node_modules/tslib": {
+        "node_modules/@amzn/sagemaker-client/node_modules/@aws-crypto/sha256-browser/node_modules/tslib": {
             "version": "1.14.1",
             "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
             "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
         },
-        "node_modules/@aws-crypto/sha256-js": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-2.0.0.tgz",
-            "integrity": "sha512-VZY+mCY4Nmrs5WGfitmNqXzaE873fcIZDu54cbaDaaamsaTOP1DBImV9F4pICc3EHjQXujyE8jig+PFCaew9ig==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@aws-crypto/sha256-js": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-3.0.0.tgz",
+            "integrity": "sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==",
             "dependencies": {
-                "@aws-crypto/util": "^2.0.0",
-                "@aws-sdk/types": "^3.1.0",
+                "@aws-crypto/util": "^3.0.0",
+                "@aws-sdk/types": "^3.222.0",
                 "tslib": "^1.11.1"
             }
         },
-        "node_modules/@aws-crypto/sha256-js/node_modules/tslib": {
+        "node_modules/@amzn/sagemaker-client/node_modules/@aws-crypto/sha256-js/node_modules/tslib": {
             "version": "1.14.1",
             "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
             "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
         },
-        "node_modules/@aws-crypto/supports-web-crypto": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-2.0.0.tgz",
-            "integrity": "sha512-Ge7WQ3E0OC7FHYprsZV3h0QIcpdyJLvIeg+uTuHqRYm8D6qCFJoiC+edSzSyFiHtZf+NOQDJ1q46qxjtzIY2nA==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@aws-crypto/supports-web-crypto": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-3.0.0.tgz",
+            "integrity": "sha512-06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg==",
             "dependencies": {
                 "tslib": "^1.11.1"
             }
         },
-        "node_modules/@aws-crypto/supports-web-crypto/node_modules/tslib": {
+        "node_modules/@amzn/sagemaker-client/node_modules/@aws-crypto/supports-web-crypto/node_modules/tslib": {
             "version": "1.14.1",
             "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
             "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
         },
-        "node_modules/@aws-crypto/util": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-2.0.1.tgz",
-            "integrity": "sha512-JJmFFwvbm08lULw4Nm5QOLg8+lAQeC8aCXK5xrtxntYzYXCGfHwUJ4Is3770Q7HmICsXthGQ+ZsDL7C2uH3yBQ==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@aws-crypto/util": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-3.0.0.tgz",
+            "integrity": "sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==",
             "dependencies": {
-                "@aws-sdk/types": "^3.1.0",
+                "@aws-sdk/types": "^3.222.0",
                 "@aws-sdk/util-utf8-browser": "^3.0.0",
                 "tslib": "^1.11.1"
             }
         },
-        "node_modules/@aws-crypto/util/node_modules/tslib": {
+        "node_modules/@amzn/sagemaker-client/node_modules/@aws-crypto/util/node_modules/tslib": {
             "version": "1.14.1",
             "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
             "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
         },
-        "node_modules/@aws-sdk/abort-controller": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.178.0.tgz",
-            "integrity": "sha512-ptDkCB06BJrYdhKzamM9yI15LxcGkPczY80hzKAY/aecm09alnW27uCt5HJJx2nCd18IUH28ZO1sc7DTLOWb3A==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@aws-sdk/client-sso": {
+            "version": "3.363.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.363.0.tgz",
+            "integrity": "sha512-PZ+HfKSgS4hlMnJzG+Ev8/mgHd/b/ETlJWPSWjC/f2NwVoBQkBnqHjdyEx7QjF6nksJozcVh5Q+kkYLKc/QwBQ==",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "3.0.0",
+                "@aws-crypto/sha256-js": "3.0.0",
+                "@aws-sdk/middleware-host-header": "3.363.0",
+                "@aws-sdk/middleware-logger": "3.363.0",
+                "@aws-sdk/middleware-recursion-detection": "3.363.0",
+                "@aws-sdk/middleware-user-agent": "3.363.0",
+                "@aws-sdk/types": "3.357.0",
+                "@aws-sdk/util-endpoints": "3.357.0",
+                "@aws-sdk/util-user-agent-browser": "3.363.0",
+                "@aws-sdk/util-user-agent-node": "3.363.0",
+                "@smithy/config-resolver": "^1.0.1",
+                "@smithy/fetch-http-handler": "^1.0.1",
+                "@smithy/hash-node": "^1.0.1",
+                "@smithy/invalid-dependency": "^1.0.1",
+                "@smithy/middleware-content-length": "^1.0.1",
+                "@smithy/middleware-endpoint": "^1.0.1",
+                "@smithy/middleware-retry": "^1.0.2",
+                "@smithy/middleware-serde": "^1.0.1",
+                "@smithy/middleware-stack": "^1.0.1",
+                "@smithy/node-config-provider": "^1.0.1",
+                "@smithy/node-http-handler": "^1.0.2",
+                "@smithy/protocol-http": "^1.0.1",
+                "@smithy/smithy-client": "^1.0.3",
+                "@smithy/types": "^1.0.0",
+                "@smithy/url-parser": "^1.0.1",
+                "@smithy/util-base64": "^1.0.1",
+                "@smithy/util-body-length-browser": "^1.0.1",
+                "@smithy/util-body-length-node": "^1.0.1",
+                "@smithy/util-defaults-mode-browser": "^1.0.1",
+                "@smithy/util-defaults-mode-node": "^1.0.1",
+                "@smithy/util-retry": "^1.0.2",
+                "@smithy/util-utf8": "^1.0.1",
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/@amzn/sagemaker-client/node_modules/@aws-sdk/client-sso-oidc": {
+            "version": "3.363.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.363.0.tgz",
+            "integrity": "sha512-V3Ebiq/zNtDS/O92HUWGBa7MY59RYSsqWd+E0XrXv6VYTA00RlMTbNcseivNgp2UghOgB9a20Nkz6EqAeIN+RQ==",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "3.0.0",
+                "@aws-crypto/sha256-js": "3.0.0",
+                "@aws-sdk/middleware-host-header": "3.363.0",
+                "@aws-sdk/middleware-logger": "3.363.0",
+                "@aws-sdk/middleware-recursion-detection": "3.363.0",
+                "@aws-sdk/middleware-user-agent": "3.363.0",
+                "@aws-sdk/types": "3.357.0",
+                "@aws-sdk/util-endpoints": "3.357.0",
+                "@aws-sdk/util-user-agent-browser": "3.363.0",
+                "@aws-sdk/util-user-agent-node": "3.363.0",
+                "@smithy/config-resolver": "^1.0.1",
+                "@smithy/fetch-http-handler": "^1.0.1",
+                "@smithy/hash-node": "^1.0.1",
+                "@smithy/invalid-dependency": "^1.0.1",
+                "@smithy/middleware-content-length": "^1.0.1",
+                "@smithy/middleware-endpoint": "^1.0.1",
+                "@smithy/middleware-retry": "^1.0.2",
+                "@smithy/middleware-serde": "^1.0.1",
+                "@smithy/middleware-stack": "^1.0.1",
+                "@smithy/node-config-provider": "^1.0.1",
+                "@smithy/node-http-handler": "^1.0.2",
+                "@smithy/protocol-http": "^1.0.1",
+                "@smithy/smithy-client": "^1.0.3",
+                "@smithy/types": "^1.0.0",
+                "@smithy/url-parser": "^1.0.1",
+                "@smithy/util-base64": "^1.0.1",
+                "@smithy/util-body-length-browser": "^1.0.1",
+                "@smithy/util-body-length-node": "^1.0.1",
+                "@smithy/util-defaults-mode-browser": "^1.0.1",
+                "@smithy/util-defaults-mode-node": "^1.0.1",
+                "@smithy/util-retry": "^1.0.2",
+                "@smithy/util-utf8": "^1.0.1",
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/@amzn/sagemaker-client/node_modules/@aws-sdk/client-sts": {
+            "version": "3.363.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.363.0.tgz",
+            "integrity": "sha512-0jj14WvBPJQ8xr72cL0mhlmQ90tF0O0wqXwSbtog6PsC8+KDE6Yf+WsxsumyI8E5O8u3eYijBL+KdqG07F/y/w==",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "3.0.0",
+                "@aws-crypto/sha256-js": "3.0.0",
+                "@aws-sdk/credential-provider-node": "3.363.0",
+                "@aws-sdk/middleware-host-header": "3.363.0",
+                "@aws-sdk/middleware-logger": "3.363.0",
+                "@aws-sdk/middleware-recursion-detection": "3.363.0",
+                "@aws-sdk/middleware-sdk-sts": "3.363.0",
+                "@aws-sdk/middleware-signing": "3.363.0",
+                "@aws-sdk/middleware-user-agent": "3.363.0",
+                "@aws-sdk/types": "3.357.0",
+                "@aws-sdk/util-endpoints": "3.357.0",
+                "@aws-sdk/util-user-agent-browser": "3.363.0",
+                "@aws-sdk/util-user-agent-node": "3.363.0",
+                "@smithy/config-resolver": "^1.0.1",
+                "@smithy/fetch-http-handler": "^1.0.1",
+                "@smithy/hash-node": "^1.0.1",
+                "@smithy/invalid-dependency": "^1.0.1",
+                "@smithy/middleware-content-length": "^1.0.1",
+                "@smithy/middleware-endpoint": "^1.0.1",
+                "@smithy/middleware-retry": "^1.0.1",
+                "@smithy/middleware-serde": "^1.0.1",
+                "@smithy/middleware-stack": "^1.0.1",
+                "@smithy/node-config-provider": "^1.0.1",
+                "@smithy/node-http-handler": "^1.0.1",
+                "@smithy/protocol-http": "^1.1.0",
+                "@smithy/smithy-client": "^1.0.2",
+                "@smithy/types": "^1.1.0",
+                "@smithy/url-parser": "^1.0.1",
+                "@smithy/util-base64": "^1.0.1",
+                "@smithy/util-body-length-browser": "^1.0.1",
+                "@smithy/util-body-length-node": "^1.0.1",
+                "@smithy/util-defaults-mode-browser": "^1.0.1",
+                "@smithy/util-defaults-mode-node": "^1.0.1",
+                "@smithy/util-retry": "^1.0.1",
+                "@smithy/util-utf8": "^1.0.1",
+                "fast-xml-parser": "4.2.5",
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/@amzn/sagemaker-client/node_modules/@aws-sdk/credential-provider-env": {
+            "version": "3.363.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.363.0.tgz",
+            "integrity": "sha512-VAQ3zITT2Q0acht0HezouYnMFKZ2vIOa20X4zQA3WI0HfaP4D6ga6KaenbDcb/4VFiqfqiRHfdyXHP0ThcDRMA==",
+            "dependencies": {
+                "@aws-sdk/types": "3.357.0",
+                "@smithy/property-provider": "^1.0.1",
+                "@smithy/types": "^1.1.0",
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/@amzn/sagemaker-client/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.363.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.363.0.tgz",
+            "integrity": "sha512-ZYN+INoqyX5FVC3rqUxB6O8nOWkr0gHRRBm1suoOlmuFJ/WSlW/uUGthRBY5x1AQQnBF8cpdlxZzGHd41lFVNw==",
+            "dependencies": {
+                "@aws-sdk/credential-provider-env": "3.363.0",
+                "@aws-sdk/credential-provider-process": "3.363.0",
+                "@aws-sdk/credential-provider-sso": "3.363.0",
+                "@aws-sdk/credential-provider-web-identity": "3.363.0",
+                "@aws-sdk/types": "3.357.0",
+                "@smithy/credential-provider-imds": "^1.0.1",
+                "@smithy/property-provider": "^1.0.1",
+                "@smithy/shared-ini-file-loader": "^1.0.1",
+                "@smithy/types": "^1.1.0",
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/@amzn/sagemaker-client/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.363.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.363.0.tgz",
+            "integrity": "sha512-C1qXFIN2yMxD6pGgug0vR1UhScOki6VqdzuBHzXZAGu7MOjvgHNdscEcb3CpWnITHaPL2ztkiw75T1sZ7oIgQg==",
             "dependencies": {
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
+                "@aws-sdk/credential-provider-env": "3.363.0",
+                "@aws-sdk/credential-provider-ini": "3.363.0",
+                "@aws-sdk/credential-provider-process": "3.363.0",
+                "@aws-sdk/credential-provider-sso": "3.363.0",
+                "@aws-sdk/credential-provider-web-identity": "3.363.0",
+                "@aws-sdk/types": "3.357.0",
+                "@smithy/credential-provider-imds": "^1.0.1",
+                "@smithy/property-provider": "^1.0.1",
+                "@smithy/shared-ini-file-loader": "^1.0.1",
+                "@smithy/types": "^1.1.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/abort-controller/node_modules/@aws-sdk/types": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-            "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@aws-sdk/credential-provider-process": {
+            "version": "3.363.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.363.0.tgz",
+            "integrity": "sha512-fOKAINU7Rtj2T8pP13GdCt+u0Ml3gYynp8ki+1jMZIQ+Ju/MdDOqZpKMFKicMn3Z1ttUOgqr+grUdus6z8ceBQ==",
+            "dependencies": {
+                "@aws-sdk/types": "3.357.0",
+                "@smithy/property-provider": "^1.0.1",
+                "@smithy/shared-ini-file-loader": "^1.0.1",
+                "@smithy/types": "^1.1.0",
+                "tslib": "^2.5.0"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/client-sso": {
-            "version": "3.181.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.181.0.tgz",
-            "integrity": "sha512-p/HsYVAO7fgjFfn4LqlnlpSKPXGPegAwjPpY+SqyK3/Hj1OtED4whG8LTgxZSTtYwNIkHEjrHnXTiymyXh34Aw==",
-            "dependencies": {
-                "@aws-crypto/sha256-browser": "2.0.0",
-                "@aws-crypto/sha256-js": "2.0.0",
-                "@aws-sdk/config-resolver": "3.178.0",
-                "@aws-sdk/fetch-http-handler": "3.178.0",
-                "@aws-sdk/hash-node": "3.178.0",
-                "@aws-sdk/invalid-dependency": "3.178.0",
-                "@aws-sdk/middleware-content-length": "3.178.0",
-                "@aws-sdk/middleware-host-header": "3.178.0",
-                "@aws-sdk/middleware-logger": "3.178.0",
-                "@aws-sdk/middleware-recursion-detection": "3.178.0",
-                "@aws-sdk/middleware-retry": "3.178.0",
-                "@aws-sdk/middleware-serde": "3.178.0",
-                "@aws-sdk/middleware-stack": "3.178.0",
-                "@aws-sdk/middleware-user-agent": "3.178.0",
-                "@aws-sdk/node-config-provider": "3.178.0",
-                "@aws-sdk/node-http-handler": "3.178.0",
-                "@aws-sdk/protocol-http": "3.178.0",
-                "@aws-sdk/smithy-client": "3.180.0",
-                "@aws-sdk/types": "3.178.0",
-                "@aws-sdk/url-parser": "3.178.0",
-                "@aws-sdk/util-base64-browser": "3.170.0",
-                "@aws-sdk/util-base64-node": "3.170.0",
-                "@aws-sdk/util-body-length-browser": "3.170.0",
-                "@aws-sdk/util-body-length-node": "3.170.0",
-                "@aws-sdk/util-defaults-mode-browser": "3.180.0",
-                "@aws-sdk/util-defaults-mode-node": "3.180.0",
-                "@aws-sdk/util-user-agent-browser": "3.178.0",
-                "@aws-sdk/util-user-agent-node": "3.178.0",
-                "@aws-sdk/util-utf8-browser": "3.170.0",
-                "@aws-sdk/util-utf8-node": "3.170.0",
-                "tslib": "^2.3.1"
+        "node_modules/@amzn/sagemaker-client/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.363.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.363.0.tgz",
+            "integrity": "sha512-5RUZ5oM0lwZSo3EehT0dXggOjgtxFogpT3cZvoLGtIwrPBvm8jOQPXQUlaqCj10ThF1sYltEyukz/ovtDwYGew==",
+            "dependencies": {
+                "@aws-sdk/client-sso": "3.363.0",
+                "@aws-sdk/token-providers": "3.363.0",
+                "@aws-sdk/types": "3.357.0",
+                "@smithy/property-provider": "^1.0.1",
+                "@smithy/shared-ini-file-loader": "^1.0.1",
+                "@smithy/types": "^1.1.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">=12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/client-sso-oidc": {
-            "version": "3.181.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.181.0.tgz",
-            "integrity": "sha512-cMrEVAgLDM4AlGuMS6uzWSCYohIth2FcqWq4102lWve2kPQK5E6bl3SdWFLOIZc75ladkbwUXivBYtjNtLeRQA==",
-            "dependencies": {
-                "@aws-crypto/sha256-browser": "2.0.0",
-                "@aws-crypto/sha256-js": "2.0.0",
-                "@aws-sdk/config-resolver": "3.178.0",
-                "@aws-sdk/fetch-http-handler": "3.178.0",
-                "@aws-sdk/hash-node": "3.178.0",
-                "@aws-sdk/invalid-dependency": "3.178.0",
-                "@aws-sdk/middleware-content-length": "3.178.0",
-                "@aws-sdk/middleware-host-header": "3.178.0",
-                "@aws-sdk/middleware-logger": "3.178.0",
-                "@aws-sdk/middleware-recursion-detection": "3.178.0",
-                "@aws-sdk/middleware-retry": "3.178.0",
-                "@aws-sdk/middleware-serde": "3.178.0",
-                "@aws-sdk/middleware-stack": "3.178.0",
-                "@aws-sdk/middleware-user-agent": "3.178.0",
-                "@aws-sdk/node-config-provider": "3.178.0",
-                "@aws-sdk/node-http-handler": "3.178.0",
-                "@aws-sdk/protocol-http": "3.178.0",
-                "@aws-sdk/smithy-client": "3.180.0",
-                "@aws-sdk/types": "3.178.0",
-                "@aws-sdk/url-parser": "3.178.0",
-                "@aws-sdk/util-base64-browser": "3.170.0",
-                "@aws-sdk/util-base64-node": "3.170.0",
-                "@aws-sdk/util-body-length-browser": "3.170.0",
-                "@aws-sdk/util-body-length-node": "3.170.0",
-                "@aws-sdk/util-defaults-mode-browser": "3.180.0",
-                "@aws-sdk/util-defaults-mode-node": "3.180.0",
-                "@aws-sdk/util-user-agent-browser": "3.178.0",
-                "@aws-sdk/util-user-agent-node": "3.178.0",
-                "@aws-sdk/util-utf8-browser": "3.170.0",
-                "@aws-sdk/util-utf8-node": "3.170.0",
-                "tslib": "^2.3.1"
+        "node_modules/@amzn/sagemaker-client/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.363.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.363.0.tgz",
+            "integrity": "sha512-Z6w7fjgy79pAax580wdixbStQw10xfyZ+hOYLcPudoYFKjoNx0NQBejg5SwBzCF/HQL23Ksm9kDfbXDX9fkPhA==",
+            "dependencies": {
+                "@aws-sdk/types": "3.357.0",
+                "@smithy/property-provider": "^1.0.1",
+                "@smithy/types": "^1.1.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">=12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/client-sso-oidc/node_modules/@aws-sdk/types": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-            "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.363.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.363.0.tgz",
+            "integrity": "sha512-FobpclDCf5Y1ueyJDmb9MqguAdPssNMlnqWQpujhYVABq69KHu73fSCWSauFPUrw7YOpV8kG1uagDF0POSxHzA==",
+            "dependencies": {
+                "@aws-sdk/types": "3.357.0",
+                "@smithy/protocol-http": "^1.1.0",
+                "@smithy/types": "^1.1.0",
+                "tslib": "^2.5.0"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/client-sso/node_modules/@aws-sdk/types": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-            "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.363.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.363.0.tgz",
+            "integrity": "sha512-SSGgthScYnFGTOw8EzbkvquqweFmvn7uJihkpFekbtBNGC/jGOGO+8ziHjTQ8t/iI/YKubEwv+LMi0f77HKSEg==",
+            "dependencies": {
+                "@aws-sdk/types": "3.357.0",
+                "@smithy/types": "^1.1.0",
+                "tslib": "^2.5.0"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/config-resolver": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.178.0.tgz",
-            "integrity": "sha512-8xL98TGMaVULIN7HRWV2q1o0Y2p38QuweehzM8yXCZrrLOyHgWo3waP2RNVeddOB7MrSwwU/gw9rXSv7YHLZ6w==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.363.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.363.0.tgz",
+            "integrity": "sha512-MWD/57QgI/N7fG8rtzDTUdSqNpYohQfgj9XCFAoVeI/bU4usrkOrew43L4smJG4XrDxlNT8lSJlDtd64tuiUZA==",
             "dependencies": {
-                "@aws-sdk/signature-v4": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "@aws-sdk/util-config-provider": "3.170.0",
-                "@aws-sdk/util-middleware": "3.178.0",
-                "tslib": "^2.3.1"
+                "@aws-sdk/types": "3.357.0",
+                "@smithy/protocol-http": "^1.1.0",
+                "@smithy/types": "^1.1.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/config-resolver/node_modules/@aws-sdk/types": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-            "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.363.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.363.0.tgz",
+            "integrity": "sha512-ri8YaQvXP6odteVTMfxPqFR26Q0h9ejtqhUDv47P34FaKXedEM4nC6ix6o+5FEYj6l8syGyktftZ5O70NoEhug==",
+            "dependencies": {
+                "@aws-sdk/types": "3.357.0",
+                "@aws-sdk/util-endpoints": "3.357.0",
+                "@smithy/protocol-http": "^1.1.0",
+                "@smithy/types": "^1.1.0",
+                "tslib": "^2.5.0"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-env": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.46.0.tgz",
-            "integrity": "sha512-dBCyVBJ1nVi+lvM1jV6LFw8FpGjdeCglLMTmZUxJLBMh/Lp+GWtnGxd7u38WnH5gxKC4xLnYj9zP1t0ha1tGzQ==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@aws-sdk/token-providers": {
+            "version": "3.363.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.363.0.tgz",
+            "integrity": "sha512-6+0aJ1zugNgsMmhTtW2LBWxOVSaXCUk2q3xyTchSXkNzallYaRiZMRkieW+pKNntnu0g5H1T0zyfCO0tbXwxEA==",
             "dependencies": {
-                "@aws-sdk/property-provider": "3.46.0",
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0"
+                "@aws-sdk/client-sso-oidc": "3.363.0",
+                "@aws-sdk/types": "3.357.0",
+                "@smithy/property-provider": "^1.0.1",
+                "@smithy/shared-ini-file-loader": "^1.0.1",
+                "@smithy/types": "^1.1.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-env/node_modules/@aws-sdk/property-provider": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.46.0.tgz",
-            "integrity": "sha512-e3Jcds7G1Hg5VDvwLox0HlQq4G2fvmkO1BRPvM8WfRGvxRNK40dqoelm2NMtbNK0KgFPIpKsGeX1UhZDt9Od9w==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@aws-sdk/types": {
+            "version": "3.357.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.357.0.tgz",
+            "integrity": "sha512-/riCRaXg3p71BeWnShrai0y0QTdXcouPSM0Cn1olZbzTf7s71aLEewrc96qFrL70XhY4XvnxMpqQh+r43XIL3g==",
             "dependencies": {
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0"
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-env/node_modules/@aws-sdk/types": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.46.0.tgz",
-            "integrity": "sha512-yhrkVVyv4RUt3KqDDyEayjBM5dRBtuS486THeqtSghUYNV7M/cW18TA3gdMC0pRGgUqfKrOysdBZjCyPrYNvuA==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.357.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.357.0.tgz",
+            "integrity": "sha512-XHKyS5JClT9su9hDif715jpZiWHQF9gKZXER8tW0gOizU3R9cyWc9EsJ2BRhFNhi7nt/JF/CLUEc5qDx3ETbUw==",
+            "dependencies": {
+                "@aws-sdk/types": "3.357.0",
+                "tslib": "^2.5.0"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-imds": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.46.0.tgz",
-            "integrity": "sha512-nQidNDq6mjas/wFOi9XvHkvNmzM/XdSB/eRh6CH+wQeb8RjAlGm2Ivg0mpz/iIxjPXDIduW8aI/gFU3+3um6CQ==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.363.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.363.0.tgz",
+            "integrity": "sha512-fk9ymBUIYbxiGm99Cn+kAAXmvMCWTf/cHAcB79oCXV4ELXdPa9lN5xQhZRFNxLUeXG4OAMEuCAUUuZEj8Fnc1Q==",
             "dependencies": {
-                "@aws-sdk/node-config-provider": "3.46.0",
-                "@aws-sdk/property-provider": "3.46.0",
-                "@aws-sdk/types": "3.46.0",
-                "@aws-sdk/url-parser": "3.46.0",
-                "tslib": "^2.3.0"
-            },
-            "engines": {
-                "node": ">= 12.0.0"
+                "@aws-sdk/types": "3.357.0",
+                "@smithy/types": "^1.1.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.5.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-imds/node_modules/@aws-sdk/node-config-provider": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.46.0.tgz",
-            "integrity": "sha512-Hzz860d1GNZSSX74TywfUu125l8BT6JkJuKG0QDhuC+9xklNfC1hgziihldHu6xL7DzY5UKgjyzdNBQfqCqLbw==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.363.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.363.0.tgz",
+            "integrity": "sha512-Fli/dvgGA9hdnQUrYb1//wNSFlK2jAfdJcfNXA6SeBYzSeH5pVGYF4kXF0FCdnMA3Fef+Zn1zAP/hw9v8VJHWQ==",
             "dependencies": {
-                "@aws-sdk/property-provider": "3.46.0",
-                "@aws-sdk/shared-ini-file-loader": "3.46.0",
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0"
+                "@aws-sdk/types": "3.357.0",
+                "@smithy/node-config-provider": "^1.0.1",
+                "@smithy/types": "^1.1.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
+            },
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
             }
         },
-        "node_modules/@aws-sdk/credential-provider-imds/node_modules/@aws-sdk/property-provider": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.46.0.tgz",
-            "integrity": "sha512-e3Jcds7G1Hg5VDvwLox0HlQq4G2fvmkO1BRPvM8WfRGvxRNK40dqoelm2NMtbNK0KgFPIpKsGeX1UhZDt9Od9w==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/abort-controller": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-1.1.0.tgz",
+            "integrity": "sha512-5imgGUlZL4dW4YWdMYAKLmal9ny/tlenM81QZY7xYyb76z9Z/QOg7oM5Ak9HQl8QfFTlGVWwcMXl+54jroRgEQ==",
             "dependencies": {
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0"
+                "@smithy/types": "^1.2.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-imds/node_modules/@aws-sdk/querystring-parser": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.46.0.tgz",
-            "integrity": "sha512-xxTnIXLbx4Jq16Utza7wh4HpPfVyCL0c+6NU2t+kXZ2sgOWhx2XAhShcZVbEkA/61UAMEIhyNBVE+z9OFz6X5g==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/config-resolver": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-1.1.0.tgz",
+            "integrity": "sha512-7WD9eZHp46BxAjNGHJLmxhhyeiNWkBdVStd7SUJPUZqQGeIO/REtIrcIfKUfdiHTQ9jyu2SYoqvzqqaFc6987w==",
             "dependencies": {
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0"
+                "@smithy/types": "^1.2.0",
+                "@smithy/util-config-provider": "^1.1.0",
+                "@smithy/util-middleware": "^1.1.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-imds/node_modules/@aws-sdk/shared-ini-file-loader": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.46.0.tgz",
-            "integrity": "sha512-Rp7Z1X23kvyRCziOxXu2PYCCPT5CQ5t8O4WoKrEkMT9Vqm2gluXOcCnL4iOpRkSRGEZT7lfe5OCM8ApNRTIHpQ==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/credential-provider-imds": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-1.1.0.tgz",
+            "integrity": "sha512-kUMOdEu3RP6ozH0Ga8OeMP8gSkBsK1UqZZKyPLFnpZHrtZuHSSt7M7gsHYB/bYQBZAo3o7qrGmRty3BubYtYxQ==",
             "dependencies": {
-                "tslib": "^2.3.0"
+                "@smithy/node-config-provider": "^1.1.0",
+                "@smithy/property-provider": "^1.2.0",
+                "@smithy/types": "^1.2.0",
+                "@smithy/url-parser": "^1.1.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-imds/node_modules/@aws-sdk/types": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.46.0.tgz",
-            "integrity": "sha512-yhrkVVyv4RUt3KqDDyEayjBM5dRBtuS486THeqtSghUYNV7M/cW18TA3gdMC0pRGgUqfKrOysdBZjCyPrYNvuA==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/fetch-http-handler": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-1.1.0.tgz",
+            "integrity": "sha512-N22C9R44u5WGlcY+Wuv8EXmCAq62wWwriRAuoczMEwAIjPbvHSthyPSLqI4S7kAST1j6niWg8kwpeJ3ReAv3xg==",
+            "dependencies": {
+                "@smithy/protocol-http": "^1.2.0",
+                "@smithy/querystring-builder": "^1.1.0",
+                "@smithy/types": "^1.2.0",
+                "@smithy/util-base64": "^1.1.0",
+                "tslib": "^2.5.0"
+            }
+        },
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/hash-node": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-1.1.0.tgz",
+            "integrity": "sha512-yiNKDGMzrQjnpnbLfkYKo+HwIxmBAsv0AI++QIJwvhfkLpUTBylelkv6oo78/YqZZS6h+bGfl0gILJsKE2wAKQ==",
+            "dependencies": {
+                "@smithy/types": "^1.2.0",
+                "@smithy/util-buffer-from": "^1.1.0",
+                "@smithy/util-utf8": "^1.1.0",
+                "tslib": "^2.5.0"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-imds/node_modules/@aws-sdk/url-parser": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.46.0.tgz",
-            "integrity": "sha512-foMB0AC3QDy+KfvRxsMXvJQZXr9CMzdupcNIXwKRZog82tEEc09dVeUjuJrO4H+A2eK84SyawRfy+ow+LRqvqw==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/invalid-dependency": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-1.1.0.tgz",
+            "integrity": "sha512-h2rXn68ClTwzPXYzEUNkz+0B/A0Hz8YdFNTiEwlxkwzkETGKMxmsrQGFXwYm3jd736R5vkXcClXz1ddKrsaBEQ==",
             "dependencies": {
-                "@aws-sdk/querystring-parser": "3.46.0",
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0"
+                "@smithy/types": "^1.2.0",
+                "tslib": "^2.5.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-ini": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.46.0.tgz",
-            "integrity": "sha512-D+3YLWzCaFUUcbLHAsJIoaI8AhoSpIl3c0a3spVN64f+V1XtwunbJO6VXsIF78RLe0kTP7IA/Rey86ydQVeqcw==",
-            "dependencies": {
-                "@aws-sdk/credential-provider-env": "3.46.0",
-                "@aws-sdk/credential-provider-imds": "3.46.0",
-                "@aws-sdk/credential-provider-sso": "3.46.0",
-                "@aws-sdk/credential-provider-web-identity": "3.46.0",
-                "@aws-sdk/property-provider": "3.46.0",
-                "@aws-sdk/shared-ini-file-loader": "3.46.0",
-                "@aws-sdk/types": "3.46.0",
-                "@aws-sdk/util-credentials": "3.46.0",
-                "tslib": "^2.3.0"
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/is-array-buffer": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-1.1.0.tgz",
+            "integrity": "sha512-twpQ/n+3OWZJ7Z+xu43MJErmhB/WO/mMTnqR6PwWQShvSJ/emx5d1N59LQZk6ZpTAeuRWrc+eHhkzTp9NFjNRQ==",
+            "dependencies": {
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/property-provider": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.46.0.tgz",
-            "integrity": "sha512-e3Jcds7G1Hg5VDvwLox0HlQq4G2fvmkO1BRPvM8WfRGvxRNK40dqoelm2NMtbNK0KgFPIpKsGeX1UhZDt9Od9w==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/middleware-content-length": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-1.1.0.tgz",
+            "integrity": "sha512-iNxwhZ7Xc5+LjeDElEOi/Nh8fFsc9Dw9+5w7h7/GLFIU0RgAwBJuJtcP1vNTOwzW4B3hG+gRu8sQLqA9OEaTwA==",
             "dependencies": {
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0"
+                "@smithy/protocol-http": "^1.2.0",
+                "@smithy/types": "^1.2.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/shared-ini-file-loader": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.46.0.tgz",
-            "integrity": "sha512-Rp7Z1X23kvyRCziOxXu2PYCCPT5CQ5t8O4WoKrEkMT9Vqm2gluXOcCnL4iOpRkSRGEZT7lfe5OCM8ApNRTIHpQ==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/middleware-endpoint": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-1.1.0.tgz",
+            "integrity": "sha512-PvpazNjVpxX2ICrzoFYCpFnjB39DKCpZds8lRpAB3p6HGrx6QHBaNvOzVhJGBf0jcAbfCdc5/W0n9z8VWaSSww==",
             "dependencies": {
-                "tslib": "^2.3.0"
+                "@smithy/middleware-serde": "^1.1.0",
+                "@smithy/types": "^1.2.0",
+                "@smithy/url-parser": "^1.1.0",
+                "@smithy/util-middleware": "^1.1.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/types": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.46.0.tgz",
-            "integrity": "sha512-yhrkVVyv4RUt3KqDDyEayjBM5dRBtuS486THeqtSghUYNV7M/cW18TA3gdMC0pRGgUqfKrOysdBZjCyPrYNvuA==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/middleware-retry": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-1.1.0.tgz",
+            "integrity": "sha512-lINKYxIvT+W20YFOtHBKeGm7npuJg0/YCoShttU7fVpsmU+a2rdb9zrJn1MHqWfUL6DhTAWGa0tH2O7l4XrDcw==",
+            "dependencies": {
+                "@smithy/protocol-http": "^1.2.0",
+                "@smithy/service-error-classification": "^1.1.0",
+                "@smithy/types": "^1.2.0",
+                "@smithy/util-middleware": "^1.1.0",
+                "@smithy/util-retry": "^1.1.0",
+                "tslib": "^2.5.0",
+                "uuid": "^8.3.2"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/util-credentials": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-credentials/-/util-credentials-3.46.0.tgz",
-            "integrity": "sha512-d5bDyCDVYi6ThBY8AntAKooExayFuLUnCXsDkmmWpHlp26JZv9s1/DsXR219ELgu8jIAWiID54HjfEYf8qa6Vw==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/middleware-serde": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-1.1.0.tgz",
+            "integrity": "sha512-RiBMxhxuO9VTjHsjJvhzViyceoLhU6gtrnJGpAXY43wE49IstXIGEQz8MT50/hOq5EumX16FCpup0r5DVyfqNQ==",
             "dependencies": {
-                "@aws-sdk/shared-ini-file-loader": "3.46.0",
-                "tslib": "^2.3.0"
+                "@smithy/types": "^1.2.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-process": {
-            "version": "3.37.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.37.0.tgz",
-            "integrity": "sha512-VOfWtUBbICb7xEHRFN7+fRA+move/3HT4mZt7C5KBXIaILT3b8hrK1mT/fRQ3dx9dF56PEGj/WkACOBjMzIcdg==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/middleware-stack": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-1.1.0.tgz",
+            "integrity": "sha512-XynYiIvXNea2BbLcppvpNK0zu8o2woJqgnmxqYTn4FWagH/Hr2QIk8LOsUz7BIJ4tooFhmx8urHKCdlPbbPDCA==",
             "dependencies": {
-                "@aws-sdk/property-provider": "3.37.0",
-                "@aws-sdk/shared-ini-file-loader": "3.37.0",
-                "@aws-sdk/types": "3.37.0",
-                "@aws-sdk/util-credentials": "3.37.0",
-                "tslib": "^2.3.0"
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 10.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.46.0.tgz",
-            "integrity": "sha512-y3zv6FtaEu1cjtun6vQ1S/2aya70cPjCcoQhSrsH9TDYXp/ZRk4PN6xdVGGpkZX2kZhowGU5DvhOGK48IqrNZg==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/node-config-provider": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-1.1.0.tgz",
+            "integrity": "sha512-2G4TlzUnmTrUY26VKTonQqydwb+gtM/mcl+TqDP8CnWtJKVL8ElPpKgLGScP04bPIRY9x2/10lDdoaRXDqPuCw==",
             "dependencies": {
-                "@aws-sdk/client-sso": "3.46.0",
-                "@aws-sdk/property-provider": "3.46.0",
-                "@aws-sdk/shared-ini-file-loader": "3.46.0",
-                "@aws-sdk/types": "3.46.0",
-                "@aws-sdk/util-credentials": "3.46.0",
-                "tslib": "^2.3.0"
+                "@smithy/property-provider": "^1.2.0",
+                "@smithy/shared-ini-file-loader": "^1.1.0",
+                "@smithy/types": "^1.2.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/abort-controller": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.46.0.tgz",
-            "integrity": "sha512-XrCocRwajh3jkI/Y2PCZjYUZcJfmCa4DYM5nnW2+w4o7ez7vXEQ1j5FCI+/ogJIqfccnmEIlLZGlfzmc6vVbJw==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/node-http-handler": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-1.1.0.tgz",
+            "integrity": "sha512-d3kRriEgaIiGXLziAM8bjnaLn1fthCJeTLZIwEIpzQqe6yPX0a+yQoLCTyjb2fvdLwkMoG4p7THIIB5cj5lkbg==",
             "dependencies": {
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0"
+                "@smithy/abort-controller": "^1.1.0",
+                "@smithy/protocol-http": "^1.2.0",
+                "@smithy/querystring-builder": "^1.1.0",
+                "@smithy/types": "^1.2.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/client-sso": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.46.0.tgz",
-            "integrity": "sha512-n+dHT9azUW4pFA7a98gV/qFYdNwoMQ/4Y4tvPE28s9CKx8O0OIDlOwLPrhSBETCuRJNfnug1vNnFIzvOapfCkg==",
-            "dependencies": {
-                "@aws-crypto/sha256-browser": "2.0.0",
-                "@aws-crypto/sha256-js": "2.0.0",
-                "@aws-sdk/config-resolver": "3.46.0",
-                "@aws-sdk/fetch-http-handler": "3.46.0",
-                "@aws-sdk/hash-node": "3.46.0",
-                "@aws-sdk/invalid-dependency": "3.46.0",
-                "@aws-sdk/middleware-content-length": "3.46.0",
-                "@aws-sdk/middleware-host-header": "3.46.0",
-                "@aws-sdk/middleware-logger": "3.46.0",
-                "@aws-sdk/middleware-retry": "3.46.0",
-                "@aws-sdk/middleware-serde": "3.46.0",
-                "@aws-sdk/middleware-stack": "3.46.0",
-                "@aws-sdk/middleware-user-agent": "3.46.0",
-                "@aws-sdk/node-config-provider": "3.46.0",
-                "@aws-sdk/node-http-handler": "3.46.0",
-                "@aws-sdk/protocol-http": "3.46.0",
-                "@aws-sdk/smithy-client": "3.46.0",
-                "@aws-sdk/types": "3.46.0",
-                "@aws-sdk/url-parser": "3.46.0",
-                "@aws-sdk/util-base64-browser": "3.46.0",
-                "@aws-sdk/util-base64-node": "3.46.0",
-                "@aws-sdk/util-body-length-browser": "3.46.0",
-                "@aws-sdk/util-body-length-node": "3.46.0",
-                "@aws-sdk/util-user-agent-browser": "3.46.0",
-                "@aws-sdk/util-user-agent-node": "3.46.0",
-                "@aws-sdk/util-utf8-browser": "3.46.0",
-                "@aws-sdk/util-utf8-node": "3.46.0",
-                "tslib": "^2.3.0"
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/property-provider": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-1.2.0.tgz",
+            "integrity": "sha512-qlJd9gT751i4T0t/hJAyNGfESfi08Fek8QiLcysoKPgR05qHhG0OYhlaCJHhpXy4ECW0lHyjvFM1smrCLIXVfw==",
+            "dependencies": {
+                "@smithy/types": "^1.2.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">=12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/config-resolver": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.46.0.tgz",
-            "integrity": "sha512-R7YGDhvVE1VIS7uyjG3rZE1nrRu/+YVBq/pPlq5f4Tis3EoUooPfr5yYOVAuZI1CGsgycbCi6jnaqLGIfxUFmQ==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/protocol-http": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-1.2.0.tgz",
+            "integrity": "sha512-GfGfruksi3nXdFok5RhgtOnWe5f6BndzYfmEXISD+5gAGdayFGpjWu5pIqIweTudMtse20bGbc+7MFZXT1Tb8Q==",
             "dependencies": {
-                "@aws-sdk/signature-v4": "3.46.0",
-                "@aws-sdk/types": "3.46.0",
-                "@aws-sdk/util-config-provider": "3.46.0",
-                "tslib": "^2.3.0"
+                "@smithy/types": "^1.2.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/fetch-http-handler": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.46.0.tgz",
-            "integrity": "sha512-uOfdwbUCG+2LQ4iMkxD/izlzjnIrB5P5HtH7L5w1EFIsdxDXeFnnql0FaEcOvaEEg2rs9z0t+oLwMJZnNNtqAg==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/querystring-builder": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-1.1.0.tgz",
+            "integrity": "sha512-gDEi4LxIGLbdfjrjiY45QNbuDmpkwh9DX4xzrR2AzjjXpxwGyfSpbJaYhXARw9p17VH0h9UewnNQXNwaQyYMDA==",
             "dependencies": {
-                "@aws-sdk/protocol-http": "3.46.0",
-                "@aws-sdk/querystring-builder": "3.46.0",
-                "@aws-sdk/types": "3.46.0",
-                "@aws-sdk/util-base64-browser": "3.46.0",
-                "tslib": "^2.3.0"
+                "@smithy/types": "^1.2.0",
+                "@smithy/util-uri-escape": "^1.1.0",
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/hash-node": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.46.0.tgz",
-            "integrity": "sha512-rABF9k5uSJdqmwBeYnu+2+iWEmPNVsoBy9bwLvEmGfh557wAwh3dL5IDf+NiIFrd8GTOF/2HV1477XXBl15C0g==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/querystring-parser": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-1.1.0.tgz",
+            "integrity": "sha512-Lm/FZu2qW3XX+kZ4WPwr+7aAeHf1Lm84UjNkKyBu16XbmEV7ukfhXni2aIwS2rcVf8Yv5E7wchGGpOFldj9V4Q==",
             "dependencies": {
-                "@aws-sdk/types": "3.46.0",
-                "@aws-sdk/util-buffer-from": "3.46.0",
-                "tslib": "^2.3.0"
+                "@smithy/types": "^1.2.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/invalid-dependency": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.46.0.tgz",
-            "integrity": "sha512-KumWtDstAKpKRQbHA95AeHpBNtxCXHVbUk+nFAiXcBP281yEalUbyK0W5Q2bDl26L3z6zHodg3OJllHYavJKMg==",
-            "dependencies": {
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0"
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/service-error-classification": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-1.1.0.tgz",
+            "integrity": "sha512-OCTEeJ1igatd5kFrS2VDlYbainNNpf7Lj1siFOxnRWqYOP9oNvC5HOJBd3t+Z8MbrmehBtuDJ2QqeBsfeiNkww==",
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/is-array-buffer": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/is-array-buffer/-/is-array-buffer-3.46.0.tgz",
-            "integrity": "sha512-HcQtJgZDQgo7ivD79GF82pTf+zYGjsgzKG7lkUBEetSfkV0W8h6XfhN6DmuYQuCcu1Pt9IkN7haYNPiPdfDhvg==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/shared-ini-file-loader": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-1.1.0.tgz",
+            "integrity": "sha512-S/v33zvCWzFyGZGlsEF0XsZtNNR281UhR7byk3nRfsgw5lGpg51rK/zjMgulM+h6NSuXaFILaYrw1I1v4kMcuA==",
             "dependencies": {
-                "tslib": "^2.3.0"
+                "@smithy/types": "^1.2.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/middleware-content-length": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.46.0.tgz",
-            "integrity": "sha512-Vf17vKAZ9n2ZlkMoHmCXMHAJegw3djC8qxe2sGdHSGyozfJNpA77ec32ldLvBtQ82LPmSaqdhcbP0/oYCalnzA==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/smithy-client": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-1.1.0.tgz",
+            "integrity": "sha512-j32SGgVhv2G9nBTmel9u3OXux8KG20ssxuFakJrEeDug3kqbl1qrGzVLCe+Eib402UDtA0Sp1a4NZ2SEXDBxag==",
             "dependencies": {
-                "@aws-sdk/protocol-http": "3.46.0",
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0"
+                "@smithy/middleware-stack": "^1.1.0",
+                "@smithy/types": "^1.2.0",
+                "@smithy/util-stream": "^1.1.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/middleware-host-header": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.46.0.tgz",
-            "integrity": "sha512-I+WsUzpyzS9l5Dt64kyp7v+9KeYPOCviYmVw2kM1EZRdAeo+jiCRxU5LnDJ9ORxfRwGcEmQV7xb4UpqXcn2N6Q==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/types": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/@smithy/types/-/types-1.2.0.tgz",
+            "integrity": "sha512-z1r00TvBqF3dh4aHhya7nz1HhvCg4TRmw51fjMrh5do3h+ngSstt/yKlNbHeb9QxJmFbmN8KEVSWgb1bRvfEoA==",
             "dependencies": {
-                "@aws-sdk/protocol-http": "3.46.0",
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0"
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/middleware-logger": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.46.0.tgz",
-            "integrity": "sha512-xkB98tfZc1pSeks0a7jagYIVHxJfoxHX7wcASzBa3IjyodZpSqDW392edF9c3kSCv6G6PGRbG+F1F6j7ZTVpRQ==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/url-parser": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-1.1.0.tgz",
+            "integrity": "sha512-tpvi761kzboiLNGEWczuybMPCJh6WHB3cz9gWAG95mSyaKXmmX8ZcMxoV+irZfxDqLwZVJ22XTumu32S7Ow8aQ==",
             "dependencies": {
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0"
-            },
-            "engines": {
-                "node": ">= 12.0.0"
+                "@smithy/querystring-parser": "^1.1.0",
+                "@smithy/types": "^1.2.0",
+                "tslib": "^2.5.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/middleware-retry": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.46.0.tgz",
-            "integrity": "sha512-YkNNs2dUcriLwy4pYG7nfa850tD8dtFUeE/IQ+YBMbWDedT31UFkCfHUdjBK1GFbIv+G1N+ZVGBCkWq1OuhKXw==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/util-base64": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-1.1.0.tgz",
+            "integrity": "sha512-FpYmDmVbOXAxqvoVCwqehUN0zXS+lN8V7VS9O7I8MKeVHdSTsZzlwiMEvGoyTNOXWn8luF4CTDYgNHnZViR30g==",
             "dependencies": {
-                "@aws-sdk/protocol-http": "3.46.0",
-                "@aws-sdk/service-error-classification": "3.46.0",
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0",
-                "uuid": "^8.3.2"
+                "@smithy/util-buffer-from": "^1.1.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/middleware-serde": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.46.0.tgz",
-            "integrity": "sha512-5M56VUm/stsSabauHxFrv1BSoH0VPyMB1V4vewAD3cp5YGiUpChYxjhcBbzi0QvI65HLxa6nLedwrE+g1uVJ1Q==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/util-body-length-browser": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-1.1.0.tgz",
+            "integrity": "sha512-cep3ioRxzRZ2Jbp3Kly7gy6iNVefYXiT6ETt8W01RQr3uwi1YMkrbU1p3lMR4KhX/91Nrk6UOgX1RH+oIt48RQ==",
             "dependencies": {
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0"
+                "tslib": "^2.5.0"
+            }
+        },
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/util-body-length-node": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-1.1.0.tgz",
+            "integrity": "sha512-fRHRjkUuT5em4HZoshySXmB1n3HAU7IS232s+qU4TicexhyGJpXMK/2+c56ePOIa1FOK2tV1Q3J/7Mae35QVSw==",
+            "dependencies": {
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/middleware-stack": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.46.0.tgz",
-            "integrity": "sha512-+3SmpYo12i9Gn7L/HEJqAv5+OieZL9zfXungFKr96rTpcvYDZWQblTP3tugBtvGV6V4tzvebMkUTWxBB6p+dhQ==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/util-buffer-from": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-1.1.0.tgz",
+            "integrity": "sha512-9m6NXE0ww+ra5HKHCHig20T+FAwxBAm7DIdwc/767uGWbRcY720ybgPacQNB96JMOI7xVr/CDa3oMzKmW4a+kw==",
             "dependencies": {
-                "tslib": "^2.3.0"
+                "@smithy/is-array-buffer": "^1.1.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/middleware-user-agent": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.46.0.tgz",
-            "integrity": "sha512-n9VEWlIXxbJXCr2IpocNJQUW7dhCdAcPKmxV0T5LZ/AygKsLvbWy40u2Qm9/eB1MYpqiheeb5MsY3UXxHgnOlg==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/util-config-provider": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-1.1.0.tgz",
+            "integrity": "sha512-rQ47YpNmF6Is4I9GiE3T3+0xQ+r7RKRKbmHYyGSbyep/0cSf9kteKcI0ssJTvveJ1K4QvwrxXj1tEFp/G2UqxQ==",
             "dependencies": {
-                "@aws-sdk/protocol-http": "3.46.0",
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0"
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/node-config-provider": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.46.0.tgz",
-            "integrity": "sha512-Hzz860d1GNZSSX74TywfUu125l8BT6JkJuKG0QDhuC+9xklNfC1hgziihldHu6xL7DzY5UKgjyzdNBQfqCqLbw==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/util-defaults-mode-browser": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-1.1.0.tgz",
+            "integrity": "sha512-0bWhs1e412bfC5gwPCMe8Zbz0J8UoZ/meEQdo6MYj8Ne+c+QZ+KxVjx0a1dFYOclvM33SslL9dP0odn8kfblkg==",
             "dependencies": {
-                "@aws-sdk/property-provider": "3.46.0",
-                "@aws-sdk/shared-ini-file-loader": "3.46.0",
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0"
+                "@smithy/property-provider": "^1.2.0",
+                "@smithy/types": "^1.2.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">= 10.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/node-http-handler": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.46.0.tgz",
-            "integrity": "sha512-SqeKskt47u/ZIeN5b6lmjOAx0yLiY/WDQ6N9Z6LRJCYiSZ7oHflA1jPWkX20qWOKioa2iHBVTNNX2lu8yFkWbg==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/util-defaults-mode-node": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-1.1.0.tgz",
+            "integrity": "sha512-440e25TUH2b+TeK5CwsjYFrI9ShVOgA31CoxCKiv4ncSK4ZM68XW5opYxQmzMbRWARGEMu2XEUeBmOgMU2RLsw==",
             "dependencies": {
-                "@aws-sdk/abort-controller": "3.46.0",
-                "@aws-sdk/protocol-http": "3.46.0",
-                "@aws-sdk/querystring-builder": "3.46.0",
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0"
+                "@smithy/config-resolver": "^1.1.0",
+                "@smithy/credential-provider-imds": "^1.1.0",
+                "@smithy/node-config-provider": "^1.1.0",
+                "@smithy/property-provider": "^1.2.0",
+                "@smithy/types": "^1.2.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">= 10.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/property-provider": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.46.0.tgz",
-            "integrity": "sha512-e3Jcds7G1Hg5VDvwLox0HlQq4G2fvmkO1BRPvM8WfRGvxRNK40dqoelm2NMtbNK0KgFPIpKsGeX1UhZDt9Od9w==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/util-hex-encoding": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-1.1.0.tgz",
+            "integrity": "sha512-7UtIE9eH0u41zpB60Jzr0oNCQ3hMJUabMcKRUVjmyHTXiWDE4vjSqN6qlih7rCNeKGbioS7f/y2Jgym4QZcKFg==",
             "dependencies": {
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0"
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/protocol-http": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.46.0.tgz",
-            "integrity": "sha512-hKqHYEp/JDfOl5kZKp0CRgvbsg+c52Ss4KwuRoU9vA56VZ5TpfgHznajdme97xedsE40hnZeitv2BKEMbkYCqg==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/util-middleware": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-1.1.0.tgz",
+            "integrity": "sha512-6hhckcBqVgjWAqLy2vqlPZ3rfxLDhFWEmM7oLh2POGvsi7j0tHkbN7w4DFhuBExVJAbJ/qqxqZdRY6Fu7/OezQ==",
             "dependencies": {
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0"
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/querystring-builder": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.46.0.tgz",
-            "integrity": "sha512-YYGRK291ro+KR3TX0jjyGRdMGHn6D2CBD89oXj8tAV3djeMIpFSGDrEL+NKeJvp7aBNlEnQ9kSfzyQuzQVvJWA==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/util-retry": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-1.1.0.tgz",
+            "integrity": "sha512-ygQW5HBqYXpR3ua09UciS0sL7UGJzGiktrKkOuEJwARoUuzz40yaEGU6xd9Gs7KBmAaFC8gMfnghHtwZ2nyBCQ==",
             "dependencies": {
-                "@aws-sdk/types": "3.46.0",
-                "@aws-sdk/util-uri-escape": "3.46.0",
-                "tslib": "^2.3.0"
+                "@smithy/service-error-classification": "^1.1.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">= 14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/querystring-parser": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.46.0.tgz",
-            "integrity": "sha512-xxTnIXLbx4Jq16Utza7wh4HpPfVyCL0c+6NU2t+kXZ2sgOWhx2XAhShcZVbEkA/61UAMEIhyNBVE+z9OFz6X5g==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/util-stream": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-1.1.0.tgz",
+            "integrity": "sha512-w3lsdGsntaLQIrwDWJkIFKrFscgZXwU/oxsse09aSTNv5TckPhDeYea3LhsDrU5MGAG3vprhVZAKr33S45coVA==",
             "dependencies": {
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0"
+                "@smithy/fetch-http-handler": "^1.1.0",
+                "@smithy/node-http-handler": "^1.1.0",
+                "@smithy/types": "^1.2.0",
+                "@smithy/util-base64": "^1.1.0",
+                "@smithy/util-buffer-from": "^1.1.0",
+                "@smithy/util-hex-encoding": "^1.1.0",
+                "@smithy/util-utf8": "^1.1.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/service-error-classification": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.46.0.tgz",
-            "integrity": "sha512-hFDh/qtvKX9xUPxjGiDvumKsoO/3+eL4hi6X3qWN8lHg49wixjwcwlCEPn9jhdFJ9TRXc20CgPxWv4+V96Yf/A==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/util-uri-escape": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-1.1.0.tgz",
+            "integrity": "sha512-/jL/V1xdVRt5XppwiaEU8Etp5WHZj609n0xMTuehmCqdoOFbId1M+aEeDWZsQ+8JbEB/BJ6ynY2SlYmOaKtt8w==",
+            "dependencies": {
+                "tslib": "^2.5.0"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/shared-ini-file-loader": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.46.0.tgz",
-            "integrity": "sha512-Rp7Z1X23kvyRCziOxXu2PYCCPT5CQ5t8O4WoKrEkMT9Vqm2gluXOcCnL4iOpRkSRGEZT7lfe5OCM8ApNRTIHpQ==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/util-utf8": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-1.1.0.tgz",
+            "integrity": "sha512-p/MYV+JmqmPyjdgyN2UxAeYDj9cBqCjp0C/NsTWnnjoZUVqoeZ6IrW915L9CAKWVECgv9lVQGc4u/yz26/bI1A==",
             "dependencies": {
-                "tslib": "^2.3.0"
+                "@smithy/util-buffer-from": "^1.1.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/signature-v4": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.46.0.tgz",
-            "integrity": "sha512-qtI1t0CrEhVCxaezmmBpMe1WmQxdxho8oPiMEKWIUkkXQFg78Eg3jnXlLhjL4+MGHMqBB3mV7nGO6k8qu8H9rA==",
+        "node_modules/@amzn/sagemaker-client/node_modules/@smithy/util-waiter": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-1.1.0.tgz",
+            "integrity": "sha512-S6FNIB3UJT+5Efd/0DeziO5Rs82QAMODHW4v2V3oNRrwaBigY/7Yx3SiLudZuF9WpVsV08Ih3BjIH34nzZiinQ==",
             "dependencies": {
-                "@aws-sdk/is-array-buffer": "3.46.0",
-                "@aws-sdk/types": "3.46.0",
-                "@aws-sdk/util-hex-encoding": "3.46.0",
-                "@aws-sdk/util-uri-escape": "3.46.0",
-                "tslib": "^2.3.0"
+                "@smithy/abort-controller": "^1.1.0",
+                "@smithy/types": "^1.2.0",
+                "tslib": "^2.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=14.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/smithy-client": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.46.0.tgz",
-            "integrity": "sha512-Dzx4CR+rOkr5hXbLhnOfnrPWmSs4O9BTjFWD+4oh+RTXq0It8g+fWZxPcdvRCDU4GjS9Gtbkw0f0pN3FMCEszQ==",
+        "node_modules/@amzn/sagemaker-client/node_modules/fast-xml-parser": {
+            "version": "4.2.5",
+            "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz",
+            "integrity": "sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==",
+            "funding": [
+                {
+                    "type": "paypal",
+                    "url": "https://paypal.me/naturalintelligence"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/NaturalIntelligence"
+                }
+            ],
             "dependencies": {
-                "@aws-sdk/middleware-stack": "3.46.0",
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0"
+                "strnum": "^1.0.5"
             },
-            "engines": {
-                "node": ">= 12.0.0"
+            "bin": {
+                "fxparser": "src/cli/cli.js"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/types": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.46.0.tgz",
-            "integrity": "sha512-yhrkVVyv4RUt3KqDDyEayjBM5dRBtuS486THeqtSghUYNV7M/cW18TA3gdMC0pRGgUqfKrOysdBZjCyPrYNvuA==",
+        "node_modules/@amzn/sagemaker-client/node_modules/uuid": {
+            "version": "8.3.2",
+            "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+            "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+            "bin": {
+                "uuid": "dist/bin/uuid"
+            }
+        },
+        "node_modules/@aws-crypto/crc32": {
+            "version": "5.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/util": "^5.2.0",
+                "@aws-sdk/types": "^3.222.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/url-parser": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.46.0.tgz",
-            "integrity": "sha512-foMB0AC3QDy+KfvRxsMXvJQZXr9CMzdupcNIXwKRZog82tEEc09dVeUjuJrO4H+A2eK84SyawRfy+ow+LRqvqw==",
+        "node_modules/@aws-crypto/crc32c": {
+            "version": "5.2.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/querystring-parser": "3.46.0",
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0"
+                "@aws-crypto/util": "^5.2.0",
+                "@aws-sdk/types": "^3.222.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/util-base64-browser": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-base64-browser/-/util-base64-browser-3.46.0.tgz",
-            "integrity": "sha512-oDlExDHYVOXsHFwFCA+CxZlGiHWeO53l0xoohpTIwGV6u48jED/4GrNM6iWVT6Vwd4skqtRMM41IHXjtiCtp/g==",
+        "node_modules/@aws-crypto/ie11-detection": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-3.0.0.tgz",
+            "integrity": "sha512-341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q==",
             "dependencies": {
-                "tslib": "^2.3.0"
+                "tslib": "^1.11.1"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/util-base64-node": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-base64-node/-/util-base64-node-3.46.0.tgz",
-            "integrity": "sha512-/ruNBm21Ptk+IGhwTphs8j5oDCjNIrUSipDoRtUuMGQR9TnNzup0e+sJDqP0BrKKM+tcvqEUhz+MScxbwJrwmg==",
+        "node_modules/@aws-crypto/ie11-detection/node_modules/tslib": {
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+            "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        },
+        "node_modules/@aws-crypto/sha1-browser": {
+            "version": "5.2.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/util-buffer-from": "3.46.0",
-                "tslib": "^2.3.0"
-            },
-            "engines": {
-                "node": ">= 12.0.0"
+                "@aws-crypto/supports-web-crypto": "^5.2.0",
+                "@aws-crypto/util": "^5.2.0",
+                "@aws-sdk/types": "^3.222.0",
+                "@aws-sdk/util-locate-window": "^3.0.0",
+                "@smithy/util-utf8": "^2.0.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/util-body-length-browser": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.46.0.tgz",
-            "integrity": "sha512-OJgMlBv4gEdmHCdZO9htysz9GMw0mS7qB3I5CbZ2aBOM0NvmaU7nqI6zYCoEmGh0keq0CnMBlNZhBBAwtiKYqg==",
+        "node_modules/@aws-crypto/sha256-browser": {
+            "version": "5.2.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "tslib": "^2.3.0"
+                "@aws-crypto/sha256-js": "^5.2.0",
+                "@aws-crypto/supports-web-crypto": "^5.2.0",
+                "@aws-crypto/util": "^5.2.0",
+                "@aws-sdk/types": "^3.222.0",
+                "@aws-sdk/util-locate-window": "^3.0.0",
+                "@smithy/util-utf8": "^2.0.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/util-body-length-node": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.46.0.tgz",
-            "integrity": "sha512-jyD+2c7iaD4Aih93Fm4I183SbdhSy4FNmSlK49PctMVVF+QSpzQxAJvv/nTwq37Kb8orVvs+sgy2FF3lxfOUJg==",
+        "node_modules/@aws-crypto/sha256-js": {
+            "version": "5.2.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "tslib": "^2.3.0"
+                "@aws-crypto/util": "^5.2.0",
+                "@aws-sdk/types": "^3.222.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/util-buffer-from": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-buffer-from/-/util-buffer-from-3.46.0.tgz",
-            "integrity": "sha512-e3avbwAUULpPCk4ke9ctrhAwxcXvMv8FYymNJDEN7+9lqZ4XqAjPt+R+IEEFMEbWmIPeZ8TpLw3yuru1Z74iuA==",
+        "node_modules/@aws-crypto/supports-web-crypto": {
+            "version": "5.2.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/is-array-buffer": "3.46.0",
-                "tslib": "^2.3.0"
-            },
-            "engines": {
-                "node": ">= 12.0.0"
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/util-config-provider": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-config-provider/-/util-config-provider-3.46.0.tgz",
-            "integrity": "sha512-KzzusGkvmb1uy3EItl+9YRxOOtjmU6iaAi9pBzHR2fiv13EMVNZrycVFPeGwz6LrsAEumKmTAZjR6c8BRbxtjw==",
+        "node_modules/@aws-crypto/util": {
+            "version": "5.2.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "tslib": "^2.3.0"
+                "@aws-sdk/types": "^3.222.0",
+                "@smithy/util-utf8": "^2.0.0",
+                "tslib": "^2.6.2"
+            }
+        },
+        "node_modules/@aws-sdk/client-accessanalyzer": {
+            "version": "3.888.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-accessanalyzer/-/client-accessanalyzer-3.888.0.tgz",
+            "integrity": "sha512-wtyBy3z2sUvuJxEcQhere+ttQWIVx5GauJaYahWAWBRhuZIkqMMebKC0ofJMBSEGTRXL98L3G96pCwoIffFbBw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.888.0",
+                "@aws-sdk/credential-provider-node": "3.888.0",
+                "@aws-sdk/middleware-host-header": "3.887.0",
+                "@aws-sdk/middleware-logger": "3.887.0",
+                "@aws-sdk/middleware-recursion-detection": "3.887.0",
+                "@aws-sdk/middleware-user-agent": "3.888.0",
+                "@aws-sdk/region-config-resolver": "3.887.0",
+                "@aws-sdk/types": "3.887.0",
+                "@aws-sdk/util-endpoints": "3.887.0",
+                "@aws-sdk/util-user-agent-browser": "3.887.0",
+                "@aws-sdk/util-user-agent-node": "3.888.0",
+                "@smithy/config-resolver": "^4.2.1",
+                "@smithy/core": "^3.11.0",
+                "@smithy/fetch-http-handler": "^5.2.1",
+                "@smithy/hash-node": "^4.1.1",
+                "@smithy/invalid-dependency": "^4.1.1",
+                "@smithy/middleware-content-length": "^4.1.1",
+                "@smithy/middleware-endpoint": "^4.2.1",
+                "@smithy/middleware-retry": "^4.2.1",
+                "@smithy/middleware-serde": "^4.1.1",
+                "@smithy/middleware-stack": "^4.1.1",
+                "@smithy/node-config-provider": "^4.2.1",
+                "@smithy/node-http-handler": "^4.2.1",
+                "@smithy/protocol-http": "^5.2.1",
+                "@smithy/smithy-client": "^4.6.1",
+                "@smithy/types": "^4.5.0",
+                "@smithy/url-parser": "^4.1.1",
+                "@smithy/util-base64": "^4.1.0",
+                "@smithy/util-body-length-browser": "^4.1.0",
+                "@smithy/util-body-length-node": "^4.1.0",
+                "@smithy/util-defaults-mode-browser": "^4.1.1",
+                "@smithy/util-defaults-mode-node": "^4.1.1",
+                "@smithy/util-endpoints": "^3.1.1",
+                "@smithy/util-middleware": "^4.1.1",
+                "@smithy/util-retry": "^4.1.1",
+                "@smithy/util-utf8": "^4.1.0",
+                "@types/uuid": "^9.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@aws-sdk/client-sso": {
+            "version": "3.888.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.888.0.tgz",
+            "integrity": "sha512-8CLy/ehGKUmekjH+VtZJ4w40PqDg3u0K7uPziq/4P8Q7LLgsy8YQoHNbuY4am7JU3HWrqLXJI9aaz1+vPGPoWA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.888.0",
+                "@aws-sdk/middleware-host-header": "3.887.0",
+                "@aws-sdk/middleware-logger": "3.887.0",
+                "@aws-sdk/middleware-recursion-detection": "3.887.0",
+                "@aws-sdk/middleware-user-agent": "3.888.0",
+                "@aws-sdk/region-config-resolver": "3.887.0",
+                "@aws-sdk/types": "3.887.0",
+                "@aws-sdk/util-endpoints": "3.887.0",
+                "@aws-sdk/util-user-agent-browser": "3.887.0",
+                "@aws-sdk/util-user-agent-node": "3.888.0",
+                "@smithy/config-resolver": "^4.2.1",
+                "@smithy/core": "^3.11.0",
+                "@smithy/fetch-http-handler": "^5.2.1",
+                "@smithy/hash-node": "^4.1.1",
+                "@smithy/invalid-dependency": "^4.1.1",
+                "@smithy/middleware-content-length": "^4.1.1",
+                "@smithy/middleware-endpoint": "^4.2.1",
+                "@smithy/middleware-retry": "^4.2.1",
+                "@smithy/middleware-serde": "^4.1.1",
+                "@smithy/middleware-stack": "^4.1.1",
+                "@smithy/node-config-provider": "^4.2.1",
+                "@smithy/node-http-handler": "^4.2.1",
+                "@smithy/protocol-http": "^5.2.1",
+                "@smithy/smithy-client": "^4.6.1",
+                "@smithy/types": "^4.5.0",
+                "@smithy/url-parser": "^4.1.1",
+                "@smithy/util-base64": "^4.1.0",
+                "@smithy/util-body-length-browser": "^4.1.0",
+                "@smithy/util-body-length-node": "^4.1.0",
+                "@smithy/util-defaults-mode-browser": "^4.1.1",
+                "@smithy/util-defaults-mode-node": "^4.1.1",
+                "@smithy/util-endpoints": "^3.1.1",
+                "@smithy/util-middleware": "^4.1.1",
+                "@smithy/util-retry": "^4.1.1",
+                "@smithy/util-utf8": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@aws-sdk/core": {
+            "version": "3.888.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.888.0.tgz",
+            "integrity": "sha512-L3S2FZywACo4lmWv37Y4TbefuPJ1fXWyWwIJ3J4wkPYFJ47mmtUPqThlVrSbdTHkEjnZgJe5cRfxk0qCLsFh1w==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.887.0",
+                "@aws-sdk/xml-builder": "3.887.0",
+                "@smithy/core": "^3.11.0",
+                "@smithy/node-config-provider": "^4.2.1",
+                "@smithy/property-provider": "^4.0.5",
+                "@smithy/protocol-http": "^5.2.1",
+                "@smithy/signature-v4": "^5.1.3",
+                "@smithy/smithy-client": "^4.6.1",
+                "@smithy/types": "^4.5.0",
+                "@smithy/util-base64": "^4.1.0",
+                "@smithy/util-body-length-browser": "^4.1.0",
+                "@smithy/util-middleware": "^4.1.1",
+                "@smithy/util-utf8": "^4.1.0",
+                "fast-xml-parser": "5.2.5",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@aws-sdk/credential-provider-env": {
+            "version": "3.888.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.888.0.tgz",
+            "integrity": "sha512-shPi4AhUKbIk7LugJWvNpeZA8va7e5bOHAEKo89S0Ac8WDZt2OaNzbh/b9l0iSL2eEyte8UgIsYGcFxOwIF1VA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.888.0",
+                "@aws-sdk/types": "3.887.0",
+                "@smithy/property-provider": "^4.0.5",
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/util-credentials": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-credentials/-/util-credentials-3.46.0.tgz",
-            "integrity": "sha512-d5bDyCDVYi6ThBY8AntAKooExayFuLUnCXsDkmmWpHlp26JZv9s1/DsXR219ELgu8jIAWiID54HjfEYf8qa6Vw==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.888.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.888.0.tgz",
+            "integrity": "sha512-Jvuk6nul0lE7o5qlQutcqlySBHLXOyoPtiwE6zyKbGc7RVl0//h39Lab7zMeY2drMn8xAnIopL4606Fd8JI/Hw==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/shared-ini-file-loader": "3.46.0",
-                "tslib": "^2.3.0"
+                "@aws-sdk/core": "3.888.0",
+                "@aws-sdk/types": "3.887.0",
+                "@smithy/fetch-http-handler": "^5.2.1",
+                "@smithy/node-http-handler": "^4.2.1",
+                "@smithy/property-provider": "^4.0.5",
+                "@smithy/protocol-http": "^5.2.1",
+                "@smithy/smithy-client": "^4.6.1",
+                "@smithy/types": "^4.5.0",
+                "@smithy/util-stream": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/util-hex-encoding": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.46.0.tgz",
-            "integrity": "sha512-A831jS32tbdjki4ihS0BIZ3HAi1gv2PtLmAjAW+PHVvBd0S4OpbQApKxKPu0w+NKsp9XQYfkEkeFKCcMqN1zhg==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.888.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.888.0.tgz",
+            "integrity": "sha512-M82ItvS5yq+tO6ZOV1ruaVs2xOne+v8HW85GFCXnz8pecrzYdgxh6IsVqEbbWruryG/mUGkWMbkBZoEsy4MgyA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "tslib": "^2.3.0"
+                "@aws-sdk/core": "3.888.0",
+                "@aws-sdk/credential-provider-env": "3.888.0",
+                "@aws-sdk/credential-provider-http": "3.888.0",
+                "@aws-sdk/credential-provider-process": "3.888.0",
+                "@aws-sdk/credential-provider-sso": "3.888.0",
+                "@aws-sdk/credential-provider-web-identity": "3.888.0",
+                "@aws-sdk/nested-clients": "3.888.0",
+                "@aws-sdk/types": "3.887.0",
+                "@smithy/credential-provider-imds": "^4.0.7",
+                "@smithy/property-provider": "^4.0.5",
+                "@smithy/shared-ini-file-loader": "^4.0.5",
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/util-uri-escape": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-uri-escape/-/util-uri-escape-3.46.0.tgz",
-            "integrity": "sha512-drAHEt3YnI6H6NpiTFLFT8e75bOhaO94ZP+kqz/0hluQiKX47Pow3Ar3Diaf/CUMLctH0IX3AaN3T2ve5v19lQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.888.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.888.0.tgz",
+            "integrity": "sha512-KCrQh1dCDC8Y+Ap3SZa6S81kHk+p+yAaOQ5jC3dak4zhHW3RCrsGR/jYdemTOgbEGcA6ye51UbhWfrrlMmeJSA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "tslib": "^2.3.0"
+                "@aws-sdk/credential-provider-env": "3.888.0",
+                "@aws-sdk/credential-provider-http": "3.888.0",
+                "@aws-sdk/credential-provider-ini": "3.888.0",
+                "@aws-sdk/credential-provider-process": "3.888.0",
+                "@aws-sdk/credential-provider-sso": "3.888.0",
+                "@aws-sdk/credential-provider-web-identity": "3.888.0",
+                "@aws-sdk/types": "3.887.0",
+                "@smithy/credential-provider-imds": "^4.0.7",
+                "@smithy/property-provider": "^4.0.5",
+                "@smithy/shared-ini-file-loader": "^4.0.5",
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/util-user-agent-browser": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.46.0.tgz",
-            "integrity": "sha512-wwUh4H6+ur9akctoSgaz41J8JuRrOqey4aY68DmDQ0did3UjhRlbPD3xu0umXoPSgmtqQyl34oMPqCOfA70Z0Q==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@aws-sdk/credential-provider-process": {
+            "version": "3.888.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.888.0.tgz",
+            "integrity": "sha512-+aX6piSukPQ8DUS4JAH344GePg8/+Q1t0+kvSHAZHhYvtQ/1Zek3ySOJWH2TuzTPCafY4nmWLcQcqvU1w9+4Lw==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/types": "3.46.0",
-                "bowser": "^2.11.0",
-                "tslib": "^2.3.0"
+                "@aws-sdk/core": "3.888.0",
+                "@aws-sdk/types": "3.887.0",
+                "@smithy/property-provider": "^4.0.5",
+                "@smithy/shared-ini-file-loader": "^4.0.5",
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/util-user-agent-node": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.46.0.tgz",
-            "integrity": "sha512-JCY8mKWPic0aXtz7amKXWyjbX8fhdOkRcgsCCnevOHc/7KOxwa97VnDT555GNQ76LO+cEDgYueHklUayV3u+IA==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.888.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.888.0.tgz",
+            "integrity": "sha512-b1ZJji7LJ6E/j1PhFTyvp51in2iCOQ3VP6mj5H6f5OUnqn7efm41iNMoinKr87n0IKZw7qput5ggXVxEdPhouA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/node-config-provider": "3.46.0",
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0"
+                "@aws-sdk/client-sso": "3.888.0",
+                "@aws-sdk/core": "3.888.0",
+                "@aws-sdk/token-providers": "3.888.0",
+                "@aws-sdk/types": "3.887.0",
+                "@smithy/property-provider": "^4.0.5",
+                "@smithy/shared-ini-file-loader": "^4.0.5",
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/util-utf8-browser": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.46.0.tgz",
-            "integrity": "sha512-zafI5Y7hRVC0vhJ77FPUyBckmpF2v2ZEKFC79AdwdFX11l7XNmq0hY/4CWVYeZ2L0Fyk0UV6eeKyk/TNdce0mg==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.888.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.888.0.tgz",
+            "integrity": "sha512-7P0QNtsDzMZdmBAaY/vY1BsZHwTGvEz3bsn2bm5VSKFAeMmZqsHK1QeYdNsFjLtegnVh+wodxMq50jqLv3LFlA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "tslib": "^2.3.0"
+                "@aws-sdk/core": "3.888.0",
+                "@aws-sdk/nested-clients": "3.888.0",
+                "@aws-sdk/types": "3.887.0",
+                "@smithy/property-provider": "^4.0.5",
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/util-utf8-node": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8-node/-/util-utf8-node-3.46.0.tgz",
-            "integrity": "sha512-Uk9hQrWQowU4ymtSxrxiIp7GnBoZfkKGSeWDy2h/1Biaexq9FQclbgwa0ZhA5lKLDj/nUxnXoT/ZcY90mTdzzQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.887.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.887.0.tgz",
+            "integrity": "sha512-ulzqXv6NNqdu/kr0sgBYupWmahISHY+azpJidtK6ZwQIC+vBUk9NdZeqQpy7KVhIk2xd4+5Oq9rxapPwPI21CA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/util-buffer-from": "3.46.0",
-                "tslib": "^2.3.0"
+                "@aws-sdk/types": "3.887.0",
+                "@smithy/protocol-http": "^5.2.1",
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-web-identity": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.46.0.tgz",
-            "integrity": "sha512-VUNTS9HjwLRmS2OQ+i4tqVJBUpk/DjIT0sWUDnKBcC6UCyGOkVmBVisCvUHpwyCLCgYbCvTab1SfrJ8dZsN83w==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.887.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.887.0.tgz",
+            "integrity": "sha512-YbbgLI6jKp2qSoAcHnXrQ5jcuc5EYAmGLVFgMVdk8dfCfJLfGGSaOLxF4CXC7QYhO50s+mPPkhBYejCik02Kug==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/property-provider": "3.46.0",
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0"
+                "@aws-sdk/types": "3.887.0",
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@aws-sdk/property-provider": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.46.0.tgz",
-            "integrity": "sha512-e3Jcds7G1Hg5VDvwLox0HlQq4G2fvmkO1BRPvM8WfRGvxRNK40dqoelm2NMtbNK0KgFPIpKsGeX1UhZDt9Od9w==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.887.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.887.0.tgz",
+            "integrity": "sha512-tjrUXFtQnFLo+qwMveq5faxP5MQakoLArXtqieHphSqZTXm21wDJM73hgT4/PQQGTwgYjDKqnqsE1hvk0hcfDw==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0"
+                "@aws-sdk/types": "3.887.0",
+                "@aws/lambda-invoke-store": "^0.0.1",
+                "@smithy/protocol-http": "^5.2.1",
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@aws-sdk/types": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.46.0.tgz",
-            "integrity": "sha512-yhrkVVyv4RUt3KqDDyEayjBM5dRBtuS486THeqtSghUYNV7M/cW18TA3gdMC0pRGgUqfKrOysdBZjCyPrYNvuA==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.888.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.888.0.tgz",
+            "integrity": "sha512-ZkcUkoys8AdrNNG7ATjqw2WiXqrhTvT+r4CIK3KhOqIGPHX0p0DQWzqjaIl7ZhSUToKoZ4Ud7MjF795yUr73oA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.888.0",
+                "@aws-sdk/types": "3.887.0",
+                "@aws-sdk/util-endpoints": "3.887.0",
+                "@smithy/core": "^3.11.0",
+                "@smithy/protocol-http": "^5.2.1",
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/fetch-http-handler": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.178.0.tgz",
-            "integrity": "sha512-T/LCNwCihdVNzGn39Dw7tk2U1fMlupFlCsAvDBbO+FOM3h+y9WLHzxmlAVsjPrFXlzdONKf9zd5cuQ+ZW93yAQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@aws-sdk/nested-clients": {
+            "version": "3.888.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.888.0.tgz",
+            "integrity": "sha512-py4o4RPSGt+uwGvSBzR6S6cCBjS4oTX5F8hrHFHfPCdIOMVjyOBejn820jXkCrcdpSj3Qg1yUZXxsByvxc9Lyg==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/protocol-http": "3.178.0",
-                "@aws-sdk/querystring-builder": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "@aws-sdk/util-base64-browser": "3.170.0",
-                "tslib": "^2.3.1"
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.888.0",
+                "@aws-sdk/middleware-host-header": "3.887.0",
+                "@aws-sdk/middleware-logger": "3.887.0",
+                "@aws-sdk/middleware-recursion-detection": "3.887.0",
+                "@aws-sdk/middleware-user-agent": "3.888.0",
+                "@aws-sdk/region-config-resolver": "3.887.0",
+                "@aws-sdk/types": "3.887.0",
+                "@aws-sdk/util-endpoints": "3.887.0",
+                "@aws-sdk/util-user-agent-browser": "3.887.0",
+                "@aws-sdk/util-user-agent-node": "3.888.0",
+                "@smithy/config-resolver": "^4.2.1",
+                "@smithy/core": "^3.11.0",
+                "@smithy/fetch-http-handler": "^5.2.1",
+                "@smithy/hash-node": "^4.1.1",
+                "@smithy/invalid-dependency": "^4.1.1",
+                "@smithy/middleware-content-length": "^4.1.1",
+                "@smithy/middleware-endpoint": "^4.2.1",
+                "@smithy/middleware-retry": "^4.2.1",
+                "@smithy/middleware-serde": "^4.1.1",
+                "@smithy/middleware-stack": "^4.1.1",
+                "@smithy/node-config-provider": "^4.2.1",
+                "@smithy/node-http-handler": "^4.2.1",
+                "@smithy/protocol-http": "^5.2.1",
+                "@smithy/smithy-client": "^4.6.1",
+                "@smithy/types": "^4.5.0",
+                "@smithy/url-parser": "^4.1.1",
+                "@smithy/util-base64": "^4.1.0",
+                "@smithy/util-body-length-browser": "^4.1.0",
+                "@smithy/util-body-length-node": "^4.1.0",
+                "@smithy/util-defaults-mode-browser": "^4.1.1",
+                "@smithy/util-defaults-mode-node": "^4.1.1",
+                "@smithy/util-endpoints": "^3.1.1",
+                "@smithy/util-middleware": "^4.1.1",
+                "@smithy/util-retry": "^4.1.1",
+                "@smithy/util-utf8": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.887.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.887.0.tgz",
+            "integrity": "sha512-VdSMrIqJ3yjJb/fY+YAxrH/lCVv0iL8uA+lbMNfQGtO5tB3Zx6SU9LEpUwBNX8fPK1tUpI65CNE4w42+MY/7Mg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.887.0",
+                "@smithy/node-config-provider": "^4.2.1",
+                "@smithy/types": "^4.5.0",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.1.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/fetch-http-handler/node_modules/@aws-sdk/types": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-            "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@aws-sdk/token-providers": {
+            "version": "3.888.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.888.0.tgz",
+            "integrity": "sha512-WA3NF+3W8GEuCMG1WvkDYbB4z10G3O8xuhT7QSjhvLYWQ9CPt3w4VpVIfdqmUn131TCIbhCzD0KN/1VJTjAjyw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.888.0",
+                "@aws-sdk/nested-clients": "3.888.0",
+                "@aws-sdk/types": "3.887.0",
+                "@smithy/property-provider": "^4.0.5",
+                "@smithy/shared-ini-file-loader": "^4.0.5",
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/hash-node": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.178.0.tgz",
-            "integrity": "sha512-mqYraRQlvPO5egUKTNZ1kP52sfwBlsz7woOewQTHOGomZBDXrh8bl1J+sgaDi1NAwXdZUgxuD3QKxxAKRs9a2Q==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@aws-sdk/types": {
+            "version": "3.887.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.887.0.tgz",
+            "integrity": "sha512-fmTEJpUhsPsovQ12vZSpVTEP/IaRoJAMBGQXlQNjtCpkBp6Iq3KQDa/HDaPINE+3xxo6XvTdtibsNOd5zJLV9A==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/types": "3.178.0",
-                "@aws-sdk/util-buffer-from": "3.170.0",
-                "tslib": "^2.3.1"
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/hash-node/node_modules/@aws-sdk/types": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-            "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.887.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.887.0.tgz",
+            "integrity": "sha512-kpegvT53KT33BMeIcGLPA65CQVxLUL/C3gTz9AzlU/SDmeusBHX4nRApAicNzI/ltQ5lxZXbQn18UczzBuwF1w==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.887.0",
+                "@smithy/types": "^4.5.0",
+                "@smithy/url-parser": "^4.1.1",
+                "@smithy/util-endpoints": "^3.1.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/invalid-dependency": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.178.0.tgz",
-            "integrity": "sha512-JJNaiLr3nbRYym6oUAAaoFFYtDnIZ9Scco2p4sG/thT2eyAfXcEdNl1cSD3E/R1J+Ml/YplqTiIY4u1KPAriRw==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.887.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.887.0.tgz",
+            "integrity": "sha512-X71UmVsYc6ZTH4KU6hA5urOzYowSXc3qvroagJNLJYU1ilgZ529lP4J9XOYfEvTXkLR1hPFSRxa43SrwgelMjA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
+                "@aws-sdk/types": "3.887.0",
+                "@smithy/types": "^4.5.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/@aws-sdk/invalid-dependency/node_modules/@aws-sdk/types": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-            "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.888.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.888.0.tgz",
+            "integrity": "sha512-rSB3OHyuKXotIGfYEo//9sU0lXAUrTY28SUUnxzOGYuQsAt0XR5iYwBAp+RjV6x8f+Hmtbg0PdCsy1iNAXa0UQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/middleware-user-agent": "3.888.0",
+                "@aws-sdk/types": "3.887.0",
+                "@smithy/node-config-provider": "^4.2.1",
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
+            },
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
             }
         },
-        "node_modules/@aws-sdk/is-array-buffer": {
-            "version": "3.170.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/is-array-buffer/-/is-array-buffer-3.170.0.tgz",
-            "integrity": "sha512-yYXqgp8rilBckIvNRs22yAXHKcXb86/g+F+hsTZl38OJintTsLQB//O5v6EQTYhSW7T3wMe1NHDrjZ+hFjAy4Q==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@aws-sdk/xml-builder": {
+            "version": "3.887.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.887.0.tgz",
+            "integrity": "sha512-lMwgWK1kNgUhHGfBvO/5uLe7TKhycwOn3eRCqsKPT9aPCx/HWuTlpcQp8oW2pCRGLS7qzcxqpQulcD+bbUL7XQ==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "tslib": "^2.3.1"
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/middleware-content-length": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.178.0.tgz",
-            "integrity": "sha512-p3n3IzU03eRzZivEoQn1HA83LbAKukZwRevsJpya1UfCUtWkXQO3v0jU8rhZE4deGa9k7zuCAEmJ8nCw3QxclQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/abort-controller": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-4.1.1.tgz",
+            "integrity": "sha512-vkzula+IwRvPR6oKQhMYioM3A/oX/lFCZiwuxkQbRhqJS2S4YRY2k7k/SyR2jMf3607HLtbEwlRxi0ndXHMjRg==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/protocol-http": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/middleware-content-length/node_modules/@aws-sdk/types": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-            "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/config-resolver": {
+            "version": "4.2.2",
+            "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-4.2.2.tgz",
+            "integrity": "sha512-IT6MatgBWagLybZl1xQcURXRICvqz1z3APSCAI9IqdvfCkrA7RaQIEfgC6G/KvfxnDfQUDqFV+ZlixcuFznGBQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.2.2",
+                "@smithy/types": "^4.5.0",
+                "@smithy/util-config-provider": "^4.1.0",
+                "@smithy/util-middleware": "^4.1.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/middleware-host-header": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.178.0.tgz",
-            "integrity": "sha512-EFc9S63iwCmudVpVSiVPiTnp6WCfsRYUmTrZJJouZzthEhJwcrunwu7Fa9lHYb0zcWLgVFLhzs1Z34J/Er4JoQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/core": {
+            "version": "3.11.0",
+            "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.11.0.tgz",
+            "integrity": "sha512-Abs5rdP1o8/OINtE49wwNeWuynCu0kme1r4RI3VXVrHr4odVDG7h7mTnw1WXXfN5Il+c25QOnrdL2y56USfxkA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/protocol-http": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
+                "@smithy/middleware-serde": "^4.1.1",
+                "@smithy/protocol-http": "^5.2.1",
+                "@smithy/types": "^4.5.0",
+                "@smithy/util-base64": "^4.1.0",
+                "@smithy/util-body-length-browser": "^4.1.0",
+                "@smithy/util-middleware": "^4.1.1",
+                "@smithy/util-stream": "^4.3.1",
+                "@smithy/util-utf8": "^4.1.0",
+                "@types/uuid": "^9.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/middleware-host-header/node_modules/@aws-sdk/types": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-            "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/credential-provider-imds": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-4.1.2.tgz",
+            "integrity": "sha512-JlYNq8TShnqCLg0h+afqe2wLAwZpuoSgOyzhYvTgbiKBWRov+uUve+vrZEQO6lkdLOWPh7gK5dtb9dS+KGendg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.2.2",
+                "@smithy/property-provider": "^4.1.1",
+                "@smithy/types": "^4.5.0",
+                "@smithy/url-parser": "^4.1.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/middleware-logger": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.178.0.tgz",
-            "integrity": "sha512-k4jnB+ryGiAhv6vyNFz2YoaVodldjkbz4mqDlVzhwEn77LT/TcwdBoown3cJD/45LEtiuPqeONoTcNCsuCkRFQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/fetch-http-handler": {
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.2.1.tgz",
+            "integrity": "sha512-5/3wxKNtV3wO/hk1is+CZUhL8a1yy/U+9u9LKQ9kZTkMsHaQjJhc3stFfiujtMnkITjzWfndGA2f7g9Uh9vKng==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
+                "@smithy/protocol-http": "^5.2.1",
+                "@smithy/querystring-builder": "^4.1.1",
+                "@smithy/types": "^4.5.0",
+                "@smithy/util-base64": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/middleware-logger/node_modules/@aws-sdk/types": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-            "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/hash-node": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-4.1.1.tgz",
+            "integrity": "sha512-H9DIU9WBLhYrvPs9v4sYvnZ1PiAI0oc8CgNQUJ1rpN3pP7QADbTOUjchI2FB764Ub0DstH5xbTqcMJu1pnVqxA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.5.0",
+                "@smithy/util-buffer-from": "^4.1.0",
+                "@smithy/util-utf8": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/middleware-recursion-detection": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.178.0.tgz",
-            "integrity": "sha512-dVgSoP2Mer8A0JGaWgpC/f4vPyvHh7laES/u5sTy6RfwrR87oTx+uhKrc6eh+9NkMR2xdRyaNJAMIXwL5bsVzg==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/invalid-dependency": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-4.1.1.tgz",
+            "integrity": "sha512-1AqLyFlfrrDkyES8uhINRlJXmHA2FkG+3DY8X+rmLSqmFwk3DJnvhyGzyByPyewh2jbmV+TYQBEfngQax8IFGg==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/protocol-http": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/middleware-recursion-detection/node_modules/@aws-sdk/types": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-            "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/is-array-buffer": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-4.1.0.tgz",
+            "integrity": "sha512-ePTYUOV54wMogio+he4pBybe8fwg4sDvEVDBU8ZlHOZXbXK3/C0XfJgUCu6qAZcawv05ZhZzODGUerFBPsPUDQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/middleware-retry": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.178.0.tgz",
-            "integrity": "sha512-glBXpAqt+4KQ7q8y2/kwDX2ujCvCSQok5rlAmUjaQjVPc3cX77QwATIRQTS2nBC4v9tfMc7yL64ZeRbx6n0RAQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/middleware-content-length": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-4.1.1.tgz",
+            "integrity": "sha512-9wlfBBgTsRvC2JxLJxv4xDGNBrZuio3AgSl0lSFX7fneW2cGskXTYpFxCdRYD2+5yzmsiTuaAJD1Wp7gWt9y9w==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/protocol-http": "3.178.0",
-                "@aws-sdk/service-error-classification": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "@aws-sdk/util-middleware": "3.178.0",
-                "tslib": "^2.3.1",
-                "uuid": "^8.3.2"
+                "@smithy/protocol-http": "^5.2.1",
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/middleware-retry/node_modules/@aws-sdk/types": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-            "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/middleware-endpoint": {
+            "version": "4.2.2",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.2.2.tgz",
+            "integrity": "sha512-M51KcwD+UeSOFtpALGf5OijWt915aQT5eJhqnMKJt7ZTfDfNcvg2UZgIgTZUoiORawb6o5lk4n3rv7vnzQXgsA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/core": "^3.11.0",
+                "@smithy/middleware-serde": "^4.1.1",
+                "@smithy/node-config-provider": "^4.2.2",
+                "@smithy/shared-ini-file-loader": "^4.2.0",
+                "@smithy/types": "^4.5.0",
+                "@smithy/url-parser": "^4.1.1",
+                "@smithy/util-middleware": "^4.1.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/middleware-serde": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.178.0.tgz",
-            "integrity": "sha512-TERiu/B4hYi5Jd4iQN9ECTWbt2IZweAgFB010MboM4CAPm6EcszEc/uCB4faLZNdJaksk1BhAR7koURcda8Sew==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/middleware-retry": {
+            "version": "4.2.2",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.2.2.tgz",
+            "integrity": "sha512-KZJueEOO+PWqflv2oGx9jICpHdBYXwCI19j7e2V3IMwKgFcXc9D9q/dsTf4B+uCnYxjNoS1jpyv6pGNGRsKOXA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
+                "@smithy/node-config-provider": "^4.2.2",
+                "@smithy/protocol-http": "^5.2.1",
+                "@smithy/service-error-classification": "^4.1.1",
+                "@smithy/smithy-client": "^4.6.2",
+                "@smithy/types": "^4.5.0",
+                "@smithy/util-middleware": "^4.1.1",
+                "@smithy/util-retry": "^4.1.1",
+                "@types/uuid": "^9.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/middleware-serde/node_modules/@aws-sdk/types": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-            "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/middleware-serde": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-4.1.1.tgz",
+            "integrity": "sha512-lh48uQdbCoj619kRouev5XbWhCwRKLmphAif16c4J6JgJ4uXjub1PI6RL38d3BLliUvSso6klyB/LTNpWSNIyg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/protocol-http": "^5.2.1",
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/middleware-stack": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.178.0.tgz",
-            "integrity": "sha512-ELYM5Imhlcz2zT1Z4OjVZwO564KvI4L9dMBxuUgO0fwommzjWqxR03yaRGhpGwpCP64d0Op5Koc/RKq5V92Wbw==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/middleware-stack": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-4.1.1.tgz",
+            "integrity": "sha512-ygRnniqNcDhHzs6QAPIdia26M7e7z9gpkIMUe/pK0RsrQ7i5MblwxY8078/QCnGq6AmlUUWgljK2HlelsKIb/A==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "tslib": "^2.3.1"
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/middleware-user-agent": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.178.0.tgz",
-            "integrity": "sha512-xkKBxrFbs+UwUPpfIGEPuHeBWS2Jgmcd+ipEJUQRR3lY4h1fJ6mPGeyyaVDvwaJp9KgESSI6QTp6V15l8GXXgQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/node-config-provider": {
+            "version": "4.2.2",
+            "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-4.2.2.tgz",
+            "integrity": "sha512-SYGTKyPvyCfEzIN5rD8q/bYaOPZprYUPD2f5g9M7OjaYupWOoQFYJ5ho+0wvxIRf471i2SR4GoiZ2r94Jq9h6A==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/protocol-http": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
+                "@smithy/property-provider": "^4.1.1",
+                "@smithy/shared-ini-file-loader": "^4.2.0",
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/middleware-user-agent/node_modules/@aws-sdk/types": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-            "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/node-http-handler": {
+            "version": "4.2.1",
+            "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.2.1.tgz",
+            "integrity": "sha512-REyybygHlxo3TJICPF89N2pMQSf+p+tBJqpVe1+77Cfi9HBPReNjTgtZ1Vg73exq24vkqJskKDpfF74reXjxfw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/abort-controller": "^4.1.1",
+                "@smithy/protocol-http": "^5.2.1",
+                "@smithy/querystring-builder": "^4.1.1",
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/node-config-provider": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.178.0.tgz",
-            "integrity": "sha512-yb5XJcC7SxkZ5oxu3zQ/foBdMkLBKryzx/CVg5BNSsKDjfbouf/ZYPcJDHhc2gzCtZcx18GjFBOnv8cpo/tyXQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/property-provider": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-4.1.1.tgz",
+            "integrity": "sha512-gm3ZS7DHxUbzC2wr8MUCsAabyiXY0gaj3ROWnhSx/9sPMc6eYLMM4rX81w1zsMaObj2Lq3PZtNCC1J6lpEY7zg==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/property-provider": "3.178.0",
-                "@aws-sdk/shared-ini-file-loader": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/node-config-provider/node_modules/@aws-sdk/property-provider": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.178.0.tgz",
-            "integrity": "sha512-+Fh1aUANa+Gt/rh4SUHO0yHwKsibyZGk2LLDUcM1+9r0pUZT0qy3h0UCl5Kkj9HUcDJMD73wHTx4UB440xRobw==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/protocol-http": {
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-5.2.1.tgz",
+            "integrity": "sha512-T8SlkLYCwfT/6m33SIU/JOVGNwoelkrvGjFKDSDtVvAXj/9gOT78JVJEas5a+ETjOu4SVvpCstKgd0PxSu/aHw==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/node-config-provider/node_modules/@aws-sdk/shared-ini-file-loader": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.178.0.tgz",
-            "integrity": "sha512-nZGmuhGLDFbXsb7QYDg7PiPMAmsdlSshKJ+AhKSZF/J0SK94kdZgGnGXGUZe52S3G41E3CZIgnLnnsMXq0uErA==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/querystring-builder": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-4.1.1.tgz",
+            "integrity": "sha512-J9b55bfimP4z/Jg1gNo+AT84hr90p716/nvxDkPGCD4W70MPms0h8KF50RDRgBGZeL83/u59DWNqJv6tEP/DHA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "tslib": "^2.3.1"
+                "@smithy/types": "^4.5.0",
+                "@smithy/util-uri-escape": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/node-config-provider/node_modules/@aws-sdk/types": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-            "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/querystring-parser": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-4.1.1.tgz",
+            "integrity": "sha512-63TEp92YFz0oQ7Pj9IuI3IgnprP92LrZtRAkE3c6wLWJxfy/yOPRt39IOKerVr0JS770olzl0kGafXlAXZ1vng==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/node-http-handler": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.178.0.tgz",
-            "integrity": "sha512-EtH6YiX1IX0QraQ/+kKBWAEtsFYBnFyxOimTBtlpDYwFpgDzIZ1GFn2wORYomEWALg10kphs8n3E5/7b5t5OWQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/service-error-classification": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-4.1.1.tgz",
+            "integrity": "sha512-Iam75b/JNXyDE41UvrlM6n8DNOa/r1ylFyvgruTUx7h2Uk7vDNV9AAwP1vfL1fOL8ls0xArwEGVcGZVd7IO/Cw==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/abort-controller": "3.178.0",
-                "@aws-sdk/protocol-http": "3.178.0",
-                "@aws-sdk/querystring-builder": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
+                "@smithy/types": "^4.5.0"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/node-http-handler/node_modules/@aws-sdk/types": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-            "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/shared-ini-file-loader": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.2.0.tgz",
+            "integrity": "sha512-OQTfmIEp2LLuWdxa8nEEPhZmiOREO6bcB6pjs0AySf4yiZhl6kMOfqmcwcY8BaBPX+0Tb+tG7/Ia/6mwpoZ7Pw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/property-provider": {
-            "version": "3.37.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.37.0.tgz",
-            "integrity": "sha512-puXV4MIj+n9Pr4KbwpOz6+nK7gmJAgAOZW/yKXxyWH4fTcrCVe9xuo5kqaiI1gb5ojaNt2GuISBFR7bVLumh9Q==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/signature-v4": {
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-5.2.1.tgz",
+            "integrity": "sha512-M9rZhWQLjlQVCCR37cSjHfhriGRN+FQ8UfgrYNufv66TJgk+acaggShl3KS5U/ssxivvZLlnj7QH2CUOKlxPyA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/types": "3.37.0",
-                "tslib": "^2.3.0"
+                "@smithy/is-array-buffer": "^4.1.0",
+                "@smithy/protocol-http": "^5.2.1",
+                "@smithy/types": "^4.5.0",
+                "@smithy/util-hex-encoding": "^4.1.0",
+                "@smithy/util-middleware": "^4.1.1",
+                "@smithy/util-uri-escape": "^4.1.0",
+                "@smithy/util-utf8": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 10.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/protocol-http": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.178.0.tgz",
-            "integrity": "sha512-GsnANW60mVYMlE16UGNSOwYZ6TbkoODvmDQi95SEPjM7asf4vihEyDvhxiGS/JvC18UyxRVWT89l/V3hR/SF7w==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/smithy-client": {
+            "version": "4.6.2",
+            "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.6.2.tgz",
+            "integrity": "sha512-u82cjh/x7MlMat76Z38TRmEcG6JtrrxN4N2CSNG5o2v2S3hfLAxRgSgFqf0FKM3dglH41Evknt/HOX+7nfzZ3g==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
+                "@smithy/core": "^3.11.0",
+                "@smithy/middleware-endpoint": "^4.2.2",
+                "@smithy/middleware-stack": "^4.1.1",
+                "@smithy/protocol-http": "^5.2.1",
+                "@smithy/types": "^4.5.0",
+                "@smithy/util-stream": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/protocol-http/node_modules/@aws-sdk/types": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-            "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/types": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.5.0.tgz",
+            "integrity": "sha512-RkUpIOsVlAwUIZXO1dsz8Zm+N72LClFfsNqf173catVlvRZiwPy0x2u0JLEA4byreOPKDZPGjmPDylMoP8ZJRg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/querystring-builder": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.178.0.tgz",
-            "integrity": "sha512-vJXlExSshlHtGVvan/U6JihWvzf8t9QwH5I4F6HUY+exxMy5vFDYCnNqGAzbJwq7w/HME1gQWLoXq2k0uODz7g==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/url-parser": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-4.1.1.tgz",
+            "integrity": "sha512-bx32FUpkhcaKlEoOMbScvc93isaSiRM75pQ5IgIBaMkT7qMlIibpPRONyx/0CvrXHzJLpOn/u6YiDX2hcvs7Dg==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/types": "3.178.0",
-                "@aws-sdk/util-uri-escape": "3.170.0",
-                "tslib": "^2.3.1"
+                "@smithy/querystring-parser": "^4.1.1",
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/querystring-builder/node_modules/@aws-sdk/types": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-            "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/util-base64": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-4.1.0.tgz",
+            "integrity": "sha512-RUGd4wNb8GeW7xk+AY5ghGnIwM96V0l2uzvs/uVHf+tIuVX2WSvynk5CxNoBCsM2rQRSZElAo9rt3G5mJ/gktQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^4.1.0",
+                "@smithy/util-utf8": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/querystring-parser": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.178.0.tgz",
-            "integrity": "sha512-dp3pLnsOvAcIF7Yn2PY5CIVWX7GvC33nSlWDYeLeCMapccwTbe6zBqreWbScmIGJra4QJTdjccpwo2Yxwhr5QQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/util-body-length-browser": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-4.1.0.tgz",
+            "integrity": "sha512-V2E2Iez+bo6bUMOTENPr6eEmepdY8Hbs+Uc1vkDKgKNA/brTJqOW/ai3JO1BGj9GbCeLqw90pbbH7HFQyFotGQ==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/querystring-parser/node_modules/@aws-sdk/types": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-            "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/util-body-length-node": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-4.1.0.tgz",
+            "integrity": "sha512-BOI5dYjheZdgR9XiEM3HJcEMCXSoqbzu7CzIgYrx0UtmvtC3tC2iDGpJLsSRFffUpy8ymsg2ARMP5fR8mtuUQQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/service-error-classification": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.178.0.tgz",
-            "integrity": "sha512-tDKTBXxck2N4bhAnQaeokx9ps38V3G70lcDdHS/N9hmqcQQmH5x+1/AMwYWLjUZmOQPBW9sFoG4B3psnl+sefw==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/util-buffer-from": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-4.1.0.tgz",
+            "integrity": "sha512-N6yXcjfe/E+xKEccWEKzK6M+crMrlwaCepKja0pNnlSkm6SjAeLKKA++er5Ba0I17gvKfN/ThV+ZOx/CntKTVw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/shared-ini-file-loader": {
-            "version": "3.37.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.37.0.tgz",
-            "integrity": "sha512-+vRBSlfa48R9KL7DpQt3dsu5/+5atjRgoCISblWo3SLpjrx41pKcjKneo7a1u0aP1Xc2oG2TfIyqTWZuOXsmEQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/util-config-provider": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-4.1.0.tgz",
+            "integrity": "sha512-swXz2vMjrP1ZusZWVTB/ai5gK+J8U0BWvP10v9fpcFvg+Xi/87LHvHfst2IgCs1i0v4qFZfGwCmeD/KNCdJZbQ==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "tslib": "^2.3.0"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 10.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/signature-v4": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.178.0.tgz",
-            "integrity": "sha512-8oOx6o0uOqlCDPM0dszfR1WHqd0E1VuFqez8iNItp0DhmhaCuanEwKYYA6HOkVu/MA6CsG6zDIJaFr5ODU2NvQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/util-defaults-mode-browser": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.1.2.tgz",
+            "integrity": "sha512-QKrOw01DvNHKgY+3p4r9Ut4u6EHLVZ01u6SkOMe6V6v5C+nRPXJeWh72qCT1HgwU3O7sxAIu23nNh+FOpYVZKA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/is-array-buffer": "3.170.0",
-                "@aws-sdk/types": "3.178.0",
-                "@aws-sdk/util-hex-encoding": "3.170.0",
-                "@aws-sdk/util-middleware": "3.178.0",
-                "@aws-sdk/util-uri-escape": "3.170.0",
-                "tslib": "^2.3.1"
+                "@smithy/property-provider": "^4.1.1",
+                "@smithy/smithy-client": "^4.6.2",
+                "@smithy/types": "^4.5.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/signature-v4/node_modules/@aws-sdk/types": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-            "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/util-defaults-mode-node": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.1.2.tgz",
+            "integrity": "sha512-l2yRmSfx5haYHswPxMmCR6jGwgPs5LjHLuBwlj9U7nNBMS43YV/eevj+Xq1869UYdiynnMrCKtoOYQcwtb6lKg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/config-resolver": "^4.2.2",
+                "@smithy/credential-provider-imds": "^4.1.2",
+                "@smithy/node-config-provider": "^4.2.2",
+                "@smithy/property-provider": "^4.1.1",
+                "@smithy/smithy-client": "^4.6.2",
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/smithy-client": {
-            "version": "3.180.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.180.0.tgz",
-            "integrity": "sha512-1vWafiUdn6RvOsD4CyNjMeDtDujuPi4Iq4Db6HrFmVPpJAutOLlCg52Dt7k96KCcIKgxVAs6Br0Waef+pcoGNA==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/util-endpoints": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-3.1.2.tgz",
+            "integrity": "sha512-+AJsaaEGb5ySvf1SKMRrPZdYHRYSzMkCoK16jWnIMpREAnflVspMIDeCVSZJuj+5muZfgGpNpijE3mUNtjv01Q==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/middleware-stack": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
+                "@smithy/node-config-provider": "^4.2.2",
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/smithy-client/node_modules/@aws-sdk/types": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-            "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/util-hex-encoding": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-4.1.0.tgz",
+            "integrity": "sha512-1LcueNN5GYC4tr8mo14yVYbh/Ur8jHhWOxniZXii+1+ePiIbsLZ5fEI0QQGtbRRP5mOhmooos+rLmVASGGoq5w==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/types": {
-            "version": "3.37.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.37.0.tgz",
-            "integrity": "sha512-KwHB06E1uxof5ijfcQXYidyihoCRMnHEFvWCy/VlL+1S54FTlMZ27JOZzQhLiw8NqeNfO33aqpMkxR60TwUZzg==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/util-middleware": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-4.1.1.tgz",
+            "integrity": "sha512-CGmZ72mL29VMfESz7S6dekqzCh8ZISj3B+w0g1hZFXaOjGTVaSqfAEFAq8EGp8fUL+Q2l8aqNmt8U1tglTikeg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 10.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/url-parser": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.178.0.tgz",
-            "integrity": "sha512-+Ch29d+IZG6zD1gNDVgFC00huY8ytrPdijAuNJ4DtPBTGP4zbrImw3js0GfvfBjLrQYBnclcAvSx4J1Q/8tqBQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/util-retry": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.1.1.tgz",
+            "integrity": "sha512-jGeybqEZ/LIordPLMh5bnmnoIgsqnp4IEimmUp5c5voZ8yx+5kAlN5+juyr7p+f7AtZTgvhmInQk4Q0UVbrZ0Q==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/querystring-parser": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
-            }
-        },
-        "node_modules/@aws-sdk/url-parser/node_modules/@aws-sdk/types": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-            "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ==",
+                "@smithy/service-error-classification": "^4.1.1",
+                "@smithy/types": "^4.5.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/util-arn-parser": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.46.0.tgz",
-            "integrity": "sha512-MIeqH53/Z5x+uQ/EHs6zqkdBqdpGA8tA6l/mL1j8hRK6bSQEUTAVlPNgjp03qse1Fk94GJbJbjZ4C0R7Z4YM+g==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/util-stream": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.3.1.tgz",
+            "integrity": "sha512-khKkW/Jqkgh6caxMWbMuox9+YfGlsk9OnHOYCGVEdYQb/XVzcORXHLYUubHmmda0pubEDncofUrPNniS9d+uAA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "tslib": "^2.3.0"
+                "@smithy/fetch-http-handler": "^5.2.1",
+                "@smithy/node-http-handler": "^4.2.1",
+                "@smithy/types": "^4.5.0",
+                "@smithy/util-base64": "^4.1.0",
+                "@smithy/util-buffer-from": "^4.1.0",
+                "@smithy/util-hex-encoding": "^4.1.0",
+                "@smithy/util-utf8": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/util-base64-browser": {
-            "version": "3.170.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-base64-browser/-/util-base64-browser-3.170.0.tgz",
-            "integrity": "sha512-uLP9Kp74+jc+UWI392LSWIaUj9eXZBhkAiSm8dXAyrr+5GFOKvmEdidFoZKKcFcZ2v3RMonDgFVcDBiZ33w7BQ==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/util-uri-escape": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-4.1.0.tgz",
+            "integrity": "sha512-b0EFQkq35K5NHUYxU72JuoheM6+pytEVUGlTwiFxWFpmddA+Bpz3LgsPRIpBk8lnPE47yT7AF2Egc3jVnKLuPg==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "tslib": "^2.3.1"
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/util-base64-node": {
-            "version": "3.170.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-base64-node/-/util-base64-node-3.170.0.tgz",
-            "integrity": "sha512-sjpOmfyW0RWCLXU8Du0ZtwgFoxIuKQIyVygXJ4qxByoa3jIUJXf4U33uSRMy47V3JoogdZuKSpND9hiNk2wU4w==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/@smithy/util-utf8": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-4.1.0.tgz",
+            "integrity": "sha512-mEu1/UIXAdNYuBcyEPbjScKi/+MQVXNIuY/7Cm5XLIWe319kDrT5SizBE95jqtmEXoDbGoZxKLCMttdZdqTZKQ==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/util-buffer-from": "3.170.0",
-                "tslib": "^2.3.1"
+                "@smithy/util-buffer-from": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@aws-sdk/util-body-length-browser": {
-            "version": "3.170.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.170.0.tgz",
-            "integrity": "sha512-SqSWA++gsZgHw6tlcEXx9K6R6cVKNYzOq6bca+NR7jXvy1hfqiv9Gx5TZrG4oL4JziP8QA0fTklmI1uQJ4HBRA==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/fast-xml-parser": {
+            "version": "5.2.5",
+            "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.2.5.tgz",
+            "integrity": "sha512-pfX9uG9Ki0yekDHx2SiuRIyFdyAr1kMIMitPvb0YBo8SUfKvia7w7FIyd/l6av85pFYRhZscS75MwMnbvY+hcQ==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/NaturalIntelligence"
+                }
+            ],
+            "license": "MIT",
             "dependencies": {
-                "tslib": "^2.3.1"
+                "strnum": "^2.1.0"
+            },
+            "bin": {
+                "fxparser": "src/cli/cli.js"
             }
         },
-        "node_modules/@aws-sdk/util-body-length-node": {
-            "version": "3.170.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.170.0.tgz",
-            "integrity": "sha512-sFb85ngsgfpamwDn22LC/+FkbDTNiddbMHptkajw+CAD2Rb4SJDp2PfXZ6k883BueJWhmxZ9+lApHZqYtgPdzw==",
+        "node_modules/@aws-sdk/client-accessanalyzer/node_modules/strnum": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.1.1.tgz",
+            "integrity": "sha512-7ZvoFTiCnGxBtDqJ//Cu6fWtZtc7Y3x+QOirG15wztbdngGSkht27o2pyGWrVy0b4WAy3jbKmnoK6g5VlVNUUw==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/NaturalIntelligence"
+                }
+            ],
+            "license": "MIT"
+        },
+        "node_modules/@aws-sdk/client-api-gateway": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "tslib": "^2.3.1"
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/client-sts": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-sdk-api-gateway": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-stream": "^3.3.0",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/client-sso": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/client-sso-oidc": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             },
-            "engines": {
-                "node": ">= 12.0.0"
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/@aws-sdk/util-buffer-from": {
-            "version": "3.170.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-buffer-from/-/util-buffer-from-3.170.0.tgz",
-            "integrity": "sha512-3ClE3wgN/Zw0ahfVAY5KQ/y3K2c+SYHwVUQaGSuVQlPOCDInGYjE/XEFwCeGJzncRPHIKDRPEsHCpm1uwgwEqQ==",
+        "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/client-sts": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/is-array-buffer": "3.170.0",
-                "tslib": "^2.3.1"
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/core": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/signature-v4": "^4.2.2",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@aws-sdk/util-config-provider": {
-            "version": "3.170.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-config-provider/-/util-config-provider-3.170.0.tgz",
-            "integrity": "sha512-VV6lfss6Go00TF2hRVJnN8Uf2FOwC++1e8glaeU7fMWluYCBjwl+116mPOPFaxvkJCg0dui2tFroXioslM/rvQ==",
+        "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "tslib": "^2.3.1"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-stream": "^3.3.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@aws-sdk/util-credentials": {
-            "version": "3.37.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-credentials/-/util-credentials-3.37.0.tgz",
-            "integrity": "sha512-zcLhSZDKgBLhUjSU5HoQpuQiP3v8oE86NmV/tiZVPEaO6YVULEAB2Cfj1hpM/b/JXWzjSHfT06KXT7QUODKS+A==",
+        "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/shared-ini-file-loader": "3.37.0",
-                "tslib": "^2.3.0"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 10.0.0"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/@aws-sdk/util-defaults-mode-browser": {
-            "version": "3.180.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.180.0.tgz",
-            "integrity": "sha512-XGq/RUuhqnLlApETBmBWDszNG4TR3FCOSNwFvok1UIPgFXxjh0JOzNc5mAX1St2hfx1IDb9Ja4BmTkYKix7byg==",
+        "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/property-provider": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "bowser": "^2.11.0",
-                "tslib": "^2.3.1"
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-ini": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 10.0.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@aws-sdk/util-defaults-mode-browser/node_modules/@aws-sdk/property-provider": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.178.0.tgz",
-            "integrity": "sha512-+Fh1aUANa+Gt/rh4SUHO0yHwKsibyZGk2LLDUcM1+9r0pUZT0qy3h0UCl5Kkj9HUcDJMD73wHTx4UB440xRobw==",
+        "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
+                "@aws-sdk/client-sso": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/token-providers": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
-            }
-        },
-        "node_modules/@aws-sdk/util-defaults-mode-browser/node_modules/@aws-sdk/types": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-            "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ==",
-            "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@aws-sdk/util-defaults-mode-node": {
-            "version": "3.180.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.180.0.tgz",
-            "integrity": "sha512-ch9VR4OKYGEaNbLhX/EyZDpNZst5T+/VYsFyqMA47J0YyMbg7GWyn2FjjhZ7qOV3XU6W8YEBNdd7U/LFFVp8uA==",
+        "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/config-resolver": "3.178.0",
-                "@aws-sdk/credential-provider-imds": "3.178.0",
-                "@aws-sdk/node-config-provider": "3.178.0",
-                "@aws-sdk/property-provider": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 10.0.0"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/@aws-sdk/util-defaults-mode-node/node_modules/@aws-sdk/credential-provider-imds": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.178.0.tgz",
-            "integrity": "sha512-ZvqQTi3+S13LACVgaWNCOKBv5jROIz7rqyZh56QunAkaAUqPbpM4VFODgAGZYPCOSggZbEUUqXOVB9xSnshLnA==",
+        "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/node-config-provider": "3.178.0",
-                "@aws-sdk/property-provider": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "@aws-sdk/url-parser": "3.178.0",
-                "tslib": "^2.3.1"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@aws-sdk/util-defaults-mode-node/node_modules/@aws-sdk/property-provider": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.178.0.tgz",
-            "integrity": "sha512-+Fh1aUANa+Gt/rh4SUHO0yHwKsibyZGk2LLDUcM1+9r0pUZT0qy3h0UCl5Kkj9HUcDJMD73wHTx4UB440xRobw==",
+        "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@aws-sdk/util-defaults-mode-node/node_modules/@aws-sdk/types": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-            "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ==",
+        "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@aws-sdk/util-hex-encoding": {
-            "version": "3.170.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.170.0.tgz",
-            "integrity": "sha512-BDYyMqaxX4/N7rYOIYlqgpZaBuHw3kNXKgOkWtJdzndIZbQX8HnyJ+rF0Pr1aVsOpVDM+fY1prERleFh/ZRTCg==",
+        "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "tslib": "^2.3.1"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@aws-sdk/util-locate-window": {
-            "version": "3.37.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.37.0.tgz",
-            "integrity": "sha512-NvDCfOhLLVHp27oGUUs8EVirhz91aX5gdxGS7J/sh5PF0cNN8rwaR1vSLR7BxPmJHMO7NH7i9EwiELfLfYcq6g==",
+        "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "tslib": "^2.3.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-config-provider": "^3.0.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 10.0.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@aws-sdk/util-middleware": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.178.0.tgz",
-            "integrity": "sha512-93WgrJKuwtv3f2r1Q04emzjMiwpYR5hysOHKMkrGOvAVZdDqe1UTjmtuxQadVi3DBr1KOT/d5uP9MjV8LqaUUA==",
+        "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/token-providers": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "tslib": "^2.3.1"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sso-oidc": "^3.693.0"
             }
         },
-        "node_modules/@aws-sdk/util-uri-escape": {
-            "version": "3.170.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-uri-escape/-/util-uri-escape-3.170.0.tgz",
-            "integrity": "sha512-Fof0urZ3Lx6z6LNKSEO6T4DNaNh6sLJaSWFaC6gtVDPux/C3R7wy2RQRDp0baHxE8m1KMB0XnKzHizJNrbDI1w==",
+        "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "tslib": "^2.3.1"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-endpoints": "^2.1.5",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@aws-sdk/util-user-agent-browser": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.178.0.tgz",
-            "integrity": "sha512-LxOrn7Ai88n0i5J5rTb5Bt0TAycPvDYzjdCwmd2mahsPHZGSDLeCeh6KOIxZsEfnzYRl4HGWvIEXdHIYZ3RTug==",
+        "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/types": "3.178.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
                 "bowser": "^2.11.0",
-                "tslib": "^2.3.1"
-            }
-        },
-        "node_modules/@aws-sdk/util-user-agent-browser/node_modules/@aws-sdk/types": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-            "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ==",
-            "engines": {
-                "node": ">= 12.0.0"
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/@aws-sdk/util-user-agent-node": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.178.0.tgz",
-            "integrity": "sha512-TrP6v+V4Qnv3E9CNgwR/G+1xiy8fa9j5LAm43qwp9PfJHchNyWOJ0FURD3Ne2sm/388Ybzjb1DRYRZ7B+xbnOw==",
+        "node_modules/@aws-sdk/client-api-gateway/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/node-config-provider": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=16.0.0"
             },
             "peerDependencies": {
                 "aws-crt": ">=1.0.0"
@@ -1778,24242 +2655,40413 @@
                 }
             }
         },
-        "node_modules/@aws-sdk/util-user-agent-node/node_modules/@aws-sdk/types": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-            "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ==",
+        "node_modules/@aws-sdk/client-api-gateway/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@aws-sdk/util-utf8-browser": {
-            "version": "3.170.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.170.0.tgz",
-            "integrity": "sha512-tJby9krepSwDsBK+KQF5ACacZQ4LH1Aheh5Dy0pghxsN/9IRw7kMWTumuRCnSntLFFphDD7GM494/Dvnl1UCLA==",
+        "node_modules/@aws-sdk/client-api-gateway/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "tslib": "^2.3.1"
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@aws-sdk/util-utf8-node": {
-            "version": "3.170.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8-node/-/util-utf8-node-3.170.0.tgz",
-            "integrity": "sha512-52QWGNoNQoyT2CuoQz6LjBKxHQtN/ceMFLW+9J1E0I1ni8XTuTYP52BlMe5484KkmZKsHOm+EWe4xuwwVetTxg==",
+        "node_modules/@aws-sdk/client-api-gateway/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/util-buffer-from": "3.170.0",
-                "tslib": "^2.3.1"
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@aws-toolkits/telemetry": {
-            "version": "1.0.87",
-            "resolved": "https://registry.npmjs.org/@aws-toolkits/telemetry/-/telemetry-1.0.87.tgz",
-            "integrity": "sha512-rN0s9YhU+SEIVTEojwuVm+Be3CXsTdIsg75PijVM9LdPqwNxzcSY2X/yU4K5R4QNMU160g4/qQ00BI9SdTJxKw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-apprunner": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "ajv": "^6.12.6",
-                "fs-extra": "^11.1.0",
-                "lodash": "^4.17.20",
-                "prettier": "^2.1.2",
-                "ts-morph": "^17.0.1",
-                "typescript": "^4.7.3",
-                "yargs": "^17.0.1"
-            }
-        },
-        "node_modules/@aws-toolkits/telemetry/node_modules/fs-extra": {
-            "version": "11.1.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz",
-            "integrity": "sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==",
-            "dev": true,
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/client-sts": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-apprunner/node_modules/@aws-sdk/client-sso": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "graceful-fs": "^4.2.0",
-                "jsonfile": "^6.0.1",
-                "universalify": "^2.0.0"
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-apprunner/node_modules/@aws-sdk/client-sso-oidc": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             },
-            "engines": {
-                "node": ">=14.14"
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/@babel/code-frame": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-            "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-apprunner/node_modules/@aws-sdk/client-sts": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-apprunner/node_modules/@aws-sdk/core": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@babel/highlight": "^7.16.7"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/signature-v4": "^4.2.2",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6.9.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@babel/compat-data": {
-            "version": "7.17.7",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.7.tgz",
-            "integrity": "sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-apprunner/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-stream": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6.9.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@babel/core": {
-            "version": "7.17.7",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.7.tgz",
-            "integrity": "sha512-djHlEfFHnSnTAcPb7dATbiM5HxGOP98+3JLBZtjRb5I7RXrw7kFRoG2dXM8cm3H+o11A8IFH/uprmJpwFynRNQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-apprunner/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@ampproject/remapping": "^2.1.0",
-                "@babel/code-frame": "^7.16.7",
-                "@babel/generator": "^7.17.7",
-                "@babel/helper-compilation-targets": "^7.17.7",
-                "@babel/helper-module-transforms": "^7.17.7",
-                "@babel/helpers": "^7.17.7",
-                "@babel/parser": "^7.17.7",
-                "@babel/template": "^7.16.7",
-                "@babel/traverse": "^7.17.3",
-                "@babel/types": "^7.17.0",
-                "convert-source-map": "^1.7.0",
-                "debug": "^4.1.0",
-                "gensync": "^1.0.0-beta.2",
-                "json5": "^2.1.2",
-                "semver": "^6.3.0"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6.9.0"
+                "node": ">=16.0.0"
             },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/babel"
-            }
-        },
-        "node_modules/@babel/core/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-            "dev": true,
-            "bin": {
-                "semver": "bin/semver.js"
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/@babel/generator": {
-            "version": "7.17.7",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz",
-            "integrity": "sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-apprunner/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@babel/types": "^7.17.0",
-                "jsesc": "^2.5.1",
-                "source-map": "^0.5.0"
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-ini": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6.9.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@babel/generator/node_modules/source-map": {
-            "version": "0.5.7",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-            "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-apprunner/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/client-sso": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/token-providers": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@babel/helper-compilation-targets": {
-            "version": "7.17.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz",
-            "integrity": "sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-apprunner/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@babel/compat-data": "^7.17.7",
-                "@babel/helper-validator-option": "^7.16.7",
-                "browserslist": "^4.17.5",
-                "semver": "^6.3.0"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6.9.0"
+                "node": ">=16.0.0"
             },
             "peerDependencies": {
-                "@babel/core": "^7.0.0"
-            }
-        },
-        "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-            "dev": true,
-            "bin": {
-                "semver": "bin/semver.js"
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/@babel/helper-environment-visitor": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
-            "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-apprunner/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@babel/types": "^7.16.7"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6.9.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@babel/helper-function-name": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz",
-            "integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-apprunner/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@babel/helper-get-function-arity": "^7.16.7",
-                "@babel/template": "^7.16.7",
-                "@babel/types": "^7.16.7"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6.9.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@babel/helper-get-function-arity": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz",
-            "integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-apprunner/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@babel/types": "^7.16.7"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6.9.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@babel/helper-hoist-variables": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-            "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-apprunner/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@babel/types": "^7.16.7"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6.9.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@babel/helper-module-imports": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-            "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-apprunner/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@babel/types": "^7.16.7"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-config-provider": "^3.0.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6.9.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@babel/helper-module-transforms": {
-            "version": "7.17.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz",
-            "integrity": "sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-apprunner/node_modules/@aws-sdk/token-providers": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@babel/helper-environment-visitor": "^7.16.7",
-                "@babel/helper-module-imports": "^7.16.7",
-                "@babel/helper-simple-access": "^7.17.7",
-                "@babel/helper-split-export-declaration": "^7.16.7",
-                "@babel/helper-validator-identifier": "^7.16.7",
-                "@babel/template": "^7.16.7",
-                "@babel/traverse": "^7.17.3",
-                "@babel/types": "^7.17.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6.9.0"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sso-oidc": "^3.693.0"
             }
         },
-        "node_modules/@babel/helper-simple-access": {
-            "version": "7.17.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz",
-            "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-apprunner/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@babel/types": "^7.17.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-endpoints": "^2.1.5",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6.9.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@babel/helper-split-export-declaration": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-            "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-apprunner/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@babel/types": "^7.16.7"
-            },
-            "engines": {
-                "node": ">=6.9.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/@babel/helper-validator-identifier": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-            "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-apprunner/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6.9.0"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
             }
         },
-        "node_modules/@babel/helper-validator-option": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-            "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-apprunner/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6.9.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@babel/helpers": {
-            "version": "7.17.7",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.7.tgz",
-            "integrity": "sha512-TKsj9NkjJfTBxM7Phfy7kv6yYc4ZcOo+AaWGqQOKTPDOmcGkIFb5xNA746eKisQkm4yavUYh4InYM9S+VnO01w==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-apprunner/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@babel/template": "^7.16.7",
-                "@babel/traverse": "^7.17.3",
-                "@babel/types": "^7.17.0"
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6.9.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@babel/highlight": {
-            "version": "7.16.10",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz",
-            "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-apprunner/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@babel/helper-validator-identifier": "^7.16.7",
-                "chalk": "^2.0.0",
-                "js-tokens": "^4.0.0"
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6.9.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@babel/highlight/node_modules/ansi-styles": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-            "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudcontrol": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "color-convert": "^1.9.0"
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/client-sts": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "@smithy/util-waiter": "^3.1.8",
+                "@types/uuid": "^9.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-cloudcontrol/node_modules/@aws-sdk/client-sso": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-cloudcontrol/node_modules/@aws-sdk/client-sso-oidc": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             },
-            "engines": {
-                "node": ">=4"
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/@babel/highlight/node_modules/chalk": {
-            "version": "2.4.2",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-            "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudcontrol/node_modules/@aws-sdk/client-sts": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "ansi-styles": "^3.2.1",
-                "escape-string-regexp": "^1.0.5",
-                "supports-color": "^5.3.0"
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-cloudcontrol/node_modules/@aws-sdk/core": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/signature-v4": "^4.2.2",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@babel/highlight/node_modules/color-convert": {
-            "version": "1.9.3",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudcontrol/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "color-name": "1.1.3"
-            }
-        },
-        "node_modules/@babel/highlight/node_modules/color-name": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-            "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-            "dev": true
-        },
-        "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-            "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-            "dev": true,
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-stream": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.8.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@babel/highlight/node_modules/has-flag": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-            "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudcontrol/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=4"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/@babel/highlight/node_modules/supports-color": {
-            "version": "5.5.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-            "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudcontrol/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "has-flag": "^3.0.0"
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-ini": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@babel/parser": {
-            "version": "7.17.7",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.7.tgz",
-            "integrity": "sha512-bm3AQf45vR4gKggRfvJdYJ0gFLoCbsPxiFLSH6hTVYABptNHY6l9NrhnucVjQ/X+SPtLANT9lc0fFhikj+VBRA==",
-            "bin": {
-                "parser": "bin/babel-parser.js"
+        "node_modules/@aws-sdk/client-cloudcontrol/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/client-sso": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/token-providers": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6.0.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@babel/template": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-            "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudcontrol/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@babel/code-frame": "^7.16.7",
-                "@babel/parser": "^7.16.7",
-                "@babel/types": "^7.16.7"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6.9.0"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/@babel/traverse": {
-            "version": "7.17.3",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz",
-            "integrity": "sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudcontrol/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@babel/code-frame": "^7.16.7",
-                "@babel/generator": "^7.17.3",
-                "@babel/helper-environment-visitor": "^7.16.7",
-                "@babel/helper-function-name": "^7.16.7",
-                "@babel/helper-hoist-variables": "^7.16.7",
-                "@babel/helper-split-export-declaration": "^7.16.7",
-                "@babel/parser": "^7.17.3",
-                "@babel/types": "^7.17.0",
-                "debug": "^4.1.0",
-                "globals": "^11.1.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6.9.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@babel/traverse/node_modules/globals": {
-            "version": "11.12.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-            "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudcontrol/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=4"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@babel/types": {
-            "version": "7.17.0",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz",
-            "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudcontrol/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@babel/helper-validator-identifier": "^7.16.7",
-                "to-fast-properties": "^2.0.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6.9.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@bcherny/json-schema-ref-parser": {
-            "version": "9.0.9",
-            "resolved": "https://registry.npmjs.org/@bcherny/json-schema-ref-parser/-/json-schema-ref-parser-9.0.9.tgz",
-            "integrity": "sha512-vmEmnJCfpkLdas++9OYg6riIezTYqTHpqUTODJzHLzs5UnXujbOJW9VwcVCnyo1mVRt32FRr23iXBx/sX8YbeQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudcontrol/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@jsdevtools/ono": "^7.1.3",
-                "@types/json-schema": "^7.0.6",
-                "call-me-maybe": "^1.0.1",
-                "js-yaml": "^4.1.0"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@colors/colors": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
-            "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
+        "node_modules/@aws-sdk/client-cloudcontrol/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-config-provider": "^3.0.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.1.90"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@cspotcode/source-map-consumer": {
-            "version": "0.8.0",
-            "resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz",
-            "integrity": "sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudcontrol/node_modules/@aws-sdk/token-providers": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 12"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sso-oidc": "^3.693.0"
             }
         },
-        "node_modules/@cspotcode/source-map-support": {
-            "version": "0.8.1",
-            "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
-            "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudcontrol/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@jridgewell/trace-mapping": "0.3.9"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-endpoints": "^2.1.5",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=12"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
-            "version": "0.3.9",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
-            "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudcontrol/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@jridgewell/resolve-uri": "^3.0.3",
-                "@jridgewell/sourcemap-codec": "^1.4.10"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/@dabh/diagnostics": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz",
-            "integrity": "sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==",
+        "node_modules/@aws-sdk/client-cloudcontrol/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "colorspace": "1.1.x",
-                "enabled": "2.0.x",
-                "kuler": "^2.0.0"
-            }
-        },
-        "node_modules/@discoveryjs/json-ext": {
-            "version": "0.5.5",
-            "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz",
-            "integrity": "sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA==",
-            "dev": true,
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=10.0.0"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
             }
         },
-        "node_modules/@esbuild/android-arm": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.13.tgz",
-            "integrity": "sha512-RY2fVI8O0iFUNvZirXaQ1vMvK0xhCcl0gqRj74Z6yEiO1zAUa7hbsdwZM1kzqbxHK7LFyMizipfXT3JME+12Hw==",
-            "cpu": [
-                "arm"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "android"
-            ],
+        "node_modules/@aws-sdk/client-cloudcontrol/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=12"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@esbuild/linux-loong64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.13.tgz",
-            "integrity": "sha512-+BoyIm4I8uJmH/QDIH0fu7MG0AEx9OXEDXnqptXCwKOlOqZiS4iraH1Nr7/ObLMokW3sOCeBNyD68ATcV9b9Ag==",
-            "cpu": [
-                "loong64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "linux"
-            ],
+        "node_modules/@aws-sdk/client-cloudcontrol/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=12"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@eslint/eslintrc": {
-            "version": "1.3.3",
-            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
-            "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudcontrol/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "ajv": "^6.12.4",
-                "debug": "^4.3.2",
-                "espree": "^9.4.0",
-                "globals": "^13.15.0",
-                "ignore": "^5.2.0",
-                "import-fresh": "^3.2.1",
-                "js-yaml": "^4.1.0",
-                "minimatch": "^3.1.2",
-                "strip-json-comments": "^3.1.1"
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "url": "https://opencollective.com/eslint"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@humanwhocodes/config-array": {
-            "version": "0.11.6",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.6.tgz",
-            "integrity": "sha512-jJr+hPTJYKyDILJfhNSHsjiwXYf26Flsz8DvNndOsHs5pwSnpGUEy8yzF0JYhCEvTDdV2vuOK5tt8BVhwO5/hg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudformation": {
+            "version": "3.682.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@humanwhocodes/object-schema": "^1.2.1",
-                "debug": "^4.1.1",
-                "minimatch": "^3.0.4"
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.682.0",
+                "@aws-sdk/client-sts": "3.682.0",
+                "@aws-sdk/core": "3.679.0",
+                "@aws-sdk/credential-provider-node": "3.682.0",
+                "@aws-sdk/middleware-host-header": "3.679.0",
+                "@aws-sdk/middleware-logger": "3.679.0",
+                "@aws-sdk/middleware-recursion-detection": "3.679.0",
+                "@aws-sdk/middleware-user-agent": "3.682.0",
+                "@aws-sdk/region-config-resolver": "3.679.0",
+                "@aws-sdk/types": "3.679.0",
+                "@aws-sdk/util-endpoints": "3.679.0",
+                "@aws-sdk/util-user-agent-browser": "3.679.0",
+                "@aws-sdk/util-user-agent-node": "3.682.0",
+                "@smithy/config-resolver": "^3.0.9",
+                "@smithy/core": "^2.4.8",
+                "@smithy/fetch-http-handler": "^3.2.9",
+                "@smithy/hash-node": "^3.0.7",
+                "@smithy/invalid-dependency": "^3.0.7",
+                "@smithy/middleware-content-length": "^3.0.9",
+                "@smithy/middleware-endpoint": "^3.1.4",
+                "@smithy/middleware-retry": "^3.0.23",
+                "@smithy/middleware-serde": "^3.0.7",
+                "@smithy/middleware-stack": "^3.0.7",
+                "@smithy/node-config-provider": "^3.1.8",
+                "@smithy/node-http-handler": "^3.2.4",
+                "@smithy/protocol-http": "^4.1.4",
+                "@smithy/smithy-client": "^3.4.0",
+                "@smithy/types": "^3.5.0",
+                "@smithy/url-parser": "^3.0.7",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.23",
+                "@smithy/util-defaults-mode-node": "^3.0.23",
+                "@smithy/util-endpoints": "^2.1.3",
+                "@smithy/util-middleware": "^3.0.7",
+                "@smithy/util-retry": "^3.0.7",
+                "@smithy/util-utf8": "^3.0.0",
+                "@smithy/util-waiter": "^3.1.6",
+                "@types/uuid": "^9.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-cloudformation/node_modules/@aws-sdk/client-sso": {
+            "version": "3.682.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.679.0",
+                "@aws-sdk/middleware-host-header": "3.679.0",
+                "@aws-sdk/middleware-logger": "3.679.0",
+                "@aws-sdk/middleware-recursion-detection": "3.679.0",
+                "@aws-sdk/middleware-user-agent": "3.682.0",
+                "@aws-sdk/region-config-resolver": "3.679.0",
+                "@aws-sdk/types": "3.679.0",
+                "@aws-sdk/util-endpoints": "3.679.0",
+                "@aws-sdk/util-user-agent-browser": "3.679.0",
+                "@aws-sdk/util-user-agent-node": "3.682.0",
+                "@smithy/config-resolver": "^3.0.9",
+                "@smithy/core": "^2.4.8",
+                "@smithy/fetch-http-handler": "^3.2.9",
+                "@smithy/hash-node": "^3.0.7",
+                "@smithy/invalid-dependency": "^3.0.7",
+                "@smithy/middleware-content-length": "^3.0.9",
+                "@smithy/middleware-endpoint": "^3.1.4",
+                "@smithy/middleware-retry": "^3.0.23",
+                "@smithy/middleware-serde": "^3.0.7",
+                "@smithy/middleware-stack": "^3.0.7",
+                "@smithy/node-config-provider": "^3.1.8",
+                "@smithy/node-http-handler": "^3.2.4",
+                "@smithy/protocol-http": "^4.1.4",
+                "@smithy/smithy-client": "^3.4.0",
+                "@smithy/types": "^3.5.0",
+                "@smithy/url-parser": "^3.0.7",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.23",
+                "@smithy/util-defaults-mode-node": "^3.0.23",
+                "@smithy/util-endpoints": "^2.1.3",
+                "@smithy/util-middleware": "^3.0.7",
+                "@smithy/util-retry": "^3.0.7",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-cloudformation/node_modules/@aws-sdk/client-sso-oidc": {
+            "version": "3.682.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.679.0",
+                "@aws-sdk/credential-provider-node": "3.682.0",
+                "@aws-sdk/middleware-host-header": "3.679.0",
+                "@aws-sdk/middleware-logger": "3.679.0",
+                "@aws-sdk/middleware-recursion-detection": "3.679.0",
+                "@aws-sdk/middleware-user-agent": "3.682.0",
+                "@aws-sdk/region-config-resolver": "3.679.0",
+                "@aws-sdk/types": "3.679.0",
+                "@aws-sdk/util-endpoints": "3.679.0",
+                "@aws-sdk/util-user-agent-browser": "3.679.0",
+                "@aws-sdk/util-user-agent-node": "3.682.0",
+                "@smithy/config-resolver": "^3.0.9",
+                "@smithy/core": "^2.4.8",
+                "@smithy/fetch-http-handler": "^3.2.9",
+                "@smithy/hash-node": "^3.0.7",
+                "@smithy/invalid-dependency": "^3.0.7",
+                "@smithy/middleware-content-length": "^3.0.9",
+                "@smithy/middleware-endpoint": "^3.1.4",
+                "@smithy/middleware-retry": "^3.0.23",
+                "@smithy/middleware-serde": "^3.0.7",
+                "@smithy/middleware-stack": "^3.0.7",
+                "@smithy/node-config-provider": "^3.1.8",
+                "@smithy/node-http-handler": "^3.2.4",
+                "@smithy/protocol-http": "^4.1.4",
+                "@smithy/smithy-client": "^3.4.0",
+                "@smithy/types": "^3.5.0",
+                "@smithy/url-parser": "^3.0.7",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.23",
+                "@smithy/util-defaults-mode-node": "^3.0.23",
+                "@smithy/util-endpoints": "^2.1.3",
+                "@smithy/util-middleware": "^3.0.7",
+                "@smithy/util-retry": "^3.0.7",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             },
-            "engines": {
-                "node": ">=10.10.0"
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.682.0"
             }
         },
-        "node_modules/@humanwhocodes/module-importer": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-            "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-            "dev": true,
-            "engines": {
-                "node": ">=12.22"
+        "node_modules/@aws-sdk/client-cloudformation/node_modules/@aws-sdk/client-sts": {
+            "version": "3.682.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.682.0",
+                "@aws-sdk/core": "3.679.0",
+                "@aws-sdk/credential-provider-node": "3.682.0",
+                "@aws-sdk/middleware-host-header": "3.679.0",
+                "@aws-sdk/middleware-logger": "3.679.0",
+                "@aws-sdk/middleware-recursion-detection": "3.679.0",
+                "@aws-sdk/middleware-user-agent": "3.682.0",
+                "@aws-sdk/region-config-resolver": "3.679.0",
+                "@aws-sdk/types": "3.679.0",
+                "@aws-sdk/util-endpoints": "3.679.0",
+                "@aws-sdk/util-user-agent-browser": "3.679.0",
+                "@aws-sdk/util-user-agent-node": "3.682.0",
+                "@smithy/config-resolver": "^3.0.9",
+                "@smithy/core": "^2.4.8",
+                "@smithy/fetch-http-handler": "^3.2.9",
+                "@smithy/hash-node": "^3.0.7",
+                "@smithy/invalid-dependency": "^3.0.7",
+                "@smithy/middleware-content-length": "^3.0.9",
+                "@smithy/middleware-endpoint": "^3.1.4",
+                "@smithy/middleware-retry": "^3.0.23",
+                "@smithy/middleware-serde": "^3.0.7",
+                "@smithy/middleware-stack": "^3.0.7",
+                "@smithy/node-config-provider": "^3.1.8",
+                "@smithy/node-http-handler": "^3.2.4",
+                "@smithy/protocol-http": "^4.1.4",
+                "@smithy/smithy-client": "^3.4.0",
+                "@smithy/types": "^3.5.0",
+                "@smithy/url-parser": "^3.0.7",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.23",
+                "@smithy/util-defaults-mode-node": "^3.0.23",
+                "@smithy/util-endpoints": "^2.1.3",
+                "@smithy/util-middleware": "^3.0.7",
+                "@smithy/util-retry": "^3.0.7",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-cloudformation/node_modules/@aws-sdk/core": {
+            "version": "3.679.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/core": "^2.4.8",
+                "@smithy/node-config-provider": "^3.1.8",
+                "@smithy/property-provider": "^3.1.7",
+                "@smithy/protocol-http": "^4.1.4",
+                "@smithy/signature-v4": "^4.2.0",
+                "@smithy/smithy-client": "^3.4.0",
+                "@smithy/types": "^3.5.0",
+                "@smithy/util-middleware": "^3.0.7",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/nzakas"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@humanwhocodes/object-schema": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-            "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-            "dev": true
-        },
-        "node_modules/@iarna/toml": {
-            "version": "2.2.5",
-            "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz",
-            "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="
-        },
-        "node_modules/@istanbuljs/load-nyc-config": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-            "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudformation/node_modules/@aws-sdk/credential-provider-env": {
+            "version": "3.679.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "camelcase": "^5.3.1",
-                "find-up": "^4.1.0",
-                "get-package-type": "^0.1.0",
-                "js-yaml": "^3.13.1",
-                "resolve-from": "^5.0.0"
+                "@aws-sdk/core": "3.679.0",
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/property-provider": "^3.1.7",
+                "@smithy/types": "^3.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": {
-            "version": "1.0.10",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudformation/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.679.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "sprintf-js": "~1.0.2"
+                "@aws-sdk/core": "3.679.0",
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/fetch-http-handler": "^3.2.9",
+                "@smithy/node-http-handler": "^3.2.4",
+                "@smithy/property-provider": "^3.1.7",
+                "@smithy/protocol-http": "^4.1.4",
+                "@smithy/smithy-client": "^3.4.0",
+                "@smithy/types": "^3.5.0",
+                "@smithy/util-stream": "^3.1.9",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@istanbuljs/load-nyc-config/node_modules/camelcase": {
-            "version": "5.3.1",
-            "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-            "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudformation/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.682.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.679.0",
+                "@aws-sdk/credential-provider-env": "3.679.0",
+                "@aws-sdk/credential-provider-http": "3.679.0",
+                "@aws-sdk/credential-provider-process": "3.679.0",
+                "@aws-sdk/credential-provider-sso": "3.682.0",
+                "@aws-sdk/credential-provider-web-identity": "3.679.0",
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/credential-provider-imds": "^3.2.4",
+                "@smithy/property-provider": "^3.1.7",
+                "@smithy/shared-ini-file-loader": "^3.1.8",
+                "@smithy/types": "^3.5.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.682.0"
             }
         },
-        "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-            "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudformation/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.682.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "locate-path": "^5.0.0",
-                "path-exists": "^4.0.0"
+                "@aws-sdk/credential-provider-env": "3.679.0",
+                "@aws-sdk/credential-provider-http": "3.679.0",
+                "@aws-sdk/credential-provider-ini": "3.682.0",
+                "@aws-sdk/credential-provider-process": "3.679.0",
+                "@aws-sdk/credential-provider-sso": "3.682.0",
+                "@aws-sdk/credential-provider-web-identity": "3.679.0",
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/credential-provider-imds": "^3.2.4",
+                "@smithy/property-provider": "^3.1.7",
+                "@smithy/shared-ini-file-loader": "^3.1.8",
+                "@smithy/types": "^3.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
-            "version": "3.14.1",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-            "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudformation/node_modules/@aws-sdk/credential-provider-process": {
+            "version": "3.679.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "argparse": "^1.0.7",
-                "esprima": "^4.0.0"
+                "@aws-sdk/core": "3.679.0",
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/property-provider": "^3.1.7",
+                "@smithy/shared-ini-file-loader": "^3.1.8",
+                "@smithy/types": "^3.5.0",
+                "tslib": "^2.6.2"
             },
-            "bin": {
-                "js-yaml": "bin/js-yaml.js"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-            "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudformation/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.682.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "p-locate": "^4.1.0"
+                "@aws-sdk/client-sso": "3.682.0",
+                "@aws-sdk/core": "3.679.0",
+                "@aws-sdk/token-providers": "3.679.0",
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/property-provider": "^3.1.7",
+                "@smithy/shared-ini-file-loader": "^3.1.8",
+                "@smithy/types": "^3.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-            "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudformation/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.679.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "p-try": "^2.0.0"
+                "@aws-sdk/core": "3.679.0",
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/property-provider": "^3.1.7",
+                "@smithy/types": "^3.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6"
+                "node": ">=16.0.0"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.679.0"
             }
         },
-        "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-            "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudformation/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.679.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "p-limit": "^2.2.0"
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/protocol-http": "^4.1.4",
+                "@smithy/types": "^3.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-            "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudformation/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.679.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/types": "^3.5.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@istanbuljs/schema": {
-            "version": "0.1.3",
-            "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-            "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudformation/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.679.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/protocol-http": "^4.1.4",
+                "@smithy/types": "^3.5.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@jridgewell/gen-mapping": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-            "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudformation/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.682.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@jridgewell/set-array": "^1.0.1",
-                "@jridgewell/sourcemap-codec": "^1.4.10",
-                "@jridgewell/trace-mapping": "^0.3.9"
+                "@aws-sdk/core": "3.679.0",
+                "@aws-sdk/types": "3.679.0",
+                "@aws-sdk/util-endpoints": "3.679.0",
+                "@smithy/core": "^2.4.8",
+                "@smithy/protocol-http": "^4.1.4",
+                "@smithy/types": "^3.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6.0.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@jridgewell/resolve-uri": {
-            "version": "3.0.5",
-            "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz",
-            "integrity": "sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudformation/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.679.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/node-config-provider": "^3.1.8",
+                "@smithy/types": "^3.5.0",
+                "@smithy/util-config-provider": "^3.0.0",
+                "@smithy/util-middleware": "^3.0.7",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6.0.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@jridgewell/set-array": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-            "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudformation/node_modules/@aws-sdk/token-providers": {
+            "version": "3.679.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/property-provider": "^3.1.7",
+                "@smithy/shared-ini-file-loader": "^3.1.8",
+                "@smithy/types": "^3.5.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6.0.0"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sso-oidc": "^3.679.0"
             }
         },
-        "node_modules/@jridgewell/source-map": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
-            "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudformation/node_modules/@aws-sdk/types": {
+            "version": "3.679.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@jridgewell/gen-mapping": "^0.3.0",
-                "@jridgewell/trace-mapping": "^0.3.9"
+                "@smithy/types": "^3.5.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@jridgewell/sourcemap-codec": {
-            "version": "1.4.11",
-            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz",
-            "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==",
-            "dev": true
-        },
-        "node_modules/@jridgewell/trace-mapping": {
-            "version": "0.3.14",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz",
-            "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudformation/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.679.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@jridgewell/resolve-uri": "^3.0.3",
-                "@jridgewell/sourcemap-codec": "^1.4.10"
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/types": "^3.5.0",
+                "@smithy/util-endpoints": "^2.1.3",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@jsdevtools/ono": {
-            "version": "7.1.3",
-            "resolved": "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz",
-            "integrity": "sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==",
-            "dev": true
-        },
-        "node_modules/@leichtgewicht/ip-codec": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
-            "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==",
-            "dev": true
+        "node_modules/@aws-sdk/client-cloudformation/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.679.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/types": "^3.5.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
+            }
         },
-        "node_modules/@nodelib/fs.scandir": {
-            "version": "2.1.5",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-            "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudformation/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.682.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@nodelib/fs.stat": "2.0.5",
-                "run-parallel": "^1.1.9"
+                "@aws-sdk/middleware-user-agent": "3.682.0",
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/node-config-provider": "^3.1.8",
+                "@smithy/types": "^3.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 8"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
             }
         },
-        "node_modules/@nodelib/fs.stat": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-            "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-            "dev": true,
-            "engines": {
-                "node": ">= 8"
+        "node_modules/@aws-sdk/client-cloudformation/node_modules/@smithy/fetch-http-handler": {
+            "version": "3.2.9",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/protocol-http": "^4.1.4",
+                "@smithy/querystring-builder": "^3.0.7",
+                "@smithy/types": "^3.5.0",
+                "@smithy/util-base64": "^3.0.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/@nodelib/fs.walk": {
-            "version": "1.2.8",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-            "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudformation/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@nodelib/fs.scandir": "2.1.5",
-                "fastq": "^1.6.0"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@sindresorhus/is": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.2.0.tgz",
-            "integrity": "sha512-VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw==",
-            "engines": {
-                "node": ">=10"
+        "node_modules/@aws-sdk/client-cloudformation/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sindresorhus/is?sponsor=1"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@sinonjs/commons": {
-            "version": "1.8.3",
-            "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
-            "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudformation/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "type-detect": "4.0.8"
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@sinonjs/fake-timers": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
-            "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudwatch-logs": {
+            "version": "3.682.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@sinonjs/commons": "^1.7.0"
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.682.0",
+                "@aws-sdk/client-sts": "3.682.0",
+                "@aws-sdk/core": "3.679.0",
+                "@aws-sdk/credential-provider-node": "3.682.0",
+                "@aws-sdk/middleware-host-header": "3.679.0",
+                "@aws-sdk/middleware-logger": "3.679.0",
+                "@aws-sdk/middleware-recursion-detection": "3.679.0",
+                "@aws-sdk/middleware-user-agent": "3.682.0",
+                "@aws-sdk/region-config-resolver": "3.679.0",
+                "@aws-sdk/types": "3.679.0",
+                "@aws-sdk/util-endpoints": "3.679.0",
+                "@aws-sdk/util-user-agent-browser": "3.679.0",
+                "@aws-sdk/util-user-agent-node": "3.682.0",
+                "@smithy/config-resolver": "^3.0.9",
+                "@smithy/core": "^2.4.8",
+                "@smithy/eventstream-serde-browser": "^3.0.10",
+                "@smithy/eventstream-serde-config-resolver": "^3.0.7",
+                "@smithy/eventstream-serde-node": "^3.0.9",
+                "@smithy/fetch-http-handler": "^3.2.9",
+                "@smithy/hash-node": "^3.0.7",
+                "@smithy/invalid-dependency": "^3.0.7",
+                "@smithy/middleware-content-length": "^3.0.9",
+                "@smithy/middleware-endpoint": "^3.1.4",
+                "@smithy/middleware-retry": "^3.0.23",
+                "@smithy/middleware-serde": "^3.0.7",
+                "@smithy/middleware-stack": "^3.0.7",
+                "@smithy/node-config-provider": "^3.1.8",
+                "@smithy/node-http-handler": "^3.2.4",
+                "@smithy/protocol-http": "^4.1.4",
+                "@smithy/smithy-client": "^3.4.0",
+                "@smithy/types": "^3.5.0",
+                "@smithy/url-parser": "^3.0.7",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.23",
+                "@smithy/util-defaults-mode-node": "^3.0.23",
+                "@smithy/util-endpoints": "^2.1.3",
+                "@smithy/util-middleware": "^3.0.7",
+                "@smithy/util-retry": "^3.0.7",
+                "@smithy/util-utf8": "^3.0.0",
+                "@types/uuid": "^9.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/client-sso": {
+            "version": "3.682.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.679.0",
+                "@aws-sdk/middleware-host-header": "3.679.0",
+                "@aws-sdk/middleware-logger": "3.679.0",
+                "@aws-sdk/middleware-recursion-detection": "3.679.0",
+                "@aws-sdk/middleware-user-agent": "3.682.0",
+                "@aws-sdk/region-config-resolver": "3.679.0",
+                "@aws-sdk/types": "3.679.0",
+                "@aws-sdk/util-endpoints": "3.679.0",
+                "@aws-sdk/util-user-agent-browser": "3.679.0",
+                "@aws-sdk/util-user-agent-node": "3.682.0",
+                "@smithy/config-resolver": "^3.0.9",
+                "@smithy/core": "^2.4.8",
+                "@smithy/fetch-http-handler": "^3.2.9",
+                "@smithy/hash-node": "^3.0.7",
+                "@smithy/invalid-dependency": "^3.0.7",
+                "@smithy/middleware-content-length": "^3.0.9",
+                "@smithy/middleware-endpoint": "^3.1.4",
+                "@smithy/middleware-retry": "^3.0.23",
+                "@smithy/middleware-serde": "^3.0.7",
+                "@smithy/middleware-stack": "^3.0.7",
+                "@smithy/node-config-provider": "^3.1.8",
+                "@smithy/node-http-handler": "^3.2.4",
+                "@smithy/protocol-http": "^4.1.4",
+                "@smithy/smithy-client": "^3.4.0",
+                "@smithy/types": "^3.5.0",
+                "@smithy/url-parser": "^3.0.7",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.23",
+                "@smithy/util-defaults-mode-node": "^3.0.23",
+                "@smithy/util-endpoints": "^2.1.3",
+                "@smithy/util-middleware": "^3.0.7",
+                "@smithy/util-retry": "^3.0.7",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/client-sso-oidc": {
+            "version": "3.682.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.679.0",
+                "@aws-sdk/credential-provider-node": "3.682.0",
+                "@aws-sdk/middleware-host-header": "3.679.0",
+                "@aws-sdk/middleware-logger": "3.679.0",
+                "@aws-sdk/middleware-recursion-detection": "3.679.0",
+                "@aws-sdk/middleware-user-agent": "3.682.0",
+                "@aws-sdk/region-config-resolver": "3.679.0",
+                "@aws-sdk/types": "3.679.0",
+                "@aws-sdk/util-endpoints": "3.679.0",
+                "@aws-sdk/util-user-agent-browser": "3.679.0",
+                "@aws-sdk/util-user-agent-node": "3.682.0",
+                "@smithy/config-resolver": "^3.0.9",
+                "@smithy/core": "^2.4.8",
+                "@smithy/fetch-http-handler": "^3.2.9",
+                "@smithy/hash-node": "^3.0.7",
+                "@smithy/invalid-dependency": "^3.0.7",
+                "@smithy/middleware-content-length": "^3.0.9",
+                "@smithy/middleware-endpoint": "^3.1.4",
+                "@smithy/middleware-retry": "^3.0.23",
+                "@smithy/middleware-serde": "^3.0.7",
+                "@smithy/middleware-stack": "^3.0.7",
+                "@smithy/node-config-provider": "^3.1.8",
+                "@smithy/node-http-handler": "^3.2.4",
+                "@smithy/protocol-http": "^4.1.4",
+                "@smithy/smithy-client": "^3.4.0",
+                "@smithy/types": "^3.5.0",
+                "@smithy/url-parser": "^3.0.7",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.23",
+                "@smithy/util-defaults-mode-node": "^3.0.23",
+                "@smithy/util-endpoints": "^2.1.3",
+                "@smithy/util-middleware": "^3.0.7",
+                "@smithy/util-retry": "^3.0.7",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.682.0"
             }
         },
-        "node_modules/@sinonjs/samsam": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-6.1.1.tgz",
-            "integrity": "sha512-cZ7rKJTLiE7u7Wi/v9Hc2fs3Ucc3jrWeMgPHbbTCeVAB2S0wOBbYlkJVeNSL04i7fdhT8wIbDq1zhC/PXTD2SA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/client-sts": {
+            "version": "3.682.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@sinonjs/commons": "^1.6.0",
-                "lodash.get": "^4.4.2",
-                "type-detect": "^4.0.8"
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.682.0",
+                "@aws-sdk/core": "3.679.0",
+                "@aws-sdk/credential-provider-node": "3.682.0",
+                "@aws-sdk/middleware-host-header": "3.679.0",
+                "@aws-sdk/middleware-logger": "3.679.0",
+                "@aws-sdk/middleware-recursion-detection": "3.679.0",
+                "@aws-sdk/middleware-user-agent": "3.682.0",
+                "@aws-sdk/region-config-resolver": "3.679.0",
+                "@aws-sdk/types": "3.679.0",
+                "@aws-sdk/util-endpoints": "3.679.0",
+                "@aws-sdk/util-user-agent-browser": "3.679.0",
+                "@aws-sdk/util-user-agent-node": "3.682.0",
+                "@smithy/config-resolver": "^3.0.9",
+                "@smithy/core": "^2.4.8",
+                "@smithy/fetch-http-handler": "^3.2.9",
+                "@smithy/hash-node": "^3.0.7",
+                "@smithy/invalid-dependency": "^3.0.7",
+                "@smithy/middleware-content-length": "^3.0.9",
+                "@smithy/middleware-endpoint": "^3.1.4",
+                "@smithy/middleware-retry": "^3.0.23",
+                "@smithy/middleware-serde": "^3.0.7",
+                "@smithy/middleware-stack": "^3.0.7",
+                "@smithy/node-config-provider": "^3.1.8",
+                "@smithy/node-http-handler": "^3.2.4",
+                "@smithy/protocol-http": "^4.1.4",
+                "@smithy/smithy-client": "^3.4.0",
+                "@smithy/types": "^3.5.0",
+                "@smithy/url-parser": "^3.0.7",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.23",
+                "@smithy/util-defaults-mode-node": "^3.0.23",
+                "@smithy/util-endpoints": "^2.1.3",
+                "@smithy/util-middleware": "^3.0.7",
+                "@smithy/util-retry": "^3.0.7",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/core": {
+            "version": "3.679.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/core": "^2.4.8",
+                "@smithy/node-config-provider": "^3.1.8",
+                "@smithy/property-provider": "^3.1.7",
+                "@smithy/protocol-http": "^4.1.4",
+                "@smithy/signature-v4": "^4.2.0",
+                "@smithy/smithy-client": "^3.4.0",
+                "@smithy/types": "^3.5.0",
+                "@smithy/util-middleware": "^3.0.7",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@sinonjs/text-encoding": {
-            "version": "0.7.1",
-            "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz",
-            "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==",
-            "dev": true
-        },
-        "node_modules/@szmarczak/http-timer": {
-            "version": "4.0.6",
-            "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
-            "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
+        "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/credential-provider-env": {
+            "version": "3.679.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "defer-to-connect": "^2.0.0"
+                "@aws-sdk/core": "3.679.0",
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/property-provider": "^3.1.7",
+                "@smithy/types": "^3.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@tootallnate/once": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
-            "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.679.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.679.0",
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/fetch-http-handler": "^3.2.9",
+                "@smithy/node-http-handler": "^3.2.4",
+                "@smithy/property-provider": "^3.1.7",
+                "@smithy/protocol-http": "^4.1.4",
+                "@smithy/smithy-client": "^3.4.0",
+                "@smithy/types": "^3.5.0",
+                "@smithy/util-stream": "^3.1.9",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 6"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@ts-morph/common": {
-            "version": "0.18.0",
-            "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.18.0.tgz",
-            "integrity": "sha512-UvWF+oQdMa4qMWhXTOd2JWtAbAJGgkPMNzGHgEcfOwQRIcViKdwsSqXXjSaQCZ4fo+bZMhdfuwQCjlW5bNcqEQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.682.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "fast-glob": "^3.2.12",
-                "minimatch": "^5.1.0",
-                "mkdirp": "^1.0.4",
-                "path-browserify": "^1.0.1"
+                "@aws-sdk/core": "3.679.0",
+                "@aws-sdk/credential-provider-env": "3.679.0",
+                "@aws-sdk/credential-provider-http": "3.679.0",
+                "@aws-sdk/credential-provider-process": "3.679.0",
+                "@aws-sdk/credential-provider-sso": "3.682.0",
+                "@aws-sdk/credential-provider-web-identity": "3.679.0",
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/credential-provider-imds": "^3.2.4",
+                "@smithy/property-provider": "^3.1.7",
+                "@smithy/shared-ini-file-loader": "^3.1.8",
+                "@smithy/types": "^3.5.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.682.0"
             }
         },
-        "node_modules/@ts-morph/common/node_modules/brace-expansion": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.682.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "balanced-match": "^1.0.0"
+                "@aws-sdk/credential-provider-env": "3.679.0",
+                "@aws-sdk/credential-provider-http": "3.679.0",
+                "@aws-sdk/credential-provider-ini": "3.682.0",
+                "@aws-sdk/credential-provider-process": "3.679.0",
+                "@aws-sdk/credential-provider-sso": "3.682.0",
+                "@aws-sdk/credential-provider-web-identity": "3.679.0",
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/credential-provider-imds": "^3.2.4",
+                "@smithy/property-provider": "^3.1.7",
+                "@smithy/shared-ini-file-loader": "^3.1.8",
+                "@smithy/types": "^3.5.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@ts-morph/common/node_modules/minimatch": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.1.tgz",
-            "integrity": "sha512-362NP+zlprccbEt/SkxKfRMHnNY85V74mVnpUpNyr3F35covl09Kec7/sEFLt3RA4oXmewtoaanoIf67SE5Y5g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/credential-provider-process": {
+            "version": "3.679.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "brace-expansion": "^2.0.1"
+                "@aws-sdk/core": "3.679.0",
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/property-provider": "^3.1.7",
+                "@smithy/shared-ini-file-loader": "^3.1.8",
+                "@smithy/types": "^3.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@ts-morph/common/node_modules/mkdirp": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-            "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-            "dev": true,
-            "bin": {
-                "mkdirp": "bin/cmd.js"
+        "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.682.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/client-sso": "3.682.0",
+                "@aws-sdk/core": "3.679.0",
+                "@aws-sdk/token-providers": "3.679.0",
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/property-provider": "^3.1.7",
+                "@smithy/shared-ini-file-loader": "^3.1.8",
+                "@smithy/types": "^3.5.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@tsconfig/node10": {
-            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz",
-            "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==",
-            "dev": true
-        },
-        "node_modules/@tsconfig/node12": {
-            "version": "1.0.9",
-            "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz",
-            "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==",
-            "dev": true
-        },
-        "node_modules/@tsconfig/node14": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz",
-            "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==",
-            "dev": true
-        },
-        "node_modules/@tsconfig/node16": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz",
-            "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==",
-            "dev": true
-        },
-        "node_modules/@types/adm-zip": {
-            "version": "0.4.34",
-            "resolved": "https://registry.npmjs.org/@types/adm-zip/-/adm-zip-0.4.34.tgz",
-            "integrity": "sha512-8ToYLLAYhkRfcmmljrKi22gT2pqu7hGMDtORP1emwIEGmgUTZOsaDjzWFzW5N2frcFRz/50CWt4zA1CxJ73pmQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.679.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@types/node": "*"
+                "@aws-sdk/core": "3.679.0",
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/property-provider": "^3.1.7",
+                "@smithy/types": "^3.5.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.679.0"
             }
         },
-        "node_modules/@types/async-lock": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/@types/async-lock/-/async-lock-1.1.3.tgz",
-            "integrity": "sha512-UpeDcjGKsYEQMeqEbfESm8OWJI305I7b9KE4ji3aBjoKWyN5CTdn8izcA1FM1DVDne30R5fNEnIy89vZw5LXJQ==",
-            "dev": true
-        },
-        "node_modules/@types/body-parser": {
-            "version": "1.19.2",
-            "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
-            "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.679.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@types/connect": "*",
-                "@types/node": "*"
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/protocol-http": "^4.1.4",
+                "@smithy/types": "^3.5.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@types/bonjour": {
-            "version": "3.5.10",
-            "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
-            "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.679.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@types/node": "*"
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/types": "^3.5.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@types/bytes": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/@types/bytes/-/bytes-3.1.1.tgz",
-            "integrity": "sha512-lOGyCnw+2JVPKU3wIV0srU0NyALwTBJlVSx5DfMQOFuuohA8y9S8orImpuIQikZ0uIQ8gehrRjxgQC1rLRi11w==",
-            "dev": true
+        "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.679.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/protocol-http": "^4.1.4",
+                "@smithy/types": "^3.5.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "node_modules/@types/cacheable-request": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz",
-            "integrity": "sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==",
+        "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.682.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@types/http-cache-semantics": "*",
-                "@types/keyv": "*",
-                "@types/node": "*",
-                "@types/responselike": "*"
+                "@aws-sdk/core": "3.679.0",
+                "@aws-sdk/types": "3.679.0",
+                "@aws-sdk/util-endpoints": "3.679.0",
+                "@smithy/core": "^2.4.8",
+                "@smithy/protocol-http": "^4.1.4",
+                "@smithy/types": "^3.5.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@types/connect": {
-            "version": "3.4.35",
-            "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
-            "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.679.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@types/node": "*"
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/node-config-provider": "^3.1.8",
+                "@smithy/types": "^3.5.0",
+                "@smithy/util-config-provider": "^3.0.0",
+                "@smithy/util-middleware": "^3.0.7",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@types/connect-history-api-fallback": {
-            "version": "1.3.5",
-            "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz",
-            "integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/token-providers": {
+            "version": "3.679.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@types/express-serve-static-core": "*",
-                "@types/node": "*"
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/property-provider": "^3.1.7",
+                "@smithy/shared-ini-file-loader": "^3.1.8",
+                "@smithy/types": "^3.5.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sso-oidc": "^3.679.0"
             }
         },
-        "node_modules/@types/cross-spawn": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/@types/cross-spawn/-/cross-spawn-6.0.2.tgz",
-            "integrity": "sha512-KuwNhp3eza+Rhu8IFI5HUXRP0LIhqH5cAjubUvGXXthh4YYBuP2ntwEX+Cz8GJoZUHlKo247wPWOfA9LYEq4cw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/types": {
+            "version": "3.679.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@types/node": "*"
+                "@smithy/types": "^3.5.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@types/eslint": {
-            "version": "7.28.2",
-            "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.2.tgz",
-            "integrity": "sha512-KubbADPkfoU75KgKeKLsFHXnU4ipH7wYg0TRT33NK3N3yiu7jlFAAoygIWBV+KbuHx/G+AvuGX6DllnK35gfJA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.679.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@types/estree": "*",
-                "@types/json-schema": "*"
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/types": "^3.5.0",
+                "@smithy/util-endpoints": "^2.1.3",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@types/eslint-scope": {
-            "version": "3.7.1",
-            "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.1.tgz",
-            "integrity": "sha512-SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.679.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@types/eslint": "*",
-                "@types/estree": "*"
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/types": "^3.5.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/@types/estree": {
-            "version": "0.0.50",
-            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
-            "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==",
-            "dev": true
+        "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.682.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/middleware-user-agent": "3.682.0",
+                "@aws-sdk/types": "3.679.0",
+                "@smithy/node-config-provider": "^3.1.8",
+                "@smithy/types": "^3.5.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
+            }
         },
-        "node_modules/@types/express": {
-            "version": "4.17.13",
-            "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz",
-            "integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/fetch-http-handler": {
+            "version": "3.2.9",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@types/body-parser": "*",
-                "@types/express-serve-static-core": "^4.17.18",
-                "@types/qs": "*",
-                "@types/serve-static": "*"
+                "@smithy/protocol-http": "^4.1.4",
+                "@smithy/querystring-builder": "^3.0.7",
+                "@smithy/types": "^3.5.0",
+                "@smithy/util-base64": "^3.0.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/@types/express-serve-static-core": {
-            "version": "4.17.28",
-            "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz",
-            "integrity": "sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@types/node": "*",
-                "@types/qs": "*",
-                "@types/range-parser": "*"
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@types/fs-extra": {
-            "version": "9.0.13",
-            "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz",
-            "integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@types/node": "*"
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@types/glob": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
-            "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cloudwatch-logs/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@types/minimatch": "*",
-                "@types/node": "*"
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/@types/http-cache-semantics": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
-            "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="
+        "node_modules/@aws-sdk/client-codecatalyst": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/token-providers": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "@types/uuid": "^9.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.758.0",
+                "@aws-sdk/middleware-host-header": "3.734.0",
+                "@aws-sdk/middleware-logger": "3.734.0",
+                "@aws-sdk/middleware-recursion-detection": "3.734.0",
+                "@aws-sdk/middleware-user-agent": "3.758.0",
+                "@aws-sdk/region-config-resolver": "3.734.0",
+                "@aws-sdk/types": "3.734.0",
+                "@aws-sdk/util-endpoints": "3.743.0",
+                "@aws-sdk/util-user-agent-browser": "3.734.0",
+                "@aws-sdk/util-user-agent-node": "3.758.0",
+                "@smithy/config-resolver": "^4.0.1",
+                "@smithy/core": "^3.1.5",
+                "@smithy/fetch-http-handler": "^5.0.1",
+                "@smithy/hash-node": "^4.0.1",
+                "@smithy/invalid-dependency": "^4.0.1",
+                "@smithy/middleware-content-length": "^4.0.1",
+                "@smithy/middleware-endpoint": "^4.0.6",
+                "@smithy/middleware-retry": "^4.0.7",
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/middleware-stack": "^4.0.1",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/node-http-handler": "^4.0.3",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.7",
+                "@smithy/util-defaults-mode-node": "^4.0.7",
+                "@smithy/util-endpoints": "^3.0.1",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-retry": "^4.0.1",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.758.0",
+                "@aws-sdk/credential-provider-node": "3.758.0",
+                "@aws-sdk/middleware-host-header": "3.734.0",
+                "@aws-sdk/middleware-logger": "3.734.0",
+                "@aws-sdk/middleware-recursion-detection": "3.734.0",
+                "@aws-sdk/middleware-user-agent": "3.758.0",
+                "@aws-sdk/region-config-resolver": "3.734.0",
+                "@aws-sdk/types": "3.734.0",
+                "@aws-sdk/util-endpoints": "3.743.0",
+                "@aws-sdk/util-user-agent-browser": "3.734.0",
+                "@aws-sdk/util-user-agent-node": "3.758.0",
+                "@smithy/config-resolver": "^4.0.1",
+                "@smithy/core": "^3.1.5",
+                "@smithy/fetch-http-handler": "^5.0.1",
+                "@smithy/hash-node": "^4.0.1",
+                "@smithy/invalid-dependency": "^4.0.1",
+                "@smithy/middleware-content-length": "^4.0.1",
+                "@smithy/middleware-endpoint": "^4.0.6",
+                "@smithy/middleware-retry": "^4.0.7",
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/middleware-stack": "^4.0.1",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/node-http-handler": "^4.0.3",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.7",
+                "@smithy/util-defaults-mode-node": "^4.0.7",
+                "@smithy/util-endpoints": "^3.0.1",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-retry": "^4.0.1",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@aws-sdk/core": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/core": "^3.1.5",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/signature-v4": "^5.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "node_modules/@types/http-proxy": {
-            "version": "1.17.9",
-            "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz",
-            "integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@types/node": "*"
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@types/js-yaml": {
-            "version": "4.0.5",
-            "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.5.tgz",
-            "integrity": "sha512-FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA==",
-            "dev": true
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "node_modules/@types/json-schema": {
-            "version": "7.0.11",
-            "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-            "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
-            "dev": true
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "node_modules/@types/keyv": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.3.tgz",
-            "integrity": "sha512-FXCJgyyN3ivVgRoml4h94G/p3kY+u/B86La+QptcqJaWtBWtmc6TtkNfS40n9bIvyLteHh7zXOtgbobORKPbDg==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@types/node": "*"
+                "@aws-sdk/core": "3.758.0",
+                "@aws-sdk/types": "3.734.0",
+                "@aws-sdk/util-endpoints": "3.743.0",
+                "@smithy/core": "^3.1.5",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@types/lodash": {
-            "version": "4.14.182",
-            "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz",
-            "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==",
-            "dev": true
-        },
-        "node_modules/@types/marked": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/@types/marked/-/marked-4.0.2.tgz",
-            "integrity": "sha512-auNrZ/c0w6wsM9DccwVxWHssrMDezHUAXNesdp2RQrCVCyrQbOiSq7yqdJKrUQQpw9VTm7CGYJH2A/YG7jjrjQ==",
-            "dev": true
-        },
-        "node_modules/@types/mime": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
-            "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==",
-            "dev": true
-        },
-        "node_modules/@types/mime-types": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.1.tgz",
-            "integrity": "sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw==",
-            "dev": true
-        },
-        "node_modules/@types/minimatch": {
-            "version": "3.0.5",
-            "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
-            "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
-            "dev": true
-        },
-        "node_modules/@types/minimist": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
-            "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
-            "dev": true
-        },
-        "node_modules/@types/mocha": {
-            "version": "10.0.0",
-            "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.0.tgz",
-            "integrity": "sha512-rADY+HtTOA52l9VZWtgQfn4p+UDVM2eDVkMZT1I6syp0YKxW2F9v+0pbRZLsvskhQv/vMb6ZfCay81GHbz5SHg==",
-            "dev": true
-        },
-        "node_modules/@types/node": {
-            "version": "14.18.5",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.5.tgz",
-            "integrity": "sha512-LMy+vDDcQR48EZdEx5wRX1q/sEl6NdGuHXPnfeL8ixkwCOSZ2qnIyIZmcCbdX0MeRqHhAcHmX+haCbrS8Run+A=="
-        },
-        "node_modules/@types/normalize-package-data": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
-            "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
-            "dev": true
-        },
-        "node_modules/@types/prettier": {
-            "version": "2.7.0",
-            "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.0.tgz",
-            "integrity": "sha512-RI1L7N4JnW5gQw2spvL7Sllfuf1SaHdrZpCHiBlCXjIlufi1SMNnbu2teze3/QE67Fg2tBlH7W+mi4hVNk4p0A==",
-            "dev": true
-        },
-        "node_modules/@types/qs": {
-            "version": "6.9.7",
-            "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
-            "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
-            "dev": true
-        },
-        "node_modules/@types/range-parser": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
-            "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
-            "dev": true
-        },
-        "node_modules/@types/readline-sync": {
-            "version": "1.4.4",
-            "resolved": "https://registry.npmjs.org/@types/readline-sync/-/readline-sync-1.4.4.tgz",
-            "integrity": "sha512-cFjVIoiamX7U6zkO2VPvXyTxbFDdiRo902IarJuPVxBhpDnXhwSaVE86ip+SCuyWBbEioKCkT4C88RNTxBM1Dw==",
-            "dev": true
-        },
-        "node_modules/@types/responselike": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
-            "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
-            "dependencies": {
-                "@types/node": "*"
-            }
-        },
-        "node_modules/@types/retry": {
-            "version": "0.12.1",
-            "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.1.tgz",
-            "integrity": "sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==",
-            "dev": true
-        },
-        "node_modules/@types/semver": {
-            "version": "7.3.9",
-            "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.9.tgz",
-            "integrity": "sha512-L/TMpyURfBkf+o/526Zb6kd/tchUP3iBDEPjqjb+U2MAJhVRxxrmr2fwpe08E7QsV7YLcpq0tUaQ9O9x97ZIxQ==",
-            "dev": true
-        },
-        "node_modules/@types/serve-index": {
-            "version": "1.9.1",
-            "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
-            "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
-            "dev": true,
-            "dependencies": {
-                "@types/express": "*"
-            }
-        },
-        "node_modules/@types/serve-static": {
-            "version": "1.13.10",
-            "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz",
-            "integrity": "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==",
-            "dev": true,
-            "dependencies": {
-                "@types/mime": "^1",
-                "@types/node": "*"
-            }
-        },
-        "node_modules/@types/sinon": {
-            "version": "10.0.5",
-            "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.5.tgz",
-            "integrity": "sha512-BrAUy0yq3n84XOykYGvGbDir9nBIYwQm2NdBNQT0DbtDLqh/5nMUsjz5XfwrefFNLPE9B6g8yLOZREpvw0J40A==",
-            "dev": true,
-            "dependencies": {
-                "@sinonjs/fake-timers": "^7.1.0"
-            }
-        },
-        "node_modules/@types/sinon/node_modules/@sinonjs/fake-timers": {
-            "version": "7.1.2",
-            "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz",
-            "integrity": "sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@sinonjs/commons": "^1.7.0"
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@types/sinonjs__fake-timers": {
-            "version": "8.1.1",
-            "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz",
-            "integrity": "sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==",
-            "dev": true
-        },
-        "node_modules/@types/sockjs": {
-            "version": "0.3.33",
-            "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
-            "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@aws-sdk/types": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@types/node": "*"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@types/tcp-port-used": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/@types/tcp-port-used/-/tcp-port-used-1.0.1.tgz",
-            "integrity": "sha512-6pwWTx8oUtWvsiZUCrhrK/53MzKVLnuNSSaZILPy3uMes9QnTrLMar9BDlJArbMOjDcjb3QXFk6Rz8qmmuySZw==",
-            "dev": true
-        },
-        "node_modules/@types/uuid": {
-            "version": "8.3.3",
-            "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.3.tgz",
-            "integrity": "sha512-0LbEEx1zxrYB3pgpd1M5lEhLcXjKJnYghvhTRgaBeUivLHMDM1TzF3IJ6hXU2+8uA4Xz+5BA63mtZo5DjVT8iA==",
-            "dev": true
-        },
-        "node_modules/@types/vscode": {
-            "version": "1.50.0",
-            "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.50.0.tgz",
-            "integrity": "sha512-QnIeyi4L2DiD9M2bAQKRzT/EQvc80qP9UL6JD5TiLlNRL1khIDg4ej4mDSRbtFrDAsRntFI1RhMvdomUThMsqg==",
-            "dev": true
-        },
-        "node_modules/@types/vscode-webview": {
-            "version": "1.57.0",
-            "resolved": "https://registry.npmjs.org/@types/vscode-webview/-/vscode-webview-1.57.0.tgz",
-            "integrity": "sha512-x3Cb/SMa1IwRHfSvKaZDZOTh4cNoG505c3NjTqGlMC082m++x/ETUmtYniDsw6SSmYzZXO8KBNhYxR0+VqymqA==",
-            "dev": true
-        },
-        "node_modules/@types/ws": {
-            "version": "8.5.3",
-            "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz",
-            "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.743.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@types/node": "*"
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-endpoints": "^3.0.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@types/xml2js": {
-            "version": "0.4.9",
-            "resolved": "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.9.tgz",
-            "integrity": "sha512-CHiCKIihl1pychwR2RNX5mAYmJDACgFVCMT5OArMaO3erzwXVcBqPcusr+Vl8yeeXukxZqtF8mZioqX+mpjjdw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@types/node": "*"
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/types": "^4.1.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/@typescript-eslint/eslint-plugin": {
-            "version": "5.38.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.38.0.tgz",
-            "integrity": "sha512-GgHi/GNuUbTOeoJiEANi0oI6fF3gBQc3bGFYj40nnAPCbhrtEDf2rjBmefFadweBmO1Du1YovHeDP2h5JLhtTQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@typescript-eslint/scope-manager": "5.38.0",
-                "@typescript-eslint/type-utils": "5.38.0",
-                "@typescript-eslint/utils": "5.38.0",
-                "debug": "^4.3.4",
-                "ignore": "^5.2.0",
-                "regexpp": "^3.2.0",
-                "semver": "^7.3.7",
-                "tsutils": "^3.21.0"
+                "@aws-sdk/middleware-user-agent": "3.758.0",
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
+                "node": ">=18.0.0"
             },
             "peerDependencies": {
-                "@typescript-eslint/parser": "^5.0.0",
-                "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+                "aws-crt": ">=1.0.0"
             },
             "peerDependenciesMeta": {
-                "typescript": {
+                "aws-crt": {
                     "optional": true
                 }
             }
         },
-        "node_modules/@typescript-eslint/parser": {
-            "version": "5.38.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.38.0.tgz",
-            "integrity": "sha512-/F63giJGLDr0ms1Cr8utDAxP2SPiglaD6V+pCOcG35P2jCqdfR7uuEhz1GIC3oy4hkUF8xA1XSXmd9hOh/a5EA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/config-resolver": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@typescript-eslint/scope-manager": "5.38.0",
-                "@typescript-eslint/types": "5.38.0",
-                "@typescript-eslint/typescript-estree": "5.38.0",
-                "debug": "^4.3.4"
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            },
-            "peerDependencies": {
-                "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@typescript-eslint/scope-manager": {
-            "version": "5.38.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.38.0.tgz",
-            "integrity": "sha512-ByhHIuNyKD9giwkkLqzezZ9y5bALW8VNY6xXcP+VxoH4JBDKjU5WNnsiD4HJdglHECdV+lyaxhvQjTUbRboiTA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/core": {
+            "version": "3.1.5",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@typescript-eslint/types": "5.38.0",
-                "@typescript-eslint/visitor-keys": "5.38.0"
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-stream": "^4.1.2",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@typescript-eslint/type-utils": {
-            "version": "5.38.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.38.0.tgz",
-            "integrity": "sha512-iZq5USgybUcj/lfnbuelJ0j3K9dbs1I3RICAJY9NZZpDgBYXmuUlYQGzftpQA9wC8cKgtS6DASTvF3HrXwwozA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/fetch-http-handler": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@typescript-eslint/typescript-estree": "5.38.0",
-                "@typescript-eslint/utils": "5.38.0",
-                "debug": "^4.3.4",
-                "tsutils": "^3.21.0"
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/querystring-builder": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-base64": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            },
-            "peerDependencies": {
-                "eslint": "*"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@typescript-eslint/types": {
-            "version": "5.38.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.38.0.tgz",
-            "integrity": "sha512-HHu4yMjJ7i3Cb+8NUuRCdOGu2VMkfmKyIJsOr9PfkBVYLYrtMCK/Ap50Rpov+iKpxDTfnqvDbuPLgBE5FwUNfA==",
-            "dev": true,
-            "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/hash-node": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@typescript-eslint/typescript-estree": {
-            "version": "5.38.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.38.0.tgz",
-            "integrity": "sha512-6P0RuphkR+UuV7Avv7MU3hFoWaGcrgOdi8eTe1NwhMp2/GjUJoODBTRWzlHpZh6lFOaPmSvgxGlROa0Sg5Zbyg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/invalid-dependency": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@typescript-eslint/types": "5.38.0",
-                "@typescript-eslint/visitor-keys": "5.38.0",
-                "debug": "^4.3.4",
-                "globby": "^11.1.0",
-                "is-glob": "^4.0.3",
-                "semver": "^7.3.7",
-                "tsutils": "^3.21.0"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            },
-            "peerDependenciesMeta": {
-                "typescript": {
-                    "optional": true
-                }
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@typescript-eslint/utils": {
-            "version": "5.38.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.38.0.tgz",
-            "integrity": "sha512-6sdeYaBgk9Fh7N2unEXGz+D+som2QCQGPAf1SxrkEr+Z32gMreQ0rparXTNGRRfYUWk/JzbGdcM8NSSd6oqnTA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/middleware-content-length": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@types/json-schema": "^7.0.9",
-                "@typescript-eslint/scope-manager": "5.38.0",
-                "@typescript-eslint/types": "5.38.0",
-                "@typescript-eslint/typescript-estree": "5.38.0",
-                "eslint-scope": "^5.1.1",
-                "eslint-utils": "^3.0.0"
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
-            },
-            "peerDependencies": {
-                "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@typescript-eslint/visitor-keys": {
-            "version": "5.38.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.38.0.tgz",
-            "integrity": "sha512-MxnrdIyArnTi+XyFLR+kt/uNAcdOnmT+879os7qDRI+EYySR4crXJq9BXPfRzzLGq0wgxkwidrCJ9WCAoacm1w==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/middleware-endpoint": {
+            "version": "4.0.6",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@typescript-eslint/types": "5.38.0",
-                "eslint-visitor-keys": "^3.3.0"
+                "@smithy/core": "^3.1.5",
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "@smithy/util-middleware": "^4.0.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/typescript-eslint"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-            "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/middleware-retry": {
+            "version": "4.0.7",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/service-error-classification": "^4.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-retry": "^4.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
             "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@vscode/codicons": {
-            "version": "0.0.32",
-            "resolved": "https://registry.npmjs.org/@vscode/codicons/-/codicons-0.0.32.tgz",
-            "integrity": "sha512-3lgSTWhAzzWN/EPURoY4ZDBEA80OPmnaknNujA3qnI4Iu7AONWd9xF3iE4L+4prIe8E3TUnLQ4pxoaFTEEZNwg==",
-            "dev": true
-        },
-        "node_modules/@vscode/test-electron": {
-            "version": "2.2.3",
-            "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.2.3.tgz",
-            "integrity": "sha512-7DmdGYQTqRNaLHKG3j56buc9DkstriY4aV0S3Zj32u0U9/T0L8vwWAC9QGCh1meu1VXDEla1ze27TkqysHGP0Q==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/middleware-serde": {
+            "version": "4.0.2",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "http-proxy-agent": "^4.0.1",
-                "https-proxy-agent": "^5.0.0",
-                "rimraf": "^3.0.2",
-                "unzipper": "^0.10.11"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=16"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@vue/compiler-core": {
-            "version": "3.2.31",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.31.tgz",
-            "integrity": "sha512-aKno00qoA4o+V/kR6i/pE+aP+esng5siNAVQ422TkBNM6qA4veXiZbSe8OTXHXquEi/f6Akc+nLfB4JGfe4/WQ==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/middleware-stack": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@babel/parser": "^7.16.4",
-                "@vue/shared": "3.2.31",
-                "estree-walker": "^2.0.2",
-                "source-map": "^0.6.1"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@vue/compiler-dom": {
-            "version": "3.2.31",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.31.tgz",
-            "integrity": "sha512-60zIlFfzIDf3u91cqfqy9KhCKIJgPeqxgveH2L+87RcGU/alT6BRrk5JtUso0OibH3O7NXuNOQ0cDc9beT0wrg==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/node-config-provider": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@vue/compiler-core": "3.2.31",
-                "@vue/shared": "3.2.31"
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@vue/compiler-sfc": {
-            "version": "3.2.40",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.40.tgz",
-            "integrity": "sha512-tzqwniIN1fu1PDHC3CpqY/dPCfN/RN1thpBC+g69kJcrl7mbGiHKNwbA6kJ3XKKy8R6JLKqcpVugqN4HkeBFFg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/node-http-handler": {
+            "version": "4.0.3",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@babel/parser": "^7.16.4",
-                "@vue/compiler-core": "3.2.40",
-                "@vue/compiler-dom": "3.2.40",
-                "@vue/compiler-ssr": "3.2.40",
-                "@vue/reactivity-transform": "3.2.40",
-                "@vue/shared": "3.2.40",
-                "estree-walker": "^2.0.2",
-                "magic-string": "^0.25.7",
-                "postcss": "^8.1.10",
-                "source-map": "^0.6.1"
+                "@smithy/abort-controller": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/querystring-builder": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@vue/compiler-sfc/node_modules/@vue/compiler-core": {
-            "version": "3.2.40",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.40.tgz",
-            "integrity": "sha512-2Dc3Stk0J/VyQ4OUr2yEC53kU28614lZS+bnrCbFSAIftBJ40g/2yQzf4mPBiFuqguMB7hyHaujdgZAQ67kZYA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/property-provider": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@babel/parser": "^7.16.4",
-                "@vue/shared": "3.2.40",
-                "estree-walker": "^2.0.2",
-                "source-map": "^0.6.1"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@vue/compiler-sfc/node_modules/@vue/compiler-dom": {
-            "version": "3.2.40",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.40.tgz",
-            "integrity": "sha512-OZCNyYVC2LQJy4H7h0o28rtk+4v+HMQygRTpmibGoG9wZyomQiS5otU7qo3Wlq5UfHDw2RFwxb9BJgKjVpjrQw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/protocol-http": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@vue/compiler-core": "3.2.40",
-                "@vue/shared": "3.2.40"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@vue/compiler-sfc/node_modules/@vue/compiler-ssr": {
-            "version": "3.2.40",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.40.tgz",
-            "integrity": "sha512-80cQcgasKjrPPuKcxwuCx7feq+wC6oFl5YaKSee9pV3DNq+6fmCVwEEC3vvkf/E2aI76rIJSOYHsWSEIxK74oQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/shared-ini-file-loader": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@vue/compiler-dom": "3.2.40",
-                "@vue/shared": "3.2.40"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@vue/compiler-sfc/node_modules/@vue/shared": {
-            "version": "3.2.40",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.40.tgz",
-            "integrity": "sha512-0PLQ6RUtZM0vO3teRfzGi4ltLUO5aO+kLgwh4Um3THSR03rpQWLTuRCkuO5A41ITzwdWeKdPHtSARuPkoo5pCQ==",
-            "dev": true
-        },
-        "node_modules/@vue/compiler-ssr": {
-            "version": "3.2.31",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.31.tgz",
-            "integrity": "sha512-mjN0rqig+A8TVDnsGPYJM5dpbjlXeHUm2oZHZwGyMYiGT/F4fhJf/cXy8QpjnLQK4Y9Et4GWzHn9PS8AHUnSkw==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/signature-v4": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@vue/compiler-dom": "3.2.31",
-                "@vue/shared": "3.2.31"
+                "@smithy/is-array-buffer": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@vue/reactivity": {
-            "version": "3.2.31",
-            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.31.tgz",
-            "integrity": "sha512-HVr0l211gbhpEKYr2hYe7hRsV91uIVGFYNHj73njbARVGHQvIojkImKMaZNDdoDZOIkMsBc9a1sMqR+WZwfSCw==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/smithy-client": {
+            "version": "4.1.6",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@vue/shared": "3.2.31"
+                "@smithy/core": "^3.1.5",
+                "@smithy/middleware-endpoint": "^4.0.6",
+                "@smithy/middleware-stack": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-stream": "^4.1.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@vue/reactivity-transform": {
-            "version": "3.2.40",
-            "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.40.tgz",
-            "integrity": "sha512-HQUCVwEaacq6fGEsg2NUuGKIhUveMCjOk8jGHqLXPI2w6zFoPrlQhwWEaINTv5kkZDXKEnCijAp+4gNEHG03yw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/types": {
+            "version": "4.1.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@babel/parser": "^7.16.4",
-                "@vue/compiler-core": "3.2.40",
-                "@vue/shared": "3.2.40",
-                "estree-walker": "^2.0.2",
-                "magic-string": "^0.25.7"
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@vue/reactivity-transform/node_modules/@vue/compiler-core": {
-            "version": "3.2.40",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.40.tgz",
-            "integrity": "sha512-2Dc3Stk0J/VyQ4OUr2yEC53kU28614lZS+bnrCbFSAIftBJ40g/2yQzf4mPBiFuqguMB7hyHaujdgZAQ67kZYA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/url-parser": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@babel/parser": "^7.16.4",
-                "@vue/shared": "3.2.40",
-                "estree-walker": "^2.0.2",
-                "source-map": "^0.6.1"
+                "@smithy/querystring-parser": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@vue/reactivity-transform/node_modules/@vue/shared": {
-            "version": "3.2.40",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.40.tgz",
-            "integrity": "sha512-0PLQ6RUtZM0vO3teRfzGi4ltLUO5aO+kLgwh4Um3THSR03rpQWLTuRCkuO5A41ITzwdWeKdPHtSARuPkoo5pCQ==",
-            "dev": true
-        },
-        "node_modules/@vue/runtime-core": {
-            "version": "3.2.31",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.31.tgz",
-            "integrity": "sha512-Kcog5XmSY7VHFEMuk4+Gap8gUssYMZ2+w+cmGI6OpZWYOEIcbE0TPzzPHi+8XTzAgx1w/ZxDFcXhZeXN5eKWsA==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-base64": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@vue/reactivity": "3.2.31",
-                "@vue/shared": "3.2.31"
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@vue/runtime-dom": {
-            "version": "3.2.31",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.31.tgz",
-            "integrity": "sha512-N+o0sICVLScUjfLG7u9u5XCjvmsexAiPt17GNnaWHJUfsKed5e85/A3SWgKxzlxx2SW/Hw7RQxzxbXez9PtY3g==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-body-length-browser": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@vue/runtime-core": "3.2.31",
-                "@vue/shared": "3.2.31",
-                "csstype": "^2.6.8"
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@vue/server-renderer": {
-            "version": "3.2.31",
-            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.31.tgz",
-            "integrity": "sha512-8CN3Zj2HyR2LQQBHZ61HexF5NReqngLT3oahyiVRfSSvak+oAvVmu8iNLSu6XR77Ili2AOpnAt1y8ywjjqtmkg==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-body-length-node": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@vue/compiler-ssr": "3.2.31",
-                "@vue/shared": "3.2.31"
+                "tslib": "^2.6.2"
             },
-            "peerDependencies": {
-                "vue": "3.2.31"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@vue/shared": {
-            "version": "3.2.31",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.31.tgz",
-            "integrity": "sha512-ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ=="
-        },
-        "node_modules/@webassemblyjs/ast": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
-            "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-config-provider": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@webassemblyjs/helper-numbers": "1.11.1",
-                "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@webassemblyjs/floating-point-hex-parser": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
-            "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
-            "dev": true
-        },
-        "node_modules/@webassemblyjs/helper-api-error": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
-            "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
-            "dev": true
-        },
-        "node_modules/@webassemblyjs/helper-buffer": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
-            "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
-            "dev": true
-        },
-        "node_modules/@webassemblyjs/helper-numbers": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
-            "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-defaults-mode-browser": {
+            "version": "4.0.7",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@webassemblyjs/floating-point-hex-parser": "1.11.1",
-                "@webassemblyjs/helper-api-error": "1.11.1",
-                "@xtuc/long": "4.2.2"
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
-            "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
-            "dev": true
-        },
-        "node_modules/@webassemblyjs/helper-wasm-section": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
-            "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-defaults-mode-node": {
+            "version": "4.0.7",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@webassemblyjs/ast": "1.11.1",
-                "@webassemblyjs/helper-buffer": "1.11.1",
-                "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-                "@webassemblyjs/wasm-gen": "1.11.1"
+                "@smithy/config-resolver": "^4.0.1",
+                "@smithy/credential-provider-imds": "^4.0.1",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@webassemblyjs/ieee754": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
-            "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-endpoints": {
+            "version": "3.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@xtuc/ieee754": "^1.2.0"
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@webassemblyjs/leb128": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
-            "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-middleware": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@xtuc/long": "4.2.2"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@webassemblyjs/utf8": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
-            "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
-            "dev": true
-        },
-        "node_modules/@webassemblyjs/wasm-edit": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
-            "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-retry": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@webassemblyjs/ast": "1.11.1",
-                "@webassemblyjs/helper-buffer": "1.11.1",
-                "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-                "@webassemblyjs/helper-wasm-section": "1.11.1",
-                "@webassemblyjs/wasm-gen": "1.11.1",
-                "@webassemblyjs/wasm-opt": "1.11.1",
-                "@webassemblyjs/wasm-parser": "1.11.1",
-                "@webassemblyjs/wast-printer": "1.11.1"
+                "@smithy/service-error-classification": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@webassemblyjs/wasm-gen": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
-            "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-utf8": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@webassemblyjs/ast": "1.11.1",
-                "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-                "@webassemblyjs/ieee754": "1.11.1",
-                "@webassemblyjs/leb128": "1.11.1",
-                "@webassemblyjs/utf8": "1.11.1"
+                "@smithy/util-buffer-from": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@webassemblyjs/wasm-opt": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
-            "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@aws-sdk/core": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@webassemblyjs/ast": "1.11.1",
-                "@webassemblyjs/helper-buffer": "1.11.1",
-                "@webassemblyjs/wasm-gen": "1.11.1",
-                "@webassemblyjs/wasm-parser": "1.11.1"
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/core": "^3.1.5",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/signature-v4": "^5.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@webassemblyjs/wasm-parser": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
-            "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@webassemblyjs/ast": "1.11.1",
-                "@webassemblyjs/helper-api-error": "1.11.1",
-                "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-                "@webassemblyjs/ieee754": "1.11.1",
-                "@webassemblyjs/leb128": "1.11.1",
-                "@webassemblyjs/utf8": "1.11.1"
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@webassemblyjs/wast-printer": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
-            "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@webassemblyjs/ast": "1.11.1",
-                "@xtuc/long": "4.2.2"
-            }
-        },
-        "node_modules/@webpack-cli/configtest": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.0.tgz",
-            "integrity": "sha512-ttOkEkoalEHa7RaFYpM0ErK1xc4twg3Am9hfHhL7MVqlHebnkYd2wuI/ZqTDj0cVzZho6PdinY0phFZV3O0Mzg==",
-            "dev": true,
-            "peerDependencies": {
-                "webpack": "4.x.x || 5.x.x",
-                "webpack-cli": "4.x.x"
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@webpack-cli/info": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.0.tgz",
-            "integrity": "sha512-F6b+Man0rwE4n0409FyAJHStYA5OIZERxmnUfLVwv0mc0V1wLad3V7jqRlMkgKBeAq07jUvglacNaa6g9lOpuw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "envinfo": "^7.7.3"
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
-            "peerDependencies": {
-                "webpack-cli": "4.x.x"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@webpack-cli/serve": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.0.tgz",
-            "integrity": "sha512-ZkVeqEmRpBV2GHvjjUZqEai2PpUbuq8Bqd//vEYsp63J8WyexI8ppCqVS3Zs0QADf6aWuPdU+0XsPI647PVlQA==",
-            "dev": true,
-            "peerDependencies": {
-                "webpack-cli": "4.x.x"
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/core": "3.758.0",
+                "@aws-sdk/types": "3.734.0",
+                "@aws-sdk/util-endpoints": "3.743.0",
+                "@smithy/core": "^3.1.5",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
-            "peerDependenciesMeta": {
-                "webpack-dev-server": {
-                    "optional": true
-                }
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@xmldom/xmldom": {
-            "version": "0.7.8",
-            "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.8.tgz",
-            "integrity": "sha512-PrJx38EfpitFhwmILRl37jAdBlsww6AZ6rRVK4QS7T7RHLhX7mSs647sTmgr9GIxe3qjXdesmomEgbgaokrVFg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=10.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/@xtuc/ieee754": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-            "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-            "dev": true
-        },
-        "node_modules/@xtuc/long": {
-            "version": "4.2.2",
-            "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-            "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-            "dev": true
-        },
-        "node_modules/a-sync-waterfall": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz",
-            "integrity": "sha512-RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA==",
-            "dev": true
-        },
-        "node_modules/accepts": {
-            "version": "1.3.8",
-            "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-            "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@aws-sdk/types": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "mime-types": "~2.1.34",
-                "negotiator": "0.6.3"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/acorn": {
-            "version": "8.8.0",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
-            "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
-            "dev": true,
-            "bin": {
-                "acorn": "bin/acorn"
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.743.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-endpoints": "^3.0.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=0.4.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/acorn-jsx": {
-            "version": "5.3.2",
-            "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-            "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-            "dev": true,
-            "peerDependencies": {
-                "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/types": "^4.1.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/acorn-walk": {
-            "version": "8.2.0",
-            "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-            "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/middleware-user-agent": "3.758.0",
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.4.0"
+                "node": ">=18.0.0"
+            },
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
             }
         },
-        "node_modules/adm-zip": {
-            "version": "0.5.9",
-            "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.9.tgz",
-            "integrity": "sha512-s+3fXLkeeLjZ2kLjCBwQufpI5fuN+kIGBxu6530nVQZGVol0d7Y/M88/xw9HGGUcJjKf8LutN3VPRUBq6N7Ajg==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/config-resolver": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/agent-base": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-            "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/core": {
+            "version": "3.1.5",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "debug": "4"
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-stream": "^4.1.2",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 6.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/aggregate-error": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-            "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/fetch-http-handler": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "clean-stack": "^2.0.0",
-                "indent-string": "^4.0.0"
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/querystring-builder": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-base64": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/ajv": {
-            "version": "6.12.6",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-            "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/hash-node": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "fast-deep-equal": "^3.1.1",
-                "fast-json-stable-stringify": "^2.0.0",
-                "json-schema-traverse": "^0.4.1",
-                "uri-js": "^4.2.2"
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/epoberezkin"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/ajv-formats": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-            "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/invalid-dependency": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "ajv": "^8.0.0"
-            },
-            "peerDependencies": {
-                "ajv": "^8.0.0"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
-            "peerDependenciesMeta": {
-                "ajv": {
-                    "optional": true
-                }
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/ajv-formats/node_modules/ajv": {
-            "version": "8.8.2",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz",
-            "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/middleware-content-length": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "fast-deep-equal": "^3.1.1",
-                "json-schema-traverse": "^1.0.0",
-                "require-from-string": "^2.0.2",
-                "uri-js": "^4.2.2"
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/epoberezkin"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/ajv-formats/node_modules/json-schema-traverse": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-            "dev": true
-        },
-        "node_modules/ajv-keywords": {
-            "version": "3.5.2",
-            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-            "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-            "dev": true,
-            "peerDependencies": {
-                "ajv": "^6.9.1"
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/middleware-endpoint": {
+            "version": "4.0.6",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/core": "^3.1.5",
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "@smithy/util-middleware": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/amazon-states-language-service": {
-            "version": "1.8.0",
-            "resolved": "https://registry.npmjs.org/amazon-states-language-service/-/amazon-states-language-service-1.8.0.tgz",
-            "integrity": "sha512-F5hTDQqAVOYEJCm4PTBf6ZjLQYqzLfnGfyNqxNMTYqilbZk/3T0GQManc0pgt5CbtFw62DB6ovBcEUQQa9xsvA==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/middleware-retry": {
+            "version": "4.0.7",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "js-yaml": "^3.14.0",
-                "vscode-json-languageservice": "3.4.9",
-                "vscode-languageserver": "^6.1.1",
-                "vscode-languageserver-textdocument": "^1.0.0",
-                "vscode-languageserver-types": "^3.15.1",
-                "yaml-language-server": "0.10.0"
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/service-error-classification": "^4.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-retry": "^4.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/amazon-states-language-service/node_modules/argparse": {
-            "version": "1.0.10",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/middleware-serde": {
+            "version": "4.0.2",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "sprintf-js": "~1.0.2"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/amazon-states-language-service/node_modules/js-yaml": {
-            "version": "3.14.1",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-            "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/middleware-stack": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "argparse": "^1.0.7",
-                "esprima": "^4.0.0"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
-            "bin": {
-                "js-yaml": "bin/js-yaml.js"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/ansi-colors": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-            "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/node-config-provider": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/ansi-gray": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
-            "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/node-http-handler": {
+            "version": "4.0.3",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "ansi-wrap": "0.1.0"
+                "@smithy/abort-controller": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/querystring-builder": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/ansi-html-community": {
-            "version": "0.0.8",
-            "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
-            "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
-            "dev": true,
-            "engines": [
-                "node >= 0.8.0"
-            ],
-            "bin": {
-                "ansi-html": "bin/ansi-html"
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/property-provider": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/ansi-regex": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-            "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/protocol-http": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/ansi-styles": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/shared-ini-file-loader": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "color-convert": "^2.0.1"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/ansi-wrap": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
-            "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/signature-v4": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/is-array-buffer": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/any-promise": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-            "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
-            "dev": true
-        },
-        "node_modules/anymatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-            "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/smithy-client": {
+            "version": "4.1.6",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "normalize-path": "^3.0.0",
-                "picomatch": "^2.0.4"
+                "@smithy/core": "^3.1.5",
+                "@smithy/middleware-endpoint": "^4.0.6",
+                "@smithy/middleware-stack": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-stream": "^4.1.2",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/append-transform": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz",
-            "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/types": {
+            "version": "4.1.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "default-require-extensions": "^3.0.0"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/aproba": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-            "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-            "dev": true
-        },
-        "node_modules/archy": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-            "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
-            "dev": true
-        },
-        "node_modules/are-we-there-yet": {
-            "version": "1.1.7",
-            "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
-            "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/url-parser": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "delegates": "^1.0.0",
-                "readable-stream": "^2.0.6"
+                "@smithy/querystring-parser": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/are-we-there-yet/node_modules/readable-stream": {
-            "version": "2.3.7",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-            "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-base64": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/are-we-there-yet/node_modules/safe-buffer": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-            "dev": true
-        },
-        "node_modules/are-we-there-yet/node_modules/string_decoder": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-body-length-browser": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "safe-buffer": "~5.1.0"
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/arg": {
-            "version": "4.1.3",
-            "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-            "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-            "dev": true
-        },
-        "node_modules/argparse": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-            "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
-        },
-        "node_modules/array-differ": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz",
-            "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-body-length-node": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/array-flatten": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-            "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
-            "dev": true
-        },
-        "node_modules/array-union": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-            "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-config-provider": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/arrify": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
-            "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-defaults-mode-browser": {
+            "version": "4.0.7",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/asap": {
-            "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-            "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
-            "dev": true
-        },
-        "node_modules/ast-types": {
-            "version": "0.9.14",
-            "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.14.tgz",
-            "integrity": "sha512-Ebvx7/0lLboCdyEmAw/4GqwBeKIijPveXNiVGhCGCNxc7z26T5he7DC6ARxu8ByKuzUZZcLog+VP8GMyZrBzJw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-defaults-mode-node": {
+            "version": "4.0.7",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/config-resolver": "^4.0.1",
+                "@smithy/credential-provider-imds": "^4.0.1",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/async": {
-            "version": "3.2.3",
-            "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
-            "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="
-        },
-        "node_modules/async-lock": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/async-lock/-/async-lock-1.3.0.tgz",
-            "integrity": "sha512-8A7SkiisnEgME2zEedtDYPxUPzdv3x//E7n5IFktPAtMYSEAV7eNJF0rMwrVyUFj6d/8rgajLantbjcNRQYXIg=="
-        },
-        "node_modules/available-typed-arrays": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-            "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
-            "engines": {
-                "node": ">= 0.4"
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-endpoints": {
+            "version": "3.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/aws-sdk": {
-            "version": "2.1267.0",
-            "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1267.0.tgz",
-            "integrity": "sha512-ANTtRay26WwNRbYs6eZYN71b3DURNfWaq3AD6BtVNa8fVvnSLn+NNINw2+vLRjDLPZXMAQVHm0qH/TmyBvtjRA==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-middleware": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "buffer": "4.9.2",
-                "events": "1.1.1",
-                "ieee754": "1.1.13",
-                "jmespath": "0.16.0",
-                "querystring": "0.2.0",
-                "sax": "1.2.1",
-                "url": "0.10.3",
-                "util": "^0.12.4",
-                "uuid": "8.0.0",
-                "xml2js": "0.4.19"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 10.0.0"
-            }
-        },
-        "node_modules/aws-sdk/node_modules/uuid": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.0.0.tgz",
-            "integrity": "sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==",
-            "bin": {
-                "uuid": "dist/bin/uuid"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/aws-sdk/node_modules/xml2js": {
-            "version": "0.4.19",
-            "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
-            "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-retry": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "sax": ">=0.6.0",
-                "xmlbuilder": "~9.0.1"
+                "@smithy/service-error-classification": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/aws-sdk/node_modules/xmlbuilder": {
-            "version": "9.0.7",
-            "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
-            "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-utf8": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/util-buffer-from": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=4.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/aws-ssm-document-language-service": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/aws-ssm-document-language-service/-/aws-ssm-document-language-service-1.0.0.tgz",
-            "integrity": "sha512-XTkladSKrrD/uIGOwRMyVK7M6eHYVZWobtF0SCXQPocpE0SsHRVY1GflZaEGYgbKgDJTgpNpP8drTsUFzgfL5A==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/core": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "vscode-json-languageservice": "3.8.3",
-                "vscode-languageserver": "^6.1.1",
-                "yaml": "^1.10.0",
-                "yaml-language-server": "0.10.1"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/signature-v4": "^4.2.2",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/aws-ssm-document-language-service/node_modules/argparse": {
-            "version": "1.0.10",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-env": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "sprintf-js": "~1.0.2"
+                "@aws-sdk/core": "3.758.0",
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/aws-ssm-document-language-service/node_modules/js-yaml": {
-            "version": "3.14.1",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-            "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-env/node_modules/@aws-sdk/core": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "argparse": "^1.0.7",
-                "esprima": "^4.0.0"
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/core": "^3.1.5",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/signature-v4": "^5.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
             },
-            "bin": {
-                "js-yaml": "bin/js-yaml.js"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/aws-ssm-document-language-service/node_modules/jsonc-parser": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz",
-            "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg=="
-        },
-        "node_modules/aws-ssm-document-language-service/node_modules/prettier": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz",
-            "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==",
-            "optional": true,
-            "bin": {
-                "prettier": "bin-prettier.js"
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-env/node_modules/@aws-sdk/types": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10.13.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/aws-ssm-document-language-service/node_modules/vscode-json-languageservice": {
-            "version": "3.8.3",
-            "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.8.3.tgz",
-            "integrity": "sha512-8yPag/NQHCuTthahyaTtzK0DHT0FKM/xBU0mFBQ8nMo8C1i2P+FCyIVqICoNoHkRI2BTGlXKomPUpsqjSz0TnQ==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-env/node_modules/@smithy/core": {
+            "version": "3.1.5",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "jsonc-parser": "^2.2.1",
-                "vscode-languageserver-textdocument": "^1.0.1",
-                "vscode-languageserver-types": "^3.15.1",
-                "vscode-nls": "^4.1.2",
-                "vscode-uri": "^2.1.2"
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-stream": "^4.1.2",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/aws-ssm-document-language-service/node_modules/vscode-jsonrpc": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz",
-            "integrity": "sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-env/node_modules/@smithy/middleware-endpoint": {
+            "version": "4.0.6",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/core": "^3.1.5",
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "@smithy/util-middleware": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8.0.0 || >=10.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/aws-ssm-document-language-service/node_modules/vscode-languageserver-protocol": {
-            "version": "3.14.1",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz",
-            "integrity": "sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-env/node_modules/@smithy/middleware-serde": {
+            "version": "4.0.2",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "vscode-jsonrpc": "^4.0.0",
-                "vscode-languageserver-types": "3.14.0"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/aws-ssm-document-language-service/node_modules/vscode-languageserver-protocol/node_modules/vscode-languageserver-types": {
-            "version": "3.14.0",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz",
-            "integrity": "sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A=="
-        },
-        "node_modules/aws-ssm-document-language-service/node_modules/vscode-nls": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.2.tgz",
-            "integrity": "sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw=="
-        },
-        "node_modules/aws-ssm-document-language-service/node_modules/yaml-language-server": {
-            "version": "0.10.1",
-            "resolved": "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.10.1.tgz",
-            "integrity": "sha512-R9SEt/nWTuZ8weB040L7yyaIVARlZ0ian1Kv6ptu4+xyVlIMobTZXaBTtgyhlMWqcQ3BpsAZu4q/2plRVG3tLQ==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-env/node_modules/@smithy/middleware-stack": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "js-yaml": "^3.13.1",
-                "jsonc-parser": "^2.2.1",
-                "request-light": "^0.2.4",
-                "vscode-json-languageservice": "^3.6.0",
-                "vscode-languageserver": "^5.2.1",
-                "vscode-languageserver-types": "^3.15.1",
-                "vscode-nls": "^4.1.2",
-                "vscode-uri": "^2.1.1",
-                "yaml-ast-parser-custom-tags": "0.0.43"
-            },
-            "bin": {
-                "yaml-language-server": "bin/yaml-language-server"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "*"
-            },
-            "optionalDependencies": {
-                "prettier": "2.0.5"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/aws-ssm-document-language-service/node_modules/yaml-language-server/node_modules/vscode-languageserver": {
-            "version": "5.2.1",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz",
-            "integrity": "sha512-GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-env/node_modules/@smithy/node-config-provider": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "vscode-languageserver-protocol": "3.14.1",
-                "vscode-uri": "^1.0.6"
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
-            "bin": {
-                "installServerIntoExtension": "bin/installServerIntoExtension"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/aws-ssm-document-language-service/node_modules/yaml-language-server/node_modules/vscode-languageserver/node_modules/vscode-uri": {
-            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.8.tgz",
-            "integrity": "sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ=="
-        },
-        "node_modules/azure-devops-node-api": {
-            "version": "11.0.1",
-            "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.0.1.tgz",
-            "integrity": "sha512-YMdjAw9l5p/6leiyIloxj3k7VIvYThKjvqgiQn88r3nhT93ENwsoDS3A83CyJ4uTWzCZ5f5jCi6c27rTU5Pz+A==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-env/node_modules/@smithy/property-provider": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "tunnel": "0.0.6",
-                "typed-rest-client": "^1.8.4"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/balanced-match": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-            "dev": true
-        },
-        "node_modules/base64-js": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-            "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ]
-        },
-        "node_modules/batch": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-            "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
-            "dev": true
-        },
-        "node_modules/big-integer": {
-            "version": "1.6.51",
-            "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
-            "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-env/node_modules/@smithy/protocol-http": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/big.js": {
-            "version": "5.2.2",
-            "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-            "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-env/node_modules/@smithy/shared-ini-file-loader": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": "*"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/binary": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
-            "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-env/node_modules/@smithy/signature-v4": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "buffers": "~0.1.1",
-                "chainsaw": "~0.1.0"
+                "@smithy/is-array-buffer": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "*"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/binary-extensions": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-            "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-env/node_modules/@smithy/smithy-client": {
+            "version": "4.1.6",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/core": "^3.1.5",
+                "@smithy/middleware-endpoint": "^4.0.6",
+                "@smithy/middleware-stack": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-stream": "^4.1.2",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/bl": {
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-env/node_modules/@smithy/types": {
             "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-            "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-            "dev": true,
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "buffer": "^5.5.0",
-                "inherits": "^2.0.4",
-                "readable-stream": "^3.4.0"
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/bl/node_modules/buffer": {
-            "version": "5.7.1",
-            "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-            "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-env/node_modules/@smithy/url-parser": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "base64-js": "^1.3.1",
-                "ieee754": "^1.1.13"
+                "@smithy/querystring-parser": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/bluebird": {
-            "version": "3.4.7",
-            "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
-            "integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=",
-            "dev": true
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-env/node_modules/@smithy/util-body-length-browser": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "node_modules/body-parser": {
-            "version": "1.20.0",
-            "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz",
-            "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-env/node_modules/@smithy/util-middleware": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "bytes": "3.1.2",
-                "content-type": "~1.0.4",
-                "debug": "2.6.9",
-                "depd": "2.0.0",
-                "destroy": "1.2.0",
-                "http-errors": "2.0.0",
-                "iconv-lite": "0.4.24",
-                "on-finished": "2.4.1",
-                "qs": "6.10.3",
-                "raw-body": "2.5.1",
-                "type-is": "~1.6.18",
-                "unpipe": "1.0.0"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.8",
-                "npm": "1.2.8000 || >= 1.4.16"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/body-parser/node_modules/debug": {
-            "version": "2.6.9",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-env/node_modules/@smithy/util-utf8": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "ms": "2.0.0"
+                "@smithy/util-buffer-from": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/body-parser/node_modules/depd": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-            "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/core": "3.758.0",
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/fetch-http-handler": "^5.0.1",
+                "@smithy/node-http-handler": "^4.0.3",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-stream": "^4.1.2",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/body-parser/node_modules/ms": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-            "dev": true
-        },
-        "node_modules/bonjour-service": {
-            "version": "1.0.13",
-            "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.13.tgz",
-            "integrity": "sha512-LWKRU/7EqDUC9CTAQtuZl5HzBALoCYwtLhffW3et7vZMwv3bWLpJf8bRYlMD5OCcDpTfnPgNCV4yo9ZIaJGMiA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-http/node_modules/@aws-sdk/core": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "array-flatten": "^2.1.2",
-                "dns-equal": "^1.0.0",
-                "fast-deep-equal": "^3.1.3",
-                "multicast-dns": "^7.2.5"
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/core": "^3.1.5",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/signature-v4": "^5.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/boolbase": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-            "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
-            "dev": true
-        },
-        "node_modules/bowser": {
-            "version": "2.11.0",
-            "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.11.0.tgz",
-            "integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA=="
-        },
-        "node_modules/brace-expansion": {
-            "version": "1.1.11",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-http/node_modules/@aws-sdk/types": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "balanced-match": "^1.0.0",
-                "concat-map": "0.0.1"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/braces": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-            "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/core": {
+            "version": "3.1.5",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "fill-range": "^7.0.1"
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-stream": "^4.1.2",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/browser-stdout": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-            "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-            "dev": true
-        },
-        "node_modules/browserslist": {
-            "version": "4.20.2",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.2.tgz",
-            "integrity": "sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/browserslist"
-                },
-                {
-                    "type": "tidelift",
-                    "url": "https://tidelift.com/funding/github/npm/browserslist"
-                }
-            ],
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/fetch-http-handler": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "caniuse-lite": "^1.0.30001317",
-                "electron-to-chromium": "^1.4.84",
-                "escalade": "^3.1.1",
-                "node-releases": "^2.0.2",
-                "picocolors": "^1.0.0"
-            },
-            "bin": {
-                "browserslist": "cli.js"
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/querystring-builder": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-base64": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/buffer": {
-            "version": "4.9.2",
-            "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-            "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/middleware-endpoint": {
+            "version": "4.0.6",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "base64-js": "^1.0.2",
-                "ieee754": "^1.1.4",
-                "isarray": "^1.0.0"
+                "@smithy/core": "^3.1.5",
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "@smithy/util-middleware": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/buffer-crc32": {
-            "version": "0.2.13",
-            "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-            "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/middleware-serde": {
+            "version": "4.0.2",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": "*"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/buffer-from": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-            "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-            "dev": true
-        },
-        "node_modules/buffer-indexof-polyfill": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz",
-            "integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/middleware-stack": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/buffers": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
-            "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/node-config-provider": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.2.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/bytes": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-            "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/node-http-handler": {
+            "version": "4.0.3",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/abort-controller": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/querystring-builder": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/cacheable-lookup": {
-            "version": "5.0.4",
-            "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
-            "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/property-provider": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=10.6.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/cacheable-request": {
-            "version": "7.0.2",
-            "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
-            "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/protocol-http": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "clone-response": "^1.0.2",
-                "get-stream": "^5.1.0",
-                "http-cache-semantics": "^4.0.0",
-                "keyv": "^4.0.0",
-                "lowercase-keys": "^2.0.0",
-                "normalize-url": "^6.0.1",
-                "responselike": "^2.0.0"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/caching-transform": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz",
-            "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/shared-ini-file-loader": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "hasha": "^5.0.0",
-                "make-dir": "^3.0.0",
-                "package-hash": "^4.0.0",
-                "write-file-atomic": "^3.0.0"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/call-bind": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-            "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/signature-v4": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "function-bind": "^1.1.1",
-                "get-intrinsic": "^1.0.2"
+                "@smithy/is-array-buffer": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/call-me-maybe": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
-            "integrity": "sha512-wCyFsDQkKPwwF8BDwOiWNx/9K45L/hvggQiDbve+viMNMQnWhrlYIuBk09offfwCRtCO9P6XwUttufzU11WCVw==",
-            "dev": true
-        },
-        "node_modules/caller-callsite": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
-            "integrity": "sha512-JuG3qI4QOftFsZyOn1qq87fq5grLIyk1JYd5lJmdA+fG7aQ9pA/i3JIJGcO3q0MrRcHlOt1U+ZeHW8Dq9axALQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/smithy-client": {
+            "version": "4.1.6",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "callsites": "^2.0.0"
+                "@smithy/core": "^3.1.5",
+                "@smithy/middleware-endpoint": "^4.0.6",
+                "@smithy/middleware-stack": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-stream": "^4.1.2",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/caller-callsite/node_modules/callsites": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-            "integrity": "sha512-ksWePWBloaWPxJYQ8TL0JHvtci6G5QTKwQ95RcWAa/lzoAKuAOflGdAK92hpHXjkwb8zLxoLNUoNYZgVsaJzvQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/types": {
+            "version": "4.1.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=4"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/caller-path": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
-            "integrity": "sha512-MCL3sf6nCSXOwCTzvPKhN18TU7AHTvdtam8DAogxcrJ8Rjfbbg7Lgng64H9Iy+vUV6VGFClN/TyxBkAebLRR4A==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/url-parser": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "caller-callsite": "^2.0.0"
+                "@smithy/querystring-parser": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/callsites": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-            "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/util-base64": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/camelcase": {
-            "version": "6.2.0",
-            "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-            "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/util-body-length-browser": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=10"
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/util-middleware": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/camelcase-keys": {
-            "version": "6.2.2",
-            "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-            "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/util-utf8": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "camelcase": "^5.3.1",
-                "map-obj": "^4.0.0",
-                "quick-lru": "^4.0.1"
+                "@smithy/util-buffer-from": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/credential-provider-env": "3.758.0",
+                "@aws-sdk/credential-provider-http": "3.758.0",
+                "@aws-sdk/credential-provider-ini": "3.758.0",
+                "@aws-sdk/credential-provider-process": "3.758.0",
+                "@aws-sdk/credential-provider-sso": "3.758.0",
+                "@aws-sdk/credential-provider-web-identity": "3.758.0",
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/credential-provider-imds": "^4.0.1",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/camelcase-keys/node_modules/camelcase": {
-            "version": "5.3.1",
-            "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-            "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-node/node_modules/@aws-sdk/types": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/camelcase-keys/node_modules/quick-lru": {
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-node/node_modules/@smithy/property-provider": {
             "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
-            "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
-            "dev": true,
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/caniuse-lite": {
-            "version": "1.0.30001317",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001317.tgz",
-            "integrity": "sha512-xIZLh8gBm4dqNX0gkzrBeyI86J2eCjWzYAs40q88smG844YIrN4tVQl/RhquHvKEKImWWFIVh1Lxe5n1G/N+GQ==",
-            "dev": true,
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/browserslist"
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-node/node_modules/@smithy/shared-ini-file-loader": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/chainsaw": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
-            "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-node/node_modules/@smithy/types": {
+            "version": "4.1.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "traverse": ">=0.3.0 <0.4"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "*"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/chalk": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-process": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
+                "@aws-sdk/core": "3.758.0",
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/chalk?sponsor=1"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/charenc": {
-            "version": "0.0.2",
-            "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
-            "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-process/node_modules/@aws-sdk/core": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/core": "^3.1.5",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/signature-v4": "^5.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": "*"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/cheerio": {
-            "version": "1.0.0-rc.10",
-            "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz",
-            "integrity": "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-process/node_modules/@aws-sdk/types": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "cheerio-select": "^1.5.0",
-                "dom-serializer": "^1.3.2",
-                "domhandler": "^4.2.0",
-                "htmlparser2": "^6.1.0",
-                "parse5": "^6.0.1",
-                "parse5-htmlparser2-tree-adapter": "^6.0.1",
-                "tslib": "^2.2.0"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 6"
-            },
-            "funding": {
-                "url": "https://github.com/cheeriojs/cheerio?sponsor=1"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/cheerio-select": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz",
-            "integrity": "sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-process/node_modules/@smithy/core": {
+            "version": "3.1.5",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "css-select": "^4.1.3",
-                "css-what": "^5.0.1",
-                "domelementtype": "^2.2.0",
-                "domhandler": "^4.2.0",
-                "domutils": "^2.7.0"
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-stream": "^4.1.2",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/fb55"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/chokidar": {
-            "version": "3.5.3",
-            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-            "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "individual",
-                    "url": "https://paulmillr.com/funding/"
-                }
-            ],
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-process/node_modules/@smithy/middleware-endpoint": {
+            "version": "4.0.6",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "anymatch": "~3.1.2",
-                "braces": "~3.0.2",
-                "glob-parent": "~5.1.2",
-                "is-binary-path": "~2.1.0",
-                "is-glob": "~4.0.1",
-                "normalize-path": "~3.0.0",
-                "readdirp": "~3.6.0"
+                "@smithy/core": "^3.1.5",
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "@smithy/util-middleware": "^4.0.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 8.10.0"
-            },
-            "optionalDependencies": {
-                "fsevents": "~2.3.2"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/chownr": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-            "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-            "dev": true
-        },
-        "node_modules/chrome-trace-event": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-            "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-process/node_modules/@smithy/middleware-serde": {
+            "version": "4.0.2",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/circular-dependency-plugin": {
-            "version": "5.2.2",
-            "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.2.tgz",
-            "integrity": "sha512-g38K9Cm5WRwlaH6g03B9OEz/0qRizI+2I7n+Gz+L5DxXJAPAiWQvwlYNm1V1jkdpUv95bOe/ASm2vfi/G560jQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=6.0.0"
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-process/node_modules/@smithy/middleware-stack": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
-            "peerDependencies": {
-                "webpack": ">=4.0.1"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/clean-stack": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-            "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-process/node_modules/@smithy/node-config-provider": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/cli-color": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-2.0.3.tgz",
-            "integrity": "sha512-OkoZnxyC4ERN3zLzZaY9Emb7f/MhBOIpePv0Ycok0fJYT+Ouo00UBEIwsVsr0yoow++n5YWlSUgST9GKhNHiRQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-process/node_modules/@smithy/property-provider": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "d": "^1.0.1",
-                "es5-ext": "^0.10.61",
-                "es6-iterator": "^2.0.3",
-                "memoizee": "^0.4.15",
-                "timers-ext": "^0.1.7"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=0.10"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/cliui": {
-            "version": "7.0.4",
-            "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-            "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-process/node_modules/@smithy/protocol-http": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "string-width": "^4.2.0",
-                "strip-ansi": "^6.0.0",
-                "wrap-ansi": "^7.0.0"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/cliui/node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-process/node_modules/@smithy/shared-ini-file-loader": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/cliui/node_modules/strip-ansi": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-process/node_modules/@smithy/signature-v4": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "ansi-regex": "^5.0.1"
+                "@smithy/is-array-buffer": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/clone": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-            "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-process/node_modules/@smithy/smithy-client": {
+            "version": "4.1.6",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/core": "^3.1.5",
+                "@smithy/middleware-endpoint": "^4.0.6",
+                "@smithy/middleware-stack": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-stream": "^4.1.2",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/clone-buffer": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-            "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-process/node_modules/@smithy/types": {
+            "version": "4.1.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.10"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/clone-deep": {
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-process/node_modules/@smithy/url-parser": {
             "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-            "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-            "dev": true,
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "is-plain-object": "^2.0.4",
-                "kind-of": "^6.0.2",
-                "shallow-clone": "^3.0.0"
+                "@smithy/querystring-parser": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/clone-response": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
-            "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-process/node_modules/@smithy/util-body-length-browser": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "mimic-response": "^1.0.0"
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/clone-stats": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-            "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-            "dev": true
-        },
-        "node_modules/cloneable-readable": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
-            "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-process/node_modules/@smithy/util-middleware": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "inherits": "^2.0.1",
-                "process-nextick-args": "^2.0.0",
-                "readable-stream": "^2.3.5"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/cloneable-readable/node_modules/readable-stream": {
-            "version": "2.3.7",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-            "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-process/node_modules/@smithy/util-utf8": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
+                "@smithy/util-buffer-from": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/cloneable-readable/node_modules/safe-buffer": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-            "dev": true
-        },
-        "node_modules/cloneable-readable/node_modules/string_decoder": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "safe-buffer": "~5.1.0"
+                "@aws-sdk/client-sso": "3.758.0",
+                "@aws-sdk/core": "3.758.0",
+                "@aws-sdk/token-providers": "3.758.0",
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/code-block-writer": {
-            "version": "11.0.3",
-            "resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-11.0.3.tgz",
-            "integrity": "sha512-NiujjUFB4SwScJq2bwbYUtXbZhBSlY6vYzm++3Q6oC+U+injTqfPYFK8wS9COOmb2lueqp0ZRB4nK1VYeHgNyw==",
-            "dev": true
-        },
-        "node_modules/code-point-at": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-            "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/core": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/core": "^3.1.5",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/signature-v4": "^5.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/color": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz",
-            "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/token-providers": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "color-convert": "^1.9.3",
-                "color-string": "^1.6.0"
+                "@aws-sdk/nested-clients": "3.758.0",
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/types": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "color-name": "~1.1.4"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=7.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "node_modules/color-string": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.6.0.tgz",
-            "integrity": "sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-sso/node_modules/@smithy/core": {
+            "version": "3.1.5",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "color-name": "^1.0.0",
-                "simple-swizzle": "^0.2.2"
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-stream": "^4.1.2",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/color-support": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-            "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-            "dev": true,
-            "bin": {
-                "color-support": "bin.js"
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-sso/node_modules/@smithy/middleware-endpoint": {
+            "version": "4.0.6",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/core": "^3.1.5",
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "@smithy/util-middleware": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/color/node_modules/color-convert": {
-            "version": "1.9.3",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-sso/node_modules/@smithy/middleware-serde": {
+            "version": "4.0.2",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "color-name": "1.1.3"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/color/node_modules/color-name": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-            "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-        },
-        "node_modules/colorette": {
-            "version": "2.0.16",
-            "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
-            "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
-            "dev": true
-        },
-        "node_modules/colorspace": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz",
-            "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-sso/node_modules/@smithy/middleware-stack": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "color": "^3.1.3",
-                "text-hex": "1.0.x"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/commander": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
-            "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-sso/node_modules/@smithy/node-config-provider": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/commondir": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-            "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-            "dev": true
-        },
-        "node_modules/compressible": {
-            "version": "2.0.18",
-            "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-            "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-sso/node_modules/@smithy/property-provider": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "mime-db": ">= 1.43.0 < 2"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/compression": {
-            "version": "1.7.4",
-            "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-            "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-sso/node_modules/@smithy/protocol-http": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "accepts": "~1.3.5",
-                "bytes": "3.0.0",
-                "compressible": "~2.0.16",
-                "debug": "2.6.9",
-                "on-headers": "~1.0.2",
-                "safe-buffer": "5.1.2",
-                "vary": "~1.1.2"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.8.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/compression/node_modules/bytes": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-            "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-            "dev": true,
-            "engines": {
-                "node": ">= 0.8"
-            }
-        },
-        "node_modules/compression/node_modules/debug": {
-            "version": "2.6.9",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-sso/node_modules/@smithy/shared-ini-file-loader": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "ms": "2.0.0"
-            }
-        },
-        "node_modules/compression/node_modules/ms": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-            "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-            "dev": true
-        },
-        "node_modules/compression/node_modules/safe-buffer": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-            "dev": true
-        },
-        "node_modules/concat-map": {
-            "version": "0.0.1",
-            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-            "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-            "dev": true
-        },
-        "node_modules/connect-history-api-fallback": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-            "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
-            "dev": true,
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/console-control-strings": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-            "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-            "dev": true
-        },
-        "node_modules/content-disposition": {
-            "version": "0.5.4",
-            "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-            "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-sso/node_modules/@smithy/signature-v4": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "safe-buffer": "5.2.1"
+                "@smithy/is-array-buffer": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.6"
-            }
-        },
-        "node_modules/content-type": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-            "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-            "dev": true,
-            "engines": {
-                "node": ">= 0.6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/convert-source-map": {
-            "version": "1.8.0",
-            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-            "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-sso/node_modules/@smithy/smithy-client": {
+            "version": "4.1.6",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "safe-buffer": "~5.1.1"
-            }
-        },
-        "node_modules/convert-source-map/node_modules/safe-buffer": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-            "dev": true
-        },
-        "node_modules/cookie": {
-            "version": "0.5.0",
-            "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-            "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
-            "dev": true,
+                "@smithy/core": "^3.1.5",
+                "@smithy/middleware-endpoint": "^4.0.6",
+                "@smithy/middleware-stack": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-stream": "^4.1.2",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/cookie-signature": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-            "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
-            "dev": true
-        },
-        "node_modules/core-util-is": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-            "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-            "dev": true
-        },
-        "node_modules/cosmiconfig": {
-            "version": "5.2.1",
-            "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-            "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-sso/node_modules/@smithy/types": {
+            "version": "4.1.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "import-fresh": "^2.0.0",
-                "is-directory": "^0.3.1",
-                "js-yaml": "^3.13.1",
-                "parse-json": "^4.0.0"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/cosmiconfig/node_modules/argparse": {
-            "version": "1.0.10",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-sso/node_modules/@smithy/url-parser": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "sprintf-js": "~1.0.2"
+                "@smithy/querystring-parser": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/cosmiconfig/node_modules/import-fresh": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-            "integrity": "sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-sso/node_modules/@smithy/util-body-length-browser": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "caller-path": "^2.0.0",
-                "resolve-from": "^3.0.0"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/cosmiconfig/node_modules/js-yaml": {
-            "version": "3.14.1",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-            "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-sso/node_modules/@smithy/util-middleware": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "argparse": "^1.0.7",
-                "esprima": "^4.0.0"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
-            "bin": {
-                "js-yaml": "bin/js-yaml.js"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/cosmiconfig/node_modules/parse-json": {
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/credential-provider-sso/node_modules/@smithy/util-utf8": {
             "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-            "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
-            "dev": true,
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "error-ex": "^1.3.1",
-                "json-parse-better-errors": "^1.0.1"
+                "@smithy/util-buffer-from": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/cosmiconfig/node_modules/resolve-from": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-            "integrity": "sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=4"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/create-require": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-            "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-            "dev": true
-        },
-        "node_modules/cross-spawn": {
-            "version": "7.0.3",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-            "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "path-key": "^3.1.0",
-                "shebang-command": "^2.0.0",
-                "which": "^2.0.1"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/crypt": {
-            "version": "0.0.2",
-            "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
-            "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": "*"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/css-loader": {
-            "version": "6.5.1",
-            "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.5.1.tgz",
-            "integrity": "sha512-gEy2w9AnJNnD9Kuo4XAP9VflW/ujKoS9c/syO+uWMlm5igc7LysKzPXaDoR2vroROkSwsTS2tGr1yGGEbZOYZQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "icss-utils": "^5.1.0",
-                "postcss": "^8.2.15",
-                "postcss-modules-extract-imports": "^3.0.0",
-                "postcss-modules-local-by-default": "^4.0.0",
-                "postcss-modules-scope": "^3.0.0",
-                "postcss-modules-values": "^4.0.0",
-                "postcss-value-parser": "^4.1.0",
-                "semver": "^7.3.5"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.13.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/webpack"
-            },
-            "peerDependencies": {
-                "webpack": "^5.0.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/css-select": {
-            "version": "4.1.3",
-            "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
-            "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "boolbase": "^1.0.0",
-                "css-what": "^5.0.0",
-                "domhandler": "^4.2.0",
-                "domutils": "^2.6.0",
-                "nth-check": "^2.0.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-config-provider": "^3.0.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/fb55"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/css-what": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz",
-            "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/token-providers": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 6"
+                "node": ">=16.0.0"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/fb55"
+            "peerDependencies": {
+                "@aws-sdk/client-sso-oidc": "^3.693.0"
             }
         },
-        "node_modules/cssesc": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-            "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-            "dev": true,
-            "bin": {
-                "cssesc": "bin/cssesc"
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-endpoints": "^2.1.5",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/csstype": {
-            "version": "2.6.20",
-            "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.20.tgz",
-            "integrity": "sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA=="
-        },
-        "node_modules/cubic2quad": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/cubic2quad/-/cubic2quad-1.2.1.tgz",
-            "integrity": "sha512-wT5Y7mO8abrV16gnssKdmIhIbA9wSkeMzhh27jAguKrV82i24wER0vL5TGhUJ9dbJNDcigoRZ0IAHFEEEI4THQ==",
-            "dev": true
-        },
-        "node_modules/d": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-            "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "es5-ext": "^0.10.50",
-                "type": "^1.0.1"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/debug": {
-            "version": "4.3.4",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-            "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "ms": "2.1.2"
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6.0"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
             },
             "peerDependenciesMeta": {
-                "supports-color": {
+                "aws-crt": {
                     "optional": true
                 }
             }
         },
-        "node_modules/decamelize": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
-            "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/abort-controller": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/decamelize-keys": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
-            "integrity": "sha512-ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/abort-controller/node_modules/@smithy/types": {
+            "version": "4.1.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "decamelize": "^1.1.0",
-                "map-obj": "^1.0.0"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/decamelize-keys/node_modules/decamelize": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-            "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/credential-provider-imds": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/decamelize-keys/node_modules/map-obj": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-            "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/credential-provider-imds/node_modules/@smithy/node-config-provider": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/decompress-response": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-            "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/credential-provider-imds/node_modules/@smithy/property-provider": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "mimic-response": "^3.1.0"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/decompress-response/node_modules/mimic-response": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-            "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-            "engines": {
-                "node": ">=10"
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/credential-provider-imds/node_modules/@smithy/shared-ini-file-loader": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/deep-extend": {
-            "version": "0.6.0",
-            "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-            "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/credential-provider-imds/node_modules/@smithy/types": {
+            "version": "4.1.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=4.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/deep-is": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-            "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
-        },
-        "node_modules/deepmerge": {
-            "version": "4.2.2",
-            "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-            "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/credential-provider-imds/node_modules/@smithy/url-parser": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/querystring-parser": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/default-gateway": {
-            "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
-            "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/is-array-buffer": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "execa": "^5.0.0"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 10"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/default-gateway/node_modules/execa": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-            "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/querystring-builder": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "cross-spawn": "^7.0.3",
-                "get-stream": "^6.0.0",
-                "human-signals": "^2.1.0",
-                "is-stream": "^2.0.0",
-                "merge-stream": "^2.0.0",
-                "npm-run-path": "^4.0.1",
-                "onetime": "^5.1.2",
-                "signal-exit": "^3.0.3",
-                "strip-final-newline": "^2.0.0"
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sindresorhus/execa?sponsor=1"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/default-gateway/node_modules/get-stream": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-            "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/querystring-builder/node_modules/@smithy/types": {
+            "version": "4.1.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/default-gateway/node_modules/human-signals": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-            "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/querystring-parser": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=10.17.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/default-require-extensions": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.0.tgz",
-            "integrity": "sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/querystring-parser/node_modules/@smithy/types": {
+            "version": "4.1.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "strip-bom": "^4.0.0"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/defer-to-connect": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
-            "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/service-error-classification": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0"
+            },
             "engines": {
-                "node": ">=10"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/define-lazy-prop": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-            "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/service-error-classification/node_modules/@smithy/types": {
+            "version": "4.1.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/define-properties": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-            "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/util-buffer-from": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
+                "@smithy/is-array-buffer": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.4"
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/util-hex-encoding": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/delegates": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-            "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-            "dev": true
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/util-stream": {
+            "version": "4.1.2",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/fetch-http-handler": "^5.0.1",
+                "@smithy/node-http-handler": "^4.0.3",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "node_modules/depd": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-            "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/util-stream/node_modules/@smithy/fetch-http-handler": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/querystring-builder": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-base64": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/destroy": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-            "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/util-stream/node_modules/@smithy/node-http-handler": {
+            "version": "4.0.3",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/abort-controller": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/querystring-builder": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.8",
-                "npm": "1.2.8000 || >= 1.4.16"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/detect-libc": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-            "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
-            "dev": true,
-            "bin": {
-                "detect-libc": "bin/detect-libc.js"
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/util-stream/node_modules/@smithy/protocol-http": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=0.10"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/detect-node": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-            "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
-            "dev": true
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/util-stream/node_modules/@smithy/types": {
+            "version": "4.1.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "node_modules/diff": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
-            "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/util-stream/node_modules/@smithy/util-base64": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.3.1"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/dir-glob": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-            "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/util-stream/node_modules/@smithy/util-utf8": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "path-type": "^4.0.0"
+                "@smithy/util-buffer-from": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/dns-equal": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-            "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==",
-            "dev": true
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/util-uri-escape": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "node_modules/dns-packet": {
-            "version": "5.4.0",
-            "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.4.0.tgz",
-            "integrity": "sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@leichtgewicht/ip-codec": "^2.0.1"
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/doctrine": {
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/util-utf8/node_modules/@smithy/is-array-buffer": {
             "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-            "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-            "dev": true,
+            "license": "Apache-2.0",
             "dependencies": {
-                "esutils": "^2.0.2"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6.0.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/dom-serializer": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
-            "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-codecatalyst/node_modules/@smithy/util-utf8/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "domelementtype": "^2.0.1",
-                "domhandler": "^4.2.0",
-                "entities": "^2.0.0"
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-cognito-identity": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.730.0.tgz",
+            "integrity": "sha512-iJt2pL6RqWg7R3pja1WfcC2+oTjwaKFYndNE9oUQqyc6RN24XWUtGy9JnWqTUOy8jYzaP2eoF00fGeasSBX+Dw==",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.730.0",
+                "@aws-sdk/credential-provider-node": "3.730.0",
+                "@aws-sdk/middleware-host-header": "3.723.0",
+                "@aws-sdk/middleware-logger": "3.723.0",
+                "@aws-sdk/middleware-recursion-detection": "3.723.0",
+                "@aws-sdk/middleware-user-agent": "3.730.0",
+                "@aws-sdk/region-config-resolver": "3.723.0",
+                "@aws-sdk/types": "3.723.0",
+                "@aws-sdk/util-endpoints": "3.730.0",
+                "@aws-sdk/util-user-agent-browser": "3.723.0",
+                "@aws-sdk/util-user-agent-node": "3.730.0",
+                "@smithy/config-resolver": "^4.0.0",
+                "@smithy/core": "^3.0.0",
+                "@smithy/fetch-http-handler": "^5.0.0",
+                "@smithy/hash-node": "^4.0.0",
+                "@smithy/invalid-dependency": "^4.0.0",
+                "@smithy/middleware-content-length": "^4.0.0",
+                "@smithy/middleware-endpoint": "^4.0.0",
+                "@smithy/middleware-retry": "^4.0.0",
+                "@smithy/middleware-serde": "^4.0.0",
+                "@smithy/middleware-stack": "^4.0.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/node-http-handler": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/smithy-client": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/url-parser": "^4.0.0",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.0",
+                "@smithy/util-defaults-mode-node": "^4.0.0",
+                "@smithy/util-endpoints": "^3.0.0",
+                "@smithy/util-middleware": "^4.0.0",
+                "@smithy/util-retry": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-sdk/client-sso": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.730.0.tgz",
+            "integrity": "sha512-mI8kqkSuVlZklewEmN7jcbBMyVODBld3MsTjCKSl5ztduuPX69JD7nXLnWWPkw1PX4aGTO24AEoRMGNxntoXUg==",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.730.0",
+                "@aws-sdk/middleware-host-header": "3.723.0",
+                "@aws-sdk/middleware-logger": "3.723.0",
+                "@aws-sdk/middleware-recursion-detection": "3.723.0",
+                "@aws-sdk/middleware-user-agent": "3.730.0",
+                "@aws-sdk/region-config-resolver": "3.723.0",
+                "@aws-sdk/types": "3.723.0",
+                "@aws-sdk/util-endpoints": "3.730.0",
+                "@aws-sdk/util-user-agent-browser": "3.723.0",
+                "@aws-sdk/util-user-agent-node": "3.730.0",
+                "@smithy/config-resolver": "^4.0.0",
+                "@smithy/core": "^3.0.0",
+                "@smithy/fetch-http-handler": "^5.0.0",
+                "@smithy/hash-node": "^4.0.0",
+                "@smithy/invalid-dependency": "^4.0.0",
+                "@smithy/middleware-content-length": "^4.0.0",
+                "@smithy/middleware-endpoint": "^4.0.0",
+                "@smithy/middleware-retry": "^4.0.0",
+                "@smithy/middleware-serde": "^4.0.0",
+                "@smithy/middleware-stack": "^4.0.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/node-http-handler": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/smithy-client": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/url-parser": "^4.0.0",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.0",
+                "@smithy/util-defaults-mode-node": "^4.0.0",
+                "@smithy/util-endpoints": "^3.0.0",
+                "@smithy/util-middleware": "^4.0.0",
+                "@smithy/util-retry": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-sdk/core": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.730.0.tgz",
+            "integrity": "sha512-jonKyR+2GcqbZj2WDICZS0c633keLc9qwXnePu83DfAoFXMMIMyoR/7FOGf8F3OrIdGh8KzE9VvST+nZCK9EJA==",
+            "dependencies": {
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/core": "^3.0.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/signature-v4": "^5.0.0",
+                "@smithy/smithy-client": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.0",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-sdk/credential-provider-env": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.730.0.tgz",
+            "integrity": "sha512-fFXgo3jBXLWqu8I07Hd96mS7RjrtpDgm3bZShm0F3lKtqDQF+hObFWq9A013SOE+RjMLVfbABhToXAYct3FcBw==",
+            "dependencies": {
+                "@aws-sdk/core": "3.730.0",
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.730.0.tgz",
+            "integrity": "sha512-1aF3elbCzpVhWLAuV63iFElfLOqLGGTp4fkf2VAFIDO3hjshpXUQssTgIWiBwwtJYJdOSxaFrCU7u8frjr/5aQ==",
+            "dependencies": {
+                "@aws-sdk/core": "3.730.0",
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/fetch-http-handler": "^5.0.0",
+                "@smithy/node-http-handler": "^4.0.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/smithy-client": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/util-stream": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.730.0.tgz",
+            "integrity": "sha512-zwsxkBuQuPp06o45ATAnznHzj3+ibop/EaTytNzSv0O87Q59K/jnS/bdtv1n6bhe99XCieRNTihvtS7YklzK7A==",
+            "dependencies": {
+                "@aws-sdk/core": "3.730.0",
+                "@aws-sdk/credential-provider-env": "3.730.0",
+                "@aws-sdk/credential-provider-http": "3.730.0",
+                "@aws-sdk/credential-provider-process": "3.730.0",
+                "@aws-sdk/credential-provider-sso": "3.730.0",
+                "@aws-sdk/credential-provider-web-identity": "3.730.0",
+                "@aws-sdk/nested-clients": "3.730.0",
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/credential-provider-imds": "^4.0.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/shared-ini-file-loader": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/domelementtype": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-            "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/fb55"
-                }
-            ]
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.730.0.tgz",
+            "integrity": "sha512-ztRjh1edY7ut2wwrj1XqHtqPY/NXEYIk5fYf04KKsp8zBi81ScVqP7C+Cst6PFKixjgLSG6RsqMx9GSAalVv0Q==",
+            "dependencies": {
+                "@aws-sdk/credential-provider-env": "3.730.0",
+                "@aws-sdk/credential-provider-http": "3.730.0",
+                "@aws-sdk/credential-provider-ini": "3.730.0",
+                "@aws-sdk/credential-provider-process": "3.730.0",
+                "@aws-sdk/credential-provider-sso": "3.730.0",
+                "@aws-sdk/credential-provider-web-identity": "3.730.0",
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/credential-provider-imds": "^4.0.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/shared-ini-file-loader": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "node_modules/domhandler": {
-            "version": "4.2.2",
-            "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz",
-            "integrity": "sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-sdk/credential-provider-process": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.730.0.tgz",
+            "integrity": "sha512-cNKUQ81eptfZN8MlSqwUq3+5ln8u/PcY57UmLZ+npxUHanqO1akpgcpNsLpmsIkoXGbtSQrLuDUgH86lS/SWOw==",
             "dependencies": {
-                "domelementtype": "^2.2.0"
+                "@aws-sdk/core": "3.730.0",
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/shared-ini-file-loader": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 4"
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.730.0.tgz",
+            "integrity": "sha512-SdI2xrTbquJLMxUh5LpSwB8zfiKq3/jso53xWRgrVfeDlrSzZuyV6QghaMs3KEEjcNzwEnTfSIjGQyRXG9VrEw==",
+            "dependencies": {
+                "@aws-sdk/client-sso": "3.730.0",
+                "@aws-sdk/core": "3.730.0",
+                "@aws-sdk/token-providers": "3.730.0",
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/shared-ini-file-loader": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/fb55/domhandler?sponsor=1"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/domutils": {
-            "version": "2.8.0",
-            "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-            "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.730.0.tgz",
+            "integrity": "sha512-l5vdPmvF/d890pbvv5g1GZrdjaSQkyPH/Bc8dO/ZqkWxkIP8JNgl48S2zgf4DkP3ik9K2axWO828L5RsMDQzdA==",
             "dependencies": {
-                "dom-serializer": "^1.0.1",
-                "domelementtype": "^2.2.0",
-                "domhandler": "^4.2.0"
+                "@aws-sdk/core": "3.730.0",
+                "@aws-sdk/nested-clients": "3.730.0",
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/fb55/domutils?sponsor=1"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/duplexer": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-            "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
-            "dev": true
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.723.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.723.0.tgz",
+            "integrity": "sha512-LLVzLvk299pd7v4jN9yOSaWDZDfH0SnBPb6q+FDPaOCMGBY8kuwQso7e/ozIKSmZHRMGO3IZrflasHM+rI+2YQ==",
+            "dependencies": {
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "node_modules/duplexer2": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
-            "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.723.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.723.0.tgz",
+            "integrity": "sha512-chASQfDG5NJ8s5smydOEnNK7N0gDMyuPbx7dYYcm1t/PKtnVfvWF+DHCTrRC2Ej76gLJVCVizlAJKM8v8Kg3cg==",
             "dependencies": {
-                "readable-stream": "^2.0.2"
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/duplexer2/node_modules/readable-stream": {
-            "version": "2.3.7",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-            "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.723.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.723.0.tgz",
+            "integrity": "sha512-7usZMtoynT9/jxL/rkuDOFQ0C2mhXl4yCm67Rg7GNTstl67u7w5WN1aIRImMeztaKlw8ExjoTyo6WTs1Kceh7A==",
             "dependencies": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/duplexer2/node_modules/safe-buffer": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-            "dev": true
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.730.0.tgz",
+            "integrity": "sha512-aPMZvNmf2a42B41au3bA3ODU4HfHka2nYT/SAIhhVXH1ENYfAmZo7FraFPxetKepFMCtL7j4QE6/LDucK6liIw==",
+            "dependencies": {
+                "@aws-sdk/core": "3.730.0",
+                "@aws-sdk/types": "3.723.0",
+                "@aws-sdk/util-endpoints": "3.730.0",
+                "@smithy/core": "^3.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "node_modules/duplexer2/node_modules/string_decoder": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-sdk/nested-clients": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.730.0.tgz",
+            "integrity": "sha512-vilIgf1/7kre8DdE5zAQkDOwHFb/TahMn/6j2RZwFLlK7cDk91r19deSiVYnKQkupDMtOfNceNqnorM4I3PDzw==",
             "dependencies": {
-                "safe-buffer": "~5.1.0"
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.730.0",
+                "@aws-sdk/middleware-host-header": "3.723.0",
+                "@aws-sdk/middleware-logger": "3.723.0",
+                "@aws-sdk/middleware-recursion-detection": "3.723.0",
+                "@aws-sdk/middleware-user-agent": "3.730.0",
+                "@aws-sdk/region-config-resolver": "3.723.0",
+                "@aws-sdk/types": "3.723.0",
+                "@aws-sdk/util-endpoints": "3.730.0",
+                "@aws-sdk/util-user-agent-browser": "3.723.0",
+                "@aws-sdk/util-user-agent-node": "3.730.0",
+                "@smithy/config-resolver": "^4.0.0",
+                "@smithy/core": "^3.0.0",
+                "@smithy/fetch-http-handler": "^5.0.0",
+                "@smithy/hash-node": "^4.0.0",
+                "@smithy/invalid-dependency": "^4.0.0",
+                "@smithy/middleware-content-length": "^4.0.0",
+                "@smithy/middleware-endpoint": "^4.0.0",
+                "@smithy/middleware-retry": "^4.0.0",
+                "@smithy/middleware-serde": "^4.0.0",
+                "@smithy/middleware-stack": "^4.0.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/node-http-handler": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/smithy-client": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/url-parser": "^4.0.0",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.0",
+                "@smithy/util-defaults-mode-node": "^4.0.0",
+                "@smithy/util-endpoints": "^3.0.0",
+                "@smithy/util-middleware": "^4.0.0",
+                "@smithy/util-retry": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/ee-first": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-            "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
-            "dev": true
-        },
-        "node_modules/electron-to-chromium": {
-            "version": "1.4.86",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.86.tgz",
-            "integrity": "sha512-EVTZ+igi8x63pK4bPuA95PXIs2b2Cowi3WQwI9f9qManLiZJOD1Lash1J3W4TvvcUCcIR4o/rgi9o8UicXSO+w==",
-            "dev": true
-        },
-        "node_modules/emoji-regex": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-            "dev": true
-        },
-        "node_modules/emojis-list": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-            "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.723.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.723.0.tgz",
+            "integrity": "sha512-tGF/Cvch3uQjZIj34LY2mg8M2Dr4kYG8VU8Yd0dFnB1ybOEOveIK/9ypUo9ycZpB9oO6q01KRe5ijBaxNueUQg==",
+            "dependencies": {
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 4"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/enabled": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz",
-            "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="
-        },
-        "node_modules/encodeurl": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-            "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-sdk/token-providers": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.730.0.tgz",
+            "integrity": "sha512-BSPssGj54B/AABWXARIPOT/1ybFahM1ldlfmXy9gRmZi/afe9geWJGlFYCCt3PmqR+1Ny5XIjSfue+kMd//drQ==",
+            "dependencies": {
+                "@aws-sdk/nested-clients": "3.730.0",
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/shared-ini-file-loader": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/end-of-stream": {
-            "version": "1.4.4",
-            "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-            "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-sdk/types": {
+            "version": "3.723.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.723.0.tgz",
+            "integrity": "sha512-LmK3kwiMZG1y5g3LGihT9mNkeNOmwEyPk6HGcJqh0wOSV4QpWoKu2epyKE4MLQNUUlz2kOVbVbOrwmI6ZcteuA==",
+            "dependencies": {
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.730.0.tgz",
+            "integrity": "sha512-1KTFuVnk+YtLgWr6TwDiggcDqtPpOY2Cszt3r2lkXfaEAX6kHyOZi1vdvxXjPU5LsOBJem8HZ7KlkmrEi+xowg==",
             "dependencies": {
-                "once": "^1.4.0"
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/util-endpoints": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.723.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.723.0.tgz",
+            "integrity": "sha512-Wh9I6j2jLhNFq6fmXydIpqD1WyQLyTfSxjW9B+PXSnPyk3jtQW8AKQur7p97rO8LAUzVI0bv8kb3ZzDEVbquIg==",
+            "dependencies": {
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/types": "^4.0.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/enhanced-resolve": {
-            "version": "5.8.3",
-            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz",
-            "integrity": "sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.730.0.tgz",
+            "integrity": "sha512-yBvkOAjqsDEl1va4eHNOhnFBk0iCY/DBFNyhvtTMqPF4NO+MITWpFs3J9JtZKzJlQ6x0Yb9TLQ8NhDjEISz5Ug==",
             "dependencies": {
-                "graceful-fs": "^4.2.4",
-                "tapable": "^2.2.0"
+                "@aws-sdk/middleware-user-agent": "3.730.0",
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10.13.0"
+                "node": ">=18.0.0"
+            },
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
             }
         },
-        "node_modules/entities": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-            "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-            "dev": true,
-            "funding": {
-                "url": "https://github.com/fb55/entities?sponsor=1"
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/abort-controller": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-4.0.4.tgz",
+            "integrity": "sha512-gJnEjZMvigPDQWHrW3oPrFhQtkrgqBkyjj3pCIdF3A5M6vsZODG93KNlfJprv6bp4245bdT32fsHK4kkH3KYDA==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/envinfo": {
-            "version": "7.8.1",
-            "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
-            "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
-            "dev": true,
-            "bin": {
-                "envinfo": "dist/cli.js"
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/config-resolver": {
+            "version": "4.1.4",
+            "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-4.1.4.tgz",
+            "integrity": "sha512-prmU+rDddxHOH0oNcwemL+SwnzcG65sBF2yXRO7aeXIn/xTlq2pX7JLVbkBnVLowHLg4/OL4+jBmv9hVrVGS+w==",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.4",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/error-ex": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-            "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/core": {
+            "version": "3.5.3",
+            "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.5.3.tgz",
+            "integrity": "sha512-xa5byV9fEguZNofCclv6v9ra0FYh5FATQW/da7FQUVTic94DfrN/NvmKZjrMyzbpqfot9ZjBaO8U1UeTbmSLuA==",
             "dependencies": {
-                "is-arrayish": "^0.2.1"
+                "@smithy/middleware-serde": "^4.0.8",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-stream": "^4.2.2",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/error-ex/node_modules/is-arrayish": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-            "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-            "dev": true
-        },
-        "node_modules/es-abstract": {
-            "version": "1.20.2",
-            "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.2.tgz",
-            "integrity": "sha512-XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ==",
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/credential-provider-imds": {
+            "version": "4.0.6",
+            "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-4.0.6.tgz",
+            "integrity": "sha512-hKMWcANhUiNbCJouYkZ9V3+/Qf9pteR1dnwgdyzR09R4ODEYx8BbUysHwRSyex4rZ9zapddZhLFTnT4ZijR4pw==",
             "dependencies": {
-                "call-bind": "^1.0.2",
-                "es-to-primitive": "^1.2.1",
-                "function-bind": "^1.1.1",
-                "function.prototype.name": "^1.1.5",
-                "get-intrinsic": "^1.1.2",
-                "get-symbol-description": "^1.0.0",
-                "has": "^1.0.3",
-                "has-property-descriptors": "^1.0.0",
-                "has-symbols": "^1.0.3",
-                "internal-slot": "^1.0.3",
-                "is-callable": "^1.2.4",
-                "is-negative-zero": "^2.0.2",
-                "is-regex": "^1.1.4",
-                "is-shared-array-buffer": "^1.0.2",
-                "is-string": "^1.0.7",
-                "is-weakref": "^1.0.2",
-                "object-inspect": "^1.12.2",
-                "object-keys": "^1.1.1",
-                "object.assign": "^4.1.4",
-                "regexp.prototype.flags": "^1.4.3",
-                "string.prototype.trimend": "^1.0.5",
-                "string.prototype.trimstart": "^1.0.5",
-                "unbox-primitive": "^1.0.2"
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "@smithy/url-parser": "^4.0.4",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/es-module-lexer": {
-            "version": "0.9.3",
-            "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
-            "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
-            "dev": true
-        },
-        "node_modules/es-to-primitive": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-            "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/fetch-http-handler": {
+            "version": "5.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.0.4.tgz",
+            "integrity": "sha512-AMtBR5pHppYMVD7z7G+OlHHAcgAN7v0kVKEpHuTO4Gb199Gowh0taYi9oDStFeUhetkeP55JLSVlTW1n9rFtUw==",
             "dependencies": {
-                "is-callable": "^1.1.4",
-                "is-date-object": "^1.0.1",
-                "is-symbol": "^1.0.2"
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/querystring-builder": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-base64": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/es5-ext": {
-            "version": "0.10.62",
-            "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz",
-            "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==",
-            "dev": true,
-            "hasInstallScript": true,
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/hash-node": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-4.0.4.tgz",
+            "integrity": "sha512-qnbTPUhCVnCgBp4z4BUJUhOEkVwxiEi1cyFM+Zj6o+aY8OFGxUQleKWq8ltgp3dujuhXojIvJWdoqpm6dVO3lQ==",
             "dependencies": {
-                "es6-iterator": "^2.0.3",
-                "es6-symbol": "^3.1.3",
-                "next-tick": "^1.1.0"
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=0.10"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/es6-error": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
-            "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
-            "dev": true
-        },
-        "node_modules/es6-iterator": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-            "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/invalid-dependency": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-4.0.4.tgz",
+            "integrity": "sha512-bNYMi7WKTJHu0gn26wg8OscncTt1t2b8KcsZxvOv56XA6cyXtOAAAaNP7+m45xfppXfOatXF3Sb1MNsLUgVLTw==",
             "dependencies": {
-                "d": "1",
-                "es5-ext": "^0.10.35",
-                "es6-symbol": "^3.1.1"
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/es6-promise": {
-            "version": "4.2.8",
-            "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-            "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
-        },
-        "node_modules/es6-promisify": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
-            "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/is-array-buffer": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-4.0.0.tgz",
+            "integrity": "sha512-saYhF8ZZNoJDTvJBEWgeBccCg+yvp1CX+ed12yORU3NilJScfc6gfch2oVb4QgxZrGUx3/ZJlb+c/dJbyupxlw==",
             "dependencies": {
-                "es6-promise": "^4.0.3"
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/es6-symbol": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-            "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/middleware-content-length": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-4.0.4.tgz",
+            "integrity": "sha512-F7gDyfI2BB1Kc+4M6rpuOLne5LOcEknH1n6UQB69qv+HucXBR1rkzXBnQTB2q46sFy1PM/zuSJOB532yc8bg3w==",
             "dependencies": {
-                "d": "^1.0.1",
-                "ext": "^1.1.2"
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/es6-weak-map": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
-            "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/middleware-endpoint": {
+            "version": "4.1.11",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.1.11.tgz",
+            "integrity": "sha512-zDogwtRLzKl58lVS8wPcARevFZNBOOqnmzWWxVe9XiaXU2CADFjvJ9XfNibgkOWs08sxLuSr81NrpY4mgp9OwQ==",
             "dependencies": {
-                "d": "1",
-                "es5-ext": "^0.10.46",
-                "es6-iterator": "^2.0.3",
-                "es6-symbol": "^3.1.1"
+                "@smithy/core": "^3.5.3",
+                "@smithy/middleware-serde": "^4.0.8",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/shared-ini-file-loader": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "@smithy/url-parser": "^4.0.4",
+                "@smithy/util-middleware": "^4.0.4",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/esbuild": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.13.tgz",
-            "integrity": "sha512-Cu3SC84oyzzhrK/YyN4iEVy2jZu5t2fz66HEOShHURcjSkOSAVL8C/gfUT+lDJxkVHpg8GZ10DD0rMHRPqMFaQ==",
-            "dev": true,
-            "hasInstallScript": true,
-            "bin": {
-                "esbuild": "bin/esbuild"
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/middleware-retry": {
+            "version": "4.1.12",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.1.12.tgz",
+            "integrity": "sha512-wvIH70c4e91NtRxdaLZF+mbLZ/HcC6yg7ySKUiufL6ESp6zJUSnJucZ309AvG9nqCFHSRB5I6T3Ez1Q9wCh0Ww==",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/service-error-classification": "^4.0.5",
+                "@smithy/smithy-client": "^4.4.3",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-retry": "^4.0.5",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
             },
             "engines": {
-                "node": ">=12"
-            },
-            "optionalDependencies": {
-                "@esbuild/android-arm": "0.15.13",
-                "@esbuild/linux-loong64": "0.15.13",
-                "esbuild-android-64": "0.15.13",
-                "esbuild-android-arm64": "0.15.13",
-                "esbuild-darwin-64": "0.15.13",
-                "esbuild-darwin-arm64": "0.15.13",
-                "esbuild-freebsd-64": "0.15.13",
-                "esbuild-freebsd-arm64": "0.15.13",
-                "esbuild-linux-32": "0.15.13",
-                "esbuild-linux-64": "0.15.13",
-                "esbuild-linux-arm": "0.15.13",
-                "esbuild-linux-arm64": "0.15.13",
-                "esbuild-linux-mips64le": "0.15.13",
-                "esbuild-linux-ppc64le": "0.15.13",
-                "esbuild-linux-riscv64": "0.15.13",
-                "esbuild-linux-s390x": "0.15.13",
-                "esbuild-netbsd-64": "0.15.13",
-                "esbuild-openbsd-64": "0.15.13",
-                "esbuild-sunos-64": "0.15.13",
-                "esbuild-windows-32": "0.15.13",
-                "esbuild-windows-64": "0.15.13",
-                "esbuild-windows-arm64": "0.15.13"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/esbuild-android-64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.13.tgz",
-            "integrity": "sha512-yRorukXBlokwTip+Sy4MYskLhJsO0Kn0/Fj43s1krVblfwP+hMD37a4Wmg139GEsMLl+vh8WXp2mq/cTA9J97g==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "android"
-            ],
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/middleware-serde": {
+            "version": "4.0.8",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-4.0.8.tgz",
+            "integrity": "sha512-iSSl7HJoJaGyMIoNn2B7czghOVwJ9nD7TMvLhMWeSB5vt0TnEYyRRqPJu/TqW76WScaNvYYB8nRoiBHR9S1Ddw==",
+            "dependencies": {
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=12"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/esbuild-android-arm64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.13.tgz",
-            "integrity": "sha512-TKzyymLD6PiVeyYa4c5wdPw87BeAiTXNtK6amWUcXZxkV51gOk5u5qzmDaYSwiWeecSNHamFsaFjLoi32QR5/w==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "android"
-            ],
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/middleware-stack": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-4.0.4.tgz",
+            "integrity": "sha512-kagK5ggDrBUCCzI93ft6DjteNSfY8Ulr83UtySog/h09lTIOAJ/xUSObutanlPT0nhoHAkpmW9V5K8oPyLh+QA==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=12"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/esbuild-darwin-64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.13.tgz",
-            "integrity": "sha512-WAx7c2DaOS6CrRcoYCgXgkXDliLnFv3pQLV6GeW1YcGEZq2Gnl8s9Pg7ahValZkpOa0iE/ojRVQ87sbUhF1Cbg==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "darwin"
-            ],
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/node-config-provider": {
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-4.1.3.tgz",
+            "integrity": "sha512-HGHQr2s59qaU1lrVH6MbLlmOBxadtzTsoO4c+bF5asdgVik3I8o7JIOzoeqWc5MjVa+vD36/LWE0iXKpNqooRw==",
+            "dependencies": {
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/shared-ini-file-loader": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=12"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/esbuild-darwin-arm64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.13.tgz",
-            "integrity": "sha512-U6jFsPfSSxC3V1CLiQqwvDuj3GGrtQNB3P3nNC3+q99EKf94UGpsG9l4CQ83zBs1NHrk1rtCSYT0+KfK5LsD8A==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "darwin"
-            ],
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/node-http-handler": {
+            "version": "4.0.6",
+            "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.0.6.tgz",
+            "integrity": "sha512-NqbmSz7AW2rvw4kXhKGrYTiJVDHnMsFnX4i+/FzcZAfbOBauPYs2ekuECkSbtqaxETLLTu9Rl/ex6+I2BKErPA==",
+            "dependencies": {
+                "@smithy/abort-controller": "^4.0.4",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/querystring-builder": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=12"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/esbuild-freebsd-64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.13.tgz",
-            "integrity": "sha512-whItJgDiOXaDG/idy75qqevIpZjnReZkMGCgQaBWZuKHoElDJC1rh7MpoUgupMcdfOd+PgdEwNQW9DAE6i8wyA==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "freebsd"
-            ],
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/property-provider": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-4.0.4.tgz",
+            "integrity": "sha512-qHJ2sSgu4FqF4U/5UUp4DhXNmdTrgmoAai6oQiM+c5RZ/sbDwJ12qxB1M6FnP+Tn/ggkPZf9ccn4jqKSINaquw==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=12"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/esbuild-freebsd-arm64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.13.tgz",
-            "integrity": "sha512-6pCSWt8mLUbPtygv7cufV0sZLeylaMwS5Fznj6Rsx9G2AJJsAjQ9ifA+0rQEIg7DwJmi9it+WjzNTEAzzdoM3Q==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "freebsd"
-            ],
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/protocol-http": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-5.1.2.tgz",
+            "integrity": "sha512-rOG5cNLBXovxIrICSBm95dLqzfvxjEmuZx4KK3hWwPFHGdW3lxY0fZNXfv2zebfRO7sJZ5pKJYHScsqopeIWtQ==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=12"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/esbuild-linux-32": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.13.tgz",
-            "integrity": "sha512-VbZdWOEdrJiYApm2kkxoTOgsoCO1krBZ3quHdYk3g3ivWaMwNIVPIfEE0f0XQQ0u5pJtBsnk2/7OPiCFIPOe/w==",
-            "cpu": [
-                "ia32"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "linux"
-            ],
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/querystring-builder": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-4.0.4.tgz",
+            "integrity": "sha512-SwREZcDnEYoh9tLNgMbpop+UTGq44Hl9tdj3rf+yeLcfH7+J8OXEBaMc2kDxtyRHu8BhSg9ADEx0gFHvpJgU8w==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=12"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/esbuild-linux-64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.13.tgz",
-            "integrity": "sha512-rXmnArVNio6yANSqDQlIO4WiP+Cv7+9EuAHNnag7rByAqFVuRusLbGi2697A5dFPNXoO//IiogVwi3AdcfPC6A==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "linux"
-            ],
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/querystring-parser": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-4.0.4.tgz",
+            "integrity": "sha512-6yZf53i/qB8gRHH/l2ZwUG5xgkPgQF15/KxH0DdXMDHjesA9MeZje/853ifkSY0x4m5S+dfDZ+c4x439PF0M2w==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=12"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/esbuild-linux-arm": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.13.tgz",
-            "integrity": "sha512-Ac6LpfmJO8WhCMQmO253xX2IU2B3wPDbl4IvR0hnqcPrdfCaUa2j/lLMGTjmQ4W5JsJIdHEdW12dG8lFS0MbxQ==",
-            "cpu": [
-                "arm"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "linux"
-            ],
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/service-error-classification": {
+            "version": "4.0.5",
+            "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-4.0.5.tgz",
+            "integrity": "sha512-LvcfhrnCBvCmTee81pRlh1F39yTS/+kYleVeLCwNtkY8wtGg8V/ca9rbZZvYIl8OjlMtL6KIjaiL/lgVqHD2nA==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1"
+            },
             "engines": {
-                "node": ">=12"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/esbuild-linux-arm64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.13.tgz",
-            "integrity": "sha512-alEMGU4Z+d17U7KQQw2IV8tQycO6T+rOrgW8OS22Ua25x6kHxoG6Ngry6Aq6uranC+pNWNMB6aHFPh7aTQdORQ==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "linux"
-            ],
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/shared-ini-file-loader": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.0.4.tgz",
+            "integrity": "sha512-63X0260LoFBjrHifPDs+nM9tV0VMkOTl4JRMYNuKh/f5PauSjowTfvF3LogfkWdcPoxsA9UjqEOgjeYIbhb7Nw==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=12"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/esbuild-linux-mips64le": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.13.tgz",
-            "integrity": "sha512-47PgmyYEu+yN5rD/MbwS6DxP2FSGPo4Uxg5LwIdxTiyGC2XKwHhHyW7YYEDlSuXLQXEdTO7mYe8zQ74czP7W8A==",
-            "cpu": [
-                "mips64el"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "linux"
-            ],
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/signature-v4": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-5.1.2.tgz",
+            "integrity": "sha512-d3+U/VpX7a60seHziWnVZOHuEgJlclufjkS6zhXvxcJgkJq4UWdH5eOBLzHRMx6gXjsdT9h6lfpmLzbrdupHgQ==",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^4.0.0",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=12"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/esbuild-linux-ppc64le": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.13.tgz",
-            "integrity": "sha512-z6n28h2+PC1Ayle9DjKoBRcx/4cxHoOa2e689e2aDJSaKug3jXcQw7mM+GLg+9ydYoNzj8QxNL8ihOv/OnezhA==",
-            "cpu": [
-                "ppc64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "linux"
-            ],
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/smithy-client": {
+            "version": "4.4.3",
+            "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.4.3.tgz",
+            "integrity": "sha512-xxzNYgA0HD6ETCe5QJubsxP0hQH3QK3kbpJz3QrosBCuIWyEXLR/CO5hFb2OeawEKUxMNhz3a1nuJNN2np2RMA==",
+            "dependencies": {
+                "@smithy/core": "^3.5.3",
+                "@smithy/middleware-endpoint": "^4.1.11",
+                "@smithy/middleware-stack": "^4.0.4",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-stream": "^4.2.2",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=12"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/esbuild-linux-riscv64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.13.tgz",
-            "integrity": "sha512-+Lu4zuuXuQhgLUGyZloWCqTslcCAjMZH1k3Xc9MSEJEpEFdpsSU0sRDXAnk18FKOfEjhu4YMGaykx9xjtpA6ow==",
-            "cpu": [
-                "riscv64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "linux"
-            ],
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/types": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.3.1.tgz",
+            "integrity": "sha512-UqKOQBL2x6+HWl3P+3QqFD4ncKq0I8Nuz9QItGv5WuKuMHuuwlhvqcZCoXGfc+P1QmfJE7VieykoYYmrOoFJxA==",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=12"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/esbuild-linux-s390x": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.13.tgz",
-            "integrity": "sha512-BMeXRljruf7J0TMxD5CIXS65y7puiZkAh+s4XFV9qy16SxOuMhxhVIXYLnbdfLrsYGFzx7U9mcdpFWkkvy/Uag==",
-            "cpu": [
-                "s390x"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "linux"
-            ],
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/url-parser": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-4.0.4.tgz",
+            "integrity": "sha512-eMkc144MuN7B0TDA4U2fKs+BqczVbk3W+qIvcoCY6D1JY3hnAdCuhCZODC+GAeaxj0p6Jroz4+XMUn3PCxQQeQ==",
+            "dependencies": {
+                "@smithy/querystring-parser": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=12"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/esbuild-loader": {
-            "version": "2.20.0",
-            "resolved": "https://registry.npmjs.org/esbuild-loader/-/esbuild-loader-2.20.0.tgz",
-            "integrity": "sha512-dr+j8O4w5RvqZ7I4PPB4EIyVTd679EBQnMm+JBB7av+vu05Zpje2IpK5N3ld1VWa+WxrInIbNFAg093+E1aRsA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-base64": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-4.0.0.tgz",
+            "integrity": "sha512-CvHfCmO2mchox9kjrtzoHkWHxjHZzaFojLc8quxXY7WAAMAg43nuxwv95tATVgQFNDwd4M9S1qFzj40Ul41Kmg==",
             "dependencies": {
-                "esbuild": "^0.15.6",
-                "joycon": "^3.0.1",
-                "json5": "^2.2.0",
-                "loader-utils": "^2.0.0",
-                "tapable": "^2.2.0",
-                "webpack-sources": "^2.2.0"
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/privatenumber/esbuild-loader?sponsor=1"
-            },
-            "peerDependencies": {
-                "webpack": "^4.40.0 || ^5.0.0"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/esbuild-netbsd-64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.13.tgz",
-            "integrity": "sha512-EHj9QZOTel581JPj7UO3xYbltFTYnHy+SIqJVq6yd3KkCrsHRbapiPb0Lx3EOOtybBEE9EyqbmfW1NlSDsSzvQ==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "netbsd"
-            ],
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-body-length-browser": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-4.0.0.tgz",
+            "integrity": "sha512-sNi3DL0/k64/LO3A256M+m3CDdG6V7WKWHdAiBBMUN8S3hK3aMPhwnPik2A/a2ONN+9doY9UxaLfgqsIRg69QA==",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=12"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/esbuild-openbsd-64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.13.tgz",
-            "integrity": "sha512-nkuDlIjF/sfUhfx8SKq0+U+Fgx5K9JcPq1mUodnxI0x4kBdCv46rOGWbuJ6eof2n3wdoCLccOoJAbg9ba/bT2w==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "openbsd"
-            ],
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-body-length-node": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-4.0.0.tgz",
+            "integrity": "sha512-q0iDP3VsZzqJyje8xJWEJCNIu3lktUGVoSy1KB0UWym2CL1siV3artm+u1DFYTLejpsrdGyCSWBdGNjJzfDPjg==",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=12"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/esbuild-sunos-64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.13.tgz",
-            "integrity": "sha512-jVeu2GfxZQ++6lRdY43CS0Tm/r4WuQQ0Pdsrxbw+aOrHQPHV0+LNOLnvbN28M7BSUGnJnHkHm2HozGgNGyeIRw==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "sunos"
-            ],
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-buffer-from": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-4.0.0.tgz",
+            "integrity": "sha512-9TOQ7781sZvddgO8nxueKi3+yGvkY35kotA0Y6BWRajAv8jjmigQ1sBwz0UX47pQMYXJPahSKEKYFgt+rXdcug==",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=12"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/esbuild-windows-32": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.13.tgz",
-            "integrity": "sha512-XoF2iBf0wnqo16SDq+aDGi/+QbaLFpkiRarPVssMh9KYbFNCqPLlGAWwDvxEVz+ywX6Si37J2AKm+AXq1kC0JA==",
-            "cpu": [
-                "ia32"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "win32"
-            ],
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-config-provider": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-4.0.0.tgz",
+            "integrity": "sha512-L1RBVzLyfE8OXH+1hsJ8p+acNUSirQnWQ6/EgpchV88G6zGBTDPdXiiExei6Z1wR2RxYvxY/XLw6AMNCCt8H3w==",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=12"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/esbuild-windows-64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.13.tgz",
-            "integrity": "sha512-Et6htEfGycjDrtqb2ng6nT+baesZPYQIW+HUEHK4D1ncggNrDNk3yoboYQ5KtiVrw/JaDMNttz8rrPubV/fvPQ==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "win32"
-            ],
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-defaults-mode-browser": {
+            "version": "4.0.19",
+            "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.19.tgz",
+            "integrity": "sha512-mvLMh87xSmQrV5XqnUYEPoiFFeEGYeAKIDDKdhE2ahqitm8OHM3aSvhqL6rrK6wm1brIk90JhxDf5lf2hbrLbQ==",
+            "dependencies": {
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/smithy-client": "^4.4.3",
+                "@smithy/types": "^4.3.1",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=12"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/esbuild-windows-arm64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.13.tgz",
-            "integrity": "sha512-3bv7tqntThQC9SWLRouMDmZnlOukBhOCTlkzNqzGCmrkCJI7io5LLjwJBOVY6kOUlIvdxbooNZwjtBvj+7uuVg==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "optional": true,
-            "os": [
-                "win32"
-            ],
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-defaults-mode-node": {
+            "version": "4.0.19",
+            "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.19.tgz",
+            "integrity": "sha512-8tYnx+LUfj6m+zkUUIrIQJxPM1xVxfRBvoGHua7R/i6qAxOMjqR6CpEpDwKoIs1o0+hOjGvkKE23CafKL0vJ9w==",
+            "dependencies": {
+                "@smithy/config-resolver": "^4.1.4",
+                "@smithy/credential-provider-imds": "^4.0.6",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/smithy-client": "^4.4.3",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=12"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/escalade": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-            "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-endpoints": {
+            "version": "3.0.6",
+            "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-3.0.6.tgz",
+            "integrity": "sha512-YARl3tFL3WgPuLzljRUnrS2ngLiUtkwhQtj8PAL13XZSyUiNLQxwG3fBBq3QXFqGFUXepIN73pINp3y8c2nBmA==",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/escape-html": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-            "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-            "dev": true
-        },
-        "node_modules/escape-string-regexp": {
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-hex-encoding": {
             "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-            "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
+            "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-4.0.0.tgz",
+            "integrity": "sha512-Yk5mLhHtfIgW2W2WQZWSg5kuMZCVbvhFmC7rV4IO2QqnZdbEFPmQnCcGMAX2z/8Qj3B9hYYNjZOhWym+RwhePw==",
+            "dependencies": {
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/eslint": {
-            "version": "8.26.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.26.0.tgz",
-            "integrity": "sha512-kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-middleware": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-4.0.4.tgz",
+            "integrity": "sha512-9MLKmkBmf4PRb0ONJikCbCwORACcil6gUWojwARCClT7RmLzF04hUR4WdRprIXal7XVyrddadYNfp2eF3nrvtQ==",
             "dependencies": {
-                "@eslint/eslintrc": "^1.3.3",
-                "@humanwhocodes/config-array": "^0.11.6",
-                "@humanwhocodes/module-importer": "^1.0.1",
-                "@nodelib/fs.walk": "^1.2.8",
-                "ajv": "^6.10.0",
-                "chalk": "^4.0.0",
-                "cross-spawn": "^7.0.2",
-                "debug": "^4.3.2",
-                "doctrine": "^3.0.0",
-                "escape-string-regexp": "^4.0.0",
-                "eslint-scope": "^7.1.1",
-                "eslint-utils": "^3.0.0",
-                "eslint-visitor-keys": "^3.3.0",
-                "espree": "^9.4.0",
-                "esquery": "^1.4.0",
-                "esutils": "^2.0.2",
-                "fast-deep-equal": "^3.1.3",
-                "file-entry-cache": "^6.0.1",
-                "find-up": "^5.0.0",
-                "glob-parent": "^6.0.2",
-                "globals": "^13.15.0",
-                "grapheme-splitter": "^1.0.4",
-                "ignore": "^5.2.0",
-                "import-fresh": "^3.0.0",
-                "imurmurhash": "^0.1.4",
-                "is-glob": "^4.0.0",
-                "is-path-inside": "^3.0.3",
-                "js-sdsl": "^4.1.4",
-                "js-yaml": "^4.1.0",
-                "json-stable-stringify-without-jsonify": "^1.0.1",
-                "levn": "^0.4.1",
-                "lodash.merge": "^4.6.2",
-                "minimatch": "^3.1.2",
-                "natural-compare": "^1.4.0",
-                "optionator": "^0.9.1",
-                "regexpp": "^3.2.0",
-                "strip-ansi": "^6.0.1",
-                "strip-json-comments": "^3.1.0",
-                "text-table": "^0.2.0"
-            },
-            "bin": {
-                "eslint": "bin/eslint.js"
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "url": "https://opencollective.com/eslint"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/eslint-config-prettier": {
-            "version": "8.3.0",
-            "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz",
-            "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==",
-            "dev": true,
-            "bin": {
-                "eslint-config-prettier": "bin/cli.js"
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-retry": {
+            "version": "4.0.5",
+            "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.0.5.tgz",
+            "integrity": "sha512-V7MSjVDTlEt/plmOFBn1762Dyu5uqMrV2Pl2X0dYk4XvWfdWJNe9Bs5Bzb56wkCuiWjSfClVMGcsuKrGj7S/yg==",
+            "dependencies": {
+                "@smithy/service-error-classification": "^4.0.5",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
-            "peerDependencies": {
-                "eslint": ">=7.0.0"
-            }
-        },
-        "node_modules/eslint-plugin-header": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-header/-/eslint-plugin-header-3.1.1.tgz",
-            "integrity": "sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg==",
-            "dev": true,
-            "peerDependencies": {
-                "eslint": ">=7.7.0"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/eslint-plugin-no-null": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-no-null/-/eslint-plugin-no-null-1.0.2.tgz",
-            "integrity": "sha512-uRDiz88zCO/2rzGfgG15DBjNsgwWtWiSo4Ezy7zzajUgpnFIqd1TjepKeRmJZHEfBGu58o2a8S0D7vglvvhkVA==",
-            "dev": true,
-            "engines": {
-                "node": ">=5.0.0"
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-stream": {
+            "version": "4.2.2",
+            "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.2.2.tgz",
+            "integrity": "sha512-aI+GLi7MJoVxg24/3J1ipwLoYzgkB4kUfogZfnslcYlynj3xsQ0e7vk4TnTro9hhsS5PvX1mwmkRqqHQjwcU7w==",
+            "dependencies": {
+                "@smithy/fetch-http-handler": "^5.0.4",
+                "@smithy/node-http-handler": "^4.0.6",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
-            "peerDependencies": {
-                "eslint": ">=3.0.0"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/eslint-scope": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-            "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-uri-escape": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-4.0.0.tgz",
+            "integrity": "sha512-77yfbCbQMtgtTylO9itEAdpPXSog3ZxMe09AEhm0dU0NLTalV70ghDZFR+Nfi1C60jnJoh/Re4090/DuZh2Omg==",
             "dependencies": {
-                "esrecurse": "^4.3.0",
-                "estraverse": "^4.1.1"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/eslint-utils": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-            "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-            "dev": true,
-            "dependencies": {
-                "eslint-visitor-keys": "^2.0.0"
+        "node_modules/@aws-sdk/client-cognito-identity/node_modules/@smithy/util-utf8": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-4.0.0.tgz",
+            "integrity": "sha512-b+zebfKCfRdgNJDknHCob3O7FpeYQN6ZG6YLExMcasDHsCXlsXCEuiPZeLnJLpwa5dvPetGlnGCiMHuLwGvFow==",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-datazone": {
+            "version": "3.848.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-datazone/-/client-datazone-3.848.0.tgz",
+            "integrity": "sha512-m9x9G6oQHUVJvt9JsTdU41/nimz11MMmQLptQVgIJcD6VHoHoVXppvPntK7GUkH0T6+0gw63RugGd7kB+xofBQ==",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.846.0",
+                "@aws-sdk/credential-provider-node": "3.848.0",
+                "@aws-sdk/middleware-host-header": "3.840.0",
+                "@aws-sdk/middleware-logger": "3.840.0",
+                "@aws-sdk/middleware-recursion-detection": "3.840.0",
+                "@aws-sdk/middleware-user-agent": "3.848.0",
+                "@aws-sdk/region-config-resolver": "3.840.0",
+                "@aws-sdk/types": "3.840.0",
+                "@aws-sdk/util-endpoints": "3.848.0",
+                "@aws-sdk/util-user-agent-browser": "3.840.0",
+                "@aws-sdk/util-user-agent-node": "3.848.0",
+                "@smithy/config-resolver": "^4.1.4",
+                "@smithy/core": "^3.7.0",
+                "@smithy/fetch-http-handler": "^5.1.0",
+                "@smithy/hash-node": "^4.0.4",
+                "@smithy/invalid-dependency": "^4.0.4",
+                "@smithy/middleware-content-length": "^4.0.4",
+                "@smithy/middleware-endpoint": "^4.1.15",
+                "@smithy/middleware-retry": "^4.1.16",
+                "@smithy/middleware-serde": "^4.0.8",
+                "@smithy/middleware-stack": "^4.0.4",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/node-http-handler": "^4.1.0",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/smithy-client": "^4.4.7",
+                "@smithy/types": "^4.3.1",
+                "@smithy/url-parser": "^4.0.4",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.23",
+                "@smithy/util-defaults-mode-node": "^4.0.23",
+                "@smithy/util-endpoints": "^3.0.6",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-retry": "^4.0.6",
+                "@smithy/util-stream": "^4.2.3",
+                "@smithy/util-utf8": "^4.0.0",
+                "@types/uuid": "^9.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-datazone/node_modules/@aws-sdk/client-sso": {
+            "version": "3.848.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.848.0.tgz",
+            "integrity": "sha512-mD+gOwoeZQvbecVLGoCmY6pS7kg02BHesbtIxUj+PeBqYoZV5uLvjUOmuGfw1SfoSobKvS11urxC9S7zxU/Maw==",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.846.0",
+                "@aws-sdk/middleware-host-header": "3.840.0",
+                "@aws-sdk/middleware-logger": "3.840.0",
+                "@aws-sdk/middleware-recursion-detection": "3.840.0",
+                "@aws-sdk/middleware-user-agent": "3.848.0",
+                "@aws-sdk/region-config-resolver": "3.840.0",
+                "@aws-sdk/types": "3.840.0",
+                "@aws-sdk/util-endpoints": "3.848.0",
+                "@aws-sdk/util-user-agent-browser": "3.840.0",
+                "@aws-sdk/util-user-agent-node": "3.848.0",
+                "@smithy/config-resolver": "^4.1.4",
+                "@smithy/core": "^3.7.0",
+                "@smithy/fetch-http-handler": "^5.1.0",
+                "@smithy/hash-node": "^4.0.4",
+                "@smithy/invalid-dependency": "^4.0.4",
+                "@smithy/middleware-content-length": "^4.0.4",
+                "@smithy/middleware-endpoint": "^4.1.15",
+                "@smithy/middleware-retry": "^4.1.16",
+                "@smithy/middleware-serde": "^4.0.8",
+                "@smithy/middleware-stack": "^4.0.4",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/node-http-handler": "^4.1.0",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/smithy-client": "^4.4.7",
+                "@smithy/types": "^4.3.1",
+                "@smithy/url-parser": "^4.0.4",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.23",
+                "@smithy/util-defaults-mode-node": "^4.0.23",
+                "@smithy/util-endpoints": "^3.0.6",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-retry": "^4.0.6",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-datazone/node_modules/@aws-sdk/core": {
+            "version": "3.846.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.846.0.tgz",
+            "integrity": "sha512-7CX0pM906r4WSS68fCTNMTtBCSkTtf3Wggssmx13gD40gcWEZXsU00KzPp1bYheNRyPlAq3rE22xt4wLPXbuxA==",
+            "dependencies": {
+                "@aws-sdk/types": "3.840.0",
+                "@aws-sdk/xml-builder": "3.821.0",
+                "@smithy/core": "^3.7.0",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/signature-v4": "^5.1.2",
+                "@smithy/smithy-client": "^4.4.7",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-utf8": "^4.0.0",
+                "fast-xml-parser": "5.2.5",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-datazone/node_modules/@aws-sdk/credential-provider-env": {
+            "version": "3.846.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.846.0.tgz",
+            "integrity": "sha512-QuCQZET9enja7AWVISY+mpFrEIeHzvkx/JEEbHYzHhUkxcnC2Kq2c0bB7hDihGD0AZd3Xsm653hk1O97qu69zg==",
+            "dependencies": {
+                "@aws-sdk/core": "3.846.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-datazone/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.846.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.846.0.tgz",
+            "integrity": "sha512-Jh1iKUuepdmtreMYozV2ePsPcOF5W9p3U4tWhi3v6nDvz0GsBjzjAROW+BW8XMz9vAD3I9R+8VC3/aq63p5nlw==",
+            "dependencies": {
+                "@aws-sdk/core": "3.846.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/fetch-http-handler": "^5.1.0",
+                "@smithy/node-http-handler": "^4.1.0",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/smithy-client": "^4.4.7",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-stream": "^4.2.3",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-datazone/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.848.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.848.0.tgz",
+            "integrity": "sha512-r6KWOG+En2xujuMhgZu7dzOZV3/M5U/5+PXrG8dLQ3rdPRB3vgp5tc56KMqLwm/EXKRzAOSuw/UE4HfNOAB8Hw==",
+            "dependencies": {
+                "@aws-sdk/core": "3.846.0",
+                "@aws-sdk/credential-provider-env": "3.846.0",
+                "@aws-sdk/credential-provider-http": "3.846.0",
+                "@aws-sdk/credential-provider-process": "3.846.0",
+                "@aws-sdk/credential-provider-sso": "3.848.0",
+                "@aws-sdk/credential-provider-web-identity": "3.848.0",
+                "@aws-sdk/nested-clients": "3.848.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/credential-provider-imds": "^4.0.6",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/shared-ini-file-loader": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/mysticatea"
-            },
-            "peerDependencies": {
-                "eslint": ">=5"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/eslint-visitor-keys": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-            "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.848.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.848.0.tgz",
+            "integrity": "sha512-AblNesOqdzrfyASBCo1xW3uweiSro4Kft9/htdxLeCVU1KVOnFWA5P937MNahViRmIQm2sPBCqL8ZG0u9lnh5g==",
+            "dependencies": {
+                "@aws-sdk/credential-provider-env": "3.846.0",
+                "@aws-sdk/credential-provider-http": "3.846.0",
+                "@aws-sdk/credential-provider-ini": "3.848.0",
+                "@aws-sdk/credential-provider-process": "3.846.0",
+                "@aws-sdk/credential-provider-sso": "3.848.0",
+                "@aws-sdk/credential-provider-web-identity": "3.848.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/credential-provider-imds": "^4.0.6",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/shared-ini-file-loader": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=10"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/eslint/node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@aws-sdk/credential-provider-process": {
+            "version": "3.846.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.846.0.tgz",
+            "integrity": "sha512-mEpwDYarJSH+CIXnnHN0QOe0MXI+HuPStD6gsv3z/7Q6ESl8KRWon3weFZCDnqpiJMUVavlDR0PPlAFg2MQoPg==",
+            "dependencies": {
+                "@aws-sdk/core": "3.846.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/shared-ini-file-loader": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/eslint/node_modules/eslint-scope": {
-            "version": "7.1.1",
-            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-            "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.848.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.848.0.tgz",
+            "integrity": "sha512-pozlDXOwJZL0e7w+dqXLgzVDB7oCx4WvtY0sk6l4i07uFliWF/exupb6pIehFWvTUcOvn5aFTTqcQaEzAD5Wsg==",
             "dependencies": {
-                "esrecurse": "^4.3.0",
-                "estraverse": "^5.2.0"
+                "@aws-sdk/client-sso": "3.848.0",
+                "@aws-sdk/core": "3.846.0",
+                "@aws-sdk/token-providers": "3.848.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/shared-ini-file-loader": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/eslint/node_modules/eslint-visitor-keys": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-            "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.848.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.848.0.tgz",
+            "integrity": "sha512-D1fRpwPxtVDhcSc/D71exa2gYweV+ocp4D3brF0PgFd//JR3XahZ9W24rVnTQwYEcK9auiBZB89Ltv+WbWN8qw==",
+            "dependencies": {
+                "@aws-sdk/core": "3.846.0",
+                "@aws-sdk/nested-clients": "3.848.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/eslint/node_modules/estraverse": {
-            "version": "5.3.0",
-            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-            "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.840.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.840.0.tgz",
+            "integrity": "sha512-ub+hXJAbAje94+Ya6c6eL7sYujoE8D4Bumu1NUI8TXjUhVVn0HzVWQjpRLshdLsUp1AW7XyeJaxyajRaJQ8+Xg==",
+            "dependencies": {
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=4.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/eslint/node_modules/glob-parent": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-            "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.840.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.840.0.tgz",
+            "integrity": "sha512-lSV8FvjpdllpGaRspywss4CtXV8M7NNNH+2/j86vMH+YCOZ6fu2T/TyFd/tHwZ92vDfHctWkRbQxg0bagqwovA==",
             "dependencies": {
-                "is-glob": "^4.0.3"
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10.13.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/eslint/node_modules/strip-ansi": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.840.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.840.0.tgz",
+            "integrity": "sha512-Gu7lGDyfddyhIkj1Z1JtrY5NHb5+x/CRiB87GjaSrKxkDaydtX2CU977JIABtt69l9wLbcGDIQ+W0uJ5xPof7g==",
             "dependencies": {
-                "ansi-regex": "^5.0.1"
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/espree": {
-            "version": "9.4.0",
-            "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
-            "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.848.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.848.0.tgz",
+            "integrity": "sha512-rjMuqSWJEf169/ByxvBqfdei1iaduAnfolTshsZxwcmLIUtbYrFUmts0HrLQqsAG8feGPpDLHA272oPl+NTCCA==",
             "dependencies": {
-                "acorn": "^8.8.0",
-                "acorn-jsx": "^5.3.2",
-                "eslint-visitor-keys": "^3.3.0"
+                "@aws-sdk/core": "3.846.0",
+                "@aws-sdk/types": "3.840.0",
+                "@aws-sdk/util-endpoints": "3.848.0",
+                "@smithy/core": "^3.7.0",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-            },
-            "funding": {
-                "url": "https://opencollective.com/eslint"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/espree/node_modules/eslint-visitor-keys": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-            "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@aws-sdk/nested-clients": {
+            "version": "3.848.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.848.0.tgz",
+            "integrity": "sha512-joLsyyo9u61jnZuyYzo1z7kmS7VgWRAkzSGESVzQHfOA1H2PYeUFek6vLT4+c9xMGrX/Z6B0tkRdzfdOPiatLg==",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.846.0",
+                "@aws-sdk/middleware-host-header": "3.840.0",
+                "@aws-sdk/middleware-logger": "3.840.0",
+                "@aws-sdk/middleware-recursion-detection": "3.840.0",
+                "@aws-sdk/middleware-user-agent": "3.848.0",
+                "@aws-sdk/region-config-resolver": "3.840.0",
+                "@aws-sdk/types": "3.840.0",
+                "@aws-sdk/util-endpoints": "3.848.0",
+                "@aws-sdk/util-user-agent-browser": "3.840.0",
+                "@aws-sdk/util-user-agent-node": "3.848.0",
+                "@smithy/config-resolver": "^4.1.4",
+                "@smithy/core": "^3.7.0",
+                "@smithy/fetch-http-handler": "^5.1.0",
+                "@smithy/hash-node": "^4.0.4",
+                "@smithy/invalid-dependency": "^4.0.4",
+                "@smithy/middleware-content-length": "^4.0.4",
+                "@smithy/middleware-endpoint": "^4.1.15",
+                "@smithy/middleware-retry": "^4.1.16",
+                "@smithy/middleware-serde": "^4.0.8",
+                "@smithy/middleware-stack": "^4.0.4",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/node-http-handler": "^4.1.0",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/smithy-client": "^4.4.7",
+                "@smithy/types": "^4.3.1",
+                "@smithy/url-parser": "^4.0.4",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.23",
+                "@smithy/util-defaults-mode-node": "^4.0.23",
+                "@smithy/util-endpoints": "^3.0.6",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-retry": "^4.0.6",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/esprima": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-            "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-            "bin": {
-                "esparse": "bin/esparse.js",
-                "esvalidate": "bin/esvalidate.js"
+        "node_modules/@aws-sdk/client-datazone/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.840.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.840.0.tgz",
+            "integrity": "sha512-Qjnxd/yDv9KpIMWr90ZDPtRj0v75AqGC92Lm9+oHXZ8p1MjG5JE2CW0HL8JRgK9iKzgKBL7pPQRXI8FkvEVfrA==",
+            "dependencies": {
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.4",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/esquery": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-            "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@aws-sdk/token-providers": {
+            "version": "3.848.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.848.0.tgz",
+            "integrity": "sha512-oNPyM4+Di2Umu0JJRFSxDcKQ35+Chl/rAwD47/bS0cDPI8yrao83mLXLeDqpRPHyQW4sXlP763FZcuAibC0+mg==",
             "dependencies": {
-                "estraverse": "^5.1.0"
+                "@aws-sdk/core": "3.846.0",
+                "@aws-sdk/nested-clients": "3.848.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/shared-ini-file-loader": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=0.10"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/esquery/node_modules/estraverse": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-            "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=4.0"
+        "node_modules/@aws-sdk/client-datazone/node_modules/@aws-sdk/types": {
+            "version": "3.840.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.840.0.tgz",
+            "integrity": "sha512-xliuHaUFZxEx1NSXeLLZ9Dyu6+EJVQKEoD+yM+zqUo3YDZ7medKJWY6fIOKiPX/N7XbLdBYwajb15Q7IL8KkeA==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-datazone/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.848.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.848.0.tgz",
+            "integrity": "sha512-fY/NuFFCq/78liHvRyFKr+aqq1aA/uuVSANjzr5Ym8c+9Z3HRPE9OrExAHoMrZ6zC8tHerQwlsXYYH5XZ7H+ww==",
+            "dependencies": {
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/types": "^4.3.1",
+                "@smithy/url-parser": "^4.0.4",
+                "@smithy/util-endpoints": "^3.0.6",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-datazone/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.840.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.840.0.tgz",
+            "integrity": "sha512-JdyZM3EhhL4PqwFpttZu1afDpPJCCc3eyZOLi+srpX11LsGj6sThf47TYQN75HT1CarZ7cCdQHGzP2uy3/xHfQ==",
+            "dependencies": {
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/types": "^4.3.1",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/esrecurse": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-            "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.848.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.848.0.tgz",
+            "integrity": "sha512-Zz1ft9NiLqbzNj/M0jVNxaoxI2F4tGXN0ZbZIj+KJ+PbJo+w5+Jo6d0UDAtbj3AEd79pjcCaP4OA9NTVzItUdw==",
             "dependencies": {
-                "estraverse": "^5.2.0"
+                "@aws-sdk/middleware-user-agent": "3.848.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=4.0"
+                "node": ">=18.0.0"
+            },
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
             }
         },
-        "node_modules/esrecurse/node_modules/estraverse": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-            "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@aws-sdk/xml-builder": {
+            "version": "3.821.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.821.0.tgz",
+            "integrity": "sha512-DIIotRnefVL6DiaHtO6/21DhJ4JZnnIwdNbpwiAhdt/AVbttcE4yw925gsjur0OGv5BTYXQXU3YnANBYnZjuQA==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=4.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/estraverse": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-            "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/abort-controller": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-4.0.4.tgz",
+            "integrity": "sha512-gJnEjZMvigPDQWHrW3oPrFhQtkrgqBkyjj3pCIdF3A5M6vsZODG93KNlfJprv6bp4245bdT32fsHK4kkH3KYDA==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=4.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/estree-walker": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-            "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
-        },
-        "node_modules/esutils": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-            "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/config-resolver": {
+            "version": "4.1.4",
+            "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-4.1.4.tgz",
+            "integrity": "sha512-prmU+rDddxHOH0oNcwemL+SwnzcG65sBF2yXRO7aeXIn/xTlq2pX7JLVbkBnVLowHLg4/OL4+jBmv9hVrVGS+w==",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.4",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/etag": {
-            "version": "1.8.1",
-            "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-            "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/core": {
+            "version": "3.7.1",
+            "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.7.1.tgz",
+            "integrity": "sha512-ExRCsHnXFtBPnM7MkfKBPcBBdHw1h/QS/cbNw4ho95qnyNHvnpmGbR39MIAv9KggTr5qSPxRSEL+hRXlyGyGQw==",
+            "dependencies": {
+                "@smithy/middleware-serde": "^4.0.8",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-stream": "^4.2.3",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/event-emitter": {
-            "version": "0.3.5",
-            "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-            "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/credential-provider-imds": {
+            "version": "4.0.6",
+            "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-4.0.6.tgz",
+            "integrity": "sha512-hKMWcANhUiNbCJouYkZ9V3+/Qf9pteR1dnwgdyzR09R4ODEYx8BbUysHwRSyex4rZ9zapddZhLFTnT4ZijR4pw==",
             "dependencies": {
-                "d": "1",
-                "es5-ext": "~0.10.14"
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "@smithy/url-parser": "^4.0.4",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/event-stream": {
-            "version": "3.3.5",
-            "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.5.tgz",
-            "integrity": "sha512-vyibDcu5JL20Me1fP734QBH/kenBGLZap2n0+XXM7mvuUPzJ20Ydqj1aKcIeMdri1p+PU+4yAKugjN8KCVst+g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/fetch-http-handler": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.1.0.tgz",
+            "integrity": "sha512-mADw7MS0bYe2OGKkHYMaqarOXuDwRbO6ArD91XhHcl2ynjGCFF+hvqf0LyQcYxkA1zaWjefSkU7Ne9mqgApSgQ==",
             "dependencies": {
-                "duplexer": "^0.1.1",
-                "from": "^0.1.7",
-                "map-stream": "0.0.7",
-                "pause-stream": "^0.0.11",
-                "split": "^1.0.1",
-                "stream-combiner": "^0.2.2",
-                "through": "^2.3.8"
-            }
-        },
-        "node_modules/eventemitter3": {
-            "version": "4.0.7",
-            "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-            "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-            "dev": true
-        },
-        "node_modules/events": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-            "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/querystring-builder": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-base64": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.4.x"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/execa": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
-            "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/hash-node": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-4.0.4.tgz",
+            "integrity": "sha512-qnbTPUhCVnCgBp4z4BUJUhOEkVwxiEi1cyFM+Zj6o+aY8OFGxUQleKWq8ltgp3dujuhXojIvJWdoqpm6dVO3lQ==",
             "dependencies": {
-                "cross-spawn": "^7.0.0",
-                "get-stream": "^5.0.0",
-                "human-signals": "^1.1.1",
-                "is-stream": "^2.0.0",
-                "merge-stream": "^2.0.0",
-                "npm-run-path": "^4.0.0",
-                "onetime": "^5.1.0",
-                "signal-exit": "^3.0.2",
-                "strip-final-newline": "^2.0.0"
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sindresorhus/execa?sponsor=1"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/expand-template": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
-            "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/invalid-dependency": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-4.0.4.tgz",
+            "integrity": "sha512-bNYMi7WKTJHu0gn26wg8OscncTt1t2b8KcsZxvOv56XA6cyXtOAAAaNP7+m45xfppXfOatXF3Sb1MNsLUgVLTw==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/express": {
-            "version": "4.18.1",
-            "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz",
-            "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/is-array-buffer": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-4.0.0.tgz",
+            "integrity": "sha512-saYhF8ZZNoJDTvJBEWgeBccCg+yvp1CX+ed12yORU3NilJScfc6gfch2oVb4QgxZrGUx3/ZJlb+c/dJbyupxlw==",
             "dependencies": {
-                "accepts": "~1.3.8",
-                "array-flatten": "1.1.1",
-                "body-parser": "1.20.0",
-                "content-disposition": "0.5.4",
-                "content-type": "~1.0.4",
-                "cookie": "0.5.0",
-                "cookie-signature": "1.0.6",
-                "debug": "2.6.9",
-                "depd": "2.0.0",
-                "encodeurl": "~1.0.2",
-                "escape-html": "~1.0.3",
-                "etag": "~1.8.1",
-                "finalhandler": "1.2.0",
-                "fresh": "0.5.2",
-                "http-errors": "2.0.0",
-                "merge-descriptors": "1.0.1",
-                "methods": "~1.1.2",
-                "on-finished": "2.4.1",
-                "parseurl": "~1.3.3",
-                "path-to-regexp": "0.1.7",
-                "proxy-addr": "~2.0.7",
-                "qs": "6.10.3",
-                "range-parser": "~1.2.1",
-                "safe-buffer": "5.2.1",
-                "send": "0.18.0",
-                "serve-static": "1.15.0",
-                "setprototypeof": "1.2.0",
-                "statuses": "2.0.1",
-                "type-is": "~1.6.18",
-                "utils-merge": "1.0.1",
-                "vary": "~1.1.2"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.10.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/express/node_modules/array-flatten": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-            "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
-            "dev": true
-        },
-        "node_modules/express/node_modules/debug": {
-            "version": "2.6.9",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/middleware-content-length": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-4.0.4.tgz",
+            "integrity": "sha512-F7gDyfI2BB1Kc+4M6rpuOLne5LOcEknH1n6UQB69qv+HucXBR1rkzXBnQTB2q46sFy1PM/zuSJOB532yc8bg3w==",
             "dependencies": {
-                "ms": "2.0.0"
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/express/node_modules/depd": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-            "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/middleware-endpoint": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.1.16.tgz",
+            "integrity": "sha512-plpa50PIGLqzMR2ANKAw2yOW5YKS626KYKqae3atwucbz4Ve4uQ9K9BEZxDLIFmCu7hKLcrq2zmj4a+PfmUV5w==",
+            "dependencies": {
+                "@smithy/core": "^3.7.1",
+                "@smithy/middleware-serde": "^4.0.8",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/shared-ini-file-loader": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "@smithy/url-parser": "^4.0.4",
+                "@smithy/util-middleware": "^4.0.4",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/express/node_modules/ms": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-            "dev": true
-        },
-        "node_modules/express/node_modules/path-to-regexp": {
-            "version": "0.1.7",
-            "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-            "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
-            "dev": true
-        },
-        "node_modules/express/node_modules/statuses": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-            "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/middleware-retry": {
+            "version": "4.1.17",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.1.17.tgz",
+            "integrity": "sha512-gsCimeG6BApj0SBecwa1Be+Z+JOJe46iy3B3m3A8jKJHf7eIihP76Is4LwLrbJ1ygoS7Vg73lfqzejmLOrazUA==",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/service-error-classification": "^4.0.6",
+                "@smithy/smithy-client": "^4.4.8",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-retry": "^4.0.6",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
             "engines": {
-                "node": ">= 0.8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/ext": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz",
-            "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/middleware-serde": {
+            "version": "4.0.8",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-4.0.8.tgz",
+            "integrity": "sha512-iSSl7HJoJaGyMIoNn2B7czghOVwJ9nD7TMvLhMWeSB5vt0TnEYyRRqPJu/TqW76WScaNvYYB8nRoiBHR9S1Ddw==",
             "dependencies": {
-                "type": "^2.5.0"
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/ext/node_modules/type": {
-            "version": "2.7.2",
-            "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
-            "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==",
-            "dev": true
-        },
-        "node_modules/fancy-log": {
-            "version": "1.3.3",
-            "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
-            "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/middleware-stack": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-4.0.4.tgz",
+            "integrity": "sha512-kagK5ggDrBUCCzI93ft6DjteNSfY8Ulr83UtySog/h09lTIOAJ/xUSObutanlPT0nhoHAkpmW9V5K8oPyLh+QA==",
             "dependencies": {
-                "ansi-gray": "^0.1.1",
-                "color-support": "^1.1.3",
-                "parse-node-version": "^1.0.0",
-                "time-stamp": "^1.0.0"
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.10"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/fast-deep-equal": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-            "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-            "dev": true
-        },
-        "node_modules/fast-glob": {
-            "version": "3.2.12",
-            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-            "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/node-config-provider": {
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-4.1.3.tgz",
+            "integrity": "sha512-HGHQr2s59qaU1lrVH6MbLlmOBxadtzTsoO4c+bF5asdgVik3I8o7JIOzoeqWc5MjVa+vD36/LWE0iXKpNqooRw==",
             "dependencies": {
-                "@nodelib/fs.stat": "^2.0.2",
-                "@nodelib/fs.walk": "^1.2.3",
-                "glob-parent": "^5.1.2",
-                "merge2": "^1.3.0",
-                "micromatch": "^4.0.4"
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/shared-ini-file-loader": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8.6.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/fast-json-patch": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.1.1.tgz",
-            "integrity": "sha512-vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ=="
-        },
-        "node_modules/fast-json-stable-stringify": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-            "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-            "dev": true
-        },
-        "node_modules/fast-levenshtein": {
-            "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-            "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-            "dev": true
-        },
-        "node_modules/fastest-levenshtein": {
-            "version": "1.0.12",
-            "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
-            "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
-            "dev": true
-        },
-        "node_modules/fastq": {
-            "version": "1.13.0",
-            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-            "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/node-http-handler": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.1.0.tgz",
+            "integrity": "sha512-vqfSiHz2v8b3TTTrdXi03vNz1KLYYS3bhHCDv36FYDqxT7jvTll1mMnCrkD+gOvgwybuunh/2VmvOMqwBegxEg==",
             "dependencies": {
-                "reusify": "^1.0.4"
+                "@smithy/abort-controller": "^4.0.4",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/querystring-builder": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/faye-websocket": {
-            "version": "0.11.4",
-            "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-            "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/property-provider": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-4.0.4.tgz",
+            "integrity": "sha512-qHJ2sSgu4FqF4U/5UUp4DhXNmdTrgmoAai6oQiM+c5RZ/sbDwJ12qxB1M6FnP+Tn/ggkPZf9ccn4jqKSINaquw==",
             "dependencies": {
-                "websocket-driver": ">=0.5.1"
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=0.8.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/fd-slicer": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-            "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/protocol-http": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-5.1.2.tgz",
+            "integrity": "sha512-rOG5cNLBXovxIrICSBm95dLqzfvxjEmuZx4KK3hWwPFHGdW3lxY0fZNXfv2zebfRO7sJZ5pKJYHScsqopeIWtQ==",
             "dependencies": {
-                "pend": "~1.2.0"
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/fecha": {
-            "version": "4.2.1",
-            "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.1.tgz",
-            "integrity": "sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q=="
-        },
-        "node_modules/file-entry-cache": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-            "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/querystring-builder": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-4.0.4.tgz",
+            "integrity": "sha512-SwREZcDnEYoh9tLNgMbpop+UTGq44Hl9tdj3rf+yeLcfH7+J8OXEBaMc2kDxtyRHu8BhSg9ADEx0gFHvpJgU8w==",
             "dependencies": {
-                "flat-cache": "^3.0.4"
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "^10.12.0 || >=12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/fill-range": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-            "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/querystring-parser": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-4.0.4.tgz",
+            "integrity": "sha512-6yZf53i/qB8gRHH/l2ZwUG5xgkPgQF15/KxH0DdXMDHjesA9MeZje/853ifkSY0x4m5S+dfDZ+c4x439PF0M2w==",
             "dependencies": {
-                "to-regex-range": "^5.0.1"
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/finalhandler": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-            "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/service-error-classification": {
+            "version": "4.0.6",
+            "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-4.0.6.tgz",
+            "integrity": "sha512-RRoTDL//7xi4tn5FrN2NzH17jbgmnKidUqd4KvquT0954/i6CXXkh1884jBiunq24g9cGtPBEXlU40W6EpNOOg==",
             "dependencies": {
-                "debug": "2.6.9",
-                "encodeurl": "~1.0.2",
-                "escape-html": "~1.0.3",
-                "on-finished": "2.4.1",
-                "parseurl": "~1.3.3",
-                "statuses": "2.0.1",
-                "unpipe": "~1.0.0"
+                "@smithy/types": "^4.3.1"
             },
             "engines": {
-                "node": ">= 0.8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/finalhandler/node_modules/debug": {
-            "version": "2.6.9",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/shared-ini-file-loader": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.0.4.tgz",
+            "integrity": "sha512-63X0260LoFBjrHifPDs+nM9tV0VMkOTl4JRMYNuKh/f5PauSjowTfvF3LogfkWdcPoxsA9UjqEOgjeYIbhb7Nw==",
             "dependencies": {
-                "ms": "2.0.0"
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/finalhandler/node_modules/ms": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-            "dev": true
-        },
-        "node_modules/finalhandler/node_modules/statuses": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-            "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/signature-v4": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-5.1.2.tgz",
+            "integrity": "sha512-d3+U/VpX7a60seHziWnVZOHuEgJlclufjkS6zhXvxcJgkJq4UWdH5eOBLzHRMx6gXjsdT9h6lfpmLzbrdupHgQ==",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^4.0.0",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/find-cache-dir": {
-            "version": "3.3.2",
-            "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-            "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/smithy-client": {
+            "version": "4.4.8",
+            "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.4.8.tgz",
+            "integrity": "sha512-pcW691/lx7V54gE+dDGC26nxz8nrvnvRSCJaIYD6XLPpOInEZeKdV/SpSux+wqeQ4Ine7LJQu8uxMvobTIBK0w==",
             "dependencies": {
-                "commondir": "^1.0.1",
-                "make-dir": "^3.0.2",
-                "pkg-dir": "^4.1.0"
+                "@smithy/core": "^3.7.1",
+                "@smithy/middleware-endpoint": "^4.1.16",
+                "@smithy/middleware-stack": "^4.0.4",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-stream": "^4.2.3",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/find-up": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-            "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/types": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.3.1.tgz",
+            "integrity": "sha512-UqKOQBL2x6+HWl3P+3QqFD4ncKq0I8Nuz9QItGv5WuKuMHuuwlhvqcZCoXGfc+P1QmfJE7VieykoYYmrOoFJxA==",
             "dependencies": {
-                "locate-path": "^6.0.0",
-                "path-exists": "^4.0.0"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/flat": {
-            "version": "5.0.2",
-            "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
-            "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
-            "dev": true,
-            "bin": {
-                "flat": "cli.js"
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/url-parser": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-4.0.4.tgz",
+            "integrity": "sha512-eMkc144MuN7B0TDA4U2fKs+BqczVbk3W+qIvcoCY6D1JY3hnAdCuhCZODC+GAeaxj0p6Jroz4+XMUn3PCxQQeQ==",
+            "dependencies": {
+                "@smithy/querystring-parser": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/flat-cache": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-            "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/util-base64": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-4.0.0.tgz",
+            "integrity": "sha512-CvHfCmO2mchox9kjrtzoHkWHxjHZzaFojLc8quxXY7WAAMAg43nuxwv95tATVgQFNDwd4M9S1qFzj40Ul41Kmg==",
             "dependencies": {
-                "flatted": "^3.1.0",
-                "rimraf": "^3.0.2"
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "^10.12.0 || >=12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/flatted": {
-            "version": "3.2.2",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
-            "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
-            "dev": true
-        },
-        "node_modules/fn.name": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz",
-            "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="
-        },
-        "node_modules/follow-redirects": {
-            "version": "1.15.1",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
-            "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "individual",
-                    "url": "https://github.com/sponsors/RubenVerborgh"
-                }
-            ],
-            "engines": {
-                "node": ">=4.0"
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/util-body-length-browser": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-4.0.0.tgz",
+            "integrity": "sha512-sNi3DL0/k64/LO3A256M+m3CDdG6V7WKWHdAiBBMUN8S3hK3aMPhwnPik2A/a2ONN+9doY9UxaLfgqsIRg69QA==",
+            "dependencies": {
+                "tslib": "^2.6.2"
             },
-            "peerDependenciesMeta": {
-                "debug": {
-                    "optional": true
-                }
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/for-each": {
-            "version": "0.3.3",
-            "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-            "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/util-body-length-node": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-4.0.0.tgz",
+            "integrity": "sha512-q0iDP3VsZzqJyje8xJWEJCNIu3lktUGVoSy1KB0UWym2CL1siV3artm+u1DFYTLejpsrdGyCSWBdGNjJzfDPjg==",
             "dependencies": {
-                "is-callable": "^1.1.3"
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/foreground-child": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz",
-            "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/util-buffer-from": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-4.0.0.tgz",
+            "integrity": "sha512-9TOQ7781sZvddgO8nxueKi3+yGvkY35kotA0Y6BWRajAv8jjmigQ1sBwz0UX47pQMYXJPahSKEKYFgt+rXdcug==",
             "dependencies": {
-                "cross-spawn": "^7.0.0",
-                "signal-exit": "^3.0.2"
+                "@smithy/is-array-buffer": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/forwarded": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-            "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/util-config-provider": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-4.0.0.tgz",
+            "integrity": "sha512-L1RBVzLyfE8OXH+1hsJ8p+acNUSirQnWQ6/EgpchV88G6zGBTDPdXiiExei6Z1wR2RxYvxY/XLw6AMNCCt8H3w==",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/fresh": {
-            "version": "0.5.2",
-            "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-            "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/util-defaults-mode-browser": {
+            "version": "4.0.24",
+            "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.24.tgz",
+            "integrity": "sha512-UkQNgaQ+bidw1MgdgPO1z1k95W/v8Ej/5o/T/Is8PiVUYPspl/ZxV6WO/8DrzZQu5ULnmpB9CDdMSRwgRc21AA==",
+            "dependencies": {
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/smithy-client": "^4.4.8",
+                "@smithy/types": "^4.3.1",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/from": {
-            "version": "0.1.7",
-            "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
-            "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
-            "dev": true
-        },
-        "node_modules/fromentries": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz",
-            "integrity": "sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ]
-        },
-        "node_modules/fs-constants": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-            "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-            "dev": true
-        },
-        "node_modules/fs-extra": {
-            "version": "10.1.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-            "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/util-defaults-mode-node": {
+            "version": "4.0.24",
+            "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.24.tgz",
+            "integrity": "sha512-phvGi/15Z4MpuQibTLOYIumvLdXb+XIJu8TA55voGgboln85jytA3wiD7CkUE8SNcWqkkb+uptZKPiuFouX/7g==",
             "dependencies": {
-                "graceful-fs": "^4.2.0",
-                "jsonfile": "^6.0.1",
-                "universalify": "^2.0.0"
+                "@smithy/config-resolver": "^4.1.4",
+                "@smithy/credential-provider-imds": "^4.0.6",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/smithy-client": "^4.4.8",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=12"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/fs-monkey": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
-            "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==",
-            "dev": true
-        },
-        "node_modules/fs.realpath": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-            "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-            "dev": true
-        },
-        "node_modules/fsevents": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-            "dev": true,
-            "hasInstallScript": true,
-            "optional": true,
-            "os": [
-                "darwin"
-            ],
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/util-endpoints": {
+            "version": "3.0.6",
+            "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-3.0.6.tgz",
+            "integrity": "sha512-YARl3tFL3WgPuLzljRUnrS2ngLiUtkwhQtj8PAL13XZSyUiNLQxwG3fBBq3QXFqGFUXepIN73pINp3y8c2nBmA==",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/fstream": {
-            "version": "1.0.12",
-            "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
-            "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/util-hex-encoding": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-4.0.0.tgz",
+            "integrity": "sha512-Yk5mLhHtfIgW2W2WQZWSg5kuMZCVbvhFmC7rV4IO2QqnZdbEFPmQnCcGMAX2z/8Qj3B9hYYNjZOhWym+RwhePw==",
             "dependencies": {
-                "graceful-fs": "^4.1.2",
-                "inherits": "~2.0.0",
-                "mkdirp": ">=0.5 0",
-                "rimraf": "2"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=0.6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/fstream/node_modules/rimraf": {
-            "version": "2.7.1",
-            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-            "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/util-middleware": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-4.0.4.tgz",
+            "integrity": "sha512-9MLKmkBmf4PRb0ONJikCbCwORACcil6gUWojwARCClT7RmLzF04hUR4WdRprIXal7XVyrddadYNfp2eF3nrvtQ==",
             "dependencies": {
-                "glob": "^7.1.3"
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
-            "bin": {
-                "rimraf": "bin.js"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/function-bind": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-            "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-        },
-        "node_modules/function.prototype.name": {
-            "version": "1.1.5",
-            "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-            "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/util-retry": {
+            "version": "4.0.6",
+            "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.0.6.tgz",
+            "integrity": "sha512-+YekoF2CaSMv6zKrA6iI/N9yva3Gzn4L6n35Luydweu5MMPYpiGZlWqehPHDHyNbnyaYlz/WJyYAZnC+loBDZg==",
             "dependencies": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.3",
-                "es-abstract": "^1.19.0",
-                "functions-have-names": "^1.2.2"
+                "@smithy/service-error-classification": "^4.0.6",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/functions-have-names": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-            "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/util-stream": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.2.3.tgz",
+            "integrity": "sha512-cQn412DWHHFNKrQfbHY8vSFI3nTROY1aIKji9N0tpp8gUABRilr7wdf8fqBbSlXresobM+tQFNk6I+0LXK/YZg==",
+            "dependencies": {
+                "@smithy/fetch-http-handler": "^5.1.0",
+                "@smithy/node-http-handler": "^4.1.0",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/gauge": {
-            "version": "2.7.4",
-            "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-            "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/util-uri-escape": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-4.0.0.tgz",
+            "integrity": "sha512-77yfbCbQMtgtTylO9itEAdpPXSog3ZxMe09AEhm0dU0NLTalV70ghDZFR+Nfi1C60jnJoh/Re4090/DuZh2Omg==",
             "dependencies": {
-                "aproba": "^1.0.3",
-                "console-control-strings": "^1.0.0",
-                "has-unicode": "^2.0.0",
-                "object-assign": "^4.1.0",
-                "signal-exit": "^3.0.0",
-                "string-width": "^1.0.1",
-                "strip-ansi": "^3.0.1",
-                "wide-align": "^1.1.0"
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/gauge/node_modules/ansi-regex": {
+        "node_modules/@aws-sdk/client-datazone/node_modules/@smithy/util-utf8": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-4.0.0.tgz",
+            "integrity": "sha512-b+zebfKCfRdgNJDknHCob3O7FpeYQN6ZG6YLExMcasDHsCXlsXCEuiPZeLnJLpwa5dvPetGlnGCiMHuLwGvFow==",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-datazone/node_modules/fast-xml-parser": {
+            "version": "5.2.5",
+            "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.2.5.tgz",
+            "integrity": "sha512-pfX9uG9Ki0yekDHx2SiuRIyFdyAr1kMIMitPvb0YBo8SUfKvia7w7FIyd/l6av85pFYRhZscS75MwMnbvY+hcQ==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/NaturalIntelligence"
+                }
+            ],
+            "dependencies": {
+                "strnum": "^2.1.0"
+            },
+            "bin": {
+                "fxparser": "src/cli/cli.js"
+            }
+        },
+        "node_modules/@aws-sdk/client-datazone/node_modules/strnum": {
             "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-            "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-            "dev": true,
+            "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.1.1.tgz",
+            "integrity": "sha512-7ZvoFTiCnGxBtDqJ//Cu6fWtZtc7Y3x+QOirG15wztbdngGSkht27o2pyGWrVy0b4WAy3jbKmnoK6g5VlVNUUw==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/NaturalIntelligence"
+                }
+            ]
+        },
+        "node_modules/@aws-sdk/client-ec2": {
+            "version": "3.695.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/client-sts": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-sdk-ec2": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "@smithy/util-waiter": "^3.1.8",
+                "@types/uuid": "^9.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-ec2/node_modules/@aws-sdk/client-sso": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-ec2/node_modules/@aws-sdk/client-sso-oidc": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-ec2/node_modules/@aws-sdk/client-sts": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-ec2/node_modules/@aws-sdk/core": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/signature-v4": "^4.2.2",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/gauge/node_modules/is-fullwidth-code-point": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-            "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ec2/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "number-is-nan": "^1.0.0"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-stream": "^3.3.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/gauge/node_modules/string-width": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-            "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ec2/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/gauge/node_modules/strip-ansi": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-            "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ec2/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "ansi-regex": "^2.0.0"
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-ini": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/gensync": {
-            "version": "1.0.0-beta.2",
-            "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-            "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ec2/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/client-sso": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/token-providers": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6.9.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/geometry-interfaces": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/geometry-interfaces/-/geometry-interfaces-1.1.4.tgz",
-            "integrity": "sha512-qD6OdkT6NcES9l4Xx3auTpwraQruU7dARbQPVO71MKvkGYw5/z/oIiGymuFXrRaEQa5Y67EIojUpaLeGEa5hGA==",
-            "dev": true
+        "node_modules/@aws-sdk/client-ec2/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
+            }
         },
-        "node_modules/get-caller-file": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-            "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ec2/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": "6.* || 8.* || >= 10.*"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/get-intrinsic": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
-            "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
+        "node_modules/@aws-sdk/client-ec2/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "function-bind": "^1.1.1",
-                "has": "^1.0.3",
-                "has-symbols": "^1.0.3"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/get-package-type": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-            "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ec2/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8.0.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/get-stdin": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-            "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ec2/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=10"
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-ec2/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-config-provider": "^3.0.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/get-stream": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-            "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+        "node_modules/@aws-sdk/client-ec2/node_modules/@aws-sdk/token-providers": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "pump": "^3.0.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+            "peerDependencies": {
+                "@aws-sdk/client-sso-oidc": "^3.693.0"
             }
         },
-        "node_modules/get-symbol-description": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-            "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+        "node_modules/@aws-sdk/client-ec2/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "call-bind": "^1.0.2",
-                "get-intrinsic": "^1.1.1"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-endpoints": "^2.1.5",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/github-from-package": {
-            "version": "0.0.0",
-            "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
-            "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=",
-            "dev": true
+        "node_modules/@aws-sdk/client-ec2/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
+            }
         },
-        "node_modules/glob": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-            "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ec2/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.0.4",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "*"
+                "node": ">=16.0.0"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
             }
         },
-        "node_modules/glob-parent": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ec2/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "is-glob": "^4.0.1"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 6"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/glob-promise": {
-            "version": "4.2.2",
-            "resolved": "https://registry.npmjs.org/glob-promise/-/glob-promise-4.2.2.tgz",
-            "integrity": "sha512-xcUzJ8NWN5bktoTIX7eOclO1Npxd/dyVqUJxlLIDasT4C7KZyqlPIwkdJ0Ypiy3p2ZKahTjK4M9uC3sNSfNMzw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ec2/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@types/glob": "^7.1.3"
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=12"
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-ec2/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-ecr": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-ecr/-/client-ecr-3.693.0.tgz",
+            "integrity": "sha512-qBI06wo2VaQI/+Pb4GmZRVQMnXFr9B983nWWNhM6xzcYmfJKXbCW29syDVojiwp8/HPMOSqcKJzqIOqCWtN1Ug==",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/client-sts": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "@smithy/util-waiter": "^3.1.8",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-ecr/node_modules/@aws-sdk/client-sso": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.693.0.tgz",
+            "integrity": "sha512-QEynrBC26x6TG9ZMzApR/kZ3lmt4lEIs2D+cHuDxt6fDGzahBUsQFBwJqhizzsM97JJI5YvmJhmihoYjdSSaXA==",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-ecr/node_modules/@aws-sdk/client-sso-oidc": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.693.0.tgz",
+            "integrity": "sha512-UEDbYlYtK/e86OOMyFR4zEPyenIxDzO2DRdz3fwVW7RzZ94wfmSwBh/8skzPTuY1G7sI064cjHW0b0QG01Sdtg==",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             },
-            "funding": {
-                "type": "individual",
-                "url": "https://github.com/sponsors/ahmadnassri"
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-ecr/node_modules/@aws-sdk/client-sts": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.693.0.tgz",
+            "integrity": "sha512-4S2y7VEtvdnjJX4JPl4kDQlslxXEZFnC50/UXVUYSt/AMc5A/GgspFNA5FVz4E3Gwpfobbf23hR2NBF8AGvYoQ==",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-ecr/node_modules/@aws-sdk/core": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.693.0.tgz",
+            "integrity": "sha512-v6Z/kWmLFqRLDPEwl9hJGhtTgIFHjZugSfF1Yqffdxf4n1AWgtHS7qSegakuMyN5pP4K2tvUD8qHJ+gGe2Bw2A==",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/signature-v4": "^4.2.2",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-ecr/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.693.0.tgz",
+            "integrity": "sha512-sL8MvwNJU7ZpD7/d2VVb3by1GknIJUxzTIgYtVkDVA/ojo+KRQSSHxcj0EWWXF5DTSh2Tm+LrEug3y1ZyKHsDA==",
+            "dependencies": {
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-stream": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-ecr/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.693.0.tgz",
+            "integrity": "sha512-kvaa4mXhCCOuW7UQnBhYqYfgWmwy7WSBSDClutwSLPZvgrhYj2l16SD2lN4IfYdxARYMJJ1lFYp3/jJG/9Yk4Q==",
+            "dependencies": {
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             },
             "peerDependencies": {
-                "glob": "^7.1.6"
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/glob-to-regexp": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-            "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-            "dev": true
-        },
-        "node_modules/globals": {
-            "version": "13.17.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-            "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ecr/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.693.0.tgz",
+            "integrity": "sha512-42WMsBjTNnjYxYuM3qD/Nq+8b7UdMopUq5OduMDxoM3mFTV6PXMMnfI4Z1TNnR4tYRvPXAnuNltF6xmjKbSJRA==",
             "dependencies": {
-                "type-fest": "^0.20.2"
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-ini": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-ecr/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.693.0.tgz",
+            "integrity": "sha512-479UlJxY+BFjj3pJFYUNC0DCMrykuG7wBAXfsvZqQxKUa83DnH5Q1ID/N2hZLkxjGd4ZW0AC3lTOMxFelGzzpQ==",
+            "dependencies": {
+                "@aws-sdk/client-sso": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/token-providers": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/globals/node_modules/type-fest": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-            "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ecr/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.693.0.tgz",
+            "integrity": "sha512-8LB210Pr6VeCiSb2hIra+sAH4KUBLyGaN50axHtIgufVK8jbKIctTZcVY5TO9Se+1107TsruzeXS7VeqVdJfFA==",
+            "dependencies": {
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=10"
+                "node": ">=16.0.0"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/globby": {
-            "version": "11.1.0",
-            "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-            "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ecr/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.693.0.tgz",
+            "integrity": "sha512-BCki6sAZ5jYwIN/t3ElCiwerHad69ipHwPsDCxJQyeiOnJ8HG+lEpnVIfrnI8A0fLQNSF3Gtx6ahfBpKiv1Oug==",
             "dependencies": {
-                "array-union": "^2.1.0",
-                "dir-glob": "^3.0.1",
-                "fast-glob": "^3.2.9",
-                "ignore": "^5.2.0",
-                "merge2": "^1.4.1",
-                "slash": "^3.0.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/got": {
-            "version": "11.8.5",
-            "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz",
-            "integrity": "sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==",
+        "node_modules/@aws-sdk/client-ecr/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.693.0.tgz",
+            "integrity": "sha512-dXnXDPr+wIiJ1TLADACI1g9pkSB21KkMIko2u4CJ2JCBoxi5IqeTnVoa6YcC8GdFNVRl+PorZ3Zqfmf1EOTC6w==",
             "dependencies": {
-                "@sindresorhus/is": "^4.0.0",
-                "@szmarczak/http-timer": "^4.0.5",
-                "@types/cacheable-request": "^6.0.1",
-                "@types/responselike": "^1.0.0",
-                "cacheable-lookup": "^5.0.3",
-                "cacheable-request": "^7.0.2",
-                "decompress-response": "^6.0.0",
-                "http2-wrapper": "^1.0.0-beta.5.2",
-                "lowercase-keys": "^2.0.0",
-                "p-cancelable": "^2.0.0",
-                "responselike": "^2.0.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10.19.0"
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-ecr/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.693.0.tgz",
+            "integrity": "sha512-0LDmM+VxXp0u3rG0xQRWD/q6Ubi7G8I44tBPahevD5CaiDZTkmNTrVUf0VEJgVe0iCKBppACMBDkLB0/ETqkFw==",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sindresorhus/got?sponsor=1"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/graceful-fs": {
-            "version": "4.2.8",
-            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
-            "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="
-        },
-        "node_modules/grapheme-splitter": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-            "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
-            "dev": true
-        },
-        "node_modules/handle-thing": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-            "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
-            "dev": true
-        },
-        "node_modules/hard-rejection": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
-            "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ecr/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.693.0.tgz",
+            "integrity": "sha512-/KUq/KEpFFbQmNmpp7SpAtFAdViquDfD2W0QcG07zYBfz9MwE2ig48ALynXm5sMpRmnG7sJXjdvPtTsSVPfkiw==",
+            "dependencies": {
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/has": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-            "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+        "node_modules/@aws-sdk/client-ecr/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.693.0.tgz",
+            "integrity": "sha512-YLUkMsUY0GLW/nfwlZ69cy1u07EZRmsv8Z9m0qW317/EZaVx59hcvmcvb+W4bFqj5E8YImTjoGfE4cZ0F9mkyw==",
             "dependencies": {
-                "function-bind": "^1.1.1"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-config-provider": "^3.0.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.4.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/has-bigints": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-            "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+        "node_modules/@aws-sdk/client-ecr/node_modules/@aws-sdk/token-providers": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.693.0.tgz",
+            "integrity": "sha512-nDBTJMk1l/YmFULGfRbToOA2wjf+FkQT4dMgYCv+V9uSYsMzQj8A7Tha2dz9yv4vnQgYaEiErQ8d7HVyXcVEoA==",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sso-oidc": "^3.693.0"
             }
         },
-        "node_modules/has-flag": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ecr/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.693.0.tgz",
+            "integrity": "sha512-eo4F6DRQ/kxS3gxJpLRv+aDNy76DxQJL5B3DPzpr9Vkq0ygVoi4GT5oIZLVaAVIJmi6k5qq9dLsYZfWLUxJJSg==",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-endpoints": "^2.1.5",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/has-property-descriptors": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-            "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
+        "node_modules/@aws-sdk/client-ecr/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.693.0.tgz",
+            "integrity": "sha512-6EUfuKOujtddy18OLJUaXfKBgs+UcbZ6N/3QV4iOkubCUdeM1maIqs++B9bhCbWeaeF5ORizJw5FTwnyNjE/mw==",
             "dependencies": {
-                "get-intrinsic": "^1.1.1"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/has-symbols": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-            "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+        "node_modules/@aws-sdk/client-ecr/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.693.0.tgz",
+            "integrity": "sha512-td0OVX8m5ZKiXtecIDuzY3Y3UZIzvxEr57Hp21NOwieqKCG2UeyQWWeGPv0FQaU7dpTkvFmVNI+tx9iB8V/Nhg==",
+            "dependencies": {
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.4"
+                "node": ">=16.0.0"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
             }
         },
-        "node_modules/has-tostringtag": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-            "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+        "node_modules/@aws-sdk/client-ecr/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+            "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
             "dependencies": {
-                "has-symbols": "^1.0.2"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/has-unicode": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-            "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-            "dev": true
-        },
-        "node_modules/hash-sum": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
-            "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
-            "dev": true
-        },
-        "node_modules/hasha": {
-            "version": "5.2.2",
-            "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz",
-            "integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ecr/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+            "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
             "dependencies": {
-                "is-stream": "^2.0.0",
-                "type-fest": "^0.8.0"
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/he": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-            "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-            "dev": true,
-            "bin": {
-                "he": "bin/he"
+        "node_modules/@aws-sdk/client-ecr/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+            "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-glue": {
+            "version": "3.852.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-glue/-/client-glue-3.852.0.tgz",
+            "integrity": "sha512-5IyZt/gKr0NoUHWGM112ikXrZs+VsA/09bwKDmp4/j250tfaZqgC1zhfBNFkyNisj1JQ0XYjwfzkLnYWlT3Pyw==",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.846.0",
+                "@aws-sdk/credential-provider-node": "3.848.0",
+                "@aws-sdk/middleware-host-header": "3.840.0",
+                "@aws-sdk/middleware-logger": "3.840.0",
+                "@aws-sdk/middleware-recursion-detection": "3.840.0",
+                "@aws-sdk/middleware-user-agent": "3.848.0",
+                "@aws-sdk/region-config-resolver": "3.840.0",
+                "@aws-sdk/types": "3.840.0",
+                "@aws-sdk/util-endpoints": "3.848.0",
+                "@aws-sdk/util-user-agent-browser": "3.840.0",
+                "@aws-sdk/util-user-agent-node": "3.848.0",
+                "@smithy/config-resolver": "^4.1.4",
+                "@smithy/core": "^3.7.0",
+                "@smithy/fetch-http-handler": "^5.1.0",
+                "@smithy/hash-node": "^4.0.4",
+                "@smithy/invalid-dependency": "^4.0.4",
+                "@smithy/middleware-content-length": "^4.0.4",
+                "@smithy/middleware-endpoint": "^4.1.15",
+                "@smithy/middleware-retry": "^4.1.16",
+                "@smithy/middleware-serde": "^4.0.8",
+                "@smithy/middleware-stack": "^4.0.4",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/node-http-handler": "^4.1.0",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/smithy-client": "^4.4.7",
+                "@smithy/types": "^4.3.1",
+                "@smithy/url-parser": "^4.0.4",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.23",
+                "@smithy/util-defaults-mode-node": "^4.0.23",
+                "@smithy/util-endpoints": "^3.0.6",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-retry": "^4.0.6",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-glue/node_modules/@aws-sdk/client-sso": {
+            "version": "3.848.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.848.0.tgz",
+            "integrity": "sha512-mD+gOwoeZQvbecVLGoCmY6pS7kg02BHesbtIxUj+PeBqYoZV5uLvjUOmuGfw1SfoSobKvS11urxC9S7zxU/Maw==",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.846.0",
+                "@aws-sdk/middleware-host-header": "3.840.0",
+                "@aws-sdk/middleware-logger": "3.840.0",
+                "@aws-sdk/middleware-recursion-detection": "3.840.0",
+                "@aws-sdk/middleware-user-agent": "3.848.0",
+                "@aws-sdk/region-config-resolver": "3.840.0",
+                "@aws-sdk/types": "3.840.0",
+                "@aws-sdk/util-endpoints": "3.848.0",
+                "@aws-sdk/util-user-agent-browser": "3.840.0",
+                "@aws-sdk/util-user-agent-node": "3.848.0",
+                "@smithy/config-resolver": "^4.1.4",
+                "@smithy/core": "^3.7.0",
+                "@smithy/fetch-http-handler": "^5.1.0",
+                "@smithy/hash-node": "^4.0.4",
+                "@smithy/invalid-dependency": "^4.0.4",
+                "@smithy/middleware-content-length": "^4.0.4",
+                "@smithy/middleware-endpoint": "^4.1.15",
+                "@smithy/middleware-retry": "^4.1.16",
+                "@smithy/middleware-serde": "^4.0.8",
+                "@smithy/middleware-stack": "^4.0.4",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/node-http-handler": "^4.1.0",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/smithy-client": "^4.4.7",
+                "@smithy/types": "^4.3.1",
+                "@smithy/url-parser": "^4.0.4",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.23",
+                "@smithy/util-defaults-mode-node": "^4.0.23",
+                "@smithy/util-endpoints": "^3.0.6",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-retry": "^4.0.6",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-glue/node_modules/@aws-sdk/core": {
+            "version": "3.846.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.846.0.tgz",
+            "integrity": "sha512-7CX0pM906r4WSS68fCTNMTtBCSkTtf3Wggssmx13gD40gcWEZXsU00KzPp1bYheNRyPlAq3rE22xt4wLPXbuxA==",
+            "dependencies": {
+                "@aws-sdk/types": "3.840.0",
+                "@aws-sdk/xml-builder": "3.821.0",
+                "@smithy/core": "^3.7.0",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/signature-v4": "^5.1.2",
+                "@smithy/smithy-client": "^4.4.7",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-utf8": "^4.0.0",
+                "fast-xml-parser": "5.2.5",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-glue/node_modules/@aws-sdk/credential-provider-env": {
+            "version": "3.846.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.846.0.tgz",
+            "integrity": "sha512-QuCQZET9enja7AWVISY+mpFrEIeHzvkx/JEEbHYzHhUkxcnC2Kq2c0bB7hDihGD0AZd3Xsm653hk1O97qu69zg==",
+            "dependencies": {
+                "@aws-sdk/core": "3.846.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-glue/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.846.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.846.0.tgz",
+            "integrity": "sha512-Jh1iKUuepdmtreMYozV2ePsPcOF5W9p3U4tWhi3v6nDvz0GsBjzjAROW+BW8XMz9vAD3I9R+8VC3/aq63p5nlw==",
+            "dependencies": {
+                "@aws-sdk/core": "3.846.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/fetch-http-handler": "^5.1.0",
+                "@smithy/node-http-handler": "^4.1.0",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/smithy-client": "^4.4.7",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-stream": "^4.2.3",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-glue/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.848.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.848.0.tgz",
+            "integrity": "sha512-r6KWOG+En2xujuMhgZu7dzOZV3/M5U/5+PXrG8dLQ3rdPRB3vgp5tc56KMqLwm/EXKRzAOSuw/UE4HfNOAB8Hw==",
+            "dependencies": {
+                "@aws-sdk/core": "3.846.0",
+                "@aws-sdk/credential-provider-env": "3.846.0",
+                "@aws-sdk/credential-provider-http": "3.846.0",
+                "@aws-sdk/credential-provider-process": "3.846.0",
+                "@aws-sdk/credential-provider-sso": "3.848.0",
+                "@aws-sdk/credential-provider-web-identity": "3.848.0",
+                "@aws-sdk/nested-clients": "3.848.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/credential-provider-imds": "^4.0.6",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/shared-ini-file-loader": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/hosted-git-info": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
-            "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.848.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.848.0.tgz",
+            "integrity": "sha512-AblNesOqdzrfyASBCo1xW3uweiSro4Kft9/htdxLeCVU1KVOnFWA5P937MNahViRmIQm2sPBCqL8ZG0u9lnh5g==",
             "dependencies": {
-                "lru-cache": "^6.0.0"
+                "@aws-sdk/credential-provider-env": "3.846.0",
+                "@aws-sdk/credential-provider-http": "3.846.0",
+                "@aws-sdk/credential-provider-ini": "3.848.0",
+                "@aws-sdk/credential-provider-process": "3.846.0",
+                "@aws-sdk/credential-provider-sso": "3.848.0",
+                "@aws-sdk/credential-provider-web-identity": "3.848.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/credential-provider-imds": "^4.0.6",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/shared-ini-file-loader": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/hpack.js": {
-            "version": "2.1.6",
-            "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-            "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@aws-sdk/credential-provider-process": {
+            "version": "3.846.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.846.0.tgz",
+            "integrity": "sha512-mEpwDYarJSH+CIXnnHN0QOe0MXI+HuPStD6gsv3z/7Q6ESl8KRWon3weFZCDnqpiJMUVavlDR0PPlAFg2MQoPg==",
             "dependencies": {
-                "inherits": "^2.0.1",
-                "obuf": "^1.0.0",
-                "readable-stream": "^2.0.1",
-                "wbuf": "^1.1.0"
+                "@aws-sdk/core": "3.846.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/shared-ini-file-loader": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/hpack.js/node_modules/readable-stream": {
-            "version": "2.3.7",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-            "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.848.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.848.0.tgz",
+            "integrity": "sha512-pozlDXOwJZL0e7w+dqXLgzVDB7oCx4WvtY0sk6l4i07uFliWF/exupb6pIehFWvTUcOvn5aFTTqcQaEzAD5Wsg==",
             "dependencies": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
+                "@aws-sdk/client-sso": "3.848.0",
+                "@aws-sdk/core": "3.846.0",
+                "@aws-sdk/token-providers": "3.848.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/shared-ini-file-loader": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/hpack.js/node_modules/safe-buffer": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-            "dev": true
-        },
-        "node_modules/hpack.js/node_modules/string_decoder": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.848.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.848.0.tgz",
+            "integrity": "sha512-D1fRpwPxtVDhcSc/D71exa2gYweV+ocp4D3brF0PgFd//JR3XahZ9W24rVnTQwYEcK9auiBZB89Ltv+WbWN8qw==",
             "dependencies": {
-                "safe-buffer": "~5.1.0"
+                "@aws-sdk/core": "3.846.0",
+                "@aws-sdk/nested-clients": "3.848.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/html-entities": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.2.tgz",
-            "integrity": "sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==",
-            "dev": true
-        },
-        "node_modules/html-escaper": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-            "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-            "dev": true
-        },
-        "node_modules/htmlparser2": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
-            "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
-            "dev": true,
-            "funding": [
-                "https://github.com/fb55/htmlparser2?sponsor=1",
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/fb55"
-                }
-            ],
+        "node_modules/@aws-sdk/client-glue/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.840.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.840.0.tgz",
+            "integrity": "sha512-ub+hXJAbAje94+Ya6c6eL7sYujoE8D4Bumu1NUI8TXjUhVVn0HzVWQjpRLshdLsUp1AW7XyeJaxyajRaJQ8+Xg==",
             "dependencies": {
-                "domelementtype": "^2.0.1",
-                "domhandler": "^4.0.0",
-                "domutils": "^2.5.2",
-                "entities": "^2.0.0"
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/http-cache-semantics": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-            "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="
-        },
-        "node_modules/http-deceiver": {
-            "version": "1.2.7",
-            "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-            "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
-            "dev": true
-        },
-        "node_modules/http-errors": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-            "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.840.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.840.0.tgz",
+            "integrity": "sha512-lSV8FvjpdllpGaRspywss4CtXV8M7NNNH+2/j86vMH+YCOZ6fu2T/TyFd/tHwZ92vDfHctWkRbQxg0bagqwovA==",
             "dependencies": {
-                "depd": "2.0.0",
-                "inherits": "2.0.4",
-                "setprototypeof": "1.2.0",
-                "statuses": "2.0.1",
-                "toidentifier": "1.0.1"
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/http-errors/node_modules/depd": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-            "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.840.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.840.0.tgz",
+            "integrity": "sha512-Gu7lGDyfddyhIkj1Z1JtrY5NHb5+x/CRiB87GjaSrKxkDaydtX2CU977JIABtt69l9wLbcGDIQ+W0uJ5xPof7g==",
+            "dependencies": {
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/http-errors/node_modules/statuses": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-            "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.848.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.848.0.tgz",
+            "integrity": "sha512-rjMuqSWJEf169/ByxvBqfdei1iaduAnfolTshsZxwcmLIUtbYrFUmts0HrLQqsAG8feGPpDLHA272oPl+NTCCA==",
+            "dependencies": {
+                "@aws-sdk/core": "3.846.0",
+                "@aws-sdk/types": "3.840.0",
+                "@aws-sdk/util-endpoints": "3.848.0",
+                "@smithy/core": "^3.7.0",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/http-parser-js": {
-            "version": "0.5.8",
-            "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
-            "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
-            "dev": true
+        "node_modules/@aws-sdk/client-glue/node_modules/@aws-sdk/nested-clients": {
+            "version": "3.848.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.848.0.tgz",
+            "integrity": "sha512-joLsyyo9u61jnZuyYzo1z7kmS7VgWRAkzSGESVzQHfOA1H2PYeUFek6vLT4+c9xMGrX/Z6B0tkRdzfdOPiatLg==",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.846.0",
+                "@aws-sdk/middleware-host-header": "3.840.0",
+                "@aws-sdk/middleware-logger": "3.840.0",
+                "@aws-sdk/middleware-recursion-detection": "3.840.0",
+                "@aws-sdk/middleware-user-agent": "3.848.0",
+                "@aws-sdk/region-config-resolver": "3.840.0",
+                "@aws-sdk/types": "3.840.0",
+                "@aws-sdk/util-endpoints": "3.848.0",
+                "@aws-sdk/util-user-agent-browser": "3.840.0",
+                "@aws-sdk/util-user-agent-node": "3.848.0",
+                "@smithy/config-resolver": "^4.1.4",
+                "@smithy/core": "^3.7.0",
+                "@smithy/fetch-http-handler": "^5.1.0",
+                "@smithy/hash-node": "^4.0.4",
+                "@smithy/invalid-dependency": "^4.0.4",
+                "@smithy/middleware-content-length": "^4.0.4",
+                "@smithy/middleware-endpoint": "^4.1.15",
+                "@smithy/middleware-retry": "^4.1.16",
+                "@smithy/middleware-serde": "^4.0.8",
+                "@smithy/middleware-stack": "^4.0.4",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/node-http-handler": "^4.1.0",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/smithy-client": "^4.4.7",
+                "@smithy/types": "^4.3.1",
+                "@smithy/url-parser": "^4.0.4",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.23",
+                "@smithy/util-defaults-mode-node": "^4.0.23",
+                "@smithy/util-endpoints": "^3.0.6",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-retry": "^4.0.6",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "node_modules/http-proxy": {
-            "version": "1.18.1",
-            "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-            "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.840.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.840.0.tgz",
+            "integrity": "sha512-Qjnxd/yDv9KpIMWr90ZDPtRj0v75AqGC92Lm9+oHXZ8p1MjG5JE2CW0HL8JRgK9iKzgKBL7pPQRXI8FkvEVfrA==",
             "dependencies": {
-                "eventemitter3": "^4.0.0",
-                "follow-redirects": "^1.0.0",
-                "requires-port": "^1.0.0"
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.4",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/http-proxy-agent": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-            "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@aws-sdk/token-providers": {
+            "version": "3.848.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.848.0.tgz",
+            "integrity": "sha512-oNPyM4+Di2Umu0JJRFSxDcKQ35+Chl/rAwD47/bS0cDPI8yrao83mLXLeDqpRPHyQW4sXlP763FZcuAibC0+mg==",
             "dependencies": {
-                "@tootallnate/once": "1",
-                "agent-base": "6",
-                "debug": "4"
+                "@aws-sdk/core": "3.846.0",
+                "@aws-sdk/nested-clients": "3.848.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/shared-ini-file-loader": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/http-proxy-middleware": {
-            "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
-            "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@aws-sdk/types": {
+            "version": "3.840.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.840.0.tgz",
+            "integrity": "sha512-xliuHaUFZxEx1NSXeLLZ9Dyu6+EJVQKEoD+yM+zqUo3YDZ7medKJWY6fIOKiPX/N7XbLdBYwajb15Q7IL8KkeA==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-glue/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.848.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.848.0.tgz",
+            "integrity": "sha512-fY/NuFFCq/78liHvRyFKr+aqq1aA/uuVSANjzr5Ym8c+9Z3HRPE9OrExAHoMrZ6zC8tHerQwlsXYYH5XZ7H+ww==",
+            "dependencies": {
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/types": "^4.3.1",
+                "@smithy/url-parser": "^4.0.4",
+                "@smithy/util-endpoints": "^3.0.6",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-glue/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.840.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.840.0.tgz",
+            "integrity": "sha512-JdyZM3EhhL4PqwFpttZu1afDpPJCCc3eyZOLi+srpX11LsGj6sThf47TYQN75HT1CarZ7cCdQHGzP2uy3/xHfQ==",
             "dependencies": {
-                "@types/http-proxy": "^1.17.8",
-                "http-proxy": "^1.18.1",
-                "is-glob": "^4.0.1",
-                "is-plain-obj": "^3.0.0",
-                "micromatch": "^4.0.2"
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/types": "^4.3.1",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
+            }
+        },
+        "node_modules/@aws-sdk/client-glue/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.848.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.848.0.tgz",
+            "integrity": "sha512-Zz1ft9NiLqbzNj/M0jVNxaoxI2F4tGXN0ZbZIj+KJ+PbJo+w5+Jo6d0UDAtbj3AEd79pjcCaP4OA9NTVzItUdw==",
+            "dependencies": {
+                "@aws-sdk/middleware-user-agent": "3.848.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=12.0.0"
+                "node": ">=18.0.0"
             },
             "peerDependencies": {
-                "@types/express": "^4.17.13"
+                "aws-crt": ">=1.0.0"
             },
             "peerDependenciesMeta": {
-                "@types/express": {
+                "aws-crt": {
                     "optional": true
                 }
             }
         },
-        "node_modules/http-proxy-middleware/node_modules/is-plain-obj": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
-            "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
+        "node_modules/@aws-sdk/client-glue/node_modules/@aws-sdk/xml-builder": {
+            "version": "3.821.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.821.0.tgz",
+            "integrity": "sha512-DIIotRnefVL6DiaHtO6/21DhJ4JZnnIwdNbpwiAhdt/AVbttcE4yw925gsjur0OGv5BTYXQXU3YnANBYnZjuQA==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/http2-wrapper": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
-            "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/abort-controller": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-4.0.4.tgz",
+            "integrity": "sha512-gJnEjZMvigPDQWHrW3oPrFhQtkrgqBkyjj3pCIdF3A5M6vsZODG93KNlfJprv6bp4245bdT32fsHK4kkH3KYDA==",
             "dependencies": {
-                "quick-lru": "^5.1.1",
-                "resolve-alpn": "^1.0.0"
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10.19.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/https-proxy-agent": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-            "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/config-resolver": {
+            "version": "4.1.4",
+            "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-4.1.4.tgz",
+            "integrity": "sha512-prmU+rDddxHOH0oNcwemL+SwnzcG65sBF2yXRO7aeXIn/xTlq2pX7JLVbkBnVLowHLg4/OL4+jBmv9hVrVGS+w==",
             "dependencies": {
-                "agent-base": "6",
-                "debug": "4"
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.4",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/human-signals": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
-            "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/core": {
+            "version": "3.7.2",
+            "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.7.2.tgz",
+            "integrity": "sha512-JoLw59sT5Bm8SAjFCYZyuCGxK8y3vovmoVbZWLDPTH5XpPEIwpFd9m90jjVMwoypDuB/SdVgje5Y4T7w50lJaw==",
+            "dependencies": {
+                "@smithy/middleware-serde": "^4.0.8",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-stream": "^4.2.3",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8.12.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/husky": {
-            "version": "7.0.4",
-            "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz",
-            "integrity": "sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==",
-            "dev": true,
-            "bin": {
-                "husky": "lib/bin.js"
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/credential-provider-imds": {
+            "version": "4.0.6",
+            "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-4.0.6.tgz",
+            "integrity": "sha512-hKMWcANhUiNbCJouYkZ9V3+/Qf9pteR1dnwgdyzR09R4ODEYx8BbUysHwRSyex4rZ9zapddZhLFTnT4ZijR4pw==",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "@smithy/url-parser": "^4.0.4",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/typicode"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/iconv-lite": {
-            "version": "0.4.24",
-            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-            "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/fetch-http-handler": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.1.0.tgz",
+            "integrity": "sha512-mADw7MS0bYe2OGKkHYMaqarOXuDwRbO6ArD91XhHcl2ynjGCFF+hvqf0LyQcYxkA1zaWjefSkU7Ne9mqgApSgQ==",
             "dependencies": {
-                "safer-buffer": ">= 2.1.2 < 3"
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/querystring-builder": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-base64": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/icss-utils": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-            "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-            "dev": true,
-            "engines": {
-                "node": "^10 || ^12 || >= 14"
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/hash-node": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-4.0.4.tgz",
+            "integrity": "sha512-qnbTPUhCVnCgBp4z4BUJUhOEkVwxiEi1cyFM+Zj6o+aY8OFGxUQleKWq8ltgp3dujuhXojIvJWdoqpm6dVO3lQ==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
-            "peerDependencies": {
-                "postcss": "^8.1.0"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/ieee754": {
-            "version": "1.1.13",
-            "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-            "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
-        },
-        "node_modules/ignore": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-            "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/invalid-dependency": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-4.0.4.tgz",
+            "integrity": "sha512-bNYMi7WKTJHu0gn26wg8OscncTt1t2b8KcsZxvOv56XA6cyXtOAAAaNP7+m45xfppXfOatXF3Sb1MNsLUgVLTw==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 4"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/immutable": {
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/is-array-buffer": {
             "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz",
-            "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw=="
-        },
-        "node_modules/import-fresh": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-            "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-            "dev": true,
+            "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-4.0.0.tgz",
+            "integrity": "sha512-saYhF8ZZNoJDTvJBEWgeBccCg+yvp1CX+ed12yORU3NilJScfc6gfch2oVb4QgxZrGUx3/ZJlb+c/dJbyupxlw==",
             "dependencies": {
-                "parent-module": "^1.0.0",
-                "resolve-from": "^4.0.0"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/import-local": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz",
-            "integrity": "sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/middleware-content-length": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-4.0.4.tgz",
+            "integrity": "sha512-F7gDyfI2BB1Kc+4M6rpuOLne5LOcEknH1n6UQB69qv+HucXBR1rkzXBnQTB2q46sFy1PM/zuSJOB532yc8bg3w==",
             "dependencies": {
-                "pkg-dir": "^4.2.0",
-                "resolve-cwd": "^3.0.0"
-            },
-            "bin": {
-                "import-local-fixture": "fixtures/cli.js"
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/imurmurhash": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-            "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/middleware-endpoint": {
+            "version": "4.1.17",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.1.17.tgz",
+            "integrity": "sha512-S3hSGLKmHG1m35p/MObQCBCdRsrpbPU8B129BVzRqRfDvQqPMQ14iO4LyRw+7LNizYc605COYAcjqgawqi+6jA==",
+            "dependencies": {
+                "@smithy/core": "^3.7.2",
+                "@smithy/middleware-serde": "^4.0.8",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/shared-ini-file-loader": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "@smithy/url-parser": "^4.0.4",
+                "@smithy/util-middleware": "^4.0.4",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.8.19"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/indent-string": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-            "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/middleware-retry": {
+            "version": "4.1.18",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.1.18.tgz",
+            "integrity": "sha512-bYLZ4DkoxSsPxpdmeapvAKy7rM5+25gR7PGxq2iMiecmbrRGBHj9s75N74Ylg+aBiw9i5jIowC/cLU2NR0qH8w==",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/service-error-classification": "^4.0.6",
+                "@smithy/smithy-client": "^4.4.9",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-retry": "^4.0.6",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/inflight": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-            "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/middleware-serde": {
+            "version": "4.0.8",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-4.0.8.tgz",
+            "integrity": "sha512-iSSl7HJoJaGyMIoNn2B7czghOVwJ9nD7TMvLhMWeSB5vt0TnEYyRRqPJu/TqW76WScaNvYYB8nRoiBHR9S1Ddw==",
             "dependencies": {
-                "once": "^1.3.0",
-                "wrappy": "1"
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/inherits": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-        },
-        "node_modules/ini": {
-            "version": "1.3.8",
-            "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-            "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-            "dev": true
-        },
-        "node_modules/internal-slot": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-            "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/middleware-stack": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-4.0.4.tgz",
+            "integrity": "sha512-kagK5ggDrBUCCzI93ft6DjteNSfY8Ulr83UtySog/h09lTIOAJ/xUSObutanlPT0nhoHAkpmW9V5K8oPyLh+QA==",
             "dependencies": {
-                "get-intrinsic": "^1.1.0",
-                "has": "^1.0.3",
-                "side-channel": "^1.0.4"
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.4"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/interpret": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
-            "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/node-config-provider": {
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-4.1.3.tgz",
+            "integrity": "sha512-HGHQr2s59qaU1lrVH6MbLlmOBxadtzTsoO4c+bF5asdgVik3I8o7JIOzoeqWc5MjVa+vD36/LWE0iXKpNqooRw==",
+            "dependencies": {
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/shared-ini-file-loader": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.10"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/ip-regex": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz",
-            "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==",
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/node-http-handler": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.1.0.tgz",
+            "integrity": "sha512-vqfSiHz2v8b3TTTrdXi03vNz1KLYYS3bhHCDv36FYDqxT7jvTll1mMnCrkD+gOvgwybuunh/2VmvOMqwBegxEg==",
+            "dependencies": {
+                "@smithy/abort-controller": "^4.0.4",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/querystring-builder": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/ipaddr.js": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
-            "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/property-provider": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-4.0.4.tgz",
+            "integrity": "sha512-qHJ2sSgu4FqF4U/5UUp4DhXNmdTrgmoAai6oQiM+c5RZ/sbDwJ12qxB1M6FnP+Tn/ggkPZf9ccn4jqKSINaquw==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 10"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/is": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/is/-/is-3.3.0.tgz",
-            "integrity": "sha512-nW24QBoPcFGGHJGUwnfpI7Yc5CdqWNdsyHQszVE/z2pKHXzh7FZ5GWhJqSyaQ9wMkQnsTx+kAI8bHlCX4tKdbg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/protocol-http": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-5.1.2.tgz",
+            "integrity": "sha512-rOG5cNLBXovxIrICSBm95dLqzfvxjEmuZx4KK3hWwPFHGdW3lxY0fZNXfv2zebfRO7sJZ5pKJYHScsqopeIWtQ==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": "*"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/is-arguments": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-            "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/querystring-builder": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-4.0.4.tgz",
+            "integrity": "sha512-SwREZcDnEYoh9tLNgMbpop+UTGq44Hl9tdj3rf+yeLcfH7+J8OXEBaMc2kDxtyRHu8BhSg9ADEx0gFHvpJgU8w==",
             "dependencies": {
-                "call-bind": "^1.0.2",
-                "has-tostringtag": "^1.0.0"
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/is-arrayish": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-            "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
-        },
-        "node_modules/is-bigint": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-            "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/querystring-parser": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-4.0.4.tgz",
+            "integrity": "sha512-6yZf53i/qB8gRHH/l2ZwUG5xgkPgQF15/KxH0DdXMDHjesA9MeZje/853ifkSY0x4m5S+dfDZ+c4x439PF0M2w==",
             "dependencies": {
-                "has-bigints": "^1.0.1"
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/is-binary-path": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-            "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/service-error-classification": {
+            "version": "4.0.6",
+            "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-4.0.6.tgz",
+            "integrity": "sha512-RRoTDL//7xi4tn5FrN2NzH17jbgmnKidUqd4KvquT0954/i6CXXkh1884jBiunq24g9cGtPBEXlU40W6EpNOOg==",
             "dependencies": {
-                "binary-extensions": "^2.0.0"
+                "@smithy/types": "^4.3.1"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/is-boolean-object": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-            "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/shared-ini-file-loader": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.0.4.tgz",
+            "integrity": "sha512-63X0260LoFBjrHifPDs+nM9tV0VMkOTl4JRMYNuKh/f5PauSjowTfvF3LogfkWdcPoxsA9UjqEOgjeYIbhb7Nw==",
             "dependencies": {
-                "call-bind": "^1.0.2",
-                "has-tostringtag": "^1.0.0"
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/is-buffer": {
-            "version": "1.1.6",
-            "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-            "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-            "dev": true
-        },
-        "node_modules/is-callable": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-            "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
-            "engines": {
-                "node": ">= 0.4"
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/signature-v4": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-5.1.2.tgz",
+            "integrity": "sha512-d3+U/VpX7a60seHziWnVZOHuEgJlclufjkS6zhXvxcJgkJq4UWdH5eOBLzHRMx6gXjsdT9h6lfpmLzbrdupHgQ==",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^4.0.0",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/is-core-module": {
-            "version": "2.9.0",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
-            "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/smithy-client": {
+            "version": "4.4.9",
+            "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.4.9.tgz",
+            "integrity": "sha512-mbMg8mIUAWwMmb74LoYiArP04zWElPzDoA1jVOp3or0cjlDMgoS6WTC3QXK0Vxoc9I4zdrX0tq6qsOmaIoTWEQ==",
             "dependencies": {
-                "has": "^1.0.3"
+                "@smithy/core": "^3.7.2",
+                "@smithy/middleware-endpoint": "^4.1.17",
+                "@smithy/middleware-stack": "^4.0.4",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-stream": "^4.2.3",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/is-date-object": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-            "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/types": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.3.1.tgz",
+            "integrity": "sha512-UqKOQBL2x6+HWl3P+3QqFD4ncKq0I8Nuz9QItGv5WuKuMHuuwlhvqcZCoXGfc+P1QmfJE7VieykoYYmrOoFJxA==",
             "dependencies": {
-                "has-tostringtag": "^1.0.0"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/is-directory": {
-            "version": "0.3.1",
-            "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-            "integrity": "sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/url-parser": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-4.0.4.tgz",
+            "integrity": "sha512-eMkc144MuN7B0TDA4U2fKs+BqczVbk3W+qIvcoCY6D1JY3hnAdCuhCZODC+GAeaxj0p6Jroz4+XMUn3PCxQQeQ==",
+            "dependencies": {
+                "@smithy/querystring-parser": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/is-docker": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-            "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-            "dev": true,
-            "bin": {
-                "is-docker": "cli.js"
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/util-base64": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-4.0.0.tgz",
+            "integrity": "sha512-CvHfCmO2mchox9kjrtzoHkWHxjHZzaFojLc8quxXY7WAAMAg43nuxwv95tATVgQFNDwd4M9S1qFzj40Ul41Kmg==",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/is-extglob": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-            "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/util-body-length-browser": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-4.0.0.tgz",
+            "integrity": "sha512-sNi3DL0/k64/LO3A256M+m3CDdG6V7WKWHdAiBBMUN8S3hK3aMPhwnPik2A/a2ONN+9doY9UxaLfgqsIRg69QA==",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/is-fullwidth-code-point": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/util-body-length-node": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-4.0.0.tgz",
+            "integrity": "sha512-q0iDP3VsZzqJyje8xJWEJCNIu3lktUGVoSy1KB0UWym2CL1siV3artm+u1DFYTLejpsrdGyCSWBdGNjJzfDPjg==",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/is-generator-function": {
-            "version": "1.0.10",
-            "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
-            "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/util-buffer-from": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-4.0.0.tgz",
+            "integrity": "sha512-9TOQ7781sZvddgO8nxueKi3+yGvkY35kotA0Y6BWRajAv8jjmigQ1sBwz0UX47pQMYXJPahSKEKYFgt+rXdcug==",
             "dependencies": {
-                "has-tostringtag": "^1.0.0"
+                "@smithy/is-array-buffer": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/is-glob": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-            "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/util-config-provider": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-4.0.0.tgz",
+            "integrity": "sha512-L1RBVzLyfE8OXH+1hsJ8p+acNUSirQnWQ6/EgpchV88G6zGBTDPdXiiExei6Z1wR2RxYvxY/XLw6AMNCCt8H3w==",
             "dependencies": {
-                "is-extglob": "^2.1.1"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/is-negative-zero": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-            "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-            "engines": {
-                "node": ">= 0.4"
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/util-defaults-mode-browser": {
+            "version": "4.0.25",
+            "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.25.tgz",
+            "integrity": "sha512-pxEWsxIsOPLfKNXvpgFHBGFC3pKYKUFhrud1kyooO9CJai6aaKDHfT10Mi5iiipPXN/JhKAu3qX9o75+X85OdQ==",
+            "dependencies": {
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/smithy-client": "^4.4.9",
+                "@smithy/types": "^4.3.1",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/is-number": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/util-defaults-mode-node": {
+            "version": "4.0.25",
+            "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.25.tgz",
+            "integrity": "sha512-+w4n4hKFayeCyELZLfsSQG5mCC3TwSkmRHv4+el5CzFU8ToQpYGhpV7mrRzqlwKkntlPilT1HJy1TVeEvEjWOQ==",
+            "dependencies": {
+                "@smithy/config-resolver": "^4.1.4",
+                "@smithy/credential-provider-imds": "^4.0.6",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/smithy-client": "^4.4.9",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.12.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/is-number-object": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-            "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/util-endpoints": {
+            "version": "3.0.6",
+            "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-3.0.6.tgz",
+            "integrity": "sha512-YARl3tFL3WgPuLzljRUnrS2ngLiUtkwhQtj8PAL13XZSyUiNLQxwG3fBBq3QXFqGFUXepIN73pINp3y8c2nBmA==",
             "dependencies": {
-                "has-tostringtag": "^1.0.0"
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.4"
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/util-hex-encoding": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-4.0.0.tgz",
+            "integrity": "sha512-Yk5mLhHtfIgW2W2WQZWSg5kuMZCVbvhFmC7rV4IO2QqnZdbEFPmQnCcGMAX2z/8Qj3B9hYYNjZOhWym+RwhePw==",
+            "dependencies": {
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/is-path-inside": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-            "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/util-middleware": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-4.0.4.tgz",
+            "integrity": "sha512-9MLKmkBmf4PRb0ONJikCbCwORACcil6gUWojwARCClT7RmLzF04hUR4WdRprIXal7XVyrddadYNfp2eF3nrvtQ==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/is-plain-obj": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-            "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/util-retry": {
+            "version": "4.0.6",
+            "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.0.6.tgz",
+            "integrity": "sha512-+YekoF2CaSMv6zKrA6iI/N9yva3Gzn4L6n35Luydweu5MMPYpiGZlWqehPHDHyNbnyaYlz/WJyYAZnC+loBDZg==",
+            "dependencies": {
+                "@smithy/service-error-classification": "^4.0.6",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/is-plain-object": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-            "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/util-stream": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.2.3.tgz",
+            "integrity": "sha512-cQn412DWHHFNKrQfbHY8vSFI3nTROY1aIKji9N0tpp8gUABRilr7wdf8fqBbSlXresobM+tQFNk6I+0LXK/YZg==",
             "dependencies": {
-                "isobject": "^3.0.1"
+                "@smithy/fetch-http-handler": "^5.1.0",
+                "@smithy/node-http-handler": "^4.1.0",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/is-promise": {
-            "version": "2.2.2",
-            "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
-            "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
-            "dev": true
-        },
-        "node_modules/is-regex": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-            "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/util-uri-escape": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-4.0.0.tgz",
+            "integrity": "sha512-77yfbCbQMtgtTylO9itEAdpPXSog3ZxMe09AEhm0dU0NLTalV70ghDZFR+Nfi1C60jnJoh/Re4090/DuZh2Omg==",
             "dependencies": {
-                "call-bind": "^1.0.2",
-                "has-tostringtag": "^1.0.0"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.4"
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-glue/node_modules/@smithy/util-utf8": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-4.0.0.tgz",
+            "integrity": "sha512-b+zebfKCfRdgNJDknHCob3O7FpeYQN6ZG6YLExMcasDHsCXlsXCEuiPZeLnJLpwa5dvPetGlnGCiMHuLwGvFow==",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^4.0.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/is-shared-array-buffer": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-            "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
+        "node_modules/@aws-sdk/client-glue/node_modules/fast-xml-parser": {
+            "version": "5.2.5",
+            "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.2.5.tgz",
+            "integrity": "sha512-pfX9uG9Ki0yekDHx2SiuRIyFdyAr1kMIMitPvb0YBo8SUfKvia7w7FIyd/l6av85pFYRhZscS75MwMnbvY+hcQ==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/NaturalIntelligence"
+                }
+            ],
             "dependencies": {
-                "call-bind": "^1.0.2"
+                "strnum": "^2.1.0"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+            "bin": {
+                "fxparser": "src/cli/cli.js"
             }
         },
-        "node_modules/is-stream": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-            "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-            "engines": {
-                "node": ">=8"
+        "node_modules/@aws-sdk/client-glue/node_modules/strnum": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.1.1.tgz",
+            "integrity": "sha512-7ZvoFTiCnGxBtDqJ//Cu6fWtZtc7Y3x+QOirG15wztbdngGSkht27o2pyGWrVy0b4WAy3jbKmnoK6g5VlVNUUw==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/NaturalIntelligence"
+                }
+            ]
+        },
+        "node_modules/@aws-sdk/client-iam": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/client-sts": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "@smithy/util-waiter": "^3.1.8",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-iam/node_modules/@aws-sdk/client-sso": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-iam/node_modules/@aws-sdk/client-sso-oidc": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/is-string": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-            "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+        "node_modules/@aws-sdk/client-iam/node_modules/@aws-sdk/client-sts": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "has-tostringtag": "^1.0.0"
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-iam/node_modules/@aws-sdk/core": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/signature-v4": "^4.2.2",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/is-symbol": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-            "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+        "node_modules/@aws-sdk/client-iam/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "has-symbols": "^1.0.2"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-stream": "^3.3.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/is-typed-array": {
-            "version": "1.1.9",
-            "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.9.tgz",
-            "integrity": "sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A==",
+        "node_modules/@aws-sdk/client-iam/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "available-typed-arrays": "^1.0.5",
-                "call-bind": "^1.0.2",
-                "es-abstract": "^1.20.0",
-                "for-each": "^0.3.3",
-                "has-tostringtag": "^1.0.0"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.4"
+                "node": ">=16.0.0"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/is-typedarray": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-            "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-            "dev": true
-        },
-        "node_modules/is-unicode-supported": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-            "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
+        "node_modules/@aws-sdk/client-iam/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-ini": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/is-url": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
-            "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="
-        },
-        "node_modules/is-weakref": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-            "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+        "node_modules/@aws-sdk/client-iam/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "call-bind": "^1.0.2"
+                "@aws-sdk/client-sso": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/token-providers": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/is-windows": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-            "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-iam/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/is-wsl": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-            "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-iam/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "is-docker": "^2.0.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/is2": {
-            "version": "2.0.7",
-            "resolved": "https://registry.npmjs.org/is2/-/is2-2.0.7.tgz",
-            "integrity": "sha512-4vBQoURAXC6hnLFxD4VW7uc04XiwTTl/8ydYJxKvPwkWQrSjInkuM5VZVg6BGr1/natq69zDuvO9lGpLClJqvA==",
+        "node_modules/@aws-sdk/client-iam/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "deep-is": "^0.1.3",
-                "ip-regex": "^4.1.0",
-                "is-url": "^1.2.4"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=v0.10.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/isarray": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-            "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-        },
-        "node_modules/isexe": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-            "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+        "node_modules/@aws-sdk/client-iam/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "node_modules/isobject": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-            "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-iam/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/istanbul-lib-coverage": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
-            "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-iam/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-config-provider": "^3.0.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/istanbul-lib-hook": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz",
-            "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-iam/node_modules/@aws-sdk/token-providers": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "append-transform": "^2.0.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sso-oidc": "^3.693.0"
             }
         },
-        "node_modules/istanbul-lib-instrument": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-            "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-iam/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@babel/core": "^7.7.5",
-                "@istanbuljs/schema": "^0.1.2",
-                "istanbul-lib-coverage": "^3.0.0",
-                "semver": "^6.3.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-endpoints": "^2.1.5",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/istanbul-lib-instrument/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-            "dev": true,
-            "bin": {
-                "semver": "bin/semver.js"
+        "node_modules/@aws-sdk/client-iam/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/istanbul-lib-processinfo": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.2.tgz",
-            "integrity": "sha512-kOwpa7z9hme+IBPZMzQ5vdQj8srYgAtaRqeI48NGmAQ+/5yKiHLV0QbYqQpxsdEF0+w14SoB8YbnHKcXE2KnYw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-iam/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "archy": "^1.0.0",
-                "cross-spawn": "^7.0.0",
-                "istanbul-lib-coverage": "^3.0.0-alpha.1",
-                "make-dir": "^3.0.0",
-                "p-map": "^3.0.0",
-                "rimraf": "^3.0.0",
-                "uuid": "^3.3.3"
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
             }
         },
-        "node_modules/istanbul-lib-processinfo/node_modules/p-map": {
+        "node_modules/@aws-sdk/client-iam/node_modules/@smithy/is-array-buffer": {
             "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
-            "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
-            "dev": true,
+            "license": "Apache-2.0",
             "dependencies": {
-                "aggregate-error": "^3.0.0"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/istanbul-lib-processinfo/node_modules/uuid": {
-            "version": "3.4.0",
-            "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-            "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-            "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-            "dev": true,
-            "bin": {
-                "uuid": "bin/uuid"
+        "node_modules/@aws-sdk/client-iam/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/istanbul-lib-report": {
+        "node_modules/@aws-sdk/client-iam/node_modules/@smithy/util-utf8": {
             "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-            "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
-            "dev": true,
+            "license": "Apache-2.0",
             "dependencies": {
-                "istanbul-lib-coverage": "^3.0.0",
-                "make-dir": "^3.0.0",
-                "supports-color": "^7.1.0"
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/istanbul-lib-source-maps": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-            "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-iot": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-iot/-/client-iot-3.693.0.tgz",
+            "integrity": "sha512-0EOKH6CjDHMdE1NSDdtZ8/zov+Xf1MovWvAeQGs76ec4mL2VWP5HvePjjdkGoOo0KC9k/AqOVVc0UOZjK0iCQw==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "debug": "^4.1.1",
-                "istanbul-lib-coverage": "^3.0.0",
-                "source-map": "^0.6.1"
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/client-sts": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "@types/uuid": "^9.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-iot/node_modules/@aws-sdk/client-sso": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.693.0.tgz",
+            "integrity": "sha512-QEynrBC26x6TG9ZMzApR/kZ3lmt4lEIs2D+cHuDxt6fDGzahBUsQFBwJqhizzsM97JJI5YvmJhmihoYjdSSaXA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-iot/node_modules/@aws-sdk/client-sso-oidc": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.693.0.tgz",
+            "integrity": "sha512-UEDbYlYtK/e86OOMyFR4zEPyenIxDzO2DRdz3fwVW7RzZ94wfmSwBh/8skzPTuY1G7sI064cjHW0b0QG01Sdtg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             },
-            "engines": {
-                "node": ">=10"
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/istanbul-reports": {
-            "version": "3.1.4",
-            "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.4.tgz",
-            "integrity": "sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-iot/node_modules/@aws-sdk/client-sts": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.693.0.tgz",
+            "integrity": "sha512-4S2y7VEtvdnjJX4JPl4kDQlslxXEZFnC50/UXVUYSt/AMc5A/GgspFNA5FVz4E3Gwpfobbf23hR2NBF8AGvYoQ==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "html-escaper": "^2.0.0",
-                "istanbul-lib-report": "^3.0.0"
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-iot/node_modules/@aws-sdk/core": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.693.0.tgz",
+            "integrity": "sha512-v6Z/kWmLFqRLDPEwl9hJGhtTgIFHjZugSfF1Yqffdxf4n1AWgtHS7qSegakuMyN5pP4K2tvUD8qHJ+gGe2Bw2A==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/signature-v4": "^4.2.2",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/jest-worker": {
-            "version": "27.3.1",
-            "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.3.1.tgz",
-            "integrity": "sha512-ks3WCzsiZaOPJl/oMsDjaf0TRiSv7ctNgs0FqRr2nARsovz6AWWy4oLElwcquGSz692DzgZQrCLScPNs5YlC4g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-iot/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.693.0.tgz",
+            "integrity": "sha512-sL8MvwNJU7ZpD7/d2VVb3by1GknIJUxzTIgYtVkDVA/ojo+KRQSSHxcj0EWWXF5DTSh2Tm+LrEug3y1ZyKHsDA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@types/node": "*",
-                "merge-stream": "^2.0.0",
-                "supports-color": "^8.0.0"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-stream": "^3.3.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 10.13.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/jest-worker/node_modules/supports-color": {
-            "version": "8.1.1",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-            "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-iot/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.693.0.tgz",
+            "integrity": "sha512-kvaa4mXhCCOuW7UQnBhYqYfgWmwy7WSBSDClutwSLPZvgrhYj2l16SD2lN4IfYdxARYMJJ1lFYp3/jJG/9Yk4Q==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "has-flag": "^4.0.0"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=16.0.0"
             },
-            "funding": {
-                "url": "https://github.com/chalk/supports-color?sponsor=1"
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/jmespath": {
-            "version": "0.16.0",
-            "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.16.0.tgz",
-            "integrity": "sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==",
+        "node_modules/@aws-sdk/client-iot/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.693.0.tgz",
+            "integrity": "sha512-42WMsBjTNnjYxYuM3qD/Nq+8b7UdMopUq5OduMDxoM3mFTV6PXMMnfI4Z1TNnR4tYRvPXAnuNltF6xmjKbSJRA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-ini": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.6.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/joycon": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/joycon/-/joycon-3.0.1.tgz",
-            "integrity": "sha512-SJcJNBg32dGgxhPtM0wQqxqV0ax9k/9TaUskGDSJkSFSQOEWWvQ3zzWdGQRIUry2j1zA5+ReH13t0Mf3StuVZA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-iot/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.693.0.tgz",
+            "integrity": "sha512-479UlJxY+BFjj3pJFYUNC0DCMrykuG7wBAXfsvZqQxKUa83DnH5Q1ID/N2hZLkxjGd4ZW0AC3lTOMxFelGzzpQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/client-sso": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/token-providers": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=10"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/js-sdsl": {
-            "version": "4.1.4",
-            "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz",
-            "integrity": "sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==",
-            "dev": true
-        },
-        "node_modules/js-tokens": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-            "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-            "dev": true
-        },
-        "node_modules/js-yaml": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-            "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+        "node_modules/@aws-sdk/client-iot/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.693.0.tgz",
+            "integrity": "sha512-8LB210Pr6VeCiSb2hIra+sAH4KUBLyGaN50axHtIgufVK8jbKIctTZcVY5TO9Se+1107TsruzeXS7VeqVdJfFA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "argparse": "^2.0.1"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
-            "bin": {
-                "js-yaml": "bin/js-yaml.js"
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/jsesc": {
-            "version": "2.5.2",
-            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-            "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-            "dev": true,
-            "bin": {
-                "jsesc": "bin/jsesc"
+        "node_modules/@aws-sdk/client-iot/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.693.0.tgz",
+            "integrity": "sha512-BCki6sAZ5jYwIN/t3ElCiwerHad69ipHwPsDCxJQyeiOnJ8HG+lEpnVIfrnI8A0fLQNSF3Gtx6ahfBpKiv1Oug==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/json-buffer": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-            "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="
-        },
-        "node_modules/json-parse-better-errors": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-            "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-            "dev": true
-        },
-        "node_modules/json-parse-even-better-errors": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-            "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-            "dev": true
-        },
-        "node_modules/json-schema-to-typescript": {
-            "version": "11.0.2",
-            "resolved": "https://registry.npmjs.org/json-schema-to-typescript/-/json-schema-to-typescript-11.0.2.tgz",
-            "integrity": "sha512-XRyeXBJeo/IH4eTP5D1ptX78vCvH86nMDt2k3AxO28C3uYWEDmy4mgPyMpb8bLJ/pJMElOGuQbnKR5Y6NSh3QQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-iot/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.693.0.tgz",
+            "integrity": "sha512-dXnXDPr+wIiJ1TLADACI1g9pkSB21KkMIko2u4CJ2JCBoxi5IqeTnVoa6YcC8GdFNVRl+PorZ3Zqfmf1EOTC6w==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@bcherny/json-schema-ref-parser": "9.0.9",
-                "@types/json-schema": "^7.0.11",
-                "@types/lodash": "^4.14.182",
-                "@types/prettier": "^2.6.1",
-                "cli-color": "^2.0.2",
-                "get-stdin": "^8.0.0",
-                "glob": "^7.1.6",
-                "glob-promise": "^4.2.2",
-                "is-glob": "^4.0.3",
-                "lodash": "^4.17.21",
-                "minimist": "^1.2.6",
-                "mkdirp": "^1.0.4",
-                "mz": "^2.7.0",
-                "prettier": "^2.6.2"
-            },
-            "bin": {
-                "json2ts": "dist/src/cli.js"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=12.0.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/json-schema-to-typescript/node_modules/mkdirp": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-            "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-            "dev": true,
-            "bin": {
-                "mkdirp": "bin/cmd.js"
+        "node_modules/@aws-sdk/client-iot/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.693.0.tgz",
+            "integrity": "sha512-0LDmM+VxXp0u3rG0xQRWD/q6Ubi7G8I44tBPahevD5CaiDZTkmNTrVUf0VEJgVe0iCKBppACMBDkLB0/ETqkFw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/json-schema-traverse": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-            "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-            "dev": true
-        },
-        "node_modules/json-stable-stringify-without-jsonify": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-            "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-            "dev": true
-        },
-        "node_modules/json5": {
-            "version": "2.2.3",
-            "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-            "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-            "dev": true,
-            "bin": {
-                "json5": "lib/cli.js"
+        "node_modules/@aws-sdk/client-iot/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.693.0.tgz",
+            "integrity": "sha512-/KUq/KEpFFbQmNmpp7SpAtFAdViquDfD2W0QcG07zYBfz9MwE2ig48ALynXm5sMpRmnG7sJXjdvPtTsSVPfkiw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/jsonc-parser": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
-            "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA=="
-        },
-        "node_modules/jsonfile": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-            "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+        "node_modules/@aws-sdk/client-iot/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.693.0.tgz",
+            "integrity": "sha512-YLUkMsUY0GLW/nfwlZ69cy1u07EZRmsv8Z9m0qW317/EZaVx59hcvmcvb+W4bFqj5E8YImTjoGfE4cZ0F9mkyw==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "universalify": "^2.0.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-config-provider": "^3.0.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "tslib": "^2.6.2"
             },
-            "optionalDependencies": {
-                "graceful-fs": "^4.1.6"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/just-extend": {
-            "version": "4.2.1",
-            "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz",
-            "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==",
-            "dev": true
+        "node_modules/@aws-sdk/client-iot/node_modules/@aws-sdk/token-providers": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.693.0.tgz",
+            "integrity": "sha512-nDBTJMk1l/YmFULGfRbToOA2wjf+FkQT4dMgYCv+V9uSYsMzQj8A7Tha2dz9yv4vnQgYaEiErQ8d7HVyXcVEoA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sso-oidc": "^3.693.0"
+            }
         },
-        "node_modules/keytar": {
-            "version": "7.7.0",
-            "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz",
-            "integrity": "sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==",
-            "dev": true,
-            "hasInstallScript": true,
+        "node_modules/@aws-sdk/client-iot/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.693.0.tgz",
+            "integrity": "sha512-eo4F6DRQ/kxS3gxJpLRv+aDNy76DxQJL5B3DPzpr9Vkq0ygVoi4GT5oIZLVaAVIJmi6k5qq9dLsYZfWLUxJJSg==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "node-addon-api": "^3.0.0",
-                "prebuild-install": "^6.0.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-endpoints": "^2.1.5",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/keyv": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz",
-            "integrity": "sha512-zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA==",
+        "node_modules/@aws-sdk/client-iot/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.693.0.tgz",
+            "integrity": "sha512-6EUfuKOujtddy18OLJUaXfKBgs+UcbZ6N/3QV4iOkubCUdeM1maIqs++B9bhCbWeaeF5ORizJw5FTwnyNjE/mw==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "json-buffer": "3.0.1"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/kind-of": {
-            "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-            "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-iot/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.693.0.tgz",
+            "integrity": "sha512-td0OVX8m5ZKiXtecIDuzY3Y3UZIzvxEr57Hp21NOwieqKCG2UeyQWWeGPv0FQaU7dpTkvFmVNI+tx9iB8V/Nhg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
             }
         },
-        "node_modules/kuler": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz",
-            "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="
-        },
-        "node_modules/leven": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-            "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-iot/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+            "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/levn": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-            "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-iot/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+            "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "prelude-ls": "^1.2.1",
-                "type-check": "~0.4.0"
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.8.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/lines-and-columns": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-            "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-            "dev": true
-        },
-        "node_modules/linkify-it": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
-            "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-iot/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+            "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "uc.micro": "^1.0.1"
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/listenercount": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
-            "integrity": "sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc=",
-            "dev": true
+        "node_modules/@aws-sdk/client-iotsecuretunneling": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-iotsecuretunneling/-/client-iotsecuretunneling-3.693.0.tgz",
+            "integrity": "sha512-f9p5/TgVQsko0FlYIj9UKAVSfgPF4GgoKGVOI3Gx6XpynYwideGxItq3v0ExoAzpaohq6zRKleqA68o/T1TqXQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/client-sts": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-iotsecuretunneling/node_modules/@aws-sdk/client-sso": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.693.0.tgz",
+            "integrity": "sha512-QEynrBC26x6TG9ZMzApR/kZ3lmt4lEIs2D+cHuDxt6fDGzahBUsQFBwJqhizzsM97JJI5YvmJhmihoYjdSSaXA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-iotsecuretunneling/node_modules/@aws-sdk/client-sso-oidc": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.693.0.tgz",
+            "integrity": "sha512-UEDbYlYtK/e86OOMyFR4zEPyenIxDzO2DRdz3fwVW7RzZ94wfmSwBh/8skzPTuY1G7sI064cjHW0b0QG01Sdtg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
+            }
         },
-        "node_modules/loader-runner": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
-            "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-iotsecuretunneling/node_modules/@aws-sdk/client-sts": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.693.0.tgz",
+            "integrity": "sha512-4S2y7VEtvdnjJX4JPl4kDQlslxXEZFnC50/UXVUYSt/AMc5A/GgspFNA5FVz4E3Gwpfobbf23hR2NBF8AGvYoQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-iotsecuretunneling/node_modules/@aws-sdk/core": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.693.0.tgz",
+            "integrity": "sha512-v6Z/kWmLFqRLDPEwl9hJGhtTgIFHjZugSfF1Yqffdxf4n1AWgtHS7qSegakuMyN5pP4K2tvUD8qHJ+gGe2Bw2A==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/signature-v4": "^4.2.2",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6.11.5"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/loader-utils": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-            "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-iotsecuretunneling/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.693.0.tgz",
+            "integrity": "sha512-sL8MvwNJU7ZpD7/d2VVb3by1GknIJUxzTIgYtVkDVA/ojo+KRQSSHxcj0EWWXF5DTSh2Tm+LrEug3y1ZyKHsDA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "big.js": "^5.2.2",
-                "emojis-list": "^3.0.0",
-                "json5": "^2.1.2"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-stream": "^3.3.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8.9.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/locate-path": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-            "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-iotsecuretunneling/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.693.0.tgz",
+            "integrity": "sha512-kvaa4mXhCCOuW7UQnBhYqYfgWmwy7WSBSDClutwSLPZvgrhYj2l16SD2lN4IfYdxARYMJJ1lFYp3/jJG/9Yk4Q==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "p-locate": "^5.0.0"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=16.0.0"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/lodash": {
-            "version": "4.17.21",
-            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-        },
-        "node_modules/lodash.flattendeep": {
-            "version": "4.4.0",
-            "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
-            "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
-            "dev": true
-        },
-        "node_modules/lodash.get": {
-            "version": "4.4.2",
-            "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-            "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
-            "dev": true
+        "node_modules/@aws-sdk/client-iotsecuretunneling/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.693.0.tgz",
+            "integrity": "sha512-42WMsBjTNnjYxYuM3qD/Nq+8b7UdMopUq5OduMDxoM3mFTV6PXMMnfI4Z1TNnR4tYRvPXAnuNltF6xmjKbSJRA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-ini": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "node_modules/lodash.merge": {
-            "version": "4.6.2",
-            "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-            "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-            "dev": true
+        "node_modules/@aws-sdk/client-iotsecuretunneling/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.693.0.tgz",
+            "integrity": "sha512-479UlJxY+BFjj3pJFYUNC0DCMrykuG7wBAXfsvZqQxKUa83DnH5Q1ID/N2hZLkxjGd4ZW0AC3lTOMxFelGzzpQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/client-sso": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/token-providers": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "node_modules/log-symbols": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-            "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-iotsecuretunneling/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.693.0.tgz",
+            "integrity": "sha512-8LB210Pr6VeCiSb2hIra+sAH4KUBLyGaN50axHtIgufVK8jbKIctTZcVY5TO9Se+1107TsruzeXS7VeqVdJfFA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "chalk": "^4.1.0",
-                "is-unicode-supported": "^0.1.0"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=16.0.0"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/logform": {
-            "version": "2.4.0",
-            "resolved": "https://registry.npmjs.org/logform/-/logform-2.4.0.tgz",
-            "integrity": "sha512-CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw==",
+        "node_modules/@aws-sdk/client-iotsecuretunneling/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.693.0.tgz",
+            "integrity": "sha512-BCki6sAZ5jYwIN/t3ElCiwerHad69ipHwPsDCxJQyeiOnJ8HG+lEpnVIfrnI8A0fLQNSF3Gtx6ahfBpKiv1Oug==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@colors/colors": "1.5.0",
-                "fecha": "^4.2.0",
-                "ms": "^2.1.1",
-                "safe-stable-stringify": "^2.3.1",
-                "triple-beam": "^1.3.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/lowercase-keys": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-            "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+        "node_modules/@aws-sdk/client-iotsecuretunneling/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.693.0.tgz",
+            "integrity": "sha512-dXnXDPr+wIiJ1TLADACI1g9pkSB21KkMIko2u4CJ2JCBoxi5IqeTnVoa6YcC8GdFNVRl+PorZ3Zqfmf1EOTC6w==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/lru-cache": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-            "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+        "node_modules/@aws-sdk/client-iotsecuretunneling/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.693.0.tgz",
+            "integrity": "sha512-0LDmM+VxXp0u3rG0xQRWD/q6Ubi7G8I44tBPahevD5CaiDZTkmNTrVUf0VEJgVe0iCKBppACMBDkLB0/ETqkFw==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "yallist": "^4.0.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/lru-queue": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
-            "integrity": "sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-iotsecuretunneling/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.693.0.tgz",
+            "integrity": "sha512-/KUq/KEpFFbQmNmpp7SpAtFAdViquDfD2W0QcG07zYBfz9MwE2ig48ALynXm5sMpRmnG7sJXjdvPtTsSVPfkiw==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "es5-ext": "~0.10.2"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/magic-string": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
-            "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
+        "node_modules/@aws-sdk/client-iotsecuretunneling/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.693.0.tgz",
+            "integrity": "sha512-YLUkMsUY0GLW/nfwlZ69cy1u07EZRmsv8Z9m0qW317/EZaVx59hcvmcvb+W4bFqj5E8YImTjoGfE4cZ0F9mkyw==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "sourcemap-codec": "^1.4.8"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-config-provider": "^3.0.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/make-dir": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-            "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-iotsecuretunneling/node_modules/@aws-sdk/token-providers": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.693.0.tgz",
+            "integrity": "sha512-nDBTJMk1l/YmFULGfRbToOA2wjf+FkQT4dMgYCv+V9uSYsMzQj8A7Tha2dz9yv4vnQgYaEiErQ8d7HVyXcVEoA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "semver": "^6.0.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+            "peerDependencies": {
+                "@aws-sdk/client-sso-oidc": "^3.693.0"
             }
         },
-        "node_modules/make-dir/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-            "dev": true,
-            "bin": {
-                "semver": "bin/semver.js"
+        "node_modules/@aws-sdk/client-iotsecuretunneling/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.693.0.tgz",
+            "integrity": "sha512-eo4F6DRQ/kxS3gxJpLRv+aDNy76DxQJL5B3DPzpr9Vkq0ygVoi4GT5oIZLVaAVIJmi6k5qq9dLsYZfWLUxJJSg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-endpoints": "^2.1.5",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/make-error": {
-            "version": "1.3.6",
-            "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-            "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-            "dev": true
+        "node_modules/@aws-sdk/client-iotsecuretunneling/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.693.0.tgz",
+            "integrity": "sha512-6EUfuKOujtddy18OLJUaXfKBgs+UcbZ6N/3QV4iOkubCUdeM1maIqs++B9bhCbWeaeF5ORizJw5FTwnyNjE/mw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
+            }
         },
-        "node_modules/map-obj": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
-            "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-iotsecuretunneling/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.693.0.tgz",
+            "integrity": "sha512-td0OVX8m5ZKiXtecIDuzY3Y3UZIzvxEr57Hp21NOwieqKCG2UeyQWWeGPv0FQaU7dpTkvFmVNI+tx9iB8V/Nhg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
             }
         },
-        "node_modules/map-stream": {
-            "version": "0.0.7",
-            "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
-            "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=",
-            "dev": true
-        },
-        "node_modules/markdown-it": {
-            "version": "12.3.2",
-            "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
-            "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-iotsecuretunneling/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+            "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "argparse": "^2.0.1",
-                "entities": "~2.1.0",
-                "linkify-it": "^3.0.1",
-                "mdurl": "^1.0.1",
-                "uc.micro": "^1.0.5"
+                "tslib": "^2.6.2"
             },
-            "bin": {
-                "markdown-it": "bin/markdown-it.js"
-            }
-        },
-        "node_modules/markdown-it/node_modules/entities": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
-            "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
-            "dev": true,
-            "funding": {
-                "url": "https://github.com/fb55/entities?sponsor=1"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/marked": {
-            "version": "4.0.10",
-            "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.10.tgz",
-            "integrity": "sha512-+QvuFj0nGgO970fySghXGmuw+Fd0gD2x3+MqCWLIPf5oxdv1Ka6b2q+z9RP01P/IaKPMEramy+7cNy/Lw8c3hw==",
-            "dev": true,
-            "bin": {
-                "marked": "bin/marked.js"
+        "node_modules/@aws-sdk/client-iotsecuretunneling/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+            "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/md5": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
-            "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-iotsecuretunneling/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+            "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "charenc": "0.0.2",
-                "crypt": "0.0.2",
-                "is-buffer": "~1.1.6"
-            }
-        },
-        "node_modules/mdurl": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-            "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
-            "dev": true
-        },
-        "node_modules/media-typer": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-            "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
-            "dev": true,
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.6"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/memfs": {
-            "version": "3.4.7",
-            "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.7.tgz",
-            "integrity": "sha512-ygaiUSNalBX85388uskeCyhSAoOSgzBbtVCr9jA2RROssFL9Q19/ZXFqS+2Th2sr1ewNIWgFdLzLC3Yl1Zv+lw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-lambda": {
+            "version": "3.637.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "fs-monkey": "^1.0.3"
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.637.0",
+                "@aws-sdk/client-sts": "3.637.0",
+                "@aws-sdk/core": "3.635.0",
+                "@aws-sdk/credential-provider-node": "3.637.0",
+                "@aws-sdk/middleware-host-header": "3.620.0",
+                "@aws-sdk/middleware-logger": "3.609.0",
+                "@aws-sdk/middleware-recursion-detection": "3.620.0",
+                "@aws-sdk/middleware-user-agent": "3.637.0",
+                "@aws-sdk/region-config-resolver": "3.614.0",
+                "@aws-sdk/types": "3.609.0",
+                "@aws-sdk/util-endpoints": "3.637.0",
+                "@aws-sdk/util-user-agent-browser": "3.609.0",
+                "@aws-sdk/util-user-agent-node": "3.614.0",
+                "@smithy/config-resolver": "^3.0.5",
+                "@smithy/core": "^2.4.0",
+                "@smithy/eventstream-serde-browser": "^3.0.6",
+                "@smithy/eventstream-serde-config-resolver": "^3.0.3",
+                "@smithy/eventstream-serde-node": "^3.0.5",
+                "@smithy/fetch-http-handler": "^3.2.4",
+                "@smithy/hash-node": "^3.0.3",
+                "@smithy/invalid-dependency": "^3.0.3",
+                "@smithy/middleware-content-length": "^3.0.5",
+                "@smithy/middleware-endpoint": "^3.1.0",
+                "@smithy/middleware-retry": "^3.0.15",
+                "@smithy/middleware-serde": "^3.0.3",
+                "@smithy/middleware-stack": "^3.0.3",
+                "@smithy/node-config-provider": "^3.1.4",
+                "@smithy/node-http-handler": "^3.1.4",
+                "@smithy/protocol-http": "^4.1.0",
+                "@smithy/smithy-client": "^3.2.0",
+                "@smithy/types": "^3.3.0",
+                "@smithy/url-parser": "^3.0.3",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.15",
+                "@smithy/util-defaults-mode-node": "^3.0.15",
+                "@smithy/util-endpoints": "^2.0.5",
+                "@smithy/util-middleware": "^3.0.3",
+                "@smithy/util-retry": "^3.0.3",
+                "@smithy/util-stream": "^3.1.3",
+                "@smithy/util-utf8": "^3.0.0",
+                "@smithy/util-waiter": "^3.1.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-lambda/node_modules/@aws-sdk/types": {
+            "version": "3.609.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 4.0.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/memoizee": {
-            "version": "0.4.15",
-            "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz",
-            "integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/fetch-http-handler": {
+            "version": "3.2.4",
+            "license": "Apache-2.0",
             "dependencies": {
-                "d": "^1.0.1",
-                "es5-ext": "^0.10.53",
-                "es6-weak-map": "^2.0.3",
-                "event-emitter": "^0.3.5",
-                "is-promise": "^2.2.2",
-                "lru-queue": "^0.1.0",
-                "next-tick": "^1.1.0",
-                "timers-ext": "^0.1.7"
+                "@smithy/protocol-http": "^4.1.0",
+                "@smithy/querystring-builder": "^3.0.3",
+                "@smithy/types": "^3.3.0",
+                "@smithy/util-base64": "^3.0.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/meow": {
-            "version": "9.0.0",
-            "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
-            "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@types/minimist": "^1.2.0",
-                "camelcase-keys": "^6.2.2",
-                "decamelize": "^1.2.0",
-                "decamelize-keys": "^1.1.0",
-                "hard-rejection": "^2.1.0",
-                "minimist-options": "4.1.0",
-                "normalize-package-data": "^3.0.0",
-                "read-pkg-up": "^7.0.1",
-                "redent": "^3.0.0",
-                "trim-newlines": "^3.0.0",
-                "type-fest": "^0.18.0",
-                "yargs-parser": "^20.2.3"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/meow/node_modules/decamelize": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-            "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/meow/node_modules/type-fest": {
-            "version": "0.18.1",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-            "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
+        "node_modules/@aws-sdk/client-lambda/node_modules/@smithy/util-utf8/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/merge-descriptors": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-            "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
-            "dev": true
-        },
-        "node_modules/merge-stream": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-            "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-            "dev": true
+        "node_modules/@aws-sdk/client-redshift": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-redshift/-/client-redshift-3.693.0.tgz",
+            "integrity": "sha512-k+4emXXK7iOOYjTAU+Erj5RVxu68Hi6iI48h5r8iNMhWRUMqUq346tK5qkD4C4x9SzJu5j0WgPWpVUiHu8ufDw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/client-sts": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "@smithy/util-waiter": "^3.1.8",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-redshift-data": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-redshift-data/-/client-redshift-data-3.693.0.tgz",
+            "integrity": "sha512-uG5LdlXz80KcauRIucMdiRSQJ2WutewQRHpcTQW4vFUf/kEhUha5fD9FMn+/eJ1NFA2N8hv64vhpzGvu7EiP6Q==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/client-sts": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "@types/uuid": "^9.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-redshift-data/node_modules/@aws-sdk/client-sso": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.693.0.tgz",
+            "integrity": "sha512-QEynrBC26x6TG9ZMzApR/kZ3lmt4lEIs2D+cHuDxt6fDGzahBUsQFBwJqhizzsM97JJI5YvmJhmihoYjdSSaXA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-redshift-data/node_modules/@aws-sdk/client-sso-oidc": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.693.0.tgz",
+            "integrity": "sha512-UEDbYlYtK/e86OOMyFR4zEPyenIxDzO2DRdz3fwVW7RzZ94wfmSwBh/8skzPTuY1G7sI064cjHW0b0QG01Sdtg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
+            }
         },
-        "node_modules/merge2": {
-            "version": "1.4.1",
-            "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-            "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift-data/node_modules/@aws-sdk/client-sts": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.693.0.tgz",
+            "integrity": "sha512-4S2y7VEtvdnjJX4JPl4kDQlslxXEZFnC50/UXVUYSt/AMc5A/GgspFNA5FVz4E3Gwpfobbf23hR2NBF8AGvYoQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-redshift-data/node_modules/@aws-sdk/core": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.693.0.tgz",
+            "integrity": "sha512-v6Z/kWmLFqRLDPEwl9hJGhtTgIFHjZugSfF1Yqffdxf4n1AWgtHS7qSegakuMyN5pP4K2tvUD8qHJ+gGe2Bw2A==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/signature-v4": "^4.2.2",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/methods": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-            "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift-data/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.693.0.tgz",
+            "integrity": "sha512-sL8MvwNJU7ZpD7/d2VVb3by1GknIJUxzTIgYtVkDVA/ojo+KRQSSHxcj0EWWXF5DTSh2Tm+LrEug3y1ZyKHsDA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-stream": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.6"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/microbuffer": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/microbuffer/-/microbuffer-1.0.0.tgz",
-            "integrity": "sha512-O/SUXauVN4x6RaEJFqSPcXNtLFL+QzJHKZlyDVYFwcDDRVca3Fa/37QXXC+4zAGGa4YhHrHxKXuuHvLDIQECtA==",
-            "dev": true
-        },
-        "node_modules/micromatch": {
-            "version": "4.0.4",
-            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-            "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift-data/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.693.0.tgz",
+            "integrity": "sha512-kvaa4mXhCCOuW7UQnBhYqYfgWmwy7WSBSDClutwSLPZvgrhYj2l16SD2lN4IfYdxARYMJJ1lFYp3/jJG/9Yk4Q==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "braces": "^3.0.1",
-                "picomatch": "^2.2.3"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8.6"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/mime": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-            "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-            "dev": true,
-            "bin": {
-                "mime": "cli.js"
+        "node_modules/@aws-sdk/client-redshift-data/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.693.0.tgz",
+            "integrity": "sha512-42WMsBjTNnjYxYuM3qD/Nq+8b7UdMopUq5OduMDxoM3mFTV6PXMMnfI4Z1TNnR4tYRvPXAnuNltF6xmjKbSJRA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-ini": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/mime-db": {
-            "version": "1.52.0",
-            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-            "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+        "node_modules/@aws-sdk/client-redshift-data/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.693.0.tgz",
+            "integrity": "sha512-479UlJxY+BFjj3pJFYUNC0DCMrykuG7wBAXfsvZqQxKUa83DnH5Q1ID/N2hZLkxjGd4ZW0AC3lTOMxFelGzzpQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/client-sso": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/token-providers": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.6"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/mime-types": {
-            "version": "2.1.35",
-            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-            "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+        "node_modules/@aws-sdk/client-redshift-data/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.693.0.tgz",
+            "integrity": "sha512-8LB210Pr6VeCiSb2hIra+sAH4KUBLyGaN50axHtIgufVK8jbKIctTZcVY5TO9Se+1107TsruzeXS7VeqVdJfFA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "mime-db": "1.52.0"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.6"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/mimic-fn": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-            "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift-data/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.693.0.tgz",
+            "integrity": "sha512-BCki6sAZ5jYwIN/t3ElCiwerHad69ipHwPsDCxJQyeiOnJ8HG+lEpnVIfrnI8A0fLQNSF3Gtx6ahfBpKiv1Oug==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/mimic-response": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-            "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+        "node_modules/@aws-sdk/client-redshift-data/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.693.0.tgz",
+            "integrity": "sha512-dXnXDPr+wIiJ1TLADACI1g9pkSB21KkMIko2u4CJ2JCBoxi5IqeTnVoa6YcC8GdFNVRl+PorZ3Zqfmf1EOTC6w==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=4"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/min-indent": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-            "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift-data/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.693.0.tgz",
+            "integrity": "sha512-0LDmM+VxXp0u3rG0xQRWD/q6Ubi7G8I44tBPahevD5CaiDZTkmNTrVUf0VEJgVe0iCKBppACMBDkLB0/ETqkFw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=4"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/minimalistic-assert": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-            "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-            "dev": true
-        },
-        "node_modules/minimatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift-data/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.693.0.tgz",
+            "integrity": "sha512-/KUq/KEpFFbQmNmpp7SpAtFAdViquDfD2W0QcG07zYBfz9MwE2ig48ALynXm5sMpRmnG7sJXjdvPtTsSVPfkiw==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "brace-expansion": "^1.1.7"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "*"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/minimist": {
-            "version": "1.2.6",
-            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-            "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
-        },
-        "node_modules/minimist-options": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
-            "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift-data/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.693.0.tgz",
+            "integrity": "sha512-YLUkMsUY0GLW/nfwlZ69cy1u07EZRmsv8Z9m0qW317/EZaVx59hcvmcvb+W4bFqj5E8YImTjoGfE4cZ0F9mkyw==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "arrify": "^1.0.1",
-                "is-plain-obj": "^1.1.0",
-                "kind-of": "^6.0.3"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-config-provider": "^3.0.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 6"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/minimist-options/node_modules/arrify": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-            "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift-data/node_modules/@aws-sdk/token-providers": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.693.0.tgz",
+            "integrity": "sha512-nDBTJMk1l/YmFULGfRbToOA2wjf+FkQT4dMgYCv+V9uSYsMzQj8A7Tha2dz9yv4vnQgYaEiErQ8d7HVyXcVEoA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sso-oidc": "^3.693.0"
             }
         },
-        "node_modules/minimist-options/node_modules/is-plain-obj": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-            "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift-data/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.693.0.tgz",
+            "integrity": "sha512-eo4F6DRQ/kxS3gxJpLRv+aDNy76DxQJL5B3DPzpr9Vkq0ygVoi4GT5oIZLVaAVIJmi6k5qq9dLsYZfWLUxJJSg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-endpoints": "^2.1.5",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/mkdirp": {
-            "version": "0.5.5",
-            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-            "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+        "node_modules/@aws-sdk/client-redshift-data/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.693.0.tgz",
+            "integrity": "sha512-6EUfuKOujtddy18OLJUaXfKBgs+UcbZ6N/3QV4iOkubCUdeM1maIqs++B9bhCbWeaeF5ORizJw5FTwnyNjE/mw==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "minimist": "^1.2.5"
-            },
-            "bin": {
-                "mkdirp": "bin/cmd.js"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/mkdirp-classic": {
-            "version": "0.5.3",
-            "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-            "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
-            "dev": true
-        },
-        "node_modules/mocha": {
-            "version": "10.1.0",
-            "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.1.0.tgz",
-            "integrity": "sha512-vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift-data/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.693.0.tgz",
+            "integrity": "sha512-td0OVX8m5ZKiXtecIDuzY3Y3UZIzvxEr57Hp21NOwieqKCG2UeyQWWeGPv0FQaU7dpTkvFmVNI+tx9iB8V/Nhg==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "ansi-colors": "4.1.1",
-                "browser-stdout": "1.3.1",
-                "chokidar": "3.5.3",
-                "debug": "4.3.4",
-                "diff": "5.0.0",
-                "escape-string-regexp": "4.0.0",
-                "find-up": "5.0.0",
-                "glob": "7.2.0",
-                "he": "1.2.0",
-                "js-yaml": "4.1.0",
-                "log-symbols": "4.1.0",
-                "minimatch": "5.0.1",
-                "ms": "2.1.3",
-                "nanoid": "3.3.3",
-                "serialize-javascript": "6.0.0",
-                "strip-json-comments": "3.1.1",
-                "supports-color": "8.1.1",
-                "workerpool": "6.2.1",
-                "yargs": "16.2.0",
-                "yargs-parser": "20.2.4",
-                "yargs-unparser": "2.0.0"
-            },
-            "bin": {
-                "_mocha": "bin/_mocha",
-                "mocha": "bin/mocha.js"
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 14.0.0"
+                "node": ">=16.0.0"
             },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/mochajs"
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
             }
         },
-        "node_modules/mocha-junit-reporter": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-2.0.2.tgz",
-            "integrity": "sha512-vYwWq5hh3v1lG0gdQCBxwNipBfvDiAM1PHroQRNp96+2l72e9wEUTw+mzoK+O0SudgfQ7WvTQZ9Nh3qkAYAjfg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift-data/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+            "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "debug": "^2.2.0",
-                "md5": "^2.1.0",
-                "mkdirp": "~0.5.1",
-                "strip-ansi": "^6.0.1",
-                "xml": "^1.0.0"
+                "tslib": "^2.6.2"
             },
-            "peerDependencies": {
-                "mocha": ">=2.2.5"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/mocha-junit-reporter/node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift-data/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+            "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/mocha-junit-reporter/node_modules/debug": {
-            "version": "2.6.9",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift-data/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+            "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "ms": "2.0.0"
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/mocha-junit-reporter/node_modules/ms": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-            "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-            "dev": true
+        "node_modules/@aws-sdk/client-redshift-serverless": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-redshift-serverless/-/client-redshift-serverless-3.693.0.tgz",
+            "integrity": "sha512-m6Bhw0Xx/x0KGKP9N7c+Jqs5VT6nkZbfwO+QTxllggsuNfAzGwluCw1hoY++/MQ9oFtioEu+ud7xWOlTIK8w/A==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/client-sts": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-redshift-serverless/node_modules/@aws-sdk/client-sso": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.693.0.tgz",
+            "integrity": "sha512-QEynrBC26x6TG9ZMzApR/kZ3lmt4lEIs2D+cHuDxt6fDGzahBUsQFBwJqhizzsM97JJI5YvmJhmihoYjdSSaXA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-redshift-serverless/node_modules/@aws-sdk/client-sso-oidc": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.693.0.tgz",
+            "integrity": "sha512-UEDbYlYtK/e86OOMyFR4zEPyenIxDzO2DRdz3fwVW7RzZ94wfmSwBh/8skzPTuY1G7sI064cjHW0b0QG01Sdtg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
+            }
         },
-        "node_modules/mocha-junit-reporter/node_modules/strip-ansi": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift-serverless/node_modules/@aws-sdk/client-sts": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.693.0.tgz",
+            "integrity": "sha512-4S2y7VEtvdnjJX4JPl4kDQlslxXEZFnC50/UXVUYSt/AMc5A/GgspFNA5FVz4E3Gwpfobbf23hR2NBF8AGvYoQ==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "ansi-regex": "^5.0.1"
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-redshift-serverless/node_modules/@aws-sdk/core": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.693.0.tgz",
+            "integrity": "sha512-v6Z/kWmLFqRLDPEwl9hJGhtTgIFHjZugSfF1Yqffdxf4n1AWgtHS7qSegakuMyN5pP4K2tvUD8qHJ+gGe2Bw2A==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/signature-v4": "^4.2.2",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/mocha-multi-reporters": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/mocha-multi-reporters/-/mocha-multi-reporters-1.5.1.tgz",
-            "integrity": "sha512-Yb4QJOaGLIcmB0VY7Wif5AjvLMUFAdV57D2TWEva1Y0kU/3LjKpeRVmlMIfuO1SVbauve459kgtIizADqxMWPg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift-serverless/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.693.0.tgz",
+            "integrity": "sha512-sL8MvwNJU7ZpD7/d2VVb3by1GknIJUxzTIgYtVkDVA/ojo+KRQSSHxcj0EWWXF5DTSh2Tm+LrEug3y1ZyKHsDA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "debug": "^4.1.1",
-                "lodash": "^4.17.15"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-stream": "^3.3.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6.0.0"
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-redshift-serverless/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.693.0.tgz",
+            "integrity": "sha512-kvaa4mXhCCOuW7UQnBhYqYfgWmwy7WSBSDClutwSLPZvgrhYj2l16SD2lN4IfYdxARYMJJ1lFYp3/jJG/9Yk4Q==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             },
             "peerDependencies": {
-                "mocha": ">=3.1.2"
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/mocha/node_modules/brace-expansion": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift-serverless/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.693.0.tgz",
+            "integrity": "sha512-42WMsBjTNnjYxYuM3qD/Nq+8b7UdMopUq5OduMDxoM3mFTV6PXMMnfI4Z1TNnR4tYRvPXAnuNltF6xmjKbSJRA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "balanced-match": "^1.0.0"
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-ini": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/mocha/node_modules/minimatch": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
-            "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift-serverless/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.693.0.tgz",
+            "integrity": "sha512-479UlJxY+BFjj3pJFYUNC0DCMrykuG7wBAXfsvZqQxKUa83DnH5Q1ID/N2hZLkxjGd4ZW0AC3lTOMxFelGzzpQ==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "brace-expansion": "^2.0.1"
+                "@aws-sdk/client-sso": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/token-providers": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/mocha/node_modules/ms": {
-            "version": "2.1.3",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-            "dev": true
-        },
-        "node_modules/mocha/node_modules/supports-color": {
-            "version": "8.1.1",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-            "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift-serverless/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.693.0.tgz",
+            "integrity": "sha512-8LB210Pr6VeCiSb2hIra+sAH4KUBLyGaN50axHtIgufVK8jbKIctTZcVY5TO9Se+1107TsruzeXS7VeqVdJfFA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "has-flag": "^4.0.0"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=16.0.0"
             },
-            "funding": {
-                "url": "https://github.com/chalk/supports-color?sponsor=1"
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/mocha/node_modules/yargs": {
-            "version": "16.2.0",
-            "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-            "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift-serverless/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.693.0.tgz",
+            "integrity": "sha512-BCki6sAZ5jYwIN/t3ElCiwerHad69ipHwPsDCxJQyeiOnJ8HG+lEpnVIfrnI8A0fLQNSF3Gtx6ahfBpKiv1Oug==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "cliui": "^7.0.2",
-                "escalade": "^3.1.1",
-                "get-caller-file": "^2.0.5",
-                "require-directory": "^2.1.1",
-                "string-width": "^4.2.0",
-                "y18n": "^5.0.5",
-                "yargs-parser": "^20.2.2"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/moment": {
-            "version": "2.29.4",
-            "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-            "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
+        "node_modules/@aws-sdk/client-redshift-serverless/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.693.0.tgz",
+            "integrity": "sha512-dXnXDPr+wIiJ1TLADACI1g9pkSB21KkMIko2u4CJ2JCBoxi5IqeTnVoa6YcC8GdFNVRl+PorZ3Zqfmf1EOTC6w==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": "*"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/mri": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz",
-            "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift-serverless/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.693.0.tgz",
+            "integrity": "sha512-0LDmM+VxXp0u3rG0xQRWD/q6Ubi7G8I44tBPahevD5CaiDZTkmNTrVUf0VEJgVe0iCKBppACMBDkLB0/ETqkFw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=4"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/ms": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        },
-        "node_modules/multicast-dns": {
-            "version": "7.2.5",
-            "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
-            "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift-serverless/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.693.0.tgz",
+            "integrity": "sha512-/KUq/KEpFFbQmNmpp7SpAtFAdViquDfD2W0QcG07zYBfz9MwE2ig48ALynXm5sMpRmnG7sJXjdvPtTsSVPfkiw==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "dns-packet": "^5.2.2",
-                "thunky": "^1.0.2"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
-            "bin": {
-                "multicast-dns": "cli.js"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/multimatch": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-4.0.0.tgz",
-            "integrity": "sha512-lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift-serverless/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.693.0.tgz",
+            "integrity": "sha512-YLUkMsUY0GLW/nfwlZ69cy1u07EZRmsv8Z9m0qW317/EZaVx59hcvmcvb+W4bFqj5E8YImTjoGfE4cZ0F9mkyw==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@types/minimatch": "^3.0.3",
-                "array-differ": "^3.0.0",
-                "array-union": "^2.1.0",
-                "arrify": "^2.0.1",
-                "minimatch": "^3.0.4"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-config-provider": "^3.0.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/mute-stream": {
-            "version": "0.0.8",
-            "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-            "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-            "dev": true
-        },
-        "node_modules/mvdan-sh": {
-            "version": "0.5.0",
-            "resolved": "https://registry.npmjs.org/mvdan-sh/-/mvdan-sh-0.5.0.tgz",
-            "integrity": "sha512-UWbdl4LHd2fUnaEcOUFVWRdWGLkNoV12cKVIPiirYd8qM5VkCoCTXErlDubevrkEG7kGohvjRxAlTQmOqG80tw==",
-            "dev": true
-        },
-        "node_modules/mz": {
-            "version": "2.7.0",
-            "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
-            "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift-serverless/node_modules/@aws-sdk/token-providers": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.693.0.tgz",
+            "integrity": "sha512-nDBTJMk1l/YmFULGfRbToOA2wjf+FkQT4dMgYCv+V9uSYsMzQj8A7Tha2dz9yv4vnQgYaEiErQ8d7HVyXcVEoA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "any-promise": "^1.0.0",
-                "object-assign": "^4.0.1",
-                "thenify-all": "^1.0.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sso-oidc": "^3.693.0"
             }
         },
-        "node_modules/nanoid": {
-            "version": "3.3.3",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
-            "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==",
-            "bin": {
-                "nanoid": "bin/nanoid.cjs"
+        "node_modules/@aws-sdk/client-redshift-serverless/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.693.0.tgz",
+            "integrity": "sha512-eo4F6DRQ/kxS3gxJpLRv+aDNy76DxQJL5B3DPzpr9Vkq0ygVoi4GT5oIZLVaAVIJmi6k5qq9dLsYZfWLUxJJSg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-endpoints": "^2.1.5",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/napi-build-utils": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
-            "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
-            "dev": true
+        "node_modules/@aws-sdk/client-redshift-serverless/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.693.0.tgz",
+            "integrity": "sha512-6EUfuKOujtddy18OLJUaXfKBgs+UcbZ6N/3QV4iOkubCUdeM1maIqs++B9bhCbWeaeF5ORizJw5FTwnyNjE/mw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
+            }
         },
-        "node_modules/natural-compare": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-            "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-            "dev": true
+        "node_modules/@aws-sdk/client-redshift-serverless/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.693.0.tgz",
+            "integrity": "sha512-td0OVX8m5ZKiXtecIDuzY3Y3UZIzvxEr57Hp21NOwieqKCG2UeyQWWeGPv0FQaU7dpTkvFmVNI+tx9iB8V/Nhg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
+            }
         },
-        "node_modules/neatequal": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/neatequal/-/neatequal-1.0.0.tgz",
-            "integrity": "sha512-sVt5awO4a4w24QmAthdrCPiVRW3naB8FGLdyadin01BH+6BzNPEBwGrpwCczQvPlULS6uXTItTe1PJ5P0kYm7A==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift-serverless/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+            "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "varstream": "^0.3.2"
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/negotiator": {
-            "version": "0.6.3",
-            "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-            "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift-serverless/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+            "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.6"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/neo-async": {
-            "version": "2.6.2",
-            "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-            "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-            "dev": true
+        "node_modules/@aws-sdk/client-redshift-serverless/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+            "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "node_modules/next-tick": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
-            "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
-            "dev": true
-        },
-        "node_modules/nise": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.1.tgz",
-            "integrity": "sha512-yr5kW2THW1AkxVmCnKEh4nbYkJdB3I7LUkiUgOvEkOp414mc2UMaHMA7pjq1nYowhdoJZGwEKGaQVbxfpWj10A==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift/node_modules/@aws-sdk/client-sso": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.693.0.tgz",
+            "integrity": "sha512-QEynrBC26x6TG9ZMzApR/kZ3lmt4lEIs2D+cHuDxt6fDGzahBUsQFBwJqhizzsM97JJI5YvmJhmihoYjdSSaXA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@sinonjs/commons": "^1.8.3",
-                "@sinonjs/fake-timers": ">=5",
-                "@sinonjs/text-encoding": "^0.7.1",
-                "just-extend": "^4.0.2",
-                "path-to-regexp": "^1.7.0"
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-redshift/node_modules/@aws-sdk/client-sso-oidc": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.693.0.tgz",
+            "integrity": "sha512-UEDbYlYtK/e86OOMyFR4zEPyenIxDzO2DRdz3fwVW7RzZ94wfmSwBh/8skzPTuY1G7sI064cjHW0b0QG01Sdtg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/node-abi": {
-            "version": "2.30.1",
-            "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz",
-            "integrity": "sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift/node_modules/@aws-sdk/client-sts": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.693.0.tgz",
+            "integrity": "sha512-4S2y7VEtvdnjJX4JPl4kDQlslxXEZFnC50/UXVUYSt/AMc5A/GgspFNA5FVz4E3Gwpfobbf23hR2NBF8AGvYoQ==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "semver": "^5.4.1"
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-redshift/node_modules/@aws-sdk/core": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.693.0.tgz",
+            "integrity": "sha512-v6Z/kWmLFqRLDPEwl9hJGhtTgIFHjZugSfF1Yqffdxf4n1AWgtHS7qSegakuMyN5pP4K2tvUD8qHJ+gGe2Bw2A==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/signature-v4": "^4.2.2",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/node-abi/node_modules/semver": {
-            "version": "5.7.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-            "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-            "dev": true,
-            "bin": {
-                "semver": "bin/semver"
+        "node_modules/@aws-sdk/client-redshift/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.693.0.tgz",
+            "integrity": "sha512-sL8MvwNJU7ZpD7/d2VVb3by1GknIJUxzTIgYtVkDVA/ojo+KRQSSHxcj0EWWXF5DTSh2Tm+LrEug3y1ZyKHsDA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-stream": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/node-addon-api": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-            "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
-            "dev": true
-        },
-        "node_modules/node-forge": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-            "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.693.0.tgz",
+            "integrity": "sha512-kvaa4mXhCCOuW7UQnBhYqYfgWmwy7WSBSDClutwSLPZvgrhYj2l16SD2lN4IfYdxARYMJJ1lFYp3/jJG/9Yk4Q==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 6.13.0"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/node-preload": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz",
-            "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.693.0.tgz",
+            "integrity": "sha512-42WMsBjTNnjYxYuM3qD/Nq+8b7UdMopUq5OduMDxoM3mFTV6PXMMnfI4Z1TNnR4tYRvPXAnuNltF6xmjKbSJRA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "process-on-spawn": "^1.0.0"
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-ini": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/node-releases": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.2.tgz",
-            "integrity": "sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==",
-            "dev": true
-        },
-        "node_modules/normalize-package-data": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
-            "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.693.0.tgz",
+            "integrity": "sha512-479UlJxY+BFjj3pJFYUNC0DCMrykuG7wBAXfsvZqQxKUa83DnH5Q1ID/N2hZLkxjGd4ZW0AC3lTOMxFelGzzpQ==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "hosted-git-info": "^4.0.1",
-                "is-core-module": "^2.5.0",
-                "semver": "^7.3.4",
-                "validate-npm-package-license": "^3.0.1"
+                "@aws-sdk/client-sso": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/token-providers": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/normalize-path": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.693.0.tgz",
+            "integrity": "sha512-8LB210Pr6VeCiSb2hIra+sAH4KUBLyGaN50axHtIgufVK8jbKIctTZcVY5TO9Se+1107TsruzeXS7VeqVdJfFA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/normalize-url": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-            "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+        "node_modules/@aws-sdk/client-redshift/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.693.0.tgz",
+            "integrity": "sha512-BCki6sAZ5jYwIN/t3ElCiwerHad69ipHwPsDCxJQyeiOnJ8HG+lEpnVIfrnI8A0fLQNSF3Gtx6ahfBpKiv1Oug==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=10"
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-redshift/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.693.0.tgz",
+            "integrity": "sha512-dXnXDPr+wIiJ1TLADACI1g9pkSB21KkMIko2u4CJ2JCBoxi5IqeTnVoa6YcC8GdFNVRl+PorZ3Zqfmf1EOTC6w==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/npm-run-path": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-            "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.693.0.tgz",
+            "integrity": "sha512-0LDmM+VxXp0u3rG0xQRWD/q6Ubi7G8I44tBPahevD5CaiDZTkmNTrVUf0VEJgVe0iCKBppACMBDkLB0/ETqkFw==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "path-key": "^3.0.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/npmlog": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-            "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.693.0.tgz",
+            "integrity": "sha512-/KUq/KEpFFbQmNmpp7SpAtFAdViquDfD2W0QcG07zYBfz9MwE2ig48ALynXm5sMpRmnG7sJXjdvPtTsSVPfkiw==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "are-we-there-yet": "~1.1.2",
-                "console-control-strings": "~1.1.0",
-                "gauge": "~2.7.3",
-                "set-blocking": "~2.0.0"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/nth-check": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
-            "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.693.0.tgz",
+            "integrity": "sha512-YLUkMsUY0GLW/nfwlZ69cy1u07EZRmsv8Z9m0qW317/EZaVx59hcvmcvb+W4bFqj5E8YImTjoGfE4cZ0F9mkyw==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "boolbase": "^1.0.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-config-provider": "^3.0.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/fb55/nth-check?sponsor=1"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/number-is-nan": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-            "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift/node_modules/@aws-sdk/token-providers": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.693.0.tgz",
+            "integrity": "sha512-nDBTJMk1l/YmFULGfRbToOA2wjf+FkQT4dMgYCv+V9uSYsMzQj8A7Tha2dz9yv4vnQgYaEiErQ8d7HVyXcVEoA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sso-oidc": "^3.693.0"
             }
         },
-        "node_modules/nunjucks": {
-            "version": "3.2.3",
-            "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.3.tgz",
-            "integrity": "sha512-psb6xjLj47+fE76JdZwskvwG4MYsQKXUtMsPh6U0YMvmyjRtKRFcxnlXGWglNybtNTNVmGdp94K62/+NjF5FDQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.693.0.tgz",
+            "integrity": "sha512-eo4F6DRQ/kxS3gxJpLRv+aDNy76DxQJL5B3DPzpr9Vkq0ygVoi4GT5oIZLVaAVIJmi6k5qq9dLsYZfWLUxJJSg==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "a-sync-waterfall": "^1.0.0",
-                "asap": "^2.0.3",
-                "commander": "^5.1.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-endpoints": "^2.1.5",
+                "tslib": "^2.6.2"
             },
-            "bin": {
-                "nunjucks-precompile": "bin/precompile"
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-redshift/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.693.0.tgz",
+            "integrity": "sha512-6EUfuKOujtddy18OLJUaXfKBgs+UcbZ6N/3QV4iOkubCUdeM1maIqs++B9bhCbWeaeF5ORizJw5FTwnyNjE/mw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
+            }
+        },
+        "node_modules/@aws-sdk/client-redshift/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.693.0.tgz",
+            "integrity": "sha512-td0OVX8m5ZKiXtecIDuzY3Y3UZIzvxEr57Hp21NOwieqKCG2UeyQWWeGPv0FQaU7dpTkvFmVNI+tx9iB8V/Nhg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 6.9.0"
+                "node": ">=16.0.0"
             },
             "peerDependencies": {
-                "chokidar": "^3.3.0"
+                "aws-crt": ">=1.0.0"
             },
             "peerDependenciesMeta": {
-                "chokidar": {
+                "aws-crt": {
                     "optional": true
                 }
             }
         },
-        "node_modules/nunjucks/node_modules/commander": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
-            "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+            "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 6"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/nyc": {
-            "version": "15.1.0",
-            "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz",
-            "integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+            "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@istanbuljs/load-nyc-config": "^1.0.0",
-                "@istanbuljs/schema": "^0.1.2",
-                "caching-transform": "^4.0.0",
-                "convert-source-map": "^1.7.0",
-                "decamelize": "^1.2.0",
-                "find-cache-dir": "^3.2.0",
-                "find-up": "^4.1.0",
-                "foreground-child": "^2.0.0",
-                "get-package-type": "^0.1.0",
-                "glob": "^7.1.6",
-                "istanbul-lib-coverage": "^3.0.0",
-                "istanbul-lib-hook": "^3.0.0",
-                "istanbul-lib-instrument": "^4.0.0",
-                "istanbul-lib-processinfo": "^2.0.2",
-                "istanbul-lib-report": "^3.0.0",
-                "istanbul-lib-source-maps": "^4.0.0",
-                "istanbul-reports": "^3.0.2",
-                "make-dir": "^3.0.0",
-                "node-preload": "^0.2.1",
-                "p-map": "^3.0.0",
-                "process-on-spawn": "^1.0.0",
-                "resolve-from": "^5.0.0",
-                "rimraf": "^3.0.0",
-                "signal-exit": "^3.0.2",
-                "spawn-wrap": "^2.0.0",
-                "test-exclude": "^6.0.0",
-                "yargs": "^15.0.2"
-            },
-            "bin": {
-                "nyc": "bin/nyc.js"
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8.9"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/nyc/node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-redshift/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+            "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/nyc/node_modules/camelcase": {
-            "version": "5.3.1",
-            "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-            "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha1-browser": "5.2.0",
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/client-sts": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-bucket-endpoint": "3.693.0",
+                "@aws-sdk/middleware-expect-continue": "3.693.0",
+                "@aws-sdk/middleware-flexible-checksums": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-location-constraint": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-sdk-s3": "3.693.0",
+                "@aws-sdk/middleware-ssec": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/signature-v4-multi-region": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@aws-sdk/xml-builder": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/eventstream-serde-browser": "^3.0.12",
+                "@smithy/eventstream-serde-config-resolver": "^3.0.9",
+                "@smithy/eventstream-serde-node": "^3.0.11",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-blob-browser": "^3.1.8",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/hash-stream-node": "^3.1.8",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/md5-js": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-stream": "^3.3.0",
+                "@smithy/util-utf8": "^3.0.0",
+                "@smithy/util-waiter": "^3.1.8",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-s3-control": {
+            "version": "3.859.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-s3-control/-/client-s3-control-3.859.0.tgz",
+            "integrity": "sha512-vzhOtDH4BCdn30+Crg1QxGXbhZIh4Ia84/qNx2EtupkM2UrO6uaZ91qGl175QWU4TcG+mlf/yA/bvrwenhbF6w==",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.858.0",
+                "@aws-sdk/credential-provider-node": "3.859.0",
+                "@aws-sdk/middleware-bucket-endpoint": "3.840.0",
+                "@aws-sdk/middleware-host-header": "3.840.0",
+                "@aws-sdk/middleware-logger": "3.840.0",
+                "@aws-sdk/middleware-recursion-detection": "3.840.0",
+                "@aws-sdk/middleware-sdk-s3-control": "3.848.0",
+                "@aws-sdk/middleware-user-agent": "3.858.0",
+                "@aws-sdk/region-config-resolver": "3.840.0",
+                "@aws-sdk/types": "3.840.0",
+                "@aws-sdk/util-endpoints": "3.848.0",
+                "@aws-sdk/util-user-agent-browser": "3.840.0",
+                "@aws-sdk/util-user-agent-node": "3.858.0",
+                "@aws-sdk/xml-builder": "3.821.0",
+                "@smithy/config-resolver": "^4.1.4",
+                "@smithy/core": "^3.7.2",
+                "@smithy/fetch-http-handler": "^5.1.0",
+                "@smithy/hash-blob-browser": "^4.0.4",
+                "@smithy/hash-node": "^4.0.4",
+                "@smithy/hash-stream-node": "^4.0.4",
+                "@smithy/invalid-dependency": "^4.0.4",
+                "@smithy/md5-js": "^4.0.4",
+                "@smithy/middleware-apply-body-checksum": "^4.1.2",
+                "@smithy/middleware-content-length": "^4.0.4",
+                "@smithy/middleware-endpoint": "^4.1.17",
+                "@smithy/middleware-retry": "^4.1.18",
+                "@smithy/middleware-serde": "^4.0.8",
+                "@smithy/middleware-stack": "^4.0.4",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/node-http-handler": "^4.1.0",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/smithy-client": "^4.4.9",
+                "@smithy/types": "^4.3.1",
+                "@smithy/url-parser": "^4.0.4",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.25",
+                "@smithy/util-defaults-mode-node": "^4.0.25",
+                "@smithy/util-endpoints": "^3.0.6",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-retry": "^4.0.6",
+                "@smithy/util-utf8": "^4.0.0",
+                "@types/uuid": "^9.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@aws-sdk/client-sso": {
+            "version": "3.858.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.858.0.tgz",
+            "integrity": "sha512-iXuZQs4KH6a3Pwnt0uORalzAZ5EXRPr3lBYAsdNwkP8OYyoUz5/TE3BLyw7ceEh0rj4QKGNnNALYo1cDm0EV8w==",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.858.0",
+                "@aws-sdk/middleware-host-header": "3.840.0",
+                "@aws-sdk/middleware-logger": "3.840.0",
+                "@aws-sdk/middleware-recursion-detection": "3.840.0",
+                "@aws-sdk/middleware-user-agent": "3.858.0",
+                "@aws-sdk/region-config-resolver": "3.840.0",
+                "@aws-sdk/types": "3.840.0",
+                "@aws-sdk/util-endpoints": "3.848.0",
+                "@aws-sdk/util-user-agent-browser": "3.840.0",
+                "@aws-sdk/util-user-agent-node": "3.858.0",
+                "@smithy/config-resolver": "^4.1.4",
+                "@smithy/core": "^3.7.2",
+                "@smithy/fetch-http-handler": "^5.1.0",
+                "@smithy/hash-node": "^4.0.4",
+                "@smithy/invalid-dependency": "^4.0.4",
+                "@smithy/middleware-content-length": "^4.0.4",
+                "@smithy/middleware-endpoint": "^4.1.17",
+                "@smithy/middleware-retry": "^4.1.18",
+                "@smithy/middleware-serde": "^4.0.8",
+                "@smithy/middleware-stack": "^4.0.4",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/node-http-handler": "^4.1.0",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/smithy-client": "^4.4.9",
+                "@smithy/types": "^4.3.1",
+                "@smithy/url-parser": "^4.0.4",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.25",
+                "@smithy/util-defaults-mode-node": "^4.0.25",
+                "@smithy/util-endpoints": "^3.0.6",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-retry": "^4.0.6",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@aws-sdk/core": {
+            "version": "3.858.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.858.0.tgz",
+            "integrity": "sha512-iWm4QLAS+/XMlnecIU1Y33qbBr1Ju+pmWam3xVCPlY4CSptKpVY+2hXOnmg9SbHAX9C005fWhrIn51oDd00c9A==",
+            "dependencies": {
+                "@aws-sdk/types": "3.840.0",
+                "@aws-sdk/xml-builder": "3.821.0",
+                "@smithy/core": "^3.7.2",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/signature-v4": "^5.1.2",
+                "@smithy/smithy-client": "^4.4.9",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-utf8": "^4.0.0",
+                "fast-xml-parser": "5.2.5",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@aws-sdk/credential-provider-env": {
+            "version": "3.858.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.858.0.tgz",
+            "integrity": "sha512-kZsGyh2BoSRguzlcGtzdLhw/l/n3KYAC+/l/H0SlsOq3RLHF6tO/cRdsLnwoix2bObChHUp03cex63o1gzdx/Q==",
+            "dependencies": {
+                "@aws-sdk/core": "3.858.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.858.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.858.0.tgz",
+            "integrity": "sha512-GDnfYl3+NPJQ7WQQYOXEA489B212NinpcIDD7rpsB6IWUPo8yDjT5NceK4uUkIR3MFpNCGt9zd/z6NNLdB2fuQ==",
+            "dependencies": {
+                "@aws-sdk/core": "3.858.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/fetch-http-handler": "^5.1.0",
+                "@smithy/node-http-handler": "^4.1.0",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/smithy-client": "^4.4.9",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-stream": "^4.2.3",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.859.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.859.0.tgz",
+            "integrity": "sha512-KsccE1T88ZDNhsABnqbQj014n5JMDilAroUErFbGqu5/B3sXqUsYmG54C/BjvGTRUFfzyttK9lB9P9h6ddQ8Cw==",
+            "dependencies": {
+                "@aws-sdk/core": "3.858.0",
+                "@aws-sdk/credential-provider-env": "3.858.0",
+                "@aws-sdk/credential-provider-http": "3.858.0",
+                "@aws-sdk/credential-provider-process": "3.858.0",
+                "@aws-sdk/credential-provider-sso": "3.859.0",
+                "@aws-sdk/credential-provider-web-identity": "3.858.0",
+                "@aws-sdk/nested-clients": "3.858.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/credential-provider-imds": "^4.0.6",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/shared-ini-file-loader": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/nyc/node_modules/cliui": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-            "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.859.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.859.0.tgz",
+            "integrity": "sha512-ZRDB2xU5aSyTR/jDcli30tlycu6RFvQngkZhBs9Zoh2BiYXrfh2MMuoYuZk+7uD6D53Q2RIEldDHR9A/TPlRuA==",
             "dependencies": {
-                "string-width": "^4.2.0",
-                "strip-ansi": "^6.0.0",
-                "wrap-ansi": "^6.2.0"
+                "@aws-sdk/credential-provider-env": "3.858.0",
+                "@aws-sdk/credential-provider-http": "3.858.0",
+                "@aws-sdk/credential-provider-ini": "3.859.0",
+                "@aws-sdk/credential-provider-process": "3.858.0",
+                "@aws-sdk/credential-provider-sso": "3.859.0",
+                "@aws-sdk/credential-provider-web-identity": "3.858.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/credential-provider-imds": "^4.0.6",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/shared-ini-file-loader": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/nyc/node_modules/decamelize": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-            "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@aws-sdk/credential-provider-process": {
+            "version": "3.858.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.858.0.tgz",
+            "integrity": "sha512-l5LJWZJMRaZ+LhDjtupFUKEC5hAjgvCRrOvV5T60NCUBOy0Ozxa7Sgx3x+EOwiruuoh3Cn9O+RlbQlJX6IfZIw==",
+            "dependencies": {
+                "@aws-sdk/core": "3.858.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/shared-ini-file-loader": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/nyc/node_modules/find-up": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-            "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.859.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.859.0.tgz",
+            "integrity": "sha512-BwAqmWIivhox5YlFRjManFF8GoTvEySPk6vsJNxDsmGsabY+OQovYxFIYxRCYiHzH7SFjd4Lcd+riJOiXNsvRw==",
             "dependencies": {
-                "locate-path": "^5.0.0",
-                "path-exists": "^4.0.0"
+                "@aws-sdk/client-sso": "3.858.0",
+                "@aws-sdk/core": "3.858.0",
+                "@aws-sdk/token-providers": "3.859.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/shared-ini-file-loader": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/nyc/node_modules/locate-path": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-            "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.858.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.858.0.tgz",
+            "integrity": "sha512-8iULWsH83iZDdUuiDsRb83M0NqIlXjlDbJUIddVsIrfWp4NmanKw77SV6yOZ66nuJjPsn9j7RDb9bfEPCy5SWA==",
             "dependencies": {
-                "p-locate": "^4.1.0"
+                "@aws-sdk/core": "3.858.0",
+                "@aws-sdk/nested-clients": "3.858.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/nyc/node_modules/p-limit": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-            "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@aws-sdk/middleware-bucket-endpoint": {
+            "version": "3.840.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.840.0.tgz",
+            "integrity": "sha512-+gkQNtPwcSMmlwBHFd4saVVS11In6ID1HczNzpM3MXKXRBfSlbZJbCt6wN//AZ8HMklZEik4tcEOG0qa9UY8SQ==",
             "dependencies": {
-                "p-try": "^2.0.0"
+                "@aws-sdk/types": "3.840.0",
+                "@aws-sdk/util-arn-parser": "3.804.0",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-config-provider": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/nyc/node_modules/p-locate": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-            "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.840.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.840.0.tgz",
+            "integrity": "sha512-ub+hXJAbAje94+Ya6c6eL7sYujoE8D4Bumu1NUI8TXjUhVVn0HzVWQjpRLshdLsUp1AW7XyeJaxyajRaJQ8+Xg==",
             "dependencies": {
-                "p-limit": "^2.2.0"
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/nyc/node_modules/p-map": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
-            "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.840.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.840.0.tgz",
+            "integrity": "sha512-lSV8FvjpdllpGaRspywss4CtXV8M7NNNH+2/j86vMH+YCOZ6fu2T/TyFd/tHwZ92vDfHctWkRbQxg0bagqwovA==",
             "dependencies": {
-                "aggregate-error": "^3.0.0"
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/nyc/node_modules/resolve-from": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-            "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.840.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.840.0.tgz",
+            "integrity": "sha512-Gu7lGDyfddyhIkj1Z1JtrY5NHb5+x/CRiB87GjaSrKxkDaydtX2CU977JIABtt69l9wLbcGDIQ+W0uJ5xPof7g==",
+            "dependencies": {
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/nyc/node_modules/strip-ansi": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.858.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.858.0.tgz",
+            "integrity": "sha512-pC3FT/sRZ6n5NyXiTVu9dpf1D9j3YbJz3XmeOOwJqO/Mib2PZyIQktvNMPgwaC5KMVB1zWqS5bmCwxpMOnq0UQ==",
             "dependencies": {
-                "ansi-regex": "^5.0.1"
+                "@aws-sdk/core": "3.858.0",
+                "@aws-sdk/types": "3.840.0",
+                "@aws-sdk/util-endpoints": "3.848.0",
+                "@smithy/core": "^3.7.2",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/nyc/node_modules/wrap-ansi": {
-            "version": "6.2.0",
-            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-            "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@aws-sdk/nested-clients": {
+            "version": "3.858.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.858.0.tgz",
+            "integrity": "sha512-ChdIj80T2whoWbovmO7o8ICmhEB2S9q4Jes9MBnKAPm69PexcJAK2dQC8yI4/iUP8b3+BHZoUPrYLWjBxIProQ==",
             "dependencies": {
-                "ansi-styles": "^4.0.0",
-                "string-width": "^4.1.0",
-                "strip-ansi": "^6.0.0"
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.858.0",
+                "@aws-sdk/middleware-host-header": "3.840.0",
+                "@aws-sdk/middleware-logger": "3.840.0",
+                "@aws-sdk/middleware-recursion-detection": "3.840.0",
+                "@aws-sdk/middleware-user-agent": "3.858.0",
+                "@aws-sdk/region-config-resolver": "3.840.0",
+                "@aws-sdk/types": "3.840.0",
+                "@aws-sdk/util-endpoints": "3.848.0",
+                "@aws-sdk/util-user-agent-browser": "3.840.0",
+                "@aws-sdk/util-user-agent-node": "3.858.0",
+                "@smithy/config-resolver": "^4.1.4",
+                "@smithy/core": "^3.7.2",
+                "@smithy/fetch-http-handler": "^5.1.0",
+                "@smithy/hash-node": "^4.0.4",
+                "@smithy/invalid-dependency": "^4.0.4",
+                "@smithy/middleware-content-length": "^4.0.4",
+                "@smithy/middleware-endpoint": "^4.1.17",
+                "@smithy/middleware-retry": "^4.1.18",
+                "@smithy/middleware-serde": "^4.0.8",
+                "@smithy/middleware-stack": "^4.0.4",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/node-http-handler": "^4.1.0",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/smithy-client": "^4.4.9",
+                "@smithy/types": "^4.3.1",
+                "@smithy/url-parser": "^4.0.4",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.25",
+                "@smithy/util-defaults-mode-node": "^4.0.25",
+                "@smithy/util-endpoints": "^3.0.6",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-retry": "^4.0.6",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/nyc/node_modules/y18n": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-            "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-            "dev": true
-        },
-        "node_modules/nyc/node_modules/yargs": {
-            "version": "15.4.1",
-            "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-            "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.840.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.840.0.tgz",
+            "integrity": "sha512-Qjnxd/yDv9KpIMWr90ZDPtRj0v75AqGC92Lm9+oHXZ8p1MjG5JE2CW0HL8JRgK9iKzgKBL7pPQRXI8FkvEVfrA==",
             "dependencies": {
-                "cliui": "^6.0.0",
-                "decamelize": "^1.2.0",
-                "find-up": "^4.1.0",
-                "get-caller-file": "^2.0.1",
-                "require-directory": "^2.1.1",
-                "require-main-filename": "^2.0.0",
-                "set-blocking": "^2.0.0",
-                "string-width": "^4.2.0",
-                "which-module": "^2.0.0",
-                "y18n": "^4.0.0",
-                "yargs-parser": "^18.1.2"
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.4",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/nyc/node_modules/yargs-parser": {
-            "version": "18.1.3",
-            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-            "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@aws-sdk/token-providers": {
+            "version": "3.859.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.859.0.tgz",
+            "integrity": "sha512-6P2wlvm9KBWOvRNn0Pt8RntnXg8fzOb5kEShvWsOsAocZeqKNaYbihum5/Onq1ZPoVtkdb++8eWDocDnM4k85Q==",
             "dependencies": {
-                "camelcase": "^5.0.0",
-                "decamelize": "^1.2.0"
+                "@aws-sdk/core": "3.858.0",
+                "@aws-sdk/nested-clients": "3.858.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/shared-ini-file-loader": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/object-assign": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-            "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@aws-sdk/types": {
+            "version": "3.840.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.840.0.tgz",
+            "integrity": "sha512-xliuHaUFZxEx1NSXeLLZ9Dyu6+EJVQKEoD+yM+zqUo3YDZ7medKJWY6fIOKiPX/N7XbLdBYwajb15Q7IL8KkeA==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/object-inspect": {
-            "version": "1.12.2",
-            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-            "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@aws-sdk/util-arn-parser": {
+            "version": "3.804.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.804.0.tgz",
+            "integrity": "sha512-wmBJqn1DRXnZu3b4EkE6CWnoWMo1ZMvlfkqU5zPz67xx1GMaXlDCchFvKAXMjk4jn/L1O3tKnoFDNsoLV1kgNQ==",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/object-keys": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-            "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.848.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.848.0.tgz",
+            "integrity": "sha512-fY/NuFFCq/78liHvRyFKr+aqq1aA/uuVSANjzr5Ym8c+9Z3HRPE9OrExAHoMrZ6zC8tHerQwlsXYYH5XZ7H+ww==",
+            "dependencies": {
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/types": "^4.3.1",
+                "@smithy/url-parser": "^4.0.4",
+                "@smithy/util-endpoints": "^3.0.6",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.4"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/object.assign": {
-            "version": "4.1.4",
-            "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-            "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.840.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.840.0.tgz",
+            "integrity": "sha512-JdyZM3EhhL4PqwFpttZu1afDpPJCCc3eyZOLi+srpX11LsGj6sThf47TYQN75HT1CarZ7cCdQHGzP2uy3/xHfQ==",
             "dependencies": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.4",
-                "has-symbols": "^1.0.3",
-                "object-keys": "^1.1.1"
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/types": "^4.3.1",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
+            }
+        },
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.858.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.858.0.tgz",
+            "integrity": "sha512-T1m05QlN8hFpx5/5duMjS8uFSK5e6EXP45HQRkZULVkL3DK+jMaxsnh3KLl5LjUoHn/19M4HM0wNUBhYp4Y2Yw==",
+            "dependencies": {
+                "@aws-sdk/middleware-user-agent": "3.858.0",
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.4"
+                "node": ">=18.0.0"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
             }
         },
-        "node_modules/obuf": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-            "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-            "dev": true
-        },
-        "node_modules/on-finished": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-            "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@aws-sdk/xml-builder": {
+            "version": "3.821.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.821.0.tgz",
+            "integrity": "sha512-DIIotRnefVL6DiaHtO6/21DhJ4JZnnIwdNbpwiAhdt/AVbttcE4yw925gsjur0OGv5BTYXQXU3YnANBYnZjuQA==",
             "dependencies": {
-                "ee-first": "1.1.1"
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/on-headers": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-            "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/abort-controller": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-4.0.4.tgz",
+            "integrity": "sha512-gJnEjZMvigPDQWHrW3oPrFhQtkrgqBkyjj3pCIdF3A5M6vsZODG93KNlfJprv6bp4245bdT32fsHK4kkH3KYDA==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/once": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-            "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/chunked-blob-reader": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader/-/chunked-blob-reader-5.0.0.tgz",
+            "integrity": "sha512-+sKqDBQqb036hh4NPaUiEkYFkTUGYzRsn3EuFhyfQfMy6oGHEUJDurLP9Ufb5dasr/XiAmPNMr6wa9afjQB+Gw==",
             "dependencies": {
-                "wrappy": "1"
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/one-time": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz",
-            "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==",
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/chunked-blob-reader-native": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-4.0.0.tgz",
+            "integrity": "sha512-R9wM2yPmfEMsUmlMlIgSzOyICs0x9uu7UTHoccMyt7BWw8shcGM8HqB355+BZCPBcySvbTYMs62EgEQkNxz2ig==",
             "dependencies": {
-                "fn.name": "1.x.x"
+                "@smithy/util-base64": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/onetime": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-            "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/config-resolver": {
+            "version": "4.1.4",
+            "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-4.1.4.tgz",
+            "integrity": "sha512-prmU+rDddxHOH0oNcwemL+SwnzcG65sBF2yXRO7aeXIn/xTlq2pX7JLVbkBnVLowHLg4/OL4+jBmv9hVrVGS+w==",
             "dependencies": {
-                "mimic-fn": "^2.1.0"
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.4",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/open": {
-            "version": "8.4.0",
-            "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
-            "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/core": {
+            "version": "3.7.2",
+            "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.7.2.tgz",
+            "integrity": "sha512-JoLw59sT5Bm8SAjFCYZyuCGxK8y3vovmoVbZWLDPTH5XpPEIwpFd9m90jjVMwoypDuB/SdVgje5Y4T7w50lJaw==",
             "dependencies": {
-                "define-lazy-prop": "^2.0.0",
-                "is-docker": "^2.1.1",
-                "is-wsl": "^2.2.0"
+                "@smithy/middleware-serde": "^4.0.8",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-stream": "^4.2.3",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/optionator": {
-            "version": "0.9.1",
-            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-            "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/credential-provider-imds": {
+            "version": "4.0.6",
+            "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-4.0.6.tgz",
+            "integrity": "sha512-hKMWcANhUiNbCJouYkZ9V3+/Qf9pteR1dnwgdyzR09R4ODEYx8BbUysHwRSyex4rZ9zapddZhLFTnT4ZijR4pw==",
             "dependencies": {
-                "deep-is": "^0.1.3",
-                "fast-levenshtein": "^2.0.6",
-                "levn": "^0.4.1",
-                "prelude-ls": "^1.2.1",
-                "type-check": "^0.4.0",
-                "word-wrap": "^1.2.3"
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "@smithy/url-parser": "^4.0.4",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.8.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/p-cancelable": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
-            "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/fetch-http-handler": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.1.0.tgz",
+            "integrity": "sha512-mADw7MS0bYe2OGKkHYMaqarOXuDwRbO6ArD91XhHcl2ynjGCFF+hvqf0LyQcYxkA1zaWjefSkU7Ne9mqgApSgQ==",
+            "dependencies": {
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/querystring-builder": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-base64": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/p-limit": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-            "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/hash-blob-browser": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-4.0.4.tgz",
+            "integrity": "sha512-WszRiACJiQV3QG6XMV44i5YWlkrlsM5Yxgz4jvsksuu7LDXA6wAtypfPajtNTadzpJy3KyJPoWehYpmZGKUFIQ==",
             "dependencies": {
-                "yocto-queue": "^0.1.0"
+                "@smithy/chunked-blob-reader": "^5.0.0",
+                "@smithy/chunked-blob-reader-native": "^4.0.0",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/p-locate": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-            "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/hash-node": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-4.0.4.tgz",
+            "integrity": "sha512-qnbTPUhCVnCgBp4z4BUJUhOEkVwxiEi1cyFM+Zj6o+aY8OFGxUQleKWq8ltgp3dujuhXojIvJWdoqpm6dVO3lQ==",
             "dependencies": {
-                "p-limit": "^3.0.2"
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/p-retry": {
-            "version": "4.6.1",
-            "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.1.tgz",
-            "integrity": "sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/hash-stream-node": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-4.0.4.tgz",
+            "integrity": "sha512-wHo0d8GXyVmpmMh/qOR0R7Y46/G1y6OR8U+bSTB4ppEzRxd1xVAQ9xOE9hOc0bSjhz0ujCPAbfNLkLrpa6cevg==",
             "dependencies": {
-                "@types/retry": "^0.12.0",
-                "retry": "^0.13.1"
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/p-try": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-            "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/invalid-dependency": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-4.0.4.tgz",
+            "integrity": "sha512-bNYMi7WKTJHu0gn26wg8OscncTt1t2b8KcsZxvOv56XA6cyXtOAAAaNP7+m45xfppXfOatXF3Sb1MNsLUgVLTw==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/package-hash": {
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/is-array-buffer": {
             "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz",
-            "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==",
-            "dev": true,
+            "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-4.0.0.tgz",
+            "integrity": "sha512-saYhF8ZZNoJDTvJBEWgeBccCg+yvp1CX+ed12yORU3NilJScfc6gfch2oVb4QgxZrGUx3/ZJlb+c/dJbyupxlw==",
             "dependencies": {
-                "graceful-fs": "^4.1.15",
-                "hasha": "^5.0.0",
-                "lodash.flattendeep": "^4.4.0",
-                "release-zalgo": "^1.0.0"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/pako": {
-            "version": "1.0.11",
-            "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-            "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-            "dev": true
-        },
-        "node_modules/parent-module": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-            "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/md5-js": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-4.0.4.tgz",
+            "integrity": "sha512-uGLBVqcOwrLvGh/v/jw423yWHq/ofUGK1W31M2TNspLQbUV1Va0F5kTxtirkoHawODAZcjXTSGi7JwbnPcDPJg==",
             "dependencies": {
-                "callsites": "^3.0.0"
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/parse-json": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-            "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/middleware-content-length": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-4.0.4.tgz",
+            "integrity": "sha512-F7gDyfI2BB1Kc+4M6rpuOLne5LOcEknH1n6UQB69qv+HucXBR1rkzXBnQTB2q46sFy1PM/zuSJOB532yc8bg3w==",
             "dependencies": {
-                "@babel/code-frame": "^7.0.0",
-                "error-ex": "^1.3.1",
-                "json-parse-even-better-errors": "^2.3.0",
-                "lines-and-columns": "^1.1.6"
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/parse-node-version": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
-            "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/middleware-endpoint": {
+            "version": "4.1.17",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.1.17.tgz",
+            "integrity": "sha512-S3hSGLKmHG1m35p/MObQCBCdRsrpbPU8B129BVzRqRfDvQqPMQ14iO4LyRw+7LNizYc605COYAcjqgawqi+6jA==",
+            "dependencies": {
+                "@smithy/core": "^3.7.2",
+                "@smithy/middleware-serde": "^4.0.8",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/shared-ini-file-loader": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "@smithy/url-parser": "^4.0.4",
+                "@smithy/util-middleware": "^4.0.4",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.10"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/parse-semver": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/parse-semver/-/parse-semver-1.1.1.tgz",
-            "integrity": "sha1-mkr9bfBj3Egm+T+6SpnPIj9mbLg=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/middleware-retry": {
+            "version": "4.1.18",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.1.18.tgz",
+            "integrity": "sha512-bYLZ4DkoxSsPxpdmeapvAKy7rM5+25gR7PGxq2iMiecmbrRGBHj9s75N74Ylg+aBiw9i5jIowC/cLU2NR0qH8w==",
             "dependencies": {
-                "semver": "^5.1.0"
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/service-error-classification": "^4.0.6",
+                "@smithy/smithy-client": "^4.4.9",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-retry": "^4.0.6",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/parse-semver/node_modules/semver": {
-            "version": "5.7.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-            "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-            "dev": true,
-            "bin": {
-                "semver": "bin/semver"
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/middleware-serde": {
+            "version": "4.0.8",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-4.0.8.tgz",
+            "integrity": "sha512-iSSl7HJoJaGyMIoNn2B7czghOVwJ9nD7TMvLhMWeSB5vt0TnEYyRRqPJu/TqW76WScaNvYYB8nRoiBHR9S1Ddw==",
+            "dependencies": {
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/parse5": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-            "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-            "dev": true
-        },
-        "node_modules/parse5-htmlparser2-tree-adapter": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
-            "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/middleware-stack": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-4.0.4.tgz",
+            "integrity": "sha512-kagK5ggDrBUCCzI93ft6DjteNSfY8Ulr83UtySog/h09lTIOAJ/xUSObutanlPT0nhoHAkpmW9V5K8oPyLh+QA==",
             "dependencies": {
-                "parse5": "^6.0.1"
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/parseurl": {
-            "version": "1.3.3",
-            "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-            "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/node-config-provider": {
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-4.1.3.tgz",
+            "integrity": "sha512-HGHQr2s59qaU1lrVH6MbLlmOBxadtzTsoO4c+bF5asdgVik3I8o7JIOzoeqWc5MjVa+vD36/LWE0iXKpNqooRw==",
+            "dependencies": {
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/shared-ini-file-loader": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/path-browserify": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
-            "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
-            "dev": true
-        },
-        "node_modules/path-exists": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-            "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/node-http-handler": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.1.0.tgz",
+            "integrity": "sha512-vqfSiHz2v8b3TTTrdXi03vNz1KLYYS3bhHCDv36FYDqxT7jvTll1mMnCrkD+gOvgwybuunh/2VmvOMqwBegxEg==",
+            "dependencies": {
+                "@smithy/abort-controller": "^4.0.4",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/querystring-builder": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/path-is-absolute": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-            "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/property-provider": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-4.0.4.tgz",
+            "integrity": "sha512-qHJ2sSgu4FqF4U/5UUp4DhXNmdTrgmoAai6oQiM+c5RZ/sbDwJ12qxB1M6FnP+Tn/ggkPZf9ccn4jqKSINaquw==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/path-key": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-            "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/protocol-http": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-5.1.2.tgz",
+            "integrity": "sha512-rOG5cNLBXovxIrICSBm95dLqzfvxjEmuZx4KK3hWwPFHGdW3lxY0fZNXfv2zebfRO7sJZ5pKJYHScsqopeIWtQ==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/path-parse": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-            "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-            "dev": true
-        },
-        "node_modules/path-to-regexp": {
-            "version": "1.8.0",
-            "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
-            "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/querystring-builder": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-4.0.4.tgz",
+            "integrity": "sha512-SwREZcDnEYoh9tLNgMbpop+UTGq44Hl9tdj3rf+yeLcfH7+J8OXEBaMc2kDxtyRHu8BhSg9ADEx0gFHvpJgU8w==",
             "dependencies": {
-                "isarray": "0.0.1"
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/path-to-regexp/node_modules/isarray": {
-            "version": "0.0.1",
-            "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-            "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-            "dev": true
-        },
-        "node_modules/path-type": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-            "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/querystring-parser": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-4.0.4.tgz",
+            "integrity": "sha512-6yZf53i/qB8gRHH/l2ZwUG5xgkPgQF15/KxH0DdXMDHjesA9MeZje/853ifkSY0x4m5S+dfDZ+c4x439PF0M2w==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/pause-stream": {
-            "version": "0.0.11",
-            "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
-            "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/service-error-classification": {
+            "version": "4.0.6",
+            "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-4.0.6.tgz",
+            "integrity": "sha512-RRoTDL//7xi4tn5FrN2NzH17jbgmnKidUqd4KvquT0954/i6CXXkh1884jBiunq24g9cGtPBEXlU40W6EpNOOg==",
             "dependencies": {
-                "through": "~2.3"
+                "@smithy/types": "^4.3.1"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/pend": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-            "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-            "dev": true
-        },
-        "node_modules/picocolors": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-            "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
-        },
-        "node_modules/picomatch": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-            "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
-            "dev": true,
-            "engines": {
-                "node": ">=8.6"
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/shared-ini-file-loader": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.0.4.tgz",
+            "integrity": "sha512-63X0260LoFBjrHifPDs+nM9tV0VMkOTl4JRMYNuKh/f5PauSjowTfvF3LogfkWdcPoxsA9UjqEOgjeYIbhb7Nw==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/jonschlinkert"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/pkg-dir": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-            "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/signature-v4": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-5.1.2.tgz",
+            "integrity": "sha512-d3+U/VpX7a60seHziWnVZOHuEgJlclufjkS6zhXvxcJgkJq4UWdH5eOBLzHRMx6gXjsdT9h6lfpmLzbrdupHgQ==",
             "dependencies": {
-                "find-up": "^4.0.0"
+                "@smithy/is-array-buffer": "^4.0.0",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/pkg-dir/node_modules/find-up": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-            "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/smithy-client": {
+            "version": "4.4.9",
+            "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.4.9.tgz",
+            "integrity": "sha512-mbMg8mIUAWwMmb74LoYiArP04zWElPzDoA1jVOp3or0cjlDMgoS6WTC3QXK0Vxoc9I4zdrX0tq6qsOmaIoTWEQ==",
             "dependencies": {
-                "locate-path": "^5.0.0",
-                "path-exists": "^4.0.0"
+                "@smithy/core": "^3.7.2",
+                "@smithy/middleware-endpoint": "^4.1.17",
+                "@smithy/middleware-stack": "^4.0.4",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-stream": "^4.2.3",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/pkg-dir/node_modules/locate-path": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-            "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/types": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.3.1.tgz",
+            "integrity": "sha512-UqKOQBL2x6+HWl3P+3QqFD4ncKq0I8Nuz9QItGv5WuKuMHuuwlhvqcZCoXGfc+P1QmfJE7VieykoYYmrOoFJxA==",
             "dependencies": {
-                "p-locate": "^4.1.0"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/pkg-dir/node_modules/p-limit": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-            "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/url-parser": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-4.0.4.tgz",
+            "integrity": "sha512-eMkc144MuN7B0TDA4U2fKs+BqczVbk3W+qIvcoCY6D1JY3hnAdCuhCZODC+GAeaxj0p6Jroz4+XMUn3PCxQQeQ==",
             "dependencies": {
-                "p-try": "^2.0.0"
+                "@smithy/querystring-parser": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/pkg-dir/node_modules/p-locate": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-            "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/util-base64": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-4.0.0.tgz",
+            "integrity": "sha512-CvHfCmO2mchox9kjrtzoHkWHxjHZzaFojLc8quxXY7WAAMAg43nuxwv95tATVgQFNDwd4M9S1qFzj40Ul41Kmg==",
             "dependencies": {
-                "p-limit": "^2.2.0"
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/portfinder": {
-            "version": "1.0.28",
-            "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
-            "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==",
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/util-body-length-browser": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-4.0.0.tgz",
+            "integrity": "sha512-sNi3DL0/k64/LO3A256M+m3CDdG6V7WKWHdAiBBMUN8S3hK3aMPhwnPik2A/a2ONN+9doY9UxaLfgqsIRg69QA==",
             "dependencies": {
-                "async": "^2.6.2",
-                "debug": "^3.1.1",
-                "mkdirp": "^0.5.5"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.12.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/portfinder/node_modules/async": {
-            "version": "2.6.4",
-            "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
-            "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/util-body-length-node": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-4.0.0.tgz",
+            "integrity": "sha512-q0iDP3VsZzqJyje8xJWEJCNIu3lktUGVoSy1KB0UWym2CL1siV3artm+u1DFYTLejpsrdGyCSWBdGNjJzfDPjg==",
             "dependencies": {
-                "lodash": "^4.17.14"
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/portfinder/node_modules/debug": {
-            "version": "3.2.7",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-            "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/util-buffer-from": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-4.0.0.tgz",
+            "integrity": "sha512-9TOQ7781sZvddgO8nxueKi3+yGvkY35kotA0Y6BWRajAv8jjmigQ1sBwz0UX47pQMYXJPahSKEKYFgt+rXdcug==",
             "dependencies": {
-                "ms": "^2.1.1"
+                "@smithy/is-array-buffer": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/postcss": {
-            "version": "8.3.11",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz",
-            "integrity": "sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA==",
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/util-config-provider": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-4.0.0.tgz",
+            "integrity": "sha512-L1RBVzLyfE8OXH+1hsJ8p+acNUSirQnWQ6/EgpchV88G6zGBTDPdXiiExei6Z1wR2RxYvxY/XLw6AMNCCt8H3w==",
             "dependencies": {
-                "nanoid": "^3.1.30",
-                "picocolors": "^1.0.0",
-                "source-map-js": "^0.6.2"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "^10 || ^12 || >=14"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/postcss/"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/postcss-modules-extract-imports": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-            "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-            "dev": true,
-            "engines": {
-                "node": "^10 || ^12 || >= 14"
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/util-defaults-mode-browser": {
+            "version": "4.0.25",
+            "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.25.tgz",
+            "integrity": "sha512-pxEWsxIsOPLfKNXvpgFHBGFC3pKYKUFhrud1kyooO9CJai6aaKDHfT10Mi5iiipPXN/JhKAu3qX9o75+X85OdQ==",
+            "dependencies": {
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/smithy-client": "^4.4.9",
+                "@smithy/types": "^4.3.1",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
             },
-            "peerDependencies": {
-                "postcss": "^8.1.0"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/postcss-modules-local-by-default": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
-            "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/util-defaults-mode-node": {
+            "version": "4.0.25",
+            "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.25.tgz",
+            "integrity": "sha512-+w4n4hKFayeCyELZLfsSQG5mCC3TwSkmRHv4+el5CzFU8ToQpYGhpV7mrRzqlwKkntlPilT1HJy1TVeEvEjWOQ==",
             "dependencies": {
-                "icss-utils": "^5.0.0",
-                "postcss-selector-parser": "^6.0.2",
-                "postcss-value-parser": "^4.1.0"
+                "@smithy/config-resolver": "^4.1.4",
+                "@smithy/credential-provider-imds": "^4.0.6",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/smithy-client": "^4.4.9",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "^10 || ^12 || >= 14"
-            },
-            "peerDependencies": {
-                "postcss": "^8.1.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/postcss-modules-scope": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-            "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/util-endpoints": {
+            "version": "3.0.6",
+            "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-3.0.6.tgz",
+            "integrity": "sha512-YARl3tFL3WgPuLzljRUnrS2ngLiUtkwhQtj8PAL13XZSyUiNLQxwG3fBBq3QXFqGFUXepIN73pINp3y8c2nBmA==",
             "dependencies": {
-                "postcss-selector-parser": "^6.0.4"
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "^10 || ^12 || >= 14"
-            },
-            "peerDependencies": {
-                "postcss": "^8.1.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/postcss-modules-values": {
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/util-hex-encoding": {
             "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
-            "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
-            "dev": true,
+            "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-4.0.0.tgz",
+            "integrity": "sha512-Yk5mLhHtfIgW2W2WQZWSg5kuMZCVbvhFmC7rV4IO2QqnZdbEFPmQnCcGMAX2z/8Qj3B9hYYNjZOhWym+RwhePw==",
             "dependencies": {
-                "icss-utils": "^5.0.0"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "^10 || ^12 || >= 14"
-            },
-            "peerDependencies": {
-                "postcss": "^8.1.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/postcss-selector-parser": {
-            "version": "6.0.6",
-            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
-            "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/util-middleware": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-4.0.4.tgz",
+            "integrity": "sha512-9MLKmkBmf4PRb0ONJikCbCwORACcil6gUWojwARCClT7RmLzF04hUR4WdRprIXal7XVyrddadYNfp2eF3nrvtQ==",
             "dependencies": {
-                "cssesc": "^3.0.0",
-                "util-deprecate": "^1.0.2"
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/postcss-value-parser": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-            "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
-            "dev": true
-        },
-        "node_modules/prebuild-install": {
-            "version": "6.1.4",
-            "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.4.tgz",
-            "integrity": "sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/util-retry": {
+            "version": "4.0.6",
+            "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.0.6.tgz",
+            "integrity": "sha512-+YekoF2CaSMv6zKrA6iI/N9yva3Gzn4L6n35Luydweu5MMPYpiGZlWqehPHDHyNbnyaYlz/WJyYAZnC+loBDZg==",
             "dependencies": {
-                "detect-libc": "^1.0.3",
-                "expand-template": "^2.0.3",
-                "github-from-package": "0.0.0",
-                "minimist": "^1.2.3",
-                "mkdirp-classic": "^0.5.3",
-                "napi-build-utils": "^1.0.1",
-                "node-abi": "^2.21.0",
-                "npmlog": "^4.0.1",
-                "pump": "^3.0.0",
-                "rc": "^1.2.7",
-                "simple-get": "^3.0.3",
-                "tar-fs": "^2.0.0",
-                "tunnel-agent": "^0.6.0"
-            },
-            "bin": {
-                "prebuild-install": "bin.js"
+                "@smithy/service-error-classification": "^4.0.6",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/prelude-ls": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-            "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/util-stream": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.2.3.tgz",
+            "integrity": "sha512-cQn412DWHHFNKrQfbHY8vSFI3nTROY1aIKji9N0tpp8gUABRilr7wdf8fqBbSlXresobM+tQFNk6I+0LXK/YZg==",
+            "dependencies": {
+                "@smithy/fetch-http-handler": "^5.1.0",
+                "@smithy/node-http-handler": "^4.1.0",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.8.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/prettier": {
-            "version": "2.7.1",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
-            "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
-            "dev": true,
-            "bin": {
-                "prettier": "bin-prettier.js"
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/util-uri-escape": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-4.0.0.tgz",
+            "integrity": "sha512-77yfbCbQMtgtTylO9itEAdpPXSog3ZxMe09AEhm0dU0NLTalV70ghDZFR+Nfi1C60jnJoh/Re4090/DuZh2Omg==",
+            "dependencies": {
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10.13.0"
-            },
-            "funding": {
-                "url": "https://github.com/prettier/prettier?sponsor=1"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/prettier-plugin-sh": {
-            "version": "0.8.1",
-            "resolved": "https://registry.npmjs.org/prettier-plugin-sh/-/prettier-plugin-sh-0.8.1.tgz",
-            "integrity": "sha512-tz0g6y+ZaJF0PWaa1F7vhCv4nLgYYl2zYzYU4XJFD1McoY0oHI+l2osvXqv1s5yQdtjdlzKszN6VY7WTaw2Gqw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/@smithy/util-utf8": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-4.0.0.tgz",
+            "integrity": "sha512-b+zebfKCfRdgNJDknHCob3O7FpeYQN6ZG6YLExMcasDHsCXlsXCEuiPZeLnJLpwa5dvPetGlnGCiMHuLwGvFow==",
             "dependencies": {
-                "mvdan-sh": "^0.5.0"
+                "@smithy/util-buffer-from": "^4.0.0",
+                "tslib": "^2.6.2"
             },
-            "peerDependencies": {
-                "prettier": "^2.0.0"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/pretty-quick": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/pretty-quick/-/pretty-quick-3.1.1.tgz",
-            "integrity": "sha512-ZYLGiMoV2jcaas3vTJrLvKAYsxDoXQBUn8OSTxkl67Fyov9lyXivJTl0+2WVh+y6EovGcw7Lm5ThYpH+Sh3XxQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3-control/node_modules/fast-xml-parser": {
+            "version": "5.2.5",
+            "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.2.5.tgz",
+            "integrity": "sha512-pfX9uG9Ki0yekDHx2SiuRIyFdyAr1kMIMitPvb0YBo8SUfKvia7w7FIyd/l6av85pFYRhZscS75MwMnbvY+hcQ==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/NaturalIntelligence"
+                }
+            ],
             "dependencies": {
-                "chalk": "^3.0.0",
-                "execa": "^4.0.0",
-                "find-up": "^4.1.0",
-                "ignore": "^5.1.4",
-                "mri": "^1.1.5",
-                "multimatch": "^4.0.0"
+                "strnum": "^2.1.0"
             },
             "bin": {
-                "pretty-quick": "bin/pretty-quick.js"
-            },
-            "engines": {
-                "node": ">=10.13"
+                "fxparser": "src/cli/cli.js"
+            }
+        },
+        "node_modules/@aws-sdk/client-s3-control/node_modules/strnum": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.1.1.tgz",
+            "integrity": "sha512-7ZvoFTiCnGxBtDqJ//Cu6fWtZtc7Y3x+QOirG15wztbdngGSkht27o2pyGWrVy0b4WAy3jbKmnoK6g5VlVNUUw==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/NaturalIntelligence"
+                }
+            ]
+        },
+        "node_modules/@aws-sdk/client-s3/node_modules/@aws-sdk/client-sso": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-s3/node_modules/@aws-sdk/client-sso-oidc": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             },
             "peerDependencies": {
-                "prettier": ">=2.0.0"
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/pretty-quick/node_modules/chalk": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-            "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3/node_modules/@aws-sdk/client-sts": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-s3/node_modules/@aws-sdk/core": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/signature-v4": "^4.2.2",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/pretty-quick/node_modules/find-up": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-            "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "locate-path": "^5.0.0",
-                "path-exists": "^4.0.0"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-stream": "^3.3.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/pretty-quick/node_modules/locate-path": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-            "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "p-locate": "^4.1.0"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/pretty-quick/node_modules/p-limit": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-            "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "p-try": "^2.0.0"
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-ini": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/pretty-quick/node_modules/p-locate": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-            "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "p-limit": "^2.2.0"
+                "@aws-sdk/client-sso": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/token-providers": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/private": {
-            "version": "0.1.8",
-            "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-            "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.6"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/process-nextick-args": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-            "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-            "dev": true
-        },
-        "node_modules/process-on-spawn": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz",
-            "integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "fromentries": "^1.2.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/proxy-addr": {
-            "version": "2.0.7",
-            "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-            "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "forwarded": "0.2.0",
-                "ipaddr.js": "1.9.1"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.10"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/proxy-addr/node_modules/ipaddr.js": {
-            "version": "1.9.1",
-            "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-            "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.10"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/pump": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-            "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+        "node_modules/@aws-sdk/client-s3/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "end-of-stream": "^1.1.0",
-                "once": "^1.3.1"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/punycode": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-            "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-config-provider": "^3.0.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/qs": {
-            "version": "6.10.3",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
-            "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3/node_modules/@aws-sdk/token-providers": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "side-channel": "^1.0.4"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=0.6"
+                "node": ">=16.0.0"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+            "peerDependencies": {
+                "@aws-sdk/client-sso-oidc": "^3.693.0"
             }
         },
-        "node_modules/querystring": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-            "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-            "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
+        "node_modules/@aws-sdk/client-s3/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-endpoints": "^2.1.5",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.4.x"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/queue-microtask": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-            "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ]
+        "node_modules/@aws-sdk/client-s3/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
+            }
         },
-        "node_modules/quick-lru": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-            "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
+        "node_modules/@aws-sdk/client-s3/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=10"
+                "node": ">=16.0.0"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
             }
         },
-        "node_modules/randombytes": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-            "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "safe-buffer": "^5.1.0"
-            }
-        },
-        "node_modules/range-parser": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-            "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-            "dev": true,
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.6"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/raw-body": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-            "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "bytes": "3.1.2",
-                "http-errors": "2.0.0",
-                "iconv-lite": "0.4.24",
-                "unpipe": "1.0.0"
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/rc": {
-            "version": "1.2.8",
-            "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-            "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-s3/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "deep-extend": "^0.6.0",
-                "ini": "~1.3.0",
-                "minimist": "^1.2.0",
-                "strip-json-comments": "~2.0.1"
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
             },
-            "bin": {
-                "rc": "cli.js"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/rc/node_modules/strip-json-comments": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-            "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
+        "node_modules/@aws-sdk/client-sagemaker": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sagemaker/-/client-sagemaker-3.693.0.tgz",
+            "integrity": "sha512-iInrrb7V9f0CRBiVCaaxCbpoBRQ5BqxX4elRYI6gE/pSDD2tPqmRfm4reahMtTUcKg1jaSGuvqJLfOpp0HTozQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/client-sts": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "@smithy/util-waiter": "^3.1.8",
+                "@types/uuid": "^9.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-sagemaker/node_modules/@aws-sdk/client-sso": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.693.0.tgz",
+            "integrity": "sha512-QEynrBC26x6TG9ZMzApR/kZ3lmt4lEIs2D+cHuDxt6fDGzahBUsQFBwJqhizzsM97JJI5YvmJhmihoYjdSSaXA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-sagemaker/node_modules/@aws-sdk/client-sso-oidc": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.693.0.tgz",
+            "integrity": "sha512-UEDbYlYtK/e86OOMyFR4zEPyenIxDzO2DRdz3fwVW7RzZ94wfmSwBh/8skzPTuY1G7sI064cjHW0b0QG01Sdtg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/read": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
-            "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sagemaker/node_modules/@aws-sdk/client-sts": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.693.0.tgz",
+            "integrity": "sha512-4S2y7VEtvdnjJX4JPl4kDQlslxXEZFnC50/UXVUYSt/AMc5A/GgspFNA5FVz4E3Gwpfobbf23hR2NBF8AGvYoQ==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "mute-stream": "~0.0.4"
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-sagemaker/node_modules/@aws-sdk/core": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.693.0.tgz",
+            "integrity": "sha512-v6Z/kWmLFqRLDPEwl9hJGhtTgIFHjZugSfF1Yqffdxf4n1AWgtHS7qSegakuMyN5pP4K2tvUD8qHJ+gGe2Bw2A==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/signature-v4": "^4.2.2",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=0.8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/read-pkg": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-            "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sagemaker/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.693.0.tgz",
+            "integrity": "sha512-sL8MvwNJU7ZpD7/d2VVb3by1GknIJUxzTIgYtVkDVA/ojo+KRQSSHxcj0EWWXF5DTSh2Tm+LrEug3y1ZyKHsDA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@types/normalize-package-data": "^2.4.0",
-                "normalize-package-data": "^2.5.0",
-                "parse-json": "^5.0.0",
-                "type-fest": "^0.6.0"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-stream": "^3.3.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/read-pkg-up": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-            "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sagemaker/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.693.0.tgz",
+            "integrity": "sha512-kvaa4mXhCCOuW7UQnBhYqYfgWmwy7WSBSDClutwSLPZvgrhYj2l16SD2lN4IfYdxARYMJJ1lFYp3/jJG/9Yk4Q==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "find-up": "^4.1.0",
-                "read-pkg": "^5.2.0",
-                "type-fest": "^0.8.1"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/read-pkg-up/node_modules/find-up": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-            "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sagemaker/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.693.0.tgz",
+            "integrity": "sha512-42WMsBjTNnjYxYuM3qD/Nq+8b7UdMopUq5OduMDxoM3mFTV6PXMMnfI4Z1TNnR4tYRvPXAnuNltF6xmjKbSJRA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "locate-path": "^5.0.0",
-                "path-exists": "^4.0.0"
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-ini": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/read-pkg-up/node_modules/locate-path": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-            "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sagemaker/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.693.0.tgz",
+            "integrity": "sha512-479UlJxY+BFjj3pJFYUNC0DCMrykuG7wBAXfsvZqQxKUa83DnH5Q1ID/N2hZLkxjGd4ZW0AC3lTOMxFelGzzpQ==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "p-locate": "^4.1.0"
+                "@aws-sdk/client-sso": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/token-providers": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/read-pkg-up/node_modules/p-limit": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-            "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sagemaker/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.693.0.tgz",
+            "integrity": "sha512-8LB210Pr6VeCiSb2hIra+sAH4KUBLyGaN50axHtIgufVK8jbKIctTZcVY5TO9Se+1107TsruzeXS7VeqVdJfFA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "p-try": "^2.0.0"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6"
+                "node": ">=16.0.0"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/read-pkg-up/node_modules/p-locate": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-            "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sagemaker/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.693.0.tgz",
+            "integrity": "sha512-BCki6sAZ5jYwIN/t3ElCiwerHad69ipHwPsDCxJQyeiOnJ8HG+lEpnVIfrnI8A0fLQNSF3Gtx6ahfBpKiv1Oug==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "p-limit": "^2.2.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/read-pkg/node_modules/hosted-git-info": {
-            "version": "2.8.9",
-            "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-            "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-            "dev": true
-        },
-        "node_modules/read-pkg/node_modules/normalize-package-data": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-            "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sagemaker/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.693.0.tgz",
+            "integrity": "sha512-dXnXDPr+wIiJ1TLADACI1g9pkSB21KkMIko2u4CJ2JCBoxi5IqeTnVoa6YcC8GdFNVRl+PorZ3Zqfmf1EOTC6w==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "hosted-git-info": "^2.1.4",
-                "resolve": "^1.10.0",
-                "semver": "2 || 3 || 4 || 5",
-                "validate-npm-package-license": "^3.0.1"
-            }
-        },
-        "node_modules/read-pkg/node_modules/semver": {
-            "version": "5.7.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-            "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-            "dev": true,
-            "bin": {
-                "semver": "bin/semver"
-            }
-        },
-        "node_modules/read-pkg/node_modules/type-fest": {
-            "version": "0.6.0",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-            "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-            "dev": true,
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/readable-stream": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-            "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+        "node_modules/@aws-sdk/client-sagemaker/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.693.0.tgz",
+            "integrity": "sha512-0LDmM+VxXp0u3rG0xQRWD/q6Ubi7G8I44tBPahevD5CaiDZTkmNTrVUf0VEJgVe0iCKBppACMBDkLB0/ETqkFw==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "inherits": "^2.0.3",
-                "string_decoder": "^1.1.1",
-                "util-deprecate": "^1.0.1"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 6"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/readdirp": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-            "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sagemaker/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.693.0.tgz",
+            "integrity": "sha512-/KUq/KEpFFbQmNmpp7SpAtFAdViquDfD2W0QcG07zYBfz9MwE2ig48ALynXm5sMpRmnG7sJXjdvPtTsSVPfkiw==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "picomatch": "^2.2.1"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8.10.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/readline-sync": {
-            "version": "1.4.10",
-            "resolved": "https://registry.npmjs.org/readline-sync/-/readline-sync-1.4.10.tgz",
-            "integrity": "sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sagemaker/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.693.0.tgz",
+            "integrity": "sha512-YLUkMsUY0GLW/nfwlZ69cy1u07EZRmsv8Z9m0qW317/EZaVx59hcvmcvb+W4bFqj5E8YImTjoGfE4cZ0F9mkyw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-config-provider": "^3.0.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.8.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/recast": {
-            "version": "0.11.23",
-            "resolved": "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz",
-            "integrity": "sha1-RR/TAEqx5N+bTktmN2sqIZEkYtM=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sagemaker/node_modules/@aws-sdk/token-providers": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.693.0.tgz",
+            "integrity": "sha512-nDBTJMk1l/YmFULGfRbToOA2wjf+FkQT4dMgYCv+V9uSYsMzQj8A7Tha2dz9yv4vnQgYaEiErQ8d7HVyXcVEoA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "ast-types": "0.9.6",
-                "esprima": "~3.1.0",
-                "private": "~0.1.5",
-                "source-map": "~0.5.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.8"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sso-oidc": "^3.693.0"
             }
         },
-        "node_modules/recast/node_modules/ast-types": {
-            "version": "0.9.6",
-            "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz",
-            "integrity": "sha1-ECyenpAF0+fjgpvwxPok7oYu6bk=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sagemaker/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.693.0.tgz",
+            "integrity": "sha512-eo4F6DRQ/kxS3gxJpLRv+aDNy76DxQJL5B3DPzpr9Vkq0ygVoi4GT5oIZLVaAVIJmi6k5qq9dLsYZfWLUxJJSg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-endpoints": "^2.1.5",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/recast/node_modules/esprima": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-            "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
-            "dev": true,
-            "bin": {
-                "esparse": "bin/esparse.js",
-                "esvalidate": "bin/esvalidate.js"
-            },
-            "engines": {
-                "node": ">=4"
+        "node_modules/@aws-sdk/client-sagemaker/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.693.0.tgz",
+            "integrity": "sha512-6EUfuKOujtddy18OLJUaXfKBgs+UcbZ6N/3QV4iOkubCUdeM1maIqs++B9bhCbWeaeF5ORizJw5FTwnyNjE/mw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/recast/node_modules/source-map": {
-            "version": "0.5.7",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-            "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sagemaker/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.693.0.tgz",
+            "integrity": "sha512-td0OVX8m5ZKiXtecIDuzY3Y3UZIzvxEr57Hp21NOwieqKCG2UeyQWWeGPv0FQaU7dpTkvFmVNI+tx9iB8V/Nhg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
             }
         },
-        "node_modules/rechoir": {
-            "version": "0.7.1",
-            "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
-            "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sagemaker/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+            "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "resolve": "^1.9.0"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.10"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/redent": {
+        "node_modules/@aws-sdk/client-sagemaker/node_modules/@smithy/util-buffer-from": {
             "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-            "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-            "dev": true,
+            "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+            "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "indent-string": "^4.0.0",
-                "strip-indent": "^3.0.0"
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/regexp.prototype.flags": {
-            "version": "1.4.3",
-            "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-            "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
+        "node_modules/@aws-sdk/client-sagemaker/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+            "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.3",
-                "functions-have-names": "^1.2.2"
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/regexpp": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-            "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
+        "node_modules/@aws-sdk/client-sfn": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sfn/-/client-sfn-3.693.0.tgz",
+            "integrity": "sha512-B2K3aXGnP7eD1ITEIx4kO43l1N5OLqHdLW4AUbwoopwU5qzicc9jADrthXpGxymJI8AhJz9T2WtLmceBU2EpNg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/client-sts": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "@types/uuid": "^9.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-sfn/node_modules/@aws-sdk/client-sso": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.693.0.tgz",
+            "integrity": "sha512-QEynrBC26x6TG9ZMzApR/kZ3lmt4lEIs2D+cHuDxt6fDGzahBUsQFBwJqhizzsM97JJI5YvmJhmihoYjdSSaXA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-sfn/node_modules/@aws-sdk/client-sso-oidc": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.693.0.tgz",
+            "integrity": "sha512-UEDbYlYtK/e86OOMyFR4zEPyenIxDzO2DRdz3fwVW7RzZ94wfmSwBh/8skzPTuY1G7sI064cjHW0b0QG01Sdtg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/mysticatea"
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/release-zalgo": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz",
-            "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sfn/node_modules/@aws-sdk/client-sts": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.693.0.tgz",
+            "integrity": "sha512-4S2y7VEtvdnjJX4JPl4kDQlslxXEZFnC50/UXVUYSt/AMc5A/GgspFNA5FVz4E3Gwpfobbf23hR2NBF8AGvYoQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-sfn/node_modules/@aws-sdk/core": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.693.0.tgz",
+            "integrity": "sha512-v6Z/kWmLFqRLDPEwl9hJGhtTgIFHjZugSfF1Yqffdxf4n1AWgtHS7qSegakuMyN5pP4K2tvUD8qHJ+gGe2Bw2A==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "es6-error": "^4.0.1"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/signature-v4": "^4.2.2",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/remove-trailing-separator": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-            "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-            "dev": true
-        },
-        "node_modules/replace-ext": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
-            "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sfn/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.693.0.tgz",
+            "integrity": "sha512-sL8MvwNJU7ZpD7/d2VVb3by1GknIJUxzTIgYtVkDVA/ojo+KRQSSHxcj0EWWXF5DTSh2Tm+LrEug3y1ZyKHsDA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-stream": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.10"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/request-light": {
-            "version": "0.2.5",
-            "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.2.5.tgz",
-            "integrity": "sha512-eBEh+GzJAftUnex6tcL6eV2JCifY0+sZMIUpUPOVXbs2nV5hla4ZMmO3icYKGuGVuQ2zHE9evh4OrRcH4iyYYw==",
+        "node_modules/@aws-sdk/client-sfn/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.693.0.tgz",
+            "integrity": "sha512-kvaa4mXhCCOuW7UQnBhYqYfgWmwy7WSBSDClutwSLPZvgrhYj2l16SD2lN4IfYdxARYMJJ1lFYp3/jJG/9Yk4Q==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "http-proxy-agent": "^2.1.0",
-                "https-proxy-agent": "^2.2.3",
-                "vscode-nls": "^4.1.1"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/request-light/node_modules/agent-base": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
-            "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
+        "node_modules/@aws-sdk/client-sfn/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.693.0.tgz",
+            "integrity": "sha512-42WMsBjTNnjYxYuM3qD/Nq+8b7UdMopUq5OduMDxoM3mFTV6PXMMnfI4Z1TNnR4tYRvPXAnuNltF6xmjKbSJRA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "es6-promisify": "^5.0.0"
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-ini": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 4.0.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/request-light/node_modules/debug": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-            "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+        "node_modules/@aws-sdk/client-sfn/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.693.0.tgz",
+            "integrity": "sha512-479UlJxY+BFjj3pJFYUNC0DCMrykuG7wBAXfsvZqQxKUa83DnH5Q1ID/N2hZLkxjGd4ZW0AC3lTOMxFelGzzpQ==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "ms": "2.0.0"
+                "@aws-sdk/client-sso": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/token-providers": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/request-light/node_modules/http-proxy-agent": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
-            "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
+        "node_modules/@aws-sdk/client-sfn/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.693.0.tgz",
+            "integrity": "sha512-8LB210Pr6VeCiSb2hIra+sAH4KUBLyGaN50axHtIgufVK8jbKIctTZcVY5TO9Se+1107TsruzeXS7VeqVdJfFA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "agent-base": "4",
-                "debug": "3.1.0"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 4.5.0"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/request-light/node_modules/https-proxy-agent": {
-            "version": "2.2.4",
-            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
-            "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
+        "node_modules/@aws-sdk/client-sfn/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.693.0.tgz",
+            "integrity": "sha512-BCki6sAZ5jYwIN/t3ElCiwerHad69ipHwPsDCxJQyeiOnJ8HG+lEpnVIfrnI8A0fLQNSF3Gtx6ahfBpKiv1Oug==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "agent-base": "^4.3.0",
-                "debug": "^3.1.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 4.5.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/request-light/node_modules/ms": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-            "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        },
-        "node_modules/request-light/node_modules/vscode-nls": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.2.tgz",
-            "integrity": "sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw=="
-        },
-        "node_modules/require-directory": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-            "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sfn/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.693.0.tgz",
+            "integrity": "sha512-dXnXDPr+wIiJ1TLADACI1g9pkSB21KkMIko2u4CJ2JCBoxi5IqeTnVoa6YcC8GdFNVRl+PorZ3Zqfmf1EOTC6w==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/require-from-string": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-            "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sfn/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.693.0.tgz",
+            "integrity": "sha512-0LDmM+VxXp0u3rG0xQRWD/q6Ubi7G8I44tBPahevD5CaiDZTkmNTrVUf0VEJgVe0iCKBppACMBDkLB0/ETqkFw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/require-main-filename": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-            "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-            "dev": true
-        },
-        "node_modules/requires-port": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-            "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-            "dev": true
-        },
-        "node_modules/resolve": {
-            "version": "1.22.1",
-            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-            "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sfn/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.693.0.tgz",
+            "integrity": "sha512-/KUq/KEpFFbQmNmpp7SpAtFAdViquDfD2W0QcG07zYBfz9MwE2ig48ALynXm5sMpRmnG7sJXjdvPtTsSVPfkiw==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "is-core-module": "^2.9.0",
-                "path-parse": "^1.0.7",
-                "supports-preserve-symlinks-flag": "^1.0.0"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
-            "bin": {
-                "resolve": "bin/resolve"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/resolve-alpn": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
-            "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="
-        },
-        "node_modules/resolve-cwd": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-            "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sfn/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.693.0.tgz",
+            "integrity": "sha512-YLUkMsUY0GLW/nfwlZ69cy1u07EZRmsv8Z9m0qW317/EZaVx59hcvmcvb+W4bFqj5E8YImTjoGfE4cZ0F9mkyw==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "resolve-from": "^5.0.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-config-provider": "^3.0.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/resolve-cwd/node_modules/resolve-from": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-            "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sfn/node_modules/@aws-sdk/token-providers": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.693.0.tgz",
+            "integrity": "sha512-nDBTJMk1l/YmFULGfRbToOA2wjf+FkQT4dMgYCv+V9uSYsMzQj8A7Tha2dz9yv4vnQgYaEiErQ8d7HVyXcVEoA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sso-oidc": "^3.693.0"
             }
         },
-        "node_modules/resolve-from": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-            "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sfn/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.693.0.tgz",
+            "integrity": "sha512-eo4F6DRQ/kxS3gxJpLRv+aDNy76DxQJL5B3DPzpr9Vkq0ygVoi4GT5oIZLVaAVIJmi6k5qq9dLsYZfWLUxJJSg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-endpoints": "^2.1.5",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=4"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/responselike": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz",
-            "integrity": "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==",
+        "node_modules/@aws-sdk/client-sfn/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.693.0.tgz",
+            "integrity": "sha512-6EUfuKOujtddy18OLJUaXfKBgs+UcbZ6N/3QV4iOkubCUdeM1maIqs++B9bhCbWeaeF5ORizJw5FTwnyNjE/mw==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "lowercase-keys": "^2.0.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/retry": {
-            "version": "0.13.1",
-            "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
-            "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sfn/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.693.0.tgz",
+            "integrity": "sha512-td0OVX8m5ZKiXtecIDuzY3Y3UZIzvxEr57Hp21NOwieqKCG2UeyQWWeGPv0FQaU7dpTkvFmVNI+tx9iB8V/Nhg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 4"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
             }
         },
-        "node_modules/reusify": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-            "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sfn/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz",
+            "integrity": "sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "iojs": ">=1.0.0",
-                "node": ">=0.10.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/rimraf": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-            "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sfn/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz",
+            "integrity": "sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "glob": "^7.1.3"
-            },
-            "bin": {
-                "rimraf": "bin.js"
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/run-parallel": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-            "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
+        "node_modules/@aws-sdk/client-sfn/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-3.0.0.tgz",
+            "integrity": "sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "queue-microtask": "^1.2.2"
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/safe-buffer": {
-            "version": "5.2.1",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ]
+        "node_modules/@aws-sdk/client-ssm": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/client-sts": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "@smithy/util-waiter": "^3.1.8",
+                "@types/uuid": "^9.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-ssm/node_modules/@aws-sdk/client-sso": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-ssm/node_modules/@aws-sdk/client-sso-oidc": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
+            }
         },
-        "node_modules/safe-stable-stringify": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz",
-            "integrity": "sha512-kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg==",
+        "node_modules/@aws-sdk/client-ssm/node_modules/@aws-sdk/client-sts": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-ssm/node_modules/@aws-sdk/core": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/signature-v4": "^4.2.2",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=10"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/safer-buffer": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-            "dev": true
-        },
-        "node_modules/sax": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
-            "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o="
+        "node_modules/@aws-sdk/client-ssm/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-stream": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "node_modules/schema-utils": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-            "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ssm/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@types/json-schema": "^7.0.8",
-                "ajv": "^6.12.5",
-                "ajv-keywords": "^3.5.2"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 10.13.0"
+                "node": ">=16.0.0"
             },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/webpack"
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/select-hose": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-            "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
-            "dev": true
-        },
-        "node_modules/selfsigned": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.0.1.tgz",
-            "integrity": "sha512-LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ssm/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "node-forge": "^1"
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-ini": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/semver": {
-            "version": "7.3.7",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-            "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+        "node_modules/@aws-sdk/client-ssm/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "lru-cache": "^6.0.0"
-            },
-            "bin": {
-                "semver": "bin/semver.js"
+                "@aws-sdk/client-sso": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/token-providers": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/send": {
-            "version": "0.18.0",
-            "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-            "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ssm/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "debug": "2.6.9",
-                "depd": "2.0.0",
-                "destroy": "1.2.0",
-                "encodeurl": "~1.0.2",
-                "escape-html": "~1.0.3",
-                "etag": "~1.8.1",
-                "fresh": "0.5.2",
-                "http-errors": "2.0.0",
-                "mime": "1.6.0",
-                "ms": "2.1.3",
-                "on-finished": "2.4.1",
-                "range-parser": "~1.2.1",
-                "statuses": "2.0.1"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.8.0"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
             }
         },
-        "node_modules/send/node_modules/debug": {
-            "version": "2.6.9",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ssm/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "ms": "2.0.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/send/node_modules/debug/node_modules/ms": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-            "dev": true
-        },
-        "node_modules/send/node_modules/depd": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-            "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ssm/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/send/node_modules/ms": {
-            "version": "2.1.3",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-            "dev": true
-        },
-        "node_modules/send/node_modules/statuses": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-            "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ssm/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/serialize-javascript": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-            "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ssm/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "randombytes": "^2.1.0"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/serve-index": {
-            "version": "1.9.1",
-            "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-            "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ssm/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "accepts": "~1.3.4",
-                "batch": "0.6.1",
-                "debug": "2.6.9",
-                "escape-html": "~1.0.3",
-                "http-errors": "~1.6.2",
-                "mime-types": "~2.1.17",
-                "parseurl": "~1.3.2"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-config-provider": "^3.0.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.8.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/serve-index/node_modules/debug": {
-            "version": "2.6.9",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ssm/node_modules/@aws-sdk/token-providers": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "ms": "2.0.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sso-oidc": "^3.693.0"
             }
         },
-        "node_modules/serve-index/node_modules/http-errors": {
-            "version": "1.6.3",
-            "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-            "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ssm/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "depd": "~1.1.2",
-                "inherits": "2.0.3",
-                "setprototypeof": "1.1.0",
-                "statuses": ">= 1.4.0 < 2"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-endpoints": "^2.1.5",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.6"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/serve-index/node_modules/inherits": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-            "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-            "dev": true
-        },
-        "node_modules/serve-index/node_modules/ms": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-            "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-            "dev": true
-        },
-        "node_modules/serve-index/node_modules/setprototypeof": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-            "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-            "dev": true
+        "node_modules/@aws-sdk/client-ssm/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
+            }
         },
-        "node_modules/serve-static": {
-            "version": "1.15.0",
-            "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-            "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ssm/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "encodeurl": "~1.0.2",
-                "escape-html": "~1.0.3",
-                "parseurl": "~1.3.3",
-                "send": "0.18.0"
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.8.0"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
             }
         },
-        "node_modules/set-blocking": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-            "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-            "dev": true
-        },
-        "node_modules/setimmediate": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-            "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
-            "dev": true
-        },
-        "node_modules/setprototypeof": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-            "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
-            "dev": true
-        },
-        "node_modules/shallow-clone": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-            "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-ssm/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "kind-of": "^6.0.2"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/shebang-command": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-            "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+        "node_modules/@aws-sdk/client-ssm/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "shebang-regex": "^3.0.0"
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/shebang-regex": {
+        "node_modules/@aws-sdk/client-ssm/node_modules/@smithy/util-utf8": {
             "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-            "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/side-channel": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-            "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+        "node_modules/@aws-sdk/client-sso": {
+            "version": "3.637.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "call-bind": "^1.0.0",
-                "get-intrinsic": "^1.0.2",
-                "object-inspect": "^1.9.0"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.635.0",
+                "@aws-sdk/middleware-host-header": "3.620.0",
+                "@aws-sdk/middleware-logger": "3.609.0",
+                "@aws-sdk/middleware-recursion-detection": "3.620.0",
+                "@aws-sdk/middleware-user-agent": "3.637.0",
+                "@aws-sdk/region-config-resolver": "3.614.0",
+                "@aws-sdk/types": "3.609.0",
+                "@aws-sdk/util-endpoints": "3.637.0",
+                "@aws-sdk/util-user-agent-browser": "3.609.0",
+                "@aws-sdk/util-user-agent-node": "3.614.0",
+                "@smithy/config-resolver": "^3.0.5",
+                "@smithy/core": "^2.4.0",
+                "@smithy/fetch-http-handler": "^3.2.4",
+                "@smithy/hash-node": "^3.0.3",
+                "@smithy/invalid-dependency": "^3.0.3",
+                "@smithy/middleware-content-length": "^3.0.5",
+                "@smithy/middleware-endpoint": "^3.1.0",
+                "@smithy/middleware-retry": "^3.0.15",
+                "@smithy/middleware-serde": "^3.0.3",
+                "@smithy/middleware-stack": "^3.0.3",
+                "@smithy/node-config-provider": "^3.1.4",
+                "@smithy/node-http-handler": "^3.1.4",
+                "@smithy/protocol-http": "^4.1.0",
+                "@smithy/smithy-client": "^3.2.0",
+                "@smithy/types": "^3.3.0",
+                "@smithy/url-parser": "^3.0.3",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.15",
+                "@smithy/util-defaults-mode-node": "^3.0.15",
+                "@smithy/util-endpoints": "^2.0.5",
+                "@smithy/util-middleware": "^3.0.3",
+                "@smithy/util-retry": "^3.0.3",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/signal-exit": {
-            "version": "3.0.5",
-            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz",
-            "integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==",
-            "dev": true
+        "node_modules/@aws-sdk/client-sso-oidc": {
+            "version": "3.637.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.635.0",
+                "@aws-sdk/credential-provider-node": "3.637.0",
+                "@aws-sdk/middleware-host-header": "3.620.0",
+                "@aws-sdk/middleware-logger": "3.609.0",
+                "@aws-sdk/middleware-recursion-detection": "3.620.0",
+                "@aws-sdk/middleware-user-agent": "3.637.0",
+                "@aws-sdk/region-config-resolver": "3.614.0",
+                "@aws-sdk/types": "3.609.0",
+                "@aws-sdk/util-endpoints": "3.637.0",
+                "@aws-sdk/util-user-agent-browser": "3.609.0",
+                "@aws-sdk/util-user-agent-node": "3.614.0",
+                "@smithy/config-resolver": "^3.0.5",
+                "@smithy/core": "^2.4.0",
+                "@smithy/fetch-http-handler": "^3.2.4",
+                "@smithy/hash-node": "^3.0.3",
+                "@smithy/invalid-dependency": "^3.0.3",
+                "@smithy/middleware-content-length": "^3.0.5",
+                "@smithy/middleware-endpoint": "^3.1.0",
+                "@smithy/middleware-retry": "^3.0.15",
+                "@smithy/middleware-serde": "^3.0.3",
+                "@smithy/middleware-stack": "^3.0.3",
+                "@smithy/node-config-provider": "^3.1.4",
+                "@smithy/node-http-handler": "^3.1.4",
+                "@smithy/protocol-http": "^4.1.0",
+                "@smithy/smithy-client": "^3.2.0",
+                "@smithy/types": "^3.3.0",
+                "@smithy/url-parser": "^3.0.3",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.15",
+                "@smithy/util-defaults-mode-node": "^3.0.15",
+                "@smithy/util-endpoints": "^2.0.5",
+                "@smithy/util-middleware": "^3.0.3",
+                "@smithy/util-retry": "^3.0.3",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.637.0"
+            }
         },
-        "node_modules/simple-concat": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
-            "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ]
+        "node_modules/@aws-sdk/client-sso-oidc/node_modules/@aws-sdk/types": {
+            "version": "3.609.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "node_modules/simple-get": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz",
-            "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/fetch-http-handler": {
+            "version": "3.2.4",
+            "license": "Apache-2.0",
             "dependencies": {
-                "decompress-response": "^4.2.0",
-                "once": "^1.3.1",
-                "simple-concat": "^1.0.0"
+                "@smithy/protocol-http": "^4.1.0",
+                "@smithy/querystring-builder": "^3.0.3",
+                "@smithy/types": "^3.3.0",
+                "@smithy/util-base64": "^3.0.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/simple-get/node_modules/decompress-response": {
-            "version": "4.2.1",
-            "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
-            "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "mimic-response": "^2.0.0"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/simple-get/node_modules/mimic-response": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
-            "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
+        "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/simple-swizzle": {
-            "version": "0.2.2",
-            "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-            "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
+        "node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-utf8/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "is-arrayish": "^0.3.1"
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/sinon": {
-            "version": "14.0.0",
-            "resolved": "https://registry.npmjs.org/sinon/-/sinon-14.0.0.tgz",
-            "integrity": "sha512-ugA6BFmE+WrJdh0owRZHToLd32Uw3Lxq6E6LtNRU+xTVBefx632h03Q7apXWRsRdZAJ41LB8aUfn2+O4jsDNMw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sso/node_modules/@aws-sdk/types": {
+            "version": "3.609.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@sinonjs/commons": "^1.8.3",
-                "@sinonjs/fake-timers": "^9.1.2",
-                "@sinonjs/samsam": "^6.1.1",
-                "diff": "^5.0.0",
-                "nise": "^5.1.1",
-                "supports-color": "^7.2.0"
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/sinon"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/sinon/node_modules/@sinonjs/fake-timers": {
-            "version": "9.1.2",
-            "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz",
-            "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sso/node_modules/@smithy/fetch-http-handler": {
+            "version": "3.2.4",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@sinonjs/commons": "^1.7.0"
+                "@smithy/protocol-http": "^4.1.0",
+                "@smithy/querystring-builder": "^3.0.3",
+                "@smithy/types": "^3.3.0",
+                "@smithy/util-base64": "^3.0.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/slash": {
+        "node_modules/@aws-sdk/client-sso/node_modules/@smithy/is-array-buffer": {
             "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/sockjs": {
-            "version": "0.3.24",
-            "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
-            "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "faye-websocket": "^0.11.3",
-                "uuid": "^8.3.2",
-                "websocket-driver": "^0.7.4"
-            }
-        },
-        "node_modules/source-list-map": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-            "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-            "dev": true
-        },
-        "node_modules/source-map": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/source-map-js": {
-            "version": "0.6.2",
-            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz",
-            "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==",
+        "node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-utf8/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/source-map-support": {
-            "version": "0.5.21",
-            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-            "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sts": {
+            "version": "3.637.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "buffer-from": "^1.0.0",
-                "source-map": "^0.6.0"
-            }
-        },
-        "node_modules/sourcemap-codec": {
-            "version": "1.4.8",
-            "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-            "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
-        },
-        "node_modules/spawn-wrap": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz",
-            "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==",
-            "dev": true,
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.637.0",
+                "@aws-sdk/core": "3.635.0",
+                "@aws-sdk/credential-provider-node": "3.637.0",
+                "@aws-sdk/middleware-host-header": "3.620.0",
+                "@aws-sdk/middleware-logger": "3.609.0",
+                "@aws-sdk/middleware-recursion-detection": "3.620.0",
+                "@aws-sdk/middleware-user-agent": "3.637.0",
+                "@aws-sdk/region-config-resolver": "3.614.0",
+                "@aws-sdk/types": "3.609.0",
+                "@aws-sdk/util-endpoints": "3.637.0",
+                "@aws-sdk/util-user-agent-browser": "3.609.0",
+                "@aws-sdk/util-user-agent-node": "3.614.0",
+                "@smithy/config-resolver": "^3.0.5",
+                "@smithy/core": "^2.4.0",
+                "@smithy/fetch-http-handler": "^3.2.4",
+                "@smithy/hash-node": "^3.0.3",
+                "@smithy/invalid-dependency": "^3.0.3",
+                "@smithy/middleware-content-length": "^3.0.5",
+                "@smithy/middleware-endpoint": "^3.1.0",
+                "@smithy/middleware-retry": "^3.0.15",
+                "@smithy/middleware-serde": "^3.0.3",
+                "@smithy/middleware-stack": "^3.0.3",
+                "@smithy/node-config-provider": "^3.1.4",
+                "@smithy/node-http-handler": "^3.1.4",
+                "@smithy/protocol-http": "^4.1.0",
+                "@smithy/smithy-client": "^3.2.0",
+                "@smithy/types": "^3.3.0",
+                "@smithy/url-parser": "^3.0.3",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.15",
+                "@smithy/util-defaults-mode-node": "^3.0.15",
+                "@smithy/util-endpoints": "^2.0.5",
+                "@smithy/util-middleware": "^3.0.3",
+                "@smithy/util-retry": "^3.0.3",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-sts/node_modules/@aws-sdk/types": {
+            "version": "3.609.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "foreground-child": "^2.0.0",
-                "is-windows": "^1.0.2",
-                "make-dir": "^3.0.0",
-                "rimraf": "^3.0.0",
-                "signal-exit": "^3.0.2",
-                "which": "^2.0.1"
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/spdx-correct": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-            "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sts/node_modules/@smithy/fetch-http-handler": {
+            "version": "3.2.4",
+            "license": "Apache-2.0",
             "dependencies": {
-                "spdx-expression-parse": "^3.0.0",
-                "spdx-license-ids": "^3.0.0"
+                "@smithy/protocol-http": "^4.1.0",
+                "@smithy/querystring-builder": "^3.0.3",
+                "@smithy/types": "^3.3.0",
+                "@smithy/util-base64": "^3.0.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/spdx-exceptions": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-            "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-            "dev": true
-        },
-        "node_modules/spdx-expression-parse": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-            "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sts/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "spdx-exceptions": "^2.1.0",
-                "spdx-license-ids": "^3.0.0"
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/spdx-license-ids": {
-            "version": "3.0.11",
-            "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz",
-            "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",
-            "dev": true
-        },
-        "node_modules/spdy": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
-            "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
-            "dev": true,
+        "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "debug": "^4.1.0",
-                "handle-thing": "^2.0.0",
-                "http-deceiver": "^1.2.7",
-                "select-hose": "^2.0.0",
-                "spdy-transport": "^3.0.0"
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6.0.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/spdy-transport": {
+        "node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-utf8/node_modules/@smithy/util-buffer-from": {
             "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-            "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-            "dev": true,
+            "license": "Apache-2.0",
             "dependencies": {
-                "debug": "^4.1.0",
-                "detect-node": "^2.0.4",
-                "hpack.js": "^2.1.6",
-                "obuf": "^1.1.2",
-                "readable-stream": "^3.0.6",
-                "wbuf": "^1.7.3"
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/split": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-            "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
-            "dev": true,
+        "node_modules/@aws-sdk/core": {
+            "version": "3.635.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "through": "2"
+                "@smithy/core": "^2.4.0",
+                "@smithy/node-config-provider": "^3.1.4",
+                "@smithy/property-provider": "^3.1.3",
+                "@smithy/protocol-http": "^4.1.0",
+                "@smithy/signature-v4": "^4.1.0",
+                "@smithy/smithy-client": "^3.2.0",
+                "@smithy/types": "^3.3.0",
+                "@smithy/util-middleware": "^3.0.3",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "*"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/sprintf-js": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-            "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
-        },
-        "node_modules/stack-trace": {
-            "version": "0.0.10",
-            "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
-            "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
+        "node_modules/@aws-sdk/credential-provider-cognito-identity": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.730.0.tgz",
+            "integrity": "sha512-Ynp67VkpaaFubqPrqGxLbg5XuS+QTjR7JVhZvjNO6Su4tQVKBFSfQpDIXTyggD9UVixXy4NB9cqg30uvebDeiw==",
+            "dependencies": {
+                "@aws-sdk/client-cognito-identity": "3.730.0",
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": "*"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/statuses": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-            "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-cognito-identity/node_modules/@aws-sdk/types": {
+            "version": "3.723.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.723.0.tgz",
+            "integrity": "sha512-LmK3kwiMZG1y5g3LGihT9mNkeNOmwEyPk6HGcJqh0wOSV4QpWoKu2epyKE4MLQNUUlz2kOVbVbOrwmI6ZcteuA==",
+            "dependencies": {
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/stream-combiner": {
-            "version": "0.2.2",
-            "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz",
-            "integrity": "sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-cognito-identity/node_modules/@smithy/property-provider": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-4.0.4.tgz",
+            "integrity": "sha512-qHJ2sSgu4FqF4U/5UUp4DhXNmdTrgmoAai6oQiM+c5RZ/sbDwJ12qxB1M6FnP+Tn/ggkPZf9ccn4jqKSINaquw==",
             "dependencies": {
-                "duplexer": "~0.1.1",
-                "through": "~2.3.4"
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/string_decoder": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-            "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+        "node_modules/@aws-sdk/credential-provider-cognito-identity/node_modules/@smithy/types": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.3.1.tgz",
+            "integrity": "sha512-UqKOQBL2x6+HWl3P+3QqFD4ncKq0I8Nuz9QItGv5WuKuMHuuwlhvqcZCoXGfc+P1QmfJE7VieykoYYmrOoFJxA==",
             "dependencies": {
-                "safe-buffer": "~5.2.0"
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/string-width": {
-            "version": "4.2.3",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-env": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "emoji-regex": "^8.0.0",
-                "is-fullwidth-code-point": "^3.0.0",
-                "strip-ansi": "^6.0.1"
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/string-width/node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-env/node_modules/@aws-sdk/core": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/signature-v4": "^4.2.2",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/string-width/node_modules/strip-ansi": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.635.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "ansi-regex": "^5.0.1"
+                "@aws-sdk/types": "3.609.0",
+                "@smithy/fetch-http-handler": "^3.2.4",
+                "@smithy/node-http-handler": "^3.1.4",
+                "@smithy/property-provider": "^3.1.3",
+                "@smithy/protocol-http": "^4.1.0",
+                "@smithy/smithy-client": "^3.2.0",
+                "@smithy/types": "^3.3.0",
+                "@smithy/util-stream": "^3.1.3",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/string.prototype.trimend": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-            "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
+        "node_modules/@aws-sdk/credential-provider-http/node_modules/@aws-sdk/types": {
+            "version": "3.609.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.4",
-                "es-abstract": "^1.19.5"
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/string.prototype.trimstart": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-            "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
+        "node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/fetch-http-handler": {
+            "version": "3.2.4",
+            "license": "Apache-2.0",
             "dependencies": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.4",
-                "es-abstract": "^1.19.5"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+                "@smithy/protocol-http": "^4.1.0",
+                "@smithy/querystring-builder": "^3.0.3",
+                "@smithy/types": "^3.3.0",
+                "@smithy/util-base64": "^3.0.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/strip-ansi": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-            "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+        "node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "ansi-regex": "^4.1.0"
+                "@aws-sdk/core": "3.758.0",
+                "@aws-sdk/credential-provider-env": "3.758.0",
+                "@aws-sdk/credential-provider-http": "3.758.0",
+                "@aws-sdk/credential-provider-process": "3.758.0",
+                "@aws-sdk/credential-provider-sso": "3.758.0",
+                "@aws-sdk/credential-provider-web-identity": "3.758.0",
+                "@aws-sdk/nested-clients": "3.758.0",
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/credential-provider-imds": "^4.0.1",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/strip-bom": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-            "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/client-sso": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.758.0",
+                "@aws-sdk/middleware-host-header": "3.734.0",
+                "@aws-sdk/middleware-logger": "3.734.0",
+                "@aws-sdk/middleware-recursion-detection": "3.734.0",
+                "@aws-sdk/middleware-user-agent": "3.758.0",
+                "@aws-sdk/region-config-resolver": "3.734.0",
+                "@aws-sdk/types": "3.734.0",
+                "@aws-sdk/util-endpoints": "3.743.0",
+                "@aws-sdk/util-user-agent-browser": "3.734.0",
+                "@aws-sdk/util-user-agent-node": "3.758.0",
+                "@smithy/config-resolver": "^4.0.1",
+                "@smithy/core": "^3.1.5",
+                "@smithy/fetch-http-handler": "^5.0.1",
+                "@smithy/hash-node": "^4.0.1",
+                "@smithy/invalid-dependency": "^4.0.1",
+                "@smithy/middleware-content-length": "^4.0.1",
+                "@smithy/middleware-endpoint": "^4.0.6",
+                "@smithy/middleware-retry": "^4.0.7",
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/middleware-stack": "^4.0.1",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/node-http-handler": "^4.0.3",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.7",
+                "@smithy/util-defaults-mode-node": "^4.0.7",
+                "@smithy/util-endpoints": "^3.0.1",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-retry": "^4.0.1",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/core": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/core": "^3.1.5",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/signature-v4": "^5.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/strip-final-newline": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-            "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/credential-provider-env": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/core": "3.758.0",
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/strip-indent": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-            "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "min-indent": "^1.0.0"
+                "@aws-sdk/core": "3.758.0",
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/fetch-http-handler": "^5.0.1",
+                "@smithy/node-http-handler": "^4.0.3",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-stream": "^4.1.2",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/strip-json-comments": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-            "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/credential-provider-process": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/core": "3.758.0",
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/supports-color": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "has-flag": "^4.0.0"
+                "@aws-sdk/client-sso": "3.758.0",
+                "@aws-sdk/core": "3.758.0",
+                "@aws-sdk/token-providers": "3.758.0",
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/supports-preserve-symlinks-flag": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-            "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-            "dev": true,
-            "engines": {
-                "node": ">= 0.4"
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/svg-pathdata": {
-            "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/svg-pathdata/-/svg-pathdata-6.0.3.tgz",
-            "integrity": "sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/svg2ttf": {
-            "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/svg2ttf/-/svg2ttf-6.0.3.tgz",
-            "integrity": "sha512-CgqMyZrbOPpc+WqH7aga4JWkDPso23EgypLsbQ6gN3uoPWwwiLjXvzgrwGADBExvCRJrWFzAeK1bSoSpE7ixSQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@xmldom/xmldom": "^0.7.2",
-                "argparse": "^2.0.1",
-                "cubic2quad": "^1.2.1",
-                "lodash": "^4.17.10",
-                "microbuffer": "^1.0.0",
-                "svgpath": "^2.1.5"
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
-            "bin": {
-                "svg2ttf": "svg2ttf.js"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/svgicons2svgfont": {
-            "version": "10.0.6",
-            "resolved": "https://registry.npmjs.org/svgicons2svgfont/-/svgicons2svgfont-10.0.6.tgz",
-            "integrity": "sha512-fUgQEVg3XwTbOHvlXahHGqCet5Wvfo1bV4DCvbSRvjsOCPCRunYbG4dUJCPegps37BMph3eOrfoobhH5AWuC6A==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "commander": "^7.2.0",
-                "geometry-interfaces": "^1.1.4",
-                "glob": "^7.1.6",
-                "neatequal": "^1.0.0",
-                "readable-stream": "^3.4.0",
-                "sax": "^1.2.4",
-                "svg-pathdata": "^6.0.0"
-            },
-            "bin": {
-                "svgicons2svgfont": "bin/svgicons2svgfont.js"
+                "@aws-sdk/core": "3.758.0",
+                "@aws-sdk/types": "3.734.0",
+                "@aws-sdk/util-endpoints": "3.743.0",
+                "@smithy/core": "^3.1.5",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/svgicons2svgfont/node_modules/commander": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-            "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 10"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/svgicons2svgfont/node_modules/sax": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-            "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-            "dev": true
-        },
-        "node_modules/svgpath": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/svgpath/-/svgpath-2.5.0.tgz",
-            "integrity": "sha512-o/vohwqjUO9nDAh4rcjE3KaW/v//At8UJu2LJMybXidf5QLQLVA4bxH0//4YCsr+1H4Gw1Wi/Jc62ynzSBYidw==",
-            "dev": true
-        },
-        "node_modules/tapable": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-            "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/token-providers": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/nested-clients": "3.758.0",
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/tar-fs": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-            "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/types": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "chownr": "^1.1.1",
-                "mkdirp-classic": "^0.5.2",
-                "pump": "^3.0.0",
-                "tar-stream": "^2.1.4"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/tar-stream": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-            "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.743.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "bl": "^4.0.3",
-                "end-of-stream": "^1.4.1",
-                "fs-constants": "^1.0.0",
-                "inherits": "^2.0.3",
-                "readable-stream": "^3.1.1"
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-endpoints": "^3.0.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/tcp-port-used": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/tcp-port-used/-/tcp-port-used-1.0.2.tgz",
-            "integrity": "sha512-l7ar8lLUD3XS1V2lfoJlCBaeoaWo/2xfYt81hM7VlvR4RrMVFqfmzfhLVk40hAb368uitje5gPtBRL1m/DGvLA==",
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "debug": "4.3.1",
-                "is2": "^2.0.6"
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/types": "^4.1.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/tcp-port-used/node_modules/debug": {
-            "version": "4.3.1",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-            "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "ms": "2.1.2"
+                "@aws-sdk/middleware-user-agent": "3.758.0",
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6.0"
+                "node": ">=18.0.0"
+            },
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
             },
             "peerDependenciesMeta": {
-                "supports-color": {
+                "aws-crt": {
                     "optional": true
                 }
             }
         },
-        "node_modules/terser": {
-            "version": "5.14.2",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz",
-            "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/abort-controller": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@jridgewell/source-map": "^0.3.2",
-                "acorn": "^8.5.0",
-                "commander": "^2.20.0",
-                "source-map-support": "~0.5.20"
-            },
-            "bin": {
-                "terser": "bin/terser"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/terser-webpack-plugin": {
-            "version": "5.2.4",
-            "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.2.4.tgz",
-            "integrity": "sha512-E2CkNMN+1cho04YpdANyRrn8CyN4yMy+WdFKZIySFZrGXZxJwJP6PMNGGc/Mcr6qygQHUUqRxnAPmi0M9f00XA==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/config-resolver": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "jest-worker": "^27.0.6",
-                "p-limit": "^3.1.0",
-                "schema-utils": "^3.1.1",
-                "serialize-javascript": "^6.0.0",
-                "source-map": "^0.6.1",
-                "terser": "^5.7.2"
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 10.13.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/webpack"
-            },
-            "peerDependencies": {
-                "webpack": "^5.1.0"
-            },
-            "peerDependenciesMeta": {
-                "@swc/core": {
-                    "optional": true
-                },
-                "esbuild": {
-                    "optional": true
-                },
-                "uglify-js": {
-                    "optional": true
-                }
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/terser/node_modules/commander": {
-            "version": "2.20.3",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-            "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-            "dev": true
-        },
-        "node_modules/test-exclude": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-            "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/core": {
+            "version": "3.1.5",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@istanbuljs/schema": "^0.1.2",
-                "glob": "^7.1.4",
-                "minimatch": "^3.0.4"
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-stream": "^4.1.2",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/text-hex": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
-            "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg=="
-        },
-        "node_modules/text-table": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-            "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-            "dev": true
-        },
-        "node_modules/thenify": {
-            "version": "3.3.1",
-            "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
-            "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/credential-provider-imds": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "any-promise": "^1.0.0"
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/thenify-all": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
-            "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/fetch-http-handler": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "thenify": ">= 3.1.0 < 4"
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/querystring-builder": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-base64": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=0.8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/through": {
-            "version": "2.3.8",
-            "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-            "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-            "dev": true
-        },
-        "node_modules/thunky": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-            "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
-            "dev": true
-        },
-        "node_modules/time-stamp": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-            "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/hash-node": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/timers-ext": {
-            "version": "0.1.7",
-            "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
-            "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/invalid-dependency": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "es5-ext": "~0.10.46",
-                "next-tick": "1"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/tmp": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-            "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/is-array-buffer": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "rimraf": "^3.0.0"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8.17.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/to-fast-properties": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-            "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/middleware-content-length": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=4"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/to-regex-range": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-            "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/middleware-endpoint": {
+            "version": "4.0.6",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "is-number": "^7.0.0"
+                "@smithy/core": "^3.1.5",
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "@smithy/util-middleware": "^4.0.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/toidentifier": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-            "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/middleware-retry": {
+            "version": "4.0.7",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/service-error-classification": "^4.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-retry": "^4.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
             "engines": {
-                "node": ">=0.6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/traverse": {
-            "version": "0.3.9",
-            "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
-            "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/middleware-serde": {
+            "version": "4.0.2",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": "*"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/trim-newlines": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-            "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/middleware-stack": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/triple-beam": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz",
-            "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="
-        },
-        "node_modules/ts-mockito": {
-            "version": "2.6.1",
-            "resolved": "https://registry.npmjs.org/ts-mockito/-/ts-mockito-2.6.1.tgz",
-            "integrity": "sha512-qU9m/oEBQrKq5hwfbJ7MgmVN5Gu6lFnIGWvpxSjrqq6YYEVv+RwVFWySbZMBgazsWqv6ctAyVBpo9TmAxnOEKw==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/node-config-provider": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "lodash": "^4.17.5"
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/ts-morph": {
-            "version": "17.0.1",
-            "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-17.0.1.tgz",
-            "integrity": "sha512-10PkHyXmrtsTvZSL+cqtJLTgFXkU43Gd0JCc0Rw6GchWbqKe0Rwgt1v3ouobTZwQzF1mGhDeAlWYBMGRV7y+3g==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/node-http-handler": {
+            "version": "4.0.3",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@ts-morph/common": "~0.18.0",
-                "code-block-writer": "^11.0.3"
+                "@smithy/abort-controller": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/querystring-builder": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/ts-node": {
-            "version": "10.7.0",
-            "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.7.0.tgz",
-            "integrity": "sha512-TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/property-provider": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@cspotcode/source-map-support": "0.7.0",
-                "@tsconfig/node10": "^1.0.7",
-                "@tsconfig/node12": "^1.0.7",
-                "@tsconfig/node14": "^1.0.0",
-                "@tsconfig/node16": "^1.0.2",
-                "acorn": "^8.4.1",
-                "acorn-walk": "^8.1.1",
-                "arg": "^4.1.0",
-                "create-require": "^1.1.0",
-                "diff": "^4.0.1",
-                "make-error": "^1.1.1",
-                "v8-compile-cache-lib": "^3.0.0",
-                "yn": "3.1.1"
-            },
-            "bin": {
-                "ts-node": "dist/bin.js",
-                "ts-node-cwd": "dist/bin-cwd.js",
-                "ts-node-esm": "dist/bin-esm.js",
-                "ts-node-script": "dist/bin-script.js",
-                "ts-node-transpile-only": "dist/bin-transpile.js",
-                "ts-script": "dist/bin-script-deprecated.js"
-            },
-            "peerDependencies": {
-                "@swc/core": ">=1.2.50",
-                "@swc/wasm": ">=1.2.50",
-                "@types/node": "*",
-                "typescript": ">=2.7"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
-            "peerDependenciesMeta": {
-                "@swc/core": {
-                    "optional": true
-                },
-                "@swc/wasm": {
-                    "optional": true
-                }
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/ts-node/node_modules/@cspotcode/source-map-support": {
-            "version": "0.7.0",
-            "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz",
-            "integrity": "sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/protocol-http": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@cspotcode/source-map-consumer": "0.8.0"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=12"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/ts-node/node_modules/diff": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-            "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/querystring-builder": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.3.1"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/tslib": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-            "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
-        },
-        "node_modules/tsutils": {
-            "version": "3.21.0",
-            "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-            "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/querystring-parser": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "tslib": "^1.8.1"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 6"
-            },
-            "peerDependencies": {
-                "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/tsutils/node_modules/tslib": {
-            "version": "1.14.1",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-            "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-            "dev": true
-        },
-        "node_modules/ttf2eot": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/ttf2eot/-/ttf2eot-2.0.0.tgz",
-            "integrity": "sha512-U56aG2Ylw7psLOmakjemAzmpqVgeadwENg9oaDjaZG5NYX4WB6+7h74bNPcc+0BXsoU5A/XWiHabDXyzFOmsxQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/service-error-classification": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "argparse": "^1.0.6",
-                "microbuffer": "^1.0.0"
+                "@smithy/types": "^4.1.0"
             },
-            "bin": {
-                "ttf2eot": "ttf2eot.js"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/ttf2eot/node_modules/argparse": {
-            "version": "1.0.10",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/shared-ini-file-loader": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "sprintf-js": "~1.0.2"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/ttf2woff": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/ttf2woff/-/ttf2woff-2.0.2.tgz",
-            "integrity": "sha512-X68badwBjAy/+itU49scLjXUL094up+rHuYk+YAOTTBYSUMOmLZ7VyhZJuqQESj1gnyLAC2/5V8Euv+mExmyPA==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/signature-v4": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "argparse": "^1.0.6",
-                "microbuffer": "^1.0.0",
-                "pako": "^1.0.0"
+                "@smithy/is-array-buffer": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
-            "bin": {
-                "ttf2woff": "ttf2woff.js"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/ttf2woff/node_modules/argparse": {
-            "version": "1.0.10",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/smithy-client": {
+            "version": "4.1.6",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "sprintf-js": "~1.0.2"
+                "@smithy/core": "^3.1.5",
+                "@smithy/middleware-endpoint": "^4.0.6",
+                "@smithy/middleware-stack": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-stream": "^4.1.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/tunnel": {
-            "version": "0.0.6",
-            "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
-            "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/types": {
+            "version": "4.1.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/tunnel-agent": {
-            "version": "0.6.0",
-            "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-            "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/url-parser": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "safe-buffer": "^5.0.1"
+                "@smithy/querystring-parser": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "*"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/type": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-            "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
-            "dev": true
-        },
-        "node_modules/type-check": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-            "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/util-base64": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "prelude-ls": "^1.2.1"
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.8.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/type-detect": {
-            "version": "4.0.8",
-            "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-            "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/util-body-length-browser": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=4"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/type-fest": {
-            "version": "0.8.1",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-            "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/util-body-length-node": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/type-is": {
-            "version": "1.6.18",
-            "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-            "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/util-buffer-from": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "media-typer": "0.3.0",
-                "mime-types": "~2.1.24"
+                "@smithy/is-array-buffer": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/typed-rest-client": {
-            "version": "1.8.6",
-            "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.6.tgz",
-            "integrity": "sha512-xcQpTEAJw2DP7GqVNECh4dD+riS+C1qndXLfBCJ3xk0kqprtGN491P5KlmrDbKdtuW8NEcP/5ChxiJI3S9WYTA==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/util-config-provider": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "qs": "^6.9.1",
-                "tunnel": "0.0.6",
-                "underscore": "^1.12.1"
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/typedarray-to-buffer": {
-            "version": "3.1.5",
-            "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-            "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/util-defaults-mode-browser": {
+            "version": "4.0.7",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "is-typedarray": "^1.0.0"
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/typescript": {
-            "version": "4.8.4",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
-            "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
-            "bin": {
-                "tsc": "bin/tsc",
-                "tsserver": "bin/tsserver"
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/util-defaults-mode-node": {
+            "version": "4.0.7",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/config-resolver": "^4.0.1",
+                "@smithy/credential-provider-imds": "^4.0.1",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=4.2.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/uc.micro": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
-            "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
-            "dev": true
-        },
-        "node_modules/umd-compat-loader": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/umd-compat-loader/-/umd-compat-loader-2.1.2.tgz",
-            "integrity": "sha512-RkTlsfrCxUISWqiTtYFFJank7b2Hhl4V2pc29nl0xOEGvvuVkpy1xnufhXfTituxgpW0HSrDk0JHlvPYZxEXKQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/util-endpoints": {
+            "version": "3.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "ast-types": "^0.9.2",
-                "loader-utils": "^1.0.3",
-                "recast": "^0.11.17"
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/umd-compat-loader/node_modules/json5": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-            "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/util-hex-encoding": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "minimist": "^1.2.0"
+                "tslib": "^2.6.2"
             },
-            "bin": {
-                "json5": "lib/cli.js"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/umd-compat-loader/node_modules/loader-utils": {
-            "version": "1.4.2",
-            "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
-            "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/util-middleware": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "big.js": "^5.2.2",
-                "emojis-list": "^3.0.0",
-                "json5": "^1.0.1"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=4.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/unbox-primitive": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-            "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/util-retry": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "call-bind": "^1.0.2",
-                "has-bigints": "^1.0.2",
-                "has-symbols": "^1.0.3",
-                "which-boxed-primitive": "^1.0.2"
+                "@smithy/service-error-classification": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/underscore": {
-            "version": "1.13.1",
-            "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
-            "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==",
-            "dev": true
-        },
-        "node_modules/universalify": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-            "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/util-stream": {
+            "version": "4.1.2",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/fetch-http-handler": "^5.0.1",
+                "@smithy/node-http-handler": "^4.0.3",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 10.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/unpipe": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-            "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/util-uri-escape": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/unzipper": {
-            "version": "0.10.11",
-            "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.10.11.tgz",
-            "integrity": "sha512-+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/util-utf8": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "big-integer": "^1.6.17",
-                "binary": "~0.3.0",
-                "bluebird": "~3.4.1",
-                "buffer-indexof-polyfill": "~1.0.0",
-                "duplexer2": "~0.1.4",
-                "fstream": "^1.0.12",
-                "graceful-fs": "^4.2.2",
-                "listenercount": "~1.0.1",
-                "readable-stream": "~2.3.6",
-                "setimmediate": "~1.0.4"
+                "@smithy/util-buffer-from": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/unzipper/node_modules/readable-stream": {
-            "version": "2.3.7",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-            "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.637.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
+                "@aws-sdk/credential-provider-env": "3.620.1",
+                "@aws-sdk/credential-provider-http": "3.635.0",
+                "@aws-sdk/credential-provider-ini": "3.637.0",
+                "@aws-sdk/credential-provider-process": "3.620.1",
+                "@aws-sdk/credential-provider-sso": "3.637.0",
+                "@aws-sdk/credential-provider-web-identity": "3.621.0",
+                "@aws-sdk/types": "3.609.0",
+                "@smithy/credential-provider-imds": "^3.2.0",
+                "@smithy/property-provider": "^3.1.3",
+                "@smithy/shared-ini-file-loader": "^3.1.4",
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/unzipper/node_modules/safe-buffer": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-            "dev": true
-        },
-        "node_modules/unzipper/node_modules/string_decoder": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-node/node_modules/@aws-sdk/credential-provider-env": {
+            "version": "3.620.1",
+            "license": "Apache-2.0",
             "dependencies": {
-                "safe-buffer": "~5.1.0"
+                "@aws-sdk/types": "3.609.0",
+                "@smithy/property-provider": "^3.1.3",
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/uri-js": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-            "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-node/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.637.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "punycode": "^2.1.0"
+                "@aws-sdk/credential-provider-env": "3.620.1",
+                "@aws-sdk/credential-provider-http": "3.635.0",
+                "@aws-sdk/credential-provider-process": "3.620.1",
+                "@aws-sdk/credential-provider-sso": "3.637.0",
+                "@aws-sdk/credential-provider-web-identity": "3.621.0",
+                "@aws-sdk/types": "3.609.0",
+                "@smithy/credential-provider-imds": "^3.2.0",
+                "@smithy/property-provider": "^3.1.3",
+                "@smithy/shared-ini-file-loader": "^3.1.4",
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.637.0"
             }
         },
-        "node_modules/url": {
-            "version": "0.10.3",
-            "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
-            "integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=",
+        "node_modules/@aws-sdk/credential-provider-node/node_modules/@aws-sdk/credential-provider-process": {
+            "version": "3.620.1",
+            "license": "Apache-2.0",
             "dependencies": {
-                "punycode": "1.3.2",
-                "querystring": "0.2.0"
+                "@aws-sdk/types": "3.609.0",
+                "@smithy/property-provider": "^3.1.3",
+                "@smithy/shared-ini-file-loader": "^3.1.4",
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/url-join": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
-            "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==",
-            "dev": true
-        },
-        "node_modules/url/node_modules/punycode": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-            "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
-        },
-        "node_modules/util": {
-            "version": "0.12.4",
-            "resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz",
-            "integrity": "sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==",
+        "node_modules/@aws-sdk/credential-provider-node/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.621.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "inherits": "^2.0.3",
-                "is-arguments": "^1.0.4",
-                "is-generator-function": "^1.0.7",
-                "is-typed-array": "^1.1.3",
-                "safe-buffer": "^5.1.2",
-                "which-typed-array": "^1.1.2"
+                "@aws-sdk/types": "3.609.0",
+                "@smithy/property-provider": "^3.1.3",
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.621.0"
             }
         },
-        "node_modules/util-deprecate": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-            "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-        },
-        "node_modules/utils-merge": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-            "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-node/node_modules/@aws-sdk/types": {
+            "version": "3.609.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.4.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/uuid": {
-            "version": "8.3.2",
-            "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-            "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-            "bin": {
-                "uuid": "dist/bin/uuid"
+        "node_modules/@aws-sdk/credential-provider-process": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/v8-compile-cache-lib": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.0.tgz",
-            "integrity": "sha512-mpSYqfsFvASnSn5qMiwrr4VKfumbPyONLCOPmsR3A6pTY/r0+tSaVbgPWSAIuzbk3lCTa+FForeTiO+wBQGkjA==",
-            "dev": true
-        },
-        "node_modules/validate-npm-package-license": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-            "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-process/node_modules/@aws-sdk/core": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "spdx-correct": "^3.0.0",
-                "spdx-expression-parse": "^3.0.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/signature-v4": "^4.2.2",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/varstream": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/varstream/-/varstream-0.3.2.tgz",
-            "integrity": "sha512-OpR3Usr9dGZZbDttlTxdviGdxiURI0prX68+DuaN/JfIDbK9ZOmREKM6PgmelsejMnhgjXmEEEgf+E4NbsSqMg==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.637.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "readable-stream": "^1.0.33"
-            },
-            "bin": {
-                "json2varstream": "cli/json2varstream.js",
-                "varstream2json": "cli/varstream2json.js"
+                "@aws-sdk/client-sso": "3.637.0",
+                "@aws-sdk/token-providers": "3.614.0",
+                "@aws-sdk/types": "3.609.0",
+                "@smithy/property-provider": "^3.1.3",
+                "@smithy/shared-ini-file-loader": "^3.1.4",
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=0.10.*"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/varstream/node_modules/isarray": {
-            "version": "0.0.1",
-            "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-            "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-            "dev": true
-        },
-        "node_modules/varstream/node_modules/readable-stream": {
-            "version": "1.1.14",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-            "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-sso/node_modules/@aws-sdk/types": {
+            "version": "3.609.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.1",
-                "isarray": "0.0.1",
-                "string_decoder": "~0.10.x"
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/varstream/node_modules/string_decoder": {
-            "version": "0.10.31",
-            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-            "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-            "dev": true
-        },
-        "node_modules/vary": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-            "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/core": "3.758.0",
+                "@aws-sdk/nested-clients": "3.758.0",
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 0.8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vinyl": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
-            "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@aws-sdk/core": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "clone": "^2.1.1",
-                "clone-buffer": "^1.0.0",
-                "clone-stats": "^1.0.0",
-                "cloneable-readable": "^1.0.0",
-                "remove-trailing-separator": "^1.0.1",
-                "replace-ext": "^1.0.0"
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/core": "^3.1.5",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/signature-v4": "^5.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.10"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vsce": {
-            "version": "2.6.7",
-            "resolved": "https://registry.npmjs.org/vsce/-/vsce-2.6.7.tgz",
-            "integrity": "sha512-5dEtdi/yzWQbOU7JDUSOs8lmSzzkewBR5P122BUkmXE6A/DEdFsKNsg2773NGXJTwwF1MfsOgUR6QVF3cLLJNQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@aws-sdk/types": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "azure-devops-node-api": "^11.0.1",
-                "chalk": "^2.4.2",
-                "cheerio": "^1.0.0-rc.9",
-                "commander": "^6.1.0",
-                "glob": "^7.0.6",
-                "hosted-git-info": "^4.0.2",
-                "keytar": "^7.7.0",
-                "leven": "^3.1.0",
-                "markdown-it": "^12.3.2",
-                "mime": "^1.3.4",
-                "minimatch": "^3.0.3",
-                "parse-semver": "^1.1.1",
-                "read": "^1.0.7",
-                "semver": "^5.1.0",
-                "tmp": "^0.2.1",
-                "typed-rest-client": "^1.8.4",
-                "url-join": "^4.0.1",
-                "xml2js": "^0.4.23",
-                "yauzl": "^2.3.1",
-                "yazl": "^2.2.2"
-            },
-            "bin": {
-                "vsce": "vsce"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 14"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vsce/node_modules/ansi-styles": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-            "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@smithy/abort-controller": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "color-convert": "^1.9.0"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vsce/node_modules/chalk": {
-            "version": "2.4.2",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-            "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@smithy/core": {
+            "version": "3.1.5",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "ansi-styles": "^3.2.1",
-                "escape-string-regexp": "^1.0.5",
-                "supports-color": "^5.3.0"
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-stream": "^4.1.2",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vsce/node_modules/color-convert": {
-            "version": "1.9.3",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@smithy/fetch-http-handler": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "color-name": "1.1.3"
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/querystring-builder": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-base64": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vsce/node_modules/color-name": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-            "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-            "dev": true
-        },
-        "node_modules/vsce/node_modules/escape-string-regexp": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-            "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@smithy/is-array-buffer": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.8.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vsce/node_modules/has-flag": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-            "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@smithy/middleware-endpoint": {
+            "version": "4.0.6",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/core": "^3.1.5",
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "@smithy/util-middleware": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=4"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vsce/node_modules/semver": {
-            "version": "5.7.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-            "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-            "dev": true,
-            "bin": {
-                "semver": "bin/semver"
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@smithy/middleware-serde": {
+            "version": "4.0.2",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vsce/node_modules/supports-color": {
-            "version": "5.5.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-            "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@smithy/middleware-stack": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "has-flag": "^3.0.0"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vscode-json-languageservice": {
-            "version": "3.4.9",
-            "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.4.9.tgz",
-            "integrity": "sha512-4VCpZ9ooea/Zc/MTnj1ccc9C7rqcoinKVQLhLoi6jw6yueSf4y4tg/YIUiPPVMlEAG7ZCPS+NVmqxisQ+mOsSw==",
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@smithy/node-config-provider": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "jsonc-parser": "^2.2.0",
-                "vscode-languageserver-textdocument": "^1.0.0-next.4",
-                "vscode-languageserver-types": "^3.15.0-next.6",
-                "vscode-nls": "^4.1.1",
-                "vscode-uri": "^2.1.0"
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vscode-json-languageservice/node_modules/jsonc-parser": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz",
-            "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg=="
-        },
-        "node_modules/vscode-json-languageservice/node_modules/vscode-nls": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.2.tgz",
-            "integrity": "sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw=="
-        },
-        "node_modules/vscode-jsonrpc": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz",
-            "integrity": "sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A==",
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@smithy/node-http-handler": {
+            "version": "4.0.3",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/abort-controller": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/querystring-builder": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8.0.0 || >=10.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vscode-languageclient": {
-            "version": "6.1.4",
-            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.4.tgz",
-            "integrity": "sha512-EUOU+bJu6axmt0RFNo3nrglQLPXMfanbYViJee3Fbn2VuQoX0ZOI4uTYhSRvYLP2vfwTP/juV62P/mksCdTZMA==",
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@smithy/property-provider": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "semver": "^6.3.0",
-                "vscode-languageserver-protocol": "3.15.3"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "vscode": "^1.41.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vscode-languageclient/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-            "bin": {
-                "semver": "bin/semver.js"
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@smithy/protocol-http": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vscode-languageserver": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.1.1.tgz",
-            "integrity": "sha512-DueEpkUAkD5XTR4MLYNr6bQIp/UFR0/IPApgXU3YfCBCB08u2sm9hRCs6DxYZELkk++STPjpcjksR2H8qI3cDQ==",
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@smithy/querystring-builder": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "vscode-languageserver-protocol": "^3.15.3"
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "tslib": "^2.6.2"
             },
-            "bin": {
-                "installServerIntoExtension": "bin/installServerIntoExtension"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vscode-languageserver-protocol": {
-            "version": "3.15.3",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz",
-            "integrity": "sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==",
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@smithy/querystring-parser": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "vscode-jsonrpc": "^5.0.1",
-                "vscode-languageserver-types": "3.15.1"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vscode-languageserver-protocol/node_modules/vscode-languageserver-types": {
-            "version": "3.15.1",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz",
-            "integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="
-        },
-        "node_modules/vscode-languageserver-textdocument": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.3.tgz",
-            "integrity": "sha512-ynEGytvgTb6HVSUwPJIAZgiHQmPCx8bZ8w5um5Lz+q5DjP0Zj8wTFhQpyg8xaMvefDytw2+HH5yzqS+FhsR28A=="
-        },
-        "node_modules/vscode-languageserver-types": {
-            "version": "3.16.0",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz",
-            "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA=="
-        },
-        "node_modules/vscode-nls": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.0.tgz",
-            "integrity": "sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA=="
-        },
-        "node_modules/vscode-nls-dev": {
-            "version": "3.3.2",
-            "resolved": "https://registry.npmjs.org/vscode-nls-dev/-/vscode-nls-dev-3.3.2.tgz",
-            "integrity": "sha512-/YJY/LegZ0jsWFd8BforDmXpwWKprM7L3rL0kLEvjQxOJw6qtmnoUJorLIv0ZXjebeyhI3mc8hjmQr479ykLIQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@smithy/shared-ini-file-loader": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "ansi-colors": "^3.2.3",
-                "clone": "^2.1.1",
-                "event-stream": "^3.3.4",
-                "fancy-log": "^1.3.3",
-                "glob": "^7.1.2",
-                "iconv-lite": "^0.4.19",
-                "is": "^3.2.1",
-                "source-map": "^0.6.1",
-                "typescript": "^3.9.5",
-                "vinyl": "^2.1.0",
-                "xml2js": "^0.4.19",
-                "yargs": "^13.2.4"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
-            "bin": {
-                "vscl": "lib/vscl.js"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vscode-nls-dev/node_modules/ansi-colors": {
-            "version": "3.2.4",
-            "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
-            "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@smithy/signature-v4": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/is-array-buffer": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vscode-nls-dev/node_modules/ansi-styles": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-            "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@smithy/smithy-client": {
+            "version": "4.1.6",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "color-convert": "^1.9.0"
+                "@smithy/core": "^3.1.5",
+                "@smithy/middleware-endpoint": "^4.0.6",
+                "@smithy/middleware-stack": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-stream": "^4.1.2",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=4"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vscode-nls-dev/node_modules/camelcase": {
-            "version": "5.3.1",
-            "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-            "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@smithy/types": {
+            "version": "4.1.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vscode-nls-dev/node_modules/cliui": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-            "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@smithy/url-parser": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "string-width": "^3.1.0",
-                "strip-ansi": "^5.2.0",
-                "wrap-ansi": "^5.1.0"
+                "@smithy/querystring-parser": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vscode-nls-dev/node_modules/color-convert": {
-            "version": "1.9.3",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@smithy/util-base64": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "color-name": "1.1.3"
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vscode-nls-dev/node_modules/color-name": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-            "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-            "dev": true
-        },
-        "node_modules/vscode-nls-dev/node_modules/decamelize": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-            "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@smithy/util-body-length-browser": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vscode-nls-dev/node_modules/emoji-regex": {
-            "version": "7.0.3",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-            "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-            "dev": true
-        },
-        "node_modules/vscode-nls-dev/node_modules/find-up": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-            "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@smithy/util-buffer-from": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "locate-path": "^3.0.0"
+                "@smithy/is-array-buffer": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vscode-nls-dev/node_modules/is-fullwidth-code-point": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-            "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@smithy/util-hex-encoding": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=4"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vscode-nls-dev/node_modules/locate-path": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-            "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@smithy/util-middleware": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "p-locate": "^3.0.0",
-                "path-exists": "^3.0.0"
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vscode-nls-dev/node_modules/p-limit": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-            "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@smithy/util-stream": {
+            "version": "4.1.2",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "p-try": "^2.0.0"
+                "@smithy/fetch-http-handler": "^5.0.1",
+                "@smithy/node-http-handler": "^4.0.3",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vscode-nls-dev/node_modules/p-locate": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-            "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@smithy/util-uri-escape": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "p-limit": "^2.0.0"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vscode-nls-dev/node_modules/path-exists": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-            "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-provider-web-identity/node_modules/@smithy/util-utf8": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/util-buffer-from": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/credential-providers": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.730.0.tgz",
+            "integrity": "sha512-Z25yfmHOehgIDVyY8h7GmAEbodHD2iLgNmrBBkkJXCE6d4GwDet3Qeyw4bQPPyuycBtYOUiz5Oco03+YGOEhYA==",
+            "dependencies": {
+                "@aws-sdk/client-cognito-identity": "3.730.0",
+                "@aws-sdk/core": "3.730.0",
+                "@aws-sdk/credential-provider-cognito-identity": "3.730.0",
+                "@aws-sdk/credential-provider-env": "3.730.0",
+                "@aws-sdk/credential-provider-http": "3.730.0",
+                "@aws-sdk/credential-provider-ini": "3.730.0",
+                "@aws-sdk/credential-provider-node": "3.730.0",
+                "@aws-sdk/credential-provider-process": "3.730.0",
+                "@aws-sdk/credential-provider-sso": "3.730.0",
+                "@aws-sdk/credential-provider-web-identity": "3.730.0",
+                "@aws-sdk/nested-clients": "3.730.0",
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/credential-provider-imds": "^4.0.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/credential-providers/node_modules/@aws-sdk/client-sso": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.730.0.tgz",
+            "integrity": "sha512-mI8kqkSuVlZklewEmN7jcbBMyVODBld3MsTjCKSl5ztduuPX69JD7nXLnWWPkw1PX4aGTO24AEoRMGNxntoXUg==",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.730.0",
+                "@aws-sdk/middleware-host-header": "3.723.0",
+                "@aws-sdk/middleware-logger": "3.723.0",
+                "@aws-sdk/middleware-recursion-detection": "3.723.0",
+                "@aws-sdk/middleware-user-agent": "3.730.0",
+                "@aws-sdk/region-config-resolver": "3.723.0",
+                "@aws-sdk/types": "3.723.0",
+                "@aws-sdk/util-endpoints": "3.730.0",
+                "@aws-sdk/util-user-agent-browser": "3.723.0",
+                "@aws-sdk/util-user-agent-node": "3.730.0",
+                "@smithy/config-resolver": "^4.0.0",
+                "@smithy/core": "^3.0.0",
+                "@smithy/fetch-http-handler": "^5.0.0",
+                "@smithy/hash-node": "^4.0.0",
+                "@smithy/invalid-dependency": "^4.0.0",
+                "@smithy/middleware-content-length": "^4.0.0",
+                "@smithy/middleware-endpoint": "^4.0.0",
+                "@smithy/middleware-retry": "^4.0.0",
+                "@smithy/middleware-serde": "^4.0.0",
+                "@smithy/middleware-stack": "^4.0.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/node-http-handler": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/smithy-client": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/url-parser": "^4.0.0",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.0",
+                "@smithy/util-defaults-mode-node": "^4.0.0",
+                "@smithy/util-endpoints": "^3.0.0",
+                "@smithy/util-middleware": "^4.0.0",
+                "@smithy/util-retry": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/credential-providers/node_modules/@aws-sdk/core": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.730.0.tgz",
+            "integrity": "sha512-jonKyR+2GcqbZj2WDICZS0c633keLc9qwXnePu83DfAoFXMMIMyoR/7FOGf8F3OrIdGh8KzE9VvST+nZCK9EJA==",
+            "dependencies": {
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/core": "^3.0.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/signature-v4": "^5.0.0",
+                "@smithy/smithy-client": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.0",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/credential-providers/node_modules/@aws-sdk/credential-provider-env": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.730.0.tgz",
+            "integrity": "sha512-fFXgo3jBXLWqu8I07Hd96mS7RjrtpDgm3bZShm0F3lKtqDQF+hObFWq9A013SOE+RjMLVfbABhToXAYct3FcBw==",
+            "dependencies": {
+                "@aws-sdk/core": "3.730.0",
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/credential-providers/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.730.0.tgz",
+            "integrity": "sha512-1aF3elbCzpVhWLAuV63iFElfLOqLGGTp4fkf2VAFIDO3hjshpXUQssTgIWiBwwtJYJdOSxaFrCU7u8frjr/5aQ==",
+            "dependencies": {
+                "@aws-sdk/core": "3.730.0",
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/fetch-http-handler": "^5.0.0",
+                "@smithy/node-http-handler": "^4.0.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/smithy-client": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/util-stream": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/credential-providers/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.730.0.tgz",
+            "integrity": "sha512-zwsxkBuQuPp06o45ATAnznHzj3+ibop/EaTytNzSv0O87Q59K/jnS/bdtv1n6bhe99XCieRNTihvtS7YklzK7A==",
+            "dependencies": {
+                "@aws-sdk/core": "3.730.0",
+                "@aws-sdk/credential-provider-env": "3.730.0",
+                "@aws-sdk/credential-provider-http": "3.730.0",
+                "@aws-sdk/credential-provider-process": "3.730.0",
+                "@aws-sdk/credential-provider-sso": "3.730.0",
+                "@aws-sdk/credential-provider-web-identity": "3.730.0",
+                "@aws-sdk/nested-clients": "3.730.0",
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/credential-provider-imds": "^4.0.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/shared-ini-file-loader": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=4"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vscode-nls-dev/node_modules/string-width": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-            "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.730.0.tgz",
+            "integrity": "sha512-ztRjh1edY7ut2wwrj1XqHtqPY/NXEYIk5fYf04KKsp8zBi81ScVqP7C+Cst6PFKixjgLSG6RsqMx9GSAalVv0Q==",
             "dependencies": {
-                "emoji-regex": "^7.0.1",
-                "is-fullwidth-code-point": "^2.0.0",
-                "strip-ansi": "^5.1.0"
+                "@aws-sdk/credential-provider-env": "3.730.0",
+                "@aws-sdk/credential-provider-http": "3.730.0",
+                "@aws-sdk/credential-provider-ini": "3.730.0",
+                "@aws-sdk/credential-provider-process": "3.730.0",
+                "@aws-sdk/credential-provider-sso": "3.730.0",
+                "@aws-sdk/credential-provider-web-identity": "3.730.0",
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/credential-provider-imds": "^4.0.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/shared-ini-file-loader": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vscode-nls-dev/node_modules/typescript": {
-            "version": "3.9.10",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
-            "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==",
-            "dev": true,
-            "bin": {
-                "tsc": "bin/tsc",
-                "tsserver": "bin/tsserver"
+        "node_modules/@aws-sdk/credential-providers/node_modules/@aws-sdk/credential-provider-process": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.730.0.tgz",
+            "integrity": "sha512-cNKUQ81eptfZN8MlSqwUq3+5ln8u/PcY57UmLZ+npxUHanqO1akpgcpNsLpmsIkoXGbtSQrLuDUgH86lS/SWOw==",
+            "dependencies": {
+                "@aws-sdk/core": "3.730.0",
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/shared-ini-file-loader": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=4.2.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vscode-nls-dev/node_modules/wrap-ansi": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-            "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.730.0.tgz",
+            "integrity": "sha512-SdI2xrTbquJLMxUh5LpSwB8zfiKq3/jso53xWRgrVfeDlrSzZuyV6QghaMs3KEEjcNzwEnTfSIjGQyRXG9VrEw==",
             "dependencies": {
-                "ansi-styles": "^3.2.0",
-                "string-width": "^3.0.0",
-                "strip-ansi": "^5.0.0"
+                "@aws-sdk/client-sso": "3.730.0",
+                "@aws-sdk/core": "3.730.0",
+                "@aws-sdk/token-providers": "3.730.0",
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/shared-ini-file-loader": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=6"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vscode-nls-dev/node_modules/y18n": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-            "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-            "dev": true
-        },
-        "node_modules/vscode-nls-dev/node_modules/yargs": {
-            "version": "13.3.2",
-            "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-            "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.730.0.tgz",
+            "integrity": "sha512-l5vdPmvF/d890pbvv5g1GZrdjaSQkyPH/Bc8dO/ZqkWxkIP8JNgl48S2zgf4DkP3ik9K2axWO828L5RsMDQzdA==",
             "dependencies": {
-                "cliui": "^5.0.0",
-                "find-up": "^3.0.0",
-                "get-caller-file": "^2.0.1",
-                "require-directory": "^2.1.1",
-                "require-main-filename": "^2.0.0",
-                "set-blocking": "^2.0.0",
-                "string-width": "^3.0.0",
-                "which-module": "^2.0.0",
-                "y18n": "^4.0.0",
-                "yargs-parser": "^13.1.2"
+                "@aws-sdk/core": "3.730.0",
+                "@aws-sdk/nested-clients": "3.730.0",
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vscode-nls-dev/node_modules/yargs-parser": {
-            "version": "13.1.2",
-            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-            "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.723.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.723.0.tgz",
+            "integrity": "sha512-LLVzLvk299pd7v4jN9yOSaWDZDfH0SnBPb6q+FDPaOCMGBY8kuwQso7e/ozIKSmZHRMGO3IZrflasHM+rI+2YQ==",
             "dependencies": {
-                "camelcase": "^5.0.0",
-                "decamelize": "^1.2.0"
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vscode-uri": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz",
-            "integrity": "sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A=="
-        },
-        "node_modules/vue": {
-            "version": "3.2.31",
-            "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.31.tgz",
-            "integrity": "sha512-odT3W2tcffTiQCy57nOT93INw1auq5lYLLYtWpPYQQYQOOdHiqFct9Xhna6GJ+pJQaF67yZABraH47oywkJgFw==",
+        "node_modules/@aws-sdk/credential-providers/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.723.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.723.0.tgz",
+            "integrity": "sha512-chASQfDG5NJ8s5smydOEnNK7N0gDMyuPbx7dYYcm1t/PKtnVfvWF+DHCTrRC2Ej76gLJVCVizlAJKM8v8Kg3cg==",
             "dependencies": {
-                "@vue/compiler-dom": "3.2.31",
-                "@vue/compiler-sfc": "3.2.31",
-                "@vue/runtime-dom": "3.2.31",
-                "@vue/server-renderer": "3.2.31",
-                "@vue/shared": "3.2.31"
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vue-loader": {
-            "version": "16.8.1",
-            "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.1.tgz",
-            "integrity": "sha512-V53TJbHmzjBhCG5OYI2JWy/aYDspz4oVHKxS43Iy212GjGIG1T3EsB3+GWXFm/1z5VwjdjLmdZUFYM70y77vtQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.723.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.723.0.tgz",
+            "integrity": "sha512-7usZMtoynT9/jxL/rkuDOFQ0C2mhXl4yCm67Rg7GNTstl67u7w5WN1aIRImMeztaKlw8ExjoTyo6WTs1Kceh7A==",
             "dependencies": {
-                "chalk": "^4.1.0",
-                "hash-sum": "^2.0.0",
-                "loader-utils": "^2.0.0"
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
             },
-            "peerDependencies": {
-                "webpack": "^4.1.0 || ^5.0.0-0"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vue-style-loader": {
-            "version": "4.1.3",
-            "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
-            "integrity": "sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.730.0.tgz",
+            "integrity": "sha512-aPMZvNmf2a42B41au3bA3ODU4HfHka2nYT/SAIhhVXH1ENYfAmZo7FraFPxetKepFMCtL7j4QE6/LDucK6liIw==",
             "dependencies": {
-                "hash-sum": "^1.0.2",
-                "loader-utils": "^1.0.2"
+                "@aws-sdk/core": "3.730.0",
+                "@aws-sdk/types": "3.723.0",
+                "@aws-sdk/util-endpoints": "3.730.0",
+                "@smithy/core": "^3.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vue-style-loader/node_modules/hash-sum": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
-            "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=",
-            "dev": true
-        },
-        "node_modules/vue-style-loader/node_modules/json5": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-            "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@aws-sdk/nested-clients": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.730.0.tgz",
+            "integrity": "sha512-vilIgf1/7kre8DdE5zAQkDOwHFb/TahMn/6j2RZwFLlK7cDk91r19deSiVYnKQkupDMtOfNceNqnorM4I3PDzw==",
             "dependencies": {
-                "minimist": "^1.2.0"
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.730.0",
+                "@aws-sdk/middleware-host-header": "3.723.0",
+                "@aws-sdk/middleware-logger": "3.723.0",
+                "@aws-sdk/middleware-recursion-detection": "3.723.0",
+                "@aws-sdk/middleware-user-agent": "3.730.0",
+                "@aws-sdk/region-config-resolver": "3.723.0",
+                "@aws-sdk/types": "3.723.0",
+                "@aws-sdk/util-endpoints": "3.730.0",
+                "@aws-sdk/util-user-agent-browser": "3.723.0",
+                "@aws-sdk/util-user-agent-node": "3.730.0",
+                "@smithy/config-resolver": "^4.0.0",
+                "@smithy/core": "^3.0.0",
+                "@smithy/fetch-http-handler": "^5.0.0",
+                "@smithy/hash-node": "^4.0.0",
+                "@smithy/invalid-dependency": "^4.0.0",
+                "@smithy/middleware-content-length": "^4.0.0",
+                "@smithy/middleware-endpoint": "^4.0.0",
+                "@smithy/middleware-retry": "^4.0.0",
+                "@smithy/middleware-serde": "^4.0.0",
+                "@smithy/middleware-stack": "^4.0.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/node-http-handler": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/smithy-client": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/url-parser": "^4.0.0",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.0",
+                "@smithy/util-defaults-mode-node": "^4.0.0",
+                "@smithy/util-endpoints": "^3.0.0",
+                "@smithy/util-middleware": "^4.0.0",
+                "@smithy/util-retry": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
-            "bin": {
-                "json5": "lib/cli.js"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vue-style-loader/node_modules/loader-utils": {
-            "version": "1.4.2",
-            "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
-            "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.723.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.723.0.tgz",
+            "integrity": "sha512-tGF/Cvch3uQjZIj34LY2mg8M2Dr4kYG8VU8Yd0dFnB1ybOEOveIK/9ypUo9ycZpB9oO6q01KRe5ijBaxNueUQg==",
             "dependencies": {
-                "big.js": "^5.2.2",
-                "emojis-list": "^3.0.0",
-                "json5": "^1.0.1"
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=4.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vue/node_modules/@vue/compiler-sfc": {
-            "version": "3.2.31",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.31.tgz",
-            "integrity": "sha512-748adc9msSPGzXgibHiO6T7RWgfnDcVQD+VVwYgSsyyY8Ans64tALHZANrKtOzvkwznV/F4H7OAod/jIlp/dkQ==",
+        "node_modules/@aws-sdk/credential-providers/node_modules/@aws-sdk/token-providers": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.730.0.tgz",
+            "integrity": "sha512-BSPssGj54B/AABWXARIPOT/1ybFahM1ldlfmXy9gRmZi/afe9geWJGlFYCCt3PmqR+1Ny5XIjSfue+kMd//drQ==",
             "dependencies": {
-                "@babel/parser": "^7.16.4",
-                "@vue/compiler-core": "3.2.31",
-                "@vue/compiler-dom": "3.2.31",
-                "@vue/compiler-ssr": "3.2.31",
-                "@vue/reactivity-transform": "3.2.31",
-                "@vue/shared": "3.2.31",
-                "estree-walker": "^2.0.2",
-                "magic-string": "^0.25.7",
-                "postcss": "^8.1.10",
-                "source-map": "^0.6.1"
+                "@aws-sdk/nested-clients": "3.730.0",
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/shared-ini-file-loader": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/credential-providers/node_modules/@aws-sdk/types": {
+            "version": "3.723.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.723.0.tgz",
+            "integrity": "sha512-LmK3kwiMZG1y5g3LGihT9mNkeNOmwEyPk6HGcJqh0wOSV4QpWoKu2epyKE4MLQNUUlz2kOVbVbOrwmI6ZcteuA==",
+            "dependencies": {
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/vue/node_modules/@vue/reactivity-transform": {
-            "version": "3.2.31",
-            "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.31.tgz",
-            "integrity": "sha512-uS4l4z/W7wXdI+Va5pgVxBJ345wyGFKvpPYtdSgvfJfX/x2Ymm6ophQlXXB6acqGHtXuBqNyyO3zVp9b1r0MOA==",
+        "node_modules/@aws-sdk/credential-providers/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.730.0.tgz",
+            "integrity": "sha512-1KTFuVnk+YtLgWr6TwDiggcDqtPpOY2Cszt3r2lkXfaEAX6kHyOZi1vdvxXjPU5LsOBJem8HZ7KlkmrEi+xowg==",
             "dependencies": {
-                "@babel/parser": "^7.16.4",
-                "@vue/compiler-core": "3.2.31",
-                "@vue/shared": "3.2.31",
-                "estree-walker": "^2.0.2",
-                "magic-string": "^0.25.7"
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/util-endpoints": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/credential-providers/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.723.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.723.0.tgz",
+            "integrity": "sha512-Wh9I6j2jLhNFq6fmXydIpqD1WyQLyTfSxjW9B+PXSnPyk3jtQW8AKQur7p97rO8LAUzVI0bv8kb3ZzDEVbquIg==",
+            "dependencies": {
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/types": "^4.0.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
             }
         },
-        "node_modules/watchpack": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz",
-            "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.730.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.730.0.tgz",
+            "integrity": "sha512-yBvkOAjqsDEl1va4eHNOhnFBk0iCY/DBFNyhvtTMqPF4NO+MITWpFs3J9JtZKzJlQ6x0Yb9TLQ8NhDjEISz5Ug==",
             "dependencies": {
-                "glob-to-regexp": "^0.4.1",
-                "graceful-fs": "^4.1.2"
+                "@aws-sdk/middleware-user-agent": "3.730.0",
+                "@aws-sdk/types": "3.723.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10.13.0"
+                "node": ">=18.0.0"
+            },
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
             }
         },
-        "node_modules/wawoff2": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/wawoff2/-/wawoff2-2.0.1.tgz",
-            "integrity": "sha512-r0CEmvpH63r4T15ebFqeOjGqU4+EgTx4I510NtK35EMciSdcTxCw3Byy3JnBonz7iyIFZ0AbVo0bbFpEVuhCYA==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/abort-controller": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-4.0.4.tgz",
+            "integrity": "sha512-gJnEjZMvigPDQWHrW3oPrFhQtkrgqBkyjj3pCIdF3A5M6vsZODG93KNlfJprv6bp4245bdT32fsHK4kkH3KYDA==",
             "dependencies": {
-                "argparse": "^2.0.1"
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
-            "bin": {
-                "woff2_compress.js": "bin/woff2_compress.js",
-                "woff2_decompress.js": "bin/woff2_decompress.js"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/wbuf": {
-            "version": "1.7.3",
-            "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-            "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/config-resolver": {
+            "version": "4.1.4",
+            "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-4.1.4.tgz",
+            "integrity": "sha512-prmU+rDddxHOH0oNcwemL+SwnzcG65sBF2yXRO7aeXIn/xTlq2pX7JLVbkBnVLowHLg4/OL4+jBmv9hVrVGS+w==",
             "dependencies": {
-                "minimalistic-assert": "^1.0.0"
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.4",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/webfont": {
-            "version": "11.2.26",
-            "resolved": "https://registry.npmjs.org/webfont/-/webfont-11.2.26.tgz",
-            "integrity": "sha512-ms9abzcJGMBj5yVTpNfAcyQB0SNzmi10aBlKLC7kAt1TQ5eZqieRhvhxN1BrXaizWV0nksp6vLqBfaJmBWmF7Q==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/core": {
+            "version": "3.5.3",
+            "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.5.3.tgz",
+            "integrity": "sha512-xa5byV9fEguZNofCclv6v9ra0FYh5FATQW/da7FQUVTic94DfrN/NvmKZjrMyzbpqfot9ZjBaO8U1UeTbmSLuA==",
             "dependencies": {
-                "cosmiconfig": "^5.2.0",
-                "deepmerge": "^4.2.2",
-                "globby": "^11.0.0",
-                "meow": "^9.0.0",
-                "nunjucks": "^3.2.3",
-                "p-limit": "^3.1.0",
-                "parse-json": "^5.2.0",
-                "resolve-from": "^5.0.0",
-                "svg2ttf": "^6.0.2",
-                "svgicons2svgfont": "^10.0.3",
-                "ttf2eot": "^2.0.0",
-                "ttf2woff": "^2.0.2",
-                "wawoff2": "^2.0.0",
-                "xml2js": "^0.4.23"
-            },
-            "bin": {
-                "webfont": "dist/cli.js"
+                "@smithy/middleware-serde": "^4.0.8",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-stream": "^4.2.2",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/webfont/node_modules/resolve-from": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-            "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/credential-provider-imds": {
+            "version": "4.0.6",
+            "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-4.0.6.tgz",
+            "integrity": "sha512-hKMWcANhUiNbCJouYkZ9V3+/Qf9pteR1dnwgdyzR09R4ODEYx8BbUysHwRSyex4rZ9zapddZhLFTnT4ZijR4pw==",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "@smithy/url-parser": "^4.0.4",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/webpack": {
-            "version": "5.65.0",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.65.0.tgz",
-            "integrity": "sha512-Q5or2o6EKs7+oKmJo7LaqZaMOlDWQse9Tm5l1WAfU/ujLGN5Pb0SqGeVkN/4bpPmEqEP5RnVhiqsOtWtUVwGRw==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/fetch-http-handler": {
+            "version": "5.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.0.4.tgz",
+            "integrity": "sha512-AMtBR5pHppYMVD7z7G+OlHHAcgAN7v0kVKEpHuTO4Gb199Gowh0taYi9oDStFeUhetkeP55JLSVlTW1n9rFtUw==",
             "dependencies": {
-                "@types/eslint-scope": "^3.7.0",
-                "@types/estree": "^0.0.50",
-                "@webassemblyjs/ast": "1.11.1",
-                "@webassemblyjs/wasm-edit": "1.11.1",
-                "@webassemblyjs/wasm-parser": "1.11.1",
-                "acorn": "^8.4.1",
-                "acorn-import-assertions": "^1.7.6",
-                "browserslist": "^4.14.5",
-                "chrome-trace-event": "^1.0.2",
-                "enhanced-resolve": "^5.8.3",
-                "es-module-lexer": "^0.9.0",
-                "eslint-scope": "5.1.1",
-                "events": "^3.2.0",
-                "glob-to-regexp": "^0.4.1",
-                "graceful-fs": "^4.2.4",
-                "json-parse-better-errors": "^1.0.2",
-                "loader-runner": "^4.2.0",
-                "mime-types": "^2.1.27",
-                "neo-async": "^2.6.2",
-                "schema-utils": "^3.1.0",
-                "tapable": "^2.1.1",
-                "terser-webpack-plugin": "^5.1.3",
-                "watchpack": "^2.3.1",
-                "webpack-sources": "^3.2.2"
-            },
-            "bin": {
-                "webpack": "bin/webpack.js"
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/querystring-builder": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-base64": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10.13.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/webpack"
-            },
-            "peerDependenciesMeta": {
-                "webpack-cli": {
-                    "optional": true
-                }
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/webpack-cli": {
-            "version": "4.9.1",
-            "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.1.tgz",
-            "integrity": "sha512-JYRFVuyFpzDxMDB+v/nanUdQYcZtqFPGzmlW4s+UkPMFhSpfRNmf1z4AwYcHJVdvEFAM7FFCQdNTpsBYhDLusQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/hash-node": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-4.0.4.tgz",
+            "integrity": "sha512-qnbTPUhCVnCgBp4z4BUJUhOEkVwxiEi1cyFM+Zj6o+aY8OFGxUQleKWq8ltgp3dujuhXojIvJWdoqpm6dVO3lQ==",
             "dependencies": {
-                "@discoveryjs/json-ext": "^0.5.0",
-                "@webpack-cli/configtest": "^1.1.0",
-                "@webpack-cli/info": "^1.4.0",
-                "@webpack-cli/serve": "^1.6.0",
-                "colorette": "^2.0.14",
-                "commander": "^7.0.0",
-                "execa": "^5.0.0",
-                "fastest-levenshtein": "^1.0.12",
-                "import-local": "^3.0.2",
-                "interpret": "^2.2.0",
-                "rechoir": "^0.7.0",
-                "webpack-merge": "^5.7.3"
-            },
-            "bin": {
-                "webpack-cli": "bin/cli.js"
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10.13.0"
-            },
-            "peerDependencies": {
-                "webpack": "4.x.x || 5.x.x"
-            },
-            "peerDependenciesMeta": {
-                "@webpack-cli/generators": {
-                    "optional": true
-                },
-                "@webpack-cli/migrate": {
-                    "optional": true
-                },
-                "webpack-bundle-analyzer": {
-                    "optional": true
-                },
-                "webpack-dev-server": {
-                    "optional": true
-                }
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/webpack-cli/node_modules/commander": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-            "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/invalid-dependency": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-4.0.4.tgz",
+            "integrity": "sha512-bNYMi7WKTJHu0gn26wg8OscncTt1t2b8KcsZxvOv56XA6cyXtOAAAaNP7+m45xfppXfOatXF3Sb1MNsLUgVLTw==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">= 10"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/webpack-cli/node_modules/execa": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-            "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/is-array-buffer": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-4.0.0.tgz",
+            "integrity": "sha512-saYhF8ZZNoJDTvJBEWgeBccCg+yvp1CX+ed12yORU3NilJScfc6gfch2oVb4QgxZrGUx3/ZJlb+c/dJbyupxlw==",
             "dependencies": {
-                "cross-spawn": "^7.0.3",
-                "get-stream": "^6.0.0",
-                "human-signals": "^2.1.0",
-                "is-stream": "^2.0.0",
-                "merge-stream": "^2.0.0",
-                "npm-run-path": "^4.0.1",
-                "onetime": "^5.1.2",
-                "signal-exit": "^3.0.3",
-                "strip-final-newline": "^2.0.0"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sindresorhus/execa?sponsor=1"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/webpack-cli/node_modules/get-stream": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-            "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/middleware-content-length": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-4.0.4.tgz",
+            "integrity": "sha512-F7gDyfI2BB1Kc+4M6rpuOLne5LOcEknH1n6UQB69qv+HucXBR1rkzXBnQTB2q46sFy1PM/zuSJOB532yc8bg3w==",
+            "dependencies": {
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/webpack-cli/node_modules/human-signals": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-            "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-            "dev": true,
             "engines": {
-                "node": ">=10.17.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/webpack-dev-middleware": {
-            "version": "5.3.3",
-            "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
-            "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/middleware-endpoint": {
+            "version": "4.1.11",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.1.11.tgz",
+            "integrity": "sha512-zDogwtRLzKl58lVS8wPcARevFZNBOOqnmzWWxVe9XiaXU2CADFjvJ9XfNibgkOWs08sxLuSr81NrpY4mgp9OwQ==",
             "dependencies": {
-                "colorette": "^2.0.10",
-                "memfs": "^3.4.3",
-                "mime-types": "^2.1.31",
-                "range-parser": "^1.2.1",
-                "schema-utils": "^4.0.0"
+                "@smithy/core": "^3.5.3",
+                "@smithy/middleware-serde": "^4.0.8",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/shared-ini-file-loader": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "@smithy/url-parser": "^4.0.4",
+                "@smithy/util-middleware": "^4.0.4",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.13.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/webpack"
-            },
-            "peerDependencies": {
-                "webpack": "^4.0.0 || ^5.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/webpack-dev-middleware/node_modules/ajv": {
-            "version": "8.11.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-            "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/middleware-retry": {
+            "version": "4.1.12",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.1.12.tgz",
+            "integrity": "sha512-wvIH70c4e91NtRxdaLZF+mbLZ/HcC6yg7ySKUiufL6ESp6zJUSnJucZ309AvG9nqCFHSRB5I6T3Ez1Q9wCh0Ww==",
             "dependencies": {
-                "fast-deep-equal": "^3.1.1",
-                "json-schema-traverse": "^1.0.0",
-                "require-from-string": "^2.0.2",
-                "uri-js": "^4.2.2"
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/service-error-classification": "^4.0.5",
+                "@smithy/smithy-client": "^4.4.3",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-retry": "^4.0.5",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
             },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/epoberezkin"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/webpack-dev-middleware/node_modules/ajv-keywords": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-            "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/middleware-serde": {
+            "version": "4.0.8",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-4.0.8.tgz",
+            "integrity": "sha512-iSSl7HJoJaGyMIoNn2B7czghOVwJ9nD7TMvLhMWeSB5vt0TnEYyRRqPJu/TqW76WScaNvYYB8nRoiBHR9S1Ddw==",
             "dependencies": {
-                "fast-deep-equal": "^3.1.3"
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
-            "peerDependencies": {
-                "ajv": "^8.8.2"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/webpack-dev-middleware/node_modules/json-schema-traverse": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-            "dev": true
-        },
-        "node_modules/webpack-dev-middleware/node_modules/schema-utils": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-            "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/middleware-stack": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-4.0.4.tgz",
+            "integrity": "sha512-kagK5ggDrBUCCzI93ft6DjteNSfY8Ulr83UtySog/h09lTIOAJ/xUSObutanlPT0nhoHAkpmW9V5K8oPyLh+QA==",
             "dependencies": {
-                "@types/json-schema": "^7.0.9",
-                "ajv": "^8.8.0",
-                "ajv-formats": "^2.1.1",
-                "ajv-keywords": "^5.0.0"
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.13.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/webpack"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/webpack-dev-server": {
-            "version": "4.9.2",
-            "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.9.2.tgz",
-            "integrity": "sha512-H95Ns95dP24ZsEzO6G9iT+PNw4Q7ltll1GfJHV4fKphuHWgKFzGHWi4alTlTnpk1SPPk41X+l2RB7rLfIhnB9Q==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/node-config-provider": {
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-4.1.3.tgz",
+            "integrity": "sha512-HGHQr2s59qaU1lrVH6MbLlmOBxadtzTsoO4c+bF5asdgVik3I8o7JIOzoeqWc5MjVa+vD36/LWE0iXKpNqooRw==",
             "dependencies": {
-                "@types/bonjour": "^3.5.9",
-                "@types/connect-history-api-fallback": "^1.3.5",
-                "@types/express": "^4.17.13",
-                "@types/serve-index": "^1.9.1",
-                "@types/serve-static": "^1.13.10",
-                "@types/sockjs": "^0.3.33",
-                "@types/ws": "^8.5.1",
-                "ansi-html-community": "^0.0.8",
-                "bonjour-service": "^1.0.11",
-                "chokidar": "^3.5.3",
-                "colorette": "^2.0.10",
-                "compression": "^1.7.4",
-                "connect-history-api-fallback": "^1.6.0",
-                "default-gateway": "^6.0.3",
-                "express": "^4.17.3",
-                "graceful-fs": "^4.2.6",
-                "html-entities": "^2.3.2",
-                "http-proxy-middleware": "^2.0.3",
-                "ipaddr.js": "^2.0.1",
-                "open": "^8.0.9",
-                "p-retry": "^4.5.0",
-                "rimraf": "^3.0.2",
-                "schema-utils": "^4.0.0",
-                "selfsigned": "^2.0.1",
-                "serve-index": "^1.9.1",
-                "sockjs": "^0.3.24",
-                "spdy": "^4.0.2",
-                "webpack-dev-middleware": "^5.3.1",
-                "ws": "^8.4.2"
-            },
-            "bin": {
-                "webpack-dev-server": "bin/webpack-dev-server.js"
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/shared-ini-file-loader": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.13.0"
-            },
-            "peerDependencies": {
-                "webpack": "^4.37.0 || ^5.0.0"
-            },
-            "peerDependenciesMeta": {
-                "webpack-cli": {
-                    "optional": true
-                }
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/webpack-dev-server/node_modules/ajv": {
-            "version": "8.8.2",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz",
-            "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/node-http-handler": {
+            "version": "4.0.6",
+            "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.0.6.tgz",
+            "integrity": "sha512-NqbmSz7AW2rvw4kXhKGrYTiJVDHnMsFnX4i+/FzcZAfbOBauPYs2ekuECkSbtqaxETLLTu9Rl/ex6+I2BKErPA==",
             "dependencies": {
-                "fast-deep-equal": "^3.1.1",
-                "json-schema-traverse": "^1.0.0",
-                "require-from-string": "^2.0.2",
-                "uri-js": "^4.2.2"
+                "@smithy/abort-controller": "^4.0.4",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/querystring-builder": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/epoberezkin"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/webpack-dev-server/node_modules/ajv-keywords": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-            "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/property-provider": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-4.0.4.tgz",
+            "integrity": "sha512-qHJ2sSgu4FqF4U/5UUp4DhXNmdTrgmoAai6oQiM+c5RZ/sbDwJ12qxB1M6FnP+Tn/ggkPZf9ccn4jqKSINaquw==",
             "dependencies": {
-                "fast-deep-equal": "^3.1.3"
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
-            "peerDependencies": {
-                "ajv": "^8.8.2"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/webpack-dev-server/node_modules/json-schema-traverse": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-            "dev": true
-        },
-        "node_modules/webpack-dev-server/node_modules/schema-utils": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-            "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/protocol-http": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-5.1.2.tgz",
+            "integrity": "sha512-rOG5cNLBXovxIrICSBm95dLqzfvxjEmuZx4KK3hWwPFHGdW3lxY0fZNXfv2zebfRO7sJZ5pKJYHScsqopeIWtQ==",
             "dependencies": {
-                "@types/json-schema": "^7.0.9",
-                "ajv": "^8.8.0",
-                "ajv-formats": "^2.1.1",
-                "ajv-keywords": "^5.0.0"
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.13.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/webpack"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/webpack-merge": {
-            "version": "5.8.0",
-            "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
-            "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/querystring-builder": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-4.0.4.tgz",
+            "integrity": "sha512-SwREZcDnEYoh9tLNgMbpop+UTGq44Hl9tdj3rf+yeLcfH7+J8OXEBaMc2kDxtyRHu8BhSg9ADEx0gFHvpJgU8w==",
             "dependencies": {
-                "clone-deep": "^4.0.1",
-                "wildcard": "^2.0.0"
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/webpack-sources": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
-            "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/querystring-parser": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-4.0.4.tgz",
+            "integrity": "sha512-6yZf53i/qB8gRHH/l2ZwUG5xgkPgQF15/KxH0DdXMDHjesA9MeZje/853ifkSY0x4m5S+dfDZ+c4x439PF0M2w==",
             "dependencies": {
-                "source-list-map": "^2.0.1",
-                "source-map": "^0.6.1"
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10.13.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/webpack/node_modules/acorn-import-assertions": {
-            "version": "1.8.0",
-            "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
-            "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-            "dev": true,
-            "peerDependencies": {
-                "acorn": "^8"
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/service-error-classification": {
+            "version": "4.0.5",
+            "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-4.0.5.tgz",
+            "integrity": "sha512-LvcfhrnCBvCmTee81pRlh1F39yTS/+kYleVeLCwNtkY8wtGg8V/ca9rbZZvYIl8OjlMtL6KIjaiL/lgVqHD2nA==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/webpack/node_modules/events": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-            "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/shared-ini-file-loader": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.0.4.tgz",
+            "integrity": "sha512-63X0260LoFBjrHifPDs+nM9tV0VMkOTl4JRMYNuKh/f5PauSjowTfvF3LogfkWdcPoxsA9UjqEOgjeYIbhb7Nw==",
+            "dependencies": {
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.8.x"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/webpack/node_modules/webpack-sources": {
-            "version": "3.2.2",
-            "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.2.tgz",
-            "integrity": "sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/signature-v4": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-5.1.2.tgz",
+            "integrity": "sha512-d3+U/VpX7a60seHziWnVZOHuEgJlclufjkS6zhXvxcJgkJq4UWdH5eOBLzHRMx6gXjsdT9h6lfpmLzbrdupHgQ==",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^4.0.0",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.4",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=10.13.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/websocket-driver": {
-            "version": "0.7.4",
-            "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-            "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/smithy-client": {
+            "version": "4.4.3",
+            "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.4.3.tgz",
+            "integrity": "sha512-xxzNYgA0HD6ETCe5QJubsxP0hQH3QK3kbpJz3QrosBCuIWyEXLR/CO5hFb2OeawEKUxMNhz3a1nuJNN2np2RMA==",
             "dependencies": {
-                "http-parser-js": ">=0.5.1",
-                "safe-buffer": ">=5.1.0",
-                "websocket-extensions": ">=0.1.1"
+                "@smithy/core": "^3.5.3",
+                "@smithy/middleware-endpoint": "^4.1.11",
+                "@smithy/middleware-stack": "^4.0.4",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-stream": "^4.2.2",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=0.8.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/websocket-extensions": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-            "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/types": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.3.1.tgz",
+            "integrity": "sha512-UqKOQBL2x6+HWl3P+3QqFD4ncKq0I8Nuz9QItGv5WuKuMHuuwlhvqcZCoXGfc+P1QmfJE7VieykoYYmrOoFJxA==",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.8.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/which": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-            "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/url-parser": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-4.0.4.tgz",
+            "integrity": "sha512-eMkc144MuN7B0TDA4U2fKs+BqczVbk3W+qIvcoCY6D1JY3hnAdCuhCZODC+GAeaxj0p6Jroz4+XMUn3PCxQQeQ==",
             "dependencies": {
-                "isexe": "^2.0.0"
-            },
-            "bin": {
-                "node-which": "bin/node-which"
+                "@smithy/querystring-parser": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/which-boxed-primitive": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-            "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/util-base64": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-4.0.0.tgz",
+            "integrity": "sha512-CvHfCmO2mchox9kjrtzoHkWHxjHZzaFojLc8quxXY7WAAMAg43nuxwv95tATVgQFNDwd4M9S1qFzj40Ul41Kmg==",
             "dependencies": {
-                "is-bigint": "^1.0.1",
-                "is-boolean-object": "^1.1.0",
-                "is-number-object": "^1.0.4",
-                "is-string": "^1.0.5",
-                "is-symbol": "^1.0.3"
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/which-module": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-            "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-            "dev": true
-        },
-        "node_modules/which-typed-array": {
-            "version": "1.1.8",
-            "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz",
-            "integrity": "sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw==",
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/util-body-length-browser": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-4.0.0.tgz",
+            "integrity": "sha512-sNi3DL0/k64/LO3A256M+m3CDdG6V7WKWHdAiBBMUN8S3hK3aMPhwnPik2A/a2ONN+9doY9UxaLfgqsIRg69QA==",
             "dependencies": {
-                "available-typed-arrays": "^1.0.5",
-                "call-bind": "^1.0.2",
-                "es-abstract": "^1.20.0",
-                "for-each": "^0.3.3",
-                "has-tostringtag": "^1.0.0",
-                "is-typed-array": "^1.1.9"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/wide-align": {
-            "version": "1.1.5",
-            "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
-            "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/util-body-length-node": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-4.0.0.tgz",
+            "integrity": "sha512-q0iDP3VsZzqJyje8xJWEJCNIu3lktUGVoSy1KB0UWym2CL1siV3artm+u1DFYTLejpsrdGyCSWBdGNjJzfDPjg==",
             "dependencies": {
-                "string-width": "^1.0.2 || 2 || 3 || 4"
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/wildcard": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
-            "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
-            "dev": true
-        },
-        "node_modules/winston": {
-            "version": "3.7.1",
-            "resolved": "https://registry.npmjs.org/winston/-/winston-3.7.1.tgz",
-            "integrity": "sha512-qKLMQVWMOvY0h9H4BA8Sfh79+KdnKi8gsyCSvfQgc+6teSlq92j82WK+zAJc6fLbAA2jwQuqkANLpQeOFA4Kug==",
-            "deprecated": "Please use version 3.6.0 or >3.7.1 when available due to https://github.com/winstonjs/winston/issues/2103",
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/util-buffer-from": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-4.0.0.tgz",
+            "integrity": "sha512-9TOQ7781sZvddgO8nxueKi3+yGvkY35kotA0Y6BWRajAv8jjmigQ1sBwz0UX47pQMYXJPahSKEKYFgt+rXdcug==",
             "dependencies": {
-                "@dabh/diagnostics": "^2.0.2",
-                "async": "^3.2.3",
-                "is-stream": "^2.0.0",
-                "logform": "^2.4.0",
-                "one-time": "^1.0.0",
-                "readable-stream": "^3.4.0",
-                "safe-stable-stringify": "^2.3.1",
-                "stack-trace": "0.0.x",
-                "triple-beam": "^1.3.0",
-                "winston-transport": "^4.5.0"
+                "@smithy/is-array-buffer": "^4.0.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 12.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/winston-transport": {
-            "version": "4.5.0",
-            "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz",
-            "integrity": "sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q==",
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/util-config-provider": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-4.0.0.tgz",
+            "integrity": "sha512-L1RBVzLyfE8OXH+1hsJ8p+acNUSirQnWQ6/EgpchV88G6zGBTDPdXiiExei6Z1wR2RxYvxY/XLw6AMNCCt8H3w==",
             "dependencies": {
-                "logform": "^2.3.2",
-                "readable-stream": "^3.6.0",
-                "triple-beam": "^1.3.0"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">= 6.4.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/word-wrap": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/util-defaults-mode-browser": {
+            "version": "4.0.19",
+            "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.19.tgz",
+            "integrity": "sha512-mvLMh87xSmQrV5XqnUYEPoiFFeEGYeAKIDDKdhE2ahqitm8OHM3aSvhqL6rrK6wm1brIk90JhxDf5lf2hbrLbQ==",
+            "dependencies": {
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/smithy-client": "^4.4.3",
+                "@smithy/types": "^4.3.1",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=0.10.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/workerpool": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
-            "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==",
-            "dev": true
-        },
-        "node_modules/wrap-ansi": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/util-defaults-mode-node": {
+            "version": "4.0.19",
+            "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.19.tgz",
+            "integrity": "sha512-8tYnx+LUfj6m+zkUUIrIQJxPM1xVxfRBvoGHua7R/i6qAxOMjqR6CpEpDwKoIs1o0+hOjGvkKE23CafKL0vJ9w==",
             "dependencies": {
-                "ansi-styles": "^4.0.0",
-                "string-width": "^4.1.0",
-                "strip-ansi": "^6.0.0"
+                "@smithy/config-resolver": "^4.1.4",
+                "@smithy/credential-provider-imds": "^4.0.6",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/smithy-client": "^4.4.3",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/wrap-ansi/node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/util-endpoints": {
+            "version": "3.0.6",
+            "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-3.0.6.tgz",
+            "integrity": "sha512-YARl3tFL3WgPuLzljRUnrS2ngLiUtkwhQtj8PAL13XZSyUiNLQxwG3fBBq3QXFqGFUXepIN73pINp3y8c2nBmA==",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/wrap-ansi/node_modules/strip-ansi": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/util-hex-encoding": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-4.0.0.tgz",
+            "integrity": "sha512-Yk5mLhHtfIgW2W2WQZWSg5kuMZCVbvhFmC7rV4IO2QqnZdbEFPmQnCcGMAX2z/8Qj3B9hYYNjZOhWym+RwhePw==",
             "dependencies": {
-                "ansi-regex": "^5.0.1"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/wrappy": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-        },
-        "node_modules/write-file-atomic": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-            "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-            "dev": true,
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/util-middleware": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-4.0.4.tgz",
+            "integrity": "sha512-9MLKmkBmf4PRb0ONJikCbCwORACcil6gUWojwARCClT7RmLzF04hUR4WdRprIXal7XVyrddadYNfp2eF3nrvtQ==",
             "dependencies": {
-                "imurmurhash": "^0.1.4",
-                "is-typedarray": "^1.0.0",
-                "signal-exit": "^3.0.2",
-                "typedarray-to-buffer": "^3.1.5"
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/ws": {
-            "version": "8.8.0",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz",
-            "integrity": "sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=10.0.0"
-            },
-            "peerDependencies": {
-                "bufferutil": "^4.0.1",
-                "utf-8-validate": "^5.0.2"
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/util-retry": {
+            "version": "4.0.5",
+            "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.0.5.tgz",
+            "integrity": "sha512-V7MSjVDTlEt/plmOFBn1762Dyu5uqMrV2Pl2X0dYk4XvWfdWJNe9Bs5Bzb56wkCuiWjSfClVMGcsuKrGj7S/yg==",
+            "dependencies": {
+                "@smithy/service-error-classification": "^4.0.5",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
             },
-            "peerDependenciesMeta": {
-                "bufferutil": {
-                    "optional": true
-                },
-                "utf-8-validate": {
-                    "optional": true
-                }
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/xml": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
-            "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=",
-            "dev": true
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/util-stream": {
+            "version": "4.2.2",
+            "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.2.2.tgz",
+            "integrity": "sha512-aI+GLi7MJoVxg24/3J1ipwLoYzgkB4kUfogZfnslcYlynj3xsQ0e7vk4TnTro9hhsS5PvX1mwmkRqqHQjwcU7w==",
+            "dependencies": {
+                "@smithy/fetch-http-handler": "^5.0.4",
+                "@smithy/node-http-handler": "^4.0.6",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "node_modules/xml2js": {
-            "version": "0.4.23",
-            "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-            "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/util-uri-escape": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-4.0.0.tgz",
+            "integrity": "sha512-77yfbCbQMtgtTylO9itEAdpPXSog3ZxMe09AEhm0dU0NLTalV70ghDZFR+Nfi1C60jnJoh/Re4090/DuZh2Omg==",
             "dependencies": {
-                "sax": ">=0.6.0",
-                "xmlbuilder": "~11.0.0"
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=4.0.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/xmlbuilder": {
-            "version": "11.0.1",
-            "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
-            "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+        "node_modules/@aws-sdk/credential-providers/node_modules/@smithy/util-utf8": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-4.0.0.tgz",
+            "integrity": "sha512-b+zebfKCfRdgNJDknHCob3O7FpeYQN6ZG6YLExMcasDHsCXlsXCEuiPZeLnJLpwa5dvPetGlnGCiMHuLwGvFow==",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=4.0"
+                "node": ">=18.0.0"
             }
         },
-        "node_modules/y18n": {
-            "version": "5.0.8",
-            "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-            "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-            "dev": true,
+        "node_modules/@aws-sdk/lib-storage": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/abort-controller": "^3.1.7",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/smithy-client": "^3.4.3",
+                "buffer": "5.6.0",
+                "events": "3.3.0",
+                "stream-browserify": "3.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=10"
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-s3": "^3.693.0"
             }
         },
-        "node_modules/yallist": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+        "node_modules/@aws-sdk/lib-storage/node_modules/buffer": {
+            "version": "5.6.0",
+            "license": "MIT",
+            "dependencies": {
+                "base64-js": "^1.0.2",
+                "ieee754": "^1.1.4"
+            }
         },
-        "node_modules/yaml": {
-            "version": "1.10.2",
-            "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-            "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+        "node_modules/@aws-sdk/lib-storage/node_modules/events": {
+            "version": "3.3.0",
+            "license": "MIT",
             "engines": {
-                "node": ">= 6"
+                "node": ">=0.8.x"
             }
         },
-        "node_modules/yaml-ast-parser-custom-tags": {
-            "version": "0.0.43",
-            "resolved": "https://registry.npmjs.org/yaml-ast-parser-custom-tags/-/yaml-ast-parser-custom-tags-0.0.43.tgz",
-            "integrity": "sha512-R5063FF/JSAN6qXCmylwjt9PcDH6M0ExEme/nJBzLspc6FJDmHHIqM7xh2WfEmsTJqClF79A9VkXjkAqmZw9SQ=="
-        },
-        "node_modules/yaml-cfn": {
-            "version": "0.3.1",
-            "resolved": "https://registry.npmjs.org/yaml-cfn/-/yaml-cfn-0.3.1.tgz",
-            "integrity": "sha512-8uEuOFPZFI06cQA+E37oRd9zHEPZVpkVjrBjXxWSt0Hy8hil/KnCcskpR7jwx6ejzfejIi5uzaoQgHTl6qzaNw==",
+        "node_modules/@aws-sdk/middleware-bucket-endpoint": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "js-yaml": "^4.0.0"
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-arn-parser": "3.693.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-config-provider": "^3.0.0",
+                "tslib": "^2.6.2"
             },
-            "bin": {
-                "yaml-cfn": "cli.js"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/yaml-language-server": {
-            "version": "0.10.0",
-            "resolved": "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.10.0.tgz",
-            "integrity": "sha512-d2/7eGgonEIRcnW9kK+k+ERG4gTOk5BXHr9KjTVv8gEarXKa62Kk+nyFE4AXgMDZ0LXTu8nTuN/AdboJiGN+pQ==",
+        "node_modules/@aws-sdk/middleware-expect-continue": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "js-yaml": "^3.13.1",
-                "jsonc-parser": "^2.2.1",
-                "request-light": "^0.2.4",
-                "vscode-json-languageservice": "^3.6.0",
-                "vscode-languageserver": "^5.2.1",
-                "vscode-languageserver-types": "^3.15.1",
-                "vscode-nls": "^4.1.2",
-                "vscode-uri": "^2.1.1",
-                "yaml-ast-parser-custom-tags": "0.0.43"
-            },
-            "bin": {
-                "yaml-language-server": "bin/yaml-language-server"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": "*"
-            },
-            "optionalDependencies": {
-                "prettier": "2.0.5"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/yaml-language-server/node_modules/argparse": {
-            "version": "1.0.10",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+        "node_modules/@aws-sdk/middleware-flexible-checksums": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "sprintf-js": "~1.0.2"
+                "@aws-crypto/crc32": "5.2.0",
+                "@aws-crypto/crc32c": "5.2.0",
+                "@aws-crypto/util": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/is-array-buffer": "^3.0.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-stream": "^3.3.0",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/yaml-language-server/node_modules/js-yaml": {
-            "version": "3.14.1",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-            "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+        "node_modules/@aws-sdk/middleware-flexible-checksums/node_modules/@aws-sdk/core": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "argparse": "^1.0.7",
-                "esprima": "^4.0.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/signature-v4": "^4.2.2",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
             },
-            "bin": {
-                "js-yaml": "bin/js-yaml.js"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/yaml-language-server/node_modules/jsonc-parser": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz",
-            "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg=="
-        },
-        "node_modules/yaml-language-server/node_modules/prettier": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz",
-            "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==",
-            "optional": true,
-            "bin": {
-                "prettier": "bin-prettier.js"
+        "node_modules/@aws-sdk/middleware-flexible-checksums/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10.13.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/yaml-language-server/node_modules/vscode-json-languageservice": {
-            "version": "3.11.0",
-            "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.11.0.tgz",
-            "integrity": "sha512-QxI+qV97uD7HHOCjh3MrM1TfbdwmTXrMckri5Tus1/FQiG3baDZb2C9Y0y8QThs7PwHYBIQXcAc59ZveCRZKPA==",
+        "node_modules/@aws-sdk/middleware-flexible-checksums/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "jsonc-parser": "^3.0.0",
-                "vscode-languageserver-textdocument": "^1.0.1",
-                "vscode-languageserver-types": "3.16.0-next.2",
-                "vscode-nls": "^5.0.0",
-                "vscode-uri": "^2.1.2"
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/yaml-language-server/node_modules/vscode-json-languageservice/node_modules/jsonc-parser": {
+        "node_modules/@aws-sdk/middleware-flexible-checksums/node_modules/@smithy/util-utf8": {
             "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
-            "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA=="
-        },
-        "node_modules/yaml-language-server/node_modules/vscode-json-languageservice/node_modules/vscode-languageserver-types": {
-            "version": "3.16.0-next.2",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz",
-            "integrity": "sha512-QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q=="
-        },
-        "node_modules/yaml-language-server/node_modules/vscode-json-languageservice/node_modules/vscode-nls": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.0.tgz",
-            "integrity": "sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA=="
-        },
-        "node_modules/yaml-language-server/node_modules/vscode-jsonrpc": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz",
-            "integrity": "sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=8.0.0 || >=10.0.0"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/yaml-language-server/node_modules/vscode-languageserver": {
-            "version": "5.2.1",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz",
-            "integrity": "sha512-GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A==",
+        "node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.620.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "vscode-languageserver-protocol": "3.14.1",
-                "vscode-uri": "^1.0.6"
+                "@aws-sdk/types": "3.609.0",
+                "@smithy/protocol-http": "^4.1.0",
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
             },
-            "bin": {
-                "installServerIntoExtension": "bin/installServerIntoExtension"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/yaml-language-server/node_modules/vscode-languageserver-protocol": {
-            "version": "3.14.1",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz",
-            "integrity": "sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==",
+        "node_modules/@aws-sdk/middleware-host-header/node_modules/@aws-sdk/types": {
+            "version": "3.609.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "vscode-jsonrpc": "^4.0.0",
-                "vscode-languageserver-types": "3.14.0"
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/yaml-language-server/node_modules/vscode-languageserver-protocol/node_modules/vscode-languageserver-types": {
-            "version": "3.14.0",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz",
-            "integrity": "sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A=="
-        },
-        "node_modules/yaml-language-server/node_modules/vscode-languageserver/node_modules/vscode-uri": {
-            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.8.tgz",
-            "integrity": "sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ=="
-        },
-        "node_modules/yaml-language-server/node_modules/vscode-nls": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.2.tgz",
-            "integrity": "sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw=="
-        },
-        "node_modules/yargs": {
-            "version": "17.5.1",
-            "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
-            "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
-            "dev": true,
+        "node_modules/@aws-sdk/middleware-location-constraint": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "cliui": "^7.0.2",
-                "escalade": "^3.1.1",
-                "get-caller-file": "^2.0.5",
-                "require-directory": "^2.1.1",
-                "string-width": "^4.2.3",
-                "y18n": "^5.0.5",
-                "yargs-parser": "^21.0.0"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=12"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/yargs-parser": {
-            "version": "20.2.4",
-            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
-            "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
-            "dev": true,
+        "node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.609.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.609.0",
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=10"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/yargs-unparser": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
-            "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
-            "dev": true,
+        "node_modules/@aws-sdk/middleware-logger/node_modules/@aws-sdk/types": {
+            "version": "3.609.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "camelcase": "^6.0.0",
-                "decamelize": "^4.0.0",
-                "flat": "^5.0.2",
-                "is-plain-obj": "^2.1.0"
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/yargs/node_modules/yargs-parser": {
-            "version": "21.1.1",
-            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-            "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-            "dev": true,
+        "node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.620.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.609.0",
+                "@smithy/protocol-http": "^4.1.0",
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=12"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/yauzl": {
-            "version": "2.10.0",
-            "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-            "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
-            "dev": true,
+        "node_modules/@aws-sdk/middleware-recursion-detection/node_modules/@aws-sdk/types": {
+            "version": "3.609.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "buffer-crc32": "~0.2.3",
-                "fd-slicer": "~1.1.0"
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/yazl": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz",
-            "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
-            "dev": true,
+        "node_modules/@aws-sdk/middleware-sdk-api-gateway": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "buffer-crc32": "~0.2.3"
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/yn": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-            "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
-            "dev": true,
+        "node_modules/@aws-sdk/middleware-sdk-ec2": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-format-url": "3.693.0",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/signature-v4": "^4.2.2",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
             "engines": {
-                "node": ">=6"
+                "node": ">=16.0.0"
             }
         },
-        "node_modules/yocto-queue": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-            "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
+        "node_modules/@aws-sdk/middleware-sdk-s3": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-arn-parser": "3.693.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/signature-v4": "^4.2.2",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-config-provider": "^3.0.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-stream": "^3.3.0",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
             },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        }
-    },
-    "dependencies": {
-        "@ampproject/remapping": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz",
-            "integrity": "sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==",
-            "dev": true,
-            "requires": {
-                "@jridgewell/trace-mapping": "^0.3.0"
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "@aws-crypto/ie11-detection": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-2.0.0.tgz",
-            "integrity": "sha512-pkVXf/dq6PITJ0jzYZ69VhL8VFOFoPZLZqtU/12SGnzYuJOOGNfF41q9GxdI1yqC8R13Rq3jOLKDFpUJFT5eTA==",
-            "requires": {
-                "tslib": "^1.11.1"
-            },
+        "node_modules/@aws-sdk/middleware-sdk-s3-control": {
+            "version": "3.848.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3-control/-/middleware-sdk-s3-control-3.848.0.tgz",
+            "integrity": "sha512-1zozD+IKFzFE9RLOCBOGPjhi+jUj0bLxf0ntqBMBJKX9Cf5zqvVuck7mCY19+m0/B+GuSAoiQm2yPV6dcgN17g==",
             "dependencies": {
-                "tslib": {
-                    "version": "1.14.1",
-                    "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-                    "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-                }
+                "@aws-sdk/middleware-bucket-endpoint": "3.840.0",
+                "@aws-sdk/types": "3.840.0",
+                "@aws-sdk/util-arn-parser": "3.804.0",
+                "@aws-sdk/util-endpoints": "3.848.0",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-endpoints": "^3.0.6",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-crypto/sha256-browser": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-2.0.0.tgz",
-            "integrity": "sha512-rYXOQ8BFOaqMEHJrLHul/25ckWH6GTJtdLSajhlqGMx0PmSueAuvboCuZCTqEKlxR8CQOwRarxYMZZSYlhRA1A==",
-            "requires": {
-                "@aws-crypto/ie11-detection": "^2.0.0",
-                "@aws-crypto/sha256-js": "^2.0.0",
-                "@aws-crypto/supports-web-crypto": "^2.0.0",
-                "@aws-crypto/util": "^2.0.0",
-                "@aws-sdk/types": "^3.1.0",
-                "@aws-sdk/util-locate-window": "^3.0.0",
-                "@aws-sdk/util-utf8-browser": "^3.0.0",
-                "tslib": "^1.11.1"
-            },
+        "node_modules/@aws-sdk/middleware-sdk-s3-control/node_modules/@aws-sdk/middleware-bucket-endpoint": {
+            "version": "3.840.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.840.0.tgz",
+            "integrity": "sha512-+gkQNtPwcSMmlwBHFd4saVVS11In6ID1HczNzpM3MXKXRBfSlbZJbCt6wN//AZ8HMklZEik4tcEOG0qa9UY8SQ==",
             "dependencies": {
-                "tslib": {
-                    "version": "1.14.1",
-                    "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-                    "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-                }
+                "@aws-sdk/types": "3.840.0",
+                "@aws-sdk/util-arn-parser": "3.804.0",
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "@smithy/util-config-provider": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-crypto/sha256-js": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-2.0.0.tgz",
-            "integrity": "sha512-VZY+mCY4Nmrs5WGfitmNqXzaE873fcIZDu54cbaDaaamsaTOP1DBImV9F4pICc3EHjQXujyE8jig+PFCaew9ig==",
-            "requires": {
-                "@aws-crypto/util": "^2.0.0",
-                "@aws-sdk/types": "^3.1.0",
-                "tslib": "^1.11.1"
-            },
+        "node_modules/@aws-sdk/middleware-sdk-s3-control/node_modules/@aws-sdk/types": {
+            "version": "3.840.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.840.0.tgz",
+            "integrity": "sha512-xliuHaUFZxEx1NSXeLLZ9Dyu6+EJVQKEoD+yM+zqUo3YDZ7medKJWY6fIOKiPX/N7XbLdBYwajb15Q7IL8KkeA==",
             "dependencies": {
-                "tslib": {
-                    "version": "1.14.1",
-                    "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-                    "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-                }
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-crypto/supports-web-crypto": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-2.0.0.tgz",
-            "integrity": "sha512-Ge7WQ3E0OC7FHYprsZV3h0QIcpdyJLvIeg+uTuHqRYm8D6qCFJoiC+edSzSyFiHtZf+NOQDJ1q46qxjtzIY2nA==",
-            "requires": {
-                "tslib": "^1.11.1"
-            },
+        "node_modules/@aws-sdk/middleware-sdk-s3-control/node_modules/@aws-sdk/util-arn-parser": {
+            "version": "3.804.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.804.0.tgz",
+            "integrity": "sha512-wmBJqn1DRXnZu3b4EkE6CWnoWMo1ZMvlfkqU5zPz67xx1GMaXlDCchFvKAXMjk4jn/L1O3tKnoFDNsoLV1kgNQ==",
             "dependencies": {
-                "tslib": {
-                    "version": "1.14.1",
-                    "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-                    "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-                }
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-crypto/util": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-2.0.1.tgz",
-            "integrity": "sha512-JJmFFwvbm08lULw4Nm5QOLg8+lAQeC8aCXK5xrtxntYzYXCGfHwUJ4Is3770Q7HmICsXthGQ+ZsDL7C2uH3yBQ==",
-            "requires": {
-                "@aws-sdk/types": "^3.1.0",
-                "@aws-sdk/util-utf8-browser": "^3.0.0",
-                "tslib": "^1.11.1"
-            },
+        "node_modules/@aws-sdk/middleware-sdk-s3-control/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.848.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.848.0.tgz",
+            "integrity": "sha512-fY/NuFFCq/78liHvRyFKr+aqq1aA/uuVSANjzr5Ym8c+9Z3HRPE9OrExAHoMrZ6zC8tHerQwlsXYYH5XZ7H+ww==",
             "dependencies": {
-                "tslib": {
-                    "version": "1.14.1",
-                    "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-                    "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-                }
+                "@aws-sdk/types": "3.840.0",
+                "@smithy/types": "^4.3.1",
+                "@smithy/url-parser": "^4.0.4",
+                "@smithy/util-endpoints": "^3.0.6",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-sdk/abort-controller": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.178.0.tgz",
-            "integrity": "sha512-ptDkCB06BJrYdhKzamM9yI15LxcGkPczY80hzKAY/aecm09alnW27uCt5HJJx2nCd18IUH28ZO1sc7DTLOWb3A==",
-            "requires": {
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
-            },
+        "node_modules/@aws-sdk/middleware-sdk-s3-control/node_modules/@smithy/node-config-provider": {
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-4.1.3.tgz",
+            "integrity": "sha512-HGHQr2s59qaU1lrVH6MbLlmOBxadtzTsoO4c+bF5asdgVik3I8o7JIOzoeqWc5MjVa+vD36/LWE0iXKpNqooRw==",
             "dependencies": {
-                "@aws-sdk/types": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-                    "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ=="
-                }
+                "@smithy/property-provider": "^4.0.4",
+                "@smithy/shared-ini-file-loader": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-sdk/client-sso": {
-            "version": "3.181.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.181.0.tgz",
-            "integrity": "sha512-p/HsYVAO7fgjFfn4LqlnlpSKPXGPegAwjPpY+SqyK3/Hj1OtED4whG8LTgxZSTtYwNIkHEjrHnXTiymyXh34Aw==",
-            "requires": {
-                "@aws-crypto/sha256-browser": "2.0.0",
-                "@aws-crypto/sha256-js": "2.0.0",
-                "@aws-sdk/config-resolver": "3.178.0",
-                "@aws-sdk/fetch-http-handler": "3.178.0",
-                "@aws-sdk/hash-node": "3.178.0",
-                "@aws-sdk/invalid-dependency": "3.178.0",
-                "@aws-sdk/middleware-content-length": "3.178.0",
-                "@aws-sdk/middleware-host-header": "3.178.0",
-                "@aws-sdk/middleware-logger": "3.178.0",
-                "@aws-sdk/middleware-recursion-detection": "3.178.0",
-                "@aws-sdk/middleware-retry": "3.178.0",
-                "@aws-sdk/middleware-serde": "3.178.0",
-                "@aws-sdk/middleware-stack": "3.178.0",
-                "@aws-sdk/middleware-user-agent": "3.178.0",
-                "@aws-sdk/node-config-provider": "3.178.0",
-                "@aws-sdk/node-http-handler": "3.178.0",
-                "@aws-sdk/protocol-http": "3.178.0",
-                "@aws-sdk/smithy-client": "3.180.0",
-                "@aws-sdk/types": "3.178.0",
-                "@aws-sdk/url-parser": "3.178.0",
-                "@aws-sdk/util-base64-browser": "3.170.0",
-                "@aws-sdk/util-base64-node": "3.170.0",
-                "@aws-sdk/util-body-length-browser": "3.170.0",
-                "@aws-sdk/util-body-length-node": "3.170.0",
-                "@aws-sdk/util-defaults-mode-browser": "3.180.0",
-                "@aws-sdk/util-defaults-mode-node": "3.180.0",
-                "@aws-sdk/util-user-agent-browser": "3.178.0",
-                "@aws-sdk/util-user-agent-node": "3.178.0",
-                "@aws-sdk/util-utf8-browser": "3.170.0",
-                "@aws-sdk/util-utf8-node": "3.170.0",
-                "tslib": "^2.3.1"
-            },
+        "node_modules/@aws-sdk/middleware-sdk-s3-control/node_modules/@smithy/property-provider": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-4.0.4.tgz",
+            "integrity": "sha512-qHJ2sSgu4FqF4U/5UUp4DhXNmdTrgmoAai6oQiM+c5RZ/sbDwJ12qxB1M6FnP+Tn/ggkPZf9ccn4jqKSINaquw==",
             "dependencies": {
-                "@aws-sdk/types": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-                    "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ=="
-                }
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-sdk/client-sso-oidc": {
-            "version": "3.181.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.181.0.tgz",
-            "integrity": "sha512-cMrEVAgLDM4AlGuMS6uzWSCYohIth2FcqWq4102lWve2kPQK5E6bl3SdWFLOIZc75ladkbwUXivBYtjNtLeRQA==",
-            "requires": {
-                "@aws-crypto/sha256-browser": "2.0.0",
-                "@aws-crypto/sha256-js": "2.0.0",
-                "@aws-sdk/config-resolver": "3.178.0",
-                "@aws-sdk/fetch-http-handler": "3.178.0",
-                "@aws-sdk/hash-node": "3.178.0",
-                "@aws-sdk/invalid-dependency": "3.178.0",
-                "@aws-sdk/middleware-content-length": "3.178.0",
-                "@aws-sdk/middleware-host-header": "3.178.0",
-                "@aws-sdk/middleware-logger": "3.178.0",
-                "@aws-sdk/middleware-recursion-detection": "3.178.0",
-                "@aws-sdk/middleware-retry": "3.178.0",
-                "@aws-sdk/middleware-serde": "3.178.0",
-                "@aws-sdk/middleware-stack": "3.178.0",
-                "@aws-sdk/middleware-user-agent": "3.178.0",
-                "@aws-sdk/node-config-provider": "3.178.0",
-                "@aws-sdk/node-http-handler": "3.178.0",
-                "@aws-sdk/protocol-http": "3.178.0",
-                "@aws-sdk/smithy-client": "3.180.0",
-                "@aws-sdk/types": "3.178.0",
-                "@aws-sdk/url-parser": "3.178.0",
-                "@aws-sdk/util-base64-browser": "3.170.0",
-                "@aws-sdk/util-base64-node": "3.170.0",
-                "@aws-sdk/util-body-length-browser": "3.170.0",
-                "@aws-sdk/util-body-length-node": "3.170.0",
-                "@aws-sdk/util-defaults-mode-browser": "3.180.0",
-                "@aws-sdk/util-defaults-mode-node": "3.180.0",
-                "@aws-sdk/util-user-agent-browser": "3.178.0",
-                "@aws-sdk/util-user-agent-node": "3.178.0",
-                "@aws-sdk/util-utf8-browser": "3.170.0",
-                "@aws-sdk/util-utf8-node": "3.170.0",
-                "tslib": "^2.3.1"
-            },
+        "node_modules/@aws-sdk/middleware-sdk-s3-control/node_modules/@smithy/protocol-http": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-5.1.2.tgz",
+            "integrity": "sha512-rOG5cNLBXovxIrICSBm95dLqzfvxjEmuZx4KK3hWwPFHGdW3lxY0fZNXfv2zebfRO7sJZ5pKJYHScsqopeIWtQ==",
             "dependencies": {
-                "@aws-sdk/types": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-                    "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ=="
-                }
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-sdk/config-resolver": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.178.0.tgz",
-            "integrity": "sha512-8xL98TGMaVULIN7HRWV2q1o0Y2p38QuweehzM8yXCZrrLOyHgWo3waP2RNVeddOB7MrSwwU/gw9rXSv7YHLZ6w==",
-            "requires": {
-                "@aws-sdk/signature-v4": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "@aws-sdk/util-config-provider": "3.170.0",
-                "@aws-sdk/util-middleware": "3.178.0",
-                "tslib": "^2.3.1"
-            },
+        "node_modules/@aws-sdk/middleware-sdk-s3-control/node_modules/@smithy/querystring-parser": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-4.0.4.tgz",
+            "integrity": "sha512-6yZf53i/qB8gRHH/l2ZwUG5xgkPgQF15/KxH0DdXMDHjesA9MeZje/853ifkSY0x4m5S+dfDZ+c4x439PF0M2w==",
             "dependencies": {
-                "@aws-sdk/types": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-                    "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ=="
-                }
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-sdk/credential-provider-env": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.46.0.tgz",
-            "integrity": "sha512-dBCyVBJ1nVi+lvM1jV6LFw8FpGjdeCglLMTmZUxJLBMh/Lp+GWtnGxd7u38WnH5gxKC4xLnYj9zP1t0ha1tGzQ==",
-            "requires": {
-                "@aws-sdk/property-provider": "3.46.0",
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0"
-            },
+        "node_modules/@aws-sdk/middleware-sdk-s3-control/node_modules/@smithy/shared-ini-file-loader": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.0.4.tgz",
+            "integrity": "sha512-63X0260LoFBjrHifPDs+nM9tV0VMkOTl4JRMYNuKh/f5PauSjowTfvF3LogfkWdcPoxsA9UjqEOgjeYIbhb7Nw==",
             "dependencies": {
-                "@aws-sdk/property-provider": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.46.0.tgz",
-                    "integrity": "sha512-e3Jcds7G1Hg5VDvwLox0HlQq4G2fvmkO1BRPvM8WfRGvxRNK40dqoelm2NMtbNK0KgFPIpKsGeX1UhZDt9Od9w==",
-                    "requires": {
-                        "@aws-sdk/types": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/types": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.46.0.tgz",
-                    "integrity": "sha512-yhrkVVyv4RUt3KqDDyEayjBM5dRBtuS486THeqtSghUYNV7M/cW18TA3gdMC0pRGgUqfKrOysdBZjCyPrYNvuA=="
-                }
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-sdk/credential-provider-imds": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.46.0.tgz",
-            "integrity": "sha512-nQidNDq6mjas/wFOi9XvHkvNmzM/XdSB/eRh6CH+wQeb8RjAlGm2Ivg0mpz/iIxjPXDIduW8aI/gFU3+3um6CQ==",
-            "requires": {
-                "@aws-sdk/node-config-provider": "3.46.0",
-                "@aws-sdk/property-provider": "3.46.0",
-                "@aws-sdk/types": "3.46.0",
-                "@aws-sdk/url-parser": "3.46.0",
-                "tslib": "^2.3.0"
-            },
+        "node_modules/@aws-sdk/middleware-sdk-s3-control/node_modules/@smithy/types": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.3.1.tgz",
+            "integrity": "sha512-UqKOQBL2x6+HWl3P+3QqFD4ncKq0I8Nuz9QItGv5WuKuMHuuwlhvqcZCoXGfc+P1QmfJE7VieykoYYmrOoFJxA==",
             "dependencies": {
-                "@aws-sdk/node-config-provider": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.46.0.tgz",
-                    "integrity": "sha512-Hzz860d1GNZSSX74TywfUu125l8BT6JkJuKG0QDhuC+9xklNfC1hgziihldHu6xL7DzY5UKgjyzdNBQfqCqLbw==",
-                    "requires": {
-                        "@aws-sdk/property-provider": "3.46.0",
-                        "@aws-sdk/shared-ini-file-loader": "3.46.0",
-                        "@aws-sdk/types": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/property-provider": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.46.0.tgz",
-                    "integrity": "sha512-e3Jcds7G1Hg5VDvwLox0HlQq4G2fvmkO1BRPvM8WfRGvxRNK40dqoelm2NMtbNK0KgFPIpKsGeX1UhZDt9Od9w==",
-                    "requires": {
-                        "@aws-sdk/types": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/querystring-parser": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.46.0.tgz",
-                    "integrity": "sha512-xxTnIXLbx4Jq16Utza7wh4HpPfVyCL0c+6NU2t+kXZ2sgOWhx2XAhShcZVbEkA/61UAMEIhyNBVE+z9OFz6X5g==",
-                    "requires": {
-                        "@aws-sdk/types": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/shared-ini-file-loader": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.46.0.tgz",
-                    "integrity": "sha512-Rp7Z1X23kvyRCziOxXu2PYCCPT5CQ5t8O4WoKrEkMT9Vqm2gluXOcCnL4iOpRkSRGEZT7lfe5OCM8ApNRTIHpQ==",
-                    "requires": {
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/types": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.46.0.tgz",
-                    "integrity": "sha512-yhrkVVyv4RUt3KqDDyEayjBM5dRBtuS486THeqtSghUYNV7M/cW18TA3gdMC0pRGgUqfKrOysdBZjCyPrYNvuA=="
-                },
-                "@aws-sdk/url-parser": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.46.0.tgz",
-                    "integrity": "sha512-foMB0AC3QDy+KfvRxsMXvJQZXr9CMzdupcNIXwKRZog82tEEc09dVeUjuJrO4H+A2eK84SyawRfy+ow+LRqvqw==",
-                    "requires": {
-                        "@aws-sdk/querystring-parser": "3.46.0",
-                        "@aws-sdk/types": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                }
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-sdk/credential-provider-ini": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.46.0.tgz",
-            "integrity": "sha512-D+3YLWzCaFUUcbLHAsJIoaI8AhoSpIl3c0a3spVN64f+V1XtwunbJO6VXsIF78RLe0kTP7IA/Rey86ydQVeqcw==",
-            "requires": {
-                "@aws-sdk/credential-provider-env": "3.46.0",
-                "@aws-sdk/credential-provider-imds": "3.46.0",
-                "@aws-sdk/credential-provider-sso": "3.46.0",
-                "@aws-sdk/credential-provider-web-identity": "3.46.0",
-                "@aws-sdk/property-provider": "3.46.0",
-                "@aws-sdk/shared-ini-file-loader": "3.46.0",
-                "@aws-sdk/types": "3.46.0",
-                "@aws-sdk/util-credentials": "3.46.0",
-                "tslib": "^2.3.0"
-            },
+        "node_modules/@aws-sdk/middleware-sdk-s3-control/node_modules/@smithy/url-parser": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-4.0.4.tgz",
+            "integrity": "sha512-eMkc144MuN7B0TDA4U2fKs+BqczVbk3W+qIvcoCY6D1JY3hnAdCuhCZODC+GAeaxj0p6Jroz4+XMUn3PCxQQeQ==",
             "dependencies": {
-                "@aws-sdk/property-provider": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.46.0.tgz",
-                    "integrity": "sha512-e3Jcds7G1Hg5VDvwLox0HlQq4G2fvmkO1BRPvM8WfRGvxRNK40dqoelm2NMtbNK0KgFPIpKsGeX1UhZDt9Od9w==",
-                    "requires": {
-                        "@aws-sdk/types": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/shared-ini-file-loader": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.46.0.tgz",
-                    "integrity": "sha512-Rp7Z1X23kvyRCziOxXu2PYCCPT5CQ5t8O4WoKrEkMT9Vqm2gluXOcCnL4iOpRkSRGEZT7lfe5OCM8ApNRTIHpQ==",
-                    "requires": {
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/types": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.46.0.tgz",
-                    "integrity": "sha512-yhrkVVyv4RUt3KqDDyEayjBM5dRBtuS486THeqtSghUYNV7M/cW18TA3gdMC0pRGgUqfKrOysdBZjCyPrYNvuA=="
-                },
-                "@aws-sdk/util-credentials": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/util-credentials/-/util-credentials-3.46.0.tgz",
-                    "integrity": "sha512-d5bDyCDVYi6ThBY8AntAKooExayFuLUnCXsDkmmWpHlp26JZv9s1/DsXR219ELgu8jIAWiID54HjfEYf8qa6Vw==",
-                    "requires": {
-                        "@aws-sdk/shared-ini-file-loader": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                }
+                "@smithy/querystring-parser": "^4.0.4",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-sdk/credential-provider-process": {
-            "version": "3.37.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.37.0.tgz",
-            "integrity": "sha512-VOfWtUBbICb7xEHRFN7+fRA+move/3HT4mZt7C5KBXIaILT3b8hrK1mT/fRQ3dx9dF56PEGj/WkACOBjMzIcdg==",
-            "requires": {
-                "@aws-sdk/property-provider": "3.37.0",
-                "@aws-sdk/shared-ini-file-loader": "3.37.0",
-                "@aws-sdk/types": "3.37.0",
-                "@aws-sdk/util-credentials": "3.37.0",
-                "tslib": "^2.3.0"
+        "node_modules/@aws-sdk/middleware-sdk-s3-control/node_modules/@smithy/util-config-provider": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-4.0.0.tgz",
+            "integrity": "sha512-L1RBVzLyfE8OXH+1hsJ8p+acNUSirQnWQ6/EgpchV88G6zGBTDPdXiiExei6Z1wR2RxYvxY/XLw6AMNCCt8H3w==",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-sdk/credential-provider-sso": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.46.0.tgz",
-            "integrity": "sha512-y3zv6FtaEu1cjtun6vQ1S/2aya70cPjCcoQhSrsH9TDYXp/ZRk4PN6xdVGGpkZX2kZhowGU5DvhOGK48IqrNZg==",
-            "requires": {
-                "@aws-sdk/client-sso": "3.46.0",
-                "@aws-sdk/property-provider": "3.46.0",
-                "@aws-sdk/shared-ini-file-loader": "3.46.0",
-                "@aws-sdk/types": "3.46.0",
-                "@aws-sdk/util-credentials": "3.46.0",
-                "tslib": "^2.3.0"
-            },
+        "node_modules/@aws-sdk/middleware-sdk-s3-control/node_modules/@smithy/util-endpoints": {
+            "version": "3.0.6",
+            "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-3.0.6.tgz",
+            "integrity": "sha512-YARl3tFL3WgPuLzljRUnrS2ngLiUtkwhQtj8PAL13XZSyUiNLQxwG3fBBq3QXFqGFUXepIN73pINp3y8c2nBmA==",
             "dependencies": {
-                "@aws-sdk/abort-controller": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.46.0.tgz",
-                    "integrity": "sha512-XrCocRwajh3jkI/Y2PCZjYUZcJfmCa4DYM5nnW2+w4o7ez7vXEQ1j5FCI+/ogJIqfccnmEIlLZGlfzmc6vVbJw==",
-                    "requires": {
-                        "@aws-sdk/types": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/client-sso": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.46.0.tgz",
-                    "integrity": "sha512-n+dHT9azUW4pFA7a98gV/qFYdNwoMQ/4Y4tvPE28s9CKx8O0OIDlOwLPrhSBETCuRJNfnug1vNnFIzvOapfCkg==",
-                    "requires": {
-                        "@aws-crypto/sha256-browser": "2.0.0",
-                        "@aws-crypto/sha256-js": "2.0.0",
-                        "@aws-sdk/config-resolver": "3.46.0",
-                        "@aws-sdk/fetch-http-handler": "3.46.0",
-                        "@aws-sdk/hash-node": "3.46.0",
-                        "@aws-sdk/invalid-dependency": "3.46.0",
-                        "@aws-sdk/middleware-content-length": "3.46.0",
-                        "@aws-sdk/middleware-host-header": "3.46.0",
-                        "@aws-sdk/middleware-logger": "3.46.0",
-                        "@aws-sdk/middleware-retry": "3.46.0",
-                        "@aws-sdk/middleware-serde": "3.46.0",
-                        "@aws-sdk/middleware-stack": "3.46.0",
-                        "@aws-sdk/middleware-user-agent": "3.46.0",
-                        "@aws-sdk/node-config-provider": "3.46.0",
-                        "@aws-sdk/node-http-handler": "3.46.0",
-                        "@aws-sdk/protocol-http": "3.46.0",
-                        "@aws-sdk/smithy-client": "3.46.0",
-                        "@aws-sdk/types": "3.46.0",
-                        "@aws-sdk/url-parser": "3.46.0",
-                        "@aws-sdk/util-base64-browser": "3.46.0",
-                        "@aws-sdk/util-base64-node": "3.46.0",
-                        "@aws-sdk/util-body-length-browser": "3.46.0",
-                        "@aws-sdk/util-body-length-node": "3.46.0",
-                        "@aws-sdk/util-user-agent-browser": "3.46.0",
-                        "@aws-sdk/util-user-agent-node": "3.46.0",
-                        "@aws-sdk/util-utf8-browser": "3.46.0",
-                        "@aws-sdk/util-utf8-node": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/config-resolver": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.46.0.tgz",
-                    "integrity": "sha512-R7YGDhvVE1VIS7uyjG3rZE1nrRu/+YVBq/pPlq5f4Tis3EoUooPfr5yYOVAuZI1CGsgycbCi6jnaqLGIfxUFmQ==",
-                    "requires": {
-                        "@aws-sdk/signature-v4": "3.46.0",
-                        "@aws-sdk/types": "3.46.0",
-                        "@aws-sdk/util-config-provider": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/fetch-http-handler": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.46.0.tgz",
-                    "integrity": "sha512-uOfdwbUCG+2LQ4iMkxD/izlzjnIrB5P5HtH7L5w1EFIsdxDXeFnnql0FaEcOvaEEg2rs9z0t+oLwMJZnNNtqAg==",
-                    "requires": {
-                        "@aws-sdk/protocol-http": "3.46.0",
-                        "@aws-sdk/querystring-builder": "3.46.0",
-                        "@aws-sdk/types": "3.46.0",
-                        "@aws-sdk/util-base64-browser": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/hash-node": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.46.0.tgz",
-                    "integrity": "sha512-rABF9k5uSJdqmwBeYnu+2+iWEmPNVsoBy9bwLvEmGfh557wAwh3dL5IDf+NiIFrd8GTOF/2HV1477XXBl15C0g==",
-                    "requires": {
-                        "@aws-sdk/types": "3.46.0",
-                        "@aws-sdk/util-buffer-from": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/invalid-dependency": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.46.0.tgz",
-                    "integrity": "sha512-KumWtDstAKpKRQbHA95AeHpBNtxCXHVbUk+nFAiXcBP281yEalUbyK0W5Q2bDl26L3z6zHodg3OJllHYavJKMg==",
-                    "requires": {
-                        "@aws-sdk/types": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/is-array-buffer": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/is-array-buffer/-/is-array-buffer-3.46.0.tgz",
-                    "integrity": "sha512-HcQtJgZDQgo7ivD79GF82pTf+zYGjsgzKG7lkUBEetSfkV0W8h6XfhN6DmuYQuCcu1Pt9IkN7haYNPiPdfDhvg==",
-                    "requires": {
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/middleware-content-length": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.46.0.tgz",
-                    "integrity": "sha512-Vf17vKAZ9n2ZlkMoHmCXMHAJegw3djC8qxe2sGdHSGyozfJNpA77ec32ldLvBtQ82LPmSaqdhcbP0/oYCalnzA==",
-                    "requires": {
-                        "@aws-sdk/protocol-http": "3.46.0",
-                        "@aws-sdk/types": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/middleware-host-header": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.46.0.tgz",
-                    "integrity": "sha512-I+WsUzpyzS9l5Dt64kyp7v+9KeYPOCviYmVw2kM1EZRdAeo+jiCRxU5LnDJ9ORxfRwGcEmQV7xb4UpqXcn2N6Q==",
-                    "requires": {
-                        "@aws-sdk/protocol-http": "3.46.0",
-                        "@aws-sdk/types": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/middleware-logger": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.46.0.tgz",
-                    "integrity": "sha512-xkB98tfZc1pSeks0a7jagYIVHxJfoxHX7wcASzBa3IjyodZpSqDW392edF9c3kSCv6G6PGRbG+F1F6j7ZTVpRQ==",
-                    "requires": {
-                        "@aws-sdk/types": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/middleware-retry": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.46.0.tgz",
-                    "integrity": "sha512-YkNNs2dUcriLwy4pYG7nfa850tD8dtFUeE/IQ+YBMbWDedT31UFkCfHUdjBK1GFbIv+G1N+ZVGBCkWq1OuhKXw==",
-                    "requires": {
-                        "@aws-sdk/protocol-http": "3.46.0",
-                        "@aws-sdk/service-error-classification": "3.46.0",
-                        "@aws-sdk/types": "3.46.0",
-                        "tslib": "^2.3.0",
-                        "uuid": "^8.3.2"
-                    }
-                },
-                "@aws-sdk/middleware-serde": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.46.0.tgz",
-                    "integrity": "sha512-5M56VUm/stsSabauHxFrv1BSoH0VPyMB1V4vewAD3cp5YGiUpChYxjhcBbzi0QvI65HLxa6nLedwrE+g1uVJ1Q==",
-                    "requires": {
-                        "@aws-sdk/types": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/middleware-stack": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.46.0.tgz",
-                    "integrity": "sha512-+3SmpYo12i9Gn7L/HEJqAv5+OieZL9zfXungFKr96rTpcvYDZWQblTP3tugBtvGV6V4tzvebMkUTWxBB6p+dhQ==",
-                    "requires": {
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/middleware-user-agent": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.46.0.tgz",
-                    "integrity": "sha512-n9VEWlIXxbJXCr2IpocNJQUW7dhCdAcPKmxV0T5LZ/AygKsLvbWy40u2Qm9/eB1MYpqiheeb5MsY3UXxHgnOlg==",
-                    "requires": {
-                        "@aws-sdk/protocol-http": "3.46.0",
-                        "@aws-sdk/types": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/node-config-provider": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.46.0.tgz",
-                    "integrity": "sha512-Hzz860d1GNZSSX74TywfUu125l8BT6JkJuKG0QDhuC+9xklNfC1hgziihldHu6xL7DzY5UKgjyzdNBQfqCqLbw==",
-                    "requires": {
-                        "@aws-sdk/property-provider": "3.46.0",
-                        "@aws-sdk/shared-ini-file-loader": "3.46.0",
-                        "@aws-sdk/types": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/node-http-handler": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.46.0.tgz",
-                    "integrity": "sha512-SqeKskt47u/ZIeN5b6lmjOAx0yLiY/WDQ6N9Z6LRJCYiSZ7oHflA1jPWkX20qWOKioa2iHBVTNNX2lu8yFkWbg==",
-                    "requires": {
-                        "@aws-sdk/abort-controller": "3.46.0",
-                        "@aws-sdk/protocol-http": "3.46.0",
-                        "@aws-sdk/querystring-builder": "3.46.0",
-                        "@aws-sdk/types": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/property-provider": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.46.0.tgz",
-                    "integrity": "sha512-e3Jcds7G1Hg5VDvwLox0HlQq4G2fvmkO1BRPvM8WfRGvxRNK40dqoelm2NMtbNK0KgFPIpKsGeX1UhZDt9Od9w==",
-                    "requires": {
-                        "@aws-sdk/types": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/protocol-http": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.46.0.tgz",
-                    "integrity": "sha512-hKqHYEp/JDfOl5kZKp0CRgvbsg+c52Ss4KwuRoU9vA56VZ5TpfgHznajdme97xedsE40hnZeitv2BKEMbkYCqg==",
-                    "requires": {
-                        "@aws-sdk/types": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/querystring-builder": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.46.0.tgz",
-                    "integrity": "sha512-YYGRK291ro+KR3TX0jjyGRdMGHn6D2CBD89oXj8tAV3djeMIpFSGDrEL+NKeJvp7aBNlEnQ9kSfzyQuzQVvJWA==",
-                    "requires": {
-                        "@aws-sdk/types": "3.46.0",
-                        "@aws-sdk/util-uri-escape": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/querystring-parser": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.46.0.tgz",
-                    "integrity": "sha512-xxTnIXLbx4Jq16Utza7wh4HpPfVyCL0c+6NU2t+kXZ2sgOWhx2XAhShcZVbEkA/61UAMEIhyNBVE+z9OFz6X5g==",
-                    "requires": {
-                        "@aws-sdk/types": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/service-error-classification": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.46.0.tgz",
-                    "integrity": "sha512-hFDh/qtvKX9xUPxjGiDvumKsoO/3+eL4hi6X3qWN8lHg49wixjwcwlCEPn9jhdFJ9TRXc20CgPxWv4+V96Yf/A=="
-                },
-                "@aws-sdk/shared-ini-file-loader": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.46.0.tgz",
-                    "integrity": "sha512-Rp7Z1X23kvyRCziOxXu2PYCCPT5CQ5t8O4WoKrEkMT9Vqm2gluXOcCnL4iOpRkSRGEZT7lfe5OCM8ApNRTIHpQ==",
-                    "requires": {
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/signature-v4": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.46.0.tgz",
-                    "integrity": "sha512-qtI1t0CrEhVCxaezmmBpMe1WmQxdxho8oPiMEKWIUkkXQFg78Eg3jnXlLhjL4+MGHMqBB3mV7nGO6k8qu8H9rA==",
-                    "requires": {
-                        "@aws-sdk/is-array-buffer": "3.46.0",
-                        "@aws-sdk/types": "3.46.0",
-                        "@aws-sdk/util-hex-encoding": "3.46.0",
-                        "@aws-sdk/util-uri-escape": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/smithy-client": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.46.0.tgz",
-                    "integrity": "sha512-Dzx4CR+rOkr5hXbLhnOfnrPWmSs4O9BTjFWD+4oh+RTXq0It8g+fWZxPcdvRCDU4GjS9Gtbkw0f0pN3FMCEszQ==",
-                    "requires": {
-                        "@aws-sdk/middleware-stack": "3.46.0",
-                        "@aws-sdk/types": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/types": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.46.0.tgz",
-                    "integrity": "sha512-yhrkVVyv4RUt3KqDDyEayjBM5dRBtuS486THeqtSghUYNV7M/cW18TA3gdMC0pRGgUqfKrOysdBZjCyPrYNvuA=="
-                },
-                "@aws-sdk/url-parser": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.46.0.tgz",
-                    "integrity": "sha512-foMB0AC3QDy+KfvRxsMXvJQZXr9CMzdupcNIXwKRZog82tEEc09dVeUjuJrO4H+A2eK84SyawRfy+ow+LRqvqw==",
-                    "requires": {
-                        "@aws-sdk/querystring-parser": "3.46.0",
-                        "@aws-sdk/types": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/util-base64-browser": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/util-base64-browser/-/util-base64-browser-3.46.0.tgz",
-                    "integrity": "sha512-oDlExDHYVOXsHFwFCA+CxZlGiHWeO53l0xoohpTIwGV6u48jED/4GrNM6iWVT6Vwd4skqtRMM41IHXjtiCtp/g==",
-                    "requires": {
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/util-base64-node": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/util-base64-node/-/util-base64-node-3.46.0.tgz",
-                    "integrity": "sha512-/ruNBm21Ptk+IGhwTphs8j5oDCjNIrUSipDoRtUuMGQR9TnNzup0e+sJDqP0BrKKM+tcvqEUhz+MScxbwJrwmg==",
-                    "requires": {
-                        "@aws-sdk/util-buffer-from": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/util-body-length-browser": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.46.0.tgz",
-                    "integrity": "sha512-OJgMlBv4gEdmHCdZO9htysz9GMw0mS7qB3I5CbZ2aBOM0NvmaU7nqI6zYCoEmGh0keq0CnMBlNZhBBAwtiKYqg==",
-                    "requires": {
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/util-body-length-node": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.46.0.tgz",
-                    "integrity": "sha512-jyD+2c7iaD4Aih93Fm4I183SbdhSy4FNmSlK49PctMVVF+QSpzQxAJvv/nTwq37Kb8orVvs+sgy2FF3lxfOUJg==",
-                    "requires": {
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/util-buffer-from": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/util-buffer-from/-/util-buffer-from-3.46.0.tgz",
-                    "integrity": "sha512-e3avbwAUULpPCk4ke9ctrhAwxcXvMv8FYymNJDEN7+9lqZ4XqAjPt+R+IEEFMEbWmIPeZ8TpLw3yuru1Z74iuA==",
-                    "requires": {
-                        "@aws-sdk/is-array-buffer": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/util-config-provider": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/util-config-provider/-/util-config-provider-3.46.0.tgz",
-                    "integrity": "sha512-KzzusGkvmb1uy3EItl+9YRxOOtjmU6iaAi9pBzHR2fiv13EMVNZrycVFPeGwz6LrsAEumKmTAZjR6c8BRbxtjw==",
-                    "requires": {
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/util-credentials": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/util-credentials/-/util-credentials-3.46.0.tgz",
-                    "integrity": "sha512-d5bDyCDVYi6ThBY8AntAKooExayFuLUnCXsDkmmWpHlp26JZv9s1/DsXR219ELgu8jIAWiID54HjfEYf8qa6Vw==",
-                    "requires": {
-                        "@aws-sdk/shared-ini-file-loader": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/util-hex-encoding": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.46.0.tgz",
-                    "integrity": "sha512-A831jS32tbdjki4ihS0BIZ3HAi1gv2PtLmAjAW+PHVvBd0S4OpbQApKxKPu0w+NKsp9XQYfkEkeFKCcMqN1zhg==",
-                    "requires": {
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/util-uri-escape": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/util-uri-escape/-/util-uri-escape-3.46.0.tgz",
-                    "integrity": "sha512-drAHEt3YnI6H6NpiTFLFT8e75bOhaO94ZP+kqz/0hluQiKX47Pow3Ar3Diaf/CUMLctH0IX3AaN3T2ve5v19lQ==",
-                    "requires": {
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/util-user-agent-browser": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.46.0.tgz",
-                    "integrity": "sha512-wwUh4H6+ur9akctoSgaz41J8JuRrOqey4aY68DmDQ0did3UjhRlbPD3xu0umXoPSgmtqQyl34oMPqCOfA70Z0Q==",
-                    "requires": {
-                        "@aws-sdk/types": "3.46.0",
-                        "bowser": "^2.11.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/util-user-agent-node": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.46.0.tgz",
-                    "integrity": "sha512-JCY8mKWPic0aXtz7amKXWyjbX8fhdOkRcgsCCnevOHc/7KOxwa97VnDT555GNQ76LO+cEDgYueHklUayV3u+IA==",
-                    "requires": {
-                        "@aws-sdk/node-config-provider": "3.46.0",
-                        "@aws-sdk/types": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/util-utf8-browser": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.46.0.tgz",
-                    "integrity": "sha512-zafI5Y7hRVC0vhJ77FPUyBckmpF2v2ZEKFC79AdwdFX11l7XNmq0hY/4CWVYeZ2L0Fyk0UV6eeKyk/TNdce0mg==",
-                    "requires": {
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/util-utf8-node": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8-node/-/util-utf8-node-3.46.0.tgz",
-                    "integrity": "sha512-Uk9hQrWQowU4ymtSxrxiIp7GnBoZfkKGSeWDy2h/1Biaexq9FQclbgwa0ZhA5lKLDj/nUxnXoT/ZcY90mTdzzQ==",
-                    "requires": {
-                        "@aws-sdk/util-buffer-from": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                }
+                "@smithy/node-config-provider": "^4.1.3",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-sdk/credential-provider-web-identity": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.46.0.tgz",
-            "integrity": "sha512-VUNTS9HjwLRmS2OQ+i4tqVJBUpk/DjIT0sWUDnKBcC6UCyGOkVmBVisCvUHpwyCLCgYbCvTab1SfrJ8dZsN83w==",
-            "requires": {
-                "@aws-sdk/property-provider": "3.46.0",
-                "@aws-sdk/types": "3.46.0",
-                "tslib": "^2.3.0"
-            },
+        "node_modules/@aws-sdk/middleware-sdk-s3/node_modules/@aws-sdk/core": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/property-provider": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.46.0.tgz",
-                    "integrity": "sha512-e3Jcds7G1Hg5VDvwLox0HlQq4G2fvmkO1BRPvM8WfRGvxRNK40dqoelm2NMtbNK0KgFPIpKsGeX1UhZDt9Od9w==",
-                    "requires": {
-                        "@aws-sdk/types": "3.46.0",
-                        "tslib": "^2.3.0"
-                    }
-                },
-                "@aws-sdk/types": {
-                    "version": "3.46.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.46.0.tgz",
-                    "integrity": "sha512-yhrkVVyv4RUt3KqDDyEayjBM5dRBtuS486THeqtSghUYNV7M/cW18TA3gdMC0pRGgUqfKrOysdBZjCyPrYNvuA=="
-                }
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/signature-v4": "^4.2.2",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "@aws-sdk/fetch-http-handler": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.178.0.tgz",
-            "integrity": "sha512-T/LCNwCihdVNzGn39Dw7tk2U1fMlupFlCsAvDBbO+FOM3h+y9WLHzxmlAVsjPrFXlzdONKf9zd5cuQ+ZW93yAQ==",
-            "requires": {
-                "@aws-sdk/protocol-http": "3.178.0",
-                "@aws-sdk/querystring-builder": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "@aws-sdk/util-base64-browser": "3.170.0",
-                "tslib": "^2.3.1"
-            },
+        "node_modules/@aws-sdk/middleware-sdk-s3/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/types": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-                    "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ=="
-                }
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "@aws-sdk/hash-node": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.178.0.tgz",
-            "integrity": "sha512-mqYraRQlvPO5egUKTNZ1kP52sfwBlsz7woOewQTHOGomZBDXrh8bl1J+sgaDi1NAwXdZUgxuD3QKxxAKRs9a2Q==",
-            "requires": {
-                "@aws-sdk/types": "3.178.0",
-                "@aws-sdk/util-buffer-from": "3.170.0",
-                "tslib": "^2.3.1"
-            },
+        "node_modules/@aws-sdk/middleware-sdk-s3/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/types": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-                    "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ=="
-                }
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "@aws-sdk/invalid-dependency": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.178.0.tgz",
-            "integrity": "sha512-JJNaiLr3nbRYym6oUAAaoFFYtDnIZ9Scco2p4sG/thT2eyAfXcEdNl1cSD3E/R1J+Ml/YplqTiIY4u1KPAriRw==",
-            "requires": {
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
-            },
+        "node_modules/@aws-sdk/middleware-sdk-s3/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/types": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-                    "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ=="
-                }
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "@aws-sdk/is-array-buffer": {
-            "version": "3.170.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/is-array-buffer/-/is-array-buffer-3.170.0.tgz",
-            "integrity": "sha512-yYXqgp8rilBckIvNRs22yAXHKcXb86/g+F+hsTZl38OJintTsLQB//O5v6EQTYhSW7T3wMe1NHDrjZ+hFjAy4Q==",
-            "requires": {
-                "tslib": "^2.3.1"
+        "node_modules/@aws-sdk/middleware-sdk-sts": {
+            "version": "3.363.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.363.0.tgz",
+            "integrity": "sha512-1yy2Ac50FO8BrODaw5bPWvVrRhaVLqXTFH6iHB+dJLPUkwtY5zLM3Mp+9Ilm7kME+r7oIB1wuO6ZB1Lf4ZszIw==",
+            "dependencies": {
+                "@aws-sdk/middleware-signing": "3.363.0",
+                "@aws-sdk/types": "3.357.0",
+                "@smithy/types": "^1.1.0",
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "@aws-sdk/middleware-content-length": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.178.0.tgz",
-            "integrity": "sha512-p3n3IzU03eRzZivEoQn1HA83LbAKukZwRevsJpya1UfCUtWkXQO3v0jU8rhZE4deGa9k7zuCAEmJ8nCw3QxclQ==",
-            "requires": {
-                "@aws-sdk/protocol-http": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
-            },
+        "node_modules/@aws-sdk/middleware-sdk-sts/node_modules/@aws-sdk/types": {
+            "version": "3.357.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.357.0.tgz",
+            "integrity": "sha512-/riCRaXg3p71BeWnShrai0y0QTdXcouPSM0Cn1olZbzTf7s71aLEewrc96qFrL70XhY4XvnxMpqQh+r43XIL3g==",
             "dependencies": {
-                "@aws-sdk/types": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-                    "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ=="
-                }
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "@aws-sdk/middleware-host-header": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.178.0.tgz",
-            "integrity": "sha512-EFc9S63iwCmudVpVSiVPiTnp6WCfsRYUmTrZJJouZzthEhJwcrunwu7Fa9lHYb0zcWLgVFLhzs1Z34J/Er4JoQ==",
-            "requires": {
-                "@aws-sdk/protocol-http": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
-            },
+        "node_modules/@aws-sdk/middleware-sdk-sts/node_modules/@smithy/types": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/@smithy/types/-/types-1.2.0.tgz",
+            "integrity": "sha512-z1r00TvBqF3dh4aHhya7nz1HhvCg4TRmw51fjMrh5do3h+ngSstt/yKlNbHeb9QxJmFbmN8KEVSWgb1bRvfEoA==",
             "dependencies": {
-                "@aws-sdk/types": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-                    "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ=="
-                }
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "@aws-sdk/middleware-logger": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.178.0.tgz",
-            "integrity": "sha512-k4jnB+ryGiAhv6vyNFz2YoaVodldjkbz4mqDlVzhwEn77LT/TcwdBoown3cJD/45LEtiuPqeONoTcNCsuCkRFQ==",
-            "requires": {
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
-            },
+        "node_modules/@aws-sdk/middleware-signing": {
+            "version": "3.363.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.363.0.tgz",
+            "integrity": "sha512-/7qia715pt9JKYIPDGu22WmdZxD8cfF/5xB+1kmILg7ZtjO0pPuTaCNJ7xiIuFd7Dn7JXp5lop08anX/GOhNRQ==",
             "dependencies": {
-                "@aws-sdk/types": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-                    "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ=="
-                }
+                "@aws-sdk/types": "3.357.0",
+                "@smithy/property-provider": "^1.0.1",
+                "@smithy/protocol-http": "^1.1.0",
+                "@smithy/signature-v4": "^1.0.1",
+                "@smithy/types": "^1.1.0",
+                "@smithy/util-middleware": "^1.0.1",
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "@aws-sdk/middleware-recursion-detection": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.178.0.tgz",
-            "integrity": "sha512-dVgSoP2Mer8A0JGaWgpC/f4vPyvHh7laES/u5sTy6RfwrR87oTx+uhKrc6eh+9NkMR2xdRyaNJAMIXwL5bsVzg==",
-            "requires": {
-                "@aws-sdk/protocol-http": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
-            },
+        "node_modules/@aws-sdk/middleware-signing/node_modules/@aws-crypto/crc32": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-3.0.0.tgz",
+            "integrity": "sha512-IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA==",
             "dependencies": {
-                "@aws-sdk/types": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-                    "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ=="
-                }
+                "@aws-crypto/util": "^3.0.0",
+                "@aws-sdk/types": "^3.222.0",
+                "tslib": "^1.11.1"
             }
         },
-        "@aws-sdk/middleware-retry": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.178.0.tgz",
-            "integrity": "sha512-glBXpAqt+4KQ7q8y2/kwDX2ujCvCSQok5rlAmUjaQjVPc3cX77QwATIRQTS2nBC4v9tfMc7yL64ZeRbx6n0RAQ==",
-            "requires": {
-                "@aws-sdk/protocol-http": "3.178.0",
-                "@aws-sdk/service-error-classification": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "@aws-sdk/util-middleware": "3.178.0",
-                "tslib": "^2.3.1",
-                "uuid": "^8.3.2"
-            },
+        "node_modules/@aws-sdk/middleware-signing/node_modules/@aws-crypto/crc32/node_modules/tslib": {
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+            "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        },
+        "node_modules/@aws-sdk/middleware-signing/node_modules/@aws-crypto/util": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-3.0.0.tgz",
+            "integrity": "sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==",
             "dependencies": {
-                "@aws-sdk/types": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-                    "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ=="
-                }
+                "@aws-sdk/types": "^3.222.0",
+                "@aws-sdk/util-utf8-browser": "^3.0.0",
+                "tslib": "^1.11.1"
             }
         },
-        "@aws-sdk/middleware-serde": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.178.0.tgz",
-            "integrity": "sha512-TERiu/B4hYi5Jd4iQN9ECTWbt2IZweAgFB010MboM4CAPm6EcszEc/uCB4faLZNdJaksk1BhAR7koURcda8Sew==",
-            "requires": {
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
-            },
+        "node_modules/@aws-sdk/middleware-signing/node_modules/@aws-crypto/util/node_modules/tslib": {
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+            "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        },
+        "node_modules/@aws-sdk/middleware-signing/node_modules/@aws-sdk/types": {
+            "version": "3.357.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.357.0.tgz",
+            "integrity": "sha512-/riCRaXg3p71BeWnShrai0y0QTdXcouPSM0Cn1olZbzTf7s71aLEewrc96qFrL70XhY4XvnxMpqQh+r43XIL3g==",
             "dependencies": {
-                "@aws-sdk/types": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-                    "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ=="
-                }
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "@aws-sdk/middleware-stack": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.178.0.tgz",
-            "integrity": "sha512-ELYM5Imhlcz2zT1Z4OjVZwO564KvI4L9dMBxuUgO0fwommzjWqxR03yaRGhpGwpCP64d0Op5Koc/RKq5V92Wbw==",
-            "requires": {
-                "tslib": "^2.3.1"
+        "node_modules/@aws-sdk/middleware-signing/node_modules/@smithy/eventstream-codec": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-1.1.0.tgz",
+            "integrity": "sha512-3tEbUb8t8an226jKB6V/Q2XU/J53lCwCzULuBPEaF4JjSh+FlCMp7TmogE/Aij5J9DwlsZ4VAD/IRDuQ/0ZtMw==",
+            "dependencies": {
+                "@aws-crypto/crc32": "3.0.0",
+                "@smithy/types": "^1.2.0",
+                "@smithy/util-hex-encoding": "^1.1.0",
+                "tslib": "^2.5.0"
             }
         },
-        "@aws-sdk/middleware-user-agent": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.178.0.tgz",
-            "integrity": "sha512-xkKBxrFbs+UwUPpfIGEPuHeBWS2Jgmcd+ipEJUQRR3lY4h1fJ6mPGeyyaVDvwaJp9KgESSI6QTp6V15l8GXXgQ==",
-            "requires": {
-                "@aws-sdk/protocol-http": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
-            },
+        "node_modules/@aws-sdk/middleware-signing/node_modules/@smithy/is-array-buffer": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-1.1.0.tgz",
+            "integrity": "sha512-twpQ/n+3OWZJ7Z+xu43MJErmhB/WO/mMTnqR6PwWQShvSJ/emx5d1N59LQZk6ZpTAeuRWrc+eHhkzTp9NFjNRQ==",
             "dependencies": {
-                "@aws-sdk/types": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-                    "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ=="
-                }
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "@aws-sdk/node-config-provider": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.178.0.tgz",
-            "integrity": "sha512-yb5XJcC7SxkZ5oxu3zQ/foBdMkLBKryzx/CVg5BNSsKDjfbouf/ZYPcJDHhc2gzCtZcx18GjFBOnv8cpo/tyXQ==",
-            "requires": {
-                "@aws-sdk/property-provider": "3.178.0",
-                "@aws-sdk/shared-ini-file-loader": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
-            },
+        "node_modules/@aws-sdk/middleware-signing/node_modules/@smithy/property-provider": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-1.2.0.tgz",
+            "integrity": "sha512-qlJd9gT751i4T0t/hJAyNGfESfi08Fek8QiLcysoKPgR05qHhG0OYhlaCJHhpXy4ECW0lHyjvFM1smrCLIXVfw==",
             "dependencies": {
-                "@aws-sdk/property-provider": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.178.0.tgz",
-                    "integrity": "sha512-+Fh1aUANa+Gt/rh4SUHO0yHwKsibyZGk2LLDUcM1+9r0pUZT0qy3h0UCl5Kkj9HUcDJMD73wHTx4UB440xRobw==",
-                    "requires": {
-                        "@aws-sdk/types": "3.178.0",
-                        "tslib": "^2.3.1"
-                    }
-                },
-                "@aws-sdk/shared-ini-file-loader": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.178.0.tgz",
-                    "integrity": "sha512-nZGmuhGLDFbXsb7QYDg7PiPMAmsdlSshKJ+AhKSZF/J0SK94kdZgGnGXGUZe52S3G41E3CZIgnLnnsMXq0uErA==",
-                    "requires": {
-                        "tslib": "^2.3.1"
-                    }
-                },
-                "@aws-sdk/types": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-                    "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ=="
-                }
+                "@smithy/types": "^1.2.0",
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "@aws-sdk/node-http-handler": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.178.0.tgz",
-            "integrity": "sha512-EtH6YiX1IX0QraQ/+kKBWAEtsFYBnFyxOimTBtlpDYwFpgDzIZ1GFn2wORYomEWALg10kphs8n3E5/7b5t5OWQ==",
-            "requires": {
-                "@aws-sdk/abort-controller": "3.178.0",
-                "@aws-sdk/protocol-http": "3.178.0",
-                "@aws-sdk/querystring-builder": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
-            },
+        "node_modules/@aws-sdk/middleware-signing/node_modules/@smithy/protocol-http": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-1.2.0.tgz",
+            "integrity": "sha512-GfGfruksi3nXdFok5RhgtOnWe5f6BndzYfmEXISD+5gAGdayFGpjWu5pIqIweTudMtse20bGbc+7MFZXT1Tb8Q==",
             "dependencies": {
-                "@aws-sdk/types": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-                    "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ=="
-                }
+                "@smithy/types": "^1.2.0",
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "@aws-sdk/property-provider": {
-            "version": "3.37.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.37.0.tgz",
-            "integrity": "sha512-puXV4MIj+n9Pr4KbwpOz6+nK7gmJAgAOZW/yKXxyWH4fTcrCVe9xuo5kqaiI1gb5ojaNt2GuISBFR7bVLumh9Q==",
-            "requires": {
-                "@aws-sdk/types": "3.37.0",
-                "tslib": "^2.3.0"
+        "node_modules/@aws-sdk/middleware-signing/node_modules/@smithy/signature-v4": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-1.1.0.tgz",
+            "integrity": "sha512-fDo3m7YqXBs7neciOePPd/X9LPm5QLlDMdIC4m1H6dgNLnXfLMFNIxEfPyohGA8VW9Wn4X8lygnPSGxDZSmp0Q==",
+            "dependencies": {
+                "@smithy/eventstream-codec": "^1.1.0",
+                "@smithy/is-array-buffer": "^1.1.0",
+                "@smithy/types": "^1.2.0",
+                "@smithy/util-hex-encoding": "^1.1.0",
+                "@smithy/util-middleware": "^1.1.0",
+                "@smithy/util-uri-escape": "^1.1.0",
+                "@smithy/util-utf8": "^1.1.0",
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "@aws-sdk/protocol-http": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.178.0.tgz",
-            "integrity": "sha512-GsnANW60mVYMlE16UGNSOwYZ6TbkoODvmDQi95SEPjM7asf4vihEyDvhxiGS/JvC18UyxRVWT89l/V3hR/SF7w==",
-            "requires": {
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
-            },
+        "node_modules/@aws-sdk/middleware-signing/node_modules/@smithy/types": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/@smithy/types/-/types-1.2.0.tgz",
+            "integrity": "sha512-z1r00TvBqF3dh4aHhya7nz1HhvCg4TRmw51fjMrh5do3h+ngSstt/yKlNbHeb9QxJmFbmN8KEVSWgb1bRvfEoA==",
             "dependencies": {
-                "@aws-sdk/types": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-                    "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ=="
-                }
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "@aws-sdk/querystring-builder": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.178.0.tgz",
-            "integrity": "sha512-vJXlExSshlHtGVvan/U6JihWvzf8t9QwH5I4F6HUY+exxMy5vFDYCnNqGAzbJwq7w/HME1gQWLoXq2k0uODz7g==",
-            "requires": {
-                "@aws-sdk/types": "3.178.0",
-                "@aws-sdk/util-uri-escape": "3.170.0",
-                "tslib": "^2.3.1"
-            },
+        "node_modules/@aws-sdk/middleware-signing/node_modules/@smithy/util-buffer-from": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-1.1.0.tgz",
+            "integrity": "sha512-9m6NXE0ww+ra5HKHCHig20T+FAwxBAm7DIdwc/767uGWbRcY720ybgPacQNB96JMOI7xVr/CDa3oMzKmW4a+kw==",
             "dependencies": {
-                "@aws-sdk/types": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-                    "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ=="
-                }
+                "@smithy/is-array-buffer": "^1.1.0",
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "@aws-sdk/querystring-parser": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.178.0.tgz",
-            "integrity": "sha512-dp3pLnsOvAcIF7Yn2PY5CIVWX7GvC33nSlWDYeLeCMapccwTbe6zBqreWbScmIGJra4QJTdjccpwo2Yxwhr5QQ==",
-            "requires": {
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
-            },
+        "node_modules/@aws-sdk/middleware-signing/node_modules/@smithy/util-hex-encoding": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-1.1.0.tgz",
+            "integrity": "sha512-7UtIE9eH0u41zpB60Jzr0oNCQ3hMJUabMcKRUVjmyHTXiWDE4vjSqN6qlih7rCNeKGbioS7f/y2Jgym4QZcKFg==",
             "dependencies": {
-                "@aws-sdk/types": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-                    "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ=="
-                }
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "@aws-sdk/service-error-classification": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.178.0.tgz",
-            "integrity": "sha512-tDKTBXxck2N4bhAnQaeokx9ps38V3G70lcDdHS/N9hmqcQQmH5x+1/AMwYWLjUZmOQPBW9sFoG4B3psnl+sefw=="
-        },
-        "@aws-sdk/shared-ini-file-loader": {
-            "version": "3.37.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.37.0.tgz",
-            "integrity": "sha512-+vRBSlfa48R9KL7DpQt3dsu5/+5atjRgoCISblWo3SLpjrx41pKcjKneo7a1u0aP1Xc2oG2TfIyqTWZuOXsmEQ==",
-            "requires": {
-                "tslib": "^2.3.0"
+        "node_modules/@aws-sdk/middleware-signing/node_modules/@smithy/util-middleware": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-1.1.0.tgz",
+            "integrity": "sha512-6hhckcBqVgjWAqLy2vqlPZ3rfxLDhFWEmM7oLh2POGvsi7j0tHkbN7w4DFhuBExVJAbJ/qqxqZdRY6Fu7/OezQ==",
+            "dependencies": {
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "@aws-sdk/signature-v4": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.178.0.tgz",
-            "integrity": "sha512-8oOx6o0uOqlCDPM0dszfR1WHqd0E1VuFqez8iNItp0DhmhaCuanEwKYYA6HOkVu/MA6CsG6zDIJaFr5ODU2NvQ==",
-            "requires": {
-                "@aws-sdk/is-array-buffer": "3.170.0",
-                "@aws-sdk/types": "3.178.0",
-                "@aws-sdk/util-hex-encoding": "3.170.0",
-                "@aws-sdk/util-middleware": "3.178.0",
-                "@aws-sdk/util-uri-escape": "3.170.0",
-                "tslib": "^2.3.1"
-            },
+        "node_modules/@aws-sdk/middleware-signing/node_modules/@smithy/util-uri-escape": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-1.1.0.tgz",
+            "integrity": "sha512-/jL/V1xdVRt5XppwiaEU8Etp5WHZj609n0xMTuehmCqdoOFbId1M+aEeDWZsQ+8JbEB/BJ6ynY2SlYmOaKtt8w==",
             "dependencies": {
-                "@aws-sdk/types": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-                    "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ=="
-                }
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "@aws-sdk/smithy-client": {
-            "version": "3.180.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.180.0.tgz",
-            "integrity": "sha512-1vWafiUdn6RvOsD4CyNjMeDtDujuPi4Iq4Db6HrFmVPpJAutOLlCg52Dt7k96KCcIKgxVAs6Br0Waef+pcoGNA==",
-            "requires": {
-                "@aws-sdk/middleware-stack": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
-            },
+        "node_modules/@aws-sdk/middleware-signing/node_modules/@smithy/util-utf8": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-1.1.0.tgz",
+            "integrity": "sha512-p/MYV+JmqmPyjdgyN2UxAeYDj9cBqCjp0C/NsTWnnjoZUVqoeZ6IrW915L9CAKWVECgv9lVQGc4u/yz26/bI1A==",
             "dependencies": {
-                "@aws-sdk/types": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-                    "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ=="
-                }
+                "@smithy/util-buffer-from": "^1.1.0",
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "@aws-sdk/types": {
-            "version": "3.37.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.37.0.tgz",
-            "integrity": "sha512-KwHB06E1uxof5ijfcQXYidyihoCRMnHEFvWCy/VlL+1S54FTlMZ27JOZzQhLiw8NqeNfO33aqpMkxR60TwUZzg=="
-        },
-        "@aws-sdk/url-parser": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.178.0.tgz",
-            "integrity": "sha512-+Ch29d+IZG6zD1gNDVgFC00huY8ytrPdijAuNJ4DtPBTGP4zbrImw3js0GfvfBjLrQYBnclcAvSx4J1Q/8tqBQ==",
-            "requires": {
-                "@aws-sdk/querystring-parser": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
-            },
+        "node_modules/@aws-sdk/middleware-ssec": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/types": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-                    "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ=="
-                }
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "@aws-sdk/util-arn-parser": {
-            "version": "3.46.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.46.0.tgz",
-            "integrity": "sha512-MIeqH53/Z5x+uQ/EHs6zqkdBqdpGA8tA6l/mL1j8hRK6bSQEUTAVlPNgjp03qse1Fk94GJbJbjZ4C0R7Z4YM+g==",
-            "requires": {
-                "tslib": "^2.3.0"
+        "node_modules/@aws-sdk/middleware-stack": {
+            "version": "3.342.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "@aws-sdk/util-base64-browser": {
-            "version": "3.170.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-base64-browser/-/util-base64-browser-3.170.0.tgz",
-            "integrity": "sha512-uLP9Kp74+jc+UWI392LSWIaUj9eXZBhkAiSm8dXAyrr+5GFOKvmEdidFoZKKcFcZ2v3RMonDgFVcDBiZ33w7BQ==",
-            "requires": {
-                "tslib": "^2.3.1"
+        "node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.637.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.609.0",
+                "@aws-sdk/util-endpoints": "3.637.0",
+                "@smithy/protocol-http": "^4.1.0",
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "@aws-sdk/util-base64-node": {
-            "version": "3.170.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-base64-node/-/util-base64-node-3.170.0.tgz",
-            "integrity": "sha512-sjpOmfyW0RWCLXU8Du0ZtwgFoxIuKQIyVygXJ4qxByoa3jIUJXf4U33uSRMy47V3JoogdZuKSpND9hiNk2wU4w==",
-            "requires": {
-                "@aws-sdk/util-buffer-from": "3.170.0",
-                "tslib": "^2.3.1"
+        "node_modules/@aws-sdk/middleware-user-agent/node_modules/@aws-sdk/types": {
+            "version": "3.609.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "@aws-sdk/util-body-length-browser": {
-            "version": "3.170.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.170.0.tgz",
-            "integrity": "sha512-SqSWA++gsZgHw6tlcEXx9K6R6cVKNYzOq6bca+NR7jXvy1hfqiv9Gx5TZrG4oL4JziP8QA0fTklmI1uQJ4HBRA==",
-            "requires": {
-                "tslib": "^2.3.1"
+        "node_modules/@aws-sdk/nested-clients": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.758.0",
+                "@aws-sdk/middleware-host-header": "3.734.0",
+                "@aws-sdk/middleware-logger": "3.734.0",
+                "@aws-sdk/middleware-recursion-detection": "3.734.0",
+                "@aws-sdk/middleware-user-agent": "3.758.0",
+                "@aws-sdk/region-config-resolver": "3.734.0",
+                "@aws-sdk/types": "3.734.0",
+                "@aws-sdk/util-endpoints": "3.743.0",
+                "@aws-sdk/util-user-agent-browser": "3.734.0",
+                "@aws-sdk/util-user-agent-node": "3.758.0",
+                "@smithy/config-resolver": "^4.0.1",
+                "@smithy/core": "^3.1.5",
+                "@smithy/fetch-http-handler": "^5.0.1",
+                "@smithy/hash-node": "^4.0.1",
+                "@smithy/invalid-dependency": "^4.0.1",
+                "@smithy/middleware-content-length": "^4.0.1",
+                "@smithy/middleware-endpoint": "^4.0.6",
+                "@smithy/middleware-retry": "^4.0.7",
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/middleware-stack": "^4.0.1",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/node-http-handler": "^4.0.3",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.7",
+                "@smithy/util-defaults-mode-node": "^4.0.7",
+                "@smithy/util-endpoints": "^3.0.1",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-retry": "^4.0.1",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/nested-clients/node_modules/@aws-sdk/core": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/core": "^3.1.5",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/signature-v4": "^5.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-sdk/util-body-length-node": {
-            "version": "3.170.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.170.0.tgz",
-            "integrity": "sha512-sFb85ngsgfpamwDn22LC/+FkbDTNiddbMHptkajw+CAD2Rb4SJDp2PfXZ6k883BueJWhmxZ9+lApHZqYtgPdzw==",
-            "requires": {
-                "tslib": "^2.3.1"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-sdk/util-buffer-from": {
-            "version": "3.170.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-buffer-from/-/util-buffer-from-3.170.0.tgz",
-            "integrity": "sha512-3ClE3wgN/Zw0ahfVAY5KQ/y3K2c+SYHwVUQaGSuVQlPOCDInGYjE/XEFwCeGJzncRPHIKDRPEsHCpm1uwgwEqQ==",
-            "requires": {
-                "@aws-sdk/is-array-buffer": "3.170.0",
-                "tslib": "^2.3.1"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-sdk/util-config-provider": {
-            "version": "3.170.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-config-provider/-/util-config-provider-3.170.0.tgz",
-            "integrity": "sha512-VV6lfss6Go00TF2hRVJnN8Uf2FOwC++1e8glaeU7fMWluYCBjwl+116mPOPFaxvkJCg0dui2tFroXioslM/rvQ==",
-            "requires": {
-                "tslib": "^2.3.1"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-sdk/util-credentials": {
-            "version": "3.37.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-credentials/-/util-credentials-3.37.0.tgz",
-            "integrity": "sha512-zcLhSZDKgBLhUjSU5HoQpuQiP3v8oE86NmV/tiZVPEaO6YVULEAB2Cfj1hpM/b/JXWzjSHfT06KXT7QUODKS+A==",
-            "requires": {
-                "@aws-sdk/shared-ini-file-loader": "3.37.0",
-                "tslib": "^2.3.0"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/core": "3.758.0",
+                "@aws-sdk/types": "3.734.0",
+                "@aws-sdk/util-endpoints": "3.743.0",
+                "@smithy/core": "^3.1.5",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-sdk/util-defaults-mode-browser": {
-            "version": "3.180.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.180.0.tgz",
-            "integrity": "sha512-XGq/RUuhqnLlApETBmBWDszNG4TR3FCOSNwFvok1UIPgFXxjh0JOzNc5mAX1St2hfx1IDb9Ja4BmTkYKix7byg==",
-            "requires": {
-                "@aws-sdk/property-provider": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "bowser": "^2.11.0",
-                "tslib": "^2.3.1"
-            },
+        "node_modules/@aws-sdk/nested-clients/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@aws-sdk/property-provider": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.178.0.tgz",
-                    "integrity": "sha512-+Fh1aUANa+Gt/rh4SUHO0yHwKsibyZGk2LLDUcM1+9r0pUZT0qy3h0UCl5Kkj9HUcDJMD73wHTx4UB440xRobw==",
-                    "requires": {
-                        "@aws-sdk/types": "3.178.0",
-                        "tslib": "^2.3.1"
-                    }
-                },
-                "@aws-sdk/types": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-                    "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ=="
-                }
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-sdk/util-defaults-mode-node": {
-            "version": "3.180.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.180.0.tgz",
-            "integrity": "sha512-ch9VR4OKYGEaNbLhX/EyZDpNZst5T+/VYsFyqMA47J0YyMbg7GWyn2FjjhZ7qOV3XU6W8YEBNdd7U/LFFVp8uA==",
-            "requires": {
-                "@aws-sdk/config-resolver": "3.178.0",
-                "@aws-sdk/credential-provider-imds": "3.178.0",
-                "@aws-sdk/node-config-provider": "3.178.0",
-                "@aws-sdk/property-provider": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
-            },
+        "node_modules/@aws-sdk/nested-clients/node_modules/@aws-sdk/types": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@aws-sdk/credential-provider-imds": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.178.0.tgz",
-                    "integrity": "sha512-ZvqQTi3+S13LACVgaWNCOKBv5jROIz7rqyZh56QunAkaAUqPbpM4VFODgAGZYPCOSggZbEUUqXOVB9xSnshLnA==",
-                    "requires": {
-                        "@aws-sdk/node-config-provider": "3.178.0",
-                        "@aws-sdk/property-provider": "3.178.0",
-                        "@aws-sdk/types": "3.178.0",
-                        "@aws-sdk/url-parser": "3.178.0",
-                        "tslib": "^2.3.1"
-                    }
-                },
-                "@aws-sdk/property-provider": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.178.0.tgz",
-                    "integrity": "sha512-+Fh1aUANa+Gt/rh4SUHO0yHwKsibyZGk2LLDUcM1+9r0pUZT0qy3h0UCl5Kkj9HUcDJMD73wHTx4UB440xRobw==",
-                    "requires": {
-                        "@aws-sdk/types": "3.178.0",
-                        "tslib": "^2.3.1"
-                    }
-                },
-                "@aws-sdk/types": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-                    "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ=="
-                }
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-sdk/util-hex-encoding": {
-            "version": "3.170.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.170.0.tgz",
-            "integrity": "sha512-BDYyMqaxX4/N7rYOIYlqgpZaBuHw3kNXKgOkWtJdzndIZbQX8HnyJ+rF0Pr1aVsOpVDM+fY1prERleFh/ZRTCg==",
-            "requires": {
-                "tslib": "^2.3.1"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.743.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-endpoints": "^3.0.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-sdk/util-locate-window": {
-            "version": "3.37.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.37.0.tgz",
-            "integrity": "sha512-NvDCfOhLLVHp27oGUUs8EVirhz91aX5gdxGS7J/sh5PF0cNN8rwaR1vSLR7BxPmJHMO7NH7i9EwiELfLfYcq6g==",
-            "requires": {
-                "tslib": "^2.3.0"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.734.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/types": "^4.1.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
             }
         },
-        "@aws-sdk/util-middleware": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.178.0.tgz",
-            "integrity": "sha512-93WgrJKuwtv3f2r1Q04emzjMiwpYR5hysOHKMkrGOvAVZdDqe1UTjmtuxQadVi3DBr1KOT/d5uP9MjV8LqaUUA==",
-            "requires": {
-                "tslib": "^2.3.1"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.758.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@aws-sdk/middleware-user-agent": "3.758.0",
+                "@aws-sdk/types": "3.734.0",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            },
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
             }
         },
-        "@aws-sdk/util-uri-escape": {
-            "version": "3.170.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-uri-escape/-/util-uri-escape-3.170.0.tgz",
-            "integrity": "sha512-Fof0urZ3Lx6z6LNKSEO6T4DNaNh6sLJaSWFaC6gtVDPux/C3R7wy2RQRDp0baHxE8m1KMB0XnKzHizJNrbDI1w==",
-            "requires": {
-                "tslib": "^2.3.1"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/abort-controller": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-sdk/util-user-agent-browser": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.178.0.tgz",
-            "integrity": "sha512-LxOrn7Ai88n0i5J5rTb5Bt0TAycPvDYzjdCwmd2mahsPHZGSDLeCeh6KOIxZsEfnzYRl4HGWvIEXdHIYZ3RTug==",
-            "requires": {
-                "@aws-sdk/types": "3.178.0",
-                "bowser": "^2.11.0",
-                "tslib": "^2.3.1"
-            },
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/config-resolver": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@aws-sdk/types": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-                    "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ=="
-                }
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-sdk/util-user-agent-node": {
-            "version": "3.178.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.178.0.tgz",
-            "integrity": "sha512-TrP6v+V4Qnv3E9CNgwR/G+1xiy8fa9j5LAm43qwp9PfJHchNyWOJ0FURD3Ne2sm/388Ybzjb1DRYRZ7B+xbnOw==",
-            "requires": {
-                "@aws-sdk/node-config-provider": "3.178.0",
-                "@aws-sdk/types": "3.178.0",
-                "tslib": "^2.3.1"
-            },
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/core": {
+            "version": "3.1.5",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@aws-sdk/types": {
-                    "version": "3.178.0",
-                    "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.178.0.tgz",
-                    "integrity": "sha512-CrHxHzXSEr/Z3NLFvJgSGHGcD9tYUZ0Rhp8tFCSpD3TpBo3/Y7RIvqaEPvECsL52UEloeBhQf65AO8590YkVmQ=="
-                }
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-stream": "^4.1.2",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-sdk/util-utf8-browser": {
-            "version": "3.170.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.170.0.tgz",
-            "integrity": "sha512-tJby9krepSwDsBK+KQF5ACacZQ4LH1Aheh5Dy0pghxsN/9IRw7kMWTumuRCnSntLFFphDD7GM494/Dvnl1UCLA==",
-            "requires": {
-                "tslib": "^2.3.1"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/credential-provider-imds": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-sdk/util-utf8-node": {
-            "version": "3.170.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8-node/-/util-utf8-node-3.170.0.tgz",
-            "integrity": "sha512-52QWGNoNQoyT2CuoQz6LjBKxHQtN/ceMFLW+9J1E0I1ni8XTuTYP52BlMe5484KkmZKsHOm+EWe4xuwwVetTxg==",
-            "requires": {
-                "@aws-sdk/util-buffer-from": "3.170.0",
-                "tslib": "^2.3.1"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/fetch-http-handler": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/querystring-builder": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-base64": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@aws-toolkits/telemetry": {
-            "version": "1.0.87",
-            "resolved": "https://registry.npmjs.org/@aws-toolkits/telemetry/-/telemetry-1.0.87.tgz",
-            "integrity": "sha512-rN0s9YhU+SEIVTEojwuVm+Be3CXsTdIsg75PijVM9LdPqwNxzcSY2X/yU4K5R4QNMU160g4/qQ00BI9SdTJxKw==",
-            "dev": true,
-            "requires": {
-                "ajv": "^6.12.6",
-                "fs-extra": "^11.1.0",
-                "lodash": "^4.17.20",
-                "prettier": "^2.1.2",
-                "ts-morph": "^17.0.1",
-                "typescript": "^4.7.3",
-                "yargs": "^17.0.1"
-            },
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/hash-node": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "fs-extra": {
-                    "version": "11.1.0",
-                    "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz",
-                    "integrity": "sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==",
-                    "dev": true,
-                    "requires": {
-                        "graceful-fs": "^4.2.0",
-                        "jsonfile": "^6.0.1",
-                        "universalify": "^2.0.0"
-                    }
-                }
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@babel/code-frame": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
-            "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
-            "dev": true,
-            "requires": {
-                "@babel/highlight": "^7.16.7"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/invalid-dependency": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@babel/compat-data": {
-            "version": "7.17.7",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.7.tgz",
-            "integrity": "sha512-p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ==",
-            "dev": true
-        },
-        "@babel/core": {
-            "version": "7.17.7",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.7.tgz",
-            "integrity": "sha512-djHlEfFHnSnTAcPb7dATbiM5HxGOP98+3JLBZtjRb5I7RXrw7kFRoG2dXM8cm3H+o11A8IFH/uprmJpwFynRNQ==",
-            "dev": true,
-            "requires": {
-                "@ampproject/remapping": "^2.1.0",
-                "@babel/code-frame": "^7.16.7",
-                "@babel/generator": "^7.17.7",
-                "@babel/helper-compilation-targets": "^7.17.7",
-                "@babel/helper-module-transforms": "^7.17.7",
-                "@babel/helpers": "^7.17.7",
-                "@babel/parser": "^7.17.7",
-                "@babel/template": "^7.16.7",
-                "@babel/traverse": "^7.17.3",
-                "@babel/types": "^7.17.0",
-                "convert-source-map": "^1.7.0",
-                "debug": "^4.1.0",
-                "gensync": "^1.0.0-beta.2",
-                "json5": "^2.1.2",
-                "semver": "^6.3.0"
-            },
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/is-array-buffer": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                }
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@babel/generator": {
-            "version": "7.17.7",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz",
-            "integrity": "sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.17.0",
-                "jsesc": "^2.5.1",
-                "source-map": "^0.5.0"
-            },
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/middleware-content-length": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "source-map": {
-                    "version": "0.5.7",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-                    "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-                    "dev": true
-                }
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@babel/helper-compilation-targets": {
-            "version": "7.17.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz",
-            "integrity": "sha512-UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w==",
-            "dev": true,
-            "requires": {
-                "@babel/compat-data": "^7.17.7",
-                "@babel/helper-validator-option": "^7.16.7",
-                "browserslist": "^4.17.5",
-                "semver": "^6.3.0"
-            },
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/middleware-endpoint": {
+            "version": "4.0.6",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                }
+                "@smithy/core": "^3.1.5",
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "@smithy/util-middleware": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@babel/helper-environment-visitor": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz",
-            "integrity": "sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.16.7"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/middleware-retry": {
+            "version": "4.0.7",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/service-error-classification": "^4.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-retry": "^4.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@babel/helper-function-name": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz",
-            "integrity": "sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-get-function-arity": "^7.16.7",
-                "@babel/template": "^7.16.7",
-                "@babel/types": "^7.16.7"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/middleware-serde": {
+            "version": "4.0.2",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@babel/helper-get-function-arity": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz",
-            "integrity": "sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.16.7"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/middleware-stack": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@babel/helper-hoist-variables": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
-            "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.16.7"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/node-config-provider": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@babel/helper-module-imports": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
-            "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.16.7"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/node-http-handler": {
+            "version": "4.0.3",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/abort-controller": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/querystring-builder": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@babel/helper-module-transforms": {
-            "version": "7.17.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz",
-            "integrity": "sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-environment-visitor": "^7.16.7",
-                "@babel/helper-module-imports": "^7.16.7",
-                "@babel/helper-simple-access": "^7.17.7",
-                "@babel/helper-split-export-declaration": "^7.16.7",
-                "@babel/helper-validator-identifier": "^7.16.7",
-                "@babel/template": "^7.16.7",
-                "@babel/traverse": "^7.17.3",
-                "@babel/types": "^7.17.0"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/property-provider": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@babel/helper-simple-access": {
-            "version": "7.17.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz",
-            "integrity": "sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.17.0"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/protocol-http": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@babel/helper-split-export-declaration": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
-            "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
-            "dev": true,
-            "requires": {
-                "@babel/types": "^7.16.7"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/querystring-builder": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@babel/helper-validator-identifier": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
-            "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
-            "dev": true
-        },
-        "@babel/helper-validator-option": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
-            "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
-            "dev": true
-        },
-        "@babel/helpers": {
-            "version": "7.17.7",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.7.tgz",
-            "integrity": "sha512-TKsj9NkjJfTBxM7Phfy7kv6yYc4ZcOo+AaWGqQOKTPDOmcGkIFb5xNA746eKisQkm4yavUYh4InYM9S+VnO01w==",
-            "dev": true,
-            "requires": {
-                "@babel/template": "^7.16.7",
-                "@babel/traverse": "^7.17.3",
-                "@babel/types": "^7.17.0"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/querystring-parser": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@babel/highlight": {
-            "version": "7.16.10",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz",
-            "integrity": "sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-validator-identifier": "^7.16.7",
-                "chalk": "^2.0.0",
-                "js-tokens": "^4.0.0"
-            },
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/service-error-classification": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "ansi-styles": {
-                    "version": "3.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^1.9.0"
-                    }
-                },
-                "chalk": {
-                    "version": "2.4.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-                    "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^3.2.1",
-                        "escape-string-regexp": "^1.0.5",
-                        "supports-color": "^5.3.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "1.9.3",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-                    "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "1.1.3"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.3",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-                    "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-                    "dev": true
-                },
-                "escape-string-regexp": {
-                    "version": "1.0.5",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-                    "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-                    "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "5.5.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-                    "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^3.0.0"
-                    }
-                }
+                "@smithy/types": "^4.1.0"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@babel/parser": {
-            "version": "7.17.7",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.7.tgz",
-            "integrity": "sha512-bm3AQf45vR4gKggRfvJdYJ0gFLoCbsPxiFLSH6hTVYABptNHY6l9NrhnucVjQ/X+SPtLANT9lc0fFhikj+VBRA=="
-        },
-        "@babel/template": {
-            "version": "7.16.7",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-            "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
-            "dev": true,
-            "requires": {
-                "@babel/code-frame": "^7.16.7",
-                "@babel/parser": "^7.16.7",
-                "@babel/types": "^7.16.7"
-            }
-        },
-        "@babel/traverse": {
-            "version": "7.17.3",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz",
-            "integrity": "sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==",
-            "dev": true,
-            "requires": {
-                "@babel/code-frame": "^7.16.7",
-                "@babel/generator": "^7.17.3",
-                "@babel/helper-environment-visitor": "^7.16.7",
-                "@babel/helper-function-name": "^7.16.7",
-                "@babel/helper-hoist-variables": "^7.16.7",
-                "@babel/helper-split-export-declaration": "^7.16.7",
-                "@babel/parser": "^7.17.3",
-                "@babel/types": "^7.17.0",
-                "debug": "^4.1.0",
-                "globals": "^11.1.0"
-            },
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/shared-ini-file-loader": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "globals": {
-                    "version": "11.12.0",
-                    "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-                    "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-                    "dev": true
-                }
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@babel/types": {
-            "version": "7.17.0",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz",
-            "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==",
-            "dev": true,
-            "requires": {
-                "@babel/helper-validator-identifier": "^7.16.7",
-                "to-fast-properties": "^2.0.0"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/signature-v4": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/is-array-buffer": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@bcherny/json-schema-ref-parser": {
-            "version": "9.0.9",
-            "resolved": "https://registry.npmjs.org/@bcherny/json-schema-ref-parser/-/json-schema-ref-parser-9.0.9.tgz",
-            "integrity": "sha512-vmEmnJCfpkLdas++9OYg6riIezTYqTHpqUTODJzHLzs5UnXujbOJW9VwcVCnyo1mVRt32FRr23iXBx/sX8YbeQ==",
-            "dev": true,
-            "requires": {
-                "@jsdevtools/ono": "^7.1.3",
-                "@types/json-schema": "^7.0.6",
-                "call-me-maybe": "^1.0.1",
-                "js-yaml": "^4.1.0"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/smithy-client": {
+            "version": "4.1.6",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/core": "^3.1.5",
+                "@smithy/middleware-endpoint": "^4.0.6",
+                "@smithy/middleware-stack": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-stream": "^4.1.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@colors/colors": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
-            "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ=="
-        },
-        "@cspotcode/source-map-consumer": {
-            "version": "0.8.0",
-            "resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz",
-            "integrity": "sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==",
-            "dev": true
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/types": {
+            "version": "4.1.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "@cspotcode/source-map-support": {
-            "version": "0.8.1",
-            "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
-            "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
-            "dev": true,
-            "requires": {
-                "@jridgewell/trace-mapping": "0.3.9"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/url-parser": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/querystring-parser": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/util-base64": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "@jridgewell/trace-mapping": {
-                    "version": "0.3.9",
-                    "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
-                    "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
-                    "dev": true,
-                    "requires": {
-                        "@jridgewell/resolve-uri": "^3.0.3",
-                        "@jridgewell/sourcemap-codec": "^1.4.10"
-                    }
-                }
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@dabh/diagnostics": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz",
-            "integrity": "sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==",
-            "requires": {
-                "colorspace": "1.1.x",
-                "enabled": "2.0.x",
-                "kuler": "^2.0.0"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/util-body-length-browser": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@discoveryjs/json-ext": {
-            "version": "0.5.5",
-            "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz",
-            "integrity": "sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA==",
-            "dev": true
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/util-body-length-node": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "@esbuild/android-arm": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.13.tgz",
-            "integrity": "sha512-RY2fVI8O0iFUNvZirXaQ1vMvK0xhCcl0gqRj74Z6yEiO1zAUa7hbsdwZM1kzqbxHK7LFyMizipfXT3JME+12Hw==",
-            "dev": true,
-            "optional": true
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/util-buffer-from": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/is-array-buffer": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "@esbuild/linux-loong64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.13.tgz",
-            "integrity": "sha512-+BoyIm4I8uJmH/QDIH0fu7MG0AEx9OXEDXnqptXCwKOlOqZiS4iraH1Nr7/ObLMokW3sOCeBNyD68ATcV9b9Ag==",
-            "dev": true,
-            "optional": true
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/util-config-provider": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "@eslint/eslintrc": {
-            "version": "1.3.3",
-            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz",
-            "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==",
-            "dev": true,
-            "requires": {
-                "ajv": "^6.12.4",
-                "debug": "^4.3.2",
-                "espree": "^9.4.0",
-                "globals": "^13.15.0",
-                "ignore": "^5.2.0",
-                "import-fresh": "^3.2.1",
-                "js-yaml": "^4.1.0",
-                "minimatch": "^3.1.2",
-                "strip-json-comments": "^3.1.1"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/util-defaults-mode-browser": {
+            "version": "4.0.7",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@humanwhocodes/config-array": {
-            "version": "0.11.6",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.6.tgz",
-            "integrity": "sha512-jJr+hPTJYKyDILJfhNSHsjiwXYf26Flsz8DvNndOsHs5pwSnpGUEy8yzF0JYhCEvTDdV2vuOK5tt8BVhwO5/hg==",
-            "dev": true,
-            "requires": {
-                "@humanwhocodes/object-schema": "^1.2.1",
-                "debug": "^4.1.1",
-                "minimatch": "^3.0.4"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/util-defaults-mode-node": {
+            "version": "4.0.7",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/config-resolver": "^4.0.1",
+                "@smithy/credential-provider-imds": "^4.0.1",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@humanwhocodes/module-importer": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-            "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-            "dev": true
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/util-endpoints": {
+            "version": "3.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "@humanwhocodes/object-schema": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-            "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-            "dev": true
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/util-hex-encoding": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "@iarna/toml": {
-            "version": "2.2.5",
-            "resolved": "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz",
-            "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/util-middleware": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "@istanbuljs/load-nyc-config": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-            "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-            "dev": true,
-            "requires": {
-                "camelcase": "^5.3.1",
-                "find-up": "^4.1.0",
-                "get-package-type": "^0.1.0",
-                "js-yaml": "^3.13.1",
-                "resolve-from": "^5.0.0"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/util-retry": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/service-error-classification": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/util-stream": {
+            "version": "4.1.2",
+            "license": "Apache-2.0",
+            "peer": true,
             "dependencies": {
-                "argparse": {
-                    "version": "1.0.10",
-                    "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-                    "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-                    "dev": true,
-                    "requires": {
-                        "sprintf-js": "~1.0.2"
-                    }
-                },
-                "camelcase": {
-                    "version": "5.3.1",
-                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-                    "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-                    "dev": true
-                },
-                "find-up": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-                    "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-                    "dev": true,
-                    "requires": {
-                        "locate-path": "^5.0.0",
-                        "path-exists": "^4.0.0"
-                    }
-                },
-                "js-yaml": {
-                    "version": "3.14.1",
-                    "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-                    "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-                    "dev": true,
-                    "requires": {
-                        "argparse": "^1.0.7",
-                        "esprima": "^4.0.0"
-                    }
-                },
-                "locate-path": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-                    "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-                    "dev": true,
-                    "requires": {
-                        "p-locate": "^4.1.0"
-                    }
-                },
-                "p-limit": {
-                    "version": "2.3.0",
-                    "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-                    "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-                    "dev": true,
-                    "requires": {
-                        "p-try": "^2.0.0"
-                    }
-                },
-                "p-locate": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-                    "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-                    "dev": true,
-                    "requires": {
-                        "p-limit": "^2.2.0"
-                    }
-                },
-                "resolve-from": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-                    "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-                    "dev": true
-                }
+                "@smithy/fetch-http-handler": "^5.0.1",
+                "@smithy/node-http-handler": "^4.0.3",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@istanbuljs/schema": {
-            "version": "0.1.3",
-            "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-            "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-            "dev": true
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/util-uri-escape": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "@jridgewell/gen-mapping": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-            "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-            "dev": true,
-            "requires": {
-                "@jridgewell/set-array": "^1.0.1",
-                "@jridgewell/sourcemap-codec": "^1.4.10",
-                "@jridgewell/trace-mapping": "^0.3.9"
+        "node_modules/@aws-sdk/nested-clients/node_modules/@smithy/util-utf8": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "peer": true,
+            "dependencies": {
+                "@smithy/util-buffer-from": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@jridgewell/resolve-uri": {
-            "version": "3.0.5",
-            "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz",
-            "integrity": "sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==",
-            "dev": true
+        "node_modules/@aws-sdk/property-provider": {
+            "version": "3.46.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.46.0",
+                "tslib": "^2.3.0"
+            },
+            "engines": {
+                "node": ">= 12.0.0"
+            }
         },
-        "@jridgewell/set-array": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-            "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
-            "dev": true
+        "node_modules/@aws-sdk/property-provider/node_modules/@aws-sdk/types": {
+            "version": "3.46.0",
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">= 12.0.0"
+            }
         },
-        "@jridgewell/source-map": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
-            "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
-            "dev": true,
-            "requires": {
-                "@jridgewell/gen-mapping": "^0.3.0",
-                "@jridgewell/trace-mapping": "^0.3.9"
+        "node_modules/@aws-sdk/protocol-http": {
+            "version": "3.370.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.370.0",
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "@jridgewell/sourcemap-codec": {
-            "version": "1.4.11",
-            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz",
-            "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==",
-            "dev": true
+        "node_modules/@aws-sdk/protocol-http/node_modules/@aws-sdk/types": {
+            "version": "3.370.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^1.1.0",
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
         },
-        "@jridgewell/trace-mapping": {
-            "version": "0.3.14",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz",
-            "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==",
-            "dev": true,
-            "requires": {
-                "@jridgewell/resolve-uri": "^3.0.3",
-                "@jridgewell/sourcemap-codec": "^1.4.10"
+        "node_modules/@aws-sdk/protocol-http/node_modules/@smithy/types": {
+            "version": "1.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "@jsdevtools/ono": {
-            "version": "7.1.3",
-            "resolved": "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz",
-            "integrity": "sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==",
-            "dev": true
+        "node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.614.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.609.0",
+                "@smithy/node-config-provider": "^3.1.4",
+                "@smithy/types": "^3.3.0",
+                "@smithy/util-config-provider": "^3.0.0",
+                "@smithy/util-middleware": "^3.0.3",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "@leichtgewicht/ip-codec": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
-            "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==",
-            "dev": true
+        "node_modules/@aws-sdk/region-config-resolver/node_modules/@aws-sdk/types": {
+            "version": "3.609.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "@nodelib/fs.scandir": {
-            "version": "2.1.5",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-            "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-            "dev": true,
-            "requires": {
-                "@nodelib/fs.stat": "2.0.5",
-                "run-parallel": "^1.1.9"
+        "node_modules/@aws-sdk/s3-request-presigner": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/signature-v4-multi-region": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-format-url": "3.693.0",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "@nodelib/fs.stat": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-            "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-            "dev": true
-        },
-        "@nodelib/fs.walk": {
-            "version": "1.2.8",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-            "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-            "dev": true,
-            "requires": {
-                "@nodelib/fs.scandir": "2.1.5",
-                "fastq": "^1.6.0"
+        "node_modules/@aws-sdk/signature-v4-multi-region": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/middleware-sdk-s3": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/signature-v4": "^4.2.2",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "@sindresorhus/is": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.2.0.tgz",
-            "integrity": "sha512-VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw=="
-        },
-        "@sinonjs/commons": {
-            "version": "1.8.3",
-            "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
-            "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
-            "dev": true,
-            "requires": {
-                "type-detect": "4.0.8"
+        "node_modules/@aws-sdk/smithy-client": {
+            "version": "3.342.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/middleware-stack": "3.342.0",
+                "@aws-sdk/types": "3.342.0",
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "@sinonjs/fake-timers": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
-            "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
-            "dev": true,
-            "requires": {
-                "@sinonjs/commons": "^1.7.0"
+        "node_modules/@aws-sdk/smithy-client/node_modules/@aws-sdk/types": {
+            "version": "3.342.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.5.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "@sinonjs/samsam": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-6.1.1.tgz",
-            "integrity": "sha512-cZ7rKJTLiE7u7Wi/v9Hc2fs3Ucc3jrWeMgPHbbTCeVAB2S0wOBbYlkJVeNSL04i7fdhT8wIbDq1zhC/PXTD2SA==",
-            "dev": true,
-            "requires": {
-                "@sinonjs/commons": "^1.6.0",
-                "lodash.get": "^4.4.2",
-                "type-detect": "^4.0.8"
+        "node_modules/@aws-sdk/token-providers": {
+            "version": "3.614.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.609.0",
+                "@smithy/property-provider": "^3.1.3",
+                "@smithy/shared-ini-file-loader": "^3.1.4",
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sso-oidc": "^3.614.0"
             }
         },
-        "@sinonjs/text-encoding": {
-            "version": "0.7.1",
-            "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz",
-            "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==",
-            "dev": true
-        },
-        "@szmarczak/http-timer": {
-            "version": "4.0.6",
-            "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
-            "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
-            "requires": {
-                "defer-to-connect": "^2.0.0"
+        "node_modules/@aws-sdk/token-providers/node_modules/@aws-sdk/types": {
+            "version": "3.609.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "@tootallnate/once": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
-            "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
-            "dev": true
-        },
-        "@ts-morph/common": {
-            "version": "0.18.0",
-            "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.18.0.tgz",
-            "integrity": "sha512-UvWF+oQdMa4qMWhXTOd2JWtAbAJGgkPMNzGHgEcfOwQRIcViKdwsSqXXjSaQCZ4fo+bZMhdfuwQCjlW5bNcqEQ==",
-            "dev": true,
-            "requires": {
-                "fast-glob": "^3.2.12",
-                "minimatch": "^5.1.0",
-                "mkdirp": "^1.0.4",
-                "path-browserify": "^1.0.1"
-            },
+        "node_modules/@aws-sdk/types": {
+            "version": "3.692.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "brace-expansion": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-                    "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-                    "dev": true,
-                    "requires": {
-                        "balanced-match": "^1.0.0"
-                    }
-                },
-                "minimatch": {
-                    "version": "5.1.1",
-                    "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.1.tgz",
-                    "integrity": "sha512-362NP+zlprccbEt/SkxKfRMHnNY85V74mVnpUpNyr3F35covl09Kec7/sEFLt3RA4oXmewtoaanoIf67SE5Y5g==",
-                    "dev": true,
-                    "requires": {
-                        "brace-expansion": "^2.0.1"
-                    }
-                },
-                "mkdirp": {
-                    "version": "1.0.4",
-                    "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-                    "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-                    "dev": true
-                }
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "@tsconfig/node10": {
-            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz",
-            "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==",
-            "dev": true
-        },
-        "@tsconfig/node12": {
-            "version": "1.0.9",
-            "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz",
-            "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==",
-            "dev": true
-        },
-        "@tsconfig/node14": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz",
-            "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==",
-            "dev": true
-        },
-        "@tsconfig/node16": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz",
-            "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==",
-            "dev": true
+        "node_modules/@aws-sdk/util-arn-parser": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "@types/adm-zip": {
-            "version": "0.4.34",
-            "resolved": "https://registry.npmjs.org/@types/adm-zip/-/adm-zip-0.4.34.tgz",
-            "integrity": "sha512-8ToYLLAYhkRfcmmljrKi22gT2pqu7hGMDtORP1emwIEGmgUTZOsaDjzWFzW5N2frcFRz/50CWt4zA1CxJ73pmQ==",
-            "dev": true,
-            "requires": {
-                "@types/node": "*"
+        "node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.637.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.609.0",
+                "@smithy/types": "^3.3.0",
+                "@smithy/util-endpoints": "^2.0.5",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "@types/async-lock": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/@types/async-lock/-/async-lock-1.1.3.tgz",
-            "integrity": "sha512-UpeDcjGKsYEQMeqEbfESm8OWJI305I7b9KE4ji3aBjoKWyN5CTdn8izcA1FM1DVDne30R5fNEnIy89vZw5LXJQ==",
-            "dev": true
+        "node_modules/@aws-sdk/util-endpoints/node_modules/@aws-sdk/types": {
+            "version": "3.609.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "@types/body-parser": {
-            "version": "1.19.2",
-            "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
-            "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
-            "dev": true,
-            "requires": {
-                "@types/connect": "*",
-                "@types/node": "*"
+        "node_modules/@aws-sdk/util-format-url": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/querystring-builder": "^3.0.9",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "@types/bonjour": {
-            "version": "3.5.10",
-            "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
-            "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
-            "dev": true,
-            "requires": {
-                "@types/node": "*"
+        "node_modules/@aws-sdk/util-locate-window": {
+            "version": "3.37.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.3.0"
+            },
+            "engines": {
+                "node": ">= 10.0.0"
             }
         },
-        "@types/bytes": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/@types/bytes/-/bytes-3.1.1.tgz",
-            "integrity": "sha512-lOGyCnw+2JVPKU3wIV0srU0NyALwTBJlVSx5DfMQOFuuohA8y9S8orImpuIQikZ0uIQ8gehrRjxgQC1rLRi11w==",
-            "dev": true
+        "node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.609.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.609.0",
+                "@smithy/types": "^3.3.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
+            }
         },
-        "@types/cacheable-request": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz",
-            "integrity": "sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==",
-            "requires": {
-                "@types/http-cache-semantics": "*",
-                "@types/keyv": "*",
-                "@types/node": "*",
-                "@types/responselike": "*"
+        "node_modules/@aws-sdk/util-user-agent-browser/node_modules/@aws-sdk/types": {
+            "version": "3.609.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "@types/connect": {
-            "version": "3.4.35",
-            "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
-            "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
-            "dev": true,
-            "requires": {
-                "@types/node": "*"
+        "node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.614.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.609.0",
+                "@smithy/node-config-provider": "^3.1.4",
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
             }
         },
-        "@types/connect-history-api-fallback": {
-            "version": "1.3.5",
-            "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz",
-            "integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==",
-            "dev": true,
-            "requires": {
-                "@types/express-serve-static-core": "*",
-                "@types/node": "*"
+        "node_modules/@aws-sdk/util-user-agent-node/node_modules/@aws-sdk/types": {
+            "version": "3.609.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "@types/cross-spawn": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/@types/cross-spawn/-/cross-spawn-6.0.2.tgz",
-            "integrity": "sha512-KuwNhp3eza+Rhu8IFI5HUXRP0LIhqH5cAjubUvGXXthh4YYBuP2ntwEX+Cz8GJoZUHlKo247wPWOfA9LYEq4cw==",
-            "dev": true,
-            "requires": {
-                "@types/node": "*"
+        "node_modules/@aws-sdk/util-utf8-browser": {
+            "version": "3.259.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.259.0.tgz",
+            "integrity": "sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==",
+            "dependencies": {
+                "tslib": "^2.3.1"
             }
         },
-        "@types/eslint": {
-            "version": "7.28.2",
-            "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.2.tgz",
-            "integrity": "sha512-KubbADPkfoU75KgKeKLsFHXnU4ipH7wYg0TRT33NK3N3yiu7jlFAAoygIWBV+KbuHx/G+AvuGX6DllnK35gfJA==",
-            "dev": true,
-            "requires": {
-                "@types/estree": "*",
-                "@types/json-schema": "*"
+        "node_modules/@aws-sdk/xml-builder": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "@types/eslint-scope": {
-            "version": "3.7.1",
-            "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.1.tgz",
-            "integrity": "sha512-SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g==",
+        "node_modules/@aws-toolkits/telemetry": {
+            "version": "1.0.329",
+            "resolved": "https://registry.npmjs.org/@aws-toolkits/telemetry/-/telemetry-1.0.329.tgz",
+            "integrity": "sha512-zMkljZDtIAxuZzPTLL5zIxn+zGmk767sbqGIc2ZYuv0sSU+UoYgB3tqwV5KVV2oDPKs5593nwJC97NVHJqzowQ==",
             "dev": true,
-            "requires": {
-                "@types/eslint": "*",
-                "@types/estree": "*"
+            "license": "Apache-2.0",
+            "dependencies": {
+                "ajv": "^6.12.6",
+                "cross-spawn": "^7.0.6",
+                "fs-extra": "^11.1.0",
+                "lodash": "^4.17.20",
+                "prettier": "^3.3.2",
+                "ts-morph": "^23.0.0",
+                "yargs": "^17.0.1"
             }
         },
-        "@types/estree": {
-            "version": "0.0.50",
-            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
-            "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==",
-            "dev": true
-        },
-        "@types/express": {
-            "version": "4.17.13",
-            "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz",
-            "integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==",
+        "node_modules/@aws/chat-client": {
+            "version": "0.1.4",
             "dev": true,
-            "requires": {
-                "@types/body-parser": "*",
-                "@types/express-serve-static-core": "^4.17.18",
-                "@types/qs": "*",
-                "@types/serve-static": "*"
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws/chat-client-ui-types": "^0.1.12",
+                "@aws/language-server-runtimes-types": "^0.1.10",
+                "@aws/mynah-ui": "^4.28.0"
             }
         },
-        "@types/express-serve-static-core": {
-            "version": "4.17.28",
-            "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz",
-            "integrity": "sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==",
+        "node_modules/@aws/chat-client-ui-types": {
+            "version": "0.1.47",
+            "resolved": "https://registry.npmjs.org/@aws/chat-client-ui-types/-/chat-client-ui-types-0.1.47.tgz",
+            "integrity": "sha512-Pu6UnAImpweLMcAmhNdw/NrajB25Ymzp1Om1V9NEVQJRMO/KJCDiErmbOYTYBXvgNoR10kObqiL1P/Tk/Fpu3g==",
             "dev": true,
-            "requires": {
-                "@types/node": "*",
-                "@types/qs": "*",
-                "@types/range-parser": "*"
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws/language-server-runtimes-types": "^0.1.41"
             }
         },
-        "@types/fs-extra": {
-            "version": "9.0.13",
-            "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz",
-            "integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==",
-            "dev": true,
-            "requires": {
-                "@types/node": "*"
+        "node_modules/@aws/lambda-invoke-store": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmjs.org/@aws/lambda-invoke-store/-/lambda-invoke-store-0.0.1.tgz",
+            "integrity": "sha512-ORHRQ2tmvnBXc8t/X9Z8IcSbBA4xTLKuN873FopzklHMeqBst7YG0d+AX97inkvDX+NChYtSr+qGfcqGFaI8Zw==",
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@types/glob": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
-            "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
-            "dev": true,
-            "requires": {
-                "@types/minimatch": "*",
-                "@types/node": "*"
+        "node_modules/@aws/language-server-runtimes": {
+            "version": "0.2.128",
+            "resolved": "https://registry.npmjs.org/@aws/language-server-runtimes/-/language-server-runtimes-0.2.128.tgz",
+            "integrity": "sha512-C666VAvY2PQ8CQkDzjL/+N9rfcFzY6vuGe733drMwwRVHt8On0B0PQPjy31ZjxHUUcjVp78Nb9vmSUEVBfxGTQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws/language-server-runtimes-types": "^0.1.56",
+                "@opentelemetry/api": "^1.9.0",
+                "@opentelemetry/api-logs": "^0.200.0",
+                "@opentelemetry/core": "^2.0.0",
+                "@opentelemetry/exporter-logs-otlp-http": "^0.200.0",
+                "@opentelemetry/exporter-metrics-otlp-http": "^0.200.0",
+                "@opentelemetry/resources": "^2.0.1",
+                "@opentelemetry/sdk-logs": "^0.200.0",
+                "@opentelemetry/sdk-metrics": "^2.0.1",
+                "@smithy/node-http-handler": "^4.0.4",
+                "ajv": "^8.17.1",
+                "aws-sdk": "^2.1692.0",
+                "hpagent": "^1.2.0",
+                "jose": "^5.9.6",
+                "mac-ca": "^3.1.1",
+                "registry-js": "^1.16.1",
+                "rxjs": "^7.8.2",
+                "vscode-languageserver": "^9.0.1",
+                "vscode-languageserver-protocol": "^3.17.5",
+                "vscode-uri": "^3.1.0",
+                "win-ca": "^3.5.1"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws/language-server-runtimes-types": {
+            "version": "0.1.56",
+            "resolved": "https://registry.npmjs.org/@aws/language-server-runtimes-types/-/language-server-runtimes-types-0.1.56.tgz",
+            "integrity": "sha512-Md/L750JShCHUsCQUJva51Ofkn/GDBEX8PpZnWUIVqkpddDR00SLQS2smNf4UHtKNJ2fefsfks/Kqfuatjkjvg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "vscode-languageserver-textdocument": "^1.0.12",
+                "vscode-languageserver-types": "^3.17.5"
             }
         },
-        "@types/http-cache-semantics": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
-            "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="
+        "node_modules/@aws/language-server-runtimes/node_modules/@opentelemetry/core": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-2.0.1.tgz",
+            "integrity": "sha512-MaZk9SJIDgo1peKevlbhP6+IwIiNPNmswNL4AF0WaQJLbHXjr9SrZMgS12+iqr9ToV4ZVosCcc0f8Rg67LXjxw==",
+            "dependencies": {
+                "@opentelemetry/semantic-conventions": "^1.29.0"
+            },
+            "engines": {
+                "node": "^18.19.0 || >=20.6.0"
+            },
+            "peerDependencies": {
+                "@opentelemetry/api": ">=1.0.0 <1.10.0"
+            }
         },
-        "@types/http-proxy": {
-            "version": "1.17.9",
-            "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz",
-            "integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==",
-            "dev": true,
-            "requires": {
-                "@types/node": "*"
+        "node_modules/@aws/language-server-runtimes/node_modules/@opentelemetry/resources": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.0.1.tgz",
+            "integrity": "sha512-dZOB3R6zvBwDKnHDTB4X1xtMArB/d324VsbiPkX/Yu0Q8T2xceRthoIVFhJdvgVM2QhGVUyX9tzwiNxGtoBJUw==",
+            "dependencies": {
+                "@opentelemetry/core": "2.0.1",
+                "@opentelemetry/semantic-conventions": "^1.29.0"
+            },
+            "engines": {
+                "node": "^18.19.0 || >=20.6.0"
+            },
+            "peerDependencies": {
+                "@opentelemetry/api": ">=1.3.0 <1.10.0"
             }
         },
-        "@types/js-yaml": {
-            "version": "4.0.5",
-            "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.5.tgz",
-            "integrity": "sha512-FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA==",
-            "dev": true
+        "node_modules/@aws/language-server-runtimes/node_modules/@opentelemetry/sdk-metrics": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-2.0.1.tgz",
+            "integrity": "sha512-wf8OaJoSnujMAHWR3g+/hGvNcsC16rf9s1So4JlMiFaFHiE4HpIA3oUh+uWZQ7CNuK8gVW/pQSkgoa5HkkOl0g==",
+            "dependencies": {
+                "@opentelemetry/core": "2.0.1",
+                "@opentelemetry/resources": "2.0.1"
+            },
+            "engines": {
+                "node": "^18.19.0 || >=20.6.0"
+            },
+            "peerDependencies": {
+                "@opentelemetry/api": ">=1.9.0 <1.10.0"
+            }
         },
-        "@types/json-schema": {
-            "version": "7.0.11",
-            "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-            "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
-            "dev": true
+        "node_modules/@aws/language-server-runtimes/node_modules/@smithy/abort-controller": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-4.0.2.tgz",
+            "integrity": "sha512-Sl/78VDtgqKxN2+1qduaVE140XF+Xg+TafkncspwM4jFP/LHr76ZHmIY/y3V1M0mMLNk+Je6IGbzxy23RSToMw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "@types/keyv": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.3.tgz",
-            "integrity": "sha512-FXCJgyyN3ivVgRoml4h94G/p3kY+u/B86La+QptcqJaWtBWtmc6TtkNfS40n9bIvyLteHh7zXOtgbobORKPbDg==",
-            "requires": {
-                "@types/node": "*"
+        "node_modules/@aws/language-server-runtimes/node_modules/@smithy/node-http-handler": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.0.4.tgz",
+            "integrity": "sha512-/mdqabuAT3o/ihBGjL94PUbTSPSRJ0eeVTdgADzow0wRJ0rN4A27EOrtlK56MYiO1fDvlO3jVTCxQtQmK9dZ1g==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/abort-controller": "^4.0.2",
+                "@smithy/protocol-http": "^5.1.0",
+                "@smithy/querystring-builder": "^4.0.2",
+                "@smithy/types": "^4.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "@types/lodash": {
-            "version": "4.14.182",
-            "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.182.tgz",
-            "integrity": "sha512-/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q==",
-            "dev": true
+        "node_modules/@aws/language-server-runtimes/node_modules/@smithy/protocol-http": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-5.1.0.tgz",
+            "integrity": "sha512-KxAOL1nUNw2JTYrtviRRjEnykIDhxc84qMBzxvu1MUfQfHTuBlCG7PA6EdVwqpJjH7glw7FqQoFxUJSyBQgu7g==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "@types/marked": {
+        "node_modules/@aws/language-server-runtimes/node_modules/@smithy/querystring-builder": {
             "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/@types/marked/-/marked-4.0.2.tgz",
-            "integrity": "sha512-auNrZ/c0w6wsM9DccwVxWHssrMDezHUAXNesdp2RQrCVCyrQbOiSq7yqdJKrUQQpw9VTm7CGYJH2A/YG7jjrjQ==",
-            "dev": true
-        },
-        "@types/mime": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
-            "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==",
-            "dev": true
-        },
-        "@types/mime-types": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.1.tgz",
-            "integrity": "sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw==",
-            "dev": true
-        },
-        "@types/minimatch": {
-            "version": "3.0.5",
-            "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
-            "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==",
-            "dev": true
-        },
-        "@types/minimist": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
-            "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
-            "dev": true
-        },
-        "@types/mocha": {
-            "version": "10.0.0",
-            "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.0.tgz",
-            "integrity": "sha512-rADY+HtTOA52l9VZWtgQfn4p+UDVM2eDVkMZT1I6syp0YKxW2F9v+0pbRZLsvskhQv/vMb6ZfCay81GHbz5SHg==",
-            "dev": true
+            "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-4.0.2.tgz",
+            "integrity": "sha512-NTOs0FwHw1vimmQM4ebh+wFQvOwkEf/kQL6bSM1Lock+Bv4I89B3hGYoUEPkmvYPkDKyp5UdXJYu+PoTQ3T31Q==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.2.0",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "@types/node": {
-            "version": "14.18.5",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.5.tgz",
-            "integrity": "sha512-LMy+vDDcQR48EZdEx5wRX1q/sEl6NdGuHXPnfeL8ixkwCOSZ2qnIyIZmcCbdX0MeRqHhAcHmX+haCbrS8Run+A=="
+        "node_modules/@aws/language-server-runtimes/node_modules/@smithy/types": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.2.0.tgz",
+            "integrity": "sha512-7eMk09zQKCO+E/ivsjQv+fDlOupcFUCSC/L2YUPgwhvowVGWbPQHjEFcmjt7QQ4ra5lyowS92SV53Zc6XD4+fg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "@types/normalize-package-data": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
-            "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
-            "dev": true
+        "node_modules/@aws/language-server-runtimes/node_modules/@smithy/util-uri-escape": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-4.0.0.tgz",
+            "integrity": "sha512-77yfbCbQMtgtTylO9itEAdpPXSog3ZxMe09AEhm0dU0NLTalV70ghDZFR+Nfi1C60jnJoh/Re4090/DuZh2Omg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "@types/prettier": {
-            "version": "2.7.0",
-            "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.0.tgz",
-            "integrity": "sha512-RI1L7N4JnW5gQw2spvL7Sllfuf1SaHdrZpCHiBlCXjIlufi1SMNnbu2teze3/QE67Fg2tBlH7W+mi4hVNk4p0A==",
-            "dev": true
+        "node_modules/@aws/language-server-runtimes/node_modules/ajv": {
+            "version": "8.17.1",
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3",
+                "fast-uri": "^3.0.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
         },
-        "@types/qs": {
-            "version": "6.9.7",
-            "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
-            "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
-            "dev": true
+        "node_modules/@aws/language-server-runtimes/node_modules/jose": {
+            "version": "5.10.0",
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/panva"
+            }
         },
-        "@types/range-parser": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
-            "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
-            "dev": true
+        "node_modules/@aws/language-server-runtimes/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "license": "MIT"
         },
-        "@types/readline-sync": {
-            "version": "1.4.4",
-            "resolved": "https://registry.npmjs.org/@types/readline-sync/-/readline-sync-1.4.4.tgz",
-            "integrity": "sha512-cFjVIoiamX7U6zkO2VPvXyTxbFDdiRo902IarJuPVxBhpDnXhwSaVE86ip+SCuyWBbEioKCkT4C88RNTxBM1Dw==",
-            "dev": true
+        "node_modules/@aws/language-server-runtimes/node_modules/vscode-uri": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz",
+            "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ=="
         },
-        "@types/responselike": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
-            "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
-            "requires": {
-                "@types/node": "*"
+        "node_modules/@aws/mynah-ui": {
+            "version": "4.35.4",
+            "resolved": "https://registry.npmjs.org/@aws/mynah-ui/-/mynah-ui-4.35.4.tgz",
+            "integrity": "sha512-LuOexbuMSKYCl/Qa7zj9d4/ueTLK3ltoYHeA0I7gOpPC/vYACxqjVqX6HPhNCE+L5zBKNMN2Z+FUaox+fYhvAQ==",
+            "hasInstallScript": true,
+            "dependencies": {
+                "escape-html": "^1.0.3",
+                "highlight.js": "^11.11.0",
+                "just-clone": "^6.2.0",
+                "marked": "^14.1.0",
+                "sanitize-html": "^2.12.1",
+                "unescape-html": "^1.1.0"
+            },
+            "peerDependencies": {
+                "escape-html": "^1.0.3",
+                "highlight.js": "^11.11.0",
+                "just-clone": "^6.2.0",
+                "marked": "^14.1.0",
+                "sanitize-html": "^2.12.1",
+                "unescape-html": "^1.1.0"
             }
         },
-        "@types/retry": {
-            "version": "0.12.1",
-            "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.1.tgz",
-            "integrity": "sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==",
-            "dev": true
-        },
-        "@types/semver": {
-            "version": "7.3.9",
-            "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.9.tgz",
-            "integrity": "sha512-L/TMpyURfBkf+o/526Zb6kd/tchUP3iBDEPjqjb+U2MAJhVRxxrmr2fwpe08E7QsV7YLcpq0tUaQ9O9x97ZIxQ==",
-            "dev": true
+        "node_modules/@aws/mynah-ui/node_modules/marked": {
+            "version": "14.1.4",
+            "license": "MIT",
+            "bin": {
+                "marked": "bin/marked.js"
+            },
+            "engines": {
+                "node": ">= 18"
+            }
         },
-        "@types/serve-index": {
-            "version": "1.9.1",
-            "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
-            "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
+        "node_modules/@babel/code-frame": {
+            "version": "7.23.5",
             "dev": true,
-            "requires": {
-                "@types/express": "*"
+            "license": "MIT",
+            "dependencies": {
+                "@babel/highlight": "^7.23.4",
+                "chalk": "^2.4.2"
+            },
+            "engines": {
+                "node": ">=6.9.0"
             }
         },
-        "@types/serve-static": {
-            "version": "1.13.10",
-            "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz",
-            "integrity": "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==",
+        "node_modules/@babel/code-frame/node_modules/ansi-styles": {
+            "version": "3.2.1",
             "dev": true,
-            "requires": {
-                "@types/mime": "^1",
-                "@types/node": "*"
+            "license": "MIT",
+            "dependencies": {
+                "color-convert": "^1.9.0"
+            },
+            "engines": {
+                "node": ">=4"
             }
         },
-        "@types/sinon": {
-            "version": "10.0.5",
-            "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.5.tgz",
-            "integrity": "sha512-BrAUy0yq3n84XOykYGvGbDir9nBIYwQm2NdBNQT0DbtDLqh/5nMUsjz5XfwrefFNLPE9B6g8yLOZREpvw0J40A==",
+        "node_modules/@babel/code-frame/node_modules/chalk": {
+            "version": "2.4.2",
             "dev": true,
-            "requires": {
-                "@sinonjs/fake-timers": "^7.1.0"
-            },
+            "license": "MIT",
             "dependencies": {
-                "@sinonjs/fake-timers": {
-                    "version": "7.1.2",
-                    "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz",
-                    "integrity": "sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==",
-                    "dev": true,
-                    "requires": {
-                        "@sinonjs/commons": "^1.7.0"
-                    }
-                }
+                "ansi-styles": "^3.2.1",
+                "escape-string-regexp": "^1.0.5",
+                "supports-color": "^5.3.0"
+            },
+            "engines": {
+                "node": ">=4"
             }
         },
-        "@types/sinonjs__fake-timers": {
-            "version": "8.1.1",
-            "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz",
-            "integrity": "sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==",
-            "dev": true
-        },
-        "@types/sockjs": {
-            "version": "0.3.33",
-            "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
-            "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
+        "node_modules/@babel/code-frame/node_modules/color-convert": {
+            "version": "1.9.3",
             "dev": true,
-            "requires": {
-                "@types/node": "*"
+            "license": "MIT",
+            "dependencies": {
+                "color-name": "1.1.3"
             }
         },
-        "@types/tcp-port-used": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/@types/tcp-port-used/-/tcp-port-used-1.0.1.tgz",
-            "integrity": "sha512-6pwWTx8oUtWvsiZUCrhrK/53MzKVLnuNSSaZILPy3uMes9QnTrLMar9BDlJArbMOjDcjb3QXFk6Rz8qmmuySZw==",
-            "dev": true
-        },
-        "@types/uuid": {
-            "version": "8.3.3",
-            "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.3.tgz",
-            "integrity": "sha512-0LbEEx1zxrYB3pgpd1M5lEhLcXjKJnYghvhTRgaBeUivLHMDM1TzF3IJ6hXU2+8uA4Xz+5BA63mtZo5DjVT8iA==",
-            "dev": true
-        },
-        "@types/vscode": {
-            "version": "1.50.0",
-            "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.50.0.tgz",
-            "integrity": "sha512-QnIeyi4L2DiD9M2bAQKRzT/EQvc80qP9UL6JD5TiLlNRL1khIDg4ej4mDSRbtFrDAsRntFI1RhMvdomUThMsqg==",
-            "dev": true
-        },
-        "@types/vscode-webview": {
-            "version": "1.57.0",
-            "resolved": "https://registry.npmjs.org/@types/vscode-webview/-/vscode-webview-1.57.0.tgz",
-            "integrity": "sha512-x3Cb/SMa1IwRHfSvKaZDZOTh4cNoG505c3NjTqGlMC082m++x/ETUmtYniDsw6SSmYzZXO8KBNhYxR0+VqymqA==",
-            "dev": true
-        },
-        "@types/ws": {
-            "version": "8.5.3",
-            "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz",
-            "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==",
+        "node_modules/@babel/code-frame/node_modules/color-name": {
+            "version": "1.1.3",
             "dev": true,
-            "requires": {
-                "@types/node": "*"
-            }
+            "license": "MIT"
         },
-        "@types/xml2js": {
-            "version": "0.4.9",
-            "resolved": "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.9.tgz",
-            "integrity": "sha512-CHiCKIihl1pychwR2RNX5mAYmJDACgFVCMT5OArMaO3erzwXVcBqPcusr+Vl8yeeXukxZqtF8mZioqX+mpjjdw==",
+        "node_modules/@babel/code-frame/node_modules/escape-string-regexp": {
+            "version": "1.0.5",
             "dev": true,
-            "requires": {
-                "@types/node": "*"
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.8.0"
             }
         },
-        "@typescript-eslint/eslint-plugin": {
-            "version": "5.38.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.38.0.tgz",
-            "integrity": "sha512-GgHi/GNuUbTOeoJiEANi0oI6fF3gBQc3bGFYj40nnAPCbhrtEDf2rjBmefFadweBmO1Du1YovHeDP2h5JLhtTQ==",
+        "node_modules/@babel/code-frame/node_modules/has-flag": {
+            "version": "3.0.0",
             "dev": true,
-            "requires": {
-                "@typescript-eslint/scope-manager": "5.38.0",
-                "@typescript-eslint/type-utils": "5.38.0",
-                "@typescript-eslint/utils": "5.38.0",
-                "debug": "^4.3.4",
-                "ignore": "^5.2.0",
-                "regexpp": "^3.2.0",
-                "semver": "^7.3.7",
-                "tsutils": "^3.21.0"
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
             }
         },
-        "@typescript-eslint/parser": {
-            "version": "5.38.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.38.0.tgz",
-            "integrity": "sha512-/F63giJGLDr0ms1Cr8utDAxP2SPiglaD6V+pCOcG35P2jCqdfR7uuEhz1GIC3oy4hkUF8xA1XSXmd9hOh/a5EA==",
+        "node_modules/@babel/code-frame/node_modules/supports-color": {
+            "version": "5.5.0",
             "dev": true,
-            "requires": {
-                "@typescript-eslint/scope-manager": "5.38.0",
-                "@typescript-eslint/types": "5.38.0",
-                "@typescript-eslint/typescript-estree": "5.38.0",
-                "debug": "^4.3.4"
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=4"
             }
         },
-        "@typescript-eslint/scope-manager": {
-            "version": "5.38.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.38.0.tgz",
-            "integrity": "sha512-ByhHIuNyKD9giwkkLqzezZ9y5bALW8VNY6xXcP+VxoH4JBDKjU5WNnsiD4HJdglHECdV+lyaxhvQjTUbRboiTA==",
+        "node_modules/@babel/helper-validator-identifier": {
+            "version": "7.24.7",
             "dev": true,
-            "requires": {
-                "@typescript-eslint/types": "5.38.0",
-                "@typescript-eslint/visitor-keys": "5.38.0"
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.9.0"
             }
         },
-        "@typescript-eslint/type-utils": {
-            "version": "5.38.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.38.0.tgz",
-            "integrity": "sha512-iZq5USgybUcj/lfnbuelJ0j3K9dbs1I3RICAJY9NZZpDgBYXmuUlYQGzftpQA9wC8cKgtS6DASTvF3HrXwwozA==",
+        "node_modules/@babel/highlight": {
+            "version": "7.23.4",
             "dev": true,
-            "requires": {
-                "@typescript-eslint/typescript-estree": "5.38.0",
-                "@typescript-eslint/utils": "5.38.0",
-                "debug": "^4.3.4",
-                "tsutils": "^3.21.0"
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-validator-identifier": "^7.22.20",
+                "chalk": "^2.4.2",
+                "js-tokens": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
             }
         },
-        "@typescript-eslint/types": {
-            "version": "5.38.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.38.0.tgz",
-            "integrity": "sha512-HHu4yMjJ7i3Cb+8NUuRCdOGu2VMkfmKyIJsOr9PfkBVYLYrtMCK/Ap50Rpov+iKpxDTfnqvDbuPLgBE5FwUNfA==",
-            "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-            "version": "5.38.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.38.0.tgz",
-            "integrity": "sha512-6P0RuphkR+UuV7Avv7MU3hFoWaGcrgOdi8eTe1NwhMp2/GjUJoODBTRWzlHpZh6lFOaPmSvgxGlROa0Sg5Zbyg==",
+        "node_modules/@babel/highlight/node_modules/ansi-styles": {
+            "version": "3.2.1",
             "dev": true,
-            "requires": {
-                "@typescript-eslint/types": "5.38.0",
-                "@typescript-eslint/visitor-keys": "5.38.0",
-                "debug": "^4.3.4",
-                "globby": "^11.1.0",
-                "is-glob": "^4.0.3",
-                "semver": "^7.3.7",
-                "tsutils": "^3.21.0"
+            "license": "MIT",
+            "dependencies": {
+                "color-convert": "^1.9.0"
+            },
+            "engines": {
+                "node": ">=4"
             }
         },
-        "@typescript-eslint/utils": {
-            "version": "5.38.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.38.0.tgz",
-            "integrity": "sha512-6sdeYaBgk9Fh7N2unEXGz+D+som2QCQGPAf1SxrkEr+Z32gMreQ0rparXTNGRRfYUWk/JzbGdcM8NSSd6oqnTA==",
+        "node_modules/@babel/highlight/node_modules/chalk": {
+            "version": "2.4.2",
             "dev": true,
-            "requires": {
-                "@types/json-schema": "^7.0.9",
-                "@typescript-eslint/scope-manager": "5.38.0",
-                "@typescript-eslint/types": "5.38.0",
-                "@typescript-eslint/typescript-estree": "5.38.0",
-                "eslint-scope": "^5.1.1",
-                "eslint-utils": "^3.0.0"
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^3.2.1",
+                "escape-string-regexp": "^1.0.5",
+                "supports-color": "^5.3.0"
+            },
+            "engines": {
+                "node": ">=4"
             }
         },
-        "@typescript-eslint/visitor-keys": {
-            "version": "5.38.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.38.0.tgz",
-            "integrity": "sha512-MxnrdIyArnTi+XyFLR+kt/uNAcdOnmT+879os7qDRI+EYySR4crXJq9BXPfRzzLGq0wgxkwidrCJ9WCAoacm1w==",
+        "node_modules/@babel/highlight/node_modules/color-convert": {
+            "version": "1.9.3",
             "dev": true,
-            "requires": {
-                "@typescript-eslint/types": "5.38.0",
-                "eslint-visitor-keys": "^3.3.0"
-            },
+            "license": "MIT",
             "dependencies": {
-                "eslint-visitor-keys": {
-                    "version": "3.3.0",
-                    "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-                    "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-                    "dev": true
-                }
+                "color-name": "1.1.3"
             }
         },
-        "@vscode/codicons": {
-            "version": "0.0.32",
-            "resolved": "https://registry.npmjs.org/@vscode/codicons/-/codicons-0.0.32.tgz",
-            "integrity": "sha512-3lgSTWhAzzWN/EPURoY4ZDBEA80OPmnaknNujA3qnI4Iu7AONWd9xF3iE4L+4prIe8E3TUnLQ4pxoaFTEEZNwg==",
-            "dev": true
-        },
-        "@vscode/test-electron": {
-            "version": "2.2.3",
-            "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.2.3.tgz",
-            "integrity": "sha512-7DmdGYQTqRNaLHKG3j56buc9DkstriY4aV0S3Zj32u0U9/T0L8vwWAC9QGCh1meu1VXDEla1ze27TkqysHGP0Q==",
+        "node_modules/@babel/highlight/node_modules/color-name": {
+            "version": "1.1.3",
             "dev": true,
-            "requires": {
-                "http-proxy-agent": "^4.0.1",
-                "https-proxy-agent": "^5.0.0",
-                "rimraf": "^3.0.2",
-                "unzipper": "^0.10.11"
-            }
+            "license": "MIT"
         },
-        "@vue/compiler-core": {
-            "version": "3.2.31",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.31.tgz",
-            "integrity": "sha512-aKno00qoA4o+V/kR6i/pE+aP+esng5siNAVQ422TkBNM6qA4veXiZbSe8OTXHXquEi/f6Akc+nLfB4JGfe4/WQ==",
-            "requires": {
-                "@babel/parser": "^7.16.4",
-                "@vue/shared": "3.2.31",
-                "estree-walker": "^2.0.2",
-                "source-map": "^0.6.1"
+        "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
+            "version": "1.0.5",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.8.0"
             }
         },
-        "@vue/compiler-dom": {
-            "version": "3.2.31",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.31.tgz",
-            "integrity": "sha512-60zIlFfzIDf3u91cqfqy9KhCKIJgPeqxgveH2L+87RcGU/alT6BRrk5JtUso0OibH3O7NXuNOQ0cDc9beT0wrg==",
-            "requires": {
-                "@vue/compiler-core": "3.2.31",
-                "@vue/shared": "3.2.31"
+        "node_modules/@babel/highlight/node_modules/has-flag": {
+            "version": "3.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
             }
         },
-        "@vue/compiler-sfc": {
-            "version": "3.2.40",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.40.tgz",
-            "integrity": "sha512-tzqwniIN1fu1PDHC3CpqY/dPCfN/RN1thpBC+g69kJcrl7mbGiHKNwbA6kJ3XKKy8R6JLKqcpVugqN4HkeBFFg==",
+        "node_modules/@babel/highlight/node_modules/supports-color": {
+            "version": "5.5.0",
             "dev": true,
-            "requires": {
-                "@babel/parser": "^7.16.4",
-                "@vue/compiler-core": "3.2.40",
-                "@vue/compiler-dom": "3.2.40",
-                "@vue/compiler-ssr": "3.2.40",
-                "@vue/reactivity-transform": "3.2.40",
-                "@vue/shared": "3.2.40",
-                "estree-walker": "^2.0.2",
-                "magic-string": "^0.25.7",
-                "postcss": "^8.1.10",
-                "source-map": "^0.6.1"
-            },
+            "license": "MIT",
             "dependencies": {
-                "@vue/compiler-core": {
-                    "version": "3.2.40",
-                    "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.40.tgz",
-                    "integrity": "sha512-2Dc3Stk0J/VyQ4OUr2yEC53kU28614lZS+bnrCbFSAIftBJ40g/2yQzf4mPBiFuqguMB7hyHaujdgZAQ67kZYA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/parser": "^7.16.4",
-                        "@vue/shared": "3.2.40",
-                        "estree-walker": "^2.0.2",
-                        "source-map": "^0.6.1"
-                    }
-                },
-                "@vue/compiler-dom": {
-                    "version": "3.2.40",
-                    "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.40.tgz",
-                    "integrity": "sha512-OZCNyYVC2LQJy4H7h0o28rtk+4v+HMQygRTpmibGoG9wZyomQiS5otU7qo3Wlq5UfHDw2RFwxb9BJgKjVpjrQw==",
-                    "dev": true,
-                    "requires": {
-                        "@vue/compiler-core": "3.2.40",
-                        "@vue/shared": "3.2.40"
-                    }
-                },
-                "@vue/compiler-ssr": {
-                    "version": "3.2.40",
-                    "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.40.tgz",
-                    "integrity": "sha512-80cQcgasKjrPPuKcxwuCx7feq+wC6oFl5YaKSee9pV3DNq+6fmCVwEEC3vvkf/E2aI76rIJSOYHsWSEIxK74oQ==",
-                    "dev": true,
-                    "requires": {
-                        "@vue/compiler-dom": "3.2.40",
-                        "@vue/shared": "3.2.40"
-                    }
-                },
-                "@vue/shared": {
-                    "version": "3.2.40",
-                    "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.40.tgz",
-                    "integrity": "sha512-0PLQ6RUtZM0vO3teRfzGi4ltLUO5aO+kLgwh4Um3THSR03rpQWLTuRCkuO5A41ITzwdWeKdPHtSARuPkoo5pCQ==",
-                    "dev": true
-                }
+                "has-flag": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=4"
             }
         },
-        "@vue/compiler-ssr": {
-            "version": "3.2.31",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.31.tgz",
-            "integrity": "sha512-mjN0rqig+A8TVDnsGPYJM5dpbjlXeHUm2oZHZwGyMYiGT/F4fhJf/cXy8QpjnLQK4Y9Et4GWzHn9PS8AHUnSkw==",
-            "requires": {
-                "@vue/compiler-dom": "3.2.31",
-                "@vue/shared": "3.2.31"
+        "node_modules/@babel/parser": {
+            "version": "7.23.6",
+            "license": "MIT",
+            "bin": {
+                "parser": "bin/babel-parser.js"
+            },
+            "engines": {
+                "node": ">=6.0.0"
             }
         },
-        "@vue/reactivity": {
-            "version": "3.2.31",
-            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.31.tgz",
-            "integrity": "sha512-HVr0l211gbhpEKYr2hYe7hRsV91uIVGFYNHj73njbARVGHQvIojkImKMaZNDdoDZOIkMsBc9a1sMqR+WZwfSCw==",
-            "requires": {
-                "@vue/shared": "3.2.31"
+        "node_modules/@bcherny/json-schema-ref-parser": {
+            "version": "10.0.5-fork",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jsdevtools/ono": "^7.1.3",
+                "@types/json-schema": "^7.0.6",
+                "call-me-maybe": "^1.0.1",
+                "js-yaml": "^4.1.0"
+            },
+            "engines": {
+                "node": ">= 16"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/philsturgeon"
             }
         },
-        "@vue/reactivity-transform": {
-            "version": "3.2.40",
-            "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.40.tgz",
-            "integrity": "sha512-HQUCVwEaacq6fGEsg2NUuGKIhUveMCjOk8jGHqLXPI2w6zFoPrlQhwWEaINTv5kkZDXKEnCijAp+4gNEHG03yw==",
+        "node_modules/@bcoe/v8-coverage": {
+            "version": "0.2.3",
             "dev": true,
-            "requires": {
-                "@babel/parser": "^7.16.4",
-                "@vue/compiler-core": "3.2.40",
-                "@vue/shared": "3.2.40",
-                "estree-walker": "^2.0.2",
-                "magic-string": "^0.25.7"
-            },
-            "dependencies": {
-                "@vue/compiler-core": {
-                    "version": "3.2.40",
-                    "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.40.tgz",
-                    "integrity": "sha512-2Dc3Stk0J/VyQ4OUr2yEC53kU28614lZS+bnrCbFSAIftBJ40g/2yQzf4mPBiFuqguMB7hyHaujdgZAQ67kZYA==",
-                    "dev": true,
-                    "requires": {
-                        "@babel/parser": "^7.16.4",
-                        "@vue/shared": "3.2.40",
-                        "estree-walker": "^2.0.2",
-                        "source-map": "^0.6.1"
-                    }
-                },
-                "@vue/shared": {
-                    "version": "3.2.40",
-                    "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.40.tgz",
-                    "integrity": "sha512-0PLQ6RUtZM0vO3teRfzGi4ltLUO5aO+kLgwh4Um3THSR03rpQWLTuRCkuO5A41ITzwdWeKdPHtSARuPkoo5pCQ==",
-                    "dev": true
-                }
-            }
+            "license": "MIT"
         },
-        "@vue/runtime-core": {
-            "version": "3.2.31",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.31.tgz",
-            "integrity": "sha512-Kcog5XmSY7VHFEMuk4+Gap8gUssYMZ2+w+cmGI6OpZWYOEIcbE0TPzzPHi+8XTzAgx1w/ZxDFcXhZeXN5eKWsA==",
-            "requires": {
-                "@vue/reactivity": "3.2.31",
-                "@vue/shared": "3.2.31"
+        "node_modules/@colors/colors": {
+            "version": "1.5.0",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.1.90"
             }
         },
-        "@vue/runtime-dom": {
-            "version": "3.2.31",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.31.tgz",
-            "integrity": "sha512-N+o0sICVLScUjfLG7u9u5XCjvmsexAiPt17GNnaWHJUfsKed5e85/A3SWgKxzlxx2SW/Hw7RQxzxbXez9PtY3g==",
-            "requires": {
-                "@vue/runtime-core": "3.2.31",
-                "@vue/shared": "3.2.31",
-                "csstype": "^2.6.8"
+        "node_modules/@cspotcode/source-map-support": {
+            "version": "0.8.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/trace-mapping": "0.3.9"
+            },
+            "engines": {
+                "node": ">=12"
             }
         },
-        "@vue/server-renderer": {
-            "version": "3.2.31",
-            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.31.tgz",
-            "integrity": "sha512-8CN3Zj2HyR2LQQBHZ61HexF5NReqngLT3oahyiVRfSSvak+oAvVmu8iNLSu6XR77Ili2AOpnAt1y8ywjjqtmkg==",
-            "requires": {
-                "@vue/compiler-ssr": "3.2.31",
-                "@vue/shared": "3.2.31"
+        "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
+            "version": "0.3.9",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/resolve-uri": "^3.0.3",
+                "@jridgewell/sourcemap-codec": "^1.4.10"
             }
         },
-        "@vue/shared": {
-            "version": "3.2.31",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.31.tgz",
-            "integrity": "sha512-ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ=="
+        "node_modules/@dabh/diagnostics": {
+            "version": "2.0.2",
+            "license": "MIT",
+            "dependencies": {
+                "colorspace": "1.1.x",
+                "enabled": "2.0.x",
+                "kuler": "^2.0.0"
+            }
         },
-        "@webassemblyjs/ast": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
-            "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
+        "node_modules/@discoveryjs/json-ext": {
+            "version": "0.5.5",
             "dev": true,
-            "requires": {
-                "@webassemblyjs/helper-numbers": "1.11.1",
-                "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
+            "license": "MIT",
+            "engines": {
+                "node": ">=10.0.0"
             }
         },
-        "@webassemblyjs/floating-point-hex-parser": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
-            "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
-            "dev": true
-        },
-        "@webassemblyjs/helper-api-error": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
-            "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
-            "dev": true
-        },
-        "@webassemblyjs/helper-buffer": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
-            "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
-            "dev": true
-        },
-        "@webassemblyjs/helper-numbers": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
-            "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
+        "node_modules/@eslint-community/eslint-utils": {
+            "version": "4.4.0",
             "dev": true,
-            "requires": {
-                "@webassemblyjs/floating-point-hex-parser": "1.11.1",
-                "@webassemblyjs/helper-api-error": "1.11.1",
-                "@xtuc/long": "4.2.2"
+            "license": "MIT",
+            "dependencies": {
+                "eslint-visitor-keys": "^3.3.0"
+            },
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "peerDependencies": {
+                "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
             }
         },
-        "@webassemblyjs/helper-wasm-bytecode": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
-            "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
-            "dev": true
-        },
-        "@webassemblyjs/helper-wasm-section": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
-            "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
+        "node_modules/@eslint-community/regexpp": {
+            "version": "4.10.0",
             "dev": true,
-            "requires": {
-                "@webassemblyjs/ast": "1.11.1",
-                "@webassemblyjs/helper-buffer": "1.11.1",
-                "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-                "@webassemblyjs/wasm-gen": "1.11.1"
+            "license": "MIT",
+            "engines": {
+                "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
             }
         },
-        "@webassemblyjs/ieee754": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
-            "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
+        "node_modules/@eslint/eslintrc": {
+            "version": "2.1.4",
             "dev": true,
-            "requires": {
-                "@xtuc/ieee754": "^1.2.0"
+            "license": "MIT",
+            "dependencies": {
+                "ajv": "^6.12.4",
+                "debug": "^4.3.2",
+                "espree": "^9.6.0",
+                "globals": "^13.19.0",
+                "ignore": "^5.2.0",
+                "import-fresh": "^3.2.1",
+                "js-yaml": "^4.1.0",
+                "minimatch": "^3.1.2",
+                "strip-json-comments": "^3.1.1"
+            },
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
             }
         },
-        "@webassemblyjs/leb128": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
-            "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
+        "node_modules/@eslint/js": {
+            "version": "8.56.0",
             "dev": true,
-            "requires": {
-                "@xtuc/long": "4.2.2"
+            "license": "MIT",
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
             }
         },
-        "@webassemblyjs/utf8": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
-            "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
-            "dev": true
-        },
-        "@webassemblyjs/wasm-edit": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
-            "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
-            "dev": true,
-            "requires": {
-                "@webassemblyjs/ast": "1.11.1",
-                "@webassemblyjs/helper-buffer": "1.11.1",
-                "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-                "@webassemblyjs/helper-wasm-section": "1.11.1",
-                "@webassemblyjs/wasm-gen": "1.11.1",
-                "@webassemblyjs/wasm-opt": "1.11.1",
-                "@webassemblyjs/wasm-parser": "1.11.1",
-                "@webassemblyjs/wast-printer": "1.11.1"
-            }
-        },
-        "@webassemblyjs/wasm-gen": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
-            "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
-            "dev": true,
-            "requires": {
-                "@webassemblyjs/ast": "1.11.1",
-                "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-                "@webassemblyjs/ieee754": "1.11.1",
-                "@webassemblyjs/leb128": "1.11.1",
-                "@webassemblyjs/utf8": "1.11.1"
-            }
-        },
-        "@webassemblyjs/wasm-opt": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
-            "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
-            "dev": true,
-            "requires": {
-                "@webassemblyjs/ast": "1.11.1",
-                "@webassemblyjs/helper-buffer": "1.11.1",
-                "@webassemblyjs/wasm-gen": "1.11.1",
-                "@webassemblyjs/wasm-parser": "1.11.1"
-            }
-        },
-        "@webassemblyjs/wasm-parser": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
-            "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
-            "dev": true,
-            "requires": {
-                "@webassemblyjs/ast": "1.11.1",
-                "@webassemblyjs/helper-api-error": "1.11.1",
-                "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-                "@webassemblyjs/ieee754": "1.11.1",
-                "@webassemblyjs/leb128": "1.11.1",
-                "@webassemblyjs/utf8": "1.11.1"
-            }
-        },
-        "@webassemblyjs/wast-printer": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
-            "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
-            "dev": true,
-            "requires": {
-                "@webassemblyjs/ast": "1.11.1",
-                "@xtuc/long": "4.2.2"
+        "node_modules/@gerhobbelt/gitignore-parser": {
+            "version": "0.2.0-9",
+            "license": "Apache License, Version 2.0",
+            "engines": {
+                "node": ">=10"
             }
         },
-        "@webpack-cli/configtest": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.0.tgz",
-            "integrity": "sha512-ttOkEkoalEHa7RaFYpM0ErK1xc4twg3Am9hfHhL7MVqlHebnkYd2wuI/ZqTDj0cVzZho6PdinY0phFZV3O0Mzg==",
+        "node_modules/@humanwhocodes/config-array": {
+            "version": "0.11.14",
             "dev": true,
-            "requires": {}
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@humanwhocodes/object-schema": "^2.0.2",
+                "debug": "^4.3.1",
+                "minimatch": "^3.0.5"
+            },
+            "engines": {
+                "node": ">=10.10.0"
+            }
         },
-        "@webpack-cli/info": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.0.tgz",
-            "integrity": "sha512-F6b+Man0rwE4n0409FyAJHStYA5OIZERxmnUfLVwv0mc0V1wLad3V7jqRlMkgKBeAq07jUvglacNaa6g9lOpuw==",
+        "node_modules/@humanwhocodes/module-importer": {
+            "version": "1.0.1",
             "dev": true,
-            "requires": {
-                "envinfo": "^7.7.3"
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=12.22"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/nzakas"
             }
         },
-        "@webpack-cli/serve": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.0.tgz",
-            "integrity": "sha512-ZkVeqEmRpBV2GHvjjUZqEai2PpUbuq8Bqd//vEYsp63J8WyexI8ppCqVS3Zs0QADf6aWuPdU+0XsPI647PVlQA==",
+        "node_modules/@humanwhocodes/object-schema": {
+            "version": "2.0.2",
             "dev": true,
-            "requires": {}
-        },
-        "@xmldom/xmldom": {
-            "version": "0.7.8",
-            "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.8.tgz",
-            "integrity": "sha512-PrJx38EfpitFhwmILRl37jAdBlsww6AZ6rRVK4QS7T7RHLhX7mSs647sTmgr9GIxe3qjXdesmomEgbgaokrVFg==",
-            "dev": true
+            "license": "BSD-3-Clause"
         },
-        "@xtuc/ieee754": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-            "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-            "dev": true
+        "node_modules/@iarna/toml": {
+            "version": "2.2.5",
+            "license": "ISC"
         },
-        "@xtuc/long": {
-            "version": "4.2.2",
-            "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-            "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-            "dev": true
+        "node_modules/@isaacs/cliui": {
+            "version": "8.0.2",
+            "license": "ISC",
+            "dependencies": {
+                "string-width": "^5.1.2",
+                "string-width-cjs": "npm:string-width@^4.2.0",
+                "strip-ansi": "^7.0.1",
+                "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+                "wrap-ansi": "^8.1.0",
+                "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
         },
-        "a-sync-waterfall": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz",
-            "integrity": "sha512-RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA==",
-            "dev": true
+        "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+            "version": "6.0.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+            }
         },
-        "accepts": {
-            "version": "1.3.8",
-            "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-            "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-            "dev": true,
-            "requires": {
-                "mime-types": "~2.1.34",
-                "negotiator": "0.6.3"
+        "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+            "version": "6.2.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
             }
         },
-        "acorn": {
-            "version": "8.8.0",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
-            "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
-            "dev": true
+        "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
+            "version": "9.2.2",
+            "license": "MIT"
         },
-        "acorn-jsx": {
-            "version": "5.3.2",
-            "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-            "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-            "dev": true,
-            "requires": {}
+        "node_modules/@isaacs/cliui/node_modules/string-width": {
+            "version": "5.1.2",
+            "license": "MIT",
+            "dependencies": {
+                "eastasianwidth": "^0.2.0",
+                "emoji-regex": "^9.2.2",
+                "strip-ansi": "^7.0.1"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
         },
-        "acorn-walk": {
-            "version": "8.2.0",
-            "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-            "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-            "dev": true
+        "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+            "version": "7.1.0",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+            }
         },
-        "adm-zip": {
-            "version": "0.5.9",
-            "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.9.tgz",
-            "integrity": "sha512-s+3fXLkeeLjZ2kLjCBwQufpI5fuN+kIGBxu6530nVQZGVol0d7Y/M88/xw9HGGUcJjKf8LutN3VPRUBq6N7Ajg=="
+        "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
+            "version": "8.1.0",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^6.1.0",
+                "string-width": "^5.0.1",
+                "strip-ansi": "^7.0.1"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+            }
         },
-        "agent-base": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-            "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+        "node_modules/@istanbuljs/schema": {
+            "version": "0.1.3",
             "dev": true,
-            "requires": {
-                "debug": "4"
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
             }
         },
-        "aggregate-error": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-            "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+        "node_modules/@jridgewell/gen-mapping": {
+            "version": "0.3.5",
             "dev": true,
-            "requires": {
-                "clean-stack": "^2.0.0",
-                "indent-string": "^4.0.0"
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/set-array": "^1.2.1",
+                "@jridgewell/sourcemap-codec": "^1.4.10",
+                "@jridgewell/trace-mapping": "^0.3.24"
+            },
+            "engines": {
+                "node": ">=6.0.0"
             }
         },
-        "ajv": {
-            "version": "6.12.6",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-            "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+        "node_modules/@jridgewell/resolve-uri": {
+            "version": "3.1.0",
             "dev": true,
-            "requires": {
-                "fast-deep-equal": "^3.1.1",
-                "fast-json-stable-stringify": "^2.0.0",
-                "json-schema-traverse": "^0.4.1",
-                "uri-js": "^4.2.2"
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.0.0"
             }
         },
-        "ajv-formats": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-            "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+        "node_modules/@jridgewell/set-array": {
+            "version": "1.2.1",
             "dev": true,
-            "requires": {
-                "ajv": "^8.0.0"
-            },
-            "dependencies": {
-                "ajv": {
-                    "version": "8.8.2",
-                    "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz",
-                    "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==",
-                    "dev": true,
-                    "requires": {
-                        "fast-deep-equal": "^3.1.1",
-                        "json-schema-traverse": "^1.0.0",
-                        "require-from-string": "^2.0.2",
-                        "uri-js": "^4.2.2"
-                    }
-                },
-                "json-schema-traverse": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-                    "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-                    "dev": true
-                }
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.0.0"
             }
         },
-        "ajv-keywords": {
-            "version": "3.5.2",
-            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-            "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+        "node_modules/@jridgewell/source-map": {
+            "version": "0.3.6",
             "dev": true,
-            "requires": {}
-        },
-        "amazon-states-language-service": {
-            "version": "1.8.0",
-            "resolved": "https://registry.npmjs.org/amazon-states-language-service/-/amazon-states-language-service-1.8.0.tgz",
-            "integrity": "sha512-F5hTDQqAVOYEJCm4PTBf6ZjLQYqzLfnGfyNqxNMTYqilbZk/3T0GQManc0pgt5CbtFw62DB6ovBcEUQQa9xsvA==",
-            "requires": {
-                "js-yaml": "^3.14.0",
-                "vscode-json-languageservice": "3.4.9",
-                "vscode-languageserver": "^6.1.1",
-                "vscode-languageserver-textdocument": "^1.0.0",
-                "vscode-languageserver-types": "^3.15.1",
-                "yaml-language-server": "0.10.0"
-            },
+            "license": "MIT",
             "dependencies": {
-                "argparse": {
-                    "version": "1.0.10",
-                    "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-                    "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-                    "requires": {
-                        "sprintf-js": "~1.0.2"
-                    }
-                },
-                "js-yaml": {
-                    "version": "3.14.1",
-                    "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-                    "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-                    "requires": {
-                        "argparse": "^1.0.7",
-                        "esprima": "^4.0.0"
-                    }
-                }
+                "@jridgewell/gen-mapping": "^0.3.5",
+                "@jridgewell/trace-mapping": "^0.3.25"
             }
         },
-        "ansi-colors": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-            "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-            "dev": true
+        "node_modules/@jridgewell/sourcemap-codec": {
+            "version": "1.4.14",
+            "license": "MIT"
         },
-        "ansi-gray": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
-            "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
+        "node_modules/@jridgewell/trace-mapping": {
+            "version": "0.3.25",
             "dev": true,
-            "requires": {
-                "ansi-wrap": "0.1.0"
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/resolve-uri": "^3.1.0",
+                "@jridgewell/sourcemap-codec": "^1.4.14"
             }
         },
-        "ansi-html-community": {
-            "version": "0.0.8",
-            "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
-            "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
-            "dev": true
+        "node_modules/@jsdevtools/ono": {
+            "version": "7.1.3",
+            "dev": true,
+            "license": "MIT"
         },
-        "ansi-regex": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-            "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="
+        "node_modules/@koa/cors": {
+            "version": "5.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "vary": "^1.1.2"
+            },
+            "engines": {
+                "node": ">= 14.0.0"
+            }
         },
-        "ansi-styles": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+        "node_modules/@koa/router": {
+            "version": "13.1.0",
             "dev": true,
-            "requires": {
-                "color-convert": "^2.0.1"
+            "license": "MIT",
+            "dependencies": {
+                "http-errors": "^2.0.0",
+                "koa-compose": "^4.1.0",
+                "path-to-regexp": "^6.3.0"
+            },
+            "engines": {
+                "node": ">= 18"
             }
         },
-        "ansi-wrap": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
-            "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
-            "dev": true
+        "node_modules/@koa/router/node_modules/path-to-regexp": {
+            "version": "6.3.0",
+            "dev": true,
+            "license": "MIT"
         },
-        "any-promise": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-            "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
-            "dev": true
+        "node_modules/@leichtgewicht/ip-codec": {
+            "version": "2.0.4",
+            "dev": true,
+            "license": "MIT"
         },
-        "anymatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-            "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+        "node_modules/@nodelib/fs.scandir": {
+            "version": "2.1.5",
             "dev": true,
-            "requires": {
-                "normalize-path": "^3.0.0",
-                "picomatch": "^2.0.4"
+            "license": "MIT",
+            "dependencies": {
+                "@nodelib/fs.stat": "2.0.5",
+                "run-parallel": "^1.1.9"
+            },
+            "engines": {
+                "node": ">= 8"
             }
         },
-        "append-transform": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz",
-            "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==",
+        "node_modules/@nodelib/fs.stat": {
+            "version": "2.0.5",
             "dev": true,
-            "requires": {
-                "default-require-extensions": "^3.0.0"
+            "license": "MIT",
+            "engines": {
+                "node": ">= 8"
             }
         },
-        "aproba": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-            "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-            "dev": true
-        },
-        "archy": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-            "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
-            "dev": true
-        },
-        "are-we-there-yet": {
-            "version": "1.1.7",
-            "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
-            "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
+        "node_modules/@nodelib/fs.walk": {
+            "version": "1.2.8",
             "dev": true,
-            "requires": {
-                "delegates": "^1.0.0",
-                "readable-stream": "^2.0.6"
-            },
+            "license": "MIT",
             "dependencies": {
-                "readable-stream": {
-                    "version": "2.3.7",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-                    "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-                    "dev": true,
-                    "requires": {
-                        "core-util-is": "~1.0.0",
-                        "inherits": "~2.0.3",
-                        "isarray": "~1.0.0",
-                        "process-nextick-args": "~2.0.0",
-                        "safe-buffer": "~5.1.1",
-                        "string_decoder": "~1.1.1",
-                        "util-deprecate": "~1.0.1"
-                    }
-                },
-                "safe-buffer": {
-                    "version": "5.1.2",
-                    "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-                    "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-                    "dev": true
-                },
-                "string_decoder": {
-                    "version": "1.1.1",
-                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-                    "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-                    "dev": true,
-                    "requires": {
-                        "safe-buffer": "~5.1.0"
-                    }
-                }
+                "@nodelib/fs.scandir": "2.1.5",
+                "fastq": "^1.6.0"
+            },
+            "engines": {
+                "node": ">= 8"
             }
         },
-        "arg": {
-            "version": "4.1.3",
-            "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-            "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-            "dev": true
+        "node_modules/@opentelemetry/api": {
+            "version": "1.9.0",
+            "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz",
+            "integrity": "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==",
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=8.0.0"
+            }
         },
-        "argparse": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-            "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+        "node_modules/@opentelemetry/api-logs": {
+            "version": "0.200.0",
+            "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.200.0.tgz",
+            "integrity": "sha512-IKJBQxh91qJ+3ssRly5hYEJ8NDHu9oY/B1PXVSCWf7zytmYO9RNLB0Ox9XQ/fJ8m6gY6Q6NtBWlmXfaXt5Uc4Q==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@opentelemetry/api": "^1.3.0"
+            },
+            "engines": {
+                "node": ">=8.0.0"
+            }
         },
-        "array-differ": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz",
-            "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==",
-            "dev": true
-        },
-        "array-flatten": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-            "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
-            "dev": true
-        },
-        "array-union": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-            "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-            "dev": true
-        },
-        "arrify": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
-            "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
-            "dev": true
-        },
-        "asap": {
-            "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-            "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
-            "dev": true
-        },
-        "ast-types": {
-            "version": "0.9.14",
-            "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.14.tgz",
-            "integrity": "sha512-Ebvx7/0lLboCdyEmAw/4GqwBeKIijPveXNiVGhCGCNxc7z26T5he7DC6ARxu8ByKuzUZZcLog+VP8GMyZrBzJw==",
-            "dev": true
-        },
-        "async": {
-            "version": "3.2.3",
-            "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
-            "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="
-        },
-        "async-lock": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/async-lock/-/async-lock-1.3.0.tgz",
-            "integrity": "sha512-8A7SkiisnEgME2zEedtDYPxUPzdv3x//E7n5IFktPAtMYSEAV7eNJF0rMwrVyUFj6d/8rgajLantbjcNRQYXIg=="
-        },
-        "available-typed-arrays": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-            "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="
-        },
-        "aws-sdk": {
-            "version": "2.1267.0",
-            "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1267.0.tgz",
-            "integrity": "sha512-ANTtRay26WwNRbYs6eZYN71b3DURNfWaq3AD6BtVNa8fVvnSLn+NNINw2+vLRjDLPZXMAQVHm0qH/TmyBvtjRA==",
-            "requires": {
-                "buffer": "4.9.2",
-                "events": "1.1.1",
-                "ieee754": "1.1.13",
-                "jmespath": "0.16.0",
-                "querystring": "0.2.0",
-                "sax": "1.2.1",
-                "url": "0.10.3",
-                "util": "^0.12.4",
-                "uuid": "8.0.0",
-                "xml2js": "0.4.19"
-            },
+        "node_modules/@opentelemetry/core": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-2.0.0.tgz",
+            "integrity": "sha512-SLX36allrcnVaPYG3R78F/UZZsBsvbc7lMCLx37LyH5MJ1KAAZ2E3mW9OAD3zGz0G8q/BtoS5VUrjzDydhD6LQ==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "uuid": {
-                    "version": "8.0.0",
-                    "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.0.0.tgz",
-                    "integrity": "sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw=="
-                },
-                "xml2js": {
-                    "version": "0.4.19",
-                    "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
-                    "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
-                    "requires": {
-                        "sax": ">=0.6.0",
-                        "xmlbuilder": "~9.0.1"
-                    }
-                },
-                "xmlbuilder": {
-                    "version": "9.0.7",
-                    "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
-                    "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
-                }
+                "@opentelemetry/semantic-conventions": "^1.29.0"
+            },
+            "engines": {
+                "node": "^18.19.0 || >=20.6.0"
+            },
+            "peerDependencies": {
+                "@opentelemetry/api": ">=1.0.0 <1.10.0"
             }
         },
-        "aws-ssm-document-language-service": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/aws-ssm-document-language-service/-/aws-ssm-document-language-service-1.0.0.tgz",
-            "integrity": "sha512-XTkladSKrrD/uIGOwRMyVK7M6eHYVZWobtF0SCXQPocpE0SsHRVY1GflZaEGYgbKgDJTgpNpP8drTsUFzgfL5A==",
-            "requires": {
-                "vscode-json-languageservice": "3.8.3",
-                "vscode-languageserver": "^6.1.1",
-                "yaml": "^1.10.0",
-                "yaml-language-server": "0.10.1"
-            },
+        "node_modules/@opentelemetry/exporter-logs-otlp-http": {
+            "version": "0.200.0",
+            "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-logs-otlp-http/-/exporter-logs-otlp-http-0.200.0.tgz",
+            "integrity": "sha512-KfWw49htbGGp9s8N4KI8EQ9XuqKJ0VG+yVYVYFiCYSjEV32qpQ5qZ9UZBzOZ6xRb+E16SXOSCT3RkqBVSABZ+g==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "argparse": {
-                    "version": "1.0.10",
-                    "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-                    "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-                    "requires": {
-                        "sprintf-js": "~1.0.2"
-                    }
-                },
-                "js-yaml": {
-                    "version": "3.14.1",
-                    "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-                    "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-                    "requires": {
-                        "argparse": "^1.0.7",
-                        "esprima": "^4.0.0"
-                    }
-                },
-                "jsonc-parser": {
-                    "version": "2.3.1",
-                    "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz",
-                    "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg=="
-                },
-                "prettier": {
-                    "version": "2.0.5",
-                    "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz",
-                    "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==",
-                    "optional": true
-                },
-                "vscode-json-languageservice": {
-                    "version": "3.8.3",
-                    "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.8.3.tgz",
-                    "integrity": "sha512-8yPag/NQHCuTthahyaTtzK0DHT0FKM/xBU0mFBQ8nMo8C1i2P+FCyIVqICoNoHkRI2BTGlXKomPUpsqjSz0TnQ==",
-                    "requires": {
-                        "jsonc-parser": "^2.2.1",
-                        "vscode-languageserver-textdocument": "^1.0.1",
-                        "vscode-languageserver-types": "^3.15.1",
-                        "vscode-nls": "^4.1.2",
-                        "vscode-uri": "^2.1.2"
-                    }
-                },
-                "vscode-jsonrpc": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz",
-                    "integrity": "sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg=="
-                },
-                "vscode-languageserver-protocol": {
-                    "version": "3.14.1",
-                    "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz",
-                    "integrity": "sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==",
-                    "requires": {
-                        "vscode-jsonrpc": "^4.0.0",
-                        "vscode-languageserver-types": "3.14.0"
-                    },
-                    "dependencies": {
-                        "vscode-languageserver-types": {
-                            "version": "3.14.0",
-                            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz",
-                            "integrity": "sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A=="
-                        }
-                    }
-                },
-                "vscode-nls": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.2.tgz",
-                    "integrity": "sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw=="
-                },
-                "yaml-language-server": {
-                    "version": "0.10.1",
-                    "resolved": "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.10.1.tgz",
-                    "integrity": "sha512-R9SEt/nWTuZ8weB040L7yyaIVARlZ0ian1Kv6ptu4+xyVlIMobTZXaBTtgyhlMWqcQ3BpsAZu4q/2plRVG3tLQ==",
-                    "requires": {
-                        "js-yaml": "^3.13.1",
-                        "jsonc-parser": "^2.2.1",
-                        "prettier": "2.0.5",
-                        "request-light": "^0.2.4",
-                        "vscode-json-languageservice": "^3.6.0",
-                        "vscode-languageserver": "^5.2.1",
-                        "vscode-languageserver-types": "^3.15.1",
-                        "vscode-nls": "^4.1.2",
-                        "vscode-uri": "^2.1.1",
-                        "yaml-ast-parser-custom-tags": "0.0.43"
-                    },
-                    "dependencies": {
-                        "vscode-languageserver": {
-                            "version": "5.2.1",
-                            "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz",
-                            "integrity": "sha512-GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A==",
-                            "requires": {
-                                "vscode-languageserver-protocol": "3.14.1",
-                                "vscode-uri": "^1.0.6"
-                            },
-                            "dependencies": {
-                                "vscode-uri": {
-                                    "version": "1.0.8",
-                                    "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.8.tgz",
-                                    "integrity": "sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ=="
-                                }
-                            }
-                        }
-                    }
-                }
+                "@opentelemetry/api-logs": "0.200.0",
+                "@opentelemetry/core": "2.0.0",
+                "@opentelemetry/otlp-exporter-base": "0.200.0",
+                "@opentelemetry/otlp-transformer": "0.200.0",
+                "@opentelemetry/sdk-logs": "0.200.0"
+            },
+            "engines": {
+                "node": "^18.19.0 || >=20.6.0"
+            },
+            "peerDependencies": {
+                "@opentelemetry/api": "^1.3.0"
             }
         },
-        "azure-devops-node-api": {
-            "version": "11.0.1",
-            "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.0.1.tgz",
-            "integrity": "sha512-YMdjAw9l5p/6leiyIloxj3k7VIvYThKjvqgiQn88r3nhT93ENwsoDS3A83CyJ4uTWzCZ5f5jCi6c27rTU5Pz+A==",
-            "dev": true,
-            "requires": {
-                "tunnel": "0.0.6",
-                "typed-rest-client": "^1.8.4"
+        "node_modules/@opentelemetry/exporter-metrics-otlp-http": {
+            "version": "0.200.0",
+            "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-metrics-otlp-http/-/exporter-metrics-otlp-http-0.200.0.tgz",
+            "integrity": "sha512-5BiR6i8yHc9+qW7F6LqkuUnIzVNA7lt0qRxIKcKT+gq3eGUPHZ3DY29sfxI3tkvnwMgtnHDMNze5DdxW39HsAw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@opentelemetry/core": "2.0.0",
+                "@opentelemetry/otlp-exporter-base": "0.200.0",
+                "@opentelemetry/otlp-transformer": "0.200.0",
+                "@opentelemetry/resources": "2.0.0",
+                "@opentelemetry/sdk-metrics": "2.0.0"
+            },
+            "engines": {
+                "node": "^18.19.0 || >=20.6.0"
+            },
+            "peerDependencies": {
+                "@opentelemetry/api": "^1.3.0"
             }
         },
-        "balanced-match": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-            "dev": true
-        },
-        "base64-js": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-            "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
-        },
-        "batch": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-            "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
-            "dev": true
-        },
-        "big-integer": {
-            "version": "1.6.51",
-            "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
-            "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==",
-            "dev": true
-        },
-        "big.js": {
-            "version": "5.2.2",
-            "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-            "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-            "dev": true
-        },
-        "binary": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
-            "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
-            "dev": true,
-            "requires": {
-                "buffers": "~0.1.1",
-                "chainsaw": "~0.1.0"
+        "node_modules/@opentelemetry/otlp-exporter-base": {
+            "version": "0.200.0",
+            "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.200.0.tgz",
+            "integrity": "sha512-IxJgA3FD7q4V6gGq4bnmQM5nTIyMDkoGFGrBrrDjB6onEiq1pafma55V+bHvGYLWvcqbBbRfezr1GED88lacEQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@opentelemetry/core": "2.0.0",
+                "@opentelemetry/otlp-transformer": "0.200.0"
+            },
+            "engines": {
+                "node": "^18.19.0 || >=20.6.0"
+            },
+            "peerDependencies": {
+                "@opentelemetry/api": ">=1.0.0 <1.10.0"
             }
         },
-        "binary-extensions": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-            "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-            "dev": true
+        "node_modules/@opentelemetry/otlp-transformer": {
+            "version": "0.200.0",
+            "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-transformer/-/otlp-transformer-0.200.0.tgz",
+            "integrity": "sha512-+9YDZbYybOnv7sWzebWOeK6gKyt2XE7iarSyBFkwwnP559pEevKOUD8NyDHhRjCSp13ybh9iVXlMfcj/DwF/yw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@opentelemetry/api-logs": "0.200.0",
+                "@opentelemetry/core": "2.0.0",
+                "@opentelemetry/resources": "2.0.0",
+                "@opentelemetry/sdk-logs": "0.200.0",
+                "@opentelemetry/sdk-metrics": "2.0.0",
+                "@opentelemetry/sdk-trace-base": "2.0.0",
+                "protobufjs": "^7.3.0"
+            },
+            "engines": {
+                "node": "^18.19.0 || >=20.6.0"
+            },
+            "peerDependencies": {
+                "@opentelemetry/api": "^1.3.0"
+            }
         },
-        "bl": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-            "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-            "dev": true,
-            "requires": {
-                "buffer": "^5.5.0",
-                "inherits": "^2.0.4",
-                "readable-stream": "^3.4.0"
+        "node_modules/@opentelemetry/resources": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.0.0.tgz",
+            "integrity": "sha512-rnZr6dML2z4IARI4zPGQV4arDikF/9OXZQzrC01dLmn0CZxU5U5OLd/m1T7YkGRj5UitjeoCtg/zorlgMQcdTg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@opentelemetry/core": "2.0.0",
+                "@opentelemetry/semantic-conventions": "^1.29.0"
+            },
+            "engines": {
+                "node": "^18.19.0 || >=20.6.0"
             },
+            "peerDependencies": {
+                "@opentelemetry/api": ">=1.3.0 <1.10.0"
+            }
+        },
+        "node_modules/@opentelemetry/sdk-logs": {
+            "version": "0.200.0",
+            "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-logs/-/sdk-logs-0.200.0.tgz",
+            "integrity": "sha512-VZG870063NLfObmQQNtCVcdXXLzI3vOjjrRENmU37HYiPFa0ZXpXVDsTD02Nh3AT3xYJzQaWKl2X2lQ2l7TWJA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "buffer": {
-                    "version": "5.7.1",
-                    "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-                    "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-                    "dev": true,
-                    "requires": {
-                        "base64-js": "^1.3.1",
-                        "ieee754": "^1.1.13"
-                    }
-                }
+                "@opentelemetry/api-logs": "0.200.0",
+                "@opentelemetry/core": "2.0.0",
+                "@opentelemetry/resources": "2.0.0"
+            },
+            "engines": {
+                "node": "^18.19.0 || >=20.6.0"
+            },
+            "peerDependencies": {
+                "@opentelemetry/api": ">=1.4.0 <1.10.0"
             }
         },
-        "bluebird": {
-            "version": "3.4.7",
-            "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
-            "integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=",
-            "dev": true
+        "node_modules/@opentelemetry/sdk-logs/node_modules/@opentelemetry/core": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-2.0.0.tgz",
+            "integrity": "sha512-SLX36allrcnVaPYG3R78F/UZZsBsvbc7lMCLx37LyH5MJ1KAAZ2E3mW9OAD3zGz0G8q/BtoS5VUrjzDydhD6LQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@opentelemetry/semantic-conventions": "^1.29.0"
+            },
+            "engines": {
+                "node": "^18.19.0 || >=20.6.0"
+            },
+            "peerDependencies": {
+                "@opentelemetry/api": ">=1.0.0 <1.10.0"
+            }
         },
-        "body-parser": {
-            "version": "1.20.0",
-            "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz",
-            "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==",
-            "dev": true,
-            "requires": {
-                "bytes": "3.1.2",
-                "content-type": "~1.0.4",
-                "debug": "2.6.9",
-                "depd": "2.0.0",
-                "destroy": "1.2.0",
-                "http-errors": "2.0.0",
-                "iconv-lite": "0.4.24",
-                "on-finished": "2.4.1",
-                "qs": "6.10.3",
-                "raw-body": "2.5.1",
-                "type-is": "~1.6.18",
-                "unpipe": "1.0.0"
+        "node_modules/@opentelemetry/sdk-logs/node_modules/@opentelemetry/resources": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.0.0.tgz",
+            "integrity": "sha512-rnZr6dML2z4IARI4zPGQV4arDikF/9OXZQzrC01dLmn0CZxU5U5OLd/m1T7YkGRj5UitjeoCtg/zorlgMQcdTg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@opentelemetry/core": "2.0.0",
+                "@opentelemetry/semantic-conventions": "^1.29.0"
+            },
+            "engines": {
+                "node": "^18.19.0 || >=20.6.0"
             },
+            "peerDependencies": {
+                "@opentelemetry/api": ">=1.3.0 <1.10.0"
+            }
+        },
+        "node_modules/@opentelemetry/sdk-metrics": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-2.0.0.tgz",
+            "integrity": "sha512-Bvy8QDjO05umd0+j+gDeWcTaVa1/R2lDj/eOvjzpm8VQj1K1vVZJuyjThpV5/lSHyYW2JaHF2IQ7Z8twJFAhjA==",
+            "license": "Apache-2.0",
             "dependencies": {
-                "debug": {
-                    "version": "2.6.9",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "2.0.0"
-                    }
-                },
-                "depd": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-                    "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-                    "dev": true
-                },
-                "ms": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-                    "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-                    "dev": true
-                }
+                "@opentelemetry/core": "2.0.0",
+                "@opentelemetry/resources": "2.0.0"
+            },
+            "engines": {
+                "node": "^18.19.0 || >=20.6.0"
+            },
+            "peerDependencies": {
+                "@opentelemetry/api": ">=1.9.0 <1.10.0"
             }
         },
-        "bonjour-service": {
-            "version": "1.0.13",
-            "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.13.tgz",
-            "integrity": "sha512-LWKRU/7EqDUC9CTAQtuZl5HzBALoCYwtLhffW3et7vZMwv3bWLpJf8bRYlMD5OCcDpTfnPgNCV4yo9ZIaJGMiA==",
-            "dev": true,
-            "requires": {
-                "array-flatten": "^2.1.2",
-                "dns-equal": "^1.0.0",
-                "fast-deep-equal": "^3.1.3",
-                "multicast-dns": "^7.2.5"
+        "node_modules/@opentelemetry/sdk-trace-base": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.0.0.tgz",
+            "integrity": "sha512-qQnYdX+ZCkonM7tA5iU4fSRsVxbFGml8jbxOgipRGMFHKaXKHQ30js03rTobYjKjIfnOsZSbHKWF0/0v0OQGfw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@opentelemetry/core": "2.0.0",
+                "@opentelemetry/resources": "2.0.0",
+                "@opentelemetry/semantic-conventions": "^1.29.0"
+            },
+            "engines": {
+                "node": "^18.19.0 || >=20.6.0"
+            },
+            "peerDependencies": {
+                "@opentelemetry/api": ">=1.3.0 <1.10.0"
             }
         },
-        "boolbase": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-            "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
-            "dev": true
+        "node_modules/@opentelemetry/semantic-conventions": {
+            "version": "1.33.0",
+            "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.33.0.tgz",
+            "integrity": "sha512-TIpZvE8fiEILFfTlfPnltpBaD3d9/+uQHVCyC3vfdh6WfCXKhNFzoP5RyDDIndfvZC5GrA4pyEDNyjPloJud+w==",
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=14"
+            }
         },
-        "bowser": {
-            "version": "2.11.0",
-            "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.11.0.tgz",
-            "integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA=="
+        "node_modules/@pkgjs/parseargs": {
+            "version": "0.11.0",
+            "license": "MIT",
+            "optional": true,
+            "engines": {
+                "node": ">=14"
+            }
         },
-        "brace-expansion": {
-            "version": "1.1.11",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+        "node_modules/@pkgr/core": {
+            "version": "0.1.1",
             "dev": true,
-            "requires": {
-                "balanced-match": "^1.0.0",
-                "concat-map": "0.0.1"
+            "license": "MIT",
+            "engines": {
+                "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/unts"
             }
         },
-        "braces": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-            "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+        "node_modules/@playwright/browser-chromium": {
+            "version": "1.49.1",
             "dev": true,
-            "requires": {
-                "fill-range": "^7.0.1"
+            "hasInstallScript": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "playwright-core": "1.49.1"
+            },
+            "engines": {
+                "node": ">=18"
             }
         },
-        "browser-stdout": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-            "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-            "dev": true
+        "node_modules/@protobufjs/aspromise": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+            "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==",
+            "license": "BSD-3-Clause"
         },
-        "browserslist": {
-            "version": "4.20.2",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.2.tgz",
-            "integrity": "sha512-CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA==",
-            "dev": true,
-            "requires": {
-                "caniuse-lite": "^1.0.30001317",
-                "electron-to-chromium": "^1.4.84",
-                "escalade": "^3.1.1",
-                "node-releases": "^2.0.2",
-                "picocolors": "^1.0.0"
-            }
+        "node_modules/@protobufjs/base64": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
+            "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==",
+            "license": "BSD-3-Clause"
         },
-        "buffer": {
-            "version": "4.9.2",
-            "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-            "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
-            "requires": {
-                "base64-js": "^1.0.2",
-                "ieee754": "^1.1.4",
-                "isarray": "^1.0.0"
-            }
+        "node_modules/@protobufjs/codegen": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
+            "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==",
+            "license": "BSD-3-Clause"
         },
-        "buffer-crc32": {
-            "version": "0.2.13",
-            "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-            "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-            "dev": true
+        "node_modules/@protobufjs/eventemitter": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
+            "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==",
+            "license": "BSD-3-Clause"
         },
-        "buffer-from": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-            "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-            "dev": true
+        "node_modules/@protobufjs/fetch": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
+            "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==",
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "@protobufjs/aspromise": "^1.1.1",
+                "@protobufjs/inquire": "^1.1.0"
+            }
         },
-        "buffer-indexof-polyfill": {
+        "node_modules/@protobufjs/float": {
             "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz",
-            "integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==",
-            "dev": true
+            "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
+            "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==",
+            "license": "BSD-3-Clause"
         },
-        "buffers": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
-            "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=",
-            "dev": true
+        "node_modules/@protobufjs/inquire": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
+            "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==",
+            "license": "BSD-3-Clause"
         },
-        "bytes": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-            "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="
+        "node_modules/@protobufjs/path": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
+            "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==",
+            "license": "BSD-3-Clause"
         },
-        "cacheable-lookup": {
-            "version": "5.0.4",
-            "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
-            "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA=="
+        "node_modules/@protobufjs/pool": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
+            "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==",
+            "license": "BSD-3-Clause"
         },
-        "cacheable-request": {
-            "version": "7.0.2",
-            "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
-            "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
-            "requires": {
-                "clone-response": "^1.0.2",
-                "get-stream": "^5.1.0",
-                "http-cache-semantics": "^4.0.0",
-                "keyv": "^4.0.0",
-                "lowercase-keys": "^2.0.0",
-                "normalize-url": "^6.0.1",
-                "responselike": "^2.0.0"
+        "node_modules/@protobufjs/utf8": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
+            "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==",
+            "license": "BSD-3-Clause"
+        },
+        "node_modules/@sindresorhus/is": {
+            "version": "4.2.0",
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sindresorhus/is?sponsor=1"
             }
         },
-        "caching-transform": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz",
-            "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==",
+        "node_modules/@sinonjs/commons": {
+            "version": "1.8.3",
             "dev": true,
-            "requires": {
-                "hasha": "^5.0.0",
-                "make-dir": "^3.0.0",
-                "package-hash": "^4.0.0",
-                "write-file-atomic": "^3.0.0"
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "type-detect": "4.0.8"
             }
         },
-        "call-bind": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-            "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-            "requires": {
-                "function-bind": "^1.1.1",
-                "get-intrinsic": "^1.0.2"
+        "node_modules/@sinonjs/fake-timers": {
+            "version": "10.0.2",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "@sinonjs/commons": "^2.0.0"
             }
         },
-        "call-me-maybe": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
-            "integrity": "sha512-wCyFsDQkKPwwF8BDwOiWNx/9K45L/hvggQiDbve+viMNMQnWhrlYIuBk09offfwCRtCO9P6XwUttufzU11WCVw==",
-            "dev": true
-        },
-        "caller-callsite": {
+        "node_modules/@sinonjs/fake-timers/node_modules/@sinonjs/commons": {
             "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
-            "integrity": "sha512-JuG3qI4QOftFsZyOn1qq87fq5grLIyk1JYd5lJmdA+fG7aQ9pA/i3JIJGcO3q0MrRcHlOt1U+ZeHW8Dq9axALQ==",
             "dev": true,
-            "requires": {
-                "callsites": "^2.0.0"
-            },
+            "license": "BSD-3-Clause",
             "dependencies": {
-                "callsites": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-                    "integrity": "sha512-ksWePWBloaWPxJYQ8TL0JHvtci6G5QTKwQ95RcWAa/lzoAKuAOflGdAK92hpHXjkwb8zLxoLNUoNYZgVsaJzvQ==",
-                    "dev": true
-                }
+                "type-detect": "4.0.8"
             }
         },
-        "caller-path": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
-            "integrity": "sha512-MCL3sf6nCSXOwCTzvPKhN18TU7AHTvdtam8DAogxcrJ8Rjfbbg7Lgng64H9Iy+vUV6VGFClN/TyxBkAebLRR4A==",
+        "node_modules/@sinonjs/samsam": {
+            "version": "6.1.1",
             "dev": true,
-            "requires": {
-                "caller-callsite": "^2.0.0"
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "@sinonjs/commons": "^1.6.0",
+                "lodash.get": "^4.4.2",
+                "type-detect": "^4.0.8"
             }
         },
-        "callsites": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-            "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-            "dev": true
-        },
-        "camelcase": {
-            "version": "6.2.0",
-            "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-            "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
-            "dev": true
-        },
-        "camelcase-keys": {
-            "version": "6.2.2",
-            "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
-            "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+        "node_modules/@sinonjs/text-encoding": {
+            "version": "0.7.3",
+            "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz",
+            "integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==",
             "dev": true,
-            "requires": {
-                "camelcase": "^5.3.1",
-                "map-obj": "^4.0.0",
-                "quick-lru": "^4.0.1"
-            },
+            "license": "(Unlicense OR Apache-2.0)"
+        },
+        "node_modules/@smithy/abort-controller": {
+            "version": "3.1.9",
+            "license": "Apache-2.0",
             "dependencies": {
-                "camelcase": {
-                    "version": "5.3.1",
-                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-                    "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-                    "dev": true
-                },
-                "quick-lru": {
-                    "version": "4.0.1",
-                    "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
-                    "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
-                    "dev": true
-                }
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "caniuse-lite": {
-            "version": "1.0.30001317",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001317.tgz",
-            "integrity": "sha512-xIZLh8gBm4dqNX0gkzrBeyI86J2eCjWzYAs40q88smG844YIrN4tVQl/RhquHvKEKImWWFIVh1Lxe5n1G/N+GQ==",
-            "dev": true
-        },
-        "chainsaw": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
-            "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
-            "dev": true,
-            "requires": {
-                "traverse": ">=0.3.0 <0.4"
+        "node_modules/@smithy/chunked-blob-reader": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
             }
         },
-        "chalk": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-            "dev": true,
-            "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
+        "node_modules/@smithy/chunked-blob-reader-native": {
+            "version": "3.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-base64": "^3.0.0",
+                "tslib": "^2.6.2"
             }
         },
-        "charenc": {
-            "version": "0.0.2",
-            "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
-            "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=",
-            "dev": true
+        "node_modules/@smithy/config-resolver": {
+            "version": "3.0.13",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^3.1.12",
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-config-provider": "^3.0.0",
+                "@smithy/util-middleware": "^3.0.11",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "cheerio": {
-            "version": "1.0.0-rc.10",
-            "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz",
-            "integrity": "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==",
-            "dev": true,
-            "requires": {
-                "cheerio-select": "^1.5.0",
-                "dom-serializer": "^1.3.2",
-                "domhandler": "^4.2.0",
-                "htmlparser2": "^6.1.0",
-                "parse5": "^6.0.1",
-                "parse5-htmlparser2-tree-adapter": "^6.0.1",
-                "tslib": "^2.2.0"
+        "node_modules/@smithy/core": {
+            "version": "2.5.7",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/middleware-serde": "^3.0.11",
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-middleware": "^3.0.11",
+                "@smithy/util-stream": "^3.3.4",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "cheerio-select": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz",
-            "integrity": "sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==",
-            "dev": true,
-            "requires": {
-                "css-select": "^4.1.3",
-                "css-what": "^5.0.1",
-                "domelementtype": "^2.2.0",
-                "domhandler": "^4.2.0",
-                "domutils": "^2.7.0"
+        "node_modules/@smithy/core/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "chokidar": {
-            "version": "3.5.3",
-            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-            "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-            "dev": true,
-            "requires": {
-                "anymatch": "~3.1.2",
-                "braces": "~3.0.2",
-                "fsevents": "~2.3.2",
-                "glob-parent": "~5.1.2",
-                "is-binary-path": "~2.1.0",
-                "is-glob": "~4.0.1",
-                "normalize-path": "~3.0.0",
-                "readdirp": "~3.6.0"
+        "node_modules/@smithy/core/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "chownr": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-            "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-            "dev": true
+        "node_modules/@smithy/core/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "chrome-trace-event": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-            "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
-            "dev": true
+        "node_modules/@smithy/credential-provider-imds": {
+            "version": "3.2.8",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^3.1.12",
+                "@smithy/property-provider": "^3.1.11",
+                "@smithy/types": "^3.7.2",
+                "@smithy/url-parser": "^3.0.11",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "circular-dependency-plugin": {
-            "version": "5.2.2",
-            "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.2.tgz",
-            "integrity": "sha512-g38K9Cm5WRwlaH6g03B9OEz/0qRizI+2I7n+Gz+L5DxXJAPAiWQvwlYNm1V1jkdpUv95bOe/ASm2vfi/G560jQ==",
-            "dev": true,
-            "requires": {}
+        "node_modules/@smithy/eventstream-codec": {
+            "version": "3.1.10",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/crc32": "5.2.0",
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-hex-encoding": "^3.0.0",
+                "tslib": "^2.6.2"
+            }
         },
-        "clean-stack": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-            "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-            "dev": true
+        "node_modules/@smithy/eventstream-serde-browser": {
+            "version": "3.0.14",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/eventstream-serde-universal": "^3.0.13",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "cli-color": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-2.0.3.tgz",
-            "integrity": "sha512-OkoZnxyC4ERN3zLzZaY9Emb7f/MhBOIpePv0Ycok0fJYT+Ouo00UBEIwsVsr0yoow++n5YWlSUgST9GKhNHiRQ==",
-            "dev": true,
-            "requires": {
-                "d": "^1.0.1",
-                "es5-ext": "^0.10.61",
-                "es6-iterator": "^2.0.3",
-                "memoizee": "^0.4.15",
-                "timers-ext": "^0.1.7"
+        "node_modules/@smithy/eventstream-serde-config-resolver": {
+            "version": "3.0.11",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "cliui": {
-            "version": "7.0.4",
-            "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-            "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-            "dev": true,
-            "requires": {
-                "string-width": "^4.2.0",
-                "strip-ansi": "^6.0.0",
-                "wrap-ansi": "^7.0.0"
+        "node_modules/@smithy/eventstream-serde-node": {
+            "version": "3.0.13",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/eventstream-serde-universal": "^3.0.13",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
             },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@smithy/eventstream-serde-universal": {
+            "version": "3.0.13",
+            "license": "Apache-2.0",
             "dependencies": {
-                "ansi-regex": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-                    "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-                    "dev": true
-                },
-                "strip-ansi": {
-                    "version": "6.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-                    "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^5.0.1"
-                    }
-                }
+                "@smithy/eventstream-codec": "^3.1.10",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "clone": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-            "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
-            "dev": true
+        "node_modules/@smithy/fetch-http-handler": {
+            "version": "4.1.3",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/querystring-builder": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-base64": "^3.0.0",
+                "tslib": "^2.6.2"
+            }
         },
-        "clone-buffer": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-            "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
-            "dev": true
+        "node_modules/@smithy/hash-blob-browser": {
+            "version": "3.1.10",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/chunked-blob-reader": "^4.0.0",
+                "@smithy/chunked-blob-reader-native": "^3.0.1",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            }
         },
-        "clone-deep": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
-            "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
-            "dev": true,
-            "requires": {
-                "is-plain-object": "^2.0.4",
-                "kind-of": "^6.0.2",
-                "shallow-clone": "^3.0.0"
+        "node_modules/@smithy/hash-node": {
+            "version": "3.0.11",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-buffer-from": "^3.0.0",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "clone-response": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
-            "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
-            "requires": {
-                "mimic-response": "^1.0.0"
+        "node_modules/@smithy/hash-node/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "clone-stats": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-            "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-            "dev": true
+        "node_modules/@smithy/hash-node/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "cloneable-readable": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
-            "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
-            "dev": true,
-            "requires": {
-                "inherits": "^2.0.1",
-                "process-nextick-args": "^2.0.0",
-                "readable-stream": "^2.3.5"
+        "node_modules/@smithy/hash-node/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
             },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@smithy/hash-stream-node": {
+            "version": "3.1.10",
+            "license": "Apache-2.0",
             "dependencies": {
-                "readable-stream": {
-                    "version": "2.3.7",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-                    "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-                    "dev": true,
-                    "requires": {
-                        "core-util-is": "~1.0.0",
-                        "inherits": "~2.0.3",
-                        "isarray": "~1.0.0",
-                        "process-nextick-args": "~2.0.0",
-                        "safe-buffer": "~5.1.1",
-                        "string_decoder": "~1.1.1",
-                        "util-deprecate": "~1.0.1"
-                    }
-                },
-                "safe-buffer": {
-                    "version": "5.1.2",
-                    "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-                    "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-                    "dev": true
-                },
-                "string_decoder": {
-                    "version": "1.1.1",
-                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-                    "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-                    "dev": true,
-                    "requires": {
-                        "safe-buffer": "~5.1.0"
-                    }
-                }
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "code-block-writer": {
-            "version": "11.0.3",
-            "resolved": "https://registry.npmjs.org/code-block-writer/-/code-block-writer-11.0.3.tgz",
-            "integrity": "sha512-NiujjUFB4SwScJq2bwbYUtXbZhBSlY6vYzm++3Q6oC+U+injTqfPYFK8wS9COOmb2lueqp0ZRB4nK1VYeHgNyw==",
-            "dev": true
+        "node_modules/@smithy/hash-stream-node/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "code-point-at": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-            "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-            "dev": true
+        "node_modules/@smithy/hash-stream-node/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "color": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz",
-            "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==",
-            "requires": {
-                "color-convert": "^1.9.3",
-                "color-string": "^1.6.0"
+        "node_modules/@smithy/hash-stream-node/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
             },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@smithy/invalid-dependency": {
+            "version": "3.0.11",
+            "license": "Apache-2.0",
             "dependencies": {
-                "color-convert": {
-                    "version": "1.9.3",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-                    "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-                    "requires": {
-                        "color-name": "1.1.3"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.3",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-                    "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-                }
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
             }
         },
-        "color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "requires": {
-                "color-name": "~1.1.4"
+        "node_modules/@smithy/is-array-buffer": {
+            "version": "2.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+        "node_modules/@smithy/md5-js": {
+            "version": "3.0.11",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            }
         },
-        "color-string": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.6.0.tgz",
-            "integrity": "sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA==",
-            "requires": {
-                "color-name": "^1.0.0",
-                "simple-swizzle": "^0.2.2"
+        "node_modules/@smithy/md5-js/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "color-support": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-            "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-            "dev": true
+        "node_modules/@smithy/md5-js/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "colorette": {
-            "version": "2.0.16",
-            "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
-            "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
-            "dev": true
+        "node_modules/@smithy/md5-js/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "colorspace": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz",
-            "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==",
-            "requires": {
-                "color": "^3.1.3",
-                "text-hex": "1.0.x"
+        "node_modules/@smithy/middleware-apply-body-checksum": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-apply-body-checksum/-/middleware-apply-body-checksum-4.1.2.tgz",
+            "integrity": "sha512-YK7yIjjW67Fat8uk2CsUDaQwfcvA1RPaoLKKDZycf7QZ3QlmPUuLLDsMVrJWPy/2mahJjpcaAfzZnK7cXDlVAQ==",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^4.0.0",
+                "@smithy/protocol-http": "^5.1.2",
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "commander": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
-            "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
-            "dev": true
-        },
-        "commondir": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-            "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-            "dev": true
-        },
-        "compressible": {
-            "version": "2.0.18",
-            "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-            "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-            "dev": true,
-            "requires": {
-                "mime-db": ">= 1.43.0 < 2"
+        "node_modules/@smithy/middleware-apply-body-checksum/node_modules/@smithy/is-array-buffer": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-4.0.0.tgz",
+            "integrity": "sha512-saYhF8ZZNoJDTvJBEWgeBccCg+yvp1CX+ed12yORU3NilJScfc6gfch2oVb4QgxZrGUx3/ZJlb+c/dJbyupxlw==",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "compression": {
-            "version": "1.7.4",
-            "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-            "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
-            "dev": true,
-            "requires": {
-                "accepts": "~1.3.5",
-                "bytes": "3.0.0",
-                "compressible": "~2.0.16",
-                "debug": "2.6.9",
-                "on-headers": "~1.0.2",
-                "safe-buffer": "5.1.2",
-                "vary": "~1.1.2"
-            },
+        "node_modules/@smithy/middleware-apply-body-checksum/node_modules/@smithy/protocol-http": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-5.1.2.tgz",
+            "integrity": "sha512-rOG5cNLBXovxIrICSBm95dLqzfvxjEmuZx4KK3hWwPFHGdW3lxY0fZNXfv2zebfRO7sJZ5pKJYHScsqopeIWtQ==",
             "dependencies": {
-                "bytes": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-                    "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-                    "dev": true
-                },
-                "debug": {
-                    "version": "2.6.9",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "2.0.0"
-                    }
-                },
-                "ms": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-                    "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-                    "dev": true
-                },
-                "safe-buffer": {
-                    "version": "5.1.2",
-                    "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-                    "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-                    "dev": true
-                }
+                "@smithy/types": "^4.3.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "concat-map": {
-            "version": "0.0.1",
-            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-            "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-            "dev": true
-        },
-        "connect-history-api-fallback": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-            "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
-            "dev": true
-        },
-        "console-control-strings": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-            "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-            "dev": true
-        },
-        "content-disposition": {
-            "version": "0.5.4",
-            "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-            "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
-            "dev": true,
-            "requires": {
-                "safe-buffer": "5.2.1"
+        "node_modules/@smithy/middleware-apply-body-checksum/node_modules/@smithy/types": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.3.1.tgz",
+            "integrity": "sha512-UqKOQBL2x6+HWl3P+3QqFD4ncKq0I8Nuz9QItGv5WuKuMHuuwlhvqcZCoXGfc+P1QmfJE7VieykoYYmrOoFJxA==",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "content-type": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-            "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-            "dev": true
+        "node_modules/@smithy/middleware-content-length": {
+            "version": "3.0.13",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "convert-source-map": {
-            "version": "1.8.0",
-            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
-            "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
-            "dev": true,
-            "requires": {
-                "safe-buffer": "~5.1.1"
+        "node_modules/@smithy/middleware-endpoint": {
+            "version": "3.2.8",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/core": "^2.5.7",
+                "@smithy/middleware-serde": "^3.0.11",
+                "@smithy/node-config-provider": "^3.1.12",
+                "@smithy/shared-ini-file-loader": "^3.1.12",
+                "@smithy/types": "^3.7.2",
+                "@smithy/url-parser": "^3.0.11",
+                "@smithy/util-middleware": "^3.0.11",
+                "tslib": "^2.6.2"
             },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@smithy/middleware-retry": {
+            "version": "3.0.34",
+            "license": "Apache-2.0",
             "dependencies": {
-                "safe-buffer": {
-                    "version": "5.1.2",
-                    "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-                    "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-                    "dev": true
-                }
+                "@smithy/node-config-provider": "^3.1.12",
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/service-error-classification": "^3.0.11",
+                "@smithy/smithy-client": "^3.7.0",
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-middleware": "^3.0.11",
+                "@smithy/util-retry": "^3.0.11",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "cookie": {
-            "version": "0.5.0",
-            "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-            "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
-            "dev": true
+        "node_modules/@smithy/middleware-serde": {
+            "version": "3.0.11",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "cookie-signature": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-            "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
-            "dev": true
+        "node_modules/@smithy/middleware-stack": {
+            "version": "3.0.11",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "core-util-is": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-            "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
-            "dev": true
+        "node_modules/@smithy/node-config-provider": {
+            "version": "3.1.12",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/property-provider": "^3.1.11",
+                "@smithy/shared-ini-file-loader": "^3.1.12",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "cosmiconfig": {
-            "version": "5.2.1",
-            "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-            "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
-            "dev": true,
-            "requires": {
-                "import-fresh": "^2.0.0",
-                "is-directory": "^0.3.1",
-                "js-yaml": "^3.13.1",
-                "parse-json": "^4.0.0"
+        "node_modules/@smithy/node-http-handler": {
+            "version": "3.3.3",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/abort-controller": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/querystring-builder": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
             },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@smithy/property-provider": {
+            "version": "3.1.11",
+            "license": "Apache-2.0",
             "dependencies": {
-                "argparse": {
-                    "version": "1.0.10",
-                    "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-                    "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-                    "dev": true,
-                    "requires": {
-                        "sprintf-js": "~1.0.2"
-                    }
-                },
-                "import-fresh": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-                    "integrity": "sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg==",
-                    "dev": true,
-                    "requires": {
-                        "caller-path": "^2.0.0",
-                        "resolve-from": "^3.0.0"
-                    }
-                },
-                "js-yaml": {
-                    "version": "3.14.1",
-                    "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-                    "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-                    "dev": true,
-                    "requires": {
-                        "argparse": "^1.0.7",
-                        "esprima": "^4.0.0"
-                    }
-                },
-                "parse-json": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-                    "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
-                    "dev": true,
-                    "requires": {
-                        "error-ex": "^1.3.1",
-                        "json-parse-better-errors": "^1.0.1"
-                    }
-                },
-                "resolve-from": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-                    "integrity": "sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==",
-                    "dev": true
-                }
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "create-require": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-            "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-            "dev": true
+        "node_modules/@smithy/protocol-http": {
+            "version": "4.1.8",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "cross-spawn": {
-            "version": "7.0.3",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-            "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-            "requires": {
-                "path-key": "^3.1.0",
-                "shebang-command": "^2.0.0",
-                "which": "^2.0.1"
+        "node_modules/@smithy/querystring-builder": {
+            "version": "3.0.11",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-uri-escape": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "crypt": {
-            "version": "0.0.2",
-            "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
-            "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=",
-            "dev": true
+        "node_modules/@smithy/querystring-parser": {
+            "version": "3.0.11",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "css-loader": {
-            "version": "6.5.1",
-            "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.5.1.tgz",
-            "integrity": "sha512-gEy2w9AnJNnD9Kuo4XAP9VflW/ujKoS9c/syO+uWMlm5igc7LysKzPXaDoR2vroROkSwsTS2tGr1yGGEbZOYZQ==",
-            "dev": true,
-            "requires": {
-                "icss-utils": "^5.1.0",
-                "postcss": "^8.2.15",
-                "postcss-modules-extract-imports": "^3.0.0",
-                "postcss-modules-local-by-default": "^4.0.0",
-                "postcss-modules-scope": "^3.0.0",
-                "postcss-modules-values": "^4.0.0",
-                "postcss-value-parser": "^4.1.0",
-                "semver": "^7.3.5"
+        "node_modules/@smithy/service-error-classification": {
+            "version": "3.0.11",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "css-select": {
-            "version": "4.1.3",
-            "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz",
-            "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==",
-            "dev": true,
-            "requires": {
-                "boolbase": "^1.0.0",
-                "css-what": "^5.0.0",
-                "domhandler": "^4.2.0",
-                "domutils": "^2.6.0",
-                "nth-check": "^2.0.0"
+        "node_modules/@smithy/shared-ini-file-loader": {
+            "version": "3.1.12",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "css-what": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz",
-            "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==",
-            "dev": true
+        "node_modules/@smithy/signature-v4": {
+            "version": "4.2.4",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^3.0.0",
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-hex-encoding": "^3.0.0",
+                "@smithy/util-middleware": "^3.0.11",
+                "@smithy/util-uri-escape": "^3.0.0",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "cssesc": {
+        "node_modules/@smithy/signature-v4/node_modules/@smithy/is-array-buffer": {
             "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-            "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-            "dev": true
-        },
-        "csstype": {
-            "version": "2.6.20",
-            "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.20.tgz",
-            "integrity": "sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA=="
-        },
-        "cubic2quad": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/cubic2quad/-/cubic2quad-1.2.1.tgz",
-            "integrity": "sha512-wT5Y7mO8abrV16gnssKdmIhIbA9wSkeMzhh27jAguKrV82i24wER0vL5TGhUJ9dbJNDcigoRZ0IAHFEEEI4THQ==",
-            "dev": true
-        },
-        "d": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-            "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-            "dev": true,
-            "requires": {
-                "es5-ext": "^0.10.50",
-                "type": "^1.0.1"
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "debug": {
-            "version": "4.3.4",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-            "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-            "dev": true,
-            "requires": {
-                "ms": "2.1.2"
+        "node_modules/@smithy/signature-v4/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "decamelize": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
-            "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
-            "dev": true
-        },
-        "decamelize-keys": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
-            "integrity": "sha512-ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg==",
-            "dev": true,
-            "requires": {
-                "decamelize": "^1.1.0",
-                "map-obj": "^1.0.0"
-            },
+        "node_modules/@smithy/signature-v4/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "decamelize": {
-                    "version": "1.2.0",
-                    "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-                    "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-                    "dev": true
-                },
-                "map-obj": {
-                    "version": "1.0.1",
-                    "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-                    "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
-                    "dev": true
-                }
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "decompress-response": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-            "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-            "requires": {
-                "mimic-response": "^3.1.0"
-            },
+        "node_modules/@smithy/smithy-client": {
+            "version": "3.7.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "mimic-response": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-                    "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="
-                }
+                "@smithy/core": "^2.5.7",
+                "@smithy/middleware-endpoint": "^3.2.8",
+                "@smithy/middleware-stack": "^3.0.11",
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-stream": "^3.3.4",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "deep-extend": {
-            "version": "0.6.0",
-            "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-            "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-            "dev": true
-        },
-        "deep-is": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-            "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
+        "node_modules/@smithy/types": {
+            "version": "3.7.2",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "deepmerge": {
-            "version": "4.2.2",
-            "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-            "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-            "dev": true
+        "node_modules/@smithy/url-parser": {
+            "version": "3.0.11",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/querystring-parser": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            }
         },
-        "default-gateway": {
-            "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
-            "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
-            "dev": true,
-            "requires": {
-                "execa": "^5.0.0"
+        "node_modules/@smithy/util-base64": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^3.0.0",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
             },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@smithy/util-base64/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "execa": {
-                    "version": "5.1.1",
-                    "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-                    "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-                    "dev": true,
-                    "requires": {
-                        "cross-spawn": "^7.0.3",
-                        "get-stream": "^6.0.0",
-                        "human-signals": "^2.1.0",
-                        "is-stream": "^2.0.0",
-                        "merge-stream": "^2.0.0",
-                        "npm-run-path": "^4.0.1",
-                        "onetime": "^5.1.2",
-                        "signal-exit": "^3.0.3",
-                        "strip-final-newline": "^2.0.0"
-                    }
-                },
-                "get-stream": {
-                    "version": "6.0.1",
-                    "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-                    "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-                    "dev": true
-                },
-                "human-signals": {
-                    "version": "2.1.0",
-                    "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-                    "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-                    "dev": true
-                }
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "default-require-extensions": {
+        "node_modules/@smithy/util-base64/node_modules/@smithy/util-buffer-from": {
             "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.0.tgz",
-            "integrity": "sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==",
-            "dev": true,
-            "requires": {
-                "strip-bom": "^4.0.0"
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "defer-to-connect": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
-            "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="
+        "node_modules/@smithy/util-base64/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "define-lazy-prop": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-            "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
-            "dev": true
+        "node_modules/@smithy/util-body-length-browser": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            }
         },
-        "define-properties": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-            "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-            "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
+        "node_modules/@smithy/util-body-length-node": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "delegates": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-            "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-            "dev": true
-        },
-        "depd": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-            "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-            "dev": true
-        },
-        "destroy": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-            "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-            "dev": true
-        },
-        "detect-libc": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-            "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
-            "dev": true
-        },
-        "detect-node": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-            "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
-            "dev": true
+        "node_modules/@smithy/util-buffer-from": {
+            "version": "2.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^2.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
         },
-        "diff": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
-            "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
-            "dev": true
+        "node_modules/@smithy/util-config-provider": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "dir-glob": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-            "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-            "dev": true,
-            "requires": {
-                "path-type": "^4.0.0"
+        "node_modules/@smithy/util-defaults-mode-browser": {
+            "version": "3.0.34",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/property-provider": "^3.1.11",
+                "@smithy/smithy-client": "^3.7.0",
+                "@smithy/types": "^3.7.2",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">= 10.0.0"
             }
         },
-        "dns-equal": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-            "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==",
-            "dev": true
+        "node_modules/@smithy/util-defaults-mode-node": {
+            "version": "3.0.34",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/config-resolver": "^3.0.13",
+                "@smithy/credential-provider-imds": "^3.2.8",
+                "@smithy/node-config-provider": "^3.1.12",
+                "@smithy/property-provider": "^3.1.11",
+                "@smithy/smithy-client": "^3.7.0",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">= 10.0.0"
+            }
         },
-        "dns-packet": {
-            "version": "5.4.0",
-            "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.4.0.tgz",
-            "integrity": "sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==",
-            "dev": true,
-            "requires": {
-                "@leichtgewicht/ip-codec": "^2.0.1"
+        "node_modules/@smithy/util-endpoints": {
+            "version": "2.1.7",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^3.1.12",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "doctrine": {
+        "node_modules/@smithy/util-hex-encoding": {
             "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-            "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-            "dev": true,
-            "requires": {
-                "esutils": "^2.0.2"
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "dom-serializer": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
-            "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
-            "dev": true,
-            "requires": {
-                "domelementtype": "^2.0.1",
-                "domhandler": "^4.2.0",
-                "entities": "^2.0.0"
+        "node_modules/@smithy/util-middleware": {
+            "version": "3.0.11",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "domelementtype": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-            "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
-            "dev": true
-        },
-        "domhandler": {
-            "version": "4.2.2",
-            "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz",
-            "integrity": "sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w==",
-            "dev": true,
-            "requires": {
-                "domelementtype": "^2.2.0"
+        "node_modules/@smithy/util-retry": {
+            "version": "3.0.11",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/service-error-classification": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "domutils": {
-            "version": "2.8.0",
-            "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-            "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-            "dev": true,
-            "requires": {
-                "dom-serializer": "^1.0.1",
-                "domelementtype": "^2.2.0",
-                "domhandler": "^4.2.0"
+        "node_modules/@smithy/util-stream": {
+            "version": "3.3.4",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/fetch-http-handler": "^4.1.3",
+                "@smithy/node-http-handler": "^3.3.3",
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-buffer-from": "^3.0.0",
+                "@smithy/util-hex-encoding": "^3.0.0",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "duplexer": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-            "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
-            "dev": true
-        },
-        "duplexer2": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
-            "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
-            "dev": true,
-            "requires": {
-                "readable-stream": "^2.0.2"
-            },
-            "dependencies": {
-                "readable-stream": {
-                    "version": "2.3.7",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-                    "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-                    "dev": true,
-                    "requires": {
-                        "core-util-is": "~1.0.0",
-                        "inherits": "~2.0.3",
-                        "isarray": "~1.0.0",
-                        "process-nextick-args": "~2.0.0",
-                        "safe-buffer": "~5.1.1",
-                        "string_decoder": "~1.1.1",
-                        "util-deprecate": "~1.0.1"
-                    }
-                },
-                "safe-buffer": {
-                    "version": "5.1.2",
-                    "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-                    "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-                    "dev": true
-                },
-                "string_decoder": {
-                    "version": "1.1.1",
-                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-                    "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-                    "dev": true,
-                    "requires": {
-                        "safe-buffer": "~5.1.0"
-                    }
-                }
+        "node_modules/@smithy/util-stream/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "ee-first": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-            "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
-            "dev": true
-        },
-        "electron-to-chromium": {
-            "version": "1.4.86",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.86.tgz",
-            "integrity": "sha512-EVTZ+igi8x63pK4bPuA95PXIs2b2Cowi3WQwI9f9qManLiZJOD1Lash1J3W4TvvcUCcIR4o/rgi9o8UicXSO+w==",
-            "dev": true
-        },
-        "emoji-regex": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-            "dev": true
+        "node_modules/@smithy/util-stream/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "emojis-list": {
+        "node_modules/@smithy/util-stream/node_modules/@smithy/util-utf8": {
             "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-            "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-            "dev": true
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "enabled": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz",
-            "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="
+        "node_modules/@smithy/util-uri-escape": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "encodeurl": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-            "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
-            "dev": true
+        "node_modules/@smithy/util-utf8": {
+            "version": "2.3.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^2.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
         },
-        "end-of-stream": {
-            "version": "1.4.4",
-            "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-            "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-            "requires": {
-                "once": "^1.4.0"
+        "node_modules/@smithy/util-waiter": {
+            "version": "3.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/abort-controller": "^3.1.9",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "enhanced-resolve": {
-            "version": "5.8.3",
-            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz",
-            "integrity": "sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==",
+        "node_modules/@stylistic/eslint-plugin": {
+            "version": "2.11.0",
             "dev": true,
-            "requires": {
-                "graceful-fs": "^4.2.4",
-                "tapable": "^2.2.0"
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/utils": "^8.13.0",
+                "eslint-visitor-keys": "^4.2.0",
+                "espree": "^10.3.0",
+                "estraverse": "^5.3.0",
+                "picomatch": "^4.0.2"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "peerDependencies": {
+                "eslint": ">=8.40.0"
             }
         },
-        "entities": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-            "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-            "dev": true
-        },
-        "envinfo": {
-            "version": "7.8.1",
-            "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
-            "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
-            "dev": true
-        },
-        "error-ex": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-            "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+        "node_modules/@stylistic/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
+            "version": "8.16.0",
             "dev": true,
-            "requires": {
-                "is-arrayish": "^0.2.1"
-            },
+            "license": "MIT",
             "dependencies": {
-                "is-arrayish": {
-                    "version": "0.2.1",
-                    "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-                    "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-                    "dev": true
-                }
+                "@typescript-eslint/types": "8.16.0",
+                "@typescript-eslint/visitor-keys": "8.16.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
             }
         },
-        "es-abstract": {
-            "version": "1.20.2",
-            "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.2.tgz",
-            "integrity": "sha512-XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ==",
-            "requires": {
-                "call-bind": "^1.0.2",
-                "es-to-primitive": "^1.2.1",
-                "function-bind": "^1.1.1",
-                "function.prototype.name": "^1.1.5",
-                "get-intrinsic": "^1.1.2",
-                "get-symbol-description": "^1.0.0",
-                "has": "^1.0.3",
-                "has-property-descriptors": "^1.0.0",
-                "has-symbols": "^1.0.3",
-                "internal-slot": "^1.0.3",
-                "is-callable": "^1.2.4",
-                "is-negative-zero": "^2.0.2",
-                "is-regex": "^1.1.4",
-                "is-shared-array-buffer": "^1.0.2",
-                "is-string": "^1.0.7",
-                "is-weakref": "^1.0.2",
-                "object-inspect": "^1.12.2",
-                "object-keys": "^1.1.1",
-                "object.assign": "^4.1.4",
-                "regexp.prototype.flags": "^1.4.3",
-                "string.prototype.trimend": "^1.0.5",
-                "string.prototype.trimstart": "^1.0.5",
-                "unbox-primitive": "^1.0.2"
+        "node_modules/@stylistic/eslint-plugin/node_modules/@typescript-eslint/types": {
+            "version": "8.16.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
             }
         },
-        "es-module-lexer": {
-            "version": "0.9.3",
-            "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
-            "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
-            "dev": true
-        },
-        "es-to-primitive": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-            "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-            "requires": {
-                "is-callable": "^1.1.4",
-                "is-date-object": "^1.0.1",
-                "is-symbol": "^1.0.2"
+        "node_modules/@stylistic/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
+            "version": "8.16.0",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "@typescript-eslint/types": "8.16.0",
+                "@typescript-eslint/visitor-keys": "8.16.0",
+                "debug": "^4.3.4",
+                "fast-glob": "^3.3.2",
+                "is-glob": "^4.0.3",
+                "minimatch": "^9.0.4",
+                "semver": "^7.6.0",
+                "ts-api-utils": "^1.3.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
             }
         },
-        "es5-ext": {
-            "version": "0.10.62",
-            "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz",
-            "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==",
+        "node_modules/@stylistic/eslint-plugin/node_modules/@typescript-eslint/utils": {
+            "version": "8.16.0",
             "dev": true,
-            "requires": {
-                "es6-iterator": "^2.0.3",
-                "es6-symbol": "^3.1.3",
-                "next-tick": "^1.1.0"
+            "license": "MIT",
+            "dependencies": {
+                "@eslint-community/eslint-utils": "^4.4.0",
+                "@typescript-eslint/scope-manager": "8.16.0",
+                "@typescript-eslint/types": "8.16.0",
+                "@typescript-eslint/typescript-estree": "8.16.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^8.57.0 || ^9.0.0"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
             }
         },
-        "es6-error": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
-            "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
-            "dev": true
-        },
-        "es6-iterator": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-            "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
+        "node_modules/@stylistic/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
+            "version": "8.16.0",
             "dev": true,
-            "requires": {
-                "d": "1",
-                "es5-ext": "^0.10.35",
-                "es6-symbol": "^3.1.1"
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/types": "8.16.0",
+                "eslint-visitor-keys": "^4.2.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
             }
         },
-        "es6-promise": {
-            "version": "4.2.8",
-            "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
-            "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
-        },
-        "es6-promisify": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
-            "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
-            "requires": {
-                "es6-promise": "^4.0.3"
+        "node_modules/@stylistic/eslint-plugin/node_modules/brace-expansion": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0"
             }
         },
-        "es6-symbol": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-            "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+        "node_modules/@stylistic/eslint-plugin/node_modules/eslint-visitor-keys": {
+            "version": "4.2.0",
             "dev": true,
-            "requires": {
-                "d": "^1.0.1",
-                "ext": "^1.1.2"
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
             }
         },
-        "es6-weak-map": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
-            "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
+        "node_modules/@stylistic/eslint-plugin/node_modules/espree": {
+            "version": "10.3.0",
             "dev": true,
-            "requires": {
-                "d": "1",
-                "es5-ext": "^0.10.46",
-                "es6-iterator": "^2.0.3",
-                "es6-symbol": "^3.1.1"
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "acorn": "^8.14.0",
+                "acorn-jsx": "^5.3.2",
+                "eslint-visitor-keys": "^4.2.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
             }
         },
-        "esbuild": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.13.tgz",
-            "integrity": "sha512-Cu3SC84oyzzhrK/YyN4iEVy2jZu5t2fz66HEOShHURcjSkOSAVL8C/gfUT+lDJxkVHpg8GZ10DD0rMHRPqMFaQ==",
+        "node_modules/@stylistic/eslint-plugin/node_modules/estraverse": {
+            "version": "5.3.0",
             "dev": true,
-            "requires": {
-                "@esbuild/android-arm": "0.15.13",
-                "@esbuild/linux-loong64": "0.15.13",
-                "esbuild-android-64": "0.15.13",
-                "esbuild-android-arm64": "0.15.13",
-                "esbuild-darwin-64": "0.15.13",
-                "esbuild-darwin-arm64": "0.15.13",
-                "esbuild-freebsd-64": "0.15.13",
-                "esbuild-freebsd-arm64": "0.15.13",
-                "esbuild-linux-32": "0.15.13",
-                "esbuild-linux-64": "0.15.13",
-                "esbuild-linux-arm": "0.15.13",
-                "esbuild-linux-arm64": "0.15.13",
-                "esbuild-linux-mips64le": "0.15.13",
-                "esbuild-linux-ppc64le": "0.15.13",
-                "esbuild-linux-riscv64": "0.15.13",
-                "esbuild-linux-s390x": "0.15.13",
-                "esbuild-netbsd-64": "0.15.13",
-                "esbuild-openbsd-64": "0.15.13",
-                "esbuild-sunos-64": "0.15.13",
-                "esbuild-windows-32": "0.15.13",
-                "esbuild-windows-64": "0.15.13",
-                "esbuild-windows-arm64": "0.15.13"
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=4.0"
             }
         },
-        "esbuild-android-64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.13.tgz",
-            "integrity": "sha512-yRorukXBlokwTip+Sy4MYskLhJsO0Kn0/Fj43s1krVblfwP+hMD37a4Wmg139GEsMLl+vh8WXp2mq/cTA9J97g==",
+        "node_modules/@stylistic/eslint-plugin/node_modules/minimatch": {
+            "version": "9.0.5",
             "dev": true,
-            "optional": true
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
         },
-        "esbuild-android-arm64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.13.tgz",
-            "integrity": "sha512-TKzyymLD6PiVeyYa4c5wdPw87BeAiTXNtK6amWUcXZxkV51gOk5u5qzmDaYSwiWeecSNHamFsaFjLoi32QR5/w==",
+        "node_modules/@stylistic/eslint-plugin/node_modules/picomatch": {
+            "version": "4.0.2",
             "dev": true,
-            "optional": true
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
+            }
         },
-        "esbuild-darwin-64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.13.tgz",
-            "integrity": "sha512-WAx7c2DaOS6CrRcoYCgXgkXDliLnFv3pQLV6GeW1YcGEZq2Gnl8s9Pg7ahValZkpOa0iE/ojRVQ87sbUhF1Cbg==",
-            "dev": true,
-            "optional": true
+        "node_modules/@svgdotjs/svg.js": {
+            "version": "3.2.4",
+            "resolved": "https://registry.npmjs.org/@svgdotjs/svg.js/-/svg.js-3.2.4.tgz",
+            "integrity": "sha512-BjJ/7vWNowlX3Z8O4ywT58DqbNRyYlkk6Yz/D13aB7hGmfQTvGX4Tkgtm/ApYlu9M7lCQi15xUEidqMUmdMYwg==",
+            "license": "MIT",
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/Fuzzyma"
+            }
         },
-        "esbuild-darwin-arm64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.13.tgz",
-            "integrity": "sha512-U6jFsPfSSxC3V1CLiQqwvDuj3GGrtQNB3P3nNC3+q99EKf94UGpsG9l4CQ83zBs1NHrk1rtCSYT0+KfK5LsD8A==",
-            "dev": true,
-            "optional": true
+        "node_modules/@swc/helpers": {
+            "version": "0.5.17",
+            "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.17.tgz",
+            "integrity": "sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.8.0"
+            }
         },
-        "esbuild-freebsd-64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.13.tgz",
-            "integrity": "sha512-whItJgDiOXaDG/idy75qqevIpZjnReZkMGCgQaBWZuKHoElDJC1rh7MpoUgupMcdfOd+PgdEwNQW9DAE6i8wyA==",
-            "dev": true,
-            "optional": true
+        "node_modules/@szmarczak/http-timer": {
+            "version": "4.0.6",
+            "license": "MIT",
+            "dependencies": {
+                "defer-to-connect": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
         },
-        "esbuild-freebsd-arm64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.13.tgz",
-            "integrity": "sha512-6pCSWt8mLUbPtygv7cufV0sZLeylaMwS5Fznj6Rsx9G2AJJsAjQ9ifA+0rQEIg7DwJmi9it+WjzNTEAzzdoM3Q==",
+        "node_modules/@tootallnate/once": {
+            "version": "1.1.2",
             "dev": true,
-            "optional": true
+            "license": "MIT",
+            "engines": {
+                "node": ">= 6"
+            }
         },
-        "esbuild-linux-32": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.13.tgz",
-            "integrity": "sha512-VbZdWOEdrJiYApm2kkxoTOgsoCO1krBZ3quHdYk3g3ivWaMwNIVPIfEE0f0XQQ0u5pJtBsnk2/7OPiCFIPOe/w==",
+        "node_modules/@ts-morph/common": {
+            "version": "0.24.0",
             "dev": true,
-            "optional": true
+            "license": "MIT",
+            "dependencies": {
+                "fast-glob": "^3.3.2",
+                "minimatch": "^9.0.4",
+                "mkdirp": "^3.0.1",
+                "path-browserify": "^1.0.1"
+            }
         },
-        "esbuild-linux-64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.13.tgz",
-            "integrity": "sha512-rXmnArVNio6yANSqDQlIO4WiP+Cv7+9EuAHNnag7rByAqFVuRusLbGi2697A5dFPNXoO//IiogVwi3AdcfPC6A==",
+        "node_modules/@ts-morph/common/node_modules/brace-expansion": {
+            "version": "2.0.1",
             "dev": true,
-            "optional": true
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0"
+            }
         },
-        "esbuild-linux-arm": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.13.tgz",
-            "integrity": "sha512-Ac6LpfmJO8WhCMQmO253xX2IU2B3wPDbl4IvR0hnqcPrdfCaUa2j/lLMGTjmQ4W5JsJIdHEdW12dG8lFS0MbxQ==",
+        "node_modules/@ts-morph/common/node_modules/minimatch": {
+            "version": "9.0.5",
             "dev": true,
-            "optional": true
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
         },
-        "esbuild-linux-arm64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.13.tgz",
-            "integrity": "sha512-alEMGU4Z+d17U7KQQw2IV8tQycO6T+rOrgW8OS22Ua25x6kHxoG6Ngry6Aq6uranC+pNWNMB6aHFPh7aTQdORQ==",
+        "node_modules/@ts-morph/common/node_modules/mkdirp": {
+            "version": "3.0.1",
             "dev": true,
-            "optional": true
+            "license": "MIT",
+            "bin": {
+                "mkdirp": "dist/cjs/src/bin.js"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
         },
-        "esbuild-linux-mips64le": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.13.tgz",
-            "integrity": "sha512-47PgmyYEu+yN5rD/MbwS6DxP2FSGPo4Uxg5LwIdxTiyGC2XKwHhHyW7YYEDlSuXLQXEdTO7mYe8zQ74czP7W8A==",
+        "node_modules/@tsconfig/node10": {
+            "version": "1.0.8",
             "dev": true,
-            "optional": true
+            "license": "MIT"
         },
-        "esbuild-linux-ppc64le": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.13.tgz",
-            "integrity": "sha512-z6n28h2+PC1Ayle9DjKoBRcx/4cxHoOa2e689e2aDJSaKug3jXcQw7mM+GLg+9ydYoNzj8QxNL8ihOv/OnezhA==",
+        "node_modules/@tsconfig/node12": {
+            "version": "1.0.9",
             "dev": true,
-            "optional": true
+            "license": "MIT"
         },
-        "esbuild-linux-riscv64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.13.tgz",
-            "integrity": "sha512-+Lu4zuuXuQhgLUGyZloWCqTslcCAjMZH1k3Xc9MSEJEpEFdpsSU0sRDXAnk18FKOfEjhu4YMGaykx9xjtpA6ow==",
+        "node_modules/@tsconfig/node14": {
+            "version": "1.0.3",
             "dev": true,
-            "optional": true
+            "license": "MIT"
         },
-        "esbuild-linux-s390x": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.13.tgz",
-            "integrity": "sha512-BMeXRljruf7J0TMxD5CIXS65y7puiZkAh+s4XFV9qy16SxOuMhxhVIXYLnbdfLrsYGFzx7U9mcdpFWkkvy/Uag==",
+        "node_modules/@tsconfig/node16": {
+            "version": "1.0.2",
             "dev": true,
-            "optional": true
+            "license": "MIT"
         },
-        "esbuild-loader": {
-            "version": "2.20.0",
-            "resolved": "https://registry.npmjs.org/esbuild-loader/-/esbuild-loader-2.20.0.tgz",
-            "integrity": "sha512-dr+j8O4w5RvqZ7I4PPB4EIyVTd679EBQnMm+JBB7av+vu05Zpje2IpK5N3ld1VWa+WxrInIbNFAg093+E1aRsA==",
+        "node_modules/@types/adm-zip": {
+            "version": "0.4.34",
             "dev": true,
-            "requires": {
-                "esbuild": "^0.15.6",
-                "joycon": "^3.0.1",
-                "json5": "^2.2.0",
-                "loader-utils": "^2.0.0",
-                "tapable": "^2.2.0",
-                "webpack-sources": "^2.2.0"
+            "license": "MIT",
+            "dependencies": {
+                "@types/node": "*"
             }
         },
-        "esbuild-netbsd-64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.13.tgz",
-            "integrity": "sha512-EHj9QZOTel581JPj7UO3xYbltFTYnHy+SIqJVq6yd3KkCrsHRbapiPb0Lx3EOOtybBEE9EyqbmfW1NlSDsSzvQ==",
+        "node_modules/@types/async-lock": {
+            "version": "1.4.0",
             "dev": true,
-            "optional": true
+            "license": "MIT"
         },
-        "esbuild-openbsd-64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.13.tgz",
-            "integrity": "sha512-nkuDlIjF/sfUhfx8SKq0+U+Fgx5K9JcPq1mUodnxI0x4kBdCv46rOGWbuJ6eof2n3wdoCLccOoJAbg9ba/bT2w==",
+        "node_modules/@types/body-parser": {
+            "version": "1.19.2",
             "dev": true,
-            "optional": true
+            "license": "MIT",
+            "dependencies": {
+                "@types/connect": "*",
+                "@types/node": "*"
+            }
         },
-        "esbuild-sunos-64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.13.tgz",
-            "integrity": "sha512-jVeu2GfxZQ++6lRdY43CS0Tm/r4WuQQ0Pdsrxbw+aOrHQPHV0+LNOLnvbN28M7BSUGnJnHkHm2HozGgNGyeIRw==",
+        "node_modules/@types/bonjour": {
+            "version": "3.5.10",
             "dev": true,
-            "optional": true
+            "license": "MIT",
+            "dependencies": {
+                "@types/node": "*"
+            }
         },
-        "esbuild-windows-32": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.13.tgz",
-            "integrity": "sha512-XoF2iBf0wnqo16SDq+aDGi/+QbaLFpkiRarPVssMh9KYbFNCqPLlGAWwDvxEVz+ywX6Si37J2AKm+AXq1kC0JA==",
+        "node_modules/@types/bytes": {
+            "version": "3.1.1",
             "dev": true,
-            "optional": true
+            "license": "MIT"
         },
-        "esbuild-windows-64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.13.tgz",
-            "integrity": "sha512-Et6htEfGycjDrtqb2ng6nT+baesZPYQIW+HUEHK4D1ncggNrDNk3yoboYQ5KtiVrw/JaDMNttz8rrPubV/fvPQ==",
-            "dev": true,
-            "optional": true
+        "node_modules/@types/cacheable-request": {
+            "version": "6.0.2",
+            "license": "MIT",
+            "dependencies": {
+                "@types/http-cache-semantics": "*",
+                "@types/keyv": "*",
+                "@types/node": "*",
+                "@types/responselike": "*"
+            }
         },
-        "esbuild-windows-arm64": {
-            "version": "0.15.13",
-            "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.13.tgz",
-            "integrity": "sha512-3bv7tqntThQC9SWLRouMDmZnlOukBhOCTlkzNqzGCmrkCJI7io5LLjwJBOVY6kOUlIvdxbooNZwjtBvj+7uuVg==",
+        "node_modules/@types/circular-dependency-plugin": {
+            "version": "5.0.8",
             "dev": true,
-            "optional": true
-        },
-        "escalade": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-            "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
-            "dev": true
-        },
-        "escape-html": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-            "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-            "dev": true
-        },
-        "escape-string-regexp": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-            "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-            "dev": true
+            "license": "MIT",
+            "dependencies": {
+                "@types/node": "*",
+                "webpack": "^5.1.0"
+            }
         },
-        "eslint": {
-            "version": "8.26.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.26.0.tgz",
-            "integrity": "sha512-kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg==",
+        "node_modules/@types/connect": {
+            "version": "3.4.35",
             "dev": true,
-            "requires": {
-                "@eslint/eslintrc": "^1.3.3",
-                "@humanwhocodes/config-array": "^0.11.6",
-                "@humanwhocodes/module-importer": "^1.0.1",
-                "@nodelib/fs.walk": "^1.2.8",
-                "ajv": "^6.10.0",
-                "chalk": "^4.0.0",
-                "cross-spawn": "^7.0.2",
-                "debug": "^4.3.2",
-                "doctrine": "^3.0.0",
-                "escape-string-regexp": "^4.0.0",
-                "eslint-scope": "^7.1.1",
-                "eslint-utils": "^3.0.0",
-                "eslint-visitor-keys": "^3.3.0",
-                "espree": "^9.4.0",
-                "esquery": "^1.4.0",
-                "esutils": "^2.0.2",
-                "fast-deep-equal": "^3.1.3",
-                "file-entry-cache": "^6.0.1",
-                "find-up": "^5.0.0",
-                "glob-parent": "^6.0.2",
-                "globals": "^13.15.0",
-                "grapheme-splitter": "^1.0.4",
-                "ignore": "^5.2.0",
-                "import-fresh": "^3.0.0",
-                "imurmurhash": "^0.1.4",
-                "is-glob": "^4.0.0",
-                "is-path-inside": "^3.0.3",
-                "js-sdsl": "^4.1.4",
-                "js-yaml": "^4.1.0",
-                "json-stable-stringify-without-jsonify": "^1.0.1",
-                "levn": "^0.4.1",
-                "lodash.merge": "^4.6.2",
-                "minimatch": "^3.1.2",
-                "natural-compare": "^1.4.0",
-                "optionator": "^0.9.1",
-                "regexpp": "^3.2.0",
-                "strip-ansi": "^6.0.1",
-                "strip-json-comments": "^3.1.0",
-                "text-table": "^0.2.0"
-            },
+            "license": "MIT",
             "dependencies": {
-                "ansi-regex": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-                    "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-                    "dev": true
-                },
-                "eslint-scope": {
-                    "version": "7.1.1",
-                    "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-                    "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-                    "dev": true,
-                    "requires": {
-                        "esrecurse": "^4.3.0",
-                        "estraverse": "^5.2.0"
-                    }
-                },
-                "eslint-visitor-keys": {
-                    "version": "3.3.0",
-                    "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-                    "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-                    "dev": true
-                },
-                "estraverse": {
-                    "version": "5.3.0",
-                    "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-                    "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-                    "dev": true
-                },
-                "glob-parent": {
-                    "version": "6.0.2",
-                    "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-                    "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-                    "dev": true,
-                    "requires": {
-                        "is-glob": "^4.0.3"
-                    }
-                },
-                "strip-ansi": {
-                    "version": "6.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-                    "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^5.0.1"
-                    }
-                }
+                "@types/node": "*"
             }
         },
-        "eslint-config-prettier": {
-            "version": "8.3.0",
-            "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz",
-            "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==",
+        "node_modules/@types/connect-history-api-fallback": {
+            "version": "1.3.5",
             "dev": true,
-            "requires": {}
+            "license": "MIT",
+            "dependencies": {
+                "@types/express-serve-static-core": "*",
+                "@types/node": "*"
+            }
         },
-        "eslint-plugin-header": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-header/-/eslint-plugin-header-3.1.1.tgz",
-            "integrity": "sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg==",
+        "node_modules/@types/cross-spawn": {
+            "version": "6.0.6",
             "dev": true,
-            "requires": {}
+            "license": "MIT",
+            "dependencies": {
+                "@types/node": "*"
+            }
         },
-        "eslint-plugin-no-null": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-no-null/-/eslint-plugin-no-null-1.0.2.tgz",
-            "integrity": "sha512-uRDiz88zCO/2rzGfgG15DBjNsgwWtWiSo4Ezy7zzajUgpnFIqd1TjepKeRmJZHEfBGu58o2a8S0D7vglvvhkVA==",
+        "node_modules/@types/diff": {
+            "version": "5.0.7",
             "dev": true,
-            "requires": {}
+            "license": "MIT"
         },
-        "eslint-scope": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-            "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+        "node_modules/@types/eslint": {
+            "version": "8.56.12",
+            "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.12.tgz",
+            "integrity": "sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==",
             "dev": true,
-            "requires": {
-                "esrecurse": "^4.3.0",
-                "estraverse": "^4.1.1"
+            "license": "MIT",
+            "dependencies": {
+                "@types/estree": "*",
+                "@types/json-schema": "*"
             }
         },
-        "eslint-utils": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-            "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+        "node_modules/@types/estree": {
+            "version": "1.0.5",
             "dev": true,
-            "requires": {
-                "eslint-visitor-keys": "^2.0.0"
-            }
+            "license": "MIT"
         },
-        "eslint-visitor-keys": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-            "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-            "dev": true
-        },
-        "espree": {
-            "version": "9.4.0",
-            "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
-            "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
+        "node_modules/@types/express": {
+            "version": "4.17.13",
             "dev": true,
-            "requires": {
-                "acorn": "^8.8.0",
-                "acorn-jsx": "^5.3.2",
-                "eslint-visitor-keys": "^3.3.0"
-            },
+            "license": "MIT",
             "dependencies": {
-                "eslint-visitor-keys": {
-                    "version": "3.3.0",
-                    "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-                    "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-                    "dev": true
-                }
+                "@types/body-parser": "*",
+                "@types/express-serve-static-core": "^4.17.18",
+                "@types/qs": "*",
+                "@types/serve-static": "*"
             }
         },
-        "esprima": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-            "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
-        },
-        "esquery": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-            "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+        "node_modules/@types/express-serve-static-core": {
+            "version": "4.17.28",
             "dev": true,
-            "requires": {
-                "estraverse": "^5.1.0"
-            },
+            "license": "MIT",
             "dependencies": {
-                "estraverse": {
-                    "version": "5.2.0",
-                    "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-                    "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-                    "dev": true
-                }
+                "@types/node": "*",
+                "@types/qs": "*",
+                "@types/range-parser": "*"
             }
         },
-        "esrecurse": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-            "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+        "node_modules/@types/glob": {
+            "version": "8.1.0",
             "dev": true,
-            "requires": {
-                "estraverse": "^5.2.0"
-            },
+            "license": "MIT",
             "dependencies": {
-                "estraverse": {
-                    "version": "5.2.0",
-                    "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-                    "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-                    "dev": true
-                }
+                "@types/minimatch": "^5.1.2",
+                "@types/node": "*"
             }
         },
-        "estraverse": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-            "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-            "dev": true
-        },
-        "estree-walker": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-            "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
+        "node_modules/@types/glob/node_modules/@types/minimatch": {
+            "version": "5.1.2",
+            "dev": true,
+            "license": "MIT"
         },
-        "esutils": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-            "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-            "dev": true
+        "node_modules/@types/he": {
+            "version": "1.2.3",
+            "dev": true,
+            "license": "MIT"
         },
-        "etag": {
-            "version": "1.8.1",
-            "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-            "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
-            "dev": true
+        "node_modules/@types/http-cache-semantics": {
+            "version": "4.0.1",
+            "license": "MIT"
         },
-        "event-emitter": {
-            "version": "0.3.5",
-            "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
-            "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==",
+        "node_modules/@types/http-proxy": {
+            "version": "1.17.9",
             "dev": true,
-            "requires": {
-                "d": "1",
-                "es5-ext": "~0.10.14"
+            "license": "MIT",
+            "dependencies": {
+                "@types/node": "*"
             }
         },
-        "event-stream": {
-            "version": "3.3.5",
-            "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.5.tgz",
-            "integrity": "sha512-vyibDcu5JL20Me1fP734QBH/kenBGLZap2n0+XXM7mvuUPzJ20Ydqj1aKcIeMdri1p+PU+4yAKugjN8KCVst+g==",
+        "node_modules/@types/istanbul-lib-coverage": {
+            "version": "2.0.6",
             "dev": true,
-            "requires": {
-                "duplexer": "^0.1.1",
-                "from": "^0.1.7",
-                "map-stream": "0.0.7",
-                "pause-stream": "^0.0.11",
-                "split": "^1.0.1",
-                "stream-combiner": "^0.2.2",
-                "through": "^2.3.8"
-            }
-        },
-        "eventemitter3": {
-            "version": "4.0.7",
-            "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-            "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-            "dev": true
-        },
-        "events": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-            "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ="
+            "license": "MIT"
         },
-        "execa": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
-            "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
+        "node_modules/@types/jaro-winkler": {
+            "version": "0.2.4",
+            "resolved": "https://registry.npmjs.org/@types/jaro-winkler/-/jaro-winkler-0.2.4.tgz",
+            "integrity": "sha512-TNVu6vL0Z3h+hYcW78IRloINA0y0MTVJ1PFVtVpBSgk+ejmaH5aVfcVghzNXZ0fa6gXe4zapNMQtMGWOJKTLig==",
             "dev": true,
-            "requires": {
-                "cross-spawn": "^7.0.0",
-                "get-stream": "^5.0.0",
-                "human-signals": "^1.1.1",
-                "is-stream": "^2.0.0",
-                "merge-stream": "^2.0.0",
-                "npm-run-path": "^4.0.0",
-                "onetime": "^5.1.0",
-                "signal-exit": "^3.0.2",
-                "strip-final-newline": "^2.0.0"
-            }
+            "license": "MIT"
         },
-        "expand-template": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
-            "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
-            "dev": true
+        "node_modules/@types/js-yaml": {
+            "version": "4.0.5",
+            "dev": true,
+            "license": "MIT"
         },
-        "express": {
-            "version": "4.18.1",
-            "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz",
-            "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==",
+        "node_modules/@types/jsdom": {
+            "version": "21.1.6",
             "dev": true,
-            "requires": {
-                "accepts": "~1.3.8",
-                "array-flatten": "1.1.1",
-                "body-parser": "1.20.0",
-                "content-disposition": "0.5.4",
-                "content-type": "~1.0.4",
-                "cookie": "0.5.0",
-                "cookie-signature": "1.0.6",
-                "debug": "2.6.9",
-                "depd": "2.0.0",
-                "encodeurl": "~1.0.2",
-                "escape-html": "~1.0.3",
-                "etag": "~1.8.1",
-                "finalhandler": "1.2.0",
-                "fresh": "0.5.2",
-                "http-errors": "2.0.0",
-                "merge-descriptors": "1.0.1",
-                "methods": "~1.1.2",
-                "on-finished": "2.4.1",
-                "parseurl": "~1.3.3",
-                "path-to-regexp": "0.1.7",
-                "proxy-addr": "~2.0.7",
-                "qs": "6.10.3",
-                "range-parser": "~1.2.1",
-                "safe-buffer": "5.2.1",
-                "send": "0.18.0",
-                "serve-static": "1.15.0",
-                "setprototypeof": "1.2.0",
-                "statuses": "2.0.1",
-                "type-is": "~1.6.18",
-                "utils-merge": "1.0.1",
-                "vary": "~1.1.2"
-            },
+            "license": "MIT",
             "dependencies": {
-                "array-flatten": {
-                    "version": "1.1.1",
-                    "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-                    "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
-                    "dev": true
-                },
-                "debug": {
-                    "version": "2.6.9",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "2.0.0"
-                    }
-                },
-                "depd": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-                    "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-                    "dev": true
-                },
-                "ms": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-                    "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-                    "dev": true
-                },
-                "path-to-regexp": {
-                    "version": "0.1.7",
-                    "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-                    "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
-                    "dev": true
-                },
-                "statuses": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-                    "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-                    "dev": true
-                }
+                "@types/node": "*",
+                "@types/tough-cookie": "*",
+                "parse5": "^7.0.0"
             }
         },
-        "ext": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz",
-            "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==",
+        "node_modules/@types/json-schema": {
+            "version": "7.0.15",
             "dev": true,
-            "requires": {
-                "type": "^2.5.0"
-            },
+            "license": "MIT"
+        },
+        "node_modules/@types/keyv": {
+            "version": "3.1.3",
+            "license": "MIT",
             "dependencies": {
-                "type": {
-                    "version": "2.7.2",
-                    "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz",
-                    "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==",
-                    "dev": true
-                }
+                "@types/node": "*"
             }
         },
-        "fancy-log": {
-            "version": "1.3.3",
-            "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
-            "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
+        "node_modules/@types/linkify-it": {
+            "version": "3.0.3",
             "dev": true,
-            "requires": {
-                "ansi-gray": "^0.1.1",
-                "color-support": "^1.1.3",
-                "parse-node-version": "^1.0.0",
-                "time-stamp": "^1.0.0"
-            }
+            "license": "MIT"
         },
-        "fast-deep-equal": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-            "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-            "dev": true
+        "node_modules/@types/lodash": {
+            "version": "4.14.182",
+            "dev": true,
+            "license": "MIT"
         },
-        "fast-glob": {
-            "version": "3.2.12",
-            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-            "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+        "node_modules/@types/lokijs": {
+            "version": "1.5.14",
             "dev": true,
-            "requires": {
-                "@nodelib/fs.stat": "^2.0.2",
-                "@nodelib/fs.walk": "^1.2.3",
-                "glob-parent": "^5.1.2",
-                "merge2": "^1.3.0",
-                "micromatch": "^4.0.4"
+            "license": "MIT"
+        },
+        "node_modules/@types/markdown-it": {
+            "version": "13.0.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/linkify-it": "*",
+                "@types/mdurl": "*"
             }
         },
-        "fast-json-patch": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-3.1.1.tgz",
-            "integrity": "sha512-vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ=="
+        "node_modules/@types/mdurl": {
+            "version": "1.0.3",
+            "dev": true,
+            "license": "MIT"
         },
-        "fast-json-stable-stringify": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-            "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-            "dev": true
+        "node_modules/@types/mime": {
+            "version": "1.3.2",
+            "dev": true,
+            "license": "MIT"
         },
-        "fast-levenshtein": {
-            "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-            "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-            "dev": true
+        "node_modules/@types/mime-types": {
+            "version": "2.1.4",
+            "dev": true,
+            "license": "MIT"
         },
-        "fastest-levenshtein": {
-            "version": "1.0.12",
-            "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
-            "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
-            "dev": true
+        "node_modules/@types/minimatch": {
+            "version": "3.0.5",
+            "dev": true,
+            "license": "MIT"
         },
-        "fastq": {
-            "version": "1.13.0",
-            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-            "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+        "node_modules/@types/minimist": {
+            "version": "1.2.2",
             "dev": true,
-            "requires": {
-                "reusify": "^1.0.4"
-            }
+            "license": "MIT"
         },
-        "faye-websocket": {
-            "version": "0.11.4",
-            "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-            "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
+        "node_modules/@types/mocha": {
+            "version": "10.0.6",
             "dev": true,
-            "requires": {
-                "websocket-driver": ">=0.5.1"
+            "license": "MIT"
+        },
+        "node_modules/@types/node": {
+            "version": "22.8.4",
+            "license": "MIT",
+            "dependencies": {
+                "undici-types": "~6.19.8"
             }
         },
-        "fd-slicer": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-            "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+        "node_modules/@types/node-fetch": {
+            "version": "2.6.9",
             "dev": true,
-            "requires": {
-                "pend": "~1.2.0"
+            "license": "MIT",
+            "dependencies": {
+                "@types/node": "*",
+                "form-data": "^4.0.0"
             }
         },
-        "fecha": {
-            "version": "4.2.1",
-            "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.1.tgz",
-            "integrity": "sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q=="
+        "node_modules/@types/normalize-package-data": {
+            "version": "2.4.1",
+            "dev": true,
+            "license": "MIT"
         },
-        "file-entry-cache": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-            "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+        "node_modules/@types/prettier": {
+            "version": "2.7.0",
             "dev": true,
-            "requires": {
-                "flat-cache": "^3.0.4"
-            }
+            "license": "MIT"
         },
-        "fill-range": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-            "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+        "node_modules/@types/prismjs": {
+            "version": "1.26.3",
             "dev": true,
-            "requires": {
-                "to-regex-range": "^5.0.1"
-            }
+            "license": "MIT"
         },
-        "finalhandler": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-            "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+        "node_modules/@types/proper-lockfile": {
+            "version": "4.1.4",
             "dev": true,
-            "requires": {
-                "debug": "2.6.9",
-                "encodeurl": "~1.0.2",
-                "escape-html": "~1.0.3",
-                "on-finished": "2.4.1",
-                "parseurl": "~1.3.3",
-                "statuses": "2.0.1",
-                "unpipe": "~1.0.0"
-            },
+            "license": "MIT",
             "dependencies": {
-                "debug": {
-                    "version": "2.6.9",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "2.0.0"
-                    }
-                },
-                "ms": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-                    "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-                    "dev": true
-                },
-                "statuses": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-                    "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-                    "dev": true
-                }
+                "@types/retry": "*"
             }
         },
-        "find-cache-dir": {
-            "version": "3.3.2",
-            "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-            "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+        "node_modules/@types/qs": {
+            "version": "6.9.7",
             "dev": true,
-            "requires": {
-                "commondir": "^1.0.1",
-                "make-dir": "^3.0.2",
-                "pkg-dir": "^4.1.0"
-            }
+            "license": "MIT"
         },
-        "find-up": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-            "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+        "node_modules/@types/range-parser": {
+            "version": "1.2.4",
             "dev": true,
-            "requires": {
-                "locate-path": "^6.0.0",
-                "path-exists": "^4.0.0"
-            }
-        },
-        "flat": {
-            "version": "5.0.2",
-            "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
-            "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
-            "dev": true
+            "license": "MIT"
         },
-        "flat-cache": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-            "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+        "node_modules/@types/readline-sync": {
+            "version": "1.4.8",
             "dev": true,
-            "requires": {
-                "flatted": "^3.1.0",
-                "rimraf": "^3.0.2"
+            "license": "MIT"
+        },
+        "node_modules/@types/responselike": {
+            "version": "1.0.0",
+            "license": "MIT",
+            "dependencies": {
+                "@types/node": "*"
             }
         },
-        "flatted": {
-            "version": "3.2.2",
-            "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
-            "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==",
-            "dev": true
+        "node_modules/@types/retry": {
+            "version": "0.12.1",
+            "dev": true,
+            "license": "MIT"
         },
-        "fn.name": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz",
-            "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="
+        "node_modules/@types/semver": {
+            "version": "7.5.0",
+            "dev": true,
+            "license": "MIT"
         },
-        "follow-redirects": {
-            "version": "1.15.1",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
-            "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==",
-            "dev": true
+        "node_modules/@types/serve-index": {
+            "version": "1.9.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/express": "*"
+            }
         },
-        "for-each": {
-            "version": "0.3.3",
-            "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-            "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
-            "requires": {
-                "is-callable": "^1.1.3"
+        "node_modules/@types/serve-static": {
+            "version": "1.13.10",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/mime": "^1",
+                "@types/node": "*"
             }
         },
-        "foreground-child": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz",
-            "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==",
+        "node_modules/@types/sinon": {
+            "version": "10.0.5",
             "dev": true,
-            "requires": {
-                "cross-spawn": "^7.0.0",
-                "signal-exit": "^3.0.2"
+            "license": "MIT",
+            "dependencies": {
+                "@sinonjs/fake-timers": "^7.1.0"
             }
         },
-        "forwarded": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-            "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
-            "dev": true
-        },
-        "fresh": {
-            "version": "0.5.2",
-            "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-            "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
-            "dev": true
-        },
-        "from": {
-            "version": "0.1.7",
-            "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
-            "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
-            "dev": true
-        },
-        "fromentries": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz",
-            "integrity": "sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==",
-            "dev": true
-        },
-        "fs-constants": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-            "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-            "dev": true
-        },
-        "fs-extra": {
-            "version": "10.1.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-            "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-            "requires": {
-                "graceful-fs": "^4.2.0",
-                "jsonfile": "^6.0.1",
-                "universalify": "^2.0.0"
+        "node_modules/@types/sinon/node_modules/@sinonjs/fake-timers": {
+            "version": "7.1.2",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "@sinonjs/commons": "^1.7.0"
             }
         },
-        "fs-monkey": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
-            "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==",
-            "dev": true
-        },
-        "fs.realpath": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-            "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-            "dev": true
-        },
-        "fsevents": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+        "node_modules/@types/sinonjs__fake-timers": {
+            "version": "8.1.2",
             "dev": true,
-            "optional": true
+            "license": "MIT"
         },
-        "fstream": {
-            "version": "1.0.12",
-            "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
-            "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
-            "dev": true,
-            "requires": {
-                "graceful-fs": "^4.1.2",
-                "inherits": "~2.0.0",
-                "mkdirp": ">=0.5 0",
-                "rimraf": "2"
-            },
-            "dependencies": {
-                "rimraf": {
-                    "version": "2.7.1",
-                    "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-                    "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-                    "dev": true,
-                    "requires": {
-                        "glob": "^7.1.3"
-                    }
-                }
+        "node_modules/@types/sockjs": {
+            "version": "0.3.33",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/node": "*"
             }
         },
-        "function-bind": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-            "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-        },
-        "function.prototype.name": {
-            "version": "1.1.5",
-            "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-            "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-            "requires": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.3",
-                "es-abstract": "^1.19.0",
-                "functions-have-names": "^1.2.2"
+        "node_modules/@types/stream-buffers": {
+            "version": "3.0.7",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/node": "*"
             }
         },
-        "functions-have-names": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-            "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
+        "node_modules/@types/svgdom": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmjs.org/@types/svgdom/-/svgdom-0.1.2.tgz",
+            "integrity": "sha512-ZFwX8cDhbz6jiv3JZdMVYq8SSWHOUchChPmRoMwdIu3lz89aCu/gVK9TdR1eeb0ARQ8+5rtjUKrk1UR8hh0dhQ==",
+            "dev": true,
+            "license": "MIT"
         },
-        "gauge": {
-            "version": "2.7.4",
-            "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-            "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+        "node_modules/@types/tcp-port-used": {
+            "version": "1.0.1",
             "dev": true,
-            "requires": {
-                "aproba": "^1.0.3",
-                "console-control-strings": "^1.0.0",
-                "has-unicode": "^2.0.0",
-                "object-assign": "^4.1.0",
-                "signal-exit": "^3.0.0",
-                "string-width": "^1.0.1",
-                "strip-ansi": "^3.0.1",
-                "wide-align": "^1.1.0"
-            },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-                    "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-                    "dev": true
-                },
-                "is-fullwidth-code-point": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-                    "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-                    "dev": true,
-                    "requires": {
-                        "number-is-nan": "^1.0.0"
-                    }
-                },
-                "string-width": {
-                    "version": "1.0.2",
-                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-                    "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-                    "dev": true,
-                    "requires": {
-                        "code-point-at": "^1.0.0",
-                        "is-fullwidth-code-point": "^1.0.0",
-                        "strip-ansi": "^3.0.0"
-                    }
-                },
-                "strip-ansi": {
-                    "version": "3.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-                    "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^2.0.0"
-                    }
-                }
-            }
+            "license": "MIT"
         },
-        "gensync": {
-            "version": "1.0.0-beta.2",
-            "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-            "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-            "dev": true
+        "node_modules/@types/tough-cookie": {
+            "version": "4.0.5",
+            "dev": true,
+            "license": "MIT"
         },
-        "geometry-interfaces": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/geometry-interfaces/-/geometry-interfaces-1.1.4.tgz",
-            "integrity": "sha512-qD6OdkT6NcES9l4Xx3auTpwraQruU7dARbQPVO71MKvkGYw5/z/oIiGymuFXrRaEQa5Y67EIojUpaLeGEa5hGA==",
-            "dev": true
+        "node_modules/@types/uuid": {
+            "version": "9.0.8",
+            "license": "MIT"
         },
-        "get-caller-file": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-            "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-            "dev": true
+        "node_modules/@types/vscode": {
+            "version": "1.83.0",
+            "dev": true,
+            "license": "MIT"
         },
-        "get-intrinsic": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
-            "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
-            "requires": {
-                "function-bind": "^1.1.1",
-                "has": "^1.0.3",
-                "has-symbols": "^1.0.3"
-            }
+        "node_modules/@types/vscode-webview": {
+            "version": "1.57.1",
+            "dev": true,
+            "license": "MIT"
         },
-        "get-package-type": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-            "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-            "dev": true
+        "node_modules/@types/webidl-conversions": {
+            "version": "7.0.3",
+            "dev": true,
+            "license": "MIT"
         },
-        "get-stdin": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-            "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
-            "dev": true
+        "node_modules/@types/webpack-env": {
+            "version": "1.18.5",
+            "dev": true,
+            "license": "MIT"
         },
-        "get-stream": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-            "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-            "requires": {
-                "pump": "^3.0.0"
+        "node_modules/@types/whatwg-url": {
+            "version": "11.0.4",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/webidl-conversions": "*"
             }
         },
-        "get-symbol-description": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-            "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-            "requires": {
-                "call-bind": "^1.0.2",
-                "get-intrinsic": "^1.1.1"
+        "node_modules/@types/ws": {
+            "version": "8.5.5",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/node": "*"
             }
         },
-        "github-from-package": {
-            "version": "0.0.0",
-            "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
-            "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=",
-            "dev": true
-        },
-        "glob": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-            "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+        "node_modules/@types/xml2js": {
+            "version": "0.4.11",
             "dev": true,
-            "requires": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.0.4",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
+            "license": "MIT",
+            "dependencies": {
+                "@types/node": "*"
             }
         },
-        "glob-parent": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+        "node_modules/@typescript-eslint/eslint-plugin": {
+            "version": "7.14.1",
             "dev": true,
-            "requires": {
-                "is-glob": "^4.0.1"
+            "license": "MIT",
+            "dependencies": {
+                "@eslint-community/regexpp": "^4.10.0",
+                "@typescript-eslint/scope-manager": "7.14.1",
+                "@typescript-eslint/type-utils": "7.14.1",
+                "@typescript-eslint/utils": "7.14.1",
+                "@typescript-eslint/visitor-keys": "7.14.1",
+                "graphemer": "^1.4.0",
+                "ignore": "^5.3.1",
+                "natural-compare": "^1.4.0",
+                "ts-api-utils": "^1.3.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || >=20.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "@typescript-eslint/parser": "^7.0.0",
+                "eslint": "^8.56.0"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
             }
         },
-        "glob-promise": {
-            "version": "4.2.2",
-            "resolved": "https://registry.npmjs.org/glob-promise/-/glob-promise-4.2.2.tgz",
-            "integrity": "sha512-xcUzJ8NWN5bktoTIX7eOclO1Npxd/dyVqUJxlLIDasT4C7KZyqlPIwkdJ0Ypiy3p2ZKahTjK4M9uC3sNSfNMzw==",
+        "node_modules/@typescript-eslint/parser": {
+            "version": "7.14.1",
             "dev": true,
-            "requires": {
-                "@types/glob": "^7.1.3"
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "@typescript-eslint/scope-manager": "7.14.1",
+                "@typescript-eslint/types": "7.14.1",
+                "@typescript-eslint/typescript-estree": "7.14.1",
+                "@typescript-eslint/visitor-keys": "7.14.1",
+                "debug": "^4.3.4"
+            },
+            "engines": {
+                "node": "^18.18.0 || >=20.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^8.56.0"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
             }
         },
-        "glob-to-regexp": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-            "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-            "dev": true
-        },
-        "globals": {
-            "version": "13.17.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
-            "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
+        "node_modules/@typescript-eslint/scope-manager": {
+            "version": "7.14.1",
             "dev": true,
-            "requires": {
-                "type-fest": "^0.20.2"
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/types": "7.14.1",
+                "@typescript-eslint/visitor-keys": "7.14.1"
             },
+            "engines": {
+                "node": "^18.18.0 || >=20.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            }
+        },
+        "node_modules/@typescript-eslint/type-utils": {
+            "version": "7.14.1",
+            "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "type-fest": {
-                    "version": "0.20.2",
-                    "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-                    "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-                    "dev": true
+                "@typescript-eslint/typescript-estree": "7.14.1",
+                "@typescript-eslint/utils": "7.14.1",
+                "debug": "^4.3.4",
+                "ts-api-utils": "^1.3.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || >=20.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^8.56.0"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
                 }
             }
         },
-        "globby": {
-            "version": "11.1.0",
-            "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-            "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+        "node_modules/@typescript-eslint/types": {
+            "version": "7.14.1",
             "dev": true,
-            "requires": {
-                "array-union": "^2.1.0",
-                "dir-glob": "^3.0.1",
-                "fast-glob": "^3.2.9",
-                "ignore": "^5.2.0",
-                "merge2": "^1.4.1",
-                "slash": "^3.0.0"
+            "license": "MIT",
+            "engines": {
+                "node": "^18.18.0 || >=20.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
             }
         },
-        "got": {
-            "version": "11.8.5",
-            "resolved": "https://registry.npmjs.org/got/-/got-11.8.5.tgz",
-            "integrity": "sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==",
-            "requires": {
-                "@sindresorhus/is": "^4.0.0",
-                "@szmarczak/http-timer": "^4.0.5",
-                "@types/cacheable-request": "^6.0.1",
-                "@types/responselike": "^1.0.0",
-                "cacheable-lookup": "^5.0.3",
-                "cacheable-request": "^7.0.2",
-                "decompress-response": "^6.0.0",
-                "http2-wrapper": "^1.0.0-beta.5.2",
-                "lowercase-keys": "^2.0.0",
-                "p-cancelable": "^2.0.0",
-                "responselike": "^2.0.0"
+        "node_modules/@typescript-eslint/typescript-estree": {
+            "version": "7.14.1",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "@typescript-eslint/types": "7.14.1",
+                "@typescript-eslint/visitor-keys": "7.14.1",
+                "debug": "^4.3.4",
+                "globby": "^11.1.0",
+                "is-glob": "^4.0.3",
+                "minimatch": "^9.0.4",
+                "semver": "^7.6.0",
+                "ts-api-utils": "^1.3.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || >=20.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
             }
         },
-        "graceful-fs": {
-            "version": "4.2.8",
-            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
-            "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="
-        },
-        "grapheme-splitter": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
-            "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
-            "dev": true
-        },
-        "handle-thing": {
+        "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
             "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-            "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
-            "dev": true
-        },
-        "hard-rejection": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
-            "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
-            "dev": true
-        },
-        "has": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-            "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-            "requires": {
-                "function-bind": "^1.1.1"
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0"
             }
         },
-        "has-bigints": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-            "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="
-        },
-        "has-flag": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-            "dev": true
-        },
-        "has-property-descriptors": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-            "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-            "requires": {
-                "get-intrinsic": "^1.1.1"
+        "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
+            "version": "9.0.5",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
             }
         },
-        "has-symbols": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-            "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
-        },
-        "has-tostringtag": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-            "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-            "requires": {
-                "has-symbols": "^1.0.2"
+        "node_modules/@typescript-eslint/utils": {
+            "version": "7.14.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@eslint-community/eslint-utils": "^4.4.0",
+                "@typescript-eslint/scope-manager": "7.14.1",
+                "@typescript-eslint/types": "7.14.1",
+                "@typescript-eslint/typescript-estree": "7.14.1"
+            },
+            "engines": {
+                "node": "^18.18.0 || >=20.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^8.56.0"
             }
         },
-        "has-unicode": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-            "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-            "dev": true
-        },
-        "hash-sum": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
-            "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
-            "dev": true
-        },
-        "hasha": {
-            "version": "5.2.2",
-            "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz",
-            "integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==",
+        "node_modules/@typescript-eslint/visitor-keys": {
+            "version": "7.14.1",
             "dev": true,
-            "requires": {
-                "is-stream": "^2.0.0",
-                "type-fest": "^0.8.0"
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/types": "7.14.1",
+                "eslint-visitor-keys": "^3.4.3"
+            },
+            "engines": {
+                "node": "^18.18.0 || >=20.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
             }
         },
-        "he": {
+        "node_modules/@ungap/structured-clone": {
             "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-            "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-            "dev": true
+            "dev": true,
+            "license": "ISC"
         },
-        "hosted-git-info": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
-            "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
+        "node_modules/@vscode/codicons": {
+            "version": "0.0.33",
             "dev": true,
-            "requires": {
-                "lru-cache": "^6.0.0"
-            }
+            "license": "CC-BY-4.0"
         },
-        "hpack.js": {
-            "version": "2.1.6",
-            "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-            "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
+        "node_modules/@vscode/debugprotocol": {
+            "version": "1.64.0",
+            "license": "MIT"
+        },
+        "node_modules/@vscode/test-electron": {
+            "version": "2.3.8",
             "dev": true,
-            "requires": {
-                "inherits": "^2.0.1",
-                "obuf": "^1.0.0",
-                "readable-stream": "^2.0.1",
-                "wbuf": "^1.1.0"
-            },
+            "license": "MIT",
             "dependencies": {
-                "readable-stream": {
-                    "version": "2.3.7",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-                    "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-                    "dev": true,
-                    "requires": {
-                        "core-util-is": "~1.0.0",
-                        "inherits": "~2.0.3",
-                        "isarray": "~1.0.0",
-                        "process-nextick-args": "~2.0.0",
-                        "safe-buffer": "~5.1.1",
-                        "string_decoder": "~1.1.1",
-                        "util-deprecate": "~1.0.1"
-                    }
-                },
-                "safe-buffer": {
-                    "version": "5.1.2",
-                    "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-                    "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-                    "dev": true
-                },
-                "string_decoder": {
-                    "version": "1.1.1",
-                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-                    "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-                    "dev": true,
-                    "requires": {
-                        "safe-buffer": "~5.1.0"
-                    }
-                }
+                "http-proxy-agent": "^4.0.1",
+                "https-proxy-agent": "^5.0.0",
+                "jszip": "^3.10.1",
+                "semver": "^7.5.2"
+            },
+            "engines": {
+                "node": ">=16"
             }
         },
-        "html-entities": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.2.tgz",
-            "integrity": "sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==",
-            "dev": true
-        },
-        "html-escaper": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-            "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-            "dev": true
-        },
-        "htmlparser2": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
-            "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
+        "node_modules/@vscode/test-web": {
+            "version": "0.0.65",
             "dev": true,
-            "requires": {
-                "domelementtype": "^2.0.1",
-                "domhandler": "^4.0.0",
-                "domutils": "^2.5.2",
-                "entities": "^2.0.0"
+            "license": "MIT",
+            "dependencies": {
+                "@koa/cors": "^5.0.0",
+                "@koa/router": "^13.1.0",
+                "@playwright/browser-chromium": "^1.49.0",
+                "glob": "^11.0.0",
+                "gunzip-maybe": "^1.4.2",
+                "http-proxy-agent": "^7.0.2",
+                "https-proxy-agent": "^7.0.5",
+                "koa": "^2.15.3",
+                "koa-morgan": "^1.0.1",
+                "koa-mount": "^4.0.0",
+                "koa-static": "^5.0.0",
+                "minimist": "^1.2.8",
+                "playwright": "^1.49.0",
+                "tar-fs": "^3.0.6",
+                "vscode-uri": "^3.0.8"
+            },
+            "bin": {
+                "vscode-test-web": "out/server/index.js"
+            },
+            "engines": {
+                "node": ">=16"
             }
         },
-        "http-cache-semantics": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-            "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="
-        },
-        "http-deceiver": {
-            "version": "1.2.7",
-            "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-            "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
-            "dev": true
+        "node_modules/@vscode/test-web/node_modules/agent-base": {
+            "version": "7.1.3",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 14"
+            }
         },
-        "http-errors": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-            "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+        "node_modules/@vscode/test-web/node_modules/brace-expansion": {
+            "version": "2.0.1",
             "dev": true,
-            "requires": {
-                "depd": "2.0.0",
-                "inherits": "2.0.4",
-                "setprototypeof": "1.2.0",
-                "statuses": "2.0.1",
-                "toidentifier": "1.0.1"
-            },
+            "license": "MIT",
             "dependencies": {
-                "depd": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-                    "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-                    "dev": true
-                },
-                "statuses": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-                    "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-                    "dev": true
-                }
+                "balanced-match": "^1.0.0"
             }
         },
-        "http-parser-js": {
-            "version": "0.5.8",
-            "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
-            "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
-            "dev": true
+        "node_modules/@vscode/test-web/node_modules/glob": {
+            "version": "11.0.0",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "foreground-child": "^3.1.0",
+                "jackspeak": "^4.0.1",
+                "minimatch": "^10.0.0",
+                "minipass": "^7.1.2",
+                "package-json-from-dist": "^1.0.0",
+                "path-scurry": "^2.0.0"
+            },
+            "bin": {
+                "glob": "dist/esm/bin.mjs"
+            },
+            "engines": {
+                "node": "20 || >=22"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
         },
-        "http-proxy": {
-            "version": "1.18.1",
-            "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-            "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+        "node_modules/@vscode/test-web/node_modules/http-proxy-agent": {
+            "version": "7.0.2",
             "dev": true,
-            "requires": {
-                "eventemitter3": "^4.0.0",
-                "follow-redirects": "^1.0.0",
-                "requires-port": "^1.0.0"
+            "license": "MIT",
+            "dependencies": {
+                "agent-base": "^7.1.0",
+                "debug": "^4.3.4"
+            },
+            "engines": {
+                "node": ">= 14"
             }
         },
-        "http-proxy-agent": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-            "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+        "node_modules/@vscode/test-web/node_modules/https-proxy-agent": {
+            "version": "7.0.6",
             "dev": true,
-            "requires": {
-                "@tootallnate/once": "1",
-                "agent-base": "6",
+            "license": "MIT",
+            "dependencies": {
+                "agent-base": "^7.1.2",
                 "debug": "4"
+            },
+            "engines": {
+                "node": ">= 14"
             }
         },
-        "http-proxy-middleware": {
-            "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
-            "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
+        "node_modules/@vscode/test-web/node_modules/jackspeak": {
+            "version": "4.0.2",
             "dev": true,
-            "requires": {
-                "@types/http-proxy": "^1.17.8",
-                "http-proxy": "^1.18.1",
-                "is-glob": "^4.0.1",
-                "is-plain-obj": "^3.0.0",
-                "micromatch": "^4.0.2"
-            },
+            "license": "BlueOak-1.0.0",
             "dependencies": {
-                "is-plain-obj": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
-                    "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
-                    "dev": true
-                }
+                "@isaacs/cliui": "^8.0.2"
+            },
+            "engines": {
+                "node": "20 || >=22"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
             }
         },
-        "http2-wrapper": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
-            "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
-            "requires": {
-                "quick-lru": "^5.1.1",
-                "resolve-alpn": "^1.0.0"
+        "node_modules/@vscode/test-web/node_modules/lru-cache": {
+            "version": "11.0.2",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": "20 || >=22"
             }
         },
-        "https-proxy-agent": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-            "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+        "node_modules/@vscode/test-web/node_modules/minimatch": {
+            "version": "10.0.1",
             "dev": true,
-            "requires": {
-                "agent-base": "6",
-                "debug": "4"
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": "20 || >=22"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
             }
         },
-        "human-signals": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
-            "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
-            "dev": true
-        },
-        "husky": {
-            "version": "7.0.4",
-            "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz",
-            "integrity": "sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==",
-            "dev": true
-        },
-        "iconv-lite": {
-            "version": "0.4.24",
-            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-            "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+        "node_modules/@vscode/test-web/node_modules/path-scurry": {
+            "version": "2.0.0",
             "dev": true,
-            "requires": {
-                "safer-buffer": ">= 2.1.2 < 3"
+            "license": "BlueOak-1.0.0",
+            "dependencies": {
+                "lru-cache": "^11.0.0",
+                "minipass": "^7.1.2"
+            },
+            "engines": {
+                "node": "20 || >=22"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
             }
         },
-        "icss-utils": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-            "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+        "node_modules/@vscode/test-web/node_modules/tar-fs": {
+            "version": "3.0.6",
             "dev": true,
-            "requires": {}
-        },
-        "ieee754": {
-            "version": "1.1.13",
-            "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-            "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
+            "license": "MIT",
+            "dependencies": {
+                "pump": "^3.0.0",
+                "tar-stream": "^3.1.5"
+            },
+            "optionalDependencies": {
+                "bare-fs": "^2.1.1",
+                "bare-path": "^2.1.0"
+            }
         },
-        "ignore": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-            "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-            "dev": true
+        "node_modules/@vscode/test-web/node_modules/tar-stream": {
+            "version": "3.1.7",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "b4a": "^1.6.4",
+                "fast-fifo": "^1.2.0",
+                "streamx": "^2.15.0"
+            }
         },
-        "immutable": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz",
-            "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw=="
+        "node_modules/@vscode/test-web/node_modules/vscode-uri": {
+            "version": "3.0.8",
+            "dev": true,
+            "license": "MIT"
         },
-        "import-fresh": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-            "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+        "node_modules/@vscode/vsce": {
+            "version": "2.19.0",
             "dev": true,
-            "requires": {
-                "parent-module": "^1.0.0",
-                "resolve-from": "^4.0.0"
+            "license": "MIT",
+            "dependencies": {
+                "azure-devops-node-api": "^11.0.1",
+                "chalk": "^2.4.2",
+                "cheerio": "^1.0.0-rc.9",
+                "commander": "^6.1.0",
+                "glob": "^7.0.6",
+                "hosted-git-info": "^4.0.2",
+                "jsonc-parser": "^3.2.0",
+                "leven": "^3.1.0",
+                "markdown-it": "^12.3.2",
+                "mime": "^1.3.4",
+                "minimatch": "^3.0.3",
+                "parse-semver": "^1.1.1",
+                "read": "^1.0.7",
+                "semver": "^5.1.0",
+                "tmp": "^0.2.1",
+                "typed-rest-client": "^1.8.4",
+                "url-join": "^4.0.1",
+                "xml2js": "^0.5.0",
+                "yauzl": "^2.3.1",
+                "yazl": "^2.2.2"
+            },
+            "bin": {
+                "vsce": "vsce"
+            },
+            "engines": {
+                "node": ">= 14"
+            },
+            "optionalDependencies": {
+                "keytar": "^7.7.0"
             }
         },
-        "import-local": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz",
-            "integrity": "sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==",
+        "node_modules/@vscode/vsce/node_modules/ansi-styles": {
+            "version": "3.2.1",
             "dev": true,
-            "requires": {
-                "pkg-dir": "^4.2.0",
-                "resolve-cwd": "^3.0.0"
+            "license": "MIT",
+            "dependencies": {
+                "color-convert": "^1.9.0"
+            },
+            "engines": {
+                "node": ">=4"
             }
         },
-        "imurmurhash": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-            "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-            "dev": true
-        },
-        "indent-string": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-            "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-            "dev": true
-        },
-        "inflight": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-            "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+        "node_modules/@vscode/vsce/node_modules/chalk": {
+            "version": "2.4.2",
             "dev": true,
-            "requires": {
-                "once": "^1.3.0",
-                "wrappy": "1"
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^3.2.1",
+                "escape-string-regexp": "^1.0.5",
+                "supports-color": "^5.3.0"
+            },
+            "engines": {
+                "node": ">=4"
             }
         },
-        "inherits": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+        "node_modules/@vscode/vsce/node_modules/color-convert": {
+            "version": "1.9.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "color-name": "1.1.3"
+            }
         },
-        "ini": {
-            "version": "1.3.8",
-            "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-            "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-            "dev": true
+        "node_modules/@vscode/vsce/node_modules/color-name": {
+            "version": "1.1.3",
+            "dev": true,
+            "license": "MIT"
         },
-        "internal-slot": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
-            "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
-            "requires": {
-                "get-intrinsic": "^1.1.0",
-                "has": "^1.0.3",
-                "side-channel": "^1.0.4"
+        "node_modules/@vscode/vsce/node_modules/entities": {
+            "version": "2.1.0",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "funding": {
+                "url": "https://github.com/fb55/entities?sponsor=1"
             }
         },
-        "interpret": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
-            "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
-            "dev": true
+        "node_modules/@vscode/vsce/node_modules/escape-string-regexp": {
+            "version": "1.0.5",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.8.0"
+            }
         },
-        "ip-regex": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz",
-            "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q=="
-        },
-        "ipaddr.js": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
-            "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==",
-            "dev": true
-        },
-        "is": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/is/-/is-3.3.0.tgz",
-            "integrity": "sha512-nW24QBoPcFGGHJGUwnfpI7Yc5CdqWNdsyHQszVE/z2pKHXzh7FZ5GWhJqSyaQ9wMkQnsTx+kAI8bHlCX4tKdbg==",
-            "dev": true
-        },
-        "is-arguments": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-            "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
-            "requires": {
-                "call-bind": "^1.0.2",
-                "has-tostringtag": "^1.0.0"
-            }
-        },
-        "is-arrayish": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-            "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
-        },
-        "is-bigint": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-            "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-            "requires": {
-                "has-bigints": "^1.0.1"
+        "node_modules/@vscode/vsce/node_modules/glob": {
+            "version": "7.2.3",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
             }
         },
-        "is-binary-path": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-            "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+        "node_modules/@vscode/vsce/node_modules/has-flag": {
+            "version": "3.0.0",
             "dev": true,
-            "requires": {
-                "binary-extensions": "^2.0.0"
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
             }
         },
-        "is-boolean-object": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-            "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-            "requires": {
-                "call-bind": "^1.0.2",
-                "has-tostringtag": "^1.0.0"
+        "node_modules/@vscode/vsce/node_modules/linkify-it": {
+            "version": "3.0.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "uc.micro": "^1.0.1"
             }
         },
-        "is-buffer": {
-            "version": "1.1.6",
-            "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-            "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-            "dev": true
-        },
-        "is-callable": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
-            "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="
-        },
-        "is-core-module": {
-            "version": "2.9.0",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
-            "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
+        "node_modules/@vscode/vsce/node_modules/markdown-it": {
+            "version": "12.3.2",
             "dev": true,
-            "requires": {
-                "has": "^1.0.3"
+            "license": "MIT",
+            "dependencies": {
+                "argparse": "^2.0.1",
+                "entities": "~2.1.0",
+                "linkify-it": "^3.0.1",
+                "mdurl": "^1.0.1",
+                "uc.micro": "^1.0.5"
+            },
+            "bin": {
+                "markdown-it": "bin/markdown-it.js"
             }
         },
-        "is-date-object": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-            "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-            "requires": {
-                "has-tostringtag": "^1.0.0"
+        "node_modules/@vscode/vsce/node_modules/semver": {
+            "version": "5.7.2",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver"
             }
         },
-        "is-directory": {
-            "version": "0.3.1",
-            "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-            "integrity": "sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw==",
-            "dev": true
-        },
-        "is-docker": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-            "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-            "dev": true
-        },
-        "is-extglob": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-            "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-            "dev": true
-        },
-        "is-fullwidth-code-point": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-            "dev": true
-        },
-        "is-generator-function": {
-            "version": "1.0.10",
-            "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
-            "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
-            "requires": {
-                "has-tostringtag": "^1.0.0"
+        "node_modules/@vscode/vsce/node_modules/supports-color": {
+            "version": "5.5.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=4"
             }
         },
-        "is-glob": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-            "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+        "node_modules/@vscode/vsce/node_modules/xml2js": {
+            "version": "0.5.0",
             "dev": true,
-            "requires": {
-                "is-extglob": "^2.1.1"
+            "license": "MIT",
+            "dependencies": {
+                "sax": ">=0.6.0",
+                "xmlbuilder": "~11.0.0"
+            },
+            "engines": {
+                "node": ">=4.0.0"
             }
         },
-        "is-negative-zero": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-            "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
-        },
-        "is-number": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-            "dev": true
-        },
-        "is-number-object": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-            "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-            "requires": {
-                "has-tostringtag": "^1.0.0"
+        "node_modules/@vue/compiler-core": {
+            "version": "3.3.4",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/parser": "^7.21.3",
+                "@vue/shared": "3.3.4",
+                "estree-walker": "^2.0.2",
+                "source-map-js": "^1.0.2"
             }
         },
-        "is-path-inside": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-            "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-            "dev": true
-        },
-        "is-plain-obj": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-            "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
-            "dev": true
+        "node_modules/@vue/compiler-dom": {
+            "version": "3.3.4",
+            "license": "MIT",
+            "dependencies": {
+                "@vue/compiler-core": "3.3.4",
+                "@vue/shared": "3.3.4"
+            }
         },
-        "is-plain-object": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-            "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-            "dev": true,
-            "requires": {
-                "isobject": "^3.0.1"
+        "node_modules/@vue/compiler-sfc": {
+            "version": "3.3.4",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/parser": "^7.20.15",
+                "@vue/compiler-core": "3.3.4",
+                "@vue/compiler-dom": "3.3.4",
+                "@vue/compiler-ssr": "3.3.4",
+                "@vue/reactivity-transform": "3.3.4",
+                "@vue/shared": "3.3.4",
+                "estree-walker": "^2.0.2",
+                "magic-string": "^0.30.0",
+                "postcss": "^8.1.10",
+                "source-map-js": "^1.0.2"
             }
         },
-        "is-promise": {
-            "version": "2.2.2",
-            "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
-            "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==",
-            "dev": true
+        "node_modules/@vue/compiler-ssr": {
+            "version": "3.3.4",
+            "license": "MIT",
+            "dependencies": {
+                "@vue/compiler-dom": "3.3.4",
+                "@vue/shared": "3.3.4"
+            }
         },
-        "is-regex": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-            "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-            "requires": {
-                "call-bind": "^1.0.2",
-                "has-tostringtag": "^1.0.0"
+        "node_modules/@vue/reactivity": {
+            "version": "3.3.4",
+            "license": "MIT",
+            "dependencies": {
+                "@vue/shared": "3.3.4"
             }
         },
-        "is-shared-array-buffer": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-            "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-            "requires": {
-                "call-bind": "^1.0.2"
+        "node_modules/@vue/reactivity-transform": {
+            "version": "3.3.4",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/parser": "^7.20.15",
+                "@vue/compiler-core": "3.3.4",
+                "@vue/shared": "3.3.4",
+                "estree-walker": "^2.0.2",
+                "magic-string": "^0.30.0"
             }
         },
-        "is-stream": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-            "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="
+        "node_modules/@vue/runtime-core": {
+            "version": "3.3.4",
+            "license": "MIT",
+            "dependencies": {
+                "@vue/reactivity": "3.3.4",
+                "@vue/shared": "3.3.4"
+            }
         },
-        "is-string": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-            "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-            "requires": {
-                "has-tostringtag": "^1.0.0"
+        "node_modules/@vue/runtime-dom": {
+            "version": "3.3.4",
+            "license": "MIT",
+            "dependencies": {
+                "@vue/runtime-core": "3.3.4",
+                "@vue/shared": "3.3.4",
+                "csstype": "^3.1.1"
             }
         },
-        "is-symbol": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-            "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-            "requires": {
-                "has-symbols": "^1.0.2"
+        "node_modules/@vue/server-renderer": {
+            "version": "3.3.4",
+            "license": "MIT",
+            "dependencies": {
+                "@vue/compiler-ssr": "3.3.4",
+                "@vue/shared": "3.3.4"
+            },
+            "peerDependencies": {
+                "vue": "3.3.4"
             }
         },
-        "is-typed-array": {
-            "version": "1.1.9",
-            "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.9.tgz",
-            "integrity": "sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A==",
-            "requires": {
-                "available-typed-arrays": "^1.0.5",
-                "call-bind": "^1.0.2",
-                "es-abstract": "^1.20.0",
-                "for-each": "^0.3.3",
-                "has-tostringtag": "^1.0.0"
+        "node_modules/@vue/shared": {
+            "version": "3.3.4",
+            "license": "MIT"
+        },
+        "node_modules/@webassemblyjs/ast": {
+            "version": "1.12.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@webassemblyjs/helper-numbers": "1.11.6",
+                "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
             }
         },
-        "is-typedarray": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-            "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-            "dev": true
+        "node_modules/@webassemblyjs/floating-point-hex-parser": {
+            "version": "1.11.6",
+            "dev": true,
+            "license": "MIT"
         },
-        "is-unicode-supported": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-            "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-            "dev": true
+        "node_modules/@webassemblyjs/helper-api-error": {
+            "version": "1.11.6",
+            "dev": true,
+            "license": "MIT"
         },
-        "is-url": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
-            "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="
+        "node_modules/@webassemblyjs/helper-buffer": {
+            "version": "1.12.1",
+            "dev": true,
+            "license": "MIT"
         },
-        "is-weakref": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-            "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-            "requires": {
-                "call-bind": "^1.0.2"
+        "node_modules/@webassemblyjs/helper-numbers": {
+            "version": "1.11.6",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@webassemblyjs/floating-point-hex-parser": "1.11.6",
+                "@webassemblyjs/helper-api-error": "1.11.6",
+                "@xtuc/long": "4.2.2"
             }
         },
-        "is-windows": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-            "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-            "dev": true
+        "node_modules/@webassemblyjs/helper-wasm-bytecode": {
+            "version": "1.11.6",
+            "dev": true,
+            "license": "MIT"
         },
-        "is-wsl": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-            "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+        "node_modules/@webassemblyjs/helper-wasm-section": {
+            "version": "1.12.1",
             "dev": true,
-            "requires": {
-                "is-docker": "^2.0.0"
+            "license": "MIT",
+            "dependencies": {
+                "@webassemblyjs/ast": "1.12.1",
+                "@webassemblyjs/helper-buffer": "1.12.1",
+                "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+                "@webassemblyjs/wasm-gen": "1.12.1"
             }
         },
-        "is2": {
-            "version": "2.0.7",
-            "resolved": "https://registry.npmjs.org/is2/-/is2-2.0.7.tgz",
-            "integrity": "sha512-4vBQoURAXC6hnLFxD4VW7uc04XiwTTl/8ydYJxKvPwkWQrSjInkuM5VZVg6BGr1/natq69zDuvO9lGpLClJqvA==",
-            "requires": {
-                "deep-is": "^0.1.3",
-                "ip-regex": "^4.1.0",
-                "is-url": "^1.2.4"
+        "node_modules/@webassemblyjs/ieee754": {
+            "version": "1.11.6",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@xtuc/ieee754": "^1.2.0"
             }
         },
-        "isarray": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-            "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-        },
-        "isexe": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-            "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
-        },
-        "isobject": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-            "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-            "dev": true
+        "node_modules/@webassemblyjs/leb128": {
+            "version": "1.11.6",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@xtuc/long": "4.2.2"
+            }
         },
-        "istanbul-lib-coverage": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
-            "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
-            "dev": true
+        "node_modules/@webassemblyjs/utf8": {
+            "version": "1.11.6",
+            "dev": true,
+            "license": "MIT"
         },
-        "istanbul-lib-hook": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz",
-            "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==",
+        "node_modules/@webassemblyjs/wasm-edit": {
+            "version": "1.12.1",
             "dev": true,
-            "requires": {
-                "append-transform": "^2.0.0"
+            "license": "MIT",
+            "dependencies": {
+                "@webassemblyjs/ast": "1.12.1",
+                "@webassemblyjs/helper-buffer": "1.12.1",
+                "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+                "@webassemblyjs/helper-wasm-section": "1.12.1",
+                "@webassemblyjs/wasm-gen": "1.12.1",
+                "@webassemblyjs/wasm-opt": "1.12.1",
+                "@webassemblyjs/wasm-parser": "1.12.1",
+                "@webassemblyjs/wast-printer": "1.12.1"
             }
         },
-        "istanbul-lib-instrument": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-            "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+        "node_modules/@webassemblyjs/wasm-gen": {
+            "version": "1.12.1",
             "dev": true,
-            "requires": {
-                "@babel/core": "^7.7.5",
-                "@istanbuljs/schema": "^0.1.2",
-                "istanbul-lib-coverage": "^3.0.0",
-                "semver": "^6.3.0"
-            },
+            "license": "MIT",
             "dependencies": {
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
-                }
+                "@webassemblyjs/ast": "1.12.1",
+                "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+                "@webassemblyjs/ieee754": "1.11.6",
+                "@webassemblyjs/leb128": "1.11.6",
+                "@webassemblyjs/utf8": "1.11.6"
             }
         },
-        "istanbul-lib-processinfo": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.2.tgz",
-            "integrity": "sha512-kOwpa7z9hme+IBPZMzQ5vdQj8srYgAtaRqeI48NGmAQ+/5yKiHLV0QbYqQpxsdEF0+w14SoB8YbnHKcXE2KnYw==",
+        "node_modules/@webassemblyjs/wasm-opt": {
+            "version": "1.12.1",
             "dev": true,
-            "requires": {
-                "archy": "^1.0.0",
-                "cross-spawn": "^7.0.0",
-                "istanbul-lib-coverage": "^3.0.0-alpha.1",
-                "make-dir": "^3.0.0",
-                "p-map": "^3.0.0",
-                "rimraf": "^3.0.0",
-                "uuid": "^3.3.3"
-            },
+            "license": "MIT",
             "dependencies": {
-                "p-map": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
-                    "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
-                    "dev": true,
-                    "requires": {
-                        "aggregate-error": "^3.0.0"
-                    }
-                },
-                "uuid": {
-                    "version": "3.4.0",
-                    "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-                    "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-                    "dev": true
-                }
+                "@webassemblyjs/ast": "1.12.1",
+                "@webassemblyjs/helper-buffer": "1.12.1",
+                "@webassemblyjs/wasm-gen": "1.12.1",
+                "@webassemblyjs/wasm-parser": "1.12.1"
             }
         },
-        "istanbul-lib-report": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-            "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+        "node_modules/@webassemblyjs/wasm-parser": {
+            "version": "1.12.1",
             "dev": true,
-            "requires": {
-                "istanbul-lib-coverage": "^3.0.0",
-                "make-dir": "^3.0.0",
-                "supports-color": "^7.1.0"
+            "license": "MIT",
+            "dependencies": {
+                "@webassemblyjs/ast": "1.12.1",
+                "@webassemblyjs/helper-api-error": "1.11.6",
+                "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+                "@webassemblyjs/ieee754": "1.11.6",
+                "@webassemblyjs/leb128": "1.11.6",
+                "@webassemblyjs/utf8": "1.11.6"
             }
         },
-        "istanbul-lib-source-maps": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-            "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+        "node_modules/@webassemblyjs/wast-printer": {
+            "version": "1.12.1",
             "dev": true,
-            "requires": {
-                "debug": "^4.1.1",
-                "istanbul-lib-coverage": "^3.0.0",
-                "source-map": "^0.6.1"
+            "license": "MIT",
+            "dependencies": {
+                "@webassemblyjs/ast": "1.12.1",
+                "@xtuc/long": "4.2.2"
             }
         },
-        "istanbul-reports": {
-            "version": "3.1.4",
-            "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.4.tgz",
-            "integrity": "sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==",
+        "node_modules/@webpack-cli/configtest": {
+            "version": "2.1.1",
             "dev": true,
-            "requires": {
-                "html-escaper": "^2.0.0",
-                "istanbul-lib-report": "^3.0.0"
+            "license": "MIT",
+            "engines": {
+                "node": ">=14.15.0"
+            },
+            "peerDependencies": {
+                "webpack": "5.x.x",
+                "webpack-cli": "5.x.x"
             }
         },
-        "jest-worker": {
-            "version": "27.3.1",
-            "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.3.1.tgz",
-            "integrity": "sha512-ks3WCzsiZaOPJl/oMsDjaf0TRiSv7ctNgs0FqRr2nARsovz6AWWy4oLElwcquGSz692DzgZQrCLScPNs5YlC4g==",
+        "node_modules/@webpack-cli/info": {
+            "version": "2.0.2",
             "dev": true,
-            "requires": {
-                "@types/node": "*",
-                "merge-stream": "^2.0.0",
-                "supports-color": "^8.0.0"
+            "license": "MIT",
+            "engines": {
+                "node": ">=14.15.0"
             },
-            "dependencies": {
-                "supports-color": {
-                    "version": "8.1.1",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-                    "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
+            "peerDependencies": {
+                "webpack": "5.x.x",
+                "webpack-cli": "5.x.x"
             }
         },
-        "jmespath": {
-            "version": "0.16.0",
-            "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.16.0.tgz",
-            "integrity": "sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw=="
-        },
-        "joycon": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/joycon/-/joycon-3.0.1.tgz",
-            "integrity": "sha512-SJcJNBg32dGgxhPtM0wQqxqV0ax9k/9TaUskGDSJkSFSQOEWWvQ3zzWdGQRIUry2j1zA5+ReH13t0Mf3StuVZA==",
-            "dev": true
-        },
-        "js-sdsl": {
-            "version": "4.1.4",
-            "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz",
-            "integrity": "sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==",
-            "dev": true
-        },
-        "js-tokens": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-            "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-            "dev": true
-        },
-        "js-yaml": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-            "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-            "requires": {
-                "argparse": "^2.0.1"
-            }
-        },
-        "jsesc": {
-            "version": "2.5.2",
-            "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-            "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-            "dev": true
-        },
-        "json-buffer": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-            "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="
-        },
-        "json-parse-better-errors": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-            "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-            "dev": true
-        },
-        "json-parse-even-better-errors": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-            "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-            "dev": true
-        },
-        "json-schema-to-typescript": {
-            "version": "11.0.2",
-            "resolved": "https://registry.npmjs.org/json-schema-to-typescript/-/json-schema-to-typescript-11.0.2.tgz",
-            "integrity": "sha512-XRyeXBJeo/IH4eTP5D1ptX78vCvH86nMDt2k3AxO28C3uYWEDmy4mgPyMpb8bLJ/pJMElOGuQbnKR5Y6NSh3QQ==",
+        "node_modules/@webpack-cli/serve": {
+            "version": "2.0.5",
             "dev": true,
-            "requires": {
-                "@bcherny/json-schema-ref-parser": "9.0.9",
-                "@types/json-schema": "^7.0.11",
-                "@types/lodash": "^4.14.182",
-                "@types/prettier": "^2.6.1",
-                "cli-color": "^2.0.2",
-                "get-stdin": "^8.0.0",
-                "glob": "^7.1.6",
-                "glob-promise": "^4.2.2",
-                "is-glob": "^4.0.3",
-                "lodash": "^4.17.21",
-                "minimist": "^1.2.6",
-                "mkdirp": "^1.0.4",
-                "mz": "^2.7.0",
-                "prettier": "^2.6.2"
+            "license": "MIT",
+            "engines": {
+                "node": ">=14.15.0"
             },
-            "dependencies": {
-                "mkdirp": {
-                    "version": "1.0.4",
-                    "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-                    "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-                    "dev": true
+            "peerDependencies": {
+                "webpack": "5.x.x",
+                "webpack-cli": "5.x.x"
+            },
+            "peerDependenciesMeta": {
+                "webpack-dev-server": {
+                    "optional": true
                 }
             }
         },
-        "json-schema-traverse": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-            "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-            "dev": true
-        },
-        "json-stable-stringify-without-jsonify": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-            "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-            "dev": true
-        },
-        "json5": {
-            "version": "2.2.3",
-            "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-            "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-            "dev": true
-        },
-        "jsonc-parser": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
-            "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA=="
-        },
-        "jsonfile": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-            "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-            "requires": {
-                "graceful-fs": "^4.1.6",
-                "universalify": "^2.0.0"
+        "node_modules/@xmldom/xmldom": {
+            "version": "0.7.8",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10.0.0"
             }
         },
-        "just-extend": {
-            "version": "4.2.1",
-            "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz",
-            "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==",
-            "dev": true
+        "node_modules/@xtuc/ieee754": {
+            "version": "1.2.0",
+            "dev": true,
+            "license": "BSD-3-Clause"
         },
-        "keytar": {
-            "version": "7.7.0",
-            "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz",
-            "integrity": "sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==",
+        "node_modules/@xtuc/long": {
+            "version": "4.2.2",
             "dev": true,
-            "requires": {
-                "node-addon-api": "^3.0.0",
-                "prebuild-install": "^6.0.0"
-            }
+            "license": "Apache-2.0"
         },
-        "keyv": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz",
-            "integrity": "sha512-zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA==",
-            "requires": {
-                "json-buffer": "3.0.1"
+        "node_modules/@zip.js/zip.js": {
+            "version": "2.7.41",
+            "license": "BSD-3-Clause",
+            "engines": {
+                "bun": ">=0.7.0",
+                "deno": ">=1.0.0",
+                "node": ">=16.5.0"
             }
         },
-        "kind-of": {
-            "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-            "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-            "dev": true
-        },
-        "kuler": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz",
-            "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="
-        },
-        "leven": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-            "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-            "dev": true
-        },
-        "levn": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-            "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+        "node_modules/a-sync-waterfall": {
+            "version": "1.0.1",
             "dev": true,
-            "requires": {
-                "prelude-ls": "^1.2.1",
-                "type-check": "~0.4.0"
-            }
-        },
-        "lines-and-columns": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-            "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-            "dev": true
+            "license": "MIT"
         },
-        "linkify-it": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
-            "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
+        "node_modules/accepts": {
+            "version": "1.3.8",
             "dev": true,
-            "requires": {
-                "uc.micro": "^1.0.1"
+            "license": "MIT",
+            "dependencies": {
+                "mime-types": "~2.1.34",
+                "negotiator": "0.6.3"
+            },
+            "engines": {
+                "node": ">= 0.6"
             }
         },
-        "listenercount": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
-            "integrity": "sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc=",
-            "dev": true
-        },
-        "loader-runner": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz",
-            "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==",
-            "dev": true
-        },
-        "loader-utils": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-            "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+        "node_modules/acorn": {
+            "version": "8.14.0",
             "dev": true,
-            "requires": {
-                "big.js": "^5.2.2",
-                "emojis-list": "^3.0.0",
-                "json5": "^2.1.2"
+            "license": "MIT",
+            "bin": {
+                "acorn": "bin/acorn"
+            },
+            "engines": {
+                "node": ">=0.4.0"
             }
         },
-        "locate-path": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-            "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+        "node_modules/acorn-import-attributes": {
+            "version": "1.9.5",
             "dev": true,
-            "requires": {
-                "p-locate": "^5.0.0"
+            "license": "MIT",
+            "peerDependencies": {
+                "acorn": "^8"
             }
         },
-        "lodash": {
-            "version": "4.17.21",
-            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-        },
-        "lodash.flattendeep": {
-            "version": "4.4.0",
-            "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
-            "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
-            "dev": true
-        },
-        "lodash.get": {
-            "version": "4.4.2",
-            "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-            "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
-            "dev": true
-        },
-        "lodash.merge": {
-            "version": "4.6.2",
-            "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-            "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-            "dev": true
-        },
-        "log-symbols": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-            "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+        "node_modules/acorn-jsx": {
+            "version": "5.3.2",
             "dev": true,
-            "requires": {
-                "chalk": "^4.1.0",
-                "is-unicode-supported": "^0.1.0"
+            "license": "MIT",
+            "peerDependencies": {
+                "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
             }
         },
-        "logform": {
-            "version": "2.4.0",
-            "resolved": "https://registry.npmjs.org/logform/-/logform-2.4.0.tgz",
-            "integrity": "sha512-CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw==",
-            "requires": {
-                "@colors/colors": "1.5.0",
-                "fecha": "^4.2.0",
-                "ms": "^2.1.1",
-                "safe-stable-stringify": "^2.3.1",
-                "triple-beam": "^1.3.0"
+        "node_modules/acorn-walk": {
+            "version": "8.2.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.4.0"
             }
         },
-        "lowercase-keys": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-            "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="
-        },
-        "lru-cache": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-            "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-            "requires": {
-                "yallist": "^4.0.0"
+        "node_modules/adm-zip": {
+            "version": "0.5.10",
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.0"
             }
         },
-        "lru-queue": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
-            "integrity": "sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ==",
+        "node_modules/agent-base": {
+            "version": "6.0.2",
             "dev": true,
-            "requires": {
-                "es5-ext": "~0.10.2"
+            "license": "MIT",
+            "dependencies": {
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 6.0.0"
             }
         },
-        "magic-string": {
-            "version": "0.25.9",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
-            "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
-            "requires": {
-                "sourcemap-codec": "^1.4.8"
+        "node_modules/ajv": {
+            "version": "6.12.6",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.1",
+                "fast-json-stable-stringify": "^2.0.0",
+                "json-schema-traverse": "^0.4.1",
+                "uri-js": "^4.2.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
             }
         },
-        "make-dir": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-            "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+        "node_modules/ajv-formats": {
+            "version": "2.1.1",
             "dev": true,
-            "requires": {
-                "semver": "^6.0.0"
-            },
+            "license": "MIT",
             "dependencies": {
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-                    "dev": true
+                "ajv": "^8.0.0"
+            },
+            "peerDependencies": {
+                "ajv": "^8.0.0"
+            },
+            "peerDependenciesMeta": {
+                "ajv": {
+                    "optional": true
                 }
             }
         },
-        "make-error": {
-            "version": "1.3.6",
-            "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-            "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-            "dev": true
-        },
-        "map-obj": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
-            "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
-            "dev": true
-        },
-        "map-stream": {
-            "version": "0.0.7",
-            "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz",
-            "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=",
-            "dev": true
-        },
-        "markdown-it": {
-            "version": "12.3.2",
-            "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
-            "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
+        "node_modules/ajv-formats/node_modules/ajv": {
+            "version": "8.8.2",
             "dev": true,
-            "requires": {
-                "argparse": "^2.0.1",
-                "entities": "~2.1.0",
-                "linkify-it": "^3.0.1",
-                "mdurl": "^1.0.1",
-                "uc.micro": "^1.0.5"
-            },
+            "license": "MIT",
             "dependencies": {
-                "entities": {
-                    "version": "2.1.0",
-                    "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
-                    "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
-                    "dev": true
-                }
+                "fast-deep-equal": "^3.1.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2",
+                "uri-js": "^4.2.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
             }
         },
-        "marked": {
-            "version": "4.0.10",
-            "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.10.tgz",
-            "integrity": "sha512-+QvuFj0nGgO970fySghXGmuw+Fd0gD2x3+MqCWLIPf5oxdv1Ka6b2q+z9RP01P/IaKPMEramy+7cNy/Lw8c3hw==",
-            "dev": true
+        "node_modules/ajv-formats/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "MIT"
         },
-        "md5": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
-            "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
+        "node_modules/ajv-keywords": {
+            "version": "3.5.2",
             "dev": true,
-            "requires": {
-                "charenc": "0.0.2",
-                "crypt": "0.0.2",
-                "is-buffer": "~1.1.6"
+            "license": "MIT",
+            "peerDependencies": {
+                "ajv": "^6.9.1"
             }
         },
-        "mdurl": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
-            "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
-            "dev": true
-        },
-        "media-typer": {
-            "version": "0.3.0",
-            "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-            "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
-            "dev": true
+        "node_modules/amazon-q-vscode": {
+            "resolved": "packages/amazonq",
+            "link": true
         },
-        "memfs": {
-            "version": "3.4.7",
-            "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.7.tgz",
-            "integrity": "sha512-ygaiUSNalBX85388uskeCyhSAoOSgzBbtVCr9jA2RROssFL9Q19/ZXFqS+2Th2sr1ewNIWgFdLzLC3Yl1Zv+lw==",
-            "dev": true,
-            "requires": {
-                "fs-monkey": "^1.0.3"
+        "node_modules/amazon-states-language-service": {
+            "version": "1.16.1",
+            "license": "MIT",
+            "dependencies": {
+                "js-yaml": "^4.1.0",
+                "jsonata": "2.0.5",
+                "lodash": "^4.17.21",
+                "vscode-json-languageservice": "3.4.9",
+                "vscode-languageserver": "^9.0.0",
+                "vscode-languageserver-textdocument": "^1.0.0",
+                "vscode-languageserver-types": "^3.17.5",
+                "yaml-language-server": "0.15.0"
             }
         },
-        "memoizee": {
-            "version": "0.4.15",
-            "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz",
-            "integrity": "sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==",
-            "dev": true,
-            "requires": {
-                "d": "^1.0.1",
-                "es5-ext": "^0.10.53",
-                "es6-weak-map": "^2.0.3",
-                "event-emitter": "^0.3.5",
-                "is-promise": "^2.2.2",
-                "lru-queue": "^0.1.0",
-                "next-tick": "^1.1.0",
-                "timers-ext": "^0.1.7"
+        "node_modules/ansi-colors": {
+            "version": "4.1.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
             }
         },
-        "meow": {
-            "version": "9.0.0",
-            "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
-            "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
-            "dev": true,
-            "requires": {
-                "@types/minimist": "^1.2.0",
-                "camelcase-keys": "^6.2.2",
-                "decamelize": "^1.2.0",
-                "decamelize-keys": "^1.1.0",
-                "hard-rejection": "^2.1.0",
-                "minimist-options": "4.1.0",
-                "normalize-package-data": "^3.0.0",
-                "read-pkg-up": "^7.0.1",
-                "redent": "^3.0.0",
-                "trim-newlines": "^3.0.0",
-                "type-fest": "^0.18.0",
-                "yargs-parser": "^20.2.3"
-            },
+        "node_modules/ansi-gray": {
+            "version": "0.1.1",
+            "license": "MIT",
             "dependencies": {
-                "decamelize": {
-                    "version": "1.2.0",
-                    "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-                    "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-                    "dev": true
-                },
-                "type-fest": {
-                    "version": "0.18.1",
-                    "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-                    "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
-                    "dev": true
-                }
+                "ansi-wrap": "0.1.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
             }
         },
-        "merge-descriptors": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-            "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
-            "dev": true
+        "node_modules/ansi-html-community": {
+            "version": "0.0.8",
+            "dev": true,
+            "engines": [
+                "node >= 0.8.0"
+            ],
+            "license": "Apache-2.0",
+            "bin": {
+                "ansi-html": "bin/ansi-html"
+            }
         },
-        "merge-stream": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-            "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-            "dev": true
+        "node_modules/ansi-regex": {
+            "version": "4.1.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
         },
-        "merge2": {
-            "version": "1.4.1",
-            "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-            "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-            "dev": true
+        "node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "license": "MIT",
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+            }
         },
-        "methods": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-            "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
-            "dev": true
+        "node_modules/ansi-wrap": {
+            "version": "0.1.0",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
         },
-        "microbuffer": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/microbuffer/-/microbuffer-1.0.0.tgz",
-            "integrity": "sha512-O/SUXauVN4x6RaEJFqSPcXNtLFL+QzJHKZlyDVYFwcDDRVca3Fa/37QXXC+4zAGGa4YhHrHxKXuuHvLDIQECtA==",
-            "dev": true
+        "node_modules/any-promise": {
+            "version": "1.3.0",
+            "dev": true,
+            "license": "MIT"
         },
-        "micromatch": {
-            "version": "4.0.4",
-            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
-            "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+        "node_modules/anymatch": {
+            "version": "3.1.2",
             "dev": true,
-            "requires": {
-                "braces": "^3.0.1",
-                "picomatch": "^2.2.3"
+            "license": "ISC",
+            "dependencies": {
+                "normalize-path": "^3.0.0",
+                "picomatch": "^2.0.4"
+            },
+            "engines": {
+                "node": ">= 8"
             }
         },
-        "mime": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-            "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-            "dev": true
+        "node_modules/aproba": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+            "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+            "license": "ISC"
         },
-        "mime-db": {
-            "version": "1.52.0",
-            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-            "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+        "node_modules/are-we-there-yet": {
+            "version": "1.1.7",
+            "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
+            "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
+            "deprecated": "This package is no longer supported.",
+            "license": "ISC",
+            "dependencies": {
+                "delegates": "^1.0.0",
+                "readable-stream": "^2.0.6"
+            }
         },
-        "mime-types": {
-            "version": "2.1.35",
-            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-            "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-            "requires": {
-                "mime-db": "1.52.0"
+        "node_modules/are-we-there-yet/node_modules/readable-stream": {
+            "version": "2.3.8",
+            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+            "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+            "license": "MIT",
+            "dependencies": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
             }
         },
-        "mimic-fn": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-            "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-            "dev": true
+        "node_modules/are-we-there-yet/node_modules/safe-buffer": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+            "license": "MIT"
         },
-        "mimic-response": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-            "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="
+        "node_modules/are-we-there-yet/node_modules/string_decoder": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+            "license": "MIT",
+            "dependencies": {
+                "safe-buffer": "~5.1.0"
+            }
         },
-        "min-indent": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-            "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-            "dev": true
+        "node_modules/arg": {
+            "version": "4.1.3",
+            "dev": true,
+            "license": "MIT"
         },
-        "minimalistic-assert": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-            "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-            "dev": true
+        "node_modules/argparse": {
+            "version": "2.0.1",
+            "license": "Python-2.0"
         },
-        "minimatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+        "node_modules/array-flatten": {
+            "version": "2.1.2",
             "dev": true,
-            "requires": {
-                "brace-expansion": "^1.1.7"
+            "license": "MIT"
+        },
+        "node_modules/array-union": {
+            "version": "2.1.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
             }
         },
-        "minimist": {
-            "version": "1.2.6",
-            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-            "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
+        "node_modules/asap": {
+            "version": "2.0.6",
+            "dev": true,
+            "license": "MIT"
         },
-        "minimist-options": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
-            "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
+        "node_modules/asn1.js": {
+            "version": "5.4.1",
+            "license": "MIT",
+            "dependencies": {
+                "bn.js": "^4.0.0",
+                "inherits": "^2.0.1",
+                "minimalistic-assert": "^1.0.0",
+                "safer-buffer": "^2.1.0"
+            }
+        },
+        "node_modules/asn1.js/node_modules/bn.js": {
+            "version": "4.12.0",
+            "license": "MIT"
+        },
+        "node_modules/assert": {
+            "version": "2.1.0",
             "dev": true,
-            "requires": {
-                "arrify": "^1.0.1",
-                "is-plain-obj": "^1.1.0",
-                "kind-of": "^6.0.3"
-            },
+            "license": "MIT",
             "dependencies": {
-                "arrify": {
-                    "version": "1.0.1",
-                    "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-                    "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
-                    "dev": true
-                },
-                "is-plain-obj": {
-                    "version": "1.1.0",
-                    "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-                    "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
-                    "dev": true
-                }
+                "call-bind": "^1.0.2",
+                "is-nan": "^1.3.2",
+                "object-is": "^1.1.5",
+                "object.assign": "^4.1.4",
+                "util": "^0.12.5"
             }
         },
-        "mkdirp": {
-            "version": "0.5.5",
-            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-            "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-            "requires": {
-                "minimist": "^1.2.5"
+        "node_modules/ast-types": {
+            "version": "0.9.14",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
             }
         },
-        "mkdirp-classic": {
-            "version": "0.5.3",
-            "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-            "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
-            "dev": true
+        "node_modules/async": {
+            "version": "3.2.5",
+            "license": "MIT"
         },
-        "mocha": {
-            "version": "10.1.0",
-            "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.1.0.tgz",
-            "integrity": "sha512-vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg==",
+        "node_modules/async-lock": {
+            "version": "1.4.0",
+            "license": "MIT"
+        },
+        "node_modules/asynckit": {
+            "version": "0.4.0",
             "dev": true,
-            "requires": {
-                "ansi-colors": "4.1.1",
-                "browser-stdout": "1.3.1",
-                "chokidar": "3.5.3",
-                "debug": "4.3.4",
-                "diff": "5.0.0",
-                "escape-string-regexp": "4.0.0",
-                "find-up": "5.0.0",
-                "glob": "7.2.0",
-                "he": "1.2.0",
-                "js-yaml": "4.1.0",
-                "log-symbols": "4.1.0",
-                "minimatch": "5.0.1",
-                "ms": "2.1.3",
-                "nanoid": "3.3.3",
-                "serialize-javascript": "6.0.0",
-                "strip-json-comments": "3.1.1",
-                "supports-color": "8.1.1",
-                "workerpool": "6.2.1",
-                "yargs": "16.2.0",
-                "yargs-parser": "20.2.4",
-                "yargs-unparser": "2.0.0"
+            "license": "MIT"
+        },
+        "node_modules/available-typed-arrays": {
+            "version": "1.0.5",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
             },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/aws-core-vscode": {
+            "resolved": "packages/core",
+            "link": true
+        },
+        "node_modules/aws-sdk": {
+            "version": "2.1692.0",
+            "hasInstallScript": true,
+            "license": "Apache-2.0",
             "dependencies": {
-                "brace-expansion": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-                    "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-                    "dev": true,
-                    "requires": {
-                        "balanced-match": "^1.0.0"
-                    }
-                },
-                "minimatch": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
-                    "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
-                    "dev": true,
-                    "requires": {
-                        "brace-expansion": "^2.0.1"
-                    }
-                },
-                "ms": {
-                    "version": "2.1.3",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-                    "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "8.1.1",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-                    "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                },
-                "yargs": {
-                    "version": "16.2.0",
-                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-                    "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-                    "dev": true,
-                    "requires": {
-                        "cliui": "^7.0.2",
-                        "escalade": "^3.1.1",
-                        "get-caller-file": "^2.0.5",
-                        "require-directory": "^2.1.1",
-                        "string-width": "^4.2.0",
-                        "y18n": "^5.0.5",
-                        "yargs-parser": "^20.2.2"
-                    }
-                }
+                "buffer": "4.9.2",
+                "events": "1.1.1",
+                "ieee754": "1.1.13",
+                "jmespath": "0.16.0",
+                "querystring": "0.2.0",
+                "sax": "1.2.1",
+                "url": "0.10.3",
+                "util": "^0.12.4",
+                "uuid": "8.0.0",
+                "xml2js": "0.6.2"
+            },
+            "engines": {
+                "node": ">= 10.0.0"
             }
         },
-        "mocha-junit-reporter": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-2.0.2.tgz",
-            "integrity": "sha512-vYwWq5hh3v1lG0gdQCBxwNipBfvDiAM1PHroQRNp96+2l72e9wEUTw+mzoK+O0SudgfQ7WvTQZ9Nh3qkAYAjfg==",
+        "node_modules/aws-sdk-client-mock": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/aws-sdk-client-mock/-/aws-sdk-client-mock-4.1.0.tgz",
+            "integrity": "sha512-h/tOYTkXEsAcV3//6C1/7U4ifSpKyJvb6auveAepqqNJl6TdZaPFEtKjBQNf8UxQdDP850knB2i/whq4zlsxJw==",
             "dev": true,
-            "requires": {
-                "debug": "^2.2.0",
-                "md5": "^2.1.0",
-                "mkdirp": "~0.5.1",
-                "strip-ansi": "^6.0.1",
-                "xml": "^1.0.0"
-            },
+            "license": "MIT",
             "dependencies": {
-                "ansi-regex": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-                    "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-                    "dev": true
-                },
-                "debug": {
-                    "version": "2.6.9",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "2.0.0"
-                    }
-                },
-                "ms": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-                    "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-                    "dev": true
-                },
-                "strip-ansi": {
-                    "version": "6.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-                    "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^5.0.1"
-                    }
-                }
+                "@types/sinon": "^17.0.3",
+                "sinon": "^18.0.1",
+                "tslib": "^2.1.0"
             }
         },
-        "mocha-multi-reporters": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/mocha-multi-reporters/-/mocha-multi-reporters-1.5.1.tgz",
-            "integrity": "sha512-Yb4QJOaGLIcmB0VY7Wif5AjvLMUFAdV57D2TWEva1Y0kU/3LjKpeRVmlMIfuO1SVbauve459kgtIizADqxMWPg==",
+        "node_modules/aws-sdk-client-mock/node_modules/@sinonjs/commons": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz",
+            "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==",
             "dev": true,
-            "requires": {
-                "debug": "^4.1.1",
-                "lodash": "^4.17.15"
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "type-detect": "4.0.8"
             }
         },
-        "moment": {
-            "version": "2.29.4",
-            "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-            "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
-        },
-        "mri": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz",
-            "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==",
-            "dev": true
+        "node_modules/aws-sdk-client-mock/node_modules/@sinonjs/fake-timers": {
+            "version": "11.2.2",
+            "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-11.2.2.tgz",
+            "integrity": "sha512-G2piCSxQ7oWOxwGSAyFHfPIsyeJGXYtc6mFbnFA+kRXkiEnTl8c/8jul2S329iFBnDI9HGoeWWAZvuvOkZccgw==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "@sinonjs/commons": "^3.0.0"
+            }
         },
-        "ms": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        "node_modules/aws-sdk-client-mock/node_modules/@sinonjs/samsam": {
+            "version": "8.0.3",
+            "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.3.tgz",
+            "integrity": "sha512-hw6HbX+GyVZzmaYNh82Ecj1vdGZrqVIn/keDTg63IgAwiQPO+xCz99uG6Woqgb4tM0mUiFENKZ4cqd7IX94AXQ==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "@sinonjs/commons": "^3.0.1",
+                "type-detect": "^4.1.0"
+            }
         },
-        "multicast-dns": {
-            "version": "7.2.5",
-            "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
-            "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
+        "node_modules/aws-sdk-client-mock/node_modules/@sinonjs/samsam/node_modules/type-detect": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz",
+            "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==",
             "dev": true,
-            "requires": {
-                "dns-packet": "^5.2.2",
-                "thunky": "^1.0.2"
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
             }
         },
-        "multimatch": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-4.0.0.tgz",
-            "integrity": "sha512-lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ==",
+        "node_modules/aws-sdk-client-mock/node_modules/@types/sinon": {
+            "version": "17.0.4",
+            "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-17.0.4.tgz",
+            "integrity": "sha512-RHnIrhfPO3+tJT0s7cFaXGZvsL4bbR3/k7z3P312qMS4JaS2Tk+KiwiLx1S0rQ56ERj00u1/BtdyVd0FY+Pdew==",
             "dev": true,
-            "requires": {
-                "@types/minimatch": "^3.0.3",
-                "array-differ": "^3.0.0",
-                "array-union": "^2.1.0",
-                "arrify": "^2.0.1",
-                "minimatch": "^3.0.4"
+            "license": "MIT",
+            "dependencies": {
+                "@types/sinonjs__fake-timers": "*"
             }
         },
-        "mute-stream": {
-            "version": "0.0.8",
-            "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-            "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-            "dev": true
+        "node_modules/aws-sdk-client-mock/node_modules/just-extend": {
+            "version": "6.2.0",
+            "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-6.2.0.tgz",
+            "integrity": "sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw==",
+            "dev": true,
+            "license": "MIT"
         },
-        "mvdan-sh": {
-            "version": "0.5.0",
-            "resolved": "https://registry.npmjs.org/mvdan-sh/-/mvdan-sh-0.5.0.tgz",
-            "integrity": "sha512-UWbdl4LHd2fUnaEcOUFVWRdWGLkNoV12cKVIPiirYd8qM5VkCoCTXErlDubevrkEG7kGohvjRxAlTQmOqG80tw==",
-            "dev": true
+        "node_modules/aws-sdk-client-mock/node_modules/nise": {
+            "version": "6.1.1",
+            "resolved": "https://registry.npmjs.org/nise/-/nise-6.1.1.tgz",
+            "integrity": "sha512-aMSAzLVY7LyeM60gvBS423nBmIPP+Wy7St7hsb+8/fc1HmeoHJfLO8CKse4u3BtOZvQLJghYPI2i/1WZrEj5/g==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "@sinonjs/commons": "^3.0.1",
+                "@sinonjs/fake-timers": "^13.0.1",
+                "@sinonjs/text-encoding": "^0.7.3",
+                "just-extend": "^6.2.0",
+                "path-to-regexp": "^8.1.0"
+            }
         },
-        "mz": {
-            "version": "2.7.0",
-            "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
-            "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+        "node_modules/aws-sdk-client-mock/node_modules/nise/node_modules/@sinonjs/fake-timers": {
+            "version": "13.0.5",
+            "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz",
+            "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==",
             "dev": true,
-            "requires": {
-                "any-promise": "^1.0.0",
-                "object-assign": "^4.0.1",
-                "thenify-all": "^1.0.0"
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "@sinonjs/commons": "^3.0.1"
             }
         },
-        "nanoid": {
-            "version": "3.3.3",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
-            "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w=="
+        "node_modules/aws-sdk-client-mock/node_modules/path-to-regexp": {
+            "version": "8.3.0",
+            "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz",
+            "integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/express"
+            }
         },
-        "napi-build-utils": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
-            "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
-            "dev": true
+        "node_modules/aws-sdk-client-mock/node_modules/sinon": {
+            "version": "18.0.1",
+            "resolved": "https://registry.npmjs.org/sinon/-/sinon-18.0.1.tgz",
+            "integrity": "sha512-a2N2TDY1uGviajJ6r4D1CyRAkzE9NNVlYOV1wX5xQDuAk0ONgzgRl0EjCQuRCPxOwp13ghsMwt9Gdldujs39qw==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "@sinonjs/commons": "^3.0.1",
+                "@sinonjs/fake-timers": "11.2.2",
+                "@sinonjs/samsam": "^8.0.0",
+                "diff": "^5.2.0",
+                "nise": "^6.0.0",
+                "supports-color": "^7"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/sinon"
+            }
         },
-        "natural-compare": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-            "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-            "dev": true
+        "node_modules/aws-sdk/node_modules/uuid": {
+            "version": "8.0.0",
+            "license": "MIT",
+            "bin": {
+                "uuid": "dist/bin/uuid"
+            }
         },
-        "neatequal": {
+        "node_modules/aws-ssm-document-language-service": {
             "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/neatequal/-/neatequal-1.0.0.tgz",
-            "integrity": "sha512-sVt5awO4a4w24QmAthdrCPiVRW3naB8FGLdyadin01BH+6BzNPEBwGrpwCczQvPlULS6uXTItTe1PJ5P0kYm7A==",
-            "dev": true,
-            "requires": {
-                "varstream": "^0.3.2"
+            "license": "Apache-2.0",
+            "dependencies": {
+                "vscode-json-languageservice": "3.8.3",
+                "vscode-languageserver": "^6.1.1",
+                "yaml": "^1.10.0",
+                "yaml-language-server": "0.10.1"
             }
         },
-        "negotiator": {
-            "version": "0.6.3",
-            "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-            "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-            "dev": true
+        "node_modules/aws-ssm-document-language-service/node_modules/argparse": {
+            "version": "1.0.10",
+            "license": "MIT",
+            "dependencies": {
+                "sprintf-js": "~1.0.2"
+            }
         },
-        "neo-async": {
-            "version": "2.6.2",
-            "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-            "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-            "dev": true
+        "node_modules/aws-ssm-document-language-service/node_modules/js-yaml": {
+            "version": "3.14.1",
+            "license": "MIT",
+            "dependencies": {
+                "argparse": "^1.0.7",
+                "esprima": "^4.0.0"
+            },
+            "bin": {
+                "js-yaml": "bin/js-yaml.js"
+            }
         },
-        "next-tick": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
-            "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
-            "dev": true
+        "node_modules/aws-ssm-document-language-service/node_modules/jsonc-parser": {
+            "version": "2.3.1",
+            "license": "MIT"
         },
-        "nise": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.1.tgz",
-            "integrity": "sha512-yr5kW2THW1AkxVmCnKEh4nbYkJdB3I7LUkiUgOvEkOp414mc2UMaHMA7pjq1nYowhdoJZGwEKGaQVbxfpWj10A==",
-            "dev": true,
-            "requires": {
-                "@sinonjs/commons": "^1.8.3",
-                "@sinonjs/fake-timers": ">=5",
-                "@sinonjs/text-encoding": "^0.7.1",
-                "just-extend": "^4.0.2",
-                "path-to-regexp": "^1.7.0"
+        "node_modules/aws-ssm-document-language-service/node_modules/prettier": {
+            "version": "2.0.5",
+            "license": "MIT",
+            "optional": true,
+            "bin": {
+                "prettier": "bin-prettier.js"
+            },
+            "engines": {
+                "node": ">=10.13.0"
             }
         },
-        "node-abi": {
-            "version": "2.30.1",
-            "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz",
-            "integrity": "sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w==",
-            "dev": true,
-            "requires": {
-                "semver": "^5.4.1"
+        "node_modules/aws-ssm-document-language-service/node_modules/vscode-json-languageservice": {
+            "version": "3.8.3",
+            "license": "MIT",
+            "dependencies": {
+                "jsonc-parser": "^2.2.1",
+                "vscode-languageserver-textdocument": "^1.0.1",
+                "vscode-languageserver-types": "^3.15.1",
+                "vscode-nls": "^4.1.2",
+                "vscode-uri": "^2.1.2"
+            }
+        },
+        "node_modules/aws-ssm-document-language-service/node_modules/vscode-jsonrpc": {
+            "version": "4.0.0",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8.0.0 || >=10.0.0"
+            }
+        },
+        "node_modules/aws-ssm-document-language-service/node_modules/vscode-languageserver": {
+            "version": "6.1.1",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.1.1.tgz",
+            "integrity": "sha512-DueEpkUAkD5XTR4MLYNr6bQIp/UFR0/IPApgXU3YfCBCB08u2sm9hRCs6DxYZELkk++STPjpcjksR2H8qI3cDQ==",
+            "license": "MIT",
+            "dependencies": {
+                "vscode-languageserver-protocol": "^3.15.3"
             },
+            "bin": {
+                "installServerIntoExtension": "bin/installServerIntoExtension"
+            }
+        },
+        "node_modules/aws-ssm-document-language-service/node_modules/vscode-languageserver-protocol": {
+            "version": "3.14.1",
+            "license": "MIT",
             "dependencies": {
-                "semver": {
-                    "version": "5.7.1",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-                    "dev": true
-                }
+                "vscode-jsonrpc": "^4.0.0",
+                "vscode-languageserver-types": "3.14.0"
             }
         },
-        "node-addon-api": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-            "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
-            "dev": true
+        "node_modules/aws-ssm-document-language-service/node_modules/vscode-languageserver-protocol/node_modules/vscode-languageserver-types": {
+            "version": "3.14.0",
+            "license": "MIT"
         },
-        "node-forge": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-            "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
-            "dev": true
+        "node_modules/aws-ssm-document-language-service/node_modules/vscode-languageserver/node_modules/vscode-jsonrpc": {
+            "version": "8.2.0",
+            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz",
+            "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=14.0.0"
+            }
         },
-        "node-preload": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz",
-            "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==",
-            "dev": true,
-            "requires": {
-                "process-on-spawn": "^1.0.0"
+        "node_modules/aws-ssm-document-language-service/node_modules/vscode-languageserver/node_modules/vscode-languageserver-protocol": {
+            "version": "3.17.5",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz",
+            "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==",
+            "license": "MIT",
+            "dependencies": {
+                "vscode-jsonrpc": "8.2.0",
+                "vscode-languageserver-types": "3.17.5"
             }
         },
-        "node-releases": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.2.tgz",
-            "integrity": "sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==",
-            "dev": true
+        "node_modules/aws-ssm-document-language-service/node_modules/vscode-nls": {
+            "version": "4.1.2",
+            "license": "MIT"
         },
-        "normalize-package-data": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
-            "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
-            "dev": true,
-            "requires": {
-                "hosted-git-info": "^4.0.1",
-                "is-core-module": "^2.5.0",
-                "semver": "^7.3.4",
-                "validate-npm-package-license": "^3.0.1"
+        "node_modules/aws-ssm-document-language-service/node_modules/yaml-language-server": {
+            "version": "0.10.1",
+            "license": "MIT",
+            "dependencies": {
+                "js-yaml": "^3.13.1",
+                "jsonc-parser": "^2.2.1",
+                "request-light": "^0.2.4",
+                "vscode-json-languageservice": "^3.6.0",
+                "vscode-languageserver": "^5.2.1",
+                "vscode-languageserver-types": "^3.15.1",
+                "vscode-nls": "^4.1.2",
+                "vscode-uri": "^2.1.1",
+                "yaml-ast-parser-custom-tags": "0.0.43"
+            },
+            "bin": {
+                "yaml-language-server": "bin/yaml-language-server"
+            },
+            "engines": {
+                "node": "*"
+            },
+            "optionalDependencies": {
+                "prettier": "2.0.5"
             }
         },
-        "normalize-path": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-            "dev": true
+        "node_modules/aws-ssm-document-language-service/node_modules/yaml-language-server/node_modules/vscode-languageserver": {
+            "version": "5.2.1",
+            "license": "MIT",
+            "dependencies": {
+                "vscode-languageserver-protocol": "3.14.1",
+                "vscode-uri": "^1.0.6"
+            },
+            "bin": {
+                "installServerIntoExtension": "bin/installServerIntoExtension"
+            }
         },
-        "normalize-url": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-            "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="
+        "node_modules/aws-ssm-document-language-service/node_modules/yaml-language-server/node_modules/vscode-languageserver/node_modules/vscode-uri": {
+            "version": "1.0.8",
+            "license": "MIT"
         },
-        "npm-run-path": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-            "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+        "node_modules/aws-toolkit-vscode": {
+            "resolved": "packages/toolkit",
+            "link": true
+        },
+        "node_modules/azure-devops-node-api": {
+            "version": "11.2.0",
             "dev": true,
-            "requires": {
-                "path-key": "^3.0.0"
+            "license": "MIT",
+            "dependencies": {
+                "tunnel": "0.0.6",
+                "typed-rest-client": "^1.8.4"
             }
         },
-        "npmlog": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-            "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+        "node_modules/b4a": {
+            "version": "1.6.4",
             "dev": true,
-            "requires": {
-                "are-we-there-yet": "~1.1.2",
-                "console-control-strings": "~1.1.0",
-                "gauge": "~2.7.3",
-                "set-blocking": "~2.0.0"
-            }
+            "license": "ISC"
         },
-        "nth-check": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
-            "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
+        "node_modules/balanced-match": {
+            "version": "1.0.2",
+            "license": "MIT"
+        },
+        "node_modules/bare-events": {
+            "version": "2.2.2",
             "dev": true,
-            "requires": {
-                "boolbase": "^1.0.0"
+            "license": "Apache-2.0",
+            "optional": true
+        },
+        "node_modules/bare-fs": {
+            "version": "2.3.0",
+            "dev": true,
+            "license": "Apache-2.0",
+            "optional": true,
+            "dependencies": {
+                "bare-events": "^2.0.0",
+                "bare-path": "^2.0.0",
+                "bare-stream": "^1.0.0"
             }
         },
-        "number-is-nan": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-            "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-            "dev": true
+        "node_modules/bare-os": {
+            "version": "2.3.0",
+            "dev": true,
+            "license": "Apache-2.0",
+            "optional": true
         },
-        "nunjucks": {
-            "version": "3.2.3",
-            "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.3.tgz",
-            "integrity": "sha512-psb6xjLj47+fE76JdZwskvwG4MYsQKXUtMsPh6U0YMvmyjRtKRFcxnlXGWglNybtNTNVmGdp94K62/+NjF5FDQ==",
+        "node_modules/bare-path": {
+            "version": "2.1.2",
             "dev": true,
-            "requires": {
-                "a-sync-waterfall": "^1.0.0",
-                "asap": "^2.0.3",
-                "commander": "^5.1.0"
-            },
+            "license": "Apache-2.0",
+            "optional": true,
             "dependencies": {
-                "commander": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
-                    "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
-                    "dev": true
-                }
+                "bare-os": "^2.1.0"
             }
         },
-        "nyc": {
-            "version": "15.1.0",
-            "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz",
-            "integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==",
+        "node_modules/bare-stream": {
+            "version": "1.0.0",
             "dev": true,
-            "requires": {
-                "@istanbuljs/load-nyc-config": "^1.0.0",
-                "@istanbuljs/schema": "^0.1.2",
-                "caching-transform": "^4.0.0",
-                "convert-source-map": "^1.7.0",
-                "decamelize": "^1.2.0",
-                "find-cache-dir": "^3.2.0",
-                "find-up": "^4.1.0",
-                "foreground-child": "^2.0.0",
-                "get-package-type": "^0.1.0",
-                "glob": "^7.1.6",
-                "istanbul-lib-coverage": "^3.0.0",
-                "istanbul-lib-hook": "^3.0.0",
-                "istanbul-lib-instrument": "^4.0.0",
-                "istanbul-lib-processinfo": "^2.0.2",
-                "istanbul-lib-report": "^3.0.0",
-                "istanbul-lib-source-maps": "^4.0.0",
-                "istanbul-reports": "^3.0.2",
-                "make-dir": "^3.0.0",
-                "node-preload": "^0.2.1",
-                "p-map": "^3.0.0",
-                "process-on-spawn": "^1.0.0",
-                "resolve-from": "^5.0.0",
-                "rimraf": "^3.0.0",
-                "signal-exit": "^3.0.2",
-                "spawn-wrap": "^2.0.0",
-                "test-exclude": "^6.0.0",
-                "yargs": "^15.0.2"
-            },
+            "license": "Apache-2.0",
+            "optional": true,
             "dependencies": {
-                "ansi-regex": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-                    "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-                    "dev": true
-                },
-                "camelcase": {
-                    "version": "5.3.1",
-                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-                    "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-                    "dev": true
-                },
-                "cliui": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-                    "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-                    "dev": true,
-                    "requires": {
-                        "string-width": "^4.2.0",
-                        "strip-ansi": "^6.0.0",
-                        "wrap-ansi": "^6.2.0"
-                    }
-                },
-                "decamelize": {
-                    "version": "1.2.0",
-                    "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-                    "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-                    "dev": true
-                },
-                "find-up": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-                    "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-                    "dev": true,
-                    "requires": {
-                        "locate-path": "^5.0.0",
-                        "path-exists": "^4.0.0"
-                    }
-                },
-                "locate-path": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-                    "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-                    "dev": true,
-                    "requires": {
-                        "p-locate": "^4.1.0"
-                    }
-                },
-                "p-limit": {
-                    "version": "2.3.0",
-                    "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-                    "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-                    "dev": true,
-                    "requires": {
-                        "p-try": "^2.0.0"
-                    }
-                },
-                "p-locate": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-                    "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-                    "dev": true,
-                    "requires": {
-                        "p-limit": "^2.2.0"
-                    }
-                },
-                "p-map": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
-                    "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
-                    "dev": true,
-                    "requires": {
-                        "aggregate-error": "^3.0.0"
-                    }
-                },
-                "resolve-from": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-                    "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-                    "dev": true
-                },
-                "strip-ansi": {
-                    "version": "6.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-                    "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^5.0.1"
-                    }
-                },
-                "wrap-ansi": {
-                    "version": "6.2.0",
-                    "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-                    "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.0.0",
-                        "string-width": "^4.1.0",
-                        "strip-ansi": "^6.0.0"
-                    }
-                },
-                "y18n": {
-                    "version": "4.0.3",
-                    "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-                    "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-                    "dev": true
-                },
-                "yargs": {
-                    "version": "15.4.1",
-                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-                    "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
-                    "dev": true,
-                    "requires": {
-                        "cliui": "^6.0.0",
-                        "decamelize": "^1.2.0",
-                        "find-up": "^4.1.0",
-                        "get-caller-file": "^2.0.1",
-                        "require-directory": "^2.1.1",
-                        "require-main-filename": "^2.0.0",
-                        "set-blocking": "^2.0.0",
-                        "string-width": "^4.2.0",
-                        "which-module": "^2.0.0",
-                        "y18n": "^4.0.0",
-                        "yargs-parser": "^18.1.2"
-                    }
-                },
-                "yargs-parser": {
-                    "version": "18.1.3",
-                    "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-                    "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-                    "dev": true,
-                    "requires": {
-                        "camelcase": "^5.0.0",
-                        "decamelize": "^1.2.0"
-                    }
-                }
+                "streamx": "^2.16.1"
             }
         },
-        "object-assign": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-            "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-            "dev": true
-        },
-        "object-inspect": {
-            "version": "1.12.2",
-            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-            "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
-        },
-        "object-keys": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-            "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
-        },
-        "object.assign": {
-            "version": "4.1.4",
-            "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-            "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-            "requires": {
-                "call-bind": "^1.0.2",
+        "node_modules/base64-js": {
+            "version": "1.5.1",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "license": "MIT"
+        },
+        "node_modules/basic-auth": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "safe-buffer": "5.1.2"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/basic-auth/node_modules/safe-buffer": {
+            "version": "5.1.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/batch": {
+            "version": "0.6.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/big.js": {
+            "version": "5.2.2",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/binary-extensions": {
+            "version": "2.2.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/bl": {
+            "version": "4.1.0",
+            "license": "MIT",
+            "dependencies": {
+                "buffer": "^5.5.0",
+                "inherits": "^2.0.4",
+                "readable-stream": "^3.4.0"
+            }
+        },
+        "node_modules/bl/node_modules/buffer": {
+            "version": "5.7.1",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "base64-js": "^1.3.1",
+                "ieee754": "^1.1.13"
+            }
+        },
+        "node_modules/bn.js": {
+            "version": "5.2.1",
+            "license": "MIT"
+        },
+        "node_modules/body-parser": {
+            "version": "1.20.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "bytes": "3.1.2",
+                "content-type": "~1.0.5",
+                "debug": "2.6.9",
+                "depd": "2.0.0",
+                "destroy": "1.2.0",
+                "http-errors": "2.0.0",
+                "iconv-lite": "0.4.24",
+                "on-finished": "2.4.1",
+                "qs": "6.13.0",
+                "raw-body": "2.5.2",
+                "type-is": "~1.6.18",
+                "unpipe": "1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.8",
+                "npm": "1.2.8000 || >= 1.4.16"
+            }
+        },
+        "node_modules/body-parser/node_modules/debug": {
+            "version": "2.6.9",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/body-parser/node_modules/depd": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/body-parser/node_modules/ms": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/bonjour-service": {
+            "version": "1.0.13",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "array-flatten": "^2.1.2",
+                "dns-equal": "^1.0.0",
+                "fast-deep-equal": "^3.1.3",
+                "multicast-dns": "^7.2.5"
+            }
+        },
+        "node_modules/boolbase": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/bowser": {
+            "version": "2.11.0",
+            "license": "MIT"
+        },
+        "node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/braces": {
+            "version": "3.0.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fill-range": "^7.1.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/brorand": {
+            "version": "1.1.0",
+            "license": "MIT"
+        },
+        "node_modules/brotli": {
+            "version": "1.3.3",
+            "resolved": "https://registry.npmjs.org/brotli/-/brotli-1.3.3.tgz",
+            "integrity": "sha512-oTKjJdShmDuGW94SyyaoQvAjf30dZaHnjJ8uAF+u2/vGJkJbJPJAT1gDiOJP5v1Zb6f9KEyW/1HpuaWIXtGHPg==",
+            "license": "MIT",
+            "dependencies": {
+                "base64-js": "^1.1.2"
+            }
+        },
+        "node_modules/browser-stdout": {
+            "version": "1.3.1",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/browserify-aes": {
+            "version": "1.2.0",
+            "license": "MIT",
+            "dependencies": {
+                "buffer-xor": "^1.0.3",
+                "cipher-base": "^1.0.0",
+                "create-hash": "^1.1.0",
+                "evp_bytestokey": "^1.0.3",
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.0.1"
+            }
+        },
+        "node_modules/browserify-cipher": {
+            "version": "1.0.1",
+            "license": "MIT",
+            "dependencies": {
+                "browserify-aes": "^1.0.4",
+                "browserify-des": "^1.0.0",
+                "evp_bytestokey": "^1.0.0"
+            }
+        },
+        "node_modules/browserify-des": {
+            "version": "1.0.2",
+            "license": "MIT",
+            "dependencies": {
+                "cipher-base": "^1.0.1",
+                "des.js": "^1.0.0",
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.1.2"
+            }
+        },
+        "node_modules/browserify-rsa": {
+            "version": "4.1.0",
+            "license": "MIT",
+            "dependencies": {
+                "bn.js": "^5.0.0",
+                "randombytes": "^2.0.1"
+            }
+        },
+        "node_modules/browserify-sign": {
+            "version": "4.2.2",
+            "license": "ISC",
+            "dependencies": {
+                "bn.js": "^5.2.1",
+                "browserify-rsa": "^4.1.0",
+                "create-hash": "^1.2.0",
+                "create-hmac": "^1.1.7",
+                "elliptic": "^6.5.4",
+                "inherits": "^2.0.4",
+                "parse-asn1": "^5.1.6",
+                "readable-stream": "^3.6.2",
+                "safe-buffer": "^5.2.1"
+            },
+            "engines": {
+                "node": ">= 4"
+            }
+        },
+        "node_modules/browserify-zlib": {
+            "version": "0.1.4",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "pako": "~0.2.0"
+            }
+        },
+        "node_modules/browserify-zlib/node_modules/pako": {
+            "version": "0.2.9",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/browserslist": {
+            "version": "4.23.1",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/browserslist"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/browserslist"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "caniuse-lite": "^1.0.30001629",
+                "electron-to-chromium": "^1.4.796",
+                "node-releases": "^2.0.14",
+                "update-browserslist-db": "^1.0.16"
+            },
+            "bin": {
+                "browserslist": "cli.js"
+            },
+            "engines": {
+                "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+            }
+        },
+        "node_modules/buffer": {
+            "version": "4.9.2",
+            "license": "MIT",
+            "dependencies": {
+                "base64-js": "^1.0.2",
+                "ieee754": "^1.1.4",
+                "isarray": "^1.0.0"
+            }
+        },
+        "node_modules/buffer-crc32": {
+            "version": "0.2.13",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/buffer-from": {
+            "version": "1.1.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/buffer-xor": {
+            "version": "1.0.3",
+            "license": "MIT"
+        },
+        "node_modules/builtin-modules": {
+            "version": "3.3.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/bytes": {
+            "version": "3.1.2",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/c8": {
+            "version": "9.0.0",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "@bcoe/v8-coverage": "^0.2.3",
+                "@istanbuljs/schema": "^0.1.3",
+                "find-up": "^5.0.0",
+                "foreground-child": "^3.1.1",
+                "istanbul-lib-coverage": "^3.2.0",
+                "istanbul-lib-report": "^3.0.1",
+                "istanbul-reports": "^3.1.6",
+                "test-exclude": "^6.0.0",
+                "v8-to-istanbul": "^9.0.0",
+                "yargs": "^17.7.2",
+                "yargs-parser": "^21.1.1"
+            },
+            "bin": {
+                "c8": "bin/c8.js"
+            },
+            "engines": {
+                "node": ">=14.14.0"
+            }
+        },
+        "node_modules/c8/node_modules/yargs-parser": {
+            "version": "21.1.1",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/cache-content-type": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "mime-types": "^2.1.18",
+                "ylru": "^1.2.0"
+            },
+            "engines": {
+                "node": ">= 6.0.0"
+            }
+        },
+        "node_modules/cacheable-lookup": {
+            "version": "5.0.4",
+            "license": "MIT",
+            "engines": {
+                "node": ">=10.6.0"
+            }
+        },
+        "node_modules/cacheable-request": {
+            "version": "7.0.2",
+            "license": "MIT",
+            "dependencies": {
+                "clone-response": "^1.0.2",
+                "get-stream": "^5.1.0",
+                "http-cache-semantics": "^4.0.0",
+                "keyv": "^4.0.0",
+                "lowercase-keys": "^2.0.0",
+                "normalize-url": "^6.0.1",
+                "responselike": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/call-bind": {
+            "version": "1.0.7",
+            "license": "MIT",
+            "dependencies": {
+                "es-define-property": "^1.0.0",
+                "es-errors": "^1.3.0",
+                "function-bind": "^1.1.2",
+                "get-intrinsic": "^1.2.4",
+                "set-function-length": "^1.2.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/call-me-maybe": {
+            "version": "1.0.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/caller-callsite": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "callsites": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/caller-callsite/node_modules/callsites": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/caller-path": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "caller-callsite": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/callsites": {
+            "version": "3.1.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/camelcase": {
+            "version": "6.2.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/camelcase-keys": {
+            "version": "6.2.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "camelcase": "^5.3.1",
+                "map-obj": "^4.0.0",
+                "quick-lru": "^4.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/camelcase-keys/node_modules/camelcase": {
+            "version": "5.3.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/camelcase-keys/node_modules/quick-lru": {
+            "version": "4.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/caniuse-lite": {
+            "version": "1.0.30001638",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/browserslist"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "CC-BY-4.0"
+        },
+        "node_modules/chalk": {
+            "version": "4.1.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/chalk?sponsor=1"
+            }
+        },
+        "node_modules/charenc": {
+            "version": "0.0.2",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/cheerio": {
+            "version": "1.0.0-rc.12",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "cheerio-select": "^2.1.0",
+                "dom-serializer": "^2.0.0",
+                "domhandler": "^5.0.3",
+                "domutils": "^3.0.1",
+                "htmlparser2": "^8.0.1",
+                "parse5": "^7.0.0",
+                "parse5-htmlparser2-tree-adapter": "^7.0.0"
+            },
+            "engines": {
+                "node": ">= 6"
+            },
+            "funding": {
+                "url": "https://github.com/cheeriojs/cheerio?sponsor=1"
+            }
+        },
+        "node_modules/cheerio-select": {
+            "version": "2.1.0",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "boolbase": "^1.0.0",
+                "css-select": "^5.1.0",
+                "css-what": "^6.1.0",
+                "domelementtype": "^2.3.0",
+                "domhandler": "^5.0.3",
+                "domutils": "^3.0.1"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/fb55"
+            }
+        },
+        "node_modules/chokidar": {
+            "version": "3.5.3",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "individual",
+                    "url": "https://paulmillr.com/funding/"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "anymatch": "~3.1.2",
+                "braces": "~3.0.2",
+                "glob-parent": "~5.1.2",
+                "is-binary-path": "~2.1.0",
+                "is-glob": "~4.0.1",
+                "normalize-path": "~3.0.0",
+                "readdirp": "~3.6.0"
+            },
+            "engines": {
+                "node": ">= 8.10.0"
+            },
+            "optionalDependencies": {
+                "fsevents": "~2.3.2"
+            }
+        },
+        "node_modules/chownr": {
+            "version": "1.1.4",
+            "license": "ISC"
+        },
+        "node_modules/chrome-trace-event": {
+            "version": "1.0.3",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.0"
+            }
+        },
+        "node_modules/ci-info": {
+            "version": "4.0.0",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/sibiraj-s"
+                }
+            ],
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/cipher-base": {
+            "version": "1.0.4",
+            "license": "MIT",
+            "dependencies": {
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.0.1"
+            }
+        },
+        "node_modules/circular-dependency-plugin": {
+            "version": "5.2.2",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=6.0.0"
+            },
+            "peerDependencies": {
+                "webpack": ">=4.0.1"
+            }
+        },
+        "node_modules/clean-regexp": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "escape-string-regexp": "^1.0.5"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/clean-regexp/node_modules/escape-string-regexp": {
+            "version": "1.0.5",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.8.0"
+            }
+        },
+        "node_modules/cli-color": {
+            "version": "2.0.3",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "d": "^1.0.1",
+                "es5-ext": "^0.10.61",
+                "es6-iterator": "^2.0.3",
+                "memoizee": "^0.4.15",
+                "timers-ext": "^0.1.7"
+            },
+            "engines": {
+                "node": ">=0.10"
+            }
+        },
+        "node_modules/cliui": {
+            "version": "7.0.4",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "string-width": "^4.2.0",
+                "strip-ansi": "^6.0.0",
+                "wrap-ansi": "^7.0.0"
+            }
+        },
+        "node_modules/cliui/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/cliui/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/clone": {
+            "version": "2.1.2",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.8"
+            }
+        },
+        "node_modules/clone-buffer": {
+            "version": "1.0.0",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/clone-deep": {
+            "version": "4.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-plain-object": "^2.0.4",
+                "kind-of": "^6.0.2",
+                "shallow-clone": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/clone-response": {
+            "version": "1.0.2",
+            "license": "MIT",
+            "dependencies": {
+                "mimic-response": "^1.0.0"
+            }
+        },
+        "node_modules/clone-stats": {
+            "version": "1.0.0",
+            "license": "MIT"
+        },
+        "node_modules/cloneable-readable": {
+            "version": "1.1.3",
+            "license": "MIT",
+            "dependencies": {
+                "inherits": "^2.0.1",
+                "process-nextick-args": "^2.0.0",
+                "readable-stream": "^2.3.5"
+            }
+        },
+        "node_modules/cloneable-readable/node_modules/readable-stream": {
+            "version": "2.3.7",
+            "license": "MIT",
+            "dependencies": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+            }
+        },
+        "node_modules/cloneable-readable/node_modules/safe-buffer": {
+            "version": "5.1.2",
+            "license": "MIT"
+        },
+        "node_modules/cloneable-readable/node_modules/string_decoder": {
+            "version": "1.1.1",
+            "license": "MIT",
+            "dependencies": {
+                "safe-buffer": "~5.1.0"
+            }
+        },
+        "node_modules/co": {
+            "version": "4.6.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "iojs": ">= 1.0.0",
+                "node": ">= 0.12.0"
+            }
+        },
+        "node_modules/code-block-writer": {
+            "version": "13.0.3",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/code-point-at": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+            "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/color": {
+            "version": "3.2.1",
+            "license": "MIT",
+            "dependencies": {
+                "color-convert": "^1.9.3",
+                "color-string": "^1.6.0"
+            }
+        },
+        "node_modules/color-convert": {
+            "version": "2.0.1",
+            "license": "MIT",
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/color-name": {
+            "version": "1.1.4",
+            "license": "MIT"
+        },
+        "node_modules/color-string": {
+            "version": "1.9.1",
+            "license": "MIT",
+            "dependencies": {
+                "color-name": "^1.0.0",
+                "simple-swizzle": "^0.2.2"
+            }
+        },
+        "node_modules/color-support": {
+            "version": "1.1.3",
+            "license": "ISC",
+            "bin": {
+                "color-support": "bin.js"
+            }
+        },
+        "node_modules/color/node_modules/color-convert": {
+            "version": "1.9.3",
+            "license": "MIT",
+            "dependencies": {
+                "color-name": "1.1.3"
+            }
+        },
+        "node_modules/color/node_modules/color-name": {
+            "version": "1.1.3",
+            "license": "MIT"
+        },
+        "node_modules/colorette": {
+            "version": "2.0.16",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/colorspace": {
+            "version": "1.1.4",
+            "license": "MIT",
+            "dependencies": {
+                "color": "^3.1.3",
+                "text-hex": "1.0.x"
+            }
+        },
+        "node_modules/combined-stream": {
+            "version": "1.0.8",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "delayed-stream": "~1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/commander": {
+            "version": "6.2.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/compressible": {
+            "version": "2.0.18",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "mime-db": ">= 1.43.0 < 2"
+            },
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/compression": {
+            "version": "1.7.4",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "accepts": "~1.3.5",
+                "bytes": "3.0.0",
+                "compressible": "~2.0.16",
+                "debug": "2.6.9",
+                "on-headers": "~1.0.2",
+                "safe-buffer": "5.1.2",
+                "vary": "~1.1.2"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/compression/node_modules/bytes": {
+            "version": "3.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/compression/node_modules/debug": {
+            "version": "2.6.9",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/compression/node_modules/ms": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/compression/node_modules/safe-buffer": {
+            "version": "5.1.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/concat-map": {
+            "version": "0.0.1",
+            "license": "MIT"
+        },
+        "node_modules/connect-history-api-fallback": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.8"
+            }
+        },
+        "node_modules/console-control-strings": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+            "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+            "license": "ISC"
+        },
+        "node_modules/content-disposition": {
+            "version": "0.5.4",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "safe-buffer": "5.2.1"
+            },
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/content-type": {
+            "version": "1.0.5",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/convert-source-map": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/cookie": {
+            "version": "0.7.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/cookie-signature": {
+            "version": "1.0.6",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/cookies": {
+            "version": "0.9.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "depd": "~2.0.0",
+                "keygrip": "~1.1.0"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/cookies/node_modules/depd": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/core-js-compat": {
+            "version": "3.37.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "browserslist": "^4.23.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/core-js"
+            }
+        },
+        "node_modules/core-util-is": {
+            "version": "1.0.3",
+            "license": "MIT"
+        },
+        "node_modules/cosmiconfig": {
+            "version": "5.2.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "import-fresh": "^2.0.0",
+                "is-directory": "^0.3.1",
+                "js-yaml": "^3.13.1",
+                "parse-json": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/cosmiconfig/node_modules/argparse": {
+            "version": "1.0.10",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "sprintf-js": "~1.0.2"
+            }
+        },
+        "node_modules/cosmiconfig/node_modules/import-fresh": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "caller-path": "^2.0.0",
+                "resolve-from": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/cosmiconfig/node_modules/js-yaml": {
+            "version": "3.14.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "argparse": "^1.0.7",
+                "esprima": "^4.0.0"
+            },
+            "bin": {
+                "js-yaml": "bin/js-yaml.js"
+            }
+        },
+        "node_modules/cosmiconfig/node_modules/parse-json": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "error-ex": "^1.3.1",
+                "json-parse-better-errors": "^1.0.1"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/cosmiconfig/node_modules/resolve-from": {
+            "version": "3.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/create-ecdh": {
+            "version": "4.0.4",
+            "license": "MIT",
+            "dependencies": {
+                "bn.js": "^4.1.0",
+                "elliptic": "^6.5.3"
+            }
+        },
+        "node_modules/create-ecdh/node_modules/bn.js": {
+            "version": "4.12.0",
+            "license": "MIT"
+        },
+        "node_modules/create-hash": {
+            "version": "1.2.0",
+            "license": "MIT",
+            "dependencies": {
+                "cipher-base": "^1.0.1",
+                "inherits": "^2.0.1",
+                "md5.js": "^1.3.4",
+                "ripemd160": "^2.0.1",
+                "sha.js": "^2.4.0"
+            }
+        },
+        "node_modules/create-hmac": {
+            "version": "1.1.7",
+            "license": "MIT",
+            "dependencies": {
+                "cipher-base": "^1.0.3",
+                "create-hash": "^1.1.0",
+                "inherits": "^2.0.1",
+                "ripemd160": "^2.0.0",
+                "safe-buffer": "^5.0.1",
+                "sha.js": "^2.4.8"
+            }
+        },
+        "node_modules/create-require": {
+            "version": "1.1.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/cross-fetch": {
+            "version": "4.0.0",
+            "license": "MIT",
+            "dependencies": {
+                "node-fetch": "^2.6.12"
+            }
+        },
+        "node_modules/cross-spawn": {
+            "version": "7.0.6",
+            "license": "MIT",
+            "dependencies": {
+                "path-key": "^3.1.0",
+                "shebang-command": "^2.0.0",
+                "which": "^2.0.1"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/crypt": {
+            "version": "0.0.2",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/crypto-browserify": {
+            "version": "3.12.0",
+            "license": "MIT",
+            "dependencies": {
+                "browserify-cipher": "^1.0.0",
+                "browserify-sign": "^4.0.0",
+                "create-ecdh": "^4.0.0",
+                "create-hash": "^1.1.0",
+                "create-hmac": "^1.1.0",
+                "diffie-hellman": "^5.0.0",
+                "inherits": "^2.0.1",
+                "pbkdf2": "^3.0.3",
+                "public-encrypt": "^4.0.0",
+                "randombytes": "^2.0.0",
+                "randomfill": "^1.0.3"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/css-loader": {
+            "version": "6.10.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "icss-utils": "^5.1.0",
+                "postcss": "^8.4.33",
+                "postcss-modules-extract-imports": "^3.0.0",
+                "postcss-modules-local-by-default": "^4.0.4",
+                "postcss-modules-scope": "^3.1.1",
+                "postcss-modules-values": "^4.0.0",
+                "postcss-value-parser": "^4.2.0",
+                "semver": "^7.5.4"
+            },
+            "engines": {
+                "node": ">= 12.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "@rspack/core": "0.x || 1.x",
+                "webpack": "^5.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@rspack/core": {
+                    "optional": true
+                },
+                "webpack": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/css-select": {
+            "version": "5.1.0",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "boolbase": "^1.0.0",
+                "css-what": "^6.1.0",
+                "domhandler": "^5.0.2",
+                "domutils": "^3.0.1",
+                "nth-check": "^2.0.1"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/fb55"
+            }
+        },
+        "node_modules/css-what": {
+            "version": "6.1.0",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">= 6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/fb55"
+            }
+        },
+        "node_modules/cssesc": {
+            "version": "3.0.0",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "cssesc": "bin/cssesc"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/cssstyle": {
+            "version": "3.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "rrweb-cssom": "^0.6.0"
+            },
+            "engines": {
+                "node": ">=14"
+            }
+        },
+        "node_modules/csstype": {
+            "version": "3.1.2",
+            "license": "MIT"
+        },
+        "node_modules/cubic2quad": {
+            "version": "1.2.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/d": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "es5-ext": "^0.10.50",
+                "type": "^1.0.1"
+            }
+        },
+        "node_modules/data-urls": {
+            "version": "5.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "whatwg-mimetype": "^4.0.0",
+                "whatwg-url": "^14.0.0"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/debug": {
+            "version": "4.3.4",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ms": "2.1.2"
+            },
+            "engines": {
+                "node": ">=6.0"
+            },
+            "peerDependenciesMeta": {
+                "supports-color": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/decamelize": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/decamelize-keys": {
+            "version": "1.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "decamelize": "^1.1.0",
+                "map-obj": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/decamelize-keys/node_modules/decamelize": {
+            "version": "1.2.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/decamelize-keys/node_modules/map-obj": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/decimal.js": {
+            "version": "10.4.3",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/decompress-response": {
+            "version": "6.0.0",
+            "license": "MIT",
+            "dependencies": {
+                "mimic-response": "^3.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/decompress-response/node_modules/mimic-response": {
+            "version": "3.1.0",
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/deep-equal": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/deep-extend": {
+            "version": "0.6.0",
+            "license": "MIT",
+            "engines": {
+                "node": ">=4.0.0"
+            }
+        },
+        "node_modules/deep-is": {
+            "version": "0.1.4",
+            "license": "MIT"
+        },
+        "node_modules/deepmerge": {
+            "version": "4.2.2",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/default-gateway": {
+            "version": "6.0.3",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "execa": "^5.0.0"
+            },
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/defer-to-connect": {
+            "version": "2.0.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/define-data-property": {
+            "version": "1.1.4",
+            "license": "MIT",
+            "dependencies": {
+                "es-define-property": "^1.0.0",
+                "es-errors": "^1.3.0",
+                "gopd": "^1.0.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/define-lazy-prop": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/define-properties": {
+            "version": "1.1.4",
+            "license": "MIT",
+            "dependencies": {
+                "has-property-descriptors": "^1.0.0",
+                "object-keys": "^1.1.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/delayed-stream": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/delegates": {
+            "version": "1.0.0",
+            "license": "MIT"
+        },
+        "node_modules/depd": {
+            "version": "1.1.2",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/des.js": {
+            "version": "1.1.0",
+            "license": "MIT",
+            "dependencies": {
+                "inherits": "^2.0.1",
+                "minimalistic-assert": "^1.0.0"
+            }
+        },
+        "node_modules/destroy": {
+            "version": "1.2.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8",
+                "npm": "1.2.8000 || >= 1.4.16"
+            }
+        },
+        "node_modules/detect-libc": {
+            "version": "2.0.2",
+            "dev": true,
+            "license": "Apache-2.0",
+            "optional": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/detect-node": {
+            "version": "2.1.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/dfa": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/dfa/-/dfa-1.2.0.tgz",
+            "integrity": "sha512-ED3jP8saaweFTjeGX8HQPjeC1YYyZs98jGNZx6IiBvxW7JG5v492kamAQB3m2wop07CvU/RQmzcKr6bgcC5D/Q==",
+            "license": "MIT"
+        },
+        "node_modules/diff": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
+            "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==",
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">=0.3.1"
+            }
+        },
+        "node_modules/diffie-hellman": {
+            "version": "5.0.3",
+            "license": "MIT",
+            "dependencies": {
+                "bn.js": "^4.1.0",
+                "miller-rabin": "^4.0.0",
+                "randombytes": "^2.0.0"
+            }
+        },
+        "node_modules/diffie-hellman/node_modules/bn.js": {
+            "version": "4.12.0",
+            "license": "MIT"
+        },
+        "node_modules/dir-glob": {
+            "version": "3.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "path-type": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/dns-equal": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/dns-packet": {
+            "version": "5.4.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@leichtgewicht/ip-codec": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/doctrine": {
+            "version": "3.0.0",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "esutils": "^2.0.2"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/dom-serializer": {
+            "version": "2.0.0",
+            "license": "MIT",
+            "dependencies": {
+                "domelementtype": "^2.3.0",
+                "domhandler": "^5.0.2",
+                "entities": "^4.2.0"
+            },
+            "funding": {
+                "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+            }
+        },
+        "node_modules/domelementtype": {
+            "version": "2.3.0",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/fb55"
+                }
+            ],
+            "license": "BSD-2-Clause"
+        },
+        "node_modules/domhandler": {
+            "version": "5.0.3",
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "domelementtype": "^2.3.0"
+            },
+            "engines": {
+                "node": ">= 4"
+            },
+            "funding": {
+                "url": "https://github.com/fb55/domhandler?sponsor=1"
+            }
+        },
+        "node_modules/domutils": {
+            "version": "3.1.0",
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "dom-serializer": "^2.0.0",
+                "domelementtype": "^2.3.0",
+                "domhandler": "^5.0.3"
+            },
+            "funding": {
+                "url": "https://github.com/fb55/domutils?sponsor=1"
+            }
+        },
+        "node_modules/duplexer": {
+            "version": "0.1.2",
+            "license": "MIT"
+        },
+        "node_modules/duplexify": {
+            "version": "3.7.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "end-of-stream": "^1.0.0",
+                "inherits": "^2.0.1",
+                "readable-stream": "^2.0.0",
+                "stream-shift": "^1.0.0"
+            }
+        },
+        "node_modules/duplexify/node_modules/readable-stream": {
+            "version": "2.3.8",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+            }
+        },
+        "node_modules/duplexify/node_modules/safe-buffer": {
+            "version": "5.1.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/duplexify/node_modules/string_decoder": {
+            "version": "1.1.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "safe-buffer": "~5.1.0"
+            }
+        },
+        "node_modules/eastasianwidth": {
+            "version": "0.2.0",
+            "license": "MIT"
+        },
+        "node_modules/ee-first": {
+            "version": "1.1.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/electron-to-chromium": {
+            "version": "1.4.812",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/elliptic": {
+            "version": "6.6.1",
+            "license": "MIT",
+            "dependencies": {
+                "bn.js": "^4.11.9",
+                "brorand": "^1.1.0",
+                "hash.js": "^1.0.0",
+                "hmac-drbg": "^1.0.1",
+                "inherits": "^2.0.4",
+                "minimalistic-assert": "^1.0.1",
+                "minimalistic-crypto-utils": "^1.0.1"
+            }
+        },
+        "node_modules/elliptic/node_modules/bn.js": {
+            "version": "4.12.0",
+            "license": "MIT"
+        },
+        "node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "license": "MIT"
+        },
+        "node_modules/emojis-list": {
+            "version": "3.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 4"
+            }
+        },
+        "node_modules/enabled": {
+            "version": "2.0.0",
+            "license": "MIT"
+        },
+        "node_modules/encodeurl": {
+            "version": "1.0.2",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/end-of-stream": {
+            "version": "1.4.4",
+            "license": "MIT",
+            "dependencies": {
+                "once": "^1.4.0"
+            }
+        },
+        "node_modules/enhanced-resolve": {
+            "version": "5.17.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "graceful-fs": "^4.2.4",
+                "tapable": "^2.2.0"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/entities": {
+            "version": "4.5.0",
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=0.12"
+            },
+            "funding": {
+                "url": "https://github.com/fb55/entities?sponsor=1"
+            }
+        },
+        "node_modules/envinfo": {
+            "version": "7.11.1",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "envinfo": "dist/cli.js"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/error-ex": {
+            "version": "1.3.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-arrayish": "^0.2.1"
+            }
+        },
+        "node_modules/error-ex/node_modules/is-arrayish": {
+            "version": "0.2.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/es-abstract": {
+            "version": "1.20.2",
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.2",
+                "es-to-primitive": "^1.2.1",
+                "function-bind": "^1.1.1",
+                "function.prototype.name": "^1.1.5",
+                "get-intrinsic": "^1.1.2",
+                "get-symbol-description": "^1.0.0",
+                "has": "^1.0.3",
+                "has-property-descriptors": "^1.0.0",
+                "has-symbols": "^1.0.3",
+                "internal-slot": "^1.0.3",
+                "is-callable": "^1.2.4",
+                "is-negative-zero": "^2.0.2",
+                "is-regex": "^1.1.4",
+                "is-shared-array-buffer": "^1.0.2",
+                "is-string": "^1.0.7",
+                "is-weakref": "^1.0.2",
+                "object-inspect": "^1.12.2",
+                "object-keys": "^1.1.1",
+                "object.assign": "^4.1.4",
+                "regexp.prototype.flags": "^1.4.3",
+                "string.prototype.trimend": "^1.0.5",
+                "string.prototype.trimstart": "^1.0.5",
+                "unbox-primitive": "^1.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/es-define-property": {
+            "version": "1.0.0",
+            "license": "MIT",
+            "dependencies": {
+                "get-intrinsic": "^1.2.4"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/es-errors": {
+            "version": "1.3.0",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/es-module-lexer": {
+            "version": "1.2.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/es-to-primitive": {
+            "version": "1.2.1",
+            "license": "MIT",
+            "dependencies": {
+                "is-callable": "^1.1.4",
+                "is-date-object": "^1.0.1",
+                "is-symbol": "^1.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/es5-ext": {
+            "version": "0.10.64",
+            "dev": true,
+            "hasInstallScript": true,
+            "license": "ISC",
+            "dependencies": {
+                "es6-iterator": "^2.0.3",
+                "es6-symbol": "^3.1.3",
+                "esniff": "^2.0.1",
+                "next-tick": "^1.1.0"
+            },
+            "engines": {
+                "node": ">=0.10"
+            }
+        },
+        "node_modules/es6-iterator": {
+            "version": "2.0.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "d": "1",
+                "es5-ext": "^0.10.35",
+                "es6-symbol": "^3.1.1"
+            }
+        },
+        "node_modules/es6-promise": {
+            "version": "4.2.8",
+            "license": "MIT"
+        },
+        "node_modules/es6-promisify": {
+            "version": "5.0.0",
+            "license": "MIT",
+            "dependencies": {
+                "es6-promise": "^4.0.3"
+            }
+        },
+        "node_modules/es6-symbol": {
+            "version": "3.1.3",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "d": "^1.0.1",
+                "ext": "^1.1.2"
+            }
+        },
+        "node_modules/es6-weak-map": {
+            "version": "2.0.3",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "d": "1",
+                "es5-ext": "^0.10.46",
+                "es6-iterator": "^2.0.3",
+                "es6-symbol": "^3.1.1"
+            }
+        },
+        "node_modules/esbuild": {
+            "version": "0.15.13",
+            "dev": true,
+            "hasInstallScript": true,
+            "license": "MIT",
+            "bin": {
+                "esbuild": "bin/esbuild"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "optionalDependencies": {
+                "@esbuild/android-arm": "0.15.13",
+                "@esbuild/linux-loong64": "0.15.13",
+                "esbuild-android-64": "0.15.13",
+                "esbuild-android-arm64": "0.15.13",
+                "esbuild-darwin-64": "0.15.13",
+                "esbuild-darwin-arm64": "0.15.13",
+                "esbuild-freebsd-64": "0.15.13",
+                "esbuild-freebsd-arm64": "0.15.13",
+                "esbuild-linux-32": "0.15.13",
+                "esbuild-linux-64": "0.15.13",
+                "esbuild-linux-arm": "0.15.13",
+                "esbuild-linux-arm64": "0.15.13",
+                "esbuild-linux-mips64le": "0.15.13",
+                "esbuild-linux-ppc64le": "0.15.13",
+                "esbuild-linux-riscv64": "0.15.13",
+                "esbuild-linux-s390x": "0.15.13",
+                "esbuild-netbsd-64": "0.15.13",
+                "esbuild-openbsd-64": "0.15.13",
+                "esbuild-sunos-64": "0.15.13",
+                "esbuild-windows-32": "0.15.13",
+                "esbuild-windows-64": "0.15.13",
+                "esbuild-windows-arm64": "0.15.13"
+            }
+        },
+        "node_modules/esbuild-loader": {
+            "version": "2.20.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "esbuild": "^0.15.6",
+                "joycon": "^3.0.1",
+                "json5": "^2.2.0",
+                "loader-utils": "^2.0.0",
+                "tapable": "^2.2.0",
+                "webpack-sources": "^2.2.0"
+            },
+            "funding": {
+                "url": "https://github.com/privatenumber/esbuild-loader?sponsor=1"
+            },
+            "peerDependencies": {
+                "webpack": "^4.40.0 || ^5.0.0"
+            }
+        },
+        "node_modules/esbuild/node_modules/esbuild-darwin-arm64": {
+            "version": "0.15.13",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/escalade": {
+            "version": "3.1.2",
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/escape-html": {
+            "version": "1.0.3",
+            "license": "MIT"
+        },
+        "node_modules/escape-string-regexp": {
+            "version": "4.0.0",
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/eslint": {
+            "version": "8.56.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@eslint-community/eslint-utils": "^4.2.0",
+                "@eslint-community/regexpp": "^4.6.1",
+                "@eslint/eslintrc": "^2.1.4",
+                "@eslint/js": "8.56.0",
+                "@humanwhocodes/config-array": "^0.11.13",
+                "@humanwhocodes/module-importer": "^1.0.1",
+                "@nodelib/fs.walk": "^1.2.8",
+                "@ungap/structured-clone": "^1.2.0",
+                "ajv": "^6.12.4",
+                "chalk": "^4.0.0",
+                "cross-spawn": "^7.0.2",
+                "debug": "^4.3.2",
+                "doctrine": "^3.0.0",
+                "escape-string-regexp": "^4.0.0",
+                "eslint-scope": "^7.2.2",
+                "eslint-visitor-keys": "^3.4.3",
+                "espree": "^9.6.1",
+                "esquery": "^1.4.2",
+                "esutils": "^2.0.2",
+                "fast-deep-equal": "^3.1.3",
+                "file-entry-cache": "^6.0.1",
+                "find-up": "^5.0.0",
+                "glob-parent": "^6.0.2",
+                "globals": "^13.19.0",
+                "graphemer": "^1.4.0",
+                "ignore": "^5.2.0",
+                "imurmurhash": "^0.1.4",
+                "is-glob": "^4.0.0",
+                "is-path-inside": "^3.0.3",
+                "js-yaml": "^4.1.0",
+                "json-stable-stringify-without-jsonify": "^1.0.1",
+                "levn": "^0.4.1",
+                "lodash.merge": "^4.6.2",
+                "minimatch": "^3.1.2",
+                "natural-compare": "^1.4.0",
+                "optionator": "^0.9.3",
+                "strip-ansi": "^6.0.1",
+                "text-table": "^0.2.0"
+            },
+            "bin": {
+                "eslint": "bin/eslint.js"
+            },
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/eslint-config-prettier": {
+            "version": "9.1.0",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "eslint-config-prettier": "bin/cli.js"
+            },
+            "peerDependencies": {
+                "eslint": ">=7.0.0"
+            }
+        },
+        "node_modules/eslint-plugin-aws-toolkits": {
+            "resolved": "plugins/eslint-plugin-aws-toolkits",
+            "link": true
+        },
+        "node_modules/eslint-plugin-header": {
+            "version": "3.1.1",
+            "dev": true,
+            "license": "MIT",
+            "peerDependencies": {
+                "eslint": ">=7.7.0"
+            }
+        },
+        "node_modules/eslint-plugin-prettier": {
+            "version": "5.1.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "prettier-linter-helpers": "^1.0.0",
+                "synckit": "^0.8.6"
+            },
+            "engines": {
+                "node": "^14.18.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint-plugin-prettier"
+            },
+            "peerDependencies": {
+                "@types/eslint": ">=8.0.0",
+                "eslint": ">=8.0.0",
+                "eslint-config-prettier": "*",
+                "prettier": ">=3.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/eslint": {
+                    "optional": true
+                },
+                "eslint-config-prettier": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/eslint-plugin-security-node": {
+            "version": "1.1.4",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/eslint-plugin-unicorn": {
+            "version": "54.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-validator-identifier": "^7.24.5",
+                "@eslint-community/eslint-utils": "^4.4.0",
+                "@eslint/eslintrc": "^3.0.2",
+                "ci-info": "^4.0.0",
+                "clean-regexp": "^1.0.0",
+                "core-js-compat": "^3.37.0",
+                "esquery": "^1.5.0",
+                "indent-string": "^4.0.0",
+                "is-builtin-module": "^3.2.1",
+                "jsesc": "^3.0.2",
+                "pluralize": "^8.0.0",
+                "read-pkg-up": "^7.0.1",
+                "regexp-tree": "^0.1.27",
+                "regjsparser": "^0.10.0",
+                "semver": "^7.6.1",
+                "strip-indent": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=18.18"
+            },
+            "funding": {
+                "url": "https://github.com/sindresorhus/eslint-plugin-unicorn?sponsor=1"
+            },
+            "peerDependencies": {
+                "eslint": ">=8.56.0"
+            }
+        },
+        "node_modules/eslint-plugin-unicorn/node_modules/@eslint/eslintrc": {
+            "version": "3.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ajv": "^6.12.4",
+                "debug": "^4.3.2",
+                "espree": "^10.0.1",
+                "globals": "^14.0.0",
+                "ignore": "^5.2.0",
+                "import-fresh": "^3.2.1",
+                "js-yaml": "^4.1.0",
+                "minimatch": "^3.1.2",
+                "strip-json-comments": "^3.1.1"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/eslint-plugin-unicorn/node_modules/eslint-visitor-keys": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/eslint-plugin-unicorn/node_modules/espree": {
+            "version": "10.1.0",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "acorn": "^8.12.0",
+                "acorn-jsx": "^5.3.2",
+                "eslint-visitor-keys": "^4.0.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/eslint-plugin-unicorn/node_modules/globals": {
+            "version": "14.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/eslint-scope": {
+            "version": "5.1.1",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "esrecurse": "^4.3.0",
+                "estraverse": "^4.1.1"
+            },
+            "engines": {
+                "node": ">=8.0.0"
+            }
+        },
+        "node_modules/eslint-visitor-keys": {
+            "version": "3.4.3",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/eslint/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/eslint/node_modules/eslint-scope": {
+            "version": "7.2.2",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "esrecurse": "^4.3.0",
+                "estraverse": "^5.2.0"
+            },
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/eslint/node_modules/estraverse": {
+            "version": "5.3.0",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=4.0"
+            }
+        },
+        "node_modules/eslint/node_modules/glob-parent": {
+            "version": "6.0.2",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "is-glob": "^4.0.3"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/eslint/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/esniff": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "d": "^1.0.1",
+                "es5-ext": "^0.10.62",
+                "event-emitter": "^0.3.5",
+                "type": "^2.7.2"
+            },
+            "engines": {
+                "node": ">=0.10"
+            }
+        },
+        "node_modules/esniff/node_modules/type": {
+            "version": "2.7.3",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/espree": {
+            "version": "9.6.1",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "acorn": "^8.9.0",
+                "acorn-jsx": "^5.3.2",
+                "eslint-visitor-keys": "^3.4.1"
+            },
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/esprima": {
+            "version": "4.0.1",
+            "license": "BSD-2-Clause",
+            "bin": {
+                "esparse": "bin/esparse.js",
+                "esvalidate": "bin/esvalidate.js"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/esquery": {
+            "version": "1.5.0",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "estraverse": "^5.1.0"
+            },
+            "engines": {
+                "node": ">=0.10"
+            }
+        },
+        "node_modules/esquery/node_modules/estraverse": {
+            "version": "5.3.0",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=4.0"
+            }
+        },
+        "node_modules/esrecurse": {
+            "version": "4.3.0",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "estraverse": "^5.2.0"
+            },
+            "engines": {
+                "node": ">=4.0"
+            }
+        },
+        "node_modules/esrecurse/node_modules/estraverse": {
+            "version": "5.2.0",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=4.0"
+            }
+        },
+        "node_modules/estraverse": {
+            "version": "4.3.0",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=4.0"
+            }
+        },
+        "node_modules/estree-walker": {
+            "version": "2.0.2",
+            "license": "MIT"
+        },
+        "node_modules/esutils": {
+            "version": "2.0.3",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/etag": {
+            "version": "1.8.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/event-emitter": {
+            "version": "0.3.5",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "d": "1",
+                "es5-ext": "~0.10.14"
+            }
+        },
+        "node_modules/event-stream": {
+            "version": "3.3.5",
+            "license": "MIT",
+            "dependencies": {
+                "duplexer": "^0.1.1",
+                "from": "^0.1.7",
+                "map-stream": "0.0.7",
+                "pause-stream": "^0.0.11",
+                "split": "^1.0.1",
+                "stream-combiner": "^0.2.2",
+                "through": "^2.3.8"
+            }
+        },
+        "node_modules/eventemitter3": {
+            "version": "4.0.7",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/events": {
+            "version": "1.1.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.4.x"
+            }
+        },
+        "node_modules/evp_bytestokey": {
+            "version": "1.0.3",
+            "license": "MIT",
+            "dependencies": {
+                "md5.js": "^1.3.4",
+                "safe-buffer": "^5.1.1"
+            }
+        },
+        "node_modules/execa": {
+            "version": "5.1.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "cross-spawn": "^7.0.3",
+                "get-stream": "^6.0.0",
+                "human-signals": "^2.1.0",
+                "is-stream": "^2.0.0",
+                "merge-stream": "^2.0.0",
+                "npm-run-path": "^4.0.1",
+                "onetime": "^5.1.2",
+                "signal-exit": "^3.0.3",
+                "strip-final-newline": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sindresorhus/execa?sponsor=1"
+            }
+        },
+        "node_modules/execa/node_modules/get-stream": {
+            "version": "6.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/expand-template": {
+            "version": "2.0.3",
+            "license": "(MIT OR WTFPL)",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/express": {
+            "version": "4.21.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "accepts": "~1.3.8",
+                "array-flatten": "1.1.1",
+                "body-parser": "1.20.3",
+                "content-disposition": "0.5.4",
+                "content-type": "~1.0.4",
+                "cookie": "0.7.1",
+                "cookie-signature": "1.0.6",
+                "debug": "2.6.9",
+                "depd": "2.0.0",
+                "encodeurl": "~2.0.0",
+                "escape-html": "~1.0.3",
+                "etag": "~1.8.1",
+                "finalhandler": "1.3.1",
+                "fresh": "0.5.2",
+                "http-errors": "2.0.0",
+                "merge-descriptors": "1.0.3",
+                "methods": "~1.1.2",
+                "on-finished": "2.4.1",
+                "parseurl": "~1.3.3",
+                "path-to-regexp": "0.1.12",
+                "proxy-addr": "~2.0.7",
+                "qs": "6.13.0",
+                "range-parser": "~1.2.1",
+                "safe-buffer": "5.2.1",
+                "send": "0.19.0",
+                "serve-static": "1.16.2",
+                "setprototypeof": "1.2.0",
+                "statuses": "2.0.1",
+                "type-is": "~1.6.18",
+                "utils-merge": "1.0.1",
+                "vary": "~1.1.2"
+            },
+            "engines": {
+                "node": ">= 0.10.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/express"
+            }
+        },
+        "node_modules/express/node_modules/array-flatten": {
+            "version": "1.1.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/express/node_modules/debug": {
+            "version": "2.6.9",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/express/node_modules/depd": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/express/node_modules/encodeurl": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/express/node_modules/ms": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/express/node_modules/path-to-regexp": {
+            "version": "0.1.12",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/express/node_modules/statuses": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/ext": {
+            "version": "1.6.0",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "type": "^2.5.0"
+            }
+        },
+        "node_modules/ext/node_modules/type": {
+            "version": "2.7.2",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/fancy-log": {
+            "version": "1.3.3",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-gray": "^0.1.1",
+                "color-support": "^1.1.3",
+                "parse-node-version": "^1.0.0",
+                "time-stamp": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/fast-deep-equal": {
+            "version": "3.1.3",
+            "license": "MIT"
+        },
+        "node_modules/fast-diff": {
+            "version": "1.3.0",
+            "dev": true,
+            "license": "Apache-2.0"
+        },
+        "node_modules/fast-fifo": {
+            "version": "1.3.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/fast-glob": {
+            "version": "3.3.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@nodelib/fs.stat": "^2.0.2",
+                "@nodelib/fs.walk": "^1.2.3",
+                "glob-parent": "^5.1.2",
+                "merge2": "^1.3.0",
+                "micromatch": "^4.0.4"
+            },
+            "engines": {
+                "node": ">=8.6.0"
+            }
+        },
+        "node_modules/fast-json-patch": {
+            "version": "3.1.1",
+            "license": "MIT"
+        },
+        "node_modules/fast-json-stable-stringify": {
+            "version": "2.1.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/fast-levenshtein": {
+            "version": "2.0.6",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/fast-uri": {
+            "version": "3.0.6",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/fastify"
+                },
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/fastify"
+                }
+            ],
+            "license": "BSD-3-Clause"
+        },
+        "node_modules/fast-xml-parser": {
+            "version": "4.4.1",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/NaturalIntelligence"
+                },
+                {
+                    "type": "paypal",
+                    "url": "https://paypal.me/naturalintelligence"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "strnum": "^1.0.5"
+            },
+            "bin": {
+                "fxparser": "src/cli/cli.js"
+            }
+        },
+        "node_modules/fastest-levenshtein": {
+            "version": "1.0.12",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/fastq": {
+            "version": "1.13.0",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "reusify": "^1.0.4"
+            }
+        },
+        "node_modules/faye-websocket": {
+            "version": "0.11.4",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "websocket-driver": ">=0.5.1"
+            },
+            "engines": {
+                "node": ">=0.8.0"
+            }
+        },
+        "node_modules/fd-slicer": {
+            "version": "1.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "pend": "~1.2.0"
+            }
+        },
+        "node_modules/fecha": {
+            "version": "4.2.1",
+            "license": "MIT"
+        },
+        "node_modules/file-entry-cache": {
+            "version": "6.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "flat-cache": "^3.0.4"
+            },
+            "engines": {
+                "node": "^10.12.0 || >=12.0.0"
+            }
+        },
+        "node_modules/file-loader": {
+            "version": "6.2.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "loader-utils": "^2.0.0",
+                "schema-utils": "^3.0.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "^4.0.0 || ^5.0.0"
+            }
+        },
+        "node_modules/fill-range": {
+            "version": "7.1.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "to-regex-range": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/finalhandler": {
+            "version": "1.3.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "debug": "2.6.9",
+                "encodeurl": "~2.0.0",
+                "escape-html": "~1.0.3",
+                "on-finished": "2.4.1",
+                "parseurl": "~1.3.3",
+                "statuses": "2.0.1",
+                "unpipe": "~1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/finalhandler/node_modules/debug": {
+            "version": "2.6.9",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/finalhandler/node_modules/encodeurl": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/finalhandler/node_modules/ms": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/finalhandler/node_modules/statuses": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/find-up": {
+            "version": "5.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "locate-path": "^6.0.0",
+                "path-exists": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/flat": {
+            "version": "5.0.2",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "bin": {
+                "flat": "cli.js"
+            }
+        },
+        "node_modules/flat-cache": {
+            "version": "3.0.4",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "flatted": "^3.1.0",
+                "rimraf": "^3.0.2"
+            },
+            "engines": {
+                "node": "^10.12.0 || >=12.0.0"
+            }
+        },
+        "node_modules/flatted": {
+            "version": "3.2.2",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/fn.name": {
+            "version": "1.1.0",
+            "license": "MIT"
+        },
+        "node_modules/follow-redirects": {
+            "version": "1.15.6",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "individual",
+                    "url": "https://github.com/sponsors/RubenVerborgh"
+                }
+            ],
+            "license": "MIT",
+            "engines": {
+                "node": ">=4.0"
+            },
+            "peerDependenciesMeta": {
+                "debug": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/fontkit": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/fontkit/-/fontkit-2.0.4.tgz",
+            "integrity": "sha512-syetQadaUEDNdxdugga9CpEYVaQIxOwk7GlwZWWZ19//qW4zE5bknOKeMBDYAASwnpaSHKJITRLMF9m1fp3s6g==",
+            "license": "MIT",
+            "dependencies": {
+                "@swc/helpers": "^0.5.12",
+                "brotli": "^1.3.2",
+                "clone": "^2.1.2",
+                "dfa": "^1.2.0",
+                "fast-deep-equal": "^3.1.3",
+                "restructure": "^3.0.0",
+                "tiny-inflate": "^1.0.3",
+                "unicode-properties": "^1.4.0",
+                "unicode-trie": "^2.0.0"
+            }
+        },
+        "node_modules/for-each": {
+            "version": "0.3.3",
+            "license": "MIT",
+            "dependencies": {
+                "is-callable": "^1.1.3"
+            }
+        },
+        "node_modules/foreground-child": {
+            "version": "3.1.1",
+            "license": "ISC",
+            "dependencies": {
+                "cross-spawn": "^7.0.0",
+                "signal-exit": "^4.0.1"
+            },
+            "engines": {
+                "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/foreground-child/node_modules/signal-exit": {
+            "version": "4.1.0",
+            "license": "ISC",
+            "engines": {
+                "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/form-data": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "asynckit": "^0.4.0",
+                "combined-stream": "^1.0.8",
+                "mime-types": "^2.1.12"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/forwarded": {
+            "version": "0.2.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/fresh": {
+            "version": "0.5.2",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/from": {
+            "version": "0.1.7",
+            "license": "MIT"
+        },
+        "node_modules/fs-constants": {
+            "version": "1.0.0",
+            "license": "MIT"
+        },
+        "node_modules/fs-extra": {
+            "version": "11.3.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=14.14"
+            }
+        },
+        "node_modules/fs-monkey": {
+            "version": "1.0.3",
+            "dev": true,
+            "license": "Unlicense"
+        },
+        "node_modules/fs.realpath": {
+            "version": "1.0.0",
+            "license": "ISC"
+        },
+        "node_modules/fsevents": {
+            "version": "2.3.2",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+            }
+        },
+        "node_modules/function-bind": {
+            "version": "1.1.2",
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/function.prototype.name": {
+            "version": "1.1.5",
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.2",
+                "define-properties": "^1.1.3",
+                "es-abstract": "^1.19.0",
+                "functions-have-names": "^1.2.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/functions-have-names": {
+            "version": "1.2.3",
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/gauge": {
+            "version": "2.7.4",
+            "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+            "integrity": "sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==",
+            "deprecated": "This package is no longer supported.",
+            "license": "ISC",
+            "dependencies": {
+                "aproba": "^1.0.3",
+                "console-control-strings": "^1.0.0",
+                "has-unicode": "^2.0.0",
+                "object-assign": "^4.1.0",
+                "signal-exit": "^3.0.0",
+                "string-width": "^1.0.1",
+                "strip-ansi": "^3.0.1",
+                "wide-align": "^1.1.0"
+            }
+        },
+        "node_modules/gauge/node_modules/ansi-regex": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+            "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/gauge/node_modules/is-fullwidth-code-point": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+            "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
+            "license": "MIT",
+            "dependencies": {
+                "number-is-nan": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/gauge/node_modules/string-width": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+            "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==",
+            "license": "MIT",
+            "dependencies": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/gauge/node_modules/strip-ansi": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+            "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/geometry-interfaces": {
+            "version": "1.1.4",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/get-caller-file": {
+            "version": "2.0.5",
+            "license": "ISC",
+            "engines": {
+                "node": "6.* || 8.* || >= 10.*"
+            }
+        },
+        "node_modules/get-intrinsic": {
+            "version": "1.2.4",
+            "license": "MIT",
+            "dependencies": {
+                "es-errors": "^1.3.0",
+                "function-bind": "^1.1.2",
+                "has-proto": "^1.0.1",
+                "has-symbols": "^1.0.3",
+                "hasown": "^2.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/get-stdin": {
+            "version": "8.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/get-stream": {
+            "version": "5.2.0",
+            "license": "MIT",
+            "dependencies": {
+                "pump": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/get-symbol-description": {
+            "version": "1.0.0",
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.2",
+                "get-intrinsic": "^1.1.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/github-from-package": {
+            "version": "0.0.0",
+            "license": "MIT"
+        },
+        "node_modules/glob": {
+            "version": "10.3.10",
+            "license": "ISC",
+            "dependencies": {
+                "foreground-child": "^3.1.0",
+                "jackspeak": "^2.3.5",
+                "minimatch": "^9.0.1",
+                "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
+                "path-scurry": "^1.10.1"
+            },
+            "bin": {
+                "glob": "dist/esm/bin.mjs"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/glob-parent": {
+            "version": "5.1.2",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "is-glob": "^4.0.1"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/glob-to-regexp": {
+            "version": "0.4.1",
+            "dev": true,
+            "license": "BSD-2-Clause"
+        },
+        "node_modules/glob/node_modules/brace-expansion": {
+            "version": "2.0.1",
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "node_modules/glob/node_modules/minimatch": {
+            "version": "9.0.3",
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/globals": {
+            "version": "13.24.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "type-fest": "^0.20.2"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/globals/node_modules/type-fest": {
+            "version": "0.20.2",
+            "dev": true,
+            "license": "(MIT OR CC0-1.0)",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/globby": {
+            "version": "11.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "array-union": "^2.1.0",
+                "dir-glob": "^3.0.1",
+                "fast-glob": "^3.2.9",
+                "ignore": "^5.2.0",
+                "merge2": "^1.4.1",
+                "slash": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/gopd": {
+            "version": "1.0.1",
+            "license": "MIT",
+            "dependencies": {
+                "get-intrinsic": "^1.1.3"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/got": {
+            "version": "11.8.5",
+            "license": "MIT",
+            "dependencies": {
+                "@sindresorhus/is": "^4.0.0",
+                "@szmarczak/http-timer": "^4.0.5",
+                "@types/cacheable-request": "^6.0.1",
+                "@types/responselike": "^1.0.0",
+                "cacheable-lookup": "^5.0.3",
+                "cacheable-request": "^7.0.2",
+                "decompress-response": "^6.0.0",
+                "http2-wrapper": "^1.0.0-beta.5.2",
+                "lowercase-keys": "^2.0.0",
+                "p-cancelable": "^2.0.0",
+                "responselike": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10.19.0"
+            },
+            "funding": {
+                "url": "https://github.com/sindresorhus/got?sponsor=1"
+            }
+        },
+        "node_modules/graceful-fs": {
+            "version": "4.2.11",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/graphemer": {
+            "version": "1.4.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/gunzip-maybe": {
+            "version": "1.4.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "browserify-zlib": "^0.1.4",
+                "is-deflate": "^1.0.0",
+                "is-gzip": "^1.0.0",
+                "peek-stream": "^1.1.0",
+                "pumpify": "^1.3.3",
+                "through2": "^2.0.3"
+            },
+            "bin": {
+                "gunzip-maybe": "bin.js"
+            }
+        },
+        "node_modules/handle-thing": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/hard-rejection": {
+            "version": "2.1.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/has": {
+            "version": "1.0.3",
+            "license": "MIT",
+            "dependencies": {
+                "function-bind": "^1.1.1"
+            },
+            "engines": {
+                "node": ">= 0.4.0"
+            }
+        },
+        "node_modules/has-bigints": {
+            "version": "1.0.2",
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/has-flag": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/has-property-descriptors": {
+            "version": "1.0.2",
+            "license": "MIT",
+            "dependencies": {
+                "es-define-property": "^1.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/has-proto": {
+            "version": "1.0.3",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/has-symbols": {
+            "version": "1.0.3",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/has-tostringtag": {
+            "version": "1.0.0",
+            "license": "MIT",
+            "dependencies": {
+                "has-symbols": "^1.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/has-unicode": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+            "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+            "license": "ISC"
+        },
+        "node_modules/hash-base": {
+            "version": "3.1.0",
+            "license": "MIT",
+            "dependencies": {
+                "inherits": "^2.0.4",
+                "readable-stream": "^3.6.0",
+                "safe-buffer": "^5.2.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/hash-sum": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/hash.js": {
+            "version": "1.1.7",
+            "license": "MIT",
+            "dependencies": {
+                "inherits": "^2.0.3",
+                "minimalistic-assert": "^1.0.1"
+            }
+        },
+        "node_modules/hasown": {
+            "version": "2.0.2",
+            "license": "MIT",
+            "dependencies": {
+                "function-bind": "^1.1.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/he": {
+            "version": "1.2.0",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "he": "bin/he"
+            }
+        },
+        "node_modules/highlight.js": {
+            "version": "11.11.1",
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">=12.0.0"
+            }
+        },
+        "node_modules/hmac-drbg": {
+            "version": "1.0.1",
+            "license": "MIT",
+            "dependencies": {
+                "hash.js": "^1.0.3",
+                "minimalistic-assert": "^1.0.0",
+                "minimalistic-crypto-utils": "^1.0.1"
+            }
+        },
+        "node_modules/hosted-git-info": {
+            "version": "4.0.2",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "lru-cache": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/hpack.js": {
+            "version": "2.1.6",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "inherits": "^2.0.1",
+                "obuf": "^1.0.0",
+                "readable-stream": "^2.0.1",
+                "wbuf": "^1.1.0"
+            }
+        },
+        "node_modules/hpack.js/node_modules/readable-stream": {
+            "version": "2.3.7",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+            }
+        },
+        "node_modules/hpack.js/node_modules/safe-buffer": {
+            "version": "5.1.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/hpack.js/node_modules/string_decoder": {
+            "version": "1.1.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "safe-buffer": "~5.1.0"
+            }
+        },
+        "node_modules/hpagent": {
+            "version": "1.2.0",
+            "license": "MIT",
+            "engines": {
+                "node": ">=14"
+            }
+        },
+        "node_modules/html-encoding-sniffer": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "whatwg-encoding": "^3.1.1"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/html-entities": {
+            "version": "2.3.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/html-escaper": {
+            "version": "2.0.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/htmlparser2": {
+            "version": "8.0.2",
+            "funding": [
+                "https://github.com/fb55/htmlparser2?sponsor=1",
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/fb55"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "domelementtype": "^2.3.0",
+                "domhandler": "^5.0.3",
+                "domutils": "^3.0.1",
+                "entities": "^4.4.0"
+            }
+        },
+        "node_modules/http-assert": {
+            "version": "1.5.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "deep-equal": "~1.0.1",
+                "http-errors": "~1.8.0"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/http-assert/node_modules/http-errors": {
+            "version": "1.8.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "depd": "~1.1.2",
+                "inherits": "2.0.4",
+                "setprototypeof": "1.2.0",
+                "statuses": ">= 1.5.0 < 2",
+                "toidentifier": "1.0.1"
+            },
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/http-cache-semantics": {
+            "version": "4.1.1",
+            "license": "BSD-2-Clause"
+        },
+        "node_modules/http-deceiver": {
+            "version": "1.2.7",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/http-errors": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "depd": "2.0.0",
+                "inherits": "2.0.4",
+                "setprototypeof": "1.2.0",
+                "statuses": "2.0.1",
+                "toidentifier": "1.0.1"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/http-errors/node_modules/depd": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/http-errors/node_modules/statuses": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/http-parser-js": {
+            "version": "0.5.8",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/http-proxy": {
+            "version": "1.18.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "eventemitter3": "^4.0.0",
+                "follow-redirects": "^1.0.0",
+                "requires-port": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=8.0.0"
+            }
+        },
+        "node_modules/http-proxy-agent": {
+            "version": "4.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@tootallnate/once": "1",
+                "agent-base": "6",
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/http-proxy-middleware": {
+            "version": "2.0.7",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/http-proxy": "^1.17.8",
+                "http-proxy": "^1.18.1",
+                "is-glob": "^4.0.1",
+                "is-plain-obj": "^3.0.0",
+                "micromatch": "^4.0.2"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            },
+            "peerDependencies": {
+                "@types/express": "^4.17.13"
+            },
+            "peerDependenciesMeta": {
+                "@types/express": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/http-proxy-middleware/node_modules/is-plain-obj": {
+            "version": "3.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/http2": {
+            "version": "3.3.6",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.12.0"
+            }
+        },
+        "node_modules/http2-wrapper": {
+            "version": "1.0.3",
+            "license": "MIT",
+            "dependencies": {
+                "quick-lru": "^5.1.1",
+                "resolve-alpn": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=10.19.0"
+            }
+        },
+        "node_modules/https-proxy-agent": {
+            "version": "5.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "agent-base": "6",
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/human-signals": {
+            "version": "2.1.0",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=10.17.0"
+            }
+        },
+        "node_modules/husky": {
+            "version": "9.0.7",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "husky": "bin.js"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/typicode"
+            }
+        },
+        "node_modules/i18n-ts": {
+            "version": "1.0.5",
+            "license": "MIT"
+        },
+        "node_modules/iconv-lite": {
+            "version": "0.4.24",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "safer-buffer": ">= 2.1.2 < 3"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/icss-utils": {
+            "version": "5.1.0",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": "^10 || ^12 || >= 14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/ieee754": {
+            "version": "1.1.13",
+            "license": "BSD-3-Clause"
+        },
+        "node_modules/ignore": {
+            "version": "5.3.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 4"
+            }
+        },
+        "node_modules/image-size": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/image-size/-/image-size-1.2.1.tgz",
+            "integrity": "sha512-rH+46sQJ2dlwfjfhCyNx5thzrv+dtmBIhPHk0zgRUukHzZ/kRueTJXoYYsclBaKcSMBWuGbOFXtioLpzTb5euw==",
+            "license": "MIT",
+            "dependencies": {
+                "queue": "6.0.2"
+            },
+            "bin": {
+                "image-size": "bin/image-size.js"
+            },
+            "engines": {
+                "node": ">=16.x"
+            }
+        },
+        "node_modules/immediate": {
+            "version": "3.0.6",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/immutable": {
+            "version": "4.3.0",
+            "license": "MIT"
+        },
+        "node_modules/import-fresh": {
+            "version": "3.3.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "parent-module": "^1.0.0",
+                "resolve-from": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/import-local": {
+            "version": "3.0.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "pkg-dir": "^4.2.0",
+                "resolve-cwd": "^3.0.0"
+            },
+            "bin": {
+                "import-local-fixture": "fixtures/cli.js"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/imurmurhash": {
+            "version": "0.1.4",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.8.19"
+            }
+        },
+        "node_modules/indent-string": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/inflight": {
+            "version": "1.0.6",
+            "license": "ISC",
+            "dependencies": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+            }
+        },
+        "node_modules/inherits": {
+            "version": "2.0.4",
+            "license": "ISC"
+        },
+        "node_modules/ini": {
+            "version": "1.3.8",
+            "license": "ISC"
+        },
+        "node_modules/internal-slot": {
+            "version": "1.0.3",
+            "license": "MIT",
+            "dependencies": {
+                "get-intrinsic": "^1.1.0",
+                "has": "^1.0.3",
+                "side-channel": "^1.0.4"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/interpret": {
+            "version": "3.1.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/ip-regex": {
+            "version": "4.3.0",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/ipaddr.js": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/is": {
+            "version": "3.3.0",
+            "license": "MIT",
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/is-arguments": {
+            "version": "1.1.1",
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.2",
+                "has-tostringtag": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/is-arrayish": {
+            "version": "0.3.2",
+            "license": "MIT"
+        },
+        "node_modules/is-bigint": {
+            "version": "1.0.4",
+            "license": "MIT",
+            "dependencies": {
+                "has-bigints": "^1.0.1"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/is-binary-path": {
+            "version": "2.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "binary-extensions": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/is-boolean-object": {
+            "version": "1.1.2",
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.2",
+                "has-tostringtag": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/is-buffer": {
+            "version": "1.1.6",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/is-builtin-module": {
+            "version": "3.2.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "builtin-modules": "^3.3.0"
+            },
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/is-callable": {
+            "version": "1.2.4",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/is-core-module": {
+            "version": "2.16.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "hasown": "^2.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/is-date-object": {
+            "version": "1.0.5",
+            "license": "MIT",
+            "dependencies": {
+                "has-tostringtag": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/is-deflate": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/is-directory": {
+            "version": "0.3.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-docker": {
+            "version": "2.2.1",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "is-docker": "cli.js"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/is-electron": {
+            "version": "2.2.2",
+            "license": "MIT"
+        },
+        "node_modules/is-extglob": {
+            "version": "2.1.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-fullwidth-code-point": {
+            "version": "3.0.0",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/is-generator-function": {
+            "version": "1.0.10",
+            "license": "MIT",
+            "dependencies": {
+                "has-tostringtag": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/is-glob": {
+            "version": "4.0.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-extglob": "^2.1.1"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-gzip": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-nan": {
+            "version": "1.3.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.0",
+                "define-properties": "^1.1.3"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/is-negative-zero": {
+            "version": "2.0.2",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/is-number": {
+            "version": "7.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.12.0"
+            }
+        },
+        "node_modules/is-number-object": {
+            "version": "1.0.7",
+            "license": "MIT",
+            "dependencies": {
+                "has-tostringtag": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/is-path-inside": {
+            "version": "3.0.3",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/is-plain-obj": {
+            "version": "2.1.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/is-plain-object": {
+            "version": "2.0.4",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "isobject": "^3.0.1"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-potential-custom-element-name": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/is-promise": {
+            "version": "2.2.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/is-regex": {
+            "version": "1.1.4",
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.2",
+                "has-tostringtag": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/is-shared-array-buffer": {
+            "version": "1.0.2",
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.2"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/is-stream": {
+            "version": "2.0.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/is-string": {
+            "version": "1.0.7",
+            "license": "MIT",
+            "dependencies": {
+                "has-tostringtag": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/is-symbol": {
+            "version": "1.0.4",
+            "license": "MIT",
+            "dependencies": {
+                "has-symbols": "^1.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/is-typed-array": {
+            "version": "1.1.9",
+            "license": "MIT",
+            "dependencies": {
+                "available-typed-arrays": "^1.0.5",
+                "call-bind": "^1.0.2",
+                "es-abstract": "^1.20.0",
+                "for-each": "^0.3.3",
+                "has-tostringtag": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/is-unicode-supported": {
+            "version": "0.1.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/is-url": {
+            "version": "1.2.4",
+            "license": "MIT"
+        },
+        "node_modules/is-weakref": {
+            "version": "1.0.2",
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.2"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/is-wsl": {
+            "version": "2.2.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-docker": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/is2": {
+            "version": "2.0.7",
+            "license": "MIT",
+            "dependencies": {
+                "deep-is": "^0.1.3",
+                "ip-regex": "^4.1.0",
+                "is-url": "^1.2.4"
+            },
+            "engines": {
+                "node": ">=v0.10.0"
+            }
+        },
+        "node_modules/isarray": {
+            "version": "1.0.0",
+            "license": "MIT"
+        },
+        "node_modules/isexe": {
+            "version": "2.0.0",
+            "license": "ISC"
+        },
+        "node_modules/isobject": {
+            "version": "3.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/istanbul-lib-coverage": {
+            "version": "3.2.0",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/istanbul-lib-report": {
+            "version": "3.0.1",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "istanbul-lib-coverage": "^3.0.0",
+                "make-dir": "^4.0.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/istanbul-reports": {
+            "version": "3.1.6",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "html-escaper": "^2.0.0",
+                "istanbul-lib-report": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jackspeak": {
+            "version": "2.3.6",
+            "license": "BlueOak-1.0.0",
+            "dependencies": {
+                "@isaacs/cliui": "^8.0.2"
+            },
+            "engines": {
+                "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            },
+            "optionalDependencies": {
+                "@pkgjs/parseargs": "^0.11.0"
+            }
+        },
+        "node_modules/jaro-winkler": {
+            "version": "0.2.8",
+            "resolved": "https://registry.npmjs.org/jaro-winkler/-/jaro-winkler-0.2.8.tgz",
+            "integrity": "sha512-yr+mElb6dWxA1mzFu0+26njV5DWAQRNTi5pB6fFMm79zHrfAs3d0qjhe/IpZI4AHIUJkzvu5QXQRWOw2O0GQyw==",
+            "license": "MIT"
+        },
+        "node_modules/jest-worker": {
+            "version": "27.5.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/node": "*",
+                "merge-stream": "^2.0.0",
+                "supports-color": "^8.0.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            }
+        },
+        "node_modules/jest-worker/node_modules/supports-color": {
+            "version": "8.1.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/supports-color?sponsor=1"
+            }
+        },
+        "node_modules/jmespath": {
+            "version": "0.16.0",
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">= 0.6.0"
+            }
+        },
+        "node_modules/jose": {
+            "version": "5.4.1",
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/panva"
+            }
+        },
+        "node_modules/joycon": {
+            "version": "3.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/js-tokens": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/js-yaml": {
+            "version": "4.1.0",
+            "license": "MIT",
+            "dependencies": {
+                "argparse": "^2.0.1"
+            },
+            "bin": {
+                "js-yaml": "bin/js-yaml.js"
+            }
+        },
+        "node_modules/jsdom": {
+            "version": "23.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "cssstyle": "^3.0.0",
+                "data-urls": "^5.0.0",
+                "decimal.js": "^10.4.3",
+                "form-data": "^4.0.0",
+                "html-encoding-sniffer": "^4.0.0",
+                "http-proxy-agent": "^7.0.0",
+                "https-proxy-agent": "^7.0.2",
+                "is-potential-custom-element-name": "^1.0.1",
+                "nwsapi": "^2.2.7",
+                "parse5": "^7.1.2",
+                "rrweb-cssom": "^0.6.0",
+                "saxes": "^6.0.0",
+                "symbol-tree": "^3.2.4",
+                "tough-cookie": "^4.1.3",
+                "w3c-xmlserializer": "^5.0.0",
+                "webidl-conversions": "^7.0.0",
+                "whatwg-encoding": "^3.1.1",
+                "whatwg-mimetype": "^4.0.0",
+                "whatwg-url": "^14.0.0",
+                "ws": "^8.14.2",
+                "xml-name-validator": "^5.0.0"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "peerDependencies": {
+                "canvas": "^2.11.2"
+            },
+            "peerDependenciesMeta": {
+                "canvas": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/jsdom/node_modules/agent-base": {
+            "version": "7.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "debug": "^4.3.4"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/jsdom/node_modules/http-proxy-agent": {
+            "version": "7.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "agent-base": "^7.1.0",
+                "debug": "^4.3.4"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/jsdom/node_modules/https-proxy-agent": {
+            "version": "7.0.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "agent-base": "^7.0.2",
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/jsesc": {
+            "version": "3.0.2",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "jsesc": "bin/jsesc"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/json-buffer": {
+            "version": "3.0.1",
+            "license": "MIT"
+        },
+        "node_modules/json-parse-better-errors": {
+            "version": "1.0.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/json-parse-even-better-errors": {
+            "version": "2.3.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/json-schema-to-typescript": {
+            "version": "13.1.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@bcherny/json-schema-ref-parser": "10.0.5-fork",
+                "@types/json-schema": "^7.0.11",
+                "@types/lodash": "^4.14.182",
+                "@types/prettier": "^2.6.1",
+                "cli-color": "^2.0.2",
+                "get-stdin": "^8.0.0",
+                "glob": "^7.1.6",
+                "glob-promise": "^4.2.2",
+                "is-glob": "^4.0.3",
+                "lodash": "^4.17.21",
+                "minimist": "^1.2.6",
+                "mkdirp": "^1.0.4",
+                "mz": "^2.7.0",
+                "prettier": "^2.6.2"
+            },
+            "bin": {
+                "json2ts": "dist/src/cli.js"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            }
+        },
+        "node_modules/json-schema-to-typescript/node_modules/@types/glob": {
+            "version": "7.2.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/minimatch": "*",
+                "@types/node": "*"
+            }
+        },
+        "node_modules/json-schema-to-typescript/node_modules/glob": {
+            "version": "7.2.3",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/json-schema-to-typescript/node_modules/glob-promise": {
+            "version": "4.2.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/glob": "^7.1.3"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "type": "individual",
+                "url": "https://github.com/sponsors/ahmadnassri"
+            },
+            "peerDependencies": {
+                "glob": "^7.1.6"
+            }
+        },
+        "node_modules/json-schema-to-typescript/node_modules/mkdirp": {
+            "version": "1.0.4",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "mkdirp": "bin/cmd.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/json-schema-to-typescript/node_modules/prettier": {
+            "version": "2.8.8",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "prettier": "bin-prettier.js"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            },
+            "funding": {
+                "url": "https://github.com/prettier/prettier?sponsor=1"
+            }
+        },
+        "node_modules/json-schema-traverse": {
+            "version": "0.4.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/json-stable-stringify-without-jsonify": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/json5": {
+            "version": "2.2.3",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "json5": "lib/cli.js"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/jsonata": {
+            "version": "2.0.5",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/jsonc-parser": {
+            "version": "3.2.0",
+            "license": "MIT"
+        },
+        "node_modules/jsonfile": {
+            "version": "6.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "universalify": "^2.0.0"
+            },
+            "optionalDependencies": {
+                "graceful-fs": "^4.1.6"
+            }
+        },
+        "node_modules/jszip": {
+            "version": "3.10.1",
+            "dev": true,
+            "license": "(MIT OR GPL-3.0-or-later)",
+            "dependencies": {
+                "lie": "~3.3.0",
+                "pako": "~1.0.2",
+                "readable-stream": "~2.3.6",
+                "setimmediate": "^1.0.5"
+            }
+        },
+        "node_modules/jszip/node_modules/readable-stream": {
+            "version": "2.3.8",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+            }
+        },
+        "node_modules/jszip/node_modules/safe-buffer": {
+            "version": "5.1.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/jszip/node_modules/string_decoder": {
+            "version": "1.1.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "safe-buffer": "~5.1.0"
+            }
+        },
+        "node_modules/just-clone": {
+            "version": "6.2.0",
+            "license": "MIT"
+        },
+        "node_modules/just-extend": {
+            "version": "4.2.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/keygrip": {
+            "version": "1.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "tsscmp": "1.0.6"
+            },
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/keytar": {
+            "version": "7.9.0",
+            "dev": true,
+            "hasInstallScript": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "node-addon-api": "^4.3.0",
+                "prebuild-install": "^7.0.1"
+            }
+        },
+        "node_modules/keyv": {
+            "version": "4.0.3",
+            "license": "MIT",
+            "dependencies": {
+                "json-buffer": "3.0.1"
+            }
+        },
+        "node_modules/kind-of": {
+            "version": "6.0.3",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/koa": {
+            "version": "2.15.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "accepts": "^1.3.5",
+                "cache-content-type": "^1.0.0",
+                "content-disposition": "~0.5.2",
+                "content-type": "^1.0.4",
+                "cookies": "~0.9.0",
+                "debug": "^4.3.2",
+                "delegates": "^1.0.0",
+                "depd": "^2.0.0",
+                "destroy": "^1.0.4",
+                "encodeurl": "^1.0.2",
+                "escape-html": "^1.0.3",
+                "fresh": "~0.5.2",
+                "http-assert": "^1.3.0",
+                "http-errors": "^1.6.3",
+                "is-generator-function": "^1.0.7",
+                "koa-compose": "^4.1.0",
+                "koa-convert": "^2.0.0",
+                "on-finished": "^2.3.0",
+                "only": "~0.0.2",
+                "parseurl": "^1.3.2",
+                "statuses": "^1.5.0",
+                "type-is": "^1.6.16",
+                "vary": "^1.1.2"
+            },
+            "engines": {
+                "node": "^4.8.4 || ^6.10.1 || ^7.10.1 || >= 8.1.4"
+            }
+        },
+        "node_modules/koa-compose": {
+            "version": "4.1.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/koa-convert": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "co": "^4.6.0",
+                "koa-compose": "^4.1.0"
+            },
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/koa-morgan": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "morgan": "^1.6.1"
+            }
+        },
+        "node_modules/koa-mount": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "debug": "^4.0.1",
+                "koa-compose": "^4.1.0"
+            },
+            "engines": {
+                "node": ">= 7.6.0"
+            }
+        },
+        "node_modules/koa-send": {
+            "version": "5.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "debug": "^4.1.1",
+                "http-errors": "^1.7.3",
+                "resolve-path": "^1.4.0"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/koa-send/node_modules/http-errors": {
+            "version": "1.8.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "depd": "~1.1.2",
+                "inherits": "2.0.4",
+                "setprototypeof": "1.2.0",
+                "statuses": ">= 1.5.0 < 2",
+                "toidentifier": "1.0.1"
+            },
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/koa-static": {
+            "version": "5.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "debug": "^3.1.0",
+                "koa-send": "^5.0.0"
+            },
+            "engines": {
+                "node": ">= 7.6.0"
+            }
+        },
+        "node_modules/koa-static/node_modules/debug": {
+            "version": "3.2.7",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ms": "^2.1.1"
+            }
+        },
+        "node_modules/koa/node_modules/depd": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/koa/node_modules/http-errors": {
+            "version": "1.8.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "depd": "~1.1.2",
+                "inherits": "2.0.4",
+                "setprototypeof": "1.2.0",
+                "statuses": ">= 1.5.0 < 2",
+                "toidentifier": "1.0.1"
+            },
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/koa/node_modules/http-errors/node_modules/depd": {
+            "version": "1.1.2",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/kuler": {
+            "version": "2.0.0",
+            "license": "MIT"
+        },
+        "node_modules/launch-editor": {
+            "version": "2.6.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "picocolors": "^1.0.0",
+                "shell-quote": "^1.7.3"
+            }
+        },
+        "node_modules/leven": {
+            "version": "3.1.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/levn": {
+            "version": "0.4.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "prelude-ls": "^1.2.1",
+                "type-check": "~0.4.0"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/lie": {
+            "version": "3.3.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "immediate": "~3.0.5"
+            }
+        },
+        "node_modules/lines-and-columns": {
+            "version": "1.2.4",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/linkify-it": {
+            "version": "4.0.1",
+            "license": "MIT",
+            "dependencies": {
+                "uc.micro": "^1.0.1"
+            }
+        },
+        "node_modules/loader-runner": {
+            "version": "4.2.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6.11.5"
+            }
+        },
+        "node_modules/loader-utils": {
+            "version": "2.0.4",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "big.js": "^5.2.2",
+                "emojis-list": "^3.0.0",
+                "json5": "^2.1.2"
+            },
+            "engines": {
+                "node": ">=8.9.0"
+            }
+        },
+        "node_modules/locate-path": {
+            "version": "6.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-locate": "^5.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/lodash": {
+            "version": "4.17.21",
+            "license": "MIT"
+        },
+        "node_modules/lodash.get": {
+            "version": "4.4.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/lodash.merge": {
+            "version": "4.6.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/log-symbols": {
+            "version": "4.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "chalk": "^4.1.0",
+                "is-unicode-supported": "^0.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/logform": {
+            "version": "2.4.0",
+            "license": "MIT",
+            "dependencies": {
+                "@colors/colors": "1.5.0",
+                "fecha": "^4.2.0",
+                "ms": "^2.1.1",
+                "safe-stable-stringify": "^2.3.1",
+                "triple-beam": "^1.3.0"
+            }
+        },
+        "node_modules/lokijs": {
+            "version": "1.5.12",
+            "license": "MIT"
+        },
+        "node_modules/long": {
+            "version": "5.3.1",
+            "resolved": "https://registry.npmjs.org/long/-/long-5.3.1.tgz",
+            "integrity": "sha512-ka87Jz3gcx/I7Hal94xaN2tZEOPoUOEVftkQqZx2EeQRN7LGdfLlI3FvZ+7WDplm+vK2Urx9ULrvSowtdCieng==",
+            "license": "Apache-2.0"
+        },
+        "node_modules/lowercase-keys": {
+            "version": "2.0.0",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/lru-cache": {
+            "version": "6.0.0",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "yallist": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/lru-queue": {
+            "version": "0.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "es5-ext": "~0.10.2"
+            }
+        },
+        "node_modules/mac-ca": {
+            "version": "3.1.1",
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "node-forge": "^1.3.1",
+                "undici": "^6.16.1"
+            }
+        },
+        "node_modules/magic-string": {
+            "version": "0.30.0",
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/sourcemap-codec": "^1.4.13"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/make-dir": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "semver": "^7.5.3"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/make-error": {
+            "version": "1.3.6",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/map-obj": {
+            "version": "4.3.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/map-stream": {
+            "version": "0.0.7",
+            "license": "MIT"
+        },
+        "node_modules/markdown-it": {
+            "version": "13.0.2",
+            "license": "MIT",
+            "dependencies": {
+                "argparse": "^2.0.1",
+                "entities": "~3.0.1",
+                "linkify-it": "^4.0.1",
+                "mdurl": "^1.0.1",
+                "uc.micro": "^1.0.5"
+            },
+            "bin": {
+                "markdown-it": "bin/markdown-it.js"
+            }
+        },
+        "node_modules/markdown-it/node_modules/entities": {
+            "version": "3.0.1",
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=0.12"
+            },
+            "funding": {
+                "url": "https://github.com/fb55/entities?sponsor=1"
+            }
+        },
+        "node_modules/marked": {
+            "version": "13.0.1",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "marked": "bin/marked.js"
+            },
+            "engines": {
+                "node": ">= 18"
+            }
+        },
+        "node_modules/md5": {
+            "version": "2.3.0",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "charenc": "0.0.2",
+                "crypt": "0.0.2",
+                "is-buffer": "~1.1.6"
+            }
+        },
+        "node_modules/md5.js": {
+            "version": "1.3.5",
+            "license": "MIT",
+            "dependencies": {
+                "hash-base": "^3.0.0",
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.1.2"
+            }
+        },
+        "node_modules/mdurl": {
+            "version": "1.0.1",
+            "license": "MIT"
+        },
+        "node_modules/media-typer": {
+            "version": "0.3.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/memfs": {
+            "version": "3.4.7",
+            "dev": true,
+            "license": "Unlicense",
+            "dependencies": {
+                "fs-monkey": "^1.0.3"
+            },
+            "engines": {
+                "node": ">= 4.0.0"
+            }
+        },
+        "node_modules/memoizee": {
+            "version": "0.4.15",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "d": "^1.0.1",
+                "es5-ext": "^0.10.53",
+                "es6-weak-map": "^2.0.3",
+                "event-emitter": "^0.3.5",
+                "is-promise": "^2.2.2",
+                "lru-queue": "^0.1.0",
+                "next-tick": "^1.1.0",
+                "timers-ext": "^0.1.7"
+            }
+        },
+        "node_modules/meow": {
+            "version": "9.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/minimist": "^1.2.0",
+                "camelcase-keys": "^6.2.2",
+                "decamelize": "^1.2.0",
+                "decamelize-keys": "^1.1.0",
+                "hard-rejection": "^2.1.0",
+                "minimist-options": "4.1.0",
+                "normalize-package-data": "^3.0.0",
+                "read-pkg-up": "^7.0.1",
+                "redent": "^3.0.0",
+                "trim-newlines": "^3.0.0",
+                "type-fest": "^0.18.0",
+                "yargs-parser": "^20.2.3"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/meow/node_modules/decamelize": {
+            "version": "1.2.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/meow/node_modules/type-fest": {
+            "version": "0.18.1",
+            "dev": true,
+            "license": "(MIT OR CC0-1.0)",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/merge-descriptors": {
+            "version": "1.0.3",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/merge-stream": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/merge2": {
+            "version": "1.4.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/methods": {
+            "version": "1.1.2",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/microbuffer": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/micromatch": {
+            "version": "4.0.8",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "braces": "^3.0.3",
+                "picomatch": "^2.3.1"
+            },
+            "engines": {
+                "node": ">=8.6"
+            }
+        },
+        "node_modules/miller-rabin": {
+            "version": "4.0.1",
+            "license": "MIT",
+            "dependencies": {
+                "bn.js": "^4.0.0",
+                "brorand": "^1.0.1"
+            },
+            "bin": {
+                "miller-rabin": "bin/miller-rabin"
+            }
+        },
+        "node_modules/miller-rabin/node_modules/bn.js": {
+            "version": "4.12.0",
+            "license": "MIT"
+        },
+        "node_modules/mime": {
+            "version": "1.6.0",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "mime": "cli.js"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/mime-db": {
+            "version": "1.52.0",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/mime-types": {
+            "version": "2.1.35",
+            "license": "MIT",
+            "dependencies": {
+                "mime-db": "1.52.0"
+            },
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/mimic-fn": {
+            "version": "2.1.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/mimic-response": {
+            "version": "1.0.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/min-indent": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/minimalistic-assert": {
+            "version": "1.0.1",
+            "license": "ISC"
+        },
+        "node_modules/minimalistic-crypto-utils": {
+            "version": "1.0.1",
+            "license": "MIT"
+        },
+        "node_modules/minimatch": {
+            "version": "3.1.2",
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/minimist": {
+            "version": "1.2.8",
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/minimist-options": {
+            "version": "4.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "arrify": "^1.0.1",
+                "is-plain-obj": "^1.1.0",
+                "kind-of": "^6.0.3"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/minimist-options/node_modules/arrify": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/minimist-options/node_modules/is-plain-obj": {
+            "version": "1.1.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/minipass": {
+            "version": "7.1.2",
+            "license": "ISC",
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            }
+        },
+        "node_modules/mkdirp": {
+            "version": "0.5.6",
+            "license": "MIT",
+            "dependencies": {
+                "minimist": "^1.2.6"
+            },
+            "bin": {
+                "mkdirp": "bin/cmd.js"
+            }
+        },
+        "node_modules/mkdirp-classic": {
+            "version": "0.5.3",
+            "license": "MIT"
+        },
+        "node_modules/mocha": {
+            "version": "10.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-colors": "4.1.1",
+                "browser-stdout": "1.3.1",
+                "chokidar": "3.5.3",
+                "debug": "4.3.4",
+                "diff": "5.0.0",
+                "escape-string-regexp": "4.0.0",
+                "find-up": "5.0.0",
+                "glob": "7.2.0",
+                "he": "1.2.0",
+                "js-yaml": "4.1.0",
+                "log-symbols": "4.1.0",
+                "minimatch": "5.0.1",
+                "ms": "2.1.3",
+                "nanoid": "3.3.3",
+                "serialize-javascript": "6.0.0",
+                "strip-json-comments": "3.1.1",
+                "supports-color": "8.1.1",
+                "workerpool": "6.2.1",
+                "yargs": "16.2.0",
+                "yargs-parser": "20.2.4",
+                "yargs-unparser": "2.0.0"
+            },
+            "bin": {
+                "_mocha": "bin/_mocha",
+                "mocha": "bin/mocha.js"
+            },
+            "engines": {
+                "node": ">= 14.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/mochajs"
+            }
+        },
+        "node_modules/mocha-junit-reporter": {
+            "version": "2.2.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "debug": "^4.3.4",
+                "md5": "^2.3.0",
+                "mkdirp": "^3.0.0",
+                "strip-ansi": "^6.0.1",
+                "xml": "^1.0.1"
+            },
+            "peerDependencies": {
+                "mocha": ">=2.2.5"
+            }
+        },
+        "node_modules/mocha-junit-reporter/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/mocha-junit-reporter/node_modules/mkdirp": {
+            "version": "3.0.1",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "mkdirp": "dist/cjs/src/bin.js"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/mocha-junit-reporter/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/mocha-multi-reporters": {
+            "version": "1.5.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "debug": "^4.1.1",
+                "lodash": "^4.17.15"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            },
+            "peerDependencies": {
+                "mocha": ">=3.1.2"
+            }
+        },
+        "node_modules/mocha/node_modules/brace-expansion": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "node_modules/mocha/node_modules/diff": {
+            "version": "5.0.0",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">=0.3.1"
+            }
+        },
+        "node_modules/mocha/node_modules/glob": {
+            "version": "7.2.0",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.0.4",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/mocha/node_modules/glob/node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/mocha/node_modules/glob/node_modules/minimatch": {
+            "version": "3.1.2",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/mocha/node_modules/minimatch": {
+            "version": "5.0.1",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/mocha/node_modules/ms": {
+            "version": "2.1.3",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/mocha/node_modules/supports-color": {
+            "version": "8.1.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/supports-color?sponsor=1"
+            }
+        },
+        "node_modules/mocha/node_modules/yargs": {
+            "version": "16.2.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "cliui": "^7.0.2",
+                "escalade": "^3.1.1",
+                "get-caller-file": "^2.0.5",
+                "require-directory": "^2.1.1",
+                "string-width": "^4.2.0",
+                "y18n": "^5.0.5",
+                "yargs-parser": "^20.2.2"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/morgan": {
+            "version": "1.10.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "basic-auth": "~2.0.1",
+                "debug": "2.6.9",
+                "depd": "~2.0.0",
+                "on-finished": "~2.3.0",
+                "on-headers": "~1.0.2"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/morgan/node_modules/debug": {
+            "version": "2.6.9",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/morgan/node_modules/depd": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/morgan/node_modules/ms": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/morgan/node_modules/on-finished": {
+            "version": "2.3.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ee-first": "1.1.1"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/mri": {
+            "version": "1.2.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/ms": {
+            "version": "2.1.2",
+            "license": "MIT"
+        },
+        "node_modules/multicast-dns": {
+            "version": "7.2.5",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "dns-packet": "^5.2.2",
+                "thunky": "^1.0.2"
+            },
+            "bin": {
+                "multicast-dns": "cli.js"
+            }
+        },
+        "node_modules/mute-stream": {
+            "version": "0.0.8",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/mvdan-sh": {
+            "version": "0.10.1",
+            "dev": true,
+            "license": "BSD-3-Clause"
+        },
+        "node_modules/mz": {
+            "version": "2.7.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "any-promise": "^1.0.0",
+                "object-assign": "^4.0.1",
+                "thenify-all": "^1.0.0"
+            }
+        },
+        "node_modules/nanoid": {
+            "version": "3.3.3",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "nanoid": "bin/nanoid.cjs"
+            },
+            "engines": {
+                "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+            }
+        },
+        "node_modules/napi-build-utils": {
+            "version": "1.0.2",
+            "license": "MIT"
+        },
+        "node_modules/natural-compare": {
+            "version": "1.4.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/neatequal": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "varstream": "^0.3.2"
+            }
+        },
+        "node_modules/negotiator": {
+            "version": "0.6.3",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/neo-async": {
+            "version": "2.6.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/next-tick": {
+            "version": "1.1.0",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/nise": {
+            "version": "5.1.1",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "@sinonjs/commons": "^1.8.3",
+                "@sinonjs/fake-timers": ">=5",
+                "@sinonjs/text-encoding": "^0.7.1",
+                "just-extend": "^4.0.2",
+                "path-to-regexp": "^1.7.0"
+            }
+        },
+        "node_modules/node-abi": {
+            "version": "3.45.0",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "semver": "^7.3.5"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/node-addon-api": {
+            "version": "4.3.0",
+            "dev": true,
+            "license": "MIT",
+            "optional": true
+        },
+        "node_modules/node-fetch": {
+            "version": "2.7.0",
+            "license": "MIT",
+            "dependencies": {
+                "whatwg-url": "^5.0.0"
+            },
+            "engines": {
+                "node": "4.x || >=6.0.0"
+            },
+            "peerDependencies": {
+                "encoding": "^0.1.0"
+            },
+            "peerDependenciesMeta": {
+                "encoding": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/node-fetch/node_modules/tr46": {
+            "version": "0.0.3",
+            "license": "MIT"
+        },
+        "node_modules/node-fetch/node_modules/webidl-conversions": {
+            "version": "3.0.1",
+            "license": "BSD-2-Clause"
+        },
+        "node_modules/node-fetch/node_modules/whatwg-url": {
+            "version": "5.0.0",
+            "license": "MIT",
+            "dependencies": {
+                "tr46": "~0.0.3",
+                "webidl-conversions": "^3.0.0"
+            }
+        },
+        "node_modules/node-forge": {
+            "version": "1.3.1",
+            "license": "(BSD-3-Clause OR GPL-2.0)",
+            "engines": {
+                "node": ">= 6.13.0"
+            }
+        },
+        "node_modules/node-releases": {
+            "version": "2.0.14",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/noop-logger": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz",
+            "integrity": "sha512-6kM8CLXvuW5crTxsAtva2YLrRrDaiTIkIePWs9moLHqbFWT94WpNFjwS/5dfLfECg5i/lkmw3aoqVidxt23TEQ==",
+            "license": "MIT"
+        },
+        "node_modules/normalize-package-data": {
+            "version": "3.0.3",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "hosted-git-info": "^4.0.1",
+                "is-core-module": "^2.5.0",
+                "semver": "^7.3.4",
+                "validate-npm-package-license": "^3.0.1"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/normalize-path": {
+            "version": "3.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/normalize-url": {
+            "version": "6.1.0",
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/npm-run-path": {
+            "version": "4.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "path-key": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/npmlog": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+            "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+            "deprecated": "This package is no longer supported.",
+            "license": "ISC",
+            "dependencies": {
+                "are-we-there-yet": "~1.1.2",
+                "console-control-strings": "~1.1.0",
+                "gauge": "~2.7.3",
+                "set-blocking": "~2.0.0"
+            }
+        },
+        "node_modules/nth-check": {
+            "version": "2.1.1",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "boolbase": "^1.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/fb55/nth-check?sponsor=1"
+            }
+        },
+        "node_modules/number-is-nan": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+            "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/nunjucks": {
+            "version": "3.2.4",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "a-sync-waterfall": "^1.0.0",
+                "asap": "^2.0.3",
+                "commander": "^5.1.0"
+            },
+            "bin": {
+                "nunjucks-precompile": "bin/precompile"
+            },
+            "engines": {
+                "node": ">= 6.9.0"
+            },
+            "peerDependencies": {
+                "chokidar": "^3.3.0"
+            },
+            "peerDependenciesMeta": {
+                "chokidar": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/nunjucks/node_modules/commander": {
+            "version": "5.1.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/nwsapi": {
+            "version": "2.2.7",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/object-assign": {
+            "version": "4.1.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/object-inspect": {
+            "version": "1.13.2",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/object-is": {
+            "version": "1.1.5",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.2",
+                "define-properties": "^1.1.3"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/object-keys": {
+            "version": "1.1.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/object.assign": {
+            "version": "4.1.4",
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.2",
+                "define-properties": "^1.1.4",
+                "has-symbols": "^1.0.3",
+                "object-keys": "^1.1.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/obuf": {
+            "version": "1.1.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/on-finished": {
+            "version": "2.4.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ee-first": "1.1.1"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/on-headers": {
+            "version": "1.0.2",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/once": {
+            "version": "1.4.0",
+            "license": "ISC",
+            "dependencies": {
+                "wrappy": "1"
+            }
+        },
+        "node_modules/one-time": {
+            "version": "1.0.0",
+            "license": "MIT",
+            "dependencies": {
+                "fn.name": "1.x.x"
+            }
+        },
+        "node_modules/onetime": {
+            "version": "5.1.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "mimic-fn": "^2.1.0"
+            },
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/only": {
+            "version": "0.0.2",
+            "dev": true
+        },
+        "node_modules/open": {
+            "version": "8.4.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "define-lazy-prop": "^2.0.0",
+                "is-docker": "^2.1.1",
+                "is-wsl": "^2.2.0"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/optionator": {
+            "version": "0.9.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@aashutoshrathi/word-wrap": "^1.2.3",
+                "deep-is": "^0.1.3",
+                "fast-levenshtein": "^2.0.6",
+                "levn": "^0.4.1",
+                "prelude-ls": "^1.2.1",
+                "type-check": "^0.4.0"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/os-browserify": {
+            "version": "0.3.0",
+            "license": "MIT"
+        },
+        "node_modules/p-cancelable": {
+            "version": "2.1.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/p-limit": {
+            "version": "3.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "yocto-queue": "^0.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/p-locate": {
+            "version": "5.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-limit": "^3.0.2"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/p-retry": {
+            "version": "4.6.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/retry": "^0.12.0",
+                "retry": "^0.13.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/p-try": {
+            "version": "2.2.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/package-json-from-dist": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "BlueOak-1.0.0"
+        },
+        "node_modules/pako": {
+            "version": "1.0.11",
+            "dev": true,
+            "license": "(MIT AND Zlib)"
+        },
+        "node_modules/parent-module": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "callsites": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/parse-asn1": {
+            "version": "5.1.6",
+            "license": "ISC",
+            "dependencies": {
+                "asn1.js": "^5.2.0",
+                "browserify-aes": "^1.0.0",
+                "evp_bytestokey": "^1.0.0",
+                "pbkdf2": "^3.0.3",
+                "safe-buffer": "^5.1.1"
+            }
+        },
+        "node_modules/parse-json": {
+            "version": "5.2.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/code-frame": "^7.0.0",
+                "error-ex": "^1.3.1",
+                "json-parse-even-better-errors": "^2.3.0",
+                "lines-and-columns": "^1.1.6"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/parse-node-version": {
+            "version": "1.0.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/parse-semver": {
+            "version": "1.1.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "semver": "^5.1.0"
+            }
+        },
+        "node_modules/parse-semver/node_modules/semver": {
+            "version": "5.7.2",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver"
+            }
+        },
+        "node_modules/parse-srcset": {
+            "version": "1.0.2",
+            "license": "MIT"
+        },
+        "node_modules/parse5": {
+            "version": "7.1.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "entities": "^4.4.0"
+            },
+            "funding": {
+                "url": "https://github.com/inikulin/parse5?sponsor=1"
+            }
+        },
+        "node_modules/parse5-htmlparser2-tree-adapter": {
+            "version": "7.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "domhandler": "^5.0.2",
+                "parse5": "^7.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/inikulin/parse5?sponsor=1"
+            }
+        },
+        "node_modules/parseurl": {
+            "version": "1.3.3",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/path-browserify": {
+            "version": "1.0.1",
+            "license": "MIT"
+        },
+        "node_modules/path-exists": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/path-is-absolute": {
+            "version": "1.0.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/path-key": {
+            "version": "3.1.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/path-parse": {
+            "version": "1.0.7",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/path-scurry": {
+            "version": "1.10.1",
+            "license": "BlueOak-1.0.0",
+            "dependencies": {
+                "lru-cache": "^9.1.1 || ^10.0.0",
+                "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/path-scurry/node_modules/lru-cache": {
+            "version": "10.1.0",
+            "license": "ISC",
+            "engines": {
+                "node": "14 || >=16.14"
+            }
+        },
+        "node_modules/path-to-regexp": {
+            "version": "1.9.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "isarray": "0.0.1"
+            }
+        },
+        "node_modules/path-to-regexp/node_modules/isarray": {
+            "version": "0.0.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/path-type": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/pause-stream": {
+            "version": "0.0.11",
+            "license": [
+                "MIT",
+                "Apache2"
+            ],
+            "dependencies": {
+                "through": "~2.3"
+            }
+        },
+        "node_modules/pbkdf2": {
+            "version": "3.1.2",
+            "license": "MIT",
+            "dependencies": {
+                "create-hash": "^1.1.2",
+                "create-hmac": "^1.1.4",
+                "ripemd160": "^2.0.1",
+                "safe-buffer": "^5.0.1",
+                "sha.js": "^2.4.8"
+            },
+            "engines": {
+                "node": ">=0.12"
+            }
+        },
+        "node_modules/peek-stream": {
+            "version": "1.1.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "buffer-from": "^1.0.0",
+                "duplexify": "^3.5.0",
+                "through2": "^2.0.3"
+            }
+        },
+        "node_modules/pend": {
+            "version": "1.2.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/picocolors": {
+            "version": "1.0.1",
+            "license": "ISC"
+        },
+        "node_modules/picomatch": {
+            "version": "2.3.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8.6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
+            }
+        },
+        "node_modules/pify": {
+            "version": "3.0.0",
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/pkg-dir": {
+            "version": "4.2.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "find-up": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/pkg-dir/node_modules/find-up": {
+            "version": "4.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "locate-path": "^5.0.0",
+                "path-exists": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/pkg-dir/node_modules/locate-path": {
+            "version": "5.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-locate": "^4.1.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/pkg-dir/node_modules/p-limit": {
+            "version": "2.3.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-try": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/pkg-dir/node_modules/p-locate": {
+            "version": "4.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-limit": "^2.2.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/playwright": {
+            "version": "1.49.1",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "playwright-core": "1.49.1"
+            },
+            "bin": {
+                "playwright": "cli.js"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "optionalDependencies": {
+                "fsevents": "2.3.2"
+            }
+        },
+        "node_modules/playwright-core": {
+            "version": "1.49.1",
+            "dev": true,
+            "license": "Apache-2.0",
+            "bin": {
+                "playwright-core": "cli.js"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/pluralize": {
+            "version": "8.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/portfinder": {
+            "version": "1.0.32",
+            "license": "MIT",
+            "dependencies": {
+                "async": "^2.6.4",
+                "debug": "^3.2.7",
+                "mkdirp": "^0.5.6"
+            },
+            "engines": {
+                "node": ">= 0.12.0"
+            }
+        },
+        "node_modules/portfinder/node_modules/async": {
+            "version": "2.6.4",
+            "license": "MIT",
+            "dependencies": {
+                "lodash": "^4.17.14"
+            }
+        },
+        "node_modules/portfinder/node_modules/debug": {
+            "version": "3.2.7",
+            "license": "MIT",
+            "dependencies": {
+                "ms": "^2.1.1"
+            }
+        },
+        "node_modules/postcss": {
+            "version": "8.4.33",
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/postcss/"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/postcss"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "nanoid": "^3.3.7",
+                "picocolors": "^1.0.0",
+                "source-map-js": "^1.0.2"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14"
+            }
+        },
+        "node_modules/postcss-modules-extract-imports": {
+            "version": "3.0.0",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": "^10 || ^12 || >= 14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/postcss-modules-local-by-default": {
+            "version": "4.0.4",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "icss-utils": "^5.0.0",
+                "postcss-selector-parser": "^6.0.2",
+                "postcss-value-parser": "^4.1.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >= 14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/postcss-modules-scope": {
+            "version": "3.1.1",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "postcss-selector-parser": "^6.0.4"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >= 14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/postcss-modules-values": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "icss-utils": "^5.0.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >= 14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/postcss-selector-parser": {
+            "version": "6.0.15",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "cssesc": "^3.0.0",
+                "util-deprecate": "^1.0.2"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/postcss-value-parser": {
+            "version": "4.2.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/postcss/node_modules/nanoid": {
+            "version": "3.3.7",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "bin": {
+                "nanoid": "bin/nanoid.cjs"
+            },
+            "engines": {
+                "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+            }
+        },
+        "node_modules/prebuild-install": {
+            "version": "7.1.1",
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "detect-libc": "^2.0.0",
+                "expand-template": "^2.0.3",
+                "github-from-package": "0.0.0",
+                "minimist": "^1.2.3",
+                "mkdirp-classic": "^0.5.3",
+                "napi-build-utils": "^1.0.1",
+                "node-abi": "^3.3.0",
+                "pump": "^3.0.0",
+                "rc": "^1.2.7",
+                "simple-get": "^4.0.0",
+                "tar-fs": "^2.0.0",
+                "tunnel-agent": "^0.6.0"
+            },
+            "bin": {
+                "prebuild-install": "bin.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/prelude-ls": {
+            "version": "1.2.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/prettier": {
+            "version": "3.3.3",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "prettier": "bin/prettier.cjs"
+            },
+            "engines": {
+                "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/prettier/prettier?sponsor=1"
+            }
+        },
+        "node_modules/prettier-linter-helpers": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-diff": "^1.1.2"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/prettier-plugin-sh": {
+            "version": "0.14.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "mvdan-sh": "^0.10.1",
+                "sh-syntax": "^0.4.1"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/unts"
+            },
+            "peerDependencies": {
+                "prettier": "^3.0.3"
+            }
+        },
+        "node_modules/pretty-quick": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "execa": "^5.1.1",
+                "find-up": "^5.0.0",
+                "ignore": "^5.3.0",
+                "mri": "^1.2.0",
+                "picocolors": "^1.0.0",
+                "picomatch": "^3.0.1",
+                "tslib": "^2.6.2"
+            },
+            "bin": {
+                "pretty-quick": "lib/cli.mjs"
+            },
+            "engines": {
+                "node": ">=14"
+            },
+            "peerDependencies": {
+                "prettier": "^3.0.0"
+            }
+        },
+        "node_modules/pretty-quick/node_modules/picomatch": {
+            "version": "3.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
+            }
+        },
+        "node_modules/private": {
+            "version": "0.1.8",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/process": {
+            "version": "0.11.10",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.6.0"
+            }
+        },
+        "node_modules/process-nextick-args": {
+            "version": "2.0.1",
+            "license": "MIT"
+        },
+        "node_modules/protobufjs": {
+            "version": "7.4.0",
+            "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz",
+            "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==",
+            "hasInstallScript": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "@protobufjs/aspromise": "^1.1.2",
+                "@protobufjs/base64": "^1.1.2",
+                "@protobufjs/codegen": "^2.0.4",
+                "@protobufjs/eventemitter": "^1.1.0",
+                "@protobufjs/fetch": "^1.1.0",
+                "@protobufjs/float": "^1.0.2",
+                "@protobufjs/inquire": "^1.1.0",
+                "@protobufjs/path": "^1.1.2",
+                "@protobufjs/pool": "^1.1.0",
+                "@protobufjs/utf8": "^1.1.0",
+                "@types/node": ">=13.7.0",
+                "long": "^5.0.0"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            }
+        },
+        "node_modules/proxy-addr": {
+            "version": "2.0.7",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "forwarded": "0.2.0",
+                "ipaddr.js": "1.9.1"
+            },
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/proxy-addr/node_modules/ipaddr.js": {
+            "version": "1.9.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/psl": {
+            "version": "1.9.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/public-encrypt": {
+            "version": "4.0.3",
+            "license": "MIT",
+            "dependencies": {
+                "bn.js": "^4.1.0",
+                "browserify-rsa": "^4.0.0",
+                "create-hash": "^1.1.0",
+                "parse-asn1": "^5.0.0",
+                "randombytes": "^2.0.1",
+                "safe-buffer": "^5.1.2"
+            }
+        },
+        "node_modules/public-encrypt/node_modules/bn.js": {
+            "version": "4.12.0",
+            "license": "MIT"
+        },
+        "node_modules/pump": {
+            "version": "3.0.0",
+            "license": "MIT",
+            "dependencies": {
+                "end-of-stream": "^1.1.0",
+                "once": "^1.3.1"
+            }
+        },
+        "node_modules/pumpify": {
+            "version": "1.5.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "duplexify": "^3.6.0",
+                "inherits": "^2.0.3",
+                "pump": "^2.0.0"
+            }
+        },
+        "node_modules/pumpify/node_modules/pump": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "end-of-stream": "^1.1.0",
+                "once": "^1.3.1"
+            }
+        },
+        "node_modules/punycode": {
+            "version": "2.3.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/qs": {
+            "version": "6.13.0",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "side-channel": "^1.0.6"
+            },
+            "engines": {
+                "node": ">=0.6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/querystring": {
+            "version": "0.2.0",
+            "engines": {
+                "node": ">=0.4.x"
+            }
+        },
+        "node_modules/querystringify": {
+            "version": "2.2.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/queue": {
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/queue/-/queue-6.0.2.tgz",
+            "integrity": "sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==",
+            "license": "MIT",
+            "dependencies": {
+                "inherits": "~2.0.3"
+            }
+        },
+        "node_modules/queue-microtask": {
+            "version": "1.2.3",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "license": "MIT"
+        },
+        "node_modules/queue-tick": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/quick-lru": {
+            "version": "5.1.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/randombytes": {
+            "version": "2.1.0",
+            "license": "MIT",
+            "dependencies": {
+                "safe-buffer": "^5.1.0"
+            }
+        },
+        "node_modules/randomfill": {
+            "version": "1.0.4",
+            "license": "MIT",
+            "dependencies": {
+                "randombytes": "^2.0.5",
+                "safe-buffer": "^5.1.0"
+            }
+        },
+        "node_modules/range-parser": {
+            "version": "1.2.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/raw-body": {
+            "version": "2.5.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "bytes": "3.1.2",
+                "http-errors": "2.0.0",
+                "iconv-lite": "0.4.24",
+                "unpipe": "1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/rc": {
+            "version": "1.2.8",
+            "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
+            "dependencies": {
+                "deep-extend": "^0.6.0",
+                "ini": "~1.3.0",
+                "minimist": "^1.2.0",
+                "strip-json-comments": "~2.0.1"
+            },
+            "bin": {
+                "rc": "cli.js"
+            }
+        },
+        "node_modules/rc/node_modules/strip-json-comments": {
+            "version": "2.0.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/read": {
+            "version": "1.0.7",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "mute-stream": "~0.0.4"
+            },
+            "engines": {
+                "node": ">=0.8"
+            }
+        },
+        "node_modules/read-pkg": {
+            "version": "5.2.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/normalize-package-data": "^2.4.0",
+                "normalize-package-data": "^2.5.0",
+                "parse-json": "^5.0.0",
+                "type-fest": "^0.6.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/read-pkg-up": {
+            "version": "7.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "find-up": "^4.1.0",
+                "read-pkg": "^5.2.0",
+                "type-fest": "^0.8.1"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/read-pkg-up/node_modules/find-up": {
+            "version": "4.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "locate-path": "^5.0.0",
+                "path-exists": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/read-pkg-up/node_modules/locate-path": {
+            "version": "5.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-locate": "^4.1.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/read-pkg-up/node_modules/p-limit": {
+            "version": "2.3.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-try": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/read-pkg-up/node_modules/p-locate": {
+            "version": "4.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "p-limit": "^2.2.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/read-pkg/node_modules/hosted-git-info": {
+            "version": "2.8.9",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/read-pkg/node_modules/normalize-package-data": {
+            "version": "2.5.0",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "hosted-git-info": "^2.1.4",
+                "resolve": "^1.10.0",
+                "semver": "2 || 3 || 4 || 5",
+                "validate-npm-package-license": "^3.0.1"
+            }
+        },
+        "node_modules/read-pkg/node_modules/semver": {
+            "version": "5.7.2",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver"
+            }
+        },
+        "node_modules/read-pkg/node_modules/type-fest": {
+            "version": "0.6.0",
+            "dev": true,
+            "license": "(MIT OR CC0-1.0)",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/readable-stream": {
+            "version": "3.6.2",
+            "license": "MIT",
+            "dependencies": {
+                "inherits": "^2.0.3",
+                "string_decoder": "^1.1.1",
+                "util-deprecate": "^1.0.1"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/readdirp": {
+            "version": "3.6.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "picomatch": "^2.2.1"
+            },
+            "engines": {
+                "node": ">=8.10.0"
+            }
+        },
+        "node_modules/readline-sync": {
+            "version": "1.4.10",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/recast": {
+            "version": "0.11.23",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ast-types": "0.9.6",
+                "esprima": "~3.1.0",
+                "private": "~0.1.5",
+                "source-map": "~0.5.0"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/recast/node_modules/ast-types": {
+            "version": "0.9.6",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/recast/node_modules/esprima": {
+            "version": "3.1.3",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "bin": {
+                "esparse": "bin/esparse.js",
+                "esvalidate": "bin/esvalidate.js"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/recast/node_modules/source-map": {
+            "version": "0.5.7",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/rechoir": {
+            "version": "0.8.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "resolve": "^1.20.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            }
+        },
+        "node_modules/redent": {
+            "version": "3.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "indent-string": "^4.0.0",
+                "strip-indent": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/regexp-tree": {
+            "version": "0.1.27",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "regexp-tree": "bin/regexp-tree"
+            }
+        },
+        "node_modules/regexp.prototype.flags": {
+            "version": "1.4.3",
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.2",
+                "define-properties": "^1.1.3",
+                "functions-have-names": "^1.2.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/registry-js": {
+            "version": "1.16.1",
+            "resolved": "https://registry.npmjs.org/registry-js/-/registry-js-1.16.1.tgz",
+            "integrity": "sha512-pQ2kD36lh+YNtpaXm6HCCb0QZtV/zQEeKnkfEIj5FDSpF/oFts7pwizEUkWSvP8IbGb4A4a5iBhhS9eUearMmQ==",
+            "hasInstallScript": true,
+            "license": "MIT",
+            "dependencies": {
+                "node-addon-api": "^3.2.1",
+                "prebuild-install": "^5.3.5"
+            }
+        },
+        "node_modules/registry-js/node_modules/decompress-response": {
+            "version": "4.2.1",
+            "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
+            "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+            "license": "MIT",
+            "dependencies": {
+                "mimic-response": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/registry-js/node_modules/detect-libc": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+            "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+            "license": "Apache-2.0",
+            "bin": {
+                "detect-libc": "bin/detect-libc.js"
+            },
+            "engines": {
+                "node": ">=0.10"
+            }
+        },
+        "node_modules/registry-js/node_modules/mimic-response": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
+            "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/registry-js/node_modules/node-abi": {
+            "version": "2.30.1",
+            "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.30.1.tgz",
+            "integrity": "sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w==",
+            "license": "MIT",
+            "dependencies": {
+                "semver": "^5.4.1"
+            }
+        },
+        "node_modules/registry-js/node_modules/node-addon-api": {
+            "version": "3.2.1",
+            "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
+            "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
+            "license": "MIT"
+        },
+        "node_modules/registry-js/node_modules/prebuild-install": {
+            "version": "5.3.6",
+            "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.6.tgz",
+            "integrity": "sha512-s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg==",
+            "license": "MIT",
+            "dependencies": {
+                "detect-libc": "^1.0.3",
+                "expand-template": "^2.0.3",
+                "github-from-package": "0.0.0",
+                "minimist": "^1.2.3",
+                "mkdirp-classic": "^0.5.3",
+                "napi-build-utils": "^1.0.1",
+                "node-abi": "^2.7.0",
+                "noop-logger": "^0.1.1",
+                "npmlog": "^4.0.1",
+                "pump": "^3.0.0",
+                "rc": "^1.2.7",
+                "simple-get": "^3.0.3",
+                "tar-fs": "^2.0.0",
+                "tunnel-agent": "^0.6.0",
+                "which-pm-runs": "^1.0.0"
+            },
+            "bin": {
+                "prebuild-install": "bin.js"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/registry-js/node_modules/semver": {
+            "version": "5.7.2",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+            "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver"
+            }
+        },
+        "node_modules/registry-js/node_modules/simple-get": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz",
+            "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==",
+            "license": "MIT",
+            "dependencies": {
+                "decompress-response": "^4.2.0",
+                "once": "^1.3.1",
+                "simple-concat": "^1.0.0"
+            }
+        },
+        "node_modules/regjsparser": {
+            "version": "0.10.0",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "jsesc": "~0.5.0"
+            },
+            "bin": {
+                "regjsparser": "bin/parser"
+            }
+        },
+        "node_modules/regjsparser/node_modules/jsesc": {
+            "version": "0.5.0",
+            "dev": true,
+            "bin": {
+                "jsesc": "bin/jsesc"
+            }
+        },
+        "node_modules/remove-trailing-separator": {
+            "version": "1.1.0",
+            "license": "ISC"
+        },
+        "node_modules/replace-ext": {
+            "version": "1.0.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/request-light": {
+            "version": "0.2.5",
+            "license": "MIT",
+            "dependencies": {
+                "http-proxy-agent": "^2.1.0",
+                "https-proxy-agent": "^2.2.3",
+                "vscode-nls": "^4.1.1"
+            }
+        },
+        "node_modules/request-light/node_modules/agent-base": {
+            "version": "4.3.0",
+            "license": "MIT",
+            "dependencies": {
+                "es6-promisify": "^5.0.0"
+            },
+            "engines": {
+                "node": ">= 4.0.0"
+            }
+        },
+        "node_modules/request-light/node_modules/debug": {
+            "version": "3.1.0",
+            "license": "MIT",
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/request-light/node_modules/http-proxy-agent": {
+            "version": "2.1.0",
+            "license": "MIT",
+            "dependencies": {
+                "agent-base": "4",
+                "debug": "3.1.0"
+            },
+            "engines": {
+                "node": ">= 4.5.0"
+            }
+        },
+        "node_modules/request-light/node_modules/https-proxy-agent": {
+            "version": "2.2.4",
+            "license": "MIT",
+            "dependencies": {
+                "agent-base": "^4.3.0",
+                "debug": "^3.1.0"
+            },
+            "engines": {
+                "node": ">= 4.5.0"
+            }
+        },
+        "node_modules/request-light/node_modules/ms": {
+            "version": "2.0.0",
+            "license": "MIT"
+        },
+        "node_modules/request-light/node_modules/vscode-nls": {
+            "version": "4.1.2",
+            "license": "MIT"
+        },
+        "node_modules/require-directory": {
+            "version": "2.1.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/require-from-string": {
+            "version": "2.0.2",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/requires-port": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/resolve": {
+            "version": "1.22.10",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-core-module": "^2.16.0",
+                "path-parse": "^1.0.7",
+                "supports-preserve-symlinks-flag": "^1.0.0"
+            },
+            "bin": {
+                "resolve": "bin/resolve"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/resolve-alpn": {
+            "version": "1.2.1",
+            "license": "MIT"
+        },
+        "node_modules/resolve-cwd": {
+            "version": "3.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "resolve-from": "^5.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/resolve-cwd/node_modules/resolve-from": {
+            "version": "5.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/resolve-from": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/resolve-path": {
+            "version": "1.4.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "http-errors": "~1.6.2",
+                "path-is-absolute": "1.0.1"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/resolve-path/node_modules/http-errors": {
+            "version": "1.6.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "depd": "~1.1.2",
+                "inherits": "2.0.3",
+                "setprototypeof": "1.1.0",
+                "statuses": ">= 1.4.0 < 2"
+            },
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/resolve-path/node_modules/inherits": {
+            "version": "2.0.3",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/resolve-path/node_modules/setprototypeof": {
+            "version": "1.1.0",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/responselike": {
+            "version": "2.0.0",
+            "license": "MIT",
+            "dependencies": {
+                "lowercase-keys": "^2.0.0"
+            }
+        },
+        "node_modules/restructure": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/restructure/-/restructure-3.0.2.tgz",
+            "integrity": "sha512-gSfoiOEA0VPE6Tukkrr7I0RBdE0s7H1eFCDBk05l1KIQT1UIKNc5JZy6jdyW6eYH3aR3g5b3PuL77rq0hvwtAw==",
+            "license": "MIT"
+        },
+        "node_modules/retry": {
+            "version": "0.13.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 4"
+            }
+        },
+        "node_modules/reusify": {
+            "version": "1.0.4",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "iojs": ">=1.0.0",
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/rimraf": {
+            "version": "3.0.2",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "glob": "^7.1.3"
+            },
+            "bin": {
+                "rimraf": "bin.js"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/rimraf/node_modules/glob": {
+            "version": "7.2.3",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/ripemd160": {
+            "version": "2.0.2",
+            "license": "MIT",
+            "dependencies": {
+                "hash-base": "^3.0.0",
+                "inherits": "^2.0.1"
+            }
+        },
+        "node_modules/rrweb-cssom": {
+            "version": "0.6.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/run-parallel": {
+            "version": "1.2.0",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "queue-microtask": "^1.2.2"
+            }
+        },
+        "node_modules/rxjs": {
+            "version": "7.8.2",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.1.0"
+            }
+        },
+        "node_modules/safe-buffer": {
+            "version": "5.2.1",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "license": "MIT"
+        },
+        "node_modules/safe-stable-stringify": {
+            "version": "2.3.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/safer-buffer": {
+            "version": "2.1.2",
+            "license": "MIT"
+        },
+        "node_modules/sanitize-html": {
+            "version": "2.13.0",
+            "license": "MIT",
+            "dependencies": {
+                "deepmerge": "^4.2.2",
+                "escape-string-regexp": "^4.0.0",
+                "htmlparser2": "^8.0.0",
+                "is-plain-object": "^5.0.0",
+                "parse-srcset": "^1.0.2",
+                "postcss": "^8.3.11"
+            }
+        },
+        "node_modules/sanitize-html/node_modules/is-plain-object": {
+            "version": "5.0.0",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/sass": {
+            "version": "1.69.5",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "chokidar": ">=3.0.0 <4.0.0",
+                "immutable": "^4.0.0",
+                "source-map-js": ">=0.6.2 <2.0.0"
+            },
+            "bin": {
+                "sass": "sass.js"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/sass-loader": {
+            "version": "16.0.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "neo-async": "^2.6.2"
+            },
+            "engines": {
+                "node": ">= 18.12.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "@rspack/core": "0.x || 1.x",
+                "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
+                "sass": "^1.3.0",
+                "sass-embedded": "*",
+                "webpack": "^5.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@rspack/core": {
+                    "optional": true
+                },
+                "node-sass": {
+                    "optional": true
+                },
+                "sass": {
+                    "optional": true
+                },
+                "sass-embedded": {
+                    "optional": true
+                },
+                "webpack": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/sax": {
+            "version": "1.2.1",
+            "license": "ISC"
+        },
+        "node_modules/saxes": {
+            "version": "6.0.0",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "xmlchars": "^2.2.0"
+            },
+            "engines": {
+                "node": ">=v12.22.7"
+            }
+        },
+        "node_modules/schema-utils": {
+            "version": "3.3.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/json-schema": "^7.0.8",
+                "ajv": "^6.12.5",
+                "ajv-keywords": "^3.5.2"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            }
+        },
+        "node_modules/select-hose": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/selfsigned": {
+            "version": "2.1.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "node-forge": "^1"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/semver": {
+            "version": "7.6.2",
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/send": {
+            "version": "0.19.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "debug": "2.6.9",
+                "depd": "2.0.0",
+                "destroy": "1.2.0",
+                "encodeurl": "~1.0.2",
+                "escape-html": "~1.0.3",
+                "etag": "~1.8.1",
+                "fresh": "0.5.2",
+                "http-errors": "2.0.0",
+                "mime": "1.6.0",
+                "ms": "2.1.3",
+                "on-finished": "2.4.1",
+                "range-parser": "~1.2.1",
+                "statuses": "2.0.1"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/send/node_modules/debug": {
+            "version": "2.6.9",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/send/node_modules/debug/node_modules/ms": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/send/node_modules/depd": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/send/node_modules/ms": {
+            "version": "2.1.3",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/send/node_modules/statuses": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/serialize-javascript": {
+            "version": "6.0.0",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "randombytes": "^2.1.0"
+            }
+        },
+        "node_modules/serve-index": {
+            "version": "1.9.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "accepts": "~1.3.4",
+                "batch": "0.6.1",
+                "debug": "2.6.9",
+                "escape-html": "~1.0.3",
+                "http-errors": "~1.6.2",
+                "mime-types": "~2.1.17",
+                "parseurl": "~1.3.2"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/serve-index/node_modules/debug": {
+            "version": "2.6.9",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/serve-index/node_modules/http-errors": {
+            "version": "1.6.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "depd": "~1.1.2",
+                "inherits": "2.0.3",
+                "setprototypeof": "1.1.0",
+                "statuses": ">= 1.4.0 < 2"
+            },
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/serve-index/node_modules/inherits": {
+            "version": "2.0.3",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/serve-index/node_modules/ms": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/serve-index/node_modules/setprototypeof": {
+            "version": "1.1.0",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/serve-static": {
+            "version": "1.16.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "encodeurl": "~2.0.0",
+                "escape-html": "~1.0.3",
+                "parseurl": "~1.3.3",
+                "send": "0.19.0"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/serve-static/node_modules/encodeurl": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/set-blocking": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+            "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+            "license": "ISC"
+        },
+        "node_modules/set-function-length": {
+            "version": "1.2.2",
+            "license": "MIT",
+            "dependencies": {
+                "define-data-property": "^1.1.4",
+                "es-errors": "^1.3.0",
+                "function-bind": "^1.1.2",
+                "get-intrinsic": "^1.2.4",
+                "gopd": "^1.0.1",
+                "has-property-descriptors": "^1.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/setimmediate": {
+            "version": "1.0.5",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/setprototypeof": {
+            "version": "1.2.0",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/sh-syntax": {
+            "version": "0.4.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/unts"
+            }
+        },
+        "node_modules/sha.js": {
+            "version": "2.4.11",
+            "license": "(MIT AND BSD-3-Clause)",
+            "dependencies": {
+                "inherits": "^2.0.1",
+                "safe-buffer": "^5.0.1"
+            },
+            "bin": {
+                "sha.js": "bin.js"
+            }
+        },
+        "node_modules/shallow-clone": {
+            "version": "3.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "kind-of": "^6.0.2"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/shebang-command": {
+            "version": "2.0.0",
+            "license": "MIT",
+            "dependencies": {
+                "shebang-regex": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/shebang-regex": {
+            "version": "3.0.0",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/shell-quote": {
+            "version": "1.8.1",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/side-channel": {
+            "version": "1.0.6",
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.7",
+                "es-errors": "^1.3.0",
+                "get-intrinsic": "^1.2.4",
+                "object-inspect": "^1.13.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/signal-exit": {
+            "version": "3.0.7",
+            "license": "ISC"
+        },
+        "node_modules/simple-concat": {
+            "version": "1.0.1",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "license": "MIT"
+        },
+        "node_modules/simple-get": {
+            "version": "4.0.1",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "decompress-response": "^6.0.0",
+                "once": "^1.3.1",
+                "simple-concat": "^1.0.0"
+            }
+        },
+        "node_modules/simple-swizzle": {
+            "version": "0.2.2",
+            "license": "MIT",
+            "dependencies": {
+                "is-arrayish": "^0.3.1"
+            }
+        },
+        "node_modules/sinon": {
+            "version": "14.0.0",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "@sinonjs/commons": "^1.8.3",
+                "@sinonjs/fake-timers": "^9.1.2",
+                "@sinonjs/samsam": "^6.1.1",
+                "diff": "^5.0.0",
+                "nise": "^5.1.1",
+                "supports-color": "^7.2.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/sinon"
+            }
+        },
+        "node_modules/sinon/node_modules/@sinonjs/fake-timers": {
+            "version": "9.1.2",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "@sinonjs/commons": "^1.7.0"
+            }
+        },
+        "node_modules/slash": {
+            "version": "3.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/sockjs": {
+            "version": "0.3.24",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "faye-websocket": "^0.11.3",
+                "uuid": "^8.3.2",
+                "websocket-driver": "^0.7.4"
+            }
+        },
+        "node_modules/sockjs/node_modules/uuid": {
+            "version": "8.3.2",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "uuid": "dist/bin/uuid"
+            }
+        },
+        "node_modules/source-list-map": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/source-map": {
+            "version": "0.6.1",
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/source-map-js": {
+            "version": "1.0.2",
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/source-map-support": {
+            "version": "0.5.21",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "buffer-from": "^1.0.0",
+                "source-map": "^0.6.0"
+            }
+        },
+        "node_modules/spdx-correct": {
+            "version": "3.1.1",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "spdx-expression-parse": "^3.0.0",
+                "spdx-license-ids": "^3.0.0"
+            }
+        },
+        "node_modules/spdx-exceptions": {
+            "version": "2.3.0",
+            "dev": true,
+            "license": "CC-BY-3.0"
+        },
+        "node_modules/spdx-expression-parse": {
+            "version": "3.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "spdx-exceptions": "^2.1.0",
+                "spdx-license-ids": "^3.0.0"
+            }
+        },
+        "node_modules/spdx-license-ids": {
+            "version": "3.0.11",
+            "dev": true,
+            "license": "CC0-1.0"
+        },
+        "node_modules/spdy": {
+            "version": "4.0.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "debug": "^4.1.0",
+                "handle-thing": "^2.0.0",
+                "http-deceiver": "^1.2.7",
+                "select-hose": "^2.0.0",
+                "spdy-transport": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/spdy-transport": {
+            "version": "3.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "debug": "^4.1.0",
+                "detect-node": "^2.0.4",
+                "hpack.js": "^2.1.6",
+                "obuf": "^1.1.2",
+                "readable-stream": "^3.0.6",
+                "wbuf": "^1.7.3"
+            }
+        },
+        "node_modules/split": {
+            "version": "1.0.1",
+            "license": "MIT",
+            "dependencies": {
+                "through": "2"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/sprintf-js": {
+            "version": "1.0.3",
+            "license": "BSD-3-Clause"
+        },
+        "node_modules/stack-trace": {
+            "version": "0.0.10",
+            "license": "MIT",
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/statuses": {
+            "version": "1.5.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/stream-browserify": {
+            "version": "3.0.0",
+            "license": "MIT",
+            "dependencies": {
+                "inherits": "~2.0.4",
+                "readable-stream": "^3.5.0"
+            }
+        },
+        "node_modules/stream-buffers": {
+            "version": "3.0.2",
+            "license": "Unlicense",
+            "engines": {
+                "node": ">= 0.10.0"
+            }
+        },
+        "node_modules/stream-combiner": {
+            "version": "0.2.2",
+            "license": "MIT",
+            "dependencies": {
+                "duplexer": "~0.1.1",
+                "through": "~2.3.4"
+            }
+        },
+        "node_modules/stream-shift": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/streamx": {
+            "version": "2.16.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-fifo": "^1.1.0",
+                "queue-tick": "^1.0.1"
+            },
+            "optionalDependencies": {
+                "bare-events": "^2.2.0"
+            }
+        },
+        "node_modules/string_decoder": {
+            "version": "1.3.0",
+            "license": "MIT",
+            "dependencies": {
+                "safe-buffer": "~5.2.0"
+            }
+        },
+        "node_modules/string-width": {
+            "version": "4.2.3",
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/string-width-cjs": {
+            "name": "string-width",
+            "version": "4.2.3",
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/string-width-cjs/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/string-width-cjs/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/string-width/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/string-width/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/string.prototype.trimend": {
+            "version": "1.0.5",
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.2",
                 "define-properties": "^1.1.4",
+                "es-abstract": "^1.19.5"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/string.prototype.trimstart": {
+            "version": "1.0.5",
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.2",
+                "define-properties": "^1.1.4",
+                "es-abstract": "^1.19.5"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/strip-ansi": {
+            "version": "5.2.0",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^4.1.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/strip-ansi-cjs": {
+            "name": "strip-ansi",
+            "version": "6.0.1",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strip-final-newline": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/strip-indent": {
+            "version": "3.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "min-indent": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strip-json-comments": {
+            "version": "3.1.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/strnum": {
+            "version": "1.0.5",
+            "license": "MIT"
+        },
+        "node_modules/style-loader": {
+            "version": "3.3.3",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 12.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "^5.0.0"
+            }
+        },
+        "node_modules/supports-color": {
+            "version": "7.2.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/supports-preserve-symlinks-flag": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/svg-pathdata": {
+            "version": "6.0.3",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12.0.0"
+            }
+        },
+        "node_modules/svg2ttf": {
+            "version": "6.0.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@xmldom/xmldom": "^0.7.2",
+                "argparse": "^2.0.1",
+                "cubic2quad": "^1.2.1",
+                "lodash": "^4.17.10",
+                "microbuffer": "^1.0.0",
+                "svgpath": "^2.1.5"
+            },
+            "bin": {
+                "svg2ttf": "svg2ttf.js"
+            }
+        },
+        "node_modules/svgdom": {
+            "version": "0.1.21",
+            "resolved": "https://registry.npmjs.org/svgdom/-/svgdom-0.1.21.tgz",
+            "integrity": "sha512-PrMx2aEzjRgyK9nbff6/NOzNmGcRnkjwO9p3JnHISmqPTMGtBPi4uFp59fVhI9PqRp8rVEWgmXFbkgYRsTnapg==",
+            "license": "MIT",
+            "dependencies": {
+                "fontkit": "^2.0.4",
+                "image-size": "^1.2.1",
+                "sax": "^1.4.1"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/Fuzzyma"
+            }
+        },
+        "node_modules/svgdom/node_modules/sax": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
+            "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==",
+            "license": "ISC"
+        },
+        "node_modules/svgicons2svgfont": {
+            "version": "10.0.6",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "commander": "^7.2.0",
+                "geometry-interfaces": "^1.1.4",
+                "glob": "^7.1.6",
+                "neatequal": "^1.0.0",
+                "readable-stream": "^3.4.0",
+                "sax": "^1.2.4",
+                "svg-pathdata": "^6.0.0"
+            },
+            "bin": {
+                "svgicons2svgfont": "bin/svgicons2svgfont.js"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            }
+        },
+        "node_modules/svgicons2svgfont/node_modules/commander": {
+            "version": "7.2.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/svgicons2svgfont/node_modules/glob": {
+            "version": "7.2.3",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/svgicons2svgfont/node_modules/sax": {
+            "version": "1.2.4",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/svgpath": {
+            "version": "2.5.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/symbol-tree": {
+            "version": "3.2.4",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/synckit": {
+            "version": "0.8.8",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@pkgr/core": "^0.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": "^14.18.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/unts"
+            }
+        },
+        "node_modules/tapable": {
+            "version": "2.2.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/tar-fs": {
+            "version": "2.1.1",
+            "license": "MIT",
+            "dependencies": {
+                "chownr": "^1.1.1",
+                "mkdirp-classic": "^0.5.2",
+                "pump": "^3.0.0",
+                "tar-stream": "^2.1.4"
+            }
+        },
+        "node_modules/tar-stream": {
+            "version": "2.2.0",
+            "license": "MIT",
+            "dependencies": {
+                "bl": "^4.0.3",
+                "end-of-stream": "^1.4.1",
+                "fs-constants": "^1.0.0",
+                "inherits": "^2.0.3",
+                "readable-stream": "^3.1.1"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/tcp-port-used": {
+            "version": "1.0.2",
+            "license": "MIT",
+            "dependencies": {
+                "debug": "4.3.1",
+                "is2": "^2.0.6"
+            }
+        },
+        "node_modules/tcp-port-used/node_modules/debug": {
+            "version": "4.3.1",
+            "license": "MIT",
+            "dependencies": {
+                "ms": "2.1.2"
+            },
+            "engines": {
+                "node": ">=6.0"
+            },
+            "peerDependenciesMeta": {
+                "supports-color": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/terser": {
+            "version": "5.31.6",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "@jridgewell/source-map": "^0.3.3",
+                "acorn": "^8.8.2",
+                "commander": "^2.20.0",
+                "source-map-support": "~0.5.20"
+            },
+            "bin": {
+                "terser": "bin/terser"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/terser-webpack-plugin": {
+            "version": "5.3.10",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/trace-mapping": "^0.3.20",
+                "jest-worker": "^27.4.5",
+                "schema-utils": "^3.1.1",
+                "serialize-javascript": "^6.0.1",
+                "terser": "^5.26.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "^5.1.0"
+            },
+            "peerDependenciesMeta": {
+                "@swc/core": {
+                    "optional": true
+                },
+                "esbuild": {
+                    "optional": true
+                },
+                "uglify-js": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/terser-webpack-plugin/node_modules/serialize-javascript": {
+            "version": "6.0.2",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "randombytes": "^2.1.0"
+            }
+        },
+        "node_modules/terser/node_modules/commander": {
+            "version": "2.20.3",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/test-exclude": {
+            "version": "6.0.0",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "@istanbuljs/schema": "^0.1.2",
+                "glob": "^7.1.4",
+                "minimatch": "^3.0.4"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/test-exclude/node_modules/glob": {
+            "version": "7.2.3",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/text-hex": {
+            "version": "1.0.0",
+            "license": "MIT"
+        },
+        "node_modules/text-table": {
+            "version": "0.2.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/thenify": {
+            "version": "3.3.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "any-promise": "^1.0.0"
+            }
+        },
+        "node_modules/thenify-all": {
+            "version": "1.6.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "thenify": ">= 3.1.0 < 4"
+            },
+            "engines": {
+                "node": ">=0.8"
+            }
+        },
+        "node_modules/through": {
+            "version": "2.3.8",
+            "license": "MIT"
+        },
+        "node_modules/through2": {
+            "version": "2.0.5",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "readable-stream": "~2.3.6",
+                "xtend": "~4.0.1"
+            }
+        },
+        "node_modules/through2/node_modules/readable-stream": {
+            "version": "2.3.8",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+            }
+        },
+        "node_modules/through2/node_modules/safe-buffer": {
+            "version": "5.1.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/through2/node_modules/string_decoder": {
+            "version": "1.1.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "safe-buffer": "~5.1.0"
+            }
+        },
+        "node_modules/thunky": {
+            "version": "1.1.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/time-stamp": {
+            "version": "1.1.0",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/timers-ext": {
+            "version": "0.1.7",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "es5-ext": "~0.10.46",
+                "next-tick": "1"
+            }
+        },
+        "node_modules/tiny-inflate": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.3.tgz",
+            "integrity": "sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==",
+            "license": "MIT"
+        },
+        "node_modules/tmp": {
+            "version": "0.2.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "rimraf": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8.17.0"
+            }
+        },
+        "node_modules/to-regex-range": {
+            "version": "5.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-number": "^7.0.0"
+            },
+            "engines": {
+                "node": ">=8.0"
+            }
+        },
+        "node_modules/toidentifier": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.6"
+            }
+        },
+        "node_modules/tough-cookie": {
+            "version": "4.1.3",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "psl": "^1.1.33",
+                "punycode": "^2.1.1",
+                "universalify": "^0.2.0",
+                "url-parse": "^1.5.3"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/tough-cookie/node_modules/universalify": {
+            "version": "0.2.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 4.0.0"
+            }
+        },
+        "node_modules/tr46": {
+            "version": "5.0.0",
+            "license": "MIT",
+            "dependencies": {
+                "punycode": "^2.3.1"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/trim-newlines": {
+            "version": "3.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/triple-beam": {
+            "version": "1.3.0",
+            "license": "MIT"
+        },
+        "node_modules/ts-api-utils": {
+            "version": "1.3.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=16"
+            },
+            "peerDependencies": {
+                "typescript": ">=4.2.0"
+            }
+        },
+        "node_modules/ts-morph": {
+            "version": "23.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@ts-morph/common": "~0.24.0",
+                "code-block-writer": "^13.0.1"
+            }
+        },
+        "node_modules/ts-node": {
+            "version": "10.9.2",
+            "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
+            "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
+            "dev": true,
+            "dependencies": {
+                "@cspotcode/source-map-support": "^0.8.0",
+                "@tsconfig/node10": "^1.0.7",
+                "@tsconfig/node12": "^1.0.7",
+                "@tsconfig/node14": "^1.0.0",
+                "@tsconfig/node16": "^1.0.2",
+                "acorn": "^8.4.1",
+                "acorn-walk": "^8.1.1",
+                "arg": "^4.1.0",
+                "create-require": "^1.1.0",
+                "diff": "^4.0.1",
+                "make-error": "^1.1.1",
+                "v8-compile-cache-lib": "^3.0.1",
+                "yn": "3.1.1"
+            },
+            "bin": {
+                "ts-node": "dist/bin.js",
+                "ts-node-cwd": "dist/bin-cwd.js",
+                "ts-node-esm": "dist/bin-esm.js",
+                "ts-node-script": "dist/bin-script.js",
+                "ts-node-transpile-only": "dist/bin-transpile.js",
+                "ts-script": "dist/bin-script-deprecated.js"
+            },
+            "peerDependencies": {
+                "@swc/core": ">=1.2.50",
+                "@swc/wasm": ">=1.2.50",
+                "@types/node": "*",
+                "typescript": ">=2.7"
+            },
+            "peerDependenciesMeta": {
+                "@swc/core": {
+                    "optional": true
+                },
+                "@swc/wasm": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/ts-node/node_modules/diff": {
+            "version": "4.0.2",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">=0.3.1"
+            }
+        },
+        "node_modules/tslib": {
+            "version": "2.8.1",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+            "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+            "license": "0BSD"
+        },
+        "node_modules/tsscmp": {
+            "version": "1.0.6",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.6.x"
+            }
+        },
+        "node_modules/ttf2eot": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "argparse": "^1.0.6",
+                "microbuffer": "^1.0.0"
+            },
+            "bin": {
+                "ttf2eot": "ttf2eot.js"
+            }
+        },
+        "node_modules/ttf2eot/node_modules/argparse": {
+            "version": "1.0.10",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "sprintf-js": "~1.0.2"
+            }
+        },
+        "node_modules/ttf2woff": {
+            "version": "2.0.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "argparse": "^1.0.6",
+                "microbuffer": "^1.0.0",
+                "pako": "^1.0.0"
+            },
+            "bin": {
+                "ttf2woff": "ttf2woff.js"
+            }
+        },
+        "node_modules/ttf2woff/node_modules/argparse": {
+            "version": "1.0.10",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "sprintf-js": "~1.0.2"
+            }
+        },
+        "node_modules/tunnel": {
+            "version": "0.0.6",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+            }
+        },
+        "node_modules/tunnel-agent": {
+            "version": "0.6.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "safe-buffer": "^5.0.1"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/type": {
+            "version": "1.2.0",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/type-check": {
+            "version": "0.4.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "prelude-ls": "^1.2.1"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/type-detect": {
+            "version": "4.0.8",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/type-fest": {
+            "version": "0.8.1",
+            "dev": true,
+            "license": "(MIT OR CC0-1.0)",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/type-is": {
+            "version": "1.6.18",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "media-typer": "0.3.0",
+                "mime-types": "~2.1.24"
+            },
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/typed-rest-client": {
+            "version": "1.8.11",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "qs": "^6.9.1",
+                "tunnel": "0.0.6",
+                "underscore": "^1.12.1"
+            }
+        },
+        "node_modules/typescript": {
+            "version": "5.2.2",
+            "dev": true,
+            "license": "Apache-2.0",
+            "bin": {
+                "tsc": "bin/tsc",
+                "tsserver": "bin/tsserver"
+            },
+            "engines": {
+                "node": ">=14.17"
+            }
+        },
+        "node_modules/uc.micro": {
+            "version": "1.0.6",
+            "license": "MIT"
+        },
+        "node_modules/umd-compat-loader": {
+            "version": "2.1.2",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "ast-types": "^0.9.2",
+                "loader-utils": "^1.0.3",
+                "recast": "^0.11.17"
+            }
+        },
+        "node_modules/umd-compat-loader/node_modules/json5": {
+            "version": "1.0.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "minimist": "^1.2.0"
+            },
+            "bin": {
+                "json5": "lib/cli.js"
+            }
+        },
+        "node_modules/umd-compat-loader/node_modules/loader-utils": {
+            "version": "1.4.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "big.js": "^5.2.2",
+                "emojis-list": "^3.0.0",
+                "json5": "^1.0.1"
+            },
+            "engines": {
+                "node": ">=4.0.0"
+            }
+        },
+        "node_modules/unbox-primitive": {
+            "version": "1.0.2",
+            "license": "MIT",
+            "dependencies": {
+                "call-bind": "^1.0.2",
+                "has-bigints": "^1.0.2",
                 "has-symbols": "^1.0.3",
-                "object-keys": "^1.1.1"
+                "which-boxed-primitive": "^1.0.2"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/underscore": {
+            "version": "1.13.6",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/undici": {
+            "version": "6.21.2",
+            "license": "MIT",
+            "engines": {
+                "node": ">=18.17"
+            }
+        },
+        "node_modules/undici-types": {
+            "version": "6.19.8",
+            "license": "MIT"
+        },
+        "node_modules/unescape-html": {
+            "version": "1.1.0",
+            "license": "MIT"
+        },
+        "node_modules/unicode-properties": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/unicode-properties/-/unicode-properties-1.4.1.tgz",
+            "integrity": "sha512-CLjCCLQ6UuMxWnbIylkisbRj31qxHPAurvena/0iwSVbQ2G1VY5/HjV0IRabOEbDHlzZlRdCrD4NhB0JtU40Pg==",
+            "license": "MIT",
+            "dependencies": {
+                "base64-js": "^1.3.0",
+                "unicode-trie": "^2.0.0"
+            }
+        },
+        "node_modules/unicode-trie": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/unicode-trie/-/unicode-trie-2.0.0.tgz",
+            "integrity": "sha512-x7bc76x0bm4prf1VLg79uhAzKw8DVboClSN5VxJuQ+LKDOVEW9CdH+VY7SP+vX7xCYQqzzgQpFqz15zeLvAtZQ==",
+            "license": "MIT",
+            "dependencies": {
+                "pako": "^0.2.5",
+                "tiny-inflate": "^1.0.0"
+            }
+        },
+        "node_modules/unicode-trie/node_modules/pako": {
+            "version": "0.2.9",
+            "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
+            "integrity": "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==",
+            "license": "MIT"
+        },
+        "node_modules/universalify": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 10.0.0"
+            }
+        },
+        "node_modules/unpipe": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/update-browserslist-db": {
+            "version": "1.0.16",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/browserslist"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/browserslist"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "escalade": "^3.1.2",
+                "picocolors": "^1.0.1"
+            },
+            "bin": {
+                "update-browserslist-db": "cli.js"
+            },
+            "peerDependencies": {
+                "browserslist": ">= 4.21.0"
+            }
+        },
+        "node_modules/uri-js": {
+            "version": "4.4.1",
+            "dev": true,
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "punycode": "^2.1.0"
+            }
+        },
+        "node_modules/url": {
+            "version": "0.10.3",
+            "license": "MIT",
+            "dependencies": {
+                "punycode": "1.3.2",
+                "querystring": "0.2.0"
+            }
+        },
+        "node_modules/url-join": {
+            "version": "4.0.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/url-parse": {
+            "version": "1.5.10",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "querystringify": "^2.1.1",
+                "requires-port": "^1.0.0"
+            }
+        },
+        "node_modules/url/node_modules/punycode": {
+            "version": "1.3.2",
+            "license": "MIT"
+        },
+        "node_modules/util": {
+            "version": "0.12.5",
+            "license": "MIT",
+            "dependencies": {
+                "inherits": "^2.0.3",
+                "is-arguments": "^1.0.4",
+                "is-generator-function": "^1.0.7",
+                "is-typed-array": "^1.1.3",
+                "which-typed-array": "^1.1.2"
+            }
+        },
+        "node_modules/util-deprecate": {
+            "version": "1.0.2",
+            "license": "MIT"
+        },
+        "node_modules/utils-merge": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4.0"
+            }
+        },
+        "node_modules/uuid": {
+            "version": "9.0.1",
+            "funding": [
+                "https://github.com/sponsors/broofa",
+                "https://github.com/sponsors/ctavan"
+            ],
+            "license": "MIT",
+            "bin": {
+                "uuid": "dist/bin/uuid"
+            }
+        },
+        "node_modules/v8-compile-cache-lib": {
+            "version": "3.0.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/v8-to-istanbul": {
+            "version": "9.2.0",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "@jridgewell/trace-mapping": "^0.3.12",
+                "@types/istanbul-lib-coverage": "^2.0.1",
+                "convert-source-map": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10.12.0"
+            }
+        },
+        "node_modules/validate-npm-package-license": {
+            "version": "3.0.4",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "spdx-correct": "^3.0.0",
+                "spdx-expression-parse": "^3.0.0"
+            }
+        },
+        "node_modules/varstream": {
+            "version": "0.3.2",
+            "dev": true,
+            "dependencies": {
+                "readable-stream": "^1.0.33"
+            },
+            "bin": {
+                "json2varstream": "cli/json2varstream.js",
+                "varstream2json": "cli/varstream2json.js"
+            },
+            "engines": {
+                "node": ">=0.10.*"
+            }
+        },
+        "node_modules/varstream/node_modules/isarray": {
+            "version": "0.0.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/varstream/node_modules/readable-stream": {
+            "version": "1.1.14",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.1",
+                "isarray": "0.0.1",
+                "string_decoder": "~0.10.x"
+            }
+        },
+        "node_modules/varstream/node_modules/string_decoder": {
+            "version": "0.10.31",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/vary": {
+            "version": "1.1.2",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/vinyl": {
+            "version": "2.2.1",
+            "license": "MIT",
+            "dependencies": {
+                "clone": "^2.1.1",
+                "clone-buffer": "^1.0.0",
+                "clone-stats": "^1.0.0",
+                "cloneable-readable": "^1.0.0",
+                "remove-trailing-separator": "^1.0.1",
+                "replace-ext": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/vscode-json-languageservice": {
+            "version": "3.4.9",
+            "license": "MIT",
+            "dependencies": {
+                "jsonc-parser": "^2.2.0",
+                "vscode-languageserver-textdocument": "^1.0.0-next.4",
+                "vscode-languageserver-types": "^3.15.0-next.6",
+                "vscode-nls": "^4.1.1",
+                "vscode-uri": "^2.1.0"
+            }
+        },
+        "node_modules/vscode-json-languageservice/node_modules/jsonc-parser": {
+            "version": "2.3.1",
+            "license": "MIT"
+        },
+        "node_modules/vscode-json-languageservice/node_modules/vscode-nls": {
+            "version": "4.1.2",
+            "license": "MIT"
+        },
+        "node_modules/vscode-jsonrpc": {
+            "version": "8.2.0",
+            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz",
+            "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/vscode-languageclient": {
+            "version": "9.0.1",
+            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-9.0.1.tgz",
+            "integrity": "sha512-JZiimVdvimEuHh5olxhxkht09m3JzUGwggb5eRUkzzJhZ2KjCN0nh55VfiED9oez9DyF8/fz1g1iBV3h+0Z2EA==",
+            "license": "MIT",
+            "dependencies": {
+                "minimatch": "^5.1.0",
+                "semver": "^7.3.7",
+                "vscode-languageserver-protocol": "3.17.5"
+            },
+            "engines": {
+                "vscode": "^1.82.0"
+            }
+        },
+        "node_modules/vscode-languageclient/node_modules/brace-expansion": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+            "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "node_modules/vscode-languageclient/node_modules/minimatch": {
+            "version": "5.1.6",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+            "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/vscode-languageserver": {
+            "version": "9.0.1",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-9.0.1.tgz",
+            "integrity": "sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==",
+            "license": "MIT",
+            "dependencies": {
+                "vscode-languageserver-protocol": "3.17.5"
+            },
+            "bin": {
+                "installServerIntoExtension": "bin/installServerIntoExtension"
+            }
+        },
+        "node_modules/vscode-languageserver-protocol": {
+            "version": "3.17.5",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz",
+            "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==",
+            "license": "MIT",
+            "dependencies": {
+                "vscode-jsonrpc": "8.2.0",
+                "vscode-languageserver-types": "3.17.5"
+            }
+        },
+        "node_modules/vscode-languageserver-textdocument": {
+            "version": "1.0.12",
+            "license": "MIT"
+        },
+        "node_modules/vscode-languageserver-types": {
+            "version": "3.17.5",
+            "license": "MIT"
+        },
+        "node_modules/vscode-nls": {
+            "version": "5.2.0",
+            "license": "MIT"
+        },
+        "node_modules/vscode-nls-dev": {
+            "version": "4.0.4",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-colors": "^4.1.1",
+                "clone": "^2.1.2",
+                "event-stream": "^3.3.4",
+                "fancy-log": "^1.3.3",
+                "glob": "^7.2.0",
+                "iconv-lite": "^0.6.3",
+                "is": "^3.3.0",
+                "source-map": "^0.6.1",
+                "typescript": "^4.5.4",
+                "vinyl": "^2.2.1",
+                "xml2js": "^0.5.0",
+                "yargs": "^17.3.0"
+            },
+            "bin": {
+                "vscl": "lib/vscl.js"
+            }
+        },
+        "node_modules/vscode-nls-dev/node_modules/glob": {
+            "version": "7.2.3",
+            "license": "ISC",
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/vscode-nls-dev/node_modules/iconv-lite": {
+            "version": "0.6.3",
+            "license": "MIT",
+            "dependencies": {
+                "safer-buffer": ">= 2.1.2 < 3.0.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/vscode-nls-dev/node_modules/typescript": {
+            "version": "4.9.5",
+            "license": "Apache-2.0",
+            "bin": {
+                "tsc": "bin/tsc",
+                "tsserver": "bin/tsserver"
+            },
+            "engines": {
+                "node": ">=4.2.0"
+            }
+        },
+        "node_modules/vscode-nls-dev/node_modules/xml2js": {
+            "version": "0.5.0",
+            "license": "MIT",
+            "dependencies": {
+                "sax": ">=0.6.0",
+                "xmlbuilder": "~11.0.0"
+            },
+            "engines": {
+                "node": ">=4.0.0"
+            }
+        },
+        "node_modules/vscode-uri": {
+            "version": "2.1.2",
+            "license": "MIT"
+        },
+        "node_modules/vue": {
+            "version": "3.3.4",
+            "license": "MIT",
+            "dependencies": {
+                "@vue/compiler-dom": "3.3.4",
+                "@vue/compiler-sfc": "3.3.4",
+                "@vue/runtime-dom": "3.3.4",
+                "@vue/server-renderer": "3.3.4",
+                "@vue/shared": "3.3.4"
+            }
+        },
+        "node_modules/vue-loader": {
+            "version": "17.2.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "chalk": "^4.1.0",
+                "hash-sum": "^2.0.0",
+                "watchpack": "^2.4.0"
+            },
+            "peerDependencies": {
+                "webpack": "^4.1.0 || ^5.0.0-0"
+            },
+            "peerDependenciesMeta": {
+                "@vue/compiler-sfc": {
+                    "optional": true
+                },
+                "vue": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/vue-style-loader": {
+            "version": "4.1.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "hash-sum": "^1.0.2",
+                "loader-utils": "^1.0.2"
+            }
+        },
+        "node_modules/vue-style-loader/node_modules/hash-sum": {
+            "version": "1.0.2",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/vue-style-loader/node_modules/json5": {
+            "version": "1.0.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "minimist": "^1.2.0"
+            },
+            "bin": {
+                "json5": "lib/cli.js"
+            }
+        },
+        "node_modules/vue-style-loader/node_modules/loader-utils": {
+            "version": "1.4.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "big.js": "^5.2.2",
+                "emojis-list": "^3.0.0",
+                "json5": "^1.0.1"
+            },
+            "engines": {
+                "node": ">=4.0.0"
+            }
+        },
+        "node_modules/w3c-xmlserializer": {
+            "version": "5.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "xml-name-validator": "^5.0.0"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/watchpack": {
+            "version": "2.4.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "glob-to-regexp": "^0.4.1",
+                "graceful-fs": "^4.1.2"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/wawoff2": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "argparse": "^2.0.1"
+            },
+            "bin": {
+                "woff2_compress.js": "bin/woff2_compress.js",
+                "woff2_decompress.js": "bin/woff2_decompress.js"
+            }
+        },
+        "node_modules/wbuf": {
+            "version": "1.7.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "minimalistic-assert": "^1.0.0"
+            }
+        },
+        "node_modules/web-toolkit": {
+            "resolved": "packages/core/src/web",
+            "link": true
+        },
+        "node_modules/web-tree-sitter": {
+            "version": "0.20.8",
+            "license": "MIT"
+        },
+        "node_modules/webfont": {
+            "version": "11.2.26",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "cosmiconfig": "^5.2.0",
+                "deepmerge": "^4.2.2",
+                "globby": "^11.0.0",
+                "meow": "^9.0.0",
+                "nunjucks": "^3.2.3",
+                "p-limit": "^3.1.0",
+                "parse-json": "^5.2.0",
+                "resolve-from": "^5.0.0",
+                "svg2ttf": "^6.0.2",
+                "svgicons2svgfont": "^10.0.3",
+                "ttf2eot": "^2.0.0",
+                "ttf2woff": "^2.0.2",
+                "wawoff2": "^2.0.0",
+                "xml2js": "^0.4.23"
+            },
+            "bin": {
+                "webfont": "dist/cli.js"
+            },
+            "engines": {
+                "node": ">= 12.0.0"
+            }
+        },
+        "node_modules/webfont/node_modules/resolve-from": {
+            "version": "5.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/webfont/node_modules/xml2js": {
+            "version": "0.5.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "sax": ">=0.6.0",
+                "xmlbuilder": "~11.0.0"
+            },
+            "engines": {
+                "node": ">=4.0.0"
+            }
+        },
+        "node_modules/webidl-conversions": {
+            "version": "7.0.0",
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/webpack": {
+            "version": "5.95.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/estree": "^1.0.5",
+                "@webassemblyjs/ast": "^1.12.1",
+                "@webassemblyjs/wasm-edit": "^1.12.1",
+                "@webassemblyjs/wasm-parser": "^1.12.1",
+                "acorn": "^8.7.1",
+                "acorn-import-attributes": "^1.9.5",
+                "browserslist": "^4.21.10",
+                "chrome-trace-event": "^1.0.2",
+                "enhanced-resolve": "^5.17.1",
+                "es-module-lexer": "^1.2.1",
+                "eslint-scope": "5.1.1",
+                "events": "^3.2.0",
+                "glob-to-regexp": "^0.4.1",
+                "graceful-fs": "^4.2.11",
+                "json-parse-even-better-errors": "^2.3.1",
+                "loader-runner": "^4.2.0",
+                "mime-types": "^2.1.27",
+                "neo-async": "^2.6.2",
+                "schema-utils": "^3.2.0",
+                "tapable": "^2.1.1",
+                "terser-webpack-plugin": "^5.3.10",
+                "watchpack": "^2.4.1",
+                "webpack-sources": "^3.2.3"
+            },
+            "bin": {
+                "webpack": "bin/webpack.js"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependenciesMeta": {
+                "webpack-cli": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/webpack-cli": {
+            "version": "5.1.4",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@discoveryjs/json-ext": "^0.5.0",
+                "@webpack-cli/configtest": "^2.1.1",
+                "@webpack-cli/info": "^2.0.2",
+                "@webpack-cli/serve": "^2.0.5",
+                "colorette": "^2.0.14",
+                "commander": "^10.0.1",
+                "cross-spawn": "^7.0.3",
+                "envinfo": "^7.7.3",
+                "fastest-levenshtein": "^1.0.12",
+                "import-local": "^3.0.2",
+                "interpret": "^3.1.1",
+                "rechoir": "^0.8.0",
+                "webpack-merge": "^5.7.3"
+            },
+            "bin": {
+                "webpack-cli": "bin/cli.js"
+            },
+            "engines": {
+                "node": ">=14.15.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "5.x.x"
+            },
+            "peerDependenciesMeta": {
+                "@webpack-cli/generators": {
+                    "optional": true
+                },
+                "webpack-bundle-analyzer": {
+                    "optional": true
+                },
+                "webpack-dev-server": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/webpack-cli/node_modules/commander": {
+            "version": "10.0.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=14"
+            }
+        },
+        "node_modules/webpack-dev-middleware": {
+            "version": "5.3.4",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "colorette": "^2.0.10",
+                "memfs": "^3.4.3",
+                "mime-types": "^2.1.31",
+                "range-parser": "^1.2.1",
+                "schema-utils": "^4.0.0"
+            },
+            "engines": {
+                "node": ">= 12.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "^4.0.0 || ^5.0.0"
+            }
+        },
+        "node_modules/webpack-dev-middleware/node_modules/ajv": {
+            "version": "8.11.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2",
+                "uri-js": "^4.2.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/webpack-dev-middleware/node_modules/ajv-keywords": {
+            "version": "5.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3"
+            },
+            "peerDependencies": {
+                "ajv": "^8.8.2"
+            }
+        },
+        "node_modules/webpack-dev-middleware/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/webpack-dev-middleware/node_modules/schema-utils": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/json-schema": "^7.0.9",
+                "ajv": "^8.8.0",
+                "ajv-formats": "^2.1.1",
+                "ajv-keywords": "^5.0.0"
+            },
+            "engines": {
+                "node": ">= 12.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            }
+        },
+        "node_modules/webpack-dev-server": {
+            "version": "4.15.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/bonjour": "^3.5.9",
+                "@types/connect-history-api-fallback": "^1.3.5",
+                "@types/express": "^4.17.13",
+                "@types/serve-index": "^1.9.1",
+                "@types/serve-static": "^1.13.10",
+                "@types/sockjs": "^0.3.33",
+                "@types/ws": "^8.5.5",
+                "ansi-html-community": "^0.0.8",
+                "bonjour-service": "^1.0.11",
+                "chokidar": "^3.5.3",
+                "colorette": "^2.0.10",
+                "compression": "^1.7.4",
+                "connect-history-api-fallback": "^2.0.0",
+                "default-gateway": "^6.0.3",
+                "express": "^4.17.3",
+                "graceful-fs": "^4.2.6",
+                "html-entities": "^2.3.2",
+                "http-proxy-middleware": "^2.0.3",
+                "ipaddr.js": "^2.0.1",
+                "launch-editor": "^2.6.0",
+                "open": "^8.0.9",
+                "p-retry": "^4.5.0",
+                "rimraf": "^3.0.2",
+                "schema-utils": "^4.0.0",
+                "selfsigned": "^2.1.1",
+                "serve-index": "^1.9.1",
+                "sockjs": "^0.3.24",
+                "spdy": "^4.0.2",
+                "webpack-dev-middleware": "^5.3.4",
+                "ws": "^8.13.0"
+            },
+            "bin": {
+                "webpack-dev-server": "bin/webpack-dev-server.js"
+            },
+            "engines": {
+                "node": ">= 12.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "^4.37.0 || ^5.0.0"
+            },
+            "peerDependenciesMeta": {
+                "webpack": {
+                    "optional": true
+                },
+                "webpack-cli": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/webpack-dev-server/node_modules/ajv": {
+            "version": "8.8.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2",
+                "uri-js": "^4.2.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/webpack-dev-server/node_modules/ajv-keywords": {
+            "version": "5.1.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3"
+            },
+            "peerDependencies": {
+                "ajv": "^8.8.2"
+            }
+        },
+        "node_modules/webpack-dev-server/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/webpack-dev-server/node_modules/schema-utils": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/json-schema": "^7.0.9",
+                "ajv": "^8.8.0",
+                "ajv-formats": "^2.1.1",
+                "ajv-keywords": "^5.0.0"
+            },
+            "engines": {
+                "node": ">= 12.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            }
+        },
+        "node_modules/webpack-merge": {
+            "version": "5.10.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "clone-deep": "^4.0.1",
+                "flat": "^5.0.2",
+                "wildcard": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10.0.0"
+            }
+        },
+        "node_modules/webpack-sources": {
+            "version": "2.3.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "source-list-map": "^2.0.1",
+                "source-map": "^0.6.1"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/webpack/node_modules/events": {
+            "version": "3.3.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.8.x"
+            }
+        },
+        "node_modules/webpack/node_modules/webpack-sources": {
+            "version": "3.2.3",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/websocket-driver": {
+            "version": "0.7.4",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "http-parser-js": ">=0.5.1",
+                "safe-buffer": ">=5.1.0",
+                "websocket-extensions": ">=0.1.1"
+            },
+            "engines": {
+                "node": ">=0.8.0"
+            }
+        },
+        "node_modules/websocket-extensions": {
+            "version": "0.1.4",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=0.8.0"
+            }
+        },
+        "node_modules/whatwg-encoding": {
+            "version": "3.1.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "iconv-lite": "0.6.3"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/whatwg-encoding/node_modules/iconv-lite": {
+            "version": "0.6.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "safer-buffer": ">= 2.1.2 < 3.0.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/whatwg-mimetype": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/whatwg-url": {
+            "version": "14.0.0",
+            "license": "MIT",
+            "dependencies": {
+                "tr46": "^5.0.0",
+                "webidl-conversions": "^7.0.0"
+            },
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/which": {
+            "version": "2.0.2",
+            "license": "ISC",
+            "dependencies": {
+                "isexe": "^2.0.0"
+            },
+            "bin": {
+                "node-which": "bin/node-which"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/which-boxed-primitive": {
+            "version": "1.0.2",
+            "license": "MIT",
+            "dependencies": {
+                "is-bigint": "^1.0.1",
+                "is-boolean-object": "^1.1.0",
+                "is-number-object": "^1.0.4",
+                "is-string": "^1.0.5",
+                "is-symbol": "^1.0.3"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/which-pm-runs": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.1.0.tgz",
+            "integrity": "sha512-n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/which-typed-array": {
+            "version": "1.1.8",
+            "license": "MIT",
+            "dependencies": {
+                "available-typed-arrays": "^1.0.5",
+                "call-bind": "^1.0.2",
+                "es-abstract": "^1.20.0",
+                "for-each": "^0.3.3",
+                "has-tostringtag": "^1.0.0",
+                "is-typed-array": "^1.1.9"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/wide-align": {
+            "version": "1.1.5",
+            "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+            "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+            "license": "ISC",
+            "dependencies": {
+                "string-width": "^1.0.2 || 2 || 3 || 4"
+            }
+        },
+        "node_modules/wildcard": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/win-ca": {
+            "version": "3.5.1",
+            "hasInstallScript": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-electron": "^2.2.0",
+                "make-dir": "^1.3.0",
+                "node-forge": "^1.2.1",
+                "split": "^1.0.1"
+            }
+        },
+        "node_modules/win-ca/node_modules/make-dir": {
+            "version": "1.3.0",
+            "license": "MIT",
+            "dependencies": {
+                "pify": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/winston": {
+            "version": "3.11.0",
+            "license": "MIT",
+            "dependencies": {
+                "@colors/colors": "^1.6.0",
+                "@dabh/diagnostics": "^2.0.2",
+                "async": "^3.2.3",
+                "is-stream": "^2.0.0",
+                "logform": "^2.4.0",
+                "one-time": "^1.0.0",
+                "readable-stream": "^3.4.0",
+                "safe-stable-stringify": "^2.3.1",
+                "stack-trace": "0.0.x",
+                "triple-beam": "^1.3.0",
+                "winston-transport": "^4.5.0"
+            },
+            "engines": {
+                "node": ">= 12.0.0"
+            }
+        },
+        "node_modules/winston-transport": {
+            "version": "4.6.0",
+            "license": "MIT",
+            "dependencies": {
+                "logform": "^2.3.2",
+                "readable-stream": "^3.6.0",
+                "triple-beam": "^1.3.0"
+            },
+            "engines": {
+                "node": ">= 12.0.0"
+            }
+        },
+        "node_modules/winston/node_modules/@colors/colors": {
+            "version": "1.6.0",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.1.90"
+            }
+        },
+        "node_modules/workerpool": {
+            "version": "6.2.1",
+            "dev": true,
+            "license": "Apache-2.0"
+        },
+        "node_modules/wrap-ansi": {
+            "version": "7.0.0",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+            }
+        },
+        "node_modules/wrap-ansi-cjs": {
+            "name": "wrap-ansi",
+            "version": "7.0.0",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+            }
+        },
+        "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/wrap-ansi/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/wrap-ansi/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/wrappy": {
+            "version": "1.0.2",
+            "license": "ISC"
+        },
+        "node_modules/ws": {
+            "version": "8.17.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=10.0.0"
+            },
+            "peerDependencies": {
+                "bufferutil": "^4.0.1",
+                "utf-8-validate": ">=5.0.2"
+            },
+            "peerDependenciesMeta": {
+                "bufferutil": {
+                    "optional": true
+                },
+                "utf-8-validate": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/xml": {
+            "version": "1.0.1",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/xml-name-validator": {
+            "version": "5.0.0",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=18"
+            }
+        },
+        "node_modules/xml2js": {
+            "version": "0.6.2",
+            "license": "MIT",
+            "dependencies": {
+                "sax": ">=0.6.0",
+                "xmlbuilder": "~11.0.0"
+            },
+            "engines": {
+                "node": ">=4.0.0"
+            }
+        },
+        "node_modules/xmlbuilder": {
+            "version": "11.0.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=4.0"
+            }
+        },
+        "node_modules/xmlchars": {
+            "version": "2.2.0",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/xtend": {
+            "version": "4.0.2",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.4"
+            }
+        },
+        "node_modules/y18n": {
+            "version": "5.0.8",
+            "license": "ISC",
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/yallist": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/yaml": {
+            "version": "1.10.2",
+            "license": "ISC",
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/yaml-ast-parser-custom-tags": {
+            "version": "0.0.43",
+            "license": "Apache-2.0"
+        },
+        "node_modules/yaml-cfn": {
+            "version": "0.3.2",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "js-yaml": "^4.0.0"
+            },
+            "bin": {
+                "yaml-cfn": "cli.js"
+            }
+        },
+        "node_modules/yaml-language-server": {
+            "version": "0.15.0",
+            "license": "MIT",
+            "dependencies": {
+                "js-yaml": "^3.13.1",
+                "jsonc-parser": "^2.2.1",
+                "request-light": "^0.2.4",
+                "vscode-json-languageservice": "^3.10.0",
+                "vscode-languageserver": "^5.2.1",
+                "vscode-languageserver-textdocument": "^1.0.1",
+                "vscode-languageserver-types": "^3.15.1",
+                "vscode-nls": "^4.1.2",
+                "vscode-uri": "^2.1.1",
+                "yaml-language-server-parser": "0.1.2"
+            },
+            "bin": {
+                "yaml-language-server": "bin/yaml-language-server"
+            },
+            "engines": {
+                "node": "*"
+            },
+            "optionalDependencies": {
+                "prettier": "2.0.5"
+            }
+        },
+        "node_modules/yaml-language-server-parser": {
+            "version": "0.1.2",
+            "license": "Apache-2.0"
+        },
+        "node_modules/yaml-language-server/node_modules/argparse": {
+            "version": "1.0.10",
+            "license": "MIT",
+            "dependencies": {
+                "sprintf-js": "~1.0.2"
+            }
+        },
+        "node_modules/yaml-language-server/node_modules/js-yaml": {
+            "version": "3.14.1",
+            "license": "MIT",
+            "dependencies": {
+                "argparse": "^1.0.7",
+                "esprima": "^4.0.0"
+            },
+            "bin": {
+                "js-yaml": "bin/js-yaml.js"
+            }
+        },
+        "node_modules/yaml-language-server/node_modules/jsonc-parser": {
+            "version": "2.3.1",
+            "license": "MIT"
+        },
+        "node_modules/yaml-language-server/node_modules/prettier": {
+            "version": "2.0.5",
+            "license": "MIT",
+            "optional": true,
+            "bin": {
+                "prettier": "bin-prettier.js"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/yaml-language-server/node_modules/vscode-json-languageservice": {
+            "version": "3.11.0",
+            "license": "MIT",
+            "dependencies": {
+                "jsonc-parser": "^3.0.0",
+                "vscode-languageserver-textdocument": "^1.0.1",
+                "vscode-languageserver-types": "3.16.0-next.2",
+                "vscode-nls": "^5.0.0",
+                "vscode-uri": "^2.1.2"
+            }
+        },
+        "node_modules/yaml-language-server/node_modules/vscode-json-languageservice/node_modules/jsonc-parser": {
+            "version": "3.2.0",
+            "license": "MIT"
+        },
+        "node_modules/yaml-language-server/node_modules/vscode-json-languageservice/node_modules/vscode-languageserver-types": {
+            "version": "3.16.0-next.2",
+            "license": "MIT"
+        },
+        "node_modules/yaml-language-server/node_modules/vscode-json-languageservice/node_modules/vscode-nls": {
+            "version": "5.2.0",
+            "license": "MIT"
+        },
+        "node_modules/yaml-language-server/node_modules/vscode-jsonrpc": {
+            "version": "4.0.0",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8.0.0 || >=10.0.0"
+            }
+        },
+        "node_modules/yaml-language-server/node_modules/vscode-languageserver": {
+            "version": "5.2.1",
+            "license": "MIT",
+            "dependencies": {
+                "vscode-languageserver-protocol": "3.14.1",
+                "vscode-uri": "^1.0.6"
+            },
+            "bin": {
+                "installServerIntoExtension": "bin/installServerIntoExtension"
+            }
+        },
+        "node_modules/yaml-language-server/node_modules/vscode-languageserver-protocol": {
+            "version": "3.14.1",
+            "license": "MIT",
+            "dependencies": {
+                "vscode-jsonrpc": "^4.0.0",
+                "vscode-languageserver-types": "3.14.0"
+            }
+        },
+        "node_modules/yaml-language-server/node_modules/vscode-languageserver-protocol/node_modules/vscode-languageserver-types": {
+            "version": "3.14.0",
+            "license": "MIT"
+        },
+        "node_modules/yaml-language-server/node_modules/vscode-languageserver/node_modules/vscode-uri": {
+            "version": "1.0.8",
+            "license": "MIT"
+        },
+        "node_modules/yaml-language-server/node_modules/vscode-nls": {
+            "version": "4.1.2",
+            "license": "MIT"
+        },
+        "node_modules/yargs": {
+            "version": "17.7.2",
+            "license": "MIT",
+            "dependencies": {
+                "cliui": "^8.0.1",
+                "escalade": "^3.1.1",
+                "get-caller-file": "^2.0.5",
+                "require-directory": "^2.1.1",
+                "string-width": "^4.2.3",
+                "y18n": "^5.0.5",
+                "yargs-parser": "^21.1.1"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/yargs-parser": {
+            "version": "20.2.4",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/yargs-unparser": {
+            "version": "2.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "camelcase": "^6.0.0",
+                "decamelize": "^4.0.0",
+                "flat": "^5.0.2",
+                "is-plain-obj": "^2.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/yargs/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/yargs/node_modules/cliui": {
+            "version": "8.0.1",
+            "license": "ISC",
+            "dependencies": {
+                "string-width": "^4.2.0",
+                "strip-ansi": "^6.0.1",
+                "wrap-ansi": "^7.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/yargs/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/yargs/node_modules/yargs-parser": {
+            "version": "21.1.1",
+            "license": "ISC",
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/yauzl": {
+            "version": "2.10.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "buffer-crc32": "~0.2.3",
+                "fd-slicer": "~1.1.0"
+            }
+        },
+        "node_modules/yazl": {
+            "version": "2.5.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "buffer-crc32": "~0.2.3"
+            }
+        },
+        "node_modules/ylru": {
+            "version": "1.4.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 4.0.0"
+            }
+        },
+        "node_modules/yn": {
+            "version": "3.1.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/yocto-queue": {
+            "version": "0.1.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "packages/amazonq": {
+            "name": "amazon-q-vscode",
+            "version": "1.103.0-SNAPSHOT",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "aws-core-vscode": "file:../core/"
+            },
+            "engines": {
+                "npm": "^10.1.0",
+                "vscode": "^1.83.0"
+            }
+        },
+        "packages/core": {
+            "name": "aws-core-vscode",
+            "version": "1.0.0",
+            "hasInstallScript": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@amzn/amazon-q-developer-streaming-client": "file:../../src.gen/@amzn/amazon-q-developer-streaming-client",
+                "@amzn/codewhisperer-streaming": "file:../../src.gen/@amzn/codewhisperer-streaming",
+                "@amzn/sagemaker-client": "file:../../src.gen/@amzn/sagemaker-client/1.0.0.tgz",
+                "@aws-sdk/client-accessanalyzer": "^3.888.0",
+                "@aws-sdk/client-api-gateway": "<3.731.0",
+                "@aws-sdk/client-apprunner": "<3.731.0",
+                "@aws-sdk/client-cloudcontrol": "<3.731.0",
+                "@aws-sdk/client-cloudformation": "<3.731.0",
+                "@aws-sdk/client-cloudwatch-logs": "<3.731.0",
+                "@aws-sdk/client-codecatalyst": "<3.731.0",
+                "@aws-sdk/client-cognito-identity": "<3.731.0",
+                "@aws-sdk/client-datazone": "^3.848.0",
+                "@aws-sdk/client-docdb": "<3.731.0",
+                "@aws-sdk/client-docdb-elastic": "<3.731.0",
+                "@aws-sdk/client-ec2": "<3.731.0",
+                "@aws-sdk/client-ecr": "~3.693.0",
+                "@aws-sdk/client-ecs": "~3.693.0",
+                "@aws-sdk/client-glue": "^3.852.0",
+                "@aws-sdk/client-iam": "<3.731.0",
+                "@aws-sdk/client-iot": "~3.693.0",
+                "@aws-sdk/client-iotsecuretunneling": "~3.693.0",
+                "@aws-sdk/client-lambda": "<3.731.0",
+                "@aws-sdk/client-redshift": "~3.693.0",
+                "@aws-sdk/client-redshift-data": "~3.693.0",
+                "@aws-sdk/client-redshift-serverless": "~3.693.0",
+                "@aws-sdk/client-s3": "<3.731.0",
+                "@aws-sdk/client-s3-control": "^3.830.0",
+                "@aws-sdk/client-sagemaker": "<3.696.0",
+                "@aws-sdk/client-schemas": "~3.693.0",
+                "@aws-sdk/client-secrets-manager": "~3.693.0",
+                "@aws-sdk/client-sfn": "<3.731.0",
+                "@aws-sdk/client-ssm": "<3.731.0",
+                "@aws-sdk/client-sso": "<3.731.0",
+                "@aws-sdk/client-sso-oidc": "<3.731.0",
+                "@aws-sdk/credential-provider-env": "<3.731.0",
+                "@aws-sdk/credential-provider-process": "<3.731.0",
+                "@aws-sdk/credential-provider-sso": "<3.731.0",
+                "@aws-sdk/credential-providers": "<3.731.0",
+                "@aws-sdk/lib-storage": "<3.731.0",
+                "@aws-sdk/property-provider": "<3.731.0",
+                "@aws-sdk/protocol-http": "<3.731.0",
+                "@aws-sdk/s3-request-presigner": "<3.731.0",
+                "@aws-sdk/smithy-client": "<3.731.0",
+                "@aws-sdk/util-arn-parser": "<3.731.0",
+                "@aws/mynah-ui": "^4.35.4",
+                "@gerhobbelt/gitignore-parser": "^0.2.0-9",
+                "@iarna/toml": "^2.2.5",
+                "@smithy/fetch-http-handler": "^5.0.1",
+                "@smithy/middleware-retry": "^4.0.3",
+                "@smithy/node-http-handler": "^4.0.2",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/service-error-classification": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.0",
+                "@smithy/util-retry": "^4.0.1",
+                "@svgdotjs/svg.js": "^3.0.16",
+                "@vscode/debugprotocol": "^1.57.0",
+                "@zip.js/zip.js": "^2.7.41",
+                "adm-zip": "^0.5.10",
+                "amazon-states-language-service": "^1.16.1",
+                "async-lock": "^1.4.0",
+                "aws-sdk": "^2.1692.0",
+                "aws-ssm-document-language-service": "^1.0.0",
+                "bytes": "^3.1.2",
+                "cross-fetch": "^4.0.0",
+                "cross-spawn": "^7.0.5",
+                "diff": "^5.1.0",
+                "fast-json-patch": "^3.1.1",
+                "glob": "^10.3.10",
+                "got": "^11.8.5",
+                "highlight.js": "^11.9.0",
+                "http2": "^3.3.6",
+                "i18n-ts": "^1.0.5",
+                "immutable": "^4.3.0",
+                "jaro-winkler": "^0.2.8",
+                "jose": "5.4.1",
+                "js-yaml": "^4.1.0",
+                "jsonc-parser": "^3.2.0",
+                "lodash": "^4.17.21",
+                "lokijs": "^1.5.12",
+                "markdown-it": "^13.0.2",
+                "mime-types": "^2.1.32",
+                "node-fetch": "^2.7.0",
+                "portfinder": "^1.0.32",
+                "protobufjs": "^7.2.6",
+                "semver": "^7.5.4",
+                "stream-buffers": "^3.0.2",
+                "strip-ansi": "^5.2.0",
+                "svgdom": "^0.1.0",
+                "tcp-port-used": "^1.0.1",
+                "vscode-languageclient": "^9.0.1",
+                "vscode-languageserver": "^9.0.1",
+                "vscode-languageserver-protocol": "^3.15.3",
+                "vscode-languageserver-textdocument": "^1.0.8",
+                "vue": "^3.3.4",
+                "web-tree-sitter": "^0.20.8",
+                "whatwg-url": "^14.0.0",
+                "winston": "^3.11.0",
+                "winston-transport": "^4.6.0",
+                "ws": "^8.16.0",
+                "xml2js": "^0.6.1",
+                "yaml-cfn": "^0.3.2"
+            },
+            "devDependencies": {
+                "@aws-sdk/types": "^3.13.1",
+                "@aws/chat-client": "^0.1.4",
+                "@aws/chat-client-ui-types": "^0.1.47",
+                "@aws/language-server-runtimes": "^0.2.119",
+                "@aws/language-server-runtimes-types": "^0.1.47",
+                "@cspotcode/source-map-support": "^0.8.1",
+                "@sinonjs/fake-timers": "^10.0.2",
+                "@types/adm-zip": "^0.4.34",
+                "@types/async-lock": "^1.4.0",
+                "@types/bytes": "^3.1.0",
+                "@types/circular-dependency-plugin": "^5.0.8",
+                "@types/cross-spawn": "^6.0.6",
+                "@types/diff": "^5.0.7",
+                "@types/glob": "^8.1.0",
+                "@types/js-yaml": "^4.0.5",
+                "@types/jsdom": "^21.1.6",
+                "@types/lodash": "^4.14.180",
+                "@types/lokijs": "^1.5.14",
+                "@types/markdown-it": "^13.0.2",
+                "@types/mime-types": "^2.1.4",
+                "@types/mocha": "^10.0.6",
+                "@types/node": "^16.18.95",
+                "@types/node-fetch": "^2.6.8",
+                "@types/prismjs": "^1.26.0",
+                "@types/proper-lockfile": "^4.1.4",
+                "@types/readline-sync": "^1.4.8",
+                "@types/semver": "^7.5.0",
+                "@types/sinon": "^10.0.5",
+                "@types/sinonjs__fake-timers": "^8.1.2",
+                "@types/stream-buffers": "^3.0.7",
+                "@types/svgdom": "^0.1.2",
+                "@types/tcp-port-used": "^1.0.1",
+                "@types/uuid": "^9.0.1",
+                "@types/whatwg-url": "^11.0.4",
+                "@types/xml2js": "^0.4.11",
+                "@vue/compiler-sfc": "^3.3.2",
+                "aws-sdk-client-mock": "^4.1.0",
+                "c8": "^9.0.0",
+                "circular-dependency-plugin": "^5.2.2",
+                "css-loader": "^6.10.0",
+                "esbuild-loader": "2.20.0",
+                "file-loader": "^6.2.0",
+                "jsdom": "^23.0.1",
+                "json-schema-to-typescript": "^13.1.1",
+                "marked": "^13.0.1",
+                "mocha": "^10.1.0",
+                "mocha-junit-reporter": "^2.2.1",
+                "mocha-multi-reporters": "^1.5.1",
+                "readline-sync": "^1.4.9",
+                "sass": "^1.49.8",
+                "sass-loader": "^16.0.2",
+                "sinon": "^14.0.0",
+                "style-loader": "^3.3.1",
+                "ts-node": "^10.9.1",
+                "typescript": "^5.0.4",
+                "umd-compat-loader": "^2.1.2",
+                "vue-loader": "^17.2.2",
+                "vue-style-loader": "^4.1.3",
+                "webfont": "^11.2.26"
+            },
+            "engines": {
+                "npm": "^10.1.0",
+                "vscode": "^1.83.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-docdb": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/client-sts": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-sdk-rds": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "@smithy/util-waiter": "^3.1.8",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-docdb-elastic": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/client-sts": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "@types/uuid": "^9.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-docdb-elastic/node_modules/@smithy/fetch-http-handler": {
+            "version": "4.1.3",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/querystring-builder": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-base64": "^3.0.0",
+                "tslib": "^2.6.2"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-docdb-elastic/node_modules/@smithy/middleware-retry": {
+            "version": "3.0.34",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^3.1.12",
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/service-error-classification": "^3.0.11",
+                "@smithy/smithy-client": "^3.7.0",
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-middleware": "^3.0.11",
+                "@smithy/util-retry": "^3.0.11",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-docdb-elastic/node_modules/@smithy/node-http-handler": {
+            "version": "3.3.3",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/abort-controller": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/querystring-builder": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-docdb-elastic/node_modules/@smithy/protocol-http": {
+            "version": "4.1.8",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-docdb-elastic/node_modules/@smithy/service-error-classification": {
+            "version": "3.0.11",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-docdb-elastic/node_modules/@smithy/util-retry": {
+            "version": "3.0.11",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/service-error-classification": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-docdb/node_modules/@smithy/fetch-http-handler": {
+            "version": "4.1.3",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/querystring-builder": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-base64": "^3.0.0",
+                "tslib": "^2.6.2"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-docdb/node_modules/@smithy/middleware-retry": {
+            "version": "3.0.34",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^3.1.12",
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/service-error-classification": "^3.0.11",
+                "@smithy/smithy-client": "^3.7.0",
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-middleware": "^3.0.11",
+                "@smithy/util-retry": "^3.0.11",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-docdb/node_modules/@smithy/node-http-handler": {
+            "version": "3.3.3",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/abort-controller": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/querystring-builder": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-docdb/node_modules/@smithy/protocol-http": {
+            "version": "4.1.8",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-docdb/node_modules/@smithy/service-error-classification": {
+            "version": "3.0.11",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-docdb/node_modules/@smithy/util-retry": {
+            "version": "3.0.11",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/service-error-classification": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-ecs": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-ecs/-/client-ecs-3.693.0.tgz",
+            "integrity": "sha512-HbMtxh+gBtdHS4v0lZk7mb/E9PtjK9m2mDxiqyTXcZkdYPnq3MGACgUNUt8Siv+BgzQJTP8jikflCeMQ4ECHmw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/client-sts": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "@smithy/util-waiter": "^3.1.8",
+                "@types/uuid": "^9.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-ecs/node_modules/@smithy/fetch-http-handler": {
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-4.1.3.tgz",
+            "integrity": "sha512-6SxNltSncI8s689nvnzZQc/dPXcpHQ34KUj6gR/HBroytKOd/isMG3gJF/zBE1TBmTT18TXyzhg3O3SOOqGEhA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/querystring-builder": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-base64": "^3.0.0",
+                "tslib": "^2.6.2"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-ecs/node_modules/@smithy/middleware-retry": {
+            "version": "3.0.34",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.34.tgz",
+            "integrity": "sha512-yVRr/AAtPZlUvwEkrq7S3x7Z8/xCd97m2hLDaqdz6ucP2RKHsBjEqaUA2ebNv2SsZoPEi+ZD0dZbOB1u37tGCA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^3.1.12",
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/service-error-classification": "^3.0.11",
+                "@smithy/smithy-client": "^3.7.0",
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-middleware": "^3.0.11",
+                "@smithy/util-retry": "^3.0.11",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-ecs/node_modules/@smithy/node-http-handler": {
+            "version": "3.3.3",
+            "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.3.3.tgz",
+            "integrity": "sha512-BrpZOaZ4RCbcJ2igiSNG16S+kgAc65l/2hmxWdmhyoGWHTLlzQzr06PXavJp9OBlPEG/sHlqdxjWmjzV66+BSQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/abort-controller": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/querystring-builder": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-ecs/node_modules/@smithy/protocol-http": {
+            "version": "4.1.8",
+            "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.8.tgz",
+            "integrity": "sha512-hmgIAVyxw1LySOwkgMIUN0kjN8TG9Nc85LJeEmEE/cNEe2rkHDUWhnJf2gxcSRFLWsyqWsrZGw40ROjUogg+Iw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-ecs/node_modules/@smithy/service-error-classification": {
+            "version": "3.0.11",
+            "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.11.tgz",
+            "integrity": "sha512-QnYDPkyewrJzCyaeI2Rmp7pDwbUETe+hU8ADkXmgNusO1bgHBH7ovXJiYmba8t0fNfJx75fE8dlM6SEmZxheog==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-ecs/node_modules/@smithy/util-retry": {
+            "version": "3.0.11",
+            "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.11.tgz",
+            "integrity": "sha512-hJUC6W7A3DQgaee3Hp9ZFcOxVDZzmBIRBPlUAk8/fSOEl7pE/aX7Dci0JycNOnm9Mfr0KV2XjIlUOcGWXQUdVQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/service-error-classification": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-schemas": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-schemas/-/client-schemas-3.693.0.tgz",
+            "integrity": "sha512-a6B9z2hBlO67c8k6WMJNhFP26VCYEaL7aAo3oe/IbT1sncD6cSoROF5L0o9ebsosA+81Xkkvjj2zeF/+ohdAng==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/client-sts": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-stream": "^3.3.0",
+                "@smithy/util-utf8": "^3.0.0",
+                "@smithy/util-waiter": "^3.1.8",
+                "@types/uuid": "^9.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-schemas/node_modules/@smithy/fetch-http-handler": {
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-4.1.3.tgz",
+            "integrity": "sha512-6SxNltSncI8s689nvnzZQc/dPXcpHQ34KUj6gR/HBroytKOd/isMG3gJF/zBE1TBmTT18TXyzhg3O3SOOqGEhA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/querystring-builder": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-base64": "^3.0.0",
+                "tslib": "^2.6.2"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-schemas/node_modules/@smithy/middleware-retry": {
+            "version": "3.0.34",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.34.tgz",
+            "integrity": "sha512-yVRr/AAtPZlUvwEkrq7S3x7Z8/xCd97m2hLDaqdz6ucP2RKHsBjEqaUA2ebNv2SsZoPEi+ZD0dZbOB1u37tGCA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^3.1.12",
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/service-error-classification": "^3.0.11",
+                "@smithy/smithy-client": "^3.7.0",
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-middleware": "^3.0.11",
+                "@smithy/util-retry": "^3.0.11",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-schemas/node_modules/@smithy/node-http-handler": {
+            "version": "3.3.3",
+            "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.3.3.tgz",
+            "integrity": "sha512-BrpZOaZ4RCbcJ2igiSNG16S+kgAc65l/2hmxWdmhyoGWHTLlzQzr06PXavJp9OBlPEG/sHlqdxjWmjzV66+BSQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/abort-controller": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/querystring-builder": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-schemas/node_modules/@smithy/protocol-http": {
+            "version": "4.1.8",
+            "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.8.tgz",
+            "integrity": "sha512-hmgIAVyxw1LySOwkgMIUN0kjN8TG9Nc85LJeEmEE/cNEe2rkHDUWhnJf2gxcSRFLWsyqWsrZGw40ROjUogg+Iw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-schemas/node_modules/@smithy/service-error-classification": {
+            "version": "3.0.11",
+            "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.11.tgz",
+            "integrity": "sha512-QnYDPkyewrJzCyaeI2Rmp7pDwbUETe+hU8ADkXmgNusO1bgHBH7ovXJiYmba8t0fNfJx75fE8dlM6SEmZxheog==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-schemas/node_modules/@smithy/util-retry": {
+            "version": "3.0.11",
+            "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.11.tgz",
+            "integrity": "sha512-hJUC6W7A3DQgaee3Hp9ZFcOxVDZzmBIRBPlUAk8/fSOEl7pE/aX7Dci0JycNOnm9Mfr0KV2XjIlUOcGWXQUdVQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/service-error-classification": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-secrets-manager": {
+            "version": "3.693.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-secrets-manager/-/client-secrets-manager-3.693.0.tgz",
+            "integrity": "sha512-PiXkl64LYhwZQ2zPQhxwpnLwGS7Lw8asFCj29SxEaYRnYra3ajE5d+Yvv68qC+diUNkeZh6k6zn7nEOZ4rWEwA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/client-sts": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "@types/uuid": "^9.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-secrets-manager/node_modules/@smithy/fetch-http-handler": {
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-4.1.3.tgz",
+            "integrity": "sha512-6SxNltSncI8s689nvnzZQc/dPXcpHQ34KUj6gR/HBroytKOd/isMG3gJF/zBE1TBmTT18TXyzhg3O3SOOqGEhA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/querystring-builder": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-base64": "^3.0.0",
+                "tslib": "^2.6.2"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-secrets-manager/node_modules/@smithy/middleware-retry": {
+            "version": "3.0.34",
+            "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.34.tgz",
+            "integrity": "sha512-yVRr/AAtPZlUvwEkrq7S3x7Z8/xCd97m2hLDaqdz6ucP2RKHsBjEqaUA2ebNv2SsZoPEi+ZD0dZbOB1u37tGCA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^3.1.12",
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/service-error-classification": "^3.0.11",
+                "@smithy/smithy-client": "^3.7.0",
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-middleware": "^3.0.11",
+                "@smithy/util-retry": "^3.0.11",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-secrets-manager/node_modules/@smithy/node-http-handler": {
+            "version": "3.3.3",
+            "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.3.3.tgz",
+            "integrity": "sha512-BrpZOaZ4RCbcJ2igiSNG16S+kgAc65l/2hmxWdmhyoGWHTLlzQzr06PXavJp9OBlPEG/sHlqdxjWmjzV66+BSQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/abort-controller": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/querystring-builder": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-secrets-manager/node_modules/@smithy/protocol-http": {
+            "version": "4.1.8",
+            "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.8.tgz",
+            "integrity": "sha512-hmgIAVyxw1LySOwkgMIUN0kjN8TG9Nc85LJeEmEE/cNEe2rkHDUWhnJf2gxcSRFLWsyqWsrZGw40ROjUogg+Iw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-secrets-manager/node_modules/@smithy/service-error-classification": {
+            "version": "3.0.11",
+            "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.11.tgz",
+            "integrity": "sha512-QnYDPkyewrJzCyaeI2Rmp7pDwbUETe+hU8ADkXmgNusO1bgHBH7ovXJiYmba8t0fNfJx75fE8dlM6SEmZxheog==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-secrets-manager/node_modules/@smithy/util-retry": {
+            "version": "3.0.11",
+            "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.11.tgz",
+            "integrity": "sha512-hJUC6W7A3DQgaee3Hp9ZFcOxVDZzmBIRBPlUAk8/fSOEl7pE/aX7Dci0JycNOnm9Mfr0KV2XjIlUOcGWXQUdVQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/service-error-classification": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-sso": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-sso-oidc": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/fetch-http-handler": {
+            "version": "4.1.3",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/querystring-builder": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-base64": "^3.0.0",
+                "tslib": "^2.6.2"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/middleware-retry": {
+            "version": "3.0.34",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^3.1.12",
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/service-error-classification": "^3.0.11",
+                "@smithy/smithy-client": "^3.7.0",
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-middleware": "^3.0.11",
+                "@smithy/util-retry": "^3.0.11",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/node-http-handler": {
+            "version": "3.3.3",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/abort-controller": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/querystring-builder": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/protocol-http": {
+            "version": "4.1.8",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/service-error-classification": {
+            "version": "3.0.11",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-sso-oidc/node_modules/@smithy/util-retry": {
+            "version": "3.0.11",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/service-error-classification": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-sso/node_modules/@smithy/fetch-http-handler": {
+            "version": "4.1.3",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/querystring-builder": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-base64": "^3.0.0",
+                "tslib": "^2.6.2"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-sso/node_modules/@smithy/middleware-retry": {
+            "version": "3.0.34",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^3.1.12",
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/service-error-classification": "^3.0.11",
+                "@smithy/smithy-client": "^3.7.0",
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-middleware": "^3.0.11",
+                "@smithy/util-retry": "^3.0.11",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-sso/node_modules/@smithy/node-http-handler": {
+            "version": "3.3.3",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/abort-controller": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/querystring-builder": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-sso/node_modules/@smithy/protocol-http": {
+            "version": "4.1.8",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-sso/node_modules/@smithy/service-error-classification": {
+            "version": "3.0.11",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-sso/node_modules/@smithy/util-retry": {
+            "version": "3.0.11",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/service-error-classification": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-sts": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/client-sso-oidc": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-node": "3.693.0",
+                "@aws-sdk/middleware-host-header": "3.693.0",
+                "@aws-sdk/middleware-logger": "3.693.0",
+                "@aws-sdk/middleware-recursion-detection": "3.693.0",
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/region-config-resolver": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@aws-sdk/util-user-agent-browser": "3.693.0",
+                "@aws-sdk/util-user-agent-node": "3.693.0",
+                "@smithy/config-resolver": "^3.0.11",
+                "@smithy/core": "^2.5.2",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/hash-node": "^3.0.9",
+                "@smithy/invalid-dependency": "^3.0.9",
+                "@smithy/middleware-content-length": "^3.0.11",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/middleware-retry": "^3.0.26",
+                "@smithy/middleware-serde": "^3.0.9",
+                "@smithy/middleware-stack": "^3.0.9",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/url-parser": "^3.0.9",
+                "@smithy/util-base64": "^3.0.0",
+                "@smithy/util-body-length-browser": "^3.0.0",
+                "@smithy/util-body-length-node": "^3.0.0",
+                "@smithy/util-defaults-mode-browser": "^3.0.26",
+                "@smithy/util-defaults-mode-node": "^3.0.26",
+                "@smithy/util-endpoints": "^2.1.5",
+                "@smithy/util-middleware": "^3.0.9",
+                "@smithy/util-retry": "^3.0.9",
+                "@smithy/util-utf8": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-sts/node_modules/@smithy/fetch-http-handler": {
+            "version": "4.1.3",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/querystring-builder": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-base64": "^3.0.0",
+                "tslib": "^2.6.2"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-sts/node_modules/@smithy/middleware-retry": {
+            "version": "3.0.34",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^3.1.12",
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/service-error-classification": "^3.0.11",
+                "@smithy/smithy-client": "^3.7.0",
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-middleware": "^3.0.11",
+                "@smithy/util-retry": "^3.0.11",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-sts/node_modules/@smithy/node-http-handler": {
+            "version": "3.3.3",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/abort-controller": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/querystring-builder": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-sts/node_modules/@smithy/protocol-http": {
+            "version": "4.1.8",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-sts/node_modules/@smithy/service-error-classification": {
+            "version": "3.0.11",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/client-sts/node_modules/@smithy/util-retry": {
+            "version": "3.0.11",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/service-error-classification": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/core": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/signature-v4": "^4.2.2",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/core/node_modules/@smithy/protocol-http": {
+            "version": "4.1.8",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/fetch-http-handler": "^4.1.0",
+                "@smithy/node-http-handler": "^3.3.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/smithy-client": "^3.4.3",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-stream": "^3.3.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/fetch-http-handler": {
+            "version": "4.1.3",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/querystring-builder": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "@smithy/util-base64": "^3.0.0",
+                "tslib": "^2.6.2"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/node-http-handler": {
+            "version": "3.3.3",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/abort-controller": "^3.1.9",
+                "@smithy/protocol-http": "^4.1.8",
+                "@smithy/querystring-builder": "^3.0.11",
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/credential-provider-http/node_modules/@smithy/protocol-http": {
+            "version": "4.1.8",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/credential-provider-ini/node_modules/@smithy/shared-ini-file-loader": {
+            "version": "3.1.12",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/credential-provider-env": "3.693.0",
+                "@aws-sdk/credential-provider-http": "3.693.0",
+                "@aws-sdk/credential-provider-ini": "3.693.0",
+                "@aws-sdk/credential-provider-process": "3.693.0",
+                "@aws-sdk/credential-provider-sso": "3.693.0",
+                "@aws-sdk/credential-provider-web-identity": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/credential-provider-imds": "^3.2.6",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/credential-provider-node/node_modules/@smithy/shared-ini-file-loader": {
+            "version": "3.1.12",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/client-sso": "3.693.0",
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/token-providers": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/credential-provider-sso/node_modules/@smithy/shared-ini-file-loader": {
+            "version": "3.1.12",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sts": "^3.693.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/middleware-host-header/node_modules/@smithy/protocol-http": {
+            "version": "4.1.8",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/middleware-recursion-detection/node_modules/@smithy/protocol-http": {
+            "version": "4.1.8",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/middleware-sdk-rds": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-format-url": "3.693.0",
+                "@smithy/middleware-endpoint": "^3.2.2",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/signature-v4": "^4.2.2",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/middleware-sdk-rds/node_modules/@smithy/protocol-http": {
+            "version": "4.1.8",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@aws-sdk/util-endpoints": "3.693.0",
+                "@smithy/core": "^2.5.2",
+                "@smithy/protocol-http": "^4.1.6",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/middleware-user-agent/node_modules/@smithy/protocol-http": {
+            "version": "4.1.8",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-config-provider": "^3.0.0",
+                "@smithy/util-middleware": "^3.0.9",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/token-providers": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/property-provider": "^3.1.9",
+                "@smithy/shared-ini-file-loader": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "@aws-sdk/client-sso-oidc": "^3.693.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/token-providers/node_modules/@smithy/shared-ini-file-loader": {
+            "version": "3.1.12",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^3.7.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "@smithy/util-endpoints": "^2.1.5",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/types": "^3.7.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
+            }
+        },
+        "packages/core/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.693.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/middleware-user-agent": "3.693.0",
+                "@aws-sdk/types": "3.692.0",
+                "@smithy/node-config-provider": "^3.1.10",
+                "@smithy/types": "^3.7.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
+            }
+        },
+        "packages/core/node_modules/@smithy/fetch-http-handler": {
+            "version": "5.0.2",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/protocol-http": "^5.1.0",
+                "@smithy/querystring-builder": "^4.0.2",
+                "@smithy/types": "^4.2.0",
+                "@smithy/util-base64": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/fetch-http-handler/node_modules/@smithy/is-array-buffer": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/fetch-http-handler/node_modules/@smithy/querystring-builder": {
+            "version": "4.0.2",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.2.0",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/fetch-http-handler/node_modules/@smithy/types": {
+            "version": "4.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/fetch-http-handler/node_modules/@smithy/util-base64": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/fetch-http-handler/node_modules/@smithy/util-buffer-from": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/fetch-http-handler/node_modules/@smithy/util-utf8": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/is-array-buffer": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/middleware-retry": {
+            "version": "4.1.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.0.2",
+                "@smithy/protocol-http": "^5.1.0",
+                "@smithy/service-error-classification": "^4.0.2",
+                "@smithy/smithy-client": "^4.2.0",
+                "@smithy/types": "^4.2.0",
+                "@smithy/util-middleware": "^4.0.2",
+                "@smithy/util-retry": "^4.0.2",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/middleware-retry/node_modules/@smithy/core": {
+            "version": "3.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/middleware-serde": "^4.0.3",
+                "@smithy/protocol-http": "^5.1.0",
+                "@smithy/types": "^4.2.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.2",
+                "@smithy/util-stream": "^4.2.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/middleware-retry/node_modules/@smithy/is-array-buffer": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/middleware-retry/node_modules/@smithy/middleware-endpoint": {
+            "version": "4.1.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/core": "^3.2.0",
+                "@smithy/middleware-serde": "^4.0.3",
+                "@smithy/node-config-provider": "^4.0.2",
+                "@smithy/shared-ini-file-loader": "^4.0.2",
+                "@smithy/types": "^4.2.0",
+                "@smithy/url-parser": "^4.0.2",
+                "@smithy/util-middleware": "^4.0.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/middleware-retry/node_modules/@smithy/middleware-serde": {
+            "version": "4.0.3",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/middleware-retry/node_modules/@smithy/middleware-stack": {
+            "version": "4.0.2",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/middleware-retry/node_modules/@smithy/node-config-provider": {
+            "version": "4.0.2",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/property-provider": "^4.0.2",
+                "@smithy/shared-ini-file-loader": "^4.0.2",
+                "@smithy/types": "^4.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/middleware-retry/node_modules/@smithy/property-provider": {
+            "version": "4.0.2",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/middleware-retry/node_modules/@smithy/smithy-client": {
+            "version": "4.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/core": "^3.2.0",
+                "@smithy/middleware-endpoint": "^4.1.0",
+                "@smithy/middleware-stack": "^4.0.2",
+                "@smithy/protocol-http": "^5.1.0",
+                "@smithy/types": "^4.2.0",
+                "@smithy/util-stream": "^4.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/middleware-retry/node_modules/@smithy/types": {
+            "version": "4.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/middleware-retry/node_modules/@smithy/url-parser": {
+            "version": "4.0.2",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/querystring-parser": "^4.0.2",
+                "@smithy/types": "^4.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/middleware-retry/node_modules/@smithy/util-base64": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/middleware-retry/node_modules/@smithy/util-body-length-browser": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/middleware-retry/node_modules/@smithy/util-buffer-from": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/middleware-retry/node_modules/@smithy/util-middleware": {
+            "version": "4.0.2",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/middleware-retry/node_modules/@smithy/util-stream": {
+            "version": "4.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/fetch-http-handler": "^5.0.2",
+                "@smithy/node-http-handler": "^4.0.4",
+                "@smithy/types": "^4.2.0",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/middleware-retry/node_modules/@smithy/util-utf8": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/node-http-handler": {
+            "version": "4.0.4",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/abort-controller": "^4.0.2",
+                "@smithy/protocol-http": "^5.1.0",
+                "@smithy/querystring-builder": "^4.0.2",
+                "@smithy/types": "^4.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/node-http-handler/node_modules/@smithy/abort-controller": {
+            "version": "4.0.2",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/node-http-handler/node_modules/@smithy/querystring-builder": {
+            "version": "4.0.2",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.2.0",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/node-http-handler/node_modules/@smithy/types": {
+            "version": "4.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/protocol-http": {
+            "version": "5.1.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/protocol-http/node_modules/@smithy/types": {
+            "version": "4.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/querystring-parser": {
+            "version": "4.0.2",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/querystring-parser/node_modules/@smithy/types": {
+            "version": "4.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/service-error-classification": {
+            "version": "4.0.2",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.2.0"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/service-error-classification/node_modules/@smithy/types": {
+            "version": "4.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/shared-ini-file-loader": {
+            "version": "4.0.2",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/shared-ini-file-loader/node_modules/@smithy/types": {
+            "version": "4.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/util-buffer-from": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/util-hex-encoding": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/util-retry": {
+            "version": "4.0.2",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/service-error-classification": "^4.0.2",
+                "@smithy/types": "^4.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/util-retry/node_modules/@smithy/types": {
+            "version": "4.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/util-uri-escape": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "packages/core/node_modules/@smithy/util-utf8": {
+            "version": "3.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "packages/core/node_modules/@types/node": {
+            "version": "16.18.95",
+            "dev": true,
+            "license": "MIT"
+        },
+        "packages/core/src/web": {
+            "name": "web-toolkit",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "crypto-browserify": "^3.12.0",
+                "os-browserify": "^0.3.0",
+                "path-browserify": "^1.0.1",
+                "process": "^0.11.10",
+                "stream-browserify": "^3.0.0"
+            },
+            "devDependencies": {
+                "assert": "^2.1.0"
+            }
+        },
+        "packages/toolkit": {
+            "name": "aws-toolkit-vscode",
+            "version": "3.83.0-SNAPSHOT",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "aws-core-vscode": "file:../core/"
+            },
+            "devDependencies": {},
+            "engines": {
+                "npm": "^10.1.0",
+                "vscode": "^1.83.0"
+            }
+        },
+        "plugins/eslint-plugin-aws-toolkits": {
+            "version": "1.0.0",
+            "license": "Apache-2.0",
+            "devDependencies": {
+                "@types/eslint": "^8.56.0",
+                "mocha": "^10.1.0"
+            },
+            "engines": {
+                "npm": "^10.1.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client": {
+            "version": "1.0.0",
+            "hasInstallScript": true,
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.731.0",
+                "@aws-sdk/credential-provider-node": "3.731.1",
+                "@aws-sdk/middleware-host-header": "3.731.0",
+                "@aws-sdk/middleware-logger": "3.731.0",
+                "@aws-sdk/middleware-recursion-detection": "3.731.0",
+                "@aws-sdk/middleware-user-agent": "3.731.0",
+                "@aws-sdk/region-config-resolver": "3.731.0",
+                "@aws-sdk/types": "3.731.0",
+                "@aws-sdk/util-user-agent-browser": "3.731.0",
+                "@aws-sdk/util-user-agent-node": "3.731.0",
+                "@smithy/config-resolver": "^4.0.1",
+                "@smithy/core": "^3.1.1",
+                "@smithy/eventstream-serde-browser": "^4.0.1",
+                "@smithy/eventstream-serde-config-resolver": "^4.0.1",
+                "@smithy/eventstream-serde-node": "^4.0.1",
+                "@smithy/fetch-http-handler": "^5.0.1",
+                "@smithy/hash-node": "^4.0.1",
+                "@smithy/invalid-dependency": "^4.0.1",
+                "@smithy/middleware-content-length": "^4.0.1",
+                "@smithy/middleware-retry": "^4.0.3",
+                "@smithy/middleware-serde": "^4.0.1",
+                "@smithy/middleware-stack": "^4.0.1",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/node-http-handler": "^4.0.2",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/smithy-client": "^4.1.2",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.3",
+                "@smithy/util-defaults-mode-node": "^4.0.3",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-retry": "^4.0.1",
+                "@smithy/util-utf8": "^4.0.0",
+                "@types/uuid": "^9.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "devDependencies": {
+                "@tsconfig/node18": "18.2.4",
+                "@types/node": "^18.19.69",
+                "concurrently": "7.0.0",
+                "downlevel-dts": "0.10.1",
+                "rimraf": "^3.0.0",
+                "typescript": "~5.2.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-crypto/crc32": {
+            "version": "5.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/util": "^5.2.0",
+                "@aws-sdk/types": "^3.222.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-crypto/sha256-browser": {
+            "version": "5.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-js": "^5.2.0",
+                "@aws-crypto/supports-web-crypto": "^5.2.0",
+                "@aws-crypto/util": "^5.2.0",
+                "@aws-sdk/types": "^3.222.0",
+                "@aws-sdk/util-locate-window": "^3.0.0",
+                "@smithy/util-utf8": "^2.0.0",
+                "tslib": "^2.6.2"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/is-array-buffer": {
+            "version": "2.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-buffer-from": {
+            "version": "2.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^2.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-utf8": {
+            "version": "2.3.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^2.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-crypto/sha256-js": {
+            "version": "5.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/util": "^5.2.0",
+                "@aws-sdk/types": "^3.222.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-crypto/supports-web-crypto": {
+            "version": "5.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-crypto/util": {
+            "version": "5.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "^3.222.0",
+                "@smithy/util-utf8": "^2.0.0",
+                "tslib": "^2.6.2"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-crypto/util/node_modules/@smithy/is-array-buffer": {
+            "version": "2.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-crypto/util/node_modules/@smithy/util-buffer-from": {
+            "version": "2.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^2.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": {
+            "version": "2.3.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^2.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-sdk/client-sso": {
+            "version": "3.731.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.731.0",
+                "@aws-sdk/middleware-host-header": "3.731.0",
+                "@aws-sdk/middleware-logger": "3.731.0",
+                "@aws-sdk/middleware-recursion-detection": "3.731.0",
+                "@aws-sdk/middleware-user-agent": "3.731.0",
+                "@aws-sdk/region-config-resolver": "3.731.0",
+                "@aws-sdk/types": "3.731.0",
+                "@aws-sdk/util-endpoints": "3.731.0",
+                "@aws-sdk/util-user-agent-browser": "3.731.0",
+                "@aws-sdk/util-user-agent-node": "3.731.0",
+                "@smithy/config-resolver": "^4.0.0",
+                "@smithy/core": "^3.0.0",
+                "@smithy/fetch-http-handler": "^5.0.0",
+                "@smithy/hash-node": "^4.0.0",
+                "@smithy/invalid-dependency": "^4.0.0",
+                "@smithy/middleware-content-length": "^4.0.0",
+                "@smithy/middleware-endpoint": "^4.0.0",
+                "@smithy/middleware-retry": "^4.0.0",
+                "@smithy/middleware-serde": "^4.0.0",
+                "@smithy/middleware-stack": "^4.0.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/node-http-handler": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/smithy-client": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/url-parser": "^4.0.0",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.0",
+                "@smithy/util-defaults-mode-node": "^4.0.0",
+                "@smithy/util-endpoints": "^3.0.0",
+                "@smithy/util-middleware": "^4.0.0",
+                "@smithy/util-retry": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-sdk/core": {
+            "version": "3.731.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/core": "^3.0.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/signature-v4": "^5.0.0",
+                "@smithy/smithy-client": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.0",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-sdk/credential-provider-env": {
+            "version": "3.731.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.731.0",
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.731.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.731.0",
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/fetch-http-handler": "^5.0.0",
+                "@smithy/node-http-handler": "^4.0.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/smithy-client": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/util-stream": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.731.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.731.0",
+                "@aws-sdk/credential-provider-env": "3.731.0",
+                "@aws-sdk/credential-provider-http": "3.731.0",
+                "@aws-sdk/credential-provider-process": "3.731.0",
+                "@aws-sdk/credential-provider-sso": "3.731.1",
+                "@aws-sdk/credential-provider-web-identity": "3.731.1",
+                "@aws-sdk/nested-clients": "3.731.1",
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/credential-provider-imds": "^4.0.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/shared-ini-file-loader": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.731.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/credential-provider-env": "3.731.0",
+                "@aws-sdk/credential-provider-http": "3.731.0",
+                "@aws-sdk/credential-provider-ini": "3.731.1",
+                "@aws-sdk/credential-provider-process": "3.731.0",
+                "@aws-sdk/credential-provider-sso": "3.731.1",
+                "@aws-sdk/credential-provider-web-identity": "3.731.1",
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/credential-provider-imds": "^4.0.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/shared-ini-file-loader": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-sdk/credential-provider-process": {
+            "version": "3.731.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.731.0",
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/shared-ini-file-loader": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.731.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/client-sso": "3.731.0",
+                "@aws-sdk/core": "3.731.0",
+                "@aws-sdk/token-providers": "3.731.1",
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/shared-ini-file-loader": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.731.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.731.0",
+                "@aws-sdk/nested-clients": "3.731.1",
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.731.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.731.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.731.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.731.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.731.0",
+                "@aws-sdk/types": "3.731.0",
+                "@aws-sdk/util-endpoints": "3.731.0",
+                "@smithy/core": "^3.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-sdk/nested-clients": {
+            "version": "3.731.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.731.0",
+                "@aws-sdk/middleware-host-header": "3.731.0",
+                "@aws-sdk/middleware-logger": "3.731.0",
+                "@aws-sdk/middleware-recursion-detection": "3.731.0",
+                "@aws-sdk/middleware-user-agent": "3.731.0",
+                "@aws-sdk/region-config-resolver": "3.731.0",
+                "@aws-sdk/types": "3.731.0",
+                "@aws-sdk/util-endpoints": "3.731.0",
+                "@aws-sdk/util-user-agent-browser": "3.731.0",
+                "@aws-sdk/util-user-agent-node": "3.731.0",
+                "@smithy/config-resolver": "^4.0.0",
+                "@smithy/core": "^3.0.0",
+                "@smithy/fetch-http-handler": "^5.0.0",
+                "@smithy/hash-node": "^4.0.0",
+                "@smithy/invalid-dependency": "^4.0.0",
+                "@smithy/middleware-content-length": "^4.0.0",
+                "@smithy/middleware-endpoint": "^4.0.0",
+                "@smithy/middleware-retry": "^4.0.0",
+                "@smithy/middleware-serde": "^4.0.0",
+                "@smithy/middleware-stack": "^4.0.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/node-http-handler": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/smithy-client": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/url-parser": "^4.0.0",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.0",
+                "@smithy/util-defaults-mode-node": "^4.0.0",
+                "@smithy/util-endpoints": "^3.0.0",
+                "@smithy/util-middleware": "^4.0.0",
+                "@smithy/util-retry": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.731.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-sdk/token-providers": {
+            "version": "3.731.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/nested-clients": "3.731.1",
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/shared-ini-file-loader": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-sdk/types": {
+            "version": "3.731.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.731.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/util-endpoints": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-sdk/util-locate-window": {
+            "version": "3.723.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.731.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/types": "^4.0.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.731.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/middleware-user-agent": "3.731.0",
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            },
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@babel/runtime": {
+            "version": "7.26.9",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "regenerator-runtime": "^0.14.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/abort-controller": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/config-resolver": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/core": {
+            "version": "3.1.5",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-stream": "^4.1.2",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/credential-provider-imds": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/eventstream-codec": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/crc32": "5.2.0",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/eventstream-serde-browser": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/eventstream-serde-universal": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/eventstream-serde-config-resolver": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/eventstream-serde-node": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/eventstream-serde-universal": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/eventstream-serde-universal": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/eventstream-codec": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/fetch-http-handler": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/querystring-builder": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-base64": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/hash-node": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/invalid-dependency": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/is-array-buffer": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/middleware-content-length": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/middleware-endpoint": {
+            "version": "4.0.6",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/core": "^3.1.5",
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "@smithy/util-middleware": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/middleware-retry": {
+            "version": "4.0.7",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/service-error-classification": "^4.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-retry": "^4.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/middleware-serde": {
+            "version": "4.0.2",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/middleware-stack": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/node-config-provider": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "obuf": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-            "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-            "dev": true
-        },
-        "on-finished": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-            "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-            "dev": true,
-            "requires": {
-                "ee-first": "1.1.1"
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/node-http-handler": {
+            "version": "4.0.3",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/abort-controller": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/querystring-builder": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "on-headers": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-            "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-            "dev": true
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/property-provider": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "once": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-            "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-            "requires": {
-                "wrappy": "1"
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/protocol-http": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "one-time": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz",
-            "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==",
-            "requires": {
-                "fn.name": "1.x.x"
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/querystring-builder": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "onetime": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-            "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-            "dev": true,
-            "requires": {
-                "mimic-fn": "^2.1.0"
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/querystring-parser": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "open": {
-            "version": "8.4.0",
-            "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
-            "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
-            "dev": true,
-            "requires": {
-                "define-lazy-prop": "^2.0.0",
-                "is-docker": "^2.1.1",
-                "is-wsl": "^2.2.0"
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/service-error-classification": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "optionator": {
-            "version": "0.9.1",
-            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-            "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-            "dev": true,
-            "requires": {
-                "deep-is": "^0.1.3",
-                "fast-levenshtein": "^2.0.6",
-                "levn": "^0.4.1",
-                "prelude-ls": "^1.2.1",
-                "type-check": "^0.4.0",
-                "word-wrap": "^1.2.3"
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/shared-ini-file-loader": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "p-cancelable": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
-            "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/signature-v4": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "p-limit": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-            "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-            "dev": true,
-            "requires": {
-                "yocto-queue": "^0.1.0"
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/smithy-client": {
+            "version": "4.1.6",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/core": "^3.1.5",
+                "@smithy/middleware-endpoint": "^4.0.6",
+                "@smithy/middleware-stack": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-stream": "^4.1.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "p-locate": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-            "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-            "dev": true,
-            "requires": {
-                "p-limit": "^3.0.2"
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/types": {
+            "version": "4.1.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "p-retry": {
-            "version": "4.6.1",
-            "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.1.tgz",
-            "integrity": "sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==",
-            "dev": true,
-            "requires": {
-                "@types/retry": "^0.12.0",
-                "retry": "^0.13.1"
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/url-parser": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/querystring-parser": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "p-try": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-            "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-            "dev": true
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/util-base64": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "package-hash": {
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/util-body-length-browser": {
             "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz",
-            "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==",
-            "dev": true,
-            "requires": {
-                "graceful-fs": "^4.1.15",
-                "hasha": "^5.0.0",
-                "lodash.flattendeep": "^4.4.0",
-                "release-zalgo": "^1.0.0"
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "pako": {
-            "version": "1.0.11",
-            "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-            "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
-            "dev": true
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/util-body-length-node": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "parent-module": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-            "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-            "dev": true,
-            "requires": {
-                "callsites": "^3.0.0"
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/util-buffer-from": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "parse-json": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-            "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-            "dev": true,
-            "requires": {
-                "@babel/code-frame": "^7.0.0",
-                "error-ex": "^1.3.1",
-                "json-parse-even-better-errors": "^2.3.0",
-                "lines-and-columns": "^1.1.6"
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/util-config-provider": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "parse-node-version": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
-            "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
-            "dev": true
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/util-defaults-mode-browser": {
+            "version": "4.0.7",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "parse-semver": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/parse-semver/-/parse-semver-1.1.1.tgz",
-            "integrity": "sha1-mkr9bfBj3Egm+T+6SpnPIj9mbLg=",
-            "dev": true,
-            "requires": {
-                "semver": "^5.1.0"
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/util-defaults-mode-node": {
+            "version": "4.0.7",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/config-resolver": "^4.0.1",
+                "@smithy/credential-provider-imds": "^4.0.1",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/util-endpoints": {
+            "version": "3.0.1",
+            "license": "Apache-2.0",
             "dependencies": {
-                "semver": {
-                    "version": "5.7.1",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-                    "dev": true
-                }
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "parse5": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-            "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
-            "dev": true
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/util-hex-encoding": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "parse5-htmlparser2-tree-adapter": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
-            "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
-            "dev": true,
-            "requires": {
-                "parse5": "^6.0.1"
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/util-middleware": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "parseurl": {
-            "version": "1.3.3",
-            "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-            "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-            "dev": true
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/util-retry": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/service-error-classification": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "path-browserify": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
-            "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
-            "dev": true
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/util-stream": {
+            "version": "4.1.2",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/fetch-http-handler": "^5.0.1",
+                "@smithy/node-http-handler": "^4.0.3",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "path-exists": {
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/util-uri-escape": {
             "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-            "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-            "dev": true
-        },
-        "path-is-absolute": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-            "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-            "dev": true
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "path-key": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-            "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@smithy/util-utf8": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "path-parse": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-            "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-            "dev": true
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@tsconfig/node18": {
+            "version": "18.2.4",
+            "dev": true,
+            "license": "MIT"
         },
-        "path-to-regexp": {
-            "version": "1.8.0",
-            "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
-            "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@types/node": {
+            "version": "18.19.80",
             "dev": true,
-            "requires": {
-                "isarray": "0.0.1"
-            },
+            "license": "MIT",
             "dependencies": {
-                "isarray": {
-                    "version": "0.0.1",
-                    "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-                    "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-                    "dev": true
-                }
+                "undici-types": "~5.26.4"
             }
         },
-        "path-type": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-            "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-            "dev": true
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/@types/uuid": {
+            "version": "9.0.8",
+            "license": "MIT"
         },
-        "pause-stream": {
-            "version": "0.0.11",
-            "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
-            "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/ansi-regex": {
+            "version": "5.0.1",
             "dev": true,
-            "requires": {
-                "through": "~2.3"
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
             }
         },
-        "pend": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-            "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
-            "dev": true
-        },
-        "picocolors": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-            "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
-        },
-        "picomatch": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
-            "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
-            "dev": true
-        },
-        "pkg-dir": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-            "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/ansi-styles": {
+            "version": "4.3.0",
             "dev": true,
-            "requires": {
-                "find-up": "^4.0.0"
-            },
+            "license": "MIT",
             "dependencies": {
-                "find-up": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-                    "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-                    "dev": true,
-                    "requires": {
-                        "locate-path": "^5.0.0",
-                        "path-exists": "^4.0.0"
-                    }
-                },
-                "locate-path": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-                    "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-                    "dev": true,
-                    "requires": {
-                        "p-locate": "^4.1.0"
-                    }
-                },
-                "p-limit": {
-                    "version": "2.3.0",
-                    "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-                    "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-                    "dev": true,
-                    "requires": {
-                        "p-try": "^2.0.0"
-                    }
-                },
-                "p-locate": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-                    "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-                    "dev": true,
-                    "requires": {
-                        "p-limit": "^2.2.0"
-                    }
-                }
-            }
-        },
-        "portfinder": {
-            "version": "1.0.28",
-            "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
-            "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==",
-            "requires": {
-                "async": "^2.6.2",
-                "debug": "^3.1.1",
-                "mkdirp": "^0.5.5"
+                "color-convert": "^2.0.1"
             },
-            "dependencies": {
-                "async": {
-                    "version": "2.6.4",
-                    "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
-                    "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
-                    "requires": {
-                        "lodash": "^4.17.14"
-                    }
-                },
-                "debug": {
-                    "version": "3.2.7",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-                    "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-                    "requires": {
-                        "ms": "^2.1.1"
-                    }
-                }
-            }
-        },
-        "postcss": {
-            "version": "8.3.11",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz",
-            "integrity": "sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA==",
-            "requires": {
-                "nanoid": "^3.1.30",
-                "picocolors": "^1.0.0",
-                "source-map-js": "^0.6.2"
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
             }
         },
-        "postcss-modules-extract-imports": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-            "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/balanced-match": {
+            "version": "1.0.2",
             "dev": true,
-            "requires": {}
+            "license": "MIT"
         },
-        "postcss-modules-local-by-default": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
-            "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/bowser": {
+            "version": "2.11.0",
+            "license": "MIT"
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/brace-expansion": {
+            "version": "1.1.11",
             "dev": true,
-            "requires": {
-                "icss-utils": "^5.0.0",
-                "postcss-selector-parser": "^6.0.2",
-                "postcss-value-parser": "^4.1.0"
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
             }
         },
-        "postcss-modules-scope": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-            "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/chalk": {
+            "version": "4.1.2",
             "dev": true,
-            "requires": {
-                "postcss-selector-parser": "^6.0.4"
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "postcss-modules-values": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
-            "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/chalk/node_modules/supports-color": {
+            "version": "7.2.0",
             "dev": true,
-            "requires": {
-                "icss-utils": "^5.0.0"
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
             }
         },
-        "postcss-selector-parser": {
-            "version": "6.0.6",
-            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
-            "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/cliui": {
+            "version": "7.0.4",
             "dev": true,
-            "requires": {
-                "cssesc": "^3.0.0",
-                "util-deprecate": "^1.0.2"
+            "license": "ISC",
+            "dependencies": {
+                "string-width": "^4.2.0",
+                "strip-ansi": "^6.0.0",
+                "wrap-ansi": "^7.0.0"
             }
         },
-        "postcss-value-parser": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-            "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
-            "dev": true
-        },
-        "prebuild-install": {
-            "version": "6.1.4",
-            "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.4.tgz",
-            "integrity": "sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/color-convert": {
+            "version": "2.0.1",
             "dev": true,
-            "requires": {
-                "detect-libc": "^1.0.3",
-                "expand-template": "^2.0.3",
-                "github-from-package": "0.0.0",
-                "minimist": "^1.2.3",
-                "mkdirp-classic": "^0.5.3",
-                "napi-build-utils": "^1.0.1",
-                "node-abi": "^2.21.0",
-                "npmlog": "^4.0.1",
-                "pump": "^3.0.0",
-                "rc": "^1.2.7",
-                "simple-get": "^3.0.3",
-                "tar-fs": "^2.0.0",
-                "tunnel-agent": "^0.6.0"
+            "license": "MIT",
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
             }
         },
-        "prelude-ls": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-            "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-            "dev": true
-        },
-        "prettier": {
-            "version": "2.7.1",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
-            "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
-            "dev": true
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/color-name": {
+            "version": "1.1.4",
+            "dev": true,
+            "license": "MIT"
         },
-        "prettier-plugin-sh": {
-            "version": "0.8.1",
-            "resolved": "https://registry.npmjs.org/prettier-plugin-sh/-/prettier-plugin-sh-0.8.1.tgz",
-            "integrity": "sha512-tz0g6y+ZaJF0PWaa1F7vhCv4nLgYYl2zYzYU4XJFD1McoY0oHI+l2osvXqv1s5yQdtjdlzKszN6VY7WTaw2Gqw==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/concat-map": {
+            "version": "0.0.1",
             "dev": true,
-            "requires": {
-                "mvdan-sh": "^0.5.0"
-            }
+            "license": "MIT"
         },
-        "pretty-quick": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/pretty-quick/-/pretty-quick-3.1.1.tgz",
-            "integrity": "sha512-ZYLGiMoV2jcaas3vTJrLvKAYsxDoXQBUn8OSTxkl67Fyov9lyXivJTl0+2WVh+y6EovGcw7Lm5ThYpH+Sh3XxQ==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/concurrently": {
+            "version": "7.0.0",
             "dev": true,
-            "requires": {
-                "chalk": "^3.0.0",
-                "execa": "^4.0.0",
-                "find-up": "^4.1.0",
-                "ignore": "^5.1.4",
-                "mri": "^1.1.5",
-                "multimatch": "^4.0.0"
-            },
-            "dependencies": {
-                "chalk": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-                    "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^4.1.0",
-                        "supports-color": "^7.1.0"
-                    }
-                },
-                "find-up": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-                    "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-                    "dev": true,
-                    "requires": {
-                        "locate-path": "^5.0.0",
-                        "path-exists": "^4.0.0"
-                    }
-                },
-                "locate-path": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-                    "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-                    "dev": true,
-                    "requires": {
-                        "p-locate": "^4.1.0"
-                    }
-                },
-                "p-limit": {
-                    "version": "2.3.0",
-                    "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-                    "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-                    "dev": true,
-                    "requires": {
-                        "p-try": "^2.0.0"
-                    }
-                },
-                "p-locate": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-                    "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-                    "dev": true,
-                    "requires": {
-                        "p-limit": "^2.2.0"
-                    }
-                }
+            "license": "MIT",
+            "dependencies": {
+                "chalk": "^4.1.0",
+                "date-fns": "^2.16.1",
+                "lodash": "^4.17.21",
+                "rxjs": "^6.6.3",
+                "spawn-command": "^0.0.2-1",
+                "supports-color": "^8.1.0",
+                "tree-kill": "^1.2.2",
+                "yargs": "^16.2.0"
+            },
+            "bin": {
+                "concurrently": "dist/bin/concurrently.js"
+            },
+            "engines": {
+                "node": "^12.20.0 || ^14.13.0 || >=16.0.0"
             }
         },
-        "private": {
-            "version": "0.1.8",
-            "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-            "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
-            "dev": true
-        },
-        "process-nextick-args": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-            "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-            "dev": true
-        },
-        "process-on-spawn": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz",
-            "integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/date-fns": {
+            "version": "2.30.0",
             "dev": true,
-            "requires": {
-                "fromentries": "^1.2.0"
+            "license": "MIT",
+            "dependencies": {
+                "@babel/runtime": "^7.21.0"
+            },
+            "engines": {
+                "node": ">=0.11"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/date-fns"
             }
         },
-        "proxy-addr": {
-            "version": "2.0.7",
-            "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-            "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/downlevel-dts": {
+            "version": "0.10.1",
             "dev": true,
-            "requires": {
-                "forwarded": "0.2.0",
-                "ipaddr.js": "1.9.1"
-            },
+            "license": "MIT",
             "dependencies": {
-                "ipaddr.js": {
-                    "version": "1.9.1",
-                    "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-                    "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-                    "dev": true
-                }
+                "semver": "^7.3.2",
+                "shelljs": "^0.8.3",
+                "typescript": "next"
+            },
+            "bin": {
+                "downlevel-dts": "index.js"
             }
         },
-        "pump": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-            "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-            "requires": {
-                "end-of-stream": "^1.1.0",
-                "once": "^1.3.1"
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/downlevel-dts/node_modules/typescript": {
+            "version": "5.9.0-dev.20250324",
+            "dev": true,
+            "license": "Apache-2.0",
+            "bin": {
+                "tsc": "bin/tsc",
+                "tsserver": "bin/tsserver"
+            },
+            "engines": {
+                "node": ">=14.17"
             }
         },
-        "punycode": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-            "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-            "dev": true
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "dev": true,
+            "license": "MIT"
         },
-        "qs": {
-            "version": "6.10.3",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
-            "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/escalade": {
+            "version": "3.2.0",
             "dev": true,
-            "requires": {
-                "side-channel": "^1.0.4"
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
             }
         },
-        "querystring": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-            "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
-        },
-        "queue-microtask": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-            "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-            "dev": true
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/fast-xml-parser": {
+            "version": "4.4.1",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/NaturalIntelligence"
+                },
+                {
+                    "type": "paypal",
+                    "url": "https://paypal.me/naturalintelligence"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "strnum": "^1.0.5"
+            },
+            "bin": {
+                "fxparser": "src/cli/cli.js"
+            }
         },
-        "quick-lru": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-            "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/fs.realpath": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "ISC"
         },
-        "randombytes": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-            "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/function-bind": {
+            "version": "1.1.2",
             "dev": true,
-            "requires": {
-                "safe-buffer": "^5.1.0"
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "range-parser": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-            "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-            "dev": true
-        },
-        "raw-body": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-            "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/get-caller-file": {
+            "version": "2.0.5",
             "dev": true,
-            "requires": {
-                "bytes": "3.1.2",
-                "http-errors": "2.0.0",
-                "iconv-lite": "0.4.24",
-                "unpipe": "1.0.0"
+            "license": "ISC",
+            "engines": {
+                "node": "6.* || 8.* || >= 10.*"
             }
         },
-        "rc": {
-            "version": "1.2.8",
-            "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-            "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/glob": {
+            "version": "7.2.3",
             "dev": true,
-            "requires": {
-                "deep-extend": "^0.6.0",
-                "ini": "~1.3.0",
-                "minimist": "^1.2.0",
-                "strip-json-comments": "~2.0.1"
-            },
+            "license": "ISC",
             "dependencies": {
-                "strip-json-comments": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-                    "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-                    "dev": true
-                }
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
             }
         },
-        "read": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
-            "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/has-flag": {
+            "version": "4.0.0",
             "dev": true,
-            "requires": {
-                "mute-stream": "~0.0.4"
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
             }
         },
-        "read-pkg": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-            "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/hasown": {
+            "version": "2.0.2",
             "dev": true,
-            "requires": {
-                "@types/normalize-package-data": "^2.4.0",
-                "normalize-package-data": "^2.5.0",
-                "parse-json": "^5.0.0",
-                "type-fest": "^0.6.0"
-            },
+            "license": "MIT",
             "dependencies": {
-                "hosted-git-info": {
-                    "version": "2.8.9",
-                    "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-                    "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-                    "dev": true
-                },
-                "normalize-package-data": {
-                    "version": "2.5.0",
-                    "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-                    "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-                    "dev": true,
-                    "requires": {
-                        "hosted-git-info": "^2.1.4",
-                        "resolve": "^1.10.0",
-                        "semver": "2 || 3 || 4 || 5",
-                        "validate-npm-package-license": "^3.0.1"
-                    }
-                },
-                "semver": {
-                    "version": "5.7.1",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-                    "dev": true
-                },
-                "type-fest": {
-                    "version": "0.6.0",
-                    "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-                    "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-                    "dev": true
-                }
+                "function-bind": "^1.1.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
             }
         },
-        "read-pkg-up": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-            "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/inflight": {
+            "version": "1.0.6",
             "dev": true,
-            "requires": {
-                "find-up": "^4.1.0",
-                "read-pkg": "^5.2.0",
-                "type-fest": "^0.8.1"
-            },
+            "license": "ISC",
             "dependencies": {
-                "find-up": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-                    "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-                    "dev": true,
-                    "requires": {
-                        "locate-path": "^5.0.0",
-                        "path-exists": "^4.0.0"
-                    }
-                },
-                "locate-path": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-                    "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-                    "dev": true,
-                    "requires": {
-                        "p-locate": "^4.1.0"
-                    }
-                },
-                "p-limit": {
-                    "version": "2.3.0",
-                    "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-                    "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-                    "dev": true,
-                    "requires": {
-                        "p-try": "^2.0.0"
-                    }
-                },
-                "p-locate": {
-                    "version": "4.1.0",
-                    "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-                    "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-                    "dev": true,
-                    "requires": {
-                        "p-limit": "^2.2.0"
-                    }
-                }
+                "once": "^1.3.0",
+                "wrappy": "1"
             }
         },
-        "readable-stream": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-            "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-            "requires": {
-                "inherits": "^2.0.3",
-                "string_decoder": "^1.1.1",
-                "util-deprecate": "^1.0.1"
-            }
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/inherits": {
+            "version": "2.0.4",
+            "dev": true,
+            "license": "ISC"
         },
-        "readdirp": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-            "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/interpret": {
+            "version": "1.4.0",
             "dev": true,
-            "requires": {
-                "picomatch": "^2.2.1"
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.10"
             }
         },
-        "readline-sync": {
-            "version": "1.4.10",
-            "resolved": "https://registry.npmjs.org/readline-sync/-/readline-sync-1.4.10.tgz",
-            "integrity": "sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw==",
-            "dev": true
-        },
-        "recast": {
-            "version": "0.11.23",
-            "resolved": "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz",
-            "integrity": "sha1-RR/TAEqx5N+bTktmN2sqIZEkYtM=",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/is-core-module": {
+            "version": "2.16.1",
             "dev": true,
-            "requires": {
-                "ast-types": "0.9.6",
-                "esprima": "~3.1.0",
-                "private": "~0.1.5",
-                "source-map": "~0.5.0"
-            },
+            "license": "MIT",
             "dependencies": {
-                "ast-types": {
-                    "version": "0.9.6",
-                    "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz",
-                    "integrity": "sha1-ECyenpAF0+fjgpvwxPok7oYu6bk=",
-                    "dev": true
-                },
-                "esprima": {
-                    "version": "3.1.3",
-                    "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-                    "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
-                    "dev": true
-                },
-                "source-map": {
-                    "version": "0.5.7",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-                    "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-                    "dev": true
-                }
+                "hasown": "^2.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "rechoir": {
-            "version": "0.7.1",
-            "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
-            "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/is-fullwidth-code-point": {
+            "version": "3.0.0",
             "dev": true,
-            "requires": {
-                "resolve": "^1.9.0"
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
             }
         },
-        "redent": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
-            "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/lodash": {
+            "version": "4.17.21",
             "dev": true,
-            "requires": {
-                "indent-string": "^4.0.0",
-                "strip-indent": "^3.0.0"
-            }
+            "license": "MIT"
         },
-        "regexp.prototype.flags": {
-            "version": "1.4.3",
-            "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-            "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-            "requires": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.3",
-                "functions-have-names": "^1.2.2"
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/minimatch": {
+            "version": "3.1.2",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
             }
         },
-        "regexpp": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-            "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-            "dev": true
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/once": {
+            "version": "1.4.0",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "wrappy": "1"
+            }
         },
-        "release-zalgo": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz",
-            "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/path-is-absolute": {
+            "version": "1.0.1",
             "dev": true,
-            "requires": {
-                "es6-error": "^4.0.1"
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
             }
         },
-        "remove-trailing-separator": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-            "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-            "dev": true
-        },
-        "replace-ext": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
-            "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
-            "dev": true
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/path-parse": {
+            "version": "1.0.7",
+            "dev": true,
+            "license": "MIT"
         },
-        "request-light": {
-            "version": "0.2.5",
-            "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.2.5.tgz",
-            "integrity": "sha512-eBEh+GzJAftUnex6tcL6eV2JCifY0+sZMIUpUPOVXbs2nV5hla4ZMmO3icYKGuGVuQ2zHE9evh4OrRcH4iyYYw==",
-            "requires": {
-                "http-proxy-agent": "^2.1.0",
-                "https-proxy-agent": "^2.2.3",
-                "vscode-nls": "^4.1.1"
-            },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/rechoir": {
+            "version": "0.6.2",
+            "dev": true,
             "dependencies": {
-                "agent-base": {
-                    "version": "4.3.0",
-                    "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
-                    "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
-                    "requires": {
-                        "es6-promisify": "^5.0.0"
-                    }
-                },
-                "debug": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-                    "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-                    "requires": {
-                        "ms": "2.0.0"
-                    }
-                },
-                "http-proxy-agent": {
-                    "version": "2.1.0",
-                    "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
-                    "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
-                    "requires": {
-                        "agent-base": "4",
-                        "debug": "3.1.0"
-                    }
-                },
-                "https-proxy-agent": {
-                    "version": "2.2.4",
-                    "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
-                    "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
-                    "requires": {
-                        "agent-base": "^4.3.0",
-                        "debug": "^3.1.0"
-                    }
-                },
-                "ms": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-                    "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-                },
-                "vscode-nls": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.2.tgz",
-                    "integrity": "sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw=="
-                }
+                "resolve": "^1.1.6"
+            },
+            "engines": {
+                "node": ">= 0.10"
             }
         },
-        "require-directory": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-            "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-            "dev": true
-        },
-        "require-from-string": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-            "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-            "dev": true
-        },
-        "require-main-filename": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-            "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-            "dev": true
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/regenerator-runtime": {
+            "version": "0.14.1",
+            "dev": true,
+            "license": "MIT"
         },
-        "requires-port": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-            "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-            "dev": true
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/require-directory": {
+            "version": "2.1.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
         },
-        "resolve": {
-            "version": "1.22.1",
-            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-            "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/resolve": {
+            "version": "1.22.10",
             "dev": true,
-            "requires": {
-                "is-core-module": "^2.9.0",
+            "license": "MIT",
+            "dependencies": {
+                "is-core-module": "^2.16.0",
                 "path-parse": "^1.0.7",
                 "supports-preserve-symlinks-flag": "^1.0.0"
+            },
+            "bin": {
+                "resolve": "bin/resolve"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "resolve-alpn": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
-            "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="
-        },
-        "resolve-cwd": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
-            "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/rimraf": {
+            "version": "3.0.2",
             "dev": true,
-            "requires": {
-                "resolve-from": "^5.0.0"
+            "license": "ISC",
+            "dependencies": {
+                "glob": "^7.1.3"
+            },
+            "bin": {
+                "rimraf": "bin.js"
             },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/rxjs": {
+            "version": "6.6.7",
+            "dev": true,
+            "license": "Apache-2.0",
             "dependencies": {
-                "resolve-from": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-                    "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-                    "dev": true
-                }
+                "tslib": "^1.9.0"
+            },
+            "engines": {
+                "npm": ">=2.0.0"
             }
         },
-        "resolve-from": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-            "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-            "dev": true
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/rxjs/node_modules/tslib": {
+            "version": "1.14.1",
+            "dev": true,
+            "license": "0BSD"
         },
-        "responselike": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz",
-            "integrity": "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==",
-            "requires": {
-                "lowercase-keys": "^2.0.0"
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/semver": {
+            "version": "7.7.1",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
             }
         },
-        "retry": {
-            "version": "0.13.1",
-            "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
-            "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
-            "dev": true
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/shelljs": {
+            "version": "0.8.5",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "glob": "^7.0.0",
+                "interpret": "^1.0.0",
+                "rechoir": "^0.6.2"
+            },
+            "bin": {
+                "shjs": "bin/shjs"
+            },
+            "engines": {
+                "node": ">=4"
+            }
         },
-        "reusify": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-            "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/spawn-command": {
+            "version": "0.0.2",
             "dev": true
         },
-        "rimraf": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-            "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/string-width": {
+            "version": "4.2.3",
             "dev": true,
-            "requires": {
-                "glob": "^7.1.3"
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
             }
         },
-        "run-parallel": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-            "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/strip-ansi": {
+            "version": "6.0.1",
             "dev": true,
-            "requires": {
-                "queue-microtask": "^1.2.2"
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
             }
         },
-        "safe-buffer": {
-            "version": "5.2.1",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-        },
-        "safe-stable-stringify": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz",
-            "integrity": "sha512-kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg=="
-        },
-        "safer-buffer": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-            "dev": true
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/strnum": {
+            "version": "1.1.2",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/NaturalIntelligence"
+                }
+            ],
+            "license": "MIT"
         },
-        "sax": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz",
-            "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o="
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/supports-color": {
+            "version": "8.1.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/supports-color?sponsor=1"
+            }
         },
-        "schema-utils": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-            "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/supports-preserve-symlinks-flag": {
+            "version": "1.0.0",
             "dev": true,
-            "requires": {
-                "@types/json-schema": "^7.0.8",
-                "ajv": "^6.12.5",
-                "ajv-keywords": "^3.5.2"
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "select-hose": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-            "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
-            "dev": true
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/tree-kill": {
+            "version": "1.2.2",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "tree-kill": "cli.js"
+            }
         },
-        "selfsigned": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.0.1.tgz",
-            "integrity": "sha512-LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/typescript": {
+            "version": "5.2.2",
             "dev": true,
-            "requires": {
-                "node-forge": "^1"
+            "license": "Apache-2.0",
+            "bin": {
+                "tsc": "bin/tsc",
+                "tsserver": "bin/tsserver"
+            },
+            "engines": {
+                "node": ">=14.17"
             }
         },
-        "semver": {
-            "version": "7.3.7",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-            "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-            "requires": {
-                "lru-cache": "^6.0.0"
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/undici-types": {
+            "version": "5.26.5",
+            "dev": true,
+            "license": "MIT"
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/uuid": {
+            "version": "9.0.1",
+            "funding": [
+                "https://github.com/sponsors/broofa",
+                "https://github.com/sponsors/ctavan"
+            ],
+            "license": "MIT",
+            "bin": {
+                "uuid": "dist/bin/uuid"
             }
         },
-        "send": {
-            "version": "0.18.0",
-            "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-            "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/wrap-ansi": {
+            "version": "7.0.0",
             "dev": true,
-            "requires": {
-                "debug": "2.6.9",
-                "depd": "2.0.0",
-                "destroy": "1.2.0",
-                "encodeurl": "~1.0.2",
-                "escape-html": "~1.0.3",
-                "etag": "~1.8.1",
-                "fresh": "0.5.2",
-                "http-errors": "2.0.0",
-                "mime": "1.6.0",
-                "ms": "2.1.3",
-                "on-finished": "2.4.1",
-                "range-parser": "~1.2.1",
-                "statuses": "2.0.1"
-            },
+            "license": "MIT",
             "dependencies": {
-                "debug": {
-                    "version": "2.6.9",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "2.0.0"
-                    },
-                    "dependencies": {
-                        "ms": {
-                            "version": "2.0.0",
-                            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-                            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-                            "dev": true
-                        }
-                    }
-                },
-                "depd": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-                    "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-                    "dev": true
-                },
-                "ms": {
-                    "version": "2.1.3",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-                    "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-                    "dev": true
-                },
-                "statuses": {
-                    "version": "2.0.1",
-                    "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-                    "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-                    "dev": true
-                }
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
             }
         },
-        "serialize-javascript": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-            "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/wrappy": {
+            "version": "1.0.2",
             "dev": true,
-            "requires": {
-                "randombytes": "^2.1.0"
+            "license": "ISC"
+        },
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/y18n": {
+            "version": "5.0.8",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=10"
             }
         },
-        "serve-index": {
-            "version": "1.9.1",
-            "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-            "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/yargs": {
+            "version": "16.2.0",
             "dev": true,
-            "requires": {
-                "accepts": "~1.3.4",
-                "batch": "0.6.1",
-                "debug": "2.6.9",
-                "escape-html": "~1.0.3",
-                "http-errors": "~1.6.2",
-                "mime-types": "~2.1.17",
-                "parseurl": "~1.3.2"
-            },
+            "license": "MIT",
             "dependencies": {
-                "debug": {
-                    "version": "2.6.9",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "2.0.0"
-                    }
-                },
-                "http-errors": {
-                    "version": "1.6.3",
-                    "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-                    "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-                    "dev": true,
-                    "requires": {
-                        "depd": "~1.1.2",
-                        "inherits": "2.0.3",
-                        "setprototypeof": "1.1.0",
-                        "statuses": ">= 1.4.0 < 2"
-                    }
-                },
-                "inherits": {
-                    "version": "2.0.3",
-                    "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                    "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                    "dev": true
-                },
-                "ms": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-                    "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-                    "dev": true
-                },
-                "setprototypeof": {
-                    "version": "1.1.0",
-                    "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-                    "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-                    "dev": true
-                }
+                "cliui": "^7.0.2",
+                "escalade": "^3.1.1",
+                "get-caller-file": "^2.0.5",
+                "require-directory": "^2.1.1",
+                "string-width": "^4.2.0",
+                "y18n": "^5.0.5",
+                "yargs-parser": "^20.2.2"
+            },
+            "engines": {
+                "node": ">=10"
             }
         },
-        "serve-static": {
-            "version": "1.15.0",
-            "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-            "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+        "src.gen/@amzn/amazon-q-developer-streaming-client/node_modules/yargs-parser": {
+            "version": "20.2.9",
             "dev": true,
-            "requires": {
-                "encodeurl": "~1.0.2",
-                "escape-html": "~1.0.3",
-                "parseurl": "~1.3.3",
-                "send": "0.18.0"
+            "license": "ISC",
+            "engines": {
+                "node": ">=10"
             }
         },
-        "set-blocking": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-            "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-            "dev": true
+        "src.gen/@amzn/codewhisperer-streaming": {
+            "version": "1.0.0",
+            "hasInstallScript": true,
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.731.0",
+                "@aws-sdk/middleware-host-header": "3.731.0",
+                "@aws-sdk/middleware-logger": "3.731.0",
+                "@aws-sdk/middleware-recursion-detection": "3.731.0",
+                "@aws-sdk/middleware-user-agent": "3.731.0",
+                "@aws-sdk/region-config-resolver": "3.731.0",
+                "@aws-sdk/token-providers": "3.731.1",
+                "@aws-sdk/types": "3.731.0",
+                "@aws-sdk/util-user-agent-browser": "3.731.0",
+                "@aws-sdk/util-user-agent-node": "3.731.0",
+                "@smithy/config-resolver": "^4.0.1",
+                "@smithy/core": "^3.1.1",
+                "@smithy/eventstream-serde-browser": "^4.0.1",
+                "@smithy/eventstream-serde-config-resolver": "^4.0.1",
+                "@smithy/eventstream-serde-node": "^4.0.1",
+                "@smithy/fetch-http-handler": "^5.0.1",
+                "@smithy/hash-node": "^4.0.1",
+                "@smithy/invalid-dependency": "^4.0.1",
+                "@smithy/middleware-content-length": "^4.0.1",
+                "@smithy/middleware-retry": "^4.0.3",
+                "@smithy/middleware-serde": "^4.0.1",
+                "@smithy/middleware-stack": "^4.0.1",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/node-http-handler": "^4.0.2",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/smithy-client": "^4.1.2",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.3",
+                "@smithy/util-defaults-mode-node": "^4.0.3",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-retry": "^4.0.1",
+                "@smithy/util-utf8": "^4.0.0",
+                "@types/uuid": "^9.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "devDependencies": {
+                "@tsconfig/node18": "18.2.4",
+                "@types/node": "^18.19.69",
+                "concurrently": "7.0.0",
+                "downlevel-dts": "0.10.1",
+                "rimraf": "^3.0.0",
+                "typescript": "~5.2.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "setimmediate": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-            "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
-            "dev": true
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@aws-crypto/crc32": {
+            "version": "5.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/util": "^5.2.0",
+                "@aws-sdk/types": "^3.222.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
         },
-        "setprototypeof": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
-            "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
-            "dev": true
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@aws-crypto/sha256-browser": {
+            "version": "5.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-js": "^5.2.0",
+                "@aws-crypto/supports-web-crypto": "^5.2.0",
+                "@aws-crypto/util": "^5.2.0",
+                "@aws-sdk/types": "^3.222.0",
+                "@aws-sdk/util-locate-window": "^3.0.0",
+                "@smithy/util-utf8": "^2.0.0",
+                "tslib": "^2.6.2"
+            }
         },
-        "shallow-clone": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
-            "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
-            "dev": true,
-            "requires": {
-                "kind-of": "^6.0.2"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/is-array-buffer": {
+            "version": "2.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "shebang-command": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-            "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-            "requires": {
-                "shebang-regex": "^3.0.0"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-buffer-from": {
+            "version": "2.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^2.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "shebang-regex": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-            "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-utf8": {
+            "version": "2.3.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^2.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
         },
-        "side-channel": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-            "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-            "requires": {
-                "call-bind": "^1.0.0",
-                "get-intrinsic": "^1.0.2",
-                "object-inspect": "^1.9.0"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@aws-crypto/sha256-js": {
+            "version": "5.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/util": "^5.2.0",
+                "@aws-sdk/types": "^3.222.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
             }
         },
-        "signal-exit": {
-            "version": "3.0.5",
-            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz",
-            "integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==",
-            "dev": true
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@aws-crypto/supports-web-crypto": {
+            "version": "5.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            }
         },
-        "simple-concat": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
-            "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
-            "dev": true
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@aws-crypto/util": {
+            "version": "5.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "^3.222.0",
+                "@smithy/util-utf8": "^2.0.0",
+                "tslib": "^2.6.2"
+            }
         },
-        "simple-get": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz",
-            "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==",
-            "dev": true,
-            "requires": {
-                "decompress-response": "^4.2.0",
-                "once": "^1.3.1",
-                "simple-concat": "^1.0.0"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@aws-crypto/util/node_modules/@smithy/is-array-buffer": {
+            "version": "2.2.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
             },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@aws-crypto/util/node_modules/@smithy/util-buffer-from": {
+            "version": "2.2.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "decompress-response": {
-                    "version": "4.2.1",
-                    "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
-                    "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
-                    "dev": true,
-                    "requires": {
-                        "mimic-response": "^2.0.0"
-                    }
-                },
-                "mimic-response": {
-                    "version": "2.1.0",
-                    "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
-                    "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
-                    "dev": true
-                }
+                "@smithy/is-array-buffer": "^2.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "simple-swizzle": {
-            "version": "0.2.2",
-            "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-            "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
-            "requires": {
-                "is-arrayish": "^0.3.1"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": {
+            "version": "2.3.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^2.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
             }
         },
-        "sinon": {
-            "version": "14.0.0",
-            "resolved": "https://registry.npmjs.org/sinon/-/sinon-14.0.0.tgz",
-            "integrity": "sha512-ugA6BFmE+WrJdh0owRZHToLd32Uw3Lxq6E6LtNRU+xTVBefx632h03Q7apXWRsRdZAJ41LB8aUfn2+O4jsDNMw==",
-            "dev": true,
-            "requires": {
-                "@sinonjs/commons": "^1.8.3",
-                "@sinonjs/fake-timers": "^9.1.2",
-                "@sinonjs/samsam": "^6.1.1",
-                "diff": "^5.0.0",
-                "nise": "^5.1.1",
-                "supports-color": "^7.2.0"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@aws-sdk/core": {
+            "version": "3.731.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/core": "^3.0.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/signature-v4": "^5.0.0",
+                "@smithy/smithy-client": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.0",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
             },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.731.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@sinonjs/fake-timers": {
-                    "version": "9.1.2",
-                    "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz",
-                    "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==",
-                    "dev": true,
-                    "requires": {
-                        "@sinonjs/commons": "^1.7.0"
-                    }
-                }
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "slash": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-            "dev": true
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.731.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "sockjs": {
-            "version": "0.3.24",
-            "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
-            "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
-            "dev": true,
-            "requires": {
-                "faye-websocket": "^0.11.3",
-                "uuid": "^8.3.2",
-                "websocket-driver": "^0.7.4"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.731.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "source-list-map": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-            "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-            "dev": true
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.731.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.731.0",
+                "@aws-sdk/types": "3.731.0",
+                "@aws-sdk/util-endpoints": "3.731.0",
+                "@smithy/core": "^3.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "source-map": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@aws-sdk/nested-clients": {
+            "version": "3.731.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.731.0",
+                "@aws-sdk/middleware-host-header": "3.731.0",
+                "@aws-sdk/middleware-logger": "3.731.0",
+                "@aws-sdk/middleware-recursion-detection": "3.731.0",
+                "@aws-sdk/middleware-user-agent": "3.731.0",
+                "@aws-sdk/region-config-resolver": "3.731.0",
+                "@aws-sdk/types": "3.731.0",
+                "@aws-sdk/util-endpoints": "3.731.0",
+                "@aws-sdk/util-user-agent-browser": "3.731.0",
+                "@aws-sdk/util-user-agent-node": "3.731.0",
+                "@smithy/config-resolver": "^4.0.0",
+                "@smithy/core": "^3.0.0",
+                "@smithy/fetch-http-handler": "^5.0.0",
+                "@smithy/hash-node": "^4.0.0",
+                "@smithy/invalid-dependency": "^4.0.0",
+                "@smithy/middleware-content-length": "^4.0.0",
+                "@smithy/middleware-endpoint": "^4.0.0",
+                "@smithy/middleware-retry": "^4.0.0",
+                "@smithy/middleware-serde": "^4.0.0",
+                "@smithy/middleware-stack": "^4.0.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/node-http-handler": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/smithy-client": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/url-parser": "^4.0.0",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.0",
+                "@smithy/util-defaults-mode-node": "^4.0.0",
+                "@smithy/util-endpoints": "^3.0.0",
+                "@smithy/util-middleware": "^4.0.0",
+                "@smithy/util-retry": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.731.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "source-map-js": {
-            "version": "0.6.2",
-            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz",
-            "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug=="
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@aws-sdk/token-providers": {
+            "version": "3.731.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/nested-clients": "3.731.1",
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/shared-ini-file-loader": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "source-map-support": {
-            "version": "0.5.21",
-            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-            "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-            "dev": true,
-            "requires": {
-                "buffer-from": "^1.0.0",
-                "source-map": "^0.6.0"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@aws-sdk/types": {
+            "version": "3.731.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "sourcemap-codec": {
-            "version": "1.4.8",
-            "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
-            "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.731.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/util-endpoints": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "spawn-wrap": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz",
-            "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==",
-            "dev": true,
-            "requires": {
-                "foreground-child": "^2.0.0",
-                "is-windows": "^1.0.2",
-                "make-dir": "^3.0.0",
-                "rimraf": "^3.0.0",
-                "signal-exit": "^3.0.2",
-                "which": "^2.0.1"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@aws-sdk/util-locate-window": {
+            "version": "3.723.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "spdx-correct": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-            "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-            "dev": true,
-            "requires": {
-                "spdx-expression-parse": "^3.0.0",
-                "spdx-license-ids": "^3.0.0"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.731.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/types": "^4.0.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
             }
         },
-        "spdx-exceptions": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-            "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-            "dev": true
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.731.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/middleware-user-agent": "3.731.0",
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            },
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
+            }
         },
-        "spdx-expression-parse": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-            "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@babel/runtime": {
+            "version": "7.26.9",
             "dev": true,
-            "requires": {
-                "spdx-exceptions": "^2.1.0",
-                "spdx-license-ids": "^3.0.0"
+            "license": "MIT",
+            "dependencies": {
+                "regenerator-runtime": "^0.14.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
             }
         },
-        "spdx-license-ids": {
-            "version": "3.0.11",
-            "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz",
-            "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==",
-            "dev": true
-        },
-        "spdy": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
-            "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
-            "dev": true,
-            "requires": {
-                "debug": "^4.1.0",
-                "handle-thing": "^2.0.0",
-                "http-deceiver": "^1.2.7",
-                "select-hose": "^2.0.0",
-                "spdy-transport": "^3.0.0"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/abort-controller": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "spdy-transport": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-            "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-            "dev": true,
-            "requires": {
-                "debug": "^4.1.0",
-                "detect-node": "^2.0.4",
-                "hpack.js": "^2.1.6",
-                "obuf": "^1.1.2",
-                "readable-stream": "^3.0.6",
-                "wbuf": "^1.7.3"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/config-resolver": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "split": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
-            "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
-            "dev": true,
-            "requires": {
-                "through": "2"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/core": {
+            "version": "3.1.5",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-stream": "^4.1.2",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "sprintf-js": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-            "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/credential-provider-imds": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "stack-trace": {
-            "version": "0.0.10",
-            "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
-            "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA="
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/eventstream-codec": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/crc32": "5.2.0",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "statuses": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-            "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
-            "dev": true
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/eventstream-serde-browser": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/eventstream-serde-universal": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "stream-combiner": {
-            "version": "0.2.2",
-            "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz",
-            "integrity": "sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=",
-            "dev": true,
-            "requires": {
-                "duplexer": "~0.1.1",
-                "through": "~2.3.4"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/eventstream-serde-config-resolver": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "string_decoder": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-            "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-            "requires": {
-                "safe-buffer": "~5.2.0"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/eventstream-serde-node": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/eventstream-serde-universal": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "string-width": {
-            "version": "4.2.3",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-            "dev": true,
-            "requires": {
-                "emoji-regex": "^8.0.0",
-                "is-fullwidth-code-point": "^3.0.0",
-                "strip-ansi": "^6.0.1"
-            },
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/eventstream-serde-universal": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
             "dependencies": {
-                "ansi-regex": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-                    "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-                    "dev": true
-                },
-                "strip-ansi": {
-                    "version": "6.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-                    "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^5.0.1"
-                    }
-                }
+                "@smithy/eventstream-codec": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "string.prototype.trimend": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz",
-            "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==",
-            "requires": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.4",
-                "es-abstract": "^1.19.5"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/fetch-http-handler": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/querystring-builder": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-base64": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "string.prototype.trimstart": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz",
-            "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==",
-            "requires": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.4",
-                "es-abstract": "^1.19.5"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/hash-node": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "strip-ansi": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-            "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-            "requires": {
-                "ansi-regex": "^4.1.0"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/invalid-dependency": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "strip-bom": {
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/is-array-buffer": {
             "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-            "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-            "dev": true
-        },
-        "strip-final-newline": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-            "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-            "dev": true
-        },
-        "strip-indent": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
-            "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-            "dev": true,
-            "requires": {
-                "min-indent": "^1.0.0"
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "strip-json-comments": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-            "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-            "dev": true
-        },
-        "supports-color": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-            "dev": true,
-            "requires": {
-                "has-flag": "^4.0.0"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/middleware-content-length": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "supports-preserve-symlinks-flag": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-            "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-            "dev": true
-        },
-        "svg-pathdata": {
-            "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/svg-pathdata/-/svg-pathdata-6.0.3.tgz",
-            "integrity": "sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw==",
-            "dev": true
-        },
-        "svg2ttf": {
-            "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/svg2ttf/-/svg2ttf-6.0.3.tgz",
-            "integrity": "sha512-CgqMyZrbOPpc+WqH7aga4JWkDPso23EgypLsbQ6gN3uoPWwwiLjXvzgrwGADBExvCRJrWFzAeK1bSoSpE7ixSQ==",
-            "dev": true,
-            "requires": {
-                "@xmldom/xmldom": "^0.7.2",
-                "argparse": "^2.0.1",
-                "cubic2quad": "^1.2.1",
-                "lodash": "^4.17.10",
-                "microbuffer": "^1.0.0",
-                "svgpath": "^2.1.5"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/middleware-endpoint": {
+            "version": "4.0.6",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/core": "^3.1.5",
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "@smithy/util-middleware": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "svgicons2svgfont": {
-            "version": "10.0.6",
-            "resolved": "https://registry.npmjs.org/svgicons2svgfont/-/svgicons2svgfont-10.0.6.tgz",
-            "integrity": "sha512-fUgQEVg3XwTbOHvlXahHGqCet5Wvfo1bV4DCvbSRvjsOCPCRunYbG4dUJCPegps37BMph3eOrfoobhH5AWuC6A==",
-            "dev": true,
-            "requires": {
-                "commander": "^7.2.0",
-                "geometry-interfaces": "^1.1.4",
-                "glob": "^7.1.6",
-                "neatequal": "^1.0.0",
-                "readable-stream": "^3.4.0",
-                "sax": "^1.2.4",
-                "svg-pathdata": "^6.0.0"
-            },
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/middleware-retry": {
+            "version": "4.0.7",
+            "license": "Apache-2.0",
             "dependencies": {
-                "commander": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-                    "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-                    "dev": true
-                },
-                "sax": {
-                    "version": "1.2.4",
-                    "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-                    "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-                    "dev": true
-                }
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/service-error-classification": "^4.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-retry": "^4.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "svgpath": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/svgpath/-/svgpath-2.5.0.tgz",
-            "integrity": "sha512-o/vohwqjUO9nDAh4rcjE3KaW/v//At8UJu2LJMybXidf5QLQLVA4bxH0//4YCsr+1H4Gw1Wi/Jc62ynzSBYidw==",
-            "dev": true
-        },
-        "tapable": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-            "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
-            "dev": true
-        },
-        "tar-fs": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-            "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
-            "dev": true,
-            "requires": {
-                "chownr": "^1.1.1",
-                "mkdirp-classic": "^0.5.2",
-                "pump": "^3.0.0",
-                "tar-stream": "^2.1.4"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/middleware-serde": {
+            "version": "4.0.2",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "tar-stream": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-            "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-            "dev": true,
-            "requires": {
-                "bl": "^4.0.3",
-                "end-of-stream": "^1.4.1",
-                "fs-constants": "^1.0.0",
-                "inherits": "^2.0.3",
-                "readable-stream": "^3.1.1"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/middleware-stack": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "tcp-port-used": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/tcp-port-used/-/tcp-port-used-1.0.2.tgz",
-            "integrity": "sha512-l7ar8lLUD3XS1V2lfoJlCBaeoaWo/2xfYt81hM7VlvR4RrMVFqfmzfhLVk40hAb368uitje5gPtBRL1m/DGvLA==",
-            "requires": {
-                "debug": "4.3.1",
-                "is2": "^2.0.6"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/node-config-provider": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/node-http-handler": {
+            "version": "4.0.3",
+            "license": "Apache-2.0",
             "dependencies": {
-                "debug": {
-                    "version": "4.3.1",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-                    "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
-                    "requires": {
-                        "ms": "2.1.2"
-                    }
-                }
+                "@smithy/abort-controller": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/querystring-builder": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "terser": {
-            "version": "5.14.2",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz",
-            "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==",
-            "dev": true,
-            "requires": {
-                "@jridgewell/source-map": "^0.3.2",
-                "acorn": "^8.5.0",
-                "commander": "^2.20.0",
-                "source-map-support": "~0.5.20"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/property-provider": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/protocol-http": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
             "dependencies": {
-                "commander": {
-                    "version": "2.20.3",
-                    "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-                    "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-                    "dev": true
-                }
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "terser-webpack-plugin": {
-            "version": "5.2.4",
-            "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.2.4.tgz",
-            "integrity": "sha512-E2CkNMN+1cho04YpdANyRrn8CyN4yMy+WdFKZIySFZrGXZxJwJP6PMNGGc/Mcr6qygQHUUqRxnAPmi0M9f00XA==",
-            "dev": true,
-            "requires": {
-                "jest-worker": "^27.0.6",
-                "p-limit": "^3.1.0",
-                "schema-utils": "^3.1.1",
-                "serialize-javascript": "^6.0.0",
-                "source-map": "^0.6.1",
-                "terser": "^5.7.2"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/querystring-builder": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "test-exclude": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-            "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-            "dev": true,
-            "requires": {
-                "@istanbuljs/schema": "^0.1.2",
-                "glob": "^7.1.4",
-                "minimatch": "^3.0.4"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/querystring-parser": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "text-hex": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
-            "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg=="
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/service-error-classification": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "text-table": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-            "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-            "dev": true
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/shared-ini-file-loader": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "thenify": {
-            "version": "3.3.1",
-            "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
-            "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
-            "dev": true,
-            "requires": {
-                "any-promise": "^1.0.0"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/signature-v4": {
+            "version": "5.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "thenify-all": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
-            "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
-            "dev": true,
-            "requires": {
-                "thenify": ">= 3.1.0 < 4"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/smithy-client": {
+            "version": "4.1.6",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/core": "^3.1.5",
+                "@smithy/middleware-endpoint": "^4.0.6",
+                "@smithy/middleware-stack": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-stream": "^4.1.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "through": {
-            "version": "2.3.8",
-            "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-            "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-            "dev": true
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/types": {
+            "version": "4.1.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "thunky": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-            "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
-            "dev": true
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/url-parser": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/querystring-parser": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "time-stamp": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-            "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
-            "dev": true
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/util-base64": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "timers-ext": {
-            "version": "0.1.7",
-            "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz",
-            "integrity": "sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==",
-            "dev": true,
-            "requires": {
-                "es5-ext": "~0.10.46",
-                "next-tick": "1"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/util-body-length-browser": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "tmp": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-            "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
-            "dev": true,
-            "requires": {
-                "rimraf": "^3.0.0"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/util-body-length-node": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "to-fast-properties": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-            "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-            "dev": true
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/util-buffer-from": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "to-regex-range": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-            "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-            "dev": true,
-            "requires": {
-                "is-number": "^7.0.0"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/util-config-provider": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "toidentifier": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
-            "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
-            "dev": true
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/util-defaults-mode-browser": {
+            "version": "4.0.7",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "traverse": {
-            "version": "0.3.9",
-            "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
-            "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=",
-            "dev": true
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/util-defaults-mode-node": {
+            "version": "4.0.7",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/config-resolver": "^4.0.1",
+                "@smithy/credential-provider-imds": "^4.0.1",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
         },
-        "trim-newlines": {
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/util-endpoints": {
             "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-            "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
-            "dev": true
-        },
-        "triple-beam": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz",
-            "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="
-        },
-        "ts-mockito": {
-            "version": "2.6.1",
-            "resolved": "https://registry.npmjs.org/ts-mockito/-/ts-mockito-2.6.1.tgz",
-            "integrity": "sha512-qU9m/oEBQrKq5hwfbJ7MgmVN5Gu6lFnIGWvpxSjrqq6YYEVv+RwVFWySbZMBgazsWqv6ctAyVBpo9TmAxnOEKw==",
-            "dev": true,
-            "requires": {
-                "lodash": "^4.17.5"
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "ts-morph": {
-            "version": "17.0.1",
-            "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-17.0.1.tgz",
-            "integrity": "sha512-10PkHyXmrtsTvZSL+cqtJLTgFXkU43Gd0JCc0Rw6GchWbqKe0Rwgt1v3ouobTZwQzF1mGhDeAlWYBMGRV7y+3g==",
-            "dev": true,
-            "requires": {
-                "@ts-morph/common": "~0.18.0",
-                "code-block-writer": "^11.0.3"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/util-hex-encoding": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "ts-node": {
-            "version": "10.7.0",
-            "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.7.0.tgz",
-            "integrity": "sha512-TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A==",
-            "dev": true,
-            "requires": {
-                "@cspotcode/source-map-support": "0.7.0",
-                "@tsconfig/node10": "^1.0.7",
-                "@tsconfig/node12": "^1.0.7",
-                "@tsconfig/node14": "^1.0.0",
-                "@tsconfig/node16": "^1.0.2",
-                "acorn": "^8.4.1",
-                "acorn-walk": "^8.1.1",
-                "arg": "^4.1.0",
-                "create-require": "^1.1.0",
-                "diff": "^4.0.1",
-                "make-error": "^1.1.1",
-                "v8-compile-cache-lib": "^3.0.0",
-                "yn": "3.1.1"
-            },
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/util-middleware": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
             "dependencies": {
-                "@cspotcode/source-map-support": {
-                    "version": "0.7.0",
-                    "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz",
-                    "integrity": "sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==",
-                    "dev": true,
-                    "requires": {
-                        "@cspotcode/source-map-consumer": "0.8.0"
-                    }
-                },
-                "diff": {
-                    "version": "4.0.2",
-                    "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-                    "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-                    "dev": true
-                }
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "tslib": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-            "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
-        },
-        "tsutils": {
-            "version": "3.21.0",
-            "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-            "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-            "dev": true,
-            "requires": {
-                "tslib": "^1.8.1"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/util-retry": {
+            "version": "4.0.1",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/service-error-classification": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
             },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/util-stream": {
+            "version": "4.1.2",
+            "license": "Apache-2.0",
             "dependencies": {
-                "tslib": {
-                    "version": "1.14.1",
-                    "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-                    "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-                    "dev": true
-                }
+                "@smithy/fetch-http-handler": "^5.0.1",
+                "@smithy/node-http-handler": "^4.0.3",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "ttf2eot": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/ttf2eot/-/ttf2eot-2.0.0.tgz",
-            "integrity": "sha512-U56aG2Ylw7psLOmakjemAzmpqVgeadwENg9oaDjaZG5NYX4WB6+7h74bNPcc+0BXsoU5A/XWiHabDXyzFOmsxQ==",
-            "dev": true,
-            "requires": {
-                "argparse": "^1.0.6",
-                "microbuffer": "^1.0.0"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/util-uri-escape": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
             },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@smithy/util-utf8": {
+            "version": "4.0.0",
+            "license": "Apache-2.0",
             "dependencies": {
-                "argparse": {
-                    "version": "1.0.10",
-                    "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-                    "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-                    "dev": true,
-                    "requires": {
-                        "sprintf-js": "~1.0.2"
-                    }
-                }
+                "@smithy/util-buffer-from": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
             }
         },
-        "ttf2woff": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/ttf2woff/-/ttf2woff-2.0.2.tgz",
-            "integrity": "sha512-X68badwBjAy/+itU49scLjXUL094up+rHuYk+YAOTTBYSUMOmLZ7VyhZJuqQESj1gnyLAC2/5V8Euv+mExmyPA==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@tsconfig/node18": {
+            "version": "18.2.4",
             "dev": true,
-            "requires": {
-                "argparse": "^1.0.6",
-                "microbuffer": "^1.0.0",
-                "pako": "^1.0.0"
-            },
+            "license": "MIT"
+        },
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@types/node": {
+            "version": "18.19.80",
+            "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "argparse": {
-                    "version": "1.0.10",
-                    "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-                    "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-                    "dev": true,
-                    "requires": {
-                        "sprintf-js": "~1.0.2"
-                    }
-                }
+                "undici-types": "~5.26.4"
             }
         },
-        "tunnel": {
-            "version": "0.0.6",
-            "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
-            "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
-            "dev": true
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/@types/uuid": {
+            "version": "9.0.8",
+            "license": "MIT"
         },
-        "tunnel-agent": {
-            "version": "0.6.0",
-            "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-            "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/ansi-regex": {
+            "version": "5.0.1",
             "dev": true,
-            "requires": {
-                "safe-buffer": "^5.0.1"
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
             }
         },
-        "type": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-            "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
-            "dev": true
-        },
-        "type-check": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-            "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/ansi-styles": {
+            "version": "4.3.0",
             "dev": true,
-            "requires": {
-                "prelude-ls": "^1.2.1"
+            "license": "MIT",
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
             }
         },
-        "type-detect": {
-            "version": "4.0.8",
-            "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-            "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-            "dev": true
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/balanced-match": {
+            "version": "1.0.2",
+            "dev": true,
+            "license": "MIT"
         },
-        "type-fest": {
-            "version": "0.8.1",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-            "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-            "dev": true
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/bowser": {
+            "version": "2.11.0",
+            "license": "MIT"
         },
-        "type-is": {
-            "version": "1.6.18",
-            "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-            "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/brace-expansion": {
+            "version": "1.1.11",
             "dev": true,
-            "requires": {
-                "media-typer": "0.3.0",
-                "mime-types": "~2.1.24"
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
             }
         },
-        "typed-rest-client": {
-            "version": "1.8.6",
-            "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.8.6.tgz",
-            "integrity": "sha512-xcQpTEAJw2DP7GqVNECh4dD+riS+C1qndXLfBCJ3xk0kqprtGN491P5KlmrDbKdtuW8NEcP/5ChxiJI3S9WYTA==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/chalk": {
+            "version": "4.1.2",
             "dev": true,
-            "requires": {
-                "qs": "^6.9.1",
-                "tunnel": "0.0.6",
-                "underscore": "^1.12.1"
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "typedarray-to-buffer": {
-            "version": "3.1.5",
-            "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-            "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/chalk/node_modules/supports-color": {
+            "version": "7.2.0",
             "dev": true,
-            "requires": {
-                "is-typedarray": "^1.0.0"
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
             }
         },
-        "typescript": {
-            "version": "4.8.4",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
-            "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ=="
-        },
-        "uc.micro": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
-            "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
-            "dev": true
-        },
-        "umd-compat-loader": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/umd-compat-loader/-/umd-compat-loader-2.1.2.tgz",
-            "integrity": "sha512-RkTlsfrCxUISWqiTtYFFJank7b2Hhl4V2pc29nl0xOEGvvuVkpy1xnufhXfTituxgpW0HSrDk0JHlvPYZxEXKQ==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/cliui": {
+            "version": "7.0.4",
             "dev": true,
-            "requires": {
-                "ast-types": "^0.9.2",
-                "loader-utils": "^1.0.3",
-                "recast": "^0.11.17"
-            },
+            "license": "ISC",
             "dependencies": {
-                "json5": {
-                    "version": "1.0.2",
-                    "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-                    "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-                    "dev": true,
-                    "requires": {
-                        "minimist": "^1.2.0"
-                    }
-                },
-                "loader-utils": {
-                    "version": "1.4.2",
-                    "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
-                    "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-                    "dev": true,
-                    "requires": {
-                        "big.js": "^5.2.2",
-                        "emojis-list": "^3.0.0",
-                        "json5": "^1.0.1"
-                    }
-                }
+                "string-width": "^4.2.0",
+                "strip-ansi": "^6.0.0",
+                "wrap-ansi": "^7.0.0"
             }
         },
-        "unbox-primitive": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-            "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-            "requires": {
-                "call-bind": "^1.0.2",
-                "has-bigints": "^1.0.2",
-                "has-symbols": "^1.0.3",
-                "which-boxed-primitive": "^1.0.2"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/color-convert": {
+            "version": "2.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
             }
         },
-        "underscore": {
-            "version": "1.13.1",
-            "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
-            "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==",
-            "dev": true
-        },
-        "universalify": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-            "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/color-name": {
+            "version": "1.1.4",
+            "dev": true,
+            "license": "MIT"
         },
-        "unpipe": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-            "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
-            "dev": true
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/concat-map": {
+            "version": "0.0.1",
+            "dev": true,
+            "license": "MIT"
         },
-        "unzipper": {
-            "version": "0.10.11",
-            "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.10.11.tgz",
-            "integrity": "sha512-+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw==",
-            "dev": true,
-            "requires": {
-                "big-integer": "^1.6.17",
-                "binary": "~0.3.0",
-                "bluebird": "~3.4.1",
-                "buffer-indexof-polyfill": "~1.0.0",
-                "duplexer2": "~0.1.4",
-                "fstream": "^1.0.12",
-                "graceful-fs": "^4.2.2",
-                "listenercount": "~1.0.1",
-                "readable-stream": "~2.3.6",
-                "setimmediate": "~1.0.4"
-            },
-            "dependencies": {
-                "readable-stream": {
-                    "version": "2.3.7",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-                    "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-                    "dev": true,
-                    "requires": {
-                        "core-util-is": "~1.0.0",
-                        "inherits": "~2.0.3",
-                        "isarray": "~1.0.0",
-                        "process-nextick-args": "~2.0.0",
-                        "safe-buffer": "~5.1.1",
-                        "string_decoder": "~1.1.1",
-                        "util-deprecate": "~1.0.1"
-                    }
-                },
-                "safe-buffer": {
-                    "version": "5.1.2",
-                    "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-                    "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-                    "dev": true
-                },
-                "string_decoder": {
-                    "version": "1.1.1",
-                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-                    "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-                    "dev": true,
-                    "requires": {
-                        "safe-buffer": "~5.1.0"
-                    }
-                }
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/concurrently": {
+            "version": "7.0.0",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "chalk": "^4.1.0",
+                "date-fns": "^2.16.1",
+                "lodash": "^4.17.21",
+                "rxjs": "^6.6.3",
+                "spawn-command": "^0.0.2-1",
+                "supports-color": "^8.1.0",
+                "tree-kill": "^1.2.2",
+                "yargs": "^16.2.0"
+            },
+            "bin": {
+                "concurrently": "dist/bin/concurrently.js"
+            },
+            "engines": {
+                "node": "^12.20.0 || ^14.13.0 || >=16.0.0"
             }
         },
-        "uri-js": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-            "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/date-fns": {
+            "version": "2.30.0",
             "dev": true,
-            "requires": {
-                "punycode": "^2.1.0"
+            "license": "MIT",
+            "dependencies": {
+                "@babel/runtime": "^7.21.0"
+            },
+            "engines": {
+                "node": ">=0.11"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/date-fns"
             }
         },
-        "url": {
-            "version": "0.10.3",
-            "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
-            "integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=",
-            "requires": {
-                "punycode": "1.3.2",
-                "querystring": "0.2.0"
-            },
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/downlevel-dts": {
+            "version": "0.10.1",
+            "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "punycode": {
-                    "version": "1.3.2",
-                    "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-                    "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
-                }
+                "semver": "^7.3.2",
+                "shelljs": "^0.8.3",
+                "typescript": "next"
+            },
+            "bin": {
+                "downlevel-dts": "index.js"
             }
         },
-        "url-join": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
-            "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==",
-            "dev": true
-        },
-        "util": {
-            "version": "0.12.4",
-            "resolved": "https://registry.npmjs.org/util/-/util-0.12.4.tgz",
-            "integrity": "sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==",
-            "requires": {
-                "inherits": "^2.0.3",
-                "is-arguments": "^1.0.4",
-                "is-generator-function": "^1.0.7",
-                "is-typed-array": "^1.1.3",
-                "safe-buffer": "^5.1.2",
-                "which-typed-array": "^1.1.2"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/downlevel-dts/node_modules/typescript": {
+            "version": "5.9.0-dev.20250324",
+            "dev": true,
+            "license": "Apache-2.0",
+            "bin": {
+                "tsc": "bin/tsc",
+                "tsserver": "bin/tsserver"
+            },
+            "engines": {
+                "node": ">=14.17"
             }
         },
-        "util-deprecate": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-            "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-        },
-        "utils-merge": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-            "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
-            "dev": true
-        },
-        "uuid": {
-            "version": "8.3.2",
-            "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-            "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-        },
-        "v8-compile-cache-lib": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.0.tgz",
-            "integrity": "sha512-mpSYqfsFvASnSn5qMiwrr4VKfumbPyONLCOPmsR3A6pTY/r0+tSaVbgPWSAIuzbk3lCTa+FForeTiO+wBQGkjA==",
-            "dev": true
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "dev": true,
+            "license": "MIT"
         },
-        "validate-npm-package-license": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-            "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/escalade": {
+            "version": "3.2.0",
             "dev": true,
-            "requires": {
-                "spdx-correct": "^3.0.0",
-                "spdx-expression-parse": "^3.0.0"
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
             }
         },
-        "varstream": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/varstream/-/varstream-0.3.2.tgz",
-            "integrity": "sha512-OpR3Usr9dGZZbDttlTxdviGdxiURI0prX68+DuaN/JfIDbK9ZOmREKM6PgmelsejMnhgjXmEEEgf+E4NbsSqMg==",
-            "dev": true,
-            "requires": {
-                "readable-stream": "^1.0.33"
-            },
-            "dependencies": {
-                "isarray": {
-                    "version": "0.0.1",
-                    "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-                    "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==",
-                    "dev": true
-                },
-                "readable-stream": {
-                    "version": "1.1.14",
-                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-                    "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-                    "dev": true,
-                    "requires": {
-                        "core-util-is": "~1.0.0",
-                        "inherits": "~2.0.1",
-                        "isarray": "0.0.1",
-                        "string_decoder": "~0.10.x"
-                    }
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/fast-xml-parser": {
+            "version": "4.4.1",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/NaturalIntelligence"
                 },
-                "string_decoder": {
-                    "version": "0.10.31",
-                    "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-                    "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
-                    "dev": true
+                {
+                    "type": "paypal",
+                    "url": "https://paypal.me/naturalintelligence"
                 }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "strnum": "^1.0.5"
+            },
+            "bin": {
+                "fxparser": "src/cli/cli.js"
             }
         },
-        "vary": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-            "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
-            "dev": true
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/fs.realpath": {
+            "version": "1.0.0",
+            "dev": true,
+            "license": "ISC"
         },
-        "vinyl": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
-            "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/function-bind": {
+            "version": "1.1.2",
             "dev": true,
-            "requires": {
-                "clone": "^2.1.1",
-                "clone-buffer": "^1.0.0",
-                "clone-stats": "^1.0.0",
-                "cloneable-readable": "^1.0.0",
-                "remove-trailing-separator": "^1.0.1",
-                "replace-ext": "^1.0.0"
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "vsce": {
-            "version": "2.6.7",
-            "resolved": "https://registry.npmjs.org/vsce/-/vsce-2.6.7.tgz",
-            "integrity": "sha512-5dEtdi/yzWQbOU7JDUSOs8lmSzzkewBR5P122BUkmXE6A/DEdFsKNsg2773NGXJTwwF1MfsOgUR6QVF3cLLJNQ==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/get-caller-file": {
+            "version": "2.0.5",
             "dev": true,
-            "requires": {
-                "azure-devops-node-api": "^11.0.1",
-                "chalk": "^2.4.2",
-                "cheerio": "^1.0.0-rc.9",
-                "commander": "^6.1.0",
-                "glob": "^7.0.6",
-                "hosted-git-info": "^4.0.2",
-                "keytar": "^7.7.0",
-                "leven": "^3.1.0",
-                "markdown-it": "^12.3.2",
-                "mime": "^1.3.4",
-                "minimatch": "^3.0.3",
-                "parse-semver": "^1.1.1",
-                "read": "^1.0.7",
-                "semver": "^5.1.0",
-                "tmp": "^0.2.1",
-                "typed-rest-client": "^1.8.4",
-                "url-join": "^4.0.1",
-                "xml2js": "^0.4.23",
-                "yauzl": "^2.3.1",
-                "yazl": "^2.2.2"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "3.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^1.9.0"
-                    }
-                },
-                "chalk": {
-                    "version": "2.4.2",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-                    "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^3.2.1",
-                        "escape-string-regexp": "^1.0.5",
-                        "supports-color": "^5.3.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "1.9.3",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-                    "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "1.1.3"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.3",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-                    "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-                    "dev": true
-                },
-                "escape-string-regexp": {
-                    "version": "1.0.5",
-                    "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-                    "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-                    "dev": true
-                },
-                "has-flag": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-                    "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-                    "dev": true
-                },
-                "semver": {
-                    "version": "5.7.1",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-                    "dev": true
-                },
-                "supports-color": {
-                    "version": "5.5.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-                    "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "^3.0.0"
-                    }
-                }
+            "license": "ISC",
+            "engines": {
+                "node": "6.* || 8.* || >= 10.*"
             }
         },
-        "vscode-json-languageservice": {
-            "version": "3.4.9",
-            "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.4.9.tgz",
-            "integrity": "sha512-4VCpZ9ooea/Zc/MTnj1ccc9C7rqcoinKVQLhLoi6jw6yueSf4y4tg/YIUiPPVMlEAG7ZCPS+NVmqxisQ+mOsSw==",
-            "requires": {
-                "jsonc-parser": "^2.2.0",
-                "vscode-languageserver-textdocument": "^1.0.0-next.4",
-                "vscode-languageserver-types": "^3.15.0-next.6",
-                "vscode-nls": "^4.1.1",
-                "vscode-uri": "^2.1.0"
-            },
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/glob": {
+            "version": "7.2.3",
+            "dev": true,
+            "license": "ISC",
             "dependencies": {
-                "jsonc-parser": {
-                    "version": "2.3.1",
-                    "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz",
-                    "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg=="
-                },
-                "vscode-nls": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.2.tgz",
-                    "integrity": "sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw=="
-                }
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
             }
         },
-        "vscode-jsonrpc": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz",
-            "integrity": "sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A=="
-        },
-        "vscode-languageclient": {
-            "version": "6.1.4",
-            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.4.tgz",
-            "integrity": "sha512-EUOU+bJu6axmt0RFNo3nrglQLPXMfanbYViJee3Fbn2VuQoX0ZOI4uTYhSRvYLP2vfwTP/juV62P/mksCdTZMA==",
-            "requires": {
-                "semver": "^6.3.0",
-                "vscode-languageserver-protocol": "3.15.3"
-            },
-            "dependencies": {
-                "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
-                }
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/has-flag": {
+            "version": "4.0.0",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
             }
         },
-        "vscode-languageserver": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.1.1.tgz",
-            "integrity": "sha512-DueEpkUAkD5XTR4MLYNr6bQIp/UFR0/IPApgXU3YfCBCB08u2sm9hRCs6DxYZELkk++STPjpcjksR2H8qI3cDQ==",
-            "requires": {
-                "vscode-languageserver-protocol": "^3.15.3"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/hasown": {
+            "version": "2.0.2",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "function-bind": "^1.1.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
             }
         },
-        "vscode-languageserver-protocol": {
-            "version": "3.15.3",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.3.tgz",
-            "integrity": "sha512-zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw==",
-            "requires": {
-                "vscode-jsonrpc": "^5.0.1",
-                "vscode-languageserver-types": "3.15.1"
-            },
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/inflight": {
+            "version": "1.0.6",
+            "dev": true,
+            "license": "ISC",
             "dependencies": {
-                "vscode-languageserver-types": {
-                    "version": "3.15.1",
-                    "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz",
-                    "integrity": "sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="
-                }
+                "once": "^1.3.0",
+                "wrappy": "1"
             }
         },
-        "vscode-languageserver-textdocument": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.3.tgz",
-            "integrity": "sha512-ynEGytvgTb6HVSUwPJIAZgiHQmPCx8bZ8w5um5Lz+q5DjP0Zj8wTFhQpyg8xaMvefDytw2+HH5yzqS+FhsR28A=="
-        },
-        "vscode-languageserver-types": {
-            "version": "3.16.0",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz",
-            "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA=="
-        },
-        "vscode-nls": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.0.tgz",
-            "integrity": "sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA=="
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/inherits": {
+            "version": "2.0.4",
+            "dev": true,
+            "license": "ISC"
         },
-        "vscode-nls-dev": {
-            "version": "3.3.2",
-            "resolved": "https://registry.npmjs.org/vscode-nls-dev/-/vscode-nls-dev-3.3.2.tgz",
-            "integrity": "sha512-/YJY/LegZ0jsWFd8BforDmXpwWKprM7L3rL0kLEvjQxOJw6qtmnoUJorLIv0ZXjebeyhI3mc8hjmQr479ykLIQ==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/interpret": {
+            "version": "1.4.0",
             "dev": true,
-            "requires": {
-                "ansi-colors": "^3.2.3",
-                "clone": "^2.1.1",
-                "event-stream": "^3.3.4",
-                "fancy-log": "^1.3.3",
-                "glob": "^7.1.2",
-                "iconv-lite": "^0.4.19",
-                "is": "^3.2.1",
-                "source-map": "^0.6.1",
-                "typescript": "^3.9.5",
-                "vinyl": "^2.1.0",
-                "xml2js": "^0.4.19",
-                "yargs": "^13.2.4"
-            },
-            "dependencies": {
-                "ansi-colors": {
-                    "version": "3.2.4",
-                    "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
-                    "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
-                    "dev": true
-                },
-                "ansi-styles": {
-                    "version": "3.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "^1.9.0"
-                    }
-                },
-                "camelcase": {
-                    "version": "5.3.1",
-                    "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-                    "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-                    "dev": true
-                },
-                "cliui": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-                    "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-                    "dev": true,
-                    "requires": {
-                        "string-width": "^3.1.0",
-                        "strip-ansi": "^5.2.0",
-                        "wrap-ansi": "^5.1.0"
-                    }
-                },
-                "color-convert": {
-                    "version": "1.9.3",
-                    "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-                    "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-                    "dev": true,
-                    "requires": {
-                        "color-name": "1.1.3"
-                    }
-                },
-                "color-name": {
-                    "version": "1.1.3",
-                    "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-                    "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-                    "dev": true
-                },
-                "decamelize": {
-                    "version": "1.2.0",
-                    "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-                    "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-                    "dev": true
-                },
-                "emoji-regex": {
-                    "version": "7.0.3",
-                    "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-                    "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-                    "dev": true
-                },
-                "find-up": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-                    "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-                    "dev": true,
-                    "requires": {
-                        "locate-path": "^3.0.0"
-                    }
-                },
-                "is-fullwidth-code-point": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-                    "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-                    "dev": true
-                },
-                "locate-path": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-                    "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-                    "dev": true,
-                    "requires": {
-                        "p-locate": "^3.0.0",
-                        "path-exists": "^3.0.0"
-                    }
-                },
-                "p-limit": {
-                    "version": "2.3.0",
-                    "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-                    "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-                    "dev": true,
-                    "requires": {
-                        "p-try": "^2.0.0"
-                    }
-                },
-                "p-locate": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-                    "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-                    "dev": true,
-                    "requires": {
-                        "p-limit": "^2.0.0"
-                    }
-                },
-                "path-exists": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-                    "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-                    "dev": true
-                },
-                "string-width": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-                    "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-                    "dev": true,
-                    "requires": {
-                        "emoji-regex": "^7.0.1",
-                        "is-fullwidth-code-point": "^2.0.0",
-                        "strip-ansi": "^5.1.0"
-                    }
-                },
-                "typescript": {
-                    "version": "3.9.10",
-                    "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
-                    "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==",
-                    "dev": true
-                },
-                "wrap-ansi": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-                    "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "^3.2.0",
-                        "string-width": "^3.0.0",
-                        "strip-ansi": "^5.0.0"
-                    }
-                },
-                "y18n": {
-                    "version": "4.0.3",
-                    "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-                    "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-                    "dev": true
-                },
-                "yargs": {
-                    "version": "13.3.2",
-                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-                    "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
-                    "dev": true,
-                    "requires": {
-                        "cliui": "^5.0.0",
-                        "find-up": "^3.0.0",
-                        "get-caller-file": "^2.0.1",
-                        "require-directory": "^2.1.1",
-                        "require-main-filename": "^2.0.0",
-                        "set-blocking": "^2.0.0",
-                        "string-width": "^3.0.0",
-                        "which-module": "^2.0.0",
-                        "y18n": "^4.0.0",
-                        "yargs-parser": "^13.1.2"
-                    }
-                },
-                "yargs-parser": {
-                    "version": "13.1.2",
-                    "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-                    "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-                    "dev": true,
-                    "requires": {
-                        "camelcase": "^5.0.0",
-                        "decamelize": "^1.2.0"
-                    }
-                }
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.10"
             }
         },
-        "vscode-uri": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-2.1.2.tgz",
-            "integrity": "sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A=="
-        },
-        "vue": {
-            "version": "3.2.31",
-            "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.31.tgz",
-            "integrity": "sha512-odT3W2tcffTiQCy57nOT93INw1auq5lYLLYtWpPYQQYQOOdHiqFct9Xhna6GJ+pJQaF67yZABraH47oywkJgFw==",
-            "requires": {
-                "@vue/compiler-dom": "3.2.31",
-                "@vue/compiler-sfc": "3.2.31",
-                "@vue/runtime-dom": "3.2.31",
-                "@vue/server-renderer": "3.2.31",
-                "@vue/shared": "3.2.31"
-            },
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/is-core-module": {
+            "version": "2.16.1",
+            "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "@vue/compiler-sfc": {
-                    "version": "3.2.31",
-                    "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.31.tgz",
-                    "integrity": "sha512-748adc9msSPGzXgibHiO6T7RWgfnDcVQD+VVwYgSsyyY8Ans64tALHZANrKtOzvkwznV/F4H7OAod/jIlp/dkQ==",
-                    "requires": {
-                        "@babel/parser": "^7.16.4",
-                        "@vue/compiler-core": "3.2.31",
-                        "@vue/compiler-dom": "3.2.31",
-                        "@vue/compiler-ssr": "3.2.31",
-                        "@vue/reactivity-transform": "3.2.31",
-                        "@vue/shared": "3.2.31",
-                        "estree-walker": "^2.0.2",
-                        "magic-string": "^0.25.7",
-                        "postcss": "^8.1.10",
-                        "source-map": "^0.6.1"
-                    }
-                },
-                "@vue/reactivity-transform": {
-                    "version": "3.2.31",
-                    "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.31.tgz",
-                    "integrity": "sha512-uS4l4z/W7wXdI+Va5pgVxBJ345wyGFKvpPYtdSgvfJfX/x2Ymm6ophQlXXB6acqGHtXuBqNyyO3zVp9b1r0MOA==",
-                    "requires": {
-                        "@babel/parser": "^7.16.4",
-                        "@vue/compiler-core": "3.2.31",
-                        "@vue/shared": "3.2.31",
-                        "estree-walker": "^2.0.2",
-                        "magic-string": "^0.25.7"
-                    }
-                }
+                "hasown": "^2.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "vue-loader": {
-            "version": "16.8.1",
-            "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.1.tgz",
-            "integrity": "sha512-V53TJbHmzjBhCG5OYI2JWy/aYDspz4oVHKxS43Iy212GjGIG1T3EsB3+GWXFm/1z5VwjdjLmdZUFYM70y77vtQ==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/is-fullwidth-code-point": {
+            "version": "3.0.0",
             "dev": true,
-            "requires": {
-                "chalk": "^4.1.0",
-                "hash-sum": "^2.0.0",
-                "loader-utils": "^2.0.0"
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
             }
         },
-        "vue-style-loader": {
-            "version": "4.1.3",
-            "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
-            "integrity": "sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/lodash": {
+            "version": "4.17.21",
             "dev": true,
-            "requires": {
-                "hash-sum": "^1.0.2",
-                "loader-utils": "^1.0.2"
-            },
+            "license": "MIT"
+        },
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/minimatch": {
+            "version": "3.1.2",
+            "dev": true,
+            "license": "ISC",
             "dependencies": {
-                "hash-sum": {
-                    "version": "1.0.2",
-                    "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
-                    "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=",
-                    "dev": true
-                },
-                "json5": {
-                    "version": "1.0.2",
-                    "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-                    "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-                    "dev": true,
-                    "requires": {
-                        "minimist": "^1.2.0"
-                    }
-                },
-                "loader-utils": {
-                    "version": "1.4.2",
-                    "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
-                    "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-                    "dev": true,
-                    "requires": {
-                        "big.js": "^5.2.2",
-                        "emojis-list": "^3.0.0",
-                        "json5": "^1.0.1"
-                    }
-                }
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
             }
         },
-        "watchpack": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz",
-            "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/once": {
+            "version": "1.4.0",
             "dev": true,
-            "requires": {
-                "glob-to-regexp": "^0.4.1",
-                "graceful-fs": "^4.1.2"
+            "license": "ISC",
+            "dependencies": {
+                "wrappy": "1"
             }
         },
-        "wawoff2": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/wawoff2/-/wawoff2-2.0.1.tgz",
-            "integrity": "sha512-r0CEmvpH63r4T15ebFqeOjGqU4+EgTx4I510NtK35EMciSdcTxCw3Byy3JnBonz7iyIFZ0AbVo0bbFpEVuhCYA==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/path-is-absolute": {
+            "version": "1.0.1",
             "dev": true,
-            "requires": {
-                "argparse": "^2.0.1"
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
             }
         },
-        "wbuf": {
-            "version": "1.7.3",
-            "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-            "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/path-parse": {
+            "version": "1.0.7",
             "dev": true,
-            "requires": {
-                "minimalistic-assert": "^1.0.0"
-            }
+            "license": "MIT"
         },
-        "webfont": {
-            "version": "11.2.26",
-            "resolved": "https://registry.npmjs.org/webfont/-/webfont-11.2.26.tgz",
-            "integrity": "sha512-ms9abzcJGMBj5yVTpNfAcyQB0SNzmi10aBlKLC7kAt1TQ5eZqieRhvhxN1BrXaizWV0nksp6vLqBfaJmBWmF7Q==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/rechoir": {
+            "version": "0.6.2",
             "dev": true,
-            "requires": {
-                "cosmiconfig": "^5.2.0",
-                "deepmerge": "^4.2.2",
-                "globby": "^11.0.0",
-                "meow": "^9.0.0",
-                "nunjucks": "^3.2.3",
-                "p-limit": "^3.1.0",
-                "parse-json": "^5.2.0",
-                "resolve-from": "^5.0.0",
-                "svg2ttf": "^6.0.2",
-                "svgicons2svgfont": "^10.0.3",
-                "ttf2eot": "^2.0.0",
-                "ttf2woff": "^2.0.2",
-                "wawoff2": "^2.0.0",
-                "xml2js": "^0.4.23"
-            },
             "dependencies": {
-                "resolve-from": {
-                    "version": "5.0.0",
-                    "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-                    "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-                    "dev": true
-                }
+                "resolve": "^1.1.6"
+            },
+            "engines": {
+                "node": ">= 0.10"
             }
         },
-        "webpack": {
-            "version": "5.65.0",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.65.0.tgz",
-            "integrity": "sha512-Q5or2o6EKs7+oKmJo7LaqZaMOlDWQse9Tm5l1WAfU/ujLGN5Pb0SqGeVkN/4bpPmEqEP5RnVhiqsOtWtUVwGRw==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/regenerator-runtime": {
+            "version": "0.14.1",
             "dev": true,
-            "requires": {
-                "@types/eslint-scope": "^3.7.0",
-                "@types/estree": "^0.0.50",
-                "@webassemblyjs/ast": "1.11.1",
-                "@webassemblyjs/wasm-edit": "1.11.1",
-                "@webassemblyjs/wasm-parser": "1.11.1",
-                "acorn": "^8.4.1",
-                "acorn-import-assertions": "^1.7.6",
-                "browserslist": "^4.14.5",
-                "chrome-trace-event": "^1.0.2",
-                "enhanced-resolve": "^5.8.3",
-                "es-module-lexer": "^0.9.0",
-                "eslint-scope": "5.1.1",
-                "events": "^3.2.0",
-                "glob-to-regexp": "^0.4.1",
-                "graceful-fs": "^4.2.4",
-                "json-parse-better-errors": "^1.0.2",
-                "loader-runner": "^4.2.0",
-                "mime-types": "^2.1.27",
-                "neo-async": "^2.6.2",
-                "schema-utils": "^3.1.0",
-                "tapable": "^2.1.1",
-                "terser-webpack-plugin": "^5.1.3",
-                "watchpack": "^2.3.1",
-                "webpack-sources": "^3.2.2"
-            },
-            "dependencies": {
-                "acorn-import-assertions": {
-                    "version": "1.8.0",
-                    "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
-                    "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-                    "dev": true,
-                    "requires": {}
-                },
-                "events": {
-                    "version": "3.3.0",
-                    "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-                    "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-                    "dev": true
-                },
-                "webpack-sources": {
-                    "version": "3.2.2",
-                    "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.2.tgz",
-                    "integrity": "sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw==",
-                    "dev": true
-                }
+            "license": "MIT"
+        },
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/require-directory": {
+            "version": "2.1.1",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
             }
         },
-        "webpack-cli": {
-            "version": "4.9.1",
-            "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.1.tgz",
-            "integrity": "sha512-JYRFVuyFpzDxMDB+v/nanUdQYcZtqFPGzmlW4s+UkPMFhSpfRNmf1z4AwYcHJVdvEFAM7FFCQdNTpsBYhDLusQ==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/resolve": {
+            "version": "1.22.10",
             "dev": true,
-            "requires": {
-                "@discoveryjs/json-ext": "^0.5.0",
-                "@webpack-cli/configtest": "^1.1.0",
-                "@webpack-cli/info": "^1.4.0",
-                "@webpack-cli/serve": "^1.6.0",
-                "colorette": "^2.0.14",
-                "commander": "^7.0.0",
-                "execa": "^5.0.0",
-                "fastest-levenshtein": "^1.0.12",
-                "import-local": "^3.0.2",
-                "interpret": "^2.2.0",
-                "rechoir": "^0.7.0",
-                "webpack-merge": "^5.7.3"
-            },
+            "license": "MIT",
             "dependencies": {
-                "commander": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-                    "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-                    "dev": true
-                },
-                "execa": {
-                    "version": "5.1.1",
-                    "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-                    "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-                    "dev": true,
-                    "requires": {
-                        "cross-spawn": "^7.0.3",
-                        "get-stream": "^6.0.0",
-                        "human-signals": "^2.1.0",
-                        "is-stream": "^2.0.0",
-                        "merge-stream": "^2.0.0",
-                        "npm-run-path": "^4.0.1",
-                        "onetime": "^5.1.2",
-                        "signal-exit": "^3.0.3",
-                        "strip-final-newline": "^2.0.0"
-                    }
-                },
-                "get-stream": {
-                    "version": "6.0.1",
-                    "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-                    "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-                    "dev": true
-                },
-                "human-signals": {
-                    "version": "2.1.0",
-                    "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-                    "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-                    "dev": true
-                }
+                "is-core-module": "^2.16.0",
+                "path-parse": "^1.0.7",
+                "supports-preserve-symlinks-flag": "^1.0.0"
+            },
+            "bin": {
+                "resolve": "bin/resolve"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "webpack-dev-middleware": {
-            "version": "5.3.3",
-            "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
-            "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/rimraf": {
+            "version": "3.0.2",
             "dev": true,
-            "requires": {
-                "colorette": "^2.0.10",
-                "memfs": "^3.4.3",
-                "mime-types": "^2.1.31",
-                "range-parser": "^1.2.1",
-                "schema-utils": "^4.0.0"
-            },
+            "license": "ISC",
             "dependencies": {
-                "ajv": {
-                    "version": "8.11.0",
-                    "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-                    "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-                    "dev": true,
-                    "requires": {
-                        "fast-deep-equal": "^3.1.1",
-                        "json-schema-traverse": "^1.0.0",
-                        "require-from-string": "^2.0.2",
-                        "uri-js": "^4.2.2"
-                    }
-                },
-                "ajv-keywords": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-                    "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-                    "dev": true,
-                    "requires": {
-                        "fast-deep-equal": "^3.1.3"
-                    }
-                },
-                "json-schema-traverse": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-                    "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-                    "dev": true
-                },
-                "schema-utils": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-                    "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-                    "dev": true,
-                    "requires": {
-                        "@types/json-schema": "^7.0.9",
-                        "ajv": "^8.8.0",
-                        "ajv-formats": "^2.1.1",
-                        "ajv-keywords": "^5.0.0"
-                    }
-                }
+                "glob": "^7.1.3"
+            },
+            "bin": {
+                "rimraf": "bin.js"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
             }
         },
-        "webpack-dev-server": {
-            "version": "4.9.2",
-            "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.9.2.tgz",
-            "integrity": "sha512-H95Ns95dP24ZsEzO6G9iT+PNw4Q7ltll1GfJHV4fKphuHWgKFzGHWi4alTlTnpk1SPPk41X+l2RB7rLfIhnB9Q==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/rxjs": {
+            "version": "6.6.7",
             "dev": true,
-            "requires": {
-                "@types/bonjour": "^3.5.9",
-                "@types/connect-history-api-fallback": "^1.3.5",
-                "@types/express": "^4.17.13",
-                "@types/serve-index": "^1.9.1",
-                "@types/serve-static": "^1.13.10",
-                "@types/sockjs": "^0.3.33",
-                "@types/ws": "^8.5.1",
-                "ansi-html-community": "^0.0.8",
-                "bonjour-service": "^1.0.11",
-                "chokidar": "^3.5.3",
-                "colorette": "^2.0.10",
-                "compression": "^1.7.4",
-                "connect-history-api-fallback": "^1.6.0",
-                "default-gateway": "^6.0.3",
-                "express": "^4.17.3",
-                "graceful-fs": "^4.2.6",
-                "html-entities": "^2.3.2",
-                "http-proxy-middleware": "^2.0.3",
-                "ipaddr.js": "^2.0.1",
-                "open": "^8.0.9",
-                "p-retry": "^4.5.0",
-                "rimraf": "^3.0.2",
-                "schema-utils": "^4.0.0",
-                "selfsigned": "^2.0.1",
-                "serve-index": "^1.9.1",
-                "sockjs": "^0.3.24",
-                "spdy": "^4.0.2",
-                "webpack-dev-middleware": "^5.3.1",
-                "ws": "^8.4.2"
-            },
+            "license": "Apache-2.0",
             "dependencies": {
-                "ajv": {
-                    "version": "8.8.2",
-                    "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz",
-                    "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==",
-                    "dev": true,
-                    "requires": {
-                        "fast-deep-equal": "^3.1.1",
-                        "json-schema-traverse": "^1.0.0",
-                        "require-from-string": "^2.0.2",
-                        "uri-js": "^4.2.2"
-                    }
-                },
-                "ajv-keywords": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-                    "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-                    "dev": true,
-                    "requires": {
-                        "fast-deep-equal": "^3.1.3"
-                    }
-                },
-                "json-schema-traverse": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-                    "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-                    "dev": true
-                },
-                "schema-utils": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-                    "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-                    "dev": true,
-                    "requires": {
-                        "@types/json-schema": "^7.0.9",
-                        "ajv": "^8.8.0",
-                        "ajv-formats": "^2.1.1",
-                        "ajv-keywords": "^5.0.0"
-                    }
-                }
+                "tslib": "^1.9.0"
+            },
+            "engines": {
+                "npm": ">=2.0.0"
             }
         },
-        "webpack-merge": {
-            "version": "5.8.0",
-            "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
-            "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/rxjs/node_modules/tslib": {
+            "version": "1.14.1",
             "dev": true,
-            "requires": {
-                "clone-deep": "^4.0.1",
-                "wildcard": "^2.0.0"
-            }
+            "license": "0BSD"
         },
-        "webpack-sources": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
-            "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/semver": {
+            "version": "7.7.1",
             "dev": true,
-            "requires": {
-                "source-list-map": "^2.0.1",
-                "source-map": "^0.6.1"
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
             }
         },
-        "websocket-driver": {
-            "version": "0.7.4",
-            "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-            "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/shelljs": {
+            "version": "0.8.5",
             "dev": true,
-            "requires": {
-                "http-parser-js": ">=0.5.1",
-                "safe-buffer": ">=5.1.0",
-                "websocket-extensions": ">=0.1.1"
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "glob": "^7.0.0",
+                "interpret": "^1.0.0",
+                "rechoir": "^0.6.2"
+            },
+            "bin": {
+                "shjs": "bin/shjs"
+            },
+            "engines": {
+                "node": ">=4"
             }
         },
-        "websocket-extensions": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-            "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/spawn-command": {
+            "version": "0.0.2",
             "dev": true
         },
-        "which": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-            "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-            "requires": {
-                "isexe": "^2.0.0"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/string-width": {
+            "version": "4.2.3",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
             }
         },
-        "which-boxed-primitive": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-            "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-            "requires": {
-                "is-bigint": "^1.0.1",
-                "is-boolean-object": "^1.1.0",
-                "is-number-object": "^1.0.4",
-                "is-string": "^1.0.5",
-                "is-symbol": "^1.0.3"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
             }
         },
-        "which-module": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-            "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-            "dev": true
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/strnum": {
+            "version": "1.1.2",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/NaturalIntelligence"
+                }
+            ],
+            "license": "MIT"
         },
-        "which-typed-array": {
-            "version": "1.1.8",
-            "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz",
-            "integrity": "sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw==",
-            "requires": {
-                "available-typed-arrays": "^1.0.5",
-                "call-bind": "^1.0.2",
-                "es-abstract": "^1.20.0",
-                "for-each": "^0.3.3",
-                "has-tostringtag": "^1.0.0",
-                "is-typed-array": "^1.1.9"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/supports-color": {
+            "version": "8.1.1",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/supports-color?sponsor=1"
             }
         },
-        "wide-align": {
-            "version": "1.1.5",
-            "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
-            "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/supports-preserve-symlinks-flag": {
+            "version": "1.0.0",
             "dev": true,
-            "requires": {
-                "string-width": "^1.0.2 || 2 || 3 || 4"
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "wildcard": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
-            "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
-            "dev": true
-        },
-        "winston": {
-            "version": "3.7.1",
-            "resolved": "https://registry.npmjs.org/winston/-/winston-3.7.1.tgz",
-            "integrity": "sha512-qKLMQVWMOvY0h9H4BA8Sfh79+KdnKi8gsyCSvfQgc+6teSlq92j82WK+zAJc6fLbAA2jwQuqkANLpQeOFA4Kug==",
-            "requires": {
-                "@dabh/diagnostics": "^2.0.2",
-                "async": "^3.2.3",
-                "is-stream": "^2.0.0",
-                "logform": "^2.4.0",
-                "one-time": "^1.0.0",
-                "readable-stream": "^3.4.0",
-                "safe-stable-stringify": "^2.3.1",
-                "stack-trace": "0.0.x",
-                "triple-beam": "^1.3.0",
-                "winston-transport": "^4.5.0"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/tree-kill": {
+            "version": "1.2.2",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "tree-kill": "cli.js"
             }
         },
-        "winston-transport": {
-            "version": "4.5.0",
-            "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz",
-            "integrity": "sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q==",
-            "requires": {
-                "logform": "^2.3.2",
-                "readable-stream": "^3.6.0",
-                "triple-beam": "^1.3.0"
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/typescript": {
+            "version": "5.2.2",
+            "dev": true,
+            "license": "Apache-2.0",
+            "bin": {
+                "tsc": "bin/tsc",
+                "tsserver": "bin/tsserver"
+            },
+            "engines": {
+                "node": ">=14.17"
             }
         },
-        "word-wrap": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-            "dev": true
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/undici-types": {
+            "version": "5.26.5",
+            "dev": true,
+            "license": "MIT"
         },
-        "workerpool": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
-            "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==",
-            "dev": true
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/uuid": {
+            "version": "9.0.1",
+            "funding": [
+                "https://github.com/sponsors/broofa",
+                "https://github.com/sponsors/ctavan"
+            ],
+            "license": "MIT",
+            "bin": {
+                "uuid": "dist/bin/uuid"
+            }
         },
-        "wrap-ansi": {
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/wrap-ansi": {
             "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "ansi-styles": "^4.0.0",
                 "string-width": "^4.1.0",
                 "strip-ansi": "^6.0.0"
             },
-            "dependencies": {
-                "ansi-regex": {
-                    "version": "5.0.1",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-                    "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-                    "dev": true
-                },
-                "strip-ansi": {
-                    "version": "6.0.1",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-                    "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "^5.0.1"
-                    }
-                }
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
             }
         },
-        "wrappy": {
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/wrappy": {
             "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-        },
-        "write-file-atomic": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-            "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-            "dev": true,
-            "requires": {
-                "imurmurhash": "^0.1.4",
-                "is-typedarray": "^1.0.0",
-                "signal-exit": "^3.0.2",
-                "typedarray-to-buffer": "^3.1.5"
-            }
-        },
-        "ws": {
-            "version": "8.8.0",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz",
-            "integrity": "sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==",
             "dev": true,
-            "requires": {}
-        },
-        "xml": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz",
-            "integrity": "sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=",
-            "dev": true
-        },
-        "xml2js": {
-            "version": "0.4.23",
-            "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-            "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
-            "requires": {
-                "sax": ">=0.6.0",
-                "xmlbuilder": "~11.0.0"
-            }
-        },
-        "xmlbuilder": {
-            "version": "11.0.1",
-            "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
-            "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
+            "license": "ISC"
         },
-        "y18n": {
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/y18n": {
             "version": "5.0.8",
-            "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-            "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-            "dev": true
-        },
-        "yallist": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-        },
-        "yaml": {
-            "version": "1.10.2",
-            "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-            "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
-        },
-        "yaml-ast-parser-custom-tags": {
-            "version": "0.0.43",
-            "resolved": "https://registry.npmjs.org/yaml-ast-parser-custom-tags/-/yaml-ast-parser-custom-tags-0.0.43.tgz",
-            "integrity": "sha512-R5063FF/JSAN6qXCmylwjt9PcDH6M0ExEme/nJBzLspc6FJDmHHIqM7xh2WfEmsTJqClF79A9VkXjkAqmZw9SQ=="
-        },
-        "yaml-cfn": {
-            "version": "0.3.1",
-            "resolved": "https://registry.npmjs.org/yaml-cfn/-/yaml-cfn-0.3.1.tgz",
-            "integrity": "sha512-8uEuOFPZFI06cQA+E37oRd9zHEPZVpkVjrBjXxWSt0Hy8hil/KnCcskpR7jwx6ejzfejIi5uzaoQgHTl6qzaNw==",
-            "requires": {
-                "js-yaml": "^4.0.0"
-            }
-        },
-        "yaml-language-server": {
-            "version": "0.10.0",
-            "resolved": "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.10.0.tgz",
-            "integrity": "sha512-d2/7eGgonEIRcnW9kK+k+ERG4gTOk5BXHr9KjTVv8gEarXKa62Kk+nyFE4AXgMDZ0LXTu8nTuN/AdboJiGN+pQ==",
-            "requires": {
-                "js-yaml": "^3.13.1",
-                "jsonc-parser": "^2.2.1",
-                "prettier": "2.0.5",
-                "request-light": "^0.2.4",
-                "vscode-json-languageservice": "^3.6.0",
-                "vscode-languageserver": "^5.2.1",
-                "vscode-languageserver-types": "^3.15.1",
-                "vscode-nls": "^4.1.2",
-                "vscode-uri": "^2.1.1",
-                "yaml-ast-parser-custom-tags": "0.0.43"
-            },
-            "dependencies": {
-                "argparse": {
-                    "version": "1.0.10",
-                    "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-                    "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-                    "requires": {
-                        "sprintf-js": "~1.0.2"
-                    }
-                },
-                "js-yaml": {
-                    "version": "3.14.1",
-                    "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-                    "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-                    "requires": {
-                        "argparse": "^1.0.7",
-                        "esprima": "^4.0.0"
-                    }
-                },
-                "jsonc-parser": {
-                    "version": "2.3.1",
-                    "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz",
-                    "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg=="
-                },
-                "prettier": {
-                    "version": "2.0.5",
-                    "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz",
-                    "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==",
-                    "optional": true
-                },
-                "vscode-json-languageservice": {
-                    "version": "3.11.0",
-                    "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.11.0.tgz",
-                    "integrity": "sha512-QxI+qV97uD7HHOCjh3MrM1TfbdwmTXrMckri5Tus1/FQiG3baDZb2C9Y0y8QThs7PwHYBIQXcAc59ZveCRZKPA==",
-                    "requires": {
-                        "jsonc-parser": "^3.0.0",
-                        "vscode-languageserver-textdocument": "^1.0.1",
-                        "vscode-languageserver-types": "3.16.0-next.2",
-                        "vscode-nls": "^5.0.0",
-                        "vscode-uri": "^2.1.2"
-                    },
-                    "dependencies": {
-                        "jsonc-parser": {
-                            "version": "3.0.0",
-                            "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz",
-                            "integrity": "sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA=="
-                        },
-                        "vscode-languageserver-types": {
-                            "version": "3.16.0-next.2",
-                            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz",
-                            "integrity": "sha512-QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q=="
-                        },
-                        "vscode-nls": {
-                            "version": "5.0.0",
-                            "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.0.0.tgz",
-                            "integrity": "sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA=="
-                        }
-                    }
-                },
-                "vscode-jsonrpc": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz",
-                    "integrity": "sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg=="
-                },
-                "vscode-languageserver": {
-                    "version": "5.2.1",
-                    "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz",
-                    "integrity": "sha512-GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A==",
-                    "requires": {
-                        "vscode-languageserver-protocol": "3.14.1",
-                        "vscode-uri": "^1.0.6"
-                    },
-                    "dependencies": {
-                        "vscode-uri": {
-                            "version": "1.0.8",
-                            "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-1.0.8.tgz",
-                            "integrity": "sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ=="
-                        }
-                    }
-                },
-                "vscode-languageserver-protocol": {
-                    "version": "3.14.1",
-                    "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz",
-                    "integrity": "sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==",
-                    "requires": {
-                        "vscode-jsonrpc": "^4.0.0",
-                        "vscode-languageserver-types": "3.14.0"
-                    },
-                    "dependencies": {
-                        "vscode-languageserver-types": {
-                            "version": "3.14.0",
-                            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz",
-                            "integrity": "sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A=="
-                        }
-                    }
-                },
-                "vscode-nls": {
-                    "version": "4.1.2",
-                    "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-4.1.2.tgz",
-                    "integrity": "sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw=="
-                }
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=10"
             }
         },
-        "yargs": {
-            "version": "17.5.1",
-            "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
-            "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/yargs": {
+            "version": "16.2.0",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "cliui": "^7.0.2",
                 "escalade": "^3.1.1",
                 "get-caller-file": "^2.0.5",
                 "require-directory": "^2.1.1",
-                "string-width": "^4.2.3",
+                "string-width": "^4.2.0",
                 "y18n": "^5.0.5",
-                "yargs-parser": "^21.0.0"
+                "yargs-parser": "^20.2.2"
             },
-            "dependencies": {
-                "yargs-parser": {
-                    "version": "21.1.1",
-                    "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-                    "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-                    "dev": true
-                }
-            }
-        },
-        "yargs-parser": {
-            "version": "20.2.4",
-            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
-            "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
-            "dev": true
-        },
-        "yargs-unparser": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
-            "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
-            "dev": true,
-            "requires": {
-                "camelcase": "^6.0.0",
-                "decamelize": "^4.0.0",
-                "flat": "^5.0.2",
-                "is-plain-obj": "^2.1.0"
-            }
-        },
-        "yauzl": {
-            "version": "2.10.0",
-            "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-            "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
-            "dev": true,
-            "requires": {
-                "buffer-crc32": "~0.2.3",
-                "fd-slicer": "~1.1.0"
+            "engines": {
+                "node": ">=10"
             }
         },
-        "yazl": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz",
-            "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
+        "src.gen/@amzn/codewhisperer-streaming/node_modules/yargs-parser": {
+            "version": "20.2.9",
             "dev": true,
-            "requires": {
-                "buffer-crc32": "~0.2.3"
+            "license": "ISC",
+            "engines": {
+                "node": ">=10"
             }
-        },
-        "yn": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-            "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
-            "dev": true
-        },
-        "yocto-queue": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-            "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-            "dev": true
         }
     }
 }
diff --git a/package.json b/package.json
index 9b38eaef846..dd196da079f 100644
--- a/package.json
+++ b/package.json
@@ -1,3624 +1,13 @@
 {
-    "name": "aws-toolkit-vscode",
-    "displayName": "AWS Toolkit",
-    "description": "Amazon Web Services toolkit for browsing and updating cloud resources",
-    "version": "1.63.0-SNAPSHOT",
-    "extensionKind": [
-        "workspace"
+    "name": "root",
+    "workspaces": [
+        "packages/core/src/web",
+        "packages/*",
+        "plugins/*"
     ],
-    "publisher": "amazonwebservices",
+    "version": "0.0.1",
+    "private": true,
     "license": "Apache-2.0",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/aws/aws-toolkit-vscode"
-    },
-    "engines": {
-        "vscode": "^1.50.1"
-    },
-    "icon": "resources/marketplace/aws-icon-256x256.png",
-    "bugs": {
-        "url": "https://github.com/aws/aws-toolkit-vscode/issues"
-    },
-    "galleryBanner": {
-        "color": "#FF9900",
-        "theme": "light"
-    },
-    "categories": [
-        "Debuggers",
-        "Linters",
-        "Other"
-    ],
-    "keywords": [
-        "AWS",
-        "CodeCatalyst",
-        "CodeWhisperer",
-        "Lambda",
-        "Serverless"
-    ],
-    "preview": false,
-    "qna": "https://github.com/aws/aws-toolkit-vscode/issues",
-    "activationEvents": [
-        "onStartupFinished",
-        "onDebugResolve:aws-sam",
-        "onCommand:aws.login",
-        "onCommand:aws.credentials.profile.create",
-        "onCommand:aws.credentials.edit",
-        "onCommand:aws.logout",
-        "onCommand:aws.createIssueOnGitHub",
-        "onCommand:aws.submitFeedback",
-        "onCommand:aws.showRegion",
-        "onView:aws.explorer",
-        "onView:aws.codeWhisperer.securityPanel",
-        "onCommand:aws.deploySamApplication",
-        "onCommand:aws.samcli.detect",
-        "onCommand:aws.lambda.createNewSamApp",
-        "onDebugInitialConfigurations",
-        "onCommand:aws.viewLogs",
-        "onCommand:aws.quickStart",
-        "onCommand:aws.help",
-        "onCommand:aws.github",
-        "onCommand:aws.previewStateMachine",
-        "onCommand:aws.stepfunctions.createStateMachineFromTemplate",
-        "onCommand:aws.stepfunctions.publishStateMachine",
-        "onView:aws.developerTools",
-        "onCommand:aws.cdk.refresh",
-        "onCommand:aws.cdk.renderStateMachineGraph",
-        "onCommand:aws.aboutToolkit",
-        "onCommand:aws.cloudWatchLogs.viewLogStream",
-        "onCommand:aws.codecatalyst.listCommands",
-        "onCommand:aws.codecatalyst.openOrg",
-        "onCommand:aws.codecatalyst.openProject",
-        "onCommand:aws.codecatalyst.openRepo",
-        "onCommand:aws.codecatalyst.openDevEnv",
-        "onCommand:aws.codecatalyst.cloneRepo",
-        "onCommand:aws.codecatalyst.createDevEnv",
-        "onLanguage:asl",
-        "onLanguage:asl-yaml",
-        "onLanguage:ssm-json",
-        "onLanguage:ssm-yaml",
-        "onCommand:aws.ssmDocument.createLocalDocument",
-        "onCommand:aws.ssmDocument.openLocalDocument",
-        "onCommand:aws.ssmDocument.openLocalDocumentJson",
-        "onCommand:aws.ssmDocument.openLocalDocumentYaml",
-        "onCommand:aws.ssmDocument.deleteDocument",
-        "onCommand:aws.ssmDocument.publishDocument",
-        "onCommand:aws.ssmDocument.updateDocumentVersion",
-        "onLanguage:javascript",
-        "onLanguage:java",
-        "onLanguage:python",
-        "onLanguage:csharp",
-        "onLanguage:yaml",
-        "onCommand:aws.launchConfigForm",
-        "onCommand:aws.toggleSamCodeLenses",
-        "onCommand:aws.addSamDebugConfig",
-        "onCommand:aws.s3.uploadFile",
-        "onCommand:aws.cloudFormation.newTemplate",
-        "onCommand:aws.sam.newTemplate",
-        "onFileSystem:s3",
-        "onFileSystem:s3-readonly",
-        "onCommand:aws.codeWhisperer.accept",
-        "onCommand:aws.codeWhisperer",
-        "onCommand:aws.uploadLambda"
-    ],
-    "main": "./dist/src/main",
-    "contributes": {
-        "configuration": {
-            "type": "object",
-            "title": "%AWS.productName%",
-            "cloud9": {
-                "cn": {
-                    "title": "%AWS.productName.cn%"
-                }
-            },
-            "properties": {
-                "aws.profile": {
-                    "type": "string",
-                    "deprecationMessage": "The current profile is now stored internally by the Toolkit.",
-                    "description": "%AWS.configuration.profileDescription%"
-                },
-                "aws.ecs.openTerminalCommand": {
-                    "type": "string",
-                    "default": "/bin/sh",
-                    "markdownDescription": "%AWS.configuration.description.ecs.openTerminalCommand%"
-                },
-                "aws.iot.maxItemsPerPage": {
-                    "type": "number",
-                    "default": 100,
-                    "minimum": 1,
-                    "maximum": 250,
-                    "markdownDescription": "%AWS.configuration.description.iot.maxItemsPerPage%"
-                },
-                "aws.s3.maxItemsPerPage": {
-                    "type": "number",
-                    "default": 300,
-                    "minimum": 3,
-                    "maximum": 1000,
-                    "markdownDescription": "%AWS.configuration.description.s3.maxItemsPerPage%"
-                },
-                "aws.samcli.location": {
-                    "type": "string",
-                    "scope": "machine",
-                    "default": "",
-                    "markdownDescription": "%AWS.configuration.description.samcli.location%"
-                },
-                "aws.samcli.lambdaTimeout": {
-                    "type": "number",
-                    "default": 90000,
-                    "markdownDescription": "%AWS.configuration.description.samcli.lambdaTimeout%"
-                },
-                "aws.samcli.legacyDeploy": {
-                    "type": "boolean",
-                    "default": false,
-                    "markdownDescription": "%AWS.configuration.description.samcli.legacyDeploy%"
-                },
-                "aws.logLevel": {
-                    "type": "string",
-                    "default": "info",
-                    "enum": [
-                        "error",
-                        "warn",
-                        "info",
-                        "verbose",
-                        "debug"
-                    ],
-                    "enumDescriptions": [
-                        "Errors Only",
-                        "Errors and Warnings",
-                        "Errors, Warnings, and Info",
-                        "Errors, Warnings, Info, and Verbose",
-                        "Errors, Warnings, Info, Verbose, and Debug"
-                    ],
-                    "markdownDescription": "%AWS.configuration.description.logLevel%",
-                    "cloud9": {
-                        "cn": {
-                            "markdownDescription": "%AWS.configuration.description.logLevel.cn%"
-                        }
-                    }
-                },
-                "aws.telemetry": {
-                    "type": "boolean",
-                    "default": true,
-                    "markdownDescription": "%AWS.configuration.description.telemetry%",
-                    "cloud9": {
-                        "cn": {
-                            "markdownDescription": "%AWS.configuration.description.telemetry.cn%"
-                        }
-                    }
-                },
-                "aws.stepfunctions.asl.format.enable": {
-                    "type": "boolean",
-                    "scope": "window",
-                    "default": true,
-                    "description": "%AWS.stepFunctions.asl.format.enable.desc%"
-                },
-                "aws.stepfunctions.asl.maxItemsComputed": {
-                    "type": "number",
-                    "default": 5000,
-                    "description": "%AWS.stepFunctions.asl.maxItemsComputed.desc%"
-                },
-                "aws.ssmDocument.ssm.maxItemsComputed": {
-                    "type": "number",
-                    "default": 5000,
-                    "description": "%AWS.ssmDocument.ssm.maxItemsComputed.desc%"
-                },
-                "aws.cloudWatchLogs.limit": {
-                    "type": "number",
-                    "default": 10000,
-                    "description": "%AWS.cloudWatchLogs.limit.desc%",
-                    "maximum": 10000
-                },
-                "aws.samcli.manuallySelectedBuckets": {
-                    "type": "object",
-                    "description": "%AWS.samcli.deploy.bucket.recentlyUsed%",
-                    "default": []
-                },
-                "aws.samcli.enableCodeLenses": {
-                    "type": "boolean",
-                    "description": "%AWS.configuration.enableCodeLenses%",
-                    "default": false
-                },
-                "aws.suppressPrompts": {
-                    "type": "object",
-                    "description": "%AWS.configuration.description.suppressPrompts%",
-                    "default": {},
-                    "properties": {
-                        "apprunnerNotifyPricing": {
-                            "type": "boolean",
-                            "default": false
-                        },
-                        "apprunnerNotifyPause": {
-                            "type": "boolean",
-                            "default": false
-                        },
-                        "ecsRunCommand": {
-                            "type": "boolean",
-                            "default": false
-                        },
-                        "ecsRunCommandEnable": {
-                            "type": "boolean",
-                            "default": false
-                        },
-                        "ecsRunCommandDisable": {
-                            "type": "boolean",
-                            "default": false
-                        },
-                        "regionAddAutomatically": {
-                            "type": "boolean",
-                            "default": false
-                        },
-                        "yamlExtPrompt": {
-                            "type": "boolean",
-                            "default": false
-                        },
-                        "fileViewerEdit": {
-                            "type": "boolean",
-                            "default": false
-                        },
-                        "createCredentialsProfile": {
-                            "type": "boolean",
-                            "default": false
-                        },
-                        "samcliConfirmDevStack": {
-                            "type": "boolean",
-                            "default": false
-                        },
-                        "remoteConnected": {
-                            "type": "boolean",
-                            "default": false
-                        }
-                    },
-                    "additionalProperties": false
-                },
-                "aws.experiments": {
-                    "type": "object",
-                    "markdownDescription": "%AWS.configuration.description.experiments%",
-                    "default": {
-                        "jsonResourceModification": false,
-                        "samSyncCode": false
-                    },
-                    "properties": {
-                        "jsonResourceModification": {
-                            "type": "boolean",
-                            "default": false
-                        },
-                        "samSyncCode": {
-                            "type": "boolean",
-                            "default": false
-                        }
-                    },
-                    "additionalProperties": false
-                },
-                "aws.codeWhisperer.includeSuggestionsWithCodeReferences": {
-                    "type": "boolean",
-                    "description": "%AWS.configuration.description.codewhisperer%",
-                    "default": true
-                },
-                "aws.codeWhisperer.shareCodeWhispererContentWithAWS": {
-                    "type": "boolean",
-                    "markdownDescription": "%AWS.configuration.description.codewhisperer.shareCodeWhispererContentWithAWS%",
-                    "default": true
-                },
-                "aws.codeWhisperer.javaCompilationOutput": {
-                    "type": "string",
-                    "default": "",
-                    "description": "Provide the ABSOLUTE path which is used to store java project compilation results."
-                },
-                "aws.resources.enabledResources": {
-                    "type": "array",
-                    "description": "%AWS.configuration.description.resources.enabledResources%",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "aws.lambda.recentlyUploaded": {
-                    "type": "object",
-                    "description": "%AWS.configuration.description.lambda.recentlyUploaded%",
-                    "default": []
-                }
-            }
-        },
-        "debuggers": [
-            {
-                "type": "aws-sam",
-                "label": "%AWS.configuration.description.awssam.debug.label%",
-                "configurationAttributes": {
-                    "direct-invoke": {
-                        "$schema": "http://json-schema.org/draft-07/schema#",
-                        "title": "AwsSamDebuggerConfiguration",
-                        "additionalProperties": false,
-                        "properties": {
-                            "aws": {
-                                "title": "AWS Connection",
-                                "description": "%AWS.configuration.description.awssam.debug.aws%",
-                                "properties": {
-                                    "credentials": {
-                                        "description": "%AWS.configuration.description.awssam.debug.credentials%",
-                                        "type": "string",
-                                        "cloud9": {
-                                            "cn": {
-                                                "description": "%AWS.configuration.description.awssam.debug.credentials.cn%"
-                                            }
-                                        }
-                                    },
-                                    "region": {
-                                        "description": "%AWS.configuration.description.awssam.debug.region%",
-                                        "type": "string"
-                                    }
-                                },
-                                "additionalProperties": false,
-                                "type": "object"
-                            },
-                            "invokeTarget": {
-                                "oneOf": [
-                                    {
-                                        "title": "Template Target Properties",
-                                        "description": "%AWS.configuration.description.awssam.debug.invokeTarget%",
-                                        "properties": {
-                                            "templatePath": {
-                                                "description": "%AWS.configuration.description.awssam.debug.templatePath%",
-                                                "type": "string"
-                                            },
-                                            "logicalId": {
-                                                "description": "%AWS.configuration.description.awssam.debug.logicalId%",
-                                                "type": "string"
-                                            },
-                                            "target": {
-                                                "description": "%AWS.configuration.description.awssam.debug.target%",
-                                                "type": "string",
-                                                "enum": [
-                                                    "template"
-                                                ]
-                                            }
-                                        },
-                                        "additionalProperties": false,
-                                        "required": [
-                                            "templatePath",
-                                            "logicalId",
-                                            "target"
-                                        ],
-                                        "type": "object"
-                                    },
-                                    {
-                                        "title": "Code Target Properties",
-                                        "description": "%AWS.configuration.description.awssam.debug.invokeTarget%",
-                                        "properties": {
-                                            "lambdaHandler": {
-                                                "description": "%AWS.configuration.description.awssam.debug.lambdaHandler%",
-                                                "type": "string"
-                                            },
-                                            "projectRoot": {
-                                                "description": "%AWS.configuration.description.awssam.debug.projectRoot%",
-                                                "type": "string"
-                                            },
-                                            "target": {
-                                                "description": "%AWS.configuration.description.awssam.debug.target%",
-                                                "type": "string",
-                                                "enum": [
-                                                    "code"
-                                                ]
-                                            },
-                                            "architecture": {
-                                                "description": "%AWS.configuration.description.awssam.debug.architecture%",
-                                                "type": "string",
-                                                "enum": [
-                                                    "x86_64",
-                                                    "arm64"
-                                                ]
-                                            }
-                                        },
-                                        "additionalProperties": false,
-                                        "required": [
-                                            "lambdaHandler",
-                                            "projectRoot",
-                                            "target"
-                                        ],
-                                        "type": "object"
-                                    },
-                                    {
-                                        "title": "API Target Properties",
-                                        "description": "%AWS.configuration.description.awssam.debug.invokeTarget%",
-                                        "properties": {
-                                            "templatePath": {
-                                                "description": "%AWS.configuration.description.awssam.debug.templatePath%",
-                                                "type": "string"
-                                            },
-                                            "logicalId": {
-                                                "description": "%AWS.configuration.description.awssam.debug.logicalId%",
-                                                "type": "string"
-                                            },
-                                            "target": {
-                                                "description": "%AWS.configuration.description.awssam.debug.target%",
-                                                "type": "string",
-                                                "enum": [
-                                                    "api"
-                                                ]
-                                            }
-                                        },
-                                        "additionalProperties": false,
-                                        "required": [
-                                            "templatePath",
-                                            "logicalId",
-                                            "target"
-                                        ],
-                                        "type": "object"
-                                    }
-                                ]
-                            },
-                            "lambda": {
-                                "title": "Lambda Properties",
-                                "description": "%AWS.configuration.description.awssam.debug.lambda%",
-                                "properties": {
-                                    "environmentVariables": {
-                                        "description": "%AWS.configuration.description.awssam.debug.envvars%",
-                                        "additionalProperties": {
-                                            "type": [
-                                                "string"
-                                            ]
-                                        },
-                                        "type": "object"
-                                    },
-                                    "payload": {
-                                        "description": "%AWS.configuration.description.awssam.debug.event%",
-                                        "properties": {
-                                            "json": {
-                                                "description": "%AWS.configuration.description.awssam.debug.event.json%",
-                                                "type": "object"
-                                            },
-                                            "path": {
-                                                "description": "%AWS.configuration.description.awssam.debug.event.path%",
-                                                "type": "string"
-                                            }
-                                        },
-                                        "additionalProperties": false,
-                                        "type": "object"
-                                    },
-                                    "memoryMb": {
-                                        "description": "%AWS.configuration.description.awssam.debug.memoryMb%",
-                                        "type": "number"
-                                    },
-                                    "runtime": {
-                                        "description": "%AWS.configuration.description.awssam.debug.runtime%",
-                                        "type": "string"
-                                    },
-                                    "timeoutSec": {
-                                        "description": "%AWS.configuration.description.awssam.debug.timeout%",
-                                        "type": "number"
-                                    },
-                                    "pathMappings": {
-                                        "type:": "array",
-                                        "items": {
-                                            "title": "Path Mapping",
-                                            "type": "object",
-                                            "properties": {
-                                                "localRoot": {
-                                                    "type": "string"
-                                                },
-                                                "remoteRoot": {
-                                                    "type": "string"
-                                                }
-                                            },
-                                            "additionalProperties": false,
-                                            "required": [
-                                                "localRoot",
-                                                "remoteRoot"
-                                            ]
-                                        }
-                                    }
-                                },
-                                "additionalProperties": false,
-                                "type": "object"
-                            },
-                            "sam": {
-                                "title": "SAM CLI Properties",
-                                "description": "%AWS.configuration.description.awssam.debug.sam%",
-                                "properties": {
-                                    "buildArguments": {
-                                        "description": "%AWS.configuration.description.awssam.debug.buildArguments%",
-                                        "type": "array",
-                                        "items": {
-                                            "type": "string"
-                                        }
-                                    },
-                                    "buildDir": {
-                                        "description": "%AWS.configuration.description.awssam.debug.buildDir%",
-                                        "type": "string"
-                                    },
-                                    "containerBuild": {
-                                        "description": "%AWS.configuration.description.awssam.debug.containerBuild%",
-                                        "type": "boolean"
-                                    },
-                                    "dockerNetwork": {
-                                        "description": "%AWS.configuration.description.awssam.debug.dockerNetwork%",
-                                        "type": "string"
-                                    },
-                                    "localArguments": {
-                                        "description": "%AWS.configuration.description.awssam.debug.localArguments%",
-                                        "type": "array",
-                                        "items": {
-                                            "type": "string"
-                                        }
-                                    },
-                                    "skipNewImageCheck": {
-                                        "description": "%AWS.configuration.description.awssam.debug.skipNewImageCheck%",
-                                        "type": "boolean"
-                                    },
-                                    "template": {
-                                        "description": "%AWS.configuration.description.awssam.debug.template%",
-                                        "properties": {
-                                            "parameters": {
-                                                "description": "%AWS.configuration.description.awssam.debug.templateParameters%",
-                                                "additionalProperties": {
-                                                    "type": [
-                                                        "string",
-                                                        "number"
-                                                    ]
-                                                },
-                                                "type": "object"
-                                            }
-                                        },
-                                        "type": "object",
-                                        "additionalProperties": false
-                                    }
-                                },
-                                "additionalProperties": false,
-                                "type": "object"
-                            },
-                            "api": {
-                                "title": "API Gateway Properties",
-                                "description": "%AWS.configuration.description.awssam.debug.api%",
-                                "properties": {
-                                    "path": {
-                                        "description": "%AWS.configuration.description.awssam.debug.api.path%",
-                                        "type": "string"
-                                    },
-                                    "httpMethod": {
-                                        "description": "%AWS.configuration.description.awssam.debug.api.httpMethod%",
-                                        "type": "string",
-                                        "enum": [
-                                            "delete",
-                                            "get",
-                                            "head",
-                                            "options",
-                                            "patch",
-                                            "post",
-                                            "put"
-                                        ]
-                                    },
-                                    "payload": {
-                                        "description": "%AWS.configuration.description.awssam.debug.event%",
-                                        "properties": {
-                                            "json": {
-                                                "description": "%AWS.configuration.description.awssam.debug.event.json%",
-                                                "type": "object"
-                                            },
-                                            "path": {
-                                                "description": "%AWS.configuration.description.awssam.debug.event.path%",
-                                                "type": "string"
-                                            }
-                                        },
-                                        "additionalProperties": false,
-                                        "type": "object"
-                                    },
-                                    "headers": {
-                                        "description": "%AWS.configuration.description.awssam.debug.api.headers%",
-                                        "type": "object",
-                                        "additionalProperties": {
-                                            "type": "string"
-                                        }
-                                    },
-                                    "querystring": {
-                                        "description": "%AWS.configuration.description.awssam.debug.api.queryString%",
-                                        "type": "string"
-                                    },
-                                    "stageVariables": {
-                                        "description": "%AWS.configuration.description.awssam.debug.api.stageVariables%",
-                                        "type": "object",
-                                        "additionalProperties": {
-                                            "type": "string"
-                                        }
-                                    },
-                                    "clientCertificateId": {
-                                        "description": "%AWS.configuration.description.awssam.debug.api.clientCertId%",
-                                        "type": "string"
-                                    }
-                                },
-                                "additionalProperties": false,
-                                "required": [
-                                    "path",
-                                    "httpMethod"
-                                ],
-                                "type": "object"
-                            }
-                        },
-                        "required": [
-                            "invokeTarget"
-                        ],
-                        "type": "object"
-                    }
-                },
-                "configurationSnippets": [
-                    {
-                        "label": "%AWS.configuration.description.awssam.debug.snippets.lambdaCode.label%",
-                        "description": "%AWS.configuration.description.awssam.debug.snippets.lambdaCode.description%",
-                        "body": {
-                            "type": "aws-sam",
-                            "request": "direct-invoke",
-                            "name": "${3:Invoke Lambda}",
-                            "invokeTarget": {
-                                "target": "code",
-                                "lambdaHandler": "${1:Function Handler}",
-                                "projectRoot": "^\"\\${workspaceFolder}\""
-                            },
-                            "lambda": {
-                                "runtime": "${2:Lambda Runtime}",
-                                "payload": {
-                                    "json": {}
-                                }
-                            }
-                        },
-                        "cloud9": {
-                            "cn": {
-                                "label": "%AWS.configuration.description.awssam.debug.snippets.lambdaCode.label.cn%",
-                                "description": "%AWS.configuration.description.awssam.debug.snippets.lambdaCode.description.cn%"
-                            }
-                        }
-                    },
-                    {
-                        "label": "%AWS.configuration.description.awssam.debug.snippets.lambdaTemplate.label%",
-                        "description": "%AWS.configuration.description.awssam.debug.snippets.lambdaTemplate.description%",
-                        "body": {
-                            "type": "aws-sam",
-                            "request": "direct-invoke",
-                            "name": "${3:Invoke Lambda}",
-                            "invokeTarget": {
-                                "target": "template",
-                                "templatePath": "${1:Template Location}",
-                                "logicalId": "${2:Function Logical ID}"
-                            },
-                            "lambda": {
-                                "payload": {
-                                    "json": {}
-                                }
-                            }
-                        },
-                        "cloud9": {
-                            "cn": {
-                                "label": "%AWS.configuration.description.awssam.debug.snippets.lambdaTemplate.label.cn%",
-                                "description": "%AWS.configuration.description.awssam.debug.snippets.lambdaTemplate.description.cn%"
-                            }
-                        }
-                    },
-                    {
-                        "label": "%AWS.configuration.description.awssam.debug.snippets.api.label%",
-                        "description": "%AWS.configuration.description.awssam.debug.snippets.api.description%",
-                        "body": {
-                            "type": "aws-sam",
-                            "request": "direct-invoke",
-                            "name": "${5:Invoke Lambda with API Gateway}",
-                            "invokeTarget": {
-                                "target": "api",
-                                "templatePath": "${1:Template Location}",
-                                "logicalId": "${2:Function Logical ID}"
-                            },
-                            "api": {
-                                "path": "${3:Path}",
-                                "httpMethod": "${4:Method}",
-                                "payload": {
-                                    "json": {}
-                                }
-                            }
-                        },
-                        "cloud9": {
-                            "cn": {
-                                "label": "%AWS.configuration.description.awssam.debug.snippets.api.label.cn%",
-                                "description": "%AWS.configuration.description.awssam.debug.snippets.api.description.cn%"
-                            }
-                        }
-                    }
-                ]
-            }
-        ],
-        "viewsContainers": {
-            "activitybar": [
-                {
-                    "id": "aws-explorer",
-                    "title": "%AWS.title%",
-                    "icon": "resources/aws-logo.svg",
-                    "cloud9": {
-                        "cn": {
-                            "title": "%AWS.title.cn%",
-                            "icon": "resources/aws-cn-logo.svg"
-                        }
-                    }
-                }
-            ],
-            "panel": [
-                {
-                    "id": "aws-codewhisperer-reference-log",
-                    "title": "CodeWhisperer Reference Log",
-                    "icon": "media/aws-logo.svg"
-                }
-            ]
-        },
-        "views": {
-            "aws-explorer": [
-                {
-                    "id": "aws.explorer",
-                    "name": "%AWS.lambda.explorerTitle%"
-                },
-                {
-                    "id": "aws.developerTools",
-                    "name": "%AWS.developerTools.explorerTitle%"
-                }
-            ],
-            "aws-codewhisperer-reference-log": [
-                {
-                    "type": "webview",
-                    "id": "aws.codeWhisperer.referenceLog",
-                    "name": ""
-                }
-            ]
-        },
-        "submenus": [
-            {
-                "id": "aws.auth",
-                "label": "%AWS.submenu.auth.title%",
-                "icon": "$(ellipsis)"
-            }
-        ],
-        "menus": {
-            "commandPalette": [
-                {
-                    "command": "aws.apig.copyUrl",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.apig.invokeRemoteRestApi",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.deleteCloudFormation",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.downloadStateMachineDefinition",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ecr.createRepository",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.executeStateMachine",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.copyArn",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.copyName",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.listCommands",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.codecatalyst.listCommands",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.codecatalyst.openDevEnv",
-                    "when": "!isCloud9"
-                },
-                {
-                    "command": "aws.codecatalyst.createDevEnv",
-                    "when": "!isCloud9"
-                },
-                {
-                    "command": "aws.codecatalyst.removeConnection",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.codeWhisperer.removeConnection",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.downloadSchemaItemCode",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.deleteLambda",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.downloadLambda",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.invokeLambda",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.copyLambdaUrl",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.viewSchemaItem",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.searchSchema",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.searchSchemaPerRegistry",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.refreshAwsExplorer",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.cdk.refresh",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.cdk.viewDocs",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ssmDocument.openLocalDocument",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ssmDocument.openLocalDocumentJson",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ssmDocument.openLocalDocumentYaml",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ssmDocument.deleteDocument",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ssmDocument.updateDocumentVersion",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.copyLogStreamName",
-                    "when": "resourceScheme == awsCloudWatchLogs"
-                },
-                {
-                    "command": "aws.saveCurrentLogStreamContent",
-                    "when": "resourceScheme == awsCloudWatchLogs"
-                },
-                {
-                    "command": "aws.s3.editFile",
-                    "when": "resourceScheme == s3-readonly"
-                },
-                {
-                    "command": "aws.cloudWatchLogs.viewLogStream",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ecr.deleteRepository",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ecr.copyTagUri",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ecr.copyRepositoryUri",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ecr.deleteTag",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.createThing",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.deleteThing",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.createCert",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.deleteCert",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.attachCert",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.attachPolicy",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.activateCert",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.deactivateCert",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.revokeCert",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.createPolicy",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.deletePolicy",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.createPolicyVersion",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.deletePolicyVersion",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.detachCert",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.detachPolicy",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.viewPolicyVersion",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.setDefaultPolicy",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.iot.copyEndpoint",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.deploySamApplication",
-                    "when": "config.aws.samcli.legacyDeploy"
-                },
-                {
-                    "command": "aws.samcli.sync",
-                    "when": "!config.aws.samcli.legacyDeploy"
-                },
-                {
-                    "command": "aws.samcli.syncCode",
-                    "when": "config.aws.experiments.samSyncCode && !config.aws.samcli.legacyDeploy"
-                },
-                {
-                    "command": "aws.s3.copyPath",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.s3.createBucket",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.s3.createFolder",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.s3.deleteBucket",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.s3.deleteFile",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.s3.downloadFileAs",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.s3.openFile",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.s3.editFile",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.s3.uploadFileToParent",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.apprunner.startDeployment",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.apprunner.createService",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.apprunner.pauseService",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.apprunner.resumeService",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.apprunner.copyServiceUrl",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.apprunner.open",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.apprunner.deleteService",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.apprunner.createServiceFromEcr",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.resources.copyIdentifier",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.resources.openResourcePreview",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.resources.createResource",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.resources.deleteResource",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.resources.updateResource",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.resources.updateResourceInline",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.resources.saveResource",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.resources.closeResource",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.resources.viewDocs",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ecs.runCommandInContainer",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ecs.openTaskInTerminal",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ecs.enableEcsExec",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ecs.disableEcsExec",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.ecs.viewDocumentation",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.renderStateMachineGraph",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.auth.addConnection",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.auth.switchConnections",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.auth.signout",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.auth.help",
-                    "when": "false"
-                },
-                {
-                    "command": "aws.dev.openMenu",
-                    "when": "aws.isDevMode || isCloud9"
-                }
-            ],
-            "editor/title": [
-                {
-                    "command": "aws.previewStateMachine",
-                    "when": "editorLangId == asl || editorLangId == asl-yaml",
-                    "group": "navigation"
-                },
-                {
-                    "command": "aws.saveCurrentLogStreamContent",
-                    "when": "resourceScheme == awsCloudWatchLogs",
-                    "group": "navigation"
-                },
-                {
-                    "command": "aws.s3.editFile",
-                    "when": "resourceScheme == s3-readonly",
-                    "group": "navigation"
-                },
-                {
-                    "command": "aws.ssmDocument.publishDocument",
-                    "when": "editorLangId =~ /^(ssm-yaml|ssm-json)$/",
-                    "group": "navigation"
-                },
-                {
-                    "command": "aws.resources.updateResourceInline",
-                    "when": "resourceScheme == awsResource && !isCloud9 && config.aws.experiments.jsonResourceModification",
-                    "group": "navigation"
-                },
-                {
-                    "command": "aws.resources.closeResource",
-                    "when": "resourcePath =~ /^.+(awsResource.json)$/",
-                    "group": "navigation"
-                },
-                {
-                    "command": "aws.resources.saveResource",
-                    "when": "resourcePath =~ /^.+(awsResource.json)$/",
-                    "group": "navigation"
-                }
-            ],
-            "editor/title/context": [
-                {
-                    "command": "aws.copyLogStreamName",
-                    "when": "resourceScheme == awsCloudWatchLogs",
-                    "group": "1_cutcopypaste@1"
-                }
-            ],
-            "view/title": [
-                {
-                    "command": "aws.submitFeedback",
-                    "when": "view == aws.explorer",
-                    "group": "navigation@6"
-                },
-                {
-                    "command": "aws.refreshAwsExplorer",
-                    "when": "view == aws.explorer",
-                    "group": "navigation@5"
-                },
-                {
-                    "command": "aws.login",
-                    "when": "view == aws.explorer",
-                    "group": "1_account@1"
-                },
-                {
-                    "command": "aws.showRegion",
-                    "when": "view == aws.explorer",
-                    "group": "1_account@2"
-                },
-                {
-                    "command": "aws.listCommands",
-                    "when": "view == aws.explorer && !isCloud9",
-                    "group": "1_account@3"
-                },
-                {
-                    "command": "aws.lambda.createNewSamApp",
-                    "when": "view == aws.explorer",
-                    "group": "3_lambda@1"
-                },
-                {
-                    "command": "aws.launchConfigForm",
-                    "when": "view == aws.explorer",
-                    "group": "3_lambda@2"
-                },
-                {
-                    "command": "aws.deploySamApplication",
-                    "when": "config.aws.samcli.legacyDeploy && view == aws.explorer",
-                    "group": "3_lambda@3"
-                },
-                {
-                    "command": "aws.samcli.sync",
-                    "when": "!config.aws.samcli.legacyDeploy && view == aws.explorer",
-                    "group": "3_lambda@3"
-                },
-                {
-                    "command": "aws.samcli.syncCode",
-                    "when": "config.aws.experiments.samSyncCode && !config.aws.samcli.legacyDeploy && view == aws.explorer",
-                    "group": "3_lambda@4"
-                },
-                {
-                    "command": "aws.quickStart",
-                    "when": "view == aws.explorer",
-                    "group": "y_toolkitMeta@1"
-                },
-                {
-                    "command": "aws.help",
-                    "when": "view == aws.explorer || !aws.explorer.visible && view =~ /^aws/",
-                    "group": "y_toolkitMeta@2"
-                },
-                {
-                    "command": "aws.github",
-                    "when": "view == aws.explorer || !aws.explorer.visible && view =~ /^aws/",
-                    "group": "y_toolkitMeta@3"
-                },
-                {
-                    "command": "aws.createIssueOnGitHub",
-                    "when": "view == aws.explorer || !aws.explorer.visible && view =~ /^aws/",
-                    "group": "y_toolkitMeta@4"
-                },
-                {
-                    "command": "aws.submitFeedback",
-                    "when": "view == aws.explorer || !aws.explorer.visible && view =~ /^aws/",
-                    "group": "y_toolkitMeta@5"
-                },
-                {
-                    "command": "aws.aboutToolkit",
-                    "when": "view == aws.explorer || !aws.explorer.visible && view =~ /^aws/",
-                    "group": "z_about@1"
-                },
-                {
-                    "command": "aws.viewLogs",
-                    "when": "view == aws.explorer || !aws.explorer.visible && view =~ /^aws/",
-                    "group": "z_about@1"
-                },
-                {
-                    "command": "aws.codecatalyst.cloneRepo",
-                    "when": "view == aws.codecatalyst && !isCloud9",
-                    "group": "1_codeCatalyst@1"
-                },
-                {
-                    "command": "aws.codecatalyst.createDevEnv",
-                    "when": "view == aws.codecatalyst && !isCloud9",
-                    "group": "1_codeCatalyst@1"
-                },
-                {
-                    "command": "aws.codecatalyst.listCommands",
-                    "when": "view == aws.codecatalyst && !isCloud9",
-                    "group": "1_codeCatalyst@1"
-                },
-                {
-                    "command": "aws.codecatalyst.openDevEnv",
-                    "when": "view == aws.codecatalyst && !isCloud9",
-                    "group": "1_codeCatalyst@1"
-                }
-            ],
-            "explorer/context": [
-                {
-                    "command": "aws.deploySamApplication",
-                    "when": "config.aws.samcli.legacyDeploy && isFileSystemResource && resourceFilename =~ /^template\\.(json|yml|yaml)$/",
-                    "group": "z_aws@1"
-                },
-                {
-                    "command": "aws.samcli.sync",
-                    "when": "!config.aws.samcli.legacyDeploy && isFileSystemResource && resourceFilename =~ /^(template\\.(json|yml|yaml))|(samconfig\\.toml)$/",
-                    "group": "z_aws@1"
-                },
-                {
-                    "command": "aws.samcli.syncCode",
-                    "when": "config.aws.experiments.samSyncCode && !config.aws.samcli.legacyDeploy && isFileSystemResource && resourceFilename =~ /^(template\\.(json|yml|yaml))|(samconfig\\.toml)$/",
-                    "group": "z_aws@2"
-                },
-                {
-                    "command": "aws.uploadLambda",
-                    "when": "explorerResourceIsFolder || isFileSystemResource && resourceFilename =~ /^template\\.(json|yml|yaml)$/",
-                    "group": "z_aws@3"
-                }
-            ],
-            "view/item/context": [
-                {
-                    "command": "aws.apig.invokeRemoteRestApi",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsApiGatewayNode)$/",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.codecatalyst.removeConnection",
-                    "when": "viewItem == awsCodeCatalystNodeSaved",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.codecatalyst.removeConnection",
-                    "when": "viewItem == awsCodeCatalystNodeSaved",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.ecr.createRepository",
-                    "when": "view == aws.explorer && viewItem == awsEcrNode",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.iot.createThing",
-                    "when": "view == aws.explorer && viewItem == awsIotThingsNode",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.iot.createCert",
-                    "when": "view == aws.explorer && viewItem == awsIotCertsNode",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.iot.createPolicy",
-                    "when": "view == aws.explorer && viewItem == awsIotPoliciesNode",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.iot.attachCert",
-                    "when": "view == aws.explorer && viewItem == awsIotThingNode",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.iot.attachPolicy",
-                    "when": "view == aws.explorer && viewItem =~ /^awsIotCertificateNode.(Things|Policies)/",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.s3.openFile",
-                    "when": "view == aws.explorer && viewItem == awsS3FileNode && !isCloud9",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.s3.editFile",
-                    "when": "view == aws.explorer && viewItem == awsS3FileNode && !isCloud9",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.s3.downloadFileAs",
-                    "when": "view == aws.explorer && viewItem == awsS3FileNode",
-                    "group": "inline@2"
-                },
-                {
-                    "command": "aws.s3.createBucket",
-                    "when": "view == aws.explorer && viewItem == awsS3Node",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.s3.createFolder",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsS3BucketNode|awsS3FolderNode)$/",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.ssmDocument.openLocalDocument",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsDocumentItemNode|awsDocumentItemNodeWriteable)$/",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.s3.uploadFile",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsS3BucketNode|awsS3FolderNode)$/",
-                    "group": "inline@2"
-                },
-                {
-                    "command": "aws.showRegion",
-                    "when": "view == aws.explorer && viewItem == awsRegionNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.lambda.createNewSamApp",
-                    "when": "view == aws.explorer && viewItem == awsLambdaNode || viewItem == awsRegionNode",
-                    "group": "1@1"
-                },
-                {
-                    "command": "aws.launchConfigForm",
-                    "when": "view == aws.explorer && viewItem == awsLambdaNode || viewItem == awsRegionNode || viewItem == awsCloudFormationRootNode",
-                    "group": "1@1"
-                },
-                {
-                    "command": "aws.deploySamApplication",
-                    "when": "config.aws.samcli.legacyDeploy && view == aws.explorer && viewItem =~ /^(awsLambdaNode|awsRegionNode|awsCloudFormationRootNode)$/",
-                    "group": "1@2"
-                },
-                {
-                    "command": "aws.samcli.sync",
-                    "when": "!config.aws.samcli.legacyDeploy && view == aws.explorer && viewItem =~ /^(awsLambdaNode|awsRegionNode|awsCloudFormationRootNode)$/",
-                    "group": "1@2"
-                },
-                {
-                    "command": "aws.samcli.syncCode",
-                    "when": "config.aws.experiments.samSyncCode && !config.aws.samcli.legacyDeploy && view == aws.explorer && viewItem =~ /^(awsLambdaNode|awsRegionNode|awsCloudFormationRootNode)$/",
-                    "group": "1@3"
-                },
-                {
-                    "command": "aws.ecr.copyTagUri",
-                    "when": "view == aws.explorer && viewItem == awsEcrTagNode",
-                    "group": "2@1"
-                },
-                {
-                    "command": "aws.ecr.deleteTag",
-                    "when": "view == aws.explorer && viewItem == awsEcrTagNode",
-                    "group": "3@1"
-                },
-                {
-                    "command": "aws.ecr.copyRepositoryUri",
-                    "when": "view == aws.explorer && viewItem == awsEcrRepositoryNode",
-                    "group": "2@1"
-                },
-                {
-                    "command": "aws.ecr.createRepository",
-                    "when": "view == aws.explorer && viewItem == awsEcrNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.ecr.deleteRepository",
-                    "when": "view == aws.explorer && viewItem == awsEcrRepositoryNode",
-                    "group": "3@1"
-                },
-                {
-                    "command": "aws.invokeLambda",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable|awsCloudFormationFunctionNode)$/",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.downloadLambda",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable)$/",
-                    "group": "0@2"
-                },
-                {
-                    "command": "aws.uploadLambda",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable)$/",
-                    "group": "1@1"
-                },
-                {
-                    "command": "aws.deleteLambda",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable)$/",
-                    "group": "4@1"
-                },
-                {
-                    "command": "aws.copyLambdaUrl",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable)$/",
-                    "group": "2@0"
-                },
-                {
-                    "command": "aws.deleteCloudFormation",
-                    "when": "view == aws.explorer && viewItem == awsCloudFormationNode",
-                    "group": "3@5"
-                },
-                {
-                    "command": "aws.searchSchema",
-                    "when": "view == aws.explorer && viewItem == awsSchemasNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.searchSchemaPerRegistry",
-                    "when": "view == aws.explorer && viewItem == awsRegistryItemNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.viewSchemaItem",
-                    "when": "view == aws.explorer && viewItem == awsSchemaItemNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.stepfunctions.createStateMachineFromTemplate",
-                    "when": "view == aws.explorer && viewItem == awsStepFunctionsNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.downloadStateMachineDefinition",
-                    "when": "view == aws.explorer && viewItem == awsStateMachineNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.renderStateMachineGraph",
-                    "when": "view == aws.explorer && viewItem == awsStateMachineNode",
-                    "group": "0@2"
-                },
-                {
-                    "command": "aws.cdk.renderStateMachineGraph",
-                    "when": "viewItem == awsCdkStateMachineNode",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.cdk.renderStateMachineGraph",
-                    "when": "viewItem == awsCdkStateMachineNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.executeStateMachine",
-                    "when": "view == aws.explorer && viewItem == awsStateMachineNode",
-                    "group": "0@3"
-                },
-                {
-                    "command": "aws.iot.createThing",
-                    "when": "view == aws.explorer && viewItem == awsIotThingsNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.iot.createCert",
-                    "when": "view == aws.explorer && viewItem == awsIotCertsNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.iot.createPolicy",
-                    "when": "view == aws.explorer && viewItem == awsIotPoliciesNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.iot.createPolicyVersion",
-                    "when": "view == aws.explorer && viewItem == awsIotPolicyNode.WithVersions",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.iot.viewPolicyVersion",
-                    "when": "view == aws.explorer && viewItem =~ /^awsIotPolicyVersionNode./",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.iot.attachCert",
-                    "when": "view == aws.explorer && viewItem == awsIotThingNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.iot.attachPolicy",
-                    "when": "view == aws.explorer && viewItem =~ /^awsIotCertificateNode.(Things|Policies)/",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.s3.createBucket",
-                    "when": "view == aws.explorer && viewItem == awsS3Node",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.s3.downloadFileAs",
-                    "when": "view == aws.explorer && viewItem == awsS3FileNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.s3.uploadFile",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsS3BucketNode|awsS3FolderNode)$/",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.s3.uploadFileToParent",
-                    "when": "view == aws.explorer && viewItem == awsS3FileNode",
-                    "group": "1@1"
-                },
-                {
-                    "command": "aws.s3.createFolder",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsS3BucketNode|awsS3FolderNode)$/",
-                    "group": "1@1"
-                },
-                {
-                    "command": "aws.iot.deactivateCert",
-                    "when": "view == aws.explorer && viewItem =~ /^awsIotCertificateNode.(Things|Policies).ACTIVE$/",
-                    "group": "1@1"
-                },
-                {
-                    "command": "aws.iot.activateCert",
-                    "when": "view == aws.explorer && viewItem =~ /^awsIotCertificateNode.(Things|Policies).INACTIVE$/",
-                    "group": "1@1"
-                },
-                {
-                    "command": "aws.iot.revokeCert",
-                    "when": "view == aws.explorer && viewItem =~ /^awsIotCertificateNode.(Things|Policies).(ACTIVE|INACTIVE)$/",
-                    "group": "1@2"
-                },
-                {
-                    "command": "aws.iot.setDefaultPolicy",
-                    "when": "view == aws.explorer && viewItem == awsIotPolicyVersionNode.NONDEFAULT",
-                    "group": "1@1"
-                },
-                {
-                    "command": "aws.iot.copyEndpoint",
-                    "when": "view == aws.explorer && viewItem == awsIotNode",
-                    "group": "2@1"
-                },
-                {
-                    "command": "aws.copyName",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable|awsCloudFormationFunctionNode|awsStateMachineNode|awsCloudFormationNode|awsS3BucketNode|awsS3FolderNode|awsS3FileNode|awsApiGatewayNode|awsIotThingNode)$|^(awsAppRunnerServiceNode|awsIotCertificateNode|awsIotPolicyNode|awsIotPolicyVersionNode)/",
-                    "group": "2@1"
-                },
-                {
-                    "command": "aws.copyArn",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable|awsCloudFormationFunctionNode|awsStateMachineNode|awsCloudFormationNode|awsCloudWatchLogNode|awsS3BucketNode|awsS3FolderNode|awsS3FileNode|awsApiGatewayNode|awsEcrRepositoryNode|awsIotThingNode)$|^(awsAppRunnerServiceNode|awsEcsServiceNode|awsIotCertificateNode|awsIotPolicyNode|awsIotPolicyVersionNode|awsMdeInstanceNode)/",
-                    "group": "2@2"
-                },
-                {
-                    "command": "aws.apig.copyUrl",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsApiGatewayNode)$/",
-                    "group": "2@0"
-                },
-                {
-                    "command": "aws.s3.copyPath",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsS3FolderNode|awsS3FileNode)$/",
-                    "group": "2@3"
-                },
-                {
-                    "command": "aws.s3.presignedURL",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsS3FileNode)$/",
-                    "group": "2@4"
-                },
-                {
-                    "command": "aws.iot.detachCert",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsIotCertificateNode.Things)/",
-                    "group": "3@1"
-                },
-                {
-                    "command": "aws.iot.detachPolicy",
-                    "when": "view == aws.explorer && viewItem == awsIotPolicyNode.Certificates",
-                    "group": "3@1"
-                },
-                {
-                    "command": "aws.iot.deleteThing",
-                    "when": "view == aws.explorer && viewItem == awsIotThingNode",
-                    "group": "3@1"
-                },
-                {
-                    "command": "aws.iot.deleteCert",
-                    "when": "view == aws.explorer && viewItem =~ /^awsIotCertificateNode.Policies/",
-                    "group": "3@1"
-                },
-                {
-                    "command": "aws.iot.deletePolicy",
-                    "when": "view == aws.explorer && viewItem == awsIotPolicyNode.WithVersions",
-                    "group": "3@1"
-                },
-                {
-                    "command": "aws.iot.deletePolicyVersion",
-                    "when": "view == aws.explorer && viewItem == awsIotPolicyVersionNode.NONDEFAULT",
-                    "group": "3@1"
-                },
-                {
-                    "command": "aws.s3.deleteBucket",
-                    "when": "view == aws.explorer && viewItem == awsS3BucketNode",
-                    "group": "3@1"
-                },
-                {
-                    "command": "aws.s3.deleteFile",
-                    "when": "view == aws.explorer && viewItem == awsS3FileNode",
-                    "group": "3@1"
-                },
-                {
-                    "command": "aws.downloadSchemaItemCode",
-                    "when": "view == aws.explorer && viewItem == awsSchemaItemNode",
-                    "group": "1@1"
-                },
-                {
-                    "command": "aws.cloudWatchLogs.viewLogStream",
-                    "group": "0@1",
-                    "when": "view == aws.explorer && viewItem == awsCloudWatchLogNode"
-                },
-                {
-                    "command": "aws.ssmDocument.openLocalDocumentYaml",
-                    "group": "0@1",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsDocumentItemNode|awsDocumentItemNodeWriteable)$/"
-                },
-                {
-                    "command": "aws.ssmDocument.openLocalDocumentJson",
-                    "group": "0@2",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsDocumentItemNode|awsDocumentItemNodeWriteable)$/"
-                },
-                {
-                    "command": "aws.ssmDocument.updateDocumentVersion",
-                    "group": "2@1",
-                    "when": "view == aws.explorer && viewItem == awsDocumentItemNodeWriteable"
-                },
-                {
-                    "command": "aws.ssmDocument.deleteDocument",
-                    "group": "3@2",
-                    "when": "view == aws.explorer && viewItem == awsDocumentItemNodeWriteable"
-                },
-                {
-                    "command": "aws.ecs.runCommandInContainer",
-                    "group": "0@1",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsEcsContainerNodeExec)(.*)$/"
-                },
-                {
-                    "command": "aws.ecs.openTaskInTerminal",
-                    "group": "0@2",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsEcsContainerNodeExec)(.*)$/ && !isCloud9"
-                },
-                {
-                    "command": "aws.ecs.enableEcsExec",
-                    "group": "0@2",
-                    "when": "view == aws.explorer && viewItem == awsEcsServiceNode.DISABLED"
-                },
-                {
-                    "command": "aws.ecs.disableEcsExec",
-                    "group": "0@2",
-                    "when": "view == aws.explorer && viewItem == awsEcsServiceNode.ENABLED"
-                },
-                {
-                    "command": "aws.ecs.viewDocumentation",
-                    "group": "1@3",
-                    "when": "view == aws.explorer && viewItem =~ /^(awsEcsClusterNode|awsEcsContainerNode)$|^awsEcsServiceNode/"
-                },
-                {
-                    "command": "aws.resources.configure",
-                    "when": "view == aws.explorer && viewItem == resourcesRootNode",
-                    "group": "1@1"
-                },
-                {
-                    "command": "aws.resources.configure",
-                    "when": "view == aws.explorer && viewItem == resourcesRootNode",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.resources.openResourcePreview",
-                    "when": "view == aws.explorer && viewItem =~ /^(.*)(ResourceNode)$/",
-                    "group": "1@1"
-                },
-                {
-                    "command": "aws.resources.copyIdentifier",
-                    "when": "view == aws.explorer && viewItem =~ /^(.*)(ResourceNode)$/",
-                    "group": "1@1"
-                },
-                {
-                    "command": "aws.resources.viewDocs",
-                    "when": "view == aws.explorer && viewItem =~ /^(.*)(Documented)(.*)(ResourceTypeNode)$/",
-                    "group": "1@1"
-                },
-                {
-                    "command": "aws.resources.createResource",
-                    "when": "view == aws.explorer && viewItem =~ /^(.*)(Creatable)(.*)(ResourceTypeNode)$/ && !isCloud9 && config.aws.experiments.jsonResourceModification",
-                    "group": "2@1"
-                },
-                {
-                    "command": "aws.resources.createResource",
-                    "when": "view == aws.explorer && viewItem =~ /^(.*)(Creatable)(.*)(ResourceTypeNode)$/ && !isCloud9 && config.aws.experiments.jsonResourceModification",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.resources.updateResource",
-                    "when": "view == aws.explorer && viewItem =~ /^(.*)(Updatable)(.*)(ResourceNode)$/ && !isCloud9 && config.aws.experiments.jsonResourceModification",
-                    "group": "2@1"
-                },
-                {
-                    "command": "aws.resources.deleteResource",
-                    "when": "view == aws.explorer && viewItem =~ /^(.*)(Deletable)(.*)(ResourceNode)$/ && !isCloud9 && config.aws.experiments.jsonResourceModification",
-                    "group": "2@2"
-                },
-                {
-                    "command": "aws.apprunner.createServiceFromEcr",
-                    "group": "0@2",
-                    "when": "view == aws.explorer && viewItem =~ /awsEcrTagNode|awsEcrRepositoryNode/"
-                },
-                {
-                    "command": "aws.apprunner.startDeployment",
-                    "group": "0@1",
-                    "when": "view == aws.explorer && viewItem == awsAppRunnerServiceNode.RUNNING"
-                },
-                {
-                    "command": "aws.apprunner.createService",
-                    "group": "0@2",
-                    "when": "view == aws.explorer && viewItem == awsAppRunnerNode"
-                },
-                {
-                    "command": "aws.apprunner.pauseService",
-                    "group": "0@3",
-                    "when": "view == aws.explorer && viewItem == awsAppRunnerServiceNode.RUNNING"
-                },
-                {
-                    "command": "aws.apprunner.resumeService",
-                    "group": "0@3",
-                    "when": "view == aws.explorer && viewItem == awsAppRunnerServiceNode.PAUSED"
-                },
-                {
-                    "command": "aws.apprunner.copyServiceUrl",
-                    "group": "1@1",
-                    "when": "view == aws.explorer && viewItem == awsAppRunnerServiceNode.RUNNING"
-                },
-                {
-                    "command": "aws.apprunner.open",
-                    "group": "1@2",
-                    "when": "view == aws.explorer && viewItem == awsAppRunnerServiceNode.RUNNING"
-                },
-                {
-                    "command": "aws.apprunner.deleteService",
-                    "group": "3@1",
-                    "when": "view == aws.explorer && viewItem =~ /awsAppRunnerServiceNode.[RUNNING|PAUSED|CREATE_FAILED]/"
-                },
-                {
-                    "command": "aws.cloudFormation.newTemplate",
-                    "group": "0@1",
-                    "when": "view == aws.explorer && viewItem == awsCloudFormationRootNode"
-                },
-                {
-                    "command": "aws.sam.newTemplate",
-                    "group": "0@2",
-                    "when": "view == aws.explorer && viewItem == awsCloudFormationRootNode"
-                },
-                {
-                    "command": "aws.codeWhisperer.configure",
-                    "when": "viewItem =~ /^awsCodeWhispererNode/ && !isCloud9",
-                    "group": "inline@2"
-                },
-                {
-                    "command": "aws.codeWhisperer.introduction",
-                    "when": "viewItem =~ /^awsCodeWhispererNode/ && !isCloud9 && CODEWHISPERER_TERMS_ACCEPTED",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.codeWhisperer.removeConnection",
-                    "when": "viewItem == awsCodeWhispererNodeSaved",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.codeWhisperer.removeConnection",
-                    "when": "viewItem == awsCodeWhispererNodeSaved",
-                    "group": "inline@3"
-                },
-                {
-                    "command": "aws.cdk.refresh",
-                    "when": "viewItem == awsCdkRootNode",
-                    "group": "inline@1"
-                },
-                {
-                    "command": "aws.cdk.refresh",
-                    "when": "viewItem == awsCdkRootNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.cdk.viewDocs",
-                    "when": "viewItem == awsCdkRootNode",
-                    "group": "0@2"
-                },
-                {
-                    "command": "aws.auth.addConnection",
-                    "when": "viewItem == awsAuthNode",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.auth.switchConnections",
-                    "when": "viewItem == awsAuthNode",
-                    "group": "0@2"
-                },
-                {
-                    "command": "aws.auth.signout",
-                    "when": "viewItem == awsAuthNode && !isCloud9",
-                    "group": "0@3"
-                },
-                {
-                    "command": "aws.auth.help",
-                    "when": "viewItem == awsAuthNode",
-                    "group": "inline@1"
-                },
-                {
-                    "submenu": "aws.auth",
-                    "when": "viewItem == awsAuthNode",
-                    "group": "inline@2"
-                }
-            ],
-            "aws.auth": [
-                {
-                    "command": "aws.auth.addConnection",
-                    "group": "0@1"
-                },
-                {
-                    "command": "aws.auth.switchConnections",
-                    "group": "0@2"
-                },
-                {
-                    "command": "aws.auth.signout",
-                    "enablement": "!isCloud9",
-                    "group": "0@3"
-                }
-            ]
-        },
-        "commands": [
-            {
-                "command": "aws.launchConfigForm",
-                "title": "%AWS.command.launchConfigForm.title%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.apig.copyUrl",
-                "title": "%AWS.command.apig.copyUrl%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.apig.invokeRemoteRestApi",
-                "title": "%AWS.command.apig.invokeRemoteRestApi%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%",
-                        "title": "%AWS.command.apig.invokeRemoteRestApi.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.lambda.createNewSamApp",
-                "title": "%AWS.command.createNewSamApp%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.login",
-                "title": "%AWS.command.login%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "title": "%AWS.command.login.cn%",
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.credentials.profile.create",
-                "title": "%AWS.command.credentials.profile.create%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.credentials.edit",
-                "title": "%AWS.command.credentials.edit%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.codecatalyst.openOrg",
-                "title": "%AWS.command.codecatalyst.openOrg%",
-                "category": "AWS"
-            },
-            {
-                "command": "aws.codecatalyst.openProject",
-                "title": "%AWS.command.codecatalyst.openProject%",
-                "category": "AWS"
-            },
-            {
-                "command": "aws.codecatalyst.openRepo",
-                "title": "%AWS.command.codecatalyst.openRepo%",
-                "category": "AWS"
-            },
-            {
-                "command": "aws.codecatalyst.openDevEnv",
-                "title": "%AWS.command.codecatalyst.openDevEnv%",
-                "category": "AWS",
-                "enablement": "!isCloud9"
-            },
-            {
-                "command": "aws.codecatalyst.listCommands",
-                "title": "%AWS.command.codecatalyst.listCommands%",
-                "category": "AWS",
-                "enablement": "!isCloud9"
-            },
-            {
-                "command": "aws.codecatalyst.cloneRepo",
-                "title": "%AWS.command.codecatalyst.cloneRepo%",
-                "category": "AWS",
-                "enablement": "!isCloud9"
-            },
-            {
-                "command": "aws.codecatalyst.createDevEnv",
-                "title": "%AWS.command.codecatalyst.createDevEnv%",
-                "category": "AWS",
-                "enablement": "!isCloud9"
-            },
-            {
-                "command": "aws.codecatalyst.removeConnection",
-                "title": "%AWS.command.codecatalyst.removeConnection%",
-                "category": "AWS",
-                "icon": "$(debug-disconnect)"
-            },
-            {
-                "command": "aws.logout",
-                "title": "%AWS.command.logout%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.auth.addConnection",
-                "title": "%AWS.command.auth.addConnection%",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.auth.switchConnections",
-                "title": "%AWS.command.auth.switchConnections%",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.auth.signout",
-                "title": "%AWS.command.auth.signout%",
-                "category": "%AWS.title%",
-                "enablement": "!isCloud9"
-            },
-            {
-                "command": "aws.auth.help",
-                "title": "%AWS.generic.viewDocs%",
-                "category": "%AWS.title%",
-                "icon": "$(question)"
-            },
-            {
-                "command": "aws.createIssueOnGitHub",
-                "title": "%AWS.command.createIssueOnGitHub%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ecr.copyTagUri",
-                "title": "%AWS.command.ecr.copyTagUri%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ecr.deleteTag",
-                "title": "%AWS.command.ecr.deleteTag%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ecr.copyRepositoryUri",
-                "title": "%AWS.command.ecr.copyRepositoryUri%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ecr.createRepository",
-                "title": "%AWS.command.ecr.createRepository%",
-                "category": "%AWS.title%",
-                "icon": "$(add)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ecr.deleteRepository",
-                "title": "%AWS.command.ecr.deleteRepository%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.showRegion",
-                "title": "%AWS.command.showRegion%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.createThing",
-                "title": "%AWS.command.iot.createThing%",
-                "category": "%AWS.title%",
-                "icon": "$(add)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.deleteThing",
-                "title": "%AWS.generic.promptDelete%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.createCert",
-                "title": "%AWS.command.iot.createCert%",
-                "category": "%AWS.title%",
-                "icon": "$(add)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.deleteCert",
-                "title": "%AWS.generic.promptDelete%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.attachCert",
-                "title": "%AWS.command.iot.attachCert%",
-                "category": "%AWS.title%",
-                "icon": "$(aws-generic-attach-file)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.attachPolicy",
-                "title": "%AWS.command.iot.attachPolicy%",
-                "category": "%AWS.title%",
-                "icon": "$(aws-generic-attach-file)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.activateCert",
-                "title": "%AWS.command.iot.activateCert%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.deactivateCert",
-                "title": "%AWS.command.iot.deactivateCert%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.revokeCert",
-                "title": "%AWS.command.iot.revokeCert%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.createPolicy",
-                "title": "%AWS.command.iot.createPolicy%",
-                "category": "%AWS.title%",
-                "icon": "$(add)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.deletePolicy",
-                "title": "%AWS.generic.promptDelete%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.createPolicyVersion",
-                "title": "%AWS.command.iot.createPolicyVersion%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.deletePolicyVersion",
-                "title": "%AWS.generic.promptDelete%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.detachCert",
-                "title": "%AWS.command.iot.detachCert%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.detachPolicy",
-                "title": "%AWS.command.iot.detachCert%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.viewPolicyVersion",
-                "title": "%AWS.command.iot.viewPolicyVersion%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.setDefaultPolicy",
-                "title": "%AWS.command.iot.setDefaultPolicy%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.iot.copyEndpoint",
-                "title": "%AWS.command.iot.copyEndpoint%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.s3.presignedURL",
-                "title": "%AWS.command.s3.presignedURL%",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.s3.copyPath",
-                "title": "%AWS.command.s3.copyPath%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.s3.downloadFileAs",
-                "title": "%AWS.command.s3.downloadFileAs%",
-                "category": "%AWS.title%",
-                "icon": "$(cloud-download)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.s3.openFile",
-                "title": "%AWS.command.s3.openFile%",
-                "category": "%AWS.title%",
-                "icon": "$(open-preview)"
-            },
-            {
-                "command": "aws.s3.editFile",
-                "title": "%AWS.command.s3.editFile%",
-                "category": "%AWS.title%",
-                "icon": "$(edit)"
-            },
-            {
-                "command": "aws.s3.uploadFile",
-                "title": "%AWS.command.s3.uploadFile%",
-                "category": "%AWS.title%",
-                "icon": "$(cloud-upload)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.s3.uploadFileToParent",
-                "title": "%AWS.command.s3.uploadFileToParent%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.s3.createFolder",
-                "title": "%AWS.command.s3.createFolder%",
-                "category": "%AWS.title%",
-                "icon": "$(new-folder)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.s3.createBucket",
-                "title": "%AWS.command.s3.createBucket%",
-                "category": "%AWS.title%",
-                "icon": "$(aws-s3-create-bucket)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.s3.deleteBucket",
-                "title": "%AWS.generic.promptDelete%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.s3.deleteFile",
-                "title": "%AWS.generic.promptDelete%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.invokeLambda",
-                "title": "%AWS.command.invokeLambda%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "title": "%AWS.command.invokeLambda.cn%",
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.downloadLambda",
-                "title": "%AWS.command.downloadLambda%",
-                "category": "%AWS.title%",
-                "enablement": "viewItem == awsRegionFunctionNodeDownloadable",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.uploadLambda",
-                "title": "%AWS.command.uploadLambda%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.deleteLambda",
-                "title": "%AWS.generic.promptDelete%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.copyLambdaUrl",
-                "title": "%AWS.generic.copyUrl%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.deploySamApplication",
-                "title": "%AWS.command.deploySamApplication%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.submitFeedback",
-                "title": "%AWS.command.submitFeedback%",
-                "category": "%AWS.title%",
-                "icon": "$(comment)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.refreshAwsExplorer",
-                "title": "%AWS.command.refreshAwsExplorer%",
-                "category": "%AWS.title%",
-                "icon": {
-                    "dark": "resources/icons/vscode/dark/refresh.svg",
-                    "light": "resources/icons/vscode/light/refresh.svg"
-                }
-            },
-            {
-                "command": "aws.samcli.detect",
-                "title": "%AWS.command.samcli.detect%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.deleteCloudFormation",
-                "title": "%AWS.command.deleteCloudFormation%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.downloadStateMachineDefinition",
-                "title": "%AWS.command.downloadStateMachineDefinition%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.executeStateMachine",
-                "title": "%AWS.command.executeStateMachine%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.renderStateMachineGraph",
-                "title": "%AWS.command.renderStateMachineGraph%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.copyArn",
-                "title": "%AWS.command.copyArn%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.copyName",
-                "title": "%AWS.command.copyName%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.listCommands",
-                "title": "%AWS.command.listCommands%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "title": "%AWS.command.listCommands.cn%",
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.viewSchemaItem",
-                "title": "%AWS.command.viewSchemaItem%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.searchSchema",
-                "title": "%AWS.command.searchSchema%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.searchSchemaPerRegistry",
-                "title": "%AWS.command.searchSchemaPerRegistry%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.downloadSchemaItemCode",
-                "title": "%AWS.command.downloadSchemaItemCode%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.viewLogs",
-                "title": "%AWS.command.viewLogs%",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.help",
-                "title": "%AWS.command.help%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.github",
-                "title": "%AWS.command.github%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.quickStart",
-                "title": "%AWS.command.quickStart%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.cdk.refresh",
-                "title": "%AWS.command.refreshCdkExplorer%",
-                "category": "%AWS.title%",
-                "icon": {
-                    "dark": "resources/icons/vscode/dark/refresh.svg",
-                    "light": "resources/icons/vscode/light/refresh.svg"
-                },
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.cdk.viewDocs",
-                "title": "%AWS.generic.viewDocs%",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.stepfunctions.createStateMachineFromTemplate",
-                "title": "%AWS.command.stepFunctions.createStateMachineFromTemplate%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.stepfunctions.publishStateMachine",
-                "title": "%AWS.command.stepFunctions.publishStateMachine%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.previewStateMachine",
-                "title": "%AWS.command.stepFunctions.previewStateMachine%",
-                "category": "%AWS.title%",
-                "icon": "$(aws-stepfunctions-preview)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.cdk.renderStateMachineGraph",
-                "title": "%AWS.command.cdk.previewStateMachine%",
-                "category": "AWS",
-                "icon": "$(aws-stepfunctions-preview)"
-            },
-            {
-                "command": "aws.aboutToolkit",
-                "title": "%AWS.command.aboutToolkit%",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.cloudWatchLogs.viewLogStream",
-                "title": "%AWS.command.viewLogStream%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ssmDocument.createLocalDocument",
-                "title": "%AWS.command.ssmDocument.createLocalDocument%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ssmDocument.openLocalDocument",
-                "title": "%AWS.command.ssmDocument.openLocalDocument%",
-                "category": "%AWS.title%",
-                "icon": "$(cloud-download)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ssmDocument.openLocalDocumentJson",
-                "title": "%AWS.command.ssmDocument.openLocalDocumentJson%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ssmDocument.openLocalDocumentYaml",
-                "title": "%AWS.command.ssmDocument.openLocalDocumentYaml%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ssmDocument.deleteDocument",
-                "title": "%AWS.command.ssmDocument.deleteDocument%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ssmDocument.publishDocument",
-                "title": "%AWS.command.ssmDocument.publishDocument%",
-                "category": "%AWS.title%",
-                "icon": "$(cloud-upload)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ssmDocument.updateDocumentVersion",
-                "title": "%AWS.command.ssmDocument.updateDocumentVersion%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.copyLogStreamName",
-                "title": "%AWS.command.copyLogStreamName%",
-                "category": "%AWS.title%",
-                "icon": "$(files)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.saveCurrentLogStreamContent",
-                "title": "%AWS.command.saveCurrentLogStreamContent%",
-                "category": "%AWS.title%",
-                "icon": "$(save-as)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.addSamDebugConfig",
-                "title": "%AWS.command.addSamDebugConfig%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.toggleSamCodeLenses",
-                "title": "%AWS.command.toggleSamCodeLenses%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ecs.runCommandInContainer",
-                "title": "%AWS.ecs.runCommandInContainer%",
-                "category": "%AWS.title%",
-                "enablement": "viewItem == awsEcsContainerNodeExecEnabled",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ecs.openTaskInTerminal",
-                "title": "%AWS.ecs.openTaskInTerminal%",
-                "category": "%AWS.title%",
-                "enablement": "viewItem == awsEcsContainerNodeExecEnabled",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ecs.enableEcsExec",
-                "title": "%AWS.ecs.enableEcsExec%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ecs.viewDocumentation",
-                "title": "%AWS.generic.viewDocs%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.resources.copyIdentifier",
-                "title": "%AWS.command.resources.copyIdentifier%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.resources.openResourcePreview",
-                "title": "%AWS.generic.preview%",
-                "category": "%AWS.title%",
-                "icon": "$(open-preview)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.resources.createResource",
-                "title": "%AWS.generic.create%",
-                "category": "%AWS.title%",
-                "icon": "$(add)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.resources.deleteResource",
-                "title": "%AWS.generic.promptDelete%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.resources.updateResource",
-                "title": "%AWS.generic.promptUpdate%",
-                "category": "%AWS.title%",
-                "icon": "$(pencil)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.resources.updateResourceInline",
-                "title": "%AWS.generic.promptUpdate%",
-                "category": "%AWS.title%",
-                "icon": "$(pencil)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.resources.saveResource",
-                "title": "%AWS.generic.save%",
-                "category": "%AWS.title%",
-                "icon": "$(save)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.resources.closeResource",
-                "title": "%AWS.generic.close%",
-                "category": "%AWS.title%",
-                "icon": "$(close)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.resources.viewDocs",
-                "title": "%AWS.generic.viewDocs%",
-                "category": "%AWS.title%",
-                "icon": "$(book)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.resources.configure",
-                "title": "%AWS.command.resources.configure%",
-                "category": "%AWS.title%",
-                "icon": "$(gear)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.apprunner.createService",
-                "title": "%AWS.command.apprunner.createService%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.ecs.disableEcsExec",
-                "title": "%AWS.ecs.disableEcsExec%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.apprunner.createServiceFromEcr",
-                "title": "%AWS.command.apprunner.createServiceFromEcr%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.apprunner.pauseService",
-                "title": "%AWS.command.apprunner.pauseService%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.apprunner.resumeService",
-                "title": "%AWS.command.apprunner.resumeService%",
-                "category": "AWS",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.apprunner.copyServiceUrl",
-                "title": "%AWS.command.apprunner.copyServiceUrl%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.apprunner.open",
-                "title": "%AWS.command.apprunner.open%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.apprunner.deleteService",
-                "title": "%AWS.generic.promptDelete%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.apprunner.startDeployment",
-                "title": "%AWS.command.apprunner.startDeployment%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.cloudFormation.newTemplate",
-                "title": "%AWS.command.cloudFormation.newTemplate%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.sam.newTemplate",
-                "title": "%AWS.command.sam.newTemplate%",
-                "category": "%AWS.title%",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.samcli.sync",
-                "title": "%AWS.command.samcli.sync%",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.samcli.syncCode",
-                "title": "%AWS.command.samcli.syncCode%",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.codeWhisperer",
-                "title": "%AWS.command.codewhisperer.title%",
-                "category": "%AWS.title%"
-            },
-            {
-                "command": "aws.codeWhisperer.configure",
-                "title": "%AWS.command.codewhisperer.configure%",
-                "category": "%AWS.title%",
-                "icon": "$(gear)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.codeWhisperer.introduction",
-                "title": "%AWS.command.codewhisperer.introduction%",
-                "category": "%AWS.title%",
-                "icon": "$(question)",
-                "cloud9": {
-                    "cn": {
-                        "category": "%AWS.title.cn%"
-                    }
-                }
-            },
-            {
-                "command": "aws.codeWhisperer.removeConnection",
-                "title": "%AWS.command.codewhisperer.removeConnection%",
-                "category": "%AWS.title%",
-                "icon": "$(debug-disconnect)"
-            },
-            {
-                "command": "aws.dev.openMenu",
-                "title": "Open Developer Menu",
-                "category": "AWS (Developer)",
-                "enablement": "aws.isDevMode"
-            }
-        ],
-        "jsonValidation": [
-            {
-                "fileMatch": ".aws/templates.json",
-                "url": "./dist/src/templates/templates.json"
-            },
-            {
-                "fileMatch": "*ecs-task-def.json",
-                "url": "https://ecs-intellisense.s3-us-west-2.amazonaws.com/task-definition/schema.json"
-            }
-        ],
-        "languages": [
-            {
-                "id": "asl",
-                "extensions": [
-                    ".asl.json",
-                    ".asl"
-                ],
-                "aliases": [
-                    "Amazon States Language"
-                ]
-            },
-            {
-                "id": "asl-yaml",
-                "aliases": [
-                    "Amazon States Language (YAML)"
-                ],
-                "extensions": [
-                    ".asl.yaml",
-                    ".asl.yml"
-                ]
-            },
-            {
-                "id": "ssm-json",
-                "extensions": [
-                    ".ssm.json"
-                ],
-                "aliases": [
-                    "AWS Systems Manager Document (JSON)"
-                ]
-            },
-            {
-                "id": "ssm-yaml",
-                "extensions": [
-                    ".ssm.yaml",
-                    ".ssm.yml"
-                ],
-                "aliases": [
-                    "AWS Systems Manager Document (YAML)"
-                ]
-            }
-        ],
-        "keybindings": [
-            {
-                "command": "aws.previewStateMachine",
-                "key": "ctrl+shift+v",
-                "mac": "cmd+shift+v",
-                "when": "editorTextFocus && editorLangId == asl || editorTextFocus && editorLangId == asl-yaml"
-            },
-            {
-                "command": "aws.codeWhisperer",
-                "key": "alt+c",
-                "mac": "alt+c",
-                "when": "editorTextFocus"
-            },
-            {
-                "command": "aws.codeWhisperer.nextCodeSuggestion",
-                "key": "right",
-                "mac": "right",
-                "when": "editorTextFocus && CODEWHISPERER_SERVICE_ACTIVE"
-            },
-            {
-                "command": "aws.codeWhisperer.previousCodeSuggestion",
-                "key": "left",
-                "mac": "left",
-                "when": "editorTextFocus && CODEWHISPERER_SERVICE_ACTIVE"
-            },
-            {
-                "command": "aws.codeWhisperer.rejectCodeSuggestion",
-                "key": "escape",
-                "mac": "escape",
-                "when": "editorTextFocus && CODEWHISPERER_SERVICE_ACTIVE"
-            },
-            {
-                "command": "aws.codeWhisperer.rejectCodeSuggestion",
-                "key": "backspace",
-                "mac": "backspace",
-                "when": "editorTextFocus && CODEWHISPERER_SERVICE_ACTIVE"
-            },
-            {
-                "command": "aws.codeWhisperer.rejectCodeSuggestion",
-                "key": "up",
-                "mac": "up",
-                "when": "editorTextFocus && CODEWHISPERER_SERVICE_ACTIVE",
-                "args": "up"
-            },
-            {
-                "command": "aws.codeWhisperer.rejectCodeSuggestion",
-                "key": "down",
-                "mac": "down",
-                "when": "editorTextFocus && CODEWHISPERER_SERVICE_ACTIVE",
-                "args": "down"
-            },
-            {
-                "command": "aws.codeWhisperer.acceptCodeSuggestion",
-                "key": "tab",
-                "mac": "tab",
-                "when": "editorTextFocus && CODEWHISPERER_SERVICE_ACTIVE"
-            },
-            {
-                "key": "right",
-                "command": "editor.action.inlineSuggest.showNext",
-                "when": "inlineSuggestionVisible && !editorReadonly && CODEWHISPERER_ENABLED"
-            },
-            {
-                "key": "left",
-                "command": "editor.action.inlineSuggest.showPrevious",
-                "when": "inlineSuggestionVisible && !editorReadonly && CODEWHISPERER_ENABLED"
-            }
-        ],
-        "grammars": [
-            {
-                "language": "asl",
-                "scopeName": "source.asl",
-                "path": "./syntaxes/ASL.tmLanguage"
-            },
-            {
-                "language": "asl-yaml",
-                "scopeName": "source.asl.yaml",
-                "path": "./syntaxes/asl-yaml.tmLanguage.json"
-            },
-            {
-                "language": "ssm-json",
-                "scopeName": "source.ssmjson",
-                "path": "./syntaxes/SSMJSON.tmLanguage"
-            },
-            {
-                "language": "ssm-yaml",
-                "scopeName": "source.ssmyaml",
-                "path": "./syntaxes/SSMYAML.tmLanguage"
-            }
-        ],
-        "resourceLabelFormatters": [
-            {
-                "scheme": "awsCloudWatchLogs",
-                "formatting": {
-                    "label": "${path}",
-                    "separator": "\\"
-                }
-            },
-            {
-                "scheme": "s3*",
-                "formatting": {
-                    "label": "[S3] ${path}",
-                    "separator": "/"
-                }
-            }
-        ],
-        "walkthroughs": [
-            {
-                "id": "getStarted",
-                "title": "%AWS.walkthrough.gettingStarted.title%",
-                "description": "%AWS.walkthrough.gettingStarted.description%",
-                "cloud9": {
-                    "cn": {
-                        "description": "%AWS.walkthrough.gettingStarted.description.cn%"
-                    }
-                },
-                "steps": [
-                    {
-                        "id": "connect",
-                        "title": "%AWS.walkthrough.gettingStarted.connect%",
-                        "media": {
-                            "markdown": "resources/walkthrough/setup-connect.md"
-                        },
-                        "completionEvents": [
-                            "onCommand:aws.login",
-                            "onCommand:aws.credentials.profile.create"
-                        ]
-                    },
-                    {
-                        "id": "changeRegions",
-                        "title": "%AWS.walkthrough.gettingStarted.changeRegions%",
-                        "media": {
-                            "markdown": "resources/walkthrough/setup-region.md"
-                        },
-                        "completionEvents": [
-                            "onCommand:aws.showRegion"
-                        ]
-                    },
-                    {
-                        "id": "setupToolchain",
-                        "title": "%AWS.walkthrough.gettingStarted.setupToolchain%",
-                        "media": {
-                            "markdown": "resources/walkthrough/setup-toolchain.md"
-                        }
-                    }
-                ]
-            }
-        ],
-        "icons": {
-            "aws-apprunner-service": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\e1a5"
-                }
-            },
-            "aws-cdk-logo": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\e1a6"
-                }
-            },
-            "aws-cloudformation-stack": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\e1a7"
-                }
-            },
-            "aws-cloudwatch-log-group": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\e1a8"
-                }
-            },
-            "aws-codecatalyst-logo": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\e1a9"
-                }
-            },
-            "aws-ecr-registry": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\e1aa"
-                }
-            },
-            "aws-ecs-cluster": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\e1ab"
-                }
-            },
-            "aws-ecs-container": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\e1ac"
-                }
-            },
-            "aws-ecs-service": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\e1ad"
-                }
-            },
-            "aws-generic-attach-file": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\e1ae"
-                }
-            },
-            "aws-iot-certificate": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\e1af"
-                }
-            },
-            "aws-iot-policy": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\e1b0"
-                }
-            },
-            "aws-iot-thing": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\e1b1"
-                }
-            },
-            "aws-lambda-function": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\e1b2"
-                }
-            },
-            "aws-s3-bucket": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\e1b3"
-                }
-            },
-            "aws-s3-create-bucket": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\e1b4"
-                }
-            },
-            "aws-schemas-registry": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\e1b5"
-                }
-            },
-            "aws-schemas-schema": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\e1b6"
-                }
-            },
-            "aws-stepfunctions-preview": {
-                "description": "AWS Contributed Icon",
-                "default": {
-                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
-                    "fontCharacter": "\\e1b7"
-                }
-            }
-        }
-    },
-    "scripts": {
-        "vscode:prepublish": "npm run clean && npm run buildScripts && npm run lint && webpack --mode production && npm run copyFiles -- --webpacked",
-        "clean": "ts-node ./scripts/clean.ts dist",
-        "reset": "npm run clean -- node_modules && npm install",
-        "copyFiles": "ts-node ./scripts/build/copyFiles.ts",
-        "buildScripts": "npm run generateClients && npm run generatePackage && npm run generateNonCodeFiles && npm run copyFiles",
-        "compile": "npm run clean && npm run buildScripts && webpack --mode development && npm run copyFiles -- --webpacked",
-        "watch": "npm run clean && npm run buildScripts && tsc -watch -p ./",
-        "postinstall": "npm run generateTelemetry && npm run generateConfigurationAttributes",
-        "testCompile": "npm run buildScripts && tsc -p ./ && npm run instrument",
-        "test": "npm run testCompile && ts-node ./scripts/test/test.ts && npm run report",
-        "integrationTest": "npm run testCompile && ts-node ./scripts/test/integrationTest.ts && npm run report",
-        "lint": "eslint -c .eslintrc.js --ext .ts .",
-        "lintfix": "eslint -c .eslintrc.js --fix --ext .ts .",
-        "package": "ts-node ./scripts/build/package.ts",
-        "install-plugin": "vsce package -o aws-toolkit-vscode-test.vsix && code --install-extension aws-toolkit-vscode-test.vsix",
-        "generateClients": "ts-node ./scripts/build/generateServiceClient.ts ",
-        "generatePackage": "ts-node ./scripts/build/generateIcons.ts",
-        "generateTelemetry": "node node_modules/@aws-toolkits/telemetry/lib/generateTelemetry.js --extraInput=src/shared/telemetry/vscodeTelemetry.json --output=src/shared/telemetry/telemetry.gen.ts",
-        "generateNonCodeFiles": "ts-node ./scripts/build/generateNonCodeFiles.ts",
-        "generateConfigurationAttributes": "ts-node ./scripts/build/generateConfigurationAttributes.ts",
-        "newChange": "ts-node ./scripts/newChange.ts",
-        "createRelease": "ts-node ./scripts/build/createRelease.ts",
-        "serve": "webpack serve --config-name vue-hmr --mode development",
-        "instrument": "nyc instrument --in-place ./dist/src",
-        "report": "nyc report --reporter=html --reporter=json"
-    },
-    "devDependencies": {
-        "@aws-toolkits/telemetry": "^1.0.87",
-        "@cspotcode/source-map-support": "^0.8.1",
-        "@sinonjs/fake-timers": "^8.1.0",
-        "@types/adm-zip": "^0.4.34",
-        "@types/async-lock": "^1.1.3",
-        "@types/bytes": "^3.1.0",
-        "@types/cross-spawn": "^6.0.0",
-        "@types/fs-extra": "^9.0.11",
-        "@types/glob": "^7.1.1",
-        "@types/js-yaml": "^4.0.5",
-        "@types/lodash": "^4.14.180",
-        "@types/marked": "^4.0.2",
-        "@types/mime-types": "^2.1.1",
-        "@types/mocha": "^10.0.0",
-        "@types/node": "^14.18.5",
-        "@types/readline-sync": "^1.4.3",
-        "@types/semver": "^7.3.6",
-        "@types/sinon": "^10.0.5",
-        "@types/sinonjs__fake-timers": "^8.1.1",
-        "@types/tcp-port-used": "^1.0.1",
-        "@types/uuid": "^8.3.3",
-        "@types/vscode": "1.50.0",
-        "@types/vscode-webview": "^1.57.0",
-        "@types/xml2js": "^0.4.8",
-        "@typescript-eslint/eslint-plugin": "^5.38.0",
-        "@typescript-eslint/parser": "^5.38.0",
-        "@vscode/codicons": "^0.0.32",
-        "@vscode/test-electron": "^2.2.3",
-        "@vue/compiler-sfc": "^3.2.40",
-        "circular-dependency-plugin": "^5.2.2",
-        "css-loader": "^6.5.1",
-        "esbuild-loader": "2.20.0",
-        "eslint": "^8.26.0",
-        "eslint-config-prettier": "8.3",
-        "eslint-plugin-header": "^3.1.1",
-        "eslint-plugin-no-null": "^1.0.2",
-        "glob": "^7.1.7",
-        "husky": "^7.0.2",
-        "json-schema-to-typescript": "^11.0.2",
-        "marked": "^4.0.10",
-        "mocha": "^10.1.0",
-        "mocha-junit-reporter": "^2.0.0",
-        "mocha-multi-reporters": "^1.5.1",
-        "nyc": "^15.1.0",
-        "prettier": "^2.7.1",
-        "prettier-plugin-sh": "^0.8.1",
-        "pretty-quick": "^3.1.0",
-        "readline-sync": "^1.4.9",
-        "sinon": "^14.0.0",
-        "ts-mockito": "^2.5.0",
-        "ts-node": "^10.7.0",
-        "umd-compat-loader": "^2.1.2",
-        "vsce": "^2.6.3",
-        "vscode-nls-dev": "^3.3.1",
-        "vue-loader": "^16.8.1",
-        "vue-style-loader": "^4.1.3",
-        "webfont": "^11.2.26",
-        "webpack": "^5.65.0",
-        "webpack-cli": "^4.9.1",
-        "webpack-dev-server": "^4.9.2"
-    },
-    "dependencies": {
-        "@aws-sdk/client-sso": "^3.181.0",
-        "@aws-sdk/client-sso-oidc": "^3.181.0",
-        "@aws-sdk/credential-provider-ini": "^3.46.0",
-        "@aws-sdk/credential-provider-process": "^3.15.0",
-        "@aws-sdk/credential-provider-sso": "^3.38.0",
-        "@aws-sdk/util-arn-parser": "^3.46.0",
-        "@iarna/toml": "^2.2.5",
-        "adm-zip": "^0.5.9",
-        "amazon-states-language-service": "^1.8.0",
-        "async-lock": "^1.3.0",
-        "aws-sdk": "^2.1267.0",
-        "aws-ssm-document-language-service": "^1.0.0",
-        "bytes": "^3.1.2",
-        "cross-spawn": "^7.0.3",
-        "fast-json-patch": "^3.1.1",
-        "fs-extra": "^10.0.1",
-        "got": "^11.8.5",
-        "immutable": "^4.0.0",
-        "js-yaml": "^4.1.0",
-        "jsonc-parser": "^3.0.0",
-        "lodash": "^4.17.21",
-        "mime-types": "^2.1.32",
-        "moment": "^2.29.4",
-        "portfinder": "^1.0.25",
-        "semver": "^7.3.5",
-        "strip-ansi": "^5.2.0",
-        "tcp-port-used": "^1.0.1",
-        "typescript": "^4.8.4",
-        "uuid": "^8.3.2",
-        "vscode-languageclient": "^6.1.4",
-        "vscode-languageserver": "^6.1.1",
-        "vscode-languageserver-textdocument": "^1.0.3",
-        "vscode-nls": "^5.0.0",
-        "vue": "^3.2.31",
-        "winston": "^3.7.1",
-        "winston-transport": "^4.5.0",
-        "xml2js": "^0.4.19",
-        "yaml": "^1.9.2",
-        "yaml-cfn": "^0.3.1"
-    },
     "prettier": {
         "printWidth": 120,
         "trailingComma": "es5",
@@ -3626,7 +15,70 @@
         "singleQuote": true,
         "semi": false,
         "bracketSpacing": true,
-        "arrowParens": "avoid",
+        "arrowParens": "always",
         "endOfLine": "lf"
+    },
+    "scripts": {
+        "prepare": "ts-node ./scripts/prepare.ts",
+        "preinstall": "cd src.gen/@amzn/codewhisperer-streaming && npm i && cd ../amazon-q-developer-streaming-client && npm i",
+        "postinstall": "npm run buildCustomLintPlugin && npm run postinstall -ws --if-present",
+        "buildCustomLintPlugin": "npm run build -w plugins/eslint-plugin-aws-toolkits",
+        "compile": "npm run compile -w packages/",
+        "testCompile": "npm run testCompile -w packages/ --if-present",
+        "test": "npm run test -w packages/ --if-present",
+        "testWeb": "npm run testWeb -w packages/ --if-present",
+        "testE2E": "npm run testE2E -w packages/ --if-present",
+        "testInteg": "npm run testInteg -w packages/ --if-present",
+        "package": "npm run package -w packages/toolkit -w packages/amazonq",
+        "newChange": "echo 'Must specify subproject/workspace with -w packages/<subproject>' && false",
+        "createRelease": "echo 'Must specify subproject/workspace with -w packages/<subproject>' && false",
+        "lint": "npm run lint -w packages/ --if-present",
+        "lintfix": "eslint -c .eslintrc.js --ignore-path .gitignore --ignore-pattern '**/*.json' --ignore-pattern '**/*.gen.ts' --ignore-pattern '**/types/*.d.ts' --ignore-pattern '**/src/testFixtures/**' --fix --ext .ts packages plugins",
+        "clean": "npm run clean -w packages/ -w plugins/",
+        "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/",
+        "scan-licenses": "ts-node ./scripts/scan-licenses.ts"
+    },
+    "devDependencies": {
+        "@aws-toolkits/telemetry": "^1.0.329",
+        "@playwright/browser-chromium": "^1.43.1",
+        "@stylistic/eslint-plugin": "^2.11.0",
+        "@types/he": "^1.2.3",
+        "@types/jaro-winkler": "^0.2.4",
+        "@types/vscode": "^1.68.0",
+        "@types/vscode-webview": "^1.57.1",
+        "@types/webpack-env": "^1.18.5",
+        "@typescript-eslint/eslint-plugin": "^7.14.1",
+        "@typescript-eslint/parser": "^7.14.1",
+        "@vscode/codicons": "^0.0.33",
+        "@vscode/test-electron": "^2.3.8",
+        "@vscode/test-web": "^0.0.65",
+        "@vscode/vsce": "^2.19.0",
+        "eslint": "^8.56.0",
+        "eslint-config-prettier": "^9.1.0",
+        "eslint-plugin-aws-toolkits": "file:plugins/eslint-plugin-aws-toolkits",
+        "eslint-plugin-header": "^3.1.1",
+        "eslint-plugin-prettier": "^5.1.3",
+        "eslint-plugin-security-node": "^1.1.4",
+        "eslint-plugin-unicorn": "^54.0.0",
+        "husky": "^9.0.7",
+        "prettier": "^3.3.3",
+        "prettier-plugin-sh": "^0.14.0",
+        "pretty-quick": "^4.0.0",
+        "ts-node": "^10.9.1",
+        "typescript": "^5.0.4",
+        "webpack": "^5.95.0",
+        "webpack-cli": "^5.1.4",
+        "webpack-dev-server": "^4.15.2",
+        "webpack-merge": "^5.10.0"
+    },
+    "dependencies": {
+        "@aws/language-server-runtimes": "^0.2.128",
+        "@types/node": "^22.7.5",
+        "jaro-winkler": "^0.2.8",
+        "vscode-nls": "^5.2.0",
+        "vscode-nls-dev": "^4.0.4"
     }
 }
diff --git a/package.nls.json b/package.nls.json
deleted file mode 100644
index 3b0c0e7cc47..00000000000
--- a/package.nls.json
+++ /dev/null
@@ -1,210 +0,0 @@
-{
-    "AWS.title": "AWS",
-    "AWS.title.cn": "Amazon",
-    "AWS.productName": "AWS Toolkit",
-    "AWS.productName.cn": "Amazon Toolkit",
-    "AWS.configuration.profileDescription": "The name of the credential profile to obtain credentials from.",
-    "AWS.configuration.description.lambda.recentlyUploaded": "Recently selected Lambda upload targets.",
-    "AWS.configuration.description.ecs.openTerminalCommand": "The command to run when starting a new interactive terminal session.",
-    "AWS.configuration.description.logLevel": "The AWS Toolkit's log level (changes reflected on restart)",
-    "AWS.configuration.description.logLevel.cn": "The Amazon Toolkit's log level (changes reflected on restart)",
-    "AWS.configuration.description.iot.maxItemsPerPage": "Controls how many IoT Things, Certificates, or Policies are listed before showing a node to `Load More...`.",
-    "AWS.configuration.description.s3.maxItemsPerPage": "Controls how many S3 items are listed before showing a node to `Load More...`.\nThis corresponds to the `MaxKeys` requested in a single call to S3. [Learn More](https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html#AmazonS3-ListObjectsV2-response-MaxKeys)",
-    "AWS.configuration.description.samcli.lambdaTimeout": "Maximum time (in milliseconds) to wait for SAM output while starting a Local Lambda session",
-    "AWS.configuration.description.samcli.location": "Location of SAM CLI. SAM CLI is used to create, build, package, and deploy Serverless Applications. [Learn More](https://aws.amazon.com/serverless/sam/)",
-    "AWS.configuration.description.samcli.legacyDeploy": "Use the legacy SAM deploy experience, disabling all SAM sync functionality.",
-    "AWS.configuration.description.telemetry": "Enable AWS Toolkit to send usage data to AWS.",
-    "AWS.configuration.description.telemetry.cn": "Enable Amazon Toolkit to send usage data to Amazon.",
-    "AWS.configuration.description.suppressPrompts": "Prompts which ask for confirmation. Checking an item suppresses the prompt.",
-    "AWS.configuration.enableCodeLenses": "Enable SAM hints in source files",
-    "AWS.configuration.description.resources.enabledResources": "AWS resources to display in the 'Resources' portion of the explorer.",
-    "AWS.configuration.description.experiments": "Try experimental features and give feedback. Note that experimental features may be removed at any time.\n * `jsonResourceModification` - Enables basic create, update, and delete support for cloud resources via the JSON Resources explorer component.\n * `samSyncCode` - Adds an additional code-only option when synchronizing SAM applications. Code-only synchronizations are faster but can cause drift in the CloudFormation stack. Does nothing when using the legacy SAM deploy feature.",
-    "AWS.stepFunctions.asl.format.enable.desc": "Enables the default formatter used with Amazon States Language files",
-    "AWS.stepFunctions.asl.maxItemsComputed.desc": "The maximum number of outline symbols and folding regions computed (limited for performance reasons).",
-    "AWS.configuration.description.awssam.debug.api": "API Gateway configuration",
-    "AWS.configuration.description.awssam.debug.api.clientCertId": "The API Gateway client certificate ID",
-    "AWS.configuration.description.awssam.debug.api.headers": "Additional HTTP headers",
-    "AWS.configuration.description.awssam.debug.api.httpMethod": "The HTTP message method that will be used",
-    "AWS.configuration.description.awssam.debug.api.path": "The path to the api (must start with /)",
-    "AWS.configuration.description.awssam.debug.api.queryString": "URL query string (e.g. key=foo&value=bar)",
-    "AWS.configuration.description.awssam.debug.api.stageVariables": "key-value map of API Gateway stage variables",
-    "AWS.configuration.description.awssam.debug.buildDir": "Base directory to build and run the application.\n A temporary directory will be created if not specified.",
-    "AWS.configuration.description.awssam.debug.label": "AWS SAM: Debug Lambda Function Locally",
-    "AWS.configuration.description.awssam.debug.invokeTarget": "Configures the application to launch",
-    "AWS.configuration.description.awssam.debug.target": "The type of invocation to launch. Possible values:\n* `template` uses a CFN/SAM Template as an entrypoint\n* `code` invokes Lambda code directly.\n* `api` uses the CFN/SAM Template to emulate API Gateway",
-    "AWS.configuration.description.awssam.debug.architecture": "Architecture used for local SAM Lambda emulation",
-    "AWS.configuration.description.awssam.debug.lambdaHandler": "Lambda Function handler to invoke.",
-    "AWS.configuration.description.awssam.debug.projectRoot": "The root of the project, used to determine where in the file-system to locate the lambdaHandler.",
-    "AWS.configuration.description.awssam.debug.templatePath": "Path to the CFN/SAM template.",
-    "AWS.configuration.description.awssam.debug.logicalId": "Resource name of an AWS::Lambda::Function or AWS::Serverless::Function to invoke.",
-    "AWS.configuration.description.awssam.debug.envvars": "Environment variables to pass to the function invocation (replaces template variables).",
-    "AWS.configuration.description.awssam.debug.lambda": "Lambda specific details of the invocation",
-    "AWS.configuration.description.awssam.debug.memoryMb": "The amount of memory (in Mb) the Lambda function has access to.",
-    "AWS.configuration.description.awssam.debug.runtime": "The Lambda Function's runtime",
-    "AWS.configuration.description.awssam.debug.timeout": "The amount of time (in seconds) that Lambda allows a function to run before stopping it.",
-    "AWS.configuration.description.awssam.debug.aws": "AWS connection details",
-    "AWS.configuration.description.awssam.debug.credentials": "The AWS credentials provider and name to use during the invocation. Example: credential profile \"default\" would be entered as `profile:default`.",
-    "AWS.configuration.description.awssam.debug.credentials.cn": "The Amazon credentials provider and name to use during the invocation. Example: credential profile \"default\" would be entered as `profile:default`.",
-    "AWS.configuration.description.awssam.debug.region": "AWS region to use during the invocation.",
-    "AWS.configuration.description.awssam.debug.event": "Event payload to pass to the Lambda invocation.\n Must specify one of 'json' or 'path'.",
-    "AWS.configuration.description.awssam.debug.event.json": "JSON definition to use as the event payload",
-    "AWS.configuration.description.awssam.debug.event.path": "Path to a file to use as the event payload",
-    "AWS.configuration.description.awssam.debug.sam": "SAM CLI specific configurations",
-    "AWS.configuration.description.awssam.debug.buildArguments": "Additional arguments to pass to the `sam build` command.",
-    "AWS.configuration.description.awssam.debug.containerBuild": "Whether to build inside a container (default: false).",
-    "AWS.configuration.description.awssam.debug.dockerNetwork": "Specifies the name or id of an existing Docker network that Lambda Docker containers should connect to.",
-    "AWS.configuration.description.awssam.debug.localArguments": "Additional arguments to pass to the `sam local` command.",
-    "AWS.configuration.description.awssam.debug.skipNewImageCheck": "Specifies whether the command should skip pulling down the latest Docker image for Lambda runtime (default: false).",
-    "AWS.configuration.description.awssam.debug.template": "Values to override in the template",
-    "AWS.configuration.description.awssam.debug.templateParameters": "Key:value mappings for SAM template parameter overrides. More information can be found here: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stackinstances-override.html#stackinstances-override-cli",
-    "AWS.configuration.description.awssam.debug.snippets.lambdaCode.label": "AWS SAM: Direct Lambda handler invoke",
-    "AWS.configuration.description.awssam.debug.snippets.lambdaCode.description": "A new configuration for invoking an AWS Lambda directly via the SAM CLI.",
-    "AWS.configuration.description.awssam.debug.snippets.lambdaCode.label.cn": "Amazon SAM: Direct Lambda handler invoke",
-    "AWS.configuration.description.awssam.debug.snippets.lambdaCode.description.cn": "A new configuration for invoking an Amazon Lambda directly via the SAM CLI.",
-    "AWS.configuration.description.awssam.debug.snippets.lambdaTemplate.label": "AWS SAM: Template-based Lambda invoke",
-    "AWS.configuration.description.awssam.debug.snippets.lambdaTemplate.description": "A new configuration for invoking an AWS Lambda in a CloudFormation template via the SAM CLI.",
-    "AWS.configuration.description.awssam.debug.snippets.lambdaTemplate.label.cn": "Amazon SAM: Template-based Lambda invoke",
-    "AWS.configuration.description.awssam.debug.snippets.lambdaTemplate.description.cn": "A new configuration for invoking an Amazon Lambda in a CloudFormation template via the SAM CLI.",
-    "AWS.configuration.description.awssam.debug.snippets.api.label": "AWS SAM: API Gateway lambda invoke",
-    "AWS.configuration.description.awssam.debug.snippets.api.description": "A new configuration for invoking an AWS Lambda in a CloudFormation template, simulating API Gateway",
-    "AWS.configuration.description.awssam.debug.snippets.api.label.cn": "Amazon SAM: API Gateway lambda invoke",
-    "AWS.configuration.description.awssam.debug.snippets.api.description.cn": "A new configuration for invoking an Amazon Lambda in a CloudFormation template, simulating API Gateway",
-    "AWS.configuration.description.codewhisperer": "When checked, CodeWhisperer will include suggestions with code references",
-    "AWS.configuration.description.codewhisperer.shareCodeWhispererContentWithAWS": "When checked, your content processed by CodeWhisperer may be used for service improvement. Unchecking this box will cause AWS to delete any of your content used for that purpose. The information used to provide the CodeWhisperer service to you will not be affected. See the Preview terms and [Service Terms](https://aws.amazon.com/service-terms/) for more detail.",
-    "AWS.command.apig.copyUrl": "Copy URL",
-    "AWS.command.apig.invokeRemoteRestApi": "Invoke on AWS",
-    "AWS.command.apig.invokeRemoteRestApi.cn": "Invoke on Amazon",
-    "AWS.command.auth.addConnection": "Add New Connection",
-    "AWS.command.auth.switchConnections": "Switch Connections",
-    "AWS.command.auth.signout": "Sign out",
-    "AWS.command.github": "View Source on GitHub",
-    "AWS.command.help": "View Toolkit Documentation",
-    "AWS.command.login": "Connect to AWS",
-    "AWS.command.login.cn": "Connect to Amazon",
-    "AWS.command.logout": "Sign out",
-    "AWS.command.createIssueOnGitHub": "Report Toolkit Issue",
-    "AWS.command.createNewSamApp": "Create Lambda SAM Application",
-    "AWS.command.credentials.profile.create": "Create Credentials Profile",
-    "AWS.command.credentials.edit": "Edit Credentials",
-    "AWS.command.showRegion": "Show or Hide Regions",
-    "AWS.command.codecatalyst.openOrg": "Open CodeCatalyst Space",
-    "AWS.command.codecatalyst.openProject": "Open CodeCatalyst Project",
-    "AWS.command.codecatalyst.openRepo": "Open CodeCatalyst Repository",
-    "AWS.command.codecatalyst.openDevEnv": "Open CodeCatalyst Dev Environment",
-    "AWS.command.codecatalyst.cloneRepo": "Clone CodeCatalyst Repository",
-    "AWS.command.codecatalyst.createDevEnv": "Create CodeCatalyst Dev Environment",
-    "AWS.command.codecatalyst.listCommands": "List CodeCatalyst Commands",
-    "AWS.command.codecatalyst.login": "Connect to CodeCatalyst",
-    "AWS.command.codecatalyst.logout": "Sign out of CodeCatalyst",
-    "AWS.command.codecatalyst.removeConnection": "Remove Connection from Tool",
-    "AWS.command.deploySamApplication": "Deploy SAM Application",
-    "AWS.command.aboutToolkit": "About Toolkit",
-    "AWS.command.downloadLambda": "Download...",
-    "AWS.command.uploadLambda": "Upload Lambda...",
-    "AWS.command.invokeLambda": "Invoke on AWS",
-    "AWS.command.invokeLambda.cn": "Invoke on Amazon",
-    "AWS.command.refreshAwsExplorer": "Refresh Explorer",
-    "AWS.command.refreshCdkExplorer": "Refresh CDK Explorer",
-    "AWS.command.cdk.help": "View CDK Documentation",
-    "AWS.command.ecr.copyTagUri": "Copy Tag URI",
-    "AWS.command.ecr.copyRepositoryUri": "Copy Repository URI",
-    "AWS.command.ecr.createRepository": "Create Repository...",
-    "AWS.command.ecr.deleteRepository": "Delete Repository...",
-    "AWS.command.ecr.deleteTag": "Delete Tag...",
-    "AWS.ecs.enableEcsExec": "Enable Command Execution",
-    "AWS.ecs.disableEcsExec": "Disable Command Execution",
-    "AWS.ecs.runCommandInContainer": "Run Command in Container",
-    "AWS.ecs.openTaskInTerminal": "Open Terminal...",
-    "AWS.command.samcli.detect": "Detect SAM CLI",
-    "AWS.command.deleteCloudFormation": "Delete CloudFormation Stack",
-    "AWS.command.viewSchemaItem": "View Schema",
-    "AWS.command.searchSchema": "Search Schemas",
-    "AWS.command.executeStateMachine": "Start Execution...",
-    "AWS.command.renderStateMachineGraph": "Render graph",
-    "AWS.command.copyArn": "Copy ARN",
-    "AWS.command.copyName": "Copy Name",
-    "AWS.command.listCommands": "Show AWS Commands...",
-    "AWS.command.listCommands.cn": "Show Amazon Commands...",
-    "AWS.command.downloadStateMachineDefinition": "Download Definition...",
-    "AWS.command.searchSchemaPerRegistry": "Search Schemas in Registry",
-    "AWS.command.submitFeedback": "Send Feedback...",
-    "AWS.command.downloadSchemaItemCode": "Download Code Bindings",
-    "AWS.command.viewLogs": "View Toolkit Logs",
-    "AWS.command.sam.newTemplate": "Create new SAM Template",
-    "AWS.command.cloudFormation.newTemplate": "Create new CloudFormation Template",
-    "AWS.command.quickStart": "View Quick Start",
-    "AWS.command.iot.createThing": "Create Thing...",
-    "AWS.command.iot.createCert": "Create Certificate...",
-    "AWS.command.iot.createPolicy": "Create Policy from Document...",
-    "AWS.command.iot.createPolicyVersion": "Create new version from Document...",
-    "AWS.command.iot.attachCert": "Attach Certificate...",
-    "AWS.command.iot.attachPolicy": "Attach Policy...",
-    "AWS.command.iot.activateCert": "Activate...",
-    "AWS.command.iot.deactivateCert": "Deactivate...",
-    "AWS.command.iot.revokeCert": "Revoke...",
-    "AWS.command.iot.detachCert": "Detach...",
-    "AWS.command.iot.setDefaultPolicy": "Set as Default",
-    "AWS.command.iot.viewPolicyVersion": "View...",
-    "AWS.command.iot.copyEndpoint": "Copy Endpoint...",
-    "AWS.command.samcli.sync": "Sync SAM Application",
-    "AWS.command.samcli.syncCode": "Sync SAM Application (code only)",
-    "AWS.command.s3.downloadFileAs": "Download As...",
-    "AWS.command.s3.editFile": "Edit File",
-    "AWS.command.s3.openFile": "Open File",
-    "AWS.command.s3.copyPath": "Copy Path",
-    "AWS.command.s3.presignedURL": "Generate Presigned URL...",
-    "AWS.command.s3.createBucket": "Create Bucket...",
-    "AWS.command.s3.createFolder": "Create Folder...",
-    "AWS.command.s3.uploadFile": "Upload Files...",
-    "AWS.command.s3.uploadFileToParent": "Upload to Parent...",
-    "AWS.command.stepFunctions.createStateMachineFromTemplate": "Create a new Step Functions state machine",
-    "AWS.command.stepFunctions.publishStateMachine": "Publish state machine to Step Functions",
-    "AWS.command.stepFunctions.previewStateMachine": "Render state machine graph",
-    "AWS.command.cdk.previewStateMachine": "Render state machine graph from CDK application",
-    "AWS.command.copyLogStreamName": "Copy Log Stream Name",
-    "AWS.command.saveCurrentLogStreamContent": "Save Current Log Content to File",
-    "AWS.command.viewLogStream": "View Log Stream...",
-    "AWS.command.ssmDocument.createLocalDocument": "Create a new Systems Manager Document locally",
-    "AWS.command.ssmDocument.deleteDocument": "Delete Document",
-    "AWS.command.ssmDocument.updateDocumentVersion": "Set Default Version",
-    "AWS.command.ssmDocument.openLocalDocument": "Download",
-    "AWS.command.ssmDocument.openLocalDocumentJson": "Download as JSON",
-    "AWS.command.ssmDocument.openLocalDocumentYaml": "Download as YAML",
-    "AWS.command.ssmDocument.publishDocument": "Publish a Systems Manager Document",
-    "AWS.command.launchConfigForm.title": "Edit SAM Debug Configuration",
-    "AWS.command.addSamDebugConfig": "Add SAM Debug Configuration",
-    "AWS.command.toggleSamCodeLenses": "Toggle SAM hints in source files",
-    "AWS.command.apprunner.createService": "Create Service",
-    "AWS.command.apprunner.createServiceFromEcr": "Create App Runner Service",
-    "AWS.command.apprunner.pauseService": "Pause Service",
-    "AWS.command.apprunner.resumeService": "Resume Service",
-    "AWS.command.apprunner.copyServiceUrl": "Copy Service URL",
-    "AWS.command.apprunner.open": "Open in Browser",
-    "AWS.command.apprunner.startDeployment": "Start Deployment",
-    "AWS.command.resources.copyIdentifier": "Copy Identifier",
-    "AWS.command.resources.configure": "Show Resources...",
-    "AWS.command.codewhisperer.introduction": "What is CodeWhisperer?",
-    "AWS.command.codewhisperer.configure": "CodeWhisperer Settings",
-    "AWS.command.codewhisperer.removeConnection": "Remove Connection from Tool",
-    "AWS.lambda.explorerTitle": "Explorer",
-    "AWS.developerTools.explorerTitle": "Developer Tools",
-    "AWS.cloudWatchLogs.limit.desc": "Maximum amount of log entries pulled per request from CloudWatch Logs (max 10000)",
-    "AWS.samcli.deploy.bucket.recentlyUsed": "Buckets recently used for SAM deployments",
-    "AWS.submenu.auth.title": "Authentication",
-    "AWS.generic.create": "Create...",
-    "AWS.generic.save": "Save",
-    "AWS.generic.close": "Close",
-    "AWS.generic.copyUrl": "Copy URL",
-    "AWS.generic.promptDelete": "Delete...",
-    "AWS.generic.promptUpdate": "Update...",
-    "AWS.generic.preview": "Preview",
-    "AWS.generic.viewDocs": "View Documentation",
-    "AWS.ssmDocument.ssm.maxItemsComputed.desc": "Controls the maximum number of problems produced by the SSM Document language server.",
-    "AWS.walkthrough.gettingStarted.title": "Get started with AWS",
-    "AWS.walkthrough.gettingStarted.description": "These walkthroughs help you set up the AWS Toolkit.",
-    "AWS.walkthrough.gettingStarted.description.cn": "These walkthroughs help you set up the Amazon Toolkit.",
-    "AWS.walkthrough.gettingStarted.connect": "Connect to AWS",
-    "AWS.walkthrough.gettingStarted.changeRegions": "Change AWS Regions",
-    "AWS.walkthrough.gettingStarted.setupToolchain": "Configure your toolchain",
-    "AWS.command.codewhisperer.title": "CodeWhisperer Invoke Service"
-}
diff --git a/packages/.vscodeignore.packages b/packages/.vscodeignore.packages
new file mode 100644
index 00000000000..239c2bb0fe2
--- /dev/null
+++ b/packages/.vscodeignore.packages
@@ -0,0 +1,28 @@
+# Ignore everything by default. #1899
+*
+*/**
+
+# Ignore outside dirs up to the root package.json, otherwise those will be collected as well
+# (until vsce officially supports workspaces: https://github.com/microsoft/vscode-vsce/issues/580)
+../**
+../../**
+
+# Allowlist
+# ---------
+!dist/*
+!dist/libs
+!dist/*/!(testFixtures|test)/**/!(*.*.map)
+!dist/*/!(*.*.map)
+!resources/**
+!syntaxes/**
+!templates/**
+!types/**
+!package.json
+!package.nls.json
+!package.nls.*.json
+
+!quickStart**
+!README.**
+!CHANGELOG.md
+!LICENSE
+!NOTICE
diff --git a/packages/amazonq/.c8rc.json b/packages/amazonq/.c8rc.json
new file mode 100644
index 00000000000..95d5af7c32b
--- /dev/null
+++ b/packages/amazonq/.c8rc.json
@@ -0,0 +1,6 @@
+{
+    "report-dir": "../../coverage/amazonq",
+    "reporter": ["lcov"],
+    "all": true,
+    "exclude": ["**/test*/**", "**/node_modules/**"]
+}
diff --git a/packages/amazonq/.changes/1.0.0.json b/packages/amazonq/.changes/1.0.0.json
new file mode 100644
index 00000000000..9499804cd6d
--- /dev/null
+++ b/packages/amazonq/.changes/1.0.0.json
@@ -0,0 +1,86 @@
+{
+	"date": "2024-04-29",
+	"version": "1.0.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Code Transformation: Address various issues in TransformationHub UX."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Code Transformation: Transform may fail if JAVA_HOME has leading or trailing whitespace"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Chat: Q panel doesn't fit to its parent"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Feature Development: update welcome message and menu item description for /dev command"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Code Transformation: show error messages in chat"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Code Transformation: Proposed changes not updated when multiple transformation jobs run in sequence."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Feature Development: Update error message for monthly conversation limit reach"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Code Transformation: Omit Maven metadata files when uploading dependencies to fix certain build failures in backend."
+		},
+		{
+			"type": "Feature",
+			"description": "Code Transformation: Refreshed UI during CodeTransformation"
+		},
+		{
+			"type": "Feature",
+			"description": "Chat: cmd + i to open chat"
+		},
+		{
+			"type": "Feature",
+			"description": "Right Click + no code selected shows Q context menu"
+		},
+		{
+			"type": "Feature",
+			"description": "Security Scan: Scans can now run on all files in the project"
+		},
+		{
+			"type": "Feature",
+			"description": "Chat: Updates quick action commands style and groupings"
+		},
+		{
+			"type": "Feature",
+			"description": "Code Transformation: add details about expected changes in transformation plan"
+		},
+		{
+			"type": "Feature",
+			"description": "Enable Amazon Q feature development and Amazon Q transform capabilities (/dev and /transform) for AWS Builder ID users."
+		},
+		{
+			"type": "Feature",
+			"description": "Initial release"
+		},
+		{
+			"type": "Feature",
+			"description": "Chat: Added metric parameters to recordAddMessage telemetry event."
+		},
+		{
+			"type": "Feature",
+			"description": "Security Scan: Scans can now run automatically when file changes are made"
+		},
+		{
+			"type": "Feature",
+			"description": "Chat: brief CodeLens to advertise chat"
+		},
+		{
+			"type": "Feature",
+			"description": "Security Scan: Send security issue to chat for explanation and fix"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.1.0.json b/packages/amazonq/.changes/1.1.0.json
new file mode 100644
index 00000000000..4e3083f31a5
--- /dev/null
+++ b/packages/amazonq/.changes/1.1.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2024-04-30",
+	"version": "1.1.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Fixed markdown is not getting parsed inside list items."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Copy to clipboard on code blocks doesn't work"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fixed a crash when trying to use Q /dev on large projects or projects containing files with unsupported encoding."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.10.0.json b/packages/amazonq/.changes/1.10.0.json
new file mode 100644
index 00000000000..6d6521e6fa6
--- /dev/null
+++ b/packages/amazonq/.changes/1.10.0.json
@@ -0,0 +1,30 @@
+{
+	"date": "2024-06-21",
+	"version": "1.10.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Security Scan: Fixes an issue where project-scans time out for larger projects."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /dev command: Fix file rejections for files outside of src/"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Feature Development: update /dev welcome message"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Fixed broken code blocks with typewriter text in list items."
+		},
+		{
+			"type": "Feature",
+			"description": "UX: New style for the login window"
+		},
+		{
+			"type": "Removal",
+			"description": "Auth: No longer share SSO sessions with AWS Toolkit."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.100.0.json b/packages/amazonq/.changes/1.100.0.json
new file mode 100644
index 00000000000..e1deb61908b
--- /dev/null
+++ b/packages/amazonq/.changes/1.100.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-10-16",
+	"version": "1.100.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.101.0.json b/packages/amazonq/.changes/1.101.0.json
new file mode 100644
index 00000000000..7a72dabfc9e
--- /dev/null
+++ b/packages/amazonq/.changes/1.101.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-10-22",
+	"version": "1.101.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.102.0.json b/packages/amazonq/.changes/1.102.0.json
new file mode 100644
index 00000000000..df8ee166397
--- /dev/null
+++ b/packages/amazonq/.changes/1.102.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-10-30",
+	"version": "1.102.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.11.0.json b/packages/amazonq/.changes/1.11.0.json
new file mode 100644
index 00000000000..202625b2560
--- /dev/null
+++ b/packages/amazonq/.changes/1.11.0.json
@@ -0,0 +1,26 @@
+{
+	"date": "2024-06-27",
+	"version": "1.11.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Fix for inline buttons don't have borders"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Fix for some edge cases when followups appear on top without styles"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Fix for prompt input removes whole word if it starts with @ character but there is no context selected"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Fix for prompt input doesn't show multi line content properly after it reaches 10-15 lines"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /dev command: Fix in progress experience for ongoing backend calls"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.12.0.json b/packages/amazonq/.changes/1.12.0.json
new file mode 100644
index 00000000000..a2cf430a220
--- /dev/null
+++ b/packages/amazonq/.changes/1.12.0.json
@@ -0,0 +1,46 @@
+{
+	"date": "2024-07-08",
+	"version": "1.12.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Security Scans: Fixed unnecessary yellow lines appearing in both auto scans and project scans."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Fixed prompt input becomes invisible if an html special character is inserted"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Fixed button font sizes are too big"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Fixed buttons don't show borders inside a message"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Code Transform: Link UI messages to troubleshooting docs"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /dev command: improve user error messages"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Fixed button texts are cropped too short"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Fixed prompt input and selected command horizontal alignment"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Fixed prompt input becomes invisible when multine text inserted with paste"
+		},
+		{
+			"type": "Feature",
+			"description": "Q feature dev: Only use relevant code and related files"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.13.0.json b/packages/amazonq/.changes/1.13.0.json
new file mode 100644
index 00000000000..7bf940dd04a
--- /dev/null
+++ b/packages/amazonq/.changes/1.13.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2024-07-11",
+	"version": "1.13.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "AD/LDAP users may see \"uv_os_get_passwd ENOENT\" error on startup #5277"
+		},
+		{
+			"type": "Feature",
+			"description": "Add support for [Amazon Q Chat Workspace Context](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/workspace-context.html). Customers can use `@workspace` to ask questions regarding local workspace."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.14.0.json b/packages/amazonq/.changes/1.14.0.json
new file mode 100644
index 00000000000..95f9248b933
--- /dev/null
+++ b/packages/amazonq/.changes/1.14.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2024-07-11",
+	"version": "1.14.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Amazon Q/dev proactively show code generation iterations"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.15.0.json b/packages/amazonq/.changes/1.15.0.json
new file mode 100644
index 00000000000..cda200cb196
--- /dev/null
+++ b/packages/amazonq/.changes/1.15.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2024-07-15",
+	"version": "1.15.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Fixes a bug when the prompt input exceeds the width of the chat box it's not always wrapped correctly."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q: Corrected a miswording in the Amazon Q: Share Content With AWS setting."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Fixes a bug when user input contains 4 or more spaces at the beginning of the line for multiline inputs, that line appears like a code block instead of a paragraph"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.16.0.json b/packages/amazonq/.changes/1.16.0.json
new file mode 100644
index 00000000000..1d24082abd6
--- /dev/null
+++ b/packages/amazonq/.changes/1.16.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2024-07-18",
+	"version": "1.16.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon q /dev: include granular error handling for code generation failed state"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Code Transformation: always show build logs from last job run"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Unexpected SSO expiration on Windows due to EPERM"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.17.0.json b/packages/amazonq/.changes/1.17.0.json
new file mode 100644
index 00000000000..d65bee6fdcc
--- /dev/null
+++ b/packages/amazonq/.changes/1.17.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2024-07-25",
+	"version": "1.17.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Dev and Transform introduction text formatted incorrectly"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /dev: update error message for code gen timeout and include backfill for error name"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Sign-in page may fail to render in rare circumstances."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.18.0.json b/packages/amazonq/.changes/1.18.0.json
new file mode 100644
index 00000000000..8ca73a4cc3f
--- /dev/null
+++ b/packages/amazonq/.changes/1.18.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2024-07-29",
+	"version": "1.18.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Security Scan: Fixed an issue scans were not able to succeed on Java projects with .class files"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "FileNotFound error causing early SSO expiration"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.19.0.json b/packages/amazonq/.changes/1.19.0.json
new file mode 100644
index 00000000000..90fe678b7fd
--- /dev/null
+++ b/packages/amazonq/.changes/1.19.0.json
@@ -0,0 +1,26 @@
+{
+	"date": "2024-08-01",
+	"version": "1.19.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Fixing issue with an incorrect input cursor position in the prompt text box"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Fixing issue with the max tabs notification not being dismissible."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Showing/hiding the scrollbars is now controlled by the OS settings"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Q chat may stop responding after processing Python/Java code"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon q /dev: i18n support for messaging"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.2.0.json b/packages/amazonq/.changes/1.2.0.json
new file mode 100644
index 00000000000..df142bc0933
--- /dev/null
+++ b/packages/amazonq/.changes/1.2.0.json
@@ -0,0 +1,30 @@
+{
+	"date": "2024-05-07",
+	"version": "1.2.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Fix bug when Amazon Q chat sends code selection while user has no selection"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Code Transformation: make jobId visible in job history tab at start of job and allow summary.md + icons to be saved when accepting changes"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Typewriter animator parts showing up in code fields inside listitems"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Security Scan: Addresses a bug where security issues sometimes appear multiple times"
+		},
+		{
+			"type": "Feature",
+			"description": "Update cross file context config for Q inline suggestion"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q: Security scans now support C, C++, and PHP files"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.20.0.json b/packages/amazonq/.changes/1.20.0.json
new file mode 100644
index 00000000000..fbaee8ce3f8
--- /dev/null
+++ b/packages/amazonq/.changes/1.20.0.json
@@ -0,0 +1,22 @@
+{
+	"date": "2024-08-08",
+	"version": "1.20.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /dev: include a retry option for the same prompt after folder reselection"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Ignore virtual environment when indexing workspace"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q Code Transformation: show pro tier users estimated cost of /transform on projects over 100K lines"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q Code Transformation: warn user if absolute file paths are found in the pom.xml"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.21.0.json b/packages/amazonq/.changes/1.21.0.json
new file mode 100644
index 00000000000..d6c630a689e
--- /dev/null
+++ b/packages/amazonq/.changes/1.21.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2024-08-15",
+	"version": "1.21.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Q feature dev: update file extension list and minor UI fixes"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.22.0.json b/packages/amazonq/.changes/1.22.0.json
new file mode 100644
index 00000000000..2053fb1f123
--- /dev/null
+++ b/packages/amazonq/.changes/1.22.0.json
@@ -0,0 +1,26 @@
+{
+	"date": "2024-08-22",
+	"version": "1.22.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Avoid refreshing code suggestion for paginated response"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Update login logo styling"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Correct indentation when insert Q chat code at cursor position"
+		},
+		{
+			"type": "Feature",
+			"description": "Add notification for extended session to IdC users"
+		},
+		{
+			"type": "Feature",
+			"description": "Support more programming languages for workspace index"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.23.0.json b/packages/amazonq/.changes/1.23.0.json
new file mode 100644
index 00000000000..1aff236995a
--- /dev/null
+++ b/packages/amazonq/.changes/1.23.0.json
@@ -0,0 +1,38 @@
+{
+	"date": "2024-08-29",
+	"version": "1.23.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Fix bug when undo inline suggestion causes command not found"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Auth: `SyntaxError` causing unexpected SSO logout"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Code Transformation: allow symlinks for JDK path"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix bug where text with inline code copied from Amazon Q Chat had new line breaks around the inline code text"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix bug with code indentation and nested list formatting in chat response prompt"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix bug when disabled commands does not get filtered in quick actions"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Auth: Users may be silently logged out due to network issues when starting the extension."
+		},
+		{
+			"type": "Feature",
+			"description": "Support AB testing"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.24.0.json b/packages/amazonq/.changes/1.24.0.json
new file mode 100644
index 00000000000..a5a87d9b747
--- /dev/null
+++ b/packages/amazonq/.changes/1.24.0.json
@@ -0,0 +1,34 @@
+{
+	"date": "2024-09-05",
+	"version": "1.24.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Network errors causing premature SSO logout"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix SyntaxError causing premature expiration (edge case)"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Code Transformation: show instructions for finding JDK path on Linux"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "UI: 'Start using Amazon Q' may display even if the user is signed in."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Add getFeature and isEnabled utility methods to FeatureConfigProvider"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q /dev: include in progress state agent in code generation"
+		},
+		{
+			"type": "Feature",
+			"description": "Reduce workspace CPU indexing time by 50%"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.25.0.json b/packages/amazonq/.changes/1.25.0.json
new file mode 100644
index 00000000000..b3cdaff40c1
--- /dev/null
+++ b/packages/amazonq/.changes/1.25.0.json
@@ -0,0 +1,22 @@
+{
+	"date": "2024-09-12",
+	"version": "1.25.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Fixed inline code blocks are not vertically aligned with texts"
+		},
+		{
+			"type": "Feature",
+			"description": "Record telemetry event when AWS Toolkits extension is uninstalled."
+		},
+		{
+			"type": "Feature",
+			"description": "Improve workspace indexing by only index files that are changed since last indexing"
+		},
+		{
+			"type": "Removal",
+			"description": "Amazon Q Feature dev: Remove approach generation flow"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.26.0.json b/packages/amazonq/.changes/1.26.0.json
new file mode 100644
index 00000000000..5f7e5361811
--- /dev/null
+++ b/packages/amazonq/.changes/1.26.0.json
@@ -0,0 +1,34 @@
+{
+	"date": "2024-09-19",
+	"version": "1.26.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Security Scan: Fixed an issue where the wrong icon was used in the status bar menu."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Disable Amazon Q LSP in AL2"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Fix shifted chat contents when closing and opening chat panel back"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Security Scan: Minor styling improvements in the security issue webview panel"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Fix tooltip remaining on screen when closing and opening chat panel back"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Auth: Login state not updating across multiple VS Code windows."
+		},
+		{
+			"type": "Feature",
+			"description": "Support @workspace queries for specific files like `@workspace what does test.ts do? `. "
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.27.0.json b/packages/amazonq/.changes/1.27.0.json
new file mode 100644
index 00000000000..005008c342f
--- /dev/null
+++ b/packages/amazonq/.changes/1.27.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2024-09-27",
+	"version": "1.27.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Security Scan: Fixes an issue that incorrectly removes hardcoded credentials detections from auto scans."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.28.0.json b/packages/amazonq/.changes/1.28.0.json
new file mode 100644
index 00000000000..481a4d8e7d2
--- /dev/null
+++ b/packages/amazonq/.changes/1.28.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2024-10-03",
+	"version": "1.28.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /dev: define first folder as a root path for LLM-created files when using workspaces"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q Code Transformation: allow users to skip running tests"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q Developer: Updated legal disclaimer text"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.29.0.json b/packages/amazonq/.changes/1.29.0.json
new file mode 100644
index 00000000000..35cc08b1b25
--- /dev/null
+++ b/packages/amazonq/.changes/1.29.0.json
@@ -0,0 +1,54 @@
+{
+	"date": "2024-10-10",
+	"version": "1.29.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /dev: include telemetry for workspace usage when generating new files"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q extension may fail to start if AWS Toolkit extension fails to start"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Start language server by default"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Feature Dev: Add error messages when the upload URL expires"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q (/dev): view diffs of previous /dev iterations"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Q dev handle no change required"
+		},
+		{
+			"type": "Deprecation",
+			"description": "The next release of this extension will require VS Code 1.83.0 or newer."
+		},
+		{
+			"type": "Feature",
+			"description": "Automatically pause and resume @workspace indexing when OS CPU load is high"
+		},
+		{
+			"type": "Feature",
+			"description": "Add buttons to code blocks to view and accept diffs."
+		},
+		{
+			"type": "Feature",
+			"description": "Inline completion for more json files, and all yaml files"
+		},
+		{
+			"type": "Feature",
+			"description": "Show a one-time warning if new VS Code is required"
+		},
+		{
+			"type": "Removal",
+			"description": "Minimum required VSCode version is now 1.83"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.3.0.json b/packages/amazonq/.changes/1.3.0.json
new file mode 100644
index 00000000000..9645f416074
--- /dev/null
+++ b/packages/amazonq/.changes/1.3.0.json
@@ -0,0 +1,30 @@
+{
+	"date": "2024-05-08",
+	"version": "1.3.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "modifying the root folder for /dev now modifies it"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Q chat may stop responding after processing Javascript/Typescript code"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Completion may fail unexpected if user opened many tabs"
+		},
+		{
+			"type": "Feature",
+			"description": "Inline Suggestions: Only display the 'Open Chat' CodeLens if the user is signed into Amazon Q."
+		},
+		{
+			"type": "Feature",
+			"description": "Security Scan: Scans can now be run without an open editor"
+		},
+		{
+			"type": "Feature",
+			"description": "Security Scan: Multi-root workspace support"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.30.0.json b/packages/amazonq/.changes/1.30.0.json
new file mode 100644
index 00000000000..070f0f7be5f
--- /dev/null
+++ b/packages/amazonq/.changes/1.30.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2024-10-17",
+	"version": "1.30.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Various fixes and changes"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.31.0.json b/packages/amazonq/.changes/1.31.0.json
new file mode 100644
index 00000000000..882fbad0f49
--- /dev/null
+++ b/packages/amazonq/.changes/1.31.0.json
@@ -0,0 +1,34 @@
+{
+	"date": "2024-10-29",
+	"version": "1.31.0",
+	"entries": [
+		{
+			"type": "Breaking Change",
+			"description": "Change keybind for focusing chat to ctrl+win+i on Windows, ctrl+cmd+i on macOS and ctrl+meta+i on Linux"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Inline Suggestions: Occasional `ValidationException` if user context has too many characters."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Update `@workspace` index when adding or deleting a file"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "fixed device code detection when running auth through tunneled vscode"
+		},
+		{
+			"type": "Feature",
+			"description": "Use inline chat to select code and transform it with natural language instructions"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q /dev: Add stop generation action"
+		},
+		{
+			"type": "Feature",
+			"description": "Provide more frequent updates about code changes made by agent"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.32.0.json b/packages/amazonq/.changes/1.32.0.json
new file mode 100644
index 00000000000..cfa6f4796bf
--- /dev/null
+++ b/packages/amazonq/.changes/1.32.0.json
@@ -0,0 +1,26 @@
+{
+	"date": "2024-10-29",
+	"version": "1.32.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Remove warning when no input is provided to inline chat input box"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Use Sagemaker environment IAM Credentials for Code Completion when they're available"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Inline: Code completion not working for Sagemaker Pro Tier users."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Disable /transform and /dev commands for sagemaker users as they're not supported"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon SageMaker Studio: Enable Free Tier Chat for IAM users"
+		}
+	]
+}
diff --git a/packages/amazonq/.changes/1.33.0.json b/packages/amazonq/.changes/1.33.0.json
new file mode 100644
index 00000000000..ac740352518
--- /dev/null
+++ b/packages/amazonq/.changes/1.33.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2024-10-30",
+	"version": "1.33.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /dev: fix for stop button showing for Code Transformation"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.34.0.json b/packages/amazonq/.changes/1.34.0.json
new file mode 100644
index 00000000000..35d1a3b1e1d
--- /dev/null
+++ b/packages/amazonq/.changes/1.34.0.json
@@ -0,0 +1,22 @@
+{
+	"date": "2024-11-07",
+	"version": "1.34.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Align example help text with prompt message in chat"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Improve `@workspace` index auto pause start strategy. "
+		},
+		{
+			"type": "Feature",
+			"description": "Allow users to View and Apply diff when they explictily send code to Amazon Q using - Fix, Refactor, Optimize and Send To Prompt."
+		},
+		{
+			"type": "Feature",
+			"description": "Security Scan: Auto-scan now supports JSX, TSX, Kotlin, Scala, and Shell files."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.35.0.json b/packages/amazonq/.changes/1.35.0.json
new file mode 100644
index 00000000000..45b791ac4c4
--- /dev/null
+++ b/packages/amazonq/.changes/1.35.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2024-11-11",
+	"version": "1.35.0",
+	"entries": [
+		{
+			"type": "Breaking Change",
+			"description": "Change focus chat keybind to win+alt+i on Windows, cmd+alt+i on macOS, and meta+alt+i on Linux"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix suboptimal inline suggestions from Amazon Q caused by improperly formatted supplemental context"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix empty chunks being sent to service and get validationException"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.36.0.json b/packages/amazonq/.changes/1.36.0.json
new file mode 100644
index 00000000000..0b10e6d8720
--- /dev/null
+++ b/packages/amazonq/.changes/1.36.0.json
@@ -0,0 +1,22 @@
+{
+	"date": "2024-11-14",
+	"version": "1.36.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Fix broken inline suggestion auto-trigger on Systemverfilog files if users dont have systemverilog extension installed and enabled"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "tutorial always showing on start"
+		},
+		{
+			"type": "Feature",
+			"description": "Enable default `@workspace` context of Amazon Q chat for certain users"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q /dev: Add an action to accept individual files"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.37.0.json b/packages/amazonq/.changes/1.37.0.json
new file mode 100644
index 00000000000..3076836aa3c
--- /dev/null
+++ b/packages/amazonq/.changes/1.37.0.json
@@ -0,0 +1,50 @@
+{
+	"date": "2024-11-22",
+	"version": "1.37.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Feature Dev: display limit reached error message"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q chat: `@workspace` command shown in all tab types"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Chat container exceeds width of container"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "amazon q inline: skip indexing when no workspace folders are found"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "file details and name unneccessary cropping"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /dev: update diff window behavior after a change is accepted"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q /dev: support `.gradle` files"
+		},
+		{
+			"type": "Feature",
+			"description": "Code Transform: Enable support for Java 17 projects."
+		},
+		{
+			"type": "Feature",
+			"description": "Notifications: Support for delivering critical alerts and product updates"
+		},
+		{
+			"type": "Feature",
+			"description": "Retrieve and display a customization name when a customization is overridden in an AB test"
+		},
+		{
+			"type": "Feature",
+			"description": "Feature(Amazon Q Code Transformation): support conversions of embedded SQL from Oracle to PostgreSQL"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.38.0.json b/packages/amazonq/.changes/1.38.0.json
new file mode 100644
index 00000000000..cc04393dfa7
--- /dev/null
+++ b/packages/amazonq/.changes/1.38.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2024-11-27",
+	"version": "1.38.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Amazon Q /dev: support `Dockerfile` files"
+		},
+		{
+			"type": "Feature",
+			"description": "Introduce @workspace command to enhance context fetching for Chat"
+		},
+		{
+			"type": "Feature",
+			"description": "Feature(Amazon Q Code Transformation): allow users to view results in 5 smaller diffs"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.39.0.json b/packages/amazonq/.changes/1.39.0.json
new file mode 100644
index 00000000000..750b30ba03a
--- /dev/null
+++ b/packages/amazonq/.changes/1.39.0.json
@@ -0,0 +1,34 @@
+{
+	"date": "2024-12-03",
+	"version": "1.39.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Added a getting started page for exploring amazon q agents"
+		},
+		{
+			"type": "Feature",
+			"description": "`/test` in Q chat to generate unit tests for java and python"
+		},
+		{
+			"type": "Feature",
+			"description": "`/doc` in Q chat to generate and update documentation for your project"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q Code Scan is now Amazon Q Code Review"
+		},
+		{
+			"type": "Feature",
+			"description": "`/review` in Q chat to scan your code for vulnerabilities and quality issues, and generate fixes"
+		},
+		{
+			"type": "Feature",
+			"description": "Security Scan: New TreeView to display security scan issues and vulnerabilities detected in your project. The TreeView provides an organized and hierarchical view of the scan results, making it easier to navigate and prioritize the issues that need to be addressed."
+		},
+		{
+			"type": "Feature",
+			"description": "Security Scan: Added ability to suppress or ignore security issues"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.4.0.json b/packages/amazonq/.changes/1.4.0.json
new file mode 100644
index 00000000000..aab7e1f2b70
--- /dev/null
+++ b/packages/amazonq/.changes/1.4.0.json
@@ -0,0 +1,30 @@
+{
+	"date": "2024-05-13",
+	"version": "1.4.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Auth: No longer request AWS account scopes during login."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Security Scan: Fixes an issue where scans fail for projects with Terraform files"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Code Transform: Show additional status messages to align with experience when JAVA_HOME set incorrectly."
+		},
+		{
+			"type": "Feature",
+			"description": "UX: Added keyboard navigation to login screen."
+		},
+		{
+			"type": "Feature",
+			"description": "New SSO Authorization Code flow for faster logins"
+		},
+		{
+			"type": "Feature",
+			"description": "Transform: Add human intervention to help update dependencies during transformation."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.40.0.json b/packages/amazonq/.changes/1.40.0.json
new file mode 100644
index 00000000000..ea251bdd8fe
--- /dev/null
+++ b/packages/amazonq/.changes/1.40.0.json
@@ -0,0 +1,66 @@
+{
+	"date": "2024-12-10",
+	"version": "1.40.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Improved LLM code review for file review."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "@workspace is missing from the welcome to q chat tab"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix chat syntax highlighting when using several different themes"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /doc: progress bar persists after cancelling README creation"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Code Review: Fixed a bug where some issues are missing from the code issues view for workspaces with custom names"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /doc: Prompt user to choose a folder in chat"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /dev not adding Dockerfiles in nested folders"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Improved Code Fix generation for code review issues"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix the quick start buttons on the explore page to show amazon q colours on hover"
+		},
+		{
+			"type": "Feature",
+			"description": "Q feature dev: recognize .bms, .pli code files"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q Code Transformation: show job ID in Transformation Hub"
+		},
+		{
+			"type": "Feature",
+			"description": "UI improvements to Amazon Q Chat: New splash loader animation, initial streaming card animation, improved button colours"
+		},
+		{
+			"type": "Feature",
+			"description": "Add acknowledgement button for amazon q chat disclaimer"
+		},
+		{
+			"type": "Feature",
+			"description": "Navigate through prompt history by using the up/down arrows"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q: Simplify log channel"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.41.0.json b/packages/amazonq/.changes/1.41.0.json
new file mode 100644
index 00000000000..d0ca09cb476
--- /dev/null
+++ b/packages/amazonq/.changes/1.41.0.json
@@ -0,0 +1,62 @@
+{
+	"date": "2024-12-17",
+	"version": "1.41.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "/review: Apply fix removes other issues in the same file."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix(Amazon Q Code Transformation): show correct diff when running consecutive transformations"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Improve when the welcome page is shown in amazon q chat"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Code Review: Cleaned up output logs when running /review"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Code Review: Fixed a bug where applying a fix did not update the positions of other issues in the same file."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Chat: When navigating to previous prompts, code attachments are sometimes displayed incorrectly"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/review: Diagnostics in the problems panel are mapped to the wrong code"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix opentabs context possibly timeout due to race condition of misuse of different timeout functionalities"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Auth: SSO session was bad, but no reauth prompt given"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Reduce frequency of system status poll"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Chat: When writing a prompt without sending it, navigating via up/down arrows sometimes deletes the unsent prompt."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Code Review: Fixed a bug where projects with repeated path names did not scan properly."
+		},
+		{
+			"type": "Feature",
+			"description": "/review: Code fix automatically scrolls into view after generation."
+		},
+		{
+			"type": "Feature",
+			"description": "Chat: improve font size and line-height in footer (below prompt input field)"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.42.0.json b/packages/amazonq/.changes/1.42.0.json
new file mode 100644
index 00000000000..7327ed0c9c4
--- /dev/null
+++ b/packages/amazonq/.changes/1.42.0.json
@@ -0,0 +1,58 @@
+{
+	"date": "2025-01-09",
+	"version": "1.42.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /doc: Improve button text phrasing"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /dev: Fix issue when files are deleted while preparing context"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Code Transformation: allow POSTGRESQL as target DB for SQL conversions"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix context menu displaying when typing @, even though input is disallowed"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q can update mvn and gradle build files"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/transform: use correct documentation link in SQL conversion help message"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Up/down history navigation only triggering on first/last line of prompt input"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /test: Fix to redirect /test to generate tests in chat for external files out of workspace scope."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/review: Code block extends beyond page margins in code issue detail view"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Code Transformation: retry project upload up to 3 times"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q Code Transformation: add view summary button in chat"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q: new code syntax highlighter for improved accuracy"
+		},
+		{
+			"type": "Removal",
+			"description": "Settings: No longer migrate old CodeWhisperer settings or initialize telemetry setting from AWS Toolkit."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.43.0.json b/packages/amazonq/.changes/1.43.0.json
new file mode 100644
index 00000000000..a4f2376f2e6
--- /dev/null
+++ b/packages/amazonq/.changes/1.43.0.json
@@ -0,0 +1,42 @@
+{
+	"date": "2025-01-15",
+	"version": "1.43.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Auth: Valid StartURL not accepted at login"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix inline completion supplementalContext length exceeding maximum in certain cases"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /test: Unit test generation completed message shows after accept/reject action"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/test: for unsupported languages was sometimes unreliable"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "User-selected customizations are sometimes not being persisted."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon q /dev: Remove hard-coded limits and instead rely server-side data to communicate number of code generations remaining"
+		},
+		{
+			"type": "Feature",
+			"description": "Adds capability to send new context commands to AB groups"
+		},
+		{
+			"type": "Feature",
+			"description": "feat(amazonq): Add error message for updated README too large"
+		},
+		{
+			"type": "Feature",
+			"description": "Enhance Q inline completion context fetching for better suggestion quality"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.44.0.json b/packages/amazonq/.changes/1.44.0.json
new file mode 100644
index 00000000000..7593e9a7af3
--- /dev/null
+++ b/packages/amazonq/.changes/1.44.0.json
@@ -0,0 +1,50 @@
+{
+	"date": "2025-01-23",
+	"version": "1.44.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q: word duplication when pressing tab on context selector fixed"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /doc: Prevent users from requesting changes if no iterations remain"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "`/test`: view diffs by clicking files in the file tree, aligning the behavior with the 'View Diff' button."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/review: Improved error handling for code fix operations"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q: cursor no longer jumps after navigating prompt history"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Improve the text description of workspace index settings"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Notifications: 'Dismiss' command visible in command palette."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/transform: replace icons in Transformation Hub with text"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /doc: Ask for user prompt if error occurs while updating documentation"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q: increase chat current active file context char limit to 40k"
+		},
+		{
+			"type": "Feature",
+			"description": "/review: Code issues can be grouped by file location or severity"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.45.0-SNAPSHOT.json b/packages/amazonq/.changes/1.45.0-SNAPSHOT.json
new file mode 100644
index 00000000000..881d3e94e5a
--- /dev/null
+++ b/packages/amazonq/.changes/1.45.0-SNAPSHOT.json
@@ -0,0 +1,18 @@
+{
+	"date": "2025-01-30",
+	"version": "1.45.0-SNAPSHOT",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Allow AB users with an overridden customization to go back to the default customization"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "For security reasons, disabled auto linkify for link texts coming in markdown other than [TEXT](URL) format"
+		},
+		{
+			"type": "Feature",
+			"description": "Add setting to allow Q /dev to run code and test commands"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.45.0.json b/packages/amazonq/.changes/1.45.0.json
new file mode 100644
index 00000000000..7ef04691624
--- /dev/null
+++ b/packages/amazonq/.changes/1.45.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2025-01-30",
+	"version": "1.45.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Allow AB users with an overridden customization to go back to the default customization"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "For security reasons, disabled auto linkify for link texts coming in markdown other than [TEXT](URL) format"
+		},
+		{
+			"type": "Feature",
+			"description": "Add setting to allow Q /dev to run code and test commands"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.46.0.json b/packages/amazonq/.changes/1.46.0.json
new file mode 100644
index 00000000000..1253cbe3d01
--- /dev/null
+++ b/packages/amazonq/.changes/1.46.0.json
@@ -0,0 +1,38 @@
+{
+	"date": "2025-02-05",
+	"version": "1.46.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Citation links are not clickable as numbers, but appear as non-clickable texts"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix language server start failure in AL2023 ARM64"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/review: Auto-review issues did not populate code issues list"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q: Fix code upload error when using /dev or /doc on Remote SSH"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/test placeholder text aligned across IDEs"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Inline: Typos in the first example suggestion"
+		},
+		{
+			"type": "Feature",
+			"description": "Inline suggestions: Pre-fetch recommendations to reduce suggestion latency."
+		},
+		{
+			"type": "Feature",
+			"description": "Added github issue link and description to the chat answer feedback form"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.47.0.json b/packages/amazonq/.changes/1.47.0.json
new file mode 100644
index 00000000000..5e168b79fe2
--- /dev/null
+++ b/packages/amazonq/.changes/1.47.0.json
@@ -0,0 +1,38 @@
+{
+	"date": "2025-02-13",
+	"version": "1.47.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "`Send to prompt` and other context menu options not sent if chat was closed"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /test: Truncating user input to 4096 characters for unit test generation."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /test: Q identify active test file and infer source file for test generation."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/review: Code review starts automatically when invoked from menu"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q /dev: support `.hbs`, `.gjs`, `.gts`, `.astro`, `.mdx`, `.svelte`, `.erb`, `.rake` files"
+		},
+		{
+			"type": "Feature",
+			"description": "/transform: automatically download results when ready"
+		},
+		{
+			"type": "Feature",
+			"description": "/transform: support Java 21 transformations"
+		},
+		{
+			"type": "Removal",
+			"description": "Reverted prefetch logic to enable more stable inline completion"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.48.0.json b/packages/amazonq/.changes/1.48.0.json
new file mode 100644
index 00000000000..409649ab817
--- /dev/null
+++ b/packages/amazonq/.changes/1.48.0.json
@@ -0,0 +1,30 @@
+{
+	"date": "2025-02-20",
+	"version": "1.48.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "/dev and /doc: Multi-root workspace with duplicate files causes infinite 'Uploading code...' loop"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /doc: update workspace too large error message "
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/review: Auto-review should not remove issues from manual reviews"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/transform: allow View Summary button to work even after accepting diff"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /test: Fixing the issue of target file does not exist."
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q /doc: Add support for infrastructure diagrams"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.49.0.json b/packages/amazonq/.changes/1.49.0.json
new file mode 100644
index 00000000000..b08aff46ac7
--- /dev/null
+++ b/packages/amazonq/.changes/1.49.0.json
@@ -0,0 +1,26 @@
+{
+	"date": "2025-02-27",
+	"version": "1.49.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /test: Unit test generation displays an inaccurate diff view for non-primary packages in the workspace."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /doc: Fix uploading file method throwing incorrect workspace too large error message"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/transform: skip running tests locally when user chooses to do so"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/review: ignored lines should not show up in scan issues"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/test: update capability card text"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.5.0.json b/packages/amazonq/.changes/1.5.0.json
new file mode 100644
index 00000000000..1e59c67e102
--- /dev/null
+++ b/packages/amazonq/.changes/1.5.0.json
@@ -0,0 +1,26 @@
+{
+	"date": "2024-05-17",
+	"version": "1.5.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Security Scan: Fixes an issue when scanning projects with binary files"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fixes an issue where the /dev chat wouldn't let customers modify the source folder when exceeding the size limit"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Security Scan: Improved error notifications"
+		},
+		{
+			"type": "Feature",
+			"description": "Security Scan: Added custom command to run the security scan."
+		},
+		{
+			"type": "Feature",
+			"description": "Security Scan: \"View details\" and \"Explain\" options can now be accessed from the problems panel"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.50.0.json b/packages/amazonq/.changes/1.50.0.json
new file mode 100644
index 00000000000..bd832127681
--- /dev/null
+++ b/packages/amazonq/.changes/1.50.0.json
@@ -0,0 +1,34 @@
+{
+	"date": "2025-03-06",
+	"version": "1.50.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "/doc: Usage in multiple chat tabs may cause unexpected behavior."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/review: subsequent reviews weren't possible"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q chat: Use `@` to add folders, files, and saved prompts as context"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q chat: increase chat input height to 3 lines"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q chat: Show list of files sent as context in chat response"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q chat: Add support for `.md` file rules in workspace-level `.amazonq/rules` directory"
+		},
+		{
+			"type": "Test",
+			"description": "add Q Chat /review command test coverage"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.51.0.json b/packages/amazonq/.changes/1.51.0.json
new file mode 100644
index 00000000000..97870fda325
--- /dev/null
+++ b/packages/amazonq/.changes/1.51.0.json
@@ -0,0 +1,34 @@
+{
+	"date": "2025-03-12",
+	"version": "1.51.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "increase scan timeout to reduce front-end timeout errors"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q chat: Create a new prompt form does not autofocus or submit with Enter press"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/review: Zip files are created with the wrong file path for file scans in multifolder workspaces."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/review: Invalid file path characters caused some detections to be skipped on Windows"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q Chat: You can now keep a \"library\" of prompt files in your home directory under `~/.aws/amazonq/prompts` and then quickly add them to the context using `@` on any project you’re working on. Prompt files are in markdown (`.md`) format."
+		},
+		{
+			"type": "Feature",
+			"description": "/review: show code diff for fix preview"
+		},
+		{
+			"type": "Feature",
+			"description": "/test: display test plan summary in chat after generating tests"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.52.0.json b/packages/amazonq/.changes/1.52.0.json
new file mode 100644
index 00000000000..a4f357edc87
--- /dev/null
+++ b/packages/amazonq/.changes/1.52.0.json
@@ -0,0 +1,50 @@
+{
+	"date": "2025-03-20",
+	"version": "1.52.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q chat: @Folders and @Files are missing `@` prefix in chat history"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/review: Code Issues ellipses menu displays AWS Toolkit options, if installed."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q chat: Progress indicator height is stretched"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q chat: Long descriptions in context list are cut off"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q chat: Improve responses for saved prompts and workspace rules"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "/test: show descriptive error message"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Code Review: Fixed a bug where issues are double counted in the Q chat"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q chat: Animation timings are too long"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix inline completion failure due to context length exceeding the threshold"
+		},
+		{
+			"type": "Feature",
+			"description": "/review: passing referenceTrackerConfiguration to StartCodeFixJob"
+		},
+		{
+			"type": "Feature",
+			"description": "/review: rename setting `showInlineCodeSuggestionsWithCodeReferences` to `showCodeWithReferences`"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.53.0.json b/packages/amazonq/.changes/1.53.0.json
new file mode 100644
index 00000000000..cb548513e35
--- /dev/null
+++ b/packages/amazonq/.changes/1.53.0.json
@@ -0,0 +1,22 @@
+{
+	"date": "2025-03-28",
+	"version": "1.53.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Choosing a nested subfolder for `/doc` on Windows results in `The folder you chose did not contain any source files` error"
+		},
+		{
+			"type": "Feature",
+			"description": "Add support for Code search in Q chat"
+		},
+		{
+			"type": "Feature",
+			"description": "(Experimental) Amazon Q inline code suggestions via Amazon Q Language Server. (enable with `aws.experiments.amazonqLSP: true`)"
+		},
+		{
+			"type": "Feature",
+			"description": "Command Palette: Add `Amazon Q: Open Chat` command."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.54.0.json b/packages/amazonq/.changes/1.54.0.json
new file mode 100644
index 00000000000..32e6ccabf4a
--- /dev/null
+++ b/packages/amazonq/.changes/1.54.0.json
@@ -0,0 +1,38 @@
+{
+	"date": "2025-04-03",
+	"version": "1.54.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q chat: `@prompts` not added to context"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q chat: View and search chat history"
+		},
+		{
+			"type": "Feature",
+			"description": "SageMaker Unified Studio: Disable Sign out"
+		},
+		{
+			"type": "Feature",
+			"description": "SageMaker Unified Studio: Update Q Chat Introduction message"
+		},
+		{
+			"type": "Feature",
+			"description": "/review: automatically generate fix without clicking Generate Fix button"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q chat: Automatically persist chats between IDE sessions"
+		},
+		{
+			"type": "Feature",
+			"description": "Save user command execution logs to plugin output."
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q chat: Code blocks in chat messages have a max-height of 21 lines and can be scrolled inside"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.55.0.json b/packages/amazonq/.changes/1.55.0.json
new file mode 100644
index 00000000000..194814fc3be
--- /dev/null
+++ b/packages/amazonq/.changes/1.55.0.json
@@ -0,0 +1,38 @@
+{
+	"date": "2025-04-09",
+	"version": "1.55.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Update chat history icon"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: chat occasionally freezes and displays gray screen"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Set owner-only permissions for chat history and saved prompt files"
+		},
+		{
+			"type": "Feature",
+			"description": "`/test` generates tests in all languages, not only Java/Python"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q chat: Click export icon to save chat transcript in Markdown or HTML"
+		},
+		{
+			"type": "Feature",
+			"description": "SageMaker: Disable the unsupported agentic commands and welcome prompt"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q Chat: Add `@code` context for PHP, Ruby, Scala, Shell, and Swift projects"
+		},
+		{
+			"type": "Feature",
+			"description": "Enterprise users can choose their preferred Amazon Q profile to improve personalization and workflow across different business regions"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.56.0.json b/packages/amazonq/.changes/1.56.0.json
new file mode 100644
index 00000000000..8de6eea2db5
--- /dev/null
+++ b/packages/amazonq/.changes/1.56.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2025-04-09",
+	"version": "1.56.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Improve status message while loading Amazon Q Profiles during login"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "\"failed to run command\" error"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.57.0.json b/packages/amazonq/.changes/1.57.0.json
new file mode 100644
index 00000000000..3a7a8d2ab95
--- /dev/null
+++ b/packages/amazonq/.changes/1.57.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2025-04-10",
+	"version": "1.57.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Fix bug where generate fix does not work"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix bug where review shows 0 findings"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.58.0.json b/packages/amazonq/.changes/1.58.0.json
new file mode 100644
index 00000000000..02395a6dfd8
--- /dev/null
+++ b/packages/amazonq/.changes/1.58.0.json
@@ -0,0 +1,22 @@
+{
+	"date": "2025-04-11",
+	"version": "1.58.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "inline chat activates properly when using 'aws.experiments.amazonqChatLSP' feature flag"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: code blocks in responses flicker, switching tabs during answer streaming makes expand button disappear"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: tab bar buttons disappear when closing non-active tab"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: chat history list does not truncate markdown"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.59.0.json b/packages/amazonq/.changes/1.59.0.json
new file mode 100644
index 00000000000..840d65f5294
--- /dev/null
+++ b/packages/amazonq/.changes/1.59.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2025-04-11",
+	"version": "1.59.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Code fix line number or file is sometimes not accurate"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix Q agents will fail for /transform /dev /test features if IdC kms key is configured with 400 error"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.6.0.json b/packages/amazonq/.changes/1.6.0.json
new file mode 100644
index 00000000000..9974f06a414
--- /dev/null
+++ b/packages/amazonq/.changes/1.6.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2024-05-21",
+	"version": "1.6.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Inside chat body, if there is a code block inside a list item it shows <br/> tags"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Prompt input field allows additional input beyond the character limit"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Prompt input field not getting focus when chat window opens"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.60.0.json b/packages/amazonq/.changes/1.60.0.json
new file mode 100644
index 00000000000..64a9b9ea137
--- /dev/null
+++ b/packages/amazonq/.changes/1.60.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2025-04-18",
+	"version": "1.60.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Users might be bound to a customization which they dont have access with the selected profile and it causes service throwing 403 when using inline suggestion and chat features"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.61.0.json b/packages/amazonq/.changes/1.61.0.json
new file mode 100644
index 00000000000..64b0f4da610
--- /dev/null
+++ b/packages/amazonq/.changes/1.61.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2025-04-22",
+	"version": "1.61.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Some users not signaled they needed to select a Region Profile to get features working"
+		},
+		{
+			"type": "bugfix",
+			"description": "/review: disable auto-review by default"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.62.0.json b/packages/amazonq/.changes/1.62.0.json
new file mode 100644
index 00000000000..530f26ccb29
--- /dev/null
+++ b/packages/amazonq/.changes/1.62.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2025-04-25",
+	"version": "1.62.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Toast message to warn users if Developer Profile is not selected"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix users can not log in successfully with 2+ IDE instnaces open due to throttle error throw by the service"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.63.0.json b/packages/amazonq/.changes/1.63.0.json
new file mode 100644
index 00000000000..10020659c5a
--- /dev/null
+++ b/packages/amazonq/.changes/1.63.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2025-05-01",
+	"version": "1.63.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Q profile selection hangs when a region is blocked"
+		},
+		{
+			"type": "Feature",
+			"description": "Agentic coding experience: Amazon Q can now write code and run shell commands on your behalf"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.64.0.json b/packages/amazonq/.changes/1.64.0.json
new file mode 100644
index 00000000000..461ad140c01
--- /dev/null
+++ b/packages/amazonq/.changes/1.64.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2025-05-02",
+	"version": "1.64.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Enable Amazon Q LSP in AL2 instances"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.65.0.json b/packages/amazonq/.changes/1.65.0.json
new file mode 100644
index 00000000000..ec01584f56b
--- /dev/null
+++ b/packages/amazonq/.changes/1.65.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2025-05-05",
+	"version": "1.65.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Support selecting customizations across all Q profiles with automatic profile switching for enterprise users"
+		},
+		{
+			"type": "Feature",
+			"description": "Memorize and autofill users' last Sso login profile"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.66.0.json b/packages/amazonq/.changes/1.66.0.json
new file mode 100644
index 00000000000..ab4a819b85a
--- /dev/null
+++ b/packages/amazonq/.changes/1.66.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2025-05-09",
+	"version": "1.66.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Avoid inline completion 'Improperly formed request' errors when file is too large"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Named agent tabs sometimes open with unnecessary input options"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.67.0.json b/packages/amazonq/.changes/1.67.0.json
new file mode 100644
index 00000000000..59ff03eacdd
--- /dev/null
+++ b/packages/amazonq/.changes/1.67.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2025-05-14",
+	"version": "1.67.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Previous and subsequent cells are used as context for completion in a Jupyter notebook"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Support chat in AL2 aarch64"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.68.0.json b/packages/amazonq/.changes/1.68.0.json
new file mode 100644
index 00000000000..2c21170aa0b
--- /dev/null
+++ b/packages/amazonq/.changes/1.68.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2025-05-15",
+	"version": "1.68.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Fix Error: 'Amazon Q service is not signed in'"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix Error: 'Amazon Q Profile is not selected for IDC connection type'"
+		},
+		{
+			"type": "Feature",
+			"description": "Add inline completion support for abap language"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.69.0.json b/packages/amazonq/.changes/1.69.0.json
new file mode 100644
index 00000000000..caa8ed28676
--- /dev/null
+++ b/packages/amazonq/.changes/1.69.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2025-05-22",
+	"version": "1.69.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "/transform: avoid prompting user for target JDK path unnecessarily"
+		},
+		{
+			"type": "Removal",
+			"description": "/transform: remove option to select multiple diffs"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.7.0.json b/packages/amazonq/.changes/1.7.0.json
new file mode 100644
index 00000000000..cfc03fc40e6
--- /dev/null
+++ b/packages/amazonq/.changes/1.7.0.json
@@ -0,0 +1,26 @@
+{
+	"date": "2024-05-30",
+	"version": "1.7.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Feature Development: File rejection is not rejecting a file when code is generated"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Security Scan: Improved accuracy when applying security fixes"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Code Transformation: show more specific error messages on failure cases"
+		},
+		{
+			"type": "Feature",
+			"description": "Security Scan: Support for scanning files outside of workspaces."
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q now publishes to Open VSX: https://open-vsx.org/namespace/amazonwebservices"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.70.0.json b/packages/amazonq/.changes/1.70.0.json
new file mode 100644
index 00000000000..841e8107430
--- /dev/null
+++ b/packages/amazonq/.changes/1.70.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2025-05-28",
+	"version": "1.70.0",
+	"entries": [
+		{
+			"type": "Removal",
+			"description": "Disable local workspace LSP"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.71.0.json b/packages/amazonq/.changes/1.71.0.json
new file mode 100644
index 00000000000..be5cc5a2013
--- /dev/null
+++ b/packages/amazonq/.changes/1.71.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-06-04",
+	"version": "1.71.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.72.0.json b/packages/amazonq/.changes/1.72.0.json
new file mode 100644
index 00000000000..10b0b374c3a
--- /dev/null
+++ b/packages/amazonq/.changes/1.72.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2025-06-11",
+	"version": "1.72.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Launch LSP with bundled artifacts as fallback"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.73.0.json b/packages/amazonq/.changes/1.73.0.json
new file mode 100644
index 00000000000..25cda6dcf03
--- /dev/null
+++ b/packages/amazonq/.changes/1.73.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2025-06-11",
+	"version": "1.73.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Add MCP Server Support"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.74.0.json b/packages/amazonq/.changes/1.74.0.json
new file mode 100644
index 00000000000..e584f7a9d01
--- /dev/null
+++ b/packages/amazonq/.changes/1.74.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-06-12",
+	"version": "1.74.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.75.0.json b/packages/amazonq/.changes/1.75.0.json
new file mode 100644
index 00000000000..384d07654a4
--- /dev/null
+++ b/packages/amazonq/.changes/1.75.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-06-13",
+	"version": "1.75.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.76.0.json b/packages/amazonq/.changes/1.76.0.json
new file mode 100644
index 00000000000..eaa2ce8af56
--- /dev/null
+++ b/packages/amazonq/.changes/1.76.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2025-06-18",
+	"version": "1.76.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "/transform: only show lines of code statistic in plan"
+		},
+		{
+			"type": "Feature",
+			"description": "Add model selection feature"
+		},
+		{
+			"type": "Feature",
+			"description": "Pin context items in chat and manage workspace rules"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.77.0.json b/packages/amazonq/.changes/1.77.0.json
new file mode 100644
index 00000000000..37436c259f9
--- /dev/null
+++ b/packages/amazonq/.changes/1.77.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-06-18",
+	"version": "1.77.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.78.0.json b/packages/amazonq/.changes/1.78.0.json
new file mode 100644
index 00000000000..9a6f35cf36f
--- /dev/null
+++ b/packages/amazonq/.changes/1.78.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2025-06-20",
+	"version": "1.78.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Resolve missing chat options in Amazon Q chat interface."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.79.0.json b/packages/amazonq/.changes/1.79.0.json
new file mode 100644
index 00000000000..51d910cca2b
--- /dev/null
+++ b/packages/amazonq/.changes/1.79.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2025-06-25",
+	"version": "1.79.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Added automatic system certificate detection and VSCode proxy settings support"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Improved Amazon Linux 2 support with better SageMaker environment detection"
+		},
+		{
+			"type": "Feature",
+			"description": "/transform: run all builds client-side"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.8.0.json b/packages/amazonq/.changes/1.8.0.json
new file mode 100644
index 00000000000..9f64639c310
--- /dev/null
+++ b/packages/amazonq/.changes/1.8.0.json
@@ -0,0 +1,26 @@
+{
+	"date": "2024-06-07",
+	"version": "1.8.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "fix(featureDev): fix file rejection for multi-workspaces"
+		},
+		{
+			"type": "Feature",
+			"description": "The `Send to Amazon Q` [context menu](https://github.com/aws/aws-toolkit-vscode/assets/371007/ce4c61a4-1b58-48ee-8500-56667d45dd7d) was renamed to `Amazon Q`"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q Transform: Increase project upload size limit to 2GB"
+		},
+		{
+			"type": "Feature",
+			"description": "feat(featureDev): generated plan being shown from top"
+		},
+		{
+			"type": "Feature",
+			"description": "Add additional commands for Amazon Q."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.80.0.json b/packages/amazonq/.changes/1.80.0.json
new file mode 100644
index 00000000000..20e948b69f2
--- /dev/null
+++ b/packages/amazonq/.changes/1.80.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-07-01",
+	"version": "1.80.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.81.0.json b/packages/amazonq/.changes/1.81.0.json
new file mode 100644
index 00000000000..b93c5693ad4
--- /dev/null
+++ b/packages/amazonq/.changes/1.81.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2025-07-02",
+	"version": "1.81.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Stop auto inline completion when deleting code"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.82.0.json b/packages/amazonq/.changes/1.82.0.json
new file mode 100644
index 00000000000..816da045f4a
--- /dev/null
+++ b/packages/amazonq/.changes/1.82.0.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"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.83.0.json b/packages/amazonq/.changes/1.83.0.json
new file mode 100644
index 00000000000..5997b2b1b95
--- /dev/null
+++ b/packages/amazonq/.changes/1.83.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2025-07-09",
+	"version": "1.83.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Amazon Q /test, /doc, and /dev capabilities integrated into Agentic coding."
+		},
+		{
+			"type": "Feature",
+			"description": "Added image support to Amazon Q chat, users can now upload images from their local file system"
+		},
+		{
+			"type": "Removal",
+			"description": "Deprecate \"amazon q is generating...\" UI for inline suggestion"
+		}
+	]
+}
\ No newline at end of file
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/1.85.0.json b/packages/amazonq/.changes/1.85.0.json
new file mode 100644
index 00000000000..b0aba38025b
--- /dev/null
+++ b/packages/amazonq/.changes/1.85.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-07-19",
+	"version": "1.85.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.86.0.json b/packages/amazonq/.changes/1.86.0.json
new file mode 100644
index 00000000000..abe84ce5b5f
--- /dev/null
+++ b/packages/amazonq/.changes/1.86.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2025-07-30",
+	"version": "1.86.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Let Enter invoke auto completion more consistently"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Faster and more responsive inline completion UX"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Use documentChangeEvent as auto trigger condition"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.87.0.json b/packages/amazonq/.changes/1.87.0.json
new file mode 100644
index 00000000000..d80e11a2bfa
--- /dev/null
+++ b/packages/amazonq/.changes/1.87.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-07-31",
+	"version": "1.87.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.88.0.json b/packages/amazonq/.changes/1.88.0.json
new file mode 100644
index 00000000000..05e006954d8
--- /dev/null
+++ b/packages/amazonq/.changes/1.88.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2025-08-06",
+	"version": "1.88.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Amazon Q Chat provides error explanations and fixes when hovering or right-clicking on error indicators and messages"
+		},
+		{
+			"type": "Feature",
+			"description": "/transform: Show transformation history in Transformation Hub and allow users to resume jobs"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.89.0.json b/packages/amazonq/.changes/1.89.0.json
new file mode 100644
index 00000000000..95ef52909d5
--- /dev/null
+++ b/packages/amazonq/.changes/1.89.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-08-13",
+	"version": "1.89.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.9.0.json b/packages/amazonq/.changes/1.9.0.json
new file mode 100644
index 00000000000..546b595dc56
--- /dev/null
+++ b/packages/amazonq/.changes/1.9.0.json
@@ -0,0 +1,26 @@
+{
+	"date": "2024-06-14",
+	"version": "1.9.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q inline suggestions: remember `Pause Auto-Suggestions` after IDE restart"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q /dev command: stop showing spinner when there is an error."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Security Scan: Fixes an issue where auto-scans cause the editor to become unresponsive for larger projects."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix(Amazon Q Code Transformation): show more detailed error messages for proxy issues"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q Code Transform: Allow user to view transformation build log"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.90.0.json b/packages/amazonq/.changes/1.90.0.json
new file mode 100644
index 00000000000..547528bce40
--- /dev/null
+++ b/packages/amazonq/.changes/1.90.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-08-15",
+	"version": "1.90.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.91.0.json b/packages/amazonq/.changes/1.91.0.json
new file mode 100644
index 00000000000..b555f97447c
--- /dev/null
+++ b/packages/amazonq/.changes/1.91.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2025-08-22",
+	"version": "1.91.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Enable inline completion in Jupyter Notebook"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q supports admin control for MCP servers to restrict MCP server usage"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.92.0.json b/packages/amazonq/.changes/1.92.0.json
new file mode 100644
index 00000000000..46f2518fb37
--- /dev/null
+++ b/packages/amazonq/.changes/1.92.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2025-08-28",
+	"version": "1.92.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Amazon Q supports admin control for MCP servers to restrict MCP server usage"
+		},
+		{
+			"type": "Feature",
+			"description": "Enabling dynamic model fetching capabilities in Amazon Q chat"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q: Support for configuring and utilizing remote MCP servers."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.93.0.json b/packages/amazonq/.changes/1.93.0.json
new file mode 100644
index 00000000000..c8f34a95645
--- /dev/null
+++ b/packages/amazonq/.changes/1.93.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-09-05",
+	"version": "1.93.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.94.0.json b/packages/amazonq/.changes/1.94.0.json
new file mode 100644
index 00000000000..d0adc1ee037
--- /dev/null
+++ b/packages/amazonq/.changes/1.94.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-09-11",
+	"version": "1.94.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.95.0.json b/packages/amazonq/.changes/1.95.0.json
new file mode 100644
index 00000000000..8014b9e23b2
--- /dev/null
+++ b/packages/amazonq/.changes/1.95.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2025-09-19",
+	"version": "1.95.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q automatically refreshes expired IAM Credentials in Sagemaker instances"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.96.0.json b/packages/amazonq/.changes/1.96.0.json
new file mode 100644
index 00000000000..17919dd6374
--- /dev/null
+++ b/packages/amazonq/.changes/1.96.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2025-09-25",
+	"version": "1.96.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q support web/container environments running Ubuntu/Linux, even when the host machine is Amazon Linux 2."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.97.0.json b/packages/amazonq/.changes/1.97.0.json
new file mode 100644
index 00000000000..94952817128
--- /dev/null
+++ b/packages/amazonq/.changes/1.97.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-09-29",
+	"version": "1.97.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.98.0.json b/packages/amazonq/.changes/1.98.0.json
new file mode 100644
index 00000000000..a71130bc08a
--- /dev/null
+++ b/packages/amazonq/.changes/1.98.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-10-02",
+	"version": "1.98.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/1.99.0.json b/packages/amazonq/.changes/1.99.0.json
new file mode 100644
index 00000000000..9d1089ee8fa
--- /dev/null
+++ b/packages/amazonq/.changes/1.99.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-10-10",
+	"version": "1.99.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/amazonq/.changes/next-release/Feature-ab31cbb6-3fe4-4ee3-a0a3-290430277856.json b/packages/amazonq/.changes/next-release/Feature-ab31cbb6-3fe4-4ee3-a0a3-290430277856.json
new file mode 100644
index 00000000000..71c1583e77b
--- /dev/null
+++ b/packages/amazonq/.changes/next-release/Feature-ab31cbb6-3fe4-4ee3-a0a3-290430277856.json
@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Q CodeTransformation: add more job metadata to history table"
+}
diff --git a/packages/amazonq/.vscode/launch.json b/packages/amazonq/.vscode/launch.json
new file mode 100644
index 00000000000..b00c5071ce5
--- /dev/null
+++ b/packages/amazonq/.vscode/launch.json
@@ -0,0 +1,168 @@
+// A launch configuration that compiles the extension and then opens it inside a new window
+// Use IntelliSense to learn about possible attributes.
+// Hover to view descriptions of existing attributes.
+// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Extension",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": ["--extensionDevelopmentPath=${workspaceFolder}"],
+            "env": {
+                "SSMDOCUMENT_LANGUAGESERVER_PORT": "6010",
+                "WEBPACK_DEVELOPER_SERVER": "http://localhost:8080"
+                // Below allows for overrides used during development
+                // "__AMAZONQLSP_PATH": "${workspaceFolder}/../../../language-servers/app/aws-lsp-codewhisperer-runtimes/out/agent-standalone.js",
+                // "__AMAZONQLSP_UI": "${workspaceFolder}/../../../language-servers/chat-client/build/amazonq-ui.js"
+            },
+            "envFile": "${workspaceFolder}/.local.env",
+            "outFiles": ["${workspaceFolder}/dist/**/*.js", "${workspaceFolder}/../core/dist/**/*.js"],
+            "preLaunchTask": "watch",
+            "postDebugTask": "terminate",
+            "presentation": {
+                "group": "1_Extension",
+                "order": 2
+            }
+        },
+        {
+            /** Handles the entire process of building and running the toolkit extension in the browser. **/
+            "name": "Extension (Web)",
+            "type": "chrome",
+            "request": "attach",
+            "port": 9222,
+            /**
+            To get an understanding why we need the following:
+              - comment out the following
+              - set a breakpoint in VS Code that gets triggerd on extension startup
+            Now in the Chrome Developer Tools menu, the extension will load slower and open up random files.
+            I think this is due to source maps for irrelevant code being attempted to be resolved and slowing execution.
+
+            What this is doing is ignoring certain modules that match the following paths, it matches the path of
+            a file in `Developer Tools` > `Sources`.
+            I was inspired by this: https://github.com/microsoft/vscode-test-web/blob/897bca4907a87a6bc564efc242ce6794e5da3232/.vscode/launch.json#L28
+            **/
+            "resolveSourceMapLocations": ["!**/node_modules/**", "!**/vs/**", "!**/extensions/**"],
+            "preLaunchTask": "webRun",
+            "postDebugTask": "webRunTerminate",
+            "presentation": {
+                "group": "1_Extension",
+                "order": 4
+            }
+        },
+        {
+            "name": "Extension Tests",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": [
+                "--disable-extensions",
+                "--extensionDevelopmentPath=${workspaceFolder}",
+                "--extensionTestsPath=${workspaceFolder}/dist/test/unit/index",
+                "${workspaceFolder}/../core/dist/src/testFixtures/workspaceFolder"
+            ],
+            "env": {
+                "DEVELOPMENT_PATH": "${workspaceFolder}",
+                "AWS_TOOLKIT_AUTOMATION": "local"
+            },
+            "outFiles": ["${workspaceFolder}/dist/**/*.js", "${workspaceFolder}/../core/dist/**/*.js"],
+            "preLaunchTask": "watch",
+            "presentation": {
+                "group": "3_ExtensionTests",
+                "order": 2
+            }
+        },
+        {
+            "name": "Extension Tests (current file)",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": [
+                "--disable-extensions",
+                "--extensionDevelopmentPath=${workspaceFolder}",
+                "--extensionTestsPath=${workspaceFolder}/dist/test/unit/index",
+                "${workspaceFolder}/../core/dist/src/testFixtures/workspaceFolder"
+            ],
+            "env": {
+                "TEST_FILE": "${relativeFile}",
+                "DEVELOPMENT_PATH": "${workspaceFolder}",
+                "AWS_TOOLKIT_AUTOMATION": "local"
+            },
+            "outFiles": ["${workspaceFolder}/dist/**/*.js", "${workspaceFolder}/../core/dist/**/*.js"],
+            "preLaunchTask": "watch",
+            "presentation": {
+                "group": "2_ExtensionTestsCurrentFile",
+                "order": 2
+            }
+        },
+        {
+            "name": "Extension Tests (web)",
+            "type": "extensionHost",
+            "debugWebWorkerHost": true,
+            "request": "launch",
+            "args": [
+                "--disable-extension=amazonwebservices.aws-toolkit-vscode",
+                "--extensionDevelopmentPath=${workspaceFolder}",
+                "--extensionDevelopmentKind=web",
+                "--extensionTestsPath=${workspaceFolder}/dist/test/web/testRunnerWebCore",
+                "${workspaceFolder}/../core/dist/src/testFixtures/workspaceFolder"
+            ],
+            "outFiles": ["${workspaceFolder}/dist/**/*.js", "${workspaceFolder}/../core/dist/**/*.js"],
+            "preLaunchTask": "webRun",
+            "presentation": {
+                "group": "3_ExtensionTests",
+                "order": 3
+            }
+        },
+        {
+            "name": "E2E Test (current file)",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": [
+                "--disable-extension=amazonwebservices.aws-toolkit-vscode",
+                "${workspaceFolder}/../core/dist/src/testFixtures/workspaceFolder",
+                "--extensionDevelopmentPath=${workspaceFolder}",
+                "--extensionTestsPath=${workspaceFolder}/dist/test/e2e/index.js"
+            ],
+            "env": {
+                "TEST_FILE": "${relativeFile}",
+                "DEVELOPMENT_PATH": "${workspaceFolder}",
+                "AWS_TOOLKIT_AUTOMATION": "local"
+            },
+            "outFiles": ["${workspaceFolder}/dist/**/*.js", "${workspaceFolder}/../core/dist/**/*.js"],
+            "preLaunchTask": "watch",
+            "presentation": {
+                "group": "4_E2ETestCurrentFile",
+                "order": 2
+            }
+        },
+        {
+            "name": "Attach to Language Server",
+            "type": "node",
+            "request": "attach",
+            "port": 6080, // Hard defined in core/src/shared/lsp/platform.ts
+            "outFiles": ["${workspaceFolder}/../../../language-servers/**/out/**/*.js"],
+            "skipFiles": [
+                "<node_internals>/**",
+                "${workspaceFolder}/../../../language-servers/**/node_modules/**/*.js"
+            ],
+            "restart": {
+                "maxAttempts": 10,
+                "delay": 1000
+            }
+        }
+    ],
+    "compounds": [
+        {
+            "name": "Launch LSP with Debugging",
+            "configurations": ["Extension", "Attach to Language Server"],
+            "presentation": {
+                "group": "1_Extension",
+                "order": 5
+            }
+        }
+    ]
+}
diff --git a/packages/amazonq/.vscode/settings.json b/packages/amazonq/.vscode/settings.json
new file mode 100644
index 00000000000..4715e0254bf
--- /dev/null
+++ b/packages/amazonq/.vscode/settings.json
@@ -0,0 +1,12 @@
+{
+    "files.exclude": {},
+    "search.exclude": {
+        "dist": true,
+        "node_modules": true
+    },
+    "files.watcherExclude": {},
+    "typescript.preferences.importModuleSpecifier": "relative",
+    "javascript.preferences.importModuleSpecifier": "relative",
+    "typescript.tsdk": "../../node_modules/typescript/lib",
+    "npm.packageManager": "npm"
+}
diff --git a/packages/amazonq/.vscode/tasks.json b/packages/amazonq/.vscode/tasks.json
new file mode 100644
index 00000000000..86652ec71df
--- /dev/null
+++ b/packages/amazonq/.vscode/tasks.json
@@ -0,0 +1,174 @@
+// See https://go.microsoft.com/fwlink/?LinkId=733558
+// for the documentation about the tasks.json format
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "watch",
+            "type": "shell",
+            "command": "npm",
+            "args": ["run", "watch"],
+            "problemMatcher": "$tsc-watch",
+            "isBackground": true,
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "dependsOn": ["watchCore", "webpackCore", "serveVueCore"]
+        },
+        {
+            "label": "watchCore",
+            "command": "npm run compileOnly -- --watch",
+            "type": "shell",
+            "isBackground": true,
+            "problemMatcher": "$tsc-watch",
+            "options": {
+                "cwd": "${workspaceFolder}/../../packages/core"
+            }
+        },
+        {
+            "label": "webpackCore",
+            "command": "npm run webpackDev -- --watch",
+            "type": "shell",
+            "isBackground": true,
+            "problemMatcher": "$ts-webpack-watch",
+            "options": {
+                "cwd": "${workspaceFolder}/../../packages/core"
+            }
+        },
+        {
+            "label": "serveVueCore",
+            "command": "npm run serveVue",
+            "type": "shell",
+            "detail": "Webpack + local server for Vue webview files from `core`.",
+            "isBackground": true,
+            "problemMatcher": "$ts-webpack-watch",
+            "options": {
+                "cwd": "${workspaceFolder}/../../packages/core"
+            },
+            "presentation": { "panel": "dedicated" }
+        },
+        {
+            "label": "terminate",
+            "command": "echo run terminate",
+            "type": "shell",
+            "presentation": {
+                "close": true
+            }
+        },
+        // ---------- Start: Web Mode Tasks ----------
+        {
+            "label": "webRun",
+            "type": "npm",
+            "script": "webRun",
+            "detail": "Runs VS Code in the Chrome browser with our toolkit installed",
+            "isBackground": true,
+            "dependsOn": ["webWatch"],
+            /**
+            We only need this problem matcher to signal when this task is completed.
+            Since this task starts a web server it does not terminate and we need to use
+            problemMatcher.background.endsPattern to read the CLI and know when this task
+            can signal it is done.
+
+            The rest of the data in problemMatcher is required by VS Code to be "valid",
+            but not important for what we need.
+
+            Doc: https://code.visualstudio.com/Docs/editor/tasks#_defining-a-problem-matcher
+            **/
+            "problemMatcher": {
+                "pattern": [
+                    {
+                        "regexp": "this section irrelevant but it must exist to work",
+                        "file": 1,
+                        "location": 2,
+                        "message": 3
+                    }
+                ],
+                "background": {
+                    "activeOnStart": true,
+                    "beginsPattern": "^@vscode/test-web",
+                    "endsPattern": "^Listening on"
+                }
+            }
+        },
+        {
+            "label": "webWatch",
+            "type": "npm",
+            "script": "webWatch",
+            "detail": "Webpacks our toolkit code (with --watch) in preparation to be run in the browser",
+            "isBackground": true,
+            // Since `webpack --watch` never terminates (but finishes packaging at some point),
+            // VS Code uses this to parse the CLI output to pattern match something that indicates it is done
+            "problemMatcher": "$ts-webpack-watch",
+            "dependsOn": ["webCoreModuleWatch"]
+        },
+        {
+            "label": "webCoreModuleWatch",
+            "type": "shell",
+            "command": "npm run compileDev -- --watch",
+            "detail": "Webpacks our toolkit code as a module in preparation to be webpacked by the toolkit package",
+            "isBackground": true,
+            // Since `webpack --watch` never terminates (but finishes packaging at some point),
+            // VS Code uses this to parse the CLI output to pattern match something that indicates it is done
+            "problemMatcher": "$ts-webpack-watch",
+            "options": {
+                "cwd": "${workspaceFolder}/../../packages/core"
+            }
+        },
+        /**
+        After we stop debugging our browser, we also want to stop the web server.
+        When this task is ran it will stop the web server.
+
+        From: https://stackoverflow.com/a/60330174
+        **/
+        {
+            "label": "webRunTerminate",
+            "command": "echo ${input:webRunTerminate}",
+            "type": "shell",
+            "dependsOn": []
+        },
+        // ---------- End: Web Mode Tasks ----------
+        {
+            "type": "npm",
+            "script": "lint",
+            "problemMatcher": "$eslint-stylish"
+        },
+        {
+            "type": "npm",
+            "script": "lintfix",
+            "problemMatcher": "$eslint-stylish"
+        },
+        {
+            "type": "npm",
+            "script": "compile",
+            "dependsOn": ["Kill Tasks"],
+            "problemMatcher": "$tsc"
+        },
+        {
+            "type": "npm",
+            "script": "clean",
+            "dependsOn": ["Kill Tasks"],
+            "problemMatcher": []
+        },
+        {
+            "label": "Kill Tasks",
+            "type": "process",
+            "command": "${input:killTasks}",
+            "problemMatcher": []
+        }
+    ],
+    "inputs": [
+        {
+            "id": "killTasks",
+            "type": "command",
+            "command": "workbench.action.tasks.terminate",
+            "args": "terminateAll"
+        },
+        {
+            "id": "webRunTerminate",
+            "type": "command",
+            "command": "workbench.action.tasks.terminate",
+            "args": "webRun"
+        }
+    ]
+}
diff --git a/packages/amazonq/CHANGELOG.md b/packages/amazonq/CHANGELOG.md
new file mode 100644
index 00000000000..361633276b5
--- /dev/null
+++ b/packages/amazonq/CHANGELOG.md
@@ -0,0 +1,724 @@
+## 1.102.0 2025-10-30
+
+- Miscellaneous non-user-facing changes
+
+## 1.101.0 2025-10-22
+
+- Miscellaneous non-user-facing changes
+
+## 1.100.0 2025-10-16
+
+- Miscellaneous non-user-facing changes
+
+## 1.99.0 2025-10-10
+
+- Miscellaneous non-user-facing changes
+
+## 1.98.0 2025-10-02
+
+- Miscellaneous non-user-facing changes
+
+## 1.97.0 2025-09-29
+
+- Miscellaneous non-user-facing changes
+
+## 1.96.0 2025-09-25
+
+- **Bug Fix** Amazon Q support web/container environments running Ubuntu/Linux, even when the host machine is Amazon Linux 2.
+
+## 1.95.0 2025-09-19
+
+- **Bug Fix** Amazon Q automatically refreshes expired IAM Credentials in Sagemaker instances
+
+## 1.94.0 2025-09-11
+
+- Miscellaneous non-user-facing changes
+
+## 1.93.0 2025-09-05
+
+- Miscellaneous non-user-facing changes
+
+## 1.92.0 2025-08-28
+
+- **Feature** Amazon Q supports admin control for MCP servers to restrict MCP server usage
+- **Feature** Enabling dynamic model fetching capabilities in Amazon Q chat
+- **Feature** Amazon Q: Support for configuring and utilizing remote MCP servers.
+
+## 1.91.0 2025-08-22
+
+- **Bug Fix** Enable inline completion in Jupyter Notebook
+- **Feature** Amazon Q supports admin control for MCP servers to restrict MCP server usage
+
+## 1.90.0 2025-08-15
+
+- Miscellaneous non-user-facing changes
+
+## 1.89.0 2025-08-13
+
+- Miscellaneous non-user-facing changes
+
+## 1.88.0 2025-08-06
+
+- **Feature** Amazon Q Chat provides error explanations and fixes when hovering or right-clicking on error indicators and messages
+- **Feature** /transform: Show transformation history in Transformation Hub and allow users to resume jobs
+
+## 1.87.0 2025-07-31
+
+- Miscellaneous non-user-facing changes
+
+## 1.86.0 2025-07-30
+
+- **Bug Fix** Let Enter invoke auto completion more consistently
+- **Bug Fix** Faster and more responsive inline completion UX
+- **Bug Fix** Use documentChangeEvent as auto trigger condition
+
+## 1.85.0 2025-07-19
+
+- Miscellaneous non-user-facing changes
+
+## 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.
+- **Feature** Added image support to Amazon Q chat, users can now upload images from their local file system
+- **Removal** Deprecate "amazon q is generating..." UI for inline suggestion
+
+## 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
+
+## 1.80.0 2025-07-01
+
+- Miscellaneous non-user-facing changes
+
+## 1.79.0 2025-06-25
+
+- **Bug Fix** Added automatic system certificate detection and VSCode proxy settings support
+- **Bug Fix** Improved Amazon Linux 2 support with better SageMaker environment detection
+- **Feature** /transform: run all builds client-side
+
+## 1.78.0 2025-06-20
+
+- **Bug Fix** Resolve missing chat options in Amazon Q chat interface.
+
+## 1.77.0 2025-06-18
+
+- Miscellaneous non-user-facing changes
+
+## 1.76.0 2025-06-18
+
+- **Bug Fix** /transform: only show lines of code statistic in plan
+- **Feature** Add model selection feature
+- **Feature** Pin context items in chat and manage workspace rules
+
+## 1.75.0 2025-06-13
+
+- Miscellaneous non-user-facing changes
+
+## 1.74.0 2025-06-12
+
+- Miscellaneous non-user-facing changes
+
+## 1.73.0 2025-06-11
+
+- **Feature** Add MCP Server Support
+
+## 1.72.0 2025-06-11
+
+- **Feature** Launch LSP with bundled artifacts as fallback
+
+## 1.71.0 2025-06-04
+
+- Miscellaneous non-user-facing changes
+
+## 1.70.0 2025-05-28
+
+- **Removal** Disable local workspace LSP
+
+## 1.69.0 2025-05-22
+
+- **Bug Fix** /transform: avoid prompting user for target JDK path unnecessarily
+- **Removal** /transform: remove option to select multiple diffs
+
+## 1.68.0 2025-05-15
+
+- **Bug Fix** Fix Error: 'Amazon Q service is not signed in'
+- **Bug Fix** Fix Error: 'Amazon Q Profile is not selected for IDC connection type'
+- **Feature** Add inline completion support for abap language
+
+## 1.67.0 2025-05-14
+
+- **Bug Fix** Previous and subsequent cells are used as context for completion in a Jupyter notebook
+- **Bug Fix** Support chat in AL2 aarch64
+
+## 1.66.0 2025-05-09
+
+- **Bug Fix** Avoid inline completion 'Improperly formed request' errors when file is too large
+- **Bug Fix** Named agent tabs sometimes open with unnecessary input options
+
+## 1.65.0 2025-05-05
+
+- **Feature** Support selecting customizations across all Q profiles with automatic profile switching for enterprise users
+- **Feature** Memorize and autofill users' last Sso login profile
+
+## 1.64.0 2025-05-02
+
+- **Bug Fix** Enable Amazon Q LSP in AL2 instances
+
+## 1.63.0 2025-05-01
+
+- **Bug Fix** Q profile selection hangs when a region is blocked
+- **Feature** Agentic coding experience: Amazon Q can now write code and run shell commands on your behalf
+
+## 1.62.0 2025-04-25
+
+- **Bug Fix** Toast message to warn users if Developer Profile is not selected
+- **Bug Fix** Fix users can not log in successfully with 2+ IDE instnaces open due to throttle error throw by the service
+
+## 1.61.0 2025-04-22
+
+- **Bug Fix** Some users not signaled they needed to select a Region Profile to get features working
+- **bugfix** /review: disable auto-review by default
+
+## 1.60.0 2025-04-18
+
+- **Bug Fix** Users might be bound to a customization which they dont have access with the selected profile and it causes service throwing 403 when using inline suggestion and chat features
+
+## 1.59.0 2025-04-11
+
+- **Bug Fix** Code fix line number or file is sometimes not accurate
+- **Bug Fix** Fix Q agents will fail for /transform /dev /test features if IdC kms key is configured with 400 error
+
+## 1.58.0 2025-04-11
+
+- **Bug Fix** inline chat activates properly when using 'aws.experiments.amazonqChatLSP' feature flag
+- **Bug Fix** Amazon Q Chat: code blocks in responses flicker, switching tabs during answer streaming makes expand button disappear
+- **Bug Fix** Amazon Q Chat: tab bar buttons disappear when closing non-active tab
+- **Bug Fix** Amazon Q Chat: chat history list does not truncate markdown
+
+## 1.57.0 2025-04-10
+
+- **Bug Fix** Fix bug where generate fix does not work
+- **Bug Fix** Fix bug where review shows 0 findings
+
+## 1.56.0 2025-04-09
+
+- **Bug Fix** Improve status message while loading Amazon Q Profiles during login
+- **Bug Fix** "failed to run command" error
+
+## 1.55.0 2025-04-09
+
+- **Bug Fix** Amazon Q Chat: Update chat history icon
+- **Bug Fix** Amazon Q Chat: chat occasionally freezes and displays gray screen
+- **Bug Fix** Amazon Q Chat: Set owner-only permissions for chat history and saved prompt files
+- **Feature** `/test` generates tests in all languages, not only Java/Python
+- **Feature** Amazon Q chat: Click export icon to save chat transcript in Markdown or HTML
+- **Feature** SageMaker: Disable the unsupported agentic commands and welcome prompt
+- **Feature** Amazon Q Chat: Add `@code` context for PHP, Ruby, Scala, Shell, and Swift projects
+- **Feature** Enterprise users can choose their preferred Amazon Q profile to improve personalization and workflow across different business regions
+
+## 1.54.0 2025-04-03
+
+- **Bug Fix** Amazon Q chat: `@prompts` not added to context
+- **Feature** Amazon Q chat: View and search chat history
+- **Feature** SageMaker Unified Studio: Disable Sign out
+- **Feature** SageMaker Unified Studio: Update Q Chat Introduction message
+- **Feature** /review: automatically generate fix without clicking Generate Fix button
+- **Feature** Amazon Q chat: Automatically persist chats between IDE sessions
+- **Feature** Save user command execution logs to plugin output.
+- **Feature** Amazon Q chat: Code blocks in chat messages have a max-height of 21 lines and can be scrolled inside
+
+## 1.53.0 2025-03-28
+
+- **Bug Fix** Amazon Q Chat: Choosing a nested subfolder for `/doc` on Windows results in `The folder you chose did not contain any source files` error
+- **Feature** Add support for Code search in Q chat
+- **Feature** (Experimental) Amazon Q inline code suggestions via Amazon Q Language Server. (enable with `aws.experiments.amazonqLSP: true`)
+- **Feature** Command Palette: Add `Amazon Q: Open Chat` command.
+
+## 1.52.0 2025-03-20
+
+- **Bug Fix** Amazon Q chat: @Folders and @Files are missing `@` prefix in chat history
+- **Bug Fix** /review: Code Issues ellipses menu displays AWS Toolkit options, if installed.
+- **Bug Fix** Amazon Q chat: Progress indicator height is stretched
+- **Bug Fix** Amazon Q chat: Long descriptions in context list are cut off
+- **Bug Fix** Amazon Q chat: Improve responses for saved prompts and workspace rules
+- **Bug Fix** /test: show descriptive error message
+- **Bug Fix** Code Review: Fixed a bug where issues are double counted in the Q chat
+- **Bug Fix** Amazon Q chat: Animation timings are too long
+- **Bug Fix** Fix inline completion failure due to context length exceeding the threshold
+- **Feature** /review: passing referenceTrackerConfiguration to StartCodeFixJob
+- **Feature** /review: rename setting `showInlineCodeSuggestionsWithCodeReferences` to `showCodeWithReferences`
+
+## 1.51.0 2025-03-12
+
+- **Bug Fix** increase scan timeout to reduce front-end timeout errors
+- **Bug Fix** Amazon Q chat: Create a new prompt form does not autofocus or submit with Enter press
+- **Bug Fix** /review: Zip files are created with the wrong file path for file scans in multifolder workspaces.
+- **Bug Fix** /review: Invalid file path characters caused some detections to be skipped on Windows
+- **Feature** Amazon Q Chat: You can now keep a "library" of prompt files in your home directory under `~/.aws/amazonq/prompts` and then quickly add them to the context using `@` on any project you’re working on. Prompt files are in markdown (`.md`) format.
+- **Feature** /review: show code diff for fix preview
+- **Feature** /test: display test plan summary in chat after generating tests
+
+## 1.50.0 2025-03-06
+
+- **Bug Fix** /doc: Usage in multiple chat tabs may cause unexpected behavior.
+- **Bug Fix** /review: subsequent reviews weren't possible
+- **Feature** Amazon Q chat: Use `@` to add folders, files, and saved prompts as context
+- **Feature** Amazon Q chat: increase chat input height to 3 lines
+- **Feature** Amazon Q chat: Show list of files sent as context in chat response
+- **Feature** Amazon Q chat: Add support for `.md` file rules in workspace-level `.amazonq/rules` directory
+- **Test** add Q Chat /review command test coverage
+
+## 1.49.0 2025-02-27
+
+- **Bug Fix** Amazon Q /test: Unit test generation displays an inaccurate diff view for non-primary packages in the workspace.
+- **Bug Fix** Amazon Q /doc: Fix uploading file method throwing incorrect workspace too large error message
+- **Bug Fix** /transform: skip running tests locally when user chooses to do so
+- **Bug Fix** /review: ignored lines should not show up in scan issues
+- **Bug Fix** /test: update capability card text
+
+## 1.48.0 2025-02-20
+
+- **Bug Fix** /dev and /doc: Multi-root workspace with duplicate files causes infinite 'Uploading code...' loop
+- **Bug Fix** Amazon Q /doc: update workspace too large error message 
+- **Bug Fix** /review: Auto-review should not remove issues from manual reviews
+- **Bug Fix** /transform: allow View Summary button to work even after accepting diff
+- **Bug Fix** Amazon Q /test: Fixing the issue of target file does not exist.
+- **Feature** Amazon Q /doc: Add support for infrastructure diagrams
+
+## 1.47.0 2025-02-13
+
+- **Bug Fix** `Send to prompt` and other context menu options not sent if chat was closed
+- **Bug Fix** Amazon Q /test: Truncating user input to 4096 characters for unit test generation.
+- **Bug Fix** Amazon Q /test: Q identify active test file and infer source file for test generation.
+- **Bug Fix** /review: Code review starts automatically when invoked from menu
+- **Feature** Amazon Q /dev: support `.hbs`, `.gjs`, `.gts`, `.astro`, `.mdx`, `.svelte`, `.erb`, `.rake` files
+- **Feature** /transform: automatically download results when ready
+- **Feature** /transform: support Java 21 transformations
+- **Removal** Reverted prefetch logic to enable more stable inline completion
+
+## 1.46.0 2025-02-05
+
+- **Bug Fix** Citation links are not clickable as numbers, but appear as non-clickable texts
+- **Bug Fix** Fix language server start failure in AL2023 ARM64
+- **Bug Fix** /review: Auto-review issues did not populate code issues list
+- **Bug Fix** Amazon Q: Fix code upload error when using /dev or /doc on Remote SSH
+- **Bug Fix** /test placeholder text aligned across IDEs
+- **Bug Fix** Inline: Typos in the first example suggestion
+- **Feature** Inline suggestions: Pre-fetch recommendations to reduce suggestion latency.
+- **Feature** Added github issue link and description to the chat answer feedback form
+
+## 1.45.0 2025-01-30
+
+- **Bug Fix** Allow AB users with an overridden customization to go back to the default customization
+- **Bug Fix** For security reasons, disabled auto linkify for link texts coming in markdown other than [TEXT](URL) format
+- **Feature** Add setting to allow Q /dev to run code and test commands
+
+## 1.44.0 2025-01-23
+
+- **Bug Fix** Amazon Q: word duplication when pressing tab on context selector fixed
+- **Bug Fix** Amazon Q /doc: Prevent users from requesting changes if no iterations remain
+- **Bug Fix** `/test`: view diffs by clicking files in the file tree, aligning the behavior with the 'View Diff' button.
+- **Bug Fix** /review: Improved error handling for code fix operations
+- **Bug Fix** Amazon Q: cursor no longer jumps after navigating prompt history
+- **Bug Fix** Improve the text description of workspace index settings
+- **Bug Fix** Notifications: 'Dismiss' command visible in command palette.
+- **Bug Fix** /transform: replace icons in Transformation Hub with text
+- **Bug Fix** Amazon Q /doc: Ask for user prompt if error occurs while updating documentation
+- **Feature** Amazon Q: increase chat current active file context char limit to 40k
+- **Feature** /review: Code issues can be grouped by file location or severity
+
+## 1.43.0 2025-01-15
+
+- **Bug Fix** Auth: Valid StartURL not accepted at login
+- **Bug Fix** Fix inline completion supplementalContext length exceeding maximum in certain cases
+- **Bug Fix** Amazon Q /test: Unit test generation completed message shows after accept/reject action
+- **Bug Fix** /test: for unsupported languages was sometimes unreliable
+- **Bug Fix** User-selected customizations are sometimes not being persisted.
+- **Bug Fix** Amazon q /dev: Remove hard-coded limits and instead rely server-side data to communicate number of code generations remaining
+- **Feature** Adds capability to send new context commands to AB groups
+- **Feature** feat(amazonq): Add error message for updated README too large
+- **Feature** Enhance Q inline completion context fetching for better suggestion quality
+
+## 1.42.0 2025-01-09
+
+- **Bug Fix** Amazon Q /doc: Improve button text phrasing
+- **Bug Fix** Amazon Q /dev: Fix issue when files are deleted while preparing context
+- **Bug Fix** Amazon Q Code Transformation: allow POSTGRESQL as target DB for SQL conversions
+- **Bug Fix** Fix context menu displaying when typing @, even though input is disallowed
+- **Bug Fix** Amazon Q can update mvn and gradle build files
+- **Bug Fix** /transform: use correct documentation link in SQL conversion help message
+- **Bug Fix** Up/down history navigation only triggering on first/last line of prompt input
+- **Bug Fix** Amazon Q /test: Fix to redirect /test to generate tests in chat for external files out of workspace scope.
+- **Bug Fix** /review: Code block extends beyond page margins in code issue detail view
+- **Bug Fix** Amazon Q Code Transformation: retry project upload up to 3 times
+- **Feature** Amazon Q Code Transformation: add view summary button in chat
+- **Feature** Amazon Q: new code syntax highlighter for improved accuracy
+- **Removal** Settings: No longer migrate old CodeWhisperer settings or initialize telemetry setting from AWS Toolkit.
+
+## 1.41.0 2024-12-17
+
+- **Bug Fix** /review: Apply fix removes other issues in the same file.
+- **Bug Fix** Fix(Amazon Q Code Transformation): show correct diff when running consecutive transformations
+- **Bug Fix** Improve when the welcome page is shown in amazon q chat
+- **Bug Fix** Code Review: Cleaned up output logs when running /review
+- **Bug Fix** Code Review: Fixed a bug where applying a fix did not update the positions of other issues in the same file.
+- **Bug Fix** Chat: When navigating to previous prompts, code attachments are sometimes displayed incorrectly
+- **Bug Fix** /review: Diagnostics in the problems panel are mapped to the wrong code
+- **Bug Fix** Fix opentabs context possibly timeout due to race condition of misuse of different timeout functionalities
+- **Bug Fix** Auth: SSO session was bad, but no reauth prompt given
+- **Bug Fix** Reduce frequency of system status poll
+- **Bug Fix** Chat: When writing a prompt without sending it, navigating via up/down arrows sometimes deletes the unsent prompt.
+- **Bug Fix** Code Review: Fixed a bug where projects with repeated path names did not scan properly.
+- **Feature** /review: Code fix automatically scrolls into view after generation.
+- **Feature** Chat: improve font size and line-height in footer (below prompt input field)
+
+## 1.40.0 2024-12-10
+
+- **Bug Fix** Improved LLM code review for file review.
+- **Bug Fix** @workspace is missing from the welcome to q chat tab
+- **Bug Fix** Fix chat syntax highlighting when using several different themes
+- **Bug Fix** Amazon Q /doc: progress bar persists after cancelling README creation
+- **Bug Fix** Code Review: Fixed a bug where some issues are missing from the code issues view for workspaces with custom names
+- **Bug Fix** Amazon Q /doc: Prompt user to choose a folder in chat
+- **Bug Fix** Amazon Q /dev not adding Dockerfiles in nested folders
+- **Bug Fix** Improved Code Fix generation for code review issues
+- **Bug Fix** Fix the quick start buttons on the explore page to show amazon q colours on hover
+- **Feature** Q feature dev: recognize .bms, .pli code files
+- **Feature** Amazon Q Code Transformation: show job ID in Transformation Hub
+- **Feature** UI improvements to Amazon Q Chat: New splash loader animation, initial streaming card animation, improved button colours
+- **Feature** Add acknowledgement button for amazon q chat disclaimer
+- **Feature** Navigate through prompt history by using the up/down arrows
+- **Feature** Amazon Q: Simplify log channel
+
+## 1.39.0 2024-12-03
+
+- **Feature** Added a getting started page for exploring amazon q agents
+- **Feature** `/test` in Q chat to generate unit tests for java and python
+- **Feature** `/doc` in Q chat to generate and update documentation for your project
+- **Feature** Amazon Q Code Scan is now Amazon Q Code Review
+- **Feature** `/review` in Q chat to scan your code for vulnerabilities and quality issues, and generate fixes
+- **Feature** Security Scan: New TreeView to display security scan issues and vulnerabilities detected in your project. The TreeView provides an organized and hierarchical view of the scan results, making it easier to navigate and prioritize the issues that need to be addressed.
+- **Feature** Security Scan: Added ability to suppress or ignore security issues
+
+## 1.38.0 2024-11-27
+
+- **Feature** Amazon Q /dev: support `Dockerfile` files
+- **Feature** Introduce @workspace command to enhance context fetching for Chat
+- **Feature** Feature(Amazon Q Code Transformation): allow users to view results in 5 smaller diffs
+
+## 1.37.0 2024-11-22
+
+- **Bug Fix** Amazon Q Feature Dev: display limit reached error message
+- **Bug Fix** Amazon Q chat: `@workspace` command shown in all tab types
+- **Bug Fix** Chat container exceeds width of container
+- **Bug Fix** amazon q inline: skip indexing when no workspace folders are found
+- **Bug Fix** file details and name unneccessary cropping
+- **Bug Fix** Amazon Q /dev: update diff window behavior after a change is accepted
+- **Feature** Amazon Q /dev: support `.gradle` files
+- **Feature** Code Transform: Enable support for Java 17 projects.
+- **Feature** Notifications: Support for delivering critical alerts and product updates
+- **Feature** Retrieve and display a customization name when a customization is overridden in an AB test
+- **Feature** Feature(Amazon Q Code Transformation): support conversions of embedded SQL from Oracle to PostgreSQL
+
+## 1.36.0 2024-11-14
+
+- **Bug Fix** Fix broken inline suggestion auto-trigger on Systemverfilog files if users dont have systemverilog extension installed and enabled
+- **Bug Fix** tutorial always showing on start
+- **Feature** Enable default `@workspace` context of Amazon Q chat for certain users
+- **Feature** Amazon Q /dev: Add an action to accept individual files
+
+## 1.35.0 2024-11-11
+
+- **Breaking Change** Change focus chat keybind to win+alt+i on Windows, cmd+alt+i on macOS, and meta+alt+i on Linux
+- **Bug Fix** Fix suboptimal inline suggestions from Amazon Q caused by improperly formatted supplemental context
+- **Bug Fix** Fix empty chunks being sent to service and get validationException
+
+## 1.34.0 2024-11-07
+
+- **Bug Fix** Align example help text with prompt message in chat
+- **Bug Fix** Improve `@workspace` index auto pause start strategy. 
+- **Feature** Allow users to View and Apply diff when they explictily send code to Amazon Q using - Fix, Refactor, Optimize and Send To Prompt.
+- **Feature** Security Scan: Auto-scan now supports JSX, TSX, Kotlin, Scala, and Shell files.
+
+## 1.33.0 2024-10-30
+
+- **Bug Fix** Amazon Q /dev: fix for stop button showing for Code Transformation
+
+## 1.32.0 2024-10-29
+
+- **Bug Fix** Remove warning when no input is provided to inline chat input box
+- **Bug Fix** Use Sagemaker environment IAM Credentials for Code Completion when they're available
+- **Bug Fix** Inline: Code completion not working for Sagemaker Pro Tier users.
+- **Bug Fix** Disable /transform and /dev commands for sagemaker users as they're not supported
+- **Feature** Amazon SageMaker Studio: Enable Free Tier Chat for IAM users
+
+## 1.31.0 2024-10-29
+
+- **Breaking Change** Change keybind for focusing chat to ctrl+win+i on Windows, ctrl+cmd+i on macOS and ctrl+meta+i on Linux
+- **Bug Fix** Inline Suggestions: Occasional `ValidationException` if user context has too many characters.
+- **Bug Fix** Update `@workspace` index when adding or deleting a file
+- **Bug Fix** fixed device code detection when running auth through tunneled vscode
+- **Feature** Use inline chat to select code and transform it with natural language instructions
+- **Feature** Amazon Q /dev: Add stop generation action
+- **Feature** Provide more frequent updates about code changes made by agent
+
+## 1.30.0 2024-10-17
+
+- **Bug Fix** Various fixes and changes
+
+## 1.29.0 2024-10-10
+
+- **Bug Fix** Amazon Q /dev: include telemetry for workspace usage when generating new files
+- **Bug Fix** Amazon Q extension may fail to start if AWS Toolkit extension fails to start
+- **Bug Fix** Start language server by default
+- **Bug Fix** Amazon Q Feature Dev: Add error messages when the upload URL expires
+- **Bug Fix** Amazon Q (/dev): view diffs of previous /dev iterations
+- **Bug Fix** Q dev handle no change required
+- **Deprecation** The next release of this extension will require VS Code 1.83.0 or newer.
+- **Feature** Automatically pause and resume @workspace indexing when OS CPU load is high
+- **Feature** Add buttons to code blocks to view and accept diffs.
+- **Feature** Inline completion for more json files, and all yaml files
+- **Feature** Show a one-time warning if new VS Code is required
+- **Removal** Minimum required VSCode version is now 1.83
+
+## 1.28.0 2024-10-03
+
+- **Bug Fix** Amazon Q /dev: define first folder as a root path for LLM-created files when using workspaces
+- **Feature** Amazon Q Code Transformation: allow users to skip running tests
+- **Feature** Amazon Q Developer: Updated legal disclaimer text
+
+## 1.27.0 2024-09-27
+
+- **Bug Fix** Security Scan: Fixes an issue that incorrectly removes hardcoded credentials detections from auto scans.
+
+## 1.26.0 2024-09-19
+
+- **Bug Fix** Security Scan: Fixed an issue where the wrong icon was used in the status bar menu.
+- **Bug Fix** Disable Amazon Q LSP in AL2
+- **Bug Fix** Amazon Q Chat: Fix shifted chat contents when closing and opening chat panel back
+- **Bug Fix** Security Scan: Minor styling improvements in the security issue webview panel
+- **Bug Fix** Amazon Q Chat: Fix tooltip remaining on screen when closing and opening chat panel back
+- **Bug Fix** Auth: Login state not updating across multiple VS Code windows.
+- **Feature** Support @workspace queries for specific files like `@workspace what does test.ts do? `. 
+
+## 1.25.0 2024-09-12
+
+- **Bug Fix** Amazon Q Chat: Fixed inline code blocks are not vertically aligned with texts
+- **Feature** Record telemetry event when Amazon Q extension is uninstalled.
+- **Feature** Improve workspace indexing by only index files that are changed since last indexing
+- **Removal** Amazon Q Feature dev: Remove approach generation flow
+
+## 1.24.0 2024-09-05
+
+- **Bug Fix** Network errors causing premature SSO logout
+- **Bug Fix** Fix SyntaxError causing premature expiration (edge case)
+- **Bug Fix** Amazon Q Code Transformation: show instructions for finding JDK path on Linux
+- **Bug Fix** UI: 'Start using Amazon Q' may display even if the user is signed in.
+- **Bug Fix** Add getFeature and isEnabled utility methods to FeatureConfigProvider
+- **Feature** Amazon Q /dev: include in progress state agent in code generation
+- **Feature** Reduce workspace CPU indexing time by 50%
+
+## 1.23.0 2024-08-29
+
+- **Bug Fix** Fix bug when undo inline suggestion causes command not found
+- **Bug Fix** Auth: `SyntaxError` causing unexpected SSO logout
+- **Bug Fix** Amazon Q Code Transformation: allow symlinks for JDK path
+- **Bug Fix** Fix bug where text with inline code copied from Amazon Q Chat had new line breaks around the inline code text
+- **Bug Fix** Fix bug with code indentation and nested list formatting in chat response prompt
+- **Bug Fix** Fix bug when disabled commands does not get filtered in quick actions
+- **Bug Fix** Auth: Users may be silently logged out due to network issues when starting the extension.
+- **Feature** Support AB testing
+
+## 1.22.0 2024-08-22
+
+- **Bug Fix** Avoid refreshing code suggestion for paginated response
+- **Bug Fix** Update login logo styling
+- **Bug Fix** Correct indentation when insert Q chat code at cursor position
+- **Feature** Add notification for extended session to IdC users
+- **Feature** Support more programming languages for workspace index
+
+## 1.21.0 2024-08-15
+
+- **Bug Fix** Q feature dev: update file extension list and minor UI fixes
+
+## 1.20.0 2024-08-08
+
+- **Bug Fix** Amazon Q /dev: include a retry option for the same prompt after folder reselection
+- **Bug Fix** Ignore virtual environment when indexing workspace
+- **Feature** Amazon Q Code Transformation: show pro tier users estimated cost of /transform on projects over 100K lines
+- **Feature** Amazon Q Code Transformation: warn user if absolute file paths are found in the pom.xml
+
+## 1.19.0 2024-08-01
+
+- **Bug Fix** Amazon Q Chat: Fixing issue with an incorrect input cursor position in the prompt text box
+- **Bug Fix** Amazon Q Chat: Fixing issue with the max tabs notification not being dismissible.
+- **Bug Fix** Amazon Q Chat: Showing/hiding the scrollbars is now controlled by the OS settings
+- **Bug Fix** Q chat may stop responding after processing Python/Java code
+- **Feature** Amazon q /dev: i18n support for messaging
+
+## 1.18.0 2024-07-29
+
+- **Bug Fix** Security Scan: Fixed an issue scans were not able to succeed on Java projects with .class files
+- **Bug Fix** FileNotFound error causing early SSO expiration
+
+## 1.17.0 2024-07-25
+
+- **Bug Fix** Amazon Q Dev and Transform introduction text formatted incorrectly
+- **Bug Fix** Amazon Q /dev: update error message for code gen timeout and include backfill for error name
+- **Bug Fix** Sign-in page may fail to render in rare circumstances.
+
+## 1.16.0 2024-07-18
+
+- **Bug Fix** Amazon q /dev: include granular error handling for code generation failed state
+- **Bug Fix** Amazon Q Code Transformation: always show build logs from last job run
+- **Bug Fix** Unexpected SSO expiration on Windows due to EPERM
+
+## 1.15.0 2024-07-15
+
+- **Bug Fix** Amazon Q Chat: Fixes a bug when the prompt input exceeds the width of the chat box it's not always wrapped correctly.
+- **Bug Fix** Amazon Q: Corrected a miswording in the Amazon Q: Share Content With AWS setting.
+- **Bug Fix** Amazon Q Chat: Fixes a bug when user input contains 4 or more spaces at the beginning of the line for multiline inputs, that line appears like a code block instead of a paragraph
+
+## 1.14.0 2024-07-11
+
+- **Feature** Amazon Q/dev proactively show code generation iterations
+
+## 1.13.0 2024-07-11
+
+- **Bug Fix** AD/LDAP users may see "uv_os_get_passwd ENOENT" error on startup #5277
+- **Feature** Add support for [Amazon Q Chat Workspace Context](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/workspace-context.html). Customers can use `@workspace` to ask questions regarding local workspace.
+
+## 1.12.0 2024-07-08
+
+- **Bug Fix** Amazon Q Security Scans: Fixed unnecessary yellow lines appearing in both auto scans and project scans.
+- **Bug Fix** Amazon Q Chat: Fixed prompt input becomes invisible if an html special character is inserted
+- **Bug Fix** Amazon Q Chat: Fixed button font sizes are too big
+- **Bug Fix** Amazon Q Chat: Fixed buttons don't show borders inside a message
+- **Bug Fix** Amazon Q Code Transform: Link UI messages to troubleshooting docs
+- **Bug Fix** Amazon Q /dev command: improve user error messages
+- **Bug Fix** Amazon Q Chat: Fixed button texts are cropped too short
+- **Bug Fix** Amazon Q Chat: Fixed prompt input and selected command horizontal alignment
+- **Bug Fix** Amazon Q Chat: Fixed prompt input becomes invisible when multine text inserted with paste
+- **Feature** Q feature dev: Only use relevant code and related files
+
+## 1.11.0 2024-06-27
+
+- **Bug Fix** Amazon Q Chat: Fix for inline buttons don't have borders
+- **Bug Fix** Amazon Q Chat: Fix for some edge cases when followups appear on top without styles
+- **Bug Fix** Amazon Q Chat: Fix for prompt input removes whole word if it starts with @ character but there is no context selected
+- **Bug Fix** Amazon Q Chat: Fix for prompt input doesn't show multi line content properly after it reaches 10-15 lines
+- **Bug Fix** Amazon Q /dev command: Fix in progress experience for ongoing backend calls
+
+## 1.10.0 2024-06-21
+
+- **Bug Fix** Security Scan: Fixes an issue where project-scans time out for larger projects.
+- **Bug Fix** Amazon Q /dev command: Fix file rejections for files outside of src/
+- **Bug Fix** Feature Development: update /dev welcome message
+- **Bug Fix** Amazon Q Chat: Fixed broken code blocks with typewriter text in list items.
+- **Feature** UX: New style for the login window
+- **Removal** Auth: No longer share SSO sessions with AWS Toolkit.
+
+## 1.9.0 2024-06-14
+
+- **Bug Fix** Amazon Q inline suggestions: remember `Pause Auto-Suggestions` after IDE restart
+- **Bug Fix** Amazon Q /dev command: stop showing spinner when there is an error.
+- **Bug Fix** Security Scan: Fixes an issue where auto-scans cause the editor to become unresponsive for larger projects.
+- **Bug Fix** Fix(Amazon Q Code Transformation): show more detailed error messages for proxy issues
+- **Feature** Amazon Q Code Transform: Allow user to view transformation build log
+
+## 1.8.0 2024-06-07
+
+- **Bug Fix** fix(featureDev): fix file rejection for multi-workspaces
+- **Feature** The `Send to Amazon Q` [context menu](https://github.com/aws/aws-toolkit-vscode/assets/371007/ce4c61a4-1b58-48ee-8500-56667d45dd7d) was renamed to `Amazon Q`
+- **Feature** Amazon Q Transform: Increase project upload size limit to 2GB
+- **Feature** feat(featureDev): generated plan being shown from top
+- **Feature** Add additional commands for Amazon Q.
+
+## 1.7.0 2024-05-30
+
+- **Bug Fix** Feature Development: File rejection is not rejecting a file when code is generated
+- **Bug Fix** Security Scan: Improved accuracy when applying security fixes
+- **Bug Fix** Amazon Q Code Transformation: show more specific error messages on failure cases
+- **Feature** Security Scan: Support for scanning files outside of workspaces.
+- **Feature** Amazon Q now publishes to Open VSX: https://open-vsx.org/namespace/amazonwebservices
+
+## 1.6.0 2024-05-21
+
+- **Bug Fix** Amazon Q Chat: Inside chat body, if there is a code block inside a list item it shows <br/> tags
+- **Bug Fix** Amazon Q Chat: Prompt input field allows additional input beyond the character limit
+- **Bug Fix** Amazon Q Chat: Prompt input field not getting focus when chat window opens
+
+## 1.5.0 2024-05-17
+
+- **Bug Fix** Security Scan: Fixes an issue when scanning projects with binary files
+- **Bug Fix** Fixes an issue where the /dev chat wouldn't let customers modify the source folder when exceeding the size limit
+- **Bug Fix** Security Scan: Improved error notifications
+- **Feature** Security Scan: Added custom command to run the security scan.
+- **Feature** Security Scan: "View details" and "Explain" options can now be accessed from the problems panel
+
+## 1.4.0 2024-05-13
+
+- **Bug Fix** Auth: No longer request AWS account scopes during login.
+- **Bug Fix** Security Scan: Fixes an issue where scans fail for projects with Terraform files
+- **Bug Fix** Amazon Q Code Transform: Show additional status messages to align with experience when JAVA_HOME set incorrectly.
+- **Feature** UX: Added keyboard navigation to login screen.
+- **Feature** New SSO Authorization Code flow for faster logins
+- **Feature** Transform: Add human intervention to help update dependencies during transformation.
+
+## 1.3.0 2024-05-08
+
+- **Bug Fix** modifying the root folder for /dev now modifies it
+- **Bug Fix** Q chat may stop responding after processing Javascript/Typescript code
+- **Bug Fix** Completion may fail unexpected if user opened many tabs
+- **Feature** Inline Suggestions: Only display the 'Open Chat' CodeLens if the user is signed into Amazon Q.
+- **Feature** Security Scan: Scans can now be run without an open editor
+- **Feature** Security Scan: Multi-root workspace support
+
+## 1.2.0 2024-05-07
+
+- **Bug Fix** Fix bug when Amazon Q chat sends code selection while user has no selection
+- **Bug Fix** Amazon Q Code Transformation: make jobId visible in job history tab at start of job and allow summary.md + icons to be saved when accepting changes
+- **Bug Fix** Amazon Q Chat: Typewriter animator parts showing up in code fields inside listitems
+- **Bug Fix** Security Scan: Addresses a bug where security issues sometimes appear multiple times
+- **Feature** Update cross file context config for Q inline suggestion
+- **Feature** Amazon Q: Security scans now support C, C++, and PHP files
+
+## 1.1.0 2024-04-30
+
+- **Bug Fix** Amazon Q Chat: Fixed markdown is not getting parsed inside list items.
+- **Bug Fix** Amazon Q Chat: Copy to clipboard on code blocks doesn't work
+- **Bug Fix** Fixed a crash when trying to use Q /dev on large projects or projects containing files with unsupported encoding.
+
+## 1.0.0 2024-04-29
+
+- **Bug Fix** Code Transformation: Address various issues in TransformationHub UX.
+- **Bug Fix** Code Transformation: Transform may fail if JAVA_HOME has leading or trailing whitespace
+- **Bug Fix** Chat: Q panel doesn't fit to its parent
+- **Bug Fix** Feature Development: update welcome message and menu item description for /dev command
+- **Bug Fix** Code Transformation: show error messages in chat
+- **Bug Fix** Code Transformation: Proposed changes not updated when multiple transformation jobs run in sequence.
+- **Bug Fix** Feature Development: Update error message for monthly conversation limit reach
+- **Bug Fix** Code Transformation: Omit Maven metadata files when uploading dependencies to fix certain build failures in backend.
+- **Feature** Code Transformation: Refreshed UI during CodeTransformation
+- **Feature** Chat: cmd + i to open chat
+- **Feature** Right Click + no code selected shows Q context menu
+- **Feature** Security Scan: Scans can now run on all files in the project
+- **Feature** Chat: Updates quick action commands style and groupings
+- **Feature** Code Transformation: add details about expected changes in transformation plan
+- **Feature** Enable Amazon Q feature development and Amazon Q transform capabilities (/dev and /transform) for AWS Builder ID users.
+- **Feature** Initial release
+- **Feature** Chat: Added metric parameters to recordAddMessage telemetry event.
+- **Feature** Security Scan: Scans can now run automatically when file changes are made
+- **Feature** Chat: brief CodeLens to advertise chat
+- **Feature** Security Scan: Send security issue to chat for explanation and fix
+
diff --git a/packages/amazonq/README.md b/packages/amazonq/README.md
new file mode 100644
index 00000000000..e3ec16bb2ac
--- /dev/null
+++ b/packages/amazonq/README.md
@@ -0,0 +1,58 @@
+![Try Amazon Q Free Tier](https://img.shields.io/badge/Try%20Amazon%20Q-Free%20Tier-success?style=flat-square)
+[![Twitter Follow](https://img.shields.io/badge/follow-@aws-1DA1F2?style=flat-square&logo=aws&logoColor=white&label=Follow)](https://x.com/awscloud)
+[![Youtube Channel Views](https://img.shields.io/youtube/channel/views/UCd6MoB9NC6uYN2grvUNT-Zg?style=flat-square&logo=youtube&label=Youtube)](https://www.youtube.com/@amazonwebservices)
+![Marketplace Installs](https://img.shields.io/vscode-marketplace/i/AmazonWebServices.amazon-q-vscode.svg?label=Installs&style=flat-square)
+
+# Agentic coding experience
+
+Amazon Q Developer uses information across native and MCP server-based tools to intelligently perform actions beyond code suggestions, such as reading files, generating code diffs, and running commands based on your natural language instruction. Simply type your prompt in your preferred language and Q Developer will provide continuous status updates and iteratively apply changes based on your feedback, helping you accomplish tasks faster.
+
+### Implement new features
+
+Generate new code across your entire project and implement features.
+
+### Generate documentation
+
+Write API, technical design, and onboarding documentation.
+
+### Automate code reviews
+
+Perform code reviews, flagging suspicious code patterns and assessing deployment risk.
+
+### Generate unit tests
+
+Generate unit tests and add them to your project, helping you improve code quality, fast.
+
+<br>
+
+# Core features
+
+### MCP support
+
+Add Model Context Protocol (MCP) servers to give Amazon Q Developer access to important context.
+
+### Inline suggestions
+
+Receive real-time code suggestions ranging from snippets to full functions based on your comments and existing code.
+
+[_15+ languages supported including Python, TypeScript, Rust, Terraform, AWS Cloudformation, and more_](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/q-language-ide-support.html)
+
+### Inline chat
+
+Seamlessly chat within the inline coding experience. Select a section of code that you need assistance with and initiate chat within the editor to request actions such as "Optimize this code", "Add comments", or "Write tests".
+
+### Chat
+
+Generate code, explain code, and get answers about software development.
+
+<br>
+
+# Getting Started
+
+**Free Tier** - create or log in with an AWS Builder ID (a personal profile from AWS).
+
+**Pro Tier** - if your organization is on the Amazon Q Developer Pro tier, log in with single sign-on.
+
+# Troubleshooting & feedback
+
+[File a bug](https://github.com/aws/aws-toolkit-vscode/issues/new?assignees=&labels=bug&projects=&template=bug_report.md) or [submit a feature request](https://github.com/aws/aws-toolkit-vscode/issues/new?assignees=&labels=feature-request&projects=&template=feature_request.md) on our Github repository.
diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json
new file mode 100644
index 00000000000..3e239d0cd0e
--- /dev/null
+++ b/packages/amazonq/package.json
@@ -0,0 +1,1492 @@
+{
+    "name": "amazon-q-vscode",
+    "displayName": "Amazon Q",
+    "description": "The most capable generative AI–powered assistant for software development.",
+    "version": "1.103.0-SNAPSHOT",
+    "extensionKind": [
+        "workspace"
+    ],
+    "publisher": "amazonwebservices",
+    "icon": "resources/marketplace/amazonq-icon-256x256.png",
+    "license": "Apache-2.0",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/aws/aws-toolkit-vscode"
+    },
+    "bugs": {
+        "url": "https://github.com/aws/aws-toolkit-vscode/issues"
+    },
+    "galleryBanner": {
+        "color": "#232F3E",
+        "theme": "dark"
+    },
+    "categories": [
+        "AI",
+        "Chat",
+        "Programming Languages",
+        "Education",
+        "Machine Learning"
+    ],
+    "keywords": [
+        "AWS",
+        "Codewhisperer",
+        "AI",
+        "Assistant",
+        "Chatbot",
+        "Q Developer"
+    ],
+    "preview": false,
+    "qna": "https://github.com/aws/aws-toolkit-vscode/issues",
+    "activationEvents": [
+        "onStartupFinished",
+        "onUri",
+        "onCommand:aws.amazonq.accept",
+        "onView:aws.codeWhisperer.securityPanel"
+    ],
+    "main": "./dist/src/extensionNode",
+    "browser": "./dist/src/extensionWeb",
+    "scripts": {
+        "vscode:prepublish": "npm run clean && npm run buildScripts && webpack --mode production",
+        "buildScripts": "npm run generateNonCodeFiles && npm run copyFiles && npm run generateIcons && npm run generateSettings && tsc -p ./ --noEmit",
+        "generateNonCodeFiles": "ts-node ../../scripts/generateNonCodeFiles.ts",
+        "copyFiles": "ts-node ./scripts/build/copyFiles.ts",
+        "clean": "ts-node ../../scripts/clean.ts dist/ LICENSE NOTICE",
+        "compile": "npm run clean && npm run buildScripts && webpack",
+        "compileDev": "npm run testCompile && webpack --mode development",
+        "compileOnly": "tsc -p ./",
+        "package": "ts-node ../../scripts/package.ts",
+        "lint": "true",
+        "watch": "npm run clean && npm run buildScripts && tsc -watch -p ./",
+        "testCompile": "npm run clean && npm run buildScripts && npm run compileOnly",
+        "test": "npm run testCompile && c8 --allowExternal ts-node ../core/scripts/test/launchTest.ts unit dist/test/unit/index.js ../core/dist/src/testFixtures/workspaceFolder",
+        "testE2E": "npm run testCompile && c8 --allowExternal ts-node ../core/scripts/test/launchTest.ts e2e dist/test/e2e/index.js ../core/dist/src/testFixtures/workspaceFolder",
+        "testWeb": "npm run compileDev && c8 --allowExternal ts-node ../core/scripts/test/launchTest.ts web dist/test/web/testRunnerWebCore.js",
+        "webRun": "npx @vscode/test-web --open-devtools --browserOption=--disable-web-security --waitForDebugger=9222 --extensionDevelopmentPath=. .",
+        "webWatch": "npm run clean && npm run buildScripts && webpack --mode development --watch",
+        "serve": "webpack serve --config-name mainServe --mode development",
+        "newChange": "ts-node ../../scripts/newChange.ts",
+        "createRelease": "ts-node ../../scripts/createRelease.ts",
+        "generateIcons": "ts-node ../../scripts/generateIcons.ts",
+        "generateSettings": "ts-node ../../scripts/generateSettings.ts"
+    },
+    "dependencies": {
+        "aws-core-vscode": "file:../core/"
+    },
+    "contributesComments": {
+        "configuration": {
+            "properties": "Any settings also defined in packages/core/package.json will override same-named settings in this file."
+        }
+    },
+    "contributes": {
+        "configuration": {
+            "type": "object",
+            "title": "%AWS.amazonq.productName%",
+            "properties": {
+                "amazonQ.telemetry": {
+                    "type": "boolean",
+                    "default": true,
+                    "markdownDescription": "%AWS.configuration.description.amazonq.telemetry%"
+                },
+                "amazonQ.suppressPrompts": {
+                    "type": "object",
+                    "description": "%AWS.configuration.description.suppressPrompts%",
+                    "default": {},
+                    "properties": {
+                        "createCredentialsProfile": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "codeWhispererNewWelcomeMessage": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "codeWhispererConnectionExpired": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "amazonQWelcomePage": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "amazonQSessionConfigurationMessage": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "minIdeVersion": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "ssoCacheError": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "amazonQLspManifestMessage": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "amazonQWorkspaceLspManifestMessage": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "amazonQChatDisclaimer": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "amazonQChatPairProgramming": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "amazonQSelectDeveloperProfile": {
+                            "type": "boolean",
+                            "default": false
+                        }
+                    },
+                    "additionalProperties": false
+                },
+                "amazonQ.showCodeWithReferences": {
+                    "type": "boolean",
+                    "markdownDescription": "%AWS.configuration.description.amazonq%",
+                    "default": true
+                },
+                "amazonQ.allowFeatureDevelopmentToRunCodeAndTests": {
+                    "markdownDescription": "%AWS.configuration.description.featureDevelopment.allowRunningCodeAndTests%",
+                    "type": "object",
+                    "default": {}
+                },
+                "amazonQ.importRecommendationForInlineCodeSuggestions": {
+                    "type": "boolean",
+                    "description": "%AWS.configuration.description.amazonq.importRecommendation%",
+                    "default": true
+                },
+                "amazonQ.shareContentWithAWS": {
+                    "type": "boolean",
+                    "markdownDescription": "%AWS.configuration.description.amazonq.shareContentWithAWS%",
+                    "default": true,
+                    "scope": "application"
+                },
+                "amazonQ.workspaceIndex": {
+                    "type": "boolean",
+                    "markdownDescription": "%AWS.configuration.description.amazonq.workspaceIndex%",
+                    "default": false,
+                    "scope": "application"
+                },
+                "amazonQ.workspaceIndexWorkerThreads": {
+                    "type": "number",
+                    "markdownDescription": "%AWS.configuration.description.amazonq.workspaceIndexWorkerThreads%",
+                    "default": 0,
+                    "scope": "application"
+                },
+                "amazonQ.workspaceIndexUseGPU": {
+                    "type": "boolean",
+                    "markdownDescription": "%AWS.configuration.description.amazonq.workspaceIndexUseGPU%",
+                    "default": false,
+                    "scope": "application"
+                },
+                "amazonQ.workspaceIndexMaxSize": {
+                    "type": "number",
+                    "markdownDescription": "%AWS.configuration.description.amazonq.workspaceIndexMaxSize%",
+                    "default": 2048,
+                    "scope": "application"
+                },
+                "amazonQ.workspaceIndexMaxFileSize": {
+                    "type": "number",
+                    "markdownDescription": "%AWS.configuration.description.amazonq.workspaceIndexMaxFileSize%",
+                    "default": 10,
+                    "scope": "application"
+                },
+                "amazonQ.workspaceIndexCacheDirPath": {
+                    "type": "string",
+                    "markdownDescription": "%AWS.configuration.description.amazonq.workspaceIndexCacheDirPath%",
+                    "default": null,
+                    "scope": "application"
+                },
+                "amazonQ.workspaceIndexIgnoreFilePatterns": {
+                    "type": "array",
+                    "markdownDescription": "%AWS.configuration.description.amazonq.workspaceIndexIgnoreFilePatterns%",
+                    "default": [],
+                    "scope": "application"
+                },
+                "amazonQ.ignoredSecurityIssues": {
+                    "type": "array",
+                    "markdownDescription": "%AWS.configuration.description.amazonq.ignoredSecurityIssues%",
+                    "scope": "window",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "amazonQ.proxy.certificateAuthority": {
+                    "type": "string",
+                    "markdownDescription": "%AWS.configuration.description.amazonq.proxy.certificateAuthority%",
+                    "default": null,
+                    "scope": "application"
+                },
+                "amazonQ.proxy.enableProxyAndCertificateAutoDiscovery": {
+                    "type": "boolean",
+                    "markdownDescription": "%AWS.configuration.description.amazonq.proxy.enableProxyAndCertificateAutoDiscovery%",
+                    "default": true
+                }
+            }
+        },
+        "viewsContainers": {
+            "activitybar": [
+                {
+                    "id": "amazonq",
+                    "title": "%AWS.amazonq.title%",
+                    "icon": "resources/amazonq-logo.svg"
+                }
+            ],
+            "panel": [
+                {
+                    "id": "aws-codewhisperer-reference-log",
+                    "title": "Code Reference Log",
+                    "icon": "media/aws-logo.svg"
+                },
+                {
+                    "id": "aws-codewhisperer-transformation-hub",
+                    "title": "Transformation Hub",
+                    "icon": "media/aws-logo.svg"
+                }
+            ]
+        },
+        "views": {
+            "amazonq": [
+                {
+                    "id": "aws.amazonq.notifications",
+                    "name": "%AWS.notifications.title%",
+                    "when": "!(isCloud9 || aws.isSageMaker) && aws.amazonq.notifications.show"
+                },
+                {
+                    "type": "webview",
+                    "id": "aws.amazonq.AmazonCommonAuth",
+                    "name": "%AWS.amazonq.login%",
+                    "when": "!aws.isWebExtHost && aws.amazonq.showLoginView"
+                },
+                {
+                    "type": "tree",
+                    "id": "aws.amazonq.SecurityIssuesTree",
+                    "name": "%AWS.amazonq.security%",
+                    "when": "!aws.isSageMaker && !aws.isWebExtHost && !aws.amazonq.showLoginView",
+                    "visibility": "collapsed"
+                },
+                {
+                    "type": "webview",
+                    "id": "aws.amazonq.AmazonQChatView",
+                    "name": "%AWS.amazonq.chat%",
+                    "when": "!aws.isWebExtHost && !aws.amazonq.showLoginView"
+                }
+            ],
+            "aws-codewhisperer-reference-log": [
+                {
+                    "type": "webview",
+                    "id": "aws.codeWhisperer.referenceLog",
+                    "name": ""
+                }
+            ],
+            "aws-codewhisperer-transformation-hub": [
+                {
+                    "type": "webview",
+                    "id": "aws.amazonq.transformationHub",
+                    "name": "Status",
+                    "when": "gumby.wasQCodeTransformationUsed"
+                },
+                {
+                    "id": "aws.amazonq.transformationProposedChangesTree",
+                    "name": "Proposed Changes",
+                    "when": "gumby.transformationProposalReviewInProgress"
+                }
+            ]
+        },
+        "viewsWelcome": [
+            {
+                "view": "aws.amazonq.transformationProposedChangesTree",
+                "contents": "Project transformation is complete.\n[Download Proposed Changes](command:aws.amazonq.transformationHub.reviewChanges.startReview)",
+                "when": "gumby.reviewState == NotStarted"
+            },
+            {
+                "view": "aws.amazonq.transformationProposedChangesTree",
+                "contents": "Project transformation is complete.\n Downloading the proposed changes...",
+                "when": "gumby.reviewState == PreparingReview"
+            },
+            {
+                "view": "aws.amazonq.SecurityIssuesTree",
+                "contents": "No code issues have been detected in the workspace.",
+                "when": "!aws.amazonq.security.noMatches"
+            },
+            {
+                "view": "aws.amazonq.SecurityIssuesTree",
+                "contents": "No matches.\n[Clear Filters](command:aws.amazonq.securityIssuesTreeFilter.clearFilters)",
+                "when": "aws.amazonq.security.noMatches"
+            }
+        ],
+        "submenus": [
+            {
+                "label": "%AWS.submenu.amazonqEditorContextSubmenu.title%",
+                "id": "amazonqEditorContextSubmenu"
+            },
+            {
+                "label": "%AWS.generic.feedback%",
+                "id": "aws.amazonq.submenu.feedback"
+            },
+            {
+                "label": "%AWS.generic.help%",
+                "id": "aws.amazonq.submenu.help"
+            },
+            {
+                "label": "%AWS.generic.moreActions%",
+                "id": "aws.amazonq.submenu.securityIssueMoreActions",
+                "icon": "$(ellipsis)"
+            }
+        ],
+        "menus": {
+            "commandPalette": [
+                {
+                    "command": "aws.amazonq.reconnect",
+                    "when": "false"
+                },
+                {
+                    "command": "amazonq.dev.openMenu",
+                    "when": "aws.isDevMode"
+                },
+                {
+                    "command": "aws.amazonq.learnMore",
+                    "when": "false"
+                }
+            ],
+            "view/title": [
+                {
+                    "command": "aws.amazonq.stopTransformationInHub",
+                    "when": "view == aws.amazonq.transformationHub",
+                    "group": "navigation@1"
+                },
+                {
+                    "command": "aws.amazonq.showPlanProgressInHub",
+                    "when": "view == aws.amazonq.transformationHub",
+                    "group": "navigation@2"
+                },
+                {
+                    "command": "aws.amazonq.showHistoryInHub",
+                    "when": "view == aws.amazonq.transformationHub",
+                    "group": "navigation@3"
+                },
+                {
+                    "command": "aws.amazonq.showTransformationPlanInHub",
+                    "when": "view == aws.amazonq.transformationHub",
+                    "group": "navigation@4"
+                },
+                {
+                    "command": "aws.amazonq.transformationHub.summary.reveal",
+                    "when": "view == aws.amazonq.transformationHub",
+                    "group": "navigation@5"
+                },
+                {
+                    "command": "aws.amazonq.transformationHub.reviewChanges.acceptChanges",
+                    "when": "view == aws.amazonq.transformationProposedChangesTree && gumby.reviewState == InReview",
+                    "group": "navigation@1"
+                },
+                {
+                    "command": "aws.amazonq.transformationHub.reviewChanges.rejectChanges",
+                    "when": "view == aws.amazonq.transformationProposedChangesTree && gumby.reviewState == InReview",
+                    "group": "navigation@2"
+                },
+                {
+                    "command": "aws.amazonq.openReferencePanel",
+                    "when": "view == aws.amazonq.AmazonQChatView",
+                    "group": "0_topAmazonQ@1"
+                },
+                {
+                    "command": "aws.amazonq.selectRegionProfile",
+                    "when": "view == aws.amazonq.AmazonQChatView && aws.amazonq.connectedSsoIdc == true",
+                    "group": "1_amazonQ@1"
+                },
+                {
+                    "command": "aws.amazonq.manageSubscription",
+                    "when": "(view == aws.amazonq.AmazonQChatView) && aws.codewhisperer.connected",
+                    "group": "1_amazonQ@2"
+                },
+                {
+                    "command": "aws.amazonq.learnMore",
+                    "when": "view =~ /^aws\\.amazonq/",
+                    "group": "1_amazonQ@3"
+                },
+                {
+                    "command": "aws.amazonq.signout",
+                    "when": "(view == aws.amazonq.AmazonQChatView) && aws.codewhisperer.connected && !aws.isSageMakerUnifiedStudio",
+                    "group": "2_amazonQ@4"
+                },
+                {
+                    "command": "aws.amazonq.showLogs",
+                    "when": "!aws.isSageMakerUnifiedStudio",
+                    "group": "1_amazonQ@5"
+                },
+                {
+                    "command": "aws.amazonq.reconnect",
+                    "when": "(view == aws.amazonq.AmazonQChatView) && aws.codewhisperer.connectionExpired",
+                    "group": "2_amazonQ@3"
+                },
+                {
+                    "submenu": "aws.amazonq.submenu.feedback",
+                    "when": "view =~ /^aws\\.amazonq/",
+                    "group": "y_toolkitMeta@1"
+                },
+                {
+                    "submenu": "aws.amazonq.submenu.help",
+                    "when": "view =~ /^aws\\.amazonq/",
+                    "group": "y_toolkitMeta@2"
+                },
+                {
+                    "command": "aws.amazonq.codescan.showGroupingStrategy",
+                    "when": "view == aws.amazonq.SecurityIssuesTree",
+                    "group": "navigation@1"
+                },
+                {
+                    "command": "aws.amazonq.security.showFilters",
+                    "when": "view == aws.amazonq.SecurityIssuesTree",
+                    "group": "navigation@2"
+                }
+            ],
+            "view/item/context": [
+                {
+                    "command": "_aws.amazonq.notifications.dismiss",
+                    "when": "viewItem == amazonqNotificationStartUp",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.amazonq.openSecurityIssuePanel",
+                    "when": "false && view == aws.amazonq.SecurityIssuesTree && (viewItem == issueWithoutFix || viewItem == issueWithFix || viewItem == issueWithFixDisabled)",
+                    "group": "inline@4"
+                },
+                {
+                    "command": "aws.amazonq.security.explain",
+                    "when": "view == aws.amazonq.SecurityIssuesTree && (viewItem == issueWithoutFix || viewItem == issueWithFix || viewItem == issueWithFixDisabled)",
+                    "group": "inline@4"
+                },
+                {
+                    "command": "aws.amazonq.security.generateFix",
+                    "when": "view == aws.amazonq.SecurityIssuesTree && (viewItem == issueWithoutFix || viewItem == issueWithFix || viewItem == issueWithFixDisabled)",
+                    "group": "inline@5"
+                },
+                {
+                    "command": "aws.amazonq.security.ignore",
+                    "when": "view == aws.amazonq.SecurityIssuesTree && (viewItem == issueWithoutFix || viewItem == issueWithFix || viewItem == issueWithFixDisabled)",
+                    "group": "inline@6"
+                },
+                {
+                    "submenu": "aws.amazonq.submenu.securityIssueMoreActions",
+                    "when": "view == aws.amazonq.SecurityIssuesTree && (viewItem == issueWithoutFix || viewItem == issueWithFix || viewItem == issueWithFixDisabled)",
+                    "group": "inline@7"
+                }
+            ],
+            "amazonqEditorContextSubmenu": [
+                {
+                    "command": "aws.amazonq.explainCode",
+                    "group": "cw_chat@1"
+                },
+                {
+                    "command": "aws.amazonq.refactorCode",
+                    "group": "cw_chat@2"
+                },
+                {
+                    "command": "aws.amazonq.fixCode",
+                    "group": "cw_chat@3"
+                },
+                {
+                    "command": "aws.amazonq.optimizeCode",
+                    "group": "cw_chat@4"
+                },
+                {
+                    "command": "aws.amazonq.generateUnitTests",
+                    "when": "!aws.isSageMaker",
+                    "group": "cw_chat@5"
+                },
+                {
+                    "command": "aws.amazonq.sendToPrompt",
+                    "group": "cw_chat@6"
+                },
+                {
+                    "command": "aws.amazonq.inline.invokeChat",
+                    "group": "cw_chat@7"
+                }
+            ],
+            "editor/context": [
+                {
+                    "submenu": "amazonqEditorContextSubmenu",
+                    "group": "cw_chat"
+                }
+            ],
+            "aws.amazonq.submenu.feedback": [
+                {
+                    "command": "aws.amazonq.submitFeedback",
+                    "when": "!aws.isWebExtHost",
+                    "group": "1_feedback@1"
+                },
+                {
+                    "command": "aws.amazonq.createIssueOnGitHub",
+                    "group": "1_feedback@2"
+                }
+            ],
+            "aws.amazonq.submenu.help": [
+                {
+                    "command": "aws.amazonq.walkthrough.show",
+                    "group": "1_help@1"
+                },
+                {
+                    "command": "aws.amazonq.github",
+                    "group": "1_help@2"
+                },
+                {
+                    "command": "aws.amazonq.aboutExtension",
+                    "group": "1_help@3"
+                },
+                {
+                    "command": "aws.amazonq.viewLogs",
+                    "group": "1_help@4"
+                }
+            ],
+            "aws.amazonq.submenu.securityIssueMoreActions": [
+                {
+                    "command": "aws.amazonq.security.explain",
+                    "when": "false",
+                    "group": "1_more@1"
+                },
+                {
+                    "command": "aws.amazonq.applySecurityFix",
+                    "when": "false && view == aws.amazonq.SecurityIssuesTree && viewItem == issueWithFix",
+                    "group": "1_more@3"
+                },
+                {
+                    "command": "aws.amazonq.security.regenerateFix",
+                    "when": "false && view == aws.amazonq.SecurityIssuesTree && viewItem == issueWithFix",
+                    "group": "1_more@4"
+                },
+                {
+                    "command": "aws.amazonq.security.ignoreAll",
+                    "group": "1_more@5"
+                }
+            ]
+        },
+        "commands": [
+            {
+                "command": "aws.amazonq.stopCmdExecution",
+                "title": "Stop Amazon Q",
+                "category": "%AWS.amazonq.title%"
+            },
+            {
+                "command": "aws.amazonq.runCmdExecution",
+                "title": "Run Amazon Q Tool",
+                "category": "%AWS.amazonq.title%"
+            },
+            {
+                "command": "aws.amazonq.rejectCmdExecution",
+                "title": "Reject Amazon Q Tool",
+                "category": "%AWS.amazonq.title%"
+            },
+            {
+                "command": "_aws.amazonq.notifications.dismiss",
+                "title": "%AWS.generic.dismiss%",
+                "category": "%AWS.amazonq.title%",
+                "enablement": "view == aws.amazonq.notifications",
+                "icon": "$(remove-close)"
+            },
+            {
+                "command": "aws.amazonq.explainCode",
+                "title": "%AWS.command.amazonq.explainCode%",
+                "category": "%AWS.amazonq.title%",
+                "enablement": "aws.codewhisperer.connected"
+            },
+            {
+                "command": "aws.amazonq.refactorCode",
+                "title": "%AWS.command.amazonq.refactorCode%",
+                "category": "%AWS.amazonq.title%",
+                "enablement": "aws.codewhisperer.connected"
+            },
+            {
+                "command": "aws.amazonq.fixCode",
+                "title": "%AWS.command.amazonq.fixCode%",
+                "category": "%AWS.amazonq.title%",
+                "enablement": "aws.codewhisperer.connected"
+            },
+            {
+                "command": "aws.amazonq.optimizeCode",
+                "title": "%AWS.command.amazonq.optimizeCode%",
+                "category": "%AWS.amazonq.title%",
+                "enablement": "aws.codewhisperer.connected"
+            },
+            {
+                "command": "aws.amazonq.sendToPrompt",
+                "title": "%AWS.command.amazonq.sendToPrompt%",
+                "category": "%AWS.amazonq.title%",
+                "enablement": "aws.codewhisperer.connected"
+            },
+            {
+                "command": "aws.amazonq.generateUnitTests",
+                "title": "%AWS.command.amazonq.generateUnitTests%",
+                "category": "%AWS.amazonq.title%",
+                "enablement": "aws.codewhisperer.connected && !aws.isSageMaker"
+            },
+            {
+                "command": "aws.amazonq.reconnect",
+                "title": "%AWS.command.codewhisperer.reconnect%",
+                "category": "%AWS.amazonq.title%",
+                "enablement": "aws.codewhisperer.connected"
+            },
+            {
+                "command": "aws.amazonq.openReferencePanel",
+                "title": "%AWS.command.codewhisperer.openReferencePanel%",
+                "category": "%AWS.amazonq.title%",
+                "enablement": "aws.codewhisperer.connected"
+            },
+            {
+                "command": "aws.amazonq.showLogs",
+                "title": "%AWS.command.codewhisperer.showLogs%",
+                "category": "%AWS.amazonq.title%"
+            },
+            {
+                "command": "aws.amazonq.selectRegionProfile",
+                "title": "Change Profile",
+                "category": "%AWS.amazonq.title%",
+                "enablement": "aws.codewhisperer.connected"
+            },
+            {
+                "command": "aws.amazonq.transformationHub.reviewChanges.acceptChanges",
+                "title": "%AWS.command.q.transform.acceptChanges%"
+            },
+            {
+                "command": "aws.amazonq.transformationHub.reviewChanges.rejectChanges",
+                "title": "%AWS.command.q.transform.rejectChanges%"
+            },
+            {
+                "command": "aws.amazonq.transformationHub.summary.reveal",
+                "title": "%AWS.command.q.transform.showChangeSummary%",
+                "enablement": "gumby.isSummaryAvailable"
+            },
+            {
+                "command": "aws.amazonq.showTransformationPlanInHub",
+                "title": "%AWS.command.q.transform.showTransformationPlan%",
+                "enablement": "gumby.isPlanAvailable"
+            },
+            {
+                "command": "aws.amazonq.createIssueOnGitHub",
+                "title": "%AWS.command.createIssueOnGitHub%",
+                "category": "%AWS.amazonq.title%"
+            },
+            {
+                "command": "aws.amazonq.submitFeedback",
+                "title": "%AWS.command.submitFeedback%",
+                "enablement": "!aws.isWebExtHost",
+                "category": "%AWS.amazonq.title%",
+                "icon": "$(comment)"
+            },
+            {
+                "command": "aws.amazonq.viewLogs",
+                "title": "%AWS.command.viewLogs%",
+                "category": "%AWS.amazonq.title%"
+            },
+            {
+                "command": "aws.amazonq.github",
+                "title": "%AWS.command.github%",
+                "category": "%AWS.amazonq.title%"
+            },
+            {
+                "command": "aws.amazonq.aboutExtension",
+                "title": "%AWS.command.aboutToolkit%",
+                "category": "%AWS.amazonq.title%"
+            },
+            {
+                "command": "aws.amazonq.invokeInlineCompletion",
+                "title": "%AWS.command.codewhisperer.title%",
+                "category": "%AWS.amazonq.title%",
+                "enablement": "aws.codewhisperer.connected"
+            },
+            {
+                "command": "aws.amazonq.configure",
+                "title": "%AWS.command.codewhisperer.configure%",
+                "category": "%AWS.amazonq.title%",
+                "icon": "$(gear)"
+            },
+            {
+                "command": "aws.amazonq.introduction",
+                "title": "%AWS.command.codewhisperer.introduction%",
+                "category": "%AWS.amazonq.title%",
+                "icon": "$(question)"
+            },
+            {
+                "command": "aws.amazonq.manageSubscription",
+                "title": "%AWS.command.manageSubscription%",
+                "category": "%AWS.amazonq.title%",
+                "icon": "$(gear)",
+                "enablement": "aws.codewhisperer.connected && !aws.amazonq.connectedSsoIdc"
+            },
+            {
+                "command": "aws.amazonq.signout",
+                "title": "%AWS.command.codewhisperer.signout%",
+                "category": "%AWS.amazonq.title%",
+                "icon": "$(debug-disconnect)",
+                "enablement": "aws.codewhisperer.connected && !aws.isSageMakerUnifiedStudio"
+            },
+            {
+                "command": "aws.amazonq.learnMore",
+                "title": "%AWS.amazonq.learnMore%",
+                "category": "%AWS.amazonq.title%"
+            },
+            {
+                "command": "amazonq.dev.openMenu",
+                "title": "Open Developer Menu",
+                "category": "Amazon Q (Developer)",
+                "enablement": "aws.isDevMode"
+            },
+            {
+                "command": "aws.amazonq.stopTransformationInHub",
+                "title": "%AWS.command.q.transform.stopJobInHub%",
+                "enablement": "gumby.isStopButtonAvailable"
+            },
+            {
+                "command": "aws.amazonq.showPlanProgressInHub",
+                "title": "%AWS.command.q.transform.viewJobProgress%"
+            },
+            {
+                "command": "aws.amazonq.showHistoryInHub",
+                "title": "%AWS.command.q.transform.viewJobHistory%"
+            },
+            {
+                "command": "aws.amazonq.selectCustomization",
+                "title": "%AWS.codewhisperer.customization.notification.new_customizations.select%",
+                "category": "%AWS.amazonq.title%",
+                "enablement": "aws.codewhisperer.connected"
+            },
+            {
+                "command": "aws.amazonq.gettingStarted",
+                "title": "Try inline suggestion examples",
+                "category": "%AWS.amazonq.title%",
+                "enablement": "aws.codewhisperer.connected"
+            },
+            {
+                "command": "aws.amazonq.toggleCodeSuggestion",
+                "title": "%AWS.amazonq.toggleCodeSuggestion%",
+                "category": "%AWS.amazonq.title%",
+                "enablement": "aws.codewhisperer.connected"
+            },
+            {
+                "command": "aws.codeWhisperer.toggleCodeScan",
+                "title": "%AWS.amazonq.toggleCodeScan%",
+                "category": "%AWS.amazonq.title%",
+                "enablement": "aws.codewhisperer.connected"
+            },
+            {
+                "command": "aws.amazonq.securityIssuesTreeFilter.clearFilters",
+                "title": "Clear Filters",
+                "enablement": "view == aws.amazonq.SecurityIssuesTree"
+            },
+            {
+                "command": "aws.amazonq.security.generateFix",
+                "title": "%AWS.command.amazonq.generateFix%",
+                "icon": "$(wrench)",
+                "enablement": "view == aws.amazonq.SecurityIssuesTree"
+            },
+            {
+                "command": "aws.amazonq.applySecurityFix",
+                "title": "%AWS.command.amazonq.acceptFix%",
+                "icon": "$(check)",
+                "enablement": "view == aws.amazonq.SecurityIssuesTree"
+            },
+            {
+                "command": "aws.amazonq.security.regenerateFix",
+                "title": "%AWS.command.amazonq.regenerateFix%",
+                "icon": "$(lightbulb-autofix)",
+                "enablement": "view == aws.amazonq.SecurityIssuesTree"
+            },
+            {
+                "command": "aws.amazonq.openSecurityIssuePanel",
+                "title": "%AWS.command.amazonq.viewDetails%",
+                "icon": "$(search)",
+                "enablement": "view == aws.amazonq.SecurityIssuesTree"
+            },
+            {
+                "command": "aws.amazonq.security.explain",
+                "title": "%AWS.command.amazonq.explainIssue%",
+                "icon": "$(search)",
+                "enablement": "view == aws.amazonq.SecurityIssuesTree"
+            },
+            {
+                "command": "aws.amazonq.security.ignore",
+                "title": "%AWS.command.amazonq.ignoreIssue%",
+                "icon": "$(circle-slash)",
+                "enablement": "view == aws.amazonq.SecurityIssuesTree"
+            },
+            {
+                "command": "aws.amazonq.security.ignoreAll",
+                "title": "%AWS.command.amazonq.ignoreAllIssues%",
+                "enablement": "view == aws.amazonq.SecurityIssuesTree"
+            },
+            {
+                "command": "aws.amazonq.security.showFilters",
+                "title": "%AWS.command.amazonq.filterIssues%",
+                "icon": "$(filter)",
+                "enablement": "view == aws.amazonq.SecurityIssuesTree"
+            },
+            {
+                "command": "aws.amazonq.codescan.showGroupingStrategy",
+                "title": "%AWS.command.amazonq.groupIssues%",
+                "icon": "$(list-filter)",
+                "enablement": "view == aws.amazonq.SecurityIssuesTree"
+            },
+            {
+                "command": "aws.amazonq.inline.invokeChat",
+                "title": "%AWS.amazonq.inline.invokeChat%",
+                "category": "%AWS.amazonq.title%",
+                "enablement": "aws.codewhisperer.connected"
+            },
+            {
+                "command": "aws.amazonq.focusChat",
+                "title": "%AWS.amazonq.openChat%",
+                "category": "%AWS.amazonq.title%"
+            },
+            {
+                "command": "aws.amazonq.walkthrough.show",
+                "title": "%AWS.amazonq.welcomeWalkthrough%"
+            },
+            {
+                "command": "aws.amazonq.clearCache",
+                "title": "%AWS.amazonq.clearCache%",
+                "category": "%AWS.amazonq.title%"
+            },
+            {
+                "command": "aws.amazonq.inline.acceptEdit",
+                "title": "%AWS.amazonq.inline.acceptEdit%",
+                "category": "%AWS.amazonq.title%",
+                "enablement": "aws.codewhisperer.connected"
+            },
+            {
+                "command": "aws.amazonq.inline.rejectEdit",
+                "title": "%AWS.amazonq.inline.rejectEdit%",
+                "category": "%AWS.amazonq.title%",
+                "enablement": "aws.codewhisperer.connected"
+            },
+            {
+                "command": "aws.amazonq.toggleNextEditPredictionPanel",
+                "title": "%AWS.amazonq.toggleNextEditPredictionPanel%",
+                "category": "%AWS.amazonq.title%",
+                "enablement": "aws.codewhisperer.connected"
+            }
+        ],
+        "keybindings": [
+            {
+                "command": "aws.amazonq.stopCmdExecution",
+                "key": "ctrl+shift+backspace",
+                "mac": "cmd+shift+backspace",
+                "when": "aws.amazonq.amazonqChatLSP.isFocus"
+            },
+            {
+                "command": "aws.amazonq.runCmdExecution",
+                "key": "ctrl+shift+enter",
+                "mac": "cmd+shift+enter",
+                "when": "aws.amazonq.amazonqChatLSP.isFocus"
+            },
+            {
+                "command": "aws.amazonq.rejectCmdExecution",
+                "key": "ctrl+shift+r",
+                "mac": "cmd+shift+r",
+                "when": "aws.amazonq.amazonqChatLSP.isFocus"
+            },
+            {
+                "command": "_aws.amazonq.focusChat.keybinding",
+                "win": "win+alt+i",
+                "mac": "cmd+alt+i",
+                "linux": "meta+alt+i"
+            },
+            {
+                "command": "aws.amazonq.inline.debugAcceptEdit",
+                "key": "ctrl+alt+a",
+                "mac": "cmd+alt+a",
+                "when": "editorTextFocus"
+            },
+            {
+                "command": "aws.amazonq.inline.debugRejectEdit",
+                "key": "ctrl+alt+r",
+                "mac": "cmd+alt+r",
+                "when": "editorTextFocus"
+            },
+            {
+                "command": "aws.amazonq.explainCode",
+                "win": "win+alt+e",
+                "mac": "cmd+alt+e",
+                "linux": "meta+alt+e"
+            },
+            {
+                "command": "aws.amazonq.refactorCode",
+                "win": "win+alt+u",
+                "mac": "cmd+alt+u",
+                "linux": "meta+alt+u"
+            },
+            {
+                "command": "aws.amazonq.fixCode",
+                "win": "win+alt+h",
+                "mac": "cmd+alt+y",
+                "linux": "meta+alt+y"
+            },
+            {
+                "command": "aws.amazonq.optimizeCode",
+                "win": "win+alt+a",
+                "mac": "cmd+alt+a",
+                "linux": "meta+alt+a"
+            },
+            {
+                "command": "aws.amazonq.sendToPrompt",
+                "key": "win+alt+q",
+                "mac": "cmd+alt+q",
+                "linux": "meta+alt+q"
+            },
+            {
+                "command": "aws.amazonq.generateUnitTests",
+                "key": "win+alt+n",
+                "mac": "cmd+alt+t",
+                "linux": "meta+alt+t"
+            },
+            {
+                "command": "aws.amazonq.invokeInlineCompletion",
+                "key": "alt+c",
+                "mac": "alt+c",
+                "when": "editorTextFocus && aws.codewhisperer.connected"
+            },
+            {
+                "command": "aws.amazonq.rejectCodeSuggestion",
+                "key": "escape",
+                "mac": "escape",
+                "when": "inlineSuggestionVisible && !editorReadonly && aws.codewhisperer.connected"
+            },
+            {
+                "command": "aws.amazonq.dismissTutorial",
+                "key": "escape",
+                "mac": "escape",
+                "when": "aws.codewhisperer.tutorial.workInProgress && !inlineSuggestionVisible && !suggestWidgetVisible"
+            },
+            {
+                "key": "right",
+                "command": "aws.amazonq.showNext",
+                "when": "inlineSuggestionVisible && !editorReadonly && aws.codewhisperer.connected"
+            },
+            {
+                "key": "left",
+                "command": "aws.amazonq.showPrev",
+                "when": "inlineSuggestionVisible && !editorReadonly && aws.codewhisperer.connected"
+            },
+            {
+                "command": "aws.amazonq.checkInlineSuggestionVisibility",
+                "when": "inlineSuggestionVisible && !editorReadonly && aws.codewhisperer.connected"
+            },
+            {
+                "command": "aws.amazonq.inline.invokeChat",
+                "win": "ctrl+i",
+                "mac": "cmd+i",
+                "linux": "ctrl+i",
+                "when": "editorTextFocus && aws.codewhisperer.connected"
+            },
+            {
+                "command": "aws.amazonq.inline.waitForUserDecisionAcceptAll",
+                "key": "enter",
+                "when": "editorTextFocus && aws.codewhisperer.connected && amazonq.inline.codelensShortcutEnabled"
+            },
+            {
+                "command": "aws.amazonq.inline.waitForUserDecisionRejectAll",
+                "key": "escape",
+                "when": "editorTextFocus && aws.codewhisperer.connected && amazonq.inline.codelensShortcutEnabled"
+            },
+            {
+                "command": "aws.amazonq.inline.acceptEdit",
+                "key": "tab",
+                "when": "editorTextFocus && aws.amazonq.editSuggestionActive"
+            },
+            {
+                "command": "aws.amazonq.inline.rejectEdit",
+                "key": "escape",
+                "when": "editorTextFocus && aws.amazonq.editSuggestionActive"
+            }
+        ],
+        "icons": {
+            "aws-amazonq-q-gradient": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1aa"
+                }
+            },
+            "aws-amazonq-q-squid-ink": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ab"
+                }
+            },
+            "aws-amazonq-q-white": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ac"
+                }
+            },
+            "aws-amazonq-severity-critical": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ad"
+                }
+            },
+            "aws-amazonq-severity-high": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ae"
+                }
+            },
+            "aws-amazonq-severity-info": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1af"
+                }
+            },
+            "aws-amazonq-severity-low": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b0"
+                }
+            },
+            "aws-amazonq-severity-medium": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b1"
+                }
+            },
+            "aws-amazonq-transform-arrow-dark": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b2"
+                }
+            },
+            "aws-amazonq-transform-arrow-light": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b3"
+                }
+            },
+            "aws-amazonq-transform-default-dark": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b4"
+                }
+            },
+            "aws-amazonq-transform-default-light": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b5"
+                }
+            },
+            "aws-amazonq-transform-dependencies-dark": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b6"
+                }
+            },
+            "aws-amazonq-transform-dependencies-light": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b7"
+                }
+            },
+            "aws-amazonq-transform-file-dark": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b8"
+                }
+            },
+            "aws-amazonq-transform-file-light": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b9"
+                }
+            },
+            "aws-amazonq-transform-logo": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ba"
+                }
+            },
+            "aws-amazonq-transform-step-into-dark": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1bb"
+                }
+            },
+            "aws-amazonq-transform-step-into-light": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1bc"
+                }
+            },
+            "aws-amazonq-transform-variables-dark": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1bd"
+                }
+            },
+            "aws-amazonq-transform-variables-light": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1be"
+                }
+            },
+            "aws-applicationcomposer-icon": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1bf"
+                }
+            },
+            "aws-applicationcomposer-icon-dark": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c0"
+                }
+            },
+            "aws-apprunner-service": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c1"
+                }
+            },
+            "aws-cdk-logo": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c2"
+                }
+            },
+            "aws-cloudformation-stack": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c3"
+                }
+            },
+            "aws-cloudwatch-log-group": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c4"
+                }
+            },
+            "aws-codecatalyst-logo": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c5"
+                }
+            },
+            "aws-codewhisperer-icon-black": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c6"
+                }
+            },
+            "aws-codewhisperer-icon-white": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c7"
+                }
+            },
+            "aws-codewhisperer-learn": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c8"
+                }
+            },
+            "aws-ecr-registry": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c9"
+                }
+            },
+            "aws-ecs-cluster": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ca"
+                }
+            },
+            "aws-ecs-container": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1cb"
+                }
+            },
+            "aws-ecs-service": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1cc"
+                }
+            },
+            "aws-generic-attach-file": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1cd"
+                }
+            },
+            "aws-iot-certificate": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ce"
+                }
+            },
+            "aws-iot-policy": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1cf"
+                }
+            },
+            "aws-iot-thing": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d0"
+                }
+            },
+            "aws-lambda-create-stack": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d1"
+                }
+            },
+            "aws-lambda-create-stack-light": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d2"
+                }
+            },
+            "aws-lambda-function": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d3"
+                }
+            },
+            "aws-mynah-MynahIconBlack": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d4"
+                }
+            },
+            "aws-mynah-MynahIconWhite": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d5"
+                }
+            },
+            "aws-mynah-logo": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d6"
+                }
+            },
+            "aws-redshift-cluster": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d7"
+                }
+            },
+            "aws-redshift-cluster-connected": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d8"
+                }
+            },
+            "aws-redshift-database": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d9"
+                }
+            },
+            "aws-redshift-redshift-cluster-connected": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1da"
+                }
+            },
+            "aws-redshift-schema": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1db"
+                }
+            },
+            "aws-redshift-table": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1dc"
+                }
+            },
+            "aws-s3-bucket": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1dd"
+                }
+            },
+            "aws-s3-create-bucket": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1de"
+                }
+            },
+            "aws-sagemaker-code-editor": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1df"
+                }
+            },
+            "aws-sagemaker-jupyter-lab": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e0"
+                }
+            },
+            "aws-sagemakerunifiedstudio-catalog": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e1"
+                }
+            },
+            "aws-sagemakerunifiedstudio-spaces": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e2"
+                }
+            },
+            "aws-sagemakerunifiedstudio-spaces-dark": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e3"
+                }
+            },
+            "aws-sagemakerunifiedstudio-symbol-int": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e4"
+                }
+            },
+            "aws-sagemakerunifiedstudio-table": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e5"
+                }
+            },
+            "aws-schemas-registry": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e6"
+                }
+            },
+            "aws-schemas-schema": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e7"
+                }
+            },
+            "aws-stepfunctions-preview": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e8"
+                }
+            }
+        },
+        "walkthroughs": [
+            {
+                "id": "aws.amazonq.walkthrough",
+                "title": "Meet Amazon Q",
+                "description": "Your generative AI-powered assistant across the software development lifecycle.",
+                "steps": [
+                    {
+                        "id": "aws.amazonq.walkthrough.inlineSuggestions",
+                        "title": "Get inline code suggestions",
+                        "description": "Amazon Q suggests code as you type based on your open files. Accepted suggestions from licensed code will go into the Code Reference Log.\n\n[Try Example](command:_aws.amazonq.walkthrough.inlineSuggestionsExample)\n\n**TIP: Invoke manually with opt/alt + c**",
+                        "media": {
+                            "markdown": "./resources/walkthrough/amazonq/inline.md"
+                        },
+                        "completionEvents": [
+                            "onCommand:_aws.amazonq.walkthrough.inlineSuggestionsExample"
+                        ]
+                    },
+                    {
+                        "id": "aws.amazonq.walkthrough.chat",
+                        "title": "Ask using chat",
+                        "description": "Amazon Q answers software development questions, writes code based on your current file, and cites sources.\n\nUse the right-click menu for quick commands.\n\n**TIP: Drag and drop the Q panel to dock on the right**",
+                        "media": {
+                            "markdown": "./resources/walkthrough/amazonq/chat.md"
+                        },
+                        "completionEvents": []
+                    },
+                    {
+                        "id": "aws.amazonq.walkthrough.settings",
+                        "title": "Access actions and options",
+                        "description": "Pause inline suggestions, open the Code Reference Log, access Settings, and more from the Amazon Q menu.\n\n[Open the status bar menu](command:_aws.amazonq.walkthrough.listCommands)",
+                        "media": {
+                            "markdown": "./resources/walkthrough/amazonq/menu.md"
+                        },
+                        "completionEvents": [
+                            "onCommand:_aws.amazonq.walkthrough.listCommands"
+                        ]
+                    }
+                ]
+            }
+        ]
+    },
+    "engines": {
+        "npm": "^10.1.0",
+        "vscode": "^1.83.0"
+    }
+}
diff --git a/packages/amazonq/scripts/build/copyFiles.ts b/packages/amazonq/scripts/build/copyFiles.ts
new file mode 100644
index 00000000000..45b1d263f0b
--- /dev/null
+++ b/packages/amazonq/scripts/build/copyFiles.ts
@@ -0,0 +1,96 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* eslint-disable no-restricted-imports */
+import fs from 'fs'
+import * as path from 'path'
+
+// Moves all dependencies into `dist`
+
+const projectRoot = process.cwd()
+const outRoot = path.join(projectRoot, 'dist')
+let vueHr = false
+
+// The target file or directory must exist, otherwise we should fail the whole build.
+interface CopyTask {
+    /**
+     * Target file or directory to copy.
+     */
+    readonly target: string
+
+    /**
+     * Providing no destination means the target will be copied relative to the root directory.
+     */
+    readonly destination?: string
+}
+
+const tasks: CopyTask[] = [
+    ...['LICENSE', 'NOTICE'].map((f) => {
+        return { target: path.join('../../', f), destination: path.join(projectRoot, f) }
+    }),
+
+    { target: path.join('../core', 'resources'), destination: path.join('..', 'resources') },
+    {
+        target: path.join('../core', 'package.nls.json'),
+        destination: path.join('..', 'package.nls.json'),
+    },
+    { target: 'test/unit/amazonqGumby/resources' },
+
+    // Vue
+    {
+        target: '../core/src/auth/sso/vue',
+        destination: 'src/auth/sso/vue',
+    },
+    {
+        target: path.join('../core', 'resources', 'js', 'vscode.js'),
+        destination: path.join('libs', 'vscode.js'),
+    },
+    {
+        target: path.join('../../node_modules', 'vue', 'dist', 'vue.global.prod.js'),
+        destination: path.join('libs', 'vue.min.js'),
+    },
+    {
+        target: path.join('../../node_modules', 'aws-core-vscode', 'dist', vueHr ? 'vuehr' : 'vue'),
+        destination: 'vue/',
+    },
+
+    {
+        target: path.join('../../node_modules', 'web-tree-sitter', 'tree-sitter.wasm'),
+        destination: path.join('src', 'tree-sitter.wasm'),
+    },
+]
+
+function copy(task: CopyTask): void {
+    const src = path.resolve(projectRoot, task.target)
+    const dst = path.resolve(outRoot, task.destination ?? task.target)
+
+    try {
+        fs.cpSync(src, dst, {
+            recursive: true,
+            force: true,
+            errorOnExist: false,
+        })
+    } catch (error) {
+        throw new Error(`Copy "${src}" to "${dst}" failed: ${error instanceof Error ? error.message : error}`)
+    }
+}
+
+const args = process.argv.slice(2)
+if (args.includes('--vueHr')) {
+    vueHr = true
+    console.log('Using Vue Hot Reload webpacks from core/')
+}
+
+function main() {
+    try {
+        tasks.map(copy)
+    } catch (error) {
+        console.error('`copyFiles.ts` failed')
+        console.error(error)
+        process.exit(1)
+    }
+}
+
+void main()
diff --git a/packages/amazonq/src/api.ts b/packages/amazonq/src/api.ts
new file mode 100644
index 00000000000..03b2a32ea55
--- /dev/null
+++ b/packages/amazonq/src/api.ts
@@ -0,0 +1,33 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { SendMessageCommandOutput, SendMessageRequest } from '@amzn/amazon-q-developer-streaming-client'
+import { GenerateAssistantResponseCommandOutput, GenerateAssistantResponseRequest } from '@amzn/codewhisperer-streaming'
+import { AuthUtil } from 'aws-core-vscode/codewhisperer'
+import { ChatSession } from 'aws-core-vscode/codewhispererChat'
+import { api } from 'aws-core-vscode/amazonq'
+
+export default {
+    chatApi: {
+        async chat(request: GenerateAssistantResponseRequest): Promise<GenerateAssistantResponseCommandOutput> {
+            const chatSession = new ChatSession()
+            return chatSession.chatSso(request)
+        },
+        async chatIam(request: SendMessageRequest): Promise<SendMessageCommandOutput> {
+            const chatSession = new ChatSession()
+            return chatSession.chatIam(request)
+        },
+    },
+    authApi: {
+        async reauthIfNeeded() {
+            if (AuthUtil.instance.isConnectionExpired()) {
+                await AuthUtil.instance.showReauthenticatePrompt()
+            }
+        },
+        async getChatAuthState() {
+            return AuthUtil.instance.getChatAuthState()
+        },
+    },
+} satisfies api
diff --git a/packages/amazonq/src/app/amazonqScan/app.ts b/packages/amazonq/src/app/amazonqScan/app.ts
new file mode 100644
index 00000000000..bd12e3acd01
--- /dev/null
+++ b/packages/amazonq/src/app/amazonqScan/app.ts
@@ -0,0 +1,70 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { AmazonQAppInitContext, MessageListener } from 'aws-core-vscode/amazonq'
+import { AuthUtil, codeScanState, onDemandFileScanState } from 'aws-core-vscode/codewhisperer'
+import { ScanChatControllerEventEmitters, ChatSessionManager } from 'aws-core-vscode/amazonqScan'
+import { ScanController } from './chat/controller/controller'
+import { AppToWebViewMessageDispatcher } from './chat/views/connector/connector'
+import { Messenger } from './chat/controller/messenger/messenger'
+import { UIMessageListener } from './chat/views/actions/uiMessageListener'
+import { debounce } from 'lodash'
+
+export function init(appContext: AmazonQAppInitContext) {
+    const scanChatControllerEventEmitters: ScanChatControllerEventEmitters = {
+        authClicked: new vscode.EventEmitter<any>(),
+        tabOpened: new vscode.EventEmitter<any>(),
+        tabClosed: new vscode.EventEmitter<any>(),
+        runScan: new vscode.EventEmitter<any>(),
+        formActionClicked: new vscode.EventEmitter<any>(),
+        errorThrown: new vscode.EventEmitter<any>(),
+        showSecurityScan: new vscode.EventEmitter<any>(),
+        scanStopped: new vscode.EventEmitter<any>(),
+        followUpClicked: new vscode.EventEmitter<any>(),
+        scanProgress: new vscode.EventEmitter<any>(),
+        processResponseBodyLinkClick: new vscode.EventEmitter<any>(),
+        fileClicked: new vscode.EventEmitter<any>(),
+        scanCancelled: new vscode.EventEmitter<any>(),
+        processChatItemVotedMessage: new vscode.EventEmitter<any>(),
+    }
+    const dispatcher = new AppToWebViewMessageDispatcher(appContext.getAppsToWebViewMessagePublisher())
+    const messenger = new Messenger(dispatcher)
+
+    new ScanController(scanChatControllerEventEmitters, messenger, appContext.onDidChangeAmazonQVisibility.event)
+
+    const scanChatUIInputEventEmitter = new vscode.EventEmitter<any>()
+
+    new UIMessageListener({
+        chatControllerEventEmitters: scanChatControllerEventEmitters,
+        webViewMessageListener: new MessageListener<any>(scanChatUIInputEventEmitter),
+    })
+
+    const debouncedEvent = debounce(async () => {
+        const authenticated = (await AuthUtil.instance.getChatAuthState()).amazonQ === 'connected'
+        let authenticatingSessionID = ''
+
+        if (authenticated) {
+            const session = ChatSessionManager.Instance.getSession()
+
+            if (session.isTabOpen() && session.isAuthenticating) {
+                authenticatingSessionID = session.tabID!
+                session.isAuthenticating = false
+            }
+        }
+
+        messenger.sendAuthenticationUpdate(authenticated, [authenticatingSessionID])
+    }, 500)
+
+    AuthUtil.instance.secondaryAuth.onDidChangeActiveConnection(() => {
+        return debouncedEvent()
+    })
+    AuthUtil.instance.regionProfileManager.onDidChangeRegionProfile(() => {
+        return debouncedEvent()
+    })
+
+    codeScanState.setChatControllers(scanChatControllerEventEmitters)
+    onDemandFileScanState.setChatControllers(scanChatControllerEventEmitters)
+}
diff --git a/packages/amazonq/src/app/amazonqScan/chat/controller/controller.ts b/packages/amazonq/src/app/amazonqScan/chat/controller/controller.ts
new file mode 100644
index 00000000000..72af0a200c5
--- /dev/null
+++ b/packages/amazonq/src/app/amazonqScan/chat/controller/controller.ts
@@ -0,0 +1,372 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * This class is responsible for responding to UI events by calling
+ * the Scan extension.
+ */
+import * as vscode from 'vscode'
+import { AuthController } from 'aws-core-vscode/amazonq'
+import { getLogger, placeholder, i18n, openUrl, fs, TabTypeDataMap, randomUUID } from 'aws-core-vscode/shared'
+import { ScanChatControllerEventEmitters, Session, ChatSessionManager } from 'aws-core-vscode/amazonqScan'
+import {
+    AggregatedCodeScanIssue,
+    AuthUtil,
+    CodeAnalysisScope,
+    codeScanState,
+    isGitRepo,
+    onDemandFileScanState,
+    SecurityScanError,
+    SecurityScanStep,
+    showFileScan,
+    showSecurityScan,
+} from 'aws-core-vscode/codewhisperer'
+import { Messenger, ScanNamedMessages } from './messenger/messenger'
+import MessengerUtils from './messenger/messengerUtils'
+import {
+    cancellingProgressField,
+    fileScanProgressField,
+    projectScanProgressField,
+    ScanAction,
+    scanProgressMessage,
+    scanSummaryMessage,
+} from '../../models/constants'
+import path from 'path'
+import { telemetry } from 'aws-core-vscode/telemetry'
+
+export class ScanController {
+    private readonly messenger: Messenger
+    private readonly sessionStorage: ChatSessionManager
+    private authController: AuthController
+
+    public constructor(
+        private readonly chatControllerMessageListeners: ScanChatControllerEventEmitters,
+        messenger: Messenger,
+        onDidChangeAmazonQVisibility: vscode.Event<boolean>
+    ) {
+        this.messenger = messenger
+        this.sessionStorage = ChatSessionManager.Instance
+        this.authController = new AuthController()
+
+        this.chatControllerMessageListeners.tabOpened.event((data) => {
+            return this.tabOpened(data)
+        })
+
+        this.chatControllerMessageListeners.tabClosed.event((data) => {
+            return this.tabClosed(data)
+        })
+
+        this.chatControllerMessageListeners.authClicked.event((data) => {
+            this.authClicked(data)
+        })
+
+        this.chatControllerMessageListeners.runScan.event((data) => {
+            return this.scanInitiated(data)
+        })
+
+        this.chatControllerMessageListeners.formActionClicked.event((data) => {
+            return this.formActionClicked(data)
+        })
+
+        this.chatControllerMessageListeners.errorThrown.event((data) => {
+            return this.handleError(data)
+        })
+
+        this.chatControllerMessageListeners.showSecurityScan.event((data) => {
+            return this.handleScanResults(data)
+        })
+
+        this.chatControllerMessageListeners.scanStopped.event((data) => {
+            return this.handleScanStopped(data)
+        })
+
+        this.chatControllerMessageListeners.followUpClicked.event((data) => {
+            return this.handleFollowUpClicked(data)
+        })
+
+        this.chatControllerMessageListeners.scanProgress.event((data) => {
+            return this.handleScanProgress(data)
+        })
+
+        this.chatControllerMessageListeners.processResponseBodyLinkClick.event((data) => {
+            return this.processLink(data)
+        })
+
+        this.chatControllerMessageListeners.fileClicked.event((data) => {
+            return this.processFileClick(data)
+        })
+
+        this.chatControllerMessageListeners.scanCancelled.event((data) => {
+            return this.handleScanCancelled(data)
+        })
+
+        this.chatControllerMessageListeners.processChatItemVotedMessage.event((data) => {
+            telemetry.amazonq_feedback.emit({
+                featureId: 'amazonQReview',
+                amazonqConversationId: this.sessionStorage.getSession().scanUuid,
+                credentialStartUrl: AuthUtil.instance.startUrl,
+                interactionType: data.vote,
+            })
+        })
+
+        AuthUtil.instance.regionProfileManager.onDidChangeRegionProfile(() => {
+            this.sessionStorage.removeActiveTab()
+        })
+    }
+
+    private async tabOpened(message: any) {
+        const session: Session = this.sessionStorage.getSession()
+        const tabID = this.sessionStorage.setActiveTab(message.tabID)
+
+        // check if authentication has expired
+        try {
+            getLogger().debug(`Q - Review: Session created with id: ${session.tabID}`)
+
+            const authState = await AuthUtil.instance.getChatAuthState()
+            if (authState.amazonQ !== 'connected') {
+                void this.messenger.sendAuthNeededExceptionMessage(authState, tabID)
+                session.isAuthenticating = true
+                return
+            }
+        } catch (err: any) {
+            this.messenger.sendErrorMessage(err.message, message.tabID)
+        }
+    }
+
+    private async tabClosed(data: any) {
+        this.sessionStorage.removeActiveTab()
+    }
+
+    private authClicked(message: any) {
+        this.authController.handleAuth(message.authType)
+
+        this.messenger.sendAnswer({
+            type: 'answer',
+            tabID: message.tabID,
+            message: 'Follow instructions to re-authenticate ...',
+        })
+
+        // Explicitly ensure the user goes through the re-authenticate flow
+        this.messenger.sendChatInputEnabled(message.tabID, false)
+    }
+
+    private async scanInitiated(message: any) {
+        const session: Session = this.sessionStorage.getSession()
+        try {
+            // check that a project is open
+            const workspaceFolders = vscode.workspace.workspaceFolders
+            if (workspaceFolders === undefined || workspaceFolders.length === 0) {
+                this.messenger.sendChatInputEnabled(message.tabID, false)
+                this.messenger.sendErrorResponse('no-project-found', message.tabID)
+                return
+            }
+            // check that the session is authenticated
+            const authState = await AuthUtil.instance.getChatAuthState()
+            if (authState.amazonQ !== 'connected') {
+                void this.messenger.sendAuthNeededExceptionMessage(authState, message.tabID)
+                session.isAuthenticating = true
+                return
+            }
+            this.messenger.sendPromptMessage({
+                tabID: message.tabID,
+                message: i18n('AWS.amazonq.scans.runCodeScan'),
+            })
+            this.messenger.sendCapabilityCard({ tabID: message.tabID })
+            // Displaying types of scans and wait for user input
+            this.messenger.sendUpdatePlaceholder(message.tabID, i18n('AWS.amazonq.scans.waitingForInput'))
+
+            this.messenger.sendScans(message.tabID, i18n('AWS.amazonq.scans.chooseScan.description'))
+        } catch (e: any) {
+            this.messenger.sendErrorMessage(e.message, message.tabID)
+        }
+    }
+
+    private async formActionClicked(message: any) {
+        const typedAction = MessengerUtils.stringToEnumValue(ScanAction, message.action as any)
+        switch (typedAction) {
+            case ScanAction.STOP_PROJECT_SCAN:
+                codeScanState.setToCancelling()
+                this.messenger.sendUpdatePromptProgress(message.tabID, cancellingProgressField)
+                break
+            case ScanAction.STOP_FILE_SCAN:
+                onDemandFileScanState.setToCancelling()
+                this.messenger.sendUpdatePromptProgress(message.tabID, cancellingProgressField)
+                break
+        }
+    }
+
+    private async handleError(message: {
+        error: SecurityScanError
+        tabID: string
+        scope: CodeAnalysisScope
+        fileName: string | undefined
+        scanUuid?: string
+    }) {
+        if (this.isNotMatchingId(message)) {
+            return
+        }
+        if (message.error.code === 'NoSourceFilesError') {
+            this.messenger.sendScanResults(message.tabID, message.scope, message.fileName, true)
+            this.messenger.sendAnswer({
+                tabID: message.tabID,
+                type: 'answer',
+                canBeVoted: true,
+                message: scanSummaryMessage(message.scope, []),
+            })
+        } else {
+            this.messenger.sendErrorResponse(message.error, message.tabID)
+        }
+    }
+
+    private async handleScanResults(message: {
+        error: Error
+        totalIssues: number
+        tabID: string
+        securityRecommendationCollection: AggregatedCodeScanIssue[]
+        scope: CodeAnalysisScope
+        fileName: string
+        scanUuid?: string
+    }) {
+        if (this.isNotMatchingId(message)) {
+            return
+        }
+        this.messenger.sendScanResults(message.tabID, message.scope, message.fileName, true)
+        this.messenger.sendAnswer({
+            tabID: message.tabID,
+            type: 'answer',
+            canBeVoted: true,
+            message: scanSummaryMessage(message.scope, message.securityRecommendationCollection),
+        })
+    }
+
+    private async handleScanStopped(message: { tabID: string }) {
+        this.messenger.sendUpdatePlaceholder(message.tabID, TabTypeDataMap.review.placeholder)
+        // eslint-disable-next-line unicorn/no-null
+        this.messenger.sendUpdatePromptProgress(message.tabID, null)
+        this.messenger.sendChatInputEnabled(message.tabID, true)
+    }
+
+    private async handleFollowUpClicked(message: any) {
+        switch (message.followUp.type) {
+            case ScanAction.RUN_PROJECT_SCAN: {
+                this.messenger.sendPromptMessage({
+                    tabID: message.tabID,
+                    message: i18n('AWS.amazonq.scans.projectScan'),
+                })
+
+                const workspaceFolders = vscode.workspace.workspaceFolders ?? []
+                for (const folder of workspaceFolders) {
+                    if (!(await isGitRepo(folder.uri))) {
+                        this.messenger.sendAnswer({
+                            tabID: message.tabID,
+                            type: 'answer',
+                            message: i18n('AWS.amazonq.scans.noGitRepo'),
+                        })
+                        break
+                    }
+                }
+
+                this.messenger.sendScanInProgress({
+                    type: 'answer-stream',
+                    tabID: message.tabID,
+                    canBeVoted: true,
+                    message: scanProgressMessage(0, CodeAnalysisScope.PROJECT),
+                })
+                this.messenger.sendUpdatePromptProgress(message.tabID, projectScanProgressField)
+                const scanUuid = randomUUID()
+                this.sessionStorage.getSession().scanUuid = scanUuid
+                void showSecurityScan.execute(placeholder, 'amazonQChat', true, scanUuid)
+                break
+            }
+            case ScanAction.RUN_FILE_SCAN: {
+                // check if IDE has active file open.
+                const activeEditor = vscode.window.activeTextEditor
+                // also check all open editors and allow this to proceed if only one is open (even if not main focus)
+                const allVisibleEditors = vscode.window.visibleTextEditors
+                const openFileEditors = allVisibleEditors.filter((editor) => editor.document.uri.scheme === 'file')
+                const hasOnlyOneOpenFileSplitView = openFileEditors.length === 1
+                getLogger().debug(`hasOnlyOneOpenSplitView: ${hasOnlyOneOpenFileSplitView}`)
+                // is not a file if the currently highlighted window is not a file, and there is either more than one or no file windows open
+                const isNotFile = activeEditor?.document.uri.scheme !== 'file' && !hasOnlyOneOpenFileSplitView
+                getLogger().debug(`activeEditor: ${activeEditor}, isNotFile: ${isNotFile}`)
+                if (!activeEditor || isNotFile) {
+                    this.messenger.sendErrorResponse(
+                        isNotFile ? 'invalid-file-type' : 'no-open-file-found',
+                        message.tabID
+                    )
+                    this.messenger.sendUpdatePlaceholder(
+                        message.tabID,
+                        'Please open and highlight a source code file in order run a code scan.'
+                    )
+                    this.messenger.sendChatInputEnabled(message.tabID, true)
+                    return
+                }
+                const fileEditorToTest = hasOnlyOneOpenFileSplitView ? openFileEditors[0] : activeEditor
+                const fileName = fileEditorToTest.document.uri.fsPath
+
+                this.messenger.sendPromptMessage({
+                    tabID: message.tabID,
+                    message: i18n('AWS.amazonq.scans.fileScan'),
+                })
+                this.messenger.sendScanInProgress({
+                    type: 'answer-stream',
+                    tabID: message.tabID,
+                    canBeVoted: true,
+                    message: scanProgressMessage(
+                        SecurityScanStep.GENERATE_ZIP - 1,
+                        CodeAnalysisScope.FILE_ON_DEMAND,
+                        fileName ? path.basename(fileName) : undefined
+                    ),
+                })
+                this.messenger.sendUpdatePromptProgress(message.tabID, fileScanProgressField)
+                const scanUuid = randomUUID()
+                this.sessionStorage.getSession().scanUuid = scanUuid
+                void showFileScan.execute(placeholder, 'amazonQChat', scanUuid)
+                break
+            }
+        }
+    }
+
+    private async handleScanProgress(message: any) {
+        if (this.isNotMatchingId(message)) {
+            return
+        }
+        this.messenger.sendAnswer({
+            type: 'answer-part',
+            tabID: message.tabID,
+            messageID: ScanNamedMessages.SCAN_SUBMISSION_STATUS_MESSAGE,
+            message: scanProgressMessage(
+                message.step,
+                message.scope,
+                message.fileName ? path.basename(message.fileName) : undefined
+            ),
+        })
+    }
+
+    private processLink(message: any) {
+        void openUrl(vscode.Uri.parse(message.link))
+    }
+
+    private async processFileClick(message: any) {
+        const workspaceFolders = vscode.workspace.workspaceFolders ?? []
+        for (const workspaceFolder of workspaceFolders) {
+            const projectPath = workspaceFolder.uri.fsPath
+            const filePathWithoutProjectName = message.filePath.split('/').slice(1).join('/')
+            const absolutePath = path.join(projectPath, filePathWithoutProjectName)
+            if (await fs.existsFile(absolutePath)) {
+                const document = await vscode.workspace.openTextDocument(absolutePath)
+                await vscode.window.showTextDocument(document)
+            }
+        }
+    }
+
+    private async handleScanCancelled(message: any) {
+        this.messenger.sendAnswer({ type: 'answer', tabID: message.tabID, message: 'Cancelled' })
+    }
+
+    private isNotMatchingId(data: { scanUuid?: string }): boolean {
+        const messagescanUuid = data.scanUuid
+        const currentscanUuid = this.sessionStorage.getSession().scanUuid
+        return Boolean(messagescanUuid) && Boolean(currentscanUuid) && messagescanUuid !== currentscanUuid
+    }
+}
diff --git a/packages/amazonq/src/app/amazonqScan/chat/controller/messenger/messenger.ts b/packages/amazonq/src/app/amazonqScan/chat/controller/messenger/messenger.ts
new file mode 100644
index 00000000000..18b05e8bb84
--- /dev/null
+++ b/packages/amazonq/src/app/amazonqScan/chat/controller/messenger/messenger.ts
@@ -0,0 +1,230 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * This class controls the presentation of the various chat bubbles presented by the
+ * Q Security Scans.
+ *
+ * As much as possible, all strings used in the experience should originate here.
+ */
+
+import { AuthFollowUpType, AuthMessageDataMap } from 'aws-core-vscode/amazonq'
+import {
+    FeatureAuthState,
+    SecurityScanError,
+    CodeWhispererConstants,
+    SecurityScanStep,
+    DefaultCodeScanErrorMessage,
+} from 'aws-core-vscode/codewhisperer'
+import { ChatItemButton, ProgressField } from '@aws/mynah-ui/dist/static'
+import { MynahIcons, ChatItemAction } from '@aws/mynah-ui'
+import { ChatItemType } from 'aws-core-vscode/amazonq'
+import {
+    AppToWebViewMessageDispatcher,
+    AuthNeededException,
+    AuthenticationUpdateMessage,
+    CapabilityCardMessage,
+    ChatInputEnabledMessage,
+    ChatMessage,
+    ChatPrompt,
+    ErrorMessage,
+    UpdatePlaceholderMessage,
+    UpdatePromptProgressMessage,
+} from '../../views/connector/connector'
+import { i18n } from 'aws-core-vscode/shared'
+import { ScanAction, scanProgressMessage } from '../../../models/constants'
+import path from 'path'
+
+export type UnrecoverableErrorType = 'no-project-found' | 'no-open-file-found' | 'invalid-file-type'
+
+export enum ScanNamedMessages {
+    SCAN_SUBMISSION_STATUS_MESSAGE = 'scanSubmissionMessage',
+}
+
+export class Messenger {
+    public constructor(private readonly dispatcher: AppToWebViewMessageDispatcher) {}
+
+    public sendAnswer(params: {
+        message?: string
+        type: ChatItemType
+        tabID: string
+        messageID?: string
+        followUps?: ChatItemAction[]
+        canBeVoted?: boolean
+    }) {
+        this.dispatcher.sendChatMessage(
+            new ChatMessage(
+                {
+                    message: params.message,
+                    messageType: params.type,
+                    messageId: params.messageID,
+                    followUps: params.followUps,
+                    canBeVoted: true,
+                },
+                params.tabID
+            )
+        )
+    }
+
+    public sendChatInputEnabled(tabID: string, enabled: boolean) {
+        this.dispatcher.sendChatInputEnabled(new ChatInputEnabledMessage(tabID, enabled))
+    }
+
+    public sendUpdatePlaceholder(tabID: string, newPlaceholder: string) {
+        this.dispatcher.sendUpdatePlaceholder(new UpdatePlaceholderMessage(tabID, newPlaceholder))
+    }
+
+    public sendUpdatePromptProgress(tabID: string, progressField: ProgressField | null) {
+        this.dispatcher.sendUpdatePromptProgress(new UpdatePromptProgressMessage(tabID, progressField))
+    }
+
+    public async sendAuthNeededExceptionMessage(credentialState: FeatureAuthState, tabID: string) {
+        let authType: AuthFollowUpType = 'full-auth'
+        let message = AuthMessageDataMap[authType].message
+
+        switch (credentialState.amazonQ) {
+            case 'disconnected':
+                authType = 'full-auth'
+                message = AuthMessageDataMap[authType].message
+                break
+            case 'unsupported':
+                authType = 'use-supported-auth'
+                message = AuthMessageDataMap[authType].message
+                break
+            case 'expired':
+                authType = 're-auth'
+                message = AuthMessageDataMap[authType].message
+                break
+        }
+
+        this.dispatcher.sendAuthNeededExceptionMessage(new AuthNeededException(message, authType, tabID))
+    }
+
+    public sendAuthenticationUpdate(scanEnabled: boolean, authenticatingTabIDs: string[]) {
+        this.dispatcher.sendAuthenticationUpdate(new AuthenticationUpdateMessage(scanEnabled, authenticatingTabIDs))
+    }
+
+    public sendScanInProgress(params: {
+        message?: string
+        type: ChatItemType
+        tabID: string
+        messageID?: string
+        canBeVoted?: boolean
+    }) {
+        this.dispatcher.sendChatMessage(
+            new ChatMessage(
+                {
+                    message: params.message,
+                    messageType: params.type,
+                    messageId: ScanNamedMessages.SCAN_SUBMISSION_STATUS_MESSAGE,
+                    canBeVoted: params.canBeVoted,
+                },
+                params.tabID
+            )
+        )
+    }
+
+    public sendErrorMessage(errorMessage: string, tabID: string) {
+        this.dispatcher.sendErrorMessage(
+            new ErrorMessage(CodeWhispererConstants.genericErrorMessage, errorMessage, tabID)
+        )
+    }
+
+    public sendScanResults(
+        tabID: string,
+        scope: CodeWhispererConstants.CodeAnalysisScope,
+        fileName?: string,
+        canBeVoted?: boolean
+    ) {
+        this.dispatcher.sendChatMessage(
+            new ChatMessage(
+                {
+                    message: scanProgressMessage(
+                        SecurityScanStep.PROCESS_SCAN_RESULTS + 1,
+                        scope,
+                        fileName ? path.basename(fileName) : undefined
+                    ),
+                    messageType: 'answer-part',
+                    messageId: ScanNamedMessages.SCAN_SUBMISSION_STATUS_MESSAGE,
+                    canBeVoted: canBeVoted,
+                },
+                tabID
+            )
+        )
+    }
+
+    public sendErrorResponse(error: UnrecoverableErrorType | SecurityScanError, tabID: string) {
+        let message = DefaultCodeScanErrorMessage
+        const buttons: ChatItemButton[] = []
+        if (typeof error === 'string') {
+            switch (error) {
+                case 'no-project-found': {
+                    // TODO: If required we can add "Open the Projects" button in the chat panel.
+                    message = CodeWhispererConstants.noOpenProjectsFound
+                    break
+                }
+                case 'no-open-file-found': {
+                    message = CodeWhispererConstants.noOpenFileFound
+                    break
+                }
+                case 'invalid-file-type': {
+                    message = CodeWhispererConstants.invalidFileTypeChatMessage
+                    break
+                }
+            }
+        } else if (error.code === 'NoActiveFileError') {
+            message = CodeWhispererConstants.noOpenFileFound
+        } else if (error.code === 'ContentLengthError') {
+            message = CodeWhispererConstants.ProjectSizeExceededErrorMessage
+        } else if (error.code === 'NoSourceFilesError') {
+            message = CodeWhispererConstants.noSourceFilesErrorMessage
+        } else {
+            message = error.customerFacingMessage
+        }
+        this.dispatcher.sendChatMessage(
+            new ChatMessage(
+                {
+                    message,
+                    messageType: 'answer',
+                    buttons,
+                },
+                tabID
+            )
+        )
+    }
+
+    public sendScans(tabID: string, message: string) {
+        const followUps: ChatItemAction[] = []
+        followUps.push({
+            pillText: i18n('AWS.amazonq.scans.projectScan'),
+            status: 'info',
+            icon: 'folder' as MynahIcons,
+            type: ScanAction.RUN_PROJECT_SCAN,
+        })
+        followUps.push({
+            pillText: i18n('AWS.amazonq.scans.fileScan'),
+            status: 'info',
+            icon: 'file' as MynahIcons,
+            type: ScanAction.RUN_FILE_SCAN,
+        })
+        this.dispatcher.sendChatMessage(
+            new ChatMessage(
+                {
+                    message,
+                    messageType: 'ai-prompt',
+                    followUps,
+                },
+                tabID
+            )
+        )
+    }
+
+    // This function shows selected scan type in the chat panel as a user input
+    public sendPromptMessage(params: { tabID: string; message: string }) {
+        this.dispatcher.sendPromptMessage(new ChatPrompt(params.message, params.tabID))
+    }
+
+    public sendCapabilityCard(params: { tabID: string }) {
+        this.dispatcher.sendChatMessage(new CapabilityCardMessage(params.tabID))
+    }
+}
diff --git a/packages/amazonq/src/app/amazonqScan/chat/controller/messenger/messengerUtils.ts b/packages/amazonq/src/app/amazonqScan/chat/controller/messenger/messengerUtils.ts
new file mode 100644
index 00000000000..455a4ebf4af
--- /dev/null
+++ b/packages/amazonq/src/app/amazonqScan/chat/controller/messenger/messengerUtils.ts
@@ -0,0 +1,19 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+// TODO: Refactor the common functionality between Transform, FeatureDev, CWSPRChat, Scan and UTG to a new Folder.
+
+export default class MessengerUtils {
+    static stringToEnumValue = <T extends { [key: string]: string }, K extends keyof T & string>(
+        enumObject: T,
+        value: `${T[K]}`
+    ): T[K] => {
+        if (Object.values(enumObject).includes(value)) {
+            return value as unknown as T[K]
+        } else {
+            throw new Error('Value provided was not found in Enum')
+        }
+    }
+}
diff --git a/packages/amazonq/src/app/amazonqScan/chat/session/session.ts b/packages/amazonq/src/app/amazonqScan/chat/session/session.ts
new file mode 100644
index 00000000000..1ca7e8d7362
--- /dev/null
+++ b/packages/amazonq/src/app/amazonqScan/chat/session/session.ts
@@ -0,0 +1,25 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export enum ConversationState {
+    IDLE,
+    JOB_SUBMITTED,
+}
+
+export class Session {
+    // Used to keep track of whether or not the current session is currently authenticating/needs authenticating
+    public isAuthenticating: boolean = false
+
+    // A tab may or may not be currently open
+    public tabID: string | undefined
+
+    public conversationState: ConversationState = ConversationState.IDLE
+
+    constructor() {}
+
+    public isTabOpen(): boolean {
+        return this.tabID !== undefined
+    }
+}
diff --git a/packages/amazonq/src/app/amazonqScan/chat/storages/chatSession.ts b/packages/amazonq/src/app/amazonqScan/chat/storages/chatSession.ts
new file mode 100644
index 00000000000..b7df6eb0cc6
--- /dev/null
+++ b/packages/amazonq/src/app/amazonqScan/chat/storages/chatSession.ts
@@ -0,0 +1,54 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+import { Session } from '../session/session'
+
+export class SessionNotFoundError extends Error {}
+
+export class ChatSessionManager {
+    private static _instance: ChatSessionManager
+    private activeSession: Session | undefined
+
+    constructor() {}
+
+    public static get Instance() {
+        return this._instance || (this._instance = new this())
+    }
+
+    private createSession(): Session {
+        this.activeSession = new Session()
+        return this.activeSession
+    }
+
+    public getSession(): Session {
+        if (this.activeSession === undefined) {
+            return this.createSession()
+        }
+
+        return this.activeSession
+    }
+
+    public setActiveTab(tabID: string): string {
+        if (this.activeSession !== undefined) {
+            if (!this.activeSession.isTabOpen()) {
+                this.activeSession.tabID = tabID
+                return tabID
+            }
+            return this.activeSession.tabID!
+        }
+
+        throw new SessionNotFoundError()
+    }
+
+    public removeActiveTab(): void {
+        if (this.activeSession !== undefined) {
+            if (this.activeSession.isTabOpen()) {
+                this.activeSession.tabID = undefined
+                return
+            }
+        }
+    }
+}
diff --git a/packages/amazonq/src/app/amazonqScan/chat/views/actions/uiMessageListener.ts b/packages/amazonq/src/app/amazonqScan/chat/views/actions/uiMessageListener.ts
new file mode 100644
index 00000000000..efa577313ab
--- /dev/null
+++ b/packages/amazonq/src/app/amazonqScan/chat/views/actions/uiMessageListener.ts
@@ -0,0 +1,126 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { MessageListener, ExtensionMessage } from 'aws-core-vscode/amazonq'
+import { ScanChatControllerEventEmitters } from 'aws-core-vscode/amazonqScan'
+
+type UIMessage = ExtensionMessage & {
+    tabID?: string
+}
+
+export interface UIMessageListenerProps {
+    readonly chatControllerEventEmitters: ScanChatControllerEventEmitters
+    readonly webViewMessageListener: MessageListener<any>
+}
+
+export class UIMessageListener {
+    private scanControllerEventsEmitters: ScanChatControllerEventEmitters | undefined
+    private webViewMessageListener: MessageListener<any>
+
+    constructor(props: UIMessageListenerProps) {
+        this.scanControllerEventsEmitters = props.chatControllerEventEmitters
+        this.webViewMessageListener = props.webViewMessageListener
+
+        // Now we are listening to events that get sent from amazonq/webview/actions/actionListener (e.g. the tab)
+        this.webViewMessageListener.onMessage((msg) => {
+            this.handleMessage(msg)
+        })
+    }
+
+    private handleMessage(msg: ExtensionMessage) {
+        switch (msg.command) {
+            case 'new-tab-was-created':
+                this.tabOpened(msg)
+                break
+            case 'tab-was-removed':
+                this.tabClosed(msg)
+                break
+            case 'auth-follow-up-was-clicked':
+                this.authClicked(msg)
+                break
+            case 'review':
+                this.scan(msg)
+                break
+            case 'form-action-click':
+                this.formActionClicked(msg)
+                break
+            case 'follow-up-was-clicked':
+                this.followUpClicked(msg)
+                break
+            case 'response-body-link-click':
+                this.processResponseBodyLinkClick(msg)
+                break
+            case 'file-click':
+                this.processFileClick(msg)
+                break
+            case 'chat-item-voted':
+                this.chatItemVoted(msg)
+                break
+        }
+    }
+
+    private scan(msg: UIMessage) {
+        this.scanControllerEventsEmitters?.runScan.fire({
+            tabID: msg.tabID,
+        })
+    }
+
+    private formActionClicked(msg: UIMessage) {
+        this.scanControllerEventsEmitters?.formActionClicked.fire({
+            ...msg,
+        })
+    }
+
+    private tabOpened(msg: UIMessage) {
+        this.scanControllerEventsEmitters?.tabOpened.fire({
+            tabID: msg.tabID,
+        })
+    }
+
+    private tabClosed(msg: UIMessage) {
+        this.scanControllerEventsEmitters?.tabClosed.fire({
+            tabID: msg.tabID,
+        })
+    }
+
+    private authClicked(msg: UIMessage) {
+        this.scanControllerEventsEmitters?.authClicked.fire({
+            tabID: msg.tabID,
+            authType: msg.authType,
+        })
+    }
+
+    private followUpClicked(msg: UIMessage) {
+        this.scanControllerEventsEmitters?.followUpClicked.fire({
+            followUp: msg.followUp,
+            tabID: msg.tabID,
+        })
+    }
+
+    private processResponseBodyLinkClick(msg: UIMessage) {
+        this.scanControllerEventsEmitters?.processResponseBodyLinkClick.fire({
+            command: msg.command,
+            messageId: msg.messageId,
+            tabID: msg.tabID,
+            link: msg.link,
+        })
+    }
+
+    private processFileClick(msg: UIMessage) {
+        this.scanControllerEventsEmitters?.fileClicked.fire({
+            tabID: msg.tabID,
+            messageId: msg.messageId,
+            filePath: msg.filePath,
+        })
+    }
+
+    private chatItemVoted(msg: any) {
+        this.scanControllerEventsEmitters?.processChatItemVotedMessage.fire({
+            tabID: msg.tabID,
+            command: msg.command,
+            vote: msg.vote,
+        })
+    }
+}
diff --git a/packages/amazonq/src/app/amazonqScan/chat/views/connector/connector.ts b/packages/amazonq/src/app/amazonqScan/chat/views/connector/connector.ts
new file mode 100644
index 00000000000..c906a401f91
--- /dev/null
+++ b/packages/amazonq/src/app/amazonqScan/chat/views/connector/connector.ts
@@ -0,0 +1,192 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { AuthFollowUpType, MessagePublisher, ChatItemType } from 'aws-core-vscode/amazonq'
+import { ScanMessageType } from 'aws-core-vscode/amazonqScan'
+import { ChatItemButton, ProgressField, ChatItemAction, ChatItemContent } from '@aws/mynah-ui/dist/static'
+import { scanChat } from '../../../models/constants'
+import { MynahIcons } from '@aws/mynah-ui'
+
+class UiMessage {
+    readonly time: number = Date.now()
+    readonly sender: string = scanChat
+    readonly type: ScanMessageType = 'chatMessage'
+    readonly status: string = 'info'
+
+    public constructor(protected tabID: string) {}
+}
+
+export class AuthenticationUpdateMessage {
+    readonly time: number = Date.now()
+    readonly sender: string = scanChat
+    readonly type: ScanMessageType = 'authenticationUpdateMessage'
+
+    constructor(
+        readonly scanEnabled: boolean,
+        readonly authenticatingTabIDs: string[]
+    ) {}
+}
+
+export class AuthNeededException extends UiMessage {
+    override type: ScanMessageType = 'authNeededException'
+
+    constructor(
+        readonly message: string,
+        readonly authType: AuthFollowUpType,
+        tabID: string
+    ) {
+        super(tabID)
+    }
+}
+
+export interface ChatMessageProps {
+    readonly message: string | undefined
+    readonly messageId?: string | undefined
+    readonly messageType: ChatItemType
+    readonly canBeVoted?: boolean
+    readonly buttons?: ChatItemButton[]
+    readonly followUps?: ChatItemAction[] | undefined
+    readonly informationCard?: ChatItemContent['informationCard']
+    readonly fileList?: ChatItemContent['fileList']
+}
+
+export class ChatMessage extends UiMessage {
+    readonly message: string | undefined
+    readonly messageId?: string | undefined
+    readonly messageType: ChatItemType
+    readonly canBeVoted?: boolean
+    readonly buttons: ChatItemButton[]
+    readonly followUps: ChatItemAction[] | undefined
+    readonly informationCard: ChatItemContent['informationCard']
+    readonly fileList: ChatItemContent['fileList']
+    override type: ScanMessageType = 'chatMessage'
+
+    constructor(props: ChatMessageProps, tabID: string) {
+        super(tabID)
+        this.message = props.message
+        this.messageType = props.messageType
+        this.buttons = props.buttons || []
+        this.messageId = props.messageId || undefined
+        this.followUps = props.followUps
+        this.informationCard = props.informationCard || undefined
+        this.fileList = props.fileList
+        this.canBeVoted = props.canBeVoted || undefined
+    }
+}
+
+export class CapabilityCardMessage extends ChatMessage {
+    constructor(tabID: string) {
+        super(
+            {
+                message: '',
+                messageType: 'answer',
+                informationCard: {
+                    title: '/review',
+                    description: 'Included in your Q Developer subscription',
+                    content: {
+                        body: `I can review your workspace for vulnerabilities and issues.
+
+After you begin a review, I will: 
+1. Review all relevant code in your workspace or your current file
+2. Provide a list of issues for your review
+
+You can then investigate, fix, or ignore issues.
+
+To learn more, check out our [User Guide](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/security-scans.html).`,
+                    },
+                    icon: 'bug' as MynahIcons,
+                },
+            },
+            tabID
+        )
+    }
+}
+
+export class ChatInputEnabledMessage extends UiMessage {
+    override type: ScanMessageType = 'chatInputEnabledMessage'
+
+    constructor(
+        tabID: string,
+        readonly enabled: boolean
+    ) {
+        super(tabID)
+    }
+}
+
+export class UpdatePlaceholderMessage extends UiMessage {
+    readonly newPlaceholder: string
+    override type: ScanMessageType = 'updatePlaceholderMessage'
+
+    constructor(tabID: string, newPlaceholder: string) {
+        super(tabID)
+        this.newPlaceholder = newPlaceholder
+    }
+}
+
+export class UpdatePromptProgressMessage extends UiMessage {
+    readonly progressField: ProgressField | null
+    override type: ScanMessageType = 'updatePromptProgress'
+    constructor(tabID: string, progressField: ProgressField | null) {
+        super(tabID)
+        this.progressField = progressField
+    }
+}
+
+export class ErrorMessage extends UiMessage {
+    override type: ScanMessageType = 'errorMessage'
+    constructor(
+        readonly title: string,
+        readonly message: string,
+        tabID: string
+    ) {
+        super(tabID)
+    }
+}
+
+export class ChatPrompt extends UiMessage {
+    readonly message: string | undefined
+    readonly messageType = 'system-prompt'
+    override type: ScanMessageType = 'chatPrompt'
+    constructor(message: string | undefined, tabID: string) {
+        super(tabID)
+        this.message = message
+    }
+}
+
+export class AppToWebViewMessageDispatcher {
+    constructor(private readonly appsToWebViewMessagePublisher: MessagePublisher<any>) {}
+
+    public sendChatMessage(message: ChatMessage) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendUpdatePlaceholder(message: UpdatePlaceholderMessage) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendUpdatePromptProgress(message: UpdatePromptProgressMessage) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendAuthenticationUpdate(message: AuthenticationUpdateMessage) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendAuthNeededExceptionMessage(message: AuthNeededException) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendChatInputEnabled(message: ChatInputEnabledMessage) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendErrorMessage(message: ErrorMessage) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendPromptMessage(message: ChatPrompt) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+}
diff --git a/packages/amazonq/src/app/amazonqScan/index.ts b/packages/amazonq/src/app/amazonqScan/index.ts
new file mode 100644
index 00000000000..c195193740b
--- /dev/null
+++ b/packages/amazonq/src/app/amazonqScan/index.ts
@@ -0,0 +1,7 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export { default as MessengerUtils } from './chat/controller/messenger/messengerUtils'
+export { init as scanChatAppInit } from './app'
diff --git a/packages/amazonq/src/app/amazonqScan/models/constants.ts b/packages/amazonq/src/app/amazonqScan/models/constants.ts
new file mode 100644
index 00000000000..4180b130b78
--- /dev/null
+++ b/packages/amazonq/src/app/amazonqScan/models/constants.ts
@@ -0,0 +1,101 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { ProgressField, MynahIcons, ChatItemButton } from '@aws/mynah-ui'
+import { AggregatedCodeScanIssue, CodeAnalysisScope, SecurityScanStep, severities } from 'aws-core-vscode/codewhisperer'
+import { i18n } from 'aws-core-vscode/shared'
+
+// For uniquely identifiying which chat messages should be routed to Scan
+export const scanChat = 'scanChat'
+
+export enum ScanAction {
+    RUN_PROJECT_SCAN = 'runProjectScan',
+    RUN_FILE_SCAN = 'runFileScan',
+    STOP_PROJECT_SCAN = 'stopProjectScan',
+    STOP_FILE_SCAN = 'stopFileScan',
+}
+
+export const cancelFileScanButton: ChatItemButton = {
+    id: ScanAction.STOP_FILE_SCAN,
+    text: i18n('AWS.generic.cancel'),
+    icon: 'cancel' as MynahIcons,
+}
+
+export const cancelProjectScanButton: ChatItemButton = {
+    ...cancelFileScanButton,
+    id: ScanAction.STOP_PROJECT_SCAN,
+}
+
+export const fileScanProgressField: ProgressField = {
+    status: 'default',
+    text: i18n('AWS.amazonq.scans.fileScanInProgress'),
+    value: -1,
+    actions: [cancelFileScanButton],
+}
+
+export const projectScanProgressField: ProgressField = {
+    ...fileScanProgressField,
+    text: i18n('AWS.amazonq.scans.projectScanInProgress'),
+    actions: [cancelProjectScanButton],
+}
+
+export const cancellingProgressField: ProgressField = {
+    status: 'warning',
+    text: i18n('AWS.generic.cancelling'),
+    value: -1,
+    actions: [],
+}
+
+const checkIcons = {
+    wait: '&#9744;',
+    current: '&#9744;',
+    done: '&#9745;',
+}
+export const scanProgressMessage = (
+    currentStep: SecurityScanStep,
+    scope: CodeAnalysisScope,
+    fileName?: string
+) => `Okay, I'm reviewing ${scope === CodeAnalysisScope.PROJECT ? 'your project' : fileName ? `\`${fileName}\`` : 'your file'} for code issues.
+
+This may take a few minutes. I'll share my progress here.
+
+${getIconForStep(SecurityScanStep.CREATE_SCAN_JOB, currentStep)} Initiating code review
+
+${getIconForStep(SecurityScanStep.POLL_SCAN_STATUS, currentStep)} Reviewing your code 
+
+${getIconForStep(SecurityScanStep.PROCESS_SCAN_RESULTS, currentStep)} Processing review results 
+`
+
+export const scanSummaryMessage = (
+    scope: CodeAnalysisScope,
+    securityRecommendationCollection: AggregatedCodeScanIssue[]
+) => {
+    const severityCounts = securityRecommendationCollection.reduce(
+        (accumulator, current) => ({
+            ...Object.fromEntries(
+                severities.map((severity) => [
+                    severity,
+                    accumulator[severity] +
+                        current.issues.filter((issue) => issue.severity === severity && issue.visible).length,
+                ])
+            ),
+        }),
+        Object.fromEntries(severities.map((severity) => [severity, 0]))
+    )
+    return `I completed the code review. I found the following issues in your ${scope === CodeAnalysisScope.PROJECT ? 'workspace' : 'file'}:
+${Object.entries(severityCounts)
+    .map(([severity, count]) => `- ${severity}: \`${count} ${count === 1 ? 'issue' : 'issues'}\``)
+    .join('\n')}
+`
+}
+
+const getIconForStep = (targetStep: number, currentStep: number) => {
+    return currentStep === targetStep
+        ? checkIcons.current
+        : currentStep > targetStep
+          ? checkIcons.done
+          : checkIcons.wait
+}
+
+export const codeReviewInChat = true
diff --git a/packages/amazonq/src/app/chat/activation.ts b/packages/amazonq/src/app/chat/activation.ts
new file mode 100644
index 00000000000..7517d668497
--- /dev/null
+++ b/packages/amazonq/src/app/chat/activation.ts
@@ -0,0 +1,74 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { ExtensionContext } from 'vscode'
+import { telemetry } from 'aws-core-vscode/telemetry'
+import { AuthUtil } from 'aws-core-vscode/codewhisperer'
+import { Commands, getLogger, placeholder } from 'aws-core-vscode/shared'
+import * as amazonq from 'aws-core-vscode/amazonq'
+
+export async function activate(context: ExtensionContext) {
+    const appInitContext = amazonq.DefaultAmazonQAppInitContext.instance
+    await amazonq.TryChatCodeLensProvider.register(appInitContext.onDidChangeAmazonQVisibility.event)
+
+    context.subscriptions.push(
+        amazonq.focusAmazonQChatWalkthrough.register(),
+        amazonq.walkthroughInlineSuggestionsExample.register(),
+        amazonq.openAmazonQWalkthrough.register(),
+        amazonq.listCodeWhispererCommandsWalkthrough.register(),
+        amazonq.focusAmazonQPanel.register(),
+        amazonq.focusAmazonQPanelKeybinding.register(),
+        amazonq.tryChatCodeLensCommand.register()
+    )
+
+    Commands.register('aws.amazonq.learnMore', () => {
+        void vscode.env.openExternal(vscode.Uri.parse(amazonq.amazonQHelpUrl))
+    })
+
+    void setupAuthNotification()
+}
+
+/**
+ * Display a notification to user for Log In.
+ *
+ * Authentication Notification is displayed when:
+ * - User is not authenticated
+ * - Once every session
+ *
+ */
+async function setupAuthNotification() {
+    let notificationDisplayed = false // Auth Notification should be displayed only once.
+    await tryShowNotification()
+
+    async function tryShowNotification() {
+        // Do not show the notification if the IDE starts and user is already authenticated.
+        if (AuthUtil.instance.isConnected()) {
+            notificationDisplayed = true
+        }
+
+        if (notificationDisplayed) {
+            return
+        }
+
+        const source = 'authNotification'
+        const buttonAction = 'Sign In'
+        notificationDisplayed = true
+
+        telemetry.toolkit_showNotification.emit({
+            component: 'editor',
+            id: source,
+            reason: 'notLoggedIn',
+            result: 'Succeeded',
+        })
+        const selection = await vscode.window.showWarningMessage('Start using Amazon Q', buttonAction)
+
+        if (selection === buttonAction) {
+            amazonq.focusAmazonQPanel.execute(placeholder, source).catch((e) => {
+                getLogger().error('focusAmazonQPanel failed: %s', e)
+            })
+        }
+    }
+}
diff --git a/packages/amazonq/src/app/chat/node/activateAgents.ts b/packages/amazonq/src/app/chat/node/activateAgents.ts
new file mode 100644
index 00000000000..cd0309d7f2d
--- /dev/null
+++ b/packages/amazonq/src/app/chat/node/activateAgents.ts
@@ -0,0 +1,16 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as amazonqNode from 'aws-core-vscode/amazonq/node'
+import { scanChatAppInit } from '../../amazonqScan'
+import { DefaultAmazonQAppInitContext } from 'aws-core-vscode/amazonq'
+
+export function activateAgents() {
+    const appInitContext = DefaultAmazonQAppInitContext.instance
+
+    amazonqNode.cwChatAppInit(appInitContext)
+    amazonqNode.gumbyChatAppInit(appInitContext)
+    scanChatAppInit(appInitContext)
+}
diff --git a/packages/amazonq/src/app/inline/EditRendering/diffUtils.ts b/packages/amazonq/src/app/inline/EditRendering/diffUtils.ts
new file mode 100644
index 00000000000..7f9ca54b6aa
--- /dev/null
+++ b/packages/amazonq/src/app/inline/EditRendering/diffUtils.ts
@@ -0,0 +1,93 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+// TODO: deprecate this file in favor of core/shared/utils/diffUtils
+import { applyPatch } from 'diff'
+
+export type LineDiff =
+    | { type: 'added'; content: string }
+    | { type: 'removed'; content: string }
+    | { type: 'modified'; before: string; after: string }
+
+/**
+ * Apply a unified diff to original code to generate modified code
+ * @param originalCode The original code as a string
+ * @param unifiedDiff The unified diff content
+ * @returns The modified code after applying the diff
+ */
+export function applyUnifiedDiff(docText: string, unifiedDiff: string): string {
+    try {
+        // First try the standard diff package
+        try {
+            const result = applyPatch(docText, unifiedDiff)
+            if (result !== false) {
+                return result
+            }
+        } catch (error) {}
+
+        // Parse the unified diff to extract the changes
+        const diffLines = unifiedDiff.split('\n')
+        let result = docText
+
+        // Find all hunks in the diff
+        const hunkStarts = diffLines
+            .map((line, index) => (line.startsWith('@@ ') ? index : -1))
+            .filter((index) => index !== -1)
+
+        // Process each hunk
+        for (const hunkStart of hunkStarts) {
+            // Parse the hunk header
+            const hunkHeader = diffLines[hunkStart]
+            const match = hunkHeader.match(/@@ -(\d+),(\d+) \+(\d+),(\d+) @@/)
+
+            if (!match) {
+                continue
+            }
+
+            const oldStart = parseInt(match[1])
+            const oldLines = parseInt(match[2])
+
+            // Extract the content lines for this hunk
+            let i = hunkStart + 1
+            const contentLines = []
+            while (i < diffLines.length && !diffLines[i].startsWith('@@')) {
+                contentLines.push(diffLines[i])
+                i++
+            }
+
+            // Build the old and new text
+            let oldText = ''
+            let newText = ''
+
+            for (const line of contentLines) {
+                if (line.startsWith('-')) {
+                    oldText += line.substring(1) + '\n'
+                } else if (line.startsWith('+')) {
+                    newText += line.substring(1) + '\n'
+                } else if (line.startsWith(' ')) {
+                    oldText += line.substring(1) + '\n'
+                    newText += line.substring(1) + '\n'
+                }
+            }
+
+            // Remove trailing newline if it was added
+            oldText = oldText.replace(/\n$/, '')
+            newText = newText.replace(/\n$/, '')
+
+            // Find the text to replace in the document
+            const docLines = docText.split('\n')
+            const startLine = oldStart - 1 // Convert to 0-based
+            const endLine = startLine + oldLines
+
+            // Extract the text that should be replaced
+            const textToReplace = docLines.slice(startLine, endLine).join('\n')
+
+            // Replace the text
+            result = result.replace(textToReplace, newText)
+        }
+        return result
+    } catch (error) {
+        return docText // Return original text if all methods fail
+    }
+}
diff --git a/packages/amazonq/src/app/inline/EditRendering/displayImage.ts b/packages/amazonq/src/app/inline/EditRendering/displayImage.ts
new file mode 100644
index 00000000000..035621f0ba4
--- /dev/null
+++ b/packages/amazonq/src/app/inline/EditRendering/displayImage.ts
@@ -0,0 +1,507 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { getContext, getLogger, setContext } from 'aws-core-vscode/shared'
+import * as vscode from 'vscode'
+import { applyPatch, diffLines } from 'diff'
+import { BaseLanguageClient } from 'vscode-languageclient'
+import { CodeWhispererSession } from '../sessionManager'
+import { LogInlineCompletionSessionResultsParams } from '@aws/language-server-runtimes/protocol'
+import { InlineCompletionItemWithReferences } from '@aws/language-server-runtimes/protocol'
+import path from 'path'
+import { imageVerticalOffset } from './svgGenerator'
+import { EditSuggestionState } from '../editSuggestionState'
+import type { AmazonQInlineCompletionItemProvider } from '../completion'
+import { vsCodeState } from 'aws-core-vscode/codewhisperer'
+
+const autoRejectEditCursorDistance = 25
+const autoDiscardEditCursorDistance = 10
+
+export class EditDecorationManager {
+    private imageDecorationType: vscode.TextEditorDecorationType
+    private removedCodeDecorationType: vscode.TextEditorDecorationType
+    private currentImageDecoration: vscode.DecorationOptions | undefined
+    private currentRemovedCodeDecorations: vscode.DecorationOptions[] = []
+    private acceptHandler: (() => void) | undefined
+    private rejectHandler: ((isDiscard: boolean) => void) | undefined
+
+    constructor() {
+        this.registerCommandHandlers()
+        this.imageDecorationType = vscode.window.createTextEditorDecorationType({
+            isWholeLine: true,
+        })
+
+        this.removedCodeDecorationType = vscode.window.createTextEditorDecorationType({
+            backgroundColor: 'rgba(255, 0, 0, 0.2)',
+        })
+    }
+
+    private imageToDecoration(image: vscode.Uri, range: vscode.Range) {
+        return {
+            range,
+            renderOptions: {
+                after: {
+                    contentIconPath: image,
+                    verticalAlign: 'text-top',
+                    width: '100%',
+                    height: 'auto',
+                    margin: '1px 0',
+                },
+            },
+            hoverMessage: new vscode.MarkdownString('Edit suggestion. Press [Tab] to accept or [Esc] to reject.'),
+        }
+    }
+
+    /**
+     * Highlights code that will be removed using the provided highlight ranges
+     * @param editor The active text editor
+     * @param startLine The line where the edit starts
+     * @param highlightRanges Array of ranges specifying which parts to highlight
+     * @returns Array of decoration options
+     */
+    private highlightRemovedLines(
+        editor: vscode.TextEditor,
+        startLine: number,
+        highlightRanges: Array<{ line: number; start: number; end: number }>
+    ): vscode.DecorationOptions[] {
+        const decorations: vscode.DecorationOptions[] = []
+
+        // Group ranges by line for more efficient processing
+        const rangesByLine = new Map<number, Array<{ start: number; end: number }>>()
+
+        // Process each range and adjust line numbers relative to document
+        for (const range of highlightRanges) {
+            const documentLine = startLine + range.line
+
+            // Skip if line is out of bounds
+            if (documentLine >= editor.document.lineCount) {
+                continue
+            }
+
+            // Add to ranges map, grouped by line
+            if (!rangesByLine.has(documentLine)) {
+                rangesByLine.set(documentLine, [])
+            }
+            rangesByLine.get(documentLine)!.push({
+                start: range.start,
+                end: range.end,
+            })
+        }
+
+        // Process each line with ranges
+        for (const [lineNumber, ranges] of rangesByLine.entries()) {
+            const lineLength = editor.document.lineAt(lineNumber).text.length
+
+            if (ranges.length === 0) {
+                continue
+            }
+
+            // Check if we should highlight the entire line
+            if (ranges.length === 1 && ranges[0].start === 0 && ranges[0].end >= lineLength) {
+                // Highlight entire line
+                const range = new vscode.Range(
+                    new vscode.Position(lineNumber, 0),
+                    new vscode.Position(lineNumber, lineLength)
+                )
+                decorations.push({ range })
+            } else {
+                // Create individual decorations for each range on this line
+                for (const range of ranges) {
+                    const end = Math.min(range.end, lineLength)
+                    if (range.start < end) {
+                        const vsRange = new vscode.Range(
+                            new vscode.Position(lineNumber, range.start),
+                            new vscode.Position(lineNumber, end)
+                        )
+                        decorations.push({ range: vsRange })
+                    }
+                }
+            }
+        }
+
+        return decorations
+    }
+
+    /**
+     * Displays an edit suggestion as an SVG image in the editor and highlights removed code
+     */
+    public async displayEditSuggestion(
+        editor: vscode.TextEditor,
+        svgImage: vscode.Uri,
+        startLine: number,
+        onAccept: () => Promise<void>,
+        onReject: (isDiscard: boolean) => Promise<void>,
+        originalCode: string,
+        newCode: string,
+        originalCodeHighlightRanges: Array<{ line: number; start: number; end: number }>
+    ): Promise<void> {
+        // 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
+
+        // Get the line text to determine the end position
+        const lineText = editor.document.lineAt(Math.max(0, startLine - imageVerticalOffset)).text
+        const endPosition = new vscode.Position(Math.max(0, startLine - imageVerticalOffset), lineText.length)
+        const range = new vscode.Range(endPosition, endPosition)
+
+        this.currentImageDecoration = this.imageToDecoration(svgImage, range)
+
+        // Apply image decoration
+        editor.setDecorations(this.imageDecorationType, [this.currentImageDecoration])
+
+        // Highlight removed code with red background
+        this.currentRemovedCodeDecorations = this.highlightRemovedLines(editor, startLine, originalCodeHighlightRanges)
+        editor.setDecorations(this.removedCodeDecorationType, this.currentRemovedCodeDecorations)
+    }
+
+    /**
+     * Clears all edit suggestion decorations
+     */
+    public async clearDecorations(editor: vscode.TextEditor): Promise<void> {
+        editor.setDecorations(this.imageDecorationType, [])
+        editor.setDecorations(this.removedCodeDecorationType, [])
+        this.currentImageDecoration = undefined
+        this.currentRemovedCodeDecorations = []
+        this.acceptHandler = undefined
+        this.rejectHandler = undefined
+        await setContext('aws.amazonq.editSuggestionActive' as any, false)
+        EditSuggestionState.setEditSuggestionActive(false)
+    }
+
+    /**
+     * Registers command handlers for accepting/rejecting suggestions
+     */
+    public registerCommandHandlers(): void {
+        // Register Tab key handler for accepting suggestion
+        vscode.commands.registerCommand('aws.amazonq.inline.acceptEdit', () => {
+            if (this.acceptHandler) {
+                this.acceptHandler()
+            }
+        })
+
+        // Register Esc key handler for rejecting suggestion
+        vscode.commands.registerCommand('aws.amazonq.inline.rejectEdit', (isDiscard: boolean = false) => {
+            if (this.rejectHandler) {
+                this.rejectHandler(isDiscard)
+            }
+        })
+    }
+
+    /**
+     * Disposes resources
+     */
+    public dispose(): void {
+        this.imageDecorationType.dispose()
+        this.removedCodeDecorationType.dispose()
+    }
+
+    // Use process-wide singleton to prevent multiple instances on Windows
+    static readonly decorationManagerKey = Symbol.for('aws.amazonq.decorationManager')
+
+    static getDecorationManager(): EditDecorationManager {
+        const globalObj = global as any
+        if (!globalObj[this.decorationManagerKey]) {
+            globalObj[this.decorationManagerKey] = new EditDecorationManager()
+        }
+        return globalObj[this.decorationManagerKey]
+    }
+}
+
+export const decorationManager = EditDecorationManager.getDecorationManager()
+
+/**
+ * Function to replace editor's content with new code
+ */
+async function replaceEditorContent(editor: vscode.TextEditor, newCode: string): Promise<void> {
+    const document = editor.document
+    const fullRange = new vscode.Range(
+        0,
+        0,
+        document.lineCount - 1,
+        document.lineAt(document.lineCount - 1).text.length
+    )
+
+    await editor.edit((editBuilder) => {
+        editBuilder.replace(fullRange, newCode)
+    })
+}
+
+/**
+ * Calculates the end position of the actual edited content by finding the last changed part
+ */
+function getEndOfEditPosition(originalCode: string, newCode: string): vscode.Position {
+    const changes = diffLines(originalCode, newCode)
+    let lineOffset = 0
+
+    // Track the end position of the last added chunk
+    let lastChangeEndLine = 0
+    let lastChangeEndColumn = 0
+    let foundAddedContent = false
+
+    for (const part of changes) {
+        if (part.added) {
+            foundAddedContent = true
+
+            // Calculate lines in this added part
+            const lines = part.value.split('\n')
+            const linesCount = lines.length
+
+            // Update position to the end of this added chunk
+            lastChangeEndLine = lineOffset + linesCount - 1
+
+            // Get the length of the last line in this added chunk
+            lastChangeEndColumn = lines[linesCount - 1].length
+        }
+
+        // Update line offset (skip removed parts)
+        if (!part.removed) {
+            const partLineCount = part.value.split('\n').length
+            lineOffset += partLineCount - 1
+        }
+    }
+
+    // If we found added content, return position at the end of the last addition
+    if (foundAddedContent) {
+        return new vscode.Position(lastChangeEndLine, lastChangeEndColumn)
+    }
+
+    // Fallback to current cursor position if no changes were found
+    const editor = vscode.window.activeTextEditor
+    return editor ? editor.selection.active : new vscode.Position(0, 0)
+}
+
+/**
+ * Helper function to create discard telemetry params
+ */
+function createDiscardTelemetryParams(
+    session: CodeWhispererSession,
+    item: InlineCompletionItemWithReferences
+): LogInlineCompletionSessionResultsParams {
+    return {
+        sessionId: session.sessionId,
+        completionSessionResult: {
+            [item.itemId]: {
+                seen: false,
+                accepted: false,
+                discarded: true,
+            },
+        },
+        totalSessionDisplayTime: Date.now() - session.requestStartTime,
+        firstCompletionDisplayLatency: session.firstCompletionDisplayLatency,
+        isInlineEdit: true,
+    }
+}
+
+/**
+ * Helper function to display SVG decorations
+ */
+export async function displaySvgDecoration(
+    editor: vscode.TextEditor,
+    svgImage: vscode.Uri,
+    startLine: number,
+    newCode: string,
+    originalCodeHighlightRanges: Array<{ line: number; start: number; end: number }>,
+    session: CodeWhispererSession,
+    languageClient: BaseLanguageClient,
+    item: InlineCompletionItemWithReferences,
+    inlineCompletionProvider?: AmazonQInlineCompletionItemProvider
+) {
+    function logSuggestionFailure(type: 'DISCARD' | 'REJECT', reason: string, suggestionContent: string) {
+        getLogger('nextEditPrediction').debug(
+            `Auto ${type} edit suggestion with reason=${reason}, suggetion: ${suggestionContent}`
+        )
+    }
+    // Check if edit is too far from current cursor position
+    const currentCursorLine = editor.selection.active.line
+    if (Math.abs(startLine - currentCursorLine) >= autoDiscardEditCursorDistance) {
+        // Emit DISCARD telemetry for edit suggestion that can't be shown because the suggestion is too far away
+        const params = createDiscardTelemetryParams(session, item)
+        void languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
+        logSuggestionFailure('DISCARD', 'cursor is too far away', item.insertText as string)
+        return
+    }
+
+    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)
+        void languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
+        logSuggestionFailure('DISCARD', 'Conflicting active inline completion', item.insertText as string)
+        return
+    }
+
+    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
+        void languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
+        logSuggestionFailure('DISCARD', 'Invalid patch', item.insertText as string)
+        return
+    }
+    const documentChangeListener = vscode.workspace.onDidChangeTextDocument((e) => {
+        if (e.contentChanges.length <= 0) {
+            return
+        }
+        if (e.document !== editor.document) {
+            return
+        }
+        if (vsCodeState.isCodeWhispererEditing) {
+            return
+        }
+        if (getContext('aws.amazonq.editSuggestionActive') === false) {
+            return
+        }
+
+        const isPatchValid = applyPatch(e.document.getText(), item.insertText as string)
+        if (!isPatchValid) {
+            logSuggestionFailure('REJECT', 'Invalid patch due to document change', item.insertText as string)
+            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) {
+            logSuggestionFailure(
+                'REJECT',
+                `cursor position move too far away off ${autoRejectEditCursorDistance} lines`,
+                item.insertText as string
+            )
+            void vscode.commands.executeCommand('aws.amazonq.inline.rejectEdit')
+        }
+    })
+    await decorationManager.displayEditSuggestion(
+        editor,
+        svgImage,
+        startLine,
+        async () => {
+            // Handle accept
+            getLogger().info('Edit suggestion accepted')
+
+            // Replace content
+            try {
+                vsCodeState.isCodeWhispererEditing = true
+                await replaceEditorContent(editor, newCode)
+            } finally {
+                vsCodeState.isCodeWhispererEditing = false
+            }
+
+            // Move cursor to end of the actual changed content
+            const endPosition = getEndOfEditPosition(originalCode, newCode)
+            editor.selection = new vscode.Selection(endPosition, endPosition)
+
+            await decorationManager.clearDecorations(editor)
+            documentChangeListener.dispose()
+            cursorChangeListener.dispose()
+            const params: LogInlineCompletionSessionResultsParams = {
+                sessionId: session.sessionId,
+                completionSessionResult: {
+                    [item.itemId]: {
+                        seen: true,
+                        accepted: true,
+                        discarded: false,
+                    },
+                },
+                totalSessionDisplayTime: Date.now() - session.requestStartTime,
+                firstCompletionDisplayLatency: session.firstCompletionDisplayLatency,
+                isInlineEdit: true,
+            }
+            void languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
+            session.triggerOnAcceptance = true
+        },
+        async (isDiscard: boolean) => {
+            // Handle reject
+            if (isDiscard) {
+                getLogger().info('Edit suggestion discarded')
+            } else {
+                getLogger().info('Edit suggestion rejected')
+            }
+            await decorationManager.clearDecorations(editor)
+            documentChangeListener.dispose()
+            cursorChangeListener.dispose()
+            const suggestionState = isDiscard
+                ? {
+                      seen: false,
+                      accepted: false,
+                      discarded: true,
+                  }
+                : {
+                      seen: true,
+                      accepted: false,
+                      discarded: false,
+                  }
+            const params: LogInlineCompletionSessionResultsParams = {
+                sessionId: session.sessionId,
+                completionSessionResult: {
+                    [item.itemId]: suggestionState,
+                },
+                totalSessionDisplayTime: Date.now() - session.requestStartTime,
+                firstCompletionDisplayLatency: session.firstCompletionDisplayLatency,
+                isInlineEdit: true,
+            }
+            void languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
+        },
+        originalCode,
+        newCode,
+        originalCodeHighlightRanges
+    )
+}
+
+export function deactivate() {
+    decorationManager.dispose()
+}
+
+let decorationType: vscode.TextEditorDecorationType | undefined
+
+export function decorateLinesWithGutterIcon(lineNumbers: number[]) {
+    const editor = vscode.window.activeTextEditor
+    if (!editor) {
+        return
+    }
+
+    // Dispose previous decoration if it exists
+    if (decorationType) {
+        decorationType.dispose()
+    }
+
+    // Create a new gutter decoration with a small green dot
+    decorationType = vscode.window.createTextEditorDecorationType({
+        gutterIconPath: vscode.Uri.file(
+            path.join(__dirname, 'media', 'green-dot.svg') // put your svg file in a `media` folder
+        ),
+        gutterIconSize: 'contain',
+    })
+
+    const decorations: vscode.DecorationOptions[] = lineNumbers.map((line) => ({
+        range: new vscode.Range(new vscode.Position(line, 0), new vscode.Position(line, 0)),
+    }))
+
+    editor.setDecorations(decorationType, decorations)
+}
diff --git a/packages/amazonq/src/app/inline/EditRendering/imageRenderer.ts b/packages/amazonq/src/app/inline/EditRendering/imageRenderer.ts
new file mode 100644
index 00000000000..497239a6c96
--- /dev/null
+++ b/packages/amazonq/src/app/inline/EditRendering/imageRenderer.ts
@@ -0,0 +1,59 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { displaySvgDecoration } from './displayImage'
+import { SvgGenerationService } from './svgGenerator'
+import { getLogger } from 'aws-core-vscode/shared'
+import { BaseLanguageClient } from 'vscode-languageclient'
+import { InlineCompletionItemWithReferences } from '@aws/language-server-runtimes/protocol'
+import { CodeWhispererSession } from '../sessionManager'
+import type { AmazonQInlineCompletionItemProvider } from '../completion'
+
+export async function showEdits(
+    item: InlineCompletionItemWithReferences,
+    editor: vscode.TextEditor | undefined,
+    session: CodeWhispererSession,
+    languageClient: BaseLanguageClient,
+    inlineCompletionProvider?: AmazonQInlineCompletionItemProvider
+) {
+    if (!editor) {
+        return
+    }
+    try {
+        const svgGenerationService = new SvgGenerationService()
+        // Generate your SVG image with the file contents
+        const currentFile = editor.document.uri.fsPath
+        const { svgImage, startLine, newCode, originalCodeHighlightRange } = await svgGenerationService.generateDiffSvg(
+            currentFile,
+            item.insertText as string
+        )
+
+        // TODO: To investigate why it fails and patch [generateDiffSvg]
+        if (newCode.length === 0) {
+            getLogger('nextEditPrediction').warn('not able to apply provided edit suggestion, skip rendering')
+            return
+        }
+
+        if (svgImage) {
+            // display the SVG image
+            await displaySvgDecoration(
+                editor,
+                svgImage,
+                startLine,
+                newCode,
+                originalCodeHighlightRange,
+                session,
+                languageClient,
+                item,
+                inlineCompletionProvider
+            )
+        } else {
+            getLogger('nextEditPrediction').error('SVG image generation returned an empty result.')
+        }
+    } catch (error) {
+        getLogger('nextEditPrediction').error(`Error generating SVG image: ${error}`)
+    }
+}
diff --git a/packages/amazonq/src/app/inline/EditRendering/stringUtils.ts b/packages/amazonq/src/app/inline/EditRendering/stringUtils.ts
new file mode 100644
index 00000000000..b8c9a52d052
--- /dev/null
+++ b/packages/amazonq/src/app/inline/EditRendering/stringUtils.ts
@@ -0,0 +1,28 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Strips common indentation from each line of code that may contain HTML tags
+ * @param lines Array of code lines (may contain HTML tags)
+ * @returns Array of code lines with common indentation removed
+ */
+export function stripCommonIndentation(lines: string[]): string[] {
+    if (lines.length === 0) {
+        return lines
+    }
+    const removeFirstTag = (line: string) => line.replace(/^<[^>]*>/, '')
+    const getLeadingWhitespace = (text: string) => text.match(/^\s*/)?.[0] || ''
+
+    // Find minimum indentation across all lines
+    const minIndentLength = Math.min(...lines.map((line) => getLeadingWhitespace(removeFirstTag(line)).length))
+
+    // Remove common indentation from each line
+    return lines.map((line) => {
+        const firstTagRemovedLine = removeFirstTag(line)
+        const leadingWhitespace = getLeadingWhitespace(firstTagRemovedLine)
+        const reducedWhitespace = leadingWhitespace.substring(minIndentLength)
+        return line.replace(leadingWhitespace, reducedWhitespace)
+    })
+}
diff --git a/packages/amazonq/src/app/inline/EditRendering/svgGenerator.ts b/packages/amazonq/src/app/inline/EditRendering/svgGenerator.ts
new file mode 100644
index 00000000000..59752a7b08a
--- /dev/null
+++ b/packages/amazonq/src/app/inline/EditRendering/svgGenerator.ts
@@ -0,0 +1,519 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { diffWordsWithSpace, diffLines } from 'diff'
+import * as vscode from 'vscode'
+import { ToolkitError, getLogger } from 'aws-core-vscode/shared'
+import { diffUtilities } from 'aws-core-vscode/shared'
+import { stripCommonIndentation } from './stringUtils'
+type Range = { line: number; start: number; end: number }
+
+const logger = getLogger('nextEditPrediction')
+export const imageVerticalOffset = 1
+export const emptyDiffSvg = {
+    svgImage: vscode.Uri.parse(''),
+    startLine: 0,
+    newCode: '',
+    originalCodeHighlightRange: [],
+}
+
+const defaultLineHighlightLength = 4
+
+export class SvgGenerationService {
+    /**
+     * Generates an SVG image representing a code diff
+     * @param originalCode The original code
+     * @param newCode The new code with editsss
+     * @param theme The editor theme information
+     * @param offSet The margin to add to the left of the image
+     */
+    public async generateDiffSvg(
+        filePath: string,
+        udiff: string
+    ): Promise<{
+        svgImage: vscode.Uri
+        startLine: number
+        newCode: string
+        originalCodeHighlightRange: Range[]
+    }> {
+        const textDoc = await vscode.workspace.openTextDocument(filePath)
+        const originalCode = textDoc.getText().replaceAll('\r\n', '\n')
+        if (originalCode === '') {
+            logger.error(`udiff format error`)
+            throw new ToolkitError('udiff format error')
+        }
+        const newCode = await diffUtilities.getPatchedCode(filePath, udiff)
+
+        const { createSVGWindow } = await import('svgdom')
+
+        const svgjs = await import('@svgdotjs/svg.js')
+        const SVG = svgjs.SVG
+        const registerWindow = svgjs.registerWindow
+
+        // Get editor theme info
+        const currentTheme = this.getEditorTheme()
+
+        // Get edit diffs with highlight
+        const { addedLines, removedLines } = this.getEditedLinesFromCode(originalCode, newCode)
+
+        const modifiedLines = diffUtilities.getModifiedLinesFromCode(addedLines, removedLines)
+        // TODO remove
+        // eslint-disable-next-line aws-toolkits/no-json-stringify-in-log
+        logger.info(`Line mapping: ${JSON.stringify(modifiedLines)}`)
+
+        // Calculate dimensions based on code content
+        const { offset, editStartLine, isPositionValid } = this.calculatePosition(
+            originalCode.split('\n'),
+            newCode.split('\n'),
+            addedLines,
+            currentTheme
+        )
+
+        // if the position for the EDITS suggestion is not valid (there is no difference between new
+        // and current code content), return EMPTY_DIFF_SVG and skip the suggestion.
+        if (!isPositionValid) {
+            return emptyDiffSvg
+        }
+
+        const highlightRanges = this.generateHighlightRanges(removedLines, addedLines, modifiedLines)
+        const diffAddedWithHighlight = this.getHighlightEdit(addedLines, highlightRanges.addedRanges)
+        const normalizedDiffLines = stripCommonIndentation(diffAddedWithHighlight)
+
+        // Create SVG window, document, and container
+        const window = createSVGWindow()
+        const document = window.document
+        registerWindow(window, document)
+        const draw = SVG(document.documentElement) as any
+
+        const { width, height } = this.calculateDimensions(addedLines, currentTheme)
+        draw.size(width + offset, height)
+
+        // Generate CSS for syntax highlighting HTML content based on theme
+        const styles = this.generateStyles(currentTheme)
+        const htmlContent = this.generateHtmlContent(normalizedDiffLines, styles, offset)
+
+        // Create foreignObject to embed HTML
+        const foreignObject = draw.foreignObject(width + offset, height)
+        foreignObject.node.innerHTML = htmlContent.trim()
+
+        const svgData = draw.svg()
+        const svgResult = `data:image/svg+xml;base64,${Buffer.from(svgData).toString('base64')}`
+
+        return {
+            svgImage: vscode.Uri.parse(svgResult),
+            startLine: editStartLine,
+            newCode: newCode,
+            originalCodeHighlightRange: highlightRanges.removedRanges,
+        }
+    }
+
+    private calculateDimensions(newLines: string[], currentTheme: editorThemeInfo): { width: number; height: number } {
+        // Calculate appropriate width and height based on diff content
+        const maxLineLength = Math.max(...newLines.map((line) => line.length))
+
+        const headerFrontSize = Math.ceil(currentTheme.fontSize * 0.66)
+
+        // Estimate width based on character count and font size
+        const width = Math.max(41 * headerFrontSize * 0.7, maxLineLength * currentTheme.fontSize * 0.7)
+
+        // Calculate height based on diff line count and line height
+        const totalLines = newLines.length + 1 // +1 for header
+        const height = totalLines * currentTheme.lingHeight + 25 // +25 for padding
+
+        return { width, height }
+    }
+
+    private generateStyles(theme: editorThemeInfo): string {
+        // Generate CSS styles based on editor theme
+        const fontSize = theme.fontSize
+        const headerFrontSize = Math.ceil(fontSize * 0.66)
+        const lineHeight = theme.lingHeight
+        const foreground = theme.foreground
+        const bordeColor = 'rgba(212, 212, 212, 0.5)'
+        const background = theme.background || '#1e1e1e'
+        const diffRemoved = theme.diffRemoved || 'rgba(255, 0, 0, 0.2)'
+        const diffAdded = 'rgba(72, 128, 72, 0.52)'
+        return `
+            .code-container {
+                font-family: ${'monospace'};
+                color: ${foreground};
+                font-size: ${fontSize}px;
+                line-height: ${lineHeight}px;
+                background-color: ${background};
+                border: 1px solid ${bordeColor};
+                border-radius: 0px;
+                padding-top: 3px;
+                padding-bottom: 5px;
+                padding-left: 10px;
+            }
+            .diff-header {
+                color: ${theme.foreground || '#d4d4d4'};
+                margin: 0;
+                font-size: ${headerFrontSize}px;
+                padding: 0px;
+            }
+            .diff-removed {
+                background-color: ${diffRemoved};
+                white-space: pre-wrap; /* Preserve whitespace */
+                text-decoration: line-through;
+                opacity: 0.7;
+            }
+            .diff-changed {
+                white-space: pre-wrap; /* Preserve whitespace */
+                background-color: ${diffAdded};
+            }
+            .diff-unchanged {
+                white-space: pre-wrap; /* Preserve indentation for unchanged lines */
+            }
+        `
+    }
+
+    private generateHtmlContent(diffLines: string[], styles: string, offSet: number): string {
+        return `
+            <div xmlns="http://www.w3.org/1999/xhtml">
+                <style>${styles}</style>
+                <div class="code-container" style="margin-left: ${offSet}px;">
+                    <div class="diff-header">Q: Press [Tab] to accept or [Esc] to reject:</div>
+                    ${diffLines.map((line) => `<div>${line}</div>`).join('')}
+                </div>
+            </div>
+        `
+    }
+
+    /**
+     * Extract added and removed lines by comparing original and new code
+     * @param originalCode The original code string
+     * @param newCode The new code string
+     * @returns Object containing arrays of added and removed lines
+     */
+    private getEditedLinesFromCode(
+        originalCode: string,
+        newCode: string
+    ): { addedLines: string[]; removedLines: string[] } {
+        const addedLines: string[] = []
+        const removedLines: string[] = []
+
+        const changes = diffLines(originalCode, newCode)
+
+        for (const change of changes) {
+            if (change.added) {
+                addedLines.push(...change.value.split('\n').filter((line) => line.length > 0))
+            } else if (change.removed) {
+                removedLines.push(...change.value.split('\n').filter((line) => line.length > 0))
+            }
+        }
+
+        return { addedLines, removedLines }
+    }
+
+    /**
+     * Applies highlighting to code lines based on the specified ranges
+     * @param newLines Array of code lines to highlight
+     * @param highlightRanges Array of ranges specifying which parts of the lines to highlight
+     * @returns Array of HTML strings with appropriate spans for highlighting
+     */
+    private getHighlightEdit(newLines: string[], highlightRanges: Range[]): string[] {
+        const result: string[] = []
+
+        // Group ranges by line for easier lookup
+        const rangesByLine = new Map<number, Range[]>()
+        for (const range of highlightRanges) {
+            if (!rangesByLine.has(range.line)) {
+                rangesByLine.set(range.line, [])
+            }
+            rangesByLine.get(range.line)!.push(range)
+        }
+
+        // Process each line of code
+        for (let lineIndex = 0; lineIndex < newLines.length; lineIndex++) {
+            const line = newLines[lineIndex]
+            // Get ranges for this line
+            const lineRanges = rangesByLine.get(lineIndex) || []
+
+            // If no ranges for this line, leave it as-is with HTML escaping
+            if (lineRanges.length === 0) {
+                result.push(`<span class="diff-unchanged">${this.escapeHtml(line)}</span>`)
+                continue
+            }
+
+            // Sort ranges by start position to ensure correct ordering
+            lineRanges.sort((a, b) => a.start - b.start)
+
+            // Build the highlighted line
+            let highlightedLine = ''
+            let currentPos = 0
+
+            for (const range of lineRanges) {
+                // Add text before the current range (with HTML escaping)
+                if (range.start > currentPos) {
+                    const beforeText = line.substring(currentPos, range.start)
+                    highlightedLine += `<span class="diff-unchanged">${this.escapeHtml(beforeText)}</span>`
+                }
+
+                // Add the highlighted part (with HTML escaping)
+                const highlightedText = line.substring(range.start, range.end)
+                highlightedLine += `<span class="diff-changed">${this.escapeHtml(highlightedText)}</span>`
+
+                // Update current position
+                currentPos = range.end
+            }
+
+            // Add any remaining text after the last range (with HTML escaping)
+            if (currentPos < line.length) {
+                const afterText = line.substring(currentPos)
+                highlightedLine += `<span class="diff-unchanged">${this.escapeHtml(afterText)}</span>`
+            }
+
+            result.push(highlightedLine)
+        }
+
+        return result
+    }
+
+    private getEditorTheme(): editorThemeInfo {
+        const editorConfig = vscode.workspace.getConfiguration('editor')
+        const fontSize = editorConfig.get<number>('fontSize', 12) // Default to 12 if not set
+        const lineHeightSetting = editorConfig.get<number>('lineHeight', 0) // Default to 0 if not set
+
+        /**
+         * Calculate effective line height, documented as such:
+         * Use 0 to automatically compute the line height from the font size.
+         * Values between 0 and 8 will be used as a multiplier with the font size.
+         * Values greater than or equal to 8 will be used as effective values.
+         */
+        let effectiveLineHeight: number
+        if (lineHeightSetting > 0 && lineHeightSetting < 8) {
+            effectiveLineHeight = lineHeightSetting * fontSize
+        } else if (lineHeightSetting >= 8) {
+            effectiveLineHeight = lineHeightSetting
+        } else {
+            effectiveLineHeight = Math.round(1.5 * fontSize)
+        }
+
+        const themeName = vscode.workspace.getConfiguration('workbench').get<string>('colorTheme', 'Default')
+        const themeColors = this.getThemeColors(themeName)
+
+        return {
+            fontSize: fontSize,
+            lingHeight: effectiveLineHeight,
+            ...themeColors,
+        }
+    }
+
+    private getThemeColors(themeName: string): {
+        foreground: string
+        background: string
+        diffAdded: string
+        diffRemoved: string
+    } {
+        // Define default dark theme colors
+        const darkThemeColors = {
+            foreground: 'rgba(212, 212, 212, 1)',
+            background: 'rgba(30, 30, 30, 1)',
+            diffAdded: 'rgba(231, 245, 231, 0.2)',
+            diffRemoved: 'rgba(255, 0, 0, 0.2)',
+        }
+
+        // Define default light theme colors
+        const lightThemeColors = {
+            foreground: 'rgba(0, 0, 0, 1)',
+            background: 'rgba(255, 255, 255, 1)',
+            diffAdded: 'rgba(198, 239, 206, 0.2)',
+            diffRemoved: 'rgba(255, 199, 206, 0.5)',
+        }
+
+        // For dark and light modes
+        const themeNameLower = themeName.toLowerCase()
+
+        if (themeNameLower.includes('dark')) {
+            return darkThemeColors
+        } else if (themeNameLower.includes('light')) {
+            return lightThemeColors
+        }
+
+        // Define colors for specific themes, add more if needed.
+        const themeColorMap: {
+            [key: string]: { foreground: string; background: string; diffAdded: string; diffRemoved: string }
+        } = {
+            Abyss: {
+                foreground: 'rgba(255, 255, 255, 1)',
+                background: 'rgba(0, 12, 24, 1)',
+                diffAdded: 'rgba(0, 255, 0, 0.2)',
+                diffRemoved: 'rgba(255, 0, 0, 0.3)',
+            },
+            Red: {
+                foreground: 'rgba(255, 0, 0, 1)',
+                background: 'rgba(51, 0, 0, 1)',
+                diffAdded: 'rgba(255, 100, 100, 0.2)',
+                diffRemoved: 'rgba(255, 0, 0, 0.5)',
+            },
+        }
+
+        // Return colors for the specific theme or default to light theme
+        return themeColorMap[themeName] || lightThemeColors
+    }
+
+    private calculatePosition(
+        originalLines: string[],
+        newLines: string[],
+        diffLines: string[],
+        theme: editorThemeInfo
+    ): { offset: number; editStartLine: number; isPositionValid: boolean } {
+        // Determine the starting line of the edit in the original file
+        let editStartLineInOldFile = 0
+        const maxLength = Math.min(originalLines.length, newLines.length)
+
+        for (let i = 0; i <= maxLength; i++) {
+            // if there is no difference between the original lines and the new lines, skip calculating for the start position.
+            if (i === maxLength && originalLines[i] === newLines[i] && originalLines.length === newLines.length) {
+                logger.info(
+                    'There is no difference between current and new code suggestion. Skip calculating for start position.'
+                )
+                return {
+                    offset: 0,
+                    editStartLine: 0,
+                    isPositionValid: false,
+                }
+            }
+            if (originalLines[i] !== newLines[i] || i === maxLength) {
+                editStartLineInOldFile = i
+                break
+            }
+        }
+        const shiftedStartLine = Math.max(0, editStartLineInOldFile - imageVerticalOffset)
+
+        // Determine the range to consider
+        const startLine = shiftedStartLine
+        const endLine = Math.min(editStartLineInOldFile + diffLines.length, originalLines.length)
+
+        // Find the longest line within the specified range
+        let maxLineLength = 0
+        for (let i = startLine; i <= endLine; i++) {
+            const lineLength = originalLines[i]?.length || 0
+            if (lineLength > maxLineLength) {
+                maxLineLength = lineLength
+            }
+        }
+
+        // Calculate the offset based on the longest line and the starting line length
+        const startLineLength = originalLines[startLine]?.length || 0
+        const offset = (maxLineLength - startLineLength) * theme.fontSize * 0.7 + 10 // padding
+
+        return { offset, editStartLine: editStartLineInOldFile, isPositionValid: true }
+    }
+
+    private escapeHtml(text: string): string {
+        return text
+            .replace(/&/g, '&amp;')
+            .replace(/</g, '&lt;')
+            .replace(/>/g, '&gt;')
+            .replace(/"/g, '&quot;')
+            .replace(/'/g, '&#039;')
+    }
+
+    /**
+     * Generates character-level highlight ranges for both original and modified code.
+     * @param originalCode Array of original code lines
+     * @param afterCode Array of code lines after modification
+     * @param modifiedLines Map of original lines to modified lines
+     * @returns Object containing ranges for original and after code character level highlighting
+     */
+    private generateHighlightRanges(
+        originalCode: string[],
+        afterCode: string[],
+        modifiedLines: Map<string, string>
+    ): { removedRanges: Range[]; addedRanges: Range[] } {
+        const originalRanges: Range[] = []
+        const afterRanges: Range[] = []
+
+        // Create reverse mapping for quicker lookups
+        const reverseMap = new Map<string, string>()
+        for (const [original, modified] of modifiedLines.entries()) {
+            reverseMap.set(modified, original)
+        }
+
+        // Process original code lines - produces highlight ranges in current editor text
+        for (let lineIndex = 0; lineIndex < originalCode.length; lineIndex++) {
+            const line = originalCode[lineIndex]
+
+            /**
+             * If [line] is an empty line or only contains whitespace char, [diffWordsWithSpace] will say it's not an "remove", i.e. [part.removed] will be undefined,
+             * therefore the deletion will not be highlighted. Thus fallback this scenario to highlight the entire line
+             */
+            // If line exists in modifiedLines as a key, process character diffs
+            if (Array.from(modifiedLines.keys()).includes(line) && line.trim().length > 0) {
+                const modifiedLine = modifiedLines.get(line)!
+                const changes = diffWordsWithSpace(line, modifiedLine)
+
+                let charPos = 0
+                for (const part of changes) {
+                    if (part.removed) {
+                        originalRanges.push({
+                            line: lineIndex,
+                            start: charPos,
+                            end: charPos + part.value.length,
+                        })
+                    }
+
+                    if (!part.added) {
+                        charPos += part.value.length
+                    }
+                }
+            } else {
+                // Line doesn't exist in modifiedLines values, highlight entire line
+                originalRanges.push({
+                    line: lineIndex,
+                    start: 0,
+                    end: line.length ?? defaultLineHighlightLength,
+                })
+            }
+        }
+
+        // Process after code lines - used for highlight in SVG image
+        for (let lineIndex = 0; lineIndex < afterCode.length; lineIndex++) {
+            const line = afterCode[lineIndex]
+
+            if (reverseMap.has(line)) {
+                const originalLine = reverseMap.get(line)!
+                const changes = diffWordsWithSpace(originalLine, line)
+
+                let charPos = 0
+                for (const part of changes) {
+                    if (part.added) {
+                        afterRanges.push({
+                            line: lineIndex,
+                            start: charPos,
+                            end: charPos + part.value.length,
+                        })
+                    }
+
+                    if (!part.removed) {
+                        charPos += part.value.length
+                    }
+                }
+            } else {
+                afterRanges.push({
+                    line: lineIndex,
+                    start: 0,
+                    end: line.length,
+                })
+            }
+        }
+
+        return {
+            removedRanges: originalRanges,
+            addedRanges: afterRanges,
+        }
+    }
+}
+
+interface editorThemeInfo {
+    fontSize: number
+    lingHeight: number
+    foreground?: string
+    background?: string
+    diffAdded?: string
+    diffRemoved?: string
+}
diff --git a/packages/amazonq/src/app/inline/activation.ts b/packages/amazonq/src/app/inline/activation.ts
new file mode 100644
index 00000000000..5a86d340c00
--- /dev/null
+++ b/packages/amazonq/src/app/inline/activation.ts
@@ -0,0 +1,128 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import vscode from 'vscode'
+import {
+    acceptSuggestion,
+    AuthUtil,
+    CodeSuggestionsState,
+    CodeWhispererCodeCoverageTracker,
+    CodeWhispererConstants,
+    CodeWhispererSettings,
+    ConfigurationEntry,
+    DefaultCodeWhispererClient,
+    invokeRecommendation,
+    isInlineCompletionEnabled,
+    KeyStrokeHandler,
+    RecommendationHandler,
+    runtimeLanguageContext,
+    TelemetryHelper,
+    UserWrittenCodeTracker,
+    vsCodeState,
+} from 'aws-core-vscode/codewhisperer'
+import { Commands, getLogger, globals, sleep } from 'aws-core-vscode/shared'
+import { BaseLanguageClient } from 'vscode-languageclient'
+
+export async function activate(languageClient: BaseLanguageClient) {
+    const codewhispererSettings = CodeWhispererSettings.instance
+    const client = new DefaultCodeWhispererClient()
+
+    if (isInlineCompletionEnabled()) {
+        await setSubscriptionsforInlineCompletion()
+        await AuthUtil.instance.setVscodeContextProps()
+        RecommendationHandler.instance.setLanguageClient(languageClient)
+    }
+
+    function getAutoTriggerStatus(): boolean {
+        return CodeSuggestionsState.instance.isSuggestionsEnabled()
+    }
+
+    async function getConfigEntry(): Promise<ConfigurationEntry> {
+        const isShowMethodsEnabled: boolean =
+            vscode.workspace.getConfiguration('editor').get('suggest.showMethods') || false
+        const isAutomatedTriggerEnabled: boolean = getAutoTriggerStatus()
+        const isManualTriggerEnabled: boolean = true
+        const isSuggestionsWithCodeReferencesEnabled = codewhispererSettings.isSuggestionsWithCodeReferencesEnabled()
+
+        // TODO:remove isManualTriggerEnabled
+        return {
+            isShowMethodsEnabled,
+            isManualTriggerEnabled,
+            isAutomatedTriggerEnabled,
+            isSuggestionsWithCodeReferencesEnabled,
+        }
+    }
+
+    async function setSubscriptionsforInlineCompletion() {
+        RecommendationHandler.instance.subscribeSuggestionCommands()
+
+        /**
+         * Automated trigger
+         */
+        globals.context.subscriptions.push(
+            acceptSuggestion.register(globals.context),
+            vscode.window.onDidChangeActiveTextEditor(async (editor) => {
+                await RecommendationHandler.instance.onEditorChange()
+            }),
+            vscode.window.onDidChangeWindowState(async (e) => {
+                await RecommendationHandler.instance.onFocusChange()
+            }),
+            vscode.window.onDidChangeTextEditorSelection(async (e) => {
+                await RecommendationHandler.instance.onCursorChange(e)
+            }),
+            vscode.workspace.onDidChangeTextDocument(async (e) => {
+                const editor = vscode.window.activeTextEditor
+                if (!editor) {
+                    return
+                }
+                if (e.document !== editor.document) {
+                    return
+                }
+                if (!runtimeLanguageContext.isLanguageSupported(e.document)) {
+                    return
+                }
+
+                CodeWhispererCodeCoverageTracker.getTracker(e.document.languageId)?.countTotalTokens(e)
+                UserWrittenCodeTracker.instance.onTextDocumentChange(e)
+                /**
+                 * Handle this keystroke event only when
+                 * 1. It is not a backspace
+                 * 2. It is not caused by CodeWhisperer editing
+                 * 3. It is not from undo/redo.
+                 */
+                if (e.contentChanges.length === 0 || vsCodeState.isCodeWhispererEditing) {
+                    return
+                }
+
+                if (vsCodeState.lastUserModificationTime) {
+                    TelemetryHelper.instance.setTimeSinceLastModification(
+                        Date.now() - vsCodeState.lastUserModificationTime
+                    )
+                }
+                vsCodeState.lastUserModificationTime = Date.now()
+                /**
+                 * Important:  Doing this sleep(10) is to make sure
+                 * 1. this event is processed by vs code first
+                 * 2. editor.selection.active has been successfully updated by VS Code
+                 * Then this event can be processed by our code.
+                 */
+                await sleep(CodeWhispererConstants.vsCodeCursorUpdateDelay)
+                if (!RecommendationHandler.instance.isSuggestionVisible()) {
+                    await KeyStrokeHandler.instance.processKeyStroke(e, editor, client, await getConfigEntry())
+                }
+            }),
+            // manual trigger
+            Commands.register({ id: 'aws.amazonq.invokeInlineCompletion', autoconnect: true }, async () => {
+                invokeRecommendation(
+                    vscode.window.activeTextEditor as vscode.TextEditor,
+                    client,
+                    await getConfigEntry()
+                ).catch((e: Error) => {
+                    getLogger().error('invokeRecommendation failed: %s', (e as Error).message)
+                })
+            })
+        )
+    }
+}
diff --git a/packages/amazonq/src/app/inline/completion.ts b/packages/amazonq/src/app/inline/completion.ts
new file mode 100644
index 00000000000..2e5d25be165
--- /dev/null
+++ b/packages/amazonq/src/app/inline/completion.ts
@@ -0,0 +1,589 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import {
+    CancellationToken,
+    InlineCompletionContext,
+    InlineCompletionItem,
+    InlineCompletionItemProvider,
+    Position,
+    TextDocument,
+    commands,
+    languages,
+    Disposable,
+    window,
+    TextEditor,
+    InlineCompletionTriggerKind,
+    Range,
+} from 'vscode'
+import { BaseLanguageClient } from 'vscode-languageclient'
+import {
+    InlineCompletionItemWithReferences,
+    LogInlineCompletionSessionResultsParams,
+} from '@aws/language-server-runtimes/protocol'
+import { SessionManager } from './sessionManager'
+import { GetAllRecommendationsOptions, RecommendationService } from './recommendationService'
+import {
+    CodeWhispererConstants,
+    ReferenceHoverProvider,
+    ReferenceLogViewProvider,
+    ImportAdderProvider,
+    CodeSuggestionsState,
+    vsCodeState,
+    noInlineSuggestionsMsg,
+    getDiagnosticsDifferences,
+    getDiagnosticsOfCurrentFile,
+    toIdeDiagnostics,
+    handleExtraBrackets,
+} from 'aws-core-vscode/codewhisperer'
+import { LineTracker } from './stateTracker/lineTracker'
+import { InlineTutorialAnnotation } from './tutorials/inlineTutorialAnnotation'
+import { TelemetryHelper } from './telemetryHelper'
+import { Experiments, getLogger, sleep } from 'aws-core-vscode/shared'
+import { messageUtils } from 'aws-core-vscode/utils'
+import { showEdits } from './EditRendering/imageRenderer'
+import { ICursorUpdateRecorder } from './cursorUpdateManager'
+import { DocumentEventListener } from './documentEventListener'
+
+export class InlineCompletionManager implements Disposable {
+    private disposable: Disposable
+    private inlineCompletionProvider: AmazonQInlineCompletionItemProvider
+    private languageClient: BaseLanguageClient
+    private sessionManager: SessionManager
+    private recommendationService: RecommendationService
+    private lineTracker: LineTracker
+
+    private inlineTutorialAnnotation: InlineTutorialAnnotation
+    private readonly logSessionResultMessageName = 'aws/logInlineCompletionSessionResults'
+    private documentEventListener: DocumentEventListener
+
+    constructor(
+        languageClient: BaseLanguageClient,
+        sessionManager: SessionManager,
+        lineTracker: LineTracker,
+        inlineTutorialAnnotation: InlineTutorialAnnotation,
+        cursorUpdateRecorder?: ICursorUpdateRecorder
+    ) {
+        this.languageClient = languageClient
+        this.sessionManager = sessionManager
+        this.lineTracker = lineTracker
+        this.recommendationService = new RecommendationService(this.sessionManager, cursorUpdateRecorder)
+        this.inlineTutorialAnnotation = inlineTutorialAnnotation
+        this.documentEventListener = new DocumentEventListener()
+        this.inlineCompletionProvider = new AmazonQInlineCompletionItemProvider(
+            languageClient,
+            this.recommendationService,
+            this.sessionManager,
+            this.inlineTutorialAnnotation,
+            this.documentEventListener
+        )
+
+        this.disposable = languages.registerInlineCompletionItemProvider(
+            CodeWhispererConstants.platformLanguageIds,
+            this.inlineCompletionProvider
+        )
+        this.lineTracker.ready()
+    }
+
+    public getInlineCompletionProvider(): AmazonQInlineCompletionItemProvider {
+        return this.inlineCompletionProvider
+    }
+
+    public dispose(): void {
+        if (this.disposable) {
+            this.disposable.dispose()
+            this.lineTracker.dispose()
+        }
+        if (this.documentEventListener) {
+            this.documentEventListener.dispose()
+        }
+    }
+
+    public registerInlineCompletion() {
+        const onInlineAcceptance = async (
+            sessionId: string,
+            item: InlineCompletionItemWithReferences,
+            editor: TextEditor,
+            requestStartTime: number,
+            position: vscode.Position,
+            firstCompletionDisplayLatency?: number
+        ) => {
+            try {
+                vsCodeState.isCodeWhispererEditing = true
+                const startLine = position.line
+                // TODO: also log the seen state for other suggestions in session
+                // Calculate timing metrics before diagnostic delay
+                const totalSessionDisplayTime = Date.now() - requestStartTime
+                await sleep(500)
+                const diagnosticDiff = getDiagnosticsDifferences(
+                    this.sessionManager.getActiveSession()?.diagnosticsBeforeAccept,
+                    getDiagnosticsOfCurrentFile()
+                )
+                // try remove the extra } ) ' " if there is a new reported problem
+                // the extra } will cause syntax error
+                if (diagnosticDiff.added.length > 0) {
+                    await handleExtraBrackets(editor, editor.selection.active, position)
+                }
+                const params: LogInlineCompletionSessionResultsParams = {
+                    sessionId: sessionId,
+                    completionSessionResult: {
+                        [item.itemId]: {
+                            seen: true,
+                            accepted: true,
+                            discarded: false,
+                        },
+                    },
+                    totalSessionDisplayTime: totalSessionDisplayTime,
+                    firstCompletionDisplayLatency: firstCompletionDisplayLatency,
+                    addedDiagnostics: diagnosticDiff.added.map((it) => toIdeDiagnostics(it)),
+                    removedDiagnostics: diagnosticDiff.removed.map((it) => toIdeDiagnostics(it)),
+                }
+                void this.languageClient.sendNotification(this.logSessionResultMessageName, params)
+                this.disposable.dispose()
+                this.disposable = languages.registerInlineCompletionItemProvider(
+                    CodeWhispererConstants.platformLanguageIds,
+                    this.inlineCompletionProvider
+                )
+                if (item.references && item.references.length) {
+                    const referenceLog = ReferenceLogViewProvider.getReferenceLog(
+                        item.insertText as string,
+                        item.references,
+                        editor
+                    )
+                    ReferenceLogViewProvider.instance.addReferenceLog(referenceLog)
+                    ReferenceHoverProvider.instance.addCodeReferences(item.insertText as string, item.references)
+                }
+                if (item.mostRelevantMissingImports?.length) {
+                    await ImportAdderProvider.instance.onAcceptRecommendation(editor, item, startLine)
+                }
+                this.sessionManager.incrementSuggestionCount()
+                // clear session manager states once accepted
+                this.sessionManager.clear()
+            } finally {
+                vsCodeState.isCodeWhispererEditing = false
+            }
+        }
+        commands.registerCommand('aws.amazonq.acceptInline', onInlineAcceptance)
+
+        const onInlineRejection = async () => {
+            try {
+                vsCodeState.isCodeWhispererEditing = true
+                const session = this.sessionManager.getActiveSession()
+                if (session === undefined) {
+                    return
+                }
+                const requestStartTime = session.requestStartTime
+                const totalSessionDisplayTime = Date.now() - requestStartTime
+                await commands.executeCommand('editor.action.inlineSuggest.hide')
+                // TODO: also log the seen state for other suggestions in session
+                this.disposable.dispose()
+                this.disposable = languages.registerInlineCompletionItemProvider(
+                    CodeWhispererConstants.platformLanguageIds,
+                    this.inlineCompletionProvider
+                )
+                const sessionId = session.sessionId
+                const itemId = this.sessionManager.getActiveRecommendation()[0]?.itemId
+                if (!itemId) {
+                    return
+                }
+                const params: LogInlineCompletionSessionResultsParams = {
+                    sessionId: sessionId,
+                    completionSessionResult: {
+                        [itemId]: {
+                            seen: true,
+                            accepted: false,
+                            discarded: false,
+                        },
+                    },
+                    firstCompletionDisplayLatency: session.firstCompletionDisplayLatency,
+                    totalSessionDisplayTime: totalSessionDisplayTime,
+                }
+                void this.languageClient.sendNotification(this.logSessionResultMessageName, params)
+                // clear session manager states once rejected
+                this.sessionManager.clear()
+            } finally {
+                vsCodeState.isCodeWhispererEditing = false
+            }
+        }
+        commands.registerCommand('aws.amazonq.rejectCodeSuggestion', onInlineRejection)
+    }
+}
+
+export class AmazonQInlineCompletionItemProvider implements InlineCompletionItemProvider {
+    private logger = getLogger()
+    private pendingRequest: Promise<InlineCompletionItem[]> | undefined
+
+    constructor(
+        private readonly languageClient: BaseLanguageClient,
+        private readonly recommendationService: RecommendationService,
+        private readonly sessionManager: SessionManager,
+        private readonly inlineTutorialAnnotation: InlineTutorialAnnotation,
+        private readonly documentEventListener: DocumentEventListener
+    ) {}
+
+    private readonly logSessionResultMessageName = 'aws/logInlineCompletionSessionResults'
+
+    // Ideally use this API handleDidShowCompletionItem
+    // https://github.com/microsoft/vscode/blob/main/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts#L83
+    // we need this because the returned items of provideInlineCompletionItems may not be actually rendered on screen
+    // if VS Code believes the user is actively typing then it will not show such item
+    async checkWhetherInlineCompletionWasShown() {
+        // this line is to force VS Code to re-render the inline completion
+        // if it decides the inline completion can be shown
+        await vscode.commands.executeCommand('editor.action.inlineSuggest.trigger')
+        // yield event loop to let backend state transition finish plus wait for vsc to render
+        await sleep(10)
+        // run the command to detect if inline suggestion is really shown or not
+        await vscode.commands.executeCommand(`aws.amazonq.checkInlineSuggestionVisibility`)
+    }
+
+    /**
+     * Check if a completion suggestion is currently active/displayed
+     */
+    public async isCompletionActive(): Promise<boolean> {
+        const session = this.sessionManager.getActiveSession()
+        if (session === undefined || !session.displayed || session.suggestions.some((item) => item.isInlineEdit)) {
+            return false
+        }
+
+        // Use VS Code command to check if inline suggestion is actually visible on screen
+        // This command only executes when inlineSuggestionVisible context is true
+        await vscode.commands.executeCommand('aws.amazonq.checkInlineSuggestionVisibility')
+        const isInlineSuggestionVisible = Date.now() - session.lastVisibleTime < 50
+        return isInlineSuggestionVisible
+    }
+
+    /**
+     * Batch discard telemetry for completion suggestions when edit suggestion is active
+     */
+    public batchDiscardTelemetryForEditSuggestion(items: any[], session: any): void {
+        // Emit DISCARD telemetry for completion suggestions that can't be shown due to active edit
+        const completionSessionResult: {
+            [key: string]: { seen: boolean; accepted: boolean; discarded: boolean }
+        } = {}
+
+        for (const item of items) {
+            if (!item.isInlineEdit && item.itemId) {
+                completionSessionResult[item.itemId] = {
+                    seen: false,
+                    accepted: false,
+                    discarded: true,
+                }
+            }
+        }
+
+        // Send single telemetry event for all discarded items
+        if (Object.keys(completionSessionResult).length > 0) {
+            const params: LogInlineCompletionSessionResultsParams = {
+                sessionId: session.sessionId,
+                completionSessionResult,
+                firstCompletionDisplayLatency: session.firstCompletionDisplayLatency,
+                totalSessionDisplayTime: Date.now() - session.requestStartTime,
+            }
+            void this.languageClient.sendNotification(this.logSessionResultMessageName, params)
+        }
+    }
+
+    // this method is automatically invoked by VS Code as user types
+    async provideInlineCompletionItems(
+        document: TextDocument,
+        position: Position,
+        context: InlineCompletionContext,
+        token: CancellationToken,
+        getAllRecommendationsOptions?: GetAllRecommendationsOptions
+    ): Promise<InlineCompletionItem[]> {
+        getLogger().info('_provideInlineCompletionItems called with: %O', {
+            documentUri: document.uri.toString(),
+            position,
+            context,
+            triggerKind: context.triggerKind === InlineCompletionTriggerKind.Automatic ? 'Automatic' : 'Invoke',
+            options: JSON.stringify(getAllRecommendationsOptions),
+        })
+
+        // If there's already a pending request, wait for it to complete instead of starting a new one
+        // This prevents race conditions where multiple concurrent calls cause the later (empty) response
+        // to override the earlier (valid) response
+        if (this.pendingRequest) {
+            getLogger().info('Reusing pending inline completion request to avoid race condition')
+            try {
+                const result = await this.pendingRequest
+                // Check if THIS call's token was cancelled (not the original call's token)
+                if (token.isCancellationRequested) {
+                    getLogger().info('Reused request completed but this call was cancelled')
+                    return []
+                }
+                return result
+            } catch (e) {
+                // If the pending request failed, continue with a new request
+                getLogger().info('Pending request failed, starting new request: %O', e)
+            }
+        }
+
+        // Start a new request and track it
+        this.pendingRequest = this._provideInlineCompletionItemsImpl(
+            document,
+            position,
+            context,
+            token,
+            getAllRecommendationsOptions
+        )
+
+        try {
+            return await this.pendingRequest
+        } finally {
+            this.pendingRequest = undefined
+        }
+    }
+
+    private async _provideInlineCompletionItemsImpl(
+        document: TextDocument,
+        position: Position,
+        context: InlineCompletionContext,
+        token: CancellationToken,
+        getAllRecommendationsOptions?: GetAllRecommendationsOptions
+    ): Promise<InlineCompletionItem[]> {
+        if (vsCodeState.isCodeWhispererEditing) {
+            getLogger().info('Q is editing, returning empty')
+            return []
+        }
+
+        // there is a bug in VS Code, when hitting Enter, the context.triggerKind is Invoke (0)
+        // when hitting other keystrokes, the context.triggerKind is Automatic (1)
+        // we only mark option + C as manual trigger
+        // this is a workaround since the inlineSuggest.trigger command take no params
+        const isAutoTrigger = Date.now() - vsCodeState.lastManualTriggerTime > 50
+        if (isAutoTrigger && !CodeSuggestionsState.instance.isSuggestionsEnabled()) {
+            // return early when suggestions are disabled with auto trigger
+            return []
+        }
+
+        // yield event loop to let the document listen catch updates
+        await sleep(1)
+
+        let logstr = `GenerateCompletion activity:\\n`
+        try {
+            const t0 = Date.now()
+            vsCodeState.isRecommendationsActive = true
+            // handling previous session
+            const prevSession = this.sessionManager.getActiveSession()
+            const prevSessionId = prevSession?.sessionId
+            const prevItemId = this.sessionManager.getActiveRecommendation()?.[0]?.itemId
+            const prevStartPosition = prevSession?.startPosition
+            const editsTriggerOnAcceptance = prevSession?.triggerOnAcceptance
+            if (editsTriggerOnAcceptance) {
+                getAllRecommendationsOptions = {
+                    ...getAllRecommendationsOptions,
+                    editsStreakToken: prevSession?.editsStreakPartialResultToken,
+                }
+            }
+            const editor = window.activeTextEditor
+            // Skip prefix matching for Edits suggestions that trigger on acceptance.
+            if (prevSession && prevSessionId && prevItemId && prevStartPosition && !editsTriggerOnAcceptance) {
+                const prefix = document.getText(new Range(prevStartPosition, position))
+                const prevItemMatchingPrefix = []
+                for (const item of this.sessionManager.getActiveRecommendation()) {
+                    // if item is an Edit suggestion, insertText is a diff instead of new code contents, skip the logic to check for prefix.
+                    if (item.isInlineEdit) {
+                        continue
+                    }
+                    const text = typeof item.insertText === 'string' ? item.insertText : item.insertText.value
+                    if (text.startsWith(prefix) && position.isAfterOrEqual(prevStartPosition)) {
+                        item.command = {
+                            command: 'aws.amazonq.acceptInline',
+                            title: 'On acceptance',
+                            arguments: [
+                                prevSessionId,
+                                item,
+                                editor,
+                                prevSession?.requestStartTime,
+                                position,
+                                prevSession?.firstCompletionDisplayLatency,
+                            ],
+                        }
+                        item.range = new Range(prevStartPosition, position)
+                        prevItemMatchingPrefix.push(item as InlineCompletionItem)
+                    }
+                }
+                // re-use previous suggestions as long as new typed prefix matches
+                if (prevItemMatchingPrefix.length > 0) {
+                    logstr += `- not call LSP and reuse previous suggestions that match user typed characters
+                    - duration between trigger to completion suggestion is displayed ${Date.now() - t0}`
+                    void this.checkWhetherInlineCompletionWasShown()
+                    return prevItemMatchingPrefix
+                }
+
+                // if no such suggestions, report the previous suggestion as Reject or Discarded
+                const params: LogInlineCompletionSessionResultsParams = {
+                    sessionId: prevSessionId,
+                    completionSessionResult: {
+                        [prevItemId]: {
+                            seen: prevSession.displayed,
+                            accepted: false,
+                            discarded: !prevSession.displayed,
+                        },
+                    },
+                    firstCompletionDisplayLatency: prevSession.firstCompletionDisplayLatency,
+                    totalSessionDisplayTime: Date.now() - prevSession.requestStartTime,
+                }
+                void this.languageClient.sendNotification(this.logSessionResultMessageName, params)
+                this.sessionManager.clear()
+                // Do not make auto trigger if user rejects a suggestion
+                // by typing characters that does not match
+                return []
+            }
+
+            // tell the tutorial that completions has been triggered
+            await this.inlineTutorialAnnotation.triggered(context.triggerKind)
+
+            TelemetryHelper.instance.setInvokeSuggestionStartTime()
+            TelemetryHelper.instance.setTriggerType(context.triggerKind)
+
+            const t1 = Date.now()
+
+            await this.recommendationService.getAllRecommendations(
+                this.languageClient,
+                document,
+                position,
+                {
+                    triggerKind: isAutoTrigger ? 1 : 0,
+                    selectedCompletionInfo: context.selectedCompletionInfo,
+                },
+                token,
+                isAutoTrigger,
+                this.documentEventListener,
+                getAllRecommendationsOptions
+            )
+            // get active item from session for displaying
+            const items = this.sessionManager.getActiveRecommendation()
+            const itemId = this.sessionManager.getActiveRecommendation()?.[0]?.itemId
+
+            // eslint-disable-next-line @typescript-eslint/no-base-to-string
+            const itemLog = items[0] ? `${items[0].insertText.toString()}` : `no suggestion`
+
+            const t2 = Date.now()
+
+            logstr += `- number of suggestions: ${items.length}
+- sessionId: ${this.sessionManager.getActiveSession()?.sessionId}
+- first suggestion content (next line):
+${itemLog}
+- duration between trigger to before sending LSP call: ${t1 - t0}ms
+- duration between trigger to after receiving LSP response: ${t2 - t0}ms
+- duration between before sending LSP call to after receving LSP response: ${t2 - t1}ms
+`
+            const session = this.sessionManager.getActiveSession()
+
+            // Show message to user when manual invoke fails to produce results.
+            if (items.length === 0 && context.triggerKind === InlineCompletionTriggerKind.Invoke) {
+                void messageUtils.showTimedMessage(noInlineSuggestionsMsg, 2000)
+            }
+
+            if (!session || !items.length || !editor) {
+                logstr += `Failed to produce inline suggestion results. Received ${items.length} items from service`
+                return []
+            }
+
+            const cursorPosition = document.validatePosition(position)
+
+            // Completion will not be rendered if users cursor moves to a position which is before the position when the service is invoked
+            if (items.length > 0 && !items[0].isInlineEdit) {
+                if (position.isAfter(editor.selection.active)) {
+                    const params: LogInlineCompletionSessionResultsParams = {
+                        sessionId: session.sessionId,
+                        completionSessionResult: {
+                            [itemId]: {
+                                seen: false,
+                                accepted: false,
+                                discarded: true,
+                            },
+                        },
+                    }
+                    void this.languageClient.sendNotification(this.logSessionResultMessageName, params)
+                    this.sessionManager.clear()
+                    logstr += `- cursor moved behind trigger position. Discarding completion suggestion...`
+                    return []
+                }
+            }
+
+            // delay the suggestion rendeing if user is actively typing
+            // see https://github.com/aws/aws-toolkit-vscode/commit/a537602a96f498f372ed61ec9d82cf8577a9d854
+            for (let i = 0; i < 30; i++) {
+                const lastDocumentChange = this.documentEventListener.getLastDocumentChangeEvent(document.uri.fsPath)
+                if (
+                    lastDocumentChange &&
+                    Date.now() - lastDocumentChange.timestamp < CodeWhispererConstants.inlineSuggestionShowDelay
+                ) {
+                    await sleep(CodeWhispererConstants.showRecommendationTimerPollPeriod)
+                } else {
+                    break
+                }
+            }
+
+            // the user typed characters from invoking suggestion cursor position to receiving suggestion position
+            const typeahead = document.getText(new Range(position, editor.selection.active))
+
+            const itemsMatchingTypeahead = []
+
+            for (const item of items) {
+                if (item.isInlineEdit) {
+                    // Check if Next Edit Prediction feature flag is enabled
+                    if (Experiments.instance.get('amazonqLSPNEP', true)) {
+                        await showEdits(item, editor, session, this.languageClient, this)
+                        logstr += `- duration between trigger to edits suggestion is displayed: ${Date.now() - t0}ms`
+                    }
+                    return []
+                }
+
+                item.insertText = typeof item.insertText === 'string' ? item.insertText : item.insertText.value
+                if (item.insertText.startsWith(typeahead)) {
+                    item.command = {
+                        command: 'aws.amazonq.acceptInline',
+                        title: 'On acceptance',
+                        arguments: [
+                            session.sessionId,
+                            item,
+                            editor,
+                            session.requestStartTime,
+                            cursorPosition,
+                            session.firstCompletionDisplayLatency,
+                        ],
+                    }
+                    item.range = new Range(cursorPosition, cursorPosition)
+                    itemsMatchingTypeahead.push(item)
+                }
+            }
+
+            // report discard if none of suggestions match typeahead
+            if (itemsMatchingTypeahead.length === 0) {
+                const params: LogInlineCompletionSessionResultsParams = {
+                    sessionId: session.sessionId,
+                    completionSessionResult: {
+                        [itemId]: {
+                            seen: false,
+                            accepted: false,
+                            discarded: true,
+                        },
+                    },
+                }
+                void this.languageClient.sendNotification(this.logSessionResultMessageName, params)
+                this.sessionManager.clear()
+                logstr += `- suggestion does not match user typeahead from insertion position. Discarding suggestion...`
+                return []
+            }
+
+            this.sessionManager.updateCodeReferenceAndImports()
+            // suggestions returned here will be displayed on screen
+            logstr += `- duration between trigger to completion suggestion is displayed: ${Date.now() - t0}ms`
+            void this.checkWhetherInlineCompletionWasShown()
+            return itemsMatchingTypeahead as InlineCompletionItem[]
+        } catch (e) {
+            getLogger('amazonqLsp').error('Failed to provide completion items: %O', e)
+            logstr += `- failed to provide completion items ${(e as Error).message}`
+            return []
+        } finally {
+            vsCodeState.isRecommendationsActive = false
+            this.logger.info(logstr)
+        }
+    }
+}
diff --git a/packages/amazonq/src/app/inline/cursorUpdateManager.ts b/packages/amazonq/src/app/inline/cursorUpdateManager.ts
new file mode 100644
index 00000000000..e06285d1f32
--- /dev/null
+++ b/packages/amazonq/src/app/inline/cursorUpdateManager.ts
@@ -0,0 +1,211 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { BaseLanguageClient } from 'vscode-languageclient'
+import { getLogger } from 'aws-core-vscode/shared'
+import { globals } from 'aws-core-vscode/shared'
+import { AmazonQInlineCompletionItemProvider } from './completion'
+import { CodeSuggestionsState } from 'aws-core-vscode/codewhisperer'
+
+// Configuration section for cursor updates
+export const cursorUpdateConfigurationSection = 'aws.q.cursorUpdate'
+
+/**
+ * Interface for recording completion requests
+ */
+export interface ICursorUpdateRecorder {
+    recordCompletionRequest(): void
+}
+
+/**
+ * Manages periodic cursor position updates for Next Edit Prediction
+ */
+export class CursorUpdateManager implements vscode.Disposable, ICursorUpdateRecorder {
+    private readonly logger = getLogger('amazonqLsp')
+    private updateIntervalMs = 250
+    private updateTimer?: NodeJS.Timeout
+    private lastPosition?: vscode.Position
+    private lastDocumentUri?: string
+    private lastSentPosition?: vscode.Position
+    private lastSentDocumentUri?: string
+    private isActive = false
+    private lastRequestTime = 0
+    private autotriggerStateDisposable?: vscode.Disposable
+
+    constructor(
+        private readonly languageClient: BaseLanguageClient,
+        private readonly inlineCompletionProvider?: AmazonQInlineCompletionItemProvider
+    ) {
+        // Listen for autotrigger state changes to enable/disable the timer
+        this.autotriggerStateDisposable = CodeSuggestionsState.instance.onDidChangeState((isEnabled: boolean) => {
+            if (isEnabled && this.isActive) {
+                // If autotrigger is enabled and we're active, ensure timer is running
+                this.setupUpdateTimer()
+            } else {
+                // If autotrigger is disabled, clear the timer but keep isActive state
+                this.clearUpdateTimer()
+            }
+        })
+    }
+
+    /**
+     * Start tracking cursor positions and sending periodic updates
+     */
+    public async start(): Promise<void> {
+        if (this.isActive) {
+            return
+        }
+
+        // Request configuration from server
+        try {
+            const config = await this.languageClient.sendRequest('aws/getConfigurationFromServer', {
+                section: cursorUpdateConfigurationSection,
+            })
+
+            if (
+                config &&
+                typeof config === 'object' &&
+                'intervalMs' in config &&
+                typeof config.intervalMs === 'number' &&
+                config.intervalMs > 0
+            ) {
+                this.updateIntervalMs = config.intervalMs
+            }
+        } catch (error) {
+            this.logger.warn(`Failed to get cursor update configuration from server: ${error}`)
+        }
+
+        this.isActive = true
+        if (CodeSuggestionsState.instance.isSuggestionsEnabled()) {
+            this.setupUpdateTimer()
+        }
+    }
+
+    /**
+     * Stop tracking cursor positions and sending updates
+     */
+    public stop(): void {
+        this.isActive = false
+        this.clearUpdateTimer()
+    }
+
+    /**
+     * Update the current cursor position
+     */
+    public updatePosition(position: vscode.Position, documentUri: string): void {
+        // If the document changed, set the last sent position to the current position
+        // This prevents triggering an immediate recommendation when switching tabs
+        if (this.lastDocumentUri !== documentUri) {
+            this.lastSentPosition = position.with() // Create a copy
+            this.lastSentDocumentUri = documentUri
+        }
+
+        this.lastPosition = position.with() // Create a copy
+        this.lastDocumentUri = documentUri
+    }
+
+    /**
+     * Record that a regular InlineCompletionWithReferences request was made
+     * This will prevent cursor updates from being sent for the update interval
+     */
+    public recordCompletionRequest(): void {
+        this.lastRequestTime = globals.clock.Date.now()
+    }
+
+    /**
+     * Set up the timer for periodic cursor position updates
+     */
+    private setupUpdateTimer(): void {
+        this.clearUpdateTimer()
+
+        this.updateTimer = globals.clock.setInterval(async () => {
+            await this.sendCursorUpdate()
+        }, this.updateIntervalMs)
+    }
+
+    /**
+     * Clear the update timer
+     */
+    private clearUpdateTimer(): void {
+        if (this.updateTimer) {
+            globals.clock.clearInterval(this.updateTimer)
+            this.updateTimer = undefined
+        }
+    }
+
+    /**
+     * Creates a cancellation token source
+     * This method exists to make testing easier by allowing it to be stubbed
+     */
+    private createCancellationTokenSource(): vscode.CancellationTokenSource {
+        return new vscode.CancellationTokenSource()
+    }
+
+    /**
+     * Request LSP generate a completion for the current cursor position.
+     */
+    private async sendCursorUpdate(): Promise<void> {
+        // Don't send an update if a regular request was made recently
+        const now = globals.clock.Date.now()
+        if (now - this.lastRequestTime < this.updateIntervalMs) {
+            return
+        }
+
+        const editor = vscode.window.activeTextEditor
+        if (!editor || editor.document.uri.toString() !== this.lastDocumentUri) {
+            return
+        }
+
+        // Don't send an update if the position hasn't changed since the last update
+        if (
+            this.lastSentPosition &&
+            this.lastPosition &&
+            this.lastSentDocumentUri === this.lastDocumentUri &&
+            this.lastSentPosition.line === this.lastPosition.line &&
+            this.lastSentPosition.character === this.lastPosition.character
+        ) {
+            return
+        }
+
+        // Only proceed if we have a valid position and provider
+        if (this.lastPosition && this.inlineCompletionProvider) {
+            const position = this.lastPosition.with() // Create a copy
+
+            // Call the inline completion provider instead of directly calling getAllRecommendations
+            try {
+                await this.inlineCompletionProvider.provideInlineCompletionItems(
+                    editor.document,
+                    position,
+                    {
+                        triggerKind: vscode.InlineCompletionTriggerKind.Automatic,
+                        selectedCompletionInfo: undefined,
+                    },
+                    this.createCancellationTokenSource().token,
+                    { emitTelemetry: false, showUi: false }
+                )
+
+                // Only update the last sent position after successfully sending the request
+                this.lastSentPosition = position
+                this.lastSentDocumentUri = this.lastDocumentUri
+            } catch (error) {
+                this.logger.error(`Error sending cursor update: ${error}`)
+            }
+        }
+    }
+
+    /**
+     * Dispose of resources
+     */
+    public dispose(): void {
+        // Dispose of the autotrigger state change listener
+        if (this.autotriggerStateDisposable) {
+            this.autotriggerStateDisposable.dispose()
+            this.autotriggerStateDisposable = undefined
+        }
+
+        this.stop()
+    }
+}
diff --git a/packages/amazonq/src/app/inline/documentEventListener.ts b/packages/amazonq/src/app/inline/documentEventListener.ts
new file mode 100644
index 00000000000..7af22a3015a
--- /dev/null
+++ b/packages/amazonq/src/app/inline/documentEventListener.ts
@@ -0,0 +1,69 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+
+export interface DocumentChangeEvent {
+    event: vscode.TextDocumentChangeEvent
+    timestamp: number
+}
+
+export class DocumentEventListener {
+    private lastDocumentChangeEventMap: Map<string, DocumentChangeEvent> = new Map()
+    private documentChangeListener: vscode.Disposable
+    private _maxDocument = 1000
+
+    constructor() {
+        this.documentChangeListener = vscode.workspace.onDidChangeTextDocument((e) => {
+            if (e.contentChanges.length > 0) {
+                if (this.lastDocumentChangeEventMap.size > this._maxDocument) {
+                    this.lastDocumentChangeEventMap.clear()
+                }
+                this.lastDocumentChangeEventMap.set(e.document.uri.fsPath, { event: e, timestamp: Date.now() })
+                // The VS Code provideInlineCompletionCallback may not trigger when Enter is pressed, especially in Python files
+                // manually make this trigger. In case of duplicate, the provideInlineCompletionCallback is already debounced
+                if (this.isEnter(e) && vscode.window.activeTextEditor) {
+                    void vscode.commands.executeCommand('editor.action.inlineSuggest.trigger')
+                }
+            }
+        })
+    }
+
+    public isLastEventDeletion(filepath: string): boolean {
+        const result = this.lastDocumentChangeEventMap.get(filepath)
+        if (result) {
+            const event = result.event
+            const eventTime = result.timestamp
+            const isDelete =
+                (event && event.contentChanges.length === 1 && event.contentChanges[0].text === '') || false
+            const timeDiff = Math.abs(Date.now() - eventTime)
+            return timeDiff < 500 && isDelete
+        }
+        return false
+    }
+
+    public getLastDocumentChangeEvent(filepath: string): DocumentChangeEvent | undefined {
+        return this.lastDocumentChangeEventMap.get(filepath)
+    }
+
+    public dispose(): void {
+        if (this.documentChangeListener) {
+            this.documentChangeListener.dispose()
+        }
+    }
+
+    private isEnter(e: vscode.TextDocumentChangeEvent): boolean {
+        if (e.contentChanges.length !== 1) {
+            return false
+        }
+        const str = e.contentChanges[0].text
+        if (str.length === 0) {
+            return false
+        }
+        return (
+            (str.startsWith('\r\n') && str.substring(2).trim() === '') ||
+            (str[0] === '\n' && str.substring(1).trim() === '')
+        )
+    }
+}
diff --git a/packages/amazonq/src/app/inline/editSuggestionState.ts b/packages/amazonq/src/app/inline/editSuggestionState.ts
new file mode 100644
index 00000000000..61e4aebd142
--- /dev/null
+++ b/packages/amazonq/src/app/inline/editSuggestionState.ts
@@ -0,0 +1,27 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Manages the state of edit suggestions to avoid circular dependencies
+ */
+export class EditSuggestionState {
+    private static isEditSuggestionCurrentlyActive = false
+    private static displayStartTime = Date.now()
+
+    static setEditSuggestionActive(active: boolean): void {
+        this.isEditSuggestionCurrentlyActive = active
+        if (active) {
+            this.displayStartTime = Date.now()
+        }
+    }
+
+    static isEditSuggestionActive(): boolean {
+        return this.isEditSuggestionCurrentlyActive
+    }
+
+    static isEditSuggestionDisplayingOverOneSecond(): boolean {
+        return this.isEditSuggestionActive() && Date.now() - this.displayStartTime > 1000
+    }
+}
diff --git a/packages/amazonq/src/app/inline/notebookUtil.ts b/packages/amazonq/src/app/inline/notebookUtil.ts
new file mode 100644
index 00000000000..928de1aad33
--- /dev/null
+++ b/packages/amazonq/src/app/inline/notebookUtil.ts
@@ -0,0 +1,98 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+
+import { CodeWhispererConstants, runtimeLanguageContext } from 'aws-core-vscode/codewhisperer'
+import { InlineCompletionWithReferencesParams } from '@aws/language-server-runtimes/server-interface'
+
+function getEnclosingNotebook(document: vscode.TextDocument): vscode.NotebookDocument | undefined {
+    // For notebook cells, find the existing notebook with a cell that matches the current document.
+    return vscode.workspace.notebookDocuments.find(
+        (nb) => nb.notebookType === 'jupyter-notebook' && nb.getCells().some((cell) => cell.document === document)
+    )
+}
+
+export function getNotebookContext(
+    notebook: vscode.NotebookDocument,
+    document: vscode.TextDocument,
+    position: vscode.Position
+) {
+    // Expand the context for a cell inside of a noteboo with whatever text fits from the preceding and subsequent cells
+    const allCells = notebook.getCells()
+    const cellIndex = allCells.findIndex((cell) => cell.document === document)
+    let caretLeftFileContext = ''
+    let caretRightFileContext = ''
+
+    if (cellIndex >= 0 && cellIndex < allCells.length) {
+        // Add content from previous cells
+        for (let i = 0; i < cellIndex; i++) {
+            caretLeftFileContext += convertCellContent(allCells[i]) + '\n'
+        }
+
+        // Add content from current cell up to cursor
+        caretLeftFileContext += allCells[cellIndex].document.getText(
+            new vscode.Range(new vscode.Position(0, 0), position)
+        )
+
+        // Add content from cursor to end of current cell
+        caretRightFileContext = allCells[cellIndex].document.getText(
+            new vscode.Range(
+                position,
+                allCells[cellIndex].document.positionAt(allCells[cellIndex].document.getText().length)
+            )
+        )
+
+        // Add content from following cells
+        for (let i = cellIndex + 1; i < allCells.length; i++) {
+            caretRightFileContext += '\n' + convertCellContent(allCells[i])
+        }
+    }
+    caretLeftFileContext = caretLeftFileContext.slice(-CodeWhispererConstants.charactersLimit)
+    caretRightFileContext = caretRightFileContext.slice(0, CodeWhispererConstants.charactersLimit)
+    return { caretLeftFileContext, caretRightFileContext }
+}
+
+// Convert the markup cells into code with comments
+export function convertCellContent(cell: vscode.NotebookCell) {
+    const cellText = cell.document.getText()
+    if (cell.kind === vscode.NotebookCellKind.Markup) {
+        const commentPrefix = runtimeLanguageContext.getSingleLineCommentPrefix(
+            runtimeLanguageContext.normalizeLanguage(cell.document.languageId) ?? cell.document.languageId
+        )
+        if (commentPrefix === '') {
+            return cellText
+        }
+        return cell.document
+            .getText()
+            .split('\n')
+            .map((line) => `${commentPrefix}${line}`)
+            .join('\n')
+    }
+    return cellText
+}
+
+export function extractFileContextInNotebooks(
+    document: vscode.TextDocument,
+    position: vscode.Position
+): InlineCompletionWithReferencesParams['fileContextOverride'] | undefined {
+    let caretLeftFileContext = ''
+    let caretRightFileContext = ''
+    const languageName = runtimeLanguageContext.normalizeLanguage(document.languageId) ?? document.languageId
+    if (document.uri.scheme === 'vscode-notebook-cell') {
+        const notebook = getEnclosingNotebook(document)
+        if (notebook) {
+            ;({ caretLeftFileContext, caretRightFileContext } = getNotebookContext(notebook, document, position))
+            return {
+                leftFileContent: caretLeftFileContext,
+                rightFileContent: caretRightFileContext,
+                filename: document.fileName,
+                fileUri: document.uri.toString(),
+                programmingLanguage: languageName,
+            }
+        }
+    }
+    return undefined
+}
diff --git a/packages/amazonq/src/app/inline/recommendationService.ts b/packages/amazonq/src/app/inline/recommendationService.ts
new file mode 100644
index 00000000000..b601b2d90da
--- /dev/null
+++ b/packages/amazonq/src/app/inline/recommendationService.ts
@@ -0,0 +1,318 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import {
+    InlineCompletionListWithReferences,
+    InlineCompletionWithReferencesParams,
+    inlineCompletionWithReferencesRequestType,
+    TextDocumentContentChangeEvent,
+    editCompletionRequestType,
+    LogInlineCompletionSessionResultsParams,
+} from '@aws/language-server-runtimes/protocol'
+import { CancellationToken, InlineCompletionContext, Position, TextDocument, commands } from 'vscode'
+import { BaseLanguageClient } from 'vscode-languageclient'
+import { SessionManager } from './sessionManager'
+import {
+    AuthUtil,
+    CodeWhispererConstants,
+    CodeWhispererStatusBarManager,
+    vsCodeState,
+} from 'aws-core-vscode/codewhisperer'
+import { TelemetryHelper } from './telemetryHelper'
+import { ICursorUpdateRecorder } from './cursorUpdateManager'
+import { getLogger } from 'aws-core-vscode/shared'
+import { DocumentEventListener } from './documentEventListener'
+import { getOpenFilesInWindow } from 'aws-core-vscode/utils'
+import { asyncCallWithTimeout } from '../../util/timeoutUtil'
+import { extractFileContextInNotebooks } from './notebookUtil'
+import { EditSuggestionState } from './editSuggestionState'
+
+export interface GetAllRecommendationsOptions {
+    emitTelemetry?: boolean
+    showUi?: boolean
+    editsStreakToken?: number | string
+}
+
+export class RecommendationService {
+    private logger = getLogger()
+
+    constructor(
+        private readonly sessionManager: SessionManager,
+        private cursorUpdateRecorder?: ICursorUpdateRecorder
+    ) {}
+    /**
+     * Set the recommendation service
+     */
+    public setCursorUpdateRecorder(recorder: ICursorUpdateRecorder): void {
+        this.cursorUpdateRecorder = recorder
+    }
+
+    async getRecommendationsWithTimeout(
+        languageClient: BaseLanguageClient,
+        request: InlineCompletionWithReferencesParams,
+        token: CancellationToken
+    ) {
+        const resultPromise: Promise<InlineCompletionListWithReferences> = languageClient.sendRequest(
+            inlineCompletionWithReferencesRequestType.method,
+            request,
+            token
+        )
+        return await asyncCallWithTimeout<InlineCompletionListWithReferences>(
+            resultPromise,
+            `${inlineCompletionWithReferencesRequestType.method} time out`,
+            CodeWhispererConstants.promiseTimeoutLimit * 1000
+        )
+    }
+
+    async getAllRecommendations(
+        languageClient: BaseLanguageClient,
+        document: TextDocument,
+        position: Position,
+        context: InlineCompletionContext,
+        token: CancellationToken,
+        isAutoTrigger: boolean,
+        documentEventListener: DocumentEventListener,
+        options: GetAllRecommendationsOptions = { emitTelemetry: true, showUi: true }
+    ) {
+        const documentChangeEvent = documentEventListener?.getLastDocumentChangeEvent(document.uri.fsPath)?.event
+
+        // Record that a regular request is being made
+        this.cursorUpdateRecorder?.recordCompletionRequest()
+        const documentChangeParams = documentChangeEvent
+            ? {
+                  textDocument: {
+                      uri: document.uri.toString(),
+                      version: document.version,
+                  },
+                  contentChanges: documentChangeEvent.contentChanges.map((x) => x as TextDocumentContentChangeEvent),
+              }
+            : undefined
+        const openTabs = await getOpenFilesInWindow()
+        let request: InlineCompletionWithReferencesParams = {
+            textDocument: {
+                uri: document.uri.toString(),
+            },
+            position,
+            context,
+            documentChangeParams: documentChangeParams,
+            openTabFilepaths: openTabs,
+        }
+        if (options.editsStreakToken) {
+            request = { ...request, partialResultToken: options.editsStreakToken }
+        }
+        if (document.uri.scheme === 'vscode-notebook-cell') {
+            request.fileContextOverride = extractFileContextInNotebooks(document, position)
+        }
+        const requestStartTime = Date.now()
+        const statusBar = CodeWhispererStatusBarManager.instance
+
+        // Only track telemetry if enabled
+        TelemetryHelper.instance.setInvokeSuggestionStartTime()
+        TelemetryHelper.instance.setPreprocessEndTime()
+        TelemetryHelper.instance.setSdkApiCallStartTime()
+
+        try {
+            // Show UI indicators only if UI is enabled
+            if (options.showUi) {
+                await statusBar.setLoading()
+            }
+
+            // Handle first request
+            this.logger.info('Sending inline completion request: %O', {
+                method: inlineCompletionWithReferencesRequestType.method,
+                request: {
+                    textDocument: request.textDocument,
+                    position: request.position,
+                    context: request.context,
+                    nextToken: request.partialResultToken,
+                },
+            })
+            const t0 = Date.now()
+
+            // Best effort estimate of deletion
+            const isTriggerByDeletion = documentEventListener.isLastEventDeletion(document.uri.fsPath)
+
+            const ps: Promise<InlineCompletionListWithReferences>[] = []
+            /**
+             * IsTriggerByDeletion is to prevent user deletion invoking Completions.
+             * PartialResultToken is not a hack for now since only Edits suggestion use partialResultToken across different calls of [getAllRecommendations],
+             * 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 && !EditSuggestionState.isEditSuggestionActive()) {
+                const completionPromise: Promise<InlineCompletionListWithReferences> = languageClient.sendRequest(
+                    inlineCompletionWithReferencesRequestType.method,
+                    request,
+                    token
+                )
+                ps.push(completionPromise)
+            }
+
+            /**
+             * Though Edit request is sent on keystrokes everytime, the language server will execute the request in a debounced manner so that it won't be immediately executed.
+             */
+            const editPromise: Promise<InlineCompletionListWithReferences> = languageClient.sendRequest(
+                editCompletionRequestType.method,
+                request,
+                token
+            )
+            ps.push(editPromise)
+
+            /**
+             * First come first serve, ideally we should simply return the first response returned. However there are some caviar here because either
+             * (1) promise might be returned early without going through service
+             * (2) some users are not enabled with edits suggestion, therefore service will return empty result without passing through the model
+             * With the scenarios listed above or others, it's possible that 1 promise will ALWAYS win the race and users will NOT get any suggestion back.
+             * This is the hack to return first "NON-EMPTY" response
+             */
+            let result = await Promise.race(ps)
+            if (ps.length > 1 && result.items.length === 0) {
+                for (const p of ps) {
+                    const r = await p
+                    if (r.items.length > 0) {
+                        result = r
+                    }
+                }
+            }
+
+            this.logger.info('Received inline completion response from LSP: %O', {
+                sessionId: result.sessionId,
+                latency: Date.now() - t0,
+                itemCount: result.items?.length || 0,
+                items: result.items?.map((item) => ({
+                    itemId: item.itemId,
+                    insertText:
+                        (typeof item.insertText === 'string' ? item.insertText : String(item.insertText))?.substring(
+                            0,
+                            50
+                        ) + '...',
+                })),
+            })
+
+            if (result.items.length > 0 && result.items[0].isInlineEdit === false) {
+                if (isTriggerByDeletion) {
+                    this.logger.info(`Suggestions were discarded; reason: triggerByDeletion`)
+                    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()
+                    if (!session) {
+                        this.logger.error(`Suggestions were discarded; reason: undefined conflicting session`)
+                        return []
+                    }
+                    const params: LogInlineCompletionSessionResultsParams = {
+                        sessionId: session.sessionId,
+                        completionSessionResult: Object.fromEntries(
+                            result.items.map((item) => [
+                                item.itemId,
+                                {
+                                    seen: false,
+                                    accepted: false,
+                                    discarded: true,
+                                },
+                            ])
+                        ),
+                    }
+                    void languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
+                    this.sessionManager.clear()
+                    this.logger.info(
+                        'Suggetions were discarded; reason: active edit suggestion displayed longer than 1 second'
+                    )
+                    return []
+                } else if (EditSuggestionState.isEditSuggestionActive()) {
+                    // discard the current edit suggestion if its display time is less than 1 sec
+                    await commands.executeCommand('aws.amazonq.inline.rejectEdit', true)
+                    this.logger.info('Discarding active edit suggestion displaying less than 1 second')
+                }
+            }
+
+            TelemetryHelper.instance.setSdkApiCallEndTime()
+            TelemetryHelper.instance.setSessionId(result.sessionId)
+            if (result.items.length > 0 && result.items[0].itemId !== undefined) {
+                TelemetryHelper.instance.setFirstResponseRequestId(result.items[0].itemId as string)
+            }
+            TelemetryHelper.instance.setFirstSuggestionShowTime()
+
+            const firstCompletionDisplayLatency = Date.now() - requestStartTime
+            this.sessionManager.startSession(
+                result.sessionId,
+                result.items,
+                requestStartTime,
+                position,
+                firstCompletionDisplayLatency
+            )
+
+            const isInlineEdit = result.items.some((item) => item.isInlineEdit)
+
+            // TODO: question, is it possible that the first request returns empty suggestion but has non-empty next token?
+            if (result.partialResultToken) {
+                let logstr = `found non null next token; `
+                if (!isInlineEdit) {
+                    // If the suggestion is COMPLETIONS and there are more results to fetch, handle them in the background
+                    logstr += 'Suggestion type is COMPLETIONS. Start pulling more items'
+                    this.processRemainingRequests(languageClient, request, result, token).catch((error) => {
+                        languageClient.warn(`Error when getting suggestions: ${error}`)
+                    })
+                } else {
+                    // Skip fetching for more items if the suggesion is EDITS. If it is EDITS suggestion, only fetching for more
+                    // suggestions when the user start to accept a suggesion.
+                    // Save editsStreakPartialResultToken for the next EDITS suggestion trigger if user accepts.
+                    logstr += 'Suggestion type is EDITS. Skip pulling more items'
+                    this.sessionManager.updateActiveEditsStreakToken(result.partialResultToken)
+                }
+
+                this.logger.info(logstr)
+            }
+        } catch (error: any) {
+            this.logger.error('Error getting recommendations: %O', error)
+            // bearer token expired
+            if (error.data && error.data.awsErrorCode === 'E_AMAZON_Q_CONNECTION_EXPIRED') {
+                // ref: https://github.com/aws/aws-toolkit-vscode/blob/amazonq/v1.74.0/packages/core/src/codewhisperer/service/inlineCompletionService.ts#L104
+                // show re-auth once if connection expired
+                if (AuthUtil.instance.isConnectionExpired()) {
+                    await AuthUtil.instance.notifyReauthenticate(isAutoTrigger)
+                } else {
+                    // get a new bearer token, if this failed, the connection will be marked as expired.
+                    // new tokens will be synced per 10 seconds in auth.startTokenRefreshInterval
+                    await AuthUtil.instance.getBearerToken()
+                }
+            }
+            return []
+        } finally {
+            // Remove all UI indicators if UI is enabled
+            if (options.showUi) {
+                void statusBar.refreshStatusBar() // effectively "stop loading"
+            }
+        }
+    }
+
+    private async processRemainingRequests(
+        languageClient: BaseLanguageClient,
+        initialRequest: InlineCompletionWithReferencesParams,
+        firstResult: InlineCompletionListWithReferences,
+        token: CancellationToken
+    ): Promise<void> {
+        let nextToken = firstResult.partialResultToken
+        while (nextToken) {
+            const request = { ...initialRequest, partialResultToken: nextToken }
+
+            const result = await this.getRecommendationsWithTimeout(languageClient, request, token)
+            // when pagination is in progress, but user has already accepted or rejected an inline completion
+            // then stop pagination
+            if (this.sessionManager.getActiveSession() === undefined || vsCodeState.isCodeWhispererEditing) {
+                break
+            }
+            this.sessionManager.updateSessionSuggestions(result.items)
+            nextToken = result.partialResultToken
+        }
+
+        this.sessionManager.closeSession()
+
+        // refresh inline completion items to render paginated responses
+        // All pagination requests completed
+        TelemetryHelper.instance.setAllPaginationEndTime()
+        TelemetryHelper.instance.tryRecordClientComponentLatency()
+    }
+}
diff --git a/packages/amazonq/src/app/inline/sessionManager.ts b/packages/amazonq/src/app/inline/sessionManager.ts
new file mode 100644
index 00000000000..ef2ee2a84d0
--- /dev/null
+++ b/packages/amazonq/src/app/inline/sessionManager.ts
@@ -0,0 +1,183 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { InlineCompletionItemWithReferences } from '@aws/language-server-runtimes-types'
+import {
+    FileDiagnostic,
+    getDiagnosticsOfCurrentFile,
+    ImportAdderProvider,
+    ReferenceInlineProvider,
+} from 'aws-core-vscode/codewhisperer'
+
+// TODO: add more needed data to the session interface
+export interface CodeWhispererSession {
+    sessionId: string
+    suggestions: InlineCompletionItemWithReferences[]
+    // TODO: might need to convert to enum states
+    isRequestInProgress: boolean
+    requestStartTime: number
+    firstCompletionDisplayLatency?: number
+    startPosition: vscode.Position
+    diagnosticsBeforeAccept: FileDiagnostic | undefined
+    // partialResultToken for the next trigger if user accepts an EDITS suggestion
+    editsStreakPartialResultToken?: number | string
+    triggerOnAcceptance?: boolean
+    // whether any suggestion in this session was displayed on screen
+    displayed: boolean
+    // timestamp when the suggestion was last visible
+    lastVisibleTime: number
+}
+
+export class SessionManager {
+    private activeSession?: CodeWhispererSession
+    private _acceptedSuggestionCount: number = 0
+    private _refreshedSessions = new Set<string>()
+    private _currentSuggestionIndex = 0
+    constructor() {}
+
+    public startSession(
+        sessionId: string,
+        suggestions: InlineCompletionItemWithReferences[],
+        requestStartTime: number,
+        startPosition: vscode.Position,
+        firstCompletionDisplayLatency?: number
+    ) {
+        const diagnosticsBeforeAccept = getDiagnosticsOfCurrentFile()
+        this.activeSession = {
+            sessionId,
+            suggestions,
+            isRequestInProgress: true,
+            requestStartTime,
+            startPosition,
+            firstCompletionDisplayLatency,
+            diagnosticsBeforeAccept,
+            displayed: false,
+            lastVisibleTime: 0,
+        }
+        this._currentSuggestionIndex = 0
+    }
+
+    public closeSession() {
+        if (!this.activeSession) {
+            return
+        }
+        this.activeSession.isRequestInProgress = false
+    }
+
+    public getActiveSession() {
+        return this.activeSession
+    }
+
+    public updateSessionSuggestions(suggestions: InlineCompletionItemWithReferences[]) {
+        if (!this.activeSession) {
+            return
+        }
+        this.activeSession.suggestions = [...this.activeSession.suggestions, ...suggestions]
+    }
+
+    public getActiveRecommendation(): InlineCompletionItemWithReferences[] {
+        return this.activeSession?.suggestions ?? []
+    }
+
+    public get acceptedSuggestionCount(): number {
+        return this._acceptedSuggestionCount
+    }
+
+    public incrementSuggestionCount() {
+        this._acceptedSuggestionCount += 1
+    }
+
+    public updateActiveEditsStreakToken(partialResultToken: number | string) {
+        if (!this.activeSession) {
+            return
+        }
+        this.activeSession.editsStreakPartialResultToken = partialResultToken
+    }
+
+    public clear() {
+        this.activeSession = undefined
+        this._currentSuggestionIndex = 0
+        this.clearReferenceInlineHintsAndImportHints()
+    }
+
+    // re-render the session ghost text to display paginated responses once per completed session
+    public async maybeRefreshSessionUx() {
+        if (
+            this.activeSession &&
+            !this.activeSession.isRequestInProgress &&
+            !this._refreshedSessions.has(this.activeSession.sessionId)
+        ) {
+            await vscode.commands.executeCommand('editor.action.inlineSuggest.hide')
+            await vscode.commands.executeCommand('editor.action.inlineSuggest.trigger')
+            if (this._refreshedSessions.size > 1000) {
+                this._refreshedSessions.clear()
+            }
+            this._refreshedSessions.add(this.activeSession.sessionId)
+        }
+    }
+
+    public onNextSuggestion() {
+        if (this.activeSession?.suggestions && this.activeSession?.suggestions.length > 0) {
+            this._currentSuggestionIndex = (this._currentSuggestionIndex + 1) % this.activeSession.suggestions.length
+            this.updateCodeReferenceAndImports()
+        }
+    }
+
+    public onPrevSuggestion() {
+        if (this.activeSession?.suggestions && this.activeSession.suggestions.length > 0) {
+            this._currentSuggestionIndex =
+                (this._currentSuggestionIndex - 1 + this.activeSession.suggestions.length) %
+                this.activeSession.suggestions.length
+            this.updateCodeReferenceAndImports()
+        }
+    }
+
+    public checkInlineSuggestionVisibility() {
+        if (this.activeSession) {
+            this.activeSession.displayed = true
+            this.activeSession.lastVisibleTime = Date.now()
+        }
+    }
+
+    private clearReferenceInlineHintsAndImportHints() {
+        ReferenceInlineProvider.instance.removeInlineReference()
+        ImportAdderProvider.instance.clear()
+    }
+
+    // Ideally use this API handleDidShowCompletionItem
+    // https://github.com/microsoft/vscode/blob/main/src/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts#L83
+    updateCodeReferenceAndImports() {
+        try {
+            this.clearReferenceInlineHintsAndImportHints()
+            if (
+                this.activeSession?.suggestions &&
+                this.activeSession.suggestions[this._currentSuggestionIndex] &&
+                this.activeSession.suggestions.length > 0
+            ) {
+                const reference = this.activeSession.suggestions[this._currentSuggestionIndex].references
+                const insertText = this.activeSession.suggestions[this._currentSuggestionIndex].insertText
+                if (reference && reference.length > 0) {
+                    const insertTextStr =
+                        typeof insertText === 'string' ? insertText : (insertText.value ?? String(insertText))
+
+                    ReferenceInlineProvider.instance.setInlineReference(
+                        this.activeSession.startPosition.line,
+                        insertTextStr,
+                        reference
+                    )
+                }
+                if (vscode.window.activeTextEditor) {
+                    ImportAdderProvider.instance.onShowRecommendation(
+                        vscode.window.activeTextEditor.document,
+                        this.activeSession.startPosition.line,
+                        this.activeSession.suggestions[this._currentSuggestionIndex]
+                    )
+                }
+            }
+        } catch {
+            // do nothing as this is not critical path
+        }
+    }
+}
diff --git a/packages/amazonq/src/app/inline/stateTracker/lineTracker.ts b/packages/amazonq/src/app/inline/stateTracker/lineTracker.ts
new file mode 100644
index 00000000000..58bee329a40
--- /dev/null
+++ b/packages/amazonq/src/app/inline/stateTracker/lineTracker.ts
@@ -0,0 +1,178 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { editorUtilities, setContext } from 'aws-core-vscode/shared'
+
+export interface LineSelection {
+    anchor: number
+    active: number
+}
+
+export interface LinesChangeEvent {
+    readonly editor: vscode.TextEditor | undefined
+    readonly selections: LineSelection[] | undefined
+
+    readonly reason: 'editor' | 'selection' | 'content'
+}
+
+/**
+ * This class providees a single interface to manage and access users' "line" selections
+ * Callers could use it by subscribing onDidChangeActiveLines to do UI updates or logic needed to be executed when line selections get changed
+ */
+export class LineTracker implements vscode.Disposable {
+    private _onDidChangeActiveLines = new vscode.EventEmitter<LinesChangeEvent>()
+    get onDidChangeActiveLines(): vscode.Event<LinesChangeEvent> {
+        return this._onDidChangeActiveLines.event
+    }
+
+    private _editor: vscode.TextEditor | undefined
+    private _disposable: vscode.Disposable | undefined
+
+    private _selections: LineSelection[] | undefined
+    get selections(): LineSelection[] | undefined {
+        return this._selections
+    }
+
+    private _onReady: vscode.EventEmitter<void> = new vscode.EventEmitter<void>()
+    get onReady(): vscode.Event<void> {
+        return this._onReady.event
+    }
+
+    private _ready: boolean = false
+    get isReady() {
+        return this._ready
+    }
+
+    constructor() {
+        this._disposable = vscode.Disposable.from(
+            vscode.window.onDidChangeActiveTextEditor(async (e) => {
+                await this.onActiveTextEditorChanged(e)
+            }),
+            vscode.window.onDidChangeTextEditorSelection(async (e) => {
+                await this.onTextEditorSelectionChanged(e)
+            }),
+            vscode.workspace.onDidChangeTextDocument((e) => {
+                this.onContentChanged(e)
+            })
+        )
+
+        queueMicrotask(async () => await this.onActiveTextEditorChanged(vscode.window.activeTextEditor))
+    }
+
+    dispose() {
+        this._disposable?.dispose()
+    }
+
+    ready() {
+        if (this._ready) {
+            throw new Error('Linetracker is already activated')
+        }
+
+        this._ready = true
+        queueMicrotask(() => this._onReady.fire())
+    }
+
+    // @VisibleForTesting
+    async onActiveTextEditorChanged(editor: vscode.TextEditor | undefined) {
+        if (editor === this._editor) {
+            return
+        }
+
+        this._editor = editor
+        this._selections = toLineSelections(editor?.selections)
+        if (this._selections && this._selections[0]) {
+            const s = this._selections.map((item) => item.active + 1)
+            await setContext('codewhisperer.activeLine', s)
+        }
+
+        this.notifyLinesChanged('editor')
+    }
+
+    // @VisibleForTesting
+    async onTextEditorSelectionChanged(e: vscode.TextEditorSelectionChangeEvent) {
+        // If this isn't for our cached editor and its not a real editor -- kick out
+        if (this._editor !== e.textEditor && !editorUtilities.isTextEditor(e.textEditor)) {
+            return
+        }
+
+        const selections = toLineSelections(e.selections)
+        if (this._editor === e.textEditor && this.includes(selections)) {
+            return
+        }
+
+        this._editor = e.textEditor
+        this._selections = selections
+        if (this._selections && this._selections[0]) {
+            const s = this._selections.map((item) => item.active + 1)
+            await setContext('codewhisperer.activeLine', s)
+        }
+
+        this.notifyLinesChanged('selection')
+    }
+
+    // @VisibleForTesting
+    onContentChanged(e: vscode.TextDocumentChangeEvent) {
+        const editor = vscode.window.activeTextEditor
+        if (e.document === editor?.document && e.contentChanges.length > 0 && editorUtilities.isTextEditor(editor)) {
+            this._editor = editor
+            this._selections = toLineSelections(this._editor?.selections)
+
+            this.notifyLinesChanged('content')
+        }
+    }
+
+    notifyLinesChanged(reason: 'editor' | 'selection' | 'content') {
+        const e: LinesChangeEvent = { editor: this._editor, selections: this.selections, reason: reason }
+        this._onDidChangeActiveLines.fire(e)
+    }
+
+    includes(selections: LineSelection[]): boolean
+    includes(line: number, options?: { activeOnly: boolean }): boolean
+    includes(lineOrSelections: number | LineSelection[], options?: { activeOnly: boolean }): boolean {
+        if (typeof lineOrSelections !== 'number') {
+            return isIncluded(lineOrSelections, this._selections)
+        }
+
+        if (this._selections === undefined || this._selections.length === 0) {
+            return false
+        }
+
+        const line = lineOrSelections
+        const activeOnly = options?.activeOnly ?? true
+
+        for (const selection of this._selections) {
+            if (
+                line === selection.active ||
+                (!activeOnly &&
+                    ((selection.anchor >= line && line >= selection.active) ||
+                        (selection.active >= line && line >= selection.anchor)))
+            ) {
+                return true
+            }
+        }
+        return false
+    }
+}
+
+function isIncluded(selections: LineSelection[] | undefined, within: LineSelection[] | undefined): boolean {
+    if (selections === undefined && within === undefined) {
+        return true
+    }
+    if (selections === undefined || within === undefined || selections.length !== within.length) {
+        return false
+    }
+
+    return selections.every((s, i) => {
+        const match = within[i]
+        return s.active === match.active && s.anchor === match.anchor
+    })
+}
+
+function toLineSelections(selections: readonly vscode.Selection[]): LineSelection[]
+function toLineSelections(selections: readonly vscode.Selection[] | undefined): LineSelection[] | undefined
+function toLineSelections(selections: readonly vscode.Selection[] | undefined) {
+    return selections?.map((s) => ({ active: s.active.line, anchor: s.anchor.line }))
+}
diff --git a/packages/amazonq/src/app/inline/telemetryHelper.ts b/packages/amazonq/src/app/inline/telemetryHelper.ts
new file mode 100644
index 00000000000..41db4c7469a
--- /dev/null
+++ b/packages/amazonq/src/app/inline/telemetryHelper.ts
@@ -0,0 +1,162 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { AuthUtil, getSelectedCustomization } from 'aws-core-vscode/codewhisperer'
+import { CodewhispererLanguage } from 'aws-core-vscode/shared'
+import { CodewhispererTriggerType, telemetry } from 'aws-core-vscode/telemetry'
+import { InlineCompletionTriggerKind } from 'vscode'
+
+export class TelemetryHelper {
+    // Variables needed for client component latency
+    private _invokeSuggestionStartTime = 0
+    private _preprocessEndTime = 0
+    private _sdkApiCallStartTime = 0
+    private _sdkApiCallEndTime = 0
+    private _allPaginationEndTime = 0
+    private _firstSuggestionShowTime = 0
+    private _firstResponseRequestId = ''
+    private _sessionId = ''
+    private _language: CodewhispererLanguage = 'java'
+    private _triggerType: CodewhispererTriggerType = 'OnDemand'
+
+    constructor() {}
+
+    static #instance: TelemetryHelper
+
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+
+    public resetClientComponentLatencyTime() {
+        this._invokeSuggestionStartTime = 0
+        this._preprocessEndTime = 0
+        this._sdkApiCallStartTime = 0
+        this._sdkApiCallEndTime = 0
+        this._firstSuggestionShowTime = 0
+        this._allPaginationEndTime = 0
+        this._firstResponseRequestId = ''
+    }
+
+    public setInvokeSuggestionStartTime() {
+        this.resetClientComponentLatencyTime()
+        this._invokeSuggestionStartTime = Date.now()
+    }
+
+    get invokeSuggestionStartTime(): number {
+        return this._invokeSuggestionStartTime
+    }
+
+    public setPreprocessEndTime() {
+        this._preprocessEndTime = Date.now()
+    }
+
+    get preprocessEndTime(): number {
+        return this._preprocessEndTime
+    }
+
+    public setSdkApiCallStartTime() {
+        if (this._sdkApiCallStartTime === 0) {
+            this._sdkApiCallStartTime = Date.now()
+        }
+    }
+
+    get sdkApiCallStartTime(): number {
+        return this._sdkApiCallStartTime
+    }
+
+    public setSdkApiCallEndTime() {
+        if (this._sdkApiCallEndTime === 0 && this._sdkApiCallStartTime !== 0) {
+            this._sdkApiCallEndTime = Date.now()
+        }
+    }
+
+    get sdkApiCallEndTime(): number {
+        return this._sdkApiCallEndTime
+    }
+
+    public setAllPaginationEndTime() {
+        if (this._allPaginationEndTime === 0 && this._sdkApiCallEndTime !== 0) {
+            this._allPaginationEndTime = Date.now()
+        }
+    }
+
+    get allPaginationEndTime(): number {
+        return this._allPaginationEndTime
+    }
+
+    public setFirstSuggestionShowTime() {
+        if (this._firstSuggestionShowTime === 0 && this._sdkApiCallEndTime !== 0) {
+            this._firstSuggestionShowTime = Date.now()
+        }
+    }
+
+    get firstSuggestionShowTime(): number {
+        return this._firstSuggestionShowTime
+    }
+
+    public setFirstResponseRequestId(requestId: string) {
+        if (this._firstResponseRequestId === '') {
+            this._firstResponseRequestId = requestId
+        }
+    }
+
+    get firstResponseRequestId(): string {
+        return this._firstResponseRequestId
+    }
+
+    public setSessionId(sessionId: string) {
+        if (this._sessionId === '') {
+            this._sessionId = sessionId
+        }
+    }
+
+    get sessionId(): string {
+        return this._sessionId
+    }
+
+    public setLanguage(language: CodewhispererLanguage) {
+        this._language = language
+    }
+
+    get language(): CodewhispererLanguage {
+        return this._language
+    }
+
+    public setTriggerType(triggerType: InlineCompletionTriggerKind) {
+        if (triggerType === InlineCompletionTriggerKind.Invoke) {
+            this._triggerType = 'OnDemand'
+        } else if (triggerType === InlineCompletionTriggerKind.Automatic) {
+            this._triggerType = 'AutoTrigger'
+        }
+    }
+
+    get triggerType(): string {
+        return this._triggerType
+    }
+
+    // report client component latency after all pagination call finish
+    // and at least one suggestion is shown to the user
+    public tryRecordClientComponentLatency() {
+        if (this._firstSuggestionShowTime === 0 || this._allPaginationEndTime === 0) {
+            return
+        }
+        telemetry.codewhisperer_clientComponentLatency.emit({
+            codewhispererAllCompletionsLatency: this._allPaginationEndTime - this._sdkApiCallStartTime,
+            codewhispererCompletionType: 'Line',
+            codewhispererCredentialFetchingLatency: 0, // no longer relevant, because we don't re-build the sdk. Flare already has that set
+            codewhispererCustomizationArn: getSelectedCustomization().arn,
+            codewhispererEndToEndLatency: this._firstSuggestionShowTime - this._invokeSuggestionStartTime,
+            codewhispererFirstCompletionLatency: this._sdkApiCallEndTime - this._sdkApiCallStartTime,
+            codewhispererLanguage: this._language,
+            codewhispererPostprocessingLatency: this._firstSuggestionShowTime - this._sdkApiCallEndTime,
+            codewhispererPreprocessingLatency: this._preprocessEndTime - this._invokeSuggestionStartTime,
+            codewhispererRequestId: this._firstResponseRequestId,
+            codewhispererSessionId: this._sessionId,
+            codewhispererTriggerType: this._triggerType,
+            credentialStartUrl: AuthUtil.instance.startUrl,
+            result: 'Succeeded',
+        })
+    }
+}
diff --git a/packages/amazonq/src/app/inline/tutorials/inlineChatTutorialAnnotation.ts b/packages/amazonq/src/app/inline/tutorials/inlineChatTutorialAnnotation.ts
new file mode 100644
index 00000000000..1208b4766af
--- /dev/null
+++ b/packages/amazonq/src/app/inline/tutorials/inlineChatTutorialAnnotation.ts
@@ -0,0 +1,58 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { InlineTutorialAnnotation } from './inlineTutorialAnnotation'
+import { globals } from 'aws-core-vscode/shared'
+
+export class InlineChatTutorialAnnotation {
+    private enabled: boolean = true
+
+    constructor(private readonly inlineTutorialAnnotation: InlineTutorialAnnotation) {
+        globals.context.subscriptions.push(
+            vscode.window.onDidChangeTextEditorSelection(async ({ selections, textEditor }) => {
+                let showShow = false
+
+                if (this.enabled) {
+                    for (const selection of selections) {
+                        if (selection.end.line === selection.start.line + 1 && selection.end.character === 0) {
+                            // dont show if the selection is just a newline
+                        } else if (selection.start.line !== selection.end.line) {
+                            showShow = true
+                            break
+                        }
+                    }
+                }
+
+                await this.setVisible(textEditor, showShow)
+            }, this)
+        )
+    }
+
+    private async setVisible(editor: vscode.TextEditor, visible: boolean) {
+        let needsRefresh: boolean
+        if (visible) {
+            needsRefresh = await this.inlineTutorialAnnotation.tryShowInlineHint()
+        } else {
+            needsRefresh = await this.inlineTutorialAnnotation.tryHideInlineHint()
+        }
+        if (needsRefresh) {
+            await this.inlineTutorialAnnotation.refresh(editor, 'codewhisperer')
+        }
+    }
+
+    async hide(editor: vscode.TextEditor) {
+        await this.setVisible(editor, false)
+    }
+
+    enable() {
+        this.enabled = true
+    }
+
+    async disable(editor: vscode.TextEditor) {
+        this.enabled = false
+        await this.setVisible(editor, false)
+    }
+}
diff --git a/packages/amazonq/src/app/inline/tutorials/inlineTutorialAnnotation.ts b/packages/amazonq/src/app/inline/tutorials/inlineTutorialAnnotation.ts
new file mode 100644
index 00000000000..ad0807df94c
--- /dev/null
+++ b/packages/amazonq/src/app/inline/tutorials/inlineTutorialAnnotation.ts
@@ -0,0 +1,519 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as os from 'os'
+import { AnnotationChangeSource, AuthUtil, inlinehintKey, runtimeLanguageContext } from 'aws-core-vscode/codewhisperer'
+import { editorUtilities, getLogger, globals, setContext, vscodeUtilities } from 'aws-core-vscode/shared'
+import { LinesChangeEvent, LineSelection, LineTracker } from '../stateTracker/lineTracker'
+import { telemetry } from 'aws-core-vscode/telemetry'
+import { cancellableDebounce } from 'aws-core-vscode/utils'
+import { SessionManager } from '../sessionManager'
+
+const case3TimeWindow = 30000 // 30 seconds
+
+const maxSmallIntegerV8 = 2 ** 30 // Max number that can be stored in V8's smis (small integers)
+
+function fromId(id: string | undefined, sessionManager: SessionManager): AnnotationState | undefined {
+    switch (id) {
+        case AutotriggerState.id:
+            return new AutotriggerState(sessionManager)
+        case PressTabState.id:
+            return new AutotriggerState(sessionManager)
+        case ManualtriggerState.id:
+            return new ManualtriggerState()
+        case TryMoreExState.id:
+            return new TryMoreExState()
+        case EndState.id:
+            return new EndState()
+        case InlineChatState.id:
+            return new InlineChatState()
+        default:
+            return undefined
+    }
+}
+
+interface AnnotationState {
+    id: string
+    suppressWhileRunning: boolean
+    decorationRenderOptions?: vscode.ThemableDecorationAttachmentRenderOptions
+
+    text: () => string
+    updateState(changeSource: AnnotationChangeSource, force: boolean): AnnotationState | undefined
+    isNextState(state: AnnotationState | undefined): boolean
+}
+
+/**
+ * case 1: How Cwspr triggers
+ * Trigger Criteria:
+ *  User opens an editor file &&
+ *      CW is not providing a suggestion &&
+ *      User has not accepted any suggestion
+ *
+ * Exit criteria:
+ *  User accepts 1 suggestion
+ *
+ */
+export class AutotriggerState implements AnnotationState {
+    static id = 'codewhisperer_learnmore_case_1'
+    id = AutotriggerState.id
+
+    suppressWhileRunning = true
+    text = () => 'Amazon Q Tip 1/3: Start typing to get suggestions ([ESC] to exit)'
+    static acceptedCount = 0
+
+    constructor(private readonly sessionManager: SessionManager) {}
+
+    updateState(changeSource: AnnotationChangeSource, force: boolean): AnnotationState | undefined {
+        if (AutotriggerState.acceptedCount < this.sessionManager.acceptedSuggestionCount) {
+            return new ManualtriggerState()
+        } else if (this.sessionManager.getActiveRecommendation().length > 0) {
+            return new PressTabState(this.sessionManager)
+        } else {
+            return this
+        }
+    }
+
+    isNextState(state: AnnotationState | undefined): boolean {
+        return state instanceof ManualtriggerState
+    }
+}
+
+/**
+ * case 1-a: Tab to accept
+ * Trigger Criteria:
+ *  Case 1 &&
+ *      Inline suggestion is being shown
+ *
+ * Exit criteria:
+ *  User accepts 1 suggestion
+ */
+export class PressTabState implements AnnotationState {
+    static id = 'codewhisperer_learnmore_case_1a'
+    id = PressTabState.id
+
+    suppressWhileRunning = false
+
+    text = () => 'Amazon Q Tip 1/3: Press [TAB] to accept ([ESC] to exit)'
+
+    constructor(private readonly sessionManager: SessionManager) {}
+
+    updateState(changeSource: AnnotationChangeSource, force: boolean): AnnotationState | undefined {
+        return new AutotriggerState(this.sessionManager).updateState(changeSource, force)
+    }
+
+    isNextState(state: AnnotationState | undefined): boolean {
+        return state instanceof ManualtriggerState
+    }
+}
+
+/**
+ * case 2: Manual trigger
+ * Trigger Criteria:
+ *  User exists case 1 &&
+ *      User navigates to a new line
+ *
+ * Exit criteria:
+ *  User inokes manual trigger shortcut
+ */
+export class ManualtriggerState implements AnnotationState {
+    static id = 'codewhisperer_learnmore_case_2'
+    id = ManualtriggerState.id
+
+    suppressWhileRunning = true
+
+    text = () => {
+        if (os.platform() === 'win32') {
+            return 'Amazon Q Tip 2/3: Invoke suggestions with [Alt] + [C] ([ESC] to exit)'
+        }
+
+        return 'Amazon Q Tip 2/3: Invoke suggestions with [Option] + [C] ([ESC] to exit)'
+    }
+    hasManualTrigger: boolean = false
+    hasValidResponse: boolean = false
+
+    updateState(changeSource: AnnotationChangeSource, force: boolean): AnnotationState | undefined {
+        if (this.hasManualTrigger && this.hasValidResponse) {
+            if (changeSource !== 'codewhisperer') {
+                return new TryMoreExState()
+            } else {
+                return undefined
+            }
+        } else {
+            return this
+        }
+    }
+
+    isNextState(state: AnnotationState | undefined): boolean {
+        return state instanceof TryMoreExState
+    }
+}
+
+/**
+ * case 3: Learn more
+ * Trigger Criteria:
+ *  User exists case 2 &&
+ *      User navigates to a new line
+ *
+ * Exit criteria:
+ *  User accepts or rejects the suggestion
+ */
+export class TryMoreExState implements AnnotationState {
+    static id = 'codewhisperer_learnmore_case_3'
+    id = TryMoreExState.id
+
+    suppressWhileRunning = true
+
+    text = () => 'Amazon Q Tip 3/3: For settings, open the Amazon Q menu from the status bar ([ESC] to exit)'
+    updateState(changeSource: AnnotationChangeSource, force: boolean): AnnotationState {
+        if (force) {
+            return new EndState()
+        }
+        return this
+    }
+
+    isNextState(state: AnnotationState | undefined): boolean {
+        return state instanceof EndState
+    }
+
+    static learnmoeCount: number = 0
+}
+
+export class EndState implements AnnotationState {
+    static id = 'codewhisperer_learnmore_end'
+    id = EndState.id
+
+    suppressWhileRunning = true
+    text = () => ''
+    updateState(changeSource: AnnotationChangeSource, force: boolean): AnnotationState {
+        return this
+    }
+    isNextState(state: AnnotationState): boolean {
+        return false
+    }
+}
+
+export class InlineChatState implements AnnotationState {
+    static id = 'amazonq_annotation_inline_chat'
+    id = InlineChatState.id
+    suppressWhileRunning = false
+
+    text = () => {
+        if (os.platform() === 'darwin') {
+            return 'Amazon Q: Edit \u2318I'
+        }
+        return 'Amazon Q: Edit (Ctrl+I)'
+    }
+    updateState(_changeSource: AnnotationChangeSource, _force: boolean): AnnotationState {
+        return this
+    }
+    isNextState(_state: AnnotationState | undefined): boolean {
+        return false
+    }
+}
+
+/**
+ * There are
+ * - existing users
+ * - new users
+ *   -- new users who has not seen tutorial
+ *   -- new users who has seen tutorial
+ *
+ * "existing users" should have the context key "CODEWHISPERER_AUTO_TRIGGER_ENABLED"
+ * "new users who has seen tutorial" should have the context key "inlineKey" and "CODEWHISPERER_AUTO_TRIGGER_ENABLED"
+ * the remaining grouop of users should belong to "new users who has not seen tutorial"
+ */
+export class InlineTutorialAnnotation implements vscode.Disposable {
+    private readonly _disposable: vscode.Disposable
+    private _editor: vscode.TextEditor | undefined
+
+    private _currentState: AnnotationState
+
+    private readonly cwLineHintDecoration: vscode.TextEditorDecorationType =
+        vscode.window.createTextEditorDecorationType({
+            after: {
+                margin: '0 0 0 3em',
+                // "borderRadius" and "padding" are not available on "after" type of decoration, this is a hack to inject these css prop to "after" content. Refer to https://github.com/microsoft/vscode/issues/68845
+                textDecoration: ';border-radius:0.25rem;padding:0rem 0.5rem;',
+                width: 'fit-content',
+            },
+            rangeBehavior: vscode.DecorationRangeBehavior.OpenOpen,
+        })
+
+    constructor(
+        private readonly lineTracker: LineTracker,
+        private readonly sessionManager: SessionManager
+    ) {
+        const cachedState = fromId(globals.globalState.get<string>(inlinehintKey), sessionManager)
+        const cachedAutotriggerEnabled = globals.globalState.get<boolean>('CODEWHISPERER_AUTO_TRIGGER_ENABLED')
+
+        // new users (has or has not seen tutorial)
+        if (cachedAutotriggerEnabled === undefined || cachedState !== undefined) {
+            this._currentState = cachedState ?? new AutotriggerState(this.sessionManager)
+            getLogger().debug(
+                `codewhisperer: new user login, activating inline tutorial. (autotriggerEnabled=${cachedAutotriggerEnabled}; inlineState=${cachedState?.id})`
+            )
+        } else {
+            this._currentState = new EndState()
+            getLogger().debug(`codewhisperer: existing user login, disabling inline tutorial.`)
+        }
+
+        this._disposable = vscode.Disposable.from(
+            vscodeUtilities.subscribeOnce(this.lineTracker.onReady)(async (_) => {
+                await this.onReady()
+            }),
+            this.lineTracker.onDidChangeActiveLines(async (e) => {
+                await this.onActiveLinesChanged(e)
+            }),
+            AuthUtil.instance.auth.onDidChangeConnectionState(async (e) => {
+                if (e.state !== 'authenticating') {
+                    await this.refresh(vscode.window.activeTextEditor, 'editor')
+                }
+            }),
+            AuthUtil.instance.secondaryAuth.onDidChangeActiveConnection(async () => {
+                await this.refresh(vscode.window.activeTextEditor, 'editor')
+            })
+        )
+    }
+
+    dispose() {
+        this._disposable.dispose()
+    }
+
+    private _isReady: boolean = false
+
+    private async onReady(): Promise<void> {
+        this._isReady = !(this._currentState instanceof EndState)
+        await this._refresh(vscode.window.activeTextEditor, 'editor')
+    }
+
+    async triggered(triggerType: vscode.InlineCompletionTriggerKind): Promise<void> {
+        // TODO: this logic will take ~200ms each trigger, need to root cause and re-enable once it's fixed, or it should only be invoked when the tutorial is actually needed
+        // await telemetry.withTraceId(async () => {
+        //     if (!this._isReady) {
+        //         return
+        //     }
+        //     if (this._currentState instanceof ManualtriggerState) {
+        //         if (
+        //             triggerType === vscode.InlineCompletionTriggerKind.Invoke &&
+        //             this._currentState.hasManualTrigger === false
+        //         ) {
+        //             this._currentState.hasManualTrigger = true
+        //         }
+        //         if (
+        //             this.sessionManager.getActiveRecommendation().length > 0 &&
+        //             this._currentState.hasValidResponse === false
+        //         ) {
+        //             this._currentState.hasValidResponse = true
+        //         }
+        //     }
+        //     await this.refresh(vscode.window.activeTextEditor, 'codewhisperer')
+        // }, TelemetryHelper.instance.traceId)
+    }
+
+    isTutorialDone(): boolean {
+        return this._currentState.id === new EndState().id
+    }
+
+    isInlineChatHint(): boolean {
+        return this._currentState.id === new InlineChatState().id
+    }
+
+    async dismissTutorial() {
+        this._currentState = new EndState()
+        await setContext('aws.codewhisperer.tutorial.workInProgress', false)
+        await globals.globalState.update(inlinehintKey, this._currentState.id)
+    }
+
+    /**
+     * Trys to show the inline hint, if the tutorial is not finished it will not be shown
+     */
+    async tryShowInlineHint(): Promise<boolean> {
+        if (this.isTutorialDone()) {
+            this._isReady = true
+            this._currentState = new InlineChatState()
+            return true
+        }
+        return false
+    }
+
+    async tryHideInlineHint(): Promise<boolean> {
+        if (this._currentState instanceof InlineChatState) {
+            this._currentState = new EndState()
+            return true
+        }
+        return false
+    }
+
+    private async onActiveLinesChanged(e: LinesChangeEvent) {
+        if (!this._isReady) {
+            return
+        }
+
+        this.clear()
+
+        await this.refresh(e.editor, e.reason)
+    }
+
+    clear() {
+        this._editor?.setDecorations(this.cwLineHintDecoration, [])
+    }
+
+    async refresh(editor: vscode.TextEditor | undefined, source: AnnotationChangeSource, force?: boolean) {
+        if (force) {
+            this.refreshDebounced.cancel()
+            await this._refresh(editor, source, true)
+        } else {
+            await this.refreshDebounced.promise(editor, source)
+        }
+    }
+
+    private readonly refreshDebounced = cancellableDebounce(
+        async (editor: vscode.TextEditor | undefined, source: AnnotationChangeSource, force?: boolean) => {
+            await this._refresh(editor, source, force)
+        },
+        250
+    )
+
+    private async _refresh(editor: vscode.TextEditor | undefined, source: AnnotationChangeSource, force?: boolean) {
+        if (!this._isReady) {
+            this.clear()
+            return
+        }
+
+        if (this.isTutorialDone()) {
+            this.clear()
+            return
+        }
+
+        if (editor === undefined && this._editor === undefined) {
+            this.clear()
+            return
+        }
+
+        const selections = this.lineTracker.selections
+        if (editor === undefined || selections === undefined || !editorUtilities.isTextEditor(editor)) {
+            this.clear()
+            return
+        }
+
+        if (this._editor !== editor) {
+            // Clear any annotations on the previously active editor
+            this.clear()
+            this._editor = editor
+        }
+
+        // Make sure the editor hasn't died since the await above and that we are still on the same line(s)
+        if (editor.document === undefined || !this.lineTracker.includes(selections)) {
+            this.clear()
+            return
+        }
+
+        if (!AuthUtil.instance.isConnectionValid()) {
+            this.clear()
+            return
+        }
+
+        // Disable Tips when language is not supported by Amazon Q.
+        if (!runtimeLanguageContext.isLanguageSupported(editor.document)) {
+            return
+        }
+
+        await this.updateDecorations(editor, selections, source, force)
+    }
+
+    private async updateDecorations(
+        editor: vscode.TextEditor,
+        lines: LineSelection[],
+        source: AnnotationChangeSource,
+        force?: boolean
+    ) {
+        const range = editor.document.validateRange(
+            new vscode.Range(lines[0].active, maxSmallIntegerV8, lines[0].active, maxSmallIntegerV8)
+        )
+
+        const decorationOptions = this.getInlineDecoration(editor, lines, source, force) as
+            | vscode.DecorationOptions
+            | undefined
+
+        if (decorationOptions === undefined) {
+            this.clear()
+            await setContext('aws.codewhisperer.tutorial.workInProgress', false)
+            return
+        } else if (this.isTutorialDone()) {
+            // special case
+            // Endstate is meaningless and doesnt need to be rendered
+            this.clear()
+            await this.dismissTutorial()
+            return
+        } else if (decorationOptions.renderOptions?.after?.contentText === new TryMoreExState().text()) {
+            // special case
+            // case 3 exit criteria is to fade away in 30s
+            setTimeout(async () => {
+                await this.refresh(editor, source, true)
+            }, case3TimeWindow)
+        }
+
+        decorationOptions.range = range
+
+        await globals.globalState.update(inlinehintKey, this._currentState.id)
+        if (!this.isInlineChatHint()) {
+            await setContext('aws.codewhisperer.tutorial.workInProgress', true)
+        }
+        editor.setDecorations(this.cwLineHintDecoration, [decorationOptions])
+    }
+
+    getInlineDecoration(
+        editor: vscode.TextEditor,
+        lines: LineSelection[],
+        source: AnnotationChangeSource,
+        force?: boolean
+    ): Partial<vscode.DecorationOptions> | undefined {
+        const isCWRunning = this.sessionManager.getActiveSession()?.isRequestInProgress ?? false
+
+        const textOptions: vscode.ThemableDecorationAttachmentRenderOptions = {
+            contentText: '',
+            fontWeight: 'normal',
+            fontStyle: 'normal',
+            textDecoration: 'none',
+            color: 'var(--vscode-editor-background)',
+            backgroundColor: 'var(--vscode-foreground)',
+        }
+
+        if (isCWRunning && this._currentState.suppressWhileRunning) {
+            return undefined
+        }
+
+        const updatedState: AnnotationState | undefined = this._currentState.updateState(source, force ?? false)
+
+        if (updatedState === undefined) {
+            return undefined
+        }
+
+        if (this._currentState.isNextState(updatedState)) {
+            // special case because PressTabState is part of case_1 (1a) which possibly jumps directly from case_1a to case_2 and miss case_1
+            if (this._currentState instanceof PressTabState) {
+                telemetry.ui_click.emit({ elementId: AutotriggerState.id, passive: true })
+            }
+            telemetry.ui_click.emit({ elementId: this._currentState.id, passive: true })
+        }
+
+        // update state
+        this._currentState = updatedState
+
+        // take snapshot of accepted session so that we can compre if there is delta -> users accept 1 suggestion after seeing this state
+        AutotriggerState.acceptedCount = this.sessionManager.acceptedSuggestionCount
+
+        textOptions.contentText = this._currentState.text()
+
+        return {
+            renderOptions: { after: textOptions },
+        }
+    }
+
+    public get currentState(): AnnotationState {
+        return this._currentState
+    }
+}
diff --git a/packages/amazonq/src/app/inline/webViewPanel.ts b/packages/amazonq/src/app/inline/webViewPanel.ts
new file mode 100644
index 00000000000..2effa94429c
--- /dev/null
+++ b/packages/amazonq/src/app/inline/webViewPanel.ts
@@ -0,0 +1,450 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+/* eslint-disable no-restricted-imports */
+import fs from 'fs'
+import { getLogger } from 'aws-core-vscode/shared'
+
+/**
+ * Interface for JSON request log data
+ */
+interface RequestLogEntry {
+    timestamp: string
+    request: string
+    response: string
+    endpoint: string
+    error: string
+    requestId: string
+    responseCode: number
+    applicationLogs?: {
+        rts?: string[]
+        ceo?: string[]
+        [key: string]: string[] | undefined
+    }
+    latency?: number
+    latencyBreakdown?: {
+        rts?: number
+        ceo?: number
+        [key: string]: number | undefined
+    }
+    miscellaneous?: any
+}
+
+/**
+ * Manages the webview panel for displaying insert text content and request logs
+ */
+export class NextEditPredictionPanel implements vscode.Disposable {
+    public static readonly viewType = 'nextEditPrediction'
+
+    private static instance: NextEditPredictionPanel | undefined
+    private panel: vscode.WebviewPanel | undefined
+    private disposables: vscode.Disposable[] = []
+    private statusBarItem: vscode.StatusBarItem
+    private isVisible = false
+    private fileWatcher: vscode.FileSystemWatcher | undefined
+    private requestLogs: RequestLogEntry[] = []
+    private logFilePath = '/tmp/request_log.jsonl'
+    private fileReadTimeout: NodeJS.Timeout | undefined
+
+    private constructor() {
+        // Create status bar item - higher priority (1) to ensure visibility
+        this.statusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, 1)
+        this.statusBarItem.text = '$(eye) NEP' // Add icon for better visibility
+        this.statusBarItem.tooltip = 'Toggle Next Edit Prediction Panel'
+        this.statusBarItem.command = 'aws.amazonq.toggleNextEditPredictionPanel'
+        this.statusBarItem.show()
+
+        // Register command for toggling the panel
+        this.disposables.push(
+            vscode.commands.registerCommand('aws.amazonq.toggleNextEditPredictionPanel', () => {
+                this.toggle()
+            })
+        )
+    }
+
+    /**
+     * Get or create the NextEditPredictionPanel instance
+     */
+    public static getInstance(): NextEditPredictionPanel {
+        if (!NextEditPredictionPanel.instance) {
+            NextEditPredictionPanel.instance = new NextEditPredictionPanel()
+        }
+        return NextEditPredictionPanel.instance
+    }
+
+    /**
+     * Setup file watcher to monitor the request log file
+     */
+    private setupFileWatcher(): void {
+        if (this.fileWatcher) {
+            return
+        }
+
+        try {
+            // Create the watcher for the specific file
+            this.fileWatcher = vscode.workspace.createFileSystemWatcher(this.logFilePath)
+
+            // When file is changed, read it after a delay
+            this.fileWatcher.onDidChange(() => {
+                this.scheduleFileRead()
+            })
+
+            // When file is created, read it after a delay
+            this.fileWatcher.onDidCreate(() => {
+                this.scheduleFileRead()
+            })
+
+            this.disposables.push(this.fileWatcher)
+
+            // Initial read of the file if it exists
+            if (fs.existsSync(this.logFilePath)) {
+                this.scheduleFileRead()
+            }
+
+            getLogger('nextEditPrediction').info(`File watcher set up for ${this.logFilePath}`)
+        } catch (error) {
+            getLogger('nextEditPrediction').error(`Error setting up file watcher: ${error}`)
+        }
+    }
+
+    /**
+     * Schedule file read with a delay to ensure file is fully written
+     */
+    private scheduleFileRead(): void {
+        // Clear any existing timeout
+        if (this.fileReadTimeout) {
+            clearTimeout(this.fileReadTimeout)
+        }
+
+        // Schedule new read after 1 second delay
+        this.fileReadTimeout = setTimeout(() => {
+            this.readRequestLogFile()
+        }, 1000)
+    }
+
+    /**
+     * Read the request log file and update the panel content
+     */
+    private readRequestLogFile(): void {
+        getLogger('nextEditPrediction').info(`Attempting to read log file: ${this.logFilePath}`)
+        try {
+            if (!fs.existsSync(this.logFilePath)) {
+                getLogger('nextEditPrediction').info(`Log file does not exist: ${this.logFilePath}`)
+                return
+            }
+
+            const content = fs.readFileSync(this.logFilePath, 'utf8')
+            this.requestLogs = []
+
+            // Process JSONL format (one JSON object per line)
+            const lines = content.split('\n').filter((line: string) => line.trim() !== '')
+            for (let i = 0; i < lines.length; i++) {
+                const line = lines[i].trim()
+                try {
+                    // Try to parse the JSON, handling potential trailing characters
+                    let jsonString = line
+
+                    // Find the last valid JSON by looking for the last closing brace/bracket
+                    const lastClosingBrace = line.lastIndexOf('}')
+                    const lastClosingBracket = line.lastIndexOf(']')
+                    const lastValidChar = Math.max(lastClosingBrace, lastClosingBracket)
+
+                    if (lastValidChar > 0 && lastValidChar < line.length - 1) {
+                        // If there are characters after the last valid JSON ending, trim them
+                        jsonString = line.substring(0, lastValidChar + 1)
+                        getLogger('nextEditPrediction').info(`Trimmed extra characters from line ${i + 1}`)
+                    }
+
+                    // Step 1: Parse the JSON string to get an object
+                    const parsed = JSON.parse(jsonString)
+                    // Step 2: Stringify the object to normalize it
+                    const normalized = JSON.stringify(parsed)
+                    // Step 3: Parse the normalized string back to an object
+                    const logEntry = JSON.parse(normalized) as RequestLogEntry
+
+                    // Parse request and response fields if they're JSON stringss
+                    if (typeof logEntry.request === 'string') {
+                        try {
+                            // Apply the same double-parse technique to nested JSON
+                            const requestObj = JSON.parse(logEntry.request)
+                            const requestNormalized = JSON.stringify(requestObj)
+                            logEntry.request = JSON.parse(requestNormalized)
+                        } catch (e) {
+                            // Keep as string if it's not valid JSON
+                            getLogger('nextEditPrediction').info(`Could not parse request as JSON: ${e}`)
+                        }
+                    }
+
+                    if (typeof logEntry.response === 'string') {
+                        try {
+                            // Apply the same double-parse technique to nested JSON
+                            const responseObj = JSON.parse(logEntry.response)
+                            const responseNormalized = JSON.stringify(responseObj)
+                            logEntry.response = JSON.parse(responseNormalized)
+                        } catch (e) {
+                            // Keep as string if it's not valid JSON
+                            getLogger('nextEditPrediction').info(`Could not parse response as JSON: ${e}`)
+                        }
+                    }
+
+                    this.requestLogs.push(logEntry)
+                } catch (e) {
+                    getLogger('nextEditPrediction').error(`Error parsing log entry ${i + 1}: ${e}`)
+                    getLogger('nextEditPrediction').error(
+                        `Problematic line: ${line.length > 100 ? line.substring(0, 100) + '...' : line}`
+                    )
+                }
+            }
+
+            if (this.isVisible && this.panel) {
+                this.updateRequestLogsView()
+            }
+
+            getLogger('nextEditPrediction').info(`Read ${this.requestLogs.length} log entries`)
+        } catch (error) {
+            getLogger('nextEditPrediction').error(`Error reading log file: ${error}`)
+        }
+    }
+
+    /**
+     * Update the panel with request logs data
+     */
+    private updateRequestLogsView(): void {
+        if (this.panel) {
+            this.panel.webview.html = this.getWebviewContent()
+            getLogger('nextEditPrediction').info('Webview panel updated with request logs')
+        }
+    }
+
+    /**
+     * Toggle the panel visibility
+     */
+    public toggle(): void {
+        if (this.isVisible) {
+            this.hide()
+        } else {
+            this.show()
+        }
+    }
+
+    /**
+     * Show the panel
+     */
+    public show(): void {
+        if (!this.panel) {
+            // Create the webview panel
+            this.panel = vscode.window.createWebviewPanel(
+                NextEditPredictionPanel.viewType,
+                'Next Edit Prediction',
+                vscode.ViewColumn.Beside,
+                {
+                    enableScripts: true,
+                    retainContextWhenHidden: true,
+                }
+            )
+
+            // Set initial content
+            this.panel.webview.html = this.getWebviewContent()
+
+            // Handle panel disposal
+            this.panel.onDidDispose(
+                () => {
+                    this.panel = undefined
+                    this.isVisible = false
+                    this.updateStatusBarItem()
+                },
+                undefined,
+                this.disposables
+            )
+
+            // Handle webview messages
+            this.panel.webview.onDidReceiveMessage(
+                (message) => {
+                    switch (message.command) {
+                        case 'refresh':
+                            getLogger('nextEditPrediction').info(`Refresh button clicked`)
+                            this.readRequestLogFile()
+                            break
+                        case 'clear':
+                            getLogger('nextEditPrediction').info(`Clear logs button clicked`)
+                            this.clearLogFile()
+                            break
+                    }
+                },
+                undefined,
+                this.disposables
+            )
+        } else {
+            this.panel.reveal()
+        }
+
+        this.isVisible = true
+        this.updateStatusBarItem()
+
+        // Setup file watcher when panel is shown
+        this.setupFileWatcher()
+
+        // If we already have logs, update the view
+        if (this.requestLogs.length > 0) {
+            this.updateRequestLogsView()
+        } else {
+            // Try to read the log file
+            this.scheduleFileRead()
+        }
+    }
+
+    /**
+     * Hide the panel
+     */
+    private hide(): void {
+        if (this.panel) {
+            this.panel.dispose()
+            this.panel = undefined
+            this.isVisible = false
+            this.updateStatusBarItem()
+        }
+    }
+
+    /**
+     * Update the status bar item appearance based on panel state
+     */
+    private updateStatusBarItem(): void {
+        if (this.isVisible) {
+            this.statusBarItem.backgroundColor = new vscode.ThemeColor('statusBarItem.warningBackground')
+        } else {
+            this.statusBarItem.backgroundColor = undefined
+        }
+    }
+
+    /**
+     * Update the panel content with new text
+     */
+    public updateContent(text: string): void {
+        if (this.panel) {
+            try {
+                // Store the text for display in a separate section
+                const customContent = text
+
+                // Update the panel with both the custom content and the request logs
+                this.panel.webview.html = this.getWebviewContent(customContent)
+                getLogger('nextEditPrediction').info('Webview panel content updated')
+            } catch (error) {
+                getLogger('nextEditPrediction').error(`Error updating webview: ${error}`)
+            }
+        }
+    }
+
+    /**
+     * Generate HTML content for the webview
+     */
+    private getWebviewContent(customContent?: string): string {
+        // Path to the debug.html file
+        const debugHtmlPath = vscode.Uri.file(
+            vscode.Uri.joinPath(
+                vscode.Uri.file(__dirname),
+                '..',
+                '..',
+                '..',
+                'app',
+                'inline',
+                'EditRendering',
+                'debug.html'
+            ).fsPath
+        )
+
+        // Read the HTML file content
+        try {
+            const htmlContent = fs.readFileSync(debugHtmlPath.fsPath, 'utf8')
+            getLogger('nextEditPrediction').info(`Successfully loaded debug.html from ${debugHtmlPath.fsPath}`)
+
+            // Modify the HTML to add vscode API initialization
+            return htmlContent.replace(
+                '</body>',
+                `
+                <script>
+                    // Initialize vscode API
+                    const vscode = acquireVsCodeApi();
+                    
+                    // Set up message handlers for communication with extension
+                    window.addEventListener('message', event => {
+                        const message = event.data;
+                        // Handle messages from extension if needed
+                    });
+                    
+                    // Set up button handlers for clear and refresh
+                    document.getElementById('clearBtn')?.addEventListener('click', () => {
+                        vscode.postMessage({ command: 'clear' });
+                    });
+                    
+                    document.getElementById('reconnectBtn')?.addEventListener('click', () => {
+                        vscode.postMessage({ command: 'refresh' });
+                    });
+                </script>
+            </body>`
+            )
+        } catch (error) {
+            getLogger('nextEditPrediction').error(`Error loading debug.html: ${error}`)
+            return `
+                <html>
+                <body>
+                    <h1>Error loading visualization</h1>
+                    <p>Failed to load debug.html file: ${error}</p>
+                </body>
+                </html>
+            `
+        }
+    }
+
+    /**
+     * Clear the log file and update the panel
+     */
+    private clearLogFile(): void {
+        try {
+            getLogger('nextEditPrediction').info(`Clearing log file: ${this.logFilePath}`)
+
+            // Write an empty string to clear the file
+            fs.writeFileSync(this.logFilePath, '')
+
+            // Clear the in-memory logs
+            this.requestLogs = []
+
+            // Update the view
+            if (this.isVisible && this.panel) {
+                this.updateRequestLogsView()
+            }
+
+            getLogger('nextEditPrediction').info(`Log file cleared successfully`)
+        } catch (error) {
+            getLogger('nextEditPrediction').error(`Error clearing log file: ${error}`)
+        }
+    }
+
+    /**
+     * Dispose of resources
+     */
+    public dispose(): void {
+        if (this.panel) {
+            this.panel.dispose()
+        }
+
+        if (this.fileWatcher) {
+            this.fileWatcher.dispose()
+        }
+
+        if (this.fileReadTimeout) {
+            clearTimeout(this.fileReadTimeout)
+        }
+
+        this.statusBarItem.dispose()
+
+        for (const d of this.disposables) {
+            d.dispose()
+        }
+        this.disposables = []
+
+        NextEditPredictionPanel.instance = undefined
+    }
+}
diff --git a/packages/amazonq/src/commands.ts b/packages/amazonq/src/commands.ts
new file mode 100644
index 00000000000..494a3f6a3b7
--- /dev/null
+++ b/packages/amazonq/src/commands.ts
@@ -0,0 +1,19 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Amazon Q extension commands and implementations.
+ */
+import * as vscode from 'vscode'
+import { Auth } from 'aws-core-vscode/auth'
+import { Commands } from 'aws-core-vscode/shared'
+import { clearCacheDeclaration } from './util/clearCache'
+
+export function registerCommands(context: vscode.ExtensionContext) {
+    context.subscriptions.push(
+        Commands.register('_aws.amazonq.auth.autoConnect', Auth.instance.tryAutoConnect),
+        clearCacheDeclaration.register()
+    )
+}
diff --git a/packages/amazonq/src/extension.ts b/packages/amazonq/src/extension.ts
new file mode 100644
index 00000000000..9b83695205c
--- /dev/null
+++ b/packages/amazonq/src/extension.ts
@@ -0,0 +1,202 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { AuthUtils, CredentialsStore, LoginManager, initializeAuth } from 'aws-core-vscode/auth'
+import { activate as activateCodeWhisperer, shutdown as shutdownCodeWhisperer } from 'aws-core-vscode/codewhisperer'
+import { makeEndpointsProvider, registerGenericCommands } from 'aws-core-vscode'
+import { CommonAuthWebview } from 'aws-core-vscode/login'
+import {
+    amazonQDiffScheme,
+    DefaultAWSClientBuilder,
+    DefaultAwsContext,
+    ExtContext,
+    RegionProvider,
+    Settings,
+    VirtualFileSystem,
+    VirtualMemoryFile,
+    activateLogger,
+    activateTelemetry,
+    env,
+    errors,
+    fs,
+    getLogger,
+    getMachineId,
+    globals,
+    initialize,
+    initializeComputeRegion,
+    messages,
+    placeholder,
+    setContext,
+    setupUninstallHandler,
+    maybeShowMinVscodeWarning,
+    Experiments,
+    isSageMaker,
+    isAmazonLinux2,
+    ProxyUtil,
+} from 'aws-core-vscode/shared'
+import { ExtStartUpSources } from 'aws-core-vscode/telemetry'
+import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
+import { join } from 'path'
+import * as semver from 'semver'
+import * as vscode from 'vscode'
+import { registerCommands } from './commands'
+import { focusAmazonQPanel } from 'aws-core-vscode/codewhispererChat'
+import { activate as activateAmazonqLsp } from './lsp/activation'
+import { hasGlibcPatch } from './lsp/client'
+import { activateAutoDebug } from './lsp/chat/autoDebug/activation'
+
+export const amazonQContextPrefix = 'amazonq'
+
+/**
+ * Activation code for Amazon Q that will we want in all environments (eg Node.js, web mode)
+ */
+export async function activateAmazonQCommon(context: vscode.ExtensionContext, isWeb: boolean) {
+    initialize(context, isWeb)
+    const homeDirLogs = await fs.init(context, (homeDir) => {
+        void messages.showViewLogsMessage(`Invalid home directory (check $HOME): "${homeDir}"`)
+    })
+    errors.init(fs.getUsername(), env.isAutomation())
+    await initializeComputeRegion()
+
+    globals.contextPrefix = 'amazonq.' // todo: disconnect from above line
+
+    // Avoid activation if older toolkit is installed
+    // Amazon Q is only compatible with AWS Toolkit >= 3.0.0
+    // Or AWS Toolkit with a development version. Example: 2.19.0-3413gv
+    const toolkit = vscode.extensions.getExtension(VSCODE_EXTENSION_ID.awstoolkit)
+    if (toolkit) {
+        const toolkitVersion = semver.coerce(toolkit.packageJSON.version)
+        // XXX: can't use `SemVer.prerelease` because Toolkit "prerelease" (git sha) is not a valid
+        // semver prerelease: it may start with a number.
+        const isDevVersion = toolkit.packageJSON.version.toString().includes('-')
+        if (toolkitVersion && toolkitVersion.major < 3 && !isDevVersion) {
+            await vscode.commands
+                .executeCommand('workbench.extensions.installExtension', VSCODE_EXTENSION_ID.awstoolkit)
+                .then(
+                    () =>
+                        vscode.window
+                            .showInformationMessage(
+                                `The Amazon Q extension is incompatible with AWS Toolkit ${
+                                    toolkitVersion as any
+                                } and older. Your AWS Toolkit was updated to version 3.0 or later.`,
+                                'Reload Now'
+                            )
+                            .then(async (resp) => {
+                                if (resp === 'Reload Now') {
+                                    await vscode.commands.executeCommand('workbench.action.reloadWindow')
+                                }
+                            }),
+                    (reason) => {
+                        getLogger().error('workbench.extensions.installExtension failed: %O', reason)
+                    }
+                )
+            return
+        }
+    }
+
+    void maybeShowMinVscodeWarning('1.83.0')
+
+    globals.machineId = await getMachineId()
+    globals.awsContext = new DefaultAwsContext()
+    globals.sdkClientBuilder = new DefaultAWSClientBuilder(globals.awsContext)
+    globals.manifestPaths.endpoints = context.asAbsolutePath(join('resources', 'endpoints.json'))
+    globals.regionProvider = RegionProvider.fromEndpointsProvider(makeEndpointsProvider())
+
+    const qLogChannel = vscode.window.createOutputChannel('Amazon Q Logs', { log: true })
+    await activateLogger(context, amazonQContextPrefix, qLogChannel)
+    globals.logOutputChannel = qLogChannel
+    globals.loginManager = new LoginManager(globals.awsContext, new CredentialsStore())
+
+    if (homeDirLogs.length > 0) {
+        getLogger().error('fs.init: invalid env vars found: %O', homeDirLogs)
+    }
+
+    await activateTelemetry(context, globals.awsContext, Settings.instance, 'Amazon Q For VS Code')
+
+    await initializeAuth(globals.loginManager)
+
+    const extContext = {
+        extensionContext: context,
+    }
+
+    // Configure proxy settings early
+    await ProxyUtil.configureProxyForLanguageServer()
+
+    // This contains every lsp agnostic things (auth, security scan, code scan)
+    await activateCodeWhisperer(extContext as ExtContext)
+
+    if (!isAmazonLinux2() || hasGlibcPatch()) {
+        // Activate Amazon Q LSP for everyone unless they're using AL2 without the glibc patch
+        await activateAmazonqLsp(context)
+    }
+
+    // Activate AutoDebug feature at extension level
+    try {
+        const autoDebugFeature = await activateAutoDebug(context)
+        context.subscriptions.push(autoDebugFeature)
+    } catch (error) {
+        getLogger().error('Failed to activate AutoDebug feature at extension level: %s', error)
+    }
+
+    // Generic extension commands
+    registerGenericCommands(context, amazonQContextPrefix)
+
+    // Amazon Q specific commands
+    registerCommands(context)
+
+    // Handle Amazon Q Extension un-installation.
+    setupUninstallHandler(VSCODE_EXTENSION_ID.amazonq, context.extension.packageJSON.version, context)
+
+    const vfs = new VirtualFileSystem()
+
+    // Register an empty file that's used when a to open a diff
+    vfs.registerProvider(
+        vscode.Uri.from({ scheme: amazonQDiffScheme, path: 'empty' }),
+        new VirtualMemoryFile(new Uint8Array())
+    )
+
+    // Hide the Amazon Q tree in toolkit explorer
+    await setContext('aws.toolkit.amazonq.dismissed', true)
+
+    // set context var to check if its SageMaker AI or not
+    await setContext('aws.isSageMaker', isSageMaker())
+
+    // set context var to check if its SageMaker Unified Studio or not
+    await setContext('aws.isSageMakerUnifiedStudio', isSageMaker('SMUS'))
+
+    // reload webviews
+    await vscode.commands.executeCommand('workbench.action.webview.reloadWebviewAction')
+
+    if (AuthUtils.ExtensionUse.instance.isFirstUse()) {
+        // Give time for the extension to finish initializing.
+        globals.clock.setTimeout(async () => {
+            CommonAuthWebview.authSource = ExtStartUpSources.firstStartUp
+            focusAmazonQPanel.execute(placeholder, ExtStartUpSources.firstStartUp).catch((e) => {
+                getLogger().error('focusAmazonQPanel failed: %s', e)
+            })
+        }, 1000)
+    }
+
+    context.subscriptions.push(
+        Experiments.instance.onDidChange(async (event) => {
+            if (event.key === 'amazonqLSP' || event.key === 'amazonqChatLSP' || event.key === 'amazonqLSPInline') {
+                await vscode.window
+                    .showInformationMessage(
+                        'Amazon Q LSP setting has changed. Reload VS Code for the changes to take effect.',
+                        'Reload Now'
+                    )
+                    .then(async (selection) => {
+                        if (selection === 'Reload Now') {
+                            await vscode.commands.executeCommand('workbench.action.reloadWindow')
+                        }
+                    })
+            }
+        })
+    )
+}
+
+export async function deactivateCommon() {
+    await shutdownCodeWhisperer()
+}
diff --git a/packages/amazonq/src/extensionNode.ts b/packages/amazonq/src/extensionNode.ts
new file mode 100644
index 00000000000..d42fafea058
--- /dev/null
+++ b/packages/amazonq/src/extensionNode.ts
@@ -0,0 +1,185 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { activateAmazonQCommon, amazonQContextPrefix, deactivateCommon } from './extension'
+import { DefaultAmazonQAppInitContext, AmazonQChatViewProvider } from 'aws-core-vscode/amazonq'
+import { activate as activateTransformationHub } from 'aws-core-vscode/amazonqGumby'
+import {
+    ExtContext,
+    globals,
+    CrashMonitoring,
+    getLogger,
+    isNetworkError,
+    isSageMaker,
+    Experiments,
+} from 'aws-core-vscode/shared'
+import { filetypes, SchemaService } from 'aws-core-vscode/sharedNode'
+import { updateDevMode } from 'aws-core-vscode/dev'
+import { CommonAuthViewProvider } from 'aws-core-vscode/login'
+import { isExtensionActive, VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
+import { registerSubmitFeedback } from 'aws-core-vscode/feedback'
+import { DevOptions } from 'aws-core-vscode/dev'
+import { Auth, AuthUtils, getTelemetryMetadataForConn, isAnySsoConnection } from 'aws-core-vscode/auth'
+import api from './api'
+import { activate as activateCWChat } from './app/chat/activation'
+import { beta } from 'aws-core-vscode/dev'
+import { activate as activateNotifications, NotificationsController } from 'aws-core-vscode/notifications'
+import { AuthState, AuthUtil } from 'aws-core-vscode/codewhisperer'
+import { telemetry, AuthUserState } from 'aws-core-vscode/telemetry'
+import { activateAgents } from './app/chat/node/activateAgents'
+
+export async function activate(context: vscode.ExtensionContext) {
+    // IMPORTANT: No other code should be added to this function. Place it in one of the following 2 functions where appropriate.
+    await activateAmazonQCommon(context, false)
+    await activateAmazonQNode(context)
+
+    return api
+}
+
+/**
+ * The code in this function is not common, implying it only works in Node.js and not web.
+ * The goal should be for this to not exist and that all code is "common". So if possible make
+ * the code compatible with web and move it to {@link activateAmazonQCommon}.
+ */
+async function activateAmazonQNode(context: vscode.ExtensionContext) {
+    // Intentionally do not await since this is slow and non-critical
+    void (await CrashMonitoring.instance())?.start()
+
+    const extContext = {
+        extensionContext: context,
+    }
+
+    if (!Experiments.instance.get('amazonqChatLSP', true)) {
+        const appInitContext = DefaultAmazonQAppInitContext.instance
+        const provider = new AmazonQChatViewProvider(
+            context,
+            appInitContext.getWebViewToAppsMessagePublishers(),
+            appInitContext.getAppsToWebViewMessageListener(),
+            appInitContext.onDidChangeAmazonQVisibility
+        )
+        context.subscriptions.push(
+            vscode.window.registerWebviewViewProvider(AmazonQChatViewProvider.viewType, provider, {
+                webviewOptions: {
+                    retainContextWhenHidden: true,
+                },
+            })
+        )
+        // this is registered inside of lsp/chat/activation.ts when the chat experiment is enabled
+        await activateCWChat(context)
+    }
+    activateAgents()
+    await activateTransformationHub(extContext as ExtContext)
+
+    const authProvider = new CommonAuthViewProvider(
+        context,
+        amazonQContextPrefix,
+        DefaultAmazonQAppInitContext.instance.onDidChangeAmazonQVisibility
+    )
+    context.subscriptions.push(
+        vscode.window.registerWebviewViewProvider(authProvider.viewType, authProvider, {
+            webviewOptions: {
+                retainContextWhenHidden: true,
+            },
+        }),
+        registerSubmitFeedback(context, 'Amazon Q', amazonQContextPrefix)
+    )
+
+    globals.schemaService = new SchemaService()
+    filetypes.activate()
+
+    await setupDevMode(context)
+    await beta.activate(context)
+
+    // TODO: Should probably emit for web as well.
+    // Will the web metric look the same?
+    telemetry.auth_userState.emit({
+        passive: true,
+        result: 'Succeeded',
+        source: AuthUtils.ExtensionUse.instance.sourceForTelemetry(),
+        ...(await getAuthState()),
+    })
+
+    void activateNotifications(context, getAuthState)
+}
+
+async function getAuthState(): Promise<Omit<AuthUserState, 'source'>> {
+    let authState: AuthState = 'disconnected'
+    try {
+        // May call connection validate functions that try to refresh the token.
+        // This could result in network errors.
+        authState = (await AuthUtil.instance._getChatAuthState(false)).codewhispererChat
+    } catch (err) {
+        if (
+            isNetworkError(err) &&
+            AuthUtil.instance.conn &&
+            AuthUtil.instance.auth.getConnectionState(AuthUtil.instance.conn) === 'valid'
+        ) {
+            authState = 'connectedWithNetworkError'
+        } else {
+            throw err
+        }
+    }
+    const currConn = AuthUtil.instance.conn
+    if (currConn !== undefined && !(isAnySsoConnection(currConn) || isSageMaker())) {
+        getLogger().error(`Current Amazon Q connection is not SSO, type is: %s`, currConn?.type)
+    }
+
+    // Pending profile selection state means users already log in with Sso service
+    if (authState === 'pendingProfileSelection') {
+        authState = 'connected'
+    }
+
+    return {
+        authStatus:
+            authState === 'connected' || authState === 'expired' || authState === 'connectedWithNetworkError'
+                ? authState
+                : 'notConnected',
+        authEnabledConnections: AuthUtils.getAuthFormIdsFromConnection(currConn).join(','),
+        ...(await getTelemetryMetadataForConn(currConn)),
+    }
+}
+
+/**
+ * Some parts of this do not work in Web mode so we need to set Dev Mode up here.
+ *
+ * TODO: Get the following working in web mode as well and then move this function.
+ */
+async function setupDevMode(context: vscode.ExtensionContext) {
+    // At some point this imports CodeCatalyst code which breaks in web mode.
+    // TODO: Make this work in web mode and move it to extensionCommon.ts
+    await updateDevMode()
+
+    const devOptions: DevOptions = {
+        context,
+        auth: () => Auth.instance,
+        notificationsController: () => NotificationsController.instance,
+        menuOptions: [
+            'editStorage',
+            'resetState',
+            'showEnvVars',
+            'deleteSsoConnections',
+            'expireSsoConnections',
+            'editAuthConnections',
+            'notificationsSend',
+            'forceIdeCrash',
+        ],
+    }
+
+    context.subscriptions.push(
+        vscode.commands.registerCommand('amazonq.dev.openMenu', async () => {
+            if (!isExtensionActive(VSCODE_EXTENSION_ID.awstoolkit)) {
+                void vscode.window.showErrorMessage('AWS Toolkit must be installed to access the Developer Menu.')
+                return
+            }
+            await vscode.commands.executeCommand('_aws.dev.invokeMenu', devOptions)
+        })
+    )
+}
+
+export async function deactivate() {
+    // Run concurrently to speed up execution. stop() does not throw so it is safe
+    await Promise.all([(await CrashMonitoring.instance())?.shutdown(), deactivateCommon()])
+}
diff --git a/packages/amazonq/src/extensionWeb.ts b/packages/amazonq/src/extensionWeb.ts
new file mode 100644
index 00000000000..3091cda2da8
--- /dev/null
+++ b/packages/amazonq/src/extensionWeb.ts
@@ -0,0 +1,17 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type { ExtensionContext } from 'vscode'
+import { activateWebShared } from 'aws-core-vscode/webShared'
+import { activateAmazonQCommon, deactivateCommon } from './extension'
+
+export async function activate(context: ExtensionContext) {
+    await activateWebShared(context)
+    await activateAmazonQCommon(context, true)
+}
+
+export async function deactivate() {
+    await deactivateCommon()
+}
diff --git a/packages/amazonq/src/inlineChat/activation.ts b/packages/amazonq/src/inlineChat/activation.ts
new file mode 100644
index 00000000000..52c826abb61
--- /dev/null
+++ b/packages/amazonq/src/inlineChat/activation.ts
@@ -0,0 +1,19 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { InlineChatController } from './controller/inlineChatController'
+import { registerInlineCommands } from './command/registerInlineCommands'
+import { BaseLanguageClient } from 'vscode-languageclient'
+import { InlineChatTutorialAnnotation } from '../app/inline/tutorials/inlineChatTutorialAnnotation'
+
+export function activate(
+    context: vscode.ExtensionContext,
+    client: BaseLanguageClient,
+    encryptionKey: Buffer,
+    inlineChatTutorialAnnotation: InlineChatTutorialAnnotation
+) {
+    const inlineChatController = new InlineChatController(context, client, encryptionKey, inlineChatTutorialAnnotation)
+    registerInlineCommands(context, inlineChatController)
+}
diff --git a/packages/amazonq/src/inlineChat/codeLenses/codeLenseProvider.ts b/packages/amazonq/src/inlineChat/codeLenses/codeLenseProvider.ts
new file mode 100644
index 00000000000..34a85e10b38
--- /dev/null
+++ b/packages/amazonq/src/inlineChat/codeLenses/codeLenseProvider.ts
@@ -0,0 +1,76 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as os from 'os'
+import { InlineTask, TaskState } from '../controller/inlineTask'
+
+export class CodelensProvider implements vscode.CodeLensProvider {
+    private codeLenses: vscode.CodeLens[] = []
+    private _onDidChangeCodeLenses: vscode.EventEmitter<void> = new vscode.EventEmitter<void>()
+    public readonly onDidChangeCodeLenses: vscode.Event<void> = this._onDidChangeCodeLenses.event
+
+    constructor(context: vscode.ExtensionContext) {
+        context.subscriptions.push(vscode.languages.registerCodeLensProvider('*', this))
+        this.provideCodeLenses = this.provideCodeLenses.bind(this)
+    }
+
+    public provideCodeLenses(_document: vscode.TextDocument, _token: vscode.CancellationToken): vscode.CodeLens[] {
+        return this.codeLenses
+    }
+
+    public updateLenses(task: InlineTask): void {
+        if (task.state === TaskState.Complete) {
+            this.codeLenses = []
+            this._onDidChangeCodeLenses.fire()
+            return
+        }
+        switch (task.state) {
+            case TaskState.InProgress: {
+                this.codeLenses = []
+                this.codeLenses.push(
+                    new vscode.CodeLens(new vscode.Range(task.selectedRange.start, task.selectedRange.start), {
+                        title: 'Amazon Q is generating...',
+                        command: '',
+                    })
+                )
+                break
+            }
+            case TaskState.WaitingForDecision: {
+                let acceptTitle: string
+                let rejectTitle: string
+                if (os.platform() === 'darwin') {
+                    acceptTitle = 'Accept ($(newline))'
+                    rejectTitle = `Reject ( \u238B )`
+                } else {
+                    acceptTitle = 'Accept (Enter)'
+                    rejectTitle = `Reject (Esc)`
+                }
+
+                this.codeLenses = []
+                this.codeLenses.push(
+                    new vscode.CodeLens(new vscode.Range(task.selectedRange.start, task.selectedRange.start), {
+                        title: acceptTitle,
+                        command: 'aws.amazonq.inline.waitForUserDecisionAcceptAll',
+                        arguments: [task],
+                    })
+                )
+                this.codeLenses.push(
+                    new vscode.CodeLens(new vscode.Range(task.selectedRange.start, task.selectedRange.start), {
+                        title: rejectTitle,
+                        command: 'aws.amazonq.inline.waitForUserDecisionRejectAll',
+                        arguments: [task],
+                    })
+                )
+                break
+            }
+            default: {
+                this.codeLenses = []
+                break
+            }
+        }
+        this._onDidChangeCodeLenses.fire()
+    }
+}
diff --git a/packages/amazonq/src/inlineChat/command/registerInlineCommands.ts b/packages/amazonq/src/inlineChat/command/registerInlineCommands.ts
new file mode 100644
index 00000000000..48b1fbf5145
--- /dev/null
+++ b/packages/amazonq/src/inlineChat/command/registerInlineCommands.ts
@@ -0,0 +1,22 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import vscode from 'vscode'
+import { InlineChatController } from '../controller/inlineChatController'
+import { InlineTask } from '../controller/inlineTask'
+
+export function registerInlineCommands(context: vscode.ExtensionContext, inlineChatController: InlineChatController) {
+    context.subscriptions.push(
+        vscode.commands.registerCommand('aws.amazonq.inline.invokeChat', async () => {
+            await inlineChatController.inlineQuickPick()
+        }),
+        vscode.commands.registerCommand('aws.amazonq.inline.waitForUserDecisionAcceptAll', async (task: InlineTask) => {
+            await inlineChatController.acceptAllChanges(task, true)
+        }),
+        vscode.commands.registerCommand('aws.amazonq.inline.waitForUserDecisionRejectAll', async (task: InlineTask) => {
+            await inlineChatController.rejectAllChanges(task, true)
+        })
+    )
+}
diff --git a/packages/amazonq/src/inlineChat/controller/inlineChatController.ts b/packages/amazonq/src/inlineChat/controller/inlineChatController.ts
new file mode 100644
index 00000000000..472591039f3
--- /dev/null
+++ b/packages/amazonq/src/inlineChat/controller/inlineChatController.ts
@@ -0,0 +1,466 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { randomUUID } from 'crypto'
+import * as vscode from 'vscode'
+import { InlineDecorator } from '../decorations/inlineDecorator'
+import { InlineChatProvider } from '../provider/inlineChatProvider'
+import { InlineTask, TaskState, TextDiff } from './inlineTask'
+import { responseTransformer } from '../output/responseTransformer'
+import { adjustTextDiffForEditing, computeDiff } from '../output/computeDiff'
+import { computeDecorations } from '../decorations/computeDecorations'
+import { CodelensProvider } from '../codeLenses/codeLenseProvider'
+import { PromptMessage, ReferenceLogController } from 'aws-core-vscode/codewhispererChat'
+import { CodeWhispererSettings } from 'aws-core-vscode/codewhisperer'
+import { UserWrittenCodeTracker } from 'aws-core-vscode/codewhisperer'
+import { BaseLanguageClient } from 'vscode-languageclient'
+import {
+    codicon,
+    getIcon,
+    getLogger,
+    messages,
+    setContext,
+    Timeout,
+    textDocumentUtil,
+    isSageMaker,
+    Experiments,
+} from 'aws-core-vscode/shared'
+import { InlineChatTutorialAnnotation } from '../../app/inline/tutorials/inlineChatTutorialAnnotation'
+
+export class InlineChatController {
+    private task: InlineTask | undefined
+    private readonly decorator = new InlineDecorator()
+    private readonly inlineChatProvider: InlineChatProvider
+    private readonly codeLenseProvider: CodelensProvider
+    private readonly referenceLogController = new ReferenceLogController()
+    private readonly inlineChatTutorialAnnotation: InlineChatTutorialAnnotation
+    private readonly computeDiffAndRenderOnEditor: (query: string) => Promise<void>
+    private userQuery: string | undefined
+    private listeners: vscode.Disposable[] = []
+
+    constructor(
+        context: vscode.ExtensionContext,
+        client: BaseLanguageClient,
+        encryptionKey: Buffer,
+        inlineChatTutorialAnnotation: InlineChatTutorialAnnotation
+    ) {
+        this.inlineChatProvider = new InlineChatProvider(client, encryptionKey)
+        this.inlineChatProvider.onErrorOccured(() => this.handleError())
+        this.codeLenseProvider = new CodelensProvider(context)
+        this.inlineChatTutorialAnnotation = inlineChatTutorialAnnotation
+        this.computeDiffAndRenderOnEditor = Experiments.instance.get('amazonqLSPInlineChat', false)
+            ? this.computeDiffAndRenderOnEditorLSP.bind(this)
+            : this.computeDiffAndRenderOnEditorLocal.bind(this)
+    }
+
+    public async createTask(
+        query: string,
+        document: vscode.TextDocument,
+        selectionRange: vscode.Selection
+    ): Promise<InlineTask> {
+        const inlineTask = new InlineTask(query, document, selectionRange)
+        return inlineTask
+    }
+
+    public async acceptAllChanges(task = this.task, userInvoked: boolean): Promise<void> {
+        if (!task) {
+            return
+        }
+        const editor = vscode.window.visibleTextEditors.find(
+            (editor) => editor.document.uri.toString() === task.document.uri.toString()
+        )
+        if (!editor) {
+            return
+        }
+        if (userInvoked) {
+            this.inlineChatProvider.sendTelemetryEvent(
+                {
+                    userDecision: 'ACCEPT',
+                },
+                this.task
+            )
+        }
+        const deletions = task.diff.filter((diff) => diff.type === 'deletion')
+        await editor.edit(
+            (editBuilder) => {
+                for (const deletion of deletions) {
+                    editBuilder.delete(deletion.range)
+                }
+            },
+            { undoStopAfter: false, undoStopBefore: false }
+        )
+        task.diff = []
+        task.updateDecorations()
+        this.decorator.applyDecorations(task)
+        await this.updateTaskAndLenses(task)
+        this.referenceLogController.addReferenceLog(task.codeReferences, task.replacement ? task.replacement : '')
+        await this.reset()
+        UserWrittenCodeTracker.instance.onQFinishesEdits()
+    }
+
+    public async rejectAllChanges(task = this.task, userInvoked: boolean): Promise<void> {
+        if (!task) {
+            return
+        }
+        const editor = vscode.window.visibleTextEditors.find(
+            (editor) => editor.document.uri.toString() === task.document.uri.toString()
+        )
+        if (!editor) {
+            return
+        }
+        if (userInvoked) {
+            this.inlineChatProvider.sendTelemetryEvent(
+                {
+                    userDecision: 'REJECT',
+                },
+                this.task
+            )
+        }
+        const insertions = task.diff.filter((diff) => diff.type === 'insertion')
+        await editor.edit(
+            (editBuilder) => {
+                for (const insertion of insertions) {
+                    editBuilder.delete(insertion.range)
+                }
+            },
+            { undoStopAfter: false, undoStopBefore: false }
+        )
+        task.diff = []
+        task.updateDecorations()
+        this.decorator.applyDecorations(task)
+        await this.updateTaskAndLenses(task)
+        this.referenceLogController.addReferenceLog(task.codeReferences, task.replacement ? task.replacement : '')
+        await this.reset()
+    }
+
+    public async updateTaskAndLenses(task?: InlineTask, taskState?: TaskState) {
+        if (!task) {
+            return
+        }
+        if (taskState) {
+            task.state = taskState
+        } else if (!task.diff || task.diff.length === 0) {
+            // If the previous state was waiting for a decision and the code diff is clean, then we mark the task as completed
+            if (task.state === TaskState.WaitingForDecision) {
+                task.state = TaskState.Complete
+            }
+        }
+        this.codeLenseProvider.updateLenses(task)
+        if (task.state === TaskState.InProgress) {
+            if (vscode.window.activeTextEditor) {
+                await this.inlineChatTutorialAnnotation.hide(vscode.window.activeTextEditor)
+            }
+        }
+        await this.refreshCodeLenses(task)
+        if (task.state === TaskState.Complete) {
+            await this.reset()
+        }
+    }
+
+    private async handleError() {
+        if (!this.task) {
+            return
+        }
+        this.task.state = TaskState.Error
+        this.codeLenseProvider.updateLenses(this.task)
+        await this.refreshCodeLenses(this.task)
+        await this.reset()
+    }
+
+    private async reset() {
+        for (const listener of this.listeners) {
+            listener.dispose()
+        }
+        this.listeners = []
+
+        this.task = undefined
+        this.inlineChatTutorialAnnotation.enable()
+        await setContext('amazonq.inline.codelensShortcutEnabled', undefined)
+    }
+
+    private async refreshCodeLenses(task: InlineTask): Promise<void> {
+        await vscode.commands.executeCommand('vscode.executeCodeLensProvider', task.document.uri)
+    }
+
+    public async inlineQuickPick(previouseQuery?: string) {
+        const editor = vscode.window.activeTextEditor
+        if (!editor) {
+            return
+        }
+
+        if (isSageMaker()) {
+            void vscode.window.showWarningMessage('Amazon Q: Inline chat is not supported in Sagemaker')
+            return
+        }
+
+        if (this.task && this.task.isActiveState()) {
+            void vscode.window.showWarningMessage(
+                'Amazon Q: Reject or Accept the current suggestion before creating a new one'
+            )
+            return
+        }
+
+        await vscode.window
+            .showInputBox({
+                value: previouseQuery ?? '',
+                placeHolder: 'Enter instructions for Q',
+                prompt: codicon`${getIcon('aws-amazonq-q-white')} Edit code`,
+            })
+            .then(async (query) => {
+                if (!query || query.trim() === '') {
+                    getLogger().info('inlineQuickPick query is empty')
+                    return
+                }
+                UserWrittenCodeTracker.instance.onQStartsMakingEdits()
+                this.userQuery = query
+                await textDocumentUtil.addEofNewline(editor)
+                this.task = await this.createTask(query, editor.document, editor.selection)
+                await this.inlineChatTutorialAnnotation.disable(editor)
+                await this.computeDiffAndRenderOnEditor(query).catch(async (err) => {
+                    getLogger().error('computeDiffAndRenderOnEditor error: %s', (err as Error)?.message)
+                    if (err instanceof Error) {
+                        void vscode.window.showErrorMessage(`Amazon Q: ${err.message}`)
+                    } else {
+                        void vscode.window.showErrorMessage('Amazon Q encountered an error')
+                    }
+                    await this.handleError()
+                })
+            })
+    }
+
+    private async computeDiffAndRenderOnEditorLSP(query: string) {
+        if (!this.task) {
+            return
+        }
+
+        await this.updateTaskAndLenses(this.task, TaskState.InProgress)
+        getLogger().info(`inline chat query:\n${query}`)
+        const uuid = randomUUID()
+        const message: PromptMessage = {
+            message: query,
+            messageId: uuid,
+            command: undefined,
+            userIntent: undefined,
+            tabID: uuid,
+        }
+
+        const response = await this.inlineChatProvider.processPromptMessageLSP(message)
+
+        // TODO: add tests for this case.
+        if (!response.body) {
+            getLogger().warn('Empty body in inline chat response')
+            await this.handleError()
+            return
+        }
+
+        // Update inline diff view
+        const textDiff = computeDiff(response.body, this.task, false)
+        const decorations = computeDecorations(this.task)
+        this.task.decorations = decorations
+        await this.applyDiff(this.task, textDiff ?? [])
+        this.decorator.applyDecorations(this.task)
+
+        // Update Codelenses
+        await this.updateTaskAndLenses(this.task, TaskState.WaitingForDecision)
+        await setContext('amazonq.inline.codelensShortcutEnabled', true)
+        this.undoListener(this.task)
+    }
+
+    // TODO: remove this implementation in favor of LSP
+    private async computeDiffAndRenderOnEditorLocal(query: string) {
+        if (!this.task) {
+            return
+        }
+
+        await this.updateTaskAndLenses(this.task, TaskState.InProgress)
+        getLogger().info(`inline chat query:\n${query}`)
+        const uuid = randomUUID()
+        const message: PromptMessage = {
+            message: query,
+            messageId: uuid,
+            command: undefined,
+            userIntent: undefined,
+            tabID: uuid,
+        }
+
+        const requestStart = performance.now()
+        let responseStartLatency: number | undefined
+
+        const response = await this.inlineChatProvider.processPromptMessage(message)
+        this.task.requestId = response?.$metadata.requestId
+
+        // Deselect all code
+        const editor = vscode.window.activeTextEditor
+        if (editor) {
+            const selection = editor.selection
+            if (!selection.isEmpty) {
+                const cursor = selection.active
+                const newSelection = new vscode.Selection(cursor, cursor)
+                editor.selection = newSelection
+            }
+        }
+
+        if (response) {
+            let qSuggestedCodeResponse = ''
+            for await (const chatEvent of response.generateAssistantResponseResponse!) {
+                if (
+                    chatEvent.assistantResponseEvent?.content !== undefined &&
+                    chatEvent.assistantResponseEvent.content.length > 0
+                ) {
+                    if (responseStartLatency === undefined) {
+                        responseStartLatency = performance.now() - requestStart
+                    }
+
+                    qSuggestedCodeResponse += chatEvent.assistantResponseEvent.content
+
+                    const transformedResponse = responseTransformer(qSuggestedCodeResponse, this.task, false)
+                    if (transformedResponse) {
+                        const textDiff = computeDiff(transformedResponse, this.task, true)
+                        const decorations = computeDecorations(this.task)
+                        this.task.decorations = decorations
+                        await this.applyDiff(this.task!, textDiff ?? [], {
+                            undoStopBefore: false,
+                            undoStopAfter: false,
+                        })
+                        this.decorator.applyDecorations(this.task)
+                        this.task.previouseDiff = textDiff
+                    }
+                }
+                if (
+                    chatEvent.codeReferenceEvent?.references !== undefined &&
+                    chatEvent.codeReferenceEvent.references.length > 0
+                ) {
+                    this.task.codeReferences = this.task.codeReferences.concat(chatEvent.codeReferenceEvent?.references)
+                    // clear diff if user settings is off for code reference
+                    if (!CodeWhispererSettings.instance.isSuggestionsWithCodeReferencesEnabled()) {
+                        await this.rejectAllChanges(this.task, false)
+                        void vscode.window.showInformationMessage(
+                            'Your settings do not allow code generation with references.'
+                        )
+                        await this.updateTaskAndLenses(this.task, TaskState.Complete)
+                        return
+                    }
+                }
+                if (chatEvent.error) {
+                    getLogger().error('generateAssistantResponse stream error: %s', chatEvent.error)
+                    await this.rejectAllChanges(this.task, false)
+                    void vscode.window.showErrorMessage(`Amazon Q: ${chatEvent.error.message}`)
+                    await this.updateTaskAndLenses(this.task, TaskState.Complete)
+                    return
+                }
+            }
+
+            if (this.task) {
+                // Unclear why we need to check if task is defined, but occasionally an error occurs otherwise
+                this.task.responseStartLatency = responseStartLatency
+                this.task.responseEndLatency = performance.now() - requestStart
+            }
+            getLogger().info(`qSuggestedCodeResponse:\n${qSuggestedCodeResponse}`)
+            const transformedResponse = responseTransformer(qSuggestedCodeResponse, this.task, true)
+            if (transformedResponse) {
+                const textDiff = computeDiff(transformedResponse, this.task, false)
+                const decorations = computeDecorations(this.task)
+                this.task.decorations = decorations
+                await this.applyDiff(this.task, textDiff ?? [])
+                this.decorator.applyDecorations(this.task)
+                await this.updateTaskAndLenses(this.task, TaskState.WaitingForDecision)
+                await setContext('amazonq.inline.codelensShortcutEnabled', true)
+                this.undoListener(this.task)
+            } else {
+                void messages.showMessageWithCancel(
+                    'No suggestions from Q, please try different instructions.',
+                    new Timeout(5000)
+                )
+                await this.updateTaskAndLenses(this.task, TaskState.Complete)
+                await this.inlineQuickPick(this.userQuery)
+                await this.handleError()
+            }
+        }
+    }
+
+    private async applyDiff(
+        task: InlineTask,
+        textDiff: TextDiff[],
+        undoOption?: { undoStopBefore: boolean; undoStopAfter: boolean }
+    ) {
+        const adjustedTextDiff = adjustTextDiffForEditing(textDiff)
+        const visibleEditor = vscode.window.visibleTextEditors.find(
+            (editor) => editor.document.uri === task.document.uri
+        )
+        const previousDiff = task.previouseDiff?.filter((diff) => diff.type === 'insertion')
+
+        if (visibleEditor) {
+            if (previousDiff) {
+                await visibleEditor.edit(
+                    (editBuilder) => {
+                        for (const insertion of previousDiff) {
+                            editBuilder.delete(insertion.range)
+                        }
+                    },
+                    { undoStopAfter: false, undoStopBefore: false }
+                )
+            }
+            await visibleEditor.edit(
+                (editBuilder) => {
+                    for (const change of adjustedTextDiff) {
+                        if (change.type === 'insertion') {
+                            editBuilder.insert(change.range.start, change.replacementText)
+                        }
+                    }
+                },
+                undoOption ?? { undoStopBefore: true, undoStopAfter: false }
+            )
+        } else {
+            if (previousDiff) {
+                const edit = new vscode.WorkspaceEdit()
+                for (const insertion of previousDiff) {
+                    edit.delete(task.document.uri, insertion.range)
+                }
+                await vscode.workspace.applyEdit(edit)
+            }
+            const edit = new vscode.WorkspaceEdit()
+            for (const change of textDiff) {
+                if (change.type === 'insertion') {
+                    edit.insert(task.document.uri, change.range.start, change.replacementText)
+                }
+            }
+            await vscode.workspace.applyEdit(edit)
+        }
+    }
+
+    private undoListener(task: InlineTask) {
+        const listener: vscode.Disposable = vscode.workspace.onDidChangeTextDocument(async (event) => {
+            const { document, contentChanges } = event
+
+            if (document.uri.toString() !== task.document.uri.toString()) {
+                return
+            }
+
+            const changeIntersectsRange = contentChanges.some((change) => {
+                const { range } = change
+                if (task.selectedRange) {
+                    return !(
+                        range.end.isBefore(task.selectedRange.start) || range.start.isAfter(task.selectedRange.end)
+                    )
+                }
+            })
+
+            if (!changeIntersectsRange) {
+                return
+            }
+
+            const updatedSelectedText = document.getText(task.selectedRange)
+
+            if (updatedSelectedText.trim() === task.selectedText.trim()) {
+                task.diff = []
+                await this.updateTaskAndLenses(task)
+                task.updateDecorations()
+                this.decorator.applyDecorations(task)
+                listener.dispose()
+            }
+        })
+
+        this.listeners.push(listener)
+    }
+}
diff --git a/packages/amazonq/src/inlineChat/controller/inlineTask.ts b/packages/amazonq/src/inlineChat/controller/inlineTask.ts
new file mode 100644
index 00000000000..a6a169ad58c
--- /dev/null
+++ b/packages/amazonq/src/inlineChat/controller/inlineTask.ts
@@ -0,0 +1,160 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import type { CodeReference } from 'aws-core-vscode/amazonq'
+import type { InlineChatEvent } from 'aws-core-vscode/codewhisperer'
+import type { Decorations } from '../decorations/inlineDecorator'
+import { computeDecorations } from '../decorations/computeDecorations'
+import { extractLanguageNameFromFile } from 'aws-core-vscode/codewhispererChat'
+import { textDocumentUtil } from 'aws-core-vscode/shared'
+
+interface TextToInsert {
+    type: 'insertion'
+    replacementText: string
+    range: vscode.Range
+}
+
+interface TextToDelete {
+    type: 'deletion'
+    originalText: string
+    range: vscode.Range
+}
+
+interface DiffBlock {
+    originalText: string
+    replacementText: string
+    range: vscode.Range
+}
+
+export type TextDiff = TextToInsert | TextToDelete
+
+export enum TaskState {
+    Idle = 'Idle',
+    InProgress = 'InProgress',
+    WaitingForDecision = 'WaitingForDecision',
+    Complete = 'Complete',
+    Error = 'Error',
+}
+
+export class InlineTask {
+    public state: TaskState = TaskState.Idle
+    public diff: TextDiff[] = []
+    public decorations: Decorations | undefined
+    public diffBlock: DiffBlock[] = []
+    public codeReferences: CodeReference[] = []
+    public selectedText: string
+    public languageName: string | undefined
+
+    public partialSelectedText: string | undefined
+    public partialSelectedTextRight: string | undefined
+
+    public previouseDiff: TextDiff[] | undefined
+    public selectedRange: vscode.Range
+    public inProgressReplacement: string | undefined
+    public replacement: string | undefined
+
+    // Telemetry fields
+    public requestId?: string
+    public responseStartLatency?: number
+    public responseEndLatency?: number
+
+    constructor(
+        public query: string,
+        public document: vscode.TextDocument,
+        selection: vscode.Selection
+    ) {
+        this.selectedRange = textDocumentUtil.expandSelectionToFullLines(document, selection)
+        this.selectedText = document.getText(this.selectedRange)
+        this.languageName = extractLanguageNameFromFile(document)
+    }
+
+    public revertDiff(): void {
+        this.diff = []
+        this.decorations = {
+            linesAdded: [],
+            linesRemoved: [],
+        }
+    }
+
+    public removeDiffChangeByRange(range: vscode.Range): void {
+        if (this.diff) {
+            this.diff = this.diff.filter((change) => !change.range.isEqual(range))
+        }
+    }
+
+    public updateDecorations(): void {
+        const isEmpty =
+            !this.decorations ||
+            (this.decorations?.linesAdded?.length === 0 && this.decorations?.linesRemoved?.length === 0)
+
+        if (isEmpty) {
+            return
+        }
+        const updatedDecorations = computeDecorations(this)
+        this.decorations = updatedDecorations
+    }
+
+    public updateDiff(affectedRange: vscode.Range, deletedLines: number) {
+        const diffsAfter = this.diff.filter((edit) => edit.range.start.isAfter(affectedRange.end))
+        for (const diff of diffsAfter) {
+            diff.range = new vscode.Range(
+                diff.range.start.translate(-deletedLines),
+                diff.range.end.translate(-deletedLines)
+            )
+        }
+    }
+
+    // Telemetry methods
+    public get numSelectedLines() {
+        return this.selectedText.split('\n').length
+    }
+
+    public get inputLength() {
+        return this.query.length
+    }
+
+    public inlineChatEventBase() {
+        let numSuggestionAddChars = 0
+        let numSuggestionAddLines = 0
+        let numSuggestionDelChars = 0
+        let numSuggestionDelLines = 0
+
+        for (const diff of this.diff) {
+            if (diff.type === 'insertion') {
+                numSuggestionAddChars += diff.replacementText.length
+                numSuggestionAddLines += diff.range.end.line - diff.range.start.line + 1
+            } else {
+                numSuggestionDelChars += diff.originalText.length
+                numSuggestionDelLines += diff.range.end.line - diff.range.start.line + 1
+            }
+        }
+
+        const programmingLanguage = this.languageName
+            ? {
+                  languageName: this.languageName,
+              }
+            : undefined
+
+        const event: Partial<InlineChatEvent> = {
+            requestId: this.requestId,
+            timestamp: new Date(),
+            inputLength: this.inputLength,
+            numSelectedLines: this.numSelectedLines,
+            codeIntent: true,
+            responseStartLatency: this.responseStartLatency,
+            responseEndLatency: this.responseEndLatency,
+            numSuggestionAddChars,
+            numSuggestionAddLines,
+            numSuggestionDelChars,
+            numSuggestionDelLines,
+            programmingLanguage,
+        }
+        return event
+    }
+
+    public isActiveState() {
+        return !(this.state === TaskState.Complete || this.state === TaskState.Error)
+    }
+}
diff --git a/packages/amazonq/src/inlineChat/decorations/computeDecorations.ts b/packages/amazonq/src/inlineChat/decorations/computeDecorations.ts
new file mode 100644
index 00000000000..fb289494b3f
--- /dev/null
+++ b/packages/amazonq/src/inlineChat/decorations/computeDecorations.ts
@@ -0,0 +1,32 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { InlineTask } from '../controller/inlineTask'
+import { Decorations } from './inlineDecorator'
+
+export function computeDecorations(task: InlineTask): Decorations | undefined {
+    if (!task.diff) {
+        return
+    }
+
+    const decorations: Decorations = {
+        linesAdded: [],
+        linesRemoved: [],
+    }
+
+    for (const edit of task.diff) {
+        const countChanged = edit.range.end.line - edit.range.start.line - 1
+        if (edit.type === 'deletion') {
+            decorations.linesRemoved.push({
+                range: new vscode.Range(edit.range.start.line, 0, edit.range.start.line + countChanged, 0),
+            })
+        } else if (edit.type === 'insertion') {
+            decorations.linesAdded.push({
+                range: new vscode.Range(edit.range.start.line, 0, edit.range.start.line + countChanged, 0),
+            })
+        }
+    }
+    return decorations
+}
diff --git a/packages/amazonq/src/inlineChat/decorations/inlineDecorator.ts b/packages/amazonq/src/inlineChat/decorations/inlineDecorator.ts
new file mode 100644
index 00000000000..3c4e3899e13
--- /dev/null
+++ b/packages/amazonq/src/inlineChat/decorations/inlineDecorator.ts
@@ -0,0 +1,38 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { InlineTask } from '../controller/inlineTask'
+
+export interface Decorations {
+    linesAdded: vscode.DecorationOptions[]
+    linesRemoved: vscode.DecorationOptions[]
+}
+
+const removedTextDecorationType = vscode.window.createTextEditorDecorationType({
+    backgroundColor: 'rgba(255, 0, 0, 0.1)',
+    isWholeLine: true,
+})
+
+const AddedTextDecorationType = vscode.window.createTextEditorDecorationType({
+    backgroundColor: 'rgba(0, 255, 0, 0.1)',
+    isWholeLine: true,
+})
+
+export class InlineDecorator {
+    public applyDecorations(task: InlineTask): void {
+        const decorations = task.decorations
+        if (!decorations) {
+            return
+        }
+        const editors = vscode.window.visibleTextEditors.filter(
+            (editor) => editor.document.uri.toString() === task.document.uri.toString()
+        )
+        for (const editor of editors) {
+            editor.setDecorations(AddedTextDecorationType, decorations.linesAdded ?? [])
+            editor.setDecorations(removedTextDecorationType, decorations.linesRemoved ?? [])
+        }
+    }
+}
diff --git a/packages/amazonq/src/inlineChat/output/computeDiff.ts b/packages/amazonq/src/inlineChat/output/computeDiff.ts
new file mode 100644
index 00000000000..a17a7914cf6
--- /dev/null
+++ b/packages/amazonq/src/inlineChat/output/computeDiff.ts
@@ -0,0 +1,115 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type LinesOptions, diffLines } from 'diff'
+import * as vscode from 'vscode'
+import { InlineTask, TextDiff } from '../controller/inlineTask'
+
+export function computeDiff(response: string, inlineTask: InlineTask, isPartialDiff: boolean): TextDiff[] | undefined {
+    if (!response) {
+        return
+    }
+    const selectedRange = inlineTask.selectedRange
+    const partialSelectedText = inlineTask.partialSelectedText ?? ''
+    const selectedText = isPartialDiff ? partialSelectedText : inlineTask.selectedText
+
+    const normalizedResponse =
+        getLeadingWhitespace(selectedText) + response.trim() + getTrailingWhitespace(selectedText)
+
+    const diffs = diffLines(selectedText, normalizedResponse, {
+        stripTrailingCr: true,
+        ignoreNewlineAtEof: true,
+    } as LinesOptions)
+
+    const textDiff: TextDiff[] = []
+    let startLine = selectedRange.start.line
+    for (const part of diffs) {
+        const count = part.count ?? 0
+        if (part.removed) {
+            if (part.value !== '\n') {
+                textDiff.push({
+                    type: 'deletion',
+                    originalText: part.value,
+                    range: new vscode.Range(startLine, 0, startLine + count, 0),
+                })
+            }
+        } else if (part.added) {
+            if (part.value !== '\n') {
+                // The partial response sometimes doesn't have the correct ending newline character (\n), so we ensure that every insertion respects the code formatting.
+                if (isPartialDiff && !part.value.endsWith('\n')) {
+                    part.value += '\n'
+                }
+                textDiff.push({
+                    type: 'insertion',
+                    replacementText: part.value,
+                    range: new vscode.Range(startLine, 0, startLine + count, 0),
+                })
+            }
+        }
+        startLine += count
+    }
+    inlineTask.diff = textDiff
+    return textDiff
+}
+
+export function adjustTextDiffForEditing(textDiff: TextDiff[]): TextDiff[] {
+    let linesAdded = 0
+    const adjustedDiff: TextDiff[] = []
+
+    for (const edit of textDiff) {
+        const { range, type } = edit
+        const { start, end } = range
+        const linesChanged = end.line - start.line
+
+        const adjustedRange = new vscode.Range(
+            new vscode.Position(start.line - linesAdded, start.character),
+            new vscode.Position(end.line - linesAdded, end.character)
+        )
+
+        adjustedDiff.push({
+            ...edit,
+            range: adjustedRange,
+        })
+
+        if (type === 'insertion') {
+            linesAdded += linesChanged
+        }
+    }
+
+    return adjustedDiff
+}
+
+export function getDiffBlocks(inlineTask: InlineTask): vscode.Range[] {
+    const diff = inlineTask.diff
+
+    if (!diff || diff.length === 0) {
+        return []
+    }
+
+    const diffBlocks: vscode.Range[] = []
+    let currentRange: vscode.Range | undefined
+
+    for (const change of diff) {
+        const { range } = change
+        if (!currentRange || range.start.line !== currentRange.end.line) {
+            currentRange = range
+            diffBlocks.push(range)
+        } else {
+            currentRange = new vscode.Range(currentRange.start, range.end)
+            diffBlocks[diffBlocks.length - 1] = currentRange
+        }
+    }
+
+    return diffBlocks
+}
+
+function getLeadingWhitespace(str: string): string {
+    const match = str.match(/^\s*/)
+    return match ? match[0] : ''
+}
+
+function getTrailingWhitespace(str: string): string {
+    const match = str.match(/\s*$/)
+    return match ? match[0] : ''
+}
diff --git a/packages/amazonq/src/inlineChat/output/responseTransformer.ts b/packages/amazonq/src/inlineChat/output/responseTransformer.ts
new file mode 100644
index 00000000000..b965ced519e
--- /dev/null
+++ b/packages/amazonq/src/inlineChat/output/responseTransformer.ts
@@ -0,0 +1,55 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { getLogger } from 'aws-core-vscode/shared'
+import { decode } from 'he'
+import { InlineTask } from '../controller/inlineTask'
+
+/**
+ * Transforms the response from the INLINE_CHAT GenerateAssistantResponse call.
+ *
+ * @param response - The raw response string from GenerateAssistantResponse.
+ * @param inlineTask - The inline task object containing information about the current task.
+ * @param isWholeResponse - A boolean indicating whether this is a complete response or a partial one.
+ * @returns The decoded response string, or undefined if an error occurs.
+ */
+export function responseTransformer(
+    response: string,
+    inlineTask: InlineTask,
+    isWholeResponse: boolean
+): string | undefined {
+    try {
+        const decodedResponse = decode(response)
+        if (!isWholeResponse) {
+            const [partialSelectedCode, right] = extractPartialCode(decodedResponse, inlineTask)
+            inlineTask.partialSelectedText = partialSelectedCode
+            inlineTask.partialSelectedTextRight = right
+            return decodedResponse
+        } else {
+            return decodedResponse
+        }
+    } catch (err) {
+        getLogger().error('An unknown error occurred: %s', (err as Error).message)
+        return undefined
+    }
+}
+
+/**
+ * This function is used to handle partial responses in inline tasks. It divides
+ * the selected text into two parts:
+ * 1. The "left" part, which contains the same number of lines as the response.
+ * 2. The "right" part, which contains the remaining lines.
+ *
+ * @param response - The response string from the assistant.
+ * @param inlineTask - The inline task object containing the full selected text.
+ * @returns A tuple with two strings: [leftPart, rightPart].
+ */
+function extractPartialCode(response: string, inlineTask: InlineTask): [string, string] {
+    const lineCount = response.split('\n').length
+    const splitLines = inlineTask.selectedText.split('\n')
+    const left = splitLines.slice(0, lineCount).join('\n')
+    const right = splitLines.slice(lineCount).join('\n')
+    return [left, right]
+}
diff --git a/packages/amazonq/src/inlineChat/provider/inlineChatProvider.ts b/packages/amazonq/src/inlineChat/provider/inlineChatProvider.ts
new file mode 100644
index 00000000000..c2dc94de36f
--- /dev/null
+++ b/packages/amazonq/src/inlineChat/provider/inlineChatProvider.ts
@@ -0,0 +1,249 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import {
+    CodeWhispererStreamingServiceException,
+    GenerateAssistantResponseCommandOutput,
+} from '@amzn/codewhisperer-streaming'
+import { BaseLanguageClient } from 'vscode-languageclient'
+import { inlineChatRequestType } from '@aws/language-server-runtimes/protocol'
+import { AuthUtil, getSelectedCustomization } from 'aws-core-vscode/codewhisperer'
+import {
+    ChatSessionStorage,
+    ChatTriggerType,
+    EditorContextExtractor,
+    PromptMessage,
+    TriggerEventsStorage,
+    TriggerPayload,
+    triggerPayloadToChatRequest,
+    UserIntentRecognizer,
+} from 'aws-core-vscode/codewhispererChat'
+import { AwsClientResponseError, getLogger, isAwsError, ToolkitError } from 'aws-core-vscode/shared'
+import { randomUUID } from 'crypto'
+import { codeWhispererClient } from 'aws-core-vscode/codewhisperer'
+import type { InlineChatEvent } from 'aws-core-vscode/codewhisperer'
+import { InlineTask } from '../controller/inlineTask'
+import { extractAuthFollowUp } from 'aws-core-vscode/amazonq'
+import { InlineChatParams, InlineChatResult } from '@aws/language-server-runtimes-types'
+import { decryptResponse, encryptRequest } from '../../lsp/encryption'
+import { getCursorState } from '../../lsp/utils'
+
+export class InlineChatProvider {
+    private readonly editorContextExtractor: EditorContextExtractor
+    private readonly userIntentRecognizer: UserIntentRecognizer
+    private readonly sessionStorage: ChatSessionStorage
+    private readonly triggerEventsStorage: TriggerEventsStorage
+    private errorEmitter = new vscode.EventEmitter<void>()
+    public onErrorOccured = this.errorEmitter.event
+
+    public constructor(
+        private readonly client: BaseLanguageClient,
+        private readonly encryptionKey: Buffer
+    ) {
+        this.editorContextExtractor = new EditorContextExtractor()
+        this.userIntentRecognizer = new UserIntentRecognizer()
+        this.sessionStorage = new ChatSessionStorage()
+        this.triggerEventsStorage = new TriggerEventsStorage()
+    }
+
+    private getCurrentEditorParams(prompt: string): InlineChatParams {
+        const editor = vscode.window.activeTextEditor
+        if (!editor) {
+            throw new ToolkitError('No active editor')
+        }
+
+        const documentUri = editor.document.uri.toString()
+        const cursorState = getCursorState(editor.selections)
+        return {
+            prompt: {
+                prompt,
+            },
+            cursorState,
+            textDocument: {
+                uri: documentUri,
+            },
+        }
+    }
+
+    public async processPromptMessageLSP(message: PromptMessage): Promise<InlineChatResult> {
+        // TODO: handle partial responses.
+        getLogger().info('Making inline chat request with message %O', message)
+        const params = this.getCurrentEditorParams(message.message ?? '')
+
+        const inlineChatRequest = await encryptRequest<InlineChatParams>(params, this.encryptionKey)
+        const response = await this.client.sendRequest(inlineChatRequestType.method, inlineChatRequest)
+        const inlineChatResponse = await decryptResponse<InlineChatResult>(response, this.encryptionKey)
+        this.client.info(`Logging response for inline chat ${JSON.stringify(inlineChatResponse)}`)
+
+        return inlineChatResponse
+    }
+
+    // TODO: remove in favor of LSP implementation.
+    public async processPromptMessage(message: PromptMessage) {
+        return this.editorContextExtractor
+            .extractContextForTrigger('ChatMessage')
+            .then((context) => {
+                const triggerID = randomUUID()
+                this.triggerEventsStorage.addTriggerEvent({
+                    id: triggerID,
+                    tabID: message.tabID,
+                    message: message.message,
+                    type: 'inline_chat',
+                    context,
+                })
+                return this.generateResponse(
+                    {
+                        message: message.message ?? '',
+                        trigger: ChatTriggerType.InlineChatMessage,
+                        query: message.message,
+                        codeSelection: context?.focusAreaContext?.selectionInsideExtendedCodeBlock,
+                        fileText: context?.focusAreaContext?.extendedCodeBlock ?? '',
+                        fileLanguage: context?.activeFileContext?.fileLanguage,
+                        filePath: context?.activeFileContext?.filePath,
+                        matchPolicy: context?.activeFileContext?.matchPolicy,
+                        codeQuery: context?.focusAreaContext?.names,
+                        userIntent: this.userIntentRecognizer.getFromPromptChatMessage(message),
+                        customization: getSelectedCustomization(),
+                        profile: AuthUtil.instance.regionProfileManager.activeRegionProfile,
+                        context: [],
+                        relevantTextDocuments: [],
+                        additionalContents: [],
+                        documentReferences: [],
+                        useRelevantDocuments: false,
+                        contextLengths: {
+                            additionalContextLengths: {
+                                fileContextLength: 0,
+                                promptContextLength: 0,
+                                ruleContextLength: 0,
+                            },
+                            truncatedAdditionalContextLengths: {
+                                fileContextLength: 0,
+                                promptContextLength: 0,
+                                ruleContextLength: 0,
+                            },
+                            workspaceContextLength: 0,
+                            truncatedWorkspaceContextLength: 0,
+                            userInputContextLength: 0,
+                            truncatedUserInputContextLength: 0,
+                            focusFileContextLength: 0,
+                            truncatedFocusFileContextLength: 0,
+                        },
+                    },
+                    triggerID
+                )
+            })
+            .catch((e) => {
+                this.processException(e, message.tabID)
+            })
+    }
+
+    private async generateResponse(
+        triggerPayload: TriggerPayload & { projectContextQueryLatencyMs?: number },
+        triggerID: string
+    ) {
+        const triggerEvent = this.triggerEventsStorage.getTriggerEvent(triggerID)
+        if (triggerEvent === undefined) {
+            return
+        }
+
+        if (triggerEvent.tabID === 'no-available-tabs') {
+            return
+        }
+
+        if (triggerEvent.tabID === undefined) {
+            setTimeout(() => {
+                this.generateResponse(triggerPayload, triggerID).catch((e) => {
+                    getLogger().error('generateResponse failed: %s', (e as Error).message)
+                })
+            }, 20)
+            return
+        }
+
+        const tabID = triggerEvent.tabID
+
+        const credentialsState = await AuthUtil.instance.getChatAuthState()
+        if (
+            !(credentialsState.codewhispererChat === 'connected' && credentialsState.codewhispererCore === 'connected')
+        ) {
+            const { message } = extractAuthFollowUp(credentialsState)
+            this.errorEmitter.fire()
+            throw new ToolkitError(message)
+        }
+        triggerPayload.useRelevantDocuments = false
+
+        const request = triggerPayloadToChatRequest(triggerPayload)
+        const session = this.sessionStorage.getSession(tabID)
+        getLogger().debug(
+            `request from tab: ${tabID} conversationID: ${session.sessionIdentifier} request: %O`,
+            request
+        )
+
+        let response: GenerateAssistantResponseCommandOutput | undefined = undefined
+        session.createNewTokenSource()
+        try {
+            response = await session.chatSso(request)
+            getLogger().info(
+                `response to tab: ${tabID} conversationID: ${session.sessionIdentifier} requestID: ${response.$metadata.requestId} metadata: %O`,
+                response.$metadata
+            )
+        } catch (e: any) {
+            this.processException(e, tabID)
+        }
+
+        return response
+    }
+
+    private processException(e: any, tabID: string) {
+        let errorMessage: string | undefined
+        let requestID: string | undefined
+        if (typeof e === 'string') {
+            errorMessage = e.toUpperCase()
+        } else if (e instanceof SyntaxError) {
+            // Workaround to handle case when LB returns web-page with error and our client doesn't return proper exception
+            errorMessage = AwsClientResponseError.tryExtractReasonFromSyntaxError(e)
+        } else if (e instanceof CodeWhispererStreamingServiceException) {
+            errorMessage = e.message
+            requestID = e.$metadata.requestId
+        } else if (e instanceof Error) {
+            errorMessage = e.message
+        }
+
+        this.errorEmitter.fire()
+        this.sessionStorage.deleteSession(tabID)
+
+        throw ToolkitError.chain(e, errorMessage ?? 'Failed to get response', {
+            details: {
+                tabID,
+                requestID,
+            },
+        })
+    }
+
+    public sendTelemetryEvent(inlineChatEvent: InlineChatEvent, currentTask?: InlineTask) {
+        codeWhispererClient
+            .sendTelemetryEvent({
+                telemetryEvent: {
+                    inlineChatEvent: {
+                        ...inlineChatEvent,
+                        ...(currentTask?.inlineChatEventBase() ?? {}),
+                    },
+                },
+            })
+            .then()
+            .catch((error) => {
+                let requestId: string | undefined
+                if (isAwsError(error)) {
+                    requestId = error.requestId
+                }
+
+                getLogger().debug(
+                    `Failed to sendTelemetryEvent to CodeWhisperer, requestId: ${
+                        requestId ?? ''
+                    }, message: ${error.message}`
+                )
+            })
+    }
+}
diff --git a/packages/amazonq/src/lsp/activation.ts b/packages/amazonq/src/lsp/activation.ts
new file mode 100644
index 00000000000..e2c1b6899d9
--- /dev/null
+++ b/packages/amazonq/src/lsp/activation.ts
@@ -0,0 +1,30 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import vscode from 'vscode'
+import { startLanguageServer } from './client'
+import { AmazonQLspInstaller, getBundledResourcePaths } from './lspInstaller'
+import { lspSetupStage, ToolkitError, messages, getLogger } from 'aws-core-vscode/shared'
+
+export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
+    try {
+        await lspSetupStage('all', async () => {
+            const installResult = await new AmazonQLspInstaller().resolve()
+            await lspSetupStage('launch', async () => await startLanguageServer(ctx, installResult.resourcePaths))
+        })
+    } catch (err) {
+        const e = err as ToolkitError
+        getLogger('amazonqLsp').warn(`Failed to start downloaded LSP, falling back to bundled LSP: ${e.message}`)
+        try {
+            await lspSetupStage('all', async () => {
+                await lspSetupStage('launch', async () => await startLanguageServer(ctx, getBundledResourcePaths(ctx)))
+            })
+        } catch (error) {
+            void messages.showViewLogsMessage(
+                `Failed to launch Amazon Q language server: ${(error as ToolkitError).message}`
+            )
+        }
+    }
+}
diff --git a/packages/amazonq/src/lsp/auth.ts b/packages/amazonq/src/lsp/auth.ts
new file mode 100644
index 00000000000..b4093362004
--- /dev/null
+++ b/packages/amazonq/src/lsp/auth.ts
@@ -0,0 +1,180 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    bearerCredentialsUpdateRequestType,
+    iamCredentialsUpdateRequestType,
+    ConnectionMetadata,
+    NotificationType,
+    RequestType,
+    ResponseMessage,
+    UpdateCredentialsParams,
+} from '@aws/language-server-runtimes/protocol'
+import * as jose from 'jose'
+import * as crypto from 'crypto'
+import { BaseLanguageClient } from 'vscode-languageclient'
+import { AuthUtil } from 'aws-core-vscode/codewhisperer'
+import { Writable } from 'stream'
+import { onceChanged, onceChangedWithComparator } from 'aws-core-vscode/utils'
+import { getLogger, oneMinute, isSageMaker } from 'aws-core-vscode/shared'
+import { isSsoConnection, isIamConnection, areCredentialsEqual } from 'aws-core-vscode/auth'
+
+export const encryptionKey = crypto.randomBytes(32)
+
+/**
+ * Sends a json payload to the language server, who is waiting to know what the encryption key is.
+ * Code reference: https://github.com/aws/language-servers/blob/7da212185a5da75a72ce49a1a7982983f438651a/client/vscode/src/credentialsActivation.ts#L77
+ */
+export function writeEncryptionInit(stream: Writable): void {
+    const request = {
+        version: '1.0',
+        mode: 'JWT',
+        key: encryptionKey.toString('base64'),
+    }
+    stream.write(JSON.stringify(request))
+    stream.write('\n')
+}
+
+/**
+ * Request for custom notifications that Update Credentials and tokens.
+ * See core\aws-lsp-core\src\credentials\updateCredentialsRequest.ts for details
+ */
+export interface UpdateCredentialsRequest {
+    /**
+     * Encrypted token (JWT or PASETO)
+     * The token's contents differ whether IAM or Bearer token is sent
+     */
+    data: string
+    /**
+     * Used by the runtime based language servers.
+     * Signals that this client will encrypt its credentials payloads.
+     */
+    encrypted: boolean
+}
+
+export const notificationTypes = {
+    updateBearerToken: new RequestType<UpdateCredentialsRequest, ResponseMessage, Error>(
+        'aws/credentials/token/update'
+    ),
+    deleteBearerToken: new NotificationType('aws/credentials/token/delete'),
+    getConnectionMetadata: new RequestType<undefined, ConnectionMetadata, Error>(
+        'aws/credentials/getConnectionMetadata'
+    ),
+}
+
+/**
+ * Facade over our VSCode Auth that does crud operations on the language server auth
+ */
+export class AmazonQLspAuth {
+    #logErrorIfChanged = onceChanged((s) => getLogger('amazonqLsp').error(s))
+    constructor(
+        private readonly client: BaseLanguageClient,
+        private readonly authUtil: AuthUtil = AuthUtil.instance
+    ) {}
+
+    /**
+     * @param force bypass memoization, and forcefully update the bearer token
+     */
+    async refreshConnection(force: boolean = false) {
+        const activeConnection = this.authUtil.conn
+        if (this.authUtil.isConnectionValid()) {
+            if (isSsoConnection(activeConnection)) {
+                // Existing SSO path
+                const token = await this.authUtil.getBearerToken()
+                await (force ? this._updateBearerToken(token) : this.updateBearerToken(token))
+            } else if (isSageMaker() && isIamConnection(activeConnection)) {
+                // New SageMaker IAM path
+                const credentials = await this.authUtil.getCredentials()
+                await (force ? this._updateIamCredentials(credentials) : this.updateIamCredentials(credentials))
+            }
+        }
+    }
+
+    async logRefreshError(e: unknown) {
+        const err = e as Error
+        this.#logErrorIfChanged(`Unable to update bearer token: ${err.name}:${err.message}`)
+    }
+
+    public updateBearerToken = onceChanged(this._updateBearerToken.bind(this))
+    private async _updateBearerToken(token: string) {
+        const request = await this.createUpdateBearerCredentialsRequest(token)
+
+        // "aws/credentials/token/update"
+        // https://github.com/aws/language-servers/blob/44d81f0b5754747d77bda60b40cc70950413a737/core/aws-lsp-core/src/credentials/credentialsProvider.ts#L27
+        await this.client.sendRequest(bearerCredentialsUpdateRequestType.method, request)
+
+        this.client.info(`UpdateBearerToken: ${JSON.stringify(request)}`)
+    }
+
+    public updateIamCredentials = onceChangedWithComparator(
+        this._updateIamCredentials.bind(this),
+        ([prevCreds], [currentCreds]) => areCredentialsEqual(prevCreds, currentCreds)
+    )
+    private async _updateIamCredentials(credentials: any) {
+        getLogger().info(
+            `[SageMaker Debug] Updating IAM credentials - credentials received: ${credentials ? 'YES' : 'NO'}`
+        )
+        if (credentials) {
+            getLogger().info(
+                `[SageMaker Debug] IAM credentials structure: accessKeyId=${credentials.accessKeyId ? 'present' : 'missing'}, secretAccessKey=${credentials.secretAccessKey ? 'present' : 'missing'}, sessionToken=${credentials.sessionToken ? 'present' : 'missing'},  expiration=${credentials.expiration ? 'present' : 'missing'}`
+            )
+        }
+
+        const request = await this.createUpdateIamCredentialsRequest(credentials)
+
+        // "aws/credentials/iam/update"
+        await this.client.sendRequest(iamCredentialsUpdateRequestType.method, request)
+
+        this.client.info(`UpdateIamCredentials: ${JSON.stringify(request)}`)
+        getLogger().info(`[SageMaker Debug] IAM credentials update request sent successfully`)
+    }
+
+    public startTokenRefreshInterval(pollingTime: number = oneMinute / 2) {
+        const interval = setInterval(async () => {
+            await this.refreshConnection().catch((e) => this.logRefreshError(e))
+        }, pollingTime)
+        return interval
+    }
+
+    private async createUpdateBearerCredentialsRequest(token: string): Promise<UpdateCredentialsParams> {
+        const bearerCredentials = { token }
+        const payload = new TextEncoder().encode(JSON.stringify({ data: bearerCredentials }))
+
+        const jwt = await new jose.CompactEncrypt(payload)
+            .setProtectedHeader({ alg: 'dir', enc: 'A256GCM' })
+            .encrypt(encryptionKey)
+
+        return {
+            data: jwt,
+            metadata: {
+                sso: {
+                    startUrl: AuthUtil.instance.startUrl,
+                },
+            },
+            encrypted: true,
+        }
+    }
+
+    private async createUpdateIamCredentialsRequest(credentials: any): Promise<UpdateCredentialsParams> {
+        // Extract IAM credentials structure
+        const iamCredentials = {
+            accessKeyId: credentials.accessKeyId,
+            secretAccessKey: credentials.secretAccessKey,
+            sessionToken: credentials.sessionToken,
+            expiration: credentials.expiration,
+        }
+        const payload = new TextEncoder().encode(JSON.stringify({ data: iamCredentials }))
+
+        const jwt = await new jose.CompactEncrypt(payload)
+            .setProtectedHeader({ alg: 'dir', enc: 'A256GCM' })
+            .encrypt(encryptionKey)
+
+        return {
+            data: jwt,
+            // Omit metadata for IAM credentials since startUrl is undefined for non-SSO connections
+            encrypted: true,
+        }
+    }
+}
diff --git a/packages/amazonq/src/lsp/chat/activation.ts b/packages/amazonq/src/lsp/chat/activation.ts
new file mode 100644
index 00000000000..93f4d68cf2a
--- /dev/null
+++ b/packages/amazonq/src/lsp/chat/activation.ts
@@ -0,0 +1,104 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { window } from 'vscode'
+import { BaseLanguageClient } from 'vscode-languageclient'
+import { AmazonQChatViewProvider } from './webviewProvider'
+import { focusAmazonQPanel, registerCommands } from './commands'
+import {
+    registerActiveEditorChangeListener,
+    registerLanguageServerEventListener,
+    registerMessageListeners,
+} from './messages'
+import { Commands, getLogger, globals, undefinedIfEmpty } from 'aws-core-vscode/shared'
+import { activate as registerLegacyChatListeners } from '../../app/chat/activation'
+import { DefaultAmazonQAppInitContext } from 'aws-core-vscode/amazonq'
+import { AuthUtil, getSelectedCustomization } from 'aws-core-vscode/codewhisperer'
+import { pushConfigUpdate } from '../config'
+import { AutoDebugLspClient } from './autoDebug/lsp/autoDebugLspClient'
+
+export async function activate(languageClient: BaseLanguageClient, encryptionKey: Buffer, mynahUIPath: string) {
+    const disposables = globals.context.subscriptions
+
+    const provider = new AmazonQChatViewProvider(mynahUIPath, languageClient)
+
+    // Set the chat view provider for AutoDebug to use
+    AutoDebugLspClient.setChatViewProvider(provider)
+
+    disposables.push(
+        window.registerWebviewViewProvider(AmazonQChatViewProvider.viewType, provider, {
+            webviewOptions: {
+                retainContextWhenHidden: true,
+            },
+        })
+    )
+
+    /**
+     * Commands are registered independent of the webview being open because when they're executed
+     * they focus the webview
+     **/
+    registerCommands(provider)
+    registerLanguageServerEventListener(languageClient, provider)
+    registerActiveEditorChangeListener(languageClient)
+
+    provider.onDidResolveWebview(() => {
+        const disposable = DefaultAmazonQAppInitContext.instance.getAppsToWebViewMessageListener().onMessage((msg) => {
+            /**
+             * codewhispers app handler is still registered because the activation flow hasn't been refactored.
+             * We need to explicitly deny events like restoreTabMessage, otherwise they will be forwarded to the frontend
+             *
+             */
+            if (msg.sender === 'CWChat' && ['restoreTabMessage', 'contextCommandData'].includes(msg.type)) {
+                return
+            }
+            provider.webview?.postMessage(msg).then(undefined, (e) => {
+                getLogger().error('webView.postMessage failed: %s', (e as Error).message)
+            })
+        })
+
+        if (provider.webviewView) {
+            disposables.push(
+                provider.webviewView.onDidDispose(() => {
+                    disposable.dispose()
+                })
+            )
+        }
+
+        registerMessageListeners(languageClient, provider, encryptionKey)
+    })
+
+    // register event listeners from the legacy agent flow
+    await registerLegacyChatListeners(globals.context)
+
+    disposables.push(
+        AuthUtil.instance.regionProfileManager.onDidChangeRegionProfile(async () => {
+            await provider.refreshWebview()
+        }),
+        Commands.register('aws.amazonq.updateCustomizations', () => {
+            void pushConfigUpdate(languageClient, {
+                type: 'customization',
+                customization: undefinedIfEmpty(getSelectedCustomization().arn),
+            })
+        }),
+        Commands.register('aws.amazonq.manageSubscription', () => {
+            focusAmazonQPanel().catch((e: Error) => languageClient.error(`[VSCode Client] focusAmazonQPanel() failed`))
+
+            languageClient
+                .sendRequest('workspace/executeCommand', {
+                    command: 'aws/chat/manageSubscription',
+                    // arguments: [],
+                })
+                .catch((e: Error) => {
+                    getLogger('amazonqLsp').error('failed request: aws/chat/manageSubscription: %O', e)
+                })
+        }),
+        globals.logOutputChannel.onDidChangeLogLevel((logLevel) => {
+            getLogger('amazonqLsp').info(`Local log level changed to ${logLevel}, notifying LSP`)
+            void pushConfigUpdate(languageClient, {
+                type: 'logLevel',
+            })
+        })
+    )
+}
diff --git a/packages/amazonq/src/lsp/chat/autoDebug/activation.ts b/packages/amazonq/src/lsp/chat/autoDebug/activation.ts
new file mode 100644
index 00000000000..f18c82c237a
--- /dev/null
+++ b/packages/amazonq/src/lsp/chat/autoDebug/activation.ts
@@ -0,0 +1,78 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from 'aws-core-vscode/shared'
+import { AutoDebugCommands } from './commands'
+import { AutoDebugCodeActionsProvider } from './codeActionsProvider'
+import { AutoDebugController } from './controller'
+
+/**
+ * Auto Debug feature activation for Amazon Q
+ * This handles the complete lifecycle of the auto debug feature
+ */
+export class AutoDebugFeature implements vscode.Disposable {
+    private readonly logger = getLogger()
+    private readonly disposables: vscode.Disposable[] = []
+
+    private autoDebugCommands?: AutoDebugCommands
+    private codeActionsProvider?: AutoDebugCodeActionsProvider
+    private controller?: AutoDebugController
+
+    constructor(private readonly context: vscode.ExtensionContext) {}
+
+    /**
+     * Activate the auto debug feature
+     */
+    async activate(): Promise<void> {
+        try {
+            // Initialize the controller first
+            this.controller = new AutoDebugController()
+
+            // Initialize commands and register them with the controller
+            this.autoDebugCommands = new AutoDebugCommands()
+            this.autoDebugCommands.registerCommands(this.context, this.controller)
+
+            // Initialize code actions provider
+            this.codeActionsProvider = new AutoDebugCodeActionsProvider()
+            this.context.subscriptions.push(this.codeActionsProvider)
+
+            // Add all to disposables
+            this.disposables.push(this.controller, this.autoDebugCommands, this.codeActionsProvider)
+        } catch (error) {
+            this.logger.error('AutoDebugFeature: Failed to activate auto debug feature: %s', error)
+            throw error
+        }
+    }
+
+    /**
+     * Get the auto debug controller instance
+     */
+    getController(): AutoDebugController | undefined {
+        return this.controller
+    }
+
+    /**
+     * Dispose of all resources
+     */
+    dispose(): void {
+        vscode.Disposable.from(...this.disposables).dispose()
+    }
+}
+
+/**
+ * Factory function to activate auto debug feature with LSP client
+ * This is the main entry point for activating auto debug
+ */
+export async function activateAutoDebug(
+    context: vscode.ExtensionContext,
+    client?: any,
+    encryptionKey?: Buffer
+): Promise<AutoDebugFeature> {
+    const feature = new AutoDebugFeature(context)
+    await feature.activate()
+
+    return feature
+}
diff --git a/packages/amazonq/src/lsp/chat/autoDebug/codeActionsProvider.ts b/packages/amazonq/src/lsp/chat/autoDebug/codeActionsProvider.ts
new file mode 100644
index 00000000000..aed926eaacf
--- /dev/null
+++ b/packages/amazonq/src/lsp/chat/autoDebug/codeActionsProvider.ts
@@ -0,0 +1,119 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+
+/**
+ * Provides code actions for Amazon Q Auto Debug features.
+ * Integrates with VS Code's quick fix system to offer debugging assistance.
+ */
+export class AutoDebugCodeActionsProvider implements vscode.CodeActionProvider, vscode.Disposable {
+    private readonly disposables: vscode.Disposable[] = []
+
+    public static readonly providedCodeActionKinds = [vscode.CodeActionKind.QuickFix, vscode.CodeActionKind.Refactor]
+
+    constructor() {
+        this.registerProvider()
+    }
+
+    private registerProvider(): void {
+        // Register for all file types
+        const selector: vscode.DocumentSelector = [{ scheme: 'file' }]
+
+        this.disposables.push(
+            vscode.languages.registerCodeActionsProvider(selector, this, {
+                providedCodeActionKinds: AutoDebugCodeActionsProvider.providedCodeActionKinds,
+            })
+        )
+    }
+
+    /**
+     * Provides code actions for the given document and range
+     */
+    public provideCodeActions(
+        document: vscode.TextDocument,
+        range: vscode.Range | vscode.Selection,
+        context: vscode.CodeActionContext,
+        token: vscode.CancellationToken
+    ): vscode.ProviderResult<(vscode.CodeAction | vscode.Command)[]> {
+        if (token.isCancellationRequested) {
+            return []
+        }
+
+        const actions: vscode.CodeAction[] = []
+
+        // Get diagnostics for the current range
+        const diagnostics = context.diagnostics.filter(
+            (diagnostic) => diagnostic.range.intersection(range) !== undefined
+        )
+
+        if (diagnostics.length > 0) {
+            // Add "Fix with Amazon Q" action
+            actions.push(this.createFixWithQAction(document, range, diagnostics))
+
+            // Add "Fix All with Amazon Q" action
+            actions.push(this.createFixAllWithQAction(document))
+
+            // Add "Explain Problem" action
+            actions.push(this.createExplainProblemAction(document, range, diagnostics))
+        }
+        return actions
+    }
+
+    private createFixWithQAction(
+        document: vscode.TextDocument,
+        range: vscode.Range,
+        diagnostics: vscode.Diagnostic[]
+    ): vscode.CodeAction {
+        const action = new vscode.CodeAction(
+            `Amazon Q: Fix Problem (${diagnostics.length} issue${diagnostics.length !== 1 ? 's' : ''})`,
+            vscode.CodeActionKind.QuickFix
+        )
+
+        action.command = {
+            command: 'amazonq.01.fixWithQ',
+            title: 'Amazon Q: Fix Problem',
+            arguments: [range, diagnostics],
+        }
+
+        action.diagnostics = diagnostics
+        action.isPreferred = true // Make this the preferred quick fix
+
+        return action
+    }
+
+    private createFixAllWithQAction(document: vscode.TextDocument): vscode.CodeAction {
+        const action = new vscode.CodeAction('Amazon Q: Fix All Errors', vscode.CodeActionKind.QuickFix)
+
+        action.command = {
+            command: 'amazonq.02.fixAllWithQ',
+            title: 'Amazon Q: Fix All Errors',
+        }
+
+        return action
+    }
+
+    private createExplainProblemAction(
+        document: vscode.TextDocument,
+        range: vscode.Range,
+        diagnostics: vscode.Diagnostic[]
+    ): vscode.CodeAction {
+        const action = new vscode.CodeAction('Amazon Q: Explain Problem', vscode.CodeActionKind.QuickFix)
+
+        action.command = {
+            command: 'amazonq.03.explainProblem',
+            title: 'Amazon Q: Explain Problem',
+            arguments: [range, diagnostics],
+        }
+
+        action.diagnostics = diagnostics
+
+        return action
+    }
+
+    public dispose(): void {
+        vscode.Disposable.from(...this.disposables).dispose()
+    }
+}
diff --git a/packages/amazonq/src/lsp/chat/autoDebug/commands.ts b/packages/amazonq/src/lsp/chat/autoDebug/commands.ts
new file mode 100644
index 00000000000..ecdbf80d1e0
--- /dev/null
+++ b/packages/amazonq/src/lsp/chat/autoDebug/commands.ts
@@ -0,0 +1,177 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { Commands, getLogger, messages } from 'aws-core-vscode/shared'
+import { AutoDebugController } from './controller'
+import { autoDebugTelemetry } from './telemetry'
+
+/**
+ * Auto Debug commands for Amazon Q
+ * Handles all command registrations and implementations
+ */
+export class AutoDebugCommands implements vscode.Disposable {
+    private readonly logger = getLogger()
+    private readonly disposables: vscode.Disposable[] = []
+    private controller!: AutoDebugController
+
+    /**
+     * Register all auto debug commands
+     */
+    registerCommands(context: vscode.ExtensionContext, controller: AutoDebugController): void {
+        this.controller = controller
+        this.disposables.push(
+            // Fix with Amazon Q command
+            Commands.register(
+                {
+                    id: 'amazonq.01.fixWithQ',
+                    name: 'Amazon Q: Fix Problem',
+                },
+                async (range?: vscode.Range, diagnostics?: vscode.Diagnostic[]) => {
+                    await this.fixWithAmazonQ(range, diagnostics)
+                }
+            ),
+
+            // Fix All with Amazon Q command
+            Commands.register(
+                {
+                    id: 'amazonq.02.fixAllWithQ',
+                    name: 'Amazon Q: Fix All Errors',
+                },
+                async () => {
+                    await this.fixAllWithAmazonQ()
+                }
+            ),
+
+            // Explain Problem with Amazon Q command
+            Commands.register(
+                {
+                    id: 'amazonq.03.explainProblem',
+                    name: 'Amazon Q: Explain Problem',
+                },
+                async (range?: vscode.Range, diagnostics?: vscode.Diagnostic[]) => {
+                    await this.explainProblem(range, diagnostics)
+                }
+            )
+        )
+
+        // Add all disposables to context
+        context.subscriptions.push(...this.disposables)
+    }
+
+    /**
+     * Generic error handling wrapper for command execution
+     */
+    private async executeWithErrorHandling<T>(
+        action: () => Promise<T>,
+        errorMessage: string,
+        logContext: string
+    ): Promise<T | void> {
+        try {
+            return await action()
+        } catch (error) {
+            this.logger.error(`AutoDebugCommands: Error in ${logContext}: %s`, error)
+
+            // Record telemetry failure based on context
+            const commandType =
+                logContext === 'fixWithAmazonQ'
+                    ? 'fixWithQ'
+                    : logContext === 'fixAllWithAmazonQ'
+                      ? 'fixAllWithQ'
+                      : 'explainProblem'
+            autoDebugTelemetry.recordCommandFailure(commandType, String(error))
+
+            void messages.showMessage('error', 'Amazon Q was not able to fix or explain the problem. Try again shortly')
+        }
+    }
+
+    /**
+     * Check if there's an active editor and log warning if not
+     */
+    private checkActiveEditor(): vscode.TextEditor | undefined {
+        const editor = vscode.window.activeTextEditor
+        if (!editor) {
+            this.logger.warn('AutoDebugCommands: No active editor found')
+        }
+        return editor
+    }
+
+    /**
+     * Fix with Amazon Q - fixes only the specific issues the user selected
+     */
+    private async fixWithAmazonQ(range?: vscode.Range, diagnostics?: vscode.Diagnostic[]): Promise<void> {
+        const problemCount = diagnostics?.length
+        autoDebugTelemetry.recordCommandInvocation('fixWithQ', problemCount)
+
+        await this.executeWithErrorHandling(
+            async () => {
+                const editor = this.checkActiveEditor()
+                if (!editor) {
+                    return
+                }
+                const saved = await editor.document.save()
+                if (!saved) {
+                    throw new Error('Failed to save document')
+                }
+                await this.controller.fixSpecificProblems(range, diagnostics)
+                autoDebugTelemetry.recordCommandSuccess('fixWithQ', problemCount)
+            },
+            'Fix with Amazon Q',
+            'fixWithAmazonQ'
+        )
+    }
+
+    /**
+     * Fix All with Amazon Q - processes all errors in the current file
+     */
+    private async fixAllWithAmazonQ(): Promise<void> {
+        autoDebugTelemetry.recordCommandInvocation('fixAllWithQ')
+
+        await this.executeWithErrorHandling(
+            async () => {
+                const editor = this.checkActiveEditor()
+                if (!editor) {
+                    return
+                }
+                const saved = await editor.document.save()
+                if (!saved) {
+                    throw new Error('Failed to save document')
+                }
+                const problemCount = await this.controller.fixAllProblemsInFile(10) // 10 errors per batch
+                autoDebugTelemetry.recordCommandSuccess('fixAllWithQ', problemCount)
+            },
+            'Fix All with Amazon Q',
+            'fixAllWithAmazonQ'
+        )
+    }
+
+    /**
+     * Explains the problem using Amazon Q
+     */
+    private async explainProblem(range?: vscode.Range, diagnostics?: vscode.Diagnostic[]): Promise<void> {
+        const problemCount = diagnostics?.length
+        autoDebugTelemetry.recordCommandInvocation('explainProblem', problemCount)
+
+        await this.executeWithErrorHandling(
+            async () => {
+                const editor = this.checkActiveEditor()
+                if (!editor) {
+                    return
+                }
+                await this.controller.explainProblems(range, diagnostics)
+                autoDebugTelemetry.recordCommandSuccess('explainProblem', problemCount)
+            },
+            'Explain Problem',
+            'explainProblem'
+        )
+    }
+
+    /**
+     * Dispose of all resources
+     */
+    dispose(): void {
+        vscode.Disposable.from(...this.disposables).dispose()
+    }
+}
diff --git a/packages/amazonq/src/lsp/chat/autoDebug/controller.ts b/packages/amazonq/src/lsp/chat/autoDebug/controller.ts
new file mode 100644
index 00000000000..66dcc83b21d
--- /dev/null
+++ b/packages/amazonq/src/lsp/chat/autoDebug/controller.ts
@@ -0,0 +1,206 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger, randomUUID, messages } from 'aws-core-vscode/shared'
+import { AutoDebugLspClient } from './lsp/autoDebugLspClient'
+import { mapDiagnosticSeverity } from './shared/diagnosticUtils'
+import { ErrorContextFormatter } from './diagnostics/errorContext'
+import { Problem } from './diagnostics/problemDetector'
+export interface AutoDebugConfig {
+    readonly enabled: boolean
+    readonly excludedSources: string[]
+    readonly severityFilter: ('error' | 'warning' | 'info' | 'hint')[]
+}
+
+/**
+ * Simplified controller for Amazon Q Auto Debug system.
+ * Focuses on context menu and quick fix functionality without workspace-wide monitoring.
+ */
+export class AutoDebugController implements vscode.Disposable {
+    private readonly logger = getLogger()
+    private readonly lspClient: AutoDebugLspClient
+    private readonly errorFormatter: ErrorContextFormatter
+    private readonly disposables: vscode.Disposable[] = []
+
+    private config: AutoDebugConfig
+
+    constructor(config?: Partial<AutoDebugConfig>) {
+        this.config = {
+            enabled: true,
+            excludedSources: [], // No default exclusions - let users configure as needed
+            severityFilter: ['error'], // Only auto-fix errors, not warnings
+            ...config,
+        }
+
+        this.lspClient = new AutoDebugLspClient()
+        this.errorFormatter = new ErrorContextFormatter()
+    }
+
+    /**
+     * Extract common logic for getting problems from diagnostics
+     */
+    private async getProblemsFromDiagnostics(
+        range?: vscode.Range,
+        diagnostics?: vscode.Diagnostic[]
+    ): Promise<{ editor: vscode.TextEditor; problems: Problem[] } | undefined> {
+        const editor = vscode.window.activeTextEditor
+        if (!editor) {
+            throw new Error('No active editor found')
+        }
+
+        // Use provided diagnostics or get diagnostics for the range
+        let targetDiagnostics = diagnostics
+        if (!targetDiagnostics && range) {
+            const allDiagnostics = vscode.languages.getDiagnostics(editor.document.uri)
+            targetDiagnostics = allDiagnostics.filter((d) => d.range.intersection(range) !== undefined)
+        }
+
+        if (!targetDiagnostics || targetDiagnostics.length === 0) {
+            return undefined
+        }
+
+        // Convert diagnostics to problems
+        const problems = targetDiagnostics.map((diagnostic) => ({
+            uri: editor.document.uri,
+            diagnostic,
+            severity: mapDiagnosticSeverity(diagnostic.severity),
+            source: diagnostic.source || 'unknown',
+            isNew: false,
+        }))
+
+        return { editor, problems }
+    }
+
+    /**
+     * Filter diagnostics to only errors and apply source filtering
+     */
+    private filterErrorDiagnostics(diagnostics: vscode.Diagnostic[]): vscode.Diagnostic[] {
+        return diagnostics.filter((d) => {
+            if (d.severity !== vscode.DiagnosticSeverity.Error) {
+                return false
+            }
+            // Apply source filtering
+            if (this.config.excludedSources.length > 0 && d.source) {
+                return !this.config.excludedSources.includes(d.source)
+            }
+            return true
+        })
+    }
+
+    /**
+     * Fix specific problems in the code
+     */
+    async fixSpecificProblems(range?: vscode.Range, diagnostics?: vscode.Diagnostic[]): Promise<void> {
+        try {
+            const result = await this.getProblemsFromDiagnostics(range, diagnostics)
+            if (!result) {
+                return
+            }
+            const fixMessage = this.createFixMessage(result.editor.document.uri.fsPath, result.problems)
+            await this.sendMessageToChat(fixMessage)
+        } catch (error) {
+            this.logger.error('AutoDebugController: Error fixing specific problems: %s', error)
+            throw error
+        }
+    }
+
+    /**
+     * Fix with Amazon Q - sends up to 15 error messages one time when user clicks the button
+     */
+    public async fixAllProblemsInFile(maxProblems: number = 15): Promise<number> {
+        try {
+            const editor = vscode.window.activeTextEditor
+            if (!editor) {
+                void messages.showMessage('warn', 'No active editor found')
+                return 0
+            }
+
+            // Get all diagnostics for the current file
+            const allDiagnostics = vscode.languages.getDiagnostics(editor.document.uri)
+            const errorDiagnostics = this.filterErrorDiagnostics(allDiagnostics)
+            if (errorDiagnostics.length === 0) {
+                return 0
+            }
+
+            // Take up to maxProblems errors (15 by default)
+            const diagnosticsToFix = errorDiagnostics.slice(0, maxProblems)
+            const result = await this.getProblemsFromDiagnostics(undefined, diagnosticsToFix)
+            if (!result) {
+                return 0
+            }
+
+            const fixMessage = this.createFixMessage(result.editor.document.uri.fsPath, result.problems)
+            await this.sendMessageToChat(fixMessage)
+            return result.problems.length
+        } catch (error) {
+            this.logger.error('AutoDebugController: Error in fix process: %s', error)
+            throw error
+        }
+    }
+
+    /**
+     * Explain problems using Amazon Q
+     */
+    async explainProblems(range?: vscode.Range, diagnostics?: vscode.Diagnostic[]): Promise<void> {
+        try {
+            const result = await this.getProblemsFromDiagnostics(range, diagnostics)
+            if (!result) {
+                return
+            }
+            const explainMessage = this.createExplainMessage(result.editor.document.uri.fsPath, result.problems)
+            await this.sendMessageToChat(explainMessage)
+        } catch (error) {
+            this.logger.error('AutoDebugController: Error explaining problems: %s', error)
+            throw error
+        }
+    }
+
+    private createFixMessage(filePath: string, problems: Problem[]): string {
+        const workspaceRoot = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath || ''
+        const formattedProblems = this.errorFormatter.formatProblemsString(problems, workspaceRoot)
+
+        return `Please help me fix the following errors in ${filePath}:${formattedProblems}`
+    }
+
+    private createExplainMessage(filePath: string, problems: Problem[]): string {
+        const workspaceRoot = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath || ''
+        const formattedProblems = this.errorFormatter.formatProblemsString(problems, workspaceRoot)
+
+        return `Please explain the following problems in ${filePath}. DO NOT edit files. ONLY provide explanation:${formattedProblems}`
+    }
+
+    /**
+     * Sends message directly to language server bypassing webview connectors
+     * This ensures messages go through the proper LSP chat system
+     */
+    private async sendMessageToChat(message: string): Promise<void> {
+        const triggerID = randomUUID()
+        try {
+            const success = await this.lspClient.sendChatMessage({
+                message: message,
+                triggerType: 'autoDebug',
+                eventId: triggerID,
+            })
+
+            if (success) {
+                this.logger.debug('AutoDebugController: Chat message sent successfully through LSP client')
+            } else {
+                this.logger.error('AutoDebugController: Failed to send chat message through LSP client')
+                throw new Error('Failed to send message through LSP client')
+            }
+        } catch (error) {
+            this.logger.error(
+                'AutoDebugController: Error sending message through LSP client with triggerID %s: %s',
+                triggerID,
+                error
+            )
+        }
+    }
+
+    public dispose(): void {
+        vscode.Disposable.from(...this.disposables).dispose()
+    }
+}
diff --git a/packages/amazonq/src/lsp/chat/autoDebug/diagnostics/diagnosticsMonitor.ts b/packages/amazonq/src/lsp/chat/autoDebug/diagnostics/diagnosticsMonitor.ts
new file mode 100644
index 00000000000..8f4000bf217
--- /dev/null
+++ b/packages/amazonq/src/lsp/chat/autoDebug/diagnostics/diagnosticsMonitor.ts
@@ -0,0 +1,22 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+
+export interface DiagnosticCollection {
+    readonly diagnostics: [vscode.Uri, vscode.Diagnostic[]][]
+    readonly timestamp: number
+}
+
+export interface DiagnosticSnapshot {
+    readonly diagnostics: DiagnosticCollection
+    readonly captureTime: number
+    readonly id: string
+}
+
+export interface FileDiagnostics {
+    readonly uri: vscode.Uri
+    readonly diagnostics: vscode.Diagnostic[]
+}
diff --git a/packages/amazonq/src/lsp/chat/autoDebug/diagnostics/errorContext.ts b/packages/amazonq/src/lsp/chat/autoDebug/diagnostics/errorContext.ts
new file mode 100644
index 00000000000..dee7bc0565a
--- /dev/null
+++ b/packages/amazonq/src/lsp/chat/autoDebug/diagnostics/errorContext.ts
@@ -0,0 +1,75 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as path from 'path'
+import { Problem } from './problemDetector'
+
+export interface ErrorContext {
+    readonly source: string
+    readonly severity: 'error' | 'warning' | 'info' | 'hint'
+    readonly location: {
+        readonly file: string
+        readonly line: number
+        readonly column: number
+        readonly range?: vscode.Range
+    }
+    readonly message: string
+    readonly code?: string | number
+    readonly relatedInformation?: vscode.DiagnosticRelatedInformation[]
+    readonly suggestedFixes?: vscode.CodeAction[]
+    readonly surroundingCode?: string
+}
+
+export interface FormattedErrorReport {
+    readonly summary: string
+    readonly details: string
+    readonly contextualCode: string
+    readonly suggestions: string
+}
+
+/**
+ * Formats diagnostic errors into contextual information for AI debugging assistance.
+ */
+export class ErrorContextFormatter {
+    /**
+     * Creates a problems string with Markdown formatting for better readability
+     */
+    public formatProblemsString(problems: Problem[], cwd: string): string {
+        let result = ''
+        const fileGroups = this.groupProblemsByFile(problems)
+
+        for (const [filePath, fileProblems] of fileGroups.entries()) {
+            if (fileProblems.length > 0) {
+                result += `\n\n**${path.relative(cwd, filePath)}**\n\n`
+
+                // Group problems into a code block for better formatting
+                result += '```\n'
+                for (const problem of fileProblems) {
+                    const line = problem.diagnostic.range.start.line + 1
+                    const source = problem.source ? `${problem.source}` : 'Unknown'
+                    result += `[${source}] Line ${line}: ${problem.diagnostic.message}\n`
+                }
+                result += '```'
+            }
+        }
+
+        return result.trim()
+    }
+
+    private groupProblemsByFile(problems: Problem[]): Map<string, Problem[]> {
+        const groups = new Map<string, Problem[]>()
+
+        for (const problem of problems) {
+            const filePath = problem.uri.fsPath
+            if (!groups.has(filePath)) {
+                groups.set(filePath, [])
+            }
+            groups.get(filePath)!.push(problem)
+        }
+
+        return groups
+    }
+}
diff --git a/packages/amazonq/src/lsp/chat/autoDebug/diagnostics/problemDetector.ts b/packages/amazonq/src/lsp/chat/autoDebug/diagnostics/problemDetector.ts
new file mode 100644
index 00000000000..44d00b55ca1
--- /dev/null
+++ b/packages/amazonq/src/lsp/chat/autoDebug/diagnostics/problemDetector.ts
@@ -0,0 +1,21 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+
+export interface Problem {
+    readonly uri: vscode.Uri
+    readonly diagnostic: vscode.Diagnostic
+    readonly severity: 'error' | 'warning' | 'info' | 'hint'
+    readonly source: string
+    readonly isNew: boolean
+}
+
+export interface CategorizedProblems {
+    readonly errors: Problem[]
+    readonly warnings: Problem[]
+    readonly info: Problem[]
+    readonly hints: Problem[]
+}
diff --git a/packages/amazonq/src/lsp/chat/autoDebug/index.ts b/packages/amazonq/src/lsp/chat/autoDebug/index.ts
new file mode 100644
index 00000000000..4819835066b
--- /dev/null
+++ b/packages/amazonq/src/lsp/chat/autoDebug/index.ts
@@ -0,0 +1,18 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Auto Debug feature for Amazon Q
+ *
+ * This module provides auto debug functionality including:
+ * - Command registration for fixing problems with Amazon Q
+ * - Code actions provider for quick fixes
+ * - Integration with VSCode's diagnostic system
+ */
+
+export { AutoDebugFeature, activateAutoDebug } from './activation'
+export { AutoDebugCommands } from './commands'
+export { AutoDebugCodeActionsProvider } from './codeActionsProvider'
+export { AutoDebugController } from './controller'
diff --git a/packages/amazonq/src/lsp/chat/autoDebug/lsp/autoDebugLspClient.ts b/packages/amazonq/src/lsp/chat/autoDebug/lsp/autoDebugLspClient.ts
new file mode 100644
index 00000000000..2d2d0ca3664
--- /dev/null
+++ b/packages/amazonq/src/lsp/chat/autoDebug/lsp/autoDebugLspClient.ts
@@ -0,0 +1,75 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { getLogger, placeholder } from 'aws-core-vscode/shared'
+import { focusAmazonQPanel } from 'aws-core-vscode/codewhispererChat'
+
+export class AutoDebugLspClient {
+    private readonly logger = getLogger()
+    private static chatViewProvider: any // AmazonQChatViewProvider instance
+
+    /**
+     * Sets the chat view provider instance
+     */
+    public static setChatViewProvider(provider: any): void {
+        AutoDebugLspClient.chatViewProvider = provider
+    }
+
+    public async sendChatMessage(params: { message: string; triggerType: string; eventId: string }): Promise<boolean> {
+        try {
+            // Ensure the chat view provider and webview are available
+            await this.ensureWebviewReady()
+
+            // Get the webview provider from the static reference
+            const amazonQChatViewProvider = AutoDebugLspClient.chatViewProvider
+
+            if (!amazonQChatViewProvider?.webview) {
+                this.logger.error(
+                    'AutoDebugLspClient: Amazon Q Chat View Provider webview not available after initialization'
+                )
+                return false
+            }
+
+            // Focus Amazon Q panel first using the imported function
+            await focusAmazonQPanel.execute(placeholder, 'autoDebug')
+
+            // Wait for panel to focus
+            await new Promise((resolve) => setTimeout(resolve, 200))
+            await amazonQChatViewProvider.webview.postMessage({
+                command: 'sendToPrompt',
+                params: {
+                    selection: '',
+                    triggerType: 'autoDebug',
+                    prompt: {
+                        prompt: params.message, // what gets sent to the user
+                        escapedPrompt: params.message, // what gets sent to the backend
+                    },
+                    autoSubmit: true, // Automatically submit the message
+                },
+            })
+            return true
+        } catch (error) {
+            this.logger.error('AutoDebugLspClient: Error sending message via webview: %s', error)
+            return false
+        }
+    }
+
+    /**
+     * Ensures that the chat view provider and its webview are ready for use
+     */
+    private async ensureWebviewReady(): Promise<void> {
+        if (!AutoDebugLspClient.chatViewProvider) {
+            await focusAmazonQPanel.execute(placeholder, 'autoDebug')
+            // wait 1 second for focusAmazonQPanel to finish
+            await new Promise((resolve) => setTimeout(resolve, 500))
+        }
+
+        // Now ensure the webview is created
+        if (!AutoDebugLspClient.chatViewProvider.webview) {
+            await focusAmazonQPanel.execute(placeholder, 'autoDebug')
+            // wait 1 second for webview to be created
+            await new Promise((resolve) => setTimeout(resolve, 500))
+        }
+    }
+}
diff --git a/packages/amazonq/src/lsp/chat/autoDebug/shared/diagnosticUtils.ts b/packages/amazonq/src/lsp/chat/autoDebug/shared/diagnosticUtils.ts
new file mode 100644
index 00000000000..bf466168347
--- /dev/null
+++ b/packages/amazonq/src/lsp/chat/autoDebug/shared/diagnosticUtils.ts
@@ -0,0 +1,35 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { toIdeDiagnostics } from 'aws-core-vscode/codewhisperer'
+
+/**
+ * Maps VSCode DiagnosticSeverity to string representation
+ * Reuses the existing toIdeDiagnostics logic but returns lowercase format expected by Problem interface
+ */
+export function mapDiagnosticSeverity(severity: vscode.DiagnosticSeverity): 'error' | 'warning' | 'info' | 'hint' {
+    // Create a minimal diagnostic to use with toIdeDiagnostics
+    const tempDiagnostic: vscode.Diagnostic = {
+        range: new vscode.Range(0, 0, 0, 0),
+        message: '',
+        severity: severity,
+    }
+
+    const ideDiagnostic = toIdeDiagnostics(tempDiagnostic)
+    // Convert uppercase severity to lowercase format expected by Problem interface
+    switch (ideDiagnostic.severity) {
+        case 'ERROR':
+            return 'error'
+        case 'WARNING':
+            return 'warning'
+        case 'INFORMATION':
+            return 'info'
+        case 'HINT':
+            return 'hint'
+        default:
+            return 'error'
+    }
+}
diff --git a/packages/amazonq/src/lsp/chat/autoDebug/telemetry.ts b/packages/amazonq/src/lsp/chat/autoDebug/telemetry.ts
new file mode 100644
index 00000000000..dec3f424c5a
--- /dev/null
+++ b/packages/amazonq/src/lsp/chat/autoDebug/telemetry.ts
@@ -0,0 +1,71 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { telemetry } from 'aws-core-vscode/telemetry'
+
+/**
+ * Auto Debug command types for telemetry tracking
+ */
+export type AutoDebugCommandType = 'fixWithQ' | 'fixAllWithQ' | 'explainProblem'
+
+/**
+ * Telemetry interface for Auto Debug feature
+ * Tracks usage counts and success rates for the three main commands
+ */
+export interface AutoDebugTelemetry {
+    /**
+     * Record when an auto debug command is invoked
+     */
+    recordCommandInvocation(commandType: AutoDebugCommandType, problemCount?: number): void
+
+    /**
+     * Record when an auto debug command succeeds
+     */
+    recordCommandSuccess(commandType: AutoDebugCommandType, problemCount?: number): void
+
+    /**
+     * Record when an auto debug command fails
+     */
+    recordCommandFailure(commandType: AutoDebugCommandType, error?: string, problemCount?: number): void
+}
+
+/**
+ * Implementation of Auto Debug telemetry tracking
+ */
+export class AutoDebugTelemetryImpl implements AutoDebugTelemetry {
+    recordCommandInvocation(commandType: AutoDebugCommandType, problemCount?: number): void {
+        telemetry.amazonq_autoDebugCommand.emit({
+            amazonqAutoDebugCommandType: commandType,
+            amazonqAutoDebugAction: 'invoked',
+            amazonqAutoDebugProblemCount: problemCount,
+            result: 'Succeeded',
+        })
+    }
+
+    recordCommandSuccess(commandType: AutoDebugCommandType, problemCount?: number): void {
+        telemetry.amazonq_autoDebugCommand.emit({
+            amazonqAutoDebugCommandType: commandType,
+            amazonqAutoDebugAction: 'completed',
+            amazonqAutoDebugProblemCount: problemCount,
+            result: 'Succeeded',
+        })
+    }
+
+    recordCommandFailure(commandType: AutoDebugCommandType, error?: string, problemCount?: number): void {
+        telemetry.amazonq_autoDebugCommand.emit({
+            amazonqAutoDebugCommandType: commandType,
+            amazonqAutoDebugAction: 'completed',
+            amazonqAutoDebugProblemCount: problemCount,
+            result: 'Failed',
+            reason: error ? 'Error' : 'Unknown',
+            reasonDesc: error?.substring(0, 200), // Truncate to 200 chars as recommended
+        })
+    }
+}
+
+/**
+ * Global instance of auto debug telemetry
+ */
+export const autoDebugTelemetry: AutoDebugTelemetry = new AutoDebugTelemetryImpl()
diff --git a/packages/amazonq/src/lsp/chat/commands.ts b/packages/amazonq/src/lsp/chat/commands.ts
new file mode 100644
index 00000000000..6e4f928f5f1
--- /dev/null
+++ b/packages/amazonq/src/lsp/chat/commands.ts
@@ -0,0 +1,186 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Commands, globals } from 'aws-core-vscode/shared'
+import { window } from 'vscode'
+import { AmazonQChatViewProvider } from './webviewProvider'
+import { CodeScanIssue, AuthUtil } from 'aws-core-vscode/codewhisperer'
+import { getLogger } from 'aws-core-vscode/shared'
+import * as vscode from 'vscode'
+import * as path from 'path'
+import { telemetry, AmazonqCodeReviewTool } from 'aws-core-vscode/telemetry'
+
+/**
+ * TODO: Re-enable these once we can figure out which path they're going to live in
+ * In hybrid chat mode they were being registered twice causing a registration error
+ */
+export function registerCommands(provider: AmazonQChatViewProvider) {
+    globals.context.subscriptions.push(
+        registerGenericCommand('aws.amazonq.explainCode', 'Explain', provider),
+        registerGenericCommand('aws.amazonq.refactorCode', 'Refactor', provider),
+        registerGenericCommand('aws.amazonq.fixCode', 'Fix', provider),
+        registerGenericCommand('aws.amazonq.optimizeCode', 'Optimize', provider),
+        registerGenericCommand('aws.amazonq.generateUnitTests', 'Generate Tests', provider),
+
+        Commands.register('aws.amazonq.explainIssue', (issue: CodeScanIssue, filePath: string) =>
+            handleIssueCommand(
+                issue,
+                filePath,
+                'Explain',
+                'Provide a small description of the issue. You must not attempt to fix the issue. You should only give a small summary of it to the user. You must start with the information stored in the recommendation.text field if it is present.',
+                provider,
+                'explainIssue'
+            )
+        ),
+        Commands.register('aws.amazonq.generateFix', (issue: CodeScanIssue, filePath: string) =>
+            handleIssueCommand(
+                issue,
+                filePath,
+                'Fix',
+                'Generate a fix for the following code issue. You must not explain the issue, just generate and explain the fix. The user should have the option to accept or reject the fix before any code is changed.',
+                provider,
+                'applyFix'
+            )
+        ),
+        Commands.register('aws.amazonq.sendToPrompt', (data) => {
+            const triggerType = getCommandTriggerType(data)
+            const selection = getSelectedText()
+
+            void focusAmazonQPanel().then(() => {
+                void provider.webview?.postMessage({
+                    command: 'sendToPrompt',
+                    params: { selection: selection, triggerType },
+                })
+            })
+        }),
+        Commands.register('aws.amazonq.openTab', () => {
+            void focusAmazonQPanel().then(() => {
+                void provider.webview?.postMessage({
+                    command: 'aws/chat/openTab',
+                    params: {},
+                })
+            })
+        }),
+        registerShellCommandShortCut('aws.amazonq.runCmdExecution', 'run-shell-command', provider),
+        registerShellCommandShortCut('aws.amazonq.rejectCmdExecution', 'reject-shell-command', provider),
+        registerShellCommandShortCut('aws.amazonq.stopCmdExecution', 'stop-shell-command', provider)
+    )
+}
+
+async function handleIssueCommand(
+    issue: CodeScanIssue,
+    filePath: string,
+    action: string,
+    contextPrompt: string,
+    provider: AmazonQChatViewProvider,
+    metricName: string
+) {
+    await focusAmazonQPanel()
+
+    if (issue && filePath) {
+        await openFileWithSelection(issue, filePath)
+    }
+
+    const lineRange = createLineRangeText(issue)
+    const visibleMessageInChat = `_${action} **${issue.title}** issue in **${path.basename(filePath)}** at \`${lineRange}\`_`
+    const contextMessage = `${contextPrompt} Code issue - ${JSON.stringify(issue)}`
+
+    void provider.webview?.postMessage({
+        command: 'sendToPrompt',
+        params: {
+            selection: '',
+            triggerType: 'contextMenu',
+            prompt: {
+                prompt: visibleMessageInChat,
+                escapedPrompt: contextMessage,
+            },
+            autoSubmit: true,
+        },
+    })
+
+    telemetry.amazonq_codeReviewTool.emit({
+        findingId: issue.findingId,
+        detectorId: issue.detectorId,
+        ruleId: issue.ruleId,
+        credentialStartUrl: AuthUtil.instance.startUrl,
+        autoDetected: issue.autoDetected,
+        result: 'Succeeded',
+        reason: metricName,
+    } as AmazonqCodeReviewTool)
+}
+
+async function openFileWithSelection(issue: CodeScanIssue, filePath: string) {
+    try {
+        const range = new vscode.Range(issue.startLine, 0, issue.endLine, 0)
+        const doc = await vscode.workspace.openTextDocument(filePath)
+        await vscode.window.showTextDocument(doc, {
+            selection: range,
+            viewColumn: vscode.ViewColumn.One,
+            preview: true,
+        })
+    } catch (e) {
+        getLogger().error('openFileWithSelection: Failed to open file %s with selection: %O', filePath, e)
+        void vscode.window.showInformationMessage('Failed to display file with issue.')
+    }
+}
+
+function createLineRangeText(issue: CodeScanIssue): string {
+    return issue.startLine === issue.endLine - 1
+        ? `[${issue.startLine + 1}]`
+        : `[${issue.startLine + 1}, ${issue.endLine}]`
+}
+
+function getSelectedText(): string {
+    const editor = window.activeTextEditor
+    if (editor) {
+        const selection = editor.selection
+        const selectedText = editor.document.getText(selection)
+        return selectedText
+    }
+
+    return ' '
+}
+
+function getCommandTriggerType(data: any): string {
+    // data is undefined when commands triggered from keybinding or command palette. Currently no
+    // way to differentiate keybinding and command palette, so both interactions are recorded as keybinding
+    return data === undefined ? 'hotkeys' : 'contextMenu'
+}
+
+function registerGenericCommand(commandName: string, genericCommand: string, provider: AmazonQChatViewProvider) {
+    return Commands.register(commandName, (data) => {
+        const triggerType = getCommandTriggerType(data)
+        const selection = getSelectedText()
+
+        void focusAmazonQPanel().then(() => {
+            void provider.webview?.postMessage({
+                command: 'genericCommand',
+                params: { genericCommand, selection, triggerType },
+            })
+        })
+    })
+}
+
+/**
+ * Importing focusAmazonQPanel from aws-core-vscode/amazonq leads to several dependencies down the chain not resolving since AmazonQ chat
+ * is currently only activated on node, but the language server is activated on both web and node.
+ *
+ * Instead, we just create our own as a temporary solution
+ */
+export async function focusAmazonQPanel() {
+    await Commands.tryExecute('aws.amazonq.AmazonQChatView.focus')
+    await Commands.tryExecute('aws.amazonq.AmazonCommonAuth.focus')
+}
+
+function registerShellCommandShortCut(commandName: string, buttonId: string, provider: AmazonQChatViewProvider) {
+    return Commands.register(commandName, async () => {
+        void focusAmazonQPanel().then(() => {
+            void provider.webview?.postMessage({
+                command: 'aws/chat/executeShellCommandShortCut',
+                params: { id: buttonId },
+            })
+        })
+    })
+}
diff --git a/packages/amazonq/src/lsp/chat/error.ts b/packages/amazonq/src/lsp/chat/error.ts
new file mode 100644
index 00000000000..fc2e0211b0f
--- /dev/null
+++ b/packages/amazonq/src/lsp/chat/error.ts
@@ -0,0 +1,23 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { ChatResult } from '@aws/language-server-runtimes/protocol'
+import { ResponseError } from '@aws/language-server-runtimes/protocol'
+/**
+ * Perform a sanity check that the error we got from the LSP can be safely cast to the expected type.
+ * @param error
+ * @returns
+ */
+export function isValidResponseError(error: unknown): error is ResponseError<ChatResult> & { data: ChatResult } {
+    return (
+        typeof error === 'object' &&
+        error !== null &&
+        'code' in error &&
+        typeof error.code === 'number' &&
+        'message' in error &&
+        typeof error.message === 'string' &&
+        'data' in error &&
+        error.data !== undefined
+    )
+}
diff --git a/packages/amazonq/src/lsp/chat/messages.ts b/packages/amazonq/src/lsp/chat/messages.ts
new file mode 100644
index 00000000000..1541e60b9c5
--- /dev/null
+++ b/packages/amazonq/src/lsp/chat/messages.ts
@@ -0,0 +1,856 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    isValidAuthFollowUpType,
+    INSERT_TO_CURSOR_POSITION,
+    AUTH_FOLLOW_UP_CLICKED,
+    CHAT_OPTIONS,
+    COPY_TO_CLIPBOARD,
+    AuthFollowUpType,
+    DISCLAIMER_ACKNOWLEDGED,
+    UiMessageResultParams,
+    CHAT_PROMPT_OPTION_ACKNOWLEDGED,
+    ChatPromptOptionAcknowledgedMessage,
+    STOP_CHAT_RESPONSE,
+    StopChatResponseMessage,
+    OPEN_FILE_DIALOG,
+} from '@aws/chat-client-ui-types'
+import {
+    ChatResult,
+    chatRequestType,
+    ChatParams,
+    followUpClickNotificationType,
+    quickActionRequestType,
+    QuickActionResult,
+    QuickActionParams,
+    insertToCursorPositionNotificationType,
+    ErrorCodes,
+    ResponseError,
+    openTabRequestType,
+    getSerializedChatRequestType,
+    listConversationsRequestType,
+    conversationClickRequestType,
+    listMcpServersRequestType,
+    mcpServerClickRequestType,
+    ShowSaveFileDialogRequestType,
+    ShowSaveFileDialogParams,
+    LSPErrorCodes,
+    tabBarActionRequestType,
+    ShowDocumentParams,
+    ShowDocumentResult,
+    ShowDocumentRequest,
+    contextCommandsNotificationType,
+    ContextCommandParams,
+    openFileDiffNotificationType,
+    OpenFileDiffParams,
+    LINK_CLICK_NOTIFICATION_METHOD,
+    LinkClickParams,
+    INFO_LINK_CLICK_NOTIFICATION_METHOD,
+    READY_NOTIFICATION_METHOD,
+    buttonClickRequestType,
+    ButtonClickResult,
+    CancellationTokenSource,
+    chatUpdateNotificationType,
+    ChatUpdateParams,
+    chatOptionsUpdateType,
+    ChatOptionsUpdateParams,
+    listRulesRequestType,
+    ruleClickRequestType,
+    pinnedContextNotificationType,
+    activeEditorChangedNotificationType,
+    listAvailableModelsRequestType,
+    ShowOpenDialogRequestType,
+    ShowOpenDialogParams,
+    openFileDialogRequestType,
+    OpenFileDialogResult,
+} from '@aws/language-server-runtimes/protocol'
+import { v4 as uuidv4 } from 'uuid'
+import * as vscode from 'vscode'
+import * as path from 'path'
+import { Disposable, BaseLanguageClient, Position, TextDocumentIdentifier } from 'vscode-languageclient'
+import { AmazonQChatViewProvider } from './webviewProvider'
+import {
+    AggregatedCodeScanIssue,
+    AuthUtil,
+    CodeAnalysisScope,
+    CodeWhispererSettings,
+    initSecurityScanRender,
+    ReferenceLogViewProvider,
+    SecurityIssueTreeViewProvider,
+    CodeWhispererConstants,
+} from 'aws-core-vscode/codewhisperer'
+import { AmazonQPromptSettings, messages, openUrl, isTextEditor, globals, setContext } from 'aws-core-vscode/shared'
+import { DefaultAmazonQAppInitContext, messageDispatcher, referenceLogText } from 'aws-core-vscode/amazonq'
+import { telemetry } from 'aws-core-vscode/telemetry'
+import { isValidResponseError } from './error'
+import { decryptResponse, encryptRequest } from '../encryption'
+import { getCursorState } from '../utils'
+import { focusAmazonQPanel } from './commands'
+import { ChatMessage } from '@aws/language-server-runtimes/server-interface'
+import { CommentUtils } from 'aws-core-vscode/utils'
+
+export function registerActiveEditorChangeListener(languageClient: BaseLanguageClient) {
+    let debounceTimer: NodeJS.Timeout | undefined
+    vscode.window.onDidChangeActiveTextEditor((editor) => {
+        if (debounceTimer) {
+            clearTimeout(debounceTimer)
+        }
+        debounceTimer = setTimeout(() => {
+            let textDocument = undefined
+            let cursorState = undefined
+            if (editor) {
+                textDocument = {
+                    uri: editor.document.uri.toString(),
+                }
+                cursorState = getCursorState(editor.selections)
+            }
+            void languageClient.sendNotification(activeEditorChangedNotificationType.method, {
+                textDocument,
+                cursorState,
+            })
+        }, 100)
+    })
+}
+
+export function registerLanguageServerEventListener(
+    languageClient: BaseLanguageClient,
+    provider: AmazonQChatViewProvider
+) {
+    languageClient.info(
+        'Language client received initializeResult from server:',
+        JSON.stringify(languageClient.initializeResult)
+    )
+
+    const chatOptions = languageClient.initializeResult?.awsServerCapabilities?.chatOptions
+
+    // overide the quick action commands provided by flare server initialization, which doesn't provide the group header
+    if (chatOptions?.quickActions?.quickActionsCommandGroups?.[0]) {
+        chatOptions.quickActions.quickActionsCommandGroups[0].groupName = 'Quick Actions'
+    }
+
+    // This passes through metric data from LSP events to Toolkit telemetry with all fields from the LSP server
+    languageClient.onTelemetry((e: any) => {
+        const telemetryName: string = e.name
+        languageClient.info(`[VSCode Telemetry] Emitting ${telemetryName} telemetry: ${JSON.stringify(e.data)}`)
+        try {
+            // Flare is now the source of truth for metrics instead of depending on each IDE client and toolkit-common
+            const metric = (telemetry as any).getMetric(telemetryName)
+            metric?.emit(e.data)
+        } catch (error) {
+            languageClient.warn(`[VSCode Telemetry] Failed to emit ${telemetryName}: ${error}`)
+        }
+    })
+}
+
+export function registerMessageListeners(
+    languageClient: BaseLanguageClient,
+    provider: AmazonQChatViewProvider,
+    encryptionKey: Buffer
+) {
+    const chatStreamTokens = new Map<string, CancellationTokenSource>() // tab id -> token
+
+    // Keep track of pending chat options to send when webview UI is ready
+    const pendingChatOptions = languageClient.initializeResult?.awsServerCapabilities?.chatOptions
+
+    provider.webview?.onDidReceiveMessage(async (message) => {
+        languageClient.info(`[VSCode Client]  Received ${JSON.stringify(message)} from chat`)
+
+        if ((message.tabType && message.tabType !== 'cwc') || messageDispatcher.isLegacyEvent(message.command)) {
+            // handle the mynah ui -> agent legacy flow
+            messageDispatcher.handleWebviewEvent(
+                message,
+                DefaultAmazonQAppInitContext.instance.getWebViewToAppsMessagePublishers()
+            )
+            return
+        }
+
+        const webview = provider.webview
+
+        switch (message.command) {
+            // Handle "aws/chat/ready" event
+            case READY_NOTIFICATION_METHOD:
+                languageClient.info(`[VSCode Client] "aws/chat/ready" event is received, sending chat options`)
+                if (webview && pendingChatOptions) {
+                    try {
+                        await webview.postMessage({
+                            command: CHAT_OPTIONS,
+                            params: pendingChatOptions,
+                        })
+
+                        // Display a more readable representation of quick actions
+                        const quickActionCommands =
+                            pendingChatOptions?.quickActions?.quickActionsCommandGroups?.[0]?.commands || []
+                        const quickActionsDisplay = quickActionCommands.map((cmd: any) => cmd.command).join(', ')
+                        languageClient.info(
+                            `[VSCode Client] Chat options flags: mcpServers=${pendingChatOptions?.mcpServers}, history=${pendingChatOptions?.history}, export=${pendingChatOptions?.export}, quickActions=[${quickActionsDisplay}]`
+                        )
+                        void languageClient.sendNotification(message.command, message.params)
+                    } catch (err) {
+                        languageClient.error(
+                            `[VSCode Client] Failed to send CHAT_OPTIONS after "aws/chat/ready" event: ${(err as Error).message}`
+                        )
+                    }
+                }
+                break
+            case COPY_TO_CLIPBOARD:
+                languageClient.info('[VSCode Client] Copy to clipboard event received')
+                try {
+                    await messages.copyToClipboard(message.params.code)
+                } catch (e: unknown) {
+                    languageClient.error(`[VSCode Client] Failed to copy to clipboard: ${(e as Error).message}`)
+                }
+                break
+            case INSERT_TO_CURSOR_POSITION: {
+                const editor = vscode.window.activeTextEditor
+                let textDocument: TextDocumentIdentifier | undefined = undefined
+                let cursorPosition: Position | undefined = undefined
+                if (editor) {
+                    cursorPosition = editor.selection.active
+                    textDocument = { uri: editor.document.uri.toString() }
+                }
+
+                void languageClient.sendNotification(insertToCursorPositionNotificationType.method, {
+                    ...message.params,
+                    cursorPosition,
+                    textDocument,
+                })
+                break
+            }
+            case AUTH_FOLLOW_UP_CLICKED: {
+                languageClient.info('[VSCode Client] AuthFollowUp clicked')
+                const authType = message.params.authFollowupType
+                const reAuthTypes: AuthFollowUpType[] = ['re-auth', 'missing_scopes']
+                const fullAuthTypes: AuthFollowUpType[] = ['full-auth', 'use-supported-auth']
+
+                if (reAuthTypes.includes(authType)) {
+                    try {
+                        await AuthUtil.instance.reauthenticate()
+                    } catch (e) {
+                        languageClient.error(
+                            `[VSCode Client] Failed to re-authenticate after AUTH_FOLLOW_UP_CLICKED: ${(e as Error).message}`
+                        )
+                    }
+                }
+
+                if (fullAuthTypes.includes(authType)) {
+                    try {
+                        await AuthUtil.instance.secondaryAuth.deleteConnection()
+                    } catch (e) {
+                        languageClient.error(
+                            `[VSCode Client] Failed to authenticate after AUTH_FOLLOW_UP_CLICKED: ${(e as Error).message}`
+                        )
+                    }
+                }
+                break
+            }
+            case DISCLAIMER_ACKNOWLEDGED: {
+                void AmazonQPromptSettings.instance.update('amazonQChatDisclaimer', true)
+                break
+            }
+            case CHAT_PROMPT_OPTION_ACKNOWLEDGED: {
+                const acknowledgedMessage = message as ChatPromptOptionAcknowledgedMessage
+                switch (acknowledgedMessage.params.messageId) {
+                    case 'programmerModeCardId': {
+                        void AmazonQPromptSettings.instance.disablePrompt('amazonQChatPairProgramming')
+                    }
+                }
+                break
+            }
+            case INFO_LINK_CLICK_NOTIFICATION_METHOD:
+            case LINK_CLICK_NOTIFICATION_METHOD: {
+                const linkParams = message.params as LinkClickParams
+                void openUrl(vscode.Uri.parse(linkParams.link))
+                break
+            }
+            case STOP_CHAT_RESPONSE: {
+                const tabId = (message as StopChatResponseMessage).params.tabId
+                const token = chatStreamTokens.get(tabId)
+                token?.cancel()
+                token?.dispose()
+                chatStreamTokens.delete(tabId)
+                break
+            }
+            case chatRequestType.method: {
+                const chatParams: ChatParams = { ...message.params }
+                const partialResultToken = uuidv4()
+                let lastPartialResult: ChatResult | undefined
+                const cancellationToken = new CancellationTokenSource()
+                chatStreamTokens.set(chatParams.tabId, cancellationToken)
+
+                const chatDisposable = languageClient.onProgress(
+                    chatRequestType,
+                    partialResultToken,
+                    (partialResult: any) =>
+                        handlePartialResult<ChatResult>(partialResult, encryptionKey, provider, chatParams.tabId).then(
+                            (result) => {
+                                lastPartialResult = result
+                            }
+                        )
+                )
+
+                const editor =
+                    vscode.window.activeTextEditor ||
+                    vscode.window.visibleTextEditors.find((editor) => editor.document.languageId !== 'Log')
+                if (editor) {
+                    chatParams.cursorState = getCursorState(editor.selections)
+                    chatParams.textDocument = { uri: editor.document.uri.toString() }
+                }
+
+                const chatRequest = await encryptRequest<ChatParams>(chatParams, encryptionKey)
+
+                // Add detailed logging for SageMaker debugging
+                if (process.env.USE_IAM_AUTH === 'true') {
+                    languageClient.info(`[SageMaker Debug] Making chat request with IAM auth`)
+                    languageClient.info(`[SageMaker Debug] Chat request method: ${chatRequestType.method}`)
+                    languageClient.info(
+                        `[SageMaker Debug] Original chat params: ${JSON.stringify(
+                            {
+                                tabId: chatParams.tabId,
+                                prompt: chatParams.prompt,
+                                // Don't log full textDocument content, just metadata
+                                textDocument: chatParams.textDocument
+                                    ? { uri: chatParams.textDocument.uri }
+                                    : undefined,
+                                context: chatParams.context ? `${chatParams.context.length} context items` : undefined,
+                            },
+                            undefined,
+                            2
+                        )}`
+                    )
+                    languageClient.info(
+                        `[SageMaker Debug] Environment context: USE_IAM_AUTH=${process.env.USE_IAM_AUTH}, AWS_REGION=${process.env.AWS_REGION}`
+                    )
+                }
+
+                try {
+                    const chatResult = await languageClient.sendRequest<string | ChatResult>(
+                        chatRequestType.method,
+                        {
+                            ...chatRequest,
+                            partialResultToken,
+                        },
+                        cancellationToken.token
+                    )
+
+                    // Add response content logging for SageMaker debugging
+                    if (process.env.USE_IAM_AUTH === 'true') {
+                        languageClient.info(`[SageMaker Debug] Chat response received - type: ${typeof chatResult}`)
+                        if (typeof chatResult === 'string') {
+                            languageClient.info(
+                                `[SageMaker Debug] Chat response (string): ${chatResult.substring(0, 200)}...`
+                            )
+                        } else if (chatResult && typeof chatResult === 'object') {
+                            languageClient.info(
+                                `[SageMaker Debug] Chat response (object keys): ${Object.keys(chatResult)}`
+                            )
+                            if ('message' in chatResult) {
+                                languageClient.info(
+                                    `[SageMaker Debug] Chat response message: ${JSON.stringify(chatResult.message).substring(0, 200)}...`
+                                )
+                            }
+                        }
+                    }
+
+                    await handleCompleteResult<ChatResult>(
+                        chatResult,
+                        encryptionKey,
+                        provider,
+                        chatParams.tabId,
+                        chatDisposable,
+                        languageClient
+                    )
+                } catch (e) {
+                    const errorMsg = `Error occurred during chat request: ${e}`
+                    languageClient.info(errorMsg)
+                    languageClient.info(
+                        `Last result from langauge server: ${JSON.stringify(lastPartialResult, undefined, 2)}`
+                    )
+                    if (!isValidResponseError(e)) {
+                        throw e
+                    }
+                    await handleCompleteResult<ChatResult>(
+                        e.data,
+                        encryptionKey,
+                        provider,
+                        chatParams.tabId,
+                        chatDisposable,
+                        languageClient
+                    )
+                } finally {
+                    chatStreamTokens.delete(chatParams.tabId)
+                }
+                break
+            }
+            case OPEN_FILE_DIALOG: {
+                // openFileDialog is the event emitted from webView to open
+                // file system
+                const result = await languageClient.sendRequest<OpenFileDialogResult>(
+                    openFileDialogRequestType.method,
+                    message.params
+                )
+                void provider.webview?.postMessage({
+                    command: openFileDialogRequestType.method,
+                    params: result,
+                })
+                break
+            }
+            case quickActionRequestType.method: {
+                const quickActionPartialResultToken = uuidv4()
+                const quickActionDisposable = languageClient.onProgress(
+                    quickActionRequestType,
+                    quickActionPartialResultToken,
+                    (partialResult: any) =>
+                        handlePartialResult<QuickActionResult>(
+                            partialResult,
+                            encryptionKey,
+                            provider,
+                            message.params.tabId
+                        )
+                )
+
+                const quickActionRequest = await encryptRequest<QuickActionParams>(message.params, encryptionKey)
+                const quickActionResult = (await languageClient.sendRequest(quickActionRequestType.method, {
+                    ...quickActionRequest,
+                    partialResultToken: quickActionPartialResultToken,
+                })) as string | ChatResult
+                void handleCompleteResult<ChatResult>(
+                    quickActionResult,
+                    encryptionKey,
+                    provider,
+                    message.params.tabId,
+                    quickActionDisposable,
+                    languageClient
+                )
+                break
+            }
+            case listRulesRequestType.method:
+            case ruleClickRequestType.method:
+            case listConversationsRequestType.method:
+            case conversationClickRequestType.method:
+            case listMcpServersRequestType.method:
+            case mcpServerClickRequestType.method:
+            case tabBarActionRequestType.method:
+                // handling for show_logs button
+                if (message.params.action === 'show_logs') {
+                    languageClient.info('[VSCode Client] Received show_logs action, showing disclaimer')
+
+                    // Show warning message without buttons - just informational
+                    void vscode.window.showWarningMessage(
+                        'Log files may contain sensitive information such as account IDs, resource names, and other data. Be careful when sharing these logs.'
+                    )
+
+                    // Get the log directory path
+                    const logFolderPath = globals.context.logUri?.fsPath
+                    const result = { ...message.params, success: false }
+
+                    if (logFolderPath) {
+                        // Open the log directory in the OS file explorer directly
+                        languageClient.info('[VSCode Client] Opening logs directory')
+                        const path = require('path')
+                        const logFilePath = path.join(logFolderPath, 'Amazon Q Logs.log')
+                        await vscode.commands.executeCommand('revealFileInOS', vscode.Uri.file(logFilePath))
+                        result.success = true
+                    } else {
+                        // Fallback: show error if log path is not available
+                        void vscode.window.showErrorMessage('Log location not available.')
+                        languageClient.error('[VSCode Client] Log location not available')
+                    }
+
+                    void webview?.postMessage({
+                        command: message.command,
+                        params: result,
+                    })
+
+                    break
+                }
+            // eslint-disable-next-line no-fallthrough
+            case listAvailableModelsRequestType.method:
+                await resolveChatResponse(message.command, message.params, languageClient, webview)
+                break
+            case followUpClickNotificationType.method:
+                if (!isValidAuthFollowUpType(message.params.followUp.type)) {
+                    void languageClient.sendNotification(followUpClickNotificationType.method, message.params)
+                }
+                break
+            case buttonClickRequestType.method: {
+                const buttonResult = await languageClient.sendRequest<ButtonClickResult>(
+                    buttonClickRequestType.method,
+                    message.params
+                )
+                if (!buttonResult.success) {
+                    languageClient.error(
+                        `[VSCode Client] Failed to execute button action: ${buttonResult.failureReason}`
+                    )
+                }
+                break
+            }
+            default:
+                if (isServerEvent(message.command)) {
+                    if (enterFocus(message.params)) {
+                        await setContext('aws.amazonq.amazonqChatLSP.isFocus', true)
+                    } else if (exitFocus(message.params)) {
+                        await setContext('aws.amazonq.amazonqChatLSP.isFocus', false)
+                    }
+                    void languageClient.sendNotification(message.command, message.params)
+                }
+                break
+        }
+    }, undefined)
+
+    const registerHandlerWithResponseRouter = (command: string) => {
+        const handler = async (params: any, _: any) => {
+            const mapErrorType = (type: string | undefined): number => {
+                switch (type) {
+                    case 'InvalidRequest':
+                        return ErrorCodes.InvalidRequest
+                    case 'InternalError':
+                        return ErrorCodes.InternalError
+                    case 'UnknownError':
+                    default:
+                        return ErrorCodes.UnknownErrorCode
+                }
+            }
+            const requestId = uuidv4()
+
+            void provider.webview?.postMessage({
+                requestId: requestId,
+                command: command,
+                params: params,
+            })
+            const responsePromise = new Promise<UiMessageResultParams | undefined>((resolve, reject) => {
+                const timeout = setTimeout(() => {
+                    disposable?.dispose()
+                    reject(new Error('Request timed out'))
+                }, 30000)
+
+                const disposable = provider.webview?.onDidReceiveMessage((message: any) => {
+                    if (message.requestId === requestId) {
+                        clearTimeout(timeout)
+                        disposable?.dispose()
+                        resolve(message.params)
+                    }
+                })
+            })
+
+            const result = await responsePromise
+
+            if (result?.success) {
+                return result.result
+            } else {
+                return new ResponseError(
+                    mapErrorType(result?.error.type),
+                    result?.error.message ?? 'No response from client'
+                )
+            }
+        }
+
+        languageClient.onRequest(command, handler)
+    }
+
+    registerHandlerWithResponseRouter(openTabRequestType.method)
+    registerHandlerWithResponseRouter(getSerializedChatRequestType.method)
+
+    languageClient.onRequest(ShowSaveFileDialogRequestType.method, async (params: ShowSaveFileDialogParams) => {
+        const filters: Record<string, string[]> = {}
+        const formatMappings = [
+            { format: 'markdown', key: 'Markdown', extensions: ['md'] },
+            { format: 'html', key: 'HTML', extensions: ['html'] },
+        ]
+
+        for (const format of params.supportedFormats ?? []) {
+            const mapping = formatMappings.find((m) => m.format === format)
+            if (mapping) {
+                filters[mapping.key] = mapping.extensions
+            }
+        }
+
+        const saveAtUri = params.defaultUri ? vscode.Uri.parse(params.defaultUri) : vscode.Uri.file('export-chat.md')
+        const targetUri = await vscode.window.showSaveDialog({
+            filters,
+            defaultUri: saveAtUri,
+            title: 'Export',
+        })
+
+        if (!targetUri) {
+            return new ResponseError(LSPErrorCodes.RequestFailed, 'Export failed')
+        }
+
+        return {
+            targetUri: targetUri.toString(),
+        }
+    })
+
+    languageClient.onRequest(ShowOpenDialogRequestType.method, async (params: ShowOpenDialogParams) => {
+        try {
+            const uris = await vscode.window.showOpenDialog({
+                canSelectFiles: params.canSelectFiles ?? true,
+                canSelectFolders: params.canSelectFolders ?? false,
+                canSelectMany: params.canSelectMany ?? false,
+                filters: params.filters,
+                defaultUri: params.defaultUri ? vscode.Uri.parse(params.defaultUri, false) : undefined,
+                title: params.title,
+            })
+            const urisString = uris?.map((uri) => uri.fsPath)
+            return { uris: urisString || [] }
+        } catch (err) {
+            languageClient.error(`[VSCode Client] Failed to open file dialog: ${(err as Error).message}`)
+            return { uris: [] }
+        }
+    })
+
+    languageClient.onRequest<ShowDocumentParams, ShowDocumentResult>(
+        ShowDocumentRequest.method,
+        async (params: ShowDocumentParams): Promise<ShowDocumentParams | ResponseError<ShowDocumentResult>> => {
+            focusAmazonQPanel().catch((e: Error) => languageClient.error(`[VSCode Client] focusAmazonQPanel() failed`))
+
+            try {
+                const uri = vscode.Uri.parse(params.uri)
+
+                if (params.external) {
+                    // Note: Not using openUrl() because we probably don't want telemetry for these URLs.
+                    // Also it doesn't yet support the required HACK below.
+
+                    // HACK: workaround vscode bug: https://github.com/microsoft/vscode/issues/85930
+                    vscode.env.openExternal(params.uri as any).then(undefined, (e) => {
+                        // TODO: getLogger('?').error('failed vscode.env.openExternal: %O', e)
+                        vscode.env.openExternal(uri).then(undefined, (e) => {
+                            // TODO: getLogger('?').error('failed vscode.env.openExternal: %O', e)
+                        })
+                    })
+                    return params
+                }
+
+                const doc = await vscode.workspace.openTextDocument(uri)
+                await vscode.window.showTextDocument(doc, { preview: false })
+                return params
+            } catch (e) {
+                return new ResponseError(
+                    LSPErrorCodes.RequestFailed,
+                    `Failed to open document: ${(e as Error).message}`
+                )
+            }
+        }
+    )
+
+    languageClient.onNotification(contextCommandsNotificationType.method, (params: ContextCommandParams) => {
+        void provider.webview?.postMessage({
+            command: contextCommandsNotificationType.method,
+            params: params,
+        })
+    })
+    languageClient.onNotification(
+        pinnedContextNotificationType.method,
+        (params: ContextCommandParams & { tabId: string; textDocument?: TextDocumentIdentifier }) => {
+            const editor = vscode.window.activeTextEditor
+            let textDocument = undefined
+            if (editor && isTextEditor(editor)) {
+                textDocument = { uri: vscode.workspace.asRelativePath(editor.document.uri) }
+            }
+            void provider.webview?.postMessage({
+                command: pinnedContextNotificationType.method,
+                params: { ...params, textDocument },
+            })
+        }
+    )
+
+    languageClient.onNotification(openFileDiffNotificationType.method, async (params: OpenFileDiffParams) => {
+        // Handle both file:// URIs and raw file paths, ensuring proper Windows path handling
+        let currentFileUri: vscode.Uri
+
+        // Check if it's already a proper file:// URI
+        if (params.originalFileUri.startsWith('file://')) {
+            currentFileUri = vscode.Uri.parse(params.originalFileUri)
+        } else {
+            // Decode URL-encoded characters and treat as file path
+            const decodedPath = decodeURIComponent(params.originalFileUri)
+            currentFileUri = vscode.Uri.file(decodedPath)
+        }
+
+        const originalContent = params.originalFileContent ?? ''
+        const fileName = path.basename(currentFileUri.fsPath)
+
+        // Use custom scheme to avoid adding to recent files
+        const originalFileUri = vscode.Uri.parse(`amazonq-diff:${fileName}_original_${Date.now()}`)
+
+        // Register content provider for the custom scheme
+        const disposable = vscode.workspace.registerTextDocumentContentProvider('amazonq-diff', {
+            provideTextDocumentContent: () => originalContent,
+        })
+
+        try {
+            // Open diff view with custom scheme URI (left) vs current file (right)
+            await vscode.commands.executeCommand(
+                'vscode.diff',
+                originalFileUri,
+                currentFileUri,
+                `${vscode.workspace.asRelativePath(currentFileUri)} (Original ↔ Current, Editable)`,
+                { preview: false }
+            )
+
+            // Clean up content provider when diff view is closed
+            const cleanupDisposable = vscode.window.onDidChangeVisibleTextEditors(() => {
+                const isDiffViewOpen = vscode.window.visibleTextEditors.some(
+                    (editor) => editor.document.uri.toString() === originalFileUri.toString()
+                )
+                if (!isDiffViewOpen) {
+                    disposable.dispose()
+                    cleanupDisposable.dispose()
+                }
+            })
+        } catch (error) {
+            disposable.dispose()
+            languageClient.error(`[VSCode Client] Failed to open diff view: ${error}`)
+        }
+    })
+
+    languageClient.onNotification(chatUpdateNotificationType.method, (params: ChatUpdateParams) => {
+        void provider.webview?.postMessage({
+            command: chatUpdateNotificationType.method,
+            params: params,
+        })
+    })
+
+    languageClient.onNotification(chatOptionsUpdateType.method, (params: ChatOptionsUpdateParams) => {
+        void provider.webview?.postMessage({
+            command: chatOptionsUpdateType.method,
+            params: params,
+        })
+    })
+}
+
+function isServerEvent(command: string) {
+    return command.startsWith('aws/chat/') || command === 'telemetry/event'
+}
+
+function enterFocus(params: any) {
+    return params.name === 'enterFocus'
+}
+
+function exitFocus(params: any) {
+    return params.name === 'exitFocus'
+}
+
+/**
+ * Decodes partial chat responses from the language server before sending them to mynah UI
+ */
+async function handlePartialResult<T extends ChatResult>(
+    partialResult: string | T,
+    encryptionKey: Buffer | undefined,
+    provider: AmazonQChatViewProvider,
+    tabId: string
+) {
+    const decryptedMessage = await decryptResponse<T>(partialResult, encryptionKey)
+
+    // This is to filter out the message containing findings from CodeReview tool to update CodeIssues panel
+    decryptedMessage.additionalMessages = decryptedMessage.additionalMessages?.filter(
+        (message) =>
+            !(
+                message.messageId !== undefined &&
+                (message.messageId.endsWith(CodeWhispererConstants.codeReviewFindingsSuffix) ||
+                    message.messageId.endsWith(CodeWhispererConstants.displayFindingsSuffix))
+            )
+    )
+
+    if (decryptedMessage.body !== undefined) {
+        void provider.webview?.postMessage({
+            command: chatRequestType.method,
+            params: decryptedMessage,
+            isPartialResult: true,
+            tabId: tabId,
+        })
+    }
+    return decryptedMessage
+}
+
+/**
+ * Decodes the final chat responses from the language server before sending it to mynah UI.
+ * Once this is called the answer response is finished
+ */
+async function handleCompleteResult<T extends ChatResult>(
+    result: string | T,
+    encryptionKey: Buffer | undefined,
+    provider: AmazonQChatViewProvider,
+    tabId: string,
+    disposable: Disposable,
+    languageClient: BaseLanguageClient
+) {
+    const decryptedMessage = await decryptResponse<T>(result, encryptionKey)
+
+    await handleSecurityFindings(decryptedMessage, languageClient)
+
+    void provider.webview?.postMessage({
+        command: chatRequestType.method,
+        params: decryptedMessage,
+        tabId: tabId,
+    })
+
+    // only add the reference log once the request is complete, otherwise we will get duplicate log items
+    for (const ref of decryptedMessage.codeReference ?? []) {
+        ReferenceLogViewProvider.instance.addReferenceLog(referenceLogText(ref))
+    }
+    disposable.dispose()
+}
+
+async function handleSecurityFindings(
+    decryptedMessage: { additionalMessages?: ChatMessage[] },
+    languageClient: BaseLanguageClient
+): Promise<void> {
+    if (decryptedMessage.additionalMessages === undefined || decryptedMessage.additionalMessages.length === 0) {
+        return
+    }
+    for (let i = decryptedMessage.additionalMessages.length - 1; i >= 0; i--) {
+        const message = decryptedMessage.additionalMessages[i]
+        if (
+            message.messageId !== undefined &&
+            (message.messageId.endsWith(CodeWhispererConstants.codeReviewFindingsSuffix) ||
+                message.messageId.endsWith(CodeWhispererConstants.displayFindingsSuffix))
+        ) {
+            if (message.body !== undefined) {
+                try {
+                    const aggregatedCodeScanIssues: AggregatedCodeScanIssue[] = JSON.parse(message.body)
+                    for (const aggregatedCodeScanIssue of aggregatedCodeScanIssues) {
+                        const document = await vscode.workspace.openTextDocument(aggregatedCodeScanIssue.filePath)
+                        for (const issue of aggregatedCodeScanIssue.issues) {
+                            const isIssueTitleIgnored = CodeWhispererSettings.instance
+                                .getIgnoredSecurityIssues()
+                                .includes(issue.title)
+                            const isSingleIssueIgnored = CommentUtils.detectCommentAboveLine(
+                                document,
+                                issue.startLine,
+                                CodeWhispererConstants.amazonqIgnoreNextLine
+                            )
+
+                            issue.visible = !isIssueTitleIgnored && !isSingleIssueIgnored
+                        }
+                    }
+                    initSecurityScanRender(
+                        aggregatedCodeScanIssues,
+                        undefined,
+                        CodeAnalysisScope.AGENTIC,
+                        message.messageId.endsWith(CodeWhispererConstants.codeReviewFindingsSuffix)
+                    )
+                    SecurityIssueTreeViewProvider.focus()
+                } catch (e) {
+                    languageClient.info('Failed to parse findings')
+                }
+            }
+            decryptedMessage.additionalMessages.splice(i, 1)
+        }
+    }
+}
+
+async function resolveChatResponse(
+    requestMethod: string,
+    params: any,
+    languageClient: BaseLanguageClient,
+    webview: vscode.Webview | undefined
+) {
+    const result = await languageClient.sendRequest(requestMethod, params)
+    void webview?.postMessage({
+        command: requestMethod,
+        params: result,
+    })
+}
diff --git a/packages/amazonq/src/lsp/chat/webviewProvider.ts b/packages/amazonq/src/lsp/chat/webviewProvider.ts
new file mode 100644
index 00000000000..b0e0bddc195
--- /dev/null
+++ b/packages/amazonq/src/lsp/chat/webviewProvider.ts
@@ -0,0 +1,186 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    EventEmitter,
+    CancellationToken,
+    WebviewView,
+    WebviewViewProvider,
+    WebviewViewResolveContext,
+    Uri,
+    Webview,
+} from 'vscode'
+import * as path from 'path'
+import * as os from 'os'
+import {
+    globals,
+    isSageMaker,
+    AmazonQPromptSettings,
+    LanguageServerResolver,
+    amazonqMark,
+    getLogger,
+} from 'aws-core-vscode/shared'
+import { AuthUtil, RegionProfile } from 'aws-core-vscode/codewhisperer'
+import { featureConfig } from 'aws-core-vscode/amazonq'
+import { getAmazonQLspConfig } from '../config'
+import { BaseLanguageClient } from 'vscode-languageclient'
+
+export class AmazonQChatViewProvider implements WebviewViewProvider {
+    public static readonly viewType = 'aws.amazonq.AmazonQChatView'
+    private readonly onDidResolveWebviewEmitter = new EventEmitter<void>()
+    public readonly onDidResolveWebview = this.onDidResolveWebviewEmitter.event
+
+    webviewView?: WebviewView
+    webview?: Webview
+
+    connectorAdapterPath?: string
+    uiPath?: string
+
+    constructor(
+        private readonly mynahUIPath: string,
+        private readonly languageClient: BaseLanguageClient
+    ) {}
+
+    public async resolveWebviewView(
+        webviewView: WebviewView,
+        context: WebviewViewResolveContext,
+        _token: CancellationToken
+    ) {
+        const lspDir = Uri.file(LanguageServerResolver.defaultDir())
+        const dist = Uri.joinPath(globals.context.extensionUri, 'dist')
+        const bundledResources = Uri.joinPath(globals.context.extensionUri, 'resources/language-server')
+        let resourcesRoots = [lspDir, dist]
+        if (this.mynahUIPath?.startsWith(globals.context.extensionUri.fsPath)) {
+            getLogger('amazonqLsp').info(`Using bundled webview resources ${bundledResources.fsPath}`)
+            resourcesRoots = [bundledResources, dist]
+        }
+        /**
+         * if the mynah chat client is defined, then make sure to add it to the resource roots, otherwise
+         * it will 401 when trying to load
+         */
+        const mynahUIPath = getAmazonQLspConfig().ui
+        if (process.env.WEBPACK_DEVELOPER_SERVER && mynahUIPath) {
+            const dir = path.dirname(mynahUIPath)
+            resourcesRoots.push(Uri.file(dir))
+        }
+
+        webviewView.webview.options = {
+            enableScripts: true,
+            enableCommandUris: true,
+            localResourceRoots: resourcesRoots,
+        }
+
+        const source = 'vue/src/amazonq/webview/ui/amazonq-ui-connector-adapter.js' // Sent to dist/vue folder in webpack.
+        const serverHostname = process.env.WEBPACK_DEVELOPER_SERVER
+
+        this.connectorAdapterPath =
+            serverHostname !== undefined
+                ? `${serverHostname}/${source}`
+                : webviewView.webview.asWebviewUri(Uri.joinPath(dist, source)).toString()
+        this.uiPath = webviewView.webview.asWebviewUri(Uri.file(this.mynahUIPath)).toString()
+
+        webviewView.webview.html = await this.getWebviewContent()
+
+        this.webviewView = webviewView
+        this.webview = this.webviewView.webview
+
+        this.onDidResolveWebviewEmitter.fire()
+        performance.mark(amazonqMark.open)
+    }
+
+    private async getWebviewContent() {
+        const featureConfigData = await featureConfig.getFeatureConfigs()
+
+        const isSM = isSageMaker('SMAI')
+        const isSMUS = isSageMaker('SMUS')
+        const disabledCommands = isSM ? `['/dev', '/transform', '/test', '/review', '/doc']` : '[]'
+        const disclaimerAcknowledged = !AmazonQPromptSettings.instance.isPromptEnabled('amazonQChatDisclaimer')
+        const pairProgrammingAcknowledged =
+            !AmazonQPromptSettings.instance.isPromptEnabled('amazonQChatPairProgramming')
+        const welcomeCount = globals.globalState.tryGet('aws.amazonq.welcomeChatShowCount', Number, 0)
+        const modelSelectionEnabled =
+            this.languageClient.initializeResult?.awsServerCapabilities?.chatOptions?.modelSelection ?? false
+
+        // only show profile card when the two conditions
+        //  1. profile count >= 2
+        //  2. not default (fallback) which has empty arn
+        let regionProfile: RegionProfile | undefined = AuthUtil.instance.regionProfileManager.activeRegionProfile
+        if (AuthUtil.instance.regionProfileManager.profiles.length === 1) {
+            regionProfile = undefined
+        }
+
+        const regionProfileString: string = JSON.stringify(regionProfile)
+
+        const entrypoint = process.env.WEBPACK_DEVELOPER_SERVER
+            ? 'http://localhost:8080'
+            : 'https://file+.vscode-resource.vscode-cdn.net'
+
+        const contentPolicy = `default-src ${entrypoint} data: blob: 'unsafe-inline';
+            script-src ${entrypoint} filesystem: file: vscode-resource: https: ws: wss: 'unsafe-inline';`
+
+        return `
+        <!DOCTYPE html>
+        <html lang="en">
+        <head>
+            <meta charset="UTF-8">
+            <meta http-equiv="Content-Security-Policy" content="${contentPolicy}">
+            <meta name="viewport" content="width=device-width, initial-scale=1.0">
+            <title>Chat</title>
+            <style>
+                body,
+                html {
+                    background-color: var(--mynah-color-bg);
+                    color: var(--mynah-color-text-default);
+                    height: 100%;
+                    width: 100%;
+                    overflow: hidden;
+                    margin: 0;
+                    padding: 0;
+                }
+            </style>
+        </head>
+        <body>
+            <script type="text/javascript" src="${this.uiPath?.toString()}" defer onload="init()"></script>
+            <script type="text/javascript" src="${this.connectorAdapterPath?.toString()}"></script>
+            <script type="text/javascript">
+                let qChat = undefined
+                const init = () => {
+                    const vscodeApi = acquireVsCodeApi()
+                    const hybridChatConnector = new HybridChatAdapter(${(await AuthUtil.instance.getChatAuthState()).amazonQ === 'connected'},${featureConfigData},${welcomeCount},${disclaimerAcknowledged},${regionProfileString},${disabledCommands},${isSMUS},${isSM},vscodeApi.postMessage)
+                    const commands = [hybridChatConnector.initialQuickActions[0]]
+                    qChat = amazonQChat.createChat(vscodeApi, {os: "${os.platform()}", disclaimerAcknowledged: ${disclaimerAcknowledged}, pairProgrammingAcknowledged: ${pairProgrammingAcknowledged}, agenticMode: true, quickActionCommands: commands, modelSelectionEnabled: ${modelSelectionEnabled}}, hybridChatConnector, ${JSON.stringify(featureConfigData)});
+                }
+                window.addEventListener('message', (event) => {
+                    /**
+                     * special handler that "simulates" reloading the webview when a profile changes.
+                     * required because chat-client relies on initializedResult from the lsp that
+                     * are only sent once
+                     *
+                     * References:
+                     *   closing tabs: https://github.com/aws/mynah-ui/blob/de736b52f369ba885cd19f33ac86c6f57b4a3134/docs/USAGE.md#removing-a-tab-programmatically-
+                     *   opening tabs: https://github.com/aws/aws-toolkit-vscode/blob/c22efa03e73b241564c8051c35761eb8620edb83/packages/amazonq/test/e2e/amazonq/framework/framework.ts#L98
+                     */
+                    if (event.data.command === 'reload' && qChat) {
+                        // close all previous tabs
+                        Object.keys(qChat.getAllTabs()).forEach(tabId => qChat.removeTab(tabId, qChat.lastEventId));
+
+                        // open a new "initial" tab
+                        ;(document.querySelectorAll('.mynah-nav-tabs-wrapper > button.mynah-button')[0]).click()
+                    }
+                });
+            </script>
+        </body>
+        </html>`
+    }
+
+    async refreshWebview() {
+        if (this.webview) {
+            // post a message to the webview telling it to reload
+            void this.webview?.postMessage({
+                command: 'reload',
+            })
+        }
+    }
+}
diff --git a/packages/amazonq/src/lsp/client.ts b/packages/amazonq/src/lsp/client.ts
new file mode 100644
index 00000000000..2255fb80fee
--- /dev/null
+++ b/packages/amazonq/src/lsp/client.ts
@@ -0,0 +1,552 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import vscode, { version } from 'vscode'
+import * as nls from 'vscode-nls'
+import { BaseLanguageClient, LanguageClientOptions, RequestType, State } from 'vscode-languageclient'
+import { LanguageClient } from 'vscode-languageclient/node'
+import { InlineCompletionManager } from '../app/inline/completion'
+import { AmazonQLspAuth, encryptionKey, notificationTypes } from './auth'
+import {
+    CreateFilesParams,
+    DeleteFilesParams,
+    DidChangeWorkspaceFoldersParams,
+    GetConfigurationFromServerParams,
+    RenameFilesParams,
+    ResponseMessage,
+    WorkspaceFolder,
+    ConnectionMetadata,
+} from '@aws/language-server-runtimes/protocol'
+import {
+    AuthUtil,
+    CodeWhispererSettings,
+    FeatureConfigProvider,
+    getSelectedCustomization,
+    TelemetryHelper,
+    vsCodeState,
+} from 'aws-core-vscode/codewhisperer'
+import {
+    Settings,
+    createServerOptions,
+    globals,
+    Experiments,
+    Commands,
+    oneSecond,
+    validateNodeExe,
+    getLogger,
+    undefinedIfEmpty,
+    getOptOutPreference,
+    isAmazonLinux2,
+    getClientId,
+    getClientName,
+    extensionVersion,
+    isSageMaker,
+    DevSettings,
+} from 'aws-core-vscode/shared'
+import { processUtils } from 'aws-core-vscode/shared'
+import { activate } from './chat/activation'
+import { activate as activateInline } from '../app/inline/activation'
+import { AmazonQResourcePaths } from './lspInstaller'
+import { ConfigSection, isValidConfigSection, pushConfigUpdate, toAmazonQLSPLogLevel } from './config'
+import { activate as activateInlineChat } from '../inlineChat/activation'
+import { telemetry } from 'aws-core-vscode/telemetry'
+import { SessionManager } from '../app/inline/sessionManager'
+import { LineTracker } from '../app/inline/stateTracker/lineTracker'
+import { InlineTutorialAnnotation } from '../app/inline/tutorials/inlineTutorialAnnotation'
+import { InlineChatTutorialAnnotation } from '../app/inline/tutorials/inlineChatTutorialAnnotation'
+import { codeReviewInChat } from '../app/amazonqScan/models/constants'
+
+const localize = nls.loadMessageBundle()
+const logger = getLogger('amazonqLsp.lspClient')
+
+export function hasGlibcPatch(): boolean {
+    // Skip GLIBC patching for SageMaker environments
+    if (isSageMaker()) {
+        getLogger('amazonqLsp').info('SageMaker environment detected in hasGlibcPatch, skipping GLIBC patching')
+        return false // Return false to ensure SageMaker doesn't try to use GLIBC patching
+    }
+
+    // Check for environment variables (for CDM)
+    const glibcLinker = process.env.VSCODE_SERVER_CUSTOM_GLIBC_LINKER || ''
+    const glibcPath = process.env.VSCODE_SERVER_CUSTOM_GLIBC_PATH || ''
+
+    if (glibcLinker.length > 0 && glibcPath.length > 0) {
+        getLogger('amazonqLsp').info('GLIBC patching environment variables detected')
+        return true
+    }
+
+    // No environment variables, no patching needed
+    return false
+}
+
+export async function startLanguageServer(
+    extensionContext: vscode.ExtensionContext,
+    resourcePaths: AmazonQResourcePaths
+) {
+    const toDispose = extensionContext.subscriptions
+
+    const serverModule = resourcePaths.lsp
+
+    const argv = [
+        '--nolazy',
+        '--preserve-symlinks',
+        '--stdio',
+        '--pre-init-encryption',
+        '--set-credentials-encryption-key',
+    ]
+
+    const documentSelector = [{ scheme: 'file', language: '*' }]
+
+    const clientId = 'amazonq'
+    const traceServerEnabled = Settings.instance.isSet(`${clientId}.trace.server`)
+    let executable: string[] = []
+    // apply the GLIBC 2.28 path to node js runtime binary
+    if (isSageMaker()) {
+        // SageMaker doesn't need GLIBC patching
+        getLogger('amazonqLsp').info('SageMaker environment detected, skipping GLIBC patching')
+        executable = [resourcePaths.node]
+    } else if (isAmazonLinux2() && hasGlibcPatch()) {
+        // Use environment variables if available (for CDM)
+        if (process.env.VSCODE_SERVER_CUSTOM_GLIBC_LINKER && process.env.VSCODE_SERVER_CUSTOM_GLIBC_PATH) {
+            executable = [
+                process.env.VSCODE_SERVER_CUSTOM_GLIBC_LINKER,
+                '--library-path',
+                process.env.VSCODE_SERVER_CUSTOM_GLIBC_PATH,
+                resourcePaths.node,
+            ]
+            getLogger('amazonqLsp').info(`Patched node runtime with GLIBC using env vars to ${executable}`)
+        } else {
+            // No environment variables, use the node executable directly
+            executable = [resourcePaths.node]
+        }
+    } else {
+        executable = [resourcePaths.node]
+    }
+
+    const memoryWarnThreshold = 1024 * processUtils.oneMB
+    const serverOptions = createServerOptions({
+        encryptionKey,
+        executable: executable,
+        serverModule,
+        execArgv: argv,
+        warnThresholds: { memory: memoryWarnThreshold },
+    })
+
+    await validateNodeExe(executable, resourcePaths.lsp, argv, logger)
+
+    const endpointOverride = DevSettings.instance.get('codewhispererService', {}).endpoint ?? undefined
+    const textDocSection = {
+        inlineEditSupport: Experiments.instance.get('amazonqLSPNEP', true),
+    } as any
+
+    if (endpointOverride) {
+        textDocSection.endpointOverride = endpointOverride
+    }
+
+    // Options to control the language client
+    const clientOptions: LanguageClientOptions = {
+        // Register the server for json documents
+        documentSelector,
+        middleware: {
+            workspace: {
+                /**
+                 * Convert VSCode settings format to be compatible with flare's configs
+                 */
+                configuration: async (params, token, next) => {
+                    const config = await next(params, token)
+                    const section = params.items[0].section
+                    if (!isValidConfigSection(section)) {
+                        return config
+                    }
+                    return getConfigSection(section)
+                },
+            },
+        },
+        initializationOptions: {
+            aws: {
+                clientInfo: {
+                    name: getClientName(),
+                    version: version,
+                    extension: {
+                        name: 'AmazonQ-For-VSCode',
+                        version: extensionVersion,
+                    },
+                    clientId: getClientId(globals.globalState),
+                },
+                awsClientCapabilities: {
+                    q: {
+                        developerProfiles: true,
+                        pinnedContextEnabled: true,
+                        imageContextEnabled: true,
+                        mcp: true,
+                        shortcut: true,
+                        reroute: true,
+                        modelSelection: true,
+                        workspaceFilePath: vscode.workspace.workspaceFile?.fsPath,
+                        codeReviewInChat: codeReviewInChat,
+                        // feature flag for displaying findings found not through CodeReview in the Code Issues Panel
+                        displayFindings: true,
+                    },
+                    window: {
+                        notifications: true,
+                        showSaveFileDialog: true,
+                        showLogs: isSageMaker() ? false : true,
+                    },
+                    textDocument: {
+                        inlineCompletionWithReferences: textDocSection,
+                    },
+                },
+                contextConfiguration: {
+                    workspaceIdentifier: extensionContext.storageUri?.path,
+                },
+                logLevel: isSageMaker() ? 'debug' : toAmazonQLSPLogLevel(globals.logOutputChannel.logLevel),
+            },
+            credentials: {
+                providesBearerToken: true,
+                providesIam: isSageMaker(), // Enable IAM credentials for SageMaker environments
+            },
+        },
+        /**
+         * When the trace server is enabled it outputs a ton of log messages so:
+         *   When trace server is enabled, logs go to a seperate "Amazon Q Language Server" output.
+         *   Otherwise, logs go to the regular "Amazon Q Logs" channel.
+         */
+        ...(traceServerEnabled
+            ? {}
+            : {
+                  outputChannel: globals.logOutputChannel,
+              }),
+    }
+
+    const client = new LanguageClient(
+        clientId,
+        localize('amazonq.server.name', 'Amazon Q Language Server'),
+        serverOptions,
+        clientOptions
+    )
+
+    await client.start()
+
+    // Set up connection metadata handler
+    client.onRequest<ConnectionMetadata, Error>(notificationTypes.getConnectionMetadata.method, () => {
+        // For IAM auth, provide a default startUrl
+        if (process.env.USE_IAM_AUTH === 'true') {
+            getLogger().info(
+                `[SageMaker Debug] Connection metadata requested - returning hardcoded startUrl for IAM auth`
+            )
+            return {
+                sso: {
+                    // TODO P261194666 Replace with correct startUrl once identified
+                    startUrl: 'https://amzn.awsapps.com/start', // Default for IAM auth
+                },
+            }
+        }
+
+        // For SSO auth, use the actual startUrl
+        getLogger().info(
+            `[SageMaker Debug] Connection metadata requested - returning actual startUrl for SSO auth: ${AuthUtil.instance.auth.startUrl}`
+        )
+        return {
+            sso: {
+                startUrl: AuthUtil.instance.auth.startUrl,
+            },
+        }
+    })
+
+    const auth = await initializeAuth(client)
+
+    await onLanguageServerReady(extensionContext, auth, client, resourcePaths, toDispose)
+
+    return client
+}
+
+async function initializeAuth(client: BaseLanguageClient): Promise<AmazonQLspAuth> {
+    const auth = new AmazonQLspAuth(client)
+    await auth.refreshConnection(true)
+    return auth
+}
+
+// jscpd:ignore-start
+async function initializeLanguageServerConfiguration(client: BaseLanguageClient, context: string = 'startup') {
+    const logger = getLogger('amazonqLsp')
+
+    if (AuthUtil.instance.isConnectionValid()) {
+        logger.info(`[${context}] Initializing language server configuration`)
+        // jscpd:ignore-end
+
+        try {
+            // Send profile configuration
+            logger.debug(`[${context}] Sending profile configuration to language server`)
+            await sendProfileToLsp(client)
+            logger.debug(`[${context}] Profile configuration sent successfully`)
+
+            // Send customization configuration
+            logger.debug(`[${context}] Sending customization configuration to language server`)
+            await pushConfigUpdate(client, {
+                type: 'customization',
+                customization: getSelectedCustomization(),
+            })
+            logger.debug(`[${context}] Customization configuration sent successfully`)
+
+            logger.info(`[${context}] Language server configuration completed successfully`)
+        } catch (error) {
+            logger.error(`[${context}] Failed to initialize language server configuration: ${error}`)
+            throw error
+        }
+    } else {
+        logger.warn(
+            `[${context}] Connection invalid, skipping language server configuration - this will cause authentication failures`
+        )
+        const activeConnection = AuthUtil.instance.auth.activeConnection
+        const connectionState = activeConnection
+            ? AuthUtil.instance.auth.getConnectionState(activeConnection)
+            : 'no-connection'
+        logger.warn(`[${context}] Connection state: ${connectionState}`)
+    }
+}
+
+async function sendProfileToLsp(client: BaseLanguageClient) {
+    const logger = getLogger('amazonqLsp')
+    const profileArn = AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn
+
+    logger.debug(`Sending profile to LSP: ${profileArn || 'undefined'}`)
+
+    await pushConfigUpdate(client, {
+        type: 'profile',
+        profileArn: profileArn,
+    })
+
+    logger.debug(`Profile sent to LSP successfully`)
+}
+
+async function onLanguageServerReady(
+    extensionContext: vscode.ExtensionContext,
+    auth: AmazonQLspAuth,
+    client: BaseLanguageClient,
+    resourcePaths: AmazonQResourcePaths,
+    toDispose: vscode.Disposable[]
+) {
+    const sessionManager = new SessionManager()
+
+    // keeps track of the line changes
+    const lineTracker = new LineTracker()
+
+    // tutorial for inline suggestions
+    const inlineTutorialAnnotation = new InlineTutorialAnnotation(lineTracker, sessionManager)
+
+    // tutorial for inline chat
+    const inlineChatTutorialAnnotation = new InlineChatTutorialAnnotation(inlineTutorialAnnotation)
+
+    const enableInlineRollback = FeatureConfigProvider.instance.getPreFlareRollbackGroup() === 'treatment'
+    if (enableInlineRollback) {
+        // use VSC inline
+        getLogger().info('Entering preflare logic')
+        await activateInline(client)
+    } else {
+        // use language server for inline completion
+        getLogger().info('Entering postflare logic')
+        const inlineManager = new InlineCompletionManager(client, sessionManager, lineTracker, inlineTutorialAnnotation)
+        inlineManager.registerInlineCompletion()
+        toDispose.push(
+            inlineManager,
+            Commands.register('aws.amazonq.showPrev', async () => {
+                await sessionManager.maybeRefreshSessionUx()
+                await vscode.commands.executeCommand('editor.action.inlineSuggest.showPrevious')
+                sessionManager.onPrevSuggestion()
+            }),
+            Commands.register('aws.amazonq.showNext', async () => {
+                await sessionManager.maybeRefreshSessionUx()
+                await vscode.commands.executeCommand('editor.action.inlineSuggest.showNext')
+                sessionManager.onNextSuggestion()
+            }),
+            // this is a workaround since handleDidShowCompletionItem is not public API
+            Commands.register('aws.amazonq.checkInlineSuggestionVisibility', async () => {
+                sessionManager.checkInlineSuggestionVisibility()
+            }),
+            Commands.register({ id: 'aws.amazonq.invokeInlineCompletion', autoconnect: true }, async () => {
+                vsCodeState.lastManualTriggerTime = performance.now()
+                await vscode.commands.executeCommand('editor.action.inlineSuggest.trigger')
+            }),
+            vscode.workspace.onDidCloseTextDocument(async () => {
+                await vscode.commands.executeCommand('aws.amazonq.rejectCodeSuggestion')
+            })
+        )
+    }
+
+    activateInlineChat(extensionContext, client, encryptionKey, inlineChatTutorialAnnotation)
+
+    if (Experiments.instance.get('amazonqChatLSP', true)) {
+        await activate(client, encryptionKey, resourcePaths.ui)
+    }
+
+    const refreshInterval = auth.startTokenRefreshInterval(10 * oneSecond)
+
+    // We manually push the cached values the first time since event handlers, which should push, may not have been setup yet.
+    // Execution order is weird and should be fixed in the flare implementation.
+    // TODO: Revisit if we need this if we setup the event handlers properly
+    await initializeLanguageServerConfiguration(client, 'startup')
+
+    toDispose.push(
+        Commands.register('aws.amazonq.refreshAnnotation', async (forceProceed: boolean) => {
+            telemetry.record({
+                traceId: TelemetryHelper.instance.traceId,
+            })
+
+            const editor = vscode.window.activeTextEditor
+            if (editor) {
+                if (forceProceed) {
+                    await inlineTutorialAnnotation.refresh(editor, 'codewhisperer', true)
+                } else {
+                    await inlineTutorialAnnotation.refresh(editor, 'codewhisperer')
+                }
+            }
+        }),
+        Commands.register('aws.amazonq.dismissTutorial', async () => {
+            const editor = vscode.window.activeTextEditor
+            if (editor) {
+                inlineTutorialAnnotation.clear()
+                try {
+                    telemetry.ui_click.emit({ elementId: `dismiss_${inlineTutorialAnnotation.currentState.id}` })
+                } catch (_) {}
+                await inlineTutorialAnnotation.dismissTutorial()
+                getLogger().debug(`codewhisperer: user dismiss tutorial.`)
+            }
+        }),
+        AuthUtil.instance.auth.onDidChangeActiveConnection(async () => {
+            await auth.refreshConnection()
+        }),
+        AuthUtil.instance.auth.onDidDeleteConnection(async () => {
+            void client.sendNotification(notificationTypes.deleteBearerToken.method)
+        }),
+        AuthUtil.instance.regionProfileManager.onDidChangeRegionProfile(() => sendProfileToLsp(client)),
+        vscode.commands.registerCommand('aws.amazonq.getWorkspaceId', async () => {
+            const requestType = new RequestType<GetConfigurationFromServerParams, ResponseMessage, Error>(
+                'aws/getConfigurationFromServer'
+            )
+            const workspaceIdResp = await client.sendRequest(requestType.method, {
+                section: 'aws.q.workspaceContext',
+            })
+            return workspaceIdResp
+        }),
+        vscode.workspace.onDidCreateFiles((e) => {
+            void client.sendNotification('workspace/didCreateFiles', {
+                files: e.files.map((it) => {
+                    return { uri: it.fsPath }
+                }),
+            } as CreateFilesParams)
+        }),
+        vscode.workspace.onDidDeleteFiles((e) => {
+            void client.sendNotification('workspace/didDeleteFiles', {
+                files: e.files.map((it) => {
+                    return { uri: it.fsPath }
+                }),
+            } as DeleteFilesParams)
+        }),
+        vscode.workspace.onDidRenameFiles((e) => {
+            void client.sendNotification('workspace/didRenameFiles', {
+                files: e.files.map((it) => {
+                    return { oldUri: it.oldUri.fsPath, newUri: it.newUri.fsPath }
+                }),
+            } as RenameFilesParams)
+        }),
+        vscode.workspace.onDidChangeWorkspaceFolders((e) => {
+            void client.sendNotification('workspace/didChangeWorkspaceFolder', {
+                event: {
+                    added: e.added.map((it) => {
+                        return {
+                            name: it.name,
+                            uri: it.uri.fsPath,
+                        } as WorkspaceFolder
+                    }),
+                    removed: e.removed.map((it) => {
+                        return {
+                            name: it.name,
+                            uri: it.uri.fsPath,
+                        } as WorkspaceFolder
+                    }),
+                },
+            } as DidChangeWorkspaceFoldersParams)
+        }),
+        { dispose: () => clearInterval(refreshInterval) },
+        // Set this inside onReady so that it only triggers on subsequent language server starts (not the first)
+        onServerRestartHandler(client, auth)
+    )
+}
+
+/**
+ * When the server restarts (likely due to a crash, then the LanguageClient automatically starts it again)
+ * we need to run some server intialization again.
+ */
+function onServerRestartHandler(client: BaseLanguageClient, auth: AmazonQLspAuth) {
+    return client.onDidChangeState(async (e) => {
+        // Ensure we are in a "restart" state
+        if (!(e.oldState === State.Starting && e.newState === State.Running)) {
+            return
+        }
+
+        // Emit telemetry that a crash was detected.
+        // It is not guaranteed to 100% be a crash since somehow the server may have been intentionally restarted,
+        // but most of the time it probably will have been due to a crash.
+        // TODO: Port this metric override to common definitions
+        telemetry.languageServer_crash.emit({ id: 'AmazonQ' })
+
+        const logger = getLogger('amazonqLsp')
+        logger.info('[crash-recovery] Language server crash detected, reinitializing authentication')
+
+        try {
+            // Send bearer token
+            logger.debug('[crash-recovery] Refreshing connection and sending bearer token')
+            await auth.refreshConnection(true)
+            logger.debug('[crash-recovery] Bearer token sent successfully')
+
+            // Send profile and customization configuration
+            await initializeLanguageServerConfiguration(client, 'crash-recovery')
+            logger.info('[crash-recovery] Authentication reinitialized successfully')
+        } catch (error) {
+            logger.error(`[crash-recovery] Failed to reinitialize after crash: ${error}`)
+        }
+    })
+}
+
+function getConfigSection(section: ConfigSection) {
+    getLogger('amazonqLsp').debug('Fetching config section %s for language server', section)
+    switch (section) {
+        case 'aws.q':
+            /**
+             * IMPORTANT: This object is parsed by the following code in the language server, **so
+             * it must match that expected shape**.
+             * https://github.com/aws/language-servers/blob/1d2ca018f2248106690438b860d40a7ee67ac728/server/aws-lsp-codewhisperer/src/shared/amazonQServiceManager/configurationUtils.ts#L114
+             */
+            return [
+                {
+                    customization: undefinedIfEmpty(getSelectedCustomization().arn),
+                    optOutTelemetry: getOptOutPreference() === 'OPTOUT',
+                    projectContext: {
+                        enableLocalIndexing: CodeWhispererSettings.instance.isLocalIndexEnabled(),
+                        enableGpuAcceleration: CodeWhispererSettings.instance.isLocalIndexGPUEnabled(),
+                        indexWorkerThreads: CodeWhispererSettings.instance.getIndexWorkerThreads(),
+                        localIndexing: {
+                            ignoreFilePatterns: CodeWhispererSettings.instance.getIndexIgnoreFilePatterns(),
+                            maxFileSizeMB: CodeWhispererSettings.instance.getMaxIndexFileSize(),
+                            maxIndexSizeMB: CodeWhispererSettings.instance.getMaxIndexSize(),
+                            indexCacheDirPath: CodeWhispererSettings.instance.getIndexCacheDirPath(),
+                        },
+                    },
+                },
+            ]
+        case 'aws.codeWhisperer':
+            return [
+                {
+                    includeSuggestionsWithCodeReferences:
+                        CodeWhispererSettings.instance.isSuggestionsWithCodeReferencesEnabled(),
+                    shareCodeWhispererContentWithAWS: !CodeWhispererSettings.instance.isOptoutEnabled(),
+                    includeImportsWithSuggestions: CodeWhispererSettings.instance.isImportRecommendationEnabled(),
+                    sendUserWrittenCodeMetrics: true,
+                },
+            ]
+        case 'aws.logLevel':
+            return [toAmazonQLSPLogLevel(globals.logOutputChannel.logLevel)]
+    }
+}
diff --git a/packages/amazonq/src/lsp/config.ts b/packages/amazonq/src/lsp/config.ts
new file mode 100644
index 00000000000..d33f58d6988
--- /dev/null
+++ b/packages/amazonq/src/lsp/config.ts
@@ -0,0 +1,110 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { DevSettings, getServiceEnvVarConfig, BaseLspInstaller, getLogger } from 'aws-core-vscode/shared'
+import { BaseLanguageClient } from 'vscode-languageclient'
+import {
+    DidChangeConfigurationNotification,
+    updateConfigurationRequestType,
+} from '@aws/language-server-runtimes/protocol'
+
+export interface ExtendedAmazonQLSPConfig extends BaseLspInstaller.LspConfig {
+    ui?: string
+}
+
+// Taken from language server runtimes since they are not exported:
+// https://github.com/aws/language-server-runtimes/blob/eae85672c345d8adaf4c8cbd741260b8a59750c4/runtimes/runtimes/util/loggingUtil.ts#L4-L10
+const validLspLogLevels = ['error', 'warn', 'info', 'log', 'debug'] as const
+export type LspLogLevel = (typeof validLspLogLevels)[number]
+const lspLogLevelMapping: Map<vscode.LogLevel, LspLogLevel> = new Map([
+    [vscode.LogLevel.Error, 'error'],
+    [vscode.LogLevel.Warning, 'warn'],
+    [vscode.LogLevel.Info, 'info'],
+    [vscode.LogLevel.Debug, 'log'],
+    [vscode.LogLevel.Trace, 'debug'],
+    [vscode.LogLevel.Off, 'error'], // TODO: once the language server supports a no-log setting, we can map to that.
+])
+
+const configSections = ['aws.q', 'aws.codeWhisperer', 'aws.logLevel'] as const
+export type ConfigSection = (typeof configSections)[number]
+
+export function isValidConfigSection(section: unknown): section is ConfigSection {
+    return typeof section === 'string' && configSections.includes(section as ConfigSection)
+}
+
+export const defaultAmazonQLspConfig: ExtendedAmazonQLSPConfig = {
+    manifestUrl: 'https://aws-toolkit-language-servers.amazonaws.com/qAgenticChatServer/0/manifest.json',
+    supportedVersions: '1.*.*',
+    id: 'AmazonQ', // used across IDEs for identifying global storage/local disk locations. Do not change.
+    suppressPromptPrefix: 'amazonQ',
+    path: undefined,
+    ui: undefined,
+}
+
+export function getAmazonQLspConfig(): ExtendedAmazonQLSPConfig {
+    return {
+        ...defaultAmazonQLspConfig,
+        ...(DevSettings.instance.getServiceConfig('amazonqLsp', {}) as ExtendedAmazonQLSPConfig),
+        ...getServiceEnvVarConfig('amazonqLsp', Object.keys(defaultAmazonQLspConfig)),
+    }
+}
+/**
+ * The language server logging levels do not directly match those used in VSC. Therefore, we must perform a mapping defined by {@link lspLogLevelMapping}
+ * @param logLevel vscode log level (0-5)
+ * @returns language server log level
+ */
+export function toAmazonQLSPLogLevel(logLevel: vscode.LogLevel): LspLogLevel {
+    return lspLogLevelMapping.get(logLevel) ?? 'info'
+}
+
+/**
+ * Request/Notify a config value to the language server, effectively updating it with the
+ * latest configuration from the client.
+ *
+ * The issue is we need to push certain configs to different places, since there are
+ * different handlers for specific configs. So this determines the correct place to
+ * push the given config.
+ */
+export async function pushConfigUpdate(client: BaseLanguageClient, config: QConfigs) {
+    const logger = getLogger('amazonqLsp')
+
+    switch (config.type) {
+        case 'profile':
+            logger.debug(`Pushing profile configuration: ${config.profileArn || 'undefined'}`)
+            await client.sendRequest(updateConfigurationRequestType.method, {
+                section: 'aws.q',
+                settings: { profileArn: config.profileArn },
+            })
+            logger.debug(`Profile configuration pushed successfully`)
+            break
+        case 'customization':
+            logger.debug(`Pushing customization configuration: ${config.customization || 'undefined'}`)
+            void client.sendNotification(DidChangeConfigurationNotification.type.method, {
+                section: 'aws.q',
+                settings: { customization: config.customization },
+            })
+            logger.debug(`Customization configuration pushed successfully`)
+            break
+        case 'logLevel':
+            logger.debug(`Pushing log level configuration`)
+            void client.sendNotification(DidChangeConfigurationNotification.type.method, {
+                section: 'aws.logLevel',
+            })
+            logger.debug(`Log level configuration pushed successfully`)
+            break
+    }
+}
+type ProfileConfig = {
+    type: 'profile'
+    profileArn: string | undefined
+}
+type CustomizationConfig = {
+    type: 'customization'
+    customization: string | undefined
+}
+type LogLevelConfig = {
+    type: 'logLevel'
+}
+type QConfigs = ProfileConfig | CustomizationConfig | LogLevelConfig
diff --git a/packages/amazonq/src/lsp/encryption.ts b/packages/amazonq/src/lsp/encryption.ts
new file mode 100644
index 00000000000..246c64f476b
--- /dev/null
+++ b/packages/amazonq/src/lsp/encryption.ts
@@ -0,0 +1,34 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as jose from 'jose'
+
+export async function encryptRequest<T>(params: T, encryptionKey: Buffer): Promise<{ message: string } | T> {
+    const payload = new TextEncoder().encode(JSON.stringify(params))
+
+    const encryptedMessage = await new jose.CompactEncrypt(payload)
+        .setProtectedHeader({ alg: 'dir', enc: 'A256GCM' })
+        .encrypt(encryptionKey)
+
+    return { message: encryptedMessage }
+}
+
+export async function decryptResponse<T>(response: unknown, key: Buffer | undefined) {
+    // Note that casts are required since language client requests return 'unknown' type.
+    // If we can't decrypt, return original response casted.
+    if (typeof response !== 'string' || key === undefined) {
+        return response as T
+    }
+
+    const result = await jose.jwtDecrypt(response, key, {
+        clockTolerance: 60, // Allow up to 60 seconds to account for clock differences
+        contentEncryptionAlgorithms: ['A256GCM'],
+        keyManagementAlgorithms: ['dir'],
+    })
+
+    if (!result.payload) {
+        throw new Error('JWT payload not found')
+    }
+    return result.payload as T
+}
diff --git a/packages/amazonq/src/lsp/lspInstaller.ts b/packages/amazonq/src/lsp/lspInstaller.ts
new file mode 100644
index 00000000000..9ac19601fe7
--- /dev/null
+++ b/packages/amazonq/src/lsp/lspInstaller.ts
@@ -0,0 +1,67 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import vscode from 'vscode'
+import { fs, getNodeExecutableName, getRgExecutableName, BaseLspInstaller, ResourcePaths } from 'aws-core-vscode/shared'
+import path from 'path'
+import { ExtendedAmazonQLSPConfig, getAmazonQLspConfig } from './config'
+
+export interface AmazonQResourcePaths extends ResourcePaths {
+    ui: string
+    /**
+     * Path to `rg` (or `rg.exe`) executable/binary.
+     * Example: `"<cachedir>/aws/toolkits/language-servers/AmazonQ/3.3.0/servers/rg"`
+     */
+    ripGrep: string
+}
+
+export class AmazonQLspInstaller extends BaseLspInstaller.BaseLspInstaller<
+    AmazonQResourcePaths,
+    ExtendedAmazonQLSPConfig
+> {
+    constructor(lspConfig: ExtendedAmazonQLSPConfig = getAmazonQLspConfig()) {
+        super(lspConfig, 'amazonqLsp')
+    }
+
+    protected override async postInstall(assetDirectory: string): Promise<void> {
+        const resourcePaths = this.resourcePaths(assetDirectory)
+        await fs.chmod(resourcePaths.node, 0o755)
+        if (await fs.exists(resourcePaths.ripGrep)) {
+            await fs.chmod(resourcePaths.ripGrep, 0o755)
+        }
+    }
+
+    protected override resourcePaths(assetDirectory?: string): AmazonQResourcePaths {
+        if (!assetDirectory) {
+            return {
+                lsp: this.config.path ?? '',
+                node: getNodeExecutableName(),
+                ripGrep: `ripgrep/${getRgExecutableName()}`,
+                ui: this.config.ui ?? '',
+            }
+        }
+
+        const nodePath = path.join(assetDirectory, `servers/${getNodeExecutableName()}`)
+        const rgPath = path.join(assetDirectory, `servers/ripgrep/${getRgExecutableName()}`)
+        return {
+            lsp: path.join(assetDirectory, 'servers/aws-lsp-codewhisperer.js'),
+            node: nodePath,
+            ripGrep: rgPath,
+            ui: path.join(assetDirectory, 'clients/amazonq-ui.js'),
+        }
+    }
+
+    protected override downloadMessageOverride: string | undefined = 'Updating Amazon Q plugin'
+}
+
+export function getBundledResourcePaths(ctx: vscode.ExtensionContext): AmazonQResourcePaths {
+    const assetDirectory = vscode.Uri.joinPath(ctx.extensionUri, 'resources', 'language-server').fsPath
+    return {
+        lsp: path.join(assetDirectory, 'servers', 'aws-lsp-codewhisperer.js'),
+        node: process.execPath,
+        ripGrep: '',
+        ui: path.join(assetDirectory, 'clients', 'amazonq-ui.js'),
+    }
+}
diff --git a/packages/amazonq/src/lsp/utils.ts b/packages/amazonq/src/lsp/utils.ts
new file mode 100644
index 00000000000..f5b010c536b
--- /dev/null
+++ b/packages/amazonq/src/lsp/utils.ts
@@ -0,0 +1,26 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { CursorState } from '@aws/language-server-runtimes-types'
+
+/**
+ * Convert from vscode selection type to the general CursorState expected by the AmazonQLSP.
+ * @param selection
+ * @returns
+ */
+export function getCursorState(selection: readonly vscode.Selection[]): CursorState[] {
+    return selection.map((s) => ({
+        range: {
+            start: {
+                line: s.start.line,
+                character: s.start.character,
+            },
+            end: {
+                line: s.end.line,
+                character: s.end.character,
+            },
+        },
+    }))
+}
diff --git a/packages/amazonq/src/util/clearCache.ts b/packages/amazonq/src/util/clearCache.ts
new file mode 100644
index 00000000000..8c93b35ac12
--- /dev/null
+++ b/packages/amazonq/src/util/clearCache.ts
@@ -0,0 +1,49 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { AuthUtil } from 'aws-core-vscode/codewhisperer'
+import { Commands, fs, globals, LanguageServerResolver } from 'aws-core-vscode/shared'
+import vscode from 'vscode'
+
+/**
+ * The purpose of this module is to provide a util to clear all extension cache so that it has a clean state
+ */
+
+/**
+ * Clears "all" cache of the extension, effectively putting the user in a "net new" state.
+ *
+ * NOTE: This is a best attempt. There may be state like a file in the filesystem which is not deleted.
+ *       We should aim to add all state clearing in to this method.
+ */
+async function clearCache() {
+    // Check a final time if they want to clear their cache
+    const doContinue = await vscode.window
+        .showInformationMessage(
+            'This will wipe your Amazon Q extension state, then reload your VS Code window. This operation is not dangerous. ',
+            { modal: true },
+            'Continue'
+        )
+        .then((value) => {
+            return value === 'Continue'
+        })
+    if (!doContinue) {
+        return
+    }
+
+    // SSO cache persists on disk, this should indirectly delete it
+    const conn = AuthUtil.instance.conn
+    if (conn) {
+        await AuthUtil.instance.auth.deleteConnection(conn)
+    }
+
+    await globals.globalState.clear()
+
+    // Clear the Language Server Cache
+    await fs.delete(LanguageServerResolver.defaultDir(), { recursive: true, force: true })
+
+    // Make the IDE reload so all new changes take effect
+    void vscode.commands.executeCommand('workbench.action.reloadWindow')
+}
+export const clearCacheDeclaration = Commands.declare({ id: 'aws.amazonq.clearCache' }, () => clearCache)
diff --git a/packages/amazonq/src/util/timeoutUtil.ts b/packages/amazonq/src/util/timeoutUtil.ts
new file mode 100644
index 00000000000..c42d1e3be01
--- /dev/null
+++ b/packages/amazonq/src/util/timeoutUtil.ts
@@ -0,0 +1,15 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export function asyncCallWithTimeout<T>(asyncPromise: Promise<T>, message: string, timeLimit: number): Promise<T> {
+    let timeoutHandle: NodeJS.Timeout
+    const timeoutPromise = new Promise((_resolve, reject) => {
+        timeoutHandle = setTimeout(() => reject(new Error(message)), timeLimit)
+    })
+    return Promise.race([asyncPromise, timeoutPromise]).then((result) => {
+        clearTimeout(timeoutHandle)
+        return result as T
+    })
+}
diff --git a/packages/amazonq/test/e2e/amazonq/assert.ts b/packages/amazonq/test/e2e/amazonq/assert.ts
new file mode 100644
index 00000000000..5bcec3fc0b4
--- /dev/null
+++ b/packages/amazonq/test/e2e/amazonq/assert.ts
@@ -0,0 +1,41 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { Messenger } from './framework/messenger'
+
+export function assertQuickActions(tab: Messenger, commands: string[]) {
+    const commandGroup = tab
+        .getCommands()
+        .map((groups) => groups.commands)
+        .flat()
+    if (!commandGroup) {
+        assert.fail(`Could not find commands for ${tab.tabID}`)
+    }
+
+    const commandNames = commandGroup.map((cmd) => cmd.command)
+
+    const missingCommands = []
+    for (const command of commands) {
+        if (!commandNames.includes(command)) {
+            missingCommands.push(command)
+        }
+    }
+
+    if (missingCommands.length > 0) {
+        assert.fail(`Could not find commands: ${missingCommands.join(', ')} for ${tab.tabID}`)
+    }
+}
+
+export function assertContextCommands(tab: Messenger, contextCommands: string[]) {
+    assert.deepStrictEqual(
+        tab
+            .getStore()
+            .contextCommands?.map((x) => x.commands)
+            .flat()
+            .map((x) => x.command),
+        contextCommands
+    )
+}
diff --git a/packages/amazonq/test/e2e/amazonq/chat.test.ts b/packages/amazonq/test/e2e/amazonq/chat.test.ts
new file mode 100644
index 00000000000..c4f74c51376
--- /dev/null
+++ b/packages/amazonq/test/e2e/amazonq/chat.test.ts
@@ -0,0 +1,86 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { qTestingFramework } from './framework/framework'
+import sinon from 'sinon'
+import { Messenger } from './framework/messenger'
+import { MynahUIDataModel } from '@aws/mynah-ui'
+import { assertContextCommands, assertQuickActions } from './assert'
+import { registerAuthHook, using } from 'aws-core-vscode/test'
+import { loginToIdC } from './utils/setup'
+import { webviewConstants, webviewTabConstants } from 'aws-core-vscode/amazonq'
+
+describe('Amazon Q Chat', function () {
+    this.retries(3)
+    let framework: qTestingFramework
+    let tab: Messenger
+    let store: MynahUIDataModel
+
+    const availableCommands: string[] = ['/dev', '/test', '/review', '/doc', '/transform']
+
+    before(async function () {
+        /**
+         * Login to the amazonq-test-account. When running in CI this has unlimited
+         * calls to the backend api
+         */
+        await using(registerAuthHook('amazonq-test-account'), async () => {
+            await loginToIdC()
+        })
+    })
+
+    // jscpd:ignore-start
+    beforeEach(() => {
+        // Make sure you're logged in before every test
+        registerAuthHook('amazonq-test-account')
+        framework = new qTestingFramework('cwc', true, [])
+        tab = framework.createTab()
+        store = tab.getStore()
+    })
+
+    afterEach(() => {
+        framework.removeTab(tab.tabID)
+        framework.dispose()
+        sinon.restore()
+    })
+
+    it(`Shows quick actions: ${availableCommands.join(', ')}`, async () => {
+        assertQuickActions(tab, availableCommands)
+    })
+
+    it('Shows @workspace', () => {
+        assertContextCommands(tab, ['@workspace'])
+    })
+
+    // jscpd:ignore-end
+
+    it('Shows title', () => {
+        assert.deepStrictEqual(store.tabTitle, 'Chat')
+    })
+
+    it('Shows placeholder', () => {
+        assert.deepStrictEqual(store.promptInputPlaceholder, webviewTabConstants.commonTabData.placeholder)
+    })
+
+    it('Sends message', async () => {
+        tab.addChatMessage({
+            prompt: 'What is a lambda',
+        })
+        await tab.waitForChatFinishesLoading()
+        const chatItems = tab.getChatItems()
+        // the last item should be an answer
+        assert.deepStrictEqual(chatItems[4].type, 'answer')
+    })
+
+    describe('Clicks examples', () => {
+        it('Click help', async () => {
+            tab.clickButton('help')
+            await tab.waitForText(webviewConstants.helpMessage)
+            const chatItems = tab.getChatItems()
+            assert.deepStrictEqual(chatItems[4].type, 'answer')
+            assert.deepStrictEqual(chatItems[4].body, webviewConstants.helpMessage)
+        })
+    })
+})
diff --git a/packages/amazonq/test/e2e/amazonq/framework/framework.ts b/packages/amazonq/test/e2e/amazonq/framework/framework.ts
new file mode 100644
index 00000000000..0cc9a9298ee
--- /dev/null
+++ b/packages/amazonq/test/e2e/amazonq/framework/framework.ts
@@ -0,0 +1,136 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { injectJSDOM } from './jsdomInjector'
+
+// This needs to be ran before all other imports so that mynah ui gets loaded inside of jsdom
+injectJSDOM()
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import { MynahUI, MynahUIProps } from '@aws/mynah-ui'
+import { DefaultAmazonQAppInitContext, TabType, createMynahUI } from 'aws-core-vscode/amazonq'
+import { Messenger, MessengerOptions } from './messenger'
+import { FeatureContext } from 'aws-core-vscode/shared'
+
+/**
+ * Abstraction over Amazon Q to make e2e testing easier
+ */
+export class qTestingFramework {
+    private readonly mynahUI: MynahUI
+    private readonly mynahUIProps: MynahUIProps
+    private disposables: vscode.Disposable[] = []
+
+    lastEventId: string = ''
+
+    constructor(
+        featureName: TabType,
+        amazonQEnabled: boolean,
+        featureConfigsSerialized: [string, FeatureContext][],
+        welcomeCount = Number.MAX_VALUE // by default don't show the welcome page
+    ) {
+        /**
+         * Instantiate the UI and override the postMessage to publish using the app message
+         * publishers directly.
+         *
+         * The postMessage function implements the MynahUI -> VSCode flow
+         */
+        const ui = createMynahUI(
+            {
+                postMessage: (message: string) => {
+                    const appMessagePublisher = DefaultAmazonQAppInitContext.instance
+                        .getWebViewToAppsMessagePublishers()
+                        .get(featureName)
+                    if (appMessagePublisher === undefined) {
+                        return
+                    }
+                    appMessagePublisher.publish(message)
+                },
+            },
+            amazonQEnabled,
+            featureConfigsSerialized,
+            welcomeCount
+        )
+        this.mynahUI = ui.mynahUI
+        this.mynahUIProps = (this.mynahUI as any).props
+
+        /**
+         * In order to successfully remove tabs we need the last event id
+         */
+        const originalOnTabAdd = this.mynahUIProps.onTabAdd
+        this.mynahUIProps.onTabAdd = (tabId, eventId) => {
+            this.lastEventId = eventId ?? this.lastEventId
+            originalOnTabAdd && originalOnTabAdd(tabId)
+        }
+
+        /**
+         * Listen to incoming events coming from VSCode and redirect them to MynahUI
+         *
+         * This implements the VSCode -> Mynah UI flow
+         */
+        this.disposables.push(
+            DefaultAmazonQAppInitContext.instance.getAppsToWebViewMessageListener().onMessage(async (message) => {
+                // Emulate the json format of postMessage
+                const event = {
+                    data: JSON.stringify(message),
+                } as any
+                await ui.messageReceiver(event)
+            })
+        )
+
+        /**
+         * We need to manually indicate that the UI is ready since we are using a custom mynah UI event routing
+         * implementation instead of routing events through the real webview
+         **/
+        DefaultAmazonQAppInitContext.instance.getAppsToWebViewMessagePublisher().setUiReady()
+    }
+
+    /**
+     * Create a new tab and then return a new encapsulated tab messenger that makes it easier to directly call
+     * functionality against a specific tab
+     */
+    public createTab(options?: MessengerOptions) {
+        const oldTabs = Object.keys(this.mynahUI.getAllTabs())
+
+        // simulate pressing the new tab button
+        ;(document.querySelectorAll('.mynah-nav-tabs-wrapper > button.mynah-button')[0] as HTMLButtonElement).click()
+        const newTabs = Object.keys(this.mynahUI.getAllTabs())
+
+        const newTabID = newTabs.find((tab) => !oldTabs.includes(tab))
+        if (!newTabID) {
+            assert.fail('Could not find new tab')
+        }
+
+        return new Messenger(newTabID, this.mynahUIProps, this.mynahUI, options)
+    }
+
+    public getTabs() {
+        const tabs = this.mynahUI.getAllTabs()
+        return Object.entries(tabs).map(([tabId]) => new Messenger(tabId, this.mynahUIProps, this.mynahUI))
+    }
+
+    public getSelectedTab() {
+        const selectedTabId = this.mynahUI.getSelectedTabId()
+        const selectedTab = this.getTabs().find((tab) => tab.tabID === selectedTabId)
+
+        if (!selectedTab) {
+            assert.fail('Selected tab not found')
+        }
+        return selectedTab
+    }
+
+    public findTab(title: string) {
+        return Object.values(this.getTabs()).find((tab) => tab.getStore().tabTitle === title)
+    }
+
+    public removeTab(tabId: string) {
+        this.mynahUI.removeTab(tabId, this.lastEventId)
+    }
+
+    public dispose() {
+        vscode.Disposable.from(...this.disposables).dispose()
+        this.mynahUI.destroy()
+    }
+}
diff --git a/packages/amazonq/test/e2e/amazonq/framework/jsdomInjector.ts b/packages/amazonq/test/e2e/amazonq/framework/jsdomInjector.ts
new file mode 100644
index 00000000000..24e2d361640
--- /dev/null
+++ b/packages/amazonq/test/e2e/amazonq/framework/jsdomInjector.ts
@@ -0,0 +1,63 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { JSDOM, VirtualConsole } from 'jsdom'
+
+/**
+ * JSDOM is used to help hoist MynahUI to running in a node environment vs in the browser (which is what it's made for)
+ */
+export function injectJSDOM() {
+    const virtualConsole = new VirtualConsole()
+    virtualConsole.on('error', (error) => {
+        // JSDOM can't load scss from mynah UI, just skip it
+        if (!error.includes('Could not parse CSS stylesheet')) {
+            console.error(error)
+        }
+    })
+
+    const dom = new JSDOM(undefined, {
+        pretendToBeVisual: true,
+        includeNodeLocations: true,
+        virtualConsole,
+    })
+    global.window = dom.window as unknown as Window & typeof globalThis
+    global.document = dom.window.document
+    global.self = dom.window as unknown as Window & typeof globalThis
+    global.Element = dom.window.Element
+    global.HTMLElement = dom.window.HTMLElement
+    global.Node = dom.window.Node
+
+    global.ResizeObserver = class ResizeObserver {
+        observe() {}
+        unobserve() {}
+        disconnect() {}
+    }
+
+    // jsdom doesn't have support for innerText: https://github.com/jsdom/jsdom/issues/1245 which mynah ui uses
+    Object.defineProperty(global.Element.prototype, 'innerText', {
+        get() {
+            return this.textContent
+        },
+        set(value) {
+            this.textContent = value
+        },
+    })
+
+    // jsdom doesn't have support for structuredClone. See https://github.com/jsdom/jsdom/issues/3363
+    global.structuredClone = (val: any) => JSON.parse(JSON.stringify(val))
+
+    global.IntersectionObserver = class IntersectionObserver {
+        observe() {}
+        unobserve() {}
+        disconnect() {}
+        takeRecords() {
+            return []
+        }
+        // eslint-disable-next-line unicorn/no-null
+        root = null
+        rootMargin = ''
+        thresholds = []
+    }
+}
diff --git a/packages/amazonq/test/e2e/amazonq/framework/messenger.ts b/packages/amazonq/test/e2e/amazonq/framework/messenger.ts
new file mode 100644
index 00000000000..231e93b35be
--- /dev/null
+++ b/packages/amazonq/test/e2e/amazonq/framework/messenger.ts
@@ -0,0 +1,219 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { MynahUI, MynahUIProps, MynahUIDataModel } from '@aws/mynah-ui'
+import { waitUntil } from 'aws-core-vscode/shared'
+import { FollowUpTypes } from 'aws-core-vscode/amazonq'
+
+export interface MessengerOptions {
+    waitIntervalInMs?: number
+    waitTimeoutInMs?: number
+}
+
+/**
+ * Abstraction over tabIds to make it easier to send messages to specific tabs
+ */
+export class Messenger {
+    private defaultWaitIntervalInMs = 5000
+    private defaultWaitTimeoutInMs = 600000
+
+    private waitIntervalInMs: number
+    private waitTimeoutInMs: number
+
+    constructor(
+        public readonly tabID: string,
+        private readonly mynahUIProps: MynahUIProps,
+        private readonly mynahUI: MynahUI,
+        options?: MessengerOptions
+    ) {
+        this.waitIntervalInMs = options?.waitIntervalInMs ?? this.defaultWaitIntervalInMs
+        this.waitTimeoutInMs = options?.waitTimeoutInMs ?? this.defaultWaitTimeoutInMs
+    }
+
+    addChatMessage({ prompt, command }: { prompt?: string; command?: string }) {
+        if (!this.mynahUIProps.onChatPrompt) {
+            assert.fail('onChatPrompt must be defined to use it in the tests')
+        }
+
+        this.mynahUIProps.onChatPrompt(this.tabID, {
+            prompt,
+            escapedPrompt: prompt,
+            command,
+        })
+    }
+
+    clickButton(type: string) {
+        if (!this.mynahUIProps.onFollowUpClicked) {
+            assert.fail('onFollowUpClicked must be defined to use it in the tests')
+        }
+
+        const lastChatItem = this.getChatItems().pop()
+        const followupOption = lastChatItem?.followUp?.options?.filter((option) => option.type === type)
+        if (followupOption && followupOption.length > 0) {
+            this.mynahUIProps.onFollowUpClicked(this.tabID, lastChatItem?.messageId ?? '', followupOption[0])
+            return
+        }
+
+        assert.fail(`Could not find a button with id ${type} on tabID: ${this.tabID}`)
+    }
+
+    clickInBodyButton(type: string) {
+        if (!this.mynahUIProps.onInBodyButtonClicked) {
+            assert.fail('onInBodyButtonClicked must be defined to use it in the tests')
+        }
+
+        const lastChatItem = this.getChatItems().pop()
+        const followupButton = lastChatItem?.buttons?.filter((option) => option.id === type)
+        if (followupButton && followupButton.length > 0) {
+            this.mynahUIProps.onInBodyButtonClicked(this.tabID, lastChatItem?.messageId ?? '', followupButton[0])
+            return
+        }
+
+        assert.fail(`Could not find a button with id ${type} on tabID: ${this.tabID}`)
+    }
+
+    clickCustomFormButton(action: { id: string; text?: string; formItemValues?: Record<string, string> }) {
+        if (!this.mynahUIProps.onCustomFormAction) {
+            assert.fail('onCustomFormAction must be defined to use it in the tests')
+        }
+
+        this.mynahUIProps.onCustomFormAction(this.tabID, action)
+    }
+
+    clickFileActionButton(filePath: string, actionName: string) {
+        if (!this.mynahUIProps.onFileActionClick) {
+            assert.fail('onFileActionClick must be defined to use it in the tests')
+        }
+
+        this.mynahUIProps.onFileActionClick(this.tabID, this.getFileListMessageId(), filePath, actionName)
+    }
+
+    findCommand(command: string) {
+        return this.getCommands()
+            .map((groups) => groups.commands)
+            .flat()
+            .filter((commands) => commands.command === command)
+    }
+
+    getCommands() {
+        return [...(this.getStore().quickActionCommands ?? [])]
+    }
+
+    getChatItems() {
+        return [...(this.getStore().chatItems ?? [])]
+    }
+
+    getPlaceholder() {
+        return this.getStore().promptInputPlaceholder
+    }
+
+    getFollowUpButton(type: FollowUpTypes) {
+        const followUpButton = this.getChatItems()
+            .pop()
+            ?.followUp?.options?.find((action) => action.type === type)
+        if (!followUpButton) {
+            assert.fail(`Could not find follow up button with type ${type}`)
+        }
+        return followUpButton
+    }
+
+    getFileList() {
+        const chatItems = this.getChatItems()
+        const fileList = chatItems.find((item) => 'fileList' in item)
+        if (!fileList) {
+            assert.fail('Could not find file list')
+        }
+        return fileList
+    }
+
+    getFileListMessageId() {
+        const fileList = this.getFileList()
+        const messageId = fileList?.messageId
+        if (!messageId) {
+            assert.fail('Could not find file list message id')
+        }
+        return messageId
+    }
+
+    getFilePaths() {
+        const fileList = this.getFileList()
+        const filePaths = fileList?.fileList?.filePaths
+        if (!filePaths) {
+            assert.fail('Could not find file paths')
+        }
+        if (filePaths.length === 0) {
+            assert.fail('File paths list is empty')
+        }
+        return filePaths
+    }
+
+    getActionsByFilePath(filePath: string) {
+        const fileList = this.getFileList()
+        const actions = fileList?.fileList?.actions
+        return actions?.[filePath] ?? []
+    }
+
+    hasButton(type: FollowUpTypes) {
+        return (
+            this.getChatItems()
+                .pop()
+                ?.followUp?.options?.map((opt) => opt.type)
+                .includes(type) ?? false
+        )
+    }
+
+    hasAction(filePath: string, actionName: string) {
+        return this.getActionsByFilePath(filePath).some((action) => action.name === actionName)
+    }
+
+    async waitForText(text: string, waitOverrides?: MessengerOptions) {
+        await this.waitForEvent(() => {
+            return this.getChatItems().some((chatItem) => chatItem.body === text)
+        }, waitOverrides)
+    }
+
+    async waitForButtons(buttons: FollowUpTypes[]) {
+        return this.waitForEvent(() => {
+            return buttons.every((value) => this.hasButton(value))
+        })
+    }
+
+    async waitForChatFinishesLoading() {
+        return this.waitForEvent(() => this.getStore().loadingChat === false || this.hasButton(FollowUpTypes.Retry))
+    }
+
+    async waitForEvent(event: () => boolean, waitOverrides?: MessengerOptions) {
+        /**
+         * Wait until the chat has finished loading. This happens when a backend request
+         * has finished and responded in the chat
+         */
+        const ok = await waitUntil(
+            async () => {
+                return event()
+            },
+            {
+                interval: waitOverrides ? waitOverrides.waitIntervalInMs : this.waitIntervalInMs,
+                timeout: waitOverrides ? waitOverrides.waitTimeoutInMs : this.waitTimeoutInMs,
+                truthy: true,
+            }
+        )
+
+        // Do another check just in case the waitUntil time'd out
+        if (!ok) {
+            assert.fail(
+                `Event has not finished loading in: ${waitOverrides ? waitOverrides.waitTimeoutInMs : this.waitTimeoutInMs} ms`
+            )
+        }
+    }
+
+    getStore(): MynahUIDataModel {
+        const store = this.mynahUI.getAllTabs()[this.tabID].store
+        if (!store) {
+            assert.fail(`${this.tabID} does not have a store`)
+        }
+        return store
+    }
+}
diff --git a/packages/amazonq/test/e2e/amazonq/framework/text.ts b/packages/amazonq/test/e2e/amazonq/framework/text.ts
new file mode 100644
index 00000000000..020792c6835
--- /dev/null
+++ b/packages/amazonq/test/e2e/amazonq/framework/text.ts
@@ -0,0 +1,29 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as assert from 'assert'
+import { ChatItem } from '@aws/mynah-ui'
+
+/**
+ * Verify that the text items in expectedText appears in the exact same order in chatItems
+ * @param chatItems An array of chat items in mynah UI
+ * @param expectedText An array of expected text items in order
+ * @returns true if the items in expectedText are found in the correct order in chatItems otherwise false
+ */
+export function verifyTextOrder(chatItems: ChatItem[], expectedText: RegExp[]) {
+    let currInd = 0
+    for (const item of chatItems) {
+        const currentExpected = expectedText[currInd]
+        if (currentExpected && item.body?.match(currentExpected)) {
+            currInd++
+        }
+    }
+
+    if (currInd !== expectedText.length) {
+        const chatItemBodies = chatItems.filter((item) => item !== undefined).map((item) => item.body)
+        const expected = expectedText.join(', ')
+        assert.fail(`Items did not appear in expected order. Found ${chatItemBodies} but expected ${expected}`)
+    }
+}
diff --git a/packages/amazonq/test/e2e/amazonq/review.test.ts b/packages/amazonq/test/e2e/amazonq/review.test.ts
new file mode 100644
index 00000000000..5914e3eaa29
--- /dev/null
+++ b/packages/amazonq/test/e2e/amazonq/review.test.ts
@@ -0,0 +1,611 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ * Zuo
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import { qTestingFramework } from './framework/framework'
+import sinon from 'sinon'
+import { Messenger } from './framework/messenger'
+import { registerAuthHook, using, closeAllEditors } from 'aws-core-vscode/test'
+import { loginToIdC } from './utils/setup'
+import {
+    codewhispererDiagnosticSourceLabel,
+    invalidFileTypeChatMessage,
+    CodeAnalysisScope,
+    SecurityScanStep,
+    amazonqCodeIssueDetailsTabTitle,
+    CodeWhispererConstants,
+    CodeScanIssue,
+} from 'aws-core-vscode/codewhisperer'
+import path from 'path'
+import { ScanAction, scanProgressMessage } from '../../../src/app/amazonqScan/models/constants'
+import { SecurityIssueProvider } from 'aws-core-vscode/codewhisperer'
+import { fs, waitUntil, processUtils } from 'aws-core-vscode/shared'
+
+function getWorkspaceFolder(): string {
+    return vscode.workspace.workspaceFolders![0].uri.fsPath
+}
+
+describe('Amazon Q Code Review', function () {
+    let framework: qTestingFramework
+    let tab: Messenger
+
+    function extractAndValidateIssues(reviewString: string): Record<string, number> {
+        const issueRegex = /- (\w+): `(\d+) issues?`/g
+        const issues: Record<string, number> = {
+            Critical: 0,
+            High: 0,
+            Medium: 0,
+            Low: 0,
+            Info: 0,
+        }
+        const foundCategories = new Set<string>()
+
+        let match
+        while ((match = issueRegex.exec(reviewString)) !== null) {
+            const [, severity, count] = match
+            if (severity in issues) {
+                issues[severity] = parseInt(count, 10)
+                foundCategories.add(severity)
+            }
+        }
+
+        const expectedCategories = Object.keys(issues)
+        const missingCategories = expectedCategories.filter((category) => !foundCategories.has(category))
+
+        assert.deepStrictEqual(
+            missingCategories.length,
+            0,
+            `Output chat issue format is not correct or it does not have these categories: ${missingCategories.join(', ')}`
+        )
+        return issues
+    }
+
+    function matchingSecurityDiagnosticCount(diagnostics: vscode.Diagnostic[], message: string, lineNumber?: number) {
+        const matchingDiagnostics = diagnostics.filter((diagnostic) => {
+            let matches = diagnostic.message === message
+
+            // Only filter by startLine if it's provided
+            if (lineNumber !== undefined) {
+                matches =
+                    matches && diagnostic.range.start.line <= lineNumber && diagnostic.range.end.line >= lineNumber
+            }
+
+            return matches
+        })
+
+        return matchingDiagnostics.length
+    }
+
+    async function waitForChatItems(index: number, waitTimeoutInMs: number = 5000, waitIntervalInMs: number = 1000) {
+        await tab.waitForEvent(() => tab.getChatItems().length > index, {
+            waitTimeoutInMs: waitTimeoutInMs,
+            waitIntervalInMs: waitIntervalInMs,
+        })
+    }
+
+    async function validateInitialChatMessage() {
+        tab.addChatMessage({ command: '/review' })
+        await waitForChatItems(4)
+        const fileOrWorkspaceMessage = tab.getChatItems()[4]
+        assert.deepStrictEqual(fileOrWorkspaceMessage.type, 'ai-prompt')
+    }
+
+    async function waitForReviewResults(tab: Messenger): Promise<string> {
+        await waitForChatItems(7, 600_000, 10_000)
+        const scanResultsMessage = tab.getChatItems()[7]
+        assert.deepStrictEqual(scanResultsMessage.type, 'answer')
+
+        const scanResultBody = scanResultsMessage.body ?? ''
+        assert.notDeepStrictEqual(scanResultBody, '')
+        return scanResultBody
+    }
+
+    before(async function () {
+        await using(registerAuthHook('amazonq-test-account'), async () => {
+            await loginToIdC()
+        })
+    })
+
+    beforeEach(async () => {
+        registerAuthHook('amazonq-test-account')
+        framework = new qTestingFramework('review', true, [])
+        tab = framework.createTab()
+    })
+
+    afterEach(async () => {
+        await closeAllEditors()
+        framework.removeTab(tab.tabID)
+        framework.dispose()
+        sinon.restore()
+    })
+
+    describe('Quick action availability', () => {
+        it('Shows /review when code review is enabled', async () => {
+            const command = tab.findCommand('/review')
+            if (!command.length) {
+                assert.fail('Could not find command')
+            }
+            if (command.length > 1) {
+                assert.fail('Found too many commands with the name /review')
+            }
+        })
+
+        it('Does NOT show /review when code review is NOT enabled', () => {
+            framework.dispose()
+            framework = new qTestingFramework('review', false, [])
+            const tab = framework.createTab()
+            const command = tab.findCommand('/review')
+            if (command.length > 0) {
+                assert.fail('Found command when it should not have been found')
+            }
+        })
+    })
+
+    describe('/review initial chat output', () => {
+        it('Shows appropriate message when /review is entered', async () => {
+            tab.addChatMessage({ command: '/review' })
+
+            await waitForChatItems(4)
+            const fileOrWorkspaceMessage = tab.getChatItems()[4]
+
+            assert.deepStrictEqual(fileOrWorkspaceMessage.type, 'ai-prompt')
+            assert.deepStrictEqual(
+                fileOrWorkspaceMessage.body,
+                'Would you like to review your active file or the workspace you have open?'
+            )
+        })
+    })
+
+    describe('/review entry', () => {
+        describe('No file open when review active file', () => {
+            it('Shows appropriate message when no file is open', async () => {
+                await validateInitialChatMessage()
+
+                tab.clickButton(ScanAction.RUN_FILE_SCAN)
+
+                await waitForChatItems(5)
+                const noFileMessage = tab.getChatItems()[5]
+                assert.deepStrictEqual(noFileMessage.type, 'answer')
+                assert.deepStrictEqual(noFileMessage.body, invalidFileTypeChatMessage)
+            })
+        })
+
+        describe('review insecure file and then fix file', async () => {
+            it('/review file gives correct critical and high security issues, clicks on view details, generate fix, verify diff, apply fix', async () => {
+                const testFolder = path.join(getWorkspaceFolder(), 'QCAFolder')
+                const fileName = 'ProblematicCode.java'
+                const filePath = path.join(testFolder, fileName)
+
+                await validateInitialChatMessage()
+                const document = await vscode.workspace.openTextDocument(filePath)
+                const originalContent = document.getText()
+                await vscode.window.showTextDocument(document)
+
+                tab.clickButton(ScanAction.RUN_FILE_SCAN)
+
+                await waitForChatItems(6)
+                const scanningInProgressMessage = tab.getChatItems()[6]
+                assert.deepStrictEqual(
+                    scanningInProgressMessage.body,
+                    scanProgressMessage(SecurityScanStep.CREATE_SCAN_JOB, CodeAnalysisScope.FILE_ON_DEMAND, fileName)
+                )
+
+                const scanResultBody = await waitForReviewResults(tab)
+
+                const issues = extractAndValidateIssues(scanResultBody)
+                assert.deepStrictEqual(
+                    issues.Critical >= 1,
+                    true,
+                    `critical issue ${issues.Critical} is not larger or equal to 1`
+                )
+
+                const uri = vscode.Uri.file(filePath)
+                const securityDiagnostics = vscode.languages
+                    .getDiagnostics(uri)
+                    .filter((diagnostic) => diagnostic.source === codewhispererDiagnosticSourceLabel)
+
+                assert.ok(securityDiagnostics.length > 0, 'No security diagnostics found')
+
+                // at least 1 exact critical issue matches
+                assert.ok(
+                    matchingSecurityDiagnosticCount(securityDiagnostics, 'CWE-798 - Hardcoded credentials', 21) >= 1
+                )
+
+                // Find one diagnostic
+                const sampleDiagnostic = securityDiagnostics[0]
+                assert.ok(sampleDiagnostic, 'Could not find critical issue diagnostic')
+
+                const range = new vscode.Range(sampleDiagnostic.range.start, sampleDiagnostic.range.end)
+
+                const codeActions = await vscode.commands.executeCommand<vscode.CodeAction[]>(
+                    'vscode.executeCodeActionProvider',
+                    uri,
+                    range
+                )
+
+                await new Promise((resolve) => setTimeout(resolve, 1000))
+
+                // Find the "View details" code action
+                const viewDetailsAction = codeActions?.find((action) => action.title.includes('View details'))
+                assert.ok(viewDetailsAction, 'Could not find View details code action')
+
+                // Execute the view details command
+                if (viewDetailsAction?.command) {
+                    await vscode.commands.executeCommand(
+                        viewDetailsAction.command.command,
+                        ...viewDetailsAction.command.arguments!
+                    )
+                }
+
+                // Wait for the webview panel to open with polling
+                const webviewPanel = await waitUntil(
+                    async () => {
+                        const panels = vscode.window.tabGroups.all
+                            .flatMap((group) => group.tabs)
+                            .filter((tab) => tab.label === amazonqCodeIssueDetailsTabTitle)
+                            .map((tab) => tab.input)
+                            .filter((input): input is vscode.WebviewPanel => input !== undefined)
+
+                        return panels.length > 0 ? panels[0] : undefined
+                    },
+                    {
+                        timeout: 20_000,
+                        interval: 1000,
+                        truthy: false,
+                    }
+                )
+
+                await new Promise((resolve) => setTimeout(resolve, 1000))
+
+                assert.ok(webviewPanel, 'Security issue webview panel did not open after waiting')
+
+                // Wait until viewDetailsAction.command is defined
+                const viewDetailsActionDefined = await waitUntil(
+                    async () => {
+                        return viewDetailsAction.command?.arguments !== undefined
+                            ? viewDetailsAction.command
+                            : undefined
+                    },
+                    {
+                        timeout: 10_000,
+                        interval: 500,
+                        truthy: true,
+                    }
+                )
+                await new Promise((resolve) => setTimeout(resolve, 1000))
+
+                assert.ok(viewDetailsActionDefined, 'viewDetailsAction.command was not defined after waiting')
+
+                const issue = viewDetailsActionDefined.arguments?.[0] as CodeScanIssue
+                console.log('issue', issue)
+
+                // Wait for the fix to be generated with polling
+                const updatedIssue = await waitUntil(
+                    async () => {
+                        const foundIssue = SecurityIssueProvider.instance.issues
+                            .flatMap(({ issues }) => issues)
+                            .find((i) => i.findingId === issue.findingId)
+
+                        return foundIssue?.suggestedFixes?.length !== undefined &&
+                            foundIssue?.suggestedFixes?.length > 0
+                            ? foundIssue
+                            : undefined
+                    },
+                    {
+                        timeout: CodeWhispererConstants.codeFixJobTimeoutMs + 20_000,
+                        interval: CodeWhispererConstants.codeFixJobPollingIntervalMs,
+                        truthy: true,
+                    }
+                )
+
+                await new Promise((resolve) => setTimeout(resolve, 1000))
+
+                console.log('updated issue', updatedIssue)
+                console.log('original issue', issue)
+
+                // Verify the fix was generated by checking if the issue has suggestedFixes
+                assert.ok(updatedIssue, 'Could not find updated issue')
+                assert.ok(updatedIssue.suggestedFixes.length > 0, 'No suggested fixes were generated')
+
+                // Get the suggested fix and verify it contains diff markers
+                const suggestedFix = updatedIssue.suggestedFixes[0]
+                const suggestedFixDiff = suggestedFix.code
+                assert.ok(suggestedFixDiff, 'No suggested fix code was found')
+                assert.ok(
+                    suggestedFixDiff.includes('-') && suggestedFixDiff.includes('+'),
+                    'Suggested fix does not contain diff markers'
+                )
+
+                // Parse the diff to extract removed and added lines
+                const diffLines = suggestedFixDiff.split('\n')
+                const removedLines = diffLines
+                    .filter((line) => line.startsWith('-') && !line.startsWith('---'))
+                    .map((line) => line.substring(1).trim())
+                const addedLines = diffLines
+                    .filter((line) => line.startsWith('+') && !line.startsWith('+++'))
+                    .map((line) => line.substring(1).trim())
+
+                // Make sure we found some changes in the diff
+                assert.ok(addedLines.length + removedLines.length > 0, 'No added or deleted lines found in the diff')
+
+                // Apply the fix
+                await vscode.commands.executeCommand('aws.amazonq.applySecurityFix', updatedIssue, filePath, 'webview')
+
+                // Wait for the fix to be applied
+                await new Promise((resolve) => setTimeout(resolve, 1000))
+
+                // Verify the fix was applied to the file
+                const updatedDocument = await vscode.workspace.openTextDocument(filePath)
+                const updatedContent = updatedDocument.getText()
+
+                // Check that the content has changed
+                assert.notStrictEqual(
+                    updatedContent,
+                    originalContent,
+                    'File content did not change after applying the fix'
+                )
+
+                // Count occurrences of each line in original and updated content
+                const countOccurrences = (text: string, line: string): number => {
+                    const regex = new RegExp(`^\\s*${line.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\s*$`, 'gm')
+                    const matches = text.match(regex)
+                    return matches ? matches.length : 0
+                }
+
+                // Create a dictionary to track expected line count changes
+                const lineCountChanges: Record<string, number> = {}
+
+                // Process removed lines (decrement count)
+                for (const removedLine of removedLines) {
+                    if (removedLine.trim()) {
+                        // Skip empty lines
+                        const trimmedLine = removedLine.trim()
+                        lineCountChanges[trimmedLine] = (lineCountChanges[trimmedLine] || 0) - 1
+                    }
+                }
+
+                // Process added lines (increment count)
+                for (const addedLine of addedLines) {
+                    if (addedLine.trim()) {
+                        // Skip empty lines
+                        const trimmedLine = addedLine.trim()
+                        lineCountChanges[trimmedLine] = (lineCountChanges[trimmedLine] || 0) + 1
+                    }
+                }
+
+                // Verify all line count changes match expectations
+                for (const [line, expectedChange] of Object.entries(lineCountChanges)) {
+                    const originalCount = countOccurrences(originalContent, line)
+                    const updatedCount = countOccurrences(updatedContent, line)
+                    const actualChange = updatedCount - originalCount
+
+                    assert.strictEqual(
+                        actualChange,
+                        expectedChange,
+                        `Line "${line}" count change mismatch: expected ${expectedChange}, got ${actualChange} (original: ${originalCount}, updated: ${updatedCount})`
+                    )
+                }
+
+                // Revert the changes
+                await fs.writeFile(uri, originalContent)
+
+                // Wait a moment for the file system to update
+                await new Promise((resolve) => setTimeout(resolve, 1000))
+
+                // Verify the file was reverted
+                const revertedDocument = await vscode.workspace.openTextDocument(filePath)
+                const revertedContent = revertedDocument.getText()
+
+                assert.deepStrictEqual(revertedContent, originalContent, 'File content was not properly reverted')
+            })
+        })
+
+        describe('/review file and project scans should respect ignored line findings', async () => {
+            const testFolder = path.join(getWorkspaceFolder(), 'QCAFolder')
+            const fileName = 'ProblematicCode.java'
+            const filePath = path.join(testFolder, fileName)
+            let document: vscode.TextDocument
+
+            beforeEach(async () => {
+                await validateInitialChatMessage()
+
+                document = await vscode.workspace.openTextDocument(filePath)
+                await vscode.window.showTextDocument(document)
+
+                const editor = vscode.window.activeTextEditor
+
+                if (editor) {
+                    const position = new vscode.Position(20, 0)
+                    await editor.edit((editBuilder) => {
+                        editBuilder.insert(position, '// amazonq-ignore-next-line\n')
+                    })
+                    await document.save()
+                }
+            })
+
+            it('/review file respect ignored line findings', async () => {
+                tab.clickButton(ScanAction.RUN_FILE_SCAN)
+            })
+
+            it('/review project respect ignored line findings', async () => {
+                tab.clickButton(ScanAction.RUN_PROJECT_SCAN)
+            })
+
+            afterEach(async () => {
+                await waitForReviewResults(tab)
+
+                const uri = vscode.Uri.file(filePath)
+                const securityDiagnostics: vscode.Diagnostic[] = vscode.languages
+                    .getDiagnostics(uri)
+                    .filter((diagnostic) => diagnostic.source === codewhispererDiagnosticSourceLabel)
+
+                // cannot find this ignored issue
+                assert.equal(
+                    matchingSecurityDiagnosticCount(securityDiagnostics, 'CWE-798 - Hardcoded credentials', 22),
+                    0
+                )
+
+                const editor = vscode.window.activeTextEditor
+                if (editor) {
+                    await editor.edit((editBuilder) => {
+                        const lineRange = editor.document.lineAt(20).rangeIncludingLineBreak
+                        editBuilder.delete(lineRange)
+                    })
+                    await document.save()
+                }
+            })
+        })
+
+        describe('Project and file scans should return at least 1 LLM findings', async () => {
+            const testFolder = path.join(getWorkspaceFolder(), 'QCAFolder')
+            const fileName = 'RLinker.java'
+            const filePath = path.join(testFolder, fileName)
+            let document: vscode.TextDocument
+
+            function assertAtLeastOneLLMFindings(securityDiagnostics: vscode.Diagnostic[]) {
+                const readabilityIssuesCount = matchingSecurityDiagnosticCount(
+                    securityDiagnostics,
+                    'Readability and maintainability issues detected.'
+                )
+                const performanceIssuesCount = matchingSecurityDiagnosticCount(
+                    securityDiagnostics,
+                    'Performance inefficiencies detected in code.'
+                )
+                const errorHandlingIssuesCount = matchingSecurityDiagnosticCount(
+                    securityDiagnostics,
+                    'Inadequate error handling detected.'
+                )
+                const namingIssuesCount = matchingSecurityDiagnosticCount(
+                    securityDiagnostics,
+                    'Inconsistent or unclear naming detected.'
+                )
+                const loggingIssuesCount = matchingSecurityDiagnosticCount(
+                    securityDiagnostics,
+                    'Insufficient or improper logging found.'
+                )
+                assert.ok(
+                    readabilityIssuesCount +
+                        performanceIssuesCount +
+                        errorHandlingIssuesCount +
+                        namingIssuesCount +
+                        loggingIssuesCount >
+                        0,
+                    'No LLM findings were found'
+                )
+            }
+
+            beforeEach(async () => {
+                await validateInitialChatMessage()
+            })
+
+            it('file scan returns at least 1 LLM findings', async () => {
+                document = await vscode.workspace.openTextDocument(filePath)
+                await vscode.window.showTextDocument(document)
+
+                tab.clickButton(ScanAction.RUN_FILE_SCAN)
+
+                await waitForChatItems(6)
+                const scanningInProgressMessage = tab.getChatItems()[6]
+                assert.deepStrictEqual(
+                    scanningInProgressMessage.body,
+                    scanProgressMessage(SecurityScanStep.CREATE_SCAN_JOB, CodeAnalysisScope.FILE_ON_DEMAND, fileName)
+                )
+
+                const scanResultBody = await waitForReviewResults(tab)
+
+                const issues = extractAndValidateIssues(scanResultBody)
+
+                assert.deepStrictEqual(
+                    issues.Critical + issues.High + issues.Medium + issues.Low + issues.Info >= 1,
+                    true,
+                    `There are no issues detected when there should be at least 1`
+                )
+
+                const uri = vscode.Uri.file(filePath)
+                const securityDiagnostics: vscode.Diagnostic[] = vscode.languages
+                    .getDiagnostics(uri)
+                    .filter((diagnostic) => diagnostic.source === codewhispererDiagnosticSourceLabel)
+
+                assertAtLeastOneLLMFindings(securityDiagnostics)
+            })
+
+            it('project scan returns at least 1 LLM findings', async () => {
+                const fileDir = path.join(getWorkspaceFolder())
+
+                try {
+                    // Initialize git repository to make RLinker.java appear in git diff
+                    await processUtils.ChildProcess.run('git', ['init'], { spawnOptions: { cwd: fileDir } })
+                    await processUtils.ChildProcess.run('git', ['add', 'QCAFolder/RLinker.java'], {
+                        spawnOptions: { cwd: fileDir },
+                    })
+                    await processUtils.ChildProcess.run('git', ['config', 'user.name', 'Test'], {
+                        spawnOptions: { cwd: fileDir },
+                    })
+                    await processUtils.ChildProcess.run('git', ['config', 'user.email', 'test@example.com'], {
+                        spawnOptions: { cwd: fileDir },
+                    })
+                    await processUtils.ChildProcess.run('git', ['commit', '-m', 'Initial commit'], {
+                        spawnOptions: { cwd: fileDir },
+                    })
+
+                    document = await vscode.workspace.openTextDocument(filePath)
+                    await vscode.window.showTextDocument(document)
+
+                    const editor = vscode.window.activeTextEditor
+
+                    if (editor) {
+                        const position = new vscode.Position(20, 0)
+                        await editor.edit((editBuilder) => {
+                            editBuilder.insert(position, '\n')
+                        })
+                        // save file
+                        await document.save()
+                    }
+
+                    // Run the project scan
+                    tab.clickButton(ScanAction.RUN_PROJECT_SCAN)
+
+                    await waitForChatItems(6)
+                    const scanningInProgressMessage = tab.getChatItems()[6]
+                    assert.deepStrictEqual(
+                        scanningInProgressMessage.body,
+                        scanProgressMessage(SecurityScanStep.CREATE_SCAN_JOB, CodeAnalysisScope.PROJECT)
+                    )
+
+                    const scanResultBody = await waitForReviewResults(tab)
+
+                    const issues = extractAndValidateIssues(scanResultBody)
+
+                    assert.deepStrictEqual(
+                        issues.Critical + issues.High + issues.Medium + issues.Low + issues.Info >= 1,
+                        true,
+                        `There are no issues detected when there should be at least 1`
+                    )
+
+                    const uri = vscode.Uri.file(filePath)
+                    const securityDiagnostics: vscode.Diagnostic[] = vscode.languages
+                        .getDiagnostics(uri)
+                        .filter((diagnostic) => diagnostic.source === codewhispererDiagnosticSourceLabel)
+
+                    assertAtLeastOneLLMFindings(securityDiagnostics)
+
+                    const editor2 = vscode.window.activeTextEditor
+                    if (editor2) {
+                        await editor2.edit((editBuilder) => {
+                            const lineRange = editor2.document.lineAt(20).rangeIncludingLineBreak
+                            editBuilder.delete(lineRange)
+                        })
+                        await document.save()
+                    }
+                } finally {
+                    // Clean up git repository
+                    await fs.delete(path.join(fileDir, '.git'), { recursive: true })
+                }
+            })
+        })
+    })
+})
diff --git a/packages/amazonq/test/e2e/amazonq/template.test.ts b/packages/amazonq/test/e2e/amazonq/template.test.ts
new file mode 100644
index 00000000000..42857575583
--- /dev/null
+++ b/packages/amazonq/test/e2e/amazonq/template.test.ts
@@ -0,0 +1,67 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// jscpd:ignore-start
+import assert from 'assert'
+import { qTestingFramework } from './framework/framework'
+import sinon from 'sinon'
+import { Messenger } from './framework/messenger'
+import { MynahUIDataModel } from '@aws/mynah-ui'
+import { assertQuickActions } from './assert'
+import { registerAuthHook, using } from 'aws-core-vscode/test'
+import { loginToIdC } from './utils/setup'
+
+describe.skip('Amazon Q Test Template', function () {
+    let framework: qTestingFramework
+    let tab: Messenger
+    let store: MynahUIDataModel
+
+    const availableCommands: string[] = []
+
+    before(async function () {
+        /**
+         * Login to the amazonq-test-account. When running in CI this has unlimited
+         * calls to the backend api
+         */
+        await using(registerAuthHook('amazonq-test-account'), async () => {
+            await loginToIdC()
+        })
+    })
+
+    beforeEach(() => {
+        // Make sure you're logged in before every test
+        registerAuthHook('amazonq-test-account')
+
+        // TODO change unknown to the tab type you want to test
+        framework = new qTestingFramework('unknown', true, [])
+        tab = framework.getTabs()[0] // use the default tab that gets created
+        framework.createTab() // alternatively you can create a new tab
+        store = tab.getStore()
+    })
+
+    afterEach(() => {
+        framework.removeTab(tab.tabID)
+        framework.dispose()
+        sinon.restore()
+    })
+
+    it(`Shows quick actions: ${availableCommands.join(', ')}`, async () => {
+        assertQuickActions(tab, availableCommands)
+    })
+
+    it('Shows title', () => {
+        assert.deepStrictEqual(store.tabTitle, '')
+    })
+
+    it('Shows placeholder', () => {
+        assert.deepStrictEqual(store.promptInputPlaceholder, '')
+    })
+
+    describe('clicks examples', () => {})
+
+    describe('sends message', async () => {})
+})
+
+// jscpd:ignore-end
diff --git a/packages/amazonq/test/e2e/amazonq/transformByQ.test.ts b/packages/amazonq/test/e2e/amazonq/transformByQ.test.ts
new file mode 100644
index 00000000000..7a9273a1e84
--- /dev/null
+++ b/packages/amazonq/test/e2e/amazonq/transformByQ.test.ts
@@ -0,0 +1,407 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { qTestingFramework } from './framework/framework'
+import sinon from 'sinon'
+import { Messenger } from './framework/messenger'
+import {
+    CodeWhispererConstants,
+    JDKVersion,
+    TransformationType,
+    transformByQState,
+} from 'aws-core-vscode/codewhisperer'
+import { GumbyController, setMaven, startTransformByQ, TabsStorage } from 'aws-core-vscode/amazonqGumby'
+import { using, registerAuthHook, TestFolder } from 'aws-core-vscode/test'
+import { loginToIdC } from './utils/setup'
+import { fs } from 'aws-core-vscode/shared'
+import path from 'path'
+
+describe('Amazon Q Code Transformation', function () {
+    let framework: qTestingFramework
+    let tab: Messenger
+
+    before(async function () {
+        await using(registerAuthHook('amazonq-test-account'), async () => {
+            await loginToIdC()
+        })
+    })
+
+    beforeEach(() => {
+        registerAuthHook('amazonq-test-account')
+        framework = new qTestingFramework('gumby', true, [])
+        tab = framework.createTab()
+    })
+
+    afterEach(() => {
+        framework.removeTab(tab.tabID)
+        framework.dispose()
+        sinon.restore()
+    })
+
+    describe('Quick action availability', () => {
+        it('Can invoke /transform when QCT is enabled', async () => {
+            const command = tab.findCommand('/transform')
+            if (!command) {
+                assert.fail('Could not find command')
+            }
+
+            if (command.length > 1) {
+                assert.fail('Found too many commands with the name /transform')
+            }
+        })
+
+        it('CANNOT invoke /transform when QCT is NOT enabled', () => {
+            framework.dispose()
+            framework = new qTestingFramework('gumby', false, [])
+            const tab = framework.createTab()
+            const command = tab.findCommand('/transform')
+            if (command.length > 0) {
+                assert.fail('Found command when it should not have been found')
+            }
+        })
+    })
+
+    describe('Starting a transformation from chat', () => {
+        it('Can click through all user input forms for a Java upgrade', async () => {
+            sinon.stub(startTransformByQ, 'getValidSQLConversionCandidateProjects').resolves([])
+            sinon.stub(GumbyController.prototype, 'validateLanguageUpgradeProjects' as keyof GumbyController).resolves([
+                {
+                    name: 'qct-sample-java-8-app-main',
+                    path: '/Users/alias/Desktop/qct-sample-java-8-app-main',
+                    JDKVersion: JDKVersion.JDK8,
+                },
+            ])
+
+            transformByQState.setSourceJDKVersion(JDKVersion.JDK8)
+            transformByQState.setTargetJDKVersion(JDKVersion.JDK17)
+
+            tab.addChatMessage({ command: '/transform' })
+
+            // wait for /transform to respond with some intro messages and the first user input form
+            await tab.waitForEvent(() => tab.getChatItems().length > 3, {
+                waitTimeoutInMs: 5000,
+                waitIntervalInMs: 1000,
+            })
+            const projectForm = tab.getChatItems().pop()
+            assert.strictEqual(projectForm?.formItems?.[0]?.id ?? undefined, 'GumbyTransformLanguageUpgradeProjectForm')
+
+            const projectFormItemValues = {
+                GumbyTransformLanguageUpgradeProjectForm: '/Users/alias/Desktop/qct-sample-java-8-app-main',
+                GumbyTransformJdkFromForm: '8',
+                GumbyTransformJdkToForm: '17',
+            }
+            const projectFormValues: Record<string, string> = { ...projectFormItemValues }
+            // TODO: instead of stubbing, can we create a tab in qTestingFramework with tabType passed in?
+            // Mynah-UI updates tab type like this: this.tabsStorage.updateTabTypeFromUnknown(affectedTabId, 'gumby')
+            sinon
+                .stub(TabsStorage.prototype, 'getTab')
+                .returns({ id: tab.tabID, status: 'free', type: 'gumby', isSelected: true })
+            tab.clickCustomFormButton({
+                id: 'gumbyLanguageUpgradeTransformFormConfirm',
+                text: 'Confirm',
+                formItemValues: projectFormValues,
+            })
+
+            // 3 additional chat messages (including message with 2nd form) get sent after 1st form submitted; wait for all of them
+            await tab.waitForEvent(() => tab.getChatItems().length > 6, {
+                waitTimeoutInMs: 5000,
+                waitIntervalInMs: 1000,
+            })
+            const skipTestsForm = tab.getChatItems().pop()
+            assert.strictEqual(skipTestsForm?.formItems?.[0]?.id ?? undefined, 'GumbyTransformSkipTestsForm')
+
+            const skipTestsFormItemValues = {
+                GumbyTransformSkipTestsForm: 'Run unit tests',
+            }
+            const skipTestsFormValues: Record<string, string> = { ...skipTestsFormItemValues }
+            tab.clickCustomFormButton({
+                id: 'gumbyTransformSkipTestsFormConfirm',
+                text: 'Confirm',
+                formItemValues: skipTestsFormValues,
+            })
+
+            // 2 additional chat messages get sent after 3rd form submitted; wait for both of them
+            await tab.waitForEvent(() => tab.getChatItems().length > 8, {
+                waitTimeoutInMs: 5000,
+                waitIntervalInMs: 1000,
+            })
+
+            const customDependencyVersionPrompt = tab.getChatItems().pop()
+            assert.strictEqual(
+                customDependencyVersionPrompt?.body?.includes('You can optionally upload a YAML file'),
+                true
+            )
+            tab.clickCustomFormButton({ id: 'gumbyTransformFormContinue' })
+
+            // 2 additional chat messages get sent after Continue button clicked; wait for both of them
+            await tab.waitForEvent(() => tab.getChatItems().length > 10, {
+                waitTimeoutInMs: 5000,
+                waitIntervalInMs: 1000,
+            })
+
+            const sourceJdkPathPrompt = tab.getChatItems().pop()
+            assert.strictEqual(sourceJdkPathPrompt?.body?.includes('Enter the path to JDK 8'), true)
+
+            tab.addChatMessage({ prompt: '/dummy/path/to/jdk8' })
+
+            // 2 additional chat messages get sent after JDK path submitted; wait for both of them
+            await tab.waitForEvent(() => tab.getChatItems().length > 12, {
+                waitTimeoutInMs: 5000,
+                waitIntervalInMs: 1000,
+            })
+            const jdkPathResponse = tab.getChatItems().pop()
+            // this 'Sorry' message is OK - just making sure that the UI components are working correctly
+            assert.strictEqual(jdkPathResponse?.body?.includes("Sorry, I couldn't locate your Java installation"), true)
+
+            const tmpDir = (await TestFolder.create()).path
+
+            transformByQState.setSummaryFilePath(path.join(tmpDir, 'summary.md'))
+            transformByQState.setToPartiallySucceeded()
+
+            transformByQState
+                .getChatMessenger()
+                ?.sendJobFinishedMessage(tab.tabID, CodeWhispererConstants.viewProposedChangesChatMessage)
+
+            tab.clickCustomFormButton({
+                id: 'gumbyViewSummary',
+                text: 'View summary',
+            })
+
+            await tab.waitForEvent(() => tab.getChatItems().length > 13, {
+                waitTimeoutInMs: 5000,
+                waitIntervalInMs: 1000,
+            })
+
+            const viewSummaryChatItem = tab.getChatItems().pop()
+            assert.strictEqual(viewSummaryChatItem?.body?.includes('view a summary'), true)
+        })
+
+        it('CANNOT do a Java 21 to Java 17 transformation', async () => {
+            sinon.stub(startTransformByQ, 'getValidSQLConversionCandidateProjects').resolves([])
+            sinon.stub(GumbyController.prototype, 'validateLanguageUpgradeProjects' as keyof GumbyController).resolves([
+                {
+                    name: 'qct-sample-java-8-app-main',
+                    path: '/Users/alias/Desktop/qct-sample-java-8-app-main',
+                    JDKVersion: JDKVersion.JDK21,
+                },
+            ])
+            tab.addChatMessage({ command: '/transform' })
+            await tab.waitForEvent(() => tab.getChatItems().length > 3, {
+                waitTimeoutInMs: 5000,
+                waitIntervalInMs: 1000,
+            })
+            const projectForm = tab.getChatItems().pop()
+            assert.strictEqual(projectForm?.formItems?.[0]?.id ?? undefined, 'GumbyTransformLanguageUpgradeProjectForm')
+
+            const projectFormItemValues = {
+                GumbyTransformLanguageUpgradeProjectForm: '/Users/alias/Desktop/qct-sample-java-8-app-main',
+                GumbyTransformJdkFromForm: '21',
+                GumbyTransformJdkToForm: '17',
+            }
+            const projectFormValues: Record<string, string> = { ...projectFormItemValues }
+            tab.clickCustomFormButton({
+                id: 'gumbyLanguageUpgradeTransformFormConfirm',
+                text: 'Confirm',
+                formItemValues: projectFormValues,
+            })
+            await tab.waitForEvent(() => tab.getChatItems().length > 4, {
+                waitTimeoutInMs: 5000,
+                waitIntervalInMs: 1000,
+            })
+            const errorMessage = tab.getChatItems().pop()
+            assert.strictEqual(errorMessage?.body, CodeWhispererConstants.invalidFromToJdkChatMessage)
+        })
+
+        it('Can provide metadata file for a SQL conversion', async () => {
+            sinon.stub(startTransformByQ, 'getValidSQLConversionCandidateProjects').resolves([
+                {
+                    name: 'OracleExample',
+                    path: '/Users/alias/Desktop/OracleExample',
+                    JDKVersion: JDKVersion.JDK17,
+                },
+            ])
+            sinon.stub(startTransformByQ, 'getValidLanguageUpgradeCandidateProjects').resolves([])
+            sinon.stub(GumbyController.prototype, 'validateSQLConversionProjects' as keyof GumbyController).resolves([
+                {
+                    name: 'OracleExample',
+                    path: '/Users/alias/Desktop/OracleExample',
+                    JDKVersion: JDKVersion.JDK17,
+                },
+            ])
+
+            tab.addChatMessage({ command: '/transform' })
+
+            // wait for /transform to respond with some intro messages and the first user input message
+            await tab.waitForEvent(() => tab.getChatItems().length > 3, {
+                waitTimeoutInMs: 5000,
+                waitIntervalInMs: 1000,
+            })
+            const selectMetadataMessage = tab.getChatItems().pop()
+            assert.strictEqual(
+                selectMetadataMessage?.body?.includes('I can convert the embedded SQL') ?? undefined,
+                true
+            )
+
+            // verify that we processed the metadata file
+            const processMetadataFileStub = sinon.stub(
+                GumbyController.prototype,
+                'processMetadataFile' as keyof GumbyController
+            )
+            tab.clickCustomFormButton({
+                id: 'gumbySQLConversionMetadataTransformFormConfirm',
+                text: 'Select metadata file',
+            })
+            sinon.assert.calledOnce(processMetadataFileStub)
+        })
+
+        it('Can choose "language upgrade" when eligible for a Java upgrade AND SQL conversion', async () => {
+            sinon.stub(startTransformByQ, 'getValidSQLConversionCandidateProjects').resolves([
+                {
+                    name: 'OracleExample',
+                    path: '/Users/alias/Desktop/OracleExample',
+                    JDKVersion: JDKVersion.JDK17,
+                },
+            ])
+            sinon.stub(startTransformByQ, 'getValidLanguageUpgradeCandidateProjects').resolves([
+                {
+                    name: 'qct-sample-java-8-app-main',
+                    path: '/Users/alias/Desktop/qct-sample-java-8-app-main',
+                    JDKVersion: JDKVersion.JDK8,
+                },
+            ])
+
+            tab.addChatMessage({ command: '/transform' })
+
+            // wait for /transform to respond with some intro messages and a prompt asking user what they want to do
+            await tab.waitForEvent(() => tab.getChatItems().length > 2, {
+                waitTimeoutInMs: 5000,
+                waitIntervalInMs: 1000,
+            })
+            const prompt = tab.getChatItems().pop()
+            assert.strictEqual(
+                prompt?.body?.includes('You can enter "language upgrade" or "sql conversion"') ?? undefined,
+                true
+            )
+
+            // 3 additional chat messages get sent after user enters a choice; wait for all of them
+            tab.addChatMessage({ prompt: 'language upgrade' })
+            await tab.waitForEvent(() => tab.getChatItems().length > 5, {
+                waitTimeoutInMs: 5000,
+                waitIntervalInMs: 1000,
+            })
+            const projectForm = tab.getChatItems().pop()
+            assert.strictEqual(projectForm?.formItems?.[0]?.id ?? undefined, 'GumbyTransformLanguageUpgradeProjectForm')
+        })
+
+        it('Can choose "sql conversion" when eligible for a Java upgrade AND SQL conversion', async () => {
+            sinon.stub(startTransformByQ, 'getValidSQLConversionCandidateProjects').resolves([
+                {
+                    name: 'OracleExample',
+                    path: '/Users/alias/Desktop/OracleExample',
+                    JDKVersion: JDKVersion.JDK17,
+                },
+            ])
+            sinon.stub(startTransformByQ, 'getValidLanguageUpgradeCandidateProjects').resolves([
+                {
+                    name: 'qct-sample-java-8-app-main',
+                    path: '/Users/alias/Desktop/qct-sample-java-8-app-main',
+                    JDKVersion: JDKVersion.JDK8,
+                },
+            ])
+
+            tab.addChatMessage({ command: '/transform' })
+
+            // wait for /transform to respond with some intro messages and a prompt asking user what they want to do
+            await tab.waitForEvent(() => tab.getChatItems().length > 2, {
+                waitTimeoutInMs: 5000,
+                waitIntervalInMs: 1000,
+            })
+            const prompt = tab.getChatItems().pop()
+            assert.strictEqual(
+                prompt?.body?.includes('You can enter "language upgrade" or "sql conversion"') ?? undefined,
+                true
+            )
+
+            // 3 additional chat messages get sent after user enters a choice; wait for all of them
+            tab.addChatMessage({ prompt: 'sql conversion' })
+            await tab.waitForEvent(() => tab.getChatItems().length > 5, {
+                waitTimeoutInMs: 5000,
+                waitIntervalInMs: 1000,
+            })
+            const selectMetadataMessage = tab.getChatItems().pop()
+            assert.strictEqual(
+                selectMetadataMessage?.body?.includes('I can convert the embedded SQL') ?? undefined,
+                true
+            )
+        })
+    })
+
+    // TODO: enable when we no longer get throttled on CreateUploadUrl and other APIs
+    describe.skip('Running a Java upgrade from start to finish', async function () {
+        let tempDir = ''
+        let tempFileName = ''
+        let tempFilePath = ''
+
+        const javaFileContents = `public class MyApp {
+                public static void main(String[] args) {
+                    Integer temp = new Integer("1234");
+                }
+            }`
+
+        const pomXmlContents = `<?xml version="1.0" encoding="UTF-8"?>
+            <project xmlns="http://maven.apache.org/POM/4.0.0"
+                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+                <modelVersion>4.0.0</modelVersion>
+
+                <groupId>com.example</groupId>
+                <artifactId>basic-java-app</artifactId>
+                <version>1.0-SNAPSHOT</version>
+
+                <properties>
+                    <maven.compiler.source>1.8</maven.compiler.source>
+                    <maven.compiler.target>1.8</maven.compiler.target>
+                    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+                </properties>
+
+                <build>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-compiler-plugin</artifactId>
+                            <version>3.8.1</version>
+                            <configuration>
+                                <source>1.8</source>
+                                <target>1.8</target>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </build>
+            </project>`
+
+        before(async function () {
+            tempDir = path.join((await TestFolder.create()).path, 'qct-java-upgrade-test')
+            tempFileName = 'MyApp.java'
+            tempFilePath = path.join(tempDir, tempFileName)
+            await fs.writeFile(tempFilePath, javaFileContents)
+            tempFileName = 'pom.xml'
+            tempFilePath = path.join(tempDir, tempFileName)
+            await fs.writeFile(tempFilePath, pomXmlContents)
+        })
+
+        after(async function () {
+            await fs.delete(tempDir, { recursive: true })
+        })
+
+        it('WHEN transforming a Java 8 project E2E THEN job is successful', async function () {
+            transformByQState.setTransformationType(TransformationType.LANGUAGE_UPGRADE)
+            setMaven()
+            await startTransformByQ.processLanguageUpgradeTransformFormInput(tempDir, JDKVersion.JDK8, JDKVersion.JDK17)
+            await startTransformByQ.startTransformByQ()
+            assert.strictEqual(transformByQState.getPolledJobStatus(), 'COMPLETED')
+        })
+    })
+})
diff --git a/packages/amazonq/test/e2e/amazonq/utils/setup.ts b/packages/amazonq/test/e2e/amazonq/utils/setup.ts
new file mode 100644
index 00000000000..dd82b1f0b19
--- /dev/null
+++ b/packages/amazonq/test/e2e/amazonq/utils/setup.ts
@@ -0,0 +1,26 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { AuthUtil } from 'aws-core-vscode/codewhisperer'
+
+export async function loginToIdC() {
+    const authState = await AuthUtil.instance.getChatAuthState()
+    if (process.env['AWS_TOOLKIT_AUTOMATION'] === 'local') {
+        if (authState.amazonQ !== 'connected') {
+            throw new Error('You will need to login manually before running tests.')
+        }
+        return
+    }
+
+    const startUrl = process.env['TEST_SSO_STARTURL']
+    const region = process.env['TEST_SSO_REGION']
+
+    if (!startUrl || !region) {
+        throw new Error(
+            'TEST_SSO_STARTURL and TEST_SSO_REGION are required environment variables when running Amazon Q E2E tests'
+        )
+    }
+
+    await AuthUtil.instance.connectToEnterpriseSso(startUrl, region)
+}
diff --git a/packages/amazonq/test/e2e/amazonq/welcome.test.ts b/packages/amazonq/test/e2e/amazonq/welcome.test.ts
new file mode 100644
index 00000000000..d9f0ccd66bf
--- /dev/null
+++ b/packages/amazonq/test/e2e/amazonq/welcome.test.ts
@@ -0,0 +1,103 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { qTestingFramework } from './framework/framework'
+import sinon from 'sinon'
+import { Messenger } from './framework/messenger'
+import { MynahUIDataModel } from '@aws/mynah-ui'
+import { FeatureContext } from 'aws-core-vscode/shared'
+import { assertContextCommands, assertQuickActions } from './assert'
+
+describe('Amazon Q Welcome page', function () {
+    let framework: qTestingFramework
+    let tab: Messenger
+    let store: MynahUIDataModel
+
+    const availableCommands = ['/dev', '/test', '/review', '/doc', '/transform']
+
+    const highlightCommand: FeatureContext = {
+        name: 'highlightCommand',
+        value: {
+            stringValue: '@highlight',
+        },
+        variation: 'highlight command desc',
+    }
+    beforeEach(() => {
+        framework = new qTestingFramework('welcome', true, [['highlightCommand', highlightCommand]], 0)
+        tab = framework.getTabs()[0] // use the default tab that gets created
+        store = tab.getStore()
+    })
+
+    afterEach(() => {
+        framework.removeTab(tab.tabID)
+        framework.dispose()
+        sinon.restore()
+    })
+
+    it(`Shows quick actions: ${availableCommands.join(', ')}`, async () => {
+        assertQuickActions(tab, availableCommands)
+    })
+
+    it('Shows context commands', async () => {
+        assertContextCommands(tab, ['@workspace', '@highlight'])
+    })
+
+    describe('shows 3 times', async () => {
+        it('new tabs', () => {
+            framework.createTab()
+            framework.createTab()
+            framework.createTab()
+            framework.createTab()
+
+            let welcomeCount = 0
+            for (const tab of framework.getTabs()) {
+                if (tab.getStore().tabTitle === 'Welcome to Q') {
+                    welcomeCount++
+                }
+            }
+            // 3 welcome tabs
+            assert.deepStrictEqual(welcomeCount, 3)
+
+            // 2 normal tabs
+            assert.deepStrictEqual(framework.getTabs().length - welcomeCount, 2)
+        })
+
+        it('new windows', () => {
+            // check the initial window
+            assert.deepStrictEqual(store.tabTitle, 'Welcome to Q')
+            framework.dispose()
+
+            // check when theres already been two welcome tabs shown
+            framework = new qTestingFramework('welcome', true, [], 2)
+            const secondStore = framework.getTabs()[0].getStore()
+            assert.deepStrictEqual(secondStore.tabTitle, 'Welcome to Q')
+            framework.dispose()
+
+            // check when theres already been three welcome tabs shown
+            framework = new qTestingFramework('welcome', true, [], 3)
+            const thirdStore = framework.getTabs()[0].getStore()
+            assert.deepStrictEqual(thirdStore.tabTitle, 'Chat')
+            framework.dispose()
+        })
+    })
+
+    describe('Welcome actions', () => {
+        it('explore', () => {
+            tab.clickInBodyButton('explore')
+
+            // explore opens in a new tab
+            const exploreTabStore = framework.findTab('Explore')?.getStore()
+            assert.strictEqual(exploreTabStore?.tabTitle, 'Explore')
+        })
+
+        it('quick-start', async () => {
+            tab.clickInBodyButton('quick-start')
+
+            // clicking quick start opens in the current tab and changes the compact mode
+            assert.deepStrictEqual(tab.getStore().compactMode, false)
+        })
+    })
+})
diff --git a/packages/amazonq/test/e2e/index.ts b/packages/amazonq/test/e2e/index.ts
new file mode 100644
index 00000000000..065a2cd8bc8
--- /dev/null
+++ b/packages/amazonq/test/e2e/index.ts
@@ -0,0 +1,13 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { runTests } from 'aws-core-vscode/test'
+import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
+
+export function run(): Promise<void> {
+    return runTests(process.env.TEST_DIR ?? 'test/e2e', VSCODE_EXTENSION_ID.amazonq, [
+        '../../core/dist/src/testInteg/globalSetup.test.ts',
+    ])
+}
diff --git a/packages/amazonq/test/e2e/inline/inline.test.ts b/packages/amazonq/test/e2e/inline/inline.test.ts
new file mode 100644
index 00000000000..43a9f67ab73
--- /dev/null
+++ b/packages/amazonq/test/e2e/inline/inline.test.ts
@@ -0,0 +1,244 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import assert from 'assert'
+import {
+    closeAllEditors,
+    getTestWindow,
+    registerAuthHook,
+    resetCodeWhispererGlobalVariables,
+    TestFolder,
+    toTextEditor,
+    using,
+} from 'aws-core-vscode/test'
+import { RecommendationHandler, RecommendationService, session } from 'aws-core-vscode/codewhisperer'
+import { Commands, globals, sleep, waitUntil, collectionUtil } from 'aws-core-vscode/shared'
+import { loginToIdC } from '../amazonq/utils/setup'
+
+describe('Amazon Q Inline', async function () {
+    const retries = 3
+    this.retries(retries)
+
+    let tempFolder: string
+    const waitOptions = {
+        interval: 500,
+        timeout: 10000,
+        retryOnFail: false,
+    }
+
+    before(async function () {
+        await using(registerAuthHook('amazonq-test-account'), async () => {
+            await loginToIdC()
+        })
+    })
+
+    beforeEach(async function () {
+        registerAuthHook('amazonq-test-account')
+        const folder = await TestFolder.create()
+        tempFolder = folder.path
+        await closeAllEditors()
+        await resetCodeWhispererGlobalVariables()
+    })
+
+    afterEach(async function () {
+        await closeAllEditors()
+        if (this.currentTest?.state === undefined || this.currentTest?.isFailed() || this.currentTest?.isPending()) {
+            logUserDecisionStatus()
+        }
+    })
+
+    function logUserDecisionStatus() {
+        const events = getUserTriggerDecision()
+        console.table({
+            'telemetry events': JSON.stringify(events),
+            'recommendation service status': RecommendationService.instance.isRunning,
+        })
+    }
+
+    async function setupEditor({ name, contents }: { name?: string; contents?: string } = {}) {
+        const fileName = name ?? 'test.ts'
+        const textContents =
+            contents ??
+            `function fib() {
+    
+    
+}`
+        await toTextEditor(textContents, fileName, tempFolder, {
+            selection: new vscode.Range(new vscode.Position(1, 4), new vscode.Position(1, 4)),
+        })
+    }
+
+    async function waitForRecommendations() {
+        const suggestionShown = await waitUntil(async () => session.getSuggestionState(0) === 'Showed', waitOptions)
+        if (!suggestionShown) {
+            throw new Error(`Suggestion did not show. Suggestion States: ${JSON.stringify(session.suggestionStates)}`)
+        }
+        const suggestionVisible = await waitUntil(
+            async () => RecommendationHandler.instance.isSuggestionVisible(),
+            waitOptions
+        )
+        if (!suggestionVisible) {
+            throw new Error(
+                `Suggestions failed to become visible. Suggestion States: ${JSON.stringify(session.suggestionStates)}`
+            )
+        }
+        console.table({
+            'suggestions states': JSON.stringify(session.suggestionStates),
+            'valid recommendation': RecommendationHandler.instance.isValidResponse(),
+            'recommendation service status': RecommendationService.instance.isRunning,
+            recommendations: session.recommendations,
+        })
+        if (!RecommendationHandler.instance.isValidResponse()) {
+            throw new Error('Did not find a valid response')
+        }
+    }
+
+    /**
+     * Waits for a specific telemetry event to be emitted with the expected suggestion state.
+     * It looks like there might be a potential race condition in codewhisperer causing telemetry
+     * events to be emitted in different orders
+     */
+    async function waitForTelemetry(metricName: string, suggestionState: string) {
+        const ok = await waitUntil(async () => {
+            const events = globals.telemetry.logger.query({
+                metricName,
+            })
+            return events.some((event) => event.codewhispererSuggestionState === suggestionState)
+        }, waitOptions)
+        if (!ok) {
+            assert.fail(`Telemetry for ${metricName} with suggestionState ${suggestionState} was not emitted`)
+        }
+        const events = getUserTriggerDecision()
+        if (events.length > 1 && events[events.length - 1].codewhispererSuggestionState !== suggestionState) {
+            assert.fail(`Telemetry events were emitted in the wrong order`)
+        }
+    }
+
+    function getUserTriggerDecision() {
+        return globals.telemetry.logger
+            .query({
+                metricName: 'codewhisperer_userTriggerDecision',
+            })
+            .map((e) => collectionUtil.partialClone(e, 3, ['credentialStartUrl'], { replacement: '[omitted]' }))
+    }
+
+    for (const [name, invokeCompletion] of [
+        ['automatic', async () => await vscode.commands.executeCommand('type', { text: '\n' })],
+        ['manual', async () => Commands.tryExecute('aws.amazonq.invokeInlineCompletion')],
+    ] as const) {
+        describe(`${name} invoke`, async function () {
+            let originalEditorContents: string | undefined
+
+            describe('supported filetypes', () => {
+                async function setup() {
+                    await setupEditor()
+
+                    /**
+                     * Allow some time between when the editor is opened and when we start typing.
+                     * If we don't do this then the time between the initial editor selection
+                     * and invoking the "type" command is too low, causing completion to never
+                     * activate. AFAICT there isn't anything we can use waitUntil on here.
+                     *
+                     * note: this number is entirely arbitrary
+                     **/
+                    await sleep(1000)
+
+                    await invokeCompletion()
+                    originalEditorContents = vscode.window.activeTextEditor?.document.getText()
+
+                    // wait until the ghost text appears
+                    await waitForRecommendations()
+                }
+
+                beforeEach(async () => {
+                    /**
+                     * Every once and a while the backend won't respond with any recommendations.
+                     * In those cases, re-try the setup up-to ${retries} times
+                     */
+                    let attempt = 0
+                    while (attempt < retries) {
+                        try {
+                            await setup()
+                            console.log(`test run ${attempt} succeeded`)
+                            logUserDecisionStatus()
+                            break
+                        } catch (e) {
+                            console.log(`test run ${attempt} failed`)
+                            console.log(e)
+                            logUserDecisionStatus()
+                            attempt++
+                            await resetCodeWhispererGlobalVariables()
+                        }
+                    }
+                    if (attempt === retries) {
+                        assert.fail(`Failed to invoke ${name} tests after ${attempt} attempts`)
+                    }
+                })
+
+                it(`${name} invoke accept`, async function () {
+                    /**
+                     * keep accepting the suggestion until the text contents change
+                     * this is required because we have no access to the inlineSuggest panel
+                     **/
+                    const suggestionAccepted = await waitUntil(async () => {
+                        // Accept the suggestion
+                        await vscode.commands.executeCommand('editor.action.inlineSuggest.commit')
+                        return vscode.window.activeTextEditor?.document.getText() !== originalEditorContents
+                    }, waitOptions)
+
+                    assert.ok(suggestionAccepted, 'Editor contents should have changed')
+
+                    await waitForTelemetry('codewhisperer_userTriggerDecision', 'Accept')
+                })
+
+                it(`${name} invoke reject`, async function () {
+                    // Reject the suggestion
+                    await vscode.commands.executeCommand('aws.amazonq.rejectCodeSuggestion')
+
+                    // Contents haven't changed
+                    assert.deepStrictEqual(vscode.window.activeTextEditor?.document.getText(), originalEditorContents)
+                    await waitForTelemetry('codewhisperer_userTriggerDecision', 'Reject')
+                })
+
+                it(`${name} invoke discard`, async function () {
+                    // Discard the suggestion by moving it back to the original position
+                    const position = new vscode.Position(1, 4)
+                    const editor = vscode.window.activeTextEditor
+                    if (!editor) {
+                        assert.fail('Could not find text editor')
+                    }
+                    editor.selection = new vscode.Selection(position, position)
+
+                    // Contents are the same
+                    assert.deepStrictEqual(vscode.window.activeTextEditor?.document.getText(), originalEditorContents)
+                })
+            })
+
+            it(`${name} invoke on unsupported filetype`, async function () {
+                await setupEditor({
+                    name: 'test.zig',
+                    contents: `fn doSomething() void {
+        
+             }`,
+                })
+
+                /**
+                 * Add delay between editor loading and invoking completion
+                 * @see beforeEach in supported filetypes for more information
+                 */
+                await sleep(1000)
+                await invokeCompletion()
+
+                if (name === 'automatic') {
+                    // It should never get triggered since its not a supported file type
+                    assert.deepStrictEqual(RecommendationService.instance.isRunning, false)
+                } else {
+                    await getTestWindow().waitForMessage('currently not supported by Amazon Q inline suggestions')
+                }
+            })
+        })
+    }
+})
diff --git a/packages/amazonq/test/e2e/lsp/amazonqLsp.test.ts b/packages/amazonq/test/e2e/lsp/amazonqLsp.test.ts
new file mode 100644
index 00000000000..f4a60ff282b
--- /dev/null
+++ b/packages/amazonq/test/e2e/lsp/amazonqLsp.test.ts
@@ -0,0 +1,31 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { AmazonQLspInstaller } from '../../../src/lsp/lspInstaller'
+import { defaultAmazonQLspConfig } from '../../../src/lsp/config'
+import { createLspInstallerTests } from './lspInstallerUtil'
+import { BaseLspInstaller } from 'aws-core-vscode/shared'
+
+describe('AmazonQLSP', () => {
+    createLspInstallerTests({
+        suiteName: 'AmazonQLSPInstaller',
+        lspConfig: defaultAmazonQLspConfig,
+        createInstaller: (lspConfig?: BaseLspInstaller.LspConfig) => new AmazonQLspInstaller(lspConfig),
+        targetContents: [
+            {
+                bytes: 0,
+                filename: 'servers.zip',
+                hashes: [],
+                url: 'http://fakeurl',
+            },
+        ],
+        setEnv: (path: string) => {
+            process.env.__AMAZONQLSP_PATH = path
+        },
+        resetEnv: () => {
+            delete process.env.__AMAZONQLSP_PATH
+        },
+    })
+})
diff --git a/packages/amazonq/test/e2e/lsp/lspInstallerUtil.ts b/packages/amazonq/test/e2e/lsp/lspInstallerUtil.ts
new file mode 100644
index 00000000000..d4251959756
--- /dev/null
+++ b/packages/amazonq/test/e2e/lsp/lspInstallerUtil.ts
@@ -0,0 +1,307 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import {
+    BaseLspInstaller,
+    DevSettings,
+    fs,
+    LanguageServerResolver,
+    makeTemporaryToolkitFolder,
+    ManifestResolver,
+    request,
+    TargetContent,
+    ToolkitError,
+} from 'aws-core-vscode/shared'
+import * as semver from 'semver'
+import { assertTelemetry } from 'aws-core-vscode/test'
+import { LanguageServerSetup } from 'aws-core-vscode/telemetry'
+
+function createVersion(version: string, contents: TargetContent[]) {
+    return {
+        isDelisted: false,
+        serverVersion: version,
+        targets: [
+            {
+                arch: process.arch,
+                platform: process.platform,
+                contents,
+            },
+        ],
+    }
+}
+
+export function createLspInstallerTests({
+    suiteName,
+    lspConfig,
+    createInstaller,
+    targetContents,
+    setEnv,
+    resetEnv,
+}: {
+    suiteName: string
+    lspConfig: BaseLspInstaller.LspConfig
+    createInstaller: (lspConfig?: BaseLspInstaller.LspConfig) => BaseLspInstaller.BaseLspInstaller
+    targetContents: TargetContent[]
+    setEnv: (path: string) => void
+    resetEnv: () => void
+}) {
+    describe(suiteName, () => {
+        let installer: BaseLspInstaller.BaseLspInstaller
+        let sandbox: sinon.SinonSandbox
+        let tempDir: string
+
+        beforeEach(async () => {
+            sandbox = sinon.createSandbox()
+            installer = createInstaller()
+            tempDir = await makeTemporaryToolkitFolder()
+            sandbox.stub(LanguageServerResolver.prototype, 'defaultDownloadFolder').returns(tempDir)
+        })
+
+        afterEach(async () => {
+            resetEnv()
+            sandbox.restore()
+            await fs.delete(tempDir, {
+                recursive: true,
+            })
+        })
+
+        describe('resolve()', () => {
+            it('uses dev setting override', async () => {
+                const path = '/custom/path/to/lsp'
+                sandbox.stub(DevSettings.instance, 'getServiceConfig').returns({
+                    path,
+                })
+                /**
+                 * The installer pre-evaluates the config, so if we want to override the config
+                 * we need to stub then re-create it
+                 */
+                const result = await createInstaller().resolve()
+
+                assert.strictEqual(result.assetDirectory, path)
+                assert.strictEqual(result.location, 'override')
+                assert.strictEqual(result.version, '0.0.0')
+            })
+
+            it('uses environment variable override', async () => {
+                const overridePath = '/custom/path/to/lsp'
+                setEnv(overridePath)
+
+                /**
+                 * The installer pre-evaluates the config, so if we want to override the environment variables
+                 * we need to override the env then re-create it
+                 */
+                const result = await createInstaller().resolve()
+
+                assert.strictEqual(result.assetDirectory, overridePath)
+                assert.strictEqual(result.location, 'override')
+                assert.strictEqual(result.version, '0.0.0')
+            })
+
+            it('resolves', async () => {
+                // First try - should download the file
+                const download = await installer.resolve()
+
+                assert.ok(download.assetDirectory.startsWith(tempDir))
+                assert.deepStrictEqual(download.location, 'remote')
+                assert.ok(semver.satisfies(download.version, lspConfig.supportedVersions))
+
+                // Second try - Should see the contents in the cache
+                const cache = await installer.resolve()
+
+                assert.ok(cache.assetDirectory.startsWith(tempDir))
+                assert.deepStrictEqual(cache.location, 'cache')
+                assert.ok(semver.satisfies(cache.version, lspConfig.supportedVersions))
+
+                /**
+                 * Always make sure the latest version is one patch higher. This stops a problem
+                 * where the fallback can't be used because the latest compatible version
+                 * is equal to the min version, so if the cache isn't valid, then there
+                 * would be no fallback location
+                 *
+                 * Instead, increasing the latest compatible lsp version means we can just
+                 * use the one we downloaded earlier in the test as the fallback
+                 */
+                const nextVer = semver.inc(cache.version, 'patch', true)
+                if (!nextVer) {
+                    throw new Error('Could not increment version')
+                }
+                sandbox.stub(ManifestResolver.prototype, 'resolve').resolves({
+                    manifestSchemaVersion: '0.0.0',
+                    artifactId: 'foo',
+                    artifactDescription: 'foo',
+                    isManifestDeprecated: false,
+                    versions: [createVersion(nextVer, targetContents), createVersion(cache.version, targetContents)],
+                })
+
+                // fail the next http request for the language server
+                sandbox.stub(request, 'fetch').returns({
+                    response: Promise.resolve({
+                        ok: false,
+                    }),
+                } as any)
+
+                const config = {
+                    ...lspConfig,
+                    // contains the old version thats actually on disk + the new version
+                    supportedVersions: `${cache.version} || ${nextVer}`,
+                }
+
+                // Third try - Cache doesn't exist and we couldn't download from the internet, fallback to a local version
+                const fallback = await createInstaller(config).resolve()
+
+                assert.ok(fallback.assetDirectory.startsWith(tempDir))
+                assert.deepStrictEqual(fallback.location, 'fallback')
+                assert.ok(semver.satisfies(fallback.version, lspConfig.supportedVersions))
+
+                /* First Try Telemetry
+                        getManifest: remote succeeds
+                        getServer: cache fails then remote succeeds.
+                        validate: succeeds.
+                */
+                const firstTryTelemetry: Partial<LanguageServerSetup>[] = [
+                    {
+                        id: lspConfig.id,
+                        manifestLocation: 'remote',
+                        languageServerSetupStage: 'getManifest',
+                        result: 'Succeeded',
+                    },
+                    {
+                        id: lspConfig.id,
+                        languageServerLocation: 'cache',
+                        languageServerSetupStage: 'getServer',
+                        result: 'Failed',
+                    },
+                    {
+                        id: lspConfig.id,
+                        languageServerLocation: 'remote',
+                        languageServerSetupStage: 'validate',
+                        result: 'Succeeded',
+                    },
+                    {
+                        id: lspConfig.id,
+                        languageServerLocation: 'remote',
+                        languageServerSetupStage: 'getServer',
+                        result: 'Succeeded',
+                    },
+                ]
+
+                /* Second Try Telemetry
+                        getManifest: remote fails, then cache succeeds.
+                        getServer: cache succeeds
+                        validate: doesn't run since its cached.
+                */
+                const secondTryTelemetry: Partial<LanguageServerSetup>[] = [
+                    {
+                        id: lspConfig.id,
+                        manifestLocation: 'remote',
+                        languageServerSetupStage: 'getManifest',
+                        result: 'Succeeded',
+                    },
+                    {
+                        id: lspConfig.id,
+                        languageServerLocation: 'cache',
+                        languageServerSetupStage: 'getServer',
+                        result: 'Succeeded',
+                    },
+                ]
+
+                /* Third Try Telemetry
+                        getManifest: (stubbed to fail, no telemetry)
+                        getServer: remote and cache fail
+                        validate: no validation since not remote.
+                */
+                const thirdTryTelemetry: Partial<LanguageServerSetup>[] = [
+                    {
+                        id: lspConfig.id,
+                        languageServerLocation: 'cache',
+                        languageServerSetupStage: 'getServer',
+                        result: 'Failed',
+                    },
+                    {
+                        id: lspConfig.id,
+                        languageServerLocation: 'remote',
+                        languageServerSetupStage: 'getServer',
+                        result: 'Failed',
+                    },
+                    {
+                        id: lspConfig.id,
+                        languageServerLocation: 'fallback',
+                        languageServerSetupStage: 'getServer',
+                        result: 'Succeeded',
+                    },
+                ]
+
+                const expectedTelemetry = firstTryTelemetry.concat(secondTryTelemetry, thirdTryTelemetry)
+
+                assertTelemetry('languageServer_setup', expectedTelemetry)
+            })
+
+            it('resolves release candidiates', async () => {
+                const original = new ManifestResolver(lspConfig.manifestUrl, lspConfig.id, '').resolve()
+                sandbox.stub(ManifestResolver.prototype, 'resolve').callsFake(async () => {
+                    const originalManifest = await original
+
+                    const latestVersion = originalManifest.versions.reduce((latest, current) => {
+                        return semver.gt(current.serverVersion, latest.serverVersion) ? current : latest
+                    }, originalManifest.versions[0])
+
+                    // These convert something like 3.1.1 to 3.1.2-rc.0
+                    const incrementedVersion = semver.inc(latestVersion.serverVersion, 'patch')
+                    if (!incrementedVersion) {
+                        assert.fail('Failed to increment minor version')
+                    }
+
+                    const prereleaseVersion = semver.inc(incrementedVersion, 'prerelease', 'rc')
+                    if (!prereleaseVersion) {
+                        assert.fail('Failed to create pre-release version')
+                    }
+
+                    const newVersion = {
+                        ...latestVersion,
+                        serverVersion: prereleaseVersion,
+                    }
+
+                    originalManifest.versions = [newVersion, ...originalManifest.versions]
+                    return originalManifest
+                })
+
+                const version = lspConfig.supportedVersions
+                lspConfig.supportedVersions = version.startsWith('^') ? version : `^${version}`
+                const download = await createInstaller(lspConfig).resolve()
+                assert.ok(download.assetDirectory.endsWith('-rc.0'))
+            })
+
+            it('throws on firewall error', async () => {
+                // Stub the manifest resolver to return a valid manifest
+                sandbox.stub(ManifestResolver.prototype, 'resolve').resolves({
+                    manifestSchemaVersion: '0.0.0',
+                    artifactId: 'foo',
+                    artifactDescription: 'foo',
+                    isManifestDeprecated: false,
+                    versions: [createVersion('1.0.0', targetContents)],
+                })
+
+                // Fail all HTTP requests for the language server
+                sandbox.stub(request, 'fetch').returns({
+                    response: Promise.resolve({
+                        ok: false,
+                    }),
+                } as any)
+
+                // This should now throw a NetworkConnectivityError
+                await assert.rejects(
+                    async () => await installer.resolve(),
+                    (err: ToolkitError) => {
+                        assert.strictEqual(err.code, 'NetworkConnectivityError')
+                        assert.ok(err.message.includes('Unable to download dependencies'))
+                        return true
+                    }
+                )
+            })
+        })
+    })
+}
diff --git a/packages/amazonq/test/unit/amazonq/apps/initContext.test.ts b/packages/amazonq/test/unit/amazonq/apps/initContext.test.ts
new file mode 100644
index 00000000000..71aa82d7818
--- /dev/null
+++ b/packages/amazonq/test/unit/amazonq/apps/initContext.test.ts
@@ -0,0 +1,42 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { EventEmitter } from 'vscode'
+import { DefaultAmazonQAppInitContext, MessagePublisher } from 'aws-core-vscode/amazonq'
+import assert from 'assert'
+
+describe('DefaultAmazonQAppInitContext', () => {
+    let context: DefaultAmazonQAppInitContext
+
+    beforeEach(() => {
+        context = new DefaultAmazonQAppInitContext()
+    })
+
+    describe('registerWebViewToAppMessagePublisher', () => {
+        it('should add the publisher to the map', () => {
+            const publisher = new MessagePublisher(new EventEmitter())
+            context.registerWebViewToAppMessagePublisher(publisher, 'unknown')
+            assert.strictEqual(context.getWebViewToAppsMessagePublishers().get('unknown'), publisher)
+        })
+    })
+
+    describe('getAppsToWebViewMessagePublisher', () => {
+        it('should return the publisher', () => {
+            assert.notDeepStrictEqual(context.getAppsToWebViewMessagePublisher(), undefined)
+        })
+    })
+
+    describe('getAppsToWebViewMessageListener', () => {
+        it('should return the listener', () => {
+            assert.notDeepStrictEqual(context.getAppsToWebViewMessageListener(), undefined)
+        })
+    })
+
+    describe('onDidChangeAmazonQVisibility', () => {
+        it('should be an EventEmitter', () => {
+            assert.strictEqual(context.onDidChangeAmazonQVisibility instanceof EventEmitter, true)
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/amazonq/apps/inline/EditRendering/stringUtils.test.ts b/packages/amazonq/test/unit/amazonq/apps/inline/EditRendering/stringUtils.test.ts
new file mode 100644
index 00000000000..09c33fb0c80
--- /dev/null
+++ b/packages/amazonq/test/unit/amazonq/apps/inline/EditRendering/stringUtils.test.ts
@@ -0,0 +1,47 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import { stripCommonIndentation } from '../../../../../../src/app/inline/EditRendering/stringUtils'
+
+describe('stripCommonIndentation', () => {
+    it('should strip common leading whitespace', () => {
+        const input = ['    line1 ', '    line2 ', '        line3   ']
+        const expected = ['line1 ', 'line2 ', '    line3   ']
+        assert.deepStrictEqual(stripCommonIndentation(input), expected)
+    })
+
+    it('should handle HTML tags', () => {
+        const input = [
+            '<span class="diff-unchanged>       line1 </span>',
+            '<span class="diff-changed>   line2  </span>',
+        ]
+        const expected = ['<span class="diff-unchanged>    line1 </span>', '<span class="diff-changed>line2  </span>']
+        assert.deepStrictEqual(stripCommonIndentation(input), expected)
+    })
+
+    it('should handle mixed indentation', () => {
+        const input = [' line1', '    line2', '  line3']
+        const expected = ['line1', '   line2', ' line3']
+        assert.deepStrictEqual(stripCommonIndentation(input), expected)
+    })
+
+    it('should handle empty lines', () => {
+        const input = ['    line1', '', '    line2']
+        const expected = ['    line1', '', '    line2']
+        assert.deepStrictEqual(stripCommonIndentation(input), expected)
+    })
+
+    it('should handle no indentation', () => {
+        const input = ['line1', 'line2']
+        const expected = ['line1', 'line2']
+        assert.deepStrictEqual(stripCommonIndentation(input), expected)
+    })
+
+    it('should handle single line', () => {
+        const input = ['    single line']
+        const expected = ['single line']
+        assert.deepStrictEqual(stripCommonIndentation(input), expected)
+    })
+})
diff --git a/packages/amazonq/test/unit/amazonq/apps/inline/completion.test.ts b/packages/amazonq/test/unit/amazonq/apps/inline/completion.test.ts
new file mode 100644
index 00000000000..8e0d2719428
--- /dev/null
+++ b/packages/amazonq/test/unit/amazonq/apps/inline/completion.test.ts
@@ -0,0 +1,424 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import sinon from 'sinon'
+import {
+    CancellationToken,
+    commands,
+    InlineCompletionItem,
+    languages,
+    Position,
+    window,
+    Range,
+    InlineCompletionTriggerKind,
+} from 'vscode'
+import assert from 'assert'
+import { BaseLanguageClient } from 'vscode-languageclient'
+import { StringValue } from 'vscode-languageserver-types'
+import { AmazonQInlineCompletionItemProvider, InlineCompletionManager } from '../../../../../src/app/inline/completion'
+import { RecommendationService } from '../../../../../src/app/inline/recommendationService'
+import { SessionManager } from '../../../../../src/app/inline/sessionManager'
+import { createMockDocument, createMockTextEditor, getTestWindow, installFakeClock } from 'aws-core-vscode/test'
+import {
+    noInlineSuggestionsMsg,
+    ReferenceHoverProvider,
+    ReferenceLogViewProvider,
+    vsCodeState,
+} from 'aws-core-vscode/codewhisperer'
+import { LineTracker } from '../../../../../src/app/inline/stateTracker/lineTracker'
+import { InlineTutorialAnnotation } from '../../../../../src/app/inline/tutorials/inlineTutorialAnnotation'
+import { DocumentEventListener } from '../../../../../src/app/inline/documentEventListener'
+
+describe('InlineCompletionManager', () => {
+    let manager: InlineCompletionManager
+    let languageClient: BaseLanguageClient
+    let sendNotificationStub: sinon.SinonStub
+    let registerProviderStub: sinon.SinonStub
+    let registerCommandStub: sinon.SinonStub
+    let executeCommandStub: sinon.SinonStub
+    let disposableStub: sinon.SinonStub
+    let sandbox: sinon.SinonSandbox
+    let getActiveSessionStub: sinon.SinonStub
+    let getActiveRecommendationStub: sinon.SinonStub
+    let logReferenceStub: sinon.SinonStub
+    let getReferenceStub: sinon.SinonStub
+    let hoverReferenceStub: sinon.SinonStub
+    const mockDocument = createMockDocument()
+    const mockEditor = createMockTextEditor()
+    const mockPosition = new Position(0, 0)
+    const mockContext = { triggerKind: 1, selectedCompletionInfo: undefined }
+    const mockToken = { isCancellationRequested: false } as CancellationToken
+    const fakeReferences = [
+        {
+            message: '',
+            licenseName: 'TEST_LICENSE',
+            repository: 'TEST_REPO',
+            recommendationContentSpan: {
+                start: 0,
+                end: 10,
+            },
+        },
+    ]
+    const mockSuggestions = [
+        {
+            itemId: 'test-item',
+            insertText: 'test',
+            references: fakeReferences,
+        },
+        {
+            itemId: 'test-item2',
+            insertText: 'import math\ndef two_sum(nums, target):\n',
+            references: fakeReferences,
+        },
+    ]
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+
+        registerProviderStub = sandbox.stub(languages, 'registerInlineCompletionItemProvider')
+        registerCommandStub = sandbox.stub(commands, 'registerCommand')
+        executeCommandStub = sandbox.stub(commands, 'executeCommand')
+        sendNotificationStub = sandbox.stub()
+
+        const mockDisposable = {
+            dispose: sandbox.stub(),
+        }
+        disposableStub = mockDisposable.dispose
+        registerProviderStub.returns(mockDisposable)
+
+        languageClient = {
+            sendNotification: sendNotificationStub,
+        } as unknown as BaseLanguageClient
+
+        const sessionManager = new SessionManager()
+        const lineTracker = new LineTracker()
+        const inlineTutorialAnnotation = new InlineTutorialAnnotation(lineTracker, sessionManager)
+        manager = new InlineCompletionManager(languageClient, sessionManager, lineTracker, inlineTutorialAnnotation)
+        getActiveSessionStub = sandbox.stub(manager['sessionManager'], 'getActiveSession')
+        getActiveRecommendationStub = sandbox.stub(manager['sessionManager'], 'getActiveRecommendation')
+        getReferenceStub = sandbox.stub(ReferenceLogViewProvider, 'getReferenceLog')
+        logReferenceStub = sandbox.stub(ReferenceLogViewProvider.instance, 'addReferenceLog')
+        hoverReferenceStub = sandbox.stub(ReferenceHoverProvider.instance, 'addCodeReferences')
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+
+    describe('registerInlineCompletion', () => {
+        beforeEach(() => {
+            manager.registerInlineCompletion()
+        })
+
+        it('should register accept and reject commands', () => {
+            assert(registerCommandStub.calledWith('aws.amazonq.acceptInline'))
+            assert(registerCommandStub.calledWith('aws.amazonq.rejectCodeSuggestion'))
+        })
+
+        describe('onInlineAcceptance', () => {
+            it('should send notification and re-register provider on acceptance', async () => {
+                // Get the acceptance handler
+                const acceptanceHandler = registerCommandStub
+                    .getCalls()
+                    ?.find((call) => call.args[0] === 'aws.amazonq.acceptInline')?.args[1]
+
+                const sessionId = 'test-session'
+                const requestStartTime = Date.now() - 1000
+                const firstCompletionDisplayLatency = 500
+
+                await acceptanceHandler(
+                    sessionId,
+                    mockSuggestions[0],
+                    mockEditor,
+                    requestStartTime,
+                    firstCompletionDisplayLatency
+                )
+
+                assert(sendNotificationStub.calledOnce)
+                assert(
+                    sendNotificationStub.calledWith(
+                        'aws/logInlineCompletionSessionResults',
+                        sinon.match({
+                            sessionId,
+                            completionSessionResult: {
+                                [mockSuggestions[0].itemId]: {
+                                    seen: true,
+                                    accepted: true,
+                                    discarded: false,
+                                },
+                            },
+                        })
+                    )
+                )
+
+                assert(disposableStub.calledOnce)
+                assert(registerProviderStub.calledTwice) // Once in constructor, once after acceptance
+            })
+
+            it('should log reference if there is any', async () => {
+                const acceptanceHandler = registerCommandStub
+                    .getCalls()
+                    ?.find((call) => call.args[0] === 'aws.amazonq.acceptInline')?.args[1]
+
+                const sessionId = 'test-session'
+                const requestStartTime = Date.now() - 1000
+                const firstCompletionDisplayLatency = 500
+                const mockReferenceLog = 'test reference log'
+                getReferenceStub.returns(mockReferenceLog)
+
+                await acceptanceHandler(
+                    sessionId,
+                    mockSuggestions[0],
+                    mockEditor,
+                    requestStartTime,
+                    firstCompletionDisplayLatency
+                )
+
+                assert(getReferenceStub.calledOnce)
+                assert(
+                    getReferenceStub.calledWith(
+                        mockSuggestions[0].insertText,
+                        mockSuggestions[0].references,
+                        mockEditor
+                    )
+                )
+                assert(logReferenceStub.calledOnce)
+                assert(logReferenceStub.calledWith(mockReferenceLog))
+                assert(hoverReferenceStub.calledOnce)
+                assert(hoverReferenceStub.calledWith(mockSuggestions[0].insertText, mockSuggestions[0].references))
+            })
+        })
+
+        describe('onInlineRejection', () => {
+            it('should hide suggestion and send notification on rejection', async () => {
+                // Get the rejection handler
+                const rejectionHandler = registerCommandStub
+                    .getCalls()
+                    .find((call) => call.args[0] === 'aws.amazonq.rejectCodeSuggestion')?.args[1]
+
+                const sessionId = 'test-session'
+                const itemId = 'test-item'
+                const mockSuggestion = {
+                    itemId,
+                    insertText: 'test',
+                }
+
+                getActiveSessionStub.returns({
+                    sessionId: 'test-session',
+                    suggestions: [mockSuggestion],
+                    isRequestInProgress: false,
+                    requestStartTime: Date.now(),
+                })
+                getActiveRecommendationStub.returns([mockSuggestion])
+                await rejectionHandler()
+
+                assert(executeCommandStub.calledWith('editor.action.inlineSuggest.hide'))
+                assert(sendNotificationStub.calledOnce)
+                assert(
+                    sendNotificationStub.calledWith(
+                        'aws/logInlineCompletionSessionResults',
+                        sinon.match({
+                            sessionId,
+                            completionSessionResult: {
+                                [itemId]: {
+                                    seen: true,
+                                    accepted: false,
+                                    discarded: false,
+                                },
+                            },
+                        })
+                    )
+                )
+
+                assert(disposableStub.calledOnce)
+                assert(registerProviderStub.calledTwice) // Once in constructor, once after rejection
+            })
+        })
+    })
+
+    describe('AmazonQInlineCompletionItemProvider', () => {
+        describe('provideInlineCompletionItems', () => {
+            let mockSessionManager: SessionManager
+            let provider: AmazonQInlineCompletionItemProvider
+            let getAllRecommendationsStub: sinon.SinonStub
+            let recommendationService: RecommendationService
+            let inlineTutorialAnnotation: InlineTutorialAnnotation
+            let documentEventListener: DocumentEventListener
+
+            beforeEach(() => {
+                const lineTracker = new LineTracker()
+                inlineTutorialAnnotation = new InlineTutorialAnnotation(lineTracker, mockSessionManager)
+                recommendationService = new RecommendationService(mockSessionManager)
+                documentEventListener = new DocumentEventListener()
+                vsCodeState.isRecommendationsActive = false
+                mockSessionManager = {
+                    getActiveSession: getActiveSessionStub,
+                    getActiveRecommendation: getActiveRecommendationStub,
+                    clear: () => {},
+                    updateCodeReferenceAndImports: () => {},
+                } as unknown as SessionManager
+
+                getActiveSessionStub.returns({
+                    sessionId: 'test-session',
+                    suggestions: mockSuggestions,
+                    isRequestInProgress: false,
+                    requestStartTime: Date.now(),
+                })
+                getActiveRecommendationStub.returns(mockSuggestions)
+                getAllRecommendationsStub = sandbox.stub(recommendationService, 'getAllRecommendations')
+                getAllRecommendationsStub.resolves()
+                sandbox.stub(window, 'activeTextEditor').value(createMockTextEditor())
+            }),
+                it('should call recommendation service to get new suggestions(matching typeahead) for new sessions', async () => {
+                    provider = new AmazonQInlineCompletionItemProvider(
+                        languageClient,
+                        recommendationService,
+                        mockSessionManager,
+                        inlineTutorialAnnotation,
+                        documentEventListener
+                    )
+                    const items = await provider.provideInlineCompletionItems(
+                        mockDocument,
+                        mockPosition,
+                        mockContext,
+                        mockToken
+                    )
+                    assert(getAllRecommendationsStub.calledOnce)
+                    assert.deepStrictEqual(items, [mockSuggestions[1]])
+                }),
+                it('should handle reference if there is any', async () => {
+                    provider = new AmazonQInlineCompletionItemProvider(
+                        languageClient,
+                        recommendationService,
+                        mockSessionManager,
+                        inlineTutorialAnnotation,
+                        documentEventListener
+                    )
+                    await provider.provideInlineCompletionItems(mockDocument, mockPosition, mockContext, mockToken)
+                }),
+                it('should add a range to the completion item when missing', async function () {
+                    provider = new AmazonQInlineCompletionItemProvider(
+                        languageClient,
+                        recommendationService,
+                        mockSessionManager,
+                        inlineTutorialAnnotation,
+                        documentEventListener
+                    )
+                    getActiveRecommendationStub.returns([
+                        {
+                            insertText: 'testText',
+                            itemId: 'itemId',
+                        },
+                        {
+                            insertText: 'testText2',
+                            itemId: 'itemId2',
+                            range: undefined,
+                        },
+                    ])
+                    const cursorPosition = new Position(5, 6)
+                    const result = await provider.provideInlineCompletionItems(
+                        mockDocument,
+                        cursorPosition,
+                        mockContext,
+                        mockToken
+                    )
+
+                    for (const item of result) {
+                        assert.deepStrictEqual(item.range, new Range(cursorPosition, cursorPosition))
+                    }
+                }),
+                it('should handle StringValue instead of strings', async function () {
+                    provider = new AmazonQInlineCompletionItemProvider(
+                        languageClient,
+                        recommendationService,
+                        mockSessionManager,
+                        inlineTutorialAnnotation,
+                        documentEventListener
+                    )
+                    const expectedText = `${mockSuggestions[1].insertText}this is my text`
+                    getActiveRecommendationStub.returns([
+                        {
+                            insertText: {
+                                kind: 'snippet',
+                                value: `${mockSuggestions[1].insertText}this is my text`,
+                            } satisfies StringValue,
+                            itemId: 'itemId',
+                        },
+                    ])
+                    const result = await provider.provideInlineCompletionItems(
+                        mockDocument,
+                        mockPosition,
+                        mockContext,
+                        mockToken
+                    )
+
+                    assert.strictEqual(result[0].insertText, expectedText)
+                }),
+                it('shows message to user when manual invoke fails to produce results', async function () {
+                    provider = new AmazonQInlineCompletionItemProvider(
+                        languageClient,
+                        recommendationService,
+                        mockSessionManager,
+                        inlineTutorialAnnotation,
+                        documentEventListener
+                    )
+                    getActiveRecommendationStub.returns([])
+                    const messageShown = new Promise((resolve) =>
+                        getTestWindow().onDidShowMessage((e) => {
+                            assert.strictEqual(e.message, noInlineSuggestionsMsg)
+                            resolve(true)
+                        })
+                    )
+                    await provider.provideInlineCompletionItems(
+                        mockDocument,
+                        mockPosition,
+                        { triggerKind: InlineCompletionTriggerKind.Invoke, selectedCompletionInfo: undefined },
+                        mockToken
+                    )
+                    await messageShown
+                })
+            describe.skip('debounce behavior', function () {
+                let clock: ReturnType<typeof installFakeClock>
+
+                beforeEach(function () {
+                    clock = installFakeClock()
+                })
+
+                after(function () {
+                    clock.uninstall()
+                })
+
+                it.skip('should only trigger once on rapid events', async () => {
+                    provider = new AmazonQInlineCompletionItemProvider(
+                        languageClient,
+                        recommendationService,
+                        mockSessionManager,
+                        inlineTutorialAnnotation,
+                        documentEventListener
+                    )
+                    const p1 = provider.provideInlineCompletionItems(mockDocument, mockPosition, mockContext, mockToken)
+                    const p2 = provider.provideInlineCompletionItems(mockDocument, mockPosition, mockContext, mockToken)
+                    const p3 = provider.provideInlineCompletionItems(
+                        mockDocument,
+                        new Position(1, 26),
+                        mockContext,
+                        mockToken
+                    )
+
+                    await clock.tickAsync(1000)
+
+                    // All promises should be the same object when debounced properly.
+                    assert.strictEqual(p1, p2)
+                    assert.strictEqual(p1, p3)
+                    await p1
+                    await p2
+                    const r3 = await p3
+
+                    // calls the function with the latest provided args.
+                    assert.deepStrictEqual((r3 as InlineCompletionItem[])[0].range?.end, new Position(1, 26))
+                })
+            })
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/amazonq/apps/inline/inlineTracker.test.ts b/packages/amazonq/test/unit/amazonq/apps/inline/inlineTracker.test.ts
new file mode 100644
index 00000000000..6b9490c72a5
--- /dev/null
+++ b/packages/amazonq/test/unit/amazonq/apps/inline/inlineTracker.test.ts
@@ -0,0 +1,299 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { LineSelection, LineTracker, AuthUtil } from 'aws-core-vscode/codewhisperer'
+import sinon from 'sinon'
+import { Disposable, TextEditor, Position, Range, Selection } from 'vscode'
+import { toTextEditor } from 'aws-core-vscode/test'
+import assert from 'assert'
+import { waitUntil } from 'aws-core-vscode/shared'
+
+describe('LineTracker class', function () {
+    let sut: LineTracker
+    let disposable: Disposable
+    let editor: TextEditor
+    let sandbox: sinon.SinonSandbox
+    let counts = {
+        editor: 0,
+        selection: 0,
+        content: 0,
+    }
+
+    beforeEach(async function () {
+        sut = new LineTracker()
+        sandbox = sinon.createSandbox()
+        counts = {
+            editor: 0,
+            selection: 0,
+            content: 0,
+        }
+        disposable = sut.onDidChangeActiveLines((e) => {
+            if (e.reason === 'content') {
+                counts.content++
+            } else if (e.reason === 'selection') {
+                counts.selection++
+            } else if (e.reason === 'editor') {
+                counts.editor++
+            }
+        })
+
+        sandbox.stub(AuthUtil.instance, 'isConnected').returns(true)
+        sandbox.stub(AuthUtil.instance, 'isConnectionExpired').returns(false)
+    })
+
+    afterEach(function () {
+        disposable.dispose()
+        sut.dispose()
+        sandbox.restore()
+    })
+
+    function assertEmptyCounts() {
+        assert.deepStrictEqual(counts, {
+            editor: 0,
+            selection: 0,
+            content: 0,
+        })
+    }
+
+    it('ready will emit onReady event', async function () {
+        let messageReceived = 0
+        disposable = sut.onReady((_) => {
+            messageReceived++
+        })
+
+        assert.strictEqual(sut.isReady, false)
+        sut.ready()
+
+        await waitUntil(
+            async () => {
+                if (messageReceived !== 0) {
+                    return
+                }
+            },
+            { interval: 1000 }
+        )
+
+        assert.strictEqual(sut.isReady, true)
+        assert.strictEqual(messageReceived, 1)
+    })
+
+    describe('includes', function () {
+        // util function to help set up LineTracker.selections
+        async function setEditorSelection(selections: LineSelection[]): Promise<TextEditor> {
+            const editor = await toTextEditor('\n\n\n\n\n\n\n\n\n\n', 'foo.py', undefined, {
+                preview: false,
+            })
+
+            const vscodeSelections = selections.map((s) => {
+                return new Selection(new Position(s.anchor, 0), new Position(s.active, 0))
+            })
+
+            await sut.onTextEditorSelectionChanged({
+                textEditor: editor,
+                selections: vscodeSelections,
+                kind: undefined,
+            })
+
+            assert.deepStrictEqual(sut.selections, selections)
+            return editor
+        }
+
+        it('exact match when array of selections are provided', async function () {
+            const selections = [
+                {
+                    anchor: 1,
+                    active: 1,
+                },
+                {
+                    anchor: 3,
+                    active: 3,
+                },
+            ]
+
+            editor = await setEditorSelection(selections)
+            assert.deepStrictEqual(sut.selections, selections)
+
+            let actual = sut.includes([
+                { active: 1, anchor: 1 },
+                { active: 3, anchor: 3 },
+            ])
+            assert.strictEqual(actual, true)
+
+            actual = sut.includes([
+                { active: 2, anchor: 2 },
+                { active: 4, anchor: 4 },
+            ])
+            assert.strictEqual(actual, false)
+
+            // both active && anchor have to be the same
+            actual = sut.includes([
+                { active: 1, anchor: 0 },
+                { active: 3, anchor: 0 },
+            ])
+            assert.strictEqual(actual, false)
+
+            // different length would simply return false
+            actual = sut.includes([
+                { active: 1, anchor: 1 },
+                { active: 3, anchor: 3 },
+                { active: 5, anchor: 5 },
+            ])
+            assert.strictEqual(actual, false)
+        })
+
+        it('match active line if line number and activeOnly option are provided', async function () {
+            const selections = [
+                {
+                    anchor: 1,
+                    active: 1,
+                },
+                {
+                    anchor: 3,
+                    active: 3,
+                },
+            ]
+
+            editor = await setEditorSelection(selections)
+            assert.deepStrictEqual(sut.selections, selections)
+
+            let actual = sut.includes(1, { activeOnly: true })
+            assert.strictEqual(actual, true)
+
+            actual = sut.includes(2, { activeOnly: true })
+            assert.strictEqual(actual, false)
+        })
+
+        it('range match if line number and activeOnly is set to false', async function () {
+            const selections = [
+                {
+                    anchor: 0,
+                    active: 2,
+                },
+                {
+                    anchor: 4,
+                    active: 6,
+                },
+            ]
+
+            editor = await setEditorSelection(selections)
+            assert.deepStrictEqual(sut.selections, selections)
+
+            for (const line of [0, 1, 2]) {
+                const actual = sut.includes(line, { activeOnly: false })
+                assert.strictEqual(actual, true)
+            }
+
+            for (const line of [4, 5, 6]) {
+                const actual = sut.includes(line, { activeOnly: false })
+                assert.strictEqual(actual, true)
+            }
+
+            let actual = sut.includes(3, { activeOnly: false })
+            assert.strictEqual(actual, false)
+
+            actual = sut.includes(7, { activeOnly: false })
+            assert.strictEqual(actual, false)
+        })
+    })
+
+    describe('onContentChanged', function () {
+        it('should fire lineChangedEvent and set current line selection', async function () {
+            editor = await toTextEditor('\n\n\n\n\n', 'foo.py', undefined, { preview: false })
+            editor.selection = new Selection(new Position(5, 0), new Position(5, 0))
+            assertEmptyCounts()
+
+            sut.onContentChanged({
+                document: editor.document,
+                contentChanges: [{ text: 'a', range: new Range(0, 0, 0, 0), rangeOffset: 0, rangeLength: 0 }],
+                reason: undefined,
+            })
+
+            assert.deepStrictEqual(counts, { ...counts, content: 1 })
+            assert.deepStrictEqual(sut.selections, [
+                {
+                    anchor: 5,
+                    active: 5,
+                },
+            ])
+        })
+    })
+
+    describe('onTextEditorSelectionChanged', function () {
+        it('should fire lineChangedEvent if selection changes and set current line selection', async function () {
+            editor = await toTextEditor('\n\n\n\n\n', 'foo.py', undefined, { preview: false })
+            editor.selection = new Selection(new Position(3, 0), new Position(3, 0))
+            assertEmptyCounts()
+
+            await sut.onTextEditorSelectionChanged({
+                textEditor: editor,
+                selections: [new Selection(new Position(3, 0), new Position(3, 0))],
+                kind: undefined,
+            })
+
+            assert.deepStrictEqual(counts, { ...counts, selection: 1 })
+            assert.deepStrictEqual(sut.selections, [
+                {
+                    anchor: 3,
+                    active: 3,
+                },
+            ])
+
+            // if selection is included in the existing selections, won't emit an event
+            await sut.onTextEditorSelectionChanged({
+                textEditor: editor,
+                selections: [new Selection(new Position(3, 0), new Position(3, 0))],
+                kind: undefined,
+            })
+
+            assert.deepStrictEqual(counts, { ...counts, selection: 1 })
+            assert.deepStrictEqual(sut.selections, [
+                {
+                    anchor: 3,
+                    active: 3,
+                },
+            ])
+        })
+
+        it('should not fire lineChangedEvent if uri scheme is debug || output', async function () {
+            // if the editor is not a text editor, won't emit an event and selection will be set to undefined
+            async function assertLineChanged(schema: string) {
+                const anotherEditor = await toTextEditor('', 'bar.log', undefined, { preview: false })
+                const uri = anotherEditor.document.uri
+                sandbox.stub(uri, 'scheme').get(() => schema)
+
+                await sut.onTextEditorSelectionChanged({
+                    textEditor: anotherEditor,
+                    selections: [new Selection(new Position(3, 0), new Position(3, 0))],
+                    kind: undefined,
+                })
+
+                assert.deepStrictEqual(counts, { ...counts })
+            }
+
+            await assertLineChanged('debug')
+            await assertLineChanged('output')
+        })
+    })
+
+    describe('onActiveTextEditorChanged', function () {
+        it('shoudl fire lineChangedEvent', async function () {
+            const selections: Selection[] = [new Selection(0, 0, 1, 1)]
+
+            editor = { selections: selections } as any
+
+            assertEmptyCounts()
+
+            await sut.onActiveTextEditorChanged(editor)
+
+            assert.deepStrictEqual(counts, { ...counts, editor: 1 })
+            assert.deepStrictEqual(sut.selections, [
+                {
+                    anchor: 0,
+                    active: 1,
+                },
+            ])
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/amazonq/apps/inline/recommendationService.test.ts b/packages/amazonq/test/unit/amazonq/apps/inline/recommendationService.test.ts
new file mode 100644
index 00000000000..c8473022118
--- /dev/null
+++ b/packages/amazonq/test/unit/amazonq/apps/inline/recommendationService.test.ts
@@ -0,0 +1,400 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import sinon from 'sinon'
+import { BaseLanguageClient } from 'vscode-languageclient'
+import { Position, CancellationToken, InlineCompletionItem, InlineCompletionTriggerKind } from 'vscode'
+import assert from 'assert'
+import { RecommendationService } from '../../../../../src/app/inline/recommendationService'
+import { SessionManager } from '../../../../../src/app/inline/sessionManager'
+import { createMockDocument } from 'aws-core-vscode/test'
+// Import CursorUpdateManager directly instead of the interface
+import { CursorUpdateManager } from '../../../../../src/app/inline/cursorUpdateManager'
+import { CodeWhispererStatusBarManager } from 'aws-core-vscode/codewhisperer'
+import { globals } from 'aws-core-vscode/shared'
+import { DocumentEventListener } from '../../../../../src/app/inline/documentEventListener'
+import { EditSuggestionState } from '../../../../../src/app/inline/editSuggestionState'
+
+const completionApi = 'aws/textDocument/inlineCompletionWithReferences'
+const editApi = 'aws/textDocument/editCompletion'
+
+describe('RecommendationService', () => {
+    let languageClient: BaseLanguageClient
+    let sendRequestStub: sinon.SinonStub
+    let sandbox: sinon.SinonSandbox
+    let sessionManager: SessionManager
+    let service: RecommendationService
+    let cursorUpdateManager: CursorUpdateManager
+    let statusBarStub: any
+    let clockStub: sinon.SinonFakeTimers
+    const mockDocument = createMockDocument()
+    const mockPosition = { line: 0, character: 0 } as Position
+    const mockContext = { triggerKind: InlineCompletionTriggerKind.Automatic, selectedCompletionInfo: undefined }
+    const mockToken = { isCancellationRequested: false } as CancellationToken
+    const mockDocumentEventListener = {
+        isLastEventDeletion: (filepath: string) => false,
+        getLastDocumentChangeEvent: (filepath: string) => undefined,
+    } as DocumentEventListener
+    const mockInlineCompletionItemOne = {
+        insertText: 'ItemOne',
+    } as InlineCompletionItem
+
+    const mockInlineCompletionItemTwo = {
+        insertText: 'ItemTwo',
+    } as InlineCompletionItem
+    const mockPartialResultToken = 'some-random-token'
+
+    beforeEach(async () => {
+        sandbox = sinon.createSandbox()
+
+        // Create a fake clock for testing time-based functionality
+        clockStub = sandbox.useFakeTimers({
+            now: 1000,
+            shouldAdvanceTime: true,
+        })
+
+        // Stub globals.clock
+        sandbox.stub(globals, 'clock').value({
+            Date: {
+                now: () => clockStub.now,
+            },
+            setTimeout: clockStub.setTimeout.bind(clockStub),
+            clearTimeout: clockStub.clearTimeout.bind(clockStub),
+            setInterval: clockStub.setInterval.bind(clockStub),
+            clearInterval: clockStub.clearInterval.bind(clockStub),
+        })
+
+        sendRequestStub = sandbox.stub()
+
+        languageClient = {
+            sendRequest: sendRequestStub,
+            warn: sandbox.stub(),
+        } as unknown as BaseLanguageClient
+
+        sessionManager = new SessionManager()
+
+        // Create cursor update manager mock
+        cursorUpdateManager = {
+            recordCompletionRequest: sandbox.stub(),
+            logger: { debug: sandbox.stub(), warn: sandbox.stub(), error: sandbox.stub() },
+            updateIntervalMs: 250,
+            isActive: false,
+            lastRequestTime: 0,
+            dispose: sandbox.stub(),
+            start: sandbox.stub(),
+            stop: sandbox.stub(),
+            updatePosition: sandbox.stub(),
+        } as unknown as CursorUpdateManager
+
+        // Create status bar stub
+        statusBarStub = {
+            setLoading: sandbox.stub().resolves(),
+            refreshStatusBar: sandbox.stub().resolves(),
+        }
+
+        sandbox.stub(CodeWhispererStatusBarManager, 'instance').get(() => statusBarStub)
+
+        // Create the service without cursor update recorder initially
+        service = new RecommendationService(sessionManager)
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+        sessionManager.clear()
+    })
+
+    describe('constructor', () => {
+        it('should initialize with optional cursorUpdateRecorder', () => {
+            const serviceWithRecorder = new RecommendationService(sessionManager, cursorUpdateManager)
+
+            // Verify the service was created with the recorder
+            assert.strictEqual(serviceWithRecorder['cursorUpdateRecorder'], cursorUpdateManager)
+        })
+    })
+
+    describe('setCursorUpdateRecorder', () => {
+        it('should set the cursor update recorder', () => {
+            // Initially the recorder should be undefined
+            assert.strictEqual(service['cursorUpdateRecorder'], undefined)
+
+            // Set the recorder
+            service.setCursorUpdateRecorder(cursorUpdateManager)
+
+            // Verify it was set correctly
+            assert.strictEqual(service['cursorUpdateRecorder'], cursorUpdateManager)
+        })
+    })
+
+    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],
+                partialResultToken: undefined,
+            }
+
+            sendRequestStub.resolves(mockFirstResult)
+
+            await service.getAllRecommendations(
+                languageClient,
+                mockDocument,
+                mockPosition,
+                mockContext,
+                mockToken,
+                true,
+                mockDocumentEventListener
+            )
+
+            // Verify sendRequest was called with correct parameters
+            const cs = sendRequestStub.getCalls()
+            const completionCalls = cs.filter((c) => c.firstArg === completionApi)
+            const editCalls = cs.filter((c) => c.firstArg === editApi)
+            assert.strictEqual(cs.length, 2)
+            assert.strictEqual(completionCalls.length, 1)
+            assert.strictEqual(editCalls.length, 1)
+
+            const requestArgs = completionCalls[0].args[1]
+            assert.deepStrictEqual(requestArgs, {
+                textDocument: {
+                    uri: 'file:///test.py',
+                },
+                position: mockPosition,
+                context: mockContext,
+                documentChangeParams: undefined,
+                openTabFilepaths: [],
+            })
+
+            // Verify session management
+            const items = sessionManager.getActiveRecommendation()
+            assert.deepStrictEqual(items, [mockInlineCompletionItemOne])
+        })
+
+        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],
+                partialResultToken: mockPartialResultToken,
+            }
+
+            const mockSecondResult = {
+                sessionId: 'test-session',
+                items: [mockInlineCompletionItemTwo],
+                partialResultToken: undefined,
+            }
+
+            sendRequestStub.onFirstCall().resolves(mockFirstResult)
+            sendRequestStub.onSecondCall().resolves(mockSecondResult)
+
+            await service.getAllRecommendations(
+                languageClient,
+                mockDocument,
+                mockPosition,
+                mockContext,
+                mockToken,
+                true,
+                mockDocumentEventListener
+            )
+
+            // Verify sendRequest was called with correct parameters
+            const cs = sendRequestStub.getCalls()
+            const completionCalls = cs.filter((c) => c.firstArg === completionApi)
+            const editCalls = cs.filter((c) => c.firstArg === editApi)
+            assert.strictEqual(cs.length, 3)
+            assert.strictEqual(completionCalls.length, 2)
+            assert.strictEqual(editCalls.length, 1)
+
+            const firstRequestArgs = completionCalls[0].args[1]
+            const expectedRequestArgs = {
+                textDocument: {
+                    uri: 'file:///test.py',
+                },
+                position: mockPosition,
+                context: mockContext,
+                documentChangeParams: undefined,
+                openTabFilepaths: [],
+            }
+            const secondRequestArgs = completionCalls[1].args[1]
+            assert.deepStrictEqual(firstRequestArgs, expectedRequestArgs)
+            assert.deepStrictEqual(secondRequestArgs, {
+                ...expectedRequestArgs,
+                partialResultToken: mockPartialResultToken,
+            })
+        })
+
+        it('should record completion request when cursorUpdateRecorder is set', async () => {
+            // Set the cursor update recorder
+            service.setCursorUpdateRecorder(cursorUpdateManager)
+
+            const mockFirstResult = {
+                sessionId: 'test-session',
+                items: [mockInlineCompletionItemOne],
+                partialResultToken: undefined,
+            }
+
+            sendRequestStub.resolves(mockFirstResult)
+
+            await service.getAllRecommendations(
+                languageClient,
+                mockDocument,
+                mockPosition,
+                mockContext,
+                mockToken,
+                true,
+                mockDocumentEventListener
+            )
+
+            // Verify recordCompletionRequest was called
+            // eslint-disable-next-line @typescript-eslint/unbound-method
+            sinon.assert.calledOnce(cursorUpdateManager.recordCompletionRequest as sinon.SinonStub)
+        })
+
+        it('should not show UI indicators when showUi option is false', async () => {
+            // Call with showUi: false option
+            await service.getAllRecommendations(
+                languageClient,
+                mockDocument,
+                mockPosition,
+                mockContext,
+                mockToken,
+                true,
+                mockDocumentEventListener,
+                {
+                    showUi: false,
+                    emitTelemetry: true,
+                }
+            )
+
+            // Verify UI methods were not called
+            sinon.assert.notCalled(statusBarStub.setLoading)
+            sinon.assert.notCalled(statusBarStub.refreshStatusBar)
+        })
+
+        it('should show UI indicators when showUi option is true (default)', async () => {
+            // Call with default options (showUi: true)
+            await service.getAllRecommendations(
+                languageClient,
+                mockDocument,
+                mockPosition,
+                mockContext,
+                mockToken,
+                true,
+                mockDocumentEventListener
+            )
+
+            // Verify UI methods were called
+            sinon.assert.calledOnce(statusBarStub.setLoading)
+            sinon.assert.calledOnce(statusBarStub.refreshStatusBar)
+        })
+
+        it('should handle errors gracefully', async () => {
+            // Set the cursor update recorder
+            service.setCursorUpdateRecorder(cursorUpdateManager)
+
+            // Make the request throw an error
+            const testError = new Error('Test error')
+            sendRequestStub.rejects(testError)
+
+            // Set up UI options
+            const options = { showUi: true }
+
+            // Temporarily replace console.error with a no-op function to prevent test failure
+            const originalConsoleError = console.error
+            console.error = () => {}
+
+            try {
+                // Call the method and expect it to handle the error
+                const result = await service.getAllRecommendations(
+                    languageClient,
+                    mockDocument,
+                    mockPosition,
+                    mockContext,
+                    mockToken,
+                    true,
+                    mockDocumentEventListener,
+                    options
+                )
+
+                // Assert that error handling was done correctly
+                assert.deepStrictEqual(result, [])
+
+                // Verify the UI indicators were hidden even when an error occurs
+                sinon.assert.calledOnce(statusBarStub.refreshStatusBar)
+            } finally {
+                // Restore the original console.error function
+                console.error = originalConsoleError
+            }
+        })
+
+        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)
+
+            const mockResult = {
+                sessionId: 'test-session',
+                items: [mockInlineCompletionItemOne],
+                partialResultToken: undefined,
+            }
+
+            sendRequestStub.resolves(mockResult)
+
+            await service.getAllRecommendations(
+                languageClient,
+                mockDocument,
+                mockPosition,
+                mockContext,
+                mockToken,
+                true,
+                mockDocumentEventListener
+            )
+
+            // Verify sendRequest was called only for edit API, not completion API
+            const cs = sendRequestStub.getCalls()
+            const completionCalls = cs.filter((c) => c.firstArg === completionApi)
+            const editCalls = cs.filter((c) => c.firstArg === editApi)
+
+            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],
+                partialResultToken: undefined,
+            }
+
+            sendRequestStub.resolves(mockResult)
+
+            await service.getAllRecommendations(
+                languageClient,
+                mockDocument,
+                mockPosition,
+                mockContext,
+                mockToken,
+                true,
+                mockDocumentEventListener
+            )
+
+            // Verify sendRequest was called for both APIs
+            const cs = sendRequestStub.getCalls()
+            const completionCalls = cs.filter((c) => c.firstArg === completionApi)
+            const editCalls = cs.filter((c) => c.firstArg === editApi)
+
+            assert.strictEqual(cs.length, 2) // Both calls
+            assert.strictEqual(completionCalls.length, 1) // One completion call
+            assert.strictEqual(editCalls.length, 1) // One edit call
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/amazonq/auth/controller.test.ts b/packages/amazonq/test/unit/amazonq/auth/controller.test.ts
new file mode 100644
index 00000000000..e18032d9424
--- /dev/null
+++ b/packages/amazonq/test/unit/amazonq/auth/controller.test.ts
@@ -0,0 +1,36 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import sinon from 'sinon'
+import { AuthController } from 'aws-core-vscode/amazonq'
+import { reconnect, amazonQChatSource } from 'aws-core-vscode/codewhisperer'
+import assert from 'assert'
+import { placeholder } from 'aws-core-vscode/shared'
+
+describe('AuthController', () => {
+    let authController: AuthController
+    let reconnectStub: any
+
+    beforeEach(() => {
+        authController = new AuthController()
+        reconnectStub = sinon.stub(reconnect, 'execute')
+    })
+
+    afterEach(() => {
+        sinon.restore()
+    })
+
+    it('should call reconnect for "missing_scopes"', () => {
+        authController.handleAuth('missing_scopes')
+
+        assert.strictEqual(reconnectStub.calledWith(placeholder, amazonQChatSource), true)
+    })
+
+    it('should call reconnect for "re-auth"', () => {
+        authController.handleAuth('re-auth')
+
+        assert.strictEqual(reconnectStub.calledWith(placeholder, amazonQChatSource), true)
+    })
+})
diff --git a/packages/amazonq/test/unit/amazonq/lsp/auth.test.ts b/packages/amazonq/test/unit/amazonq/lsp/auth.test.ts
new file mode 100644
index 00000000000..835a19b65f1
--- /dev/null
+++ b/packages/amazonq/test/unit/amazonq/lsp/auth.test.ts
@@ -0,0 +1,33 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import { AmazonQLspAuth } from '../../../../src/lsp/auth'
+import { BaseLanguageClient } from 'vscode-languageclient'
+
+describe('AmazonQLspAuth', function () {
+    describe('updateBearerToken', function () {
+        it('makes request to LSP when token changes', async function () {
+            // Note: this token will be encrypted
+            let lastSentToken = {}
+            const auth = new AmazonQLspAuth({
+                sendRequest: (_method: string, param: any) => {
+                    lastSentToken = param
+                },
+                info: (_message: string, _data: any) => {},
+            } as BaseLanguageClient)
+
+            await auth.updateBearerToken('firstToken')
+            assert.notDeepStrictEqual(lastSentToken, {})
+            const encryptedFirstToken = lastSentToken
+
+            await auth.updateBearerToken('secondToken')
+            assert.notDeepStrictEqual(lastSentToken, encryptedFirstToken)
+            const encryptedSecondToken = lastSentToken
+
+            await auth.updateBearerToken('secondToken')
+            assert.deepStrictEqual(lastSentToken, encryptedSecondToken)
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/amazonq/lsp/chat/error.test.ts b/packages/amazonq/test/unit/amazonq/lsp/chat/error.test.ts
new file mode 100644
index 00000000000..80bfe657cc1
--- /dev/null
+++ b/packages/amazonq/test/unit/amazonq/lsp/chat/error.test.ts
@@ -0,0 +1,15 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { isValidResponseError } from '../../../../../src/lsp/chat/error'
+import { ResponseError } from '@aws/language-server-runtimes/protocol'
+import * as assert from 'assert'
+
+describe('isValidResponseError', async function () {
+    it('requires the data field', function () {
+        assert.ok(isValidResponseError(new ResponseError(0, 'this one has data', {})))
+        assert.ok(!isValidResponseError(new ResponseError(0, 'this one does not have data')))
+    })
+})
diff --git a/packages/amazonq/test/unit/amazonq/lsp/chat/messages.test.ts b/packages/amazonq/test/unit/amazonq/lsp/chat/messages.test.ts
new file mode 100644
index 00000000000..4c412a17676
--- /dev/null
+++ b/packages/amazonq/test/unit/amazonq/lsp/chat/messages.test.ts
@@ -0,0 +1,163 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+import { BaseLanguageClient } from 'vscode-languageclient'
+import { AuthUtil } from 'aws-core-vscode/codewhisperer'
+import { registerMessageListeners } from '../../../../../src/lsp/chat/messages'
+import { AmazonQChatViewProvider } from '../../../../../src/lsp/chat/webviewProvider'
+import { secondaryAuth, authConnection, AuthFollowUpType } from 'aws-core-vscode/amazonq'
+import { messages } from 'aws-core-vscode/shared'
+
+describe('registerMessageListeners', () => {
+    let languageClient: BaseLanguageClient
+    let provider: AmazonQChatViewProvider
+    let sandbox: sinon.SinonSandbox
+    let messageHandler: (message: any) => void | Promise<void>
+    let errorStub: sinon.SinonStub
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+        errorStub = sandbox.stub()
+
+        languageClient = {
+            info: sandbox.stub(),
+            error: errorStub,
+            sendNotification: sandbox.stub(),
+            onRequest: sandbox.stub(),
+            onNotification: sandbox.stub(),
+        } as unknown as BaseLanguageClient
+
+        provider = {
+            webview: {
+                onDidReceiveMessage: (callback: (message: any) => void | Promise<void>) => {
+                    messageHandler = callback
+                    return {
+                        dispose: (): void => {},
+                    }
+                },
+            },
+        } as any
+
+        registerMessageListeners(languageClient, provider, Buffer.from('test-key'))
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+
+    describe('AUTH_FOLLOW_UP_CLICKED', () => {
+        let mockAuthUtil: AuthUtil
+        let deleteConnectionStub: sinon.SinonStub
+        let reauthenticateStub: sinon.SinonStub
+
+        const authFollowUpClickedCommand = 'authFollowUpClicked'
+
+        interface TestCase {
+            authType: AuthFollowUpType
+            stubToReject: sinon.SinonStub
+            errorMessage: string
+        }
+
+        const testFailure = async (testCase: TestCase) => {
+            testCase.stubToReject.rejects(new Error())
+
+            await messageHandler({
+                command: authFollowUpClickedCommand,
+                params: {
+                    authFollowupType: testCase.authType,
+                },
+            })
+
+            sinon.assert.calledOnce(errorStub)
+            sinon.assert.calledWith(errorStub, sinon.match(testCase.errorMessage))
+        }
+
+        beforeEach(() => {
+            deleteConnectionStub = sandbox.stub().resolves()
+            reauthenticateStub = sandbox.stub().resolves()
+
+            mockAuthUtil = {
+                reauthenticate: reauthenticateStub,
+                secondaryAuth: {
+                    deleteConnection: deleteConnectionStub,
+                } as unknown as secondaryAuth.SecondaryAuth<authConnection.Connection>,
+            } as unknown as AuthUtil
+
+            sandbox.replaceGetter(AuthUtil, 'instance', () => mockAuthUtil)
+        })
+
+        it('handles re-authentication request', async () => {
+            await messageHandler({
+                command: authFollowUpClickedCommand,
+                params: {
+                    authFollowupType: 're-auth',
+                },
+            })
+
+            sinon.assert.calledOnce(reauthenticateStub)
+            sinon.assert.notCalled(deleteConnectionStub)
+        })
+
+        it('handles full authentication request', async () => {
+            await messageHandler({
+                command: authFollowUpClickedCommand,
+                params: {
+                    authFollowupType: 'full-auth',
+                },
+            })
+
+            sinon.assert.notCalled(reauthenticateStub)
+            sinon.assert.calledOnce(deleteConnectionStub)
+        })
+
+        it('logs error if re-authentication fails', async () => {
+            await testFailure({
+                authType: 're-auth',
+                stubToReject: reauthenticateStub,
+                errorMessage: 'Failed to re-authenticate',
+            })
+        })
+
+        it('logs error if full authentication fails', async () => {
+            await testFailure({
+                authType: 'full-auth',
+                stubToReject: deleteConnectionStub,
+                errorMessage: 'Failed to authenticate',
+            })
+        })
+    })
+
+    describe('COPY_TO_CLIPBOARD', () => {
+        let copyToClipboardStub: sinon.SinonStub
+        const testCode = 'test'
+        const copyMessage = {
+            command: 'copyToClipboard',
+            params: {
+                code: testCode,
+            },
+        }
+
+        beforeEach(() => {
+            copyToClipboardStub = sandbox.stub().resolves()
+            sandbox.stub(messages, 'copyToClipboard').get(() => copyToClipboardStub)
+        })
+
+        it('successfully copies code to clipboard', async () => {
+            await messageHandler(copyMessage)
+
+            sinon.assert.calledWith(copyToClipboardStub, testCode)
+        })
+
+        it('handles clipboard copy failure', async () => {
+            const errorMessage = 'Failed to copy'
+            copyToClipboardStub.rejects(new Error(errorMessage))
+
+            await messageHandler(copyMessage)
+
+            sinon.assert.calledWith(errorStub, `[VSCode Client] Failed to copy to clipboard: ${errorMessage}`)
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/amazonq/lsp/client.test.ts b/packages/amazonq/test/unit/amazonq/lsp/client.test.ts
new file mode 100644
index 00000000000..8f11c8eaa35
--- /dev/null
+++ b/packages/amazonq/test/unit/amazonq/lsp/client.test.ts
@@ -0,0 +1,268 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import { BaseLanguageClient } from 'vscode-languageclient'
+import { AuthUtil } from 'aws-core-vscode/codewhisperer'
+import { AmazonQLspAuth } from '../../../../src/lsp/auth'
+
+// These tests verify the behavior of the authentication functions
+// Since the actual functions are module-level and use real dependencies,
+// we test the expected behavior through mock implementations
+
+describe('Language Server Client Authentication', function () {
+    let sandbox: sinon.SinonSandbox
+    let mockClient: any
+    let mockAuth: any
+    let authUtilStub: sinon.SinonStub
+    let loggerStub: any
+    let getLoggerStub: sinon.SinonStub
+    let pushConfigUpdateStub: sinon.SinonStub
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+
+        // Mock LanguageClient
+        mockClient = {
+            sendRequest: sandbox.stub().resolves(),
+            sendNotification: sandbox.stub(),
+            onDidChangeState: sandbox.stub(),
+        }
+
+        // Mock AmazonQLspAuth
+        mockAuth = {
+            refreshConnection: sandbox.stub().resolves(),
+        }
+
+        // Mock AuthUtil
+        authUtilStub = sandbox.stub(AuthUtil, 'instance').get(() => ({
+            isConnectionValid: sandbox.stub().returns(true),
+            regionProfileManager: {
+                activeRegionProfile: { arn: 'test-profile-arn' },
+            },
+            auth: {
+                getConnectionState: sandbox.stub().returns('valid'),
+                activeConnection: { id: 'test-connection' },
+            },
+        }))
+
+        // Create logger stub
+        loggerStub = {
+            info: sandbox.stub(),
+            debug: sandbox.stub(),
+            warn: sandbox.stub(),
+            error: sandbox.stub(),
+        }
+
+        // Clear all relevant module caches
+        const sharedModuleId = require.resolve('aws-core-vscode/shared')
+        const configModuleId = require.resolve('../../../../src/lsp/config')
+        delete require.cache[sharedModuleId]
+        delete require.cache[configModuleId]
+
+        // jscpd:ignore-start
+        // Create getLogger stub
+        getLoggerStub = sandbox.stub().returns(loggerStub)
+
+        // Create a mock shared module with stubbed getLogger
+        const mockSharedModule = {
+            getLogger: getLoggerStub,
+        }
+
+        // Override the require cache with our mock
+        require.cache[sharedModuleId] = {
+            id: sharedModuleId,
+            filename: sharedModuleId,
+            loaded: true,
+            parent: undefined,
+            children: [],
+            exports: mockSharedModule,
+            paths: [],
+        } as any
+        // jscpd:ignore-end
+
+        // Mock pushConfigUpdate
+        pushConfigUpdateStub = sandbox.stub().resolves()
+        const mockConfigModule = {
+            pushConfigUpdate: pushConfigUpdateStub,
+        }
+
+        require.cache[configModuleId] = {
+            id: configModuleId,
+            filename: configModuleId,
+            loaded: true,
+            parent: undefined,
+            children: [],
+            exports: mockConfigModule,
+            paths: [],
+        } as any
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+
+    describe('initializeLanguageServerConfiguration behavior', function () {
+        it('should initialize configuration when connection is valid', async function () {
+            // Test the expected behavior of the function
+            const mockInitializeFunction = async (client: BaseLanguageClient, context: string) => {
+                const { getLogger } = require('aws-core-vscode/shared')
+                const { pushConfigUpdate } = require('../../../../src/lsp/config')
+                const logger = getLogger('amazonqLsp')
+
+                if (AuthUtil.instance.isConnectionValid()) {
+                    logger.info(`[${context}] Initializing language server configuration`)
+
+                    // Send profile configuration
+                    logger.debug(`[${context}] Sending profile configuration to language server`)
+                    await pushConfigUpdate(client, {
+                        type: 'profile',
+                        profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,
+                    })
+                    logger.debug(`[${context}] Profile configuration sent successfully`)
+
+                    // Send customization configuration
+                    logger.debug(`[${context}] Sending customization configuration to language server`)
+                    await pushConfigUpdate(client, {
+                        type: 'customization',
+                        customization: 'test-customization',
+                    })
+                    logger.debug(`[${context}] Customization configuration sent successfully`)
+
+                    logger.info(`[${context}] Language server configuration completed successfully`)
+                } else {
+                    logger.warn(`[${context}] Connection invalid, skipping configuration`)
+                }
+            }
+
+            await mockInitializeFunction(mockClient as any, 'startup')
+
+            // Verify logging
+            assert(loggerStub.info.calledWith('[startup] Initializing language server configuration'))
+            assert(loggerStub.debug.calledWith('[startup] Sending profile configuration to language server'))
+            assert(loggerStub.debug.calledWith('[startup] Profile configuration sent successfully'))
+            assert(loggerStub.debug.calledWith('[startup] Sending customization configuration to language server'))
+            assert(loggerStub.debug.calledWith('[startup] Customization configuration sent successfully'))
+            assert(loggerStub.info.calledWith('[startup] Language server configuration completed successfully'))
+
+            // Verify pushConfigUpdate was called twice
+            assert.strictEqual(pushConfigUpdateStub.callCount, 2)
+
+            // Verify profile configuration
+            assert(
+                pushConfigUpdateStub.calledWith(mockClient, {
+                    type: 'profile',
+                    profileArn: 'test-profile-arn',
+                })
+            )
+
+            // Verify customization configuration
+            assert(
+                pushConfigUpdateStub.calledWith(mockClient, {
+                    type: 'customization',
+                    customization: 'test-customization',
+                })
+            )
+        })
+
+        it('should log warning when connection is invalid', async function () {
+            // Mock invalid connection
+            authUtilStub.get(() => ({
+                isConnectionValid: sandbox.stub().returns(false),
+                auth: {
+                    getConnectionState: sandbox.stub().returns('invalid'),
+                    activeConnection: { id: 'test-connection' },
+                },
+            }))
+
+            const mockInitializeFunction = async (client: BaseLanguageClient, context: string) => {
+                const { getLogger } = require('aws-core-vscode/shared')
+                const logger = getLogger('amazonqLsp')
+
+                // jscpd:ignore-start
+                if (AuthUtil.instance.isConnectionValid()) {
+                    // Should not reach here
+                } else {
+                    logger.warn(
+                        `[${context}] Connection invalid, skipping language server configuration - this will cause authentication failures`
+                    )
+                    const activeConnection = AuthUtil.instance.auth.activeConnection
+                    const connectionState = activeConnection
+                        ? AuthUtil.instance.auth.getConnectionState(activeConnection)
+                        : 'no-connection'
+                    logger.warn(`[${context}] Connection state: ${connectionState}`)
+                    // jscpd:ignore-end
+                }
+            }
+
+            await mockInitializeFunction(mockClient as any, 'crash-recovery')
+
+            // Verify warning logs
+            assert(
+                loggerStub.warn.calledWith(
+                    '[crash-recovery] Connection invalid, skipping language server configuration - this will cause authentication failures'
+                )
+            )
+            assert(loggerStub.warn.calledWith('[crash-recovery] Connection state: invalid'))
+
+            // Verify pushConfigUpdate was not called
+            assert.strictEqual(pushConfigUpdateStub.callCount, 0)
+        })
+    })
+
+    describe('crash recovery handler behavior', function () {
+        it('should reinitialize authentication after crash', async function () {
+            const mockCrashHandler = async (client: BaseLanguageClient, auth: AmazonQLspAuth) => {
+                const { getLogger } = require('aws-core-vscode/shared')
+                const { pushConfigUpdate } = require('../../../../src/lsp/config')
+                const logger = getLogger('amazonqLsp')
+
+                logger.info('[crash-recovery] Language server crash detected, reinitializing authentication')
+
+                try {
+                    logger.debug('[crash-recovery] Refreshing connection and sending bearer token')
+                    await auth.refreshConnection(true)
+                    logger.debug('[crash-recovery] Bearer token sent successfully')
+
+                    // Mock the configuration initialization
+                    if (AuthUtil.instance.isConnectionValid()) {
+                        await pushConfigUpdate(client, {
+                            type: 'profile',
+                            profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,
+                        })
+                    }
+
+                    logger.info('[crash-recovery] Authentication reinitialized successfully')
+                } catch (error) {
+                    logger.error(`[crash-recovery] Failed to reinitialize after crash: ${error}`)
+                }
+            }
+
+            await mockCrashHandler(mockClient as any, mockAuth as any)
+
+            // Verify crash recovery logging
+            assert(
+                loggerStub.info.calledWith(
+                    '[crash-recovery] Language server crash detected, reinitializing authentication'
+                )
+            )
+            assert(loggerStub.debug.calledWith('[crash-recovery] Refreshing connection and sending bearer token'))
+            assert(loggerStub.debug.calledWith('[crash-recovery] Bearer token sent successfully'))
+            assert(loggerStub.info.calledWith('[crash-recovery] Authentication reinitialized successfully'))
+
+            // Verify auth.refreshConnection was called
+            assert(mockAuth.refreshConnection.calledWith(true))
+
+            // Verify profile configuration was sent
+            assert(
+                pushConfigUpdateStub.calledWith(mockClient, {
+                    type: 'profile',
+                    profileArn: 'test-profile-arn',
+                })
+            )
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/amazonq/lsp/config.test.ts b/packages/amazonq/test/unit/amazonq/lsp/config.test.ts
new file mode 100644
index 00000000000..c31e873e181
--- /dev/null
+++ b/packages/amazonq/test/unit/amazonq/lsp/config.test.ts
@@ -0,0 +1,227 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { DevSettings } from 'aws-core-vscode/shared'
+import sinon from 'sinon'
+import { defaultAmazonQLspConfig, ExtendedAmazonQLSPConfig, getAmazonQLspConfig } from '../../../../src/lsp/config'
+
+describe('getAmazonQLspConfig', () => {
+    let sandbox: sinon.SinonSandbox
+    let serviceConfigStub: sinon.SinonStub
+    const settingConfig: ExtendedAmazonQLSPConfig = {
+        manifestUrl: 'https://custom.url/manifest.json',
+        supportedVersions: '4.0.0',
+        id: 'AmazonQSetting',
+        suppressPromptPrefix: getAmazonQLspConfig().suppressPromptPrefix,
+        path: '/custom/path',
+        ui: '/chat/client/location',
+    }
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+
+        serviceConfigStub = sandbox.stub()
+        sandbox.stub(DevSettings, 'instance').get(() => ({
+            getServiceConfig: serviceConfigStub,
+        }))
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+        resetEnv()
+    })
+
+    it('uses default config', () => {
+        serviceConfigStub.returns({})
+        assert.deepStrictEqual(getAmazonQLspConfig(), defaultAmazonQLspConfig)
+    })
+
+    it('overrides path', () => {
+        const path = '/custom/path/to/lsp'
+        serviceConfigStub.returns({ path })
+
+        assert.deepStrictEqual(getAmazonQLspConfig(), {
+            ...defaultAmazonQLspConfig,
+            path,
+        })
+    })
+
+    it('overrides default settings', () => {
+        serviceConfigStub.returns(settingConfig)
+
+        assert.deepStrictEqual(getAmazonQLspConfig(), settingConfig)
+    })
+
+    it('environment variable takes precedence over settings', () => {
+        setEnv(settingConfig)
+        serviceConfigStub.returns({})
+        assert.deepStrictEqual(getAmazonQLspConfig(), settingConfig)
+    })
+
+    function setEnv(envConfig: ExtendedAmazonQLSPConfig) {
+        process.env.__AMAZONQLSP_MANIFEST_URL = envConfig.manifestUrl
+        process.env.__AMAZONQLSP_SUPPORTED_VERSIONS = envConfig.supportedVersions
+        process.env.__AMAZONQLSP_ID = envConfig.id
+        process.env.__AMAZONQLSP_PATH = envConfig.path
+        process.env.__AMAZONQLSP_UI = envConfig.ui
+    }
+
+    function resetEnv() {
+        delete process.env.__AMAZONQLSP_MANIFEST_URL
+        delete process.env.__AMAZONQLSP_SUPPORTED_VERSIONS
+        delete process.env.__AMAZONQLSP_ID
+        delete process.env.__AMAZONQLSP_PATH
+        delete process.env.__AMAZONQLSP_UI
+    }
+})
+
+describe('pushConfigUpdate', () => {
+    let sandbox: sinon.SinonSandbox
+    let mockClient: any
+    let loggerStub: any
+    let getLoggerStub: sinon.SinonStub
+    let pushConfigUpdate: any
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+
+        // Mock LanguageClient
+        mockClient = {
+            sendRequest: sandbox.stub().resolves(),
+            sendNotification: sandbox.stub(),
+        }
+
+        // Create logger stub
+        loggerStub = {
+            debug: sandbox.stub(),
+        }
+
+        // Clear all relevant module caches
+        const configModuleId = require.resolve('../../../../src/lsp/config')
+        const sharedModuleId = require.resolve('aws-core-vscode/shared')
+        delete require.cache[configModuleId]
+        delete require.cache[sharedModuleId]
+
+        // jscpd:ignore-start
+        // Create getLogger stub and store reference for test verification
+        getLoggerStub = sandbox.stub().returns(loggerStub)
+
+        // Create a mock shared module with stubbed getLogger
+        const mockSharedModule = {
+            getLogger: getLoggerStub,
+        }
+
+        // Override the require cache with our mock
+        require.cache[sharedModuleId] = {
+            id: sharedModuleId,
+            filename: sharedModuleId,
+            loaded: true,
+            parent: undefined,
+            children: [],
+            exports: mockSharedModule,
+            paths: [],
+        } as any
+
+        // Now require the module - it should use our mocked getLogger
+        // jscpd:ignore-end
+        const configModule = require('../../../../src/lsp/config')
+        pushConfigUpdate = configModule.pushConfigUpdate
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+
+    it('should send profile configuration with logging', async () => {
+        const config = {
+            type: 'profile' as const,
+            profileArn: 'test-profile-arn',
+        }
+
+        await pushConfigUpdate(mockClient, config)
+
+        // Verify logging
+        assert(loggerStub.debug.calledWith('Pushing profile configuration: test-profile-arn'))
+        assert(loggerStub.debug.calledWith('Profile configuration pushed successfully'))
+
+        // Verify client call
+        assert(mockClient.sendRequest.calledOnce)
+        assert(
+            mockClient.sendRequest.calledWith(sinon.match.string, {
+                section: 'aws.q',
+                settings: { profileArn: 'test-profile-arn' },
+            })
+        )
+    })
+
+    it('should send customization configuration with logging', async () => {
+        const config = {
+            type: 'customization' as const,
+            customization: 'test-customization-arn',
+        }
+
+        await pushConfigUpdate(mockClient, config)
+
+        // Verify logging
+        assert(loggerStub.debug.calledWith('Pushing customization configuration: test-customization-arn'))
+        assert(loggerStub.debug.calledWith('Customization configuration pushed successfully'))
+
+        // Verify client call
+        assert(mockClient.sendNotification.calledOnce)
+        assert(
+            mockClient.sendNotification.calledWith(sinon.match.string, {
+                section: 'aws.q',
+                settings: { customization: 'test-customization-arn' },
+            })
+        )
+    })
+
+    it('should handle undefined profile ARN', async () => {
+        const config = {
+            type: 'profile' as const,
+            profileArn: undefined,
+        }
+
+        await pushConfigUpdate(mockClient, config)
+
+        // Verify logging with undefined
+        assert(loggerStub.debug.calledWith('Pushing profile configuration: undefined'))
+        assert(loggerStub.debug.calledWith('Profile configuration pushed successfully'))
+    })
+
+    it('should handle undefined customization ARN', async () => {
+        const config = {
+            type: 'customization' as const,
+            customization: undefined,
+        }
+
+        await pushConfigUpdate(mockClient, config)
+
+        // Verify logging with undefined
+        assert(loggerStub.debug.calledWith('Pushing customization configuration: undefined'))
+        assert(loggerStub.debug.calledWith('Customization configuration pushed successfully'))
+    })
+
+    it('should send logLevel configuration with logging', async () => {
+        const config = {
+            type: 'logLevel' as const,
+        }
+
+        await pushConfigUpdate(mockClient, config)
+
+        // Verify logging
+        assert(loggerStub.debug.calledWith('Pushing log level configuration'))
+        assert(loggerStub.debug.calledWith('Log level configuration pushed successfully'))
+
+        // Verify client call
+        assert(mockClient.sendNotification.calledOnce)
+        assert(
+            mockClient.sendNotification.calledWith(sinon.match.string, {
+                section: 'aws.logLevel',
+            })
+        )
+    })
+})
diff --git a/packages/amazonq/test/unit/amazonq/lsp/encryption.test.ts b/packages/amazonq/test/unit/amazonq/lsp/encryption.test.ts
new file mode 100644
index 00000000000..06a901edde6
--- /dev/null
+++ b/packages/amazonq/test/unit/amazonq/lsp/encryption.test.ts
@@ -0,0 +1,27 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as assert from 'assert'
+import { decryptResponse, encryptRequest } from '../../../../src/lsp/encryption'
+import { encryptionKey } from '../../../../src/lsp/auth'
+
+describe('LSP encryption', function () {
+    it('encrypt and decrypt invert eachother with same key', async function () {
+        const key = encryptionKey
+        const request = {
+            id: 0,
+            name: 'my Request',
+            isRealRequest: false,
+            metadata: {
+                tags: ['tag1', 'tag2'],
+            },
+        }
+        const encryptedPayload = await encryptRequest<typeof request>(request, key)
+        const message = (encryptedPayload as { message: string }).message
+        const decrypted = await decryptResponse<typeof request>(message, key)
+
+        assert.deepStrictEqual(decrypted, request)
+    })
+})
diff --git a/packages/amazonq/test/unit/amazonq/onboardingPage/walkthrough.test.ts b/packages/amazonq/test/unit/amazonq/onboardingPage/walkthrough.test.ts
new file mode 100644
index 00000000000..23be7643128
--- /dev/null
+++ b/packages/amazonq/test/unit/amazonq/onboardingPage/walkthrough.test.ts
@@ -0,0 +1,22 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { showAmazonQWalkthroughOnce } from 'aws-core-vscode/amazonq'
+import sinon from 'sinon'
+
+describe('showAmazonQWalkthroughOnce', function () {
+    it('only shows once', async function () {
+        const showWalkthroughStub = sinon.stub()
+        assert.deepStrictEqual(showWalkthroughStub.callCount, 0)
+        await showAmazonQWalkthroughOnce(showWalkthroughStub)
+        // Show walkthrough since our state indicates we haven't shown before
+        assert.deepStrictEqual(showWalkthroughStub.callCount, 1)
+
+        await showAmazonQWalkthroughOnce(showWalkthroughStub)
+        // On the second call we do not show again since we've shown before.
+        assert.deepStrictEqual(showWalkthroughStub.callCount, 1)
+    })
+})
diff --git a/packages/amazonq/test/unit/amazonqGumby/amazonQGumbyUtil.ts b/packages/amazonq/test/unit/amazonqGumby/amazonQGumbyUtil.ts
new file mode 100644
index 00000000000..b6b6af3eaf9
--- /dev/null
+++ b/packages/amazonq/test/unit/amazonqGumby/amazonQGumbyUtil.ts
@@ -0,0 +1,11 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import path from 'path'
+
+export const getTestResourceFilePath = (relativePathToFile: string) => {
+    return path.resolve(__dirname, relativePathToFile)
+}
+
+export const stripStringWhitespace = (str: string) => str.replace(/\s+/g, '')
diff --git a/packages/amazonq/test/unit/amazonqGumby/chat/controller/messenger/messengerUtils.test.ts b/packages/amazonq/test/unit/amazonqGumby/chat/controller/messenger/messengerUtils.test.ts
new file mode 100644
index 00000000000..8792510db79
--- /dev/null
+++ b/packages/amazonq/test/unit/amazonqGumby/chat/controller/messenger/messengerUtils.test.ts
@@ -0,0 +1,45 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as assert from 'assert'
+import { DependencyVersions, MessengerUtils } from 'aws-core-vscode/amazonqGumby'
+
+const TestDependencyVersions = new DependencyVersions('4.2', ['3.8', '4.2', '2.4'], ['1.12', '1.09', '1.10'], '1.3')
+
+describe('MessengerUtils', () => {
+    describe('createAvailableDependencyVersionString', async () => {
+        it('returns a string containing the highest major version available', async () => {
+            const message = MessengerUtils.createAvailableDependencyVersionString(TestDependencyVersions)
+            assert.strictEqual(
+                message.includes('Latest major version:'),
+                true,
+                "'Latest major version' was not found in string"
+            )
+            assert.strictEqual(
+                message.includes('4.2'),
+                true,
+                'Expected the actual latest major version to be present in string'
+            )
+        })
+
+        it('returns a string that does not contain a major version when major versions are not defined', async () => {
+            const testDependencyVersions = new DependencyVersions('4.2', [], ['1.9', '1.11', '1.10'], '1.3')
+            const message = MessengerUtils.createAvailableDependencyVersionString(testDependencyVersions)
+            assert.strictEqual(message.includes('Latest major version:'), false)
+        })
+
+        it('returns a string containing the highest minor version available', async () => {
+            const message = MessengerUtils.createAvailableDependencyVersionString(TestDependencyVersions)
+            assert.strictEqual(message.includes('Latest minor version:'), true)
+            assert.strictEqual(message.includes('1.12'), true)
+        })
+
+        it('returns a string that does not contain a minor version when minor versions are not defined', async () => {
+            const testDependencyVersions = new DependencyVersions('4.2', ['3.8', '4.2', '2.4'], [], '1.3')
+            const message = MessengerUtils.createAvailableDependencyVersionString(testDependencyVersions)
+            assert.strictEqual(message.includes('Latest minor version:'), false)
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/amazonqGumby/humanInTheLoopManager.test.ts b/packages/amazonq/test/unit/amazonqGumby/humanInTheLoopManager.test.ts
new file mode 100644
index 00000000000..e94838ba3c2
--- /dev/null
+++ b/packages/amazonq/test/unit/amazonqGumby/humanInTheLoopManager.test.ts
@@ -0,0 +1,64 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import assert from 'assert'
+import path from 'path'
+import { HumanInTheLoopManager } from 'aws-core-vscode/codewhisperer/node'
+import { getTestResourceFilePath, stripStringWhitespace } from './amazonQGumbyUtil'
+import { fs } from 'aws-core-vscode/shared'
+import { assertEqualPaths } from 'aws-core-vscode/test'
+
+describe('HumanInTheLoopManager', async function () {
+    it('will getUserDependencyUpdateDir()', async function () {
+        const updateDirPath = HumanInTheLoopManager.instance.getUserDependencyUpdateDir()
+        assert.ok(updateDirPath, 'q-pom-dependency-update')
+    })
+    it('will getUploadFolderInfo()', async function () {
+        const uploadFolderInfo = HumanInTheLoopManager.instance.getUploadFolderInfo()
+        assert.strictEqual(uploadFolderInfo.name, 'q-pom-dependency-update')
+        assert.strictEqual(uploadFolderInfo.path, HumanInTheLoopManager.instance.getUserDependencyUpdateDir())
+    })
+    it('will getCompileDependencyListFolderInfo()', async function () {
+        const compileFolderInfo = HumanInTheLoopManager.instance.getCompileDependencyListFolderInfo()
+        assert.strictEqual(compileFolderInfo.name, 'q-pom-dependency-list')
+        assert.strictEqual(compileFolderInfo.path, HumanInTheLoopManager.instance.getTmpDependencyListDir())
+    })
+    it('will createPomFileCopy() and delete artifact', async function () {
+        const pomFileVirtualFileReference = vscode.Uri.file(
+            getTestResourceFilePath('resources/files/humanInTheLoop/downloadResults/pom.xml')
+        )
+        const outputDirectoryPath = path.resolve(__dirname, 'testOutput')
+        const newPomFilePath = await HumanInTheLoopManager.instance.createPomFileCopy(
+            outputDirectoryPath,
+            pomFileVirtualFileReference
+        )
+        const outputPathResult = path.join(outputDirectoryPath, 'pom.xml')
+        assertEqualPaths(newPomFilePath.fsPath, outputPathResult)
+        const newPomFileContents = await fs.readFileText(newPomFilePath.path)
+        assert.strictEqual(
+            stripStringWhitespace(newPomFileContents),
+            stripStringWhitespace(`<?xml version="1.0" encoding="UTF-8"?>
+            <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+            <modelVersion>4.0.0</modelVersion>
+            <groupId>GROUP_ID</groupId>
+            <artifactId>ARTIFACT_ID</artifactId>
+            <version>VERSION</version>
+            
+            <dependencies>
+                <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>*****</version>
+                </dependency>
+            </dependencies>
+            </project>
+            `)
+        )
+        await HumanInTheLoopManager.instance.cleanUpArtifacts()
+        const newPomFileDoesNotExistFlag = await fs.existsFile(newPomFilePath)
+        assert.equal(newPomFileDoesNotExistFlag, false)
+    })
+})
diff --git a/packages/amazonq/test/unit/amazonqGumby/models/dependencies.test.ts b/packages/amazonq/test/unit/amazonqGumby/models/dependencies.test.ts
new file mode 100644
index 00000000000..e56ec1853c3
--- /dev/null
+++ b/packages/amazonq/test/unit/amazonqGumby/models/dependencies.test.ts
@@ -0,0 +1,48 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as assert from 'assert'
+import { DependencyVersions } from 'aws-core-vscode/amazonqGumby'
+
+describe('DependencyVersions', () => {
+    describe('length', async () => {
+        it('returns the correct number of versions when empty arrays are passed in', async () => {
+            const testDependencyVersions = new DependencyVersions('', [], [], '1')
+            assert.strictEqual(testDependencyVersions.length, 0)
+        })
+
+        it('returns the correct number of versions when full arrays', async () => {
+            const testDependencyVersions = new DependencyVersions('1', ['1', '2', '3'], ['4', '5', '6'], '1')
+            assert.strictEqual(testDependencyVersions.length, 6)
+        })
+
+        it('ignores duplicates when calculating the length', async () => {
+            const testDependencyVersions = new DependencyVersions('1', ['1', '2'], ['1', '3', '4'], '1')
+            assert.strictEqual(testDependencyVersions.length, 4)
+        })
+    })
+
+    describe('allVersions', async () => {
+        it('returns an empty array when constructed with empty arrays', async () => {
+            const testDependencyVersions = new DependencyVersions('1', [], [], '1')
+            assert.deepStrictEqual(Array.from(testDependencyVersions.allVersions), [])
+        })
+
+        it('returns a flat array containing all versions passed in the constructor', async () => {
+            const testDependencyVersions = new DependencyVersions('1', ['1', '2', '3'], ['4', '5', '6'], '1')
+            assert.deepStrictEqual(Array.from(testDependencyVersions.allVersions), ['1', '2', '3', '4', '5', '6'])
+        })
+
+        it('returns an array containing only unique members', async () => {
+            const testDependencyVersions = new DependencyVersions('1', ['1', '2'], ['1', '2', '3'], '1')
+            assert.deepStrictEqual(Array.from(testDependencyVersions.allVersions), ['1', '2', '3'])
+        })
+
+        it('returns an array where major versions are sorted in ascending order, followed by minor versions', async () => {
+            const testDependencyVersions = new DependencyVersions('4.4', ['4.4', '3.2'], ['1.1', '1.3', '1.2'], '1')
+            assert.deepStrictEqual(Array.from(testDependencyVersions.allVersions), ['3.2', '4.4', '1.1', '1.2', '1.3'])
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/amazonqGumby/resources/files/addedFile.diff b/packages/amazonq/test/unit/amazonqGumby/resources/files/addedFile.diff
new file mode 100644
index 00000000000..7eb35b5fa0e
--- /dev/null
+++ b/packages/amazonq/test/unit/amazonqGumby/resources/files/addedFile.diff
@@ -0,0 +1,6 @@
+diff --git a/testfile.txt b/testfile.txt
+index e69de29..9f4b6d8 100644
+--- a/testfile.txt
++++ b/testfile.txt
+@@ -0,0 +1 @@
++This is a test file
diff --git a/packages/amazonq/test/unit/amazonqGumby/resources/files/humanInTheLoop/dependency-updates-aggregate-report.xml b/packages/amazonq/test/unit/amazonqGumby/resources/files/humanInTheLoop/dependency-updates-aggregate-report.xml
new file mode 100644
index 00000000000..fd105d8e66c
--- /dev/null
+++ b/packages/amazonq/test/unit/amazonqGumby/resources/files/humanInTheLoop/dependency-updates-aggregate-report.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<DependencyUpdatesReport xsi:schemaLocation="https://www.mojohaus.org/VERSIONS/DEPENDENCY-UPDATES-REPORT/2.0.0 https://www.mojohaus.org/versions/versions-model-report/xsd/dependency-updates-report-2.0.0.xsd"
+    xmlns="https://www.mojohaus.org/VERSIONS/DEPENDENCY-UPDATES-REPORT/2.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <summary>
+        <usingLastVersion>0</usingLastVersion>
+        <nextVersionAvailable>0</nextVersionAvailable>
+        <nextIncrementalAvailable>1</nextIncrementalAvailable>
+        <nextMinorAvailable>0</nextMinorAvailable>
+        <nextMajorAvailable>0</nextMajorAvailable>
+    </summary>
+    <dependencies>
+        <dependency>
+        <groupId>org.projectlombok</groupId>
+        <artifactId>lombok</artifactId>
+        <scope>compile</scope>
+        <type>jar</type>
+        <currentVersion>0.11.4</currentVersion>
+        <lastVersion>1.18.32</lastVersion>
+        <incrementals>
+            <incremental>0.11.6</incremental>
+            <incremental>0.11.8</incremental>
+        </incrementals>
+        <minors>
+            <minor>0.12.0</minor>
+        </minors>
+        <majors>
+            <major>1.12.2</major>
+            <major>1.12.4</major>
+            <major>1.12.6</major>
+        </majors>
+        <status>incremental available</status>
+        </dependency>
+    </dependencies>
+</DependencyUpdatesReport>
diff --git a/packages/amazonq/test/unit/amazonqGumby/resources/files/humanInTheLoop/downloadResults/manifest.json b/packages/amazonq/test/unit/amazonqGumby/resources/files/humanInTheLoop/downloadResults/manifest.json
new file mode 100644
index 00000000000..048276f5237
--- /dev/null
+++ b/packages/amazonq/test/unit/amazonqGumby/resources/files/humanInTheLoop/downloadResults/manifest.json
@@ -0,0 +1,7 @@
+{
+    "hilCapability": "HIL_1pDependency_VersionUpgrade",
+    "pomFolderName": "pomFolder",
+    "pomGroupId": "org.projectlombok",
+    "pomArtifactId": "lombok",
+    "sourcePomVersion": "0.11.4"
+}
diff --git a/packages/amazonq/test/unit/amazonqGumby/resources/files/humanInTheLoop/downloadResults/pom.xml b/packages/amazonq/test/unit/amazonqGumby/resources/files/humanInTheLoop/downloadResults/pom.xml
new file mode 100644
index 00000000000..c5cd78ac24d
--- /dev/null
+++ b/packages/amazonq/test/unit/amazonqGumby/resources/files/humanInTheLoop/downloadResults/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>GROUP_ID</groupId>
+  <artifactId>ARTIFACT_ID</artifactId>
+  <version>VERSION</version>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <version>*****</version>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/packages/amazonq/test/unit/amazonqGumby/resources/files/modifiedFile.diff b/packages/amazonq/test/unit/amazonqGumby/resources/files/modifiedFile.diff
new file mode 100644
index 00000000000..ee3a0a44008
--- /dev/null
+++ b/packages/amazonq/test/unit/amazonqGumby/resources/files/modifiedFile.diff
@@ -0,0 +1,8 @@
+diff --git a/README.md b/README.md
+index 084f378..1705101 100644
+--- a/README.md
++++ b/README.md
+@@ -1,3 +1,5 @@
+This guide walks you through using Gradle to build a simple Java project.
++This line is added.
+\ No newline at end of file
\ No newline at end of file
diff --git a/packages/amazonq/test/unit/amazonqGumby/resources/mocks/transformFixtures.ts b/packages/amazonq/test/unit/amazonqGumby/resources/mocks/transformFixtures.ts
new file mode 100644
index 00000000000..60053108efb
--- /dev/null
+++ b/packages/amazonq/test/unit/amazonqGumby/resources/mocks/transformFixtures.ts
@@ -0,0 +1,33 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { TransformationStep } from 'aws-core-vscode/codewhisperer/node'
+
+export const downloadArtifactIdFixture = 'hil-test-artifact-id'
+export const downloadArtifactTypeFixture = 'BuiltJars'
+export const transformationStepsHumanInTheLoopFixture: TransformationStep[] = [
+    {
+        id: 'fake-step-id-1',
+        name: 'Building Code',
+        description: 'Building dependencies',
+        status: 'COMPLETED',
+        progressUpdates: [
+            {
+                name: 'Status step',
+                status: 'FAILED',
+                description: 'This step should be hil identifier',
+                startTime: new Date(),
+                endTime: new Date(),
+                downloadArtifacts: [
+                    {
+                        downloadArtifactId: downloadArtifactIdFixture,
+                        downloadArtifactType: downloadArtifactTypeFixture,
+                    },
+                ],
+            },
+        ],
+        startTime: new Date(),
+        endTime: new Date(),
+    },
+]
diff --git a/packages/amazonq/test/unit/amazonqGumby/transformApiHandler.test.ts b/packages/amazonq/test/unit/amazonqGumby/transformApiHandler.test.ts
new file mode 100644
index 00000000000..1441171bafc
--- /dev/null
+++ b/packages/amazonq/test/unit/amazonqGumby/transformApiHandler.test.ts
@@ -0,0 +1,150 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import {
+    TransformationProgressUpdate,
+    TransformationStep,
+    findDownloadArtifactProgressUpdate,
+    findDownloadArtifactStep,
+    getArtifactsFromProgressUpdate,
+} from 'aws-core-vscode/codewhisperer/node'
+
+describe('Amazon Q Transform - transformApiHandler tests', function () {
+    describe('getArtifactIdentifiers', function () {
+        it('will return downloaded artifact values from transformationStep', function () {
+            const downloadArtifactId = 'hil-test-artifact-id'
+            const downloadArtifactType = 'BuiltJars'
+            const transformationStepsFixture: TransformationProgressUpdate = {
+                name: 'Status step',
+                status: 'FAILED',
+                description: 'This step should be hil identifier',
+                startTime: new Date(),
+                endTime: new Date(),
+                downloadArtifacts: [
+                    {
+                        downloadArtifactId,
+                        downloadArtifactType,
+                    },
+                ],
+            }
+            const { artifactId, artifactType } = getArtifactsFromProgressUpdate(transformationStepsFixture)
+
+            assert.strictEqual(artifactId, downloadArtifactId)
+            assert.strictEqual(artifactType, downloadArtifactType)
+        })
+    })
+    describe('findDownloadArtifactStep', function () {
+        it('will return downloaded artifact values from transformationStep', function () {
+            const downloadArtifactId = 'hil-test-artifact-id'
+            const downloadArtifactType = 'BuiltJars'
+            const transformationStepsFixture: TransformationStep[] = [
+                {
+                    id: 'fake-step-id-1',
+                    name: 'Building Code',
+                    description: 'Building dependencies',
+                    status: 'COMPLETED',
+                    progressUpdates: [
+                        {
+                            name: 'Status step',
+                            status: 'FAILED',
+                            description: 'This step should be hil identifier',
+                            startTime: new Date(),
+                            endTime: new Date(),
+                            downloadArtifacts: [
+                                {
+                                    downloadArtifactId,
+                                    downloadArtifactType,
+                                },
+                            ],
+                        },
+                    ],
+                    startTime: new Date(),
+                    endTime: new Date(),
+                },
+            ]
+            const { transformationStep, progressUpdate } = findDownloadArtifactStep(transformationStepsFixture)
+
+            assert.strictEqual(transformationStep, transformationStepsFixture[0])
+            assert.strictEqual(progressUpdate, transformationStepsFixture[0].progressUpdates?.[0])
+        })
+        it('will return undefined if no downloadArtifactId found', function () {
+            const transformationStepsFixture: TransformationStep[] = [
+                {
+                    id: 'fake-step-id-1',
+                    name: 'Building Code',
+                    description: 'Building dependencies',
+                    status: 'COMPLETED',
+                    progressUpdates: [
+                        {
+                            name: 'Status step',
+                            status: 'FAILED',
+                            description: 'This step should be hil identifier',
+                            startTime: new Date(),
+                            endTime: new Date(),
+                            downloadArtifacts: undefined,
+                        },
+                    ],
+                    startTime: new Date(),
+                    endTime: new Date(),
+                },
+            ]
+            const { transformationStep, progressUpdate } = findDownloadArtifactStep(transformationStepsFixture)
+
+            assert.strictEqual(transformationStep, undefined)
+            assert.strictEqual(progressUpdate, undefined)
+        })
+    })
+
+    describe('findDownloadArtifactProgressUpdate', function () {
+        it('will return correct progress update from transformationStep', function () {
+            const transformationStepsFixture: TransformationStep[] = [
+                {
+                    id: 'dummy-id',
+                    name: 'Step name',
+                    description: 'Step description',
+                    status: 'TRANSFORMING',
+                    progressUpdates: [
+                        {
+                            name: 'Progress update name',
+                            status: 'AWAITING_CLIENT_ACTION',
+                            description: 'Client-side build happening now',
+                            startTime: new Date(),
+                            endTime: new Date(),
+                            downloadArtifacts: [
+                                {
+                                    downloadArtifactId: 'some-download-artifact-id',
+                                    downloadArtifactType: 'some-download-artifact-type',
+                                },
+                            ],
+                        },
+                    ],
+                    startTime: new Date(),
+                    endTime: new Date(),
+                },
+            ]
+            const progressUpdate = findDownloadArtifactProgressUpdate(transformationStepsFixture)
+            assert.strictEqual(progressUpdate, transformationStepsFixture[0].progressUpdates?.[0])
+        })
+
+        it('will return undefined if step status is NOT AWAITING_CLIENT_ACTION', function () {
+            const transformationStepsFixture: TransformationStep[] = [
+                {
+                    id: 'random-id',
+                    name: 'not-awaiting-client-action step name',
+                    description: 'not-awaiting-client-action step description',
+                    status: 'TRANSFORMING',
+                    progressUpdates: [
+                        {
+                            name: 'some progress update name',
+                            status: 'SOMETHING-BESIDES-AWAITING_CLIENT_ACTION',
+                        },
+                    ],
+                },
+            ]
+            const progressUpdate = findDownloadArtifactProgressUpdate(transformationStepsFixture)
+            assert.strictEqual(progressUpdate, undefined)
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/amazonqGumby/transformFileHandler.test.ts b/packages/amazonq/test/unit/amazonqGumby/transformFileHandler.test.ts
new file mode 100644
index 00000000000..d89e97af7f0
--- /dev/null
+++ b/packages/amazonq/test/unit/amazonqGumby/transformFileHandler.test.ts
@@ -0,0 +1,57 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import { parseVersionsListFromPomFile } from 'aws-core-vscode/codewhisperer/node'
+
+describe('Amazon Q Transform - transformFileHandler tests', function () {
+    describe('parseXmlDependenciesReport', function () {
+        it('Will return parsed values', async function () {
+            const testXmlReport = `
+            <?xml version="1.0" encoding="UTF-8"?>
+                <DependencyUpdatesReport xsi:schemaLocation="https://www.mojohaus.org/VERSIONS/DEPENDENCY-UPDATES-REPORT/2.0.0 https://www.mojohaus.org/versions/versions-model-report/xsd/dependency-updates-report-2.0.0.xsd"
+                    xmlns="https://www.mojohaus.org/VERSIONS/DEPENDENCY-UPDATES-REPORT/2.0.0"
+                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+                <summary>
+                    <usingLastVersion>0</usingLastVersion>
+                    <nextVersionAvailable>0</nextVersionAvailable>
+                    <nextIncrementalAvailable>1</nextIncrementalAvailable>
+                    <nextMinorAvailable>0</nextMinorAvailable>
+                    <nextMajorAvailable>0</nextMajorAvailable>
+                </summary>
+                <dependencies>
+                    <dependency>
+                    <groupId>org.projectlombok</groupId>
+                    <artifactId>lombok</artifactId>
+                    <scope>compile</scope>
+                    <type>jar</type>
+                    <currentVersion>0.11.4</currentVersion>
+                    <lastVersion>1.18.32</lastVersion>
+                    <incrementals>
+                        <incremental>0.11.6</incremental>
+                        <incremental>0.11.8</incremental>
+                    </incrementals>
+                    <minors>
+                        <minor>0.12.0</minor>
+                    </minors>
+                    <majors>
+                        <major>1.12.2</major>
+                        <major>1.12.4</major>
+                        <major>1.12.6</major>
+                    </majors>
+                    <status>incremental available</status>
+                    </dependency>
+                </dependencies>
+                </DependencyUpdatesReport>
+                `
+            const { latestVersion, majorVersions, minorVersions, status } =
+                await parseVersionsListFromPomFile(testXmlReport)
+
+            assert.strictEqual(latestVersion, '1.18.32')
+            assert.strictEqual(minorVersions[0], '0.12.0')
+            assert.strictEqual(majorVersions[0], '1.12.2')
+            assert.strictEqual(status, 'incremental available')
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/amazonqGumby/transformationResultsHandler.test.ts b/packages/amazonq/test/unit/amazonqGumby/transformationResultsHandler.test.ts
new file mode 100644
index 00000000000..143346674d9
--- /dev/null
+++ b/packages/amazonq/test/unit/amazonqGumby/transformationResultsHandler.test.ts
@@ -0,0 +1,66 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import sinon from 'sinon'
+import { DiffModel, AddedChangeNode, ModifiedChangeNode } from 'aws-core-vscode/codewhisperer/node'
+import path from 'path'
+import { getTestResourceFilePath } from './amazonQGumbyUtil'
+import { fs } from 'aws-core-vscode/shared'
+import { createTestWorkspace } from 'aws-core-vscode/test'
+
+describe('DiffModel', function () {
+    afterEach(() => {
+        sinon.restore()
+    })
+
+    it('WHEN parsing a diff patch where a file was added THEN returns an array representing the added file', async function () {
+        const testDiffModel = new DiffModel()
+
+        const workspacePath = 'workspace'
+
+        sinon.replace(fs, 'exists', async (path) => {
+            const pathStr = path.toString()
+            if (pathStr.includes(workspacePath)) {
+                return false
+            }
+
+            return true
+        })
+        testDiffModel.parseDiff(getTestResourceFilePath('resources/files/addedFile.diff'), workspacePath)
+
+        assert.strictEqual(
+            testDiffModel.patchFileNodes[0].patchFilePath,
+            getTestResourceFilePath('resources/files/addedFile.diff')
+        )
+        const change = testDiffModel.patchFileNodes[0].children[0]
+
+        assert.strictEqual(change instanceof AddedChangeNode, true)
+    })
+
+    it('WHEN parsing a diff patch where a file was modified THEN returns an array representing the modified file', async function () {
+        const testDiffModel = new DiffModel()
+
+        const fileAmount = 1
+        const workspaceFolder = await createTestWorkspace(fileAmount, { fileContent: '' })
+
+        await fs.writeFile(
+            path.join(workspaceFolder.uri.fsPath, 'README.md'),
+            'This guide walks you through using Gradle to build a simple Java project.'
+        )
+
+        testDiffModel.parseDiff(
+            getTestResourceFilePath('resources/files/modifiedFile.diff'),
+            workspaceFolder.uri.fsPath
+        )
+
+        assert.strictEqual(
+            testDiffModel.patchFileNodes[0].patchFilePath,
+            getTestResourceFilePath('resources/files/modifiedFile.diff')
+        )
+        const change = testDiffModel.patchFileNodes[0].children[0]
+
+        assert.strictEqual(change instanceof ModifiedChangeNode, true)
+    })
+})
diff --git a/packages/amazonq/test/unit/app/inline/EditRendering/diffUtils.test.ts b/packages/amazonq/test/unit/app/inline/EditRendering/diffUtils.test.ts
new file mode 100644
index 00000000000..dee096d7f57
--- /dev/null
+++ b/packages/amazonq/test/unit/app/inline/EditRendering/diffUtils.test.ts
@@ -0,0 +1,83 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as assert from 'assert'
+import { applyUnifiedDiff } from '../../../../../src/app/inline/EditRendering/diffUtils'
+
+describe('diffUtils', function () {
+    describe('applyUnifiedDiff', function () {
+        it('should correctly apply a unified diff to original text', function () {
+            // Original code
+            const originalCode = 'function add(a, b) {\n  return a + b;\n}'
+
+            // Unified diff that adds a comment and modifies the return statement
+            const unifiedDiff =
+                '--- a/file.js\n' +
+                '+++ b/file.js\n' +
+                '@@ -1,3 +1,4 @@\n' +
+                ' function add(a, b) {\n' +
+                '+  // Add two numbers\n' +
+                '-  return a + b;\n' +
+                '+  return a + b; // Return the sum\n' +
+                ' }'
+
+            // Expected result after applying the diff
+            const expectedResult = 'function add(a, b) {\n  // Add two numbers\n  return a + b; // Return the sum\n}'
+
+            // Apply the diff
+            const appliedCode = applyUnifiedDiff(originalCode, unifiedDiff)
+
+            // Verify the result
+            assert.strictEqual(appliedCode, expectedResult)
+        })
+    })
+
+    describe('applyUnifiedDiff with complex changes', function () {
+        it('should handle multiple hunks in a diff', function () {
+            // Original code with multiple functions
+            const originalCode =
+                'function add(a, b) {\n' +
+                '  return a + b;\n' +
+                '}\n' +
+                '\n' +
+                'function subtract(a, b) {\n' +
+                '  return a - b;\n' +
+                '}'
+
+            // Unified diff that modifies both functions
+            const unifiedDiff =
+                '--- a/file.js\n' +
+                '+++ b/file.js\n' +
+                '@@ -1,3 +1,4 @@\n' +
+                ' function add(a, b) {\n' +
+                '+  // Addition function\n' +
+                '   return a + b;\n' +
+                ' }\n' +
+                '@@ -5,3 +6,4 @@\n' +
+                ' function subtract(a, b) {\n' +
+                '+  // Subtraction function\n' +
+                '   return a - b;\n' +
+                ' }'
+
+            // Expected result after applying the diff
+            const expectedResult =
+                'function add(a, b) {\n' +
+                '  // Addition function\n' +
+                '  return a + b;\n' +
+                '}\n' +
+                '\n' +
+                'function subtract(a, b) {\n' +
+                '  // Subtraction function\n' +
+                '  return a - b;\n' +
+                '}'
+
+            // Apply the diff
+            const appliedCode = applyUnifiedDiff(originalCode, unifiedDiff)
+
+            // Verify the result
+            assert.strictEqual(appliedCode, expectedResult)
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/app/inline/EditRendering/displayImage.test.ts b/packages/amazonq/test/unit/app/inline/EditRendering/displayImage.test.ts
new file mode 100644
index 00000000000..28155811f50
--- /dev/null
+++ b/packages/amazonq/test/unit/app/inline/EditRendering/displayImage.test.ts
@@ -0,0 +1,417 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import assert from 'assert'
+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
+    let editorStub: sinon.SinonStubbedInstance<vscode.TextEditor>
+    let documentStub: sinon.SinonStubbedInstance<vscode.TextDocument>
+    let windowStub: sinon.SinonStubbedInstance<typeof vscode.window>
+    let commandsStub: sinon.SinonStubbedInstance<typeof vscode.commands>
+    let decorationTypeStub: sinon.SinonStubbedInstance<vscode.TextEditorDecorationType>
+    let manager: EditDecorationManager
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+
+        // Create stubs for vscode objects
+        decorationTypeStub = {
+            dispose: sandbox.stub(),
+        } as unknown as sinon.SinonStubbedInstance<vscode.TextEditorDecorationType>
+
+        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)
+
+        commandsStub = sandbox.stub(vscode.commands)
+        commandsStub.registerCommand.returns({ dispose: sandbox.stub() })
+
+        // Create a new instance of EditDecorationManager for each test
+        manager = new EditDecorationManager()
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('should display SVG decorations in the editor', async function () {
+        // Create a fake SVG image URI
+        const svgUri = vscode.Uri.parse('file:///path/to/image.svg')
+
+        // Create accept and reject handlers
+        const acceptHandler = sandbox.stub()
+        const rejectHandler = sandbox.stub()
+
+        // Reset the setDecorations stub to clear any previous calls
+        editorStub.setDecorations.reset()
+
+        // Call displayEditSuggestion
+        await manager.displayEditSuggestion(
+            editorStub as unknown as vscode.TextEditor,
+            svgUri,
+            0,
+            acceptHandler,
+            rejectHandler,
+            'Original code',
+            'New code',
+            [{ line: 0, start: 0, end: 0 }]
+        )
+
+        // Verify decorations were set (we expect 4 calls because clearDecorations is called first)
+        assert.strictEqual(editorStub.setDecorations.callCount, 4)
+
+        // Verify the third call is for the image decoration (after clearDecorations)
+        const imageCall = editorStub.setDecorations.getCall(2)
+        assert.strictEqual(imageCall.args[0], manager['imageDecorationType'])
+        assert.strictEqual(imageCall.args[1].length, 1)
+
+        // Verify the fourth call is for the removed code decoration
+        const removedCodeCall = editorStub.setDecorations.getCall(3)
+        assert.strictEqual(removedCodeCall.args[0], manager['removedCodeDecorationType'])
+    })
+
+    // Helper function to setup edit suggestion test
+    async function setupEditSuggestionTest() {
+        // Create a fake SVG image URI
+        const svgUri = vscode.Uri.parse('file:///path/to/image.svg')
+
+        // Create accept and reject handlers
+        const acceptHandler = sandbox.stub()
+        const rejectHandler = sandbox.stub()
+
+        // Display the edit suggestion
+        await manager.displayEditSuggestion(
+            editorStub as unknown as vscode.TextEditor,
+            svgUri,
+            0,
+            acceptHandler,
+            rejectHandler,
+            'Original code',
+            'New code',
+            [{ line: 0, start: 0, end: 0 }]
+        )
+
+        return { acceptHandler, rejectHandler }
+    }
+
+    it('should trigger accept handler when command is executed', async function () {
+        const { acceptHandler, rejectHandler } = await setupEditSuggestionTest()
+
+        // Find the command handler that was registered for accept
+        const acceptCommandArgs = commandsStub.registerCommand.args.find(
+            (args) => args[0] === 'aws.amazonq.inline.acceptEdit'
+        )
+
+        // Execute the accept command handler if found
+        if (acceptCommandArgs && acceptCommandArgs[1]) {
+            const acceptCommandHandler = acceptCommandArgs[1]
+            acceptCommandHandler()
+
+            // Verify the accept handler was called
+            sinon.assert.calledOnce(acceptHandler)
+            sinon.assert.notCalled(rejectHandler)
+        } else {
+            assert.fail('Accept command handler not found')
+        }
+    })
+
+    it('should trigger reject handler when command is executed', async function () {
+        const { acceptHandler, rejectHandler } = await setupEditSuggestionTest()
+
+        // Find the command handler that was registered for reject
+        const rejectCommandArgs = commandsStub.registerCommand.args.find(
+            (args) => args[0] === 'aws.amazonq.inline.rejectEdit'
+        )
+
+        // Execute the reject command handler if found
+        if (rejectCommandArgs && rejectCommandArgs[1]) {
+            const rejectCommandHandler = rejectCommandArgs[1]
+            rejectCommandHandler()
+
+            // Verify the reject handler was called
+            sinon.assert.calledOnce(rejectHandler)
+            sinon.assert.notCalled(acceptHandler)
+        } else {
+            assert.fail('Reject command handler not found')
+        }
+    })
+
+    it('should clear decorations when requested', async function () {
+        // Reset the setDecorations stub to clear any previous calls
+        editorStub.setDecorations.reset()
+
+        // Call clearDecorations
+        await manager.clearDecorations(editorStub as unknown as vscode.TextEditor)
+
+        // Verify decorations were cleared
+        assert.strictEqual(editorStub.setDecorations.callCount, 2)
+
+        // Verify both decoration types were cleared
+        sinon.assert.calledWith(editorStub.setDecorations.firstCall, manager['imageDecorationType'], [])
+        sinon.assert.calledWith(editorStub.setDecorations.secondCall, manager['removedCodeDecorationType'], [])
+    })
+})
+
+describe('displaySvgDecoration cursor distance auto-discard', function () {
+    let sandbox: sinon.SinonSandbox
+    let editorStub: sinon.SinonStubbedInstance<vscode.TextEditor>
+    let languageClientStub: any
+    let sessionStub: any
+    let itemStub: any
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        const commonStubs = createCommonStubs(sandbox)
+        editorStub = commonStubs.editorStub
+
+        languageClientStub = {
+            sendNotification: sandbox.stub(),
+        }
+
+        sessionStub = {
+            sessionId: 'test-session',
+            requestStartTime: Date.now(),
+            firstCompletionDisplayLatency: 100,
+        }
+
+        itemStub = {
+            itemId: 'test-item',
+            insertText: 'test content',
+        }
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('should send discard telemetry and return early when edit is 10+ lines away from cursor', async function () {
+        // Set cursor at line 5
+        editorStub.selection = {
+            active: new vscode.Position(5, 0),
+        } as any
+        // Try to display edit at line 20 (15 lines away)
+        await displaySvgDecoration(
+            editorStub as unknown as vscode.TextEditor,
+            vscode.Uri.parse('data:image/svg+xml;base64,test'),
+            20,
+            'new code',
+            [],
+            sessionStub,
+            languageClientStub,
+            itemStub
+        )
+
+        // Verify discard telemetry was sent
+        sinon.assert.calledOnce(languageClientStub.sendNotification)
+        const call = languageClientStub.sendNotification.getCall(0)
+        assert.strictEqual(call.args[0], 'aws/logInlineCompletionSessionResults')
+        assert.strictEqual(call.args[1].sessionId, 'test-session')
+        assert.strictEqual(call.args[1].completionSessionResult['test-item'].discarded, true)
+    })
+
+    it('should proceed normally when edit is within 10 lines of cursor', async function () {
+        // Set cursor at line 5
+        editorStub.selection = {
+            active: new vscode.Position(5, 0),
+        } as any
+        // Mock required dependencies for normal flow
+        sandbox.stub(vscode.workspace, 'onDidChangeTextDocument').returns({ dispose: sandbox.stub() })
+        sandbox.stub(vscode.window, 'onDidChangeTextEditorSelection').returns({ dispose: sandbox.stub() })
+
+        // Try to display edit at line 10 (5 lines away)
+        await displaySvgDecoration(
+            editorStub as unknown as vscode.TextEditor,
+            vscode.Uri.parse('data:image/svg+xml;base64,test'),
+            10,
+            'new code',
+            [],
+            sessionStub,
+            languageClientStub,
+            itemStub
+        )
+
+        // Verify no discard telemetry was sent (function should proceed normally)
+        sinon.assert.notCalled(languageClientStub.sendNotification)
+    })
+})
+
+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 () {
+        // Set cursor at line 50
+        editorStub.selection = {
+            active: new vscode.Position(50, 0),
+        } as any
+        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 () {
+        // Set cursor at line 50
+        editorStub.selection = {
+            active: new vscode.Position(50, 0),
+        } as any
+        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 () {
+        // Set cursor at line 50
+        editorStub.selection = {
+            active: new vscode.Position(50, 0),
+        } as any
+        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 () {
+        // Set cursor at line 50
+        editorStub.selection = {
+            active: new vscode.Position(50, 0),
+        } as any
+        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 () {
+        // Set cursor at line 10
+        editorStub.selection = {
+            active: new vscode.Position(10, 0),
+        } as any
+        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 () {
+        // Set cursor at line 50
+        editorStub.selection = {
+            active: new vscode.Position(50, 0),
+        } as any
+        editSuggestionStateStub.returns(false)
+
+        const startLine = 50
+        await setupDisplaySvgDecoration(startLine)
+
+        selectionChangeListener(createSelectionChangeEvent(startLine + 100))
+
+        sinon.assert.notCalled(commandsStub)
+    })
+})
diff --git a/packages/amazonq/test/unit/app/inline/EditRendering/imageRenderer.test.ts b/packages/amazonq/test/unit/app/inline/EditRendering/imageRenderer.test.ts
new file mode 100644
index 00000000000..e1c32778d83
--- /dev/null
+++ b/packages/amazonq/test/unit/app/inline/EditRendering/imageRenderer.test.ts
@@ -0,0 +1,269 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import assert from 'assert'
+// Remove static import - we'll use dynamic import instead
+// import { showEdits } from '../../../../../src/app/inline/EditRendering/imageRenderer'
+import { SvgGenerationService } from '../../../../../src/app/inline/EditRendering/svgGenerator'
+import { InlineCompletionItemWithReferences } from '@aws/language-server-runtimes/protocol'
+
+describe('showEdits', function () {
+    let sandbox: sinon.SinonSandbox
+    let editorStub: sinon.SinonStubbedInstance<vscode.TextEditor>
+    let documentStub: sinon.SinonStubbedInstance<vscode.TextDocument>
+    let svgGenerationServiceStub: sinon.SinonStubbedInstance<SvgGenerationService>
+    let displaySvgDecorationStub: sinon.SinonStub
+    let loggerStub: sinon.SinonStubbedInstance<any>
+    let getLoggerStub: sinon.SinonStub
+    let showEdits: any // Will be dynamically imported
+    let languageClientStub: any
+    let sessionStub: any
+    let itemStub: InlineCompletionItemWithReferences
+
+    // Helper function to create mock SVG result
+    function createMockSvgResult(overrides: Partial<any> = {}) {
+        return {
+            svgImage: vscode.Uri.file('/path/to/generated.svg'),
+            startLine: 5,
+            newCode: 'console.log("Hello World");',
+            originalCodeHighlightRange: [{ line: 5, start: 0, end: 10 }],
+            ...overrides,
+        }
+    }
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+
+        // Create logger stub
+        loggerStub = {
+            error: sandbox.stub(),
+            info: sandbox.stub(),
+            debug: sandbox.stub(),
+            warn: sandbox.stub(),
+        }
+
+        // Clear all relevant module caches
+        const moduleId = require.resolve('../../../../../src/app/inline/EditRendering/imageRenderer')
+        const sharedModuleId = require.resolve('aws-core-vscode/shared')
+        delete require.cache[moduleId]
+        delete require.cache[sharedModuleId]
+
+        // jscpd:ignore-start
+        // Create getLogger stub and store reference for test verification
+        getLoggerStub = sandbox.stub().returns(loggerStub)
+
+        // Create a mock shared module with stubbed getLogger
+        const mockSharedModule = {
+            getLogger: getLoggerStub,
+        }
+
+        // Override the require cache with our mock
+        require.cache[sharedModuleId] = {
+            id: sharedModuleId,
+            filename: sharedModuleId,
+            loaded: true,
+            parent: undefined,
+            children: [],
+            exports: mockSharedModule,
+            paths: [],
+        } as any
+
+        // Now require the module - it should use our mocked getLogger
+        // jscpd:ignore-end
+        const imageRendererModule = require('../../../../../src/app/inline/EditRendering/imageRenderer')
+        showEdits = imageRendererModule.showEdits
+
+        // Create document stub
+        documentStub = {
+            uri: {
+                fsPath: '/path/to/test/file.ts',
+            },
+            getText: sandbox.stub().returns('Original code content'),
+            lineCount: 5,
+        } as unknown as sinon.SinonStubbedInstance<vscode.TextDocument>
+
+        // Create editor stub
+        editorStub = {
+            document: documentStub,
+            setDecorations: sandbox.stub(),
+            edit: sandbox.stub().resolves(true),
+        } as unknown as sinon.SinonStubbedInstance<vscode.TextEditor>
+
+        // Create SVG generation service stub
+        svgGenerationServiceStub = {
+            generateDiffSvg: sandbox.stub(),
+        } as unknown as sinon.SinonStubbedInstance<SvgGenerationService>
+
+        // Stub the SvgGenerationService constructor
+        sandbox
+            .stub(SvgGenerationService.prototype, 'generateDiffSvg')
+            .callsFake(svgGenerationServiceStub.generateDiffSvg)
+
+        // Create display SVG decoration stub
+        displaySvgDecorationStub = sandbox.stub()
+        sandbox.replace(
+            require('../../../../../src/app/inline/EditRendering/displayImage'),
+            'displaySvgDecoration',
+            displaySvgDecorationStub
+        )
+
+        // Create language client stub
+        languageClientStub = {} as any
+
+        // Create session stub
+        sessionStub = {
+            sessionId: 'test-session-id',
+            suggestions: [],
+            isRequestInProgress: false,
+            requestStartTime: Date.now(),
+            startPosition: new vscode.Position(0, 0),
+        } as any
+
+        // Create item stub
+        itemStub = {
+            insertText: 'console.log("Hello World");',
+            range: new vscode.Range(0, 0, 0, 0),
+            itemId: 'test-item-id',
+        } as any
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('should return early when editor is undefined', async function () {
+        await showEdits(itemStub, undefined, sessionStub, languageClientStub)
+
+        // Verify that no SVG generation or display methods were called
+        sinon.assert.notCalled(svgGenerationServiceStub.generateDiffSvg)
+        sinon.assert.notCalled(displaySvgDecorationStub)
+        sinon.assert.notCalled(loggerStub.error)
+    })
+
+    it('should successfully generate and display SVG when all parameters are valid', async function () {
+        // Setup successful SVG generation
+        const mockSvgResult = createMockSvgResult()
+        svgGenerationServiceStub.generateDiffSvg.resolves(mockSvgResult)
+
+        await showEdits(itemStub, editorStub as unknown as vscode.TextEditor, sessionStub, languageClientStub)
+
+        // Verify SVG generation was called with correct parameters
+        sinon.assert.calledOnce(svgGenerationServiceStub.generateDiffSvg)
+        sinon.assert.calledWith(
+            svgGenerationServiceStub.generateDiffSvg,
+            '/path/to/test/file.ts',
+            'console.log("Hello World");'
+        )
+
+        // Verify display decoration was called with correct parameters
+        sinon.assert.calledOnce(displaySvgDecorationStub)
+        sinon.assert.calledWith(
+            displaySvgDecorationStub,
+            editorStub,
+            mockSvgResult.svgImage,
+            mockSvgResult.startLine,
+            mockSvgResult.newCode,
+            mockSvgResult.originalCodeHighlightRange,
+            sessionStub,
+            languageClientStub,
+            itemStub
+        )
+
+        // Verify no errors were logged
+        sinon.assert.notCalled(loggerStub.error)
+    })
+
+    it('should log error when SVG generation returns empty result', async function () {
+        // Setup SVG generation to return undefined svgImage
+        const mockSvgResult = createMockSvgResult({ svgImage: undefined as any })
+        svgGenerationServiceStub.generateDiffSvg.resolves(mockSvgResult)
+
+        await showEdits(itemStub, editorStub as unknown as vscode.TextEditor, sessionStub, languageClientStub)
+
+        // Verify SVG generation was called
+        sinon.assert.calledOnce(svgGenerationServiceStub.generateDiffSvg)
+
+        // Verify display decoration was NOT called
+        sinon.assert.notCalled(displaySvgDecorationStub)
+
+        // Verify error was logged
+        sinon.assert.calledOnce(loggerStub.error)
+        sinon.assert.calledWith(loggerStub.error, 'SVG image generation returned an empty result.')
+    })
+
+    it('should catch and log error when SVG generation throws exception', async function () {
+        // Setup SVG generation to throw an error
+        const testError = new Error('SVG generation failed')
+        svgGenerationServiceStub.generateDiffSvg.rejects(testError)
+
+        await showEdits(itemStub, editorStub as unknown as vscode.TextEditor, sessionStub, languageClientStub)
+
+        // Verify SVG generation was called
+        sinon.assert.calledOnce(svgGenerationServiceStub.generateDiffSvg)
+
+        // Verify display decoration was NOT called
+        sinon.assert.notCalled(displaySvgDecorationStub)
+
+        // Verify error was logged with correct message
+        sinon.assert.calledOnce(loggerStub.error)
+        const errorCall = loggerStub.error.getCall(0)
+        assert.strictEqual(errorCall.args[0], `Error generating SVG image: ${testError}`)
+    })
+
+    it('should catch and log error when displaySvgDecoration throws exception', async function () {
+        // Setup successful SVG generation
+        const mockSvgResult = createMockSvgResult()
+        svgGenerationServiceStub.generateDiffSvg.resolves(mockSvgResult)
+
+        // Setup displaySvgDecoration to throw an error
+        const testError = new Error('Display decoration failed')
+        displaySvgDecorationStub.rejects(testError)
+
+        await showEdits(itemStub, editorStub as unknown as vscode.TextEditor, sessionStub, languageClientStub)
+
+        // Verify SVG generation was called
+        sinon.assert.calledOnce(svgGenerationServiceStub.generateDiffSvg)
+
+        // Verify display decoration was called
+        sinon.assert.calledOnce(displaySvgDecorationStub)
+
+        // Verify error was logged with correct message
+        sinon.assert.calledOnce(loggerStub.error)
+        const errorCall = loggerStub.error.getCall(0)
+        assert.strictEqual(errorCall.args[0], `Error generating SVG image: ${testError}`)
+    })
+
+    it('should use correct logger name', async function () {
+        await showEdits(itemStub, editorStub as unknown as vscode.TextEditor, sessionStub, languageClientStub)
+
+        // Verify getLogger was called with correct name
+        sinon.assert.calledWith(getLoggerStub, 'nextEditPrediction')
+    })
+
+    it('should handle item with undefined insertText', async function () {
+        // Create item with undefined insertText
+        const itemWithUndefinedText = {
+            ...itemStub,
+            insertText: undefined,
+        } as any
+
+        // Setup successful SVG generation
+        const mockSvgResult = createMockSvgResult()
+        svgGenerationServiceStub.generateDiffSvg.resolves(mockSvgResult)
+
+        await showEdits(
+            itemWithUndefinedText,
+            editorStub as unknown as vscode.TextEditor,
+            sessionStub,
+            languageClientStub
+        )
+
+        // Verify SVG generation was called with undefined as string
+        sinon.assert.calledOnce(svgGenerationServiceStub.generateDiffSvg)
+        sinon.assert.calledWith(svgGenerationServiceStub.generateDiffSvg, '/path/to/test/file.ts', undefined)
+    })
+})
diff --git a/packages/amazonq/test/unit/app/inline/EditRendering/svgGenerator.test.ts b/packages/amazonq/test/unit/app/inline/EditRendering/svgGenerator.test.ts
new file mode 100644
index 00000000000..657ff5c2915
--- /dev/null
+++ b/packages/amazonq/test/unit/app/inline/EditRendering/svgGenerator.test.ts
@@ -0,0 +1,252 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import assert from 'assert'
+import { SvgGenerationService } from '../../../../../src/app/inline/EditRendering/svgGenerator'
+
+describe('SvgGenerationService', function () {
+    let sandbox: sinon.SinonSandbox
+    let service: SvgGenerationService
+    let documentStub: sinon.SinonStubbedInstance<vscode.TextDocument>
+    let workspaceStub: sinon.SinonStubbedInstance<typeof vscode.workspace>
+    let editorConfigStub: any
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+
+        // Create stubs for vscode objects and utilities
+        documentStub = {
+            getText: sandbox.stub().returns('function example() {\n  return 42;\n}'),
+            lineCount: 3,
+            lineAt: sandbox.stub().returns({
+                text: 'Line content',
+                range: new vscode.Range(0, 0, 0, 12),
+            }),
+        } as unknown as sinon.SinonStubbedInstance<vscode.TextDocument>
+
+        workspaceStub = sandbox.stub(vscode.workspace)
+        workspaceStub.openTextDocument.resolves(documentStub as unknown as vscode.TextDocument)
+        workspaceStub.getConfiguration = sandbox.stub()
+
+        editorConfigStub = {
+            get: sandbox.stub(),
+        }
+        editorConfigStub.get.withArgs('fontSize').returns(14)
+        editorConfigStub.get.withArgs('lineHeight').returns(0)
+
+        // Create the service instance
+        service = new SvgGenerationService()
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    describe('generateDiffSvg', function () {
+        it('should handle empty original code', async function () {
+            // Create a new document stub for this test with empty content
+            const emptyDocStub = {
+                getText: sandbox.stub().returns(''),
+                lineCount: 0,
+                lineAt: sandbox.stub().returns({
+                    text: '',
+                    range: new vscode.Range(0, 0, 0, 0),
+                }),
+            } as unknown as vscode.TextDocument
+
+            // Make openTextDocument return our empty document
+            workspaceStub.openTextDocument.resolves(emptyDocStub as unknown as vscode.TextDocument)
+
+            // A simple unified diff
+            const udiff = '--- a/example.js\n+++ b/example.js\n@@ -0,0 +1,1 @@\n+function example() {}\n'
+
+            // Expect an error to be thrown
+            try {
+                await service.generateDiffSvg('example.js', udiff)
+                assert.fail('Expected an error to be thrown')
+            } catch (error) {
+                assert.ok(error)
+                assert.strictEqual((error as Error).message, 'udiff format error')
+            }
+        })
+    })
+
+    describe('theme handling', function () {
+        it('should generate correct styles for dark theme', function () {
+            // Configure for dark theme
+            workspaceStub.getConfiguration.withArgs('editor').returns(editorConfigStub)
+            workspaceStub.getConfiguration.withArgs('workbench').returns({
+                get: sandbox.stub().withArgs('colorTheme', 'Default').returns('Dark+ (default dark)'),
+            } as any)
+
+            const getEditorTheme = (service as any).getEditorTheme.bind(service)
+            const theme = getEditorTheme()
+
+            assert.strictEqual(theme.fontSize, 14)
+            assert.strictEqual(theme.lingHeight, 21) // 1.5 * 14
+            assert.strictEqual(theme.foreground, 'rgba(212, 212, 212, 1)')
+            assert.strictEqual(theme.background, 'rgba(30, 30, 30, 1)')
+        })
+
+        it('should generate correct styles for light theme', function () {
+            // Reconfigure for light theme
+            editorConfigStub.get.withArgs('fontSize', 12).returns(12)
+
+            workspaceStub.getConfiguration.withArgs('editor').returns(editorConfigStub)
+            workspaceStub.getConfiguration.withArgs('workbench').returns({
+                get: sandbox.stub().withArgs('colorTheme', 'Default').returns('Light+ (default light)'),
+            } as any)
+
+            const getEditorTheme = (service as any).getEditorTheme.bind(service)
+            const theme = getEditorTheme()
+
+            assert.strictEqual(theme.fontSize, 12)
+            assert.strictEqual(theme.lingHeight, 18) // 1.5 * 12
+            assert.strictEqual(theme.foreground, 'rgba(0, 0, 0, 1)')
+            assert.strictEqual(theme.background, 'rgba(255, 255, 255, 1)')
+        })
+
+        it('should handle custom line height settings', function () {
+            // Reconfigure for custom line height
+            editorConfigStub.get.withArgs('fontSize').returns(16)
+            editorConfigStub.get.withArgs('lineHeight').returns(2.5)
+
+            workspaceStub.getConfiguration.withArgs('editor').returns(editorConfigStub)
+            workspaceStub.getConfiguration.withArgs('workbench').returns({
+                get: sandbox.stub().withArgs('colorTheme', 'Default').returns('Dark+ (default dark)'),
+            } as any)
+
+            const getEditorTheme = (service as any).getEditorTheme.bind(service)
+            const theme = getEditorTheme()
+
+            assert.strictEqual(theme.fontSize, 16)
+            assert.strictEqual(theme.lingHeight, 40) // 2.5 * 16
+        })
+
+        it('should generate CSS styles correctly', function () {
+            const theme = {
+                fontSize: 14,
+                lingHeight: 21,
+                foreground: 'rgba(212, 212, 212, 1)',
+                background: 'rgba(30, 30, 30, 1)',
+                diffAdded: 'rgba(231, 245, 231, 0.2)',
+                diffRemoved: 'rgba(255, 0, 0, 0.2)',
+            }
+
+            const generateStyles = (service as any).generateStyles.bind(service)
+            const styles = generateStyles(theme)
+
+            assert.ok(styles.includes('font-size: 14px'))
+            assert.ok(styles.includes('line-height: 21px'))
+            assert.ok(styles.includes('color: rgba(212, 212, 212, 1)'))
+            assert.ok(styles.includes('background-color: rgba(30, 30, 30, 1)'))
+            assert.ok(styles.includes('.diff-changed'))
+            assert.ok(styles.includes('.diff-removed'))
+        })
+    })
+
+    describe('highlight ranges', function () {
+        it('should generate highlight ranges for word-level changes', function () {
+            const originalCode = ['function test() {', '  return 42;', '}']
+            const afterCode = ['function test() {', '  return 100;', '}']
+            const modifiedLines = new Map([['  return 42;', '  return 100;']])
+
+            const generateHighlightRanges = (service as any).generateHighlightRanges.bind(service)
+            const result = generateHighlightRanges(originalCode, afterCode, modifiedLines)
+
+            // Should have ranges for the changed characters
+            assert.ok(result.removedRanges.length > 0)
+            assert.ok(result.addedRanges.length > 0)
+
+            // Check that ranges are properly formatted
+            const removedRange = result.removedRanges[0]
+            assert.ok(removedRange.line >= 0)
+            assert.ok(removedRange.start >= 0)
+            assert.ok(removedRange.end > removedRange.start)
+
+            const addedRange = result.addedRanges[0]
+            assert.ok(addedRange.line >= 0)
+            assert.ok(addedRange.start >= 0)
+            assert.ok(addedRange.end > addedRange.start)
+        })
+
+        it('should handle HTML escaping in highlight edits', function () {
+            const newLines = ['function test() {', '  return "<script>alert(1)</script>";', '}']
+            const highlightRanges = [{ line: 1, start: 10, end: 35 }]
+
+            const getHighlightEdit = (service as any).getHighlightEdit.bind(service)
+            const result = getHighlightEdit(newLines, highlightRanges)
+
+            assert.ok(result[1].includes('&lt;script&gt;'))
+            assert.ok(result[1].includes('&lt;/script&gt;'))
+            assert.ok(result[1].includes('diff-changed'))
+        })
+    })
+
+    describe('dimensions and positioning', function () {
+        it('should calculate dimensions correctly', function () {
+            const newLines = ['function test() {', '  return 42;', '}']
+            const theme = {
+                fontSize: 14,
+                lingHeight: 21,
+                foreground: 'rgba(212, 212, 212, 1)',
+                background: 'rgba(30, 30, 30, 1)',
+            }
+
+            const calculateDimensions = (service as any).calculateDimensions.bind(service)
+            const result = calculateDimensions(newLines, theme)
+
+            assert.strictEqual(result.width, 287)
+            assert.strictEqual(result.height, 109)
+            assert.ok(result.height >= (newLines.length + 1) * theme.lingHeight)
+        })
+
+        it('should calculate position offset correctly', function () {
+            const originalLines = ['function test() {', '  return 42;', '}']
+            const newLines = ['function test() {', '  return 100;', '}']
+            const diffLines = ['  return 100;']
+            const theme = {
+                fontSize: 14,
+                lingHeight: 21,
+                foreground: 'rgba(212, 212, 212, 1)',
+                background: 'rgba(30, 30, 30, 1)',
+            }
+
+            const calculatePosition = (service as any).calculatePosition.bind(service)
+            const result = calculatePosition(originalLines, newLines, diffLines, theme)
+
+            assert.strictEqual(result.offset, 10)
+            assert.strictEqual(result.editStartLine, 1)
+        })
+    })
+
+    describe('HTML content generation', function () {
+        it('should generate HTML content with proper structure', function () {
+            const diffLines = ['function test() {', '  return 42;', '}']
+            const styles = '.code-container { color: white; }'
+            const offset = 20
+
+            const generateHtmlContent = (service as any).generateHtmlContent.bind(service)
+            const result = generateHtmlContent(diffLines, styles, offset)
+
+            assert.ok(result.includes('<div xmlns="http://www.w3.org/1999/xhtml">'))
+            assert.ok(result.includes('<style>'))
+            assert.ok(result.includes('margin-left: 20px'))
+            assert.ok(result.includes('Q: Press [Tab] to accept or [Esc] to reject:'))
+            assert.ok(result.includes('function test() {'))
+        })
+
+        it('should escape HTML characters properly', function () {
+            const escapeHtml = (service as any).escapeHtml.bind(service)
+
+            assert.strictEqual(escapeHtml('<script>'), '&lt;script&gt;')
+            assert.strictEqual(escapeHtml('&amp;'), '&amp;amp;')
+            assert.strictEqual(escapeHtml('"quoted"'), '&quot;quoted&quot;')
+            assert.strictEqual(escapeHtml("'quoted'"), '&#039;quoted&#039;')
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/app/inline/completion.test.ts b/packages/amazonq/test/unit/app/inline/completion.test.ts
new file mode 100644
index 00000000000..5c8673a0276
--- /dev/null
+++ b/packages/amazonq/test/unit/app/inline/completion.test.ts
@@ -0,0 +1,210 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as assert from 'assert'
+import * as sinon from 'sinon'
+import { AmazonQInlineCompletionItemProvider } from '../../../../src/app/inline/completion'
+
+describe('AmazonQInlineCompletionItemProvider', function () {
+    let provider: AmazonQInlineCompletionItemProvider
+    let mockLanguageClient: any
+    let sandbox: sinon.SinonSandbox
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        mockLanguageClient = {
+            sendNotification: sandbox.stub(),
+        }
+
+        // Create provider with minimal mocks
+        provider = new AmazonQInlineCompletionItemProvider(
+            mockLanguageClient,
+            {} as any, // recommendationService
+            {} as any, // sessionManager
+            {} as any, // inlineTutorialAnnotation
+            {} as any // documentEventListener
+        )
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    describe('batchDiscardTelemetryForEditSuggestion', function () {
+        it('should batch multiple completion items into single telemetry event', function () {
+            const items = [
+                { itemId: 'item1', isInlineEdit: false },
+                { itemId: 'item2', isInlineEdit: false },
+                { itemId: 'item3', isInlineEdit: false },
+            ]
+
+            const session = {
+                sessionId: 'test-session',
+                firstCompletionDisplayLatency: 100,
+                requestStartTime: Date.now() - 1000,
+            }
+
+            provider.batchDiscardTelemetryForEditSuggestion(items, session)
+
+            // Verify single telemetry notification was sent
+            assert.strictEqual(mockLanguageClient.sendNotification.callCount, 1)
+
+            // Verify the notification contains all items
+            const call = mockLanguageClient.sendNotification.getCall(0)
+            const params = call.args[1]
+
+            assert.strictEqual(params.sessionId, 'test-session')
+            assert.strictEqual(Object.keys(params.completionSessionResult).length, 3)
+            assert.deepStrictEqual(params.completionSessionResult.item1, {
+                seen: false,
+                accepted: false,
+                discarded: true,
+            })
+            assert.deepStrictEqual(params.completionSessionResult.item2, {
+                seen: false,
+                accepted: false,
+                discarded: true,
+            })
+            assert.deepStrictEqual(params.completionSessionResult.item3, {
+                seen: false,
+                accepted: false,
+                discarded: true,
+            })
+        })
+
+        it('should filter out inline edit items', function () {
+            const items = [
+                { itemId: 'item1', isInlineEdit: false },
+                { itemId: 'item2', isInlineEdit: true }, // Should be filtered out
+                { itemId: 'item3', isInlineEdit: false },
+            ]
+
+            const session = {
+                sessionId: 'test-session',
+                firstCompletionDisplayLatency: 100,
+                requestStartTime: Date.now() - 1000,
+            }
+
+            provider.batchDiscardTelemetryForEditSuggestion(items, session)
+
+            const call = mockLanguageClient.sendNotification.getCall(0)
+            const params = call.args[1]
+
+            // Should only include 2 items (item2 filtered out)
+            assert.strictEqual(Object.keys(params.completionSessionResult).length, 2)
+            assert.ok(params.completionSessionResult.item1)
+            assert.ok(params.completionSessionResult.item3)
+            assert.ok(!params.completionSessionResult.item2)
+        })
+
+        it('should not send notification when no valid items', function () {
+            const items = [
+                { itemId: 'item1', isInlineEdit: true }, // Filtered out
+                { itemId: undefined, isInlineEdit: false }, // No itemId
+            ]
+
+            const session = {
+                sessionId: 'test-session',
+                firstCompletionDisplayLatency: 100,
+                requestStartTime: Date.now() - 1000,
+            }
+
+            provider.batchDiscardTelemetryForEditSuggestion(items, session)
+
+            // No notification should be sent
+            assert.strictEqual(mockLanguageClient.sendNotification.callCount, 0)
+        })
+    })
+
+    describe('isCompletionActive', function () {
+        let mockSessionManager: any
+        let mockVscodeCommands: any
+
+        beforeEach(function () {
+            mockSessionManager = {
+                getActiveSession: sandbox.stub(),
+            }
+
+            // Mock vscode.commands.executeCommand
+            mockVscodeCommands = sandbox.stub(require('vscode').commands, 'executeCommand')
+
+            // Create provider with mocked session manager
+            provider = new AmazonQInlineCompletionItemProvider(
+                mockLanguageClient,
+                {} as any, // recommendationService
+                mockSessionManager,
+                {} as any, // inlineTutorialAnnotation
+                {} as any // documentEventListener
+            )
+        })
+
+        it('should return false when no active session', async function () {
+            mockSessionManager.getActiveSession.returns(undefined)
+
+            const result = await provider.isCompletionActive()
+
+            assert.strictEqual(result, false)
+            assert.strictEqual(mockVscodeCommands.callCount, 0)
+        })
+
+        it('should return false when session not displayed', async function () {
+            mockSessionManager.getActiveSession.returns({
+                displayed: false,
+                suggestions: [{ isInlineEdit: false }],
+                lastVisibleTime: 0,
+            })
+
+            const result = await provider.isCompletionActive()
+
+            assert.strictEqual(result, false)
+            assert.strictEqual(mockVscodeCommands.callCount, 0)
+        })
+
+        it('should return false when session has inline edit suggestions', async function () {
+            mockSessionManager.getActiveSession.returns({
+                displayed: true,
+                suggestions: [{ isInlineEdit: true }],
+                lastVisibleTime: Date.now(),
+            })
+
+            const result = await provider.isCompletionActive()
+
+            assert.strictEqual(result, false)
+            assert.strictEqual(mockVscodeCommands.callCount, 0)
+        })
+
+        it('should return true when VS Code command executes successfully', async function () {
+            const currentTime = Date.now()
+            mockSessionManager.getActiveSession.returns({
+                displayed: true,
+                suggestions: [{ isInlineEdit: false }],
+                lastVisibleTime: currentTime, // Recent timestamp
+            })
+            mockVscodeCommands.resolves()
+
+            const result = await provider.isCompletionActive()
+
+            assert.strictEqual(result, true)
+            assert.strictEqual(mockVscodeCommands.callCount, 1)
+            assert.strictEqual(mockVscodeCommands.getCall(0).args[0], 'aws.amazonq.checkInlineSuggestionVisibility')
+        })
+
+        it('should return false when VS Code command fails', async function () {
+            const oldTime = Date.now() - 100 // Old timestamp (>50ms ago)
+            mockSessionManager.getActiveSession.returns({
+                displayed: true,
+                suggestions: [{ isInlineEdit: false }],
+                lastVisibleTime: oldTime,
+            })
+            mockVscodeCommands.resolves() // Command doesn't fail, but timestamp is old
+
+            const result = await provider.isCompletionActive()
+
+            assert.strictEqual(result, false)
+            assert.strictEqual(mockVscodeCommands.callCount, 1)
+            assert.strictEqual(mockVscodeCommands.getCall(0).args[0], 'aws.amazonq.checkInlineSuggestionVisibility')
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/app/inline/cursorUpdateManager.test.ts b/packages/amazonq/test/unit/app/inline/cursorUpdateManager.test.ts
new file mode 100644
index 00000000000..aec2c1c7ddf
--- /dev/null
+++ b/packages/amazonq/test/unit/app/inline/cursorUpdateManager.test.ts
@@ -0,0 +1,329 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import { BaseLanguageClient } from 'vscode-languageclient'
+import { CursorUpdateManager } from '../../../../src/app/inline/cursorUpdateManager'
+import { globals } from 'aws-core-vscode/shared'
+import assert from 'assert'
+import { AmazonQInlineCompletionItemProvider } from '../../../../src/app/inline/completion'
+import { CodeSuggestionsState } from 'aws-core-vscode/codewhisperer'
+
+describe('CursorUpdateManager', () => {
+    let cursorUpdateManager: CursorUpdateManager
+    let languageClient: BaseLanguageClient
+    let clock: sinon.SinonFakeTimers
+    let sendRequestStub: sinon.SinonStub
+    let setIntervalStub: sinon.SinonStub
+    let clearIntervalStub: sinon.SinonStub
+    let dateNowStub: sinon.SinonStub
+
+    beforeEach(() => {
+        // Create stubs for all the methods we'll use
+        sendRequestStub = sinon.stub()
+        sendRequestStub.resolves({}) // Default resolve value
+
+        languageClient = {
+            sendRequest: sendRequestStub,
+        } as unknown as BaseLanguageClient
+
+        // Setup clock stubs
+        clock = sinon.useFakeTimers()
+        setIntervalStub = sinon.stub(globals.clock, 'setInterval').returns(1 as unknown as NodeJS.Timeout)
+        clearIntervalStub = sinon.stub(globals.clock, 'clearInterval')
+        dateNowStub = sinon.stub(globals.clock.Date, 'now').returns(1000)
+
+        // Create the manager with a mock recommendation service
+        const mockInlineCompletionProvider = {
+            provideInlineCompletionItems: sinon.stub().resolves([]),
+        } as unknown as AmazonQInlineCompletionItemProvider
+        cursorUpdateManager = new CursorUpdateManager(languageClient, mockInlineCompletionProvider)
+    })
+
+    afterEach(() => {
+        sinon.restore()
+        clock.restore()
+    })
+
+    it('should initialize with default values', () => {
+        assert.strictEqual((cursorUpdateManager as any).updateIntervalMs, 250)
+        assert.strictEqual((cursorUpdateManager as any).isActive, false)
+    })
+
+    it('should start tracking cursor positions', async () => {
+        // Setup the server response for configuration
+        sendRequestStub.resolves({ intervalMs: 500 })
+
+        await cursorUpdateManager.start()
+
+        // Verify the configuration was requested
+        assert.ok(sendRequestStub.called)
+        assert.strictEqual(sendRequestStub.firstCall.args[0], 'aws/getConfigurationFromServer')
+
+        // Verify the interval was updated and timer was started
+        assert.strictEqual((cursorUpdateManager as any).updateIntervalMs, 500)
+        assert.strictEqual((cursorUpdateManager as any).isActive, true)
+        assert.ok(setIntervalStub.called)
+    })
+
+    it('should use default interval if server config is invalid', async () => {
+        // Setup the server response with invalid config
+        sendRequestStub.resolves(undefined)
+
+        await cursorUpdateManager.start()
+
+        // Verify the interval was not updated but timer was started
+        assert.strictEqual((cursorUpdateManager as any).updateIntervalMs, 250)
+        assert.strictEqual((cursorUpdateManager as any).isActive, true)
+        assert.ok(setIntervalStub.called)
+    })
+
+    it('should handle server configuration errors', async () => {
+        // Setup the server to throw an error
+        sendRequestStub.onFirstCall().rejects(new Error('Server error'))
+        sendRequestStub.onSecondCall().resolves({})
+
+        await cursorUpdateManager.start()
+
+        // Verify we still start with default values
+        assert.strictEqual((cursorUpdateManager as any).updateIntervalMs, 250)
+        assert.strictEqual((cursorUpdateManager as any).isActive, true)
+        assert.ok(setIntervalStub.called)
+    })
+
+    it('should update cursor position', () => {
+        const position = new vscode.Position(1, 2)
+        const uri = 'file:///test.ts'
+
+        cursorUpdateManager.updatePosition(position, uri)
+
+        assert.deepStrictEqual((cursorUpdateManager as any).lastPosition, position)
+        assert.strictEqual((cursorUpdateManager as any).lastDocumentUri, uri)
+    })
+
+    it('should record completion request time', () => {
+        dateNowStub.returns(2000)
+        cursorUpdateManager.recordCompletionRequest()
+        assert.strictEqual((cursorUpdateManager as any).lastRequestTime, 2000)
+    })
+
+    it('should stop tracking and clean up resources', () => {
+        // First start the manager
+        ;(cursorUpdateManager as any).isActive = true as boolean
+        ;(cursorUpdateManager as any).updateTimer = 123
+
+        cursorUpdateManager.stop()
+
+        assert.strictEqual((cursorUpdateManager as any).isActive, false)
+        assert.ok(clearIntervalStub.called)
+        assert.strictEqual(clearIntervalStub.firstCall.args[0], 123)
+    })
+
+    it('should dispose resources', () => {
+        const stopSpy = sinon.spy(cursorUpdateManager, 'stop')
+
+        cursorUpdateManager.dispose()
+
+        assert.ok(stopSpy.called)
+    })
+
+    // Helper function to setup cursor update test
+    function setupCursorUpdateTest() {
+        // Setup test data
+        const position = new vscode.Position(1, 2)
+        const uri = 'file:///test.ts'
+        cursorUpdateManager.updatePosition(position, uri)
+
+        // Mock the active editor
+        const mockEditor = {
+            document: {
+                uri: { toString: () => uri },
+            },
+        }
+        sinon.stub(vscode.window, 'activeTextEditor').get(() => mockEditor as any)
+
+        // Create a mock cancellation token source
+        const mockCancellationTokenSource = {
+            token: {} as vscode.CancellationToken,
+            dispose: sinon.stub(),
+        }
+        sinon.stub(cursorUpdateManager as any, 'createCancellationTokenSource').returns(mockCancellationTokenSource)
+
+        // Mock the provideInlineCompletionItems method with a proper stub
+        const provideStub = sinon.stub().resolves([])
+        ;(cursorUpdateManager as any).inlineCompletionProvider = {
+            provideInlineCompletionItems: provideStub,
+        }
+
+        return { provideStub, position, uri }
+    }
+
+    it('should send cursor update requests at intervals', () => {
+        const { provideStub } = setupCursorUpdateTest()
+
+        // Start the manager - we're not awaiting this since we're just setting up the test
+        void cursorUpdateManager.start()
+
+        // Reset the sendRequestStub to clear the call from start()
+        sendRequestStub.resetHistory()
+
+        // Make sure lastSentPosition is different from lastPosition to trigger an update
+        ;(cursorUpdateManager as any).lastSentPosition = new vscode.Position(0, 0)
+
+        // Manually call the interval function
+        ;(cursorUpdateManager as any).sendCursorUpdate()
+
+        // Verify the provider was called
+        assert.strictEqual(provideStub.called, true, 'provideInlineCompletionItems should have been called')
+    })
+
+    it('should not send cursor update if a regular request was made recently', async () => {
+        setupCursorUpdateTest()
+
+        // Start the manager
+        await cursorUpdateManager.start()
+
+        // Reset the sendRequestStub to clear the call from start()
+        sendRequestStub.resetHistory()
+
+        // Record a recent completion request
+        dateNowStub.returns(1000)
+        cursorUpdateManager.recordCompletionRequest()
+
+        // Set current time to be within the interval
+        dateNowStub.returns(1100) // Only 100ms after the request
+
+        // Manually call the interval function
+        await (cursorUpdateManager as any).sendCursorUpdate()
+
+        // Verify no request was sent
+        assert.strictEqual(sendRequestStub.called, false)
+    })
+
+    it('should not send cursor update if position has not changed since last update', async () => {
+        const { provideStub } = setupCursorUpdateTest()
+
+        // Start the manager
+        await cursorUpdateManager.start()
+
+        // Set lastSentPosition to undefined to ensure first update is sent
+        ;(cursorUpdateManager as any).lastSentPosition = undefined
+
+        // First call to sendCursorUpdate - should send update
+        await (cursorUpdateManager as any).sendCursorUpdate()
+
+        // Verify the provider was called once
+        assert.strictEqual(provideStub.callCount, 1, 'First update should be sent')
+
+        // Reset the stub to clear the call history
+        provideStub.resetHistory()
+
+        // Second call to sendCursorUpdate without changing position - should NOT send update
+        await (cursorUpdateManager as any).sendCursorUpdate()
+
+        // Verify the provider was NOT called again
+        assert.strictEqual(provideStub.callCount, 0, 'No update should be sent when position has not changed')
+
+        // Now change the position
+        const newPosition = new vscode.Position(1, 3)
+        cursorUpdateManager.updatePosition(newPosition, 'file:///test.ts')
+
+        // Third call to sendCursorUpdate with changed position - should send update
+        await (cursorUpdateManager as any).sendCursorUpdate()
+
+        // Verify the provider was called again
+        assert.strictEqual(provideStub.callCount, 1, 'Update should be sent when position has changed')
+    })
+
+    describe('autotrigger state handling', () => {
+        class TestCodeSuggestionsState extends CodeSuggestionsState {
+            private _isEnabled: boolean
+            private _onDidChangeStateEmitter = new vscode.EventEmitter<boolean>()
+
+            public constructor(initialState: boolean = true) {
+                super(initialState)
+                this._isEnabled = initialState
+            }
+
+            public override onDidChangeState = this._onDidChangeStateEmitter.event
+
+            public override isSuggestionsEnabled(): boolean {
+                return this._isEnabled
+            }
+
+            public override async setSuggestionsEnabled(enabled: boolean): Promise<void> {
+                if (this._isEnabled !== enabled) {
+                    this._isEnabled = enabled
+                    this._onDidChangeStateEmitter.fire(enabled)
+                }
+            }
+        }
+
+        let testCodeSuggestionsState: TestCodeSuggestionsState
+        let instanceStub: sinon.SinonStub
+        let testCursorUpdateManager: CursorUpdateManager
+
+        beforeEach(() => {
+            // Create test instance
+            testCodeSuggestionsState = new TestCodeSuggestionsState(true)
+
+            // Stub the static getter to return our test instance
+            instanceStub = sinon.stub(CodeSuggestionsState, 'instance').get(() => testCodeSuggestionsState)
+
+            // Create the manager AFTER the stub is in place so it uses the test instance
+            const mockInlineCompletionProvider = {
+                provideInlineCompletionItems: sinon.stub().resolves([]),
+            } as unknown as AmazonQInlineCompletionItemProvider
+            testCursorUpdateManager = new CursorUpdateManager(languageClient, mockInlineCompletionProvider)
+        })
+
+        afterEach(() => {
+            // Dispose the test manager
+            testCursorUpdateManager.dispose()
+            // Restore the original getter
+            instanceStub.restore()
+        })
+
+        it('should not start timer when autotrigger is disabled', async () => {
+            // Test the new behavior: timer doesn't start when autotrigger is disabled
+            await testCodeSuggestionsState.setSuggestionsEnabled(false)
+            sendRequestStub.resolves({})
+
+            await testCursorUpdateManager.start()
+
+            // Manager should be active but timer should not be started
+            assert.strictEqual((testCursorUpdateManager as any).isActive, true)
+            assert.ok(!setIntervalStub.called, 'Timer should NOT be started when autotrigger is disabled')
+        })
+
+        it('should start/stop timer when autotrigger state changes', async () => {
+            // Start with autotrigger enabled
+            await testCodeSuggestionsState.setSuggestionsEnabled(true)
+            sendRequestStub.resolves({})
+            await testCursorUpdateManager.start()
+
+            // Reset stubs to test state changes
+            setIntervalStub.resetHistory()
+            clearIntervalStub.resetHistory()
+
+            // Simulate autotrigger being disabled
+            await testCodeSuggestionsState.setSuggestionsEnabled(false)
+            assert.ok(clearIntervalStub.called, 'Timer should be stopped when autotrigger is disabled')
+
+            // Simulate autotrigger being enabled again
+            await testCodeSuggestionsState.setSuggestionsEnabled(true)
+            assert.ok(setIntervalStub.called, 'Timer should be started when autotrigger is re-enabled')
+        })
+
+        it('should dispose autotrigger state listener on dispose', () => {
+            testCursorUpdateManager.dispose()
+            // The dispose method should clean up the state listener
+            // We can't easily test the disposal without more complex mocking,
+            // but we can at least verify dispose doesn't throw
+            assert.ok(true, 'Dispose should complete without errors')
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/app/inline/notebookUtil.test.ts b/packages/amazonq/test/unit/app/inline/notebookUtil.test.ts
new file mode 100644
index 00000000000..697c88ef6ec
--- /dev/null
+++ b/packages/amazonq/test/unit/app/inline/notebookUtil.test.ts
@@ -0,0 +1,87 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as assert from 'assert'
+import { createMockDocument } from 'aws-core-vscode/test'
+import { convertCellContent, getNotebookContext } from '../../../../src/app/inline/notebookUtil'
+import { CodeWhispererConstants } from 'aws-core-vscode/codewhisperer'
+
+export function createNotebookCell(
+    document: vscode.TextDocument = createMockDocument('def example():\n    return "test"'),
+    kind: vscode.NotebookCellKind = vscode.NotebookCellKind.Code,
+    notebook: vscode.NotebookDocument = {} as any,
+    index: number = 0,
+    outputs: vscode.NotebookCellOutput[] = [],
+    metadata: { readonly [key: string]: any } = {},
+    executionSummary?: vscode.NotebookCellExecutionSummary
+): vscode.NotebookCell {
+    return {
+        document,
+        kind,
+        notebook,
+        index,
+        outputs,
+        metadata,
+        executionSummary,
+    }
+}
+
+describe('Notebook Util', function () {
+    describe('convertCellContent', function () {
+        it('should return code cell content as-is', function () {
+            const codeCell = createNotebookCell(
+                createMockDocument('def example():\n    return "test"'),
+                vscode.NotebookCellKind.Code
+            )
+            const result = convertCellContent(codeCell)
+            assert.strictEqual(result, 'def example():\n    return "test"')
+        })
+
+        it('should convert markdown cell content to comments for Python', function () {
+            const markdownCell = createNotebookCell(
+                createMockDocument('# Heading\nSome text'),
+                vscode.NotebookCellKind.Markup
+            )
+            const result = convertCellContent(markdownCell)
+            assert.strictEqual(result, '# # Heading\n# Some text')
+        })
+    })
+
+    describe('getNotebookContext', function () {
+        it('should combine context from multiple cells', function () {
+            const currentDoc = createMockDocument('cell2 content', 'b.ipynb')
+            const notebook = {
+                getCells: () => [
+                    createNotebookCell(createMockDocument('cell1 content', 'a.ipynb'), vscode.NotebookCellKind.Code),
+                    createNotebookCell(currentDoc, vscode.NotebookCellKind.Code),
+                    createNotebookCell(createMockDocument('cell3 content', 'c.ipynb'), vscode.NotebookCellKind.Code),
+                ],
+            } as vscode.NotebookDocument
+
+            const position = new vscode.Position(0, 5)
+
+            const { caretLeftFileContext, caretRightFileContext } = getNotebookContext(notebook, currentDoc, position)
+
+            assert.strictEqual(caretLeftFileContext, 'cell1 content\ncell2')
+            assert.strictEqual(caretRightFileContext, ' content\ncell3 content')
+        })
+
+        it('should respect character limits', function () {
+            const longContent = 'a'.repeat(10000)
+            const notebook = {
+                getCells: () => [createNotebookCell(createMockDocument(longContent), vscode.NotebookCellKind.Code)],
+            } as vscode.NotebookDocument
+
+            const currentDoc = createMockDocument(longContent)
+            const position = new vscode.Position(0, 5000)
+
+            const { caretLeftFileContext, caretRightFileContext } = getNotebookContext(notebook, currentDoc, position)
+
+            assert.ok(caretLeftFileContext.length <= CodeWhispererConstants.charactersLimit)
+            assert.ok(caretRightFileContext.length <= CodeWhispererConstants.charactersLimit)
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/app/inline/webViewPanel.test.ts b/packages/amazonq/test/unit/app/inline/webViewPanel.test.ts
new file mode 100644
index 00000000000..594ddb35a1d
--- /dev/null
+++ b/packages/amazonq/test/unit/app/inline/webViewPanel.test.ts
@@ -0,0 +1,153 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import assert from 'assert'
+import { NextEditPredictionPanel } from '../../../../src/app/inline/webViewPanel'
+
+describe('NextEditPredictionPanel', function () {
+    let sandbox: sinon.SinonSandbox
+    let statusBarStub: sinon.SinonStubbedInstance<vscode.StatusBarItem>
+    let windowStub: sinon.SinonStubbedInstance<typeof vscode.window>
+    let commandsStub: sinon.SinonStubbedInstance<typeof vscode.commands>
+    let panel: NextEditPredictionPanel
+    let webviewPanelStub: sinon.SinonStubbedInstance<vscode.WebviewPanel>
+    let workspaceStub: sinon.SinonStubbedInstance<typeof vscode.workspace>
+    let fileSystemWatcherStub: sinon.SinonStubbedInstance<vscode.FileSystemWatcher>
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+
+        // Create a proper stub for the status bar item
+        statusBarStub = {
+            text: '',
+            tooltip: '',
+            command: '',
+            show: sandbox.stub(),
+            dispose: sandbox.stub(),
+            backgroundColor: undefined,
+        } as unknown as sinon.SinonStubbedInstance<vscode.StatusBarItem>
+
+        // Create a stub for the webview panel with a proper webview object
+        const webviewStub = {
+            html: '',
+            onDidReceiveMessage: sandbox.stub().returns({ dispose: sandbox.stub() }),
+        }
+
+        webviewPanelStub = {
+            dispose: sandbox.stub(),
+            reveal: sandbox.stub(),
+            onDidDispose: sandbox.stub().returns({ dispose: sandbox.stub() }),
+            webview: webviewStub,
+        } as unknown as sinon.SinonStubbedInstance<vscode.WebviewPanel>
+
+        // Create a stub for the file system watcher
+        fileSystemWatcherStub = {
+            onDidChange: sandbox.stub().returns({ dispose: sandbox.stub() }),
+            onDidCreate: sandbox.stub().returns({ dispose: sandbox.stub() }),
+            onDidDelete: sandbox.stub().returns({ dispose: sandbox.stub() }),
+            dispose: sandbox.stub(),
+        } as unknown as sinon.SinonStubbedInstance<vscode.FileSystemWatcher>
+
+        // Stub vscode.window.createStatusBarItem to return our statusBarStub
+        windowStub = sandbox.stub(vscode.window)
+        windowStub.createStatusBarItem.returns(statusBarStub as any)
+        windowStub.createWebviewPanel.returns(webviewPanelStub as any)
+
+        // Stub vscode.commands.registerCommand
+        commandsStub = sandbox.stub(vscode.commands)
+        commandsStub.registerCommand.returns({ dispose: sandbox.stub() })
+
+        // Stub vscode.workspace
+        workspaceStub = sandbox.stub(vscode.workspace)
+        workspaceStub.createFileSystemWatcher.returns(fileSystemWatcherStub as any)
+
+        // Setup clock for timers
+        sandbox.useFakeTimers()
+
+        // Reset any existing instance to ensure we create a new one
+        // This is needed because NextEditPredictionPanel uses a singleton pattern
+        const anyPanel = NextEditPredictionPanel as any
+        anyPanel.instance = undefined
+
+        // Get the panel instance
+        panel = NextEditPredictionPanel.getInstance()
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('should initialize status bar item with correct properties', function () {
+        assert.strictEqual(statusBarStub.text, '$(eye) NEP')
+        assert.strictEqual(statusBarStub.tooltip, 'Toggle Next Edit Prediction Panel')
+        assert.strictEqual(statusBarStub.command, 'aws.amazonq.toggleNextEditPredictionPanel')
+        sinon.assert.calledOnce(statusBarStub.show)
+    })
+
+    it('should toggle panel visibility when command is executed', function () {
+        // Get the command handler that was registered
+        const toggleCommandHandler = commandsStub.registerCommand.firstCall.args[1]
+
+        // Execute the toggle command to show the panel
+        toggleCommandHandler()
+
+        // Verify the panel was created and shown
+        sinon.assert.calledOnce(windowStub.createWebviewPanel)
+        assert.strictEqual(windowStub.createWebviewPanel.firstCall.args[0], 'nextEditPrediction')
+        assert.strictEqual(windowStub.createWebviewPanel.firstCall.args[1], 'Next Edit Prediction')
+
+        // Execute the toggle command again to hide the panel
+        toggleCommandHandler()
+
+        // Verify the panel was disposed
+        sinon.assert.calledOnce(webviewPanelStub.dispose)
+    })
+
+    it('should update panel content with new text', function () {
+        // First show the panel
+        const toggleCommandHandler = commandsStub.registerCommand.firstCall.args[1]
+        toggleCommandHandler()
+
+        // Update the content
+        const testContent = 'Test content update'
+        panel.updateContent(testContent)
+
+        // Verify the webview HTML was updated (it should contain some HTML content)
+        assert.ok(typeof webviewPanelStub.webview.html === 'string')
+        assert.ok(webviewPanelStub.webview.html.length > 0)
+    })
+
+    it('should setup file watcher when panel is shown', function () {
+        // First show the panel to trigger file watcher setup
+        const toggleCommandHandler = commandsStub.registerCommand.firstCall.args[1]
+        toggleCommandHandler()
+
+        // Verify file system watcher was created
+        sinon.assert.calledOnce(workspaceStub.createFileSystemWatcher)
+
+        // Verify the change handler was registered
+        sinon.assert.calledOnce(fileSystemWatcherStub.onDidChange)
+    })
+
+    it('should properly dispose resources when closed', function () {
+        // First show the panel to create resources
+        const toggleCommandHandler = commandsStub.registerCommand.firstCall.args[1]
+        toggleCommandHandler()
+
+        // Now dispose the panel
+        panel.dispose()
+
+        // Verify status bar item was disposed
+        assert.ok(statusBarStub.dispose.called)
+
+        // Verify file watcher was disposed if it was created
+        assert.ok(fileSystemWatcherStub.dispose.called)
+
+        // Verify panel was disposed if it was created
+        assert.ok(webviewPanelStub.dispose.called)
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/commands/invokeRecommendation.test.ts b/packages/amazonq/test/unit/codewhisperer/commands/invokeRecommendation.test.ts
new file mode 100644
index 00000000000..68cebe37bb1
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/commands/invokeRecommendation.test.ts
@@ -0,0 +1,43 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import { resetCodeWhispererGlobalVariables, createMockTextEditor } from 'aws-core-vscode/test'
+import {
+    ConfigurationEntry,
+    invokeRecommendation,
+    InlineCompletionService,
+    isInlineCompletionEnabled,
+    DefaultCodeWhispererClient,
+} from 'aws-core-vscode/codewhisperer'
+
+describe('invokeRecommendation', function () {
+    describe('invokeRecommendation', function () {
+        let getRecommendationStub: sinon.SinonStub
+        let mockClient: DefaultCodeWhispererClient
+
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+            getRecommendationStub = sinon.stub(InlineCompletionService.instance, 'getPaginatedRecommendation')
+        })
+
+        afterEach(function () {
+            sinon.restore()
+        })
+
+        it('Should call getPaginatedRecommendation with OnDemand as trigger type when inline completion is enabled', async function () {
+            const mockEditor = createMockTextEditor()
+            const config: ConfigurationEntry = {
+                isShowMethodsEnabled: true,
+                isManualTriggerEnabled: true,
+                isAutomatedTriggerEnabled: true,
+                isSuggestionsWithCodeReferencesEnabled: true,
+            }
+            await invokeRecommendation(mockEditor, mockClient, config)
+            assert.strictEqual(getRecommendationStub.called, isInlineCompletionEnabled())
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/commands/onAcceptance.test.ts b/packages/amazonq/test/unit/codewhisperer/commands/onAcceptance.test.ts
new file mode 100644
index 00000000000..0471aaa3601
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/commands/onAcceptance.test.ts
@@ -0,0 +1,64 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import { onAcceptance, AcceptedSuggestionEntry, session, CodeWhispererTracker } from 'aws-core-vscode/codewhisperer'
+import { resetCodeWhispererGlobalVariables, createMockTextEditor } from 'aws-core-vscode/test'
+
+describe('onAcceptance', function () {
+    describe('onAcceptance', function () {
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+            session.reset()
+        })
+
+        afterEach(function () {
+            sinon.restore()
+            session.reset()
+        })
+
+        it('Should enqueue an event object to tracker', async function () {
+            const mockEditor = createMockTextEditor()
+            const trackerSpy = sinon.spy(CodeWhispererTracker.prototype, 'enqueue')
+            const fakeReferences = [
+                {
+                    message: '',
+                    licenseName: 'MIT',
+                    repository: 'http://github.com/fake',
+                    recommendationContentSpan: {
+                        start: 0,
+                        end: 10,
+                    },
+                },
+            ]
+            await onAcceptance({
+                editor: mockEditor,
+                range: new vscode.Range(new vscode.Position(1, 0), new vscode.Position(1, 26)),
+                effectiveRange: new vscode.Range(new vscode.Position(1, 0), new vscode.Position(1, 26)),
+                acceptIndex: 0,
+                recommendation: "print('Hello World!')",
+                requestId: '',
+                sessionId: '',
+                triggerType: 'OnDemand',
+                completionType: 'Line',
+                language: 'python',
+                references: fakeReferences,
+            })
+            const actualArg = trackerSpy.getCall(0).args[0] as AcceptedSuggestionEntry
+            assert.ok(trackerSpy.calledOnce)
+            assert.strictEqual(actualArg.originalString, 'def two_sum(nums, target):')
+            assert.strictEqual(actualArg.requestId, '')
+            assert.strictEqual(actualArg.sessionId, '')
+            assert.strictEqual(actualArg.triggerType, 'OnDemand')
+            assert.strictEqual(actualArg.completionType, 'Line')
+            assert.strictEqual(actualArg.language, 'python')
+            assert.deepStrictEqual(actualArg.startPosition, new vscode.Position(1, 0))
+            assert.deepStrictEqual(actualArg.endPosition, new vscode.Position(1, 26))
+            assert.strictEqual(actualArg.index, 0)
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/commands/onInlineAcceptance.test.ts b/packages/amazonq/test/unit/codewhisperer/commands/onInlineAcceptance.test.ts
new file mode 100644
index 00000000000..ed3bc99fa34
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/commands/onInlineAcceptance.test.ts
@@ -0,0 +1,43 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import { resetCodeWhispererGlobalVariables, createMockTextEditor } from 'aws-core-vscode/test'
+import { onInlineAcceptance, RecommendationHandler, session } from 'aws-core-vscode/codewhisperer'
+
+describe('onInlineAcceptance', function () {
+    describe('onInlineAcceptance', function () {
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+            session.reset()
+        })
+
+        afterEach(function () {
+            sinon.restore()
+            session.reset()
+        })
+
+        it('Should dispose inline completion provider', async function () {
+            const mockEditor = createMockTextEditor()
+            const spy = sinon.spy(RecommendationHandler.instance, 'disposeInlineCompletion')
+            await onInlineAcceptance({
+                editor: mockEditor,
+                range: new vscode.Range(new vscode.Position(1, 0), new vscode.Position(1, 21)),
+                effectiveRange: new vscode.Range(new vscode.Position(1, 0), new vscode.Position(1, 21)),
+                acceptIndex: 0,
+                recommendation: "print('Hello World!')",
+                requestId: '',
+                sessionId: '',
+                triggerType: 'OnDemand',
+                completionType: 'Line',
+                language: 'python',
+                references: undefined,
+            })
+            assert.ok(spy.calledWith())
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/models/model.test.ts b/packages/amazonq/test/unit/codewhisperer/models/model.test.ts
new file mode 100644
index 00000000000..7b0888521f4
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/models/model.test.ts
@@ -0,0 +1,174 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import sinon from 'sinon'
+import {
+    CodeIssueGroupingStrategy,
+    CodeIssueGroupingStrategyState,
+    SecurityIssueFilters,
+    SecurityTreeViewFilterState,
+} from 'aws-core-vscode/codewhisperer'
+import { globals } from 'aws-core-vscode/shared'
+
+describe('model', function () {
+    describe('SecurityTreeViewFilterState', function () {
+        let securityTreeViewFilterState: SecurityTreeViewFilterState
+
+        beforeEach(function () {
+            securityTreeViewFilterState = SecurityTreeViewFilterState.instance
+        })
+
+        afterEach(function () {
+            sinon.restore()
+        })
+
+        it('should get the state', async function () {
+            const state: SecurityIssueFilters = {
+                severity: {
+                    Critical: false,
+                    High: true,
+                    Medium: true,
+                    Low: true,
+                    Info: true,
+                },
+            }
+            await globals.globalState.update('aws.amazonq.securityIssueFilters', state)
+            assert.deepStrictEqual(securityTreeViewFilterState.getState(), state)
+        })
+
+        it('should set the state', async function () {
+            await globals.globalState.update('aws.amazonq.securityIssueFilters', {
+                severity: {
+                    Critical: true,
+                    High: true,
+                    Medium: true,
+                    Low: true,
+                    Info: true,
+                },
+            } satisfies SecurityIssueFilters)
+            const state = {
+                severity: {
+                    Critical: false,
+                    High: true,
+                    Medium: true,
+                    Low: true,
+                    Info: true,
+                },
+            } satisfies SecurityIssueFilters
+            await securityTreeViewFilterState.setState(state)
+            assert.deepStrictEqual(globals.globalState.get('aws.amazonq.securityIssueFilters'), state)
+        })
+
+        it('should get hidden severities', async function () {
+            await globals.globalState.update('aws.amazonq.securityIssueFilters', {
+                severity: {
+                    Critical: true,
+                    High: false,
+                    Medium: true,
+                    Low: false,
+                    Info: true,
+                },
+            } satisfies SecurityIssueFilters)
+            const hiddenSeverities = securityTreeViewFilterState.getHiddenSeverities()
+            assert.deepStrictEqual(hiddenSeverities, ['High', 'Low'])
+        })
+    })
+
+    describe('CodeIssueGroupingStrategyState', function () {
+        let sandbox: sinon.SinonSandbox
+        let state: CodeIssueGroupingStrategyState
+
+        beforeEach(function () {
+            sandbox = sinon.createSandbox()
+            state = CodeIssueGroupingStrategyState.instance
+        })
+
+        afterEach(function () {
+            sandbox.restore()
+        })
+
+        describe('instance', function () {
+            it('should return the same instance when called multiple times', function () {
+                const instance1 = CodeIssueGroupingStrategyState.instance
+                const instance2 = CodeIssueGroupingStrategyState.instance
+                assert.strictEqual(instance1, instance2)
+            })
+        })
+
+        describe('getState', function () {
+            it('should return fallback when no state is stored', function () {
+                const result = state.getState()
+
+                assert.equal(result, CodeIssueGroupingStrategy.Severity)
+            })
+
+            it('should return stored state when valid', async function () {
+                const validStrategy = CodeIssueGroupingStrategy.FileLocation
+                await state.setState(validStrategy)
+
+                const result = state.getState()
+
+                assert.equal(result, validStrategy)
+            })
+
+            it('should return fallback when stored state is invalid', async function () {
+                const invalidStrategy = 'invalid'
+                await state.setState(invalidStrategy)
+
+                const result = state.getState()
+
+                assert.equal(result, CodeIssueGroupingStrategy.Severity)
+            })
+        })
+
+        describe('setState', function () {
+            it('should update state and fire change event for valid strategy', async function () {
+                const validStrategy = CodeIssueGroupingStrategy.FileLocation
+
+                // Create a spy to watch for event emissions
+                const eventSpy = sandbox.spy()
+                state.onDidChangeState(eventSpy)
+
+                await state.setState(validStrategy)
+
+                sinon.assert.calledWith(eventSpy, validStrategy)
+            })
+
+            it('should use fallback and fire change event for invalid strategy', async function () {
+                const invalidStrategy = 'invalid'
+
+                // Create a spy to watch for event emissions
+                const eventSpy = sandbox.spy()
+                state.onDidChangeState(eventSpy)
+
+                await state.setState(invalidStrategy)
+
+                sinon.assert.calledWith(eventSpy, CodeIssueGroupingStrategy.Severity)
+            })
+        })
+
+        describe('reset', function () {
+            it('should set state to fallback value', async function () {
+                const setStateStub = sandbox.stub(state, 'setState').resolves()
+
+                await state.reset()
+
+                sinon.assert.calledWith(setStateStub, CodeIssueGroupingStrategy.Severity)
+            })
+        })
+
+        describe('onDidChangeState', function () {
+            it('should allow subscribing to state changes', async function () {
+                const listener = sandbox.spy()
+                const disposable = state.onDidChangeState(listener)
+
+                await state.setState(CodeIssueGroupingStrategy.Severity)
+
+                sinon.assert.calledWith(listener, CodeIssueGroupingStrategy.Severity)
+                disposable.dispose()
+            })
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/region/regionProfileManager.test.ts b/packages/amazonq/test/unit/codewhisperer/region/regionProfileManager.test.ts
new file mode 100644
index 00000000000..11441b9bf6f
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/region/regionProfileManager.test.ts
@@ -0,0 +1,301 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+import assert, { fail } from 'assert'
+import { AuthUtil, RegionProfile, RegionProfileManager, defaultServiceConfig } from 'aws-core-vscode/codewhisperer'
+import { globals } from 'aws-core-vscode/shared'
+import { createTestAuth } from 'aws-core-vscode/test'
+import { SsoConnection } from 'aws-core-vscode/auth'
+
+const enterpriseSsoStartUrl = 'https://enterprise.awsapps.com/start'
+
+describe('RegionProfileManager', function () {
+    let sut: RegionProfileManager
+    let auth: ReturnType<typeof createTestAuth>
+    let authUtil: AuthUtil
+
+    const profileFoo: RegionProfile = {
+        name: 'foo',
+        region: 'us-east-1',
+        arn: 'foo arn',
+        description: 'foo description',
+    }
+
+    async function setupConnection(type: 'builderId' | 'idc') {
+        if (type === 'builderId') {
+            await authUtil.connectToAwsBuilderId()
+            const conn = authUtil.conn
+            assert.strictEqual(conn?.type, 'sso')
+            assert.strictEqual(conn.label, 'AWS Builder ID')
+        } else if (type === 'idc') {
+            await authUtil.connectToEnterpriseSso(enterpriseSsoStartUrl, 'us-east-1')
+            const conn = authUtil.conn
+            assert.strictEqual(conn?.type, 'sso')
+            assert.strictEqual(conn.label, 'IAM Identity Center (enterprise)')
+        }
+    }
+
+    beforeEach(function () {
+        auth = createTestAuth(globals.globalState)
+        authUtil = new AuthUtil(auth)
+        sut = new RegionProfileManager(() => authUtil.conn)
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    describe('list profiles', function () {
+        it('should call list profiles with different region endpoints', async function () {
+            await setupConnection('idc')
+            const listProfilesStub = sinon.stub().returns({
+                promise: () =>
+                    Promise.resolve({
+                        profiles: [
+                            {
+                                arn: 'arn',
+                                profileName: 'foo',
+                            },
+                        ],
+                    }),
+            })
+            const mockClient = {
+                listAvailableProfiles: listProfilesStub,
+            }
+            const createClientStub = sinon.stub(sut, '_createQClient').resolves(mockClient)
+
+            const r = await sut.listRegionProfile()
+
+            assert.strictEqual(r.length, 2)
+            assert.deepStrictEqual(r, [
+                {
+                    name: 'foo',
+                    arn: 'arn',
+                    region: 'us-east-1',
+                    description: '',
+                },
+                {
+                    name: 'foo',
+                    arn: 'arn',
+                    region: 'eu-central-1',
+                    description: '',
+                },
+            ])
+
+            assert.ok(createClientStub.calledTwice)
+            assert.ok(listProfilesStub.calledTwice)
+        })
+    })
+
+    describe('switch and get profile', function () {
+        it('should switch if connection is IdC', async function () {
+            await setupConnection('idc')
+            await sut.switchRegionProfile(profileFoo, 'user')
+            assert.deepStrictEqual(sut.activeRegionProfile, profileFoo)
+        })
+
+        it('should do nothing and return undefined if connection is builder id', async function () {
+            await setupConnection('builderId')
+            await sut.switchRegionProfile(profileFoo, 'user')
+            assert.deepStrictEqual(sut.activeRegionProfile, undefined)
+        })
+    })
+
+    describe(`client config`, function () {
+        it(`no valid credential should throw`, async function () {
+            assert.ok(authUtil.conn === undefined)
+
+            assert.throws(() => {
+                sut.clientConfig
+            }, /trying to get client configuration without credential/)
+        })
+
+        it(`builder id should always use default profile IAD`, async function () {
+            await setupConnection('builderId')
+            await sut.switchRegionProfile(profileFoo, 'user')
+            assert.deepStrictEqual(sut.activeRegionProfile, undefined)
+            const conn = authUtil.conn
+            if (!conn) {
+                fail('connection should not be undefined')
+            }
+
+            assert.deepStrictEqual(sut.clientConfig, defaultServiceConfig)
+        })
+
+        it(`idc should return correct endpoint corresponding to profile region`, async function () {
+            await setupConnection('idc')
+            await sut.switchRegionProfile(
+                {
+                    name: 'foo',
+                    region: 'eu-central-1',
+                    arn: 'foo arn',
+                    description: 'foo description',
+                },
+                'user'
+            )
+            assert.ok(sut.activeRegionProfile)
+            assert.deepStrictEqual(sut.clientConfig, {
+                region: 'eu-central-1',
+                endpoint: 'https://q.eu-central-1.amazonaws.com/',
+            })
+        })
+
+        it(`idc should throw if corresponding endpoint is not defined`, async function () {
+            await setupConnection('idc')
+            await sut.switchRegionProfile(
+                {
+                    name: 'foo',
+                    region: 'unknown region',
+                    arn: 'foo arn',
+                    description: 'foo description',
+                },
+                'user'
+            )
+
+            assert.throws(() => {
+                sut.clientConfig
+            }, /Q client configuration error, endpoint not found for region*/)
+        })
+    })
+
+    describe('persistence', function () {
+        it('persistSelectedRegionProfile', async function () {
+            await setupConnection('idc')
+            await sut.switchRegionProfile(profileFoo, 'user')
+            assert.deepStrictEqual(sut.activeRegionProfile, profileFoo)
+            const conn = authUtil.conn
+            if (!conn) {
+                fail('connection should not be undefined')
+            }
+
+            await sut.persistSelectRegionProfile()
+
+            const state = globals.globalState.tryGet<{ [label: string]: RegionProfile }>(
+                'aws.amazonq.regionProfiles',
+                Object,
+                {}
+            )
+
+            assert.strictEqual(state[conn.id], profileFoo)
+        })
+
+        it(`restoreRegionProfile`, async function () {
+            sinon.stub(sut, 'listRegionProfile').resolves([profileFoo])
+            await setupConnection('idc')
+            const conn = authUtil.conn
+            if (!conn) {
+                fail('connection should not be undefined')
+            }
+
+            const state = {} as any
+            state[conn.id] = profileFoo
+
+            await globals.globalState.update('aws.amazonq.regionProfiles', state)
+
+            await sut.restoreRegionProfile(conn)
+
+            assert.strictEqual(sut.activeRegionProfile, profileFoo)
+        })
+    })
+
+    describe('invalidate', function () {
+        it('should reset activeProfile and global state', async function () {
+            // setup
+            await setupConnection('idc')
+            await sut.switchRegionProfile(profileFoo, 'user')
+            assert.deepStrictEqual(sut.activeRegionProfile, profileFoo)
+            const conn = authUtil.conn
+            if (!conn) {
+                fail('connection should not be undefined')
+            }
+            await sut.persistSelectRegionProfile()
+            const state = globals.globalState.tryGet<{ [label: string]: RegionProfile }>(
+                'aws.amazonq.regionProfiles',
+                Object,
+                {}
+            )
+            assert.strictEqual(state[conn.id], profileFoo)
+
+            // subject to test
+            await sut.invalidateProfile(profileFoo.arn)
+
+            // assertion
+            assert.strictEqual(sut.activeRegionProfile, undefined)
+            const actualGlobalState = globals.globalState.tryGet<{ [label: string]: RegionProfile }>(
+                'aws.amazonq.regionProfiles',
+                Object,
+                {}
+            )
+            assert.deepStrictEqual(actualGlobalState, {})
+        })
+    })
+
+    describe('createQClient', function () {
+        it(`should configure the endpoint and region from a profile`, async function () {
+            await setupConnection('idc')
+
+            const iadClient = await sut.createQClient({
+                name: 'foo',
+                region: 'us-east-1',
+                arn: 'arn',
+                description: 'description',
+            })
+
+            assert.deepStrictEqual(iadClient.config.region, 'us-east-1')
+            assert.deepStrictEqual(iadClient.endpoint.href, 'https://q.us-east-1.amazonaws.com/')
+
+            const fraClient = await sut.createQClient({
+                name: 'bar',
+                region: 'eu-central-1',
+                arn: 'arn',
+                description: 'description',
+            })
+
+            assert.deepStrictEqual(fraClient.config.region, 'eu-central-1')
+            assert.deepStrictEqual(fraClient.endpoint.href, 'https://q.eu-central-1.amazonaws.com/')
+        })
+
+        it(`should throw if the region is not supported or recognizable by Q`, async function () {
+            await setupConnection('idc')
+
+            await assert.rejects(
+                async () => {
+                    await sut.createQClient({
+                        name: 'foo',
+                        region: 'ap-east-1',
+                        arn: 'arn',
+                        description: 'description',
+                    })
+                },
+                { message: /trying to initiatize Q client with unrecognizable region/ }
+            )
+
+            await assert.rejects(
+                async () => {
+                    await sut.createQClient({
+                        name: 'foo',
+                        region: 'unknown-somewhere',
+                        arn: 'arn',
+                        description: 'description',
+                    })
+                },
+                { message: /trying to initiatize Q client with unrecognizable region/ }
+            )
+        })
+
+        it(`should configure the endpoint and region correspondingly`, async function () {
+            await setupConnection('idc')
+            await sut.switchRegionProfile(profileFoo, 'user')
+            assert.deepStrictEqual(sut.activeRegionProfile, profileFoo)
+            const conn = authUtil.conn as SsoConnection
+
+            const client = await sut._createQClient('eu-central-1', 'https://amazon.com/', conn)
+
+            assert.deepStrictEqual(client.config.region, 'eu-central-1')
+            assert.deepStrictEqual(client.endpoint.href, 'https://amazon.com/')
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/service/codewhisperer.test.ts b/packages/amazonq/test/unit/codewhisperer/service/codewhisperer.test.ts
new file mode 100644
index 00000000000..9742c69d7df
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/service/codewhisperer.test.ts
@@ -0,0 +1,152 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import sinon from 'sinon'
+import {
+    CodeWhispererUserClient,
+    SendTelemetryEventResponse,
+    TelemetryEvent,
+    AuthUtil,
+    codeWhispererClient,
+} from 'aws-core-vscode/codewhisperer'
+import { globals, getClientId, getOperatingSystem } from 'aws-core-vscode/shared'
+import { Request } from 'aws-sdk'
+import { ServiceException } from '@smithy/smithy-client'
+import { createSpyClient } from 'aws-core-vscode/test'
+
+describe('codewhisperer', async function () {
+    let clientSpy: CodeWhispererUserClient
+    let telemetryEnabledDefault: boolean
+    const userTriggerDecisionPayload: TelemetryEvent = {
+        userTriggerDecisionEvent: {
+            sessionId: '',
+            requestId: '',
+            programmingLanguage: { languageName: 'python' },
+            completionType: 'BLOCK',
+            suggestionState: 'ACCEPT',
+            recommendationLatencyMilliseconds: 1,
+            timestamp: new Date(),
+        },
+    }
+
+    beforeEach(async function () {
+        sinon.restore()
+        clientSpy = await createSpyClient()
+        telemetryEnabledDefault = globals.telemetry.telemetryEnabled
+    })
+
+    afterEach(async function () {
+        sinon.restore()
+        await globals.telemetry.setTelemetryEnabled(telemetryEnabledDefault)
+    })
+
+    it('sendTelemetryEvent for userTriggerDecision should respect telemetry optout status', async function () {
+        await sendTelemetryEventOptoutCheckHelper(userTriggerDecisionPayload, true, true)
+        await sendTelemetryEventOptoutCheckHelper(userTriggerDecisionPayload, true, false)
+    })
+
+    it('sendTelemetryEvent for codeScan should respect telemetry optout status', async function () {
+        const payload = {
+            codeScanEvent: {
+                programmingLanguage: { languageName: 'python' },
+                codeScanJobId: '',
+                timestamp: new Date(),
+            },
+        }
+        await sendTelemetryEventOptoutCheckHelper(payload, true, true)
+        await sendTelemetryEventOptoutCheckHelper(payload, true, false)
+    })
+
+    it('sendTelemetryEvent for codePercentage should respect telemetry optout status', async function () {
+        const payload = {
+            codeCoverageEvent: {
+                programmingLanguage: { languageName: 'python' },
+                acceptedCharacterCount: 0,
+                totalCharacterCount: 1,
+                timestamp: new Date(),
+            },
+        }
+        await sendTelemetryEventOptoutCheckHelper(payload, true, true)
+        await sendTelemetryEventOptoutCheckHelper(payload, true, false)
+    })
+
+    it('sendTelemetryEvent for userModification should respect telemetry optout status', async function () {
+        const payload = {
+            userModificationEvent: {
+                sessionId: '',
+                requestId: '',
+                programmingLanguage: { languageName: 'python' },
+                modificationPercentage: 2.0,
+                timestamp: new Date(),
+            },
+        }
+        await sendTelemetryEventOptoutCheckHelper(payload, true, true)
+        await sendTelemetryEventOptoutCheckHelper(payload, true, false)
+    })
+
+    it('sendTelemetryEvent should be called for SSO user who optin telemetry', async function () {
+        await sendTelemetryEventOptoutCheckHelper(userTriggerDecisionPayload, true, true)
+    })
+
+    it('sendTelemetryEvent should be called for SSO user who optout telemetry', async function () {
+        await sendTelemetryEventOptoutCheckHelper(userTriggerDecisionPayload, true, false)
+    })
+
+    it('sendTelemetryEvent should be called for Builder ID user who optin telemetry', async function () {
+        await sendTelemetryEventOptoutCheckHelper(userTriggerDecisionPayload, false, true)
+    })
+
+    it('sendTelemetryEvent should NOT be called for Builder ID user who optout telemetry', async function () {
+        await sendTelemetryEventOptoutCheckHelper(userTriggerDecisionPayload, false, false)
+    })
+
+    it('sendTelemetryEvent should be called with UserContext payload', async function () {
+        const clientSpyStub = sinon.stub(clientSpy, 'sendTelemetryEvent').returns({
+            promise: () =>
+                Promise.resolve({
+                    $response: {
+                        requestId: '',
+                    },
+                }),
+        } as Request<SendTelemetryEventResponse, ServiceException>)
+
+        const expectedUserContext = {
+            ideCategory: 'VSCODE',
+            operatingSystem: getOperatingSystem(),
+            product: 'CodeWhisperer',
+            clientId: getClientId(globals.globalState),
+        }
+
+        await codeWhispererClient.sendTelemetryEvent({ telemetryEvent: userTriggerDecisionPayload })
+        sinon.assert.calledWith(clientSpyStub, sinon.match({ userContext: expectedUserContext }))
+    })
+
+    async function sendTelemetryEventOptoutCheckHelper(
+        payload: TelemetryEvent,
+        isSso: boolean,
+        isTelemetryEnabled: boolean
+    ) {
+        const clientSpyStub = sinon.stub(clientSpy, 'sendTelemetryEvent').returns({
+            promise: () =>
+                Promise.resolve({
+                    $response: {
+                        requestId: '',
+                    },
+                }),
+        } as Request<SendTelemetryEventResponse, ServiceException>)
+
+        const authUtilStub = sinon.stub(AuthUtil.instance, 'isValidEnterpriseSsoInUse').returns(isSso)
+        await globals.telemetry.setTelemetryEnabled(isTelemetryEnabled)
+        await codeWhispererClient.sendTelemetryEvent({ telemetryEvent: payload })
+        const expectedOptOutPreference = isTelemetryEnabled ? 'OPTIN' : 'OPTOUT'
+        if (isSso || isTelemetryEnabled) {
+            sinon.assert.calledWith(clientSpyStub, sinon.match({ optOutPreference: expectedOptOutPreference }))
+        } else {
+            sinon.assert.notCalled(clientSpyStub)
+        }
+        clientSpyStub.restore()
+        authUtilStub.restore()
+    }
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/service/diagnosticsProvider.test.ts b/packages/amazonq/test/unit/codewhisperer/service/diagnosticsProvider.test.ts
new file mode 100644
index 00000000000..910aadb02b9
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/service/diagnosticsProvider.test.ts
@@ -0,0 +1,100 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import vscode from 'vscode'
+import sinon from 'sinon'
+import assert from 'assert'
+import {
+    createSecurityDiagnosticCollection,
+    securityScanRender,
+    removeDiagnostic,
+    disposeSecurityDiagnostic,
+    SecurityDiagnostic,
+    createSecurityDiagnostic,
+    codewhispererDiagnosticSourceLabel,
+} from 'aws-core-vscode/codewhisperer'
+import { createCodeScanIssue, createMockDocument, createTextDocumentChangeEvent } from 'aws-core-vscode/test'
+
+describe('diagnosticsProvider', function () {
+    let mockDocument: vscode.TextDocument
+    let mockCollection: vscode.DiagnosticCollection
+
+    beforeEach(function () {
+        mockDocument = createMockDocument()
+        mockCollection = createSecurityDiagnosticCollection()
+        securityScanRender.initialized = true
+    })
+
+    afterEach(function () {
+        sinon.restore()
+        mockCollection.clear()
+    })
+
+    it('should remove diagnostic by findingId', function () {
+        mockCollection.set(mockDocument.uri, [
+            { findingId: 'finding1' },
+            { findingId: 'finding2' },
+        ] as SecurityDiagnostic[])
+        sinon.stub(securityScanRender, 'securityDiagnosticCollection').returns(mockCollection)
+
+        removeDiagnostic(mockDocument.uri, createCodeScanIssue({ findingId: 'finding1' }))
+        const actual = mockCollection.get(mockDocument.uri) as SecurityDiagnostic[]
+        assert.strictEqual(actual.length, 1)
+        assert.strictEqual(actual[0].findingId, 'finding2')
+    })
+
+    it('should offset diagnostics and fixes by 1 line', function () {
+        mockCollection.set(mockDocument.uri, [
+            { findingId: 'finding1', range: new vscode.Range(1, 0, 2, 0) },
+            { findingId: 'finding2', range: new vscode.Range(3, 0, 4, 0) },
+        ] as SecurityDiagnostic[])
+        sinon.stub(securityScanRender, 'securityDiagnosticCollection').returns(mockCollection)
+
+        const mockEvent = createTextDocumentChangeEvent(mockDocument, new vscode.Range(0, 0, 0, 0), '\n')
+        disposeSecurityDiagnostic(mockEvent)
+        const actual = mockCollection.get(mockDocument.uri)
+        assert.strictEqual(actual?.length, 2)
+        assert.strictEqual(actual[0].range.start.line, 2)
+        assert.strictEqual(actual[0].range.end.line, 3)
+        assert.strictEqual(actual[1].range.start.line, 4)
+        assert.strictEqual(actual[1].range.end.line, 5)
+    })
+
+    it('should handle change event with multiple content changes', function () {
+        mockCollection.set(mockDocument.uri, [
+            { findingId: 'finding1', range: new vscode.Range(1, 0, 2, 0) },
+            { findingId: 'finding2', range: new vscode.Range(3, 0, 4, 0) },
+        ] as SecurityDiagnostic[])
+        sinon.stub(securityScanRender, 'securityDiagnosticCollection').returns(mockCollection)
+
+        const mockEvent: vscode.TextDocumentChangeEvent = {
+            reason: undefined,
+            document: mockDocument,
+            contentChanges: [
+                { range: new vscode.Range(0, 0, 0, 0), rangeOffset: 1, rangeLength: 1, text: 'a\n' },
+                { range: new vscode.Range(0, 0, 0, 0), rangeOffset: 1, rangeLength: 1, text: 'b\n' },
+            ],
+        }
+        disposeSecurityDiagnostic(mockEvent)
+        const actual = mockCollection.get(mockDocument.uri)
+        assert.strictEqual(actual?.length, 2)
+        assert.strictEqual(actual[0].range.start.line, 3)
+        assert.strictEqual(actual[0].range.end.line, 4)
+        assert.strictEqual(actual[1].range.start.line, 5)
+        assert.strictEqual(actual[1].range.end.line, 6)
+    })
+
+    it('should create securityDiagnostic from codeScanIssue', function () {
+        const codeScanIssue = createCodeScanIssue()
+        const securityDiagnostic = createSecurityDiagnostic(codeScanIssue)
+        assert.strictEqual(securityDiagnostic.findingId, codeScanIssue.findingId)
+        assert.strictEqual(securityDiagnostic.message, codeScanIssue.title)
+        assert.strictEqual(securityDiagnostic.range.start.line, codeScanIssue.startLine)
+        assert.strictEqual(securityDiagnostic.range.end.line, codeScanIssue.endLine)
+        assert.strictEqual(securityDiagnostic.severity, vscode.DiagnosticSeverity.Warning)
+        assert.strictEqual(securityDiagnostic.source, codewhispererDiagnosticSourceLabel)
+        assert.strictEqual(securityDiagnostic.code, codeScanIssue.ruleId)
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/service/inlineCompletionService.test.ts b/packages/amazonq/test/unit/codewhisperer/service/inlineCompletionService.test.ts
new file mode 100644
index 00000000000..a35677408c4
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/service/inlineCompletionService.test.ts
@@ -0,0 +1,173 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import assert from 'assert'
+import * as sinon from 'sinon'
+import {
+    InlineCompletionService,
+    ReferenceInlineProvider,
+    RecommendationHandler,
+    ConfigurationEntry,
+    CWInlineCompletionItemProvider,
+    session,
+    DefaultCodeWhispererClient,
+} from 'aws-core-vscode/codewhisperer'
+import { createMockTextEditor, resetCodeWhispererGlobalVariables, createMockDocument } from 'aws-core-vscode/test'
+
+describe('inlineCompletionService', function () {
+    beforeEach(async function () {
+        await resetCodeWhispererGlobalVariables()
+    })
+
+    describe('getPaginatedRecommendation', function () {
+        const config: ConfigurationEntry = {
+            isShowMethodsEnabled: true,
+            isManualTriggerEnabled: true,
+            isAutomatedTriggerEnabled: true,
+            isSuggestionsWithCodeReferencesEnabled: true,
+        }
+
+        let mockClient: DefaultCodeWhispererClient
+
+        beforeEach(async function () {
+            mockClient = new DefaultCodeWhispererClient()
+            await resetCodeWhispererGlobalVariables()
+        })
+
+        afterEach(function () {
+            sinon.restore()
+        })
+
+        it('should call checkAndResetCancellationTokens before showing inline and next token to be null', async function () {
+            const mockEditor = createMockTextEditor()
+            sinon.stub(RecommendationHandler.instance, 'getRecommendations').resolves({
+                result: 'Succeeded',
+                errorMessage: undefined,
+                recommendationCount: 1,
+            })
+            const checkAndResetCancellationTokensStub = sinon.stub(
+                RecommendationHandler.instance,
+                'checkAndResetCancellationTokens'
+            )
+            session.recommendations = [{ content: "\n\t\tconsole.log('Hello world!');\n\t}" }, { content: '' }]
+            await InlineCompletionService.instance.getPaginatedRecommendation(
+                mockClient,
+                mockEditor,
+                'OnDemand',
+                config
+            )
+            assert.ok(checkAndResetCancellationTokensStub.called)
+            assert.strictEqual(RecommendationHandler.instance.hasNextToken(), false)
+        })
+    })
+
+    describe('clearInlineCompletionStates', function () {
+        it('should remove inline reference and recommendations', async function () {
+            const fakeReferences = [
+                {
+                    message: '',
+                    licenseName: 'MIT',
+                    repository: 'http://github.com/fake',
+                    recommendationContentSpan: {
+                        start: 0,
+                        end: 10,
+                    },
+                },
+            ]
+            ReferenceInlineProvider.instance.setInlineReference(1, 'test', fakeReferences)
+            session.recommendations = [{ content: "\n\t\tconsole.log('Hello world!');\n\t}" }, { content: '' }]
+            session.language = 'python'
+
+            assert.ok(session.recommendations.length > 0)
+            await RecommendationHandler.instance.clearInlineCompletionStates()
+            assert.strictEqual(ReferenceInlineProvider.instance.refs.length, 0)
+            assert.strictEqual(session.recommendations.length, 0)
+        })
+    })
+
+    describe('truncateOverlapWithRightContext', function () {
+        const fileName = 'test.py'
+        const language = 'python'
+        const rightContext = 'return target\n'
+        const doc = `import math\ndef two_sum(nums, target):\n`
+        const provider = new CWInlineCompletionItemProvider(0, 0, [], '', new vscode.Position(0, 0), '')
+
+        it('removes overlap with right context from suggestion', async function () {
+            const mockSuggestion = 'return target\n'
+            const mockEditor = createMockTextEditor(`${doc}${rightContext}`, fileName, language)
+            const cursorPosition = new vscode.Position(2, 0)
+            const result = provider.truncateOverlapWithRightContext(mockEditor.document, mockSuggestion, cursorPosition)
+            assert.strictEqual(result, '')
+        })
+
+        it('only removes the overlap part from suggestion', async function () {
+            const mockSuggestion = 'print(nums)\nreturn target\n'
+            const mockEditor = createMockTextEditor(`${doc}${rightContext}`, fileName, language)
+            const cursorPosition = new vscode.Position(2, 0)
+            const result = provider.truncateOverlapWithRightContext(mockEditor.document, mockSuggestion, cursorPosition)
+            assert.strictEqual(result, 'print(nums)\n')
+        })
+
+        it('only removes the last overlap pattern from suggestion', async function () {
+            const mockSuggestion = 'return target\nprint(nums)\nreturn target\n'
+            const mockEditor = createMockTextEditor(`${doc}${rightContext}`, fileName, language)
+            const cursorPosition = new vscode.Position(2, 0)
+            const result = provider.truncateOverlapWithRightContext(mockEditor.document, mockSuggestion, cursorPosition)
+            assert.strictEqual(result, 'return target\nprint(nums)\n')
+        })
+
+        it('returns empty string if the remaining suggestion only contains white space', async function () {
+            const mockSuggestion = 'return target\n     '
+            const mockEditor = createMockTextEditor(`${doc}${rightContext}`, fileName, language)
+            const cursorPosition = new vscode.Position(2, 0)
+            const result = provider.truncateOverlapWithRightContext(mockEditor.document, mockSuggestion, cursorPosition)
+            assert.strictEqual(result, '')
+        })
+
+        it('returns the original suggestion if no match found', async function () {
+            const mockSuggestion = 'import numpy\n'
+            const mockEditor = createMockTextEditor(`${doc}${rightContext}`, fileName, language)
+            const cursorPosition = new vscode.Position(2, 0)
+            const result = provider.truncateOverlapWithRightContext(mockEditor.document, mockSuggestion, cursorPosition)
+            assert.strictEqual(result, 'import numpy\n')
+        })
+
+        it('ignores the space at the end of recommendation', async function () {
+            const mockSuggestion = 'return target\n\n\n\n\n'
+            const mockEditor = createMockTextEditor(`${doc}${rightContext}`, fileName, language)
+            const cursorPosition = new vscode.Position(2, 0)
+            const result = provider.truncateOverlapWithRightContext(mockEditor.document, mockSuggestion, cursorPosition)
+            assert.strictEqual(result, '')
+        })
+    })
+})
+
+describe('CWInlineCompletionProvider', function () {
+    beforeEach(async function () {
+        await resetCodeWhispererGlobalVariables()
+    })
+
+    describe('provideInlineCompletionItems', function () {
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+        })
+
+        afterEach(function () {
+            sinon.restore()
+        })
+
+        it('should return undefined if position is before RecommendationHandler start pos', async function () {
+            const position = new vscode.Position(0, 0)
+            const document = createMockDocument()
+            const fakeContext = { triggerKind: 0, selectedCompletionInfo: undefined }
+            const token = new vscode.CancellationTokenSource().token
+            const provider = new CWInlineCompletionItemProvider(0, 0, [], '', new vscode.Position(1, 1), '')
+            const result = await provider.provideInlineCompletionItems(document, position, fakeContext, token)
+
+            assert.ok(result === undefined)
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/service/keyStrokeHandler.test.ts b/packages/amazonq/test/unit/codewhisperer/service/keyStrokeHandler.test.ts
new file mode 100644
index 00000000000..4b6a5291f22
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/service/keyStrokeHandler.test.ts
@@ -0,0 +1,237 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import * as codewhispererSdkClient from 'aws-core-vscode/codewhisperer'
+import {
+    createMockTextEditor,
+    createTextDocumentChangeEvent,
+    resetCodeWhispererGlobalVariables,
+} from 'aws-core-vscode/test'
+import * as EditorContext from 'aws-core-vscode/codewhisperer'
+import {
+    ConfigurationEntry,
+    DocumentChangedSource,
+    KeyStrokeHandler,
+    DefaultDocumentChangedType,
+    RecommendationService,
+    ClassifierTrigger,
+    isInlineCompletionEnabled,
+    RecommendationHandler,
+    InlineCompletionService,
+} from 'aws-core-vscode/codewhisperer'
+
+describe('keyStrokeHandler', function () {
+    const config: ConfigurationEntry = {
+        isShowMethodsEnabled: true,
+        isManualTriggerEnabled: true,
+        isAutomatedTriggerEnabled: true,
+        isSuggestionsWithCodeReferencesEnabled: true,
+    }
+    beforeEach(async function () {
+        await resetCodeWhispererGlobalVariables()
+    })
+    describe('processKeyStroke', async function () {
+        let invokeSpy: sinon.SinonStub
+        let startTimerSpy: sinon.SinonStub
+        let mockClient: codewhispererSdkClient.DefaultCodeWhispererClient
+        beforeEach(async function () {
+            invokeSpy = sinon.stub(KeyStrokeHandler.instance, 'invokeAutomatedTrigger')
+            startTimerSpy = sinon.stub(KeyStrokeHandler.instance, 'startIdleTimeTriggerTimer')
+            sinon.spy(RecommendationHandler.instance, 'getRecommendations')
+            mockClient = new codewhispererSdkClient.DefaultCodeWhispererClient()
+            await resetCodeWhispererGlobalVariables()
+            sinon.stub(mockClient, 'listRecommendations')
+            sinon.stub(mockClient, 'generateRecommendations')
+        })
+        afterEach(function () {
+            sinon.restore()
+        })
+
+        it('Whatever the input is, should skip when automatic trigger is turned off, should not call invokeAutomatedTrigger', async function () {
+            const mockEditor = createMockTextEditor()
+            const mockEvent: vscode.TextDocumentChangeEvent = createTextDocumentChangeEvent(
+                mockEditor.document,
+                new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 1)),
+                ' '
+            )
+            const cfg: ConfigurationEntry = {
+                isShowMethodsEnabled: true,
+                isManualTriggerEnabled: true,
+                isAutomatedTriggerEnabled: false,
+                isSuggestionsWithCodeReferencesEnabled: true,
+            }
+            const keyStrokeHandler = new KeyStrokeHandler()
+            await keyStrokeHandler.processKeyStroke(mockEvent, mockEditor, mockClient, cfg)
+            assert.ok(!invokeSpy.called)
+            assert.ok(!startTimerSpy.called)
+        })
+
+        it('Should not call invokeAutomatedTrigger when changed text across multiple lines', async function () {
+            await testShouldInvoke('\nprint(n', false)
+        })
+
+        it('Should not call invokeAutomatedTrigger when doing delete or undo (empty changed text)', async function () {
+            await testShouldInvoke('', false)
+        })
+
+        it('Should call invokeAutomatedTrigger with Enter when inputing \n', async function () {
+            await testShouldInvoke('\n', true)
+        })
+
+        it('Should call invokeAutomatedTrigger with Enter when inputing \r\n', async function () {
+            await testShouldInvoke('\r\n', true)
+        })
+
+        it('Should call invokeAutomatedTrigger with SpecialCharacter when inputing {', async function () {
+            await testShouldInvoke('{', true)
+        })
+
+        it('Should not call invokeAutomatedTrigger for non-special characters for classifier language if classifier says no', async function () {
+            sinon.stub(ClassifierTrigger.instance, 'shouldTriggerFromClassifier').returns(false)
+            await testShouldInvoke('a', false)
+        })
+
+        it('Should call invokeAutomatedTrigger for non-special characters for classifier language if classifier says yes', async function () {
+            sinon.stub(ClassifierTrigger.instance, 'shouldTriggerFromClassifier').returns(true)
+            await testShouldInvoke('a', true)
+        })
+
+        it('Should skip invoking if there is immediate right context on the same line and not a single }', async function () {
+            const casesForSuppressTokenFilling = [
+                {
+                    rightContext: 'add',
+                    shouldInvoke: false,
+                },
+                {
+                    rightContext: '}',
+                    shouldInvoke: true,
+                },
+                {
+                    rightContext: '}    ',
+                    shouldInvoke: true,
+                },
+                {
+                    rightContext: ')',
+                    shouldInvoke: true,
+                },
+                {
+                    rightContext: ')    ',
+                    shouldInvoke: true,
+                },
+                {
+                    rightContext: ' add',
+                    shouldInvoke: true,
+                },
+                {
+                    rightContext: '    ',
+                    shouldInvoke: true,
+                },
+                {
+                    rightContext: '\naddTwo',
+                    shouldInvoke: true,
+                },
+            ]
+
+            for (const o of casesForSuppressTokenFilling) {
+                await testShouldInvoke('{', o.shouldInvoke, o.rightContext)
+            }
+        })
+
+        async function testShouldInvoke(input: string, shouldTrigger: boolean, rightContext: string = '') {
+            const mockEditor = createMockTextEditor(rightContext, 'test.js', 'javascript', 0, 0)
+            const mockEvent: vscode.TextDocumentChangeEvent = createTextDocumentChangeEvent(
+                mockEditor.document,
+                new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 1)),
+                input
+            )
+            await KeyStrokeHandler.instance.processKeyStroke(mockEvent, mockEditor, mockClient, config)
+            assert.strictEqual(
+                invokeSpy.called,
+                shouldTrigger,
+                `invokeAutomatedTrigger ${shouldTrigger ? 'NOT' : 'WAS'} called for rightContext: "${rightContext}"`
+            )
+        }
+    })
+
+    describe('invokeAutomatedTrigger', function () {
+        let mockClient: codewhispererSdkClient.DefaultCodeWhispererClient
+        beforeEach(async function () {
+            sinon.restore()
+            mockClient = new codewhispererSdkClient.DefaultCodeWhispererClient()
+            await resetCodeWhispererGlobalVariables()
+            sinon.stub(mockClient, 'listRecommendations')
+            sinon.stub(mockClient, 'generateRecommendations')
+        })
+        afterEach(function () {
+            sinon.restore()
+        })
+
+        it('should call getPaginatedRecommendation when inline completion is enabled', async function () {
+            const mockEditor = createMockTextEditor()
+            const keyStrokeHandler = new KeyStrokeHandler()
+            const mockEvent: vscode.TextDocumentChangeEvent = createTextDocumentChangeEvent(
+                mockEditor.document,
+                new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 1)),
+                ' '
+            )
+            const getRecommendationsStub = sinon.stub(InlineCompletionService.instance, 'getPaginatedRecommendation')
+            await keyStrokeHandler.invokeAutomatedTrigger('Enter', mockEditor, mockClient, config, mockEvent)
+            assert.strictEqual(getRecommendationsStub.called, isInlineCompletionEnabled())
+        })
+    })
+
+    describe('shouldTriggerIdleTime', function () {
+        it('should return false when inline is enabled and inline completion is in progress ', function () {
+            const keyStrokeHandler = new KeyStrokeHandler()
+            sinon.stub(RecommendationService.instance, 'isRunning').get(() => true)
+            const result = keyStrokeHandler.shouldTriggerIdleTime()
+            assert.strictEqual(result, !isInlineCompletionEnabled())
+        })
+    })
+
+    describe('test checkChangeSource', function () {
+        const tabStr = ' '.repeat(EditorContext.getTabSize())
+
+        const cases: [string, DocumentChangedSource][] = [
+            ['\n          ', DocumentChangedSource.EnterKey],
+            ['\n', DocumentChangedSource.EnterKey],
+            ['(', DocumentChangedSource.SpecialCharsKey],
+            ['()', DocumentChangedSource.SpecialCharsKey],
+            ['{}', DocumentChangedSource.SpecialCharsKey],
+            ['(a, b):', DocumentChangedSource.Unknown],
+            [':', DocumentChangedSource.SpecialCharsKey],
+            ['a', DocumentChangedSource.RegularKey],
+            [tabStr, DocumentChangedSource.TabKey],
+            ['   ', DocumentChangedSource.Reformatting],
+            ['def add(a,b):\n    return a + b\n', DocumentChangedSource.Unknown],
+            ['function suggestedByIntelliSense():', DocumentChangedSource.Unknown],
+        ]
+
+        for (const tuple of cases) {
+            const input = tuple[0]
+            const expected = tuple[1]
+            it(`test input ${input} should return ${expected}`, function () {
+                const actual = new DefaultDocumentChangedType(
+                    createFakeDocumentChangeEvent(tuple[0])
+                ).checkChangeSource()
+                assert.strictEqual(actual, expected)
+            })
+        }
+
+        function createFakeDocumentChangeEvent(str: string): ReadonlyArray<vscode.TextDocumentContentChangeEvent> {
+            return [
+                {
+                    range: new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 5)),
+                    rangeOffset: 0,
+                    rangeLength: 0,
+                    text: str,
+                },
+            ]
+        }
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/service/recommendationHandler.test.ts b/packages/amazonq/test/unit/codewhisperer/service/recommendationHandler.test.ts
new file mode 100644
index 00000000000..08c1b3a7cca
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/service/recommendationHandler.test.ts
@@ -0,0 +1,269 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import {
+    ReferenceInlineProvider,
+    session,
+    AuthUtil,
+    DefaultCodeWhispererClient,
+    ConfigurationEntry,
+    RecommendationHandler,
+    supplementalContextUtil,
+} from 'aws-core-vscode/codewhisperer'
+import {
+    assertTelemetryCurried,
+    stub,
+    createMockTextEditor,
+    resetCodeWhispererGlobalVariables,
+} from 'aws-core-vscode/test'
+// import * as supplementalContextUtil from 'aws-core-vscode/codewhisperer'
+
+describe('recommendationHandler', function () {
+    const config: ConfigurationEntry = {
+        isShowMethodsEnabled: true,
+        isManualTriggerEnabled: true,
+        isAutomatedTriggerEnabled: true,
+        isSuggestionsWithCodeReferencesEnabled: true,
+    }
+    beforeEach(async function () {
+        await resetCodeWhispererGlobalVariables()
+    })
+
+    describe('getRecommendations', async function () {
+        const mockClient = stub(DefaultCodeWhispererClient)
+        const mockEditor = createMockTextEditor()
+        const testStartUrl = 'testStartUrl'
+
+        beforeEach(async function () {
+            sinon.restore()
+            await resetCodeWhispererGlobalVariables()
+            mockClient.listRecommendations.resolves({})
+            mockClient.generateRecommendations.resolves({})
+            RecommendationHandler.instance.clearRecommendations()
+            sinon.stub(AuthUtil.instance, 'startUrl').value(testStartUrl)
+        })
+
+        afterEach(function () {
+            sinon.restore()
+        })
+
+        // it('should assign correct recommendations given input', async function () {
+        //     assert.strictEqual(CodeWhispererCodeCoverageTracker.instances.size, 0)
+        //     assert.strictEqual(
+        //         CodeWhispererCodeCoverageTracker.getTracker(mockEditor.document.languageId)?.serviceInvocationCount,
+        //         0
+        //     )
+
+        //     const mockServerResult = {
+        //         recommendations: [{ content: "print('Hello World!')" }, { content: '' }],
+        //         $response: {
+        //             requestId: 'test_request',
+        //             httpResponse: {
+        //                 headers: {
+        //                     'x-amzn-sessionid': 'test_request',
+        //                 },
+        //             },
+        //         },
+        //     }
+        //     const handler = new RecommendationHandler()
+        //     sinon.stub(handler, 'getServerResponse').resolves(mockServerResult)
+        //     await handler.getRecommendations(mockClient, mockEditor, 'AutoTrigger', config, 'Enter', false)
+        //     const actual = session.recommendations
+        //     const expected: RecommendationsList = [{ content: "print('Hello World!')" }, { content: '' }]
+        //     assert.deepStrictEqual(actual, expected)
+        //     assert.strictEqual(
+        //         CodeWhispererCodeCoverageTracker.getTracker(mockEditor.document.languageId)?.serviceInvocationCount,
+        //         1
+        //     )
+        // })
+
+        it('should assign request id correctly', async function () {
+            const mockServerResult = {
+                recommendations: [{ content: "print('Hello World!')" }, { content: '' }],
+                $response: {
+                    requestId: 'test_request',
+                    httpResponse: {
+                        headers: {
+                            'x-amzn-sessionid': 'test_request',
+                        },
+                    },
+                },
+            }
+            const handler = new RecommendationHandler()
+            sinon.stub(handler, 'getServerResponse').resolves(mockServerResult)
+            sinon.stub(handler, 'isCancellationRequested').returns(false)
+            await handler.getRecommendations(mockClient, mockEditor, 'AutoTrigger', config, 'Enter', false)
+            assert.strictEqual(handler.requestId, 'test_request')
+            assert.strictEqual(session.sessionId, 'test_request')
+            assert.strictEqual(session.triggerType, 'AutoTrigger')
+        })
+
+        it('should call telemetry function that records a CodeWhisperer service invocation', async function () {
+            const mockServerResult = {
+                recommendations: [{ content: "print('Hello World!')" }, { content: '' }],
+                $response: {
+                    requestId: 'test_request',
+                    httpResponse: {
+                        headers: {
+                            'x-amzn-sessionid': 'test_request',
+                        },
+                    },
+                },
+            }
+            const handler = new RecommendationHandler()
+            sinon.stub(handler, 'getServerResponse').resolves(mockServerResult)
+            sinon.stub(supplementalContextUtil, 'fetchSupplementalContext').resolves({
+                isUtg: false,
+                isProcessTimeout: false,
+                supplementalContextItems: [],
+                contentsLength: 100,
+                latency: 0,
+                strategy: 'empty',
+            })
+            sinon.stub(performance, 'now').returns(0.0)
+            session.startPos = new vscode.Position(1, 0)
+            session.startCursorOffset = 2
+            await handler.getRecommendations(mockClient, mockEditor, 'AutoTrigger', config, 'Enter')
+            const assertTelemetry = assertTelemetryCurried('codewhisperer_serviceInvocation')
+            assertTelemetry({
+                codewhispererRequestId: 'test_request',
+                codewhispererSessionId: 'test_request',
+                codewhispererLastSuggestionIndex: 1,
+                codewhispererTriggerType: 'AutoTrigger',
+                codewhispererAutomatedTriggerType: 'Enter',
+                codewhispererImportRecommendationEnabled: true,
+                result: 'Succeeded',
+                codewhispererLineNumber: 1,
+                codewhispererCursorOffset: 38,
+                codewhispererLanguage: 'python',
+                credentialStartUrl: testStartUrl,
+                codewhispererSupplementalContextIsUtg: false,
+                codewhispererSupplementalContextTimeout: false,
+                codewhispererSupplementalContextLatency: 0,
+                codewhispererSupplementalContextLength: 100,
+            })
+        })
+    })
+
+    describe('isValidResponse', function () {
+        afterEach(function () {
+            sinon.restore()
+        })
+        it('should return true if any response is not empty', function () {
+            const handler = new RecommendationHandler()
+            session.recommendations = [
+                {
+                    content:
+                        '\n    // Use the console to output debug info…n of the command with the "command" variable',
+                },
+                { content: '' },
+            ]
+            assert.ok(handler.isValidResponse())
+        })
+
+        it('should return false if response is empty', function () {
+            const handler = new RecommendationHandler()
+            session.recommendations = []
+            assert.ok(!handler.isValidResponse())
+        })
+
+        it('should return false if all response has no string length', function () {
+            const handler = new RecommendationHandler()
+            session.recommendations = [{ content: '' }, { content: '' }]
+            assert.ok(!handler.isValidResponse())
+        })
+    })
+
+    describe('setCompletionType/getCompletionType', function () {
+        beforeEach(function () {
+            sinon.restore()
+        })
+
+        it('should set the completion type to block given a multi-line suggestion', function () {
+            session.setCompletionType(0, { content: 'test\n\n   \t\r\nanother test' })
+            assert.strictEqual(session.getCompletionType(0), 'Block')
+
+            session.setCompletionType(0, { content: 'test\ntest\n' })
+            assert.strictEqual(session.getCompletionType(0), 'Block')
+
+            session.setCompletionType(0, { content: '\n   \t\r\ntest\ntest' })
+            assert.strictEqual(session.getCompletionType(0), 'Block')
+        })
+
+        it('should set the completion type to line given a single-line suggestion', function () {
+            session.setCompletionType(0, { content: 'test' })
+            assert.strictEqual(session.getCompletionType(0), 'Line')
+
+            session.setCompletionType(0, { content: 'test\r\t   ' })
+            assert.strictEqual(session.getCompletionType(0), 'Line')
+        })
+
+        it('should set the completion type to line given a multi-line completion but only one-lien of non-blank sequence', function () {
+            session.setCompletionType(0, { content: 'test\n\t' })
+            assert.strictEqual(session.getCompletionType(0), 'Line')
+
+            session.setCompletionType(0, { content: 'test\n    ' })
+            assert.strictEqual(session.getCompletionType(0), 'Line')
+
+            session.setCompletionType(0, { content: 'test\n\r' })
+            assert.strictEqual(session.getCompletionType(0), 'Line')
+
+            session.setCompletionType(0, { content: '\n\n\n\ntest' })
+            assert.strictEqual(session.getCompletionType(0), 'Line')
+        })
+    })
+
+    describe('on event change', async function () {
+        beforeEach(function () {
+            const fakeReferences = [
+                {
+                    message: '',
+                    licenseName: 'MIT',
+                    repository: 'http://github.com/fake',
+                    recommendationContentSpan: {
+                        start: 0,
+                        end: 10,
+                    },
+                },
+            ]
+            ReferenceInlineProvider.instance.setInlineReference(1, 'test', fakeReferences)
+            session.sessionId = ''
+            RecommendationHandler.instance.requestId = ''
+        })
+
+        it('should remove inline reference onEditorChange', async function () {
+            session.sessionId = 'aSessionId'
+            RecommendationHandler.instance.requestId = 'aRequestId'
+            await RecommendationHandler.instance.onEditorChange()
+            assert.strictEqual(ReferenceInlineProvider.instance.refs.length, 0)
+        })
+        it('should remove inline reference onFocusChange', async function () {
+            session.sessionId = 'aSessionId'
+            RecommendationHandler.instance.requestId = 'aRequestId'
+            await RecommendationHandler.instance.onFocusChange()
+            assert.strictEqual(ReferenceInlineProvider.instance.refs.length, 0)
+        })
+        it('should not remove inline reference on cursor change from typing', async function () {
+            await RecommendationHandler.instance.onCursorChange({
+                textEditor: createMockTextEditor(),
+                selections: [],
+                kind: vscode.TextEditorSelectionChangeKind.Keyboard,
+            })
+            assert.strictEqual(ReferenceInlineProvider.instance.refs.length, 1)
+        })
+
+        it('should remove inline reference on cursor change from mouse movement', async function () {
+            await RecommendationHandler.instance.onCursorChange({
+                textEditor: vscode.window.activeTextEditor!,
+                selections: [],
+                kind: vscode.TextEditorSelectionChangeKind.Mouse,
+            })
+            assert.strictEqual(ReferenceInlineProvider.instance.refs.length, 0)
+        })
+    })
+})
diff --git a/src/test/codewhisperer/service/referenceHoverProvider.test.ts b/packages/amazonq/test/unit/codewhisperer/service/referenceHoverProvider.test.ts
similarity index 86%
rename from src/test/codewhisperer/service/referenceHoverProvider.test.ts
rename to packages/amazonq/test/unit/codewhisperer/service/referenceHoverProvider.test.ts
index b1d0467c334..702eceb8202 100644
--- a/src/test/codewhisperer/service/referenceHoverProvider.test.ts
+++ b/packages/amazonq/test/unit/codewhisperer/service/referenceHoverProvider.test.ts
@@ -1,17 +1,17 @@
 /*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as vscode from 'vscode'
-import { createMockDocument, resetCodeWhispererGlobalVariables } from '../testUtil'
-import { ReferenceHoverProvider } from '../../../codewhisperer/service/referenceHoverProvider'
-import { cast } from '../../../shared/utilities/typeConstructors'
+import { createMockDocument, resetCodeWhispererGlobalVariables } from 'aws-core-vscode/test'
+import { cast } from 'aws-core-vscode/shared'
+import { ReferenceHoverProvider } from 'aws-core-vscode/codewhisperer'
 
 describe('referenceHoverProvider', function () {
-    beforeEach(function () {
-        resetCodeWhispererGlobalVariables()
+    beforeEach(async function () {
+        await resetCodeWhispererGlobalVariables()
     })
     describe('provideHover', async function () {
         it('Should return a hover object that contains license name and repo name when reference code exists in document ', function () {
diff --git a/packages/amazonq/test/unit/codewhisperer/service/referenceInlineProvider.test.ts b/packages/amazonq/test/unit/codewhisperer/service/referenceInlineProvider.test.ts
new file mode 100644
index 00000000000..f0540bc2df3
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/service/referenceInlineProvider.test.ts
@@ -0,0 +1,32 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import { ReferenceInlineProvider } from 'aws-core-vscode/codewhisperer'
+import { resetCodeWhispererGlobalVariables } from 'aws-core-vscode/test'
+
+describe('referenceInlineProvider', function () {
+    beforeEach(async function () {
+        await resetCodeWhispererGlobalVariables()
+    })
+    describe('setInlineReference', async function () {
+        it('Reference codelens message should contain license name and Code Reference Log', function () {
+            const referenceInlineProvider = new ReferenceInlineProvider()
+            const fakeReferences = [
+                {
+                    message: '',
+                    licenseName: 'TEST_LICENSE',
+                    repository: 'TEST_REPO',
+                    recommendationContentSpan: {
+                        start: 0,
+                        end: 10,
+                    },
+                },
+            ]
+            referenceInlineProvider.setInlineReference(1, `def two_sum(nums, target):`, fakeReferences)
+            assert.ok(referenceInlineProvider.refs[0].includes(`TEST_LICENSE`))
+            assert.ok(referenceInlineProvider.refs[0].includes(`Reference Log`))
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/service/referenceLogViewProvider.test.ts b/packages/amazonq/test/unit/codewhisperer/service/referenceLogViewProvider.test.ts
new file mode 100644
index 00000000000..dcacf745a57
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/service/referenceLogViewProvider.test.ts
@@ -0,0 +1,103 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import { createMockTextEditor, resetCodeWhispererGlobalVariables } from 'aws-core-vscode/test'
+import { ReferenceLogViewProvider, LicenseUtil } from 'aws-core-vscode/codewhisperer'
+describe('referenceLogViewProvider', function () {
+    beforeEach(async function () {
+        await resetCodeWhispererGlobalVariables()
+    })
+    describe('getReferenceLog', async function () {
+        it('Should return expected reference log string with link to license if there is no url', function () {
+            const currentTime = new Date()
+            const currentTimeString = currentTime.toLocaleString()
+            currentTime.setSeconds(currentTime.getSeconds() + 1)
+            const nextTimeString = currentTime.toLocaleString()
+            const mockEditor = createMockTextEditor()
+            const recommendation = `def two_sum(nums, target):`
+            const fakeReferences = [
+                {
+                    message: '',
+                    licenseName: 'MIT',
+                    repository: 'TEST_REPO',
+                    recommendationContentSpan: {
+                        start: 0,
+                        end: 10,
+                    },
+                },
+            ]
+            const actual = ReferenceLogViewProvider.getReferenceLog(recommendation, fakeReferences, mockEditor)
+            const actualTime = actual.substring(1, actual.indexOf(']'))
+            assert.ok(actualTime === currentTimeString || actualTime === nextTimeString)
+            assert.ok(actual.includes('MIT'))
+            assert.ok(actual.includes('def two_su'))
+            assert.ok(actual.includes(LicenseUtil.getLicenseHtml('MIT')))
+        })
+
+        it('Should return expected reference log string with link to the repo url if present', function () {
+            const currentTime = new Date()
+            const currentTimeString = currentTime.toLocaleString()
+            currentTime.setSeconds(currentTime.getSeconds() + 1)
+            const nextTimeString = currentTime.toLocaleString()
+            const mockEditor = createMockTextEditor()
+            const recommendation = `def two_sum(nums, target):`
+            const mockUrl = 'https://www.amazon.com'
+            const fakeReferences = [
+                {
+                    message: '',
+                    licenseName: 'MIT',
+                    repository: 'TEST_REPO',
+                    url: mockUrl,
+                    recommendationContentSpan: {
+                        start: 0,
+                        end: 10,
+                    },
+                },
+            ]
+            const actual = ReferenceLogViewProvider.getReferenceLog(recommendation, fakeReferences, mockEditor)
+            const actualTime = actual.substring(1, actual.indexOf(']'))
+            assert.ok(actualTime === currentTimeString || actualTime === nextTimeString)
+            assert.ok(actual.includes('MIT'))
+            assert.ok(actual.includes('def two_su'))
+            assert.ok(actual.includes(mockUrl))
+            assert.ok(!actual.includes(LicenseUtil.getLicenseHtml('MIT')))
+        })
+    })
+
+    it('accepts references from CW and language server', async function () {
+        const cwReference = {
+            licenseName: 'MIT',
+            repository: 'TEST_REPO',
+            url: 'cw.com',
+            recommendationContentSpan: {
+                start: 0,
+                end: 10,
+            },
+        }
+
+        const flareReference = {
+            referenceName: 'test reference',
+            referenceUrl: 'flare.com',
+            licenseName: 'apache',
+            position: {
+                startCharacter: 0,
+                endCharacter: 10,
+            },
+        }
+
+        const actual = ReferenceLogViewProvider.getReferenceLog(
+            '',
+            [cwReference, flareReference],
+            createMockTextEditor()
+        )
+
+        assert.ok(actual.includes('MIT'))
+        assert.ok(actual.includes('apache'))
+        assert.ok(actual.includes('TEST_REPO'))
+        assert.ok(actual.includes('test reference'))
+        assert.ok(actual.includes('flare.com'))
+        assert.ok(actual.includes('cw.com'))
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/service/securityIssueCodeActionProvider.test.ts b/packages/amazonq/test/unit/codewhisperer/service/securityIssueCodeActionProvider.test.ts
new file mode 100644
index 00000000000..3ac473cbcca
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/service/securityIssueCodeActionProvider.test.ts
@@ -0,0 +1,110 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { createCodeActionContext, createCodeScanIssue, createMockDocument } from 'aws-core-vscode/test'
+import assert from 'assert'
+import { SecurityIssueCodeActionProvider, SecurityIssueProvider } from 'aws-core-vscode/codewhisperer'
+
+describe('securityIssueCodeActionProvider', () => {
+    let securityIssueProvider: SecurityIssueProvider
+    let securityIssueCodeActionProvider: SecurityIssueCodeActionProvider
+    let mockDocument: vscode.TextDocument
+    let context: vscode.CodeActionContext
+    let token: vscode.CancellationTokenSource
+
+    beforeEach(() => {
+        securityIssueProvider = SecurityIssueProvider.instance
+        securityIssueCodeActionProvider = new SecurityIssueCodeActionProvider()
+        mockDocument = createMockDocument('def two_sum(nums, target):\nfor', 'test.py', 'python')
+        context = createCodeActionContext()
+        token = new vscode.CancellationTokenSource()
+    })
+
+    it('should provide quick fix for each issue that has a suggested fix', () => {
+        securityIssueProvider.issues = [
+            {
+                filePath: mockDocument.fileName,
+                issues: [createCodeScanIssue({ title: 'issue 1' }), createCodeScanIssue({ title: 'issue 2' })],
+            },
+        ]
+        const range = new vscode.Range(0, 0, 0, 0)
+        const actual = securityIssueCodeActionProvider.provideCodeActions(mockDocument, range, context, token.token)
+
+        assert.strictEqual(actual.length, 10)
+        assert.strictEqual(actual[0].title, 'Amazon Q: Fix "issue 1"')
+        assert.strictEqual(actual[0].kind, vscode.CodeActionKind.QuickFix)
+        assert.strictEqual(actual[1].title, 'Amazon Q: View details for "issue 1"')
+        assert.strictEqual(actual[1].kind, vscode.CodeActionKind.QuickFix)
+        assert.strictEqual(actual[2].title, 'Amazon Q: Explain "issue 1"')
+        assert.strictEqual(actual[2].kind, vscode.CodeActionKind.QuickFix)
+        assert.strictEqual(actual[3].title, 'Amazon Q: Ignore this "issue 1" issue')
+        assert.strictEqual(actual[3].kind, vscode.CodeActionKind.QuickFix)
+        assert.strictEqual(actual[4].title, 'Amazon Q: Ignore all "issue 1" issues')
+        assert.strictEqual(actual[4].kind, vscode.CodeActionKind.QuickFix)
+        assert.strictEqual(actual[5].title, 'Amazon Q: Fix "issue 2"')
+        assert.strictEqual(actual[5].kind, vscode.CodeActionKind.QuickFix)
+        assert.strictEqual(actual[6].title, 'Amazon Q: View details for "issue 2"')
+        assert.strictEqual(actual[6].kind, vscode.CodeActionKind.QuickFix)
+        assert.strictEqual(actual[7].title, 'Amazon Q: Explain "issue 2"')
+        assert.strictEqual(actual[7].kind, vscode.CodeActionKind.QuickFix)
+    })
+
+    it('should not provide quick fix if the issue does not have a suggested fix', () => {
+        securityIssueProvider.issues = [
+            {
+                filePath: mockDocument.fileName,
+                issues: [createCodeScanIssue({ title: 'issue 1', suggestedFixes: [] })],
+            },
+        ]
+        const range = new vscode.Range(0, 0, 0, 0)
+        const actual = securityIssueCodeActionProvider.provideCodeActions(mockDocument, range, context, token.token)
+
+        assert.strictEqual(actual.length, 4)
+        assert.strictEqual(actual[0].title, 'Amazon Q: View details for "issue 1"')
+        assert.strictEqual(actual[0].kind, vscode.CodeActionKind.QuickFix)
+        assert.strictEqual(actual[1].title, 'Amazon Q: Explain "issue 1"')
+        assert.strictEqual(actual[1].kind, vscode.CodeActionKind.QuickFix)
+        assert.strictEqual(actual[2].title, 'Amazon Q: Ignore this "issue 1" issue')
+        assert.strictEqual(actual[2].kind, vscode.CodeActionKind.QuickFix)
+        assert.strictEqual(actual[3].title, 'Amazon Q: Ignore all "issue 1" issues')
+        assert.strictEqual(actual[3].kind, vscode.CodeActionKind.QuickFix)
+    })
+
+    it('should skip issues not in the current file', () => {
+        securityIssueProvider.issues = [
+            {
+                filePath: 'some/path',
+                issues: [createCodeScanIssue({ title: 'issue 1' })],
+            },
+            {
+                filePath: mockDocument.fileName,
+                issues: [createCodeScanIssue({ title: 'issue 2' })],
+            },
+        ]
+        const range = new vscode.Range(0, 0, 0, 0)
+        const actual = securityIssueCodeActionProvider.provideCodeActions(mockDocument, range, context, token.token)
+
+        assert.strictEqual(actual.length, 5)
+        assert.strictEqual(actual[0].title, 'Amazon Q: Fix "issue 2"')
+        assert.strictEqual(actual[1].title, 'Amazon Q: View details for "issue 2"')
+        assert.strictEqual(actual[2].title, 'Amazon Q: Explain "issue 2"')
+        assert.strictEqual(actual[3].title, 'Amazon Q: Ignore this "issue 2" issue')
+        assert.strictEqual(actual[4].title, 'Amazon Q: Ignore all "issue 2" issues')
+    })
+
+    it('should not show issues that are not visible', () => {
+        securityIssueProvider.issues = [
+            {
+                filePath: mockDocument.fileName,
+                issues: [createCodeScanIssue({ visible: false })],
+            },
+        ]
+        const range = new vscode.Range(0, 0, 0, 0)
+        const actual = securityIssueCodeActionProvider.provideCodeActions(mockDocument, range, context, token.token)
+
+        assert.strictEqual(actual.length, 0)
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/service/securityIssueHoverProvider.test.ts b/packages/amazonq/test/unit/codewhisperer/service/securityIssueHoverProvider.test.ts
new file mode 100644
index 00000000000..7709eed10fe
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/service/securityIssueHoverProvider.test.ts
@@ -0,0 +1,147 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { SecurityIssueHoverProvider, SecurityIssueProvider } from 'aws-core-vscode/codewhisperer'
+import { createCodeScanIssue, createMockDocument, assertTelemetry } from 'aws-core-vscode/test'
+import assert from 'assert'
+
+describe('securityIssueHoverProvider', () => {
+    let securityIssueProvider: SecurityIssueProvider
+    let securityIssueHoverProvider: SecurityIssueHoverProvider
+    let mockDocument: vscode.TextDocument
+    let token: vscode.CancellationTokenSource
+
+    beforeEach(() => {
+        securityIssueProvider = SecurityIssueProvider.instance
+        securityIssueHoverProvider = new SecurityIssueHoverProvider()
+        mockDocument = createMockDocument('def two_sum(nums, target):\nfor', 'test.py', 'python')
+        token = new vscode.CancellationTokenSource()
+    })
+
+    function buildCommandLink(
+        command: string,
+        commandIcon: string,
+        args: any[],
+        label: string,
+        tooltip: string
+    ): string {
+        return `[$(${commandIcon}) ${label}](command:${command}?${encodeURIComponent(JSON.stringify(args))} '${tooltip}')`
+    }
+
+    function buildExpectedContent(issue: any, fileName: string, description: string, severity?: string): string {
+        const severityBadge = severity ? ` ![${severity}](severity-${severity.toLowerCase()}.svg)` : ' '
+        const commands = [
+            buildCommandLink(
+                'aws.amazonq.explainIssue',
+                'comment',
+                [issue, fileName],
+                'Explain',
+                'Explain with Amazon Q'
+            ),
+            buildCommandLink('aws.amazonq.generateFix', 'wrench', [issue, fileName], 'Fix', 'Fix with Amazon Q'),
+            buildCommandLink(
+                'aws.amazonq.security.ignore',
+                'error',
+                [issue, fileName, 'hover'],
+                'Ignore',
+                'Ignore Issue'
+            ),
+            buildCommandLink(
+                'aws.amazonq.security.ignoreAll',
+                'error',
+                [issue, 'hover'],
+                'Ignore All',
+                'Ignore Similar Issues'
+            ),
+        ]
+        return `## title${severityBadge}\n${description}\n\n${commands.join('\n | ')}\n`
+    }
+
+    function setupIssues(issues: any[]): void {
+        securityIssueProvider.issues = [{ filePath: mockDocument.fileName, issues }]
+    }
+
+    it('should return hover for each issue for the current position', () => {
+        const issues = [
+            createCodeScanIssue({ findingId: 'finding-1', detectorId: 'language/detector-1', ruleId: 'Rule-123' }),
+            createCodeScanIssue({
+                findingId: 'finding-2',
+                detectorId: 'language/detector-2',
+                suggestedFixes: [],
+                ruleId: 'Rule-456',
+            }),
+        ]
+
+        setupIssues(issues)
+        const actual = securityIssueHoverProvider.provideHover(mockDocument, new vscode.Position(0, 0), token.token)
+
+        assert.strictEqual(actual.contents.length, 2)
+        assert.strictEqual(
+            (actual.contents[0] as vscode.MarkdownString).value,
+            buildExpectedContent(issues[0], mockDocument.fileName, 'fix', 'High')
+        )
+        assert.strictEqual(
+            (actual.contents[1] as vscode.MarkdownString).value,
+            buildExpectedContent(issues[1], mockDocument.fileName, 'recommendationText', 'High')
+        )
+        assertTelemetry('codewhisperer_codeScanIssueHover', [
+            { findingId: 'finding-1', detectorId: 'language/detector-1', ruleId: 'Rule-123', includesFix: true },
+            { findingId: 'finding-2', detectorId: 'language/detector-2', ruleId: 'Rule-456', includesFix: false },
+        ])
+    })
+
+    it('should return empty contents if there is no issue on the current position', () => {
+        setupIssues([createCodeScanIssue()])
+        const actual = securityIssueHoverProvider.provideHover(mockDocument, new vscode.Position(2, 0), token.token)
+        assert.strictEqual(actual.contents.length, 0)
+    })
+
+    it('should skip issues not in the current file', () => {
+        securityIssueProvider.issues = [
+            { filePath: 'some/path', issues: [createCodeScanIssue()] },
+            { filePath: mockDocument.fileName, issues: [createCodeScanIssue()] },
+        ]
+        const actual = securityIssueHoverProvider.provideHover(mockDocument, new vscode.Position(0, 0), token.token)
+        assert.strictEqual(actual.contents.length, 1)
+    })
+
+    it('should not show severity badge if undefined', () => {
+        const issues = [createCodeScanIssue({ severity: undefined, suggestedFixes: [] })]
+        setupIssues(issues)
+        const actual = securityIssueHoverProvider.provideHover(mockDocument, new vscode.Position(0, 0), token.token)
+        assert.strictEqual(actual.contents.length, 1)
+        assert.strictEqual(
+            (actual.contents[0] as vscode.MarkdownString).value,
+            buildExpectedContent(issues[0], mockDocument.fileName, 'recommendationText')
+        )
+    })
+
+    it('should handle fixes with consecutive lines removed', () => {
+        const issues = [
+            createCodeScanIssue({
+                suggestedFixes: [
+                    {
+                        code: '@@ -1,1 +1,1 @@\nfirst line\n-second line\n-third line\n+fourth line\nfifth line',
+                        description: 'fix',
+                    },
+                ],
+            }),
+        ]
+        setupIssues(issues)
+        const actual = securityIssueHoverProvider.provideHover(mockDocument, new vscode.Position(0, 0), token.token)
+        assert.strictEqual(actual.contents.length, 1)
+        assert.strictEqual(
+            (actual.contents[0] as vscode.MarkdownString).value,
+            buildExpectedContent(issues[0], mockDocument.fileName, 'fix', 'High')
+        )
+    })
+
+    it('should not show issues that are not visible', () => {
+        setupIssues([createCodeScanIssue({ visible: false })])
+        const actual = securityIssueHoverProvider.provideHover(mockDocument, new vscode.Position(0, 0), token.token)
+        assert.strictEqual(actual.contents.length, 0)
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/service/securityIssueProvider.test.ts b/packages/amazonq/test/unit/codewhisperer/service/securityIssueProvider.test.ts
new file mode 100644
index 00000000000..cbe4daed9fb
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/service/securityIssueProvider.test.ts
@@ -0,0 +1,132 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { SecurityIssueProvider, CodeScansState } from 'aws-core-vscode/codewhisperer'
+import { createCodeScanIssue, createMockDocument, createTextDocumentChangeEvent } from 'aws-core-vscode/test'
+import assert from 'assert'
+
+class MockProvider extends SecurityIssueProvider {}
+
+describe('securityIssueProvider', () => {
+    let mockProvider: MockProvider
+    let mockDocument: vscode.TextDocument
+
+    beforeEach(() => {
+        mockProvider = new MockProvider()
+        mockDocument = createMockDocument('def two_sum(nums, target):\nfor', 'test.py', 'python')
+    })
+
+    it('removes the issue if the document change on the same line if auto scan is disabled', async () => {
+        await CodeScansState.instance.setScansEnabled(false)
+        mockProvider.issues = [{ filePath: mockDocument.fileName, issues: [createCodeScanIssue()] }]
+
+        assert.strictEqual(mockProvider.issues[0].issues.length, 1)
+
+        const changeEvent = createTextDocumentChangeEvent(mockDocument, new vscode.Range(0, 0, 0, 0), 'a')
+        mockProvider.handleDocumentChange(changeEvent)
+
+        assert.strictEqual(mockProvider.issues[0].issues.length, 0)
+    })
+
+    it('offsets the existing issue down a line if a new line is inserted above', () => {
+        mockProvider.issues = [
+            { filePath: mockDocument.fileName, issues: [createCodeScanIssue({ startLine: 1, endLine: 2 })] },
+        ]
+        assert.strictEqual(mockProvider.issues[0].issues[0].startLine, 1)
+        assert.strictEqual(mockProvider.issues[0].issues[0].endLine, 2)
+        assert.ok(mockProvider.issues[0].issues[0].suggestedFixes[0].code?.startsWith('@@ -1,1 +1,1 @@'))
+
+        const changeEvent = createTextDocumentChangeEvent(mockDocument, new vscode.Range(0, 0, 0, 0), '\n')
+        mockProvider.handleDocumentChange(changeEvent)
+
+        assert.strictEqual(mockProvider.issues[0].issues[0].startLine, 2)
+        assert.strictEqual(mockProvider.issues[0].issues[0].endLine, 3)
+        assert.ok(mockProvider.issues[0].issues[0].suggestedFixes[0].code?.startsWith('@@ -2,1 +2,1 @@'))
+    })
+
+    it('does not move the issue if the document changed below the line', () => {
+        mockProvider.issues = [{ filePath: mockDocument.fileName, issues: [createCodeScanIssue()] }]
+
+        assert.strictEqual(mockProvider.issues[0].issues[0].startLine, 0)
+        assert.strictEqual(mockProvider.issues[0].issues[0].endLine, 1)
+        assert.ok(mockProvider.issues[0].issues[0].suggestedFixes[0].code?.startsWith('@@ -1,1 +1,1 @@'))
+
+        const changeEvent = createTextDocumentChangeEvent(mockDocument, new vscode.Range(2, 0, 2, 0), '\n')
+        mockProvider.handleDocumentChange(changeEvent)
+
+        assert.strictEqual(mockProvider.issues[0].issues[0].startLine, 0)
+        assert.strictEqual(mockProvider.issues[0].issues[0].endLine, 1)
+        assert.ok(mockProvider.issues[0].issues[0].suggestedFixes[0].code?.startsWith('@@ -1,1 +1,1 @@'))
+    })
+
+    it('should do nothing if no content changes', () => {
+        mockProvider.issues = [
+            { filePath: mockDocument.fileName, issues: [createCodeScanIssue({ startLine: 1, endLine: 2 })] },
+        ]
+
+        assert.strictEqual(mockProvider.issues[0].issues[0].startLine, 1)
+        assert.strictEqual(mockProvider.issues[0].issues[0].endLine, 2)
+        assert.ok(mockProvider.issues[0].issues[0].suggestedFixes[0].code?.startsWith('@@ -1,1 +1,1 @@'))
+
+        const changeEvent = createTextDocumentChangeEvent(mockDocument, new vscode.Range(0, 0, 0, 0), '')
+        changeEvent.contentChanges = []
+        mockProvider.handleDocumentChange(changeEvent)
+
+        assert.strictEqual(mockProvider.issues[0].issues[0].startLine, 1)
+        assert.strictEqual(mockProvider.issues[0].issues[0].endLine, 2)
+        assert.ok(mockProvider.issues[0].issues[0].suggestedFixes[0].code?.startsWith('@@ -1,1 +1,1 @@'))
+    })
+
+    it('should do nothing if file path does not match', () => {
+        mockProvider.issues = [{ filePath: 'some/path', issues: [createCodeScanIssue({ startLine: 1, endLine: 2 })] }]
+        assert.strictEqual(mockProvider.issues[0].issues[0].startLine, 1)
+        assert.strictEqual(mockProvider.issues[0].issues[0].endLine, 2)
+        assert.ok(mockProvider.issues[0].issues[0].suggestedFixes[0].code?.startsWith('@@ -1,1 +1,1 @@'))
+
+        const changeEvent = createTextDocumentChangeEvent(mockDocument, new vscode.Range(0, 0, 0, 0), '\n')
+        mockProvider.handleDocumentChange(changeEvent)
+
+        assert.strictEqual(mockProvider.issues[0].issues[0].startLine, 1)
+        assert.strictEqual(mockProvider.issues[0].issues[0].endLine, 2)
+        assert.ok(mockProvider.issues[0].issues[0].suggestedFixes[0].code?.startsWith('@@ -1,1 +1,1 @@'))
+    })
+
+    describe('removeIssue', () => {
+        it('should remove an issue from the issue list', () => {
+            mockProvider.issues = [
+                {
+                    filePath: mockDocument.fileName,
+                    issues: [
+                        createCodeScanIssue({ findingId: 'finding-1' }),
+                        createCodeScanIssue({ findingId: 'finding-2' }),
+                    ],
+                },
+            ]
+            mockProvider.removeIssue(
+                vscode.Uri.file(mockDocument.fileName),
+                createCodeScanIssue({ findingId: 'finding-1' })
+            )
+
+            assert.strictEqual(mockProvider.issues[0].issues.length, 1)
+            assert.strictEqual(mockProvider.issues[0].issues[0].findingId, 'finding-2')
+        })
+
+        it('should not remove an issue if file path does not match', () => {
+            mockProvider.issues = [
+                {
+                    filePath: mockDocument.fileName,
+                    issues: [
+                        createCodeScanIssue({ findingId: 'finding-1' }),
+                        createCodeScanIssue({ findingId: 'finding-2' }),
+                    ],
+                },
+            ]
+            mockProvider.removeIssue(vscode.Uri.file('some/path'), createCodeScanIssue({ findingId: 'finding-1' }))
+
+            assert.strictEqual(mockProvider.issues[0].issues.length, 2)
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/service/securityIssueTreeViewProvider.test.ts b/packages/amazonq/test/unit/codewhisperer/service/securityIssueTreeViewProvider.test.ts
new file mode 100644
index 00000000000..d72e1f8636f
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/service/securityIssueTreeViewProvider.test.ts
@@ -0,0 +1,177 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    FileItem,
+    IssueItem,
+    SecurityIssueTreeViewProvider,
+    SecurityTreeViewFilterState,
+    SecurityIssueProvider,
+    SeverityItem,
+    CodeIssueGroupingStrategyState,
+    CodeIssueGroupingStrategy,
+    sasRuleId,
+} from 'aws-core-vscode/codewhisperer'
+import { createCodeScanIssue } from 'aws-core-vscode/test'
+import assert from 'assert'
+import sinon from 'sinon'
+import path from 'path'
+
+describe('SecurityIssueTreeViewProvider', function () {
+    let securityIssueTreeViewProvider: SecurityIssueTreeViewProvider
+
+    beforeEach(function () {
+        SecurityIssueProvider.instance.issues = [
+            { filePath: 'file/path/a', issues: [createCodeScanIssue(), createCodeScanIssue()] },
+            { filePath: 'file/path/b', issues: [createCodeScanIssue(), createCodeScanIssue()] },
+            { filePath: 'file/path/c', issues: [createCodeScanIssue(), createCodeScanIssue()] },
+            { filePath: 'file/path/d', issues: [createCodeScanIssue(), createCodeScanIssue()] },
+        ]
+        securityIssueTreeViewProvider = new SecurityIssueTreeViewProvider()
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    describe('getTreeItem', function () {
+        it('should return the element as a FileItem', function () {
+            const element = new FileItem('dummy-path', [])
+            const result = securityIssueTreeViewProvider.getTreeItem(element)
+            assert.strictEqual(result, element)
+        })
+
+        it('should return the element as a IssueItem', function () {
+            const element = new IssueItem('dummy-path', createCodeScanIssue())
+            const result = securityIssueTreeViewProvider.getTreeItem(element)
+            assert.strictEqual(result, element)
+        })
+    })
+
+    describe('getChildren', function () {
+        it('should return sorted list of severities if element is undefined', function () {
+            const element = undefined
+            const result = securityIssueTreeViewProvider.getChildren(element) as SeverityItem[]
+            assert.strictEqual(result.length, 5)
+            assert.strictEqual(result[0].label, 'Critical')
+            assert.strictEqual(result[0].description, '0 issues')
+            assert.strictEqual(result[1].label, 'High')
+            assert.strictEqual(result[1].description, '8 issues')
+            assert.strictEqual(result[2].label, 'Medium')
+            assert.strictEqual(result[2].description, '0 issues')
+            assert.strictEqual(result[3].label, 'Low')
+            assert.strictEqual(result[3].description, '0 issues')
+            assert.strictEqual(result[4].label, 'Info')
+            assert.strictEqual(result[4].description, '0 issues')
+        })
+
+        it('should return sorted list of issues if element is SeverityItem', function () {
+            const element = new SeverityItem('Critical', [
+                {
+                    ...createCodeScanIssue({ title: 'Finding A', startLine: 10, severity: 'Critical' }),
+                    filePath: 'file/path/a',
+                },
+                {
+                    ...createCodeScanIssue({ title: 'Finding B', startLine: 2, severity: 'Critical' }),
+                    filePath: 'file/path/b',
+                },
+            ])
+            const result = securityIssueTreeViewProvider.getChildren(element) as IssueItem[]
+            assert.strictEqual(result.length, 2)
+            assert.strictEqual(result[0].label, 'Finding A')
+            assert.strictEqual(result[1].label, 'Finding B')
+        })
+
+        it('should filter out severities', function () {
+            const element = undefined
+            let result = securityIssueTreeViewProvider.getChildren(element) as SeverityItem[]
+            assert.strictEqual(result.length, 5)
+
+            sinon.stub(SecurityTreeViewFilterState.instance, 'getHiddenSeverities').returns(['Medium'])
+
+            result = securityIssueTreeViewProvider.getChildren(element) as SeverityItem[]
+            assert.strictEqual(result.length, 4)
+            assert.ok(result.every((item) => item.severity !== 'Medium'))
+        })
+
+        it('should not show issues that are not visible', function () {
+            const element = new SeverityItem('Critical', [
+                { ...createCodeScanIssue({ visible: false }), filePath: 'file/path/a' },
+            ])
+            const result = securityIssueTreeViewProvider.getChildren(element) as IssueItem[]
+            assert.strictEqual(result.length, 0)
+        })
+
+        it('should return severity-grouped items when grouping strategy is Severity', function () {
+            sinon.stub(CodeIssueGroupingStrategyState.instance, 'getState').returns(CodeIssueGroupingStrategy.Severity)
+
+            const severityItems = securityIssueTreeViewProvider.getChildren() as SeverityItem[]
+            for (const [index, [severity, expectedIssueCount]] of [
+                ['Critical', 0],
+                ['High', 8],
+                ['Medium', 0],
+                ['Low', 0],
+                ['Info', 0],
+            ].entries()) {
+                const currentSeverityItem = severityItems[index]
+                assert.strictEqual(currentSeverityItem.label, severity)
+                assert.strictEqual(currentSeverityItem.issues.length, expectedIssueCount)
+
+                const issueItems = securityIssueTreeViewProvider.getChildren(currentSeverityItem) as IssueItem[]
+                assert.ok(issueItems.every((item) => item.iconPath === undefined))
+                assert.ok(
+                    issueItems.every((item) => item.description?.toString().startsWith(path.basename(item.filePath)))
+                )
+            }
+        })
+
+        it('should return file-grouped items when grouping strategy is FileLocation', function () {
+            sinon
+                .stub(CodeIssueGroupingStrategyState.instance, 'getState')
+                .returns(CodeIssueGroupingStrategy.FileLocation)
+
+            const result = securityIssueTreeViewProvider.getChildren() as FileItem[]
+            for (const [index, [fileName, expectedIssueCount]] of [
+                ['a', 2],
+                ['b', 2],
+                ['c', 2],
+                ['d', 2],
+            ].entries()) {
+                const currentFileItem = result[index]
+                assert.strictEqual(currentFileItem.label, fileName)
+                assert.strictEqual(currentFileItem.issues.length, expectedIssueCount)
+                assert.strictEqual(currentFileItem.description, 'file/path')
+
+                const issueItems = securityIssueTreeViewProvider.getChildren(currentFileItem) as IssueItem[]
+                assert.ok(
+                    issueItems.every((item) =>
+                        item.iconPath?.toString().includes(`${item.issue.severity.toLowerCase()}.svg`)
+                    )
+                )
+                assert.ok(issueItems.every((item) => item.description?.toString().startsWith('[Ln ')))
+            }
+        })
+    })
+})
+
+describe('IssueItem', function () {
+    it('has issueWithFix context value for issues with suggested fix', function () {
+        const issueItem = new IssueItem(
+            'file/path',
+            createCodeScanIssue({ suggestedFixes: [{ code: 'fixCode', description: 'fixDescription' }] })
+        )
+        assert.strictEqual(issueItem.contextValue, 'issueWithFix')
+    })
+
+    it('has issueWithoutFix context value for issues without suggested fix', function () {
+        const issueItem = new IssueItem('file/path', createCodeScanIssue({ suggestedFixes: [] }))
+        assert.strictEqual(issueItem.contextValue, 'issueWithoutFix')
+    })
+
+    it('has issueWithFixDisabled context value for SAS findings', function () {
+        const issueItem = new IssueItem('file/path', createCodeScanIssue({ ruleId: sasRuleId }))
+        assert.strictEqual(issueItem.contextValue, 'issueWithFixDisabled')
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/service/securityScanHandler.test.ts b/packages/amazonq/test/unit/codewhisperer/service/securityScanHandler.test.ts
new file mode 100644
index 00000000000..a368291e12b
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/service/securityScanHandler.test.ts
@@ -0,0 +1,326 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { PromiseResult } from 'aws-sdk/lib/request'
+import { Stub, stub } from 'aws-core-vscode/test'
+import { AWSError, HttpResponse } from 'aws-sdk'
+import {
+    CodeAnalysisScope,
+    RawCodeScanIssue,
+    listScanResults,
+    mapToAggregatedList,
+    DefaultCodeWhispererClient,
+    ListCodeScanFindingsResponse,
+    pollScanJobStatus,
+    SecurityScanTimedOutError,
+    CodeWhispererConstants,
+    CodeScansState,
+} from 'aws-core-vscode/codewhisperer'
+import { timeoutUtils } from 'aws-core-vscode/shared'
+import assert from 'assert'
+import sinon from 'sinon'
+import * as vscode from 'vscode'
+import path from 'path'
+
+const buildRawCodeScanIssue = (params?: Partial<RawCodeScanIssue>): RawCodeScanIssue => ({
+    filePath: 'workspaceFolder/python3.7-plain-sam-app/hello_world/app.py',
+    startLine: 1,
+    endLine: 1,
+    title: 'title',
+    description: {
+        text: 'text',
+        markdown: 'markdown',
+    },
+    detectorId: 'detectorId',
+    detectorName: 'detectorName',
+    findingId: 'findingId',
+    relatedVulnerabilities: [],
+    severity: 'High',
+    remediation: {
+        recommendation: {
+            text: 'text',
+            url: 'url',
+        },
+        suggestedFixes: [],
+    },
+    codeSnippet: [],
+    ...params,
+})
+
+const buildMockListCodeScanFindingsResponse = (
+    codeScanFindings: string = JSON.stringify([buildRawCodeScanIssue()]),
+    nextToken?: boolean
+): Awaited<Promise<PromiseResult<ListCodeScanFindingsResponse, AWSError>>> => ({
+    $response: {
+        hasNextPage: () => false,
+        nextPage: () => null, // eslint-disable-line unicorn/no-null
+        data: undefined,
+        error: undefined,
+        requestId: '',
+        redirectCount: 0,
+        retryCount: 0,
+        httpResponse: new HttpResponse(),
+    },
+    codeScanFindings,
+    nextToken: nextToken ? 'nextToken' : undefined,
+})
+
+function getWorkspaceFolder(): string {
+    return (
+        vscode.workspace.workspaceFolders?.[0]?.uri.fsPath ??
+        path.join(__dirname, '../../../../../../core/src/testFixtures/workspaceFolder')
+    )
+}
+
+describe('securityScanHandler', function () {
+    describe('listScanResults', function () {
+        let mockClient: Stub<DefaultCodeWhispererClient>
+        beforeEach(function () {
+            mockClient = stub(DefaultCodeWhispererClient)
+        })
+
+        it('should make ListCodeScanFindings request and aggregate findings by file path', async function () {
+            mockClient.listCodeScanFindings.resolves(buildMockListCodeScanFindingsResponse())
+
+            const aggregatedCodeScanIssueList = await listScanResults(
+                mockClient,
+                'jobId',
+                'codeScanFindingsSchema',
+                [getWorkspaceFolder()],
+                CodeAnalysisScope.PROJECT,
+                undefined
+            )
+
+            assert.equal(aggregatedCodeScanIssueList.length, 1)
+            assert.equal(aggregatedCodeScanIssueList[0].issues.length, 1)
+        })
+
+        it('should handle ListCodeScanFindings request with paginated response', async function () {
+            mockClient.listCodeScanFindings
+                .onFirstCall()
+                .resolves(
+                    buildMockListCodeScanFindingsResponse(
+                        JSON.stringify([buildRawCodeScanIssue({ title: 'title1' })]),
+                        true
+                    )
+                )
+                .onSecondCall()
+                .resolves(
+                    buildMockListCodeScanFindingsResponse(
+                        JSON.stringify([buildRawCodeScanIssue({ title: 'title2' })]),
+                        true
+                    )
+                )
+                .onThirdCall()
+                .resolves(
+                    buildMockListCodeScanFindingsResponse(
+                        JSON.stringify([buildRawCodeScanIssue({ title: 'title3' })]),
+                        false
+                    )
+                )
+
+            const aggregatedCodeScanIssueList = await listScanResults(
+                mockClient,
+                'jobId',
+                'codeScanFindingsSchema',
+                [getWorkspaceFolder()],
+                CodeAnalysisScope.PROJECT,
+                undefined
+            )
+
+            assert.equal(aggregatedCodeScanIssueList.length, 1)
+            assert.equal(aggregatedCodeScanIssueList[0].issues.length, 3)
+        })
+
+        it('should set autoDetected based on scope', async function () {
+            mockClient.listCodeScanFindings.resolves(
+                buildMockListCodeScanFindingsResponse(JSON.stringify([buildRawCodeScanIssue()]))
+            )
+            for (const [scope, expectedValue] of [
+                [CodeAnalysisScope.FILE_AUTO, true],
+                [CodeAnalysisScope.FILE_ON_DEMAND, false],
+                [CodeAnalysisScope.PROJECT, false],
+            ] as [CodeAnalysisScope, boolean][]) {
+                const aggregatedCodeScanIssueList = await listScanResults(
+                    mockClient,
+                    'jobId',
+                    'codeScanFindingsSchema',
+                    [getWorkspaceFolder()],
+                    scope,
+                    undefined
+                )
+                assert.ok(
+                    aggregatedCodeScanIssueList.every((item) =>
+                        item.issues.every((issue) => issue.autoDetected === expectedValue)
+                    )
+                )
+            }
+        })
+    })
+
+    describe('mapToAggregatedList', () => {
+        let codeScanIssueMap: Map<string, RawCodeScanIssue[]>
+        let editor: vscode.TextEditor | undefined
+
+        beforeEach(() => {
+            codeScanIssueMap = new Map()
+            editor = {
+                document: {
+                    lineAt: (lineNumber: number): vscode.TextLine => ({
+                        lineNumber: lineNumber + 1,
+                        range: new vscode.Range(0, 0, 0, 0),
+                        rangeIncludingLineBreak: new vscode.Range(0, 0, 0, 0),
+                        firstNonWhitespaceCharacterIndex: 0,
+                        isEmptyOrWhitespace: false,
+                        text: `line ${lineNumber + 1}`,
+                    }),
+                },
+            } as vscode.TextEditor
+        })
+
+        it('should aggregate issues by file path', () => {
+            const json = JSON.stringify([
+                {
+                    filePath: 'file1.ts',
+                    startLine: 1,
+                    endLine: 2,
+                    codeSnippet: [
+                        { number: 1, content: 'line 1' },
+                        { number: 2, content: 'line 2' },
+                    ],
+                },
+                { filePath: 'file2.ts', startLine: 1, endLine: 1, codeSnippet: [{ number: 1, content: 'line 1' }] },
+            ])
+
+            mapToAggregatedList(codeScanIssueMap, json, editor, CodeAnalysisScope.FILE_AUTO)
+
+            assert.equal(codeScanIssueMap.size, 2)
+            assert.equal(codeScanIssueMap.get('file1.ts')?.length, 1)
+            assert.equal(codeScanIssueMap.get('file2.ts')?.length, 1)
+        })
+
+        it('should filter issues based on the scope', () => {
+            const json = JSON.stringify([
+                {
+                    filePath: 'file1.ts',
+                    startLine: 1,
+                    endLine: 2,
+                    codeSnippet: [
+                        { number: 1, content: 'line 1' },
+                        { number: 2, content: 'line 2' },
+                    ],
+                },
+                { filePath: 'file1.ts', startLine: 3, endLine: 3, codeSnippet: [{ number: 3, content: 'line 3' }] },
+            ])
+
+            mapToAggregatedList(codeScanIssueMap, json, editor, CodeAnalysisScope.FILE_AUTO)
+
+            assert.equal(codeScanIssueMap.size, 1)
+            assert.equal(codeScanIssueMap.get('file1.ts')?.length, 2)
+        })
+
+        it('should handle issue filtering with redacted code', () => {
+            const json = JSON.stringify([
+                {
+                    filePath: 'file1.ts',
+                    startLine: 1,
+                    endLine: 2,
+                    codeSnippet: [
+                        { number: 1, content: '**** *' },
+                        { number: 2, content: '**** *' },
+                    ],
+                },
+                { filePath: 'file1.ts', startLine: 3, endLine: 3, codeSnippet: [{ number: 3, content: '**** **' }] },
+            ])
+
+            mapToAggregatedList(codeScanIssueMap, json, editor, CodeAnalysisScope.FILE_AUTO)
+            assert.strictEqual(codeScanIssueMap.size, 1)
+            assert.strictEqual(codeScanIssueMap.get('file1.ts')?.length, 1)
+        })
+
+        it('should handle duplicate issues', function () {
+            const json = JSON.stringify([
+                {
+                    filePath: 'file1.ts',
+                    startLine: 1,
+                    endLine: 2,
+                    title: 'duplicate issue',
+                    codeSnippet: [
+                        { number: 1, content: 'line 1' },
+                        { number: 2, content: 'line 2' },
+                    ],
+                },
+                {
+                    filePath: 'file1.ts',
+                    startLine: 1,
+                    endLine: 2,
+                    title: 'duplicate issue',
+                    codeSnippet: [
+                        { number: 1, content: 'line 1' },
+                        { number: 2, content: 'line 2' },
+                    ],
+                },
+            ])
+
+            mapToAggregatedList(codeScanIssueMap, json, editor, CodeAnalysisScope.FILE_AUTO)
+            assert.strictEqual(codeScanIssueMap.size, 1)
+            assert.strictEqual(codeScanIssueMap.get('file1.ts')?.length, 1)
+        })
+    })
+
+    describe('pollScanJobStatus', function () {
+        let mockClient: Stub<DefaultCodeWhispererClient>
+        let clock: sinon.SinonFakeTimers
+        const mockJobId = 'test-job-id'
+        const mockStartTime = Date.now()
+
+        beforeEach(function () {
+            mockClient = stub(DefaultCodeWhispererClient)
+            clock = sinon.useFakeTimers({
+                shouldAdvanceTime: true,
+            })
+            sinon.stub(timeoutUtils, 'sleep').resolves()
+            sinon.stub(CodeScansState.instance, 'isScansEnabled').returns(true)
+        })
+
+        afterEach(function () {
+            sinon.restore()
+            clock.restore()
+        })
+
+        it('should return status when scan completes successfully', async function () {
+            mockClient.getCodeScan
+                .onFirstCall()
+                .resolves({ status: 'Pending', $response: { requestId: 'req1' } })
+                .onSecondCall()
+                .resolves({ status: 'Completed', $response: { requestId: 'req2' } })
+
+            const result = await pollScanJobStatus(mockClient, mockJobId, CodeAnalysisScope.FILE_AUTO, mockStartTime)
+            assert.strictEqual(result, 'Completed')
+        })
+
+        it('should throw SecurityScanTimedOutError when polling exceeds timeout for express scans', async function () {
+            mockClient.getCodeScan.resolves({ status: 'Pending', $response: { requestId: 'req1' } })
+
+            const pollPromise = pollScanJobStatus(mockClient, mockJobId, CodeAnalysisScope.FILE_AUTO, mockStartTime)
+
+            const expectedTimeoutMs = CodeWhispererConstants.expressScanTimeoutMs
+            clock.tick(expectedTimeoutMs + 1000)
+
+            await assert.rejects(() => pollPromise, SecurityScanTimedOutError)
+        })
+
+        it('should throw SecurityScanTimedOutError when polling exceeds timeout for standard scans', async function () {
+            mockClient.getCodeScan.resolves({ status: 'Pending', $response: { requestId: 'req1' } })
+
+            const pollPromise = pollScanJobStatus(mockClient, mockJobId, CodeAnalysisScope.PROJECT, mockStartTime)
+
+            const expectedTimeoutMs = CodeWhispererConstants.standardScanTimeoutMs
+            clock.tick(expectedTimeoutMs + 1000)
+
+            await assert.rejects(() => pollPromise, SecurityScanTimedOutError)
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/service/telemetry.test.ts b/packages/amazonq/test/unit/codewhisperer/service/telemetry.test.ts
new file mode 100644
index 00000000000..1f11661f002
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/service/telemetry.test.ts
@@ -0,0 +1,613 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import os from 'os'
+import * as vscode from 'vscode'
+import sinon from 'sinon'
+import semver from 'semver'
+import {
+    assertTabCount,
+    assertTelemetry,
+    assertTextEditorContains,
+    createTestWorkspaceFolder,
+    toTextEditor,
+} from 'aws-core-vscode/test'
+import {
+    DefaultCodeWhispererClient,
+    ListRecommendationsResponse,
+    Recommendation,
+    ConfigurationEntry,
+    session,
+    vsCodeCursorUpdateDelay,
+    AuthUtil,
+} from 'aws-core-vscode/codewhisperer'
+import { sleep, waitUntil, env, CodewhispererUserTriggerDecision } from 'aws-core-vscode/shared'
+import { resetCodeWhispererGlobalVariables } from 'aws-core-vscode/test'
+
+type CodeWhispererResponse = ListRecommendationsResponse & {
+    $response: { requestId: string; httpResponse: { headers: { [key: string]: string } } }
+}
+
+let tempFolder: string
+
+describe.skip('CodeWhisperer telemetry', async function () {
+    let sandbox: sinon.SinonSandbox
+    let client: DefaultCodeWhispererClient
+
+    // can refactor to single 1 function
+    function aUserTriggerEvent(ops: Partial<CodewhispererUserTriggerDecision>): CodewhispererUserTriggerDecision {
+        return {
+            codewhispererSessionId: '',
+            codewhispererFirstRequestId: '',
+            codewhispererLanguage: 'python',
+            codewhispererTriggerType: 'OnDemand',
+            codewhispererLineNumber: 0,
+            codewhispererCursorOffset: 0,
+            codewhispererSuggestionCount: 0,
+            codewhispererCompletionType: 'Line',
+            codewhispererSuggestionState: 'Accept',
+            codewhispererSuggestionImportCount: 0,
+            codewhispererTypeaheadLength: 0,
+            ...ops,
+        }
+    }
+
+    function session1UserTriggerEvent(
+        ops?: Partial<CodewhispererUserTriggerDecision>
+    ): CodewhispererUserTriggerDecision {
+        return aUserTriggerEvent({
+            codewhispererSessionId: 'session_id_1',
+            codewhispererFirstRequestId: 'request_id_1',
+            codewhispererSuggestionCount: 3,
+            ...ops,
+        })
+    }
+
+    function session2UserTriggerEvent(
+        ops?: Partial<CodewhispererUserTriggerDecision>
+    ): CodewhispererUserTriggerDecision {
+        return aUserTriggerEvent({
+            codewhispererSessionId: 'session_id_2',
+            codewhispererFirstRequestId: 'request_id_2',
+            codewhispererSuggestionCount: 2,
+            codewhispererCompletionType: 'Block',
+            ...ops,
+        })
+    }
+
+    function sesssion3UserTriggerEvent(
+        ops?: Partial<CodewhispererUserTriggerDecision>
+    ): CodewhispererUserTriggerDecision {
+        return aUserTriggerEvent({
+            codewhispererSessionId: 'session_id_3',
+            codewhispererFirstRequestId: 'request_id_3',
+            codewhispererSuggestionCount: 1,
+            ...ops,
+        })
+    }
+
+    const config: ConfigurationEntry = {
+        isShowMethodsEnabled: true,
+        isManualTriggerEnabled: true,
+        isAutomatedTriggerEnabled: false,
+        isSuggestionsWithCodeReferencesEnabled: true,
+    }
+
+    beforeEach(async function () {
+        sandbox = sinon.createSandbox()
+        tempFolder = (await createTestWorkspaceFolder()).uri.fsPath
+        client = mockClient()
+        sandbox.stub(AuthUtil.instance, 'isConnected').returns(true)
+        sandbox.stub(AuthUtil.instance, 'isConnectionExpired').returns(false)
+        await resetStates()
+    })
+
+    afterEach(async function () {
+        sandbox.restore()
+        await resetStates()
+    })
+
+    async function resetStates() {
+        await resetCodeWhispererGlobalVariables()
+    }
+
+    function mockClient(): DefaultCodeWhispererClient {
+        const response11 = aResponse(
+            'session_id_1',
+            'request_id_1',
+            'fake-nextToken',
+            { content: 'Foo' },
+            { content: 'Bar\nBar' }
+        )
+        const response12 = aResponse('session_id_1', 'request_id_1_2', undefined, { content: 'FooFoo' })
+        const response2 = aResponse(
+            'session_id_2',
+            'request_id_2',
+            undefined,
+            { content: 'Baz\nBaz' },
+            { content: 'Baz' }
+        )
+        const response3 = aResponse('session_id_3', 'request_id_3', undefined, { content: 'Qoo' })
+
+        const cwClient = new DefaultCodeWhispererClient()
+        const stub = sandbox.stub(cwClient, 'listRecommendations')
+        stub.onCall(0).resolves(response11)
+        stub.onCall(1).resolves(response12)
+        stub.onCall(2).resolves(response2)
+        stub.onCall(3).resolves(response3)
+
+        return cwClient
+    }
+
+    function assertSessionClean() {
+        assert.strictEqual(session.requestIdList.length, 0)
+        assert.strictEqual(session.recommendations.length, 0)
+        assert.strictEqual(session.completionTypes.size, 0)
+        assert.strictEqual(session.completionTypes.size, 0)
+    }
+
+    describe('tab and esc', function () {
+        it('single accept', async function () {
+            assertSessionClean()
+            const editor = await toTextEditor('', 'test.py')
+
+            await manualTrigger(editor, client, config)
+            await acceptByTab()
+            await assertTextEditorContains('Foo')
+            assertTelemetry('codewhisperer_userTriggerDecision', [session1UserTriggerEvent()])
+        })
+
+        it('single reject', async function () {
+            assertSessionClean()
+            const editor = await toTextEditor('', 'test.py')
+
+            await manualTrigger(editor, client, config)
+            await rejectByEsc()
+            await assertTextEditorContains('')
+
+            assertTelemetry('codewhisperer_userTriggerDecision', [
+                session1UserTriggerEvent({ codewhispererSuggestionState: 'Reject' }),
+            ])
+        })
+
+        it('accept - accept - accept', async function () {
+            assertSessionClean()
+            const editor = await toTextEditor('', 'test.py')
+
+            await manualTrigger(editor, client, config)
+            await acceptByTab()
+            await assertTextEditorContains('Foo')
+
+            assertSessionClean()
+            await manualTrigger(editor, client, config)
+            await acceptByTab()
+            await assertTextEditorContains(`FooBaz${os.EOL}Baz`)
+
+            const anotherEditor = await toTextEditor('', 'anotherTest.py')
+            assertSessionClean()
+            await manualTrigger(anotherEditor, client, config)
+            await acceptByTab()
+            await assertTextEditorContains('Qoo')
+
+            assertTelemetry('codewhisperer_userTriggerDecision', [
+                session1UserTriggerEvent(),
+                session2UserTriggerEvent({ codewhispererCursorOffset: 3 }),
+                sesssion3UserTriggerEvent(),
+            ])
+        })
+
+        it('accept - reject - accept', async function () {
+            assertSessionClean()
+            const editor = await toTextEditor('', 'test.py')
+
+            await manualTrigger(editor, client, config)
+            await acceptByTab()
+            await assertTextEditorContains('Foo')
+
+            assertSessionClean()
+            await manualTrigger(editor, client, config)
+            await rejectByEsc()
+            await assertTextEditorContains('Foo')
+
+            const anotherEditor = await toTextEditor('', 'anotherTest.py')
+            assertSessionClean()
+            await manualTrigger(anotherEditor, client, config)
+            await rejectByEsc()
+            await assertTextEditorContains('')
+
+            assertTelemetry('codewhisperer_userTriggerDecision', [
+                session1UserTriggerEvent(),
+                session2UserTriggerEvent({ codewhispererCursorOffset: 3, codewhispererSuggestionState: 'Reject' }),
+                sesssion3UserTriggerEvent({ codewhispererSuggestionState: 'Reject' }),
+            ])
+        })
+
+        it('reject - reject - reject', async function () {
+            assertSessionClean()
+            const editor = await toTextEditor('', 'test.py')
+
+            await manualTrigger(editor, client, config)
+            await rejectByEsc()
+            await assertTextEditorContains('')
+
+            assertSessionClean()
+            await manualTrigger(editor, client, config)
+            await rejectByEsc()
+            await assertTextEditorContains('')
+
+            assertSessionClean()
+            await manualTrigger(editor, client, config)
+            await rejectByEsc()
+            await assertTextEditorContains('')
+
+            assertTelemetry('codewhisperer_userTriggerDecision', [
+                session1UserTriggerEvent({ codewhispererSuggestionState: 'Reject' }),
+                session2UserTriggerEvent({ codewhispererSuggestionState: 'Reject' }),
+                sesssion3UserTriggerEvent({ codewhispererSuggestionState: 'Reject' }),
+            ])
+        })
+
+        it('reject - accept - reject', async function () {
+            assertSessionClean()
+            const editor = await toTextEditor('', 'test.py')
+
+            await manualTrigger(editor, client, config)
+            await rejectByEsc()
+            await assertTextEditorContains('')
+
+            assertSessionClean()
+            await manualTrigger(editor, client, config)
+            await acceptByTab()
+            await assertTextEditorContains(`Baz${os.EOL}Baz`)
+
+            assertSessionClean()
+            await manualTrigger(editor, client, config)
+            await rejectByEsc()
+            await assertTextEditorContains(`Baz${os.EOL}Baz`)
+
+            assertTelemetry('codewhisperer_userTriggerDecision', [
+                session1UserTriggerEvent({ codewhispererSuggestionState: 'Reject' }),
+                session2UserTriggerEvent(),
+                sesssion3UserTriggerEvent({
+                    codewhispererSuggestionState: 'Reject',
+                    codewhispererCursorOffset: 7 + (os.EOL.length - 1),
+                    codewhispererLineNumber: 1,
+                }),
+            ])
+        })
+    })
+
+    describe('navigation', function () {
+        // as per vscode official repo PR https://github.com/microsoft/vscode/commit/cb0e59c56677181b570b110167d13efb4ba7677d#diff-84b7f4a5ab7c383d86e2d40e2c704d255dc1e187a29386c036023a4696196556R19
+        // navigation commands seem to be introduced since 1.78.0
+        function shouldRun() {
+            const version = env.getMinVscodeVersion()
+            if (semver.gte(version, '1.78.0')) {
+                throw new Error('Minimum VSCode version is greater than 1.78.0, this check should be removed')
+            }
+
+            return semver.valid(vscode.version) && semver.gte(vscode.version, '1.78.0')
+        }
+
+        it('next and accept', async function () {
+            if (!shouldRun()) {
+                this.skip()
+            }
+
+            assertSessionClean()
+            const editor = await toTextEditor('', 'test.py')
+
+            await manualTrigger(editor, client, config)
+            await navigateNext()
+            await acceptByTab()
+            await assertTextEditorContains(`Bar${os.EOL}Bar`)
+
+            assertTelemetry('codewhisperer_userTriggerDecision', [session1UserTriggerEvent()])
+        })
+
+        it('next and reject', async function () {
+            if (!shouldRun()) {
+                this.skip()
+            }
+
+            assertSessionClean()
+            const editor = await toTextEditor('', 'test.py')
+
+            await manualTrigger(editor, client, config)
+            await navigateNext()
+            await rejectByEsc()
+            await assertTextEditorContains('')
+
+            assertTelemetry('codewhisperer_userTriggerDecision', [
+                session1UserTriggerEvent({ codewhispererSuggestionState: 'Reject' }),
+            ])
+        })
+
+        it('next and accept', async function () {
+            if (!shouldRun()) {
+                this.skip()
+            }
+
+            assertSessionClean()
+            const editor = await toTextEditor('', 'test.py')
+
+            await manualTrigger(editor, client, config)
+            await navigateNext()
+            await navigatePrev()
+            await acceptByTab()
+            await assertTextEditorContains('Foo')
+
+            assertTelemetry('codewhisperer_userTriggerDecision', [session1UserTriggerEvent()])
+        })
+    })
+
+    describe('typing', function () {
+        it('typeahead match accept', async function () {
+            assertSessionClean()
+            const editor = await toTextEditor('', 'test.py')
+
+            await manualTrigger(editor, client, config)
+            await typing(editor, 'F')
+            await assertTextEditorContains('F')
+
+            await acceptByTab()
+            await assertTextEditorContains('Foo')
+
+            assertTelemetry('codewhisperer_userTriggerDecision', [session1UserTriggerEvent()])
+        })
+
+        it('typeahead match, backspace and accept', async function () {
+            assertSessionClean()
+            const editor = await toTextEditor('', 'test.py')
+
+            await manualTrigger(editor, client, config)
+            await typing(editor, 'F')
+            await assertTextEditorContains('F')
+
+            await backspace(editor)
+            await assertTextEditorContains('')
+
+            await acceptByTab()
+            await assertTextEditorContains('Foo')
+
+            assertTelemetry('codewhisperer_userTriggerDecision', [session1UserTriggerEvent()])
+        })
+
+        it('typeahead match accept - reject - accept', async function () {
+            // TODO: skipping because in some machines, acceptByTab('Foo') right after typing('F') will result in 'FFoo'
+            // the solution is to waitUntil VSCode InlineSuggestion to resolve the "typeahead" but currently no easy way to know if the InlinSuggestion is shown visible again
+            this.skip()
+            assertSessionClean()
+            const editor = await toTextEditor('', 'test.py')
+
+            await manualTrigger(editor, client, config)
+            await typing(editor, 'F')
+            await assertTextEditorContains('F')
+
+            await acceptByTab()
+            await assertTextEditorContains('Foo')
+
+            await manualTrigger(editor, client, config)
+            await rejectByEsc()
+            await assertTextEditorContains('Foo')
+
+            const anotherEditor = await toTextEditor('', 'anotherTest.py')
+            await manualTrigger(anotherEditor, client, config)
+            await typing(anotherEditor, 'Qo')
+            await assertTextEditorContains('Qo')
+
+            await acceptByTab()
+            await assertTextEditorContains('Qoo')
+
+            assertTelemetry('codewhisperer_userTriggerDecision', [
+                session1UserTriggerEvent(),
+                session2UserTriggerEvent({ codewhispererCursorOffset: 3, codewhispererSuggestionState: 'Reject' }),
+                sesssion3UserTriggerEvent(),
+            ])
+        })
+
+        it('typeahead not match after suggestion is shown and reject', async function () {
+            assertSessionClean()
+            const editor = await toTextEditor('', 'test.py')
+
+            await manualTrigger(editor, client, config)
+            await typing(editor, 'H')
+            await assertTextEditorContains('H')
+
+            // states will not be cleaned until reportUserDecision is called
+            assert.strictEqual(session.sessionId, 'session_id_1')
+            assert.deepStrictEqual(session.requestIdList, ['request_id_1', 'request_id_1', 'request_id_1_2'])
+
+            assertSessionClean()
+            await backspace(editor) // todo: without this, the following manual trigger will not be displayed in the test, investigate and fix it
+
+            await manualTrigger(editor, client, config)
+            await acceptByTab()
+            await assertTextEditorContains(`Baz${os.EOL}Baz`)
+
+            assertTelemetry('codewhisperer_userTriggerDecision', [
+                session1UserTriggerEvent({ codewhispererSuggestionState: 'Reject' }),
+                session2UserTriggerEvent(),
+            ])
+        })
+
+        it('reject - typeahead not matching after suggestion is shown then invoke another round and accept', async function () {
+            assertSessionClean()
+            const editor = await toTextEditor('', 'test.py')
+
+            await manualTrigger(editor, client, config)
+            await typing(editor, 'H')
+            await assertTextEditorContains('H')
+
+            const anotherEditor = await toTextEditor('', 'anotherTest.py')
+            await manualTrigger(anotherEditor, client, config)
+            await acceptByTab()
+            await assertTextEditorContains(`Baz${os.EOL}Baz`)
+
+            assertTelemetry('codewhisperer_userTriggerDecision', [
+                session1UserTriggerEvent({ codewhispererSuggestionState: 'Reject' }),
+                session2UserTriggerEvent(),
+            ])
+        })
+    })
+
+    describe('on editor change, focus change', function () {
+        it('reject: trigger then open another editor', async function () {
+            assertSessionClean()
+            const editor = await toTextEditor('', 'test.py', tempFolder, { preview: false })
+
+            await manualTrigger(editor, client, config)
+
+            await toTextEditor('text in 2nd editor', 'another1.py', tempFolder, {
+                preview: false,
+            })
+            const anotherEditor = await toTextEditor('text in 3rd editor', 'another2.py', tempFolder, {
+                preview: false,
+            })
+
+            assert.strictEqual(vscode.window.activeTextEditor, anotherEditor)
+            await assertTextEditorContains('')
+            await assertTabCount(3)
+            assertTelemetry('codewhisperer_userTriggerDecision', [
+                session1UserTriggerEvent({ codewhispererSuggestionState: 'Reject' }),
+            ])
+        })
+
+        it('reject: trigger then close editor', async function () {
+            assertSessionClean()
+            const editor = await toTextEditor('', 'test.py')
+
+            await manualTrigger(editor, client, config)
+            await closeActiveEditor()
+            await assertTextEditorContains('')
+
+            assertTelemetry('codewhisperer_userTriggerDecision', [
+                session1UserTriggerEvent({ codewhispererSuggestionState: 'Reject' }),
+            ])
+        })
+
+        it('reject: onFocusChange', async function () {
+            assertSessionClean()
+            const editor = await toTextEditor('', 'test.py')
+
+            await manualTrigger(editor, client, config)
+            await assertTextEditorContains('')
+
+            assertTelemetry('codewhisperer_userTriggerDecision', [
+                session1UserTriggerEvent({ codewhispererSuggestionState: 'Reject' }),
+            ])
+        })
+    })
+})
+
+async function manualTrigger(
+    editor: vscode.TextEditor,
+    client: DefaultCodeWhispererClient,
+    config: ConfigurationEntry
+) {
+    await waitUntilSuggestionSeen()
+}
+
+// Note: RecommendationHandler.isSuggestionVisible seems not to work well, hence not using it
+async function waitUntilSuggestionSeen(index: number = 0) {
+    const state = await waitUntil(
+        async () => {
+            const r = session.getSuggestionState(index)
+            if (r) {
+                return r
+            }
+        },
+        {
+            interval: 500,
+        }
+    )
+
+    assert.ok(state === 'Showed')
+}
+
+async function acceptByTab() {
+    const editor = vscode.window.activeTextEditor
+    if (!editor) {
+        throw new Error('no active editor')
+    }
+    const originalContent = editor.document.getText()
+    // we have to wait until the inline suggestion is shown in the editor however we don't have an useable API for that so hacky wait to know if the accept is taking effect
+    await waitUntil(
+        async () => {
+            await sleep(50)
+            await vscode.commands.executeCommand('editor.action.inlineSuggest.commit')
+            if (editor.document.getText() !== originalContent) {
+                return true
+            }
+        },
+        { interval: 10 }
+    )
+
+    // required because oninlineAcceptance has sleep(vsCodeCursorUpdateDelay), otherwise assertion will be executed "before" onAcceptance hook
+    await sleep(vsCodeCursorUpdateDelay + 50)
+}
+
+async function rejectByEsc() {
+    return vscode.commands.executeCommand('aws.amazonq.rejectCodeSuggestion')
+}
+
+async function navigateNext() {
+    return vscode.commands.executeCommand('editor.action.inlineSuggest.showNext')
+}
+
+async function navigatePrev() {
+    return vscode.commands.executeCommand('editor.action.inlineSuggest.showPrevious')
+}
+
+async function closeActiveEditor() {
+    return vscode.commands.executeCommand('workbench.action.closeActiveEditor')
+}
+
+async function typing(editor: vscode.TextEditor, s: string) {
+    const initialContent = editor.document.getText()
+    const positionBefore = editor.document.offsetAt(editor.selection.active)
+
+    await editor.edit((edit) => {
+        edit.insert(editor.selection.active, s)
+    })
+
+    await assertTextEditorContains(initialContent + s)
+    await waitUntil(
+        async () => {
+            const positionPendingUpdate = editor.document.offsetAt(editor.selection.active)
+            if (positionPendingUpdate === positionBefore + s.length) {
+                return true
+            }
+        },
+        { interval: 50 }
+    )
+    const positionAfter = editor.document.offsetAt(editor.selection.active)
+    assert.strictEqual(positionAfter, positionBefore + s.length)
+}
+
+async function backspace(editor: vscode.TextEditor) {
+    return vscode.commands.executeCommand('deleteLeft')
+}
+
+function aResponse(
+    sessionId: string,
+    requestId: string,
+    nextToken: string | undefined,
+    ...args: Recommendation[]
+): CodeWhispererResponse {
+    return {
+        recommendations: args,
+        nextToken: nextToken,
+        $response: {
+            requestId: requestId,
+            httpResponse: {
+                headers: {
+                    'x-amzn-sessionid': sessionId,
+                },
+            },
+        },
+    }
+}
diff --git a/packages/amazonq/test/unit/codewhisperer/tracker/codewhispererCodeCoverageTracker.test.ts b/packages/amazonq/test/unit/codewhisperer/tracker/codewhispererCodeCoverageTracker.test.ts
new file mode 100644
index 00000000000..ee001b3328d
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/tracker/codewhispererCodeCoverageTracker.test.ts
@@ -0,0 +1,560 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import {
+    CodeWhispererCodeCoverageTracker,
+    vsCodeState,
+    TelemetryHelper,
+    AuthUtil,
+    getUnmodifiedAcceptedTokens,
+} from 'aws-core-vscode/codewhisperer'
+import { createMockDocument, createMockTextEditor, resetCodeWhispererGlobalVariables } from 'aws-core-vscode/test'
+import { globals } from 'aws-core-vscode/shared'
+import { assertTelemetryCurried } from 'aws-core-vscode/test'
+
+describe('codewhispererCodecoverageTracker', function () {
+    const language = 'python'
+
+    describe('test getTracker', function () {
+        afterEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+            CodeWhispererCodeCoverageTracker.instances.clear()
+        })
+
+        it('unsupported language', function () {
+            assert.strictEqual(CodeWhispererCodeCoverageTracker.getTracker('vb'), undefined)
+            assert.strictEqual(CodeWhispererCodeCoverageTracker.getTracker('ipynb'), undefined)
+        })
+
+        it('supported language', function () {
+            assert.notStrictEqual(CodeWhispererCodeCoverageTracker.getTracker('python'), undefined)
+            assert.notStrictEqual(CodeWhispererCodeCoverageTracker.getTracker('javascriptreact'), undefined)
+            assert.notStrictEqual(CodeWhispererCodeCoverageTracker.getTracker('java'), undefined)
+            assert.notStrictEqual(CodeWhispererCodeCoverageTracker.getTracker('javascript'), undefined)
+            assert.notStrictEqual(CodeWhispererCodeCoverageTracker.getTracker('cpp'), undefined)
+            assert.notStrictEqual(CodeWhispererCodeCoverageTracker.getTracker('ruby'), undefined)
+            assert.notStrictEqual(CodeWhispererCodeCoverageTracker.getTracker('go'), undefined)
+        })
+
+        it('supported language and should return singleton object per language', function () {
+            let instance1: CodeWhispererCodeCoverageTracker | undefined
+            let instance2: CodeWhispererCodeCoverageTracker | undefined
+            instance1 = CodeWhispererCodeCoverageTracker.getTracker('java')
+            instance2 = CodeWhispererCodeCoverageTracker.getTracker('java')
+            assert.notStrictEqual(instance1, undefined)
+            assert.strictEqual(Object.is(instance1, instance2), true)
+
+            instance1 = CodeWhispererCodeCoverageTracker.getTracker('python')
+            instance2 = CodeWhispererCodeCoverageTracker.getTracker('python')
+            assert.notStrictEqual(instance1, undefined)
+            assert.strictEqual(Object.is(instance1, instance2), true)
+
+            instance1 = CodeWhispererCodeCoverageTracker.getTracker('javascriptreact')
+            instance2 = CodeWhispererCodeCoverageTracker.getTracker('javascriptreact')
+            assert.notStrictEqual(instance1, undefined)
+            assert.strictEqual(Object.is(instance1, instance2), true)
+        })
+    })
+
+    describe('test isActive', function () {
+        let tracker: CodeWhispererCodeCoverageTracker | undefined
+
+        afterEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+            CodeWhispererCodeCoverageTracker.instances.clear()
+            sinon.restore()
+        })
+
+        it('inactive case: telemetryEnable = true, isConnected = false', function () {
+            sinon.stub(TelemetryHelper.instance, 'isTelemetryEnabled').returns(true)
+            sinon.stub(AuthUtil.instance, 'isConnected').returns(false)
+
+            tracker = CodeWhispererCodeCoverageTracker.getTracker('python')
+            if (!tracker) {
+                assert.fail()
+            }
+
+            assert.strictEqual(tracker.isActive(), false)
+        })
+
+        it('inactive case: telemetryEnabled = false, isConnected = false', function () {
+            sinon.stub(TelemetryHelper.instance, 'isTelemetryEnabled').returns(false)
+            sinon.stub(AuthUtil.instance, 'isConnected').returns(false)
+
+            tracker = CodeWhispererCodeCoverageTracker.getTracker('java')
+            if (!tracker) {
+                assert.fail()
+            }
+
+            assert.strictEqual(tracker.isActive(), false)
+        })
+
+        it('active case: telemetryEnabled = true, isConnected = true', function () {
+            sinon.stub(TelemetryHelper.instance, 'isTelemetryEnabled').returns(true)
+            sinon.stub(AuthUtil.instance, 'isConnected').returns(true)
+
+            tracker = CodeWhispererCodeCoverageTracker.getTracker('javascript')
+            if (!tracker) {
+                assert.fail()
+            }
+            assert.strictEqual(tracker.isActive(), true)
+        })
+    })
+
+    describe('updateAcceptedTokensCount', function () {
+        let tracker: CodeWhispererCodeCoverageTracker | undefined
+
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+            tracker = CodeWhispererCodeCoverageTracker.getTracker(language)
+            if (tracker) {
+                sinon.stub(tracker, 'isActive').returns(true)
+            }
+        })
+
+        afterEach(function () {
+            sinon.restore()
+            CodeWhispererCodeCoverageTracker.instances.clear()
+        })
+
+        it('Should compute edit distance to update the accepted tokens', function () {
+            if (!tracker) {
+                assert.fail()
+            }
+            const editor = createMockTextEditor('def addTwoNumbers(a, b):\n')
+
+            tracker.addAcceptedTokens(editor.document.fileName, {
+                range: new vscode.Range(0, 0, 0, 25),
+                text: `def addTwoNumbers(x, y):\n`,
+                accepted: 25,
+            })
+            tracker.addTotalTokens(editor.document.fileName, 100)
+            tracker.updateAcceptedTokensCount(editor)
+            assert.strictEqual(tracker?.acceptedTokens[editor.document.fileName][0].accepted, 23)
+        })
+    })
+
+    describe('getUnmodifiedAcceptedTokens', function () {
+        let tracker: CodeWhispererCodeCoverageTracker | undefined
+
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+            tracker = CodeWhispererCodeCoverageTracker.getTracker(language)
+            if (tracker) {
+                sinon.stub(tracker, 'isActive').returns(true)
+            }
+        })
+
+        afterEach(function () {
+            sinon.restore()
+            CodeWhispererCodeCoverageTracker.instances.clear()
+        })
+
+        it('Should return correct unmodified accepted tokens count', function () {
+            assert.strictEqual(getUnmodifiedAcceptedTokens('foo', 'fou'), 2)
+            assert.strictEqual(getUnmodifiedAcceptedTokens('foo', 'f11111oo'), 3)
+            assert.strictEqual(getUnmodifiedAcceptedTokens('foo', 'fo'), 2)
+            assert.strictEqual(getUnmodifiedAcceptedTokens('helloworld', 'HelloWorld'), 8)
+            assert.strictEqual(getUnmodifiedAcceptedTokens('helloworld', 'World'), 4)
+            assert.strictEqual(getUnmodifiedAcceptedTokens('CodeWhisperer', 'CODE'), 1)
+            assert.strictEqual(getUnmodifiedAcceptedTokens('CodeWhisperer', 'CodeWhispererGood'), 13)
+        })
+    })
+
+    describe('countAcceptedTokens', function () {
+        let tracker: CodeWhispererCodeCoverageTracker | undefined
+
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+            tracker = CodeWhispererCodeCoverageTracker.getTracker(language)
+            if (tracker) {
+                sinon.stub(tracker, 'isActive').returns(true)
+            }
+        })
+
+        afterEach(function () {
+            sinon.restore()
+            CodeWhispererCodeCoverageTracker.instances.clear()
+        })
+
+        it('Should skip when tracker is not active', function () {
+            if (!tracker) {
+                assert.fail()
+            }
+            tracker.countAcceptedTokens(new vscode.Range(0, 0, 0, 1), 'a', 'test.py')
+            const spy = sinon.spy(CodeWhispererCodeCoverageTracker.prototype, 'addAcceptedTokens')
+            assert.ok(!spy.called)
+        })
+
+        it('Should increase AcceptedTokens', function () {
+            if (!tracker) {
+                assert.fail()
+            }
+            tracker.countAcceptedTokens(new vscode.Range(0, 0, 0, 1), 'a', 'test.py')
+            assert.deepStrictEqual(tracker.acceptedTokens['test.py'][0], {
+                range: new vscode.Range(0, 0, 0, 1),
+                text: 'a',
+                accepted: 1,
+            })
+        })
+        it('Should increase TotalTokens', function () {
+            if (!tracker) {
+                assert.fail()
+            }
+            tracker.countAcceptedTokens(new vscode.Range(0, 0, 0, 1), 'a', 'test.py')
+            tracker.countAcceptedTokens(new vscode.Range(0, 0, 0, 1), 'b', 'test.py')
+            assert.deepStrictEqual(tracker.totalTokens['test.py'], 2)
+        })
+    })
+
+    describe('countTotalTokens', function () {
+        let tracker: CodeWhispererCodeCoverageTracker | undefined
+
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+            tracker = CodeWhispererCodeCoverageTracker.getTracker(language)
+            if (tracker) {
+                sinon.stub(tracker, 'isActive').returns(true)
+            }
+        })
+
+        afterEach(function () {
+            sinon.restore()
+            CodeWhispererCodeCoverageTracker.instances.clear()
+        })
+
+        it('Should skip when content change size is more than 50', function () {
+            if (!tracker) {
+                assert.fail()
+            }
+            tracker.countTotalTokens({
+                reason: undefined,
+                document: createMockDocument(),
+                contentChanges: [
+                    {
+                        range: new vscode.Range(0, 0, 0, 600),
+                        rangeOffset: 0,
+                        rangeLength: 600,
+                        text: 'def twoSum(nums, target):\nfor '.repeat(20),
+                    },
+                ],
+            })
+            assert.strictEqual(Object.keys(tracker.totalTokens).length, 0)
+        })
+
+        it('Should not skip when content change size is less than 50', function () {
+            if (!tracker) {
+                assert.fail()
+            }
+            tracker.countTotalTokens({
+                reason: undefined,
+                document: createMockDocument(),
+                contentChanges: [
+                    {
+                        range: new vscode.Range(0, 0, 0, 49),
+                        rangeOffset: 0,
+                        rangeLength: 49,
+                        text: 'a = 123'.repeat(7),
+                    },
+                ],
+            })
+            assert.strictEqual(Object.keys(tracker.totalTokens).length, 1)
+            assert.strictEqual(Object.values(tracker.totalTokens)[0], 49)
+        })
+
+        it('Should skip when CodeWhisperer is editing', function () {
+            if (!tracker) {
+                assert.fail()
+            }
+            vsCodeState.isCodeWhispererEditing = true
+            tracker.countTotalTokens({
+                reason: undefined,
+                document: createMockDocument(),
+                contentChanges: [
+                    {
+                        range: new vscode.Range(0, 0, 0, 30),
+                        rangeOffset: 0,
+                        rangeLength: 30,
+                        text: 'def twoSum(nums, target):\nfor',
+                    },
+                ],
+            })
+            const startedSpy = sinon.spy(CodeWhispererCodeCoverageTracker.prototype, 'addTotalTokens')
+            assert.ok(!startedSpy.called)
+        })
+
+        it('Should not reduce tokens when delete', function () {
+            if (!tracker) {
+                assert.fail()
+            }
+            const doc = createMockDocument('import math', 'test.py', 'python')
+            tracker.countTotalTokens({
+                reason: undefined,
+                document: doc,
+                contentChanges: [
+                    {
+                        range: new vscode.Range(0, 0, 0, 1),
+                        rangeOffset: 0,
+                        rangeLength: 0,
+                        text: 'a',
+                    },
+                ],
+            })
+            tracker.countTotalTokens({
+                reason: undefined,
+                document: doc,
+                contentChanges: [
+                    {
+                        range: new vscode.Range(0, 0, 0, 1),
+                        rangeOffset: 0,
+                        rangeLength: 0,
+                        text: 'b',
+                    },
+                ],
+            })
+            assert.strictEqual(tracker?.totalTokens[doc.fileName], 2)
+            tracker.countTotalTokens({
+                reason: undefined,
+                document: doc,
+                contentChanges: [
+                    {
+                        range: new vscode.Range(0, 0, 0, 1),
+                        rangeOffset: 1,
+                        rangeLength: 1,
+                        text: '',
+                    },
+                ],
+            })
+            assert.strictEqual(tracker?.totalTokens[doc.fileName], 2)
+        })
+
+        it('Should add tokens when type', function () {
+            if (!tracker) {
+                assert.fail()
+            }
+            const doc = createMockDocument('import math', 'test.py', 'python')
+            tracker.countTotalTokens({
+                reason: undefined,
+                document: doc,
+                contentChanges: [
+                    {
+                        range: new vscode.Range(0, 0, 0, 1),
+                        rangeOffset: 0,
+                        rangeLength: 0,
+                        text: 'a',
+                    },
+                ],
+            })
+            assert.strictEqual(tracker?.totalTokens[doc.fileName], 1)
+        })
+
+        it('Should add tokens when hitting enter with indentation', function () {
+            if (!tracker) {
+                assert.fail()
+            }
+            const doc = createMockDocument('def h():', 'test.py', 'python')
+            tracker.countTotalTokens({
+                reason: undefined,
+                document: doc,
+                contentChanges: [
+                    {
+                        range: new vscode.Range(0, 0, 0, 8),
+                        rangeOffset: 0,
+                        rangeLength: 0,
+                        text: '\n    ',
+                    },
+                ],
+            })
+            assert.strictEqual(tracker?.totalTokens[doc.fileName], 1)
+        })
+
+        it('Should add tokens when hitting enter with indentation in Windows', function () {
+            if (!tracker) {
+                assert.fail()
+            }
+            const doc = createMockDocument('def h():', 'test.py', 'python')
+            tracker.countTotalTokens({
+                reason: undefined,
+                document: doc,
+                contentChanges: [
+                    {
+                        range: new vscode.Range(0, 0, 0, 8),
+                        rangeOffset: 0,
+                        rangeLength: 0,
+                        text: '\r\n    ',
+                    },
+                ],
+            })
+            assert.strictEqual(tracker?.totalTokens[doc.fileName], 1)
+        })
+
+        it('Should add tokens when hitting enter with indentation in Java', function () {
+            if (!tracker) {
+                assert.fail()
+            }
+            const doc = createMockDocument('class A() {', 'test.java', 'java')
+            tracker.countTotalTokens({
+                reason: undefined,
+                document: doc,
+                contentChanges: [
+                    {
+                        range: new vscode.Range(0, 0, 0, 11),
+                        rangeOffset: 0,
+                        rangeLength: 0,
+                        text: '',
+                    },
+                    {
+                        range: new vscode.Range(0, 0, 0, 11),
+                        rangeOffset: 0,
+                        rangeLength: 0,
+                        text: '\n\t\t',
+                    },
+                ],
+            })
+            assert.strictEqual(tracker?.totalTokens[doc.fileName], 1)
+        })
+
+        it('Should add tokens when inserting closing brackets', function () {
+            if (!tracker) {
+                assert.fail()
+            }
+            const doc = createMockDocument('a=', 'test.py', 'python')
+            tracker.countTotalTokens({
+                reason: undefined,
+                document: doc,
+                contentChanges: [
+                    {
+                        range: new vscode.Range(0, 0, 0, 3),
+                        rangeOffset: 0,
+                        rangeLength: 0,
+                        text: '[]',
+                    },
+                ],
+            })
+            assert.strictEqual(tracker?.totalTokens[doc.fileName], 2)
+        })
+
+        it('Should add tokens when inserting closing brackets in Java', function () {
+            if (!tracker) {
+                assert.fail()
+            }
+            const doc = createMockDocument('class A ', 'test.java', 'java')
+            tracker.countTotalTokens({
+                reason: undefined,
+                document: doc,
+                contentChanges: [
+                    {
+                        range: new vscode.Range(0, 0, 0, 8),
+                        rangeOffset: 0,
+                        rangeLength: 0,
+                        text: '{}',
+                    },
+                    {
+                        range: new vscode.Range(0, 0, 0, 8),
+                        rangeOffset: 0,
+                        rangeLength: 0,
+                        text: '',
+                    },
+                ],
+            })
+            assert.strictEqual(tracker?.totalTokens[doc.fileName], 2)
+        })
+    })
+
+    describe('flush', function () {
+        let tracker: CodeWhispererCodeCoverageTracker | undefined
+
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+            tracker = CodeWhispererCodeCoverageTracker.getTracker(language)
+            if (tracker) {
+                sinon.stub(tracker, 'isActive').returns(true)
+            }
+        })
+
+        afterEach(function () {
+            sinon.restore()
+            CodeWhispererCodeCoverageTracker.instances.clear()
+        })
+
+        it('Should not send codecoverage telemetry if tracker is not active', function () {
+            if (!tracker) {
+                assert.fail()
+            }
+            sinon.restore()
+            sinon.stub(tracker, 'isActive').returns(false)
+
+            tracker.addAcceptedTokens(`test.py`, { range: new vscode.Range(0, 0, 0, 7), text: `print()`, accepted: 7 })
+            tracker.addTotalTokens(`test.py`, 100)
+            tracker.flush()
+            const data = globals.telemetry.logger.query({
+                metricName: 'codewhisperer_codePercentage',
+                excludeKeys: ['awsAccount'],
+            })
+            assert.strictEqual(data.length, 0)
+        })
+    })
+
+    describe('emitCodeWhispererCodeContribution', function () {
+        let tracker: CodeWhispererCodeCoverageTracker | undefined
+
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+            tracker = CodeWhispererCodeCoverageTracker.getTracker(language)
+            if (tracker) {
+                sinon.stub(tracker, 'isActive').returns(true)
+            }
+        })
+
+        afterEach(function () {
+            sinon.restore()
+            CodeWhispererCodeCoverageTracker.instances.clear()
+        })
+
+        it('should emit correct code coverage telemetry in python file', async function () {
+            const tracker = CodeWhispererCodeCoverageTracker.getTracker(language)
+
+            const assertTelemetry = assertTelemetryCurried('codewhisperer_codePercentage')
+            tracker?.incrementServiceInvocationCount()
+            tracker?.addAcceptedTokens(`test.py`, { range: new vscode.Range(0, 0, 0, 7), text: `print()`, accepted: 7 })
+            tracker?.addTotalTokens(`test.py`, 100)
+            tracker?.emitCodeWhispererCodeContribution()
+            assertTelemetry({
+                codewhispererTotalTokens: 100,
+                codewhispererLanguage: language,
+                codewhispererAcceptedTokens: 7,
+                codewhispererSuggestedTokens: 7,
+                codewhispererPercentage: 7,
+                successCount: 1,
+            })
+        })
+
+        it('should emit correct code coverage telemetry when success count = 0', async function () {
+            const tracker = CodeWhispererCodeCoverageTracker.getTracker('java')
+
+            const assertTelemetry = assertTelemetryCurried('codewhisperer_codePercentage')
+            tracker?.addAcceptedTokens(`test.java`, {
+                range: new vscode.Range(0, 0, 0, 18),
+                text: `public static main`,
+                accepted: 18,
+            })
+            tracker?.incrementServiceInvocationCount()
+            tracker?.incrementServiceInvocationCount()
+            tracker?.addTotalTokens(`test.java`, 30)
+            tracker?.emitCodeWhispererCodeContribution()
+            assertTelemetry({
+                codewhispererTotalTokens: 30,
+                codewhispererLanguage: 'java',
+                codewhispererAcceptedTokens: 18,
+                codewhispererSuggestedTokens: 18,
+                codewhispererPercentage: 60,
+                successCount: 2,
+            })
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/tracker/codewhispererTracker.test.ts b/packages/amazonq/test/unit/codewhisperer/tracker/codewhispererTracker.test.ts
new file mode 100644
index 00000000000..ed17c181ee5
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/tracker/codewhispererTracker.test.ts
@@ -0,0 +1,104 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import { assertTelemetryCurried } from 'aws-core-vscode/test'
+import { AuthUtil, CodeWhispererTracker } from 'aws-core-vscode/codewhisperer'
+import { resetCodeWhispererGlobalVariables, createAcceptedSuggestionEntry } from 'aws-core-vscode/test'
+import { globals } from 'aws-core-vscode/shared'
+
+describe('codewhispererTracker', function () {
+    describe('enqueue', function () {
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+            await CodeWhispererTracker.getTracker().shutdown()
+        })
+
+        afterEach(function () {
+            sinon.restore()
+        })
+
+        it('Should put suggestion in queue', function () {
+            const suggestion = createAcceptedSuggestionEntry()
+            const pushSpy = sinon.spy(Array.prototype, 'push')
+            CodeWhispererTracker.getTracker().enqueue(suggestion)
+            assert.ok(!pushSpy.neverCalledWith(suggestion))
+        })
+
+        it('Should not enque when telemetry is disabled', async function () {
+            await globals.telemetry.setTelemetryEnabled(false)
+            const suggestion = createAcceptedSuggestionEntry()
+            const pushSpy = sinon.spy(Array.prototype, 'push')
+            CodeWhispererTracker.getTracker().enqueue(suggestion)
+            assert.ok(pushSpy.neverCalledWith(suggestion))
+            await globals.telemetry.setTelemetryEnabled(true)
+        })
+    })
+
+    describe('flush', function () {
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+            await CodeWhispererTracker.getTracker().shutdown()
+        })
+
+        afterEach(function () {
+            sinon.restore()
+        })
+
+        it('Should call emit telemetry for event existed longer than 5 min, put back to queue if less than 5 min', async function () {
+            const suggestion1 = createAcceptedSuggestionEntry(new Date())
+            const suggestion2 = createAcceptedSuggestionEntry(new Date(Date.now() - 6 * 60 * 1000))
+            const emitSpy = sinon.spy(CodeWhispererTracker.prototype, 'emitTelemetryOnSuggestion')
+            CodeWhispererTracker.getTracker().enqueue(suggestion1)
+            CodeWhispererTracker.getTracker().enqueue(suggestion2)
+            await CodeWhispererTracker.getTracker().flush()
+            assert.ok(emitSpy.calledOnce)
+            assert.ok(!emitSpy.neverCalledWith(suggestion2))
+            assert.ok(emitSpy.neverCalledWith(suggestion1))
+        })
+
+        it('Should skip if telemetry is disabled', async function () {
+            await globals.telemetry.setTelemetryEnabled(false)
+            const getTimeSpy = sinon.spy(Date.prototype, 'getTime')
+            await CodeWhispererTracker.getTracker().flush()
+            assert.ok(!getTimeSpy.called)
+            await globals.telemetry.setTelemetryEnabled(true)
+        })
+    })
+
+    describe('checkDiff', function () {
+        it('Should return 1.0 distance for invalid input strings', function () {
+            assert.strictEqual(CodeWhispererTracker.getTracker().checkDiff('', 'aabcd'), 1.0)
+            assert.strictEqual(CodeWhispererTracker.getTracker().checkDiff('abbbacd', ''), 1.0)
+        })
+
+        it('Should return 1/levenshtein distance for valid input strings', function () {
+            assert.strictEqual(CodeWhispererTracker.getTracker().checkDiff('abccd', 'aabcd'), 0.4)
+        })
+    })
+
+    describe('emitTelemetryOnSuggestion', function () {
+        it('Should call recordCodewhispererUserModification with suggestion event', async function () {
+            const testStartUrl = 'testStartUrl'
+            sinon.stub(AuthUtil.instance, 'startUrl').value(testStartUrl)
+            const suggestion = createAcceptedSuggestionEntry()
+            const assertTelemetry = assertTelemetryCurried('codewhisperer_userModification')
+            await CodeWhispererTracker.getTracker().emitTelemetryOnSuggestion(suggestion)
+            assertTelemetry({
+                codewhispererRequestId: 'test',
+                codewhispererSessionId: 'test',
+                codewhispererTriggerType: 'OnDemand',
+                codewhispererSuggestionIndex: 1,
+                codewhispererModificationPercentage: 1,
+                codewhispererCompletionType: 'Line',
+                codewhispererLanguage: 'java',
+                credentialStartUrl: testStartUrl,
+                codewhispererCharactersAccepted: suggestion.originalString.length,
+                codewhispererCharactersModified: 0,
+            })
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/tracker/lineTracker.test.ts b/packages/amazonq/test/unit/codewhisperer/tracker/lineTracker.test.ts
new file mode 100644
index 00000000000..6b9490c72a5
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/tracker/lineTracker.test.ts
@@ -0,0 +1,299 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { LineSelection, LineTracker, AuthUtil } from 'aws-core-vscode/codewhisperer'
+import sinon from 'sinon'
+import { Disposable, TextEditor, Position, Range, Selection } from 'vscode'
+import { toTextEditor } from 'aws-core-vscode/test'
+import assert from 'assert'
+import { waitUntil } from 'aws-core-vscode/shared'
+
+describe('LineTracker class', function () {
+    let sut: LineTracker
+    let disposable: Disposable
+    let editor: TextEditor
+    let sandbox: sinon.SinonSandbox
+    let counts = {
+        editor: 0,
+        selection: 0,
+        content: 0,
+    }
+
+    beforeEach(async function () {
+        sut = new LineTracker()
+        sandbox = sinon.createSandbox()
+        counts = {
+            editor: 0,
+            selection: 0,
+            content: 0,
+        }
+        disposable = sut.onDidChangeActiveLines((e) => {
+            if (e.reason === 'content') {
+                counts.content++
+            } else if (e.reason === 'selection') {
+                counts.selection++
+            } else if (e.reason === 'editor') {
+                counts.editor++
+            }
+        })
+
+        sandbox.stub(AuthUtil.instance, 'isConnected').returns(true)
+        sandbox.stub(AuthUtil.instance, 'isConnectionExpired').returns(false)
+    })
+
+    afterEach(function () {
+        disposable.dispose()
+        sut.dispose()
+        sandbox.restore()
+    })
+
+    function assertEmptyCounts() {
+        assert.deepStrictEqual(counts, {
+            editor: 0,
+            selection: 0,
+            content: 0,
+        })
+    }
+
+    it('ready will emit onReady event', async function () {
+        let messageReceived = 0
+        disposable = sut.onReady((_) => {
+            messageReceived++
+        })
+
+        assert.strictEqual(sut.isReady, false)
+        sut.ready()
+
+        await waitUntil(
+            async () => {
+                if (messageReceived !== 0) {
+                    return
+                }
+            },
+            { interval: 1000 }
+        )
+
+        assert.strictEqual(sut.isReady, true)
+        assert.strictEqual(messageReceived, 1)
+    })
+
+    describe('includes', function () {
+        // util function to help set up LineTracker.selections
+        async function setEditorSelection(selections: LineSelection[]): Promise<TextEditor> {
+            const editor = await toTextEditor('\n\n\n\n\n\n\n\n\n\n', 'foo.py', undefined, {
+                preview: false,
+            })
+
+            const vscodeSelections = selections.map((s) => {
+                return new Selection(new Position(s.anchor, 0), new Position(s.active, 0))
+            })
+
+            await sut.onTextEditorSelectionChanged({
+                textEditor: editor,
+                selections: vscodeSelections,
+                kind: undefined,
+            })
+
+            assert.deepStrictEqual(sut.selections, selections)
+            return editor
+        }
+
+        it('exact match when array of selections are provided', async function () {
+            const selections = [
+                {
+                    anchor: 1,
+                    active: 1,
+                },
+                {
+                    anchor: 3,
+                    active: 3,
+                },
+            ]
+
+            editor = await setEditorSelection(selections)
+            assert.deepStrictEqual(sut.selections, selections)
+
+            let actual = sut.includes([
+                { active: 1, anchor: 1 },
+                { active: 3, anchor: 3 },
+            ])
+            assert.strictEqual(actual, true)
+
+            actual = sut.includes([
+                { active: 2, anchor: 2 },
+                { active: 4, anchor: 4 },
+            ])
+            assert.strictEqual(actual, false)
+
+            // both active && anchor have to be the same
+            actual = sut.includes([
+                { active: 1, anchor: 0 },
+                { active: 3, anchor: 0 },
+            ])
+            assert.strictEqual(actual, false)
+
+            // different length would simply return false
+            actual = sut.includes([
+                { active: 1, anchor: 1 },
+                { active: 3, anchor: 3 },
+                { active: 5, anchor: 5 },
+            ])
+            assert.strictEqual(actual, false)
+        })
+
+        it('match active line if line number and activeOnly option are provided', async function () {
+            const selections = [
+                {
+                    anchor: 1,
+                    active: 1,
+                },
+                {
+                    anchor: 3,
+                    active: 3,
+                },
+            ]
+
+            editor = await setEditorSelection(selections)
+            assert.deepStrictEqual(sut.selections, selections)
+
+            let actual = sut.includes(1, { activeOnly: true })
+            assert.strictEqual(actual, true)
+
+            actual = sut.includes(2, { activeOnly: true })
+            assert.strictEqual(actual, false)
+        })
+
+        it('range match if line number and activeOnly is set to false', async function () {
+            const selections = [
+                {
+                    anchor: 0,
+                    active: 2,
+                },
+                {
+                    anchor: 4,
+                    active: 6,
+                },
+            ]
+
+            editor = await setEditorSelection(selections)
+            assert.deepStrictEqual(sut.selections, selections)
+
+            for (const line of [0, 1, 2]) {
+                const actual = sut.includes(line, { activeOnly: false })
+                assert.strictEqual(actual, true)
+            }
+
+            for (const line of [4, 5, 6]) {
+                const actual = sut.includes(line, { activeOnly: false })
+                assert.strictEqual(actual, true)
+            }
+
+            let actual = sut.includes(3, { activeOnly: false })
+            assert.strictEqual(actual, false)
+
+            actual = sut.includes(7, { activeOnly: false })
+            assert.strictEqual(actual, false)
+        })
+    })
+
+    describe('onContentChanged', function () {
+        it('should fire lineChangedEvent and set current line selection', async function () {
+            editor = await toTextEditor('\n\n\n\n\n', 'foo.py', undefined, { preview: false })
+            editor.selection = new Selection(new Position(5, 0), new Position(5, 0))
+            assertEmptyCounts()
+
+            sut.onContentChanged({
+                document: editor.document,
+                contentChanges: [{ text: 'a', range: new Range(0, 0, 0, 0), rangeOffset: 0, rangeLength: 0 }],
+                reason: undefined,
+            })
+
+            assert.deepStrictEqual(counts, { ...counts, content: 1 })
+            assert.deepStrictEqual(sut.selections, [
+                {
+                    anchor: 5,
+                    active: 5,
+                },
+            ])
+        })
+    })
+
+    describe('onTextEditorSelectionChanged', function () {
+        it('should fire lineChangedEvent if selection changes and set current line selection', async function () {
+            editor = await toTextEditor('\n\n\n\n\n', 'foo.py', undefined, { preview: false })
+            editor.selection = new Selection(new Position(3, 0), new Position(3, 0))
+            assertEmptyCounts()
+
+            await sut.onTextEditorSelectionChanged({
+                textEditor: editor,
+                selections: [new Selection(new Position(3, 0), new Position(3, 0))],
+                kind: undefined,
+            })
+
+            assert.deepStrictEqual(counts, { ...counts, selection: 1 })
+            assert.deepStrictEqual(sut.selections, [
+                {
+                    anchor: 3,
+                    active: 3,
+                },
+            ])
+
+            // if selection is included in the existing selections, won't emit an event
+            await sut.onTextEditorSelectionChanged({
+                textEditor: editor,
+                selections: [new Selection(new Position(3, 0), new Position(3, 0))],
+                kind: undefined,
+            })
+
+            assert.deepStrictEqual(counts, { ...counts, selection: 1 })
+            assert.deepStrictEqual(sut.selections, [
+                {
+                    anchor: 3,
+                    active: 3,
+                },
+            ])
+        })
+
+        it('should not fire lineChangedEvent if uri scheme is debug || output', async function () {
+            // if the editor is not a text editor, won't emit an event and selection will be set to undefined
+            async function assertLineChanged(schema: string) {
+                const anotherEditor = await toTextEditor('', 'bar.log', undefined, { preview: false })
+                const uri = anotherEditor.document.uri
+                sandbox.stub(uri, 'scheme').get(() => schema)
+
+                await sut.onTextEditorSelectionChanged({
+                    textEditor: anotherEditor,
+                    selections: [new Selection(new Position(3, 0), new Position(3, 0))],
+                    kind: undefined,
+                })
+
+                assert.deepStrictEqual(counts, { ...counts })
+            }
+
+            await assertLineChanged('debug')
+            await assertLineChanged('output')
+        })
+    })
+
+    describe('onActiveTextEditorChanged', function () {
+        it('shoudl fire lineChangedEvent', async function () {
+            const selections: Selection[] = [new Selection(0, 0, 1, 1)]
+
+            editor = { selections: selections } as any
+
+            assertEmptyCounts()
+
+            await sut.onActiveTextEditorChanged(editor)
+
+            assert.deepStrictEqual(counts, { ...counts, editor: 1 })
+            assert.deepStrictEqual(sut.selections, [
+                {
+                    anchor: 0,
+                    active: 1,
+                },
+            ])
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/tracker/userWrittenCodeTracker.test.ts b/packages/amazonq/test/unit/codewhisperer/tracker/userWrittenCodeTracker.test.ts
new file mode 100644
index 00000000000..1d9b878133f
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/tracker/userWrittenCodeTracker.test.ts
@@ -0,0 +1,194 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { UserWrittenCodeTracker, TelemetryHelper, AuthUtil } from 'aws-core-vscode/codewhisperer'
+import { createMockDocument, resetCodeWhispererGlobalVariables } from 'aws-core-vscode/test'
+
+describe('userWrittenCodeTracker', function () {
+    describe('isActive()', function () {
+        afterEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+            UserWrittenCodeTracker.instance.reset()
+            sinon.restore()
+        })
+
+        it('inactive case: telemetryEnable = true, isConnected = false', function () {
+            sinon.stub(TelemetryHelper.instance, 'isTelemetryEnabled').returns(true)
+            sinon.stub(AuthUtil.instance, 'isConnected').returns(false)
+            assert.strictEqual(UserWrittenCodeTracker.instance.isActive(), false)
+        })
+
+        it('inactive case: telemetryEnabled = false, isConnected = false', function () {
+            sinon.stub(TelemetryHelper.instance, 'isTelemetryEnabled').returns(false)
+            sinon.stub(AuthUtil.instance, 'isConnected').returns(false)
+            assert.strictEqual(UserWrittenCodeTracker.instance.isActive(), false)
+        })
+
+        it('active case: telemetryEnabled = true, isConnected = true', function () {
+            sinon.stub(TelemetryHelper.instance, 'isTelemetryEnabled').returns(true)
+            sinon.stub(AuthUtil.instance, 'isConnected').returns(true)
+            assert.strictEqual(UserWrittenCodeTracker.instance.isActive(), true)
+        })
+    })
+
+    describe('onDocumentChange', function () {
+        let tracker: UserWrittenCodeTracker | undefined
+
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+            tracker = UserWrittenCodeTracker.instance
+            if (tracker) {
+                sinon.stub(tracker, 'isActive').returns(true)
+            }
+        })
+
+        afterEach(function () {
+            sinon.restore()
+            UserWrittenCodeTracker.instance.reset()
+        })
+
+        it('Should skip when content change size is more than 50', function () {
+            if (!tracker) {
+                assert.fail()
+            }
+            tracker.onQFeatureInvoked()
+            tracker.onTextDocumentChange({
+                reason: undefined,
+                document: createMockDocument(),
+                contentChanges: [
+                    {
+                        range: new vscode.Range(0, 0, 0, 600),
+                        rangeOffset: 0,
+                        rangeLength: 600,
+                        text: 'def twoSum(nums, target):\nfor '.repeat(20),
+                    },
+                ],
+            })
+            assert.strictEqual(tracker.getUserWrittenCharacters('python'), 0)
+            assert.strictEqual(tracker.getUserWrittenLines('python'), 0)
+        })
+
+        it('Should not skip when content change size is less than 50', function () {
+            if (!tracker) {
+                assert.fail()
+            }
+            tracker.onQFeatureInvoked()
+            tracker.onTextDocumentChange({
+                reason: undefined,
+                document: createMockDocument(),
+                contentChanges: [
+                    {
+                        range: new vscode.Range(0, 0, 0, 49),
+                        rangeOffset: 0,
+                        rangeLength: 49,
+                        text: 'a = 123'.repeat(7),
+                    },
+                ],
+            })
+            tracker.onTextDocumentChange({
+                reason: undefined,
+                document: createMockDocument('', 'test.java', 'java'),
+                contentChanges: [
+                    {
+                        range: new vscode.Range(0, 0, 1, 3),
+                        rangeOffset: 0,
+                        rangeLength: 11,
+                        text: 'a = 123\nbcd',
+                    },
+                ],
+            })
+            assert.strictEqual(tracker.getUserWrittenCharacters('python'), 49)
+            assert.strictEqual(tracker.getUserWrittenLines('python'), 0)
+            assert.strictEqual(tracker.getUserWrittenCharacters('java'), 11)
+            assert.strictEqual(tracker.getUserWrittenLines('java'), 1)
+            assert.strictEqual(tracker.getUserWrittenLines('cpp'), 0)
+        })
+
+        it('Should skip when Q is editing', function () {
+            if (!tracker) {
+                assert.fail()
+            }
+            tracker.onQFeatureInvoked()
+            tracker.onQStartsMakingEdits()
+            tracker.onTextDocumentChange({
+                reason: undefined,
+                document: createMockDocument(),
+                contentChanges: [
+                    {
+                        range: new vscode.Range(0, 0, 0, 30),
+                        rangeOffset: 0,
+                        rangeLength: 30,
+                        text: 'def twoSum(nums, target):\nfor',
+                    },
+                ],
+            })
+            tracker.onQFinishesEdits()
+            tracker.onTextDocumentChange({
+                reason: undefined,
+                document: createMockDocument(),
+                contentChanges: [
+                    {
+                        range: new vscode.Range(0, 0, 0, 2),
+                        rangeOffset: 0,
+                        rangeLength: 2,
+                        text: '\na',
+                    },
+                ],
+            })
+            assert.strictEqual(tracker.getUserWrittenCharacters('python'), 2)
+            assert.strictEqual(tracker.getUserWrittenLines('python'), 1)
+        })
+
+        it('Should not reduce tokens when delete', function () {
+            if (!tracker) {
+                assert.fail()
+            }
+            const doc = createMockDocument('import math', 'test.py', 'python')
+
+            tracker.onQFeatureInvoked()
+            tracker.onTextDocumentChange({
+                reason: undefined,
+                document: doc,
+                contentChanges: [
+                    {
+                        range: new vscode.Range(0, 0, 0, 1),
+                        rangeOffset: 0,
+                        rangeLength: 0,
+                        text: 'a',
+                    },
+                ],
+            })
+            tracker.onTextDocumentChange({
+                reason: undefined,
+                document: doc,
+                contentChanges: [
+                    {
+                        range: new vscode.Range(0, 0, 0, 1),
+                        rangeOffset: 0,
+                        rangeLength: 0,
+                        text: 'b',
+                    },
+                ],
+            })
+            assert.strictEqual(tracker.getUserWrittenCharacters('python'), 2)
+            tracker.onTextDocumentChange({
+                reason: undefined,
+                document: doc,
+                contentChanges: [
+                    {
+                        range: new vscode.Range(0, 0, 0, 1),
+                        rangeOffset: 1,
+                        rangeLength: 1,
+                        text: '',
+                    },
+                ],
+            })
+            assert.strictEqual(tracker.getUserWrittenCharacters('python'), 2)
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/ui/prompters.test.ts b/packages/amazonq/test/unit/codewhisperer/ui/prompters.test.ts
new file mode 100644
index 00000000000..9c5e00cd6f7
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/ui/prompters.test.ts
@@ -0,0 +1,45 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { createQuickPickPrompterTester, QuickPickPrompterTester } from 'aws-core-vscode/test'
+import {
+    CodeIssueGroupingStrategy,
+    CodeIssueGroupingStrategyState,
+    createCodeIssueGroupingStrategyPrompter,
+} from 'aws-core-vscode/codewhisperer'
+import sinon from 'sinon'
+import assert from 'assert'
+import vscode from 'vscode'
+
+const severity = { data: CodeIssueGroupingStrategy.Severity, label: 'Severity' }
+const fileLocation = { data: CodeIssueGroupingStrategy.FileLocation, label: 'File Location' }
+
+describe('createCodeIssueGroupingStrategyPrompter', function () {
+    let tester: QuickPickPrompterTester<CodeIssueGroupingStrategy>
+
+    beforeEach(function () {
+        tester = createQuickPickPrompterTester(createCodeIssueGroupingStrategyPrompter())
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    it('should list grouping strategies', async function () {
+        tester.assertItems([severity, fileLocation])
+        tester.hide()
+        await tester.result()
+    })
+
+    it('should update state on selection', async function () {
+        const originalState = CodeIssueGroupingStrategyState.instance.getState()
+        assert.equal(originalState, CodeIssueGroupingStrategy.Severity)
+
+        tester.selectItems(fileLocation)
+        tester.addCallback(() => vscode.commands.executeCommand('workbench.action.acceptSelectedQuickOpenItem'))
+
+        await tester.result()
+        assert.equal(CodeIssueGroupingStrategyState.instance.getState(), fileLocation.data)
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/util/authUtil.test.ts b/packages/amazonq/test/unit/codewhisperer/util/authUtil.test.ts
new file mode 100644
index 00000000000..500eaf23080
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/util/authUtil.test.ts
@@ -0,0 +1,422 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import {
+    AuthStates,
+    AuthUtil,
+    amazonQScopes,
+    codeWhispererChatScopes,
+    codeWhispererCoreScopes,
+} from 'aws-core-vscode/codewhisperer'
+import {
+    assertTelemetry,
+    getTestWindow,
+    SeverityLevel,
+    createBuilderIdProfile,
+    createSsoProfile,
+    createTestAuth,
+    captureEventNTimes,
+} from 'aws-core-vscode/test'
+import { Auth, Connection, isAnySsoConnection, isBuilderIdConnection } from 'aws-core-vscode/auth'
+import { globals, vscodeComponent } from 'aws-core-vscode/shared'
+
+const enterpriseSsoStartUrl = 'https://enterprise.awsapps.com/start'
+
+describe('AuthUtil', async function () {
+    let auth: ReturnType<typeof createTestAuth>
+    let authUtil: AuthUtil
+
+    beforeEach(async function () {
+        auth = createTestAuth(globals.globalState)
+        authUtil = new AuthUtil(auth)
+    })
+
+    afterEach(async function () {
+        await auth.logout()
+    })
+
+    it('if there is no valid AwsBuilderID conn, it will create one and use it', async function () {
+        getTestWindow().onDidShowQuickPick(async (picker) => {
+            await picker.untilReady()
+            picker.acceptItem(picker.items[1])
+        })
+
+        await authUtil.connectToAwsBuilderId()
+        const conn = authUtil.conn
+        assert.strictEqual(conn?.type, 'sso')
+        assert.strictEqual(conn.label, 'AWS Builder ID')
+        assert.deepStrictEqual(conn.scopes, amazonQScopes)
+    })
+
+    it('if there IS an existing AwsBuilderID conn, it will upgrade the scopes and use it', async function () {
+        const existingBuilderId = await auth.createConnection(
+            createBuilderIdProfile({ scopes: codeWhispererCoreScopes })
+        )
+        getTestWindow().onDidShowQuickPick(async (picker) => {
+            await picker.untilReady()
+            picker.acceptItem(picker.items[1])
+        })
+
+        await authUtil.connectToAwsBuilderId()
+
+        const conn = authUtil.conn
+        assert.strictEqual(conn?.type, 'sso')
+        assert.strictEqual(conn.id, existingBuilderId.id)
+        assert.deepStrictEqual(conn.scopes, amazonQScopes)
+    })
+
+    it('if there is no valid enterprise SSO conn, will create and use one', async function () {
+        getTestWindow().onDidShowQuickPick(async (picker) => {
+            await picker.untilReady()
+            picker.acceptItem(picker.items[1])
+        })
+
+        await authUtil.connectToEnterpriseSso(enterpriseSsoStartUrl, 'us-east-1')
+        const conn = authUtil.conn
+        assert.strictEqual(conn?.type, 'sso')
+        assert.strictEqual(conn.label, 'IAM Identity Center (enterprise)')
+    })
+
+    it('should add scopes + connect to existing IAM Identity Center connection', async function () {
+        getTestWindow().onDidShowMessage(async (message) => {
+            assert.ok(message.modal)
+            message.selectItem('Proceed')
+        })
+        const randomScope = 'my:random:scope'
+        const ssoConn = await auth.createInvalidSsoConnection(
+            createSsoProfile({ startUrl: enterpriseSsoStartUrl, scopes: [randomScope] })
+        )
+
+        // Method under test
+        await authUtil.connectToEnterpriseSso(ssoConn.startUrl, 'us-east-1')
+
+        const cwConn = authUtil.conn
+        assert.strictEqual(cwConn?.type, 'sso')
+        assert.strictEqual(cwConn.label, 'IAM Identity Center (enterprise)')
+        assert.deepStrictEqual(cwConn.scopes, [randomScope, ...amazonQScopes])
+    })
+
+    it('reauthenticates an existing BUT invalid Amazon Q IAM Identity Center connection', async function () {
+        const ssoConn = await auth.createInvalidSsoConnection(
+            createSsoProfile({ startUrl: enterpriseSsoStartUrl, scopes: amazonQScopes })
+        )
+        await auth.refreshConnectionState(ssoConn)
+        assert.strictEqual(auth.getConnectionState(ssoConn), 'invalid')
+
+        // Method under test
+        await authUtil.connectToEnterpriseSso(ssoConn.startUrl, 'us-east-1')
+
+        const cwConn = authUtil.conn
+        assert.strictEqual(cwConn?.type, 'sso')
+        assert.strictEqual(cwConn.id, ssoConn.id)
+        assert.deepStrictEqual(cwConn.scopes, amazonQScopes)
+        assert.strictEqual(auth.getConnectionState(cwConn), 'valid')
+    })
+
+    it('should show reauthenticate prompt', async function () {
+        getTestWindow().onDidShowMessage((m) => {
+            if (m.severity === SeverityLevel.Information) {
+                m.close()
+            }
+        })
+
+        await authUtil.showReauthenticatePrompt()
+
+        const warningMessage = getTestWindow().shownMessages.filter((m) => m.severity === SeverityLevel.Information)
+        assert.strictEqual(warningMessage.length, 1)
+        assert.strictEqual(warningMessage[0].message, `Your Amazon Q connection has expired. Please re-authenticate.`)
+        warningMessage[0].close()
+        assertTelemetry('toolkit_showNotification', {
+            id: 'codeWhispererConnectionExpired',
+            result: 'Succeeded',
+            source: vscodeComponent,
+        })
+        assertTelemetry('toolkit_invokeAction', {
+            id: 'codeWhispererConnectionExpired',
+            action: 'dismiss',
+            result: 'Succeeded',
+            source: vscodeComponent,
+        })
+    })
+
+    it('reauthenticate prompt reauthenticates invalid connection', async function () {
+        const conn = await auth.createInvalidSsoConnection(
+            createSsoProfile({ startUrl: enterpriseSsoStartUrl, scopes: codeWhispererChatScopes })
+        )
+        await auth.useConnection(conn)
+        getTestWindow().onDidShowMessage((m) => {
+            m.selectItem('Re-authenticate')
+        })
+
+        assert.strictEqual(auth.getConnectionState(conn), 'invalid')
+
+        await authUtil.showReauthenticatePrompt()
+
+        assert.strictEqual(authUtil.conn?.type, 'sso')
+        assert.strictEqual(auth.getConnectionState(conn), 'valid')
+        assertTelemetry('toolkit_showNotification', {
+            id: 'codeWhispererConnectionExpired',
+            result: 'Succeeded',
+            source: vscodeComponent,
+        })
+        assertTelemetry('toolkit_invokeAction', {
+            id: 'codeWhispererConnectionExpired',
+            action: 'connect',
+            result: 'Succeeded',
+            source: vscodeComponent,
+        })
+    })
+
+    it('reauthenticates Builder ID connection that already has all scopes', async function () {
+        const conn = await auth.createInvalidSsoConnection(createBuilderIdProfile({ scopes: amazonQScopes }))
+        await auth.useConnection(conn)
+
+        // method under test
+        await authUtil.reauthenticate()
+
+        assert.strictEqual(authUtil.conn?.type, 'sso')
+        assert.deepStrictEqual(authUtil.conn?.scopes, amazonQScopes)
+        assert.strictEqual(auth.getConnectionState(conn), 'valid')
+    })
+
+    it('reauthenticates IdC connection that already has all scopes', async function () {
+        const conn = await auth.createInvalidSsoConnection(
+            createSsoProfile({ startUrl: enterpriseSsoStartUrl, scopes: codeWhispererCoreScopes })
+        )
+        await auth.useConnection(conn)
+
+        // method under test
+        await authUtil.reauthenticate()
+
+        assert.strictEqual(authUtil.conn?.type, 'sso')
+        assert.deepStrictEqual(authUtil.conn?.scopes, amazonQScopes)
+        assert.strictEqual(auth.getConnectionState(conn), 'valid')
+    })
+
+    it('reauthenticate adds missing Builder ID scopes', async function () {
+        const conn = await auth.createInvalidSsoConnection(createBuilderIdProfile({ scopes: codeWhispererCoreScopes }))
+        await auth.useConnection(conn)
+
+        // method under test
+        await authUtil.reauthenticate()
+
+        assert.strictEqual(authUtil.conn?.type, 'sso')
+        assert.deepStrictEqual(authUtil.conn?.scopes, amazonQScopes)
+        assert.strictEqual(auth.getConnectionState(conn), 'valid')
+    })
+
+    it('reauthenticate adds missing Amazon Q IdC scopes', async function () {
+        const conn = await auth.createInvalidSsoConnection(
+            createSsoProfile({ startUrl: enterpriseSsoStartUrl, scopes: codeWhispererCoreScopes })
+        )
+        await auth.useConnection(conn)
+
+        // method under test
+        await authUtil.reauthenticate()
+
+        assert.strictEqual(authUtil.conn?.type, 'sso')
+        assert.deepStrictEqual(authUtil.conn?.scopes, amazonQScopes)
+        assert.strictEqual(auth.getConnectionState(conn), 'valid')
+    })
+
+    it('CodeWhisperer uses fallback connection when switching to an unsupported connection', async function () {
+        const supportedConn = await auth.createConnection(createBuilderIdProfile({ scopes: codeWhispererChatScopes }))
+        const unsupportedConn = await auth.createConnection(createSsoProfile())
+
+        await auth.useConnection(supportedConn)
+        assert.ok(authUtil.isConnected())
+        assert.strictEqual(auth.activeConnection?.id, authUtil.conn?.id)
+
+        // Switch to unsupported connection
+        const cwAuthUpdatedConnection = captureEventNTimes(authUtil.secondaryAuth.onDidChangeActiveConnection, 2)
+        await auth.useConnection(unsupportedConn)
+        // - This is triggered when the main Auth connection is switched
+        // - This is triggered by registerAuthListener() when it saves the previous active connection as a fallback.
+        await cwAuthUpdatedConnection
+
+        // TODO in a refactor see if we can simplify multiple multiple triggers on the same event.
+        assert.ok(authUtil.isConnected())
+        assert.ok(authUtil.isUsingSavedConnection)
+        assert.notStrictEqual(auth.activeConnection?.id, authUtil.conn?.id)
+        assert.strictEqual(authUtil.conn?.type, 'sso')
+        assert.deepStrictEqual(authUtil.conn?.scopes, codeWhispererChatScopes)
+    })
+
+    it('does not prompt to sign out of duplicate builder ID connections', async function () {
+        await authUtil.connectToAwsBuilderId()
+        await authUtil.connectToAwsBuilderId()
+        assert.ok(authUtil.isConnected())
+
+        const ssoConnectionIds = new Set(auth.activeConnectionEvents.emits.filter(isAnySsoConnection).map((c) => c.id))
+        assert.strictEqual(ssoConnectionIds.size, 1, 'Expected exactly 1 unique SSO connection id')
+        assert.strictEqual((await auth.listConnections()).filter(isAnySsoConnection).length, 1)
+    })
+
+    it('automatically upgrades connections if they do not have the required scopes', async function () {
+        const upgradeableConn = await auth.createConnection(createBuilderIdProfile())
+        await auth.useConnection(upgradeableConn)
+        assert.strictEqual(authUtil.isConnected(), false)
+
+        await authUtil.connectToAwsBuilderId()
+        assert.ok(authUtil.isConnected())
+        assert.ok(authUtil.isConnectionValid())
+        assert.ok(isBuilderIdConnection(authUtil.conn))
+        assert.strictEqual(authUtil.conn?.id, upgradeableConn.id)
+        assert.strictEqual(authUtil.conn.startUrl, upgradeableConn.startUrl)
+        assert.strictEqual(authUtil.conn.ssoRegion, upgradeableConn.ssoRegion)
+        assert.deepStrictEqual(authUtil.conn.scopes, amazonQScopes)
+        assert.strictEqual((await auth.listConnections()).filter(isAnySsoConnection).length, 1)
+    })
+
+    it('test reformatStartUrl should remove trailing slash and hash', function () {
+        const expected = 'https://view.awsapps.com/start'
+        assert.strictEqual(authUtil.reformatStartUrl(expected + '/'), expected)
+        assert.strictEqual(authUtil.reformatStartUrl(undefined), undefined)
+        assert.strictEqual(authUtil.reformatStartUrl(expected + '/#'), expected)
+        assert.strictEqual(authUtil.reformatStartUrl(expected + '#/'), expected)
+        assert.strictEqual(authUtil.reformatStartUrl(expected + '/#/'), expected)
+        assert.strictEqual(authUtil.reformatStartUrl(expected + '####'), expected)
+    })
+
+    it(`clearExtraConnections()`, async function () {
+        const conn1 = await auth.createConnection(createBuilderIdProfile())
+        const conn2 = await auth.createConnection(createSsoProfile({ startUrl: enterpriseSsoStartUrl }))
+        const conn3 = await auth.createConnection(createSsoProfile({ startUrl: enterpriseSsoStartUrl + 1 }))
+        // validate listConnections shows all connections
+        assert.deepStrictEqual(
+            (await authUtil.auth.listConnections()).map((conn) => conn.id).sort((a, b) => a.localeCompare(b)),
+            [conn1, conn2, conn3].map((conn) => conn.id).sort((a, b) => a.localeCompare(b))
+        )
+        await authUtil.secondaryAuth.useNewConnection(conn3)
+
+        await authUtil.clearExtraConnections() // method under test
+
+        // Only the conn that AuthUtil is using is remaining
+        assert.deepStrictEqual(
+            (await authUtil.auth.listConnections()).map((conn) => conn.id),
+            [conn3.id]
+        )
+    })
+})
+
+describe('getChatAuthState()', function () {
+    let auth: ReturnType<typeof createTestAuth>
+    let authUtil: AuthUtil
+    let laterDate: Date
+
+    beforeEach(async function () {
+        auth = createTestAuth(globals.globalState)
+        authUtil = new AuthUtil(auth)
+
+        laterDate = new Date(Date.now() + 10_000_000)
+    })
+
+    afterEach(async function () {
+        await auth.logout()
+    })
+
+    it('indicates nothing connected when no auth connection exists', async function () {
+        const result = await authUtil.getChatAuthState()
+        assert.deepStrictEqual(result, {
+            codewhispererChat: AuthStates.disconnected,
+            codewhispererCore: AuthStates.disconnected,
+            amazonQ: AuthStates.disconnected,
+        })
+    })
+
+    /** Affects {@link Auth.refreshConnectionState} */
+    function createToken(conn: Connection) {
+        auth.getTestTokenProvider(conn).getToken.resolves({ accessToken: 'myAccessToken', expiresAt: laterDate })
+    }
+
+    describe('Builder ID', function () {
+        it('indicates only CodeWhisperer core is connected when only CW core scopes are set', async function () {
+            const conn = await auth.createConnection(createBuilderIdProfile({ scopes: codeWhispererCoreScopes }))
+            createToken(conn)
+            await auth.useConnection(conn)
+
+            const result = await authUtil.getChatAuthState()
+            assert.deepStrictEqual(result, {
+                codewhispererCore: AuthStates.connected,
+                codewhispererChat: AuthStates.expired,
+                amazonQ: AuthStates.expired,
+            })
+        })
+
+        it('indicates all SUPPORTED features connected when all scopes are set', async function () {
+            const conn = await auth.createConnection(createBuilderIdProfile({ scopes: amazonQScopes }))
+            createToken(conn)
+            await auth.useConnection(conn)
+
+            const result = await authUtil.getChatAuthState()
+            assert.deepStrictEqual(result, {
+                codewhispererCore: AuthStates.connected,
+                codewhispererChat: AuthStates.connected,
+                amazonQ: AuthStates.connected,
+            })
+        })
+
+        it('indicates all SUPPORTED features expired when connection is invalid', async function () {
+            const conn = await auth.createInvalidSsoConnection(
+                createBuilderIdProfile({ scopes: codeWhispererChatScopes })
+            )
+            await auth.useConnection(conn)
+
+            const result = await authUtil.getChatAuthState()
+            assert.deepStrictEqual(result, {
+                codewhispererCore: AuthStates.expired,
+                codewhispererChat: AuthStates.expired,
+                amazonQ: AuthStates.expired,
+            })
+        })
+    })
+
+    describe('Identity Center', function () {
+        it('indicates only CW core is connected when only CW core scopes are set', async function () {
+            const conn = await auth.createConnection(
+                createSsoProfile({ startUrl: enterpriseSsoStartUrl, scopes: codeWhispererCoreScopes })
+            )
+            createToken(conn)
+            await auth.useConnection(conn)
+
+            const result = await authUtil.getChatAuthState()
+            assert.deepStrictEqual(result, {
+                codewhispererCore: AuthStates.pendingProfileSelection,
+                codewhispererChat: AuthStates.expired,
+                amazonQ: AuthStates.expired,
+            })
+        })
+
+        it('indicates all features connected when all scopes are set', async function () {
+            const conn = await auth.createConnection(
+                createSsoProfile({ startUrl: enterpriseSsoStartUrl, scopes: amazonQScopes })
+            )
+            createToken(conn)
+            await auth.useConnection(conn)
+
+            const result = await authUtil.getChatAuthState()
+            assert.deepStrictEqual(result, {
+                codewhispererCore: AuthStates.pendingProfileSelection,
+                codewhispererChat: AuthStates.pendingProfileSelection,
+                amazonQ: AuthStates.pendingProfileSelection,
+            })
+        })
+
+        it('indicates all features expired when connection is invalid', async function () {
+            const conn = await auth.createInvalidSsoConnection(
+                createSsoProfile({ startUrl: enterpriseSsoStartUrl, scopes: amazonQScopes })
+            )
+            await auth.useConnection(conn)
+
+            const result = await authUtil.getChatAuthState()
+            assert.deepStrictEqual(result, {
+                codewhispererCore: AuthStates.expired,
+                codewhispererChat: AuthStates.expired,
+                amazonQ: AuthStates.expired,
+            })
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/util/bm25.test.ts b/packages/amazonq/test/unit/codewhisperer/util/bm25.test.ts
new file mode 100644
index 00000000000..0a3c4b17d60
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/util/bm25.test.ts
@@ -0,0 +1,117 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { BM25Okapi } from 'aws-core-vscode/codewhisperer'
+
+describe('bm25', function () {
+    it('simple case 1', function () {
+        const query = 'windy London'
+        const corpus = ['Hello there good man!', 'It is quite windy in London', 'How is the weather today?']
+
+        const sut = new BM25Okapi(corpus)
+        const actual = sut.score(query)
+
+        assert.deepStrictEqual(actual, [
+            {
+                content: 'Hello there good man!',
+                index: 0,
+                score: 0,
+            },
+            {
+                content: 'It is quite windy in London',
+                index: 1,
+                score: 0.937294722506405,
+            },
+            {
+                content: 'How is the weather today?',
+                index: 2,
+                score: 0,
+            },
+        ])
+
+        assert.deepStrictEqual(sut.topN(query, 1), [
+            {
+                content: 'It is quite windy in London',
+                index: 1,
+                score: 0.937294722506405,
+            },
+        ])
+    })
+
+    it('simple case 2', function () {
+        const query = 'codewhisperer is a machine learning powered code generator'
+        const corpus = [
+            'codewhisperer goes GA at April 2023',
+            'machine learning tool is the trending topic!!! :)',
+            'codewhisperer is good =))))',
+            'codewhisperer vs. copilot, which code generator better?',
+            'copilot is a AI code generator too',
+            'it is so amazing!!',
+        ]
+
+        const sut = new BM25Okapi(corpus)
+        const actual = sut.score(query)
+
+        assert.deepStrictEqual(actual, [
+            {
+                content: 'codewhisperer goes GA at April 2023',
+                index: 0,
+                score: 0,
+            },
+            {
+                content: 'machine learning tool is the trending topic!!! :)',
+                index: 1,
+                score: 2.597224531416621,
+            },
+            {
+                content: 'codewhisperer is good =))))',
+                index: 2,
+                score: 0.3471790843435529,
+            },
+            {
+                content: 'codewhisperer vs. copilot, which code generator better?',
+                index: 3,
+                score: 1.063018436525109,
+            },
+            {
+                content: 'copilot is a AI code generator too',
+                index: 4,
+                score: 2.485359418462239,
+            },
+            {
+                content: 'it is so amazing!!',
+                index: 5,
+                score: 0.3154033715392277,
+            },
+        ])
+
+        assert.deepStrictEqual(sut.topN(query, 1), [
+            {
+                content: 'machine learning tool is the trending topic!!! :)',
+                index: 1,
+                score: 2.597224531416621,
+            },
+        ])
+
+        assert.deepStrictEqual(sut.topN(query, 3), [
+            {
+                content: 'machine learning tool is the trending topic!!! :)',
+                index: 1,
+                score: 2.597224531416621,
+            },
+            {
+                content: 'copilot is a AI code generator too',
+                index: 4,
+                score: 2.485359418462239,
+            },
+            {
+                content: 'codewhisperer vs. copilot, which code generator better?',
+                index: 3,
+                score: 1.063018436525109,
+            },
+        ])
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/util/codeParsingUtil.test.ts b/packages/amazonq/test/unit/codewhisperer/util/codeParsingUtil.test.ts
new file mode 100644
index 00000000000..2a2ad8bb34e
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/util/codeParsingUtil.test.ts
@@ -0,0 +1,327 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    PlatformLanguageId,
+    extractClasses,
+    extractFunctions,
+    isTestFile,
+    utgLanguageConfigs,
+} from 'aws-core-vscode/codewhisperer'
+import assert from 'assert'
+import { createTestWorkspaceFolder, toTextDocument } from 'aws-core-vscode/test'
+
+describe('RegexValidationForPython', () => {
+    it('should extract all function names from a python file content', () => {
+        // TODO: Replace this variable based testing to read content from File.
+        // const filePath = vscode.Uri.file('./testData/samplePython.py').fsPath;
+        // const fileContent = fs.readFileSync('./testData/samplePython.py' , 'utf-8');
+        // const regex = /function\s+(\w+)/g;
+
+        const result = extractFunctions(pythonFileContent, utgLanguageConfigs['python'].functionExtractionPattern)
+        assert.strictEqual(result.length, 13)
+        assert.deepStrictEqual(result, [
+            'hello_world',
+            'add_numbers',
+            'multiply_numbers',
+            'sum_numbers',
+            'divide_numbers',
+            '__init__',
+            'add',
+            'multiply',
+            'square',
+            'from_sum',
+            '__init__',
+            'triple',
+            'main',
+        ])
+    })
+
+    it('should extract all class names from a file content', () => {
+        const result = extractClasses(pythonFileContent, utgLanguageConfigs['python'].classExtractionPattern)
+        assert.deepStrictEqual(result, ['Calculator'])
+    })
+})
+
+describe('RegexValidationForJava', () => {
+    it('should extract all function names from a java file content', () => {
+        // TODO: Replace this variable based testing to read content from File.
+        // const filePath = vscode.Uri.file('./testData/samplePython.py').fsPath;
+        // const fileContent = fs.readFileSync('./testData/samplePython.py' , 'utf-8');
+        // const regex = /function\s+(\w+)/g;
+
+        const result = extractFunctions(javaFileContent, utgLanguageConfigs['java'].functionExtractionPattern)
+        assert.strictEqual(result.length, 5)
+        assert.deepStrictEqual(result, ['sayHello', 'doSomething', 'square', 'manager', 'ABCFUNCTION'])
+    })
+
+    it('should extract all class names from a java file content', () => {
+        const result = extractClasses(javaFileContent, utgLanguageConfigs['java'].classExtractionPattern)
+        assert.deepStrictEqual(result, ['Test'])
+    })
+})
+
+describe('isTestFile', () => {
+    let testWsFolder: string
+    beforeEach(async function () {
+        testWsFolder = (await createTestWorkspaceFolder()).uri.fsPath
+    })
+
+    it('validate by file path', async function () {
+        const langs = new Map<string, string>([
+            ['java', '.java'],
+            ['python', '.py'],
+            ['typescript', '.ts'],
+            ['javascript', '.js'],
+            ['typescriptreact', '.tsx'],
+            ['javascriptreact', '.jsx'],
+        ])
+        const testFilePathsWithoutExt = [
+            '/test/MyClass',
+            '/test/my_class',
+            '/tst/MyClass',
+            '/tst/my_class',
+            '/tests/MyClass',
+            '/tests/my_class',
+        ]
+
+        const srcFilePathsWithoutExt = [
+            '/src/MyClass',
+            'MyClass',
+            'foo/bar/MyClass',
+            'foo/my_class',
+            'my_class',
+            'anyFolderOtherThanTest/foo/myClass',
+        ]
+
+        for (const [languageId, ext] of langs) {
+            const testFilePaths = testFilePathsWithoutExt.map((it) => it + ext)
+            for (const testFilePath of testFilePaths) {
+                const actual = await isTestFile(testFilePath, { languageId: languageId })
+                assert.strictEqual(actual, true)
+            }
+
+            const srcFilePaths = srcFilePathsWithoutExt.map((it) => it + ext)
+            for (const srcFilePath of srcFilePaths) {
+                const actual = await isTestFile(srcFilePath, { languageId: languageId })
+                assert.strictEqual(actual, false)
+            }
+        }
+    })
+
+    async function assertIsTestFile(
+        fileNames: string[],
+        config: { languageId: PlatformLanguageId },
+        expected: boolean
+    ) {
+        for (const fileName of fileNames) {
+            const document = await toTextDocument('', fileName, testWsFolder)
+            const actual = await isTestFile(document.uri.fsPath, { languageId: config.languageId })
+            assert.strictEqual(actual, expected)
+        }
+    }
+
+    it('validate by file name', async function () {
+        const camelCaseSrc = ['Foo.java', 'Bar.java', 'Baz.java']
+        await assertIsTestFile(camelCaseSrc, { languageId: 'java' }, false)
+
+        const camelCaseTst = ['FooTest.java', 'BarTests.java']
+        await assertIsTestFile(camelCaseTst, { languageId: 'java' }, true)
+
+        const snakeCaseSrc = ['foo.py', 'bar.py']
+        await assertIsTestFile(snakeCaseSrc, { languageId: 'python' }, false)
+
+        const snakeCaseTst = ['test_foo.py', 'bar_test.py']
+        await assertIsTestFile(snakeCaseTst, { languageId: 'python' }, true)
+
+        const javascriptSrc = ['Foo.js', 'bar.js']
+        await assertIsTestFile(javascriptSrc, { languageId: 'javascript' }, false)
+
+        const javascriptTst = ['Foo.test.js', 'Bar.spec.js']
+        await assertIsTestFile(javascriptTst, { languageId: 'javascript' }, true)
+
+        const typescriptSrc = ['Foo.ts', 'bar.ts']
+        await assertIsTestFile(typescriptSrc, { languageId: 'typescript' }, false)
+
+        const typescriptTst = ['Foo.test.ts', 'Bar.spec.ts']
+        await assertIsTestFile(typescriptTst, { languageId: 'typescript' }, true)
+
+        const jsxSrc = ['Foo.jsx', 'Bar.jsx']
+        await assertIsTestFile(jsxSrc, { languageId: 'javascriptreact' }, false)
+
+        const jsxTst = ['Foo.test.jsx', 'Bar.spec.jsx']
+        await assertIsTestFile(jsxTst, { languageId: 'javascriptreact' }, true)
+    })
+
+    it('should return true if the file name matches the test filename pattern - Java', async () => {
+        const filePaths = ['/path/to/MyClassTest.java', '/path/to/TestMyClass.java', '/path/to/MyClassTests.java']
+        const language = 'java'
+
+        for (const filePath of filePaths) {
+            const result = await isTestFile(filePath, { languageId: language })
+            assert.strictEqual(result, true)
+        }
+    })
+
+    it('should return false if the file name does not match the test filename pattern - Java', async () => {
+        const filePaths = ['/path/to/MyClass.java', '/path/to/MyClass_test.java', '/path/to/test_MyClass.java']
+        const language = 'java'
+
+        for (const filePath of filePaths) {
+            const result = await isTestFile(filePath, { languageId: language })
+            assert.strictEqual(result, false)
+        }
+    })
+
+    it('should return true if the file name does not match the test filename pattern - Python', async () => {
+        const filePaths = ['/path/to/util_test.py', '/path/to/test_util.py']
+        const language = 'python'
+
+        for (const filePath of filePaths) {
+            const result = await isTestFile(filePath, { languageId: language })
+            assert.strictEqual(result, true)
+        }
+    })
+
+    it('should return false if the file name does not match the test filename pattern - Python', async () => {
+        const filePaths = ['/path/to/util.py', '/path/to/utilTest.java', '/path/to/Testutil.java']
+        const language = 'python'
+
+        for (const filePath of filePaths) {
+            const result = await isTestFile(filePath, { languageId: language })
+            assert.strictEqual(result, false)
+        }
+    })
+
+    it('should return false if the language is not supported', async () => {
+        const filePath = '/path/to/MyClass.cpp'
+        const language = 'c++'
+        const result = await isTestFile(filePath, { languageId: language })
+        assert.strictEqual(result, false)
+    })
+})
+
+const pythonFileContent = `
+# Single-line import statements
+import os
+import numpy as np
+from typing import List, Tuple
+
+# Multi-line import statements
+from collections import (
+    defaultdict,
+    Counter
+)
+
+# Relative imports
+from . import module1
+from ..subpackage import module2
+
+# Wildcard imports
+from mypackage import *
+from mypackage.module import *
+
+# Aliased imports
+import pandas as pd
+from mypackage import module1 as m1, module2 as m2
+
+def hello_world():
+    print("Hello, world!")
+
+def add_numbers(x, y):
+    return x + y
+
+def multiply_numbers(x=1, y=1):
+    return x * y
+
+def sum_numbers(*args):
+    total = 0
+    for num in args:
+        total += num
+    return total
+
+def divide_numbers(x, y=1, *args, **kwargs):
+    result = x / y
+    for arg in args:
+        result /= arg
+    for _, value in kwargs.items():
+        result /= value
+    return result
+
+class Calculator:
+    def __init__(self, x, y):
+        self.x = x
+        self.y = y
+        
+    def add(self):
+        return self.x + self.y
+    
+    def multiply(self):
+        return self.x * self.y
+    
+    @staticmethod
+    def square(x):
+        return x ** 2
+    
+    @classmethod
+    def from_sum(cls, x, y):
+        return cls(x+y, 0)
+    
+    class InnerClass:
+        def __init__(self, z):
+            self.z = z
+            
+        def triple(self):
+            return self.z * 3
+    
+def main():
+    print(hello_world())
+    print(add_numbers(3, 5))
+    print(multiply_numbers(3, 5))
+    print(sum_numbers(1, 2, 3, 4, 5))
+    print(divide_numbers(10, 2, 5, 2, a=2, b=3))
+    
+    calc = Calculator(3, 5)
+    print(calc.add())
+    print(calc.multiply())
+    print(Calculator.square(3))
+    print(Calculator.from_sum(2, 3).add())
+    
+    inner = Calculator.InnerClass(5)
+    print(inner.triple())
+
+if __name__ == "__main__":
+    main()
+`
+
+const javaFileContent = `
+@Annotation
+public class Test {
+    Test() {
+        // Do something here
+    }
+
+    //Additional commenting
+    public static void sayHello() {
+        System.out.println("Hello, World!");
+    }
+
+    private void doSomething(int x, int y) throws Exception {
+        int z = x + y;
+        System.out.println("The sum of " + x + " and " + y + " is " + z);
+    }
+
+    protected static int square(int x) {
+        return x * x;
+    }
+
+    private static void manager(int a, int b) {
+        return a+b;
+    }
+
+    public int ABCFUNCTION( int ABC, int PQR) {
+        return ABC + PQR;
+    }
+}`
diff --git a/packages/amazonq/test/unit/codewhisperer/util/commonUtil.test.ts b/packages/amazonq/test/unit/codewhisperer/util/commonUtil.test.ts
new file mode 100644
index 00000000000..5694b33365d
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/util/commonUtil.test.ts
@@ -0,0 +1,81 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import {
+    JsonConfigFileNamingConvention,
+    checkLeftContextKeywordsForJson,
+    getPrefixSuffixOverlap,
+} from 'aws-core-vscode/codewhisperer'
+
+describe('commonUtil', function () {
+    describe('getPrefixSuffixOverlap', function () {
+        it('Should return correct overlap', async function () {
+            assert.strictEqual(getPrefixSuffixOverlap('32rasdgvdsg', 'sg462ydfgbs'), `sg`)
+            assert.strictEqual(getPrefixSuffixOverlap('32rasdgbreh', 'brehsega'), `breh`)
+            assert.strictEqual(getPrefixSuffixOverlap('42y24hsd', '42y24hsdzqq23'), `42y24hsd`)
+            assert.strictEqual(getPrefixSuffixOverlap('ge23yt1', 'ge23yt1'), `ge23yt1`)
+            assert.strictEqual(getPrefixSuffixOverlap('1sgdbsfbwsergsa', 'a1sgdbsfbwsergs'), `a`)
+            assert.strictEqual(getPrefixSuffixOverlap('xxa', 'xa'), `xa`)
+        })
+
+        it('Should return empty overlap for prefix suffix not matching cases', async function () {
+            assert.strictEqual(getPrefixSuffixOverlap('1sgdbsfbwsergsa', '1sgdbsfbwsergs'), ``)
+            assert.strictEqual(getPrefixSuffixOverlap('1sgdbsfbwsergsab', '1sgdbsfbwsergs'), ``)
+            assert.strictEqual(getPrefixSuffixOverlap('2135t12', 'v2135t12'), ``)
+            assert.strictEqual(getPrefixSuffixOverlap('2135t12', 'zv2135t12'), ``)
+            assert.strictEqual(getPrefixSuffixOverlap('xa', 'xxa'), ``)
+        })
+
+        it('Should return empty overlap for empty string input', async function () {
+            assert.strictEqual(getPrefixSuffixOverlap('ergwsghws', ''), ``)
+            assert.strictEqual(getPrefixSuffixOverlap('', 'asfegw4eh'), ``)
+        })
+    })
+
+    describe('checkLeftContextKeywordsForJson', function () {
+        it('Should return true for valid left context keywords', async function () {
+            assert.strictEqual(
+                checkLeftContextKeywordsForJson('foo.json', 'Create an S3 Bucket named CodeWhisperer', 'json'),
+                true
+            )
+        })
+        it('Should return false for invalid left context keywords', async function () {
+            assert.strictEqual(
+                checkLeftContextKeywordsForJson(
+                    'foo.json',
+                    'Create an S3 Bucket named CodeWhisperer in Cloudformation',
+                    'json'
+                ),
+                false
+            )
+        })
+
+        for (const jsonConfigFile of JsonConfigFileNamingConvention) {
+            it(`should evalute by filename ${jsonConfigFile}`, function () {
+                assert.strictEqual(checkLeftContextKeywordsForJson(jsonConfigFile, 'foo', 'json'), false)
+
+                assert.strictEqual(checkLeftContextKeywordsForJson(jsonConfigFile.toUpperCase(), 'bar', 'json'), false)
+
+                assert.strictEqual(checkLeftContextKeywordsForJson(jsonConfigFile.toUpperCase(), 'baz', 'json'), false)
+            })
+
+            const upperCaseFilename = jsonConfigFile.toUpperCase()
+            it(`should evalute by filename and case insensitive ${upperCaseFilename}`, function () {
+                assert.strictEqual(checkLeftContextKeywordsForJson(upperCaseFilename, 'foo', 'json'), false)
+
+                assert.strictEqual(
+                    checkLeftContextKeywordsForJson(upperCaseFilename.toUpperCase(), 'bar', 'json'),
+                    false
+                )
+
+                assert.strictEqual(
+                    checkLeftContextKeywordsForJson(upperCaseFilename.toUpperCase(), 'baz', 'json'),
+                    false
+                )
+            })
+        }
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts b/packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts
new file mode 100644
index 00000000000..4c2ca1190ca
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/util/crossFileContextUtil.test.ts
@@ -0,0 +1,417 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as FakeTimers from '@sinonjs/fake-timers'
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import * as crossFile from 'aws-core-vscode/codewhisperer'
+import {
+    aLongStringWithLineCount,
+    aStringWithLineCount,
+    createMockTextEditor,
+    installFakeClock,
+} from 'aws-core-vscode/test'
+import { FeatureConfigProvider, crossFileContextConfig } from 'aws-core-vscode/codewhisperer'
+import {
+    assertTabCount,
+    closeAllEditors,
+    createTestWorkspaceFolder,
+    toTextEditor,
+    shuffleList,
+    toFile,
+} from 'aws-core-vscode/test'
+import { areEqual, normalize } from 'aws-core-vscode/shared'
+import * as path from 'path'
+
+let tempFolder: string
+
+describe('crossFileContextUtil', function () {
+    const fakeCancellationToken: vscode.CancellationToken = {
+        isCancellationRequested: false,
+        onCancellationRequested: sinon.spy(),
+    }
+
+    let mockEditor: vscode.TextEditor
+    let clock: FakeTimers.InstalledClock
+
+    before(function () {
+        clock = installFakeClock()
+    })
+
+    after(function () {
+        clock.uninstall()
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    describe('fetchSupplementalContextForSrc', function () {
+        beforeEach(async function () {
+            tempFolder = (await createTestWorkspaceFolder()).uri.fsPath
+        })
+
+        afterEach(async function () {
+            sinon.restore()
+        })
+
+        it.skip('for control group, should return opentabs context where there will be 3 chunks and each chunk should contains 50 lines', async function () {
+            sinon.stub(FeatureConfigProvider.instance, 'getProjectContextGroup').returns('control')
+            await toTextEditor(aStringWithLineCount(200), 'CrossFile.java', tempFolder, { preview: false })
+            const myCurrentEditor = await toTextEditor('', 'TargetFile.java', tempFolder, {
+                preview: false,
+            })
+
+            await assertTabCount(2)
+
+            const actual = await crossFile.fetchSupplementalContextForSrc(myCurrentEditor, fakeCancellationToken)
+            assert.ok(actual)
+            assert.strictEqual(actual.supplementalContextItems.length, 3)
+            assert.strictEqual(actual.supplementalContextItems[0].content.split('\n').length, 50)
+            assert.strictEqual(actual.supplementalContextItems[1].content.split('\n').length, 50)
+            assert.strictEqual(actual.supplementalContextItems[2].content.split('\n').length, 50)
+        })
+
+        it('for t1 group, should return repomap + opentabs context, should not exceed 20k total length', async function () {
+            await toTextEditor(aLongStringWithLineCount(200), 'CrossFile.java', tempFolder, { preview: false })
+            const myCurrentEditor = await toTextEditor('', 'TargetFile.java', tempFolder, {
+                preview: false,
+            })
+
+            await assertTabCount(2)
+
+            sinon.stub(FeatureConfigProvider.instance, 'getProjectContextGroup').returns('t1')
+
+            const mockLanguageClient = {
+                sendRequest: sinon.stub().resolves([
+                    {
+                        content: 'foo'.repeat(3000),
+                        score: 0,
+                        filePath: 'q-inline',
+                    },
+                ]),
+            } as any
+
+            const actual = await crossFile.fetchSupplementalContextForSrc(
+                myCurrentEditor,
+                fakeCancellationToken,
+                mockLanguageClient
+            )
+            assert.ok(actual)
+            assert.strictEqual(actual.supplementalContextItems.length, 3)
+            assert.strictEqual(actual?.strategy, 'codemap')
+            assert.deepEqual(actual?.supplementalContextItems[0], {
+                content: 'foo'.repeat(3000),
+                score: 0,
+                filePath: 'q-inline',
+            })
+            assert.strictEqual(actual.supplementalContextItems[1].content.split('\n').length, 50)
+            assert.strictEqual(actual.supplementalContextItems[2].content.split('\n').length, 50)
+        })
+
+        it.skip('for t2 group, should return global bm25 context and no repomap', async function () {
+            await toTextEditor(aStringWithLineCount(200), 'CrossFile.java', tempFolder, { preview: false })
+            const myCurrentEditor = await toTextEditor('', 'TargetFile.java', tempFolder, {
+                preview: false,
+            })
+
+            await assertTabCount(2)
+
+            sinon.stub(FeatureConfigProvider.instance, 'getProjectContextGroup').returns('t2')
+
+            const actual = await crossFile.fetchSupplementalContextForSrc(myCurrentEditor, fakeCancellationToken)
+            assert.ok(actual)
+            assert.strictEqual(actual.supplementalContextItems.length, 5)
+            assert.strictEqual(actual?.strategy, 'bm25')
+
+            assert.deepEqual(actual?.supplementalContextItems[0], {
+                content: 'foo',
+                score: 5,
+                filePath: 'foo.java',
+            })
+
+            assert.deepEqual(actual?.supplementalContextItems[1], {
+                content: 'bar',
+                score: 4,
+                filePath: 'bar.java',
+            })
+            assert.deepEqual(actual?.supplementalContextItems[2], {
+                content: 'baz',
+                score: 3,
+                filePath: 'baz.java',
+            })
+
+            assert.deepEqual(actual?.supplementalContextItems[3], {
+                content: 'qux',
+                score: 2,
+                filePath: 'qux.java',
+            })
+
+            assert.deepEqual(actual?.supplementalContextItems[4], {
+                content: 'quux',
+                score: 1,
+                filePath: 'quux.java',
+            })
+        })
+    })
+
+    describe('non supported language should return undefined', function () {
+        it('c++', async function () {
+            mockEditor = createMockTextEditor('content', 'fileName', 'cpp')
+            const actual = await crossFile.fetchSupplementalContextForSrc(mockEditor, fakeCancellationToken)
+            assert.strictEqual(actual, undefined)
+        })
+
+        it('ruby', async function () {
+            mockEditor = createMockTextEditor('content', 'fileName', 'ruby')
+
+            const actual = await crossFile.fetchSupplementalContextForSrc(mockEditor, fakeCancellationToken)
+
+            assert.strictEqual(actual, undefined)
+        })
+    })
+
+    describe('getCrossFileCandidate', function () {
+        before(async function () {
+            this.timeout(60000)
+        })
+
+        beforeEach(async function () {
+            tempFolder = (await createTestWorkspaceFolder()).uri.fsPath
+        })
+
+        afterEach(async function () {
+            await closeAllEditors()
+        })
+
+        it('should return opened files, exclude test files and sorted ascendingly by file distance', async function () {
+            const targetFile = path.join('src', 'service', 'microService', 'CodeWhispererFileContextProvider.java')
+            const fileWithDistance3 = path.join('src', 'service', 'CodewhispererRecommendationService.java')
+            const fileWithDistance5 = path.join('src', 'util', 'CodeWhispererConstants.java')
+            const fileWithDistance6 = path.join('src', 'ui', 'popup', 'CodeWhispererPopupManager.java')
+            const fileWithDistance7 = path.join('src', 'ui', 'popup', 'components', 'CodeWhispererPopup.java')
+            const fileWithDistance8 = path.join(
+                'src',
+                'ui',
+                'popup',
+                'components',
+                'actions',
+                'AcceptRecommendationAction.java'
+            )
+            const testFile1 = path.join('test', 'service', 'CodeWhispererFileContextProviderTest.java')
+            const testFile2 = path.join('test', 'ui', 'CodeWhispererPopupManagerTest.java')
+
+            const expectedFilePaths = [
+                fileWithDistance3,
+                fileWithDistance5,
+                fileWithDistance6,
+                fileWithDistance7,
+                fileWithDistance8,
+            ]
+
+            const shuffledFilePaths = shuffleList(expectedFilePaths)
+
+            for (const filePath of shuffledFilePaths) {
+                await toTextEditor('', filePath, tempFolder, { preview: false })
+            }
+
+            await toTextEditor('', testFile1, tempFolder, { preview: false })
+            await toTextEditor('', testFile2, tempFolder, { preview: false })
+            const editor = await toTextEditor('', targetFile, tempFolder, { preview: false })
+
+            await assertTabCount(shuffledFilePaths.length + 3)
+
+            const actual = await crossFile.getCrossFileCandidates(editor)
+
+            assert.ok(actual.length === 5)
+            for (const [index, actualFile] of actual.entries()) {
+                const expectedFile = path.join(tempFolder, expectedFilePaths[index])
+                assert.strictEqual(normalize(expectedFile), normalize(actualFile))
+                assert.ok(areEqual(tempFolder, actualFile, expectedFile))
+            }
+        })
+    })
+
+    describe.skip('partial support - control group', function () {
+        const fileExtLists: string[] = []
+
+        before(async function () {
+            this.timeout(60000)
+        })
+
+        beforeEach(async function () {
+            tempFolder = (await createTestWorkspaceFolder()).uri.fsPath
+        })
+
+        afterEach(async function () {
+            await closeAllEditors()
+        })
+
+        for (const fileExt of fileExtLists) {
+            it('should be empty if userGroup is control', async function () {
+                const editor = await toTextEditor('content-1', `file-1.${fileExt}`, tempFolder)
+                await toTextEditor('content-2', `file-2.${fileExt}`, tempFolder, { preview: false })
+                await toTextEditor('content-3', `file-3.${fileExt}`, tempFolder, { preview: false })
+                await toTextEditor('content-4', `file-4.${fileExt}`, tempFolder, { preview: false })
+
+                await assertTabCount(4)
+
+                const actual = await crossFile.fetchSupplementalContextForSrc(editor, fakeCancellationToken)
+
+                assert.ok(actual && actual.supplementalContextItems.length === 0)
+            })
+        }
+    })
+
+    describe.skip('partial support - crossfile group', function () {
+        const fileExtLists: string[] = []
+
+        before(async function () {
+            this.timeout(60000)
+        })
+
+        beforeEach(async function () {
+            tempFolder = (await createTestWorkspaceFolder()).uri.fsPath
+        })
+
+        afterEach(async function () {
+            await closeAllEditors()
+        })
+
+        for (const fileExt of fileExtLists) {
+            it('should be non empty if usergroup is Crossfile', async function () {
+                const editor = await toTextEditor('content-1', `file-1.${fileExt}`, tempFolder)
+                await toTextEditor('content-2', `file-2.${fileExt}`, tempFolder, { preview: false })
+                await toTextEditor('content-3', `file-3.${fileExt}`, tempFolder, { preview: false })
+                await toTextEditor('content-4', `file-4.${fileExt}`, tempFolder, { preview: false })
+
+                await assertTabCount(4)
+
+                const actual = await crossFile.fetchSupplementalContextForSrc(editor, fakeCancellationToken)
+
+                assert.ok(actual && actual.supplementalContextItems.length !== 0)
+            })
+        }
+    })
+
+    describe('full support', function () {
+        const fileExtLists = ['java', 'js', 'ts', 'py', 'tsx', 'jsx']
+
+        before(async function () {
+            this.timeout(60000)
+        })
+
+        beforeEach(async function () {
+            tempFolder = (await createTestWorkspaceFolder()).uri.fsPath
+        })
+
+        afterEach(async function () {
+            sinon.restore()
+            await closeAllEditors()
+        })
+
+        for (const fileExt of fileExtLists) {
+            it(`supplemental context for file ${fileExt} should be non empty`, async function () {
+                sinon.stub(FeatureConfigProvider.instance, 'getProjectContextGroup').returns('control')
+                const editor = await toTextEditor('content-1', `file-1.${fileExt}`, tempFolder)
+                await toTextEditor('content-2', `file-2.${fileExt}`, tempFolder, { preview: false })
+                await toTextEditor('content-3', `file-3.${fileExt}`, tempFolder, { preview: false })
+                await toTextEditor('content-4', `file-4.${fileExt}`, tempFolder, { preview: false })
+
+                await assertTabCount(4)
+
+                const actual = await crossFile.fetchSupplementalContextForSrc(editor, fakeCancellationToken)
+
+                assert.ok(actual && actual.supplementalContextItems.length !== 0)
+            })
+        }
+    })
+
+    describe('splitFileToChunks', function () {
+        beforeEach(async function () {
+            tempFolder = (await createTestWorkspaceFolder()).uri.fsPath
+        })
+
+        it('should split file to a chunk of 2 lines', async function () {
+            const filePath = path.join(tempFolder, 'file.txt')
+            await toFile('line_1\nline_2\nline_3\nline_4\nline_5\nline_6\nline_7', filePath)
+
+            const chunks = await crossFile.splitFileToChunks(filePath, 2)
+
+            assert.strictEqual(chunks.length, 4)
+            assert.strictEqual(chunks[0].content, 'line_1\nline_2')
+            assert.strictEqual(chunks[1].content, 'line_3\nline_4')
+            assert.strictEqual(chunks[2].content, 'line_5\nline_6')
+            assert.strictEqual(chunks[3].content, 'line_7')
+        })
+
+        it('should split file to a chunk of 5 lines', async function () {
+            const filePath = path.join(tempFolder, 'file.txt')
+            await toFile('line_1\nline_2\nline_3\nline_4\nline_5\nline_6\nline_7', filePath)
+
+            const chunks = await crossFile.splitFileToChunks(filePath, 5)
+
+            assert.strictEqual(chunks.length, 2)
+            assert.strictEqual(chunks[0].content, 'line_1\nline_2\nline_3\nline_4\nline_5')
+            assert.strictEqual(chunks[1].content, 'line_6\nline_7')
+        })
+
+        it('codewhisperer crossfile config should use 50 lines', async function () {
+            const filePath = path.join(tempFolder, 'file.txt')
+            await toFile(aStringWithLineCount(210), filePath)
+
+            const chunks = await crossFile.splitFileToChunks(filePath, crossFileContextConfig.numberOfLinesEachChunk)
+
+            // (210 / 50) + 1
+            assert.strictEqual(chunks.length, 5)
+            // line0 -> line49
+            assert.strictEqual(chunks[0].content, aStringWithLineCount(50, 0))
+            // line50 -> line99
+            assert.strictEqual(chunks[1].content, aStringWithLineCount(50, 50))
+            // line100 -> line149
+            assert.strictEqual(chunks[2].content, aStringWithLineCount(50, 100))
+            // line150 -> line199
+            assert.strictEqual(chunks[3].content, aStringWithLineCount(50, 150))
+            // line 200 -> line209
+            assert.strictEqual(chunks[4].content, aStringWithLineCount(10, 200))
+        })
+
+        it('linkChunks should add another chunk which will link to the first chunk and chunk.nextContent should reflect correct value', async function () {
+            const filePath = path.join(tempFolder, 'file.txt')
+            await toFile(aStringWithLineCount(210), filePath)
+
+            const chunks = await crossFile.splitFileToChunks(filePath, crossFileContextConfig.numberOfLinesEachChunk)
+            const linkedChunks = crossFile.linkChunks(chunks)
+
+            // 210 / 50 + 2
+            assert.strictEqual(linkedChunks.length, 6)
+
+            // 0th
+            assert.strictEqual(linkedChunks[0].content, aStringWithLineCount(3, 0))
+            assert.strictEqual(linkedChunks[0].nextContent, aStringWithLineCount(50, 0))
+
+            // 1st
+            assert.strictEqual(linkedChunks[1].content, aStringWithLineCount(50, 0))
+            assert.strictEqual(linkedChunks[1].nextContent, aStringWithLineCount(50, 50))
+
+            // 2nd
+            assert.strictEqual(linkedChunks[2].content, aStringWithLineCount(50, 50))
+            assert.strictEqual(linkedChunks[2].nextContent, aStringWithLineCount(50, 100))
+
+            // 3rd
+            assert.strictEqual(linkedChunks[3].content, aStringWithLineCount(50, 100))
+            assert.strictEqual(linkedChunks[3].nextContent, aStringWithLineCount(50, 150))
+
+            // 4th
+            assert.strictEqual(linkedChunks[4].content, aStringWithLineCount(50, 150))
+            assert.strictEqual(linkedChunks[4].nextContent, aStringWithLineCount(10, 200))
+
+            // 5th
+            assert.strictEqual(linkedChunks[5].content, aStringWithLineCount(10, 200))
+            assert.strictEqual(linkedChunks[5].nextContent, aStringWithLineCount(10, 200))
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/util/diagnosticsUtil.test.ts b/packages/amazonq/test/unit/codewhisperer/util/diagnosticsUtil.test.ts
new file mode 100644
index 00000000000..6c33d61ba87
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/util/diagnosticsUtil.test.ts
@@ -0,0 +1,92 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as assert from 'assert'
+import * as vscode from 'vscode'
+import { getDiagnosticsType, getDiagnosticsDifferences } from 'aws-core-vscode/codewhisperer'
+describe('diagnosticsUtil', function () {
+    describe('getDiagnosticsType', function () {
+        it('should identify SYNTAX_ERROR correctly', function () {
+            assert.strictEqual(getDiagnosticsType('Expected semicolon'), 'SYNTAX_ERROR')
+            assert.strictEqual(getDiagnosticsType('Incorrect indent level'), 'SYNTAX_ERROR')
+            assert.strictEqual(getDiagnosticsType('Syntax error in line 5'), 'SYNTAX_ERROR')
+        })
+
+        it('should identify TYPE_ERROR correctly', function () {
+            assert.strictEqual(getDiagnosticsType('Type mismatch'), 'TYPE_ERROR')
+            assert.strictEqual(getDiagnosticsType('Invalid type cast'), 'TYPE_ERROR')
+        })
+
+        it('should identify REFERENCE_ERROR correctly', function () {
+            assert.strictEqual(getDiagnosticsType('Variable is undefined'), 'REFERENCE_ERROR')
+            assert.strictEqual(getDiagnosticsType('Variable not defined'), 'REFERENCE_ERROR')
+            assert.strictEqual(getDiagnosticsType('Reference error occurred'), 'REFERENCE_ERROR')
+        })
+
+        it('should identify BEST_PRACTICE correctly', function () {
+            assert.strictEqual(getDiagnosticsType('Using deprecated method'), 'BEST_PRACTICE')
+            assert.strictEqual(getDiagnosticsType('Variable is unused'), 'BEST_PRACTICE')
+            assert.strictEqual(getDiagnosticsType('Variable not initialized'), 'BEST_PRACTICE')
+        })
+
+        it('should identify SECURITY correctly', function () {
+            assert.strictEqual(getDiagnosticsType('Potential security vulnerability'), 'SECURITY')
+            assert.strictEqual(getDiagnosticsType('Security risk detected'), 'SECURITY')
+        })
+
+        it('should return OTHER for unrecognized messages', function () {
+            assert.strictEqual(getDiagnosticsType('Random message'), 'OTHER')
+            assert.strictEqual(getDiagnosticsType(''), 'OTHER')
+        })
+    })
+
+    describe('getDiagnosticsDifferences', function () {
+        const createDiagnostic = (message: string): vscode.Diagnostic => {
+            return {
+                message,
+                severity: vscode.DiagnosticSeverity.Error,
+                range: new vscode.Range(0, 0, 0, 1),
+                source: 'test',
+            }
+        }
+
+        it('should return empty arrays when both inputs are undefined', function () {
+            const result = getDiagnosticsDifferences(undefined, undefined)
+            assert.deepStrictEqual(result, { added: [], removed: [] })
+        })
+
+        it('should return empty arrays when filepaths are different', function () {
+            const oldDiagnostics = {
+                filepath: '/path/to/file1',
+                diagnostics: [createDiagnostic('error1')],
+            }
+            const newDiagnostics = {
+                filepath: '/path/to/file2',
+                diagnostics: [createDiagnostic('error1')],
+            }
+            const result = getDiagnosticsDifferences(oldDiagnostics, newDiagnostics)
+            assert.deepStrictEqual(result, { added: [], removed: [] })
+        })
+
+        it('should correctly identify added and removed diagnostics', function () {
+            const diagnostic1 = createDiagnostic('error1')
+            const diagnostic2 = createDiagnostic('error2')
+            const diagnostic3 = createDiagnostic('error3')
+
+            const oldDiagnostics = {
+                filepath: '/path/to/file',
+                diagnostics: [diagnostic1, diagnostic2],
+            }
+            const newDiagnostics = {
+                filepath: '/path/to/file',
+                diagnostics: [diagnostic2, diagnostic3],
+            }
+
+            const result = getDiagnosticsDifferences(oldDiagnostics, newDiagnostics)
+            assert.deepStrictEqual(result.added, [diagnostic3])
+            assert.deepStrictEqual(result.removed, [diagnostic1])
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/util/editorContext.test.ts b/packages/amazonq/test/unit/codewhisperer/util/editorContext.test.ts
new file mode 100644
index 00000000000..3875dbbd0f2
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/util/editorContext.test.ts
@@ -0,0 +1,392 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import * as codewhispererClient from 'aws-core-vscode/codewhisperer'
+import * as EditorContext from 'aws-core-vscode/codewhisperer'
+import {
+    createMockDocument,
+    createMockTextEditor,
+    createMockClientRequest,
+    resetCodeWhispererGlobalVariables,
+    toTextEditor,
+    createTestWorkspaceFolder,
+    closeAllEditors,
+} from 'aws-core-vscode/test'
+import { globals } from 'aws-core-vscode/shared'
+import { GenerateCompletionsRequest } from 'aws-core-vscode/codewhisperer'
+import * as vscode from 'vscode'
+
+export function createNotebookCell(
+    document: vscode.TextDocument = createMockDocument('def example():\n    return "test"'),
+    kind: vscode.NotebookCellKind = vscode.NotebookCellKind.Code,
+    notebook: vscode.NotebookDocument = {} as any,
+    index: number = 0,
+    outputs: vscode.NotebookCellOutput[] = [],
+    metadata: { readonly [key: string]: any } = {},
+    executionSummary?: vscode.NotebookCellExecutionSummary
+): vscode.NotebookCell {
+    return {
+        document,
+        kind,
+        notebook,
+        index,
+        outputs,
+        metadata,
+        executionSummary,
+    }
+}
+
+describe('editorContext', function () {
+    let telemetryEnabledDefault: boolean
+    let tempFolder: string
+
+    beforeEach(async function () {
+        await resetCodeWhispererGlobalVariables()
+        telemetryEnabledDefault = globals.telemetry.telemetryEnabled
+    })
+
+    afterEach(async function () {
+        await globals.telemetry.setTelemetryEnabled(telemetryEnabledDefault)
+    })
+
+    describe('extractContextForCodeWhisperer', function () {
+        it('Should return expected context', function () {
+            const editor = createMockTextEditor('import math\ndef two_sum(nums, target):\n', 'test.py', 'python', 1, 17)
+            const actual = EditorContext.extractContextForCodeWhisperer(editor)
+            const expected: codewhispererClient.FileContext = {
+                fileUri: 'file:///test.py',
+                filename: 'test.py',
+                programmingLanguage: {
+                    languageName: 'python',
+                },
+                leftFileContent: 'import math\ndef two_sum(nums,',
+                rightFileContent: ' target):\n',
+            }
+            assert.deepStrictEqual(actual, expected)
+        })
+
+        it('Should return expected context within max char limit', function () {
+            const editor = createMockTextEditor(
+                'import math\ndef ' + 'a'.repeat(10340) + 'two_sum(nums, target):\n',
+                'test.py',
+                'python',
+                1,
+                17
+            )
+            const actual = EditorContext.extractContextForCodeWhisperer(editor)
+            const expected: codewhispererClient.FileContext = {
+                fileUri: 'file:///test.py',
+                filename: 'test.py',
+                programmingLanguage: {
+                    languageName: 'python',
+                },
+                leftFileContent: 'import math\ndef aaaaaaaaaaaaa',
+                rightFileContent: 'a'.repeat(10240),
+            }
+            assert.deepStrictEqual(actual, expected)
+        })
+
+        it('in a notebook, includes context from other cells', async function () {
+            const cells: vscode.NotebookCellData[] = [
+                new vscode.NotebookCellData(vscode.NotebookCellKind.Markup, 'Previous cell', 'python'),
+                new vscode.NotebookCellData(
+                    vscode.NotebookCellKind.Code,
+                    'import numpy as np\nimport pandas as pd\n\ndef analyze_data(df):\n    # Current cell with cursor here',
+                    'python'
+                ),
+                new vscode.NotebookCellData(
+                    vscode.NotebookCellKind.Code,
+                    '# Process the data\nresult = analyze_data(df)\nprint(result)',
+                    'python'
+                ),
+            ]
+
+            const document = await vscode.workspace.openNotebookDocument(
+                'jupyter-notebook',
+                new vscode.NotebookData(cells)
+            )
+            const editor: any = {
+                document: document.cellAt(1).document,
+                selection: { active: new vscode.Position(4, 13) },
+            }
+
+            const actual = EditorContext.extractContextForCodeWhisperer(editor)
+            const expected: codewhispererClient.FileContext = {
+                fileUri: editor.document.uri.toString(),
+                filename: 'Untitled-1.py',
+                programmingLanguage: {
+                    languageName: 'python',
+                },
+                leftFileContent:
+                    '# Previous cell\nimport numpy as np\nimport pandas as pd\n\ndef analyze_data(df):\n    # Current',
+                rightFileContent:
+                    ' cell with cursor here\n# Process the data\nresult = analyze_data(df)\nprint(result)\n',
+            }
+            assert.deepStrictEqual(actual, expected)
+        })
+    })
+
+    describe('getFileName', function () {
+        it('Should return expected filename given a document reading test.py', function () {
+            const editor = createMockTextEditor('', 'test.py', 'python', 1, 17)
+            const actual = EditorContext.getFileName(editor)
+            const expected = 'test.py'
+            assert.strictEqual(actual, expected)
+        })
+
+        it('Should return expected filename for a long filename', async function () {
+            const editor = createMockTextEditor('', 'a'.repeat(1500), 'python', 1, 17)
+            const actual = EditorContext.getFileName(editor)
+            const expected = 'a'.repeat(1024)
+            assert.strictEqual(actual, expected)
+        })
+    })
+
+    describe('getFileRelativePath', function () {
+        this.beforeEach(async function () {
+            tempFolder = (await createTestWorkspaceFolder()).uri.fsPath
+        })
+
+        it('Should return a new filename with correct extension given a .ipynb file', function () {
+            const languageToExtension = new Map<string, string>([
+                ['python', 'py'],
+                ['rust', 'rs'],
+                ['javascript', 'js'],
+                ['typescript', 'ts'],
+                ['c', 'c'],
+            ])
+
+            for (const [language, extension] of languageToExtension.entries()) {
+                const editor = createMockTextEditor('', 'test.ipynb', language, 1, 17)
+                const actual = EditorContext.getFileRelativePath(editor)
+                const expected = 'test.' + extension
+                assert.strictEqual(actual, expected)
+            }
+        })
+
+        it('Should return relative path', async function () {
+            const editor = await toTextEditor('tttt', 'test.py', tempFolder)
+            const actual = EditorContext.getFileRelativePath(editor)
+            const expected = 'test.py'
+            assert.strictEqual(actual, expected)
+        })
+
+        afterEach(async function () {
+            await closeAllEditors()
+        })
+    })
+
+    describe('getNotebookCellContext', function () {
+        it('Should return cell text for python code cells when language is python', function () {
+            const mockCodeCell = createNotebookCell(createMockDocument('def example():\n    return "test"'))
+            const result = EditorContext.getNotebookCellContext(mockCodeCell, 'python')
+            assert.strictEqual(result, 'def example():\n    return "test"')
+        })
+
+        it('Should return java comments for python code cells when language is java', function () {
+            const mockCodeCell = createNotebookCell(createMockDocument('def example():\n    return "test"'))
+            const result = EditorContext.getNotebookCellContext(mockCodeCell, 'java')
+            assert.strictEqual(result, '// def example():\n//     return "test"')
+        })
+
+        it('Should return python comments for java code cells when language is python', function () {
+            const mockCodeCell = createNotebookCell(createMockDocument('println(1 + 1);', 'somefile.ipynb', 'java'))
+            const result = EditorContext.getNotebookCellContext(mockCodeCell, 'python')
+            assert.strictEqual(result, '# println(1 + 1);')
+        })
+
+        it('Should add python comment prefixes for markdown cells when language is python', function () {
+            const mockMarkdownCell = createNotebookCell(
+                createMockDocument('# Heading\nThis is a markdown cell'),
+                vscode.NotebookCellKind.Markup
+            )
+            const result = EditorContext.getNotebookCellContext(mockMarkdownCell, 'python')
+            assert.strictEqual(result, '# # Heading\n# This is a markdown cell')
+        })
+
+        it('Should add java comment prefixes for markdown cells when language is java', function () {
+            const mockMarkdownCell = createNotebookCell(
+                createMockDocument('# Heading\nThis is a markdown cell'),
+                vscode.NotebookCellKind.Markup
+            )
+            const result = EditorContext.getNotebookCellContext(mockMarkdownCell, 'java')
+            assert.strictEqual(result, '// # Heading\n// This is a markdown cell')
+        })
+    })
+
+    describe('getNotebookCellsSliceContext', function () {
+        it('Should extract content from cells in reverse order up to maxLength from prefix cells', function () {
+            const mockCells = [
+                createNotebookCell(createMockDocument('First cell content')),
+                createNotebookCell(createMockDocument('Second cell content')),
+                createNotebookCell(createMockDocument('Third cell content')),
+            ]
+
+            const result = EditorContext.getNotebookCellsSliceContext(mockCells, 100, 'python', false)
+            assert.strictEqual(result, 'First cell content\nSecond cell content\nThird cell content\n')
+        })
+
+        it('Should extract content from cells in reverse order up to maxLength from suffix cells', function () {
+            const mockCells = [
+                createNotebookCell(createMockDocument('First cell content')),
+                createNotebookCell(createMockDocument('Second cell content')),
+                createNotebookCell(createMockDocument('Third cell content')),
+            ]
+
+            const result = EditorContext.getNotebookCellsSliceContext(mockCells, 100, 'python', true)
+            assert.strictEqual(result, 'First cell content\nSecond cell content\nThird cell content\n')
+        })
+
+        it('Should respect maxLength parameter from prefix cells', function () {
+            const mockCells = [
+                createNotebookCell(createMockDocument('First')),
+                createNotebookCell(createMockDocument('Second')),
+                createNotebookCell(createMockDocument('Third')),
+                createNotebookCell(createMockDocument('Fourth')),
+            ]
+            // Should only include part of second cell and the last two cells
+            const result = EditorContext.getNotebookCellsSliceContext(mockCells, 15, 'python', false)
+            assert.strictEqual(result, 'd\nThird\nFourth\n')
+        })
+
+        it('Should respect maxLength parameter from suffix cells', function () {
+            const mockCells = [
+                createNotebookCell(createMockDocument('First')),
+                createNotebookCell(createMockDocument('Second')),
+                createNotebookCell(createMockDocument('Third')),
+                createNotebookCell(createMockDocument('Fourth')),
+            ]
+
+            // Should only include first cell and part of second cell
+            const result = EditorContext.getNotebookCellsSliceContext(mockCells, 15, 'python', true)
+            assert.strictEqual(result, 'First\nSecond\nTh')
+        })
+
+        it('Should handle empty cells array from prefix cells', function () {
+            const result = EditorContext.getNotebookCellsSliceContext([], 100, 'python', false)
+            assert.strictEqual(result, '')
+        })
+
+        it('Should handle empty cells array from suffix cells', function () {
+            const result = EditorContext.getNotebookCellsSliceContext([], 100, 'python', true)
+            assert.strictEqual(result, '')
+        })
+
+        it('Should add python comments to markdown prefix cells', function () {
+            const mockCells = [
+                createNotebookCell(createMockDocument('# Heading\nThis is markdown'), vscode.NotebookCellKind.Markup),
+                createNotebookCell(createMockDocument('def example():\n    return "test"')),
+            ]
+            const result = EditorContext.getNotebookCellsSliceContext(mockCells, 100, 'python', false)
+            assert.strictEqual(result, '# # Heading\n# This is markdown\ndef example():\n    return "test"\n')
+        })
+
+        it('Should add python comments to markdown suffix cells', function () {
+            const mockCells = [
+                createNotebookCell(createMockDocument('# Heading\nThis is markdown'), vscode.NotebookCellKind.Markup),
+                createNotebookCell(createMockDocument('def example():\n    return "test"')),
+            ]
+
+            const result = EditorContext.getNotebookCellsSliceContext(mockCells, 100, 'python', true)
+            assert.strictEqual(result, '# # Heading\n# This is markdown\ndef example():\n    return "test"\n')
+        })
+
+        it('Should add java comments to markdown and python prefix cells when language is java', function () {
+            const mockCells = [
+                createNotebookCell(createMockDocument('# Heading\nThis is markdown'), vscode.NotebookCellKind.Markup),
+                createNotebookCell(createMockDocument('def example():\n    return "test"')),
+            ]
+            const result = EditorContext.getNotebookCellsSliceContext(mockCells, 100, 'java', false)
+            assert.strictEqual(result, '// # Heading\n// This is markdown\n// def example():\n//     return "test"\n')
+        })
+
+        it('Should add java comments to markdown and python suffix cells when language is java', function () {
+            const mockCells = [
+                createNotebookCell(createMockDocument('# Heading\nThis is markdown'), vscode.NotebookCellKind.Markup),
+                createNotebookCell(createMockDocument('println(1 + 1);', 'somefile.ipynb', 'java')),
+            ]
+
+            const result = EditorContext.getNotebookCellsSliceContext(mockCells, 100, 'java', true)
+            assert.strictEqual(result, '// # Heading\n// This is markdown\nprintln(1 + 1);\n')
+        })
+
+        it('Should handle code prefix cells with different languages', function () {
+            const mockCells = [
+                createNotebookCell(
+                    createMockDocument('println(1 + 1);', 'somefile.ipynb', 'java'),
+                    vscode.NotebookCellKind.Code
+                ),
+                createNotebookCell(createMockDocument('def example():\n    return "test"')),
+            ]
+            const result = EditorContext.getNotebookCellsSliceContext(mockCells, 100, 'python', false)
+            assert.strictEqual(result, '# println(1 + 1);\ndef example():\n    return "test"\n')
+        })
+
+        it('Should handle code suffix cells with different languages', function () {
+            const mockCells = [
+                createNotebookCell(
+                    createMockDocument('println(1 + 1);', 'somefile.ipynb', 'java'),
+                    vscode.NotebookCellKind.Code
+                ),
+                createNotebookCell(createMockDocument('def example():\n    return "test"')),
+            ]
+            const result = EditorContext.getNotebookCellsSliceContext(mockCells, 100, 'python', true)
+            assert.strictEqual(result, '# println(1 + 1);\ndef example():\n    return "test"\n')
+        })
+    })
+
+    describe('validateRequest', function () {
+        it('Should return false if request filename.length is invalid', function () {
+            const req = createMockClientRequest()
+            req.fileContext.filename = ''
+            assert.ok(!EditorContext.validateRequest(req))
+        })
+
+        it('Should return false if request programming language is invalid', function () {
+            const req = createMockClientRequest()
+            req.fileContext.programmingLanguage.languageName = ''
+            assert.ok(!EditorContext.validateRequest(req))
+            req.fileContext.programmingLanguage.languageName = 'a'.repeat(200)
+            assert.ok(!EditorContext.validateRequest(req))
+        })
+
+        it('Should return false if request left or right context exceeds max length', function () {
+            const req = createMockClientRequest()
+            req.fileContext.leftFileContent = 'a'.repeat(256000)
+            assert.ok(!EditorContext.validateRequest(req))
+            req.fileContext.leftFileContent = 'a'
+            req.fileContext.rightFileContent = 'a'.repeat(256000)
+            assert.ok(!EditorContext.validateRequest(req))
+        })
+
+        it('Should return true if above conditions are not met', function () {
+            const req = createMockClientRequest()
+            assert.ok(EditorContext.validateRequest(req))
+        })
+    })
+
+    describe('getLeftContext', function () {
+        it('Should return expected left context', function () {
+            const editor = createMockTextEditor('import math\ndef two_sum(nums, target):\n', 'test.py', 'python', 1, 17)
+            const actual = EditorContext.getLeftContext(editor, 1)
+            const expected = '...wo_sum(nums, target)'
+            assert.strictEqual(actual, expected)
+        })
+    })
+
+    describe('buildListRecommendationRequest', function () {
+        it('Should return expected fields for optOut, nextToken and reference config', async function () {
+            const nextToken = 'testToken'
+            const optOutPreference = false
+            await globals.telemetry.setTelemetryEnabled(false)
+            const editor = createMockTextEditor('import math\ndef two_sum(nums, target):\n', 'test.py', 'python', 1, 17)
+            const actual = await EditorContext.buildListRecommendationRequest(editor, nextToken, optOutPreference)
+
+            assert.strictEqual(actual.request.nextToken, nextToken)
+            assert.strictEqual((actual.request as GenerateCompletionsRequest).optOutPreference, 'OPTOUT')
+            assert.strictEqual(actual.request.referenceTrackerConfiguration?.recommendationsWithReferences, 'BLOCK')
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/util/globalStateUtil.test.ts b/packages/amazonq/test/unit/codewhisperer/util/globalStateUtil.test.ts
new file mode 100644
index 00000000000..24062a81b7c
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/util/globalStateUtil.test.ts
@@ -0,0 +1,42 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import { resetCodeWhispererGlobalVariables } from 'aws-core-vscode/test'
+import { getLogger } from 'aws-core-vscode/shared'
+import { resetIntelliSenseState, vsCodeState } from 'aws-core-vscode/codewhisperer'
+
+describe('globalStateUtil', function () {
+    let loggerSpy: sinon.SinonSpy
+
+    beforeEach(async function () {
+        await resetCodeWhispererGlobalVariables()
+        vsCodeState.isIntelliSenseActive = true
+        loggerSpy = sinon.spy(getLogger(), 'info')
+    })
+
+    this.afterEach(function () {
+        sinon.restore()
+    })
+
+    it('Should skip when CodeWhisperer is turned off', async function () {
+        const isManualTriggerEnabled = false
+        const isAutomatedTriggerEnabled = false
+        resetIntelliSenseState(isManualTriggerEnabled, isAutomatedTriggerEnabled, true)
+        assert.ok(!loggerSpy.called)
+    })
+
+    it('Should skip when invocationContext is not active', async function () {
+        vsCodeState.isIntelliSenseActive = false
+        resetIntelliSenseState(false, false, true)
+        assert.ok(!loggerSpy.called)
+    })
+
+    it('Should skip when no valid recommendations', async function () {
+        resetIntelliSenseState(true, true, false)
+        assert.ok(!loggerSpy.called)
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/util/importAdderUtil.test.ts b/packages/amazonq/test/unit/codewhisperer/util/importAdderUtil.test.ts
new file mode 100644
index 00000000000..9c04b75ba1b
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/util/importAdderUtil.test.ts
@@ -0,0 +1,168 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import {
+    findLineToInsertImportStatement,
+    findLineOfFirstCode,
+    findLineOfLastImportStatement,
+} from 'aws-core-vscode/codewhisperer'
+import { createMockTextEditor } from 'aws-core-vscode/test'
+
+describe('importAdderUtil', function () {
+    describe('findLineToInsertImportStatement', async function () {
+        it('Should return last line of import statement before recommendation if there is any import statement', function () {
+            const mockEditor = createMockTextEditor(
+                `
+            import numpy as np
+            from a import b
+            a = 10
+            b = 20
+            import lambda as x
+            `,
+                'test.py',
+                'python'
+            )
+            const actual = findLineToInsertImportStatement(mockEditor, 3)
+            assert.strictEqual(actual, 3)
+        })
+        it('Should return first line of code if there is no import statement before recommendation', function () {
+            const mockEditor = createMockTextEditor(
+                `
+            a = 10
+            b = 100
+            from c import b as z
+            `,
+                'test.py',
+                'python'
+            )
+            const actual = findLineToInsertImportStatement(mockEditor, 1)
+            assert.strictEqual(actual, 1)
+        })
+
+        it('Should skip license in java', function () {
+            const mockEditor = createMockTextEditor(
+                `/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0 
+ */
+
+                package aws.com;
+                public void main() {
+
+                }
+                `,
+                'test.java',
+                'java'
+            )
+            const actual = findLineToInsertImportStatement(mockEditor, 7)
+            assert.strictEqual(actual, 6)
+        })
+    })
+
+    describe('findLineOfFirstCode', async function () {
+        it('Should return 0 if file is empty', function () {
+            const mockEditor = createMockTextEditor(
+                `
+            
+            `,
+                'test.py',
+                'python'
+            )
+            const actual = findLineOfFirstCode(mockEditor, 0)
+            assert.strictEqual(actual, 0)
+        })
+        it('Should return first line after comments and use strict in JS ', function () {
+            const mockEditor = createMockTextEditor(
+                `
+            // This is a auto generated document
+            //  
+            // 
+            //
+            'use strict';
+            console.log('Hellow')
+            `,
+                'test.js',
+                'javascript'
+            )
+            const actual = findLineOfFirstCode(mockEditor, 6)
+            assert.strictEqual(actual, 6)
+        })
+        it('Should return one line after package statement in java ', function () {
+            const mockEditor = createMockTextEditor(
+                `
+            // This is a auto generated document
+            package com.aws.example;
+            public class Main {
+                public void static main(String[] args){
+
+                }
+            }
+            `,
+                'test.java',
+                'java'
+            )
+            const actual = findLineOfFirstCode(mockEditor, 4)
+            assert.strictEqual(actual, 3)
+        })
+
+        it('Should skip docstring in javascript', function () {
+            const mockEditor = createMockTextEditor(
+                `/*!
+ * DOC STRING
+ */
+                console.log('hello');
+                const a = 10;
+                `,
+                'test.js',
+                'javascript'
+            )
+            const actual = findLineOfFirstCode(mockEditor, 5)
+            assert.strictEqual(actual, 3)
+        })
+    })
+
+    describe('findLineOfLastImportStatement', async function () {
+        it('Should return -1 if there is no import statement in python', function () {
+            const mockEditor = createMockTextEditor(`a = 10\nprint('Hello, world!')`, 'python')
+            const actual = findLineOfLastImportStatement(mockEditor, 0)
+            assert.strictEqual(actual, -1)
+        })
+        it('Should return -1 if there is no import statement in java', function () {
+            const mockEditor = createMockTextEditor(
+                `public class Main {
+                int x = 5;
+                public static void main() {
+
+                }
+              }
+              `,
+                'test.java',
+                'java'
+            )
+            const actual = findLineOfLastImportStatement(mockEditor, 0)
+            assert.strictEqual(actual, -1)
+        })
+        it('Should return -1 if there is no import statement in js', function () {
+            const mockEditor = createMockTextEditor(`console.log('Hello World');`, 'test.js', 'javascript')
+            const actual = findLineOfLastImportStatement(mockEditor, 0)
+            assert.strictEqual(actual, -1)
+        })
+
+        it('Should return 4 if there is import at line 3', function () {
+            const mockEditor = createMockTextEditor(
+                `
+            import pandas
+            import numpy as np
+            from numpy import *
+            print('Hello, world!')`,
+                'test.py',
+                'python'
+            )
+            const actual = findLineOfLastImportStatement(mockEditor, 4)
+            assert.strictEqual(actual, 4)
+        })
+    })
+})
diff --git a/src/test/codewhisperer/util/licenseUtil.test.ts b/packages/amazonq/test/unit/codewhisperer/util/licenseUtil.test.ts
similarity index 82%
rename from src/test/codewhisperer/util/licenseUtil.test.ts
rename to packages/amazonq/test/unit/codewhisperer/util/licenseUtil.test.ts
index d4c005232eb..95b8c705b16 100644
--- a/src/test/codewhisperer/util/licenseUtil.test.ts
+++ b/packages/amazonq/test/unit/codewhisperer/util/licenseUtil.test.ts
@@ -1,10 +1,10 @@
 /*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
-import { LicenseUtil } from '../../../codewhisperer/util/licenseUtil'
+import assert from 'assert'
+import { LicenseUtil } from 'aws-core-vscode/codewhisperer'
 
 describe('licenseUtil', function () {
     describe('getLicenseHtml', async function () {
diff --git a/packages/amazonq/test/unit/codewhisperer/util/runtimeLanguageContext.test.ts b/packages/amazonq/test/unit/codewhisperer/util/runtimeLanguageContext.test.ts
new file mode 100644
index 00000000000..9d2dbf7954d
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/util/runtimeLanguageContext.test.ts
@@ -0,0 +1,449 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { resetCodeWhispererGlobalVariables, TestFolder, toTextDocument } from 'aws-core-vscode/test'
+import { runtimeLanguageContext, RuntimeLanguageContext, PlatformLanguageId } from 'aws-core-vscode/codewhisperer'
+import * as codewhispererClient from 'aws-core-vscode/codewhisperer'
+import { CodewhispererLanguage } from 'aws-core-vscode/shared'
+
+describe('runtimeLanguageContext', function () {
+    const languageContext = new RuntimeLanguageContext()
+    let tempFolder: TestFolder
+
+    before(async function () {
+        tempFolder = await TestFolder.create()
+    })
+
+    describe('test isLanguageSupported', function () {
+        const cases: [string, boolean][] = [
+            ['java', true],
+            ['javascript', true],
+            ['typescript', true],
+            ['jsx', true],
+            ['javascriptreact', true],
+            ['typescriptreact', true],
+            ['tsx', true],
+            ['csharp', true],
+            ['python', true],
+            ['c', true],
+            ['cpp', true],
+            ['go', true],
+            ['kotlin', true],
+            ['php', true],
+            ['ruby', true],
+            ['rust', true],
+            ['scala', true],
+            ['shellscript', true],
+            ['sql', true],
+            ['json', true],
+            ['yaml', true],
+            ['tf', true],
+            ['dart', true],
+            ['lua', true],
+            ['powershell', true],
+            ['r', true],
+            ['swift', true],
+            ['systemVerilog', true],
+            ['vue', true],
+            ['plaintext', false],
+            ['html', false],
+            ['vb', false],
+        ]
+
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+        })
+
+        for (const tuple of cases) {
+            const languageId = tuple[0]
+            const expected = tuple[1]
+
+            it(`should ${expected ? '' : 'not'} support ${languageId}`, function () {
+                const actual = languageContext.isLanguageSupported(languageId)
+                assert.strictEqual(actual, expected)
+            })
+        }
+
+        describe('test isLanguageSupported with document as the argument', function () {
+            const cases: [string, boolean][] = [
+                ['helloJava.java', true],
+                ['helloPython.py', true],
+                ['helloJavascript.js', true],
+                ['helloJsx.jsx', true],
+                ['helloTypescript.ts', true],
+                ['helloTsx.tsx', true],
+                ['helloCsharp.cs', true],
+                ['helloC.c', true],
+                ['helloC.h', true],
+                ['helloCpp.cpp', true],
+                ['helloCpp.cc', true],
+                ['helloGo.go', true],
+                ['helloKotlin.kt', true],
+                ['helloPhp.php', true],
+                ['helloRuby.rb', true],
+                ['helloRust.rs', true],
+                ['helloScala.scala', true],
+                ['helloShellscript.sh', true],
+                ['helloSql.sql', true],
+                ['helloSystemVerilog.svh', true],
+                ['helloSystemVerilog.sv', true],
+                ['helloSystemVerilog.vh', true],
+                ['helloDart.dart', true],
+                ['helloLua.lua', true],
+                ['helloLua.wlua', true],
+                ['helloSwift.swift', true],
+                ['helloVue.vue', true],
+                ['helloPowerShell.ps1', true],
+                ['helloPowerShell.psm1', true],
+                ['helloR.r', true],
+                ['helloJson.json', true],
+                ['helloYaml.yaml', true],
+                ['helloYaml.yml', true],
+                ['helloTf.tf', true],
+                ['helloPlaintext.txt', false],
+                ['helloHtml.html', false],
+                ['helloCss.css', false],
+                ['helloUnknown', false],
+                ['helloFoo.foo', false],
+            ]
+            for (const tuple of cases) {
+                const fileName = tuple[0]
+                const expected = tuple[1]
+
+                it(`pass document ${fileName} as argument should first try determine by languageId then file extensions`, async function () {
+                    const doc = await toTextDocument('', fileName, tempFolder.path)
+                    const actual = languageContext.isLanguageSupported(doc)
+                    assert.strictEqual(actual, expected)
+                })
+            }
+        })
+    })
+
+    describe('test getLanguageContext', function () {
+        const cases = [
+            ['java', 'java'],
+            ['python', 'python'],
+            ['javascript', 'javascript'],
+            ['typescript', 'typescript'],
+            ['javascriptreact', 'jsx'],
+            ['typescriptreact', 'tsx'],
+            ['csharp', 'csharp'],
+            ['c', 'c'],
+            ['cpp', 'cpp'],
+            ['go', 'go'],
+            ['kotlin', 'kotlin'],
+            ['php', 'php'],
+            ['powershell', 'powershell'],
+            ['ruby', 'ruby'],
+            ['rust', 'rust'],
+            ['scala', 'scala'],
+            ['shellscript', 'shell'],
+            ['sql', 'sql'],
+            ['r', 'r'],
+            ['swift', 'swift'],
+            ['lua', 'lua'],
+            ['vue', 'vue'],
+            ['plaintext', 'plaintext'],
+            ['html', 'plaintext'],
+            ['vb', 'plaintext'],
+            [undefined, 'plaintext'],
+        ]
+
+        for (const tuple of cases) {
+            const vscLanguageId = tuple[0]
+            const expectedCwsprLanguageId = tuple[1]
+            it(`given vscLanguage ${vscLanguageId} should return ${expectedCwsprLanguageId}`, function () {
+                const result = runtimeLanguageContext.getLanguageContext(vscLanguageId)
+                assert.strictEqual(result.language as string, expectedCwsprLanguageId)
+            })
+        }
+    })
+
+    describe('normalizeLanguage', function () {
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+        })
+
+        const codewhispererLanguageIds: CodewhispererLanguage[] = [
+            'c',
+            'cpp',
+            'csharp',
+            'go',
+            'java',
+            'javascript',
+            'jsx',
+            'kotlin',
+            'php',
+            'python',
+            'ruby',
+            'rust',
+            'scala',
+            'sql',
+            'shell',
+            'tsx',
+            'typescript',
+        ]
+
+        for (const inputCwsprLanguageId of codewhispererLanguageIds) {
+            it(`should return itself if input language is codewhispererLanguageId - ${inputCwsprLanguageId}`, function () {
+                const actual = languageContext.normalizeLanguage(inputCwsprLanguageId)
+                assert.strictEqual(actual, inputCwsprLanguageId)
+            })
+        }
+
+        const platformLanguageIds: [PlatformLanguageId, CodewhispererLanguage][] = [
+            ['cpp', 'cpp'],
+            ['c_cpp', 'cpp'],
+            ['cpp', 'cpp'],
+            ['csharp', 'csharp'],
+            ['go', 'go'],
+            ['golang', 'go'],
+            ['java', 'java'],
+            ['javascript', 'javascript'],
+            ['javascriptreact', 'jsx'],
+            ['kotlin', 'kotlin'],
+            ['php', 'php'],
+            ['python', 'python'],
+            ['ruby', 'ruby'],
+            ['rust', 'rust'],
+            ['scala', 'scala'],
+            ['sh', 'shell'],
+            ['shellscript', 'shell'],
+            ['sql', 'sql'],
+            ['typescript', 'typescript'],
+            ['typescriptreact', 'tsx'],
+        ]
+
+        for (const [platformLanguageId, expectedCwsprLanguageId] of platformLanguageIds) {
+            it(`should return mapped codewhispererLanguageId ${expectedCwsprLanguageId} if input language is platformLanguageId - ${platformLanguageId}`, function () {
+                const actual = languageContext.normalizeLanguage(platformLanguageId)
+                assert.strictEqual(actual, expectedCwsprLanguageId)
+            })
+        }
+
+        const arbitraryIds: [string | undefined, CodewhispererLanguage | undefined][] = [
+            [undefined, undefined],
+            ['r', undefined],
+            ['fooo', undefined],
+            ['bar', undefined],
+        ]
+
+        for (const [arbitraryId, _] of arbitraryIds) {
+            it(`should return undefined if languageId is undefined or not neither is type of codewhispererLanguageId or platformLanguageId - ${arbitraryId}`, function () {
+                const actual = languageContext.normalizeLanguage(undefined)
+                assert.strictEqual(actual, undefined)
+            })
+        }
+    })
+
+    describe('toRuntimeLanguage', function () {
+        const codewhispererLanguageIds: [CodewhispererLanguage, string][] = [
+            ['c', 'c'],
+            ['cpp', 'cpp'],
+            ['csharp', 'csharp'],
+            ['go', 'go'],
+            ['java', 'java'],
+            ['javascript', 'javascript'],
+            ['jsx', 'javascript'],
+            ['kotlin', 'kotlin'],
+            ['php', 'php'],
+            ['plaintext', 'plaintext'],
+            ['python', 'python'],
+            ['ruby', 'ruby'],
+            ['rust', 'rust'],
+            ['scala', 'scala'],
+            ['shell', 'shell'],
+            ['sql', 'sql'],
+            ['tsx', 'typescript'],
+            ['typescript', 'typescript'],
+            ['dart', 'dart'],
+            ['lua', 'lua'],
+            ['powershell', 'powershell'],
+            ['r', 'r'],
+            ['swift', 'swift'],
+            ['systemVerilog', 'systemverilog'],
+            ['vue', 'vue'],
+        ]
+
+        for (const [inputCwsprLanguageId, expectedCwsprLanguageId] of codewhispererLanguageIds) {
+            it(`should return ${expectedCwsprLanguageId} if input codewhispererLanguageId is - ${inputCwsprLanguageId}`, function () {
+                const actual = languageContext.toRuntimeLanguage(inputCwsprLanguageId)
+                assert.strictEqual(actual, expectedCwsprLanguageId)
+            })
+        }
+    })
+
+    describe('getLanguageExtensionForNotebook', function () {
+        const codewhispererLanguageIds: [CodewhispererLanguage, string][] = [
+            ['c', 'c'],
+            ['cpp', 'cpp'],
+            ['csharp', 'cs'],
+            ['go', 'go'],
+            ['java', 'java'],
+            ['javascript', 'js'],
+            ['jsx', 'jsx'],
+            ['kotlin', 'kt'],
+            ['php', 'php'],
+            ['python', 'py'],
+            ['ruby', 'rb'],
+            ['rust', 'rs'],
+            ['scala', 'scala'],
+            ['shell', 'sh'],
+            ['sql', 'sql'],
+            ['tsx', 'tsx'],
+            ['typescript', 'ts'],
+        ]
+
+        for (const [inputCwsprLanguageId, expectedExt] of codewhispererLanguageIds) {
+            it(`should return file extension ${expectedExt} given codewhipsererLanguageId - ${inputCwsprLanguageId}`, function () {
+                const actual = languageContext.getLanguageExtensionForNotebook(inputCwsprLanguageId)
+                assert.strictEqual(actual, expectedExt)
+            })
+        }
+
+        const platformLanguageIds: [PlatformLanguageId, string][] = [
+            ['c_cpp', 'cpp'],
+            ['cpp', 'cpp'],
+            ['golang', 'go'],
+            ['javascriptreact', 'jsx'],
+            ['sh', 'sh'],
+            ['shellscript', 'sh'],
+            ['sql', 'sql'],
+            ['typescriptreact', 'tsx'],
+        ]
+
+        for (const [inputPlatformLanguageId, expectedExt] of platformLanguageIds) {
+            it(`should return file extension ${expectedExt} given platformLanguageId - ${inputPlatformLanguageId}`, function () {
+                const actual = languageContext.getLanguageExtensionForNotebook(inputPlatformLanguageId)
+                assert.strictEqual(actual, expectedExt)
+            })
+        }
+
+        const arbitraryStrs: (string | undefined)[] = ['foo', undefined, 'bar', 'unknown']
+        for (const inputStr of arbitraryStrs) {
+            it(`should return undefined when input str is ${inputStr}`, function () {
+                const actual = languageContext.getLanguageExtensionForNotebook(inputStr)
+                assert.strictEqual(actual, undefined)
+            })
+        }
+    })
+
+    describe('getSingleLineCommentPrefix', function () {
+        it('should return the correct comment prefix for supported languages', function () {
+            assert.strictEqual(languageContext.getSingleLineCommentPrefix('java'), '// ')
+            assert.strictEqual(languageContext.getSingleLineCommentPrefix('javascript'), '// ')
+            assert.strictEqual(languageContext.getSingleLineCommentPrefix('jsonc'), '// ')
+            assert.strictEqual(languageContext.getSingleLineCommentPrefix('kotlin'), '// ')
+            assert.strictEqual(languageContext.getSingleLineCommentPrefix('lua'), '-- ')
+            assert.strictEqual(languageContext.getSingleLineCommentPrefix('python'), '# ')
+            assert.strictEqual(languageContext.getSingleLineCommentPrefix('ruby'), '# ')
+            assert.strictEqual(languageContext.getSingleLineCommentPrefix('sql'), '-- ')
+            assert.strictEqual(languageContext.getSingleLineCommentPrefix('tf'), '# ')
+            assert.strictEqual(languageContext.getSingleLineCommentPrefix('typescript'), '// ')
+            assert.strictEqual(languageContext.getSingleLineCommentPrefix('vue'), '')
+            assert.strictEqual(languageContext.getSingleLineCommentPrefix('yaml'), '# ')
+        })
+
+        it('should normalize language ID before getting comment prefix', function () {
+            assert.strictEqual(languageContext.getSingleLineCommentPrefix('hcl'), '# ')
+            assert.strictEqual(languageContext.getSingleLineCommentPrefix('javascriptreact'), '// ')
+            assert.strictEqual(languageContext.getSingleLineCommentPrefix('shellscript'), '# ')
+            assert.strictEqual(languageContext.getSingleLineCommentPrefix('typescriptreact'), '// ')
+            assert.strictEqual(languageContext.getSingleLineCommentPrefix('yml'), '# ')
+        })
+
+        it('should return empty string for unsupported languages', function () {
+            assert.strictEqual(languageContext.getSingleLineCommentPrefix('nonexistent'), '')
+            assert.strictEqual(languageContext.getSingleLineCommentPrefix(undefined), '')
+        })
+
+        it('should return empty string for plaintext', function () {
+            assert.strictEqual(languageContext.getSingleLineCommentPrefix('plaintext'), '')
+        })
+    })
+
+    // for now we will only jsx mapped to javascript, tsx mapped to typescript, all other language should remain the same
+    describe('test covertCwsprRequest', function () {
+        const leftFileContent = 'left'
+        const rightFileContent = 'right'
+        const filename = 'test'
+        const cases: [originalLanguage: string, mappedLanguage: string][] = [
+            ['java', 'java'],
+            ['python', 'python'],
+            ['javascript', 'javascript'],
+            ['jsx', 'javascript'],
+            ['typescript', 'typescript'],
+            ['tsx', 'typescript'],
+            ['csharp', 'csharp'],
+            ['c', 'c'],
+            ['cpp', 'cpp'],
+            ['go', 'go'],
+            ['kotlin', 'kotlin'],
+            ['php', 'php'],
+            ['ruby', 'ruby'],
+            ['rust', 'rust'],
+            ['scala', 'scala'],
+            ['shell', 'shell'],
+            ['sql', 'sql'],
+            ['tf', 'tf'],
+            ['hcl', 'tf'],
+            ['json', 'json'],
+            ['yaml', 'yaml'],
+            ['yml', 'yaml'],
+            ['plaintext', 'plaintext'],
+            // ['arbitrary string', 'arbitrary string'],
+        ]
+
+        this.beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+        })
+
+        for (const [originalLanguage, mappedLanguage] of cases) {
+            it(`convert ListRecommendationRequest - ${originalLanguage} should map to ${mappedLanguage}`, function () {
+                const originalRequest: codewhispererClient.ListRecommendationsRequest = {
+                    fileContext: {
+                        leftFileContent: leftFileContent,
+                        rightFileContent: rightFileContent,
+                        filename: filename,
+                        programmingLanguage: { languageName: originalLanguage },
+                    },
+                    maxResults: 1,
+                    nextToken: 'token',
+                }
+                const actual = languageContext.mapToRuntimeLanguage(originalRequest)
+                const expected: codewhispererClient.ListRecommendationsRequest = {
+                    ...originalRequest,
+                    fileContext: {
+                        ...originalRequest.fileContext,
+                        programmingLanguage: { languageName: mappedLanguage },
+                    },
+                }
+                assert.deepStrictEqual(actual, expected)
+            })
+
+            it(`convert GenerateRecommendationsRequest - ${originalLanguage} should map to ${mappedLanguage}`, function () {
+                const originalRequest: codewhispererClient.GenerateRecommendationsRequest = {
+                    fileContext: {
+                        leftFileContent: leftFileContent,
+                        rightFileContent: rightFileContent,
+                        filename: filename,
+                        programmingLanguage: { languageName: originalLanguage },
+                    },
+                    maxResults: 1,
+                }
+                const actual = languageContext.mapToRuntimeLanguage(originalRequest)
+                const expected: codewhispererClient.GenerateRecommendationsRequest = {
+                    ...originalRequest,
+                    fileContext: {
+                        ...originalRequest.fileContext,
+                        programmingLanguage: { languageName: mappedLanguage },
+                    },
+                }
+                assert.deepStrictEqual(actual, expected)
+            })
+        }
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/util/securityScanLanguageContext.test.ts b/packages/amazonq/test/unit/codewhisperer/util/securityScanLanguageContext.test.ts
new file mode 100644
index 00000000000..e1d2cf91189
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/util/securityScanLanguageContext.test.ts
@@ -0,0 +1,143 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { resetCodeWhispererGlobalVariables } from 'aws-core-vscode/test'
+import { CodewhispererLanguage } from 'aws-core-vscode/shared'
+import { SecurityScanLanguageId, SecurityScanLanguageContext } from 'aws-core-vscode/codewhisperer'
+
+describe('securityScanLanguageContext', function () {
+    const languageContext = new SecurityScanLanguageContext()
+
+    describe('test isLanguageSupported', function () {
+        const cases: [string, boolean][] = [
+            ['java', true],
+            ['javascript', true],
+            ['typescript', true],
+            ['jsx', false],
+            ['javascriptreact', true],
+            ['typescriptreact', true],
+            ['tsx', false],
+            ['csharp', true],
+            ['python', true],
+            ['c', true],
+            ['cpp', true],
+            ['go', true],
+            ['kotlin', true],
+            ['php', true],
+            ['ruby', true],
+            ['rust', false],
+            ['scala', true],
+            ['shellscript', true],
+            ['sql', false],
+            ['json', true],
+            ['yaml', true],
+            ['tf', true],
+            ['plaintext', false],
+            ['html', false],
+            ['r', false],
+            ['vb', false],
+            ['xml', false],
+            ['toml', false],
+            ['pip-requirements', false],
+            ['java-properties', false],
+            ['go.mod', false],
+            ['go.sum', false],
+        ]
+
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+        })
+
+        for (const tuple of cases) {
+            const languageId = tuple[0]
+            const expected = tuple[1]
+
+            it(`should ${expected ? '' : 'not'} support ${languageId}`, function () {
+                const actual = languageContext.isLanguageSupported(languageId)
+                assert.strictEqual(actual, expected)
+            })
+        }
+    })
+
+    describe('normalizeLanguage', function () {
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+        })
+
+        const codewhispererLanguageIds: CodewhispererLanguage[] = [
+            'java',
+            'python',
+            'javascript',
+            'typescript',
+            'csharp',
+            'go',
+            'ruby',
+            'json',
+            'yaml',
+            'tf',
+            'plaintext',
+        ]
+
+        for (const inputCwsprLanguageId of codewhispererLanguageIds) {
+            it(`should return itself if input language is codewhispererLanguageId - ${inputCwsprLanguageId}`, function () {
+                const actual = languageContext.normalizeLanguage(inputCwsprLanguageId)
+                assert.strictEqual(actual, inputCwsprLanguageId)
+            })
+        }
+
+        const securityScanLanguageIds: [SecurityScanLanguageId, CodewhispererLanguage][] = [
+            ['java', 'java'],
+            ['python', 'python'],
+            ['javascript', 'javascript'],
+            ['javascriptreact', 'javascript'],
+            ['typescript', 'typescript'],
+            ['typescriptreact', 'typescript'],
+            ['csharp', 'csharp'],
+            ['go', 'go'],
+            ['ruby', 'ruby'],
+            ['golang', 'go'],
+            ['json', 'json'],
+            ['yaml', 'yaml'],
+            ['tf', 'tf'],
+            ['hcl', 'tf'],
+            ['terraform', 'tf'],
+            ['terragrunt', 'tf'],
+            ['packer', 'tf'],
+            ['plaintext', 'plaintext'],
+            ['jsonc', 'json'],
+            ['xml', 'plaintext'],
+            ['toml', 'plaintext'],
+            ['pip-requirements', 'plaintext'],
+            ['java-properties', 'plaintext'],
+            ['go.mod', 'plaintext'],
+            ['go.sum', 'plaintext'],
+            ['kotlin', 'kotlin'],
+            ['scala', 'scala'],
+            ['shellscript', 'shell'],
+        ]
+
+        for (const [securityScanLanguageId, expectedCwsprLanguageId] of securityScanLanguageIds) {
+            it(`should return mapped codewhispererLanguageId ${expectedCwsprLanguageId} if input language is securityScanLanguageId - ${securityScanLanguageId}`, function () {
+                const actual = languageContext.normalizeLanguage(securityScanLanguageId)
+                assert.strictEqual(actual, expectedCwsprLanguageId)
+            })
+        }
+
+        const arbitraryIds: [string | undefined, CodewhispererLanguage | undefined][] = [
+            [undefined, undefined],
+            ['r', undefined],
+            ['fooo', undefined],
+            ['bar', undefined],
+        ]
+
+        for (const [arbitraryId, _] of arbitraryIds) {
+            it(`should return undefined if languageId is undefined or not neither is type of codewhispererLanguageId or securityScanLanguageId - ${arbitraryId}`, function () {
+                const actual = languageContext.normalizeLanguage(undefined)
+                assert.strictEqual(actual, undefined)
+            })
+        }
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/util/showSsoPrompt.test.ts b/packages/amazonq/test/unit/codewhisperer/util/showSsoPrompt.test.ts
new file mode 100644
index 00000000000..7d004e8ede5
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/util/showSsoPrompt.test.ts
@@ -0,0 +1,46 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import assert from 'assert'
+import * as sinon from 'sinon'
+import { resetCodeWhispererGlobalVariables } from 'aws-core-vscode/test'
+import { assertTelemetryCurried, getTestWindow, getTestLogger } from 'aws-core-vscode/test'
+import { AuthUtil, awsIdSignIn, showCodeWhispererConnectionPrompt } from 'aws-core-vscode/codewhisperer'
+
+describe('showConnectionPrompt', function () {
+    beforeEach(async function () {
+        await resetCodeWhispererGlobalVariables()
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    it('can select connect to AwsBuilderId', async function () {
+        const authUtilSpy = sinon.stub(AuthUtil.instance, 'connectToAwsBuilderId')
+
+        getTestWindow().onDidShowQuickPick(async (picker) => {
+            await picker.untilReady()
+            picker.acceptItem(picker.items[0])
+        })
+
+        await showCodeWhispererConnectionPrompt()
+
+        assert.ok(authUtilSpy.called)
+        const assertTelemetry = assertTelemetryCurried('ui_click')
+        assertTelemetry({ elementId: 'connection_optionBuilderID' })
+    })
+
+    it('connectToAwsBuilderId logs that AWS ID sign in was selected', async function () {
+        sinon.stub(AuthUtil.instance, 'connectToAwsBuilderId').resolves()
+        sinon.stub(vscode.commands, 'executeCommand')
+
+        await awsIdSignIn()
+
+        const loggedEntries = getTestLogger().getLoggedEntries()
+        assert.ok(loggedEntries.find((entry) => entry === 'selected AWS ID sign in'))
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/util/supplemetalContextUtil.test.ts b/packages/amazonq/test/unit/codewhisperer/util/supplemetalContextUtil.test.ts
new file mode 100644
index 00000000000..cf2fd151262
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/util/supplemetalContextUtil.test.ts
@@ -0,0 +1,254 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as FakeTimers from '@sinonjs/fake-timers'
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import * as os from 'os'
+import * as crossFile from 'aws-core-vscode/codewhisperer'
+import { TestFolder, assertTabCount, installFakeClock } from 'aws-core-vscode/test'
+import { CodeWhispererSupplementalContext, FeatureConfigProvider } from 'aws-core-vscode/codewhisperer'
+import { toTextEditor } from 'aws-core-vscode/test'
+
+const newLine = os.EOL
+
+describe('supplementalContextUtil', function () {
+    let testFolder: TestFolder
+    let clock: FakeTimers.InstalledClock
+
+    const fakeCancellationToken: vscode.CancellationToken = {
+        isCancellationRequested: false,
+        onCancellationRequested: sinon.spy(),
+    }
+
+    before(function () {
+        clock = installFakeClock()
+    })
+
+    after(function () {
+        clock.uninstall()
+    })
+
+    beforeEach(async function () {
+        testFolder = await TestFolder.create()
+        sinon.stub(FeatureConfigProvider.instance, 'getProjectContextGroup').returns('control')
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    describe('fetchSupplementalContext', function () {
+        describe('openTabsContext', function () {
+            it('opentabContext should include chunks if non empty', async function () {
+                await toTextEditor('class Foo', 'Foo.java', testFolder.path, { preview: false })
+                await toTextEditor('class Bar', 'Bar.java', testFolder.path, { preview: false })
+                await toTextEditor('class Baz', 'Baz.java', testFolder.path, { preview: false })
+
+                const editor = await toTextEditor('public class Foo {}', 'Query.java', testFolder.path, {
+                    preview: false,
+                })
+
+                await assertTabCount(4)
+
+                const actual = await crossFile.fetchSupplementalContext(editor, fakeCancellationToken)
+                assert.ok(actual?.supplementalContextItems.length === 3)
+            })
+
+            it('opentabsContext should filter out empty chunks', async function () {
+                // open 3 files as supplemental context candidate files but none of them have contents
+                await toTextEditor('', 'Foo.java', testFolder.path, { preview: false })
+                await toTextEditor('', 'Bar.java', testFolder.path, { preview: false })
+                await toTextEditor('', 'Baz.java', testFolder.path, { preview: false })
+
+                const editor = await toTextEditor('public class Foo {}', 'Query.java', testFolder.path, {
+                    preview: false,
+                })
+
+                await assertTabCount(4)
+
+                const actual = await crossFile.fetchSupplementalContext(editor, fakeCancellationToken)
+                assert.ok(actual?.supplementalContextItems.length === 0)
+            })
+        })
+    })
+
+    describe('truncation', function () {
+        it('truncate context should do nothing if everything fits in constraint', function () {
+            const chunkA: crossFile.CodeWhispererSupplementalContextItem = {
+                content: 'a',
+                filePath: 'a.java',
+                score: 0,
+            }
+            const chunkB: crossFile.CodeWhispererSupplementalContextItem = {
+                content: 'b',
+                filePath: 'b.java',
+                score: 1,
+            }
+            const chunks = [chunkA, chunkB]
+
+            const supplementalContext: CodeWhispererSupplementalContext = {
+                isUtg: false,
+                isProcessTimeout: false,
+                supplementalContextItems: chunks,
+                contentsLength: 25000,
+                latency: 0,
+                strategy: 'codemap',
+            }
+
+            const actual = crossFile.truncateSuppelementalContext(supplementalContext)
+            assert.strictEqual(actual.supplementalContextItems.length, 2)
+            assert.strictEqual(actual.supplementalContextItems[0].content, 'a')
+            assert.strictEqual(actual.supplementalContextItems[1].content, 'b')
+        })
+
+        it('truncateLineByLine should drop the last line if max length is greater than threshold', function () {
+            const input =
+                repeatString('a', 11) +
+                newLine +
+                repeatString('b', 11) +
+                newLine +
+                repeatString('c', 11) +
+                newLine +
+                repeatString('d', 11) +
+                newLine +
+                repeatString('e', 11)
+
+            assert.ok(input.length > 50)
+            const actual = crossFile.truncateLineByLine(input, 50)
+            assert.ok(actual.length <= 50)
+
+            const input2 = repeatString(`b${newLine}`, 10)
+            const actual2 = crossFile.truncateLineByLine(input2, 8)
+            assert.ok(actual2.length <= 8)
+        })
+
+        it('truncation context should make context length per item lte 10240 cap', function () {
+            const chunkA: crossFile.CodeWhispererSupplementalContextItem = {
+                content: repeatString(`a${newLine}`, 4000),
+                filePath: 'a.java',
+                score: 0,
+            }
+            const chunkB: crossFile.CodeWhispererSupplementalContextItem = {
+                content: repeatString(`b${newLine}`, 6000),
+                filePath: 'b.java',
+                score: 1,
+            }
+            const chunkC: crossFile.CodeWhispererSupplementalContextItem = {
+                content: repeatString(`c${newLine}`, 1000),
+                filePath: 'c.java',
+                score: 2,
+            }
+            const chunkD: crossFile.CodeWhispererSupplementalContextItem = {
+                content: repeatString(`d${newLine}`, 1500),
+                filePath: 'd.java',
+                score: 3,
+            }
+
+            assert.ok(
+                chunkA.content.length + chunkB.content.length + chunkC.content.length + chunkD.content.length > 20480
+            )
+
+            const supplementalContext: CodeWhispererSupplementalContext = {
+                isUtg: false,
+                isProcessTimeout: false,
+                supplementalContextItems: [chunkA, chunkB, chunkC, chunkD],
+                contentsLength: 25000,
+                latency: 0,
+                strategy: 'codemap',
+            }
+
+            const actual = crossFile.truncateSuppelementalContext(supplementalContext)
+            assert.strictEqual(actual.supplementalContextItems.length, 3)
+            assert.ok(actual.contentsLength <= 20480)
+            assert.strictEqual(actual.strategy, 'codemap')
+        })
+
+        it('truncate context should make context items lte 5', function () {
+            const chunkA: crossFile.CodeWhispererSupplementalContextItem = {
+                content: 'a',
+                filePath: 'a.java',
+                score: 0,
+            }
+            const chunkB: crossFile.CodeWhispererSupplementalContextItem = {
+                content: 'b',
+                filePath: 'b.java',
+                score: 1,
+            }
+            const chunkC: crossFile.CodeWhispererSupplementalContextItem = {
+                content: 'c',
+                filePath: 'c.java',
+                score: 2,
+            }
+            const chunkD: crossFile.CodeWhispererSupplementalContextItem = {
+                content: 'd',
+                filePath: 'd.java',
+                score: 3,
+            }
+            const chunkE: crossFile.CodeWhispererSupplementalContextItem = {
+                content: 'e',
+                filePath: 'e.java',
+                score: 4,
+            }
+            const chunkF: crossFile.CodeWhispererSupplementalContextItem = {
+                content: 'f',
+                filePath: 'f.java',
+                score: 5,
+            }
+            const chunkG: crossFile.CodeWhispererSupplementalContextItem = {
+                content: 'g',
+                filePath: 'g.java',
+                score: 6,
+            }
+            const chunks = [chunkA, chunkB, chunkC, chunkD, chunkE, chunkF, chunkG]
+
+            assert.strictEqual(chunks.length, 7)
+
+            const supplementalContext: CodeWhispererSupplementalContext = {
+                isUtg: false,
+                isProcessTimeout: false,
+                supplementalContextItems: chunks,
+                contentsLength: 25000,
+                latency: 0,
+                strategy: 'codemap',
+            }
+
+            const actual = crossFile.truncateSuppelementalContext(supplementalContext)
+            assert.strictEqual(actual.supplementalContextItems.length, 5)
+        })
+
+        describe('truncate line by line', function () {
+            it('should return empty if empty string is provided', function () {
+                const input = ''
+                const actual = crossFile.truncateLineByLine(input, 50)
+                assert.strictEqual(actual, '')
+            })
+
+            it('should return empty if 0 max length is provided', function () {
+                const input = 'aaaaa'
+                const actual = crossFile.truncateLineByLine(input, 0)
+                assert.strictEqual(actual, '')
+            })
+
+            it('should flip the value if negative max length is provided', function () {
+                const input = `aaaaa${newLine}bbbbb`
+                const actual = crossFile.truncateLineByLine(input, -6)
+                const expected = crossFile.truncateLineByLine(input, 6)
+                assert.strictEqual(actual, expected)
+                assert.strictEqual(actual, 'aaaaa')
+            })
+        })
+    })
+})
+
+function repeatString(s: string, n: number): string {
+    let output = ''
+    for (let i = 0; i < n; i++) {
+        output += s
+    }
+
+    return output
+}
diff --git a/packages/amazonq/test/unit/codewhisperer/util/telemetryHelper.test.ts b/packages/amazonq/test/unit/codewhisperer/util/telemetryHelper.test.ts
new file mode 100644
index 00000000000..9293f637935
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/util/telemetryHelper.test.ts
@@ -0,0 +1,285 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { assertTelemetryCurried, resetCodeWhispererGlobalVariables } from 'aws-core-vscode/test'
+import { TelemetryHelper, Completion, session } from 'aws-core-vscode/codewhisperer'
+import {
+    CodewhispererCompletionType,
+    CodewhispererSuggestionState,
+    CodewhispererUserDecision,
+} from 'aws-core-vscode/shared'
+import sinon from 'sinon'
+
+// TODO: improve and move the following test utils to codewhisperer/testUtils.ts
+function aUserDecision(
+    completionType: CodewhispererCompletionType,
+    codewhispererSuggestionIndex: number,
+    codewhispererSuggestionState: CodewhispererSuggestionState
+): CodewhispererUserDecision {
+    return {
+        codewhispererCompletionType: completionType,
+        codewhispererLanguage: 'python',
+        codewhispererRequestId: 'aFakeRequestId',
+        codewhispererSessionId: 'aFakeSessionId',
+        codewhispererSuggestionIndex: codewhispererSuggestionIndex,
+        codewhispererSuggestionReferenceCount: 0,
+        codewhispererSuggestionState: codewhispererSuggestionState,
+        codewhispererTriggerType: 'OnDemand',
+        credentialStartUrl: 'https://www.amazon.com',
+    }
+}
+
+function aCompletion(): Completion {
+    return {
+        content: 'aFakeContent',
+    }
+}
+
+describe('telemetryHelper', function () {
+    describe('clientComponentLatency', function () {
+        let sut: TelemetryHelper
+
+        beforeEach(function () {
+            sut = new TelemetryHelper()
+        })
+
+        afterEach(function () {
+            sinon.restore()
+        })
+
+        it('resetClientComponentLatencyTime should reset state variables', function () {
+            session.invokeSuggestionStartTime = 100
+            session.preprocessEndTime = 200
+            session.sdkApiCallStartTime = 300
+            session.fetchCredentialStartTime = 400
+            session.firstSuggestionShowTime = 500
+
+            sut.setSdkApiCallEndTime()
+            sut.setAllPaginationEndTime()
+            sut.setFirstResponseRequestId('aFakeRequestId')
+
+            sut.resetClientComponentLatencyTime()
+
+            assert.strictEqual(session.invokeSuggestionStartTime, 0)
+            assert.strictEqual(session.preprocessEndTime, 0)
+            assert.strictEqual(session.sdkApiCallStartTime, 0)
+            assert.strictEqual(session.fetchCredentialStartTime, 0)
+            assert.strictEqual(session.firstSuggestionShowTime, 0)
+            assert.strictEqual(sut.sdkApiCallEndTime, 0)
+            assert.strictEqual(sut.allPaginationEndTime, 0)
+            assert.strictEqual(sut.firstResponseRequestId, '')
+        })
+
+        it('setInvocationSuggestionStartTime should call resetClientComponentLatencyTime', function () {
+            const resetStub = sinon.stub(sut, 'resetClientComponentLatencyTime')
+            sut.setInvokeSuggestionStartTime()
+            assert.ok(resetStub.calledOnce)
+        })
+    })
+
+    describe('aggregateUserDecisionByRequest', function () {
+        let sut: TelemetryHelper
+
+        beforeEach(function () {
+            sut = new TelemetryHelper()
+        })
+
+        it('should return Line and Accept', function () {
+            const decisions: CodewhispererUserDecision[] = [
+                aUserDecision('Line', 0, 'Accept'),
+                aUserDecision('Line', 1, 'Discard'),
+                aUserDecision('Block', 2, 'Ignore'),
+                aUserDecision('Block', 3, 'Ignore'),
+            ]
+
+            const actual = sut.aggregateUserDecisionByRequest(decisions, 'aFakeRequestId', 'aFakeSessionId')
+            assert.ok(actual)
+            assert.strictEqual(actual?.codewhispererCompletionType, 'Line')
+            assert.strictEqual(actual?.codewhispererSuggestionState, 'Accept')
+        })
+
+        it('should return Line and Reject', function () {
+            const decisions: CodewhispererUserDecision[] = [
+                aUserDecision('Line', 0, 'Discard'),
+                aUserDecision('Line', 1, 'Reject'),
+                aUserDecision('Line', 2, 'Unseen'),
+                aUserDecision('Line', 3, 'Unseen'),
+            ]
+
+            const actual = sut.aggregateUserDecisionByRequest(decisions, 'aFakeRequestId', 'aFakeSessionId')
+            assert.ok(actual)
+            assert.strictEqual(actual?.codewhispererCompletionType, 'Line')
+            assert.strictEqual(actual?.codewhispererSuggestionState, 'Reject')
+        })
+
+        it('should return Block and Accept', function () {
+            const decisions: CodewhispererUserDecision[] = [
+                aUserDecision('Block', 0, 'Discard'),
+                aUserDecision('Block', 1, 'Accept'),
+                aUserDecision('Block', 2, 'Discard'),
+                aUserDecision('Block', 3, 'Ignore'),
+            ]
+
+            const actual = sut.aggregateUserDecisionByRequest(decisions, 'aFakeRequestId', 'aFakeSessionId')
+            assert.ok(actual)
+            assert.strictEqual(actual?.codewhispererCompletionType, 'Block')
+            assert.strictEqual(actual?.codewhispererSuggestionState, 'Accept')
+        })
+    })
+
+    describe('sendUserTriggerDecisionTelemetry', function () {
+        let sut: TelemetryHelper
+
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+            sut = new TelemetryHelper()
+        })
+
+        it('should return Line and Accept', function () {
+            sut.recordUserDecisionTelemetry(
+                ['aFakeRequestId', 'aFakeRequestId', 'aFakeRequestId2'],
+                'aFakeSessionId',
+                [aCompletion(), aCompletion(), aCompletion(), aCompletion()],
+                0,
+                0,
+                new Map([
+                    [0, 'Line'],
+                    [1, 'Line'],
+                    [2, 'Block'],
+                    [3, 'Block'],
+                ])
+            )
+
+            sut.sendUserTriggerDecisionTelemetry('aFakeSessionId', aCompletion().content, 0)
+            const assertTelemetry = assertTelemetryCurried('codewhisperer_userTriggerDecision')
+            assertTelemetry({
+                codewhispererSessionId: 'aFakeSessionId',
+                codewhispererFirstRequestId: 'aFakeRequestId',
+                codewhispererLanguage: 'python',
+                codewhispererTriggerType: 'OnDemand',
+                codewhispererLineNumber: 0,
+                codewhispererCursorOffset: 0,
+                codewhispererSuggestionCount: 4,
+                codewhispererSuggestionImportCount: 0,
+                codewhispererSuggestionState: 'Accept',
+                codewhispererCompletionType: 'Line',
+                codewhispererTypeaheadLength: 0,
+                codewhispererCharactersAccepted: aCompletion().content.length,
+            })
+        })
+
+        it('should return Line and Accept 2', function () {
+            sut.recordUserDecisionTelemetry(
+                ['aFakeRequestId', 'aFakeRequestId', 'aFakeRequestId2'],
+                'aFakeSessionId',
+                [aCompletion(), aCompletion(), aCompletion(), aCompletion()],
+                3,
+                0,
+                new Map([
+                    [0, 'Line'],
+                    [1, 'Line'],
+                    [2, 'Line'],
+                    [3, 'Line'],
+                ])
+            )
+
+            sut.sendUserTriggerDecisionTelemetry('aFakeSessionId', aCompletion().content, 0)
+            const assertTelemetry = assertTelemetryCurried('codewhisperer_userTriggerDecision')
+            assertTelemetry({
+                codewhispererSessionId: 'aFakeSessionId',
+                codewhispererFirstRequestId: 'aFakeRequestId',
+                codewhispererLanguage: 'python',
+                codewhispererTriggerType: 'OnDemand',
+                codewhispererLineNumber: 0,
+                codewhispererCursorOffset: 0,
+                codewhispererSuggestionCount: 4,
+                codewhispererSuggestionImportCount: 0,
+                codewhispererSuggestionState: 'Accept',
+                codewhispererCompletionType: 'Line',
+                codewhispererTypeaheadLength: 0,
+                codewhispererCharactersAccepted: aCompletion().content.length,
+            })
+        })
+
+        it('should return Line and Reject', function () {
+            sut.recordUserDecisionTelemetry(
+                ['aFakeRequestId', 'aFakeRequestId', 'aFakeRequestId2'],
+                'aFakeSessionId',
+                [aCompletion(), aCompletion(), aCompletion(), aCompletion()],
+                -1,
+                0,
+                new Map([
+                    [0, 'Line'],
+                    [1, 'Line'],
+                    [2, 'Line'],
+                    [3, 'Line'],
+                ])
+            )
+
+            sut.sendUserTriggerDecisionTelemetry('aFakeSessionId', '', 0)
+            const assertTelemetry = assertTelemetryCurried('codewhisperer_userTriggerDecision')
+            assertTelemetry({
+                codewhispererSessionId: 'aFakeSessionId',
+                codewhispererFirstRequestId: 'aFakeRequestId',
+                codewhispererLanguage: 'python',
+                codewhispererTriggerType: 'OnDemand',
+                codewhispererLineNumber: 0,
+                codewhispererCursorOffset: 0,
+                codewhispererSuggestionCount: 4,
+                codewhispererSuggestionImportCount: 0,
+                codewhispererSuggestionState: 'Reject',
+                codewhispererCompletionType: 'Line',
+                codewhispererTypeaheadLength: 0,
+                codewhispererCharactersAccepted: 0,
+            })
+        })
+    })
+
+    describe('getSuggestionState', function () {
+        let telemetryHelper = new TelemetryHelper()
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+            telemetryHelper = new TelemetryHelper()
+        })
+
+        it('user event is discard when recommendation state is Discarded with accept index = -1', function () {
+            const actual = telemetryHelper.getSuggestionState(0, -1, new Map([[0, 'Discard']]))
+            assert.strictEqual(actual, 'Discard')
+        })
+
+        it('user event is reject when recommendation state is Showed with accept index = -1', function () {
+            const actual = telemetryHelper.getSuggestionState(0, -1, new Map([[0, 'Showed']]))
+            assert.strictEqual(actual, 'Reject')
+        })
+
+        it('user event is Accept when recommendation state is Showed with accept index matches', function () {
+            const actual = telemetryHelper.getSuggestionState(0, 0, new Map([[0, 'Showed']]))
+            assert.strictEqual(actual, 'Accept')
+        })
+
+        it('user event is Ignore when recommendation state is Showed with accept index does not match', function () {
+            const actual = telemetryHelper.getSuggestionState(0, 1, new Map([[0, 'Showed']]))
+            assert.strictEqual(actual, 'Ignore')
+        })
+
+        it('user event is Unseen when recommendation state is not Showed, is not Unseen when recommendation is showed', function () {
+            const actual0 = telemetryHelper.getSuggestionState(0, 1, new Map([[1, 'Showed']]))
+            assert.strictEqual(actual0, 'Unseen')
+            const actual1 = telemetryHelper.getSuggestionState(1, 1, new Map([[1, 'Showed']]))
+            assert.strictEqual(actual1, 'Accept')
+        })
+
+        it('user event is Filter when recommendation state is Filter', function () {
+            const actual = telemetryHelper.getSuggestionState(0, 1, new Map([[0, 'Filter']]))
+            assert.strictEqual(actual, 'Filter')
+        })
+
+        it('user event is Empty when recommendation state is Empty', function () {
+            const actual = telemetryHelper.getSuggestionState(0, 1, new Map([[0, 'Empty']]))
+            assert.strictEqual(actual, 'Empty')
+        })
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/util/userGroupUtil.test.ts b/packages/amazonq/test/unit/codewhisperer/util/userGroupUtil.test.ts
new file mode 100644
index 00000000000..cd0d2da4197
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/util/userGroupUtil.test.ts
@@ -0,0 +1,68 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { CodeWhispererUserGroupSettings } from 'aws-core-vscode/codewhisperer'
+import * as CodeWhispererConstants from 'aws-core-vscode/codewhisperer'
+import { globals } from 'aws-core-vscode/shared'
+import { extensionVersion } from 'aws-core-vscode/shared'
+
+describe('getCodeWhispererUserGroup', function () {
+    afterEach(function () {
+        CodeWhispererUserGroupSettings.instance.reset()
+    })
+
+    it('getUserGroup should set the group and version if there is none', async function () {
+        await globals.globalState.update('CODEWHISPERER_USER_GROUP', undefined)
+
+        assert.ok(!globals.globalState.get('CODEWHISPERER_USER_GROUP'))
+
+        assert.ok(CodeWhispererUserGroupSettings.getUserGroup())
+        assert.ok(CodeWhispererUserGroupSettings.instance.version)
+
+        assert.ok(CodeWhispererUserGroupSettings.getUserGroup())
+        assert.ok(CodeWhispererUserGroupSettings.instance.version)
+
+        assert.ok(CodeWhispererUserGroupSettings.getUserGroup())
+        assert.ok(CodeWhispererUserGroupSettings.instance.version)
+    })
+
+    it('should return the same result', async function () {
+        await globals.globalState.update('CODEWHISPERER_USER_GROUP', undefined)
+
+        const group0 = CodeWhispererUserGroupSettings.getUserGroup()
+        const group1 = CodeWhispererUserGroupSettings.getUserGroup()
+        const group2 = CodeWhispererUserGroupSettings.getUserGroup()
+        const group3 = CodeWhispererUserGroupSettings.getUserGroup()
+
+        assert.strictEqual(group0, group1)
+        assert.strictEqual(group1, group2)
+        assert.strictEqual(group2, group3)
+        assert.strictEqual(group3, group0)
+    })
+
+    it('should return result stored in the extension context if the plugin version remains the same', async function () {
+        await globals.globalState.update('CODEWHISPERER_USER_GROUP', {
+            group: CodeWhispererConstants.UserGroup.Control,
+            version: extensionVersion,
+        })
+
+        assert.strictEqual(CodeWhispererUserGroupSettings.getUserGroup(), CodeWhispererConstants.UserGroup.Control)
+
+        // 2nd time should still the same result
+        assert.strictEqual(CodeWhispererUserGroupSettings.getUserGroup(), CodeWhispererConstants.UserGroup.Control)
+    })
+
+    it('should return different result if the plugin version is not the same', async function () {
+        await globals.globalState.update('CODEWHISPERER_USER_GROUP', {
+            group: CodeWhispererConstants.UserGroup.Control,
+            version: 'fake-extension-version',
+        })
+
+        CodeWhispererUserGroupSettings.getUserGroup()
+        assert.strictEqual(CodeWhispererUserGroupSettings.instance.version, extensionVersion)
+        assert.ok(CodeWhispererUserGroupSettings.instance.userGroup)
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/util/utgUtils.test.ts b/packages/amazonq/test/unit/codewhisperer/util/utgUtils.test.ts
new file mode 100644
index 00000000000..67359b8a6fc
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/util/utgUtils.test.ts
@@ -0,0 +1,63 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as utgUtils from 'aws-core-vscode/codewhisperer'
+
+describe('shouldFetchUtgContext', () => {
+    it('fully supported language', function () {
+        assert.ok(utgUtils.shouldFetchUtgContext('java'))
+    })
+
+    it('partially supported language', () => {
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('python'), false)
+    })
+
+    it('not supported language', () => {
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('typescript'), undefined)
+
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('javascript'), undefined)
+
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('javascriptreact'), undefined)
+
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('typescriptreact'), undefined)
+
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('scala'), undefined)
+
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('shellscript'), undefined)
+
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('csharp'), undefined)
+
+        assert.strictEqual(utgUtils.shouldFetchUtgContext('c'), undefined)
+    })
+})
+
+describe('guessSrcFileName', function () {
+    it('should return undefined if no matching regex', function () {
+        assert.strictEqual(utgUtils.guessSrcFileName('Foo.java', 'java'), undefined)
+        assert.strictEqual(utgUtils.guessSrcFileName('folder1/foo.py', 'python'), undefined)
+        assert.strictEqual(utgUtils.guessSrcFileName('Bar.js', 'javascript'), undefined)
+    })
+
+    it('java', function () {
+        assert.strictEqual(utgUtils.guessSrcFileName('FooTest.java', 'java'), 'Foo.java')
+        assert.strictEqual(utgUtils.guessSrcFileName('FooTests.java', 'java'), 'Foo.java')
+    })
+
+    it('python', function () {
+        assert.strictEqual(utgUtils.guessSrcFileName('test_foo.py', 'python'), 'foo.py')
+        assert.strictEqual(utgUtils.guessSrcFileName('foo_test.py', 'python'), 'foo.py')
+    })
+
+    it('typescript', function () {
+        assert.strictEqual(utgUtils.guessSrcFileName('Foo.test.ts', 'typescript'), 'Foo.ts')
+        assert.strictEqual(utgUtils.guessSrcFileName('Foo.spec.ts', 'typescript'), 'Foo.ts')
+    })
+
+    it('javascript', function () {
+        assert.strictEqual(utgUtils.guessSrcFileName('Foo.test.js', 'javascript'), 'Foo.js')
+        assert.strictEqual(utgUtils.guessSrcFileName('Foo.spec.js', 'javascript'), 'Foo.js')
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhisperer/views/securityPanelViewProvider.test.ts b/packages/amazonq/test/unit/codewhisperer/views/securityPanelViewProvider.test.ts
new file mode 100644
index 00000000000..ca163e86208
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhisperer/views/securityPanelViewProvider.test.ts
@@ -0,0 +1,97 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { SecurityPanelViewProvider, AggregatedCodeScanIssue, CodeScanIssue } from 'aws-core-vscode/codewhisperer'
+import { createMockTextEditor, createTextDocumentChangeEvent, FakeExtensionContext } from 'aws-core-vscode/test'
+import { TextEditorDecorationType, Range } from 'vscode'
+
+const codeScanIssue: CodeScanIssue[] = [
+    {
+        startLine: 0,
+        endLine: 4,
+        comment: 'foo',
+        title: 'bar',
+        description: {
+            text: 'foo',
+            markdown: 'foo',
+        },
+        detectorId: '',
+        detectorName: '',
+        findingId: '',
+        relatedVulnerabilities: [],
+        severity: 'low',
+        recommendation: { text: 'foo', url: 'foo' },
+        suggestedFixes: [],
+        visible: true,
+        language: 'python',
+        scanJobId: 'scanJob',
+    },
+]
+
+const aggregatedCodeScanIssue: AggregatedCodeScanIssue[] = [
+    {
+        filePath: '/test.py',
+        issues: codeScanIssue,
+    },
+]
+
+describe('securityPanelViewProvider', function () {
+    let decorationCalled: boolean
+    let editorDecorationType: TextEditorDecorationType | undefined
+    let editorRangesOrOptions: Range[] | undefined
+    let mockEditor: vscode.TextEditor
+    let mockExtensionContext: vscode.ExtensionContext
+    let securityPanelViewProvider: SecurityPanelViewProvider
+
+    function setDecorationsArgs(decorationType: TextEditorDecorationType, rangesOrOptions: Range[]): void {
+        decorationCalled = true
+        editorDecorationType = decorationType
+        editorRangesOrOptions = rangesOrOptions
+    }
+
+    function createEditor() {
+        const editor = createMockTextEditor()
+        editor.setDecorations = setDecorationsArgs
+        return editor
+    }
+
+    beforeEach(async function () {
+        decorationCalled = false
+        editorDecorationType = undefined
+        editorRangesOrOptions = []
+        mockEditor = createEditor()
+        mockExtensionContext = await FakeExtensionContext.create()
+        securityPanelViewProvider = new SecurityPanelViewProvider(mockExtensionContext)
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    it('should add lines to panel and add decorations to editor when adding lines', async function () {
+        securityPanelViewProvider.addLines(aggregatedCodeScanIssue, mockEditor)
+        assert.ok(decorationCalled)
+        assert.strictEqual(editorRangesOrOptions?.length, 1)
+        assert.ok(editorDecorationType?.key !== undefined)
+    })
+
+    it('should dispose security panel item', async function () {
+        const mockEvent: vscode.TextDocumentChangeEvent = createTextDocumentChangeEvent(
+            mockEditor.document,
+            new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 1)),
+            'bar'
+        )
+
+        securityPanelViewProvider.addLines(aggregatedCodeScanIssue, mockEditor)
+        assert.strictEqual(editorRangesOrOptions?.length, 1)
+
+        securityPanelViewProvider.disposeSecurityPanelItem(mockEvent, mockEditor)
+        assert.ok(decorationCalled)
+        assert.strictEqual(editorRangesOrOptions?.length, 0)
+    })
+})
diff --git a/packages/amazonq/test/unit/codewhispererChat/controllers/chat/chatRequest/converter.test.ts b/packages/amazonq/test/unit/codewhispererChat/controllers/chat/chatRequest/converter.test.ts
new file mode 100644
index 00000000000..6bcbd99bc2e
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhispererChat/controllers/chat/chatRequest/converter.test.ts
@@ -0,0 +1,260 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import {
+    ChatTriggerType,
+    filePathSizeLimit,
+    TriggerPayload,
+    triggerPayloadToChatRequest,
+} from 'aws-core-vscode/codewhispererChat'
+
+describe('triggerPayloadToChatRequest', () => {
+    const mockBasicPayload: TriggerPayload = {
+        message: 'test message',
+        filePath: 'test/path.ts',
+        fileText: 'console.log("hello")',
+        fileLanguage: 'typescript',
+        additionalContents: [],
+        relevantTextDocuments: [],
+        useRelevantDocuments: false,
+        customization: { arn: 'test:arn' },
+        trigger: ChatTriggerType.ChatMessage,
+        contextLengths: {
+            truncatedUserInputContextLength: 0,
+            truncatedFocusFileContextLength: 0,
+            truncatedWorkspaceContextLength: 0,
+            truncatedAdditionalContextLengths: {
+                promptContextLength: 0,
+                ruleContextLength: 0,
+                fileContextLength: 0,
+            },
+            additionalContextLengths: {
+                fileContextLength: 0,
+                promptContextLength: 0,
+                ruleContextLength: 0,
+            },
+            workspaceContextLength: 0,
+            userInputContextLength: 0,
+            focusFileContextLength: 0,
+        },
+        profile: undefined,
+        context: [],
+        documentReferences: [],
+        query: undefined,
+        codeSelection: undefined,
+        matchPolicy: undefined,
+        codeQuery: undefined,
+        userIntent: undefined,
+    }
+
+    const createLargeString = (size: number, prefix: string = '') => prefix + 'x'.repeat(size - prefix.length)
+
+    const createPrompt = (size: number) => {
+        return {
+            name: 'prompt',
+            description: 'prompt',
+            relativePath: 'path-prompt',
+            type: 'prompt',
+            innerContext: createLargeString(size, 'prompt-'),
+            startLine: 0,
+            endLine: 100,
+        }
+    }
+
+    const createRule = (size: number) => {
+        return {
+            name: 'rule',
+            description: 'rule',
+            relativePath: 'path-rule',
+            type: 'rule',
+            innerContext: createLargeString(size, 'rule-'),
+            startLine: 0,
+            endLine: 100,
+        }
+    }
+
+    const createFile = (size: number) => {
+        return {
+            name: 'file',
+            description: 'file',
+            relativePath: 'path-file',
+            type: 'file',
+            innerContext: createLargeString(size, 'file-'),
+            startLine: 0,
+            endLine: 100,
+        }
+    }
+
+    const createBaseTriggerPayload = (): TriggerPayload => ({
+        ...mockBasicPayload,
+        message: '',
+        fileText: '',
+        filePath: 'test.ts',
+        fileLanguage: 'typescript',
+        customization: { arn: '' },
+    })
+    it('should convert basic trigger payload to chat request', () => {
+        const result = triggerPayloadToChatRequest(mockBasicPayload)
+
+        assert.notEqual(result, undefined)
+        assert.strictEqual(result.conversationState.currentMessage?.userInputMessage?.content, 'test message')
+        assert.strictEqual(result.conversationState.chatTriggerType, 'MANUAL')
+        assert.strictEqual(result.conversationState.customizationArn, 'test:arn')
+    })
+
+    it('should handle empty file path', () => {
+        const emptyFilePathPayload = {
+            ...mockBasicPayload,
+            filePath: '',
+        }
+
+        const result = triggerPayloadToChatRequest(emptyFilePathPayload)
+
+        assert.strictEqual(
+            result.conversationState.currentMessage?.userInputMessage?.userInputMessageContext?.editorState?.document,
+            undefined
+        )
+    })
+
+    it('should filter out empty additional contents', () => {
+        const payloadWithEmptyContents: TriggerPayload = {
+            ...mockBasicPayload,
+            additionalContents: [
+                {
+                    name: 'prompt1',
+                    description: 'prompt1',
+                    relativePath: 'path1',
+                    type: 'prompt',
+                    innerContext: '',
+                    startLine: 0,
+                    endLine: 100,
+                },
+                {
+                    name: 'prompt2',
+                    description: 'prompt2',
+                    relativePath: 'path2',
+                    type: 'prompt',
+                    innerContext: 'valid content',
+                    startLine: 0,
+                    endLine: 100,
+                },
+            ],
+        }
+
+        const result = triggerPayloadToChatRequest(payloadWithEmptyContents)
+
+        assert.strictEqual(
+            result.conversationState.currentMessage?.userInputMessage?.userInputMessageContext?.additionalContext
+                ?.length,
+            1
+        )
+        assert.strictEqual(
+            result.conversationState.currentMessage?.userInputMessage?.userInputMessageContext.additionalContext?.[0]
+                .innerContext,
+            'valid content'
+        )
+    })
+
+    it('should handle unsupported programming language', () => {
+        const unsupportedLanguagePayload = {
+            ...mockBasicPayload,
+            fileLanguage: 'unsupported',
+        }
+
+        const result = triggerPayloadToChatRequest(unsupportedLanguagePayload)
+
+        assert.strictEqual(
+            result.conversationState.currentMessage?.userInputMessage?.userInputMessageContext?.editorState?.document
+                ?.programmingLanguage,
+            undefined
+        )
+    })
+
+    it('should truncate file path if it exceeds limit', () => {
+        const longFilePath = 'a'.repeat(5000)
+        const longFilePathPayload = {
+            ...mockBasicPayload,
+            filePath: longFilePath,
+        }
+
+        const result = triggerPayloadToChatRequest(longFilePathPayload)
+
+        assert.strictEqual(
+            result.conversationState.currentMessage?.userInputMessage?.userInputMessageContext?.editorState?.document
+                ?.relativeFilePath?.length,
+            filePathSizeLimit
+        )
+    })
+
+    it('should preserve priority order', () => {
+        const before1 = [5000, 30000, 40000, 20000, 15000, 25000] // Total: 135,000
+        const after1 = [5000, 30000, 40000, 20000, 5000, 0] // Total: 100,000
+        checkContextTruncationHelper(before1, after1)
+
+        const before2 = [1000, 2000, 3000, 4000, 5000, 90000] // Total: 105,000
+        const after2 = [1000, 2000, 3000, 4000, 5000, 85000] // Total: 100,000
+        checkContextTruncationHelper(before2, after2)
+
+        const before3 = [10000, 40000, 80000, 30000, 20000, 50000] // Total: 230,000
+        const after3 = [10000, 40000, 50000, 0, 0, 0] // Total: 100,000
+        checkContextTruncationHelper(before3, after3)
+
+        const before4 = [5000, 5000, 150000, 5000, 5000, 5000] // Total: 175,000
+        const after4 = [5000, 5000, 90000, 0, 0, 0] // Total: 100,000
+        checkContextTruncationHelper(before4, after4)
+
+        const before5 = [50000, 80000, 20000, 10000, 10000, 10000] // Total: 180,000
+        const after5 = [50000, 50000, 0, 0, 0, 0] // Total: 100,000
+        checkContextTruncationHelper(before5, after5)
+    })
+
+    function checkContextTruncationHelper(before: number[], after: number[]) {
+        const payload = createBaseTriggerPayload()
+        const [userInputSize, promptSize, currentFileSize, ruleSize, fileSize, workspaceSize] = before
+
+        payload.message = createLargeString(userInputSize, 'userInput-')
+        payload.additionalContents = [createPrompt(promptSize), createRule(ruleSize), createFile(fileSize)]
+        payload.fileText = createLargeString(currentFileSize, 'currentFile-')
+        payload.relevantTextDocuments = [
+            {
+                relativeFilePath: 'workspace.ts',
+                text: createLargeString(workspaceSize, 'workspace-'),
+                startLine: -1,
+                endLine: -1,
+            },
+        ]
+
+        const result = triggerPayloadToChatRequest(payload)
+
+        const userInputLength = result.conversationState.currentMessage?.userInputMessage?.content?.length
+        const promptContext =
+            result.conversationState.currentMessage?.userInputMessage?.userInputMessageContext?.additionalContext?.find(
+                (c) => c.name === 'prompt'
+            )?.innerContext
+        const currentFileLength =
+            result.conversationState.currentMessage?.userInputMessage?.userInputMessageContext?.editorState?.document
+                ?.text?.length
+        const ruleContext =
+            result.conversationState.currentMessage?.userInputMessage?.userInputMessageContext?.additionalContext?.find(
+                (c) => c.name === 'rule'
+            )?.innerContext
+        const fileContext =
+            result.conversationState.currentMessage?.userInputMessage?.userInputMessageContext?.additionalContext?.find(
+                (c) => c.name === 'file'
+            )?.innerContext
+        const workspaceContext =
+            result.conversationState.currentMessage?.userInputMessage?.userInputMessageContext?.editorState
+                ?.relevantDocuments?.[0]?.text
+
+        // Verify priority ordering
+        assert.strictEqual(userInputLength ?? 0, after[0])
+        assert.strictEqual(promptContext?.length ?? 0, after[1])
+        assert.strictEqual(currentFileLength ?? 0, after[2])
+        assert.strictEqual(ruleContext?.length ?? 0, after[3])
+        assert.strictEqual(fileContext?.length ?? 0, after[4])
+        assert.strictEqual(workspaceContext?.length ?? 0, after[5])
+    }
+})
diff --git a/packages/amazonq/test/unit/codewhispererChat/editor/context/focusArea/focusAreaExtractor.test.ts b/packages/amazonq/test/unit/codewhispererChat/editor/context/focusArea/focusAreaExtractor.test.ts
new file mode 100644
index 00000000000..d946a9cd0e9
--- /dev/null
+++ b/packages/amazonq/test/unit/codewhispererChat/editor/context/focusArea/focusAreaExtractor.test.ts
@@ -0,0 +1,464 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { FocusAreaContextExtractor } from 'aws-core-vscode/codewhispererChat'
+import { Range, TextDocument } from 'vscode'
+import { createMockDocument } from 'aws-core-vscode/test'
+
+const checkIfExpectedRangeEqualActualRange = (expectedRange: any, actualRange: Range) => {
+    assert.strictEqual(actualRange.start.line, expectedRange.start.line)
+    assert.strictEqual(actualRange.start.character, expectedRange.start.character)
+    assert.strictEqual(actualRange.end.line, expectedRange.end.line)
+    assert.strictEqual(actualRange.end.character, expectedRange.end.character)
+}
+
+describe('getSelectionInsideExtendedCodeBlock', () => {
+    it('returns undefined if selection start and end are same line and character (it means that selection is empty)', () => {
+        // Stub originSelection and extendedCodeBlockRange
+        const originSelection = {
+            start: {
+                line: 0,
+                character: 0,
+            },
+            end: {
+                line: 0,
+                character: 0,
+            },
+        }
+
+        const extendedCodeBlockRange = {
+            start: {
+                line: 2,
+                character: 0,
+            },
+            end: {
+                line: 3,
+                character: 0,
+            },
+        }
+
+        const focusAreaContextExtractor = new FocusAreaContextExtractor()
+        const method = Reflect.get(focusAreaContextExtractor, 'getSelectionInsideExtendedCodeBlock')
+
+        const result = method.call(focusAreaContextExtractor, originSelection, extendedCodeBlockRange)
+
+        assert.strictEqual(result, undefined)
+    })
+
+    it('returns adjusted selection if selection spans multiple lines', () => {
+        // Stub originSelection and extendedCodeBlockRange
+        const originSelection = {
+            start: {
+                line: 10,
+                character: 5,
+            },
+            end: {
+                line: 20,
+                character: 4,
+            },
+        }
+
+        const extendedCodeBlockRange = {
+            start: {
+                line: 9,
+                character: 0,
+            },
+            end: {
+                line: 25,
+                character: 0,
+            },
+        }
+
+        const focusAreaContextExtractor = new FocusAreaContextExtractor()
+        const method = Reflect.get(focusAreaContextExtractor, 'getSelectionInsideExtendedCodeBlock')
+
+        const result = method.call(focusAreaContextExtractor, originSelection, extendedCodeBlockRange)
+
+        checkIfExpectedRangeEqualActualRange(
+            {
+                start: {
+                    line: 1,
+                    character: 5,
+                },
+                end: {
+                    line: 11,
+                    character: 4,
+                },
+            },
+            result
+        )
+    })
+    it('returns adjusted selection for one-line selection', () => {
+        // Stub originSelection and extendedCodeBlockRange
+        const originSelection = {
+            start: {
+                line: 10,
+                character: 5,
+            },
+            end: {
+                line: 10,
+                character: 50,
+            },
+        }
+
+        const extendedCodeBlockRange = {
+            start: {
+                line: 10,
+                character: 4,
+            },
+            end: {
+                line: 10,
+                character: 51,
+            },
+        }
+
+        const focusAreaContextExtractor = new FocusAreaContextExtractor()
+        const method = Reflect.get(focusAreaContextExtractor, 'getSelectionInsideExtendedCodeBlock')
+
+        const result = method.call(focusAreaContextExtractor, originSelection, extendedCodeBlockRange)
+
+        checkIfExpectedRangeEqualActualRange(
+            {
+                start: {
+                    line: 0,
+                    character: 1,
+                },
+                end: {
+                    line: 0,
+                    character: 46,
+                },
+            },
+            result
+        )
+    })
+})
+
+describe('trimRangeAccordingToLimits', () => {
+    it('cut characters from the last line', () => {
+        // Arrange
+        const document: TextDocument = createMockDocument('01234567\n0123456789\n0123456')
+        const range = {
+            start: {
+                line: 0,
+                character: 7,
+            },
+            end: {
+                line: 1,
+                character: 10,
+            },
+        }
+        const limit = 5
+
+        // Act
+        const focusAreaContextExtractor = new FocusAreaContextExtractor()
+        const method = Reflect.get(focusAreaContextExtractor, 'trimRangeAccordingToLimits')
+        const result = method.call(focusAreaContextExtractor, document, range, limit)
+
+        // Assert
+        checkIfExpectedRangeEqualActualRange(
+            {
+                start: {
+                    line: 0,
+                    character: 7,
+                },
+                end: {
+                    line: 1,
+                    character: 3,
+                },
+            },
+            result
+        )
+    })
+    it('cut the last line', () => {
+        // Arrange
+        const document: TextDocument = createMockDocument('01234567\n0123456789\n0123456')
+        const range = {
+            start: {
+                line: 0,
+                character: 0,
+            },
+            end: {
+                line: 1,
+                character: 10,
+            },
+        }
+        const limit = 9
+
+        // Act
+        const focusAreaContextExtractor = new FocusAreaContextExtractor()
+        const method = Reflect.get(focusAreaContextExtractor, 'trimRangeAccordingToLimits')
+        const result = method.call(focusAreaContextExtractor, document, range, limit)
+
+        // Assert
+        checkIfExpectedRangeEqualActualRange(
+            {
+                start: {
+                    line: 0,
+                    character: 0,
+                },
+                end: {
+                    line: 1,
+                    character: 0,
+                },
+            },
+            result
+        )
+    })
+
+    it('cut characters from the first line', () => {
+        // Arrange
+        const document: TextDocument = createMockDocument('01234567\n0123456789\n0123456')
+        const range = {
+            start: {
+                line: 0,
+                character: 0,
+            },
+            end: {
+                line: 1,
+                character: 10,
+            },
+        }
+        const limit = 5
+
+        // Act
+        const focusAreaContextExtractor = new FocusAreaContextExtractor()
+        const method = Reflect.get(focusAreaContextExtractor, 'trimRangeAccordingToLimits')
+        const result = method.call(focusAreaContextExtractor, document, range, limit)
+
+        // Assert
+        checkIfExpectedRangeEqualActualRange(
+            {
+                start: {
+                    line: 0,
+                    character: 0,
+                },
+                end: {
+                    line: 0,
+                    character: 4,
+                },
+            },
+            result
+        )
+    })
+})
+
+describe('getExtendedCodeBlockRange', () => {
+    it('extends range to the beginning of the line if length is below limit', () => {
+        // Arrange
+        const document: TextDocument = createMockDocument('01234567\n0123456789')
+        const range = {
+            start: {
+                line: 1,
+                character: 8,
+            },
+            end: {
+                line: 1,
+                character: 9,
+            },
+        }
+        const limit = 10
+
+        // Act
+        const focusAreaContextExtractor = new FocusAreaContextExtractor()
+        const method = Reflect.get(focusAreaContextExtractor, 'getExtendedCodeBlockRange')
+        const result = method.call(focusAreaContextExtractor, document, range, limit)
+
+        // Assert
+        checkIfExpectedRangeEqualActualRange(
+            {
+                start: {
+                    line: 1,
+                    character: 0,
+                },
+                end: {
+                    line: 1,
+                    character: 9,
+                },
+            },
+            result
+        )
+    })
+
+    it('extends range to previous line if length is below limit', () => {
+        // Arrange
+        const document: TextDocument = createMockDocument('01234567\n0123456789')
+        const range = {
+            start: {
+                line: 1,
+                character: 0,
+            },
+            end: {
+                line: 1,
+                character: 9,
+            },
+        }
+        const limit = 50
+
+        // Act
+        const focusAreaContextExtractor = new FocusAreaContextExtractor()
+        const method = Reflect.get(focusAreaContextExtractor, 'getExtendedCodeBlockRange')
+        const result = method.call(focusAreaContextExtractor, document, range, limit)
+
+        // Assert
+        checkIfExpectedRangeEqualActualRange(
+            {
+                start: {
+                    line: 0,
+                    character: 0,
+                },
+                end: {
+                    line: 1,
+                    character: 10,
+                },
+            },
+            result
+        )
+    })
+
+    it('extends range to previous line if length is below limit (we have empty new line in the end)', () => {
+        // Arrange
+        const document: TextDocument = createMockDocument('01234567\n0123456789\n')
+        const range = {
+            start: {
+                line: 1,
+                character: 0,
+            },
+            end: {
+                line: 1,
+                character: 9,
+            },
+        }
+        const limit = 50
+
+        // Act
+        const focusAreaContextExtractor = new FocusAreaContextExtractor()
+        const method = Reflect.get(focusAreaContextExtractor, 'getExtendedCodeBlockRange')
+        const result = method.call(focusAreaContextExtractor, document, range, limit)
+
+        // Assert
+        checkIfExpectedRangeEqualActualRange(
+            {
+                start: {
+                    line: 0,
+                    character: 0,
+                },
+                end: {
+                    line: 2,
+                    character: 0,
+                },
+            },
+            result
+        )
+    })
+
+    it('extends range to next line if length is below limit', () => {
+        // Arrange
+        const document: TextDocument = createMockDocument('01234567\n0123456789\n')
+        const range = {
+            start: {
+                line: 0,
+                character: 0,
+            },
+            end: {
+                line: 0,
+                character: 1,
+            },
+        }
+        const limit = 50
+
+        // Act
+        const focusAreaContextExtractor = new FocusAreaContextExtractor()
+        const method = Reflect.get(focusAreaContextExtractor, 'getExtendedCodeBlockRange')
+        const result: Range = method.call(focusAreaContextExtractor, document, range, limit)
+
+        // Assert
+        checkIfExpectedRangeEqualActualRange(
+            {
+                start: {
+                    line: 0,
+                    character: 0,
+                },
+                end: {
+                    line: 2,
+                    character: 0,
+                },
+            },
+            result
+        )
+    })
+
+    it('extends range to whole line if length is below limit and we have only one line in file', () => {
+        // Arrange
+        const document: TextDocument = createMockDocument('0123456789\n')
+        const range = {
+            start: {
+                line: 0,
+                character: 3,
+            },
+            end: {
+                line: 0,
+                character: 4,
+            },
+        }
+        const limit = 50
+
+        // Act
+        const focusAreaContextExtractor = new FocusAreaContextExtractor()
+        const method = Reflect.get(focusAreaContextExtractor, 'getExtendedCodeBlockRange')
+        const result = method.call(focusAreaContextExtractor, document, range, limit)
+
+        // Assert
+        checkIfExpectedRangeEqualActualRange(
+            {
+                start: {
+                    line: 0,
+                    character: 0,
+                },
+                end: {
+                    line: 1,
+                    character: 0,
+                },
+            },
+            result
+        )
+    })
+
+    it('extends range to one line from each side if length is below limit', () => {
+        // Arrange
+        const document: TextDocument = createMockDocument('0123456789\n0123456789\n0123456789\n0123456789\n')
+        const range = {
+            start: {
+                line: 2,
+                character: 3,
+            },
+            end: {
+                line: 2,
+                character: 4,
+            },
+        }
+        const limit = 33
+
+        // Act
+        const focusAreaContextExtractor = new FocusAreaContextExtractor()
+        const method = Reflect.get(focusAreaContextExtractor, 'getExtendedCodeBlockRange')
+        const result = method.call(focusAreaContextExtractor, document, range, limit)
+
+        // Assert
+        checkIfExpectedRangeEqualActualRange(
+            {
+                start: {
+                    line: 1,
+                    character: 0,
+                },
+                end: {
+                    line: 3,
+                    character: 10,
+                },
+            },
+            result
+        )
+    })
+})
diff --git a/packages/amazonq/test/unit/index.ts b/packages/amazonq/test/unit/index.ts
new file mode 100644
index 00000000000..cc1ad0d22ca
--- /dev/null
+++ b/packages/amazonq/test/unit/index.ts
@@ -0,0 +1,13 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { runTests } from 'aws-core-vscode/test'
+import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
+
+export function run(): Promise<void> {
+    return runTests(process.env.TEST_DIR ?? ['test/unit'], VSCODE_EXTENSION_ID.amazonq, [
+        '../../core/dist/src/test/globalSetup.test.ts',
+    ])
+}
diff --git a/packages/amazonq/test/unit/validation.test.ts b/packages/amazonq/test/unit/validation.test.ts
new file mode 100644
index 00000000000..4b19d94935a
--- /dev/null
+++ b/packages/amazonq/test/unit/validation.test.ts
@@ -0,0 +1,30 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as path from 'path'
+import packageJson from '../../package.json'
+import { fs } from 'aws-core-vscode/shared'
+
+/**
+ * Validate the setup of the project itself.
+ */
+
+describe('package validations', function () {
+    /**
+     * Type checking depends on icon entries in core/package.json.
+     * To ensure that the extension has the the typed icons available, they must be synced
+     * to the local package.json. This test ensures that any hand modifications to individual
+     * package.jsons are detected.
+     *
+     * See icons.md for more info.
+     */
+    it('has synced contributes.icons with core/package.json', async function () {
+        const corePackageJson = JSON.parse(
+            await fs.readFileText(path.resolve(__dirname, '../../../../core/package.json'))
+        )
+        assert.deepStrictEqual(packageJson.contributes.icons, corePackageJson.contributes.icons)
+    })
+})
diff --git a/packages/amazonq/test/web/extension.test.ts b/packages/amazonq/test/web/extension.test.ts
new file mode 100644
index 00000000000..de685bf10f7
--- /dev/null
+++ b/packages/amazonq/test/web/extension.test.ts
@@ -0,0 +1,13 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { globals, ToolkitGlobals } from 'aws-core-vscode/shared'
+
+describe('activation', async () => {
+    it('defines a region provider that can provide regions when in web mode', async () => {
+        assert((globals as unknown as ToolkitGlobals).regionProvider.getRegions().length > 0)
+    })
+})
diff --git a/packages/amazonq/test/web/shared/crypto.test.ts b/packages/amazonq/test/web/shared/crypto.test.ts
new file mode 100644
index 00000000000..01da83cdf25
--- /dev/null
+++ b/packages/amazonq/test/web/shared/crypto.test.ts
@@ -0,0 +1,28 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { randomUUID } from 'aws-core-vscode/shared'
+
+describe('crypto', function () {
+    describe('randomUUID()', function () {
+        const uuidPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
+
+        it('functions as normal', async function () {
+            const result1 = randomUUID()
+            const result2 = randomUUID()
+            const result3 = randomUUID()
+            assert(uuidPattern.test(result1))
+            assert(uuidPattern.test(result2))
+            assert(uuidPattern.test(result3))
+            assert(result1 !== result2)
+            assert(result2 !== result3)
+        })
+
+        it('test pattern fails on non-uuid', function () {
+            assert(uuidPattern.test('not-a-uuid') === false)
+        })
+    })
+})
diff --git a/packages/amazonq/test/web/shared/fs.test.ts b/packages/amazonq/test/web/shared/fs.test.ts
new file mode 100644
index 00000000000..df3e677b287
--- /dev/null
+++ b/packages/amazonq/test/web/shared/fs.test.ts
@@ -0,0 +1,21 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { fs, globals } from 'aws-core-vscode/shared'
+
+describe('FileSystem', function () {
+    it('getUserHomeDir()', async () => {
+        // TODO: testWeb needs a `globalSetup.test.ts` ...
+        await fs.init(globals.context, () => undefined)
+        assert.strictEqual(fs.getUserHomeDir(), globals.context.globalStorageUri.toString())
+    })
+
+    it('getUsername()', async () => {
+        // TODO: testWeb needs a `globalSetup.test.ts` ...
+        await fs.init(globals.context, () => undefined)
+        assert.strictEqual(fs.getUsername(), 'webuser')
+    })
+})
diff --git a/packages/amazonq/test/web/shared/utilities/timeoutUtils.test.ts b/packages/amazonq/test/web/shared/utilities/timeoutUtils.test.ts
new file mode 100644
index 00000000000..1885c8918d0
--- /dev/null
+++ b/packages/amazonq/test/web/shared/utilities/timeoutUtils.test.ts
@@ -0,0 +1,13 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * IMPORTANT: We are importing the same test from the node timeoutUtils
+ * since the behavior should be the exact same.
+ *
+ * Any web specific tests should be made within their own `describe()`.
+ */
+import { timeoutUtilsDescribe } from 'aws-core-vscode/testWeb'
+timeoutUtilsDescribe
diff --git a/packages/amazonq/test/web/testRunner.ts b/packages/amazonq/test/web/testRunner.ts
new file mode 100644
index 00000000000..1d0726be98b
--- /dev/null
+++ b/packages/amazonq/test/web/testRunner.ts
@@ -0,0 +1,66 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * The following was influenced by this guide: https://code.visualstudio.com/api/extension-guides/web-extensions
+ */
+
+import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
+import 'mocha' // Imports mocha for the browser, defining the `mocha` global.
+import * as vscode from 'vscode'
+
+export async function run(): Promise<void> {
+    await activateExtension()
+    return new Promise(async (resolve, reject) => {
+        setupMocha()
+        gatherTestFiles()
+
+        try {
+            runMochaTests(resolve, reject)
+        } catch (err) {
+            console.error(err)
+            reject(err)
+        }
+    })
+}
+
+function setupMocha() {
+    mocha.setup({
+        ui: 'bdd',
+        reporter: undefined,
+    })
+}
+
+function gatherTestFiles() {
+    // Bundles all files in the current directory matching `*.test`
+    // eslint-disable-next-line unicorn/no-array-for-each
+    const importAll = (r: __WebpackModuleApi.RequireContext) => r.keys().forEach(r)
+    importAll(require.context('.', true, /\.test$/))
+}
+
+/**
+ * Typically extensions activate depending on their configuration in `package.json#activationEvents`, but in tests
+ * there is a race condition for when the extension has finished activating and when we start the tests.
+ *
+ * So this function ensures the extension has fully activated.
+ */
+async function activateExtension() {
+    const extId = VSCODE_EXTENSION_ID.amazonq
+    const ext = vscode.extensions.getExtension(extId)
+    if (!ext) {
+        throw new Error(`Extension '${extId}' not found, can't activate it to run tests.`)
+    }
+    await vscode.extensions.getExtension(VSCODE_EXTENSION_ID.amazonq)?.activate()
+}
+
+function runMochaTests(resolve: (value: void | PromiseLike<void>) => void, reject: (reason?: any) => void) {
+    mocha.run((failures) => {
+        if (failures > 0) {
+            reject(new Error(`${failures} tests failed.`))
+        } else {
+            resolve()
+        }
+    })
+}
diff --git a/packages/amazonq/test/web/utils.test.ts b/packages/amazonq/test/web/utils.test.ts
new file mode 100644
index 00000000000..30965ffb500
--- /dev/null
+++ b/packages/amazonq/test/web/utils.test.ts
@@ -0,0 +1,14 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as assert from 'assert'
+import { isWeb } from 'aws-core-vscode/shared'
+
+describe('isWeb', function () {
+    it('returns true when in web mode', function () {
+        // Note that this only works since the state is indirectly stored in `globalThis`, see web.md for more info
+        assert.strictEqual(isWeb(), true)
+    })
+})
diff --git a/packages/amazonq/tsconfig.json b/packages/amazonq/tsconfig.json
new file mode 100644
index 00000000000..b225cf43f6d
--- /dev/null
+++ b/packages/amazonq/tsconfig.json
@@ -0,0 +1,9 @@
+{
+    "extends": "../tsconfig.packages.json",
+    "compilerOptions": {
+        "outDir": "dist",
+        "baseUrl": ".",
+        "rootDir": "."
+    },
+    "exclude": ["node_modules", ".vscode-test", "dist"]
+}
diff --git a/packages/amazonq/webpack.config.js b/packages/amazonq/webpack.config.js
new file mode 100644
index 00000000000..44e01684754
--- /dev/null
+++ b/packages/amazonq/webpack.config.js
@@ -0,0 +1,26 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+const baseConfigFactory = require('../webpack.base.config')
+const baseWebConfigsFactory = require('../webpack.web.config')
+
+module.exports = (env, argv) => {
+    const config = {
+        ...baseConfigFactory(env, argv),
+        entry: {
+            'src/extensionNode': './src/extensionNode.ts',
+        },
+    }
+
+    const webConfig = {
+        ...baseWebConfigsFactory(env, argv),
+        entry: {
+            'src/extensionWeb': './src/extensionWeb.ts',
+            'test/web/testRunnerWebCore': './test/web/testRunner.ts',
+        },
+    }
+
+    return [config, webConfig]
+}
diff --git a/packages/core/.vscode/launch.json b/packages/core/.vscode/launch.json
new file mode 100644
index 00000000000..ac06b7c2550
--- /dev/null
+++ b/packages/core/.vscode/launch.json
@@ -0,0 +1,45 @@
+// A launch configuration that compiles the extension and then opens it inside a new window
+// Use IntelliSense to learn about possible attributes.
+// Hover to view descriptions of existing attributes.
+// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Test Lint",
+            "type": "node",
+            "request": "launch",
+            "program": "${workspaceFolder}/scripts/lint/testLint.ts",
+            "outFiles": ["${workspaceFolder}/dist/**/*.js"],
+            "preLaunchTask": "build",
+            "presentation": {
+                "group": "7_TestLint",
+                "order": 1
+            }
+        }
+        // ---- We do not need the following currently, and we want to reduce clutter. Re-enable if necessary ----
+        // {
+        //     "name": "Attach to ASL Server",
+        //     "type": "node",
+        //     "request": "attach",
+        //     "port": 6009,
+        //     "restart": true,
+        //     "outFiles": ["${workspaceRoot}/dist/src/stepFunctions/asl/**.js"]
+        // },
+        // {
+        //     "name": "Attach to SSM Document Language Server",
+        //     "type": "node",
+        //     "request": "attach",
+        //     "port": 6010,
+        //     "restart": true,
+        //     "outFiles": ["${workspaceRoot}/dist/src/ssmDocument/ssm/ssmServer.js"]
+        // }
+    ],
+    "compounds": [
+        // ---- We do not need the following currently, and we want to reduce clutter. Re-enable if necessary ----
+        // {
+        //     "name": "Extension + Attach to SSM Document Language Server",
+        //     "configurations": ["Extension", "Attach to SSM Document Language Server"]
+        // }
+    ]
+}
diff --git a/packages/core/.vscode/settings.json b/packages/core/.vscode/settings.json
new file mode 100644
index 00000000000..4bcaf47f09d
--- /dev/null
+++ b/packages/core/.vscode/settings.json
@@ -0,0 +1,17 @@
+{
+    "files.exclude": {
+        "**/src/testFixtures": true
+    },
+    "search.exclude": {
+        "dist": true,
+        "node_modules": true,
+        ".vscode-test*": true
+    },
+    "files.watcherExclude": {
+        "**/src/testFixtures": true
+    },
+    "typescript.preferences.importModuleSpecifier": "relative",
+    "javascript.preferences.importModuleSpecifier": "relative",
+    "typescript.tsdk": "../../node_modules/typescript/lib",
+    "npm.packageManager": "npm"
+}
diff --git a/packages/core/.vscode/tasks.json b/packages/core/.vscode/tasks.json
new file mode 100644
index 00000000000..d507bd017af
--- /dev/null
+++ b/packages/core/.vscode/tasks.json
@@ -0,0 +1,80 @@
+// See https://go.microsoft.com/fwlink/?LinkId=733558
+// for the documentation about the tasks.json format
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            // Single build task to enable parallel tasks
+            "label": "build",
+            "dependsOn": ["watch", "webpackWatch"]
+        },
+        {
+            "label": "watch",
+            "type": "shell",
+            "command": "npm",
+            "args": ["run", "watch"],
+            "problemMatcher": "$tsc-watch",
+            "isBackground": true
+        },
+        {
+            "label": "webpackWatch",
+            "command": "npm run webpackDev -- --watch",
+            "type": "shell",
+            "isBackground": true,
+            "problemMatcher": "$ts-webpack-watch"
+        },
+        /**
+        After we stop debugging our browser, we also want to stop the web server.
+        When this task is ran it will stop the web server.
+
+        From: https://stackoverflow.com/a/60330174
+        **/
+        {
+            "label": "webRunTerminateCore",
+            "command": "echo ${input:webRunTerminateCore}",
+            "type": "shell"
+        },
+        {
+            "type": "npm",
+            "script": "lint",
+            "problemMatcher": "$eslint-stylish"
+        },
+        {
+            "type": "npm",
+            "script": "lintfix",
+            "problemMatcher": "$eslint-stylish"
+        },
+        {
+            "type": "npm",
+            "script": "compile",
+            "dependsOn": ["Kill Tasks"],
+            "problemMatcher": "$tsc"
+        },
+        {
+            "type": "npm",
+            "script": "clean",
+            "dependsOn": ["Kill Tasks"],
+            "problemMatcher": []
+        },
+        {
+            "label": "Kill Tasks",
+            "type": "process",
+            "command": "${input:killTasks}",
+            "problemMatcher": []
+        }
+    ],
+    "inputs": [
+        {
+            "id": "killTasks",
+            "type": "command",
+            "command": "workbench.action.tasks.terminate",
+            "args": "terminateAll"
+        },
+        {
+            "id": "webRunTerminateCore",
+            "type": "command",
+            "command": "workbench.action.tasks.terminate",
+            "args": "webRun"
+        }
+    ]
+}
diff --git a/packages/core/package.json b/packages/core/package.json
new file mode 100644
index 00000000000..eb487618a09
--- /dev/null
+++ b/packages/core/package.json
@@ -0,0 +1,688 @@
+{
+    "name": "aws-core-vscode",
+    "description": "Core library used AWS IDE extensions for VSCode.",
+    "version": "1.0.0",
+    "license": "Apache-2.0",
+    "engines": {
+        "npm": "^10.1.0",
+        "vscode": "^1.83.0"
+    },
+    "exports": {
+        ".": "./dist/src/extension.js",
+        "./node": "./dist/src/extensionNode.js",
+        "./web": "./dist/src/extensionWeb.js",
+        "./webShared": "./dist/src/extensionWebShared.js",
+        "./amazonq": "./dist/src/amazonq/index.js",
+        "./amazonq/node": "./dist/src/amazonq/indexNode.js",
+        "./codewhisperer": "./dist/src/codewhisperer/index.js",
+        "./codewhisperer/node": "./dist/src/codewhisperer/indexNode.js",
+        "./shared": "./dist/src/shared/index.js",
+        "./sharedNode": "./dist/src/shared/indexNode.js",
+        "./auth": "./dist/src/auth/index.js",
+        "./amazonqGumby": "./dist/src/amazonqGumby/index.js",
+        "./amazonqFeatureDev": "./dist/src/amazonqFeatureDev/index.js",
+        "./amazonqDoc": "./dist/src/amazonqDoc/index.js",
+        "./amazonqScan": "./dist/src/amazonqScan/index.js",
+        "./amazonqTest": "./dist/src/amazonqTest/index.js",
+        "./codewhispererChat": "./dist/src/codewhispererChat/index.js",
+        "./test": "./dist/src/test/index.js",
+        "./testWeb": "./dist/src/testWeb/index.js",
+        "./login": "./dist/src/login/webview/index.js",
+        "./utils": "./dist/src/shared/utilities/index.js",
+        "./feedback": "./dist/src/feedback/index.js",
+        "./telemetry": "./dist/src/shared/telemetry/index.js",
+        "./dev": "./dist/src/dev/index.js",
+        "./notifications": "./dist/src/notifications/index.js"
+    },
+    "contributes": {
+        "icons": {
+            "aws-amazonq-q-gradient": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1aa"
+                }
+            },
+            "aws-amazonq-q-squid-ink": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ab"
+                }
+            },
+            "aws-amazonq-q-white": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ac"
+                }
+            },
+            "aws-amazonq-severity-critical": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ad"
+                }
+            },
+            "aws-amazonq-severity-high": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ae"
+                }
+            },
+            "aws-amazonq-severity-info": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1af"
+                }
+            },
+            "aws-amazonq-severity-low": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b0"
+                }
+            },
+            "aws-amazonq-severity-medium": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b1"
+                }
+            },
+            "aws-amazonq-transform-arrow-dark": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b2"
+                }
+            },
+            "aws-amazonq-transform-arrow-light": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b3"
+                }
+            },
+            "aws-amazonq-transform-default-dark": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b4"
+                }
+            },
+            "aws-amazonq-transform-default-light": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b5"
+                }
+            },
+            "aws-amazonq-transform-dependencies-dark": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b6"
+                }
+            },
+            "aws-amazonq-transform-dependencies-light": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b7"
+                }
+            },
+            "aws-amazonq-transform-file-dark": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b8"
+                }
+            },
+            "aws-amazonq-transform-file-light": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b9"
+                }
+            },
+            "aws-amazonq-transform-logo": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ba"
+                }
+            },
+            "aws-amazonq-transform-step-into-dark": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1bb"
+                }
+            },
+            "aws-amazonq-transform-step-into-light": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1bc"
+                }
+            },
+            "aws-amazonq-transform-variables-dark": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1bd"
+                }
+            },
+            "aws-amazonq-transform-variables-light": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1be"
+                }
+            },
+            "aws-applicationcomposer-icon": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1bf"
+                }
+            },
+            "aws-applicationcomposer-icon-dark": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c0"
+                }
+            },
+            "aws-apprunner-service": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c1"
+                }
+            },
+            "aws-cdk-logo": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c2"
+                }
+            },
+            "aws-cloudformation-stack": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c3"
+                }
+            },
+            "aws-cloudwatch-log-group": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c4"
+                }
+            },
+            "aws-codecatalyst-logo": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c5"
+                }
+            },
+            "aws-codewhisperer-icon-black": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c6"
+                }
+            },
+            "aws-codewhisperer-icon-white": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c7"
+                }
+            },
+            "aws-codewhisperer-learn": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c8"
+                }
+            },
+            "aws-ecr-registry": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c9"
+                }
+            },
+            "aws-ecs-cluster": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ca"
+                }
+            },
+            "aws-ecs-container": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1cb"
+                }
+            },
+            "aws-ecs-service": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1cc"
+                }
+            },
+            "aws-generic-attach-file": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1cd"
+                }
+            },
+            "aws-iot-certificate": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ce"
+                }
+            },
+            "aws-iot-policy": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1cf"
+                }
+            },
+            "aws-iot-thing": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d0"
+                }
+            },
+            "aws-lambda-create-stack": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d1"
+                }
+            },
+            "aws-lambda-create-stack-light": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d2"
+                }
+            },
+            "aws-lambda-deployed-function": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d3"
+                }
+            },
+            "aws-lambda-function": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d4"
+                }
+            },
+            "aws-lambda-invoke-remotely": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d5"
+                }
+            },
+            "aws-mynah-MynahIconBlack": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d6"
+                }
+            },
+            "aws-mynah-MynahIconWhite": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d7"
+                }
+            },
+            "aws-mynah-logo": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d8"
+                }
+            },
+            "aws-redshift-cluster": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d9"
+                }
+            },
+            "aws-redshift-cluster-connected": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1da"
+                }
+            },
+            "aws-redshift-database": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1db"
+                }
+            },
+            "aws-redshift-redshift-cluster-connected": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1dc"
+                }
+            },
+            "aws-redshift-schema": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1dd"
+                }
+            },
+            "aws-redshift-table": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1de"
+                }
+            },
+            "aws-s3-bucket": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1df"
+                }
+            },
+            "aws-s3-create-bucket": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e0"
+                }
+            },
+            "aws-sagemaker-code-editor": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e1"
+                }
+            },
+            "aws-sagemaker-jupyter-lab": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e2"
+                }
+            },
+            "aws-sagemakerunifiedstudio-catalog": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e3"
+                }
+            },
+            "aws-sagemakerunifiedstudio-spaces": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e4"
+                }
+            },
+            "aws-sagemakerunifiedstudio-spaces-dark": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e5"
+                }
+            },
+            "aws-sagemakerunifiedstudio-symbol-int": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e6"
+                }
+            },
+            "aws-sagemakerunifiedstudio-table": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e7"
+                }
+            },
+            "aws-schemas-registry": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e8"
+                }
+            },
+            "aws-schemas-schema": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e9"
+                }
+            },
+            "aws-stepfunctions-preview": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ea"
+                }
+            }
+        }
+    },
+    "scripts": {
+        "postinstall": "npm run generateTelemetry && npm run compile",
+        "clean": "ts-node ../../scripts/clean.ts dist/",
+        "copyFiles": "ts-node ./scripts/build/copyFiles.ts",
+        "buildScripts": "npm run generateClients && npm run generateIcons && npm run copyFiles",
+        "compile": "npm run clean && npm run buildScripts && npm run compileOnly && webpack",
+        "compileOnly": "tsc -p ./",
+        "compileDev": "npm run compile -- --mode development",
+        "webpackDev": "webpack --mode development",
+        "serveVue": "ts-node ./scripts/build/checkServerPort.ts && webpack serve --port 8080 --config-name vue --mode development",
+        "watch": "npm run clean && npm run buildScripts && npm run compileOnly -- --watch",
+        "lint": "node --max-old-space-size=8192 -r ts-node/register ./scripts/lint/testLint.ts",
+        "generateClients": "ts-node ./scripts/build/generateServiceClient.ts ",
+        "generateIcons": "ts-node ../../scripts/generateIcons.ts",
+        "generateTelemetry": "node ../../node_modules/@aws-toolkits/telemetry/lib/generateTelemetry.js --extraInput=src/shared/telemetry/vscodeTelemetry.json --output=src/shared/telemetry/telemetry.gen.ts"
+    },
+    "scriptsComments": {
+        "compile": "Builds EVERYTHING we would need for a final production-ready package",
+        "compileOnly": "Only compiles the `core` source code.",
+        "compileDev": "Same as compile, but in `development` mode",
+        "webpackDev": "Webpacks using all configs, but in development mode",
+        "serveVue": "Local server for Vue.js code for development purposes. Provides faster iteration when updating Vue files"
+    },
+    "devDependencies": {
+        "@aws-sdk/types": "^3.13.1",
+        "@aws/chat-client": "^0.1.4",
+        "@aws/chat-client-ui-types": "^0.1.47",
+        "@aws/language-server-runtimes": "^0.2.119",
+        "@aws/language-server-runtimes-types": "^0.1.47",
+        "@cspotcode/source-map-support": "^0.8.1",
+        "@sinonjs/fake-timers": "^10.0.2",
+        "@types/adm-zip": "^0.4.34",
+        "@types/async-lock": "^1.4.0",
+        "@types/bytes": "^3.1.0",
+        "@types/circular-dependency-plugin": "^5.0.8",
+        "@types/cross-spawn": "^6.0.6",
+        "@types/diff": "^5.0.7",
+        "@types/glob": "^8.1.0",
+        "@types/js-yaml": "^4.0.5",
+        "@types/jsdom": "^21.1.6",
+        "@types/lodash": "^4.14.180",
+        "@types/lokijs": "^1.5.14",
+        "@types/markdown-it": "^13.0.2",
+        "@types/mime-types": "^2.1.4",
+        "@types/mocha": "^10.0.6",
+        "@types/node": "^16.18.95",
+        "@types/node-fetch": "^2.6.8",
+        "@types/prismjs": "^1.26.0",
+        "@types/proper-lockfile": "^4.1.4",
+        "@types/readline-sync": "^1.4.8",
+        "@types/semver": "^7.5.0",
+        "@types/sinon": "^10.0.5",
+        "@types/sinonjs__fake-timers": "^8.1.2",
+        "@types/stream-buffers": "^3.0.7",
+        "@types/svgdom": "^0.1.2",
+        "@types/tcp-port-used": "^1.0.1",
+        "@types/uuid": "^9.0.1",
+        "@types/whatwg-url": "^11.0.4",
+        "@types/xml2js": "^0.4.11",
+        "@vue/compiler-sfc": "^3.3.2",
+        "aws-sdk-client-mock": "^4.1.0",
+        "c8": "^9.0.0",
+        "circular-dependency-plugin": "^5.2.2",
+        "css-loader": "^6.10.0",
+        "esbuild-loader": "2.20.0",
+        "file-loader": "^6.2.0",
+        "jsdom": "^23.0.1",
+        "json-schema-to-typescript": "^13.1.1",
+        "marked": "^13.0.1",
+        "mocha": "^10.1.0",
+        "mocha-junit-reporter": "^2.2.1",
+        "mocha-multi-reporters": "^1.5.1",
+        "readline-sync": "^1.4.9",
+        "sass": "^1.49.8",
+        "sass-loader": "^16.0.2",
+        "sinon": "^14.0.0",
+        "style-loader": "^3.3.1",
+        "ts-node": "^10.9.1",
+        "typescript": "^5.0.4",
+        "umd-compat-loader": "^2.1.2",
+        "vue-loader": "^17.2.2",
+        "vue-style-loader": "^4.1.3",
+        "webfont": "^11.2.26"
+    },
+    "dependencies": {
+        "@amzn/amazon-q-developer-streaming-client": "file:../../src.gen/@amzn/amazon-q-developer-streaming-client",
+        "@amzn/codewhisperer-streaming": "file:../../src.gen/@amzn/codewhisperer-streaming",
+        "@amzn/sagemaker-client": "file:../../src.gen/@amzn/sagemaker-client/1.0.0.tgz",
+        "@aws-sdk/client-accessanalyzer": "^3.888.0",
+        "@aws-sdk/client-api-gateway": "<3.731.0",
+        "@aws-sdk/client-apprunner": "<3.731.0",
+        "@aws-sdk/client-cloudcontrol": "<3.731.0",
+        "@aws-sdk/client-cloudformation": "<3.731.0",
+        "@aws-sdk/client-cloudwatch-logs": "<3.731.0",
+        "@aws-sdk/client-codecatalyst": "<3.731.0",
+        "@aws-sdk/client-cognito-identity": "<3.731.0",
+        "@aws-sdk/client-datazone": "^3.848.0",
+        "@aws-sdk/client-docdb": "<3.731.0",
+        "@aws-sdk/client-docdb-elastic": "<3.731.0",
+        "@aws-sdk/client-ec2": "<3.731.0",
+        "@aws-sdk/client-ecr": "~3.693.0",
+        "@aws-sdk/client-ecs": "~3.693.0",
+        "@aws-sdk/client-glue": "^3.852.0",
+        "@aws-sdk/client-iam": "<3.731.0",
+        "@aws-sdk/client-iot": "~3.693.0",
+        "@aws-sdk/client-iotsecuretunneling": "~3.693.0",
+        "@aws-sdk/client-lambda": "<3.731.0",
+        "@aws-sdk/client-redshift": "~3.693.0",
+        "@aws-sdk/client-redshift-data": "~3.693.0",
+        "@aws-sdk/client-redshift-serverless": "~3.693.0",
+        "@aws-sdk/client-s3": "<3.731.0",
+        "@aws-sdk/client-s3-control": "^3.830.0",
+        "@aws-sdk/client-sagemaker": "<3.696.0",
+        "@aws-sdk/client-schemas": "~3.693.0",
+        "@aws-sdk/client-secrets-manager": "~3.693.0",
+        "@aws-sdk/client-sfn": "<3.731.0",
+        "@aws-sdk/client-ssm": "<3.731.0",
+        "@aws-sdk/client-sso": "<3.731.0",
+        "@aws-sdk/client-sso-oidc": "<3.731.0",
+        "@aws-sdk/credential-provider-env": "<3.731.0",
+        "@aws-sdk/credential-provider-process": "<3.731.0",
+        "@aws-sdk/credential-provider-sso": "<3.731.0",
+        "@aws-sdk/credential-providers": "<3.731.0",
+        "@aws-sdk/lib-storage": "<3.731.0",
+        "@aws-sdk/property-provider": "<3.731.0",
+        "@aws-sdk/protocol-http": "<3.731.0",
+        "@aws-sdk/s3-request-presigner": "<3.731.0",
+        "@aws-sdk/smithy-client": "<3.731.0",
+        "@aws-sdk/util-arn-parser": "<3.731.0",
+        "@aws/mynah-ui": "^4.35.4",
+        "@gerhobbelt/gitignore-parser": "^0.2.0-9",
+        "@iarna/toml": "^2.2.5",
+        "@smithy/fetch-http-handler": "^5.0.1",
+        "@smithy/middleware-retry": "^4.0.3",
+        "@smithy/node-http-handler": "^4.0.2",
+        "@smithy/protocol-http": "^5.0.1",
+        "@smithy/service-error-classification": "^4.0.1",
+        "@smithy/shared-ini-file-loader": "^4.0.0",
+        "@smithy/util-retry": "^4.0.1",
+        "@svgdotjs/svg.js": "^3.0.16",
+        "@vscode/debugprotocol": "^1.57.0",
+        "@zip.js/zip.js": "^2.7.41",
+        "adm-zip": "^0.5.10",
+        "amazon-states-language-service": "^1.16.1",
+        "async-lock": "^1.4.0",
+        "aws-sdk": "^2.1692.0",
+        "aws-ssm-document-language-service": "^1.0.0",
+        "bytes": "^3.1.2",
+        "cross-fetch": "^4.0.0",
+        "cross-spawn": "^7.0.5",
+        "diff": "^5.1.0",
+        "fast-json-patch": "^3.1.1",
+        "glob": "^10.3.10",
+        "got": "^11.8.5",
+        "highlight.js": "^11.9.0",
+        "http2": "^3.3.6",
+        "i18n-ts": "^1.0.5",
+        "immutable": "^4.3.0",
+        "jaro-winkler": "^0.2.8",
+        "jose": "5.4.1",
+        "js-yaml": "^4.1.0",
+        "jsonc-parser": "^3.2.0",
+        "lodash": "^4.17.21",
+        "lokijs": "^1.5.12",
+        "markdown-it": "^13.0.2",
+        "mime-types": "^2.1.32",
+        "node-fetch": "^2.7.0",
+        "portfinder": "^1.0.32",
+        "protobufjs": "^7.2.6",
+        "semver": "^7.5.4",
+        "stream-buffers": "^3.0.2",
+        "strip-ansi": "^5.2.0",
+        "svgdom": "^0.1.0",
+        "tcp-port-used": "^1.0.1",
+        "vscode-languageclient": "^9.0.1",
+        "vscode-languageserver": "^9.0.1",
+        "vscode-languageserver-protocol": "^3.15.3",
+        "vscode-languageserver-textdocument": "^1.0.8",
+        "vue": "^3.3.4",
+        "web-tree-sitter": "^0.20.8",
+        "whatwg-url": "^14.0.0",
+        "winston": "^3.11.0",
+        "winston-transport": "^4.6.0",
+        "ws": "^8.16.0",
+        "xml2js": "^0.6.1",
+        "yaml-cfn": "^0.3.2"
+    },
+    "overrides": {
+        "webfont": {
+            "xml2js": "0.5.0"
+        }
+    }
+}
diff --git a/packages/core/package.nls.json b/packages/core/package.nls.json
new file mode 100644
index 00000000000..9e5c91e39e8
--- /dev/null
+++ b/packages/core/package.nls.json
@@ -0,0 +1,488 @@
+{
+    "AWS.title": "AWS",
+    "AWS.title.cn": "Amazon",
+    "AWS.productName": "AWS Toolkit",
+    "AWS.productName.cn": "Amazon Toolkit",
+    "AWS.amazonq.productName": "Amazon Q",
+    "AWS.codecatalyst.submenu.title": "Manage CodeCatalyst",
+    "AWS.notifications.title": "Notifications",
+    "AWS.configuration.profileDescription": "The name of the credential profile to obtain credentials from.",
+    "AWS.configuration.description.lambda.recentlyUploaded": "Recently selected Lambda upload targets.",
+    "AWS.configuration.description.ecs.openTerminalCommand": "The command to run when starting a new interactive terminal session.",
+    "AWS.configuration.description.iot.maxItemsPerPage": "Controls how many IoT Things, Certificates, or Policies are listed before showing a node to `Load More...`.",
+    "AWS.configuration.description.s3.maxItemsPerPage": "Controls how many S3 items are listed before showing a node to `Load More...`.\nThis corresponds to the `MaxKeys` requested in a single call to S3. [Learn More](https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html#AmazonS3-ListObjectsV2-response-MaxKeys)",
+    "AWS.configuration.description.samcli.lambdaTimeout": "Maximum time (in milliseconds) to wait for SAM output while starting a Local Lambda session",
+    "AWS.configuration.description.samcli.location": "Location of SAM CLI. SAM CLI is used to create, build, package, and deploy Serverless Applications. [Learn More](https://aws.amazon.com/serverless/sam/)",
+    "AWS.configuration.description.samcli.legacyDeploy": "Use the legacy SAM deploy experience, disabling all SAM sync functionality.",
+    "AWS.configuration.description.telemetry": "Enable AWS Toolkit to send usage data to AWS. [Details](https://docs.aws.amazon.com/sdkref/latest/guide/support-maint-idetoolkits.html)",
+    "AWS.configuration.description.telemetry.cn": "Enable Amazon Toolkit to send usage data to Amazon.",
+    "AWS.configuration.description.amazonq.telemetry": "Enable Amazon Q to send usage data to AWS. [Details](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/opt-out-IDE.html)",
+    "AWS.configuration.description.suppressPrompts": "Prompts which ask for confirmation. Checking an item suppresses the prompt.",
+    "AWS.configuration.enableCodeLenses": "Enable SAM hints in source code and template.yaml files",
+    "AWS.configuration.description.resources.enabledResources": "AWS resources to display in the 'Resources' portion of the explorer.",
+    "AWS.configuration.description.featureDevelopment.allowRunningCodeAndTests": "Allow /dev to run code and test commands",
+    "AWS.configuration.description.experiments": "Try experimental features and give feedback. Note that experimental features may be removed at any time.\n * `jsonResourceModification` - Enables basic create, update, and delete support for cloud resources via the JSON Resources explorer component.",
+    "AWS.stepFunctions.publishStateMachine.error.invalidYAML": "Cannot publish invalid YAML file",
+    "AWS.stepFunctions.publishStateMachine.info.creating": "Creating state machine '{0}' in {1}...",
+    "AWS.stepFunctions.publishStateMachine.info.createSuccess": "Created state machine '{0}'",
+    "AWS.stepFunctions.publishStateMachine.error.createFailure": "Failed to create state machine: {0}",
+    "AWS.stepFunctions.publishStateMachine.info.updating": "Updating state machine '{0}' in {1}...",
+    "AWS.stepFunctions.publishStateMachine.info.updateSuccess": "Updated state machine '{0}'",
+    "AWS.stepFunctions.publishStateMachine.error.updateFailure": "Failed to update state machine: {0}",
+    "AWS.stepFunctions.executeStateMachine.info.executing": "Starting execution of '{0}' in {1}...",
+    "AWS.stepFunctions.executeStateMachine.info.started": "Execution started",
+    "AWS.stepFunctions.executeStateMachine.error.failedToStart": "There was an error starting execution for '{0}', check AWS Toolkit logs for more information.",
+    "AWS.stepFunctions.asl.format.enable.desc": "Enables the default formatter used with Amazon States Language files",
+    "AWS.stepFunctions.asl.maxItemsComputed.desc": "The maximum number of outline symbols and folding regions computed (limited for performance reasons).",
+    "AWS.stepFunctions.workflowStudio.actions.progressMessage": "Opening asl file in Workflow Studio",
+    "AWS.stepFunctions.workflowStudio.actions.saveSuccessMessage": "{0} has been saved",
+    "AWS.stepFunctions.workflowStudio.actions.InvalidJSONContent": "The Workflow Studio editor was not opened because the JSON in the file is invalid. To access Workflow Studio, please fix the JSON and manually reopen the integration.",
+    "AWS.stepFunctions.workflowStudio.actions.InvalidYAMLContent": "The Workflow Studio editor was not opened because the YAML in the file is invalid. To access Workflow Studio, please fix the YAML and manually reopen the integration.",
+    "AWS.stepFunctions.workflowStudio.actions.webviewFetchFailed": "Failed to load Workflow Studio editor. Please check your network connection and try again.",
+    "AWS.configuration.description.awssam.debug.api": "API Gateway configuration",
+    "AWS.configuration.description.awssam.debug.api.clientCertId": "The API Gateway client certificate ID",
+    "AWS.configuration.description.awssam.debug.api.headers": "Additional HTTP headers",
+    "AWS.configuration.description.awssam.debug.api.httpMethod": "The HTTP message method that will be used",
+    "AWS.configuration.description.awssam.debug.api.path": "The path to the api (must start with /)",
+    "AWS.configuration.description.awssam.debug.api.queryString": "URL query string (e.g. key=foo&value=bar)",
+    "AWS.configuration.description.awssam.debug.api.stageVariables": "key-value map of API Gateway stage variables",
+    "AWS.configuration.description.awssam.debug.buildDir": "Base directory to build and run the application.\n A temporary directory will be created if not specified.",
+    "AWS.configuration.description.awssam.debug.label": "AWS SAM: Debug Lambda Function Locally",
+    "AWS.configuration.description.awssam.debug.invokeTarget": "Configures the application to launch",
+    "AWS.configuration.description.awssam.debug.target": "The type of invocation to launch. Possible values:\n* `template` uses a CFN/SAM Template as an entrypoint\n* `code` invokes Lambda code directly.\n* `api` uses the CFN/SAM Template to emulate API Gateway",
+    "AWS.configuration.description.awssam.debug.architecture": "Architecture used for local SAM Lambda emulation",
+    "AWS.configuration.description.awssam.debug.lambdaHandler": "Lambda Function handler to invoke.",
+    "AWS.configuration.description.awssam.debug.projectRoot": "The root of the project, used to determine where in the file-system to locate the lambdaHandler.",
+    "AWS.configuration.description.awssam.debug.templatePath": "Path to the CFN/SAM template.",
+    "AWS.configuration.description.awssam.debug.logicalId": "Resource name of an AWS::Lambda::Function or AWS::Serverless::Function to invoke.",
+    "AWS.configuration.description.awssam.debug.envvars": "Environment variables to pass to the function invocation (replaces template variables).",
+    "AWS.configuration.description.awssam.debug.lambda": "Lambda specific details of the invocation",
+    "AWS.configuration.description.awssam.debug.memoryMb": "The amount of memory (in Mb) the Lambda function has access to.",
+    "AWS.configuration.description.awssam.debug.runtime": "The Lambda Function's runtime",
+    "AWS.configuration.description.awssam.debug.timeout": "The amount of time (in seconds) that Lambda allows a function to run before stopping it.",
+    "AWS.configuration.description.awssam.debug.aws": "AWS connection details",
+    "AWS.configuration.description.awssam.debug.credentials": "The AWS credentials provider and name to use during the invocation. Example: credential profile \"default\" would be entered as `profile:default`.",
+    "AWS.configuration.description.awssam.debug.credentials.cn": "The Amazon credentials provider and name to use during the invocation. Example: credential profile \"default\" would be entered as `profile:default`.",
+    "AWS.configuration.description.awssam.debug.region": "AWS region to use during the invocation.",
+    "AWS.configuration.description.awssam.debug.event": "Event payload to pass to the Lambda invocation.\n Must specify one of 'json' or 'path'.",
+    "AWS.configuration.description.awssam.debug.event.json": "JSON definition to use as the event payload",
+    "AWS.configuration.description.awssam.debug.event.path": "Path to a file to use as the event payload",
+    "AWS.configuration.description.awssam.debug.sam": "SAM CLI specific configurations",
+    "AWS.configuration.description.awssam.debug.buildArguments": "Additional arguments to pass to the `sam build` command.",
+    "AWS.configuration.description.awssam.debug.containerBuild": "Whether to build inside a container (default: false).",
+    "AWS.configuration.description.awssam.debug.dockerNetwork": "Specifies the name or id of an existing Docker network that Lambda Docker containers should connect to.",
+    "AWS.configuration.description.awssam.debug.localArguments": "Additional arguments to pass to the `sam local` command.",
+    "AWS.configuration.description.awssam.debug.skipNewImageCheck": "Specifies whether the command should skip pulling down the latest Docker image for Lambda runtime (default: false).",
+    "AWS.configuration.description.awssam.debug.template": "Values to override in the template",
+    "AWS.configuration.description.awssam.debug.templateParameters": "Key:value mappings for SAM template parameter overrides. More information can be found here: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stackinstances-override.html#stackinstances-override-cli",
+    "AWS.configuration.description.awssam.debug.snippets.lambdaCode.label": "AWS SAM: Direct Lambda handler invoke",
+    "AWS.configuration.description.awssam.debug.snippets.lambdaCode.description": "A new configuration for invoking an AWS Lambda directly via the SAM CLI.",
+    "AWS.configuration.description.awssam.debug.snippets.lambdaCode.label.cn": "Amazon SAM: Direct Lambda handler invoke",
+    "AWS.configuration.description.awssam.debug.snippets.lambdaCode.description.cn": "A new configuration for invoking an Amazon Lambda directly via the SAM CLI.",
+    "AWS.configuration.description.awssam.debug.snippets.lambdaTemplate.label": "AWS SAM: Template-based Lambda invoke",
+    "AWS.configuration.description.awssam.debug.snippets.lambdaTemplate.description": "A new configuration for invoking an AWS Lambda in a CloudFormation template via the SAM CLI.",
+    "AWS.configuration.description.awssam.debug.snippets.lambdaTemplate.label.cn": "Amazon SAM: Template-based Lambda invoke",
+    "AWS.configuration.description.awssam.debug.snippets.lambdaTemplate.description.cn": "A new configuration for invoking an Amazon Lambda in a CloudFormation template via the SAM CLI.",
+    "AWS.configuration.description.awssam.debug.snippets.api.label": "AWS SAM: API Gateway lambda invoke",
+    "AWS.configuration.description.awssam.debug.snippets.api.description": "A new configuration for invoking an AWS Lambda in a CloudFormation template, simulating API Gateway",
+    "AWS.configuration.description.awssam.debug.snippets.api.label.cn": "Amazon SAM: API Gateway lambda invoke",
+    "AWS.configuration.description.awssam.debug.snippets.api.description.cn": "A new configuration for invoking an Amazon Lambda in a CloudFormation template, simulating API Gateway",
+    "AWS.configuration.description.amazonq": "Amazon Q creates a code reference when you insert a code suggestion from Amazon Q that is similar to training data. When unchecked, Amazon Q will not show code suggestions that have code references. If you authenticate through IAM Identity Center, this setting is controlled by your Amazon Q administrator. [Learn More](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/code-reference.html)",
+    "AWS.configuration.description.amazonq.shareContentWithAWS": "When checked, your content processed by Amazon Q may be used for service improvement (except for content processed for users with the Amazon Q Developer Pro Tier). Unchecking this box will cause AWS to delete any of your content used for that purpose. The information used to provide the Amazon Q service to you will not be affected. See the [Service Terms](https://aws.amazon.com/service-terms) for more details.",
+    "AWS.configuration.description.amazonq.importRecommendation": "Amazon Q will add import statements with inline code suggestions when necessary.",
+    "AWS.configuration.description.amazonq.workspaceIndex": "When you add @workspace to your question in Amazon Q chat, Amazon Q will index your workspace files locally to use as context for its response. Extra CPU usage is expected while indexing a workspace. This will not impact Amazon Q features or your IDE, but you may manage CPU usage by setting the number of local threads in 'Local Workspace Index Threads'.",
+    "AWS.configuration.description.amazonq.workspaceIndexWorkerThreads": "Number of worker threads of Amazon Q local index process. '0' will use the system default worker threads for balance performance. You may increase this number to more quickly index your workspace, but only up to your hardware's number of CPU cores. Please restart VS Code or reload the VS Code window after changing worker threads.",
+    "AWS.configuration.description.amazonq.workspaceIndexUseGPU": "Enable GPU to help index your local workspace files. Only applies to Linux and Windows.",
+    "AWS.configuration.description.amazonq.workspaceIndexMaxSize": "The maximum size of local workspace to be indexed in MB",
+    "AWS.configuration.description.amazonq.workspaceIndexMaxFileSize": "The maximum size of local workspace files to be indexed in MB",
+    "AWS.configuration.description.amazonq.workspaceIndexIgnoreFilePatterns": "File patterns to ignore when indexing your workspace files",
+    "AWS.configuration.description.amazonq.workspaceIndexCacheDirPath": "The path to the directory that contains the cache of the index of your workspace files",
+    "AWS.configuration.description.amazonq.ignoredSecurityIssues": "Specifies a list of code issue identifiers that Amazon Q should ignore when reviewing your workspace. Each item in the array should be a unique string identifier for a specific code issue. This allows you to suppress notifications for known issues that you've assessed and determined to be false positives or not applicable to your project. Use this setting with caution, as it may cause you to miss important security alerts.",
+    "AWS.configuration.description.amazonq.proxy.certificateAuthority": "Path to a Certificate Authority (PEM file) for SSL/TLS verification when using a proxy.",
+    "AWS.configuration.description.amazonq.proxy.enableProxyAndCertificateAutoDiscovery": "Automatically detect system proxy settings and SSL certificates.",
+    "AWS.command.apig.invokeRemoteRestApi": "Invoke remotely",
+    "AWS.command.apig.invokeRemoteRestApi.cn": "Invoke on Amazon",
+    "AWS.appBuilder.explorerTitle": "Application Builder",
+    "AWS.appBuilder.explorerNode.noApps": "[This resource is not yet supported.]",
+    "AWS.appBuilder.explorerNode.unavailableDeployedResource": "[Failed to retrive deployed resource.]",
+    "AWS.command.appBuilder.openHandler": "Open Function Handler",
+    "AWS.command.applicationComposer.open": "Open with Infrastructure Composer",
+    "AWS.command.appBuilder.openTemplate": "Open Template File",
+    "AWS.command.appBuilder.deploy": "Deploy SAM Application",
+    "AWS.command.appBuilder.build": "Build SAM Template",
+    "AWS.command.appBuilder.searchLogs": "Search Logs",
+    "AWS.command.appBuilder.tailLogs": "Tail Logs",
+    "AWS.command.refreshappBuilderExplorer": "Refresh Application Builder Explorer",
+    "AWS.command.applicationComposer.openDialog": "Open Template with Infrastructure Composer...",
+    "AWS.command.auth.addConnection": "Add New Connection",
+    "AWS.command.auth.showConnectionsPage": "Add New Connection",
+    "AWS.command.auth.switchConnections": "Switch Connections",
+    "AWS.command.auth.signout": "Sign Out",
+    "AWS.command.github": "View Source on GitHub",
+    "AWS.command.help": "View Toolkit Documentation",
+    "AWS.command.login": "Connect to AWS",
+    "AWS.command.login.cn": "Connect to Amazon",
+    "AWS.command.logout": "Sign Out",
+    "AWS.command.createIssueOnGitHub": "Report Issue",
+    "AWS.command.createNewSamApp": "Create Lambda SAM Application",
+    "AWS.command.credentials.profile.create": "Create Credentials Profile",
+    "AWS.command.credentials.edit": "Edit Credentials",
+    "AWS.command.showRegion": "Show or Hide Regions",
+    "AWS.command.codecatalyst.openOrg": "Open CodeCatalyst Space",
+    "AWS.command.codecatalyst.openProject": "Open CodeCatalyst Project",
+    "AWS.command.codecatalyst.openRepo": "Open CodeCatalyst Repository",
+    "AWS.command.codecatalyst.openDevEnv": "Open CodeCatalyst Dev Environment",
+    "AWS.command.codecatalyst.cloneRepo": "Clone CodeCatalyst Repository",
+    "AWS.command.codecatalyst.createDevEnv": "Create CodeCatalyst Dev Environment",
+    "AWS.command.codecatalyst.listCommands": "List CodeCatalyst Commands",
+    "AWS.command.codecatalyst.login": "Connect to CodeCatalyst",
+    "AWS.command.codecatalyst.logout": "Sign out of CodeCatalyst",
+    "AWS.command.codecatalyst.signout": "Sign Out",
+    "AWS.command.manageSubscription": "Manage Q Developer Pro Subscription",
+    "AWS.command.amazonq.explainCode": "Explain",
+    "AWS.command.amazonq.refactorCode": "Refactor",
+    "AWS.command.amazonq.fixCode": "Fix",
+    "AWS.command.amazonq.optimizeCode": "Optimize",
+    "AWS.command.amazonq.sendToPrompt": "Send to prompt",
+    "AWS.command.amazonq.generateUnitTests": "Generate Tests",
+    "AWS.command.amazonq.generateFix": "Fix",
+    "AWS.command.amazonq.viewDetails": "View Details",
+    "AWS.command.amazonq.explainIssue": "Explain",
+    "AWS.command.amazonq.ignoreIssue": "Ignore Issue",
+    "AWS.command.amazonq.ignoreAllIssues": "Ignore Similar Issues",
+    "AWS.command.amazonq.acceptFix": "Accept Fix",
+    "AWS.command.amazonq.regenerateFix": "Regenerate Fix",
+    "AWS.command.amazonq.filterIssues": "Filter Issues",
+    "AWS.command.amazonq.groupIssues": "Group Issues",
+    "AWS.command.deploySamApplication": "Deploy SAM Application",
+    "AWS.command.aboutToolkit": "About",
+    "AWS.command.downloadLambda": "Download...",
+    "AWS.command.uploadLambda": "Upload Lambda...",
+    "AWS.command.invokeLambda": "Invoke Remotely",
+    "AWS.command.openLambdaFile": "Open your Lambda code",
+    "AWS.command.quickDeployLambda": "Save and deploy your code",
+    "AWS.command.openLambdaWorkspace": "Open in a workspace",
+    "AWS.command.invokeLambda.cn": "Invoke on Amazon",
+    "AWS.command.remoteDebugging.clearSnapshot": "Reset Lambda Remote Debugging Snapshot",
+    "AWS.command.lambda.convertToSam": "Convert to SAM Application",
+    "AWS.command.refreshAwsExplorer": "Refresh Explorer",
+    "AWS.command.refreshCdkExplorer": "Refresh CDK Explorer",
+    "AWS.command.cdk.help": "View CDK Documentation",
+    "AWS.command.ec2.openTerminal": "Open Terminal to EC2 Instance...",
+    "AWS.command.ec2.openRemoteConnection": "Connect VS Code to EC2 Instance...",
+    "AWS.command.ec2.startInstance": "Start EC2 Instance",
+    "AWS.command.ec2.linkToLaunch": "Launch EC2 Instance",
+    "AWS.command.ec2.stopInstance": "Stop EC2 Instance",
+    "AWS.command.ec2.rebootInstance": "Reboot EC2 Instance",
+    "AWS.command.ec2.copyInstanceId": "Copy Instance Id",
+    "AWS.command.ec2.viewLogs": "View EC2 Logs",
+    "AWS.command.ecr.copyTagUri": "Copy Tag URI",
+    "AWS.command.ecr.copyRepositoryUri": "Copy Repository URI",
+    "AWS.command.ecr.createRepository": "Create Repository...",
+    "AWS.command.ecr.deleteRepository": "Delete Repository...",
+    "AWS.command.ecr.deleteTag": "Delete Tag...",
+    "AWS.ecs.enableEcsExec": "Enable Command Execution",
+    "AWS.ecs.disableEcsExec": "Disable Command Execution",
+    "AWS.ecs.runCommandInContainer": "Run Command in Container",
+    "AWS.ecs.openTaskInTerminal": "Open Terminal...",
+    "AWS.command.samcli.detect": "Detect SAM CLI",
+    "AWS.command.deleteCloudFormation": "Delete CloudFormation Stack",
+    "AWS.command.viewSchemaItem": "View Schema",
+    "AWS.command.searchSchema": "Search Schemas",
+    "AWS.command.executeStateMachine": "Start Execution...",
+    "AWS.command.copyArn": "Copy ARN",
+    "AWS.command.copyName": "Copy Name",
+    "AWS.command.openAwsConsole": "Go to AWS management console",
+    "AWS.command.openAwsConsole.cn": "Go to Amazon management console",
+    "AWS.command.listCommands": "Show AWS Commands...",
+    "AWS.command.listCommands.cn": "Show Amazon Commands...",
+    "AWS.command.downloadStateMachineDefinition": "Download Definition...",
+    "AWS.command.searchSchemaPerRegistry": "Search Schemas in Registry",
+    "AWS.command.submitFeedback": "Send Feedback...",
+    "AWS.command.downloadSchemaItemCode": "Download Code Bindings",
+    "AWS.command.viewLogs": "View Logs",
+    "AWS.command.cloudWatchLogs.searchLogGroup": "Search Log Group",
+    "AWS.command.cloudWatchLogs.tailLogGroup": "Tail Log Group",
+    "AWS.command.sam.newTemplate": "Create new SAM Template",
+    "AWS.command.cloudFormation.newTemplate": "Create new CloudFormation Template",
+    "AWS.command.quickStart": "View Quick Start",
+    "AWS.command.iot.createThing": "Create Thing...",
+    "AWS.command.iot.createCert": "Create Certificate...",
+    "AWS.command.iot.createPolicy": "Create Policy from Document...",
+    "AWS.command.iot.createPolicyVersion": "Create new version from Document...",
+    "AWS.command.iot.attachCert": "Attach Certificate...",
+    "AWS.command.iot.attachPolicy": "Attach Policy...",
+    "AWS.command.iot.activateCert": "Activate...",
+    "AWS.command.iot.deactivateCert": "Deactivate...",
+    "AWS.command.iot.revokeCert": "Revoke...",
+    "AWS.command.iot.detachCert": "Detach...",
+    "AWS.command.iot.setDefaultPolicy": "Set as Default",
+    "AWS.command.iot.viewPolicyVersion": "View...",
+    "AWS.command.iot.copyEndpoint": "Copy Endpoint...",
+    "AWS.command.samcli.sync": "Sync SAM Application (formerly Deploy)",
+    "AWS.command.s3.downloadFileAs": "Download As...",
+    "AWS.command.s3.editFile": "Edit File",
+    "AWS.command.s3.openFile": "Open File",
+    "AWS.command.s3.copyPath": "Copy Path",
+    "AWS.command.s3.presignedURL": "Generate Presigned URL...",
+    "AWS.command.s3.createBucket": "Create Bucket...",
+    "AWS.command.s3.createFolder": "Create Folder...",
+    "AWS.command.s3.uploadFile": "Upload Files...",
+    "AWS.command.s3.uploadFileToParent": "Upload to Parent...",
+    "AWS.command.smus.switchProject": "Switch Project",
+    "AWS.command.smus.refreshProject": "Refresh Project",
+    "AWS.command.smus.signOut": "Sign Out",
+    "AWS.command.sagemaker.filterSpaces": "Filter Sagemaker Spaces",
+    "AWS.command.stepFunctions.createStateMachineFromTemplate": "Create a new Step Functions state machine",
+    "AWS.command.stepFunctions.publishStateMachine": "Publish state machine to Step Functions",
+    "AWS.command.stepFunctions.openWithWorkflowStudio": "Open with Workflow Studio",
+    "AWS.command.cdk.previewStateMachine": "Render state machine graph from CDK application",
+    "AWS.command.copyLogResource": "Copy Log Stream or Group",
+    "AWS.command.saveCurrentLogDataContent": "Save Log to File",
+    "AWS.command.cwl.changeFilterPattern": "Search by Pattern...",
+    "AWS.command.cwl.changeTimeFilter": "Search by Date...",
+    "AWS.command.viewLogStream": "View Log Stream...",
+    "AWS.command.ssmDocument.createLocalDocument": "Create a new Systems Manager Document locally",
+    "AWS.command.ssmDocument.deleteDocument": "Delete Document",
+    "AWS.command.ssmDocument.updateDocumentVersion": "Set Default Version",
+    "AWS.command.ssmDocument.openLocalDocument": "Download",
+    "AWS.command.ssmDocument.openLocalDocumentJson": "Download as JSON",
+    "AWS.command.ssmDocument.openLocalDocumentYaml": "Download as YAML",
+    "AWS.command.ssmDocument.publishDocument": "Publish a Systems Manager Document",
+    "AWS.command.launchConfigForm.title": "Invoke Locally",
+    "AWS.command.addSamDebugConfig": "Add Local Invoke and Debug Configuration",
+    "AWS.command.toggleSamCodeLenses": "Toggle SAM hints in source files",
+    "AWS.command.apprunner.createService": "Create Service",
+    "AWS.command.apprunner.createServiceFromEcr": "Create App Runner Service",
+    "AWS.command.apprunner.pauseService": "Pause Service",
+    "AWS.command.apprunner.resumeService": "Resume Service",
+    "AWS.command.apprunner.copyServiceUrl": "Copy Service URL",
+    "AWS.command.apprunner.open": "Open in Browser",
+    "AWS.command.apprunner.startDeployment": "Start Deployment",
+    "AWS.command.docdb.createCluster": "Create DocumentDB Cluster",
+    "AWS.command.docdb.createInstance": "Add Instance...",
+    "AWS.command.docdb.modifyInstance": "Modify Class...",
+    "AWS.command.docdb.rebootInstance": "Reboot Instance",
+    "AWS.command.docdb.startCluster": "Start Cluster",
+    "AWS.command.docdb.stopCluster": "Stop Cluster",
+    "AWS.command.docdb.tags": "Tags...",
+    "AWS.command.docdb.open": "Open in Browser",
+    "AWS.command.docdb.openHelp": "Open Getting Started Guide",
+    "AWS.command.docdb.copyEndpoint": "Copy Endpoint",
+    "AWS.command.docdb.addRegion": "Add region...",
+    "AWS.command.resources.copyIdentifier": "Copy Identifier",
+    "AWS.command.resources.configure": "Show Resources...",
+    "AWS.command.codewhisperer.introduction": "What is Amazon Q?",
+    "AWS.command.codewhisperer.configure": "Settings",
+    "AWS.command.codewhisperer.signout": "Sign Out",
+    "AWS.command.codewhisperer.reconnect": "Reconnect",
+    "AWS.command.codewhisperer.openReferencePanel": "Open Code Reference Log",
+    "AWS.command.codewhisperer.showLogs": "Show Logs",
+    "AWS.command.q.selectRegionProfile": "Select Profile",
+    "AWS.command.q.transform.acceptChanges": "Accept",
+    "AWS.command.q.transform.rejectChanges": "Reject",
+    "AWS.command.q.transform.stopJobInHub": "Stop job",
+    "AWS.command.q.transform.viewJobProgress": "View job progress",
+    "AWS.command.q.transform.viewJobHistory": "View job history",
+    "AWS.command.q.transform.showTransformationPlan": "View plan",
+    "AWS.command.q.transform.showChangeSummary": "View summary",
+    "AWS.command.threatComposer.createNew": "Create New Threat Composer File",
+    "AWS.command.threatComposer.newFile": "Threat Composer File",
+    "AWS.threatComposer.page.title": "{0} (Threat Composer)",
+    "AWS.threatComposer.title": "Threat Composer",
+    "AWS.configuration.description.threatComposer.defaultEditor": "Use Threat Composer as the default editor for *.tc.json files.",
+    "AWS.command.accessanalyzer.iamPolicyChecks": "Open IAM Policy Checks",
+    "AWS.lambda.explorerTitle": "Explorer",
+    "AWS.developerTools.explorerTitle": "Developer Tools",
+    "AWS.codewhisperer.explorerTitle": "CodeWhisperer",
+    "AWS.appcomposer.explorerTitle": "Infrastructure Composer",
+    "AWS.cdk.explorerTitle": "CDK",
+    "AWS.codecatalyst.explorerTitle": "CodeCatalyst",
+    "AWS.sagemakerunifiedstudio.explorerTitle": "SageMaker Unified Studio",
+    "AWS.cwl.limit.desc": "Maximum amount of log entries pulled per request from CloudWatch Logs. For LiveTail, when the limit is reached, the oldest events will be removed to accomodate new events. (max 10000)",
+    "AWS.samcli.deploy.bucket.recentlyUsed": "Buckets recently used for SAM deployments",
+    "AWS.submenu.amazonqEditorContextSubmenu.title": "Amazon Q",
+    "AWS.submenu.auth.title": "Authentication",
+    "AWS.submenu.amazonqSecurityIssueTree.filters": "Filter Issues",
+    "AWS.generic.feedback": "Feedback",
+    "AWS.generic.help": "Help",
+    "AWS.generic.create": "Create...",
+    "AWS.generic.save": "Save",
+    "AWS.generic.close": "Close",
+    "AWS.generic.copyUrl": "Copy URL",
+    "AWS.generic.promptDelete": "Delete...",
+    "AWS.generic.promptUpdate": "Update...",
+    "AWS.generic.promptRename": "Rename...",
+    "AWS.generic.preview": "Preview",
+    "AWS.generic.viewDocs": "View Documentation",
+    "AWS.generic.moreActions": "More Actions...",
+    "AWS.generic.dismiss": "Dismiss",
+    "AWS.generic.cancel": "Cancel",
+    "AWS.generic.cancelling": "Cancelling...",
+    "AWS.ssmDocument.ssm.maxItemsComputed.desc": "Controls the maximum number of problems produced by the SSM Document language server.",
+    "AWS.walkthrough.gettingStarted.title": "Get started with AWS",
+    "AWS.walkthrough.gettingStarted.description": "These walkthroughs help you set up the AWS Toolkit.",
+    "AWS.walkthrough.gettingStarted.description.cn": "These walkthroughs help you set up the Amazon Toolkit.",
+    "AWS.walkthrough.gettingStarted.connect": "Connect to AWS",
+    "AWS.walkthrough.gettingStarted.changeRegions": "Change AWS Regions",
+    "AWS.walkthrough.gettingStarted.setupToolchain": "Configure your toolchain",
+    "AWS.command.codewhisperer.title": "Manual trigger inline suggestion",
+    "AWS.explorerNode.selectCustomization.label": "Select a Customization",
+    "AWS.codewhisperer.customization.base.label": "Amazon Q foundation (Default)",
+    "AWS.codewhisperer.customization.base.description": "default",
+    "AWS.codewhisperer.customization.base.detail": "Receive suggestions from Amazon Q base model",
+    "AWS.codewhisperer.customization.selected": "Connected",
+    "AWS.codewhisperer.customization.quickPick.title": "Select a Customization",
+    "AWS.codewhisperer.customization.quickPick.placeholder": "You have access to the following customizations",
+    "AWS.codewhisperer.customization.notification.new_customizations.select": "Select Customization",
+    "AWS.codewhisperer.customization.notification.new_customizations.learn_more": "Learn More",
+    "AWS.amazonq.title": "Amazon Q",
+    "AWS.amazonq.chat": "Chat",
+    "AWS.amazonq.openChat": "Open Chat",
+    "AWS.amazonq.clearCache": "Clear extension cache",
+    "AWS.amazonq.context.folders.title": "Folders",
+    "AWS.amazonq.context.folders.description": "Add all files in a folder to context",
+    "AWS.amazonq.context.files.title": "Files",
+    "AWS.amazonq.context.files.description": "Add a file to context",
+    "AWS.amazonq.context.prompts.title": "Prompts",
+    "AWS.amazonq.context.prompts.description": "Add a saved prompt to context",
+    "AWS.amazonq.context.code.title": "Code",
+    "AWS.amazonq.context.code.description": "Add code to context",
+    "AWS.amazonq.savedPrompts.title": "Prompt name",
+    "AWS.amazonq.savedPrompts.create": "Create",
+    "AWS.amazonq.savedPrompts.action": "Create a new prompt",
+    "AWS.amazonq.savedPrompts.placeholder": "Enter prompt name",
+    "AWS.amazonq.savedPrompts.description": "Use this prompt by typing '@' followed by the prompt name.",
+    "AWS.amazonq.chat.workspacecontext.enable.message": "Amazon Q: Workspace index is now enabled. You can disable it from Amazon Q settings.",
+    "AWS.amazonq.security": "Code Issues",
+    "AWS.amazonq.login": "Login",
+    "AWS.amazonq.learnMore": "Learn More About Amazon Q",
+    "AWS.amazonq.welcomeWalkthrough": "Welcome Walkthrough",
+    "AWS.amazonq.codewhisperer.title": "Amazon Q",
+    "AWS.amazonq.toggleCodeSuggestion": "Toggle Auto-Suggestions",
+    "AWS.amazonq.toggleCodeScan": "Toggle Auto-Scans",
+    "AWS.amazonq.toggleNextEditPredictionPanel": "Toggle next edit suggestion",
+    "AWS.amazonq.scans.scanProgress": "Sure. This may take a few minutes. I will send a notification when it’s complete if you navigate away from this panel.",
+    "AWS.amazonq.scans.waitingForInput": "Waiting on your inputs...",
+    "AWS.amazonq.scans.chooseScan.description": "Would you like to review your active file or the workspace you have open?",
+    "AWS.amazonq.scans.runCodeScan": "Run a code review",
+    "AWS.amazonq.scans.projectScan": "Review workspace",
+    "AWS.amazonq.scans.fileScan": "Review active file",
+    "AWS.amazonq.scans.projectScanInProgress": "Workspace review is in progress...",
+    "AWS.amazonq.scans.fileScanInProgress": "File review is in progress...",
+    "AWS.amazonq.scans.noGitRepo": "Your workspace is not in a git repository. I'll review your project files for security issues, and your in-flight changes for code quality issues.",
+    "AWS.amazonq.codefix.error.monthlyLimitReached": "Maximum code fix count reached for this month.",
+    "AWS.amazonq.scans.severity": "Severity",
+    "AWS.amazonq.scans.fileLocation": "File Location",
+    "AWS.amazonq.scans.groupIssues": "Group Issues",
+    "AWS.amazonq.scans.groupIssues.placeholder": "Select how to group code issues",
+    "AWS.amazonq.featureDev.error.conversationIdNotFoundError": "Conversation id must exist before starting code generation",
+    "AWS.amazonq.featureDev.error.contentLengthError": "The folder you selected is too large for me to use as context. Please choose a smaller folder to work on. For more information on quotas, see the <a href=\"https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/software-dev.html#quotas\" target=\"_blank\">Amazon Q Developer documentation.</a>",
+    "AWS.amazonq.featureDev.error.illegalStateTransition": "Illegal transition between states, restart the conversation",
+    "AWS.amazonq.featureDev.error.prepareRepoFailedError": "Sorry, I ran into an issue while trying to upload your code. Please try again.",
+    "AWS.amazonq.featureDev.error.promptRefusalException": "I'm sorry, I can't generate code for your request. Please make sure your message and code files comply with the <a href=\"https://aws.amazon.com/machine-learning/responsible-ai/policy/\">AWS Responsible AI Policy.</a>",
+    "AWS.amazonq.featureDev.error.noChangeRequiredException": "I'm sorry, I ran into an issue while trying to generate your code.\n\n- `/dev` can generate code to make a change in your project. Provide a detailed description of the new feature or code changes you want to make, including the specifics of what the code should achieve.\n\n- To ask me to explain, debug, or optimize your code, you can close this chat tab to start a new conversation.",
+    "AWS.amazonq.featureDev.error.zipFileError": "The zip file is corrupted",
+    "AWS.amazonq.featureDev.error.codeIterationLimitError": "Sorry, you've reached the quota for number of iterations on code generation. You can insert this code in your files or discuss a new plan. For more information on quotas, see the <a href=\"https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/software-dev.html#quotas\" target=\"_blank\">Amazon Q Developer documentation.</a>",
+    "AWS.amazonq.featureDev.error.tabIdNotFoundError": "I'm sorry, I'm having technical difficulties at the moment. Please try again.",
+    "AWS.amazonq.featureDev.error.codeGen.denyListedError": "I'm sorry, I'm having trouble generating your code and can't continue at the moment. Please try again later, and share feedback to help me improve.",
+    "AWS.amazonq.featureDev.error.codeGen.default": "I'm sorry, I ran into an issue while trying to generate your code. Please try again.",
+    "AWS.amazonq.featureDev.error.codeGen.timeout": "Code generation did not finish within the expected time",
+    "AWS.amazonq.featureDev.error.uploadURLExpired": "I’m sorry, I wasn't able to generate code. A connection timed out or became unavailable. Please try again or check the following:\n\n- Exclude non-essential files in your workspace’s `.gitignore.`\n\n- Check that your network connection is stable.",
+    "AWS.amazonq.featureDev.error.workspaceFolderNotFoundError": "I couldn't find a workspace folder. Open a workspace, and then open a new chat tab and enter /dev to start discussing your code task with me.",
+    "AWS.amazonq.featureDev.error.selectedFolderNotInWorkspaceFolderError": "The folder you chose isn't in your open workspace folder. You can add this folder to your workspace, or choose a folder in your open workspace.",
+    "AWS.amazonq.featureDev.error.userMessageNotFoundError": "It looks like you didn't provide an input. Please enter your message in the text bar.",
+    "AWS.amazonq.featureDev.error.monthlyLimitReached": "You've reached the monthly quota for Amazon Q Developer's agent capabilities. You can try again next month. For more information on usage limits, see the <a href=\"https://aws.amazon.com/q/developer/pricing/\" target=\"_blank\">Amazon Q Developer pricing page</a>.",
+    "AWS.amazonq.featureDev.error.technicalDifficulties": "I'm sorry, I'm having technical difficulties and can't continue at the moment. Please try again later, and share feedback to help me improve.",
+    "AWS.amazonq.featureDev.error.throttling": "I'm sorry, I'm experiencing high demand at the moment and can't generate your code. This attempt won't count toward usage limits. Please try again.",
+    "AWS.amazonq.featureDev.error.submitFeedback": "'submitFeedback' command was called programmatically, but its not registered.",
+    "AWS.amazonq.featureDev.pillText.awaitMessage": "Okay, I'll generate code for that.\n\nThis might take a few minutes. You can navigate away from this chat, but please keep this tab open. I'll notify you when I'm done.",
+    "AWS.amazonq.featureDev.pillText.awaitMessageRetry": "Okay, I'll generate new code.\n\nThis might take a few minutes. You can navigate away from this chat, but please keep this tab open. I'll notify you when I'm done.",
+    "AWS.amazonq.featureDev.pillText.modifyDefaultSourceFolder": "Choose another folder in your workspace",
+    "AWS.amazonq.featureDev.pillText.newTask": "Yes, I have another task",
+    "AWS.amazonq.featureDev.pillText.generateCode": "Generate code",
+    "AWS.amazonq.featureDev.pillText.uploadingCode": "Uploading code...",
+    "AWS.amazonq.featureDev.pillText.contextGatheringCompleted": "Gathering context...",
+    "AWS.amazonq.featureDev.pillText.generatingCode": "Generating code...",
+    "AWS.amazonq.featureDev.pillText.requestingChanges": "Requesting changes ...",
+    "AWS.amazonq.featureDev.pillText.insertCode": "Accept code",
+    "AWS.amazonq.featureDev.pillText.continue": "Continue",
+    "AWS.amazonq.featureDev.pillText.acceptAllChanges": "Accept all changes",
+    "AWS.amazonq.featureDev.pillText.acceptRemainingChanges": "Accept remaining changes",
+    "AWS.amazonq.featureDev.pillText.stoppingCodeGeneration": "Stopping code generation...",
+    "AWS.amazonq.featureDev.pillText.sendFeedback": "Send feedback",
+    "AWS.amazonq.featureDev.pillText.selectFiles": "Select files for context",
+    "AWS.amazonq.featureDev.pillText.retry": "Retry",
+    "AWS.amazonq.featureDev.pillText.writeNewPrompt": "Write a new prompt",
+    "AWS.amazonq.featureDev.pillText.reauthenticate": "Follow instructions to re-authenticate ...",
+    "AWS.amazonq.featureDev.pillText.closeSession": "No, thanks",
+    "AWS.amazonq.featureDev.pillText.selectOption": "Choose an option to proceed",
+    "AWS.amazonq.featureDev.pillText.unableGenerateChanges": "Unable to generate any file changes",
+    "AWS.amazonq.featureDev.pillText.provideFeedback": "Provide feedback & regenerate",
+    "AWS.amazonq.featureDev.pillText.generateDevFile": "Generate devfile to build code",
+    "AWS.amazonq.featureDev.pillText.acceptForProject": "Yes, use my devfile for this project",
+    "AWS.amazonq.featureDev.pillText.declineForProject": "No, thanks",
+    "AWS.amazonq.featureDev.answer.generateSuggestion": "Would you like to generate a suggestion for this? You’ll review a file diff before inserting into your project.",
+    "AWS.amazonq.featureDev.answer.qGeneratedCode": "The Amazon Q Developer Agent for software development has generated code for you to review",
+    "AWS.amazonq.featureDev.answer.howCodeCanBeImproved": "How can I improve the code for your use case?",
+    "AWS.amazonq.featureDev.answer.updateCode": "Okay, I updated your code files. Would you like to work on another task?",
+    "AWS.amazonq.featureDev.answer.sessionClosed": "Okay, I've ended this chat session. You can open a new tab to chat or start another workflow.",
+    "AWS.amazonq.featureDev.answer.newTaskChanges": "What new task would you like to work on?",
+    "AWS.amazonq.featureDev.answer.devFileSuggestion": "For future tasks in this project, I can create a devfile to build and test code as I generate it. This can improve the quality of generated code. To allow me to create a devfile, choose **Generate devfile to build code**.",
+    "AWS.amazonq.featureDev.answer.settingUpdated": "I've updated your settings so I can run code and test commands based on your devfile for this project. You can update this setting under **Amazon Q: Allow Q /dev to run code and test commands**.",
+    "AWS.amazonq.featureDev.answer.devFileInRepository": "I noticed that your repository has a `devfile.yaml`. Would you like me to use the devfile to build and test your project as I generate code? \n\nFor more information on using devfiles to improve code generation, see the  <a href=\"https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/software-dev.html\" target=\"_blank\">Amazon Q Developer documentation</a>.",
+    "AWS.amazonq.featureDev.placeholder.chatInputDisabled": "Chat input is disabled",
+    "AWS.amazonq.featureDev.placeholder.additionalImprovements": "Describe your task or issue in detail",
+    "AWS.amazonq.featureDev.placeholder.feedback": "Provide feedback or comments",
+    "AWS.amazonq.featureDev.placeholder.describe": "Describe your task or issue in detail",
+    "AWS.amazonq.featureDev.placeholder.sessionClosed": "Open a new chat tab to continue",
+    "AWS.amazonq.doc.pillText.selectOption": "Choose an option to continue",
+    "AWS.amazonq.doc.answer.createReadme": "Create a README for this project?",
+    "AWS.amazonq.doc.answer.updateReadme": "Update the README for this project?",
+    "AWS.amazonq.doc.answer.editReadme": "Okay, let's work on your README. Describe the changes you would like to make. For example, you can ask me to:\n- Correct something\n- Expand on something\n- Add a section\n- Remove a section",
+    "AWS.amazonq.doc.answer.readmeCreated": "I've created a README for your code.",
+    "AWS.amazonq.doc.answer.readmeUpdated": "I've updated your README.",
+    "AWS.amazonq.doc.answer.codeResult": "You can accept the changes to your files, or describe any additional changes you'd like me to make.",
+    "AWS.amazonq.doc.answer.acceptOrReject": "You can accept or reject the changes to your files.",
+    "AWS.amazonq.doc.answer.scanning": "Scanning source files",
+    "AWS.amazonq.doc.answer.summarizing": "Summarizing source files",
+    "AWS.amazonq.doc.answer.generating": "Generating documentation",
+    "AWS.amazonq.doc.answer.creating": "Okay, I'm creating a README for your project. This might take a few minutes.",
+    "AWS.amazonq.doc.answer.updating": "Okay, I'm updating the README. This might take a few minutes.",
+    "AWS.amazonq.doc.answer.chooseFolder": "Choose a folder to continue.",
+    "AWS.amazonq.doc.error.noFolderSelected": "It looks like you didn't choose a folder. Choose a folder to continue.",
+    "AWS.amazonq.doc.error.contentLengthError": "The folder you selected is in a project or workspace that is too large for me to use as context. To create or update a README for your code, choose a folder in a smaller project or workspace. For information on quotas, see the <a href=\"https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/doc-generation.html#quotas\" target=\"_blank\">Amazon Q Developer documentation.</a>",
+    "AWS.amazonq.doc.error.readmeTooLarge": "The README in your folder is too large for me to review. Try reducing the size of your README, or choose a folder with a smaller README. For more information on quotas, see the <a href=\"https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/doc-generation.html#quotas\" target=\"_blank\">Amazon Q Developer documentation.</a>",
+    "AWS.amazonq.doc.error.readmeUpdateTooLarge": "The updated README exceeds document size limits. Try reducing the size of your current README or working on a smaller task that won't produce as much content. For more information on quotas, see the <a href=\"https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/doc-generation.html#quotas\" target=\"_blank\">Amazon Q Developer documentation.</a>",
+    "AWS.amazonq.doc.error.workspaceEmpty": "The folder you chose did not contain any source files in a supported language. Choose another folder and try again. For more information on supported languages, see the <a href=\"https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/doc-generation.html\" target=\"_blank\">Amazon Q Developer documentation.</a>",
+    "AWS.amazonq.doc.error.promptTooVague": "I need more information to make changes to your README. Try providing some of the following details:\n- Which sections you want to modify\n- The content you want to add or remove\n- Specific issues that need correcting\n\nFor more information on prompt best practices, see the <a href=\"https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/doc-generation.html\" target=\"_blank\">Amazon Q Developer documentation.</a>",
+    "AWS.amazonq.doc.error.promptUnrelated": "These changes don't seem related to documentation. Try describing your changes again, using the following best practices:\n- Changes should relate to how project functionality is reflected in the README\n- Content you refer to should be available in your codebase\n\n For more information on prompt best practices, see the <a href=\"https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/doc-generation.html\" target=\"_blank\">Amazon Q Developer documentation.</a>",
+    "AWS.amazonq.doc.error.docGen.default": "I'm sorry, I ran into an issue while trying to generate your documentation. Please try again.",
+    "AWS.amazonq.doc.error.noChangeRequiredException": "I couldn't find any code changes to update in the README. Try another documentation task.",
+    "AWS.amazonq.doc.error.promptRefusal": "I'm sorry, I can't generate documentation for this folder. Please make sure your message and code files comply with the <a href=\"https://aws.amazon.com/machine-learning/responsible-ai/policy/\">AWS Responsible AI Policy.</a>",
+    "AWS.amazonq.doc.placeholder.editReadme": "Describe documentation changes",
+    "AWS.amazonq.doc.pillText.closeSession": "End session",
+    "AWS.amazonq.doc.pillText.newTask": "Start a new documentation task",
+    "AWS.amazonq.doc.pillText.update": "Update README to reflect code",
+    "AWS.amazonq.doc.pillText.makeChange": "Make a specific change",
+    "AWS.amazonq.doc.pillText.accept": "Accept",
+    "AWS.amazonq.doc.pillText.reject": "Reject",
+    "AWS.amazonq.doc.pillText.makeChanges": "Make changes",
+    "AWS.amazonq.inline.invokeChat": "Inline chat",
+    "AWS.amazonq.inline.acceptEdit": "Accept edit suggestion",
+    "AWS.amazonq.inline.rejectEdit": "Reject edit suggestion",
+    "AWS.amazonq.opensettings:": "Open settings",
+    "AWS.toolkit.lambda.walkthrough.quickpickTitle": "Application Builder Walkthrough",
+    "AWS.toolkit.lambda.walkthrough.title": "Get started building your application",
+    "AWS.toolkit.lambda.walkthrough.description": "Your quick guide to build an application visually, iterate locally, and deploy to the cloud!",
+    "AWS.toolkit.lambda.walkthrough.toolInstall.title": "Complete installation",
+    "AWS.toolkit.lambda.walkthrough.toolInstall.description.windows": "Manage your AWS services and resources with the AWS Command Line Interface (AWS CLI). \n\n[Install AWS CLI](command:aws.toolkit.installAWSCLI)\n\nBuild locally, invoke, and deploy your functions with the Serverless Application Model (SAM) CLI. \n\n[Install SAM CLI](command:aws.toolkit.installSAMCLI)\n\nDocker is an optional, third party tool that assists with local AWS Lambda runtime emulation. Docker is required to invoke Lambda functions on your local machine. \n\n[Install Docker (optional)](command:aws.toolkit.installDocker)\n\nEmulate your AWS cloud services locally with LocalStack to streamline testing in VS Code and CI environments. [Learn more](https://docs.localstack.cloud/aws/). \n\n[Install LocalStack (optional)](command:aws.toolkit.installLocalStack)",
+    "AWS.toolkit.lambda.walkthrough.toolInstall.description": "Manage your AWS services and resources with the AWS Command Line Interface (AWS CLI). \n\n[Install AWS CLI](command:aws.toolkit.installAWSCLI)\n\nBuild locally, invoke, and deploy your functions with the Serverless Application Model (SAM) CLI. \n\n[Install SAM CLI](command:aws.toolkit.installSAMCLI)\n\nDocker is an optional, third party tool that assists with local AWS Lambda runtime emulation. Docker is required to invoke Lambda functions on your local machine. \n\n[Install Docker (optional)](command:aws.toolkit.installDocker)\n\nEmulate your AWS cloud services locally with LocalStack to streamline testing in VS Code and CI environments. [Learn more]((https://docs.localstack.cloud/aws/). \n\n[Install LocalStack (optional)](command:aws.toolkit.installLocalStack)\n\nFinch is an open source tool for local container development. Finch aims to help promote innovative upstream container projects  by making it easy to install and use them. [Learn more](https://runfinch.com/) \n\n[Install Finch (optional)](command:aws.toolkit.installFinch)",
+    "AWS.toolkit.lambda.walkthrough.chooseTemplate.title": "Choose your application template",
+    "AWS.toolkit.lambda.walkthrough.chooseTemplate.description": "Select a starter application, visually compose an application from scratch, open an existing application, or browse more application examples. \n\nInfrastructure Composer allows you to visually compose modern applications in the cloud. It will define the necessary permissions between resources when you drag a connection between them. \n\n[Initialize your project](command:aws.toolkit.lambda.initializeWalkthroughProject)",
+    "AWS.toolkit.lambda.walkthrough.step1.title": "Iterate locally",
+    "AWS.toolkit.lambda.walkthrough.step1.description": "Locally test and debug your code.",
+    "AWS.toolkit.lambda.walkthrough.step2.title": "Deploy to the cloud",
+    "AWS.toolkit.lambda.walkthrough.step2.description": "Test your application in the cloud from within VS Code. \n\nNote: The AWS CLI and the SAM CLI require AWS Credentials to interact with the cloud. For information on setting up your credentials, see [Authentication and access credentials](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html). \n\n[Configure credentials](command:aws.toolkit.lambda.walkthrough.credential)",
+    "AWS.toolkit.lambda.serverlessLand.quickpickTitle": "Create application with Serverless template"
+}
diff --git a/packages/core/resources/amazonQCT/QCT-Maven-1-0-156-0.jar b/packages/core/resources/amazonQCT/QCT-Maven-1-0-156-0.jar
new file mode 100644
index 00000000000..8530e54fd5d
Binary files /dev/null and b/packages/core/resources/amazonQCT/QCT-Maven-1-0-156-0.jar differ
diff --git a/packages/core/resources/amazonq-logo.svg b/packages/core/resources/amazonq-logo.svg
new file mode 100644
index 00000000000..b33a27a021e
--- /dev/null
+++ b/packages/core/resources/amazonq-logo.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48">
+  <path d="m43.64,10.67L25.88.42c-.49-.28-1.13-.42-1.78-.42s-1.29.14-1.78.42L4.58,10.67c-.98.56-1.78,1.95-1.78,3.08v20.5c0,1.13.8,2.51,1.78,3.08l17.76,10.25c.49.28,1.13.42,1.78.42s1.29-.14,1.78-.42l17.76-10.25c.98-.56,1.78-1.95,1.78-3.08V13.75c0-1.13-.8-2.51-1.78-3.08Zm-19.53,33.31l-17.31-9.99V14.01L24.11,4.02l17.31,9.99v17.67l-13.31-7.68v-1.89c0-.26-.14-.49-.36-.62l-3.28-1.89c-.11-.06-.24-.1-.36-.1s-.25.03-.36.1l-3.28,1.89c-.22.13-.36.37-.36.62v3.79c0,.26.14.49.36.62l3.28,1.89c.11.06.24.1.36.1s.25-.03.36-.1l1.64-.95,13.31,7.68-15.31,8.84Z" style="fill: #fff; stroke-width: 0px;"/>
+</svg>
\ No newline at end of file
diff --git a/resources/aws-cn-logo.svg b/packages/core/resources/aws-cn-logo.svg
similarity index 100%
rename from resources/aws-cn-logo.svg
rename to packages/core/resources/aws-cn-logo.svg
diff --git a/resources/aws-logo.svg b/packages/core/resources/aws-logo.svg
similarity index 100%
rename from resources/aws-logo.svg
rename to packages/core/resources/aws-logo.svg
diff --git a/resources/codecatalyst_connect b/packages/core/resources/codecatalyst_connect
similarity index 95%
rename from resources/codecatalyst_connect
rename to packages/core/resources/codecatalyst_connect
index 913ccabd7a3..7df88be4576 100755
--- a/resources/codecatalyst_connect
+++ b/packages/core/resources/codecatalyst_connect
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Usage:
-#   When connecting to a development environment
+#   When connecting to a dev environment
 #       AWS_REGION=… AWS_SSM_CLI=… CODECATALYST_ENDPOINT=… BEARER_TOKEN_LOCATION=… SPACE_NAME=… PROJECT_NAME=… DEVENV_ID=… ./codecatalyst_connect
 
 set -e
@@ -37,7 +37,7 @@ _parse_json_for_value() {
     echo "$json" | grep -o "\"$key\":\"[^\"]*" | grep -o '[^"]*$'
 }
 
-# Note: A development environment must have been previously started by VSCode Extension/CodeCatalyst
+# Note: dev environment must have been previously started by VSCode Extension/CodeCatalyst
 _start_dev_environment_session() {
     # Function inputs
     local CODECATALYST_ENDPOINT=$1
diff --git a/resources/codecatalyst_connect.ps1 b/packages/core/resources/codecatalyst_connect.ps1
similarity index 98%
rename from resources/codecatalyst_connect.ps1
rename to packages/core/resources/codecatalyst_connect.ps1
index 15cd0c977f0..b3310806b6f 100644
--- a/resources/codecatalyst_connect.ps1
+++ b/packages/core/resources/codecatalyst_connect.ps1
@@ -1,5 +1,5 @@
 # Usage:
-#   When connecting to a development environment
+#   When connecting to a dev environment
 #       $Env:AWS_REGION=… $Env:AWS_SSM_CLI=… $Env:CODECATALYST_ENDPOINT=… $Env:BEARER_TOKEN_LOCATION=… $Env:SPACE_NAME=… $Env:PROJECT_NAME=… $Env:DEVENV_ID=… ./code_catalyst_connect.ps1
 
 function Get-Timestamp {
@@ -68,7 +68,7 @@ function StartDevEnvironmentSession {
 }
 "@
 
-    $webRequest = Invoke-WebRequest -Method 'PUT' -Uri "$Endpoint$startSessionPath" -Headers @{"Content-Type" = "application/json"; "Authorization" = "Bearer $Token" } -Body "$startSessionQuery"
+    $webRequest = Invoke-WebRequest -Method 'PUT' -Uri "$Endpoint$startSessionPath" -Headers @{"Content-Type" = "application/json"; "Authorization" = "Bearer $Token" } -Body "$startSessionQuery" -UseBasicParsing
     ConvertFrom-Json -InputObject $webRequest
 }
 
diff --git a/packages/core/resources/css/amazonq-chat.css b/packages/core/resources/css/amazonq-chat.css
new file mode 100644
index 00000000000..5e954bba89f
--- /dev/null
+++ b/packages/core/resources/css/amazonq-chat.css
@@ -0,0 +1,25 @@
+/* Pulsating effect */
+@keyframes pulsate {
+    0% {
+        opacity: 0;
+    }
+    50% {
+        opacity: 0.15;
+    }
+    100% {
+        opacity: 0;
+    }
+}
+
+body[data-feature-viewdiffinchat='TREATMENT'] {
+    .mynah-syntax-highlighter-copy-buttons button:nth-of-type(2)::after, /* Accept Diff and Insert At Cursor */
+    .mynah-syntax-highlighter-copy-buttons button:nth-of-type(3)::after {
+        /* View Diff */
+        content: '';
+        animation-name: pulsate;
+        animation-duration: 1.5s;
+        animation-timing-function: ease-in-out;
+        animation-iteration-count: 2;
+        transform: translate3d(0%, 0, 0);
+    }
+}
diff --git a/packages/core/resources/css/amazonq-webview.css b/packages/core/resources/css/amazonq-webview.css
new file mode 100644
index 00000000000..5a3268be669
--- /dev/null
+++ b/packages/core/resources/css/amazonq-webview.css
@@ -0,0 +1,17 @@
+body,
+html {
+    background-color: var(--mynah-color-bg);
+    color: var(--mynah-color-text-default);
+    height: 100%;
+    width: 100%;
+    overflow: hidden;
+    margin: 0;
+    padding: 0;
+}
+
+body.vscode-dark,
+body.vscode-high-contrast:not(.vscode-high-contrast-light) {
+    --mynah-color-light: rgba(255, 255, 255, 0.05);
+    --mynah-color-highlight: rgba(0, 137, 255, 0.2);
+    --mynah-color-highlight-text: rgba(0, 137, 255, 1);
+}
diff --git a/packages/core/resources/css/amazonqTransformationHub.css b/packages/core/resources/css/amazonqTransformationHub.css
new file mode 100644
index 00000000000..3deb855d087
--- /dev/null
+++ b/packages/core/resources/css/amazonqTransformationHub.css
@@ -0,0 +1,105 @@
+@keyframes spin {
+    0% {
+        transform: rotate(0deg);
+    }
+    100% {
+        transform: rotate(360deg);
+    }
+}
+body {
+    margin: 0;
+    padding: 0 1em;
+    height: 100vh;
+}
+
+.wrapper {
+    height: 100%;
+    display: flex;
+}
+
+.spinner {
+    display: inline-block;
+    animation: spin 1s infinite;
+}
+
+.column--container,
+.substep-container {
+    display: flex;
+    flex-direction: row;
+}
+
+.column {
+    flex-grow: 1;
+}
+
+.substep-container p {
+    margin: 0.5em 0;
+}
+
+.step,
+.simple-step {
+    padding: 0.5em 0 0.5em 0;
+    margin: 0;
+}
+
+.step {
+    padding-left: 20px;
+}
+
+.step:hover,
+.step.active {
+    color: var(--vscode-editor-selectionForeground, inherit);
+    background-color: var(--vscode-editor-selectionBackground, aliceblue);
+}
+
+#stepdetails {
+    width: 40%;
+    padding: 0 20px;
+    border-left: solid rgba(230, 230, 230, 0.5);
+    min-height: 100vh;
+    display: block;
+}
+
+#progress {
+    width: 60%;
+}
+
+.status-PENDING {
+    color: grey;
+}
+
+.status-COMPLETED {
+    color: green;
+}
+
+.status-FAILED {
+    color: grey;
+}
+
+.substep {
+    display: none;
+}
+
+.substep-icon {
+    padding: 0 1em;
+}
+
+.visible {
+    display: block;
+}
+
+.center {
+    position: absolute;
+    top: 50%;
+    transform: translate(0, -50%);
+}
+
+.center-flex {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+#step-duration {
+    color: grey;
+}
diff --git a/packages/core/resources/css/auth.css b/packages/core/resources/css/auth.css
new file mode 100644
index 00000000000..bafe888bb6c
--- /dev/null
+++ b/packages/core/resources/css/auth.css
@@ -0,0 +1,92 @@
+@import url('./icons.css');
+
+html {
+    height: 100%;
+}
+
+body {
+    box-sizing: border-box;
+    min-height: 100%;
+    margin: 0;
+    padding: 15px 30px;
+    display: flex;
+    flex-direction: column;
+    font-family: Verdana, Geneva, Tahoma, sans-serif;
+    font-size: 0.9rem;
+    background-color: #f2f3f3;
+    justify-content: center;
+    min-width: 400px;
+}
+
+.flex-container {
+    background-color: #ffffff;
+    width: 30%;
+    margin: 0 auto;
+    padding: 2% 2% 1% 2%;
+    max-width: 400px;
+    box-shadow: 0px 1px 1px 1px #8a969a;
+}
+
+.request {
+    border-block: 1px solid;
+    border-inline: 1px solid;
+    border-end-end-radius: 3px;
+    border-end-start-radius: 3px;
+    border-start-end-radius: 3px;
+    border-start-start-radius: 3px;
+    margin-top: 5%;
+    padding: 5%;
+    display: flex;
+    flex-direction: row;
+}
+
+.request h4 {
+    margin: 1% 1% 1% 0%;
+}
+
+.request p {
+    margin-bottom: 0;
+    margin-top: 2%;
+}
+
+.approval {
+    background-color: #f2f8f0;
+    border-color: #1d8102;
+}
+
+.denial {
+    background-color: #fff7f7;
+    border-color: #d91515;
+}
+
+.request-container {
+    width: 100%;
+}
+
+.success-icon {
+    color: #1d8102;
+    padding-right: 5px;
+}
+
+.denial-icon {
+    color: #d91515;
+    padding-right: 5px;
+}
+
+.center-icon {
+    width: 100%;
+    text-align: center;
+}
+
+.hidden {
+    display: none;
+    visibility: none;
+}
+
+.hint {
+    color: #545b64;
+}
+
+.aws-icon {
+    margin-bottom: 50px;
+}
diff --git a/packages/core/resources/css/base.css b/packages/core/resources/css/base.css
new file mode 100644
index 00000000000..eab33956f19
--- /dev/null
+++ b/packages/core/resources/css/base.css
@@ -0,0 +1,283 @@
+/* Base styling sheet for standard tags and common classes */
+@import url('./icons.css');
+
+/* Radio button */
+input[type='radio'] {
+    -webkit-appearance: none;
+    display: inline-block;
+    width: 16px;
+    min-width: 16px;
+    height: 16px;
+    padding: 4px;
+    border: 1px solid var(--vscode-settings-textInputForeground);
+    background-clip: content-box;
+    background-color: transparent;
+    border-radius: 50%;
+    margin: 0;
+}
+input[type='radio']:checked {
+    background-color: var(--vscode-focusBorder);
+    border: 1px solid var(--vscode-focusBorder);
+}
+input:focus:not(:focus-visible) {
+    outline-color: transparent;
+}
+
+/* Checkbox */
+/* TODO: use https://github.com/microsoft/vscode-webview-ui-toolkit */
+input[type='checkbox'] {
+    -webkit-appearance: none;
+    display: inline-block;
+    width: 16px;
+    min-width: 16px;
+    height: 16px;
+    border: 1px solid var(--vscode-settings-checkboxBorder);
+    border-radius: 20%;
+    background-size: 16px;
+    background-color: var(--vscode-settings-checkboxBackground);
+    background-position: center;
+    background-repeat: no-repeat;
+    margin: 0;
+}
+
+body.vscode-dark input[type='checkbox']:checked {
+    background-image: url('../../resources/icons/vscode/dark/check-old.svg');
+}
+
+body.vscode-light input[type='checkbox']:checked {
+    background-image: url('../../resources/icons/vscode/light/check-old.svg');
+}
+
+/* Placeholder */
+::placeholder {
+    color: var(--vscode-input-placeholderForeground);
+}
+
+/* Text/number input box */
+input[type='text'],
+input[type='password'],
+input[type='number'] {
+    color: var(--vscode-settings-textInputForeground);
+    background: var(--vscode-settings-textInputBackground);
+    border: 1px solid var(--vscode-settings-textInputBorder);
+    padding: 4px 4px;
+}
+input[type='text'][data-invalid='true'],
+input[type='password'][data-invalid='true'],
+input[type='number'][data-invalid='true'] {
+    border: 1px solid var(--vscode-inputValidation-errorBorder);
+    border-bottom: 0;
+}
+input:disabled {
+    /* TODO: use VSC webcomponent library instead */
+    filter: brightness(0.8);
+}
+.input-validation {
+    color: var(--vscode-inputValidation-errorForeground);
+    background: var(--vscode-inputValidation-errorBackground);
+    border: 1px solid var(--vscode-inputValidation-errorBorder);
+    padding: 4px 4px;
+}
+
+/* Select drop-down */
+select {
+    margin: 0px 0px;
+    padding: 2px 0px;
+    border-radius: 4px;
+    border: 1px solid var(--vscode-settings-dropdownBorder);
+    background: var(--vscode-settings-dropdownBackground);
+    color: var(--vscode-settings-dropdownForeground);
+}
+select:invalid {
+    color: var(--vscode-input-placeholderForeground);
+}
+option {
+    color: var(--vscode-settings-dropdownForeground);
+    background: var(--vscode-settings-dropdownBackground);
+}
+
+/* Header (for settings) (TODO: move to different sheet) */
+.header {
+    padding: 16px;
+    display: flex;
+    align-items: flex-start;
+    flex-direction: row;
+    flex-wrap: wrap;
+}
+/* The below selectors apply a tint depending on the theme: light for dark and dark for light */
+/* `backdrop-filter` with a brightness offset of 0.2 would be better here but it causes some slight flickering */
+body.vscode-dark .header {
+    background-color: rgb(255, 255, 255, 0.05);
+}
+body.vscode-light .header {
+    background-color: rgba(0, 0, 0, 0.05);
+}
+
+/* Buttons */
+button,
+.button-theme-primary {
+    color: var(--vscode-button-foreground);
+    background: var(--vscode-button-background);
+    border: 1px solid var(--vscode-button-border);
+    padding: 8px 12px;
+}
+button,
+.button-theme-primary:hover:not(:disabled) {
+    background: var(--vscode-button-hoverBackground);
+    cursor: pointer;
+}
+.button-theme-secondary {
+    color: var(--vscode-button-secondaryForeground);
+    background: var(--vscode-button-secondaryBackground);
+    border: 1px solid var(--vscode-button-border);
+}
+.button-theme-secondary:hover:not(:disabled) {
+    background: var(--vscode-button-secondaryHoverBackground);
+    cursor: pointer;
+}
+.button-theme-soft {
+    color: var(--vscode-settings-textInputForeground);
+    background: var(--vscode-settings-textInputBackground);
+}
+button:disabled {
+    /* TODO: use VSC webcomponent library instead */
+    filter: brightness(0.8);
+    cursor: default;
+}
+
+/* Text area */
+textarea {
+    color: var(--vscode-settings-textInputForeground);
+    background: var(--vscode-settings-textInputBackground);
+    border: 1px solid var(--vscode-settings-textInputBorder);
+}
+
+/* Badge */
+.badge {
+    color: var(--vscode-activityBarBadge-foreground);
+    background-color: var(--vscode-activityBarBadge-background);
+    padding: 3px 8px;
+    font-size: 0.75rem;
+    border-radius: 16px;
+    white-space: nowrap;
+}
+
+/* Labels */
+.label-context {
+    display: block;
+    padding: 0 0 4px 0;
+}
+.option-label {
+    display: block;
+    /* max-width: 560px; */
+    padding: 0 0 8px 0;
+}
+
+/* Layout */
+.ml-0 {
+    margin-left: 0px;
+}
+.ml-2 {
+    margin-left: 2px;
+}
+.ml-4 {
+    margin-left: 4px;
+}
+.ml-8 {
+    margin-left: 8px;
+}
+.ml-16 {
+    margin-left: 16px;
+}
+.mr-0 {
+    margin-right: 0px;
+}
+.mr-2 {
+    margin-right: 2px;
+}
+.mr-4 {
+    margin-right: 4px;
+}
+.mr-8 {
+    margin-right: 8px;
+}
+.mr-16 {
+    margin-right: 16px;
+}
+.mt-0 {
+    margin-top: 0px;
+}
+.mt-2 {
+    margin-top: 2px;
+}
+.mt-4 {
+    margin-top: 4px;
+}
+.mt-8 {
+    margin-top: 8px;
+}
+.mt-16 {
+    margin-top: 16px;
+}
+.mb-0 {
+    margin-bottom: 0px;
+}
+.mb-2 {
+    margin-bottom: 2px;
+}
+.mb-4 {
+    margin-bottom: 4px;
+}
+.mb-8 {
+    margin-bottom: 8px;
+}
+.mb-16 {
+    margin-bottom: 16px;
+}
+
+/* Basic 16px icon class */
+.icon {
+    display: inline;
+    height: 16px;
+    width: 16px;
+    background-repeat: no-repeat;
+    background-position: center;
+}
+
+/* Misc. */
+.no-spacing {
+    margin: 0;
+    padding: 0;
+}
+.no-wrap {
+    white-space: nowrap;
+}
+.soft {
+    color: var(--vscode-input-placeholderForeground);
+}
+.container {
+    background: var(--vscode-menu-background);
+}
+.display-contents {
+    display: contents;
+}
+.button-container {
+    display: flex;
+    align-items: flex-start;
+    flex-direction: row;
+    /* margin: 16px 0 0 0; */
+    padding: 10px;
+    position: sticky;
+    top: 10px;
+    justify-content: flex-end;
+    border-bottom: 1px solid var(--vscode-menu-separatorBackground);
+    /**
+     * HACK: Using background-color alpha as a workaround because "opacity" affects children.
+     * TODO: Is there a way to use alpha with var(--vscode-menu-background) ?
+     */
+    /* background-color: rgba(0, 0, 0, 0.1); */
+}
+
+.button-container h1 {
+    margin: 0px;
+}
diff --git a/resources/css/executeStateMachine.css b/packages/core/resources/css/executeStateMachine.css
similarity index 100%
rename from resources/css/executeStateMachine.css
rename to packages/core/resources/css/executeStateMachine.css
diff --git a/resources/css/searchSchemas.css b/packages/core/resources/css/searchSchemas.css
similarity index 100%
rename from resources/css/searchSchemas.css
rename to packages/core/resources/css/searchSchemas.css
diff --git a/packages/core/resources/css/securityIssue.css b/packages/core/resources/css/securityIssue.css
new file mode 100644
index 00000000000..5cd64211ae8
--- /dev/null
+++ b/packages/core/resources/css/securityIssue.css
@@ -0,0 +1,638 @@
+html,
+body {
+    font-family: var(
+        --markdown-font-family,
+        -apple-system,
+        BlinkMacSystemFont,
+        'Segoe WPC',
+        'Segoe UI',
+        system-ui,
+        'Ubuntu',
+        'Droid Sans',
+        sans-serif
+    );
+    font-size: var(--markdown-font-size, 14px);
+    padding: 0 26px;
+    line-height: var(--markdown-line-height, 22px);
+    word-wrap: break-word;
+}
+
+body {
+    padding-top: 1em;
+}
+
+/* Reset margin top for elements */
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+ol,
+ul,
+pre {
+    margin-top: 0;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+    font-weight: 600;
+    margin-top: 24px;
+    margin-bottom: 16px;
+    line-height: 1.25;
+}
+
+/* Prevent `sub` and `sup` elements from affecting line height */
+sub,
+sup {
+    line-height: 0;
+}
+
+ul ul:first-child,
+ul ol:first-child,
+ol ul:first-child,
+ol ol:first-child {
+    margin-bottom: 0;
+}
+
+img,
+video {
+    max-width: 100%;
+    max-height: 100%;
+}
+
+a {
+    text-decoration: none;
+}
+
+a:hover {
+    text-decoration: underline;
+}
+
+a:focus,
+input:focus,
+select:focus,
+textarea:focus {
+    outline: 1px solid -webkit-focus-ring-color;
+    outline-offset: -1px;
+}
+
+p {
+    margin-bottom: 16px;
+}
+
+li p {
+    margin-bottom: 0.7em;
+}
+
+ul,
+ol {
+    margin-bottom: 0.7em;
+}
+
+hr {
+    border: 0;
+    height: 1px;
+    border-bottom: 1px solid;
+}
+
+h1 {
+    font-size: 2em;
+    margin-top: 0;
+}
+
+h2 {
+    font-size: 1.5em;
+    padding-bottom: 0.3em;
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+}
+
+h3 {
+    font-size: 1.25em;
+}
+
+h4 {
+    font-size: 1em;
+}
+
+h5 {
+    font-size: 0.875em;
+}
+
+h6 {
+    font-size: 0.85em;
+}
+
+table {
+    border-collapse: collapse;
+    margin-bottom: 0.7em;
+}
+
+th {
+    text-align: left;
+    border-bottom: 1px solid;
+}
+
+th,
+td {
+    padding: 5px 10px;
+}
+
+table > tbody > tr + tr > td {
+    border-top: 1px solid;
+}
+
+blockquote {
+    margin: 0;
+    padding: 2px 16px 0 10px;
+    border-left-width: 5px;
+    border-left-style: solid;
+    border-radius: 2px;
+}
+
+code {
+    font-family: var(
+        --vscode-editor-font-family,
+        'SF Mono',
+        Monaco,
+        Menlo,
+        Consolas,
+        'Ubuntu Mono',
+        'Liberation Mono',
+        'DejaVu Sans Mono',
+        'Courier New',
+        monospace
+    );
+    font-size: 1em;
+    line-height: 1.357em;
+}
+
+body.wordWrap pre {
+    white-space: pre-wrap;
+}
+
+pre:not(.hljs),
+pre.hljs code > div {
+    padding: 16px;
+    border-radius: 3px;
+    overflow: auto;
+    margin-bottom: 0;
+}
+
+pre code {
+    color: var(--vscode-editor-foreground);
+    tab-size: 4;
+}
+
+pre {
+    background-color: var(--vscode-textCodeBlock-background);
+    border: 1px solid var(--vscode-widget-border);
+    font-size: 12px;
+    line-height: 1rem;
+}
+
+code[class^='language-'] {
+    background-color: unset;
+}
+
+/* These styles are used to render code diff with markdown-it rendered output */
+.hljs-addition {
+    background-color: var(--vscode-diffEditor-insertedTextBackground, rgba(155, 185, 85, 0.2));
+    color: var(--vscode-diffEditorOverview-insertedForeground, rgb(155, 185, 85));
+    display: inline-block;
+    width: 100%;
+    margin: 0 -16px;
+    padding: 0 16px;
+}
+
+.hljs-deletion {
+    background-color: var(--vscode-diffEditor-removedTextBackground, rgba(255, 0, 0, 0.2));
+    color: var(--vscode-diffEditorOverview-removedForeground, rgb(255, 0, 0));
+    display: inline-block;
+    width: 100%;
+    margin: 0 -16px;
+    padding: 0 16px;
+}
+
+.hljs-meta {
+    background-color: var(--vscode-editorMarkerNavigationInfo-headerBackground);
+    color: var(--vscode-editorOverviewRuler-selectionHighlightForeground);
+    display: inline-block;
+    width: 100%;
+    margin: 0 -16px 4px -16px;
+    padding: 4px 16px;
+}
+
+.hljs-meta * {
+    color: unset !important;
+}
+
+.hljs-keyword,
+.hljs-literal,
+.hljs-symbol,
+.hljs-name {
+    color: #569cd6;
+}
+.hljs-link {
+    color: #569cd6;
+    text-decoration: underline;
+}
+
+.hljs-built_in,
+.hljs-type {
+    color: #4ec9b0;
+}
+
+.hljs-number,
+.hljs-class {
+    color: #b8d7a3;
+}
+
+.hljs-string,
+.hljs-meta-string {
+    color: #d69d85;
+}
+
+.hljs-regexp,
+.hljs-template-tag {
+    color: #9a5334;
+}
+
+.hljs-subst,
+.hljs-function,
+.hljs-title,
+.hljs-params,
+.hljs-formula {
+    color: #dcdcdc;
+}
+
+.hljs-comment,
+.hljs-quote {
+    color: #57a64a;
+    font-style: italic;
+}
+
+.hljs-doctag {
+    color: #608b4e;
+}
+
+.hljs-meta-keyword,
+.hljs-tag {
+    color: #9b9b9b;
+}
+
+.hljs-variable,
+.hljs-template-variable {
+    color: #bd63c5;
+}
+
+.hljs-attr,
+.hljs-attribute,
+.hljs-builtin-name {
+    color: #9cdcfe;
+}
+
+.hljs-section {
+    color: gold;
+}
+
+.hljs-emphasis {
+    font-style: italic;
+}
+
+.hljs-strong {
+    font-weight: bold;
+}
+
+.hljs-bullet,
+.hljs-selector-tag,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-selector-attr,
+.hljs-selector-pseudo {
+    color: #d7ba7d;
+}
+
+.vscode-light .hljs-function,
+.vscode-light .hljs-params,
+.vscode-light .hljs-number,
+.vscode-light .hljs-class {
+    color: inherit;
+}
+
+.vscode-light .hljs-comment,
+.vscode-light .hljs-quote,
+.vscode-light .hljs-number,
+.vscode-light .hljs-class,
+.vscode-light .hljs-variable {
+    color: #008000;
+}
+
+.vscode-light .hljs-keyword,
+.vscode-light .hljs-selector-tag,
+.vscode-light .hljs-name,
+.vscode-light .hljs-tag {
+    color: #00f;
+}
+
+.vscode-light .hljs-built_in,
+.vscode-light .hljs-builtin-name {
+    color: #007acc;
+}
+
+.vscode-light .hljs-string,
+.vscode-light .hljs-section,
+.vscode-light .hljs-attribute,
+.vscode-light .hljs-literal,
+.vscode-light .hljs-template-tag,
+.vscode-light .hljs-template-variable,
+.vscode-light .hljs-type {
+    color: #a31515;
+}
+
+.vscode-light .hljs-subst,
+.vscode-light .hljs-selector-attr,
+.vscode-light .hljs-selector-pseudo,
+.vscode-light .hljs-meta-keyword {
+    color: #2b91af;
+}
+.vscode-light .hljs-title,
+.vscode-light .hljs-doctag {
+    color: #808080;
+}
+
+.vscode-light .hljs-attr {
+    color: #f00;
+}
+
+.vscode-light .hljs-symbol,
+.vscode-light .hljs-bullet,
+.vscode-light .hljs-link {
+    color: #00b0e8;
+}
+
+.vscode-light .hljs-emphasis {
+    font-style: italic;
+}
+
+.vscode-light .hljs-strong {
+    font-weight: bold;
+}
+
+input[type='submit'] {
+    background-color: var(--vscode-button-background);
+    border: none;
+    color: var(--vscode-button-foreground);
+    padding: 6px 14px;
+    cursor: pointer;
+    border-radius: 5%;
+}
+
+input[type='submit']:hover {
+    background-color: var(--vscode-button-hoverBackground);
+}
+
+.flex-container {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+}
+
+.flex-container > div {
+    flex: 33%;
+}
+
+@media screen and (max-width: 900px) {
+    .flex-container > div {
+        flex: 50%;
+    }
+}
+
+@media screen and (max-width: 400px) {
+    .flex-container {
+        flex-direction: column;
+    }
+}
+
+hr {
+    border: unset;
+    height: unset;
+    border-bottom: 1px solid var(--vscode-menu-separatorBackground);
+}
+
+img.severity {
+    height: 0.75em;
+}
+
+@keyframes spin {
+    0% {
+        transform: rotate(0deg);
+    }
+    100% {
+        transform: rotate(360deg);
+    }
+}
+
+.spinner {
+    display: inline-block;
+    animation: spin 1s infinite;
+}
+
+button.button-theme-primary,
+button.button-theme-secondary {
+    padding: 6px 14px;
+    border-radius: 5px;
+}
+
+.code-diff-actions {
+    width: 100%;
+    height: 26px;
+    background-color: var(--vscode-editorMarkerNavigationInfo-headerBackground);
+    border-radius: 0 0 3px 3px;
+    overflow: auto;
+    display: flex;
+    flex-direction: row-reverse;
+}
+
+.code-diff-action-button {
+    font-size: 12px;
+    padding: 1px 6.5px;
+    margin: 1px 0;
+    border-radius: 3px;
+    color: currentColor;
+    background-color: rgba(0, 0, 0, 0);
+    transition: all 600ms cubic-bezier(0.25, 1, 0, 1);
+    transform: translate3d(0, 0, 0) scale(1.00001);
+    gap: calc(0.25rem * 1);
+    filter: brightness(0.925);
+    border: none;
+}
+
+.code-diff-action-button:hover {
+    filter: brightness(1);
+}
+
+.code-diff-action-button:hover:after {
+    transform: translate3d(0%, 0, 0);
+    opacity: 0.15;
+}
+
+.code-diff-action-button::after {
+    content: '';
+    pointer-events: none;
+    transition: all 600ms cubic-bezier(0.25, 1, 0, 1);
+    opacity: 0;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    filter: brightness(1.35) saturate(0.75);
+    border-radius: inherit;
+    background-color: currentColor;
+    transform: translate3d(-5%, 0, 0) scale(0.93);
+}
+
+.container-bottom {
+    bottom: 0;
+    justify-content: unset;
+    border-top: 1px solid var(--vscode-menu-separatorBackground);
+    border-bottom: none;
+}
+
+.button-container {
+    padding: 10px 0;
+    flex-wrap: wrap;
+}
+
+.button-container > button {
+    white-space: nowrap;
+    margin-bottom: 8px;
+}
+
+pre.center {
+    display: flex;
+    justify-content: center;
+    padding-top: 16px;
+}
+
+pre.error {
+    color: var(--vscode-diffEditorOverview-removedForeground);
+    background-color: var(--vscode-diffEditor-removedTextBackground);
+    white-space: initial;
+}
+
+a.cursor {
+    cursor: pointer;
+    text-decoration: none;
+}
+
+.dot-typing {
+    position: relative;
+    left: -9999px;
+    width: 8px;
+    height: 8px;
+    border-radius: 5px;
+    background-color: var(--vscode-editor-foreground);
+    color: var(--vscode-editor-foreground);
+    box-shadow:
+        9984px 0 0 0 var(--vscode-editor-foreground),
+        9999px 0 0 0 var(--vscode-editor-foreground),
+        10014px 0 0 0 var(--vscode-editor-foreground);
+    animation: dot-typing 1.5s infinite linear;
+}
+
+@keyframes dot-typing {
+    0% {
+        box-shadow:
+            9984px 0 0 0 var(--vscode-editor-foreground),
+            9999px 0 0 0 var(--vscode-editor-foreground),
+            10014px 0 0 0 var(--vscode-editor-foreground);
+    }
+    16.667% {
+        box-shadow:
+            9984px -10px 0 0 var(--vscode-editor-foreground),
+            9999px 0 0 0 var(--vscode-editor-foreground),
+            10014px 0 0 0 var(--vscode-editor-foreground);
+    }
+    33.333% {
+        box-shadow:
+            9984px 0 0 0 var(--vscode-editor-foreground),
+            9999px 0 0 0 var(--vscode-editor-foreground),
+            10014px 0 0 0 var(--vscode-editor-foreground);
+    }
+    50% {
+        box-shadow:
+            9984px 0 0 0 var(--vscode-editor-foreground),
+            9999px -10px 0 0 var(--vscode-editor-foreground),
+            10014px 0 0 0 var(--vscode-editor-foreground);
+    }
+    66.667% {
+        box-shadow:
+            9984px 0 0 0 var(--vscode-editor-foreground),
+            9999px 0 0 0 var(--vscode-editor-foreground),
+            10014px 0 0 0 var(--vscode-editor-foreground);
+    }
+    83.333% {
+        box-shadow:
+            9984px 0 0 0 var(--vscode-editor-foreground),
+            9999px 0 0 0 var(--vscode-editor-foreground),
+            10014px -10px 0 0 var(--vscode-editor-foreground);
+    }
+    100% {
+        box-shadow:
+            9984px 0 0 0 var(--vscode-editor-foreground),
+            9999px 0 0 0 var(--vscode-editor-foreground),
+            10014px 0 0 0 var(--vscode-editor-foreground);
+    }
+}
+
+.code-block pre {
+    border-radius: 3px 3px 0 0;
+}
+
+.line-number {
+    display: inline-block;
+    color: var(--vscode-editorOverviewRuler-selectionHighlightForeground);
+    width: 16px;
+    margin-right: 24px;
+    text-align: right;
+}
+
+.highlight {
+    display: inline-block;
+    background-color: var(--vscode-editorOverviewRuler-selectionHighlightForeground);
+}
+
+.reference-tracker {
+    cursor: help;
+}
+
+.reference-tracker .tooltip {
+    visibility: hidden;
+    opacity: 0;
+    transition:
+        visibility 0s 0.1s,
+        opacity 0.1s linear;
+    position: absolute;
+    background-color: var(--vscode-editor-background);
+    color: var(--vscode-editor-foreground);
+    border: 1px solid var(--vscode-menu-separatorBackground);
+    border-radius: 5px;
+    padding: 16px;
+    margin-top: -80px;
+    margin-left: 20px;
+    cursor: default;
+}
+
+.reference-tracker:hover .tooltip {
+    visibility: visible;
+    opacity: 1;
+    transition: opacity 0.1s linear;
+}
diff --git a/resources/css/submitFeedback.css b/packages/core/resources/css/submitFeedback.css
similarity index 100%
rename from resources/css/submitFeedback.css
rename to packages/core/resources/css/submitFeedback.css
diff --git a/resources/debugger/py_debug_wrapper.py b/packages/core/resources/debugger/py_debug_wrapper.py
similarity index 100%
rename from resources/debugger/py_debug_wrapper.py
rename to packages/core/resources/debugger/py_debug_wrapper.py
diff --git a/packages/core/resources/ec2_connect b/packages/core/resources/ec2_connect
new file mode 100755
index 00000000000..06ae8d39686
--- /dev/null
+++ b/packages/core/resources/ec2_connect
@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+
+# Usage:
+#   When connecting to a dev environment
+#       AWS_REGION=… AWS_SSM_CLI=… STREAM_URL=… TOKEN=… LOG_FILE_LOCATION==… DEBUG_LOG=… ./ec2_connect 
+
+set -e
+set -u
+
+_DATE_CMD=true
+
+if command > /dev/null 2>&1 -v date; then
+    _DATE_CMD=date
+elif command > /dev/null 2>&1 -v /bin/date; then
+    _DATE_CMD=/bin/date
+fi
+
+_log() {
+    echo "$("$_DATE_CMD" '+%Y/%m/%d %H:%M:%S')" "$@" >> "${LOG_FILE_LOCATION}" 2>&1
+}
+
+_require_nolog() {
+    if [ -z "${1:-}" ] || [ -z "${2:-}" ]; then
+        _log "error: missing required arg: $1"
+        exit 1
+    fi
+}
+
+_require() {
+    _require_nolog "$@"
+    _log "$1=$2"
+}
+
+_ec2() {
+    # Function inputs
+    local AWS_SSM_CLI=$1
+    local AWS_REGION=$2
+    local STREAM_URL=$3
+    local TOKEN=$4
+    local SESSION_ID=$4
+
+    exec "$AWS_SSM_CLI" "{\"streamUrl\":\"$STREAM_URL\",\"tokenValue\":\"$TOKEN\",\"sessionId\":\"$SESSION_ID\"}" "$AWS_REGION" "StartSession"
+}
+
+_main() {
+    _log "=============================================================================="
+    _require DEBUG_LOG "${DEBUG_LOG:-}"
+    _require AWS_REGION "${AWS_REGION:-}"
+
+    _require SESSION_ID "${SESSION_ID:-}"
+    _require_nolog STREAM_URL "${STREAM_URL:-}"
+    _require_nolog TOKEN "${TOKEN:-}"
+
+    # Only log file paths when debug level is enabled.
+    if [ "${DEBUG_LOG:-}" -eq 1 ]; then
+        _require AWS_SSM_CLI "${AWS_SSM_CLI:-}"
+        _require LOG_FILE_LOCATION "${LOG_FILE_LOCATION:-}"
+    else
+        _require_nolog AWS_SSM_CLI "${AWS_SSM_CLI:-}"
+        _require_nolog LOG_FILE_LOCATION "${LOG_FILE_LOCATION:-}"
+    fi
+
+    _ec2 "$AWS_SSM_CLI" "$AWS_REGION" "$STREAM_URL" "$TOKEN" "$SESSION_ID"
+}
+
+_main
diff --git a/packages/core/resources/endpoints.json b/packages/core/resources/endpoints.json
new file mode 100644
index 00000000000..784854e40b5
--- /dev/null
+++ b/packages/core/resources/endpoints.json
@@ -0,0 +1,25717 @@
+{
+    "partitions": [
+        {
+            "defaults": {
+                "hostname": "{service}.{region}.{dnsSuffix}",
+                "protocols": ["https"],
+                "signatureVersions": ["v4"],
+                "variants": [
+                    {
+                        "dnsSuffix": "amazonaws.com",
+                        "hostname": "{service}-fips.{region}.{dnsSuffix}",
+                        "tags": ["fips"]
+                    },
+                    {
+                        "dnsSuffix": "api.aws",
+                        "hostname": "{service}-fips.{region}.{dnsSuffix}",
+                        "tags": ["dualstack", "fips"]
+                    },
+                    {
+                        "dnsSuffix": "api.aws",
+                        "hostname": "{service}.{region}.{dnsSuffix}",
+                        "tags": ["dualstack"]
+                    }
+                ]
+            },
+            "dnsSuffix": "amazonaws.com",
+            "partition": "aws",
+            "partitionName": "AWS Standard",
+            "regionRegex": "^(us|eu|ap|sa|ca|me|af)\\-\\w+\\-\\d+$",
+            "regions": {
+                "af-south-1": {
+                    "description": "Africa (Cape Town)"
+                },
+                "ap-east-1": {
+                    "description": "Asia Pacific (Hong Kong)"
+                },
+                "ap-northeast-1": {
+                    "description": "Asia Pacific (Tokyo)"
+                },
+                "ap-northeast-2": {
+                    "description": "Asia Pacific (Seoul)"
+                },
+                "ap-northeast-3": {
+                    "description": "Asia Pacific (Osaka)"
+                },
+                "ap-south-1": {
+                    "description": "Asia Pacific (Mumbai)"
+                },
+                "ap-south-2": {
+                    "description": "Asia Pacific (Hyderabad)"
+                },
+                "ap-southeast-1": {
+                    "description": "Asia Pacific (Singapore)"
+                },
+                "ap-southeast-2": {
+                    "description": "Asia Pacific (Sydney)"
+                },
+                "ap-southeast-3": {
+                    "description": "Asia Pacific (Jakarta)"
+                },
+                "ap-southeast-4": {
+                    "description": "Asia Pacific (Melbourne)"
+                },
+                "ca-central-1": {
+                    "description": "Canada (Central)"
+                },
+                "eu-central-1": {
+                    "description": "Europe (Frankfurt)"
+                },
+                "eu-central-2": {
+                    "description": "Europe (Zurich)"
+                },
+                "eu-north-1": {
+                    "description": "Europe (Stockholm)"
+                },
+                "eu-south-1": {
+                    "description": "Europe (Milan)"
+                },
+                "eu-south-2": {
+                    "description": "Europe (Spain)"
+                },
+                "eu-west-1": {
+                    "description": "Europe (Ireland)"
+                },
+                "eu-west-2": {
+                    "description": "Europe (London)"
+                },
+                "eu-west-3": {
+                    "description": "Europe (Paris)"
+                },
+                "me-central-1": {
+                    "description": "Middle East (UAE)"
+                },
+                "me-south-1": {
+                    "description": "Middle East (Bahrain)"
+                },
+                "sa-east-1": {
+                    "description": "South America (Sao Paulo)"
+                },
+                "us-east-1": {
+                    "description": "US East (N. Virginia)"
+                },
+                "us-east-2": {
+                    "description": "US East (Ohio)"
+                },
+                "us-west-1": {
+                    "description": "US West (N. California)"
+                },
+                "us-west-2": {
+                    "description": "US West (Oregon)"
+                }
+            },
+            "services": {
+                "a4b": {
+                    "endpoints": {
+                        "us-east-1": {}
+                    }
+                },
+                "access-analyzer": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "access-analyzer-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "access-analyzer-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "access-analyzer-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "access-analyzer-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "access-analyzer-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "access-analyzer-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "access-analyzer-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "access-analyzer-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "access-analyzer-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "access-analyzer-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "account": {
+                    "endpoints": {
+                        "aws-global": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "account.us-east-1.amazonaws.com"
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-global"
+                },
+                "acm": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "acm-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ca-central-1-fips": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "acm-fips.ca-central-1.amazonaws.com"
+                        },
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "acm-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "acm-fips.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "acm-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2-fips": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "acm-fips.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "acm-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "acm-fips.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "acm-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "acm-fips.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "acm-pca": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "acm-pca-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "acm-pca-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "acm-pca-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "acm-pca-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "acm-pca-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "acm-pca-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "acm-pca-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "acm-pca-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "acm-pca-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "acm-pca-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "airflow": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "amplify": {
+                    "endpoints": {
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "amplifybackend": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "amplifyuibuilder": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "aoss": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "api.detective": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "api.detective-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "api.detective-fips.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "api.detective-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2-fips": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "api.detective-fips.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "api.detective-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "api.detective-fips.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "api.detective-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "api.detective-fips.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "api.ecr": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "ecr-fips.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "af-south-1": {
+                            "credentialScope": {
+                                "region": "af-south-1"
+                            },
+                            "hostname": "api.ecr.af-south-1.amazonaws.com"
+                        },
+                        "ap-east-1": {
+                            "credentialScope": {
+                                "region": "ap-east-1"
+                            },
+                            "hostname": "api.ecr.ap-east-1.amazonaws.com"
+                        },
+                        "ap-northeast-1": {
+                            "credentialScope": {
+                                "region": "ap-northeast-1"
+                            },
+                            "hostname": "api.ecr.ap-northeast-1.amazonaws.com"
+                        },
+                        "ap-northeast-2": {
+                            "credentialScope": {
+                                "region": "ap-northeast-2"
+                            },
+                            "hostname": "api.ecr.ap-northeast-2.amazonaws.com"
+                        },
+                        "ap-northeast-3": {
+                            "credentialScope": {
+                                "region": "ap-northeast-3"
+                            },
+                            "hostname": "api.ecr.ap-northeast-3.amazonaws.com"
+                        },
+                        "ap-south-1": {
+                            "credentialScope": {
+                                "region": "ap-south-1"
+                            },
+                            "hostname": "api.ecr.ap-south-1.amazonaws.com"
+                        },
+                        "ap-south-2": {
+                            "credentialScope": {
+                                "region": "ap-south-2"
+                            },
+                            "hostname": "api.ecr.ap-south-2.amazonaws.com"
+                        },
+                        "ap-southeast-1": {
+                            "credentialScope": {
+                                "region": "ap-southeast-1"
+                            },
+                            "hostname": "api.ecr.ap-southeast-1.amazonaws.com"
+                        },
+                        "ap-southeast-2": {
+                            "credentialScope": {
+                                "region": "ap-southeast-2"
+                            },
+                            "hostname": "api.ecr.ap-southeast-2.amazonaws.com"
+                        },
+                        "ap-southeast-3": {
+                            "credentialScope": {
+                                "region": "ap-southeast-3"
+                            },
+                            "hostname": "api.ecr.ap-southeast-3.amazonaws.com"
+                        },
+                        "ap-southeast-4": {
+                            "credentialScope": {
+                                "region": "ap-southeast-4"
+                            },
+                            "hostname": "api.ecr.ap-southeast-4.amazonaws.com"
+                        },
+                        "ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "hostname": "api.ecr.ca-central-1.amazonaws.com"
+                        },
+                        "dkr-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "ecr-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "dkr-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "ecr-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "dkr-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "ecr-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "dkr-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "ecr-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {
+                            "credentialScope": {
+                                "region": "eu-central-1"
+                            },
+                            "hostname": "api.ecr.eu-central-1.amazonaws.com"
+                        },
+                        "eu-central-2": {
+                            "credentialScope": {
+                                "region": "eu-central-2"
+                            },
+                            "hostname": "api.ecr.eu-central-2.amazonaws.com"
+                        },
+                        "eu-north-1": {
+                            "credentialScope": {
+                                "region": "eu-north-1"
+                            },
+                            "hostname": "api.ecr.eu-north-1.amazonaws.com"
+                        },
+                        "eu-south-1": {
+                            "credentialScope": {
+                                "region": "eu-south-1"
+                            },
+                            "hostname": "api.ecr.eu-south-1.amazonaws.com"
+                        },
+                        "eu-south-2": {
+                            "credentialScope": {
+                                "region": "eu-south-2"
+                            },
+                            "hostname": "api.ecr.eu-south-2.amazonaws.com"
+                        },
+                        "eu-west-1": {
+                            "credentialScope": {
+                                "region": "eu-west-1"
+                            },
+                            "hostname": "api.ecr.eu-west-1.amazonaws.com"
+                        },
+                        "eu-west-2": {
+                            "credentialScope": {
+                                "region": "eu-west-2"
+                            },
+                            "hostname": "api.ecr.eu-west-2.amazonaws.com"
+                        },
+                        "eu-west-3": {
+                            "credentialScope": {
+                                "region": "eu-west-3"
+                            },
+                            "hostname": "api.ecr.eu-west-3.amazonaws.com"
+                        },
+                        "fips-dkr-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecr-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-dkr-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecr-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-dkr-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecr-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-dkr-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecr-fips.us-west-2.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecr-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecr-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecr-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecr-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {
+                            "credentialScope": {
+                                "region": "me-central-1"
+                            },
+                            "hostname": "api.ecr.me-central-1.amazonaws.com"
+                        },
+                        "me-south-1": {
+                            "credentialScope": {
+                                "region": "me-south-1"
+                            },
+                            "hostname": "api.ecr.me-south-1.amazonaws.com"
+                        },
+                        "sa-east-1": {
+                            "credentialScope": {
+                                "region": "sa-east-1"
+                            },
+                            "hostname": "api.ecr.sa-east-1.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "api.ecr.us-east-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "ecr-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "hostname": "api.ecr.us-east-2.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "ecr-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "hostname": "api.ecr.us-west-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "ecr-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "hostname": "api.ecr.us-west-2.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "ecr-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "api.ecr-public": {
+                    "endpoints": {
+                        "us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "api.ecr-public.us-east-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "hostname": "api.ecr-public.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "api.elastic-inference": {
+                    "endpoints": {
+                        "ap-northeast-1": {
+                            "hostname": "api.elastic-inference.ap-northeast-1.amazonaws.com"
+                        },
+                        "ap-northeast-2": {
+                            "hostname": "api.elastic-inference.ap-northeast-2.amazonaws.com"
+                        },
+                        "eu-west-1": {
+                            "hostname": "api.elastic-inference.eu-west-1.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "hostname": "api.elastic-inference.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "hostname": "api.elastic-inference.us-east-2.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "hostname": "api.elastic-inference.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "api.fleethub.iot": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "api.fleethub.iot-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "api.fleethub.iot-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "api.fleethub.iot-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "api.fleethub.iot-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "api.fleethub.iot-fips.us-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "api.fleethub.iot-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "api.fleethub.iot-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "api.fleethub.iot-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "api.iotdeviceadvisor": {
+                    "endpoints": {
+                        "ap-northeast-1": {
+                            "credentialScope": {
+                                "region": "ap-northeast-1"
+                            },
+                            "hostname": "api.iotdeviceadvisor.ap-northeast-1.amazonaws.com"
+                        },
+                        "eu-west-1": {
+                            "credentialScope": {
+                                "region": "eu-west-1"
+                            },
+                            "hostname": "api.iotdeviceadvisor.eu-west-1.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "api.iotdeviceadvisor.us-east-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "hostname": "api.iotdeviceadvisor.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "api.iotwireless": {
+                    "endpoints": {
+                        "ap-northeast-1": {
+                            "credentialScope": {
+                                "region": "ap-northeast-1"
+                            },
+                            "hostname": "api.iotwireless.ap-northeast-1.amazonaws.com"
+                        },
+                        "ap-southeast-2": {
+                            "credentialScope": {
+                                "region": "ap-southeast-2"
+                            },
+                            "hostname": "api.iotwireless.ap-southeast-2.amazonaws.com"
+                        },
+                        "eu-central-1": {
+                            "credentialScope": {
+                                "region": "eu-central-1"
+                            },
+                            "hostname": "api.iotwireless.eu-central-1.amazonaws.com"
+                        },
+                        "eu-west-1": {
+                            "credentialScope": {
+                                "region": "eu-west-1"
+                            },
+                            "hostname": "api.iotwireless.eu-west-1.amazonaws.com"
+                        },
+                        "sa-east-1": {
+                            "credentialScope": {
+                                "region": "sa-east-1"
+                            },
+                            "hostname": "api.iotwireless.sa-east-1.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "api.iotwireless.us-east-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "hostname": "api.iotwireless.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "api.mediatailor": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-northeast-1": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "api.pricing": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "pricing"
+                        }
+                    },
+                    "endpoints": {
+                        "ap-south-1": {},
+                        "us-east-1": {}
+                    }
+                },
+                "api.sagemaker": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "api-fips.sagemaker.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "api-fips.sagemaker.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "api-fips.sagemaker.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "api-fips.sagemaker.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2-fips": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "api-fips.sagemaker.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "api-fips.sagemaker.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "api-fips.sagemaker.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "api-fips.sagemaker.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "api-fips.sagemaker.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "api.tunneling.iot": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "api.tunneling.iot-fips.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "api.tunneling.iot-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "api.tunneling.iot-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "api.tunneling.iot-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "api.tunneling.iot-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "api.tunneling.iot-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "api.tunneling.iot-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "api.tunneling.iot-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "api.tunneling.iot-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "api.tunneling.iot-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "api.tunneling.iot-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "apigateway": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "apigateway-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "apigateway-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "apigateway-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "apigateway-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "apigateway-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "apigateway-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "apigateway-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "apigateway-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "apigateway-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "apigateway-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "app-integrations": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "appconfig": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "appconfigdata": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "appflow": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "application-autoscaling": {
+                    "defaults": {
+                        "protocols": ["http", "https"]
+                    },
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "applicationinsights": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "appmesh": {
+                    "endpoints": {
+                        "af-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "appmesh.af-south-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "appmesh.ap-east-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-1": {
+                            "variants": [
+                                {
+                                    "hostname": "appmesh.ap-northeast-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-2": {
+                            "variants": [
+                                {
+                                    "hostname": "appmesh.ap-northeast-2.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-3": {
+                            "variants": [
+                                {
+                                    "hostname": "appmesh.ap-northeast-3.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "appmesh.ap-south-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-1": {
+                            "variants": [
+                                {
+                                    "hostname": "appmesh.ap-southeast-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-2": {
+                            "variants": [
+                                {
+                                    "hostname": "appmesh.ap-southeast-2.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-3": {
+                            "variants": [
+                                {
+                                    "hostname": "appmesh.ap-southeast-3.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "appmesh-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "appmesh-fips.ca-central-1.api.aws",
+                                    "tags": ["dualstack", "fips"]
+                                },
+                                {
+                                    "hostname": "appmesh.ca-central-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ca-central-1-fips": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "appmesh-fips.ca-central-1.amazonaws.com"
+                        },
+                        "eu-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "appmesh.eu-central-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-north-1": {
+                            "variants": [
+                                {
+                                    "hostname": "appmesh.eu-north-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "appmesh.eu-south-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "appmesh.eu-west-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "appmesh.eu-west-2.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-west-3": {
+                            "variants": [
+                                {
+                                    "hostname": "appmesh.eu-west-3.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "me-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "appmesh.me-south-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "sa-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "appmesh.sa-east-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "appmesh-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "appmesh-fips.us-east-1.api.aws",
+                                    "tags": ["dualstack", "fips"]
+                                },
+                                {
+                                    "hostname": "appmesh.us-east-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "appmesh-fips.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "appmesh-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "appmesh-fips.us-east-2.api.aws",
+                                    "tags": ["dualstack", "fips"]
+                                },
+                                {
+                                    "hostname": "appmesh.us-east-2.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-east-2-fips": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "appmesh-fips.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "appmesh-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "appmesh-fips.us-west-1.api.aws",
+                                    "tags": ["dualstack", "fips"]
+                                },
+                                {
+                                    "hostname": "appmesh.us-west-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "appmesh-fips.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "appmesh-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "appmesh-fips.us-west-2.api.aws",
+                                    "tags": ["dualstack", "fips"]
+                                },
+                                {
+                                    "hostname": "appmesh.us-west-2.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "appmesh-fips.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "apprunner": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "apprunner-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "apprunner-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "apprunner-fips.us-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "apprunner-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "apprunner-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "apprunner-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "appstream2": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "appstream"
+                        },
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "appstream2-fips.us-west-2.amazonaws.com"
+                        },
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "appstream2-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "appstream2-fips.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {},
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "appstream2-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "appstream2-fips.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "appsync": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "aps": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "arc-zonal-shift": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "athena": {
+                    "endpoints": {
+                        "af-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "athena.af-south-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "athena.ap-east-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-1": {
+                            "variants": [
+                                {
+                                    "hostname": "athena.ap-northeast-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-2": {
+                            "variants": [
+                                {
+                                    "hostname": "athena.ap-northeast-2.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-3": {
+                            "variants": [
+                                {
+                                    "hostname": "athena.ap-northeast-3.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "athena.ap-south-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-1": {
+                            "variants": [
+                                {
+                                    "hostname": "athena.ap-southeast-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-2": {
+                            "variants": [
+                                {
+                                    "hostname": "athena.ap-southeast-2.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-3": {
+                            "variants": [
+                                {
+                                    "hostname": "athena.ap-southeast-3.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "athena.ca-central-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "athena.eu-central-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-north-1": {
+                            "variants": [
+                                {
+                                    "hostname": "athena.eu-north-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "athena.eu-south-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "athena.eu-west-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "athena.eu-west-2.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-west-3": {
+                            "variants": [
+                                {
+                                    "hostname": "athena.eu-west-3.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "athena-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "athena-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "athena-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "athena-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "athena.me-south-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "sa-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "athena.sa-east-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "athena-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "athena.us-east-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "athena-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "athena.us-east-2.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "athena-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "athena.us-west-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "athena-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "athena.us-west-2.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "auditmanager": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "autoscaling": {
+                    "defaults": {
+                        "protocols": ["http", "https"]
+                    },
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "autoscaling-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "autoscaling-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "autoscaling-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "autoscaling-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "autoscaling-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "autoscaling-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "autoscaling-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "autoscaling-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "autoscaling-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "autoscaling-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "autoscaling-plans": {
+                    "defaults": {
+                        "protocols": ["http", "https"]
+                    },
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "backup": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "backup-gateway": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "backupstorage": {
+                    "endpoints": {
+                        "eu-west-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "batch": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "fips.batch.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fips.batch.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "fips.batch.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fips.batch.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "fips.batch.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fips.batch.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "fips.batch.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fips.batch.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "fips.batch.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "billingconductor": {
+                    "endpoints": {
+                        "aws-global": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "billingconductor.us-east-1.amazonaws.com"
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-global"
+                },
+                "braket": {
+                    "endpoints": {
+                        "eu-west-2": {},
+                        "us-east-1": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "budgets": {
+                    "endpoints": {
+                        "aws-global": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "budgets.amazonaws.com"
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-global"
+                },
+                "cases": {
+                    "endpoints": {
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-west-2": {},
+                        "fips-us-east-1": {
+                            "deprecated": true
+                        },
+                        "fips-us-west-2": {
+                            "deprecated": true
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "cassandra": {
+                    "endpoints": {
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "cassandra-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "cassandra-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "cassandra-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "cassandra-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "catalog.marketplace": {
+                    "endpoints": {
+                        "us-east-1": {}
+                    }
+                },
+                "ce": {
+                    "endpoints": {
+                        "aws-global": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "ce.us-east-1.amazonaws.com"
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-global"
+                },
+                "chime": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "aws-global": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "chime.us-east-1.amazonaws.com",
+                            "protocols": ["https"]
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-global"
+                },
+                "cleanrooms": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "cloud9": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "cloudcontrolapi": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "cloudcontrolapi-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "cloudcontrolapi-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "cloudcontrolapi-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "cloudcontrolapi-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "cloudcontrolapi-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "cloudcontrolapi-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "cloudcontrolapi-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "cloudcontrolapi-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "cloudcontrolapi-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "cloudcontrolapi-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "clouddirectory": {
+                    "endpoints": {
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "cloudformation": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "cloudformation-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "cloudformation-fips.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "cloudformation-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2-fips": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "cloudformation-fips.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "cloudformation-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "cloudformation-fips.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "cloudformation-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "cloudformation-fips.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "cloudfront": {
+                    "endpoints": {
+                        "aws-global": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "cloudfront.amazonaws.com",
+                            "protocols": ["http", "https"]
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-global"
+                },
+                "cloudhsm": {
+                    "endpoints": {
+                        "us-east-1": {}
+                    }
+                },
+                "cloudhsmv2": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "cloudhsm"
+                        }
+                    },
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "cloudsearch": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "cloudtrail": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "cloudtrail-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "cloudtrail-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "cloudtrail-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "cloudtrail-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "cloudtrail-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "cloudtrail-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "cloudtrail-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "cloudtrail-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "cloudtrail-data": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "codeartifact": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "codebuild": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "codebuild-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "codebuild-fips.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "codebuild-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2-fips": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "codebuild-fips.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "codebuild-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "codebuild-fips.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "codebuild-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "codebuild-fips.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "codecatalyst": {
+                    "endpoints": {
+                        "aws-global": {
+                            "hostname": "codecatalyst.global.api.aws"
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-global"
+                },
+                "codecommit": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "codecommit-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ca-central-1-fips": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "codecommit-fips.ca-central-1.amazonaws.com"
+                        },
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "codecommit-fips.ca-central-1.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "codecommit-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "codecommit-fips.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "codecommit-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2-fips": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "codecommit-fips.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "codecommit-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "codecommit-fips.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "codecommit-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "codecommit-fips.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "codedeploy": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "codedeploy-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "codedeploy-fips.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "codedeploy-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2-fips": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "codedeploy-fips.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "codedeploy-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "codedeploy-fips.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "codedeploy-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "codedeploy-fips.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "codeguru-reviewer": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "codepipeline": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "codepipeline-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "codepipeline-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "codepipeline-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "codepipeline-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "codepipeline-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "codepipeline-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "codepipeline-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "codepipeline-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "codepipeline-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "codepipeline-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "codestar": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "codestar-connections": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "codestar-notifications": {
+                    "endpoints": {
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "cognito-identity": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "cognito-identity-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "cognito-identity-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "cognito-identity-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "cognito-identity-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "cognito-identity-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {},
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "cognito-identity-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "cognito-idp": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "cognito-idp-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "cognito-idp-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "cognito-idp-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "cognito-idp-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "cognito-idp-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "cognito-idp-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "cognito-idp-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "cognito-idp-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "cognito-sync": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "comprehend": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "comprehend-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "comprehend-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "comprehend-fips.us-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "comprehend-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "comprehend-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "comprehend-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "comprehendmedical": {
+                    "endpoints": {
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "comprehendmedical-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "comprehendmedical-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "comprehendmedical-fips.us-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "comprehendmedical-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "comprehendmedical-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "comprehendmedical-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "compute-optimizer": {
+                    "endpoints": {
+                        "af-south-1": {
+                            "credentialScope": {
+                                "region": "af-south-1"
+                            },
+                            "hostname": "compute-optimizer.af-south-1.amazonaws.com"
+                        },
+                        "ap-east-1": {
+                            "credentialScope": {
+                                "region": "ap-east-1"
+                            },
+                            "hostname": "compute-optimizer.ap-east-1.amazonaws.com"
+                        },
+                        "ap-northeast-1": {
+                            "credentialScope": {
+                                "region": "ap-northeast-1"
+                            },
+                            "hostname": "compute-optimizer.ap-northeast-1.amazonaws.com"
+                        },
+                        "ap-northeast-2": {
+                            "credentialScope": {
+                                "region": "ap-northeast-2"
+                            },
+                            "hostname": "compute-optimizer.ap-northeast-2.amazonaws.com"
+                        },
+                        "ap-northeast-3": {
+                            "credentialScope": {
+                                "region": "ap-northeast-3"
+                            },
+                            "hostname": "compute-optimizer.ap-northeast-3.amazonaws.com"
+                        },
+                        "ap-south-1": {
+                            "credentialScope": {
+                                "region": "ap-south-1"
+                            },
+                            "hostname": "compute-optimizer.ap-south-1.amazonaws.com"
+                        },
+                        "ap-southeast-1": {
+                            "credentialScope": {
+                                "region": "ap-southeast-1"
+                            },
+                            "hostname": "compute-optimizer.ap-southeast-1.amazonaws.com"
+                        },
+                        "ap-southeast-2": {
+                            "credentialScope": {
+                                "region": "ap-southeast-2"
+                            },
+                            "hostname": "compute-optimizer.ap-southeast-2.amazonaws.com"
+                        },
+                        "ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "hostname": "compute-optimizer.ca-central-1.amazonaws.com"
+                        },
+                        "eu-central-1": {
+                            "credentialScope": {
+                                "region": "eu-central-1"
+                            },
+                            "hostname": "compute-optimizer.eu-central-1.amazonaws.com"
+                        },
+                        "eu-north-1": {
+                            "credentialScope": {
+                                "region": "eu-north-1"
+                            },
+                            "hostname": "compute-optimizer.eu-north-1.amazonaws.com"
+                        },
+                        "eu-south-1": {
+                            "credentialScope": {
+                                "region": "eu-south-1"
+                            },
+                            "hostname": "compute-optimizer.eu-south-1.amazonaws.com"
+                        },
+                        "eu-west-1": {
+                            "credentialScope": {
+                                "region": "eu-west-1"
+                            },
+                            "hostname": "compute-optimizer.eu-west-1.amazonaws.com"
+                        },
+                        "eu-west-2": {
+                            "credentialScope": {
+                                "region": "eu-west-2"
+                            },
+                            "hostname": "compute-optimizer.eu-west-2.amazonaws.com"
+                        },
+                        "eu-west-3": {
+                            "credentialScope": {
+                                "region": "eu-west-3"
+                            },
+                            "hostname": "compute-optimizer.eu-west-3.amazonaws.com"
+                        },
+                        "me-south-1": {
+                            "credentialScope": {
+                                "region": "me-south-1"
+                            },
+                            "hostname": "compute-optimizer.me-south-1.amazonaws.com"
+                        },
+                        "sa-east-1": {
+                            "credentialScope": {
+                                "region": "sa-east-1"
+                            },
+                            "hostname": "compute-optimizer.sa-east-1.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "compute-optimizer.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "hostname": "compute-optimizer.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "hostname": "compute-optimizer.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "hostname": "compute-optimizer.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "config": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "config-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "config-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "config-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "config-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "config-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "config-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "config-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "config-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "connect": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-west-2": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "connect-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "connect-fips.us-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "connect-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "connect-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "connect-campaigns": {
+                    "endpoints": {
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-west-2": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "connect-campaigns-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "connect-campaigns-fips.us-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "connect-campaigns-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "connect-campaigns-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "contact-lens": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "controltower": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "controltower-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ca-central-1-fips": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "controltower-fips.ca-central-1.amazonaws.com"
+                        },
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "controltower-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "controltower-fips.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "controltower-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2-fips": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "controltower-fips.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "controltower-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "controltower-fips.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "controltower-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "controltower-fips.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "cur": {
+                    "endpoints": {
+                        "us-east-1": {}
+                    }
+                },
+                "data-ats.iot": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "iotdata"
+                        },
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "data.iot-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "service": "iotdata"
+                            },
+                            "deprecated": true,
+                            "hostname": "data.iot-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "service": "iotdata"
+                            },
+                            "deprecated": true,
+                            "hostname": "data.iot-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "service": "iotdata"
+                            },
+                            "deprecated": true,
+                            "hostname": "data.iot-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "service": "iotdata"
+                            },
+                            "deprecated": true,
+                            "hostname": "data.iot-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "service": "iotdata"
+                            },
+                            "deprecated": true,
+                            "hostname": "data.iot-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "data.iot-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "data.iot-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "data.iot-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "data.iot-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "data.iot": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "iotdata"
+                        },
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "data.iot-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "service": "iotdata"
+                            },
+                            "deprecated": true,
+                            "hostname": "data.iot-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "service": "iotdata"
+                            },
+                            "deprecated": true,
+                            "hostname": "data.iot-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "service": "iotdata"
+                            },
+                            "deprecated": true,
+                            "hostname": "data.iot-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "service": "iotdata"
+                            },
+                            "deprecated": true,
+                            "hostname": "data.iot-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "service": "iotdata"
+                            },
+                            "deprecated": true,
+                            "hostname": "data.iot-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "data.iot-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "data.iot-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "data.iot-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "data.iot-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "data.jobs.iot": {
+                    "endpoints": {
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "data.jobs.iot-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "data.jobs.iot-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "data.jobs.iot-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "data.jobs.iot-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "data.jobs.iot-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "data.jobs.iot-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "data.jobs.iot-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "data.jobs.iot-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "data.jobs.iot-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "data.jobs.iot-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "data.mediastore": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "databrew": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "databrew-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "databrew-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "databrew-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "databrew-fips.us-west-2.amazonaws.com"
+                        },
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "databrew-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "databrew-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "databrew-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "databrew-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "dataexchange": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "datapipeline": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-west-1": {},
+                        "us-east-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "datasync": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "datasync-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "datasync-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "datasync-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "datasync-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "datasync-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "datasync-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "datasync-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "datasync-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "datasync-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "datasync-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "dax": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "devicefarm": {
+                    "endpoints": {
+                        "us-west-2": {}
+                    }
+                },
+                "devops-guru": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "devops-guru-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "devops-guru-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "devops-guru-fips.us-west-2.amazonaws.com"
+                        },
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "devops-guru-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "devops-guru-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {},
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "devops-guru-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "directconnect": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "directconnect-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "directconnect-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "directconnect-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "directconnect-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "directconnect-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "directconnect-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "directconnect-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "directconnect-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "discovery": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "dlm": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "dms": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "dms": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "dms-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "dms-fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "dms-fips.us-west-1.amazonaws.com"
+                        },
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "dms-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "dms-fips.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "dms-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2-fips": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "dms-fips.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "dms-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "dms-fips.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "dms-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "dms-fips.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "docdb": {
+                    "endpoints": {
+                        "ap-northeast-1": {
+                            "credentialScope": {
+                                "region": "ap-northeast-1"
+                            },
+                            "hostname": "rds.ap-northeast-1.amazonaws.com"
+                        },
+                        "ap-northeast-2": {
+                            "credentialScope": {
+                                "region": "ap-northeast-2"
+                            },
+                            "hostname": "rds.ap-northeast-2.amazonaws.com"
+                        },
+                        "ap-south-1": {
+                            "credentialScope": {
+                                "region": "ap-south-1"
+                            },
+                            "hostname": "rds.ap-south-1.amazonaws.com"
+                        },
+                        "ap-southeast-1": {
+                            "credentialScope": {
+                                "region": "ap-southeast-1"
+                            },
+                            "hostname": "rds.ap-southeast-1.amazonaws.com"
+                        },
+                        "ap-southeast-2": {
+                            "credentialScope": {
+                                "region": "ap-southeast-2"
+                            },
+                            "hostname": "rds.ap-southeast-2.amazonaws.com"
+                        },
+                        "ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "hostname": "rds.ca-central-1.amazonaws.com"
+                        },
+                        "eu-central-1": {
+                            "credentialScope": {
+                                "region": "eu-central-1"
+                            },
+                            "hostname": "rds.eu-central-1.amazonaws.com"
+                        },
+                        "eu-west-1": {
+                            "credentialScope": {
+                                "region": "eu-west-1"
+                            },
+                            "hostname": "rds.eu-west-1.amazonaws.com"
+                        },
+                        "eu-west-2": {
+                            "credentialScope": {
+                                "region": "eu-west-2"
+                            },
+                            "hostname": "rds.eu-west-2.amazonaws.com"
+                        },
+                        "eu-west-3": {
+                            "credentialScope": {
+                                "region": "eu-west-3"
+                            },
+                            "hostname": "rds.eu-west-3.amazonaws.com"
+                        },
+                        "sa-east-1": {
+                            "credentialScope": {
+                                "region": "sa-east-1"
+                            },
+                            "hostname": "rds.sa-east-1.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "rds.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "hostname": "rds.us-east-2.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "hostname": "rds.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "drs": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "ds": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ds-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ds-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ds-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "ds-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ds-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "ds-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ds-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "ds-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ds-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "ds-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "dynamodb": {
+                    "defaults": {
+                        "protocols": ["http", "https"]
+                    },
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "dynamodb-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ca-central-1-fips": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "dynamodb-fips.ca-central-1.amazonaws.com"
+                        },
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "local": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "localhost:8000",
+                            "protocols": ["http"]
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "dynamodb-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "dynamodb-fips.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "dynamodb-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2-fips": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "dynamodb-fips.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "dynamodb-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "dynamodb-fips.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "dynamodb-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "dynamodb-fips.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "ebs": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ebs-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ebs-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ebs-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "ebs-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ebs-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "ebs-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ebs-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "ebs-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ebs-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "ebs-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "ec2": {
+                    "defaults": {
+                        "protocols": ["http", "https"]
+                    },
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ec2.ap-south-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ec2-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ec2.eu-west-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ec2-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ec2-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "ec2-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ec2-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "ec2-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ec2.sa-east-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ec2-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "ec2.us-east-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "ec2-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "ec2.us-east-2.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ec2-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "ec2-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "ec2.us-west-2.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "ecr": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "ecr-fips.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "af-south-1": {
+                            "credentialScope": {
+                                "region": "af-south-1"
+                            },
+                            "hostname": "api.ecr.af-south-1.amazonaws.com"
+                        },
+                        "ap-east-1": {
+                            "credentialScope": {
+                                "region": "ap-east-1"
+                            },
+                            "hostname": "api.ecr.ap-east-1.amazonaws.com"
+                        },
+                        "ap-northeast-1": {
+                            "credentialScope": {
+                                "region": "ap-northeast-1"
+                            },
+                            "hostname": "api.ecr.ap-northeast-1.amazonaws.com"
+                        },
+                        "ap-northeast-2": {
+                            "credentialScope": {
+                                "region": "ap-northeast-2"
+                            },
+                            "hostname": "api.ecr.ap-northeast-2.amazonaws.com"
+                        },
+                        "ap-northeast-3": {
+                            "credentialScope": {
+                                "region": "ap-northeast-3"
+                            },
+                            "hostname": "api.ecr.ap-northeast-3.amazonaws.com"
+                        },
+                        "ap-south-1": {
+                            "credentialScope": {
+                                "region": "ap-south-1"
+                            },
+                            "hostname": "api.ecr.ap-south-1.amazonaws.com"
+                        },
+                        "ap-south-2": {
+                            "credentialScope": {
+                                "region": "ap-south-2"
+                            },
+                            "hostname": "api.ecr.ap-south-2.amazonaws.com"
+                        },
+                        "ap-southeast-1": {
+                            "credentialScope": {
+                                "region": "ap-southeast-1"
+                            },
+                            "hostname": "api.ecr.ap-southeast-1.amazonaws.com"
+                        },
+                        "ap-southeast-2": {
+                            "credentialScope": {
+                                "region": "ap-southeast-2"
+                            },
+                            "hostname": "api.ecr.ap-southeast-2.amazonaws.com"
+                        },
+                        "ap-southeast-3": {
+                            "credentialScope": {
+                                "region": "ap-southeast-3"
+                            },
+                            "hostname": "api.ecr.ap-southeast-3.amazonaws.com"
+                        },
+                        "ap-southeast-4": {
+                            "credentialScope": {
+                                "region": "ap-southeast-4"
+                            },
+                            "hostname": "api.ecr.ap-southeast-4.amazonaws.com"
+                        },
+                        "ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "hostname": "api.ecr.ca-central-1.amazonaws.com"
+                        },
+                        "dkr-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "ecr-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "dkr-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "ecr-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "dkr-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "ecr-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "dkr-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "ecr-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {
+                            "credentialScope": {
+                                "region": "eu-central-1"
+                            },
+                            "hostname": "api.ecr.eu-central-1.amazonaws.com"
+                        },
+                        "eu-central-2": {
+                            "credentialScope": {
+                                "region": "eu-central-2"
+                            },
+                            "hostname": "api.ecr.eu-central-2.amazonaws.com"
+                        },
+                        "eu-north-1": {
+                            "credentialScope": {
+                                "region": "eu-north-1"
+                            },
+                            "hostname": "api.ecr.eu-north-1.amazonaws.com"
+                        },
+                        "eu-south-1": {
+                            "credentialScope": {
+                                "region": "eu-south-1"
+                            },
+                            "hostname": "api.ecr.eu-south-1.amazonaws.com"
+                        },
+                        "eu-south-2": {
+                            "credentialScope": {
+                                "region": "eu-south-2"
+                            },
+                            "hostname": "api.ecr.eu-south-2.amazonaws.com"
+                        },
+                        "eu-west-1": {
+                            "credentialScope": {
+                                "region": "eu-west-1"
+                            },
+                            "hostname": "api.ecr.eu-west-1.amazonaws.com"
+                        },
+                        "eu-west-2": {
+                            "credentialScope": {
+                                "region": "eu-west-2"
+                            },
+                            "hostname": "api.ecr.eu-west-2.amazonaws.com"
+                        },
+                        "eu-west-3": {
+                            "credentialScope": {
+                                "region": "eu-west-3"
+                            },
+                            "hostname": "api.ecr.eu-west-3.amazonaws.com"
+                        },
+                        "fips-dkr-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecr-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-dkr-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecr-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-dkr-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecr-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-dkr-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecr-fips.us-west-2.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecr-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecr-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecr-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecr-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {
+                            "credentialScope": {
+                                "region": "me-central-1"
+                            },
+                            "hostname": "api.ecr.me-central-1.amazonaws.com"
+                        },
+                        "me-south-1": {
+                            "credentialScope": {
+                                "region": "me-south-1"
+                            },
+                            "hostname": "api.ecr.me-south-1.amazonaws.com"
+                        },
+                        "sa-east-1": {
+                            "credentialScope": {
+                                "region": "sa-east-1"
+                            },
+                            "hostname": "api.ecr.sa-east-1.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "api.ecr.us-east-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "ecr-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "hostname": "api.ecr.us-east-2.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "ecr-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "hostname": "api.ecr.us-west-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "ecr-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "hostname": "api.ecr.us-west-2.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "ecr-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "ecs": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecs-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecs-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecs-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecs-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ecs-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "ecs-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ecs-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "ecs-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "edge.sagemaker": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "eks": {
+                    "defaults": {
+                        "protocols": ["http", "https"],
+                        "variants": [
+                            {
+                                "hostname": "fips.eks.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fips.eks.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "fips.eks.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fips.eks.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "fips.eks.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fips.eks.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "fips.eks.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fips.eks.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "fips.eks.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "elasticache": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticache-fips.us-west-1.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticache-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticache-fips.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticache-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2-fips": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticache-fips.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticache-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticache-fips.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticache-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticache-fips.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "elasticbeanstalk": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticbeanstalk-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticbeanstalk-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticbeanstalk-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticbeanstalk-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticbeanstalk-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticbeanstalk-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticbeanstalk-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticbeanstalk-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "elasticfilesystem": {
+                    "endpoints": {
+                        "af-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.af-south-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.ap-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.ap-northeast-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-2": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.ap-northeast-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-3": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.ap-northeast-3.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.ap-south-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-south-2": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.ap-south-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.ap-southeast-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-2": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.ap-southeast-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-3": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.ap-southeast-3.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-4": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.ap-southeast-4.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.eu-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-2": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.eu-central-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-north-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.eu-north-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.eu-south-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-south-2": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.eu-south-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.eu-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.eu-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-west-3": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.eu-west-3.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "fips-af-south-1": {
+                            "credentialScope": {
+                                "region": "af-south-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.af-south-1.amazonaws.com"
+                        },
+                        "fips-ap-east-1": {
+                            "credentialScope": {
+                                "region": "ap-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.ap-east-1.amazonaws.com"
+                        },
+                        "fips-ap-northeast-1": {
+                            "credentialScope": {
+                                "region": "ap-northeast-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.ap-northeast-1.amazonaws.com"
+                        },
+                        "fips-ap-northeast-2": {
+                            "credentialScope": {
+                                "region": "ap-northeast-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.ap-northeast-2.amazonaws.com"
+                        },
+                        "fips-ap-northeast-3": {
+                            "credentialScope": {
+                                "region": "ap-northeast-3"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.ap-northeast-3.amazonaws.com"
+                        },
+                        "fips-ap-south-1": {
+                            "credentialScope": {
+                                "region": "ap-south-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.ap-south-1.amazonaws.com"
+                        },
+                        "fips-ap-south-2": {
+                            "credentialScope": {
+                                "region": "ap-south-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.ap-south-2.amazonaws.com"
+                        },
+                        "fips-ap-southeast-1": {
+                            "credentialScope": {
+                                "region": "ap-southeast-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.ap-southeast-1.amazonaws.com"
+                        },
+                        "fips-ap-southeast-2": {
+                            "credentialScope": {
+                                "region": "ap-southeast-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.ap-southeast-2.amazonaws.com"
+                        },
+                        "fips-ap-southeast-3": {
+                            "credentialScope": {
+                                "region": "ap-southeast-3"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.ap-southeast-3.amazonaws.com"
+                        },
+                        "fips-ap-southeast-4": {
+                            "credentialScope": {
+                                "region": "ap-southeast-4"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.ap-southeast-4.amazonaws.com"
+                        },
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-eu-central-1": {
+                            "credentialScope": {
+                                "region": "eu-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.eu-central-1.amazonaws.com"
+                        },
+                        "fips-eu-central-2": {
+                            "credentialScope": {
+                                "region": "eu-central-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.eu-central-2.amazonaws.com"
+                        },
+                        "fips-eu-north-1": {
+                            "credentialScope": {
+                                "region": "eu-north-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.eu-north-1.amazonaws.com"
+                        },
+                        "fips-eu-south-1": {
+                            "credentialScope": {
+                                "region": "eu-south-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.eu-south-1.amazonaws.com"
+                        },
+                        "fips-eu-south-2": {
+                            "credentialScope": {
+                                "region": "eu-south-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.eu-south-2.amazonaws.com"
+                        },
+                        "fips-eu-west-1": {
+                            "credentialScope": {
+                                "region": "eu-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.eu-west-1.amazonaws.com"
+                        },
+                        "fips-eu-west-2": {
+                            "credentialScope": {
+                                "region": "eu-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.eu-west-2.amazonaws.com"
+                        },
+                        "fips-eu-west-3": {
+                            "credentialScope": {
+                                "region": "eu-west-3"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.eu-west-3.amazonaws.com"
+                        },
+                        "fips-me-central-1": {
+                            "credentialScope": {
+                                "region": "me-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.me-central-1.amazonaws.com"
+                        },
+                        "fips-me-south-1": {
+                            "credentialScope": {
+                                "region": "me-south-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.me-south-1.amazonaws.com"
+                        },
+                        "fips-sa-east-1": {
+                            "credentialScope": {
+                                "region": "sa-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.sa-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.me-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "me-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.me-south-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "sa-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.sa-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "elasticloadbalancing": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticloadbalancing-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticloadbalancing-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticloadbalancing-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticloadbalancing-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticloadbalancing-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticloadbalancing-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticloadbalancing-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticloadbalancing-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "elasticmapreduce": {
+                    "defaults": {
+                        "protocols": ["https"],
+                        "sslCommonName": "{region}.{service}.{dnsSuffix}"
+                    },
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticmapreduce-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {
+                            "sslCommonName": "{service}.{region}.{dnsSuffix}"
+                        },
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticmapreduce-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticmapreduce-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticmapreduce-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticmapreduce-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticmapreduce-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "sslCommonName": "{service}.{region}.{dnsSuffix}",
+                            "variants": [
+                                {
+                                    "hostname": "elasticmapreduce-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticmapreduce-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticmapreduce-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticmapreduce-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "elastictranscoder": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-west-1": {},
+                        "us-east-1": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "email": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "email-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "email-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "email-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "email-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "emr-containers": {
+                    "endpoints": {
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "emr-containers-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "emr-containers-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "emr-containers-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "emr-containers-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "emr-containers-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "emr-containers-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "emr-containers-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "emr-containers-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "emr-containers-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "emr-containers-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "emr-serverless": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "emr-serverless-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "emr-serverless-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "emr-serverless-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "emr-serverless-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "emr-serverless-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "emr-serverless-fips.us-west-2.amazonaws.com"
+                        },
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "emr-serverless-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "emr-serverless-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "emr-serverless-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "emr-serverless-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "entitlement.marketplace": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "aws-marketplace"
+                        }
+                    },
+                    "endpoints": {
+                        "us-east-1": {}
+                    }
+                },
+                "es": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "es-fips.us-west-1.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "es-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "es-fips.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "es-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2-fips": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "es-fips.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "es-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "es-fips.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "es-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "es-fips.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "events": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "events-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "events-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "events-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "events-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "events-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "events-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "events-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "events-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "evidently": {
+                    "endpoints": {
+                        "ap-northeast-1": {
+                            "hostname": "evidently.ap-northeast-1.amazonaws.com"
+                        },
+                        "ap-southeast-1": {
+                            "hostname": "evidently.ap-southeast-1.amazonaws.com"
+                        },
+                        "ap-southeast-2": {
+                            "hostname": "evidently.ap-southeast-2.amazonaws.com"
+                        },
+                        "eu-central-1": {
+                            "hostname": "evidently.eu-central-1.amazonaws.com"
+                        },
+                        "eu-north-1": {
+                            "hostname": "evidently.eu-north-1.amazonaws.com"
+                        },
+                        "eu-west-1": {
+                            "hostname": "evidently.eu-west-1.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "hostname": "evidently.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "hostname": "evidently.us-east-2.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "hostname": "evidently.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "finspace": {
+                    "endpoints": {
+                        "ca-central-1": {},
+                        "eu-west-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "finspace-api": {
+                    "endpoints": {
+                        "ca-central-1": {},
+                        "eu-west-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "firehose": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "firehose-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "firehose-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "firehose-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "firehose-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "firehose-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "firehose-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "firehose-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "firehose-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "fms": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "af-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fms-fips.af-south-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fms-fips.ap-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fms-fips.ap-northeast-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-2": {
+                            "variants": [
+                                {
+                                    "hostname": "fms-fips.ap-northeast-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-3": {},
+                        "ap-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fms-fips.ap-south-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-south-2": {},
+                        "ap-southeast-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fms-fips.ap-southeast-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-2": {
+                            "variants": [
+                                {
+                                    "hostname": "fms-fips.ap-southeast-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-3": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fms-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fms-fips.eu-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fms-fips.eu-south-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-south-2": {},
+                        "eu-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fms-fips.eu-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "fms-fips.eu-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-west-3": {
+                            "variants": [
+                                {
+                                    "hostname": "fms-fips.eu-west-3.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "fips-af-south-1": {
+                            "credentialScope": {
+                                "region": "af-south-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fms-fips.af-south-1.amazonaws.com"
+                        },
+                        "fips-ap-east-1": {
+                            "credentialScope": {
+                                "region": "ap-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fms-fips.ap-east-1.amazonaws.com"
+                        },
+                        "fips-ap-northeast-1": {
+                            "credentialScope": {
+                                "region": "ap-northeast-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fms-fips.ap-northeast-1.amazonaws.com"
+                        },
+                        "fips-ap-northeast-2": {
+                            "credentialScope": {
+                                "region": "ap-northeast-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "fms-fips.ap-northeast-2.amazonaws.com"
+                        },
+                        "fips-ap-south-1": {
+                            "credentialScope": {
+                                "region": "ap-south-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fms-fips.ap-south-1.amazonaws.com"
+                        },
+                        "fips-ap-southeast-1": {
+                            "credentialScope": {
+                                "region": "ap-southeast-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fms-fips.ap-southeast-1.amazonaws.com"
+                        },
+                        "fips-ap-southeast-2": {
+                            "credentialScope": {
+                                "region": "ap-southeast-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "fms-fips.ap-southeast-2.amazonaws.com"
+                        },
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fms-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-eu-central-1": {
+                            "credentialScope": {
+                                "region": "eu-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fms-fips.eu-central-1.amazonaws.com"
+                        },
+                        "fips-eu-south-1": {
+                            "credentialScope": {
+                                "region": "eu-south-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fms-fips.eu-south-1.amazonaws.com"
+                        },
+                        "fips-eu-west-1": {
+                            "credentialScope": {
+                                "region": "eu-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fms-fips.eu-west-1.amazonaws.com"
+                        },
+                        "fips-eu-west-2": {
+                            "credentialScope": {
+                                "region": "eu-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "fms-fips.eu-west-2.amazonaws.com"
+                        },
+                        "fips-eu-west-3": {
+                            "credentialScope": {
+                                "region": "eu-west-3"
+                            },
+                            "deprecated": true,
+                            "hostname": "fms-fips.eu-west-3.amazonaws.com"
+                        },
+                        "fips-me-south-1": {
+                            "credentialScope": {
+                                "region": "me-south-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fms-fips.me-south-1.amazonaws.com"
+                        },
+                        "fips-sa-east-1": {
+                            "credentialScope": {
+                                "region": "sa-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fms-fips.sa-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fms-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "fms-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fms-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "fms-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fms-fips.me-south-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "sa-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fms-fips.sa-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fms-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "fms-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fms-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "fms-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "forecast": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "forecast-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "forecast-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "forecast-fips.us-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "forecast-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "forecast-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "forecast-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "forecastquery": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "forecastquery-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "forecastquery-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "forecastquery-fips.us-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "forecastquery-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "forecastquery-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "forecastquery-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "frauddetector": {
+                    "endpoints": {
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-west-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "fsx": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fsx-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fsx-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-prod-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fsx-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-prod-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fsx-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-prod-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "fsx-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-prod-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fsx-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-prod-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "fsx-fips.us-west-2.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fsx-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "fsx-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fsx-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "fsx-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "prod-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "fsx-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "prod-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "fsx-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "prod-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "fsx-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "prod-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "fsx-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "prod-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "fsx-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fsx-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "fsx-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fsx-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "fsx-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "gamelift": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "gamesparks": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "us-east-1": {}
+                    }
+                },
+                "geo": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "glacier": {
+                    "defaults": {
+                        "protocols": ["http", "https"]
+                    },
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "glacier-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "glacier-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "glacier-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "glacier-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "glacier-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "glacier-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "glacier-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "glacier-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "glacier-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "glacier-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "glue": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "glue-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "glue-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "glue-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "glue-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "glue-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "glue-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "glue-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "glue-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "grafana": {
+                    "endpoints": {
+                        "ap-northeast-1": {
+                            "credentialScope": {
+                                "region": "ap-northeast-1"
+                            },
+                            "hostname": "grafana.ap-northeast-1.amazonaws.com"
+                        },
+                        "ap-northeast-2": {
+                            "credentialScope": {
+                                "region": "ap-northeast-2"
+                            },
+                            "hostname": "grafana.ap-northeast-2.amazonaws.com"
+                        },
+                        "ap-southeast-1": {
+                            "credentialScope": {
+                                "region": "ap-southeast-1"
+                            },
+                            "hostname": "grafana.ap-southeast-1.amazonaws.com"
+                        },
+                        "ap-southeast-2": {
+                            "credentialScope": {
+                                "region": "ap-southeast-2"
+                            },
+                            "hostname": "grafana.ap-southeast-2.amazonaws.com"
+                        },
+                        "eu-central-1": {
+                            "credentialScope": {
+                                "region": "eu-central-1"
+                            },
+                            "hostname": "grafana.eu-central-1.amazonaws.com"
+                        },
+                        "eu-west-1": {
+                            "credentialScope": {
+                                "region": "eu-west-1"
+                            },
+                            "hostname": "grafana.eu-west-1.amazonaws.com"
+                        },
+                        "eu-west-2": {
+                            "credentialScope": {
+                                "region": "eu-west-2"
+                            },
+                            "hostname": "grafana.eu-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "grafana.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "hostname": "grafana.us-east-2.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "hostname": "grafana.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "greengrass": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "greengrass-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "greengrass-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "greengrass-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "greengrass-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "greengrass-fips.us-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "greengrass-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "greengrass-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "greengrass-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    },
+                    "isRegionalized": true
+                },
+                "groundstation": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-northeast-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "groundstation-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "groundstation-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "groundstation-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "groundstation-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "groundstation-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "groundstation-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "guardduty": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "guardduty-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "guardduty-fips.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "guardduty-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2-fips": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "guardduty-fips.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "guardduty-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "guardduty-fips.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "guardduty-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "guardduty-fips.us-west-2.amazonaws.com"
+                        }
+                    },
+                    "isRegionalized": true
+                },
+                "health": {
+                    "defaults": {
+                        "protocols": ["https"],
+                        "sslCommonName": "health.us-east-1.amazonaws.com"
+                    },
+                    "endpoints": {
+                        "aws-global": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "global.health.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "health-fips.us-east-2.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "health-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-global"
+                },
+                "healthlake": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "ap-south-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "honeycode": {
+                    "endpoints": {
+                        "us-west-2": {}
+                    }
+                },
+                "iam": {
+                    "endpoints": {
+                        "aws-global": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "iam.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "iam-fips.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "aws-global-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "iam-fips.amazonaws.com"
+                        },
+                        "iam": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "iam-fips.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "iam-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "iam-fips.amazonaws.com"
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-global"
+                },
+                "identity-chime": {
+                    "endpoints": {
+                        "eu-central-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "identity-chime-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "identity-chime-fips.us-east-1.amazonaws.com"
+                        }
+                    }
+                },
+                "identitystore": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "importexport": {
+                    "endpoints": {
+                        "aws-global": {
+                            "credentialScope": {
+                                "region": "us-east-1",
+                                "service": "IngestionService"
+                            },
+                            "hostname": "importexport.amazonaws.com",
+                            "signatureVersions": ["v2", "v4"]
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-global"
+                },
+                "ingest.timestream": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "ingest-fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ingest.timestream-fips.us-east-1.amazonaws.com"
+                        },
+                        "ingest-fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "ingest.timestream-fips.us-east-2.amazonaws.com"
+                        },
+                        "ingest-fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "ingest.timestream-fips.us-west-2.amazonaws.com"
+                        },
+                        "ingest-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "ingest.timestream-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ingest-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "ingest.timestream-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ingest-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "ingest.timestream-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "inspector": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "inspector-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "inspector-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "inspector-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "inspector-fips.us-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "inspector-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "inspector-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "inspector-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "inspector-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "inspector2": {
+                    "endpoints": {
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "internetmonitor": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "dnsSuffix": "api.aws",
+                                "hostname": "{service}-fips.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "af-south-1": {
+                            "hostname": "internetmonitor.af-south-1.api.aws"
+                        },
+                        "ap-east-1": {
+                            "hostname": "internetmonitor.ap-east-1.api.aws"
+                        },
+                        "ap-northeast-1": {
+                            "hostname": "internetmonitor.ap-northeast-1.api.aws"
+                        },
+                        "ap-northeast-2": {
+                            "hostname": "internetmonitor.ap-northeast-2.api.aws"
+                        },
+                        "ap-northeast-3": {
+                            "hostname": "internetmonitor.ap-northeast-3.api.aws"
+                        },
+                        "ap-south-1": {
+                            "hostname": "internetmonitor.ap-south-1.api.aws"
+                        },
+                        "ap-south-2": {
+                            "hostname": "internetmonitor.ap-south-2.api.aws"
+                        },
+                        "ap-southeast-1": {
+                            "hostname": "internetmonitor.ap-southeast-1.api.aws"
+                        },
+                        "ap-southeast-2": {
+                            "hostname": "internetmonitor.ap-southeast-2.api.aws"
+                        },
+                        "ap-southeast-3": {
+                            "hostname": "internetmonitor.ap-southeast-3.api.aws"
+                        },
+                        "ap-southeast-4": {
+                            "hostname": "internetmonitor.ap-southeast-4.api.aws"
+                        },
+                        "ca-central-1": {
+                            "hostname": "internetmonitor.ca-central-1.api.aws"
+                        },
+                        "eu-central-1": {
+                            "hostname": "internetmonitor.eu-central-1.api.aws"
+                        },
+                        "eu-central-2": {
+                            "hostname": "internetmonitor.eu-central-2.api.aws"
+                        },
+                        "eu-north-1": {
+                            "hostname": "internetmonitor.eu-north-1.api.aws"
+                        },
+                        "eu-south-1": {
+                            "hostname": "internetmonitor.eu-south-1.api.aws"
+                        },
+                        "eu-south-2": {
+                            "hostname": "internetmonitor.eu-south-2.api.aws"
+                        },
+                        "eu-west-1": {
+                            "hostname": "internetmonitor.eu-west-1.api.aws"
+                        },
+                        "eu-west-2": {
+                            "hostname": "internetmonitor.eu-west-2.api.aws"
+                        },
+                        "eu-west-3": {
+                            "hostname": "internetmonitor.eu-west-3.api.aws"
+                        },
+                        "me-central-1": {
+                            "hostname": "internetmonitor.me-central-1.api.aws"
+                        },
+                        "me-south-1": {
+                            "hostname": "internetmonitor.me-south-1.api.aws"
+                        },
+                        "sa-east-1": {
+                            "hostname": "internetmonitor.sa-east-1.api.aws"
+                        },
+                        "us-east-1": {
+                            "hostname": "internetmonitor.us-east-1.api.aws"
+                        },
+                        "us-east-2": {
+                            "hostname": "internetmonitor.us-east-2.api.aws"
+                        },
+                        "us-west-1": {
+                            "hostname": "internetmonitor.us-west-1.api.aws"
+                        },
+                        "us-west-2": {
+                            "hostname": "internetmonitor.us-west-2.api.aws"
+                        }
+                    }
+                },
+                "iot": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "execute-api"
+                        }
+                    },
+                    "endpoints": {
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "iot-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "service": "execute-api"
+                            },
+                            "deprecated": true,
+                            "hostname": "iot-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "service": "execute-api"
+                            },
+                            "deprecated": true,
+                            "hostname": "iot-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "service": "execute-api"
+                            },
+                            "deprecated": true,
+                            "hostname": "iot-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "service": "execute-api"
+                            },
+                            "deprecated": true,
+                            "hostname": "iot-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "service": "execute-api"
+                            },
+                            "deprecated": true,
+                            "hostname": "iot-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "iot-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "iot-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "iot-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "iot-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "iotanalytics": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-south-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "iotevents": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "iotevents-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "iotevents-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "iotevents-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "iotevents-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "iotevents-fips.us-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "iotevents-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "iotevents-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "iotevents-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "ioteventsdata": {
+                    "endpoints": {
+                        "ap-northeast-1": {
+                            "credentialScope": {
+                                "region": "ap-northeast-1"
+                            },
+                            "hostname": "data.iotevents.ap-northeast-1.amazonaws.com"
+                        },
+                        "ap-northeast-2": {
+                            "credentialScope": {
+                                "region": "ap-northeast-2"
+                            },
+                            "hostname": "data.iotevents.ap-northeast-2.amazonaws.com"
+                        },
+                        "ap-south-1": {
+                            "credentialScope": {
+                                "region": "ap-south-1"
+                            },
+                            "hostname": "data.iotevents.ap-south-1.amazonaws.com"
+                        },
+                        "ap-southeast-1": {
+                            "credentialScope": {
+                                "region": "ap-southeast-1"
+                            },
+                            "hostname": "data.iotevents.ap-southeast-1.amazonaws.com"
+                        },
+                        "ap-southeast-2": {
+                            "credentialScope": {
+                                "region": "ap-southeast-2"
+                            },
+                            "hostname": "data.iotevents.ap-southeast-2.amazonaws.com"
+                        },
+                        "ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "hostname": "data.iotevents.ca-central-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "data.iotevents-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {
+                            "credentialScope": {
+                                "region": "eu-central-1"
+                            },
+                            "hostname": "data.iotevents.eu-central-1.amazonaws.com"
+                        },
+                        "eu-west-1": {
+                            "credentialScope": {
+                                "region": "eu-west-1"
+                            },
+                            "hostname": "data.iotevents.eu-west-1.amazonaws.com"
+                        },
+                        "eu-west-2": {
+                            "credentialScope": {
+                                "region": "eu-west-2"
+                            },
+                            "hostname": "data.iotevents.eu-west-2.amazonaws.com"
+                        },
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "data.iotevents-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "data.iotevents-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "data.iotevents-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "data.iotevents-fips.us-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "data.iotevents.us-east-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "data.iotevents-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "hostname": "data.iotevents.us-east-2.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "data.iotevents-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "hostname": "data.iotevents.us-west-2.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "data.iotevents-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "iotfleetwise": {
+                    "endpoints": {
+                        "eu-central-1": {},
+                        "us-east-1": {}
+                    }
+                },
+                "iotroborunner": {
+                    "endpoints": {
+                        "eu-central-1": {},
+                        "us-east-1": {}
+                    }
+                },
+                "iotsecuredtunneling": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "api.tunneling.iot-fips.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "api.tunneling.iot-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "api.tunneling.iot-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "api.tunneling.iot-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "api.tunneling.iot-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "api.tunneling.iot-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "api.tunneling.iot-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "api.tunneling.iot-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "api.tunneling.iot-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "api.tunneling.iot-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "api.tunneling.iot-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "iotsitewise": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "iotsitewise-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "iotsitewise-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "iotsitewise-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "iotsitewise-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "iotsitewise-fips.us-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "iotsitewise-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "iotsitewise-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "iotsitewise-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "iotthingsgraph": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "iotthingsgraph"
+                        }
+                    },
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-southeast-2": {},
+                        "eu-west-1": {},
+                        "us-east-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "iottwinmaker": {
+                    "endpoints": {
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "iottwinmaker-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "iottwinmaker-fips.us-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "iottwinmaker-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "iottwinmaker-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "iotwireless": {
+                    "endpoints": {
+                        "ap-northeast-1": {
+                            "credentialScope": {
+                                "region": "ap-northeast-1"
+                            },
+                            "hostname": "api.iotwireless.ap-northeast-1.amazonaws.com"
+                        },
+                        "ap-southeast-2": {
+                            "credentialScope": {
+                                "region": "ap-southeast-2"
+                            },
+                            "hostname": "api.iotwireless.ap-southeast-2.amazonaws.com"
+                        },
+                        "eu-west-1": {
+                            "credentialScope": {
+                                "region": "eu-west-1"
+                            },
+                            "hostname": "api.iotwireless.eu-west-1.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "api.iotwireless.us-east-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "hostname": "api.iotwireless.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "ivs": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "us-east-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "ivschat": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "us-east-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "ivsrealtime": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "us-east-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "kafka": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "kafkaconnect": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "kendra": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-west-1": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "kendra-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "kendra-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "kendra-fips.us-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "kendra-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "kendra-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "kendra-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "kendra-ranking": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "dnsSuffix": "api.aws",
+                                "hostname": "{service}-fips.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "af-south-1": {
+                            "hostname": "kendra-ranking.af-south-1.api.aws"
+                        },
+                        "ap-east-1": {
+                            "hostname": "kendra-ranking.ap-east-1.api.aws"
+                        },
+                        "ap-northeast-1": {
+                            "hostname": "kendra-ranking.ap-northeast-1.api.aws"
+                        },
+                        "ap-northeast-2": {
+                            "hostname": "kendra-ranking.ap-northeast-2.api.aws"
+                        },
+                        "ap-northeast-3": {
+                            "hostname": "kendra-ranking.ap-northeast-3.api.aws"
+                        },
+                        "ap-south-1": {
+                            "hostname": "kendra-ranking.ap-south-1.api.aws"
+                        },
+                        "ap-south-2": {
+                            "hostname": "kendra-ranking.ap-south-2.api.aws"
+                        },
+                        "ap-southeast-1": {
+                            "hostname": "kendra-ranking.ap-southeast-1.api.aws"
+                        },
+                        "ap-southeast-2": {
+                            "hostname": "kendra-ranking.ap-southeast-2.api.aws"
+                        },
+                        "ap-southeast-3": {
+                            "hostname": "kendra-ranking.ap-southeast-3.api.aws"
+                        },
+                        "ap-southeast-4": {
+                            "hostname": "kendra-ranking.ap-southeast-4.api.aws"
+                        },
+                        "ca-central-1": {
+                            "hostname": "kendra-ranking.ca-central-1.api.aws"
+                        },
+                        "eu-central-2": {
+                            "hostname": "kendra-ranking.eu-central-2.api.aws"
+                        },
+                        "eu-north-1": {
+                            "hostname": "kendra-ranking.eu-north-1.api.aws"
+                        },
+                        "eu-south-1": {
+                            "hostname": "kendra-ranking.eu-south-1.api.aws"
+                        },
+                        "eu-south-2": {
+                            "hostname": "kendra-ranking.eu-south-2.api.aws"
+                        },
+                        "eu-west-1": {
+                            "hostname": "kendra-ranking.eu-west-1.api.aws"
+                        },
+                        "eu-west-3": {
+                            "hostname": "kendra-ranking.eu-west-3.api.aws"
+                        },
+                        "me-central-1": {
+                            "hostname": "kendra-ranking.me-central-1.api.aws"
+                        },
+                        "me-south-1": {
+                            "hostname": "kendra-ranking.me-south-1.api.aws"
+                        },
+                        "sa-east-1": {
+                            "hostname": "kendra-ranking.sa-east-1.api.aws"
+                        },
+                        "us-east-1": {
+                            "hostname": "kendra-ranking.us-east-1.api.aws"
+                        },
+                        "us-east-2": {
+                            "hostname": "kendra-ranking.us-east-2.api.aws"
+                        },
+                        "us-west-1": {
+                            "hostname": "kendra-ranking.us-west-1.api.aws"
+                        },
+                        "us-west-2": {
+                            "hostname": "kendra-ranking.us-west-2.api.aws"
+                        }
+                    }
+                },
+                "kinesis": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "kinesis-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "kinesis-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "kinesis-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "kinesis-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "kinesis-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "kinesis-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "kinesis-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "kinesis-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "kinesisanalytics": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "kinesisvideo": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "kms": {
+                    "endpoints": {
+                        "ProdFips": {
+                            "credentialScope": {
+                                "region": "eu-central-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.eu-central-2.amazonaws.com"
+                        },
+                        "af-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.af-south-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "af-south-1-fips": {
+                            "credentialScope": {
+                                "region": "af-south-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.af-south-1.amazonaws.com"
+                        },
+                        "ap-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.ap-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-east-1-fips": {
+                            "credentialScope": {
+                                "region": "ap-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.ap-east-1.amazonaws.com"
+                        },
+                        "ap-northeast-1": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.ap-northeast-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-1-fips": {
+                            "credentialScope": {
+                                "region": "ap-northeast-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.ap-northeast-1.amazonaws.com"
+                        },
+                        "ap-northeast-2": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.ap-northeast-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-2-fips": {
+                            "credentialScope": {
+                                "region": "ap-northeast-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.ap-northeast-2.amazonaws.com"
+                        },
+                        "ap-northeast-3": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.ap-northeast-3.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-3-fips": {
+                            "credentialScope": {
+                                "region": "ap-northeast-3"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.ap-northeast-3.amazonaws.com"
+                        },
+                        "ap-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.ap-south-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-south-1-fips": {
+                            "credentialScope": {
+                                "region": "ap-south-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.ap-south-1.amazonaws.com"
+                        },
+                        "ap-south-2": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.ap-south-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-south-2-fips": {
+                            "credentialScope": {
+                                "region": "ap-south-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.ap-south-2.amazonaws.com"
+                        },
+                        "ap-southeast-1": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.ap-southeast-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-1-fips": {
+                            "credentialScope": {
+                                "region": "ap-southeast-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.ap-southeast-1.amazonaws.com"
+                        },
+                        "ap-southeast-2": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.ap-southeast-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-2-fips": {
+                            "credentialScope": {
+                                "region": "ap-southeast-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.ap-southeast-2.amazonaws.com"
+                        },
+                        "ap-southeast-3": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.ap-southeast-3.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-3-fips": {
+                            "credentialScope": {
+                                "region": "ap-southeast-3"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.ap-southeast-3.amazonaws.com"
+                        },
+                        "ap-southeast-4": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.ap-southeast-4.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-4-fips": {
+                            "credentialScope": {
+                                "region": "ap-southeast-4"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.ap-southeast-4.amazonaws.com"
+                        },
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ca-central-1-fips": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.ca-central-1.amazonaws.com"
+                        },
+                        "eu-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.eu-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1-fips": {
+                            "credentialScope": {
+                                "region": "eu-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.eu-central-1.amazonaws.com"
+                        },
+                        "eu-central-2": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.eu-central-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-2-fips": {
+                            "credentialScope": {
+                                "region": "eu-central-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.eu-central-2.amazonaws.com"
+                        },
+                        "eu-north-1": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.eu-north-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-north-1-fips": {
+                            "credentialScope": {
+                                "region": "eu-north-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.eu-north-1.amazonaws.com"
+                        },
+                        "eu-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.eu-south-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-south-1-fips": {
+                            "credentialScope": {
+                                "region": "eu-south-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.eu-south-1.amazonaws.com"
+                        },
+                        "eu-south-2": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.eu-south-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-south-2-fips": {
+                            "credentialScope": {
+                                "region": "eu-south-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.eu-south-2.amazonaws.com"
+                        },
+                        "eu-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.eu-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-west-1-fips": {
+                            "credentialScope": {
+                                "region": "eu-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.eu-west-1.amazonaws.com"
+                        },
+                        "eu-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.eu-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-west-2-fips": {
+                            "credentialScope": {
+                                "region": "eu-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.eu-west-2.amazonaws.com"
+                        },
+                        "eu-west-3": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.eu-west-3.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-west-3-fips": {
+                            "credentialScope": {
+                                "region": "eu-west-3"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.eu-west-3.amazonaws.com"
+                        },
+                        "il-central-1-fips": {
+                            "credentialScope": {
+                                "region": "il-central-1"
+                            },
+                            "hostname": "kms-fips.il-central-1.amazonaws.com"
+                        },
+                        "me-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.me-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "me-central-1-fips": {
+                            "credentialScope": {
+                                "region": "me-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.me-central-1.amazonaws.com"
+                        },
+                        "me-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.me-south-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "me-south-1-fips": {
+                            "credentialScope": {
+                                "region": "me-south-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.me-south-1.amazonaws.com"
+                        },
+                        "sa-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.sa-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "sa-east-1-fips": {
+                            "credentialScope": {
+                                "region": "sa-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.sa-east-1.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2-fips": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "lakeformation": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "lakeformation-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "lakeformation-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "lakeformation-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "lakeformation-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "lakeformation-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "lakeformation-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "lakeformation-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "lakeformation-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "lambda": {
+                    "endpoints": {
+                        "af-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda.af-south-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda.ap-east-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-1": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda.ap-northeast-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-2": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda.ap-northeast-2.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-3": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda.ap-northeast-3.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda.ap-south-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-south-2": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda.ap-south-2.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-1": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda.ap-southeast-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-2": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda.ap-southeast-2.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-3": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda.ap-southeast-3.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-4": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda.ap-southeast-4.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda.ca-central-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda.eu-central-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-central-2": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda.eu-central-2.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-north-1": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda.eu-north-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda.eu-south-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-south-2": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda.eu-south-2.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda.eu-west-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda.eu-west-2.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-west-3": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda.eu-west-3.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "lambda-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "lambda-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "lambda-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "lambda-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda.me-central-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "me-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda.me-south-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "sa-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda.sa-east-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "lambda.us-east-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "lambda.us-east-2.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "lambda.us-west-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "lambda.us-west-2.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "license-manager": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "license-manager-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "license-manager-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "license-manager-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "license-manager-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "license-manager-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "license-manager-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "license-manager-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "license-manager-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "license-manager-linux-subscriptions": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "license-manager-linux-subscriptions-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "license-manager-linux-subscriptions-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "license-manager-linux-subscriptions-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "license-manager-linux-subscriptions-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "license-manager-linux-subscriptions-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "license-manager-linux-subscriptions-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "license-manager-linux-subscriptions-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "license-manager-linux-subscriptions-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "license-manager-user-subscriptions": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "license-manager-user-subscriptions-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "license-manager-user-subscriptions-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "license-manager-user-subscriptions-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "license-manager-user-subscriptions-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "license-manager-user-subscriptions-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "license-manager-user-subscriptions-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "license-manager-user-subscriptions-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "license-manager-user-subscriptions-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "lightsail": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "logs": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "logs-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "logs-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "logs-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "logs-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "logs-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "logs-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "logs-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "logs-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "lookoutequipment": {
+                    "endpoints": {
+                        "ap-northeast-2": {},
+                        "eu-west-1": {},
+                        "us-east-1": {}
+                    }
+                },
+                "lookoutmetrics": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "lookoutvision": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "m2": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "deprecated": true
+                        },
+                        "fips-us-east-1": {
+                            "deprecated": true
+                        },
+                        "fips-us-east-2": {
+                            "deprecated": true
+                        },
+                        "fips-us-west-1": {
+                            "deprecated": true
+                        },
+                        "fips-us-west-2": {
+                            "deprecated": true
+                        },
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "machinelearning": {
+                    "endpoints": {
+                        "eu-west-1": {},
+                        "us-east-1": {}
+                    }
+                },
+                "macie": {
+                    "endpoints": {
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "macie-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "macie-fips.us-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "macie-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "macie-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "macie2": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "macie2-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "macie2-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "macie2-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "macie2-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "macie2-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "macie2-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "macie2-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "macie2-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "managedblockchain": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-southeast-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {}
+                    }
+                },
+                "marketplacecommerceanalytics": {
+                    "endpoints": {
+                        "us-east-1": {}
+                    }
+                },
+                "media-pipelines-chime": {
+                    "endpoints": {
+                        "ap-southeast-1": {},
+                        "eu-central-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "media-pipelines-chime-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "media-pipelines-chime-fips.us-east-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "media-pipelines-chime-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "media-pipelines-chime-fips.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "mediaconnect": {
+                    "endpoints": {
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "mediaconvert": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "mediaconvert-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "mediaconvert-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "mediaconvert-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "mediaconvert-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "mediaconvert-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "mediaconvert-fips.us-west-2.amazonaws.com"
+                        },
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "mediaconvert-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "mediaconvert-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "mediaconvert-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "mediaconvert-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "medialive": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "medialive-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "medialive-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "medialive-fips.us-west-2.amazonaws.com"
+                        },
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "medialive-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "medialive-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "medialive-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "mediapackage": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "mediapackage-vod": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "mediastore": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "meetings-chime": {
+                    "endpoints": {
+                        "ap-southeast-1": {},
+                        "eu-central-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "meetings-chime-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "meetings-chime-fips.us-east-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "meetings-chime-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "meetings-chime-fips.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "memory-db": {
+                    "endpoints": {
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "hostname": "memory-db-fips.us-west-1.amazonaws.com"
+                        },
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "messaging-chime": {
+                    "endpoints": {
+                        "eu-central-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "messaging-chime-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "messaging-chime-fips.us-east-1.amazonaws.com"
+                        }
+                    }
+                },
+                "metering.marketplace": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "aws-marketplace"
+                        }
+                    },
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "metrics.sagemaker": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "mgh": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "mgn": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "mgn-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "mgn-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "mgn-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "mgn-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "mgn-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "mgn-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "mgn-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "mgn-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "migrationhub-orchestrator": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "migrationhub-strategy": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "mobileanalytics": {
+                    "endpoints": {
+                        "us-east-1": {}
+                    }
+                },
+                "models-v2-lex": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "models.lex": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "lex"
+                        },
+                        "variants": [
+                            {
+                                "hostname": "models-fips.lex.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "models-fips.lex.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "models-fips.lex.us-east-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "models-fips.lex.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "models-fips.lex.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "monitoring": {
+                    "defaults": {
+                        "protocols": ["http", "https"]
+                    },
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "monitoring-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "monitoring-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "monitoring-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "monitoring-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "monitoring-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "monitoring-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "monitoring-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "monitoring-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "mq": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "mq-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "mq-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "mq-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "mq-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "mq-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "mq-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "mq-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "mq-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "mturk-requester": {
+                    "endpoints": {
+                        "sandbox": {
+                            "hostname": "mturk-requester-sandbox.us-east-1.amazonaws.com"
+                        },
+                        "us-east-1": {}
+                    },
+                    "isRegionalized": false
+                },
+                "neptune": {
+                    "endpoints": {
+                        "ap-east-1": {
+                            "credentialScope": {
+                                "region": "ap-east-1"
+                            },
+                            "hostname": "rds.ap-east-1.amazonaws.com"
+                        },
+                        "ap-northeast-1": {
+                            "credentialScope": {
+                                "region": "ap-northeast-1"
+                            },
+                            "hostname": "rds.ap-northeast-1.amazonaws.com"
+                        },
+                        "ap-northeast-2": {
+                            "credentialScope": {
+                                "region": "ap-northeast-2"
+                            },
+                            "hostname": "rds.ap-northeast-2.amazonaws.com"
+                        },
+                        "ap-south-1": {
+                            "credentialScope": {
+                                "region": "ap-south-1"
+                            },
+                            "hostname": "rds.ap-south-1.amazonaws.com"
+                        },
+                        "ap-southeast-1": {
+                            "credentialScope": {
+                                "region": "ap-southeast-1"
+                            },
+                            "hostname": "rds.ap-southeast-1.amazonaws.com"
+                        },
+                        "ap-southeast-2": {
+                            "credentialScope": {
+                                "region": "ap-southeast-2"
+                            },
+                            "hostname": "rds.ap-southeast-2.amazonaws.com"
+                        },
+                        "ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "hostname": "rds.ca-central-1.amazonaws.com"
+                        },
+                        "eu-central-1": {
+                            "credentialScope": {
+                                "region": "eu-central-1"
+                            },
+                            "hostname": "rds.eu-central-1.amazonaws.com"
+                        },
+                        "eu-north-1": {
+                            "credentialScope": {
+                                "region": "eu-north-1"
+                            },
+                            "hostname": "rds.eu-north-1.amazonaws.com"
+                        },
+                        "eu-west-1": {
+                            "credentialScope": {
+                                "region": "eu-west-1"
+                            },
+                            "hostname": "rds.eu-west-1.amazonaws.com"
+                        },
+                        "eu-west-2": {
+                            "credentialScope": {
+                                "region": "eu-west-2"
+                            },
+                            "hostname": "rds.eu-west-2.amazonaws.com"
+                        },
+                        "eu-west-3": {
+                            "credentialScope": {
+                                "region": "eu-west-3"
+                            },
+                            "hostname": "rds.eu-west-3.amazonaws.com"
+                        },
+                        "me-south-1": {
+                            "credentialScope": {
+                                "region": "me-south-1"
+                            },
+                            "hostname": "rds.me-south-1.amazonaws.com"
+                        },
+                        "sa-east-1": {
+                            "credentialScope": {
+                                "region": "sa-east-1"
+                            },
+                            "hostname": "rds.sa-east-1.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "rds.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "hostname": "rds.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "hostname": "rds.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "hostname": "rds.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "network-firewall": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "network-firewall-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "network-firewall-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "network-firewall-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "network-firewall-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "network-firewall-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "network-firewall-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "network-firewall-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "network-firewall-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "network-firewall-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "network-firewall-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "networkmanager": {
+                    "endpoints": {
+                        "aws-global": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "hostname": "networkmanager.us-west-2.amazonaws.com"
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-global"
+                },
+                "nimble": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "oam": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "oidc": {
+                    "endpoints": {
+                        "af-south-1": {
+                            "credentialScope": {
+                                "region": "af-south-1"
+                            },
+                            "hostname": "oidc.af-south-1.amazonaws.com"
+                        },
+                        "ap-east-1": {
+                            "credentialScope": {
+                                "region": "ap-east-1"
+                            },
+                            "hostname": "oidc.ap-east-1.amazonaws.com"
+                        },
+                        "ap-northeast-1": {
+                            "credentialScope": {
+                                "region": "ap-northeast-1"
+                            },
+                            "hostname": "oidc.ap-northeast-1.amazonaws.com"
+                        },
+                        "ap-northeast-2": {
+                            "credentialScope": {
+                                "region": "ap-northeast-2"
+                            },
+                            "hostname": "oidc.ap-northeast-2.amazonaws.com"
+                        },
+                        "ap-northeast-3": {
+                            "credentialScope": {
+                                "region": "ap-northeast-3"
+                            },
+                            "hostname": "oidc.ap-northeast-3.amazonaws.com"
+                        },
+                        "ap-south-1": {
+                            "credentialScope": {
+                                "region": "ap-south-1"
+                            },
+                            "hostname": "oidc.ap-south-1.amazonaws.com"
+                        },
+                        "ap-southeast-1": {
+                            "credentialScope": {
+                                "region": "ap-southeast-1"
+                            },
+                            "hostname": "oidc.ap-southeast-1.amazonaws.com"
+                        },
+                        "ap-southeast-2": {
+                            "credentialScope": {
+                                "region": "ap-southeast-2"
+                            },
+                            "hostname": "oidc.ap-southeast-2.amazonaws.com"
+                        },
+                        "ap-southeast-3": {
+                            "credentialScope": {
+                                "region": "ap-southeast-3"
+                            },
+                            "hostname": "oidc.ap-southeast-3.amazonaws.com"
+                        },
+                        "ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "hostname": "oidc.ca-central-1.amazonaws.com"
+                        },
+                        "eu-central-1": {
+                            "credentialScope": {
+                                "region": "eu-central-1"
+                            },
+                            "hostname": "oidc.eu-central-1.amazonaws.com"
+                        },
+                        "eu-north-1": {
+                            "credentialScope": {
+                                "region": "eu-north-1"
+                            },
+                            "hostname": "oidc.eu-north-1.amazonaws.com"
+                        },
+                        "eu-south-1": {
+                            "credentialScope": {
+                                "region": "eu-south-1"
+                            },
+                            "hostname": "oidc.eu-south-1.amazonaws.com"
+                        },
+                        "eu-west-1": {
+                            "credentialScope": {
+                                "region": "eu-west-1"
+                            },
+                            "hostname": "oidc.eu-west-1.amazonaws.com"
+                        },
+                        "eu-west-2": {
+                            "credentialScope": {
+                                "region": "eu-west-2"
+                            },
+                            "hostname": "oidc.eu-west-2.amazonaws.com"
+                        },
+                        "eu-west-3": {
+                            "credentialScope": {
+                                "region": "eu-west-3"
+                            },
+                            "hostname": "oidc.eu-west-3.amazonaws.com"
+                        },
+                        "me-south-1": {
+                            "credentialScope": {
+                                "region": "me-south-1"
+                            },
+                            "hostname": "oidc.me-south-1.amazonaws.com"
+                        },
+                        "sa-east-1": {
+                            "credentialScope": {
+                                "region": "sa-east-1"
+                            },
+                            "hostname": "oidc.sa-east-1.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "oidc.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "hostname": "oidc.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "hostname": "oidc.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "hostname": "oidc.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "omics": {
+                    "endpoints": {
+                        "ap-southeast-1": {
+                            "credentialScope": {
+                                "region": "ap-southeast-1"
+                            },
+                            "hostname": "omics.ap-southeast-1.amazonaws.com"
+                        },
+                        "eu-central-1": {
+                            "credentialScope": {
+                                "region": "eu-central-1"
+                            },
+                            "hostname": "omics.eu-central-1.amazonaws.com"
+                        },
+                        "eu-west-1": {
+                            "credentialScope": {
+                                "region": "eu-west-1"
+                            },
+                            "hostname": "omics.eu-west-1.amazonaws.com"
+                        },
+                        "eu-west-2": {
+                            "credentialScope": {
+                                "region": "eu-west-2"
+                            },
+                            "hostname": "omics.eu-west-2.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "omics-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "omics-fips.us-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "omics.us-east-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "omics-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "hostname": "omics.us-west-2.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "omics-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "opsworks": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "opsworks-cm": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "organizations": {
+                    "endpoints": {
+                        "aws-global": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "organizations.us-east-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "organizations-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "fips-aws-global": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "organizations-fips.us-east-1.amazonaws.com"
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-global"
+                },
+                "outposts": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "outposts-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "outposts-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "outposts-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "outposts-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "outposts-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "outposts-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "outposts-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "outposts-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "outposts-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "outposts-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "participant.connect": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-west-2": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "participant.connect-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "participant.connect-fips.us-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "participant.connect-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "participant.connect-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "personalize": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "pi": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "pinpoint": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "mobiletargeting"
+                        }
+                    },
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "hostname": "pinpoint.ca-central-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "pinpoint-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "pinpoint-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "pinpoint-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "pinpoint-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "pinpoint-fips.us-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "pinpoint.us-east-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "pinpoint-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "hostname": "pinpoint.us-east-2.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "pinpoint-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "hostname": "pinpoint.us-west-2.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "pinpoint-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "pipes": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "polly": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "polly-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "polly-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "polly-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "polly-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "polly-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "polly-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "polly-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "polly-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "portal.sso": {
+                    "endpoints": {
+                        "af-south-1": {
+                            "credentialScope": {
+                                "region": "af-south-1"
+                            },
+                            "hostname": "portal.sso.af-south-1.amazonaws.com"
+                        },
+                        "ap-east-1": {
+                            "credentialScope": {
+                                "region": "ap-east-1"
+                            },
+                            "hostname": "portal.sso.ap-east-1.amazonaws.com"
+                        },
+                        "ap-northeast-1": {
+                            "credentialScope": {
+                                "region": "ap-northeast-1"
+                            },
+                            "hostname": "portal.sso.ap-northeast-1.amazonaws.com"
+                        },
+                        "ap-northeast-2": {
+                            "credentialScope": {
+                                "region": "ap-northeast-2"
+                            },
+                            "hostname": "portal.sso.ap-northeast-2.amazonaws.com"
+                        },
+                        "ap-northeast-3": {
+                            "credentialScope": {
+                                "region": "ap-northeast-3"
+                            },
+                            "hostname": "portal.sso.ap-northeast-3.amazonaws.com"
+                        },
+                        "ap-south-1": {
+                            "credentialScope": {
+                                "region": "ap-south-1"
+                            },
+                            "hostname": "portal.sso.ap-south-1.amazonaws.com"
+                        },
+                        "ap-southeast-1": {
+                            "credentialScope": {
+                                "region": "ap-southeast-1"
+                            },
+                            "hostname": "portal.sso.ap-southeast-1.amazonaws.com"
+                        },
+                        "ap-southeast-2": {
+                            "credentialScope": {
+                                "region": "ap-southeast-2"
+                            },
+                            "hostname": "portal.sso.ap-southeast-2.amazonaws.com"
+                        },
+                        "ap-southeast-3": {
+                            "credentialScope": {
+                                "region": "ap-southeast-3"
+                            },
+                            "hostname": "portal.sso.ap-southeast-3.amazonaws.com"
+                        },
+                        "ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "hostname": "portal.sso.ca-central-1.amazonaws.com"
+                        },
+                        "eu-central-1": {
+                            "credentialScope": {
+                                "region": "eu-central-1"
+                            },
+                            "hostname": "portal.sso.eu-central-1.amazonaws.com"
+                        },
+                        "eu-north-1": {
+                            "credentialScope": {
+                                "region": "eu-north-1"
+                            },
+                            "hostname": "portal.sso.eu-north-1.amazonaws.com"
+                        },
+                        "eu-south-1": {
+                            "credentialScope": {
+                                "region": "eu-south-1"
+                            },
+                            "hostname": "portal.sso.eu-south-1.amazonaws.com"
+                        },
+                        "eu-west-1": {
+                            "credentialScope": {
+                                "region": "eu-west-1"
+                            },
+                            "hostname": "portal.sso.eu-west-1.amazonaws.com"
+                        },
+                        "eu-west-2": {
+                            "credentialScope": {
+                                "region": "eu-west-2"
+                            },
+                            "hostname": "portal.sso.eu-west-2.amazonaws.com"
+                        },
+                        "eu-west-3": {
+                            "credentialScope": {
+                                "region": "eu-west-3"
+                            },
+                            "hostname": "portal.sso.eu-west-3.amazonaws.com"
+                        },
+                        "me-south-1": {
+                            "credentialScope": {
+                                "region": "me-south-1"
+                            },
+                            "hostname": "portal.sso.me-south-1.amazonaws.com"
+                        },
+                        "sa-east-1": {
+                            "credentialScope": {
+                                "region": "sa-east-1"
+                            },
+                            "hostname": "portal.sso.sa-east-1.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "portal.sso.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "hostname": "portal.sso.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "hostname": "portal.sso.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "hostname": "portal.sso.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "profile": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "projects.iot1click": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "proton": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "qldb": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "qldb-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "qldb-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "qldb-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "qldb-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "qldb-fips.us-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "qldb-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "qldb-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "qldb-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "quicksight": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "ram": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ram-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ram-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ram-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "ram-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ram-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "ram-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ram-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "ram-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ram-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "ram-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "rbin": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "rbin-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "rbin-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "rbin-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "rbin-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "rbin-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "rbin-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "rbin-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "rbin-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "rbin-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "rbin-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "rds": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "rds-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ca-central-1-fips": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "rds-fips.ca-central-1.amazonaws.com"
+                        },
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "rds-fips.ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "rds-fips.ca-central-1.amazonaws.com"
+                        },
+                        "rds-fips.us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "rds-fips.us-east-1.amazonaws.com"
+                        },
+                        "rds-fips.us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "rds-fips.us-east-2.amazonaws.com"
+                        },
+                        "rds-fips.us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "rds-fips.us-west-1.amazonaws.com"
+                        },
+                        "rds-fips.us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "rds-fips.us-west-2.amazonaws.com"
+                        },
+                        "rds.ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "rds-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "rds.us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "rds-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "rds.us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "rds-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "rds.us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "rds-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "rds.us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "rds-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "sslCommonName": "{service}.{dnsSuffix}",
+                            "variants": [
+                                {
+                                    "hostname": "rds-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "rds-fips.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "rds-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2-fips": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "rds-fips.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "rds-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "rds-fips.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "rds-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "rds-fips.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "rds-data": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "rds-data-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "rds-data-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "rds-data-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "rds-data-fips.us-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "rds-data-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "rds-data-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "rds-data-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "rds-data-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "redshift": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "redshift-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "redshift-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "redshift-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "redshift-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "redshift-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "redshift-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "redshift-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "redshift-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "redshift-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "redshift-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "redshift-serverless": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "rekognition": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "rekognition-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ca-central-1-fips": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "rekognition-fips.ca-central-1.amazonaws.com"
+                        },
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "rekognition-fips.ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "rekognition-fips.ca-central-1.amazonaws.com"
+                        },
+                        "rekognition-fips.us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "rekognition-fips.us-east-1.amazonaws.com"
+                        },
+                        "rekognition-fips.us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "rekognition-fips.us-east-2.amazonaws.com"
+                        },
+                        "rekognition-fips.us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "rekognition-fips.us-west-1.amazonaws.com"
+                        },
+                        "rekognition-fips.us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "rekognition-fips.us-west-2.amazonaws.com"
+                        },
+                        "rekognition.ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "rekognition-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "rekognition.us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "rekognition-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "rekognition.us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "rekognition-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "rekognition.us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "rekognition-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "rekognition.us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "rekognition-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "rekognition-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "rekognition-fips.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "rekognition-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2-fips": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "rekognition-fips.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "rekognition-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "rekognition-fips.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "rekognition-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "rekognition-fips.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "resiliencehub": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "resource-explorer-2": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "dnsSuffix": "api.aws",
+                                "hostname": "{service}-fips.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "af-south-1": {
+                            "hostname": "resource-explorer-2.af-south-1.api.aws"
+                        },
+                        "ap-east-1": {
+                            "hostname": "resource-explorer-2.ap-east-1.api.aws"
+                        },
+                        "ap-northeast-1": {
+                            "hostname": "resource-explorer-2.ap-northeast-1.api.aws"
+                        },
+                        "ap-northeast-2": {
+                            "hostname": "resource-explorer-2.ap-northeast-2.api.aws"
+                        },
+                        "ap-northeast-3": {
+                            "hostname": "resource-explorer-2.ap-northeast-3.api.aws"
+                        },
+                        "ap-south-1": {
+                            "hostname": "resource-explorer-2.ap-south-1.api.aws"
+                        },
+                        "ap-south-2": {
+                            "hostname": "resource-explorer-2.ap-south-2.api.aws"
+                        },
+                        "ap-southeast-1": {
+                            "hostname": "resource-explorer-2.ap-southeast-1.api.aws"
+                        },
+                        "ap-southeast-2": {
+                            "hostname": "resource-explorer-2.ap-southeast-2.api.aws"
+                        },
+                        "ap-southeast-4": {
+                            "hostname": "resource-explorer-2.ap-southeast-4.api.aws"
+                        },
+                        "ca-central-1": {
+                            "hostname": "resource-explorer-2.ca-central-1.api.aws"
+                        },
+                        "eu-central-1": {
+                            "hostname": "resource-explorer-2.eu-central-1.api.aws"
+                        },
+                        "eu-central-2": {
+                            "hostname": "resource-explorer-2.eu-central-2.api.aws"
+                        },
+                        "eu-north-1": {
+                            "hostname": "resource-explorer-2.eu-north-1.api.aws"
+                        },
+                        "eu-west-1": {
+                            "hostname": "resource-explorer-2.eu-west-1.api.aws"
+                        },
+                        "eu-west-2": {
+                            "hostname": "resource-explorer-2.eu-west-2.api.aws"
+                        },
+                        "eu-west-3": {
+                            "hostname": "resource-explorer-2.eu-west-3.api.aws"
+                        },
+                        "sa-east-1": {
+                            "hostname": "resource-explorer-2.sa-east-1.api.aws"
+                        },
+                        "us-east-1": {
+                            "hostname": "resource-explorer-2.us-east-1.api.aws"
+                        },
+                        "us-east-2": {
+                            "hostname": "resource-explorer-2.us-east-2.api.aws"
+                        },
+                        "us-west-1": {
+                            "hostname": "resource-explorer-2.us-west-1.api.aws"
+                        },
+                        "us-west-2": {
+                            "hostname": "resource-explorer-2.us-west-2.api.aws"
+                        }
+                    }
+                },
+                "resource-groups": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "resource-groups-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "resource-groups-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "resource-groups-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "resource-groups-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "resource-groups-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "resource-groups-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "resource-groups-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "resource-groups-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "robomaker": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-southeast-1": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "rolesanywhere": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "route53": {
+                    "endpoints": {
+                        "aws-global": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "route53.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "route53-fips.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "fips-aws-global": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "route53-fips.amazonaws.com"
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-global"
+                },
+                "route53-recovery-control-config": {
+                    "endpoints": {
+                        "aws-global": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "hostname": "route53-recovery-control-config.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "route53domains": {
+                    "endpoints": {
+                        "us-east-1": {}
+                    }
+                },
+                "route53resolver": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "rum": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "runtime-v2-lex": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "runtime.lex": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "lex"
+                        },
+                        "variants": [
+                            {
+                                "hostname": "runtime-fips.lex.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "runtime-fips.lex.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "runtime-fips.lex.us-east-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "runtime-fips.lex.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "runtime-fips.lex.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "runtime.sagemaker": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "runtime-fips.sagemaker.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "runtime-fips.sagemaker.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "runtime-fips.sagemaker.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "runtime-fips.sagemaker.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2-fips": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "runtime-fips.sagemaker.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "runtime-fips.sagemaker.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "runtime-fips.sagemaker.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "runtime-fips.sagemaker.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "runtime-fips.sagemaker.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "s3": {
+                    "defaults": {
+                        "protocols": ["http", "https"],
+                        "signatureVersions": ["s3v4"],
+                        "variants": [
+                            {
+                                "dnsSuffix": "amazonaws.com",
+                                "hostname": "{service}-fips.dualstack.{region}.{dnsSuffix}",
+                                "tags": ["dualstack", "fips"]
+                            },
+                            {
+                                "dnsSuffix": "amazonaws.com",
+                                "hostname": "{service}.dualstack.{region}.{dnsSuffix}",
+                                "tags": ["dualstack"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "af-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "s3.dualstack.af-south-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "s3.dualstack.ap-east-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-1": {
+                            "hostname": "s3.ap-northeast-1.amazonaws.com",
+                            "signatureVersions": ["s3", "s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3.dualstack.ap-northeast-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-2": {
+                            "variants": [
+                                {
+                                    "hostname": "s3.dualstack.ap-northeast-2.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-3": {
+                            "variants": [
+                                {
+                                    "hostname": "s3.dualstack.ap-northeast-3.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "s3.dualstack.ap-south-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-south-2": {
+                            "variants": [
+                                {
+                                    "hostname": "s3.dualstack.ap-south-2.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-1": {
+                            "hostname": "s3.ap-southeast-1.amazonaws.com",
+                            "signatureVersions": ["s3", "s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3.dualstack.ap-southeast-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-2": {
+                            "hostname": "s3.ap-southeast-2.amazonaws.com",
+                            "signatureVersions": ["s3", "s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3.dualstack.ap-southeast-2.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-3": {
+                            "variants": [
+                                {
+                                    "hostname": "s3.dualstack.ap-southeast-3.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-4": {
+                            "variants": [
+                                {
+                                    "hostname": "s3.dualstack.ap-southeast-4.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "aws-global": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "s3.amazonaws.com",
+                            "signatureVersions": ["s3", "s3v4"]
+                        },
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "s3-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "s3-fips.dualstack.ca-central-1.amazonaws.com",
+                                    "tags": ["dualstack", "fips"]
+                                },
+                                {
+                                    "hostname": "s3.dualstack.ca-central-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "s3.dualstack.eu-central-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-central-2": {
+                            "variants": [
+                                {
+                                    "hostname": "s3.dualstack.eu-central-2.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-north-1": {
+                            "variants": [
+                                {
+                                    "hostname": "s3.dualstack.eu-north-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "s3.dualstack.eu-south-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-south-2": {
+                            "variants": [
+                                {
+                                    "hostname": "s3.dualstack.eu-south-2.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-west-1": {
+                            "hostname": "s3.eu-west-1.amazonaws.com",
+                            "signatureVersions": ["s3", "s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3.dualstack.eu-west-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "s3.dualstack.eu-west-2.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-west-3": {
+                            "variants": [
+                                {
+                                    "hostname": "s3.dualstack.eu-west-3.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "s3-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "s3-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "s3-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "s3-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "s3-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "s3.dualstack.me-central-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "me-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "s3.dualstack.me-south-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "s3-external-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "s3-external-1.amazonaws.com",
+                            "signatureVersions": ["s3", "s3v4"]
+                        },
+                        "sa-east-1": {
+                            "hostname": "s3.sa-east-1.amazonaws.com",
+                            "signatureVersions": ["s3", "s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3.dualstack.sa-east-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-east-1": {
+                            "hostname": "s3.us-east-1.amazonaws.com",
+                            "signatureVersions": ["s3", "s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3-fips.dualstack.us-east-1.amazonaws.com",
+                                    "tags": ["dualstack", "fips"]
+                                },
+                                {
+                                    "hostname": "s3-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "s3.dualstack.us-east-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "s3-fips.dualstack.us-east-2.amazonaws.com",
+                                    "tags": ["dualstack", "fips"]
+                                },
+                                {
+                                    "hostname": "s3-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "s3.dualstack.us-east-2.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "hostname": "s3.us-west-1.amazonaws.com",
+                            "signatureVersions": ["s3", "s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3-fips.dualstack.us-west-1.amazonaws.com",
+                                    "tags": ["dualstack", "fips"]
+                                },
+                                {
+                                    "hostname": "s3-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "s3.dualstack.us-west-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "hostname": "s3.us-west-2.amazonaws.com",
+                            "signatureVersions": ["s3", "s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3-fips.dualstack.us-west-2.amazonaws.com",
+                                    "tags": ["dualstack", "fips"]
+                                },
+                                {
+                                    "hostname": "s3-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "s3.dualstack.us-west-2.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        }
+                    },
+                    "isRegionalized": true,
+                    "partitionEndpoint": "aws-global"
+                },
+                "s3-control": {
+                    "defaults": {
+                        "protocols": ["https"],
+                        "signatureVersions": ["s3v4"],
+                        "variants": [
+                            {
+                                "dnsSuffix": "amazonaws.com",
+                                "hostname": "{service}-fips.dualstack.{region}.{dnsSuffix}",
+                                "tags": ["dualstack", "fips"]
+                            },
+                            {
+                                "dnsSuffix": "amazonaws.com",
+                                "hostname": "{service}.dualstack.{region}.{dnsSuffix}",
+                                "tags": ["dualstack"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "ap-northeast-1": {
+                            "credentialScope": {
+                                "region": "ap-northeast-1"
+                            },
+                            "hostname": "s3-control.ap-northeast-1.amazonaws.com",
+                            "signatureVersions": ["s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3-control.dualstack.ap-northeast-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-2": {
+                            "credentialScope": {
+                                "region": "ap-northeast-2"
+                            },
+                            "hostname": "s3-control.ap-northeast-2.amazonaws.com",
+                            "signatureVersions": ["s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3-control.dualstack.ap-northeast-2.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-3": {
+                            "credentialScope": {
+                                "region": "ap-northeast-3"
+                            },
+                            "hostname": "s3-control.ap-northeast-3.amazonaws.com",
+                            "signatureVersions": ["s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3-control.dualstack.ap-northeast-3.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-south-1": {
+                            "credentialScope": {
+                                "region": "ap-south-1"
+                            },
+                            "hostname": "s3-control.ap-south-1.amazonaws.com",
+                            "signatureVersions": ["s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3-control.dualstack.ap-south-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-1": {
+                            "credentialScope": {
+                                "region": "ap-southeast-1"
+                            },
+                            "hostname": "s3-control.ap-southeast-1.amazonaws.com",
+                            "signatureVersions": ["s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3-control.dualstack.ap-southeast-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-2": {
+                            "credentialScope": {
+                                "region": "ap-southeast-2"
+                            },
+                            "hostname": "s3-control.ap-southeast-2.amazonaws.com",
+                            "signatureVersions": ["s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3-control.dualstack.ap-southeast-2.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "hostname": "s3-control.ca-central-1.amazonaws.com",
+                            "signatureVersions": ["s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3-control-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "s3-control-fips.dualstack.ca-central-1.amazonaws.com",
+                                    "tags": ["dualstack", "fips"]
+                                },
+                                {
+                                    "hostname": "s3-control.dualstack.ca-central-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ca-central-1-fips": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "s3-control-fips.ca-central-1.amazonaws.com",
+                            "signatureVersions": ["s3v4"]
+                        },
+                        "eu-central-1": {
+                            "credentialScope": {
+                                "region": "eu-central-1"
+                            },
+                            "hostname": "s3-control.eu-central-1.amazonaws.com",
+                            "signatureVersions": ["s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3-control.dualstack.eu-central-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-north-1": {
+                            "credentialScope": {
+                                "region": "eu-north-1"
+                            },
+                            "hostname": "s3-control.eu-north-1.amazonaws.com",
+                            "signatureVersions": ["s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3-control.dualstack.eu-north-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-west-1": {
+                            "credentialScope": {
+                                "region": "eu-west-1"
+                            },
+                            "hostname": "s3-control.eu-west-1.amazonaws.com",
+                            "signatureVersions": ["s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3-control.dualstack.eu-west-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-west-2": {
+                            "credentialScope": {
+                                "region": "eu-west-2"
+                            },
+                            "hostname": "s3-control.eu-west-2.amazonaws.com",
+                            "signatureVersions": ["s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3-control.dualstack.eu-west-2.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-west-3": {
+                            "credentialScope": {
+                                "region": "eu-west-3"
+                            },
+                            "hostname": "s3-control.eu-west-3.amazonaws.com",
+                            "signatureVersions": ["s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3-control.dualstack.eu-west-3.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "sa-east-1": {
+                            "credentialScope": {
+                                "region": "sa-east-1"
+                            },
+                            "hostname": "s3-control.sa-east-1.amazonaws.com",
+                            "signatureVersions": ["s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3-control.dualstack.sa-east-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "s3-control.us-east-1.amazonaws.com",
+                            "signatureVersions": ["s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3-control-fips.dualstack.us-east-1.amazonaws.com",
+                                    "tags": ["dualstack", "fips"]
+                                },
+                                {
+                                    "hostname": "s3-control-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "s3-control.dualstack.us-east-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "s3-control-fips.us-east-1.amazonaws.com",
+                            "signatureVersions": ["s3v4"]
+                        },
+                        "us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "hostname": "s3-control.us-east-2.amazonaws.com",
+                            "signatureVersions": ["s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3-control-fips.dualstack.us-east-2.amazonaws.com",
+                                    "tags": ["dualstack", "fips"]
+                                },
+                                {
+                                    "hostname": "s3-control-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "s3-control.dualstack.us-east-2.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-east-2-fips": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "s3-control-fips.us-east-2.amazonaws.com",
+                            "signatureVersions": ["s3v4"]
+                        },
+                        "us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "hostname": "s3-control.us-west-1.amazonaws.com",
+                            "signatureVersions": ["s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3-control-fips.dualstack.us-west-1.amazonaws.com",
+                                    "tags": ["dualstack", "fips"]
+                                },
+                                {
+                                    "hostname": "s3-control-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "s3-control.dualstack.us-west-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "s3-control-fips.us-west-1.amazonaws.com",
+                            "signatureVersions": ["s3v4"]
+                        },
+                        "us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "hostname": "s3-control.us-west-2.amazonaws.com",
+                            "signatureVersions": ["s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3-control-fips.dualstack.us-west-2.amazonaws.com",
+                                    "tags": ["dualstack", "fips"]
+                                },
+                                {
+                                    "hostname": "s3-control-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "s3-control.dualstack.us-west-2.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "s3-control-fips.us-west-2.amazonaws.com",
+                            "signatureVersions": ["s3v4"]
+                        }
+                    }
+                },
+                "s3-outposts": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "deprecated": true
+                        },
+                        "fips-us-east-1": {
+                            "deprecated": true
+                        },
+                        "fips-us-east-2": {
+                            "deprecated": true
+                        },
+                        "fips-us-west-1": {
+                            "deprecated": true
+                        },
+                        "fips-us-west-2": {
+                            "deprecated": true
+                        },
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "sagemaker-geospatial": {
+                    "endpoints": {
+                        "us-west-2": {}
+                    }
+                },
+                "savingsplans": {
+                    "endpoints": {
+                        "aws-global": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "savingsplans.amazonaws.com"
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-global"
+                },
+                "scheduler": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "schemas": {
+                    "endpoints": {
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "sdb": {
+                    "defaults": {
+                        "protocols": ["http", "https"],
+                        "signatureVersions": ["v2"]
+                    },
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-west-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "hostname": "sdb.amazonaws.com"
+                        },
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "secretsmanager": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "secretsmanager-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ca-central-1-fips": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "secretsmanager-fips.ca-central-1.amazonaws.com"
+                        },
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "secretsmanager-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "secretsmanager-fips.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "secretsmanager-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2-fips": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "secretsmanager-fips.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "secretsmanager-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "secretsmanager-fips.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "secretsmanager-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "secretsmanager-fips.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "securityhub": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "securityhub-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "securityhub-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "securityhub-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "securityhub-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "securityhub-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "securityhub-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "securityhub-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "securityhub-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "securitylake": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "serverlessrepo": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "ap-east-1": {
+                            "protocols": ["https"]
+                        },
+                        "ap-northeast-1": {
+                            "protocols": ["https"]
+                        },
+                        "ap-northeast-2": {
+                            "protocols": ["https"]
+                        },
+                        "ap-south-1": {
+                            "protocols": ["https"]
+                        },
+                        "ap-southeast-1": {
+                            "protocols": ["https"]
+                        },
+                        "ap-southeast-2": {
+                            "protocols": ["https"]
+                        },
+                        "ca-central-1": {
+                            "protocols": ["https"]
+                        },
+                        "eu-central-1": {
+                            "protocols": ["https"]
+                        },
+                        "eu-north-1": {
+                            "protocols": ["https"]
+                        },
+                        "eu-west-1": {
+                            "protocols": ["https"]
+                        },
+                        "eu-west-2": {
+                            "protocols": ["https"]
+                        },
+                        "eu-west-3": {
+                            "protocols": ["https"]
+                        },
+                        "me-south-1": {
+                            "protocols": ["https"]
+                        },
+                        "sa-east-1": {
+                            "protocols": ["https"]
+                        },
+                        "us-east-1": {
+                            "protocols": ["https"]
+                        },
+                        "us-east-2": {
+                            "protocols": ["https"]
+                        },
+                        "us-west-1": {
+                            "protocols": ["https"]
+                        },
+                        "us-west-2": {
+                            "protocols": ["https"]
+                        }
+                    }
+                },
+                "servicecatalog": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicecatalog-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "servicecatalog-fips.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "servicecatalog-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2-fips": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "servicecatalog-fips.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicecatalog-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "servicecatalog-fips.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "servicecatalog-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "servicecatalog-fips.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "servicecatalog-appregistry": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicecatalog-appregistry-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "servicecatalog-appregistry-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "servicecatalog-appregistry-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "servicecatalog-appregistry-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "servicecatalog-appregistry-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "servicecatalog-appregistry-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicecatalog-appregistry-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "servicecatalog-appregistry-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicecatalog-appregistry-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "servicecatalog-appregistry-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "servicediscovery": {
+                    "endpoints": {
+                        "af-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery.af-south-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery.ap-east-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery.ap-northeast-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-2": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery.ap-northeast-2.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-3": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery.ap-northeast-3.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery.ap-south-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-south-2": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery.ap-south-2.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery.ap-southeast-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-2": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery.ap-southeast-2.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-3": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery.ap-southeast-3.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-4": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery.ap-southeast-4.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "servicediscovery.ca-central-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "ca-central-1-fips": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "servicediscovery-fips.ca-central-1.amazonaws.com"
+                        },
+                        "eu-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery.eu-central-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-central-2": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery.eu-central-2.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-north-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery.eu-north-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery.eu-south-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-south-2": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery.eu-south-2.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery.eu-west-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery.eu-west-2.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "eu-west-3": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery.eu-west-3.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "me-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery.me-central-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "me-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery.me-south-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "sa-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery.sa-east-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "servicediscovery": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "servicediscovery-fips": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "servicediscovery-fips.ca-central-1.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "servicediscovery.us-east-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "servicediscovery-fips.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "servicediscovery.us-east-2.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-east-2-fips": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "servicediscovery-fips.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "servicediscovery.us-west-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "servicediscovery-fips.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "servicediscovery.us-west-2.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "servicediscovery-fips.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "servicequotas": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "session.qldb": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "session.qldb-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "session.qldb-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "session.qldb-fips.us-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "session.qldb-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "session.qldb-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "session.qldb-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "shield": {
+                    "defaults": {
+                        "protocols": ["https"],
+                        "sslCommonName": "shield.us-east-1.amazonaws.com"
+                    },
+                    "endpoints": {
+                        "aws-global": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "shield.us-east-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "shield-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "fips-aws-global": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "shield-fips.us-east-1.amazonaws.com"
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-global"
+                },
+                "simspaceweaver": {
+                    "endpoints": {
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "sms": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "sms-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "sms-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "sms-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "sms-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "sms-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "sms-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "sms-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "sms-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "sms-voice": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "sms-voice-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "sms-voice-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "sms-voice-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "sms-voice-fips.us-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "sms-voice-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "sms-voice-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "snowball": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {
+                            "variants": [
+                                {
+                                    "hostname": "snowball-fips.ap-northeast-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-2": {
+                            "variants": [
+                                {
+                                    "hostname": "snowball-fips.ap-northeast-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-3": {
+                            "variants": [
+                                {
+                                    "hostname": "snowball-fips.ap-northeast-3.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-south-1": {
+                            "variants": [
+                                {
+                                    "hostname": "snowball-fips.ap-south-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-1": {
+                            "variants": [
+                                {
+                                    "hostname": "snowball-fips.ap-southeast-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-2": {
+                            "variants": [
+                                {
+                                    "hostname": "snowball-fips.ap-southeast-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-3": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "snowball-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "snowball-fips.eu-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "snowball-fips.eu-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "snowball-fips.eu-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-west-3": {
+                            "variants": [
+                                {
+                                    "hostname": "snowball-fips.eu-west-3.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "fips-ap-northeast-1": {
+                            "credentialScope": {
+                                "region": "ap-northeast-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "snowball-fips.ap-northeast-1.amazonaws.com"
+                        },
+                        "fips-ap-northeast-2": {
+                            "credentialScope": {
+                                "region": "ap-northeast-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "snowball-fips.ap-northeast-2.amazonaws.com"
+                        },
+                        "fips-ap-northeast-3": {
+                            "credentialScope": {
+                                "region": "ap-northeast-3"
+                            },
+                            "deprecated": true,
+                            "hostname": "snowball-fips.ap-northeast-3.amazonaws.com"
+                        },
+                        "fips-ap-south-1": {
+                            "credentialScope": {
+                                "region": "ap-south-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "snowball-fips.ap-south-1.amazonaws.com"
+                        },
+                        "fips-ap-southeast-1": {
+                            "credentialScope": {
+                                "region": "ap-southeast-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "snowball-fips.ap-southeast-1.amazonaws.com"
+                        },
+                        "fips-ap-southeast-2": {
+                            "credentialScope": {
+                                "region": "ap-southeast-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "snowball-fips.ap-southeast-2.amazonaws.com"
+                        },
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "snowball-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-eu-central-1": {
+                            "credentialScope": {
+                                "region": "eu-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "snowball-fips.eu-central-1.amazonaws.com"
+                        },
+                        "fips-eu-west-1": {
+                            "credentialScope": {
+                                "region": "eu-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "snowball-fips.eu-west-1.amazonaws.com"
+                        },
+                        "fips-eu-west-2": {
+                            "credentialScope": {
+                                "region": "eu-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "snowball-fips.eu-west-2.amazonaws.com"
+                        },
+                        "fips-eu-west-3": {
+                            "credentialScope": {
+                                "region": "eu-west-3"
+                            },
+                            "deprecated": true,
+                            "hostname": "snowball-fips.eu-west-3.amazonaws.com"
+                        },
+                        "fips-sa-east-1": {
+                            "credentialScope": {
+                                "region": "sa-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "snowball-fips.sa-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "snowball-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "snowball-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "snowball-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "snowball-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "sa-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "snowball-fips.sa-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "snowball-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "snowball-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "snowball-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "snowball-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "sns": {
+                    "defaults": {
+                        "protocols": ["http", "https"]
+                    },
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "sns-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "sns-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "sns-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "sns-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "sns-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "sns-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "sns-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "sns-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "sqs": {
+                    "defaults": {
+                        "protocols": ["http", "https"],
+                        "sslCommonName": "{region}.queue.{dnsSuffix}"
+                    },
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "sqs-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "sqs-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "sqs-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "sqs-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "sslCommonName": "queue.{dnsSuffix}",
+                            "variants": [
+                                {
+                                    "hostname": "sqs-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "sqs-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "sqs-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "sqs-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "ssm": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ssm-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ssm-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ssm-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "ssm-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ssm-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "ssm-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ssm-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "ssm-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ssm-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "ssm-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "ssm-incidents": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "ssm-sap": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ssm-sap-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ssm-sap-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ssm-sap-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "ssm-sap-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ssm-sap-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "ssm-sap-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ssm-sap-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "ssm-sap-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ssm-sap-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "ssm-sap-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "sso": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "states": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "states-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "states-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "states-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "states-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "states-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "states-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "states-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "states-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "storagegateway": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "storagegateway-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ca-central-1-fips": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "storagegateway-fips.ca-central-1.amazonaws.com"
+                        },
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "storagegateway-fips.ca-central-1.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "storagegateway-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "storagegateway-fips.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "storagegateway-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2-fips": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "storagegateway-fips.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "storagegateway-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "storagegateway-fips.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "storagegateway-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "storagegateway-fips.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "streams.dynamodb": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "dynamodb"
+                        },
+                        "protocols": ["http", "https"]
+                    },
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "local": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "localhost:8000",
+                            "protocols": ["http"]
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "sts": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "aws-global": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "sts.amazonaws.com"
+                        },
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "sts-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "sts-fips.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "sts-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2-fips": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "sts-fips.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "sts-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "sts-fips.us-west-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "sts-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "sts-fips.us-west-2.amazonaws.com"
+                        }
+                    },
+                    "partitionEndpoint": "aws-global"
+                },
+                "support": {
+                    "endpoints": {
+                        "aws-global": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "support.us-east-1.amazonaws.com"
+                        }
+                    },
+                    "partitionEndpoint": "aws-global"
+                },
+                "supportapp": {
+                    "endpoints": {
+                        "eu-west-1": {},
+                        "us-east-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "swf": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "swf-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "swf-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "swf-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "swf-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "swf-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "swf-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "swf-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "swf-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "synthetics": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "synthetics-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "synthetics-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "synthetics-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "synthetics-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "synthetics-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "synthetics-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "synthetics-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "synthetics-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "tagging": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "textract": {
+                    "endpoints": {
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "textract-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "textract-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "textract-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "textract-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "textract-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "textract-fips.us-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "textract-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "textract-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "textract-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "textract-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "transcribe": {
+                    "defaults": {
+                        "protocols": ["https"],
+                        "variants": [
+                            {
+                                "hostname": "fips.transcribe.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fips.transcribe.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fips.transcribe.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fips.transcribe.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "fips.transcribe.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fips.transcribe.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "fips.transcribe.us-west-2.amazonaws.com"
+                        },
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fips.transcribe.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "fips.transcribe.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fips.transcribe.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "fips.transcribe.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "transcribestreaming": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "sa-east-1": {},
+                        "transcribestreaming-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "transcribestreaming-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "transcribestreaming-fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "transcribestreaming-fips.ca-central-1.amazonaws.com"
+                        },
+                        "transcribestreaming-fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "transcribestreaming-fips.us-east-1.amazonaws.com"
+                        },
+                        "transcribestreaming-fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "transcribestreaming-fips.us-east-2.amazonaws.com"
+                        },
+                        "transcribestreaming-fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "transcribestreaming-fips.us-west-2.amazonaws.com"
+                        },
+                        "transcribestreaming-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "transcribestreaming-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "transcribestreaming-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "transcribestreaming-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "transcribestreaming-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "transcribestreaming-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "transfer": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "transfer-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "transfer-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "transfer-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "transfer-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "transfer-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "transfer-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "transfer-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "transfer-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "transfer-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "transfer-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "translate": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "translate-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "translate-fips.us-east-1.amazonaws.com"
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "translate-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2-fips": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "translate-fips.us-east-2.amazonaws.com"
+                        },
+                        "us-west-1": {},
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "translate-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "translate-fips.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "voice-chime": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-southeast-1": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "voice-chime-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ca-central-1-fips": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "voice-chime-fips.ca-central-1.amazonaws.com"
+                        },
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "voice-chime-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "voice-chime-fips.us-east-1.amazonaws.com"
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "voice-chime-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2-fips": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "voice-chime-fips.us-west-2.amazonaws.com"
+                        }
+                    }
+                },
+                "voiceid": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {
+                            "variants": [
+                                {
+                                    "hostname": "voiceid-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {},
+                        "eu-west-2": {},
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "voiceid-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "voiceid-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "voiceid-fips.us-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "voiceid-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "voiceid-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "vpc-lattice": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-west-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-2": {}
+                    }
+                },
+                "waf": {
+                    "endpoints": {
+                        "aws": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "waf-fips.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "aws-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-fips.amazonaws.com"
+                        },
+                        "aws-global": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "waf.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-fips.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "aws-global-fips": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-fips.amazonaws.com"
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-global"
+                },
+                "waf-regional": {
+                    "endpoints": {
+                        "af-south-1": {
+                            "credentialScope": {
+                                "region": "af-south-1"
+                            },
+                            "hostname": "waf-regional.af-south-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.af-south-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-east-1": {
+                            "credentialScope": {
+                                "region": "ap-east-1"
+                            },
+                            "hostname": "waf-regional.ap-east-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.ap-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-1": {
+                            "credentialScope": {
+                                "region": "ap-northeast-1"
+                            },
+                            "hostname": "waf-regional.ap-northeast-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.ap-northeast-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-2": {
+                            "credentialScope": {
+                                "region": "ap-northeast-2"
+                            },
+                            "hostname": "waf-regional.ap-northeast-2.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.ap-northeast-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-3": {
+                            "credentialScope": {
+                                "region": "ap-northeast-3"
+                            },
+                            "hostname": "waf-regional.ap-northeast-3.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.ap-northeast-3.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-south-1": {
+                            "credentialScope": {
+                                "region": "ap-south-1"
+                            },
+                            "hostname": "waf-regional.ap-south-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.ap-south-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-south-2": {
+                            "credentialScope": {
+                                "region": "ap-south-2"
+                            },
+                            "hostname": "waf-regional.ap-south-2.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.ap-south-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-1": {
+                            "credentialScope": {
+                                "region": "ap-southeast-1"
+                            },
+                            "hostname": "waf-regional.ap-southeast-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.ap-southeast-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-2": {
+                            "credentialScope": {
+                                "region": "ap-southeast-2"
+                            },
+                            "hostname": "waf-regional.ap-southeast-2.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.ap-southeast-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-3": {
+                            "credentialScope": {
+                                "region": "ap-southeast-3"
+                            },
+                            "hostname": "waf-regional.ap-southeast-3.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.ap-southeast-3.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-4": {
+                            "credentialScope": {
+                                "region": "ap-southeast-4"
+                            },
+                            "hostname": "waf-regional.ap-southeast-4.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.ap-southeast-4.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "hostname": "waf-regional.ca-central-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {
+                            "credentialScope": {
+                                "region": "eu-central-1"
+                            },
+                            "hostname": "waf-regional.eu-central-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.eu-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-2": {
+                            "credentialScope": {
+                                "region": "eu-central-2"
+                            },
+                            "hostname": "waf-regional.eu-central-2.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.eu-central-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-north-1": {
+                            "credentialScope": {
+                                "region": "eu-north-1"
+                            },
+                            "hostname": "waf-regional.eu-north-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.eu-north-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-south-1": {
+                            "credentialScope": {
+                                "region": "eu-south-1"
+                            },
+                            "hostname": "waf-regional.eu-south-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.eu-south-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-south-2": {
+                            "credentialScope": {
+                                "region": "eu-south-2"
+                            },
+                            "hostname": "waf-regional.eu-south-2.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.eu-south-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-west-1": {
+                            "credentialScope": {
+                                "region": "eu-west-1"
+                            },
+                            "hostname": "waf-regional.eu-west-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.eu-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-west-2": {
+                            "credentialScope": {
+                                "region": "eu-west-2"
+                            },
+                            "hostname": "waf-regional.eu-west-2.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.eu-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-west-3": {
+                            "credentialScope": {
+                                "region": "eu-west-3"
+                            },
+                            "hostname": "waf-regional.eu-west-3.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.eu-west-3.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "fips-af-south-1": {
+                            "credentialScope": {
+                                "region": "af-south-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.af-south-1.amazonaws.com"
+                        },
+                        "fips-ap-east-1": {
+                            "credentialScope": {
+                                "region": "ap-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.ap-east-1.amazonaws.com"
+                        },
+                        "fips-ap-northeast-1": {
+                            "credentialScope": {
+                                "region": "ap-northeast-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.ap-northeast-1.amazonaws.com"
+                        },
+                        "fips-ap-northeast-2": {
+                            "credentialScope": {
+                                "region": "ap-northeast-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.ap-northeast-2.amazonaws.com"
+                        },
+                        "fips-ap-northeast-3": {
+                            "credentialScope": {
+                                "region": "ap-northeast-3"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.ap-northeast-3.amazonaws.com"
+                        },
+                        "fips-ap-south-1": {
+                            "credentialScope": {
+                                "region": "ap-south-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.ap-south-1.amazonaws.com"
+                        },
+                        "fips-ap-south-2": {
+                            "credentialScope": {
+                                "region": "ap-south-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.ap-south-2.amazonaws.com"
+                        },
+                        "fips-ap-southeast-1": {
+                            "credentialScope": {
+                                "region": "ap-southeast-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.ap-southeast-1.amazonaws.com"
+                        },
+                        "fips-ap-southeast-2": {
+                            "credentialScope": {
+                                "region": "ap-southeast-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.ap-southeast-2.amazonaws.com"
+                        },
+                        "fips-ap-southeast-3": {
+                            "credentialScope": {
+                                "region": "ap-southeast-3"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.ap-southeast-3.amazonaws.com"
+                        },
+                        "fips-ap-southeast-4": {
+                            "credentialScope": {
+                                "region": "ap-southeast-4"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.ap-southeast-4.amazonaws.com"
+                        },
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-eu-central-1": {
+                            "credentialScope": {
+                                "region": "eu-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.eu-central-1.amazonaws.com"
+                        },
+                        "fips-eu-central-2": {
+                            "credentialScope": {
+                                "region": "eu-central-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.eu-central-2.amazonaws.com"
+                        },
+                        "fips-eu-north-1": {
+                            "credentialScope": {
+                                "region": "eu-north-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.eu-north-1.amazonaws.com"
+                        },
+                        "fips-eu-south-1": {
+                            "credentialScope": {
+                                "region": "eu-south-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.eu-south-1.amazonaws.com"
+                        },
+                        "fips-eu-south-2": {
+                            "credentialScope": {
+                                "region": "eu-south-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.eu-south-2.amazonaws.com"
+                        },
+                        "fips-eu-west-1": {
+                            "credentialScope": {
+                                "region": "eu-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.eu-west-1.amazonaws.com"
+                        },
+                        "fips-eu-west-2": {
+                            "credentialScope": {
+                                "region": "eu-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.eu-west-2.amazonaws.com"
+                        },
+                        "fips-eu-west-3": {
+                            "credentialScope": {
+                                "region": "eu-west-3"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.eu-west-3.amazonaws.com"
+                        },
+                        "fips-il-central-1": {
+                            "credentialScope": {
+                                "region": "il-central-1"
+                            },
+                            "hostname": "waf-regional-fips.il-central-1.amazonaws.com"
+                        },
+                        "fips-me-central-1": {
+                            "credentialScope": {
+                                "region": "me-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.me-central-1.amazonaws.com"
+                        },
+                        "fips-me-south-1": {
+                            "credentialScope": {
+                                "region": "me-south-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.me-south-1.amazonaws.com"
+                        },
+                        "fips-sa-east-1": {
+                            "credentialScope": {
+                                "region": "sa-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.sa-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {
+                            "credentialScope": {
+                                "region": "me-central-1"
+                            },
+                            "hostname": "waf-regional.me-central-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.me-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "me-south-1": {
+                            "credentialScope": {
+                                "region": "me-south-1"
+                            },
+                            "hostname": "waf-regional.me-south-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.me-south-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "sa-east-1": {
+                            "credentialScope": {
+                                "region": "sa-east-1"
+                            },
+                            "hostname": "waf-regional.sa-east-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.sa-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "waf-regional.us-east-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "hostname": "waf-regional.us-east-2.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "hostname": "waf-regional.us-west-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "hostname": "waf-regional.us-west-2.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "wafv2": {
+                    "endpoints": {
+                        "af-south-1": {
+                            "credentialScope": {
+                                "region": "af-south-1"
+                            },
+                            "hostname": "wafv2.af-south-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.af-south-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-east-1": {
+                            "credentialScope": {
+                                "region": "ap-east-1"
+                            },
+                            "hostname": "wafv2.ap-east-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.ap-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-1": {
+                            "credentialScope": {
+                                "region": "ap-northeast-1"
+                            },
+                            "hostname": "wafv2.ap-northeast-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.ap-northeast-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-2": {
+                            "credentialScope": {
+                                "region": "ap-northeast-2"
+                            },
+                            "hostname": "wafv2.ap-northeast-2.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.ap-northeast-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-northeast-3": {
+                            "credentialScope": {
+                                "region": "ap-northeast-3"
+                            },
+                            "hostname": "wafv2.ap-northeast-3.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.ap-northeast-3.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-south-1": {
+                            "credentialScope": {
+                                "region": "ap-south-1"
+                            },
+                            "hostname": "wafv2.ap-south-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.ap-south-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-south-2": {
+                            "credentialScope": {
+                                "region": "ap-south-2"
+                            },
+                            "hostname": "wafv2.ap-south-2.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.ap-south-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-1": {
+                            "credentialScope": {
+                                "region": "ap-southeast-1"
+                            },
+                            "hostname": "wafv2.ap-southeast-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.ap-southeast-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-2": {
+                            "credentialScope": {
+                                "region": "ap-southeast-2"
+                            },
+                            "hostname": "wafv2.ap-southeast-2.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.ap-southeast-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-3": {
+                            "credentialScope": {
+                                "region": "ap-southeast-3"
+                            },
+                            "hostname": "wafv2.ap-southeast-3.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.ap-southeast-3.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ap-southeast-4": {
+                            "credentialScope": {
+                                "region": "ap-southeast-4"
+                            },
+                            "hostname": "wafv2.ap-southeast-4.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.ap-southeast-4.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "hostname": "wafv2.ca-central-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.ca-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-1": {
+                            "credentialScope": {
+                                "region": "eu-central-1"
+                            },
+                            "hostname": "wafv2.eu-central-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.eu-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-central-2": {
+                            "credentialScope": {
+                                "region": "eu-central-2"
+                            },
+                            "hostname": "wafv2.eu-central-2.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.eu-central-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-north-1": {
+                            "credentialScope": {
+                                "region": "eu-north-1"
+                            },
+                            "hostname": "wafv2.eu-north-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.eu-north-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-south-1": {
+                            "credentialScope": {
+                                "region": "eu-south-1"
+                            },
+                            "hostname": "wafv2.eu-south-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.eu-south-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-south-2": {
+                            "credentialScope": {
+                                "region": "eu-south-2"
+                            },
+                            "hostname": "wafv2.eu-south-2.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.eu-south-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-west-1": {
+                            "credentialScope": {
+                                "region": "eu-west-1"
+                            },
+                            "hostname": "wafv2.eu-west-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.eu-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-west-2": {
+                            "credentialScope": {
+                                "region": "eu-west-2"
+                            },
+                            "hostname": "wafv2.eu-west-2.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.eu-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "eu-west-3": {
+                            "credentialScope": {
+                                "region": "eu-west-3"
+                            },
+                            "hostname": "wafv2.eu-west-3.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.eu-west-3.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "fips-af-south-1": {
+                            "credentialScope": {
+                                "region": "af-south-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.af-south-1.amazonaws.com"
+                        },
+                        "fips-ap-east-1": {
+                            "credentialScope": {
+                                "region": "ap-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.ap-east-1.amazonaws.com"
+                        },
+                        "fips-ap-northeast-1": {
+                            "credentialScope": {
+                                "region": "ap-northeast-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.ap-northeast-1.amazonaws.com"
+                        },
+                        "fips-ap-northeast-2": {
+                            "credentialScope": {
+                                "region": "ap-northeast-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.ap-northeast-2.amazonaws.com"
+                        },
+                        "fips-ap-northeast-3": {
+                            "credentialScope": {
+                                "region": "ap-northeast-3"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.ap-northeast-3.amazonaws.com"
+                        },
+                        "fips-ap-south-1": {
+                            "credentialScope": {
+                                "region": "ap-south-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.ap-south-1.amazonaws.com"
+                        },
+                        "fips-ap-south-2": {
+                            "credentialScope": {
+                                "region": "ap-south-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.ap-south-2.amazonaws.com"
+                        },
+                        "fips-ap-southeast-1": {
+                            "credentialScope": {
+                                "region": "ap-southeast-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.ap-southeast-1.amazonaws.com"
+                        },
+                        "fips-ap-southeast-2": {
+                            "credentialScope": {
+                                "region": "ap-southeast-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.ap-southeast-2.amazonaws.com"
+                        },
+                        "fips-ap-southeast-3": {
+                            "credentialScope": {
+                                "region": "ap-southeast-3"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.ap-southeast-3.amazonaws.com"
+                        },
+                        "fips-ap-southeast-4": {
+                            "credentialScope": {
+                                "region": "ap-southeast-4"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.ap-southeast-4.amazonaws.com"
+                        },
+                        "fips-ca-central-1": {
+                            "credentialScope": {
+                                "region": "ca-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.ca-central-1.amazonaws.com"
+                        },
+                        "fips-eu-central-1": {
+                            "credentialScope": {
+                                "region": "eu-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.eu-central-1.amazonaws.com"
+                        },
+                        "fips-eu-central-2": {
+                            "credentialScope": {
+                                "region": "eu-central-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.eu-central-2.amazonaws.com"
+                        },
+                        "fips-eu-north-1": {
+                            "credentialScope": {
+                                "region": "eu-north-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.eu-north-1.amazonaws.com"
+                        },
+                        "fips-eu-south-1": {
+                            "credentialScope": {
+                                "region": "eu-south-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.eu-south-1.amazonaws.com"
+                        },
+                        "fips-eu-south-2": {
+                            "credentialScope": {
+                                "region": "eu-south-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.eu-south-2.amazonaws.com"
+                        },
+                        "fips-eu-west-1": {
+                            "credentialScope": {
+                                "region": "eu-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.eu-west-1.amazonaws.com"
+                        },
+                        "fips-eu-west-2": {
+                            "credentialScope": {
+                                "region": "eu-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.eu-west-2.amazonaws.com"
+                        },
+                        "fips-eu-west-3": {
+                            "credentialScope": {
+                                "region": "eu-west-3"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.eu-west-3.amazonaws.com"
+                        },
+                        "fips-il-central-1": {
+                            "credentialScope": {
+                                "region": "il-central-1"
+                            },
+                            "hostname": "wafv2-fips.il-central-1.amazonaws.com"
+                        },
+                        "fips-me-central-1": {
+                            "credentialScope": {
+                                "region": "me-central-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.me-central-1.amazonaws.com"
+                        },
+                        "fips-me-south-1": {
+                            "credentialScope": {
+                                "region": "me-south-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.me-south-1.amazonaws.com"
+                        },
+                        "fips-sa-east-1": {
+                            "credentialScope": {
+                                "region": "sa-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.sa-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {
+                            "credentialScope": {
+                                "region": "me-central-1"
+                            },
+                            "hostname": "wafv2.me-central-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.me-central-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "me-south-1": {
+                            "credentialScope": {
+                                "region": "me-south-1"
+                            },
+                            "hostname": "wafv2.me-south-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.me-south-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "sa-east-1": {
+                            "credentialScope": {
+                                "region": "sa-east-1"
+                            },
+                            "hostname": "wafv2.sa-east-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.sa-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "hostname": "wafv2.us-east-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "hostname": "wafv2.us-east-2.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "hostname": "wafv2.us-west-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "hostname": "wafv2.us-west-2.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "wellarchitected": {
+                    "endpoints": {
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-north-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {},
+                        "us-east-2": {},
+                        "us-west-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "wisdom": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-central-1": {},
+                        "eu-west-2": {},
+                        "fips-us-east-1": {
+                            "deprecated": true
+                        },
+                        "fips-us-west-2": {
+                            "deprecated": true
+                        },
+                        "ui-ap-northeast-1": {},
+                        "ui-ap-southeast-2": {},
+                        "ui-eu-central-1": {},
+                        "ui-eu-west-2": {},
+                        "ui-us-east-1": {},
+                        "ui-us-west-2": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "workdocs": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "eu-west-1": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "workdocs-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "workdocs-fips.us-west-2.amazonaws.com"
+                        },
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "workdocs-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "workdocs-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "workmail": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "eu-west-1": {},
+                        "us-east-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "workspaces": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "workspaces-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "workspaces-fips.us-west-2.amazonaws.com"
+                        },
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "workspaces-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "workspaces-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "workspaces-web": {
+                    "endpoints": {
+                        "ap-northeast-1": {},
+                        "ap-south-1": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "us-east-1": {},
+                        "us-west-2": {}
+                    }
+                },
+                "xray": {
+                    "endpoints": {
+                        "af-south-1": {},
+                        "ap-east-1": {},
+                        "ap-northeast-1": {},
+                        "ap-northeast-2": {},
+                        "ap-northeast-3": {},
+                        "ap-south-1": {},
+                        "ap-south-2": {},
+                        "ap-southeast-1": {},
+                        "ap-southeast-2": {},
+                        "ap-southeast-3": {},
+                        "ap-southeast-4": {},
+                        "ca-central-1": {},
+                        "eu-central-1": {},
+                        "eu-central-2": {},
+                        "eu-north-1": {},
+                        "eu-south-1": {},
+                        "eu-south-2": {},
+                        "eu-west-1": {},
+                        "eu-west-2": {},
+                        "eu-west-3": {},
+                        "fips-us-east-1": {
+                            "credentialScope": {
+                                "region": "us-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "xray-fips.us-east-1.amazonaws.com"
+                        },
+                        "fips-us-east-2": {
+                            "credentialScope": {
+                                "region": "us-east-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "xray-fips.us-east-2.amazonaws.com"
+                        },
+                        "fips-us-west-1": {
+                            "credentialScope": {
+                                "region": "us-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "xray-fips.us-west-1.amazonaws.com"
+                        },
+                        "fips-us-west-2": {
+                            "credentialScope": {
+                                "region": "us-west-2"
+                            },
+                            "deprecated": true,
+                            "hostname": "xray-fips.us-west-2.amazonaws.com"
+                        },
+                        "me-central-1": {},
+                        "me-south-1": {},
+                        "sa-east-1": {},
+                        "us-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "xray-fips.us-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-east-2": {
+                            "variants": [
+                                {
+                                    "hostname": "xray-fips.us-east-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "xray-fips.us-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-west-2": {
+                            "variants": [
+                                {
+                                    "hostname": "xray-fips.us-west-2.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        },
+        {
+            "defaults": {
+                "hostname": "{service}.{region}.{dnsSuffix}",
+                "protocols": ["https"],
+                "signatureVersions": ["v4"],
+                "variants": [
+                    {
+                        "dnsSuffix": "amazonaws.com.cn",
+                        "hostname": "{service}-fips.{region}.{dnsSuffix}",
+                        "tags": ["fips"]
+                    },
+                    {
+                        "dnsSuffix": "api.amazonwebservices.com.cn",
+                        "hostname": "{service}-fips.{region}.{dnsSuffix}",
+                        "tags": ["dualstack", "fips"]
+                    },
+                    {
+                        "dnsSuffix": "api.amazonwebservices.com.cn",
+                        "hostname": "{service}.{region}.{dnsSuffix}",
+                        "tags": ["dualstack"]
+                    }
+                ]
+            },
+            "dnsSuffix": "amazonaws.com.cn",
+            "partition": "aws-cn",
+            "partitionName": "AWS China",
+            "regionRegex": "^cn\\-\\w+\\-\\d+$",
+            "regions": {
+                "cn-north-1": {
+                    "description": "China (Beijing)"
+                },
+                "cn-northwest-1": {
+                    "description": "China (Ningxia)"
+                }
+            },
+            "services": {
+                "access-analyzer": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "account": {
+                    "endpoints": {
+                        "aws-cn-global": {
+                            "credentialScope": {
+                                "region": "cn-northwest-1"
+                            },
+                            "hostname": "account.cn-northwest-1.amazonaws.com.cn"
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-cn-global"
+                },
+                "acm": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "api.ecr": {
+                    "endpoints": {
+                        "cn-north-1": {
+                            "credentialScope": {
+                                "region": "cn-north-1"
+                            },
+                            "hostname": "api.ecr.cn-north-1.amazonaws.com.cn"
+                        },
+                        "cn-northwest-1": {
+                            "credentialScope": {
+                                "region": "cn-northwest-1"
+                            },
+                            "hostname": "api.ecr.cn-northwest-1.amazonaws.com.cn"
+                        }
+                    }
+                },
+                "api.sagemaker": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "api.tunneling.iot": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "apigateway": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "appconfig": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "appconfigdata": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "application-autoscaling": {
+                    "defaults": {
+                        "protocols": ["http", "https"]
+                    },
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "applicationinsights": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "appmesh": {
+                    "endpoints": {
+                        "cn-north-1": {
+                            "variants": [
+                                {
+                                    "hostname": "appmesh.cn-north-1.api.amazonwebservices.com.cn",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "cn-northwest-1": {
+                            "variants": [
+                                {
+                                    "hostname": "appmesh.cn-northwest-1.api.amazonwebservices.com.cn",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "appsync": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "athena": {
+                    "endpoints": {
+                        "cn-north-1": {
+                            "variants": [
+                                {
+                                    "hostname": "athena.cn-north-1.api.amazonwebservices.com.cn",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "cn-northwest-1": {
+                            "variants": [
+                                {
+                                    "hostname": "athena.cn-northwest-1.api.amazonwebservices.com.cn",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "autoscaling": {
+                    "defaults": {
+                        "protocols": ["http", "https"]
+                    },
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "autoscaling-plans": {
+                    "defaults": {
+                        "protocols": ["http", "https"]
+                    },
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "backup": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "batch": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "budgets": {
+                    "endpoints": {
+                        "aws-cn-global": {
+                            "credentialScope": {
+                                "region": "cn-northwest-1"
+                            },
+                            "hostname": "budgets.amazonaws.com.cn"
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-cn-global"
+                },
+                "cassandra": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "ce": {
+                    "endpoints": {
+                        "aws-cn-global": {
+                            "credentialScope": {
+                                "region": "cn-northwest-1"
+                            },
+                            "hostname": "ce.cn-northwest-1.amazonaws.com.cn"
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-cn-global"
+                },
+                "cloudcontrolapi": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "cloudformation": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "cloudfront": {
+                    "endpoints": {
+                        "aws-cn-global": {
+                            "credentialScope": {
+                                "region": "cn-northwest-1"
+                            },
+                            "hostname": "cloudfront.cn-northwest-1.amazonaws.com.cn",
+                            "protocols": ["http", "https"]
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-cn-global"
+                },
+                "cloudtrail": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "codebuild": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "codecommit": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "codedeploy": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "codepipeline": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "cognito-identity": {
+                    "endpoints": {
+                        "cn-north-1": {}
+                    }
+                },
+                "compute-optimizer": {
+                    "endpoints": {
+                        "cn-north-1": {
+                            "credentialScope": {
+                                "region": "cn-north-1"
+                            },
+                            "hostname": "compute-optimizer.cn-north-1.amazonaws.com.cn"
+                        },
+                        "cn-northwest-1": {
+                            "credentialScope": {
+                                "region": "cn-northwest-1"
+                            },
+                            "hostname": "compute-optimizer.cn-northwest-1.amazonaws.com.cn"
+                        }
+                    }
+                },
+                "config": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "cur": {
+                    "endpoints": {
+                        "cn-northwest-1": {}
+                    }
+                },
+                "data-ats.iot": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "iotdata"
+                        },
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "cn-north-1": {
+                            "hostname": "data.ats.iot.cn-north-1.amazonaws.com.cn",
+                            "protocols": ["https"]
+                        },
+                        "cn-northwest-1": {}
+                    }
+                },
+                "data.iot": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "iotdata"
+                        },
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "data.jobs.iot": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "databrew": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "datasync": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "dax": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "directconnect": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "dlm": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "dms": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "docdb": {
+                    "endpoints": {
+                        "cn-northwest-1": {
+                            "credentialScope": {
+                                "region": "cn-northwest-1"
+                            },
+                            "hostname": "rds.cn-northwest-1.amazonaws.com.cn"
+                        }
+                    }
+                },
+                "ds": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "dynamodb": {
+                    "defaults": {
+                        "protocols": ["http", "https"]
+                    },
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "ebs": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "ec2": {
+                    "defaults": {
+                        "protocols": ["http", "https"]
+                    },
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "ecr": {
+                    "endpoints": {
+                        "cn-north-1": {
+                            "credentialScope": {
+                                "region": "cn-north-1"
+                            },
+                            "hostname": "api.ecr.cn-north-1.amazonaws.com.cn"
+                        },
+                        "cn-northwest-1": {
+                            "credentialScope": {
+                                "region": "cn-northwest-1"
+                            },
+                            "hostname": "api.ecr.cn-northwest-1.amazonaws.com.cn"
+                        }
+                    }
+                },
+                "ecs": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "eks": {
+                    "defaults": {
+                        "protocols": ["http", "https"]
+                    },
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "elasticache": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "elasticbeanstalk": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "elasticfilesystem": {
+                    "endpoints": {
+                        "cn-north-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.cn-north-1.amazonaws.com.cn",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "cn-northwest-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.cn-northwest-1.amazonaws.com.cn",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "fips-cn-north-1": {
+                            "credentialScope": {
+                                "region": "cn-north-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.cn-north-1.amazonaws.com.cn"
+                        },
+                        "fips-cn-northwest-1": {
+                            "credentialScope": {
+                                "region": "cn-northwest-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.cn-northwest-1.amazonaws.com.cn"
+                        }
+                    }
+                },
+                "elasticloadbalancing": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "elasticmapreduce": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "emr-containers": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "es": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "events": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "firehose": {
+                    "endpoints": {
+                        "cn-north-1": {
+                            "variants": [
+                                {
+                                    "hostname": "firehose.cn-north-1.api.amazonwebservices.com.cn",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "cn-northwest-1": {
+                            "variants": [
+                                {
+                                    "hostname": "firehose.cn-northwest-1.api.amazonwebservices.com.cn",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "fms": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "fsx": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "gamelift": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "glacier": {
+                    "defaults": {
+                        "protocols": ["http", "https"]
+                    },
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "glue": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "greengrass": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "cn-north-1": {}
+                    },
+                    "isRegionalized": true
+                },
+                "guardduty": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    },
+                    "isRegionalized": true
+                },
+                "health": {
+                    "defaults": {
+                        "protocols": ["https"],
+                        "sslCommonName": "health.cn-northwest-1.amazonaws.com.cn"
+                    },
+                    "endpoints": {
+                        "aws-cn-global": {
+                            "credentialScope": {
+                                "region": "cn-northwest-1"
+                            },
+                            "hostname": "global.health.amazonaws.com.cn"
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-cn-global"
+                },
+                "iam": {
+                    "endpoints": {
+                        "aws-cn-global": {
+                            "credentialScope": {
+                                "region": "cn-north-1"
+                            },
+                            "hostname": "iam.cn-north-1.amazonaws.com.cn"
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-cn-global"
+                },
+                "internetmonitor": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "dnsSuffix": "api.amazonwebservices.com.cn",
+                                "hostname": "{service}-fips.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "cn-north-1": {
+                            "hostname": "internetmonitor.cn-north-1.api.amazonwebservices.com.cn"
+                        },
+                        "cn-northwest-1": {
+                            "hostname": "internetmonitor.cn-northwest-1.api.amazonwebservices.com.cn"
+                        }
+                    }
+                },
+                "iot": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "execute-api"
+                        }
+                    },
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "iotanalytics": {
+                    "endpoints": {
+                        "cn-north-1": {}
+                    }
+                },
+                "iotevents": {
+                    "endpoints": {
+                        "cn-north-1": {}
+                    }
+                },
+                "ioteventsdata": {
+                    "endpoints": {
+                        "cn-north-1": {
+                            "credentialScope": {
+                                "region": "cn-north-1"
+                            },
+                            "hostname": "data.iotevents.cn-north-1.amazonaws.com.cn"
+                        }
+                    }
+                },
+                "iotsecuredtunneling": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "iotsitewise": {
+                    "endpoints": {
+                        "cn-north-1": {}
+                    }
+                },
+                "kafka": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "kendra-ranking": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "dnsSuffix": "api.amazonwebservices.com.cn",
+                                "hostname": "{service}-fips.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "cn-north-1": {
+                            "hostname": "kendra-ranking.cn-north-1.api.amazonwebservices.com.cn"
+                        },
+                        "cn-northwest-1": {
+                            "hostname": "kendra-ranking.cn-northwest-1.api.amazonwebservices.com.cn"
+                        }
+                    }
+                },
+                "kinesis": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "kinesisanalytics": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "kinesisvideo": {
+                    "endpoints": {
+                        "cn-north-1": {}
+                    }
+                },
+                "kms": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "lakeformation": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "lambda": {
+                    "endpoints": {
+                        "cn-north-1": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda.cn-north-1.api.amazonwebservices.com.cn",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "cn-northwest-1": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda.cn-northwest-1.api.amazonwebservices.com.cn",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "license-manager": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "logs": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "mediaconvert": {
+                    "endpoints": {
+                        "cn-northwest-1": {
+                            "credentialScope": {
+                                "region": "cn-northwest-1"
+                            },
+                            "hostname": "subscribe.mediaconvert.cn-northwest-1.amazonaws.com.cn"
+                        }
+                    }
+                },
+                "memory-db": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "metrics.sagemaker": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "monitoring": {
+                    "defaults": {
+                        "protocols": ["http", "https"]
+                    },
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "mq": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "neptune": {
+                    "endpoints": {
+                        "cn-north-1": {
+                            "credentialScope": {
+                                "region": "cn-north-1"
+                            },
+                            "hostname": "rds.cn-north-1.amazonaws.com.cn"
+                        },
+                        "cn-northwest-1": {
+                            "credentialScope": {
+                                "region": "cn-northwest-1"
+                            },
+                            "hostname": "rds.cn-northwest-1.amazonaws.com.cn"
+                        }
+                    }
+                },
+                "oam": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "organizations": {
+                    "endpoints": {
+                        "aws-cn-global": {
+                            "credentialScope": {
+                                "region": "cn-northwest-1"
+                            },
+                            "hostname": "organizations.cn-northwest-1.amazonaws.com.cn"
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-cn-global"
+                },
+                "personalize": {
+                    "endpoints": {
+                        "cn-north-1": {}
+                    }
+                },
+                "pi": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "polly": {
+                    "endpoints": {
+                        "cn-northwest-1": {}
+                    }
+                },
+                "ram": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "rbin": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "rds": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "redshift": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "resource-explorer-2": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "dnsSuffix": "api.amazonwebservices.com.cn",
+                                "hostname": "{service}-fips.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "cn-north-1": {
+                            "hostname": "resource-explorer-2.cn-north-1.api.amazonwebservices.com.cn"
+                        },
+                        "cn-northwest-1": {
+                            "hostname": "resource-explorer-2.cn-northwest-1.api.amazonwebservices.com.cn"
+                        }
+                    }
+                },
+                "resource-groups": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "rolesanywhere": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "route53": {
+                    "endpoints": {
+                        "aws-cn-global": {
+                            "credentialScope": {
+                                "region": "cn-northwest-1"
+                            },
+                            "hostname": "route53.amazonaws.com.cn"
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-cn-global"
+                },
+                "route53resolver": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "runtime.sagemaker": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "s3": {
+                    "defaults": {
+                        "protocols": ["http", "https"],
+                        "signatureVersions": ["s3v4"],
+                        "variants": [
+                            {
+                                "dnsSuffix": "amazonaws.com.cn",
+                                "hostname": "{service}.dualstack.{region}.{dnsSuffix}",
+                                "tags": ["dualstack"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "cn-north-1": {
+                            "variants": [
+                                {
+                                    "hostname": "s3.dualstack.cn-north-1.amazonaws.com.cn",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "cn-northwest-1": {
+                            "variants": [
+                                {
+                                    "hostname": "s3.dualstack.cn-northwest-1.amazonaws.com.cn",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "s3-control": {
+                    "defaults": {
+                        "protocols": ["https"],
+                        "signatureVersions": ["s3v4"],
+                        "variants": [
+                            {
+                                "dnsSuffix": "amazonaws.com.cn",
+                                "hostname": "{service}.dualstack.{region}.{dnsSuffix}",
+                                "tags": ["dualstack"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "cn-north-1": {
+                            "credentialScope": {
+                                "region": "cn-north-1"
+                            },
+                            "hostname": "s3-control.cn-north-1.amazonaws.com.cn",
+                            "signatureVersions": ["s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3-control.dualstack.cn-north-1.amazonaws.com.cn",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "cn-northwest-1": {
+                            "credentialScope": {
+                                "region": "cn-northwest-1"
+                            },
+                            "hostname": "s3-control.cn-northwest-1.amazonaws.com.cn",
+                            "signatureVersions": ["s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3-control.dualstack.cn-northwest-1.amazonaws.com.cn",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "secretsmanager": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "securityhub": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "serverlessrepo": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "cn-north-1": {
+                            "protocols": ["https"]
+                        },
+                        "cn-northwest-1": {
+                            "protocols": ["https"]
+                        }
+                    }
+                },
+                "servicecatalog": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "servicediscovery": {
+                    "endpoints": {
+                        "cn-north-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery.cn-north-1.amazonaws.com.cn",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "cn-northwest-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery.cn-northwest-1.amazonaws.com.cn",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "servicequotas": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "sms": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "snowball": {
+                    "endpoints": {
+                        "cn-north-1": {
+                            "variants": [
+                                {
+                                    "hostname": "snowball-fips.cn-north-1.amazonaws.com.cn",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "cn-northwest-1": {
+                            "variants": [
+                                {
+                                    "hostname": "snowball-fips.cn-northwest-1.amazonaws.com.cn",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "fips-cn-north-1": {
+                            "credentialScope": {
+                                "region": "cn-north-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "snowball-fips.cn-north-1.amazonaws.com.cn"
+                        },
+                        "fips-cn-northwest-1": {
+                            "credentialScope": {
+                                "region": "cn-northwest-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "snowball-fips.cn-northwest-1.amazonaws.com.cn"
+                        }
+                    }
+                },
+                "sns": {
+                    "defaults": {
+                        "protocols": ["http", "https"]
+                    },
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "sqs": {
+                    "defaults": {
+                        "protocols": ["http", "https"],
+                        "sslCommonName": "{region}.queue.{dnsSuffix}"
+                    },
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "ssm": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "states": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "storagegateway": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "streams.dynamodb": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "dynamodb"
+                        },
+                        "protocols": ["http", "https"]
+                    },
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "sts": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "support": {
+                    "endpoints": {
+                        "aws-cn-global": {
+                            "credentialScope": {
+                                "region": "cn-north-1"
+                            },
+                            "hostname": "support.cn-north-1.amazonaws.com.cn"
+                        }
+                    },
+                    "partitionEndpoint": "aws-cn-global"
+                },
+                "swf": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "synthetics": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "tagging": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "transcribe": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "cn-north-1": {
+                            "credentialScope": {
+                                "region": "cn-north-1"
+                            },
+                            "hostname": "cn.transcribe.cn-north-1.amazonaws.com.cn"
+                        },
+                        "cn-northwest-1": {
+                            "credentialScope": {
+                                "region": "cn-northwest-1"
+                            },
+                            "hostname": "cn.transcribe.cn-northwest-1.amazonaws.com.cn"
+                        }
+                    }
+                },
+                "transcribestreaming": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "transfer": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                },
+                "waf-regional": {
+                    "endpoints": {
+                        "cn-north-1": {
+                            "credentialScope": {
+                                "region": "cn-north-1"
+                            },
+                            "hostname": "waf-regional.cn-north-1.amazonaws.com.cn",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.cn-north-1.amazonaws.com.cn",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "cn-northwest-1": {
+                            "credentialScope": {
+                                "region": "cn-northwest-1"
+                            },
+                            "hostname": "waf-regional.cn-northwest-1.amazonaws.com.cn",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.cn-northwest-1.amazonaws.com.cn",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "fips-cn-north-1": {
+                            "credentialScope": {
+                                "region": "cn-north-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.cn-north-1.amazonaws.com.cn"
+                        },
+                        "fips-cn-northwest-1": {
+                            "credentialScope": {
+                                "region": "cn-northwest-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.cn-northwest-1.amazonaws.com.cn"
+                        }
+                    }
+                },
+                "wafv2": {
+                    "endpoints": {
+                        "cn-north-1": {
+                            "credentialScope": {
+                                "region": "cn-north-1"
+                            },
+                            "hostname": "wafv2.cn-north-1.amazonaws.com.cn",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.cn-north-1.amazonaws.com.cn",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "cn-northwest-1": {
+                            "credentialScope": {
+                                "region": "cn-northwest-1"
+                            },
+                            "hostname": "wafv2.cn-northwest-1.amazonaws.com.cn",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.cn-northwest-1.amazonaws.com.cn",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "fips-cn-north-1": {
+                            "credentialScope": {
+                                "region": "cn-north-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.cn-north-1.amazonaws.com.cn"
+                        },
+                        "fips-cn-northwest-1": {
+                            "credentialScope": {
+                                "region": "cn-northwest-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.cn-northwest-1.amazonaws.com.cn"
+                        }
+                    }
+                },
+                "workspaces": {
+                    "endpoints": {
+                        "cn-northwest-1": {}
+                    }
+                },
+                "xray": {
+                    "endpoints": {
+                        "cn-north-1": {},
+                        "cn-northwest-1": {}
+                    }
+                }
+            }
+        },
+        {
+            "defaults": {
+                "hostname": "{service}.{region}.{dnsSuffix}",
+                "protocols": ["https"],
+                "signatureVersions": ["v4"],
+                "variants": [
+                    {
+                        "dnsSuffix": "amazonaws.com",
+                        "hostname": "{service}-fips.{region}.{dnsSuffix}",
+                        "tags": ["fips"]
+                    },
+                    {
+                        "dnsSuffix": "api.aws",
+                        "hostname": "{service}-fips.{region}.{dnsSuffix}",
+                        "tags": ["dualstack", "fips"]
+                    },
+                    {
+                        "dnsSuffix": "api.aws",
+                        "hostname": "{service}.{region}.{dnsSuffix}",
+                        "tags": ["dualstack"]
+                    }
+                ]
+            },
+            "dnsSuffix": "amazonaws.com",
+            "partition": "aws-us-gov",
+            "partitionName": "AWS GovCloud (US)",
+            "regionRegex": "^us\\-gov\\-\\w+\\-\\d+$",
+            "regions": {
+                "us-gov-east-1": {
+                    "description": "AWS GovCloud (US-East)"
+                },
+                "us-gov-west-1": {
+                    "description": "AWS GovCloud (US-West)"
+                }
+            },
+            "services": {
+                "access-analyzer": {
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "hostname": "access-analyzer.us-gov-east-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "access-analyzer.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "access-analyzer.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "access-analyzer.us-gov-west-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "access-analyzer.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "access-analyzer.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "acm": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "acm.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "hostname": "acm.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "acm.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "acm-pca": {
+                    "defaults": {
+                        "protocols": ["https"],
+                        "variants": [
+                            {
+                                "hostname": "acm-pca.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "acm-pca.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "acm-pca.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "acm-pca.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "acm-pca.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "api.detective": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "api.detective-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "api.detective-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "api.detective-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "api.detective-fips.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "api.ecr": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "ecr-fips.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "dkr-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "ecr-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "dkr-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "ecr-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "fips-dkr-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecr-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-dkr-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecr-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecr-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecr-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "hostname": "api.ecr.us-gov-east-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "ecr-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "api.ecr.us-gov-west-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "ecr-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "api.sagemaker": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "api-fips.sagemaker.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "us-gov-east-1": {},
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "api-fips.sagemaker.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "api-fips.sagemaker.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-west-1-fips-secondary": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "api.sagemaker.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-west-1-secondary": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "api.sagemaker.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "api.tunneling.iot": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "api.tunneling.iot-fips.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "api.tunneling.iot-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "api.tunneling.iot-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "api.tunneling.iot-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "api.tunneling.iot-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "apigateway": {
+                    "endpoints": {
+                        "us-gov-east-1": {},
+                        "us-gov-west-1": {}
+                    }
+                },
+                "appconfig": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "appconfig.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "appconfig.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "appconfig.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "appconfig.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "appconfigdata": {
+                    "endpoints": {
+                        "us-gov-east-1": {},
+                        "us-gov-west-1": {}
+                    }
+                },
+                "application-autoscaling": {
+                    "defaults": {
+                        "protocols": ["http", "https"]
+                    },
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "hostname": "application-autoscaling.us-gov-east-1.amazonaws.com",
+                            "protocols": ["http", "https"],
+                            "variants": [
+                                {
+                                    "hostname": "application-autoscaling.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "deprecated": true,
+                            "hostname": "application-autoscaling.us-gov-east-1.amazonaws.com",
+                            "protocols": ["http", "https"]
+                        },
+                        "us-gov-west-1": {
+                            "hostname": "application-autoscaling.us-gov-west-1.amazonaws.com",
+                            "protocols": ["http", "https"],
+                            "variants": [
+                                {
+                                    "hostname": "application-autoscaling.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "deprecated": true,
+                            "hostname": "application-autoscaling.us-gov-west-1.amazonaws.com",
+                            "protocols": ["http", "https"]
+                        }
+                    }
+                },
+                "applicationinsights": {
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "hostname": "applicationinsights.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "applicationinsights.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "appstream2": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "appstream"
+                        },
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "appstream2-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "appstream2-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "appstream2-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "appstream2-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "appstream2-fips.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "athena": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "athena-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "athena-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "athena-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "athena.us-gov-east-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "athena-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "athena.us-gov-west-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "autoscaling": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "autoscaling.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "protocols": ["http", "https"]
+                        },
+                        "us-gov-west-1": {
+                            "protocols": ["http", "https"]
+                        }
+                    }
+                },
+                "autoscaling-plans": {
+                    "defaults": {
+                        "protocols": ["http", "https"]
+                    },
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "protocols": ["http", "https"]
+                        },
+                        "us-gov-west-1": {
+                            "protocols": ["http", "https"]
+                        }
+                    }
+                },
+                "backup": {
+                    "endpoints": {
+                        "us-gov-east-1": {},
+                        "us-gov-west-1": {}
+                    }
+                },
+                "backup-gateway": {
+                    "endpoints": {
+                        "us-gov-east-1": {},
+                        "us-gov-west-1": {}
+                    }
+                },
+                "batch": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "batch.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "batch.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "batch.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "batch.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "batch.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "cassandra": {
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "hostname": "cassandra.us-gov-east-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "cassandra.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "cassandra.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "cassandra.us-gov-west-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "cassandra.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "cassandra.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "cloudcontrolapi": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "cloudcontrolapi-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "cloudcontrolapi-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "cloudcontrolapi-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "cloudcontrolapi-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "clouddirectory": {
+                    "endpoints": {
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "clouddirectory.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "clouddirectory.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "cloudformation": {
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "hostname": "cloudformation.us-gov-east-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "cloudformation.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "cloudformation.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "cloudformation.us-gov-west-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "cloudformation.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "cloudformation.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "cloudhsm": {
+                    "endpoints": {
+                        "us-gov-west-1": {}
+                    }
+                },
+                "cloudhsmv2": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "cloudhsm"
+                        }
+                    },
+                    "endpoints": {
+                        "us-gov-east-1": {},
+                        "us-gov-west-1": {}
+                    }
+                },
+                "cloudtrail": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "cloudtrail.us-gov-west-1.amazonaws.com",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "cloudtrail.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "cloudtrail.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "cloudtrail.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "cloudtrail.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "codebuild": {
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "codebuild-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "codebuild-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "codebuild-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "codebuild-fips.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "codecommit": {
+                    "endpoints": {
+                        "fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "codecommit-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "codecommit-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "codecommit-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "codecommit-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "codecommit-fips.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "codedeploy": {
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "codedeploy-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "codedeploy-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "codedeploy-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "codedeploy-fips.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "codepipeline": {
+                    "endpoints": {
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "codepipeline-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "codepipeline-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "cognito-identity": {
+                    "endpoints": {
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "cognito-identity-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "cognito-identity-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "cognito-idp": {
+                    "endpoints": {
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "cognito-idp-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "cognito-idp-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "comprehend": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "comprehend-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "comprehend-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "comprehendmedical": {
+                    "endpoints": {
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "comprehendmedical-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "comprehendmedical-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "compute-optimizer": {
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "hostname": "compute-optimizer-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "compute-optimizer-fips.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "config": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "config.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "config.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "config.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "config.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "config.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "connect": {
+                    "endpoints": {
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "connect.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "connect.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "controltower": {
+                    "endpoints": {
+                        "us-gov-east-1": {},
+                        "us-gov-west-1": {}
+                    }
+                },
+                "data-ats.iot": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "iotdata"
+                        },
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "service": "iotdata"
+                            },
+                            "deprecated": true,
+                            "hostname": "data.iot-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "service": "iotdata"
+                            },
+                            "deprecated": true,
+                            "hostname": "data.iot-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "data.iot-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "data.iot-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "data.iot": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "iotdata"
+                        },
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "service": "iotdata"
+                            },
+                            "deprecated": true,
+                            "hostname": "data.iot-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "service": "iotdata"
+                            },
+                            "deprecated": true,
+                            "hostname": "data.iot-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "data.iot-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "data.iot-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "data.jobs.iot": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "data.jobs.iot-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "data.jobs.iot-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "data.jobs.iot-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "data.jobs.iot-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "databrew": {
+                    "endpoints": {
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "databrew.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "databrew.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "datasync": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "datasync-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "datasync-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "datasync-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "datasync-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "directconnect": {
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "hostname": "directconnect.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "directconnect.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "dlm": {
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "dlm.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "dlm.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "dlm.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "dlm.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "dms": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "dms.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "dms": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "dms.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "dms-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "dms.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "dms.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "dms.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "dms.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "dms.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "docdb": {
+                    "endpoints": {
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "rds.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "ds": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ds-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ds-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ds-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ds-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "dynamodb": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "dynamodb.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "dynamodb.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "dynamodb.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "dynamodb.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "dynamodb.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "ebs": {
+                    "endpoints": {
+                        "us-gov-east-1": {},
+                        "us-gov-west-1": {}
+                    }
+                },
+                "ec2": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "ec2.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "hostname": "ec2.us-gov-east-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "ec2.us-gov-east-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "ec2.us-gov-west-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "ec2.us-gov-west-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "ecr": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "ecr-fips.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "dkr-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "ecr-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "dkr-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "ecr-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "fips-dkr-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecr-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-dkr-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecr-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecr-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecr-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "hostname": "api.ecr.us-gov-east-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "ecr-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "api.ecr.us-gov-west-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "ecr-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "ecs": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecs-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ecs-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ecs-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ecs-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "eks": {
+                    "defaults": {
+                        "protocols": ["http", "https"],
+                        "variants": [
+                            {
+                                "hostname": "eks.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "eks.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "eks.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "eks.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "eks.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "elasticache": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "elasticache.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticache.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {},
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticache.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticache.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "elasticbeanstalk": {
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "hostname": "elasticbeanstalk.us-gov-east-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "elasticbeanstalk.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticbeanstalk.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "elasticbeanstalk.us-gov-west-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "elasticbeanstalk.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticbeanstalk.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "elasticfilesystem": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticfilesystem-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticfilesystem-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "elasticloadbalancing": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "elasticloadbalancing.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticloadbalancing.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticloadbalancing.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticloadbalancing.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "protocols": ["http", "https"],
+                            "variants": [
+                                {
+                                    "hostname": "elasticloadbalancing.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "elasticmapreduce": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "elasticmapreduce.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticmapreduce.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "elasticmapreduce.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "elasticmapreduce.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "protocols": ["https"],
+                            "variants": [
+                                {
+                                    "hostname": "elasticmapreduce.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "email": {
+                    "endpoints": {
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "email-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "email-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "emr-containers": {
+                    "endpoints": {
+                        "us-gov-east-1": {},
+                        "us-gov-west-1": {}
+                    }
+                },
+                "es": {
+                    "endpoints": {
+                        "fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "es-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "es-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "es-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "es-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "es-fips.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "events": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "events.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "events.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "events.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "events.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "firehose": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "firehose-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "firehose-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "firehose-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "firehose-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "fms": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fms-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fms-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fms-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fms-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "fsx": {
+                    "endpoints": {
+                        "fips-prod-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fsx-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-prod-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fsx-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fsx-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fsx-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "prod-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "fsx-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "prod-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "fsx-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fsx-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fsx-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "glacier": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "glacier.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "glacier.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "glacier.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "protocols": ["http", "https"],
+                            "variants": [
+                                {
+                                    "hostname": "glacier.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "glue": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "glue-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "glue-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "glue-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "glue-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "greengrass": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "dataplane-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "hostname": "greengrass-ats.iot.us-gov-east-1.amazonaws.com"
+                        },
+                        "dataplane-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "greengrass-ats.iot.us-gov-west-1.amazonaws.com"
+                        },
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "greengrass.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "greengrass.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "greengrass.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "greengrass.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    },
+                    "isRegionalized": true
+                },
+                "guardduty": {
+                    "defaults": {
+                        "protocols": ["https"],
+                        "variants": [
+                            {
+                                "hostname": "guardduty.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "guardduty.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "guardduty.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "guardduty.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "guardduty.us-gov-west-1.amazonaws.com"
+                        }
+                    },
+                    "isRegionalized": true
+                },
+                "health": {
+                    "endpoints": {
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "health-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "health-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "iam": {
+                    "endpoints": {
+                        "aws-us-gov-global": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "iam.us-gov.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "iam.us-gov.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "aws-us-gov-global-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "iam.us-gov.amazonaws.com"
+                        },
+                        "iam-govcloud": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "iam.us-gov.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "iam-govcloud-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "iam.us-gov.amazonaws.com"
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-us-gov-global"
+                },
+                "identitystore": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "identitystore.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "identitystore.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "identitystore.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "identitystore.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "identitystore.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "ingest.timestream": {
+                    "endpoints": {
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ingest.timestream.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ingest.timestream.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "inspector": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "inspector-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "inspector-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "inspector-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "inspector-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "inspector2": {
+                    "endpoints": {
+                        "us-gov-east-1": {},
+                        "us-gov-west-1": {}
+                    }
+                },
+                "internetmonitor": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "dnsSuffix": "api.aws",
+                                "hostname": "{service}-fips.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "hostname": "internetmonitor.us-gov-east-1.api.aws"
+                        },
+                        "us-gov-west-1": {
+                            "hostname": "internetmonitor.us-gov-west-1.api.aws"
+                        }
+                    }
+                },
+                "iot": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "execute-api"
+                        }
+                    },
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "service": "execute-api"
+                            },
+                            "deprecated": true,
+                            "hostname": "iot-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "service": "execute-api"
+                            },
+                            "deprecated": true,
+                            "hostname": "iot-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "iot-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "iot-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "iotevents": {
+                    "endpoints": {
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "iotevents-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "iotevents-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "ioteventsdata": {
+                    "endpoints": {
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "data.iotevents-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "data.iotevents.us-gov-west-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "data.iotevents-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "iotsecuredtunneling": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "api.tunneling.iot-fips.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "api.tunneling.iot-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "api.tunneling.iot-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "api.tunneling.iot-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "api.tunneling.iot-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "iotsitewise": {
+                    "endpoints": {
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "iotsitewise-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "iotsitewise-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "iottwinmaker": {
+                    "endpoints": {
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "iottwinmaker-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "iottwinmaker-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "kafka": {
+                    "endpoints": {
+                        "us-gov-east-1": {},
+                        "us-gov-west-1": {}
+                    }
+                },
+                "kendra": {
+                    "endpoints": {
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "kendra-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "kendra-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "kendra-ranking": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "dnsSuffix": "api.aws",
+                                "hostname": "{service}-fips.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "hostname": "kendra-ranking.us-gov-east-1.api.aws"
+                        },
+                        "us-gov-west-1": {
+                            "hostname": "kendra-ranking.us-gov-west-1.api.aws"
+                        }
+                    }
+                },
+                "kinesis": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "kinesis.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "kinesis.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "hostname": "kinesis.us-gov-east-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "kinesis.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "kinesis.us-gov-west-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "kinesis.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "kinesisanalytics": {
+                    "endpoints": {
+                        "us-gov-east-1": {},
+                        "us-gov-west-1": {}
+                    }
+                },
+                "kms": {
+                    "endpoints": {
+                        "ProdFips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "kms-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "kms-fips.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "lakeformation": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "lakeformation-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "lakeformation-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "lakeformation-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "lakeformation-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "lambda": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "lambda-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "lambda-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "lambda.us-gov-east-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "lambda-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "lambda.us-gov-west-1.api.aws",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "license-manager": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "license-manager-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "license-manager-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "license-manager-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "license-manager-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "logs": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "logs.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "logs.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "logs.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "logs.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "managedblockchain": {
+                    "endpoints": {
+                        "us-gov-west-1": {}
+                    }
+                },
+                "mediaconvert": {
+                    "endpoints": {
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "mediaconvert.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "mediaconvert.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "meetings-chime": {
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "meetings-chime-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "meetings-chime-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "meetings-chime-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "meetings-chime-fips.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "metering.marketplace": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "aws-marketplace"
+                        }
+                    },
+                    "endpoints": {
+                        "us-gov-east-1": {},
+                        "us-gov-west-1": {}
+                    }
+                },
+                "metrics.sagemaker": {
+                    "endpoints": {
+                        "us-gov-east-1": {},
+                        "us-gov-west-1": {}
+                    }
+                },
+                "models.lex": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "lex"
+                        },
+                        "variants": [
+                            {
+                                "hostname": "models-fips.lex.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "models-fips.lex.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "models-fips.lex.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "monitoring": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "monitoring.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "monitoring.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "monitoring.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "monitoring.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "monitoring.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "mq": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "mq-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "mq-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "mq-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "mq-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "neptune": {
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "hostname": "rds.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "rds.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "network-firewall": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "network-firewall-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "network-firewall-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "network-firewall-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "network-firewall-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "networkmanager": {
+                    "endpoints": {
+                        "aws-us-gov-global": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "networkmanager.us-gov-west-1.amazonaws.com"
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-us-gov-global"
+                },
+                "oidc": {
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "hostname": "oidc.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "oidc.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "organizations": {
+                    "endpoints": {
+                        "aws-us-gov-global": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "organizations.us-gov-west-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "organizations.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "fips-aws-us-gov-global": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "organizations.us-gov-west-1.amazonaws.com"
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-us-gov-global"
+                },
+                "outposts": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "outposts.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "outposts.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "outposts.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "outposts.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "participant.connect": {
+                    "endpoints": {
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "participant.connect.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "participant.connect.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "pi": {
+                    "endpoints": {
+                        "us-gov-east-1": {},
+                        "us-gov-west-1": {}
+                    }
+                },
+                "pinpoint": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "mobiletargeting"
+                        }
+                    },
+                    "endpoints": {
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "pinpoint-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "pinpoint.us-gov-west-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "pinpoint-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "polly": {
+                    "endpoints": {
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "polly-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "polly-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "portal.sso": {
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "hostname": "portal.sso.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "portal.sso.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "quicksight": {
+                    "endpoints": {
+                        "api": {},
+                        "us-gov-west-1": {}
+                    }
+                },
+                "ram": {
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "hostname": "ram.us-gov-east-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "ram.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ram.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "ram.us-gov-west-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "ram.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ram.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "rbin": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "rbin-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "rbin-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "rbin-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "rbin-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "rds": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "rds.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "rds.us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "rds.us-gov-east-1.amazonaws.com"
+                        },
+                        "rds.us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "rds.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "rds.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "rds.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "rds.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "rds.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "redshift": {
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "hostname": "redshift.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "redshift.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "rekognition": {
+                    "endpoints": {
+                        "rekognition-fips.us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "rekognition-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "rekognition.us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "rekognition-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "rekognition-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "rekognition-fips.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "resource-explorer-2": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "dnsSuffix": "api.aws",
+                                "hostname": "{service}-fips.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "hostname": "resource-explorer-2.us-gov-east-1.api.aws"
+                        },
+                        "us-gov-west-1": {
+                            "hostname": "resource-explorer-2.us-gov-west-1.api.aws"
+                        }
+                    }
+                },
+                "resource-groups": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "resource-groups.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "resource-groups.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "resource-groups.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "resource-groups.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "resource-groups.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "robomaker": {
+                    "endpoints": {
+                        "us-gov-west-1": {}
+                    }
+                },
+                "route53": {
+                    "endpoints": {
+                        "aws-us-gov-global": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "route53.us-gov.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "route53.us-gov.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "fips-aws-us-gov-global": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "route53.us-gov.amazonaws.com"
+                        }
+                    },
+                    "isRegionalized": false,
+                    "partitionEndpoint": "aws-us-gov-global"
+                },
+                "route53resolver": {
+                    "endpoints": {
+                        "us-gov-east-1": {},
+                        "us-gov-west-1": {}
+                    }
+                },
+                "runtime.lex": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "lex"
+                        },
+                        "variants": [
+                            {
+                                "hostname": "runtime-fips.lex.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "runtime-fips.lex.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "runtime-fips.lex.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "runtime.sagemaker": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "runtime.sagemaker.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "us-gov-east-1": {},
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "runtime.sagemaker.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "runtime.sagemaker.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "s3": {
+                    "defaults": {
+                        "signatureVersions": ["s3", "s3v4"],
+                        "variants": [
+                            {
+                                "dnsSuffix": "amazonaws.com",
+                                "hostname": "{service}-fips.dualstack.{region}.{dnsSuffix}",
+                                "tags": ["dualstack", "fips"]
+                            },
+                            {
+                                "dnsSuffix": "amazonaws.com",
+                                "hostname": "{service}.dualstack.{region}.{dnsSuffix}",
+                                "tags": ["dualstack"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "s3-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "s3-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "hostname": "s3.us-gov-east-1.amazonaws.com",
+                            "protocols": ["http", "https"],
+                            "variants": [
+                                {
+                                    "hostname": "s3-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "s3.dualstack.us-gov-east-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "hostname": "s3.us-gov-west-1.amazonaws.com",
+                            "protocols": ["http", "https"],
+                            "variants": [
+                                {
+                                    "hostname": "s3-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "s3.dualstack.us-gov-west-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "s3-control": {
+                    "defaults": {
+                        "protocols": ["https"],
+                        "signatureVersions": ["s3v4"],
+                        "variants": [
+                            {
+                                "dnsSuffix": "amazonaws.com",
+                                "hostname": "{service}-fips.dualstack.{region}.{dnsSuffix}",
+                                "tags": ["dualstack", "fips"]
+                            },
+                            {
+                                "dnsSuffix": "amazonaws.com",
+                                "hostname": "{service}.dualstack.{region}.{dnsSuffix}",
+                                "tags": ["dualstack"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "hostname": "s3-control.us-gov-east-1.amazonaws.com",
+                            "signatureVersions": ["s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3-control-fips.dualstack.us-gov-east-1.amazonaws.com",
+                                    "tags": ["dualstack", "fips"]
+                                },
+                                {
+                                    "hostname": "s3-control-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "s3-control.dualstack.us-gov-east-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "s3-control-fips.us-gov-east-1.amazonaws.com",
+                            "signatureVersions": ["s3v4"]
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "s3-control.us-gov-west-1.amazonaws.com",
+                            "signatureVersions": ["s3v4"],
+                            "variants": [
+                                {
+                                    "hostname": "s3-control-fips.dualstack.us-gov-west-1.amazonaws.com",
+                                    "tags": ["dualstack", "fips"]
+                                },
+                                {
+                                    "hostname": "s3-control-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "s3-control.dualstack.us-gov-west-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "s3-control-fips.us-gov-west-1.amazonaws.com",
+                            "signatureVersions": ["s3v4"]
+                        }
+                    }
+                },
+                "s3-outposts": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "deprecated": true
+                        },
+                        "fips-us-gov-west-1": {
+                            "deprecated": true
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "secretsmanager": {
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "secretsmanager-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "secretsmanager-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "secretsmanager-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "secretsmanager-fips.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "securityhub": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "securityhub-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "securityhub-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "securityhub-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "securityhub-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "serverlessrepo": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "protocols": ["https"],
+                            "variants": [
+                                {
+                                    "hostname": "serverlessrepo.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "serverlessrepo.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "protocols": ["https"],
+                            "variants": [
+                                {
+                                    "hostname": "serverlessrepo.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "serverlessrepo.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "servicecatalog": {
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicecatalog-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "servicecatalog-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicecatalog-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "servicecatalog-fips.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "servicecatalog-appregistry": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "servicecatalog-appregistry.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "us-gov-east-1": {},
+                        "us-gov-west-1": {}
+                    }
+                },
+                "servicediscovery": {
+                    "endpoints": {
+                        "servicediscovery": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "servicediscovery-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "servicediscovery-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "servicediscovery.us-gov-east-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "servicediscovery-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicediscovery-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                },
+                                {
+                                    "hostname": "servicediscovery.us-gov-west-1.amazonaws.com",
+                                    "tags": ["dualstack"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "servicediscovery-fips.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "servicequotas": {
+                    "defaults": {
+                        "protocols": ["https"],
+                        "variants": [
+                            {
+                                "hostname": "servicequotas.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "servicequotas.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "servicequotas.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicequotas.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "servicequotas.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "sms": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "sms-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "sms-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "sms-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "sms-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "sms-voice": {
+                    "endpoints": {
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "sms-voice-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "sms-voice-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "snowball": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "snowball-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "snowball-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "snowball-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "snowball-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "sns": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "sns.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "sns.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "sns.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "protocols": ["http", "https"],
+                            "variants": [
+                                {
+                                    "hostname": "sns.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "sqs": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "sqs.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "hostname": "sqs.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "sqs.us-gov-west-1.amazonaws.com",
+                            "protocols": ["http", "https"],
+                            "sslCommonName": "{region}.queue.{dnsSuffix}"
+                        }
+                    }
+                },
+                "ssm": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "ssm.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ssm.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "ssm.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ssm.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "ssm.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "sso": {
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "hostname": "sso.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "sso.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "states": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "states-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "states.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "states-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "states.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "storagegateway": {
+                    "endpoints": {
+                        "fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "storagegateway-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "storagegateway-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "storagegateway-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "storagegateway-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "storagegateway-fips.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "streams.dynamodb": {
+                    "defaults": {
+                        "credentialScope": {
+                            "service": "dynamodb"
+                        },
+                        "variants": [
+                            {
+                                "hostname": "streams.dynamodb.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "streams.dynamodb.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "streams.dynamodb.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "streams.dynamodb.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "streams.dynamodb.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "sts": {
+                    "defaults": {
+                        "variants": [
+                            {
+                                "hostname": "sts.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "sts.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "sts.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "sts.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "sts.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "support": {
+                    "endpoints": {
+                        "aws-us-gov-global": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "support.us-gov-west-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "support.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "variants": [
+                                {
+                                    "hostname": "support.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    },
+                    "partitionEndpoint": "aws-us-gov-global"
+                },
+                "swf": {
+                    "endpoints": {
+                        "us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "hostname": "swf.us-gov-east-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "swf.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-east-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "swf.us-gov-east-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "swf.us-gov-west-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "swf.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "swf.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "synthetics": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "synthetics-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "synthetics-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "synthetics-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "synthetics-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "tagging": {
+                    "endpoints": {
+                        "us-gov-east-1": {},
+                        "us-gov-west-1": {}
+                    }
+                },
+                "textract": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "textract-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "textract-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "textract-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "textract-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "transcribe": {
+                    "defaults": {
+                        "protocols": ["https"],
+                        "variants": [
+                            {
+                                "hostname": "fips.transcribe.{region}.{dnsSuffix}",
+                                "tags": ["fips"]
+                            }
+                        ]
+                    },
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fips.transcribe.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "fips.transcribe.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fips.transcribe.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "fips.transcribe.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "transcribestreaming": {
+                    "endpoints": {
+                        "us-gov-east-1": {},
+                        "us-gov-west-1": {}
+                    }
+                },
+                "transfer": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "transfer-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "transfer-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "transfer-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "transfer-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "translate": {
+                    "defaults": {
+                        "protocols": ["https"]
+                    },
+                    "endpoints": {
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "translate-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1-fips": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "translate-fips.us-gov-west-1.amazonaws.com"
+                        }
+                    }
+                },
+                "waf-regional": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "waf-regional-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "hostname": "waf-regional.us-gov-east-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "waf-regional.us-gov-west-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "waf-regional-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "wafv2": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "wafv2-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "hostname": "wafv2.us-gov-east-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "hostname": "wafv2.us-gov-west-1.amazonaws.com",
+                            "variants": [
+                                {
+                                    "hostname": "wafv2-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "wellarchitected": {
+                    "endpoints": {
+                        "us-gov-east-1": {},
+                        "us-gov-west-1": {}
+                    }
+                },
+                "workspaces": {
+                    "endpoints": {
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "workspaces-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "workspaces-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                },
+                "xray": {
+                    "endpoints": {
+                        "fips-us-gov-east-1": {
+                            "credentialScope": {
+                                "region": "us-gov-east-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "xray-fips.us-gov-east-1.amazonaws.com"
+                        },
+                        "fips-us-gov-west-1": {
+                            "credentialScope": {
+                                "region": "us-gov-west-1"
+                            },
+                            "deprecated": true,
+                            "hostname": "xray-fips.us-gov-west-1.amazonaws.com"
+                        },
+                        "us-gov-east-1": {
+                            "variants": [
+                                {
+                                    "hostname": "xray-fips.us-gov-east-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        },
+                        "us-gov-west-1": {
+                            "variants": [
+                                {
+                                    "hostname": "xray-fips.us-gov-west-1.amazonaws.com",
+                                    "tags": ["fips"]
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        }
+    ],
+    "version": 3
+}
diff --git a/packages/core/resources/icons/aws/amazonq/q-gradient.svg b/packages/core/resources/icons/aws/amazonq/q-gradient.svg
new file mode 100644
index 00000000000..84a7b4f4fe3
--- /dev/null
+++ b/packages/core/resources/icons/aws/amazonq/q-gradient.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 128 128">
+  <defs>
+    <linearGradient id="linear-gradient" x1="115.52" y1="-9.57" x2="18.86" y2="128.46" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#a7f8ff"/>
+      <stop offset=".03" stop-color="#9df1ff"/>
+      <stop offset=".08" stop-color="#84e1ff"/>
+      <stop offset=".15" stop-color="#5ac7ff"/>
+      <stop offset=".22" stop-color="#21a2ff"/>
+      <stop offset=".26" stop-color="#008dff"/>
+      <stop offset=".66" stop-color="#7f33ff"/>
+      <stop offset=".99" stop-color="#39127d"/>
+    </linearGradient>
+  </defs>
+  <path d="m54.17,2.63L15.77,24.8c-6.08,3.51-9.83,10-9.83,17.03v44.34c0,7.03,3.75,13.52,9.83,17.03l38.4,22.17c6.08,3.51,13.58,3.51,19.66,0l38.4-22.17c6.08-3.51,9.83-10,9.83-17.03v-44.34c0-7.02-3.75-13.52-9.83-17.03L73.83,2.63c-6.08-3.51-13.58-3.51-19.66,0Z" style="fill: url(#linear-gradient); stroke-width: 0px;"/>
+  <path d="m100.98,35.15l-30.49-17.6c-1.79-1.03-4.14-1.55-6.5-1.55s-4.71.52-6.5,1.55l-30.49,17.6c-3.57,2.06-6.5,7.13-6.5,11.25v35.2c0,4.13,2.92,9.19,6.5,11.25l30.49,17.6c1.79,1.03,4.14,1.55,6.5,1.55s4.71-.52,6.5-1.55l30.49-17.6c3.57-2.06,6.5-7.13,6.5-11.25v-35.2c0-4.13-2.92-9.19-6.5-11.25Zm-34.49,68.38c-.28.16-1.17.48-2.5.48s-2.21-.31-2.5-.48l-30.49-17.6c-1.1-.63-2.5-3.06-2.5-4.32v-35.2c0-1.27,1.4-3.69,2.5-4.32l30.49-17.6c.28-.16,1.17-.48,2.5-.48s2.21.31,2.5.48l30.49,17.6c1.1.63,2.5,3.06,2.5,4.32v33.47l-27.48-15.86v-3.29c0-.82-.44-1.58-1.15-2l-5.7-3.29c-.36-.21-.75-.31-1.15-.31s-.8.1-1.15.31l-5.7,3.29c-.71.41-1.15,1.17-1.15,2v6.58c0,.82.44,1.58,1.15,2l5.7,3.29c.36.21.75.31,1.15.31s.8-.1,1.15-.31l2.85-1.64,27.48,15.86-28.98,16.73Z" style="fill: #fff; stroke-width: 0px;"/>
+</svg>
\ No newline at end of file
diff --git a/packages/core/resources/icons/aws/amazonq/q-squid-ink.svg b/packages/core/resources/icons/aws/amazonq/q-squid-ink.svg
new file mode 100644
index 00000000000..33db91661a4
--- /dev/null
+++ b/packages/core/resources/icons/aws/amazonq/q-squid-ink.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
+  <path d="m113.31,25.53L72.66,2.06c-2.38-1.38-5.52-2.06-8.66-2.06s-6.28.69-8.66,2.06L14.69,25.53c-4.76,2.75-8.66,9.5-8.66,15v46.94c0,5.5,3.9,12.25,8.66,15l40.65,23.47c2.38,1.38,5.52,2.06,8.66,2.06s6.28-.69,8.66-2.06l40.65-23.47c4.76-2.75,8.66-9.5,8.66-15v-46.94c0-5.5-3.9-12.25-8.66-15Zm-45.65,91.75c-.47.27-1.76.72-3.66.72s-3.2-.45-3.66-.72l-40.65-23.47c-1.68-.97-3.66-4.41-3.66-6.34v-46.94c0-1.94,1.98-5.37,3.66-6.34L60.34,10.72c.47-.27,1.76-.72,3.66-.72s3.2.45,3.66.72l40.65,23.47c1.68.97,3.66,4.41,3.66,6.34v45.39l-37.97-21.92v-4.33c0-.89-.48-1.72-1.25-2.16l-7.5-4.33c-.39-.22-.82-.33-1.25-.33s-.86.11-1.25.33l-7.5,4.33c-.77.45-1.25,1.27-1.25,2.16v8.66c0,.89.48,1.72,1.25,2.16l7.5,4.33c.39.22.82.33,1.25.33s.86-.11,1.25-.33l3.75-2.17,37.97,21.92-39.31,22.69Z" style="fill: #232f3e; stroke-width: 0px;"/>
+</svg>
\ No newline at end of file
diff --git a/packages/core/resources/icons/aws/amazonq/q-white.svg b/packages/core/resources/icons/aws/amazonq/q-white.svg
new file mode 100644
index 00000000000..87ba2e2f738
--- /dev/null
+++ b/packages/core/resources/icons/aws/amazonq/q-white.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
+  <path d="m113.31,25.53L72.66,2.06c-2.38-1.38-5.52-2.06-8.66-2.06s-6.28.69-8.66,2.06L14.69,25.53c-4.76,2.75-8.66,9.5-8.66,15v46.94c0,5.5,3.9,12.25,8.66,15l40.65,23.47c2.38,1.38,5.52,2.06,8.66,2.06s6.28-.69,8.66-2.06l40.65-23.47c4.76-2.75,8.66-9.5,8.66-15v-46.94c0-5.5-3.9-12.25-8.66-15Zm-45.65,91.75c-.47.27-1.76.72-3.66.72s-3.2-.45-3.66-.72l-40.65-23.47c-1.68-.97-3.66-4.41-3.66-6.34v-46.94c0-1.94,1.98-5.37,3.66-6.34L60.34,10.72c.47-.27,1.76-.72,3.66-.72s3.2.45,3.66.72l40.65,23.47c1.68.97,3.66,4.41,3.66,6.34v45.39l-37.97-21.92v-4.33c0-.89-.48-1.72-1.25-2.16l-7.5-4.33c-.39-.22-.82-.33-1.25-.33s-.86.11-1.25.33l-7.5,4.33c-.77.45-1.25,1.27-1.25,2.16v8.66c0,.89.48,1.72,1.25,2.16l7.5,4.33c.39.22.82.33,1.25.33s.86-.11,1.25-.33l3.75-2.17,37.97,21.92-39.31,22.69Z" style="fill: #fff; stroke-width: 0px;"/>
+</svg>
\ No newline at end of file
diff --git a/packages/core/resources/icons/aws/amazonq/severity-critical.svg b/packages/core/resources/icons/aws/amazonq/severity-critical.svg
new file mode 100644
index 00000000000..7733994d24e
--- /dev/null
+++ b/packages/core/resources/icons/aws/amazonq/severity-critical.svg
@@ -0,0 +1,4 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="14" height="14" rx="3" fill="#7D2105"/>
+<path d="M7.12744 10.1626C5.29053 10.1626 4.15234 8.88818 4.15234 6.83154V6.82275C4.15234 4.76611 5.28613 3.49609 7.12744 3.49609C8.63037 3.49609 9.75537 4.4541 9.87842 5.79443V5.84717H8.58643V5.81641C8.4502 5.10449 7.8833 4.62109 7.12744 4.62109C6.12988 4.62109 5.51025 5.46045 5.51025 6.82275V6.83154C5.51025 8.19385 6.12988 9.0376 7.13184 9.0376C7.89209 9.0376 8.44141 8.59375 8.58203 7.91699L8.59082 7.88184H9.88281L9.87842 7.93018C9.74219 9.25732 8.65674 10.1626 7.12744 10.1626Z" fill="white"/>
+</svg>
diff --git a/packages/core/resources/icons/aws/amazonq/severity-high.svg b/packages/core/resources/icons/aws/amazonq/severity-high.svg
new file mode 100644
index 00000000000..ff92aebc817
--- /dev/null
+++ b/packages/core/resources/icons/aws/amazonq/severity-high.svg
@@ -0,0 +1,4 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="14" height="14" rx="3" fill="#BA2E0F"/>
+<path d="M4.24463 10V3.65869H5.57178V6.23389H8.42822V3.65869H9.75537V10H8.42822V7.32812H5.57178V10H4.24463Z" fill="white"/>
+</svg>
diff --git a/packages/core/resources/icons/aws/amazonq/severity-info.svg b/packages/core/resources/icons/aws/amazonq/severity-info.svg
new file mode 100644
index 00000000000..dbf78609170
--- /dev/null
+++ b/packages/core/resources/icons/aws/amazonq/severity-info.svg
@@ -0,0 +1,4 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="14" height="14" rx="3" fill="#3184C2"/>
+<path d="M6.33643 10V3.65869H7.66357V10H6.33643Z" fill="white"/>
+</svg>
diff --git a/packages/core/resources/icons/aws/amazonq/severity-low.svg b/packages/core/resources/icons/aws/amazonq/severity-low.svg
new file mode 100644
index 00000000000..4ca6d96961e
--- /dev/null
+++ b/packages/core/resources/icons/aws/amazonq/severity-low.svg
@@ -0,0 +1,4 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="14" height="14" rx="3" fill="#B2911C"/>
+<path d="M5.09277 10V3.65869H6.41992V8.90576H9.24121V10H5.09277Z" fill="white"/>
+</svg>
diff --git a/packages/core/resources/icons/aws/amazonq/severity-medium.svg b/packages/core/resources/icons/aws/amazonq/severity-medium.svg
new file mode 100644
index 00000000000..a906d9b4873
--- /dev/null
+++ b/packages/core/resources/icons/aws/amazonq/severity-medium.svg
@@ -0,0 +1,4 @@
+<svg width="14" height="15" viewBox="0 0 14 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect y="0.5" width="14" height="14" rx="3" fill="#E37933"/>
+<path d="M3.68652 10.5V4.15869H5.20703L6.96045 8.79932H7.03955L8.78857 4.15869H10.3091V10.5H9.12695V6.18457H9.03906L7.41309 10.5H6.58252L4.95654 6.18457H4.86865V10.5H3.68652Z" fill="white"/>
+</svg>
diff --git a/packages/core/resources/icons/aws/amazonq/transform-arrow-dark.svg b/packages/core/resources/icons/aws/amazonq/transform-arrow-dark.svg
new file mode 100644
index 00000000000..2bd8779b4f0
--- /dev/null
+++ b/packages/core/resources/icons/aws/amazonq/transform-arrow-dark.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="10px" height="16px" viewBox="0 0 10 16" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(94.509804%,94.509804%,94.509804%);fill-opacity:1;" d="M 5 0 L 10 6.273438 L 10 8 L 6 4 L 6 16 L 4 16 L 4 4 L 0 8 L 0 6.273438 Z M 5 0 "/>
+</g>
+</svg>
diff --git a/packages/core/resources/icons/aws/amazonq/transform-arrow-light.svg b/packages/core/resources/icons/aws/amazonq/transform-arrow-light.svg
new file mode 100644
index 00000000000..2b186c9b1e5
--- /dev/null
+++ b/packages/core/resources/icons/aws/amazonq/transform-arrow-light.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="10px" height="16px" viewBox="0 0 10 16" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:evenodd;fill:rgb(19.215686%,19.215686%,19.215686%);fill-opacity:1;" d="M 5 0 L 10 6.273438 L 10 8 L 6 4 L 6 16 L 4 16 L 4 4 L 0 8 L 0 6.273438 Z M 5 0 "/>
+</g>
+</svg>
diff --git a/packages/core/resources/icons/aws/amazonq/transform-default-dark.svg b/packages/core/resources/icons/aws/amazonq/transform-default-dark.svg
new file mode 100644
index 00000000000..341d7f0d635
--- /dev/null
+++ b/packages/core/resources/icons/aws/amazonq/transform-default-dark.svg
@@ -0,0 +1,4 @@
+<!-- Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 13L11 8L6 3" stroke="#AFB1B3" stroke-width="2"/>
+</svg>
diff --git a/packages/core/resources/icons/aws/amazonq/transform-default-light.svg b/packages/core/resources/icons/aws/amazonq/transform-default-light.svg
new file mode 100644
index 00000000000..1f867ecb86d
--- /dev/null
+++ b/packages/core/resources/icons/aws/amazonq/transform-default-light.svg
@@ -0,0 +1,4 @@
+<!-- Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 13L11 8L6 3" stroke="#6E6E6E" stroke-width="2"/>
+</svg>
diff --git a/packages/core/resources/icons/aws/amazonq/transform-dependencies-dark.svg b/packages/core/resources/icons/aws/amazonq/transform-dependencies-dark.svg
new file mode 100644
index 00000000000..74ec8c4d31f
--- /dev/null
+++ b/packages/core/resources/icons/aws/amazonq/transform-dependencies-dark.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M8.21952 1.89779L13.831 4.63988C14.205 4.82262 14.205 5.3556 13.831 5.53834L8.21952 8.28043C8.081 8.34812 7.919 8.34812 7.78048 8.28043L2.169 5.53834C1.79503 5.3556 1.79503 4.82262 2.16901 4.63988L7.78048 1.89779C7.919 1.8301 8.081 1.8301 8.21952 1.89779Z" stroke="#CED0D6"/>
+    <path d="M14.2755 8.31631L8.43692 11.1524C8.16105 11.2864 7.83895 11.2864 7.56308 11.1524L1.72447 8.31631" stroke="#CED0D6" stroke-linecap="round"/>
+    <path d="M14.2755 11.5436L8.43692 14.3797C8.16105 14.5137 7.83895 14.5137 7.56308 14.3797L1.72447 11.5436" stroke="#CED0D6" stroke-linecap="round"/>
+</svg>
diff --git a/packages/core/resources/icons/aws/amazonq/transform-dependencies-light.svg b/packages/core/resources/icons/aws/amazonq/transform-dependencies-light.svg
new file mode 100644
index 00000000000..a817deef0e0
--- /dev/null
+++ b/packages/core/resources/icons/aws/amazonq/transform-dependencies-light.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.21952 1.89779L13.831 4.63988C14.205 4.82262 14.205 5.3556 13.831 5.53834L8.21952 8.28043C8.081 8.34812 7.919 8.34812 7.78048 8.28043L2.169 5.53834C1.79503 5.3556 1.79503 4.82262 2.16901 4.63988L7.78048 1.89779C7.919 1.8301 8.081 1.8301 8.21952 1.89779Z" stroke="#6C707E"/>
+<path d="M14.2755 8.31631L8.43692 11.1524C8.16105 11.2864 7.83895 11.2864 7.56308 11.1524L1.72447 8.31631" stroke="#6C707E" stroke-linecap="round"/>
+<path d="M14.2755 11.5436L8.43692 14.3797C8.16105 14.5137 7.83895 14.5137 7.56308 14.3797L1.72447 11.5436" stroke="#6C707E" stroke-linecap="round"/>
+</svg>
diff --git a/packages/core/resources/icons/aws/amazonq/transform-file-dark.svg b/packages/core/resources/icons/aws/amazonq/transform-file-dark.svg
new file mode 100644
index 00000000000..6dc7dda9158
--- /dev/null
+++ b/packages/core/resources/icons/aws/amazonq/transform-file-dark.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.5 5.91421C3.5 5.649 3.60536 5.39464 3.79289 5.20711L7.20711 1.79289C7.39464 1.60536 7.649 1.5 7.91421 1.5H11.5C12.0523 1.5 12.5 1.94772 12.5 2.5C12.5 8.09791 12.5 8.62014 12.5 13.4992C12.5 14.0514 12.0523 14.5 11.5 14.5H4.5C3.94772 14.5 3.5 14.0523 3.5 13.5V5.91421Z" fill="#43454A"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.91421 1C7.51639 1 7.13486 1.15803 6.85355 1.43934L3.43934 4.85355C3.15804 5.13486 3 5.51639 3 5.91421V13.5C3 14.3284 3.67157 15 4.5 15H11C12.1046 15 13 14.1046 13 13V2.5C13 1.67157 12.3284 1 11.5 1H7.91421ZM12 2.5C12 2.22386 11.7761 2 11.5 2H8V4.5C8 5.32843 7.32843 6 6.5 6H4V13.5C4 13.7761 4.22386 14 4.5 14H11C11.5523 14 12 13.5523 12 13V2.5ZM7 2.70711L4.70711 5H6.5C6.77614 5 7 4.77614 7 4.5V2.70711Z" fill="#CED0D6"/>
+</svg>
diff --git a/packages/core/resources/icons/aws/amazonq/transform-file-light.svg b/packages/core/resources/icons/aws/amazonq/transform-file-light.svg
new file mode 100644
index 00000000000..31c0e32e66a
--- /dev/null
+++ b/packages/core/resources/icons/aws/amazonq/transform-file-light.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.5 5.91421C3.5 5.649 3.60536 5.39464 3.79289 5.20711L7.20711 1.79289C7.39464 1.60536 7.649 1.5 7.91421 1.5H11.5C12.0523 1.5 12.5 1.94772 12.5 2.5C12.5 8.09791 12.5 8.62014 12.5 13.4992C12.5 14.0514 12.0523 14.5 11.5 14.5H4.5C3.94772 14.5 3.5 14.0523 3.5 13.5V5.91421Z" fill="#EBECF0"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.91421 1C7.51639 1 7.13486 1.15803 6.85355 1.43934L3.43934 4.85355C3.15804 5.13486 3 5.51639 3 5.91421V13.5C3 14.3284 3.67157 15 4.5 15H11C12.1046 15 13 14.1046 13 13V2.5C13 1.67157 12.3284 1 11.5 1H7.91421ZM12 2.5C12 2.22386 11.7761 2 11.5 2H8V4.5C8 5.32843 7.32843 6 6.5 6H4V13.5C4 13.7761 4.22386 14 4.5 14H11C11.5523 14 12 13.5523 12 13V2.5ZM7 2.70711L4.70711 5H6.5C6.77614 5 7 4.77614 7 4.5V2.70711Z" fill="#6C707E"/>
+</svg>
diff --git a/packages/core/resources/icons/aws/amazonq/transform-logo.svg b/packages/core/resources/icons/aws/amazonq/transform-logo.svg
new file mode 100644
index 00000000000..51f68cf5f53
--- /dev/null
+++ b/packages/core/resources/icons/aws/amazonq/transform-logo.svg
@@ -0,0 +1,16 @@
+<svg width="59" height="64" viewBox="0 0 59 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M24.4576 1.32L5.2676 12.4C2.2176 14.16 0.347595 17.4 0.347595 20.92V43.09C0.347595 46.6 2.2176 49.85 5.2676 51.6L24.4676 62.68C27.5076 64.44 31.2576 64.44 34.2976 62.68L53.4976 51.6C56.5376 49.84 58.4176 46.6 58.4176 43.09V20.92C58.4176 17.41 56.5476 14.16 53.4976 12.41L34.2976 1.32C31.2576 -0.44 27.5076 -0.44 24.4676 1.32H24.4576Z" fill="url(#paint0_linear_775_214)"/>
+<path d="M48.9076 18.67L31.1476 8.42C30.6576 8.14 30.0176 8 29.3676 8C28.7176 8 28.0776 8.14 27.5876 8.42L9.82759 18.67C8.84759 19.23 8.04759 20.62 8.04759 21.75V42.25C8.04759 43.38 8.84759 44.76 9.82759 45.33L27.5876 55.58C28.0776 55.86 28.7176 56 29.3676 56C30.0176 56 30.6576 55.86 31.1476 55.58L48.9076 45.33C49.8876 44.77 50.6876 43.38 50.6876 42.25V21.75C50.6876 20.62 49.8876 19.24 48.9076 18.67ZM29.3776 51.98L12.0676 41.99V22.01L29.3776 12.02L46.6876 22.01V39.68L33.3776 32V30.11C33.3776 29.85 33.2376 29.62 33.0176 29.49L29.7376 27.6C29.6276 27.54 29.4976 27.5 29.3776 27.5C29.2576 27.5 29.1276 27.53 29.0176 27.6L25.7376 29.49C25.5176 29.62 25.3776 29.86 25.3776 30.11V33.9C25.3776 34.16 25.5176 34.39 25.7376 34.52L29.0176 36.41C29.1276 36.47 29.2576 36.51 29.3776 36.51C29.4976 36.51 29.6276 36.48 29.7376 36.41L31.3776 35.46L44.6876 43.14L29.3776 51.98Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_775_214" x1="55.1376" y1="-4.79" x2="6.80759" y2="64.23" gradientUnits="userSpaceOnUse">
+<stop stop-color="#A7F8FF"/>
+<stop offset="0.03" stop-color="#9DF1FF"/>
+<stop offset="0.08" stop-color="#84E1FF"/>
+<stop offset="0.15" stop-color="#5AC7FF"/>
+<stop offset="0.22" stop-color="#21A2FF"/>
+<stop offset="0.26" stop-color="#008DFF"/>
+<stop offset="0.66" stop-color="#7F33FF"/>
+<stop offset="0.99" stop-color="#39127D"/>
+</linearGradient>
+</defs>
+</svg>
\ No newline at end of file
diff --git a/packages/core/resources/icons/aws/amazonq/transform-step-into-dark.svg b/packages/core/resources/icons/aws/amazonq/transform-step-into-dark.svg
new file mode 100644
index 00000000000..07fd10768ca
--- /dev/null
+++ b/packages/core/resources/icons/aws/amazonq/transform-step-into-dark.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <rect x="9" y="12" width="6" height="1" rx="0.5" fill="#CED0D6"/>
+    <rect x="9" y="9" width="6" height="1" rx="0.5" fill="#CED0D6"/>
+    <rect x="9" y="6" width="6" height="1" rx="0.5" fill="#CED0D6"/>
+    <rect x="9" y="3" width="6" height="1" rx="0.5" fill="#CED0D6"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M5.65355 5.64645C5.45829 5.45118 5.14171 5.45118 4.94645 5.64645C4.75118 5.84171 4.75118 6.15829 4.94645 6.35355L6.09289 7.5L1.5 7.5C1.22386 7.5 1 7.72386 1 8C1 8.27614 1.22386 8.5 1.5 8.5L6.09289 8.5L4.94645 9.64645C4.75118 9.84171 4.75118 10.1583 4.94645 10.3536C5.14171 10.5488 5.45829 10.5488 5.65355 10.3536L7.65355 8.35355L8.00711 8L7.65355 7.64645L5.65355 5.64645Z" fill="#CED0D6"/>
+</svg>
diff --git a/packages/core/resources/icons/aws/amazonq/transform-step-into-light.svg b/packages/core/resources/icons/aws/amazonq/transform-step-into-light.svg
new file mode 100644
index 00000000000..e9e5c79d875
--- /dev/null
+++ b/packages/core/resources/icons/aws/amazonq/transform-step-into-light.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <rect x="9" y="12" width="6" height="1" rx="0.5" fill="#6C707E"/>
+    <rect x="9" y="9" width="6" height="1" rx="0.5" fill="#6C707E"/>
+    <rect x="9" y="6" width="6" height="1" rx="0.5" fill="#6C707E"/>
+    <rect x="9" y="3" width="6" height="1" rx="0.5" fill="#6C707E"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M5.65355 5.64645C5.45829 5.45118 5.14171 5.45118 4.94645 5.64645C4.75118 5.84171 4.75118 6.15829 4.94645 6.35355L6.09289 7.5L1.5 7.5C1.22386 7.5 1 7.72386 1 8C1 8.27614 1.22386 8.5 1.5 8.5L6.09289 8.5L4.94645 9.64645C4.75118 9.84171 4.75118 10.1583 4.94645 10.3536C5.14171 10.5488 5.45829 10.5488 5.65355 10.3536L7.65355 8.35355L8.00711 8L7.65355 7.64645L5.65355 5.64645Z" fill="#6C707E"/>
+</svg>
diff --git a/packages/core/resources/icons/aws/amazonq/transform-variables-dark.svg b/packages/core/resources/icons/aws/amazonq/transform-variables-dark.svg
new file mode 100644
index 00000000000..27f5ed19836
--- /dev/null
+++ b/packages/core/resources/icons/aws/amazonq/transform-variables-dark.svg
@@ -0,0 +1,7 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="2.5" y="1.5" width="11" height="13" rx="1.5" stroke="#868A91"/>
+<rect x="5" y="5" width="6" height="1" rx="0.5" fill="#868A91"/>
+<rect x="5" y="7.5" width="6" height="1" rx="0.5" fill="#868A91"/>
+<rect x="5" y="10" width="6" height="1" rx="0.5" fill="#868A91"/>
+</svg>
diff --git a/packages/core/resources/icons/aws/amazonq/transform-variables-light.svg b/packages/core/resources/icons/aws/amazonq/transform-variables-light.svg
new file mode 100644
index 00000000000..f36d366d2db
--- /dev/null
+++ b/packages/core/resources/icons/aws/amazonq/transform-variables-light.svg
@@ -0,0 +1,7 @@
+<!-- Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="2.5" y="1.5" width="11" height="13" rx="1.5" stroke="#A8ADBD"/>
+<rect x="5" y="5" width="6" height="1" rx="0.5" fill="#A8ADBD"/>
+<rect x="5" y="7.5" width="6" height="1" rx="0.5" fill="#A8ADBD"/>
+<rect x="5" y="10" width="6" height="1" rx="0.5" fill="#A8ADBD"/>
+</svg>
diff --git a/packages/core/resources/icons/aws/applicationcomposer/icon-dark.svg b/packages/core/resources/icons/aws/applicationcomposer/icon-dark.svg
new file mode 100644
index 00000000000..c631f327ae0
--- /dev/null
+++ b/packages/core/resources/icons/aws/applicationcomposer/icon-dark.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon-Service/16/AWS-Application-Composer_16_White</title>
+    <g id="Icon-Service/16/AWS-Application-Composer_16" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M14,14.5 C13.448,14.5 13,14.051 13,13.5 C13,12.949 13.448,12.5 14,12.5 C14.552,12.5 15,12.949 15,13.5 C15,14.051 14.552,14.5 14,14.5 M8.707,14.207 C8.316,14.597 7.684,14.597 7.293,14.207 C7.104,14.018 7,13.767 7,13.5 C7,13.233 7.104,12.982 7.293,12.793 C7.488,12.598 7.744,12.5 8,12.5 C8.256,12.5 8.512,12.598 8.707,12.793 C8.896,12.982 9,13.233 9,13.5 C9,13.767 8.896,14.018 8.707,14.207 M1.293,8.707 C1.104,8.518 1,8.267 1,8 C1,7.733 1.104,7.482 1.293,7.293 C1.488,7.098 1.744,7 2,7 C2.256,7 2.512,7.098 2.707,7.293 C2.896,7.482 3,7.733 3,8 C3,8.267 2.896,8.518 2.707,8.707 C2.316,9.097 1.684,9.097 1.293,8.707 M7.293,1.793 C7.488,1.598 7.744,1.5 8,1.5 C8.256,1.5 8.512,1.598 8.707,1.793 C8.896,1.982 9,2.233 9,2.5 C9,2.767 8.896,3.018 8.707,3.207 C8.316,3.597 7.684,3.597 7.293,3.207 C7.104,3.018 7,2.767 7,2.5 C7,2.233 7.104,1.982 7.293,1.793 M14,1.5 C14.552,1.5 15,1.949 15,2.5 C15,3.051 14.552,3.5 14,3.5 C13.448,3.5 13,3.051 13,2.5 C13,1.949 13.448,1.5 14,1.5 M14,11.5 C13.071,11.5 12.295,12.14 12.071,13 L9.929,13 C9.841,12.658 9.67,12.342 9.414,12.086 C8.736,11.407 7.686,11.32 6.911,11.823 L3.759,8.934 C3.911,8.648 4,8.333 4,8 C4,7.667 3.911,7.352 3.759,7.066 L6.911,4.176 C7.241,4.391 7.621,4.499 8,4.499 C8.512,4.499 9.024,4.304 9.414,3.914 C9.67,3.658 9.841,3.342 9.929,3 L12.071,3 C12.295,3.86 13.071,4.5 14,4.5 C15.103,4.5 16,3.603 16,2.5 C16,1.397 15.103,0.5 14,0.5 C13.071,0.5 12.295,1.14 12.071,2 L9.929,2 C9.841,1.658 9.67,1.342 9.414,1.086 C8.635,0.306 7.365,0.306 6.586,1.086 C6.208,1.463 6,1.966 6,2.5 C6,2.833 6.089,3.148 6.241,3.434 L3.089,6.323 C2.314,5.82 1.264,5.907 0.586,6.586 C0.208,6.963 0,7.466 0,8 C0,8.534 0.208,9.037 0.586,9.414 C0.976,9.804 1.488,9.999 2,9.999 C2.379,9.999 2.759,9.891 3.089,9.676 L6.241,12.566 C6.089,12.852 6,13.167 6,13.5 C6,14.034 6.208,14.537 6.586,14.914 C6.976,15.304 7.488,15.499 8,15.499 C8.512,15.499 9.024,15.304 9.414,14.914 C9.67,14.658 9.841,14.342 9.929,14 L12.071,14 C12.295,14.86 13.071,15.5 14,15.5 C15.103,15.5 16,14.603 16,13.5 C16,12.397 15.103,11.5 14,11.5 M2,14 C1.725,14 1.5,13.776 1.5,13.5 C1.5,13.224 1.725,13 2,13 C2.275,13 2.5,13.224 2.5,13.5 C2.5,13.776 2.275,14 2,14 M2,12 C1.173,12 0.5,12.673 0.5,13.5 C0.5,14.327 1.173,15 2,15 C2.827,15 3.5,14.327 3.5,13.5 C3.5,12.673 2.827,12 2,12 M14,8.5 C13.725,8.5 13.5,8.276 13.5,8 C13.5,7.724 13.725,7.5 14,7.5 C14.275,7.5 14.5,7.724 14.5,8 C14.5,8.276 14.275,8.5 14,8.5 M14,6.5 C13.173,6.5 12.5,7.173 12.5,8 C12.5,8.827 13.173,9.5 14,9.5 C14.827,9.5 15.5,8.827 15.5,8 C15.5,7.173 14.827,6.5 14,6.5 M8,8.5 C7.725,8.5 7.5,8.276 7.5,8 C7.5,7.724 7.725,7.5 8,7.5 C8.275,7.5 8.5,7.724 8.5,8 C8.5,8.276 8.275,8.5 8,8.5 M8,6.5 C7.173,6.5 6.5,7.173 6.5,8 C6.5,8.827 7.173,9.5 8,9.5 C8.827,9.5 9.5,8.827 9.5,8 C9.5,7.173 8.827,6.5 8,6.5 M2,2 C2.275,2 2.5,2.224 2.5,2.5 C2.5,2.776 2.275,3 2,3 C1.725,3 1.5,2.776 1.5,2.5 C1.5,2.224 1.725,2 2,2 M2,4 C2.827,4 3.5,3.327 3.5,2.5 C3.5,1.673 2.827,1 2,1 C1.173,1 0.5,1.673 0.5,2.5 C0.5,3.327 1.173,4 2,4" id="Fill-7" fill="#FFFFFF"></path>
+    </g>
+</svg>
diff --git a/packages/core/resources/icons/aws/applicationcomposer/icon.svg b/packages/core/resources/icons/aws/applicationcomposer/icon.svg
new file mode 100644
index 00000000000..65580136ce7
--- /dev/null
+++ b/packages/core/resources/icons/aws/applicationcomposer/icon.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon-Service/16/AWS-Application-Composer_16</title>
+    <g id="Icon-Service/16/AWS-Application-Composer_16" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M14,14.5 C13.448,14.5 13,14.051 13,13.5 C13,12.949 13.448,12.5 14,12.5 C14.552,12.5 15,12.949 15,13.5 C15,14.051 14.552,14.5 14,14.5 M8.707,14.207 C8.316,14.597 7.684,14.597 7.293,14.207 C7.104,14.018 7,13.767 7,13.5 C7,13.233 7.104,12.982 7.293,12.793 C7.488,12.598 7.744,12.5 8,12.5 C8.256,12.5 8.512,12.598 8.707,12.793 C8.896,12.982 9,13.233 9,13.5 C9,13.767 8.896,14.018 8.707,14.207 M1.293,8.707 C1.104,8.518 1,8.267 1,8 C1,7.733 1.104,7.482 1.293,7.293 C1.488,7.098 1.744,7 2,7 C2.256,7 2.512,7.098 2.707,7.293 C2.896,7.482 3,7.733 3,8 C3,8.267 2.896,8.518 2.707,8.707 C2.316,9.097 1.684,9.097 1.293,8.707 M7.293,1.793 C7.488,1.598 7.744,1.5 8,1.5 C8.256,1.5 8.512,1.598 8.707,1.793 C8.896,1.982 9,2.233 9,2.5 C9,2.767 8.896,3.018 8.707,3.207 C8.316,3.597 7.684,3.597 7.293,3.207 C7.104,3.018 7,2.767 7,2.5 C7,2.233 7.104,1.982 7.293,1.793 M14,1.5 C14.552,1.5 15,1.949 15,2.5 C15,3.051 14.552,3.5 14,3.5 C13.448,3.5 13,3.051 13,2.5 C13,1.949 13.448,1.5 14,1.5 M14,11.5 C13.071,11.5 12.295,12.14 12.071,13 L9.929,13 C9.841,12.658 9.67,12.342 9.414,12.086 C8.736,11.407 7.686,11.32 6.911,11.823 L3.759,8.934 C3.911,8.648 4,8.333 4,8 C4,7.667 3.911,7.352 3.759,7.066 L6.911,4.176 C7.241,4.391 7.621,4.499 8,4.499 C8.512,4.499 9.024,4.304 9.414,3.914 C9.67,3.658 9.841,3.342 9.929,3 L12.071,3 C12.295,3.86 13.071,4.5 14,4.5 C15.103,4.5 16,3.603 16,2.5 C16,1.397 15.103,0.5 14,0.5 C13.071,0.5 12.295,1.14 12.071,2 L9.929,2 C9.841,1.658 9.67,1.342 9.414,1.086 C8.635,0.306 7.365,0.306 6.586,1.086 C6.208,1.463 6,1.966 6,2.5 C6,2.833 6.089,3.148 6.241,3.434 L3.089,6.323 C2.314,5.82 1.264,5.907 0.586,6.586 C0.208,6.963 0,7.466 0,8 C0,8.534 0.208,9.037 0.586,9.414 C0.976,9.804 1.488,9.999 2,9.999 C2.379,9.999 2.759,9.891 3.089,9.676 L6.241,12.566 C6.089,12.852 6,13.167 6,13.5 C6,14.034 6.208,14.537 6.586,14.914 C6.976,15.304 7.488,15.499 8,15.499 C8.512,15.499 9.024,15.304 9.414,14.914 C9.67,14.658 9.841,14.342 9.929,14 L12.071,14 C12.295,14.86 13.071,15.5 14,15.5 C15.103,15.5 16,14.603 16,13.5 C16,12.397 15.103,11.5 14,11.5 M2,14 C1.725,14 1.5,13.776 1.5,13.5 C1.5,13.224 1.725,13 2,13 C2.275,13 2.5,13.224 2.5,13.5 C2.5,13.776 2.275,14 2,14 M2,12 C1.173,12 0.5,12.673 0.5,13.5 C0.5,14.327 1.173,15 2,15 C2.827,15 3.5,14.327 3.5,13.5 C3.5,12.673 2.827,12 2,12 M14,8.5 C13.725,8.5 13.5,8.276 13.5,8 C13.5,7.724 13.725,7.5 14,7.5 C14.275,7.5 14.5,7.724 14.5,8 C14.5,8.276 14.275,8.5 14,8.5 M14,6.5 C13.173,6.5 12.5,7.173 12.5,8 C12.5,8.827 13.173,9.5 14,9.5 C14.827,9.5 15.5,8.827 15.5,8 C15.5,7.173 14.827,6.5 14,6.5 M8,8.5 C7.725,8.5 7.5,8.276 7.5,8 C7.5,7.724 7.725,7.5 8,7.5 C8.275,7.5 8.5,7.724 8.5,8 C8.5,8.276 8.275,8.5 8,8.5 M8,6.5 C7.173,6.5 6.5,7.173 6.5,8 C6.5,8.827 7.173,9.5 8,9.5 C8.827,9.5 9.5,8.827 9.5,8 C9.5,7.173 8.827,6.5 8,6.5 M2,2 C2.275,2 2.5,2.224 2.5,2.5 C2.5,2.776 2.275,3 2,3 C1.725,3 1.5,2.776 1.5,2.5 C1.5,2.224 1.725,2 2,2 M2,4 C2.827,4 3.5,3.327 3.5,2.5 C3.5,1.673 2.827,1 2,1 C1.173,1 0.5,1.673 0.5,2.5 C0.5,3.327 1.173,4 2,4" id="Fill-7" fill="#000000"></path>
+    </g>
+</svg>
diff --git a/resources/icons/aws/apprunner/service.svg b/packages/core/resources/icons/aws/apprunner/service.svg
similarity index 100%
rename from resources/icons/aws/apprunner/service.svg
rename to packages/core/resources/icons/aws/apprunner/service.svg
diff --git a/resources/icons/aws/cdk/logo.svg b/packages/core/resources/icons/aws/cdk/logo.svg
similarity index 100%
rename from resources/icons/aws/cdk/logo.svg
rename to packages/core/resources/icons/aws/cdk/logo.svg
diff --git a/resources/icons/aws/cloudformation/stack.svg b/packages/core/resources/icons/aws/cloudformation/stack.svg
similarity index 100%
rename from resources/icons/aws/cloudformation/stack.svg
rename to packages/core/resources/icons/aws/cloudformation/stack.svg
diff --git a/resources/icons/aws/cloudwatch/log-group.svg b/packages/core/resources/icons/aws/cloudwatch/log-group.svg
similarity index 100%
rename from resources/icons/aws/cloudwatch/log-group.svg
rename to packages/core/resources/icons/aws/cloudwatch/log-group.svg
diff --git a/resources/icons/aws/codecatalyst/logo.svg b/packages/core/resources/icons/aws/codecatalyst/logo.svg
similarity index 100%
rename from resources/icons/aws/codecatalyst/logo.svg
rename to packages/core/resources/icons/aws/codecatalyst/logo.svg
diff --git a/packages/core/resources/icons/aws/codewhisperer/icon-black.svg b/packages/core/resources/icons/aws/codewhisperer/icon-black.svg
new file mode 100644
index 00000000000..3e5fa00548d
--- /dev/null
+++ b/packages/core/resources/icons/aws/codewhisperer/icon-black.svg
@@ -0,0 +1,15 @@
+<svg width="62" height="62" viewBox="0 0 62 62" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_993_7526)">
+<mask id="mask0_993_7526" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="62" height="62">
+<path d="M62 0H0V62H62V0Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_993_7526)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.887 33.4227L33.9531 34.1391L29.3889 47.2958L27.3228 46.5794L31.887 33.4227ZM25.5269 36.8603L22.1669 40.2488L25.4602 43.6306L23.8917 45.1575L19.8503 41.0056C19.4347 40.578 19.438 39.8955 19.858 39.4722L23.9738 35.3203L25.5269 36.8603ZM41.7789 39.4722C42.1989 39.8955 42.2022 40.578 41.7866 41.0056L37.743 45.1575L36.1756 43.6306L39.4689 40.2488L36.11 36.8603L37.6631 35.3203L41.7789 39.4722ZM49.6277 43.9227L45.8564 45.8072C45.4867 45.9931 45.2527 46.3716 45.2527 46.7861V53.3027L36.3736 58.767L32.1277 56.3422V50.6875H29.9402V56.3422L25.6942 58.767L16.8152 53.3027V46.785C16.8152 46.3705 16.5811 45.992 16.2103 45.8072L12.4402 43.9216L12.4391 39.6625L12.4402 34.8828L16.3842 31.8772C16.6555 31.6705 16.8152 31.3489 16.8152 31.0077V24.9308L24.9461 20.1883L29.9402 22.9762V29.9062H32.1277V22.9762L37.1206 20.1883L45.2527 24.9308V31.0077C45.2527 31.3489 45.4112 31.6705 45.6825 31.8772L49.6277 34.8817L49.6288 39.6625L49.6277 43.9227ZM51.3842 33.4708L47.4402 30.4652V24.303C47.4402 23.9147 47.2334 23.5548 46.8977 23.358L37.6839 17.9844C37.3492 17.7886 36.9358 17.7853 36.6 17.9734L31.0339 21.0819L25.4678 17.9734C25.1298 17.7864 24.7175 17.7886 24.3839 17.9844L15.1702 23.358C14.8333 23.5548 14.6277 23.9147 14.6277 24.303V30.4662L10.6825 33.4708C10.4113 33.6775 10.2527 34.0002 10.2527 34.3414L10.2516 39.6625L10.2527 44.5975C10.2527 45.012 10.4867 45.3905 10.8564 45.5764L14.6277 47.4609V53.9141C14.6277 54.2936 14.8234 54.6458 15.1472 54.8448L25.1003 60.9709C25.4405 61.1788 25.867 61.1864 26.2159 60.9884L31.0339 58.2366L35.8508 60.9884C36.0192 61.0847 36.2062 61.1328 36.3933 61.1328C36.5923 61.1328 36.7903 61.0781 36.9675 60.9709L46.9195 54.8448C47.2433 54.6458 47.4402 54.2936 47.4402 53.9141V47.462L51.2103 45.5764C51.5811 45.3916 51.8152 45.0131 51.8152 44.5986L51.8163 39.6625L51.8152 34.3403C51.8152 33.9991 51.6555 33.6775 51.3842 33.4708ZM20.0964 6.39062C20.0964 7.29625 19.3614 8.03125 18.4558 8.03125C17.5491 8.03125 16.8152 7.29625 16.8152 6.39062C16.8152 5.48391 17.5491 4.75 18.4558 4.75C19.3614 4.75 20.0964 5.48391 20.0964 6.39062ZM14.6277 6.39062C14.6277 7.29625 13.8927 8.03125 12.987 8.03125C12.0803 8.03125 11.3464 7.29625 11.3464 6.39062C11.3464 5.48391 12.0803 4.75 12.987 4.75C13.8927 4.75 14.6277 5.48391 14.6277 6.39062ZM9.15891 6.39062C9.15891 7.29625 8.42391 8.03125 7.51828 8.03125C6.61156 8.03125 5.87766 7.29625 5.87766 6.39062C5.87766 5.48391 6.61156 4.75 7.51828 4.75C8.42391 4.75 9.15891 5.48391 9.15891 6.39062ZM2.59641 10.2188L2.60188 2.66422C2.60188 2.61609 2.65875 2.5625 2.73969 2.5625H59.3336C59.4145 2.5625 59.4714 2.61609 59.4714 2.66422V10.2188H2.59641ZM59.3336 0.375H2.73422C1.45453 0.375 0.411095 1.40094 0.408908 2.66203L0.375001 42.9262C0.373908 44.1819 1.41078 45.21 2.69375 45.2188L6.97141 45.2166V43.0312L2.73203 43.0323C2.65219 43.0323 2.59641 42.9788 2.59641 42.9306L2.62156 12.4062H59.4714V42.9186C59.4714 42.9787 59.408 43.0302 59.3336 43.0302L55.0964 43.0312V45.2188L59.3336 45.2177C60.6155 45.2177 61.6589 44.1862 61.6589 42.9186V2.66422C61.6589 1.40203 60.6155 0.375 59.3336 0.375Z" fill="black"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_993_7526">
+<rect width="62" height="62" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/core/resources/icons/aws/codewhisperer/icon-white.svg b/packages/core/resources/icons/aws/codewhisperer/icon-white.svg
new file mode 100644
index 00000000000..c1b0447902f
--- /dev/null
+++ b/packages/core/resources/icons/aws/codewhisperer/icon-white.svg
@@ -0,0 +1,15 @@
+<svg width="62" height="62" viewBox="0 0 62 62" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_993_7532)">
+<mask id="mask0_993_7532" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="62" height="62">
+<path d="M62 0H0V62H62V0Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_993_7532)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.887 33.4227L33.9531 34.1391L29.3889 47.2958L27.3228 46.5794L31.887 33.4227ZM25.5269 36.8603L22.1669 40.2488L25.4602 43.6306L23.8917 45.1575L19.8503 41.0056C19.4347 40.578 19.438 39.8955 19.858 39.4722L23.9738 35.3203L25.5269 36.8603ZM41.7789 39.4722C42.1989 39.8955 42.2022 40.578 41.7866 41.0056L37.743 45.1575L36.1756 43.6306L39.4689 40.2488L36.11 36.8603L37.6631 35.3203L41.7789 39.4722ZM49.6277 43.9227L45.8564 45.8072C45.4867 45.9931 45.2527 46.3716 45.2527 46.7861V53.3027L36.3736 58.767L32.1277 56.3422V50.6875H29.9402V56.3422L25.6942 58.767L16.8152 53.3027V46.785C16.8152 46.3705 16.5811 45.992 16.2103 45.8072L12.4402 43.9216L12.4391 39.6625L12.4402 34.8828L16.3842 31.8772C16.6555 31.6705 16.8152 31.3489 16.8152 31.0077V24.9308L24.9461 20.1883L29.9402 22.9762V29.9062H32.1277V22.9762L37.1206 20.1883L45.2527 24.9308V31.0077C45.2527 31.3489 45.4112 31.6705 45.6825 31.8772L49.6277 34.8817L49.6288 39.6625L49.6277 43.9227ZM51.3842 33.4708L47.4402 30.4652V24.303C47.4402 23.9147 47.2334 23.5548 46.8977 23.358L37.6839 17.9844C37.3492 17.7886 36.9358 17.7853 36.6 17.9734L31.0339 21.0819L25.4678 17.9734C25.1298 17.7864 24.7175 17.7886 24.3839 17.9844L15.1702 23.358C14.8333 23.5548 14.6277 23.9147 14.6277 24.303V30.4662L10.6825 33.4708C10.4113 33.6775 10.2527 34.0002 10.2527 34.3414L10.2516 39.6625L10.2527 44.5975C10.2527 45.012 10.4867 45.3905 10.8564 45.5764L14.6277 47.4609V53.9141C14.6277 54.2936 14.8234 54.6458 15.1472 54.8448L25.1003 60.9709C25.4405 61.1788 25.867 61.1864 26.2159 60.9884L31.0339 58.2366L35.8508 60.9884C36.0192 61.0847 36.2062 61.1328 36.3933 61.1328C36.5923 61.1328 36.7903 61.0781 36.9675 60.9709L46.9195 54.8448C47.2433 54.6458 47.4402 54.2936 47.4402 53.9141V47.462L51.2103 45.5764C51.5811 45.3916 51.8152 45.0131 51.8152 44.5986L51.8163 39.6625L51.8152 34.3403C51.8152 33.9991 51.6555 33.6775 51.3842 33.4708ZM20.0964 6.39062C20.0964 7.29625 19.3614 8.03125 18.4558 8.03125C17.5491 8.03125 16.8152 7.29625 16.8152 6.39062C16.8152 5.48391 17.5491 4.75 18.4558 4.75C19.3614 4.75 20.0964 5.48391 20.0964 6.39062ZM14.6277 6.39062C14.6277 7.29625 13.8927 8.03125 12.987 8.03125C12.0803 8.03125 11.3464 7.29625 11.3464 6.39062C11.3464 5.48391 12.0803 4.75 12.987 4.75C13.8927 4.75 14.6277 5.48391 14.6277 6.39062ZM9.15891 6.39062C9.15891 7.29625 8.42391 8.03125 7.51828 8.03125C6.61156 8.03125 5.87766 7.29625 5.87766 6.39062C5.87766 5.48391 6.61156 4.75 7.51828 4.75C8.42391 4.75 9.15891 5.48391 9.15891 6.39062ZM2.59641 10.2188L2.60188 2.66422C2.60188 2.61609 2.65875 2.5625 2.73969 2.5625H59.3336C59.4145 2.5625 59.4714 2.61609 59.4714 2.66422V10.2188H2.59641ZM59.3336 0.375H2.73422C1.45453 0.375 0.411095 1.40094 0.408908 2.66203L0.375001 42.9262C0.373908 44.1819 1.41078 45.21 2.69375 45.2188L6.97141 45.2166V43.0312L2.73203 43.0323C2.65219 43.0323 2.59641 42.9788 2.59641 42.9306L2.62156 12.4062H59.4714V42.9186C59.4714 42.9787 59.408 43.0302 59.3336 43.0302L55.0964 43.0312V45.2188L59.3336 45.2177C60.6155 45.2177 61.6589 44.1862 61.6589 42.9186V2.66422C61.6589 1.40203 60.6155 0.375 59.3336 0.375Z" fill="white"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_993_7532">
+<rect width="62" height="62" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/core/resources/icons/aws/codewhisperer/learn.svg b/packages/core/resources/icons/aws/codewhisperer/learn.svg
new file mode 100644
index 00000000000..f1779777517
--- /dev/null
+++ b/packages/core/resources/icons/aws/codewhisperer/learn.svg
@@ -0,0 +1,3 @@
+<svg width="14" height="12" viewBox="0 0 14 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.9867 3.65333V4.56L10.6267 5.89333C11.16 6.64 11.4267 7.45778 11.4267 8.34667V8.77333L11.1067 9.2L7.21333 11.0133H6.78667L2.78667 9.2L2.52 8.82667V8.4C2.52 7.47556 2.78667 6.64 3.32 5.89333L1.02667 4.98667V10H0.0133333V3.65333L6.84 0.986667H7.16L13.9867 3.65333ZM10.4667 8.34667C10.4667 7.56444 10.2356 6.85333 9.77333 6.21333L7.21333 7.22667H6.84L4.22667 6.21333C3.76444 6.85333 3.51556 7.56444 3.48 8.34667V8.4L7 10L10.4667 8.4V8.34667ZM7 6.26667L12.4933 4.13333L7 2L1.50667 4.13333L7 6.26667Z" fill="#CCCCCC"/>
+</svg>
diff --git a/resources/icons/aws/ecr/registry.svg b/packages/core/resources/icons/aws/ecr/registry.svg
similarity index 100%
rename from resources/icons/aws/ecr/registry.svg
rename to packages/core/resources/icons/aws/ecr/registry.svg
diff --git a/resources/icons/aws/ecs/cluster.svg b/packages/core/resources/icons/aws/ecs/cluster.svg
similarity index 100%
rename from resources/icons/aws/ecs/cluster.svg
rename to packages/core/resources/icons/aws/ecs/cluster.svg
diff --git a/resources/icons/aws/ecs/container.svg b/packages/core/resources/icons/aws/ecs/container.svg
similarity index 100%
rename from resources/icons/aws/ecs/container.svg
rename to packages/core/resources/icons/aws/ecs/container.svg
diff --git a/resources/icons/aws/ecs/service.svg b/packages/core/resources/icons/aws/ecs/service.svg
similarity index 100%
rename from resources/icons/aws/ecs/service.svg
rename to packages/core/resources/icons/aws/ecs/service.svg
diff --git a/resources/icons/aws/generic/attach-file.svg b/packages/core/resources/icons/aws/generic/attach-file.svg
similarity index 100%
rename from resources/icons/aws/generic/attach-file.svg
rename to packages/core/resources/icons/aws/generic/attach-file.svg
diff --git a/resources/icons/aws/iot/certificate.svg b/packages/core/resources/icons/aws/iot/certificate.svg
similarity index 100%
rename from resources/icons/aws/iot/certificate.svg
rename to packages/core/resources/icons/aws/iot/certificate.svg
diff --git a/resources/icons/aws/iot/policy.svg b/packages/core/resources/icons/aws/iot/policy.svg
similarity index 100%
rename from resources/icons/aws/iot/policy.svg
rename to packages/core/resources/icons/aws/iot/policy.svg
diff --git a/resources/icons/aws/iot/thing.svg b/packages/core/resources/icons/aws/iot/thing.svg
similarity index 100%
rename from resources/icons/aws/iot/thing.svg
rename to packages/core/resources/icons/aws/iot/thing.svg
diff --git a/packages/core/resources/icons/aws/lambda/create-stack-light.svg b/packages/core/resources/icons/aws/lambda/create-stack-light.svg
new file mode 100644
index 00000000000..3dd66689af0
--- /dev/null
+++ b/packages/core/resources/icons/aws/lambda/create-stack-light.svg
@@ -0,0 +1,12 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1218_18846)">
+<path d="M13 12H16V13H13V16H12V13H9V12H12V9H13V12Z" fill="#C5C5C5"/>
+<path d="M2.74341 7.96387L1.88697 8.5L7.00025 11.6953V12.875L1.35669 9.34766C0.769514 8.9803 0.733186 8.15573 1.24732 7.73145L1.35669 7.65234L1.80005 7.375L2.74341 7.96387Z" fill="#C5C5C5"/>
+<path d="M7.46973 0.331201C7.794 0.128532 8.20601 0.128532 8.53028 0.331201L14.6436 4.15249C15.2697 4.54421 15.2697 5.45608 14.6436 5.8478L8.53028 9.66909L8.4043 9.7355C8.14699 9.8493 7.85302 9.8493 7.59571 9.7355L7.46973 9.66909L1.35645 5.8478C0.76927 5.48045 0.732942 4.65588 1.24708 4.23159L1.35645 4.15249L7.46973 0.331201ZM1.88672 5.00015L8.00001 8.82046L14.1133 5.00015L8.00001 1.17983L1.88672 5.00015Z" fill="#C5C5C5"/>
+</g>
+<defs>
+<clipPath id="clip0_1218_18846">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/core/resources/icons/aws/lambda/create-stack.svg b/packages/core/resources/icons/aws/lambda/create-stack.svg
new file mode 100644
index 00000000000..b8a08164556
--- /dev/null
+++ b/packages/core/resources/icons/aws/lambda/create-stack.svg
@@ -0,0 +1,12 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_615_17253)">
+<path d="M13 12H16V13H13V16H12V13H9V12H12V9H13V12Z" fill="#424242"/>
+<path d="M2.74341 7.96387L1.88697 8.5L7.00025 11.6953V12.875L1.35669 9.34766C0.769514 8.9803 0.733186 8.15573 1.24732 7.73145L1.35669 7.65234L1.80005 7.375L2.74341 7.96387Z" fill="#424242"/>
+<path d="M7.46973 0.331201C7.794 0.128532 8.20601 0.128532 8.53028 0.331201L14.6436 4.15249C15.2697 4.54421 15.2697 5.45608 14.6436 5.8478L8.53028 9.66909L8.4043 9.7355C8.14699 9.8493 7.85302 9.8493 7.59571 9.7355L7.46973 9.66909L1.35645 5.8478C0.76927 5.48045 0.732942 4.65588 1.24708 4.23159L1.35645 4.15249L7.46973 0.331201ZM1.88672 5.00015L8.00001 8.82046L14.1133 5.00015L8.00001 1.17983L1.88672 5.00015Z" fill="#424242"/>
+</g>
+<defs>
+<clipPath id="clip0_615_17253">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/packages/core/resources/icons/aws/lambda/deployed-function.svg b/packages/core/resources/icons/aws/lambda/deployed-function.svg
new file mode 100644
index 00000000000..5d4e1c89298
--- /dev/null
+++ b/packages/core/resources/icons/aws/lambda/deployed-function.svg
@@ -0,0 +1,7 @@
+<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.88558 0C9.07688 0.00340781 9.24959 0.115757 9.32992 0.289062L14.6307 11.6777H15.8495C16.1249 11.678 16.3485 11.9008 16.3485 12.1758V15.4434C16.3485 15.7183 16.1249 15.9412 15.8495 15.9414H12.0604C11.8667 15.9428 11.6897 15.8326 11.6063 15.6582L6.29476 4.26953H4.14828C3.87268 4.26953 3.64939 4.0465 3.64925 3.77148V0.498047C3.64933 0.222971 3.87263 0 4.14828 0H8.88558ZM4.65218 3.27344H6.6141C6.80889 3.27296 6.98622 3.38522 7.0682 3.56152L12.3543 14.9453H15.3495V12.6738H14.3211C14.1263 12.6742 13.9489 12.5612 13.867 12.3848L8.57113 0.996094H4.65218V3.27344Z" fill="black"/>
+<path d="M1.96201 13.2607C2.10141 13.2969 2.23876 13.3094 2.30283 13.3145C2.46734 13.3275 2.72147 13.3324 2.78428 13.335C2.84448 13.3488 2.90972 13.359 2.97862 13.3652L2.24424 14.9893H4.59776C5.38487 14.9893 5.32264 13.8126 5.5 13.8126C5.67736 13.8126 5.96304 13.8126 5.96304 13.8126C6.80186 13.8126 6.39916 13.8151 6.49999 13.8126C6.64643 13.8091 6.47577 13.8159 6.61284 13.8126L5.99999 15.5C5.92042 15.6755 5.5 16 5.38487 16H1.47959C1.31478 15.9995 1.16113 15.9103 1.07334 15.7637C0.985697 15.6171 0.97619 15.4336 1.04698 15.2773L1.96201 13.2607Z" fill="black"/>
+<path d="M5.5626 6C5.74649 5.99961 5.91428 6.10964 5.99522 6.2832L7.56553 9.68945C7.54024 9.6717 7.51422 9.65392 7.48643 9.63769L7.35362 9.57129L7.20713 9.52148C7.06732 9.48496 6.93003 9.48085 6.80186 9.5C6.77816 9.48741 6.75403 9.47297 6.72862 9.46094C6.6392 9.41866 6.50396 9.36354 6.33702 9.33691L5.55772 7.67383L5.20357 8.41618C5.13332 8.3748 5.07877 8.30472 5.02354 8.282C4.87504 8.22095 4.76328 8.1106 4.59776 8.08105C4.51169 8.0657 4.41811 8.05535 4.33213 8.04394L5.12998 6.28808C5.20953 6.11262 5.37769 6.00061 5.5626 6Z" fill="black"/>
+<path d="M4.31358 8.35058C4.31035 8.35082 4.30504 8.35205 4.29893 8.35254L4.29991 8.35156C4.31098 8.35031 4.32041 8.34961 4.32041 8.34961C4.32041 8.34961 4.31854 8.35022 4.31358 8.35058Z" fill="black"/>
+<path d="M5.41052 8.60816C5.63615 8.83783 5.83156 9.05458 5.96304 9.34841C6.1506 9.1971 6.3718 9.16586 6.61284 9.16584C7.10241 9.16584 7.71192 9.55024 7.81271 10.3634C8.27528 10.4731 9.16687 10.8371 9.16687 12.0604C9.19896 12.6857 8.80288 13.6435 8.01181 13.8126L7.81271 13.2421C8.41764 13.2421 8.58932 12.4961 8.59663 12.0604C8.65464 11.2107 7.87166 10.9922 7.45809 10.7979C7.41053 10.7894 7.36837 10.7622 7.3411 10.7223C7.31471 10.6846 7.30376 10.6383 7.3105 10.5928C7.2583 9.93974 6.97101 9.70976 6.61284 9.70976C6.38143 9.71182 6.12726 9.83344 5.99362 10.0223C5.95434 10.076 5.88856 10.1037 5.82263 10.0942C5.75693 10.084 5.70225 10.0383 5.68044 9.9755C5.56309 9.63022 5.27825 9.2499 5.02354 8.98881C4.4403 8.38388 3.73527 8.33641 2.98319 8.5938C2.22421 8.99901 2.01233 9.50862 1.9313 10.2808C1.93145 10.3637 1.92186 10.5157 1.9313 10.5982C1.94339 10.6928 1.88747 10.8302 1.79356 10.8475C1.14355 11.0099 0.792288 11.3859 0.762391 12.0442C0.747005 12.5719 0.945906 12.7874 1.28585 13.098C1.39778 13.1696 1.45676 13.2296 1.61097 13.2421H7.81271L8.01181 13.8126H1.61097C1.41069 13.8088 1.21527 13.7503 1.0458 13.6435C0.490664 13.3036 0.157671 12.6948 0.171062 12.0442C0.133392 11.2904 0.616835 10.6087 1.34099 10.3946V10.2542C1.36111 9.32205 1.90582 8.48102 2.74849 8.08105C3.65833 7.67872 4.72287 7.88951 5.41052 8.60816Z" fill="black"/>
+</svg>
diff --git a/resources/icons/aws/lambda/function.svg b/packages/core/resources/icons/aws/lambda/function.svg
similarity index 100%
rename from resources/icons/aws/lambda/function.svg
rename to packages/core/resources/icons/aws/lambda/function.svg
diff --git a/packages/core/resources/icons/aws/lambda/invoke-remotely.svg b/packages/core/resources/icons/aws/lambda/invoke-remotely.svg
new file mode 100644
index 00000000000..b6071674e0c
--- /dev/null
+++ b/packages/core/resources/icons/aws/lambda/invoke-remotely.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.2415 8.729C11.4671 8.95867 11.6625 9.17542 11.794 9.46925C11.9816 9.31794 12.2028 9.28671 12.4438 9.28668C12.9334 9.28668 13.5429 9.67108 13.6437 10.4842C14.1063 10.594 14.9979 10.9579 14.9979 12.1813C15.03 12.8066 14.6339 13.7644 13.8428 13.9335L13.6437 13.3629C14.2486 13.3629 14.4203 12.6169 14.4276 12.1813C14.4856 11.3315 13.7027 11.113 13.2891 10.9187C13.2415 10.9102 13.1994 10.883 13.1721 10.8431C13.1457 10.8055 13.1348 10.7591 13.1415 10.7136C13.0893 10.0606 12.802 9.8306 12.4438 9.8306C12.2124 9.83266 11.9583 9.95428 11.8246 10.1431C11.7853 10.1969 11.7196 10.2246 11.6536 10.2151C11.5879 10.2048 11.5332 10.1591 11.5114 10.0963C11.3941 9.75106 11.1092 9.37074 10.8545 9.10965C10.2713 8.50472 9.56626 8.45725 8.81419 8.71464C8.05521 9.11985 7.84332 9.62946 7.76229 10.4016C7.76244 10.4846 7.75285 10.6366 7.76229 10.719C7.77439 10.8137 7.71846 10.951 7.62456 10.9684C6.97454 11.1307 6.62328 11.5067 6.59339 12.1651C6.578 12.6928 6.7769 12.9083 7.11684 13.2189C7.22878 13.2905 7.28776 13.3504 7.44196 13.3629H13.6437L13.8428 13.9335H7.44196C7.24168 13.9296 7.04626 13.8711 6.8768 13.7644C6.32166 13.4244 5.98866 12.8156 6.00206 12.1651C5.96439 11.4112 6.44783 10.7295 7.17198 10.5154V10.3751C7.1921 9.44289 7.73681 8.60186 8.57949 8.2019C9.48932 7.79956 10.5539 8.01035 11.2415 8.729Z" fill="black"/>
+<path d="M12.915 8.24023L11.4023 9.29785C11.3053 9.02501 11.0917 8.7957 10.7979 8.69043C10.734 8.6676 10.6691 8.65203 10.6045 8.64258C10.79 8.51276 10.9819 8.37928 11.1807 8.24023L4.99512 3.91211V12.5684C5.52586 12.197 6.00526 11.8613 6.45605 11.5459C6.43045 11.5926 6.40698 11.6399 6.38672 11.6875L6.32422 11.8613C6.30463 11.9282 6.27514 12.0492 6.27832 12.1992C6.28107 12.3248 6.31065 12.544 6.45703 12.7598L4 14.4805V2L12.915 8.24023Z" fill="black"/>
+</svg>
diff --git a/packages/core/resources/icons/aws/mynah/MynahIconBlack.svg b/packages/core/resources/icons/aws/mynah/MynahIconBlack.svg
new file mode 100644
index 00000000000..cbef4eff9d2
--- /dev/null
+++ b/packages/core/resources/icons/aws/mynah/MynahIconBlack.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg41"
+   width="86.724358"
+   height="97.987442"
+   viewBox="0 0 86.724357 97.987443"
+   sodipodi:docname="MynahIconBlack.svg"
+   inkscape:version="1.1 (c4e8f9e, 2021-05-24)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview876"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="2.2500001"
+     inkscape:cx="54.888887"
+     inkscape:cy="83.333331"
+     inkscape:window-width="1296"
+     inkscape:window-height="1003"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg41" />
+  <defs
+     id="defs45" />
+  <g
+     id="g47"
+     transform="translate(-110.57257,-89.344135)">
+    <path
+       id="path119"
+       style="fill:#000000;stroke-width:0.666667"
+       d="m 132.3073,175.69728 c -10.9919,-6.39196 -20.5483,-11.71526 -21.01473,-12.35314 -1,-1 -0.66666,-7.12319 -0.66666,-25.09025 0,-23.44292 0.004,-23.50619 1.5,-25.13945 2.26641,-2.47399 39.671,-23.770305 41.74986,-23.770305 2.0058,0 40.37944,21.908195 42.26881,24.132005 1.02786,1.20981 1.15578,2.71468 1.15228,9.97108 l -0.004,8.89692 c -2.45942,1.43994 -5.63304,2.69259 -7.96617,4.03864 -0.3718,-0.15327 -0.0687,-1.03863 -0.0544,-8.82654 0.0206,-11.2121 0.0206,-9.2121 -1.51868,-10.31876 -1.52114,-1.09365 -32.51933,-18.560008 -33.84416,-18.560008 -1.25235,0 -31.04529,16.968568 -33.11659,18.861548 -1.49018,1.36189 -1.5,1.49866 -1.5,20.8874 v 19.51653 l 2.16667,1.60229 c 1.19167,0.88127 8.48303,5.24654 16.20303,9.7006 10.25534,5.91684 14.63368,8.0983 16.25381,8.0983 1.61694,0 6.21093,-2.28074 16.96364,-8.4218 8.1104,-4.63198 15.18204,-9.48673 16.17005,-10.18945 2.16666,-1.54103 2.2428,-0.72249 2.2428,-6.21889 v -8.16986 c 3.39521,-1.88596 6.37178,-3.2868 8,-4 0,2 7.1e-4,5.58598 -0.12079,11.70615 -0.20898,10.52655 -0.2405,10.72729 -1.87921,11.96607 -4.03346,3.04908 -40.10794,23.32654 -41.47877,23.31521 -0.83667,-0.007 -10.5146,-5.24234 -21.5065,-11.63429 z m 6.98527,-13.24574 -13,-7.5264 -0.1817,-12.12383 c -0.12957,-8.64498 0.0335,-12.12384 0.56841,-12.12384 0.41257,0 2.21903,0.825 4.01436,1.83333 l 3.26425,1.83334 6.6e-4,7.39667 c 3.4e-4,4.33084 0.13585,7.47409 0.33402,8.60333 4,2 4.01212,1.97913 9.05385,4.90172 11.18306,6.4826 9.65841,6.483 20.92924,-0.005 l 9.66305,-5.56306 0.0103,-11.51712 0.0103,-11.51712 -1.83333,0.95743 c -1.00834,0.52659 -5.28334,2.93269 -9.5,5.34689 -4.21667,2.4142 -8.13245,4.39106 -8.70174,4.39302 -1.12699,0.004 -22.88352,-12.14422 -24.82294,-13.86028 -0.65525,-0.57978 -0.80873,-1.13648 -1,-2.00277 0.27808,-1.37868 21.19127,-12.13371 25.78925,-14.80005 1.40202,0.66634 12.06876,6.54248 12.06876,6.54248 -2.37057,1.7297 -4.66827,3.36842 -6.66674,5.12386 -4,-2 -3.48763,-1.69984 -5.46135,-2.64104 -3.17228,1.94317 -4.53865,2.64104 -9.87191,6.04784 2.33326,1.5932 7.33326,4.5932 9.95057,5.59353 2.38269,-1.00033 2.38269,-1.00033 10.78356,-5.08996 9.97292,-4.85492 8.8766,-5.52257 14.57706,-1.92402 l 2.71204,1.71203 -0.17828,16.38541 -0.51169,15.91621 -12.66659,8.03197 c -6.9858,4.42975 -13.33341,6.96803 -14.66667,7.58246 -1.66674,-0.61443 -7.34211,-3.26612 -14.66667,-7.5067 z" />
+  </g>
+</svg>
diff --git a/packages/core/resources/icons/aws/mynah/MynahIconWhite.svg b/packages/core/resources/icons/aws/mynah/MynahIconWhite.svg
new file mode 100644
index 00000000000..1e14d6f3677
--- /dev/null
+++ b/packages/core/resources/icons/aws/mynah/MynahIconWhite.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg41"
+   width="22.945818mm"
+   height="25.925844mm"
+   viewBox="0 0 86.72435 97.987443"
+   sodipodi:docname="MynahIconWhite.svg"
+   inkscape:version="1.1 (c4e8f9e, 2021-05-24)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     units="mm"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="2.2500001"
+     inkscape:cx="54.888887"
+     inkscape:cy="83.333331"
+     inkscape:window-width="1296"
+     inkscape:window-height="1003"
+     inkscape:window-x="0"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g47"
+     inkscape:document-units="mm" />
+  <defs
+     id="defs45" />
+  <g
+     id="g47"
+     transform="translate(-110.57257,-89.344135)">
+    <path
+       id="path119"
+       style="fill:#ffffff;fill-opacity:1;stroke-width:0.666667"
+       d="m 132.3073,175.69728 c -10.9919,-6.39196 -20.5483,-11.71526 -21.01473,-12.35314 -1,-1 -0.66666,-7.12319 -0.66666,-25.09025 0,-23.44292 0.004,-23.50619 1.5,-25.13945 2.26641,-2.47399 39.671,-23.770305 41.74986,-23.770305 2.0058,0 40.37944,21.908195 42.26881,24.132005 1.02786,1.20981 1.15578,2.71468 1.15228,9.97108 l -0.004,8.89692 c -2.45942,1.43994 -5.63304,2.69259 -7.96617,4.03864 -0.3718,-0.15327 -0.0687,-1.03863 -0.0544,-8.82654 0.0206,-11.2121 0.0206,-9.2121 -1.51868,-10.31876 -1.52114,-1.09365 -32.51933,-18.560008 -33.84416,-18.560008 -1.25235,0 -31.04529,16.968568 -33.11659,18.861548 -1.49018,1.36189 -1.5,1.49866 -1.5,20.8874 v 19.51653 l 2.16667,1.60229 c 1.19167,0.88127 8.48303,5.24654 16.20303,9.7006 10.25534,5.91684 14.63368,8.0983 16.25381,8.0983 1.61694,0 6.21093,-2.28074 16.96364,-8.4218 8.1104,-4.63198 15.18204,-9.48673 16.17005,-10.18945 2.16666,-1.54103 2.2428,-0.72249 2.2428,-6.21889 v -8.16986 c 3.39521,-1.88596 6.37178,-3.2868 8,-4 0,2 7.1e-4,5.58598 -0.12079,11.70615 -0.20898,10.52655 -0.2405,10.72729 -1.87921,11.96607 -4.03346,3.04908 -40.10794,23.32654 -41.47877,23.31521 -0.83667,-0.007 -10.5146,-5.24234 -21.5065,-11.63429 z m 6.98527,-13.24574 -13,-7.5264 -0.1817,-12.12383 c -0.12957,-8.64498 0.0335,-12.12384 0.56841,-12.12384 0.41257,0 2.21903,0.825 4.01436,1.83333 l 3.26425,1.83334 6.6e-4,7.39667 c 3.4e-4,4.33084 0.13585,7.47409 0.33402,8.60333 4,2 4.01212,1.97913 9.05385,4.90172 11.18306,6.4826 9.65841,6.483 20.92924,-0.005 l 9.66305,-5.56306 0.0103,-11.51712 0.0103,-11.51712 -1.83333,0.95743 c -1.00834,0.52659 -5.28334,2.93269 -9.5,5.34689 -4.21667,2.4142 -8.13245,4.39106 -8.70174,4.39302 -1.12699,0.004 -22.88352,-12.14422 -24.82294,-13.86028 -0.65525,-0.57978 -0.80873,-1.13648 -1,-2.00277 0.27808,-1.37868 21.19127,-12.13371 25.78925,-14.80005 1.40202,0.66634 12.06876,6.54248 12.06876,6.54248 -2.37057,1.7297 -4.66827,3.36842 -6.66674,5.12386 -4,-2 -3.48763,-1.69984 -5.46135,-2.64104 -3.17228,1.94317 -4.53865,2.64104 -9.87191,6.04784 2.33326,1.5932 7.33326,4.5932 9.95057,5.59353 2.38269,-1.00033 2.38269,-1.00033 10.78356,-5.08996 9.97292,-4.85492 8.8766,-5.52257 14.57706,-1.92402 l 2.71204,1.71203 -0.17828,16.38541 -0.51169,15.91621 -12.66659,8.03197 c -6.9858,4.42975 -13.33341,6.96803 -14.66667,7.58246 -1.66674,-0.61443 -7.34211,-3.26612 -14.66667,-7.5067 z" />
+  </g>
+</svg>
diff --git a/packages/core/resources/icons/aws/mynah/logo.svg b/packages/core/resources/icons/aws/mynah/logo.svg
new file mode 100644
index 00000000000..be2ead908ad
--- /dev/null
+++ b/packages/core/resources/icons/aws/mynah/logo.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg viewBox="0 0 331.33334 334.66666" width="331.33334" height="334.66666" xmlns="http://www.w3.org/2000/svg">
+  <g id="g47" transform="matrix(3.292798, 0, 0, 3.292798, -373.532135, -291.555695)" style="">
+    <path style="fill:#8e9cbe;stroke-width:0.666667" d="M 143.015 176.353 C 132.023 169.961 122.466 164.638 122 164 C 121 163 121.333 156.877 121.333 138.91 C 121.333 115.467 121.337 115.404 122.833 113.77 C 125.1 111.296 162.504 90 164.583 90 C 166.589 90 204.963 111.908 206.852 114.132 C 207.88 115.342 208.008 116.847 208.004 124.103 L 208 133 C 205.541 134.44 202.367 135.693 200.034 137.039 C 199.662 136.885 199.965 136 199.979 128.212 C 200 117 200 119 198.461 117.893 C 196.94 116.8 165.941 99.333 164.617 99.333 C 163.364 99.333 133.571 116.302 131.5 118.195 C 130.01 119.557 130 119.694 130 139.082 L 130 158.599 L 132.167 160.201 C 133.358 161.082 140.65 165.448 148.37 169.902 C 158.625 175.819 163.003 178 164.624 178 C 166.24 178 170.834 175.719 181.587 169.578 C 189.698 164.946 196.769 160.091 197.757 159.389 C 199.924 157.848 200 158.666 200 153.17 L 200 145 C 203.395 143.114 206.372 141.713 208 141 C 208 143 208.001 146.586 207.879 152.706 C 207.67 163.233 207.639 163.433 206 164.672 C 201.967 167.721 165.892 187.999 164.521 187.987 C 163.685 187.98 154.007 182.745 143.015 176.353 Z M 150 163.107 L 137 155.581 L 136.818 143.457 C 136.689 134.812 136.852 131.333 137.387 131.333 C 137.799 131.333 139.606 132.158 141.401 133.167 L 144.665 135 L 144.666 142.397 C 144.666 146.728 144.802 149.871 145 151 C 149 153 149.012 152.979 154.054 155.902 C 165.237 162.384 163.712 162.385 174.983 155.897 L 184.646 150.334 L 184.656 138.817 L 184.667 127.299 L 182.833 128.257 C 181.825 128.783 177.55 131.19 173.333 133.604 C 169.117 136.018 165.201 137.995 164.632 137.997 C 163.505 138.001 141.748 125.853 139.809 124.136 C 139.153 123.557 139 123 138.809 122.134 C 139.087 120.755 160 110 164.598 107.334 C 166 108 176.667 113.876 176.667 113.876 C 174.296 115.606 171.998 117.245 170 119 C 166 117 166.512 117.3 164.539 116.359 C 161.366 118.302 160 119 154.667 122.407 C 157 124 162 127 164.617 128 C 167 127 167 127 175.401 122.91 C 185.374 118.055 184.277 117.388 189.978 120.986 L 192.69 122.698 L 192.512 139.084 L 192 155 L 179.333 163.032 C 172.348 167.462 166 170 164.667 170.614 C 163 170 157.325 167.348 150 163.108 L 150 163.107 Z" id="path353"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/packages/core/resources/icons/aws/redshift/cluster-connected.svg b/packages/core/resources/icons/aws/redshift/cluster-connected.svg
new file mode 100644
index 00000000000..46a0b566e70
--- /dev/null
+++ b/packages/core/resources/icons/aws/redshift/cluster-connected.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.0662 27.0186V27.0176V24.1533C20.5397 25.4607 17.3723 26.3223 13.5279 26.3223C9.68065 26.3223 6.51322 25.4597 4.98674 24.1512V27.0136C4.98674 28.4252 8.49459 29.9981 13.5279 29.9981C18.5544 29.9981 22.0583 28.4282 22.0662 27.0186ZM22.0672 18.8444L23.0539 18.8384V18.8444C23.0539 19.4685 22.7421 20.0506 22.1481 20.5856C22.8743 21.2388 23.0539 21.88 23.0539 22.3359C23.0539 22.3389 23.0529 22.3419 23.0529 22.3439V27.0136C23.0529 29.2858 18.9589 31 13.5279 31C8.12456 31 4.04736 29.3038 4.00493 27.0486C4.00493 27.0396 4 27.0326 4 27.0236V22.3339C4 22.3309 4.00197 22.3289 4.00197 22.3258C4.00395 21.872 4.18452 21.2368 4.90287 20.5886C4.18649 19.9384 4.00493 19.3052 4.00099 18.8554C4.00099 18.8534 4 18.8514 4 18.8494V14.1596C4 14.1566 4.00197 14.1536 4.00197 14.1516C4.00395 13.6968 4.18551 13.0616 4.90385 12.4144C4.18649 11.7632 4.00493 11.131 4.00099 10.6802C4.00099 10.6782 4 10.6762 4 10.6752V5.98442C4 5.97941 4.00296 5.9764 4.00296 5.9714C4.02269 3.70618 8.10878 2 13.5279 2C16.1359 2 18.6422 2.4298 20.4016 3.17719L20.0207 4.10191C18.3778 3.40261 16.0106 3.00187 13.5279 3.00187C8.49459 3.00187 4.98772 4.57479 4.98772 5.98642C4.98772 7.39905 8.49459 8.97198 13.5279 8.97198C13.6661 8.97298 13.7963 8.97198 13.9305 8.96597L13.971 9.96684C13.823 9.97385 13.675 9.97385 13.5279 9.97385C9.68065 9.97385 6.51322 9.11124 4.98674 7.8018V10.6641L4.98772 10.6762C4.99266 11.2212 5.53043 11.6961 5.9794 11.9976C7.32728 12.8873 9.74183 13.4944 12.4327 13.6196L12.3863 14.6205C9.66289 14.4943 7.27597 13.9082 5.74061 13.0115C5.35676 13.3071 4.98772 13.7038 4.98772 14.1616C4.98772 15.5733 8.49459 17.1462 13.5279 17.1462C14.0243 17.1462 14.5088 17.1292 14.9814 17.0951L15.0534 18.094C14.5571 18.13 14.047 18.1481 13.5279 18.1481C9.68065 18.1481 6.51322 17.2865 4.98674 15.977V18.8384C4.99167 19.3964 5.52944 19.8713 5.9794 20.1718C7.51969 21.1897 10.4128 21.8229 13.5279 21.8229H13.747V22.8248H13.5279C10.3625 22.8248 7.49799 22.2126 5.74159 21.1837C5.35775 21.4793 4.98772 21.877 4.98772 22.3359C4.98772 23.7475 8.49459 25.3204 13.5279 25.3204C18.5524 25.3204 22.0553 23.7525 22.0662 22.3419V22.3339V22.3329C22.0652 21.878 21.6991 21.4823 21.3173 21.1877C21.0735 21.331 20.812 21.4683 20.516 21.5945L20.1342 20.6718C20.4963 20.5165 20.812 20.3492 21.0725 20.1728C21.5264 19.8663 22.0672 19.3864 22.0672 18.8444ZM27.3551 10.4888H24.0722C23.9134 10.4888 23.7644 10.4107 23.6716 10.2794C23.5789 10.1482 23.5542 9.97986 23.6055 9.82657L25.0599 5.47948H18.5317L15.4106 11.4907H18.58C18.734 11.4907 18.879 11.5638 18.9718 11.688C19.0655 11.8113 19.0961 11.9726 19.0556 12.1239L16.3382 22.2317L27.3551 10.4888ZM28.8648 10.3335L15.7057 24.3596C15.609 24.4618 15.4787 24.5149 15.3475 24.5149C15.2646 24.5149 15.1807 24.4939 15.1047 24.4508C14.9084 24.3376 14.8117 24.1032 14.8719 23.8817L17.9347 12.4925H14.5926C14.42 12.4925 14.2591 12.4004 14.1703 12.2501C14.0805 12.0998 14.0746 11.9135 14.1555 11.7582L17.7976 4.74511C17.8834 4.58081 18.0511 4.47761 18.2337 4.47761H25.7487C25.9085 4.47761 26.0575 4.55576 26.1503 4.687C26.2421 4.81825 26.2677 4.98656 26.2164 5.13985L24.761 9.48694H28.5066C28.705 9.48694 28.8826 9.60616 28.9605 9.79051C29.0375 9.97485 29 10.1882 28.8648 10.3335ZM5.72778 27.0406C6.2991 27.3732 6.9987 27.6668 7.80684 27.9112L8.08806 26.9515C7.35392 26.729 6.72537 26.4666 6.21917 26.172L5.72778 27.0406ZM7.80684 19.8092L8.08806 18.8494C7.3559 18.628 6.72734 18.3655 6.21917 18.0689L5.72778 18.9385C6.30107 19.2732 7.00067 19.5657 7.80684 19.8092ZM5.72778 10.8355L6.21917 9.96684C6.72438 10.2614 7.35392 10.5249 8.08806 10.7473L7.80684 11.7071C6.99771 11.4626 6.2991 11.1691 5.72778 10.8355Z" fill="#232F3E"/>
+</svg>
diff --git a/packages/core/resources/icons/aws/redshift/cluster.svg b/packages/core/resources/icons/aws/redshift/cluster.svg
new file mode 100644
index 00000000000..f89739f0675
--- /dev/null
+++ b/packages/core/resources/icons/aws/redshift/cluster.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 64 (93537) - https://sketch.com -->
+    <title>Icon-Service/64/Amazon-Redshift</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <path d="M42.8250355,27.1704885 C41.7652069,27.1704885 40.9041586,26.3110668 40.9041586,25.2542373 C40.9041586,24.1974078 41.7652069,23.336989 42.8250355,23.336989 C43.8838652,23.336989 44.7449135,24.1974078 44.7449135,25.2542373 C44.7449135,26.3110668 43.8838652,27.1704885 42.8250355,27.1704885 M37.9594133,38.8245264 C36.9005836,38.8245264 36.0395353,37.9651047 36.0395353,36.9082752 C36.0395353,35.8514457 36.9005836,34.9920239 37.9594133,34.9920239 C39.018243,34.9920239 39.8802902,35.8514457 39.8802902,36.9082752 C39.8802902,37.9651047 39.018243,38.8245264 37.9594133,38.8245264 M26.2823195,36.8823529 C25.2244887,36.8823529 24.3634404,36.0229312 24.3634404,34.9661017 C24.3634404,33.9092722 25.2244887,33.0488534 26.2823195,33.0488534 C27.3421482,33.0488534 28.2031965,33.9092722 28.2031965,34.9661017 C28.2031965,36.0229312 27.3421482,36.8823529 26.2823195,36.8823529 M21.4176962,47.5653041 C20.3598654,47.5653041 19.4978182,46.7058824 19.4978182,45.6490528 C19.4978182,44.5922233 20.3598654,43.7328016 21.4176962,43.7328016 C22.4775248,43.7328016 23.3385732,44.5922233 23.3385732,45.6490528 C23.3385732,46.7058824 22.4775248,47.5653041 21.4176962,47.5653041 M42.8250355,21.3429711 C40.6644235,21.3429711 38.9063666,23.0977069 38.9063666,25.2542373 C38.9063666,26.5762712 39.5706325,27.7417747 40.5805163,28.4506481 L38.7525367,33.0787637 C38.4958204,33.0259222 38.2301141,32.998006 37.9594133,32.998006 C36.2413122,32.998006 34.793912,34.114656 34.2674938,35.6550349 L30.1770149,34.7268195 C30.0501551,32.6839482 28.3620209,31.0548355 26.2823195,31.0548355 C24.1227065,31.0548355 22.3656485,32.8095713 22.3656485,34.9661017 C22.3656485,35.9740778 22.7592135,36.885344 23.3895168,37.5792622 L21.6044898,41.7577268 C21.5405604,41.7537388 21.4816256,41.7387836 21.4176962,41.7387836 C19.2580832,41.7387836 17.5000263,43.4925224 17.5000263,45.6490528 C17.5000263,47.8045862 19.2580832,49.559322 21.4176962,49.559322 C23.5783082,49.559322 25.3363651,47.8045862 25.3363651,45.6490528 C25.3363651,44.2652044 24.6091688,43.0548355 23.5193733,42.3589232 L25.0946322,38.6729811 C25.4722149,38.7936191 25.8657799,38.8763709 26.2823195,38.8763709 C27.823616,38.8763709 29.1471531,37.9760718 29.7854477,36.6829511 L34.1186583,37.666002 C34.4732664,39.4606181 36.0595132,40.8185444 37.9594133,40.8185444 C40.1200252,40.8185444 41.8780821,39.0648056 41.8780821,36.9082752 C41.8780821,35.7427717 41.3536617,34.7068794 40.5405604,33.9890329 L42.4614374,29.1276171 C42.5833027,29.1395813 42.7001735,29.1645065 42.8250355,29.1645065 C44.9846485,29.1645065 46.7427054,27.4097707 46.7427054,25.2542373 C46.7427054,23.0977069 44.9846485,21.3429711 42.8250355,21.3429711 M32,58.0059821 C22.2687556,58.0059821 14.9977919,55.0847458 14.9977919,52.4725823 L14.9977919,15.1515454 C18.3081331,17.8414756 25.3153883,19.2632104 32.0209768,19.2632104 C38.6965985,19.2632104 45.6738868,17.8534397 49.0022081,15.1864407 L49.0022081,52.4725823 C49.0022081,55.0847458 41.7302455,58.0059821 32,58.0059821 M32.0209768,5.99401795 C42.0279165,5.99401795 49.0022081,8.96510469 49.0022081,11.6321037 C49.0022081,14.2981057 42.0279165,17.2691924 32.0209768,17.2691924 C22.0130382,17.2691924 15.0397455,14.2981057 15.0397455,11.6321037 C15.0397455,8.96510469 22.0130382,5.99401795 32.0209768,5.99401795 M51,11.6321037 C51,6.67497507 41.2218075,4 32.0209768,4 C22.8201462,4 13.0419536,6.67497507 13.0419536,11.6321037 C13.0419536,11.6400798 13.0439514,11.6490528 13.0439514,11.6570289 L13,11.6570289 L13,52.4725823 C13,57.3619143 22.7891804,60 32,60 C41.2108196,60 51,57.3619143 51,52.4725823 L51,11.6570289 L50.9980022,11.6570289 C50.9980022,11.6490528 51,11.6400798 51,11.6321037" id="path-1"></path>
+    </defs>
+    <g id="Icon-Service/64/Amazon-Redshift" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <mask id="mask-2" fill="white">
+            <use xlink:href="#path-1"></use>
+        </mask>
+        <use id="Amazon-Redshift_Icon_64_Squid" fill="#232F3D" xlink:href="#path-1"></use>
+    </g>
+</svg>
diff --git a/packages/core/resources/icons/aws/redshift/database.svg b/packages/core/resources/icons/aws/redshift/database.svg
new file mode 100644
index 00000000000..686c11be836
--- /dev/null
+++ b/packages/core/resources/icons/aws/redshift/database.svg
@@ -0,0 +1,3 @@
+<svg width="15" height="12" viewBox="0 0 15 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.5 1H6.70996L5.85999 0.150024L5.51001 0H0.51001L0.0100098 0.5V4.5V11.5L0.51001 12H13.51L14.01 11.5V7V1.5L13.5 1ZM12.99 9.48999V11H0.98999V9.48999V5.48999V5H5.47998L5.82996 4.84998L6.68994 3.98999H13V5.48999L12.99 9.48999ZM12.99 3H6.48999L6.14001 3.15002L5.28003 4.01001H1V1.01001H5.29004L6.14001 1.85999L6.5 2.01001H13L12.99 3Z" fill="#C5C5C5"/>
+</svg>
diff --git a/packages/core/resources/icons/aws/redshift/redshift-cluster-connected.svg b/packages/core/resources/icons/aws/redshift/redshift-cluster-connected.svg
new file mode 100644
index 00000000000..46a0b566e70
--- /dev/null
+++ b/packages/core/resources/icons/aws/redshift/redshift-cluster-connected.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.0662 27.0186V27.0176V24.1533C20.5397 25.4607 17.3723 26.3223 13.5279 26.3223C9.68065 26.3223 6.51322 25.4597 4.98674 24.1512V27.0136C4.98674 28.4252 8.49459 29.9981 13.5279 29.9981C18.5544 29.9981 22.0583 28.4282 22.0662 27.0186ZM22.0672 18.8444L23.0539 18.8384V18.8444C23.0539 19.4685 22.7421 20.0506 22.1481 20.5856C22.8743 21.2388 23.0539 21.88 23.0539 22.3359C23.0539 22.3389 23.0529 22.3419 23.0529 22.3439V27.0136C23.0529 29.2858 18.9589 31 13.5279 31C8.12456 31 4.04736 29.3038 4.00493 27.0486C4.00493 27.0396 4 27.0326 4 27.0236V22.3339C4 22.3309 4.00197 22.3289 4.00197 22.3258C4.00395 21.872 4.18452 21.2368 4.90287 20.5886C4.18649 19.9384 4.00493 19.3052 4.00099 18.8554C4.00099 18.8534 4 18.8514 4 18.8494V14.1596C4 14.1566 4.00197 14.1536 4.00197 14.1516C4.00395 13.6968 4.18551 13.0616 4.90385 12.4144C4.18649 11.7632 4.00493 11.131 4.00099 10.6802C4.00099 10.6782 4 10.6762 4 10.6752V5.98442C4 5.97941 4.00296 5.9764 4.00296 5.9714C4.02269 3.70618 8.10878 2 13.5279 2C16.1359 2 18.6422 2.4298 20.4016 3.17719L20.0207 4.10191C18.3778 3.40261 16.0106 3.00187 13.5279 3.00187C8.49459 3.00187 4.98772 4.57479 4.98772 5.98642C4.98772 7.39905 8.49459 8.97198 13.5279 8.97198C13.6661 8.97298 13.7963 8.97198 13.9305 8.96597L13.971 9.96684C13.823 9.97385 13.675 9.97385 13.5279 9.97385C9.68065 9.97385 6.51322 9.11124 4.98674 7.8018V10.6641L4.98772 10.6762C4.99266 11.2212 5.53043 11.6961 5.9794 11.9976C7.32728 12.8873 9.74183 13.4944 12.4327 13.6196L12.3863 14.6205C9.66289 14.4943 7.27597 13.9082 5.74061 13.0115C5.35676 13.3071 4.98772 13.7038 4.98772 14.1616C4.98772 15.5733 8.49459 17.1462 13.5279 17.1462C14.0243 17.1462 14.5088 17.1292 14.9814 17.0951L15.0534 18.094C14.5571 18.13 14.047 18.1481 13.5279 18.1481C9.68065 18.1481 6.51322 17.2865 4.98674 15.977V18.8384C4.99167 19.3964 5.52944 19.8713 5.9794 20.1718C7.51969 21.1897 10.4128 21.8229 13.5279 21.8229H13.747V22.8248H13.5279C10.3625 22.8248 7.49799 22.2126 5.74159 21.1837C5.35775 21.4793 4.98772 21.877 4.98772 22.3359C4.98772 23.7475 8.49459 25.3204 13.5279 25.3204C18.5524 25.3204 22.0553 23.7525 22.0662 22.3419V22.3339V22.3329C22.0652 21.878 21.6991 21.4823 21.3173 21.1877C21.0735 21.331 20.812 21.4683 20.516 21.5945L20.1342 20.6718C20.4963 20.5165 20.812 20.3492 21.0725 20.1728C21.5264 19.8663 22.0672 19.3864 22.0672 18.8444ZM27.3551 10.4888H24.0722C23.9134 10.4888 23.7644 10.4107 23.6716 10.2794C23.5789 10.1482 23.5542 9.97986 23.6055 9.82657L25.0599 5.47948H18.5317L15.4106 11.4907H18.58C18.734 11.4907 18.879 11.5638 18.9718 11.688C19.0655 11.8113 19.0961 11.9726 19.0556 12.1239L16.3382 22.2317L27.3551 10.4888ZM28.8648 10.3335L15.7057 24.3596C15.609 24.4618 15.4787 24.5149 15.3475 24.5149C15.2646 24.5149 15.1807 24.4939 15.1047 24.4508C14.9084 24.3376 14.8117 24.1032 14.8719 23.8817L17.9347 12.4925H14.5926C14.42 12.4925 14.2591 12.4004 14.1703 12.2501C14.0805 12.0998 14.0746 11.9135 14.1555 11.7582L17.7976 4.74511C17.8834 4.58081 18.0511 4.47761 18.2337 4.47761H25.7487C25.9085 4.47761 26.0575 4.55576 26.1503 4.687C26.2421 4.81825 26.2677 4.98656 26.2164 5.13985L24.761 9.48694H28.5066C28.705 9.48694 28.8826 9.60616 28.9605 9.79051C29.0375 9.97485 29 10.1882 28.8648 10.3335ZM5.72778 27.0406C6.2991 27.3732 6.9987 27.6668 7.80684 27.9112L8.08806 26.9515C7.35392 26.729 6.72537 26.4666 6.21917 26.172L5.72778 27.0406ZM7.80684 19.8092L8.08806 18.8494C7.3559 18.628 6.72734 18.3655 6.21917 18.0689L5.72778 18.9385C6.30107 19.2732 7.00067 19.5657 7.80684 19.8092ZM5.72778 10.8355L6.21917 9.96684C6.72438 10.2614 7.35392 10.5249 8.08806 10.7473L7.80684 11.7071C6.99771 11.4626 6.2991 11.1691 5.72778 10.8355Z" fill="#232F3E"/>
+</svg>
diff --git a/packages/core/resources/icons/aws/redshift/schema.svg b/packages/core/resources/icons/aws/redshift/schema.svg
new file mode 100644
index 00000000000..bd2ff0f6eff
--- /dev/null
+++ b/packages/core/resources/icons/aws/redshift/schema.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.5 14H12.5L12.98 13.63L15.61 6.63L15.13 6H14V3.5L13.5 3H7.70996L6.84998 2.15002L6.5 2H1.5L1 2.5V13.5L1.5 14ZM2 3H6.29004L7.15002 3.84998L7.5 4H13V6H8.5L8.15002 6.15002L7.29004 7H3.5L3.03003 7.33997L2.03003 10.42L2 3ZM12.13 13H2.18994L3.85999 8H7.5L7.84998 7.84998L8.70996 7H14.5L12.13 13Z" fill="#C5C5C5"/>
+</svg>
diff --git a/packages/core/resources/icons/aws/redshift/table.svg b/packages/core/resources/icons/aws/redshift/table.svg
new file mode 100644
index 00000000000..0bb7c56652f
--- /dev/null
+++ b/packages/core/resources/icons/aws/redshift/table.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 20 20"
+	 enable-background="new 0 0 20 20" xml:space="preserve">
+<title>Shape</title>
+<desc>Created with Sketch.</desc>
+<g id="Page-1" sketch:type="MSPage">
+	<g id="Artboard-1" transform="translate(0.000000, -1.000000)" sketch:type="MSArtboardGroup">
+		<path id="Shape" sketch:type="MSShapeGroup" d="M19,2H1C0.4,2,0,2.5,0,3v16c0,0.5,0.4,1,1,1h18c0.5,0,1-0.5,1-1V3
+			C20,2.5,19.5,2,19,2L19,2z M7,18H2v-3h5V18L7,18z M7,14H2v-3h5V14L7,14z M7,10H2V7h5V10L7,10z M18,18H8v-3h10V18L18,18z M18,14H8
+			v-3h10V14L18,14z M18,10H8V7h10V10L18,10z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/aws/s3/bucket.svg b/packages/core/resources/icons/aws/s3/bucket.svg
similarity index 100%
rename from resources/icons/aws/s3/bucket.svg
rename to packages/core/resources/icons/aws/s3/bucket.svg
diff --git a/resources/icons/aws/s3/create-bucket.svg b/packages/core/resources/icons/aws/s3/create-bucket.svg
similarity index 100%
rename from resources/icons/aws/s3/create-bucket.svg
rename to packages/core/resources/icons/aws/s3/create-bucket.svg
diff --git a/packages/core/resources/icons/aws/sagemaker/code-editor.svg b/packages/core/resources/icons/aws/sagemaker/code-editor.svg
new file mode 100644
index 00000000000..03e2f35f05c
--- /dev/null
+++ b/packages/core/resources/icons/aws/sagemaker/code-editor.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.1483 6.20865L6.6307 11.9909L6.63144 11.9905L11.1628 17.7906C11.3913 18.0834 11.1829 18.511 10.8114 18.511H7.59403C7.45657 18.511 7.32692 18.4478 7.24258 18.3397L2.49499 12.2632C2.36867 12.102 2.36904 11.8754 2.49499 11.7141L7.22846 5.65955C7.3128 5.55144 7.44246 5.48828 7.57955 5.48828H10.7969C11.1684 5.48828 11.3772 5.9159 11.1483 6.20865Z" fill="#C5C5C5"/>
+<path d="M16.7589 5.65955L21.5065 11.7361L21.5058 11.7364C21.6321 11.8977 21.6317 12.1243 21.5058 12.2855L16.7723 18.3401C16.688 18.4482 16.5583 18.5114 16.4212 18.5114H13.2039C12.8324 18.5114 12.6236 18.0838 12.8525 17.791L17.3701 12.0087L12.8387 6.20865C12.6102 5.9159 12.8187 5.48828 13.1902 5.48828H16.4075C16.545 5.48828 16.6746 5.55144 16.7589 5.65955Z" fill="#C5C5C5"/>
+</svg>
diff --git a/packages/core/resources/icons/aws/sagemaker/jupyter-lab.svg b/packages/core/resources/icons/aws/sagemaker/jupyter-lab.svg
new file mode 100644
index 00000000000..c2a31bc0363
--- /dev/null
+++ b/packages/core/resources/icons/aws/sagemaker/jupyter-lab.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.40039 8.1604C9.25753 0.480324 14.7432 0.480458 21.6004 8.16038C12.0004 4.3202 12.0004 4.3202 2.40039 8.1604Z" fill="#C5C5C5"/>
+<path d="M21.6004 15.8404C14.7432 23.5205 9.25753 23.5203 2.40039 15.8404C12.0004 19.6806 12.0004 19.6806 21.6004 15.8404Z" fill="#C5C5C5"/>
+</svg>
diff --git a/packages/core/resources/icons/aws/sagemakerunifiedstudio/catalog.svg b/packages/core/resources/icons/aws/sagemakerunifiedstudio/catalog.svg
new file mode 100644
index 00000000000..4bd5988c386
--- /dev/null
+++ b/packages/core/resources/icons/aws/sagemakerunifiedstudio/catalog.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3 18.5V5C3 3.34315 4.34315 2 6 2H20C20.5523 2 21 2.44772 21 3V21C21 21.5523 20.5523 22 20 22H6.5C4.567 22 3 20.433 3 18.5ZM19 20V17H6.5C5.67157 17 5 17.6716 5 18.5C5 19.3284 5.67157 20 6.5 20H19ZM5 15.3368C5.45463 15.1208 5.9632 15 6.5 15H19V4H6C5.44772 4 5 4.44772 5 5V15.3368Z" fill="#CCCCCC"/>
+</svg>
diff --git a/packages/core/resources/icons/aws/sagemakerunifiedstudio/spaces-dark.svg b/packages/core/resources/icons/aws/sagemakerunifiedstudio/spaces-dark.svg
new file mode 100644
index 00000000000..3d3950ef9be
--- /dev/null
+++ b/packages/core/resources/icons/aws/sagemakerunifiedstudio/spaces-dark.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3 13.6504H10C10.1933 13.6504 10.3496 13.8067 10.3496 14V21C10.3496 21.1933 10.1933 21.3496 10 21.3496H3C2.8067 21.3496 2.65039 21.1933 2.65039 21V14C2.65039 13.8067 2.8067 13.6504 3 13.6504ZM14 13.6504H21C21.1933 13.6504 21.3496 13.8067 21.3496 14V21C21.3496 21.1933 21.1933 21.3496 21 21.3496H14C13.8067 21.3496 13.6504 21.1933 13.6504 21V14C13.6504 13.8067 13.8067 13.6504 14 13.6504ZM3 2.65039H10C10.1933 2.65039 10.3496 2.8067 10.3496 3V10C10.3496 10.1933 10.1933 10.3496 10 10.3496H3C2.8067 10.3496 2.65039 10.1933 2.65039 10V3C2.65039 2.8067 2.8067 2.65039 3 2.65039ZM14 2.65039H21C21.1933 2.65039 21.3496 2.8067 21.3496 3V10C21.3496 10.1933 21.1933 10.3496 21 10.3496H14C13.8067 10.3496 13.6504 10.1933 13.6504 10V3C13.6504 2.8067 13.8067 2.65039 14 2.65039Z" stroke="#3B3B3B"
+        stroke-width="1.3"/>
+</svg>
\ No newline at end of file
diff --git a/packages/core/resources/icons/aws/sagemakerunifiedstudio/spaces.svg b/packages/core/resources/icons/aws/sagemakerunifiedstudio/spaces.svg
new file mode 100644
index 00000000000..e559fa399c7
--- /dev/null
+++ b/packages/core/resources/icons/aws/sagemakerunifiedstudio/spaces.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3 13.6504H10C10.1933 13.6504 10.3496 13.8067 10.3496 14V21C10.3496 21.1933 10.1933 21.3496 10 21.3496H3C2.8067 21.3496 2.65039 21.1933 2.65039 21V14C2.65039 13.8067 2.8067 13.6504 3 13.6504ZM14 13.6504H21C21.1933 13.6504 21.3496 13.8067 21.3496 14V21C21.3496 21.1933 21.1933 21.3496 21 21.3496H14C13.8067 21.3496 13.6504 21.1933 13.6504 21V14C13.6504 13.8067 13.8067 13.6504 14 13.6504ZM3 2.65039H10C10.1933 2.65039 10.3496 2.8067 10.3496 3V10C10.3496 10.1933 10.1933 10.3496 10 10.3496H3C2.8067 10.3496 2.65039 10.1933 2.65039 10V3C2.65039 2.8067 2.8067 2.65039 3 2.65039ZM14 2.65039H21C21.1933 2.65039 21.3496 2.8067 21.3496 3V10C21.3496 10.1933 21.1933 10.3496 21 10.3496H14C13.8067 10.3496 13.6504 10.1933 13.6504 10V3C13.6504 2.8067 13.8067 2.65039 14 2.65039Z" stroke="#C5C5C5"
+        stroke-width="1.3"/>
+</svg>
\ No newline at end of file
diff --git a/packages/core/resources/icons/aws/sagemakerunifiedstudio/symbol-int.svg b/packages/core/resources/icons/aws/sagemakerunifiedstudio/symbol-int.svg
new file mode 100644
index 00000000000..18aa022e10f
--- /dev/null
+++ b/packages/core/resources/icons/aws/sagemakerunifiedstudio/symbol-int.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.4091 16.8638H4.30691V10.0654C4.30691 9.802 4.30691 9.57947 4.30691 9.39782C4.31545 9.21617 4.32399 9.04814 4.33254 8.89373C4.34108 8.73025 4.34963 8.56222 4.35817 8.38965C4.22147 8.53497 4.09758 8.65758 3.9865 8.75749C3.87543 8.8574 3.73445 8.98456 3.56357 9.13896L2.58954 9.98365L2 9.17984L4.47352 7.13624H5.4091V16.8638Z" fill="#C5C5C5"/>
+<path d="M14.7939 16.8638H8.7447V15.8692L11.1413 13.2943C11.6027 12.8038 11.9915 12.3678 12.3076 11.9864C12.6237 11.6049 12.863 11.2325 13.0253 10.8692C13.1876 10.4968 13.2688 10.0926 13.2688 9.65668C13.2688 9.1208 13.1193 8.71662 12.8202 8.44414C12.5212 8.16258 12.1324 8.0218 11.654 8.0218C11.2097 8.0218 10.8166 8.10354 10.4749 8.26703C10.1417 8.43052 9.79989 8.65758 9.44959 8.94823L8.84723 8.14441C9.08646 7.92643 9.34706 7.73115 9.62901 7.55858C9.91951 7.38601 10.2314 7.24977 10.5646 7.14986C10.9064 7.04995 11.2695 7 11.654 7C12.2264 7 12.7177 7.10445 13.1278 7.31335C13.5379 7.52225 13.8541 7.82198 14.0762 8.21253C14.3069 8.59401 14.4223 9.05268 14.4223 9.58856C14.4223 9.97003 14.3667 10.3333 14.2556 10.6785C14.1446 11.0145 13.9865 11.346 13.7814 11.673C13.5764 12 13.3286 12.3315 13.0381 12.6676C12.7476 13.0036 12.4272 13.3533 12.0769 13.7166L10.1673 15.7193V15.7738H14.7939V16.8638Z" fill="#C5C5C5"/>
+<path d="M21.718 9.41144C21.718 9.84741 21.6411 10.2243 21.4874 10.5422C21.3336 10.8601 21.1114 11.119 20.8209 11.3188C20.539 11.5186 20.2057 11.6594 19.8213 11.7411V11.7956C20.556 11.8865 21.1029 12.1317 21.4617 12.5313C21.8206 12.931 22 13.4532 22 14.0981C22 14.6612 21.8761 15.1653 21.6283 15.6104C21.3806 16.0463 20.9961 16.3869 20.4749 16.6322C19.9622 16.8774 19.3001 17 18.4884 17C18.0099 17 17.5656 16.9591 17.1555 16.8774C16.7454 16.8047 16.3523 16.6685 15.9764 16.4687V15.3515C16.3609 15.5513 16.7753 15.7103 17.2196 15.8283C17.6639 15.9373 18.0911 15.9918 18.5012 15.9918C19.3214 15.9918 19.911 15.8238 20.2698 15.4877C20.6372 15.1426 20.8209 14.6703 20.8209 14.0708C20.8209 13.6621 20.7184 13.3352 20.5133 13.0899C20.3168 12.8356 20.0263 12.6494 19.6418 12.5313C19.2573 12.4133 18.796 12.3542 18.2577 12.3542H17.3734V11.3324H18.2705C18.7746 11.3324 19.1933 11.2552 19.5265 11.1008C19.8682 10.9464 20.1246 10.733 20.2955 10.4605C20.4749 10.1789 20.5646 9.85649 20.5646 9.49319C20.5646 9.02089 20.4151 8.65758 20.116 8.40327C19.817 8.13987 19.4111 8.00817 18.8985 8.00817C18.5738 8.00817 18.279 8.04451 18.0142 8.11717C17.7493 8.18074 17.5015 8.27611 17.2708 8.40327C17.0487 8.52134 16.8223 8.66213 16.5916 8.82561L16.0277 8.00817C16.2498 7.82652 16.5019 7.65849 16.7838 7.50409C17.0743 7.34968 17.3947 7.22707 17.745 7.13624C18.0953 7.04541 18.4756 7 18.8857 7C19.8426 7 20.5518 7.22707 21.0132 7.6812C21.4831 8.13533 21.718 8.71208 21.718 9.41144Z" fill="#C5C5C5"/>
+</svg>
diff --git a/packages/core/resources/icons/aws/sagemakerunifiedstudio/table.svg b/packages/core/resources/icons/aws/sagemakerunifiedstudio/table.svg
new file mode 100644
index 00000000000..a8ac2aac05d
--- /dev/null
+++ b/packages/core/resources/icons/aws/sagemakerunifiedstudio/table.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20,4H4C3.4,4,3,4.4,3,5v14c0,0.6,0.4,1,1,1h16c0.6,0,1-0.4,1-1V5C21,4.4,20.6,4,20,4z M8,18H5v-2h3V18z M8,15H5v-2h3V15z M8,12H5v-2h3V12z M19,18H9v-2h10V18z M19,15H9v-2h10V15z M19,12H9v-2h10V12z" fill="#CCCCCC"/>
+</svg>
diff --git a/resources/icons/aws/schemas/registry.svg b/packages/core/resources/icons/aws/schemas/registry.svg
similarity index 100%
rename from resources/icons/aws/schemas/registry.svg
rename to packages/core/resources/icons/aws/schemas/registry.svg
diff --git a/resources/icons/aws/schemas/schema.svg b/packages/core/resources/icons/aws/schemas/schema.svg
similarity index 100%
rename from resources/icons/aws/schemas/schema.svg
rename to packages/core/resources/icons/aws/schemas/schema.svg
diff --git a/resources/icons/aws/stepfunctions/preview.svg b/packages/core/resources/icons/aws/stepfunctions/preview.svg
similarity index 100%
rename from resources/icons/aws/stepfunctions/preview.svg
rename to packages/core/resources/icons/aws/stepfunctions/preview.svg
diff --git a/packages/core/resources/icons/fonts/aws-toolkit-icons.woff b/packages/core/resources/icons/fonts/aws-toolkit-icons.woff
new file mode 100644
index 00000000000..f17f02c9974
Binary files /dev/null and b/packages/core/resources/icons/fonts/aws-toolkit-icons.woff differ
diff --git a/resources/icons/vscode/LICENSE.txt b/packages/core/resources/icons/vscode/LICENSE.txt
similarity index 100%
rename from resources/icons/vscode/LICENSE.txt
rename to packages/core/resources/icons/vscode/LICENSE.txt
diff --git a/resources/icons/vscode/README.md b/packages/core/resources/icons/vscode/README.md
similarity index 100%
rename from resources/icons/vscode/README.md
rename to packages/core/resources/icons/vscode/README.md
diff --git a/resources/icons/vscode/codicons/info.svg b/packages/core/resources/icons/vscode/codicons/info.svg
similarity index 100%
rename from resources/icons/vscode/codicons/info.svg
rename to packages/core/resources/icons/vscode/codicons/info.svg
diff --git a/resources/icons/vscode/codicons/pass.svg b/packages/core/resources/icons/vscode/codicons/pass.svg
similarity index 100%
rename from resources/icons/vscode/codicons/pass.svg
rename to packages/core/resources/icons/vscode/codicons/pass.svg
diff --git a/resources/icons/vscode/codicons/play-circle.svg b/packages/core/resources/icons/vscode/codicons/play-circle.svg
similarity index 100%
rename from resources/icons/vscode/codicons/play-circle.svg
rename to packages/core/resources/icons/vscode/codicons/play-circle.svg
diff --git a/resources/icons/vscode/codicons/stop-circle.svg b/packages/core/resources/icons/vscode/codicons/stop-circle.svg
similarity index 100%
rename from resources/icons/vscode/codicons/stop-circle.svg
rename to packages/core/resources/icons/vscode/codicons/stop-circle.svg
diff --git a/resources/icons/vscode/dark/check.svg b/packages/core/resources/icons/vscode/dark/check-old.svg
similarity index 100%
rename from resources/icons/vscode/dark/check.svg
rename to packages/core/resources/icons/vscode/dark/check-old.svg
diff --git a/packages/core/resources/icons/vscode/dark/clear-all.svg b/packages/core/resources/icons/vscode/dark/clear-all.svg
new file mode 100644
index 00000000000..24571c077fa
--- /dev/null
+++ b/packages/core/resources/icons/vscode/dark/clear-all.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.0001 12.6L10.7001 13.3L12.3001 11.7L13.9001 13.3L14.7001 12.6L13.0001 11L14.7001 9.40005L13.9001 8.60005L12.3001 10.3L10.7001 8.60005L10.0001 9.40005L11.6001 11L10.0001 12.6Z" fill="#C5C5C5"/>
+<path d="M1.00006 4L15.0001 4L15.0001 3L1.00006 3L1.00006 4Z" fill="#C5C5C5"/>
+<path d="M1.00006 7L15.0001 7L15.0001 6L1.00006 6L1.00006 7Z" fill="#C5C5C5"/>
+<path d="M9.00006 9.5L9.00006 9L1.00006 9L1.00006 10L9.00006 10L9.00006 9.5Z" fill="#C5C5C5"/>
+<path d="M9.00006 13L9.00006 12.5L9.00006 12L1.00006 12L1.00006 13L9.00006 13Z" fill="#C5C5C5"/>
+</svg>
diff --git a/resources/icons/vscode/dark/help.svg b/packages/core/resources/icons/vscode/dark/help.svg
similarity index 100%
rename from resources/icons/vscode/dark/help.svg
rename to packages/core/resources/icons/vscode/dark/help.svg
diff --git a/resources/icons/vscode/dark/refresh.svg b/packages/core/resources/icons/vscode/dark/refresh.svg
similarity index 100%
rename from resources/icons/vscode/dark/refresh.svg
rename to packages/core/resources/icons/vscode/dark/refresh.svg
diff --git a/packages/core/resources/icons/vscode/dark/shield.svg b/packages/core/resources/icons/vscode/dark/shield.svg
new file mode 100644
index 00000000000..4df4c433358
--- /dev/null
+++ b/packages/core/resources/icons/vscode/dark/shield.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="#c5c5c5"><path fill-rule="evenodd" clip-rule="evenodd" d="M8.246 14.713a27.792 27.792 0 0 1-1.505-.953c-.501-.34-.983-.707-1.444-1.1-.458-.395-.888-.82-1.288-1.274-.4-.455-.753-.95-1.05-1.478a7.8 7.8 0 0 1-.7-1.69A7.041 7.041 0 0 1 2 6.3V3.1l.5-.5c.333 0 .656-.011.97-.036.296-.023.591-.066.882-.128.284-.062.562-.148.832-.256.284-.118.557-.261.816-.427a4.83 4.83 0 0 1 1.184-.565 4.8 4.8 0 0 1 2-.142 4.018 4.018 0 0 1 1.237.383c.199.097.392.204.58.322.26.167.535.31.821.428.27.109.547.194.831.256.291.062.587.106.884.129.311.024.634.035.967.035l.5.5v3.2a7.043 7.043 0 0 1-.256 1.919 7.804 7.804 0 0 1-.7 1.69 8.751 8.751 0 0 1-1.05 1.478c-.4.452-.829.877-1.286 1.27a15.94 15.94 0 0 1-1.448 1.1 28.71 28.71 0 0 1-1.51.956h-.508zM3 3.59V6.3c-.004.555.07 1.11.22 1.645a6.7 6.7 0 0 0 .61 1.473c.263.467.575.905.93 1.308.37.417.766.81 1.188 1.174.432.368.883.712 1.352 1.03.4.267.8.523 1.2.769.4-.242.8-.498 1.2-.768.47-.319.923-.663 1.355-1.031.421-.364.817-.756 1.186-1.172a7.8 7.8 0 0 0 .93-1.308c.261-.465.466-.96.61-1.473.15-.537.223-1.09.22-1.647V3.59c-.159 0-.313-.012-.465-.023l-.079-.006a7.95 7.95 0 0 1-1.018-.147 6.112 6.112 0 0 1-1.976-.814 5.166 5.166 0 0 0-.482-.27 3.123 3.123 0 0 0-.943-.29 3.686 3.686 0 0 0-1.558.106c-.332.108-.649.26-.94.452-.312.2-.64.372-.983.513a6.4 6.4 0 0 1-1 .307c-.335.07-.675.12-1.017.146-.174.01-.355.02-.54.026zm6.065 4.3a1.5 1.5 0 1 0-1.13 0L7.5 10.5h2l-.435-2.61z"/></svg>
diff --git a/resources/icons/vscode/light/check.svg b/packages/core/resources/icons/vscode/light/check-old.svg
similarity index 100%
rename from resources/icons/vscode/light/check.svg
rename to packages/core/resources/icons/vscode/light/check-old.svg
diff --git a/packages/core/resources/icons/vscode/light/clear-all.svg b/packages/core/resources/icons/vscode/light/clear-all.svg
new file mode 100644
index 00000000000..5038d167ea6
--- /dev/null
+++ b/packages/core/resources/icons/vscode/light/clear-all.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.0002 12.6L10.7002 13.3L12.3002 11.7L13.9002 13.3L14.7002 12.6L13.0002 11L14.7002 9.40005L13.9002 8.60005L12.3002 10.3L10.7002 8.60005L10.0002 9.40005L11.6002 11L10.0002 12.6Z" fill="#424242"/>
+<path d="M1.00024 4L15.0002 4L15.0002 3L1.00024 3L1.00024 4Z" fill="#424242"/>
+<path d="M1.00024 7L15.0002 7L15.0002 6L1.00024 6L1.00024 7Z" fill="#424242"/>
+<path d="M9.00024 9.5L9.00024 9L1.00024 9L1.00024 10L9.00024 10L9.00024 9.5Z" fill="#424242"/>
+<path d="M9.00024 13L9.00024 12.5L9.00024 12L1.00024 12L1.00024 13L9.00024 13Z" fill="#424242"/>
+</svg>
diff --git a/packages/core/resources/icons/vscode/light/cloud-upload.svg b/packages/core/resources/icons/vscode/light/cloud-upload.svg
new file mode 100644
index 00000000000..8d4bc7722a8
--- /dev/null
+++ b/packages/core/resources/icons/vscode/light/cloud-upload.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.9564 6H12.0063C12.8003 6 13.5617 6.31607 14.1231 6.87868C14.6845 7.44129 14.9999 8.20435 14.9999 9C14.9999 9.79565 14.6845 10.5587 14.1231 11.1213C13.5617 11.6839 12.8003 12 12.0063 12H10.0106V11H12.0063C12.5356 11 13.0432 10.7893 13.4175 10.4142C13.7918 10.0391 14.002 9.53044 14.002 9C14.002 8.46957 13.7918 7.96086 13.4175 7.58579C13.0432 7.21072 12.5356 7 12.0063 7H11.0923L10.9686 6.143C10.8937 5.60541 10.6455 5.10711 10.2617 4.72407C9.87792 4.34103 9.37968 4.09427 8.84295 4.02143C8.30621 3.94859 7.76044 4.05365 7.28883 4.3206C6.81723 4.58754 6.44567 5.00173 6.23082 5.5L5.89754 6.262L5.08929 6.073C4.90378 6.02699 4.71361 6.0025 4.52251 6C3.8609 6 3.22639 6.2634 2.75856 6.73224C2.29073 7.20108 2.02791 7.83696 2.02791 8.5C2.02791 9.16304 2.29073 9.79893 2.75856 10.2678C3.22639 10.7366 3.8609 11 4.52251 11H7.01712V12H4.52251C4.02742 12.0043 3.53708 11.903 3.08401 11.7029C2.63095 11.5028 2.22551 11.2084 1.8946 10.8394C1.56369 10.4703 1.31487 10.0349 1.16465 9.56211C1.01442 9.08932 0.966218 8.58992 1.02324 8.09704C1.08026 7.60416 1.24121 7.12906 1.49539 6.70326C1.74958 6.27745 2.0912 5.91068 2.4976 5.62727C2.904 5.34385 3.36588 5.15027 3.85261 5.05937C4.33935 4.96847 4.8398 4.98232 5.32079 5.1C5.62405 4.40501 6.14506 3.82799 6.8049 3.45635C7.46474 3.08472 8.22745 2.9387 8.97752 3.04044C9.72759 3.14217 10.4241 3.4861 10.9617 4.02014C11.4992 4.55418 11.8484 5.24923 11.9564 6ZM10.2928 9.85348L8.97879 8.53944L8.97879 13.9749H7.98492L7.98493 8.57568L6.7071 9.85347L5.99999 9.14636L8.14643 6.99998H8.85354L10.9999 9.14637L10.2928 9.85348Z" fill="#C5C5C5"/>
+</svg>
diff --git a/resources/icons/vscode/light/help.svg b/packages/core/resources/icons/vscode/light/help.svg
similarity index 100%
rename from resources/icons/vscode/light/help.svg
rename to packages/core/resources/icons/vscode/light/help.svg
diff --git a/resources/icons/vscode/light/refresh.svg b/packages/core/resources/icons/vscode/light/refresh.svg
similarity index 100%
rename from resources/icons/vscode/light/refresh.svg
rename to packages/core/resources/icons/vscode/light/refresh.svg
diff --git a/packages/core/resources/icons/vscode/light/run.svg b/packages/core/resources/icons/vscode/light/run.svg
new file mode 100644
index 00000000000..8b0a58eca9b
--- /dev/null
+++ b/packages/core/resources/icons/vscode/light/run.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4 2V14.4805L12.9146 8.24024L4 2ZM11.1809 8.24024L4.995 12.5684V3.91209L11.1809 8.24024Z" fill="#C5C5C5"/>
+</svg>
diff --git a/packages/core/resources/icons/vscode/light/shield.svg b/packages/core/resources/icons/vscode/light/shield.svg
new file mode 100644
index 00000000000..e86757f9004
--- /dev/null
+++ b/packages/core/resources/icons/vscode/light/shield.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="#424242"><path fill-rule="evenodd" clip-rule="evenodd" d="M8.246 14.713a27.792 27.792 0 0 1-1.505-.953c-.501-.34-.983-.707-1.444-1.1-.458-.395-.888-.82-1.288-1.274-.4-.455-.753-.95-1.05-1.478a7.8 7.8 0 0 1-.7-1.69A7.041 7.041 0 0 1 2 6.3V3.1l.5-.5c.333 0 .656-.011.97-.036.296-.023.591-.066.882-.128.284-.062.562-.148.832-.256.284-.118.557-.261.816-.427a4.83 4.83 0 0 1 1.184-.565 4.8 4.8 0 0 1 2-.142 4.018 4.018 0 0 1 1.237.383c.199.097.392.204.58.322.26.167.535.31.821.428.27.109.547.194.831.256.291.062.587.106.884.129.311.024.634.035.967.035l.5.5v3.2a7.043 7.043 0 0 1-.256 1.919 7.804 7.804 0 0 1-.7 1.69 8.751 8.751 0 0 1-1.05 1.478c-.4.452-.829.877-1.286 1.27a15.94 15.94 0 0 1-1.448 1.1 28.71 28.71 0 0 1-1.51.956h-.508zM3 3.59V6.3c-.004.555.07 1.11.22 1.645a6.7 6.7 0 0 0 .61 1.473c.263.467.575.905.93 1.308.37.417.766.81 1.188 1.174.432.368.883.712 1.352 1.03.4.267.8.523 1.2.769.4-.242.8-.498 1.2-.768.47-.319.923-.663 1.355-1.031.421-.364.817-.756 1.186-1.172a7.8 7.8 0 0 0 .93-1.308c.261-.465.466-.96.61-1.473.15-.537.223-1.09.22-1.647V3.59c-.159 0-.313-.012-.465-.023l-.079-.006a7.95 7.95 0 0 1-1.018-.147 6.112 6.112 0 0 1-1.976-.814 5.166 5.166 0 0 0-.482-.27 3.123 3.123 0 0 0-.943-.29 3.686 3.686 0 0 0-1.558.106c-.332.108-.649.26-.94.452-.312.2-.64.372-.983.513a6.4 6.4 0 0 1-1 .307c-.335.07-.675.12-1.017.146-.174.01-.355.02-.54.026zm6.065 4.3a1.5 1.5 0 1 0-1.13 0L7.5 10.5h2l-.435-2.61z"/></svg>
diff --git a/packages/core/resources/images/severity-critical.svg b/packages/core/resources/images/severity-critical.svg
new file mode 100644
index 00000000000..3808e181487
--- /dev/null
+++ b/packages/core/resources/images/severity-critical.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 49 20" width="39" height="16" role="img" aria-label="Critical"><title>Critical</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="49" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="0" height="20" fill="#7d2105"/><rect x="0" width="49" height="20" fill="#7d2105"/><rect width="49" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="245" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="390">Critical</text><text x="245" y="140" transform="scale(.1)" fill="#fff" textLength="390">Critical</text></g></svg>
diff --git a/packages/core/resources/images/severity-high.svg b/packages/core/resources/images/severity-high.svg
new file mode 100644
index 00000000000..648e951c5f4
--- /dev/null
+++ b/packages/core/resources/images/severity-high.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 35 20" width="28" height="16" role="img" aria-label="High"><title>High</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="35" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="0" height="20" fill="#ba2e0f"/><rect x="0" width="35" height="20" fill="#ba2e0f"/><rect width="35" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="175" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="250">High</text><text x="175" y="140" transform="scale(.1)" fill="#fff" textLength="250">High</text></g></svg>
diff --git a/packages/core/resources/images/severity-info.svg b/packages/core/resources/images/severity-info.svg
new file mode 100644
index 00000000000..2bb7760f268
--- /dev/null
+++ b/packages/core/resources/images/severity-info.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 33 20" width="26" height="16" role="img" aria-label="Info"><title>Info</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="33" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="0" height="20" fill="#879596"/><rect x="0" width="33" height="20" fill="#879596"/><rect width="33" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="165" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="230">Info</text><text x="165" y="140" transform="scale(.1)" fill="#fff" textLength="230">Info</text></g></svg>
diff --git a/packages/core/resources/images/severity-low.svg b/packages/core/resources/images/severity-low.svg
new file mode 100644
index 00000000000..e14d1d39a92
--- /dev/null
+++ b/packages/core/resources/images/severity-low.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 31 20" width="25" height="16" role="img" aria-label="Low"><title>Low</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="31" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="0" height="20" fill="#b2911c"/><rect x="0" width="31" height="20" fill="#b2911c"/><rect width="31" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="155" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="210">Low</text><text x="155" y="140" transform="scale(.1)" fill="#fff" textLength="210">Low</text></g></svg>
diff --git a/packages/core/resources/images/severity-medium.svg b/packages/core/resources/images/severity-medium.svg
new file mode 100644
index 00000000000..121a1c0983c
--- /dev/null
+++ b/packages/core/resources/images/severity-medium.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 53 20" width="42" height="16" role="img" aria-label="Medium"><title>Medium</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="53" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="0" height="20" fill="#cc5f21"/><rect x="0" width="53" height="20" fill="#cc5f21"/><rect width="53" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="265" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">Medium</text><text x="265" y="140" transform="scale(.1)" fill="#fff" textLength="430">Medium</text></g></svg>
diff --git a/packages/core/resources/js/vsCodeExtensionInterface.js b/packages/core/resources/js/vsCodeExtensionInterface.js
new file mode 100644
index 00000000000..e9673318225
--- /dev/null
+++ b/packages/core/resources/js/vsCodeExtensionInterface.js
@@ -0,0 +1,180 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* eslint-disable no-undef */
+/* eslint-disable no-case-declarations */
+
+const autoSaveIntervalTimeout = 1000
+const checkThreatComposerAPITimeout = 50
+
+const vscode = acquireVsCodeApi()
+const instanceMapper = {}
+let disableAutoSave = false
+let theme = 'unknown'
+
+// Handle messages sent from the extension to the webview
+window.addEventListener('message', handleMessage)
+
+function handleMessage(event) {
+    const message = event.data // The json data that the extension sent
+
+    if (message.messageType === 'BROADCAST') {
+        switch (message.command) {
+            case 'FILE_CHANGED':
+                const fileContents = message.fileContents
+
+                // Persist state information.
+                // This state is returned in the call to `vscode.getState` below when a webview is reloaded.
+                vscode.setState({
+                    fileName: message.fileName,
+                    filePath: message.filePath,
+                    fileContents: fileContents,
+                })
+
+                // Update our webview's content
+                updateContent(fileContents)
+                break
+
+            case 'THEME_CHANGED':
+                applyTheme(message.newTheme)
+                break
+
+            case 'OVERWRITE_FILE':
+                disableAutoSave = false
+                break
+        }
+    } else if (message.messageType === 'RESPONSE') {
+        switch (message.command) {
+            case 'SAVE_FILE':
+                if (message.isSuccess) {
+                    console.log('File Saved successfully')
+                    disableAutoSave = false
+                } else {
+                    console.log('File Save unsuccessful')
+                }
+                break
+        }
+    }
+}
+
+function updateContent(/** @type {string} */ text) {
+    if (document.readyState !== 'loading') {
+        void render(text)
+    } else {
+        document.addEventListener('DOMContentLoaded', function () {
+            void render(text)
+        })
+    }
+}
+
+async function checkThreatComposerAPI() {
+    while (!window.threatcomposer || !window.threatcomposer.setCurrentWorkspaceData) {
+        await new Promise((r) => setTimeout(r, checkThreatComposerAPITimeout))
+    }
+}
+
+/**
+ * Render the document in the webview.
+ */
+async function render(/** @type {string} */ text) {
+    await checkThreatComposerAPI()
+
+    vscode.postMessage({
+        command: 'LOAD_STAGE',
+        messageType: 'BROADCAST',
+        loadStage: 'API_LOADED',
+    })
+
+    try {
+        let threatModel = text && JSON.parse(text)
+        await window.threatcomposer.setCurrentWorkspaceData(threatModel)
+    } catch (e) {
+        disableAutoSave = true
+        await window.threatcomposer.setCurrentWorkspaceData('')
+        vscode.postMessage({
+            command: 'LOG',
+            messageType: 'BROADCAST',
+            logMessage: e.message,
+            logType: 'ERROR',
+            showNotification: true,
+            notificationType: 'INVALID_JSON',
+        })
+    }
+
+    let defaultTemplate = ''
+
+    if (text === '') {
+        const initialState = await window.threatcomposer.getCurrentWorkspaceData()
+        defaultTemplate = window.threatcomposer.stringifyWorkspaceData(initialState)
+    }
+
+    window.threatcomposer.addEventListener('save', (e) => {
+        const stringyfiedData = window.threatcomposer.stringifyWorkspaceData(e.detail)
+        const currentState = vscode.getState()
+        currentState.fileContents = stringyfiedData
+        vscode.setState(currentState)
+        disableAutoSave = true
+
+        vscode.postMessage({
+            command: 'SAVE_FILE',
+            messageType: 'REQUEST',
+            fileContents: stringyfiedData,
+        })
+    })
+
+    autoSaveInterval = setInterval(async () => {
+        if (disableAutoSave) {
+            return
+        }
+
+        const data = await window.threatcomposer.getCurrentWorkspaceData()
+        const stringyfiedData = window.threatcomposer.stringifyWorkspaceData(data)
+
+        const currentState = vscode.getState()
+
+        if (stringyfiedData === defaultTemplate || stringyfiedData === currentState.fileContents) {
+            return
+        }
+
+        currentState.fileContents = stringyfiedData
+        vscode.setState(currentState)
+
+        vscode.postMessage({
+            command: 'AUTO_SAVE_FILE',
+            messageType: 'REQUEST',
+            fileContents: stringyfiedData,
+        })
+    }, autoSaveIntervalTimeout)
+
+    vscode.postMessage({
+        command: 'LOAD_STAGE',
+        messageType: 'BROADCAST',
+        loadStage: 'RENDER_COMPLETE',
+    })
+}
+
+function applyTheme(newTheme) {
+    if (!newTheme || theme === newTheme) {
+        return
+    }
+    theme = newTheme
+
+    window.threatcomposer.applyTheme(newTheme)
+}
+
+// Webviews are normally torn down when not visible and re-created when they become visible again.
+// State lets us save information across these re-loads
+const state = vscode.getState()
+if (state && state.fileContents) {
+    vscode.postMessage({
+        command: 'RELOAD',
+        messageType: 'REQUEST',
+    })
+} else {
+    vscode.postMessage({
+        command: 'INIT',
+        messageType: 'REQUEST',
+    })
+}
diff --git a/packages/core/resources/js/vscode.js b/packages/core/resources/js/vscode.js
new file mode 100644
index 00000000000..6567fe86b28
--- /dev/null
+++ b/packages/core/resources/js/vscode.js
@@ -0,0 +1,8 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// This injects the VSC webview API into frontend components
+// eslint-disable-next-line no-undef
+const vscode = acquireVsCodeApi()
diff --git a/resources/markdown/WelcomeToCodeWhisperer.md b/packages/core/resources/markdown/WelcomeToCodeWhisperer.md
similarity index 83%
rename from resources/markdown/WelcomeToCodeWhisperer.md
rename to packages/core/resources/markdown/WelcomeToCodeWhisperer.md
index a7681321ff3..d13e4f57612 100644
--- a/resources/markdown/WelcomeToCodeWhisperer.md
+++ b/packages/core/resources/markdown/WelcomeToCodeWhisperer.md
@@ -1,6 +1,6 @@
 ## Using Amazon CodeWhisperer
 
-CodeWhisperer uses machine learning to generate code suggestions from the existing code and comments in your IDE. Supported languages include **Java, Python, JavaScript, C# and TypeScript**.
+CodeWhisperer uses machine learning to generate code suggestions from the existing code and comments in your IDE. Supported languages include **Java, Python, JavaScript, C# , TypeScript, C, C++, Go, Rust, PHP, Scala, Kotlin, Ruby, Shell and SQL**.
 
 ---
 
@@ -20,6 +20,12 @@ You can request suggestions at any time. Use **Option-C** on Mac or **ALT-C** on
 
 ---
 
+**Customizing keyboard shortcuts**
+
+You can change CodeWhisperer keyboard shortcuts in [Keyboard Shortcuts Editor](https://code.visualstudio.com/docs/getstarted/keybindings). To open Keyboard Shortcuts Editor, go to Settings, and click on Keyboard shortcuts.
+
+---
+
 **Getting the best recommendations**
 
 For best results, follow these practices.
diff --git a/resources/markdown/WelcomeToCodeWhispererCloud9.md b/packages/core/resources/markdown/WelcomeToCodeWhispererCloud9.md
similarity index 100%
rename from resources/markdown/WelcomeToCodeWhispererCloud9.md
rename to packages/core/resources/markdown/WelcomeToCodeWhispererCloud9.md
diff --git a/packages/core/resources/markdown/lambda2sam.md b/packages/core/resources/markdown/lambda2sam.md
new file mode 100644
index 00000000000..ab43a89729a
--- /dev/null
+++ b/packages/core/resources/markdown/lambda2sam.md
@@ -0,0 +1,42 @@
+# Welcome to Lambda Development with AWS SAM
+
+This project was generated from existing ${sourceType} to ${stackName} stack using the AWS Toolkit for VS Code. Your Lambda functions are now a project in AWS Serverless Application Model (SAM). Here, you can manage your functions as infrastructure as code using the AWS SAM template. This eliminates the need for manual changes in the AWS Console, provides better version control, and allows automated deployments of your serverless resources.
+
+${warning}
+
+## Prerequisites
+
+Confirm you have installed the following tools:
+
+-   **The AWS CLI**: Needed to interact with AWS services from the command line.
+-   **The AWS SAM CLI:** Needed to locally build, invoke, and deploy your functions. Version 1.98+ is required.
+-   **Docker**: Optional, but required if you want to invoke locally, Docker is required.
+
+**Note:** For help on installing these tools, choose the **Application Builder** panel in **EXPLORER** or the AWS Toolkit Extension, and select **Walkthrough of Application Builder**.
+
+## What you can do with AWS SAM
+
+Your functions are ready for local development. You can either use the **AWS Application Builder** or the **SAM CLI** to edit and manage your functions.
+
+To get started using Application Builder, choose the **Application Builder** panel in **EXPLORER** or the AWS Toolkit Extension, and select **Walkthrough of Application Builder**.
+
+Use the following SAM CLI commands to manage your functions:
+
+-   **Build Your Code:** Run [`sam build`](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-cli-command-reference-sam-build.html) in the terminal to compile your code and install dependencies.
+-   **Test Locally:** Run the [`sam local invoke`](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-cli-command-reference-sam-local-invoke.html) and [`sam local start-api`](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-cli-command-reference-sam-local-start-api.html)commands in the terminal.
+-   **Deploy Your Changes:** Run [`sam deploy --guided`](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-cli-command-reference-sam-deploy.html) in the terminal to deploy your updated function to AWS.
+-   **Verify Deployment:** Run [`sam remote invoke`](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-cli-command-reference-remote-invoke.html) or go to the Lambda Console
+
+## Quick Reference
+
+-   **SAM Template**: [template.yaml](./template.yaml) - Contains your infrastructure as code
+-   **SAM Configuration**: [samconfig.toml](./samconfig.toml) - Contains deployment configuration
+
+## Advanced features
+
+You can also debug your functions locally with breakpoints, manage environment variables, work with layers and dependencies, and configure function triggers and permissions through the AWS Toolkit interface. For more details, refer to the following resources
+
+-   [AWS toolkit for Visual Studio Code User Guide](https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/welcome.html)
+-   [Working with Application Builder](https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/appbuilder-overview-overview.html)
+-   [AWS SAM Developer Guide](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/what-is-sam.html)
+-   [AWS SAM command line reference](http://https//docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-command-reference.html)
diff --git a/packages/core/resources/markdown/lambdaEdit.md b/packages/core/resources/markdown/lambdaEdit.md
new file mode 100644
index 00000000000..31733fb441e
--- /dev/null
+++ b/packages/core/resources/markdown/lambdaEdit.md
@@ -0,0 +1,19 @@
+# Welcome to Lambda local development
+
+Learn how to view your Lambda function locally, iterate, and deploy changes to the AWS Cloud.
+
+## Edit your Lambda function
+
+-   Make changes to your function code and save it. You will be prompted to deploy if you're done editing. You can come back later if you have more changes to make.
+-   Using the terminal and your favorite package manager, add dependencies for your project.
+
+## Manage your Lambda functions
+
+-   Select the AWS Toolkit icon in the left sidebar and select **EXPLORER**
+-   In your desired region, select the Lambda dropdown menu:
+    -   To save and deploy a previously edited Lambda function, select the ![deploy](./deploy.svg) icon next to your Lambda function.
+    -   To remotely invoke a function, select the ![invoke](./invoke.svg) icon next to your Lambda function.
+
+## Advanced features
+
+-   To convert to a Lambda function to an AWS SAM application, select the ![createStack](./create-stack.svg) icon next to your Lambda function. For details on what AWS SAM is and how it can help you, see the [AWS Serverless Application Model Developer Guide](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/what-is-sam.html).
diff --git a/resources/markdown/samReadme.md b/packages/core/resources/markdown/samReadme.md
similarity index 92%
rename from resources/markdown/samReadme.md
rename to packages/core/resources/markdown/samReadme.md
index e98229d9b5c..8b6a08eed57 100644
--- a/resources/markdown/samReadme.md
+++ b/packages/core/resources/markdown/samReadme.md
@@ -13,9 +13,9 @@ ${LISTOFCONFIGURATIONS}
 
 You can debug the Lambda handlers locally by adding a breakpoint to the source file, then running the launch configuration. This works by using Docker on your local machine.
 
-Invocation parameters, including payloads and request parameters, can be edited either by the `Edit SAM Debug Configuration` command (through the ${COMMANDPALETTE} or ${CODELENS}) or by editing the `launch.json` file.
+Invocation parameters, including payloads and request parameters, can be edited either by the `Invoke Locally` command (through the ${COMMANDPALETTE} or ${CODELENS}) or by editing the `launch.json` file.
 
-${COMPANYNAME} Lambda functions not defined in the [`template.yaml`](./template.yaml) file can be invoked and debugged by creating a launch configuration through the ${CODELENS} over the function declaration, or with the `Add SAM Debug Configuration` command.
+${COMPANYNAME} Lambda functions not defined in the [`template.yaml`](./template.yaml) file can be invoked and debugged by creating a launch configuration through the ${CODELENS} over the function declaration, or with the `Add Local Invoke and Debug Configuration` command.
 
 ## Deploying Serverless Applications
 
diff --git a/resources/markdown/twosum_vsc.gif b/packages/core/resources/markdown/twosum_vsc.gif
similarity index 100%
rename from resources/markdown/twosum_vsc.gif
rename to packages/core/resources/markdown/twosum_vsc.gif
diff --git a/packages/core/resources/marketplace/amazonq-icon-256x256.png b/packages/core/resources/marketplace/amazonq-icon-256x256.png
new file mode 100644
index 00000000000..345d212cd79
Binary files /dev/null and b/packages/core/resources/marketplace/amazonq-icon-256x256.png differ
diff --git a/resources/marketplace/aws-icon-256x256.png b/packages/core/resources/marketplace/aws-icon-256x256.png
similarity index 100%
rename from resources/marketplace/aws-icon-256x256.png
rename to packages/core/resources/marketplace/aws-icon-256x256.png
diff --git a/resources/marketplace/cloud9/Codelens-YAML-template.png b/packages/core/resources/marketplace/cloud9/Codelens-YAML-template.png
similarity index 100%
rename from resources/marketplace/cloud9/Codelens-YAML-template.png
rename to packages/core/resources/marketplace/cloud9/Codelens-YAML-template.png
diff --git a/resources/marketplace/cloud9/Codelens-direct-function.png b/packages/core/resources/marketplace/cloud9/Codelens-direct-function.png
similarity index 100%
rename from resources/marketplace/cloud9/Codelens-direct-function.png
rename to packages/core/resources/marketplace/cloud9/Codelens-direct-function.png
diff --git a/resources/marketplace/cloud9/open-commands-cn.png b/packages/core/resources/marketplace/cloud9/open-commands-cn.png
similarity index 100%
rename from resources/marketplace/cloud9/open-commands-cn.png
rename to packages/core/resources/marketplace/cloud9/open-commands-cn.png
diff --git a/resources/marketplace/cloud9/open-commands-en.png b/packages/core/resources/marketplace/cloud9/open-commands-en.png
similarity index 100%
rename from resources/marketplace/cloud9/open-commands-en.png
rename to packages/core/resources/marketplace/cloud9/open-commands-en.png
diff --git a/resources/marketplace/cloud9/overview-aws-explorer-cn.png b/packages/core/resources/marketplace/cloud9/overview-aws-explorer-cn.png
similarity index 100%
rename from resources/marketplace/cloud9/overview-aws-explorer-cn.png
rename to packages/core/resources/marketplace/cloud9/overview-aws-explorer-cn.png
diff --git a/resources/marketplace/cloud9/overview-aws-explorer-en.png b/packages/core/resources/marketplace/cloud9/overview-aws-explorer-en.png
similarity index 100%
rename from resources/marketplace/cloud9/overview-aws-explorer-en.png
rename to packages/core/resources/marketplace/cloud9/overview-aws-explorer-en.png
diff --git a/resources/marketplace/cloud9/sam-configure-and-run-still-cn.png b/packages/core/resources/marketplace/cloud9/sam-configure-and-run-still-cn.png
similarity index 100%
rename from resources/marketplace/cloud9/sam-configure-and-run-still-cn.png
rename to packages/core/resources/marketplace/cloud9/sam-configure-and-run-still-cn.png
diff --git a/resources/marketplace/cloud9/sam-configure-and-run-still-en.png b/packages/core/resources/marketplace/cloud9/sam-configure-and-run-still-en.png
similarity index 100%
rename from resources/marketplace/cloud9/sam-configure-and-run-still-en.png
rename to packages/core/resources/marketplace/cloud9/sam-configure-and-run-still-en.png
diff --git a/packages/core/resources/policychecks-tf-default.yaml b/packages/core/resources/policychecks-tf-default.yaml
new file mode 100644
index 00000000000..9df0c451076
--- /dev/null
+++ b/packages/core/resources/policychecks-tf-default.yaml
@@ -0,0 +1,121 @@
+# generate fake ARN
+# default can be specified using the following format:
+# {<key>?<default>}
+arnServiceMap:
+    aws_iam_policy: name?fakename
+    aws_iam_user_policy: name?fakename
+    aws_iam_role: name?fakename
+    aws_iam_role_policy: name
+    aws_iam_group_policy: name
+    aws_api_gateway_rest_api_policy: rest_api_id?fakeRestApiId
+    aws_backup_vault_policy: backup_vault_name?fakeBackupVaultName
+    aws_cloudwatch_event_bus_policy: event_bus_name?fakeEventBusName
+    aws_cloudwatch_log_destination_policy: destination_name?fakeDestinationName
+    aws_codeartifact_domain_permissions_policy: domain?fakeDomain
+    aws_codeartifact_repository_permissions_policy: repository?fakeRepository
+    aws_codebuild_resource_policy: fakename
+    aws_ecr_registry_policy: fakename
+    aws_ecr_repository_policy: repository?fakeRepositoryName
+    aws_ecrpublic_repository_policy: repository_name?fakeRepositoryName
+    aws_efs_file_system_policy: file_system_id?fakeFileSystemId
+    aws_elasticsearch_domain: domain_name?fakeDomainName
+    aws_elasticsearch_domain_policy: domain_name?fakeDomainName
+    aws_glacier_vault: name?fakename
+    aws_glacier_vault_lock: vault_name?fakeVaultName
+    aws_glue_resource_policy: fakeName
+    aws_iot_policy: name?fakename
+    aws_kms_external_key: fakeName
+    aws_kms_key: fakeName
+    aws_kms_replica_external_key: fakeName
+    aws_kms_replica_key: fakeName
+    # aws_lambda_layer_version_permission: layer_name?fakeLayberName
+    aws_media_store_container_policy: container_name?fakeContainerName
+    aws_networkfirewall_resource_policy: resource_arn?fakeResourceArn
+    aws_organizations_policy: name?fakename
+    aws_s3_access_point: name?fakename
+    aws_s3_bucket: bucket?fakeBucket
+    aws_s3_bucket_policy: bucket?fakeBucket
+    aws_s3control_access_point_policy: access_point_arn?fakeAccessPointArn
+    aws_s3control_bucket_policy: bucket?fakeBucket
+    aws_s3control_multi_region_access_point_policy: details.name?fakename
+    aws_s3control_object_lambda_access_point_policy: name?fakename
+    aws_ses_identity_policy: name?fakename
+    aws_sns_topic: name?fakename
+    aws_sns_topic_policy: arn?fakename
+    aws_sqs_queue: name?fakename
+    aws_sqs_queue_policy: fakeQueueUrl
+    aws_ssoadmin_permission_set_inline_policy: instance_arn?fakeSSOInstanceArn
+    aws_sagemaker_model_package_group_policy: model_package_group_name?fakeModelPackageGroupName
+    aws_secretsmanager_secret: name?fakename
+    aws_secretsmanager_secret_policy: secret_arn?fakeSecretArn
+    aws_transfer_access: server_id?fakeServerId
+    aws_transfer_user: user_name?fakeUserName
+    aws_vpc_endpoint: fakeName
+# iamChecks:
+#   - AccessAnalyzer
+
+# iamExceptions:
+#   AccessAnalyzer:
+#     - Arn: "arn:aws:iam::123456789012:policy/test_policy"
+
+iamPolicyAttributes:
+    aws_iam_group_policy: policy
+    aws_iam_policy: policy
+    aws_iam_role:
+        - assume_role_policy
+        - inline_policy.policy
+    aws_iam_role_policy: policy
+    aws_iam_user_policy: policy
+    aws_api_gateway_rest_api: policy #note
+    aws_api_gateway_rest_api_policy: policy
+    aws_backup_vault_policy: policy
+    aws_cloudwatch_event_bus_policy: policy
+    aws_cloudwatch_log_destination_policy: access_policy
+    aws_cloudwatch_log_resource_policy: policy
+    aws_codeartifact_domain_permissions_policy: policy_document
+    aws_codeartifact_repository_permissions_policy: policy_document
+    aws_codebuild_resource_policy: policy
+    aws_ecr_registry_policy: policy
+    aws_ecr_repository_policy: policy
+    aws_ecrpublic_repository_policy: policy
+    aws_efs_file_system_policy: policy
+    aws_elasticsearch_domain: access_policies
+    aws_elasticsearch_domain_policy: access_policies
+    aws_glacier_vault: access_policy
+    aws_glacier_vault_lock: access_policy
+    aws_glue_resource_policy: policy
+    aws_iot_policy: policy
+    aws_kms_external_key: policy
+    aws_kms_key: policy
+    aws_kms_replica_external_key: policy
+    aws_kms_replica_key: policy
+    # aws_lambda_layer_version_permission: policy
+    aws_media_store_container_policy: policy
+    aws_networkfirewall_resource_policy: policy
+    aws_organizations_policy: content
+    aws_s3_access_point: policy
+    aws_s3_bucket: policy
+    aws_s3_bucket_policy: policy
+    aws_s3control_access_point_policy: policy
+    aws_s3control_bucket_policy: policy
+    aws_s3control_multi_region_access_point_policy: details.policy
+    aws_s3control_object_lambda_access_point_policy: policy
+    aws_ses_identity_policy: policy
+    aws_sns_topic: policy
+    aws_sns_topic_policy: policy
+    aws_sqs_queue: policy
+    aws_sqs_queue_policy: policy
+    aws_ssoadmin_permission_set_inline_policy: inline_policy
+    aws_sagemaker_model_package_group_policy: resource_policy
+    aws_secretsmanager_secret: policy
+    aws_secretsmanager_secret_policy: policy
+    aws_transfer_access: policy
+    aws_transfer_user: policy
+    aws_vpc_endpoint: policy
+
+validatePolicyResourceType:
+    aws_s3_bucket: AWS::S3::Bucket
+    aws_s3_bucket_policy: AWS::S3::Bucket
+    aws_s3control_access_point_policy: AWS::S3::AccessPoint
+    aws_s3control_multi_region_access_point_policy: AWS::S3::MultiRegionAccessPoint
+    aws_s3control_object_lambda_access_point_policy: AWS::S3ObjectLambda::AccessPoint
diff --git a/packages/core/resources/sagemaker_connect b/packages/core/resources/sagemaker_connect
new file mode 100755
index 00000000000..ede46c1c4b3
--- /dev/null
+++ b/packages/core/resources/sagemaker_connect
@@ -0,0 +1,145 @@
+#!/bin/bash
+
+set -x
+
+_get_ssm_session_info() {
+    local credentials_type="$1"
+    local aws_resource_arn="$2"
+    local local_endpoint_port="$3"
+
+    local url_to_get_session_info="http://localhost:${local_endpoint_port}/get_session?connection_identifier=${aws_resource_arn}&credentials_type=${credentials_type}"
+
+    # Generate unique temporary file name to avoid conflicts
+    local temp_file="/tmp/ssm_session_response_$$_$(date +%s%N).json"
+
+    # Use curl with --write-out to capture HTTP status
+    response=$(curl -s -w "%{http_code}" -o "$temp_file" "$url_to_get_session_info")
+    http_status="${response: -3}"
+    session_json=$(cat "$temp_file")
+    
+    # Clean up temporary file
+    rm -f "$temp_file"
+
+    if [[ "$http_status" -ne 200 ]]; then
+        echo "Error: Failed to get SSM session info. HTTP status: $http_status"
+        echo "Response: $session_json"
+        exit 1
+    fi
+
+    if [ -z "$session_json" ]; then
+        echo "Error: SSM connection info is empty."
+        exit 1
+    fi
+
+    export SSM_SESSION_JSON="$session_json"
+}
+
+_get_ssm_session_info_async() {
+    local credentials_type="$1"
+    local aws_resource_arn="$2"
+    local local_endpoint_port="$3"
+
+    local request_id=$(date +%s%3N)
+    local url_base="http://localhost:${local_endpoint_port}/get_session_async"
+    local url_to_get_session_info="${url_base}?connection_identifier=${aws_resource_arn}&credentials_type=${credentials_type}&request_id=${request_id}"
+
+    # Generate unique temporary file name to avoid conflicts
+    local temp_file="/tmp/ssm_session_response_$$_$(date +%s%N).json"
+
+    local max_retries=8
+    local retry_interval=5
+    local attempt=1
+
+    while (( attempt <= max_retries )); do
+        response=$(curl -s -w "%{http_code}" -o "$temp_file" "$url_to_get_session_info")
+        http_status="${response: -3}"
+        session_json=$(cat "$temp_file")
+
+        if [[ "$http_status" -eq 200 ]]; then
+            # Clean up temporary file on success
+            rm -f "$temp_file"
+            export SSM_SESSION_JSON="$session_json"
+            return 0
+        elif [[ "$http_status" -eq 202 || "$http_status" -eq 204 ]]; then
+            echo "Info: Session not ready (HTTP $http_status). Retrying in $retry_interval seconds... [$attempt/$max_retries]"
+            sleep $retry_interval
+            ((attempt++))
+        else
+            echo "Error: Failed to get SSM session info. HTTP status: $http_status"
+            echo "Response: $session_json"
+            # Clean up temporary file on error
+            rm -f "$temp_file"
+            exit 1
+        fi
+    done
+
+    # Clean up temporary file on timeout
+    rm -f "$temp_file"
+    echo "Error: Timed out after $max_retries attempts waiting for session to be ready."
+    exit 1
+}
+
+
+# Validate input
+if [ "$#" -ne 1 ]; then
+    echo "Usage: $0 <hostname>"
+    exit 1
+fi
+
+HOSTNAME="$1"
+
+# Parse creds_type and AWS resource ARN from HOSTNAME
+if [[ "$HOSTNAME" =~ ^sm_([^_]+)_(arn_._aws.*)$ ]]; then
+    CREDS_TYPE="${BASH_REMATCH[1]}"
+    AWS_RESOURCE_ARN="${BASH_REMATCH[2]}"
+else
+    echo "Hostname: $HOSTNAME"
+    echo "Invalid hostname format. Expected format: sm_<creds-type>_<AWSResourceARN>"
+    exit 1
+fi
+
+# Workaround: Replace "__" with "/" in ARN
+AWS_RESOURCE_ARN=$(echo "${AWS_RESOURCE_ARN}" | sed 's|__|/|g; s|_._|:|g; s|jupyterlab/default|JupyterLab/default|g')
+REGION=$(echo "$AWS_RESOURCE_ARN" | cut -d: -f4)
+
+# Validate credentials type
+if [[ "$CREDS_TYPE" != "lc" && "$CREDS_TYPE" != "dl" ]]; then
+    echo "Invalid creds_type. Must be 'lc' or 'dl'."
+    exit 1
+fi
+
+# Validate required env var and file
+if [ -z "$SAGEMAKER_LOCAL_SERVER_FILE_PATH" ]; then
+    echo "[Error] SAGEMAKER_LOCAL_SERVER_FILE_PATH is not set"
+    exit 1
+fi
+
+if [ ! -f "$SAGEMAKER_LOCAL_SERVER_FILE_PATH" ]; then
+    echo "[Error] File not found at SAGEMAKER_LOCAL_SERVER_FILE_PATH: $SAGEMAKER_LOCAL_SERVER_FILE_PATH"
+    exit 1
+fi
+
+# Extract port from file
+LOCAL_ENDPOINT_PORT=$(jq -r '.port' "$SAGEMAKER_LOCAL_SERVER_FILE_PATH")
+if [ -z "$LOCAL_ENDPOINT_PORT" ] || [ "$LOCAL_ENDPOINT_PORT" == "null" ]; then
+    echo "[Error] 'port' field is missing or invalid in $SAGEMAKER_LOCAL_SERVER_FILE_PATH"
+    exit 1
+fi
+
+# Determine region from ARN
+if [ "$CREDS_TYPE" == "lc" ]; then
+    credentials_type="local"
+    _get_ssm_session_info "$credentials_type" "$AWS_RESOURCE_ARN" "$LOCAL_ENDPOINT_PORT"
+elif [ "$CREDS_TYPE" == "dl" ]; then
+    credentials_type="deeplink"
+    _get_ssm_session_info_async "$credentials_type" "$AWS_RESOURCE_ARN" "$LOCAL_ENDPOINT_PORT"
+else
+    echo "[Error] Invalid creds_type. Must be 'lc' or 'dl'."
+    exit 1
+fi
+
+echo "Extracting AWS_SSM_CLI: $AWS_SSM_CLI"
+
+# Execute the session
+AWS_SSM_CLI="${AWS_SSM_CLI:=session-manager-plugin}" 
+exec "${AWS_SSM_CLI}" "$SSM_SESSION_JSON" "$REGION" StartSession
diff --git a/packages/core/resources/sagemaker_connect.ps1 b/packages/core/resources/sagemaker_connect.ps1
new file mode 100644
index 00000000000..0e593d65b85
--- /dev/null
+++ b/packages/core/resources/sagemaker_connect.ps1
@@ -0,0 +1,148 @@
+param (
+    [Parameter(Mandatory = $true)][string]$Hostname
+)
+
+Write-Host "`n--- Script Start ---"
+Write-Host "Start Time: $(Get-Date -Format o)"
+Write-Host "Hostname argument received: $Hostname"
+
+Set-PSDebug -Trace 1
+
+function Get-SSMSessionInfo {
+    param (
+        [string]$CredentialsType,
+        [string]$AwsResourceArn,
+        [int]$LocalEndpointPort
+    )
+
+    Write-Host "Calling Get-SSMSessionInfo with credsType=${CredentialsType}, arn=${AwsResourceArn}, port=${LocalEndpointPort}"
+
+    $url = "http://127.0.0.1:$LocalEndpointPort/get_session?connection_identifier=$AwsResourceArn&credentials_type=$CredentialsType"
+    Write-Host "Request URL: $url"
+
+    try {
+        $response = Invoke-WebRequest -Uri $url -UseBasicParsing -ErrorAction Stop
+        Write-Host "Received response with status: $($response.StatusCode)"
+
+        if ($response.StatusCode -ne 200) {
+            Write-Error "Failed to get SSM session info. HTTP status: $($response.StatusCode)"
+            Write-Error "Response: $($response.Content)"
+            exit 1
+        }
+
+        if (-not $response.Content) {
+            Write-Error "SSM connection info is empty."
+            exit 1
+        }
+
+        $script:SSM_SESSION_JSON = $response.Content
+        Write-Host "Session JSON successfully retrieved"
+    } catch {
+        Write-Error "Exception in Get-SSMSessionInfo: $_"
+        exit 1
+    }
+}
+
+function Get-SSMSessionInfoAsync {
+    param (
+        [string]$CredentialsType,
+        [string]$AwsResourceArn,
+        [int]$LocalEndpointPort
+    )
+
+    $requestId = [string][DateTimeOffset]::Now.ToUnixTimeMilliseconds()
+    $url = "http://localhost:$LocalEndpointPort/get_session_async?connection_identifier=$AwsResourceArn&credentials_type=$CredentialsType&request_id=$requestId"
+    Write-Host "Calling Get-SSMSessionInfoAsync with URL: $url"
+
+    $maxRetries = 8
+    $retryInterval = 5
+
+    for ($attempt = 1; $attempt -le $maxRetries; $attempt++) {
+        try {
+            $response = Invoke-WebRequest -Uri $url -UseBasicParsing -ErrorAction Stop
+            $statusCode = $response.StatusCode
+            Write-Host "Attempt ${attempt}: HTTP ${statusCode}"
+
+            if ($statusCode -eq 200) {
+                $script:SSM_SESSION_JSON = $response.Content
+                Write-Host "Session JSON successfully retrieved"
+                return
+            } elseif ($statusCode -eq 202 -or $statusCode -eq 204) {
+                Write-Host "Session not ready. Retrying in ${retryInterval} seconds... [${attempt}/${maxRetries}]"
+                Start-Sleep -Seconds $retryInterval
+            } else {
+                Write-Error "Failed to get SSM session info. HTTP status: ${statusCode}"
+                Write-Error "Response: $($response.Content)"
+                exit 1
+            }
+        } catch {
+            Write-Error "Exception in Get-SSMSessionInfoAsync: $_"
+            exit 1
+        }
+    }
+
+    Write-Error "Timed out after ${maxRetries} attempts waiting for session to be ready."
+    exit 1
+}
+
+# Parse creds_type and AWS resource ARN from HOSTNAME
+Write-Host "`nParsing hostname..."
+if ($Hostname -match "^sm_([^_]+)_(arn_._aws.*)$") {
+    $CREDS_TYPE = $matches[1]
+    $AWS_RESOURCE_ARN = $matches[2] -replace '_._', ':' -replace '__', '/'
+} else {
+    Write-Error "Invalid hostname format. Expected format: sm_<creds-type>_<AWSResourceARN>"
+    exit 1
+}
+
+$REGION = ($AWS_RESOURCE_ARN -split ':')[3]
+Write-Host "Parsed values:"
+Write-Host "  CREDS_TYPE: ${CREDS_TYPE}"
+Write-Host "  AWS_RESOURCE_ARN: ${AWS_RESOURCE_ARN}"
+Write-Host "  REGION: ${REGION}"
+
+# Validate credentials type
+if ($CREDS_TYPE -ne "lc" -and $CREDS_TYPE -ne "dl") {
+    Write-Error "Invalid creds_type. Must be 'lc' or 'dl'."
+    exit 1
+}
+
+# Read port from local info JSON
+Write-Host "`nReading SAGEMAKER_LOCAL_SERVER_FILE_PATH: $env:SAGEMAKER_LOCAL_SERVER_FILE_PATH"
+try {
+    $jsonContent = Get-Content $env:SAGEMAKER_LOCAL_SERVER_FILE_PATH -Raw | ConvertFrom-Json
+    $LOCAL_ENDPOINT_PORT = $jsonContent.port
+    Write-Host "Extracted port: $LOCAL_ENDPOINT_PORT"
+} catch {
+    Write-Error "Failed to read or parse JSON file at $env:SAGEMAKER_LOCAL_SERVER_FILE_PATH"
+    exit 1
+}
+
+if (-not $LOCAL_ENDPOINT_PORT -or $LOCAL_ENDPOINT_PORT -eq "null") {
+    Write-Error "'port' field is missing or invalid in $env:SAGEMAKER_LOCAL_SERVER_FILE_PATH"
+    exit 1
+}
+
+# Retrieve SSM session
+Write-Host "`nStarting session retrieval..."
+if ($CREDS_TYPE -eq "lc") {
+    Get-SSMSessionInfo -CredentialsType "local" -AwsResourceArn $AWS_RESOURCE_ARN -LocalEndpointPort $LOCAL_ENDPOINT_PORT
+} elseif ($CREDS_TYPE -eq "dl") {
+    Get-SSMSessionInfoAsync -CredentialsType "deeplink" -AwsResourceArn $AWS_RESOURCE_ARN -LocalEndpointPort $LOCAL_ENDPOINT_PORT
+}
+
+# Execute the session
+Write-Host "`nLaunching session-manager-plugin..."
+$sessionPlugin = if ($env:AWS_SSM_CLI) { $env:AWS_SSM_CLI } else { "session-manager-plugin" }
+
+$jsonObj = $script:SSM_SESSION_JSON | ConvertFrom-Json
+$streamUrl = $jsonObj.StreamUrl
+$tokenValue = $jsonObj.TokenValue
+$sessionId = $jsonObj.SessionId
+
+Write-Host "Session Values:"
+Write-Host "  Stream URL: ${streamUrl}"
+Write-Host "  Token Value: ${tokenValue}"
+Write-Host "  Session ID: ${sessionId}"
+
+& $sessionPlugin "{\`"streamUrl\`":\`"${streamUrl}\`",\`"tokenValue\`":\`"${tokenValue}\`",\`"sessionId\`":\`"${sessionId}\`"}" "$REGION" "StartSession"
\ No newline at end of file
diff --git a/resources/vs-lambda-sample-request-manifest.xml b/packages/core/resources/vs-lambda-sample-request-manifest.xml
similarity index 100%
rename from resources/vs-lambda-sample-request-manifest.xml
rename to packages/core/resources/vs-lambda-sample-request-manifest.xml
diff --git a/packages/core/resources/walkthrough/amazonq/chat.md b/packages/core/resources/walkthrough/amazonq/chat.md
new file mode 100644
index 00000000000..83e6ca4d0fa
--- /dev/null
+++ b/packages/core/resources/walkthrough/amazonq/chat.md
@@ -0,0 +1,3 @@
+![Right-click context menu](./chat1.png)
+
+![Amazon Q Chat](./chat2.png)
diff --git a/packages/core/resources/walkthrough/amazonq/chat1.png b/packages/core/resources/walkthrough/amazonq/chat1.png
new file mode 100644
index 00000000000..2208b7d37cb
Binary files /dev/null and b/packages/core/resources/walkthrough/amazonq/chat1.png differ
diff --git a/packages/core/resources/walkthrough/amazonq/chat2.png b/packages/core/resources/walkthrough/amazonq/chat2.png
new file mode 100644
index 00000000000..c5621a7a19d
Binary files /dev/null and b/packages/core/resources/walkthrough/amazonq/chat2.png differ
diff --git a/packages/core/resources/walkthrough/amazonq/inline.md b/packages/core/resources/walkthrough/amazonq/inline.md
new file mode 100644
index 00000000000..22ea43469de
--- /dev/null
+++ b/packages/core/resources/walkthrough/amazonq/inline.md
@@ -0,0 +1 @@
+![Inline Suggestions](./inline.png)
diff --git a/packages/core/resources/walkthrough/amazonq/inline.png b/packages/core/resources/walkthrough/amazonq/inline.png
new file mode 100644
index 00000000000..8c846eb17e1
Binary files /dev/null and b/packages/core/resources/walkthrough/amazonq/inline.png differ
diff --git a/packages/core/resources/walkthrough/amazonq/menu.md b/packages/core/resources/walkthrough/amazonq/menu.md
new file mode 100644
index 00000000000..856e85e4c70
--- /dev/null
+++ b/packages/core/resources/walkthrough/amazonq/menu.md
@@ -0,0 +1 @@
+![Status Bar Menu](./menu.png)
diff --git a/packages/core/resources/walkthrough/amazonq/menu.png b/packages/core/resources/walkthrough/amazonq/menu.png
new file mode 100644
index 00000000000..09dc1e96f62
Binary files /dev/null and b/packages/core/resources/walkthrough/amazonq/menu.png differ
diff --git a/packages/core/resources/walkthrough/amazonq/scans.md b/packages/core/resources/walkthrough/amazonq/scans.md
new file mode 100644
index 00000000000..3fab817a48e
--- /dev/null
+++ b/packages/core/resources/walkthrough/amazonq/scans.md
@@ -0,0 +1 @@
+![Code Scanes](./scans.png)
diff --git a/packages/core/resources/walkthrough/amazonq/scans.png b/packages/core/resources/walkthrough/amazonq/scans.png
new file mode 100644
index 00000000000..e89901c7254
Binary files /dev/null and b/packages/core/resources/walkthrough/amazonq/scans.png differ
diff --git a/packages/core/resources/walkthrough/appBuilder/AppPicker.md b/packages/core/resources/walkthrough/appBuilder/AppPicker.md
new file mode 100644
index 00000000000..b301251feb2
--- /dev/null
+++ b/packages/core/resources/walkthrough/appBuilder/AppPicker.md
@@ -0,0 +1,25 @@
+<checklist>
+	<div class="theme-picker-row">
+		<checkbox when-checked="command:aws.toolkit.lambda.setWalkthroughToAPI" checked-on="aws.toolkit.lambda.walkthroughSelected == 'API'">
+			<img width="200" src="./AppPickerResource/API.png"/>
+			Rest API
+		</checkbox>
+		<checkbox when-checked="command:aws.toolkit.lambda.setWalkthroughToS3" checked-on="aws.toolkit.lambda.walkthroughSelected == 'S3'">
+			<img width="200" src="./AppPickerResource/S3.png"/>
+			File processing
+		</checkbox>
+	</div>
+	<div class="theme-picker-row">
+		<checkbox when-checked="command:aws.toolkit.lambda.setWalkthroughToVisual" checked-on="aws.toolkit.lambda.walkthroughSelected == 'Visual'">
+			<img width="200" src="./AppPickerResource/AppComposer.png"/>
+			New template with visual builder
+		</checkbox>
+		<checkbox when-checked="command:aws.toolkit.lambda.setWalkthroughToCustomTemplate" checked-on="aws.toolkit.lambda.walkthroughSelected == 'CustomTemplate'">
+			<img width="200" src="./AppPickerResource/CustomTemplate.png"/>
+			Current workspace template
+		</checkbox>
+	</div>
+</checklist>
+<checkbox class="theme-picker-link" when-checked="command:aws.toolkit.lambda.createServerlessLandProject" checked-on="false">
+	See more application example...
+</checkbox>
diff --git a/packages/core/resources/walkthrough/appBuilder/AppPickerResource/API.png b/packages/core/resources/walkthrough/appBuilder/AppPickerResource/API.png
new file mode 100644
index 00000000000..3cda59fbf48
Binary files /dev/null and b/packages/core/resources/walkthrough/appBuilder/AppPickerResource/API.png differ
diff --git a/packages/core/resources/walkthrough/appBuilder/AppPickerResource/AppComposer.png b/packages/core/resources/walkthrough/appBuilder/AppPickerResource/AppComposer.png
new file mode 100644
index 00000000000..51ceb392f05
Binary files /dev/null and b/packages/core/resources/walkthrough/appBuilder/AppPickerResource/AppComposer.png differ
diff --git a/packages/core/resources/walkthrough/appBuilder/AppPickerResource/CustomTemplate.png b/packages/core/resources/walkthrough/appBuilder/AppPickerResource/CustomTemplate.png
new file mode 100644
index 00000000000..6ebe6fe27a6
Binary files /dev/null and b/packages/core/resources/walkthrough/appBuilder/AppPickerResource/CustomTemplate.png differ
diff --git a/packages/core/resources/walkthrough/appBuilder/AppPickerResource/S3.png b/packages/core/resources/walkthrough/appBuilder/AppPickerResource/S3.png
new file mode 100644
index 00000000000..7ea7eebd23b
Binary files /dev/null and b/packages/core/resources/walkthrough/appBuilder/AppPickerResource/S3.png differ
diff --git a/packages/core/resources/walkthrough/appBuilder/InnerLoop.md b/packages/core/resources/walkthrough/appBuilder/InnerLoop.md
new file mode 100644
index 00000000000..97f54e9dbca
--- /dev/null
+++ b/packages/core/resources/walkthrough/appBuilder/InnerLoop.md
@@ -0,0 +1,12 @@
+<h2 id="build-your-code">Build your code</h2>
+Compile your code and install dependencies with SAM CLI so you can invoke it locally.
+<img src="InnerLoopResource/walkthrough-local-1.jpg" alt="clicking build icon in AppBuilder sidebar on project node">
+<h2 id="select-function-to-invoke">Select function to invoke</h2>
+Find the function you want to invoke in Application Builder and use the icon to open the invoke and debug view.
+<img src="InnerLoopResource/walkthrough-local-2.jpg" alt="clicking invoke function icon in AppBuilder sidebar on Lambda function node">
+<h2 id="invoke-your-function">Invoke your function</h2>
+Configure a payload to use for invoking your function.
+<img src="InnerLoopResource/walkthrough-local-3.jpg" alt="clicking invoke function button in local invoke webview">
+<h2 id="view-your-execution-results">View your execution results</h2>
+The VS Code panel will display the results of your invocation.
+<img src="InnerLoopResource/walkthrough-local-4.jpg" alt="View your execution results in the output panel">
diff --git a/packages/core/resources/walkthrough/appBuilder/InnerLoopResource/walkthrough-local-1.jpg b/packages/core/resources/walkthrough/appBuilder/InnerLoopResource/walkthrough-local-1.jpg
new file mode 100644
index 00000000000..b1236191118
Binary files /dev/null and b/packages/core/resources/walkthrough/appBuilder/InnerLoopResource/walkthrough-local-1.jpg differ
diff --git a/packages/core/resources/walkthrough/appBuilder/InnerLoopResource/walkthrough-local-2.jpg b/packages/core/resources/walkthrough/appBuilder/InnerLoopResource/walkthrough-local-2.jpg
new file mode 100644
index 00000000000..d7c0295e5ce
Binary files /dev/null and b/packages/core/resources/walkthrough/appBuilder/InnerLoopResource/walkthrough-local-2.jpg differ
diff --git a/packages/core/resources/walkthrough/appBuilder/InnerLoopResource/walkthrough-local-3.jpg b/packages/core/resources/walkthrough/appBuilder/InnerLoopResource/walkthrough-local-3.jpg
new file mode 100644
index 00000000000..471cf590830
Binary files /dev/null and b/packages/core/resources/walkthrough/appBuilder/InnerLoopResource/walkthrough-local-3.jpg differ
diff --git a/packages/core/resources/walkthrough/appBuilder/InnerLoopResource/walkthrough-local-4.jpg b/packages/core/resources/walkthrough/appBuilder/InnerLoopResource/walkthrough-local-4.jpg
new file mode 100644
index 00000000000..c0df6db61b0
Binary files /dev/null and b/packages/core/resources/walkthrough/appBuilder/InnerLoopResource/walkthrough-local-4.jpg differ
diff --git a/packages/core/resources/walkthrough/appBuilder/RemoteLoop.md b/packages/core/resources/walkthrough/appBuilder/RemoteLoop.md
new file mode 100644
index 00000000000..f811771127b
--- /dev/null
+++ b/packages/core/resources/walkthrough/appBuilder/RemoteLoop.md
@@ -0,0 +1,12 @@
+<h2 id="deploy-your-application">Deploy your application</h2>
+Use SAM CLI to deploy your application template to the cloud.
+<img src="RemoteLoopResource/walkthrough-remote-1.jpg" alt="Click Deploy SAM Application button in Appbuilder Sidebar on project node">
+<h2 id="select-deployed-function-to-invoke">Select deployed function to invoke</h2>
+Find the function you want to invoke in Application Builder and use the icon to open the remote invocation view.
+<img src="RemoteLoopResource/walkthrough-remote-2.jpg" alt="click Invoke in the cloud button in AppBuilder Sidebar on cloud function resource node">
+<h2 id="invoke-your-function-with-a-payload">Invoke your function with a payload</h2>
+Configure a payload to use for invoking your function.
+<img src="RemoteLoopResource/walkthrough-remote-3.jpg" alt="add a payload and click invoke button in remote invoke panel">
+<h2 id="view-your-execution-result-in-the-output-panel">View your execution result in the output panel</h2>
+The VS Code panel will display the results of your invocation.
+<img src="RemoteLoopResource/walkthrough-remote-4.jpg" alt="View your execution result in the output panel">
diff --git a/packages/core/resources/walkthrough/appBuilder/RemoteLoopResource/walkthrough-remote-1.jpg b/packages/core/resources/walkthrough/appBuilder/RemoteLoopResource/walkthrough-remote-1.jpg
new file mode 100644
index 00000000000..c036fc93eaf
Binary files /dev/null and b/packages/core/resources/walkthrough/appBuilder/RemoteLoopResource/walkthrough-remote-1.jpg differ
diff --git a/packages/core/resources/walkthrough/appBuilder/RemoteLoopResource/walkthrough-remote-2.jpg b/packages/core/resources/walkthrough/appBuilder/RemoteLoopResource/walkthrough-remote-2.jpg
new file mode 100644
index 00000000000..e542edc38f4
Binary files /dev/null and b/packages/core/resources/walkthrough/appBuilder/RemoteLoopResource/walkthrough-remote-2.jpg differ
diff --git a/packages/core/resources/walkthrough/appBuilder/RemoteLoopResource/walkthrough-remote-3.jpg b/packages/core/resources/walkthrough/appBuilder/RemoteLoopResource/walkthrough-remote-3.jpg
new file mode 100644
index 00000000000..891cfdc4aa0
Binary files /dev/null and b/packages/core/resources/walkthrough/appBuilder/RemoteLoopResource/walkthrough-remote-3.jpg differ
diff --git a/packages/core/resources/walkthrough/appBuilder/RemoteLoopResource/walkthrough-remote-4.jpg b/packages/core/resources/walkthrough/appBuilder/RemoteLoopResource/walkthrough-remote-4.jpg
new file mode 100644
index 00000000000..738a7d0b91f
Binary files /dev/null and b/packages/core/resources/walkthrough/appBuilder/RemoteLoopResource/walkthrough-remote-4.jpg differ
diff --git a/packages/core/resources/walkthrough/appBuilder/install.png b/packages/core/resources/walkthrough/appBuilder/install.png
new file mode 100644
index 00000000000..cdbae8b83a6
Binary files /dev/null and b/packages/core/resources/walkthrough/appBuilder/install.png differ
diff --git a/resources/walkthrough/images/aws-explorer-no-regions.png b/packages/core/resources/walkthrough/images/aws-explorer-no-regions.png
similarity index 100%
rename from resources/walkthrough/images/aws-explorer-no-regions.png
rename to packages/core/resources/walkthrough/images/aws-explorer-no-regions.png
diff --git a/resources/walkthrough/images/aws-explorer-with-regions.png b/packages/core/resources/walkthrough/images/aws-explorer-with-regions.png
similarity index 100%
rename from resources/walkthrough/images/aws-explorer-with-regions.png
rename to packages/core/resources/walkthrough/images/aws-explorer-with-regions.png
diff --git a/resources/walkthrough/images/aws-toolkit-add-connection.png b/packages/core/resources/walkthrough/images/aws-toolkit-add-connection.png
similarity index 100%
rename from resources/walkthrough/images/aws-toolkit-add-connection.png
rename to packages/core/resources/walkthrough/images/aws-toolkit-add-connection.png
diff --git a/resources/walkthrough/images/aws-toolkit-choose-connection.png b/packages/core/resources/walkthrough/images/aws-toolkit-choose-connection.png
similarity index 100%
rename from resources/walkthrough/images/aws-toolkit-choose-connection.png
rename to packages/core/resources/walkthrough/images/aws-toolkit-choose-connection.png
diff --git a/resources/walkthrough/images/aws-toolkit-commandpalette.png b/packages/core/resources/walkthrough/images/aws-toolkit-commandpalette.png
similarity index 100%
rename from resources/walkthrough/images/aws-toolkit-commandpalette.png
rename to packages/core/resources/walkthrough/images/aws-toolkit-commandpalette.png
diff --git a/resources/walkthrough/images/aws-toolkit-region-added.png b/packages/core/resources/walkthrough/images/aws-toolkit-region-added.png
similarity index 100%
rename from resources/walkthrough/images/aws-toolkit-region-added.png
rename to packages/core/resources/walkthrough/images/aws-toolkit-region-added.png
diff --git a/resources/walkthrough/images/aws-toolkit-region-context-menu.png b/packages/core/resources/walkthrough/images/aws-toolkit-region-context-menu.png
similarity index 100%
rename from resources/walkthrough/images/aws-toolkit-region-context-menu.png
rename to packages/core/resources/walkthrough/images/aws-toolkit-region-context-menu.png
diff --git a/resources/walkthrough/images/aws-toolkit-select-region.png b/packages/core/resources/walkthrough/images/aws-toolkit-select-region.png
similarity index 100%
rename from resources/walkthrough/images/aws-toolkit-select-region.png
rename to packages/core/resources/walkthrough/images/aws-toolkit-select-region.png
diff --git a/resources/walkthrough/images/aws-toolkit-show-regions.png b/packages/core/resources/walkthrough/images/aws-toolkit-show-regions.png
similarity index 100%
rename from resources/walkthrough/images/aws-toolkit-show-regions.png
rename to packages/core/resources/walkthrough/images/aws-toolkit-show-regions.png
diff --git a/resources/walkthrough/setup-connect.md b/packages/core/resources/walkthrough/setup-connect.md
similarity index 96%
rename from resources/walkthrough/setup-connect.md
rename to packages/core/resources/walkthrough/setup-connect.md
index 44a1584838a..e78f612f4f7 100644
--- a/resources/walkthrough/setup-connect.md
+++ b/packages/core/resources/walkthrough/setup-connect.md
@@ -12,7 +12,7 @@ Choose the most appropriate method based on your requirements.
 
 ## Connect to AWS through the Toolkit for VS Code
 
-1. [Click here](command:aws.login) to open the configuration wizard to connect to AWS.
+1. [Click here](command:aws.toolkit.login) to open the configuration wizard to connect to AWS.
 
     > This command can also be accessed through the [Command Palette](https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/toolkit-navigation.html#command-locations) by choosing **AWS: >Connect to AWS**\.
     >
diff --git a/resources/walkthrough/setup-region.md b/packages/core/resources/walkthrough/setup-region.md
similarity index 93%
rename from resources/walkthrough/setup-region.md
rename to packages/core/resources/walkthrough/setup-region.md
index 292eb1ad220..50a9101e6bb 100644
--- a/resources/walkthrough/setup-region.md
+++ b/packages/core/resources/walkthrough/setup-region.md
@@ -4,7 +4,7 @@ When you set up your credentials, the AWS Toolkit for Visual Studio Code automat
 
 ## Add a Region to the AWS Explorer
 
-1. [Click here](command:aws.showRegion) to select a Region to add or remove.
+1. [Click here](command:aws.toolkit.showRegion) to select a Region to add or remove.
 
     > This command can also be accessed through the [Command Palette](https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/toolkit-navigation.html#command-locations) by choosing **AWS: Show or Hide Regions**\.
     >
diff --git a/resources/walkthrough/setup-toolchain.md b/packages/core/resources/walkthrough/setup-toolchain.md
similarity index 100%
rename from resources/walkthrough/setup-toolchain.md
rename to packages/core/resources/walkthrough/setup-toolchain.md
diff --git a/packages/core/scripts/build/checkServerPort.ts b/packages/core/scripts/build/checkServerPort.ts
new file mode 100644
index 00000000000..4128504bd70
--- /dev/null
+++ b/packages/core/scripts/build/checkServerPort.ts
@@ -0,0 +1,57 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Validate that the required port used by webviews during development is not being used.
+ */
+
+import * as net from 'net'
+
+/** This must be kept up to date with the port that is being used to serve the vue files. */
+const portNumber = 8080
+
+function checkPort(port: number): Promise<boolean> {
+    return new Promise((resolve) => {
+        const server = net.createServer()
+
+        server.once('error', (err) => {
+            if ((err as NodeJS.ErrnoException).code === 'EADDRINUSE') {
+                resolve(true)
+            }
+        })
+
+        server.once('listening', () => {
+            server.close()
+            resolve(false)
+        })
+
+        server.listen(port)
+    })
+}
+
+async function main() {
+    try {
+        const isPortInUse = await checkPort(portNumber)
+
+        if (isPortInUse) {
+            console.error(`
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+
+    ERROR: Webviews will not load as expected, meaning Q may not work.
+    REASON: Port ${portNumber} is already in use, preventing the latest webview files from being served.
+    SOLUTION: Kill the current process using port ${portNumber}.
+              - Unix: "kill -9 $(lsof -t -i :${portNumber})"
+
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+    `)
+            process.exit(1)
+        }
+    } catch (error) {
+        console.error('Error checking port:', error)
+        process.exit(1)
+    }
+}
+
+void main()
diff --git a/packages/core/scripts/build/copyFiles.ts b/packages/core/scripts/build/copyFiles.ts
new file mode 100644
index 00000000000..6a4131172ba
--- /dev/null
+++ b/packages/core/scripts/build/copyFiles.ts
@@ -0,0 +1,78 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* eslint-disable no-restricted-imports */
+import fs from 'fs'
+import * as path from 'path'
+
+// Moves all dependencies into `dist`
+
+const projectRoot = process.cwd()
+const outRoot = path.join(projectRoot, 'dist')
+
+// The target file or directory must exist, otherwise we should fail the whole build.
+interface CopyTask {
+    /**
+     * Target file or directory to copy.
+     */
+    readonly target: string
+
+    /**
+     * Providing no destination means the target will be copied relative to the root directory.
+     */
+    readonly destination?: string
+}
+
+const tasks: CopyTask[] = [
+    { target: path.join('src', 'templates') },
+    { target: path.join('src', 'test', 'shared', 'cloudformation', 'yaml') },
+    { target: path.join('src', 'testFixtures') },
+    { target: 'src/auth/sso/vue' },
+
+    // Vue.js for webviews
+    {
+        target: path.join('../../node_modules', 'vue', 'dist', 'vue.global.prod.js'),
+        destination: path.join('libs', 'vue.min.js'),
+    },
+    // SSM
+    {
+        target: path.join('../../node_modules', 'aws-ssm-document-language-service', 'dist', 'server.js'),
+        destination: path.join('src', 'ssmDocument', 'ssm', 'ssmServer.js'),
+    },
+    {
+        target: path.join('../../node_modules', 'aws-ssm-document-language-service', 'dist', 'server.js.LICENSE.txt'),
+        destination: path.join('src', 'ssmDocument', 'ssm', 'ssmServer.js.LICENSE.txt'),
+    },
+    {
+        target: path.join('../../node_modules', 'aws-ssm-document-language-service', 'dist', 'server.js.map'),
+        destination: path.join('src', 'ssmDocument', 'ssm', 'server.js.map'),
+    },
+]
+
+function copy(task: CopyTask): void {
+    const src = path.resolve(projectRoot, task.target)
+    const dst = path.resolve(outRoot, task.destination ?? task.target)
+
+    try {
+        fs.cpSync(src, dst, {
+            recursive: true,
+            force: true,
+            errorOnExist: false,
+        })
+    } catch (error) {
+        throw new Error(`Copy "${src}" to "${dst}" failed: ${error instanceof Error ? error.message : error}`)
+    }
+}
+function main() {
+    try {
+        tasks.map(copy)
+    } catch (error) {
+        console.error('`copyFiles.ts` failed')
+        console.error(error)
+        process.exit(1)
+    }
+}
+
+void main()
diff --git a/packages/core/scripts/build/generateServiceClient.ts b/packages/core/scripts/build/generateServiceClient.ts
new file mode 100644
index 00000000000..de601e6ee44
--- /dev/null
+++ b/packages/core/scripts/build/generateServiceClient.ts
@@ -0,0 +1,254 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as proc 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'
+
+const repoRoot = path.join(process.cwd(), '../../') // root/packages/toolkit -> root/
+/**
+ * This script uses the AWS JS SDK to generate service clients where the client definition is contained within
+ * this repo. Client definitions are added at the bottom of this script.
+ */
+
+interface ServiceClientDefinition {
+    serviceName: string
+    serviceJsonPath: string
+}
+
+async function generateServiceClients(serviceClientDefinitions: ServiceClientDefinition[]): Promise<void> {
+    const tempJsSdkPath = path.join(repoRoot, 'node_modules', '.zzz-awssdk2')
+    console.log(`Temp JS SDK Repo location: ${tempJsSdkPath}`)
+    console.log('Service Clients to Generate: ', serviceClientDefinitions.map((x) => x.serviceName).join(', '))
+
+    await cloneJsSdk(tempJsSdkPath)
+    await insertServiceClientsIntoJsSdk(tempJsSdkPath, serviceClientDefinitions)
+    await runTypingsGenerator(tempJsSdkPath)
+    await integrateServiceClients(tempJsSdkPath, serviceClientDefinitions)
+
+    console.log('Done generating service client(s)')
+}
+
+/** When cloning aws-sdk-js, we want to pull the version actually used in package-lock.json. */
+function getJsSdkVersion(): string {
+    const json = nodefs.readFileSync(path.resolve(repoRoot, 'package-lock.json')).toString()
+    const packageLock = JSON.parse(json)
+
+    return packageLock['packages']['node_modules/aws-sdk']['version']
+}
+
+async function cloneJsSdk(dir: string): Promise<void> {
+    // Output stderr while it clones so it doesn't look frozen
+    return new Promise<void>((resolve, reject) => {
+        const sdkversion = getJsSdkVersion()
+        if (!sdkversion) {
+            throw new Error('failed to get sdk version from package-lock.json')
+        }
+        const tag = `v${sdkversion}`
+
+        const gitHead = proc.spawnSync('git', ['-C', dir, 'rev-parse', 'HEAD'])
+
+        const alreadyCloned = gitHead.status !== undefined && gitHead.status === 0
+        const msg = `${alreadyCloned ? 'Updating' : 'Cloning'} AWS JS SDK...
+    tag: ${tag}
+    git: status=${gitHead.status} output=${gitHead.output.toString()}`
+        console.log(msg)
+
+        const gitArgs = alreadyCloned
+            ? // Local repo exists already: just update it and checkout the tag.
+              // Fetch only the tag we need.
+              //      git fetch origin tag v2.950.0 --no-tags
+              ['-C', dir, 'fetch', '--quiet', 'origin', 'tag', tag, '--no-tags']
+            : // Local repo does not exist: clone it.
+              [
+                  '-c',
+                  'advice.detachedHead=false',
+                  'clone',
+                  '--quiet',
+                  '-b',
+                  tag,
+                  '--depth',
+                  '1',
+                  'https://github.com/aws/aws-sdk-js.git',
+                  dir,
+              ]
+
+        const gitCmd = proc.execFile('git', gitArgs, { encoding: 'utf8' })
+
+        gitCmd.stderr?.on('data', (data: any) => {
+            console.log(data)
+        })
+        gitCmd.once('close', (code, signal) => {
+            gitCmd.stdout?.removeAllListeners()
+
+            // Only needed for the "update" case, but harmless for "clone".
+            const gitCheckout = proc.spawnSync('git', [
+                '-c',
+                'advice.detachedHead=false',
+                '-C',
+                dir,
+                'checkout',
+                '--force',
+                tag,
+            ])
+            if (gitCheckout.status !== undefined && gitCheckout.status !== 0) {
+                console.log(`error: git: status=${gitCheckout.status} output=${gitCheckout.output.toString()}`)
+            }
+
+            resolve()
+        })
+    })
+}
+
+async function insertServiceClientsIntoJsSdk(
+    jsSdkPath: string,
+    serviceClientDefinitions: ServiceClientDefinition[]
+): Promise<void> {
+    for (const serviceClientDefinition of serviceClientDefinitions) {
+        const apiVersion = getApiVersion(serviceClientDefinition.serviceJsonPath)
+
+        // Copy the Service Json into the JS SDK for generation
+        const jsSdkServiceJsonPath = path.join(
+            jsSdkPath,
+            'apis',
+            `${serviceClientDefinition.serviceName.toLowerCase()}-${apiVersion}.normal.json`
+        )
+        nodefs.copyFileSync(serviceClientDefinition.serviceJsonPath, jsSdkServiceJsonPath)
+    }
+
+    const apiMetadataPath = path.join(jsSdkPath, 'apis', 'metadata.json')
+    await patchServicesIntoApiMetadata(
+        apiMetadataPath,
+        serviceClientDefinitions.map((x) => x.serviceName)
+    )
+}
+
+interface ServiceJsonSchema {
+    metadata: {
+        apiVersion: string
+    }
+}
+
+function getApiVersion(serviceJsonPath: string): string {
+    const json = nodefs.readFileSync(serviceJsonPath).toString()
+    const serviceJson = JSON.parse(json) as ServiceJsonSchema
+
+    return serviceJson.metadata.apiVersion
+}
+
+interface ApiMetadata {
+    [key: string]: { name: string }
+}
+
+/**
+ * Updates the JS SDK's api metadata to contain the provided services
+ */
+async function patchServicesIntoApiMetadata(apiMetadataPath: string, serviceNames: string[]): Promise<void> {
+    console.log(`Patching services (${serviceNames.join(', ')}) into API Metadata...`)
+
+    const apiMetadataJson = nodefs.readFileSync(apiMetadataPath).toString()
+    const apiMetadata = JSON.parse(apiMetadataJson) as ApiMetadata
+
+    for (const serviceName of serviceNames) {
+        apiMetadata[serviceName.toLowerCase()] = { name: serviceName }
+    }
+
+    nodefs.writeFileSync(apiMetadataPath, JSON.stringify(apiMetadata, undefined, 4))
+}
+
+/**
+ * Generates service clients
+ */
+async function runTypingsGenerator(repoPath: string): Promise<void> {
+    console.log('Generating service client typings...')
+
+    const stdout = proc.execFileSync('node', ['scripts/typings-generator.js'], {
+        encoding: 'utf8',
+        cwd: repoPath,
+    })
+    console.log(stdout)
+}
+
+/**
+ * Copies the generated service clients into the repo
+ */
+async function integrateServiceClients(
+    repoPath: string,
+    serviceClientDefinitions: ServiceClientDefinition[]
+): Promise<void> {
+    for (const serviceClientDefinition of serviceClientDefinitions) {
+        await integrateServiceClient(
+            repoPath,
+            serviceClientDefinition.serviceJsonPath,
+            serviceClientDefinition.serviceName
+        )
+    }
+}
+
+/**
+ * Copies the generated service client into the repo
+ */
+async function integrateServiceClient(repoPath: string, serviceJsonPath: string, serviceName: string): Promise<void> {
+    const typingsFilename = `${serviceName.toLowerCase()}.d.ts`
+    const sourceClientPath = path.join(repoPath, 'clients', typingsFilename)
+    const destinationClientPath = path.join(path.dirname(serviceJsonPath), typingsFilename)
+
+    console.log(`Integrating ${typingsFilename} ...`)
+
+    nodefs.copyFileSync(sourceClientPath, destinationClientPath)
+
+    await sanitizeServiceClient(destinationClientPath)
+}
+
+/**
+ * Patches the type file imports to be relative to the SDK module
+ */
+async function sanitizeServiceClient(generatedClientPath: string): Promise<void> {
+    console.log('Altering Service Client to fit the codebase...')
+
+    let fileContents = nodefs.readFileSync(generatedClientPath).toString()
+
+    // Add a header stating the file is autogenerated
+    fileContents = `
+/**
+ * THIS FILE IS AUTOGENERATED BY 'generateServiceClient.ts'.
+ * DO NOT EDIT BY HAND.
+ */
+
+${fileContents}
+    `
+
+    fileContents = fileContents.replace(/(import .* from.*)\.\.(.*)/g, '$1aws-sdk$2')
+
+    nodefs.writeFileSync(generatedClientPath, fileContents)
+}
+
+// ---------------------------------------------------------------------------------------------------------------------
+
+void (async () => {
+    const serviceClientDefinitions: ServiceClientDefinition[] = [
+        {
+            serviceJsonPath: 'src/shared/telemetry/service-2.json',
+            serviceName: 'ClientTelemetry',
+        },
+        {
+            serviceJsonPath: 'src/codewhisperer/client/service-2.json',
+            serviceName: 'CodeWhispererClient',
+        },
+        {
+            serviceJsonPath: 'src/codewhisperer/client/user-service-2.json',
+            serviceName: 'CodeWhispererUserClient',
+        },
+        {
+            serviceJsonPath: 'src/sagemakerunifiedstudio/shared/client/gluecatalogapi.json',
+            serviceName: 'GlueCatalogApi',
+        },
+        {
+            serviceJsonPath: 'src/sagemakerunifiedstudio/shared/client/sqlworkbench.json',
+            serviceName: 'SQLWorkbench',
+        },
+    ]
+    await generateServiceClients(serviceClientDefinitions)
+})()
diff --git a/packages/core/scripts/lint/testLint.ts b/packages/core/scripts/lint/testLint.ts
new file mode 100644
index 00000000000..52b22d12fd6
--- /dev/null
+++ b/packages/core/scripts/lint/testLint.ts
@@ -0,0 +1,31 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { glob } from 'glob'
+import Mocha from 'mocha'
+void (async () => {
+    try {
+        console.log('Running linting tests...')
+
+        const mocha = new Mocha({
+            timeout: 5000,
+        })
+
+        const testFiles = await glob('dist/src/testLint/**/*.test.js')
+        for (const file of testFiles) {
+            mocha.addFile(file)
+        }
+
+        mocha.run((failures) => {
+            const exitCode = failures ? 1 : 0
+            console.log(`Finished running Main test suite with result code: ${exitCode}`)
+            process.exit(exitCode)
+        })
+    } catch (err) {
+        console.error(err)
+        console.error('Failed to run tests')
+        process.exit(1)
+    }
+})()
diff --git a/packages/core/scripts/test/launchTest.ts b/packages/core/scripts/test/launchTest.ts
new file mode 100644
index 00000000000..27ac83bd43f
--- /dev/null
+++ b/packages/core/scripts/test/launchTest.ts
@@ -0,0 +1,37 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * This script is used to run unit tests from an npm script defined in package.json.
+ * TODO: Generalize and use named args system from root/scripts/package.ts
+ *
+ * Usage:
+ * node ./test/runToolkitTests.js <suite_name> <relative path to entrypoint> <relative path to workspace folder>
+ *
+ * where:
+ * - suite_name, e.g. 'unit', 'integration', 'e2e'
+ * - relative path to entrypoint: test entry point file built in .js, e.g. 'amazonq/dist/test/unit/index.js'
+ * - relative path to workspace folder: folder to open the test VSC instance in (optional)
+ *
+ * See examples in any subproject's package.json `test` scripts.
+ */
+
+import 'source-map-support/register'
+
+import { runToolkitTests, SuiteName } from './launchTestUtilities'
+void (async () => {
+    const suiteName = process.argv[2] as SuiteName
+    if (!suiteName) {
+        throw new Error('A test suite name is required.')
+    }
+
+    const relativeEntrypoint = process.argv[3]
+    if (!relativeEntrypoint) {
+        throw new Error('A path relative to core is required.')
+    }
+
+    const relativeWorkspaceFolder = process.argv[4]
+    await runToolkitTests(suiteName, relativeEntrypoint, relativeWorkspaceFolder)
+})()
diff --git a/packages/core/scripts/test/launchTestUtilities.ts b/packages/core/scripts/test/launchTestUtilities.ts
new file mode 100644
index 00000000000..92afb769275
--- /dev/null
+++ b/packages/core/scripts/test/launchTestUtilities.ts
@@ -0,0 +1,244 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as proc from 'child_process' // eslint-disable-line no-restricted-imports
+import packageJson from '../../package.json'
+import { downloadAndUnzipVSCode, resolveCliArgsFromVSCodeExecutablePath } from '@vscode/test-electron'
+import { join, resolve } from 'path'
+import { runTests } from '@vscode/test-electron'
+import { VSCODE_EXTENSION_ID } from '../../src/shared/extensions'
+import { TestOptions } from '@vscode/test-electron/out/runTest'
+
+const envvarVscodeTestVersion = 'VSCODE_TEST_VERSION'
+
+const stable = 'stable'
+const minimum = 'minimum'
+
+const disableWorkspaceTrust = '--disable-workspace-trust'
+
+const suiteNames = ['integration', 'e2e', 'unit', 'web'] as const
+export type SuiteName = (typeof suiteNames)[number]
+
+/**
+ * This is the generalized method that is used by different test suites (unit, integration, ...) in CI to
+ * setup vscode and then run tests. An important thing to note is that in CI we do not have VS Code installed,
+ * so this script needs to do this itself.
+ *
+ * If you want to run the tests manually you should use the `Run & Debug` menu in VS Code instead
+ * to be able to use to breakpoints.
+ */
+export async function runToolkitTests(
+    suite: SuiteName,
+    relativeTestEntryPoint: string,
+    workspaceFolder?: string,
+    env?: Record<string, string>
+) {
+    try {
+        if (!suiteNames.includes(suite)) {
+            throw new Error(`Invalid suite name: '${suite}'. Must be one of: ${suiteNames.join(',')}`)
+        }
+
+        console.log(`Running ${suite} test suite...`)
+
+        const args = await getVSCodeCliArgs({
+            vsCodeExecutablePath: await setupVSCodeTestInstance(suite),
+            relativeTestEntryPoint,
+            suite,
+            workspaceFolder,
+            env,
+        })
+        console.log(`runTests() args:\n${JSON.stringify(args, undefined, 2)}`)
+        const result = await runTests(args)
+
+        console.log(`Finished running ${suite} test suite with result code: ${result}`)
+        process.exit(result)
+    } catch (err) {
+        console.error(err)
+        console.error('Failed to run tests')
+        process.exit(1)
+    }
+}
+
+/**
+ * Resolves all args for {@link runTests}
+ */
+async function getVSCodeCliArgs(params: {
+    vsCodeExecutablePath: string
+    relativeTestEntryPoint: string
+    suite: SuiteName
+    workspaceFolder?: string
+    env?: Record<string, string>
+}): Promise<TestOptions> {
+    const projectRootDir = process.cwd()
+
+    let disableExtensionsArgs: string[] = []
+    let disableWorkspaceTrustArg: string[] = []
+
+    if (params.suite === 'integration' || params.suite === 'e2e') {
+        disableExtensionsArgs = await getCliArgsToDisableExtensions(params.vsCodeExecutablePath, {
+            except: [
+                VSCODE_EXTENSION_ID.python,
+                VSCODE_EXTENSION_ID.yaml,
+                VSCODE_EXTENSION_ID.jupyter,
+                VSCODE_EXTENSION_ID.go,
+                VSCODE_EXTENSION_ID.java,
+                VSCODE_EXTENSION_ID.javadebug,
+                VSCODE_EXTENSION_ID.git,
+                VSCODE_EXTENSION_ID.remotessh,
+            ],
+        })
+        disableWorkspaceTrustArg = [disableWorkspaceTrust]
+    } else {
+        disableExtensionsArgs = ['--disable-extensions']
+    }
+
+    const workspaceFolderLocation = params.workspaceFolder
+        ? params.workspaceFolder
+        : 'dist/src/testFixtures/workspaceFolder'
+    const workspacePath = join(projectRootDir, workspaceFolderLocation)
+    // This tells VS Code to run the extension in a web environment, which mimics vscode.dev
+    const webExtensionKind = params.suite === 'web' ? ['--extensionDevelopmentKind=web'] : []
+    const userDataDir = process.env.AWS_TOOLKIT_TEST_USER_DIR
+        ? [`--user-data-dir=${process.env.AWS_TOOLKIT_TEST_USER_DIR}`]
+        : []
+
+    return {
+        vscodeExecutablePath: params.vsCodeExecutablePath,
+        extensionDevelopmentPath: projectRootDir,
+
+        extensionTestsPath: resolve(projectRootDir, params.relativeTestEntryPoint),
+        // For verbose VSCode logs, add "--verbose --log debug". c2165cf48e62c
+        launchArgs: [
+            ...disableExtensionsArgs,
+            workspacePath,
+            ...disableWorkspaceTrustArg,
+            ...webExtensionKind,
+            ...userDataDir,
+        ],
+        extensionTestsEnv: {
+            ['DEVELOPMENT_PATH']: projectRootDir,
+            ['AWS_TOOLKIT_AUTOMATION']: params.suite,
+            ['TEST_DIR']: process.env.TEST_DIR,
+            ...params.env,
+        },
+    }
+}
+
+/**
+ * Downloads and unzips a copy of VS Code to run tests against.
+ *
+ * Prints the result of `code --version`.
+ *
+ * Test suites can set up an experimental instance of VS Code however they want.
+ * This method provides the common use-case, pulling down the latest version (aka 'stable').
+ * The VS Code version under test can be altered by setting the environment variable
+ * VSCODE_TEST_VERSION prior to running the tests.
+ */
+async function setupVSCodeTestInstance(suite: SuiteName): Promise<string> {
+    let vsCodeVersion = process.env[envvarVscodeTestVersion]
+    if (!vsCodeVersion) {
+        vsCodeVersion = stable
+    } else if (vsCodeVersion === minimum) {
+        vsCodeVersion = getMinVsCodeVersion()
+    }
+
+    console.log(`Setting up VS Code test instance, version: ${vsCodeVersion}`)
+    const platform = process.platform === 'win32' ? 'win32-x64-archive' : undefined
+
+    const downloadOptions = {
+        platform,
+        version: vsCodeVersion,
+        cachePath: process.env.AWS_TOOLKIT_TEST_CACHE_DIR ?? '../../.vscode-test',
+    }
+
+    const vsCodeExecutablePath = await downloadAndUnzipVSCode(downloadOptions)
+    console.log(`VS Code test instance location: ${vsCodeExecutablePath}`)
+    console.log(await invokeVSCodeCli(vsCodeExecutablePath, ['--version']))
+
+    // Only certain test suites require specific vscode extensions to be installed
+    if (suite === 'e2e' || suite === 'integration') {
+        await installVSCodeExtension(vsCodeExecutablePath, VSCODE_EXTENSION_ID.python)
+        await installVSCodeExtension(vsCodeExecutablePath, VSCODE_EXTENSION_ID.yaml)
+        await installVSCodeExtension(vsCodeExecutablePath, VSCODE_EXTENSION_ID.go)
+        await installVSCodeExtension(vsCodeExecutablePath, VSCODE_EXTENSION_ID.java)
+        await installVSCodeExtension(vsCodeExecutablePath, VSCODE_EXTENSION_ID.javadebug)
+    }
+
+    console.log('VS Code Test instance has been set up')
+    return vsCodeExecutablePath
+}
+
+async function invokeVSCodeCli(vsCodeExecutablePath: string, args: string[]): Promise<string> {
+    const [cli, ...cliArgs] = resolveCliArgsFromVSCodeExecutablePath(vsCodeExecutablePath)
+    let cmdArgs = [...cliArgs, ...args]
+
+    // Workaround: set --user-data-dir to avoid this error in CI:
+    // "You are trying to start Visual Studio Code as a super user …"
+    if (process.env.AWS_TOOLKIT_TEST_USER_DIR) {
+        cmdArgs = cmdArgs.filter((a) => !a.startsWith('--user-data-dir='))
+        cmdArgs.push(`--user-data-dir=${process.env.AWS_TOOLKIT_TEST_USER_DIR}`)
+    }
+
+    console.log(`Invoking vscode CLI command:\n    "${cli}" ${JSON.stringify(cmdArgs)}`)
+    // Shell option must be true on windows to avoid security error: https://nodejs.org/en/blog/vulnerability/april-2024-security-releases-2
+    const spawnResult = proc.spawnSync(cli, cmdArgs, {
+        encoding: 'utf-8',
+        stdio: 'pipe',
+        shell: process.platform === 'win32',
+    })
+
+    if (spawnResult.status !== 0) {
+        console.log('output: %s', spawnResult.output)
+        console.log('error: %O', spawnResult.error)
+        throw new Error(`VS Code CLI command failed (exit-code: ${spawnResult.status}): ${cli} ${cmdArgs}`)
+    }
+
+    if (spawnResult.error) {
+        throw spawnResult.error
+    }
+
+    return spawnResult.stdout
+}
+
+async function installVSCodeExtension(vsCodeExecutablePath: string, extensionIdentifier: string): Promise<void> {
+    console.log(`Installing VS Code Extension: ${extensionIdentifier}`)
+    console.log(await invokeVSCodeCli(vsCodeExecutablePath, ['--install-extension', extensionIdentifier]))
+}
+
+/**
+ * Alternative to the `--disable-extensions` CLI flag which allows us to
+ * selectively keep some extensions enabled.
+ *
+ * @param vsCodeExecutablePath Path to vscode CLI program.
+ * @param exceptIds List of extension ids that should *not* be disabled.
+ *
+ * @returns List of args which the caller is expected to pass to vscode CLI, of the form:
+ * ["--disable-extension", "foo.bar.baz", "--disable-extension", ...]
+ */
+async function getCliArgsToDisableExtensions(
+    vsCodeExecutablePath: string,
+    params: { except: string[] }
+): Promise<string[]> {
+    console.log(`Disabling all VS Code extensions *except*: ${params.except}`)
+    const output = await invokeVSCodeCli(vsCodeExecutablePath, ['--list-extensions'])
+    const foundExtensions = output.split('\n')
+    const ids: string[] = []
+    for (const extId of foundExtensions) {
+        if (extId.trim() && !params.except.includes(extId)) {
+            ids.push('--disable-extension')
+            ids.push(extId)
+        }
+    }
+    return ids
+}
+
+function getMinVsCodeVersion(): string {
+    const vsCodeVersion = packageJson.engines.vscode
+
+    // We assume that we specify a minium, so it matches ^<number>, so remove ^'s
+    const sanitizedVersion = vsCodeVersion.replace('^', '')
+    console.log(`Using minimum VSCode version specified in package.json: ${sanitizedVersion}`)
+    return sanitizedVersion
+}
diff --git a/packages/core/src/amazonq/apps/initContext.ts b/packages/core/src/amazonq/apps/initContext.ts
new file mode 100644
index 00000000000..f8b06e4b46a
--- /dev/null
+++ b/packages/core/src/amazonq/apps/initContext.ts
@@ -0,0 +1,47 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { EventEmitter } from 'vscode'
+import { MessagePublisher, UiMessagePublisher } from '../messages/messagePublisher'
+import { MessageListener } from '../messages/messageListener'
+import { TabType } from '../webview/ui/storages/tabsStorage'
+
+export interface AmazonQAppInitContext {
+    registerWebViewToAppMessagePublisher(eventEmitter: MessagePublisher<any>, tabType: TabType): void
+    getAppsToWebViewMessagePublisher(): UiMessagePublisher<any>
+    onDidChangeAmazonQVisibility: EventEmitter<boolean>
+}
+
+export class DefaultAmazonQAppInitContext implements AmazonQAppInitContext {
+    private readonly appsToWebViewEventEmitter = new EventEmitter<any>()
+    private readonly appsToWebViewMessageListener = new MessageListener<any>(this.appsToWebViewEventEmitter)
+    private readonly appsToWebViewMessagePublisher = new UiMessagePublisher<any>(this.appsToWebViewEventEmitter)
+    private readonly webViewToAppsMessagePublishers: Map<TabType, MessagePublisher<any>> = new Map()
+    public readonly onDidChangeAmazonQVisibility = new EventEmitter<boolean>()
+
+    static #instance: DefaultAmazonQAppInitContext
+
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+
+    constructor() {}
+
+    registerWebViewToAppMessagePublisher(messagePublisher: MessagePublisher<any>, tabType: TabType): void {
+        this.webViewToAppsMessagePublishers.set(tabType, messagePublisher)
+    }
+
+    getWebViewToAppsMessagePublishers(): Map<TabType, MessagePublisher<any>> {
+        return this.webViewToAppsMessagePublishers
+    }
+
+    getAppsToWebViewMessageListener(): MessageListener<any> {
+        return this.appsToWebViewMessageListener
+    }
+
+    getAppsToWebViewMessagePublisher(): UiMessagePublisher<any> {
+        return this.appsToWebViewMessagePublisher
+    }
+}
diff --git a/packages/core/src/amazonq/auth/controller.ts b/packages/core/src/amazonq/auth/controller.ts
new file mode 100644
index 00000000000..5b9772d686a
--- /dev/null
+++ b/packages/core/src/amazonq/auth/controller.ts
@@ -0,0 +1,39 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { getLogger } from '../../shared/logger/logger'
+import { reconnect } from '../../codewhisperer/commands/basicCommands'
+import { amazonQChatSource } from '../../codewhisperer/commands/types'
+import { focusAmazonQPanel } from '../../codewhispererChat/commands/registerCommands'
+import { recordTelemetryChatRunCommand } from '../../codewhispererChat/controllers/chat/telemetryHelper'
+import { placeholder } from '../../shared/vscode/commands2'
+import { AuthFollowUpType } from './model'
+
+export class AuthController {
+    public handleAuth(type: AuthFollowUpType) {
+        switch (type) {
+            case 'use-supported-auth':
+            case 'full-auth':
+                this.handleFullAuth()
+                recordTelemetryChatRunCommand('auth', type)
+                break
+            case 'missing_scopes':
+            case 're-auth':
+                this.handleReAuth()
+                recordTelemetryChatRunCommand('auth', type)
+                break
+        }
+    }
+
+    private handleFullAuth() {
+        focusAmazonQPanel.execute(placeholder, 'amazonQChat').catch((e) => {
+            getLogger().error('focusAmazonQPanel failed: %s', e)
+        })
+    }
+
+    private handleReAuth() {
+        void reconnect.execute(placeholder, amazonQChatSource)
+    }
+}
diff --git a/packages/core/src/amazonq/auth/model.ts b/packages/core/src/amazonq/auth/model.ts
new file mode 100644
index 00000000000..078bf884403
--- /dev/null
+++ b/packages/core/src/amazonq/auth/model.ts
@@ -0,0 +1,29 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export type AuthFollowUpType = 'full-auth' | 're-auth' | 'missing_scopes' | 'use-supported-auth'
+
+export type AuthMessageData = {
+    message: string
+}
+
+const reauthenticateData: AuthMessageData = {
+    message: `You don't have access to Amazon Q. Please authenticate to get started.`,
+}
+
+const enableQData: AuthMessageData = {
+    message: `You haven't enabled Amazon Q in VSCode`,
+}
+
+const expiredData: AuthMessageData = {
+    message: `Your Amazon Q session has timed out. Re-authenticate to continue.`,
+}
+
+export const AuthMessageDataMap: Record<AuthFollowUpType, AuthMessageData> = {
+    'full-auth': reauthenticateData,
+    're-auth': reauthenticateData,
+    missing_scopes: enableQData,
+    'use-supported-auth': expiredData,
+}
diff --git a/packages/core/src/amazonq/client/client.ts b/packages/core/src/amazonq/client/client.ts
new file mode 100644
index 00000000000..dd6b7e12a36
--- /dev/null
+++ b/packages/core/src/amazonq/client/client.ts
@@ -0,0 +1,33 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ServiceOptions } from '../../shared/awsClientBuilder'
+
+export abstract class FeatureClient {
+    public abstract getClient(options?: Partial<ServiceOptions>): Promise<any>
+
+    public abstract createConversation(): Promise<string>
+
+    public abstract createUploadUrl(
+        conversationId: string,
+        contentChecksumSha256: string,
+        contentLength: number,
+        uploadId: string
+    ): Promise<any>
+
+    public abstract startCodeGeneration(
+        conversationId: string,
+        uploadId: string,
+        message: string,
+        intent: any,
+        codeGenerationId: string,
+        currentCodeGenerationId?: string,
+        intentContext?: any
+    ): Promise<any>
+
+    public abstract getCodeGeneration(conversationId: string, codeGenerationId: string): Promise<any>
+
+    public abstract exportResultArchive(conversationId: string): Promise<any>
+}
diff --git a/packages/core/src/amazonq/commons/baseChatStorage.ts b/packages/core/src/amazonq/commons/baseChatStorage.ts
new file mode 100644
index 00000000000..ff748834576
--- /dev/null
+++ b/packages/core/src/amazonq/commons/baseChatStorage.ts
@@ -0,0 +1,42 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import AsyncLock from 'async-lock'
+
+export abstract class BaseChatSessionStorage<T extends { isAuthenticating: boolean }> {
+    private lock = new AsyncLock()
+    protected sessions: Map<string, T> = new Map()
+
+    abstract createSession(tabID: string): Promise<T>
+
+    public async getSession(tabID: string): Promise<T> {
+        /**
+         * The lock here is added in order to mitigate amazon Q's eventing fire & forget design when integrating with mynah-ui that creates a race condition here.
+         * The race condition happens when handleDevFeatureCommand in src/amazonq/webview/ui/quickActions/handler.ts is firing two events after each other to amazonqFeatureDev controller
+         * This eventually may make code generation fail as at the moment of that event it may get from the storage a session that has not been properly updated.
+         */
+        return this.lock.acquire(tabID, async () => {
+            const sessionFromStorage = this.sessions.get(tabID)
+            if (sessionFromStorage === undefined) {
+                // If a session doesn't already exist just create it
+                return this.createSession(tabID)
+            }
+            return sessionFromStorage
+        })
+    }
+
+    // Find all sessions that are currently waiting to be authenticated
+    public getAuthenticatingSessions(): T[] {
+        return Array.from(this.sessions.values()).filter((session) => session.isAuthenticating)
+    }
+
+    public deleteSession(tabID: string) {
+        this.sessions.delete(tabID)
+    }
+
+    public deleteAllSessions() {
+        this.sessions.clear()
+    }
+}
diff --git a/packages/core/src/amazonq/commons/controllers/contentController.ts b/packages/core/src/amazonq/commons/controllers/contentController.ts
new file mode 100644
index 00000000000..97c828e6f9e
--- /dev/null
+++ b/packages/core/src/amazonq/commons/controllers/contentController.ts
@@ -0,0 +1,202 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import path from 'path'
+import { Position, TextEditor, window } from 'vscode'
+import { getLogger } from '../../../shared/logger/logger'
+import { amazonQDiffScheme, amazonQTabSuffix } from '../../../shared/constants'
+import { disposeOnEditorClose } from '../../../shared/utilities/editorUtilities'
+import {
+    applyChanges,
+    createTempUrisForDiff,
+    getIndentedCode,
+    getSelectionFromRange,
+} from '../../../shared/utilities/textDocumentUtilities'
+import { ToolkitError, getErrorMsg } from '../../../shared/errors'
+import fs from '../../../shared/fs/fs'
+import { extractFileAndCodeSelectionFromMessage } from '../../../shared/utilities/textUtilities'
+import { UserWrittenCodeTracker } from '../../../codewhisperer/tracker/userWrittenCodeTracker'
+import { CWCTelemetryHelper } from '../../../codewhispererChat/controllers/chat/telemetryHelper'
+import type { ViewDiff } from '../../../codewhispererChat/controllers/chat/model'
+import type { TriggerEvent } from '../../../codewhispererChat/storages/triggerEvents'
+import { DiffContentProvider } from './diffContentProvider'
+
+export type ViewDiffMessage = Pick<ViewDiff, 'code'> & Partial<Pick<TriggerEvent, 'context'>>
+
+export class ContentProvider implements vscode.TextDocumentContentProvider {
+    constructor(private uri: vscode.Uri) {}
+
+    provideTextDocumentContent(_uri: vscode.Uri) {
+        return fs.readFileText(this.uri.fsPath)
+    }
+}
+
+const chatDiffCode = 'ChatDiff'
+const ChatDiffError = ToolkitError.named(chatDiffCode)
+
+export class EditorContentController {
+    /* *
+     *  Insert the Amazon Q chat written code to the cursor position
+     *  Add current intentation to the next few lines of the recommendation
+     * @param text the raw text from Amazon Q chat
+     * @param trackCodeEdit callback to track user edits
+     */
+    public insertTextAtCursorPosition(
+        text: string,
+        trackCodeEdit: (editor: TextEditor, cursorStart: Position) => void
+    ) {
+        const editor = window.activeTextEditor
+        if (editor) {
+            CWCTelemetryHelper.instance.setDocumentDiagnostics()
+            UserWrittenCodeTracker.instance.onQStartsMakingEdits()
+            const cursorStart = editor.selection.active
+            const indentRange = new vscode.Range(new vscode.Position(cursorStart.line, 0), cursorStart)
+            // use the user editor intent if the position to the left of cursor is just space or tab
+            // otherwise indent with empty space equal to the intent at this position
+            let indent = editor.document.getText(indentRange)
+            if (indent.trim().length !== 0) {
+                indent = ' '.repeat(indent.length - indent.trimStart().length)
+            }
+            let textWithIndent = ''
+            for (const [index, line] of text.split('\n').entries()) {
+                if (index === 0) {
+                    textWithIndent += line
+                } else {
+                    textWithIndent += '\n' + indent + line
+                }
+            }
+            editor
+                .edit((editBuilder) => {
+                    editBuilder.insert(cursorStart, textWithIndent)
+                })
+                .then(
+                    (appliedEdits) => {
+                        if (appliedEdits) {
+                            trackCodeEdit(editor, cursorStart)
+                        }
+                        UserWrittenCodeTracker.instance.onQFinishesEdits()
+                    },
+                    (e) => {
+                        getLogger().error('TextEditor.edit failed: %s', (e as Error).message)
+                        UserWrittenCodeTracker.instance.onQFinishesEdits()
+                    }
+                )
+        }
+    }
+
+    /**
+     * Accepts and applies a diff to a file, then closes the associated diff view tab.
+     *
+     * @param {any} message - The message containing diff information.
+     * @returns {Promise<void>} A promise that resolves when the diff is applied and the tab is closed.
+     *
+     * @description
+     * This method performs the following steps:
+     * 1. Extracts file path and selection from the message.
+     * 2. If valid file path, non-empty code, and selection are present:
+     *    a. Opens the document.
+     *    b. Gets the indented code to update.
+     *    c. Applies the changes to the document.
+     *    d. Attempts to close the diff view tab for the file.
+     *
+     * @throws {Error} If there's an issue opening the document or applying changes.
+     */
+    public async acceptDiff(message: any) {
+        const errorNotification = 'Unable to Apply code changes.'
+        const { filePath, selection } = extractFileAndCodeSelectionFromMessage(message)
+
+        if (filePath && message?.code?.trim().length > 0 && selection) {
+            try {
+                UserWrittenCodeTracker.instance.onQStartsMakingEdits()
+                const doc = await vscode.workspace.openTextDocument(filePath)
+
+                const code = getIndentedCode(message, doc, selection)
+                const range = getSelectionFromRange(doc, selection)
+                await applyChanges(doc, range, code)
+
+                // Sets the editor selection from the start of the given range, extending it by the number of lines in the code till the end of the last line
+                const editor = await vscode.window.showTextDocument(doc)
+                editor.selection = new vscode.Selection(
+                    range.start,
+                    new Position(range.start.line + code.split('\n').length, Number.MAX_SAFE_INTEGER)
+                )
+
+                // If vscode.diff is open for the filePath then close it.
+                vscode.window.tabGroups.all.flatMap(({ tabs }) =>
+                    tabs.map((tab) => {
+                        if (tab.label === `${path.basename(filePath)} ${amazonQTabSuffix}`) {
+                            const tabClosed = vscode.window.tabGroups.close(tab)
+                            if (!tabClosed) {
+                                getLogger().error(
+                                    '%s: Unable to close the diff view tab for %s',
+                                    chatDiffCode,
+                                    tab.label
+                                )
+                            }
+                        }
+                    })
+                )
+            } catch (error) {
+                void vscode.window.showInformationMessage(errorNotification)
+                const wrappedError = ChatDiffError.chain(error, `Failed to Accept Diff`, { code: chatDiffCode })
+                getLogger().error('%s: Failed to open diff view %s', chatDiffCode, getErrorMsg(wrappedError, true))
+                throw wrappedError
+            } finally {
+                UserWrittenCodeTracker.instance.onQFinishesEdits()
+            }
+        }
+    }
+
+    /**
+     * Displays a diff view comparing proposed changes with the existing file.
+     *
+     * How is diff generated:
+     * 1. Creates a temporary file as a clone of the original file.
+     * 2. Applies the proposed changes to the temporary file within the selected range.
+     * 3. Opens a diff view comparing original file to the temporary file.
+     *
+     * This approach ensures that the diff view only shows the changes proposed by Amazon Q,
+     * isolating them from any other modifications in the original file.
+     *
+     * @param message the message from Amazon Q chat
+     * @param scheme the URI scheme to use for the diff view
+     */
+    public async viewDiff(message: ViewDiffMessage, scheme: string = amazonQDiffScheme) {
+        const errorNotification = 'Unable to Open Diff.'
+        const { filePath, fileText, selection } = extractFileAndCodeSelectionFromMessage(message)
+
+        try {
+            if (filePath && message?.code !== undefined && selection) {
+                // Register content provider and show diff
+                const contentProvider = new DiffContentProvider()
+                const disposable = vscode.workspace.registerTextDocumentContentProvider(scheme, contentProvider)
+
+                const [originalFileUri, modifiedFileUri] = await createTempUrisForDiff(
+                    filePath,
+                    fileText,
+                    message,
+                    selection,
+                    scheme,
+                    contentProvider
+                )
+
+                await vscode.commands.executeCommand(
+                    'vscode.diff',
+                    originalFileUri,
+                    modifiedFileUri,
+                    `${path.basename(filePath)} ${amazonQTabSuffix}`
+                )
+
+                disposeOnEditorClose(originalFileUri, disposable)
+            }
+        } catch (error) {
+            void vscode.window.showInformationMessage(errorNotification)
+            const wrappedError = ChatDiffError.chain(error, `Failed to Open Diff View`, { code: chatDiffCode })
+            getLogger().error('%s: Failed to open diff view %s', chatDiffCode, getErrorMsg(wrappedError, true))
+            throw wrappedError
+        }
+    }
+}
diff --git a/packages/core/src/amazonq/commons/controllers/diffContentProvider.ts b/packages/core/src/amazonq/commons/controllers/diffContentProvider.ts
new file mode 100644
index 00000000000..5d2e7c2efd0
--- /dev/null
+++ b/packages/core/src/amazonq/commons/controllers/diffContentProvider.ts
@@ -0,0 +1,51 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import vscode from 'vscode'
+import { getLogger } from '../../../shared/logger/logger'
+
+/**
+ * A TextDocumentContentProvider that can handle multiple URIs with the same scheme.
+ * This provider maintains a mapping of URIs to their content.
+ */
+export class DiffContentProvider implements vscode.TextDocumentContentProvider {
+    private contentMap = new Map<string, string>()
+    private _onDidChange = new vscode.EventEmitter<vscode.Uri>()
+
+    public readonly onDidChange = this._onDidChange.event
+
+    /**
+     * Register content for a specific URI
+     * @param uri The URI to register content for
+     * @param content The content to serve for this URI
+     */
+    public registerContent(uri: vscode.Uri, content: string): void {
+        this.contentMap.set(uri.toString(), content)
+        this._onDidChange.fire(uri)
+    }
+
+    /**
+     * Unregister a URI
+     * @param uri The URI to unregister
+     */
+    public unregisterUri(uri: vscode.Uri): void {
+        this.contentMap.delete(uri.toString())
+    }
+
+    /**
+     * Provides the content for a given URI
+     * @param uri The URI to provide content for
+     * @returns The content as a string
+     */
+    public provideTextDocumentContent(uri: vscode.Uri): string {
+        const content = this.contentMap.get(uri.toString())
+
+        if (content === undefined) {
+            getLogger().warn('No content registered for URI: %s', uri.toString())
+            return ''
+        }
+
+        return content
+    }
+}
diff --git a/packages/core/src/amazonq/commons/diff.ts b/packages/core/src/amazonq/commons/diff.ts
new file mode 100644
index 00000000000..566327b6d22
--- /dev/null
+++ b/packages/core/src/amazonq/commons/diff.ts
@@ -0,0 +1,68 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { fs } from '../../shared/fs/fs'
+import { diffLines } from 'diff'
+
+export async function openDiff(leftPath: string, rightPath: string, tabId: string, scheme: string) {
+    const { left, right } = await getFileDiffUris(leftPath, rightPath, tabId, scheme)
+    await vscode.commands.executeCommand('vscode.diff', left, right)
+}
+
+export async function openDeletedDiff(filePath: string, name: string, tabId: string, scheme: string) {
+    const left = await getOriginalFileUri(filePath, tabId, scheme)
+    const right = createAmazonQUri('empty', tabId, scheme)
+    await vscode.commands.executeCommand('vscode.diff', left, right, `${name} (Deleted)`)
+}
+
+export async function getOriginalFileUri(fullPath: string, tabId: string, scheme: string) {
+    return (await fs.exists(fullPath)) ? vscode.Uri.file(fullPath) : createAmazonQUri('empty', tabId, scheme)
+}
+
+export async function getFileDiffUris(leftPath: string, rightPath: string, tabId: string, scheme: string) {
+    const left = await getOriginalFileUri(leftPath, tabId, scheme)
+    const right = createAmazonQUri(rightPath, tabId, scheme)
+
+    return { left, right }
+}
+
+export function createAmazonQUri(path: string, tabId: string, scheme: string) {
+    return vscode.Uri.from({ scheme: scheme, path, query: `tabID=${tabId}` })
+}
+
+export async function computeDiff(
+    leftPath: string,
+    rightPath: string,
+    tabId: string,
+    scheme: string,
+    reportedChanges?: string
+) {
+    const { left, right } = await getFileDiffUris(leftPath, rightPath, tabId, scheme)
+    const leftFile = await vscode.workspace.openTextDocument(left)
+    const rightFile = await vscode.workspace.openTextDocument(right)
+
+    const changes = diffLines(reportedChanges ?? leftFile.getText(), rightFile.getText(), {
+        ignoreWhitespace: true,
+    })
+
+    let charsAdded = 0
+    let charsRemoved = 0
+    let linesAdded = 0
+    let linesRemoved = 0
+    for (const change of changes) {
+        const lines = change.value.split('\n')
+        const charCount = lines.reduce((sum, line) => sum + line.length, 0)
+        const lineCount = change.count ?? lines.length - 1 // ignoring end-of-file empty line
+        if (change.added) {
+            charsAdded += charCount
+            linesAdded += lineCount
+        } else if (change.removed) {
+            charsRemoved += charCount
+            linesRemoved += lineCount
+        }
+    }
+    return { changes, charsAdded, linesAdded, charsRemoved, linesRemoved }
+}
diff --git a/packages/core/src/amazonq/commons/model.ts b/packages/core/src/amazonq/commons/model.ts
new file mode 100644
index 00000000000..3c5b228d2fc
--- /dev/null
+++ b/packages/core/src/amazonq/commons/model.ts
@@ -0,0 +1,25 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { LicenseUtil } from '../../codewhisperer/util/licenseUtil'
+import { CodeReference } from '../../codewhispererChat/view/connector/connector'
+
+// Currently importing ChatItemType in Mynah UI from the vscode side causes an error
+// TODO remove this once the import stops failing
+export type ChatItemType =
+    | 'prompt'
+    | 'system-prompt'
+    | 'ai-prompt'
+    | 'answer'
+    | 'answer-stream'
+    | 'answer-part'
+    | 'code-result'
+
+export const referenceLogText = (reference: CodeReference) =>
+    `[${new Date().toLocaleString()}] Accepted recommendation from Amazon Q. Code provided with reference under <a href="${LicenseUtil.getLicenseHtml(
+        reference.licenseName
+    )}" target="_blank">${reference.licenseName}</a> license from repository <a href="${
+        reference.url
+    }" target="_blank">${reference.repository}</a>.<br><br>`
diff --git a/packages/core/src/amazonq/commons/types.ts b/packages/core/src/amazonq/commons/types.ts
new file mode 100644
index 00000000000..3a4d014609d
--- /dev/null
+++ b/packages/core/src/amazonq/commons/types.ts
@@ -0,0 +1,135 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { DiffTreeFileInfo } from '../webview/ui/diffTree/types'
+import { FeatureClient } from '../client/client'
+import { MynahUI } from '@aws/mynah-ui'
+
+export enum FollowUpTypes {
+    // UnitTestGeneration
+    ViewDiff = 'ViewDiff',
+    AcceptCode = 'AcceptCode',
+    RejectCode = 'RejectCode',
+    BuildAndExecute = 'BuildAndExecute',
+    ModifyCommands = 'ModifyCommands',
+    SkipBuildAndFinish = 'SkipBuildAndFinish',
+    InstallDependenciesAndContinue = 'InstallDependenciesAndContinue',
+    ContinueBuildAndExecute = 'ContinueBuildAndExecute',
+    ViewCodeDiffAfterIteration = 'ViewCodeDiffAfterIteration',
+    // FeatureDev
+    GenerateCode = 'GenerateCode',
+    InsertCode = 'InsertCode',
+    ProvideFeedbackAndRegenerateCode = 'ProvideFeedbackAndRegenerateCode',
+    Retry = 'Retry',
+    ModifyDefaultSourceFolder = 'ModifyDefaultSourceFolder',
+    DevExamples = 'DevExamples',
+    NewTask = 'NewTask',
+    CloseSession = 'CloseSession',
+    SendFeedback = 'SendFeedback',
+    AcceptAutoBuild = 'AcceptAutoBuild',
+    DenyAutoBuild = 'DenyAutoBuild',
+    GenerateDevFile = 'GenerateDevFile',
+    // Doc
+    CreateDocumentation = 'CreateDocumentation',
+    ChooseFolder = 'ChooseFolder',
+    UpdateDocumentation = 'UpdateDocumentation',
+    SynchronizeDocumentation = 'SynchronizeDocumentation',
+    EditDocumentation = 'EditDocumentation',
+    AcceptChanges = 'AcceptChanges',
+    RejectChanges = 'RejectChanges',
+    MakeChanges = 'MakeChanges',
+    ProceedFolderSelection = 'ProceedFolderSelection',
+    CancelFolderSelection = 'CancelFolderSelection',
+}
+
+export type Interaction = {
+    // content to be sent back to the chat UI
+    content?: string
+    responseType?: LLMResponseType
+}
+
+export enum Intent {
+    DEV = 'DEV',
+    DOC = 'DOC',
+}
+
+export enum DevPhase {
+    INIT = 'Init',
+    APPROACH = 'Approach',
+    CODEGEN = 'Codegen',
+}
+
+export enum CodeGenerationStatus {
+    COMPLETE = 'Complete',
+    PREDICT_READY = 'predict-ready',
+    IN_PROGRESS = 'InProgress',
+    PREDICT_FAILED = 'predict-failed',
+    DEBATE_FAILED = 'debate-failed',
+    FAILED = 'Failed',
+}
+
+export type SessionStatePhase = DevPhase.INIT | DevPhase.CODEGEN
+
+export type CurrentWsFolders = [vscode.WorkspaceFolder, ...vscode.WorkspaceFolder[]]
+
+export interface SessionStateConfig {
+    workspaceRoots: string[]
+    workspaceFolders: CurrentWsFolders
+    conversationId: string
+    proxyClient: FeatureClient
+    uploadId: string
+    currentCodeGenerationId?: string
+}
+
+export type NewFileZipContents = { zipFilePath: string; fileContent: string }
+export type NewFileInfo = DiffTreeFileInfo &
+    NewFileZipContents & {
+        virtualMemoryUri: vscode.Uri
+        workspaceFolder: vscode.WorkspaceFolder
+    }
+
+export type DeletedFileInfo = DiffTreeFileInfo & {
+    workspaceFolder: vscode.WorkspaceFolder
+}
+
+export interface SessionInfo {
+    // TODO, if it had a summarized name that was better for the UI
+    name?: string
+    history: string[]
+}
+
+export interface SessionStorage {
+    [key: string]: SessionInfo
+}
+
+export type LLMResponseType = 'EMPTY' | 'INVALID_STATE' | 'VALID'
+
+export interface UpdateFilesPathsParams {
+    tabID: string
+    filePaths: NewFileInfo[]
+    deletedFiles: DeletedFileInfo[]
+    messageId: string
+    disableFileActions?: boolean
+}
+
+export enum MetricDataOperationName {
+    StartCodeGeneration = 'StartCodeGeneration',
+    EndCodeGeneration = 'EndCodeGeneration',
+}
+
+export enum MetricDataResult {
+    Success = 'Success',
+    Fault = 'Fault',
+    Error = 'Error',
+    LlmFailure = 'LLMFailure',
+}
+
+/**
+ * Note: Passing a reference around allows us to lazily inject mynah UI into
+ * connectors and handlers. This is done to supported "hybrid chat", which
+ * injects mynah UI _after_ the connector has already been created
+ */
+export type MynahUIRef = { mynahUI: MynahUI | undefined }
diff --git a/packages/core/src/amazonq/errors.ts b/packages/core/src/amazonq/errors.ts
new file mode 100644
index 00000000000..36e67d7a07e
--- /dev/null
+++ b/packages/core/src/amazonq/errors.ts
@@ -0,0 +1,21 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+/**
+ * Shared error type for content length validation.
+ * When thrown from common components, individual agents can catch and transform this error
+ * to provide their own customized error messages.
+ */
+import { ErrorInformation, ToolkitError } from '../shared/errors'
+
+/**
+ * Errors extending this class are considered "LLM failures" in service metrics.
+ */
+export class LlmError extends ToolkitError {
+    constructor(message: string, info: ErrorInformation = {}) {
+        super(message, info)
+    }
+}
diff --git a/packages/core/src/amazonq/explorer/amazonQChildrenNodes.ts b/packages/core/src/amazonq/explorer/amazonQChildrenNodes.ts
new file mode 100644
index 00000000000..86648b41361
--- /dev/null
+++ b/packages/core/src/amazonq/explorer/amazonQChildrenNodes.ts
@@ -0,0 +1,66 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+import { Commands } from '../../shared/vscode/commands2'
+import { getIcon } from '../../shared/icons'
+import { installAmazonQExtension } from '../../codewhisperer/commands/basicCommands'
+import { amazonQHelpUrl } from '../../shared/constants'
+import { cwTreeNodeSource } from '../../codewhisperer/commands/types'
+import { VSCODE_EXTENSION_ID } from '../../shared/extensions'
+import globals from '../../shared/extensionGlobals'
+import { setContext } from '../../shared/vscode/setContext'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { ExtStartUpSources } from '../../shared/telemetry/util'
+import { ExtensionUse } from '../../auth/utils'
+
+const localize = nls.loadMessageBundle()
+
+export const learnMoreAmazonQCommand = Commands.declare('aws.toolkit.amazonq.learnMore', () => () => {
+    void vscode.env.openExternal(vscode.Uri.parse(amazonQHelpUrl))
+})
+
+export const qExtensionPageCommand = Commands.declare('aws.toolkit.amazonq.extensionpage', () => () => {
+    void vscode.env.openExternal(vscode.Uri.parse(`vscode:extension/${VSCODE_EXTENSION_ID.amazonq}`))
+})
+
+export const dismissQTree = Commands.declare(
+    { id: '_aws.toolkit.amazonq.dismiss', compositeKey: { 0: 'source' } },
+    () => async (source: string) => {
+        await telemetry.toolkit_invokeAction.run(async () => {
+            telemetry.record({
+                source: ExtensionUse.instance.isFirstUse() ? ExtStartUpSources.firstStartUp : ExtStartUpSources.none,
+            })
+
+            await globals.globalState.update('aws.toolkit.amazonq.dismissed', true)
+            await setContext('aws.toolkit.amazonq.dismissed', true)
+
+            telemetry.record({ action: 'dismissQExplorerTree' })
+        })
+    }
+)
+
+// Learn more button of Amazon Q now opens the Amazon Q marketplace page.
+export const createLearnMoreNode = () =>
+    qExtensionPageCommand.build().asTreeNode({
+        label: localize('AWS.amazonq.learnMore', 'Learn More About Amazon Q'),
+        iconPath: getIcon('vscode-question'),
+        contextValue: 'awsAmazonQLearnMoreNode',
+    })
+
+export function createInstallQNode() {
+    return installAmazonQExtension.build().asTreeNode({
+        label: 'Install the Amazon Q Extension', // TODO: localize
+        iconPath: getIcon('vscode-extensions'),
+    })
+}
+
+export function createDismissNode() {
+    return dismissQTree.build(cwTreeNodeSource).asTreeNode({
+        label: 'Dismiss', // TODO: localize
+        iconPath: getIcon('vscode-close'),
+    })
+}
diff --git a/packages/core/src/amazonq/explorer/amazonQTreeNode.ts b/packages/core/src/amazonq/explorer/amazonQTreeNode.ts
new file mode 100644
index 00000000000..bbfd1bc1ff2
--- /dev/null
+++ b/packages/core/src/amazonq/explorer/amazonQTreeNode.ts
@@ -0,0 +1,86 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { ResourceTreeDataProvider, TreeNode } from '../../shared/treeview/resourceTreeDataProvider'
+import { AuthState } from '../../codewhisperer/util/authUtil'
+import { createLearnMoreNode, createInstallQNode, createDismissNode } from './amazonQChildrenNodes'
+import { Commands } from '../../shared/vscode/commands2'
+
+export class AmazonQNode implements TreeNode {
+    public readonly id = 'amazonq'
+    public readonly resource = this
+    private readonly onDidChangeChildrenEmitter = new vscode.EventEmitter<void>()
+    private readonly onDidChangeTreeItemEmitter = new vscode.EventEmitter<void>()
+    public readonly onDidChangeTreeItem = this.onDidChangeTreeItemEmitter.event
+    public readonly onDidChangeChildren = this.onDidChangeChildrenEmitter.event
+    private readonly onDidChangeVisibilityEmitter = new vscode.EventEmitter<void>()
+    public readonly onDidChangeVisibility = this.onDidChangeVisibilityEmitter.event
+
+    public static amazonQState: AuthState
+
+    private constructor() {}
+
+    public getTreeItem() {
+        const item = new vscode.TreeItem('Amazon Q')
+        item.collapsibleState = vscode.TreeItemCollapsibleState.Collapsed
+        item.contextValue = 'awsAmazonQNode'
+
+        return item
+    }
+
+    public refresh(): void {
+        this.onDidChangeChildrenEmitter.fire()
+    }
+
+    public refreshRootNode() {
+        this.onDidChangeTreeItemEmitter.fire()
+    }
+
+    public getChildren() {
+        const children = [createInstallQNode(), createLearnMoreNode(), createDismissNode()]
+        return children
+    }
+
+    /**
+     * HACK: Since this is assumed to be an immediate child of the
+     * root, we return undefined.
+     *
+     * TODO: Look to have a base root class to extend so we do not
+     * need to implement this here.
+     * @returns
+     */
+    getParent(): TreeNode<unknown> | undefined {
+        return undefined
+    }
+
+    static #instance: AmazonQNode
+
+    static get instance(): AmazonQNode {
+        return (this.#instance ??= new AmazonQNode())
+    }
+}
+
+/**
+ * Refreshes the Amazon Q Tree node. If Amazon Q's connection state is provided, it will also internally
+ * update the connection state.
+ *
+ * This command is meant to be called by Amazon Q. It doesn't serve much purpose being called otherwise.
+ */
+export const refreshAmazonQ = (provider?: ResourceTreeDataProvider) =>
+    Commands.register({ id: '_aws.toolkit.amazonq.refreshTreeNode', logging: false }, () => {
+        AmazonQNode.instance.refresh()
+        if (provider) {
+            provider.refresh()
+        }
+    })
+
+export const refreshAmazonQRootNode = (provider?: ResourceTreeDataProvider) =>
+    Commands.register({ id: '_aws.amazonq.refreshRootNode', logging: false }, () => {
+        AmazonQNode.instance.refreshRootNode()
+        if (provider) {
+            provider.refresh()
+        }
+    })
diff --git a/packages/core/src/amazonq/extApi.ts b/packages/core/src/amazonq/extApi.ts
new file mode 100644
index 00000000000..2eb16e4cde2
--- /dev/null
+++ b/packages/core/src/amazonq/extApi.ts
@@ -0,0 +1,45 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import vscode from 'vscode'
+import { VSCODE_EXTENSION_ID } from '../shared/extensions'
+import { SendMessageCommandOutput, SendMessageRequest } from '@amzn/amazon-q-developer-streaming-client'
+import { GenerateAssistantResponseCommandOutput, GenerateAssistantResponseRequest } from '@amzn/codewhisperer-streaming'
+import { FeatureAuthState } from '../codewhisperer/util/authUtil'
+import { ToolkitError } from '../shared/errors'
+
+/**
+ * This interface is used and exported by the amazon q extension. If you make a change here then
+ * update the corresponding api implementation in packages/amazonq/src/api.ts
+ */
+export interface api {
+    chatApi: {
+        chat(request: GenerateAssistantResponseRequest): Promise<GenerateAssistantResponseCommandOutput>
+        chatIam(request: SendMessageRequest): Promise<SendMessageCommandOutput>
+    }
+    authApi: {
+        reauthIfNeeded(): Promise<void>
+        getChatAuthState(): Promise<FeatureAuthState>
+    }
+}
+
+export class AmazonqNotFoundError extends ToolkitError {
+    constructor() {
+        super(`${VSCODE_EXTENSION_ID.amazonq} is not installed`, { code: 'AmazonQNotInstalled' })
+    }
+}
+
+/**
+ * Get the extension API for Amazon q
+ *
+ * @returns The extension API for Amazon q, or undefined if the extension is not installed
+ */
+export async function getAmazonqApi(): Promise<api | undefined> {
+    const ext = vscode.extensions.getExtension(VSCODE_EXTENSION_ID.amazonq)
+    if (!ext) {
+        return undefined
+    }
+    return ext.activate()
+}
diff --git a/packages/core/src/amazonq/index.ts b/packages/core/src/amazonq/index.ts
new file mode 100644
index 00000000000..aa266ce39dd
--- /dev/null
+++ b/packages/core/src/amazonq/index.ts
@@ -0,0 +1,65 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export { AmazonQAppInitContext, DefaultAmazonQAppInitContext } from './apps/initContext'
+export { TabType } from './webview/ui/storages/tabsStorage'
+export { MessagePublisher } from './messages/messagePublisher'
+export { MessageListener } from './messages/messageListener'
+export { AuthController } from './auth/controller'
+export { showAmazonQWalkthroughOnce } from './onboardingPage/walkthrough'
+export {
+    focusAmazonQChatWalkthrough,
+    openAmazonQWalkthrough,
+    walkthroughInlineSuggestionsExample,
+} from './onboardingPage/walkthrough'
+export { api } from './extApi'
+export { AmazonQChatViewProvider } from './webview/webView'
+export { amazonQHelpUrl } from '../shared/constants'
+export * as webviewConstants from './webview/ui/texts/constants'
+export * as webviewTabConstants from './webview/ui/tabs/constants'
+export { listCodeWhispererCommandsWalkthrough } from '../codewhisperer/ui/statusBarMenu'
+export { focusAmazonQPanel, focusAmazonQPanelKeybinding } from '../codewhispererChat/commands/registerCommands'
+export { TryChatCodeLensProvider, tryChatCodeLensCommand } from '../codewhispererChat/editor/codelens'
+export {
+    createAmazonQUri,
+    openDiff,
+    openDeletedDiff,
+    getOriginalFileUri,
+    getFileDiffUris,
+    computeDiff,
+} from './commons/diff'
+export { AuthFollowUpType, AuthMessageDataMap } from './auth/model'
+export { ChatItemType, referenceLogText } from './commons/model'
+export { ExtensionMessage } from '../amazonq/webview/ui/commands'
+export { CodeReference } from '../codewhispererChat/view/connector/connector'
+export { extractAuthFollowUp } from './util/authUtils'
+export * as secondaryAuth from '../auth/secondaryAuth'
+export * as authConnection from '../auth/connection'
+export * as featureConfig from './webview/generators/featureConfig'
+export * as messageDispatcher from './webview/messages/messageDispatcher'
+import { FeatureContext } from '../shared/featureConfig'
+export { EditorContentController, ViewDiffMessage } from './commons/controllers/contentController'
+
+/**
+ * main from createMynahUI is a purely browser dependency. Due to this
+ * we need to create a wrapper function that will dynamically execute it
+ * while only running on browser instances (like the e2e tests). If we
+ * just export it regularly we will get "ReferenceError: self is not defined"
+ */
+export function createMynahUI(
+    ideApi: any,
+    amazonQEnabled: boolean,
+    featureConfigsSerialized: [string, FeatureContext][],
+    welcomeCount: number,
+    disabledCommands?: string[]
+) {
+    if (typeof window !== 'undefined') {
+        const mynahUI = require('./webview/ui/main')
+        return mynahUI.createMynahUI(ideApi, amazonQEnabled, featureConfigsSerialized, welcomeCount, disabledCommands)
+    }
+    throw new Error('Not implemented for node')
+}
+
+export * from './commons/types'
diff --git a/packages/core/src/amazonq/indexNode.ts b/packages/core/src/amazonq/indexNode.ts
new file mode 100644
index 00000000000..ccc01dc2832
--- /dev/null
+++ b/packages/core/src/amazonq/indexNode.ts
@@ -0,0 +1,10 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * These agents have underlying requirements on node dependencies (e.g. jsdom, admzip)
+ */
+export { init as cwChatAppInit } from '../codewhispererChat/app'
+export { init as gumbyChatAppInit } from '../amazonqGumby/app'
diff --git a/packages/core/src/amazonq/messages/chatMessageDuration.ts b/packages/core/src/amazonq/messages/chatMessageDuration.ts
new file mode 100644
index 00000000000..6321489da62
--- /dev/null
+++ b/packages/core/src/amazonq/messages/chatMessageDuration.ts
@@ -0,0 +1,130 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import AsyncLock from 'async-lock'
+import globals from '../../shared/extensionGlobals'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { Event, uiEventRecorder } from '../util/eventRecorder'
+import { CWCTelemetryHelper } from '../../codewhispererChat/controllers/chat/telemetryHelper'
+import { TabType } from '../webview/ui/storages/tabsStorage'
+
+export class AmazonQChatMessageDuration {
+    private static _asyncLock = new AsyncLock()
+    private static getAsyncLock() {
+        if (!AmazonQChatMessageDuration._asyncLock) {
+            AmazonQChatMessageDuration._asyncLock = new AsyncLock()
+        }
+        return AmazonQChatMessageDuration._asyncLock
+    }
+
+    /**
+     * Record the initial requests in the chat message flow
+     */
+    static startChatMessageTelemetry(msg: { traceId: string; startTime: number; tabID: string; trigger?: string }) {
+        const { traceId, startTime, tabID, trigger } = msg
+
+        uiEventRecorder.set(tabID, {
+            traceId,
+            events: {
+                chatMessageSent: startTime,
+                editorReceivedMessage: globals.clock.Date.now(),
+            },
+        })
+        if (trigger) {
+            uiEventRecorder.set(tabID, {
+                trigger,
+            })
+        }
+        CWCTelemetryHelper.instance.setDisplayTimeForChunks(tabID, startTime)
+    }
+
+    /**
+     * Stop listening to all incoming events and emit what we've found
+     */
+    static stopChatMessageTelemetry(msg: { tabID: string; time: number; tabType: TabType }) {
+        const { tabID, time, tabType } = msg
+
+        // We can't figure out what trace this event was associated with
+        if (!tabID || tabType !== 'cwc') {
+            return
+        }
+
+        // Lock the tab id just in case another event tries to trigger this
+        void AmazonQChatMessageDuration.getAsyncLock().acquire(tabID, () => {
+            const metrics = uiEventRecorder.get(tabID)
+            if (!metrics) {
+                return
+            }
+
+            uiEventRecorder.set(tabID, {
+                events: {
+                    messageDisplayed: time,
+                },
+            })
+
+            const displayTime = metrics.events.messageDisplayed
+            const sentTime = metrics.events.chatMessageSent
+            if (!displayTime || !sentTime) {
+                return
+            }
+
+            const totalDuration = displayTime - sentTime
+
+            function durationFrom(start: Event, end: Event) {
+                const startEvent = metrics.events[start]
+                const endEvent = metrics.events[end]
+                if (!startEvent || !endEvent) {
+                    return -1
+                }
+                return endEvent - startEvent
+            }
+
+            // TODO: handle onContextCommand round trip time
+            if (metrics.trigger !== 'onContextCommand') {
+                const editorReceivedMessage = durationFrom('chatMessageSent', 'editorReceivedMessage')
+                const featureReceivedMessage = durationFrom('editorReceivedMessage', 'featureReceivedMessage')
+                const messageDisplayed = durationFrom('featureReceivedMessage', 'messageDisplayed')
+                let reasonDesc = undefined
+
+                /**
+                 * Temporary include more information about outliers so that we can find out if the messages
+                 * aren't being sent or the user is actually doing a different chat flow
+                 */
+                if ([editorReceivedMessage, featureReceivedMessage].some((val) => val > 30000 || val < -30000)) {
+                    reasonDesc = JSON.stringify(metrics.events)
+                }
+                telemetry.amazonq_chatRoundTrip.emit({
+                    amazonqChatMessageSentTime: metrics.events.chatMessageSent ?? -1,
+                    amazonqEditorReceivedMessageMs: editorReceivedMessage ?? -1,
+                    amazonqFeatureReceivedMessageMs: featureReceivedMessage ?? -1,
+                    amazonqMessageDisplayedMs: messageDisplayed ?? -1,
+                    source: metrics.trigger,
+                    duration: totalDuration,
+                    result: 'Succeeded',
+                    traceId: metrics.traceId,
+                    ...(reasonDesc !== undefined ? { reasonDesc } : {}),
+                })
+            }
+
+            CWCTelemetryHelper.instance.emitAddMessage(
+                tabID,
+                totalDuration,
+                metrics.traceId,
+                metrics.events.chatMessageSent
+            )
+
+            uiEventRecorder.delete(tabID)
+        })
+    }
+
+    static updateChatMessageTelemetry(msg: { tabID: string; time: number; tabType: TabType }) {
+        const { tabID, time, tabType } = msg
+        if (!tabID || tabType !== 'cwc') {
+            return
+        }
+
+        CWCTelemetryHelper.instance.setDisplayTimeForChunks(tabID, time)
+    }
+}
diff --git a/packages/core/src/amazonq/messages/messageListener.ts b/packages/core/src/amazonq/messages/messageListener.ts
new file mode 100644
index 00000000000..2f203c9fb71
--- /dev/null
+++ b/packages/core/src/amazonq/messages/messageListener.ts
@@ -0,0 +1,14 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { EventEmitter } from 'vscode'
+
+export class MessageListener<T> {
+    constructor(private readonly eventEmitter: EventEmitter<T>) {}
+
+    public onMessage(listener: (e: T) => any) {
+        return this.eventEmitter.event(listener)
+    }
+}
diff --git a/packages/core/src/amazonq/messages/messagePublisher.ts b/packages/core/src/amazonq/messages/messagePublisher.ts
new file mode 100644
index 00000000000..7fa6976b9a9
--- /dev/null
+++ b/packages/core/src/amazonq/messages/messagePublisher.ts
@@ -0,0 +1,59 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { EventEmitter } from 'vscode'
+
+export class MessagePublisher<T> {
+    constructor(private readonly eventEmitter: EventEmitter<T>) {}
+
+    public publish(event: T) {
+        this.eventEmitter.fire(event)
+    }
+}
+
+/**
+ * Same as {@link MessagePublisher}, but will wait until the UI indicates it
+ * is ready to recieve messages, before the message is published.
+ *
+ * This solves a problem when running a right click menu option like
+ * "Send To Prompt" BUT chat is not opened yet, it would result in the prompt failing to
+ * be recieved by chat.
+ */
+export class UiMessagePublisher<T> extends MessagePublisher<T> {
+    private isUiReady: boolean = false
+    private buffer: T[] = []
+
+    constructor(eventEmitter: EventEmitter<T>) {
+        super(eventEmitter)
+    }
+
+    public override publish(event: T): void {
+        // immediately send if Chat UI is ready
+        if (this.isUiReady) {
+            super.publish(event)
+            return
+        }
+
+        this.buffer.push(event)
+    }
+
+    /**
+     * Indicate the Q Chat UI is ready to recieve messages.
+     */
+    public setUiReady() {
+        this.isUiReady = true
+        this.flush()
+    }
+
+    /**
+     * Publishes all blocked messages
+     */
+    private flush() {
+        for (const msg of this.buffer) {
+            super.publish(msg)
+        }
+        this.buffer = []
+    }
+}
diff --git a/packages/core/src/amazonq/onboardingPage/walkthrough.ts b/packages/core/src/amazonq/onboardingPage/walkthrough.ts
new file mode 100644
index 00000000000..50b1db642a5
--- /dev/null
+++ b/packages/core/src/amazonq/onboardingPage/walkthrough.ts
@@ -0,0 +1,67 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { focusAmazonQPanel } from '../../codewhispererChat/commands/registerCommands'
+import globals, { isWeb } from '../../shared/extensionGlobals'
+import { VSCODE_EXTENSION_ID } from '../../shared/extensions'
+import { getLogger } from '../../shared/logger/logger'
+import { Commands, placeholder } from '../../shared/vscode/commands2'
+import vscode from 'vscode'
+
+/**
+ * Show the Amazon Q walkthrough one time forever when the user adds an Amazon Q connection.
+ * All subsequent calls to this do nothing.
+ */
+export async function showAmazonQWalkthroughOnce(showWalkthrough = () => openAmazonQWalkthrough.execute()) {
+    const hasShownWalkthrough = globals.globalState.tryGet('aws.amazonq.hasShownWalkthrough', Boolean, false)
+    if (hasShownWalkthrough) {
+        return
+    }
+
+    if (isWeb()) {
+        getLogger().debug(`amazonq: Not showing walkthrough since we are in web mode`)
+        return
+    }
+
+    await globals.globalState.update('aws.amazonq.hasShownWalkthrough', true)
+    await showWalkthrough()
+}
+
+/**
+ * Opens the Amazon Q Walkthrough.
+ * We wrap the actual command so that we can get telemetry from it.
+ */
+export const openAmazonQWalkthrough = Commands.declare(`aws.amazonq.walkthrough.show`, () => async () => {
+    await vscode.commands.executeCommand(
+        'workbench.action.openWalkthrough',
+        `${VSCODE_EXTENSION_ID.amazonq}#aws.amazonq.walkthrough`
+    )
+})
+
+/** For use by the walkthrough page only. We need this for telemetry. */
+export const focusAmazonQChatWalkthrough = Commands.declare('_aws.amazonq.walkthrough.focusChat', () => async () => {
+    await focusAmazonQPanel.execute(placeholder, 'walkthrough')
+})
+
+export const walkthroughInlineSuggestionsExample = Commands.declare(
+    `_aws.amazonq.walkthrough.inlineSuggestionsExample`,
+    () => async () => {
+        const fileName = 'AmazonQ_generate_suggestion.py'
+        const fileContents = `# TODO: place your cursor at the end of line 6 and press Enter to generate a suggestion.
+# Tip: press tab to accept the suggestion
+
+fake_users = [
+    { "name": "User 1", "id": "user1", "city": "San Francisco", "state": "CA" },
+]`
+
+        const uri = vscode.Uri.parse(`untitled:${fileName}`)
+        const document = await vscode.workspace.openTextDocument(uri)
+        const editor = await vscode.window.showTextDocument(document)
+
+        await editor.edit((editBuilder) => {
+            editBuilder.insert(new vscode.Position(0, 0), fileContents)
+        })
+    }
+)
diff --git a/packages/core/src/amazonq/util/authUtils.ts b/packages/core/src/amazonq/util/authUtils.ts
new file mode 100644
index 00000000000..e310dbe9823
--- /dev/null
+++ b/packages/core/src/amazonq/util/authUtils.ts
@@ -0,0 +1,40 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { FeatureAuthState } from '../../codewhisperer/util/authUtil'
+import { AuthFollowUpType, AuthMessageDataMap } from '../auth/model'
+
+/**
+ * This function evaluates the authentication state of CodeWhisperer features (chat and core)
+ * when the authentication is not valid, and returns the appropriate authentication follow-up type and message.
+ *
+ * @param credentialState - The current authentication state for each CodeWhisperer feature
+ * @returns An object containing:
+ *   - authType: The type of authentication follow-up required (AuthFollowUpType)
+ *   - message: The corresponding message for the determined auth type
+ */
+export function extractAuthFollowUp(credentialState: FeatureAuthState) {
+    let authType: AuthFollowUpType = 'full-auth'
+    let message = AuthMessageDataMap[authType].message
+    if (credentialState.codewhispererChat === 'disconnected' && credentialState.codewhispererCore === 'disconnected') {
+        authType = 'full-auth'
+        message = AuthMessageDataMap[authType].message
+    }
+
+    if (credentialState.codewhispererCore === 'connected' && credentialState.codewhispererChat === 'expired') {
+        authType = 'missing_scopes'
+        message = AuthMessageDataMap[authType].message
+    }
+
+    if (credentialState.codewhispererChat === 'expired' && credentialState.codewhispererCore === 'expired') {
+        authType = 're-auth'
+        message = AuthMessageDataMap[authType].message
+    }
+
+    return {
+        authType,
+        message,
+    } as const
+}
diff --git a/packages/core/src/amazonq/util/eventRecorder.ts b/packages/core/src/amazonq/util/eventRecorder.ts
new file mode 100644
index 00000000000..de7f84b7fba
--- /dev/null
+++ b/packages/core/src/amazonq/util/eventRecorder.ts
@@ -0,0 +1,35 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { RecordMap } from '../../shared/utilities/map'
+
+export type Event =
+    | 'chatMessageSent' // initial on chat prompt event in the ui
+    | 'editorReceivedMessage' // message gets from the chat prompt to VSCode
+    | 'featureReceivedMessage' // message gets redirected from VSCode -> Partner team features implementation
+    | 'messageDisplayed' // message gets shown in the UI
+
+/**
+ * For a given tabId, map an event to a time
+ *
+ * This is used to correlated disjoint events that are happening in different
+ * parts of Q Chat.
+ *
+ * It allows us to tracks time intervals between key events:
+ *  - when VSCode received the message
+ *  - when the feature starts processing the message
+ *  - final message rendering
+ * and emit those as a final result, rather than having to emit each event individually
+ *
+ * Event timings are generated using Date.now() instead of performance.now() for cross-context consistency.
+ * performance.now() provides timestamps relative to the context's time origin (when the webview or VS Code was opened),
+ * which can lead to inconsistent measurements between the webview and vscode.
+ * Date.now() is more consistent across both contexts
+ */
+export const uiEventRecorder = new RecordMap<{
+    trigger: string
+    traceId: string
+    events: Partial<Record<Event, number>>
+}>()
diff --git a/packages/core/src/amazonq/util/functionUtils.ts b/packages/core/src/amazonq/util/functionUtils.ts
new file mode 100644
index 00000000000..b5d6a9bb9dc
--- /dev/null
+++ b/packages/core/src/amazonq/util/functionUtils.ts
@@ -0,0 +1,24 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Tries to create map and returns empty map if failed.
+ *
+ * @param {[unknown, unknown][]} arr - An array of tuples, where each tuple represents a key-value pair.
+ * @returns {Map<unknown, unknown>} A new Map object created from the input array.
+ *                                  If the conversion fails, an empty Map is returned.
+ *
+ * @example
+ * const array = [['key1', 'value1'], ['key2', 'value2']];
+ * const map = tryNewMap(array);
+ * // map is now a Map object with entries: { 'key1' => 'value1', 'key2' => 'value2' }
+ */
+export function tryNewMap(arr: [unknown, unknown][]) {
+    try {
+        return new Map(arr)
+    } catch (error) {
+        return new Map()
+    }
+}
diff --git a/packages/core/src/amazonq/util/telemetryHelper.ts b/packages/core/src/amazonq/util/telemetryHelper.ts
new file mode 100644
index 00000000000..121673ed163
--- /dev/null
+++ b/packages/core/src/amazonq/util/telemetryHelper.ts
@@ -0,0 +1,97 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../../shared/extensionGlobals'
+import { getLogger } from '../../shared/logger/logger'
+import { AmazonqApproachInvoke, AmazonqCodeGenerationInvoke, Span } from '../../shared/telemetry/telemetry'
+import { LLMResponseType } from '../commons/types'
+
+export class TelemetryHelper {
+    public generateApproachIteration: number
+    public generateApproachLastInvocationTime: number
+    public generateCodeIteration: number
+    public generateCodeLastInvocationTime: number
+    public codeGenerationResult: string
+    public numberOfFilesGenerated: number
+    public repositorySize: number
+    public amazonqNumberOfReferences: number
+    public sessionStartTime: number
+
+    constructor() {
+        this.generateApproachIteration = 0
+        this.generateApproachLastInvocationTime = 0
+        this.generateCodeIteration = 0
+        this.generateCodeLastInvocationTime = 0
+        this.codeGenerationResult = ''
+        this.numberOfFilesGenerated = 0
+        this.repositorySize = 0
+        this.amazonqNumberOfReferences = 0
+        this.sessionStartTime = performance.now()
+    }
+
+    public recordUserApproachTelemetry(
+        span: Span<AmazonqApproachInvoke>,
+        amazonqConversationId: string,
+        responseType: LLMResponseType
+    ) {
+        const event = {
+            amazonqConversationId,
+            amazonqGenerateApproachIteration: this.generateApproachIteration,
+            amazonqGenerateApproachLatency: performance.now() - this.generateApproachLastInvocationTime,
+            amazonqGenerateApproachResponseType: responseType,
+        }
+        if (globals.telemetry.telemetryEnabled) {
+            getLogger().debug(`recordUserApproachTelemetry: %O`, event)
+        }
+        span.record(event)
+    }
+
+    public recordUserCodeGenerationTelemetry(span: Span<AmazonqCodeGenerationInvoke>, amazonqConversationId: string) {
+        const event = {
+            amazonqConversationId,
+            amazonqGenerateCodeIteration: this.generateCodeIteration,
+            amazonqGenerateCodeResponseLatency: performance.now() - this.generateCodeLastInvocationTime,
+            amazonqCodeGenerationResult: this.codeGenerationResult,
+            amazonqRepositorySize: this.repositorySize,
+            ...(this.numberOfFilesGenerated && { amazonqNumberOfFilesGenerated: this.numberOfFilesGenerated }),
+            ...(this.amazonqNumberOfReferences && { amazonqNumberOfReferences: this.amazonqNumberOfReferences }),
+        }
+        getLogger().debug(`recordUserCodeGenerationTelemetry: %O`, event)
+
+        span.record(event)
+    }
+
+    public setGenerateApproachIteration(generateApproachIteration: number) {
+        this.generateApproachIteration = generateApproachIteration
+    }
+
+    public setGenerateCodeIteration(generateCodeIteration: number) {
+        this.generateCodeIteration = generateCodeIteration
+    }
+
+    public setGenerateApproachLastInvocationTime() {
+        this.generateApproachLastInvocationTime = performance.now()
+    }
+
+    public setGenerateCodeLastInvocationTime() {
+        this.generateCodeLastInvocationTime = performance.now()
+    }
+
+    public setCodeGenerationResult(status: string) {
+        this.codeGenerationResult = status
+    }
+
+    public setNumberOfFilesGenerated(numberOfFilesGenerated: number) {
+        this.numberOfFilesGenerated = numberOfFilesGenerated
+    }
+
+    public setRepositorySize(repositorySize: number) {
+        this.repositorySize = repositorySize
+    }
+
+    public setAmazonqNumberOfReferences(numberOfReferences: number) {
+        this.amazonqNumberOfReferences = numberOfReferences
+    }
+}
diff --git a/packages/core/src/amazonq/util/upload.ts b/packages/core/src/amazonq/util/upload.ts
new file mode 100644
index 00000000000..92e88fbea0e
--- /dev/null
+++ b/packages/core/src/amazonq/util/upload.ts
@@ -0,0 +1,46 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import request, { RequestError } from '../../shared/request'
+import { getLogger } from '../../shared/logger/logger'
+
+import { ToolkitError, UploadCodeError, UploadURLExpired } from '../../shared/errors'
+import { i18n } from '../../shared/i18n-helper'
+import { featureName } from '../../shared/constants'
+
+/**
+ * uploadCode
+ *
+ * uses a presigned url and files checksum to transfer data to s3 through http.
+ */
+export async function uploadCode(url: string, buffer: Buffer, checksumSha256: string, kmsKeyArn?: string) {
+    try {
+        await request.fetch('PUT', url, {
+            body: buffer,
+            headers: {
+                'Content-Type': 'application/zip',
+                'Content-Length': String(buffer.length),
+                'x-amz-checksum-sha256': checksumSha256,
+                ...(kmsKeyArn && {
+                    'x-amz-server-side-encryption-aws-kms-key-id': kmsKeyArn,
+                    'x-amz-server-side-encryption': 'aws:kms',
+                }),
+            },
+        }).response
+    } catch (e: any) {
+        getLogger().error(`${featureName}: failed to upload code to s3: ${(e as Error).message}`)
+        if (e instanceof RequestError) {
+            switch (e.response.status) {
+                case 403:
+                    throw new UploadURLExpired()
+                default:
+                    throw new UploadCodeError(
+                        e instanceof RequestError ? `${e.response.status}: ${e.response.statusText}` : 'Unknown'
+                    )
+            }
+        }
+        throw ToolkitError.chain(e, i18n('AWS.amazonq.featureDev.error.codeGen.default'))
+    }
+}
diff --git a/packages/core/src/amazonq/webview/assets/assetsHandler.ts b/packages/core/src/amazonq/webview/assets/assetsHandler.ts
new file mode 100644
index 00000000000..dc48312f072
--- /dev/null
+++ b/packages/core/src/amazonq/webview/assets/assetsHandler.ts
@@ -0,0 +1,40 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { TextDocumentContentProvider, Event, Uri, CancellationToken, workspace, ExtensionContext } from 'vscode'
+import https = require('https')
+
+// The scheme 'https' is reserved, but it using it doesn't seem to give the behavior we want, so registering a customhttps scheme here.
+export function registerAssetsHttpsFileSystem(context: ExtensionContext): void {
+    context.subscriptions.push(
+        workspace.registerTextDocumentContentProvider('customhttps', new AssetsContentProvider())
+    )
+}
+
+class AssetsContentProvider implements TextDocumentContentProvider {
+    onDidChange?: Event<Uri> | undefined = undefined
+
+    async provideTextDocumentContent(uri: Uri, token: CancellationToken): Promise<string> {
+        return await httpGet({
+            host: uri.authority.replace('customhttps', 'https'),
+            path: uri.path,
+        })
+    }
+}
+
+export async function httpGet(options: https.RequestOptions): Promise<string> {
+    return await new Promise<string>((resolve, reject) => {
+        options.method = 'GET'
+        https
+            .get(options, (res) => {
+                res.setEncoding('utf8')
+                let body = ''
+                // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
+                res.on('data', (chunk) => (body += chunk))
+                res.on('end', () => resolve(body))
+            })
+            .on('error', reject)
+    })
+}
diff --git a/packages/core/src/amazonq/webview/generators/featureConfig.ts b/packages/core/src/amazonq/webview/generators/featureConfig.ts
new file mode 100644
index 00000000000..8de71be5c5c
--- /dev/null
+++ b/packages/core/src/amazonq/webview/generators/featureConfig.ts
@@ -0,0 +1,35 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { FeatureConfigProvider, FeatureContext } from '../../../shared/featureConfig'
+
+export async function getFeatureConfigs(): Promise<string> {
+    let featureConfigs = new Map<string, FeatureContext>()
+    try {
+        await FeatureConfigProvider.instance.fetchFeatureConfigs()
+        featureConfigs = FeatureConfigProvider.getFeatureConfigs()
+    } catch (error) {
+        // eslint-disable-next-line aws-toolkits/no-console-log
+        console.error('Error fetching feature configs:', error)
+    }
+
+    // Convert featureConfigs to a string suitable for data-features
+    return JSON.stringify(Array.from(featureConfigs.entries()))
+}
+
+export function serialize(configs: string) {
+    let featureDataAttributes = ''
+    try {
+        // Fetch and parse featureConfigs
+        const featureConfigs = JSON.parse(configs)
+        featureDataAttributes = featureConfigs
+            .map((config: FeatureContext[]) => `data-feature-${config[1].name}="${config[1].variation}"`)
+            .join(' ')
+    } catch (error) {
+        // eslint-disable-next-line aws-toolkits/no-console-log
+        console.error('Error setting data-feature attribute for featureConfigs:', error)
+    }
+    return featureDataAttributes
+}
diff --git a/packages/core/src/amazonq/webview/generators/webViewContent.ts b/packages/core/src/amazonq/webview/generators/webViewContent.ts
new file mode 100644
index 00000000000..bc637a8f6c6
--- /dev/null
+++ b/packages/core/src/amazonq/webview/generators/webViewContent.ts
@@ -0,0 +1,95 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import path from 'path'
+import { Uri, Webview } from 'vscode'
+import { AuthUtil } from '../../../codewhisperer/util/authUtil'
+import globals from '../../../shared/extensionGlobals'
+import { isSageMaker } from '../../../shared/extensionUtilities'
+import { AmazonQPromptSettings } from '../../../shared/settings'
+import { getFeatureConfigs, serialize } from './featureConfig'
+
+export class WebViewContentGenerator {
+    public async generate(extensionURI: Uri, webView: Webview): Promise<string> {
+        const entrypoint = process.env.WEBPACK_DEVELOPER_SERVER
+            ? 'http: localhost'
+            : 'https: file+.vscode-resources.vscode-cdn.net'
+
+        const contentPolicy = `default-src ${entrypoint} data: blob: 'unsafe-inline';
+        script-src ${entrypoint} filesystem: ws: wss: 'unsafe-inline';`
+
+        const configs = await getFeatureConfigs()
+        const featureDataAttributes = serialize(configs)
+        return `<!DOCTYPE html>
+        <html>
+            <head>
+                <meta http-equiv="Content-Security-Policy" content="${contentPolicy}">
+                <title>Amazon Q (Preview)</title>
+                ${await this.generateJS(extensionURI, webView, configs)}
+            </head>
+            <body ${featureDataAttributes}>
+            </body>
+        </html>`
+    }
+
+    private async generateJS(extensionURI: Uri, webView: Webview, featureConfigsString: string): Promise<string> {
+        const source = path.join('vue', 'src', 'amazonq', 'webview', 'ui', 'amazonq-ui.js') // Sent to dist/vue folder in webpack.
+        const assetsPath = Uri.joinPath(extensionURI)
+        const javascriptUri = Uri.joinPath(assetsPath, 'dist', source)
+
+        const serverHostname = process.env.WEBPACK_DEVELOPER_SERVER
+
+        const javascriptEntrypoint =
+            serverHostname !== undefined
+                ? Uri.parse(serverHostname).with({ path: `/${source}` })
+                : webView.asWebviewUri(javascriptUri)
+
+        const cssEntrypoints = [
+            Uri.joinPath(globals.context.extensionUri, 'resources', 'css', 'amazonq-webview.css'),
+            Uri.joinPath(globals.context.extensionUri, 'resources', 'css', 'amazonq-chat.css'),
+        ]
+
+        const cssEntrypointsMap = cssEntrypoints.map((item) => webView.asWebviewUri(item))
+        const cssLinks = cssEntrypointsMap.map((uri) => `<link rel="stylesheet" href="${uri.toString()}">`).join('\n')
+
+        const isSM = isSageMaker('SMAI')
+        const isSMUS = isSageMaker('SMUS')
+
+        const disabledCommandsString = isSM ? `['/dev', '/transform', '/test', '/review', '/doc']` : '[]'
+        const disclaimerAcknowledged = !AmazonQPromptSettings.instance.isPromptEnabled('amazonQChatDisclaimer')
+        const welcomeLoadCount = globals.globalState.tryGet('aws.amazonq.welcomeChatShowCount', Number, 0)
+
+        // only show profile card when the two conditions
+        //  1. profile count >= 2
+        //  2. not default (fallback) which has empty arn
+        const regionProfile =
+            AuthUtil.instance.regionProfileManager.profiles.length === 1
+                ? undefined
+                : AuthUtil.instance.regionProfileManager.activeRegionProfile
+
+        const regionProfileString: string = JSON.stringify(regionProfile)
+        const authState = (await AuthUtil.instance.getChatAuthState()).amazonQ
+
+        return `
+        <script type="text/javascript" src="${javascriptEntrypoint.toString()}" defer onload="init()"></script>
+        ${cssLinks}
+        <script type="text/javascript">
+            const init = () => {
+                createMynahUI(
+                    acquireVsCodeApi(),
+                    ${authState === 'connected'},
+                    ${featureConfigsString},
+                    ${welcomeLoadCount},
+                    ${disclaimerAcknowledged},
+                    ${regionProfileString},
+                    ${disabledCommandsString},
+                    ${isSMUS},
+                    ${isSM}
+                );
+            }
+        </script>
+        `
+    }
+}
diff --git a/packages/core/src/amazonq/webview/messages/messageDispatcher.ts b/packages/core/src/amazonq/webview/messages/messageDispatcher.ts
new file mode 100644
index 00000000000..56d4c8503b9
--- /dev/null
+++ b/packages/core/src/amazonq/webview/messages/messageDispatcher.ts
@@ -0,0 +1,139 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Webview, Uri } from 'vscode'
+import { MessagePublisher } from '../../messages/messagePublisher'
+import { MessageListener } from '../../messages/messageListener'
+import { TabType } from '../ui/storages/tabsStorage'
+import { getLogger } from '../../../shared/logger/logger'
+import { amazonqMark } from '../../../shared/performance/marks'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { AmazonQChatMessageDuration } from '../../messages/chatMessageDuration'
+import { isClickTelemetry, isOpenAgentTelemetry } from '../ui/telemetry/actions'
+import globals from '../../../shared/extensionGlobals'
+import { openUrl } from '../../../shared/utilities/vsCodeUtils'
+import { DefaultAmazonQAppInitContext } from '../../apps/initContext'
+import { AmazonQPromptSettings } from '../../../shared/settings'
+
+const qChatModuleName = 'amazonqChat'
+
+export function dispatchWebViewMessagesToApps(
+    webview: Webview,
+    webViewToAppsMessagePublishers: Map<TabType, MessagePublisher<any>>
+) {
+    webview.onDidReceiveMessage((msg) => {
+        handleWebviewEvent(msg, webViewToAppsMessagePublishers)
+    })
+}
+
+export function isLegacyEvent(value: string): boolean {
+    return (
+        value === 'ui-is-ready' ||
+        value === 'start-chat-message-telemetry' ||
+        value === 'update-chat-message-telemetry' ||
+        value === 'stop-chat-message-telemetry' ||
+        value === 'open-link' ||
+        value === 'send-telemetry' ||
+        value === 'disclaimer-acknowledged' ||
+        value === 'update-welcome-count'
+    )
+}
+
+export function handleWebviewEvent(msg: any, webViewToAppsMessagePublishers: Map<TabType, MessagePublisher<any>>) {
+    switch (msg.command) {
+        case 'ui-is-ready': {
+            DefaultAmazonQAppInitContext.instance.getAppsToWebViewMessagePublisher().setUiReady()
+            /**
+             * ui-is-ready isn't associated to any tab so just record the telemetry event and continue.
+             * This would be equivalent of the duration between "user clicked open q" and "ui has become available"
+             * NOTE: Amazon Q UI is only loaded ONCE. The state is saved between each hide/show of the webview.
+             */
+            telemetry.toolkit_didLoadModule.emit({
+                module: qChatModuleName,
+                duration: performance.measure(amazonqMark.uiReady, amazonqMark.open).duration,
+                result: 'Succeeded',
+            })
+            performance.clearMarks(amazonqMark.uiReady)
+            performance.clearMarks(amazonqMark.open)
+            // let cwcController know the ui is ready
+            webViewToAppsMessagePublishers.get('cwc')?.publish(msg)
+            return
+        }
+        case 'start-chat-message-telemetry': {
+            AmazonQChatMessageDuration.startChatMessageTelemetry(msg)
+            return
+        }
+        case 'update-chat-message-telemetry': {
+            AmazonQChatMessageDuration.updateChatMessageTelemetry(msg)
+            return
+        }
+        case 'stop-chat-message-telemetry': {
+            AmazonQChatMessageDuration.stopChatMessageTelemetry(msg)
+            return
+        }
+        case 'open-link': {
+            const { link } = msg
+            void openUrl(Uri.parse(link))
+            return
+        }
+        case 'send-telemetry': {
+            if (isOpenAgentTelemetry(msg)) {
+                telemetry.toolkit_didLoadModule.emit({
+                    module: msg.module,
+                    source: msg.trigger,
+                    result: 'Succeeded',
+                })
+                return
+            } else if (isClickTelemetry(msg)) {
+                telemetry.ui_click.emit({
+                    elementId: msg.source,
+                    result: 'Succeeded',
+                })
+                return
+            }
+            return
+        }
+        case 'disclaimer-acknowledged': {
+            void AmazonQPromptSettings.instance.update('amazonQChatDisclaimer', true)
+            return
+        }
+        case 'update-welcome-count': {
+            const currentLoadCount = globals.globalState.tryGet('aws.amazonq.welcomeChatShowCount', Number, 0)
+            void globals.globalState.tryUpdate('aws.amazonq.welcomeChatShowCount', currentLoadCount + 1)
+            return
+        }
+    }
+
+    if (msg.type === 'error') {
+        if (msg.event === 'toolkit_didLoadModule') {
+            telemetry.toolkit_didLoadModule.emit({
+                module: qChatModuleName,
+                result: 'Failed',
+                reasonDesc: msg.errorMessage,
+            })
+        } else {
+            telemetry.webview_error.emit({
+                webviewName: qChatModuleName,
+                result: 'Failed',
+                reasonDesc: msg.errorMessage,
+            })
+        }
+        return
+    }
+
+    const appMessagePublisher = webViewToAppsMessagePublishers.get(msg.tabType)
+    if (appMessagePublisher === undefined) {
+        return
+    }
+    appMessagePublisher.publish(msg)
+}
+
+export function dispatchAppsMessagesToWebView(webView: Webview, appsMessageListener: MessageListener<any>) {
+    appsMessageListener.onMessage((msg) => {
+        webView.postMessage(JSON.stringify(msg)).then(undefined, (e) => {
+            getLogger().error('webView.postMessage failed: %s', (e as Error).message)
+        })
+    })
+}
diff --git a/packages/core/src/amazonq/webview/ui/apps/amazonqCommonsConnector.ts b/packages/core/src/amazonq/webview/ui/apps/amazonqCommonsConnector.ts
new file mode 100644
index 00000000000..ee20b9b0726
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/apps/amazonqCommonsConnector.ts
@@ -0,0 +1,135 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ChatItem, ChatItemAction, ChatItemType, ChatPrompt } from '@aws/mynah-ui'
+import { ExtensionMessage } from '../commands'
+import { AuthFollowUpType } from '../followUps/generator'
+import { getTabCommandFromTabType, isTabType, TabType } from '../storages/tabsStorage'
+import { helpMessage, reviewGuideUrl } from '../texts/constants'
+import { linkToDocsHome } from '../../../../codewhisperer/models/constants'
+import { createClickTelemetry, createOpenAgentTelemetry } from '../telemetry/actions'
+
+export type WelcomeFollowupType = 'continue-to-chat'
+
+export interface ConnectorProps {
+    sendMessageToExtension: (message: ExtensionMessage) => void
+    onWelcomeFollowUpClicked: (tabID: string, welcomeFollowUpType: WelcomeFollowupType) => void
+    onNewTab: (tabType: TabType) => void
+    handleCommand: (chatPrompt: ChatPrompt, tabId: string) => void
+    sendStaticMessages: (tabID: string, messages: ChatItem[]) => void
+}
+export interface CodeReference {
+    licenseName?: string
+    repository?: string
+    url?: string
+    recommendationContentSpan?: {
+        start?: number
+        end?: number
+    }
+}
+
+export class Connector {
+    private readonly sendMessageToExtension
+    private readonly onWelcomeFollowUpClicked
+    private readonly handleCommand
+    private readonly sendStaticMessage
+
+    constructor(props: ConnectorProps) {
+        this.sendMessageToExtension = props.sendMessageToExtension
+        this.onWelcomeFollowUpClicked = props.onWelcomeFollowUpClicked
+        this.handleCommand = props.handleCommand
+        this.sendStaticMessage = props.sendStaticMessages
+    }
+
+    followUpClicked = (tabID: string, followUp: ChatItemAction): void => {
+        if (followUp.type !== undefined && followUp.type === 'continue-to-chat') {
+            this.onWelcomeFollowUpClicked(tabID, followUp.type)
+        }
+    }
+
+    authFollowUpClicked = (tabID: string, tabType: string, authType: AuthFollowUpType): void => {
+        this.sendMessageToExtension({
+            command: 'auth-follow-up-was-clicked',
+            authType,
+            tabID,
+            tabType,
+        })
+    }
+
+    handleMessageReceive = async (messageData: any): Promise<void> => {
+        if (messageData.command === 'review') {
+            // tabID does not exist when calling from QuickAction Menu bar
+            this.handleCommand({ command: '/review' }, '')
+            return
+        }
+    }
+
+    onCustomFormAction(
+        tabId: string,
+        action: {
+            id: string
+            text?: string | undefined
+            formItemValues?: Record<string, string> | undefined
+        }
+    ) {
+        const tabType = action.id.split('-')[2]
+        if (!isTabType(tabType)) {
+            return
+        }
+
+        if (action.id.startsWith('user-guide-')) {
+            this.processUserGuideLink(tabType, action.id)
+            return
+        }
+
+        if (action.id.startsWith('quick-start-')) {
+            this.handleCommand(
+                {
+                    command: getTabCommandFromTabType(tabType),
+                },
+                tabId
+            )
+
+            this.sendMessageToExtension(createOpenAgentTelemetry(tabType, 'quick-start'))
+        }
+    }
+
+    private processUserGuideLink(tabType: TabType, actionId: string) {
+        let userGuideLink = ''
+        switch (tabType) {
+            case 'review':
+                userGuideLink = reviewGuideUrl
+                break
+            case 'gumby':
+                userGuideLink = linkToDocsHome
+                break
+        }
+
+        // e.g. amazonq-explore-user-guide-featuredev
+        this.sendMessageToExtension(createClickTelemetry(`amazonq-explore-${actionId}`))
+
+        this.sendMessageToExtension({
+            command: 'open-link',
+            link: userGuideLink,
+        })
+    }
+
+    sendMessage(tabID: string, message: 'help') {
+        switch (message) {
+            case 'help':
+                this.sendStaticMessage(tabID, [
+                    {
+                        type: ChatItemType.PROMPT,
+                        body: 'How can Amazon Q help me?',
+                    },
+                    {
+                        type: ChatItemType.ANSWER,
+                        body: helpMessage,
+                    },
+                ])
+                break
+        }
+    }
+}
diff --git a/packages/core/src/amazonq/webview/ui/apps/baseConnector.ts b/packages/core/src/amazonq/webview/ui/apps/baseConnector.ts
new file mode 100644
index 00000000000..10d0aba9f26
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/apps/baseConnector.ts
@@ -0,0 +1,380 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    ChatItem,
+    ChatItemAction,
+    ChatItemType,
+    DetailedList,
+    FeedbackPayload,
+    QuickActionCommand,
+} from '@aws/mynah-ui'
+import { ExtensionMessage } from '../commands'
+import { CodeReference } from './amazonqCommonsConnector'
+import { TabOpenType, TabsStorage, TabType } from '../storages/tabsStorage'
+import { FollowUpGenerator } from '../followUps/generator'
+import { CWCChatItem } from '../connector'
+import { DetailedListSheetProps } from '@aws/mynah-ui/dist/components/detailed-list/detailed-list-sheet'
+import { DetailedListConnector, DetailedListType } from '../detailedList/detailedListConnector'
+
+interface ChatPayload {
+    chatMessage: string
+    chatCommand?: string
+    chatContext?: string[] | QuickActionCommand[]
+}
+
+export interface BaseConnectorProps {
+    sendMessageToExtension: (message: ExtensionMessage) => void
+    onMessageReceived?: (tabID: string, messageData: any, needToShowAPIDocsTab: boolean) => void
+    onChatAnswerReceived?: (tabID: string, message: CWCChatItem | ChatItem, messageData: any) => void
+    onError: (tabID: string, message: string, title: string) => void
+    onWarning: (tabID: string, message: string, title: string) => void
+    onOpenSettingsMessage: (tabID: string) => void
+    onNewTab: (tabType: TabType, chats?: ChatItem[]) => string | undefined
+    onOpenDetailedList: (data: DetailedListSheetProps) => {
+        update: (data: DetailedList) => void
+        close: () => void
+        changeTarget: (direction: 'up' | 'down', snapOnLastAndFirst?: boolean) => void
+        getTargetElementId: () => string | undefined
+    }
+    onSelectTab: (tabID: string, eventID: string) => void
+    onExportChat: (tabId: string, format: 'html' | 'markdown') => string
+    tabsStorage: TabsStorage
+}
+
+export abstract class BaseConnector {
+    protected readonly sendMessageToExtension
+    protected readonly onError
+    protected readonly onWarning
+    protected readonly onChatAnswerReceived
+    protected readonly onOpenSettingsMessage
+    protected readonly onNewTab
+    protected readonly onOpenDetailedList
+    protected readonly onExportChat
+    protected readonly onSelectTab
+    protected readonly followUpGenerator: FollowUpGenerator
+    protected readonly tabsStorage
+    protected historyConnector
+
+    abstract getTabType(): TabType
+
+    constructor(props: BaseConnectorProps) {
+        this.sendMessageToExtension = props.sendMessageToExtension
+        this.onChatAnswerReceived = props.onChatAnswerReceived
+        this.onWarning = props.onWarning
+        this.onError = props.onError
+        this.onOpenSettingsMessage = props.onOpenSettingsMessage
+        this.onNewTab = props.onNewTab
+        this.tabsStorage = props.tabsStorage
+        this.onOpenDetailedList = props.onOpenDetailedList
+        this.onExportChat = props.onExportChat
+        this.onSelectTab = props.onSelectTab
+        this.followUpGenerator = new FollowUpGenerator()
+        this.historyConnector = new DetailedListConnector(
+            DetailedListType.history,
+            this.sendMessageToExtension,
+            this.onOpenDetailedList
+        )
+    }
+
+    onResponseBodyLinkClick = (tabID: string, messageId: string, link: string): void => {
+        this.sendMessageToExtension({
+            command: 'response-body-link-click',
+            tabID,
+            messageId,
+            link,
+            tabType: this.getTabType(),
+        })
+    }
+    onInfoLinkClick = (tabID: string, link: string): void => {
+        this.sendMessageToExtension({
+            command: 'footer-info-link-click',
+            tabID,
+            link,
+            tabType: this.getTabType(),
+        })
+    }
+
+    followUpClicked = (tabID: string, messageId: string, followUp: ChatItemAction): void => {
+        /**
+         * We've pressed on a followup button and should start watching that round trip telemetry
+         */
+        this.sendMessageToExtension({
+            command: 'start-chat-message-telemetry',
+            trigger: 'followUpClicked',
+            tabID,
+            traceId: messageId,
+            tabType: this.getTabType(),
+            startTime: Date.now(),
+        })
+        this.sendMessageToExtension({
+            command: 'follow-up-was-clicked',
+            followUp,
+            tabID,
+            messageId,
+            tabType: this.getTabType(),
+        })
+    }
+
+    onTabAdd = (tabID: string, tabOpenInteractionType?: TabOpenType): void => {
+        this.sendMessageToExtension({
+            tabID: tabID,
+            command: 'new-tab-was-created',
+            tabType: this.getTabType(),
+            tabOpenInteractionType,
+        })
+    }
+
+    onCodeInsertToCursorPosition = (
+        tabID: string,
+        messageId: string,
+        code?: string,
+        type?: 'selection' | 'block',
+        codeReference?: CodeReference[],
+        eventId?: string,
+        codeBlockIndex?: number,
+        totalCodeBlocks?: number,
+        userIntent?: string,
+        codeBlockLanguage?: string
+    ): void => {
+        this.sendMessageToExtension({
+            tabID: tabID,
+            messageId,
+            code,
+            command: 'insert_code_at_cursor_position',
+            tabType: this.getTabType(),
+            insertionTargetType: type,
+            codeReference,
+            eventId,
+            codeBlockIndex,
+            totalCodeBlocks,
+            userIntent,
+            codeBlockLanguage,
+        })
+    }
+
+    onCopyCodeToClipboard = (
+        tabID: string,
+        messageId: string,
+        code?: string,
+        type?: 'selection' | 'block',
+        codeReference?: CodeReference[],
+        eventId?: string,
+        codeBlockIndex?: number,
+        totalCodeBlocks?: number,
+        userIntent?: string,
+        codeBlockLanguage?: string
+    ): void => {
+        this.sendMessageToExtension({
+            tabID: tabID,
+            messageId,
+            code,
+            command: 'code_was_copied_to_clipboard',
+            tabType: this.getTabType(),
+            insertionTargetType: type,
+            codeReference,
+            eventId,
+            codeBlockIndex,
+            totalCodeBlocks,
+            userIntent,
+            codeBlockLanguage,
+        })
+    }
+
+    onTabRemove = (tabID: string): void => {
+        this.sendMessageToExtension({
+            tabID: tabID,
+            command: 'tab-was-removed',
+            tabType: this.getTabType(),
+        })
+    }
+
+    onTabChange = (tabID: string, prevTabID?: string) => {
+        this.sendMessageToExtension({
+            tabID: tabID,
+            command: 'tab-was-changed',
+            tabType: this.getTabType(),
+            prevTabID,
+        })
+    }
+
+    onStopChatResponse = (tabID: string): void => {
+        this.sendMessageToExtension({
+            tabID: tabID,
+            command: 'stop-response',
+            tabType: this.getTabType(),
+        })
+    }
+
+    onChatItemVoted = (tabID: string, messageId: string, vote: 'upvote' | 'downvote'): void => {
+        this.sendMessageToExtension({
+            tabID: tabID,
+            command: 'chat-item-voted',
+            messageId,
+            vote,
+            tabType: this.getTabType(),
+        })
+    }
+    onSendFeedback = (tabID: string, feedbackPayload: FeedbackPayload): void | undefined => {
+        this.sendMessageToExtension({
+            command: 'chat-item-feedback',
+            ...feedbackPayload,
+            tabType: this.getTabType(),
+            tabID: tabID,
+        })
+    }
+
+    requestGenerativeAIAnswer = (tabID: string, messageId: string, payload: ChatPayload): Promise<any> => {
+        /**
+         * When a user presses "enter" send an event that indicates
+         * we should start tracking the round trip time for this message
+         **/
+        this.sendMessageToExtension({
+            command: 'start-chat-message-telemetry',
+            trigger: 'onChatPrompt',
+            tabID,
+            traceId: messageId,
+            tabType: this.getTabType(),
+            startTime: Date.now(),
+        })
+        return new Promise((resolve, reject) => {
+            this.sendMessageToExtension({
+                tabID: tabID,
+                command: 'chat-prompt',
+                chatMessage: payload.chatMessage,
+                chatCommand: payload.chatCommand,
+                chatContext: payload.chatContext,
+                tabType: this.getTabType(),
+            })
+        })
+    }
+
+    clearChat = (tabID: string): void => {
+        this.sendMessageToExtension({
+            tabID: tabID,
+            command: 'clear',
+            chatMessage: '',
+            tabType: this.getTabType(),
+        })
+    }
+
+    help = (tabID: string): void => {
+        this.sendMessageToExtension({
+            tabID: tabID,
+            command: 'help',
+            chatMessage: '',
+            tabType: this.getTabType(),
+        })
+    }
+
+    onTabOpen = (tabID: string): void => {
+        this.sendMessageToExtension({
+            tabID,
+            command: 'new-tab-was-created',
+            tabType: this.getTabType(),
+        })
+    }
+
+    protected sendTriggerMessageProcessed = async (requestID: any): Promise<void> => {
+        this.sendMessageToExtension({
+            command: 'trigger-message-processed',
+            requestID: requestID,
+            tabType: this.getTabType(),
+        })
+    }
+
+    protected processAuthNeededException = async (messageData: any): Promise<void> => {
+        if (this.onChatAnswerReceived === undefined) {
+            return
+        }
+
+        this.onChatAnswerReceived(
+            messageData.tabID,
+            {
+                type: ChatItemType.ANSWER,
+                messageId: messageData.triggerID,
+                body: messageData.message,
+                followUp: this.followUpGenerator.generateAuthFollowUps(this.getTabType(), messageData.authType),
+                canBeVoted: false,
+            },
+            messageData
+        )
+
+        return
+    }
+
+    protected processOpenSettingsMessage = async (messageData: any): Promise<void> => {
+        this.onOpenSettingsMessage(messageData.tabID)
+    }
+
+    protected baseHandleMessageReceive = async (messageData: any): Promise<void> => {
+        if (messageData.type === 'errorMessage') {
+            this.onError(messageData.tabID, messageData.message, messageData.title)
+            return
+        }
+        if (messageData.type === 'showInvalidTokenNotification') {
+            this.onWarning(messageData.tabID, messageData.message, messageData.title)
+            return
+        }
+
+        if (messageData.type === 'authNeededException') {
+            await this.processAuthNeededException(messageData)
+            return
+        }
+
+        if (messageData.type === 'openSettingsMessage') {
+            await this.processOpenSettingsMessage(messageData)
+            return
+        }
+
+        if (messageData.type === 'restoreTabMessage') {
+            const newTabId = this.onNewTab(messageData.tabType, messageData.chats)
+            this.sendMessageToExtension({
+                command: 'tab-restored',
+                historyId: messageData.historyId,
+                newTabId,
+                tabType: this.getTabType(),
+                exportTab: messageData.exportTab,
+            })
+            return
+        }
+
+        if (messageData.type === 'updateDetailedListMessage') {
+            if (messageData.listType === DetailedListType.history) {
+                this.historyConnector.updateList(messageData.detailedList)
+            }
+            return
+        }
+
+        if (messageData.type === 'closeDetailedListMessage') {
+            if (messageData.listType === DetailedListType.history) {
+                this.historyConnector.closeList()
+            }
+            return
+        }
+
+        if (messageData.type === 'openDetailedListMessage') {
+            if (messageData.listType === DetailedListType.history) {
+                this.historyConnector.openList(messageData)
+            }
+            return
+        }
+
+        if (messageData.type === 'exportChatMessage') {
+            const serializedChat = this.onExportChat(messageData.tabID, messageData.format)
+            this.sendMessageToExtension({
+                command: 'save-chat',
+                uri: messageData.uri,
+                serializedChat,
+                tabType: 'cwc',
+            })
+            return
+        }
+
+        if (messageData.type === 'selectTabMessage') {
+            this.onSelectTab(messageData.tabID, messageData.eventID)
+        }
+    }
+}
diff --git a/packages/core/src/amazonq/webview/ui/apps/cwChatConnector.ts b/packages/core/src/amazonq/webview/ui/apps/cwChatConnector.ts
new file mode 100644
index 00000000000..324616a445a
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/apps/cwChatConnector.ts
@@ -0,0 +1,265 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ChatItemButton, ChatItemFormItem, ChatItemType, MynahUIDataModel, QuickActionCommand } from '@aws/mynah-ui'
+import { TabType } from '../storages/tabsStorage'
+import { CWCChatItem } from '../connector'
+import { BaseConnector, BaseConnectorProps } from './baseConnector'
+
+export interface ConnectorProps extends BaseConnectorProps {
+    onCWCContextCommandMessage: (message: CWCChatItem, command?: string) => string | undefined
+    onContextCommandDataReceived: (data: MynahUIDataModel['contextCommands']) => void
+    onShowCustomForm: (
+        tabId: string,
+        formItems?: ChatItemFormItem[],
+        buttons?: ChatItemButton[],
+        title?: string,
+        description?: string
+    ) => void
+}
+
+export class Connector extends BaseConnector {
+    private readonly onCWCContextCommandMessage
+    private readonly onContextCommandDataReceived
+    private readonly onShowCustomForm
+
+    override getTabType(): TabType {
+        return 'cwc'
+    }
+
+    constructor(props: ConnectorProps) {
+        super(props)
+        this.onCWCContextCommandMessage = props.onCWCContextCommandMessage
+        this.onContextCommandDataReceived = props.onContextCommandDataReceived
+        this.onShowCustomForm = props.onShowCustomForm
+    }
+
+    onSourceLinkClick = (tabID: string, messageId: string, link: string): void => {
+        this.sendMessageToExtension({
+            command: 'source-link-click',
+            tabID,
+            messageId,
+            link,
+            tabType: this.getTabType(),
+        })
+    }
+
+    private processEditorContextCommandMessage = async (messageData: any): Promise<void> => {
+        const triggerTabID = this.onCWCContextCommandMessage(
+            {
+                body: messageData.message,
+                type: ChatItemType.PROMPT,
+            },
+            messageData.command
+        )
+        await this.sendTriggerTabIDReceived(
+            messageData.triggerID,
+            triggerTabID !== undefined ? triggerTabID : 'no-available-tabs'
+        )
+    }
+
+    private sendTriggerTabIDReceived = async (triggerID: string, tabID: string): Promise<void> => {
+        this.sendMessageToExtension({
+            command: 'trigger-tabID-received',
+            triggerID,
+            tabID,
+            tabType: this.getTabType(),
+        })
+    }
+
+    private processChatMessage = async (messageData: any): Promise<void> => {
+        if (this.onChatAnswerReceived === undefined) {
+            return
+        }
+        if (
+            messageData.message !== undefined ||
+            messageData.relatedSuggestions !== undefined ||
+            messageData.codeReference !== undefined
+        ) {
+            const followUps =
+                messageData.followUps !== undefined && messageData.followUps.length > 0
+                    ? {
+                          text: messageData.followUpsHeader ?? 'Suggested follow up questions:',
+                          options: messageData.followUps,
+                      }
+                    : undefined
+
+            const answer: CWCChatItem = {
+                type: messageData.messageType,
+                messageId: messageData.messageID ?? messageData.triggerID,
+                body: messageData.message,
+                followUp: followUps,
+                canBeVoted: true,
+                codeReference: messageData.codeReference,
+                userIntent: messageData.userIntent,
+                codeBlockLanguage: messageData.codeBlockLanguage,
+                contextList: messageData.contextList,
+            }
+
+            // If it is not there we will not set it
+            if (messageData.messageType === 'answer-part' || messageData.messageType === 'answer') {
+                answer.canBeVoted = true
+            }
+
+            if (messageData.relatedSuggestions !== undefined) {
+                answer.relatedContent = {
+                    title: 'Sources',
+                    content: messageData.relatedSuggestions,
+                }
+            }
+            this.onChatAnswerReceived(messageData.tabID, answer, messageData)
+
+            // Exit the function if we received an answer from AI
+            if (
+                messageData.messageType === ChatItemType.SYSTEM_PROMPT ||
+                messageData.messageType === ChatItemType.AI_PROMPT
+            ) {
+                await this.sendTriggerMessageProcessed(messageData.requestID)
+            }
+
+            return
+        }
+        if (messageData.messageType === ChatItemType.ANSWER) {
+            const answer: CWCChatItem = {
+                type: messageData.messageType,
+                body: undefined,
+                relatedContent: undefined,
+                messageId: messageData.messageID,
+                codeReference: messageData.codeReference,
+                userIntent: messageData.userIntent,
+                codeBlockLanguage: messageData.codeBlockLanguage,
+                followUp:
+                    messageData.followUps !== undefined && messageData.followUps.length > 0
+                        ? {
+                              text: 'Suggested follow up questions:',
+                              options: messageData.followUps,
+                          }
+                        : undefined,
+            }
+            this.onChatAnswerReceived(messageData.tabID, answer, messageData)
+
+            return
+        }
+    }
+
+    processContextCommandData(messageData: any) {
+        if (messageData.data) {
+            this.onContextCommandDataReceived(messageData.data)
+        }
+    }
+
+    private showCustomFormMessage = (messageData: any) => {
+        this.onShowCustomForm(
+            messageData.tabID,
+            messageData.formItems,
+            messageData.buttons,
+            messageData.title,
+            messageData.description
+        )
+    }
+
+    onFormTextualItemKeyPress = (
+        tabId: string,
+        event: KeyboardEvent,
+        formData: Record<string, string>,
+        itemId: string,
+        eventId?: string
+    ) => {
+        if (itemId === 'prompt-name' && event.key === 'Enter') {
+            event.preventDefault()
+            this.sendMessageToExtension({
+                command: 'form-action-click',
+                action: {
+                    id: 'submit-create-prompt',
+                    formItemValues: formData,
+                },
+                tabType: this.getTabType(),
+                tabID: tabId,
+            })
+            return true
+        }
+        return false
+    }
+
+    handleMessageReceive = async (messageData: any): Promise<void> => {
+        if (messageData.type === 'chatMessage') {
+            await this.processChatMessage(messageData)
+            return
+        }
+
+        if (messageData.type === 'editorContextCommandMessage') {
+            await this.processEditorContextCommandMessage(messageData)
+            return
+        }
+
+        if (messageData.type === 'contextCommandData') {
+            this.processContextCommandData(messageData)
+            return
+        }
+        if (messageData.type === 'showCustomFormMessage') {
+            this.showCustomFormMessage(messageData)
+            return
+        }
+
+        if (messageData.type === 'customFormActionMessage') {
+            this.onCustomFormAction(messageData.tabID, messageData.action)
+            return
+        }
+        // For other message types, call the base class handleMessageReceive
+        await this.baseHandleMessageReceive(messageData)
+    }
+
+    onQuickCommandGroupActionClick = (tabID: string, action: { id: string }) => {
+        this.sendMessageToExtension({
+            command: 'quick-command-group-action-click',
+            actionId: action.id,
+            tabID,
+            tabType: this.getTabType(),
+        })
+    }
+
+    onContextSelected = (tabID: string, contextItem: QuickActionCommand) => {
+        this.sendMessageToExtension({
+            command: 'context-selected',
+            contextItem,
+            tabID,
+            tabType: this.getTabType(),
+        })
+        if (contextItem.id === 'create-saved-prompt') {
+            return false
+        }
+        return true
+    }
+
+    onCustomFormAction(
+        tabId: string,
+        action: {
+            id: string
+            text?: string | undefined
+            formItemValues?: Record<string, string> | undefined
+        }
+    ) {
+        if (action === undefined) {
+            return
+        }
+
+        this.sendMessageToExtension({
+            command: 'form-action-click',
+            action: action,
+            tabType: this.getTabType(),
+            tabID: tabId,
+        })
+    }
+
+    onFileClick = (tabID: string, filePath: string, messageId?: string) => {
+        this.sendMessageToExtension({
+            command: 'file-click',
+            tabID,
+            messageId,
+            filePath,
+            tabType: 'cwc',
+        })
+    }
+}
diff --git a/packages/core/src/amazonq/webview/ui/apps/gumbyChatConnector.ts b/packages/core/src/amazonq/webview/ui/apps/gumbyChatConnector.ts
new file mode 100644
index 00000000000..9801ff7d27f
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/apps/gumbyChatConnector.ts
@@ -0,0 +1,180 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * This class is responsible for listening to and processing events
+ * from the webview and translating them into events to be handled by the extension,
+ * and events from the extension and translating them into events to be handled by the webview.
+ */
+
+import { ChatItem, ChatItemType } from '@aws/mynah-ui'
+import { TabType } from '../storages/tabsStorage'
+import { GumbyMessageType } from '../../../../amazonqGumby/chat/views/connector/connector'
+import { ChatPayload } from '../connector'
+import { BaseConnector, BaseConnectorProps } from './baseConnector'
+
+export interface ConnectorProps extends BaseConnectorProps {
+    onAsyncEventProgress: (
+        tabID: string,
+        inProgress: boolean,
+        message: string,
+        messageId: string,
+        enableStopAction: boolean
+    ) => void
+    onChatAnswerUpdated?: (tabID: string, message: ChatItem) => void
+    onQuickHandlerCommand: (tabID: string, command: string, eventId?: string) => void
+    onUpdateAuthentication: (gumbyEnabled: boolean, authenticatingTabIDs: string[]) => void
+    onChatInputEnabled: (tabID: string, enabled: boolean) => void
+    onUpdatePlaceholder: (tabID: string, newPlaceholder: string) => void
+}
+
+export interface MessageData {
+    tabID: string
+    type: GumbyMessageType
+}
+
+export class Connector extends BaseConnector {
+    private readonly onAuthenticationUpdate
+    private readonly onChatAnswerUpdated
+    private readonly chatInputEnabled
+    private readonly onAsyncEventProgress
+    private readonly onQuickHandlerCommand
+    private readonly updatePlaceholder
+
+    override getTabType(): TabType {
+        return 'gumby'
+    }
+
+    constructor(props: ConnectorProps) {
+        super(props)
+        this.onChatAnswerUpdated = props.onChatAnswerUpdated
+        this.chatInputEnabled = props.onChatInputEnabled
+        this.onAsyncEventProgress = props.onAsyncEventProgress
+        this.updatePlaceholder = props.onUpdatePlaceholder
+        this.onQuickHandlerCommand = props.onQuickHandlerCommand
+        this.onAuthenticationUpdate = props.onUpdateAuthentication
+    }
+
+    private processChatPrompt = async (messageData: any, tabID: string): Promise<void> => {
+        if (this.onChatAnswerReceived === undefined) {
+            return
+        }
+
+        const answer: ChatItem = {
+            type: ChatItemType.AI_PROMPT,
+            body: messageData.message,
+            formItems: messageData.formItems,
+            buttons: messageData.formButtons,
+            followUp: undefined,
+            status: 'info',
+            canBeVoted: false,
+        }
+
+        this.onChatAnswerReceived(tabID, answer, messageData)
+
+        return
+    }
+
+    private processChatMessage = async (messageData: any): Promise<void> => {
+        if (this.onChatAnswerReceived === undefined || this.onChatAnswerUpdated === undefined) {
+            return
+        }
+
+        if (messageData.message !== undefined) {
+            const answer: ChatItem = {
+                type: messageData.messageType,
+                messageId: messageData.messageId ?? messageData.triggerID,
+                body: messageData.message,
+                buttons: messageData.buttons ?? [],
+                canBeVoted: false,
+            }
+
+            if (messageData.messageId !== undefined) {
+                this.onChatAnswerUpdated(messageData.tabID, answer)
+                return
+            }
+
+            this.onChatAnswerReceived(messageData.tabID, answer, messageData)
+        }
+    }
+
+    transform = (tabID: string): void => {
+        this.sendMessageToExtension({
+            tabID: tabID,
+            command: 'transform',
+            chatMessage: 'transform',
+            tabType: this.getTabType(),
+        })
+    }
+
+    requestAnswer = (tabID: string, payload: ChatPayload) => {
+        this.tabsStorage.updateTabStatus(tabID, 'busy')
+        this.sendMessageToExtension({
+            tabID: tabID,
+            command: 'chat-prompt',
+            chatMessage: payload.chatMessage,
+            chatCommand: payload.chatCommand,
+            tabType: this.getTabType(),
+        })
+    }
+
+    onCustomFormAction(
+        tabId: string,
+        action: {
+            id: string
+            text?: string | undefined
+            formItemValues?: Record<string, string> | undefined
+        }
+    ) {
+        if (action === undefined) {
+            return
+        }
+
+        this.sendMessageToExtension({
+            command: 'form-action-click',
+            action: action.id,
+            formSelectedValues: action.formItemValues,
+            tabType: this.getTabType(),
+            tabID: tabId,
+        })
+    }
+
+    private processExecuteCommand = async (messageData: any): Promise<void> => {
+        this.onQuickHandlerCommand(messageData.tabID, messageData.command, messageData.eventId)
+    }
+
+    // This handles messages received from the extension, to be forwarded to the webview
+    handleMessageReceive = async (messageData: { type: GumbyMessageType } & Record<string, any>) => {
+        switch (messageData.type) {
+            case 'asyncEventProgressMessage':
+                this.onAsyncEventProgress(
+                    messageData.tabID,
+                    messageData.inProgress,
+                    messageData.message,
+                    messageData.messageId,
+                    false
+                )
+                break
+            case 'authenticationUpdateMessage':
+                this.onAuthenticationUpdate(messageData.gumbyEnabled, messageData.authenticatingTabIDs)
+                break
+            case 'chatInputEnabledMessage':
+                this.chatInputEnabled(messageData.tabID, messageData.enabled)
+                break
+            case 'chatMessage':
+                await this.processChatMessage(messageData)
+                break
+            case 'chatPrompt':
+                await this.processChatPrompt(messageData, messageData.tabID)
+                break
+            case 'sendCommandMessage':
+                await this.processExecuteCommand(messageData)
+                break
+            case 'updatePlaceholderMessage':
+                this.updatePlaceholder(messageData.tabID, messageData.newPlaceholder)
+                break
+            default:
+                await this.baseHandleMessageReceive(messageData)
+        }
+    }
+}
diff --git a/packages/core/src/amazonq/webview/ui/apps/scanChatConnector.ts b/packages/core/src/amazonq/webview/ui/apps/scanChatConnector.ts
new file mode 100644
index 00000000000..2087be77234
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/apps/scanChatConnector.ts
@@ -0,0 +1,191 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * This class is responsible for listening to and processing events
+ * from the webview and translating them into events to be handled by the extension,
+ * and events from the extension and translating them into events to be handled by the webview.
+ */
+
+import { ChatItem, ChatItemType, ProgressField } from '@aws/mynah-ui'
+import { ExtensionMessage } from '../commands'
+import { TabsStorage, TabType } from '../storages/tabsStorage'
+import { ScanMessageType } from '../../../../amazonqScan/connector'
+import { BaseConnector, BaseConnectorProps } from './baseConnector'
+
+export interface ConnectorProps extends BaseConnectorProps {
+    sendMessageToExtension: (message: ExtensionMessage) => void
+    onChatAnswerReceived?: (tabID: string, message: ChatItem, messageData: any) => void
+    onQuickHandlerCommand: (tabID: string, command: string, eventId?: string) => void
+    onWarning: (tabID: string, message: string, title: string) => void
+    onError: (tabID: string, message: string, title: string) => void
+    onUpdateAuthentication: (scanEnabled: boolean, authenticatingTabIDs: string[]) => void
+    onChatInputEnabled: (tabID: string, enabled: boolean) => void
+    onUpdatePlaceholder: (tabID: string, newPlaceholder: string) => void
+    onUpdatePromptProgress: (tabID: string, progressField: ProgressField) => void
+    tabsStorage: TabsStorage
+}
+
+export interface MessageData {
+    tabID: string
+    type: ScanMessageType
+}
+
+export class Connector extends BaseConnector {
+    override getTabType(): TabType {
+        return 'review'
+    }
+    readonly onAuthenticationUpdate
+    override readonly sendMessageToExtension
+    override readonly onError
+    override readonly onChatAnswerReceived
+    private readonly chatInputEnabled
+    private readonly onQuickHandlerCommand
+    private readonly updatePlaceholder
+    private readonly updatePromptProgress
+
+    constructor(props: ConnectorProps) {
+        super(props)
+        this.sendMessageToExtension = props.sendMessageToExtension
+        this.onChatAnswerReceived = props.onChatAnswerReceived
+        this.onError = props.onError
+        this.chatInputEnabled = props.onChatInputEnabled
+        this.updatePlaceholder = props.onUpdatePlaceholder
+        this.updatePromptProgress = props.onUpdatePromptProgress
+        this.onQuickHandlerCommand = props.onQuickHandlerCommand
+        this.onAuthenticationUpdate = props.onUpdateAuthentication
+    }
+
+    scan = (tabID: string): void => {
+        this.sendMessageToExtension({
+            tabID: tabID,
+            command: 'review',
+            chatMessage: '',
+            tabType: 'review',
+        })
+    }
+
+    onCustomFormAction(
+        tabId: string,
+        action: {
+            id: string
+            text?: string | undefined
+            formItemValues?: Record<string, string> | undefined
+        }
+    ) {
+        if (action === undefined) {
+            return
+        }
+        this.sendMessageToExtension({
+            command: 'form-action-click',
+            action: action.id,
+            formSelectedValues: action.formItemValues,
+            tabType: 'review',
+            tabID: tabId,
+        })
+    }
+
+    private processChatPrompt = async (messageData: any, tabID: string): Promise<void> => {
+        if (this.onChatAnswerReceived === undefined) {
+            return
+        }
+        const answer: ChatItem = {
+            type: ChatItemType.PROMPT,
+            body: messageData.message,
+            followUp: undefined,
+            status: 'info',
+            canBeVoted: false,
+        }
+        this.onChatAnswerReceived(tabID, answer, messageData)
+        return
+    }
+
+    private processExecuteCommand = async (messageData: any): Promise<void> => {
+        this.onQuickHandlerCommand(messageData.tabID, messageData.command, messageData.eventId)
+    }
+
+    private processChatMessage = async (messageData: any): Promise<void> => {
+        if (this.onChatAnswerReceived === undefined) {
+            return
+        }
+
+        if (messageData.message !== undefined) {
+            const answer: ChatItem = {
+                type: messageData.messageType,
+                messageId: messageData.messageId ?? messageData.triggerID,
+                body: messageData.message,
+                buttons: messageData.buttons ?? [],
+                canBeVoted: messageData.canBeVoted,
+                followUp:
+                    messageData.followUps !== undefined && messageData.followUps.length > 0
+                        ? {
+                              text: '',
+                              options: messageData.followUps,
+                          }
+                        : undefined,
+                informationCard: messageData.informationCard,
+                fileList: messageData.fileList,
+            }
+
+            this.onChatAnswerReceived(messageData.tabID, answer, messageData)
+        }
+    }
+
+    override processAuthNeededException = async (messageData: any): Promise<void> => {
+        if (this.onChatAnswerReceived === undefined) {
+            return
+        }
+
+        this.onChatAnswerReceived(
+            messageData.tabID,
+            {
+                type: ChatItemType.SYSTEM_PROMPT,
+                body: messageData.message,
+            },
+            messageData
+        )
+    }
+
+    // This handles messages received from the extension, to be forwarded to the webview
+    handleMessageReceive = async (messageData: { type: ScanMessageType } & Record<string, any>) => {
+        switch (messageData.type) {
+            case 'authNeededException':
+                await this.processAuthNeededException(messageData)
+                break
+            case 'authenticationUpdateMessage':
+                this.onAuthenticationUpdate(messageData.scanEnabled, messageData.authenticatingTabIDs)
+                break
+            case 'chatInputEnabledMessage':
+                this.chatInputEnabled(messageData.tabID, messageData.enabled)
+                break
+            case 'chatMessage':
+                await this.processChatMessage(messageData)
+                break
+            case 'updatePlaceholderMessage':
+                this.updatePlaceholder(messageData.tabID, messageData.newPlaceholder)
+                break
+            case 'updatePromptProgress':
+                this.updatePromptProgress(messageData.tabID, messageData.progressField)
+                break
+            case 'chatPrompt':
+                await this.processChatPrompt(messageData, messageData.tabID)
+                break
+            case 'errorMessage':
+                this.onError(messageData.tabID, messageData.message, messageData.title)
+                break
+            case 'sendCommandMessage':
+                await this.processExecuteCommand(messageData)
+                break
+        }
+    }
+
+    onFileClick = (tabID: string, filePath: string, messageId?: string) => {
+        this.sendMessageToExtension({
+            command: 'file-click',
+            tabID,
+            messageId,
+            filePath,
+            tabType: 'review',
+        })
+    }
+}
diff --git a/packages/core/src/amazonq/webview/ui/commands.ts b/packages/core/src/amazonq/webview/ui/commands.ts
new file mode 100644
index 00000000000..5343c84b7f5
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/commands.ts
@@ -0,0 +1,55 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+type MessageCommand =
+    | 'chat-prompt'
+    | 'trigger-message-processed'
+    | 'new-tab-was-created'
+    | 'tab-was-removed'
+    | 'tab-was-changed'
+    | 'ui-is-ready'
+    | 'disclaimer-acknowledged'
+    | 'ui-focus'
+    | 'follow-up-was-clicked'
+    | 'auth-follow-up-was-clicked'
+    | 'open-diff'
+    | 'code_was_copied_to_clipboard'
+    | 'insert_code_at_cursor_position'
+    | 'accept_diff'
+    | 'view_diff'
+    | 'stop-response'
+    | 'trigger-tabID-received'
+    | 'clear'
+    | 'help'
+    | 'chat-item-voted'
+    | 'chat-item-feedback'
+    | 'link-was-clicked'
+    | 'onboarding-page-interaction'
+    | 'source-link-click'
+    | 'response-body-link-click'
+    | 'transform'
+    | 'footer-info-link-click'
+    | 'file-click'
+    | 'form-action-click'
+    | 'open-settings'
+    | 'start-chat-message-telemetry'
+    | 'stop-chat-message-telemetry'
+    | 'store-code-result-message-id'
+    | 'start-test-gen'
+    | 'review'
+    | 'open-link'
+    | 'send-telemetry'
+    | 'update-welcome-count'
+    | 'quick-command-group-action-click'
+    | 'context-selected'
+    | 'tab-restored'
+    | 'tab-bar-button-clicked'
+    | 'export-chat'
+    | 'save-chat'
+    | 'detailed-list-filter-change'
+    | 'detailed-list-item-select'
+    | 'detailed-list-action-click'
+
+export type ExtensionMessage = Record<string, any> & { command: MessageCommand }
diff --git a/packages/core/src/amazonq/webview/ui/connector.ts b/packages/core/src/amazonq/webview/ui/connector.ts
new file mode 100644
index 00000000000..97821fc842f
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/connector.ts
@@ -0,0 +1,601 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    ChatItem,
+    FeedbackPayload,
+    Engagement,
+    ChatItemAction,
+    CodeSelectionType,
+    ProgressField,
+    ReferenceTrackerInformation,
+    ChatPrompt,
+    MynahUIDataModel,
+    QuickActionCommand,
+    ChatItemFormItem,
+    ChatItemButton,
+    DetailedList,
+} from '@aws/mynah-ui'
+import { Connector as CWChatConnector } from './apps/cwChatConnector'
+import { Connector as AmazonQCommonsConnector } from './apps/amazonqCommonsConnector'
+import { Connector as GumbyChatConnector } from './apps/gumbyChatConnector'
+import { Connector as ScanChatConnector } from './apps/scanChatConnector'
+import { ExtensionMessage } from './commands'
+import { TabType, TabsStorage } from './storages/tabsStorage'
+import { WelcomeFollowupType } from './apps/amazonqCommonsConnector'
+import { AuthFollowUpType } from './followUps/generator'
+import { DiffTreeFileInfo } from './diffTree/types'
+import { UserIntent } from '@amzn/codewhisperer-streaming'
+import { DetailedListSheetProps } from '@aws/mynah-ui/dist/components/detailed-list/detailed-list-sheet'
+
+export interface CodeReference {
+    licenseName?: string
+    repository?: string
+    url?: string
+    recommendationContentSpan?: {
+        start?: number
+        end?: number
+    }
+}
+
+export interface UploadHistory {
+    [key: string]: {
+        uploadId: string
+        timestamp: number
+        tabId: string
+        filePaths: DiffTreeFileInfo[]
+        deletedFiles: DiffTreeFileInfo[]
+    }
+}
+
+export interface ChatPayload {
+    chatMessage: string
+    chatCommand?: string
+    chatContext?: string[] | QuickActionCommand[] | undefined
+}
+
+// Adding userIntent param by extending ChatItem to send userIntent as part of amazonq_interactWithMessage telemetry event
+export interface CWCChatItem extends ChatItem {
+    traceId?: string
+    userIntent?: UserIntent
+    codeBlockLanguage?: string
+    contextList?: Context[]
+}
+
+export interface Context {
+    relativeFilePath: string
+    lineRanges: Array<{ first: number; second: number }> // List of [startLine, endLine] tuples
+}
+
+export interface ConnectorProps {
+    sendMessageToExtension: (message: ExtensionMessage) => void
+    onMessageReceived?: (tabID: string, messageData: any, needToShowAPIDocsTab: boolean) => void
+    onRunTestMessageReceived?: (tabID: string, showRunTestMessage: boolean) => void
+    onChatAnswerUpdated?: (tabID: string, message: ChatItem) => void
+    onChatAnswerReceived?: (tabID: string, message: ChatItem, messageData: any) => void
+    onWelcomeFollowUpClicked: (tabID: string, welcomeFollowUpType: WelcomeFollowupType) => void
+    onAsyncEventProgress: (tabID: string, inProgress: boolean, message: string | undefined) => void
+    onQuickHandlerCommand: (tabID: string, command?: string, eventId?: string) => void
+    onCWCContextCommandMessage: (message: ChatItem, command?: string) => string | undefined
+    onOpenSettingsMessage: (tabID: string) => void
+    onError: (tabID: string, message: string, title: string) => void
+    onWarning: (tabID: string, message: string, title: string) => void
+    onFileComponentUpdate: (
+        tabID: string,
+        filePaths: DiffTreeFileInfo[],
+        deletedFiles: DiffTreeFileInfo[],
+        messageId: string,
+        disableFileActions: boolean
+    ) => void
+    onUpdatePlaceholder: (tabID: string, newPlaceholder: string) => void
+    onUpdatePromptProgress: (tabID: string, progressField: ProgressField) => void
+    onChatInputEnabled: (tabID: string, enabled: boolean) => void
+    onUpdateAuthentication: (featureDevEnabled: boolean, authenticatingTabIDs: string[]) => void
+    onNewTab: (tabType: TabType, chats?: ChatItem[]) => string | undefined
+    onFileActionClick: (tabID: string, messageId: string, filePath: string, actionName: string) => void
+    handleCommand: (chatPrompt: ChatPrompt, tabId: string) => void
+    sendStaticMessages: (tabID: string, messages: ChatItem[]) => void
+    onContextCommandDataReceived: (message: MynahUIDataModel['contextCommands']) => void
+    onShowCustomForm: (
+        tabId: string,
+        formItems?: ChatItemFormItem[],
+        buttons?: ChatItemButton[],
+        title?: string,
+        description?: string
+    ) => void
+    onOpenDetailedList: (data: DetailedListSheetProps) => {
+        update: (data: DetailedList) => void
+        close: () => void
+        changeTarget: (direction: 'up' | 'down', snapOnLastAndFirst?: boolean) => void
+        getTargetElementId: () => string | undefined
+    }
+    onSelectTab: (tabID: string, eventID: string) => void
+    onExportChat: (tabID: string, format: 'markdown' | 'html') => string
+    tabsStorage: TabsStorage
+}
+
+export class Connector {
+    private readonly sendMessageToExtension
+    private readonly onMessageReceived
+    private readonly cwChatConnector
+    private readonly gumbyChatConnector
+    private readonly scanChatConnector
+    private readonly tabsStorage
+    private readonly amazonqCommonsConnector: AmazonQCommonsConnector
+
+    isUIReady = false
+
+    constructor(props: ConnectorProps) {
+        this.sendMessageToExtension = props.sendMessageToExtension
+        this.onMessageReceived = props.onMessageReceived
+        this.cwChatConnector = new CWChatConnector(props as ConnectorProps)
+        this.gumbyChatConnector = new GumbyChatConnector(props)
+        this.scanChatConnector = new ScanChatConnector(props)
+        this.amazonqCommonsConnector = new AmazonQCommonsConnector({
+            sendMessageToExtension: this.sendMessageToExtension,
+            onWelcomeFollowUpClicked: props.onWelcomeFollowUpClicked,
+            onNewTab: props.onNewTab,
+            handleCommand: props.handleCommand,
+            sendStaticMessages: props.sendStaticMessages,
+        })
+        this.tabsStorage = props.tabsStorage
+    }
+
+    onSourceLinkClick = (tabID: string, messageId: string, link: string): void => {
+        switch (this.tabsStorage.getTab(tabID)?.type) {
+            case 'cwc':
+                this.cwChatConnector.onSourceLinkClick(tabID, messageId, link)
+                break
+        }
+    }
+
+    onLinkClick = (link: string): void => {
+        this.sendMessageToExtension({
+            command: 'open-link',
+            link,
+        })
+    }
+
+    onResponseBodyLinkClick = (tabID: string, messageId: string, link: string): void => {
+        switch (this.tabsStorage.getTab(tabID)?.type) {
+            case 'cwc':
+                this.cwChatConnector.onResponseBodyLinkClick(tabID, messageId, link)
+                break
+            case 'gumby':
+                this.gumbyChatConnector.onResponseBodyLinkClick(tabID, messageId, link)
+                break
+            case 'review':
+                this.scanChatConnector.onResponseBodyLinkClick(tabID, messageId, link)
+                break
+        }
+    }
+
+    onInfoLinkClick = (tabID: string, link: string): void => {
+        switch (this.tabsStorage.getTab(tabID)?.type) {
+            default:
+                this.cwChatConnector.onInfoLinkClick(tabID, link)
+                break
+        }
+    }
+
+    requestAnswer = (tabID: string, payload: ChatPayload) => {
+        switch (this.tabsStorage.getTab(tabID)?.type) {
+            case 'gumby':
+                return this.gumbyChatConnector.requestAnswer(tabID, payload)
+        }
+    }
+
+    requestGenerativeAIAnswer = (tabID: string, messageId: string, payload: ChatPayload): Promise<any> =>
+        new Promise((resolve, reject) => {
+            if (this.isUIReady) {
+                switch (this.tabsStorage.getTab(tabID)?.type) {
+                    default:
+                        return this.cwChatConnector.requestGenerativeAIAnswer(tabID, messageId, payload)
+                }
+            } else {
+                return setTimeout(() => {
+                    return this.requestGenerativeAIAnswer(tabID, messageId, payload)
+                }, 2000)
+            }
+        })
+
+    clearChat = (tabID: string): void => {
+        switch (this.tabsStorage.getTab(tabID)?.type) {
+            case 'cwc':
+                this.cwChatConnector.clearChat(tabID)
+                break
+        }
+    }
+
+    help = (tabID: string): void => {
+        switch (this.tabsStorage.getTab(tabID)?.type) {
+            case 'cwc':
+                /**
+                 * TODO remove cwc helper and switch to the generic one
+                 * that welcome uses
+                 */
+                this.cwChatConnector.help(tabID)
+                break
+            case 'welcome':
+                this.amazonqCommonsConnector.sendMessage(tabID, 'help')
+                break
+        }
+    }
+
+    transform = (tabID: string): void => {
+        this.gumbyChatConnector.transform(tabID)
+    }
+
+    scans = (tabID: string): void => {
+        this.scanChatConnector.scan(tabID)
+    }
+
+    onStopChatResponse = (tabID: string): void => {
+        switch (this.tabsStorage.getTab(tabID)?.type) {
+            case 'cwc':
+                this.cwChatConnector.onStopChatResponse(tabID)
+                break
+        }
+    }
+
+    handleMessageReceive = async (message: MessageEvent): Promise<void> => {
+        if (message.data === undefined) {
+            return
+        }
+        // TODO: potential json parsing error exists. Need to determine the failing case.
+        const messageData = JSON.parse(message.data)
+
+        if (messageData === undefined) {
+            return
+        }
+
+        if (messageData.sender === 'CWChat') {
+            await this.cwChatConnector.handleMessageReceive(messageData)
+        } else if (messageData.sender === 'gumbyChat') {
+            await this.gumbyChatConnector.handleMessageReceive(messageData)
+        } else if (messageData.sender === 'scanChat') {
+            await this.scanChatConnector.handleMessageReceive(messageData)
+        } else if (messageData.sender === 'amazonqCore') {
+            await this.amazonqCommonsConnector.handleMessageReceive(messageData)
+        }
+
+        // Reset lastCommand after message is rendered.
+        this.tabsStorage.updateTabLastCommand(messageData.tabID, '')
+    }
+
+    // Run when user opens new tab in UI
+    onTabAdd = (tabID: string): void => {
+        this.tabsStorage.addTab({
+            id: tabID,
+            type: 'unknown',
+            status: 'free',
+            isSelected: true,
+        })
+    }
+
+    onUpdateTabType = (tabID: string) => {
+        const tab = this.tabsStorage.getTab(tabID)
+        switch (tab?.type) {
+            case 'cwc':
+                this.cwChatConnector.onTabAdd(tabID, tab.openInteractionType)
+                break
+            case 'gumby':
+                this.gumbyChatConnector.onTabAdd(tabID)
+                break
+            case 'review':
+                this.scanChatConnector.onTabAdd(tabID)
+                break
+        }
+    }
+
+    onTabChange = (tabId: string): void => {
+        const prevTabID = this.tabsStorage.setSelectedTab(tabId)
+        this.cwChatConnector.onTabChange(tabId, prevTabID)
+    }
+
+    onCodeInsertToCursorPosition = (
+        tabID: string,
+        messageId: string,
+        code?: string,
+        type?: 'selection' | 'block',
+        codeReference?: CodeReference[],
+        eventId?: string,
+        codeBlockIndex?: number,
+        totalCodeBlocks?: number,
+        userIntent?: string,
+        codeBlockLanguage?: string
+    ): void => {
+        switch (this.tabsStorage.getTab(tabID)?.type) {
+            case 'cwc':
+                this.cwChatConnector.onCodeInsertToCursorPosition(
+                    tabID,
+                    messageId,
+                    code,
+                    type,
+                    codeReference,
+                    eventId,
+                    codeBlockIndex,
+                    totalCodeBlocks,
+                    userIntent,
+                    codeBlockLanguage
+                )
+                break
+        }
+    }
+
+    onAcceptDiff = (
+        tabId: string,
+        messageId: string,
+        actionId: string,
+        data?: string,
+        code?: string,
+        type?: CodeSelectionType,
+        referenceTrackerInformation?: ReferenceTrackerInformation[],
+        eventId?: string,
+        codeBlockIndex?: number,
+        totalCodeBlocks?: number
+    ) => {
+        const tabType = this.tabsStorage.getTab(tabId)?.type
+        this.sendMessageToExtension({
+            tabType,
+            tabID: tabId,
+            command: 'accept_diff',
+            messageId,
+            actionId,
+            data,
+            code,
+            type,
+            referenceTrackerInformation,
+            eventId,
+            codeBlockIndex,
+            totalCodeBlocks,
+        })
+    }
+
+    onViewDiff = (
+        tabId: string,
+        messageId: string,
+        actionId: string,
+        data?: string,
+        code?: string,
+        type?: CodeSelectionType,
+        referenceTrackerInformation?: ReferenceTrackerInformation[],
+        eventId?: string,
+        codeBlockIndex?: number,
+        totalCodeBlocks?: number
+    ) => {
+        const tabType = this.tabsStorage.getTab(tabId)?.type
+        this.sendMessageToExtension({
+            tabType,
+            tabID: tabId,
+            command: 'view_diff',
+            messageId,
+            actionId,
+            data,
+            code,
+            type,
+            referenceTrackerInformation,
+            eventId,
+            codeBlockIndex,
+            totalCodeBlocks,
+        })
+    }
+
+    onCopyCodeToClipboard = (
+        tabID: string,
+        messageId: string,
+        code?: string,
+        type?: 'selection' | 'block',
+        codeReference?: CodeReference[],
+        eventId?: string,
+        codeBlockIndex?: number,
+        totalCodeBlocks?: number,
+        userIntent?: string,
+        codeBlockLanguage?: string
+    ): void => {
+        switch (this.tabsStorage.getTab(tabID)?.type) {
+            case 'cwc':
+                this.cwChatConnector.onCopyCodeToClipboard(
+                    tabID,
+                    messageId,
+                    code,
+                    type,
+                    codeReference,
+                    eventId,
+                    codeBlockIndex,
+                    totalCodeBlocks,
+                    userIntent,
+                    codeBlockLanguage
+                )
+                break
+        }
+    }
+
+    onTabRemove = (tabID: string): void => {
+        const tab = this.tabsStorage.getTab(tabID)
+        this.tabsStorage.deleteTab(tabID)
+        switch (tab?.type) {
+            case 'cwc':
+                this.cwChatConnector.onTabRemove(tabID)
+                break
+            case 'gumby':
+                this.gumbyChatConnector.onTabRemove(tabID)
+                break
+            case 'review':
+                this.scanChatConnector.onTabRemove(tabID)
+                break
+        }
+    }
+
+    uiReady = (): void => {
+        this.isUIReady = true
+        this.sendMessageToExtension({
+            command: 'ui-is-ready',
+        })
+
+        if (this.onMessageReceived !== undefined) {
+            window.addEventListener('message', this.handleMessageReceive.bind(this))
+        }
+
+        window.addEventListener('focus', this.handleApplicationFocus)
+        window.addEventListener('blur', this.handleApplicationFocus)
+    }
+
+    handleApplicationFocus = async (event: FocusEvent): Promise<void> => {
+        this.sendMessageToExtension({
+            command: 'ui-focus',
+            type: event.type,
+            tabType: 'cwc',
+        })
+    }
+
+    triggerSuggestionEngagement = (tabId: string, messageId: string, engagement: Engagement): void => {
+        // let command: string = 'hoverSuggestion'
+        // if (
+        //     engagement.engagementType === EngagementType.INTERACTION &&
+        //     engagement.selectionDistanceTraveled?.selectedText !== undefined
+        // ) {
+        //     command = 'selectSuggestionText'
+        // }
+        // this.sendMessageToExtension({
+        //     command,
+        //     searchId: this.searchId,
+        //     suggestionId: engagement.suggestion.url,
+        //     // suggestionRank: parseInt(engagement.suggestion.id),
+        //     suggestionType: engagement.suggestion.type,
+        //     selectedText: engagement.selectionDistanceTraveled?.selectedText,
+        //     hoverDuration: engagement.engagementDurationTillTrigger / 1000, // seconds
+        // })
+    }
+
+    onAuthFollowUpClicked = (tabID: string, authType: AuthFollowUpType) => {
+        const tabType = this.tabsStorage.getTab(tabID)?.type
+        switch (tabType) {
+            case 'cwc':
+                this.amazonqCommonsConnector.authFollowUpClicked(tabID, tabType, authType)
+        }
+    }
+
+    onFollowUpClicked = (tabID: string, messageId: string, followUp: ChatItemAction): void => {
+        switch (this.tabsStorage.getTab(tabID)?.type) {
+            // TODO: We cannot rely on the tabType here,
+            // It can come up at a later point depending on the future UX designs,
+            // We should decide it depending on the followUp.type
+            case 'unknown':
+                this.amazonqCommonsConnector.followUpClicked(tabID, followUp)
+                break
+            case 'review':
+                this.scanChatConnector.followUpClicked(tabID, messageId, followUp)
+                break
+            default:
+                this.cwChatConnector.followUpClicked(tabID, messageId, followUp)
+                break
+        }
+    }
+
+    onFileClick = (tabID: string, filePath: string, deleted: boolean, messageId?: string): void => {
+        switch (this.tabsStorage.getTab(tabID)?.type) {
+            case 'review':
+                this.scanChatConnector.onFileClick(tabID, filePath, messageId)
+                break
+            case 'cwc':
+                this.cwChatConnector.onFileClick(tabID, filePath, messageId)
+                break
+        }
+    }
+
+    sendFeedback = (tabId: string, feedbackPayload: FeedbackPayload): void | undefined => {
+        switch (this.tabsStorage.getTab(tabId)?.type) {
+            case 'cwc':
+                this.cwChatConnector.onSendFeedback(tabId, feedbackPayload)
+                break
+        }
+    }
+
+    onQuickCommandGroupActionClick = (tabId: string, action: { id: string }) => {
+        switch (this.tabsStorage.getTab(tabId)?.type) {
+            case 'welcome':
+            case 'unknown':
+            case 'cwc':
+                this.tabsStorage.updateTabTypeFromUnknown(tabId, 'cwc')
+                this.cwChatConnector.onQuickCommandGroupActionClick(tabId, action)
+                break
+        }
+    }
+
+    onContextSelected = (contextItem: QuickActionCommand, tabId: string) => {
+        switch (this.tabsStorage.getTab(tabId)?.type) {
+            case 'welcome':
+            case 'unknown':
+            case 'cwc':
+                this.tabsStorage.updateTabTypeFromUnknown(tabId, 'cwc')
+                return this.cwChatConnector.onContextSelected(tabId, contextItem)
+            default:
+                return true
+        }
+    }
+
+    onChatItemVoted = (tabId: string, messageId: string, vote: 'upvote' | 'downvote'): void | undefined => {
+        switch (this.tabsStorage.getTab(tabId)?.type) {
+            case 'cwc':
+                this.cwChatConnector.onChatItemVoted(tabId, messageId, vote)
+                break
+            case 'review':
+                this.scanChatConnector.onChatItemVoted(tabId, messageId, vote)
+                break
+        }
+    }
+
+    onFormTextualItemKeyPress = (
+        event: KeyboardEvent,
+        formData: Record<string, string>,
+        itemId: string,
+        tabId: string,
+        eventId?: string
+    ) => {
+        switch (this.tabsStorage.getTab(tabId)?.type) {
+            case 'cwc':
+                return this.cwChatConnector.onFormTextualItemKeyPress(tabId, event, formData, itemId, eventId)
+        }
+        return false
+    }
+
+    onTabBarButtonClick = async (tabId: string, buttonId: string, eventId?: string) => {
+        this.sendMessageToExtension({
+            command: 'tab-bar-button-clicked',
+            buttonId,
+            type: '',
+            tabID: tabId,
+            tabType: 'cwc',
+        })
+    }
+
+    onCustomFormAction = (
+        tabId: string,
+        messageId: string | undefined,
+        action: any,
+        eventId: string | undefined = undefined
+    ): void | undefined => {
+        switch (this.tabsStorage.getTab(tabId)?.type) {
+            case 'gumby':
+                this.gumbyChatConnector.onCustomFormAction(tabId, action)
+                break
+            case 'review':
+                this.scanChatConnector.onCustomFormAction(tabId, action)
+                break
+            case 'cwc':
+                if (action.id === `open-settings`) {
+                    this.sendMessageToExtension({
+                        command: 'open-settings',
+                        type: '',
+                        tabType: 'cwc',
+                    })
+                } else {
+                    this.cwChatConnector.onCustomFormAction(tabId, action)
+                }
+                break
+        }
+    }
+}
diff --git a/packages/core/src/amazonq/webview/ui/connectorAdapter.ts b/packages/core/src/amazonq/webview/ui/connectorAdapter.ts
new file mode 100644
index 00000000000..e645e74bd25
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/connectorAdapter.ts
@@ -0,0 +1,89 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ChatPrompt, MynahUI, QuickActionCommandGroup } from '@aws/mynah-ui'
+import { isTabType } from './storages/tabsStorage'
+import { WebviewUIHandler } from './main'
+import { FeatureContext } from '../../../shared/featureConfig'
+import { TabDataGenerator } from './tabs/generator'
+import { RegionProfile } from '../../../codewhisperer/models/model'
+import { ChatClientAdapter, ChatEventHandler } from '@aws/chat-client'
+
+export class HybridChatAdapter implements ChatClientAdapter {
+    private uiHandler?: WebviewUIHandler
+
+    private mynahUIRef?: { mynahUI: MynahUI }
+
+    constructor(
+        private enableAgents: boolean,
+        private featureConfigsSerialized: [string, FeatureContext][],
+        private welcomeCount: number,
+        private disclaimerAcknowledged: boolean,
+        private regionProfile: RegionProfile | undefined,
+        private disabledCommands: string[],
+        private isSMUS: boolean,
+        private isSM: boolean,
+        private ideApiPostMessage: (message: any) => void
+    ) {}
+
+    /**
+     * First we create the ui handler to get the props, then once mynah UI gets created flare will re-inject the
+     * mynah UI instance on the hybrid chat adapter
+     */
+    createChatEventHandler(mynahUIRef: { mynahUI: MynahUI }): ChatEventHandler {
+        this.mynahUIRef = mynahUIRef
+
+        this.uiHandler = new WebviewUIHandler({
+            postMessage: this.ideApiPostMessage,
+            mynahUIRef: this.mynahUIRef,
+            enableAgents: this.enableAgents,
+            featureConfigsSerialized: this.featureConfigsSerialized,
+            welcomeCount: this.welcomeCount,
+            disclaimerAcknowledged: this.disclaimerAcknowledged,
+            regionProfile: this.regionProfile,
+            disabledCommands: this.disabledCommands,
+            isSMUS: this.isSMUS,
+            isSM: this.isSM,
+            hybridChat: true,
+        })
+
+        return this.uiHandler.mynahUIProps
+    }
+
+    isSupportedTab(tabId: string): boolean {
+        const tabType = this.uiHandler?.tabsStorage.getTab(tabId)?.type
+        if (!tabType) {
+            return false
+        }
+        return isTabType(tabType) && tabType !== 'cwc'
+    }
+
+    async handleMessageReceive(message: MessageEvent): Promise<void> {
+        if (this.uiHandler) {
+            return this.uiHandler?.connector?.handleMessageReceive(message)
+        }
+
+        // eslint-disable-next-line aws-toolkits/no-console-log
+        console.error('unknown message: ', message.data)
+    }
+
+    isSupportedQuickAction(command: string): boolean {
+        return command === '/review' || command === '/transform'
+    }
+
+    handleQuickAction(prompt: ChatPrompt, tabId: string, eventId: string | undefined): void {
+        return this.uiHandler?.quickActionHandler?.handle(prompt, tabId, eventId)
+    }
+
+    get initialQuickActions(): QuickActionCommandGroup[] {
+        const tabDataGenerator = new TabDataGenerator({
+            isGumbyEnabled: this.enableAgents,
+            isScanEnabled: this.enableAgents,
+            disabledCommands: this.disabledCommands,
+            commandHighlight: this.featureConfigsSerialized.find(([name]) => name === 'highlightCommand')?.[1],
+        })
+        return tabDataGenerator.quickActionsGenerator.generateForTab('cwc') ?? []
+    }
+}
diff --git a/packages/core/src/amazonq/webview/ui/defs.d.ts b/packages/core/src/amazonq/webview/ui/defs.d.ts
new file mode 100644
index 00000000000..cb46457fce8
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/defs.d.ts
@@ -0,0 +1,9 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export {}
+declare global {
+    const acquireVsCodeApi: any
+}
diff --git a/packages/core/src/amazonq/webview/ui/detailedList/detailedListConnector.ts b/packages/core/src/amazonq/webview/ui/detailedList/detailedListConnector.ts
new file mode 100644
index 00000000000..3fabd05816d
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/detailedList/detailedListConnector.ts
@@ -0,0 +1,105 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { DetailedListItem, ChatItemButton, DetailedList } from '@aws/mynah-ui'
+import { ExtensionMessage } from '../commands'
+import { DetailedListSheetProps } from '@aws/mynah-ui/dist/components/detailed-list/detailed-list-sheet'
+
+export enum DetailedListType {
+    history = 'history',
+}
+export class DetailedListConnector {
+    type: DetailedListType
+    sendMessageToExtension: (message: ExtensionMessage) => void
+    onOpenDetailedList: (data: DetailedListSheetProps) => {
+        update: (data: DetailedList) => void
+        close: () => void
+        changeTarget: (direction: 'up' | 'down', snapOnLastAndFirst?: boolean) => void
+        getTargetElementId: () => string | undefined
+    }
+    closeList() {}
+    updateList(_data: DetailedList) {}
+    changeTarget(_direction: 'up' | 'down', _snapOnLastAndFirst?: boolean) {}
+    getTargetElementId(): string | undefined {
+        return undefined
+    }
+
+    constructor(
+        type: DetailedListType,
+        sendMessageToExtension: (message: ExtensionMessage) => void,
+        onOpenDetailedList: (data: DetailedListSheetProps) => {
+            update: (data: DetailedList) => void
+            close: () => void
+            changeTarget: (direction: 'up' | 'down', snapOnLastAndFirst?: boolean) => void
+            getTargetElementId: () => string | undefined
+        }
+    ) {
+        this.type = type
+        this.sendMessageToExtension = sendMessageToExtension
+        this.onOpenDetailedList = onOpenDetailedList
+    }
+
+    openList(messageData: any) {
+        const { update, close, changeTarget, getTargetElementId } = this.onOpenDetailedList({
+            tabId: messageData.tabID,
+            detailedList: messageData.detailedList,
+            events: {
+                onFilterValueChange: this.onFilterValueChange,
+                onKeyPress: this.onKeyPress,
+                onItemSelect: this.onItemSelect,
+                onActionClick: this.onActionClick,
+            },
+        })
+        this.closeList = close
+        this.updateList = update
+        this.changeTarget = changeTarget
+        this.getTargetElementId = getTargetElementId
+    }
+
+    onFilterValueChange = (filterValues: Record<string, any>, isValid: boolean) => {
+        this.sendMessageToExtension({
+            command: 'detailed-list-filter-change',
+            tabType: 'cwc',
+            listType: this.type,
+            filterValues,
+            isValid,
+        })
+    }
+
+    onItemSelect = (detailedListItem: DetailedListItem) => {
+        this.sendMessageToExtension({
+            command: 'detailed-list-item-select',
+            tabType: 'cwc',
+            listType: this.type,
+            item: detailedListItem,
+        })
+    }
+
+    onActionClick = (action: ChatItemButton) => {
+        this.sendMessageToExtension({
+            command: 'detailed-list-action-click',
+            tabType: 'cwc',
+            listType: this.type,
+            action,
+        })
+    }
+
+    onKeyPress = (e: KeyboardEvent) => {
+        if (e.key === 'Escape') {
+            this.closeList()
+        } else if (e.key === 'Enter') {
+            const targetElementId = this.getTargetElementId()
+            if (targetElementId) {
+                this.onItemSelect({
+                    id: targetElementId,
+                })
+            }
+        } else if (e.key === 'ArrowUp') {
+            this.changeTarget('up')
+        } else if (e.key === 'ArrowDown') {
+            this.changeTarget('down')
+        }
+    }
+}
diff --git a/packages/core/src/amazonq/webview/ui/diffTree/actions.ts b/packages/core/src/amazonq/webview/ui/diffTree/actions.ts
new file mode 100644
index 00000000000..93fa02b37dd
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/diffTree/actions.ts
@@ -0,0 +1,66 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { MynahIcons } from '@aws/mynah-ui'
+import { FileNodeAction, TreeNodeDetails } from '@aws/mynah-ui/dist/static'
+import { DiffTreeFileInfo } from './types'
+import { uiComponentsTexts } from '../texts/constants'
+
+export function getDetails(filePaths: DiffTreeFileInfo[]): Record<string, TreeNodeDetails> {
+    const details: Record<string, TreeNodeDetails> = {}
+    for (const filePath of filePaths) {
+        if (filePath.changeApplied) {
+            details[filePath.relativePath] = {
+                status: 'success',
+                label: uiComponentsTexts.changeAccepted,
+                icon: MynahIcons.OK,
+            }
+        } else if (filePath.rejected) {
+            details[filePath.relativePath] = {
+                status: 'error',
+                label: uiComponentsTexts.changeRejected,
+                icon: MynahIcons.CANCEL_CIRCLE,
+            }
+        }
+    }
+    return details
+}
+
+export function getActions(filePaths: DiffTreeFileInfo[]): Record<string, FileNodeAction[]> {
+    const actions: Record<string, FileNodeAction[]> = {}
+    for (const filePath of filePaths) {
+        if (filePath.changeApplied) {
+            continue
+        }
+        switch (filePath.rejected) {
+            case true:
+                actions[filePath.relativePath] = [
+                    {
+                        icon: MynahIcons.REVERT,
+                        name: 'revert-rejection',
+                        description: uiComponentsTexts.revertRejection,
+                    },
+                ]
+                break
+            case false:
+                actions[filePath.relativePath] = [
+                    {
+                        icon: MynahIcons.OK,
+                        status: 'success',
+                        name: 'accept-change',
+                        description: uiComponentsTexts.acceptChange,
+                    },
+                    {
+                        icon: MynahIcons.CANCEL_CIRCLE,
+                        status: 'error',
+                        name: 'reject-change',
+                        description: uiComponentsTexts.rejectChange,
+                    },
+                ]
+                break
+        }
+    }
+    return actions
+}
diff --git a/packages/core/src/amazonq/webview/ui/diffTree/types.ts b/packages/core/src/amazonq/webview/ui/diffTree/types.ts
new file mode 100644
index 00000000000..ce095b11455
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/diffTree/types.ts
@@ -0,0 +1,11 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export type DiffTreeFileInfo = {
+    zipFilePath: string
+    relativePath: string
+    rejected: boolean
+    changeApplied: boolean
+}
diff --git a/packages/core/src/amazonq/webview/ui/feedback/constants.ts b/packages/core/src/amazonq/webview/ui/feedback/constants.ts
new file mode 100644
index 00000000000..377453cb59b
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/feedback/constants.ts
@@ -0,0 +1,31 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export const feedbackOptions = [
+    {
+        value: 'inaccurate-response',
+        label: 'Inaccurate response',
+    },
+    {
+        value: 'harmful-content',
+        label: 'Harmful content',
+    },
+    {
+        value: 'incorrect-syntax',
+        label: 'Incorrect syntax',
+    },
+    {
+        value: 'buggy-code',
+        label: 'Buggy code',
+    },
+    {
+        value: 'low-quality',
+        label: 'Low quality',
+    },
+    {
+        value: 'other',
+        label: 'Other',
+    },
+]
diff --git a/packages/core/src/amazonq/webview/ui/followUps/generator.ts b/packages/core/src/amazonq/webview/ui/followUps/generator.ts
new file mode 100644
index 00000000000..a275cbaae6d
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/followUps/generator.ts
@@ -0,0 +1,62 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { MynahIcons } from '@aws/mynah-ui'
+import { TabType } from '../storages/tabsStorage'
+import { FollowUpsBlock } from './model'
+
+export type AuthFollowUpType = 'full-auth' | 're-auth' | 'missing_scopes' | 'use-supported-auth'
+
+export class FollowUpGenerator {
+    public generateAuthFollowUps(tabType: TabType, authType: AuthFollowUpType): FollowUpsBlock {
+        let pillText
+        switch (authType) {
+            case 'full-auth':
+                pillText = 'Authenticate'
+                break
+            case 'use-supported-auth':
+            case 'missing_scopes':
+                pillText = 'Enable Amazon Q'
+                break
+            case 're-auth':
+                pillText = 'Re-authenticate'
+                break
+        }
+        switch (tabType) {
+            default:
+                return {
+                    text: '',
+                    options: [
+                        {
+                            pillText: pillText,
+                            type: authType,
+                            status: 'info',
+                            icon: 'refresh' as MynahIcons,
+                        },
+                    ],
+                }
+        }
+    }
+
+    public generateWelcomeBlockForTab(tabType: TabType): FollowUpsBlock {
+        switch (tabType) {
+            default:
+                return {
+                    text: 'Try Examples:',
+                    options: [
+                        {
+                            pillText: 'Explain selected code',
+                            prompt: 'Explain selected code',
+                            type: 'init-prompt',
+                        },
+                        {
+                            pillText: 'How can Amazon Q help me?',
+                            type: 'help',
+                        },
+                    ],
+                }
+        }
+    }
+}
diff --git a/packages/core/src/amazonq/webview/ui/followUps/handler.ts b/packages/core/src/amazonq/webview/ui/followUps/handler.ts
new file mode 100644
index 00000000000..6024a93ddee
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/followUps/handler.ts
@@ -0,0 +1,95 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ChatItemAction, ChatItemType, MynahUI } from '@aws/mynah-ui'
+import { Connector } from '../connector'
+import { TabsStorage } from '../storages/tabsStorage'
+import { WelcomeFollowupType } from '../apps/amazonqCommonsConnector'
+import { AuthFollowUpType } from './generator'
+import { MynahUIRef } from '../../../commons/types'
+
+export interface FollowUpInteractionHandlerProps {
+    mynahUIRef: MynahUIRef
+    connector: Connector
+    tabsStorage: TabsStorage
+}
+
+export class FollowUpInteractionHandler {
+    private mynahUIRef: MynahUIRef
+    private connector: Connector
+    private tabsStorage: TabsStorage
+
+    constructor(props: FollowUpInteractionHandlerProps) {
+        this.mynahUIRef = props.mynahUIRef
+        this.connector = props.connector
+        this.tabsStorage = props.tabsStorage
+    }
+
+    public onFollowUpClicked(tabID: string, messageId: string, followUp: ChatItemAction) {
+        if (
+            followUp.type !== undefined &&
+            ['full-auth', 're-auth', 'missing_scopes', 'use-supported-auth'].includes(followUp.type)
+        ) {
+            this.connector.onAuthFollowUpClicked(tabID, followUp.type as AuthFollowUpType)
+            return
+        }
+        if (followUp.type !== undefined && followUp.type === 'help') {
+            this.tabsStorage.updateTabTypeFromUnknown(tabID, 'cwc')
+            this.connector.onUpdateTabType(tabID)
+            this.connector.help(tabID)
+            return
+        }
+
+        if (!this.mynahUI) {
+            return
+        }
+
+        // we need to check if there is a prompt
+        // which will cause an api call
+        // then we can set the loading state to true
+        if (followUp.prompt !== undefined) {
+            this.mynahUI.updateStore(tabID, {
+                loadingChat: true,
+                cancelButtonWhenLoading: false,
+                promptInputDisabledState: true,
+            })
+            this.mynahUI.addChatItem(tabID, {
+                type: ChatItemType.PROMPT,
+                body: followUp.prompt,
+            })
+            this.mynahUI.addChatItem(tabID, {
+                type: ChatItemType.ANSWER_STREAM,
+                body: '',
+            })
+            this.tabsStorage.updateTabStatus(tabID, 'busy')
+            this.tabsStorage.resetTabTimer(tabID)
+
+            if (followUp.type !== undefined && followUp.type === 'init-prompt') {
+                void this.connector.requestGenerativeAIAnswer(tabID, messageId, {
+                    chatMessage: followUp.prompt,
+                })
+                return
+            }
+        }
+
+        this.connector.onFollowUpClicked(tabID, messageId, followUp)
+    }
+
+    public onWelcomeFollowUpClicked(tabID: string, welcomeFollowUpType: WelcomeFollowupType) {
+        if (welcomeFollowUpType === 'continue-to-chat') {
+            this.mynahUI?.addChatItem(tabID, {
+                type: ChatItemType.ANSWER,
+                body: 'Ok, please write your question below.',
+            })
+            this.tabsStorage.updateTabTypeFromUnknown(tabID, 'cwc')
+            this.connector.onUpdateTabType(tabID)
+            return
+        }
+    }
+
+    private get mynahUI(): MynahUI | undefined {
+        return this.mynahUIRef.mynahUI
+    }
+}
diff --git a/packages/core/src/amazonq/webview/ui/followUps/model.ts b/packages/core/src/amazonq/webview/ui/followUps/model.ts
new file mode 100644
index 00000000000..1a1e4da8eaa
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/followUps/model.ts
@@ -0,0 +1,11 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ChatItemAction } from '@aws/mynah-ui'
+
+export interface FollowUpsBlock {
+    text?: string
+    options?: ChatItemAction[]
+}
diff --git a/packages/core/src/amazonq/webview/ui/main.ts b/packages/core/src/amazonq/webview/ui/main.ts
new file mode 100644
index 00000000000..c6df42f0566
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/main.ts
@@ -0,0 +1,1065 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { Connector, CWCChatItem } from './connector'
+import {
+    ChatItem,
+    ChatItemType,
+    CodeSelectionType,
+    MynahIcons,
+    MynahUI,
+    MynahUIProps,
+    MynahUIDataModel,
+    NotificationType,
+    ReferenceTrackerInformation,
+    ProgressField,
+    ChatItemButton,
+    ChatItemFormItem,
+} from '@aws/mynah-ui'
+import { ChatPrompt } from '@aws/mynah-ui/dist/static'
+import { TabsStorage, TabType } from './storages/tabsStorage'
+import { WelcomeFollowupType } from './apps/amazonqCommonsConnector'
+import { TabDataGenerator } from './tabs/generator'
+import { feedbackOptions } from './feedback/constants'
+import { uiComponentsTexts } from './texts/constants'
+import { FollowUpInteractionHandler } from './followUps/handler'
+import { QuickActionHandler } from './quickActions/handler'
+import { TextMessageHandler } from './messages/handler'
+import { MessageController } from './messages/controller'
+import { getActions, getDetails } from './diffTree/actions'
+import { DiffTreeFileInfo } from './diffTree/types'
+import { FeatureContext } from '../../../shared/featureConfig'
+import { tryNewMap } from '../../util/functionUtils'
+import { welcomeScreenTabData } from './walkthrough/welcome'
+import { createClickTelemetry, createOpenAgentTelemetry } from './telemetry/actions'
+import { disclaimerAcknowledgeButtonId, disclaimerCard } from './texts/disclaimer'
+import { DetailedListSheetProps } from '@aws/mynah-ui/dist/components/detailed-list/detailed-list-sheet'
+import { RegionProfile } from '../../../codewhisperer/models/model'
+
+/**
+ * The number of welcome chat tabs that can be opened before the NEXT one will become
+ * a regular chat tab.
+ */
+const welcomeCountThreshold = 3
+
+export const createMynahUI = (
+    ideApi: any,
+    amazonQEnabled: boolean,
+    featureConfigsSerialized: [string, FeatureContext][],
+    welcomeCount: number,
+    disclaimerAcknowledged: boolean,
+    regionProfile: RegionProfile | undefined,
+    disabledCommands?: string[],
+    isSMUS?: boolean,
+    isSM?: boolean
+) => {
+    const handler = new WebviewUIHandler({
+        postMessage: ideApi.postMessage,
+        mynahUIRef: { mynahUI: undefined },
+        enableAgents: amazonQEnabled,
+        featureConfigsSerialized,
+        welcomeCount,
+        disclaimerAcknowledged,
+        regionProfile,
+        disabledCommands,
+        isSMUS,
+        isSM,
+        hybridChat: false,
+    })
+
+    return {
+        mynahUI: handler.mynahUI,
+        messageReceiver: handler.connector?.handleMessageReceive,
+    }
+}
+
+export class WebviewUIHandler {
+    postMessage: any
+    welcomeCount: number
+    disclaimerCardActive: boolean
+
+    featureConfigs?: Map<string, FeatureContext>
+    // Store the mapping between messageId and messageUserIntent for amazonq_interactWithMessage telemetry
+    responseMetadata: Map<string, string[]>
+
+    tabsStorage: TabsStorage
+
+    mynahUIProps: MynahUIProps
+    connector?: Connector
+    tabDataGenerator?: TabDataGenerator
+
+    // are agents enabled
+    isGumbyEnabled: boolean
+    isScanEnabled: boolean
+
+    isSMUS: boolean
+    isSM: boolean
+
+    // handlers
+    followUpsInteractionHandler?: FollowUpInteractionHandler
+    quickActionHandler?: QuickActionHandler
+    textMessageHandler?: TextMessageHandler
+    messageController?: MessageController
+
+    savedContextCommands: MynahUIDataModel['contextCommands']
+
+    mynahUIRef: { mynahUI: MynahUI | undefined }
+
+    constructor({
+        postMessage,
+        mynahUIRef,
+        enableAgents,
+        featureConfigsSerialized,
+        welcomeCount,
+        disclaimerAcknowledged,
+        regionProfile,
+        disabledCommands,
+        isSMUS,
+        isSM,
+        hybridChat,
+    }: {
+        postMessage: any
+        mynahUIRef: { mynahUI: MynahUI | undefined }
+        enableAgents: boolean
+        featureConfigsSerialized: [string, FeatureContext][]
+        welcomeCount: number
+        disclaimerAcknowledged: boolean
+        regionProfile?: RegionProfile
+        disabledCommands?: string[]
+        isSMUS?: boolean
+        isSM?: boolean
+        hybridChat?: boolean
+    }) {
+        this.postMessage = postMessage
+        this.welcomeCount = welcomeCount
+        this.disclaimerCardActive = !disclaimerAcknowledged
+        this.isSMUS = isSMUS ?? false
+        this.isSM = isSM ?? false
+        this.mynahUIRef = mynahUIRef
+
+        this.responseMetadata = new Map<string, string[]>()
+
+        window.addEventListener('error', (e) => {
+            const { error, message } = e
+            postMessage({
+                type: 'error',
+                event: this.connector?.isUIReady ? 'webview_error' : 'toolkit_didLoadModule',
+                errorMessage: error ? error.toString() : message,
+            })
+        })
+
+        this.tabsStorage = new TabsStorage({
+            onTabTimeout: (tabID) => {
+                this.mynahUI?.addChatItem(tabID, {
+                    type: ChatItemType.ANSWER,
+                    body: 'This conversation has timed out after 48 hours. It will not be saved. Start a new conversation.',
+                })
+                this.mynahUI?.updateStore(tabID, {
+                    promptInputDisabledState: true,
+                    promptInputPlaceholder: 'Session ended.',
+                })
+            },
+        })
+
+        this.isGumbyEnabled = enableAgents
+        this.isScanEnabled = enableAgents
+
+        this.featureConfigs = tryNewMap(featureConfigsSerialized)
+        const highlightCommand = this.featureConfigs.get('highlightCommand')
+
+        this.tabDataGenerator = new TabDataGenerator({
+            isGumbyEnabled: enableAgents,
+            isScanEnabled: enableAgents,
+            disabledCommands,
+            commandHighlight: highlightCommand,
+            regionProfile, // TODO
+        })
+
+        this.connector = new Connector({
+            tabsStorage: this.tabsStorage,
+            /**
+             * Proxy for allowing underlying common connectors to call quick action handlers
+             */
+            handleCommand: (chatPrompt: ChatPrompt, tabId: string) => {
+                this.quickActionHandler?.handle(chatPrompt, tabId)
+            },
+            onUpdateAuthentication: (isAmazonQEnabled: boolean, authenticatingTabIDs: string[]): void => {
+                this.isGumbyEnabled = isAmazonQEnabled
+                this.isScanEnabled = isAmazonQEnabled
+
+                this.quickActionHandler = new QuickActionHandler({
+                    mynahUIRef: this.mynahUIRef,
+                    connector: this.connector!,
+                    tabsStorage: this.tabsStorage,
+                    isGumbyEnabled: this.isGumbyEnabled,
+                    isScanEnabled: this.isScanEnabled,
+                    hybridChat,
+                    disabledCommands,
+                })
+
+                this.tabDataGenerator = new TabDataGenerator({
+                    isGumbyEnabled: this.isGumbyEnabled,
+                    isScanEnabled: this.isScanEnabled,
+                    disabledCommands,
+                    commandHighlight: highlightCommand,
+                    regionProfile, // TODO
+                })
+
+                this.featureConfigs = tryNewMap(featureConfigsSerialized)
+
+                // Set the new defaults for the quick action commands in all tabs now that isFeatureDevEnabled was enabled/disabled
+                for (const tab of this.tabsStorage.getTabs()) {
+                    this.mynahUI?.updateStore(tab.id, {
+                        quickActionCommands: this.tabDataGenerator.quickActionsGenerator.generateForTab(tab.type),
+                    })
+                }
+
+                // Unlock every authenticated tab that is now authenticated
+                if (isAmazonQEnabled) {
+                    for (const tabID of authenticatingTabIDs) {
+                        this.mynahUI?.addChatItem(tabID, {
+                            type: ChatItemType.ANSWER,
+                            body: 'Authentication successful. Connected to Amazon Q.',
+                        })
+
+                        if (
+                            this.tabsStorage.getTab(tabID)?.type === 'gumby' ||
+                            this.tabsStorage.getTab(tabID)?.type === 'review'
+                        ) {
+                            this.mynahUI?.updateStore(tabID, {
+                                promptInputDisabledState: false,
+                            })
+                        }
+                    }
+                }
+            },
+            onOpenDetailedList: (data: DetailedListSheetProps) => {
+                return this.mynahUI!.openDetailedList(data)
+            },
+            onSelectTab: (tabID: string, eventID: string) => {
+                this.mynahUI?.selectTab(tabID, eventID || '')
+            },
+            onExportChat: (tabID: string, format: 'markdown' | 'html'): string => {
+                if (tabID) {
+                    return this.mynahUI!.serializeChat(tabID, format)
+                }
+                return ''
+            },
+            onFileActionClick: (tabID: string, messageId: string, filePath: string, actionName: string): void => {},
+            onQuickHandlerCommand: (tabID: string, command?: string, eventId?: string) => {
+                this.tabsStorage.updateTabLastCommand(tabID, command)
+                if (command === 'aws.awsq.transform') {
+                    this.quickActionHandler?.handle({ command: '/transform' }, tabID, eventId)
+                } else if (command === 'aws.awsq.clearchat') {
+                    this.quickActionHandler?.handle({ command: '/clear' }, tabID)
+                }
+            },
+            onCWCContextCommandMessage: (message: ChatItem, command?: string): string | undefined => {
+                const selectedTab = this.tabsStorage.getSelectedTab()
+                this.tabsStorage.updateTabLastCommand(selectedTab?.id || '', command || '')
+
+                if (command === 'aws.amazonq.sendToPrompt') {
+                    return this.messageController?.sendSelectedCodeToTab(message, command)
+                } else {
+                    const tabID = this.messageController?.sendMessageToTab(message, 'cwc', command)
+                    if (tabID && command) {
+                        this.postMessage(createOpenAgentTelemetry('cwc', 'right-click'))
+                        this.postMessage({
+                            command: 'start-chat-message-telemetry',
+                            trigger: 'onContextCommand',
+                            tabID,
+                            tabType: 'cwc',
+                            startTime: Date.now(),
+                        })
+                    }
+                    return tabID
+                }
+            },
+            onWelcomeFollowUpClicked: (tabID: string, welcomeFollowUpType: WelcomeFollowupType) => {
+                this.followUpsInteractionHandler?.onWelcomeFollowUpClicked(tabID, welcomeFollowUpType)
+            },
+            onChatInputEnabled: (tabID: string, enabled: boolean) => {
+                this.mynahUI?.updateStore(tabID, {
+                    promptInputDisabledState: this.tabsStorage.isTabDead(tabID) || !enabled,
+                })
+            },
+            onUpdatePromptProgress: (tabID: string, progressField: ProgressField) => {
+                this.mynahUI?.updateStore(tabID, {
+                    promptInputProgress: progressField,
+                })
+            },
+            onAsyncEventProgress: (
+                tabID: string,
+                inProgress: boolean,
+                message: string | undefined,
+                messageId: string | undefined = undefined,
+                enableStopAction: boolean = false
+            ) => {
+                if (inProgress) {
+                    this.mynahUI?.updateStore(tabID, {
+                        loadingChat: true,
+                        promptInputDisabledState: true,
+                        cancelButtonWhenLoading: enableStopAction,
+                    })
+
+                    if (message && messageId) {
+                        this.mynahUI?.updateChatAnswerWithMessageId(tabID, messageId, {
+                            body: message,
+                        })
+                    } else if (message) {
+                        this.mynahUI?.updateLastChatAnswer(tabID, {
+                            body: message,
+                        })
+                    } else {
+                        this.mynahUI?.addChatItem(tabID, {
+                            type: ChatItemType.ANSWER_STREAM,
+                            body: '',
+                            messageId: messageId,
+                        })
+                    }
+                    this.tabsStorage.updateTabStatus(tabID, 'busy')
+                    return
+                }
+
+                this.mynahUI?.updateStore(tabID, {
+                    loadingChat: false,
+                    promptInputDisabledState: this.tabsStorage.isTabDead(tabID),
+                })
+                this.tabsStorage.updateTabStatus(tabID, 'free')
+            },
+            sendMessageToExtension: (message) => {
+                this.postMessage(message)
+            },
+            onChatAnswerUpdated: (tabID: string, item: ChatItem) => {
+                if (item.messageId !== undefined) {
+                    this.mynahUI?.updateChatAnswerWithMessageId(tabID, item.messageId, {
+                        ...(item.body !== undefined ? { body: item.body } : {}),
+                        ...(item.buttons !== undefined ? { buttons: item.buttons } : {}),
+                        ...(item.followUp !== undefined ? { followUp: item.followUp } : {}),
+                        ...(item.footer !== undefined ? { footer: item.footer } : {}),
+                        ...(item.canBeVoted !== undefined ? { canBeVoted: item.canBeVoted } : {}),
+                    })
+                } else {
+                    this.mynahUI?.updateLastChatAnswer(tabID, {
+                        ...(item.body !== undefined ? { body: item.body } : {}),
+                        ...(item.buttons !== undefined ? { buttons: item.buttons } : {}),
+                        ...(item.followUp !== undefined ? { followUp: item.followUp } : {}),
+                        ...(item.footer !== undefined ? { footer: item.footer } : {}),
+                        ...(item.canBeVoted !== undefined ? { canBeVoted: item.canBeVoted } : {}),
+                    })
+                }
+            },
+            onChatAnswerReceived: (tabID: string, item: CWCChatItem, messageData: any) => {
+                if (item.type === ChatItemType.ANSWER_PART || item.type === ChatItemType.CODE_RESULT) {
+                    this.mynahUI?.updateLastChatAnswer(tabID, {
+                        ...(item.messageId !== undefined ? { messageId: item.messageId } : {}),
+                        ...(item.canBeVoted !== undefined ? { canBeVoted: item.canBeVoted } : {}),
+                        ...(item.codeReference !== undefined ? { codeReference: item.codeReference } : {}),
+                        ...(item.body !== undefined ? { body: item.body } : {}),
+                        ...(item.relatedContent !== undefined ? { relatedContent: item.relatedContent } : {}),
+                        ...(item.followUp !== undefined ? { followUp: item.followUp } : {}),
+                        ...(item.fileList !== undefined ? { fileList: item.fileList } : {}),
+                        ...(item.header !== undefined ? { header: item.header } : { header: undefined }),
+                    })
+                    if (
+                        item.messageId !== undefined &&
+                        item.userIntent !== undefined &&
+                        item.codeBlockLanguage !== undefined
+                    ) {
+                        this.responseMetadata.set(item.messageId, [item.userIntent, item.codeBlockLanguage])
+                    }
+                    this.postMessage({
+                        command: 'update-chat-message-telemetry',
+                        tabID,
+                        tabType: this.tabsStorage.getTab(tabID)?.type,
+                        time: Date.now(),
+                    })
+                    return
+                }
+
+                if (item.contextList !== undefined && item.contextList.length > 0) {
+                    item.header = {
+                        fileList: {
+                            fileTreeTitle: '',
+                            filePaths: item.contextList.map((file) => file.relativeFilePath),
+                            rootFolderTitle: 'Context',
+                            flatList: true,
+                            collapsed: true,
+                            hideFileCount: true,
+                            details: Object.fromEntries(
+                                item.contextList.map((file) => [
+                                    file.relativeFilePath,
+                                    {
+                                        label: file.lineRanges
+                                            .map((range) =>
+                                                range.first === -1 || range.second === -1
+                                                    ? ''
+                                                    : `line ${range.first} - ${range.second}`
+                                            )
+                                            .join(', '),
+                                        description: file.relativeFilePath,
+                                        clickable: true,
+                                    },
+                                ])
+                            ),
+                        },
+                    }
+                }
+
+                if (
+                    item.body !== undefined ||
+                    item.relatedContent !== undefined ||
+                    item.followUp !== undefined ||
+                    item.formItems !== undefined ||
+                    item.buttons !== undefined
+                ) {
+                    this.mynahUI?.addChatItem(tabID, {
+                        ...item,
+                        messageId: item.messageId,
+                        codeBlockActions: this.getCodeBlockActions(messageData),
+                    })
+                }
+
+                if (
+                    item.type === ChatItemType.PROMPT ||
+                    item.type === ChatItemType.SYSTEM_PROMPT ||
+                    item.type === ChatItemType.AI_PROMPT
+                ) {
+                    this.mynahUI?.updateStore(tabID, {
+                        loadingChat: true,
+                        cancelButtonWhenLoading: false,
+                        promptInputDisabledState: true,
+                    })
+
+                    this.tabsStorage.updateTabStatus(tabID, 'busy')
+                    return
+                }
+
+                if (item.type === ChatItemType.ANSWER) {
+                    this.mynahUI?.updateStore(tabID, {
+                        loadingChat: false,
+                        promptInputDisabledState: this.tabsStorage.isTabDead(tabID),
+                    })
+                    this.tabsStorage.updateTabStatus(tabID, 'free')
+
+                    /**
+                     * We've received an answer for a tabID and this message has
+                     * completed its round trip. Send that information back to
+                     * VSCode so we can emit a round trip event
+                     **/
+                    this.postMessage({
+                        command: 'stop-chat-message-telemetry',
+                        tabID,
+                        tabType: this.tabsStorage.getTab(tabID)?.type,
+                        time: Date.now(),
+                    })
+                }
+            },
+            onRunTestMessageReceived: (tabID: string, shouldRunTestMessage: boolean) => {
+                if (shouldRunTestMessage) {
+                    this.quickActionHandler?.handle({ command: '/test' }, tabID)
+                }
+            },
+            onMessageReceived: (tabID: string, messageData: MynahUIDataModel) => {
+                this.mynahUI?.updateStore(tabID, messageData)
+            },
+            onFileComponentUpdate: (
+                tabID: string,
+                filePaths: DiffTreeFileInfo[],
+                deletedFiles: DiffTreeFileInfo[],
+                messageId: string,
+                disableFileActions: boolean
+            ) => {
+                const updateWith: Partial<ChatItem> = {
+                    type: ChatItemType.ANSWER,
+                    fileList: {
+                        rootFolderTitle: 'Changes',
+                        filePaths: filePaths.map((i) => i.zipFilePath),
+                        deletedFiles: deletedFiles.map((i) => i.zipFilePath),
+                        details: getDetails([...filePaths, ...deletedFiles]),
+                        actions: disableFileActions ? undefined : getActions([...filePaths, ...deletedFiles]),
+                    },
+                }
+                this.mynahUI?.updateChatAnswerWithMessageId(tabID, messageId, updateWith)
+            },
+            onWarning: (tabID: string, message: string, title: string) => {
+                this.mynahUI?.notify({
+                    title: title,
+                    content: message,
+                    type: NotificationType.WARNING,
+                })
+                this.mynahUI?.updateStore(tabID, {
+                    loadingChat: false,
+                    promptInputDisabledState: this.tabsStorage.isTabDead(tabID),
+                })
+                this.tabsStorage.updateTabStatus(tabID, 'free')
+            },
+            onError: (tabID: string, message: string, title: string) => {
+                const answer: ChatItem = {
+                    type: ChatItemType.ANSWER,
+                    body: `**${title}**
+     ${message}`,
+                }
+
+                if (tabID !== '') {
+                    this.mynahUI?.updateStore(tabID, {
+                        loadingChat: false,
+                        promptInputDisabledState: this.tabsStorage.isTabDead(tabID),
+                    })
+                    this.tabsStorage.updateTabStatus(tabID, 'free')
+
+                    this.mynahUI?.addChatItem(tabID, answer)
+                } else {
+                    const newTabId = this.mynahUI?.updateStore('', {
+                        tabTitle: 'Error',
+                        quickActionCommands: [],
+                        promptInputPlaceholder: '',
+                        chatItems: [answer],
+                    })
+                    if (newTabId === undefined) {
+                        this.mynahUI?.notify({
+                            content: uiComponentsTexts.noMoreTabsTooltip,
+                            type: NotificationType.WARNING,
+                        })
+                        return
+                    } else {
+                        // TODO remove this since it will be added with the onTabAdd and onTabAdd is now sync,
+                        // It means that it cannot trigger after the updateStore function returns.
+                        this.tabsStorage.addTab({
+                            id: newTabId,
+                            status: 'busy',
+                            type: 'cwc',
+                            isSelected: true,
+                        })
+                    }
+                }
+                return
+            },
+            onUpdatePlaceholder: (tabID: string, newPlaceholder: string) => {
+                this.mynahUI?.updateStore(tabID, {
+                    promptInputPlaceholder: newPlaceholder,
+                })
+            },
+            onNewTab: (tabType: TabType, chats?: ChatItem[]) => {
+                const newTabID = this.mynahUI?.updateStore('', {})
+                if (!newTabID) {
+                    return
+                }
+                this.tabsStorage.updateTabTypeFromUnknown(newTabID, tabType)
+                this.connector?.onUpdateTabType(newTabID)
+
+                this.mynahUI?.updateStore(newTabID, {
+                    ...this.tabDataGenerator?.getTabData(tabType, true),
+                    ...(chats ? { chatItems: chats } : {}),
+                })
+                this.featureConfigs = tryNewMap(featureConfigsSerialized)
+                return newTabID
+            },
+            onOpenSettingsMessage: (tabId: string) => {
+                this.mynahUI?.addChatItem(tabId, {
+                    type: ChatItemType.ANSWER,
+                    body: `To add your workspace as context, enable local indexing in your IDE settings. After enabling, add @workspace to your question, and I'll generate a response using your workspace as context.`,
+                    buttons: [
+                        {
+                            id: 'open-settings',
+                            text: 'Open settings',
+                            icon: MynahIcons.EXTERNAL,
+                            keepCardAfterClick: false,
+                            status: 'info',
+                        },
+                    ],
+                })
+                this.tabsStorage.updateTabStatus(tabId, 'free')
+                this.mynahUI?.updateStore(tabId, {
+                    loadingChat: false,
+                    promptInputDisabledState: this.tabsStorage.isTabDead(tabId),
+                })
+                return
+            },
+            /**
+             * Helps with sending static messages that don't need to be sent through to the
+             * VSCode side. E.g. help messages
+             */
+            sendStaticMessages: (tabID: string, messages: ChatItem[]) => {
+                if (this.tabsStorage.getTab(tabID)?.type === 'welcome') {
+                    // set the tab type to cwc since its the most general one
+                    this.tabsStorage.updateTabTypeFromUnknown(tabID, 'cwc')
+
+                    // collapse the ui before adding the message
+                    this.mynahUI?.updateStore(tabID, {
+                        tabHeaderDetails: void 0,
+                        compactMode: false,
+                        tabBackground: false,
+                        promptInputText: '',
+                        promptInputLabel: void 0,
+                        chatItems: [],
+                        tabTitle: 'Chat',
+                    })
+                }
+
+                for (const message of messages) {
+                    this.mynahUI?.addChatItem(tabID, message)
+                }
+            },
+            onContextCommandDataReceived: (data: MynahUIDataModel['contextCommands']) => {
+                this.savedContextCommands = data
+                for (const tabID in this.mynahUI?.getAllTabs()) {
+                    const tabType = this.tabsStorage.getTab(tabID)?.type || ''
+                    if (['cwc', 'unknown', 'welcome'].includes(tabType)) {
+                        this.mynahUI.updateStore(tabID, {
+                            contextCommands: this.savedContextCommands,
+                        })
+                    }
+                }
+            },
+            onShowCustomForm: (
+                tabId: string,
+                formItems?: ChatItemFormItem[],
+                buttons?: ChatItemButton[],
+                title?: string,
+                description?: string
+            ) => {
+                this.mynahUI?.showCustomForm(tabId, formItems, buttons, title, description)
+            },
+        })
+
+        this.mynahUIProps = {
+            onReady: () => {
+                // the legacy event flow adds events listeners to the window, we want to avoid these in the lsp flow, since those
+                // are handled by the flare chat-client
+                if (hybridChat && this.connector) {
+                    this.connector.isUIReady = true
+                    postMessage({
+                        command: 'ui-is-ready',
+                    })
+                    return
+                }
+                this.connector?.uiReady()
+            },
+            onTabAdd: (tabID: string) => {
+                if (hybridChat) {
+                    /**
+                     * hybrid chat doesn't support the welcome page
+                     * tabs are already added by the quick action handler
+                     * so theres nothing we have to do here
+                     */
+                    return
+                }
+                /**
+                 * If the next tab opening will cross the welcome count threshold then
+                 * update the next tabs defaults
+                 */
+                if (welcomeCount + 1 >= welcomeCountThreshold) {
+                    this.tabsStorage.updateTabTypeFromUnknown(tabID, 'cwc')
+                    this.mynahUI?.updateTabDefaults({
+                        store: {
+                            ...this.tabDataGenerator?.getTabData('cwc', true, undefined, this.isSMUS),
+                            tabHeaderDetails: void 0,
+                            compactMode: false,
+                            tabBackground: false,
+                        },
+                    })
+                } else {
+                    // we haven't reached the welcome count limit yet
+                    this.updateWelcomeCount()
+                }
+
+                // If featureDev has changed availability inbetween the default store settings and now
+                // make sure to show/hide it accordingly
+                this.mynahUI?.updateStore(tabID, {
+                    quickActionCommands: this.tabDataGenerator?.quickActionsGenerator.generateForTab('unknown'),
+                    ...(this.disclaimerCardActive ? { promptInputStickyCard: disclaimerCard } : {}),
+                })
+                // add the cached context commands for file, folder, etc selection
+                if (this.savedContextCommands && this.savedContextCommands.length > 0) {
+                    this.mynahUI?.updateStore(tabID, {
+                        contextCommands: this.savedContextCommands,
+                    })
+                }
+                this.connector?.onTabAdd(tabID)
+            },
+            onTabRemove: this.connector.onTabRemove,
+            onTabChange: this.connector.onTabChange,
+            // TODO: update mynah-ui this type doesn't seem correct https://github.com/aws/mynah-ui/blob/3777a39eb534a91fd6b99d6cf421ce78ee5c7526/src/main.ts#L372
+            onStopChatResponse: (tabID: string) => {
+                this.mynahUI?.updateStore(tabID, {
+                    loadingChat: false,
+                    promptInputDisabledState: false,
+                })
+                this.connector?.onStopChatResponse(tabID)
+            },
+            onChatPrompt: (tabID: string, prompt: ChatPrompt, eventId: string | undefined) => {
+                if ((prompt.prompt ?? '') === '' && (prompt.command ?? '') === '') {
+                    return
+                }
+
+                const tabType = this.tabsStorage.getTab(tabID)?.type
+                if (tabType === 'gumby') {
+                    this.connector?.requestAnswer(tabID, {
+                        chatMessage: prompt.prompt ?? '',
+                    })
+                    return
+                }
+
+                if (tabType === 'welcome') {
+                    this.mynahUI?.updateStore(tabID, {
+                        tabHeaderDetails: void 0,
+                        compactMode: false,
+                        tabBackground: false,
+                        promptInputText: '',
+                        promptInputLabel: void 0,
+                        chatItems: [],
+                    })
+                }
+
+                // handler for the "/" agent commands
+                if (prompt.command !== undefined && prompt.command.trim() !== '') {
+                    this.quickActionHandler?.handle(prompt, tabID, eventId)
+
+                    const newTabType = this.tabsStorage.getSelectedTab()?.type
+                    if (newTabType) {
+                        this.postMessage(createOpenAgentTelemetry(newTabType, 'quick-action'))
+                    }
+                    return
+                }
+
+                /**
+                 * Update the tab title if coming from the welcome page
+                 * non cwc panels will have this updated automatically
+                 */
+                if (tabType === 'welcome') {
+                    this.mynahUI?.updateStore(tabID, {
+                        tabTitle: this.tabDataGenerator?.getTabData('cwc', false).tabTitle,
+                    })
+                }
+
+                // handler for the cwc panel
+                this.textMessageHandler?.handle(prompt, tabID, eventId as string)
+            },
+            onQuickCommandGroupActionClick: this.connector.onQuickCommandGroupActionClick,
+            onContextSelected: this.connector.onContextSelected,
+            onTabBarButtonClick: this.connector.onTabBarButtonClick,
+            onVote: this.connector.onChatItemVoted,
+            onInBodyButtonClicked: (tabId, messageId, action, eventId) => {
+                switch (action.id) {
+                    case disclaimerAcknowledgeButtonId: {
+                        this.disclaimerCardActive = false
+
+                        // post message to tell VSCode that disclaimer is acknowledged
+                        this.postMessage({
+                            command: 'disclaimer-acknowledged',
+                        })
+
+                        // create telemetry
+                        this.postMessage(createClickTelemetry('amazonq-disclaimer-acknowledge-button'))
+
+                        // remove all disclaimer cards from all tabs
+                        for (const storeTabKey of Object.keys(this.mynahUI?.getAllTabs() ?? [])) {
+                            // eslint-disable-next-line unicorn/no-null
+                            this.mynahUI?.updateStore(storeTabKey, { promptInputStickyCard: null })
+                        }
+                        return
+                    }
+                    case 'quick-start': {
+                        /**
+                         * quick start is the action on the welcome page. When its
+                         * clicked it collapses the view and puts it into regular
+                         * "chat" which is cwc
+                         */
+                        this.tabsStorage.updateTabTypeFromUnknown(tabId, 'cwc')
+
+                        // show quick start in the current tab instead of a new one
+                        this.mynahUI?.updateStore(tabId, {
+                            tabHeaderDetails: undefined,
+                            compactMode: false,
+                            tabBackground: false,
+                            promptInputText: '/',
+                            promptInputLabel: undefined,
+                            chatItems: [],
+                        })
+
+                        this.postMessage(createClickTelemetry('amazonq-welcome-quick-start-button'))
+                        return
+                    }
+                    default: {
+                        this.connector?.onCustomFormAction(tabId, messageId, action, eventId)
+                        return
+                    }
+                }
+            },
+            onCustomFormAction: (tabId, action, eventId) => {
+                this.connector?.onCustomFormAction(tabId, undefined, action, eventId)
+            },
+            onFormTextualItemKeyPress: (
+                event: KeyboardEvent,
+                formData: Record<string, string>,
+                itemId: string,
+                tabId: string,
+                eventId?: string
+            ) => {
+                return this.connector!.onFormTextualItemKeyPress(event, formData, itemId, tabId, eventId)
+            },
+            onChatPromptProgressActionButtonClicked: (tabID, action) => {
+                this.connector?.onCustomFormAction(tabID, undefined, action)
+            },
+            onSendFeedback: (tabId, feedbackPayload) => {
+                this.connector?.sendFeedback(tabId, feedbackPayload)
+                this.mynahUI?.notify({
+                    type: NotificationType.INFO,
+                    title: 'Your feedback is sent',
+                    content: 'Thanks for your feedback.',
+                })
+            },
+            onCodeInsertToCursorPosition: (
+                tabId,
+                messageId,
+                code,
+                type,
+                referenceTrackerInfo,
+                eventId,
+                codeBlockIndex,
+                totalCodeBlocks
+            ) => {
+                this.connector?.onCodeInsertToCursorPosition(
+                    tabId,
+                    messageId,
+                    code,
+                    type,
+                    referenceTrackerInfo,
+                    eventId,
+                    codeBlockIndex,
+                    totalCodeBlocks,
+                    this.responseMetadata.get(messageId)?.[0] ?? undefined,
+                    this.responseMetadata.get(messageId)?.[1] ?? undefined
+                )
+            },
+            onCodeBlockActionClicked: (
+                tabId: string,
+                messageId: string,
+                actionId: string,
+                data?: string,
+                code?: string,
+                type?: CodeSelectionType,
+                referenceTrackerInformation?: ReferenceTrackerInformation[],
+                eventId?: string,
+                codeBlockIndex?: number,
+                totalCodeBlocks?: number
+            ) => {
+                switch (actionId) {
+                    case 'accept_diff':
+                        this.connector?.onAcceptDiff(
+                            tabId,
+                            messageId,
+                            actionId,
+                            data,
+                            code,
+                            type,
+                            referenceTrackerInformation,
+                            eventId,
+                            codeBlockIndex,
+                            totalCodeBlocks
+                        )
+                        break
+                    case 'view_diff':
+                        this.connector?.onViewDiff(
+                            tabId,
+                            messageId,
+                            actionId,
+                            data,
+                            code,
+                            type,
+                            referenceTrackerInformation,
+                            eventId,
+                            codeBlockIndex,
+                            totalCodeBlocks
+                        )
+                        break
+                    default:
+                        break
+                }
+            },
+            onCopyCodeToClipboard: (
+                tabId,
+                messageId,
+                code,
+                type,
+                referenceTrackerInfo,
+                eventId,
+                codeBlockIndex,
+                totalCodeBlocks
+            ) => {
+                this.connector?.onCopyCodeToClipboard(
+                    tabId,
+                    messageId,
+                    code,
+                    type,
+                    referenceTrackerInfo,
+                    eventId,
+                    codeBlockIndex,
+                    totalCodeBlocks,
+                    this.responseMetadata.get(messageId)?.[0] ?? undefined,
+                    this.responseMetadata.get(messageId)?.[1] ?? undefined
+                )
+                this.mynahUI?.notify({
+                    type: NotificationType.SUCCESS,
+                    content: 'Selected code is copied to clipboard',
+                })
+            },
+            onChatItemEngagement: this.connector.triggerSuggestionEngagement,
+            onSourceLinkClick: (tabId, messageId, link, mouseEvent) => {
+                mouseEvent?.preventDefault()
+                mouseEvent?.stopPropagation()
+                mouseEvent?.stopImmediatePropagation()
+                this.connector?.onSourceLinkClick(tabId, messageId, link)
+            },
+            onLinkClick: (tabId, messageId, link, mouseEvent) => {
+                mouseEvent?.preventDefault()
+                mouseEvent?.stopPropagation()
+                mouseEvent?.stopImmediatePropagation()
+                this.connector?.onResponseBodyLinkClick(tabId, messageId, link)
+            },
+            onFormLinkClick: (link, mouseEvent) => {
+                mouseEvent?.preventDefault()
+                mouseEvent?.stopPropagation()
+                mouseEvent?.stopImmediatePropagation()
+                this.connector?.onLinkClick(link)
+            },
+            onInfoLinkClick: (tabId: string, link: string, mouseEvent?: MouseEvent) => {
+                mouseEvent?.preventDefault()
+                mouseEvent?.stopPropagation()
+                mouseEvent?.stopImmediatePropagation()
+                this.connector?.onInfoLinkClick(tabId, link)
+            },
+            onResetStore: () => {},
+            onFollowUpClicked: (tabID, messageId, followUp) => {
+                this.followUpsInteractionHandler?.onFollowUpClicked(tabID, messageId, followUp)
+            },
+            onFileClick: this.connector.onFileClick,
+            tabs: {
+                'tab-1': {
+                    isSelected: true,
+                    store: {
+                        ...(this.showWelcomePage()
+                            ? welcomeScreenTabData(this.tabDataGenerator).store
+                            : this.tabDataGenerator.getTabData('cwc', true, undefined, isSMUS)),
+                        ...(this.disclaimerCardActive ? { promptInputStickyCard: disclaimerCard } : {}),
+                    },
+                },
+            },
+            defaults: {
+                store: this.showWelcomePage()
+                    ? welcomeScreenTabData(this.tabDataGenerator).store
+                    : this.tabDataGenerator.getTabData('cwc', true, undefined, isSMUS),
+            },
+            config: {
+                maxTabs: 10,
+                feedbackOptions: feedbackOptions,
+                texts: uiComponentsTexts,
+                tabBarButtons: [
+                    {
+                        id: 'history_sheet',
+                        icon: MynahIcons.HISTORY,
+                        description: 'View chat history',
+                    },
+                    {
+                        id: 'export_chat',
+                        icon: MynahIcons.EXTERNAL,
+                        description: 'Export chat',
+                    },
+                ],
+            },
+        }
+
+        if (!hybridChat) {
+            /**
+             * when in hybrid chat the reference gets resolved later so we
+             * don't need to create mynah UI
+             */
+            this.mynahUIRef = { mynahUI: new MynahUI({ ...this.mynahUIProps, loadStyles: false }) }
+        }
+
+        /**
+         * Update the welcome count if we've initially shown
+         * the welcome page
+         */
+        if (this.showWelcomePage()) {
+            this.updateWelcomeCount()
+        }
+
+        this.followUpsInteractionHandler = new FollowUpInteractionHandler({
+            mynahUIRef: this.mynahUIRef,
+            connector: this.connector,
+            tabsStorage: this.tabsStorage,
+        })
+        this.quickActionHandler = new QuickActionHandler({
+            mynahUIRef: this.mynahUIRef,
+            connector: this.connector,
+            tabsStorage: this.tabsStorage,
+            isGumbyEnabled: this.isGumbyEnabled,
+            isScanEnabled: this.isScanEnabled,
+            hybridChat,
+        })
+        this.textMessageHandler = new TextMessageHandler({
+            mynahUIRef: this.mynahUIRef,
+            connector: this.connector,
+            tabsStorage: this.tabsStorage,
+        })
+        this.messageController = new MessageController({
+            mynahUIRef: this.mynahUIRef,
+            connector: this.connector,
+            tabsStorage: this.tabsStorage,
+            isGumbyEnabled: this.isGumbyEnabled,
+            isScanEnabled: this.isScanEnabled,
+        })
+    }
+
+    private showWelcomePage = () => {
+        /*
+         * skip Agent Capability welcome page for SageMaker cases (SMAI and SMUS) since the commands are not supported
+         */
+        return this.welcomeCount < welcomeCountThreshold && !this.isSM
+    }
+
+    private updateWelcomeCount() {
+        this.postMessage({
+            command: 'update-welcome-count',
+        })
+        this.welcomeCount += 1
+    }
+
+    private getCodeBlockActions(messageData: any) {
+        // Show ViewDiff and AcceptDiff for allowedCommands in CWC
+        const isEnabled = this.featureConfigs?.get('ViewDiffInChat')?.variation === 'TREATMENT'
+        const tab = this.tabsStorage.getTab(messageData?.tabID || '')
+        const allowedCommands = [
+            'aws.amazonq.refactorCode',
+            'aws.amazonq.fixCode',
+            'aws.amazonq.optimizeCode',
+            'aws.amazonq.sendToPrompt',
+        ]
+        if (isEnabled && tab?.type === 'cwc' && allowedCommands.includes(tab.lastCommand || '')) {
+            return {
+                'insert-to-cursor': undefined,
+                accept_diff: {
+                    id: 'accept_diff',
+                    label: 'Apply Diff',
+                    icon: MynahIcons.OK_CIRCLED,
+                    data: messageData,
+                },
+                view_diff: {
+                    id: 'view_diff',
+                    label: 'View Diff',
+                    icon: MynahIcons.EYE,
+                    data: messageData,
+                },
+            }
+        }
+        // Default will show "Copy" and "Insert at cursor" for codeblocks
+        return {}
+    }
+
+    get mynahUI(): MynahUI | undefined {
+        return this.mynahUIRef.mynahUI
+    }
+}
diff --git a/packages/core/src/amazonq/webview/ui/messages/controller.ts b/packages/core/src/amazonq/webview/ui/messages/controller.ts
new file mode 100644
index 00000000000..37a8077f8ae
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/messages/controller.ts
@@ -0,0 +1,150 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ChatItem, ChatItemType, MynahUI, NotificationType } from '@aws/mynah-ui'
+import { Connector } from '../connector'
+import { TabType, TabsStorage } from '../storages/tabsStorage'
+import { TabDataGenerator } from '../tabs/generator'
+import { uiComponentsTexts } from '../texts/constants'
+import { MynahUIRef } from '../../../commons/types'
+
+export interface MessageControllerProps {
+    mynahUIRef: MynahUIRef
+    connector: Connector
+    tabsStorage: TabsStorage
+    isGumbyEnabled: boolean
+    isScanEnabled: boolean
+    disabledCommands?: string[]
+}
+
+export class MessageController {
+    private mynahUIRef: MynahUIRef
+    private connector: Connector
+    private tabsStorage: TabsStorage
+    private tabDataGenerator: TabDataGenerator
+
+    constructor(props: MessageControllerProps) {
+        this.mynahUIRef = props.mynahUIRef
+        this.connector = props.connector
+        this.tabsStorage = props.tabsStorage
+        this.tabDataGenerator = new TabDataGenerator({
+            isGumbyEnabled: props.isGumbyEnabled,
+            isScanEnabled: props.isScanEnabled,
+            disabledCommands: props.disabledCommands,
+        })
+    }
+
+    public sendSelectedCodeToTab(message: ChatItem, command: string = ''): string | undefined {
+        const selectedTab = { ...this.tabsStorage.getSelectedTab() }
+        if (!this.mynahUI) {
+            return
+        }
+
+        if (
+            selectedTab?.id === undefined ||
+            selectedTab?.type === undefined ||
+            ['featuredev', 'gumby', 'review', 'testgen', 'doc'].includes(selectedTab.type)
+        ) {
+            // Create a new tab if there's none
+            const newTabID: string | undefined = this.mynahUI.updateStore(
+                '',
+                this.tabDataGenerator.getTabData('cwc', false)
+            )
+            if (newTabID === undefined) {
+                this.mynahUI.notify({
+                    content: uiComponentsTexts.noMoreTabsTooltip,
+                    type: NotificationType.WARNING,
+                })
+                return undefined
+            }
+            this.tabsStorage.addTab({
+                id: newTabID,
+                type: 'cwc',
+                status: 'free',
+                isSelected: true,
+                lastCommand: command,
+            })
+            selectedTab.id = newTabID
+        }
+        this.mynahUI.addToUserPrompt(selectedTab.id, message.body as string)
+
+        return selectedTab.id
+    }
+
+    public sendMessageToTab(message: ChatItem, tabType: TabType, command: string = ''): string | undefined {
+        const selectedTab = this.tabsStorage.getSelectedTab()
+        if (!this.mynahUI) {
+            return
+        }
+
+        if (
+            selectedTab !== undefined &&
+            [tabType, 'unknown'].includes(selectedTab.type) &&
+            selectedTab.status === 'free'
+        ) {
+            this.tabsStorage.updateTabStatus(selectedTab.id, 'busy')
+            this.tabsStorage.updateTabTypeFromUnknown(selectedTab.id, tabType)
+            this.tabsStorage.updateTabLastCommand(selectedTab.id, command)
+
+            this.mynahUI.updateStore(selectedTab.id, {
+                loadingChat: true,
+                cancelButtonWhenLoading: false,
+                promptInputDisabledState: true,
+            })
+            this.mynahUI.addChatItem(selectedTab.id, message)
+            this.mynahUI.addChatItem(selectedTab.id, {
+                type: ChatItemType.ANSWER_STREAM,
+                body: '',
+            })
+
+            return selectedTab.id
+        }
+
+        const newTabID: string | undefined = this.mynahUI.updateStore(
+            '',
+            this.tabDataGenerator.getTabData('cwc', false)
+        )
+        if (newTabID === undefined) {
+            this.mynahUI.notify({
+                content: uiComponentsTexts.noMoreTabsTooltip,
+                type: NotificationType.WARNING,
+            })
+            return undefined
+        } else {
+            this.tabsStorage.updateTabLastCommand(newTabID, command)
+            this.mynahUI.addChatItem(newTabID, message)
+            this.mynahUI.addChatItem(newTabID, {
+                type: ChatItemType.ANSWER_STREAM,
+                body: '',
+            })
+
+            this.mynahUI.updateStore(newTabID, {
+                loadingChat: true,
+                cancelButtonWhenLoading: false,
+                promptInputDisabledState: true,
+            })
+
+            // We have race condition here with onTabAdd Ui event. This way we need to update store twice to be sure
+            this.tabsStorage.addTab({
+                id: newTabID,
+                type: 'cwc',
+                status: 'busy',
+                isSelected: true,
+                openInteractionType: 'contextMenu',
+                lastCommand: command,
+            })
+
+            this.tabsStorage.updateTabTypeFromUnknown(newTabID, 'cwc')
+            this.connector.onUpdateTabType(newTabID)
+            this.tabsStorage.updateTabStatus(newTabID, 'busy')
+
+            return newTabID
+        }
+    }
+
+    private get mynahUI(): MynahUI | undefined {
+        return this.mynahUIRef.mynahUI
+    }
+}
diff --git a/packages/core/src/amazonq/webview/ui/messages/handler.ts b/packages/core/src/amazonq/webview/ui/messages/handler.ts
new file mode 100644
index 00000000000..56eba75a9c7
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/messages/handler.ts
@@ -0,0 +1,62 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ChatItemType, ChatPrompt, MynahUI } from '@aws/mynah-ui'
+import { Connector } from '../connector'
+import { TabsStorage } from '../storages/tabsStorage'
+import { MynahUIRef } from '../../../commons/types'
+
+export interface TextMessageHandlerProps {
+    mynahUIRef: MynahUIRef
+    connector: Connector
+    tabsStorage: TabsStorage
+}
+
+export class TextMessageHandler {
+    private mynahUIRef: MynahUIRef
+    private connector: Connector
+    private tabsStorage: TabsStorage
+
+    constructor(props: TextMessageHandlerProps) {
+        this.mynahUIRef = props.mynahUIRef
+        this.connector = props.connector
+        this.tabsStorage = props.tabsStorage
+    }
+
+    public handle(chatPrompt: ChatPrompt, tabID: string, eventID: string) {
+        this.tabsStorage.updateTabLastCommand(tabID, chatPrompt.command)
+        this.tabsStorage.updateTabTypeFromUnknown(tabID, 'cwc')
+        this.tabsStorage.resetTabTimer(tabID)
+        this.connector.onUpdateTabType(tabID)
+        if (!this.mynahUI) {
+            return
+        }
+
+        this.mynahUI.addChatItem(tabID, {
+            type: ChatItemType.PROMPT,
+            body: chatPrompt.escapedPrompt,
+        })
+
+        this.mynahUI.updateStore(tabID, {
+            loadingChat: true,
+            cancelButtonWhenLoading: false,
+            promptInputDisabledState: true,
+        })
+
+        this.tabsStorage.updateTabStatus(tabID, 'busy')
+
+        void this.connector
+            .requestGenerativeAIAnswer(tabID, eventID, {
+                chatMessage: chatPrompt.prompt ?? '',
+                chatCommand: chatPrompt.command,
+                chatContext: chatPrompt.context,
+            })
+            .then(() => {})
+    }
+
+    private get mynahUI(): MynahUI | undefined {
+        return this.mynahUIRef.mynahUI
+    }
+}
diff --git a/packages/core/src/amazonq/webview/ui/quickActions/generator.ts b/packages/core/src/amazonq/webview/ui/quickActions/generator.ts
new file mode 100644
index 00000000000..4a0c5bad16c
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/quickActions/generator.ts
@@ -0,0 +1,104 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { QuickActionCommand, QuickActionCommandGroup } from '@aws/mynah-ui/dist/static'
+import { TabType } from '../storages/tabsStorage'
+import { MynahIcons } from '@aws/mynah-ui'
+
+export interface QuickActionGeneratorProps {
+    isGumbyEnabled: boolean
+    isScanEnabled: boolean
+    disableCommands?: string[]
+}
+
+export class QuickActionGenerator {
+    private isGumbyEnabled: boolean
+    private disabledCommands: string[]
+
+    constructor(props: QuickActionGeneratorProps) {
+        this.isGumbyEnabled = props.isGumbyEnabled
+        this.disabledCommands = props.disableCommands ?? []
+    }
+
+    public generateForTab(tabType: TabType): QuickActionCommandGroup[] {
+        const quickActionCommands = [
+            {
+                commands: [
+                    ...(this.isGumbyEnabled && !this.disabledCommands.includes('/transform')
+                        ? [
+                              {
+                                  command: '/transform',
+                                  description: 'Transform your Java project',
+                                  icon: MynahIcons.TRANSFORM,
+                              },
+                          ]
+                        : []),
+                ],
+            },
+            {
+                groupName: 'Quick Actions',
+                commands: [
+                    {
+                        command: '/help',
+                        icon: MynahIcons.HELP,
+                        description: 'Learn more about Amazon Q',
+                    },
+                    {
+                        command: '/clear',
+                        icon: MynahIcons.TRASH,
+                        description: 'Clear this session',
+                    },
+                ],
+            },
+        ].filter((section) => section.commands.length > 0)
+
+        const commandUnavailability: Record<
+            Exclude<TabType, []>,
+            {
+                description: string
+                unavailableItems: string[]
+            }
+        > = {
+            cwc: {
+                description: '',
+                unavailableItems: [],
+            },
+            review: {
+                description: "This command isn't available in /review",
+                unavailableItems: ['/help', '/clear'],
+            },
+            gumby: {
+                description: "This command isn't available in /transform",
+                unavailableItems: ['/dev', '/test', '/doc', '/review', '/help', '/clear'],
+            },
+            welcome: {
+                description: '',
+                unavailableItems: ['/clear'],
+            },
+            unknown: {
+                description: '',
+                unavailableItems: [],
+            },
+        }
+
+        return quickActionCommands.map((commandGroup) => {
+            return {
+                groupName: commandGroup.groupName,
+                commands: commandGroup.commands.map((commandItem: QuickActionCommand) => {
+                    const commandNotAvailable = commandUnavailability[tabType].unavailableItems.includes(
+                        commandItem.command
+                    )
+                    return {
+                        ...commandItem,
+                        disabled: commandNotAvailable,
+                        description: commandNotAvailable
+                            ? commandUnavailability[tabType].description
+                            : commandItem.description,
+                    }
+                }) as QuickActionCommand[],
+            }
+        }) as QuickActionCommandGroup[]
+    }
+}
diff --git a/packages/core/src/amazonq/webview/ui/quickActions/handler.ts b/packages/core/src/amazonq/webview/ui/quickActions/handler.ts
new file mode 100644
index 00000000000..ff23fb72635
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/quickActions/handler.ts
@@ -0,0 +1,235 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ChatItemType, ChatPrompt, MynahUI, NotificationType } from '@aws/mynah-ui'
+import { TabDataGenerator } from '../tabs/generator'
+import { Connector } from '../connector'
+import { TabsStorage, TabType } from '../storages/tabsStorage'
+import { uiComponentsTexts } from '../texts/constants'
+import { MynahUIRef } from '../../../commons/types'
+
+export interface QuickActionsHandlerProps {
+    mynahUIRef: { mynahUI: MynahUI | undefined }
+    connector: Connector
+    tabsStorage: TabsStorage
+    isGumbyEnabled: boolean
+    isScanEnabled: boolean
+    hybridChat?: boolean
+    disabledCommands?: string[]
+}
+
+export interface HandleCommandProps {
+    tabID: string
+    tabType: TabType
+    isEnabled: boolean
+    chatPrompt?: ChatPrompt
+    eventId?: string
+    taskName?: string
+}
+export class QuickActionHandler {
+    private mynahUIRef: MynahUIRef
+    private connector: Connector
+    private tabsStorage: TabsStorage
+    private tabDataGenerator: TabDataGenerator
+    private isGumbyEnabled: boolean
+    private isScanEnabled: boolean
+    private isHybridChatEnabled: boolean
+
+    constructor(props: QuickActionsHandlerProps) {
+        this.mynahUIRef = props.mynahUIRef
+        this.connector = props.connector
+        this.tabsStorage = props.tabsStorage
+        this.tabDataGenerator = new TabDataGenerator({
+            isGumbyEnabled: props.isGumbyEnabled,
+            isScanEnabled: props.isScanEnabled,
+            disabledCommands: props.disabledCommands,
+        })
+        this.isGumbyEnabled = props.isGumbyEnabled
+        this.isScanEnabled = props.isScanEnabled
+        this.isHybridChatEnabled = props.hybridChat ?? false
+    }
+
+    /**
+     * Handle commands
+     * Inside of the welcome page commands update the current tab
+     * Outside of the welcome page commands create new tabs
+     */
+    public handle(chatPrompt: ChatPrompt, tabID: string, eventId?: string) {
+        this.tabsStorage.resetTabTimer(tabID)
+        switch (chatPrompt.command) {
+            case '/help':
+                this.handleHelpCommand(tabID)
+                break
+            case '/transform':
+                this.handleGumbyCommand(tabID, eventId)
+                break
+            case '/review':
+                this.handleScanCommand(tabID, eventId)
+                break
+            case '/clear':
+                this.handleClearCommand(tabID)
+                break
+        }
+    }
+
+    private handleScanCommand(tabID: string | undefined, eventId: string | undefined) {
+        if (!this.isScanEnabled || !this.mynahUI) {
+            return
+        }
+        let scanTabId: string | undefined = undefined
+
+        for (const tab of this.tabsStorage.getTabs()) {
+            if (tab.type === 'review') {
+                scanTabId = tab.id
+            }
+        }
+
+        if (scanTabId !== undefined) {
+            this.mynahUI.selectTab(scanTabId, eventId || '')
+            this.connector.onTabChange(scanTabId)
+            this.connector.scans(scanTabId)
+            return
+        }
+
+        /**
+         * status bar -> "full project scan is now /review" doesn't have a tab ID
+         * since it's called via a command so we need to manually create one
+         */
+        if (!tabID) {
+            tabID = this.mynahUI.updateStore('', {})
+        }
+
+        // if there is no scan tab, open a new one
+        const affectedTabId: string | undefined = this.addTab(tabID)
+
+        if (affectedTabId === undefined) {
+            this.mynahUI.notify({
+                content: uiComponentsTexts.noMoreTabsTooltip,
+                type: NotificationType.WARNING,
+            })
+            return
+        } else {
+            this.tabsStorage.updateTabTypeFromUnknown(affectedTabId, 'review')
+            this.connector.onUpdateTabType(affectedTabId)
+
+            // reset chat history
+            this.mynahUI.updateStore(affectedTabId, {
+                chatItems: [],
+            })
+
+            this.mynahUI.updateStore(affectedTabId, this.tabDataGenerator.getTabData('review', true, undefined)) // creating a new tab and printing some title
+
+            // disable chat prompt
+            this.mynahUI.updateStore(affectedTabId, {
+                loadingChat: true,
+            })
+            this.connector.scans(affectedTabId)
+        }
+    }
+
+    private handleGumbyCommand(tabID: string, eventId: string | undefined) {
+        if (!this.isGumbyEnabled || !this.mynahUI) {
+            return
+        }
+
+        let gumbyTabId: string | undefined = undefined
+
+        for (const tab of this.tabsStorage.getTabs()) {
+            if (tab.type === 'gumby') {
+                gumbyTabId = tab.id
+            }
+        }
+
+        if (gumbyTabId !== undefined) {
+            this.mynahUI.selectTab(gumbyTabId, eventId || '')
+            this.connector.onTabChange(gumbyTabId)
+            this.mynahUI.notify({
+                duration: 5000,
+                title: 'Q CodeTransformation',
+                content:
+                    "Switched to the existing /transform tab; click 'Start a new transformation' below to run another transformation",
+            })
+            return
+        }
+
+        // if there is no gumby tab, open a new one
+        const affectedTabId: string | undefined = this.addTab(tabID)
+
+        if (affectedTabId === undefined) {
+            this.mynahUI.notify({
+                content: uiComponentsTexts.noMoreTabsTooltip,
+                type: NotificationType.WARNING,
+            })
+            return
+        } else {
+            this.tabsStorage.updateTabTypeFromUnknown(affectedTabId, 'gumby')
+            this.connector.onUpdateTabType(affectedTabId)
+
+            // reset chat history
+            this.mynahUI.updateStore(affectedTabId, {
+                chatItems: [],
+            })
+
+            this.mynahUI.updateStore(affectedTabId, this.tabDataGenerator.getTabData('gumby', true, undefined))
+
+            // disable chat prompt
+            this.mynahUI.updateStore(affectedTabId, {
+                loadingChat: true,
+                cancelButtonWhenLoading: false,
+            })
+
+            this.connector.transform(affectedTabId)
+        }
+    }
+
+    private addTab(affectedTabId: string | undefined) {
+        if (!affectedTabId || !this.mynahUI) {
+            return
+        }
+
+        const currTab = this.mynahUI.getAllTabs()[affectedTabId]
+        const currTabWasUsed =
+            (currTab.store?.chatItems?.filter((item) => item.type === ChatItemType.PROMPT).length ?? 0) > 0
+        if (currTabWasUsed) {
+            affectedTabId = this.mynahUI.updateStore('', {
+                loadingChat: true,
+                cancelButtonWhenLoading: false,
+            })
+        } else {
+            this.mynahUI.updateStore(affectedTabId, { promptInputOptions: [], promptTopBarTitle: '' })
+        }
+
+        if (affectedTabId && this.isHybridChatEnabled) {
+            this.tabsStorage.addTab({
+                id: affectedTabId,
+                type: 'unknown',
+                status: 'free',
+                isSelected: true,
+            })
+        }
+
+        return affectedTabId
+    }
+
+    private handleClearCommand(tabID: string) {
+        this.mynahUI?.updateStore(tabID, {
+            chatItems: [],
+        })
+        this.connector.clearChat(tabID)
+    }
+
+    private handleHelpCommand(tabID: string) {
+        // User entered help action, so change the tab type to 'cwc' if it's an unknown tab
+        if (this.tabsStorage.getTab(tabID)?.type === 'unknown') {
+            this.tabsStorage.updateTabTypeFromUnknown(tabID, 'cwc')
+        }
+
+        this.connector.help(tabID)
+    }
+
+    private get mynahUI(): MynahUI | undefined {
+        return this.mynahUIRef.mynahUI
+    }
+}
diff --git a/packages/core/src/amazonq/webview/ui/storages/tabsStorage.ts b/packages/core/src/amazonq/webview/ui/storages/tabsStorage.ts
new file mode 100644
index 00000000000..2a803759fd0
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/storages/tabsStorage.ts
@@ -0,0 +1,154 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export type TabStatus = 'free' | 'busy' | 'dead'
+const TabTypes = ['cwc', 'gumby', 'review', 'welcome', 'unknown'] as const
+export type TabType = (typeof TabTypes)[number]
+export function isTabType(value: string): value is TabType {
+    return (TabTypes as readonly string[]).includes(value)
+}
+
+export function getTabCommandFromTabType(tabType: TabType): string {
+    switch (tabType) {
+        case 'gumby':
+            return '/transform'
+        case 'review':
+            return '/review'
+        default:
+            return ''
+    }
+}
+
+export type TabOpenType = 'click' | 'contextMenu' | 'hotkeys'
+
+const TabTimeoutDuration = 172_800_000 // 48hrs
+export interface Tab {
+    readonly id: string
+    status: TabStatus
+    type: TabType
+    isSelected: boolean
+    openInteractionType?: TabOpenType
+    lastCommand?: string
+}
+
+export class TabsStorage {
+    private tabs: Map<string, Tab> = new Map()
+    private lastCreatedTabByType: Map<TabType, string> = new Map()
+    private lastSelectedTab: Tab | undefined = undefined
+    private tabActivityTimers: Record<string, ReturnType<typeof setTimeout>> = {}
+    private onTabTimeout?: (tabId: string) => void
+
+    constructor(props?: { onTabTimeout: (tabId: string) => void }) {
+        this.onTabTimeout = props?.onTabTimeout
+    }
+
+    public addTab(tab: Tab) {
+        if (this.tabs.has(tab.id)) {
+            return
+        }
+        this.tabs.set(tab.id, tab)
+        this.lastCreatedTabByType.set(tab.type, tab.id)
+        if (tab.isSelected) {
+            this.setSelectedTab(tab.id)
+        }
+    }
+
+    public deleteTab(tabID: string) {
+        if (this.tabActivityTimers[tabID] !== undefined) {
+            clearTimeout(this.tabActivityTimers[tabID])
+            delete this.tabActivityTimers[tabID]
+        }
+        // Reset the last selected tab if the deleted one is selected
+        if (tabID === this.lastSelectedTab?.id) {
+            this.lastSelectedTab = undefined
+        }
+        this.tabs.delete(tabID)
+    }
+
+    public getTab(tabID: string): Tab | undefined {
+        return this.tabs.get(tabID)
+    }
+
+    public getTabs(): Tab[] {
+        return Array.from(this.tabs.values())
+    }
+
+    public isTabDead(tabID: string): boolean {
+        return this.tabs.get(tabID)?.status === 'dead'
+    }
+
+    public updateTabLastCommand(tabID: string, command?: string) {
+        if (command === undefined) {
+            return
+        }
+        const currentTabValue = this.tabs.get(tabID)
+        if (currentTabValue === undefined || currentTabValue.status === 'dead') {
+            return
+        }
+        currentTabValue.lastCommand = command
+        this.tabs.set(tabID, currentTabValue)
+    }
+
+    public updateTabStatus(tabID: string, tabStatus: TabStatus) {
+        const currentTabValue = this.tabs.get(tabID)
+        if (currentTabValue === undefined || currentTabValue.status === 'dead') {
+            return
+        }
+        currentTabValue.status = tabStatus
+        this.tabs.set(tabID, currentTabValue)
+    }
+
+    public updateTabTypeFromUnknown(tabID: string, tabType: TabType) {
+        const currentTabValue = this.tabs.get(tabID)
+        if (
+            currentTabValue === undefined ||
+            (currentTabValue.type !== 'unknown' && currentTabValue.type !== 'welcome')
+        ) {
+            return
+        }
+
+        currentTabValue.type = tabType
+
+        this.tabs.set(tabID, currentTabValue)
+        this.lastCreatedTabByType.set(tabType, tabID)
+    }
+
+    public resetTabTimer(tabID: string) {
+        if (this.onTabTimeout !== undefined) {
+            if (this.tabActivityTimers[tabID] !== undefined) {
+                clearTimeout(this.tabActivityTimers[tabID])
+            }
+            this.tabActivityTimers[tabID] = setTimeout(() => {
+                if (this.onTabTimeout !== undefined) {
+                    this.updateTabStatus(tabID, 'dead')
+                    this.onTabTimeout(tabID)
+                }
+            }, TabTimeoutDuration)
+        }
+    }
+
+    public setSelectedTab(tabID: string): string | undefined {
+        const prevSelectedTab = this.lastSelectedTab
+        const prevSelectedTabID = this.lastSelectedTab?.id
+        if (prevSelectedTab !== undefined) {
+            prevSelectedTab.isSelected = false
+            this.tabs.set(prevSelectedTab.id, prevSelectedTab)
+        }
+
+        const newSelectedTab = this.tabs.get(tabID)
+        if (newSelectedTab === undefined) {
+            return prevSelectedTabID
+        }
+
+        newSelectedTab.isSelected = true
+        this.tabs.set(newSelectedTab.id, newSelectedTab)
+        this.lastSelectedTab = newSelectedTab
+        return prevSelectedTabID
+    }
+
+    public getSelectedTab(): Tab | undefined {
+        return this.lastSelectedTab
+    }
+}
diff --git a/packages/core/src/amazonq/webview/ui/tabs/constants.ts b/packages/core/src/amazonq/webview/ui/tabs/constants.ts
new file mode 100644
index 00000000000..0872b829a6a
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/tabs/constants.ts
@@ -0,0 +1,61 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { TabType } from '../storages/tabsStorage'
+import { QuickActionCommandGroup } from '@aws/mynah-ui'
+
+const qChatIntroMessage = `Hi, I'm Amazon Q. I can answer your software development questions.
+  Ask me to explain, debug, or optimize your code.
+  You can enter \`/\` to see a list of quick actions. Use \`@\` to add saved prompts, files, folders, or your entire workspace as context.`
+
+/**
+ * The below intro message is for SageMaker Unified Studio(SMUS) customers only.
+ * With upcoming release of SMUS, only Q Free Tier is being supported hence the requirement to show this messaging to customers.
+ * Once Pro Tier is supported with SMUS, the below message will be removed and is only added for the interim
+ */
+export const qChatIntroMessageForSMUS = `Hi, I'm Amazon Q. I can answer your software development questions.\n\
+  Ask me to explain, debug, or optimize your code.\n\
+  You can enter \`/\` to see a list of quick actions. Use \`@\` to add saved prompts, files, folders, or your entire workspace as context.
+  You are now using Q free tier.\n\
+  `
+
+export type TabTypeData = {
+    title: string
+    placeholder: string
+    welcome: string
+    contextCommands?: QuickActionCommandGroup[]
+}
+
+export const workspaceCommand: QuickActionCommandGroup = {
+    groupName: 'Mention code',
+    commands: [
+        {
+            command: '@workspace',
+            description: 'Reference all code in workspace.',
+        },
+    ],
+}
+
+export const commonTabData: TabTypeData = {
+    title: 'Chat',
+    placeholder: 'Ask a question. Use @ to add context, / for quick actions',
+    welcome: qChatIntroMessage,
+    contextCommands: [workspaceCommand],
+}
+
+export const TabTypeDataMap: Record<Exclude<TabType, 'welcome'>, TabTypeData> = {
+    unknown: commonTabData,
+    cwc: commonTabData,
+    gumby: {
+        title: 'Q - Code Transformation',
+        placeholder: 'Open a new tab to chat with Q',
+        welcome:
+            'Welcome to Code Transformation! **You can also run transformations from the command line. To install the tool, see the [documentation](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/run-CLI-transformations.html).**',
+    },
+    review: {
+        title: 'Q - Review',
+        placeholder: `Ask a question or enter "/" for quick actions`,
+        welcome: `Welcome to code reviews. I can help you identify code issues and provide suggested fixes for the active file or workspace you have opened in your IDE.`,
+    },
+}
diff --git a/packages/core/src/amazonq/webview/ui/tabs/generator.ts b/packages/core/src/amazonq/webview/ui/tabs/generator.ts
new file mode 100644
index 00000000000..68b758d51cb
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/tabs/generator.ts
@@ -0,0 +1,110 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ChatItem, ChatItemType, MynahUIDataModel, QuickActionCommandGroup } from '@aws/mynah-ui'
+import { TabType } from '../storages/tabsStorage'
+import { FollowUpGenerator } from '../followUps/generator'
+import { QuickActionGenerator } from '../quickActions/generator'
+import { qChatIntroMessageForSMUS, TabTypeDataMap } from './constants'
+import { FeatureContext } from '../../../../shared/featureConfig'
+import { RegionProfile } from '../../../../codewhisperer/models/model'
+
+export interface TabDataGeneratorProps {
+    isGumbyEnabled: boolean
+    isScanEnabled: boolean
+    disabledCommands?: string[]
+    commandHighlight?: FeatureContext
+    regionProfile?: RegionProfile
+}
+
+export class TabDataGenerator {
+    private followUpsGenerator: FollowUpGenerator
+    public quickActionsGenerator: QuickActionGenerator
+    private highlightCommand?: FeatureContext
+    private regionProfile?: RegionProfile
+
+    constructor(props: TabDataGeneratorProps) {
+        this.followUpsGenerator = new FollowUpGenerator()
+        this.quickActionsGenerator = new QuickActionGenerator({
+            isGumbyEnabled: props.isGumbyEnabled,
+            isScanEnabled: props.isScanEnabled,
+            disableCommands: props.disabledCommands,
+        })
+        this.highlightCommand = props.commandHighlight
+        this.regionProfile = props.regionProfile
+    }
+
+    public getTabData(
+        tabType: TabType,
+        needWelcomeMessages: boolean,
+        taskName?: string,
+        isSMUS?: boolean
+    ): MynahUIDataModel {
+        if (tabType === 'welcome') {
+            return {}
+        }
+
+        const regionProfileCard: ChatItem | undefined =
+            this.regionProfile === undefined
+                ? undefined
+                : {
+                      type: ChatItemType.ANSWER,
+                      body: `You are using the ${this.regionProfile?.name} profile for this chat period`,
+                      status: 'info',
+                      messageId: 'regionProfile',
+                  }
+
+        const tabData: MynahUIDataModel = {
+            tabTitle: taskName ?? TabTypeDataMap[tabType].title,
+            promptInputInfo:
+                'Amazon Q Developer uses generative AI. You may need to verify responses. See the [AWS Responsible AI Policy](https://aws.amazon.com/machine-learning/responsible-ai/policy/).',
+            quickActionCommands: this.quickActionsGenerator.generateForTab(tabType),
+            promptInputPlaceholder: TabTypeDataMap[tabType].placeholder,
+            contextCommands: this.getContextCommands(tabType),
+            chatItems: needWelcomeMessages
+                ? [
+                      ...(regionProfileCard ? [regionProfileCard] : []),
+                      {
+                          type: ChatItemType.ANSWER,
+                          body: isSMUS ? qChatIntroMessageForSMUS : TabTypeDataMap[tabType].welcome,
+                      },
+                      {
+                          type: ChatItemType.ANSWER,
+                          followUp: this.followUpsGenerator.generateWelcomeBlockForTab(tabType),
+                      },
+                  ]
+                : [...(regionProfileCard ? [regionProfileCard] : [])],
+        }
+        return tabData
+    }
+
+    private getContextCommands(tabType: TabType): QuickActionCommandGroup[] | undefined {
+        if (tabType === 'welcome') {
+            return
+        }
+
+        const commandName = this.highlightCommand?.value.stringValue
+        if (commandName === undefined || commandName === '') {
+            return TabTypeDataMap[tabType].contextCommands
+        } else {
+            const commandHighlight: QuickActionCommandGroup = {
+                groupName: 'Additional Commands',
+                commands: [
+                    {
+                        command: commandName,
+                        description: this.highlightCommand?.variation,
+                    },
+                ],
+            }
+
+            const contextCommands = TabTypeDataMap[tabType].contextCommands
+            if (contextCommands === undefined) {
+                return [commandHighlight]
+            } else {
+                return [...contextCommands, commandHighlight]
+            }
+        }
+    }
+}
diff --git a/packages/core/src/amazonq/webview/ui/telemetry/actions.ts b/packages/core/src/amazonq/webview/ui/telemetry/actions.ts
new file mode 100644
index 00000000000..ffd65684ff6
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/telemetry/actions.ts
@@ -0,0 +1,38 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ExtensionMessage } from '../commands'
+import { TabType } from '../storages/tabsStorage'
+
+export function createClickTelemetry(source: string): ExtensionMessage {
+    return {
+        command: 'send-telemetry',
+        source,
+    }
+}
+export function isClickTelemetry(message: ExtensionMessage): boolean {
+    return (
+        message.command === 'send-telemetry' && typeof message.source === 'string' && Object.keys(message).length === 2
+    )
+}
+
+export function createOpenAgentTelemetry(module: TabType, trigger: Trigger): ExtensionMessage {
+    return {
+        command: 'send-telemetry',
+        module,
+        trigger,
+    }
+}
+
+export type Trigger = 'right-click' | 'quick-action' | 'quick-start'
+
+export function isOpenAgentTelemetry(message: ExtensionMessage): boolean {
+    return (
+        message.command === 'send-telemetry' &&
+        typeof message.module === 'string' &&
+        typeof message.trigger === 'string' &&
+        Object.keys(message).length === 3
+    )
+}
diff --git a/packages/core/src/amazonq/webview/ui/texts/constants.ts b/packages/core/src/amazonq/webview/ui/texts/constants.ts
new file mode 100644
index 00000000000..d927e19e79c
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/texts/constants.ts
@@ -0,0 +1,75 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export const uiComponentsTexts = {
+    mainTitle: 'Amazon Q',
+    copy: 'Copy',
+    insertAtCursorLabel: 'Insert at cursor',
+    feedbackFormTitle: 'Report an issue',
+    feedbackFormDescription:
+        '_Feedback is anonymous. For issue updates, please contact us on [GitHub](https://github.com/aws/aws-toolkit-vscode/issues/new/choose)._',
+    feedbackFormOptionsLabel: 'What type of issue would you like to report?',
+    feedbackFormCommentLabel: 'Description of issue (optional):',
+    feedbackThanks: 'Thanks for your feedback!',
+    feedbackReportButtonLabel: 'Report an issue',
+    codeSuggestions: 'Code suggestions',
+    files: 'file(s)',
+    clickFileToViewDiff: 'Click on a file to view diff.',
+    showMore: 'Show more',
+    save: 'Save',
+    cancel: 'Cancel',
+    submit: 'Submit',
+    stopGenerating: 'Stop',
+    copyToClipboard: 'Copied to clipboard',
+    noMoreTabsTooltip: 'You can only open ten conversation tabs at a time.',
+    codeSuggestionWithReferenceTitle: 'Some suggestions contain code with references.',
+    spinnerText: 'Generating your answer...',
+    changeAccepted: 'Change accepted',
+    changeRejected: 'Change rejected',
+    acceptChange: 'Accept change',
+    rejectChange: 'Reject change',
+    revertRejection: 'Revert rejection',
+}
+export const docUserGuide = 'https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/doc-generation.html'
+export const userGuideURL = 'https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/software-dev.html'
+export const manageAccessGuideURL =
+    'https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/security_iam_manage-access-with-policies.html'
+export const testGuideUrl = 'https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/test-generation.html'
+export const reviewGuideUrl = 'https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/code-reviews.html'
+
+export const helpMessage = `I'm Amazon Q, a generative AI assistant. Learn more about me below. Your feedback will help me improve.
+\n\n### What I can do:
+\n\n- Answer questions about AWS
+\n\n- Answer questions about general programming concepts
+\n\n- Answer questions about your workspace with @workspace
+\n\n- Answer questions about your code with @Files and @Folders
+\n\n- Create and use saved prompts with @Prompts
+\n\n- Explain what a line of code or code function does
+\n\n- Write unit tests and code
+\n\n- Debug and fix code
+\n\n- Refactor code
+\n\n### What I don't do right now:
+\n\n- Answer questions in languages other than English
+\n\n- Remember conversations from your previous sessions
+\n\n- Have information about your AWS account or your specific AWS resources
+\n\n### Examples of questions I can answer:
+\n\n- When should I use ElastiCache?
+\n\n- How do I create an Application Load Balancer?
+\n\n- Explain the <selected code> and ask clarifying questions about it.
+\n\n- What is the syntax of declaring a variable in TypeScript?
+\n\n### Special Commands
+\n\n- /dev - Get code suggestions across files in your current project. Provide a brief prompt, such as "Implement a GET API."
+\n\n- /doc - Create and update documentation for your repository.
+\n\n- /review - Discover and address security and code quality issues.
+\n\n- /test - Generate unit tests for a file.
+\n\n- /transform - Transform your code. Use to upgrade Java code versions.
+\n\n- /help - View chat topics and commands.
+\n\n- /clear - Clear the conversation.
+\n\n### Things to note:
+\n\n- I may not always provide completely accurate or current information.
+\n\n- Provide feedback by choosing the like or dislike buttons that appear below answers.
+\n\n- When you use Amazon Q, AWS may, for service improvement purposes, store data about your usage and content. You can opt-out of sharing this data by following the steps in AI services opt-out policies. See <a href="https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/opt-out-IDE.html">here</a>
+\n\n- Do not enter any confidential, sensitive, or personal information.
+\n\n*For additional help, visit the [Amazon Q User Guide](${userGuideURL}).*`
diff --git a/packages/core/src/amazonq/webview/ui/texts/disclaimer.ts b/packages/core/src/amazonq/webview/ui/texts/disclaimer.ts
new file mode 100644
index 00000000000..fc666796272
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/texts/disclaimer.ts
@@ -0,0 +1,20 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ChatItem, MynahIcons } from '@aws/mynah-ui'
+
+export const disclaimerAcknowledgeButtonId = 'amazonq-disclaimer-acknowledge-button-id'
+export const disclaimerCard: Partial<ChatItem> = {
+    messageId: 'amazonq-disclaimer-card',
+    body: 'Amazon Q Developer uses generative AI. You may need to verify responses. See the [AWS Responsible AI Policy](https://aws.amazon.com/machine-learning/responsible-ai/policy/). Amazon Q Developer processes data across all US Regions. See [here](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/cross-region-inference.html) for more info. Amazon Q may retain chats to provide and maintain the service.',
+    buttons: [
+        {
+            text: 'Acknowledge',
+            id: disclaimerAcknowledgeButtonId,
+            status: 'info',
+            icon: MynahIcons.OK,
+        },
+    ],
+}
diff --git a/packages/core/src/amazonq/webview/ui/walkthrough/welcome.ts b/packages/core/src/amazonq/webview/ui/walkthrough/welcome.ts
new file mode 100644
index 00000000000..a1df4bb8149
--- /dev/null
+++ b/packages/core/src/amazonq/webview/ui/walkthrough/welcome.ts
@@ -0,0 +1,47 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ChatItemType, MynahIcons, MynahUITabStoreTab } from '@aws/mynah-ui'
+import { TabDataGenerator } from '../tabs/generator'
+
+export const welcomeScreenTabData = (tabs: TabDataGenerator): MynahUITabStoreTab => ({
+    isSelected: true,
+    store: {
+        quickActionCommands: tabs.quickActionsGenerator.generateForTab('welcome'),
+        contextCommands: tabs.getTabData('cwc', false).contextCommands,
+        tabTitle: 'Welcome to Q',
+        tabBackground: true,
+        chatItems: [
+            {
+                type: ChatItemType.ANSWER,
+                icon: MynahIcons.ASTERISK,
+                messageId: 'new-welcome-card',
+                body: `#### Work on a task using agentic capabilities
+_Generate code, scan for issues, and more._`,
+                buttons: [
+                    {
+                        id: 'explore',
+                        disabled: false,
+                        text: 'Explore',
+                    },
+                    {
+                        id: 'quick-start',
+                        text: 'Quick start',
+                        disabled: false,
+                        status: 'main',
+                    },
+                ],
+            },
+        ],
+        promptInputLabel: 'Or, start a chat',
+        promptInputPlaceholder: 'Type your question',
+        compactMode: true,
+        tabHeaderDetails: {
+            title: "Hi, I'm Amazon Q.",
+            description: 'Where would you like to start?',
+            icon: MynahIcons.Q,
+        },
+    },
+})
diff --git a/packages/core/src/amazonq/webview/webView.ts b/packages/core/src/amazonq/webview/webView.ts
new file mode 100644
index 00000000000..70683e65bed
--- /dev/null
+++ b/packages/core/src/amazonq/webview/webView.ts
@@ -0,0 +1,79 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    WebviewViewProvider,
+    ExtensionContext,
+    WebviewView,
+    WebviewViewResolveContext,
+    CancellationToken,
+    Uri,
+    Webview,
+    EventEmitter,
+} from 'vscode'
+import { registerAssetsHttpsFileSystem } from './assets/assetsHandler'
+import { WebViewContentGenerator } from './generators/webViewContent'
+import { dispatchAppsMessagesToWebView, dispatchWebViewMessagesToApps } from './messages/messageDispatcher'
+import { MessageListener } from '../messages/messageListener'
+import { MessagePublisher } from '../messages/messagePublisher'
+import { TabType } from './ui/storages/tabsStorage'
+import { amazonqMark } from '../../shared/performance/marks'
+import { AuthUtil } from '../../codewhisperer/util/authUtil'
+
+export class AmazonQChatViewProvider implements WebviewViewProvider {
+    public static readonly viewType = 'aws.amazonq.AmazonQChatView'
+
+    webViewContentGenerator: WebViewContentGenerator
+    webView: Webview | undefined
+
+    constructor(
+        private readonly extensionContext: ExtensionContext,
+        private readonly webViewToAppsMessagesPublishers: Map<TabType, MessagePublisher<any>>,
+        private readonly appsMessagesListener: MessageListener<any>,
+        private readonly onDidChangeAmazonQVisibility: EventEmitter<boolean>
+    ) {
+        registerAssetsHttpsFileSystem(extensionContext)
+        this.webViewContentGenerator = new WebViewContentGenerator()
+
+        AuthUtil.instance.regionProfileManager.onDidChangeRegionProfile(async () => {
+            if (this.webView) {
+                this.webView.html = await this.webViewContentGenerator.generate(
+                    this.extensionContext.extensionUri,
+                    this.webView
+                )
+            }
+        })
+    }
+
+    public async resolveWebviewView(
+        webviewView: WebviewView,
+        context: WebviewViewResolveContext,
+        _token: CancellationToken
+    ) {
+        webviewView.onDidChangeVisibility(() => {
+            this.onDidChangeAmazonQVisibility.fire(webviewView.visible)
+        })
+
+        const dist = Uri.joinPath(this.extensionContext.extensionUri, 'dist')
+        const resources = Uri.joinPath(this.extensionContext.extensionUri, 'resources')
+        webviewView.webview.options = {
+            enableScripts: true,
+            enableCommandUris: true,
+            localResourceRoots: [dist, resources],
+        }
+
+        dispatchWebViewMessagesToApps(webviewView.webview, this.webViewToAppsMessagesPublishers)
+
+        dispatchAppsMessagesToWebView(webviewView.webview, this.appsMessagesListener)
+
+        webviewView.webview.html = await this.webViewContentGenerator.generate(
+            this.extensionContext.extensionUri,
+            webviewView.webview
+        )
+
+        this.webView = webviewView.webview
+        performance.mark(amazonqMark.open)
+    }
+}
diff --git a/packages/core/src/amazonqGumby/activation.ts b/packages/core/src/amazonqGumby/activation.ts
new file mode 100644
index 00000000000..8ab47f5697e
--- /dev/null
+++ b/packages/core/src/amazonqGumby/activation.ts
@@ -0,0 +1,84 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { Commands } from '../shared/vscode/commands2'
+import { TransformationHubViewProvider } from '../codewhisperer/service/transformByQ/transformationHubViewProvider'
+import { ExtContext } from '../shared/extensions'
+import {
+    cleanupTransformationJob,
+    postTransformationJob,
+    stopTransformByQ,
+} from '../codewhisperer/commands/startTransformByQ'
+import { transformByQState } from '../codewhisperer/models/model'
+import { ProposedTransformationExplorer } from '../codewhisperer/service/transformByQ/transformationResultsViewProvider'
+import { CodeTransformTelemetryState } from './telemetry/codeTransformTelemetryState'
+import { telemetry } from '../shared/telemetry/telemetry'
+import { setContext } from '../shared/vscode/setContext'
+
+export async function activate(context: ExtContext) {
+    void setContext('gumby.wasQCodeTransformationUsed', false)
+
+    const transformationHubViewProvider = TransformationHubViewProvider.instance
+    new ProposedTransformationExplorer(context.extensionContext)
+    // Register an activation event listener to determine when the IDE opens, closes or users
+    // select to open a new workspace
+    const workspaceChangeEvent = vscode.workspace.onDidChangeWorkspaceFolders((event) => {
+        // A loophole to register the IDE closed. This is when no folders were added nor
+        // removed, but the event still fired. This assumes the user closed the workspace
+        if (event.added.length === 0 && event.removed.length === 0) {
+            // Only fire closed during running/active job status
+            if (transformByQState.isRunning()) {
+                telemetry.codeTransform_jobIsClosedDuringIdeRun.emit({
+                    codeTransformJobId: transformByQState.getJobId(),
+                    codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+                    codeTransformStatus: transformByQState.getStatus(),
+                })
+            }
+        } else {
+            telemetry.codeTransform_jobIsResumedAfterIdeClose.emit({
+                codeTransformJobId: transformByQState.getJobId(),
+                codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+                codeTransformStatus: transformByQState.getStatus(),
+            })
+        }
+    })
+
+    context.extensionContext.subscriptions.push(
+        vscode.window.registerWebviewViewProvider('aws.amazonq.transformationHub', transformationHubViewProvider),
+
+        Commands.register('aws.amazonq.stopTransformationInHub', async () => {
+            if (transformByQState.isRunning()) {
+                await stopTransformByQ(transformByQState.getJobId())
+                await postTransformationJob()
+                await cleanupTransformationJob()
+            }
+        }),
+
+        Commands.register('aws.amazonq.showHistoryInHub', async () => {
+            await transformationHubViewProvider.updateContent('job history')
+        }),
+
+        Commands.register('aws.amazonq.showPlanProgressInHub', async (startTime: number) => {
+            await transformationHubViewProvider.updateContent('plan progress', startTime)
+        }),
+
+        Commands.register('aws.amazonq.showTransformationPlanInHub', async () => {
+            void vscode.commands.executeCommand(
+                'markdown.showPreview',
+                vscode.Uri.file(transformByQState.getPlanFilePath())
+            )
+        }),
+
+        Commands.register(
+            'aws.amazonq.transformationHub.updateContent',
+            async (button, startTime, historyFileUpdated) => {
+                await transformationHubViewProvider.updateContent(button, startTime, historyFileUpdated)
+            }
+        ),
+
+        workspaceChangeEvent
+    )
+}
diff --git a/packages/core/src/amazonqGumby/app.ts b/packages/core/src/amazonqGumby/app.ts
new file mode 100644
index 00000000000..21182b38155
--- /dev/null
+++ b/packages/core/src/amazonqGumby/app.ts
@@ -0,0 +1,78 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { AmazonQAppInitContext } from '../amazonq/apps/initContext'
+import { MessagePublisher } from '../amazonq/messages/messagePublisher'
+import { MessageListener } from '../amazonq/messages/messageListener'
+import { ChatControllerEventEmitters, GumbyController } from './chat/controller/controller'
+import { AppToWebViewMessageDispatcher } from './chat/views/connector/connector'
+import { Messenger } from './chat/controller/messenger/messenger'
+import { UIMessageListener } from './chat/views/actions/uiMessageListener'
+import { debounce } from 'lodash'
+import { AuthUtil } from '../codewhisperer/util/authUtil'
+import { showTransformationHub } from './commands'
+import { transformByQState } from '../codewhisperer/models/model'
+import { ChatSessionManager } from './chat/storages/chatSession'
+
+export function init(appContext: AmazonQAppInitContext) {
+    const gumbyChatControllerEventEmitters: ChatControllerEventEmitters = {
+        transformSelected: new vscode.EventEmitter<any>(),
+        authClicked: new vscode.EventEmitter<any>(),
+        formActionClicked: new vscode.EventEmitter<any>(),
+        commandSentFromIDE: new vscode.EventEmitter<any>(),
+        tabOpened: new vscode.EventEmitter<any>(),
+        tabClosed: new vscode.EventEmitter<any>(),
+        transformationFinished: new vscode.EventEmitter<any>(),
+        processHumanChatMessage: new vscode.EventEmitter<any>(),
+        linkClicked: new vscode.EventEmitter<any>(),
+        humanInTheLoopStartIntervention: new vscode.EventEmitter<any>(),
+        humanInTheLoopPromptUserForDependency: new vscode.EventEmitter<any>(),
+        humanInTheLoopSelectionUploaded: new vscode.EventEmitter<any>(),
+        errorThrown: new vscode.EventEmitter<any>(),
+    }
+
+    const dispatcher = new AppToWebViewMessageDispatcher(appContext.getAppsToWebViewMessagePublisher())
+    const messenger = new Messenger(dispatcher)
+
+    new GumbyController(gumbyChatControllerEventEmitters, messenger, appContext.onDidChangeAmazonQVisibility.event)
+
+    const gumbyChatUIInputEventEmitter = new vscode.EventEmitter<any>()
+
+    new UIMessageListener({
+        chatControllerEventEmitters: gumbyChatControllerEventEmitters,
+        webViewMessageListener: new MessageListener<any>(gumbyChatUIInputEventEmitter),
+    })
+
+    appContext.registerWebViewToAppMessagePublisher(new MessagePublisher<any>(gumbyChatUIInputEventEmitter), 'gumby')
+
+    const debouncedEvent = debounce(async () => {
+        const authenticated = (await AuthUtil.instance.getChatAuthState()).amazonQ === 'connected'
+        let authenticatingSessionID = ''
+
+        if (authenticated) {
+            const session = ChatSessionManager.Instance.getSession()
+
+            if (session.isTabOpen() && session.isAuthenticating) {
+                authenticatingSessionID = session.tabID!
+                session.isAuthenticating = false
+            }
+        }
+
+        messenger.sendAuthenticationUpdate(authenticated, [authenticatingSessionID])
+    }, 500)
+
+    AuthUtil.instance.secondaryAuth.onDidChangeActiveConnection(() => {
+        return debouncedEvent()
+    })
+    AuthUtil.instance.regionProfileManager.onDidChangeRegionProfile(() => {
+        return debouncedEvent()
+    })
+
+    showTransformationHub.register()
+
+    transformByQState.setChatControllers(gumbyChatControllerEventEmitters)
+    transformByQState.setChatMessenger(messenger)
+}
diff --git a/packages/core/src/amazonqGumby/chat/controller/controller.ts b/packages/core/src/amazonqGumby/chat/controller/controller.ts
new file mode 100644
index 00000000000..5d21c6b77f7
--- /dev/null
+++ b/packages/core/src/amazonqGumby/chat/controller/controller.ts
@@ -0,0 +1,794 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * This class is responsible for responding to UI events by calling
+ * the Gumby extension.
+ */
+import nodefs from 'fs' // eslint-disable-line no-restricted-imports
+import path from 'path'
+import * as vscode from 'vscode'
+import { GumbyNamedMessages, Messenger } from './messenger/messenger'
+import { AuthController } from '../../../amazonq/auth/controller'
+import { ChatSessionManager } from '../storages/chatSession'
+import { ConversationState, Session } from '../session/session'
+import { getLogger } from '../../../shared/logger/logger'
+import { featureName } from '../../models/constants'
+import { AuthUtil } from '../../../codewhisperer/util/authUtil'
+import {
+    cleanupTransformationJob,
+    compileProject,
+    finishHumanInTheLoop,
+    getValidLanguageUpgradeCandidateProjects,
+    postTransformationJob,
+    processLanguageUpgradeTransformFormInput,
+    processSQLConversionTransformFormInput,
+    startTransformByQ,
+    stopTransformByQ,
+    getValidSQLConversionCandidateProjects,
+    openHilPomFile,
+} from '../../../codewhisperer/commands/startTransformByQ'
+import { JDKVersion, TransformationCandidateProject, transformByQState } from '../../../codewhisperer/models/model'
+import {
+    AbsolutePathDetectedError,
+    AlternateDependencyVersionsNotFoundError,
+    JobStartError,
+    ModuleUploadError,
+    NoJavaProjectsFoundError,
+    NoMavenJavaProjectsFoundError,
+    NoOpenProjectsError,
+    TransformationPreBuildError,
+} from '../../errors'
+import * as CodeWhispererConstants from '../../../codewhisperer/models/constants'
+import MessengerUtils, { ButtonActions, GumbyCommands } from './messenger/messengerUtils'
+import { CancelActionPositions } from '../../telemetry/codeTransformTelemetry'
+import { openUrl } from '../../../shared/utilities/vsCodeUtils'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { CodeTransformTelemetryState } from '../../telemetry/codeTransformTelemetryState'
+import DependencyVersions from '../../models/dependencies'
+import { getStringHash } from '../../../shared/utilities/textUtilities'
+import AdmZip from 'adm-zip'
+import { AuthError } from '../../../auth/sso/server'
+import {
+    openBuildLogFile,
+    parseBuildFile,
+    validateSQLMetadataFile,
+    validateCustomVersionsFile,
+} from '../../../codewhisperer/service/transformByQ/transformFileHandler'
+import { getAuthType } from '../../../auth/utils'
+import fs from '../../../shared/fs/fs'
+import { setContext } from '../../../shared/vscode/setContext'
+import { readHistoryFile } from '../../../codewhisperer/service/transformByQ/transformationHistoryHandler'
+
+// These events can be interactions within the chat,
+// or elsewhere in the IDE
+export interface ChatControllerEventEmitters {
+    readonly transformSelected: vscode.EventEmitter<any>
+    readonly tabOpened: vscode.EventEmitter<any>
+    readonly tabClosed: vscode.EventEmitter<any>
+    readonly authClicked: vscode.EventEmitter<any>
+    readonly formActionClicked: vscode.EventEmitter<any>
+    readonly commandSentFromIDE: vscode.EventEmitter<any>
+    readonly transformationFinished: vscode.EventEmitter<any>
+    readonly processHumanChatMessage: vscode.EventEmitter<any>
+    readonly linkClicked: vscode.EventEmitter<any>
+    readonly humanInTheLoopStartIntervention: vscode.EventEmitter<any>
+    readonly humanInTheLoopPromptUserForDependency: vscode.EventEmitter<any>
+    readonly humanInTheLoopSelectionUploaded: vscode.EventEmitter<any>
+    readonly errorThrown: vscode.EventEmitter<any>
+}
+
+export class GumbyController {
+    private readonly messenger: Messenger
+    private readonly sessionStorage: ChatSessionManager
+    private authController: AuthController
+
+    public constructor(
+        private readonly chatControllerMessageListeners: ChatControllerEventEmitters,
+        messenger: Messenger,
+        onDidChangeAmazonQVisibility: vscode.Event<boolean>
+    ) {
+        this.messenger = messenger
+        this.sessionStorage = ChatSessionManager.Instance
+        this.authController = new AuthController()
+
+        this.chatControllerMessageListeners.transformSelected.event((data) => {
+            return this.transformInitiated(data)
+        })
+
+        this.chatControllerMessageListeners.tabOpened.event((data) => {
+            return this.tabOpened(data)
+        })
+
+        this.chatControllerMessageListeners.tabClosed.event((data) => {
+            return this.tabClosed(data)
+        })
+
+        this.chatControllerMessageListeners.authClicked.event((data) => {
+            this.authClicked(data)
+        })
+
+        this.chatControllerMessageListeners.commandSentFromIDE.event((data) => {
+            return this.commandSentFromIDE(data)
+        })
+
+        this.chatControllerMessageListeners.formActionClicked.event((data) => {
+            return this.formActionClicked(data)
+        })
+
+        this.chatControllerMessageListeners.transformationFinished.event((data) => {
+            return this.transformationFinished(data)
+        })
+
+        this.chatControllerMessageListeners.processHumanChatMessage.event((data) => {
+            return this.processHumanChatMessage(data)
+        })
+
+        this.chatControllerMessageListeners.linkClicked.event((data) => {
+            this.openLink(data)
+        })
+
+        this.chatControllerMessageListeners.humanInTheLoopStartIntervention.event((data) => {
+            return this.startHILIntervention(data)
+        })
+
+        this.chatControllerMessageListeners.humanInTheLoopPromptUserForDependency.event((data) => {
+            return this.HILPromptForDependency(data)
+        })
+
+        this.chatControllerMessageListeners.humanInTheLoopSelectionUploaded.event((data) => {
+            return this.HILDependencySelectionUploaded(data)
+        })
+
+        this.chatControllerMessageListeners.errorThrown.event((data) => {
+            return this.handleError(data)
+        })
+
+        AuthUtil.instance.regionProfileManager.onDidChangeRegionProfile(() => {
+            this.sessionStorage.removeActiveTab()
+        })
+    }
+
+    private async tabOpened(message: any) {
+        const session: Session = this.sessionStorage.getSession()
+        const tabID = this.sessionStorage.setActiveTab(message.tabID)
+
+        // check if authentication has expired
+        try {
+            getLogger().debug(`${featureName}: Session created with id: ${session.tabID}`)
+
+            const authState = await AuthUtil.instance.getChatAuthState()
+            if (authState.amazonQ !== 'connected') {
+                void this.messenger.sendAuthNeededExceptionMessage(authState, tabID)
+                session.isAuthenticating = true
+                return
+            }
+        } catch (err: any) {
+            this.messenger.sendErrorMessage(err.message, message.tabID)
+        }
+    }
+
+    private async tabClosed(data: any) {
+        this.sessionStorage.removeActiveTab()
+    }
+
+    private authClicked(message: any) {
+        this.authController.handleAuth(message.authType)
+
+        this.messenger.sendAnswer({
+            type: 'answer',
+            tabID: message.tabID,
+            message: 'Follow instructions to re-authenticate ...',
+        })
+
+        // Explicitly ensure the user goes through the re-authenticate flow
+        this.messenger.sendChatInputEnabled(message.tabID, false)
+    }
+
+    private commandSentFromIDE(data: any): any {
+        this.messenger.sendCommandMessage(data)
+    }
+
+    private async transformInitiated(message: any) {
+        // check if any jobs potentially still in progress on backend
+        const history = await readHistoryFile()
+        const numInProgress = history.filter((job) => job.status === 'FAILED').length
+        this.messenger.sendViewHistoryMessage(message.tabID, numInProgress)
+        if (transformByQState.isRefreshInProgress()) {
+            this.messenger.sendMessage(CodeWhispererConstants.refreshInProgressChatMessage, message.tabID, 'ai-prompt')
+            return
+        }
+
+        // silently check for projects eligible for SQL conversion
+        let embeddedSQLProjects: TransformationCandidateProject[] = []
+        try {
+            embeddedSQLProjects = await getValidSQLConversionCandidateProjects()
+        } catch (err) {
+            getLogger().error(`CodeTransformation: error validating SQL conversion projects: ${err}`)
+        }
+
+        if (embeddedSQLProjects.length === 0) {
+            await this.handleLanguageUpgrade(message)
+            return
+        }
+
+        let javaUpgradeProjects: TransformationCandidateProject[] = []
+        try {
+            javaUpgradeProjects = await getValidLanguageUpgradeCandidateProjects()
+        } catch (err) {
+            getLogger().error(`CodeTransformation: error validating Java upgrade projects: ${err}`)
+        }
+
+        if (javaUpgradeProjects.length === 0) {
+            await this.handleSQLConversion(message)
+            return
+        }
+
+        // if previous transformation was already running, show correct message to user
+        switch (this.sessionStorage.getSession().conversationState) {
+            case ConversationState.JOB_SUBMITTED:
+                this.messenger.sendAsyncEventProgress(
+                    message.tabID,
+                    true,
+                    undefined,
+                    GumbyNamedMessages.JOB_SUBMISSION_STATUS_MESSAGE
+                )
+                this.messenger.sendJobSubmittedMessage(message.tabID)
+                return
+            case ConversationState.COMPILING:
+                this.messenger.sendAsyncEventProgress(
+                    message.tabID,
+                    true,
+                    undefined,
+                    GumbyNamedMessages.COMPILATION_PROGRESS_MESSAGE
+                )
+                this.messenger.sendCompilationInProgress(message.tabID)
+                return
+        }
+
+        // Start /transform chat flow
+        CodeTransformTelemetryState.instance.setSessionId()
+
+        this.sessionStorage.getSession().conversationState = ConversationState.WAITING_FOR_TRANSFORMATION_OBJECTIVE
+        this.messenger.sendMessage(CodeWhispererConstants.chooseTransformationObjective, message.tabID, 'ai-prompt')
+        this.messenger.sendChatInputEnabled(message.tabID, true)
+        this.messenger.sendUpdatePlaceholder(
+            message.tabID,
+            CodeWhispererConstants.chooseTransformationObjectivePlaceholder
+        )
+    }
+
+    private async beginTransformation(message: any) {
+        await telemetry.codeTransform_initiateTransform.run(async () => {
+            const authType = await getAuthType()
+            telemetry.record({
+                codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+                credentialSourceId: authType,
+            })
+
+            const authState = await AuthUtil.instance.getChatAuthState()
+            if (authState.amazonQ !== 'connected') {
+                this.sessionStorage.getSession().isAuthenticating = true
+                await this.messenger.sendAuthNeededExceptionMessage(authState, message.tabID)
+                throw new AuthError('Not connected to Amazon Q', `AuthState=${authState.amazonQ}`)
+            }
+            this.messenger.sendTransformationIntroduction(message.tabID)
+        })
+    }
+
+    private async handleLanguageUpgrade(message: any) {
+        await telemetry.codeTransform_submitSelection
+            .run(async () => {
+                telemetry.record({
+                    codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+                    userChoice: 'language upgrade',
+                })
+                await this.beginTransformation(message)
+                const validProjects = await this.validateLanguageUpgradeProjects(message)
+                if (validProjects.length > 0) {
+                    this.sessionStorage.getSession().updateCandidateProjects(validProjects)
+                    await this.messenger.sendLanguageUpgradeProjectPrompt(validProjects, message.tabID)
+                }
+            })
+            .catch((err) => {
+                getLogger().error(`Error handling language upgrade: ${err}`)
+            })
+    }
+
+    private async handleSQLConversion(message: any) {
+        await telemetry.codeTransform_submitSelection
+            .run(async () => {
+                telemetry.record({
+                    codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+                    userChoice: 'sql conversion',
+                })
+                await this.beginTransformation(message)
+                const validProjects = await this.validateSQLConversionProjects(message)
+                if (validProjects.length > 0) {
+                    this.sessionStorage.getSession().updateCandidateProjects(validProjects)
+                    this.messenger.sendSelectSQLMetadataFileMessage(message.tabID)
+                }
+            })
+            .catch((err) => {
+                getLogger().error(`Error handling SQL conversion: ${err}`)
+            })
+    }
+
+    private async validateLanguageUpgradeProjects(message: any) {
+        try {
+            const validProjects = await telemetry.codeTransform_validateProject.run(async () => {
+                telemetry.record({
+                    codeTransformBuildSystem: 'Maven', // default for Maven until we add undefined field to CodeTransformBuildSystem
+                    codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+                })
+
+                const validProjects = await getValidLanguageUpgradeCandidateProjects()
+                return validProjects
+            })
+            return validProjects
+        } catch (e: any) {
+            if (e instanceof NoJavaProjectsFoundError) {
+                this.messenger.sendUnrecoverableErrorResponse('no-java-project-found', message.tabID)
+            } else if (e instanceof NoMavenJavaProjectsFoundError) {
+                this.messenger.sendUnrecoverableErrorResponse('no-maven-java-project-found', message.tabID)
+            } else if (e instanceof NoOpenProjectsError) {
+                this.messenger.sendUnrecoverableErrorResponse('no-project-found', message.tabID)
+            }
+        }
+        return []
+    }
+
+    private async validateSQLConversionProjects(message: any) {
+        try {
+            const validProjects = await getValidSQLConversionCandidateProjects()
+            return validProjects
+        } catch (e: any) {
+            if (e instanceof NoJavaProjectsFoundError) {
+                this.messenger.sendUnrecoverableErrorResponse('no-java-project-found', message.tabID)
+            } else if (e instanceof NoOpenProjectsError) {
+                this.messenger.sendUnrecoverableErrorResponse('no-project-found', message.tabID)
+            }
+        }
+        return []
+    }
+
+    private async formActionClicked(message: any) {
+        const typedAction = MessengerUtils.stringToEnumValue(ButtonActions, message.action as any)
+        switch (typedAction) {
+            case ButtonActions.CONFIRM_LANGUAGE_UPGRADE_TRANSFORMATION_FORM:
+                await this.handleUserLanguageUpgradeProjectChoice(message)
+                break
+            case ButtonActions.CANCEL_TRANSFORMATION_FORM:
+                telemetry.codeTransform_submitSelection.run(() => {
+                    telemetry.record({
+                        codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+                        userChoice: 'Cancel',
+                    })
+                    this.transformationFinished({
+                        message: CodeWhispererConstants.jobCancelledChatMessage,
+                        tabID: message.tabID,
+                    })
+                })
+                break
+            case ButtonActions.CONFIRM_SKIP_TESTS_FORM:
+                await this.handleSkipTestsSelection(message)
+                break
+            case ButtonActions.CONFIRM_SQL_CONVERSION_TRANSFORMATION_FORM:
+                await this.handleUserSQLConversionProjectSelection(message)
+                break
+            case ButtonActions.SELECT_SQL_CONVERSION_METADATA_FILE:
+                await this.processMetadataFile(message)
+                break
+            case ButtonActions.SELECT_CUSTOM_DEPENDENCY_VERSION_FILE:
+                await this.processCustomDependencyVersionFile(message)
+                break
+            case ButtonActions.CONTINUE_TRANSFORMATION_FORM:
+                this.messenger.sendMessage(
+                    CodeWhispererConstants.continueWithoutConfigFileMessage,
+                    message.tabID,
+                    'ai-prompt'
+                )
+                transformByQState.setCustomDependencyVersionFilePath('')
+                this.promptJavaHome('source', message.tabID)
+                break
+            case ButtonActions.VIEW_TRANSFORMATION_HUB:
+                await vscode.commands.executeCommand(GumbyCommands.FOCUS_TRANSFORMATION_HUB, CancelActionPositions.Chat)
+                break
+            case ButtonActions.VIEW_JOB_HISTORY:
+                await setContext('gumby.wasQCodeTransformationUsed', true)
+                await vscode.commands.executeCommand(GumbyCommands.FOCUS_TRANSFORMATION_HUB)
+                await vscode.commands.executeCommand(GumbyCommands.FOCUS_JOB_HISTORY, CancelActionPositions.Chat)
+                break
+            case ButtonActions.VIEW_SUMMARY:
+                await vscode.commands.executeCommand('aws.amazonq.transformationHub.summary.reveal')
+                break
+            case ButtonActions.STOP_TRANSFORMATION_JOB:
+                if (transformByQState.isRunning() || transformByQState.isRefreshInProgress()) {
+                    await stopTransformByQ(transformByQState.getJobId())
+                    await postTransformationJob()
+                    await cleanupTransformationJob()
+                }
+                break
+            case ButtonActions.CONFIRM_START_TRANSFORMATION_FLOW:
+                this.resetTransformationChatFlow()
+                this.messenger.sendCommandMessage({ ...message, command: GumbyCommands.CLEAR_CHAT })
+                await this.transformInitiated(message)
+                break
+            case ButtonActions.CONFIRM_DEPENDENCY_FORM:
+                await this.continueJobWithSelectedDependency(message)
+                break
+            case ButtonActions.CANCEL_DEPENDENCY_FORM:
+                this.messenger.sendMessage('Cancel', message.tabID, 'prompt')
+                await this.continueTransformationWithoutHIL(message)
+                break
+            case ButtonActions.OPEN_FILE:
+                await openHilPomFile()
+                break
+            case ButtonActions.OPEN_BUILD_LOG:
+                await openBuildLogFile()
+                this.messenger.sendViewBuildLog(message.tabID)
+                break
+        }
+    }
+
+    private async handleSkipTestsSelection(message: any) {
+        await telemetry.codeTransform_submitSelection.run(async () => {
+            const skipTestsSelection = message.formSelectedValues['GumbyTransformSkipTestsForm']
+            if (skipTestsSelection === CodeWhispererConstants.skipUnitTestsMessage) {
+                transformByQState.setCustomBuildCommand(CodeWhispererConstants.skipUnitTestsBuildCommand)
+            } else {
+                transformByQState.setCustomBuildCommand(CodeWhispererConstants.doNotSkipUnitTestsBuildCommand)
+            }
+            telemetry.record({
+                codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+                userChoice: skipTestsSelection,
+            })
+            this.messenger.sendSkipTestsSelectionMessage(skipTestsSelection, message.tabID)
+            await this.messenger.sendCustomDependencyVersionMessage(message.tabID)
+        })
+    }
+
+    private promptJavaHome(type: 'source' | 'target', tabID: any) {
+        let jdkVersion = undefined
+        let currJavaHome = undefined
+        if (type === 'source') {
+            this.sessionStorage.getSession().conversationState = ConversationState.PROMPT_SOURCE_JAVA_HOME
+            jdkVersion = transformByQState.getSourceJDKVersion()
+            currJavaHome = transformByQState.getPathFromJdkVersion(transformByQState.getSourceJDKVersion())
+        } else if (type === 'target') {
+            this.sessionStorage.getSession().conversationState = ConversationState.PROMPT_TARGET_JAVA_HOME
+            jdkVersion = transformByQState.getTargetJDKVersion()
+            currJavaHome = transformByQState.getPathFromJdkVersion(transformByQState.getTargetJDKVersion())
+        }
+        let message = MessengerUtils.createJavaHomePrompt(jdkVersion)
+        if (currJavaHome) {
+            message += `\n\ncurrent:\n\n\`${currJavaHome}\``
+        }
+        this.messenger.sendMessage(message, tabID, 'ai-prompt')
+        this.messenger.sendChatInputEnabled(tabID, true)
+        this.messenger.sendUpdatePlaceholder(tabID, CodeWhispererConstants.enterJavaHomePlaceholder)
+    }
+
+    private async handleUserLanguageUpgradeProjectChoice(message: any) {
+        if (transformByQState.isRefreshInProgress()) {
+            this.messenger.sendMessage(CodeWhispererConstants.refreshInProgressChatMessage, message.tabID, 'ai-prompt')
+            return
+        }
+        await telemetry.codeTransform_submitSelection.run(async () => {
+            const pathToProject: string = message.formSelectedValues['GumbyTransformLanguageUpgradeProjectForm']
+            const toJDKVersion: JDKVersion = message.formSelectedValues['GumbyTransformJdkToForm']
+            const fromJDKVersion: JDKVersion = message.formSelectedValues['GumbyTransformJdkFromForm']
+
+            telemetry.record({
+                source: fromJDKVersion,
+                target: toJDKVersion,
+                codeTransformProjectId: pathToProject === undefined ? undefined : getStringHash(pathToProject),
+                userChoice: 'Confirm-Java',
+            })
+
+            const projectName = path.basename(pathToProject)
+            this.messenger.sendLanguageUpgradeProjectChoiceMessage(
+                projectName,
+                fromJDKVersion,
+                toJDKVersion,
+                message.tabID
+            )
+
+            // do not allow downgrades (only this combination can be selected in the UI)
+            if (fromJDKVersion === JDKVersion.JDK21 && toJDKVersion === JDKVersion.JDK17) {
+                this.messenger.sendUnrecoverableErrorResponse('invalid-from-to-jdk', message.tabID)
+                return
+            }
+
+            await processLanguageUpgradeTransformFormInput(pathToProject, fromJDKVersion, toJDKVersion)
+            await this.messenger.sendSkipTestsPrompt(message.tabID)
+        })
+    }
+
+    private async handleUserSQLConversionProjectSelection(message: any) {
+        if (transformByQState.isRefreshInProgress()) {
+            this.messenger.sendMessage(CodeWhispererConstants.refreshInProgressChatMessage, message.tabID, 'ai-prompt')
+            return
+        }
+        await telemetry.codeTransform_submitSelection.run(async () => {
+            const pathToProject: string = message.formSelectedValues['GumbyTransformSQLConversionProjectForm']
+            const schema: string = message.formSelectedValues['GumbyTransformSQLSchemaForm']
+
+            telemetry.record({
+                codeTransformProjectId: pathToProject === undefined ? undefined : getStringHash(pathToProject),
+                source: transformByQState.getSourceDB(),
+                target: transformByQState.getTargetDB(),
+                userChoice: 'Confirm-SQL',
+            })
+
+            const projectName = path.basename(pathToProject)
+            this.messenger.sendSQLConversionProjectSelectionMessage(projectName, schema, message.tabID)
+
+            await processSQLConversionTransformFormInput(pathToProject, schema)
+
+            this.messenger.sendAsyncEventProgress(
+                message.tabID,
+                true,
+                undefined,
+                GumbyNamedMessages.JOB_SUBMISSION_STATUS_MESSAGE
+            )
+            this.messenger.sendJobSubmittedMessage(message.tabID)
+            this.sessionStorage.getSession().conversationState = ConversationState.JOB_SUBMITTED
+            await startTransformByQ()
+        })
+    }
+
+    private async prepareLanguageUpgradeProject(tabID: string) {
+        // build project locally
+        try {
+            this.sessionStorage.getSession().conversationState = ConversationState.COMPILING
+            this.messenger.sendCompilationInProgress(tabID)
+            await compileProject()
+        } catch (err: any) {
+            this.messenger.sendUnrecoverableErrorResponse('could-not-compile-project', tabID)
+            // reset state to allow "Start a new transformation" button to work
+            this.sessionStorage.getSession().conversationState = ConversationState.IDLE
+            throw err
+        }
+
+        this.messenger.sendCompilationFinished(tabID)
+
+        // since compilation can potentially take a long time, double check auth
+        const authState = await AuthUtil.instance.getChatAuthState()
+        if (authState.amazonQ !== 'connected') {
+            void this.messenger.sendAuthNeededExceptionMessage(authState, tabID)
+            this.sessionStorage.getSession().isAuthenticating = true
+            return
+        }
+
+        // give user a non-blocking warning if build file appears to contain absolute paths
+        await parseBuildFile()
+
+        this.messenger.sendAsyncEventProgress(tabID, true, undefined, GumbyNamedMessages.JOB_SUBMISSION_STATUS_MESSAGE)
+        this.messenger.sendJobSubmittedMessage(tabID)
+        this.sessionStorage.getSession().conversationState = ConversationState.JOB_SUBMITTED
+        await startTransformByQ()
+    }
+
+    private async processCustomDependencyVersionFile(message: any) {
+        const fileUri = await vscode.window.showOpenDialog({
+            canSelectMany: false,
+            openLabel: 'Select',
+            filters: {
+                File: ['yaml', 'yml'], // restrict user to only pick a .yaml file
+            },
+        })
+        if (!fileUri || fileUri.length === 0) {
+            return
+        }
+        const fileContents = await fs.readFileText(fileUri[0].fsPath)
+        const errorMessage = validateCustomVersionsFile(fileContents)
+
+        if (errorMessage) {
+            this.messenger.sendMessage(
+                CodeWhispererConstants.invalidCustomVersionsFileMessage(errorMessage),
+                message.tabID,
+                'ai-prompt'
+            )
+            return
+        }
+        this.messenger.sendMessage(CodeWhispererConstants.receivedValidConfigFileMessage, message.tabID, 'ai-prompt')
+        transformByQState.setCustomDependencyVersionFilePath(fileUri[0].fsPath)
+        this.promptJavaHome('source', message.tabID)
+    }
+
+    private async processMetadataFile(message: any) {
+        const fileUri = await vscode.window.showOpenDialog({
+            canSelectMany: false,
+            openLabel: 'Select',
+            filters: {
+                'SCT metadata': ['zip'], // Restrict user to only pick a .zip file
+            },
+        })
+
+        if (!fileUri || fileUri.length === 0) {
+            // user closed the dialog
+            this.transformationFinished({
+                message: CodeWhispererConstants.jobCancelledChatMessage,
+                tabID: message.tabID,
+            })
+            return
+        }
+
+        const metadataZip = new AdmZip(fileUri[0].fsPath)
+        const fileEntries = metadataZip.getEntries()
+        const metadataFile = fileEntries.find((entry) => entry.name.endsWith('.sct'))
+        if (!metadataFile) {
+            this.messenger.sendUnrecoverableErrorResponse('invalid-zip-no-sct-file', message.tabID)
+            return
+        }
+
+        const fileContents = metadataFile.getData().toString('utf-8')
+
+        const isValidMetadata = await validateSQLMetadataFile(fileContents, message)
+        if (!isValidMetadata) {
+            return
+        }
+
+        this.messenger.sendSQLConversionMetadataReceivedMessage(message.tabID)
+        transformByQState.setMetadataPathSQL(fileUri[0].fsPath)
+
+        await this.messenger.sendSQLConversionProjectPrompt(
+            Array.from(this.sessionStorage.getSession().candidateProjects.values()),
+            message.tabID
+        )
+    }
+
+    private transformationFinished(data: { message: string | undefined; tabID: string }) {
+        this.resetTransformationChatFlow()
+        // at this point job is either completed, partially_completed, cancelled, or failed
+        if (data.message) {
+            this.messenger.sendJobFinishedMessage(data.tabID, data.message)
+        }
+    }
+
+    private resetTransformationChatFlow() {
+        this.sessionStorage.getSession().conversationState = ConversationState.IDLE
+    }
+
+    private startHILIntervention(data: { tabID: string; codeSnippet: string }) {
+        this.sessionStorage.getSession().conversationState = ConversationState.WAITING_FOR_HIL_INPUT
+        this.messenger.sendHumanInTheLoopInitialMessage(data.tabID, data.codeSnippet)
+    }
+
+    private HILPromptForDependency(data: { tabID: string; dependencies: DependencyVersions }) {
+        this.messenger.sendDependencyVersionsFoundMessage(data.dependencies, data.tabID)
+    }
+
+    private HILDependencySelectionUploaded(data: { tabID: string }) {
+        this.sessionStorage.getSession().conversationState = ConversationState.JOB_SUBMITTED
+        this.messenger.sendHILResumeMessage(data.tabID)
+    }
+
+    private async processHumanChatMessage(data: { message: string; tabID: string }) {
+        this.messenger.sendMessage(data.message, data.tabID, 'prompt')
+        this.messenger.sendChatInputEnabled(data.tabID, false)
+        this.messenger.sendUpdatePlaceholder(data.tabID, CodeWhispererConstants.openNewTabPlaceholder)
+
+        const session = this.sessionStorage.getSession()
+        switch (session.conversationState) {
+            case ConversationState.PROMPT_SOURCE_JAVA_HOME: {
+                const pathToJavaHome = extractPath(data.message)
+                if (pathToJavaHome) {
+                    transformByQState.setSourceJavaHome(pathToJavaHome)
+                    transformByQState.setJdkVersionToPath(transformByQState.getSourceJDKVersion(), pathToJavaHome)
+                    // if source and target JDK versions are the same, just re-use the source JAVA_HOME and start the build
+                    if (transformByQState.getTargetJDKVersion() === transformByQState.getSourceJDKVersion()) {
+                        transformByQState.setTargetJavaHome(pathToJavaHome)
+                        await this.prepareLanguageUpgradeProject(data.tabID)
+                    } else {
+                        this.promptJavaHome('target', data.tabID)
+                    }
+                } else {
+                    this.messenger.sendUnrecoverableErrorResponse('invalid-java-home', data.tabID)
+                }
+                break
+            }
+
+            case ConversationState.PROMPT_TARGET_JAVA_HOME: {
+                const pathToJavaHome = extractPath(data.message)
+                if (pathToJavaHome) {
+                    transformByQState.setTargetJavaHome(pathToJavaHome)
+                    transformByQState.setJdkVersionToPath(transformByQState.getTargetJDKVersion(), pathToJavaHome)
+                    await this.prepareLanguageUpgradeProject(data.tabID) // build right after we get target JDK path
+                } else {
+                    this.messenger.sendUnrecoverableErrorResponse('invalid-java-home', data.tabID)
+                }
+                break
+            }
+
+            case ConversationState.WAITING_FOR_TRANSFORMATION_OBJECTIVE: {
+                const objective = data.message.trim().toLowerCase()
+                // since we're prompting the user, their project(s) must be eligible for both types of transformations, so track how often this happens here
+                if (objective === 'language upgrade' || objective === 'sql conversion') {
+                    telemetry.codeTransform_submitSelection.emit({
+                        codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+                        userChoice: objective,
+                        result: 'Succeeded',
+                    })
+                }
+                if (objective === 'language upgrade') {
+                    await this.handleLanguageUpgrade(data)
+                } else if (objective === 'sql conversion') {
+                    await this.handleSQLConversion(data)
+                } else {
+                    // keep prompting user until they enter a valid option
+                    await this.transformInitiated(data)
+                }
+                break
+            }
+        }
+    }
+
+    private async continueJobWithSelectedDependency(message: { tabID: string; formSelectedValues: any }) {
+        const selectedDependency = message.formSelectedValues['GumbyTransformDependencyForm']
+        this.messenger.sendHILContinueMessage(message.tabID, selectedDependency)
+        await finishHumanInTheLoop(selectedDependency)
+    }
+
+    private openLink(message: { link: string }) {
+        void openUrl(vscode.Uri.parse(message.link))
+    }
+
+    private async handleError(message: { error: Error; tabID: string }) {
+        if (message.error instanceof AlternateDependencyVersionsNotFoundError) {
+            this.messenger.sendKnownErrorResponse(message.tabID, CodeWhispererConstants.dependencyVersionsErrorMessage)
+            await this.continueTransformationWithoutHIL(message)
+        } else if (message.error instanceof ModuleUploadError) {
+            this.resetTransformationChatFlow()
+        } else if (message.error instanceof JobStartError) {
+            this.resetTransformationChatFlow()
+        } else if (message.error instanceof TransformationPreBuildError) {
+            this.messenger.sendJobSubmittedMessage(message.tabID, true)
+            this.messenger.sendAsyncEventProgress(
+                message.tabID,
+                true,
+                undefined,
+                GumbyNamedMessages.JOB_FAILED_IN_PRE_BUILD
+            )
+            await openBuildLogFile()
+            this.messenger.sendViewBuildLog(message.tabID)
+        } else if (message.error instanceof AbsolutePathDetectedError) {
+            this.messenger.sendKnownErrorResponse(message.tabID, message.error.message)
+        }
+    }
+
+    private async continueTransformationWithoutHIL(message: { tabID: string }) {
+        this.sessionStorage.getSession().conversationState = ConversationState.JOB_SUBMITTED
+        CodeTransformTelemetryState.instance.setCodeTransformMetaDataField({
+            canceledFromChat: true,
+        })
+        try {
+            await finishHumanInTheLoop()
+        } catch (err: any) {
+            this.transformationFinished({
+                tabID: message.tabID,
+                message: (err as Error).message,
+            })
+        }
+
+        this.messenger.sendMessage(CodeWhispererConstants.continueWithoutHilMessage, message.tabID, 'ai-prompt')
+    }
+}
+
+/**
+ * Examples:
+ * ```
+ * extractPath("./some/path/here") => "C:/some/root/some/path/here"
+ * extractPath(" ./some/path/here\n") => "C:/some/root/some/path/here"
+ * extractPath("C:/some/nonexistent/path/here") => undefined
+ * extractPath("C:/some/filepath/.txt") => undefined
+ * ```
+ *
+ * @param text
+ * @returns the absolute path if path points to existing folder, otherwise undefined
+ */
+function extractPath(text: string): string | undefined {
+    const resolvedPath = path.resolve(text.trim())
+    return nodefs.existsSync(resolvedPath) ? resolvedPath : undefined
+}
diff --git a/packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts b/packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts
new file mode 100644
index 00000000000..fb8da4c7096
--- /dev/null
+++ b/packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts
@@ -0,0 +1,824 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * This class controls the presentation of the various chat bubbles presented by the
+ * Elastic Gumby Transform by Q Experience.
+ *
+ * As much as possible, all strings used in the experience should originate here.
+ */
+
+import vscode from 'vscode'
+import { AuthFollowUpType, AuthMessageDataMap } from '../../../../amazonq/auth/model'
+import { JDKVersion, TransformationCandidateProject, transformByQState } from '../../../../codewhisperer/models/model'
+import { FeatureAuthState } from '../../../../codewhisperer/util/authUtil'
+import * as CodeWhispererConstants from '../../../../codewhisperer/models/constants'
+import {
+    AppToWebViewMessageDispatcher,
+    AsyncEventProgressMessage,
+    AuthNeededException,
+    AuthenticationUpdateMessage,
+    ChatInputEnabledMessage,
+    ChatMessage,
+    ChatPrompt,
+    ErrorMessage,
+    SendCommandMessage,
+    UpdatePlaceholderMessage,
+} from '../../views/connector/connector'
+import { ChatItemButton, ChatItemFormItem } from '@aws/mynah-ui/dist/static'
+import MessengerUtils, { ButtonActions } from './messengerUtils'
+import DependencyVersions from '../../../models/dependencies'
+import { ChatItemType } from '../../../../amazonq/commons/model'
+
+export type StaticTextResponseType =
+    | 'transform'
+    | 'java-home-not-set'
+    | 'start-transformation-confirmed'
+    | 'job-transmitted'
+    | 'end-HIL-early'
+    | 'choose-transformation-objective'
+    | 'language-upgrade-selected'
+    | 'sql-conversion-selected'
+
+export type UnrecoverableErrorType =
+    | 'no-project-found'
+    | 'no-java-project-found'
+    | 'no-maven-java-project-found'
+    | 'could-not-compile-project'
+    | 'invalid-java-home'
+    | 'upload-to-s3-failed'
+    | 'job-start-failed'
+    | 'unsupported-source-db'
+    | 'unsupported-target-db'
+    | 'error-parsing-sct-file'
+    | 'invalid-zip-no-sct-file'
+    | 'invalid-from-to-jdk'
+
+export enum GumbyNamedMessages {
+    COMPILATION_PROGRESS_MESSAGE = 'gumbyProjectCompilationMessage',
+    JOB_SUBMISSION_STATUS_MESSAGE = 'gumbyJobSubmissionMessage',
+    JOB_SUBMISSION_WITH_DEPENDENCY_STATUS_MESSAGE = 'gumbyJobSubmissionWithDependencyMessage',
+    JOB_FAILED_IN_PRE_BUILD = 'gumbyJobFailedInPreBuildMessage',
+}
+
+export class Messenger {
+    public constructor(private readonly dispatcher: AppToWebViewMessageDispatcher) {}
+
+    public sendAnswer(params: { message?: string; type: ChatItemType; tabID: string; messageID?: string }) {
+        this.dispatcher.sendChatMessage(
+            new ChatMessage(
+                {
+                    message: params.message,
+                    messageType: params.type,
+                    messageId: params.messageID,
+                },
+                params.tabID
+            )
+        )
+    }
+
+    public sendErrorMessage(errorMessage: string, tabID: string) {
+        this.dispatcher.sendErrorMessage(
+            new ErrorMessage(CodeWhispererConstants.genericErrorMessage, errorMessage, tabID)
+        )
+    }
+
+    public sendChatInputEnabled(tabID: string, enabled: boolean) {
+        this.dispatcher.sendChatInputEnabled(new ChatInputEnabledMessage(tabID, enabled))
+    }
+
+    public sendUpdatePlaceholder(tabID: string, newPlaceholder: string) {
+        this.dispatcher.sendUpdatePlaceholder(new UpdatePlaceholderMessage(tabID, newPlaceholder))
+    }
+
+    public async sendAuthNeededExceptionMessage(credentialState: FeatureAuthState, tabID: string) {
+        let authType: AuthFollowUpType = 'full-auth'
+        let message = AuthMessageDataMap[authType].message
+
+        switch (credentialState.amazonQ) {
+            case 'disconnected':
+                authType = 'full-auth'
+                message = AuthMessageDataMap[authType].message
+                break
+            case 'unsupported':
+                authType = 'use-supported-auth'
+                message = AuthMessageDataMap[authType].message
+                break
+            case 'expired':
+                authType = 're-auth'
+                message = AuthMessageDataMap[authType].message
+                break
+        }
+
+        this.dispatcher.sendAuthNeededExceptionMessage(new AuthNeededException(message, authType, tabID))
+    }
+
+    public sendAuthenticationUpdate(gumbyEnabled: boolean, authenticatingTabIDs: string[]) {
+        this.dispatcher.sendAuthenticationUpdate(new AuthenticationUpdateMessage(gumbyEnabled, authenticatingTabIDs))
+    }
+
+    public async sendSkipTestsPrompt(tabID: string) {
+        const formItems: ChatItemFormItem[] = []
+        formItems.push({
+            id: 'GumbyTransformSkipTestsForm',
+            type: 'select',
+            title: CodeWhispererConstants.skipUnitTestsFormTitle,
+            mandatory: true,
+            options: [
+                {
+                    value: CodeWhispererConstants.skipUnitTestsMessage,
+                    label: CodeWhispererConstants.skipUnitTestsMessage,
+                },
+                {
+                    value: CodeWhispererConstants.runUnitTestsMessage,
+                    label: CodeWhispererConstants.runUnitTestsMessage,
+                },
+            ],
+        })
+
+        this.dispatcher.sendAsyncEventProgress(
+            new AsyncEventProgressMessage(tabID, {
+                inProgress: true,
+                message: CodeWhispererConstants.skipUnitTestsFormMessage,
+            })
+        )
+
+        this.dispatcher.sendChatPrompt(
+            new ChatPrompt(
+                {
+                    message: 'Q Code Transformation',
+                    formItems: formItems,
+                },
+                'TransformSkipTestsForm',
+                tabID,
+                false
+            )
+        )
+    }
+
+    public async sendLanguageUpgradeProjectPrompt(projects: TransformationCandidateProject[], tabID: string) {
+        const projectFormOptions: { value: any; label: string }[] = []
+        const detectedJavaVersions = new Array<JDKVersion | undefined>()
+
+        for (const candidateProject of projects) {
+            projectFormOptions.push({
+                value: candidateProject.path,
+                label: candidateProject.name,
+            })
+            detectedJavaVersions.push(candidateProject.JDKVersion)
+        }
+
+        const formItems: ChatItemFormItem[] = []
+        formItems.push({
+            id: 'GumbyTransformLanguageUpgradeProjectForm',
+            type: 'select',
+            title: CodeWhispererConstants.chooseProjectFormTitle,
+            mandatory: true,
+
+            options: projectFormOptions,
+        })
+
+        formItems.push({
+            id: 'GumbyTransformJdkFromForm',
+            type: 'select',
+            title: CodeWhispererConstants.chooseSourceVersionFormTitle,
+            mandatory: true,
+            options: [
+                {
+                    value: JDKVersion.JDK8,
+                    label: JDKVersion.JDK8,
+                },
+                {
+                    value: JDKVersion.JDK11,
+                    label: JDKVersion.JDK11,
+                },
+                {
+                    value: JDKVersion.JDK17,
+                    label: JDKVersion.JDK17,
+                },
+                {
+                    value: JDKVersion.JDK21,
+                    label: JDKVersion.JDK21,
+                },
+            ],
+        })
+
+        formItems.push({
+            id: 'GumbyTransformJdkToForm',
+            type: 'select',
+            title: CodeWhispererConstants.chooseTargetVersionFormTitle,
+            mandatory: true,
+            options: [
+                {
+                    value: JDKVersion.JDK17,
+                    label: JDKVersion.JDK17,
+                },
+                {
+                    value: JDKVersion.JDK21,
+                    label: JDKVersion.JDK21,
+                },
+            ],
+        })
+
+        this.dispatcher.sendAsyncEventProgress(
+            new AsyncEventProgressMessage(tabID, {
+                inProgress: true,
+                message: CodeWhispererConstants.projectPromptChatMessage,
+            })
+        )
+
+        this.dispatcher.sendAsyncEventProgress(
+            new AsyncEventProgressMessage(tabID, {
+                inProgress: false,
+                message: undefined,
+            })
+        )
+
+        this.dispatcher.sendChatPrompt(
+            new ChatPrompt(
+                {
+                    message: 'Q Code Transformation',
+                    formItems: formItems,
+                },
+                'LanguageUpgradeTransformForm',
+                tabID,
+                false
+            )
+        )
+    }
+
+    public async sendSQLConversionProjectPrompt(projects: TransformationCandidateProject[], tabID: string) {
+        const projectFormOptions: { value: any; label: string }[] = []
+
+        for (const candidateProject of projects) {
+            projectFormOptions.push({
+                value: candidateProject.path,
+                label: candidateProject.name,
+            })
+        }
+
+        const formItems: ChatItemFormItem[] = []
+        formItems.push({
+            id: 'GumbyTransformSQLConversionProjectForm',
+            type: 'select',
+            title: CodeWhispererConstants.chooseProjectFormTitle,
+            mandatory: true,
+            options: projectFormOptions,
+        })
+
+        formItems.push({
+            id: 'GumbyTransformSQLSchemaForm',
+            type: 'select',
+            title: CodeWhispererConstants.chooseSchemaFormTitle,
+            mandatory: true,
+            options: Array.from(transformByQState.getSchemaOptions()).map((schema) => ({
+                value: schema,
+                label: schema,
+            })),
+        })
+
+        this.dispatcher.sendAsyncEventProgress(
+            new AsyncEventProgressMessage(tabID, {
+                inProgress: true,
+                message: CodeWhispererConstants.chooseProjectSchemaFormMessage,
+            })
+        )
+
+        this.dispatcher.sendAsyncEventProgress(
+            new AsyncEventProgressMessage(tabID, {
+                inProgress: false,
+                message: undefined,
+            })
+        )
+
+        this.dispatcher.sendChatPrompt(
+            new ChatPrompt(
+                {
+                    message: 'Q Code Transformation',
+                    formItems: formItems,
+                },
+                'SQLConversionTransformForm',
+                tabID,
+                false
+            )
+        )
+    }
+
+    public sendAsyncEventProgress(
+        tabID: string,
+        inProgress: boolean,
+        message: string | undefined = undefined,
+        messageId: string | undefined = undefined
+    ) {
+        this.dispatcher.sendAsyncEventProgress(new AsyncEventProgressMessage(tabID, { inProgress, message, messageId }))
+    }
+
+    public sendCompilationInProgress(tabID: string) {
+        const message = CodeWhispererConstants.buildStartedChatMessage
+
+        this.dispatcher.sendAsyncEventProgress(
+            new AsyncEventProgressMessage(tabID, { inProgress: true, message: undefined })
+        )
+
+        this.dispatcher.sendAsyncEventProgress(
+            new AsyncEventProgressMessage(tabID, {
+                inProgress: true,
+                message,
+            })
+        )
+    }
+
+    public sendCompilationFinished(tabID: string) {
+        const message = CodeWhispererConstants.buildSucceededChatMessage
+
+        this.dispatcher.sendAsyncEventProgress(
+            new AsyncEventProgressMessage(tabID, {
+                inProgress: true,
+                message,
+            })
+        )
+    }
+
+    public sendJobSubmittedMessage(
+        tabID: string,
+        disableJobActions: boolean = false,
+        message: string = CodeWhispererConstants.jobStartedChatMessage,
+        messageID: string = GumbyNamedMessages.JOB_SUBMISSION_STATUS_MESSAGE
+    ) {
+        const buttons: ChatItemButton[] = []
+
+        // don't show these buttons when server build fails
+        if (!disableJobActions) {
+            buttons.push({
+                keepCardAfterClick: true,
+                text: CodeWhispererConstants.openTransformationHubButtonText,
+                id: ButtonActions.VIEW_TRANSFORMATION_HUB,
+                disabled: false, // allow button to be re-clicked
+            })
+
+            buttons.push({
+                keepCardAfterClick: true,
+                text: CodeWhispererConstants.stopTransformationButtonText,
+                id: ButtonActions.STOP_TRANSFORMATION_JOB,
+                disabled: false,
+            })
+        }
+
+        const jobSubmittedMessage = new ChatMessage(
+            {
+                message,
+                messageType: 'ai-prompt',
+                messageId: messageID,
+                buttons,
+            },
+            tabID
+        )
+        this.dispatcher.sendChatMessage(jobSubmittedMessage)
+    }
+
+    public sendViewHistoryMessage(tabID: string, numInProgress: number) {
+        const buttons: ChatItemButton[] = []
+
+        buttons.push({
+            keepCardAfterClick: true,
+            text: CodeWhispererConstants.jobHistoryButtonText,
+            id: ButtonActions.VIEW_JOB_HISTORY,
+            disabled: false,
+        })
+
+        const messageText = CodeWhispererConstants.viewHistoryMessage(numInProgress)
+
+        const message = new ChatMessage(
+            {
+                message: messageText,
+                messageType: 'ai-prompt',
+                buttons,
+            },
+            tabID
+        )
+        this.dispatcher.sendChatMessage(message)
+    }
+
+    public sendJobRefreshInProgressMessage(tabID: string, jobId: string) {
+        const buttons: ChatItemButton[] = []
+        buttons.push({
+            keepCardAfterClick: true,
+            text: CodeWhispererConstants.stopTransformationButtonText,
+            id: ButtonActions.STOP_TRANSFORMATION_JOB,
+            disabled: false,
+        })
+        this.dispatcher.sendChatMessage(
+            new ChatMessage(
+                {
+                    message: CodeWhispererConstants.refreshingJobChatMessage(jobId),
+                    messageType: 'ai-prompt',
+                    buttons: buttons,
+                },
+                tabID
+            )
+        )
+    }
+
+    public sendMessage(prompt: string, tabID: string, type: 'prompt' | 'ai-prompt') {
+        this.dispatcher.sendChatMessage(
+            new ChatMessage(
+                {
+                    message: prompt,
+                    messageType: type,
+                },
+                tabID
+            )
+        )
+    }
+
+    /**
+     * This method renders an error message with a button at the end that will try the
+     * transformation again from the beginning. This message is meant for errors that are
+     * completely unrecoverable: the job cannot be completed in its current state,
+     * and the flow must be tried again.
+     */
+    public sendUnrecoverableErrorResponse(type: UnrecoverableErrorType, tabID: string) {
+        let message = '...'
+
+        switch (type) {
+            case 'no-project-found':
+                message = CodeWhispererConstants.noOpenProjectsFoundChatMessage
+                break
+            case 'no-java-project-found':
+                message = CodeWhispererConstants.noJavaProjectsFoundChatMessage
+                break
+            case 'no-maven-java-project-found':
+                // shown when user has no pom.xml, but at this point also means they have no eligible SQL conversion projects
+                message = CodeWhispererConstants.noPomXmlFoundChatMessage
+                break
+            case 'could-not-compile-project':
+                message = CodeWhispererConstants.cleanTestCompileErrorChatMessage
+                break
+            case 'invalid-java-home':
+                message = CodeWhispererConstants.noJavaHomeFoundChatMessage
+                break
+            case 'unsupported-source-db':
+                message = CodeWhispererConstants.invalidMetadataFileUnsupportedSourceDB
+                break
+            case 'unsupported-target-db':
+                message = CodeWhispererConstants.invalidMetadataFileUnsupportedTargetDB
+                break
+            case 'error-parsing-sct-file':
+                message = CodeWhispererConstants.invalidMetadataFileErrorParsing
+                break
+            case 'invalid-zip-no-sct-file':
+                message = CodeWhispererConstants.invalidMetadataFileNoSctFile
+                break
+            case 'invalid-from-to-jdk':
+                message = CodeWhispererConstants.invalidFromToJdkChatMessage
+                break
+        }
+
+        this.sendJobFinishedMessage(tabID, message)
+    }
+
+    /**
+     * @description This method renders an error message as a plain message with no other prompt or action
+     * for the user to follow. Either the job can continue and this message is purely for
+     * informational purposes, or some other error workflow is meant to contribute a
+     * follow-up with a user action.
+     */
+    public sendKnownErrorResponse(tabID: string, message: string) {
+        this.dispatcher.sendChatMessage(
+            new ChatMessage(
+                {
+                    message,
+                    messageType: 'ai-prompt',
+                },
+                tabID
+            )
+        )
+    }
+
+    public sendCommandMessage(message: any) {
+        this.dispatcher.sendCommandMessage(new SendCommandMessage(message.command, message.tabID, message.eventId))
+    }
+
+    public sendJobFinishedMessage(tabID: string, message: string) {
+        const buttons: ChatItemButton[] = []
+        buttons.push({
+            keepCardAfterClick: false,
+            text: CodeWhispererConstants.startTransformationButtonText,
+            id: ButtonActions.CONFIRM_START_TRANSFORMATION_FLOW,
+            disabled: false,
+        })
+
+        if (transformByQState.isPartiallySucceeded() || transformByQState.isSucceeded()) {
+            buttons.push({
+                keepCardAfterClick: true,
+                text: CodeWhispererConstants.viewSummaryButtonText,
+                id: ButtonActions.VIEW_SUMMARY,
+                disabled: false,
+            })
+        }
+
+        this.dispatcher.sendChatMessage(
+            new ChatMessage(
+                {
+                    message,
+                    messageType: 'ai-prompt',
+                    buttons,
+                },
+                tabID
+            )
+        )
+    }
+
+    public sendTransformationIntroduction(tabID: string) {
+        this.dispatcher.sendAsyncEventProgress(
+            new AsyncEventProgressMessage(tabID, { inProgress: true, message: undefined })
+        )
+
+        this.dispatcher.sendAsyncEventProgress(
+            new AsyncEventProgressMessage(tabID, {
+                inProgress: true,
+                message: CodeWhispererConstants.checkingForProjectsChatMessage,
+            })
+        )
+    }
+
+    public sendLanguageUpgradeProjectChoiceMessage(
+        projectName: string,
+        fromJDKVersion: JDKVersion,
+        toJDKVersion: JDKVersion,
+        tabID: string
+    ) {
+        const message = `### Transformation details
+-------------
+| | |
+| :------------------- | -------: |
+| **Project**             |   ${projectName}   |
+| **Source JDK version** |  ${fromJDKVersion}   |
+| **Target JDK version** |  ${toJDKVersion}   |
+    `
+
+        this.dispatcher.sendChatMessage(new ChatMessage({ message, messageType: 'prompt' }, tabID))
+    }
+
+    public sendSQLConversionProjectSelectionMessage(projectName: string, schema: string, tabID: string) {
+        const message = `### Transformation details
+-------------
+| | |
+| :------------------- | -------: |
+| **Project**             |   ${projectName}   |
+| **Schema** |  ${schema}   |
+    `
+        this.dispatcher.sendChatMessage(new ChatMessage({ message, messageType: 'prompt' }, tabID))
+    }
+
+    public sendSQLConversionMetadataReceivedMessage(tabID: any) {
+        const message = `### Transformation details
+-------------
+| | |
+| :------------------- | -------: |
+| **Source DB**             |   ${transformByQState.getSourceDB()}   |
+| **Target DB** |  ${transformByQState.getTargetDB()}   |
+| **Host** |  ${transformByQState.getSourceServerName()}   |
+    `
+        this.dispatcher.sendChatMessage(
+            new ChatMessage(
+                { message: CodeWhispererConstants.sqlMetadataFileReceived, messageType: 'ai-prompt' },
+                tabID
+            )
+        )
+        this.dispatcher.sendChatMessage(new ChatMessage({ message, messageType: 'ai-prompt' }, tabID))
+    }
+
+    public sendSkipTestsSelectionMessage(skipTestsSelection: string, tabID: string) {
+        const message = `Okay, I will ${skipTestsSelection.toLowerCase()} when building your project.`
+        this.dispatcher.sendChatMessage(new ChatMessage({ message, messageType: 'ai-prompt' }, tabID))
+    }
+
+    public sendHumanInTheLoopInitialMessage(tabID: string, codeSnippet: string) {
+        let message = `I was not able to upgrade all dependencies. To resolve it, I will try to find an updated depedency in your local Maven repository. I will need additional information from you to continue.`
+
+        this.dispatcher.sendChatMessage(
+            new ChatMessage(
+                {
+                    message,
+                    messageType: 'ai-prompt',
+                },
+                tabID
+            )
+        )
+
+        if (codeSnippet !== '') {
+            message = `Here is the dependency causing the issue:
+\`\`\`
+${codeSnippet}
+\`\`\`
+`
+
+            const buttons: ChatItemButton[] = []
+            buttons.push({
+                keepCardAfterClick: true,
+                text: 'Open File',
+                id: ButtonActions.OPEN_FILE,
+            })
+
+            this.dispatcher.sendChatMessage(
+                new ChatMessage(
+                    {
+                        message,
+                        messageType: 'ai-prompt',
+                        buttons,
+                    },
+                    tabID
+                )
+            )
+        }
+
+        message = `I am searching for other dependency versions available in your Maven repository...`
+
+        this.sendInProgressMessage(tabID, message)
+    }
+
+    public sendInProgressMessage(tabID: string, message: string) {
+        this.dispatcher.sendAsyncEventProgress(
+            new AsyncEventProgressMessage(tabID, { inProgress: true, message: undefined })
+        )
+
+        this.dispatcher.sendAsyncEventProgress(
+            new AsyncEventProgressMessage(tabID, {
+                inProgress: true,
+                message,
+            })
+        )
+    }
+
+    public sendDependencyVersionsFoundMessage(versions: DependencyVersions, tabID: string) {
+        const message = MessengerUtils.createAvailableDependencyVersionString(versions)
+
+        const valueFormOptions: { value: any; label: string }[] = []
+
+        for (const version of versions.allVersions) {
+            valueFormOptions.push({
+                value: version,
+                label: version,
+            })
+        }
+
+        const formItems: ChatItemFormItem[] = []
+        formItems.push({
+            id: 'GumbyTransformDependencyForm',
+            type: 'select',
+            title: 'Choose which version I should use:',
+            mandatory: true,
+
+            options: valueFormOptions,
+        })
+
+        this.dispatcher.sendChatPrompt(
+            new ChatPrompt(
+                {
+                    message,
+                    formItems: formItems,
+                },
+                'TransformDependencyForm',
+                tabID,
+                false
+            )
+        )
+    }
+
+    public sendHILContinueMessage(tabID: string, selectedDependencyVersion: string) {
+        let message = `### Dependency Details
+-------------
+| | |
+| :------------------- | -------: |
+| **Dependency Version**             |   ${selectedDependencyVersion}   |
+`
+
+        this.dispatcher.sendChatMessage(new ChatMessage({ message, messageType: 'prompt' }, tabID))
+
+        message = `I received your target version dependency.`
+        this.sendInProgressMessage(tabID, message)
+    }
+
+    public sendHILResumeMessage(tabID: string) {
+        const message = `I will continue transforming your code. You can monitor progress in the Transformation Hub.`
+        this.sendAsyncEventProgress(
+            tabID,
+            true,
+            undefined,
+            GumbyNamedMessages.JOB_SUBMISSION_WITH_DEPENDENCY_STATUS_MESSAGE
+        )
+        this.sendJobSubmittedMessage(
+            tabID,
+            false,
+            message,
+            GumbyNamedMessages.JOB_SUBMISSION_WITH_DEPENDENCY_STATUS_MESSAGE
+        )
+    }
+
+    public sendViewBuildLog(tabID: string) {
+        const message = `I am having trouble building your project in the secure build environment and could not complete the transformation.`
+        const messageId = GumbyNamedMessages.JOB_FAILED_IN_PRE_BUILD
+        const buttons: ChatItemButton[] = []
+
+        if (transformByQState.getPreBuildLogFilePath() !== '') {
+            buttons.push({
+                keepCardAfterClick: true,
+                text: `View Build Log`,
+                id: ButtonActions.OPEN_BUILD_LOG,
+            })
+        }
+
+        this.dispatcher.sendChatMessage(
+            new ChatMessage(
+                {
+                    message,
+                    messageType: 'ai-prompt',
+                    messageId,
+                    buttons,
+                },
+                tabID
+            )
+        )
+    }
+
+    public async sendCustomDependencyVersionMessage(tabID: string) {
+        let message = CodeWhispererConstants.chooseConfigFileMessageLibraryUpgrade
+        if (transformByQState.getSourceJDKVersion() !== transformByQState.getTargetJDKVersion()) {
+            message = CodeWhispererConstants.chooseConfigFileMessageJdkUpgrade
+        }
+        const buttons: ChatItemButton[] = []
+
+        buttons.push({
+            keepCardAfterClick: true,
+            text: 'Select .yaml file',
+            id: ButtonActions.SELECT_CUSTOM_DEPENDENCY_VERSION_FILE,
+            disabled: false,
+        })
+
+        buttons.push({
+            keepCardAfterClick: false,
+            text: 'Continue without this',
+            id: ButtonActions.CONTINUE_TRANSFORMATION_FORM,
+            disabled: false,
+        })
+
+        this.dispatcher.sendChatMessage(
+            new ChatMessage(
+                {
+                    message,
+                    messageType: 'ai-prompt',
+                    buttons,
+                },
+                tabID
+            )
+        )
+        const sampleYAML = `name: "dependency-upgrade"
+description: "Custom dependency version management for Java migration from JDK 8/11/17 to JDK 17/21"
+
+dependencyManagement:
+  dependencies:
+    - identifier: "com.example:library1"
+      targetVersion: "2.1.0"
+      versionProperty: "library1.version"  # Optional
+      originType: "FIRST_PARTY" # or "THIRD_PARTY"
+    - identifier: "com.example:library2"
+      targetVersion: "3.0.0"
+      originType: "THIRD_PARTY"
+  plugins:
+    - identifier: "com.example:plugin"
+      targetVersion: "1.2.0"
+      versionProperty: "plugin.version"  # Optional`
+
+        const doc = await vscode.workspace.openTextDocument({ content: sampleYAML, language: 'yaml' })
+        await vscode.window.showTextDocument(doc)
+    }
+
+    public sendSelectSQLMetadataFileMessage(tabID: string) {
+        const message = CodeWhispererConstants.selectSQLMetadataFileHelpMessage
+        const buttons: ChatItemButton[] = []
+
+        buttons.push({
+            keepCardAfterClick: true,
+            text: 'Select metadata file',
+            id: ButtonActions.SELECT_SQL_CONVERSION_METADATA_FILE,
+        })
+
+        buttons.push({
+            keepCardAfterClick: false,
+            text: 'Cancel',
+            id: ButtonActions.CANCEL_TRANSFORMATION_FORM,
+        })
+
+        this.dispatcher.sendChatMessage(
+            new ChatMessage(
+                {
+                    message,
+                    messageType: 'ai-prompt',
+                    buttons,
+                },
+                tabID
+            )
+        )
+    }
+}
diff --git a/packages/core/src/amazonqGumby/chat/controller/messenger/messengerUtils.ts b/packages/core/src/amazonqGumby/chat/controller/messenger/messengerUtils.ts
new file mode 100644
index 00000000000..2c64a050547
--- /dev/null
+++ b/packages/core/src/amazonqGumby/chat/controller/messenger/messengerUtils.ts
@@ -0,0 +1,89 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+import * as os from 'os'
+import { JDKVersion } from '../../../../codewhisperer/models/model'
+import * as CodeWhispererConstants from '../../../../codewhisperer/models/constants'
+import DependencyVersions from '../../../models/dependencies'
+
+// These enums map to string IDs
+export enum ButtonActions {
+    STOP_TRANSFORMATION_JOB = 'gumbyStopTransformationJob',
+    VIEW_TRANSFORMATION_HUB = 'gumbyViewTransformationHub',
+    VIEW_JOB_HISTORY = 'gumbyViewJobHistory',
+    VIEW_SUMMARY = 'gumbyViewSummary',
+    CONFIRM_LANGUAGE_UPGRADE_TRANSFORMATION_FORM = 'gumbyLanguageUpgradeTransformFormConfirm',
+    CONFIRM_SQL_CONVERSION_TRANSFORMATION_FORM = 'gumbySQLConversionTransformFormConfirm',
+    CANCEL_TRANSFORMATION_FORM = 'gumbyTransformFormCancel', // shared between Language Upgrade & SQL Conversion
+    CONFIRM_SKIP_TESTS_FORM = 'gumbyTransformSkipTestsFormConfirm',
+    SELECT_SQL_CONVERSION_METADATA_FILE = 'gumbySQLConversionMetadataTransformFormConfirm',
+    SELECT_CUSTOM_DEPENDENCY_VERSION_FILE = 'gumbyCustomDependencyVersionTransformFormConfirm',
+    CONTINUE_TRANSFORMATION_FORM = 'gumbyTransformFormContinue',
+    CONFIRM_DEPENDENCY_FORM = 'gumbyTransformDependencyFormConfirm',
+    CANCEL_DEPENDENCY_FORM = 'gumbyTransformDependencyFormCancel',
+    CONFIRM_JAVA_HOME_FORM = 'gumbyJavaHomeFormConfirm',
+    CONFIRM_START_TRANSFORMATION_FLOW = 'gumbyStartTransformation',
+    OPEN_FILE = 'gumbyOpenFile',
+    OPEN_BUILD_LOG = 'gumbyOpenBuildLog',
+}
+
+export enum GumbyCommands {
+    CLEAR_CHAT = 'aws.awsq.clearchat',
+    START_TRANSFORMATION_FLOW = 'aws.awsq.transform',
+    FOCUS_TRANSFORMATION_HUB = 'aws.amazonq.showTransformationHub',
+    FOCUS_JOB_HISTORY = 'aws.amazonq.showHistoryInHub',
+}
+
+export default class MessengerUtils {
+    static createJavaHomePrompt = (jdkVersion: JDKVersion | undefined): string => {
+        let javaHomePrompt = `${CodeWhispererConstants.enterJavaHomeChatMessage} ${jdkVersion}.\n\n`
+        if (os.platform() === 'win32') {
+            javaHomePrompt += CodeWhispererConstants.windowsJavaHomeHelpChatMessage
+        } else if (os.platform() === 'darwin') {
+            if (jdkVersion === JDKVersion.JDK8) {
+                javaHomePrompt += ` ${CodeWhispererConstants.macJavaVersionHomeHelpChatMessage(1.8)}`
+            } else if (jdkVersion === JDKVersion.JDK11) {
+                javaHomePrompt += ` ${CodeWhispererConstants.macJavaVersionHomeHelpChatMessage(11)}`
+            } else if (jdkVersion === JDKVersion.JDK17) {
+                javaHomePrompt += ` ${CodeWhispererConstants.macJavaVersionHomeHelpChatMessage(17)}`
+            } else if (jdkVersion === JDKVersion.JDK21) {
+                javaHomePrompt += ` ${CodeWhispererConstants.macJavaVersionHomeHelpChatMessage(21)}`
+            }
+        } else {
+            javaHomePrompt += ` ${CodeWhispererConstants.linuxJavaHomeHelpChatMessage}`
+        }
+        return javaHomePrompt
+    }
+
+    static stringToEnumValue = <T extends { [key: string]: string }, K extends keyof T & string>(
+        enumObject: T,
+        value: `${T[K]}`
+    ): T[K] => {
+        if (Object.values(enumObject).includes(value)) {
+            return value as unknown as T[K]
+        } else {
+            throw new Error('Value provided was not found in Enum')
+        }
+    }
+
+    static createAvailableDependencyVersionString = (versions: DependencyVersions): string => {
+        let message = `I found ${versions.length} other dependency versions that are more recent than the dependency in your code that's causing an error: ${versions.currentVersion}.`
+
+        if (versions.majorVersions !== undefined && versions.majorVersions.length > 0) {
+            message = message.concat(
+                `Latest major version: ${versions.majorVersions[versions.majorVersions.length - 1]} \n`
+            )
+        }
+
+        if (versions.minorVersions !== undefined && versions.minorVersions.length > 0) {
+            message = message.concat(
+                `Latest minor version: ${versions.minorVersions[versions.minorVersions.length - 1]} \n`
+            )
+        }
+
+        return message
+    }
+}
diff --git a/packages/core/src/amazonqGumby/chat/session/session.ts b/packages/core/src/amazonqGumby/chat/session/session.ts
new file mode 100644
index 00000000000..f1a69eb60ff
--- /dev/null
+++ b/packages/core/src/amazonqGumby/chat/session/session.ts
@@ -0,0 +1,51 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { TransformationCandidateProject } from '../../../codewhisperer/models/model'
+
+export enum ConversationState {
+    IDLE,
+    PROMPT_SOURCE_JAVA_HOME,
+    PROMPT_TARGET_JAVA_HOME,
+    COMPILING,
+    JOB_SUBMITTED,
+    WAITING_FOR_HIL_INPUT,
+    WAITING_FOR_TRANSFORMATION_OBJECTIVE,
+}
+
+export interface ProjectDetails {
+    pathToJavaHome: string
+}
+
+export class Session {
+    // Used to keep track of whether or not the current session is currently authenticating/needs authenticating
+    public isAuthenticating: boolean = false
+
+    // A tab may or may not be currently open
+    public tabID: string | undefined
+
+    public conversationState: ConversationState = ConversationState.IDLE
+
+    // If the user is prompted to provide more details about their project, it is stored here for use in future transformations
+    public projectDetails: ProjectDetails | undefined
+
+    public candidateProjects: Map<string, TransformationCandidateProject> = new Map<
+        string,
+        TransformationCandidateProject
+    >()
+
+    constructor() {}
+
+    public isTabOpen(): boolean {
+        return this.tabID !== undefined
+    }
+
+    public updateCandidateProjects(newCandidateProjects: TransformationCandidateProject[]) {
+        this.candidateProjects = new Map<string, TransformationCandidateProject>()
+        newCandidateProjects.map((candidateProject) => {
+            this.candidateProjects.set(candidateProject.path, candidateProject)
+        })
+    }
+}
diff --git a/packages/core/src/amazonqGumby/chat/storages/chatSession.ts b/packages/core/src/amazonqGumby/chat/storages/chatSession.ts
new file mode 100644
index 00000000000..b7df6eb0cc6
--- /dev/null
+++ b/packages/core/src/amazonqGumby/chat/storages/chatSession.ts
@@ -0,0 +1,54 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+import { Session } from '../session/session'
+
+export class SessionNotFoundError extends Error {}
+
+export class ChatSessionManager {
+    private static _instance: ChatSessionManager
+    private activeSession: Session | undefined
+
+    constructor() {}
+
+    public static get Instance() {
+        return this._instance || (this._instance = new this())
+    }
+
+    private createSession(): Session {
+        this.activeSession = new Session()
+        return this.activeSession
+    }
+
+    public getSession(): Session {
+        if (this.activeSession === undefined) {
+            return this.createSession()
+        }
+
+        return this.activeSession
+    }
+
+    public setActiveTab(tabID: string): string {
+        if (this.activeSession !== undefined) {
+            if (!this.activeSession.isTabOpen()) {
+                this.activeSession.tabID = tabID
+                return tabID
+            }
+            return this.activeSession.tabID!
+        }
+
+        throw new SessionNotFoundError()
+    }
+
+    public removeActiveTab(): void {
+        if (this.activeSession !== undefined) {
+            if (this.activeSession.isTabOpen()) {
+                this.activeSession.tabID = undefined
+                return
+            }
+        }
+    }
+}
diff --git a/packages/core/src/amazonqGumby/chat/views/actions/uiMessageListener.ts b/packages/core/src/amazonqGumby/chat/views/actions/uiMessageListener.ts
new file mode 100644
index 00000000000..31f8d952fc6
--- /dev/null
+++ b/packages/core/src/amazonqGumby/chat/views/actions/uiMessageListener.ts
@@ -0,0 +1,102 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { MessageListener } from '../../../../amazonq/messages/messageListener'
+import { ExtensionMessage } from '../../../../amazonq/webview/ui/commands'
+import { ChatControllerEventEmitters } from '../../controller/controller'
+
+type UIMessage = ExtensionMessage & {
+    tabID?: string
+}
+
+export interface UIMessageListenerProps {
+    readonly chatControllerEventEmitters: ChatControllerEventEmitters
+    readonly webViewMessageListener: MessageListener<any>
+}
+
+export class UIMessageListener {
+    private gumbyControllerEventsEmitters: ChatControllerEventEmitters | undefined
+    private webViewMessageListener: MessageListener<any>
+
+    constructor(props: UIMessageListenerProps) {
+        this.gumbyControllerEventsEmitters = props.chatControllerEventEmitters
+        this.webViewMessageListener = props.webViewMessageListener
+
+        // Now we are listening to events that get sent from amazonq/webview/actions/actionListener (e.g. the tab)
+        this.webViewMessageListener.onMessage((msg) => {
+            this.handleMessage(msg)
+        })
+    }
+
+    private handleMessage(msg: ExtensionMessage) {
+        switch (msg.command) {
+            case 'transform':
+                this.transform(msg)
+                break
+            case 'new-tab-was-created':
+                this.tabOpened(msg)
+                break
+            case 'tab-was-removed':
+                this.tabClosed(msg)
+                break
+            case 'auth-follow-up-was-clicked':
+                this.authClicked(msg)
+                break
+            case 'form-action-click':
+                this.formActionClicked(msg)
+                break
+            case 'chat-prompt':
+                this.processChatPrompt(msg)
+                break
+            case 'response-body-link-click':
+                this.linkClicked(msg)
+                break
+        }
+    }
+
+    private processChatPrompt(msg: UIMessage) {
+        this.gumbyControllerEventsEmitters?.processHumanChatMessage.fire({
+            message: msg.chatMessage,
+            tabID: msg.tabID,
+        })
+    }
+
+    private transform(msg: UIMessage) {
+        this.gumbyControllerEventsEmitters?.transformSelected.fire({
+            tabID: msg.tabID,
+        })
+    }
+
+    private tabOpened(msg: UIMessage) {
+        this.gumbyControllerEventsEmitters?.tabOpened.fire({
+            tabID: msg.tabID,
+        })
+    }
+
+    private tabClosed(msg: UIMessage) {
+        this.gumbyControllerEventsEmitters?.tabClosed.fire({
+            tabID: msg.tabID,
+        })
+    }
+
+    private authClicked(msg: UIMessage) {
+        this.gumbyControllerEventsEmitters?.authClicked.fire({
+            tabID: msg.tabID,
+            authType: msg.authType,
+        })
+    }
+
+    private formActionClicked(msg: UIMessage) {
+        this.gumbyControllerEventsEmitters?.formActionClicked.fire({
+            ...msg,
+        })
+    }
+
+    private linkClicked(msg: UIMessage) {
+        this.gumbyControllerEventsEmitters?.linkClicked.fire({
+            ...msg,
+        })
+    }
+}
diff --git a/packages/core/src/amazonqGumby/chat/views/connector/connector.ts b/packages/core/src/amazonqGumby/chat/views/connector/connector.ts
new file mode 100644
index 00000000000..9e044780858
--- /dev/null
+++ b/packages/core/src/amazonqGumby/chat/views/connector/connector.ts
@@ -0,0 +1,220 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { gumbyChat } from '../../../models/constants'
+import { AuthFollowUpType } from '../../../../amazonq/auth/model'
+import { MessagePublisher } from '../../../../amazonq/messages/messagePublisher'
+import { ChatItemButton, ChatItemFormItem } from '@aws/mynah-ui/dist/static'
+import { GumbyCommands } from '../../controller/messenger/messengerUtils'
+import { ChatItemType } from '../../../../amazonq/commons/model'
+
+export type GumbyMessageType =
+    | 'errorMessage'
+    | 'asyncEventProgressMessage'
+    | 'authenticationUpdateMessage'
+    | 'authNeededException'
+    | 'chatPrompt'
+    | 'chatMessage'
+    | 'chatInputEnabledMessage'
+    | 'sendCommandMessage'
+    | 'updatePlaceholderMessage'
+
+class UiMessage {
+    readonly time: number = Date.now()
+    readonly sender: string = gumbyChat
+    readonly type: GumbyMessageType = 'chatMessage'
+    readonly status: string = 'info'
+
+    public constructor(protected tabID: string) {}
+}
+
+export class ErrorMessage extends UiMessage {
+    override type: GumbyMessageType = 'errorMessage'
+
+    constructor(
+        readonly title: string,
+        readonly message: string,
+        tabID: string
+    ) {
+        super(tabID)
+    }
+}
+
+export interface AsyncEventProgressMessageProps {
+    readonly inProgress: boolean
+    readonly message: string | undefined
+    readonly messageId?: string | undefined
+    readonly buttons?: ChatItemButton[]
+}
+
+export class AsyncEventProgressMessage extends UiMessage {
+    readonly inProgress: boolean
+    readonly message: string | undefined
+    readonly messageId?: string | undefined
+    readonly buttons?: ChatItemButton[]
+    readonly messageType = 'answer-part'
+    override type: GumbyMessageType = 'asyncEventProgressMessage'
+
+    constructor(tabID: string, props: AsyncEventProgressMessageProps) {
+        super(tabID)
+        this.inProgress = props.inProgress
+        this.message = props.message
+        this.messageId = props.messageId
+        this.buttons = props.buttons ?? []
+    }
+}
+
+export class AuthenticationUpdateMessage {
+    readonly time: number = Date.now()
+    readonly sender: string = gumbyChat
+    readonly type: GumbyMessageType = 'authenticationUpdateMessage'
+
+    constructor(
+        readonly gumbyEnabled: boolean,
+        readonly authenticatingTabIDs: string[]
+    ) {}
+}
+
+export class AuthNeededException extends UiMessage {
+    override type: GumbyMessageType = 'authNeededException'
+
+    constructor(
+        readonly message: string,
+        readonly authType: AuthFollowUpType,
+        tabID: string
+    ) {
+        super(tabID)
+    }
+}
+
+export interface ChatPromptProps {
+    readonly message: string | undefined
+    formItems: ChatItemFormItem[]
+}
+
+export class ChatPrompt extends UiMessage {
+    readonly message: string | undefined
+    readonly messageType = 'system-prompt'
+    readonly formItems: ChatItemFormItem[]
+    formButtons: ChatItemButton[]
+    override type: GumbyMessageType = 'chatPrompt'
+
+    constructor(props: ChatPromptProps, promptIDPrefix: string, tabID: string, keepCardAfterClick: boolean = true) {
+        super(tabID)
+        this.message = props.message
+        this.formItems = props.formItems
+
+        this.formButtons = []
+        this.formButtons.push({
+            keepCardAfterClick: keepCardAfterClick,
+            waitMandatoryFormItems: true,
+            text: 'Confirm',
+            id: `gumby${promptIDPrefix}Confirm`,
+        })
+        this.formButtons.push({
+            keepCardAfterClick: false,
+            waitMandatoryFormItems: false,
+            text: 'Cancel',
+            // makes the Cancel button shared in all forms, which is fine since we respond the same exact way each time
+            id: 'gumbyTransformFormCancel',
+        })
+    }
+}
+
+export interface ChatMessageProps {
+    readonly message: string | undefined
+    readonly messageId?: string | undefined
+    readonly messageType: ChatItemType
+    readonly buttons?: ChatItemButton[]
+}
+
+export class ChatMessage extends UiMessage {
+    readonly message: string | undefined
+    readonly messageId?: string | undefined
+    readonly messageType: ChatItemType
+    readonly buttons: ChatItemButton[]
+    override type: GumbyMessageType = 'chatMessage'
+
+    constructor(props: ChatMessageProps, tabID: string) {
+        super(tabID)
+        this.message = props.message
+        this.messageType = props.messageType
+        this.buttons = props.buttons || []
+        this.messageId = props.messageId || undefined
+    }
+}
+
+export class ChatInputEnabledMessage extends UiMessage {
+    override type: GumbyMessageType = 'chatInputEnabledMessage'
+
+    constructor(
+        tabID: string,
+        readonly enabled: boolean
+    ) {
+        super(tabID)
+    }
+}
+
+export class SendCommandMessage extends UiMessage {
+    override type: GumbyMessageType = 'sendCommandMessage'
+
+    constructor(
+        readonly command: GumbyCommands,
+        tabID: string,
+        readonly eventId: string
+    ) {
+        super(tabID)
+    }
+}
+
+export class UpdatePlaceholderMessage extends UiMessage {
+    readonly newPlaceholder: string
+    override type: GumbyMessageType = 'updatePlaceholderMessage'
+
+    constructor(tabID: string, newPlaceholder: string) {
+        super(tabID)
+        this.newPlaceholder = newPlaceholder
+    }
+}
+
+export class AppToWebViewMessageDispatcher {
+    constructor(private readonly appsToWebViewMessagePublisher: MessagePublisher<any>) {}
+
+    public sendErrorMessage(message: ErrorMessage) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendChatMessage(message: ChatMessage) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendChatPrompt(message: ChatPrompt) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendAsyncEventProgress(message: AsyncEventProgressMessage) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendUpdatePlaceholder(message: UpdatePlaceholderMessage) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendAuthenticationUpdate(message: AuthenticationUpdateMessage) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendAuthNeededExceptionMessage(message: AuthNeededException) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendChatInputEnabled(message: ChatInputEnabledMessage) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendCommandMessage(message: SendCommandMessage) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+}
diff --git a/packages/core/src/amazonqGumby/commands.ts b/packages/core/src/amazonqGumby/commands.ts
new file mode 100644
index 00000000000..46f84a14250
--- /dev/null
+++ b/packages/core/src/amazonqGumby/commands.ts
@@ -0,0 +1,14 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { Commands } from '../shared/vscode/commands2'
+
+export const showTransformationHub = Commands.declare(
+    { id: 'aws.amazonq.showTransformationHub', compositeKey: { 0: 'source' } },
+    () => async (source: string) => {
+        await vscode.commands.executeCommand('workbench.view.extension.aws-codewhisperer-transformation-hub')
+    }
+)
diff --git a/packages/core/src/amazonqGumby/errors.ts b/packages/core/src/amazonqGumby/errors.ts
new file mode 100644
index 00000000000..c77bbcfc4bd
--- /dev/null
+++ b/packages/core/src/amazonqGumby/errors.ts
@@ -0,0 +1,73 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+import { ToolkitError } from '../shared/errors'
+
+export class JavaHomeNotSetError extends ToolkitError {
+    constructor() {
+        super('Java Home Is Not Set', { code: 'JavaHomeNotFound' })
+    }
+}
+
+export class NoOpenProjectsError extends ToolkitError {
+    constructor() {
+        super('No Java projects found since no projects are open', { code: 'NoOpenProjects' })
+    }
+}
+
+export class NoJavaProjectsFoundError extends ToolkitError {
+    constructor() {
+        super('No Java projects found', { code: 'CouldNotFindJavaProject' })
+    }
+}
+
+export class NoMavenJavaProjectsFoundError extends ToolkitError {
+    constructor() {
+        super('No valid Maven build file found', { code: 'CouldNotFindPomXml' })
+    }
+}
+
+export class AlternateDependencyVersionsNotFoundError extends Error {
+    constructor() {
+        super('No available versions for dependency update')
+    }
+}
+
+export class JobStoppedError extends Error {
+    constructor() {
+        super('Job was rejected, stopped, or failed')
+    }
+}
+
+export class TransformationPreBuildError extends Error {
+    constructor() {
+        super('Job failed to build after submission')
+    }
+}
+
+export class ModuleUploadError extends Error {
+    constructor() {
+        super('Failed to upload module to S3')
+    }
+}
+
+export class JobStartError extends Error {
+    constructor() {
+        super('Failed to start job')
+    }
+}
+
+export class PollJobError extends Error {
+    constructor() {
+        super('Poll job failed')
+    }
+}
+
+export class AbsolutePathDetectedError extends Error {
+    constructor(message: string) {
+        super(message)
+    }
+}
diff --git a/packages/core/src/amazonqGumby/index.ts b/packages/core/src/amazonqGumby/index.ts
new file mode 100644
index 00000000000..8c1109f9997
--- /dev/null
+++ b/packages/core/src/amazonqGumby/index.ts
@@ -0,0 +1,13 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export { activate } from './activation'
+export { default as DependencyVersions } from './models/dependencies'
+export { default as MessengerUtils } from './chat/controller/messenger/messengerUtils'
+export { GumbyController } from './chat/controller/controller'
+export { TabsStorage } from '../amazonq/webview/ui/storages/tabsStorage'
+export * as startTransformByQ from '../../src/codewhisperer/commands/startTransformByQ'
+export { setMaven } from '../../src/codewhisperer/service/transformByQ/transformFileHandler'
+export * from './errors'
diff --git a/packages/core/src/amazonqGumby/models/constants.ts b/packages/core/src/amazonqGumby/models/constants.ts
new file mode 100644
index 00000000000..87f9d456690
--- /dev/null
+++ b/packages/core/src/amazonqGumby/models/constants.ts
@@ -0,0 +1,12 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// For uniquely identifiying which chat messages should be routed to Gumby
+export const gumbyChat = 'gumbyChat'
+
+// This sets the tab name
+export const featureName = 'Q - Code Transformation'
+
+export const dependencyNoAvailableVersions = 'no available versions'
diff --git a/packages/core/src/amazonqGumby/models/dependencies.ts b/packages/core/src/amazonqGumby/models/dependencies.ts
new file mode 100644
index 00000000000..b2c109c1360
--- /dev/null
+++ b/packages/core/src/amazonqGumby/models/dependencies.ts
@@ -0,0 +1,29 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export default class DependencyVersions {
+    public readonly latestVersion: string
+    public readonly majorVersions: string[]
+    public readonly minorVersions: string[]
+
+    public readonly currentVersion: string
+
+    public readonly allVersions: Set<string>
+
+    public readonly length: number
+
+    constructor(latestVersion: string, majorVersions: string[], minorVersions: string[], currentVersion: string) {
+        this.latestVersion = latestVersion
+        this.majorVersions = majorVersions.sort()
+        this.minorVersions = minorVersions.sort()
+
+        this.currentVersion = currentVersion
+
+        // Note: Set preserves insertion order
+        this.allVersions = new Set<string>(majorVersions.concat(minorVersions))
+
+        this.length = this.allVersions.size
+    }
+}
diff --git a/packages/core/src/amazonqGumby/telemetry/codeTransformMetadata.ts b/packages/core/src/amazonqGumby/telemetry/codeTransformMetadata.ts
new file mode 100644
index 00000000000..22271a3b96b
--- /dev/null
+++ b/packages/core/src/amazonqGumby/telemetry/codeTransformMetadata.ts
@@ -0,0 +1,49 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { getLogger } from '../../shared/logger/logger'
+
+export const codeTransformMaxMetaDataLength = 65536
+
+export interface ICodeTransformMetaData {
+    dependencyVersionSelected?: string
+    canceledFromChat?: boolean
+    retryCount?: number
+    errorMessage?: string
+}
+type ICodeTransformMetaDataKeys = keyof ICodeTransformMetaData
+
+/**
+ * @description Function to remove keys from the codeTransformMetaData
+ * if the max length is exceeded.
+ * If functionality changes to truncate the field, instead of delete ky, use truncateProps()
+ * or partialClone() utility functions.
+ * @param metaData
+ * @returns Stringified JSON object
+ */
+export function codeTransformMetaDataToJsonString(metaData: ICodeTransformMetaData) {
+    const jsonString = JSON.stringify(metaData)
+
+    if (jsonString.length <= codeTransformMaxMetaDataLength) {
+        return jsonString
+    }
+
+    let currentLength = 0
+    const metaDataCopy = { ...metaData }
+    const objectKeys = Object.keys(metaData) as ICodeTransformMetaDataKeys[]
+    for (const key of objectKeys) {
+        const value = metaData[key]
+        // add 5 for quotes and comma around key-value pairs
+        const elementLength = key.length + JSON.stringify(value).length + 5
+        if (currentLength + elementLength >= codeTransformMaxMetaDataLength) {
+            delete metaDataCopy[key]
+            getLogger().info(`CodeTransformation: codeTransformMetaData key: ${key} is too large)}`)
+        } else {
+            currentLength += elementLength
+        }
+    }
+
+    return JSON.stringify(metaDataCopy)
+}
diff --git a/packages/core/src/amazonqGumby/telemetry/codeTransformTelemetry.ts b/packages/core/src/amazonqGumby/telemetry/codeTransformTelemetry.ts
new file mode 100644
index 00000000000..edcb89bf586
--- /dev/null
+++ b/packages/core/src/amazonqGumby/telemetry/codeTransformTelemetry.ts
@@ -0,0 +1,43 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * This class contains helper methods dedicated to logging metrics specific to
+ * CodeTransform
+ */
+
+import {
+    CodeTransformJavaSourceVersionsAllowed,
+    CodeTransformJavaTargetVersionsAllowed,
+} from '../../shared/telemetry/telemetry'
+import { JDKVersion } from '../../codewhisperer/models/model'
+import globals from '../../shared/extensionGlobals'
+
+export const telemetryUndefined = 'undefined'
+
+export enum CancelActionPositions {
+    ApiError = 'apiError',
+    LoadingPanel = 'loadingPanelStopButton',
+    DevToolsSidePanel = 'devToolsStopButton',
+    BottomHubPanel = 'bottomPanelSideNavButton',
+    Chat = 'qChatPanel',
+}
+
+export const JDKToTelemetryValue = (
+    source?: JDKVersion
+): CodeTransformJavaSourceVersionsAllowed | CodeTransformJavaTargetVersionsAllowed | undefined => {
+    switch (source) {
+        case JDKVersion.JDK8:
+            return 'JDK_1_8'
+        case JDKVersion.JDK11:
+            return 'JDK_11'
+        case JDKVersion.JDK17:
+            return 'JDK_17'
+        case JDKVersion.UNSUPPORTED:
+            return 'Other'
+        default:
+            return undefined
+    }
+}
+
+export const calculateTotalLatency = (startTime: number): number => globals.clock.Date.now() - startTime
diff --git a/packages/core/src/amazonqGumby/telemetry/codeTransformTelemetryState.ts b/packages/core/src/amazonqGumby/telemetry/codeTransformTelemetryState.ts
new file mode 100644
index 00000000000..770845aa717
--- /dev/null
+++ b/packages/core/src/amazonqGumby/telemetry/codeTransformTelemetryState.ts
@@ -0,0 +1,58 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { randomUUID } from '../../shared/crypto'
+import { codeTransformMetaDataToJsonString, ICodeTransformMetaData } from './codeTransformMetadata'
+import globals from '../../shared/extensionGlobals'
+
+interface ICodeTransformTelemetryState {
+    sessionId: string
+    sessionStartTime: number
+    resultStatus: string
+    codeTransformMetadata: ICodeTransformMetaData
+}
+
+export class CodeTransformTelemetryState {
+    mainState: ICodeTransformTelemetryState
+
+    private constructor() {
+        this.mainState = {
+            sessionId: randomUUID(),
+            sessionStartTime: globals.clock.Date.now(),
+            resultStatus: '',
+            codeTransformMetadata: {},
+        }
+    }
+
+    public getSessionId = () => this.mainState.sessionId
+    public getStartTime = () => this.mainState.sessionStartTime
+    public getResultStatus = () => this.mainState.resultStatus
+    public getCodeTransformMetaData = () => this.mainState.codeTransformMetadata
+    public getCodeTransformMetaDataString = () =>
+        codeTransformMetaDataToJsonString(this.mainState.codeTransformMetadata)
+
+    public setSessionId = () => {
+        this.mainState.sessionId = randomUUID()
+    }
+    public setStartTime = () => {
+        this.mainState.sessionStartTime = globals.clock.Date.now()
+    }
+    public setResultStatus = (newValue: string) => {
+        this.mainState.resultStatus = newValue
+    }
+    public setCodeTransformMetaDataField = (updatePartial: Partial<ICodeTransformMetaData>) => {
+        this.mainState.codeTransformMetadata = {
+            ...this.mainState.codeTransformMetadata,
+            ...updatePartial,
+        }
+    }
+    public resetCodeTransformMetaDataField = () => (this.mainState.codeTransformMetadata = {})
+
+    static #instance: CodeTransformTelemetryState
+
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+}
diff --git a/packages/core/src/amazonqScan/chat/session/session.ts b/packages/core/src/amazonqScan/chat/session/session.ts
new file mode 100644
index 00000000000..c50f6291bde
--- /dev/null
+++ b/packages/core/src/amazonqScan/chat/session/session.ts
@@ -0,0 +1,26 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export enum ConversationState {
+    IDLE,
+}
+
+export class Session {
+    // Used to keep track of whether or not the current session is currently authenticating/needs authenticating
+    public isAuthenticating: boolean = false
+
+    // A tab may or may not be currently open
+    public tabID: string | undefined
+
+    public conversationState: ConversationState = ConversationState.IDLE
+
+    public scanUuid: string | undefined
+
+    constructor() {}
+
+    public isTabOpen(): boolean {
+        return this.tabID !== undefined
+    }
+}
diff --git a/packages/core/src/amazonqScan/chat/storages/chatSession.ts b/packages/core/src/amazonqScan/chat/storages/chatSession.ts
new file mode 100644
index 00000000000..4feaca17675
--- /dev/null
+++ b/packages/core/src/amazonqScan/chat/storages/chatSession.ts
@@ -0,0 +1,51 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+import { getLogger } from '../../../shared/logger/logger'
+import { Session } from '../session/session'
+
+export class SessionNotFoundError extends Error {}
+
+export class ChatSessionManager {
+    private static _instance: ChatSessionManager
+    private activeSession: Session | undefined
+
+    constructor() {}
+
+    public static get Instance() {
+        return this._instance || (this._instance = new this())
+    }
+
+    private createSession(): Session {
+        this.activeSession = new Session()
+        return this.activeSession
+    }
+
+    public getSession(): Session {
+        if (this.activeSession === undefined) {
+            return this.createSession()
+        }
+
+        return this.activeSession
+    }
+
+    public setActiveTab(tabID: string): string {
+        getLogger().debug(`Setting active tab: ${tabID}, activeSession: ${this.activeSession}`)
+        if (this.activeSession !== undefined) {
+            this.activeSession.tabID = tabID
+            return tabID
+        }
+        throw new SessionNotFoundError()
+    }
+
+    public removeActiveTab(): void {
+        getLogger().debug(`Removing active tab and deleting activeSession: ${this.activeSession}`)
+        if (this.activeSession !== undefined) {
+            this.activeSession.tabID = undefined
+            this.activeSession = undefined
+        }
+    }
+}
diff --git a/packages/core/src/amazonqScan/connector.ts b/packages/core/src/amazonqScan/connector.ts
new file mode 100644
index 00000000000..1b2e05541ec
--- /dev/null
+++ b/packages/core/src/amazonqScan/connector.ts
@@ -0,0 +1,21 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * TODO:
+ * This file/declaration needs to be moved to packages/amazonq/src/amazonqScan/chat/views/connector/connector
+ * Once the mapping from Q folder to core is configured.
+ */
+
+export type ScanMessageType =
+    | 'authenticationUpdateMessage'
+    | 'authNeededException'
+    | 'chatMessage'
+    | 'chatInputEnabledMessage'
+    | 'sendCommandMessage'
+    | 'updatePlaceholderMessage'
+    | 'updatePromptProgress'
+    | 'chatPrompt'
+    | 'errorMessage'
diff --git a/packages/core/src/amazonqScan/controller.ts b/packages/core/src/amazonqScan/controller.ts
new file mode 100644
index 00000000000..85e0b92cb2d
--- /dev/null
+++ b/packages/core/src/amazonqScan/controller.ts
@@ -0,0 +1,34 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * This class is responsible for responding to UI events by calling
+ * the Scan extension.
+ */
+
+/**
+ * TODO:
+ * This file/declaration needs to be moved to packages/amazonq/src/amazonqScan/chat/controller
+ * Once the mapping from Q folder to core is configured.
+ */
+
+import * as vscode from 'vscode'
+
+// These events can be interactions within the chat,
+// or elsewhere in the IDE
+export interface ScanChatControllerEventEmitters {
+    readonly tabOpened: vscode.EventEmitter<any>
+    readonly tabClosed: vscode.EventEmitter<any>
+    readonly authClicked: vscode.EventEmitter<any>
+    readonly runScan: vscode.EventEmitter<any>
+    readonly formActionClicked: vscode.EventEmitter<any>
+    readonly errorThrown: vscode.EventEmitter<any>
+    readonly showSecurityScan: vscode.EventEmitter<any>
+    readonly scanStopped: vscode.EventEmitter<any>
+    readonly followUpClicked: vscode.EventEmitter<any>
+    readonly scanProgress: vscode.EventEmitter<any>
+    readonly processResponseBodyLinkClick: vscode.EventEmitter<any>
+    readonly fileClicked: vscode.EventEmitter<any>
+    readonly scanCancelled: vscode.EventEmitter<any>
+    readonly processChatItemVotedMessage: vscode.EventEmitter<any>
+}
diff --git a/packages/core/src/amazonqScan/index.ts b/packages/core/src/amazonqScan/index.ts
new file mode 100644
index 00000000000..7e29450c50c
--- /dev/null
+++ b/packages/core/src/amazonqScan/index.ts
@@ -0,0 +1,9 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export { ScanChatControllerEventEmitters } from './controller'
+export { ScanMessageType } from './connector'
+export { ChatSessionManager } from './chat/storages/chatSession'
+export { Session } from './chat/session/session'
diff --git a/packages/core/src/applicationcomposer/activation.ts b/packages/core/src/applicationcomposer/activation.ts
new file mode 100644
index 00000000000..28af3f47d0e
--- /dev/null
+++ b/packages/core/src/applicationcomposer/activation.ts
@@ -0,0 +1,26 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { ApplicationComposerManager } from './webviewManager'
+import { ApplicationComposerCodeLensProvider } from './codeLensProvider'
+import { openTemplateInComposerCommand } from './commands/openTemplateInComposer'
+import { openInComposerDialogCommand } from './commands/openInComposerDialog'
+
+export async function activate(extensionContext: vscode.ExtensionContext): Promise<void> {
+    const visualizationManager = await ApplicationComposerManager.create(extensionContext)
+
+    extensionContext.subscriptions.push(
+        openTemplateInComposerCommand.register(visualizationManager),
+        openInComposerDialogCommand.register(visualizationManager)
+    )
+
+    extensionContext.subscriptions.push(
+        vscode.languages.registerCodeLensProvider(
+            ['yaml', 'json', { scheme: 'file' }],
+            new ApplicationComposerCodeLensProvider()
+        )
+    )
+}
diff --git a/packages/core/src/applicationcomposer/codeLensProvider.ts b/packages/core/src/applicationcomposer/codeLensProvider.ts
new file mode 100644
index 00000000000..844f6ddb9eb
--- /dev/null
+++ b/packages/core/src/applicationcomposer/codeLensProvider.ts
@@ -0,0 +1,44 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import vscode from 'vscode'
+import * as CloudFormation from '../shared/cloudformation/cloudformation'
+import * as nls from 'vscode-nls'
+import { openTemplateInComposerCommand } from './commands/openTemplateInComposer'
+
+const localize = nls.loadMessageBundle()
+
+export class ApplicationComposerCodeLensProvider implements vscode.CodeLensProvider {
+    public async provideCodeLenses(
+        document: vscode.TextDocument,
+        _token: vscode.CancellationToken
+    ): Promise<vscode.CodeLens[]> {
+        const cfnTemplate = CloudFormation.isValidFilename(document.uri)
+            ? await CloudFormation.tryLoad(document.uri)
+            : undefined
+        if (!cfnTemplate?.template) {
+            return []
+        }
+
+        let codeLensLine = 0
+        for (let i = 0; i < document.getText().length; i++) {
+            const line = document.lineAt(i)
+            const lineContents = line.text.substring(line.firstNonWhitespaceCharacterIndex)
+            if (lineContents.length > 0 && !lineContents.startsWith('#')) {
+                codeLensLine = i
+                break
+            }
+        }
+        const resourcesLoc = new vscode.Range(codeLensLine, 0, codeLensLine, 0)
+        const codeLens = openTemplateInComposerCommand.build().asCodeLens(resourcesLoc, {
+            title: localize('AWS.applicationComposer.codeLens.title', 'Visualize with Infrastructure Composer'),
+            tooltip: localize(
+                'AWS.applicationComposer.codeLens.tooltip',
+                'Visually design and build modern applications quickly'
+            ),
+        })
+        return [codeLens]
+    }
+}
diff --git a/packages/core/src/applicationcomposer/commands/openInComposerDialog.ts b/packages/core/src/applicationcomposer/commands/openInComposerDialog.ts
new file mode 100644
index 00000000000..e3e1bc9b746
--- /dev/null
+++ b/packages/core/src/applicationcomposer/commands/openInComposerDialog.ts
@@ -0,0 +1,25 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Commands } from '../../shared/vscode/commands2'
+import { ApplicationComposerManager } from '../webviewManager'
+import vscode from 'vscode'
+
+export const openInComposerDialogCommand = Commands.declare(
+    'aws.openInApplicationComposerDialog',
+    (manager: ApplicationComposerManager) => async () => {
+        const fileUri = await vscode.window.showOpenDialog({
+            filters: {
+                Templates: ['yml', 'yaml', 'json', 'template'],
+            },
+            canSelectFiles: true,
+            canSelectFolders: false,
+            canSelectMany: false,
+        })
+        if (fileUri && fileUri[0]) {
+            return await manager.visualizeTemplate(fileUri[0])
+        }
+    }
+)
diff --git a/packages/core/src/applicationcomposer/commands/openTemplateInComposer.ts b/packages/core/src/applicationcomposer/commands/openTemplateInComposer.ts
new file mode 100644
index 00000000000..351673754c2
--- /dev/null
+++ b/packages/core/src/applicationcomposer/commands/openTemplateInComposer.ts
@@ -0,0 +1,48 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Commands } from '../../shared/vscode/commands2'
+import { ApplicationComposerManager } from '../webviewManager'
+import vscode from 'vscode'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { ToolkitError } from '../../shared/errors'
+import { isTreeNode, TreeNode } from '../../shared/treeview/resourceTreeDataProvider'
+import { SamAppLocation } from '../../awsService/appBuilder/explorer/samProject'
+import { getAmazonqApi } from '../../amazonq/extApi'
+
+export const openTemplateInComposerCommand = Commands.declare(
+    'aws.openInApplicationComposer',
+    (manager: ApplicationComposerManager) => async (arg?: vscode.TextEditor | vscode.Uri | TreeNode) => {
+        let result: vscode.WebviewPanel | undefined
+        await telemetry.appcomposer_openTemplate.run(async (span) => {
+            const amazonqApi = await getAmazonqApi()
+
+            let hasChatAuth = false
+            if (amazonqApi) {
+                const authState = await amazonqApi.authApi.getChatAuthState()
+                hasChatAuth = authState.codewhispererChat === 'connected' || authState.codewhispererChat === 'expired'
+            }
+
+            span.record({
+                hasChatAuth,
+            })
+            let input = undefined
+            if (arg instanceof vscode.Uri) {
+                input = arg
+            } else if (isTreeNode(arg)) {
+                input = ((arg as TreeNode).resource as SamAppLocation).samTemplateUri
+            } else {
+                input = vscode.window.activeTextEditor?.document
+            }
+
+            if (!input) {
+                throw new ToolkitError('No active text editor or document found')
+            }
+
+            result = await manager.visualizeTemplate(input)
+        })
+        return result
+    }
+)
diff --git a/packages/core/src/applicationcomposer/composerWebview.ts b/packages/core/src/applicationcomposer/composerWebview.ts
new file mode 100644
index 00000000000..f43775df3c7
--- /dev/null
+++ b/packages/core/src/applicationcomposer/composerWebview.ts
@@ -0,0 +1,154 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { join } from 'path'
+import * as nls from 'vscode-nls'
+import * as path from 'path'
+import * as vscode from 'vscode'
+import { handleMessage } from './handleMessage'
+import { FileWatchInfo } from './types'
+
+const localize = nls.loadMessageBundle()
+
+export class ApplicationComposer {
+    public readonly documentUri: vscode.Uri
+    public webviewPanel: vscode.WebviewPanel = {} as vscode.WebviewPanel
+    protected readonly disposables: vscode.Disposable[] = []
+    protected isPanelDisposed = false
+    private readonly onVisualizationDisposeEmitter = new vscode.EventEmitter<void>()
+    public workSpacePath: string
+    public defaultTemplatePath: string
+    public defaultTemplateName: string
+
+    private constructor(
+        textDocument: vscode.TextDocument,
+        private getWebviewContent: () => Promise<string>,
+        public fileWatches: Record<string, FileWatchInfo> = {} // fileWatches is used to monitor template file changes and achieve bi-direction sync
+    ) {
+        this.getWebviewContent = getWebviewContent
+        this.documentUri = textDocument.uri
+        this.workSpacePath = path.dirname(textDocument.uri.fsPath)
+        this.defaultTemplatePath = textDocument.uri.fsPath
+        this.defaultTemplateName = path.basename(this.defaultTemplatePath)
+    }
+
+    public static async create(
+        textDocument: vscode.TextDocument,
+        context: vscode.ExtensionContext,
+        getWebviewContent: () => Promise<string>
+    ) {
+        const obj = new ApplicationComposer(textDocument, getWebviewContent)
+        obj.webviewPanel = await obj.setupWebviewPanel(textDocument, context)
+        return obj
+    }
+
+    public get onVisualizationDisposeEvent(): vscode.Event<void> {
+        return this.onVisualizationDisposeEmitter.event
+    }
+
+    public getPanel(): vscode.WebviewPanel | undefined {
+        if (!this.isPanelDisposed) {
+            return this.webviewPanel
+        }
+    }
+
+    public showPanel(): void {
+        this.getPanel()?.reveal()
+    }
+
+    public async refreshPanel(context: vscode.ExtensionContext) {
+        if (!this.isPanelDisposed) {
+            this.webviewPanel.dispose()
+            const document = await vscode.workspace.openTextDocument(this.documentUri)
+            this.webviewPanel = await this.setupWebviewPanel(document, context)
+        }
+    }
+
+    protected getText(textDocument: vscode.TextDocument): string {
+        return textDocument.getText()
+    }
+
+    private async setupWebviewPanel(
+        textDocument: vscode.TextDocument,
+        context: vscode.ExtensionContext
+    ): Promise<vscode.WebviewPanel> {
+        const documentUri = textDocument.uri
+
+        // Create and show panel
+        const panel = this.createVisualizationWebviewPanel(documentUri, context)
+
+        // Set the initial html for the webpage
+        panel.webview.html = await this.getWebviewContent()
+
+        // Handle messages from the webview
+        this.disposables.push(
+            panel.webview.onDidReceiveMessage((message) =>
+                handleMessage(message, {
+                    panel: panel,
+                    textDocument: textDocument,
+                    disposables: this.disposables,
+                    workSpacePath: this.workSpacePath,
+                    defaultTemplatePath: this.defaultTemplatePath,
+                    defaultTemplateName: this.defaultTemplateName,
+                    fileWatches: this.fileWatches,
+                })
+            )
+        )
+
+        // When the panel is closed, dispose of any disposables/remove subscriptions
+        const disposePanel = () => {
+            if (this.isPanelDisposed) {
+                return
+            }
+            this.isPanelDisposed = true
+            this.onVisualizationDisposeEmitter.fire()
+            for (const disposable of this.disposables) {
+                disposable.dispose()
+            }
+            this.onVisualizationDisposeEmitter.dispose()
+        }
+
+        this.disposables.push(
+            panel.onDidDispose(() => {
+                disposePanel()
+            })
+        )
+
+        return panel
+    }
+
+    private createVisualizationWebviewPanel(
+        documentUri: vscode.Uri,
+        context: vscode.ExtensionContext
+    ): vscode.WebviewPanel {
+        const panel = vscode.window.createWebviewPanel(
+            'applicationComposer',
+            localize(
+                'AWS.applicationComposer.title',
+                '{0} (Infrastructure Composer)',
+                path.basename(documentUri.fsPath)
+            ),
+            {
+                preserveFocus: true,
+                viewColumn: vscode.ViewColumn.Active,
+            },
+            {
+                enableScripts: true,
+                localResourceRoots: [],
+                retainContextWhenHidden: true,
+            }
+        )
+        if (vscode.window.activeColorTheme.kind === vscode.ColorThemeKind.Light) {
+            panel.iconPath = vscode.Uri.file(
+                context.asAbsolutePath(join('resources', 'icons', 'aws', 'applicationcomposer', 'icon.svg'))
+            )
+        } else {
+            panel.iconPath = vscode.Uri.file(
+                context.asAbsolutePath(join('resources', 'icons', 'aws', 'applicationcomposer', 'icon-dark.svg'))
+            )
+        }
+        return panel
+    }
+}
diff --git a/packages/core/src/applicationcomposer/constants.ts b/packages/core/src/applicationcomposer/constants.ts
new file mode 100644
index 00000000000..1eb3852ad6a
--- /dev/null
+++ b/packages/core/src/applicationcomposer/constants.ts
@@ -0,0 +1,10 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+const isLocalDev = false
+const localhost = 'http://127.0.0.1:3000'
+const cdn = 'https://ide-toolkits.app-composer.aws.dev'
+
+export { isLocalDev, localhost, cdn }
diff --git a/packages/core/src/applicationcomposer/handleMessage.ts b/packages/core/src/applicationcomposer/handleMessage.ts
new file mode 100644
index 00000000000..d967cb744d0
--- /dev/null
+++ b/packages/core/src/applicationcomposer/handleMessage.ts
@@ -0,0 +1,68 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { loadFileMessageHandler } from './messageHandlers/loadFileMessageHandler'
+import { initMessageHandler } from './messageHandlers/initMessageHandler'
+import {
+    Command,
+    EmitTelemetryMessage,
+    LoadFileRequestMessage,
+    LogMessage,
+    Message,
+    WebviewContext,
+    SaveFileRequestMessage,
+    AddFileWatchRequestMessage,
+    GenerateResourceRequestMessage,
+    MessageType,
+    DeployRequestMessage,
+} from './types'
+import { saveFileMessageHandler } from './messageHandlers/saveFileMessageHandler'
+import { addFileWatchMessageHandler } from './messageHandlers/addFileWatchMessageHandler'
+import { deployMessageHandler } from './messageHandlers/deployMessageHandler'
+import { generateResourceHandler } from './messageHandlers/generateResourceHandler'
+import { logMessageHandler } from './messageHandlers/logMessageHandler'
+import { emitTelemetryMessageHandler } from './messageHandlers/emitTelemetryMessageHandler'
+import { openFeedbackMessageHandler } from './messageHandlers/openFeedbackMessageHandler'
+
+export async function handleMessage(message: unknown, context: WebviewContext) {
+    const composerMessage = message as Message
+
+    const { command, messageType } = composerMessage
+
+    if (messageType === MessageType.REQUEST) {
+        switch (command) {
+            case Command.INIT:
+                void initMessageHandler(context)
+                break
+            case Command.LOAD_FILE:
+                void loadFileMessageHandler(message as LoadFileRequestMessage, context)
+                break
+            case Command.SAVE_FILE:
+                void saveFileMessageHandler(message as SaveFileRequestMessage, context)
+                break
+            case Command.ADD_FILE_WATCH:
+                void addFileWatchMessageHandler(message as AddFileWatchRequestMessage, context)
+                break
+            case Command.DEPLOY:
+                void deployMessageHandler(message as DeployRequestMessage, context)
+                break
+            case Command.GENERATE_RESOURCE:
+                void generateResourceHandler(message as GenerateResourceRequestMessage, context)
+                break
+        }
+    } else if (messageType === MessageType.BROADCAST) {
+        switch (command) {
+            case Command.LOG:
+                logMessageHandler(message as LogMessage)
+                break
+            case Command.EMIT_TELEMETRY:
+                emitTelemetryMessageHandler(message as EmitTelemetryMessage)
+                break
+            case Command.OPEN_FEEDBACK:
+                openFeedbackMessageHandler()
+                break
+        }
+    }
+}
diff --git a/packages/core/src/applicationcomposer/messageHandlers/addFileWatchMessageHandler.ts b/packages/core/src/applicationcomposer/messageHandlers/addFileWatchMessageHandler.ts
new file mode 100644
index 00000000000..d23dabd4d33
--- /dev/null
+++ b/packages/core/src/applicationcomposer/messageHandlers/addFileWatchMessageHandler.ts
@@ -0,0 +1,60 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    AddFileWatchRequestMessage,
+    AddFileWatchResponseMessage,
+    MessageType,
+    FileChangedMessage,
+    Command,
+    WebviewContext,
+} from '../types'
+import vscode from 'vscode'
+
+export async function addFileWatchMessageHandler(request: AddFileWatchRequestMessage, context: WebviewContext) {
+    let addFileWatchResponseMessage: AddFileWatchResponseMessage
+    try {
+        // we only file watch on default template file now
+        if (context.defaultTemplateName !== request.fileName) {
+            throw new Error('file watching is only allowed on default template file')
+        }
+        const filePath = context.defaultTemplatePath
+        const fileName = context.defaultTemplateName
+        const fileWatch = vscode.workspace.createFileSystemWatcher(new vscode.RelativePattern(filePath, '*'))
+        context.disposables.push(fileWatch)
+
+        fileWatch.onDidChange(async () => {
+            const fileContents = (await vscode.workspace.fs.readFile(vscode.Uri.file(filePath))).toString()
+            if (fileContents !== context.fileWatches[filePath].fileContents) {
+                const fileChangedMessage: FileChangedMessage = {
+                    messageType: MessageType.BROADCAST,
+                    command: Command.FILE_CHANGED,
+                    fileName: fileName,
+                    fileContents: fileContents,
+                }
+
+                await context.panel.webview.postMessage(fileChangedMessage)
+                context.fileWatches[filePath] = { fileContents: fileContents }
+            }
+        })
+
+        addFileWatchResponseMessage = {
+            messageType: MessageType.RESPONSE,
+            command: Command.ADD_FILE_WATCH,
+            eventId: request.eventId,
+            isSuccess: true,
+        }
+    } catch (e) {
+        addFileWatchResponseMessage = {
+            messageType: MessageType.RESPONSE,
+            command: Command.ADD_FILE_WATCH,
+            eventId: request.eventId,
+            isSuccess: false,
+            failureReason: (e as Error).message,
+        }
+    }
+
+    await context.panel.webview.postMessage(addFileWatchResponseMessage)
+}
diff --git a/packages/core/src/applicationcomposer/messageHandlers/deployMessageHandler.ts b/packages/core/src/applicationcomposer/messageHandlers/deployMessageHandler.ts
new file mode 100644
index 00000000000..26cd38cafe6
--- /dev/null
+++ b/packages/core/src/applicationcomposer/messageHandlers/deployMessageHandler.ts
@@ -0,0 +1,36 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import vscode from 'vscode'
+import { Command, DeployRequestMessage, DeployResponseMessage, MessageType, WebviewContext } from '../types'
+import { SamSyncResult } from '../../shared/sam/sync'
+import { telemetry } from '../../shared/telemetry/telemetry'
+
+export async function deployMessageHandler(message: DeployRequestMessage, context: WebviewContext) {
+    // SAM already handles success/failure, so we only log that the user clicked the deploy button
+    telemetry.appcomposer_deployClicked.emit({
+        result: 'Succeeded',
+    })
+    const args = context.textDocument.uri
+    /* TODO Rework this command so that a failure case is returned
+     * We don't want to override the SAM Sync telemetry. The SAM telemetry catches all errors,
+     * so we instead check for an undefined response to determine failure. The downside is that
+     * we don't get failure reasons.
+     */
+    const result = (await vscode.commands.executeCommand('aws.samcli.sync', args, false)) as SamSyncResult
+    if (result?.isSuccess) {
+        void vscode.window.showInformationMessage('SAM Sync succeeded!')
+        telemetry.appcomposer_deployCompleted.emit({ result: 'Succeeded' })
+    } else {
+        telemetry.appcomposer_deployCompleted.emit({ result: 'Failed' })
+    }
+    const response: DeployResponseMessage = {
+        command: Command.DEPLOY,
+        messageType: MessageType.RESPONSE,
+        eventId: message.eventId,
+        isSuccess: result?.isSuccess,
+    }
+    await context.panel.webview.postMessage(response)
+}
diff --git a/packages/core/src/applicationcomposer/messageHandlers/emitTelemetryMessageHandler.ts b/packages/core/src/applicationcomposer/messageHandlers/emitTelemetryMessageHandler.ts
new file mode 100644
index 00000000000..8210f126a42
--- /dev/null
+++ b/packages/core/src/applicationcomposer/messageHandlers/emitTelemetryMessageHandler.ts
@@ -0,0 +1,171 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { EmitTelemetryMessage } from '../types'
+import {
+    AppcomposerAddConnection,
+    AppcomposerAddResource,
+    AppcomposerCloseWfs,
+    AppcomposerCustomerReady,
+    AppcomposerFps,
+    AppcomposerGenerateAccepted,
+    AppcomposerGenerateClicked,
+    AppcomposerGenerateRejected,
+    AppcomposerInvalidGeneration,
+    AppcomposerOpenWfs,
+    AppcomposerPostProcess,
+    AppcomposerRegenerateClicked,
+    AppcomposerInitializeProject,
+    telemetry,
+} from '../../shared/telemetry/telemetry'
+import { getLogger } from '../../shared/logger/logger'
+
+export function emitTelemetryMessageHandler(message: EmitTelemetryMessage) {
+    try {
+        const parsedData = message.metadata ? JSON.parse(message.metadata) : {}
+        switch (message.eventType) {
+            case 'GENERATE_CLICKED':
+                sendGenerateClicked(parsedData as AppcomposerGenerateClicked)
+                return
+            case 'REGENERATE_CLICKED':
+                sendRegenerateClicked(parsedData as AppcomposerRegenerateClicked)
+                return
+            case 'GENERATE_ACCEPTED':
+                sendGenerateAccepted(parsedData as AppcomposerGenerateAccepted)
+                return
+            case 'GENERATE_REJECTED':
+                sendGenerateRejected(parsedData as AppcomposerGenerateRejected)
+                return
+            case 'INVALID_GENERATION':
+                sendInvalidGeneration(parsedData as AppcomposerInvalidGeneration)
+                return
+            case 'POST_PROCESS':
+                sendPostProcess(parsedData as AppcomposerPostProcess)
+                return
+            case 'CUSTOMER_READY':
+                sendCustomerReady(parsedData as AppcomposerCustomerReady)
+                return
+            case 'FPS':
+                sendFps(parsedData as AppcomposerFps)
+                return
+            case 'ADD_RESOURCE':
+                sendAddResource(parsedData as AppcomposerAddResource)
+                return
+            case 'ADD_CONNECTION':
+                sendAddConnection(parsedData as AppcomposerAddConnection)
+                return
+            case 'OPEN_WFS':
+                sendOpenWfs(parsedData as AppcomposerOpenWfs)
+                return
+            case 'CLOSE_WFS':
+                sendCloseWfs(parsedData as AppcomposerCloseWfs)
+                return
+            case 'TEMPLATE_OPENED':
+                sendInitializeProject(parsedData as AppcomposerInitializeProject)
+                return
+        }
+    } catch (e) {
+        getLogger().error('Could not log telemetry for App Composer %O', e)
+    }
+}
+
+function sendGenerateClicked(metadata: AppcomposerGenerateClicked) {
+    telemetry.appcomposer_generateClicked.emit({
+        result: metadata.result ?? 'Succeeded',
+        resourceType: metadata.resourceType,
+    })
+}
+
+function sendRegenerateClicked(metadata: AppcomposerRegenerateClicked) {
+    telemetry.appcomposer_regenerateClicked.emit({
+        result: metadata.result ?? 'Succeeded',
+        resourceType: metadata.resourceType,
+    })
+}
+
+function sendGenerateAccepted(metadata: AppcomposerGenerateAccepted) {
+    telemetry.appcomposer_generateAccepted.emit({
+        result: metadata.result ?? 'Succeeded',
+        resourceType: metadata.resourceType,
+        numAttempts: metadata.numAttempts,
+    })
+}
+
+function sendGenerateRejected(metadata: AppcomposerGenerateRejected) {
+    telemetry.appcomposer_generateRejected.emit({
+        result: metadata.result ?? 'Succeeded',
+        resourceType: metadata.resourceType,
+        numAttempts: metadata.numAttempts,
+    })
+}
+
+function sendInvalidGeneration(metadata: AppcomposerInvalidGeneration) {
+    telemetry.appcomposer_invalidGeneration.emit({
+        result: metadata.result ?? 'Succeeded',
+        resourceType: metadata.resourceType,
+        generateFailure: metadata.generateFailure,
+    })
+}
+
+function sendPostProcess(metadata: AppcomposerPostProcess) {
+    telemetry.appcomposer_postProcess.emit({
+        result: metadata.result ?? 'Succeeded',
+        resourceType: metadata.resourceType,
+        pathsScrubbed: metadata.pathsScrubbed,
+    })
+}
+
+function sendCustomerReady(metadata: AppcomposerCustomerReady) {
+    telemetry.appcomposer_customerReady.emit({
+        result: metadata.result ?? 'Succeeded',
+        loadFileTime: metadata.loadFileTime,
+        initializeTime: metadata.initializeTime,
+        saveFileTime: metadata.saveFileTime,
+    })
+}
+
+function sendFps(metadata: AppcomposerFps) {
+    telemetry.appcomposer_fps.emit({
+        result: metadata.result ?? 'Succeeded',
+        fps: metadata.fps,
+    })
+}
+
+function sendAddResource(metadata: AppcomposerAddResource) {
+    telemetry.appcomposer_addResource.emit({
+        result: metadata.result ?? 'Succeeded',
+        resourceType: metadata.resourceType,
+    })
+}
+
+function sendAddConnection(metadata: AppcomposerAddConnection) {
+    telemetry.appcomposer_addConnection.emit({
+        result: metadata.result ?? 'Succeeded',
+        sourceResourceType: metadata.sourceResourceType,
+        sourceFacetType: metadata.sourceFacetType,
+        destResourceType: metadata.destResourceType,
+        destFacetType: metadata.destFacetType,
+    })
+}
+
+function sendOpenWfs(metadata: AppcomposerOpenWfs) {
+    telemetry.appcomposer_openWfs.emit({
+        result: metadata.result ?? 'Succeeded',
+    })
+}
+
+function sendCloseWfs(metadata: AppcomposerCloseWfs) {
+    telemetry.appcomposer_closeWfs.emit({
+        result: metadata.result ?? 'Succeeded',
+        didSave: metadata.didSave,
+    })
+}
+
+function sendInitializeProject(metadata: AppcomposerInitializeProject) {
+    telemetry.appcomposer_initializeProject.emit({
+        resourceCounts: metadata.resourceCounts,
+        totalResourceCount: metadata.totalResourceCount,
+    })
+}
diff --git a/packages/core/src/applicationcomposer/messageHandlers/generateResourceHandler.ts b/packages/core/src/applicationcomposer/messageHandlers/generateResourceHandler.ts
new file mode 100644
index 00000000000..fe31e40ef27
--- /dev/null
+++ b/packages/core/src/applicationcomposer/messageHandlers/generateResourceHandler.ts
@@ -0,0 +1,77 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    GenerateResourceRequestMessage,
+    GenerateResourceResponseMessage,
+    WebviewContext,
+    Command,
+    MessageType,
+} from '../types'
+import { getLogger } from '../../shared/logger/logger'
+import request from '../../shared/request'
+import { isLocalDev, localhost, cdn } from '../constants'
+
+export async function generateResourceHandler(request: GenerateResourceRequestMessage, context: WebviewContext) {
+    try {
+        const { chatResponse, references, metadata, isSuccess } = await fetchExampleResource(request.cfnType)
+
+        const responseMessage: GenerateResourceResponseMessage = {
+            command: Command.GENERATE_RESOURCE,
+            messageType: MessageType.RESPONSE,
+            chatResponse,
+            references,
+            metadata,
+            isSuccess,
+            traceId: request.traceId,
+        }
+        await context.panel.webview.postMessage(responseMessage)
+    } catch (error: any) {
+        getLogger().error(`Error in generateResourceHandler: ${error.message}`, error)
+
+        const responseMessage: GenerateResourceResponseMessage = {
+            command: Command.GENERATE_RESOURCE,
+            messageType: MessageType.RESPONSE,
+            isSuccess: false,
+            errorMessage: error.message,
+            traceId: request.traceId,
+            chatResponse: '',
+            references: [],
+            metadata: {},
+        }
+
+        await context.panel.webview.postMessage(responseMessage)
+    }
+}
+
+async function fetchExampleResource(cfnType: string) {
+    try {
+        const source = isLocalDev ? localhost : cdn
+        const resp = request.fetch('GET', `${source}/examples/${convertCFNType(cfnType)}.json`, {})
+        return {
+            chatResponse: await (await resp.response).text(),
+            references: [],
+            metadata: {},
+            isSuccess: true,
+        }
+    } catch (error: any) {
+        getLogger().debug(`Resource fetch error: ${error.name} - ${error.message}`)
+        if (error.$metadata) {
+            const { requestId, cfId, extendedRequestId } = error.$metadata
+            getLogger().debug('%O', { requestId, cfId, extendedRequestId })
+        }
+
+        throw error
+    }
+}
+
+function convertCFNType(cfnType: string): string {
+    const resourceParts = cfnType.split('::')
+    if (resourceParts.length !== 3) {
+        throw new Error('CFN type did not contain three parts')
+    }
+
+    return resourceParts.join('_')
+}
diff --git a/packages/core/src/applicationcomposer/messageHandlers/initMessageHandler.ts b/packages/core/src/applicationcomposer/messageHandlers/initMessageHandler.ts
new file mode 100644
index 00000000000..0bcca343007
--- /dev/null
+++ b/packages/core/src/applicationcomposer/messageHandlers/initMessageHandler.ts
@@ -0,0 +1,29 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import path from 'path'
+import { InitResponseMessage, MessageType, WebviewContext, Command } from '../types'
+import { getAmazonqApi } from '../../amazonq/extApi'
+
+export async function initMessageHandler(context: WebviewContext) {
+    const filePath = context.defaultTemplatePath
+    const amazonqApi = await getAmazonqApi()
+    let isConnectedToCodeWhisperer = false
+    if (amazonqApi) {
+        const authState = await amazonqApi.authApi.getChatAuthState()
+        isConnectedToCodeWhisperer =
+            authState.codewhispererChat === 'connected' || authState.codewhispererChat === 'expired'
+    }
+
+    const responseMessage: InitResponseMessage = {
+        messageType: MessageType.RESPONSE,
+        command: Command.INIT,
+        templateFileName: path.basename(filePath),
+        templateFilePath: filePath,
+        isConnectedToCodeWhisperer,
+    }
+
+    await context.panel.webview.postMessage(responseMessage)
+}
diff --git a/packages/core/src/applicationcomposer/messageHandlers/loadFileMessageHandler.ts b/packages/core/src/applicationcomposer/messageHandlers/loadFileMessageHandler.ts
new file mode 100644
index 00000000000..ad5e1bbf60b
--- /dev/null
+++ b/packages/core/src/applicationcomposer/messageHandlers/loadFileMessageHandler.ts
@@ -0,0 +1,59 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import path from 'path'
+import { MessageType, LoadFileRequestMessage, LoadFileResponseMessage, Command, WebviewContext } from '../types'
+import vscode from 'vscode'
+
+export async function loadFileMessageHandler(request: LoadFileRequestMessage, context: WebviewContext) {
+    let loadFileResponseMessage: LoadFileResponseMessage
+    try {
+        switch (request.fileName) {
+            case '': {
+                // load default template file when 'fileName' is empty
+                const initFileContents = (
+                    await vscode.workspace.fs.readFile(vscode.Uri.file(context.defaultTemplatePath))
+                ).toString()
+                if (initFileContents === undefined) {
+                    throw new Error(`Cannot read file contents from ${context.defaultTemplatePath}`)
+                }
+                context.fileWatches[context.defaultTemplatePath] = { fileContents: initFileContents }
+                loadFileResponseMessage = {
+                    messageType: MessageType.RESPONSE,
+                    command: Command.LOAD_FILE,
+                    eventId: request.eventId,
+                    fileName: context.defaultTemplateName,
+                    fileContents: initFileContents,
+                    isSuccess: true,
+                }
+                break
+            }
+            default: {
+                const filePath = path.join(context.workSpacePath, request.fileName)
+                const fileContents = (await vscode.workspace.fs.readFile(vscode.Uri.file(filePath))).toString()
+                loadFileResponseMessage = {
+                    messageType: MessageType.RESPONSE,
+                    command: Command.LOAD_FILE,
+                    eventId: request.eventId,
+                    fileName: request.fileName,
+                    fileContents: fileContents,
+                    isSuccess: true,
+                }
+                break
+            }
+        }
+    } catch (e) {
+        loadFileResponseMessage = {
+            messageType: MessageType.RESPONSE,
+            command: Command.LOAD_FILE,
+            eventId: request.eventId,
+            fileName: request.fileName,
+            fileContents: '',
+            isSuccess: false,
+            failureReason: (e as Error).message,
+        }
+    }
+    await context.panel.webview.postMessage(loadFileResponseMessage)
+}
diff --git a/packages/core/src/applicationcomposer/messageHandlers/logMessageHandler.ts b/packages/core/src/applicationcomposer/messageHandlers/logMessageHandler.ts
new file mode 100644
index 00000000000..2565a2b8118
--- /dev/null
+++ b/packages/core/src/applicationcomposer/messageHandlers/logMessageHandler.ts
@@ -0,0 +1,22 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { LogMessage } from '../types'
+import { getLogger } from '../../shared/logger/logger'
+
+export function logMessageHandler(message: LogMessage) {
+    const logger = getLogger()
+    switch (message.logType) {
+        case 'INFO':
+            logger.info(message.logMessage)
+            return
+        case 'WARNING':
+            logger.warn(message.logMessage)
+            return
+        case 'ERROR':
+            logger.error(message.logMessage)
+            return
+    }
+}
diff --git a/packages/core/src/applicationcomposer/messageHandlers/notifyUser.ts b/packages/core/src/applicationcomposer/messageHandlers/notifyUser.ts
new file mode 100644
index 00000000000..4c5a2886810
--- /dev/null
+++ b/packages/core/src/applicationcomposer/messageHandlers/notifyUser.ts
@@ -0,0 +1,13 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export type NotifyUserRequest = {
+    command: 'NOTIFY_USER'
+    notification: any
+    notificationType: 'INFO' | 'WARNING' | 'ERROR'
+}
+export function notifyUser(request: NotifyUserRequest) {
+    // TODO
+}
diff --git a/packages/core/src/applicationcomposer/messageHandlers/openFeedbackMessageHandler.ts b/packages/core/src/applicationcomposer/messageHandlers/openFeedbackMessageHandler.ts
new file mode 100644
index 00000000000..85ddd677c28
--- /dev/null
+++ b/packages/core/src/applicationcomposer/messageHandlers/openFeedbackMessageHandler.ts
@@ -0,0 +1,11 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { submitFeedback } from '../../feedback/vue/submitFeedback'
+import { placeholder } from '../../shared/vscode/commands2'
+
+export function openFeedbackMessageHandler() {
+    void submitFeedback(placeholder, 'Infrastructure Composer')
+}
diff --git a/packages/core/src/applicationcomposer/messageHandlers/saveFileMessageHandler.ts b/packages/core/src/applicationcomposer/messageHandlers/saveFileMessageHandler.ts
new file mode 100644
index 00000000000..e62aefdec9f
--- /dev/null
+++ b/packages/core/src/applicationcomposer/messageHandlers/saveFileMessageHandler.ts
@@ -0,0 +1,44 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import vscode from 'vscode'
+import { SaveFileRequestMessage, SaveFileResponseMessage, WebviewContext, Command, MessageType } from '../types'
+import path from 'path'
+
+export async function saveFileMessageHandler(request: SaveFileRequestMessage, context: WebviewContext) {
+    let saveFileResponseMessage: SaveFileResponseMessage
+    // If filePath is empty, save contents in default template file
+    const filePath =
+        request.filePath === '' ? context.defaultTemplatePath : path.join(context.workSpacePath, request.filePath)
+    try {
+        if (!context.textDocument.isDirty) {
+            const contents = Buffer.from(request.fileContents, 'utf8')
+            context.fileWatches[filePath] = { fileContents: request.fileContents }
+            const uri = vscode.Uri.file(filePath)
+            await vscode.workspace.fs.writeFile(uri, contents)
+            saveFileResponseMessage = {
+                messageType: MessageType.RESPONSE,
+                command: Command.SAVE_FILE,
+                eventId: request.eventId,
+                filePath: filePath,
+                isSuccess: true,
+            }
+        } else {
+            // TODO: If the template file is dirty, do we pop out a warning window?
+            throw new Error(`Cannot save latest contents in ${path.basename(request.filePath)}`)
+        }
+    } catch (e) {
+        saveFileResponseMessage = {
+            messageType: MessageType.RESPONSE,
+            command: Command.SAVE_FILE,
+            eventId: request.eventId,
+            filePath: filePath,
+            isSuccess: false,
+            failureReason: (e as Error).message,
+        }
+    }
+
+    await context.panel.webview.postMessage(saveFileResponseMessage)
+}
diff --git a/packages/core/src/applicationcomposer/types.ts b/packages/core/src/applicationcomposer/types.ts
new file mode 100644
index 00000000000..75d38179e9c
--- /dev/null
+++ b/packages/core/src/applicationcomposer/types.ts
@@ -0,0 +1,162 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+
+export type WebviewContext = {
+    panel: vscode.WebviewPanel
+    textDocument: vscode.TextDocument
+    disposables: vscode.Disposable[]
+    workSpacePath: string
+    defaultTemplatePath: string
+    defaultTemplateName: string
+    fileWatches: Record<string, FileWatchInfo>
+}
+
+export type FileWatchInfo = {
+    fileContents: string
+}
+
+export interface Message {
+    command: Command
+    messageType: MessageType
+}
+
+export enum Command {
+    INIT = 'INIT',
+    LOAD_FILE = 'LOAD_FILE',
+    SAVE_FILE = 'SAVE_FILE',
+    ADD_FILE_WATCH = 'ADD_FILE_WATCH',
+    DEPLOY = 'DEPLOY',
+    FILE_CHANGED = 'FILE_CHANGED',
+    GENERATE_RESOURCE = 'GENERATE_RESOURCE',
+    LOG = 'LOG',
+    EMIT_TELEMETRY = 'EMIT_TELEMETRY',
+    OPEN_FEEDBACK = 'OPEN_FEEDBACK',
+}
+
+export enum MessageType {
+    REQUEST = 'REQUEST',
+    RESPONSE = 'RESPONSE',
+    BROADCAST = 'BROADCAST',
+}
+
+type TelemetryType =
+    | 'GENERATE_CLICKED'
+    | 'REGENERATE_CLICKED'
+    | 'GENERATE_ACCEPTED'
+    | 'GENERATE_REJECTED'
+    | 'INVALID_GENERATION'
+    | 'POST_PROCESS'
+    | 'CUSTOMER_READY'
+    | 'FPS'
+    | 'ADD_RESOURCE'
+    | 'ADD_CONNECTION'
+    | 'OPEN_WFS'
+    | 'CLOSE_WFS'
+    | 'TEMPLATE_OPENED'
+
+export interface InitResponseMessage extends Message {
+    templateFileName: string
+    templateFilePath: string
+    isConnectedToCodeWhisperer: boolean
+}
+
+export interface LoadFileResponseMessage extends Message {
+    eventId: string
+    fileName: string
+    fileContents: string
+    isSuccess: boolean
+    failureReason?: string
+}
+
+export interface SaveFileResponseMessage extends Message {
+    eventId: string
+    filePath: string
+    isSuccess: boolean
+    failureReason?: string
+}
+
+export interface AddFileWatchResponseMessage extends Message {
+    eventId: string
+    isSuccess: boolean
+    failureReason?: string
+}
+
+export interface FileChangedMessage extends Message {
+    fileName: string
+    fileContents: string
+}
+
+export interface DeployRequestMessage extends Message {
+    eventId: string
+}
+
+export interface DeployResponseMessage extends Message {
+    eventId: string
+    isSuccess: boolean
+}
+
+export interface RequestMessage extends Message {
+    command: Command
+}
+
+export interface InitRequestMessage extends Message {
+    eventId?: string
+}
+
+export interface LoadFileRequestMessage extends Message {
+    eventId: string
+    fileName: string
+}
+
+export interface SaveFileRequestMessage extends Message {
+    eventId: string
+    filePath: string
+    fileContents: string
+}
+
+export interface AddFileWatchRequestMessage extends Message {
+    eventId: string
+    fileName: string
+}
+
+export interface NotifyUserRequestMessage extends Message {
+    eventId?: string
+    notification: string
+    notificationType: 'INFO' | 'WARNING' | 'ERROR'
+}
+
+export interface LogMessage extends Message {
+    eventId?: string
+    logMessage: string
+    logType: 'INFO' | 'WARNING' | 'ERROR'
+}
+
+export interface EmitTelemetryMessage extends Message {
+    eventId?: string
+    eventType: TelemetryType
+    metadata?: string
+}
+
+export interface ReferenceDetails {
+    title: string | undefined
+    url: string | undefined
+    snippet?: string
+}
+
+export interface GenerateResourceRequestMessage extends Message {
+    cfnType: string
+    prompt: string
+    traceId: string
+}
+
+export interface GenerateResourceResponseMessage extends Message {
+    chatResponse: string
+    references: ReferenceDetails[]
+    metadata: object
+    isSuccess: boolean
+    errorMessage?: string
+    traceId: string
+}
diff --git a/packages/core/src/applicationcomposer/webviewManager.ts b/packages/core/src/applicationcomposer/webviewManager.ts
new file mode 100644
index 00000000000..92bcbb55593
--- /dev/null
+++ b/packages/core/src/applicationcomposer/webviewManager.ts
@@ -0,0 +1,142 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+import request from '../shared/request'
+import { ApplicationComposer } from './composerWebview'
+import { isLocalDev, localhost, cdn } from './constants'
+import { getLogger } from '../shared/logger/logger'
+
+const localize = nls.loadMessageBundle()
+
+const enabledFeatures = ['ide-only', 'anything-resource', 'sfnV2', 'starling']
+
+export class ApplicationComposerManager {
+    protected readonly name: string = 'ApplicationComposerManager'
+
+    protected readonly managedVisualizations = new Map<string, ApplicationComposer>()
+    protected webviewHtml?: string
+    protected readonly logger = getLogger()
+
+    private constructor(protected extensionContext: vscode.ExtensionContext) {}
+
+    public static async create(extensionContext: vscode.ExtensionContext): Promise<ApplicationComposerManager> {
+        const obj = new ApplicationComposerManager(extensionContext)
+        await obj.fetchWebviewHtml()
+        return obj
+    }
+
+    private async fetchWebviewHtml() {
+        const source = isLocalDev ? localhost : cdn
+        const response = await request.fetch('GET', `${source}/index.html`).response
+        this.webviewHtml = await response.text()
+        for (const visualization of this.managedVisualizations.values()) {
+            await visualization.refreshPanel(this.extensionContext)
+        }
+    }
+
+    private getWebviewContent = async () => {
+        if (!this.webviewHtml) {
+            void this.fetchWebviewHtml()
+            return ''
+        }
+        const htmlFileSplit = this.webviewHtml.split('<head>')
+
+        // Set asset source to CDN
+        const source = isLocalDev ? localhost : cdn
+        const baseTag = '<base href="' + source + '/" >'
+
+        // Set dark mode, locale, and feature flags
+        const locale = vscode.env.language
+        const localeTag = `<meta name="locale" content="${locale}">`
+        const theme = vscode.window.activeColorTheme.kind
+        const isDarkMode = theme === vscode.ColorThemeKind.Dark || theme === vscode.ColorThemeKind.HighContrast
+        const darkModeTag = `<meta name="dark-mode" content="${isDarkMode}">`
+        const featuresTag = `<meta name="feature-flags" content='${JSON.stringify(enabledFeatures)}'>`
+
+        return htmlFileSplit[0] + '<head>' + baseTag + localeTag + darkModeTag + featuresTag + htmlFileSplit[1]
+    }
+
+    public async visualizeTemplate(target: vscode.TextDocument | vscode.Uri): Promise<vscode.WebviewPanel | undefined> {
+        const document = target instanceof vscode.Uri ? await vscode.workspace.openTextDocument(target) : target
+
+        // Attempt to retrieve existing visualization if it exists.
+        const existingVisualization = this.getExistingVisualization(document.uri.fsPath)
+        if (existingVisualization) {
+            existingVisualization.showPanel()
+
+            return existingVisualization.getPanel()
+        }
+
+        // Existing visualization does not exist, construct new visualization
+        try {
+            const newVisualization = await ApplicationComposer.create(
+                document,
+                this.extensionContext,
+                this.getWebviewContent
+            )
+            this.handleNewVisualization(document.uri.fsPath, newVisualization)
+
+            if (vscode.version === '1.91.0') {
+                void vscode.window.showWarningMessage(
+                    localize(
+                        'AWS.applicationComposer.visualisation.warnings.draganddrop',
+                        'This version of Visual Studio Code has a bug preventing normal drag and drop functionality. ' +
+                            'As a temporary workaround, hold the Shift key before releasing a resource onto the visual canvas.'
+                    )
+                )
+            }
+            return newVisualization.getPanel()
+        } catch (err) {
+            this.handleErr(err as Error)
+        }
+    }
+
+    public async createTemplate(): Promise<vscode.WebviewPanel | undefined> {
+        try {
+            const document = await vscode.workspace.openTextDocument({
+                language: 'yaml',
+            })
+            const newVisualization = await ApplicationComposer.create(
+                document,
+                this.extensionContext,
+                this.getWebviewContent
+            )
+            this.handleNewVisualization(document.uri.fsPath, newVisualization)
+
+            return newVisualization.getPanel()
+        } catch (err) {
+            this.handleErr(err as Error)
+        }
+    }
+
+    protected getExistingVisualization(key: string): ApplicationComposer | undefined {
+        return this.managedVisualizations.get(key)
+    }
+
+    protected handleErr(err: Error): void {
+        void vscode.window.showInformationMessage(
+            localize(
+                'AWS.applicationComposer.visualisation.errors.rendering',
+                'There was an error rendering Infrastructure Composer, check logs for details.'
+            )
+        )
+        this.logger.error(`${this.name}: Unable to show App Composer webview: ${err}`)
+    }
+
+    protected handleNewVisualization(key: string, visualization: ApplicationComposer): void {
+        this.managedVisualizations.set(key, visualization)
+
+        const visualizationDisposable = visualization.onVisualizationDisposeEvent(() => {
+            this.managedVisualizations.delete(key)
+        })
+        this.pushToExtensionContextSubscriptions(visualizationDisposable)
+    }
+
+    protected pushToExtensionContextSubscriptions(visualizationDisposable: vscode.Disposable): void {
+        this.extensionContext.subscriptions.push(visualizationDisposable)
+    }
+}
diff --git a/packages/core/src/auth/activation.ts b/packages/core/src/auth/activation.ts
new file mode 100644
index 00000000000..8305610dff7
--- /dev/null
+++ b/packages/core/src/auth/activation.ts
@@ -0,0 +1,44 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { Auth } from './auth'
+import { LoginManager } from './deprecated/loginManager'
+import { fromString } from './providers/credentials'
+import { initializeCredentialsProviderManager } from './utils'
+import { isAmazonQ, isSageMaker } from '../shared/extensionUtilities'
+import { getLogger } from '../shared/logger/logger'
+import { getErrorMsg } from '../shared/errors'
+
+export interface SagemakerCookie {
+    authMode?: 'Sso' | 'Iam'
+}
+
+export async function initialize(loginManager: LoginManager): Promise<void> {
+    if (isAmazonQ() && isSageMaker()) {
+        try {
+            // The command `sagemaker.parseCookies` is registered in VS Code Sagemaker environment.
+            const result = (await vscode.commands.executeCommand('sagemaker.parseCookies')) as SagemakerCookie
+            if (result.authMode !== 'Sso') {
+                initializeCredentialsProviderManager()
+            }
+        } catch (e) {
+            const errMsg = getErrorMsg(e as Error)
+            if (errMsg?.includes("command 'sagemaker.parseCookies' not found")) {
+                getLogger().warn(`Failed to execute command "sagemaker.parseCookies": ${e}`)
+            } else {
+                throw e
+            }
+        }
+    }
+    Auth.instance.onDidChangeActiveConnection(async (conn) => {
+        // This logic needs to be moved to `Auth.useConnection` to correctly record `passive`
+        if (conn?.type === 'iam' && conn.state === 'valid') {
+            await loginManager.login({ passive: true, providerId: fromString(conn.id) })
+        } else {
+            await loginManager.logout()
+        }
+    })
+}
diff --git a/packages/core/src/auth/auth.ts b/packages/core/src/auth/auth.ts
new file mode 100644
index 00000000000..053df50321e
--- /dev/null
+++ b/packages/core/src/auth/auth.ts
@@ -0,0 +1,1185 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../shared/extensionGlobals'
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as vscode from 'vscode'
+import * as localizedText from '../shared/localizedText'
+import { Credentials } from '@aws-sdk/types'
+import { SsoAccessTokenProvider } from './sso/ssoAccessTokenProvider'
+import { Timeout } from '../shared/utilities/timeoutUtils'
+import { errorCode, isAwsError, isNetworkError, ToolkitError, UnknownError } from '../shared/errors'
+import { getCache, getCacheFileWatcher } from './sso/cache'
+import { isNonNullable, Mutable } from '../shared/utilities/tsUtils'
+import { SsoToken, truncateStartUrl } from './sso/model'
+import { SsoClient } from './sso/clients'
+import { getLogger } from '../shared/logger/logger'
+import { CredentialsProviderManager } from './providers/credentialsProviderManager'
+import { asString, CredentialsId, CredentialsProvider, fromString } from './providers/credentials'
+import { keyedDebounce, once } from '../shared/utilities/functionUtils'
+import { CredentialsSettings } from './credentials/utils'
+import {
+    extractDataFromSection,
+    getSectionOrThrow,
+    loadSharedCredentialsSections,
+} from './credentials/sharedCredentials'
+import { getCodeCatalystDevEnvId } from '../shared/vscode/env'
+import { getEnvironmentSpecificMemento } from '../shared/utilities/mementos'
+import { SsoCredentialsProvider } from './providers/ssoCredentialsProvider'
+import { AsyncCollection, toCollection } from '../shared/utilities/asyncCollection'
+import { join, toStream } from '../shared/utilities/collectionUtils'
+import { getConfigFilename } from './credentials/sharedCredentialsFile'
+import { SharedCredentialsKeys, StaticProfile, StaticProfileKeyErrorMessage } from './credentials/types'
+import { TempCredentialProvider } from './providers/tempCredentialsProvider'
+import {
+    Connection,
+    ConnectionManager,
+    IamConnection,
+    IamProfile,
+    LinkedIamProfile,
+    Profile,
+    ProfileMetadata,
+    ProfileStore,
+    SsoConnection,
+    SsoProfile,
+    StatefulConnection,
+    StoredProfile,
+    scopesCodeCatalyst,
+    createBuilderIdProfile,
+    createSsoProfile,
+    hasScopes,
+    loadIamProfilesIntoStore,
+    loadLinkedProfilesIntoStore,
+    scopesSsoAccountAccess,
+    AwsConnection,
+    scopesCodeWhispererCore,
+    ProfileNotFoundError,
+    isSsoConnection,
+} from './connection'
+import { isSageMaker, isCloud9, isAmazonQ } from '../shared/extensionUtilities'
+import { telemetry } from '../shared/telemetry/telemetry'
+import { randomUUID } from '../shared/crypto'
+import { asStringifiedStack } from '../shared/telemetry/spans'
+import { withTelemetryContext } from '../shared/telemetry/util'
+import { DiskCacheError } from '../shared/utilities/cacheUtils'
+import { setContext } from '../shared/vscode/setContext'
+import { builderIdStartUrl, internalStartUrl } from './sso/constants'
+
+interface AuthService {
+    /**
+     * Lists all connections known to the extension.
+     */
+    listConnections(): Promise<Connection[]>
+
+    /**
+     * Creates a new connection using a profile.
+     *
+     * This will fail if the profile does not result in a valid connection.
+     */
+    createConnection(profile: Profile): Promise<Connection>
+
+    /**
+     * Performs _server-side_ logout, and deletes the client-side connection and stateful resources.
+     */
+    deleteConnection(connection: Pick<Connection, 'id'>): void
+
+    /**
+     * Retrieves a connection from an id if it exists.
+     *
+     * A connection id can be persisted and then later used to restore a previous connection.
+     * The caller is expected to handle the case where the connection no longer exists.
+     */
+    getConnection(connection: Pick<Connection, 'id'>): Promise<Connection | undefined>
+
+    /**
+     * Replaces the profile for a connection with a new one.
+     *
+     * **IAM connections are not implemented**
+     */
+    updateConnection(connection: Pick<Connection, 'id'>, profile: Profile): Promise<Connection>
+}
+
+export interface ConnectionStateChangeEvent {
+    readonly id: Connection['id']
+    readonly state: ProfileMetadata['connectionState']
+}
+
+export type DeletedConnection = { connId: Connection['id']; storedProfile?: StoredProfile }
+type DeclaredConnection = Pick<SsoProfile, 'ssoRegion' | 'startUrl'> & { source: string }
+
+// Must be declared outside of class for use by decorator
+const authClassName = 'Auth'
+
+export class Auth implements AuthService, ConnectionManager {
+    readonly #ssoCache = getCache()
+    readonly #ssoCacheWatcher = getCacheFileWatcher()
+    readonly #validationErrors = new Map<Connection['id'], Error>()
+    readonly #invalidCredentialsTimeouts = new Map<Connection['id'], Timeout>()
+    readonly #onDidChangeActiveConnection = new vscode.EventEmitter<StatefulConnection | undefined>()
+    readonly #onDidChangeConnectionState = new vscode.EventEmitter<ConnectionStateChangeEvent>()
+    readonly #onDidUpdateConnection = new vscode.EventEmitter<StatefulConnection>()
+    readonly #onDidDeleteConnection = new vscode.EventEmitter<DeletedConnection>()
+    public readonly onDidChangeActiveConnection = this.#onDidChangeActiveConnection.event
+    public readonly onDidChangeConnectionState = this.#onDidChangeConnectionState.event
+    public readonly onDidUpdateConnection = this.#onDidUpdateConnection.event
+    /** Fired when a connection and its metadata has been completely deleted */
+    public readonly onDidDeleteConnection = this.#onDidDeleteConnection.event
+
+    public constructor(
+        private readonly store: ProfileStore,
+        private readonly iamProfileProvider = CredentialsProviderManager.getInstance(),
+        private readonly createSsoClient = SsoClient.create.bind(SsoClient),
+        private readonly createSsoTokenProvider = SsoAccessTokenProvider.create.bind(SsoAccessTokenProvider)
+    ) {}
+
+    #activeConnection: Mutable<StatefulConnection> | undefined
+    public get activeConnection(): StatefulConnection | undefined {
+        return this.#activeConnection
+    }
+
+    public get hasConnections() {
+        return this.store.listProfiles().length !== 0
+    }
+
+    public get cacheWatcher() {
+        return this.#ssoCacheWatcher
+    }
+
+    public get startUrl(): string | undefined {
+        return isSsoConnection(this.activeConnection)
+            ? this.normalizeStartUrl(this.activeConnection.startUrl)
+            : undefined
+    }
+
+    public isConnected(): boolean {
+        return this.activeConnection !== undefined
+    }
+
+    /**
+     * Normalizes the provided URL
+     *
+     *  Any trailing '/' and `#` is removed from the URL
+     *  e.g. https://view.awsapps.com/start/# will become https://view.awsapps.com/start
+     */
+    public normalizeStartUrl(startUrl: string | undefined) {
+        return !startUrl ? undefined : startUrl.replace(/[\/#]+$/g, '')
+    }
+
+    public isInternalAmazonUser(): boolean {
+        return this.isConnected() && this.startUrl === internalStartUrl
+    }
+
+    /**
+     * Map startUrl -> declared connections
+     */
+    private readonly _declaredConnections: { [key: string]: DeclaredConnection } = {}
+    public get declaredConnections() {
+        return Object.values(this._declaredConnections)
+    }
+
+    public getCurrentProfileId() {
+        return this.store.getCurrentProfileId()
+    }
+
+    @withTelemetryContext({ name: 'restorePreviousSession', class: authClassName })
+    public async restorePreviousSession(): Promise<Connection | undefined> {
+        const id = this.store.getCurrentProfileId()
+        if (id === undefined) {
+            return
+        }
+
+        try {
+            return await this.useConnection({ id })
+        } catch (err) {
+            getLogger().warn(`auth: failed to restore previous session: %s`, err)
+        }
+    }
+
+    public async reauthenticate({ id }: Pick<SsoConnection, 'id'>, invalidate?: boolean): Promise<SsoConnection>
+    public async reauthenticate({ id }: Pick<IamConnection, 'id'>, invalidate?: boolean): Promise<IamConnection>
+    @withTelemetryContext({ name: 'reauthenticate', class: authClassName })
+    public async reauthenticate({ id }: Pick<Connection, 'id'>, invalidate?: boolean): Promise<Connection> {
+        const shouldInvalidate = invalidate ?? true
+        const profile = this.store.getProfileOrThrow(id)
+        if (profile.type === 'sso') {
+            const provider = this.getSsoTokenProvider(id, profile)
+            await this.authenticate(id, () => provider.createToken({ isReAuth: true }), shouldInvalidate)
+
+            return this.getSsoConnection(id, profile)
+        } else {
+            const provider = await this.getCredentialsProvider(id, profile)
+            await this.authenticate(id, () => this.createCachedCredentials(provider), shouldInvalidate)
+
+            return await this.getIamConnection(id, profile)
+        }
+    }
+
+    /**
+     * Gets the SSO access token for a connection
+     * @param connection The SSO connection to get the token for
+     * @returns Promise resolving to the access token string
+     */
+    @withTelemetryContext({ name: 'getSsoAccessToken', class: authClassName })
+    public async getSsoAccessToken(connection: Pick<SsoConnection, 'id'>): Promise<string> {
+        const profile = this.store.getProfileOrThrow(connection.id)
+
+        if (profile.type !== 'sso') {
+            throw new Error(`Connection ${connection.id} is not an SSO connection`)
+        }
+
+        const provider = this.getSsoTokenProvider(connection.id, profile)
+        // Calling existing getToken private method - It will handle setting the connection state etc.
+        const token = await this._getToken(connection.id, provider)
+
+        if (!token?.accessToken) {
+            throw new Error(`No access token available for connection ${connection.id}`)
+        }
+
+        return token.accessToken
+    }
+
+    public async useConnection({ id }: Pick<SsoConnection, 'id'>): Promise<SsoConnection>
+    public async useConnection({ id }: Pick<IamConnection, 'id'>): Promise<IamConnection>
+    @withTelemetryContext({ name: 'useConnection', class: authClassName })
+    public async useConnection({ id }: Pick<Connection, 'id'>): Promise<Connection> {
+        await this.refreshConnectionState({ id })
+
+        const profile = this.store.getProfile(id)
+        if (profile === undefined) {
+            throw new Error(`Connection does not exist: ${id}`)
+        }
+        const conn =
+            profile.type === 'sso' ? this.getSsoConnection(id, profile) : await this.getIamConnection(id, profile)
+
+        this.#activeConnection = conn
+        this.#onDidChangeActiveConnection.fire(conn)
+        await this.store.setCurrentProfileId(id)
+
+        await setContext('aws.isInternalUser', this.isInternalAmazonUser())
+
+        return conn
+    }
+
+    @withTelemetryContext({ name: 'logout', class: authClassName })
+    public async logout(): Promise<void> {
+        if (this.activeConnection === undefined) {
+            return
+        }
+        getLogger().info(`auth: logout`)
+        await this.store.setCurrentProfileId(undefined)
+        await this.invalidateConnection(this.activeConnection.id)
+        this.#activeConnection = undefined
+        this.#onDidChangeActiveConnection.fire(undefined)
+    }
+
+    @withTelemetryContext({ name: 'listConnections', class: authClassName })
+    public async listConnections(): Promise<Connection[]> {
+        await loadIamProfilesIntoStore(this.store, this.iamProfileProvider)
+
+        const connections = await Promise.all(
+            this.store.listProfiles().map((entry) => this.getConnectionFromStoreEntry(entry))
+        )
+
+        return connections
+    }
+
+    /**
+     * Gathers all local profiles plus any AWS accounts/roles associated with SSO ("IAM Identity
+     * Center", "IdC") connections.
+     *
+     * Use {@link Auth.listConnections} to avoid API calls to the SSO service.
+     */
+    @withTelemetryContext({ name: 'listAndTraverseConnections', class: authClassName })
+    public listAndTraverseConnections(): AsyncCollection<Connection> {
+        async function* load(this: Auth) {
+            await loadIamProfilesIntoStore(this.store, this.iamProfileProvider)
+
+            const stream = toStream(this.store.listProfiles().map((entry) => this.getConnectionFromStoreEntry(entry)))
+
+            /** Decides if SSO service should be queried for "linked" IAM roles/credentials for the given SSO connection. */
+            const isLinkable = (
+                entry: [string, StoredProfile<Profile>]
+            ): entry is [string, StoredProfile<SsoProfile>] => {
+                const r =
+                    entry[1].type === 'sso' &&
+                    hasScopes(entry[1], scopesSsoAccountAccess) &&
+                    entry[1].metadata.connectionState === 'valid'
+                return r
+            }
+
+            const linked = this.store
+                .listProfiles()
+                .filter(isLinkable)
+                .map(([id, profile]) => {
+                    return toCollection(() =>
+                        loadLinkedProfilesIntoStore(
+                            this.store,
+                            id,
+                            profile,
+                            this.createSsoClient(profile.ssoRegion, this.getSsoTokenProvider(id, profile))
+                        )
+                    )
+                        .catch((err) => {
+                            getLogger().warn(`auth: failed to load linked profiles from "${id}": %s`, err)
+                        })
+                        .filter(isNonNullable)
+                        .map((entry) => this.getConnectionFromStoreEntry(entry))
+                })
+
+            yield* linked.reduce(join, stream)
+        }
+
+        return toCollection(load.bind(this))
+    }
+
+    public async createConnection(profile: SsoProfile): Promise<SsoConnection>
+    @withTelemetryContext({ name: 'createConnection', class: authClassName })
+    public async createConnection(profile: Profile): Promise<Connection> {
+        if (profile.type === 'iam') {
+            throw new Error('Creating IAM connections is not supported')
+        }
+
+        const id = randomUUID()
+        void this.updateConnectionState(id, 'authenticating')
+
+        const tokenProvider = this.getSsoTokenProvider(id, {
+            ...profile,
+            metadata: { connectionState: 'unauthenticated' },
+        })
+
+        try {
+            ;(await tokenProvider.getToken()) ?? (await tokenProvider.createToken())
+            const storedProfile = await this.store.addProfile(id, profile)
+            await this.updateConnectionState(id, 'valid')
+
+            return this.getSsoConnection(id, storedProfile)
+        } catch (err) {
+            await this.store.deleteProfile(id)
+            throw err
+        }
+    }
+
+    @withTelemetryContext({ name: 'deleteConnection', class: authClassName })
+    public async deleteConnection(connection: Pick<Connection, 'id'>): Promise<void> {
+        const connId = connection.id
+        const profile = this.store.getProfile(connId)
+
+        // it is possible the connection was already deleted
+        // but was still requested to be deleted. We pretend
+        // we deleted it and continue as normal
+        if (profile) {
+            if (connId === this.#activeConnection?.id) {
+                // Server-side invalidation.
+                await this.logout()
+            } else {
+                await this.invalidateConnection(connId)
+            }
+
+            await this.store.deleteProfile(connId)
+
+            if (profile.type === 'sso') {
+                // There may have been linked IAM credentials attached to this
+                // so we will want to clear them.
+                await this.clearStaleLinkedIamConnections()
+            }
+        }
+
+        this.#onDidDeleteConnection.fire({ connId, storedProfile: profile })
+    }
+
+    /**
+     * @warning Intended for a specific use case. May have unintended side effects. Use `deleteConnection()` instead.
+     *
+     * Forget about a connection without logging out, invalidating it, or deleting it from disk.
+     */
+    @withTelemetryContext({ name: 'forgetConnection', class: authClassName })
+    public async forgetConnection(connection: Pick<Connection, 'id'>): Promise<void> {
+        const connId = connection.id
+        const profile = this.store.getProfile(connId)
+        if (profile) {
+            await this.store.deleteProfile(connId)
+            if (profile.type === 'sso') {
+                await this.clearStaleLinkedIamConnections()
+            }
+        }
+        this.#onDidDeleteConnection.fire({ connId, storedProfile: profile })
+        await setContext('aws.isInternalUser', false)
+    }
+
+    @withTelemetryContext({ name: 'clearStaleLinkedIamConnections', class: authClassName })
+    private async clearStaleLinkedIamConnections() {
+        // Updates our store, evicting stale IAM credential profiles if the
+        // SSO they are linked to was removed.
+        await loadIamProfilesIntoStore(this.store, this.iamProfileProvider)
+
+        // If we were using a IAM credential linked to the SSO it can exist as the
+        // active connection but was deleted everywhere else. So we check and clear if needed.
+        if (this.#activeConnection && this.store.getProfile(this.#activeConnection.id) === undefined) {
+            this.#activeConnection = undefined
+            this.#onDidChangeActiveConnection.fire(undefined)
+        }
+    }
+
+    /**
+     * @warning Only intended for Dev mode purposes.
+     *
+     * Put the SSO connection in to an expired state
+     */
+    @withTelemetryContext({ name: 'expireConnection', class: authClassName })
+    public async expireConnection(conn: Pick<SsoConnection, 'id'>): Promise<void> {
+        getLogger().info(`auth: Expiring connection ${conn.id}`)
+        const profile = this.store.getProfileOrThrow(conn.id)
+        if (profile.type === 'iam') {
+            throw new ToolkitError('Auth: Cannot force expire an IAM connection')
+        }
+        const provider = this.getSsoTokenProvider(conn.id, profile)
+        await provider.invalidate('devModeManualExpiration')
+        // updates the state of the connection
+        await this.refreshConnectionState(conn)
+        await setContext('aws.isInternalUser', false)
+    }
+
+    public async getConnection(connection: Pick<Connection, 'id'>): Promise<Connection | undefined> {
+        const connections = await this.listConnections()
+
+        return connections.find((c) => c.id === connection.id)
+    }
+
+    /**
+     * Sets the given connection as valid or invalid.
+     * You must retrieve the updated state separately using {@link Auth.getConnectionState()}
+     *
+     * Alternatively you can use the `getToken()` call on an SSO connection to do the same thing,
+     * but it will additionally prompt for reauthentication if the connection is invalid.
+     */
+    @withTelemetryContext({ name: 'refreshConnectionState', class: authClassName })
+    public async refreshConnectionState(connection?: Pick<Connection, 'id'>): Promise<undefined> {
+        if (connection === undefined) {
+            return
+        }
+
+        const profile = this.store.getProfile(connection.id)
+        if (profile === undefined) {
+            return
+        }
+
+        await this.validateConnection(connection.id, profile)
+    }
+
+    public async updateConnection(
+        connection: Pick<SsoConnection, 'id'>,
+        profile: SsoProfile,
+        invalidate?: boolean
+    ): Promise<SsoConnection>
+    @withTelemetryContext({ name: 'updateConnection', class: authClassName })
+    public async updateConnection(
+        connection: Pick<Connection, 'id'>,
+        profile: Profile,
+        invalidate?: boolean
+    ): Promise<Connection> {
+        getLogger().info(`auth: Updating connection ${connection.id}`)
+        if (profile.type === 'iam') {
+            throw new Error('Updating IAM connections is not supported')
+        }
+
+        if (invalidate ?? false) {
+            await this.invalidateConnection(connection.id, { skipGlobalLogout: true })
+        }
+
+        const newProfile = await this.store.updateProfile(connection.id, profile)
+        const updatedConn = this.getSsoConnection(connection.id, newProfile as StoredProfile<SsoProfile>)
+        if (this.activeConnection?.id === updatedConn.id) {
+            this.#activeConnection = updatedConn
+            this.#onDidChangeActiveConnection.fire(this.#activeConnection)
+        }
+        this.#onDidUpdateConnection.fire(updatedConn)
+
+        return updatedConn
+    }
+
+    public getConnectionState(connection: Pick<Connection, 'id'>): StatefulConnection['state'] | undefined {
+        return this.store.getProfile(connection.id)?.metadata.connectionState
+    }
+
+    public getConnectionSource(connection: Pick<Connection, 'id'>): 'amazonq' | 'toolkit' | undefined {
+        return this.store.getProfile(connection.id)?.metadata.source
+    }
+
+    public getInvalidationReason(connection: Pick<Connection, 'id'>): Error | undefined {
+        return this.#validationErrors.get(connection.id)
+    }
+
+    /**
+     * Authenticates the given data and returns error info if it fails.
+     *
+     * @returns undefined if authentication succeeds, otherwise object with error info
+     */
+    @withTelemetryContext({ name: 'authenticateData', class: authClassName })
+    public async authenticateData(data: StaticProfile): Promise<StaticProfileKeyErrorMessage | undefined> {
+        const tempId = await this.addTempCredential(data)
+        const tempIdString = asString(tempId)
+        try {
+            await this.reauthenticate({ id: tempIdString })
+        } catch (e) {
+            if (isAwsError(e)) {
+                if (e.code === 'InvalidClientTokenId') {
+                    return { key: SharedCredentialsKeys.AWS_ACCESS_KEY_ID, error: 'Invalid access key' }
+                } else if (e.code === 'SignatureDoesNotMatch') {
+                    return { key: SharedCredentialsKeys.AWS_SECRET_ACCESS_KEY, error: 'Invalid secret key' }
+                }
+            }
+            throw e
+        } finally {
+            await this.removeTempCredential(tempId)
+        }
+        return undefined
+    }
+
+    private async addTempCredential(data: StaticProfile): Promise<CredentialsId> {
+        const tempProvider = new TempCredentialProvider(data)
+        this.iamProfileProvider.addProvider(tempProvider)
+        await this.thrownOnConn(tempProvider.getCredentialsId(), 'not-exists')
+        return tempProvider.getCredentialsId()
+    }
+    private async removeTempCredential(id: CredentialsId) {
+        this.iamProfileProvider.removeProvider(id)
+        await this.thrownOnConn(id, 'exists')
+    }
+
+    private async thrownOnConn(id: CredentialsId, throwOn: 'exists' | 'not-exists') {
+        const idAsString = asString(id)
+        const conns = await this.listConnections() // triggers loading of profile in to store
+        const connExists = conns.some((conn) => conn.id === idAsString)
+
+        if (throwOn === 'exists' && connExists) {
+            throw new ToolkitError(`Conn should not exist: ${idAsString}`)
+        } else if (throwOn === 'not-exists' && !connExists) {
+            throw new ToolkitError(`Conn should exist: ${idAsString}`)
+        }
+    }
+
+    /**
+     * Attempts to remove all auth state related to the connection.
+     *
+     * For SSO, this involves an API call to clear server-side state. The call happens
+     * before the local token(s) are cleared as they are needed in the request.
+     */
+    @withTelemetryContext({ name: 'invalidateConnection', class: authClassName })
+    private async invalidateConnection(id: Connection['id'], opt?: { skipGlobalLogout?: boolean }) {
+        getLogger().info(`auth: Invalidating connection: ${id}`)
+        const profile = this.store.getProfileOrThrow(id)
+
+        if (profile.type === 'sso') {
+            const provider = this.getSsoTokenProvider(id, profile)
+            const client = this.createSsoClient(profile.ssoRegion, provider)
+
+            if (opt?.skipGlobalLogout !== true) {
+                await client.logout().catch((err) => {
+                    const name = profile.metadata.label ?? id
+                    getLogger().warn(`auth: failed to logout of connection "${name}": %s`, err)
+                })
+            }
+
+            // XXX: never drop tokens in a dev environment, unless you are Amazon Q!
+            if (getCodeCatalystDevEnvId() === undefined || isAmazonQ()) {
+                // TODO: Require invalidateConnection() to require a reason and then pass it in to the following instead
+                await provider.invalidate('explicitInvalidation')
+            }
+        } else if (profile.type === 'iam') {
+            globals.loginManager.store.invalidateCredentials(fromString(id))
+        }
+
+        await this.updateConnectionState(id, 'invalid')
+    }
+
+    @withTelemetryContext({ name: 'updateConnectionState', class: authClassName })
+    private async updateConnectionState(id: Connection['id'], connectionState: ProfileMetadata['connectionState']) {
+        getLogger().info(`auth: Updating connection state of ${id} to ${connectionState}`)
+
+        if (connectionState === 'authenticating') {
+            this.#onDidChangeConnectionState.fire({ id, state: connectionState })
+            return
+        }
+
+        const oldProfile = this.store.getProfileOrThrow(id)
+        if (oldProfile.metadata.connectionState === connectionState) {
+            // new state is same as old state, no need to do anything
+            return oldProfile
+        }
+
+        // Emit an event for when the connection changes state. This the the root of the
+        // state change. We rely on functions higher in the stack to have added their contexts
+        // so this event has useful information in the `source` field.
+        return telemetry.auth_modifyConnection.run(async (span) => {
+            // if we have an Sso session that became invalid, we will add its session duration to the event
+            const ssoSessionDuration =
+                connectionState === 'invalid' && oldProfile.type === 'sso'
+                    ? this.getSsoTokenProvider(id, oldProfile).getSessionDuration()
+                    : undefined
+            span.record({
+                action: 'updateConnectionState',
+                id,
+                connectionState,
+                source: asStringifiedStack(telemetry.getFunctionStack()),
+                credentialStartUrl: oldProfile.type === 'sso' ? oldProfile.startUrl : undefined,
+                sessionDuration: ssoSessionDuration,
+            })
+
+            const profile = await this.store.updateMetadata(id, { connectionState })
+            if (connectionState !== 'invalid') {
+                this.#validationErrors.delete(id)
+                this.#invalidCredentialsTimeouts.get(id)?.dispose()
+            }
+
+            if (this.#activeConnection?.id === id) {
+                this.#activeConnection.state = connectionState
+                this.#onDidChangeActiveConnection.fire(this.#activeConnection)
+            }
+            this.#onDidChangeConnectionState.fire({ id, state: connectionState })
+
+            return profile
+        })
+    }
+
+    /**
+     * Updates the state of the connection based on a series of validations.
+     * Will throw for network errors encoutered during connection checks, but the state will not be
+     * invalidated for these errors.
+     */
+    @withTelemetryContext({ name: 'validateConnection', class: authClassName })
+    private async validateConnection<T extends Profile>(id: Connection['id'], profile: StoredProfile<T>) {
+        const runCheck = async () => {
+            if (profile.type === 'sso') {
+                const provider = this.getSsoTokenProvider(id, profile)
+                if ((await provider.getToken()) === undefined) {
+                    getLogger().info(`auth: Connection is not valid: ${id} `)
+                    return this.updateConnectionState(id, 'invalid')
+                } else {
+                    getLogger().info(`auth: Connection is valid: ${id} `)
+                    return this.updateConnectionState(id, 'valid')
+                }
+            } else {
+                if (profile.subtype === 'linked') {
+                    const sourceProfile = this.store.getProfileOrThrow(profile.ssoSession)
+                    if (sourceProfile.type !== 'sso') {
+                        throw new Error('Linked profiles must use an SSO connection')
+                    }
+                    const validatedSource = await this.validateConnection(profile.ssoSession, sourceProfile)
+                    if (validatedSource?.metadata.connectionState !== 'valid') {
+                        return this.updateConnectionState(id, 'invalid')
+                    }
+                }
+
+                const provider = await this.getCredentialsProvider(id, profile)
+                const credentials = await this.getCachedCredentials(provider)
+                if (credentials !== undefined) {
+                    return this.updateConnectionState(id, 'valid')
+                } else if ((await provider.canAutoConnect()) === true) {
+                    await this.authenticate(id, () => this.createCachedCredentials(provider))
+
+                    return this.store.getProfileOrThrow(id)
+                } else {
+                    return this.updateConnectionState(id, 'invalid')
+                }
+            }
+        }
+
+        return runCheck().catch(async (err) => {
+            await this.handleSsoTokenError(id, err) // may throw without setting state to invalid - this is intended.
+            await this.updateConnectionState(id, 'invalid')
+        })
+    }
+
+    private async handleSsoTokenError(id: Connection['id'], err: unknown) {
+        this.throwOnRecoverableError(err)
+
+        this.#validationErrors.set(id, UnknownError.cast(err))
+        getLogger().info(`auth: Handling validation error of connection: ${id}`)
+    }
+
+    private async getConnectionFromStoreEntry([id, profile]: readonly [Connection['id'], StoredProfile<Profile>]) {
+        if (profile.type === 'sso') {
+            return this.getSsoConnection(id, profile)
+        } else {
+            return await this.getIamConnection(id, profile)
+        }
+    }
+
+    private async getCredentialsProvider(id: Connection['id'], profile: StoredProfile<IamProfile>) {
+        if (profile.subtype === 'unknown' || !profile.subtype) {
+            const provider = await this.iamProfileProvider.getCredentialsProvider(fromString(id))
+            if (provider === undefined) {
+                throw new Error(`Credentials provider "${id}" not found`)
+            }
+
+            return provider
+        }
+
+        return this.getSsoLinkedCredentialsProvider(id, profile)
+    }
+
+    private getSsoLinkedCredentialsProvider(id: Connection['id'], profile: LinkedIamProfile) {
+        const sourceProfile = this.store.getProfile(profile.ssoSession)
+        if (sourceProfile === undefined) {
+            throw new Error(`Source profile for "${id}" no longer exists`)
+        }
+        if (sourceProfile.type !== 'sso') {
+            throw new Error(`Source profile for "${id}" is not an SSO profile`)
+        }
+
+        const tokenProvider = this.getSsoTokenProvider(profile.ssoSession, sourceProfile)
+        const credentialsProvider = new SsoCredentialsProvider(
+            fromString(id),
+            this.createSsoClient(sourceProfile.ssoRegion, tokenProvider),
+            tokenProvider,
+            profile.ssoAccountId,
+            profile.ssoRoleName
+        )
+
+        this.iamProfileProvider.addProvider(credentialsProvider)
+
+        return credentialsProvider
+    }
+
+    // XXX: always read from the same location in a dev environment
+    // This detection is fuzzy if an sso-session section exists for any other reason.
+    private detectSsoSessionNameForCodeCatalyst = once((): string => {
+        try {
+            const configFile = getConfigFilename()
+            // `require('fs')` is workaround for web mode:
+            const contents: string = require('fs').readFileSync(configFile, 'utf-8')
+            const identifier = contents.match(/\[sso\-session (.*)\]/)?.[1]
+            if (!identifier) {
+                throw new ToolkitError('No sso-session name found in ~/.aws/config', { code: 'NoSsoSessionName' })
+            }
+
+            return identifier
+        } catch (err) {
+            const identifier = 'codecatalyst'
+            getLogger().warn(`auth: unable to get an sso session name, defaulting to "${identifier}": %s`, err)
+            return identifier
+        }
+    })
+
+    private createCodeCatalystDevEnvProfile = async (): Promise<[id: string, profile: SsoProfile]> => {
+        const identifier = this.detectSsoSessionNameForCodeCatalyst()
+
+        const { sections } = await loadSharedCredentialsSections()
+        const { sso_region: region, sso_start_url: startUrl } = extractDataFromSection(
+            getSectionOrThrow(sections, identifier, 'sso-session')
+        )
+
+        if ([region, startUrl].some((prop) => typeof prop !== 'string')) {
+            throw new ToolkitError('sso-session data missing in ~/.aws/config', { code: 'NoSsoSession' })
+        }
+
+        return startUrl === builderIdStartUrl
+            ? [identifier, createBuilderIdProfile(scopesCodeCatalyst)]
+            : [identifier, createSsoProfile(startUrl, region, scopesCodeCatalyst)]
+    }
+
+    private getSsoTokenProvider(id: Connection['id'], profile: StoredProfile<SsoProfile>) {
+        // XXX: Use the token created by Dev Environments if and only if the profile is strictly
+        // for CodeCatalyst, as indicated by its set of scopes. A consequence of these semantics is
+        // that any profile will be coerced to use this token if that profile exclusively contains
+        // CodeCatalyst scopes. Similarly, if additional scopes are added to a profile, the profile
+        // no longer matches this condition.
+        const shouldUseSoftwareStatement =
+            getCodeCatalystDevEnvId() !== undefined &&
+            profile.scopes?.every((scope) => scopesCodeCatalyst.includes(scope))
+
+        const tokenIdentifier = shouldUseSoftwareStatement ? this.detectSsoSessionNameForCodeCatalyst() : id
+
+        return this.createSsoTokenProvider(
+            {
+                identifier: tokenIdentifier,
+                startUrl: profile.startUrl,
+                scopes: profile.scopes,
+                region: profile.ssoRegion,
+            },
+            this.#ssoCache
+        )
+    }
+
+    private async getIamConnection(
+        id: Connection['id'],
+        profile: StoredProfile<IamProfile>
+    ): Promise<IamConnection & StatefulConnection> {
+        // Get the provider to extract the endpoint URL
+        const provider = await this.getCredentialsProvider(id, profile)
+        const endpointUrl = provider.getEndpointUrl?.()
+        return {
+            id,
+            type: 'iam',
+            state: profile.metadata.connectionState,
+            label:
+                profile.metadata.label ?? (profile.type === 'iam' && profile.subtype === 'linked' ? profile.name : id),
+            getCredentials: async () => this.getCredentials(id, await this.getCredentialsProvider(id, profile)),
+            endpointUrl,
+        }
+    }
+
+    private getSsoConnection(
+        id: Connection['id'],
+        profile: StoredProfile<SsoProfile>
+    ): SsoConnection & StatefulConnection {
+        const provider = this.getSsoTokenProvider(id, profile)
+
+        return {
+            id,
+            ...profile,
+            state: profile.metadata.connectionState,
+            label: profile.metadata?.label ?? this.getSsoProfileLabel(profile),
+            getToken: () => this.getToken(id, provider),
+            getRegistration: () => provider.getClientRegistration(),
+            // SsoConnection is managed internally in the AWS Toolkit, so the endpointUrl can't be configured
+            endpointUrl: undefined,
+        }
+    }
+
+    private readonly authenticate = keyedDebounce(this._authenticate.bind(this))
+    @withTelemetryContext({ name: 'authenticate', class: authClassName })
+    private async _authenticate<T>(id: Connection['id'], callback: () => Promise<T>, invalidate?: boolean): Promise<T> {
+        const originalState = this.getConnectionState({ id }) ?? 'unauthenticated'
+        await this.updateConnectionState(id, 'authenticating')
+
+        try {
+            const result = await callback()
+            await this.updateConnectionState(id, 'valid')
+
+            return result
+        } catch (err) {
+            await this.handleSsoTokenError(id, err)
+            await this.updateConnectionState(id, invalidate ? 'invalid' : originalState)
+            throw err
+        }
+    }
+
+    private async createCachedCredentials(provider: CredentialsProvider) {
+        const providerId = provider.getCredentialsId()
+        getLogger().debug(`credentials: create cache credentials for ${provider.getProviderType()}`)
+        globals.loginManager.store.invalidateCredentials(providerId)
+        const { credentials, endpointUrl } = await globals.loginManager.store.upsertCredentials(providerId, provider)
+        await globals.loginManager.validateCredentials(credentials, endpointUrl, provider.getDefaultRegion())
+
+        return credentials
+    }
+
+    private async getCachedCredentials(provider: CredentialsProvider) {
+        const creds = await globals.loginManager.store.getCredentials(provider.getCredentialsId())
+        if (creds !== undefined && creds.credentialsHashCode === provider.getHashCode()) {
+            return creds.credentials
+        }
+    }
+
+    private readonly getToken = keyedDebounce(this._getToken.bind(this))
+    @withTelemetryContext({ name: '_getToken', class: authClassName })
+    private async _getToken(id: Connection['id'], provider: SsoAccessTokenProvider): Promise<SsoToken> {
+        const token = await provider.getToken().catch((err) => {
+            this.throwOnRecoverableError(err)
+
+            this.#validationErrors.set(id, err)
+        })
+
+        return token ?? this.handleInvalidCredentials(id, () => provider.createToken())
+    }
+
+    /**
+     * Auth processes can fail due to reasons outside of authentication actually being expired.
+     * We do not want to intepret these failures as invalid/expired auth tokens.
+     *
+     * We use this to check if the given error is recoverable, meaning retrying getToken at
+     * a later time could succeed. If it is recoverable, we throw, expecting the caller to not
+     * change the state of the connection.
+     */
+    private throwOnRecoverableError(e: unknown) {
+        if (isNetworkError(e)) {
+            throw new ToolkitError('Failed to update connection due to networking issues', {
+                cause: e,
+                code: e.code,
+            })
+        }
+
+        if (e instanceof DiskCacheError) {
+            throw new ToolkitError('Failed to update connection due to file system operation failures', {
+                cause: e,
+                code: e.code,
+            })
+        }
+    }
+
+    private readonly getCredentials = keyedDebounce(this._getCredentials.bind(this))
+    private async _getCredentials(id: Connection['id'], provider: CredentialsProvider): Promise<Credentials> {
+        const credentials = await this.getCachedCredentials(provider)
+        if (credentials !== undefined) {
+            return credentials
+        } else if ((await provider.canAutoConnect()) === true) {
+            return this.createCachedCredentials(provider)
+        } else {
+            return this.handleInvalidCredentials(id, () => this.createCachedCredentials(provider))
+        }
+    }
+
+    @withTelemetryContext({ name: 'handleInvalidCredentials', class: authClassName })
+    private async handleInvalidCredentials<T>(id: Connection['id'], refresh: () => Promise<T>): Promise<T> {
+        getLogger().info(`auth: Handling invalid credentials of connection: ${id}`)
+
+        let profile: StoredProfile
+        try {
+            profile = this.store.getProfileOrThrow(id)
+        } catch (err) {
+            if (err instanceof ProfileNotFoundError) {
+                getLogger().info(
+                    `Auth: deleting connection '${id}' due to error encountered while fetching auth token: %s`,
+                    err
+                )
+                await this.deleteConnection({ id })
+            }
+            throw err
+        }
+
+        const previousState = profile.metadata.connectionState
+        await this.updateConnectionState(id, 'invalid')
+
+        if (previousState === 'invalid') {
+            throw new ToolkitError('Connection is invalid or expired. Try logging in again.', {
+                code: errorCode.invalidConnection,
+                cause: this.#validationErrors.get(id),
+            })
+        }
+        if (previousState === 'valid') {
+            // Non-token expiration errors can happen. We must log it here, otherwise they are lost.
+            getLogger().warn(`auth: valid connection became invalid. Last error: %s`, this.#validationErrors.get(id))
+            const timeout = new Timeout(60000)
+            this.#invalidCredentialsTimeouts.set(id, timeout)
+
+            // Check if this is a SMUS profile - if so, skip the generic prompt
+            // as SMUS has its own reauthentication flow
+            const isSmusConnection = profile.type === 'sso' && 'domainUrl' in profile && 'domainId' in profile
+            if (isSmusConnection) {
+                getLogger().debug(`auth: Skipping generic reauthentication prompt for SMUS connection ${id}`)
+                // For SMUS connections, just throw the InvalidConnection error
+                // The SMUS auth provider will handle showing the appropriate prompt
+                throw new ToolkitError('Connection is invalid or expired. Try logging in again.', {
+                    code: errorCode.invalidConnection,
+                    cause: this.#validationErrors.get(id),
+                })
+            }
+
+            const connLabel = profile.metadata.label ?? (profile.type === 'sso' ? this.getSsoProfileLabel(profile) : id)
+            const message = localize(
+                'aws.auth.invalidConnection',
+                'Connection "{0}" is invalid or expired, login again?',
+                connLabel
+            )
+            const login = localize('aws.auth.invalidConnection.loginAgain', 'Login')
+            const resp = await Promise.race([
+                vscode.window.showInformationMessage(message, login, localizedText.no),
+                timeout.promisify(),
+            ])
+
+            if (resp !== login) {
+                throw new ToolkitError('User cancelled login', {
+                    cancelled: true,
+                    code: errorCode.invalidConnection,
+                    cause: this.#validationErrors.get(id),
+                })
+            }
+        }
+
+        return this.authenticate(id, refresh)
+    }
+
+    public readonly tryAutoConnect = once(async () => this._tryAutoConnect())
+    @withTelemetryContext({ name: 'tryAutoConnect', class: authClassName })
+    private async _tryAutoConnect() {
+        if (this.activeConnection !== undefined) {
+            return
+        }
+
+        // Clear anything stuck in an 'authenticating...' state
+        // This can rarely happen when closing VS Code during authentication
+        await Promise.all(
+            this.store.listProfiles().map(async ([id, profile]) => {
+                if (profile.metadata.connectionState === 'authenticating') {
+                    await this.store.updateMetadata(id, { connectionState: 'invalid' })
+                }
+            })
+        )
+
+        // When opening a Dev Environment, use the environment token if no other CodeCatalyst
+        // credential is in use. This token only has CC permissions currently!
+        if (!isAmazonQ() && getCodeCatalystDevEnvId() !== undefined) {
+            const connections = await this.listConnections()
+            const shouldInsertDevEnvCredential = !connections.some(
+                (c) => c.type === 'sso' && hasScopes(c, scopesCodeCatalyst) && !hasScopes(c, scopesCodeWhispererCore)
+            )
+
+            if (shouldInsertDevEnvCredential) {
+                // Insert a profile based on the `~/.aws/config` sso-session:
+                try {
+                    // After creating a CodeCatalyst Dev Environment profile based on sso-session,
+                    // we discard the actual key, and we insert the profile with an arbitrary key.
+                    // The cache key for any strictly-CodeCatalyst profile is overriden to the
+                    // sso-session identifier on read. If the coerce-on-read semantics ever become
+                    // an issue, it should be possible to use the actual key here However, this
+                    // would require deleting existing profiles to avoid inserting duplicates.
+                    const [_dangerousDiscardActualKey, devEnvProfile] = await this.createCodeCatalystDevEnvProfile()
+                    const key = randomUUID()
+                    await this.store.addProfile(key, devEnvProfile)
+                    await this.store.setCurrentProfileId(key)
+                } catch (err) {
+                    getLogger().warn(`auth: failed to insert dev env profile: %s`, err)
+                }
+            }
+        }
+
+        const conn = await this.restorePreviousSession()
+        if (conn !== undefined) {
+            return
+        }
+
+        const defaultProfileId = asString({ credentialSource: 'profile', credentialTypeId: 'default' })
+        const ec2ProfileId = asString({ credentialSource: 'ec2', credentialTypeId: 'instance' })
+        const ecsProfileId = asString({ credentialSource: 'ecs', credentialTypeId: 'instance' })
+        const legacyProfile = new CredentialsSettings().get('profile', defaultProfileId) || defaultProfileId
+        const tryConnection = async (id: string) => {
+            try {
+                // Check for existence before using the connection to avoid noisy logs
+                const conn = await this.getConnection({ id })
+                if (conn === undefined) {
+                    return false
+                }
+
+                await this.useConnection({ id })
+                return true
+            } catch (err) {
+                getLogger().warn(`auth: failed to auto-connect using "${id}": %s`, err)
+                return false
+            }
+        }
+
+        await loadIamProfilesIntoStore(this.store, this.iamProfileProvider)
+        for (const id of [ec2ProfileId, ecsProfileId, legacyProfile]) {
+            if ((await tryConnection(id)) === true) {
+                getLogger().info(`auth: automatically connected with "${id}"`)
+                // Removes the setting from the UI
+                if (id === legacyProfile) {
+                    new CredentialsSettings().delete('profile').catch((e) => {
+                        getLogger().warn('CredentialsSettings.delete("profile") failed: %s', (e as Error).message)
+                    })
+                }
+            }
+        }
+
+        // Add conditional auto-login logic for SageMaker (jmkeyes@ guidance)
+        if (hasVendedIamCredentials() && isSageMaker()) {
+            // SageMaker auto-login logic - use 'ec2' source since SageMaker uses EC2-like instance credentials
+            const sagemakerProfileId = asString({ credentialSource: 'ec2', credentialTypeId: 'sagemaker-instance' })
+            if ((await tryConnection(sagemakerProfileId)) === true) {
+                getLogger().info(`auth: automatically connected with SageMaker credentials`)
+                return
+            }
+        }
+    }
+
+    /**
+     * Auth uses its own state, separate from the default {@link globalState}
+     * that is normally used throughout the codebase.
+     *
+     * IMPORTANT: Anything involving auth should ONLY use this state since the state
+     * can vary on certain conditions. So if you see something explicitly using
+     * globalState verify if it should actually be using that.
+     */
+    public getStateMemento: () => vscode.Memento = () => Auth._getStateMemento()
+    private static _getStateMemento = once(() => getEnvironmentSpecificMemento())
+
+    static #instance: Auth | undefined
+    public static get instance() {
+        return (this.#instance ??= new Auth(new ProfileStore(Auth._getStateMemento())))
+    }
+
+    private getSsoProfileLabel(profile: SsoProfile) {
+        const truncatedUrl = truncateStartUrl(profile.startUrl)
+
+        return profile.startUrl === builderIdStartUrl
+            ? localizedText.builderId()
+            : `${localizedText.iamIdentityCenter} (${truncatedUrl})`
+    }
+
+    // Used by AWS Toolkit to update connection status & scope when this connection is updated by another extension.
+    // If such connection does not exist, create one with same id.
+    // Otherwise, update its scope and/or state.
+    public async setConnectionFromApi(connection: AwsConnection) {
+        getLogger().info(`Set connection ${connection.id} from API`)
+        const id = connection.id
+        const profile = this.store.getProfile(connection.id)
+        const newProfile = {
+            type: connection.type,
+            ssoRegion: connection.ssoRegion,
+            scopes: connection.scopes,
+            startUrl: connection.startUrl,
+        } as SsoProfile
+        if (profile === undefined) {
+            await this.store.addProfile(id, newProfile)
+            await this.store.updateMetadata(id, {
+                label: connection.label,
+                connectionState: connection.state,
+                source: 'amazonq',
+            })
+        } else {
+            await this.store.updateProfile(connection.id, newProfile)
+            await this.updateConnectionState(id, connection.state)
+            if (!this.getConnectionSource({ id: id })) {
+                await this.store.updateMetadata(id, {
+                    source: 'amazonq',
+                    connectionState: connection.state,
+                })
+            }
+        }
+    }
+
+    public declareConnectionFromApi(conn: Pick<AwsConnection, 'startUrl' | 'ssoRegion'>, source: string) {
+        getLogger().debug(`Declared connection '${conn.startUrl}' from ${source}.`)
+        this._declaredConnections[conn.startUrl] = {
+            startUrl: conn.startUrl,
+            ssoRegion: conn.ssoRegion,
+            source,
+        }
+    }
+
+    public undeclareConnectionFromApi(conn: Pick<AwsConnection, 'startUrl'>) {
+        getLogger().debug(
+            `Undeclared connection '${conn.startUrl}' from ${this._declaredConnections[conn.startUrl].source}`
+        )
+        delete this._declaredConnections[conn.startUrl]
+    }
+}
+
+/**
+ * Returns true if credentials are provided by the environment (ex. via ~/.aws/)
+ *
+ * @param isC9 boolean for if Cloud9 is host
+ * @param isSM boolean for if SageMaker is host
+ * @returns boolean for if C9 "OR" SM
+ */
+export function hasVendedIamCredentials(isC9?: boolean, isSM?: boolean) {
+    isC9 ??= isCloud9()
+    isSM ??= isSageMaker()
+    return isSM || isC9
+}
+
+/**
+ * Returns true if credentials are provided by the metadata files in environment (ex. for IAM via ~/.aws/ and in a future case with SSO, from /cache or /sso)
+ * @param isSMUS boolean if SageMaker Unified Studio is host
+ * @returns boolean if SMUS
+ */
+export function hasVendedCredentialsFromMetadata(isSMUS?: boolean) {
+    isSMUS ??= isSageMaker('SMUS')
+    return isSMUS
+}
diff --git a/packages/core/src/auth/connection.ts b/packages/core/src/auth/connection.ts
new file mode 100644
index 00000000000..fea929fc8af
--- /dev/null
+++ b/packages/core/src/auth/connection.ts
@@ -0,0 +1,545 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { Credentials } from '@aws-sdk/types'
+import { Mutable } from '../shared/utilities/tsUtils'
+import { ClientRegistration, SsoToken, truncateStartUrl } from './sso/model'
+import { SsoClient } from './sso/clients'
+import { CredentialsProviderManager } from './providers/credentialsProviderManager'
+import { fromString } from './providers/credentials'
+import { getLogger } from '../shared/logger/logger'
+import { showMessageWithUrl } from '../shared/utilities/messages'
+import { onceChanged } from '../shared/utilities/functionUtils'
+import { AuthAddConnection, AwsLoginWithBrowser } from '../shared/telemetry/telemetry.gen'
+import { withTelemetryContext } from '../shared/telemetry/util'
+import { AuthModifyConnection, telemetry } from '../shared/telemetry/telemetry'
+import { asStringifiedStack } from '../shared/telemetry/spans'
+import { getTelemetryReason, getTelemetryReasonDesc } from '../shared/errors'
+import { builderIdStartUrl } from './sso/constants'
+
+/** Shows a warning message unless it is the same as the last one shown. */
+const warnOnce = onceChanged((s: string, url: string) => {
+    void showMessageWithUrl(s, url, undefined, 'warn')
+})
+
+// TODO: Refactor all scopes to a central file with minimal dependencies.
+export const scopesCodeCatalyst = ['codecatalyst:read_write']
+export const scopesSsoAccountAccess = ['sso:account:access']
+/** These are the non-chat scopes for CW. */
+export const scopesCodeWhispererCore = ['codewhisperer:completions', 'codewhisperer:analysis']
+export const scopesCodeWhispererChat = ['codewhisperer:conversations']
+export const scopesFeatureDev = ['codewhisperer:taskassist']
+export const scopesGumby = ['codewhisperer:transformations']
+
+export const defaultSsoRegion = 'us-east-1'
+
+type SsoType =
+    | 'any' // any type of sso
+    | 'idc' // AWS Identity Center
+    | 'builderId'
+
+// TODO: This type is not centralized and there are many routines in the codebase that use some
+// variation for these for validation, telemetry, UX, etc. A refactor is needed to align these
+// string types.
+export type AuthType = 'credentials' | 'builderId' | 'identityCenter' | 'unknown'
+
+export const isIamConnection = (conn?: Connection): conn is IamConnection => conn?.type === 'iam'
+export const isSsoConnection = (conn?: Connection, type: SsoType = 'any'): conn is SsoConnection => {
+    if (conn?.type !== 'sso') {
+        return false
+    }
+    // At this point the conn is an SSO conn, but now we must determine the specific type
+    switch (type) {
+        case 'idc':
+            // An Identity Center SSO connection is the Base/Root and doesn't
+            // have any unique identifiers, so we must eliminate the other SSO
+            // types to determine if this is Identity Center.
+            // This condition should grow as more SsoType's get added.
+            return !isBuilderIdConnection(conn)
+        case 'builderId':
+            return conn.startUrl === builderIdStartUrl
+        case 'any':
+            return true
+    }
+}
+export const isAnySsoConnection = (conn?: Connection): conn is SsoConnection => isSsoConnection(conn, 'any')
+export const isIdcSsoConnection = (conn?: Connection): conn is SsoConnection => isSsoConnection(conn, 'idc')
+export const isBuilderIdConnection = (conn?: Connection): conn is SsoConnection => isSsoConnection(conn, 'builderId')
+
+export const isValidCodeCatalystConnection = (conn?: Connection): conn is SsoConnection =>
+    isSsoConnection(conn) && hasScopes(conn, scopesCodeCatalyst)
+
+export const areCredentialsEqual = (creds1: any, creds2: any): boolean => {
+    if (!creds1 || !creds2) {
+        return creds1 === creds2
+    }
+
+    return (
+        creds1.accessKeyId === creds2.accessKeyId &&
+        creds1.secretAccessKey === creds2.secretAccessKey &&
+        creds1.sessionToken === creds2.sessionToken
+    )
+}
+
+export function hasScopes(target: SsoConnection | SsoProfile | string[], scopes: string[]): boolean {
+    return scopes?.every((s) => (Array.isArray(target) ? target : target.scopes)?.includes(s))
+}
+
+/**
+ * Stricter version of hasScopes that checks for all and only all of the predicate scopes.
+ * Not optimized, but the set of possible scopes is currently very small (< 8)
+ */
+export function hasExactScopes(target: SsoConnection | SsoProfile | string[], scopes: string[]): boolean {
+    const targetScopes = Array.isArray(target) ? target : (target.scopes ?? [])
+    return scopes.length === targetScopes.length && scopes.every((s) => targetScopes.includes(s))
+}
+
+export function createBuilderIdProfile(
+    scopes = [...scopesSsoAccountAccess]
+): SsoProfile & { readonly scopes: string[] } {
+    return {
+        scopes,
+        type: 'sso',
+        ssoRegion: defaultSsoRegion,
+        startUrl: builderIdStartUrl,
+    }
+}
+
+export function createSsoProfile(
+    startUrl: string,
+    region = 'us-east-1',
+    scopes = [...scopesSsoAccountAccess]
+): SsoProfile & { readonly scopes: string[] } {
+    return {
+        scopes,
+        type: 'sso',
+        startUrl,
+        ssoRegion: region,
+    }
+}
+
+export interface SsoConnection extends SsoProfile {
+    readonly id: string
+    readonly label: string
+    readonly endpointUrl?: string | undefined
+
+    /**
+     * Retrieves a bearer token, refreshing or re-authenticating as-needed.
+     *
+     * This should be called for each new API request sent. It is up to the caller to
+     * handle cases where the service rejects the token.
+     */
+    getToken(): Promise<Pick<SsoToken, 'accessToken' | 'expiresAt'>>
+
+    getRegistration(): Promise<ClientRegistration | undefined>
+}
+
+export interface IamConnection {
+    readonly type: 'iam'
+    // Currently equivalent to a serialized `CredentialId`
+    // This may change in the future after refactoring legacy implementations
+    readonly id: string
+    readonly label: string
+    readonly endpointUrl: string | undefined
+    getCredentials(): Promise<Credentials>
+}
+
+export type Connection = IamConnection | SsoConnection
+
+export interface SsoProfile {
+    readonly type: 'sso'
+    readonly ssoRegion: string
+    readonly startUrl: string
+    readonly scopes?: string[]
+}
+
+interface BaseIamProfile {
+    readonly type: 'iam'
+    readonly name: string
+}
+
+interface UnknownIamProfile extends BaseIamProfile {
+    readonly subtype: 'unknown'
+}
+
+export interface LinkedIamProfile extends BaseIamProfile {
+    readonly subtype: 'linked'
+    readonly ssoSession: SsoConnection['id']
+    readonly ssoRoleName: string
+    readonly ssoAccountId: string
+}
+
+export type IamProfile = LinkedIamProfile | UnknownIamProfile
+
+// Placeholder type.
+// Would be expanded over time to support
+// https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html
+export type Profile = IamProfile | SsoProfile
+
+export interface ConnectionManager {
+    /**
+     * The 'global' connection currently in use by the Toolkit.
+     *
+     * Connections can still be used even if they are not the active connection.
+     */
+    readonly activeConnection: Connection | undefined
+    readonly onDidChangeActiveConnection: vscode.Event<Connection | undefined>
+
+    /**
+     * Changes the current 'active' connection used by the Toolkit.
+     */
+    useConnection(connection: Pick<Connection, 'id'>): Promise<Connection>
+}
+
+export interface ProfileMetadata {
+    /**
+     * Labels are used for anything UI related when present.
+     */
+    readonly label?: string
+
+    /**
+     * Used to differentiate various edge-cases that are based off state or state transitions:
+     * * `unauthenticated` -> try to login
+     * * `valid` -> `invalid` -> notify that the credentials are invalid, prompt to login again
+     * * `invalid` -> `invalid` -> immediately throw to stop the user from being spammed
+     */
+    readonly connectionState: 'valid' | 'invalid' | 'unauthenticated' | 'authenticating'
+
+    /**
+     * Source of this connection profile where it was first created.
+     */
+    readonly source?: 'amazonq' | 'toolkit'
+}
+
+// Difference between "Connection" vs. "Profile":
+// * Profile - A stateless configuration that describes how to get credentials
+// * Connection - A stateful entity that can produce credentials for a specific target
+//
+// Connections are very similar to credential providers used in existing logic. The distinction
+// is that connections are (ideally) identity-orientated whereas credential providers are not.
+
+export type StoredProfile<T extends Profile = Profile> = T & { readonly metadata: ProfileMetadata }
+
+export class ProfileNotFoundError extends Error {
+    public constructor(id: string) {
+        super(`Profile does not exist: ${id}`)
+    }
+}
+
+function getTelemetryForProfile(profile: StoredProfile<Profile> | undefined) {
+    if (!profile) {
+        return {}
+    }
+
+    let metadata: Partial<AuthModifyConnection> = {
+        connectionState: profile?.metadata.connectionState ?? 'undefined',
+    }
+
+    if (profile.type === 'sso') {
+        metadata = {
+            ...metadata,
+            authScopes: profile.scopes?.join(','),
+            credentialStartUrl: profile.startUrl,
+            awsRegion: profile.ssoRegion,
+        }
+    }
+
+    return metadata
+}
+
+const profileStoreClassName = 'ProfileStore'
+export class ProfileStore {
+    // To de-dupe telemetry
+    private _prevGetProfile: { id: string; connectionState: ProfileMetadata['connectionState'] } | undefined
+
+    public constructor(private readonly memento: vscode.Memento) {}
+
+    public getProfile(id: string): StoredProfile | undefined {
+        return this.getData()[id]
+    }
+
+    @withTelemetryContext({ name: 'getProfileOrThrow', class: profileStoreClassName })
+    public getProfileOrThrow(id: string): StoredProfile {
+        const metadata: AuthModifyConnection = {
+            action: 'getProfile',
+            id,
+            source: asStringifiedStack(telemetry.getFunctionStack()),
+        }
+
+        let profile: StoredProfile<Profile> | undefined
+        try {
+            profile = this.getProfile(id)
+            if (profile === undefined) {
+                throw new ProfileNotFoundError(id)
+            }
+        } catch (err) {
+            // Always emit failures
+            telemetry.auth_modifyConnection.emit({
+                ...metadata,
+                result: 'Failed',
+                reason: getTelemetryReason(err),
+                reasonDesc: getTelemetryReasonDesc(err),
+            })
+            throw err
+        }
+
+        // De-dupe metric on last id and connection state
+        if (
+            this._prevGetProfile?.id !== id ||
+            this._prevGetProfile?.connectionState !== profile.metadata.connectionState
+        ) {
+            telemetry.auth_modifyConnection.emit({
+                ...metadata,
+                ...getTelemetryForProfile(profile),
+                result: 'Succeeded',
+            })
+            this._prevGetProfile = { id, connectionState: profile.metadata.connectionState }
+        }
+
+        return profile
+    }
+
+    public listProfiles(): [id: string, profile: StoredProfile][] {
+        return Object.entries(this.getData())
+    }
+
+    public async addProfile(id: string, profile: SsoProfile): Promise<StoredProfile<SsoProfile>>
+    public async addProfile(id: string, profile: IamProfile): Promise<StoredProfile<IamProfile>>
+    @withTelemetryContext({ name: 'addProfile', class: profileStoreClassName })
+    public async addProfile(id: string, profile: Profile): Promise<StoredProfile> {
+        return telemetry.auth_modifyConnection.run(async (span) => {
+            span.record({
+                action: 'addProfile',
+                id,
+                source: asStringifiedStack(telemetry.getFunctionStack()),
+            })
+
+            const newProfile = this.initMetadata(profile)
+            span.record(getTelemetryForProfile(newProfile))
+
+            return await this.putProfile(id, newProfile)
+        })
+    }
+
+    @withTelemetryContext({ name: 'updateProfile', class: profileStoreClassName })
+    public async updateProfile(id: string, profile: Profile): Promise<StoredProfile> {
+        return telemetry.auth_modifyConnection.run(async (span) => {
+            span.record({
+                action: 'updateProfile',
+                id,
+                source: asStringifiedStack(telemetry.getFunctionStack()),
+            })
+
+            const oldProfile = this.getProfileOrThrow(id)
+            if (oldProfile.type !== profile.type) {
+                throw new Error(`Cannot change profile type from "${oldProfile.type}" to "${profile.type}"`)
+            }
+
+            const newProfile = await this.putProfile(id, { ...oldProfile, ...profile })
+            span.record(getTelemetryForProfile(newProfile))
+            return newProfile
+        })
+    }
+
+    public async updateMetadata(id: string, metadata: ProfileMetadata): Promise<StoredProfile> {
+        const profile = this.getProfileOrThrow(id)
+
+        return this.putProfile(id, { ...profile, metadata: { ...profile.metadata, ...metadata } })
+    }
+
+    @withTelemetryContext({ name: 'deleteProfile', class: profileStoreClassName })
+    public async deleteProfile(id: string): Promise<void> {
+        return telemetry.auth_modifyConnection.run(async (span) => {
+            span.record({
+                action: 'deleteProfile',
+                id,
+                source: asStringifiedStack(telemetry.getFunctionStack()),
+            })
+
+            const data = this.getData()
+            span.record(getTelemetryForProfile(data[id]))
+            delete (data as Mutable<typeof data>)[id]
+
+            await this.updateData(data)
+        })
+    }
+
+    public getCurrentProfileId(): string | undefined {
+        return this.memento.get<string>('auth.currentProfileId')
+    }
+
+    public async setCurrentProfileId(id: string | undefined): Promise<void> {
+        await this.memento.update('auth.currentProfileId', id)
+    }
+
+    private getData() {
+        return this.memento.get<{ readonly [id: string]: StoredProfile }>('auth.profiles', {})
+    }
+
+    private async updateData(state: { readonly [id: string]: StoredProfile | undefined }) {
+        await this.memento.update('auth.profiles', state)
+    }
+
+    private async putProfile(id: string, profile: StoredProfile) {
+        await this.updateData({ ...this.getData(), [id]: profile })
+
+        return profile
+    }
+
+    private initMetadata(profile: Profile): StoredProfile {
+        return {
+            ...profile,
+            metadata: {
+                connectionState: 'unauthenticated',
+            },
+        }
+    }
+}
+
+export async function loadIamProfilesIntoStore(store: ProfileStore, manager: CredentialsProviderManager) {
+    const providers = await manager.getCredentialProviderNames()
+    for (const [id, profile] of store.listProfiles()) {
+        if (profile.type !== 'iam') {
+            continue
+        }
+
+        if (profile.subtype === 'linked') {
+            const source = store.getProfile(profile.ssoSession)
+            if (source === undefined || source.type !== 'sso') {
+                await store.deleteProfile(id)
+                manager.removeProvider(fromString(id))
+            }
+        } else if (providers[id] === undefined) {
+            await store.deleteProfile(id)
+        }
+    }
+
+    for (const id of Object.keys(providers)) {
+        if (store.getProfile(id) === undefined && !id.startsWith('sso:')) {
+            await store.addProfile(id, { type: 'iam', subtype: 'unknown', name: providers[id].credentialTypeId })
+        }
+    }
+}
+
+/**
+ * Gets credentials profiles constructed from roles ("Permission Sets") discovered from the given
+ * SSO ("IAM Identity Center", "IdC") connection.
+ */
+export async function* loadLinkedProfilesIntoStore(
+    store: ProfileStore,
+    sourceId: SsoConnection['id'],
+    ssoProfile: StoredProfile<SsoProfile>,
+    client: SsoClient
+) {
+    const accounts = new Set<string>()
+    const found = new Set<Connection['id']>()
+
+    const stream = client
+        .listAccounts()
+        .catch((e) => {
+            getLogger().error('listAccounts() failed: %s', (e as Error).message)
+            return []
+        })
+        .flatten()
+        .map((resp) => {
+            accounts.add(resp.accountId)
+            return client.listAccountRoles({ accountId: resp.accountId }).flatten()
+        })
+        .flatten()
+
+    for await (const info of stream) {
+        const name = `${info.roleName}-${info.accountId}`
+        const id = `sso:${sourceId}#${name}`
+        found.add(id)
+
+        if (store.getProfile(id) !== undefined) {
+            continue
+        }
+
+        const profile = await store.addProfile(id, {
+            name,
+            type: 'iam',
+            subtype: 'linked',
+            ssoSession: sourceId,
+            ssoRoleName: info.roleName,
+            ssoAccountId: info.accountId,
+        })
+
+        yield [id, profile] as const
+    }
+
+    /** Does `ssoProfile` have scopes other than "sso:account:access"? */
+    const hasScopes = !!ssoProfile.scopes?.some((s) => !scopesSsoAccountAccess.includes(s))
+    if (!hasScopes && (accounts.size === 0 || found.size === 0)) {
+        // SSO user has no OIDC scopes nor IAM roles. Possible causes:
+        // - user is not an "Assigned user" in any account in the SSO org
+        // - SSO org has no "Permission sets"
+        const name = truncateStartUrl(ssoProfile.startUrl)
+        if (accounts.size === 0) {
+            getLogger().warn('auth: SSO org (%s) returned no accounts', name)
+        } else if (found.size === 0) {
+            getLogger().warn('auth: SSO org (%s) returned no roles for account: %s', name, Array.from(accounts).join())
+        }
+        warnOnce(
+            `IAM Identity Center (${name}) returned no roles. Ensure the user is assigned to an account with a Permission Set.`,
+            'https://docs.aws.amazon.com/singlesignon/latest/userguide/getting-started.html'
+        )
+    }
+
+    // Clean-up stale references in case the user no longer has access
+    for (const [id, profile] of store.listProfiles()) {
+        if (
+            profile.type === 'iam' &&
+            profile.subtype === 'linked' &&
+            profile.ssoSession === sourceId &&
+            !found.has(id)
+        ) {
+            await store.deleteProfile(id)
+        }
+    }
+}
+
+// The true connection state can only be known after trying to use the connection
+// So it is not exposed on the `Connection` interface
+export type StatefulConnection = Connection & { readonly state: ProfileMetadata['connectionState'] }
+
+export interface AwsConnection {
+    readonly id: string
+    readonly label: string
+    readonly type: string
+    readonly ssoRegion: string
+    readonly startUrl: string
+    readonly scopes?: string[]
+    readonly state: ProfileMetadata['connectionState']
+}
+
+type Writeable<T> = { -readonly [U in keyof T]: T[U] }
+export type TelemetryMetadata = Partial<Writeable<AuthAddConnection & AwsLoginWithBrowser & AuthModifyConnection>>
+
+export async function getTelemetryMetadataForConn(conn?: Connection): Promise<TelemetryMetadata> {
+    if (conn === undefined) {
+        return {
+            id: 'undefined',
+        }
+    }
+
+    if (isSsoConnection(conn)) {
+        const registration = await conn.getRegistration()
+        return {
+            authScopes: conn.scopes?.join(','),
+            credentialSourceId: isBuilderIdConnection(conn) ? 'awsId' : 'iamIdentityCenter',
+            credentialStartUrl: conn?.startUrl,
+            awsRegion: conn?.ssoRegion,
+            ssoRegistrationExpiresAt: registration?.expiresAt.toISOString(),
+            ssoRegistrationClientId: registration?.clientId,
+        }
+    } else if (isIamConnection(conn)) {
+        return {
+            credentialSourceId: 'sharedCredentials',
+        }
+    }
+
+    throw new Error('getTelemetryMetadataForConn() called with unknown connection type')
+}
diff --git a/packages/core/src/auth/credentials/sharedCredentials.ts b/packages/core/src/auth/credentials/sharedCredentials.ts
new file mode 100644
index 00000000000..b78c0d53251
--- /dev/null
+++ b/packages/core/src/auth/credentials/sharedCredentials.ts
@@ -0,0 +1,275 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { ToolkitError } from '../../shared/errors'
+import fs from '../../shared/fs/fs'
+import { assertHasProps } from '../../shared/utilities/tsUtils'
+import { getConfigFilename, getCredentialsFilename } from './sharedCredentialsFile'
+import { SectionName, StaticProfile } from './types'
+import { UserCredentialsUtils } from '../../shared/credentials/userCredentialsUtils'
+
+export async function updateAwsSdkLoadConfigEnvVar(): Promise<void> {
+    const configFileExists = await fs.exists(getConfigFilename())
+    process.env.AWS_SDK_LOAD_CONFIG = configFileExists ? 'true' : ''
+}
+
+interface AssignmentNode {
+    readonly key: string
+    readonly value: string
+    readonly range: vscode.Range
+}
+
+export interface BaseSection {
+    readonly type: string
+    readonly name: SectionName
+    readonly source: vscode.Uri
+    readonly startLines: number[]
+    readonly assignments: AssignmentNode[]
+}
+
+export interface ProfileSection extends BaseSection {
+    readonly type: 'profile'
+}
+
+export interface SsoSessionSection extends BaseSection {
+    readonly type: 'sso-session'
+}
+
+export type Section = ProfileSection | SsoSessionSection
+
+export interface ParseResult {
+    readonly sections: Section[]
+    readonly errors: ParseError[]
+}
+
+export class ParseError extends Error {
+    public constructor(
+        public readonly source: vscode.Uri,
+        public readonly range: vscode.Range,
+        message: string
+    ) {
+        const location = `${source.fsPath}:${range.start.line}:${range.start.character}`
+        super(`${location}: ${message}`)
+    }
+
+    public static fromSection(section: BaseSection, message: string) {
+        const line = section.startLines[0]
+        if (line === undefined) {
+            throw new Error(`Section "${section.name}" has no source mapping`)
+        }
+
+        return new ParseError(section.source, new vscode.Range(line, 0, line, 0), message)
+    }
+}
+
+export const isProfileSection = (section: Section): section is ProfileSection => section.type === 'profile'
+export const isSsoSessionSection = (section: Section): section is SsoSessionSection => section.type === 'sso-session'
+
+export function extractDataFromSection(section: BaseSection): Record<string, string> {
+    const data: Record<string, string> = {}
+    for (const assignment of section.assignments) {
+        data[assignment.key] = assignment.value
+    }
+
+    return data
+}
+
+export function getRequiredFields<T extends string>(section: Section, ...keys: T[]): { [P in T]: string } {
+    try {
+        const data = extractDataFromSection(section)
+        assertHasProps(data, ...keys)
+
+        return data
+    } catch (err) {
+        const parseError = ParseError.fromSection(section, (err as Error).message)
+
+        throw ToolkitError.chain(parseError, `Section "${section.type} ${section.name}" is invalid`)
+    }
+}
+
+export function getSectionOrThrow<T extends Section['type'] = Section['type']>(
+    sections: Section[],
+    name: SectionName,
+    type: T
+): Section & { type: T } {
+    const section = sections.find((s) => s.name === name && s.type === type) as (Section & { type: T }) | undefined
+    if (!section) {
+        const friendlyName = type === 'sso-session' ? 'Session' : 'Profile'
+        throw new Error(`${friendlyName} not found: ${name}`)
+    }
+
+    return section
+}
+
+export function getSectionDataOrThrow(sections: Section[], name: SectionName, type: Section['type']) {
+    const section = getSectionOrThrow(sections, name, type)
+    if (section.type !== type) {
+        throw ParseError.fromSection(section, `Expected section to be type "${type}", got: ${section.type}`)
+    }
+
+    return extractDataFromSection(section)
+}
+
+const sectionTypes = ['profile', 'sso-session'] as const
+function validateSection(section: BaseSection): asserts section is Section {
+    // eslint-disable-next-line unicorn/prefer-includes
+    if (!sectionTypes.some((t) => t === section.type)) {
+        throw ParseError.fromSection(
+            section,
+            `Invalid section type "${section.type}". Expected one of: ${sectionTypes.join(', ')}`
+        )
+    }
+}
+
+/**
+ * Loads existing merged (credentials + config) profiles from the filesystem
+ */
+export async function loadSharedCredentialsProfiles(): Promise<Record<SectionName, Profile>> {
+    const profiles = {} as Record<SectionName, Profile>
+    for (const section of (await loadSharedCredentialsSections()).sections.values()) {
+        if (section.type === 'profile') {
+            profiles[section.name] = extractDataFromSection(section)
+        }
+    }
+    return profiles
+}
+
+export async function loadSharedCredentialsSections(): Promise<ParseResult> {
+    // These should eventually be changed to use `parse` to allow for credentials from other file systems
+    const data = await loadSharedConfigFiles({
+        config: vscode.Uri.file(getConfigFilename()),
+        credentials: vscode.Uri.file(getCredentialsFilename()),
+    })
+
+    return mergeAndValidateSections([...data.config, ...data.credentials])
+}
+
+export function mergeAndValidateSections(data: BaseSection[]): ParseResult {
+    const errors = [] as ParseError[]
+    const sections = new Map<`${Section['type']}:${Section['name']}`, Section>()
+    for (const section of data) {
+        try {
+            validateSection(section)
+            const key = `${section.type}:${section.name}` as const
+            const existingSection = sections.get(key)
+
+            sections.set(key, {
+                ...section,
+                startLines: (existingSection?.startLines ?? []).concat(section.startLines),
+                assignments: (existingSection?.assignments ?? []).concat(section.assignments),
+            })
+        } catch (e) {
+            if (e instanceof ParseError) {
+                errors.push(e)
+            } else {
+                errors.push(ParseError.fromSection(section, (e as Error).message))
+            }
+        }
+    }
+
+    return { sections: Array.from(sections.values()), errors }
+}
+
+export function parseIni(iniData: string, source: vscode.Uri): BaseSection[] {
+    const sections = [] as BaseSection[]
+    const lines = iniData.split(/\r?\n/).map((l) => l.split(/(^|\s)[;#]/)[0]) // remove comments
+    for (const [lineNumber, line] of lines.entries()) {
+        const section = line.match(/^\s*\[([^\[\]]+)]\s*$/)
+        const currentSection: BaseSection | undefined = sections[sections.length - 1]
+        if (section) {
+            const parts = section[1].split(' ')
+            const name = parts.length === 1 ? parts[0] : parts[1]
+            const type = parts.length === 1 ? 'profile' : parts[0]
+            sections.push({ name, type, assignments: [], source, startLines: [lineNumber] })
+        } else if (currentSection) {
+            const item = line.match(/^\s*(.+?)\s*=\s*(.+?)\s*$/)
+            if (item) {
+                const key = item[1].toLowerCase()
+                currentSection.assignments.push({
+                    key,
+                    value: item[2],
+                    range: new vscode.Range(lineNumber, 0, lineNumber, line.length),
+                })
+            }
+        }
+    }
+
+    return sections
+}
+
+export interface SharedConfigPaths {
+    /**
+     * The path at which to locate the ini credentials file. No data will be read if not provided.
+     */
+    credentials?: vscode.Uri
+
+    /**
+     * The path at which to locate the ini config file. No data will be read if not provided.
+     */
+    config?: vscode.Uri
+}
+
+export type SharedConfigData = { [T in keyof SharedConfigPaths]-?: ReturnType<typeof parseIni> }
+export async function loadSharedConfigFiles(init: SharedConfigPaths = {}): Promise<SharedConfigData> {
+    const [config, credentials] = await Promise.all([
+        loadConfigFile(init.config),
+        loadCredentialsFile(init.credentials),
+    ])
+
+    return {
+        credentials,
+        config,
+    }
+}
+
+async function loadConfigFile(configUri?: vscode.Uri): Promise<ReturnType<typeof parseIni>> {
+    if (!configUri || !(await fs.exists(configUri))) {
+        return []
+    }
+
+    return parseIni(await fs.readFileText(configUri), configUri)
+}
+
+async function loadCredentialsFile(credentialsUri?: vscode.Uri): Promise<ReturnType<typeof parseIni>> {
+    if (!credentialsUri || !(await fs.exists(credentialsUri))) {
+        return []
+    }
+
+    return parseIni(await fs.readFileText(credentialsUri), credentialsUri)
+}
+
+/**
+ * Saves the given profile data to the credentials file.
+ */
+export async function saveProfileToCredentials(profileName: SectionName, profileData: StaticProfile): Promise<void> {
+    if (await profileExists(profileName)) {
+        throw new ToolkitError(`Cannot save profile "${profileName}" because it already exists.`, {
+            code: 'ProfileAlreadyExists',
+        })
+    }
+
+    return UserCredentialsUtils.generateCredentialsFile({
+        profileName,
+        accessKey: profileData.aws_access_key_id,
+        secretKey: profileData.aws_secret_access_key,
+    })
+}
+
+/**
+ * Checks if a profile exists in a shared credentials file.
+ */
+export async function profileExists(profileName: SectionName): Promise<boolean> {
+    const existingProfiles = await loadSharedCredentialsProfiles()
+    return Object.keys(existingProfiles).includes(profileName)
+}
+
+export interface Profile {
+    [key: string]: string | undefined
+}
+
+export interface ParsedIniData {
+    [key: string]: Profile | undefined
+}
diff --git a/packages/core/src/auth/credentials/sharedCredentialsFile.ts b/packages/core/src/auth/credentials/sharedCredentialsFile.ts
new file mode 100644
index 00000000000..8760dce7b59
--- /dev/null
+++ b/packages/core/src/auth/credentials/sharedCredentialsFile.ts
@@ -0,0 +1,52 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * This module focuses on the i/o of the credentials/config files
+ */
+
+import { join, resolve } from 'path'
+import fs from '../../shared/fs/fs'
+import { getLogger } from '../../shared/logger/logger'
+
+/**
+ * Returns env var value if it is non-empty.
+ *
+ * Asynchronously checks if the value is a valid file (not directory) path and logs an error if not.
+ * The value is still returned in that case.
+ */
+function tryGetValidFileEnvVar(envVar: string): string | undefined {
+    const envVal = process.env[envVar]
+
+    if (envVal) {
+        const f = resolve(envVal)
+        fs.existsFile(f)
+            .then((r) => {
+                if (!r) {
+                    getLogger().error('$%s filepath is invalid (or is a directory): %O', envVar, f)
+                }
+            })
+            .catch((e) => getLogger().error(e))
+        return f
+    }
+}
+
+export function getCredentialsFilename(): string {
+    const envVal = tryGetValidFileEnvVar('AWS_SHARED_CREDENTIALS_FILE')
+
+    if (envVal) {
+        return envVal
+    }
+
+    return join(fs.getUserHomeDir(), '.aws/credentials')
+}
+
+export function getConfigFilename(): string {
+    const envVal = tryGetValidFileEnvVar('AWS_CONFIG_FILE')
+
+    if (envVal) {
+        return envVal
+    }
+
+    return join(fs.getUserHomeDir(), '.aws/config')
+}
diff --git a/packages/core/src/auth/credentials/store.ts b/packages/core/src/auth/credentials/store.ts
new file mode 100644
index 00000000000..ff963b09db0
--- /dev/null
+++ b/packages/core/src/auth/credentials/store.ts
@@ -0,0 +1,125 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as AWS from '@aws-sdk/types'
+import globals from '../../shared/extensionGlobals'
+import { getLogger } from '../../shared/logger/logger'
+import { asString, CredentialsProvider, CredentialsId } from '../providers/credentials'
+import { CredentialsProviderManager } from '../providers/credentialsProviderManager'
+
+export interface CachedCredentials {
+    credentials: AWS.Credentials
+    credentialsHashCode: string
+    endpointUrl?: string
+}
+
+/**
+ * Simple cache for credentials
+ */
+export class CredentialsStore {
+    public readonly credentialsCache: { [key: string]: CachedCredentials }
+
+    public constructor() {
+        this.credentialsCache = {}
+    }
+
+    /**
+     * Checks if the stored credentials are valid. Non-existent or expired credentials returns false.
+     *
+     * If the expiration property does not exist, it is assumed to never expire.
+     */
+    public isValid(key: string): boolean {
+        // Apply 60-second buffer similar to SSO token expiry logic
+        const expirationBufferMs = 60000
+
+        if (this.credentialsCache[key]) {
+            const expiration = this.credentialsCache[key].credentials.expiration
+            const now = new globals.clock.Date()
+            const bufferedNow = new globals.clock.Date(now.getTime() + expirationBufferMs)
+            return expiration !== undefined ? expiration >= bufferedNow : true
+        }
+        getLogger().debug(`credentials: no credentials found for ${key}`)
+        return false
+    }
+
+    /**
+     * Returns undefined if the specified credentials are expired or not found.
+     */
+    public async getCredentials(credentials: CredentialsId): Promise<CachedCredentials | undefined> {
+        if (this.isValid(asString(credentials))) {
+            return this.credentialsCache[asString(credentials)]
+        } else {
+            return undefined
+        }
+    }
+
+    /**
+     * If credentials are not stored, the credentialsProvider is used to produce credentials (which are then stored).
+     * If the credentials exist but are outdated, the credentials will be invalidated and updated.
+     * Either way, the credentials tied to the credentialsId will then be returned.
+     */
+    public async upsertCredentials(
+        credentialsId: CredentialsId,
+        credentialsProvider: CredentialsProvider
+    ): Promise<CachedCredentials> {
+        let credentials = await this.getCredentials(credentialsId)
+
+        if (!credentials) {
+            credentials = await this.consumeProvider(credentialsId, credentialsProvider)
+        } else if (credentialsProvider.getHashCode() !== credentials.credentialsHashCode) {
+            getLogger().verbose(`Using updated credentials: ${asString(credentialsId)}`)
+            this.invalidateCredentials(credentialsId)
+            credentials = await this.consumeProvider(credentialsId, credentialsProvider)
+        }
+
+        return credentials
+    }
+
+    /**
+     * Evicts credentials from storage
+     */
+    public invalidateCredentials(credentialsId: CredentialsId) {
+        delete this.credentialsCache[asString(credentialsId)]
+    }
+
+    public async setCredentials(credentials: AWS.Credentials, provider: CredentialsProvider): Promise<void> {
+        this.credentialsCache[asString(provider.getCredentialsId())] = {
+            credentials,
+            credentialsHashCode: provider.getHashCode(),
+        }
+    }
+
+    private async consumeProvider(
+        credentialsId: CredentialsId,
+        credentialsProvider: CredentialsProvider
+    ): Promise<CachedCredentials> {
+        getLogger().debug(`store: Fetch new credentials from provider with id: ${asString(credentialsId)}`)
+        const credentials = {
+            credentials: await credentialsProvider.getCredentials(),
+            credentialsHashCode: credentialsProvider.getHashCode(),
+            endpointUrl: credentialsProvider.getEndpointUrl?.(),
+        }
+
+        this.credentialsCache[asString(credentialsId)] = credentials
+        return credentials
+    }
+}
+
+/**
+ * Gets credentials, and tries to refresh them if necessary.
+ */
+export async function getCredentialsFromStore(
+    credentialsId: CredentialsId,
+    credentialsStore: CredentialsStore
+): Promise<AWS.Credentials | undefined> {
+    const provider = await CredentialsProviderManager.getInstance().getCredentialsProvider(credentialsId)
+    if (!provider) {
+        credentialsStore.invalidateCredentials(credentialsId)
+        return undefined
+    }
+
+    const cachedCredentials = await credentialsStore.upsertCredentials(credentialsId, provider)
+    return cachedCredentials.credentials
+}
diff --git a/packages/core/src/auth/credentials/types.ts b/packages/core/src/auth/credentials/types.ts
new file mode 100644
index 00000000000..75a12a2d9b2
--- /dev/null
+++ b/packages/core/src/auth/credentials/types.ts
@@ -0,0 +1,49 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * All keys that are shared between a credentials or config file
+ */
+export const SharedCredentialsKeys = {
+    AWS_ACCESS_KEY_ID: 'aws_access_key_id',
+    AWS_SECRET_ACCESS_KEY: 'aws_secret_access_key',
+    AWS_SESSION_TOKEN: 'aws_session_token',
+    CREDENTIAL_PROCESS: 'credential_process',
+    CREDENTIAL_SOURCE: 'credential_source',
+    ENDPOINT_URL: 'endpoint_url',
+    REGION: 'region',
+    ROLE_ARN: 'role_arn',
+    SOURCE_PROFILE: 'source_profile',
+    MFA_SERIAL: 'mfa_serial',
+    SSO_START_URL: 'sso_start_url',
+    SSO_REGION: 'sso_region',
+    SSO_ACCOUNT_ID: 'sso_account_id',
+    SSO_ROLE_NAME: 'sso_role_name',
+    SSO_SESSION: 'sso_session',
+    SSO_REGISTRATION_SCOPES: 'sso_registration_scopes',
+} as const
+
+/** An object that has only credentials data */
+export type CredentialsData = Partial<Record<CredentialsKey, string>>
+
+export type CredentialsKey = (typeof SharedCredentialsKeys)[keyof typeof SharedCredentialsKeys]
+
+/**
+ * The required keys for a static credentials profile
+ *
+ * https://docs.aws.amazon.com/sdkref/latest/guide/feature-static-credentials.html
+ */
+export type StaticProfileOptional = Pick<CredentialsData, 'aws_access_key_id' | 'aws_secret_access_key'>
+export type StaticProfile = Required<StaticProfileOptional>
+export type StaticProfileKey = keyof StaticProfile
+/** An error for a specific static profile key */
+export type StaticProfileKeyErrorMessage = { key: StaticProfileKey; error: string }
+
+/**
+ * The name of a section in a credentials/config file
+ *
+ * The is the value of `{A}` in `[ {A} ]` or `[ {B} {A} ]`.
+ */
+export type SectionName = string
diff --git a/packages/core/src/auth/credentials/utils.ts b/packages/core/src/auth/credentials/utils.ts
new file mode 100644
index 00000000000..05a648d867d
--- /dev/null
+++ b/packages/core/src/auth/credentials/utils.ts
@@ -0,0 +1,134 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as vscode from 'vscode'
+import { Credentials } from '@aws-sdk/types'
+import { authHelpUrl } from '../../shared/constants'
+import globals from '../../shared/extensionGlobals'
+import { messages, showMessageWithCancel, showViewLogsMessage } from '../../shared/utilities/messages'
+import { Timeout, waitTimeout } from '../../shared/utilities/timeoutUtils'
+import { fromExtensionManifest } from '../../shared/settings'
+import { Profile } from './sharedCredentials'
+import { openUrl } from '../../shared/utilities/vsCodeUtils'
+import { createInputBox } from '../../shared/ui/inputPrompter'
+import { isValidResponse } from '../../shared/wizards/wizard'
+
+const credentialsTimeout = 300000 // 5 minutes
+const credentialsProgressDelay = 1000
+
+export function asEnvironmentVariables(credentials: Credentials, endpointUrl?: string): NodeJS.ProcessEnv {
+    const environmentVariables: NodeJS.ProcessEnv = {}
+
+    environmentVariables.AWS_ACCESS_KEY = credentials.accessKeyId
+    environmentVariables.AWS_ACCESS_KEY_ID = credentials.accessKeyId
+    environmentVariables.AWS_SECRET_KEY = credentials.secretAccessKey
+    environmentVariables.AWS_SECRET_ACCESS_KEY = credentials.secretAccessKey
+    environmentVariables.AWS_SESSION_TOKEN = credentials.sessionToken
+    environmentVariables.AWS_SECURITY_TOKEN = credentials.sessionToken
+    if (endpointUrl !== undefined) {
+        environmentVariables.AWS_ENDPOINT_URL = endpointUrl
+    }
+
+    return environmentVariables
+}
+
+export function showLoginFailedMessage(credentialsId: string, errMsg: string): void {
+    const getHelp = localize('AWS.generic.message.getHelp', 'Get Help...')
+    const editCreds = messages.editCredentials(false)
+    // TODO: Any work towards web/another cloud9 -esqe IDE may need different getHelp docs:
+    const buttons = [editCreds, getHelp]
+
+    void showViewLogsMessage(
+        localize('AWS.message.credentials.invalid', 'Credentials "{0}" failed to connect: {1}', credentialsId, errMsg),
+        'error',
+        buttons
+    ).then((selection: string | undefined) => {
+        if (selection === getHelp) {
+            return openUrl(vscode.Uri.parse(authHelpUrl))
+        } else if (selection === editCreds) {
+            // TODO: clean this up, its confusing. Only Toolkit should enter this flow, which is why we are hardcoding it.
+            return vscode.commands.executeCommand('aws.toolkit.credentials.edit')
+        }
+    })
+}
+
+export function hasProfileProperty(profile: Profile, propertyName: string): boolean {
+    return !!profile[propertyName]
+}
+
+/**
+ * Attempts to resolve (or refresh) a provider with a 'Cancel' progress message.
+ * User cancellation or timeout expiration will cause rejection.
+ *
+ * @param profile Profile name to display for the progress message
+ * @param provider A promise that resolves in Credentials
+ * @param timeout How long to wait for resolution without user intervention (default: 5 minutes)
+ *
+ * @returns The resolved Credentials or undefined if the the provider was a 'refresh' Promise
+ */
+export async function resolveProviderWithCancel(
+    profile: string,
+    provider: Promise<Credentials>,
+    timeout: Timeout | number = credentialsTimeout
+): Promise<Credentials> {
+    if (typeof timeout === 'number') {
+        timeout = new Timeout(timeout)
+    }
+
+    globals.clock.setTimeout(() => {
+        timeout = timeout as Timeout // Typescript lost scope of the correct type here
+        if (timeout.completed !== true) {
+            void showMessageWithCancel(
+                localize('AWS.message.credentials.pending', 'Getting credentials for profile: {0}', profile),
+                timeout
+            )
+        }
+    }, credentialsProgressDelay)
+
+    return await waitTimeout(provider, timeout, {
+        allowUndefined: false,
+        onCancel: () => {
+            throw new Error(`Request to get credentials for "${profile}" cancelled`)
+        },
+        onExpire: () => {
+            throw new Error(`Request to get credentials for "${profile}" expired`)
+        },
+    })
+}
+
+export class CredentialsSettings extends fromExtensionManifest('aws', { profile: String }) {}
+
+const errorMessageUserCancelled = localize('AWS.error.mfa.userCancelled', 'User cancelled entering authentication code')
+
+/**
+ * @description Prompts user for MFA token
+ *
+ * Entered token is passed to the callback.
+ * If user cancels out, the callback is passed an error with a fixed message string.
+ *
+ * @param mfaSerial Serial arn of MFA device
+ * @param profileName Name of Credentials profile we are asking an MFA Token for
+ * @param callback tokens/errors are passed through here
+ */
+export async function getMfaTokenFromUser(mfaSerial: string, profileName: string): Promise<string> {
+    const inputBox = createInputBox({
+        ignoreFocusOut: true,
+        placeholder: localize('AWS.prompt.mfa.enterCode.placeholder', 'Enter Authentication Code Here'),
+        title: localize('AWS.prompt.mfa.enterCode.title', 'MFA Challenge for {0}', profileName),
+        prompt: localize('AWS.prompt.mfa.enterCode.prompt', 'Enter code for MFA device {0}', mfaSerial),
+    })
+
+    const token = await inputBox.prompt()
+
+    // Distinguish user cancel vs code entry issues with the error message
+    if (!isValidResponse(token)) {
+        throw new Error(errorMessageUserCancelled)
+    }
+
+    return token
+}
diff --git a/packages/core/src/auth/credentials/validation.ts b/packages/core/src/auth/credentials/validation.ts
new file mode 100644
index 00000000000..70229e3786c
--- /dev/null
+++ b/packages/core/src/auth/credentials/validation.ts
@@ -0,0 +1,135 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * This module focuses on the validation of shared credentials properties
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+import { CredentialsData, CredentialsKey, SectionName, SharedCredentialsKeys } from './types'
+import { ToolkitError } from '../../shared/errors'
+import { profileExists } from './sharedCredentials'
+import { getLogger } from '../../shared/logger/logger'
+
+/** credentials keys and their associated error message, if they exists */
+type CredentialsErrors = CredentialsData
+
+/**
+ * A function that validates a credential value
+ *
+ * @returns An error message string if there is an error, otherwise undefined.
+ */
+type GetCredentialError = (key: CredentialsKey, value: string | undefined) => string | undefined
+
+/**
+ * Validates all credentials values from the given input
+ *
+ * @returns Returns the same shape as the input, but the value of each
+ * key is an error message if the original value is invalid,
+ * otherwise undefined.
+ *
+ * If there are no errors at all, undefined is returned
+ */
+export function getCredentialsErrors(
+    data: CredentialsData,
+    validateFunc: GetCredentialError = getCredentialError
+): CredentialsErrors | undefined {
+    const errors: CredentialsData = {}
+    for (const [key, value] of Object.entries(data)) {
+        if (!isCredentialsKey(key)) {
+            continue
+        }
+        errors[key] = validateFunc(key, value)
+    }
+
+    const hasErrors = Object.values(errors).some(Boolean)
+    if (!hasErrors) {
+        return
+    }
+    return errors
+}
+
+export const getCredentialError: GetCredentialError = (key: CredentialsKey, value: string | undefined) => {
+    const emptyError = getCredentialEmptyError(key, value)
+    if (emptyError) {
+        return emptyError
+    }
+
+    // If value is allowed to be empty, no need to validate anything further
+    if (!value) {
+        return
+    }
+
+    return getCredentialFormatError(key, value)
+}
+
+/**
+ * Validates the format of a credential value.
+ *
+ * This function assumes there is a value to evaluate, if not
+ * it returns no error.
+ */
+export const getCredentialFormatError: GetCredentialError = (key, value) => {
+    if (!value) {
+        /** Empty values should be validated in {@link getCredentialEmptyError} */
+        getLogger().debug('getCredentialFormatError() called with empty value for key "%s"', key)
+        return
+    }
+
+    switch (key) {
+        case SharedCredentialsKeys.AWS_ACCESS_KEY_ID: {
+            const accessKeyPattern = /[\w]{16,128}/
+            if (!accessKeyPattern.test(value)) {
+                return localize(
+                    'AWS.credentials.error.invalidAccessKeyFormat',
+                    'Access key must be alphanumeric and between 16 and 128 characters'
+                )
+            }
+            return
+        }
+        case SharedCredentialsKeys.AWS_SECRET_ACCESS_KEY:
+            return
+        default:
+            throw new ToolkitError(`Unsupported key in getCredentialFormatError(): "${key}"`)
+    }
+}
+
+export const getCredentialEmptyError: GetCredentialError = (key: CredentialsKey, value: string | undefined) => {
+    switch (key) {
+        case SharedCredentialsKeys.AWS_ACCESS_KEY_ID:
+        case SharedCredentialsKeys.AWS_SECRET_ACCESS_KEY:
+            if (value) {
+                return undefined
+            }
+            return 'Cannot be empty.'
+        default:
+            throw new ToolkitError(`Unsupported key in getCredentialEmptyError(): "${key}"`)
+    }
+}
+
+/** To be used as a sanity check to validate all core parts of a credentials profile */
+export async function throwOnInvalidCredentials(profileName: SectionName, data: CredentialsData) {
+    await validateProfileName(profileName)
+
+    const credentialsDataErrors = getCredentialsErrors(data)
+    if (credentialsDataErrors !== undefined) {
+        throw new ToolkitError(`Errors in credentials data: ${String(credentialsDataErrors)}`, {
+            code: 'InvalidCredentialsData',
+            details: credentialsDataErrors,
+        })
+    }
+}
+
+async function validateProfileName(profileName: SectionName) {
+    if (await profileExists(profileName)) {
+        throw new ToolkitError(`Credentials profile "${profileName}" already exists`)
+    }
+}
+
+// All shared credentials keys
+const sharedCredentialsKeysSet = new Set(Object.values(SharedCredentialsKeys))
+
+export function isCredentialsKey(key: string): key is CredentialsKey {
+    return sharedCredentialsKeysSet.has(key as CredentialsKey)
+}
diff --git a/src/credentials/loginManager.ts b/packages/core/src/auth/deprecated/loginManager.ts
similarity index 77%
rename from src/credentials/loginManager.ts
rename to packages/core/src/auth/deprecated/loginManager.ts
index 9009f784740..b2d3fb3c3c3 100644
--- a/src/credentials/loginManager.ts
+++ b/packages/core/src/auth/deprecated/loginManager.ts
@@ -1,39 +1,42 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import globals from '../shared/extensionGlobals'
+import globals from '../../shared/extensionGlobals'
 
 import * as nls from 'vscode-nls'
 const localize = nls.loadMessageBundle()
 
 import * as vscode from 'vscode'
-import { CancellationError } from '../shared/utilities/timeoutUtils'
-import { AwsContext } from '../shared/awsContext'
-import { getLogger } from '../shared/logger'
-import { CredentialSourceId, CredentialType, Result } from '../shared/telemetry/telemetry'
-import { CredentialsStore } from './credentialsStore'
-import { CredentialsSettings, showLoginFailedMessage } from './credentialsUtilities'
+import { CancellationError } from '../../shared/utilities/timeoutUtils'
+import { AwsContext } from '../../shared/awsContext'
+import { getLogger } from '../../shared/logger/logger'
+import { CredentialSourceId, CredentialType, Result } from '../../shared/telemetry/telemetry'
+import { CredentialsStore } from '../credentials/store'
+import { CredentialsSettings, showLoginFailedMessage } from '../credentials/utils'
 import {
     asString,
     CredentialsProvider,
     CredentialsId,
     credentialsProviderToTelemetryType,
     fromString,
-} from './providers/credentials'
-import { CredentialsProviderManager } from './providers/credentialsProviderManager'
-import { getIdeProperties, isCloud9 } from '../shared/extensionUtilities'
-import { SharedCredentialsProvider } from './providers/sharedCredentialsProvider'
-import { showViewLogsMessage } from '../shared/utilities/messages'
-import { isAutomation } from '../shared/vscode/env'
+} from '../providers/credentials'
+import { CredentialsProviderManager } from '../providers/credentialsProviderManager'
+import { getIdeProperties, isCloud9 } from '../../shared/extensionUtilities'
+import { SharedCredentialsProvider } from '../providers/sharedCredentialsProvider'
+import { showViewLogsMessage } from '../../shared/utilities/messages'
+import { isAutomation } from '../../shared/vscode/env'
 import { Credentials } from '@aws-sdk/types'
-import { ToolkitError } from '../shared/errors'
-import * as localizedText from '../shared/localizedText'
-import { DefaultStsClient } from '../shared/clients/stsClient'
-import { findAsync } from '../shared/utilities/collectionUtils'
-import { telemetry } from '../shared/telemetry/telemetry'
-
+import { ToolkitError } from '../../shared/errors'
+import * as localizedText from '../../shared/localizedText'
+import { DefaultStsClient, type GetCallerIdentityResponse } from '../../shared/clients/stsClient'
+import { findAsync } from '../../shared/utilities/collectionUtils'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { withTelemetryContext } from '../../shared/telemetry/util'
+import { localStackConnectionHeader, localStackConnectionString } from '../utils'
+
+const loginManagerClassName = 'LoginManager'
 /**
  * @deprecated Replaced by `Auth` in `src/credentials/auth.ts`
  */
@@ -63,19 +66,19 @@ export class LoginManager {
 
         try {
             provider = await getProvider(args.providerId)
-
-            const credentials = (await this.store.upsertCredentials(args.providerId, provider))?.credentials
+            const { credentials, endpointUrl } = await this.store.upsertCredentials(args.providerId, provider)
             if (!credentials) {
                 throw new Error(`No credentials found for id ${asString(args.providerId)}`)
             }
 
-            const accountId = await this.validateCredentials(credentials, provider.getDefaultRegion())
+            const accountId = await this.validateCredentials(credentials, endpointUrl, provider.getDefaultRegion())
             this.awsContext.credentialsShim = createCredentialsShim(this.store, args.providerId, credentials)
             await this.awsContext.setCredentials({
                 credentials,
                 accountId: accountId,
                 credentialsId: asString(args.providerId),
                 defaultRegion: provider.getDefaultRegion(),
+                endpointUrl: provider.getEndpointUrl?.(),
             })
 
             telemetryResult = 'Succeeded'
@@ -109,16 +112,40 @@ export class LoginManager {
         }
     }
 
-    public async validateCredentials(credentials: Credentials, region = this.defaultCredentialsRegion) {
-        const stsClient = new DefaultStsClient(region, credentials)
-        const accountId = (await stsClient.getCallerIdentity()).Account
+    public async validateCredentials(
+        credentials: Credentials,
+        endpointUrl?: string,
+        region = this.defaultCredentialsRegion
+    ) {
+        const stsClient = new DefaultStsClient(region, credentials, endpointUrl)
+        const callerIdentity = await stsClient.getCallerIdentity()
+        await this.detectExternalConnection(callerIdentity)
+        // Validate presence of Account Id
+        const accountId = callerIdentity.Account
         if (!accountId) {
+            if (endpointUrl !== undefined) {
+                telemetry.auth_customEndpoint.emit({ source: 'validateCredentials', result: 'Failed' })
+            }
             throw new Error('Could not determine Account Id for credentials')
         }
+        if (endpointUrl !== undefined) {
+            telemetry.auth_customEndpoint.emit({ source: 'validateCredentials', result: 'Succeeded' })
+        }
 
         return accountId
     }
 
+    private async detectExternalConnection(callerIdentity: GetCallerIdentityResponse): Promise<void> {
+        // @ts-ignore
+        const headers = callerIdentity.$response?.httpResponse?.headers
+        if (headers !== undefined && localStackConnectionHeader in headers) {
+            await globals.globalState.update('aws.toolkit.externalConnection', localStackConnectionString)
+            telemetry.auth_localstackEndpoint.emit({ source: 'validateCredentials', result: 'Succeeded' })
+        } else {
+            await globals.globalState.update('aws.toolkit.externalConnection', undefined)
+        }
+    }
+
     /**
      * Removes Credentials from the Toolkit. Essentially the Toolkit becomes "logged out".
      *
@@ -131,6 +158,7 @@ export class LoginManager {
 
     private static didTryAutoConnect = false
 
+    @withTelemetryContext({ name: 'tryAutoConnect', class: loginManagerClassName })
     public static async tryAutoConnect(awsContext: AwsContext = globals.awsContext): Promise<boolean> {
         if (isAutomation()) {
             return false
@@ -148,7 +176,9 @@ export class LoginManager {
             await loginWithMostRecentCredentials(new CredentialsSettings(), loginManager)
         } catch (err) {
             getLogger().error('credentials: failed to auto-connect: %s', err)
-            showViewLogsMessage(localize('AWS.credentials.autoconnect.fatal', 'Exception occurred while connecting'))
+            void showViewLogsMessage(
+                localize('AWS.credentials.autoconnect.fatal', 'Exception occurred while connecting')
+            )
         }
         return !!(await awsContext.getCredentials())
     }
@@ -179,7 +209,7 @@ export async function loginWithMostRecentCredentials(
             }
             getLogger().info('autoconnect: connected: %O', asString(creds))
             if (popup) {
-                vscode.window.showInformationMessage(
+                void vscode.window.showInformationMessage(
                     localize(
                         'AWS.message.credentials.connected',
                         'Connected to {0} with {1}',
@@ -212,8 +242,8 @@ export async function loginWithMostRecentCredentials(
     const defaultProfile = profileNames.includes(defaultName)
         ? defaultName
         : profileNames.length === 1
-        ? profileNames[0]
-        : undefined
+          ? profileNames[0]
+          : undefined
 
     if (!previousCredentialsId && profileNames.length === 0) {
         await loginManager.logout(true)
@@ -230,7 +260,7 @@ export async function loginWithMostRecentCredentials(
     }
 
     // Try to auto-connect any other non-default profile (useful for env vars, IMDS, Cloud9, ECS, …).
-    const nonDefault = await findAsync(profileNames, async p => {
+    const nonDefault = await findAsync(profileNames, async (p) => {
         const provider = await manager.getCredentialsProvider(providerMap[p])
         return p !== defaultName && !!(await provider?.canAutoConnect())
     })
@@ -327,7 +357,7 @@ function createCredentialsShim(
             }
 
             const credentials = await provider.getCredentials()
-            store.setCredentials(credentials, provider)
+            await store.setCredentials(credentials, provider)
             getLogger().debug(`credentials: refresh succeeded for: ${formatProviderId()}`)
             result = 'Succeeded'
 
@@ -336,13 +366,13 @@ function createCredentialsShim(
             if (error instanceof ToolkitError && error.cancelled) {
                 result = 'Cancelled'
             } else {
-                showViewLogsMessage(`Failed to refresh credentials: ${(error as any)?.message}`)
+                void showViewLogsMessage(`Failed to refresh credentials: ${(error as any)?.message}`)
             }
 
             state.credentials = undefined
             store.invalidateCredentials(providerId)
             globals.awsContext.credentialsShim = undefined
-            globals.awsContext.setCredentials(undefined, true)
+            await globals.awsContext.setCredentials(undefined, true)
 
             throw error
         } finally {
diff --git a/packages/core/src/auth/index.ts b/packages/core/src/auth/index.ts
new file mode 100644
index 00000000000..a5a3ca0edd9
--- /dev/null
+++ b/packages/core/src/auth/index.ts
@@ -0,0 +1,28 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * The auth specific code we are exporting to consumers of `core`.
+ *
+ * This module is exposed through `exports` in the `package.json` file
+ */
+export { initialize as initializeAuth } from './activation'
+export { initializeAwsCredentialsStatusBarItem } from './ui/statusBarItem'
+export {
+    Connection,
+    AwsConnection,
+    SsoConnection,
+    isAnySsoConnection,
+    isBuilderIdConnection,
+    getTelemetryMetadataForConn,
+    isIamConnection,
+    isSsoConnection,
+    areCredentialsEqual,
+} from './connection'
+export { Auth } from './auth'
+export { CredentialsStore } from './credentials/store'
+export { LoginManager } from './deprecated/loginManager'
+export * as AuthUtils from './utils'
+export * as credentialsValidation from './credentials/validation'
diff --git a/packages/core/src/auth/providers/credentials.ts b/packages/core/src/auth/providers/credentials.ts
new file mode 100644
index 00000000000..2c86ffee4df
--- /dev/null
+++ b/packages/core/src/auth/providers/credentials.ts
@@ -0,0 +1,131 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as AWS from '@aws-sdk/types'
+import { CredentialSourceId, CredentialType } from '../../shared/telemetry/telemetry'
+
+const credentialsProviderIdSeparator = ':'
+
+/**
+ * "Fully-qualified" credentials structure (source + name).
+ */
+export interface CredentialsId {
+    /** Credentials source id, e.g. "sharedCredentials". */
+    readonly credentialSource: CredentialsProviderType
+    /** User-defined profile name, e.g. "default". */
+    readonly credentialTypeId: string
+}
+
+/**
+ * Gets the string form of the given `CredentialsProvider`.
+ *
+ * For use in e.g. the statusbar, menus, etc.  Includes:
+ * - credentials source kind
+ * - instance-identifying information (typically the "profile name")
+ *
+ * @param credentials  Value to be formatted.
+ */
+export function asString(credentials: CredentialsId): string {
+    return [credentials.credentialSource, credentials.credentialTypeId].join(credentialsProviderIdSeparator)
+}
+
+export function fromString(credentials: string): CredentialsId {
+    const separatorPos = credentials.indexOf(credentialsProviderIdSeparator)
+
+    if (separatorPos === -1) {
+        throw new Error(`Unexpected credentialsId format: ${credentials}`)
+    }
+
+    const credSource = credentials.substring(0, separatorPos)
+    if (!credentialsProviderType.includes(credSource as any)) {
+        throw new Error(`unexpected credential source: ${credSource}`)
+    }
+
+    return {
+        credentialSource: credSource as CredentialsProviderType,
+        credentialTypeId: credentials.substring(separatorPos + 1),
+    }
+}
+
+export function isEqual(idA: CredentialsId, idB: CredentialsId): boolean {
+    return idA.credentialSource === idB.credentialSource && idA.credentialTypeId === idB.credentialTypeId
+}
+
+/**
+ * Credentials source type, broadly describes the kind of thing that supplied the credentials.
+ *
+ * - "profile" is the most common, this is understood as a profile defined in
+ *   `~/.aws/credentials` or something like it, which may be authenticated via
+ *   static values, SSO, MFA, etc.
+ * - "ec2" or "ecs" means "instance credentials" given by the EC2/ECS "metadata service"
+ *   magic endpoint.
+ *   https://docs.aws.amazon.com/sdkref/latest/guide/setting-global-credential_source.html
+ * - "env" means we read the credentials from `AWS_XX` environment variables.
+ *   https://docs.aws.amazon.com/sdkref/latest/guide/environment-variables.html
+ * - "sso" refers to all SSO-based profiles. Currently, any profile with a start URL will
+ *   be treated as SSO _by the Toolkit_. Incomplete profiles may be rejected by the SDKs, so
+ *   valid SSO profiles may not necessarily be considered valid among all tools.
+ * - "temp" refers to credentials that are used temporarily within the code.
+ *   This can be for something like testing raw credentials data
+ * Compare the similar concept `telemetry.CredentialSourceId`.
+ */
+export type CredentialsProviderType = (typeof credentialsProviderType)[number]
+export const credentialsProviderType = ['profile', 'ec2', 'ecs', 'env', 'sso', 'temp'] as const
+
+/**
+ * Lossy map of CredentialsProviderType to telemetry.CredentialSourceId
+ */
+export function credentialsProviderToTelemetryType(o: CredentialsProviderType): CredentialSourceId {
+    switch (o) {
+        case 'ec2':
+            return 'ec2'
+        case 'ecs':
+            return 'ecs'
+        case 'env':
+            return 'envVars'
+        case 'profile':
+            return 'sharedCredentials'
+        case 'sso':
+            return 'iamIdentityCenter'
+        default:
+            return 'other'
+    }
+}
+
+export interface CredentialsProvider {
+    getCredentialsId(): CredentialsId
+    /**
+     * Gets the credential provider type, a coarser form of
+     * telemetry.CredentialSourceId for use in config files and UIs. #1725
+     *
+     * Compare getCredentialsType(). A single _provider_ serves many types of credentials.
+     *
+     * @see telemetry.CredentialSourceId
+     */
+    getProviderType(): CredentialsProviderType
+    /**
+     * Gets the credential type, for use in telemetry.  This is more granular than
+     *
+     * Compare getCredentialsProviderType() which is type of the _provider_.
+     */
+    getTelemetryType(): CredentialType
+    getDefaultRegion(): string | undefined
+    /**
+     * Gets the endpoint URL configured for this profile, if any.
+     */
+    getEndpointUrl?(): string | undefined
+    getHashCode(): string
+    getCredentials(): Promise<AWS.Credentials>
+    /**
+     * Decides if the credential is the kind that may be auto-connected at
+     * first use (in particular, credentials that may prompt, such as SSO/MFA,
+     * should _not_ attempt to auto-connect).
+     */
+    canAutoConnect(): Promise<boolean>
+    /**
+     * Determines if the provider is currently capable of producing credentials.
+     */
+    isAvailable(): Promise<boolean>
+}
diff --git a/src/credentials/providers/credentialsProviderFactory.ts b/packages/core/src/auth/providers/credentialsProviderFactory.ts
similarity index 91%
rename from src/credentials/providers/credentialsProviderFactory.ts
rename to packages/core/src/auth/providers/credentialsProviderFactory.ts
index d0901eac282..e7b337bba4c 100644
--- a/src/credentials/providers/credentialsProviderFactory.ts
+++ b/packages/core/src/auth/providers/credentialsProviderFactory.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -52,7 +52,7 @@ export abstract class BaseCredentialsProviderFactory<T extends CredentialsProvid
     }
 
     protected removeProvider(provider: T) {
-        this.providers = this.providers.filter(x => x !== provider)
+        this.providers = this.providers.filter((x) => x !== provider)
     }
 
     protected resetProviders() {
diff --git a/packages/core/src/auth/providers/credentialsProviderManager.ts b/packages/core/src/auth/providers/credentialsProviderManager.ts
new file mode 100644
index 00000000000..ff2dcab5ac9
--- /dev/null
+++ b/packages/core/src/auth/providers/credentialsProviderManager.ts
@@ -0,0 +1,131 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { oneDay } from '../../shared/datetime'
+import { getLogger } from '../../shared/logger/logger'
+import { AwsLoadCredentials, telemetry } from '../../shared/telemetry/telemetry'
+import { withTelemetryContext } from '../../shared/telemetry/util'
+import { debounce } from '../../shared/utilities/functionUtils'
+import {
+    asString,
+    CredentialsProvider,
+    CredentialsId,
+    credentialsProviderToTelemetryType,
+    isEqual,
+} from './credentials'
+import { CredentialsProviderFactory } from './credentialsProviderFactory'
+
+const credentialsProviderManagerClassName = 'CredentialsProviderManager'
+/**
+ * Responsible for providing the Toolkit with all available CredentialsProviders.
+ * Providers may be registered directly or created with supplied CredentialsProviderFactories.
+ */
+export class CredentialsProviderManager {
+    private static INSTANCE: CredentialsProviderManager | undefined
+    private readonly providerFactories: CredentialsProviderFactory[] = []
+    private readonly providers: CredentialsProvider[] = []
+
+    @withTelemetryContext({ name: 'getAllCredentialsProvider', class: credentialsProviderManagerClassName })
+    public async getAllCredentialsProviders(): Promise<CredentialsProvider[]> {
+        let providers: CredentialsProvider[] = []
+
+        for (const provider of this.providers) {
+            if (await provider.isAvailable()) {
+                void this.emitWithDebounce({
+                    credentialSourceId: credentialsProviderToTelemetryType(
+                        provider.getCredentialsId().credentialSource
+                    ),
+                    value: 1,
+                })
+                providers = providers.concat(provider)
+            } else {
+                getLogger().verbose('auth: "%s" provider unavailable', provider.getCredentialsId().credentialTypeId)
+            }
+        }
+
+        for (const factory of this.providerFactories) {
+            await factory.refresh()
+            const refreshed = factory.listProviders()
+            const providerType = factory.getProviderType()
+            if (!providerType) {
+                continue
+            }
+
+            void this.emitWithDebounce({
+                credentialSourceId: credentialsProviderToTelemetryType(providerType),
+                value: refreshed.length,
+            })
+            providers = providers.concat(refreshed)
+        }
+
+        return providers
+    }
+    private emitWithDebounce = debounce((m: AwsLoadCredentials) => telemetry.aws_loadCredentials.emit(m), oneDay)
+    /**
+     * Returns a map of `CredentialsProviderId` string-forms to object-forms,
+     * from all credential sources. Only available providers are returned.
+     */
+    @withTelemetryContext({ name: 'getCredentialProviderNames', class: credentialsProviderManagerClassName })
+    public async getCredentialProviderNames(): Promise<{ [key: string]: CredentialsId }> {
+        const m: { [key: string]: CredentialsId } = {}
+        for (const o of await this.getAllCredentialsProviders()) {
+            m[asString(o.getCredentialsId())] = o.getCredentialsId()
+        }
+
+        return m
+    }
+
+    public async getCredentialsProvider(credentials: CredentialsId): Promise<CredentialsProvider | undefined> {
+        for (const provider of this.providers) {
+            if (isEqual(provider.getCredentialsId(), credentials) && (await provider.isAvailable())) {
+                return provider
+            }
+        }
+
+        for (const factory of this.providerFactories) {
+            await factory.refresh()
+
+            for (const provider of factory.listProviders()) {
+                if (isEqual(provider.getCredentialsId(), credentials) && (await provider.isAvailable())) {
+                    return provider
+                }
+            }
+        }
+
+        return undefined
+    }
+
+    public addProvider(provider: CredentialsProvider) {
+        this.removeProvider(provider.getCredentialsId())
+        this.providers.push(provider)
+    }
+
+    public addProviders(...provider: CredentialsProvider[]) {
+        this.providers.push(...provider)
+    }
+
+    public addProviderFactory(factory: CredentialsProviderFactory) {
+        this.providerFactories.push(factory)
+    }
+
+    public addProviderFactories(...factory: CredentialsProviderFactory[]) {
+        this.providerFactories.push(...factory)
+    }
+
+    public removeProvider(id: CredentialsId) {
+        const idx = this.providers.findIndex((p) => isEqual(id, p.getCredentialsId()))
+        if (idx !== -1) {
+            this.providers.splice(idx, 1)
+        }
+    }
+
+    public static getInstance(): CredentialsProviderManager {
+        if (!CredentialsProviderManager.INSTANCE) {
+            CredentialsProviderManager.INSTANCE = new CredentialsProviderManager()
+        }
+
+        return CredentialsProviderManager.INSTANCE
+    }
+}
diff --git a/src/credentials/providers/ec2CredentialsProvider.ts b/packages/core/src/auth/providers/ec2CredentialsProvider.ts
similarity index 94%
rename from src/credentials/providers/ec2CredentialsProvider.ts
rename to packages/core/src/auth/providers/ec2CredentialsProvider.ts
index 357b571ba36..00a6bf834b5 100644
--- a/src/credentials/providers/ec2CredentialsProvider.ts
+++ b/packages/core/src/auth/providers/ec2CredentialsProvider.ts
@@ -1,13 +1,13 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import { Credentials } from '@aws-sdk/types'
-import { fromInstanceMetadata } from '@aws-sdk/credential-provider-imds'
+import { fromInstanceMetadata } from '@smithy/credential-provider-imds'
 import { DefaultEc2MetadataClient } from '../../shared/clients/ec2MetadataClient'
 import { Ec2MetadataClient } from '../../shared/clients/ec2MetadataClient'
-import { getLogger } from '../../shared/logger'
+import { getLogger } from '../../shared/logger/logger'
 import { CredentialType } from '../../shared/telemetry/telemetry.gen'
 import { getStringHash } from '../../shared/utilities/textUtilities'
 import { CredentialsId, CredentialsProvider, CredentialsProviderType } from './credentials'
diff --git a/src/credentials/providers/ecsCredentialsProvider.ts b/packages/core/src/auth/providers/ecsCredentialsProvider.ts
similarity index 93%
rename from src/credentials/providers/ecsCredentialsProvider.ts
rename to packages/core/src/auth/providers/ecsCredentialsProvider.ts
index 9d965e1013f..cfc02b8ef1b 100644
--- a/src/credentials/providers/ecsCredentialsProvider.ts
+++ b/packages/core/src/auth/providers/ecsCredentialsProvider.ts
@@ -1,15 +1,15 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import { Credentials, CredentialProvider } from '@aws-sdk/types'
-import { fromContainerMetadata } from '@aws-sdk/credential-provider-imds'
+import { fromContainerMetadata } from '@smithy/credential-provider-imds'
 import { EnvironmentVariables } from '../../shared/environmentVariables'
 import { CredentialType } from '../../shared/telemetry/telemetry.gen'
 import { getStringHash } from '../../shared/utilities/textUtilities'
 import { CredentialsId, CredentialsProvider, CredentialsProviderType } from './credentials'
-import { getLogger } from '../../shared/logger'
+import { getLogger } from '../../shared/logger/logger'
 import globals from '../../shared/extensionGlobals'
 
 /**
diff --git a/src/credentials/providers/envVarsCredentialsProvider.ts b/packages/core/src/auth/providers/envVarsCredentialsProvider.ts
similarity index 88%
rename from src/credentials/providers/envVarsCredentialsProvider.ts
rename to packages/core/src/auth/providers/envVarsCredentialsProvider.ts
index 925027ed200..14cac0907a0 100644
--- a/src/credentials/providers/envVarsCredentialsProvider.ts
+++ b/packages/core/src/auth/providers/envVarsCredentialsProvider.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -61,4 +61,9 @@ export class EnvVarsCredentialsProvider implements CredentialsProvider {
         }
         return this.credentials
     }
+
+    public getEndpointUrl(): string | undefined {
+        const env = process.env as EnvironmentVariables
+        return env.AWS_ENDPOINT_URL?.toString()
+    }
 }
diff --git a/packages/core/src/auth/providers/sharedCredentialsProvider.ts b/packages/core/src/auth/providers/sharedCredentialsProvider.ts
new file mode 100644
index 00000000000..02d8f9b40f8
--- /dev/null
+++ b/packages/core/src/auth/providers/sharedCredentialsProvider.ts
@@ -0,0 +1,473 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as AWS from '@aws-sdk/types'
+import { fromProcess } from '@aws-sdk/credential-provider-process'
+import { ParsedIniData } from '@smithy/types'
+import { chain } from '@aws-sdk/property-provider'
+import { fromInstanceMetadata, fromContainerMetadata } from '@smithy/credential-provider-imds'
+import { fromEnv } from '@aws-sdk/credential-provider-env'
+import { getLogger } from '../../shared/logger/logger'
+import { getStringHash } from '../../shared/utilities/textUtilities'
+import { getMfaTokenFromUser, resolveProviderWithCancel } from '../credentials/utils'
+import { CredentialsProvider, CredentialsProviderType, CredentialsId } from './credentials'
+import { CredentialType } from '../../shared/telemetry/telemetry.gen'
+import { assertHasProps, getMissingProps, hasProps } from '../../shared/utilities/tsUtils'
+import { DefaultStsClient } from '../../shared/clients/stsClient'
+import { SsoAccessTokenProvider } from '../sso/ssoAccessTokenProvider'
+import { SsoClient } from '../sso/clients'
+import { toRecord } from '../../shared/utilities/collectionUtils'
+import {
+    extractDataFromSection,
+    getRequiredFields,
+    getSectionDataOrThrow,
+    getSectionOrThrow,
+    isProfileSection,
+    Profile,
+    Section,
+} from '../credentials/sharedCredentials'
+import { CredentialsData, SectionName, SharedCredentialsKeys } from '../credentials/types'
+import { SsoProfile, hasScopes, scopesSsoAccountAccess } from '../connection'
+import { builderIdStartUrl } from '../sso/constants'
+import { ToolkitError } from '../../shared/errors'
+
+const credentialSources = {
+    ECS_CONTAINER: 'EcsContainer',
+    EC2_INSTANCE_METADATA: 'Ec2InstanceMetadata',
+    ENVIRONMENT: 'Environment',
+}
+
+function validateProfile(profile: Profile, ...props: string[]): string | undefined {
+    const missing = getMissingProps(profile, ...props)
+
+    if (missing.length !== 0) {
+        return `missing properties: ${missing.join(', ')}`
+    }
+}
+
+function isSsoProfile(profile: Profile): boolean {
+    return (
+        hasProps(profile, SharedCredentialsKeys.SSO_SESSION) ||
+        hasProps(profile, SharedCredentialsKeys.SSO_START_URL) ||
+        hasProps(profile, SharedCredentialsKeys.SSO_REGION) ||
+        hasProps(profile, SharedCredentialsKeys.SSO_ROLE_NAME) ||
+        hasProps(profile, SharedCredentialsKeys.SSO_ACCOUNT_ID)
+    )
+}
+
+/**
+ * Represents one profile from the AWS Shared Credentials files.
+ */
+export class SharedCredentialsProvider implements CredentialsProvider {
+    private readonly section = getSectionOrThrow(this.sections, this.profileName, 'profile')
+    private readonly profile = extractDataFromSection(this.section)
+
+    public constructor(
+        private readonly profileName: string,
+        private readonly sections: Section[]
+    ) {}
+
+    public getCredentialsId(): CredentialsId {
+        return {
+            credentialSource: this.getProviderType(),
+            credentialTypeId: this.profileName,
+        }
+    }
+
+    public static getProviderType(): CredentialsProviderType {
+        return 'profile'
+    }
+
+    public getProviderType(): CredentialsProviderType {
+        return SharedCredentialsProvider.getProviderType()
+    }
+
+    public getTelemetryType(): CredentialType {
+        if (hasProps(this.profile, SharedCredentialsKeys.SSO_START_URL)) {
+            return 'ssoProfile'
+        } else if (this.isCredentialSource(credentialSources.EC2_INSTANCE_METADATA)) {
+            return 'ec2Metadata'
+        } else if (this.isCredentialSource(credentialSources.ECS_CONTAINER)) {
+            return 'ecsMetatdata' // TODO: fix telemetry value typo
+        } else if (this.isCredentialSource(credentialSources.ENVIRONMENT)) {
+            return 'other'
+        }
+        return 'staticProfile'
+    }
+
+    public getHashCode(): string {
+        return getStringHash(JSON.stringify(this.profile))
+    }
+
+    public getDefaultRegion(): string | undefined {
+        return this.profile[SharedCredentialsKeys.REGION]
+    }
+
+    public getEndpointUrl(): string | undefined {
+        return this.profile[SharedCredentialsKeys.ENDPOINT_URL]?.trim()
+    }
+
+    public async canAutoConnect(): Promise<boolean> {
+        if (isSsoProfile(this.profile)) {
+            const tokenProvider = SsoAccessTokenProvider.create({
+                region: this.profile[SharedCredentialsKeys.SSO_REGION]!,
+                startUrl: this.profile[SharedCredentialsKeys.SSO_START_URL]!,
+            })
+
+            return (await tokenProvider.getToken()) !== undefined
+        }
+
+        return !hasProps(this.profile, SharedCredentialsKeys.MFA_SERIAL)
+    }
+
+    public async isAvailable(): Promise<boolean> {
+        const validationMessage = this.validate()
+        if (validationMessage) {
+            getLogger().error(`Profile ${this.profileName} is not a valid Credential Profile: ${validationMessage}`)
+            return false
+        }
+
+        // XXX: hide builder ID profiles until account linking is supported
+        try {
+            const ssoProfile = this.getSsoProfileFromProfile()
+            if (ssoProfile.startUrl === builderIdStartUrl) {
+                getLogger().verbose(
+                    `Profile ${this.profileName} uses Builder ID which is not supported for sigv4 auth.`
+                )
+                return false
+            }
+        } catch {
+            // Swallow error. Continue as-if it were valid.
+        }
+
+        return true
+    }
+
+    private getProfile(name: SectionName) {
+        return getSectionDataOrThrow(this.sections, name, 'profile')
+    }
+
+    private getSsoProfileFromProfile(): SsoProfile & { identifier?: string } {
+        const defaultRegion = this.getDefaultRegion() ?? 'us-east-1'
+        const sessionName = this.profile[SharedCredentialsKeys.SSO_SESSION]
+        if (sessionName === undefined) {
+            assertHasProps(this.profile, SharedCredentialsKeys.SSO_START_URL)
+
+            return {
+                type: 'sso',
+                scopes: scopesSsoAccountAccess,
+                startUrl: this.profile[SharedCredentialsKeys.SSO_START_URL],
+                ssoRegion: this.profile[SharedCredentialsKeys.SSO_REGION] ?? defaultRegion,
+            }
+        }
+
+        const sessionData = getSectionDataOrThrow(this.sections, sessionName, 'sso-session')
+        const scopes = sessionData[SharedCredentialsKeys.SSO_REGISTRATION_SCOPES]
+        assertHasProps(sessionData, SharedCredentialsKeys.SSO_START_URL)
+
+        return {
+            type: 'sso',
+            identifier: sessionName,
+            scopes: scopes?.split(',').map((s) => s.trim()),
+            startUrl: sessionData[SharedCredentialsKeys.SSO_START_URL],
+            ssoRegion: sessionData[SharedCredentialsKeys.SSO_REGION] ?? defaultRegion,
+        }
+    }
+
+    /**
+     * Returns undefined if the Profile is valid, else a string indicating what is invalid
+     */
+    public validate(): string | undefined {
+        if (hasProps(this.profile, SharedCredentialsKeys.CREDENTIAL_SOURCE)) {
+            return this.validateSourcedCredentials()
+        } else if (hasProps(this.profile, SharedCredentialsKeys.ROLE_ARN)) {
+            return this.validateSourceProfileChain()
+        } else if (hasProps(this.profile, SharedCredentialsKeys.CREDENTIAL_PROCESS)) {
+            // No validation. Don't check anything else.
+            return undefined
+        } else if (
+            hasProps(this.profile, SharedCredentialsKeys.AWS_ACCESS_KEY_ID) ||
+            hasProps(this.profile, SharedCredentialsKeys.AWS_SECRET_ACCESS_KEY) ||
+            hasProps(this.profile, SharedCredentialsKeys.AWS_SESSION_TOKEN)
+        ) {
+            return validateProfile(
+                this.profile,
+                SharedCredentialsKeys.AWS_ACCESS_KEY_ID,
+                SharedCredentialsKeys.AWS_SECRET_ACCESS_KEY
+            )
+        } else if (isSsoProfile(this.profile)) {
+            return undefined
+        } else {
+            return 'not supported by the Toolkit'
+        }
+    }
+
+    /**
+     * Patches 'source_profile' credentials as static representations, which the SDK can handle in all cases.
+     *
+     * XXX: Returns undefined if no `source_profile` property exists. Else we would prevent the SDK from re-reading
+     * the shared credential files if they were to change. #1953
+     *
+     * The SDK is unable to resolve `source_profile` fields when the source profile uses SSO/MFA/credential_process.
+     * We can handle this resolution ourselves, giving the SDK the resolved credentials by 'pre-loading' them.
+     */
+    private async patchSourceCredentials(): Promise<ParsedIniData | undefined> {
+        if (!hasProps(this.profile, SharedCredentialsKeys.SOURCE_PROFILE)) {
+            return undefined
+        }
+
+        const loadedCreds: ParsedIniData = {}
+
+        const source = new SharedCredentialsProvider(this.profile[SharedCredentialsKeys.SOURCE_PROFILE]!, this.sections)
+        const creds = await source.getCredentials()
+        loadedCreds[this.profile[SharedCredentialsKeys.SOURCE_PROFILE]!] = {
+            [SharedCredentialsKeys.AWS_ACCESS_KEY_ID]: creds.accessKeyId,
+            [SharedCredentialsKeys.AWS_SECRET_ACCESS_KEY]: creds.secretAccessKey,
+            [SharedCredentialsKeys.AWS_SESSION_TOKEN]: creds.sessionToken,
+        }
+        loadedCreds[this.profileName] = {
+            [SharedCredentialsKeys.MFA_SERIAL]: source.profile[SharedCredentialsKeys.MFA_SERIAL],
+        }
+
+        loadedCreds[this.profileName] = {
+            ...loadedCreds[this.profileName],
+            ...this.profile,
+        }
+
+        return loadedCreds
+    }
+
+    public async getCredentials(): Promise<AWS.Credentials> {
+        const validationMessage = this.validate()
+        if (validationMessage) {
+            throw new Error(`Profile ${this.profileName} is not a valid Credential Profile: ${validationMessage}`)
+        }
+
+        const loadedCreds = await this.patchSourceCredentials()
+
+        const provider = chain(this.makeCredentialsProvider(loadedCreds))
+
+        // SSO profiles already show a notification, no need to show another
+        if (isSsoProfile(this.profile)) {
+            return provider()
+        } else {
+            return resolveProviderWithCancel(this.profileName, provider())
+        }
+    }
+
+    /**
+     * Returns undefined if the Profile Chain is valid, else a string indicating what is invalid
+     */
+    private validateSourceProfileChain(): string | undefined {
+        const profilesTraversed: string[] = [this.profileName]
+
+        let profile = this.profile
+
+        while (profile[SharedCredentialsKeys.SOURCE_PROFILE]) {
+            const profileName = profile[SharedCredentialsKeys.SOURCE_PROFILE]!
+
+            // Cycle
+            if (profilesTraversed.includes(profileName)) {
+                profilesTraversed.push(profileName)
+
+                return `Cycle detected within Shared Credentials Profiles. Reference chain: ${profilesTraversed.join(
+                    ' -> '
+                )}`
+            }
+
+            profilesTraversed.push(profileName)
+
+            // Missing reference
+            if (!this.sections.some((s) => s.name === profileName && s.type === 'profile')) {
+                return `Shared Credentials Profile ${profileName} not found. Reference chain: ${profilesTraversed.join(
+                    ' -> '
+                )}`
+            }
+
+            profile = this.getProfile(profileName)
+        }
+    }
+
+    private validateSourcedCredentials(): string | undefined {
+        if (hasProps(this.profile, SharedCredentialsKeys.SOURCE_PROFILE)) {
+            return `credential_source and source_profile cannot both be set`
+        }
+
+        const source = this.profile[SharedCredentialsKeys.CREDENTIAL_SOURCE]!
+        if (!Object.values(credentialSources).includes(source)) {
+            return `Credential source ${this.profile[SharedCredentialsKeys.CREDENTIAL_SOURCE]} is not supported`
+        }
+    }
+
+    private makeCredentialsProvider(loadedCreds?: ParsedIniData): AWS.CredentialProvider {
+        const logger = getLogger()
+
+        if (hasProps(this.profile, SharedCredentialsKeys.CREDENTIAL_SOURCE)) {
+            logger.verbose(
+                `Profile ${this.profileName} contains ${SharedCredentialsKeys.CREDENTIAL_SOURCE} - treating as Environment Credentials`
+            )
+            return this.makeSourcedCredentialsProvider()
+        }
+
+        if (hasProps(this.profile, SharedCredentialsKeys.ROLE_ARN)) {
+            logger.verbose(
+                `Profile ${this.profileName} contains ${SharedCredentialsKeys.ROLE_ARN} - treating as regular Shared Credentials`
+            )
+
+            return this.makeSharedIniFileCredentialsProvider(loadedCreds)
+        }
+
+        if (hasProps(this.profile, SharedCredentialsKeys.CREDENTIAL_PROCESS)) {
+            logger.verbose(
+                `Profile ${this.profileName} contains ${SharedCredentialsKeys.CREDENTIAL_PROCESS} - treating as Process Credentials`
+            )
+
+            return fromProcess({ profile: this.profileName })
+        }
+
+        if (hasProps(this.profile, SharedCredentialsKeys.AWS_SESSION_TOKEN)) {
+            logger.verbose(
+                `Profile ${this.profileName} contains ${SharedCredentialsKeys.AWS_SESSION_TOKEN} - treating as regular Shared Credentials`
+            )
+
+            return this.makeSharedIniFileCredentialsProvider(loadedCreds)
+        }
+
+        if (hasProps(this.profile, SharedCredentialsKeys.AWS_ACCESS_KEY_ID)) {
+            logger.verbose(
+                `Profile ${this.profileName} contains ${SharedCredentialsKeys.AWS_ACCESS_KEY_ID} - treating as regular Shared Credentials`
+            )
+
+            return this.makeSharedIniFileCredentialsProvider(loadedCreds)
+        }
+
+        if (isSsoProfile(this.profile)) {
+            logger.verbose(`Profile ${this.profileName} is an SSO profile - treating as SSO Credentials`)
+
+            return this.makeSsoCredentaislProvider()
+        }
+
+        logger.error(`Profile ${this.profileName} did not contain any supported properties`)
+        throw new Error(`Shared Credentials profile ${this.profileName} is not supported`)
+    }
+
+    private makeSsoCredentaislProvider() {
+        const ssoProfile = this.getSsoProfileFromProfile()
+        if (!hasScopes(ssoProfile, scopesSsoAccountAccess)) {
+            throw new Error(`Session for "${this.profileName}" is missing required scope: sso:account:access`)
+        }
+
+        const region = ssoProfile.ssoRegion
+        const tokenProvider = SsoAccessTokenProvider.create({ ...ssoProfile, region })
+        const client = SsoClient.create(region, tokenProvider)
+
+        return async () => {
+            if ((await tokenProvider.getToken()) === undefined) {
+                await tokenProvider.createToken()
+            }
+
+            const data = getRequiredFields(
+                this.section,
+                SharedCredentialsKeys.SSO_ACCOUNT_ID,
+                SharedCredentialsKeys.SSO_ROLE_NAME
+            )
+
+            return client.getRoleCredentials({
+                accountId: data[SharedCredentialsKeys.SSO_ACCOUNT_ID],
+                roleName: data[SharedCredentialsKeys.SSO_ROLE_NAME],
+            })
+        }
+    }
+
+    private makeSharedIniFileCredentialsProvider(loadedCreds?: ParsedIniData): AWS.CredentialProvider {
+        // Our credentials logic merges profiles from the credentials and config files but SDK v3 does not
+        // This can cause odd behavior where the Toolkit can switch to a profile but not authenticate with it
+        // So the workaround is to do give the SDK the merged profiles directly
+        const profileSections = this.sections.filter(isProfileSection)
+        const profiles = toRecord(
+            profileSections.map((s) => s.name),
+            (k) => this.getProfile(k)
+        )
+
+        return async () => {
+            const iniData = loadedCreds ?? profiles
+            const profile: CredentialsData = iniData[this.profileName]
+            if (!profile) {
+                throw new ToolkitError(`auth: Profile ${this.profileName} not found`)
+            }
+            // No role to assume, return static credentials.
+            if (!profile.role_arn) {
+                return {
+                    accessKeyId: profile.aws_access_key_id!,
+                    secretAccessKey: profile.aws_secret_access_key!,
+                    sessionToken: profile.aws_session_token,
+                }
+            }
+            if (!profile.source_profile || !iniData[profile.source_profile]) {
+                throw new ToolkitError(
+                    `auth: Profile ${this.profileName} is missing source_profile for role assumption`
+                )
+            }
+
+            // Check if we already have resolved credentials from patchSourceCredentials
+            const sourceProfile = iniData[profile.source_profile!]
+            let sourceCredentials: AWS.Credentials
+
+            if (sourceProfile.aws_access_key_id && sourceProfile.aws_secret_access_key) {
+                // Source credentials have already been resolved
+                sourceCredentials = {
+                    accessKeyId: sourceProfile.aws_access_key_id,
+                    secretAccessKey: sourceProfile.aws_secret_access_key,
+                    sessionToken: sourceProfile.aws_session_token,
+                }
+            } else {
+                // Source profile needs credential resolution - this should have been handled by patchSourceCredentials
+                // but if not, we need to resolve it here
+                const sourceProvider = new SharedCredentialsProvider(profile.source_profile!, this.sections)
+                sourceCredentials = await sourceProvider.getCredentials()
+            }
+
+            // Use source credentials to assume IAM role based on role ARN provided.
+            const stsClient = new DefaultStsClient(this.getDefaultRegion() ?? 'us-east-1', sourceCredentials)
+
+            // Prompt for MFA Token if needed.
+            const assumeRoleReq = {
+                RoleArn: profile.role_arn,
+                RoleSessionName: 'AssumeRoleSession',
+                ...(profile.mfa_serial
+                    ? {
+                          SerialNumber: profile.mfa_serial,
+                          TokenCode: await getMfaTokenFromUser(profile.mfa_serial, this.profileName),
+                      }
+                    : {}),
+            }
+            const assumeRoleRsp = await stsClient.assumeRole(assumeRoleReq)
+            return {
+                accessKeyId: assumeRoleRsp.Credentials!.AccessKeyId!,
+                secretAccessKey: assumeRoleRsp.Credentials!.SecretAccessKey!,
+                sessionToken: assumeRoleRsp.Credentials?.SessionToken,
+                expiration: assumeRoleRsp.Credentials?.Expiration,
+            }
+        }
+    }
+
+    private makeSourcedCredentialsProvider(): AWS.CredentialProvider {
+        if (this.isCredentialSource(credentialSources.EC2_INSTANCE_METADATA)) {
+            return fromInstanceMetadata()
+        } else if (this.isCredentialSource(credentialSources.ECS_CONTAINER)) {
+            return fromContainerMetadata()
+        } else if (this.isCredentialSource(credentialSources.ENVIRONMENT)) {
+            return fromEnv()
+        }
+        throw new Error(`Credential source ${this.profile[SharedCredentialsKeys.CREDENTIAL_SOURCE]} is not supported`)
+    }
+
+    private isCredentialSource(source: string): boolean {
+        if (hasProps(this.profile, SharedCredentialsKeys.CREDENTIAL_SOURCE)) {
+            return this.profile[SharedCredentialsKeys.CREDENTIAL_SOURCE] === source
+        }
+        return false
+    }
+}
diff --git a/packages/core/src/auth/providers/sharedCredentialsProviderFactory.ts b/packages/core/src/auth/providers/sharedCredentialsProviderFactory.ts
new file mode 100644
index 00000000000..93a0d96d475
--- /dev/null
+++ b/packages/core/src/auth/providers/sharedCredentialsProviderFactory.ts
@@ -0,0 +1,55 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { getLogger, Logger } from '../../shared/logger/logger'
+import { loadSharedCredentialsSections, updateAwsSdkLoadConfigEnvVar } from '../credentials/sharedCredentials'
+import { CredentialsProviderType } from './credentials'
+import { BaseCredentialsProviderFactory } from './credentialsProviderFactory'
+import { SharedCredentialsProvider } from './sharedCredentialsProvider'
+
+export class SharedCredentialsProviderFactory extends BaseCredentialsProviderFactory<SharedCredentialsProvider> {
+    private readonly logger: Logger = getLogger()
+
+    public async refresh(): Promise<void> {
+        await this.loadSharedCredentialsProviders()
+    }
+
+    public override getProviderType(): CredentialsProviderType | undefined {
+        return SharedCredentialsProvider.getProviderType()
+    }
+
+    private async loadSharedCredentialsProviders(): Promise<void> {
+        this.resetProviders()
+
+        const result = await loadSharedCredentialsSections()
+        if (result.errors.length > 0) {
+            const errors = result.errors.map((e) => e.message).join('\t\n')
+            getLogger().warn(`credentials: errors while parsing:\n%s`, errors)
+        }
+        await updateAwsSdkLoadConfigEnvVar()
+
+        getLogger().verbose(
+            `credentials: found sections: ${result.sections.map((s) => `${s.type}:${s.name}`).join(' ')}`
+        )
+        for (const section of result.sections) {
+            if (section.type === 'profile') {
+                await this.addProviderIfValid(
+                    section.name,
+                    new SharedCredentialsProvider(section.name, result.sections)
+                )
+            }
+        }
+    }
+
+    private async addProviderIfValid(profileName: string, provider: SharedCredentialsProvider): Promise<void> {
+        if (!(await provider.isAvailable())) {
+            this.logger.warn(
+                `Shared Credentials Profile ${profileName} is not valid. It will not be used by the toolkit.`
+            )
+        } else {
+            this.addProvider(provider)
+        }
+    }
+}
diff --git a/packages/core/src/auth/providers/ssoCredentialsProvider.ts b/packages/core/src/auth/providers/ssoCredentialsProvider.ts
new file mode 100644
index 00000000000..e04ce1a3c06
--- /dev/null
+++ b/packages/core/src/auth/providers/ssoCredentialsProvider.ts
@@ -0,0 +1,69 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Credentials } from '@aws-sdk/types'
+import { CredentialType } from '../../shared/telemetry/telemetry.gen'
+import { getStringHash } from '../../shared/utilities/textUtilities'
+import { CredentialsId, CredentialsProvider, CredentialsProviderType } from './credentials'
+import { SsoClient } from '../sso/clients'
+import { SsoAccessTokenProvider } from '../sso/ssoAccessTokenProvider'
+
+export class SsoCredentialsProvider implements CredentialsProvider {
+    public constructor(
+        private readonly id: CredentialsId,
+        private readonly client: SsoClient,
+        private readonly tokenProvider: SsoAccessTokenProvider,
+        private readonly accountId: string,
+        private readonly roleName: string
+    ) {}
+
+    public async isAvailable(): Promise<boolean> {
+        return true
+    }
+
+    public getCredentialsId(): CredentialsId {
+        return this.id
+    }
+
+    public getProviderType(): CredentialsProviderType {
+        return this.id.credentialSource
+    }
+
+    public getTelemetryType(): CredentialType {
+        return 'ssoProfile'
+    }
+
+    public getDefaultRegion(): string | undefined {
+        return this.client.region
+    }
+
+    public getHashCode(): string {
+        return getStringHash(this.accountId + this.roleName)
+    }
+
+    public async canAutoConnect(): Promise<boolean> {
+        return this.hasToken()
+    }
+
+    public async getCredentials(): Promise<Credentials> {
+        if (!(await this.hasToken())) {
+            await this.tokenProvider.createToken()
+        }
+
+        return this.client.getRoleCredentials({
+            accountId: this.accountId,
+            roleName: this.roleName,
+        })
+    }
+
+    private async hasToken() {
+        return (await this.tokenProvider.getToken()) !== undefined
+    }
+
+    // SsoCredentials are managed internally in the AWS Toolkit, so the endpointUrl can't be configured
+    public getEndpointUrl(): undefined {
+        return undefined
+    }
+}
diff --git a/packages/core/src/auth/providers/tempCredentialsProvider.ts b/packages/core/src/auth/providers/tempCredentialsProvider.ts
new file mode 100644
index 00000000000..4ce88fb0cf3
--- /dev/null
+++ b/packages/core/src/auth/providers/tempCredentialsProvider.ts
@@ -0,0 +1,72 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Credentials } from '@aws-sdk/types'
+import { CredentialType } from '../../shared/telemetry/telemetry.gen'
+import { getStringHash } from '../../shared/utilities/textUtilities'
+import { CredentialsId, CredentialsProvider, CredentialsProviderType } from './credentials'
+import { StaticProfile } from '../credentials/types'
+import { Auth } from '../auth'
+
+/**
+ * HACK: A credentials provider for a temporary use case.
+ *
+ * This provides the bare minimum way to use credentials
+ * in the rest of the system.
+ *
+ * It is currently only used in {@link Auth} and is hidden
+ * within the class.
+ */
+export class TempCredentialProvider implements CredentialsProvider {
+    private credentials: StaticProfile
+    constructor(data: StaticProfile) {
+        this.credentials = {
+            aws_access_key_id: data.aws_access_key_id,
+            aws_secret_access_key: data.aws_secret_access_key,
+        }
+    }
+
+    public async isAvailable(): Promise<boolean> {
+        return true
+    }
+
+    public getCredentialsId(): CredentialsId {
+        return {
+            credentialSource: this.getProviderType(),
+            credentialTypeId: this.getHashCode(),
+        }
+    }
+
+    public static getProviderType(): CredentialsProviderType {
+        return 'temp'
+    }
+
+    public getProviderType(): CredentialsProviderType {
+        return TempCredentialProvider.getProviderType()
+    }
+
+    public getTelemetryType(): CredentialType {
+        return 'other'
+    }
+
+    public getHashCode(): string {
+        return getStringHash(JSON.stringify(this.credentials))
+    }
+
+    public getDefaultRegion(): string | undefined {
+        return undefined
+    }
+
+    public async canAutoConnect(): Promise<boolean> {
+        return false
+    }
+
+    public async getCredentials(): Promise<Credentials> {
+        return {
+            accessKeyId: this.credentials.aws_access_key_id,
+            secretAccessKey: this.credentials.aws_secret_access_key,
+        }
+    }
+}
diff --git a/packages/core/src/auth/secondaryAuth.ts b/packages/core/src/auth/secondaryAuth.ts
new file mode 100644
index 00000000000..f8ea5d9b44f
--- /dev/null
+++ b/packages/core/src/auth/secondaryAuth.ts
@@ -0,0 +1,432 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../shared/logger/logger'
+import { cast, Optional } from '../shared/utilities/typeConstructors'
+import { Auth } from './auth'
+import { onceChanged } from '../shared/utilities/functionUtils'
+import { isNonNullable } from '../shared/utilities/tsUtils'
+import { ToolIdStateKey } from '../shared/globalState'
+import { Connection, getTelemetryMetadataForConn, SsoConnection, StatefulConnection } from './connection'
+import { indent } from '../shared/utilities/textUtilities'
+import { AuthModifyConnection, AuthStatus, Span, telemetry } from '../shared/telemetry/telemetry'
+import { asStringifiedStack } from '../shared/telemetry/spans'
+import { withTelemetryContext } from '../shared/telemetry/util'
+import { isNetworkError } from '../shared/errors'
+import globals from '../shared/extensionGlobals'
+
+export type ToolId = 'codecatalyst' | 'codewhisperer' | 'testId' | 'smus'
+
+let currentConn: Auth['activeConnection']
+const auths = new Map<string, SecondaryAuth>()
+const multiConnectionListeners = new WeakMap<Auth, vscode.Disposable>()
+const registerAuthListener = (auth: Auth) => {
+    return auth.onDidChangeActiveConnection(async (newConn) => {
+        // When we change the active connection, there may be
+        // secondary auths that were dependent on the previous active connection.
+        // To ensure secondary auths still work, when we change to a new active connection,
+        // the following will "save" the oldConn with the secondary auths that are using it.
+        const oldConn = currentConn
+        if (newConn && oldConn?.state === 'valid') {
+            const saveableAuths = Array.from(auths.values()).filter(
+                (a) => !a.hasSavedConnection && a.isUsable(oldConn) && !a.isUsable(newConn)
+            )
+            await Promise.all(saveableAuths.map((a) => a.saveConnection(oldConn)))
+        }
+        currentConn = newConn
+    })
+}
+
+export function getSecondaryAuth<T extends Connection>(
+    auth: Auth,
+    toolId: ToolId,
+    toolLabel: string,
+    isValid: (conn: Connection) => conn is T
+): SecondaryAuth<T> {
+    const secondary = new SecondaryAuth(toolId, toolLabel, isValid, auth)
+    auths.set(toolId, secondary)
+    secondary.onDidChangeActiveConnection(() => onDidChangeConnectionsEmitter.fire())
+
+    if (!multiConnectionListeners.has(auth)) {
+        multiConnectionListeners.set(auth, registerAuthListener(auth))
+    }
+
+    return secondary
+}
+
+/**
+ * Gets all {@link SecondaryAuth} instances that have saved the connection
+ */
+export function getDependentAuths(conn: Connection): SecondaryAuth[] {
+    return Array.from(auths.values()).filter((auth) => auth.hasSavedConnection && auth.activeConnection?.id === conn.id)
+}
+
+export function getAllConnectionsInUse(auth: Auth): StatefulConnection[] {
+    const connMap = new Map<Connection['id'], StatefulConnection>()
+    const toolConns = Array.from(auths.values())
+        .filter((a) => a.hasSavedConnection)
+        .map((a) => a.activeConnection)
+
+    for (const conn of [auth.activeConnection, ...toolConns].filter(isNonNullable)) {
+        connMap.set(conn.id, { ...conn, state: auth.getConnectionState(conn) ?? 'invalid' })
+    }
+
+    return Array.from(connMap.values())
+}
+
+const onDidChangeConnectionsEmitter = new vscode.EventEmitter<void>()
+export const onDidChangeConnections = onDidChangeConnectionsEmitter.event
+
+// Variable must be declared outside of class to work with decorators
+const secondaryAuthClassName = 'SecondaryAuth'
+/**
+ * Enables a tool to bind to a connection independently from the global {@link Auth} service.
+ *
+ * Not all connections are usable by every tool, so callers of this class must provide a function
+ * that can identify usable connections. Toolkit users are notified whenever a loss of functionality
+ * would occur after switching connections. Users can then choose to save the usable connection to
+ * the tool, allowing the global connection to move freely.
+ */
+export class SecondaryAuth<T extends Connection = Connection> {
+    #activeConnection: Connection | undefined
+    #savedConnection: T | undefined
+    protected static readonly logIfChanged = onceChanged((s: string) => getLogger().info(s))
+
+    private readonly key: ToolIdStateKey = `${this.toolId}.savedConnectionId`
+    readonly #onDidChangeActiveConnection = new vscode.EventEmitter<T | undefined>()
+    public readonly onDidChangeActiveConnection = this.#onDidChangeActiveConnection.event
+
+    public constructor(
+        public readonly toolId: ToolId,
+        public readonly toolLabel: string,
+        public readonly isUsable: (conn: Connection) => conn is T,
+        private readonly auth: Auth
+    ) {
+        const handleConnectionChanged = async (newActiveConn?: Connection) => {
+            if (newActiveConn === undefined && this.#activeConnection?.id) {
+                // The active connection was removed
+                await this.clearActiveConnection()
+            }
+
+            const previousActiveId = this.activeConnection?.id
+            this.#activeConnection = newActiveConn
+            if (this.activeConnection?.id !== previousActiveId) {
+                // The user will get a different active connection from before, so notify them.
+                this.#onDidChangeActiveConnection.fire(this.activeConnection)
+            }
+        }
+
+        this.auth.onDidUpdateConnection((conn) => {
+            if (this.#savedConnection?.id === conn.id) {
+                this.#savedConnection = conn as unknown as T
+                this.#onDidChangeActiveConnection.fire(this.activeConnection)
+            }
+        })
+
+        this.auth.onDidChangeConnectionState((e) => {
+            if (this.activeConnection?.id === e.id) {
+                this.#onDidChangeActiveConnection.fire(this.activeConnection)
+            }
+        })
+
+        // Register listener and handle connection immediately in case we were instantiated late
+        handleConnectionChanged(this.auth.activeConnection).catch((e) => {
+            getLogger().error('handleConnectionChanged() failed: %s', (e as Error).message)
+        })
+        this.auth.onDidChangeActiveConnection(handleConnectionChanged)
+        this.auth.onDidDeleteConnection(async (event) => {
+            if (event.connId === this.#activeConnection?.id) {
+                await this.clearActiveConnection()
+            }
+            if (event.connId === this.#savedConnection?.id) {
+                // Our saved connection does not exist anymore, delete the reference to it.
+                await this.clearSavedConnection()
+            }
+        })
+
+        const refreshConn = (event: string) => {
+            getLogger().debug(`secondaryAuth: detected ${event} event in sso cache, refreshing auth.`)
+            globals.clock.setTimeout(
+                telemetry.function_call.run(
+                    () => async () => {
+                        if (this.#savedConnection?.id === this.getStateConnectionId()) {
+                            // Someone updated our cache but the global state doesn't indicate anything new, so do nothing.
+                            // (it could have been us that updated the cache)
+                            getLogger().debug(
+                                `secondaryAuth: cache event did not update global state, no refresh is needed.`
+                            )
+                            return
+                        }
+                        await this.auth.restorePreviousSession()
+                        await this.restoreConnection(true)
+                    },
+                    {
+                        emit: false,
+                        functionId: { name: 'cacheWatchCallback', class: secondaryAuthClassName },
+                    }
+                ),
+                /**
+                 * The connection is first created and stored on disk, then it is stored in global state.
+                 * This creates a race condition for the callback, who listens to the disk event but
+                 * depends on the global state to make a connection decision. The time is arbitrary.
+                 *
+                 * TODO: fix this race condition.
+                 */
+                3000
+            )
+        }
+        this.auth.cacheWatcher.onDidCreate(() => refreshConn('create'))
+        this.auth.cacheWatcher.onDidDelete(() => refreshConn('delete'))
+    }
+
+    public get activeConnection(): T | undefined {
+        if (this.#savedConnection) {
+            return this.#savedConnection
+        }
+
+        if (this.#activeConnection && this.isUsable(this.#activeConnection)) {
+            return this.#activeConnection
+        }
+
+        return undefined
+    }
+
+    public get hasSavedConnection() {
+        return this.#savedConnection !== undefined
+    }
+
+    public get isConnectionExpired() {
+        if (this.activeConnection) {
+            SecondaryAuth.logIfChanged(
+                indent(
+                    `secondaryAuth: connectionId=${
+                        this.activeConnection.id
+                    }, connectionStatus=${this.auth.getConnectionState(this.activeConnection)}`,
+                    4,
+                    true
+                )
+            )
+        }
+        return !!this.activeConnection && this.auth.getConnectionState(this.activeConnection) === 'invalid'
+    }
+
+    public get state() {
+        return this.auth.getStateMemento()
+    }
+
+    public async saveConnection(conn: T) {
+        // TODO: fix this
+        // eslint-disable-next-line aws-toolkits/no-banned-usages
+        await this.state.update(this.key, conn.id)
+        this.#savedConnection = conn
+        this.#onDidChangeActiveConnection.fire(this.activeConnection)
+    }
+
+    /**
+     * Globally deletes the connection that this secondary auth is using,
+     * effectively doing a signout.
+     */
+    @withTelemetryContext({ name: 'deleteConnection', class: secondaryAuthClassName })
+    public async deleteConnection() {
+        if (this.activeConnection) {
+            await this.auth.deleteConnection(this.activeConnection)
+            await this.clearSavedConnection()
+        }
+    }
+
+    /**
+     * @warning Intended for a single use case where we need to let one service "forget" about a
+     * connection but leave it intact for other services. This may have unintended consequences.
+     * Use `deleteConnection()` instead.
+     *
+     * Clears the connection in use without deleting it or logging out.
+     */
+    public async forgetConnection() {
+        getLogger().debug('running SecondaryAuth:forgetConnection()')
+        await this.clearSavedConnection()
+        await this.clearActiveConnection()
+    }
+
+    /** Stop using the saved connection and fallback to using the active connection, if it is usable. */
+    public async clearSavedConnection() {
+        // TODO: fix this
+        // eslint-disable-next-line aws-toolkits/no-banned-usages
+        await this.state.update(this.key, undefined)
+        this.#savedConnection = undefined
+        this.#onDidChangeActiveConnection.fire(this.activeConnection)
+    }
+
+    public async clearActiveConnection() {
+        this.#activeConnection = undefined
+        if (this.#savedConnection) {
+            /**
+             * No need to emit event since user is currently
+             * using the saved connection
+             */
+            return
+        }
+        this.#onDidChangeActiveConnection.fire(undefined)
+    }
+
+    @withTelemetryContext({ name: 'useNewConnection', class: secondaryAuthClassName })
+    public async useNewConnection(conn: T): Promise<T> {
+        await this.saveConnection(conn)
+        if (this.auth.activeConnection === undefined) {
+            // Since no connection exists yet in the "primary" auth, we will make
+            // this connection available to all primary auth users
+            await this.auth.useConnection(conn)
+        }
+
+        return conn
+    }
+
+    public async addScopes(conn: T & SsoConnection, extraScopes: string[]) {
+        return await addScopes(conn, extraScopes, this.auth)
+    }
+
+    private hasRunRestoreConnection = false
+
+    // Used to lazily restore persisted connections.
+    // Kind of clunky. We need an async module loader layer to make things ergonomic.
+    @withTelemetryContext({ name: 'restoreConnection', class: secondaryAuthClassName })
+    public async restoreConnection(force: boolean = false): Promise<T | undefined> {
+        if (!force && (this.activeConnection !== undefined || this.hasRunRestoreConnection)) {
+            return
+        }
+        this.hasRunRestoreConnection = true
+
+        try {
+            return await telemetry.auth_modifyConnection.run(async (span) => {
+                span.record({
+                    source: asStringifiedStack(telemetry.getFunctionStack()),
+                    action: 'restore',
+                    id: 'undefined',
+                    connectionState: 'undefined',
+                })
+                await this.auth.tryAutoConnect()
+                this.#savedConnection = await this._loadSavedConnection(span)
+                this.#onDidChangeActiveConnection.fire(this.activeConnection)
+
+                const conn = this.#savedConnection
+                if (conn) {
+                    span.record({
+                        connectionState: this.auth.getConnectionState(conn),
+                        ...(await getTelemetryMetadataForConn(conn)),
+                    })
+                }
+
+                return this.#savedConnection
+            })
+        } catch (err) {
+            getLogger().warn(`auth (${this.toolId}): failed to restore connection: %s`, err)
+        }
+    }
+
+    /**
+     * Provides telemetry if called by restoreConnection() (or another auth_modifyConnection context)
+     */
+    private async _loadSavedConnection(span: Span<AuthModifyConnection>) {
+        const id = this.getStateConnectionId()
+        if (id === undefined) {
+            return
+        }
+
+        const conn = await this.auth.getConnection({ id })
+        if (conn === undefined) {
+            getLogger().warn(`auth (${this.toolId}): removing saved connection "${this.key}" as it no longer exists`)
+            await this.state.update(this.key, undefined)
+        } else if (!this.isUsable(conn)) {
+            getLogger().warn(`auth (${this.toolId}): saved connection "${this.key}" is not valid`)
+            await this.state.update(this.key, undefined)
+        } else {
+            const getAuthStatus = (state: ReturnType<typeof this.auth.getConnectionState>): AuthStatus => {
+                return state === 'invalid' ? 'expired' : 'connected'
+            }
+
+            let connectionState = this.auth.getConnectionState(conn)
+
+            // This function is expected to be called in the context of restoreConnection()
+            span.record({
+                connectionState,
+                authStatus: getAuthStatus(connectionState),
+            })
+
+            try {
+                await this.auth.refreshConnectionState(conn)
+
+                connectionState = this.auth.getConnectionState(conn)
+                span.record({
+                    connectionState,
+                    authStatus: getAuthStatus(connectionState),
+                })
+            } catch (err) {
+                // The purpose of this function is load a saved connection into memory, not manage the state.
+                // If updating the state fails, then we should delegate downstream to handle getting the proper state.
+                getLogger().error('loadSavedConnection: Failed to refresh connection state: %s', err)
+                if (isNetworkError(err) && connectionState === 'valid') {
+                    span.record({
+                        authStatus: 'connectedWithNetworkError',
+                    })
+                }
+            }
+            return conn
+        }
+    }
+
+    private getStateConnectionId() {
+        return cast(this.state.get(this.key), Optional(String))
+    }
+}
+
+/**
+ * Used to add scopes to a connection, usually when re-using a connection across extensions.
+ * It does not invalidate or otherwise change the state of the connection, but it does
+ * trigger listeners for connection updates.
+ *
+ * How connections and scopes currently work for both this quickpick and the common Login page:
+ * - Don't request AWS scopes if we are signing into Amazon Q
+ * - Request AWS scopes for explorer sign in. Request AWS + CodeCatalyst scopes for CC sign in.
+ * - Request scope difference if re-using a connection. Cancelling or otherwise failing to get the new scopes does NOT invalidate the connection.
+ * - Adding scopes updates the connection profile, but does not change its state.
+ *
+ * Note: This should exist in connection.ts or utils.ts, but due to circular dependencies, it must go here.
+ */
+export async function addScopes(conn: SsoConnection, extraScopes: string[], auth = Auth.instance) {
+    return telemetry.function_call.run(
+        async () => {
+            const oldScopes = conn.scopes ?? []
+            const newScopes = Array.from(new Set([...oldScopes, ...extraScopes]))
+
+            const updatedConn = await setScopes(conn, newScopes, auth)
+
+            try {
+                return await auth.reauthenticate(updatedConn, false)
+            } catch (e) {
+                // We updated the connection scopes pre-emptively, but if there is some issue (e.g. user cancels,
+                // InvalidGrantException, etc), then we need to revert to the old connection scopes. Otherwise,
+                // this could soft-lock users into a broken connection that cannot be re-authenticated without
+                // first deleting the connection.
+                await setScopes(conn, oldScopes, auth)
+                throw e
+            }
+        },
+        { emit: false, functionId: { name: 'addScopesSecondaryAuth' } }
+    )
+}
+
+export function setScopes(conn: SsoConnection, scopes: string[], auth = Auth.instance): Promise<SsoConnection> {
+    return telemetry.function_call.run(
+        () => {
+            return auth.updateConnection(conn, {
+                type: 'sso',
+                scopes,
+                startUrl: conn.startUrl,
+                ssoRegion: conn.ssoRegion,
+            })
+        },
+        { emit: false, functionId: { name: 'setScopesSecondaryAuth' } }
+    )
+}
diff --git a/packages/core/src/auth/sso/cache.ts b/packages/core/src/auth/sso/cache.ts
new file mode 100644
index 00000000000..7d43c07da35
--- /dev/null
+++ b/packages/core/src/auth/sso/cache.ts
@@ -0,0 +1,160 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as crypto from 'crypto'
+import * as path from 'path'
+import { getLogger } from '../../shared/logger/logger'
+import fs from '../../shared/fs/fs'
+import { createDiskCache, KeyedCache, mapCache } from '../../shared/utilities/cacheUtils'
+import { stripUndefined } from '../../shared/utilities/collectionUtils'
+import { hasProps, selectFrom } from '../../shared/utilities/tsUtils'
+import { SsoToken, ClientRegistration } from './model'
+import { DevSettings } from '../../shared/settings'
+import { onceChanged } from '../../shared/utilities/functionUtils'
+import globals from '../../shared/extensionGlobals'
+import { ToolkitError } from '../../shared/errors'
+
+interface RegistrationKey {
+    readonly startUrl: string
+    readonly region: string
+    readonly scopes?: string[]
+}
+
+export interface SsoAccess {
+    readonly token: SsoToken
+    readonly region: string
+    readonly startUrl: string
+    readonly registration?: ClientRegistration
+}
+
+export interface SsoCache {
+    readonly token: KeyedCache<SsoAccess>
+    readonly registration: KeyedCache<ClientRegistration, RegistrationKey>
+}
+
+const defaultCacheDir = () => path.join(fs.getUserHomeDir(), '.aws/sso/cache')
+export const getCacheDir = () => DevSettings.instance.get('ssoCacheDirectory', defaultCacheDir())
+
+export function getCache(directory = getCacheDir()): SsoCache {
+    return {
+        token: getTokenCache(directory),
+        registration: getRegistrationCache(directory),
+    }
+}
+
+export function getCacheFileWatcher(directory = getCacheDir()) {
+    const watcher = vscode.workspace.createFileSystemWatcher(new vscode.RelativePattern(directory, '*.json'))
+    globals.context.subscriptions.push(watcher)
+    return watcher
+}
+
+export function getRegistrationCache(directory = getCacheDir()): KeyedCache<ClientRegistration, RegistrationKey> {
+    // Compatability for older Toolkit versions (format on disk is unchanged)
+    type StoredRegistration = Omit<ClientRegistration, 'expiresAt'> & { readonly expiresAt: string }
+    const read = (data: StoredRegistration) => ({ ...data, expiresAt: new Date(data.expiresAt) })
+    const write = (data: ClientRegistration) => ({ ...data, expiresAt: data.expiresAt.toISOString() })
+
+    const logger = (message: string) => getLogger().debug('auth: SSO registration cache: %s', message)
+    const cache: KeyedCache<StoredRegistration, RegistrationKey> = createDiskCache(
+        (registrationKey: RegistrationKey) => getRegistrationCacheFile(directory, registrationKey),
+        logger
+    )
+
+    return mapCache(cache, read, write)
+}
+
+export function getTokenCache(directory = getCacheDir()): KeyedCache<SsoAccess> {
+    // Older specs do not store the registration
+    type MaybeRegistration = Partial<Omit<ClientRegistration, 'expiresAt'> & { readonly registrationExpiresAt: string }>
+
+    // This is the format used by the SDKs (currently)
+    type StoredToken = Omit<SsoToken, 'expiresAt'> &
+        MaybeRegistration & {
+            readonly startUrl: string
+            readonly region: string
+            readonly expiresAt: string
+        }
+
+    function read(data: StoredToken): SsoAccess {
+        // Validate data is not missing. Since the input data is passed directly from whatever is on disk.
+        if (!hasProps(data, 'accessToken')) {
+            throw new ToolkitError(`SSO cache data looks malformed`)
+        }
+
+        const registration = hasProps(data, 'clientId', 'clientSecret', 'registrationExpiresAt')
+            ? {
+                  ...selectFrom(data, 'clientId', 'clientSecret', 'scopes', 'startUrl'),
+                  expiresAt: new Date(data.registrationExpiresAt),
+              }
+            : undefined
+
+        const token = {
+            ...selectFrom(data, 'accessToken', 'refreshToken', 'tokenType'),
+            expiresAt: new Date(data.expiresAt),
+        }
+
+        stripUndefined(token)
+
+        return {
+            token,
+            registration,
+            ...selectFrom(data, 'region', 'startUrl'),
+        }
+    }
+
+    function write(data: SsoAccess): StoredToken {
+        const registration =
+            data.registration !== undefined
+                ? selectFrom(data.registration, 'clientId', 'clientSecret', 'scopes')
+                : undefined
+
+        return {
+            ...registration,
+            ...selectFrom(data, 'region', 'startUrl'),
+            ...selectFrom(data.token, 'accessToken', 'refreshToken'),
+            expiresAt: data.token.expiresAt.toISOString(),
+            registrationExpiresAt: data.registration?.expiresAt.toISOString(),
+        }
+    }
+
+    const logIfChanged = onceChanged((message: string) => getLogger().debug(`SSO token cache: ${message}`))
+    const cache = createDiskCache<StoredToken, string>((key: string) => getTokenCacheFile(directory, key), logIfChanged)
+
+    return mapCache(cache, read, write)
+}
+
+function getTokenCacheFile(ssoCacheDir: string, key: string): string {
+    const encoded = encodeURI(key)
+    // Per the spec: 'SSO Login Token Flow' the access token must be
+    // cached as the SHA1 hash of the bytes of the UTF-8 encoded
+    // startUrl value with ".json" appended to the end. However, the
+    // cache key used by the Toolkit is an alternative arbitrary key
+    // in most scenarios. This alternative cache key still conforms
+    // to the same ${sha1(key)}.json cache location semantics.
+
+    const shasum = crypto.createHash('sha1')
+    // Suppress warning because:
+    //   1. SHA1 is prescribed by the AWS SSO spec
+    //   2. the hashed startUrl or other key value is not a secret
+    shasum.update(encoded) // lgtm[js/weak-cryptographic-algorithm]
+    const hashedKey = shasum.digest('hex') // lgtm[js/weak-cryptographic-algorithm]
+
+    return path.join(ssoCacheDir, `${hashedKey}.json`)
+}
+
+function getRegistrationCacheFile(ssoCacheDir: string, key: RegistrationKey): string {
+    const hash = (startUrl: string, scopes: string[]) => {
+        const shasum = crypto.createHash('sha256')
+        shasum.update(startUrl)
+        for (const s of scopes) {
+            shasum.update(s)
+        }
+        return shasum.digest('hex')
+    }
+
+    const suffix = `${key.region}${key.scopes && key.scopes.length > 0 ? `-${hash(key.startUrl, key.scopes)}` : ''}`
+    return path.join(ssoCacheDir, `aws-toolkit-vscode-client-id-${suffix}.json`)
+}
diff --git a/packages/core/src/auth/sso/clients.ts b/packages/core/src/auth/sso/clients.ts
new file mode 100644
index 00000000000..2fa8b1a3854
--- /dev/null
+++ b/packages/core/src/auth/sso/clients.ts
@@ -0,0 +1,292 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../../shared/extensionGlobals'
+
+import {
+    AccountInfo,
+    GetRoleCredentialsRequest,
+    ListAccountRolesRequest,
+    ListAccountsRequest,
+    LogoutRequest,
+    RoleInfo,
+    SSO,
+    SSOServiceException,
+} from '@aws-sdk/client-sso'
+import {
+    AuthorizationPendingException,
+    CreateTokenRequest,
+    RegisterClientRequest,
+    SSOOIDC,
+    SSOOIDCClient,
+    StartDeviceAuthorizationRequest,
+} from '@aws-sdk/client-sso-oidc'
+import { AsyncCollection } from '../../shared/utilities/asyncCollection'
+import { pageableToCollection, partialClone } from '../../shared/utilities/collectionUtils'
+import { assertHasProps, isNonNullable, RequiredProps, selectFrom } from '../../shared/utilities/tsUtils'
+import { getLogger } from '../../shared/logger/logger'
+import { SsoAccessTokenProvider } from './ssoAccessTokenProvider'
+import { AwsClientResponseError, isClientFault } from '../../shared/errors'
+import { DevSettings } from '../../shared/settings'
+import { HttpRequest, HttpResponse } from '@smithy/protocol-http'
+import { StandardRetryStrategy, defaultRetryDecider } from '@smithy/middleware-retry'
+import { AuthenticationFlow } from './model'
+import { toSnakeCase } from '../../shared/utilities/textUtilities'
+import { getUserAgent, withTelemetryContext } from '../../shared/telemetry/util'
+import { oneSecond } from '../../shared/datetime'
+
+export class OidcClient {
+    public constructor(
+        private readonly client: SSOOIDC,
+        private readonly clock: { Date: typeof Date }
+    ) {}
+
+    public async registerClient(request: RegisterClientRequest, startUrl: string, flow?: AuthenticationFlow) {
+        const response = await this.client.registerClient(request)
+        assertHasProps(response, 'clientId', 'clientSecret', 'clientSecretExpiresAt')
+
+        return {
+            scopes: request.scopes,
+            clientId: response.clientId,
+            clientSecret: response.clientSecret,
+            expiresAt: new this.clock.Date(response.clientSecretExpiresAt * 1000),
+            startUrl,
+            ...(flow ? { flow } : {}),
+        }
+    }
+
+    public async startDeviceAuthorization(request: StartDeviceAuthorizationRequest) {
+        const response = await this.client.startDeviceAuthorization(request)
+        assertHasProps(response, 'expiresIn', 'deviceCode', 'userCode', 'verificationUri')
+
+        return {
+            ...selectFrom(response, 'deviceCode', 'userCode', 'verificationUri'),
+            expiresAt: new this.clock.Date(response.expiresIn * 1000 + this.clock.Date.now()),
+            interval: response.interval ? response.interval * 1000 : undefined,
+        }
+    }
+
+    public async authorize(request: {
+        responseType: string
+        clientId: string
+        redirectUri: string
+        scopes: string[]
+        state: string
+        codeChallenge: string
+        codeChallengeMethod: string
+    }) {
+        // aws sdk doesn't convert to url params until right before you make the request, so we have to do
+        // it manually ahead of time
+        const params = toSnakeCase(request)
+        const searchParams = new URLSearchParams(params).toString()
+        const region = await this.client.config.region()
+        return `https://oidc.${region}.amazonaws.com/authorize?${searchParams}`
+    }
+
+    public async createToken(request: CreateTokenRequest) {
+        let response
+        try {
+            response = await this.client.createToken(request as CreateTokenRequest)
+        } catch (err) {
+            const newError = AwsClientResponseError.instanceIf(err)
+            throw newError
+        }
+        assertHasProps(response, 'accessToken', 'expiresIn')
+
+        return {
+            ...selectFrom(response, 'accessToken', 'refreshToken', 'tokenType'),
+            requestId: response.$metadata.requestId,
+            expiresAt: new this.clock.Date(response.expiresIn * 1000 + this.clock.Date.now()),
+        }
+    }
+
+    public static create(region: string) {
+        const client = new SSOOIDC({
+            region,
+            endpoint: DevSettings.instance.get('endpoints', {})['ssooidc'],
+            retryStrategy: new StandardRetryStrategy(
+                () => Promise.resolve(3), // Maximum number of retries
+                { retryDecider: defaultRetryDecider }
+            ),
+            customUserAgent: getUserAgent({ includePlatform: true, includeClientId: true }),
+            requestHandler: {
+                // This field may have a bug: https://github.com/aws/aws-sdk-js-v3/issues/6271
+                // If the bug is real but is fixed, then we can probably remove this field and just have no timeout by default
+                //
+                // Also, we bump this higher due to ticket V1761315147, so that SSO does not timeout
+                requestTimeout: oneSecond * 12,
+            },
+        })
+
+        addLoggingMiddleware(client)
+        return new this(client, globals.clock)
+    }
+}
+
+type OmittedProps = 'accessToken' | 'nextToken'
+type ExtractOverload<T, U> = T extends {
+    (...args: infer P1): infer R1
+    (...args: infer P2): infer R2
+    (...args: infer P3): infer R3
+}
+    ? (this: U, ...args: P1) => R1
+    : never
+
+// Removes all methods that use callbacks instead of promises
+type PromisifyClient<T> = {
+    [P in keyof T]: T[P] extends (...args: any[]) => any ? ExtractOverload<T[P], PromisifyClient<T>> : T[P]
+}
+
+const ssoClientClassName = 'SsoClient'
+
+export class SsoClient {
+    public get region() {
+        const region = this.client.config.region
+
+        return typeof region === 'string' ? (region as string) : undefined
+    }
+
+    public constructor(
+        private readonly client: PromisifyClient<SSO>,
+        private readonly provider: SsoAccessTokenProvider
+    ) {}
+
+    @withTelemetryContext({ name: 'listAccounts', class: ssoClientClassName })
+    public listAccounts(
+        request: Omit<ListAccountsRequest, OmittedProps> = {}
+    ): AsyncCollection<RequiredProps<AccountInfo, 'accountId'>[]> {
+        const requester = (request: Omit<ListAccountsRequest, 'accessToken'>) =>
+            this.call(this.client.listAccounts, request)
+        const collection = pageableToCollection(requester, request, 'nextToken', 'accountList')
+
+        return collection
+            .filter(isNonNullable)
+            .map((accounts) => accounts.map((a) => (assertHasProps(a, 'accountId'), a)))
+    }
+
+    @withTelemetryContext({ name: 'listAccountRoles', class: ssoClientClassName })
+    public listAccountRoles(
+        request: Omit<ListAccountRolesRequest, OmittedProps>
+    ): AsyncCollection<Required<RoleInfo>[]> {
+        const requester = (request: Omit<ListAccountRolesRequest, 'accessToken'>) =>
+            this.call(this.client.listAccountRoles, request)
+        const collection = pageableToCollection(requester, request, 'nextToken', 'roleList')
+
+        return collection
+            .filter(isNonNullable)
+            .map((roles) => roles.map((r) => (assertHasProps(r, 'roleName', 'accountId'), r)))
+    }
+
+    @withTelemetryContext({ name: 'getRoleCredentials', class: ssoClientClassName })
+    public async getRoleCredentials(request: Omit<GetRoleCredentialsRequest, OmittedProps>) {
+        const response = await this.call(this.client.getRoleCredentials, request)
+
+        assertHasProps(response, 'roleCredentials')
+        assertHasProps(response.roleCredentials, 'accessKeyId', 'secretAccessKey')
+
+        const expiration = response.roleCredentials.expiration
+
+        return {
+            ...response.roleCredentials,
+            expiration: expiration ? new globals.clock.Date(expiration) : undefined,
+        }
+    }
+
+    @withTelemetryContext({ name: 'logout', class: ssoClientClassName })
+    public async logout(request: Omit<LogoutRequest, OmittedProps> = {}) {
+        await this.call(this.client.logout, request)
+    }
+
+    private call<T extends { accessToken: string | undefined }, U>(
+        method: (this: typeof this.client, request: T) => Promise<U>,
+        request: Omit<T, 'accessToken'>
+    ): Promise<U> {
+        const requester = async (req: T) => {
+            const token = await this.provider.getToken()
+            assertHasProps(token, 'accessToken')
+
+            try {
+                return await method.call(this.client, { ...req, accessToken: token.accessToken })
+            } catch (error) {
+                await this.handleError(error)
+                throw error
+            }
+        }
+
+        return requester(request as T)
+    }
+
+    @withTelemetryContext({ name: 'handleError', class: ssoClientClassName })
+    private async handleError(error: unknown): Promise<never> {
+        if (error instanceof SSOServiceException && isClientFault(error) && error.name !== 'ForbiddenException') {
+            getLogger().warn(`credentials (sso): invalidating stored token: ${error.message}`)
+            await this.provider.invalidate(`ssoClient:${error.name}`)
+        }
+
+        throw error
+    }
+
+    public static create(region: string, provider: SsoAccessTokenProvider) {
+        return new this(
+            new SSO({
+                region,
+                endpoint: DevSettings.instance.get('endpoints', {})['sso'],
+                customUserAgent: getUserAgent({ includePlatform: true, includeClientId: true }),
+            }),
+            provider
+        )
+    }
+}
+
+function addLoggingMiddleware(client: SSOOIDCClient) {
+    client.middlewareStack.add(
+        (next, context) => (args) => {
+            if (HttpRequest.isInstance(args.request)) {
+                const { hostname, path } = args.request
+                const input = partialClone(
+                    // TODO: Fix
+                    args.input as unknown as Record<string, unknown>,
+                    3,
+                    ['clientSecret', 'accessToken', 'refreshToken'],
+                    { replacement: '[omitted]' }
+                )
+                getLogger().debug('API request (%s %s): %O', hostname, path, input)
+            }
+            return next(args)
+        },
+        { step: 'finalizeRequest' }
+    )
+
+    client.middlewareStack.add(
+        (next, context) => async (args) => {
+            if (!HttpRequest.isInstance(args.request)) {
+                return next(args)
+            }
+
+            const { hostname, path } = args.request
+            const result = await next(args).catch((e) => {
+                if (e instanceof Error && !(e instanceof AuthorizationPendingException)) {
+                    const err = { ...e }
+                    delete err['stack']
+                    getLogger().error('API response (%s %s): %O', hostname, path, err)
+                }
+                throw e
+            })
+            if (HttpResponse.isInstance(result.response)) {
+                const output = partialClone(
+                    // TODO: Fix
+                    result.output as unknown as Record<string, unknown>,
+                    3,
+                    ['clientSecret', 'accessToken', 'refreshToken'],
+                    { replacement: '[omitted]' }
+                )
+                getLogger().debug('API response (%s %s): %O', hostname, path, output)
+            }
+
+            return result
+        },
+        { step: 'deserialize' }
+    )
+}
diff --git a/packages/core/src/auth/sso/constants.ts b/packages/core/src/auth/sso/constants.ts
new file mode 100644
index 00000000000..0e6bb082d7e
--- /dev/null
+++ b/packages/core/src/auth/sso/constants.ts
@@ -0,0 +1,25 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * For compatibility, this file should not import anything that cannot be used in
+ * web, node, or vue.
+ */
+
+export const builderIdStartUrl = 'https://view.awsapps.com/start'
+export const internalStartUrl = 'https://amzn.awsapps.com/start'
+
+/**
+ * Doc: https://docs.aws.amazon.com/singlesignon/latest/userguide/howtochangeURL.html
+ */
+export const ssoUrlFormatRegex =
+    /^(https?:\/\/(.+)\.awsapps\.com\/start|https?:\/\/identitycenter\.amazonaws\.com\/ssoins-[\da-zA-Z]{16})\/?$/
+
+/**
+ * It is possible for a start url to be a completely custom url that redirects to something that matches the format
+ * below, so this message is only a warning.
+ */
+export const ssoUrlFormatMessage = 'URL possibly invalid. Expected format: https://xxxxxxxxxx.awsapps.com/start'
+export const urlInvalidFormatMessage = 'URL format invalid. Expected format: https://xxxxxxxxxx.com/yyyy'
diff --git a/packages/core/src/auth/sso/model.ts b/packages/core/src/auth/sso/model.ts
new file mode 100644
index 00000000000..6cc462d8a57
--- /dev/null
+++ b/packages/core/src/auth/sso/model.ts
@@ -0,0 +1,165 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../../shared/extensionGlobals'
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as vscode from 'vscode'
+import * as localizedText from '../../shared/localizedText'
+import { getLogger } from '../../shared/logger/logger'
+import { CancellationError } from '../../shared/utilities/timeoutUtils'
+import { ssoAuthHelpUrl } from '../../shared/constants'
+import { openUrl } from '../../shared/utilities/vsCodeUtils'
+import { ToolkitError } from '../../shared/errors'
+import { builderIdStartUrl } from './constants'
+
+export interface SsoToken {
+    /**
+     * An optional identity associated with this token.
+     */
+    readonly identity?: string
+
+    /**
+     * A base64 encoded string returned by the SSO-OIDC service. This token must be treated as an
+     * opaque UTF-8 string and must not be decoded.
+     */
+    readonly accessToken: string
+
+    /**
+     * The expiration time of the accessToken.
+     */
+    readonly expiresAt: Date
+
+    /**
+     * Should always be `Bearer` if present.
+     */
+    readonly tokenType?: string
+
+    /**
+     * Opaque token that may be used to 'refresh' the authentication session after expiration.
+     */
+    readonly refreshToken?: string
+}
+
+export type AuthenticationFlow = 'auth code' | 'web auth code'
+
+export interface ClientRegistration {
+    /**
+     * Unique registration id.
+     */
+    readonly clientId: string
+
+    /**
+     * Secret key associated with the registration.
+     */
+    readonly clientSecret: string
+
+    /**
+     * The expiration time of the registration.
+     */
+    readonly expiresAt: Date
+
+    /**
+     * The start URL used to create this registration.
+     */
+    readonly startUrl: string
+
+    /**
+     * Scope of the client registration. Applies to all tokens created using this registration.
+     */
+    readonly scopes?: string[]
+
+    /**
+     * The sso flow used to create this registration.
+     */
+    readonly flow?: AuthenticationFlow
+}
+
+export interface SsoProfile {
+    readonly region: string
+    readonly startUrl: string
+    readonly accountId?: string
+    readonly roleName?: string
+    readonly scopes?: string[]
+    readonly identifier?: string
+}
+
+export const trustedDomainCancellation = 'TrustedDomainCancellation'
+
+const tryOpenHelpUrl = (url: vscode.Uri) =>
+    openUrl(url).catch((e) => getLogger().verbose('auth: failed to open help URL: %s', e))
+
+export function truncateStartUrl(startUrl: string) {
+    return startUrl.match(/https?:\/\/(.*)\.awsapps\.com\/start/)?.[1] ?? startUrl
+}
+
+type Authorization = { readonly verificationUri: string; readonly userCode: string }
+
+export const proceedToBrowser = localize('AWS.auth.loginWithBrowser.proceedToBrowser', 'Proceed To Browser')
+
+export async function openSsoPortalLink(startUrl: string, authorization: Authorization): Promise<boolean> {
+    /**
+     * Depending on the verification URL + parameters used, the way the sso login flow works changes.
+     * Previously, users were asked to copy and paste a device code in to the browser page.
+     *
+     * Now, with the URL this function creates, the user will instead be asked to confirm the device code
+     * in the browser.
+     */
+    function makeConfirmCodeUrl(authorization: Authorization): vscode.Uri {
+        return vscode.Uri.parse(`${authorization.verificationUri}?user_code=${authorization.userCode}`)
+    }
+
+    async function showLoginNotification() {
+        const name = startUrl === builderIdStartUrl ? localizedText.builderId() : localizedText.iamIdentityCenterFull()
+        const title = localize('AWS.auth.loginWithBrowser.messageTitle', 'Confirm Code for {0}', name)
+        const detail = localize(
+            'AWS.auth.loginWithBrowser.messageDetail',
+            'Confirm this code in the browser: {0}',
+            authorization.userCode
+        )
+
+        while (true) {
+            // TODO: add the 'Help' item back once we have a suitable URL
+            // const resp = await vscode.window.showInformationMessage(title, options, copyCode, localizedText.help)
+            const resp = await vscode.window.showInformationMessage(title, { modal: true, detail }, proceedToBrowser)
+            switch (resp) {
+                case proceedToBrowser:
+                    return openSsoUrl(makeConfirmCodeUrl(authorization))
+                case localizedText.help:
+                    await tryOpenHelpUrl(ssoAuthHelpUrl)
+                    continue
+                default:
+                    throw new CancellationError('user')
+            }
+        }
+    }
+
+    return showLoginNotification()
+}
+
+export async function openSsoUrl(location: vscode.Uri) {
+    const didOpenUrl = await vscode.env.openExternal(location)
+
+    if (!didOpenUrl) {
+        throw new ToolkitError(`User clicked 'Copy' or 'Cancel' during the Trusted Domain popup`, {
+            code: trustedDomainCancellation,
+            name: trustedDomainCancellation,
+            cancelled: true,
+        })
+    }
+    return didOpenUrl
+}
+
+// Most SSO 'expirables' are fairly long lived, so a one minute buffer is plenty.
+const expirationBufferMs = 60000
+export function isExpired(expirable: { expiresAt: Date }): boolean {
+    return globals.clock.Date.now() + expirationBufferMs >= expirable.expiresAt.getTime()
+}
+
+export function isDeprecatedAuth(registration: ClientRegistration): boolean {
+    return registration.flow === undefined || registration.flow !== 'auth code'
+}
diff --git a/packages/core/src/auth/sso/server.ts b/packages/core/src/auth/sso/server.ts
new file mode 100644
index 00000000000..8baf05eb614
--- /dev/null
+++ b/packages/core/src/auth/sso/server.ts
@@ -0,0 +1,296 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as path from 'path'
+import http from 'http'
+import { getLogger } from '../../shared/logger/logger'
+import { ToolkitError } from '../../shared/errors'
+import { Socket } from 'net'
+import globals from '../../shared/extensionGlobals'
+import { Result } from '../../shared/utilities/result'
+import fs from '../../shared/fs/fs'
+import { CancellationError } from '../../shared/utilities/timeoutUtils'
+
+export class MissingPortError extends ToolkitError {
+    constructor() {
+        super('AuthSSOServer: missing auth server port', { code: 'MissingPort' })
+    }
+}
+
+export class MissingCodeError extends ToolkitError {
+    constructor() {
+        super('AuthSSOServer: missing code', { code: 'MissingCode' })
+    }
+}
+
+export class MissingStateError extends ToolkitError {
+    constructor() {
+        super('AuthSSOServer: missing state', { code: 'MissingState' })
+    }
+}
+
+export class InvalidStateError extends ToolkitError {
+    constructor() {
+        super('AuthSSOServer: invalid state', { code: 'InvalidState' })
+    }
+}
+
+export class AuthError extends ToolkitError {
+    constructor(error: string, errorDescription: string) {
+        super(`AuthSSOServer: ${error}: ${errorDescription}`, { code: 'AuthRedirectError' })
+    }
+}
+
+/**
+ * Server responsible for taking redirect requests from auth and redirecting them
+ * back to VSCode
+ */
+export class AuthSSOServer {
+    // Last initialized instance of the Auth Server
+    static #lastInstance: AuthSSOServer | undefined
+    public static get lastInstance() {
+        return AuthSSOServer.#lastInstance
+    }
+
+    private baseUrl = `http://127.0.0.1`
+    private oauthCallback = '/oauth/callback'
+    private authenticationFlowTimeoutInMs = 600000
+    private authenticationWarningTimeoutInMs = 60000
+
+    private readonly authenticationPromise: Promise<Result<string>>
+    private deferred: { resolve: (result: Result<string>) => void } | undefined
+    private server: http.Server
+    private connections: Socket[]
+
+    private _closed: boolean = false
+
+    private constructor(private readonly state: string) {
+        this.authenticationPromise = new Promise<Result<string>>((resolve) => {
+            this.deferred = { resolve }
+        })
+
+        this.connections = []
+
+        this.server = http.createServer(async (req, res) => {
+            res.setHeader('Access-Control-Allow-Methods', 'GET')
+
+            if (!req.url) {
+                return
+            }
+
+            const url = new URL(req.url, this.baseUrl)
+            switch (url.pathname) {
+                case this.oauthCallback: {
+                    this.handleAuthentication(url.searchParams, res)
+                    break
+                }
+                default: {
+                    if (url.pathname.startsWith('/resources')) {
+                        const iconPath = path.join(globals.context.extensionUri.fsPath, url.pathname)
+                        await this.loadResource(res, iconPath)
+                        break
+                    }
+                    const resourcePath = path.join(
+                        globals.context.extensionUri.fsPath,
+                        'dist/src/auth/sso/vue',
+                        url.pathname
+                    )
+                    await this.loadResource(res, resourcePath)
+                    break
+                }
+            }
+        })
+
+        this.server.on('connection', (connection) => {
+            this.connections.push(connection)
+        })
+    }
+
+    public static init(state: string) {
+        const lastInstance = AuthSSOServer.#lastInstance
+        if (lastInstance !== undefined && !lastInstance.closed) {
+            lastInstance
+                .close()!
+                .catch((err) =>
+                    getLogger().error('Failed to close already existing auth sever in AuthSSOServer.init(): %s', err)
+                )
+        }
+
+        getLogger().debug('AuthSSOServer: Initialized new auth server.')
+        const instance = new AuthSSOServer(state)
+        AuthSSOServer.#lastInstance = instance
+        return instance
+    }
+
+    start() {
+        if (this.server.listening) {
+            throw new ToolkitError('AuthSSOServer: Server already started')
+        }
+
+        return new Promise<void>((resolve, reject) => {
+            this.server.on('close', () => {
+                reject(new ToolkitError('AuthSSOServer: Server has closed'))
+            })
+
+            this.server.on('error', (error) => {
+                reject(new ToolkitError(`AuthSSOServer: Server failed: ${error}`))
+            })
+
+            this.server.on('listening', () => {
+                if (!this.server.address()) {
+                    reject(new MissingPortError())
+                }
+
+                resolve()
+            })
+
+            this.server.listen(0, '127.0.0.1')
+        })
+    }
+
+    close() {
+        return new Promise<void>((resolve, reject) => {
+            if (this._closed) {
+                resolve()
+                return
+            }
+
+            if (!this.server.listening) {
+                reject(new ToolkitError('AuthSSOServer: Server not started'))
+            }
+
+            getLogger().debug('AuthSSOServer: Attempting to close server.')
+
+            for (const connection of this.connections) {
+                connection.destroy()
+            }
+
+            this.server.close((err) => {
+                if (err) {
+                    reject(err)
+                }
+                this._closed = true
+                getLogger().debug('AuthSSOServer: Server closed successfully.')
+                resolve()
+            })
+        })
+    }
+
+    public get redirectUri(): string {
+        return `${this.baseLocation}${this.oauthCallback}`
+    }
+
+    private get baseLocation(): string {
+        return `${this.baseUrl}:${this.getPort()}`
+    }
+
+    public get closed() {
+        return this._closed
+    }
+
+    public getAddress() {
+        return this.server.address()
+    }
+
+    private getPort(): number {
+        const addr = this.getAddress()
+        if (addr instanceof Object) {
+            return addr.port
+        } else if (typeof addr === 'string') {
+            return parseInt(addr)
+        } else {
+            throw new MissingPortError()
+        }
+    }
+
+    private redirect(res: http.ServerResponse, error?: string) {
+        let redirectUrl = `${this.baseLocation}/index.html`
+        if (error) {
+            redirectUrl += `?${new URLSearchParams({ error }).toString()}`
+        }
+
+        res.setHeader('Location', redirectUrl)
+        res.writeHead(302)
+        res.end()
+    }
+
+    private async loadResource(res: http.ServerResponse, resourcePath: string) {
+        try {
+            const file = await fs.readFileBytes(resourcePath)
+            res.writeHead(200)
+            res.end(file)
+        } catch (e) {
+            getLogger().error(`Unable to find ${resourcePath}`)
+            res.writeHead(404)
+            res.end()
+        }
+    }
+
+    private handleAuthentication(params: URLSearchParams, res: http.ServerResponse) {
+        const error = params.get('error')
+        const errorDescription = params.get('error_description')
+        if (error && errorDescription) {
+            this.handleRequestRejection(res, new AuthError(error, errorDescription))
+            return
+        }
+
+        const code = params.get('code')
+        if (!code) {
+            this.handleRequestRejection(res, new MissingCodeError())
+            return
+        }
+
+        const state = params.get('state')
+        if (!state) {
+            this.handleRequestRejection(res, new MissingStateError())
+            return
+        }
+
+        if (state !== this.state) {
+            this.handleRequestRejection(res, new InvalidStateError())
+            return
+        }
+
+        this.deferred?.resolve(Result.ok(code))
+
+        this.redirect(res)
+    }
+
+    private handleRequestRejection(res: http.ServerResponse, error: ToolkitError) {
+        // Notify the user
+        this.redirect(res, error.message)
+
+        // Send the response back to the editor
+        this.deferred?.resolve(Result.err(error))
+    }
+
+    public cancelCurrentFlow() {
+        getLogger().debug('AuthSSOServer: Cancelling current login flow')
+        this.deferred?.resolve(Result.err(new CancellationError('user')))
+    }
+
+    public waitForAuthorization(): Promise<Result<string>> {
+        return Promise.race([
+            this.authenticationPromise,
+            new Promise<Result<string>>((_, reject) => {
+                globals.clock.setTimeout(() => {
+                    reject(
+                        new ToolkitError('Timed-out waiting for browser login flow to complete', {
+                            code: 'TimedOut',
+                        })
+                    )
+                }, this.authenticationFlowTimeoutInMs)
+
+                const warningTimeout = globals.clock.setTimeout(() => {
+                    getLogger().warn('AuthSSOServer: Authentication is taking a long time')
+                }, this.authenticationWarningTimeoutInMs)
+
+                void this.authenticationPromise.finally(() => {
+                    clearTimeout(warningTimeout)
+                })
+            }),
+        ])
+    }
+}
diff --git a/packages/core/src/auth/sso/service-2.json b/packages/core/src/auth/sso/service-2.json
new file mode 100644
index 00000000000..cd4d67e01c1
--- /dev/null
+++ b/packages/core/src/auth/sso/service-2.json
@@ -0,0 +1,1608 @@
+{
+    "version": "2.0",
+    "metadata": {
+        "apiVersion": "2019-06-10",
+        "endpointPrefix": "oidc",
+        "jsonVersion": "1.1",
+        "protocol": "rest-json",
+        "serviceAbbreviation": "SSO OIDC",
+        "serviceFullName": "AWS SSO OIDC",
+        "serviceId": "SSO OIDC",
+        "signatureVersion": "v4",
+        "signingName": "awsssooidc",
+        "uid": "sso-oidc-2019-06-10"
+    },
+    "operations": {
+        "AssociateTokenWithDevice": {
+            "name": "AssociateTokenWithDevice",
+            "http": {
+                "method": "POST",
+                "requestUri": "/device_authorization/associate_token"
+            },
+            "input": { "shape": "AssociateTokenWithDeviceRequest" },
+            "output": { "shape": "AssociateTokenWithDeviceResponse" },
+            "errors": [
+                { "shape": "AccessDeniedException" },
+                { "shape": "InvalidRequestException" },
+                { "shape": "InvalidGrantException" },
+                { "shape": "InvalidClientException" },
+                { "shape": "InvalidScopeException" },
+                { "shape": "UnauthorizedClientException" },
+                { "shape": "SlowDownException" },
+                { "shape": "InternalServerException" }
+            ],
+            "internalonly": true
+        },
+        "Authorize": {
+            "name": "Authorize",
+            "http": {
+                "method": "GET",
+                "requestUri": "/authorize",
+                "responseCode": 302
+            },
+            "input": { "shape": "AuthorizeRequest" },
+            "output": { "shape": "AuthorizeResponse" },
+            "errors": [
+                { "shape": "InvalidRequestRedirectException" },
+                { "shape": "UnauthorizedClientRedirectException" },
+                { "shape": "AccessDeniedRedirectException" },
+                { "shape": "UnsupportedResponseTypeRedirectException" },
+                { "shape": "InvalidScopeRedirectException" },
+                { "shape": "ServerErrorRedirectException" },
+                { "shape": "TemporarilyUnavailableRedirectException" },
+                { "shape": "InvalidClientException" },
+                { "shape": "UnauthorizedClientException" },
+                { "shape": "InvalidRedirectUriException" },
+                { "shape": "InvalidRequestException" },
+                { "shape": "InternalServerException" },
+                { "shape": "SlowDownException" },
+                { "shape": "SlowDownRedirectException" }
+            ],
+            "internalonly": true
+        },
+        "BackfillConfidentialClient": {
+            "name": "BackfillConfidentialClient",
+            "http": {
+                "method": "POST",
+                "requestUri": "/client/confidential/backfill"
+            },
+            "input": { "shape": "BackfillConfidentialClientRequest" },
+            "output": { "shape": "BackfillConfidentialClientResponse" },
+            "errors": [
+                { "shape": "InvalidRequestException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "EntityNotFoundException" },
+                { "shape": "ConcurrentModificationException" },
+                { "shape": "InternalServerException" }
+            ],
+            "internalonly": true
+        },
+        "CancelDeviceAuthorization": {
+            "name": "CancelDeviceAuthorization",
+            "http": {
+                "method": "POST",
+                "requestUri": "/device_authorization/cancel"
+            },
+            "input": { "shape": "CancelDeviceAuthorizationRequest" },
+            "output": { "shape": "CancelDeviceAuthorizationResponse" },
+            "errors": [
+                { "shape": "InvalidRequestException" },
+                { "shape": "InvalidClientException" },
+                { "shape": "InvalidGrantException" },
+                { "shape": "UnauthorizedClientException" },
+                { "shape": "SlowDownException" },
+                { "shape": "InternalServerException" }
+            ],
+            "internalonly": true
+        },
+        "CreateToken": {
+            "name": "CreateToken",
+            "http": {
+                "method": "POST",
+                "requestUri": "/token"
+            },
+            "input": { "shape": "CreateTokenRequest" },
+            "output": { "shape": "CreateTokenResponse" },
+            "errors": [
+                { "shape": "InvalidRequestException" },
+                { "shape": "InvalidClientException" },
+                { "shape": "InvalidGrantException" },
+                { "shape": "UnauthorizedClientException" },
+                { "shape": "UnsupportedGrantTypeException" },
+                { "shape": "InvalidScopeException" },
+                { "shape": "AuthorizationPendingException" },
+                { "shape": "SlowDownException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "ExpiredTokenException" },
+                { "shape": "InternalServerException" },
+                { "shape": "InvalidRequestRegionException" }
+            ]
+        },
+        "CreateTokenForSTS": {
+            "name": "CreateTokenForSTS",
+            "http": {
+                "method": "POST",
+                "requestUri": "/token?target=sts"
+            },
+            "input": { "shape": "CreateTokenForSTSRequest" },
+            "output": { "shape": "CreateTokenForSTSResponse" },
+            "errors": [
+                { "shape": "InvalidRequestException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "SlowDownException" },
+                { "shape": "InternalServerException" }
+            ],
+            "internalonly": true
+        },
+        "CreateTokenWithIAM": {
+            "name": "CreateTokenWithIAM",
+            "http": {
+                "method": "POST",
+                "requestUri": "/token?aws_iam=t"
+            },
+            "input": { "shape": "CreateTokenWithIAMRequest" },
+            "output": { "shape": "CreateTokenWithIAMResponse" },
+            "errors": [
+                { "shape": "InvalidRequestException" },
+                { "shape": "InvalidClientException" },
+                { "shape": "InvalidGrantException" },
+                { "shape": "UnauthorizedClientException" },
+                { "shape": "UnsupportedGrantTypeException" },
+                { "shape": "InvalidScopeException" },
+                { "shape": "AuthorizationPendingException" },
+                { "shape": "SlowDownException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "ExpiredTokenException" },
+                { "shape": "InternalServerException" },
+                { "shape": "InvalidRequestRegionException" }
+            ]
+        },
+        "DeleteConfidentialClient": {
+            "name": "DeleteConfidentialClient",
+            "http": {
+                "method": "POST",
+                "requestUri": "/client/confidential/delete"
+            },
+            "input": { "shape": "DeleteConfidentialClientRequest" },
+            "output": { "shape": "DeleteConfidentialClientResponse" },
+            "errors": [
+                { "shape": "InvalidRequestException" },
+                { "shape": "EntityNotFoundException" },
+                { "shape": "InternalServerException" }
+            ],
+            "internalonly": true
+        },
+        "GetConfidentialClient": {
+            "name": "GetConfidentialClient",
+            "http": {
+                "method": "POST",
+                "requestUri": "/client/confidential/get"
+            },
+            "input": { "shape": "GetConfidentialClientRequest" },
+            "output": { "shape": "GetConfidentialClientResponse" },
+            "errors": [
+                { "shape": "InvalidRequestException" },
+                { "shape": "EntityNotFoundException" },
+                { "shape": "InternalServerException" }
+            ],
+            "internalonly": true
+        },
+        "GetConfidentialClientByExternalId": {
+            "name": "GetConfidentialClientByExternalId",
+            "http": {
+                "method": "POST",
+                "requestUri": "/client/confidential/get_by_external"
+            },
+            "input": { "shape": "GetConfidentialClientByExternalIdRequest" },
+            "output": { "shape": "GetConfidentialClientByExternalIdResponse" },
+            "errors": [
+                { "shape": "InvalidRequestException" },
+                { "shape": "EntityNotFoundException" },
+                { "shape": "InternalServerException" }
+            ],
+            "internalonly": true
+        },
+        "GlobalRevokeToken": {
+            "name": "GlobalRevokeToken",
+            "http": {
+                "method": "POST",
+                "requestUri": "/global-revoke"
+            },
+            "input": { "shape": "GlobalRevokeTokenRequest" },
+            "output": { "shape": "GlobalRevokeTokenResponse" },
+            "errors": [
+                { "shape": "InvalidRequestException" },
+                { "shape": "InvalidClientException" },
+                { "shape": "UnauthorizedClientException" },
+                { "shape": "InvalidGrantException" },
+                { "shape": "UnsupportedTokenTypeException" },
+                { "shape": "InternalServerException" },
+                { "shape": "SlowDownException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "internalonly": true
+        },
+        "IntrospectToken": {
+            "name": "IntrospectToken",
+            "http": {
+                "method": "POST",
+                "requestUri": "/introspect"
+            },
+            "input": { "shape": "IntrospectTokenRequest" },
+            "output": { "shape": "IntrospectTokenResponse" },
+            "errors": [
+                { "shape": "InvalidRequestException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "InternalServerException" },
+                { "shape": "InvalidGrantException" },
+                { "shape": "InvalidRequestRedirectException" },
+                { "shape": "InvalidRequestRegionException" },
+                { "shape": "SlowDownException" },
+                { "shape": "InvalidClientException" }
+            ],
+            "internalonly": true
+        },
+        "ListConsentDetails": {
+            "name": "ListConsentDetails",
+            "http": {
+                "method": "GET",
+                "requestUri": "/consent_details"
+            },
+            "input": { "shape": "ListConsentDetailsRequest" },
+            "output": { "shape": "ListConsentDetailsResponse" },
+            "errors": [
+                { "shape": "AccessDeniedException" },
+                { "shape": "InvalidRequestException" },
+                { "shape": "InvalidGrantException" },
+                { "shape": "InvalidClientException" },
+                { "shape": "SlowDownException" },
+                { "shape": "InternalServerException" },
+                { "shape": "InvalidScopeException" }
+            ],
+            "internalonly": true
+        },
+        "ListConsentDetailsForUser": {
+            "name": "ListConsentDetailsForUser",
+            "http": {
+                "method": "POST",
+                "requestUri": "/consent_details"
+            },
+            "input": { "shape": "ListConsentDetailsForUserRequest" },
+            "output": { "shape": "ListConsentDetailsForUserResponse" },
+            "errors": [
+                { "shape": "AccessDeniedException" },
+                { "shape": "InvalidRequestException" },
+                { "shape": "InvalidGrantException" },
+                { "shape": "InvalidClientException" },
+                { "shape": "SlowDownException" },
+                { "shape": "InternalServerException" },
+                { "shape": "InvalidScopeException" }
+            ],
+            "internalonly": true
+        },
+        "PostAuthenticationResult": {
+            "name": "PostAuthenticationResult",
+            "http": {
+                "method": "POST",
+                "requestUri": "/authentication_result"
+            },
+            "input": { "shape": "PostAuthenticationResultRequest" },
+            "output": { "shape": "PostAuthenticationResultResponse" },
+            "errors": [
+                { "shape": "InternalServerException" },
+                { "shape": "InvalidRequestException" },
+                { "shape": "InvalidGrantException" },
+                { "shape": "SlowDownException" }
+            ],
+            "internalonly": true
+        },
+        "PreRegisterClient": {
+            "name": "PreRegisterClient",
+            "http": {
+                "method": "POST",
+                "requestUri": "/client/pre_register"
+            },
+            "input": { "shape": "PreRegisterClientRequest" },
+            "output": { "shape": "PreRegisterClientResponse" },
+            "errors": [
+                { "shape": "InvalidRequestException" },
+                { "shape": "InvalidClientMetadataException" },
+                { "shape": "ConflictException" },
+                { "shape": "InvalidGrantException" },
+                { "shape": "InvalidScopeException" },
+                { "shape": "InternalServerException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "SlowDownException" }
+            ]
+        },
+        "RegisterClient": {
+            "name": "RegisterClient",
+            "http": {
+                "method": "POST",
+                "requestUri": "/client/register"
+            },
+            "input": { "shape": "RegisterClientRequest" },
+            "output": { "shape": "RegisterClientResponse" },
+            "errors": [
+                { "shape": "InvalidRequestException" },
+                { "shape": "InvalidScopeException" },
+                { "shape": "InvalidClientMetadataException" },
+                { "shape": "InternalServerException" },
+                { "shape": "InvalidSoftwareStatementException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "UnsupportedGrantTypeException" },
+                { "shape": "InvalidRedirectUriException" }
+            ]
+        },
+        "RegisterConfidentialClient": {
+            "name": "RegisterConfidentialClient",
+            "http": {
+                "method": "POST",
+                "requestUri": "/client/confidential/register"
+            },
+            "input": { "shape": "RegisterConfidentialClientRequest" },
+            "output": { "shape": "RegisterConfidentialClientResponse" },
+            "errors": [
+                { "shape": "InvalidRequestException" },
+                { "shape": "IdempotencyConflictException" },
+                { "shape": "ConflictException" },
+                { "shape": "InternalServerException" },
+                { "shape": "UnsupportedGrantTypeException" }
+            ],
+            "internalonly": true
+        },
+        "ResolveStartLocation": {
+            "name": "ResolveStartLocation",
+            "http": {
+                "method": "GET",
+                "requestUri": "/start",
+                "responseCode": 302
+            },
+            "input": { "shape": "ResolveStartLocationRequest" },
+            "output": { "shape": "ResolveStartLocationResponse" },
+            "errors": [
+                { "shape": "InvalidRequestException" },
+                { "shape": "InternalServerException" },
+                { "shape": "SlowDownException" }
+            ],
+            "internalonly": true
+        },
+        "RestoreBackfilledConfidentialClient": {
+            "name": "RestoreBackfilledConfidentialClient",
+            "http": {
+                "method": "POST",
+                "requestUri": "/client/confidential/restore_backfilled"
+            },
+            "input": { "shape": "RestoreBackfilledConfidentialClientRequest" },
+            "output": { "shape": "RestoreBackfilledConfidentialClientResponse" },
+            "errors": [
+                { "shape": "InvalidRequestException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "EntityNotFoundException" },
+                { "shape": "ConcurrentModificationException" },
+                { "shape": "InternalServerException" }
+            ],
+            "internalonly": true
+        },
+        "RevokeToken": {
+            "name": "RevokeToken",
+            "http": {
+                "method": "POST",
+                "requestUri": "/revoke"
+            },
+            "input": { "shape": "RevokeTokenRequest" },
+            "output": { "shape": "RevokeTokenResponse" },
+            "errors": [
+                { "shape": "InvalidRequestException" },
+                { "shape": "InvalidClientException" },
+                { "shape": "UnauthorizedClientException" },
+                { "shape": "InvalidGrantException" },
+                { "shape": "UnsupportedTokenTypeException" },
+                { "shape": "InternalServerException" },
+                { "shape": "SlowDownException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "internalonly": true
+        },
+        "StartDeviceAuthorization": {
+            "name": "StartDeviceAuthorization",
+            "http": {
+                "method": "POST",
+                "requestUri": "/device_authorization"
+            },
+            "input": { "shape": "StartDeviceAuthorizationRequest" },
+            "output": { "shape": "StartDeviceAuthorizationResponse" },
+            "errors": [
+                { "shape": "InvalidRequestException" },
+                { "shape": "InvalidClientException" },
+                { "shape": "UnauthorizedClientException" },
+                { "shape": "SlowDownException" },
+                { "shape": "InternalServerException" }
+            ]
+        },
+        "UpdateConfidentialClient": {
+            "name": "UpdateConfidentialClient",
+            "http": {
+                "method": "POST",
+                "requestUri": "/client/confidential/update"
+            },
+            "input": { "shape": "UpdateConfidentialClientRequest" },
+            "output": { "shape": "UpdateConfidentialClientResponse" },
+            "errors": [
+                { "shape": "InvalidRequestException" },
+                { "shape": "EntityNotFoundException" },
+                { "shape": "ConcurrentModificationException" },
+                { "shape": "InternalServerException" },
+                { "shape": "UnsupportedGrantTypeException" }
+            ],
+            "internalonly": true
+        },
+        "UpdateConfidentialClientForMigration": {
+            "name": "UpdateConfidentialClientForMigration",
+            "http": {
+                "method": "POST",
+                "requestUri": "/migration/client/confidential/update"
+            },
+            "input": { "shape": "UpdateConfidentialClientForMigrationRequest" },
+            "output": { "shape": "UpdateConfidentialClientForMigrationResponse" },
+            "errors": [
+                { "shape": "InvalidRequestException" },
+                { "shape": "EntityNotFoundException" },
+                { "shape": "ConcurrentModificationException" },
+                { "shape": "InternalServerException" }
+            ],
+            "internalonly": true
+        },
+        "ValidateUserCode": {
+            "name": "ValidateUserCode",
+            "http": {
+                "method": "GET",
+                "requestUri": "/device_verification"
+            },
+            "input": { "shape": "ValidateUserCodeRequest" },
+            "output": { "shape": "ValidateUserCodeResponse" },
+            "errors": [
+                { "shape": "InvalidRequestException" },
+                { "shape": "InvalidGrantException" },
+                { "shape": "SlowDownException" },
+                { "shape": "InternalServerException" }
+            ],
+            "internalonly": true
+        }
+    },
+    "shapes": {
+        "AcceptLanguageHeader": { "type": "string" },
+        "AccessDeniedException": {
+            "type": "structure",
+            "members": {
+                "error": { "shape": "Error" },
+                "error_description": { "shape": "ErrorDescription" }
+            },
+            "error": { "httpStatusCode": 400 },
+            "exception": true
+        },
+        "AccessDeniedRedirectException": {
+            "type": "structure",
+            "members": {
+                "location": {
+                    "shape": "Location",
+                    "location": "header",
+                    "locationName": "Location"
+                }
+            },
+            "error": { "httpStatusCode": 302 },
+            "exception": true
+        },
+        "AccessToken": {
+            "type": "string",
+            "sensitive": true
+        },
+        "AccountIdType": { "type": "string" },
+        "Active": { "type": "boolean" },
+        "Actor": {
+            "type": "structure",
+            "members": {
+                "sub": { "shape": "ArnType" }
+            }
+        },
+        "ActorPolicy": {
+            "type": "structure",
+            "members": {},
+            "document": true
+        },
+        "AdditionalFields": {
+            "type": "list",
+            "member": { "shape": "FieldName" }
+        },
+        "AppSessionId": { "type": "string" },
+        "ApplicationName": { "type": "string" },
+        "ArnType": { "type": "string" },
+        "Assertion": {
+            "type": "string",
+            "sensitive": true
+        },
+        "AssertionProvider": {
+            "type": "structure",
+            "members": {
+                "id": { "shape": "AssertionProviderId" },
+                "audienceRestrictions": { "shape": "AssertionProviderAudienceRestrictions" }
+            }
+        },
+        "AssertionProviderAudienceRestrictions": {
+            "type": "list",
+            "member": { "shape": "ArnType" }
+        },
+        "AssertionProviderId": { "type": "string" },
+        "AssertionProviders": {
+            "type": "list",
+            "member": { "shape": "AssertionProvider" }
+        },
+        "AssociateTokenWithDeviceRequest": {
+            "type": "structure",
+            "members": {
+                "deviceContext": { "shape": "DeviceContext" },
+                "authorizationResumptionContext": { "shape": "AuthorizationResumptionContext" },
+                "userSessionId": { "shape": "UserSessionId" }
+            }
+        },
+        "AssociateTokenWithDeviceResponse": {
+            "type": "structure",
+            "members": {
+                "location": { "shape": "URI" }
+            }
+        },
+        "AssociatedAppSessionIds": {
+            "type": "list",
+            "member": { "shape": "AppSessionId" }
+        },
+        "Audience": { "type": "string" },
+        "Audiences": {
+            "type": "list",
+            "member": { "shape": "Audience" }
+        },
+        "AuthCode": { "type": "string" },
+        "AuthOrchestrationId": { "type": "string" },
+        "AuthenticationConfiguration": {
+            "type": "structure",
+            "members": {
+                "actorPolicy": { "shape": "ActorPolicy" }
+            }
+        },
+        "AuthorizationDetail": {
+            "type": "structure",
+            "members": {},
+            "document": true
+        },
+        "AuthorizationDetails": {
+            "type": "list",
+            "member": { "shape": "AuthorizationDetail" }
+        },
+        "AuthorizationPendingException": {
+            "type": "structure",
+            "members": {
+                "error": { "shape": "Error" },
+                "error_description": { "shape": "ErrorDescription" }
+            },
+            "error": { "httpStatusCode": 400 },
+            "exception": true
+        },
+        "AuthorizationResumptionContext": { "type": "string" },
+        "AuthorizeRequest": {
+            "type": "structure",
+            "members": {
+                "clientId": {
+                    "shape": "ClientId",
+                    "location": "querystring",
+                    "locationName": "client_id"
+                },
+                "state": {
+                    "shape": "State",
+                    "location": "querystring",
+                    "locationName": "state"
+                },
+                "responseType": {
+                    "shape": "ResponseType",
+                    "location": "querystring",
+                    "locationName": "response_type"
+                },
+                "redirectUri": {
+                    "shape": "URI",
+                    "location": "querystring",
+                    "locationName": "redirect_uri"
+                },
+                "scopes": {
+                    "shape": "Scopes",
+                    "location": "querystring",
+                    "locationName": "scope"
+                },
+                "authorizationResumptionContext": {
+                    "shape": "AuthorizationResumptionContext",
+                    "location": "querystring",
+                    "locationName": "authorization_resumption_context"
+                },
+                "codeChallenge": {
+                    "shape": "CodeChallenge",
+                    "location": "querystring",
+                    "locationName": "code_challenge"
+                },
+                "codeChallengeMethod": {
+                    "shape": "CodeChallengeMethod",
+                    "location": "querystring",
+                    "locationName": "code_challenge_method"
+                }
+            }
+        },
+        "AuthorizeResponse": {
+            "type": "structure",
+            "members": {
+                "location": {
+                    "shape": "Location",
+                    "location": "header",
+                    "locationName": "Location"
+                }
+            }
+        },
+        "AuthorizedTarget": { "type": "string" },
+        "AuthorizedTargets": {
+            "type": "list",
+            "member": { "shape": "AuthorizedTarget" }
+        },
+        "AwsIdentityStore": { "type": "string" },
+        "AwsInstanceAccountId": { "type": "string" },
+        "BackfillConfidentialClientRequest": {
+            "type": "structure",
+            "members": {
+                "clientId": { "shape": "ClientId" }
+            }
+        },
+        "BackfillConfidentialClientResponse": {
+            "type": "structure",
+            "members": {
+                "clientId": { "shape": "ClientId" },
+                "backfillVersion": { "shape": "BackfillVersion" }
+            }
+        },
+        "BackfillVersion": { "type": "integer" },
+        "CancelDeviceAuthorizationRequest": {
+            "type": "structure",
+            "members": {
+                "deviceContext": { "shape": "DeviceContext" }
+            }
+        },
+        "CancelDeviceAuthorizationResponse": {
+            "type": "structure",
+            "members": {}
+        },
+        "ClientId": { "type": "string" },
+        "ClientInfoStatus": { "type": "string" },
+        "ClientInformation": {
+            "type": "structure",
+            "members": {
+                "clientId": { "shape": "ClientId" },
+                "tenantId": { "shape": "TenantId" },
+                "externalId": { "shape": "ExternalId" },
+                "templateArn": { "shape": "ArnType" },
+                "templateContext": { "shape": "TemplateContextMap" },
+                "entitledResourceId": { "shape": "EntitledResourceId" },
+                "entitledResourceContainerId": { "shape": "EntitledResourceContainerId" },
+                "status": { "shape": "ClientInfoStatus" },
+                "initiateLoginUri": { "shape": "URI" },
+                "oAuthConfiguration": { "shape": "OAuthConfiguration" }
+            }
+        },
+        "ClientName": { "type": "string" },
+        "ClientSecret": {
+            "type": "string",
+            "sensitive": true
+        },
+        "ClientStateToken": {
+            "type": "string",
+            "max": 100,
+            "min": 1
+        },
+        "ClientType": { "type": "string" },
+        "CodeChallenge": {
+            "type": "string",
+            "sensitive": true
+        },
+        "CodeChallengeMethod": { "type": "string" },
+        "CodeVerifier": {
+            "type": "string",
+            "sensitive": true
+        },
+        "ConcurrentModificationException": {
+            "type": "structure",
+            "members": {
+                "error": { "shape": "Error" },
+                "error_description": { "shape": "ErrorDescription" }
+            },
+            "error": { "httpStatusCode": 409 },
+            "exception": true
+        },
+        "ConflictException": {
+            "type": "structure",
+            "members": {
+                "error": { "shape": "Error" },
+                "error_description": { "shape": "ErrorDescription" }
+            },
+            "error": { "httpStatusCode": 400 },
+            "exception": true
+        },
+        "ConsentDetail": {
+            "type": "structure",
+            "members": {
+                "applicationName": { "shape": "ApplicationName" },
+                "descriptions": { "shape": "Descriptions" }
+            }
+        },
+        "ConsentDetails": {
+            "type": "list",
+            "member": { "shape": "ConsentDetail" }
+        },
+        "ContentLanguageHeader": { "type": "string" },
+        "CreateTokenForSTSRequest": {
+            "type": "structure",
+            "required": ["sessionToken", "accountId", "roleName"],
+            "members": {
+                "sessionToken": { "shape": "SessionTokenType" },
+                "accountId": { "shape": "AccountIdType" },
+                "roleName": { "shape": "RoleNameType" }
+            }
+        },
+        "CreateTokenForSTSResponse": {
+            "type": "structure",
+            "members": {
+                "token": { "shape": "IdToken" }
+            }
+        },
+        "CreateTokenRequest": {
+            "type": "structure",
+            "required": ["clientId", "grantType"],
+            "members": {
+                "clientId": { "shape": "ClientId" },
+                "clientSecret": { "shape": "ClientSecret" },
+                "grantType": { "shape": "GrantType" },
+                "deviceCode": { "shape": "DeviceCode" },
+                "code": { "shape": "AuthCode" },
+                "refreshToken": { "shape": "RefreshToken" },
+                "assertion": { "shape": "Assertion" },
+                "scope": { "shape": "Scopes" },
+                "redirectUri": { "shape": "URI" },
+                "platformSessionExpiryRequired": { "shape": "PlatformSessionExpiryRequired" },
+                "subjectToken": { "shape": "SubjectToken" },
+                "subjectTokenType": { "shape": "TokenTypeURI" },
+                "requestedTokenType": { "shape": "TokenTypeURI" },
+                "headers": { "shape": "Headers" },
+                "codeVerifier": { "shape": "CodeVerifier" }
+            }
+        },
+        "CreateTokenResponse": {
+            "type": "structure",
+            "members": {
+                "accessToken": { "shape": "AccessToken" },
+                "tokenType": { "shape": "TokenType" },
+                "expiresIn": { "shape": "ExpirationInSeconds" },
+                "refreshToken": { "shape": "RefreshToken" },
+                "idToken": { "shape": "IdToken" },
+                "issuedTokenType": { "shape": "TokenTypeURI" },
+                "aws_sso_app_session_id": { "shape": "AppSessionId" },
+                "originSessionId": { "shape": "OriginSessionId" }
+            }
+        },
+        "CreateTokenWithIAMRequest": {
+            "type": "structure",
+            "required": ["clientId", "grantType"],
+            "members": {
+                "clientId": { "shape": "ClientId" },
+                "grantType": { "shape": "GrantType" },
+                "code": { "shape": "AuthCode" },
+                "refreshToken": { "shape": "RefreshToken" },
+                "assertion": { "shape": "Assertion" },
+                "scope": { "shape": "Scopes" },
+                "redirectUri": { "shape": "URI" },
+                "platformSessionExpiryRequired": { "shape": "PlatformSessionExpiryRequired" },
+                "subjectToken": { "shape": "SubjectToken" },
+                "subjectTokenType": { "shape": "TokenTypeURI" },
+                "requestedTokenType": { "shape": "TokenTypeURI" },
+                "headers": { "shape": "Headers" },
+                "codeVerifier": { "shape": "CodeVerifier" }
+            }
+        },
+        "CreateTokenWithIAMResponse": {
+            "type": "structure",
+            "members": {
+                "accessToken": { "shape": "AccessToken" },
+                "tokenType": { "shape": "TokenType" },
+                "expiresIn": { "shape": "ExpirationInSeconds" },
+                "refreshToken": { "shape": "RefreshToken" },
+                "idToken": { "shape": "IdToken" },
+                "issuedTokenType": { "shape": "TokenTypeURI" },
+                "aws_sso_app_session_id": { "shape": "AppSessionId" },
+                "originSessionId": { "shape": "OriginSessionId" },
+                "scope": { "shape": "Scopes" }
+            }
+        },
+        "DeleteConfidentialClientRequest": {
+            "type": "structure",
+            "members": {
+                "clientId": { "shape": "ClientId" },
+                "tenantId": { "shape": "TenantId" }
+            }
+        },
+        "DeleteConfidentialClientResponse": {
+            "type": "structure",
+            "members": {}
+        },
+        "Description": {
+            "type": "structure",
+            "members": {
+                "shortDescription": { "shape": "ShortDescription" },
+                "longDescription": { "shape": "LongDescription" },
+                "resourceType": { "shape": "ResourceType" },
+                "detailedTitle": { "shape": "DetailedTitle" }
+            }
+        },
+        "Descriptions": {
+            "type": "list",
+            "member": { "shape": "Description" }
+        },
+        "DetailedTitle": { "type": "string" },
+        "DeviceCode": { "type": "string" },
+        "DeviceContext": {
+            "type": "structure",
+            "members": {
+                "clientId": { "shape": "ClientId" },
+                "clientType": { "shape": "StringType" },
+                "deviceContextId": { "shape": "StringType" }
+            }
+        },
+        "EntitledResourceContainerId": { "type": "string" },
+        "EntitledResourceId": { "type": "string" },
+        "EntityNotFoundException": {
+            "type": "structure",
+            "members": {
+                "error": { "shape": "Error" },
+                "error_description": { "shape": "ErrorDescription" }
+            },
+            "error": { "httpStatusCode": 400 },
+            "exception": true
+        },
+        "Error": { "type": "string" },
+        "ErrorDescription": { "type": "string" },
+        "ExpirationInSeconds": { "type": "integer" },
+        "ExpiredTokenException": {
+            "type": "structure",
+            "members": {
+                "error": { "shape": "Error" },
+                "error_description": { "shape": "ErrorDescription" }
+            },
+            "error": { "httpStatusCode": 400 },
+            "exception": true
+        },
+        "ExpirySinceEpochInSeconds": { "type": "long" },
+        "ExternalId": { "type": "string" },
+        "FieldName": {
+            "type": "string",
+            "max": 100,
+            "min": 1
+        },
+        "GetConfidentialClientByExternalIdRequest": {
+            "type": "structure",
+            "members": {
+                "externalId": { "shape": "ExternalId" },
+                "tenantId": { "shape": "TenantId" },
+                "additionalFields": { "shape": "AdditionalFields" }
+            }
+        },
+        "GetConfidentialClientByExternalIdResponse": {
+            "type": "structure",
+            "members": {
+                "clientInformation": { "shape": "ClientInformation" },
+                "clientStateToken": { "shape": "ClientStateToken" }
+            }
+        },
+        "GetConfidentialClientRequest": {
+            "type": "structure",
+            "members": {
+                "clientId": { "shape": "ClientId" },
+                "tenantId": { "shape": "TenantId" }
+            }
+        },
+        "GetConfidentialClientResponse": {
+            "type": "structure",
+            "members": {
+                "clientInformation": { "shape": "ClientInformation" },
+                "clientStateToken": { "shape": "ClientStateToken" }
+            }
+        },
+        "GlobalRevokeTokenRequest": {
+            "type": "structure",
+            "members": {
+                "client_id": { "shape": "ClientId" },
+                "client_secret": { "shape": "ClientSecret" },
+                "token": { "shape": "Token" },
+                "token_type_hint": { "shape": "TokenTypeHint" },
+                "headers": { "shape": "Headers" }
+            }
+        },
+        "GlobalRevokeTokenResponse": {
+            "type": "structure",
+            "members": {
+                "associatedAppSessionsIds": { "shape": "AssociatedAppSessionIds" },
+                "originSessionId": { "shape": "OriginSessionId" }
+            }
+        },
+        "GrantConfiguration": {
+            "type": "structure",
+            "members": {
+                "grantType": { "shape": "GrantType" },
+                "grantOptions": { "shape": "GrantOptions" }
+            }
+        },
+        "GrantConfigurations": {
+            "type": "list",
+            "member": { "shape": "GrantConfiguration" }
+        },
+        "GrantOptions": {
+            "type": "structure",
+            "members": {
+                "redirectUris": { "shape": "RedirectUris" },
+                "assertionProviders": {
+                    "shape": "AssertionProviders",
+                    "deprecated": true,
+                    "deprecatedMessage": "Will be replaced by trustedTokenIssuers"
+                },
+                "trustedTokenIssuers": { "shape": "TrustedTokenIssuers" }
+            }
+        },
+        "GrantType": { "type": "string" },
+        "GrantTypes": {
+            "type": "list",
+            "member": { "shape": "GrantType" }
+        },
+        "HasConsentDetails": { "type": "boolean" },
+        "HeaderString": { "type": "string" },
+        "Headers": {
+            "type": "map",
+            "key": { "shape": "HeadersKeyType" },
+            "value": { "shape": "HeadersKeyValue" }
+        },
+        "HeadersKeyType": {
+            "type": "string",
+            "max": 256,
+            "min": 1,
+            "pattern": "^[\\x00-\\x7F]*"
+        },
+        "HeadersKeyValue": {
+            "type": "string",
+            "max": 4096,
+            "min": 1,
+            "pattern": "^[\\x00-\\x7F]*"
+        },
+        "IdToken": {
+            "type": "string",
+            "sensitive": true
+        },
+        "IdempotencyConflictException": {
+            "type": "structure",
+            "members": {
+                "error": { "shape": "Error" },
+                "error_description": { "shape": "ErrorDescription" }
+            },
+            "error": { "httpStatusCode": 400 },
+            "exception": true
+        },
+        "IdentifierType": { "type": "string" },
+        "InternalServerException": {
+            "type": "structure",
+            "members": {
+                "error": { "shape": "Error" },
+                "error_description": { "shape": "ErrorDescription" }
+            },
+            "error": { "httpStatusCode": 500 },
+            "exception": true,
+            "fault": true
+        },
+        "IntervalInSeconds": { "type": "integer" },
+        "IntrospectTokenRequest": {
+            "type": "structure",
+            "members": {
+                "token": { "shape": "Token" },
+                "tokenTypeHint": { "shape": "TokenTypeHint" },
+                "audiences": { "shape": "Audiences" }
+            }
+        },
+        "IntrospectTokenResponse": {
+            "type": "structure",
+            "members": {
+                "active": { "shape": "Active" },
+                "sub": { "shape": "Subject" },
+                "exp": { "shape": "ExpirySinceEpochInSeconds" },
+                "authorizationDetails": { "shape": "AuthorizationDetails" },
+                "aws_identityStore": { "shape": "AwsIdentityStore" },
+                "aws_identityStoreArn": { "shape": "ArnType" },
+                "aws_instanceArn": { "shape": "ArnType" },
+                "aws_instanceAccountId": { "shape": "AwsInstanceAccountId" },
+                "iss": { "shape": "Issuer" },
+                "jti": { "shape": "JwtId" },
+                "aud": { "shape": "Audiences" },
+                "scp": { "shape": "Scopes" },
+                "act": { "shape": "Actor" },
+                "token_type": { "shape": "TokenType" }
+            }
+        },
+        "InvalidClientException": {
+            "type": "structure",
+            "members": {
+                "error": { "shape": "Error" },
+                "error_description": { "shape": "ErrorDescription" }
+            },
+            "error": { "httpStatusCode": 401 },
+            "exception": true
+        },
+        "InvalidClientMetadataException": {
+            "type": "structure",
+            "members": {
+                "error": { "shape": "Error" },
+                "error_description": { "shape": "ErrorDescription" }
+            },
+            "error": { "httpStatusCode": 400 },
+            "exception": true
+        },
+        "InvalidGrantException": {
+            "type": "structure",
+            "members": {
+                "error": { "shape": "Error" },
+                "error_description": { "shape": "ErrorDescription" }
+            },
+            "error": { "httpStatusCode": 400 },
+            "exception": true
+        },
+        "InvalidRedirectUriException": {
+            "type": "structure",
+            "members": {
+                "error": { "shape": "Error" },
+                "error_description": { "shape": "ErrorDescription" }
+            },
+            "error": { "httpStatusCode": 400 },
+            "exception": true
+        },
+        "InvalidRequestException": {
+            "type": "structure",
+            "members": {
+                "error": { "shape": "Error" },
+                "error_description": { "shape": "ErrorDescription" }
+            },
+            "error": { "httpStatusCode": 400 },
+            "exception": true
+        },
+        "InvalidRequestRedirectException": {
+            "type": "structure",
+            "members": {
+                "location": {
+                    "shape": "Location",
+                    "location": "header",
+                    "locationName": "Location"
+                }
+            },
+            "error": { "httpStatusCode": 302 },
+            "exception": true
+        },
+        "InvalidRequestRegionException": {
+            "type": "structure",
+            "members": {
+                "error": { "shape": "Error" },
+                "error_description": { "shape": "ErrorDescription" },
+                "endpoint": { "shape": "Location" },
+                "region": { "shape": "Region" }
+            },
+            "error": { "httpStatusCode": 400 },
+            "exception": true
+        },
+        "InvalidScopeException": {
+            "type": "structure",
+            "members": {
+                "error": { "shape": "Error" },
+                "error_description": { "shape": "ErrorDescription" }
+            },
+            "error": { "httpStatusCode": 400 },
+            "exception": true
+        },
+        "InvalidScopeRedirectException": {
+            "type": "structure",
+            "members": {
+                "location": {
+                    "shape": "Location",
+                    "location": "header",
+                    "locationName": "Location"
+                }
+            },
+            "error": { "httpStatusCode": 302 },
+            "exception": true
+        },
+        "InvalidSoftwareStatementException": {
+            "type": "structure",
+            "members": {
+                "error": { "shape": "Error" },
+                "error_description": { "shape": "ErrorDescription" }
+            },
+            "error": { "httpStatusCode": 400 },
+            "exception": true
+        },
+        "Issuer": { "type": "string" },
+        "JwtId": { "type": "string" },
+        "ListConsentDetailsForUserRequest": {
+            "type": "structure",
+            "members": {
+                "deviceContextId": { "shape": "StringType" },
+                "authorizationResumptionContext": { "shape": "AuthorizationResumptionContext" },
+                "userSessionId": { "shape": "UserSessionId" },
+                "clientId": { "shape": "ClientId" },
+                "nextToken": { "shape": "NextToken" },
+                "maxResults": { "shape": "MaxResults" }
+            }
+        },
+        "ListConsentDetailsForUserResponse": {
+            "type": "structure",
+            "members": {
+                "consentDetails": { "shape": "ConsentDetails" },
+                "clientName": { "shape": "ClientName" },
+                "nextToken": { "shape": "NextToken" }
+            }
+        },
+        "ListConsentDetailsRequest": {
+            "type": "structure",
+            "members": {
+                "deviceContextId": {
+                    "shape": "StringType",
+                    "location": "querystring",
+                    "locationName": "device_context_id"
+                },
+                "authorizationResumptionContext": { "shape": "AuthorizationResumptionContext" },
+                "clientId": {
+                    "shape": "ClientId",
+                    "location": "querystring",
+                    "locationName": "client_id"
+                },
+                "acceptLanguage": {
+                    "shape": "AcceptLanguageHeader",
+                    "location": "header",
+                    "locationName": "Accept-Language"
+                },
+                "nextToken": {
+                    "shape": "NextToken",
+                    "location": "querystring",
+                    "locationName": "next_token"
+                },
+                "maxResults": {
+                    "shape": "MaxResults",
+                    "location": "querystring",
+                    "locationName": "max_results"
+                }
+            }
+        },
+        "ListConsentDetailsResponse": {
+            "type": "structure",
+            "members": {
+                "consentDetails": { "shape": "ConsentDetails" },
+                "contentLanguage": {
+                    "shape": "ContentLanguageHeader",
+                    "location": "header",
+                    "locationName": "Content-Language"
+                },
+                "nextToken": { "shape": "NextToken" },
+                "clientName": { "shape": "ClientName" }
+            }
+        },
+        "Location": { "type": "string" },
+        "LongDescription": { "type": "string" },
+        "LongTimeStampType": { "type": "long" },
+        "MaxResults": { "type": "integer" },
+        "NextToken": { "type": "string" },
+        "OAuthConfiguration": {
+            "type": "structure",
+            "members": {
+                "scopes": { "shape": "Scopes" },
+                "targetRestrictedScopes": { "shape": "TargetRestrictedScopes" },
+                "enabledGrants": { "shape": "GrantConfigurations" },
+                "authenticationConfiguration": { "shape": "AuthenticationConfiguration" }
+            }
+        },
+        "OriginSessionId": { "type": "string" },
+        "PlatformSessionExpiryRequired": { "type": "boolean" },
+        "PostAuthenticationResultRequest": {
+            "type": "structure",
+            "members": {
+                "orchestrator_id": { "shape": "AuthOrchestrationId" },
+                "backingSessionHeader": {
+                    "shape": "HeaderString",
+                    "location": "header",
+                    "locationName": "x-amz-sso-bearer-token"
+                },
+                "deprecatedBackingSessionHeader": {
+                    "shape": "HeaderString",
+                    "location": "header",
+                    "locationName": "x-amz-sso_bearer_token"
+                }
+            }
+        },
+        "PostAuthenticationResultResponse": {
+            "type": "structure",
+            "members": {
+                "location": { "shape": "URI" }
+            }
+        },
+        "PreRegisterClientRequest": {
+            "type": "structure",
+            "members": {
+                "softwareId": { "shape": "SoftwareId" },
+                "accessToken": { "shape": "AccessToken" },
+                "clientType": { "shape": "ClientType" },
+                "clientName": { "shape": "ClientName" },
+                "scopes": { "shape": "Scopes" }
+            }
+        },
+        "PreRegisterClientResponse": {
+            "type": "structure",
+            "members": {
+                "softwareStatement": { "shape": "SoftwareStatement" }
+            }
+        },
+        "RedirectUris": {
+            "type": "list",
+            "member": { "shape": "URI" }
+        },
+        "RefreshToken": {
+            "type": "string",
+            "sensitive": true
+        },
+        "Region": { "type": "string" },
+        "RegisterClientRequest": {
+            "type": "structure",
+            "members": {
+                "clientName": { "shape": "ClientName" },
+                "clientType": { "shape": "ClientType" },
+                "scopes": { "shape": "Scopes" },
+                "softwareStatement": { "shape": "SoftwareStatement" },
+                "redirectUris": { "shape": "RedirectUris" },
+                "grantTypes": { "shape": "GrantTypes" },
+                "entitledApplicationArn": { "shape": "ArnType" },
+                "issuerUrl": { "shape": "URI" }
+            }
+        },
+        "RegisterClientResponse": {
+            "type": "structure",
+            "members": {
+                "clientId": { "shape": "ClientId" },
+                "clientSecret": { "shape": "ClientSecret" },
+                "clientIdIssuedAt": { "shape": "LongTimeStampType" },
+                "clientSecretExpiresAt": { "shape": "LongTimeStampType" },
+                "authorizationEndpoint": { "shape": "URI" },
+                "tokenEndpoint": { "shape": "URI" }
+            }
+        },
+        "RegisterConfidentialClientRequest": {
+            "type": "structure",
+            "members": {
+                "idempotentKey": { "shape": "IdentifierType" },
+                "templateArn": { "shape": "ArnType" },
+                "templateContext": { "shape": "TemplateContextMap" },
+                "initiateLoginUri": { "shape": "URI" },
+                "entitledResourceId": { "shape": "EntitledResourceId" },
+                "entitledResourceContainerId": { "shape": "EntitledResourceContainerId" },
+                "externalId": { "shape": "ExternalId" },
+                "status": { "shape": "ClientInfoStatus" },
+                "tenantId": { "shape": "TenantId" },
+                "enabledGrants": { "shape": "GrantConfigurations" },
+                "scopes": { "shape": "Scopes" },
+                "targetRestrictedScopes": { "shape": "TargetRestrictedScopes" },
+                "authenticationConfiguration": { "shape": "AuthenticationConfiguration" },
+                "preventOAuthConfigurationBackFill": { "shape": "preventOAuthConfigurationBackFill" }
+            }
+        },
+        "RegisterConfidentialClientResponse": {
+            "type": "structure",
+            "members": {
+                "clientId": { "shape": "ClientId" },
+                "clientInformation": { "shape": "ClientInformation" }
+            }
+        },
+        "ResolveStartLocationRequest": {
+            "type": "structure",
+            "members": {
+                "clientId": {
+                    "shape": "ClientId",
+                    "location": "querystring",
+                    "locationName": "client_id"
+                }
+            }
+        },
+        "ResolveStartLocationResponse": {
+            "type": "structure",
+            "members": {
+                "location": {
+                    "shape": "Location",
+                    "location": "header",
+                    "locationName": "Location"
+                }
+            }
+        },
+        "ResourceType": { "type": "string" },
+        "ResponseType": { "type": "string" },
+        "RestoreBackfilledConfidentialClientRequest": {
+            "type": "structure",
+            "members": {
+                "clientId": { "shape": "ClientId" }
+            }
+        },
+        "RestoreBackfilledConfidentialClientResponse": {
+            "type": "structure",
+            "members": {
+                "clientId": { "shape": "ClientId" },
+                "backfillVersion": { "shape": "BackfillVersion" }
+            }
+        },
+        "RevokeTokenRequest": {
+            "type": "structure",
+            "members": {
+                "client_id": { "shape": "ClientId" },
+                "client_secret": { "shape": "ClientSecret" },
+                "token": { "shape": "Token" },
+                "token_type_hint": { "shape": "TokenTypeHint" },
+                "headers": { "shape": "Headers" }
+            }
+        },
+        "RevokeTokenResponse": {
+            "type": "structure",
+            "members": {}
+        },
+        "RoleNameType": { "type": "string" },
+        "Scope": { "type": "string" },
+        "Scopes": {
+            "type": "list",
+            "member": { "shape": "Scope" }
+        },
+        "ServerErrorRedirectException": {
+            "type": "structure",
+            "members": {
+                "location": {
+                    "shape": "Location",
+                    "location": "header",
+                    "locationName": "Location"
+                }
+            },
+            "error": { "httpStatusCode": 302 },
+            "exception": true
+        },
+        "SessionTokenType": {
+            "type": "string",
+            "sensitive": true
+        },
+        "ShortDescription": { "type": "string" },
+        "SlowDownException": {
+            "type": "structure",
+            "members": {
+                "error": { "shape": "Error" },
+                "error_description": { "shape": "ErrorDescription" }
+            },
+            "error": { "httpStatusCode": 400 },
+            "exception": true
+        },
+        "SlowDownRedirectException": {
+            "type": "structure",
+            "members": {
+                "location": {
+                    "shape": "Location",
+                    "location": "header",
+                    "locationName": "Location"
+                }
+            },
+            "error": { "httpStatusCode": 302 },
+            "exception": true
+        },
+        "SoftwareId": { "type": "string" },
+        "SoftwareStatement": { "type": "string" },
+        "StartDeviceAuthorizationRequest": {
+            "type": "structure",
+            "members": {
+                "clientId": { "shape": "ClientId" },
+                "clientSecret": { "shape": "ClientSecret" },
+                "startUrl": { "shape": "URI" }
+            }
+        },
+        "StartDeviceAuthorizationResponse": {
+            "type": "structure",
+            "members": {
+                "deviceCode": { "shape": "DeviceCode" },
+                "userCode": { "shape": "UserCode" },
+                "verificationUri": { "shape": "URI" },
+                "verificationUriComplete": { "shape": "URI" },
+                "expiresIn": { "shape": "ExpirationInSeconds" },
+                "interval": { "shape": "IntervalInSeconds" }
+            }
+        },
+        "State": { "type": "string" },
+        "StringType": { "type": "string" },
+        "Subject": { "type": "string" },
+        "SubjectToken": {
+            "type": "string",
+            "sensitive": true
+        },
+        "TargetRestrictedScope": {
+            "type": "structure",
+            "members": {
+                "scope": { "shape": "Scope" },
+                "authorizedTargets": { "shape": "AuthorizedTargets" }
+            }
+        },
+        "TargetRestrictedScopes": {
+            "type": "list",
+            "member": { "shape": "TargetRestrictedScope" }
+        },
+        "TemplateContextKeyValueType": { "type": "string" },
+        "TemplateContextMap": {
+            "type": "map",
+            "key": { "shape": "TemplateContextKeyValueType" },
+            "value": { "shape": "TemplateContextKeyValueType" }
+        },
+        "TemporarilyUnavailableRedirectException": {
+            "type": "structure",
+            "members": {
+                "location": {
+                    "shape": "Location",
+                    "location": "header",
+                    "locationName": "Location"
+                }
+            },
+            "error": { "httpStatusCode": 302 },
+            "exception": true
+        },
+        "TenantId": { "type": "string" },
+        "Token": {
+            "type": "string",
+            "sensitive": true
+        },
+        "TokenType": { "type": "string" },
+        "TokenTypeHint": { "type": "string" },
+        "TokenTypeURI": { "type": "string" },
+        "TrustedTokenIssuer": {
+            "type": "structure",
+            "members": {
+                "id": { "shape": "TrustedTokenIssuerId" },
+                "audienceRestrictions": { "shape": "TrustedTokenIssuerAudienceRestrictions" }
+            }
+        },
+        "TrustedTokenIssuerAudienceRestriction": {
+            "type": "string",
+            "max": 512,
+            "min": 1,
+            "pattern": "^[A-Za-z0-9._~()\\/%$'&=!*:@#\\[\\],;+?-]+$"
+        },
+        "TrustedTokenIssuerAudienceRestrictions": {
+            "type": "list",
+            "member": { "shape": "TrustedTokenIssuerAudienceRestriction" }
+        },
+        "TrustedTokenIssuerId": {
+            "type": "string",
+            "max": 36,
+            "min": 36,
+            "pattern": "^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$"
+        },
+        "TrustedTokenIssuers": {
+            "type": "list",
+            "member": { "shape": "TrustedTokenIssuer" }
+        },
+        "URI": { "type": "string" },
+        "UnauthorizedClientException": {
+            "type": "structure",
+            "members": {
+                "error": { "shape": "Error" },
+                "error_description": { "shape": "ErrorDescription" }
+            },
+            "error": { "httpStatusCode": 400 },
+            "exception": true
+        },
+        "UnauthorizedClientRedirectException": {
+            "type": "structure",
+            "members": {
+                "location": {
+                    "shape": "Location",
+                    "location": "header",
+                    "locationName": "Location"
+                }
+            },
+            "error": { "httpStatusCode": 302 },
+            "exception": true
+        },
+        "UnsupportedGrantTypeException": {
+            "type": "structure",
+            "members": {
+                "error": { "shape": "Error" },
+                "error_description": { "shape": "ErrorDescription" }
+            },
+            "error": { "httpStatusCode": 400 },
+            "exception": true
+        },
+        "UnsupportedResponseTypeRedirectException": {
+            "type": "structure",
+            "members": {
+                "location": {
+                    "shape": "Location",
+                    "location": "header",
+                    "locationName": "Location"
+                }
+            },
+            "error": { "httpStatusCode": 302 },
+            "exception": true
+        },
+        "UnsupportedTokenTypeException": {
+            "type": "structure",
+            "members": {
+                "error": { "shape": "Error" },
+                "error_description": { "shape": "ErrorDescription" }
+            },
+            "error": { "httpStatusCode": 400 },
+            "exception": true
+        },
+        "UpdateConfidentialClientForMigrationRequest": {
+            "type": "structure",
+            "members": {
+                "clientId": { "shape": "ClientId" },
+                "tenantId": { "shape": "TenantId" },
+                "entitledResourceId": { "shape": "EntitledResourceId" },
+                "entitledResourceContainerId": { "shape": "EntitledResourceContainerId" },
+                "externalId": { "shape": "ExternalId" },
+                "initiateLoginUri": { "shape": "URI" },
+                "status": { "shape": "ClientInfoStatus" },
+                "enabledGrants": { "shape": "GrantConfigurations" },
+                "scopes": { "shape": "Scopes" },
+                "authenticationConfiguration": { "shape": "AuthenticationConfiguration" }
+            }
+        },
+        "UpdateConfidentialClientForMigrationResponse": {
+            "type": "structure",
+            "members": {
+                "clientInformation": { "shape": "ClientInformation" }
+            }
+        },
+        "UpdateConfidentialClientRequest": {
+            "type": "structure",
+            "members": {
+                "clientId": { "shape": "ClientId" },
+                "tenantId": { "shape": "TenantId" },
+                "initiateLoginUri": { "shape": "URI" },
+                "status": { "shape": "ClientInfoStatus" },
+                "enabledGrants": { "shape": "GrantConfigurations" },
+                "scopes": { "shape": "Scopes" },
+                "targetRestrictedScopes": { "shape": "TargetRestrictedScopes" },
+                "authenticationConfiguration": { "shape": "AuthenticationConfiguration" },
+                "clientStateToken": { "shape": "ClientStateToken" }
+            }
+        },
+        "UpdateConfidentialClientResponse": {
+            "type": "structure",
+            "members": {}
+        },
+        "UserCode": { "type": "string" },
+        "UserSessionId": { "type": "string" },
+        "ValidateUserCodeRequest": {
+            "type": "structure",
+            "members": {
+                "userCode": {
+                    "shape": "UserCode",
+                    "location": "querystring",
+                    "locationName": "user_code"
+                }
+            }
+        },
+        "ValidateUserCodeResponse": {
+            "type": "structure",
+            "members": {
+                "location": { "shape": "URI" },
+                "deviceContext": { "shape": "DeviceContext" },
+                "hasConsentDetails": { "shape": "HasConsentDetails" }
+            }
+        },
+        "preventOAuthConfigurationBackFill": { "type": "boolean" }
+    }
+}
diff --git a/packages/core/src/auth/sso/ssoAccessTokenProvider.ts b/packages/core/src/auth/sso/ssoAccessTokenProvider.ts
new file mode 100644
index 00000000000..e753fb2ef90
--- /dev/null
+++ b/packages/core/src/auth/sso/ssoAccessTokenProvider.ts
@@ -0,0 +1,823 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import globals from '../../shared/extensionGlobals'
+import { AuthorizationPendingException, SSOOIDCServiceException, SlowDownException } from '@aws-sdk/client-sso-oidc'
+import { SsoToken, ClientRegistration, isExpired, SsoProfile, openSsoPortalLink, isDeprecatedAuth } from './model'
+import { getCache } from './cache'
+import { hasProps, hasStringProps, RequiredProps, selectFrom } from '../../shared/utilities/tsUtils'
+import { OidcClient } from './clients'
+import { DiskCacheError, loadOr } from '../../shared/utilities/cacheUtils'
+import {
+    ToolkitError,
+    getErrorMsg,
+    getRequestId,
+    getTelemetryReason,
+    getTelemetryReasonDesc,
+    getTelemetryResult,
+    isClientFault,
+    isNetworkError,
+} from '../../shared/errors'
+import { getLogger } from '../../shared/logger/logger'
+import { AwsLoginWithBrowser, AwsRefreshCredentials, telemetry } from '../../shared/telemetry/telemetry'
+import { indent, toBase64URL } from '../../shared/utilities/textUtilities'
+import { AuthSSOServer } from './server'
+import { CancellationError, sleep } from '../../shared/utilities/timeoutUtils'
+import { oidcClientName, isAmazonQ } from '../../shared/extensionUtilities'
+import { randomBytes, createHash } from 'crypto'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { randomUUID } from '../../shared/crypto'
+import { getExtRuntimeContext } from '../../shared/vscode/env'
+import { showInputBox } from '../../shared/ui/inputPrompter'
+import { AmazonQPromptSettings, DevSettings, PromptSettings, ToolkitPromptSettings } from '../../shared/settings'
+import { onceChanged } from '../../shared/utilities/functionUtils'
+import { NestedMap } from '../../shared/utilities/map'
+import { asStringifiedStack } from '../../shared/telemetry/spans'
+import { showViewLogsMessage } from '../../shared/utilities/messages'
+import _ from 'lodash'
+import { builderIdStartUrl } from './constants'
+
+export const authenticationPath = 'sso/authenticated'
+
+const clientRegistrationType = 'public'
+const deviceGrantType = 'urn:ietf:params:oauth:grant-type:device_code'
+const authorizationGrantType = 'authorization_code'
+const refreshGrantType = 'refresh_token'
+
+/**
+ * See {@link DeviceFlowAuthorization} or {@link AuthFlowAuthorization} for protocol overview.
+ */
+export abstract class SsoAccessTokenProvider {
+    /**
+     * Source to pass to aws_loginWithBrowser metric. Due to the complexity of how auth can be called,
+     * there is no other easy way to pass this in without signficant refactors.
+     */
+    private static _authSource: string = 'unknown'
+    private static logIfChanged = onceChanged((s: string) => getLogger().info(s))
+    private readonly className = 'SsoAccessTokenProvider'
+
+    public static set authSource(val: string) {
+        SsoAccessTokenProvider._authSource = val
+    }
+
+    public constructor(
+        protected readonly profile: Pick<SsoProfile, 'startUrl' | 'region' | 'scopes' | 'identifier'>,
+        protected readonly cache = getCache(),
+        protected readonly oidc: OidcClient = OidcClient.create(profile.region),
+        protected readonly reAuthState: ReAuthState = ReAuthState.instance
+    ) {}
+
+    public async invalidate(reason: string): Promise<void> {
+        getLogger().info(`SsoAccessTokenProvider: invalidate token and registration`)
+
+        // always emit telemetry when the cache is deleted.
+        // most of the time cache is deleted on cache expiration, this is infrequent and expected.
+        // Any premature scenarios, that are not explicit deletion by the user, are likely bugs.
+        await telemetry.auth_modifyConnection.run(
+            async (span) => {
+                span.record({
+                    source: asStringifiedStack(telemetry.getFunctionStack()),
+                    action: 'deleteSsoCache',
+                    credentialStartUrl: this.profile.startUrl,
+                    sessionDuration: this.getSessionDuration(),
+                })
+
+                // Use allSettled() instead of all() to ensure all clear() calls are resolved.
+                await Promise.allSettled([
+                    this.cache.token.clear(this.tokenCacheKey, 'SsoAccessTokenProvider.invalidate()'),
+                    this.cache.registration.clear(this.registrationCacheKey, 'SsoAccessTokenProvider.invalidate()'),
+                ])
+            },
+            { emit: true, functionId: { name: 'invalidate', class: this.className } }
+        )
+
+        this.reAuthState.set(this.profile, { reAuthReason: `invalidate():${reason}` })
+    }
+
+    public async getToken(): Promise<SsoToken | undefined> {
+        const data = await this.cache.token.load(this.tokenCacheKey)
+        SsoAccessTokenProvider.logIfChanged(
+            indent(
+                `current client registration id=${data?.registration?.clientId}
+             expires at ${data?.registration?.expiresAt}
+             key = ${this.tokenCacheKey}`,
+                4,
+                true
+            )
+        )
+        if (!data || !isExpired(data.token)) {
+            return data?.token
+        }
+
+        if (data.registration && !isExpired(data.registration) && hasProps(data.token, 'refreshToken')) {
+            const refreshed = await this.refreshToken(data.token, data.registration)
+
+            return refreshed.token
+        } else {
+            await this.invalidate('allCacheExpired')
+        }
+    }
+
+    public async createToken(args?: CreateTokenArgs): Promise<SsoToken> {
+        const access = await this.runFlow(args)
+        const identity = this.tokenCacheKey
+        await this.cache.token.save(identity, access)
+        await globals.globalState.setSsoSessionCreationDate(this.tokenCacheKey, new globals.clock.Date())
+
+        return { ...access.token, identity }
+    }
+
+    private async runFlow(args?: CreateTokenArgs) {
+        const registration = await this.getValidatedClientRegistration()
+        args = {
+            ...args,
+            registrationClientId: registration.clientId,
+            registrationExpiresAt: registration.expiresAt.toISOString(),
+        }
+
+        try {
+            const result = await this.authorize(registration, args)
+
+            // Authentication in the browser is successfully done, so the reauth reason is now stale.
+            // We don't clear the reason on failure since we want to keep reporting it as the reason until
+            // reauth is a success.
+            this.reAuthState.delete(this.profile, 'reauth successful')
+
+            return result
+        } catch (err) {
+            if (err instanceof SSOOIDCServiceException && isClientFault(err)) {
+                await this.cache.registration.clear(
+                    this.registrationCacheKey,
+                    `client fault: SSOOIDCServiceException: ${err.message}`
+                )
+            }
+
+            throw err
+        }
+    }
+
+    private async refreshToken(token: RequiredProps<SsoToken, 'refreshToken'>, registration: ClientRegistration) {
+        const metric = {
+            sessionDuration: getSessionDuration(this.tokenCacheKey),
+            credentialType: 'bearerToken',
+            credentialSourceId: this.profile.startUrl === builderIdStartUrl ? 'awsId' : 'iamIdentityCenter',
+            credentialStartUrl: this.profile.startUrl,
+            awsRegion: this.profile.region,
+            ssoRegistrationExpiresAt: registration.expiresAt.toISOString(),
+            ssoRegistrationClientId: registration.clientId,
+        }
+
+        try {
+            const clientInfo = selectFrom(registration, 'clientId', 'clientSecret')
+            const response = await this.oidc.createToken({ ...clientInfo, ...token, grantType: refreshGrantType })
+            const refreshed = this.formatToken(response, registration)
+            await this.cache.token.save(this.tokenCacheKey, refreshed)
+
+            telemetry.aws_refreshCredentials.emit({
+                result: 'Succeeded',
+                requestId: response.requestId,
+                ...metric,
+            } as AwsRefreshCredentials)
+
+            return refreshed
+        } catch (err) {
+            if (err instanceof DiskCacheError) {
+                /**
+                 * Background:
+                 * - During token refresh the cache sometimes fails due to a file system error.
+                 * - When these errors ocurr it will cause the token refresh process to fail, and the users SSO
+                 *   connection to become invalid.
+                 * - Because these cache errors do not indicate the SSO session is actually stale,
+                 *   we want to catch these errors and not invalidate the users SSO connection since a
+                 *   subsequent attempt to refresh may succeed.
+                 * - To give the user a chance to resolve their filesystem related issue, we want to point them
+                 *   to the logs where the error was logged. Hopefully they can use this information to fix the issue,
+                 *   or at least hint for them to provide the logs in a bug report.
+                 */
+                void DiskCacheErrorMessage.instance.showMessageThrottled(err)
+            } else if (!isNetworkError(err)) {
+                const reason = getTelemetryReason(err)
+                telemetry.aws_refreshCredentials.emit({
+                    result: getTelemetryResult(err),
+                    reason,
+                    reasonDesc: getTelemetryReasonDesc(err),
+                    requestId: getRequestId(err),
+                    ...metric,
+                } as AwsRefreshCredentials)
+
+                if (err instanceof SSOOIDCServiceException && isClientFault(err)) {
+                    await this.cache.token.clear(
+                        this.tokenCacheKey,
+                        `client fault: SSOOIDCServiceException: ${err.message}`
+                    )
+                    // remember why refresh failed so next reauth flow will know why reauth is needed
+                    if (reason) {
+                        this.reAuthState.set(this.profile, { reAuthReason: `refresh:${reason}` })
+                    }
+                }
+            }
+
+            throw err
+        }
+    }
+
+    getSessionDuration() {
+        return getSessionDuration(this.tokenCacheKey)
+    }
+
+    protected formatToken(token: SsoToken, registration: ClientRegistration) {
+        return { token, registration, region: this.profile.region, startUrl: this.profile.startUrl }
+    }
+
+    protected get tokenCacheKey() {
+        return this.profile.identifier ?? this.profile.startUrl
+    }
+
+    protected get registrationCacheKey() {
+        return { startUrl: this.profile.startUrl, region: this.profile.region, scopes: this.profile.scopes }
+    }
+
+    /**
+     * Wraps the given function with telemetry related to the browser login.
+     */
+    protected withBrowserLoginTelemetry<T extends (...args: any[]) => any>(
+        func: T,
+        args?: CreateTokenArgs
+    ): ReturnType<T> {
+        return telemetry.aws_loginWithBrowser.run((span) => {
+            span.record({
+                credentialStartUrl: this.profile.startUrl,
+                source: SsoAccessTokenProvider._authSource,
+                isReAuth: args?.isReAuth,
+                reAuthReason: args?.isReAuth ? this.reAuthState.get(this.profile).reAuthReason : undefined,
+                awsRegion: this.profile.region,
+                ssoRegistrationExpiresAt: args?.registrationExpiresAt,
+                ssoRegistrationClientId: args?.registrationClientId,
+                sessionDuration: getSessionDuration(this.tokenCacheKey),
+            })
+
+            // Reset source in case there is a case where browser login was called but we forgot to set the source.
+            // We don't want to attribute the wrong source.
+            SsoAccessTokenProvider.authSource = 'unknown'
+
+            return func()
+        })
+    }
+
+    protected abstract authorize(
+        registration: ClientRegistration,
+        args?: CreateTokenArgs
+    ): Promise<{
+        token: SsoToken
+        registration: ClientRegistration
+        region: string
+        startUrl: string
+    }>
+
+    /**
+     * If the registration already exists locally, it
+     * will be validated before being returned. Otherwise, a client registration is
+     * created and returned.
+     */
+    protected abstract getValidatedClientRegistration(): Promise<ClientRegistration>
+    protected abstract registerClient(): Promise<ClientRegistration>
+
+    public static create(
+        profile: Pick<SsoProfile, 'startUrl' | 'region' | 'scopes' | 'identifier'>,
+        cache = getCache(),
+        oidc: OidcClient = OidcClient.create(profile.region),
+        reAuthState?: ReAuthState,
+        useDeviceFlow: () => boolean = () => {
+            /**
+             * Device code flow is neccessary when:
+             * 1. We are in a workspace connected through ssh (codecatalyst, etc)
+             * 2. We are connected to a remote backend through the web browser (code server, openshift dev spaces)
+             *
+             * Since we are unable to serve the final authorization page
+             */
+            return getExtRuntimeContext().extensionHost === 'remote'
+        }
+    ) {
+        if (DevSettings.instance.get('webAuth', false) && getExtRuntimeContext().extensionHost === 'webworker') {
+            return new WebAuthorization(profile, cache, oidc, reAuthState)
+        }
+        if (useDeviceFlow()) {
+            return new DeviceFlowAuthorization(profile, cache, oidc, reAuthState)
+        }
+        return new AuthFlowAuthorization(profile, cache, oidc, reAuthState)
+    }
+
+    /**
+     * Returns a client registration for the current profile if it exists, otherwise
+     * undefined.
+     */
+    public async getClientRegistration() {
+        return await this.cache.registration.load(this.registrationCacheKey)
+    }
+}
+
+/**
+ * Supplementary arguments for the create token flow. This data can be used
+ * for things like telemetry.
+ */
+export type CreateTokenArgs = {
+    /** true if the create token flow is for reauthentication */
+    isReAuth?: boolean
+
+    /** registration info for telemetry */
+    registrationClientId?: string
+    registrationExpiresAt?: string
+}
+
+const backoffDelayMs = 5000
+async function pollForTokenWithProgress<T extends { requestId?: string }>(
+    fn: () => Promise<T>,
+    authorization: Awaited<ReturnType<OidcClient['startDeviceAuthorization']>>,
+    interval = authorization.interval ?? backoffDelayMs
+) {
+    async function poll(token: vscode.CancellationToken) {
+        while (
+            authorization.expiresAt.getTime() - globals.clock.Date.now() > interval &&
+            !token.isCancellationRequested
+        ) {
+            try {
+                const res = await fn()
+                telemetry.record({
+                    requestId: res.requestId,
+                })
+                return res
+            } catch (err) {
+                if (!hasStringProps(err, 'name')) {
+                    throw err
+                }
+
+                if (err instanceof SlowDownException) {
+                    interval += backoffDelayMs
+                } else if (!(err instanceof AuthorizationPendingException)) {
+                    throw err
+                }
+            }
+
+            await sleep(interval)
+        }
+
+        // TODO: verify that this emits telemetry
+        throw new ToolkitError('Timed-out waiting for browser login flow to complete', {
+            code: 'TimedOut',
+        })
+    }
+
+    return vscode.window.withProgress(
+        {
+            title: localize(
+                'AWS.auth.loginWithBrowser.messageDetail',
+                'Confirm code "{0}" in the login page opened in your web browser.',
+                authorization.userCode
+            ),
+            cancellable: true,
+            location: vscode.ProgressLocation.Notification,
+        },
+        (_, token) =>
+            Promise.race([
+                poll(token),
+                new Promise<never>((_, reject) =>
+                    token.onCancellationRequested(() => reject(new CancellationError('user')))
+                ),
+            ])
+    )
+}
+
+/**
+ * Gets SSO session creation timestamp for the given session `id`.
+ *
+ * @param id Session id
+ */
+function getSessionDuration(id: string) {
+    const creationDate = globals.globalState.getSsoSessionCreationDate(id)
+    return creationDate !== undefined ? globals.clock.Date.now() - creationDate : undefined
+}
+
+/**
+ *  SSO "device code" flow (RFC: https://tools.ietf.org/html/rfc8628)
+ *    1. Get a client id (SSO-OIDC identifier, formatted per RFC6749).
+ *       - Toolkit code: {@link SsoAccessTokenProvider.registerClient}
+ *          - Calls {@link OidcClient.registerClient}
+ *       - RETURNS:
+ *         - ClientSecret
+ *         - ClientId
+ *         - ClientSecretExpiresAt
+ *       - Client registration is valid for potentially months and creates state
+ *         server-side, so the client SHOULD cache them to disk.
+ *    2. Start device authorization.
+ *       - Toolkit code: {@link SsoAccessTokenProvider.authorize}
+ *          - Calls {@link OidcClient.startDeviceAuthorization}
+ *       - RETURNS (RFC: https://tools.ietf.org/html/rfc8628#section-3.2):
+ *         - DeviceCode             : Device verification code
+ *         - UserCode               : User verification code
+ *         - VerificationUri        : User verification URI on the authorization server
+ *         - VerificationUriComplete: User verification URI including the `user_code`
+ *         - ExpiresIn              : Lifetime (seconds) of `device_code` and `user_code`
+ *         - Interval               : Minimum time (seconds) the client SHOULD wait between polling intervals.
+ *    3. Poll for the access token.
+ *       - Toolkit code: {@link SsoAccessTokenProvider.authorize}
+ *          - Calls {@link pollForTokenWithProgress}
+ *       - RETURNS:
+ *         - AccessToken
+ *         - ExpiresIn
+ *         - RefreshToken (optional)
+ *    4. (Repeat) Tokens SHOULD be refreshed if expired and a refresh token is available.
+ *        - Toolkit code: {@link SsoAccessTokenProvider.refreshToken}
+ *          - Calls {@link OidcClient.createToken}
+ *        - RETURNS:
+ *         - AccessToken
+ *         - ExpiresIn
+ *         - RefreshToken (optional)
+ */
+export class DeviceFlowAuthorization extends SsoAccessTokenProvider {
+    override async registerClient(): Promise<ClientRegistration> {
+        return this.oidc.registerClient(
+            {
+                clientName: oidcClientName(),
+                clientType: clientRegistrationType,
+                scopes: this.profile.scopes,
+            },
+            this.profile.startUrl
+        )
+    }
+
+    override async authorize(
+        registration: ClientRegistration,
+        args?: CreateTokenArgs
+    ): Promise<{ token: SsoToken; registration: ClientRegistration; region: string; startUrl: string }> {
+        // This will NOT throw on expired clientId/Secret, but WILL throw on invalid clientId/Secret
+        const authorization = await this.oidc.startDeviceAuthorization({
+            startUrl: this.profile.startUrl,
+            clientId: registration.clientId,
+            clientSecret: registration.clientSecret,
+        })
+
+        const openBrowserAndWaitUntilComplete = async () => {
+            if (!(await openSsoPortalLink(this.profile.startUrl, authorization))) {
+                throw new CancellationError('user')
+            }
+
+            return await pollForTokenWithProgress(
+                () =>
+                    this.oidc.createToken({
+                        clientId: registration.clientId,
+                        clientSecret: registration.clientSecret,
+                        deviceCode: authorization.deviceCode,
+                        grantType: deviceGrantType,
+                    }),
+                authorization
+            )
+        }
+
+        const token = this.withBrowserLoginTelemetry(() => openBrowserAndWaitUntilComplete(), args)
+
+        return this.formatToken(await token, registration)
+    }
+
+    /**
+     * If the registration already exists locally, it
+     * will be validated before being returned. Otherwise, a client registration is
+     * created and returned.
+     */
+    override async getValidatedClientRegistration(): Promise<ClientRegistration> {
+        return telemetry.function_call.run(
+            async () => {
+                const cacheKey = this.registrationCacheKey
+                const cachedRegistration = await this.cache.registration.load(cacheKey)
+
+                // Clear cached if registration is expired
+                if (cachedRegistration && isExpired(cachedRegistration)) {
+                    await this.invalidate('registrationExpired:DeviceCode')
+                }
+
+                return loadOr(this.cache.registration, cacheKey, () => this.registerClient())
+            },
+            { emit: false, functionId: { name: 'getValidatedClientRegistration', class: 'DeviceFlowAuthorization' } }
+        )
+    }
+}
+
+/**
+ *  SSO "authorization code" + PKCE flow (https://oauth.net/2/grant-types/authorization-code/)
+ *   1. `grant_type = authorization_code`
+ *   2. Clients exchange an authorization code for an access token.
+ *       1. After the user returns to the client via the redirect URL, the application will get the authorization code from the URL and use it to request an access token.
+ *   3. PKCE https://oauth.net/2/pkce/
+ *       1. PKCE-enhanced Authorization Code Flow prevents CSRF and authorization code injection attacks, by introducing a *secret* created by the client, that can be verified by the authorization server.
+ *       2. PKCE does not add any new responses, so clients can always use the PKCE extension even if an authorization server does not support it.
+ *   4. LIFECYCLE
+ *       1. CLIENT CREATES AN APP (ONE-TIME)
+ *           1. Client creates an "app": server returns a `client_id` for use in all future sessions. (expires in 90 days)
+ *       2. PKCE SEQUENCE:
+ *           1. Client app generates a random secret (`code_verifier`) per authorization request.
+ *           2. Client: AUTHORIZATION REQUEST: `registerClient()`: client sends SHA256 hash (`code_challenge_method`) of the secret (`code_challenge`) in the authorization request.
+ *               1. PARAMETERS:
+ *                   1. `response_type=code`: indicates that your client expects to receive an authorization code.
+ *                   2. `client_id`
+ *                   3. `redirect_uri`: Server will navigate the user to this URL, after appending `?code=…`. Typically `http://127.0.0.1/…` but may be remote (`https://vscode.dev/…`) or custom URI scheme (`vscode://…`).
+ *                   4. `state=1234zyx`: CSRF token. Random string generated by your (client) application, which you’ll verify later.
+ *                   5. `code_challenge`: See above.
+ *                   6. `code_challenge_method=S256`: either "plain" or "S256".
+ *           3. Server: website redirects the user to `<redirect_uri>?code=…&state=…`.
+ *               1. Client verifies the `state` (CSRF token).
+ *               2. Client gets the `code`. Can later exchange it for a "token set" (access token, refresh token and id token).
+ *           4. Client: ACCESS TOKEN REQUEST ("AUTHORIZATION CODE EXCHANGE"): `createToken()`: client exchanges the authorization code for an access token and sends the un-hashed secret (`code_verifier`), which the server can hash and compare to the original hash, to verify the createToken() request came from the actual client.
+ *               1. PARAMETERS:
+ *                   1. `grant_type=authorization_code`
+ *                   2. `client_id`
+ *                   3. `redirect_uri`: See above.
+ *                   4. `code`: Authorization code obtained from the redirect.
+ *                   5. `client_secret` (optional): The application’s registered client secret if it was issued a secret.
+ *                   6. `code_verifier`: See above.
+ *           5. Server: transforms the provided `code_verifier` using the same hash method (`code_challenge_method`), then compares it to the stored `code_challenge` string.
+ *               1. If the verifier matches the expected value, server issues an access token.
+ *               2. If there is a problem, server responds with `invalid_grant` error.
+ */
+class AuthFlowAuthorization extends SsoAccessTokenProvider {
+    override async registerClient(): Promise<ClientRegistration> {
+        return this.oidc.registerClient(
+            {
+                // All AWS extensions (Q, Toolkit) for a given IDE use the same client name.
+                clientName: oidcClientName(),
+                clientType: clientRegistrationType,
+                scopes: this.profile.scopes,
+                grantTypes: [authorizationGrantType, refreshGrantType],
+                redirectUris: ['http://127.0.0.1/oauth/callback'],
+                issuerUrl: this.profile.startUrl,
+            },
+            this.profile.startUrl,
+            'auth code'
+        )
+    }
+
+    override async authorize(
+        registration: ClientRegistration,
+        args?: CreateTokenArgs
+    ): Promise<{ token: SsoToken; registration: ClientRegistration; region: string; startUrl: string }> {
+        const state = randomUUID()
+        const authServer = AuthSSOServer.init(state)
+
+        try {
+            await authServer.start()
+
+            const token = await this.withBrowserLoginTelemetry(async () => {
+                const redirectUri = authServer.redirectUri
+
+                const codeVerifier = randomBytes(32).toString('base64url')
+                const codeChallenge = createHash('sha256').update(codeVerifier).digest().toString('base64url')
+
+                const location = await this.oidc.authorize({
+                    responseType: 'code',
+                    clientId: registration.clientId,
+                    redirectUri: redirectUri,
+                    scopes: this.profile.scopes ?? [],
+                    state,
+                    codeChallenge,
+                    codeChallengeMethod: 'S256',
+                })
+
+                await vscode.env.openExternal(vscode.Uri.parse(location))
+
+                const authorizationCode = await authServer.waitForAuthorization()
+                if (authorizationCode.isErr()) {
+                    throw authorizationCode.err()
+                }
+
+                const res = await this.oidc.createToken({
+                    clientId: registration.clientId,
+                    clientSecret: registration.clientSecret,
+                    grantType: authorizationGrantType,
+                    redirectUri,
+                    codeVerifier,
+                    code: authorizationCode.unwrap(),
+                })
+                telemetry.record({ requestId: res.requestId })
+
+                return res
+            }, args)
+
+            return this.formatToken(token, registration)
+        } finally {
+            // Temporary delay to make sure the auth ui was displayed to the user before closing
+            // inspired by https://github.com/microsoft/vscode/blob/a49c81edea6647684eee87d204e50feed9c455f6/extensions/github-authentication/src/flows.ts#L262
+            setTimeout(() => {
+                authServer.close().catch((e) => {
+                    getLogger().error(
+                        'AuthFlowAuthorization: AuthSSOServer.close() failed: %s: %s',
+                        (e as Error).name,
+                        (e as Error).message
+                    )
+                })
+            }, 5000)
+        }
+    }
+
+    /**
+     * If the registration already exists locally, it
+     * will be validated before being returned. Otherwise, a client registration is
+     * created and returned.
+     */
+    override async getValidatedClientRegistration(): Promise<ClientRegistration> {
+        return telemetry.function_call.run(
+            async () => {
+                const cacheKey = this.registrationCacheKey
+                const cachedRegistration = await this.cache.registration.load(cacheKey)
+
+                // Clear cached if registration is expired or it uses a deprecate auth version (device code)
+                if (cachedRegistration && (isExpired(cachedRegistration) || isDeprecatedAuth(cachedRegistration))) {
+                    await this.invalidate('registrationExpired:AuthFlow')
+                }
+
+                return loadOr(this.cache.registration, cacheKey, () => this.registerClient())
+            },
+            { emit: false, functionId: { name: 'getValidatedClientRegistration', class: 'AuthFlowAuthorization' } }
+        )
+    }
+}
+
+/**
+ * Alternative to {@link AuthFlowAuthorization} for demo/testing purposes.
+ *
+ * Allows user to enter the code manually after completing the authorization flow.
+ */
+class WebAuthorization extends SsoAccessTokenProvider {
+    private redirectUri = 'http://127.0.0.1:54321/oauth/callback'
+
+    override async registerClient(): Promise<ClientRegistration> {
+        return this.oidc.registerClient(
+            {
+                // All AWS extensions (Q, Toolkit) for a given IDE use the same client name.
+                clientName: oidcClientName(),
+                clientType: clientRegistrationType,
+                scopes: this.profile.scopes,
+                grantTypes: [authorizationGrantType, refreshGrantType],
+                redirectUris: [this.redirectUri],
+                issuerUrl: this.profile.startUrl,
+            },
+            this.profile.startUrl,
+            'web auth code'
+        )
+    }
+
+    override async authorize(
+        registration: ClientRegistration,
+        args?: CreateTokenArgs
+    ): Promise<{ token: SsoToken; registration: ClientRegistration; region: string; startUrl: string }> {
+        const state = randomUUID()
+
+        const token = await this.withBrowserLoginTelemetry(async () => {
+            const codeVerifier = toBase64URL(randomBytes(32).toString('base64'))
+            const codeChallenge = toBase64URL(createHash('sha256').update(codeVerifier).digest().toString('base64'))
+
+            const location = await this.oidc.authorize({
+                responseType: 'code',
+                clientId: registration.clientId,
+                // we aren't running on localhost so we can't see the what ports are free
+                redirectUri: this.redirectUri,
+                scopes: this.profile.scopes ?? [],
+                state,
+                codeChallenge,
+                codeChallengeMethod: 'S256',
+            })
+
+            await vscode.env.openExternal(vscode.Uri.parse(location))
+
+            const inputBox = await showInputBox({
+                title: 'Authorization Input',
+                placeholder: 'Input the authorization code',
+                validateInput: (val: string) => {
+                    if (val.length === 0) {
+                        return 'At least one character is required'
+                    }
+                    return undefined
+                },
+            })
+
+            return this.oidc.createToken({
+                clientId: registration.clientId,
+                clientSecret: registration.clientSecret,
+                grantType: authorizationGrantType,
+                redirectUri: this.redirectUri,
+                codeVerifier,
+                code: inputBox,
+            })
+        }, args)
+
+        return this.formatToken(token, registration)
+    }
+
+    override async getValidatedClientRegistration(): Promise<ClientRegistration> {
+        return telemetry.function_call.run(
+            async () => {
+                const cacheKey = this.registrationCacheKey
+                const cachedRegistration = await this.cache.registration.load(cacheKey)
+
+                if (
+                    cachedRegistration &&
+                    (isExpired(cachedRegistration) || cachedRegistration.flow !== 'web auth code')
+                ) {
+                    await this.invalidate('registrationExpired:WebAuth')
+                }
+
+                return loadOr(this.cache.registration, cacheKey, () => this.registerClient())
+            },
+            { emit: false, functionId: { name: 'getValidatedClientRegistration', class: 'WebAuthorization' } }
+        )
+    }
+}
+
+/**
+ * Remembers the reason an SSO session was put in to a "needs reauthentication" state.
+ * The current use is for telemetry. When the user reauths, we want {@link AwsLoginWithBrowser}
+ * to know why it needed to be reauthed.
+ *
+ * The flow is to use `set()` to remember why the user was put in to a reauth state,
+ * then upon the next reauth use `get()`. Finally, use `clear()` if the reauth is
+ * successful.
+ */
+export class ReAuthState extends NestedMap<ReAuthStateKey, ReAuthStateValue> {
+    static #instance: ReAuthState
+    static get instance() {
+        return (this.#instance ??= new ReAuthState())
+    }
+    protected constructor() {
+        super()
+    }
+
+    protected override hash(profile: ReAuthStateKey): string {
+        return profile.identifier ?? profile.startUrl
+    }
+
+    protected override get name(): string {
+        return ReAuthState.name
+    }
+
+    override get default(): ReAuthStateValue {
+        return { reAuthReason: undefined }
+    }
+}
+
+type ReAuthStateKey = Pick<SsoProfile, 'identifier' | 'startUrl'>
+type ReAuthStateValue = {
+    // the latest reason for why the connection was moved in to a "needs reauth" state
+    reAuthReason?: string
+}
+
+/**
+ * Singleton class that manages showing the user a message during {@link DiskCacheError} errors.
+ *
+ * Background:
+ * - We need this {@link DiskCacheErrorMessage} specifically as a singleton since we want to ensure
+ *   that only 1 instance of this message appears at a time. The current implementation creates a new
+ *   {@link SsoAccessTokenProvider} instance each time a token is requested, and this can happen multiple
+ *   times in rapid succession.
+ */
+class DiskCacheErrorMessage {
+    static #instance: DiskCacheErrorMessage
+    static get instance() {
+        return (this.#instance ??= new DiskCacheErrorMessage())
+    }
+
+    /**
+     * Show a `"don't show again"`-able message which tells the user about a file system related error
+     * with the sso cache.
+     *
+     * This message is throttled so we do not spam the user every time something requests a token.
+     */
+    public showMessageThrottled(error: Error) {
+        return this._showMessageThrottled(error)
+    }
+    private _showMessageThrottled = _.throttle(async (error: Error) => this._showMessage(error), 60_000, {
+        leading: true,
+    })
+    private async _showMessage(error: Error) {
+        const dontShow = 'Never warn again'
+
+        const promptSettings: PromptSettings = isAmazonQ()
+            ? AmazonQPromptSettings.instance
+            : ToolkitPromptSettings.instance
+
+        // We know 'ssoCacheError' is in all extension prompt settings
+        if (promptSettings.isPromptEnabled('ssoCacheError')) {
+            const result = await showMessage()
+            if (result === dontShow) {
+                await promptSettings.disablePrompt('ssoCacheError')
+            }
+        }
+
+        function showMessage() {
+            return showViewLogsMessage(
+                `Features using SSO will not work due to:\n"${getErrorMsg(error, true)}"`,
+                'error',
+                [dontShow]
+            )
+        }
+    }
+}
diff --git a/packages/core/src/auth/sso/validation.ts b/packages/core/src/auth/sso/validation.ts
new file mode 100644
index 00000000000..cad6aa7f4c3
--- /dev/null
+++ b/packages/core/src/auth/sso/validation.ts
@@ -0,0 +1,48 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { UnknownError } from '../../shared/errors'
+import { Auth } from '../auth'
+import { SsoConnection, hasScopes, isAnySsoConnection } from '../connection'
+import { ssoUrlFormatMessage, ssoUrlFormatRegex } from './constants'
+
+/**
+ * Returns an error message if the url is not properly formatted.
+ * Otherwise, returns undefined.
+ */
+export function validateSsoUrlFormat(url: string) {
+    if (!ssoUrlFormatRegex.test(url)) {
+        return ssoUrlFormatMessage
+    }
+}
+
+export async function validateIsNewSsoUrlAsync(
+    auth: Auth,
+    url: string,
+    requiredScopes?: string[]
+): Promise<string | undefined> {
+    return auth.listConnections().then((conns) => {
+        return validateIsNewSsoUrl(url, requiredScopes, conns.filter(isAnySsoConnection))
+    })
+}
+
+export function validateIsNewSsoUrl(
+    url: string,
+    requiredScopes?: string[],
+    existingSsoConns: SsoConnection[] = []
+): string | undefined {
+    try {
+        const uri = vscode.Uri.parse(url, true)
+        const isSameAuthority = (a: vscode.Uri, b: vscode.Uri) =>
+            a.authority.toLowerCase() === b.authority.toLowerCase()
+        const oldConn = existingSsoConns.find((conn) => isSameAuthority(vscode.Uri.parse(conn.startUrl), uri))
+
+        if (oldConn && (!requiredScopes || hasScopes(oldConn, requiredScopes))) {
+            return 'A connection for this start URL already exists. Sign out before creating a new one.'
+        }
+    } catch (err) {
+        return `URL is malformed: ${UnknownError.cast(err).message}`
+    }
+}
diff --git a/packages/core/src/auth/sso/vue/index.html b/packages/core/src/auth/sso/vue/index.html
new file mode 100644
index 00000000000..c2e587c5735
--- /dev/null
+++ b/packages/core/src/auth/sso/vue/index.html
@@ -0,0 +1,87 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8" />
+        <title>AWS Authentication</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <link rel="stylesheet" type="text/css" media="screen" href="../../../../resources/css/auth.css" />
+    </head>
+
+    <body>
+        <div class="center-wrapper">
+            <div style="font-size: 3rem" class="center-icon aws-icon">
+                <svg
+                    id="Layer_1"
+                    data-name="Layer 1"
+                    xmlns="http://www.w3.org/2000/svg"
+                    width="6rem"
+                    :height="`${6 * 0.61}rem`"
+                    viewBox="0 0 50 30"
+                >
+                    <path
+                        id="logo-text"
+                        d="M14.09,10.85a4.7,4.7,0,0,0,.19,1.48,7.73,7.73,0,0,0,.54,1.19.77.77,0,0,1,.12.38.64.64,0,0,1-.32.49l-1,.7a.83.83,0,0,1-.44.15.69.69,0,0,1-.49-.23,3.8,3.8,0,0,1-.6-.77q-.25-.42-.51-1a6.14,6.14,0,0,1-4.89,2.3,4.54,4.54,0,0,1-3.32-1.19,4.27,4.27,0,0,1-1.22-3.2A4.28,4.28,0,0,1,3.61,7.75,6.06,6.06,0,0,1,7.69,6.46a12.47,12.47,0,0,1,1.76.13q.92.13,1.91.36V5.73a3.65,3.65,0,0,0-.79-2.66A3.81,3.81,0,0,0,7.86,2.3a7.71,7.71,0,0,0-1.79.22,12.78,12.78,0,0,0-1.79.57,4.55,4.55,0,0,1-.58.22l-.26,0q-.35,0-.35-.52V2a1.09,1.09,0,0,1,.12-.58,1.2,1.2,0,0,1,.47-.35A10.88,10.88,0,0,1,5.77.32,10.19,10.19,0,0,1,8.36,0a6,6,0,0,1,4.35,1.35,5.49,5.49,0,0,1,1.38,4.09ZM7.34,13.38a5.36,5.36,0,0,0,1.72-.31A3.63,3.63,0,0,0,10.63,12,2.62,2.62,0,0,0,11.19,11a5.63,5.63,0,0,0,.16-1.44v-.7a14.35,14.35,0,0,0-1.53-.28,12.37,12.37,0,0,0-1.56-.1,3.84,3.84,0,0,0-2.47.67A2.34,2.34,0,0,0,5,11a2.35,2.35,0,0,0,.61,1.76A2.4,2.4,0,0,0,7.34,13.38Zm13.35,1.8a1,1,0,0,1-.64-.16,1.3,1.3,0,0,1-.35-.65L15.81,1.51a3,3,0,0,1-.15-.67.36.36,0,0,1,.41-.41H17.7a1,1,0,0,1,.65.16,1.4,1.4,0,0,1,.33.65l2.79,11,2.59-11A1.17,1.17,0,0,1,24.39.6a1.1,1.1,0,0,1,.67-.16H26.4a1.1,1.1,0,0,1,.67.16,1.17,1.17,0,0,1,.32.65L30,12.39,32.88,1.25A1.39,1.39,0,0,1,33.22.6a1,1,0,0,1,.65-.16h1.54a.36.36,0,0,1,.41.41,1.36,1.36,0,0,1,0,.26,3.64,3.64,0,0,1-.12.41l-4,12.86a1.3,1.3,0,0,1-.35.65,1,1,0,0,1-.64.16H29.25a1,1,0,0,1-.67-.17,1.26,1.26,0,0,1-.32-.67L25.67,3.64,23.11,14.34a1.26,1.26,0,0,1-.32.67,1,1,0,0,1-.67.17Zm21.36.44a11.28,11.28,0,0,1-2.56-.29,7.44,7.44,0,0,1-1.92-.67,1,1,0,0,1-.61-.93v-.84q0-.52.38-.52a.9.9,0,0,1,.31.06l.42.17a8.77,8.77,0,0,0,1.83.58,9.78,9.78,0,0,0,2,.2,4.48,4.48,0,0,0,2.43-.55,1.76,1.76,0,0,0,.86-1.57,1.61,1.61,0,0,0-.45-1.16A4.29,4.29,0,0,0,43,9.22l-2.41-.76A5.15,5.15,0,0,1,38,6.78a3.94,3.94,0,0,1-.83-2.41,3.7,3.7,0,0,1,.45-1.85,4.47,4.47,0,0,1,1.19-1.37A5.27,5.27,0,0,1,40.51.29,7.4,7.4,0,0,1,42.6,0a8.87,8.87,0,0,1,1.12.07q.57.07,1.08.19t.95.26a4.27,4.27,0,0,1,.7.29,1.59,1.59,0,0,1,.49.41.94.94,0,0,1,.15.55v.79q0,.52-.38.52a1.76,1.76,0,0,1-.64-.2,7.74,7.74,0,0,0-3.2-.64,4.37,4.37,0,0,0-2.21.47,1.6,1.6,0,0,0-.79,1.48,1.58,1.58,0,0,0,.49,1.18,4.94,4.94,0,0,0,1.83.92L44.55,7a5.08,5.08,0,0,1,2.57,1.6A3.76,3.76,0,0,1,47.9,11a4.21,4.21,0,0,1-.44,1.93,4.4,4.4,0,0,1-1.21,1.47,5.43,5.43,0,0,1-1.85.93A8.25,8.25,0,0,1,42.05,15.62Z"
+                    />
+                    <path
+                        fill="#FF9900"
+                        class="cls-1"
+                        d="M45.19,23.81C39.72,27.85,31.78,30,25,30A36.64,36.64,0,0,1,.22,20.57c-.51-.46-.06-1.09.56-.74A49.78,49.78,0,0,0,25.53,26.4,49.23,49.23,0,0,0,44.4,22.53C45.32,22.14,46.1,23.14,45.19,23.81Z"
+                    />
+                    <path
+                        fill="#FF9900"
+                        class="cls-1"
+                        d="M47.47,21.21c-.7-.9-4.63-.42-6.39-.21-.53.06-.62-.4-.14-.74,3.13-2.2,8.27-1.57,8.86-.83s-.16,5.89-3.09,8.35c-.45.38-.88.18-.68-.32C46.69,25.8,48.17,22.11,47.47,21.21Z"
+                    />
+                </svg>
+            </div>
+            <div class="flex-container">
+                <!-- Section for request approval -->
+                <div id="approved-auth">
+                    <div class="request approval">
+                        <span class="pass-icon icon-2x icon icon-vscode-pass success-icon"></span>
+                        <div class="request-container">
+                            <h4>Request approved</h4>
+                            <p id="approvalMessage" class="hint"></p>
+                        </div>
+                    </div>
+                    <p id="footerText" class="hint"></p>
+                </div>
+
+                <!-- Section for request denial -->
+                <div id="denied-auth" class="hidden">
+                    <div class="request denial">
+                        <span class="icon-2x icon icon-vscode-error denial-icon"></span>
+                        <div class="request-container">
+                            <h4>Request denied</h4>
+                            <p id="errorMessage" class="hint"></p>
+                        </div>
+                    </div>
+                    <p class="hint">You can close this window and re-start the authorization flow</p>
+                </div>
+            </div>
+        </div>
+        <script>
+            window.onload = () => {
+                const params = new URLSearchParams(window.location.search)
+
+                const error = params.get('error')
+                if (error) {
+                    showErrorMessage(error)
+                    return
+                }
+
+                const productName = 'AWS IDE Extensions for VS Code'
+                document.getElementById('approvalMessage').innerText =
+                    `${productName} have been given requested permissions`
+                document.getElementById('footerText').innerText =
+                    `You can close this window and start using ${productName}`
+
+                function showErrorMessage(errorText) {
+                    document.getElementById('approved-auth').classList.add('hidden')
+                    document.getElementById('denied-auth').classList.remove('hidden')
+                    document.getElementById('errorMessage').innerText = errorText
+                }
+            }
+        </script>
+    </body>
+</html>
diff --git a/packages/core/src/auth/ui/statusBarItem.ts b/packages/core/src/auth/ui/statusBarItem.ts
new file mode 100644
index 00000000000..e253a6f427e
--- /dev/null
+++ b/packages/core/src/auth/ui/statusBarItem.ts
@@ -0,0 +1,102 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as vscode from 'vscode'
+import { AwsContext } from '../../shared/awsContext'
+import { getIdeProperties } from '../../shared/extensionUtilities'
+import { DevSettings } from '../../shared/settings'
+import { Auth } from '../auth'
+import { getAllConnectionsInUse, onDidChangeConnections } from '../secondaryAuth'
+import { codicon, getIcon } from '../../shared/icons'
+import { debounce } from '../../shared/utilities/functionUtils'
+import { Commands } from '../../shared/vscode/commands2'
+
+const statusbarPriority = 1
+
+export async function initializeAwsCredentialsStatusBarItem(
+    awsContext: AwsContext,
+    context: vscode.ExtensionContext
+): Promise<void> {
+    const devSettings = DevSettings.instance
+    const statusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, statusbarPriority)
+    statusBarItem.command = (await Commands.getOrThrow('aws.toolkit.login')).build().asCommand({ title: 'Login' })
+    statusBarItem.show()
+
+    const update = debounce(() => updateItem(statusBarItem, devSettings))
+
+    await update()
+    context.subscriptions.push(
+        statusBarItem,
+        onDidChangeConnections(() => update()),
+        Auth.instance.onDidChangeActiveConnection(() => update()),
+        Auth.instance.onDidChangeConnectionState(() => update()),
+        devSettings.onDidChangeActiveSettings(() => update())
+    )
+}
+
+function handleDevSettings(statusBarItem: vscode.StatusBarItem, devSettings: DevSettings) {
+    if (devSettings.isDevMode()) {
+        ;(statusBarItem as any).backgroundColor ??= new vscode.ThemeColor('statusBarItem.warningBackground')
+
+        const devSettingsStr = Object.keys(devSettings.activeSettings).join('  \n')
+        statusBarItem.tooltip = `Toolkit developer settings:\n${devSettingsStr}`
+    }
+}
+
+function updateItem(statusBarItem: vscode.StatusBarItem, devSettings: DevSettings): void {
+    const company = getIdeProperties().company
+    const connections = getAllConnectionsInUse(Auth.instance)
+    const disconnectedTooltip = localize(
+        'AWS.credentials.statusbar.disconnected',
+        'Click to connect to {0}',
+        getIdeProperties().company
+    )
+
+    const icon = connections.some((c) => c.state !== 'valid') ? getIcon('vscode-error') : getIcon('vscode-check')
+    const getText = (text: string) => codicon`${icon} ${company}: ${text}`
+    if (connections.length === 0) {
+        statusBarItem.text = company
+        statusBarItem.tooltip = disconnectedTooltip
+    } else if (connections.length === 1) {
+        // Get the endpoint URL if available
+        const endpointUrl = connections[0].endpointUrl
+        const connectedTooltip = endpointUrl
+            ? localize(
+                  'AWS.credentials.statusbar.connected.endpoint',
+                  'Connected to {0} with "{1}" ({2}) (click to change)',
+                  getIdeProperties().company,
+                  connections[0]?.label,
+                  endpointUrl
+              )
+            : localize(
+                  'AWS.credentials.statusbar.connected',
+                  'Connected to {0} with "{1}" (click to change)',
+                  getIdeProperties().company,
+                  connections[0]?.label
+              )
+
+        const displayText = endpointUrl ? `${connections[0].label} (custom endpoint)` : connections[0].label
+        statusBarItem.text = getText(displayText)
+        statusBarItem.tooltip = connectedTooltip
+    } else {
+        const expired = connections.filter((c) => c.state !== 'valid')
+        if (expired.length !== 0) {
+            statusBarItem.text = getText(`${expired.length} of ${connections.length} Connections Expired`)
+        } else {
+            statusBarItem.text = getText(`${connections.length} Connections`)
+        }
+    }
+
+    const color = connections.some((c) => c.state !== 'valid')
+        ? new vscode.ThemeColor('statusBarItem.errorBackground')
+        : undefined
+    ;(statusBarItem as any).backgroundColor = color
+
+    // Do this last to override the normal behavior
+    handleDevSettings(statusBarItem, devSettings)
+}
diff --git a/packages/core/src/auth/utils.ts b/packages/core/src/auth/utils.ts
new file mode 100644
index 00000000000..28e2bc1123e
--- /dev/null
+++ b/packages/core/src/auth/utils.ts
@@ -0,0 +1,901 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../shared/extensionGlobals'
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as vscode from 'vscode'
+import * as localizedText from '../shared/localizedText'
+import { codicon, getIcon } from '../shared/icons'
+import { createQuickPick, DataQuickPickItem, showQuickPick } from '../shared/ui/pickerPrompter'
+import { isValidResponse } from '../shared/wizards/wizard'
+import { CancellationError } from '../shared/utilities/timeoutUtils'
+import { formatError, ToolkitError } from '../shared/errors'
+import { asString } from './providers/credentials'
+import { TreeNode } from '../shared/treeview/resourceTreeDataProvider'
+import { createInputBox } from '../shared/ui/inputPrompter'
+import { CredentialSourceId, telemetry } from '../shared/telemetry/telemetry'
+import { createCommonButtons, createExitButton, createHelpButton, createRefreshButton } from '../shared/ui/buttons'
+import { getIdeProperties, isAmazonQ } from '../shared/extensionUtilities'
+import { addScopes, getDependentAuths } from './secondaryAuth'
+import { DevSettings } from '../shared/settings'
+import { createRegionPrompter } from '../shared/ui/common/region'
+import { saveProfileToCredentials } from './credentials/sharedCredentials'
+import { SectionName, StaticProfile } from './credentials/types'
+import { throwOnInvalidCredentials } from './credentials/validation'
+import {
+    Connection,
+    SsoConnection,
+    createBuilderIdProfile,
+    defaultSsoRegion,
+    isAnySsoConnection,
+    isIdcSsoConnection,
+    isBuilderIdConnection,
+    isIamConnection,
+    isValidCodeCatalystConnection,
+    hasScopes,
+    scopesSsoAccountAccess,
+    isSsoConnection,
+    IamConnection,
+} from './connection'
+import { Commands, placeholder } from '../shared/vscode/commands2'
+import { Auth } from './auth'
+import { validateIsNewSsoUrl, validateSsoUrlFormat } from './sso/validation'
+import { getLogger } from '../shared/logger/logger'
+import { AuthUtil, isValidAmazonQConnection, isValidCodeWhispererCoreConnection } from '../codewhisperer/util/authUtil'
+import { AuthFormId } from '../login/webview/vue/types'
+import { extensionVersion } from '../shared/vscode/env'
+import { CommonAuthWebview } from '../login/webview/vue/backend'
+import { AuthSource } from '../login/webview/util'
+import { setContext } from '../shared/vscode/setContext'
+import { CredentialsProviderManager } from './providers/credentialsProviderManager'
+import { SharedCredentialsProviderFactory } from './providers/sharedCredentialsProviderFactory'
+import { Ec2CredentialsProvider } from './providers/ec2CredentialsProvider'
+import { EcsCredentialsProvider } from './providers/ecsCredentialsProvider'
+import { EnvVarsCredentialsProvider } from './providers/envVarsCredentialsProvider'
+import { showMessageWithUrl } from '../shared/utilities/messages'
+import { credentialHelpUrl } from '../shared/constants'
+import { ExtStartUpSources, ExtStartUpSource, hadClientIdOnStartup } from '../shared/telemetry/util'
+
+// iam-only excludes Builder ID and IAM Identity Center from the list of valid connections
+// TODO: Understand if "iam" should include these from the list at all
+export async function promptForConnection(auth: Auth, type?: 'iam' | 'iam-only' | 'sso'): Promise<Connection | void> {
+    const resp = await createConnectionPrompter(auth, type).prompt()
+    if (!isValidResponse(resp)) {
+        throw new CancellationError('user')
+    }
+
+    if (resp === 'addNewConnection') {
+        // We could call this command directly, but it either lives in packages/toolkit or will at some point.
+        const source: AuthSource = 'addConnectionQuickPick' // enforcing type sanity check
+        await vscode.commands.executeCommand('aws.toolkit.auth.manageConnections', placeholder, source, undefined, true)
+        return undefined
+    }
+
+    if (resp === 'editCredentials') {
+        return globals.awsContextCommands.onCommandEditCredentials()
+    }
+
+    // If selected connection is SSO connection and has linked IAM profiles, show second quick pick with the linked IAM profiles
+    if (isSsoConnection(resp)) {
+        const linkedProfiles = await getLinkedIamProfiles(auth, resp)
+
+        if (linkedProfiles.length > 0) {
+            const linkedResp = await showLinkedProfilePicker(linkedProfiles, resp)
+            if (linkedResp) {
+                return linkedResp
+            }
+        }
+    }
+
+    return resp
+}
+
+/**
+ * Creates the 'Switch Connection' quickpick for the Toolkit.
+ * See {@link addScopes} for details about how scopes are requested for new and existing connections.
+ */
+export async function promptAndUseConnection(...[auth, type]: Parameters<typeof promptForConnection>) {
+    return telemetry.aws_setCredentials.run(async (span) => {
+        let conn = await promptForConnection(auth, type)
+        // Returning because either conn is a valid connection, or the customer selected 'addNewConnection' or 'editCredentials'
+        if (!conn) {
+            return
+        }
+
+        // HACK: We assume that if we are toolkit we want AWS account scopes.
+        // TODO: Although, Q shouldn't enter this codepath anyways.
+        // We should deprecate any codepath in Q that may enter this.
+        if (!isAmazonQ() && isSsoConnection(conn) && !hasScopes(conn, scopesSsoAccountAccess)) {
+            try {
+                conn = await addScopes(conn, scopesSsoAccountAccess)
+            } catch (e: any) {
+                throw new ToolkitError(`Failed to use connection${conn.label ? `: ${conn.label}` : '.'}`, e)
+            }
+        }
+
+        await auth.useConnection(conn)
+    })
+}
+
+/**
+ * Get a IAM connection, while prompt && connection not valid: prompt for choosing a new connection
+ * @param opts.prompt: controls if prompt is shown when no valid connection is found
+ * @returns active iam connection, or undefined if not found/no prompt
+ */
+export async function getIAMConnection(
+    opts: { prompt: boolean; messageText?: string } = {
+        prompt: false,
+    }
+) {
+    const connection = Auth.instance.activeConnection
+    if (connection?.type === 'iam' && connection.state === 'valid') {
+        return connection
+    }
+    if (!opts.prompt) {
+        return
+    }
+    const authRequiredMessage = 'The current command requires authentication with IAM credentials.'
+    let errorMessage = localize(
+        'aws.toolkit.auth.requireAuthmessage',
+        opts.messageText ? opts.messageText : authRequiredMessage
+    )
+    if (connection?.state === 'valid') {
+        errorMessage =
+            localize('aws.toolkit.auth.requireIAMInvalidAuth', 'Authentication through Builder ID detected.') +
+            errorMessage
+    }
+    const acceptMessage = localize('aws.toolkit.auth.accept', 'Select Connection')
+    const modalResponse = await showMessageWithUrl(
+        errorMessage,
+        credentialHelpUrl,
+        localizedText.learnMore,
+        'info',
+        [acceptMessage],
+        true
+    )
+    if (modalResponse !== acceptMessage) {
+        return
+    }
+    await promptAndUseConnection(Auth.instance, 'iam')
+    return Auth.instance.activeConnection
+}
+
+export async function signout(auth: Auth, conn: Connection | undefined = auth.activeConnection): Promise<void> {
+    return telemetry.function_call.run(
+        async () => {
+            if (conn?.type === 'sso') {
+                // TODO: does deleting the connection make sense UX-wise?
+                // this makes it disappear from the list of available connections
+                await auth.deleteConnection(conn)
+
+                const iamConnections = (await auth.listConnections()).filter((c) => c.type === 'iam')
+                const fallbackConn = iamConnections.find((c) => c.id === 'profile:default') ?? iamConnections[0]
+                if (fallbackConn !== undefined) {
+                    await auth.useConnection(fallbackConn)
+                }
+            } else {
+                await auth.logout()
+
+                const fallbackConn = (await auth.listConnections()).find((c) => c.type === 'sso')
+                if (fallbackConn !== undefined) {
+                    await auth.useConnection(fallbackConn)
+                }
+            }
+        },
+        { emit: false, functionId: { name: 'signoutAuthUtils' } }
+    )
+}
+
+export const createBuilderIdItem = () =>
+    ({
+        label: codicon`${getIcon('vscode-person')} ${localize(
+            'aws.auth.builderIdItem.label',
+            'Use a personal email to sign up and sign in with {0}',
+            localizedText.builderId()
+        )}`,
+        data: 'builderId',
+        onClick: () => telemetry.ui_click.emit({ elementId: 'connection_optionBuilderID' }),
+        detail: `${localizedText.builderId()} is a new, personal profile for builders.`, // TODO: need a "Learn more" button ?
+    }) as DataQuickPickItem<'builderId'>
+
+export const createSsoItem = () =>
+    ({
+        label: codicon`${getIcon('vscode-organization')} ${localize(
+            'aws.auth.ssoItem.label',
+            'Connect using {0} {1}',
+            getIdeProperties().company,
+            localizedText.iamIdentityCenter
+        )}`,
+        data: 'sso',
+        onClick: () => telemetry.ui_click.emit({ elementId: 'connection_optionSSO' }),
+        detail: `Sign in to your company's ${localizedText.iamIdentityCenter} access portal login page.`,
+    }) as DataQuickPickItem<'sso'>
+
+export const createIamItem = () =>
+    ({
+        label: codicon`${getIcon('vscode-key')} ${localize('aws.auth.iamItem.label', 'Use IAM Credentials')}`,
+        data: 'iam',
+        onClick: () => telemetry.ui_click.emit({ elementId: 'connection_optionIAM' }),
+        detail: 'Activates working with resources in the Explorer. Not supported by CodeWhisperer. Requires an access key ID and secret access key.',
+    }) as DataQuickPickItem<'iam'>
+
+export async function createStartUrlPrompter(title: string, requiredScopes?: string[]) {
+    const existingConnections = (await Auth.instance.listConnections()).filter(isAnySsoConnection)
+
+    function validateSsoUrl(url: string) {
+        const urlFormatError = validateSsoUrlFormat(url)
+        if (urlFormatError) {
+            return urlFormatError
+        }
+
+        return validateIsNewSsoUrl(url, requiredScopes, existingConnections)
+    }
+
+    return createInputBox({
+        title: `${title}: Enter Start URL`,
+        placeholder: `Enter start URL for your organization's IAM Identity Center`,
+        buttons: [createHelpButton(), createExitButton()],
+        validateInput: validateSsoUrl,
+    })
+}
+
+export async function createBuilderIdConnection(auth: Auth, scopes?: string[]) {
+    return telemetry.function_call.run(
+        async () => {
+            const newProfile = createBuilderIdProfile(scopes)
+            const existingConn = (await auth.listConnections()).find(isBuilderIdConnection)
+            if (!existingConn) {
+                return auth.createConnection(newProfile)
+            }
+
+            const userResponse = await promptLogoutExistingBuilderIdConnection()
+            if (userResponse !== 'signout') {
+                throw new CancellationError('user')
+            }
+
+            await signout(auth, existingConn)
+
+            return auth.createConnection(newProfile)
+        },
+        { emit: false, functionId: { name: 'createBuilderIdConnectionAuthUtils' } }
+    )
+}
+
+/**
+ * Prompts the user to log out of an existing Builder ID connection.
+ *
+ * @returns The name of the action performed by the user
+ */
+async function promptLogoutExistingBuilderIdConnection(): Promise<'signout' | 'cancel'> {
+    const items: DataQuickPickItem<'signout' | 'cancel'>[] = [
+        {
+            data: 'signout',
+            label: `Currently signed in with ${getIdeProperties().company} Builder ID. Sign out to add another?`,
+            detail: `This will sign out of your current ${
+                getIdeProperties().company
+            } Builder ID and open the sign-in page in browser.`,
+        },
+        { data: 'cancel', label: 'Cancel' },
+    ]
+    const resp = await showQuickPick(items, {
+        title: `Sign in to different ${getIdeProperties().company} Builder ID`,
+        buttons: createCommonButtons() as vscode.QuickInputButton[],
+    })
+
+    return resp === undefined ? 'cancel' : resp
+}
+
+export async function showRegionPrompter(
+    title: string = `IAM Identity Center: Select Region`,
+    placeholder: string = `Select region for your organization's IAM Identity Center`
+) {
+    const region = await createRegionPrompter(undefined, {
+        defaultRegion: defaultSsoRegion,
+        buttons: createCommonButtons(),
+        title: title,
+        placeholder: placeholder,
+    }).prompt()
+
+    if (!isValidResponse(region)) {
+        throw new CancellationError('user')
+    }
+    telemetry.ui_click.emit({ elementId: 'connection_region' })
+
+    return region
+}
+
+export async function tryAddCredentials(
+    profileName: SectionName,
+    profileData: StaticProfile,
+    tryConnect = true
+): Promise<boolean> {
+    const auth = Auth.instance
+
+    // sanity checks
+    await throwOnInvalidCredentials(profileName, profileData)
+    const authenticationError = await auth.authenticateData(profileData)
+    if (authenticationError) {
+        throw new ToolkitError(`Found error with '${authenticationError.key}':'${authenticationError.error}' `, {
+            code: 'InvalidCredentials',
+        })
+    }
+
+    await saveProfileToCredentials(profileName, profileData)
+
+    if (tryConnect) {
+        const id = asString({
+            credentialSource: 'profile',
+            credentialTypeId: profileName,
+        })
+        const conn = await auth.getConnection({ id })
+
+        if (conn === undefined) {
+            throw new ToolkitError(`Failed to get connection from profile: ${profileName}`, {
+                code: 'MissingConnection',
+            })
+        }
+
+        await auth.useConnection(conn)
+    }
+    return true
+}
+
+const getConnectionIcon = (conn: Connection) =>
+    conn.type === 'sso' ? getIcon('vscode-account') : getIcon('vscode-key')
+
+const deleteConnection = 'Delete Connection'
+export const createDeleteConnectionButton: () => vscode.QuickInputButton = () => {
+    return { tooltip: deleteConnection, iconPath: getIcon('vscode-trash') }
+}
+
+async function getLinkedIamProfiles(auth: Auth, ssoConnection: SsoConnection): Promise<IamConnection[]> {
+    const allConnections = await auth.listAndTraverseConnections().promise()
+
+    return allConnections.filter(
+        (conn) => isIamConnection(conn) && conn.id.startsWith(`sso:${ssoConnection.id}#`)
+    ) as IamConnection[]
+}
+
+/**
+ * Shows a quick pick with linked IAM profiles for a selected SSO connection
+ */
+async function showLinkedProfilePicker(
+    linkedProfiles: IamConnection[],
+    ssoConnection: SsoConnection
+): Promise<IamConnection | undefined> {
+    const title = `Select an IAM Role for ${ssoConnection.label}`
+
+    const items: DataQuickPickItem<IamConnection>[] = linkedProfiles.map((profile) => ({
+        label: codicon`${getIcon('vscode-key')} ${profile.label}`,
+        description: 'IAM Credential, sourced from IAM Identity Center',
+        data: profile,
+    }))
+
+    return await showQuickPick(items, {
+        title,
+        placeholder: 'Select an IAM role',
+        buttons: [createRefreshButton(), createExitButton()],
+    })
+}
+
+export function createConnectionPrompter(auth: Auth, type?: 'iam' | 'iam-only' | 'sso') {
+    const addNewConnection = {
+        label: codicon`${getIcon('vscode-plus')} Add New Connection`,
+        data: 'addNewConnection' as const,
+    }
+    const editCredentials = {
+        label: codicon`${getIcon('vscode-pencil')} Edit Credentials`,
+        data: 'editCredentials' as const,
+    }
+    const placeholder =
+        type === 'iam' || type === 'iam-only'
+            ? localize('aws.auth.promptConnection.iam.placeholder', 'Select an IAM credential')
+            : localize('aws.auth.promptConnection.all.placeholder', 'Select a connection')
+
+    const refreshPrompter = () => {
+        // This function should not return a promise, or else tests fail.
+
+        prompter.clearAndLoadItems(loadItems()).catch((e) => {
+            getLogger().error(`Auth: Failed loading connections in quickpick: %s`, e)
+            throw e
+        })
+    }
+    const refreshButton = createRefreshButton()
+    refreshButton.onClick = refreshPrompter
+
+    // Place add/edit connection items at the bottom, then sort 'sso' connections
+    // first, then valid connections, then finally the item label
+    function getSortOrder(item: DataQuickPickItem<Connection | string>) {
+        if (item.data === addNewConnection.data) {
+            return 10
+        } else if (item.data === editCredentials.data) {
+            return 9
+        }
+
+        const conn = item.data as Connection
+        if (conn.type === 'sso') {
+            return 0
+        } else if (auth.getConnectionState(conn) === 'valid') {
+            return 1
+        }
+
+        return 2
+    }
+
+    const excludeSso = type === 'iam-only'
+    const prompter = createQuickPick(loadItems(excludeSso), {
+        placeholder,
+        title: localize('aws.auth.promptConnection.title', 'Switch Connection'),
+        buttons: [refreshButton, createExitButton()],
+        compare: (a, b) => {
+            if (getSortOrder(a) === 0 && getSortOrder(b) === 0) {
+                return a.label.localeCompare(b.label)
+            }
+
+            return getSortOrder(a) - getSortOrder(b)
+        },
+    })
+
+    prompter.quickPick.onDidTriggerItemButton(async (e) => {
+        // User wants to delete a specific connection
+        if (e.button.tooltip === deleteConnection) {
+            await telemetry.function_call.run(
+                async () => {
+                    telemetry.ui_click.emit({ elementId: 'connection_deleteFromList' })
+                    const conn = e.item.data as Connection
+
+                    // Set prompter in to a busy state so that
+                    // tests must wait for refresh to fully complete
+                    prompter.busy = true
+                    await auth.deleteConnection(conn)
+                    refreshPrompter()
+                },
+                { emit: false, functionId: { name: 'quickPickDeleteConnection' } }
+            )
+        }
+    })
+
+    return prompter
+
+    async function* loadItems(
+        excludeSso?: boolean
+    ): AsyncGenerator<DataQuickPickItem<Connection | 'addNewConnection' | 'editCredentials'>[]> {
+        let connections = auth.listAndTraverseConnections()
+        if (excludeSso) {
+            connections = connections.filter((item) => item.type !== 'sso')
+        }
+
+        let hasShownEdit = false
+
+        yield [addNewConnection]
+        for await (const conn of connections) {
+            if (conn.label.includes('profile:') && !hasShownEdit) {
+                hasShownEdit = true
+                yield [await toPickerItem(conn), editCredentials]
+            } else {
+                yield [await toPickerItem(conn)]
+            }
+        }
+    }
+
+    async function toPickerItem(conn: Connection): Promise<DataQuickPickItem<Connection>> {
+        const state = auth.getConnectionState(conn)
+        // Only allow SSO connections to be deleted
+        const deleteButton: vscode.QuickInputButton[] = conn.type === 'sso' ? [createDeleteConnectionButton()] : []
+        // Get endpoint URL if available
+        const connLabel = conn.endpointUrl ? `${conn.label} (${conn.endpointUrl})` : conn.label
+        if (state === 'valid') {
+            const label = codicon`${getConnectionIcon(conn)} ${connLabel}`
+            return {
+                data: conn,
+                label: label,
+                description: await getConnectionDescription(conn),
+                buttons: [...deleteButton],
+            }
+        }
+
+        const getDetail = () => {
+            if (!DevSettings.instance.get('renderDebugDetails', false)) {
+                return
+            }
+
+            const err = auth.getInvalidationReason(conn)
+            return err ? formatError(err) : undefined
+        }
+
+        return {
+            detail: getDetail(),
+            data: conn,
+            invalidSelection: state !== 'authenticating',
+            label: codicon`${getIcon('vscode-error')} ${connLabel}`,
+            buttons: [...deleteButton],
+            description:
+                state === 'authenticating'
+                    ? 'authenticating...'
+                    : localize(
+                          'aws.auth.promptConnection.expired.description',
+                          'Expired or Invalid, select to authenticate'
+                      ),
+            onClick:
+                state !== 'authenticating'
+                    ? async () => {
+                          // XXX: this is hack because only 1 picker can be shown at a time
+                          // Some legacy auth providers will show a picker, hiding this one
+                          // If we detect this then we'll jump straight into using the connection
+                          let hidden = false
+                          const sub = prompter.quickPick.onDidHide(() => {
+                              hidden = true
+                              sub.dispose()
+                          })
+                          const newConn = await (
+                              await Commands.getOrThrow('_aws.toolkit.auth.reauthenticate')
+                          ).execute(auth, conn)
+                          if (hidden && newConn && auth.getConnectionState(newConn) === 'valid') {
+                              await auth.useConnection(newConn)
+                          } else {
+                              await prompter.clearAndLoadItems(loadItems())
+                              prompter.selectItems(
+                                  ...prompter.quickPick.items.filter((i) => i.label.includes(conn.label))
+                              )
+                          }
+                      }
+                    : undefined,
+        }
+    }
+
+    async function getConnectionDescription(conn: Connection) {
+        if (conn.type === 'iam') {
+            // TODO: implement a proper `getConnectionSource` method to discover where a connection came from
+            const descSuffix = conn.id.startsWith('profile:')
+                ? 'configured locally (~/.aws/config)'
+                : conn.id.startsWith('sso:')
+                  ? 'sourced from IAM Identity Center'
+                  : 'sourced from the environment'
+
+            return `IAM Credential, ${descSuffix}`
+        }
+
+        // If this is an SSO connection, check if it has linked IAM profiles
+        if (isSsoConnection(conn)) {
+            const linkedProfiles = await getLinkedIamProfiles(auth, conn)
+            if (linkedProfiles.length > 0) {
+                return `Has ${linkedProfiles.length} IAM role${linkedProfiles.length > 1 ? 's' : ''} (click to select)`
+            }
+        }
+
+        const toolAuths = getDependentAuths(conn)
+        if (toolAuths.length === 0) {
+            return undefined
+        } else if (toolAuths.length === 1) {
+            return `Connected to ${toolAuths[0].toolLabel}`
+        } else {
+            return `Connected to Dev Tools`
+        }
+    }
+}
+
+function mapEventType<T, U = void>(event: vscode.Event<T>, fn?: (val: T) => U): vscode.Event<U> {
+    const emitter = new vscode.EventEmitter<U>()
+    event((val) => (fn ? emitter.fire(fn(val)) : emitter.fire(undefined as U)))
+
+    return emitter.event
+}
+
+export class AuthNode implements TreeNode<Auth> {
+    public readonly id = 'auth'
+    public readonly onDidChangeTreeItem = mapEventType(this.resource.onDidChangeActiveConnection)
+
+    public constructor(public readonly resource: Auth) {}
+
+    public getTreeItem() {
+        // Calling this here is robust but `TreeShim` must be instantiated lazily to stop side-effects
+        // TODO: this is a race!
+        this.resource
+            .tryAutoConnect()
+            .then(() => {
+                CommonAuthWebview.authSource = ExtensionUse.instance.isFirstUse()
+                    ? ExtStartUpSources.firstStartUp
+                    : ExtStartUpSources.reload
+                void setContext('aws.explorer.showAuthView', !this.resource.hasConnections)
+            })
+            .catch((e) => {
+                getLogger().error('tryAutoConnect failed: %s', (e as Error).message)
+            })
+
+        const conn = this.resource.activeConnection
+        const itemLabel =
+            conn?.label !== undefined
+                ? conn?.endpointUrl !== undefined
+                    ? localize(
+                          'aws.auth.node.connectedWithEndpoint',
+                          `Connected with {0} ({1})`,
+                          conn.label,
+                          conn?.endpointUrl
+                      )
+                    : localize('aws.auth.node.connected', `Connected with {0}`, conn.label)
+                : localize('aws.auth.node.selectConnection', 'Select a connection...')
+
+        const item = new vscode.TreeItem(itemLabel)
+        item.contextValue = 'awsAuthNode'
+
+        if (conn !== undefined && conn.state !== 'valid') {
+            item.iconPath = getIcon('vscode-error')
+            if (conn.state === 'authenticating') {
+                item.description = 'authenticating...'
+            } else {
+                item.description = 'expired or invalid, click to authenticate'
+                item.command = {
+                    title: 'Reauthenticate',
+                    command: '_aws.toolkit.auth.reauthenticate',
+                    arguments: [this.resource, conn],
+                }
+            }
+        } else {
+            item.command = { title: 'Login', command: 'aws.toolkit.auth.switchConnections', arguments: [this.resource] }
+            item.iconPath = conn !== undefined ? getConnectionIcon(conn) : undefined
+        }
+
+        return item
+    }
+}
+
+export async function hasIamCredentials(
+    allConnections = () => Auth.instance.listAndTraverseConnections().promise()
+): Promise<boolean> {
+    return (await allConnections()).some(isIamConnection)
+}
+
+export type SsoKind = 'any' | 'codewhisperer' | 'codecatalyst'
+
+/**
+ * Returns true if an Identity Center SSO connection exists.
+ *
+ * @param kind A specific kind of Identity Center SSO connection that must exist.
+ * @param allConnections func to get all connections that exist
+ */
+export async function hasSso(
+    kind: SsoKind = 'any',
+    allConnections = () => Auth.instance.listConnections()
+): Promise<boolean> {
+    return (await findSsoConnections(kind, allConnections)).length > 0
+}
+
+export async function findSsoConnections(
+    kind: SsoKind = 'any',
+    allConnections = () => Auth.instance.listConnections()
+): Promise<SsoConnection[]> {
+    let predicate: (c?: Connection) => boolean
+    switch (kind) {
+        case 'codewhisperer':
+            predicate = (conn?: Connection) => {
+                return isIdcSsoConnection(conn) && isValidCodeWhispererCoreConnection(conn)
+            }
+            break
+        case 'codecatalyst':
+            predicate = (conn?: Connection) => {
+                return isIdcSsoConnection(conn) && isValidCodeCatalystConnection(conn)
+            }
+            break
+        case 'any':
+            predicate = isIdcSsoConnection
+    }
+    return (await allConnections()).filter(predicate).filter(isIdcSsoConnection)
+}
+
+export type BuilderIdKind = 'any' | 'codewhisperer' | 'codecatalyst'
+
+/**
+ * Returns true if a Builder ID connection exists.
+ *
+ * @param kind A Builder ID connection that has the scopes of this kind.
+ * @param allConnections func to get all connections that exist
+ */
+export async function hasBuilderId(
+    kind: BuilderIdKind = 'any',
+    allConnections = () => Auth.instance.listConnections()
+): Promise<boolean> {
+    return (await findBuilderIdConnections(kind, allConnections)).length > 0
+}
+
+async function findBuilderIdConnections(
+    kind: BuilderIdKind = 'any',
+    allConnections = () => Auth.instance.listConnections()
+): Promise<SsoConnection[]> {
+    let predicate: (c?: Connection) => boolean
+    switch (kind) {
+        case 'codewhisperer':
+            predicate = (conn?: Connection) => {
+                return isBuilderIdConnection(conn) && isValidCodeWhispererCoreConnection(conn)
+            }
+            break
+        case 'codecatalyst':
+            predicate = (conn?: Connection) => {
+                return isBuilderIdConnection(conn) && isValidCodeCatalystConnection(conn)
+            }
+            break
+        case 'any':
+            predicate = isBuilderIdConnection
+    }
+    return (await allConnections()).filter(predicate).filter(isAnySsoConnection)
+}
+
+/**
+ * Class to get info about the user + use of this extension
+ *
+ * Why is this extension in this file?
+ * - Due to circular dependency issues since this class needs to use the {@link Auth}
+ *   instance. If we can find a better spot and not run in to the isssue this should be moved.
+ *
+ * Keywords for searchability:
+ * - new user
+ * - first time
+ */
+export class ExtensionUse {
+    public readonly isExtensionFirstUseKey = 'isExtensionFirstUse'
+    public readonly lastExtensionVersionKey = 'lastExtensionVersion'
+
+    // The result of if is first use for the remainder of the extension session.
+    // This will reset on next startup.
+    private isFirstUseCurrentSession: boolean | undefined
+
+    private wasExtensionUpdated: boolean | undefined
+
+    /**
+     * Check if this is the first use/session of the extension.
+     */
+    isFirstUse(hasExistingConnections = () => Auth.instance.hasConnections): boolean {
+        if (this.isFirstUseCurrentSession !== undefined) {
+            return this.isFirstUseCurrentSession
+        }
+
+        // This is for sure not their first use
+        const isFirstUse = globals.globalState.tryGet('isExtensionFirstUse', Boolean)
+        if (isFirstUse === false) {
+            this.isFirstUseCurrentSession = isFirstUse
+            return this.isFirstUseCurrentSession
+        }
+
+        /**
+         * SANITY CHECK: If the clientId already existed on startup, then isFirstUse MUST be false. So
+         * there is a bug in the state.
+         */
+        if (hadClientIdOnStartup(globals.globalState)) {
+            telemetry.function_call.emit({
+                result: 'Failed',
+                functionName: 'isFirstUse',
+                reason: 'ClientIdAlreadyExisted',
+            })
+        }
+
+        if (isAmazonQ()) {
+            this.isFirstUseCurrentSession = true
+            if (hasExistingConnections()) {
+                telemetry.function_call.emit({
+                    result: 'Failed',
+                    functionName: 'isFirstUse',
+                    reason: 'UnexpectedConnections',
+                })
+            }
+        } else {
+            // The variable in the store is not defined yet, fallback to checking if they have existing connections.
+            this.isFirstUseCurrentSession = !hasExistingConnections()
+        }
+        getLogger().debug(
+            `isFirstUse: State not found, marking user as '${
+                this.isFirstUseCurrentSession ? '' : 'NOT '
+            }first use' since they 'did ${this.isFirstUseCurrentSession ? 'NOT ' : ''}have existing connections'.`
+        )
+
+        // Update state, so next time it is not first use
+        this.updateMemento('isExtensionFirstUse', false)
+
+        return this.isFirstUseCurrentSession
+    }
+
+    /**
+     * Checks if the extension has been updated since the last time it was used.
+     * If this is the first used version of the extension, it returns true.
+     * If the extension has been downgraded, it returns true.
+     *
+     * Caveat: This may return true even if an update hadn't occurred IF
+     * this function hasn't been called.
+     */
+    wasUpdated() {
+        if (this.wasExtensionUpdated !== undefined) {
+            return this.wasExtensionUpdated
+        }
+        const currentVersion = extensionVersion
+
+        this.wasExtensionUpdated = currentVersion !== globals.globalState.get('lastExtensionVersion')
+        this.updateMemento(this.lastExtensionVersionKey, currentVersion)
+
+        return this.wasExtensionUpdated
+    }
+
+    /**
+     * Returns a {@link ExtStartUpSource} based on the current state of the extension.
+     */
+    sourceForTelemetry(): ExtStartUpSource {
+        if (this.isFirstUse()) {
+            return ExtStartUpSources.firstStartUp
+        } else if (this.wasUpdated()) {
+            return ExtStartUpSources.update
+        } else {
+            return ExtStartUpSources.reload
+        }
+    }
+
+    private updateMemento(key: 'isExtensionFirstUse' | 'lastExtensionVersion', val: any) {
+        globals.globalState.tryUpdate(key, val)
+    }
+
+    static #instance: ExtensionUse
+
+    static get instance(): ExtensionUse {
+        return (this.#instance ??= new ExtensionUse())
+    }
+}
+
+/**
+ * Returns readable auth Ids for a connection, which are used by telemetry.
+ */
+export function getAuthFormIdsFromConnection(conn?: Connection): AuthFormId[] {
+    if (!conn) {
+        return []
+    }
+
+    const authIds: AuthFormId[] = []
+    let connType: 'builderId' | 'identityCenter'
+
+    if (isIamConnection(conn)) {
+        return ['credentials']
+    } else if (isBuilderIdConnection(conn)) {
+        connType = 'builderId'
+    } else if (isIdcSsoConnection(conn)) {
+        connType = 'identityCenter'
+        if (hasScopes(conn, scopesSsoAccountAccess)) {
+            authIds.push('identityCenterExplorer')
+        }
+    } else {
+        return ['unknown']
+    }
+
+    if (isValidCodeCatalystConnection(conn)) {
+        authIds.push(`${connType}CodeCatalyst`)
+    }
+    if (isValidAmazonQConnection(conn)) {
+        authIds.push(`${connType}CodeWhisperer`)
+    }
+
+    return authIds
+}
+
+export function initializeCredentialsProviderManager() {
+    const manager = CredentialsProviderManager.getInstance()
+    manager.addProviderFactory(new SharedCredentialsProviderFactory())
+    manager.addProviders(new Ec2CredentialsProvider(), new EcsCredentialsProvider(), new EnvVarsCredentialsProvider())
+}
+
+export async function getAuthType() {
+    let authType: CredentialSourceId | undefined = undefined
+    if (AuthUtil.instance.isEnterpriseSsoInUse() && AuthUtil.instance.isConnectionValid()) {
+        authType = 'iamIdentityCenter'
+    } else if (AuthUtil.instance.isBuilderIdInUse() && AuthUtil.instance.isConnectionValid()) {
+        authType = 'awsId'
+    }
+    return authType
+}
+
+export const localStackConnectionHeader = 'x-localstack'
+export const localStackConnectionString = 'localstack'
+
+export function isLocalStackConnection(): boolean {
+    return (
+        globals.globalState.tryGet('aws.toolkit.externalConnection', String, undefined) === localStackConnectionString
+    )
+}
diff --git a/src/credentials/wizards/createProfile.ts b/packages/core/src/auth/wizards/createProfile.ts
similarity index 83%
rename from src/credentials/wizards/createProfile.ts
rename to packages/core/src/auth/wizards/createProfile.ts
index b841d92d1b7..87cd3aac77b 100644
--- a/src/credentials/wizards/createProfile.ts
+++ b/packages/core/src/auth/wizards/createProfile.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -9,25 +9,25 @@ const localize = nls.loadMessageBundle()
 import * as vscode from 'vscode'
 import { StepEstimator, Wizard, WIZARD_BACK } from '../../shared/wizards/wizard'
 import { Prompter, PromptResult } from '../../shared/ui/prompter'
-import { ParsedIniData, Profile } from '../../shared/credentials/credentialsFile'
 import { createInputBox } from '../../shared/ui/inputPrompter'
 import { DefaultStsClient } from '../../shared/clients/stsClient'
-import { ProfileKey } from './templates'
 import { createCommonButtons } from '../../shared/ui/buttons'
 import { credentialHelpUrl } from '../../shared/constants'
-import { showLoginFailedMessage } from '../credentialsUtilities'
+import { showLoginFailedMessage } from '../credentials/utils'
+import { ParsedIniData, Profile } from '../credentials/sharedCredentials'
+import { SharedCredentialsKeys } from '../credentials/types'
 
 function createProfileNamePrompter(profiles: ParsedIniData) {
     return createInputBox({
         title: localize('AWS.profileName.title', 'Enter a profile name'),
         prompt: localize('AWS.profileName.prompt', 'Choose a unique name for the new profile'),
         buttons: createCommonButtons(credentialHelpUrl),
-        validateInput: name => {
+        validateInput: (name) => {
             if (name === '') {
                 return localize('AWS.credentials.error.emptyProfileName', 'Profile name must not be empty')
             }
 
-            return Object.keys(profiles).find(k => k === name) ? 'Name is not unique' : undefined
+            return Object.keys(profiles).includes(name) ? 'Name is not unique' : undefined
         },
     })
 }
@@ -67,7 +67,10 @@ interface CreateProfileState {
 }
 
 class ProfileChecker<T extends Profile> extends Prompter<string> {
-    public constructor(private readonly name: string, private readonly profile: T) {
+    public constructor(
+        private readonly name: string,
+        private readonly profile: T
+    ) {
         super()
     }
 
@@ -82,8 +85,8 @@ class ProfileChecker<T extends Profile> extends Prompter<string> {
         try {
             const region = this.profile['region'] ?? 'us-east-1' // De-dupe this pattern
             const stsClient = new DefaultStsClient(region, {
-                accessKeyId: this.profile[ProfileKey.AccessKeyId]!,
-                secretAccessKey: this.profile[ProfileKey.SecretKey]!,
+                accessKeyId: this.profile[SharedCredentialsKeys.AWS_ACCESS_KEY_ID]!,
+                secretAccessKey: this.profile[SharedCredentialsKeys.AWS_SECRET_ACCESS_KEY]!,
             })
 
             return (await stsClient.getCallerIdentity()).Account
diff --git a/src/credentials/wizards/sso.ts b/packages/core/src/auth/wizards/sso.ts
similarity index 89%
rename from src/credentials/wizards/sso.ts
rename to packages/core/src/auth/wizards/sso.ts
index 1c459a2be7c..004032df85e 100644
--- a/src/credentials/wizards/sso.ts
+++ b/packages/core/src/auth/wizards/sso.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -37,7 +37,7 @@ export function createAccountPrompter(provider: SsoAccessTokenProvider, region:
     }
 
     const client = SsoClient.create(region, provider)
-    const items = client.listAccounts({}).map(accounts => accounts.map(toItem))
+    const items = client.listAccounts({}).map((accounts) => accounts.map(toItem))
 
     return createQuickPick(items, {
         title: localize('AWS.sso.promptAccount.title', 'Select an account ({0})', region),
@@ -54,7 +54,7 @@ export function createRolePrompter(provider: SsoAccessTokenProvider, region: str
     }
 
     const client = SsoClient.create(region, provider)
-    const items = client.listAccountRoles({ accountId }).map(roles => roles.map(toItem))
+    const items = client.listAccountRoles({ accountId }).map((roles) => roles.map(toItem))
 
     return createQuickPick(items, {
         title: localize('AWS.sso.promptRole.title', 'Select a role in {0} ({1})', accountId, region),
@@ -94,22 +94,22 @@ export class SsoWizard extends Wizard<SsoWizardState> {
     public constructor(init: Partial<SsoProfile> = {}) {
         super({ initState: init })
 
-        this.form.region.bindPrompter(() => createRegionPrompter().transform(r => r.id))
+        this.form.region.bindPrompter(() => createRegionPrompter().transform((r) => r.id))
         this.form.startUrl.bindPrompter(createStartUrlPrompter)
 
         this.form.tokenProvider.bindPrompter(
             ({ region, startUrl }) => new TokenLoader({ region: region!, startUrl: startUrl!, scopes: init.scopes })
         )
 
-        this.form.accountId.bindPrompter(state => {
+        this.form.accountId.bindPrompter((state) => {
             // If we fail here, we should just abort the wizard
             // prevents having to write messy back-tracking logic
             assertHasProps(state, 'tokenProvider', 'region')
-            return createAccountPrompter(state.tokenProvider, state.region).transform(a => a.accountId)
+            return createAccountPrompter(state.tokenProvider, state.region).transform((a) => a.accountId)
         })
-        this.form.roleName.bindPrompter(state => {
+        this.form.roleName.bindPrompter((state) => {
             assertHasProps(state, 'tokenProvider', 'region', 'accountId')
-            return createRolePrompter(state.tokenProvider, state.region, state.accountId).transform(r => r.roleName)
+            return createRolePrompter(state.tokenProvider, state.region, state.accountId).transform((r) => r.roleName)
         })
     }
 }
diff --git a/packages/core/src/auth/wizards/templates.ts b/packages/core/src/auth/wizards/templates.ts
new file mode 100644
index 00000000000..c17108b5937
--- /dev/null
+++ b/packages/core/src/auth/wizards/templates.ts
@@ -0,0 +1,70 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import { createInputBox } from '../../shared/ui/inputPrompter'
+import { getIdeProperties } from '../../shared/extensionUtilities'
+import { ProfileTemplateProvider } from './createProfile'
+import { createCommonButtons } from '../../shared/ui/buttons'
+import { credentialHelpUrl } from '../../shared/constants'
+import { SharedCredentialsKeys, StaticProfile } from '../credentials/types'
+import { getCredentialError } from '../credentials/validation'
+
+function getTitle(profileName: string): string {
+    return localize('AWS.title.createCredentialProfile', 'Creating new profile "{0}"', profileName)
+}
+
+export const staticCredentialsTemplate: ProfileTemplateProvider<StaticProfile> = {
+    label: 'Static Credentials',
+    description: 'Use this for credentials that never expire',
+    prompts: {
+        [SharedCredentialsKeys.AWS_ACCESS_KEY_ID]: (name) =>
+            createInputBox({
+                title: getTitle(name),
+                buttons: createCommonButtons(credentialHelpUrl),
+                // Example comes from https://docs.aws.amazon.com/STS/latest/APIReference/API_GetAccessKeyInfo.html
+                placeholder: 'AKIAIOSFODNN7EXAMPLE',
+                prompt: localize(
+                    'AWS.placeHolder.inputAccessKey',
+                    'Input the {0} Access Key',
+                    getIdeProperties().company
+                ),
+                validateInput: (value) => getCredentialError(SharedCredentialsKeys.AWS_ACCESS_KEY_ID, value),
+            }),
+        [SharedCredentialsKeys.AWS_SECRET_ACCESS_KEY]: (name) =>
+            createInputBox({
+                title: getTitle(name),
+                buttons: createCommonButtons(credentialHelpUrl),
+                // Example comes from https://docs.aws.amazon.com/STS/latest/APIReference/API_GetAccessKeyInfo.html
+                placeholder: 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY',
+                prompt: localize(
+                    'AWS.placeHolder.inputSecretKey',
+                    'Input the {0} Secret Key',
+                    getIdeProperties().company
+                ),
+                validateInput: (value) => getCredentialError(SharedCredentialsKeys.AWS_SECRET_ACCESS_KEY, value),
+                password: true,
+            }),
+    },
+}
+
+interface CredentialsProcessProfile {
+    [SharedCredentialsKeys.CREDENTIAL_PROCESS]: string
+}
+
+export const processCredentialsTemplate: ProfileTemplateProvider<CredentialsProcessProfile> = {
+    label: 'External Process',
+    description: 'Creates a new profile that fetches credentials from a process',
+    prompts: {
+        [SharedCredentialsKeys.CREDENTIAL_PROCESS]: (name) =>
+            createInputBox({
+                title: getTitle(name),
+                prompt: 'Enter a command to run',
+                buttons: createCommonButtons(credentialHelpUrl),
+            }),
+    },
+}
diff --git a/packages/core/src/awsService/accessanalyzer/activation.ts b/packages/core/src/awsService/accessanalyzer/activation.ts
new file mode 100644
index 00000000000..6c8d7a74bd7
--- /dev/null
+++ b/packages/core/src/awsService/accessanalyzer/activation.ts
@@ -0,0 +1,19 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ExtContext } from '../../shared/extensions'
+import { Commands } from '../../shared/vscode/commands2'
+import { renderIamPolicyChecks } from './vue/iamPolicyChecks'
+
+/**
+ * Activate Policy Checks functionality for the extension.
+ */
+export async function activate(extContext: ExtContext): Promise<void> {
+    const extensionContext = extContext.extensionContext
+
+    extensionContext.subscriptions.push(
+        Commands.register('aws.accessanalyzer.iamPolicyChecks', async () => await renderIamPolicyChecks(extContext))
+    )
+}
diff --git a/packages/core/src/awsService/accessanalyzer/vue/constants.ts b/packages/core/src/awsService/accessanalyzer/vue/constants.ts
new file mode 100644
index 00000000000..2c0ddb0585b
--- /dev/null
+++ b/packages/core/src/awsService/accessanalyzer/vue/constants.ts
@@ -0,0 +1,44 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export abstract class IamPolicyChecksConstants {
+    static readonly ValidatePolicySuccessWithFindings =
+        'Review the findings for your policy document in the problems panel. We recommend that you update your policy document and re-run the policy checks until no findings are generated.'
+    static readonly ValidatePolicySuccessNoFindings = 'Policy checks did not generate any findings for your policy.'
+    static readonly CustomCheckSuccessWithFindings =
+        'Result: FAIL. Review the details for the check failure for your policy document in the problems panel. We recommend that you update your policy document and re-run the policy check until the check returns a PASS result.'
+    static readonly CustomCheckSuccessNoFindings = 'Result: PASS.'
+    static readonly CheckNoNewAccessFilePathSetting = 'aws.accessAnalyzer.policyChecks.checkNoNewAccessFilePath'
+    static readonly CheckAccessNotGrantedFilePathSetting =
+        'aws.accessAnalyzer.policyChecks.checkAccessNotGrantedFilePath'
+    static readonly CfnParameterFilePathSetting = 'aws.accessAnalyzer.policyChecks.cloudFormationParameterFilePath'
+    static readonly MissingReferenceDocError = 'Reference document is missing.'
+    static readonly IncorrectFileExtension =
+        'The file extension does not match the selected document type. Please select the correct document type, or use the proper file extension.'
+    static readonly InvalidAwsCredentials =
+        'AWS Role Credentials are invalid or expired. Update AWS credentials and try again.'
+    static readonly MissingActionsOrResourcesError = 'Please provide at least one of actions or resources.'
+}
+
+export type PolicyChecksErrorCode = 'FileReadError' | 'ValidatePolicyError' | 'CustomChecksError'
+
+export type PolicyChecksDocumentType = 'Terraform Plan' | 'CloudFormation' | 'JSON Policy Language'
+
+export type PolicyChecksCheckType = 'CheckNoNewAccess' | 'CheckAccessNotGranted' | 'CheckNoPublicAccess'
+
+export type PolicyChecksPolicyType = 'Identity' | 'Resource'
+
+export type PolicyChecksResult = 'Success' | 'Warning' | 'Error'
+
+export type PolicyChecksUiClick =
+    | 'accessanalyzer_selectDocumentType'
+    | 'accessanalyzer_selectInputPolicyType'
+    | 'accessanalyzer_selectReferencePolicyType'
+    | 'accessanalyzer_selectCustomCheckType'
+    | 'accessanalyzer_selectCheckAccessNotGrantedFilePath'
+    | 'accessanalyzer_selectCheckNoNewAccessFilePath'
+    | 'accessanalyzer_selectCfnParameterFilePath'
+    | 'accessanalyzer_runValidatePolicy'
+    | 'accessanalyzer_runCustomPolicyCheck'
diff --git a/packages/core/src/awsService/accessanalyzer/vue/iamPolicyChecks.ts b/packages/core/src/awsService/accessanalyzer/vue/iamPolicyChecks.ts
new file mode 100644
index 00000000000..42521e73ec6
--- /dev/null
+++ b/packages/core/src/awsService/accessanalyzer/vue/iamPolicyChecks.ts
@@ -0,0 +1,970 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as fs from 'fs' // eslint-disable-line no-restricted-imports
+import * as path from 'path'
+import { getLogger, Logger } from '../../../shared/logger/logger'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { VueWebview, VueWebviewPanel } from '../../../webviews/main'
+import { ExtContext } from '../../../shared/extensions'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { AccessAnalyzerClient, ValidatePolicyCommand } from '@aws-sdk/client-accessanalyzer'
+import { fromIni } from '@aws-sdk/credential-providers'
+import { ToolkitError } from '../../../shared/errors'
+import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../../../shared/filesystemUtilities'
+import globals from '../../../shared/extensionGlobals'
+import {
+    IamPolicyChecksConstants,
+    PolicyChecksCheckType,
+    PolicyChecksDocumentType,
+    PolicyChecksErrorCode,
+    PolicyChecksPolicyType,
+    PolicyChecksResult,
+    PolicyChecksUiClick,
+} from './constants'
+import { S3Client, parseS3Uri } from '../../../shared/clients/s3'
+import { ExpiredTokenException } from '@aws-sdk/client-sso-oidc'
+import { ChildProcess } from '../../../shared/utilities/processUtils'
+
+const defaultTerraformConfigPath = 'resources/policychecks-tf-default.yaml'
+// Diagnostics for Custom checks are shared
+export const customPolicyCheckDiagnosticCollection = vscode.languages.createDiagnosticCollection('customPolicyCheck')
+export const validatePolicyDiagnosticCollection = vscode.languages.createDiagnosticCollection('validatePolicy')
+
+export interface IamPolicyChecksInitialData {
+    checkNoNewAccessFilePath: string
+    checkNoNewAccessTextArea: string
+    checkAccessNotGrantedFilePath: string
+    checkAccessNotGrantedActionsTextArea: string
+    checkAccessNotGrantedResourcesTextArea: string
+    customChecksFileErrorMessage: string
+    cfnParameterPath: string
+    pythonToolsInstalled: boolean
+}
+
+type PolicyCommandOpts = {
+    command: string
+    args: string[]
+    cfnParameterPathExists: boolean
+    documentType: PolicyChecksDocumentType
+}
+
+export class IamPolicyChecksWebview extends VueWebview {
+    public static readonly sourcePath: string = 'src/awsService/accessanalyzer/vue/index.js'
+    public readonly id = 'iamPolicyChecks'
+    private static editedDocumentUri: vscode.Uri
+    public static editedDocumentFileName: string
+    private static editedDocument: string
+
+    public constructor(
+        private readonly data: IamPolicyChecksInitialData,
+        private client: AccessAnalyzerClient,
+        private readonly region: string,
+        public readonly onChangeInputPath = new vscode.EventEmitter<string>(),
+        public readonly onChangeCheckNoNewAccessFilePath = new vscode.EventEmitter<string>(),
+        public readonly onChangeCheckAccessNotGrantedFilePath = new vscode.EventEmitter<string>(),
+        public readonly onChangeCloudformationParameterFilePath = new vscode.EventEmitter<string>(),
+        public readonly onValidatePolicyResponse = new vscode.EventEmitter<[string, string]>(),
+        public readonly onCustomPolicyCheckResponse = new vscode.EventEmitter<[string, string]>(),
+        public readonly onFileReadError = new vscode.EventEmitter<string>()
+    ) {
+        super(IamPolicyChecksWebview.sourcePath)
+        this._setActiveTextEditorListener()
+        this._setActiveConfigurationListener()
+        if (vscode.window.activeTextEditor) {
+            IamPolicyChecksWebview.editedDocumentFileName = vscode.window.activeTextEditor.document.uri.path
+            IamPolicyChecksWebview.editedDocument = vscode.window.activeTextEditor.document.getText()
+            IamPolicyChecksWebview.editedDocumentUri = vscode.window.activeTextEditor.document.uri
+        }
+    }
+
+    public init(): typeof this.data {
+        return this.data
+    }
+
+    public async readCustomChecksFile(path: string): Promise<string> {
+        try {
+            const customChecksTextArea = await _readCustomChecksFile(path)
+            this.onFileReadError.fire('') // Reset error message display if no error is found
+            return customChecksTextArea
+        } catch (err: any) {
+            if (err instanceof PolicyChecksError && (err.code as PolicyChecksErrorCode) === 'FileReadError') {
+                this.onFileReadError.fire(err.message)
+            }
+            return ''
+        }
+    }
+
+    public async readCustomChecksJsonFile(path: string): Promise<object> {
+        try {
+            const rawString = await _readCustomChecksFile(path)
+            this.onFileReadError.fire('') // Reset error message display if no error is found
+            return JSON.parse(rawString)
+        } catch (err: any) {
+            if (err instanceof PolicyChecksError && (err.code as PolicyChecksErrorCode) === 'FileReadError') {
+                this.onFileReadError.fire(err.message)
+            } else if (err instanceof SyntaxError) {
+                this.onFileReadError.fire(`JSON Parse Error: ${err.message}`)
+            } else {
+                this.onFileReadError.fire(`Unexpected Error: ${err.message}`)
+            }
+        }
+        return {}
+    }
+
+    public _setActiveTextEditorListener() {
+        // Send the current active text editor to Webview to show what is being targeted by the user
+        vscode.window.onDidChangeActiveTextEditor((message: any) => {
+            const editedFile = vscode.window.activeTextEditor?.document
+            if (editedFile !== undefined) {
+                IamPolicyChecksWebview.editedDocumentFileName = editedFile.uri.path
+                IamPolicyChecksWebview.editedDocument = editedFile.getText()
+                IamPolicyChecksWebview.editedDocumentUri = editedFile.uri
+                this.onChangeInputPath.fire(editedFile.uri.path)
+            }
+        })
+        vscode.workspace.onDidChangeTextDocument((message: any) => {
+            const editedFile = vscode.window.activeTextEditor?.document
+            if (editedFile !== undefined) {
+                IamPolicyChecksWebview.editedDocument = editedFile.getText()
+            }
+        })
+    }
+
+    public _setActiveConfigurationListener() {
+        vscode.workspace.onDidChangeConfiguration((config: vscode.ConfigurationChangeEvent) => {
+            // If settings change, we want to update the Webview to reflect the change in inputs
+            if (config.affectsConfiguration(IamPolicyChecksConstants.CheckNoNewAccessFilePathSetting)) {
+                this.onChangeCheckNoNewAccessFilePath.fire(
+                    vscode.workspace.getConfiguration().get(IamPolicyChecksConstants.CheckNoNewAccessFilePathSetting)!
+                )
+            } else if (config.affectsConfiguration(IamPolicyChecksConstants.CheckAccessNotGrantedFilePathSetting)) {
+                this.onChangeCheckAccessNotGrantedFilePath.fire(
+                    vscode.workspace
+                        .getConfiguration()
+                        .get(IamPolicyChecksConstants.CheckAccessNotGrantedFilePathSetting)!
+                )
+            } else if (config.affectsConfiguration(IamPolicyChecksConstants.CfnParameterFilePathSetting)) {
+                this.onChangeCloudformationParameterFilePath.fire(
+                    vscode.workspace.getConfiguration().get(IamPolicyChecksConstants.CfnParameterFilePathSetting)!
+                )
+            }
+        })
+    }
+
+    public emitUiClick(elementId: PolicyChecksUiClick) {
+        telemetry.ui_click.emit({ elementId })
+    }
+
+    /* Uses A2 SDK and Python CLI tools to call ValidatePolicy API
+     * Responses are exposed in the Webview, including errors
+     * Diagnostic objects are created to expose findings, which appear in the problems panel
+     */
+    public async validatePolicy(
+        documentType: PolicyChecksDocumentType,
+        policyType: PolicyChecksPolicyType,
+        cfnParameterPath?: string
+    ) {
+        const document = IamPolicyChecksWebview.editedDocumentFileName
+        validatePolicyDiagnosticCollection.clear()
+        const diagnostics: vscode.Diagnostic[] = []
+        switch (documentType) {
+            case 'JSON Policy Language': {
+                if (isJsonPolicyLanguage(document)) {
+                    telemetry.accessanalyzer_iamPolicyChecksValidatePolicy.run((span) => {
+                        span.record({
+                            documentType,
+                            inputPolicyType: policyType ? policyType : 'None',
+                        })
+                        this.client.config.credentials = fromIni({
+                            profile: `${getProfileName()}`,
+                        }) // We need to detect changes in the user's credentials
+                        this.client
+                            .send(
+                                new ValidatePolicyCommand({
+                                    policyDocument: IamPolicyChecksWebview.editedDocument,
+                                    policyType: policyType === 'Identity' ? 'IDENTITY_POLICY' : 'RESOURCE_POLICY',
+                                })
+                            )
+                            .then((data) => {
+                                if (data.findings && data.findings.length > 0) {
+                                    span.record({
+                                        findingsCount: data.findings.length,
+                                    })
+                                    // eslint-disable-next-line unicorn/no-array-for-each
+                                    data.findings.forEach((finding) => {
+                                        const locationSpan = finding.locations?.[0].span
+                                        if (
+                                            !locationSpan?.start?.line ||
+                                            !locationSpan.start.offset ||
+                                            !locationSpan.end?.line ||
+                                            !locationSpan.end.offset
+                                        ) {
+                                            return
+                                        }
+                                        const message = `${finding.findingType}: ${finding.issueCode} - ${finding.findingDetails} Learn more: ${finding.learnMoreLink}`
+                                        if (finding.findingType === 'ERROR') {
+                                            diagnostics.push(
+                                                new vscode.Diagnostic(
+                                                    new vscode.Range(
+                                                        locationSpan.start.line,
+                                                        locationSpan.start.offset,
+                                                        locationSpan.end.line,
+                                                        locationSpan.end.offset
+                                                    ),
+                                                    message,
+                                                    vscode.DiagnosticSeverity.Error
+                                                )
+                                            )
+                                            validatePolicyDiagnosticCollection.set(
+                                                IamPolicyChecksWebview.editedDocumentUri,
+                                                diagnostics
+                                            )
+                                        } else {
+                                            diagnostics.push(
+                                                new vscode.Diagnostic(
+                                                    new vscode.Range(
+                                                        locationSpan.start.line,
+                                                        locationSpan.start.offset,
+                                                        locationSpan.end.line,
+                                                        locationSpan.end.offset
+                                                    ),
+                                                    message,
+                                                    vscode.DiagnosticSeverity.Warning
+                                                )
+                                            )
+                                            validatePolicyDiagnosticCollection.set(
+                                                IamPolicyChecksWebview.editedDocumentUri,
+                                                diagnostics
+                                            )
+                                        }
+                                    })
+                                    this.onValidatePolicyResponse.fire([
+                                        IamPolicyChecksConstants.ValidatePolicySuccessWithFindings,
+                                        getResultCssColor('Warning'),
+                                    ])
+                                    void vscode.commands.executeCommand('workbench.actions.view.problems')
+                                } else {
+                                    this.onValidatePolicyResponse.fire([
+                                        IamPolicyChecksConstants.ValidatePolicySuccessNoFindings,
+                                        getResultCssColor('Success'),
+                                    ])
+                                }
+                            })
+                            .catch((err) => {
+                                span.record({
+                                    findingsCount: 0,
+                                })
+                                if (err instanceof ExpiredTokenException) {
+                                    this.onValidatePolicyResponse.fire([
+                                        IamPolicyChecksConstants.InvalidAwsCredentials,
+                                        getResultCssColor('Error'),
+                                    ])
+                                } else {
+                                    this.onValidatePolicyResponse.fire([err.message, getResultCssColor('Error')])
+                                }
+                            })
+                    })
+                    return
+                } else {
+                    this.onValidatePolicyResponse.fire([
+                        IamPolicyChecksConstants.IncorrectFileExtension,
+                        getResultCssColor('Error'),
+                    ])
+                    return
+                }
+            }
+            case 'Terraform Plan': {
+                if (isTerraformPlan(document)) {
+                    const command = 'tf-policy-validator'
+                    const args = [
+                        'validate',
+                        '--template-path',
+                        `${document}`,
+                        '--region',
+                        `${this.region}`,
+                        '--config',
+                        `${globals.context.asAbsolutePath(defaultTerraformConfigPath)}`,
+                        '--profile',
+                        `${getProfileName()}`,
+                    ]
+                    await this.executeValidatePolicyCommand({
+                        command,
+                        args,
+                        cfnParameterPathExists: !!cfnParameterPath,
+                        documentType,
+                        policyType,
+                    })
+                    return
+                } else {
+                    this.onValidatePolicyResponse.fire([
+                        IamPolicyChecksConstants.IncorrectFileExtension,
+                        getResultCssColor('Error'),
+                    ])
+                    return
+                }
+            }
+            case 'CloudFormation': {
+                if (isCloudFormationTemplate(document)) {
+                    const command = 'cfn-policy-validator'
+                    const args = [
+                        'validate',
+                        '--template-path',
+                        `${document}`,
+                        '--region',
+                        `${this.region}`,
+                        '--profile',
+                        `${getProfileName()}`,
+                    ]
+                    if (cfnParameterPath !== '') {
+                        args.push('--template-configuration-file', `${cfnParameterPath}`)
+                    }
+                    await this.executeValidatePolicyCommand({
+                        command,
+                        args,
+                        cfnParameterPathExists: !!cfnParameterPath,
+                        documentType,
+                        policyType,
+                    })
+                    return
+                } else {
+                    this.onValidatePolicyResponse.fire([
+                        IamPolicyChecksConstants.IncorrectFileExtension,
+                        getResultCssColor('Error'),
+                    ])
+                    return
+                }
+            }
+        }
+    }
+
+    public async checkNoNewAccess(
+        documentType: PolicyChecksDocumentType,
+        policyType: PolicyChecksPolicyType,
+        referenceDocument: string,
+        cfnParameterPath?: string
+    ) {
+        const tempFolder = await makeTemporaryToolkitFolder()
+        const tempFilePath = path.join(tempFolder, 'policyChecksDocument')
+
+        const document = IamPolicyChecksWebview.editedDocumentFileName
+        customPolicyCheckDiagnosticCollection.clear()
+        if (referenceDocument !== '') {
+            fs.writeFileSync(tempFilePath, referenceDocument)
+        } else {
+            this.onCustomPolicyCheckResponse.fire([
+                IamPolicyChecksConstants.MissingReferenceDocError,
+                getResultCssColor('Error'),
+            ])
+            return
+        }
+
+        switch (documentType) {
+            case 'Terraform Plan': {
+                if (isTerraformPlan(document)) {
+                    const command = 'tf-policy-validator'
+                    const args = [
+                        'check-no-new-access',
+                        '--template-path',
+                        `${document}`,
+                        '--region',
+                        `${this.region}`,
+                        '--config',
+                        `${globals.context.asAbsolutePath(defaultTerraformConfigPath)}`,
+                        '--reference-policy',
+                        `${tempFilePath}`,
+                        '--reference-policy-type',
+                        `${policyType}`,
+                        '--profile',
+                        `${getProfileName()}`,
+                    ]
+                    await this.executeCustomPolicyChecksCommand({
+                        command,
+                        args,
+                        cfnParameterPathExists: !!cfnParameterPath,
+                        documentType,
+                        checkType: 'CheckNoNewAccess',
+                        referencePolicyType: policyType,
+                    })
+                    return
+                } else {
+                    this.onCustomPolicyCheckResponse.fire([
+                        IamPolicyChecksConstants.IncorrectFileExtension,
+                        getResultCssColor('Error'),
+                    ])
+                    return
+                }
+            }
+            case 'CloudFormation': {
+                if (isCloudFormationTemplate(document)) {
+                    const command = 'cfn-policy-validator'
+                    const args = [
+                        'check-no-new-access',
+                        '--template-path',
+                        `${document}`,
+                        '--region',
+                        `${this.region}`,
+                        '--reference-policy',
+                        `${tempFilePath}`,
+                        '--reference-policy-type',
+                        `${policyType}`,
+                        '--profile',
+                        `${getProfileName()}`,
+                    ]
+                    if (cfnParameterPath !== '') {
+                        args.push('--template-configuration-file', `${cfnParameterPath}`)
+                    }
+                    await this.executeCustomPolicyChecksCommand({
+                        command,
+                        args,
+                        cfnParameterPathExists: !!cfnParameterPath,
+                        documentType,
+                        checkType: 'CheckNoNewAccess',
+                        referencePolicyType: policyType,
+                    })
+                    return
+                } else {
+                    this.onCustomPolicyCheckResponse.fire([
+                        IamPolicyChecksConstants.IncorrectFileExtension,
+                        getResultCssColor('Error'),
+                    ])
+                    return
+                }
+            }
+        }
+        await tryRemoveFolder(tempFolder)
+    }
+
+    public async checkAccessNotGranted(
+        documentType: PolicyChecksDocumentType,
+        actions: string,
+        resources: string,
+        cfnParameterPath?: string
+    ) {
+        const document = IamPolicyChecksWebview.editedDocumentFileName
+        customPolicyCheckDiagnosticCollection.clear()
+        if (actions !== '') {
+            // Remove spaces, line breaks, carriage returns, and tabs
+            actions = actions.replace(/\s*|\t|\r|\n/gm, '')
+        }
+        if (resources !== '') {
+            // Remove spaces, line breaks, carriage returns, and tabs
+            resources = resources.replace(/\s*|\t|\r|\n/gm, '')
+        }
+        if (!(actions || resources)) {
+            this.onCustomPolicyCheckResponse.fire([
+                IamPolicyChecksConstants.MissingActionsOrResourcesError,
+                getResultCssColor('Error'),
+            ])
+            return
+        }
+        switch (documentType) {
+            case 'Terraform Plan': {
+                if (isTerraformPlan(document)) {
+                    const command = 'tf-policy-validator'
+                    const args = [
+                        'check-access-not-granted',
+                        '--template-path',
+                        `${document}`,
+                        '--region',
+                        `${this.region}`,
+                        '--config',
+                        `${globals.context.asAbsolutePath(defaultTerraformConfigPath)}`,
+                        '--profile',
+                        `${getProfileName()}`,
+                    ]
+                    if (actions !== '') {
+                        args.push('--actions', `${actions}`)
+                    }
+                    if (resources !== '') {
+                        args.push('--resources', `${resources}`)
+                    }
+                    await this.executeCustomPolicyChecksCommand({
+                        command,
+                        args,
+                        cfnParameterPathExists: !!cfnParameterPath,
+                        documentType,
+                        checkType: 'CheckAccessNotGranted',
+                    })
+                    return
+                } else {
+                    this.onCustomPolicyCheckResponse.fire([
+                        IamPolicyChecksConstants.IncorrectFileExtension,
+                        getResultCssColor('Error'),
+                    ])
+                    return
+                }
+            }
+            case 'CloudFormation': {
+                if (isCloudFormationTemplate(document)) {
+                    const command = 'cfn-policy-validator'
+                    const args = [
+                        'check-access-not-granted',
+                        '--template-path',
+                        `${document}`,
+                        '--region',
+                        `${this.region}`,
+                        '--profile',
+                        `${getProfileName()}`,
+                    ]
+                    if (actions !== '') {
+                        args.push('--actions', `${actions}`)
+                    }
+                    if (resources !== '') {
+                        args.push('--resources', `${resources}`)
+                    }
+                    if (cfnParameterPath !== '') {
+                        args.push('--template-configuration-file', `${cfnParameterPath}`)
+                    }
+                    await this.executeCustomPolicyChecksCommand({
+                        command,
+                        args,
+                        cfnParameterPathExists: !!cfnParameterPath,
+                        documentType,
+                        checkType: 'CheckAccessNotGranted',
+                    })
+                    return
+                } else {
+                    this.onCustomPolicyCheckResponse.fire([
+                        IamPolicyChecksConstants.IncorrectFileExtension,
+                        getResultCssColor('Error'),
+                    ])
+                    return
+                }
+            }
+        }
+    }
+
+    public async checkNoPublicAccess(documentType: PolicyChecksDocumentType, cfnParameterPath?: string) {
+        const document = IamPolicyChecksWebview.editedDocumentFileName
+        customPolicyCheckDiagnosticCollection.clear()
+
+        switch (documentType) {
+            case 'Terraform Plan': {
+                if (isTerraformPlan(document)) {
+                    const command = 'tf-policy-validator'
+                    const args = [
+                        'check-no-public-access',
+                        '--template-path',
+                        `${document}`,
+                        '--region',
+                        `${this.region}`,
+                        '--config',
+                        `${globals.context.asAbsolutePath(defaultTerraformConfigPath)}`,
+                        '--profile',
+                        `${getProfileName()}`,
+                    ]
+                    await this.executeCustomPolicyChecksCommand({
+                        command,
+                        args,
+                        cfnParameterPathExists: !!cfnParameterPath,
+                        documentType,
+                        checkType: 'CheckNoPublicAccess',
+                    })
+                    return
+                } else {
+                    this.onCustomPolicyCheckResponse.fire([
+                        IamPolicyChecksConstants.IncorrectFileExtension,
+                        getResultCssColor('Error'),
+                    ])
+                    return
+                }
+            }
+            case 'CloudFormation': {
+                if (isCloudFormationTemplate(document)) {
+                    const command = 'cfn-policy-validator'
+                    const args = [
+                        'check-no-public-access',
+                        '--template-path',
+                        `${document}`,
+                        '--region',
+                        `${this.region}`,
+                        '--profile',
+                        `${getProfileName()}`,
+                    ]
+                    if (cfnParameterPath !== '') {
+                        args.push('--template-configuration-file', `${cfnParameterPath}`)
+                    }
+                    await this.executeCustomPolicyChecksCommand({
+                        command,
+                        args,
+                        cfnParameterPathExists: !!cfnParameterPath,
+                        documentType,
+                        checkType: 'CheckNoPublicAccess',
+                    })
+                    return
+                } else {
+                    this.onCustomPolicyCheckResponse.fire([
+                        IamPolicyChecksConstants.IncorrectFileExtension,
+                        getResultCssColor('Error'),
+                    ])
+                    return
+                }
+            }
+        }
+    }
+
+    public async executeValidatePolicyCommand(opts: PolicyCommandOpts & { policyType?: PolicyChecksPolicyType }) {
+        await telemetry.accessanalyzer_iamPolicyChecksValidatePolicy.run(async (span) => {
+            try {
+                span.record({
+                    cfnParameterFileUsed: opts.cfnParameterPathExists,
+                    documentType: opts.documentType,
+                    inputPolicyType: opts.policyType ?? 'None',
+                })
+                const result = await ChildProcess.run(opts.command, opts.args, { collect: true })
+                const findingsCount = this.handleValidatePolicyCliResponse(result.stdout)
+                span.record({
+                    findingsCount: findingsCount,
+                })
+            } catch (err: any) {
+                if (err.status === 2) {
+                    // CLI responds with a status code of 2 when findings are discovered
+                    const findingsCount = this.handleValidatePolicyCliResponse(err.stdout.toString())
+                    span.record({
+                        findingsCount: findingsCount,
+                    })
+                } else {
+                    span.record({
+                        findingsCount: 0,
+                    })
+                    this.onValidatePolicyResponse.fire([
+                        parseCliErrorMessage(err.message, opts.documentType),
+                        getResultCssColor('Error'),
+                    ])
+                }
+            }
+        })
+    }
+
+    public handleValidatePolicyCliResponse(response: string): number {
+        let findingsCount = 0
+        const diagnostics: vscode.Diagnostic[] = []
+        const jsonOutput = JSON.parse(response)
+        if (jsonOutput.BlockingFindings.length === 0 && jsonOutput.NonBlockingFindings.length === 0) {
+            this.onValidatePolicyResponse.fire([
+                IamPolicyChecksConstants.ValidatePolicySuccessNoFindings,
+                getResultCssColor('Success'),
+            ])
+        } else {
+            // eslint-disable-next-line unicorn/no-array-for-each
+            jsonOutput.BlockingFindings.forEach((finding: any) => {
+                this.pushValidatePolicyDiagnostic(diagnostics, finding, true)
+                findingsCount++
+            })
+            // eslint-disable-next-line unicorn/no-array-for-each
+            jsonOutput.NonBlockingFindings.forEach((finding: any) => {
+                this.pushValidatePolicyDiagnostic(diagnostics, finding, false)
+                findingsCount++
+            })
+            this.onValidatePolicyResponse.fire([
+                IamPolicyChecksConstants.ValidatePolicySuccessWithFindings,
+                getResultCssColor('Warning'),
+            ])
+            void vscode.commands.executeCommand('workbench.actions.view.problems')
+        }
+        return findingsCount
+    }
+
+    public async executeCustomPolicyChecksCommand(
+        opts: PolicyCommandOpts & { checkType: PolicyChecksCheckType; referencePolicyType?: PolicyChecksPolicyType }
+    ) {
+        await telemetry.accessanalyzer_iamPolicyChecksCustomChecks.run(async (span) => {
+            try {
+                span.record({
+                    cfnParameterFileUsed: opts.cfnParameterPathExists,
+                    checkType: opts.checkType,
+                    documentType: opts.documentType,
+                    inputPolicyType: 'None', // Note: This will change once JSON policy language is enabled for Custom policy checks
+                    referencePolicyType: opts.referencePolicyType ?? 'None',
+                })
+                const resp = await ChildProcess.run(opts.command, opts.args)
+                const findingsCount = this.handleCustomPolicyChecksCliResponse(resp.stdout)
+                span.record({
+                    findingsCount: findingsCount,
+                })
+            } catch (err: any) {
+                if (err.status === 2) {
+                    // CLI responds with a status code of 2 when findings are discovered
+                    const findingsCount = this.handleCustomPolicyChecksCliResponse(err.stdout.toString())
+                    span.record({
+                        findingsCount: findingsCount,
+                    })
+                } else {
+                    span.record({
+                        findingsCount: 0,
+                    })
+                    this.onCustomPolicyCheckResponse.fire([
+                        parseCliErrorMessage(err.message, opts.documentType),
+                        getResultCssColor('Error'),
+                    ])
+                }
+            }
+        })
+    }
+
+    public handleCustomPolicyChecksCliResponse(response: string): number {
+        let findingsCount = 0
+        let errorMessage: string | undefined
+        const diagnostics: vscode.Diagnostic[] = []
+        try {
+            const jsonOutput = JSON.parse(response)
+            if (jsonOutput.BlockingFindings.length === 0 && jsonOutput.NonBlockingFindings.length === 0) {
+                this.onCustomPolicyCheckResponse.fire([
+                    IamPolicyChecksConstants.CustomCheckSuccessNoFindings,
+                    getResultCssColor('Success'),
+                ])
+            } else {
+                // eslint-disable-next-line unicorn/no-array-for-each
+                jsonOutput.BlockingFindings.forEach((finding: any) => {
+                    this.pushCustomCheckDiagnostic(diagnostics, finding, true)
+                    errorMessage = getCheckNoNewAccessErrorMessage(finding)
+                    findingsCount++
+                })
+                // eslint-disable-next-line unicorn/no-array-for-each
+                jsonOutput.NonBlockingFindings.forEach((finding: any) => {
+                    this.pushCustomCheckDiagnostic(diagnostics, finding, false)
+                    findingsCount++
+                })
+                if (errorMessage) {
+                    this.onCustomPolicyCheckResponse.fire([errorMessage, getResultCssColor('Error')])
+                } else {
+                    this.onCustomPolicyCheckResponse.fire([
+                        IamPolicyChecksConstants.CustomCheckSuccessWithFindings,
+                        getResultCssColor('Warning'),
+                    ])
+                }
+                void vscode.commands.executeCommand('workbench.actions.view.problems')
+            }
+        } catch (err: any) {
+            this.onCustomPolicyCheckResponse.fire([err.message, getResultCssColor('Error')])
+        }
+        return findingsCount
+    }
+
+    public pushValidatePolicyDiagnostic(diagnostics: vscode.Diagnostic[], finding: any, isBlocking: boolean) {
+        diagnostics.push(
+            new vscode.Diagnostic(
+                new vscode.Range(0, 0, 0, 0),
+                `${finding.findingType}: ${finding.code} - ${finding.details.findingDetails} Resource name: ${finding.resourceName}, Policy name: ${finding.policyName}. Learn more: ${finding.details.learnMoreLink}`,
+                isBlocking ? vscode.DiagnosticSeverity.Error : vscode.DiagnosticSeverity.Warning
+            )
+        )
+        validatePolicyDiagnosticCollection.set(IamPolicyChecksWebview.editedDocumentUri, diagnostics)
+    }
+
+    public pushCustomCheckDiagnostic(diagnostics: vscode.Diagnostic[], finding: any, isBlocking: boolean) {
+        const findingMessage: string = finding.message.includes('existingPolicyDocument')
+            ? finding.message.replace('existingPolicyDocument', 'reference document')
+            : finding.message
+        const message = `${finding.findingType}: ${findingMessage} - Resource name: ${finding.resourceName}, Policy name: ${finding.policyName}`
+        if (finding.details.reasons) {
+            // eslint-disable-next-line unicorn/no-array-for-each
+            finding.details.reasons.forEach((reason: any) => {
+                diagnostics.push(
+                    new vscode.Diagnostic(
+                        new vscode.Range(0, 0, 0, 0),
+                        message + ` - ${reason.description}`,
+                        isBlocking ? vscode.DiagnosticSeverity.Error : vscode.DiagnosticSeverity.Warning
+                    )
+                )
+            })
+        } else {
+            diagnostics.push(
+                new vscode.Diagnostic(
+                    new vscode.Range(0, 0, 0, 0),
+                    message,
+                    isBlocking ? vscode.DiagnosticSeverity.Error : vscode.DiagnosticSeverity.Warning
+                )
+            )
+        }
+        customPolicyCheckDiagnosticCollection.set(IamPolicyChecksWebview.editedDocumentUri, diagnostics)
+    }
+}
+
+const Panel = VueWebview.compilePanel(IamPolicyChecksWebview)
+
+export async function renderIamPolicyChecks(context: ExtContext): Promise<VueWebviewPanel | undefined> {
+    const logger: Logger = getLogger()
+    try {
+        const client = new AccessAnalyzerClient({ region: context.regionProvider.defaultRegionId })
+        // Read from settings to auto-fill some inputs
+        const checkNoNewAccessFilePath: string = vscode.workspace
+            .getConfiguration()
+            .get(IamPolicyChecksConstants.CheckNoNewAccessFilePathSetting)!
+        const checkAccessNotGrantedFilePath: string = vscode.workspace
+            .getConfiguration()
+            .get(IamPolicyChecksConstants.CheckAccessNotGrantedFilePathSetting)!
+        const cfnParameterPath: string = vscode.workspace
+            .getConfiguration()
+            .get(IamPolicyChecksConstants.CfnParameterFilePathSetting)!
+        let checkNoNewAccessTextArea: string = ''
+        let checkAccessNotGrantedActionsTextArea: string = ''
+        let checkAccessNotGrantedResourcesTextArea: string = ''
+        let customChecksFileErrorMessage: string = ''
+        try {
+            if (checkNoNewAccessFilePath) {
+                checkNoNewAccessTextArea = await _readCustomChecksFile(checkNoNewAccessFilePath)
+            }
+            if (checkAccessNotGrantedFilePath) {
+                // Parse JSON into actions & resources here
+                const accessJson = JSON.parse(await _readCustomChecksFile(checkAccessNotGrantedFilePath))
+                checkAccessNotGrantedActionsTextArea = accessJson.actions || ''
+                checkAccessNotGrantedResourcesTextArea = accessJson.resources || ''
+            }
+        } catch (err: any) {
+            customChecksFileErrorMessage = err.message
+        }
+
+        const wv = new Panel(
+            context.extensionContext,
+            {
+                checkNoNewAccessFilePath: checkNoNewAccessFilePath ? checkNoNewAccessFilePath : '',
+                checkNoNewAccessTextArea,
+                checkAccessNotGrantedFilePath: checkAccessNotGrantedFilePath ? checkAccessNotGrantedFilePath : '',
+                checkAccessNotGrantedActionsTextArea,
+                checkAccessNotGrantedResourcesTextArea,
+                customChecksFileErrorMessage,
+                cfnParameterPath: cfnParameterPath ? cfnParameterPath : '',
+                pythonToolsInstalled: await arePythonToolsInstalled(),
+            },
+            client,
+            context.regionProvider.defaultRegionId
+        )
+        await wv.show({
+            viewColumn: vscode.ViewColumn.Beside,
+            title: localize('AWS.iamPolicyChecks.title', 'IAM Policy Checks'),
+        })
+        return wv
+    } catch (err) {
+        logger.error(err as Error)
+    }
+}
+
+// Helper function to get document contents from a path
+export async function _readCustomChecksFile(input: string): Promise<string> {
+    if (fs.existsSync(input)) {
+        return fs.readFileSync(input).toString()
+    } else {
+        try {
+            const [region, bucket, key] = parseS3Uri(input)
+            const s3Client = new S3Client(region)
+            const resp = await s3Client.getObject({ bucketName: bucket, key })
+            // Lint warning: this may evaluate to '[object Object]'. @typescript-eslint/no-base-to-string
+            // eslint-disable-next-line @typescript-eslint/no-base-to-string
+            return resp.objectBody.toString()
+        } catch (e: any) {
+            if (e.message.includes('Invalid S3 URI')) {
+                throw new PolicyChecksError('Invalid file path or S3 URI', 'FileReadError')
+            } else {
+                throw new PolicyChecksError(e.message, 'FileReadError')
+            }
+        }
+    }
+}
+
+// Check if Cfn and Tf tools are installed
+export async function arePythonToolsInstalled(): Promise<boolean> {
+    const logger: Logger = getLogger()
+    let cfnToolInstalled = true
+    let tfToolInstalled = true
+    try {
+        await ChildProcess.run('tf-policy-validator')
+    } catch (err: any) {
+        if (isProcessNotFoundErr(err.message)) {
+            tfToolInstalled = false
+            logger.error('Terraform Policy Validator is not found')
+        }
+    }
+    try {
+        await ChildProcess.run('cfn-policy-validator')
+    } catch (err: any) {
+        if (isProcessNotFoundErr(err.message)) {
+            cfnToolInstalled = false
+            logger.error('Cloudformation Policy Validator is not found')
+        }
+    }
+    return cfnToolInstalled && tfToolInstalled
+}
+
+export function isProcessNotFoundErr(errMsg: string) {
+    return errMsg.includes('command not found') || errMsg.includes('ENOENT')
+}
+
+// Since TypeScript can only get the CLI tool's error output as a string, we have to parse and sanitize it ourselves
+export function parseCliErrorMessage(message: string, documentType: PolicyChecksDocumentType): string {
+    const cfnMatch = message.match(/ERROR: .*/)
+    const botoMatch = message.match(/(?<=botocore\.exceptions\.).*/) // Boto errors have a special match
+    const terraformMatch = message.match(/AttributeError:.*/) // Terraform CLI responds with a different error schema... this catches invalid .json plans
+    if (
+        message.includes('The security token included in the request is invalid') ||
+        message.includes('The security token included in the request is expired')
+    ) {
+        return IamPolicyChecksConstants.InvalidAwsCredentials
+    } else if (message.includes(`Unexpected error occurred. 'AccessAnalyzer' object has no attribute 'check`)) {
+        return 'ERROR: The dependencies of the Python CLI tools are outdated.'
+    } else if (cfnMatch?.[0]) {
+        return cfnMatch[0]
+    } else if (botoMatch?.[0]) {
+        return botoMatch[0]
+    } else if (isProcessNotFoundErr(message)) {
+        return `Command not found, please install the ${documentType} Python CLI tool`
+    } else if (terraformMatch?.[0]) {
+        return 'ERROR: Unable to parse Terraform plan. Invalid Terraform plan schema detected.'
+    } else if (message.includes('Unexpected end of JSON input')) {
+        return 'ERROR: Unexpected input. Please enter a list of AWS actions, separated by commas.'
+    }
+    return message
+}
+
+export function getCheckNoNewAccessErrorMessage(finding: any) {
+    if (finding.findingType === 'ERROR') {
+        if (
+            finding.message.includes(
+                'The policy in existingPolicyDocument is invalid. Principal is a prohibited policy element.'
+            )
+        ) {
+            return "ERROR: The policy in reference document is invalid. Principal is a prohibited policy element. Review the reference document's policy type and try again."
+        }
+    }
+}
+
+export function getResultCssColor(resultType: PolicyChecksResult): string {
+    switch (resultType) {
+        case 'Success':
+            return 'var(--vscode-terminal-ansiGreen)'
+        case 'Warning':
+            return 'var(--vscode-debugConsole-warningForeground)'
+        case 'Error':
+            return 'var(--vscode-errorForeground)'
+    }
+}
+
+export function isCloudFormationTemplate(document: string): boolean {
+    const cfnFileTypes = ['.yaml', '.yml', '.json']
+    return cfnFileTypes.some((t) => document.endsWith(t))
+}
+
+export function isTerraformPlan(document: string) {
+    const terraformPlanFileTypes = ['.json']
+    return terraformPlanFileTypes.some((t) => document.endsWith(t))
+}
+
+export function isJsonPolicyLanguage(document: string) {
+    const policyLanguageFileTypes = ['.json']
+    return policyLanguageFileTypes.some((t) => document.endsWith(t))
+}
+
+export function getProfileName(): string | undefined {
+    // We neeed to split the name on 'profile:' to extract the correct profile name
+    return globals.awsContext.getCredentialProfileName()?.split('profile:')[1]
+}
+
+export class PolicyChecksError extends ToolkitError {
+    constructor(message: string, code: PolicyChecksErrorCode) {
+        super(message, { code })
+    }
+}
diff --git a/packages/core/src/awsService/accessanalyzer/vue/iamPolicyChecks.vue b/packages/core/src/awsService/accessanalyzer/vue/iamPolicyChecks.vue
new file mode 100644
index 00000000000..866e177eea9
--- /dev/null
+++ b/packages/core/src/awsService/accessanalyzer/vue/iamPolicyChecks.vue
@@ -0,0 +1,510 @@
+/*! * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */
+
+<template>
+    <div id="app">
+        <div>
+            <h1>IAM Policy Checks</h1>
+            <div v-if="!initialData.pythonToolsInstalled">
+                <h3>Getting Started</h3>
+                <p>
+                    Policy Checks requires Python 3.6+ and the respective Python CLI tools installed, based on the
+                    document type:
+                </p>
+                <ol>
+                    <li>
+                        <p>Install Python 3.6+</p>
+                    </li>
+                    <li>
+                        <code> pip install cfn-policy-validator==0.0.36 </code>
+                    </li>
+                    <li>
+                        <code> pip install tf-policy-validator==0.0.9 </code>
+                    </li>
+                    <li>
+                        <p>Provide IAM Roles Credentials</p>
+                    </li>
+                </ol>
+            </div>
+            <div style="justify-content: space-between">
+                <div style="display: flex">
+                    <div style="display: block; margin-right: 25px">
+                        <label for="select-document-type" style="display: block; margin-top: 5px; margin-bottom: 3px"
+                            >Select a Document Type</label
+                        >
+                        <select id="select-document-type" v-on:change="setDocumentType" v-model="documentType">
+                            <option value="CloudFormation">CloudFormation Template</option>
+                            <option value="Terraform Plan">Terraform Plan</option>
+                            <option value="JSON Policy Language">JSON Policy Language</option>
+                        </select>
+                    </div>
+                    <div style="display: block" v-if="documentType == 'JSON Policy Language'">
+                        <label for="select-policy-type" style="display: block; margin-top: 5px; margin-bottom: 3px"
+                            >Policy Type</label
+                        >
+                        <select
+                            id="select-policy-type"
+                            v-on:change="setValidatePolicyType"
+                            v-model="validatePolicyType"
+                        >
+                            <option value="Identity">Identity</option>
+                            <option value="Resource">Resource</option>
+                        </select>
+                    </div>
+                </div>
+                <label for="input-path" style="display: block; cursor: not-allowed; margin-top: 15px; opacity: 0.4">
+                    Open a file with the selected Document Type in the VS Code text editor to begin
+                </label>
+                <input
+                    type="text"
+                    style="
+                        display: flex;
+                        cursor: not-allowed;
+                        box-sizing: border-box;
+                        position: relative;
+                        opacity: 0.4;
+                        width: 70%;
+                    "
+                    id="input-path"
+                    placeholder="Input policy file path"
+                    readOnly
+                    disabled
+                    v-model="inputPath"
+                />
+            </div>
+            <div v-if="documentType == 'CloudFormation'">
+                <label for="input-path" style="display: block; margin-top: 15px; margin-bottom: 3px"
+                    >CloudFormation Parameter File (Optional)</label
+                >
+                <input
+                    type="text"
+                    style="display: flex; box-sizing: border-box; position: relative; margin-bottom: 10px; width: 70%"
+                    id="input-path"
+                    placeholder="CloudFormation Parameter File Path"
+                    v-on:change="setCfnParameterFilePath"
+                    v-model="initialData.cfnParameterPath"
+                />
+            </div>
+            <div v-if="documentType == 'Terraform Plan'" style="margin-top: 15px">
+                <p>
+                    For Terraform Plans, generate terraform plan file and convert the plan files to machine-readable
+                    JSON files before running policy checks.
+                </p>
+                <ol>
+                    <li><code>$terraform init</code></li>
+                    <li><code>$terraform plan -out tf.plan</code></li>
+                    <li><code>$terraform show -json -no-color tf.plan > tf.json</code></li>
+                    - For TF 0.12 and prior, use command
+                    <code>$terraform show tf.plan > tf.out</code>
+                    <li>View the converted JSON file in VS Code and run the desired policy check</li>
+                </ol>
+            </div>
+        </div>
+        <hr style="margin-top: 25px" />
+        <div class="validate-container">
+            <h2 style="border-bottom-style: none">Validate Policies</h2>
+            <div style="display: grid">
+                <p>
+                    Validate your policy against IAM policy grammar and AWS best practices. You can view policy
+                    validation check findings that include security warnings, errors, general warnings, and suggestions
+                    for your policy. These findings provide actionable recommendations that help you author policies
+                    that are functional and conform to security best practices.
+                </p>
+                <div style="display: grid">
+                    <div>
+                        <button
+                            class="button-theme-primary"
+                            v-on:click="runValidator"
+                            :disabled="validateButtonDisabled"
+                        >
+                            Run Policy Validation
+                        </button>
+                        <div style="margin-top: 5px">
+                            <p :style="{ color: validatePolicyResponseColor }">
+                                {{ validatePolicyResponse }}
+                            </p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <hr style="margin-top: 25px" />
+        <div class="custom-checks-container" v-if="documentType != 'JSON Policy Language'">
+            <h2 style="border-bottom-style: none">Custom Policy Checks</h2>
+            <div style="display: block">
+                <p>
+                    Validate your policy against your specified security standards using IAM Access Analyzer custom
+                    policy checks. You can check for new access against a reference policy, whether access is granted to
+                    a list of IAM actions and/or resource ARNs, or public access to supported resource types.
+                </p>
+                <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/access-analyzer-custom-policy-checks.html"
+                    >More about Custom Policy Checks</a
+                >
+                <div style="justify-content: space-between">
+                    <div style="display: flex">
+                        <div style="display: block; margin-right: 25px">
+                            <label for="select-check-type" style="display: block; margin-top: 15px; margin-bottom: 3px"
+                                >Select a Check Type</label
+                            >
+                            <select id="select-check-type" style="margin-bottom: 5px" v-on:change="setCheckType">
+                                <option value="CheckAccessNotGranted">CheckAccessNotGranted</option>
+                                <option value="CheckNoNewAccess">CheckNoNewAccess</option>
+                                <option value="CheckNoPublicAccess">CheckNoPublicAccess</option>
+                            </select>
+                        </div>
+                        <div
+                            style="display: block"
+                            v-if="
+                                (documentType == 'CloudFormation' || documentType == 'Terraform Plan') &&
+                                checkType == 'CheckNoNewAccess'
+                            "
+                        >
+                            <label
+                                for="select-reference-type"
+                                style="display: block; margin-top: 15px; margin-bottom: 3px"
+                                >Select a Reference Policy Type</label
+                            >
+                            <select
+                                id="select-reference-type"
+                                v-on:change="setCheckNoNewAccessPolicyType"
+                                v-model="checkNoNewAccessPolicyType"
+                            >
+                                <option value="Identity">Identity</option>
+                                <option value="Resource">Resource</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+                <div v-if="checkType == 'CheckNoNewAccess'">
+                    <div>
+                        <label for="input-path" style="display: block; margin-bottom: 3px"
+                            >Provide a reference file containing a JSON Policy Document</label
+                        >
+                        <input
+                            type="text"
+                            style="
+                                display: flex;
+                                box-sizing: border-box;
+                                position: relative;
+                                margin-bottom: 10px;
+                                width: 70%;
+                            "
+                            id="input-path"
+                            placeholder="Enter reference policy document"
+                            v-on:change="setCheckNoNewAccessFilePath"
+                            v-model="initialData.checkNoNewAccessFilePath"
+                        />
+                    </div>
+                    <div style="margin-top: 5px" v-if="initialData.customChecksFileErrorMessage">
+                        <p style="color: var(--vscode-errorForeground)">
+                            {{ initialData.customChecksFileErrorMessage }}
+                        </p>
+                    </div>
+                    <div>
+                        <label style="margin-bottom: 3px">Enter a JSON Policy Document</label>
+                        <textarea
+                            style="
+                                width: 100%;
+                                margin-bottom: 10px;
+                                font-family:
+                                    -apple-system,
+                                    BlinkMacSystemFont,
+                                    Segoe UI,
+                                    Roboto,
+                                    Helvetica,
+                                    Arial,
+                                    sans-serif,
+                                    Apple Color Emoji,
+                                    Segoe UI Emoji,
+                                    Segoe UI Symbol;
+                            "
+                            rows="30"
+                            v-model="initialData.checkNoNewAccessTextArea"
+                            v-on:change="setCheckNoNewAccessTextArea"
+                            placeholder="Reference policy document"
+                        ></textarea>
+                    </div>
+                </div>
+                <div v-if="checkType == 'CheckAccessNotGranted'">
+                    <div>
+                        <label for="input-path" style="display: block; margin-bottom: 3px">
+                            Provide a reference JSON file containing actions and/or resources. The file should be
+                            structured as follows:
+                            <code
+                                >{"actions": ["action1", "action2", "action3"], "resources": ["resource1", "resource2",
+                                "resource3"]}</code
+                            >
+                        </label>
+                        <input
+                            type="text"
+                            style="
+                                display: flex;
+                                box-sizing: border-box;
+                                position: relative;
+                                margin-bottom: 10px;
+                                width: 70%;
+                            "
+                            id="input-path"
+                            placeholder="File path to JSON file"
+                            v-on:change="setCheckAccessNotGrantedFilePath"
+                            v-model="initialData.checkAccessNotGrantedFilePath"
+                        />
+                    </div>
+                    <div style="margin-top: 5px" v-if="initialData.customChecksFileErrorMessage">
+                        <p style="color: var(--vscode-errorForeground)">
+                            {{ initialData.customChecksFileErrorMessage }}
+                        </p>
+                    </div>
+                    <div>
+                        <label style="margin-bottom: 3px">Enter a comma-separated list of actions</label>
+                        <textarea
+                            style="
+                                width: 100%;
+                                margin-bottom: 10px;
+                                font-family:
+                                    -apple-system,
+                                    BlinkMacSystemFont,
+                                    Segoe UI,
+                                    Roboto,
+                                    Helvetica,
+                                    Arial,
+                                    sans-serif,
+                                    Apple Color Emoji,
+                                    Segoe UI Emoji,
+                                    Segoe UI Symbol;
+                            "
+                            rows="15"
+                            v-on:change="setcheckAccessNotGrantedActionsTextArea"
+                            v-model="initialData.checkAccessNotGrantedActionsTextArea"
+                            placeholder="List of actions"
+                        ></textarea>
+                    </div>
+                    <div>
+                        <label style="margin-bottom: 3px">Enter a comma-separated list of resource ARNs</label>
+                        <textarea
+                            style="
+                                width: 100%;
+                                margin-bottom: 10px;
+                                font-family:
+                                    -apple-system,
+                                    BlinkMacSystemFont,
+                                    Segoe UI,
+                                    Roboto,
+                                    Helvetica,
+                                    Arial,
+                                    sans-serif,
+                                    Apple Color Emoji,
+                                    Segoe UI Emoji,
+                                    Segoe UI Symbol;
+                            "
+                            rows="15"
+                            v-on:change="setcheckAccessNotGrantedResourcesTextArea"
+                            v-model="initialData.checkAccessNotGrantedResourcesTextArea"
+                            placeholder="List of resource ARNs"
+                        ></textarea>
+                    </div>
+                </div>
+                <div style="display: grid">
+                    <b style="margin-bottom: 5px"
+                        >A charge is associated with each custom policy check. For more details about pricing, see
+                        <a href="https://aws.amazon.com/iam/access-analyzer/pricing/"> IAM Access Analyzer pricing </a>.
+                    </b>
+                    <div>
+                        <button
+                            class="button-theme-primary"
+                            style="margin-bottom: 5px"
+                            v-on:click="runCustomPolicyCheck"
+                            :disabled="customCheckButtonDisabled"
+                        >
+                            Run Custom Policy Check
+                        </button>
+                        <div style="margin-top: 5px">
+                            <p :style="{ color: customPolicyCheckResponseColor }">
+                                {{ customPolicyCheckResponse }}
+                            </p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue'
+import { WebviewClientFactory } from '../../../webviews/client'
+import saveData from '../../../webviews/mixins/saveData'
+import { IamPolicyChecksWebview } from './iamPolicyChecks'
+import { PolicyChecksDocumentType, PolicyChecksPolicyType } from './constants'
+import '@../../../resources/css/base.css'
+import '@../../../resources/css/securityIssue.css'
+
+const client = WebviewClientFactory.create<IamPolicyChecksWebview>()
+
+export default defineComponent({
+    mixins: [saveData],
+    data: () => ({
+        documentType: 'CloudFormation',
+        validatePolicyType: 'Identity',
+        checkNoNewAccessPolicyType: 'Identity',
+        checkType: 'CheckAccessNotGranted',
+        initialData: {
+            checkNoNewAccessFilePath: '',
+            checkNoNewAccessTextArea: '',
+            checkAccessNotGrantedFilePath: '',
+            checkAccessNotGrantedActionsTextArea: '',
+            checkAccessNotGrantedResourcesTextArea: '',
+            customChecksFileErrorMessage: '',
+            cfnParameterPath: '',
+            pythonToolsInstalled: false,
+        },
+        inputPath: '',
+        checkAccessNotGrantedPathPlaceholder: 'List of actions file path',
+        checkAccessNotGrantedActionsTextAreaPlaceholder: 'Enter a list of actions',
+        checkAccessNotGrantedResourcesTextAreaPlaceholder: 'Enter a list of resource ARNs',
+        validatePolicyResponse: '',
+        validatePolicyResponseColor: 'var(--vscode-errorForeground)',
+        customPolicyCheckResponse: '',
+        customPolicyCheckResponseColor: 'var(--vscode-errorForeground)',
+        validateButtonDisabled: false,
+        customCheckButtonDisabled: false,
+    }),
+    async created() {
+        this.initialData = (await client.init()) ?? this.initialData
+        client.onChangeInputPath((data: string) => {
+            this.inputPath = data
+        })
+        client.onChangeCheckNoNewAccessFilePath((data: string) => {
+            this.initialData.checkNoNewAccessFilePath = data
+            client
+                .readCustomChecksFile(this.initialData.checkNoNewAccessFilePath)
+                .then(response => {
+                    this.initialData.checkNoNewAccessTextArea = response
+                })
+                .catch(err => console.log(err))
+        })
+        client.onChangeCheckAccessNotGrantedFilePath((data: string) => {
+            this.initialData.checkAccessNotGrantedFilePath = data
+            client
+                .readCustomChecksJsonFile(this.initialData.checkAccessNotGrantedFilePath)
+                .then(response => {
+                    this.initialData.checkAccessNotGrantedActionsTextArea = response.actions
+                        ? response.actions.toString()
+                        : ''
+                    this.initialData.checkAccessNotGrantedResourcesTextArea = response.resources
+                        ? response.resources.toString()
+                        : ''
+                })
+                .catch(err => console.log(err))
+        })
+        client.onChangeCloudformationParameterFilePath((data: string) => {
+            this.initialData.cfnParameterPath = data
+        })
+        client.onValidatePolicyResponse((data: [string, string]) => {
+            this.validatePolicyResponse = data[0]
+            this.validatePolicyResponseColor = data[1]
+        })
+        client.onCustomPolicyCheckResponse((data: [string, string]) => {
+            this.customPolicyCheckResponse = data[0]
+            this.customPolicyCheckResponseColor = data[1]
+        })
+        client.onFileReadError((data: string) => {
+            this.initialData.customChecksFileErrorMessage = data
+        })
+    },
+    methods: {
+        setDocumentType: function (event: any) {
+            client.emitUiClick('accessanalyzer_selectDocumentType')
+            this.documentType = event.target.value
+        },
+        setValidatePolicyType: function (event: any) {
+            client.emitUiClick('accessanalyzer_selectInputPolicyType')
+            this.validatePolicyType = event.target.value
+        },
+        setCheckNoNewAccessPolicyType: function (event: any) {
+            client.emitUiClick('accessanalyzer_selectReferencePolicyType')
+            this.checkNoNewAccessPolicyType = event.target.value
+        },
+        setCheckType: function (event: any) {
+            client.emitUiClick('accessanalyzer_selectCustomCheckType')
+            this.checkType = event.target.value
+        },
+        setCheckNoNewAccessFilePath: function (event: any) {
+            client.emitUiClick('accessanalyzer_selectCheckNoNewAccessFilePath')
+            this.initialData.checkNoNewAccessFilePath = event.target.value
+            client
+                .readCustomChecksFile(this.initialData.checkNoNewAccessFilePath)
+                .then(response => {
+                    this.initialData.checkNoNewAccessTextArea = response
+                })
+                .catch(err => console.log(err))
+        },
+        setCheckNoNewAccessTextArea: function (event: any) {
+            this.initialData.checkNoNewAccessTextArea = event.target.value
+            this.initialData.checkNoNewAccessFilePath = ''
+        },
+        setCheckAccessNotGrantedFilePath: function (event: any) {
+            client.emitUiClick('accessanalyzer_selectCheckAccessNotGrantedFilePath')
+            this.initialData.checkAccessNotGrantedFilePath = event.target.value
+            client
+                .readCustomChecksJsonFile(this.initialData.checkAccessNotGrantedFilePath)
+                .then(response => {
+                    this.initialData.checkAccessNotGrantedActionsTextArea = response.actions
+                        ? response.actions.toString()
+                        : ''
+                    this.initialData.checkAccessNotGrantedResourcesTextArea = response.resources
+                        ? response.resources.toString()
+                        : ''
+                })
+                .catch(err => console.log(err))
+        },
+        setcheckAccessNotGrantedActionsTextArea: function (event: any) {
+            this.initialData.checkAccessNotGrantedActionsTextArea = event.target.value
+            this.initialData.checkAccessNotGrantedFilePath = ''
+        },
+        setcheckAccessNotGrantedResourcesTextArea: function (event: any) {
+            this.initialData.checkAccessNotGrantedResourcesTextArea = event.target.value
+            this.initialData.checkAccessNotGrantedFilePath = ''
+        },
+        setCfnParameterFilePath: function (event: any) {
+            client.emitUiClick('accessanalyzer_selectCfnParameterFilePath')
+            this.initialData.cfnParameterPath = event.target.value
+        },
+        runValidator: async function () {
+            this.validateButtonDisabled = true
+            client.emitUiClick('accessanalyzer_runValidatePolicy')
+            await client.validatePolicy(
+                this.documentType as PolicyChecksDocumentType,
+                this.validatePolicyType as PolicyChecksPolicyType,
+                this.initialData.cfnParameterPath
+            )
+            this.validateButtonDisabled = false
+        },
+        runCustomPolicyCheck: async function () {
+            this.customCheckButtonDisabled = true
+            client.emitUiClick('accessanalyzer_runCustomPolicyCheck')
+            if (this.checkType == 'CheckNoNewAccess') {
+                await client.checkNoNewAccess(
+                    this.documentType as PolicyChecksDocumentType,
+                    this.checkNoNewAccessPolicyType as PolicyChecksPolicyType,
+                    this.initialData.checkNoNewAccessTextArea,
+                    this.initialData.cfnParameterPath
+                )
+            } else if (this.checkType == 'CheckAccessNotGranted') {
+                await client.checkAccessNotGranted(
+                    this.documentType as PolicyChecksDocumentType,
+                    this.initialData.checkAccessNotGrantedActionsTextArea,
+                    this.initialData.checkAccessNotGrantedResourcesTextArea,
+                    this.initialData.cfnParameterPath
+                )
+            } else if (this.checkType == 'CheckNoPublicAccess') {
+                await client.checkNoPublicAccess(
+                    this.documentType as PolicyChecksDocumentType,
+                    this.initialData.cfnParameterPath
+                )
+            }
+            this.customCheckButtonDisabled = false
+        },
+    },
+    computed: {},
+})
+</script>
diff --git a/packages/core/src/awsService/accessanalyzer/vue/index.ts b/packages/core/src/awsService/accessanalyzer/vue/index.ts
new file mode 100644
index 00000000000..153c86daa69
--- /dev/null
+++ b/packages/core/src/awsService/accessanalyzer/vue/index.ts
@@ -0,0 +1,16 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { createApp } from 'vue'
+import component from './iamPolicyChecks.vue'
+
+const create = () => createApp(component)
+const app = create()
+app.mount('#vue-app')
+
+window.addEventListener('remount', () => {
+    app.unmount()
+    create().mount('#vue-app')
+})
diff --git a/packages/core/src/awsService/apigateway/activation.ts b/packages/core/src/awsService/apigateway/activation.ts
new file mode 100644
index 00000000000..78add0d3e67
--- /dev/null
+++ b/packages/core/src/awsService/apigateway/activation.ts
@@ -0,0 +1,37 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { RestApiNode } from './explorer/apiNodes'
+import { invokeRemoteRestApi } from './vue/invokeRemoteRestApi'
+import { copyUrlCommand } from './commands/copyUrl'
+import { ExtContext } from '../../shared/extensions'
+import { Commands } from '../../shared/vscode/commands2'
+import { TreeNode } from '../../shared/treeview/resourceTreeDataProvider'
+import { getSourceNode } from '../../shared/utilities/treeNodeUtils'
+
+/**
+ * Activate API Gateway functionality for the extension.
+ */
+export async function activate(activateArguments: {
+    extContext: ExtContext
+    outputChannel: vscode.OutputChannel
+}): Promise<void> {
+    const extensionContext = activateArguments.extContext.extensionContext
+    const regionProvider = activateArguments.extContext.regionProvider
+    extensionContext.subscriptions.push(
+        Commands.register('aws.apig.copyUrl', async (node: RestApiNode | TreeNode) => {
+            const sourceNode = getSourceNode<RestApiNode>(node)
+            await copyUrlCommand(sourceNode, regionProvider)
+        }),
+        Commands.register('aws.apig.invokeRemoteRestApi', async (node: RestApiNode | TreeNode) => {
+            const sourceNode = getSourceNode<RestApiNode>(node)
+            await invokeRemoteRestApi(activateArguments.extContext, {
+                apiNode: sourceNode,
+                outputChannel: activateArguments.outputChannel,
+            })
+        })
+    )
+}
diff --git a/packages/core/src/awsService/apigateway/commands/copyUrl.ts b/packages/core/src/awsService/apigateway/commands/copyUrl.ts
new file mode 100644
index 00000000000..7c19ffa9254
--- /dev/null
+++ b/packages/core/src/awsService/apigateway/commands/copyUrl.ts
@@ -0,0 +1,98 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { copyToClipboard } from '../../../shared/utilities/messages'
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+import { RestApiNode } from '../explorer/apiNodes'
+import * as picker from '../../../shared/ui/picker'
+import * as vscode from 'vscode'
+import { ProgressLocation } from 'vscode'
+
+import { Stage } from '@aws-sdk/client-api-gateway'
+import { ApiGatewayClient } from '../../../shared/clients/apiGateway'
+import { defaultDnsSuffix, RegionProvider } from '../../../shared/regions/regionProvider'
+import { getLogger } from '../../../shared/logger/logger'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+
+interface StageInvokeUrlQuickPick extends vscode.QuickPickItem {
+    // override declaration so this can't be undefined
+    detail: string
+}
+
+export async function copyUrlCommand(node: RestApiNode, regionProvider: RegionProvider): Promise<void> {
+    const region = node.regionCode
+    const dnsSuffix = regionProvider.getDnsSuffixForRegion(region) || defaultDnsSuffix
+    const client = new ApiGatewayClient(region)
+
+    let stages: Stage[]
+    try {
+        stages = await vscode.window.withProgress(
+            {
+                cancellable: false,
+                location: ProgressLocation.Window,
+            },
+            async (progress) => {
+                progress.report({
+                    message: localize('AWS.apig.loadingStages', 'Loading stage list for API: {0}', node.name),
+                })
+                return (await client.getStages(node.id)).item || []
+            }
+        )
+    } catch (e) {
+        getLogger().error(`Failed to load stages: %s`, e)
+        telemetry.apigateway_copyUrl.emit({ result: 'Failed' })
+        return
+    }
+
+    const quickPickItems = stages.map<StageInvokeUrlQuickPick>((stage) => ({
+        label: stage.stageName!,
+        detail: buildDefaultApiInvokeUrl(node.id, region, dnsSuffix, stage.stageName!),
+    }))
+
+    if (quickPickItems.length === 0) {
+        void vscode.window.showInformationMessage(
+            localize('AWS.apig.copyUrlNoStages', "Failed to copy URL because '{0}' has no stages", node.name)
+        )
+        telemetry.apigateway_copyUrl.emit({ result: 'Failed' })
+        return
+    } else if (quickPickItems.length === 1) {
+        const url = quickPickItems[0].detail
+        await copyToClipboard(url, 'URL')
+        telemetry.apigateway_copyUrl.emit({ result: 'Succeeded' })
+        return
+    }
+
+    const quickPick = picker.createQuickPick({
+        options: {
+            ignoreFocusOut: true,
+            title: localize('AWS.apig.selectStage', 'Select an API stage'),
+        },
+        items: quickPickItems,
+    })
+
+    const choices = await picker.promptUser({
+        picker: quickPick,
+        onDidTriggerButton: (button, resolve, reject) => {
+            if (button === vscode.QuickInputButtons.Back) {
+                resolve(undefined)
+            }
+        },
+    })
+    const pickerResponse = picker.verifySinglePickerOutput<StageInvokeUrlQuickPick>(choices)
+
+    if (!pickerResponse) {
+        telemetry.apigateway_copyUrl.emit({ result: 'Cancelled' })
+        return
+    }
+
+    const url = pickerResponse.detail
+    await copyToClipboard(url, 'URL')
+    telemetry.apigateway_copyUrl.emit({ result: 'Succeeded' })
+}
+
+export function buildDefaultApiInvokeUrl(apiId: string, region: string, dnsSuffix: string, stage: string): string {
+    return `https://${apiId}.execute-api.${region}.${dnsSuffix}/${stage}`
+}
diff --git a/packages/core/src/awsService/apigateway/explorer/apiGatewayNodes.ts b/packages/core/src/awsService/apigateway/explorer/apiGatewayNodes.ts
new file mode 100644
index 00000000000..c23b6cb972f
--- /dev/null
+++ b/packages/core/src/awsService/apigateway/explorer/apiGatewayNodes.ts
@@ -0,0 +1,63 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as vscode from 'vscode'
+
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
+import { compareTreeItems, makeChildrenNodes } from '../../../shared/treeview/utils'
+import { ApiGatewayClient } from '../../../shared/clients/apiGateway'
+import { RestApi } from '@aws-sdk/client-api-gateway'
+import { toArrayAsync, toMap, updateInPlace } from '../../../shared/utilities/collectionUtils'
+import { RestApiNode } from './apiNodes'
+
+/**
+ * An AWS Explorer node representing the API Gateway (v1) service.
+ */
+export class ApiGatewayNode extends AWSTreeNodeBase {
+    private readonly apiNodes: Map<string, RestApiNode>
+
+    public constructor(
+        private readonly partitionId: string,
+        public override readonly regionCode: string,
+        private readonly client = new ApiGatewayClient(regionCode)
+    ) {
+        super('API Gateway', vscode.TreeItemCollapsibleState.Collapsed)
+        this.apiNodes = new Map<string, RestApiNode>()
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        return await makeChildrenNodes({
+            getChildNodes: async () => {
+                await this.updateChildren()
+
+                return [...this.apiNodes.values()]
+            },
+            getNoChildrenPlaceholderNode: async () =>
+                new PlaceholderNode(
+                    this,
+                    localize('AWS.explorerNode.apigateway.noApis', '[No API Gateway REST APIs found]')
+                ),
+            sort: (nodeA, nodeB) => compareTreeItems(nodeA, nodeB),
+        })
+    }
+
+    public async updateChildren(): Promise<void> {
+        const apis: Map<string, RestApi> = toMap(
+            await toArrayAsync(this.client.listApis()),
+            (configuration) => `${configuration.name} (${configuration.id})`
+        )
+
+        updateInPlace(
+            this.apiNodes,
+            apis.keys(),
+            (key) => this.apiNodes.get(key)!.update(apis.get(key)!),
+            (key) => new RestApiNode(this, this.partitionId, this.regionCode, apis.get(key)!)
+        )
+    }
+}
diff --git a/src/apigateway/explorer/apiNodes.ts b/packages/core/src/awsService/apigateway/explorer/apiNodes.ts
similarity index 79%
rename from src/apigateway/explorer/apiNodes.ts
rename to packages/core/src/awsService/apigateway/explorer/apiNodes.ts
index daf533a2959..02280a74368 100644
--- a/src/apigateway/explorer/apiNodes.ts
+++ b/packages/core/src/awsService/apigateway/explorer/apiNodes.ts
@@ -1,11 +1,11 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { AWSResourceNode } from '../../shared/treeview/nodes/awsResourceNode'
-import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
-import { RestApi } from 'aws-sdk/clients/apigateway'
+import { AWSResourceNode } from '../../../shared/treeview/nodes/awsResourceNode'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { RestApi } from '@aws-sdk/client-api-gateway'
 
 export class RestApiNode extends AWSTreeNodeBase implements AWSResourceNode {
     public override id!: string
diff --git a/packages/core/src/awsService/apigateway/vue/index.ts b/packages/core/src/awsService/apigateway/vue/index.ts
new file mode 100644
index 00000000000..fad0b0d6ce9
--- /dev/null
+++ b/packages/core/src/awsService/apigateway/vue/index.ts
@@ -0,0 +1,16 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { createApp } from 'vue'
+import component from './invokeApi.vue'
+
+const create = () => createApp(component)
+const app = create()
+app.mount('#vue-app')
+
+window.addEventListener('remount', () => {
+    app.unmount()
+    create().mount('#vue-app')
+})
diff --git a/src/apigateway/vue/invokeApi.vue b/packages/core/src/awsService/apigateway/vue/invokeApi.vue
similarity index 94%
rename from src/apigateway/vue/invokeApi.vue
rename to packages/core/src/awsService/apigateway/vue/invokeApi.vue
index 2f80a679651..8588109d559 100644
--- a/src/apigateway/vue/invokeApi.vue
+++ b/packages/core/src/awsService/apigateway/vue/invokeApi.vue
@@ -1,4 +1,4 @@
-/*! * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */
+/*! * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */
 
 <template>
     <div id="app">
@@ -48,8 +48,8 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue'
-import { WebviewClientFactory } from '../../webviews/client'
-import saveData from '../../webviews/mixins/saveData'
+import { WebviewClientFactory } from '../../../webviews/client'
+import saveData from '../../../webviews/mixins/saveData'
 import { InvokeRemoteRestApiInitialData, RemoteRestInvokeWebview } from './invokeRemoteRestApi'
 
 const client = WebviewClientFactory.create<RemoteRestInvokeWebview>()
diff --git a/src/apigateway/vue/invokeRemoteRestApi.ts b/packages/core/src/awsService/apigateway/vue/invokeRemoteRestApi.ts
similarity index 83%
rename from src/apigateway/vue/invokeRemoteRestApi.ts
rename to packages/core/src/awsService/apigateway/vue/invokeRemoteRestApi.ts
index 99253fa7ef0..4e8389c89bc 100644
--- a/src/apigateway/vue/invokeRemoteRestApi.ts
+++ b/packages/core/src/awsService/apigateway/vue/invokeRemoteRestApi.ts
@@ -1,20 +1,20 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as vscode from 'vscode'
 import { RestApiNode } from '../explorer/apiNodes'
-import { getLogger, Logger } from '../../shared/logger'
+import { getLogger, Logger } from '../../../shared/logger/logger'
 
-import { toArrayAsync } from '../../shared/utilities/collectionUtils'
-import { Resource } from 'aws-sdk/clients/apigateway'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { Result } from '../../shared/telemetry/telemetry'
-import { VueWebview } from '../../webviews/main'
-import { ExtContext } from '../../shared/extensions'
-import { DefaultApiGatewayClient } from '../../shared/clients/apiGatewayClient'
-import { telemetry } from '../../shared/telemetry/telemetry'
+import { toArrayAsync } from '../../../shared/utilities/collectionUtils'
+import { Resource } from '@aws-sdk/client-api-gateway'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { Result } from '../../../shared/telemetry/telemetry'
+import { VueWebview } from '../../../webviews/main'
+import { ExtContext } from '../../../shared/extensions'
+import { ApiGatewayClient } from '../../../shared/clients/apiGateway'
+import { telemetry } from '../../../shared/telemetry/telemetry'
 
 interface InvokeApiMessage {
     region: string
@@ -42,16 +42,17 @@ export interface InvokeRemoteRestApiInitialData {
 }
 
 export class RemoteRestInvokeWebview extends VueWebview {
+    public static readonly sourcePath: string = 'src/awsService/apigateway/vue/index.js'
     public readonly id = 'remoteInvoke'
-    public readonly source = 'src/apigateway/vue/index.js'
+
     private readonly logger = getLogger()
 
     public constructor(
         private readonly data: InvokeRemoteRestApiInitialData,
         private readonly channel: vscode.OutputChannel,
-        private readonly client = new DefaultApiGatewayClient(data.Region)
+        private readonly client = new ApiGatewayClient(data.Region)
     ) {
-        super()
+        super(RemoteRestInvokeWebview.sourcePath)
     }
 
     public init(): typeof this.data {
@@ -114,7 +115,7 @@ export async function invokeRemoteRestApi(
     const logger: Logger = getLogger()
 
     try {
-        const client = new DefaultApiGatewayClient(params.apiNode.regionCode)
+        const client = new ApiGatewayClient(params.apiNode.regionCode)
         logger.info(`Loading API Resources for API ${params.apiNode.name} (id: ${params.apiNode.id})`)
         const resources = (await toArrayAsync(client.getResourcesForApi(params.apiNode.id)))
             .sort((a, b) => a.path!.localeCompare(b.path!))
@@ -124,7 +125,7 @@ export async function invokeRemoteRestApi(
                     [curr.id!]: curr,
                 }
             }, {})
-        logger.debug(`Loaded: ${resources}`)
+        logger.debug(`Loaded: %O`, resources)
 
         // something is wrong if the paths aren't defined...
         // const sortResources = (a: [string, Resource], b: [string, Resource]) => a[1].path!.localeCompare(b[1].path!)
@@ -157,7 +158,7 @@ export function listValidMethods(resource: Resource): string[] {
     // you can simultaneously declare a resource that supports ANY in conjunction with conventional methods
     const isAny = (method: string) => method.toUpperCase() === 'ANY'
     const methods = resource.resourceMethods !== undefined ? Object.keys(resource.resourceMethods) : []
-    if (methods.find(isAny)) {
+    if (methods.some(isAny)) {
         return supportedOperations
     }
 
diff --git a/packages/core/src/awsService/appBuilder/activation.ts b/packages/core/src/awsService/appBuilder/activation.ts
new file mode 100644
index 00000000000..93cf1119448
--- /dev/null
+++ b/packages/core/src/awsService/appBuilder/activation.ts
@@ -0,0 +1,228 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import globals from '../../shared/extensionGlobals'
+import { ExtContext } from '../../shared/extensions'
+import { Commands, VsCodeCommandArg } from '../../shared/vscode/commands2'
+import { ToolView } from '../../awsexplorer/toolView'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { activateViewsShared, registerToolView } from '../../awsexplorer/activationShared'
+import { setContext } from '../../shared/vscode/setContext'
+import { fs } from '../../shared/fs/fs'
+import { AppBuilderRootNode } from './explorer/nodes/rootNode'
+import {
+    initWalkthroughProjectCommand,
+    walkthroughContextString,
+    getOrInstallCliWrapper,
+    installLocalStackExtension,
+} from './walkthrough'
+import { getLogger } from '../../shared/logger/logger'
+import path from 'path'
+import { TreeNode } from '../../shared/treeview/resourceTreeDataProvider'
+import { runBuild } from '../../shared/sam/build'
+import { runOpenHandler, runOpenTemplate } from './utils'
+import { ResourceNode } from './explorer/nodes/resourceNode'
+import { getSyncWizard, runSync } from '../../shared/sam/sync'
+import { getDeployWizard, runDeploy } from '../../shared/sam/deploy'
+import { DeployTypeWizard } from './wizards/deployTypeWizard'
+import { createNewServerlessLandProject } from './serverlessLand/main'
+import { lambdaToSam } from './lambda2sam/lambda2sam'
+export const templateToOpenAppComposer = 'aws.toolkit.appComposer.templateToOpenOnStart'
+
+/**
+ * Activates the AWS Explorer UI and related functionality.
+ *
+ * IMPORTANT: Views that should work in all vscode environments (node or web)
+ * should be setup in {@link activateViewsShared}.
+ */
+export async function activate(context: ExtContext): Promise<void> {
+    // recover context variables from global state when activate
+    const walkthroughSelected = globals.globalState.get<string>(walkthroughContextString)
+    if (walkthroughSelected !== undefined) {
+        await setContext(walkthroughContextString, walkthroughSelected)
+    }
+
+    await registerAppBuilderCommands(context)
+
+    const appBuilderNode: ToolView[] = [
+        {
+            nodes: [AppBuilderRootNode.instance],
+            view: 'aws.appBuilder',
+            refreshCommands: [AppBuilderRootNode.instance.refreshAppBuilderExplorer],
+        },
+        {
+            nodes: [AppBuilderRootNode.instance],
+            view: 'aws.appBuilderForFileExplorer',
+            refreshCommands: [AppBuilderRootNode.instance.refreshAppBuilderForFileExplorer],
+        },
+    ]
+
+    const watcher = vscode.workspace.createFileSystemWatcher('**/{template.yaml,template.yml,samconfig.toml}')
+    watcher.onDidChange(async (uri) => runRefreshAppBuilder(uri, 'changed'))
+    watcher.onDidCreate(async (uri) => runRefreshAppBuilder(uri, 'created'))
+    watcher.onDidDelete(async (uri) => runRefreshAppBuilder(uri, 'deleted'))
+
+    for (const viewNode of appBuilderNode) {
+        registerToolView(viewNode, context.extensionContext)
+    }
+
+    await openApplicationComposerAfterReload()
+}
+
+async function runRefreshAppBuilder(uri: vscode.Uri, event: string) {
+    getLogger().debug(`${uri.fsPath} ${event}, refreshing appBuilder`)
+    await vscode.commands.executeCommand('aws.appBuilderForFileExplorer.refresh')
+    await vscode.commands.executeCommand('aws.appBuilder.refresh')
+}
+
+/**
+ * To support open template in AppComposer after extension reload.
+ * This typically happens when user create project from walkthrough
+ * and added a new folder to an empty workspace.
+ *
+ * Checkes templateToOpenAppComposer in global and opens template
+ * Directly return if templateToOpenAppComposer is undefined
+ */
+export async function openApplicationComposerAfterReload(): Promise<void> {
+    const templatesToOpen = globals.globalState.get<[string]>(templateToOpenAppComposer)
+    // undefined
+    if (!templatesToOpen) {
+        return
+    }
+
+    for (const template of templatesToOpen) {
+        const templateUri = vscode.Uri.file(template)
+        const templateFolder = vscode.Uri.file(path.dirname(template))
+        const basename = path.basename(template)
+        // ignore templates that doesn't belong to current workspace, ignore if not template
+        if (
+            !vscode.workspace.getWorkspaceFolder(templateFolder) ||
+            (basename !== 'template.yaml' && basename !== 'template.yml')
+        ) {
+            continue
+        }
+
+        await vscode.commands.executeCommand('workbench.action.focusFirstEditorGroup')
+        await vscode.commands.executeCommand('aws.openInApplicationComposer', templateUri)
+
+        if (await fs.exists(vscode.Uri.joinPath(templateFolder, 'README.md'))) {
+            await vscode.commands.executeCommand('workbench.action.focusFirstEditorGroup')
+            await vscode.commands.executeCommand(
+                'markdown.showPreview',
+                vscode.Uri.joinPath(templateFolder, 'README.md')
+            )
+        }
+    }
+    // set to undefined
+    await globals.globalState.update(templateToOpenAppComposer, undefined)
+}
+
+async function setWalkthrough(walkthroughSelected: string = 'S3'): Promise<void> {
+    await setContext(walkthroughContextString, walkthroughSelected)
+    await globals.globalState.update(walkthroughContextString, walkthroughSelected)
+}
+
+/**
+ *
+ * @param context VScode Context
+ */
+async function registerAppBuilderCommands(context: ExtContext): Promise<void> {
+    const source = 'AppBuilderWalkthrough'
+    context.extensionContext.subscriptions.push(
+        Commands.register({ id: 'aws.toolkit.lambda.convertToSam', autoconnect: true }, async (lambdaNode) => {
+            await telemetry.appbuilder_lambda2sam.run(async () => {
+                telemetry.record({ source: 'explorer' })
+                await lambdaToSam(lambdaNode)
+            })
+        }),
+        Commands.register('aws.toolkit.installSAMCLI', async () => {
+            await getOrInstallCliWrapper('sam-cli', source)
+        }),
+        Commands.register('aws.toolkit.installAWSCLI', async () => {
+            await getOrInstallCliWrapper('aws-cli', source)
+        }),
+        Commands.register('aws.toolkit.installDocker', async () => {
+            await getOrInstallCliWrapper('docker', source)
+        }),
+        Commands.register('aws.toolkit.installLocalStack', async () => {
+            await installLocalStackExtension(source)
+        }),
+        Commands.register('aws.toolkit.installFinch', async () => {
+            await getOrInstallCliWrapper('finch', source)
+        }),
+        Commands.register('aws.toolkit.lambda.setWalkthroughToAPI', async () => {
+            await setWalkthrough('API')
+        }),
+        Commands.register('aws.toolkit.lambda.setWalkthroughToS3', async () => {
+            await setWalkthrough('S3')
+        }),
+        Commands.register('aws.toolkit.lambda.setWalkthroughToVisual', async () => {
+            await setWalkthrough('Visual')
+        }),
+        Commands.register('aws.toolkit.lambda.setWalkthroughToCustomTemplate', async () => {
+            await setWalkthrough('CustomTemplate')
+        }),
+        Commands.register('aws.toolkit.lambda.initializeWalkthroughProject', async (): Promise<void> => {
+            await telemetry.appBuilder_selectWalkthroughTemplate.run(async () => await initWalkthroughProjectCommand())
+            await globals.globalState.update('aws.toolkit.lambda.walkthroughCompleted', true)
+        }),
+        Commands.register('aws.toolkit.lambda.walkthrough.credential', async (): Promise<void> => {
+            await vscode.commands.executeCommand('aws.toolkit.auth.manageConnections', source)
+        }),
+        Commands.register(
+            { id: `aws.toolkit.lambda.openWalkthrough`, compositeKey: { 1: 'source' } },
+            async (_: VsCodeCommandArg, source?: string) => {
+                telemetry.appBuilder_startWalkthrough.emit({ source: source })
+                await vscode.commands.executeCommand(
+                    'workbench.action.openWalkthrough',
+                    'amazonwebservices.aws-toolkit-vscode#aws.toolkit.lambda.walkthrough'
+                )
+            }
+        ),
+        Commands.register(
+            {
+                id: 'aws.appBuilder.build',
+                autoconnect: false,
+            },
+            async (arg?: TreeNode | undefined) => await telemetry.sam_build.run(async () => await runBuild(arg))
+        ),
+        Commands.register({ id: 'aws.appBuilder.openTemplate', autoconnect: false }, async (arg: TreeNode) =>
+            telemetry.appBuilder_openTemplate.run(async (span) => {
+                if (arg) {
+                    span.record({ source: 'AppBuilderOpenTemplate' })
+                } else {
+                    span.record({ source: 'commandPalette' })
+                }
+                await runOpenTemplate(arg)
+            })
+        ),
+        Commands.register({ id: 'aws.appBuilder.openHandler', autoconnect: false }, async (arg: ResourceNode) =>
+            telemetry.lambda_goToHandler.run(async (span) => {
+                span.record({ source: 'AppBuilderOpenHandler' })
+                await runOpenHandler(arg)
+            })
+        ),
+        Commands.register({ id: 'aws.appBuilder.deploy', autoconnect: true }, async (arg) => {
+            const wizard = new DeployTypeWizard(
+                await getSyncWizard('infra', arg, undefined, false),
+                await getDeployWizard(arg, false)
+            )
+            const choices = await wizard.run()
+            if (choices) {
+                if (choices.choice === 'deploy' && choices.deployParam) {
+                    await runDeploy(arg, choices.deployParam)
+                } else if (choices.choice === 'sync' && choices.syncParam) {
+                    await runSync('infra', arg, undefined, choices.syncParam)
+                }
+            }
+        }),
+        Commands.register({ id: 'aws.toolkit.lambda.createServerlessLandProject', autoconnect: false }, async () => {
+            await telemetry.lambda_createServerlessLandProject.run(async () => {
+                await createNewServerlessLandProject(context)
+            })
+        })
+    )
+}
diff --git a/packages/core/src/awsService/appBuilder/explorer/detectSamProjects.ts b/packages/core/src/awsService/appBuilder/explorer/detectSamProjects.ts
new file mode 100644
index 00000000000..511217481b3
--- /dev/null
+++ b/packages/core/src/awsService/appBuilder/explorer/detectSamProjects.ts
@@ -0,0 +1,63 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { SamAppLocation } from './samProject'
+import { getLogger } from '../../../shared/logger/logger'
+import { getProjectRootUri } from '../../../shared/sam/utils'
+
+export async function detectSamProjects(): Promise<SamAppLocation[]> {
+    const workspaceFolders = vscode.workspace.workspaceFolders
+
+    if (!workspaceFolders) {
+        return []
+    }
+
+    const results = new Map<string, SamAppLocation>()
+    const projects = (await Promise.all(workspaceFolders.map(detectSamProjectsFromWorkspaceFolder))).reduce(
+        (a, b) => a.concat(b),
+        []
+    )
+
+    for (const p of projects) {
+        results.set(p.samTemplateUri.toString(), p)
+    }
+
+    return Array.from(results.values())
+}
+
+async function detectSamProjectsFromWorkspaceFolder(
+    workspaceFolder: vscode.WorkspaceFolder
+): Promise<SamAppLocation[]> {
+    const result: SamAppLocation[] = []
+    const samTemplateFiles = await getFiles(workspaceFolder, '**/template.{yml,yaml}', '**/.aws-sam/**')
+    for (const samTemplateFile of samTemplateFiles) {
+        const project = {
+            samTemplateUri: samTemplateFile,
+            workspaceFolder: workspaceFolder,
+            projectRoot: getProjectRootUri(samTemplateFile),
+        }
+        result.push(project)
+    }
+    return result
+}
+
+export async function getFiles(
+    workspaceFolder: vscode.WorkspaceFolder,
+    pattern: string,
+    buildArtifactFolderPattern?: string
+): Promise<vscode.Uri[]> {
+    try {
+        const globPattern = new vscode.RelativePattern(workspaceFolder, pattern)
+        const excludePattern = buildArtifactFolderPattern
+            ? new vscode.RelativePattern(workspaceFolder, buildArtifactFolderPattern)
+            : undefined
+
+        return await vscode.workspace.findFiles(globPattern, excludePattern)
+    } catch (error) {
+        getLogger().error(`Failed to find files with pattern ${pattern}:`, error)
+        return []
+    }
+}
diff --git a/packages/core/src/awsService/appBuilder/explorer/nodes/appNode.ts b/packages/core/src/awsService/appBuilder/explorer/nodes/appNode.ts
new file mode 100644
index 00000000000..b9c00d59c79
--- /dev/null
+++ b/packages/core/src/awsService/appBuilder/explorer/nodes/appNode.ts
@@ -0,0 +1,93 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as vscode from 'vscode'
+import { getLogger } from '../../../../shared/logger/logger'
+import { ResourceTreeEntity, SamAppLocation, getApp, getStackName } from '../samProject'
+import { ResourceNode, generateResourceNodes } from './resourceNode'
+import { TreeNode } from '../../../../shared/treeview/resourceTreeDataProvider'
+import { createPlaceholderItem } from '../../../../shared/treeview/utils'
+import { getIcon } from '../../../../shared/icons'
+import { getSamCliContext } from '../../../../shared/sam/cli/samCliContext'
+import { SamCliListResourcesParameters } from '../../../../shared/sam/cli/samCliListResources'
+import { getDeployedResources, StackResource } from '../../../../lambda/commands/listSamResources'
+import * as path from 'path'
+import { generateStackNode } from './deployedStack'
+
+export class AppNode implements TreeNode {
+    public readonly id = this.location.samTemplateUri.toString()
+    public readonly resource = this.location
+    public readonly label = path.join(
+        this.location.workspaceFolder.name,
+        path.relative(this.location.workspaceFolder.uri.fsPath, path.dirname(this.location.samTemplateUri.fsPath))
+    )
+    private stackName: string = ''
+    public constructor(private readonly location: SamAppLocation) {}
+
+    public async getChildren(): Promise<(ResourceNode | TreeNode)[]> {
+        const resources = []
+        try {
+            const successfulApp = await getApp(this.location)
+            const templateResources: ResourceTreeEntity[] = successfulApp.resourceTree
+            const { stackName, region } = await getStackName(this.location.projectRoot)
+            this.stackName = stackName
+
+            const listStackResourcesArguments: SamCliListResourcesParameters = {
+                stackName: this.stackName,
+                templateFile: this.location.samTemplateUri.fsPath,
+                region: region,
+                projectRoot: this.location.projectRoot,
+            }
+
+            const deployedResources: StackResource[] | undefined = this.stackName
+                ? await getDeployedResources({
+                      listResourcesParams: listStackResourcesArguments,
+                      invoker: getSamCliContext().invoker,
+                  })
+                : undefined
+            // Skip generating stack node if stack does not exist in region or other errors
+            if (deployedResources && deployedResources.length > 0) {
+                resources.push(...(await generateStackNode(this.stackName, region)))
+            }
+            resources.push(
+                ...generateResourceNodes(this.location, templateResources, this.stackName, region, deployedResources)
+            )
+
+            // indicate that App exists, but it is empty
+            if (resources.length === 0) {
+                return [
+                    createPlaceholderItem(
+                        localize('AWS.appBuilder.explorerNode.app.noResource', '[No resource found in SAM template]')
+                    ),
+                ]
+            }
+            return resources
+        } catch (error) {
+            getLogger().error(`Could not load the construct tree located at '${this.id}': %O`, error as Error)
+            return [
+                createPlaceholderItem(
+                    localize(
+                        'AWS.appBuilder.explorerNode.app.noResourceTree',
+                        '[Unable to load resource tree for this app. Ensure SAM template is correct.]'
+                    )
+                ),
+            ]
+        }
+    }
+
+    public getTreeItem() {
+        const item = new vscode.TreeItem(this.label, vscode.TreeItemCollapsibleState.Collapsed)
+
+        item.contextValue = 'awsAppBuilderAppNode'
+        item.iconPath = getIcon('vscode-folder')
+        item.resourceUri = this.location.samTemplateUri
+        item.tooltip = this.location.samTemplateUri.path
+
+        return item
+    }
+}
diff --git a/packages/core/src/awsService/appBuilder/explorer/nodes/deployedNode.ts b/packages/core/src/awsService/appBuilder/explorer/nodes/deployedNode.ts
new file mode 100644
index 00000000000..59b9662c70b
--- /dev/null
+++ b/packages/core/src/awsService/appBuilder/explorer/nodes/deployedNode.ts
@@ -0,0 +1,159 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getIcon } from '../../../../shared/icons'
+import { TreeNode } from '../../../../shared/treeview/resourceTreeDataProvider'
+import { createPlaceholderItem } from '../../../../shared/treeview/utils'
+import * as nls from 'vscode-nls'
+
+import { getLogger } from '../../../../shared/logger/logger'
+import { DefaultLambdaClient } from '../../../../shared/clients/lambdaClient'
+import globals from '../../../../shared/extensionGlobals'
+import { defaultPartition } from '../../../../shared/regions/regionProvider'
+import { FunctionConfiguration } from '@aws-sdk/client-lambda'
+import { RestApi } from '@aws-sdk/client-api-gateway'
+import { LambdaNode } from '../../../../lambda/explorer/lambdaNodes'
+import { LambdaFunctionNode } from '../../../../lambda/explorer/lambdaFunctionNode'
+import { S3Client, toBucket } from '../../../../shared/clients/s3'
+import { S3Node } from '../../../../awsService/s3/explorer/s3Nodes'
+import { S3BucketNode } from '../../../../awsService/s3/explorer/s3BucketNode'
+import { ApiGatewayNode } from '../../../../awsService/apigateway/explorer/apiGatewayNodes'
+import { RestApiNode } from '../../../../awsService/apigateway/explorer/apiNodes'
+import {
+    SERVERLESS_FUNCTION_TYPE,
+    SERVERLESS_API_TYPE,
+    s3BucketType,
+} from '../../../../shared/cloudformation/cloudformation'
+import { ToolkitError } from '../../../../shared/errors'
+import { ResourceTreeEntity } from '../samProject'
+
+const localize = nls.loadMessageBundle()
+export interface DeployedResource {
+    stackName: string
+    regionCode: string
+    explorerNode: any
+    arn: string
+    contextValue: string
+}
+
+export const DeployedResourceContextValues: Record<string, string> = {
+    [SERVERLESS_FUNCTION_TYPE]: 'awsRegionFunctionNodeDownloadable',
+    [SERVERLESS_API_TYPE]: 'awsApiGatewayNode',
+    [s3BucketType]: 'awsS3BucketNode',
+}
+
+export class DeployedResourceNode implements TreeNode<DeployedResource> {
+    public readonly id: string
+    public readonly contextValue: string
+
+    public constructor(public readonly resource: DeployedResource) {
+        if (this.resource.arn) {
+            this.id = this.resource.arn
+            this.contextValue = this.resource.contextValue
+        } else {
+            getLogger().warn('Cannot create DeployedResourceNode, the ARN does not exist.')
+            this.id = ''
+            this.contextValue = ''
+        }
+    }
+
+    public async getChildren(): Promise<DeployedResourceNode[]> {
+        return []
+    }
+
+    public getTreeItem() {
+        const item = new vscode.TreeItem(this.id)
+
+        item.contextValue = this.contextValue
+        item.iconPath = getIcon('vscode-cloud')
+        item.collapsibleState = vscode.TreeItemCollapsibleState.None
+        item.tooltip = this.resource.arn
+        return item
+    }
+}
+
+export async function generateDeployedNode(
+    deployedResource: any,
+    regionCode: string,
+    stackName: string,
+    resourceTreeEntity: ResourceTreeEntity,
+    location?: vscode.Uri
+): Promise<DeployedResourceNode[] | TreeNode[]> {
+    let newDeployedResource: any
+    const partitionId = globals.regionProvider.getPartitionId(regionCode) ?? defaultPartition
+    try {
+        switch (resourceTreeEntity.Type) {
+            case SERVERLESS_FUNCTION_TYPE: {
+                const defaultClient = new DefaultLambdaClient(regionCode)
+                const lambdaNode = new LambdaNode(regionCode, defaultClient)
+                let configuration: FunctionConfiguration
+                try {
+                    configuration = (await defaultClient.getFunction(deployedResource.PhysicalResourceId))
+                        .Configuration as FunctionConfiguration
+                    newDeployedResource = new LambdaFunctionNode(
+                        lambdaNode,
+                        regionCode,
+                        configuration,
+                        undefined,
+                        location ? vscode.Uri.joinPath(location, resourceTreeEntity.CodeUri ?? '').fsPath : undefined,
+                        location,
+                        deployedResource.LogicalResourceId
+                    )
+                } catch (error: any) {
+                    getLogger().error('Error getting Lambda configuration: %O', error)
+                    throw ToolkitError.chain(error, 'Error getting Lambda configuration', {
+                        code: 'lambdaClientError',
+                    })
+                }
+                break
+            }
+            case s3BucketType: {
+                const s3Client = new S3Client(regionCode)
+                const s3Node = new S3Node(s3Client)
+                const s3Bucket = toBucket(deployedResource.PhysicalResourceId, regionCode, partitionId)
+                newDeployedResource = new S3BucketNode(s3Bucket, s3Node, s3Client)
+                break
+            }
+            case SERVERLESS_API_TYPE: {
+                const apiParentNode = new ApiGatewayNode(partitionId, regionCode)
+                const apiNodes = await apiParentNode.getChildren()
+                const apiNode = apiNodes.find((node) => node.id === deployedResource.PhysicalResourceId)
+                newDeployedResource = new RestApiNode(apiParentNode, partitionId, regionCode, apiNode as RestApi)
+                break
+            }
+            default:
+                newDeployedResource = new DeployedResourceNode(deployedResource)
+                getLogger().info('Details are missing or are incomplete for: %O', deployedResource)
+                return [
+                    createPlaceholderItem(
+                        localize(
+                            'AWS.appBuilder.explorerNode.noApps',
+                            '[This resource is not yet supported in AppBuilder.]'
+                        )
+                    ),
+                ]
+        }
+    } catch (error: any) {
+        void vscode.window.showErrorMessage(error.messages)
+        return [
+            createPlaceholderItem(
+                localize(
+                    'AWS.appBuilder.explorerNode.unavailableDeployedResource',
+                    '[Failed to retrieve deployed resource. Ensure correct stack name and region are in the samconfig.toml, and that your account is connected.]'
+                )
+            ),
+        ]
+    }
+    newDeployedResource.contextValue = DeployedResourceContextValues[resourceTreeEntity.Type]
+    const finalDeployedResource = {
+        stackName,
+        regionCode,
+        explorerNode: newDeployedResource,
+        arn: newDeployedResource.arn,
+        contextValue: newDeployedResource.contextValue,
+    }
+    return [new DeployedResourceNode(finalDeployedResource)]
+}
diff --git a/packages/core/src/awsService/appBuilder/explorer/nodes/deployedStack.ts b/packages/core/src/awsService/appBuilder/explorer/nodes/deployedStack.ts
new file mode 100644
index 00000000000..3a533c722fb
--- /dev/null
+++ b/packages/core/src/awsService/appBuilder/explorer/nodes/deployedStack.ts
@@ -0,0 +1,72 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { TreeNode } from '../../../../shared/treeview/resourceTreeDataProvider'
+import { getIcon } from '../../../../shared/icons'
+import { CloudFormationClient, DescribeStacksCommand, CloudFormationClientConfig } from '@aws-sdk/client-cloudformation'
+import { ToolkitError } from '../../../../shared/errors'
+import { getIAMConnection } from '../../../../auth/utils'
+import globals from '../../../../shared/extensionGlobals'
+
+export class StackNameNode implements TreeNode {
+    public readonly id = this.stackName
+    public readonly resource = this
+    public arn: string | undefined
+    public readonly link = `command:aws.explorer.cloudformation.showStack?${encodeURIComponent(JSON.stringify({ stackName: this.stackName, region: this.regionCode }))}`
+
+    public constructor(
+        public stackName: string,
+        public regionCode: string
+    ) {
+        this.stackName = stackName
+        this.regionCode = regionCode
+    }
+
+    public async getChildren(): Promise<TreeNode[]> {
+        // This stack name node is a leaf node that does not have any children.
+        return []
+    }
+    public get value(): string {
+        return `Stack: ${this.stackName} (${this.regionCode})`
+    }
+
+    public getTreeItem() {
+        const item = new vscode.TreeItem(this.value)
+
+        item.contextValue = 'awsAppBuilderStackNode'
+        item.iconPath = getIcon('vscode-cloud')
+        return item
+    }
+}
+
+export async function generateStackNode(stackName?: string, regionCode?: string): Promise<StackNameNode[]> {
+    const connection = await getIAMConnection({ prompt: false })
+    if (!connection || connection.type !== 'iam') {
+        return []
+    }
+    const cred = await connection.getCredentials()
+    const endpointUrl = globals.awsContext.getCredentialEndpointUrl()
+    const opts: CloudFormationClientConfig = { region: regionCode, credentials: cred }
+    if (endpointUrl !== undefined) {
+        opts.endpoint = endpointUrl
+    }
+    const client = new CloudFormationClient(opts)
+    try {
+        const command = new DescribeStacksCommand({ StackName: stackName })
+        const response = await client.send(command)
+        if (response.Stacks && response.Stacks[0]) {
+            const stackArn = response.Stacks[0].StackId
+            if (stackName === undefined || regionCode === undefined) {
+                return []
+            }
+            const stackNode = new StackNameNode(stackName || '', regionCode || '')
+            stackNode.arn = stackArn
+            return [stackNode]
+        }
+    } catch (error) {
+        throw new ToolkitError(`Failed to generate stack node ${stackName} in region ${regionCode}: ${error}`)
+    }
+    return []
+}
diff --git a/packages/core/src/awsService/appBuilder/explorer/nodes/propertyNode.ts b/packages/core/src/awsService/appBuilder/explorer/nodes/propertyNode.ts
new file mode 100644
index 00000000000..481ecdf7009
--- /dev/null
+++ b/packages/core/src/awsService/appBuilder/explorer/nodes/propertyNode.ts
@@ -0,0 +1,46 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getIcon } from '../../../../shared/icons'
+import { TreeNode } from '../../../../shared/treeview/resourceTreeDataProvider'
+
+export class PropertyNode implements TreeNode {
+    public readonly id = this.key
+    public readonly resource = this.value
+
+    public constructor(
+        private readonly key: string,
+        private readonly value: unknown
+    ) {}
+
+    public async getChildren(): Promise<TreeNode[]> {
+        if (this.value instanceof Array || this.value instanceof Object) {
+            return generatePropertyNodes(this.value)
+        } else {
+            return []
+        }
+    }
+
+    public getTreeItem() {
+        const item = new vscode.TreeItem(`${this.key}: ${this.value}`)
+
+        item.contextValue = 'awsAppBuilderPropertyNode'
+        item.iconPath = getIcon('vscode-gear')
+
+        if (this.value instanceof Array || this.value instanceof Object) {
+            item.label = this.key
+            item.collapsibleState = vscode.TreeItemCollapsibleState.Collapsed
+        }
+
+        return item
+    }
+}
+
+export function generatePropertyNodes(properties: { [key: string]: any }): TreeNode[] {
+    return Object.entries(properties)
+        .filter(([key, _]) => key !== 'Id' && key !== 'Type' && key !== 'Events')
+        .map(([key, value]) => new PropertyNode(key, value))
+}
diff --git a/packages/core/src/awsService/appBuilder/explorer/nodes/resourceNode.ts b/packages/core/src/awsService/appBuilder/explorer/nodes/resourceNode.ts
new file mode 100644
index 00000000000..fc9d4c48c14
--- /dev/null
+++ b/packages/core/src/awsService/appBuilder/explorer/nodes/resourceNode.ts
@@ -0,0 +1,176 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { IconPath, getIcon } from '../../../../shared/icons'
+import { TreeNode } from '../../../../shared/treeview/resourceTreeDataProvider'
+import { ResourceTreeEntity, SamAppLocation } from '../samProject'
+import {
+    SERVERLESS_FUNCTION_TYPE,
+    s3BucketType,
+    appRunnerType,
+    ecrRepositoryType,
+} from '../../../../shared/cloudformation/cloudformation'
+import { generatePropertyNodes } from './propertyNode'
+import { generateDeployedNode } from './deployedNode'
+import { StackResource } from '../../../../lambda/commands/listSamResources'
+import { DeployedResourceNode } from './deployedNode'
+import { LambdaFunctionNode } from '../../../../lambda/explorer/lambdaFunctionNode'
+import { ToolkitError } from '../../../../shared/errors'
+
+enum ResourceTypeId {
+    Function = 'function',
+    DeployedFunction = 'deployed-function',
+    Api = 'api',
+    Other = '',
+}
+
+export async function generateLambdaNodeFromResource(resource: ResourceNode['resource']): Promise<LambdaFunctionNode> {
+    if (!resource.deployedResource || !resource.region || !resource.stackName || !resource.resource) {
+        throw new ToolkitError('Error getting Lambda info from Appbuilder Node, please check your connection')
+    }
+    const nodes = (await generateDeployedNode(
+        resource.deployedResource,
+        resource.region,
+        resource.stackName,
+        resource.resource,
+        resource.projectRoot
+    )) as DeployedResourceNode[]
+    if (nodes.length !== 1) {
+        throw new ToolkitError('Error getting Lambda info from Appbuilder Node, please check your connection')
+    }
+    // lambda function node or undefined
+    return nodes[0].resource?.explorerNode
+}
+
+// from here, we should have a helper function to detect if lambda is deployed
+// then return deployed node/normal node on each condition.
+export class ResourceNode implements TreeNode {
+    public readonly id = this.resourceTreeEntity.Id
+    private readonly type = this.resourceTreeEntity.Type
+    public readonly resourceLogicalId = this.deployedResource?.LogicalResourceId
+
+    public constructor(
+        private readonly location: SamAppLocation,
+        private readonly resourceTreeEntity: ResourceTreeEntity,
+        private readonly stackName?: string,
+        private readonly region?: string,
+        private readonly deployedResource?: StackResource,
+        // TODO: cleanup or rename functionArn parameter as type can be differ from Lambda; value never set in generateResourceNodes()
+        private readonly functionArn?: string
+    ) {}
+
+    public get resource() {
+        return {
+            resource: this.resourceTreeEntity,
+            location: this.location.samTemplateUri,
+            projectRoot: this.location.projectRoot,
+            workspaceFolder: this.location.workspaceFolder,
+            region: this.region,
+            stackName: this.stackName,
+            deployedResource: this.deployedResource,
+            functionArn: this.functionArn,
+        }
+    }
+
+    public async getChildren() {
+        let deployedNodes: DeployedResourceNode[] = []
+        let propertyNodes: TreeNode[] = []
+
+        if (this.deployedResource && this.region && this.stackName) {
+            deployedNodes = (await generateDeployedNode(
+                this.deployedResource,
+                this.region,
+                this.stackName,
+                this.resourceTreeEntity,
+                this.location.projectRoot
+            )) as DeployedResourceNode[]
+        }
+        if (this.resourceTreeEntity.Type === SERVERLESS_FUNCTION_TYPE) {
+            propertyNodes = generatePropertyNodes(this.resourceTreeEntity)
+        }
+
+        return [...propertyNodes, ...deployedNodes]
+    }
+
+    public getTreeItem(): vscode.TreeItem {
+        const collapsibleState = vscode.TreeItemCollapsibleState.Collapsed
+
+        // Create the TreeItem with the determined collapsible state
+        const item = new vscode.TreeItem(this.resourceTreeEntity.Id, collapsibleState)
+
+        // Set the tooltip to the URI of the SAM template
+        item.tooltip = this.location.samTemplateUri.toString()
+
+        item.iconPath = this.getIconPath()
+
+        // Set the resource URI to the SAM template URI
+        item.resourceUri = this.location.samTemplateUri
+
+        // Define the context value for the item
+        item.contextValue = `awsAppBuilderResourceNode.${this.getResourceId()}`
+
+        return item
+    }
+
+    // Additional resources and corresponding icons will be added in the future.
+    // When adding support for new resources, ensure that each new resource
+    // has an appropriate mapping in place.
+    private getIconPath(): IconPath | undefined {
+        switch (this.type) {
+            case SERVERLESS_FUNCTION_TYPE:
+                if (this.deployedResource) {
+                    return getIcon('aws-lambda-deployed-function')
+                }
+                return getIcon('aws-lambda-function')
+            // add deployed lambda function type
+            case s3BucketType:
+                return getIcon('aws-s3-bucket')
+            case appRunnerType:
+                return getIcon('aws-apprunner-service')
+            case ecrRepositoryType:
+                return getIcon('aws-ecr-registry')
+            default:
+                return getIcon('vscode-info')
+        }
+    }
+
+    private getResourceId(): ResourceTypeId {
+        switch (this.type) {
+            case SERVERLESS_FUNCTION_TYPE:
+                if (this.deployedResource) {
+                    return ResourceTypeId.DeployedFunction
+                }
+                return ResourceTypeId.Function
+            case 'Api':
+                return ResourceTypeId.Api
+            default:
+                return ResourceTypeId.Other
+        }
+    }
+}
+
+export function generateResourceNodes(
+    app: SamAppLocation,
+    resources: NonNullable<ResourceTreeEntity[]>,
+    stackName?: string,
+    region?: string,
+    deployedResources?: StackResource[]
+): ResourceNode[] {
+    if (!deployedResources) {
+        return resources.map((resource) => new ResourceNode(app, resource, stackName, region))
+    }
+
+    return resources.map((resource) => {
+        if (resource.Type) {
+            const deployedResource = deployedResources.find(
+                (deployedResource) => resource.Id === deployedResource.LogicalResourceId
+            )
+            return new ResourceNode(app, resource, stackName, region, deployedResource)
+        } else {
+            return new ResourceNode(app, resource, stackName, region)
+        }
+    })
+}
diff --git a/packages/core/src/awsService/appBuilder/explorer/nodes/rootNode.ts b/packages/core/src/awsService/appBuilder/explorer/nodes/rootNode.ts
new file mode 100644
index 00000000000..941ad8ec0f0
--- /dev/null
+++ b/packages/core/src/awsService/appBuilder/explorer/nodes/rootNode.ts
@@ -0,0 +1,110 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { debugNewSamAppDocUrl } from '../../../../shared/constants'
+import { telemetry } from '../../../../shared/telemetry/telemetry'
+import { ResourceTreeDataProvider, TreeNode } from '../../../../shared/treeview/resourceTreeDataProvider'
+import { createPlaceholderItem } from '../../../../shared/treeview/utils'
+import { localize, openUrl } from '../../../../shared/utilities/vsCodeUtils'
+import { Commands } from '../../../../shared/vscode/commands2'
+import { AppNode } from './appNode'
+import { detectSamProjects } from '../detectSamProjects'
+import globals from '../../../../shared/extensionGlobals'
+import { WalkthroughNode } from './walkthroughNode'
+
+export async function getAppNodes(): Promise<TreeNode[]> {
+    // no active workspace, show buttons in welcomeview
+    if (!vscode.workspace.workspaceFolders || vscode.workspace.workspaceFolders.length === 0) {
+        return []
+    }
+
+    const appsFound = await detectSamProjects()
+
+    if (appsFound.length === 0) {
+        return [
+            createPlaceholderItem(
+                localize('AWS.appBuilder.explorerNode.noApps', '[No SAM templates found in Workspaces]')
+            ),
+        ]
+    }
+
+    const nodesToReturn: TreeNode[] = appsFound
+        .map((appLocation) => new AppNode(appLocation))
+        .sort((a, b) => a.label.localeCompare(b.label) ?? 0)
+
+    return nodesToReturn
+}
+
+export class AppBuilderRootNode implements TreeNode {
+    public readonly id = 'appBuilder'
+    public readonly resource = this
+    private readonly onDidChangeChildrenEmitter = new vscode.EventEmitter<void>()
+    public readonly onDidChangeChildren = this.onDidChangeChildrenEmitter.event
+    private readonly _refreshAppBuilderExplorer
+    private readonly _refreshAppBuilderForFileExplorer
+
+    constructor() {
+        Commands.register('aws.appBuilder.viewDocs', () => {
+            void openUrl(debugNewSamAppDocUrl.toolkit)
+            telemetry.aws_help.emit({ name: 'appBuilder' })
+        })
+        this._refreshAppBuilderExplorer = (provider?: ResourceTreeDataProvider) =>
+            Commands.register('aws.appBuilder.refresh', () => {
+                this.refresh()
+                if (provider) {
+                    provider.refresh()
+                }
+            })
+
+        this._refreshAppBuilderForFileExplorer = (provider?: ResourceTreeDataProvider) =>
+            Commands.register('aws.appBuilderForFileExplorer.refresh', () => {
+                this.refresh()
+                if (provider) {
+                    provider.refresh()
+                }
+            })
+    }
+
+    public get refreshAppBuilderExplorer() {
+        return this._refreshAppBuilderExplorer
+    }
+
+    public get refreshAppBuilderForFileExplorer() {
+        return this._refreshAppBuilderForFileExplorer
+    }
+
+    public async getChildren() {
+        const nodesToReturn = await getAppNodes()
+        if (nodesToReturn.length === 0) {
+            return []
+        }
+
+        const walkthroughCompleted = globals.globalState.get('aws.toolkit.lambda.walkthroughCompleted')
+        // show walkthrough node if walkthrough not completed yet
+        if (!walkthroughCompleted) {
+            nodesToReturn.unshift(new WalkthroughNode())
+        }
+        return nodesToReturn
+    }
+
+    public refresh(): void {
+        this.onDidChangeChildrenEmitter.fire()
+    }
+
+    public getTreeItem() {
+        const item = new vscode.TreeItem('APPLICATION BUILDER')
+        item.collapsibleState = vscode.TreeItemCollapsibleState.Collapsed
+        item.contextValue = 'awsAppBuilderRootNode'
+
+        return item
+    }
+
+    static #instance: AppBuilderRootNode
+
+    static get instance(): AppBuilderRootNode {
+        return (this.#instance ??= new AppBuilderRootNode())
+    }
+}
diff --git a/packages/core/src/awsService/appBuilder/explorer/nodes/walkthroughNode.ts b/packages/core/src/awsService/appBuilder/explorer/nodes/walkthroughNode.ts
new file mode 100644
index 00000000000..8f3432075df
--- /dev/null
+++ b/packages/core/src/awsService/appBuilder/explorer/nodes/walkthroughNode.ts
@@ -0,0 +1,37 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { TreeNode } from '../../../../shared/treeview/resourceTreeDataProvider'
+import { localize } from '../../../../shared/utilities/vsCodeUtils'
+
+/**
+ * Create Open Walkthrough Node in App builder sidebar
+ *
+ */
+export class WalkthroughNode implements TreeNode {
+    public readonly id = 'walkthrough'
+    public readonly resource: WalkthroughNode = this
+
+    // Constructor left empty intentionally for future extensibility
+    public constructor() {}
+
+    /**
+     * Generates the TreeItem for the Walkthrough Node.
+     * This item will appear in the sidebar with a label and command to open the walkthrough.
+     */
+    public getTreeItem() {
+        const itemLabel = localize('AWS.appBuilder.openWalkthroughTitle', 'Walkthrough of Application Builder')
+
+        const item = new vscode.TreeItem(itemLabel)
+        item.contextValue = 'awsWalkthroughNode'
+        item.command = {
+            title: localize('AWS.appBuilder.openWalkthroughTitle', 'Walkthrough of Application Builder'),
+            command: 'aws.toolkit.lambda.openWalkthrough',
+        }
+
+        return item
+    }
+}
diff --git a/packages/core/src/awsService/appBuilder/explorer/openTemplate.ts b/packages/core/src/awsService/appBuilder/explorer/openTemplate.ts
new file mode 100644
index 00000000000..c29bdeffce4
--- /dev/null
+++ b/packages/core/src/awsService/appBuilder/explorer/openTemplate.ts
@@ -0,0 +1,22 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { samSyncUrl } from '../../../shared/constants'
+import { CloudFormationTemplateRegistry } from '../../../shared/fs/templateRegistry'
+import { syncMementoRootKey } from '../../../shared/sam/constants'
+import { createExitPrompter } from '../../../shared/ui/common/exitPrompter'
+import { createTemplatePrompter, TemplateItem } from '../../../shared/ui/sam/templatePrompter'
+import { Wizard } from '../../../shared/wizards/wizard'
+
+export interface OpenTemplateParams {
+    readonly template: TemplateItem
+}
+
+export class OpenTemplateWizard extends Wizard<OpenTemplateParams> {
+    public constructor(state: Partial<OpenTemplateParams>, registry: CloudFormationTemplateRegistry) {
+        super({ initState: state, exitPrompterProvider: createExitPrompter })
+        this.form.template.bindPrompter(() => createTemplatePrompter(registry, syncMementoRootKey, samSyncUrl))
+    }
+}
diff --git a/packages/core/src/awsService/appBuilder/explorer/samProject.ts b/packages/core/src/awsService/appBuilder/explorer/samProject.ts
new file mode 100644
index 00000000000..faba9bcad76
--- /dev/null
+++ b/packages/core/src/awsService/appBuilder/explorer/samProject.ts
@@ -0,0 +1,110 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as CloudFormation from '../../../shared/cloudformation/cloudformation'
+import { SamConfig, SamConfigErrorCode } from '../../../shared/sam/config'
+import { getLogger } from '../../../shared/logger/logger'
+import { ToolkitError } from '../../../shared/errors'
+import { showViewLogsMessage } from '../../../shared/utilities/messages'
+import { Runtime } from '@aws-sdk/client-lambda'
+
+export interface SamApp {
+    location: SamAppLocation
+    resourceTree: ResourceTreeEntity[]
+}
+
+export interface SamAppLocation {
+    samTemplateUri: vscode.Uri
+    workspaceFolder: vscode.WorkspaceFolder
+    projectRoot: vscode.Uri
+}
+
+export interface ResourceTreeEntity {
+    Id: string
+    Type: string
+    Runtime?: Runtime
+    CodeUri?: string
+    Handler?: string
+    Events?: ResourceTreeEntity[]
+    Path?: string
+    Method?: string
+    Environment?: {
+        Variables: Record<string, any>
+    }
+}
+
+export async function getStackName(projectRoot: vscode.Uri): Promise<any> {
+    try {
+        const samConfig = await SamConfig.fromProjectRoot(projectRoot)
+        const stackName = await samConfig.getCommandParam('global', 'stack_name')
+        const region = await samConfig.getCommandParam('global', 'region')
+
+        return { stackName, region }
+    } catch (error: any) {
+        switch (error.code) {
+            case SamConfigErrorCode.samNoConfigFound:
+                getLogger().info('Stack name and/or region information not found in samconfig.toml: %O', error)
+                break
+            case SamConfigErrorCode.samConfigParseError:
+                getLogger().error(
+                    `Error parsing stack name and/or region information from samconfig.toml: ${error.message}. Ensure the information is correct.`,
+                    error
+                )
+                void showViewLogsMessage('Encountered an issue reading samconfig.toml')
+                break
+            default:
+                getLogger().warn(`Error parsing stack name and/or region information: ${error.message}`, error)
+        }
+        return {}
+    }
+}
+
+export async function getApp(location: SamAppLocation): Promise<SamApp> {
+    const samTemplate = await CloudFormation.tryLoad(location.samTemplateUri)
+    if (!samTemplate.template) {
+        throw new ToolkitError(`Template at ${location.samTemplateUri.fsPath} is not valid`)
+    }
+    const templateResources = getResourceEntity(samTemplate.template)
+
+    const resourceTree = [...templateResources]
+
+    return { location, resourceTree }
+}
+
+function getResourceEntity(template: any): ResourceTreeEntity[] {
+    const resourceTree: ResourceTreeEntity[] = []
+
+    for (const [logicalId, resource] of Object.entries(template?.Resources ?? []) as [string, any][]) {
+        const resourceEntity: ResourceTreeEntity = {
+            Id: logicalId,
+            Type: resource.Type,
+            Runtime: resource.Properties?.Runtime ?? template?.Globals?.Function?.Runtime,
+            Handler: resource.Properties?.Handler ?? template?.Globals?.Function?.Handler,
+            Events: resource.Properties?.Events ? getEvents(resource.Properties.Events) : undefined,
+            CodeUri: resource.Properties?.CodeUri ?? template?.Globals?.Function?.CodeUri,
+            Environment: resource.Properties?.Environment ?? template?.Globals?.Function?.Environment,
+        }
+        resourceTree.push(resourceEntity)
+    }
+    return resourceTree
+}
+
+function getEvents(events: Record<string, any>): ResourceTreeEntity[] {
+    const eventResources: ResourceTreeEntity[] = []
+
+    for (const [eventsLogicalId, event] of Object.entries(events)) {
+        const eventProperties = event.Properties
+        const eventResource: ResourceTreeEntity = {
+            Id: eventsLogicalId,
+            Type: event.Type,
+            Path: eventProperties.Path,
+            Method: eventProperties.Method,
+        }
+        eventResources.push(eventResource)
+    }
+
+    return eventResources
+}
diff --git a/packages/core/src/awsService/appBuilder/lambda2sam/lambda2sam.ts b/packages/core/src/awsService/appBuilder/lambda2sam/lambda2sam.ts
new file mode 100644
index 00000000000..75722842bc5
--- /dev/null
+++ b/packages/core/src/awsService/appBuilder/lambda2sam/lambda2sam.ts
@@ -0,0 +1,1007 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { LambdaFunctionNode } from '../../../lambda/explorer/lambdaFunctionNode'
+import fs from '../../../shared/fs/fs'
+import { getLogger } from '../../../shared/logger/logger'
+import * as os from 'os'
+import {
+    LAMBDA_FUNCTION_TYPE,
+    LAMBDA_LAYER_TYPE,
+    LAMBDA_URL_TYPE,
+    SERVERLESS_FUNCTION_TYPE,
+    SERVERLESS_LAYER_TYPE,
+    Template,
+    TemplateResources,
+    loadByContents,
+    save,
+    tryLoad,
+    ZipResourceProperties,
+    Resource,
+} from '../../../shared/cloudformation/cloudformation'
+
+import { downloadUnzip, getLambdaClient, getCFNClient, isPermissionError } from '../utils'
+import { openProjectInWorkspace } from '../walkthrough'
+import { ToolkitError } from '../../../shared/errors'
+import { ResourceToImport, StackResource } from '@aws-sdk/client-cloudformation'
+import { SignatureV4 } from '@smithy/signature-v4'
+import { Sha256 } from '@aws-crypto/sha256-js'
+import { getIAMConnection } from '../../../auth/utils'
+import globals from '../../../shared/extensionGlobals'
+import { Runtime, telemetry } from '../../../shared/telemetry/telemetry'
+
+/**
+ * Information about a CloudFormation stack
+ */
+export interface StackInfo {
+    stackId: string
+    stackName: string
+    isSamTemplate: boolean
+    template: Template
+}
+
+/**
+ * Main entry point for converting a Lambda function to a SAM project
+ */
+export async function lambdaToSam(lambdaNode: LambdaFunctionNode): Promise<void> {
+    try {
+        // Show progress notification for the overall process
+        await vscode.window.withProgress(
+            {
+                location: vscode.ProgressLocation.Notification,
+                title: `Converting ${lambdaNode.name} to SAM project`,
+                cancellable: false,
+            },
+            async (progress) => {
+                // 0. Prompt user for project location
+                const saveUri = await promptForProjectLocation()
+                if (!saveUri) {
+                    getLogger().info('User canceled project location selection')
+                    return
+                }
+                progress.report({ increment: 0, message: 'Checking stack association...' })
+
+                // 1. Determine which scenario applies to this Lambda function
+                telemetry.record({ runtime: lambdaNode?.configuration?.Runtime as Runtime | undefined })
+                let stackInfo = await determineStackAssociation(lambdaNode)
+
+                // 2. Handle the appropriate scenario
+                let samTemplate: Template
+                let sourceType: 'LambdaFunction' | 'SAMStack' | 'CFNStack'
+                let stackName: string | undefined
+                if (!stackInfo) {
+                    telemetry.record({ action: 'deployStack' })
+                    // Scenario 1: Lambda doesn't belong to any stack
+                    sourceType = 'LambdaFunction'
+                    progress.report({ increment: 30, message: 'Generating template...' })
+                    // 2.1 call api to get CFN
+                    let cfnTemplate: Template
+                    let resourcesToImport: ResourceToImport[]
+                    try {
+                        ;[cfnTemplate, resourcesToImport] = await callExternalApiForCfnTemplate(lambdaNode)
+                    } catch (error) {
+                        throw new ToolkitError(`Failed to generate template: ${error}`)
+                    }
+
+                    // 2.2. Deploy the CFN template to create a stack
+                    progress.report({ increment: 20, message: 'Deploying template...' })
+                    stackName = await promptForStackName(lambdaNode.name.replaceAll('_', '-'))
+                    if (!stackName) {
+                        throw new ToolkitError('Stack name not provided')
+                    }
+
+                    stackInfo = await deployCfnTemplate(
+                        cfnTemplate,
+                        resourcesToImport,
+                        stackName,
+                        lambdaNode.regionCode
+                    )
+                    samTemplate = {
+                        AWSTemplateFormatVersion: stackInfo.template.AWSTemplateFormatVersion,
+                        Transform: 'AWS::Serverless-2016-10-31',
+                        Parameters: stackInfo.template.Parameters,
+                        Globals: stackInfo.template.Globals,
+                        Resources: stackInfo.template.Resources,
+                    }
+                } else if (stackInfo.isSamTemplate) {
+                    // Scenario 3: Lambda belongs to a stack deployed by SAM
+                    sourceType = 'SAMStack'
+                    progress.report({ increment: 50, message: 'Processing SAM template...' })
+                    samTemplate = stackInfo.template
+                    stackName = stackInfo.stackName
+                } else {
+                    // Scenario 2: Lambda belongs to a CFN stack
+                    sourceType = 'CFNStack'
+                    progress.report({ increment: 50, message: 'Creating SAM project from CFN...' })
+                    samTemplate = {
+                        AWSTemplateFormatVersion: stackInfo.template.AWSTemplateFormatVersion,
+                        Transform: 'AWS::Serverless-2016-10-31',
+                        Parameters: stackInfo.template.Parameters,
+                        Globals: stackInfo.template.Globals,
+                        Resources: stackInfo.template.Resources,
+                    }
+                    stackName = stackInfo.stackName
+                }
+
+                const projectUri = vscode.Uri.joinPath(saveUri[0], stackName)
+
+                telemetry.record({ iac: sourceType })
+
+                // 3. Process Lambda functions in the template
+                if (!samTemplate.Resources) {
+                    throw new ToolkitError('Template does not contain any resource, please retry')
+                }
+
+                progress.report({ message: 'Downloading Lambda function code...' })
+                await cfn2sam(samTemplate.Resources, projectUri, stackInfo, lambdaNode.regionCode)
+
+                // 4. Save the SAM template
+                progress.report({ message: 'Saving SAM template...' })
+                await save(samTemplate, vscode.Uri.joinPath(projectUri, 'template.yaml').fsPath)
+
+                // 5. Create a basic README.md
+                // Use stack name from stackInfo if available, otherwise use the Lambda function name
+                progress.report({ message: 'Creating Readme...' })
+                await createReadme(stackName, sourceType, projectUri)
+
+                // 6. Create samconfig.toml
+                progress.report({ message: 'Creating SAM configuration...' })
+                await createSAMConfig(stackName, lambdaNode.regionCode, projectUri)
+
+                // 7. Open the project in VS Code
+                await openProjectInWorkspace(projectUri)
+
+                // 8. Show success message
+                void vscode.window.showInformationMessage(`SAM project created successfully at ${projectUri.fsPath}`)
+                progress.report({ increment: 100, message: 'Done!' })
+            }
+        )
+    } catch (err) {
+        throw new ToolkitError(`Failed to convert Lambda to SAM: ${err instanceof Error ? err.message : String(err)}`)
+    }
+}
+
+export async function createReadme(
+    stackName: string,
+    sourceType: 'LambdaFunction' | 'SAMStack' | 'CFNStack',
+    projectUri: vscode.Uri
+) {
+    const warningSection =
+        sourceType !== 'LambdaFunction'
+            ? ''
+            : `**[Warning**: Currently only a subset of resource support converting to SAM, For any missing resources, please check the Lambda Console and add them manually to your SAM template. ]`
+    const lambda2SAMReadmeSource = 'resources/markdown/lambda2sam.md'
+    const readme = (await fs.readFileText(globals.context.asAbsolutePath(lambda2SAMReadmeSource)))
+        .replace(/\$\{sourceType\}/g, sourceType)
+        .replace(/\$\{stackName\}/g, stackName)
+        .replace(/\$\{warning\}/g, warningSection)
+
+    await fs.writeFile(vscode.Uri.joinPath(projectUri, 'README.md'), readme)
+}
+
+export async function createSAMConfig(stackName: string, region: string, projectUri: vscode.Uri) {
+    const samConfigContent = `# More information about the configuration file can be found here:
+# https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-config.html
+version = 0.1
+
+[default]
+[default.global.parameters]
+stack_name = "${stackName}"
+region = "${region}"`
+    await fs.writeFile(vscode.Uri.joinPath(projectUri, 'samconfig.toml'), samConfigContent)
+}
+
+/**
+ * Determines if the Lambda function is associated with a CloudFormation stack
+ * and if that stack was deployed using SAM
+ */
+export async function determineStackAssociation(lambdaNode: LambdaFunctionNode): Promise<StackInfo | undefined> {
+    try {
+        // Get Lambda function details including tags
+        const lambdaClient = getLambdaClient(lambdaNode.regionCode)
+        const functionDetails = await lambdaClient.getFunction(lambdaNode.name)
+
+        // Check if the Lambda function has CloudFormation stack tags
+        if (!functionDetails.Tags) {
+            // Lambda doesn't have any tags, so it's not part of a stack
+            return undefined
+        }
+
+        // Look for the CloudFormation stack ID tag
+        const stackIdTag = functionDetails.Tags['aws:cloudformation:stack-id']
+        if (!stackIdTag) {
+            // Lambda doesn't have a CloudFormation stack ID tag
+            return undefined
+        }
+
+        // Get the stack name tag if available, otherwise extract from stack ID
+        let stackName = functionDetails.Tags['aws:cloudformation:stack-name']
+        if (!stackName) {
+            // Extract stack name from stack ID
+            const stackIdParts = stackIdTag.split('/')
+            stackName = stackIdParts.length > 1 ? stackIdParts[1] : ''
+        }
+
+        // Create CloudFormation client
+        const cfn = await getCFNClient(lambdaNode.regionCode)
+
+        // stack could be in DELETE_COMPLETE status or doesn't exist
+        const describeStacksResult = await cfn.describeStacks({ StackName: stackIdTag })
+        if (!describeStacksResult.Stacks || describeStacksResult.Stacks.length === 0) {
+            return undefined
+        }
+        if (describeStacksResult.Stacks![0].StackStatus === 'DELETE_COMPLETE') {
+            return undefined
+        }
+        // Get the original stack template
+        const templateResponse = await cfn.getTemplate({
+            StackName: stackIdTag,
+            TemplateStage: 'Original', // Critical to get the original SAM template
+        })
+
+        const templateBody = templateResponse.TemplateBody || '{}'
+        const template = await loadByContents(templateBody, false)
+
+        // Determine if it's a SAM template by checking for the transform
+        const isSamTemplate = ifSamTemplate(template)
+
+        return {
+            stackId: stackIdTag,
+            stackName,
+            isSamTemplate,
+            template,
+        }
+    } catch (err) {
+        throw new ToolkitError(`Error determining stack association: ${err}, please try again`)
+    }
+}
+
+/**
+ * Checks if a template is a SAM template by looking for the SAM transform
+ */
+export function ifSamTemplate(template: Template): boolean {
+    // Check for SAM transform
+    if (template.Transform) {
+        if (typeof template.Transform === 'string') {
+            return template.Transform.startsWith('AWS::Serverless')
+        } else if (typeof template.Transform === 'object' && Array.isArray(template.Transform)) {
+            // Handle case where Transform might be an array
+            return template.Transform.some((t: string) => typeof t === 'string' && t.startsWith('AWS::Serverless'))
+        }
+    }
+
+    return false
+}
+
+/**
+ * Calls the external API to generate a CloudFormation template for a Lambda function
+ * Note: This is a placeholder for the actual API call
+ */
+export async function callExternalApiForCfnTemplate(
+    lambdaNode: LambdaFunctionNode
+): Promise<[Template, ResourceToImport[]]> {
+    const conn = await getIAMConnection()
+    if (!conn || conn.type !== 'iam') {
+        return [{}, []]
+    }
+
+    const cred = await conn.getCredentials()
+    const signer = new SignatureV4({
+        credentials: cred,
+        region: lambdaNode.regionCode,
+        service: 'lambdaconsole',
+        sha256: Sha256,
+    })
+
+    // TODO: govcloud URL is in a slightly different format
+    const url = new URL(
+        `https://${lambdaNode.regionCode}.prod.topology.console.lambda.aws.a2z.com/lambda-api/topology/topology?lambdaArn=${lambdaNode.arn}`
+    )
+
+    const signedRequest = await signer.sign({
+        method: 'GET',
+        headers: {
+            host: url.hostname,
+        },
+        hostname: url.hostname,
+        path: url.pathname,
+        query: Object.fromEntries(url.searchParams),
+        protocol: url.protocol,
+    })
+
+    const response = await fetch(url.toString(), {
+        method: 'GET',
+        headers: {
+            Accept: 'application/xml',
+            'Content-Type': 'application/json',
+            ...signedRequest.headers,
+        },
+    })
+
+    if (!response.ok) {
+        getLogger().error('Failed to retrieve generated CloudFormation template: %O', await response.json())
+        throw new ToolkitError(`Failed to retrieve generated CloudFormation template ID: ${response.statusText}`)
+    }
+
+    const data = await response.json()
+    if (!data.cloudFormationTemplateId) {
+        throw new ToolkitError('No template ID returned')
+    }
+
+    let status: string | undefined = 'CREATE_IN_PROGRESS'
+    let getGeneratedTemplateResponse
+    let resourcesToImport: ResourceToImport[] = []
+    const cfn = await getCFNClient(lambdaNode.regionCode)
+
+    // Wait for template generation to complete
+    while (status !== 'COMPLETE') {
+        getGeneratedTemplateResponse = await cfn.getGeneratedTemplate({
+            Format: 'YAML',
+            GeneratedTemplateName: data.cloudFormationTemplateId,
+        })
+
+        status = getGeneratedTemplateResponse.Status
+        if (status === 'FAILED') {
+            throw new ToolkitError('CloudFormation template create status FAILED')
+        }
+
+        // Add a small delay to avoid hitting API rate limits
+        if (status !== 'COMPLETE') {
+            await new Promise((resolve) => setTimeout(resolve, 1000))
+        }
+    }
+
+    // Get the generated template details to extract resource information
+    const describeGeneratedTemplateResponse = await cfn.describeGeneratedTemplate({
+        GeneratedTemplateName: data.cloudFormationTemplateId,
+    })
+
+    if (describeGeneratedTemplateResponse.Status === 'FAILED') {
+        throw new ToolkitError('CloudFormation template describe request failed')
+    }
+
+    // Build resourcesToImport from the generated template resources
+    if (describeGeneratedTemplateResponse.Resources) {
+        resourcesToImport = describeGeneratedTemplateResponse.Resources.filter(
+            (resource) => resource.LogicalResourceId && resource.ResourceType && resource.ResourceIdentifier
+        ).map((resource) => {
+            const resourceIdentifier = { ...resource.ResourceIdentifier! }
+
+            // Fix Lambda function identifiers - extract function name from ARN
+            if (resource.ResourceType === 'AWS::Lambda::Function' && resourceIdentifier.FunctionName) {
+                // FunctionName might be returned as 'arn:aws:lambda:region:account:function:name'
+                // We need to extract just the function name
+                const functionNameOrArn = resourceIdentifier.FunctionName
+                if (functionNameOrArn.startsWith('arn:')) {
+                    const arnParts = functionNameOrArn.split(':')
+                    // ARN format: arn:aws:lambda:region:account:function:function-name
+                    if (arnParts.length >= 7 && arnParts[5] === 'function') {
+                        resourceIdentifier.FunctionName = arnParts[6]
+                    }
+                }
+            }
+
+            return {
+                ResourceType: resource.ResourceType!,
+                LogicalResourceId: resource.LogicalResourceId!,
+                ResourceIdentifier: resourceIdentifier,
+            }
+        })
+    }
+
+    const cfnTemplate = getGeneratedTemplateResponse!.TemplateBody
+
+    const load = await tryLoad(vscode.Uri.from({ scheme: 'untitled' }), cfnTemplate)
+    if (!load.template || !load.template.Resources) {
+        throw new ToolkitError('Failed to load CloudFormation template')
+    }
+
+    return [load.template, resourcesToImport]
+}
+
+/**
+ * Prompts the user for a stack name
+ */
+export async function promptForStackName(defaultName: string): Promise<string | undefined> {
+    return vscode.window.showInputBox({
+        title: 'Enter Stack Name',
+        prompt: 'Enter a name for the CloudFormation stack',
+        value: `${defaultName}-stack`,
+        validateInput: (value) => {
+            if (!value) {
+                return 'Stack name is required'
+            }
+            if (!/^[a-zA-Z][a-zA-Z0-9-]*$/.test(value)) {
+                return 'Stack name must start with a letter and contain only letters, numbers, and hyphens'
+            }
+            return undefined
+        },
+    })
+}
+
+async function promptForProjectLocation(): Promise<vscode.Uri[] | undefined> {
+    return vscode.window.showOpenDialog({
+        canSelectFolders: true,
+        canSelectFiles: false,
+        canSelectMany: false,
+        openLabel: 'Select SAM project location',
+        // if not workspace, use home dir
+        defaultUri: vscode.workspace.workspaceFolders?.[0]?.uri ?? vscode.Uri.file(os.homedir()),
+    })
+}
+
+/**
+ * Deploys a CloudFormation template to create a stack and imports the existing Lambda function
+ */
+export async function deployCfnTemplate(
+    template: Template,
+    resourcesToImport: ResourceToImport[],
+    stackName: string,
+    region: string
+): Promise<StackInfo> {
+    const cfn = await getCFNClient(region)
+
+    removeUnwantedCodeParameters(template)
+
+    // Convert template object to JSON string
+    const templateBody = JSON.stringify(template)
+
+    // Create a change set to import the existing resources
+    const changeSetName = `ImportLambda-${Date.now()}`
+    const changeSetResponse = await cfn.createChangeSet({
+        StackName: stackName,
+        ChangeSetName: changeSetName,
+        ChangeSetType: 'IMPORT',
+        TemplateBody: templateBody,
+        Capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM', 'CAPABILITY_AUTO_EXPAND'],
+        ResourcesToImport: resourcesToImport,
+    })
+
+    if (!changeSetResponse.Id) {
+        throw new ToolkitError('Failed to create change set')
+    }
+
+    // Wait for change set creation to complete
+    await cfn
+        .waitFor('changeSetCreateComplete', {
+            StackName: stackName,
+            ChangeSetName: changeSetName,
+            $waiter: {
+                delay: 2,
+            },
+        })
+        .catch(async (err: any) => {
+            // If the change set failed to create, get the status reason
+            const describeResponse = await cfn.describeChangeSet({
+                StackName: stackName,
+                ChangeSetName: changeSetName,
+            })
+
+            throw new ToolkitError(`Change set creation failed: ${describeResponse.StatusReason || err.message}`)
+        })
+
+    // Execute the change set
+    await cfn.executeChangeSet({
+        StackName: stackName,
+        ChangeSetName: changeSetName,
+    })
+
+    // Wait for stack import to complete
+    await cfn
+        .waitFor('stackImportComplete', {
+            StackName: stackName,
+            $waiter: {
+                delay: 2,
+            },
+        })
+        .catch(async () => {
+            // If the stack import failed, wait for stack update complete instead
+            // (AWS SDK might not have stackImportComplete waiter)
+            await cfn.waitFor('stackUpdateComplete', {
+                StackName: stackName,
+                $waiter: {
+                    delay: 2,
+                },
+            })
+        })
+
+    // Get the stack ID
+    const describeStackResponse = await cfn.describeStacks({
+        StackName: stackName,
+    })
+
+    if (!describeStackResponse.Stacks || !describeStackResponse.Stacks[0].StackId) {
+        throw new ToolkitError('Failed to get stack information')
+    }
+
+    // Return information about the deployed stack
+    return {
+        stackId: describeStackResponse.Stacks[0].StackId,
+        stackName,
+        template,
+        isSamTemplate: false,
+    }
+}
+
+export function removeUnwantedCodeParameters(template: Template) {
+    if (!template.Resources) {
+        throw new Error('No Resources found in template')
+    }
+
+    const lambdaKey = Object.keys(template.Resources).find(
+        (key) => template.Resources![key]?.Type === 'AWS::Lambda::Function'
+    )
+
+    if (!lambdaKey) {
+        throw new Error('No Lambda function found in template')
+    }
+
+    template.Resources[lambdaKey]!.Properties!.Code = {
+        ZipFile: '',
+    }
+
+    template.Parameters = {}
+}
+
+/**
+ * Extracts the logical ID from an intrinsic function like !Ref or !GetAtt
+ * Returns undefined if the value is not an intrinsic function
+ */
+export function extractLogicalIdFromIntrinsic(value: any): string | undefined {
+    // Check for Ref: { "Ref": "logicalId" }
+    if (typeof value === 'object' && value !== null && Object.keys(value).length === 1 && value.Ref) {
+        return value.Ref
+    }
+
+    // Check for GetAtt: { "Fn::GetAtt": ["logicalId", "Arn"] }
+    if (
+        typeof value === 'object' &&
+        value !== null &&
+        Object.keys(value).length === 1 &&
+        value['Fn::GetAtt'] &&
+        Array.isArray(value['Fn::GetAtt']) &&
+        value['Fn::GetAtt'].length === 2 &&
+        value['Fn::GetAtt'][1] === 'Arn'
+    ) {
+        return value['Fn::GetAtt'][0]
+    }
+
+    return undefined
+}
+
+/**
+ * the main tansform to convert a CFN template to a sam project
+ * @param resources the parsed CFN template
+ * @param projectDir selected local location for project
+ * @param stackInfo
+ * @param region
+ */
+export async function cfn2sam(
+    resources: TemplateResources,
+    projectDir: vscode.Uri,
+    stackInfo: StackInfo,
+    region: string
+): Promise<void> {
+    const lambdaProcess = processLambdaResources(resources, projectDir, stackInfo, region)
+    const lambdaLayerProcess = processLambdaLayerResources(resources, projectDir, stackInfo, region)
+    await Promise.all([lambdaProcess, lambdaLayerProcess])
+    await processLambdaUrlResources(resources)
+}
+
+/**
+ * Processes Lambda resources in a template, transforming AWS::Lambda::Function to AWS::Serverless::Function
+ */
+export function Lambda2Serverless(resourceProp: ZipResourceProperties, key: string): Resource {
+    const dlqConfig = resourceProp.DeadLetterConfig
+    return {
+        Type: SERVERLESS_FUNCTION_TYPE,
+        Metadata: resourceProp.Metadata,
+        Properties: {
+            ...resourceProp,
+            // Transform Tags from array to object format
+            Tags: resourceProp.Tags
+                ? Object.fromEntries(
+                      resourceProp.Tags.filter((item: { Key: any; Value: any }) => item.Key !== 'lambda:createdBy').map(
+                          (item: { Key: any; Value: any }) => [item.Key, item.Value]
+                      )
+                  )
+                : undefined,
+            // Remove Code property (S3 reference)
+            Code: undefined,
+            // Map TracingConfig.Mode to Tracing property
+            Tracing: resourceProp.TracingConfig?.Mode,
+            TracingConfig: undefined,
+            // Transform DeadLetterConfig to DeadLetterQueue
+            DeadLetterQueue: dlqConfig
+                ? {
+                      Type: dlqConfig.TargetArn.split(':')[2] === 'sqs' ? 'SQS' : 'SNS',
+                      TargetArn: dlqConfig.TargetArn,
+                  }
+                : undefined,
+            // Set CodeUri to the local path
+            CodeUri: key,
+        },
+    }
+}
+
+/**
+ * Processes Lambda URL resources in a template, transforming AWS::Lambda::Url to AWS::Serverless::Function.FunctionUrlConfig
+ */
+export async function processLambdaResources(
+    resources: TemplateResources,
+    projectDir: vscode.Uri,
+    stackInfo: StackInfo,
+    region: string
+): Promise<void> {
+    await Promise.all(
+        Object.entries(resources).map(async ([key, resource]) => {
+            if (!resource) {
+                return
+            }
+
+            const resourceProp = resource.Properties
+            if (!resourceProp || resourceProp.PackageType === 'Image') {
+                return
+            }
+
+            if (resource.Type === LAMBDA_FUNCTION_TYPE) {
+                // Transform AWS::Lambda::Function to AWS::Serverless::Function
+                try {
+                    await downloadLambdaFunctionCode(key, stackInfo, projectDir, region, resourceProp.FunctionName)
+
+                    // Transform to Serverless Function
+                    resources[key] = Lambda2Serverless(resourceProp, key)
+                } catch (err) {
+                    throw new ToolkitError(
+                        `Failed to process Lambda function ${key}: ${err instanceof Error ? err.message : String(err)}`
+                    )
+                }
+            } else if (resource.Type === SERVERLESS_FUNCTION_TYPE) {
+                // Update CodeUri for AWS::Serverless::Function
+                try {
+                    await downloadLambdaFunctionCode(key, stackInfo, projectDir, region, resourceProp.FunctionName)
+                    // Update the CodeUri to point to the local directory
+                    resourceProp.CodeUri = key
+                } catch (err) {
+                    throw new ToolkitError(
+                        `Failed to process Serverless function ${key}: ${err instanceof Error ? err.message : String(err)}`
+                    )
+                }
+            }
+        })
+    )
+}
+
+/**
+ * Processes Lambda Layer resources in a template, transforming AWS::Lambda::LayerVersion to AWS::Serverless::LayerVersion
+ */
+export async function processLambdaLayerResources(
+    resources: TemplateResources,
+    projectDir: vscode.Uri,
+    stackInfo: StackInfo,
+    region: string
+): Promise<void> {
+    // Process each resource
+    await Promise.all(
+        Object.entries(resources).map(async ([key, resource]) => {
+            if (!resource || (resource.Type !== LAMBDA_LAYER_TYPE && resource.Type !== SERVERLESS_LAYER_TYPE)) {
+                return
+            }
+
+            const resourceProp = resource.Properties
+            if (!resourceProp) {
+                return
+            }
+
+            try {
+                // Download the layer code
+                await downloadLayerVersionResourceByName(key, stackInfo, projectDir, region)
+
+                // Transform to Serverless LayerVersion
+                resources[key] = {
+                    Type: SERVERLESS_LAYER_TYPE,
+                    Properties: {
+                        ...resourceProp,
+                        // Remove Content property (S3 reference)
+                        Content: undefined,
+                        // Set ContentUri to the local path
+                        ContentUri: key,
+                    },
+                }
+
+                getLogger().info(`Successfully transformed Lambda Layer ${key} to Serverless LayerVersion`)
+            } catch (err) {
+                throw new ToolkitError(
+                    `Failed to process Lambda Layer ${key}: ${err instanceof Error ? err.message : String(err)}`
+                )
+            }
+        })
+    )
+}
+
+/**
+ * Processes Lambda URL resources in a template, transforming AWS::Lambda::Url to AWS::Serverless::Function.FunctionUrlConfig
+ */
+export async function processLambdaUrlResources(resources: TemplateResources): Promise<void> {
+    for (const [key, resource] of Object.entries(resources)) {
+        if (resource && resource.Type === LAMBDA_URL_TYPE) {
+            try {
+                const resourceProp = resource.Properties
+                if (!resourceProp) {
+                    continue
+                }
+
+                // Skip if Qualifier is present (not supported in FunctionUrlConfig)
+                if (resourceProp.Qualifier) {
+                    getLogger().info(
+                        `Skipping Lambda URL ${key} because Qualifier is not supported in FunctionUrlConfig`
+                    )
+                    continue
+                }
+
+                // Find the target function using TargetFunctionArn
+                const targetFunctionArn = resourceProp.TargetFunctionArn
+                if (!targetFunctionArn) {
+                    getLogger().warn(`Lambda URL ${key} does not have a TargetFunctionArn`)
+                    continue
+                }
+
+                const targetFunctionKey = extractLogicalIdFromIntrinsic(targetFunctionArn)
+                if (!targetFunctionKey) {
+                    getLogger().debug(`Could not extract logical ID from TargetFunctionArn in Lambda URL ${key}`)
+                    continue
+                }
+
+                const targetFunction = resources[targetFunctionKey]
+                // if MyLambdaFunction 's url is not formated as MyLambdaFunctionUrl, then we shouldn't transform it
+                if (
+                    !targetFunction ||
+                    targetFunction.Type !== SERVERLESS_FUNCTION_TYPE ||
+                    targetFunctionKey + 'Url' !== key
+                ) {
+                    getLogger().debug(`Target function ${targetFunctionKey} not found or not a Serverless Function`)
+                    continue
+                }
+
+                // Add FunctionUrlConfig to the Serverless Function
+                if (!targetFunction.Properties) {
+                    // skip if target function is not correctly setup
+                    continue
+                }
+
+                // Now we can safely add FunctionUrlConfig
+                if (targetFunction.Properties) {
+                    targetFunction.Properties.FunctionUrlConfig = {
+                        AuthType: resourceProp.AuthType,
+                        Cors: resourceProp.Cors,
+                        InvokeMode: resourceProp.InvokeMode,
+                    }
+                }
+
+                // Remove the original Lambda URL resource
+                delete resources[key]
+
+                getLogger().info(
+                    `Successfully transformed Lambda URL ${key} to FunctionUrlConfig in ${targetFunctionKey}`
+                )
+            } catch (err) {
+                throw new ToolkitError(
+                    `Failed to process Lambda URL ${key}: ${err instanceof Error ? err.message : String(err)}`
+                )
+            }
+        }
+    }
+}
+
+/**
+ * Download lambda function code based on logical resource ID or physical resrouce ID
+ * If logical id is given, it will try to find the physical id first and then download the code
+ * If physical id is given, it will download the code directly
+ * @param resourceName logical name of Lambda function in CFN template
+ * @param stackInfo
+ * @param targetDir Local location to store the code
+ * @param region
+ * @param physicalResourceId Physical name of Lambda function
+ */
+export async function downloadLambdaFunctionCode(
+    resourceName: string, // This is the logical name from CFN
+    stackInfo: StackInfo,
+    targetDir: vscode.Uri,
+    region: string,
+    physicalResourceId?: string
+) {
+    try {
+        if (!physicalResourceId || typeof physicalResourceId !== 'string') {
+            physicalResourceId = await getPhysicalIdfromCFNResourceName(
+                resourceName,
+                region,
+                stackInfo.stackId,
+                LAMBDA_FUNCTION_TYPE
+            )
+            if (!physicalResourceId) {
+                throw new ToolkitError(`Could not find physical resource ID for ${resourceName}`)
+            }
+        }
+
+        const lambdaClient = getLambdaClient(region)
+        const functionDetails = await lambdaClient.getFunction(physicalResourceId)
+
+        if (!functionDetails.Code || !functionDetails.Code.Location) {
+            throw new ToolkitError(`Could not determine code location for function: ${physicalResourceId}`)
+        }
+
+        const outputPath = vscode.Uri.joinPath(targetDir, resourceName)
+        await downloadUnzip(functionDetails.Code.Location, outputPath)
+
+        getLogger().info(`Successfully downloaded and extracted: ${resourceName}`)
+    } catch (err) {
+        throw new ToolkitError(
+            `Failed to download resource ${resourceName}: ${err instanceof Error ? err.message : String(err)}`
+        )
+    }
+}
+
+/**
+ * Get physical resource ID from CFN resource name
+ * @param name CFN resource name
+ * @param region
+ * @param stackId
+ * @returns Physical resrouce ID
+ */
+export async function getPhysicalIdfromCFNResourceName(
+    name: string,
+    region: string,
+    stackId: string,
+    resourceType: string
+): Promise<string | undefined> {
+    // Create CloudFormation client
+    const cfn = await getCFNClient(region)
+
+    try {
+        // First try the exact match approach
+        let describeResult
+        try {
+            describeResult = await cfn.describeStackResource({
+                StackName: stackId,
+                LogicalResourceId: name,
+            })
+        } catch (error) {
+            // If it's a permission error, re-throw it immediately
+            if (isPermissionError(error)) {
+                throw error
+            }
+            // For other errors (like ResourceNotFound), continue to fuzzy matching
+            describeResult = undefined
+        }
+
+        if (describeResult?.StackResourceDetail?.PhysicalResourceId) {
+            const physicalResourceId = describeResult.StackResourceDetail.PhysicalResourceId
+            getLogger().debug(`Resource ${name} found with exact match, physical ID: ${physicalResourceId}`)
+            return physicalResourceId
+        }
+
+        // only do fuzzy matching for layer, function doesn't have random suffix
+        if (resourceType === LAMBDA_FUNCTION_TYPE || resourceType === SERVERLESS_FUNCTION_TYPE) {
+            throw new ToolkitError(`Could not find physical resource ID for ${name}`)
+        }
+
+        // If exact match fails, get all resources and try fuzzy matching
+        getLogger().debug(`Resource ${name} not found with exact match, trying fuzzy match...`)
+        const resources = await cfn.describeStackResources({
+            StackName: stackId,
+        })
+
+        if (!resources.StackResources || resources.StackResources.length === 0) {
+            getLogger().debug(`No resources found in stack ${stackId}`)
+            return undefined
+        }
+
+        // Find resources that start with the given name (SAM transform often adds suffixes)
+        const matchingResources = resources.StackResources.filter((resource: StackResource) =>
+            resource.LogicalResourceId?.startsWith(name)
+        )
+
+        if (matchingResources.length === 0) {
+            // Try a more flexible approach - check if the resource name is a substring
+            const substringMatches = resources.StackResources.filter((resource: StackResource) =>
+                resource.LogicalResourceId?.includes(name)
+            )
+
+            if (substringMatches.length === 0) {
+                getLogger().debug(`No fuzzy matches found for resource ${name}`)
+                return undefined
+            }
+
+            // Use the first substring match
+            const match = substringMatches[0]
+            getLogger().debug(
+                `Resource ${name} matched with ${match.LogicalResourceId} using substring match, physical ID: ${match.PhysicalResourceId}`
+            )
+            return match.PhysicalResourceId
+        }
+
+        // If we have multiple matches, prefer exact prefix match
+        // Sort by length to get the closest match (shortest additional suffix)
+        matchingResources.sort(
+            (a: StackResource, b: StackResource) =>
+                (a.LogicalResourceId?.length ?? 0) - (b.LogicalResourceId?.length ?? 0)
+        )
+
+        const bestMatch = matchingResources[0]
+        getLogger().debug(
+            `Resource ${name} matched with ${bestMatch.LogicalResourceId} using prefix match, physical ID: ${bestMatch.PhysicalResourceId}`
+        )
+        return bestMatch.PhysicalResourceId
+    } catch (err) {
+        throw ToolkitError.chain(err, `Error finding physical ID for resource ${name}, please retry`)
+    }
+}
+
+/**
+ * Download a Lambda Layer resource by name and stack info
+ * @param resourceName Layer's Logical name from CFN
+ * @param stackInfo
+ * @param targetDir local location to store
+ * @param region
+ */
+export async function downloadLayerVersionResourceByName(
+    resourceName: string, // This is the logical name from CFN
+    stackInfo: StackInfo,
+    targetDir: vscode.Uri,
+    region: string
+) {
+    try {
+        const physicalResourceId = await getPhysicalIdfromCFNResourceName(
+            resourceName,
+            region,
+            stackInfo.stackId,
+            LAMBDA_LAYER_TYPE
+        )
+        if (!physicalResourceId) {
+            throw new ToolkitError(`Could not find physical resource ID for ${resourceName}`)
+        }
+
+        getLogger().debug(`Resource ${resourceName} has physical ID ${physicalResourceId} and type LayerVersion`)
+
+        // Parse the ARN to extract layer name and version
+        // Format: arn:aws:lambda:region:account-id:layer:layer-name:version
+        const arnParts = physicalResourceId.split(':')
+        if (arnParts.length < 8) {
+            throw new ToolkitError(`Invalid layer ARN format: ${physicalResourceId}`)
+        }
+
+        const layerName = arnParts[6]
+        const version = parseInt(arnParts[7], 10)
+
+        if (isNaN(version)) {
+            throw new ToolkitError(`Invalid version number in layer ARN: ${physicalResourceId}`)
+        }
+
+        getLogger().debug(`Extracted layer name: ${layerName}, version: ${version} from ARN`)
+
+        const lambdaClient = getLambdaClient(region)
+
+        // Get the layer version details directly using the extracted name and version
+        const layerDetails = await lambdaClient.getLayerVersion(layerName, version)
+
+        if (!layerDetails.Content || !layerDetails.Content.Location) {
+            throw new ToolkitError(`Could not determine code location for layer: ${layerName}:${version}`)
+        }
+
+        // Download Lambda layer code using the presigned URL
+        const presignedUrl = layerDetails.Content.Location
+
+        // Use node-fetch to download from the presigned URL
+        const outputPath = vscode.Uri.joinPath(targetDir, resourceName)
+        await downloadUnzip(presignedUrl, outputPath)
+
+        getLogger().info(`Successfully downloaded and extracted layer ${layerName}:${version} to: ${resourceName}`)
+    } catch (err) {
+        throw new ToolkitError(
+            `Failed to download resource ${resourceName}: ${err instanceof Error ? err.message : String(err)}, please retry`
+        )
+    }
+}
diff --git a/packages/core/src/awsService/appBuilder/serverlessLand/main.ts b/packages/core/src/awsService/appBuilder/serverlessLand/main.ts
new file mode 100644
index 00000000000..aac352b9764
--- /dev/null
+++ b/packages/core/src/awsService/appBuilder/serverlessLand/main.ts
@@ -0,0 +1,140 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+import * as path from 'path'
+import * as vscode from 'vscode'
+import { getLogger } from '../../../shared/logger/logger'
+import { checklogs } from '../../../shared/localizedText'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { CreateServerlessLandWizardForm, CreateServerlessLandWizard } from './wizard'
+import { ExtContext } from '../../../shared/extensions'
+import { addFolderToWorkspace } from '../../../shared/utilities/workspaceUtils'
+import { ToolkitError } from '../../../shared/errors'
+import { fs } from '../../../shared/fs/fs'
+import { handleOverwriteConflict } from '../../../shared/utilities/messages'
+import { getPattern } from '../../../shared/utilities/downloadPatterns'
+import { MetadataManager } from './metadataManager'
+
+export const readmeFile: string = 'README.md'
+const serverlessLandOwner = 'aws-samples'
+const serverlessLandRepo = 'serverless-patterns'
+
+/**
+ * Creates a new Serverless Land project using the provided extension context
+ * @param extContext Extension context containing AWS credentials and region information
+ * @returns Promise that resolves when the project creation is complete
+ *
+ * This function:
+ * 1. Validates AWS credentials and regions
+ * 2. Launches the Serverless Land project creation wizard
+ * 3. Creates the project structure
+ * 4. Adds the project folder to the workspace
+ * 5. Opens the README.md file if available
+ * 6. Handles errors and emits telemetry
+ */
+export async function createNewServerlessLandProject(extContext: ExtContext): Promise<void> {
+    let metadataManager: MetadataManager
+
+    try {
+        metadataManager = MetadataManager.getInstance()
+        // Launch the project creation wizard
+        const config = await launchProjectCreationWizard(extContext)
+        if (!config) {
+            return
+        }
+        const assetName = metadataManager.getAssetName(config.pattern, config.runtime, config.iac)
+
+        await downloadPatternCode(config, assetName)
+        await openReadmeFile(config)
+        await addFolderToWorkspace(
+            {
+                uri: vscode.Uri.joinPath(config.location, config.name),
+                name: path.basename(config.name),
+            },
+            true
+        )
+        telemetry.record({
+            templateName: config.pattern,
+            runtimeString: config.runtime,
+            iac: config.iac,
+        })
+    } catch (err) {
+        getLogger().error(
+            localize(
+                'AWS.serverlessland.initWizard.general.error',
+                'Error creating new Serverless Land Application. {0}',
+                checklogs()
+            )
+        )
+        getLogger().error('Error creating new Serverless Land Application: %O', err as Error)
+    }
+}
+
+export async function launchProjectCreationWizard(
+    extContext: ExtContext
+): Promise<CreateServerlessLandWizardForm | undefined> {
+    const awsContext = extContext.awsContext
+    const credentials = await awsContext.getCredentials()
+    const defaultRegion = awsContext.getCredentialDefaultRegion()
+
+    return new CreateServerlessLandWizard({
+        credentials,
+        defaultRegion,
+    }).run()
+}
+
+export async function downloadPatternCode(config: CreateServerlessLandWizardForm, assetName: string): Promise<void> {
+    const fullAssetName = assetName + '.zip'
+    const location = vscode.Uri.joinPath(config.location, config.name)
+
+    await handleOverwriteConflict(location)
+
+    try {
+        await getPattern(serverlessLandOwner, serverlessLandRepo, fullAssetName, location, true)
+    } catch (error) {
+        if (error instanceof ToolkitError) {
+            throw error
+        }
+        throw new ToolkitError(`Failed to download pattern: ${error}`)
+    }
+}
+
+export async function openReadmeFile(config: CreateServerlessLandWizardForm): Promise<void> {
+    try {
+        const readmeUri = await getProjectUri(config, readmeFile)
+        if (!readmeUri) {
+            getLogger().warn('README.md file not found in the project directory')
+            return
+        }
+        await vscode.commands.executeCommand('workbench.action.focusFirstEditorGroup')
+        await vscode.commands.executeCommand('markdown.showPreview', readmeUri)
+    } catch (err) {
+        getLogger().error(`Error in openReadmeFile: ${err}`)
+        throw new ToolkitError('Error processing README file')
+    }
+}
+
+export async function getProjectUri(
+    config: Pick<CreateServerlessLandWizardForm, 'location' | 'name'>,
+    file: string
+): Promise<vscode.Uri | undefined> {
+    if (!file) {
+        throw new ToolkitError('expected "file" parameter to have at least one item')
+    }
+    const cfnTemplatePath = path.resolve(config.location.fsPath, config.name, file)
+    if (await fs.exists(cfnTemplatePath)) {
+        return vscode.Uri.file(cfnTemplatePath)
+    }
+    void vscode.window.showWarningMessage(
+        localize(
+            'AWS.serverlessLand.initWizard.source.error.notFound',
+            'Project created successfully, but {0} file not found: {1}',
+            file!,
+            cfnTemplatePath!
+        )
+    )
+}
diff --git a/packages/core/src/awsService/appBuilder/serverlessLand/metadata.json b/packages/core/src/awsService/appBuilder/serverlessLand/metadata.json
new file mode 100644
index 00000000000..06ab2efc521
--- /dev/null
+++ b/packages/core/src/awsService/appBuilder/serverlessLand/metadata.json
@@ -0,0 +1,108 @@
+{
+    "patterns": {
+        "Image Resizing": {
+            "name": "Resizing image",
+            "description": "Lambda, S3 • Python, Javascript, Java, .NET • SAM",
+            "implementation": [
+                {
+                    "iac": "sam",
+                    "runtime": "python",
+                    "assetName": "s3-lambda-resizing-python"
+                },
+                {
+                    "iac": "sam",
+                    "runtime": "javascript",
+                    "assetName": "s3-lambda"
+                },
+                {
+                    "iac": "sam",
+                    "runtime": "java",
+                    "assetName": "s3-lambda-resizing-java"
+                },
+                {
+                    "iac": "sam",
+                    "runtime": "dotnet",
+                    "assetName": "s3-lambda-dotnet"
+                }
+            ]
+        },
+        "Hello World Lambda with API": {
+            "name": "Rest API",
+            "description": "Lambda, API Gateway • Python, Javascript, Java, .NET • SAM",
+            "implementation": [
+                {
+                    "iac": "sam",
+                    "runtime": "python",
+                    "assetName": "apigw-rest-api-lambda-python"
+                },
+                {
+                    "iac": "sam",
+                    "runtime": "javascript",
+                    "assetName": "apigw-rest-api-lambda-node"
+                },
+                {
+                    "iac": "sam",
+                    "runtime": "java",
+                    "assetName": "apigw-rest-api-lambda-java"
+                },
+                {
+                    "iac": "sam",
+                    "runtime": "dotnet",
+                    "assetName": "apigw-rest-api-lambda-dotnet"
+                }
+            ]
+        },
+        "Process SQS Records with Lambda": {
+            "name": "Process SQS Records with Lambda",
+            "description": "Lambda, SQS • Python, Javascript, Java, .NET • SAM",
+            "implementation": [
+                {
+                    "iac": "sam",
+                    "runtime": "python",
+                    "assetName": "sqs-lambda-python-sam"
+                },
+                {
+                    "iac": "sam",
+                    "runtime": "javascript",
+                    "assetName": "sqs-lambda-nodejs-sam"
+                },
+                {
+                    "iac": "sam",
+                    "runtime": "java",
+                    "assetName": "sqs-lambda-java-sam"
+                },
+                {
+                    "iac": "sam",
+                    "runtime": "dotnet",
+                    "assetName": "sqs-lambda-dotnet-sam"
+                }
+            ]
+        },
+        "Process SNS notification messages with Lambda": {
+            "name": "Process SNS notification messages with Lambda",
+            "description": "Lambda, SNS • Python, Javascript, Java, .NET • SAM",
+            "implementation": [
+                {
+                    "iac": "sam",
+                    "runtime": "python",
+                    "assetName": "sns-lambda-python-sam"
+                },
+                {
+                    "iac": "sam",
+                    "runtime": "javascript",
+                    "assetName": "sns-lambda-nodejs-sam"
+                },
+                {
+                    "iac": "sam",
+                    "runtime": "java",
+                    "assetName": "sns-lambda-java-sam"
+                },
+                {
+                    "iac": "sam",
+                    "runtime": "dotnet",
+                    "assetName": "sns-lambda-dotnet-sam"
+                }
+            ]
+        }
+    }
+}
diff --git a/packages/core/src/awsService/appBuilder/serverlessLand/metadataManager.ts b/packages/core/src/awsService/appBuilder/serverlessLand/metadataManager.ts
new file mode 100644
index 00000000000..35d0b254503
--- /dev/null
+++ b/packages/core/src/awsService/appBuilder/serverlessLand/metadataManager.ts
@@ -0,0 +1,153 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as nodefs from 'fs' // eslint-disable-line no-restricted-imports
+import * as path from 'path'
+import { ToolkitError } from '../../../shared/errors'
+import globals from '../../../shared/extensionGlobals'
+
+interface Implementation {
+    iac: string
+    runtime: string
+    assetName: string
+}
+interface PatternData {
+    name: string
+    description: string
+    implementation: Implementation[]
+}
+
+export interface ProjectMetadata {
+    patterns: Record<string, PatternData>
+}
+
+/**
+ * Manages metadata for serverless application patterns
+ */
+
+export class MetadataManager {
+    private static instance: MetadataManager
+    private metadata: ProjectMetadata | undefined
+
+    private constructor() {}
+
+    public static getInstance(): MetadataManager {
+        if (!MetadataManager.instance) {
+            MetadataManager.instance = new MetadataManager()
+        }
+        return MetadataManager.instance
+    }
+
+    public static initialize(): MetadataManager {
+        const instance = MetadataManager.getInstance()
+        const metadataPath = instance.getMetadataPath()
+        instance.loadMetadata(metadataPath).catch((err) => {
+            throw new ToolkitError(`Failed to load metadata: ${err}`)
+        })
+        return instance
+    }
+
+    public getMetadataPath(): string {
+        return globals.context.asAbsolutePath(path.join('dist', 'src', 'serverlessLand', 'metadata.json'))
+    }
+
+    /**
+     * Loads metadata from a JSON file
+     * @param metadataPath Path to the metadata JSON file
+     * @returns Promise containing the parsed ProjectMetadata
+     */
+    public async loadMetadata(metadataPath: string): Promise<ProjectMetadata> {
+        try {
+            if (!this.metadata) {
+                const metadataContent = nodefs.readFileSync(metadataPath, { encoding: 'utf-8' })
+                const parseMetadata = JSON.parse(metadataContent) as ProjectMetadata
+                this.metadata = parseMetadata
+            }
+            return this.metadata
+        } catch (err) {
+            throw new ToolkitError(`Failed to load metadata: ${err instanceof Error ? err.message : String(err)}`)
+        }
+    }
+
+    /**
+     * Retrieves available patterns with their descriptions
+     * @returns Array of pattern objects containing labels and descriptions
+     */
+    public getPatterns(): { label: string; description?: string }[] {
+        if (!this.metadata) {
+            return []
+        }
+        return Object.entries(this.metadata.patterns).map(([patternName, patternData]) => {
+            let description: string | undefined = undefined
+            if (typeof patternData === 'string') {
+                description = patternData
+            } else if (Array.isArray(patternData)) {
+                // If description is an array, join it into a single string
+                description = patternData.join(' ')
+            }
+            if (!patternData || !patternData.name) {
+                return {
+                    label: patternName,
+                    description: description || 'No description available',
+                }
+            }
+            return {
+                label: patternName,
+                description: patternData.description,
+            }
+        })
+    }
+
+    /**
+     * Gets available runtimes for a specific pattern
+     * @param pattern The pattern name to get runtimes for
+     * @returns Array of runtime options with labels
+     */
+    public getRuntimes(pattern: string): { label: string }[] {
+        const patternData = this.metadata?.patterns?.[pattern]
+        if (!patternData || !patternData.implementation) {
+            return []
+        }
+        const uniqueRuntimes = new Set(patternData.implementation.map((item) => item.runtime))
+        return Array.from(uniqueRuntimes).map((runtime) => ({
+            label: runtime,
+        }))
+    }
+
+    public getUrl(pattern: string): string {
+        const patternData = this.metadata?.patterns?.[pattern]
+        if (!patternData || !patternData.implementation) {
+            return ''
+        }
+        const asset = patternData.implementation[0].assetName
+
+        return `https://serverlessland.com/patterns/${asset}`
+    }
+
+    /**
+     * Gets available Infrastructure as Code options for a specific pattern
+     * @param pattern The pattern name to get IaC options for
+     * @returns Array of IaC options with labels
+     */
+    public getIacOptions(pattern: string): { label: string }[] {
+        const patternData = this.metadata?.patterns?.[pattern]
+        if (!patternData || !patternData.implementation) {
+            return []
+        }
+        const uniqueIaCs = new Set(patternData.implementation.map((item) => item.iac))
+        return Array.from(uniqueIaCs).map((iac) => ({
+            label: iac,
+        }))
+    }
+    public getAssetName(selectedPattern: string, selectedRuntime: string, selectedIaC: string): string {
+        const patternData = this.metadata?.patterns?.[selectedPattern]
+        if (!patternData || !patternData.implementation) {
+            return ''
+        }
+        const matchingImplementation = patternData.implementation.find(
+            (impl) => impl.runtime === selectedRuntime && impl.iac === selectedIaC
+        )
+        return matchingImplementation?.assetName ?? ''
+    }
+}
diff --git a/packages/core/src/awsService/appBuilder/serverlessLand/wizard.ts b/packages/core/src/awsService/appBuilder/serverlessLand/wizard.ts
new file mode 100644
index 00000000000..42b3d28330d
--- /dev/null
+++ b/packages/core/src/awsService/appBuilder/serverlessLand/wizard.ts
@@ -0,0 +1,145 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as nls from 'vscode-nls'
+import * as AWS from '@aws-sdk/types'
+import * as vscode from 'vscode'
+import { Wizard } from '../../../shared/wizards/wizard'
+import * as path from 'path'
+import { createInputBox } from '../../../shared/ui/inputPrompter'
+import { createCommonButtons } from '../../../shared/ui/buttons'
+import { createQuickPick } from '../../../shared/ui/pickerPrompter'
+import { createFolderPrompt } from '../../../shared/ui/common/location'
+import { createExitPrompter } from '../../../shared/ui/common/exitPrompter'
+import { MetadataManager } from './metadataManager'
+import { ToolkitError } from '../../../shared/errors'
+
+const localize = nls.loadMessageBundle()
+export interface CreateServerlessLandWizardForm {
+    name: string
+    location: vscode.Uri
+    pattern: string
+    runtime: string
+    iac: string
+}
+
+function promptPattern(metadataManager: MetadataManager) {
+    const patterns = metadataManager.getPatterns()
+    if (patterns.length === 0) {
+        throw new ToolkitError('No patterns found in metadata')
+    }
+
+    return createQuickPick<string>(
+        patterns.map((p) => ({
+            label: p.label,
+            detail: p.description,
+            data: p.label,
+            buttons: [
+                {
+                    iconPath: new vscode.ThemeIcon('link-external'),
+                    tooltip: 'Open in Serverless Land',
+                },
+            ],
+        })),
+        {
+            title: localize('AWS.serverlessLand.initWizard.pattern.prompt', 'Select a Pattern for your application'),
+            placeholder: 'Choose a pattern for your project',
+            buttons: createCommonButtons(),
+            matchOnDescription: true,
+            matchOnDetail: true,
+        }
+    )
+}
+
+function promptRuntime(metadataManager: MetadataManager, pattern: string | undefined) {
+    if (!pattern || typeof pattern !== 'string') {
+        throw new ToolkitError('Pattern not selected')
+    }
+
+    const runtimes = metadataManager.getRuntimes(pattern)
+    if (runtimes.length === 0) {
+        throw new ToolkitError('No runtimes found for the selected pattern')
+    }
+
+    return createQuickPick<string>(
+        runtimes.map((r) => ({
+            label: r.label,
+            data: r.label,
+        })),
+        {
+            title: localize('AWS.serverlessLand.initWizard.runtime.prompt', 'Select Runtime'),
+            placeholder: 'Choose a runtime for your project',
+            buttons: createCommonButtons(),
+        }
+    )
+}
+
+function promptIac(metadataManager: MetadataManager, pattern: string | undefined) {
+    if (!pattern || typeof pattern !== 'string') {
+        throw new ToolkitError('Pattern not selected')
+    }
+
+    const iacOptions = metadataManager.getIacOptions(pattern)
+    if (iacOptions.length === 0) {
+        throw new ToolkitError('No IAC options found for the selected pattern')
+    }
+
+    return createQuickPick<string>(
+        iacOptions.map((i) => ({
+            label: i.label,
+            data: i.label,
+        })),
+        {
+            title: localize('AWS.serverlessLand.initWizard.iac.prompt', 'Select IaC'),
+            placeholder: 'Choose an IaC option for your project',
+            buttons: createCommonButtons(),
+        }
+    )
+}
+
+function promptLocation() {
+    return createFolderPrompt(vscode.workspace.workspaceFolders ?? [], {
+        title: localize('AWS.serverlessLand.initWizard.location.prompt', 'Select Project Location'),
+        buttons: createCommonButtons(),
+        browseFolderDetail: 'Select a parent folder for your project',
+    })
+}
+
+function promptName(location: vscode.Uri | undefined) {
+    const folderName = location ? path.basename(location.fsPath) : ''
+    return createInputBox({
+        title: localize('AWS.serverlessLand.initWizard.name.prompt', 'Enter Project Name'),
+        placeholder: ` ${folderName}/: Enter a name for your new application`,
+        buttons: createCommonButtons(),
+        validateInput: (value: string): string | undefined => {
+            if (!value) {
+                return 'Application name cannot be empty'
+            }
+            if (value.includes(path.sep)) {
+                return `The path separator (${path.sep}) is not allowed in application names`
+            }
+            return undefined
+        },
+    })
+}
+
+/**
+ * Wizard for creating Serverless Land applications
+ * Guides users through the project creation process
+ */
+export class CreateServerlessLandWizard extends Wizard<CreateServerlessLandWizardForm> {
+    private metadataManager: MetadataManager
+
+    public constructor(context: { defaultRegion?: string; credentials?: AWS.Credentials }) {
+        super({
+            exitPrompterProvider: createExitPrompter,
+        })
+        this.metadataManager = MetadataManager.initialize()
+        this.form.pattern.bindPrompter(() => promptPattern(this.metadataManager))
+        this.form.runtime.bindPrompter((state) => promptRuntime(this.metadataManager, state.pattern))
+        this.form.iac.bindPrompter((state) => promptIac(this.metadataManager, state.pattern))
+        this.form.location.bindPrompter(() => promptLocation())
+        this.form.name.bindPrompter((state) => promptName(state.location))
+    }
+}
diff --git a/packages/core/src/awsService/appBuilder/utils.ts b/packages/core/src/awsService/appBuilder/utils.ts
new file mode 100644
index 00000000000..d88aa170f57
--- /dev/null
+++ b/packages/core/src/awsService/appBuilder/utils.ts
@@ -0,0 +1,756 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { TreeNode } from '../../shared/treeview/resourceTreeDataProvider'
+import * as nls from 'vscode-nls'
+import { ResourceNode } from './explorer/nodes/resourceNode'
+import type { SamAppLocation } from './explorer/samProject'
+import { ToolkitError } from '../../shared/errors'
+import globals from '../../shared/extensionGlobals'
+import { OpenTemplateParams, OpenTemplateWizard } from './explorer/openTemplate'
+import { DataQuickPickItem, createQuickPick } from '../../shared/ui/pickerPrompter'
+import { createCommonButtons } from '../../shared/ui/buttons'
+import { samDeployUrl } from '../../shared/constants'
+import path from 'path'
+import fs from '../../shared/fs/fs'
+import { getLogger } from '../../shared/logger/logger'
+import { RuntimeFamily, getFamily } from '../../lambda/models/samLambdaRuntime'
+import { showMessage } from '../../shared/utilities/messages'
+import { DefaultLambdaClient } from '../../shared/clients/lambdaClient'
+import AdmZip from 'adm-zip'
+import {
+    CloudFormationClient,
+    CreateChangeSetCommand,
+    CreateChangeSetInput,
+    CreateChangeSetOutput,
+    DescribeChangeSetCommand,
+    DescribeChangeSetInput,
+    DescribeChangeSetOutput,
+    DescribeGeneratedTemplateCommand,
+    DescribeGeneratedTemplateInput,
+    DescribeGeneratedTemplateOutput,
+    DescribeStackResourceCommand,
+    DescribeStackResourceInput,
+    DescribeStackResourceOutput,
+    DescribeStackResourcesCommand,
+    DescribeStackResourcesInput,
+    DescribeStackResourcesOutput,
+    DescribeStacksCommand,
+    DescribeStacksInput,
+    DescribeStacksOutput,
+    ExecuteChangeSetCommand,
+    ExecuteChangeSetInput,
+    ExecuteChangeSetOutput,
+    GetGeneratedTemplateCommand,
+    GetGeneratedTemplateInput,
+    GetGeneratedTemplateOutput,
+    GetTemplateCommand,
+    GetTemplateInput,
+    GetTemplateOutput,
+    waitUntilChangeSetCreateComplete,
+    waitUntilStackImportComplete,
+    waitUntilStackUpdateComplete,
+} from '@aws-sdk/client-cloudformation'
+import {
+    FunctionConfiguration,
+    FunctionUrlConfig,
+    GetFunctionResponse,
+    GetLayerVersionResponse,
+    InvocationRequest,
+    InvocationResponse,
+    LayerVersionsListItem,
+    Runtime,
+} from '@aws-sdk/client-lambda'
+import { isAwsError, UnknownError } from '../../shared/errors'
+import { WaiterConfiguration } from '@aws-sdk/types'
+const localize = nls.loadMessageBundle()
+
+/**
+ * Interface for mapping AWS service actions to their required permissions
+ */
+interface PermissionMapping {
+    service: 'cloudformation' | 'lambda'
+    action: string
+    requiredPermissions: string[]
+    documentation?: string
+}
+
+/**
+ * Comprehensive mapping of AWS service actions to their required permissions
+ */
+const PermissionMappings: PermissionMapping[] = [
+    // CloudFormation permissions
+    {
+        service: 'cloudformation',
+        action: 'describeStacks',
+        requiredPermissions: ['cloudformation:DescribeStacks'],
+        documentation: 'https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_DescribeStacks.html',
+    },
+    {
+        service: 'cloudformation',
+        action: 'getTemplate',
+        requiredPermissions: ['cloudformation:GetTemplate'],
+        documentation: 'https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_GetTemplate.html',
+    },
+    {
+        service: 'cloudformation',
+        action: 'createChangeSet',
+        requiredPermissions: ['cloudformation:CreateChangeSet'],
+        documentation: 'https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_CreateChangeSet.html',
+    },
+    {
+        service: 'cloudformation',
+        action: 'executeChangeSet',
+        requiredPermissions: ['cloudformation:ExecuteChangeSet'],
+        documentation: 'https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_ExecuteChangeSet.html',
+    },
+    {
+        service: 'cloudformation',
+        action: 'describeChangeSet',
+        requiredPermissions: ['cloudformation:DescribeChangeSet'],
+        documentation: 'https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_DescribeChangeSet.html',
+    },
+    {
+        service: 'cloudformation',
+        action: 'describeStackResources',
+        requiredPermissions: ['cloudformation:DescribeStackResources'],
+        documentation:
+            'https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_DescribeStackResources.html',
+    },
+    {
+        service: 'cloudformation',
+        action: 'describeStackResource',
+        requiredPermissions: ['cloudformation:DescribeStackResource'],
+        documentation:
+            'https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_DescribeStackResource.html',
+    },
+    {
+        service: 'cloudformation',
+        action: 'getGeneratedTemplate',
+        requiredPermissions: ['cloudformation:GetGeneratedTemplate'],
+        documentation:
+            'https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_GetGeneratedTemplate.html',
+    },
+    {
+        service: 'cloudformation',
+        action: 'describeGeneratedTemplate',
+        requiredPermissions: ['cloudformation:DescribeGeneratedTemplate'],
+        documentation:
+            'https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_DescribeGeneratedTemplate.html',
+    },
+    // Lambda permissions
+    {
+        service: 'lambda',
+        action: 'getFunction',
+        requiredPermissions: ['lambda:GetFunction'],
+        documentation: 'https://docs.aws.amazon.com/lambda/latest/api/API_GetFunction.html',
+    },
+    {
+        service: 'lambda',
+        action: 'listFunctions',
+        requiredPermissions: ['lambda:ListFunctions'],
+        documentation: 'https://docs.aws.amazon.com/lambda/latest/api/API_ListFunctions.html',
+    },
+    {
+        service: 'lambda',
+        action: 'getLayerVersion',
+        requiredPermissions: ['lambda:GetLayerVersion'],
+        documentation: 'https://docs.aws.amazon.com/lambda/latest/api/API_GetLayerVersion.html',
+    },
+    {
+        service: 'lambda',
+        action: 'listLayerVersions',
+        requiredPermissions: ['lambda:ListLayerVersions'],
+        documentation: 'https://docs.aws.amazon.com/lambda/latest/api/API_ListLayerVersions.html',
+    },
+    {
+        service: 'lambda',
+        action: 'listFunctionUrlConfigs',
+        requiredPermissions: ['lambda:GetFunctionUrlConfig'],
+        documentation: 'https://docs.aws.amazon.com/lambda/latest/api/API_GetFunctionUrlConfig.html',
+    },
+    {
+        service: 'lambda',
+        action: 'updateFunctionCode',
+        requiredPermissions: ['lambda:UpdateFunctionCode'],
+        documentation: 'https://docs.aws.amazon.com/lambda/latest/api/API_UpdateFunctionCode.html',
+    },
+    {
+        service: 'lambda',
+        action: 'deleteFunction',
+        requiredPermissions: ['lambda:DeleteFunction'],
+        documentation: 'https://docs.aws.amazon.com/lambda/latest/api/API_DeleteFunction.html',
+    },
+    {
+        service: 'lambda',
+        action: 'invoke',
+        requiredPermissions: ['lambda:InvokeFunction'],
+        documentation: 'https://docs.aws.amazon.com/lambda/latest/api/API_Invoke.html',
+    },
+]
+
+/**
+ * Creates an enhanced error message for permission-related failures
+ */
+function createEnhancedPermissionError(
+    originalError: unknown,
+    service: 'cloudformation' | 'lambda',
+    action: string,
+    resourceArn?: string
+): ToolkitError {
+    const mapping = PermissionMappings.find((m) => m.service === service && m.action === action)
+
+    if (!mapping) {
+        return ToolkitError.chain(originalError, `Permission denied for ${service}:${action}`)
+    }
+
+    const permissionsList = mapping.requiredPermissions.map((p) => `  - ${p}`).join('\n')
+    const resourceInfo = resourceArn ? `\nResource: ${resourceArn}` : ''
+
+    const message = `Permission denied: Missing required permissions for ${service}:${action}
+
+Required permissions:
+${permissionsList}${resourceInfo}
+
+To fix this issue:
+1. Contact your AWS administrator to add the missing permissions
+2. Add these permissions to your IAM user/role policy
+3. If using IAM roles, ensure the role has these permissions attached
+
+${mapping.documentation ? `Documentation: ${mapping.documentation}` : ''}`
+
+    return new ToolkitError(message, {
+        code: 'InsufficientPermissions',
+        cause: UnknownError.cast(originalError),
+        details: {
+            service,
+            action,
+            requiredPermissions: mapping.requiredPermissions,
+            resourceArn,
+        },
+    })
+}
+
+/**
+ * Checks if an error is a permission-related error
+ */
+export function isPermissionError(error: unknown): boolean {
+    return (
+        isAwsError(error) &&
+        (error.code === 'AccessDeniedException' ||
+            error.code === 'UnauthorizedOperation' ||
+            error.code === 'Forbidden' ||
+            error.code === 'AccessDenied' ||
+            (error as any).statusCode === 403)
+    )
+}
+
+/**
+ * Enhanced Lambda client wrapper that provides better error messages for permission issues
+ */
+export class EnhancedLambdaClient {
+    constructor(
+        private readonly client: DefaultLambdaClient,
+        private readonly regionCode: string
+    ) {}
+
+    async deleteFunction(name: string): Promise<void> {
+        try {
+            return await this.client.deleteFunction(name)
+        } catch (error) {
+            if (isPermissionError(error)) {
+                throw createEnhancedPermissionError(
+                    error,
+                    'lambda',
+                    'deleteFunction',
+                    `arn:aws:lambda:${this.regionCode}:*:function:${name}`
+                )
+            }
+            throw error
+        }
+    }
+
+    async invoke(name: string, payload?: InvocationRequest['Payload']): Promise<InvocationResponse> {
+        try {
+            return await this.client.invoke(name, payload)
+        } catch (error) {
+            if (isPermissionError(error)) {
+                throw createEnhancedPermissionError(
+                    error,
+                    'lambda',
+                    'invoke',
+                    `arn:aws:lambda:${this.regionCode}:*:function:${name}`
+                )
+            }
+            throw error
+        }
+    }
+
+    async *listFunctions(): AsyncIterableIterator<FunctionConfiguration> {
+        try {
+            yield* this.client.listFunctions()
+        } catch (error) {
+            if (isPermissionError(error)) {
+                throw createEnhancedPermissionError(error, 'lambda', 'listFunctions')
+            }
+            throw error
+        }
+    }
+
+    async getFunction(name: string): Promise<GetFunctionResponse> {
+        try {
+            return await this.client.getFunction(name)
+        } catch (error) {
+            if (isPermissionError(error)) {
+                throw createEnhancedPermissionError(
+                    error,
+                    'lambda',
+                    'getFunction',
+                    `arn:aws:lambda:${this.regionCode}:*:function:${name}`
+                )
+            }
+            throw error
+        }
+    }
+
+    async getLayerVersion(name: string, version: number): Promise<GetLayerVersionResponse> {
+        try {
+            return await this.client.getLayerVersion(name, version)
+        } catch (error) {
+            if (isPermissionError(error)) {
+                throw createEnhancedPermissionError(
+                    error,
+                    'lambda',
+                    'getLayerVersion',
+                    `arn:aws:lambda:${this.regionCode}:*:layer:${name}:${version}`
+                )
+            }
+            throw error
+        }
+    }
+
+    async *listLayerVersions(name: string): AsyncIterableIterator<LayerVersionsListItem> {
+        try {
+            yield* this.client.listLayerVersions(name)
+        } catch (error) {
+            if (isPermissionError(error)) {
+                throw createEnhancedPermissionError(
+                    error,
+                    'lambda',
+                    'listLayerVersions',
+                    `arn:aws:lambda:${this.regionCode}:*:layer:${name}`
+                )
+            }
+            throw error
+        }
+    }
+
+    async getFunctionUrlConfigs(name: string): Promise<FunctionUrlConfig[]> {
+        try {
+            return await this.client.getFunctionUrlConfigs(name)
+        } catch (error) {
+            if (isPermissionError(error)) {
+                throw createEnhancedPermissionError(
+                    error,
+                    'lambda',
+                    'listFunctionUrlConfigs',
+                    `arn:aws:lambda:${this.regionCode}:*:function:${name}`
+                )
+            }
+            throw error
+        }
+    }
+
+    async updateFunctionCode(name: string, zipFile: Uint8Array): Promise<FunctionConfiguration> {
+        try {
+            return await this.client.updateFunctionCode(name, zipFile)
+        } catch (error) {
+            if (isPermissionError(error)) {
+                throw createEnhancedPermissionError(
+                    error,
+                    'lambda',
+                    'updateFunctionCode',
+                    `arn:aws:lambda:${this.regionCode}:*:function:${name}`
+                )
+            }
+            throw error
+        }
+    }
+}
+
+/**
+ * Enhanced CloudFormation client wrapper that provides better error messages for permission issues
+ */
+export class EnhancedCloudFormationClient {
+    constructor(
+        private readonly client: CloudFormationClient,
+        private readonly regionCode: string
+    ) {}
+
+    async describeStacks(params: DescribeStacksInput): Promise<DescribeStacksOutput> {
+        try {
+            return await this.client.send(new DescribeStacksCommand(params))
+        } catch (error) {
+            if (isPermissionError(error)) {
+                const stackArn = params.StackName
+                    ? `arn:aws:cloudformation:${this.regionCode}:*:stack/${params.StackName}/*`
+                    : undefined
+                throw createEnhancedPermissionError(error, 'cloudformation', 'describeStacks', stackArn)
+            }
+            throw error
+        }
+    }
+
+    async getTemplate(params: GetTemplateInput): Promise<GetTemplateOutput> {
+        try {
+            return await this.client.send(new GetTemplateCommand(params))
+        } catch (error) {
+            if (isPermissionError(error)) {
+                const stackArn = params.StackName
+                    ? `arn:aws:cloudformation:${this.regionCode}:*:stack/${params.StackName}/*`
+                    : undefined
+                throw createEnhancedPermissionError(error, 'cloudformation', 'getTemplate', stackArn)
+            }
+            throw error
+        }
+    }
+
+    async createChangeSet(params: CreateChangeSetInput): Promise<CreateChangeSetOutput> {
+        try {
+            return await this.client.send(new CreateChangeSetCommand(params))
+        } catch (error) {
+            if (isPermissionError(error)) {
+                const stackArn = params.StackName
+                    ? `arn:aws:cloudformation:${this.regionCode}:*:stack/${params.StackName}/*`
+                    : undefined
+                throw createEnhancedPermissionError(error, 'cloudformation', 'createChangeSet', stackArn)
+            }
+            throw error
+        }
+    }
+
+    async executeChangeSet(params: ExecuteChangeSetInput): Promise<ExecuteChangeSetOutput> {
+        try {
+            return await this.client.send(new ExecuteChangeSetCommand(params))
+        } catch (error) {
+            if (isPermissionError(error)) {
+                const stackArn = params.StackName
+                    ? `arn:aws:cloudformation:${this.regionCode}:*:stack/${params.StackName}/*`
+                    : undefined
+                throw createEnhancedPermissionError(error, 'cloudformation', 'executeChangeSet', stackArn)
+            }
+            throw error
+        }
+    }
+
+    async describeChangeSet(params: DescribeChangeSetInput): Promise<DescribeChangeSetOutput> {
+        try {
+            return await this.client.send(new DescribeChangeSetCommand(params))
+        } catch (error) {
+            if (isPermissionError(error)) {
+                const stackArn = params.StackName
+                    ? `arn:aws:cloudformation:${this.regionCode}:*:stack/${params.StackName}/*`
+                    : undefined
+                throw createEnhancedPermissionError(error, 'cloudformation', 'describeChangeSet', stackArn)
+            }
+            throw error
+        }
+    }
+
+    async describeStackResources(params: DescribeStackResourcesInput): Promise<DescribeStackResourcesOutput> {
+        try {
+            return await this.client.send(new DescribeStackResourcesCommand(params))
+        } catch (error) {
+            if (isPermissionError(error)) {
+                const stackArn = params.StackName
+                    ? `arn:aws:cloudformation:${this.regionCode}:*:stack/${params.StackName}/*`
+                    : undefined
+                throw createEnhancedPermissionError(error, 'cloudformation', 'describeStackResources', stackArn)
+            }
+            throw error
+        }
+    }
+
+    async describeStackResource(params: DescribeStackResourceInput): Promise<DescribeStackResourceOutput> {
+        try {
+            return await this.client.send(new DescribeStackResourceCommand(params))
+        } catch (error) {
+            if (isPermissionError(error)) {
+                const stackArn = params.StackName
+                    ? `arn:aws:cloudformation:${this.regionCode}:*:stack/${params.StackName}/*`
+                    : undefined
+                throw createEnhancedPermissionError(error, 'cloudformation', 'describeStackResource', stackArn)
+            }
+            throw error
+        }
+    }
+
+    async getGeneratedTemplate(params: GetGeneratedTemplateInput): Promise<GetGeneratedTemplateOutput> {
+        try {
+            return await this.client.send(new GetGeneratedTemplateCommand(params))
+        } catch (error) {
+            if (isPermissionError(error)) {
+                throw createEnhancedPermissionError(error, 'cloudformation', 'getGeneratedTemplate')
+            }
+            throw error
+        }
+    }
+
+    async describeGeneratedTemplate(params: DescribeGeneratedTemplateInput): Promise<DescribeGeneratedTemplateOutput> {
+        try {
+            return await this.client.send(new DescribeGeneratedTemplateCommand(params))
+        } catch (error) {
+            if (isPermissionError(error)) {
+                throw createEnhancedPermissionError(error, 'cloudformation', 'describeGeneratedTemplate')
+            }
+            throw error
+        }
+    }
+
+    async waitFor(state: string, params: any): Promise<any> {
+        try {
+            const waiterConfig = {
+                client: this.client,
+                maxWaitTime: 900,
+            } satisfies WaiterConfiguration<CloudFormationClient>
+            switch (state) {
+                case 'changeSetCreateComplete':
+                    return await waitUntilChangeSetCreateComplete(waiterConfig, params)
+                case 'stackImportComplete':
+                    return await waitUntilStackImportComplete(waiterConfig, params)
+                case 'stackUpdateComplete':
+                    return await waitUntilStackUpdateComplete(waiterConfig, params)
+                default:
+                    throw new Error(`Unsupported waiter state: ${state}`)
+            }
+        } catch (error) {
+            if (isPermissionError(error)) {
+                // For waitFor operations, we'll provide a generic permission error since the specific action varies
+                throw createEnhancedPermissionError(error, 'cloudformation', 'describeStacks')
+            }
+            throw error
+        }
+    }
+}
+
+export async function runOpenTemplate(arg?: TreeNode) {
+    const templateUri = arg ? (arg.resource as SamAppLocation).samTemplateUri : await promptUserForTemplate()
+    if (!templateUri || !(await fs.exists(templateUri))) {
+        throw new ToolkitError('SAM Template not found, cannot open template', { code: 'NoTemplateProvided' })
+    }
+    const document = await vscode.workspace.openTextDocument(templateUri)
+    await vscode.window.showTextDocument(document)
+}
+
+/**
+ * Find and open the lambda handler with given ResourceNode
+ * If not found, a NoHandlerFound error will be raised
+ * @param arg ResourceNode
+ */
+export async function runOpenHandler(arg: ResourceNode): Promise<void> {
+    const folderUri = path.dirname(arg.resource.location.fsPath)
+    if (!arg.resource.resource.CodeUri) {
+        throw new ToolkitError('No CodeUri provided in template, cannot open handler', { code: 'NoCodeUriProvided' })
+    }
+
+    if (!arg.resource.resource.Handler) {
+        throw new ToolkitError('No Handler provided in template, cannot open handler', { code: 'NoHandlerProvided' })
+    }
+
+    if (!arg.resource.resource.Runtime) {
+        throw new ToolkitError('No Runtime provided in template, cannot open handler', { code: 'NoRuntimeProvided' })
+    }
+
+    const handlerFile = await getLambdaHandlerFile(
+        vscode.Uri.file(folderUri),
+        arg.resource.resource.CodeUri,
+        arg.resource.resource.Handler,
+        arg.resource.resource.Runtime
+    )
+    if (!handlerFile) {
+        throw new ToolkitError(
+            `No handler file found with name "${arg.resource.resource.Handler}". Ensure the file exists in the expected location."`,
+            {
+                code: 'NoHandlerFound',
+            }
+        )
+    }
+    await vscode.workspace.openTextDocument(handlerFile).then(async (doc) => await vscode.window.showTextDocument(doc))
+}
+
+// create a set to store all supported runtime in the following function
+const supportedRuntimeForHandler = new Set<RuntimeFamily>([
+    RuntimeFamily.Ruby,
+    RuntimeFamily.Python,
+    RuntimeFamily.NodeJS,
+    RuntimeFamily.DotNet,
+    RuntimeFamily.Java,
+])
+
+/**
+ * Get the actual Lambda handler file, in vscode.Uri format, from the template
+ * file and handler name. If not found, return undefined.
+ *
+ * @param folderUri The root folder for sam project
+ * @param codeUri codeUri prop in sam template
+ * @param handler handler prop in sam template
+ * @param runtime runtime prop in sam template
+ * @returns
+ */
+export async function getLambdaHandlerFile(
+    folderUri: vscode.Uri,
+    codeUri: string,
+    handler: string,
+    runtime: Runtime
+): Promise<vscode.Uri | undefined> {
+    const family = getFamily(runtime)
+    if (!supportedRuntimeForHandler.has(family)) {
+        throw new ToolkitError(`Runtime ${runtime} is not supported for the 'Open handler' button`, {
+            code: 'RuntimeNotSupported',
+        })
+    }
+
+    // if this function is used to get handler from a just downloaded lambda function zip. codeUri will be ''
+    if (codeUri !== '') {
+        folderUri = vscode.Uri.joinPath(folderUri, codeUri)
+    }
+
+    const handlerParts = handler.split('.')
+    // sample: app.lambda_handler -> app.rb
+    if (family === RuntimeFamily.Ruby) {
+        // Ruby supports namespace/class handlers as well, but the path is
+        // guaranteed to be slash-delimited so we can assume the first part is
+        // the path
+        return vscode.Uri.joinPath(folderUri, handlerParts.slice(0, handlerParts.length - 1).join('/') + '.rb')
+    }
+
+    // sample:app.lambda_handler -> app.py
+    if (family === RuntimeFamily.Python) {
+        // Otherwise (currently Node.js and Python) handle dot-delimited paths
+        return vscode.Uri.joinPath(folderUri, handlerParts.slice(0, handlerParts.length - 1).join('/') + '.py')
+    }
+
+    // sample: app.handler -> app.mjs/app.js
+    // More likely to be mjs if NODEJS version>=18, now searching for both
+    if (family === RuntimeFamily.NodeJS) {
+        const handlerName = handlerParts.slice(0, handlerParts.length - 1).join('/')
+        const handlerPath = path.dirname(handlerName)
+        const handlerFile = path.basename(handlerName)
+        const pattern = new vscode.RelativePattern(
+            vscode.Uri.joinPath(folderUri, handlerPath),
+            `${handlerFile}.{js,mjs,cjs,ts}`
+        )
+        return searchHandlerFile(folderUri, pattern)
+    }
+    // search directly under Code uri for Dotnet and java
+    // sample: ImageResize::ImageResize.Function::FunctionHandler -> Function.cs
+    if (family === RuntimeFamily.DotNet) {
+        const handlerName = path.basename(handler.split('::')[1].replaceAll('.', '/'))
+        const pattern = new vscode.RelativePattern(folderUri, `${handlerName}.cs`)
+        return searchHandlerFile(folderUri, pattern)
+    }
+
+    // sample: resizer.App::handleRequest -> App.java
+    if (family === RuntimeFamily.Java) {
+        const handlerName = handler.split('::')[0].replaceAll('.', '/')
+        const pattern = new vscode.RelativePattern(folderUri, `**/${handlerName}.java`)
+        return searchHandlerFile(folderUri, pattern)
+    }
+}
+
+/**
+    Searches for a handler file in the given pattern and returns the first match.
+    If no match is found, returns undefined.
+*/
+export async function searchHandlerFile(
+    folderUri: vscode.Uri,
+    pattern: vscode.RelativePattern
+): Promise<vscode.Uri | undefined> {
+    const handlerFile = await vscode.workspace.findFiles(pattern, new vscode.RelativePattern(folderUri, '.aws-sam'))
+    if (handlerFile.length === 0) {
+        return undefined
+    }
+    if (handlerFile.length > 1) {
+        getLogger().warn(`Multiple handler files found with name "${path.basename(handlerFile[0].fsPath)}"`)
+        void showMessage('warn', `Multiple handler files found with name "${path.basename(handlerFile[0].fsPath)}"`)
+    }
+    if (await fs.exists(handlerFile[0])) {
+        return handlerFile[0]
+    }
+    return undefined
+}
+
+async function promptUserForTemplate() {
+    const registry = await globals.templateRegistry
+    const openTemplateParams: Partial<OpenTemplateParams> = {}
+
+    const param = await new OpenTemplateWizard(openTemplateParams, registry).run()
+    return param?.template.uri
+}
+
+export async function deployTypePrompt() {
+    const items: DataQuickPickItem<string>[] = [
+        {
+            label: 'Sync',
+            data: 'sync',
+            detail: 'Speed up your development and testing experience in the AWS Cloud. With the --watch parameter, sync will build, deploy and watch for local changes',
+            description: 'Development environments',
+        },
+        {
+            label: 'Deploy',
+            data: 'deploy',
+            detail: 'Deploys your template through CloudFormation',
+            description: 'Production environments',
+        },
+    ]
+
+    const selected = await createQuickPick(items, {
+        title: localize('AWS.appBuilder.deployType.title', 'Select deployment command'),
+        placeholder: 'Press enter to proceed with highlighted option',
+        buttons: createCommonButtons(samDeployUrl),
+    }).prompt()
+
+    if (!selected) {
+        getLogger().info('Operation cancelled.')
+        return
+    }
+    return selected
+}
+
+export async function downloadUnzip(url: string, destination: vscode.Uri) {
+    const response = await fetch(url)
+    if (!response.ok) {
+        throw new Error(`Failed to download Lambda layer code: ${response.statusText}`)
+    }
+
+    // Get the response as an ArrayBuffer
+    const arrayBuffer = await response.arrayBuffer()
+    const zipBuffer = Buffer.from(arrayBuffer)
+
+    // Create AdmZip instance with the buffer
+    const zip = new AdmZip(zipBuffer)
+
+    // Create output directory if it doesn't exist
+    if (!(await fs.exists(destination))) {
+        await fs.mkdir(destination)
+    }
+
+    // Extract zip contents to output path
+    zip.extractAllTo(destination.fsPath, true)
+}
+
+export function getLambdaClient(region: string): EnhancedLambdaClient {
+    const originalClient = new DefaultLambdaClient(region)
+    return new EnhancedLambdaClient(originalClient, region)
+}
+
+export async function getCFNClient(regionCode: string): Promise<EnhancedCloudFormationClient> {
+    const originalClient = globals.sdkClientBuilderV3.createAwsService({
+        serviceClient: CloudFormationClient,
+        region: regionCode,
+    })
+    return new EnhancedCloudFormationClient(originalClient, regionCode)
+}
diff --git a/packages/core/src/awsService/appBuilder/walkthrough.ts b/packages/core/src/awsService/appBuilder/walkthrough.ts
new file mode 100644
index 00000000000..e1a0954864b
--- /dev/null
+++ b/packages/core/src/awsService/appBuilder/walkthrough.ts
@@ -0,0 +1,380 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as semver from 'semver'
+import * as vscode from 'vscode'
+import globals from '../../shared/extensionGlobals'
+import { getLogger } from '../../shared/logger/logger'
+
+import { Wizard } from '../../shared/wizards/wizard'
+import { createQuickPick } from '../../shared/ui/pickerPrompter'
+import { createCommonButtons } from '../../shared/ui/buttons'
+import * as nls from 'vscode-nls'
+import { ToolkitError } from '../../shared/errors'
+import { createSingleFileDialog } from '../../shared/ui/common/openDialog'
+import { fs } from '../../shared/fs/fs'
+import path from 'path'
+import { telemetry, ToolId } from '../../shared/telemetry/telemetry'
+
+import { minSamCliVersionForAppBuilderSupport } from '../../shared/sam/cli/samCliValidator'
+import { SamCliInfoInvocation } from '../../shared/sam/cli/samCliInfo'
+import { openUrl } from '../../shared/utilities/vsCodeUtils'
+import { getOrInstallCli, awsClis, AwsClis } from '../../shared/utilities/cliUtils'
+import { getPattern } from '../../shared/utilities/downloadPatterns'
+import { addFolderToWorkspace } from '../../shared/utilities/workspaceUtils'
+
+const localize = nls.loadMessageBundle()
+const serverlessLandUrl = 'https://serverlessland.com/'
+export const walkthroughContextString = 'aws.toolkit.lambda.walkthroughSelected'
+export const templateToOpenAppComposer = 'aws.toolkit.appComposer.templateToOpenOnStart'
+const defaultTemplateName = 'template.yaml'
+const serverlessLandOwner = 'aws-samples'
+const serverlessLandRepo = 'serverless-patterns'
+
+type WalkthroughOptions = 'CustomTemplate' | 'Visual' | 'S3' | 'API'
+type TutorialRuntimeOptions = 'python' | 'node' | 'java' | 'dotnet' | 'skipped'
+
+interface IServerlessLandProject {
+    asset: string
+    handler?: string
+}
+
+export const appMap = new Map<string, IServerlessLandProject>([
+    ['APIdotnet', { asset: 'apigw-rest-api-lambda-dotnet.zip', handler: 'src/HelloWorld/Function.cs' }],
+    ['APInode', { asset: 'apigw-rest-api-lambda-node.zip', handler: 'hello_world/app.mjs' }],
+    ['APIpython', { asset: 'apigw-rest-api-lambda-python.zip', handler: 'hello_world/app.py' }],
+    [
+        'APIjava',
+        {
+            asset: 'apigw-rest-api-lambda-java.zip',
+            handler: 'HelloWorldFunction/src/main/java/helloworld/App.java',
+        },
+    ],
+    ['S3dotnet', { asset: 's3-lambda-resizing-dotnet.zip', handler: 'ImageResize/Function.cs' }],
+    ['S3node', { asset: 's3-lambda-resizing-node.zip', handler: 'src/app.js' }],
+    ['S3python', { asset: 's3-lambda-resizing-python.zip', handler: 'src/app.py' }],
+    [
+        'S3java',
+        {
+            asset: 's3-lambda-resizing-java.zip',
+            handler: 'ResizerFunction/src/main/java/resizer/App.java',
+        },
+    ],
+])
+
+export class RuntimeLocationWizard extends Wizard<{
+    runtime: TutorialRuntimeOptions
+    dir: string
+    realDir: vscode.Uri
+}> {
+    public constructor(skipRuntime: boolean, labelValue: string, existingTemplates?: vscode.Uri[]) {
+        super()
+        const form = this.form
+
+        // step1: choose runtime
+        const items: { label: string; data: TutorialRuntimeOptions }[] = [
+            { label: 'Python', data: 'python' },
+            { label: 'Node JS', data: 'node' },
+            { label: 'Java', data: 'java' },
+            { label: 'Dot Net', data: 'dotnet' },
+        ]
+        form.runtime.bindPrompter(
+            () => {
+                return createQuickPick(items, {
+                    title: localize('AWS.toolkit.lambda.walkthroughSelectRuntime', 'Select a runtime'),
+                    buttons: createCommonButtons(serverlessLandUrl),
+                })
+            },
+            { showWhen: () => !skipRuntime }
+        )
+
+        // step2: choose location for project
+        const wsFolders = vscode.workspace.workspaceFolders
+        const items2 = [
+            {
+                label: localize('AWS.toolkit.lambda.walkthroughOpenExplorer', 'Open file explorer'),
+                data: 'file-selector',
+            },
+        ]
+
+        // if at least one open workspace, add all opened workspace as options
+        if (wsFolders && labelValue !== 'Open existing Project') {
+            for (const wsFolder of wsFolders) {
+                items2.push({ label: wsFolder.uri.fsPath, data: wsFolder.uri.fsPath })
+            }
+        }
+
+        if (wsFolders && existingTemplates && labelValue === 'Open existing Project') {
+            existingTemplates.map((file) => {
+                items2.push({ label: file.fsPath, data: path.dirname(file.fsPath) })
+            })
+        }
+
+        form.dir.bindPrompter(() => {
+            return createQuickPick(items2, {
+                title:
+                    labelValue === 'Open existing Project'
+                        ? localize('AWS.toolkit.lambda.walkthroughOpenExistProject', 'Select an existing template file')
+                        : localize('AWS.toolkit.lambda.walkthroughProjectLocation', 'Select a location for project'),
+                buttons: createCommonButtons(labelValue === 'Open existing Project' ? undefined : serverlessLandUrl),
+            })
+        })
+
+        const options: vscode.OpenDialogOptions = {
+            canSelectMany: false,
+            openLabel: labelValue,
+            canSelectFiles: false,
+            canSelectFolders: true,
+        }
+        if (wsFolders) {
+            options.defaultUri = wsFolders[0]?.uri
+        }
+
+        form.realDir.bindPrompter((state) => createSingleFileDialog(options), {
+            showWhen: (state) => state.dir !== undefined && state.dir === 'file-selector',
+            setDefault: (state) => (state.dir ? vscode.Uri.file(state.dir) : undefined),
+        })
+    }
+}
+
+export async function getTutorial(
+    runtime: TutorialRuntimeOptions,
+    project: WalkthroughOptions,
+    outputDir: vscode.Uri,
+    source?: string
+): Promise<void> {
+    const appSelected = appMap.get(project + runtime)
+    telemetry.record({ action: project + runtime, source: source ?? 'AppBuilderWalkthrough' })
+    if (!appSelected) {
+        throw new ToolkitError(`Template '${project}+${runtime}' does not exist, choose another template.`)
+    }
+
+    try {
+        await getPattern(serverlessLandOwner, serverlessLandRepo, appSelected.asset, outputDir, true)
+    } catch (error) {
+        throw new ToolkitError(`An error occurred while fetching this pattern from Serverless Land: ${error}`)
+    }
+}
+
+/**
+ * Takes projectUri and runtime then generate matching project
+ * @param walkthroughSelected the selected walkthrough
+ * @param projectUri The choosen project uri to generate proejct
+ * @param runtime The runtime choosen
+ */
+export async function genWalkthroughProject(
+    walkthroughSelected: WalkthroughOptions,
+    projectUri: vscode.Uri,
+    runtime: TutorialRuntimeOptions | undefined
+): Promise<void> {
+    // create project here
+    // TODO update with file fetching from serverless land
+    if (walkthroughSelected === 'CustomTemplate') {
+        // customer already have a project, no need to generate
+        return
+    }
+
+    // check if template.yaml already exists
+    const templateUri = vscode.Uri.joinPath(projectUri, defaultTemplateName)
+    if (await fs.exists(templateUri)) {
+        // ask if want to overwrite
+        const choice = await vscode.window.showInformationMessage(
+            localize(
+                'AWS.toolkit.lambda.walkthroughCreateProjectPrompt',
+                '{0} already exist in the selected directory, overwrite?',
+                defaultTemplateName
+            ),
+            'Yes',
+            'No'
+        )
+        if (choice !== 'Yes') {
+            throw new ToolkitError(`A file named ${defaultTemplateName} already exists in this path.`)
+        }
+    }
+
+    // if Yes, or template not found, continue to generate
+    if (walkthroughSelected === 'Visual') {
+        // create an empty template.yaml, open it in appcomposer later
+        await fs.writeFile(templateUri, Buffer.from(''))
+        return
+    }
+    // start fetching project
+    if (runtime && runtime !== 'skipped') {
+        await getTutorial(runtime, walkthroughSelected, projectUri, 'AppBuilderWalkthrough')
+    }
+}
+
+/**
+ * check if the selected project Uri exist in current workspace. If not, add Project folder to Workspace
+ * @param projectUri uri for the selected project
+ */
+export async function openProjectInWorkspace(projectUri: vscode.Uri): Promise<void> {
+    let templateUri: vscode.Uri | undefined = vscode.Uri.joinPath(projectUri, defaultTemplateName)
+    if (!(await fs.exists(templateUri))) {
+        // no template.yaml, trying yml
+        templateUri = vscode.Uri.joinPath(projectUri, 'template.yml')
+        if (!(await fs.exists(templateUri))) {
+            templateUri = undefined
+        }
+    }
+
+    // Open template file, and after update workspace folder
+    if (templateUri) {
+        await vscode.commands.executeCommand('workbench.action.focusFirstEditorGroup')
+        await vscode.window.showTextDocument(await vscode.workspace.openTextDocument(templateUri))
+        // set global key to template to be opened, appComposer will open them upon reload
+        await globals.globalState.update(templateToOpenAppComposer, [templateUri.fsPath])
+    }
+
+    // if extension is reloaded here, this function will never return (killed)
+    await addFolderToWorkspace({ uri: projectUri, name: path.basename(projectUri.fsPath) }, true)
+
+    // Open template file
+    if (templateUri) {
+        // extension not reloaded, set to false
+        await globals.globalState.update(templateToOpenAppComposer, undefined)
+        await vscode.commands.executeCommand('aws.openInApplicationComposer', templateUri)
+    }
+
+    // Open Readme if exist
+    if (await fs.exists(vscode.Uri.joinPath(projectUri, 'README.md'))) {
+        await vscode.commands.executeCommand('workbench.action.focusFirstEditorGroup')
+        await vscode.commands.executeCommand('markdown.showPreview', vscode.Uri.joinPath(projectUri, 'README.md'))
+    }
+}
+
+/**
+ * Used in Toolkit Appbuilder Walkthrough.
+ * 1: Customer select a template
+ * 2: Create project / Or don't create if customer choose use my own template
+ * 3: Add project to workspace, Open template.yaml, open template.yaml in AppComposer
+ */
+export async function initWalkthroughProjectCommand() {
+    const walkthroughSelected = globals.globalState.get<WalkthroughOptions>(walkthroughContextString)
+    let runtimeSelected: TutorialRuntimeOptions | undefined = undefined
+    try {
+        if (!walkthroughSelected || !(typeof walkthroughSelected === 'string')) {
+            getLogger().info('No walkthrough selected - exiting')
+            void vscode.window.showErrorMessage(
+                localize('AWS.toolkit.lambda.walkthroughNotSelected', 'Select a template in the walkthrough.')
+            )
+            return
+        }
+        let labelValue = 'Create Project'
+        if (walkthroughSelected === 'CustomTemplate') {
+            labelValue = 'Open existing Project'
+        }
+        // if these two, skip runtime choice
+        const skipRuntimeChoice = walkthroughSelected === 'Visual' || walkthroughSelected === 'CustomTemplate'
+        const templates: vscode.Uri[] =
+            walkthroughSelected === 'CustomTemplate'
+                ? await vscode.workspace.findFiles('**/{template.yaml,template.yml}', '**/.aws-sam/*')
+                : []
+        const result = await new RuntimeLocationWizard(skipRuntimeChoice, labelValue, templates).run()
+        if (!result) {
+            getLogger().info('User canceled the runtime selection process via quickpick')
+            return
+        }
+
+        if (!result.realDir || !fs.exists(result.realDir)) {
+            // exit for non-vaild uri
+            getLogger().info('exit on customer fileselector cancellation')
+            return
+        }
+
+        runtimeSelected = result.runtime
+
+        // generate project
+        await genWalkthroughProject(walkthroughSelected, result.realDir, runtimeSelected)
+        // open a workspace if no workspace yet
+        await openProjectInWorkspace(result.realDir)
+    } finally {
+        telemetry.record({ action: `${walkthroughSelected}:${runtimeSelected}`, source: 'AppBuilderWalkthrough' })
+    }
+}
+
+export async function getOrUpdateOrInstallSAMCli(source: string) {
+    try {
+        // find sam
+        const samPath = await getOrInstallCli('sam-cli', true, true)
+        // check version
+        const samCliVersion = (await new SamCliInfoInvocation(samPath).execute()).version
+
+        if (semver.lt(samCliVersion, minSamCliVersionForAppBuilderSupport)) {
+            // sam found but version too low
+            const updateInstruction = localize(
+                'AWS.toolkit.updateSAMInstruction',
+                'View AWS SAM CLI update instructions'
+            )
+            const selection = await vscode.window.showInformationMessage(
+                localize(
+                    'AWS.toolkit.samOutdatedPrompt',
+                    'AWS SAM CLI version {0} or greater is required ({1} currently installed).',
+                    minSamCliVersionForAppBuilderSupport,
+                    samCliVersion
+                ),
+                updateInstruction
+            )
+            if (selection === updateInstruction) {
+                void openUrl(vscode.Uri.parse(awsClis['sam-cli'].manualInstallLink))
+            }
+        }
+    } catch (err) {
+        throw ToolkitError.chain(err, 'Failed to install or detect SAM.')
+    } finally {
+        telemetry.record({ source: source, toolId: 'sam-cli' })
+    }
+}
+
+/**
+ * wraps getOrinstallCli and send telemetry
+ * @param toolId to install/check
+ * @param source to be added in telemetry
+ */
+export async function getOrInstallCliWrapper(toolId: AwsClis, source: string) {
+    await telemetry.appBuilder_installTool.run(async (span) => {
+        span.record({ source: source, toolId: toolId })
+        if (toolId === 'sam-cli') {
+            await getOrUpdateOrInstallSAMCli(source)
+            return
+        }
+        try {
+            await getOrInstallCli(toolId, true, true)
+        } finally {
+            telemetry.record({ source: source, toolId: toolId })
+        }
+    })
+}
+
+export async function installLocalStackExtension(source: string) {
+    await telemetry.appBuilder_installTool.run(async (span) => {
+        // TODO: Update `ToolId` accepted values: https://github.com/aws/aws-toolkit-common/blob/8c88537fae2ac7e6524fb2b29ae336c606850eeb/telemetry/definitions/commonDefinitions.json#L2215-L2221
+        // @ts-ignore
+        const toolId: ToolId = 'localstack'
+        span.record({ source, toolId })
+        const extensionId = 'localstack.localstack'
+        const extension = vscode.extensions.getExtension(extensionId)
+        if (extension) {
+            void vscode.window.showInformationMessage(
+                localize(
+                    'AWS.toolkit.lambda.walkthrough.localStackExtension.alreadyInstalled',
+                    'LocalStack extension is already installed'
+                )
+            )
+        } else {
+            try {
+                await vscode.commands.executeCommand('workbench.extensions.installExtension', extensionId)
+                void vscode.window.showInformationMessage(
+                    localize(
+                        'AWS.toolkit.lambda.walkthrough.localStackExtension.installSuccessful',
+                        'LocalStack extension has been installed'
+                    )
+                )
+            } catch (err) {
+                throw ToolkitError.chain(err, 'Failed to install LocalStack extension')
+            }
+        }
+    })
+}
diff --git a/packages/core/src/awsService/appBuilder/wizards/deployTypeWizard.ts b/packages/core/src/awsService/appBuilder/wizards/deployTypeWizard.ts
new file mode 100644
index 00000000000..fbaec4657ca
--- /dev/null
+++ b/packages/core/src/awsService/appBuilder/wizards/deployTypeWizard.ts
@@ -0,0 +1,54 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { samDeployUrl } from '../../../shared/constants'
+import { createCommonButtons } from '../../../shared/ui/buttons'
+import { DataQuickPickItem, createQuickPick } from '../../../shared/ui/pickerPrompter'
+import * as nls from 'vscode-nls'
+import { Wizard } from '../../../shared/wizards/wizard'
+import { DeployParams, DeployWizard } from '../../../shared/sam/deploy'
+import { SyncParams, SyncWizard } from '../../../shared/sam/sync'
+import { WizardPrompter } from '../../../shared/ui/wizardPrompter'
+import { createExitPrompter } from '../../../shared/ui/common/exitPrompter'
+const localize = nls.loadMessageBundle()
+
+export class DeployTypeWizard extends Wizard<{
+    choice: string
+    syncParam: SyncParams
+    deployParam: DeployParams
+}> {
+    public constructor(syncWizard: SyncWizard, deployWizard: DeployWizard) {
+        super({ exitPrompterProvider: createExitPrompter })
+        const form = this.form
+
+        const items: DataQuickPickItem<string>[] = [
+            {
+                label: 'Sync',
+                data: 'sync',
+                detail: 'Speed up your development and testing experience in the AWS Cloud. With the --watch parameter, sync will build, deploy and watch for local changes',
+                description: 'Development environments',
+            },
+            {
+                label: 'Deploy',
+                data: 'deploy',
+                detail: 'Deploys your template through CloudFormation',
+                description: 'Production environments',
+            },
+        ]
+        form.choice.bindPrompter(() => {
+            return createQuickPick(items, {
+                title: localize('AWS.appBuilder.deployType.title', 'Select deployment command'),
+                placeholder: 'Press enter to proceed with highlighted option',
+                buttons: createCommonButtons(samDeployUrl),
+            })
+        })
+        form.deployParam.bindPrompter((state) => new WizardPrompter(deployWizard), {
+            showWhen: (state) => state.choice === 'deploy',
+        })
+        form.syncParam.bindPrompter((state) => new WizardPrompter(syncWizard), {
+            showWhen: (state) => state.choice === 'sync',
+        })
+    }
+}
diff --git a/packages/core/src/awsService/appBuilder/wizards/templateParametersWizard.ts b/packages/core/src/awsService/appBuilder/wizards/templateParametersWizard.ts
new file mode 100644
index 00000000000..9641562d6f0
--- /dev/null
+++ b/packages/core/src/awsService/appBuilder/wizards/templateParametersWizard.ts
@@ -0,0 +1,62 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { Wizard } from '../../../shared/wizards/wizard'
+import { createExitPrompter } from '../../../shared/ui/common/exitPrompter'
+import * as CloudFormation from '../../../shared/cloudformation/cloudformation'
+import { createInputBox } from '../../../shared/ui/inputPrompter'
+import { createCommonButtons } from '../../../shared/ui/buttons'
+import { getRecentResponse, updateRecentResponse } from '../../../shared/sam/utils'
+import { getParameters } from '../../../lambda/config/parameterUtils'
+
+export interface TemplateParametersForm {
+    [key: string]: any
+}
+
+export class TemplateParametersWizard extends Wizard<TemplateParametersForm> {
+    template: vscode.Uri
+    preloadedTemplate: CloudFormation.Template | undefined
+    samTemplateParameters: Map<string, { required: boolean }> | undefined
+    samCommandUrl: vscode.Uri
+    commandMementoRootKey: string
+
+    public constructor(template: vscode.Uri, samCommandUrl: vscode.Uri, commandMementoRootKey: string) {
+        super({ exitPrompterProvider: createExitPrompter })
+        this.template = template
+        this.samCommandUrl = samCommandUrl
+        this.commandMementoRootKey = commandMementoRootKey
+    }
+
+    public override async init(): Promise<this> {
+        this.samTemplateParameters = await getParameters(this.template)
+        this.preloadedTemplate = await CloudFormation.load(this.template.fsPath)
+        const samTemplateNames = new Set<string>(this.samTemplateParameters?.keys() ?? [])
+
+        for (const name of samTemplateNames) {
+            if (this.preloadedTemplate) {
+                const defaultValue = this.preloadedTemplate.Parameters
+                    ? (this.preloadedTemplate.Parameters[name]?.Default as string)
+                    : undefined
+                this.form[name].bindPrompter(() =>
+                    this.createParamPromptProvider(name, defaultValue).transform(async (item) => {
+                        await updateRecentResponse(this.commandMementoRootKey, this.template.fsPath, name, item)
+                        return item
+                    })
+                )
+            }
+        }
+
+        return this
+    }
+
+    createParamPromptProvider(name: string, defaultValue: string | undefined) {
+        return createInputBox({
+            title: `Specify SAM Template parameter value for ${name}`,
+            buttons: createCommonButtons(this.samCommandUrl),
+            value: getRecentResponse(this.commandMementoRootKey, this.template.fsPath, name) ?? defaultValue,
+        })
+    }
+}
diff --git a/packages/core/src/awsService/apprunner/activation.ts b/packages/core/src/awsService/apprunner/activation.ts
new file mode 100644
index 00000000000..5b907d2b968
--- /dev/null
+++ b/packages/core/src/awsService/apprunner/activation.ts
@@ -0,0 +1,94 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+import { showViewLogsMessage } from '../../shared/utilities/messages'
+import { AppRunnerServiceNode } from './explorer/apprunnerServiceNode'
+import { getLogger } from '../../shared/logger/logger'
+import { createAppRunnerService } from './commands/createService'
+import { pauseService } from './commands/pauseService'
+import { deleteService } from './commands/deleteService'
+import { createFromEcr } from './commands/createServiceFromEcr'
+import { ExtContext } from '../../shared/extensions'
+import { copyToClipboard } from '../../shared/utilities/messages'
+import { Commands } from '../../shared/vscode/commands2'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { Result } from '../../shared/telemetry/telemetry'
+
+const localize = nls.loadMessageBundle()
+
+const commandMap = new Map<[command: string, errorMessage: string], (...args: any) => Promise<any>>()
+
+const createServiceFailed = localize('aws.apprunner.createService.failed', 'Failed to create App Runner service')
+const createServiceEcrFailed = localize(
+    'aws.apprunner.createServiceFromEcr.failed',
+    'Failed to create App Runner service from ECR'
+)
+const pauseServiceFailed = localize('aws.apprunner.pauseService.failed', 'Failed to pause App Runner service')
+const resumeServiceFailed = localize('aws.apprunner.resumeService.failed', 'Failed to resume App Runner service')
+const copyServiceUrlFailed = localize('aws.apprunner.copyServiceUrl.failed', 'Failed to copy App Runner service URL')
+const openServiceFailed = localize('aws.apprunner.open.failed', 'Failed to open App Runner service')
+const deployServiceFailed = localize(
+    'aws.apprunner.startDeployment.failed',
+    'Failed to start deployment of App Runner service'
+)
+const deleteServiceFailed = localize('aws.apprunner.deleteService.failed', 'Failed to delete App Runner service')
+
+const copyUrl = async (node: AppRunnerServiceNode) => {
+    await copyToClipboard(node.url, 'URL')
+    telemetry.apprunner_copyServiceUrl.emit({ passive: false })
+}
+const openUrl = async (node: AppRunnerServiceNode) => {
+    await vscode.env.openExternal(vscode.Uri.parse(node.url))
+    telemetry.apprunner_openServiceUrl.emit({ passive: false })
+}
+
+const resumeService = async (node: AppRunnerServiceNode) => {
+    let telemetryResult: Result = 'Failed'
+    try {
+        await node.resume()
+        telemetryResult = 'Succeeded'
+    } finally {
+        telemetry.apprunner_resumeService.emit({ result: telemetryResult, passive: false })
+    }
+}
+
+const deployService = async (node: AppRunnerServiceNode) => {
+    let telemetryResult: Result = 'Failed'
+    try {
+        await node.deploy()
+        telemetryResult = 'Succeeded'
+    } finally {
+        telemetry.apprunner_startDeployment.emit({ result: telemetryResult, passive: false })
+    }
+}
+
+commandMap.set(['aws.apprunner.createService', createServiceFailed], createAppRunnerService)
+commandMap.set(['aws.apprunner.createServiceFromEcr', createServiceEcrFailed], createFromEcr)
+commandMap.set(['aws.apprunner.pauseService', pauseServiceFailed], pauseService)
+commandMap.set(['aws.apprunner.resumeService', resumeServiceFailed], resumeService)
+commandMap.set(['aws.apprunner.copyServiceUrl', copyServiceUrlFailed], copyUrl)
+commandMap.set(['aws.apprunner.open', openServiceFailed], openUrl)
+commandMap.set(['aws.apprunner.startDeployment', deployServiceFailed], deployService)
+commandMap.set(['aws.apprunner.deleteService', deleteServiceFailed], deleteService)
+
+/**
+ * Activates App Runner
+ */
+export async function activate(context: ExtContext): Promise<void> {
+    for (const [tuple, command] of commandMap.entries()) {
+        context.extensionContext.subscriptions.push(
+            Commands.register(tuple[0], async (...args: any) => {
+                try {
+                    await command(...args)
+                } catch (err) {
+                    getLogger().error(`${tuple[1]}: %s`, err)
+                    await showViewLogsMessage(tuple[1])
+                }
+            })
+        )
+    }
+}
diff --git a/packages/core/src/awsService/apprunner/commands/createService.ts b/packages/core/src/awsService/apprunner/commands/createService.ts
new file mode 100644
index 00000000000..cafe328ffcd
--- /dev/null
+++ b/packages/core/src/awsService/apprunner/commands/createService.ts
@@ -0,0 +1,41 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { AppRunnerServiceSource, Result } from '../../../shared/telemetry/telemetry'
+import { AppRunnerNode } from '../explorer/apprunnerNode'
+import { CreateAppRunnerServiceWizard } from '../wizards/apprunnerCreateServiceWizard'
+
+export async function createAppRunnerService(node: AppRunnerNode): Promise<void> {
+    let telemetryResult: Result = 'Failed'
+    let source: AppRunnerServiceSource | undefined = undefined
+
+    try {
+        const wizard = new CreateAppRunnerServiceWizard(node.regionCode)
+        const result = await wizard.run()
+        if (result === undefined) {
+            telemetryResult = 'Cancelled'
+            return
+        }
+
+        await node.createService(result)
+        source =
+            result.SourceConfiguration.CodeRepository !== undefined
+                ? 'repository'
+                : result.SourceConfiguration.ImageRepository !== undefined
+                  ? result.SourceConfiguration.ImageRepository.ImageRepositoryType === 'ECR_PUBLIC'
+                      ? 'ecrPublic'
+                      : 'ecr'
+                  : undefined
+        telemetryResult = 'Succeeded'
+    } finally {
+        telemetry.apprunner_createService.emit({
+            result: telemetryResult,
+            // If we cancel there is no source type (so this should be optional)
+            appRunnerServiceSource: source as any,
+            passive: false,
+        })
+    }
+}
diff --git a/packages/core/src/awsService/apprunner/commands/createServiceFromEcr.ts b/packages/core/src/awsService/apprunner/commands/createServiceFromEcr.ts
new file mode 100644
index 00000000000..dfd2c3df099
--- /dev/null
+++ b/packages/core/src/awsService/apprunner/commands/createServiceFromEcr.ts
@@ -0,0 +1,52 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { EcrRepositoryNode } from '../../../awsService/ecr/explorer/ecrRepositoryNode'
+import { EcrTagNode } from '../../../awsService/ecr/explorer/ecrTagNode'
+
+import { CreateAppRunnerServiceWizard } from '../wizards/apprunnerCreateServiceWizard'
+import { AppRunnerClient } from '../../../shared/clients/apprunner'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { Result } from '../../../shared/telemetry/telemetry'
+
+export async function createFromEcr(
+    node: EcrTagNode | EcrRepositoryNode,
+    client = new AppRunnerClient(node.regionCode)
+): Promise<void> {
+    let telemetryResult: Result = 'Failed'
+
+    try {
+        const ecrNode = (node as any).tag === undefined ? (node as EcrRepositoryNode) : (node as EcrTagNode).parent
+        const wizard = new CreateAppRunnerServiceWizard(node.regionCode, {
+            SourceConfiguration: {
+                ImageRepository: {
+                    ImageIdentifier: `${ecrNode.repository.repositoryUri}:${(node as any).tag ?? 'latest'}`,
+                    ImageRepositoryType: 'ECR',
+                    ImageConfiguration: {},
+                },
+                AuthenticationConfiguration: {},
+            },
+        })
+        const result = await wizard.run()
+
+        if (result === undefined) {
+            telemetryResult = 'Cancelled'
+            return
+        }
+
+        await client.createService(result)
+        await vscode.commands.executeCommand('aws.refreshAwsExplorer', true)
+        telemetryResult = 'Succeeded'
+    } finally {
+        telemetry.apprunner_createService.emit({
+            result: telemetryResult,
+            appRunnerServiceSource: 'ecr',
+            passive: false,
+        })
+    }
+
+    return undefined
+}
diff --git a/src/apprunner/commands/deleteService.ts b/packages/core/src/awsService/apprunner/commands/deleteService.ts
similarity index 77%
rename from src/apprunner/commands/deleteService.ts
rename to packages/core/src/awsService/apprunner/commands/deleteService.ts
index 1765c0609e5..51209d1dd72 100644
--- a/src/apprunner/commands/deleteService.ts
+++ b/packages/core/src/awsService/apprunner/commands/deleteService.ts
@@ -1,15 +1,15 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { createHelpButton } from '../../shared/ui/buttons'
-import { createInputBox } from '../../shared/ui/inputPrompter'
+import { createHelpButton } from '../../../shared/ui/buttons'
+import { createInputBox } from '../../../shared/ui/inputPrompter'
 import { AppRunnerServiceNode } from '../explorer/apprunnerServiceNode'
 import * as nls from 'vscode-nls'
-import { isValidResponse } from '../../shared/wizards/wizard'
-import { telemetry } from '../../shared/telemetry/telemetry'
-import { AppRunnerServiceStatus, Result } from '../../shared/telemetry/telemetry'
+import { isValidResponse } from '../../../shared/wizards/wizard'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { AppRunnerServiceStatus, Result } from '../../../shared/telemetry/telemetry'
 const localize = nls.loadMessageBundle()
 
 function validateName(name: string) {
diff --git a/packages/core/src/awsService/apprunner/commands/pauseService.ts b/packages/core/src/awsService/apprunner/commands/pauseService.ts
new file mode 100644
index 00000000000..b2cbdee1cae
--- /dev/null
+++ b/packages/core/src/awsService/apprunner/commands/pauseService.ts
@@ -0,0 +1,42 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as localizedText from '../../../shared/localizedText'
+import { showConfirmationMessage } from '../../../shared/utilities/messages'
+import { AppRunnerServiceNode } from '../explorer/apprunnerServiceNode'
+import { ToolkitPromptSettings } from '../../../shared/settings'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { Result } from '../../../shared/telemetry/telemetry'
+
+export async function pauseService(node: AppRunnerServiceNode): Promise<void> {
+    let telemetryResult: Result = 'Failed'
+
+    try {
+        const prompts = ToolkitPromptSettings.instance
+        const shouldNotify = prompts.isPromptEnabled('apprunnerNotifyPause')
+        const notifyPrompt = localize(
+            'aws.apprunner.pauseService.notify',
+            'Your service will be unavailable while paused. ' +
+                'You can resume the service once the pause operation is complete.'
+        )
+        const confirmationOptions = { prompt: notifyPrompt, confirm: localizedText.ok, cancel: localizedText.cancel }
+
+        if (shouldNotify && !(await showConfirmationMessage(confirmationOptions))) {
+            telemetryResult = 'Cancelled'
+            return
+        }
+
+        await node.pause()
+        telemetryResult = 'Succeeded'
+    } finally {
+        telemetry.apprunner_pauseService.emit({
+            result: telemetryResult,
+            passive: false,
+        })
+    }
+}
diff --git a/packages/core/src/awsService/apprunner/explorer/apprunnerNode.ts b/packages/core/src/awsService/apprunner/explorer/apprunnerNode.ts
new file mode 100644
index 00000000000..6e8bc496472
--- /dev/null
+++ b/packages/core/src/awsService/apprunner/explorer/apprunnerNode.ts
@@ -0,0 +1,92 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { compareTreeItems, makeChildrenNodes } from '../../../shared/treeview/utils'
+import * as vscode from 'vscode'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { AppRunnerServiceNode } from './apprunnerServiceNode'
+import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
+import * as nls from 'vscode-nls'
+import { AppRunnerClient, CreateServiceRequest, ServiceSummary } from '../../../shared/clients/apprunner'
+import { PollingSet } from '../../../shared/utilities/pollingSet'
+
+const localize = nls.loadMessageBundle()
+
+export class AppRunnerNode extends AWSTreeNodeBase {
+    private readonly serviceNodes: Map<string, AppRunnerServiceNode> = new Map()
+    private readonly pollingSet: PollingSet<string> = new PollingSet(20000, this.refresh.bind(this))
+
+    public constructor(
+        public override readonly regionCode: string,
+        public readonly client: AppRunnerClient
+    ) {
+        super('App Runner', vscode.TreeItemCollapsibleState.Collapsed)
+        this.contextValue = 'awsAppRunnerNode'
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        return await makeChildrenNodes({
+            getChildNodes: async () => {
+                await this.updateChildren()
+
+                return [...this.serviceNodes.values()]
+            },
+            getNoChildrenPlaceholderNode: async () =>
+                new PlaceholderNode(
+                    this,
+                    localize('AWS.explorerNode.apprunner.noServices', '[No App Runner services found]')
+                ),
+            sort: (nodeA, nodeB) => compareTreeItems(nodeA, nodeB),
+        })
+    }
+
+    private async getServiceSummaries(): Promise<ServiceSummary[]> {
+        // TODO: avoid resolving all services at once.
+        const serviceCollection = this.client.paginateServices({})
+        return await serviceCollection.flatten().promise()
+    }
+
+    public async updateChildren(): Promise<void> {
+        const serviceSummaries = await this.getServiceSummaries()
+        const deletedNodeArns = new Set(this.serviceNodes.keys())
+
+        await Promise.all(
+            serviceSummaries.map(async (summary) => {
+                if (this.serviceNodes.has(summary.ServiceArn)) {
+                    this.serviceNodes.get(summary.ServiceArn)!.update(summary)
+                    if (summary.Status !== 'OPERATION_IN_PROGRESS') {
+                        this.pollingSet.delete(summary.ServiceArn)
+                        this.pollingSet.clearTimer()
+                    }
+                } else {
+                    this.serviceNodes.set(summary.ServiceArn, new AppRunnerServiceNode(this, this.client, summary))
+                }
+                deletedNodeArns.delete(summary.ServiceArn)
+            })
+        )
+
+        // eslint-disable-next-line unicorn/no-array-for-each
+        deletedNodeArns.forEach(this.deleteNode.bind(this))
+    }
+
+    public startPollingNode(id: string): void {
+        this.pollingSet.add(id)
+    }
+
+    public stopPollingNode(id: string): void {
+        this.pollingSet.delete(id)
+        this.serviceNodes.get(id)?.refresh()
+        this.pollingSet.clearTimer()
+    }
+
+    public deleteNode(id: string): void {
+        this.serviceNodes.delete(id)
+        this.pollingSet.delete(id)
+    }
+
+    public async createService(request: CreateServiceRequest): Promise<void> {
+        await this.client.createService(request)
+        this.refresh()
+    }
+}
diff --git a/src/apprunner/explorer/apprunnerServiceNode.ts b/packages/core/src/awsService/apprunner/explorer/apprunnerServiceNode.ts
similarity index 75%
rename from src/apprunner/explorer/apprunnerServiceNode.ts
rename to packages/core/src/awsService/apprunner/explorer/apprunnerServiceNode.ts
index 814f0d210bf..7a50f6f53f4 100644
--- a/src/apprunner/explorer/apprunnerServiceNode.ts
+++ b/packages/core/src/awsService/apprunner/explorer/apprunnerServiceNode.ts
@@ -1,22 +1,22 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as AsyncLock from 'async-lock'
-import { AppRunnerClient } from '../../shared/clients/apprunnerClient'
-import { AppRunner } from 'aws-sdk'
+import AsyncLock from 'async-lock'
+import { AppRunnerClient, ServiceSummary } from '../../../shared/clients/apprunner'
 import { AppRunnerNode } from './apprunnerNode'
 
-import { toArrayAsync, toMap } from '../../shared/utilities/collectionUtils'
-import { CloudWatchLogsBase } from '../../cloudWatchLogs/explorer/cloudWatchLogsNode'
-import { CloudWatchLogs } from 'aws-sdk'
-import { AWSResourceNode } from '../../shared/treeview/nodes/awsResourceNode'
+import { toArrayAsync, toMap } from '../../../shared/utilities/collectionUtils'
+import { CloudWatchLogsBase } from '../../../awsService/cloudWatchLogs/explorer/cloudWatchLogsNode'
+import { AWSResourceNode } from '../../../shared/treeview/nodes/awsResourceNode'
 
 import * as nls from 'vscode-nls'
-import { getLogger } from '../../shared/logger'
-import { getIcon } from '../../shared/icons'
-import { DefaultCloudWatchLogsClient } from '../../shared/clients/cloudWatchLogsClient'
+import { getLogger } from '../../../shared/logger/logger'
+import { getIcon } from '../../../shared/icons'
+import * as AppRunner from '@aws-sdk/client-apprunner'
+import { CloudWatchLogsClient } from '../../../shared/clients/cloudWatchLogs'
+import { LogGroup } from '@aws-sdk/client-cloudwatch-logs'
 const localize = nls.loadMessageBundle()
 
 const contextBase = 'awsAppRunnerServiceNode'
@@ -41,9 +41,9 @@ export class AppRunnerServiceNode extends CloudWatchLogsBase implements AWSResou
     constructor(
         public readonly parent: AppRunnerNode,
         private readonly client: AppRunnerClient,
-        private _info: AppRunner.Service,
+        private _info: ServiceSummary,
         private currentOperation: AppRunner.OperationSummary & { Type?: ServiceOperation } = {},
-        cloudwatchClient = new DefaultCloudWatchLogsClient(client.regionCode)
+        cloudwatchClient = new CloudWatchLogsClient(client.regionCode)
     ) {
         super('App Runner Service', parent.regionCode, cloudwatchClient)
 
@@ -55,7 +55,7 @@ export class AppRunnerServiceNode extends CloudWatchLogsBase implements AWSResou
         this.update(_info)
     }
 
-    public get info(): Readonly<AppRunner.Service> {
+    public get info(): Readonly<ServiceSummary> {
         return this._info
     }
 
@@ -63,14 +63,14 @@ export class AppRunnerServiceNode extends CloudWatchLogsBase implements AWSResou
         return `https://${this._info.ServiceUrl}`
     }
 
-    protected async getLogGroups(): Promise<Map<string, CloudWatchLogs.LogGroup>> {
+    protected async getLogGroups(): Promise<Map<string, LogGroup>> {
         return toMap(
             await toArrayAsync(
                 this.cloudwatchClient.describeLogGroups({
                     logGroupNamePrefix: `/aws/apprunner/${this._info.ServiceName}/${this._info.ServiceId}`,
                 })
             ),
-            configuration => configuration.logGroupName
+            (configuration) => configuration.logGroupName
         )
     }
 
@@ -81,15 +81,19 @@ export class AppRunnerServiceNode extends CloudWatchLogsBase implements AWSResou
         this.label = `${this._info.ServiceName} [${displayStatus}]`
     }
 
-    public update(info: AppRunner.ServiceSummary | AppRunner.Service): void {
+    public update(info: ServiceSummary): void {
         // update can be called multiple times during an event loop
         // this would rarely cause the node's status to appear as 'Operation in progress'
-        this.lock.acquire(this._info.ServiceId, done => {
-            const lastLabel = this.label
-            this.updateInfo(info)
-            this.updateStatus(lastLabel)
-            done()
-        })
+        this.lock
+            .acquire(this._info.ServiceId, (done) => {
+                const lastLabel = this.label
+                this.updateInfo(info)
+                this.updateStatus(typeof lastLabel === 'string' ? lastLabel : lastLabel?.label)
+                done()
+            })
+            .catch((e) => {
+                getLogger().error('AsyncLock.acquire failed: %s', e.message)
+            })
     }
 
     private updateStatus(lastLabel?: string): void {
@@ -103,26 +107,26 @@ export class AppRunnerServiceNode extends CloudWatchLogsBase implements AWSResou
         }
 
         if (this._info.Status === 'OPERATION_IN_PROGRESS') {
-            this.parent.startPolling(this._info.ServiceArn)
+            this.parent.startPollingNode(this._info.ServiceArn)
         } else if (this.currentOperation.Type !== undefined) {
             this.currentOperation.Id = undefined
             this.currentOperation.Type = undefined
             this.setLabel()
-            this.parent.stopPolling(this._info.ServiceArn)
+            this.parent.stopPollingNode(this._info.ServiceArn)
         }
     }
 
     private async updateOperation(): Promise<void> {
         return this.client
             .listOperations({ MaxResults: 1, ServiceArn: this._info.ServiceArn })
-            .then(resp => {
+            .then((resp) => {
                 const operations = resp.OperationSummaryList
                 const operation = operations && operations[0]?.EndedAt === undefined ? operations[0] : undefined
                 if (operation !== undefined) {
                     this.setOperation(this._info, operation.Id!, operation.Type as any)
                 }
             })
-            .catch(err => {
+            .catch((err) => {
                 // Apparently App Runner can rarely list deleted services with the wrong status
                 getLogger().warn(
                     `Failed to list operations for service "${this._info.ServiceName}", service may be in an unstable state.`
@@ -131,10 +135,10 @@ export class AppRunnerServiceNode extends CloudWatchLogsBase implements AWSResou
             })
     }
 
-    private updateInfo(info: AppRunner.ServiceSummary | AppRunner.Service): void {
+    private updateInfo(info: ServiceSummary): void {
         if (info.Status === 'OPERATION_IN_PROGRESS' && this.currentOperation.Type === undefined) {
             // Asynchronous since it is not currently possible for race-conditions to occur with updating operations
-            this.updateOperation()
+            void this.updateOperation()
         }
 
         this._info = Object.assign(this._info, info)
@@ -167,13 +171,14 @@ export class AppRunnerServiceNode extends CloudWatchLogsBase implements AWSResou
         this.setOperation(this._info, resp.OperationId, 'START_DEPLOYMENT')
     }
 
-    public setOperation(info: AppRunner.Service, id?: string, type?: ServiceOperation): void {
+    // eslint-disable-next-line @typescript-eslint/no-duplicate-type-constituents
+    public setOperation(info: ServiceSummary, id?: string, type?: ServiceOperation): void {
         this.currentOperation.Id = id
         this.currentOperation.Type = type
         this.update(info)
     }
 
-    public async describe(): Promise<AppRunner.Service> {
+    public async describe(): Promise<ServiceSummary> {
         const resp = await this.client.describeService({ ServiceArn: this.arn })
         this.update(resp.Service)
         return this._info
diff --git a/packages/core/src/awsService/apprunner/wizards/apprunnerCreateServiceWizard.ts b/packages/core/src/awsService/apprunner/wizards/apprunnerCreateServiceWizard.ts
new file mode 100644
index 00000000000..913fdf93bec
--- /dev/null
+++ b/packages/core/src/awsService/apprunner/wizards/apprunnerCreateServiceWizard.ts
@@ -0,0 +1,147 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+import { createCommonButtons, QuickInputToggleButton } from '../../../shared/ui/buttons'
+import * as input from '../../../shared/ui/inputPrompter'
+import * as picker from '../../../shared/ui/pickerPrompter'
+import { Prompter } from '../../../shared/ui/prompter'
+import { Wizard, WizardState } from '../../../shared/wizards/wizard'
+import { AppRunnerImageRepositoryWizard } from './imageRepositoryWizard'
+import { AppRunnerCodeRepositoryWizard } from './codeRepositoryWizard'
+import { GitExtension } from '../../../shared/extensions/git'
+import { makeDeploymentButton } from './deploymentButton'
+import { createExitPrompter } from '../../../shared/ui/common/exitPrompter'
+import { IamClient } from '../../../shared/clients/iam'
+import { DefaultEcrClient } from '../../../shared/clients/ecrClient'
+import { AppRunnerClient, CreateServiceRequest, SourceConfiguration } from '../../../shared/clients/apprunner'
+import { getAppRunnerCreateServiceDocUrl } from '../../../shared/extensionUtilities'
+import * as AppRunner from '@aws-sdk/client-apprunner'
+
+const localize = nls.loadMessageBundle()
+
+// I'm sure this code could be reused in many places
+const validateName = (name: string) => {
+    const badNameRegExp = /[^A-Za-z0-9-_]/g
+    if (!name || name.length < 4) {
+        return localize('AWS.apprunner.createService.name.validation', 'Service names must be at least 4 characters')
+    } else if (name.length > 40) {
+        return localize(
+            'AWS.apprunner.createService.name.validationExceeds',
+            'Service names cannot be more than 40 characters'
+        )
+    } else if (name.match(/\s/)) {
+        return localize(
+            'AWS.apprunner.createService.name.validationWhitespace',
+            'Service names cannot contain whitespace'
+        )
+    }
+
+    let matches: string[] | undefined = name.match(badNameRegExp) ?? undefined
+    if (name[0] === '_' || name[0] === '-') {
+        matches = matches ? [name[0]].concat(matches) : [name[0]]
+    }
+    if (matches && matches.length > 0) {
+        return localize(
+            'AWS.apprunner.createService.name.validationBadChar',
+            'Invalid character(s): {0}',
+            Array.from(new Set(matches)).join('')
+        )
+    }
+
+    return undefined
+}
+
+function createInstanceStep(): Prompter<AppRunner.InstanceConfiguration> {
+    const enumerations = [
+        [1, 2],
+        [1, 3],
+        [2, 4],
+    ]
+
+    const items: picker.DataQuickPickItem<AppRunner.InstanceConfiguration>[] = enumerations.map((e) => ({
+        label: `${e[0]} vCPUs, ${e[1]} GBs Memory`,
+        data: { Cpu: `${e[0]} vCPU`, Memory: `${e[1]} GB` },
+    }))
+
+    return picker.createQuickPick(items, {
+        title: localize('AWS.apprunner.createService.selectInstanceConfig.title', 'Select instance configuration'),
+        buttons: createCommonButtons(getAppRunnerCreateServiceDocUrl()),
+    })
+}
+
+function createSourcePrompter(
+    autoDeployButton: QuickInputToggleButton
+): Prompter<CreateServiceRequest['SourceConfiguration']> {
+    const ecrPath = {
+        label: 'ECR',
+        data: { ImageRepository: {} } as SourceConfiguration,
+        detail: localize(
+            'AWS.apprunner.createService.ecr.detail',
+            'Create a service from a public or private Elastic Container Registry repository'
+        ),
+    }
+
+    const repositoryPath = {
+        label: 'Repository',
+        data: { CodeRepository: {} } as SourceConfiguration,
+        detail: localize('AWS.apprunner.createService.repository.detail', 'Create a service from a GitHub repository'),
+    }
+
+    return picker.createQuickPick([ecrPath, repositoryPath], {
+        title: localize('AWS.apprunner.createService.sourceType.title', 'Select a source code location type'),
+        buttons: [autoDeployButton, ...createCommonButtons(getAppRunnerCreateServiceDocUrl())],
+    })
+}
+
+export class CreateAppRunnerServiceWizard extends Wizard<CreateServiceRequest> {
+    public constructor(
+        region: string,
+        initState: WizardState<CreateServiceRequest> = {},
+        implicitState: WizardState<CreateServiceRequest> = {},
+        clients = {
+            iam: new IamClient(region),
+            ecr: new DefaultEcrClient(region),
+            apprunner: new AppRunnerClient(region),
+        }
+    ) {
+        super({
+            initState,
+            implicitState,
+            exitPrompterProvider: createExitPrompter,
+        })
+
+        const autoDeployButton = makeDeploymentButton()
+        const gitExtension = GitExtension.instance
+        const codeRepositoryWizard = new AppRunnerCodeRepositoryWizard(
+            clients.apprunner,
+            gitExtension,
+            autoDeployButton
+        )
+        const imageRepositoryWizard = new AppRunnerImageRepositoryWizard(clients.ecr, clients.iam, autoDeployButton)
+
+        const form = this.form
+
+        form.SourceConfiguration.bindPrompter(() => createSourcePrompter(autoDeployButton))
+
+        form.SourceConfiguration.applyBoundForm(imageRepositoryWizard.boundForm, {
+            showWhen: (state) => state.SourceConfiguration?.ImageRepository !== undefined,
+        })
+        form.SourceConfiguration.applyBoundForm(codeRepositoryWizard.boundForm, {
+            showWhen: (state) => state.SourceConfiguration?.CodeRepository !== undefined,
+        })
+
+        form.ServiceName.bindPrompter(() =>
+            input.createInputBox({
+                title: localize('AWS.apprunner.createService.name.title', 'Name your service'),
+                validateInput: validateName, // TODO: we can check if names match any already made services
+                buttons: createCommonButtons(getAppRunnerCreateServiceDocUrl()),
+            })
+        )
+
+        form.InstanceConfiguration.bindPrompter(() => createInstanceStep())
+        form.SourceConfiguration.AutoDeploymentsEnabled.setDefault(() => autoDeployButton.state === 'on')
+    }
+}
diff --git a/packages/core/src/awsService/apprunner/wizards/codeRepositoryWizard.ts b/packages/core/src/awsService/apprunner/wizards/codeRepositoryWizard.ts
new file mode 100644
index 00000000000..04896648652
--- /dev/null
+++ b/packages/core/src/awsService/apprunner/wizards/codeRepositoryWizard.ts
@@ -0,0 +1,260 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+import { createCommonButtons, createRefreshButton, QuickInputToggleButton } from '../../../shared/ui/buttons'
+import { Remote } from '../../../../types/git.d'
+import { GitExtension } from '../../../shared/extensions/git'
+import * as vscode from 'vscode'
+import { WizardForm } from '../../../shared/wizards/wizardForm'
+import { createVariablesPrompter } from '../../../shared/ui/common/variablesPrompter'
+import {
+    AppRunnerClient,
+    SourceConfiguration,
+    CodeRepository,
+    CodeConfigurationValues,
+} from '../../../shared/clients/apprunner'
+import { makeDeploymentButton } from './deploymentButton'
+import {
+    createLabelQuickPick,
+    createQuickPick,
+    DataQuickPickItem,
+    QuickPickPrompter,
+} from '../../../shared/ui/pickerPrompter'
+import { createInputBox, InputBoxPrompter } from '../../../shared/ui/inputPrompter'
+import { apprunnerConfigHelpUrl, apprunnerConnectionHelpUrl, apprunnerRuntimeHelpUrl } from '../../../shared/constants'
+import { Wizard, WIZARD_BACK } from '../../../shared/wizards/wizard'
+import { openUrl } from '../../../shared/utilities/vsCodeUtils'
+import { getAppRunnerCreateServiceDocUrl } from '../../../shared/extensionUtilities'
+import * as AppRunner from '@aws-sdk/client-apprunner'
+
+const localize = nls.loadMessageBundle()
+
+function validateCommand(command: string): string | undefined {
+    if (command === '') {
+        return localize('AWS.apprunner.command.invalid', 'Command cannot be empty')
+    }
+
+    return undefined
+}
+
+function createRepoPrompter(git: GitExtension): QuickPickPrompter<Remote> {
+    const mapRemote = (remote: Remote) => ({ label: remote.name, detail: remote.fetchUrl, data: remote })
+    const remotes = git.getRemotes().then((r) => r.map(mapRemote))
+    const userInputString = localize('AWS.apprunner.createService.customRepo', 'Enter GitHub URL')
+
+    return createQuickPick(remotes, {
+        title: localize('AWS.apprunner.createService.selectRepository.title', 'Select a remote GitHub repository'),
+        placeholder: localize(
+            'AWS.apprunner.createService.selectRepository.placeholder',
+            'Select a remote repository or enter a URL'
+        ),
+        filterBoxInputSettings: {
+            label: userInputString,
+            transform: (resp) => ({ name: 'UserRemote', isReadOnly: true, fetchUrl: resp }),
+        },
+        buttons: createCommonButtons(),
+    })
+}
+
+function createBranchPrompter(
+    git: GitExtension,
+    cache: { [key: string]: any },
+    repo: string = ''
+): QuickPickPrompter<string> {
+    const last = cache[repo]
+    const branchItems =
+        last ??
+        git.getBranchesForRemote({ name: '', fetchUrl: repo } as any).then((branches) => {
+            const branchItems = branches
+                .filter((b) => b.name !== undefined && b.name !== '')
+                .map((branch) => ({
+                    label: branch.name!.split('/').slice(1).join('/'),
+                }))
+            cache[repo] = branchItems
+            return branchItems
+        })
+    const userInputString = localize('AWS.apprunner.createService.customRepo', 'Enter branch name')
+    return createLabelQuickPick(branchItems, {
+        title: localize('AWS.apprunner.createService.selectBranch.title', 'Select a branch'),
+        filterBoxInputSettings: {
+            label: userInputString,
+            transform: (resp) => resp,
+        },
+        buttons: createCommonButtons(),
+        placeholder: localize(
+            'AWS.apprunner.createService.selectBranch.placeholder',
+            'Select a branch or enter a branch name'
+        ),
+    })
+}
+
+function createRuntimePrompter(): QuickPickPrompter<AppRunner.Runtime> {
+    const items: DataQuickPickItem<AppRunner.Runtime>[] = [
+        { label: 'python3', data: AppRunner.Runtime.PYTHON_3 },
+        { label: 'nodejs16', data: AppRunner.Runtime.NODEJS_16 },
+    ]
+
+    return createQuickPick(items, {
+        title: localize('AWS.apprunner.createService.selectRuntime.title', 'Select a runtime'),
+        buttons: createCommonButtons(apprunnerRuntimeHelpUrl),
+    })
+}
+
+function createBuildCommandPrompter(runtime: AppRunner.Runtime): InputBoxPrompter {
+    const buildCommandMap = {
+        python: 'pip install -r requirements.txt',
+        node: 'npm install',
+    } as { [key: string]: string }
+
+    return createInputBox({
+        title: localize('AWS.apprunner.createService.buildCommand.title', 'Enter a build command'),
+        buttons: createCommonButtons(apprunnerRuntimeHelpUrl),
+        placeholder:
+            buildCommandMap[Object.keys(buildCommandMap).filter((key) => runtime.toLowerCase().includes(key))[0]],
+        validateInput: validateCommand,
+    })
+}
+
+function createStartCommandPrompter(runtime: AppRunner.Runtime): InputBoxPrompter {
+    const startCommandMap = {
+        python: 'python runapp.py',
+        node: 'node app.js',
+    } as { [key: string]: string }
+
+    return createInputBox({
+        title: localize('AWS.apprunner.createService.startCommand.title', 'Enter a start command'),
+        buttons: createCommonButtons(apprunnerRuntimeHelpUrl),
+        placeholder:
+            startCommandMap[Object.keys(startCommandMap).filter((key) => runtime.toLowerCase().includes(key))[0]],
+        validateInput: validateCommand,
+    })
+}
+
+function createPortPrompter(): InputBoxPrompter {
+    const validatePort = (port: string) => {
+        if (isNaN(Number(port)) || port === '') {
+            return localize('AWS.apprunner.createService.selectPort.invalidPort', 'Port must be a number')
+        }
+
+        return undefined
+    }
+
+    return createInputBox({
+        validateInput: validatePort,
+        title: localize('AWS.apprunner.createService.selectPort.title', 'Enter a port for the new service'),
+        placeholder: 'Enter a port',
+        buttons: createCommonButtons(getAppRunnerCreateServiceDocUrl()),
+    })
+}
+
+export function createConnectionPrompter(client: AppRunnerClient) {
+    const noItemsFoundItem = {
+        label: 'No connections found',
+        detail: 'Click for documentation on creating a new GitHub connection for App Runner',
+        data: {} as any,
+        invalidSelection: true,
+        onClick: () => openUrl(vscode.Uri.parse(apprunnerConnectionHelpUrl)),
+    }
+
+    const errorItem = {
+        label: localize('AWS.apprunner.createService.selectConnection.failed', 'Failed to list GitHub connections'),
+        description: localize('AWS.generic.goBack', 'Click to go back'),
+        data: WIZARD_BACK,
+    }
+
+    const getItems = async () => {
+        const resp = await client.listConnections()
+
+        return resp
+            .filter((conn) => conn.Status === 'AVAILABLE')
+            .map((conn) => ({
+                label: conn.ConnectionName!,
+                data: conn,
+            }))
+    }
+
+    const refreshButton = createRefreshButton()
+    refreshButton.onClick = () => void prompter.clearAndLoadItems(getItems())
+
+    const prompter = createQuickPick(getItems(), {
+        errorItem,
+        noItemsFoundItem,
+        buttons: [refreshButton, ...createCommonButtons(apprunnerConnectionHelpUrl)],
+        title: localize('AWS.apprunner.createService.selectConnection.title', 'Select a connection'),
+    })
+
+    return prompter
+}
+
+function createSourcePrompter(): QuickPickPrompter<AppRunner.ConfigurationSource> {
+    const configDetail = localize(
+        'AWS.apprunner.createService.configSource.detail',
+        'App Runner will read "apprunner.yaml" in the root of your repository for configuration details'
+    )
+    const apiLabel = localize('AWS.apprunner.createService.configSource.apiLabel', 'Configure all settings here')
+    const repoLabel = localize('AWS.apprunner.createService.configSource.repoLabel', 'Use configuration file')
+    const apiItem: DataQuickPickItem<AppRunner.ConfigurationSource> = {
+        label: apiLabel,
+        data: AppRunner.ConfigurationSource.API,
+    }
+    const repoItem: DataQuickPickItem<AppRunner.ConfigurationSource> = {
+        label: repoLabel,
+        data: AppRunner.ConfigurationSource.REPOSITORY,
+        detail: configDetail,
+    }
+
+    return createQuickPick([apiItem, repoItem], {
+        title: localize('AWS.apprunner.createService.configSource.title', 'Choose configuration source'),
+        buttons: createCommonButtons(apprunnerConfigHelpUrl),
+    })
+}
+
+function createCodeRepositorySubForm(git: GitExtension): WizardForm<CodeRepository> {
+    const subform = new WizardForm<CodeRepository>()
+    const form = subform.body
+
+    form.RepositoryUrl.bindPrompter(() => createRepoPrompter(git).transform((r) => r.fetchUrl!))
+    form.SourceCodeVersion.Value.bindPrompter((state) =>
+        createBranchPrompter(git, state.stepCache, state.RepositoryUrl).transform((resp) =>
+            resp.replace(`${state.RepositoryUrl}/`, '')
+        )
+    )
+    form.CodeConfiguration.ConfigurationSource.bindPrompter(createSourcePrompter)
+    form.SourceCodeVersion.Type.setDefault(() => 'BRANCH')
+
+    const codeConfigForm = new WizardForm<CodeConfigurationValues>()
+    codeConfigForm.body.Runtime.bindPrompter(createRuntimePrompter)
+    codeConfigForm.body.BuildCommand.bindPrompter((state) => createBuildCommandPrompter(state.Runtime!))
+    codeConfigForm.body.StartCommand.bindPrompter((state) => createStartCommandPrompter(state.Runtime!))
+    codeConfigForm.body.Port.bindPrompter(createPortPrompter)
+    codeConfigForm.body.RuntimeEnvironmentVariables.bindPrompter(() =>
+        createVariablesPrompter(createCommonButtons(getAppRunnerCreateServiceDocUrl()))
+    )
+    // TODO: ask user if they would like to save their parameters into an App Runner config file
+
+    form.CodeConfiguration.CodeConfigurationValues.applyBoundForm(codeConfigForm, {
+        showWhen: (state) => state.CodeConfiguration?.ConfigurationSource === 'API',
+    })
+
+    return subform
+}
+
+export class AppRunnerCodeRepositoryWizard extends Wizard<SourceConfiguration> {
+    constructor(
+        client: AppRunnerClient,
+        git: GitExtension,
+        autoDeployButton: QuickInputToggleButton = makeDeploymentButton()
+    ) {
+        super()
+        const form = this.form
+
+        form.AuthenticationConfiguration.ConnectionArn.bindPrompter(() =>
+            createConnectionPrompter(client).transform((conn) => conn.ConnectionArn!)
+        )
+        form.CodeRepository.applyBoundForm(createCodeRepositorySubForm(git))
+        form.AutoDeploymentsEnabled.setDefault(() => autoDeployButton.state === 'on')
+    }
+}
diff --git a/packages/core/src/awsService/apprunner/wizards/deploymentButton.ts b/packages/core/src/awsService/apprunner/wizards/deploymentButton.ts
new file mode 100644
index 00000000000..dee77c05e97
--- /dev/null
+++ b/packages/core/src/awsService/apprunner/wizards/deploymentButton.ts
@@ -0,0 +1,60 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+import * as vscode from 'vscode'
+
+import { QuickInputButton, QuickInputToggleButton } from '../../../shared/ui/buttons'
+import { apprunnerPricingUrl } from '../../../shared/constants'
+import { ToolkitPromptSettings } from '../../../shared/settings'
+import { getIcon } from '../../../shared/icons'
+import { dontShow } from '../../../shared/localizedText'
+import { openUrl } from '../../../shared/utilities/vsCodeUtils'
+
+const localize = nls.loadMessageBundle()
+
+function makeDeployButtons() {
+    const autoDeploymentsEnable: QuickInputButton<void> = {
+        iconPath: getIcon('vscode-sync-ignore'),
+        tooltip: localize('AWS.apprunner.buttons.enableAutoDeploy', 'Turn on automatic deployment'),
+    }
+
+    const autoDeploymentsDisable: QuickInputButton<void> = {
+        iconPath: getIcon('vscode-sync'),
+        tooltip: localize('AWS.apprunner.buttons.disableAutoDeploy', 'Turn off automatic deployment'),
+    }
+
+    return [autoDeploymentsDisable, autoDeploymentsEnable]
+}
+
+async function showDeploymentCostNotification(): Promise<void> {
+    const settings = ToolkitPromptSettings.instance
+
+    if (settings.isPromptEnabled('apprunnerNotifyPricing')) {
+        const notice = localize(
+            'aws.apprunner.createService.priceNotice.message',
+            'App Runner automatic deployments incur an additional cost.'
+        )
+        const viewPricing = localize('aws.apprunner.createService.priceNotice.view', 'View Pricing')
+        const pricingUri = vscode.Uri.parse(apprunnerPricingUrl)
+
+        await vscode.window.showInformationMessage(notice, viewPricing, dontShow).then(async (button) => {
+            if (button === viewPricing) {
+                await openUrl(pricingUri)
+                await showDeploymentCostNotification()
+            } else if (button === dontShow) {
+                await settings.disablePrompt('apprunnerNotifyPricing')
+            }
+        })
+    }
+}
+
+export function makeDeploymentButton() {
+    const [autoDeploymentsDisable, autoDeploymentsEnable] = makeDeployButtons()
+
+    return new QuickInputToggleButton(autoDeploymentsDisable, autoDeploymentsEnable, {
+        onCallback: showDeploymentCostNotification,
+    })
+}
diff --git a/packages/core/src/awsService/apprunner/wizards/imageRepositoryWizard.ts b/packages/core/src/awsService/apprunner/wizards/imageRepositoryWizard.ts
new file mode 100644
index 00000000000..e906e249e71
--- /dev/null
+++ b/packages/core/src/awsService/apprunner/wizards/imageRepositoryWizard.ts
@@ -0,0 +1,274 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { createCommonButtons, QuickInputButton, QuickInputToggleButton } from '../../../shared/ui/buttons'
+import { toArrayAsync } from '../../../shared/utilities/collectionUtils'
+import { EcrClient, EcrRepository } from '../../../shared/clients/ecrClient'
+import * as input from '../../../shared/ui/inputPrompter'
+import * as picker from '../../../shared/ui/pickerPrompter'
+import { Prompter } from '../../../shared/ui/prompter'
+import { Wizard, WizardControl, WIZARD_BACK } from '../../../shared/wizards/wizard'
+import { WizardPrompter } from '../../../shared/ui/wizardPrompter'
+
+import * as nls from 'vscode-nls'
+import { WizardForm } from '../../../shared/wizards/wizardForm'
+import { createVariablesPrompter } from '../../../shared/ui/common/variablesPrompter'
+import { makeDeploymentButton } from './deploymentButton'
+import { IamClient, IamRole } from '../../../shared/clients/iam'
+import { createRolePrompter } from '../../../shared/ui/common/roles'
+import { getLogger } from '../../../shared/logger/logger'
+import { getAppRunnerCreateServiceDocUrl, isCloud9 } from '../../../shared/extensionUtilities'
+import { createExitPrompter } from '../../../shared/ui/common/exitPrompter'
+import { ImageRepository, SourceConfiguration } from '../../../shared/clients/apprunner'
+
+const localize = nls.loadMessageBundle()
+
+const publicEcr = 'public.ecr.aws'
+const appRunnerEcrEntity = 'build.apprunner.amazonaws'
+
+export type TaggedEcrRepository = EcrRepository & { tag?: string }
+
+interface ImagePrompterOptions {
+    noPublicMessage?: string
+    extraButtons?: QuickInputButton<void | WizardControl>
+}
+
+function createEcrRole(client: IamClient): Promise<IamRole> {
+    const policy = {
+        Version: '2008-10-17',
+        Statement: [
+            {
+                Sid: '',
+                Effect: 'Allow',
+                Principal: {
+                    Service: ['build.apprunner.amazonaws.com'],
+                },
+                Action: 'sts:AssumeRole',
+            },
+        ],
+    }
+    const ecrPolicy = 'arn:aws:iam::aws:policy/service-role/AWSAppRunnerServicePolicyForECRAccess'
+
+    return client
+        .createRole({
+            RoleName: `${isCloud9() ? 'Cloud9-' : ''}AppRunnerECRAccessRole${
+                Math.floor(Math.random() * 1000000000) + 1000
+            }`,
+            AssumeRolePolicyDocument: JSON.stringify(policy),
+        })
+        .then((resp) => {
+            const role = resp.Role
+            return client.attachRolePolicy({ RoleName: role.RoleName, PolicyArn: ecrPolicy }).then(() => role)
+        })
+}
+
+function createImagePrompter(
+    ecrClient: EcrClient,
+    cache: { [key: string]: any },
+    options: ImagePrompterOptions = {}
+): picker.QuickPickPrompter<TaggedEcrRepository> {
+    const last = cache['repos']
+    const imageRepos =
+        last ??
+        toArrayAsync(ecrClient.describeRepositories())
+            .then((resp) => {
+                const repos = resp.map((repo) => ({
+                    label: repo.repositoryName,
+                    detail: repo.repositoryUri,
+                    data: repo,
+                }))
+                cache['repos'] = repos
+                return repos
+            })
+            .catch((err) => {
+                getLogger().error(`Unabled to list repositories: %s`, err)
+                return [
+                    {
+                        label: localize(
+                            'AWS.apprunner.createService.selectImageRepo.failed',
+                            'Failed to list repositories'
+                        ),
+                        description: localize('AWS.generic.goBack', 'Click to go back'),
+                        data: WIZARD_BACK,
+                    },
+                ]
+            })
+
+    const customUserInputLabel = localize('AWS.apprunner.createService.selectImageRepo.input', 'Custom ECR URL')
+    const customUserInputTransform = (resp: string) => {
+        const userInputParts = resp.split(':')
+
+        return {
+            repositoryArn: '',
+            repositoryName: 'UserDefined',
+            repositoryUri: userInputParts[0],
+            tag: userInputParts[1]?.trim() ?? 'latest',
+        }
+    }
+
+    const ecrUriValidator = (input: string) => {
+        const userInputParts = input.split(':')
+
+        if (userInputParts.length > 2) {
+            return 'colon should be used to delimit tag'
+        }
+
+        if (userInputParts.length === 2 && userInputParts[1].trim() === '') {
+            return 'tag cannot be empty'
+        }
+
+        const privateRegExp = /[0-9]+\.dkr\.ecr\.[a-zA-z0-9\-]+\.amazonaws\.com/
+
+        if (options.noPublicMessage && userInputParts[0].startsWith(publicEcr)) {
+            return options.noPublicMessage
+        }
+
+        if (!userInputParts[0].startsWith(publicEcr) && !userInputParts[0].match(privateRegExp)) {
+            return 'not a valid ECR URL'
+        }
+    }
+
+    const customUserInputValidator = (input: string) => {
+        const message = ecrUriValidator(input)
+        return message !== undefined ? `$(close) Invalid input: ${message}` : undefined
+    }
+
+    return picker.createQuickPick<TaggedEcrRepository>(imageRepos, {
+        title: localize('AWS.apprunner.createService.selectImageRepo.title', 'Select or enter an image repository'),
+        placeholder: '123456789012.dkr.ecr.us-east-1.amazonaws.com/myrepo:latest',
+        filterBoxInputSettings: {
+            label: customUserInputLabel,
+            transform: customUserInputTransform,
+            validator: customUserInputValidator,
+        },
+        buttons: createCommonButtons(),
+    })
+}
+
+function createPortPrompter(): Prompter<string> {
+    const validatePort = (port: string) => {
+        if (isNaN(Number(port)) || port === '') {
+            return localize('AWS.apprunner.createService.selectPort.invalidPort', 'Port must be a number')
+        }
+
+        return undefined
+    }
+
+    return input.createInputBox({
+        validateInput: validatePort,
+        title: localize('AWS.apprunner.createService.selectPort.title', 'Enter a port for the new service'),
+        placeholder: 'Enter a port',
+        buttons: createCommonButtons(getAppRunnerCreateServiceDocUrl()),
+    })
+}
+
+function createTagPrompter(
+    ecrClient: EcrClient,
+    imageRepo: EcrRepository,
+    cache: { [key: string]: any }
+): picker.QuickPickPrompter<string> {
+    const last: picker.DataQuickPickItem<TaggedEcrRepository>[] = cache[imageRepo.repositoryName]
+    const tagItems =
+        last ??
+        toArrayAsync(ecrClient.describeTags(imageRepo.repositoryName))
+            .then((tags) => {
+                if (tags.length === 0) {
+                    return [
+                        {
+                            label: localize('AWS.apprunner.createService.selectTags.noFound', 'No tags found'),
+                            description: localize('AWS.generic.goBack', 'Click to go back'),
+                            data: WIZARD_BACK,
+                        },
+                    ]
+                }
+
+                const tagT = tags.map((tag) => ({ label: tag }))
+                cache[imageRepo.repositoryName] = tagT
+                return tagT
+            })
+            .catch((err) => {
+                getLogger().error(`Unabled to list tags for repository "${imageRepo.repositoryName}": %s`, err)
+                return [
+                    {
+                        label: localize(
+                            'AWS.apprunner.createService.selectTag.failed',
+                            'Failed to get tags for repository'
+                        ),
+                        description: localize('AWS.generic.goBack', 'Click to go back'),
+                        data: WIZARD_BACK,
+                    },
+                ]
+            })
+
+    return picker.createLabelQuickPick(tagItems, {
+        title: localize('AWS.apprunner.createService.selectTag.title', 'Select an ECR tag'),
+        placeholder: 'latest',
+        buttons: createCommonButtons(),
+    })
+}
+
+export class ImageIdentifierForm extends WizardForm<{ repo: TaggedEcrRepository }> {
+    constructor(ecrClient: EcrClient, options: ImagePrompterOptions = {}) {
+        super()
+
+        this.body.repo.bindPrompter((state) => createImagePrompter(ecrClient, state.stepCache, options))
+        this.body.repo.tag.bindPrompter((state) => createTagPrompter(ecrClient, state.repo!, state.stepCache), {
+            requireParent: true,
+        })
+    }
+}
+
+function createImageRepositorySubForm(
+    ecrClient: EcrClient,
+    autoDeployButton: QuickInputToggleButton
+): WizardForm<ImageRepository> {
+    const subform = new WizardForm<ImageRepository>()
+    const form = subform.body
+
+    // note: this is intentionally initialized only once to preserve caches
+    const imageIdentifierWizard = new Wizard({
+        initForm: new ImageIdentifierForm(ecrClient),
+        exitPrompterProvider: createExitPrompter,
+    })
+
+    form.ImageIdentifier.bindPrompter(() =>
+        new WizardPrompter(imageIdentifierWizard).transform((resp) => `${resp.repo.repositoryUri}:${resp.repo.tag}`)
+    )
+
+    function isPublic(imageRepo: string): boolean {
+        return imageRepo.search(/^public.ecr.aws/) !== -1
+    }
+
+    form.ImageRepositoryType.setDefault((state) =>
+        state.ImageIdentifier !== undefined ? (isPublic(state.ImageIdentifier) ? 'ECR_PUBLIC' : 'ECR') : undefined
+    )
+
+    form.ImageConfiguration.Port.bindPrompter(() => createPortPrompter())
+    form.ImageConfiguration.RuntimeEnvironmentVariables.bindPrompter(() =>
+        createVariablesPrompter(createCommonButtons(getAppRunnerCreateServiceDocUrl()))
+    )
+
+    return subform
+}
+
+export class AppRunnerImageRepositoryWizard extends Wizard<SourceConfiguration> {
+    constructor(ecrClient: EcrClient, iamClient: IamClient, autoDeployButton = makeDeploymentButton()) {
+        super()
+        const form = this.form
+        const createAccessRolePrompter = () =>
+            createRolePrompter(iamClient, {
+                title: localize('AWS.apprunner.createService.selectRole.title', 'Select a role to pull from ECR'),
+                helpUrl: getAppRunnerCreateServiceDocUrl(),
+                roleFilter: (role) => (role.AssumeRolePolicyDocument ?? '').includes(appRunnerEcrEntity),
+                createRole: createEcrRole.bind(undefined, iamClient),
+            }).transform((resp) => resp.Arn)
+
+        form.ImageRepository.applyBoundForm(createImageRepositorySubForm(ecrClient, autoDeployButton))
+        form.AuthenticationConfiguration.AccessRoleArn.bindPrompter(createAccessRolePrompter, {
+            showWhen: (form) => form.ImageRepository?.ImageRepositoryType === 'ECR',
+        })
+        form.AutoDeploymentsEnabled.setDefault(() => autoDeployButton.state === 'on')
+    }
+}
diff --git a/packages/core/src/awsService/cdk/explorer/cdkProject.ts b/packages/core/src/awsService/cdk/explorer/cdkProject.ts
new file mode 100644
index 00000000000..c90fd3aa214
--- /dev/null
+++ b/packages/core/src/awsService/cdk/explorer/cdkProject.ts
@@ -0,0 +1,24 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import fs from '../../../shared/fs/fs'
+import { ConstructTree } from './tree/types'
+
+export interface CdkApp {
+    location: CdkAppLocation
+    constructTree: ConstructTree
+}
+
+export interface CdkAppLocation {
+    cdkJsonUri: vscode.Uri
+    treeUri: vscode.Uri
+}
+
+export async function getApp(location: CdkAppLocation): Promise<CdkApp> {
+    const constructTree = JSON.parse(await fs.readFileText(location.treeUri)) as ConstructTree
+
+    return { location, constructTree }
+}
diff --git a/src/cdk/explorer/detectCdkProjects.ts b/packages/core/src/awsService/cdk/explorer/detectCdkProjects.ts
similarity index 88%
rename from src/cdk/explorer/detectCdkProjects.ts
rename to packages/core/src/awsService/cdk/explorer/detectCdkProjects.ts
index f30fb12c035..acf7e28af1a 100644
--- a/src/cdk/explorer/detectCdkProjects.ts
+++ b/packages/core/src/awsService/cdk/explorer/detectCdkProjects.ts
@@ -1,11 +1,11 @@
 /*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as vscode from 'vscode'
 import * as path from 'path'
-import { getLogger } from '../../shared/logger'
+import { getLogger } from '../../../shared/logger/logger'
 import { CdkAppLocation } from './cdkProject'
 
 export async function detectCdkProjects(
@@ -21,7 +21,9 @@ export async function detectCdkProjects(
         []
     )
 
-    projects.forEach(p => results.set(p.cdkJsonUri.toString(), p))
+    for (const p of projects) {
+        results.set(p.cdkJsonUri.toString(), p)
+    }
 
     return Array.from(results.values())
 }
diff --git a/packages/core/src/awsService/cdk/explorer/nodes/appNode.ts b/packages/core/src/awsService/cdk/explorer/nodes/appNode.ts
new file mode 100644
index 00000000000..3e79ebba74d
--- /dev/null
+++ b/packages/core/src/awsService/cdk/explorer/nodes/appNode.ts
@@ -0,0 +1,69 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as vscode from 'vscode'
+import { getLogger } from '../../../../shared/logger/logger'
+import { CdkAppLocation, getApp } from '../cdkProject'
+import { ConstructNode, generateConstructNodes } from './constructNode'
+import { TreeNode } from '../../../../shared/treeview/resourceTreeDataProvider'
+import { createPlaceholderItem } from '../../../../shared/treeview/utils'
+import { getIcon } from '../../../../shared/icons'
+
+/**
+ * Represents a CDK App
+ * Existence of apps is determined by the presence of `cdk.json` in a workspace folder
+ */
+export class AppNode implements TreeNode {
+    public readonly id = this.location.cdkJsonUri.toString()
+    public readonly resource = this.location
+    public readonly label = vscode.workspace.asRelativePath(vscode.Uri.joinPath(this.location.cdkJsonUri, '..'))
+
+    public constructor(private readonly location: CdkAppLocation) {}
+
+    public async getChildren(): Promise<(ConstructNode | TreeNode)[]> {
+        const constructs = []
+        try {
+            const successfulApp = await getApp(this.location)
+
+            const constructsInTree = successfulApp.constructTree.tree.children
+            if (constructsInTree) {
+                constructs.push(...generateConstructNodes(this.location, constructsInTree))
+            }
+
+            // indicate that App exists, but it is empty
+            if (constructs.length === 0) {
+                return [
+                    createPlaceholderItem(localize('AWS.cdk.explorerNode.app.noStacks', '[No stacks in this CDK App]')),
+                ]
+            }
+
+            return constructs
+        } catch (error) {
+            getLogger().error(`Could not load the construct tree located at '${this.id}': %O`, error as Error)
+
+            return [
+                createPlaceholderItem(
+                    localize(
+                        'AWS.cdk.explorerNode.app.noConstructTree',
+                        '[Unable to load construct tree for this App. Run `cdk synth`]'
+                    )
+                ),
+            ]
+        }
+    }
+
+    public getTreeItem() {
+        const item = new vscode.TreeItem(this.label, vscode.TreeItemCollapsibleState.Collapsed)
+
+        item.contextValue = 'awsCdkAppNode'
+        item.iconPath = getIcon('aws-cdk-logo')
+        item.tooltip = this.location.cdkJsonUri.path
+
+        return item
+    }
+}
diff --git a/src/cdk/explorer/nodes/constructNode.ts b/packages/core/src/awsService/cdk/explorer/nodes/constructNode.ts
similarity index 83%
rename from src/cdk/explorer/nodes/constructNode.ts
rename to packages/core/src/awsService/cdk/explorer/nodes/constructNode.ts
index 4b91916b826..8e75843ad1f 100644
--- a/src/cdk/explorer/nodes/constructNode.ts
+++ b/packages/core/src/awsService/cdk/explorer/nodes/constructNode.ts
@@ -1,11 +1,11 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as vscode from 'vscode'
-import { getIcon } from '../../../shared/icons'
-import { TreeNode } from '../../../shared/treeview/resourceTreeDataProvider'
+import { getIcon } from '../../../../shared/icons'
+import { TreeNode } from '../../../../shared/treeview/resourceTreeDataProvider'
 import { CdkAppLocation } from '../cdkProject'
 import * as treeInspector from '../tree/treeInspector'
 import { ConstructTreeEntity } from '../tree/types'
@@ -16,7 +16,10 @@ export class ConstructNode implements TreeNode {
     private readonly type = treeInspector.getTypeAttributeOrDefault(this.construct, '')
     private readonly properties = treeInspector.getProperties(this.construct)
 
-    public constructor(private readonly location: CdkAppLocation, private readonly construct: ConstructTreeEntity) {}
+    public constructor(
+        private readonly location: CdkAppLocation,
+        private readonly construct: ConstructTreeEntity
+    ) {}
 
     public get resource() {
         return {
@@ -50,8 +53,8 @@ export class ConstructNode implements TreeNode {
 
 export function generateConstructNodes(app: CdkAppLocation, children: NonNullable<ConstructTreeEntity['children']>) {
     return Object.values(children)
-        .filter(c => treeInspector.includeConstructInTree(c))
-        .map(c => new ConstructNode(app, c))
+        .filter((c) => treeInspector.includeConstructInTree(c))
+        .map((c) => new ConstructNode(app, c))
 }
 
 /**
diff --git a/packages/core/src/awsService/cdk/explorer/nodes/propertyNode.ts b/packages/core/src/awsService/cdk/explorer/nodes/propertyNode.ts
new file mode 100644
index 00000000000..e694821ef8f
--- /dev/null
+++ b/packages/core/src/awsService/cdk/explorer/nodes/propertyNode.ts
@@ -0,0 +1,48 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getIcon } from '../../../../shared/icons'
+import { TreeNode } from '../../../../shared/treeview/resourceTreeDataProvider'
+
+/*
+ * Represents a property of a CDK construct. Properties can be simple key-value pairs, Arrays,
+ * or objects that are nested deeply
+ */
+export class PropertyNode implements TreeNode {
+    public readonly id = this.key
+    public readonly resource = this.value
+
+    public constructor(
+        private readonly key: string,
+        private readonly value: unknown
+    ) {}
+
+    public async getChildren(): Promise<TreeNode[]> {
+        if (this.value instanceof Array || this.value instanceof Object) {
+            return generatePropertyNodes(this.value)
+        } else {
+            return []
+        }
+    }
+
+    public getTreeItem() {
+        const item = new vscode.TreeItem(`${this.key}: ${this.value}`)
+
+        item.contextValue = 'awsCdkPropertyNode'
+        item.iconPath = getIcon('vscode-gear')
+
+        if (this.value instanceof Array || this.value instanceof Object) {
+            item.label = this.key
+            item.collapsibleState = vscode.TreeItemCollapsibleState.Collapsed
+        }
+
+        return item
+    }
+}
+
+export function generatePropertyNodes(properties: { [key: string]: any }): TreeNode[] {
+    return Object.entries(properties).map(([k, v]) => new PropertyNode(k, v))
+}
diff --git a/packages/core/src/awsService/cdk/explorer/rootNode.ts b/packages/core/src/awsService/cdk/explorer/rootNode.ts
new file mode 100644
index 00000000000..86b6f45aab4
--- /dev/null
+++ b/packages/core/src/awsService/cdk/explorer/rootNode.ts
@@ -0,0 +1,72 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { cdkDocumentationUrl } from '../../../shared/constants'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { ResourceTreeDataProvider, TreeNode } from '../../../shared/treeview/resourceTreeDataProvider'
+import { createPlaceholderItem } from '../../../shared/treeview/utils'
+import { localize, openUrl } from '../../../shared/utilities/vsCodeUtils'
+import { Commands } from '../../../shared/vscode/commands2'
+import { detectCdkProjects } from './detectCdkProjects'
+import { AppNode } from './nodes/appNode'
+
+export async function getAppNodes(): Promise<TreeNode[]> {
+    const appsFound = await detectCdkProjects(vscode.workspace.workspaceFolders)
+
+    if (appsFound.length === 0) {
+        return [createPlaceholderItem(localize('AWS.cdk.explorerNode.noApps', '[No CDK Apps found in Workspaces]'))]
+    }
+
+    return appsFound.map((appLocation) => new AppNode(appLocation)).sort((a, b) => a.label.localeCompare(b.label) ?? 0)
+}
+
+export class CdkRootNode implements TreeNode {
+    public readonly id = 'cdk'
+    public readonly resource = this
+    private readonly onDidChangeChildrenEmitter = new vscode.EventEmitter<void>()
+    public readonly onDidChangeChildren = this.onDidChangeChildrenEmitter.event
+    private readonly _refreshCdkExplorer
+
+    constructor() {
+        Commands.register('aws.cdk.viewDocs', () => {
+            void openUrl(vscode.Uri.parse(cdkDocumentationUrl))
+            telemetry.aws_help.emit({ name: 'cdk' })
+        })
+        this._refreshCdkExplorer = (provider?: ResourceTreeDataProvider) =>
+            Commands.register('aws.cdk.refresh', () => {
+                this.refresh()
+                if (provider) {
+                    provider.refresh()
+                }
+            })
+    }
+
+    public get refreshCdkExplorer() {
+        return this._refreshCdkExplorer
+    }
+
+    public getChildren() {
+        return getAppNodes()
+    }
+
+    public refresh(): void {
+        this.onDidChangeChildrenEmitter.fire()
+    }
+
+    public getTreeItem() {
+        const item = new vscode.TreeItem('CDK')
+        item.collapsibleState = vscode.TreeItemCollapsibleState.Collapsed
+        item.contextValue = 'awsCdkRootNode'
+
+        return item
+    }
+
+    static #instance: CdkRootNode
+
+    static get instance(): CdkRootNode {
+        return (this.#instance ??= new CdkRootNode())
+    }
+}
diff --git a/src/cdk/explorer/tree/treeInspector.ts b/packages/core/src/awsService/cdk/explorer/tree/treeInspector.ts
similarity index 95%
rename from src/cdk/explorer/tree/treeInspector.ts
rename to packages/core/src/awsService/cdk/explorer/tree/treeInspector.ts
index d53fbd026b8..d60eeee5911 100644
--- a/src/cdk/explorer/tree/treeInspector.ts
+++ b/packages/core/src/awsService/cdk/explorer/tree/treeInspector.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/packages/core/src/awsService/cdk/explorer/tree/types.ts b/packages/core/src/awsService/cdk/explorer/tree/types.ts
new file mode 100644
index 00000000000..7a371b89c4d
--- /dev/null
+++ b/packages/core/src/awsService/cdk/explorer/tree/types.ts
@@ -0,0 +1,72 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * The CDK construct tree is the hierarchy of a CDK application. Every time a CDK application
+ * is built and `cdk synth` is called on it from the CLI, the construct tree is written to a
+ * file named `tree.json`.
+ *
+ * The tree includes all of the resources that are encapsulated by the CDK.
+ * A motivation for sharing this tree is to provide a design-time view of the resources that are
+ * contained with a CDK application
+ *
+ * The intial RFC around the construct tree can be found here:
+ * https://github.com/aws/aws-cdk/pull/4053
+ *
+ * @attribute version - version of the tree to leverage if the spec changes
+ * @attribute tree - every construct in the tree adheres to this schema
+ */
+export interface ConstructTree {
+    readonly version: string
+    readonly tree: ConstructTreeEntity
+}
+
+/**
+ * Represents a construct in the CDK construct tree.
+ * The tree is produced by a construct called `Tree` which visits every construct in an application
+ * and adds an entry for it.
+ *
+ * @attribute id - identifier in the tree. At the top level every CDK application will have a construct called "App"
+ * The children of "App" will include 'Tree'
+ * @attribute path - path in the tree. All application start with a path of ''. The path represents the depth of a
+ * construct in a CDK application (i.e Apps contain Stacks which contain Resource - the path would be Stack/Resource)
+ * @attribute children - All of the chidren encapsulated by the current level in the tree. Children are keyed on their ids
+ * @attribute attributes - An Attribute bag that constructs can voluntarily contribute towards. All CloudFormation
+ * resources contribute their type and properties. Attributes will be keyed on convention. i.e. CloudFormation properties
+ * are prefixed `aws:cdk:cloudformation`
+ */
+export interface ConstructTreeEntity {
+    readonly id: string
+    readonly path: string
+    readonly children?: { [key: string]: ConstructTreeEntity }
+    readonly attributes?: { [key: string]: any }
+}
+
+/**
+ * CloudFormation attributes in the construct tree will contain these keys
+ * The keys are defined by convention and the prefix `aws:cdk:cloudformation`
+ * indicates that the attribute is a property of a CloudFormation resource
+ *
+ */
+export enum CfnResourceKeys {
+    TYPE = 'aws:cdk:cloudformation:type',
+    PROPS = 'aws:cdk:cloudformation:props',
+}
+
+/**
+ * Attributes of a CDK construct
+ */
+export interface ConstructAttributes {
+    readonly type: string
+    readonly props: ConstructProps
+}
+
+/**
+ * Represents a bag of properties
+ * Construct properties can be arrays, objects, strings, or boolean
+ */
+export interface ConstructProps {
+    readonly props: { [key: string]: any }
+}
diff --git a/packages/core/src/awsService/cloudWatchLogs/activation.ts b/packages/core/src/awsService/cloudWatchLogs/activation.ts
new file mode 100644
index 00000000000..03cf23c235c
--- /dev/null
+++ b/packages/core/src/awsService/cloudWatchLogs/activation.ts
@@ -0,0 +1,163 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { cloudwatchLogsLiveTailScheme, CLOUDWATCH_LOGS_SCHEME } from '../../shared/constants'
+import { Settings } from '../../shared/settings'
+import { addLogEvents } from './commands/addLogEvents'
+import { copyLogResource } from './commands/copyLogResource'
+import { saveCurrentLogDataContent } from './commands/saveCurrentLogDataContent'
+import { viewLogStream } from './commands/viewLogStream'
+import { LogDataCodeLensProvider } from './document/logDataCodeLensProvider'
+import { LogDataDocumentProvider } from './document/logDataDocumentProvider'
+import { LogGroupNode } from './explorer/logGroupNode'
+import { LogDataRegistry } from './registry/logDataRegistry'
+import { Commands } from '../../shared/vscode/commands2'
+import { searchLogGroup } from './commands/searchLogGroup'
+import { changeLogSearchParams } from './changeLogSearch'
+import { CloudWatchLogsNode } from './explorer/cloudWatchLogsNode'
+import { loadAndOpenInitialLogStreamFile, LogStreamCodeLensProvider } from './document/logStreamsCodeLensProvider'
+import { clearDocument, closeSession, tailLogGroup } from './commands/tailLogGroup'
+import { LiveTailDocumentProvider } from './document/liveTailDocumentProvider'
+import { LiveTailSessionRegistry } from './registry/liveTailSessionRegistry'
+import { DeployedResourceNode } from '../appBuilder/explorer/nodes/deployedNode'
+import { isTreeNode, TreeNode } from '../../shared/treeview/resourceTreeDataProvider'
+import { getLogger } from '../../shared/logger/logger'
+import { ToolkitError } from '../../shared/errors'
+import { LiveTailCodeLensProvider } from './document/liveTailCodeLensProvider'
+import { generateLambdaNodeFromResource } from '../appBuilder/explorer/nodes/resourceNode'
+import { LambdaFunctionNode } from '../../lambda/explorer/lambdaFunctionNode'
+import { getSourceNode } from '../../shared/utilities/treeNodeUtils'
+
+export const liveTailRegistry = LiveTailSessionRegistry.instance
+export const liveTailCodeLensProvider = new LiveTailCodeLensProvider(liveTailRegistry)
+export async function activate(context: vscode.ExtensionContext, configuration: Settings): Promise<void> {
+    const registry = LogDataRegistry.instance
+
+    const documentProvider = new LogDataDocumentProvider(registry)
+    const liveTailDocumentProvider = new LiveTailDocumentProvider()
+    context.subscriptions.push(
+        vscode.languages.registerCodeLensProvider(
+            {
+                language: 'log',
+                scheme: CLOUDWATCH_LOGS_SCHEME,
+            },
+            new LogStreamCodeLensProvider(registry, documentProvider)
+        )
+    )
+
+    context.subscriptions.push(
+        vscode.workspace.registerTextDocumentContentProvider(CLOUDWATCH_LOGS_SCHEME, documentProvider)
+    )
+
+    context.subscriptions.push(
+        vscode.languages.registerCodeLensProvider(
+            {
+                language: 'log',
+                scheme: cloudwatchLogsLiveTailScheme,
+            },
+            liveTailCodeLensProvider
+        )
+    )
+
+    context.subscriptions.push(
+        vscode.workspace.registerTextDocumentContentProvider(cloudwatchLogsLiveTailScheme, liveTailDocumentProvider)
+    )
+
+    context.subscriptions.push(
+        vscode.workspace.onDidCloseTextDocument((doc) => {
+            if (doc.isClosed && doc.uri.scheme === CLOUDWATCH_LOGS_SCHEME) {
+                registry.disposeRegistryData(doc.uri)
+            }
+        })
+    )
+
+    context.subscriptions.push(
+        vscode.languages.registerCodeLensProvider(
+            {
+                language: 'log',
+                scheme: CLOUDWATCH_LOGS_SCHEME,
+            },
+            new LogDataCodeLensProvider(registry)
+        )
+    )
+
+    context.subscriptions.push(
+        Commands.register('aws.loadLogStreamFile', async (uri: vscode.Uri, registry: LogDataRegistry) =>
+            loadAndOpenInitialLogStreamFile(uri, registry)
+        )
+    )
+    context.subscriptions.push(Commands.register('aws.copyLogResource', copyLogResource))
+    context.subscriptions.push(
+        Commands.register(
+            'aws.addLogEvents',
+            async (
+                document: vscode.TextDocument,
+                registry: LogDataRegistry,
+                headOrTail: 'head' | 'tail',
+                onDidChangeCodeLensEvent: vscode.EventEmitter<void>
+            ) => addLogEvents(document, registry, headOrTail, onDidChangeCodeLensEvent)
+        ),
+        Commands.register('aws.saveCurrentLogDataContent', async () => await saveCurrentLogDataContent()),
+        // AWS Explorer right-click action
+        // Here instead of in ../awsexplorer/activation due to dependence on the registry.
+        Commands.register('aws.cwl.viewLogStream', async (node: LogGroupNode) => await viewLogStream(node, registry)),
+
+        Commands.register('aws.cwl.searchLogGroup', async (node: LogGroupNode | CloudWatchLogsNode) => {
+            const logGroupInfo =
+                node instanceof LogGroupNode
+                    ? { regionName: node.regionCode, groupName: node.logGroup.logGroupName! }
+                    : undefined
+            const source = node ? (logGroupInfo ? 'ExplorerLogGroupNode' : 'ExplorerServiceNode') : 'Command'
+            await searchLogGroup(registry, source, logGroupInfo)
+        }),
+
+        Commands.register('aws.cwl.changeFilterPattern', async () => changeLogSearchParams(registry, 'filterPattern')),
+
+        Commands.register('aws.cwl.changeTimeFilter', async () => changeLogSearchParams(registry, 'timeFilter')),
+
+        Commands.register('aws.cwl.tailLogGroup', async (node: LogGroupNode | CloudWatchLogsNode) => {
+            const logGroupInfo =
+                node instanceof LogGroupNode
+                    ? { regionName: node.regionCode, groupName: node.logGroup.logGroupName! }
+                    : undefined
+            const source = node ? (logGroupInfo ? 'ExplorerLogGroupNode' : 'ExplorerServiceNode') : 'Command'
+            await tailLogGroup(liveTailRegistry, source, liveTailCodeLensProvider, logGroupInfo)
+        }),
+
+        Commands.register('aws.cwl.stopTailingLogGroup', async (document: vscode.TextDocument, source: string) => {
+            closeSession(document.uri, liveTailRegistry, source, liveTailCodeLensProvider)
+        }),
+
+        Commands.register('aws.cwl.clearDocument', async (document: vscode.TextDocument) => {
+            await clearDocument(document)
+        }),
+
+        Commands.register('aws.appBuilder.searchLogs', async (node: DeployedResourceNode | TreeNode) => {
+            try {
+                let tmpNode: LambdaFunctionNode | undefined = getSourceNode<LambdaFunctionNode>(node)
+                if (!tmpNode && isTreeNode(node)) {
+                    // failed to extract, meaning this is appbuilder function node
+                    tmpNode = await generateLambdaNodeFromResource(node.resource as any)
+                }
+                const logGroupInfo = {
+                    regionName: tmpNode.regionCode,
+                    groupName: getFunctionLogGroupName(tmpNode.configuration),
+                }
+
+                const source: string = logGroupInfo ? 'AppBuilderSearchLogs' : 'CommandPaletteSearchLogs'
+                await searchLogGroup(registry, source, logGroupInfo)
+            } catch (err) {
+                getLogger().error('Failed to search logs: %s', err)
+                throw ToolkitError.chain(err, 'Failed to search logs')
+            }
+        })
+    )
+}
+
+export function getFunctionLogGroupName(configuration: any) {
+    const logGroupPrefix = '/aws/lambda/'
+    return configuration.LoggingConfig?.LogGroup || logGroupPrefix + configuration.FunctionName
+}
diff --git a/packages/core/src/awsService/cloudWatchLogs/changeLogSearch.ts b/packages/core/src/awsService/cloudWatchLogs/changeLogSearch.ts
new file mode 100644
index 00000000000..349f7339e87
--- /dev/null
+++ b/packages/core/src/awsService/cloudWatchLogs/changeLogSearch.ts
@@ -0,0 +1,104 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { CancellationError } from '../../shared/utilities/timeoutUtils'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { showInputBox } from '../../shared/ui/inputPrompter'
+import { cwlUriSchema, isLogStreamUri, recordTelemetryFilter } from './cloudWatchLogsUtils'
+import { prepareDocument } from './commands/searchLogGroup'
+import { getActiveDocumentUri } from './document/logDataDocumentProvider'
+import { CloudWatchLogsData, filterLogEventsFromUri, LogDataRegistry } from './registry/logDataRegistry'
+import { isViewAllEvents, TimeFilterResponse, TimeFilterSubmenu } from './timeFilterSubmenu'
+
+/**
+ * Prompts the user for new value for param in logSearch.
+ * @param registry
+ * @param param
+ * @param oldUri
+ * @returns Undefined if cancelled and the newData otherwise.
+ */
+
+export async function getNewData(
+    param: 'filterPattern' | 'timeFilter',
+    oldData: CloudWatchLogsData
+): Promise<CloudWatchLogsData | undefined> {
+    // We must deepcopy the parameters so that we don't change their original value in oldData
+    const newData: CloudWatchLogsData = {
+        ...oldData,
+        parameters: { ...oldData.parameters },
+        events: [],
+        next: undefined,
+        previous: undefined,
+    }
+
+    let newPattern: string | undefined
+    let newTimeRange: TimeFilterResponse | undefined
+
+    switch (param) {
+        case 'filterPattern':
+            newPattern = await showInputBox({
+                title: oldData.logGroupInfo.streamName ? 'Filter Log Stream' : 'Search Log Group',
+                placeholder: 'Enter Text Here',
+                value: oldData.parameters.filterPattern ?? undefined,
+            })
+            if (newPattern === undefined) {
+                return
+            }
+            newData.parameters.filterPattern = newPattern
+            break
+
+        case 'timeFilter':
+            newTimeRange = (await new TimeFilterSubmenu(oldData.parameters).prompt()) as TimeFilterResponse
+            if (newTimeRange === undefined) {
+                return
+            }
+            newData.parameters.startTime = isViewAllEvents(newTimeRange) ? undefined : newTimeRange.start
+            newData.parameters.endTime = isViewAllEvents(newTimeRange) ? undefined : newTimeRange.end
+            break
+    }
+
+    if (newData.logGroupInfo.streamName) {
+        newData.retrieveLogsFunction = filterLogEventsFromUri
+        newData.parameters.streamNameOptions = [newData.logGroupInfo.streamName]
+        newData.logGroupInfo.streamName = undefined
+    }
+
+    recordTelemetryFilter(newData)
+
+    return newData
+}
+
+export async function changeLogSearchParams(
+    registry: LogDataRegistry,
+    param: 'filterPattern' | 'timeFilter'
+): Promise<void> {
+    await telemetry.cloudwatchlogs_open.run(async (span) => {
+        const oldUri = getActiveDocumentUri(registry)
+        span.record({
+            source: 'Editor',
+            cloudWatchResourceType: isLogStreamUri(oldUri) ? 'logStream' : 'logGroup',
+            hasTimeFilter: param === 'timeFilter',
+            hasTextFilter: param === 'filterPattern',
+        })
+
+        if (!registry.isRegistered(oldUri)) {
+            throw new Error(`cwl: Failed to get data for URI: ${oldUri}`)
+        }
+
+        const oldData = registry.getRegisteredLog(oldUri)
+        const newData = await getNewData(param, oldData)
+        span.record({
+            cloudWatchResourceType: isLogStreamUri(oldUri) ? 'logStream' : 'logGroup',
+            hasTimeFilter: !!oldData.parameters.startTime || param === 'timeFilter',
+            hasTextFilter: !!oldData.parameters.filterPattern || param === 'filterPattern',
+        })
+
+        if (!newData) {
+            throw new CancellationError('user')
+        }
+
+        const newUri = cwlUriSchema.form({ logGroupInfo: newData.logGroupInfo, parameters: newData.parameters })
+        await prepareDocument(newUri, newData, registry)
+    })
+}
diff --git a/packages/core/src/awsService/cloudWatchLogs/cloudWatchLogsUtils.ts b/packages/core/src/awsService/cloudWatchLogs/cloudWatchLogsUtils.ts
new file mode 100644
index 00000000000..e2356595153
--- /dev/null
+++ b/packages/core/src/awsService/cloudWatchLogs/cloudWatchLogsUtils.ts
@@ -0,0 +1,114 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { telemetry } from '../../shared/telemetry/telemetry'
+import * as vscode from 'vscode'
+import { CLOUDWATCH_LOGS_SCHEME } from '../../shared/constants'
+import { fromExtensionManifest } from '../../shared/settings'
+import { CloudWatchLogsArgs, CloudWatchLogsData, CloudWatchLogsGroupInfo } from './registry/logDataRegistry'
+import { CloudWatchLogsParameters } from './registry/logDataRegistry'
+import { UriSchema } from '../../shared/utilities/uriUtils'
+
+// URIs are the only vehicle for delivering information to a TextDocumentContentProvider.
+// The following functions are used to structure and destructure relevant information to/from a URI.
+// Colons are not valid characters in either the group name or stream name and will be used as separators.
+
+/** Records "filter" metric if a filter was actually applied. */
+export function recordTelemetryFilter(logData: CloudWatchLogsData): void {
+    const hasTimeFilter = !!logData.parameters.startTime
+    const hasTextFilter = !!logData.parameters.filterPattern && logData.parameters.filterPattern !== ''
+    // Update current container (span) metric.
+    telemetry.record({
+        hasTimeFilter: hasTimeFilter,
+        hasTextFilter: hasTextFilter,
+    })
+}
+
+/**
+ * This function concatenates the path and query to create a unique (enough) identifier for a URI.
+ * @param uri
+ * @returns
+ */
+export function uriToKey(uri: vscode.Uri): string {
+    if (uri.query) {
+        try {
+            const { filterPattern, startTime, endTime, limit, streamNameOptions } = cwlUriSchema.parse(uri).parameters
+            const parts = [uri.path, filterPattern, startTime, endTime, limit, streamNameOptions]
+            return parts.map((p) => p ?? '').join(':')
+        } catch {
+            throw new Error(
+                `Unable to parse ${uri.query} into JSON and therefore cannot key uri with path: ${uri.path}`
+            )
+        }
+    }
+    return uri.path
+}
+
+/**
+ * Creates a message key from region + loggroup + logstream.
+ *
+ * Intentionally _ignores_ query parameters, so that the validation step can use the same progress
+ * message as the actual log group search. That results in a more fluid UX.
+ */
+export function msgKey(logGroupInfo: CloudWatchLogsGroupInfo): string {
+    const uri = cwlUriSchema.form({ logGroupInfo: logGroupInfo, parameters: {} })
+    return uri.toString()
+}
+
+/**
+ * Destructures an awsCloudWatchLogs URI into its component pieces.
+ * @param uri URI for a Cloudwatch Logs file
+ */
+function parseCloudWatchLogsUri(uri: vscode.Uri): CloudWatchLogsArgs {
+    const parts = uri.path.split(':')
+
+    if (uri.scheme !== CLOUDWATCH_LOGS_SCHEME) {
+        throw new Error(`URI ${uri} is not parseable for CloudWatch Logs`)
+    }
+
+    const logGroupInfo: CloudWatchLogsGroupInfo = {
+        regionName: parts[0],
+        groupName: parts[1],
+    }
+
+    if (parts.length === 3) {
+        logGroupInfo.streamName = parts[2]
+    }
+
+    return {
+        logGroupInfo,
+        parameters: JSON.parse(uri.query),
+    }
+}
+
+export function patternFromCwlUri(uri: vscode.Uri): CloudWatchLogsParameters['filterPattern'] {
+    return cwlUriSchema.parse(uri).parameters.filterPattern
+}
+
+/**
+ * Determines if loadOlder codelense should be visible on virtual document
+ * @param uri CloudWatchLogs Document URI
+ * @returns
+ */
+export function isLogStreamUri(uri: vscode.Uri): boolean {
+    const logGroupInfo = cwlUriSchema.parse(uri).logGroupInfo
+    return logGroupInfo.streamName !== undefined
+}
+
+/**
+ * Converts relevant information for CloudWatch Logs Streams into an awsCloudWatchLogs URI
+ * @param groupName Log group name
+ * @param streamName Log stream name
+ * @param regionName AWS region
+ */
+function createURIFromArgs(args: CloudWatchLogsArgs): vscode.Uri {
+    let uriStr = `${CLOUDWATCH_LOGS_SCHEME}:${args.logGroupInfo.regionName}:${args.logGroupInfo.groupName}`
+    uriStr += args.logGroupInfo.streamName ? `:${args.logGroupInfo.streamName}` : ''
+
+    uriStr += `?${encodeURIComponent(JSON.stringify(args.parameters))}`
+    return vscode.Uri.parse(uriStr)
+}
+export const cwlUriSchema = new UriSchema<CloudWatchLogsArgs>(parseCloudWatchLogsUri, createURIFromArgs)
+
+export class CloudWatchLogsSettings extends fromExtensionManifest('aws.cwl', { limit: Number }) {}
diff --git a/packages/core/src/awsService/cloudWatchLogs/commands/addLogEvents.ts b/packages/core/src/awsService/cloudWatchLogs/commands/addLogEvents.ts
new file mode 100644
index 00000000000..fe8b7cb5334
--- /dev/null
+++ b/packages/core/src/awsService/cloudWatchLogs/commands/addLogEvents.ts
@@ -0,0 +1,63 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import AsyncLock from 'async-lock'
+import { getLogger } from '../../../shared/logger/logger'
+import { LogDataRegistry } from '../registry/logDataRegistry'
+import { CancellationError } from '../../../shared/utilities/timeoutUtils'
+import { localize } from 'vscode-nls'
+
+// TODO: Cut a PR to the async-lock package?...as of now, maxPending = 0 is theoretically ideal, but also falsy (which sets maxPending = 1000):
+// https://github.com/rogierschouten/async-lock/blob/78cb0c2441650d7bdc148548f99542ccc9c93fd7/lib/index.js#L19
+const lock = new AsyncLock({ maxPending: 1 })
+
+export async function addLogEvents(
+    document: vscode.TextDocument,
+    registry: LogDataRegistry,
+    headOrTail: 'head' | 'tail',
+    onDidChangeCodeLensEvent: vscode.EventEmitter<void>
+): Promise<void> {
+    const uri = document.uri
+    const lockName = `${headOrTail === 'head' ? 'logHeadLock' : 'logTailLock'}:${uri.path}`
+
+    if (lock.isBusy(lockName)) {
+        getLogger().debug(`addLogEvents already locked for lock: ${lockName}`)
+        return
+    }
+
+    try {
+        await lock.acquire(lockName, async () => {
+            // TODO: Find a way to force this to fire and run through codelens provider prior to updateLog call?
+            // Currently EXTREMELY unreliable that the event signaling that the busy status is set occurs before updateLog completes.
+            registry.setBusyStatus(uri, true)
+            if (onDidChangeCodeLensEvent) {
+                onDidChangeCodeLensEvent.fire()
+            }
+            await registry.fetchNextLogEvents(uri, headOrTail)
+            getLogger().debug('Update done, releasing lock...')
+        })
+    } catch (e) {
+        if (CancellationError.isUserCancelled(e)) {
+            getLogger().debug('cwl: User Cancelled Search')
+        } else {
+            // contingency in case lock isn't busy but still locked out. Don't want to accidentally trigger making codelens not busy
+            const error = e as Error
+            void vscode.window.showErrorMessage(
+                localize(
+                    'AWS.cwl.searchLogGroup.errorRetrievingLogs2',
+                    'Failed to get logs for {0}: {1}',
+                    uri.path,
+                    error.message
+                )
+            )
+        }
+    } finally {
+        registry.setBusyStatus(uri, false)
+        if (onDidChangeCodeLensEvent) {
+            onDidChangeCodeLensEvent.fire()
+        }
+    }
+}
diff --git a/packages/core/src/awsService/cloudWatchLogs/commands/copyLogResource.ts b/packages/core/src/awsService/cloudWatchLogs/commands/copyLogResource.ts
new file mode 100644
index 00000000000..846f87e797e
--- /dev/null
+++ b/packages/core/src/awsService/cloudWatchLogs/commands/copyLogResource.ts
@@ -0,0 +1,40 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as vscode from 'vscode'
+import { cwlUriSchema, isLogStreamUri } from '../cloudWatchLogsUtils'
+import { copyToClipboard } from '../../../shared/utilities/messages'
+
+export async function copyLogResource(uri?: vscode.Uri): Promise<void> {
+    try {
+        if (!uri) {
+            // No URI = used command palette as entrypoint, attempt to get URI from active editor
+            // should work correctly under any normal circumstances since the action only appears in command palette when the editor is a CloudWatch Logs editor
+            uri = vscode.window.activeTextEditor?.document.uri
+            if (!uri) {
+                throw new Error('no active text editor, or undefined URI')
+            }
+        }
+        const parsedUri = cwlUriSchema.parse(uri)
+        const resourceName = isLogStreamUri(uri) ? parsedUri.logGroupInfo.streamName : parsedUri.logGroupInfo.groupName
+
+        if (!resourceName) {
+            throw new Error(`Failed to copy log resource name for URI (missing stream or group?): ${uri}`)
+        }
+        await copyToClipboard(resourceName)
+    } catch (e) {
+        void vscode.window.showErrorMessage(
+            localize(
+                'AWS.cwl.invalidEditor',
+                'Invalid Cloudwatch Log stream or group: {0}',
+                vscode.window.activeTextEditor?.document.fileName
+            )
+        )
+        return
+    }
+}
diff --git a/packages/core/src/awsService/cloudWatchLogs/commands/saveCurrentLogDataContent.ts b/packages/core/src/awsService/cloudWatchLogs/commands/saveCurrentLogDataContent.ts
new file mode 100644
index 00000000000..9d1600fafba
--- /dev/null
+++ b/packages/core/src/awsService/cloudWatchLogs/commands/saveCurrentLogDataContent.ts
@@ -0,0 +1,78 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import { cwlUriSchema, isLogStreamUri } from '../cloudWatchLogsUtils'
+import { telemetry, CloudWatchResourceType, Result } from '../../../shared/telemetry/telemetry'
+import fs from '../../../shared/fs/fs'
+
+/** Prompts the user to select a file location to save the currently visible "aws-cwl:" document to. */
+export async function saveCurrentLogDataContent(): Promise<void> {
+    let result: Result = 'Succeeded'
+    let resourceType: CloudWatchResourceType = 'logStream' // Default to stream if it fails to find URI
+
+    try {
+        // Get URI from active editor.
+        const uri = vscode.window.activeTextEditor?.document.uri
+        if (!uri) {
+            throw new Error()
+        }
+
+        resourceType = isLogStreamUri(uri) ? 'logStream' : 'logGroup'
+        const content = vscode.window.activeTextEditor?.document.getText()
+        const workspaceDir = vscode.workspace.workspaceFolders
+            ? vscode.workspace.workspaceFolders[0].uri
+            : vscode.Uri.file(fs.getUserHomeDir())
+        const uriComponents = cwlUriSchema.parse(uri)
+        const logGroupInfo = uriComponents.logGroupInfo
+
+        const localizedLogFile = localize('AWS.command.saveCurrentLogDataContent.logfile', 'Log File')
+        const selectedUri = await vscode.window.showSaveDialog({
+            defaultUri: vscode.Uri.joinPath(
+                workspaceDir,
+                logGroupInfo.streamName ? logGroupInfo.streamName : logGroupInfo.groupName
+            ),
+            filters: {
+                [localizedLogFile]: ['log'],
+            },
+        })
+
+        if (selectedUri && content) {
+            try {
+                await fs.writeFile(selectedUri, content)
+            } catch (e) {
+                result = 'Failed'
+                const err = e as Error
+                void vscode.window.showErrorMessage(
+                    localize(
+                        'AWS.command.saveCurrentLogDataContent.error',
+                        'Error saving current log to {0}: {1}',
+                        selectedUri.fsPath,
+                        err.message
+                    )
+                )
+            }
+        } else {
+            result = 'Cancelled'
+        }
+    } catch (e) {
+        result = 'Failed'
+        void vscode.window.showErrorMessage(
+            localize(
+                'AWS.cwl.invalidEditor',
+                'Not a Cloudwatch Log data source: {0}',
+                vscode.window.activeTextEditor?.document.fileName
+            )
+        )
+    }
+
+    telemetry.cloudwatchlogs_download.emit({
+        result: result,
+        cloudWatchResourceType: resourceType,
+    })
+}
diff --git a/packages/core/src/awsService/cloudWatchLogs/commands/searchLogGroup.ts b/packages/core/src/awsService/cloudWatchLogs/commands/searchLogGroup.ts
new file mode 100644
index 00000000000..6b45f35fb53
--- /dev/null
+++ b/packages/core/src/awsService/cloudWatchLogs/commands/searchLogGroup.ts
@@ -0,0 +1,304 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import {
+    CloudWatchLogsData,
+    CloudWatchLogsGroupInfo,
+    LogDataRegistry,
+    filterLogEventsFromUri,
+    CloudWatchLogsParameters,
+    initLogData,
+} from '../registry/logDataRegistry'
+import { DataQuickPickItem } from '../../../shared/ui/pickerPrompter'
+import { isValidResponse, isWizardControl, Wizard, WIZARD_RETRY } from '../../../shared/wizards/wizard'
+import { cwlUriSchema, msgKey, recordTelemetryFilter } from '../cloudWatchLogsUtils'
+import { CloudWatchLogsClient } from '../../../shared/clients/cloudWatchLogs'
+import { CancellationError } from '../../../shared/utilities/timeoutUtils'
+import { getLogger } from '../../../shared/logger/logger'
+import { TimeFilterResponse, TimeFilterSubmenu } from '../timeFilterSubmenu'
+import { ExtendedInputBoxOptions, InputBox, InputBoxPrompter } from '../../../shared/ui/inputPrompter'
+import { RegionSubmenu, RegionSubmenuResponse } from '../../../shared/ui/common/regionSubmenu'
+import { truncate } from '../../../shared/utilities/textUtilities'
+import { createBackButton, createExitButton, createHelpButton } from '../../../shared/ui/buttons'
+import { PromptResult } from '../../../shared/ui/prompter'
+import { ToolkitError } from '../../../shared/errors'
+import { Messages } from '../../../shared/utilities/messages'
+import { showFile } from '../../../shared/utilities/textDocumentUtilities'
+import { LogGroup } from '@aws-sdk/client-cloudwatch-logs'
+
+const localize = nls.loadMessageBundle()
+
+function handleWizardResponse(response: SearchLogGroupWizardResponse, registry: LogDataRegistry): CloudWatchLogsData {
+    const logGroupInfo: CloudWatchLogsGroupInfo = {
+        groupName: response.submenuResponse.data,
+        regionName: response.submenuResponse.region,
+    }
+    let parameters: CloudWatchLogsParameters
+    const limitParam = registry.configuration.get('limit', 10000)
+
+    if (response.timeRange.start === response.timeRange.end) {
+        // this means no time filter.
+        parameters = {
+            limit: limitParam,
+            filterPattern: response.filterPattern,
+        }
+    } else {
+        parameters = {
+            limit: limitParam,
+            filterPattern: response.filterPattern,
+            startTime: response.timeRange.start,
+            endTime: response.timeRange.end,
+        }
+    }
+
+    const logData = initLogData(logGroupInfo, parameters, filterLogEventsFromUri)
+    recordTelemetryFilter(logData)
+
+    return logData
+}
+
+export async function prepareDocument(uri: vscode.Uri, logData: CloudWatchLogsData, registry: LogDataRegistry) {
+    try {
+        // Gets the data: calls filterLogEventsFromUri().
+        await registry.fetchNextLogEvents(uri)
+        await showFile(uri)
+    } catch (err) {
+        if (CancellationError.isUserCancelled(err)) {
+            throw err
+        }
+
+        throw ToolkitError.chain(
+            err,
+            localize(
+                'AWS.cwl.searchLogGroup.errorRetrievingLogs',
+                'Failed to get logs for {0}',
+                cwlUriSchema.parse(uri).logGroupInfo.groupName
+            )
+        )
+    }
+}
+
+/**
+ * "Search Log Group" command
+ *
+ * @param registry
+ * @param source Telemetry "source" name
+ * @param logData
+ */
+export async function searchLogGroup(
+    registry: LogDataRegistry,
+    source: string,
+    logData?: { regionName: string; groupName: string }
+): Promise<void> {
+    await telemetry.cloudwatchlogs_open.run(async (span) => {
+        const wizard = new SearchLogGroupWizard(logData)
+        span.record({ cloudWatchResourceType: 'logGroup', source: source })
+        const response = await wizard.run()
+        if (!response) {
+            throw new CancellationError('user')
+        }
+
+        const userResponse = handleWizardResponse(response, registry)
+        const uri = cwlUriSchema.form({ logGroupInfo: userResponse.logGroupInfo, parameters: userResponse.parameters })
+        await prepareDocument(uri, userResponse, registry)
+    })
+}
+
+async function getLogGroupsFromRegion(regionCode: string): Promise<DataQuickPickItem<string>[]> {
+    const client = new CloudWatchLogsClient(regionCode)
+    const logGroups = await logGroupsToArray(client.describeLogGroups())
+    const options = logGroups.map<DataQuickPickItem<string>>((logGroupString) => ({
+        label: logGroupString,
+        data: logGroupString,
+    }))
+    return options
+}
+
+async function logGroupsToArray(logGroups: AsyncIterableIterator<LogGroup>): Promise<string[]> {
+    const logGroupsArray = []
+    for await (const logGroupObject of logGroups) {
+        logGroupObject.logGroupName && logGroupsArray.push(logGroupObject.logGroupName)
+    }
+    return logGroupsArray
+}
+
+/**
+ * HACK: this subclass overrides promptUser() so that we can validate the
+ * search pattern against the service and if it fails, keep the prompt displayed.
+ *
+ * This is necessary until vscode's inputbox.onDidAccept() awaits async callbacks:
+ *    - https://github.com/aws/aws-toolkit-vscode/pull/3114#discussion_r1085484630
+ *    - https://github.com/microsoft/vscode/blob/78947444843f4ebb094e5ab4288360010a293463/extensions/git-base/src/remoteSource.ts#L13
+ *    - https://github.com/microsoft/vscode/blob/78947444843f4ebb094e5ab4288360010a293463/src/vs/base/browser/ui/inputbox/inputBox.ts#L511
+ */
+export class SearchPatternPrompter extends InputBoxPrompter {
+    constructor(
+        public logGroup: CloudWatchLogsGroupInfo,
+        public logParams: CloudWatchLogsParameters,
+        /** HACK: also maintain ad-hoc state because `wizardState` is not mutable. */
+        public readonly retryState: any,
+        public override readonly inputBox: InputBox,
+        protected override readonly options: ExtendedInputBoxOptions = {},
+        private noValidate: boolean
+    ) {
+        super(inputBox, options)
+        this.inputBox.validationMessage = retryState.validationMessage ? retryState.validationMessage : undefined
+        if (this.retryState.searchPattern) {
+            this.inputBox.value = this.retryState.searchPattern
+        }
+        this.inputBox.onDidChangeValue((val) => {
+            this.inputBox.validationMessage = undefined
+        })
+    }
+
+    protected override async promptUser(): Promise<PromptResult<string>> {
+        const rv = await super.promptUser()
+        this.inputBox.busy = true
+        try {
+            if (isWizardControl(rv)) {
+                return rv
+            }
+
+            const validationResult = await this.validateSearchPattern(this.inputBox.value, this.noValidate)
+            // HACK: maintain our own state and restore it.
+            this.retryState.searchPattern = isValidResponse(rv) ? rv : undefined
+            this.retryState.validationMessage = validationResult
+
+            if (validationResult !== undefined) {
+                return WIZARD_RETRY
+            }
+            return this.inputBox.value
+        } finally {
+            this.inputBox.busy = false
+        }
+    }
+
+    async validateSearchPattern(searchPattern: string, noValidate: boolean): Promise<string | undefined> {
+        if (noValidate) {
+            return undefined // Skip validation (service call) in tests.
+        }
+        getLogger().debug('cwl: validateSearchPattern: %O', searchPattern)
+        try {
+            await filterLogEventsFromUri(
+                this.logGroup,
+                {
+                    ...this.logParams,
+                    filterPattern: searchPattern,
+                    limit: 1,
+                },
+                undefined,
+                false
+            )
+        } catch (e) {
+            // Validation error. Get the progress message from the global map and cancel it.
+            const msgTimeout = await Messages.putMessage(msgKey(this.logGroup), '')
+            msgTimeout.cancel()
+
+            return (e as Error).message
+        }
+        return undefined
+    }
+}
+
+/**
+ * Prompts the user for a search query, and validates it.
+ *
+ * @param noValidate For testing only: disable validation (which does a service call).
+ */
+export function createSearchPatternPrompter(
+    logGroup: CloudWatchLogsGroupInfo,
+    logParams: CloudWatchLogsParameters,
+    retryState: any,
+    isFirst: boolean,
+    noValidate: boolean
+): SearchPatternPrompter {
+    const helpUri =
+        'https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/FilterAndPatternSyntax.html#matching-terms-events'
+    const titleText = localize(
+        'AWS.cwl.searchLogGroup.filterPatternTitle',
+        `Search Log Group {0}`,
+        truncate(logGroup.groupName, -50)
+    )
+    const placeHolderText = localize(
+        'AWS.cwl.searchLogGroup.filterPatternPlaceholder',
+        'search pattern (case sensitive; empty matches all)'
+    )
+
+    const options = {
+        title: titleText,
+        placeholder: placeHolderText,
+        buttons: [createHelpButton(helpUri), createExitButton()],
+    }
+
+    if (!isFirst) {
+        options.buttons = [...options.buttons, createBackButton()]
+    }
+
+    const inputBox = vscode.window.createInputBox() as InputBox
+    // assign({ ...defaultInputboxOptions, ...options }, inputBox)
+    inputBox.title = titleText
+    inputBox.placeholder = placeHolderText
+    inputBox.buttons = options.buttons
+    const prompter = new SearchPatternPrompter(logGroup, logParams, retryState, inputBox, {}, noValidate)
+    return prompter
+}
+
+export function createRegionSubmenu() {
+    return new RegionSubmenu(
+        getLogGroupsFromRegion,
+        { title: localize('AWS.cwl.searchLogGroup.logGroupPromptTitle', 'Select Log Group') },
+        { title: localize('AWS.cwl.searchLogGroup.regionPromptTitle', 'Select Region for Log Group') },
+        'Log Groups'
+    )
+}
+
+export interface SearchLogGroupWizardResponse {
+    submenuResponse: RegionSubmenuResponse<string>
+    filterPattern: string
+    timeRange: TimeFilterResponse
+}
+
+export class SearchLogGroupWizard extends Wizard<SearchLogGroupWizardResponse> {
+    /** HACK: maintain our own state and restore it because WizardState is not mutable. */
+    private retryState: any = {}
+
+    public constructor(logGroupInfo?: CloudWatchLogsGroupInfo) {
+        super({
+            initState: {
+                submenuResponse: logGroupInfo
+                    ? {
+                          data: logGroupInfo.groupName,
+                          region: logGroupInfo.regionName,
+                      }
+                    : undefined,
+            },
+        })
+
+        this.form.submenuResponse.bindPrompter(createRegionSubmenu)
+        this.form.timeRange.bindPrompter(() => new TimeFilterSubmenu())
+        this.form.filterPattern.bindPrompter((state) => {
+            if (!state.submenuResponse) {
+                throw Error('state.submenuResponse is null')
+            }
+            return createSearchPatternPrompter(
+                {
+                    groupName: state.submenuResponse.data,
+                    regionName: state.submenuResponse.region,
+                },
+                {
+                    startTime: state.timeRange?.start,
+                    endTime: state.timeRange?.end,
+                    filterPattern: undefined,
+                },
+                this.retryState,
+                logGroupInfo ? true : false,
+                false
+            )
+        })
+    }
+}
diff --git a/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts
new file mode 100644
index 00000000000..a86ed4d3382
--- /dev/null
+++ b/packages/core/src/awsService/cloudWatchLogs/commands/tailLogGroup.ts
@@ -0,0 +1,292 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { TailLogGroupWizard } from '../wizard/tailLogGroupWizard'
+import { CancellationError } from '../../../shared/utilities/timeoutUtils'
+import { LiveTailSession, LiveTailSessionConfiguration } from '../registry/liveTailSession'
+import { LiveTailSessionRegistry } from '../registry/liveTailSessionRegistry'
+import {
+    LiveTailSessionLogEvent,
+    LiveTailSessionUpdate,
+    StartLiveTailResponseStream,
+} from '@aws-sdk/client-cloudwatch-logs'
+import { ToolkitError } from '../../../shared/errors'
+import { getLogger } from '../../../shared/logger/logger'
+import globals from '../../../shared/extensionGlobals'
+import { uriToKey } from '../cloudWatchLogsUtils'
+import { LiveTailCodeLensProvider } from '../document/liveTailCodeLensProvider'
+import { LogStreamFilterResponse } from '../wizard/liveTailLogStreamSubmenu'
+
+export async function tailLogGroup(
+    registry: LiveTailSessionRegistry,
+    source: string,
+    codeLensProvider: LiveTailCodeLensProvider,
+    logData?: { regionName: string; groupName: string },
+    logStreamFilterData?: LogStreamFilterResponse
+): Promise<void> {
+    await telemetry.cloudwatchlogs_startLiveTail.run(async (span) => {
+        const wizard = new TailLogGroupWizard(logData, logStreamFilterData)
+        const wizardResponse = await wizard.run()
+        if (!wizardResponse) {
+            throw new CancellationError('user')
+        }
+        if (wizardResponse.logStreamFilter.type === 'menu' || wizardResponse.logStreamFilter.type === undefined) {
+            // logstream filter wizard uses type to determine which submenu to show. 'menu' is set when no type is selected
+            // and to show the 'menu' of selecting a type. This should not be reachable due to the picker logic, but validating in case.
+            throw new ToolkitError(`Invalid Log Stream filter type: ${wizardResponse.logStreamFilter.type}`)
+        }
+        const awsCredentials = await globals.awsContext.getCredentials()
+        if (awsCredentials === undefined) {
+            throw new ToolkitError('Failed to start LiveTail session: credentials are undefined.')
+        }
+        const liveTailSessionConfig: LiveTailSessionConfiguration = {
+            logGroupArn: wizardResponse.regionLogGroupSubmenuResponse.data,
+            logStreamFilter: wizardResponse.logStreamFilter,
+            logEventFilterPattern: wizardResponse.filterPattern,
+            region: wizardResponse.regionLogGroupSubmenuResponse.region,
+            awsCredentials: awsCredentials,
+        }
+        const session = new LiveTailSession(liveTailSessionConfig)
+        if (registry.has(uriToKey(session.uri))) {
+            await vscode.window.showTextDocument(session.uri, { preview: false })
+            void vscode.window.showInformationMessage(`Switching editor to an existing session that matches request.`)
+            span.record({
+                result: 'Succeeded',
+                sessionAlreadyStarted: true,
+                source: source,
+            })
+            return
+        }
+        const document = await prepareDocument(session)
+
+        const disposables: vscode.Disposable[] = []
+        disposables.push(hideShowStatusBarItemsOnActiveEditor(session, document))
+        disposables.push(closeSessionWhenAllEditorsClosed(session, registry, document, codeLensProvider))
+
+        try {
+            const stream = await session.startLiveTailSession()
+            registry.set(uriToKey(session.uri), session)
+            codeLensProvider.refresh()
+            getLogger().info(`LiveTail session started: ${uriToKey(session.uri)}`)
+            span.record({
+                source: source,
+                result: 'Succeeded',
+                sessionAlreadyStarted: false,
+                hasTextFilter: Boolean(wizardResponse.filterPattern),
+                filterType: wizardResponse.logStreamFilter.type,
+            })
+            await handleSessionStream(stream, document, session)
+        } finally {
+            for (const disposable of disposables) {
+                disposable.dispose()
+            }
+        }
+    })
+}
+
+export function closeSession(
+    sessionUri: vscode.Uri,
+    registry: LiveTailSessionRegistry,
+    source: string,
+    codeLensProvider: LiveTailCodeLensProvider
+) {
+    telemetry.cloudwatchlogs_stopLiveTail.run((span) => {
+        const session = registry.get(uriToKey(sessionUri))
+        if (session === undefined) {
+            throw new ToolkitError(`No LiveTail session found for URI: ${uriToKey(sessionUri)}`)
+        }
+        session.stopLiveTailSession()
+        registry.delete(uriToKey(sessionUri))
+        void vscode.window.showInformationMessage(`Stopped LiveTail session: ${uriToKey(sessionUri)}`)
+        codeLensProvider.refresh()
+        span.record({
+            result: 'Succeeded',
+            source: source,
+            duration: session.getLiveTailSessionDuration(),
+        })
+    })
+}
+
+export async function clearDocument(textDocument: vscode.TextDocument) {
+    const edit = new vscode.WorkspaceEdit()
+    const startPosition = new vscode.Position(0, 0)
+    const endPosition = new vscode.Position(textDocument.lineCount, 0)
+    edit.delete(textDocument.uri, new vscode.Range(startPosition, endPosition))
+    await vscode.workspace.applyEdit(edit)
+}
+
+async function prepareDocument(session: LiveTailSession): Promise<vscode.TextDocument> {
+    const textDocument = await vscode.workspace.openTextDocument(session.uri)
+    await clearDocument(textDocument)
+    await vscode.window.showTextDocument(textDocument, { preview: false })
+    await vscode.languages.setTextDocumentLanguage(textDocument, 'log')
+    session.showStatusBarItem(true)
+    return textDocument
+}
+
+async function handleSessionStream(
+    stream: AsyncIterable<StartLiveTailResponseStream>,
+    document: vscode.TextDocument,
+    session: LiveTailSession
+) {
+    try {
+        for await (const event of stream) {
+            if (event.sessionUpdate !== undefined && event.sessionUpdate.sessionResults !== undefined) {
+                const formattedLogEvents = event.sessionUpdate.sessionResults.map<string>((logEvent) =>
+                    formatLogEvent(logEvent)
+                )
+                if (formattedLogEvents.length !== 0) {
+                    // Determine should scroll before adding new lines to doc because adding large
+                    // amount of new lines can push bottom of file out of view before scrolling.
+                    const editorsToScroll = getTextEditorsToScroll(document)
+                    await updateTextDocumentWithNewLogEvents(formattedLogEvents, document, session.maxLines)
+                    // eslint-disable-next-line unicorn/no-array-for-each
+                    editorsToScroll.forEach(scrollTextEditorToBottom)
+                }
+                session.eventRate = eventRate(event.sessionUpdate)
+                session.isSampled = isSampled(event.sessionUpdate)
+            }
+        }
+    } catch (e) {
+        if (session.isAborted) {
+            // Expected case. User action cancelled stream (CodeLens, Close Editor, etc.).
+            // AbortSignal interrupts the LiveTail stream, causing error to be thrown here.
+            // Can assume that stopLiveTailSession() has already been called - AbortSignal is only
+            // exposed through that method.
+            getLogger().info(`LiveTail session stopped: ${uriToKey(session.uri)}`)
+        } else {
+            // Unexpected exception.
+            session.stopLiveTailSession()
+            throw ToolkitError.chain(
+                e,
+                `Unexpected on-stream exception while tailing session: ${session.uri.toString()}`
+            )
+        }
+    }
+}
+
+function formatLogEvent(logEvent: LiveTailSessionLogEvent): string {
+    if (!logEvent.timestamp || !logEvent.message) {
+        return ''
+    }
+    const timestamp = new Date(logEvent.timestamp).toLocaleTimeString('en', {
+        timeStyle: 'medium',
+        hour12: false,
+        timeZone: 'UTC',
+    })
+    let line = timestamp.concat('\t', logEvent.message)
+    if (!line.endsWith('\n')) {
+        line = line.concat('\n')
+    }
+    return line
+}
+
+// Auto scroll visible LiveTail session editors if the end-of-file is in view.
+// This allows for newly added log events to stay in view.
+function getTextEditorsToScroll(document: vscode.TextDocument): vscode.TextEditor[] {
+    return vscode.window.visibleTextEditors.filter((editor) => {
+        if (editor.document !== document) {
+            return false
+        }
+        return editor.visibleRanges[0].contains(new vscode.Position(document.lineCount - 1, 0))
+    })
+}
+
+function scrollTextEditorToBottom(editor: vscode.TextEditor) {
+    const position = new vscode.Position(Math.max(editor.document.lineCount - 2, 0), 0)
+    editor.revealRange(new vscode.Range(position, position), vscode.TextEditorRevealType.Default)
+}
+
+async function updateTextDocumentWithNewLogEvents(
+    formattedLogEvents: string[],
+    document: vscode.TextDocument,
+    maxLines: number
+) {
+    const edit = new vscode.WorkspaceEdit()
+    for (const formattedLogEvent of formattedLogEvents) {
+        edit.insert(document.uri, new vscode.Position(document.lineCount, 0), formattedLogEvent)
+    }
+
+    if (document.lineCount + formattedLogEvents.length > maxLines) {
+        trimOldestLines(formattedLogEvents.length, maxLines, document, edit)
+    }
+    await vscode.workspace.applyEdit(edit)
+}
+
+function trimOldestLines(
+    numNewLines: number,
+    maxLines: number,
+    document: vscode.TextDocument,
+    edit: vscode.WorkspaceEdit
+) {
+    const numLinesToTrim = document.lineCount + numNewLines - maxLines
+    const startPosition = new vscode.Position(0, 0)
+    const endPosition = new vscode.Position(numLinesToTrim, 0)
+    const range = new vscode.Range(startPosition, endPosition)
+    edit.delete(document.uri, range)
+}
+
+function isSampled(event: LiveTailSessionUpdate): boolean {
+    return event.sessionMetadata === undefined || event.sessionMetadata.sampled === undefined
+        ? false
+        : event.sessionMetadata.sampled
+}
+
+function eventRate(event: LiveTailSessionUpdate): number {
+    return event.sessionResults === undefined ? 0 : event.sessionResults.length
+}
+
+function hideShowStatusBarItemsOnActiveEditor(
+    session: LiveTailSession,
+    document: vscode.TextDocument
+): vscode.Disposable {
+    return vscode.window.onDidChangeActiveTextEditor((editor) => {
+        session.showStatusBarItem(editor?.document === document)
+    })
+}
+
+/**
+ * The LiveTail session should be automatically closed if the user does not have the session's
+ * document in any Tab in their editor.
+ *
+ * `onDidCloseTextDocument` doesn't work for our case because the tailLogGroup command will keep the stream
+ * writing to the doc even when all its tabs/editors are closed, seemingly keeping the doc 'open'.
+ * Also there is no guarantee that this event fires when an editor tab is closed
+ *
+ * `onDidChangeVisibleTextEditors` returns editors that the user can see its contents. An editor that is open, but hidden
+ * from view, will not be returned. Meaning a Tab that is created (shown in top bar), but not open, will not be returned. Even if
+ * the tab isn't visible, we want to continue writing to the doc, and keep the session alive.
+ */
+function closeSessionWhenAllEditorsClosed(
+    session: LiveTailSession,
+    registry: LiveTailSessionRegistry,
+    document: vscode.TextDocument,
+    codeLensProvider: LiveTailCodeLensProvider
+): vscode.Disposable {
+    return vscode.window.tabGroups.onDidChangeTabs((tabEvent) => {
+        const isOpen = isLiveTailSessionOpenInAnyTab(session)
+        if (!isOpen) {
+            closeSession(session.uri, registry, 'ClosedEditors', codeLensProvider)
+            void clearDocument(document)
+        }
+    })
+}
+
+function isLiveTailSessionOpenInAnyTab(liveTailSession: LiveTailSession) {
+    let isOpen = false
+    // eslint-disable-next-line unicorn/no-array-for-each
+    vscode.window.tabGroups.all.forEach(async (tabGroup) => {
+        for (const tab of tabGroup.tabs) {
+            if (tab.input instanceof vscode.TabInputText) {
+                if (liveTailSession.uri.toString() === tab.input.uri.toString()) {
+                    isOpen = true
+                }
+            }
+        }
+    })
+    return isOpen
+}
diff --git a/packages/core/src/awsService/cloudWatchLogs/commands/viewLogStream.ts b/packages/core/src/awsService/cloudWatchLogs/commands/viewLogStream.ts
new file mode 100644
index 00000000000..87b6261110c
--- /dev/null
+++ b/packages/core/src/awsService/cloudWatchLogs/commands/viewLogStream.ts
@@ -0,0 +1,222 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as vscode from 'vscode'
+import * as picker from '../../../shared/ui/picker'
+import { MultiStepWizard, WIZARD_RETRY, WIZARD_TERMINATE, WizardStep } from '../../../shared/wizards/multiStepWizard'
+import { LogGroupNode } from '../explorer/logGroupNode'
+import * as CloudWatchLogs from '@aws-sdk/client-cloudwatch-logs'
+import { CloudWatchLogsClient } from '../../../shared/clients/cloudWatchLogs'
+import { getPaginatedAwsCallIter, IteratorTransformer } from '../../../shared/utilities/collectionUtils'
+import {
+    CloudWatchLogsGroupInfo,
+    CloudWatchLogsParameters,
+    LogDataRegistry,
+    initLogData as initLogData,
+    filterLogEventsFromUri,
+} from '../registry/logDataRegistry'
+import { prepareDocument, searchLogGroup } from './searchLogGroup'
+import { telemetry, Result } from '../../../shared/telemetry/telemetry'
+import { CancellationError } from '../../../shared/utilities/timeoutUtils'
+import { cwlUriSchema } from '../cloudWatchLogsUtils'
+import { formatLocalized } from '../../../shared/datetime'
+
+export async function viewLogStream(node: LogGroupNode, registry: LogDataRegistry): Promise<void> {
+    await telemetry.cloudwatchlogs_open.run(async (span) => {
+        span.record({ cloudWatchResourceType: 'logStream', source: 'Explorer' })
+        const r = await new SelectLogStreamWizard(node).run()
+        if (r === undefined || r.kind === 'cancelled' || r.kind === 'failed') {
+            throw new CancellationError('user')
+        }
+
+        if (r.kind === 'doSearchLogGroup') {
+            return searchLogGroup(registry, 'LogStreamMenu', {
+                regionName: node.regionCode,
+                groupName: node.logGroup.logGroupName!,
+            })
+        }
+
+        const logGroupInfo: CloudWatchLogsGroupInfo = {
+            groupName: r.logGroupName,
+            regionName: r.region,
+            streamName: r.logStreamName,
+        }
+
+        const parameters: CloudWatchLogsParameters = {
+            limit: registry.configuration.get('limit', 10000),
+        }
+
+        const uri = cwlUriSchema.form({ logGroupInfo: logGroupInfo, parameters: parameters })
+        const logData = initLogData(logGroupInfo, parameters, filterLogEventsFromUri)
+        await prepareDocument(uri, logData, registry)
+    })
+}
+
+/**
+ * This represents the final user choice from the select log stream wizard.
+ *
+ * Why? This wizard has different kinds of results, and this is a simple way to
+ * represent them.
+ */
+export type LogSearchChoice =
+    | { kind: 'doSearchLogGroup' }
+    | { kind: 'selectedLogStream'; logStreamName: string; logGroupName: string; region: string }
+    | { kind: 'cancelled' }
+    | { kind: 'failed' }
+
+export interface SelectLogStreamWizardContext {
+    pickLogStream(): Promise<LogSearchChoice>
+}
+
+export class DefaultSelectLogStreamWizardContext implements SelectLogStreamWizardContext {
+    private readonly totalSteps = 1
+    public constructor(
+        private readonly regionCode: string,
+        private readonly logGroupName: string
+    ) {}
+
+    public async pickLogStream(): Promise<LogSearchChoice> {
+        const client = new CloudWatchLogsClient(this.regionCode)
+        const request: CloudWatchLogs.DescribeLogStreamsRequest = {
+            logGroupName: this.logGroupName,
+            orderBy: 'LastEventTime',
+            descending: true,
+        }
+        const qp = picker.createQuickPick({
+            options: {
+                title: localize('AWS.cwl.viewLogStream.workflow.prompt', 'Select a log stream'),
+                step: 1,
+                totalSteps: this.totalSteps,
+            },
+        })
+
+        // Add item to top of quick pick which indicates user instead wants to do Search Log Group quickpick flow
+        const searchLogGroupItems: vscode.QuickPickItem[] = [
+            { label: 'Actions', kind: vscode.QuickPickItemKind.Separator },
+            { label: 'Search Log Group', detail: 'Search all Log Streams in this Log Group' },
+            { label: 'Log Streams', kind: vscode.QuickPickItemKind.Separator },
+        ]
+
+        qp.items = searchLogGroupItems.concat(qp.items)
+
+        const populator = new IteratorTransformer(
+            () =>
+                getPaginatedAwsCallIter({
+                    awsCall: (request) => client.describeLogStreams(request),
+                    nextTokenNames: {
+                        request: 'nextToken',
+                        response: 'nextToken',
+                    },
+                    request,
+                }),
+            (response) => convertDescribeLogToQuickPickItems(response)
+        )
+
+        const controller = new picker.IteratingQuickPickController(qp, populator)
+        controller.startRequests()
+        const choices = await picker.promptUser({
+            picker: qp,
+            onDidTriggerButton: (button, resolve, reject) =>
+                controller.iteratingOnDidTriggerButton(button, resolve, reject),
+        })
+
+        const val = picker.verifySinglePickerOutput(choices)
+
+        const result = val?.label
+
+        // The possible results of this wizard are not binary, the following
+        // returns an object representing the final result (along with any necessary data)
+        return this.shouldSearchLogGroup(result) ?? this.getSelectedLogStream(result)
+    }
+
+    /**
+     * Returns an object indicating the user wants to search the log groups,
+     * otherwise undefined
+     */
+    shouldSearchLogGroup(quickPickResult?: string): (LogSearchChoice & { kind: 'doSearchLogGroup' }) | undefined {
+        if (quickPickResult !== 'Search Log Group') {
+            return undefined
+        }
+
+        return { kind: 'doSearchLogGroup' }
+    }
+
+    /**
+     * Returns the result of the log stream selection process.
+     *
+     * It is possible nothing was selected, this will be indicated
+     * by the return value.
+     */
+    getSelectedLogStream(result?: string): LogSearchChoice {
+        let telemetryResult: Result = 'Succeeded'
+        let choice: LogSearchChoice
+        // handle no items for a group as a cancel
+        if (!result || result === picker.IteratingQuickPickController.NO_ITEMS_ITEM.label) {
+            choice = { kind: 'cancelled' }
+            telemetryResult = 'Cancelled'
+        }
+        // retry handled by caller -- should this be a "Failed"?
+        // of note: we don't track if an error pops up, we just track if the error is selected.
+        else if (result === picker.IteratingQuickPickController.ERROR_ITEM.label) {
+            choice = { kind: 'failed' }
+            telemetryResult = 'Failed'
+        } else {
+            choice = {
+                kind: 'selectedLogStream',
+                logStreamName: result,
+                region: this.regionCode,
+                logGroupName: this.logGroupName,
+            }
+        }
+
+        telemetry.cloudwatchlogs_openGroup.emit({ result: telemetryResult })
+        return choice
+    }
+}
+
+export function convertDescribeLogToQuickPickItems(
+    response: CloudWatchLogs.DescribeLogStreamsResponse
+): vscode.QuickPickItem[] {
+    return (response.logStreams ?? []).map<vscode.QuickPickItem>((stream) => ({
+        label: stream.logStreamName!,
+        detail: stream.lastEventTimestamp
+            ? formatLocalized(new Date(stream.lastEventTimestamp))
+            : localize('AWS.cwl.viewLogStream.workflow.noStreams', '[No Log Events found]'),
+    }))
+}
+
+export class SelectLogStreamWizard extends MultiStepWizard<LogSearchChoice> {
+    private response: LogSearchChoice = { kind: 'cancelled' }
+
+    public constructor(
+        node: LogGroupNode,
+        private readonly context: SelectLogStreamWizardContext = new DefaultSelectLogStreamWizardContext(
+            node.regionCode,
+            node.logGroup.logGroupName!
+        )
+    ) {
+        super()
+    }
+
+    protected get startStep(): WizardStep {
+        return this.selectStream
+    }
+
+    protected getResult(): LogSearchChoice {
+        return this.response
+    }
+
+    private readonly selectStream: WizardStep = async () => {
+        this.response = await this.context.pickLogStream()
+        if (this.response.kind === 'failed') {
+            // retry on error
+            return WIZARD_RETRY
+        }
+        return WIZARD_TERMINATE
+    }
+}
diff --git a/packages/core/src/awsService/cloudWatchLogs/document/liveTailCodeLensProvider.ts b/packages/core/src/awsService/cloudWatchLogs/document/liveTailCodeLensProvider.ts
new file mode 100644
index 00000000000..dde0ddbbe28
--- /dev/null
+++ b/packages/core/src/awsService/cloudWatchLogs/document/liveTailCodeLensProvider.ts
@@ -0,0 +1,62 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { cloudwatchLogsLiveTailScheme } from '../../../shared/constants'
+import { LiveTailSessionRegistry } from '../registry/liveTailSessionRegistry'
+import { uriToKey } from '../cloudWatchLogsUtils'
+
+export class LiveTailCodeLensProvider implements vscode.CodeLensProvider {
+    private _onDidChangeCodeLenses: vscode.EventEmitter<void> = new vscode.EventEmitter<void>()
+    public readonly onDidChangeCodeLenses: vscode.Event<void> = this._onDidChangeCodeLenses.event
+
+    public constructor(private readonly registry: LiveTailSessionRegistry) {}
+
+    public provideCodeLenses(
+        document: vscode.TextDocument,
+        token: vscode.CancellationToken
+    ): vscode.ProviderResult<vscode.CodeLens[]> {
+        const uri = document.uri
+        // if registry does not contain session, it is assumed to have been stopped, thus, hide lenses.
+        if (uri.scheme !== cloudwatchLogsLiveTailScheme || !this.registry.has(uriToKey(uri))) {
+            return []
+        }
+        const codeLenses: vscode.CodeLens[] = []
+        codeLenses.push(this.buildClearDocumentCodeLens(document))
+        codeLenses.push(this.buildStopTailingCodeLens(document))
+        return codeLenses
+    }
+
+    public refresh() {
+        this._onDidChangeCodeLenses.fire()
+    }
+
+    private buildClearDocumentCodeLens(document: vscode.TextDocument): vscode.CodeLens {
+        const range = this.getBottomOfDocumentRange(document)
+        const command: vscode.Command = {
+            title: 'Clear document',
+            command: 'aws.cwl.clearDocument',
+            arguments: [document],
+        }
+        return new vscode.CodeLens(range, command)
+    }
+
+    private buildStopTailingCodeLens(document: vscode.TextDocument): vscode.CodeLens {
+        const range = this.getBottomOfDocumentRange(document)
+        const command: vscode.Command = {
+            title: 'Stop tailing',
+            command: 'aws.cwl.stopTailingLogGroup',
+            arguments: [document, 'codeLens'],
+        }
+        return new vscode.CodeLens(range, command)
+    }
+
+    private getBottomOfDocumentRange(document: vscode.TextDocument): vscode.Range {
+        return new vscode.Range(
+            new vscode.Position(document.lineCount - 1, 0),
+            new vscode.Position(document.lineCount - 1, 0)
+        )
+    }
+}
diff --git a/packages/core/src/awsService/cloudWatchLogs/document/liveTailDocumentProvider.ts b/packages/core/src/awsService/cloudWatchLogs/document/liveTailDocumentProvider.ts
new file mode 100644
index 00000000000..7d662890dcf
--- /dev/null
+++ b/packages/core/src/awsService/cloudWatchLogs/document/liveTailDocumentProvider.ts
@@ -0,0 +1,13 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+
+export class LiveTailDocumentProvider implements vscode.TextDocumentContentProvider {
+    provideTextDocumentContent(uri: vscode.Uri, token: vscode.CancellationToken): vscode.ProviderResult<string> {
+        // Content will be written to the document via handling a LiveTail response stream in the TailLogGroup command.
+        return ''
+    }
+}
diff --git a/packages/core/src/awsService/cloudWatchLogs/document/logDataCodeLensProvider.ts b/packages/core/src/awsService/cloudWatchLogs/document/logDataCodeLensProvider.ts
new file mode 100644
index 00000000000..52245896c16
--- /dev/null
+++ b/packages/core/src/awsService/cloudWatchLogs/document/logDataCodeLensProvider.ts
@@ -0,0 +1,68 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as vscode from 'vscode'
+import { CLOUDWATCH_LOGS_SCHEME } from '../../../shared/constants'
+import { LogDataRegistry } from '../registry/logDataRegistry'
+import { isLogStreamUri } from '../cloudWatchLogsUtils'
+
+export class LogDataCodeLensProvider implements vscode.CodeLensProvider {
+    public constructor(private readonly registry: LogDataRegistry) {}
+
+    private _onDidChangeCodeLenses = new vscode.EventEmitter<void>()
+    public get onDidChangeCodeLenses(): vscode.Event<void> {
+        return this._onDidChangeCodeLenses.event
+    }
+
+    public provideCodeLenses(
+        document: vscode.TextDocument,
+        token: vscode.CancellationToken
+    ): vscode.ProviderResult<vscode.CodeLens[]> {
+        const uri = document.uri
+        const isBusy = this.registry.getBusyStatus(uri)
+
+        const busyCommand: vscode.Command = {
+            title: localize('AWS.message.loading', 'Loading...'),
+            command: 'aws.doNothingCommand',
+        }
+        const codelenses = []
+        const newerCodelense = {
+            range: new vscode.Range(
+                new vscode.Position(document.lineCount - 1, 0),
+                new vscode.Position(document.lineCount - 1, 0)
+            ),
+            isResolved: true,
+            command: isBusy
+                ? busyCommand
+                : {
+                      title: localize('AWS.cwl.codeLens.loadNewer', 'Load newer events...'),
+                      command: 'aws.addLogEvents',
+                      arguments: [document, this.registry, 'tail', this._onDidChangeCodeLenses],
+                  },
+        }
+
+        const oldCodeLense = {
+            range: new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 0)),
+            isResolved: true,
+            command: isBusy
+                ? busyCommand
+                : {
+                      title: localize('AWS.cwl.codeLens.loadOlder', 'Load older events...'),
+                      command: 'aws.addLogEvents',
+                      arguments: [document, this.registry, 'head', this._onDidChangeCodeLenses],
+                  },
+        }
+
+        // log stream documents always start at the oldest log event, so no need to get older events
+        if (!isLogStreamUri(uri)) {
+            codelenses.push(oldCodeLense)
+        }
+        codelenses.push(newerCodelense)
+        return uri.scheme === CLOUDWATCH_LOGS_SCHEME ? codelenses : []
+    }
+}
diff --git a/packages/core/src/awsService/cloudWatchLogs/document/logDataDocumentProvider.ts b/packages/core/src/awsService/cloudWatchLogs/document/logDataDocumentProvider.ts
new file mode 100644
index 00000000000..f54a8b12391
--- /dev/null
+++ b/packages/core/src/awsService/cloudWatchLogs/document/logDataDocumentProvider.ts
@@ -0,0 +1,80 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { CloudWatchLogsGroupInfo, LogDataRegistry, UriString } from '../registry/logDataRegistry'
+import { getLogger } from '../../../shared/logger/logger'
+import { generateTextFromLogEvents, LineToLogStreamMap } from './textContent'
+import { cwlUriSchema } from '../cloudWatchLogsUtils'
+
+export class LogDataDocumentProvider implements vscode.TextDocumentContentProvider {
+    /** Resolves the correct {@link LineToLogStreamMap} instance for a given URI */
+    readonly lineToLogStreamMapResolver: Map<UriString, LineToLogStreamMap> = new Map()
+    // Expose an event to signal changes of _virtual_ documents
+    // to the editor
+    private _onDidChange = new vscode.EventEmitter<vscode.Uri>()
+    public get onDidChange(): vscode.Event<vscode.Uri> {
+        return this._onDidChange.event
+    }
+
+    public constructor(private readonly registry: LogDataRegistry) {
+        this.registry.onDidChange((uri) => {
+            getLogger().debug(`Registry item changed: ${uri.path}`)
+            this._onDidChange.fire(uri)
+        })
+    }
+
+    public provideTextDocumentContent(uri: vscode.Uri): string {
+        if (!cwlUriSchema.isValid(uri)) {
+            throw new Error(`Uri is not a CWL Uri, so no text can be provided: ${uri.toString()}`)
+        }
+        const events = this.registry.fetchCachedLogEvents(uri)
+        const { text, streamIdMap } = generateTextFromLogEvents(events, { timestamps: true })
+        this.lineToLogStreamMapResolver.set(uri.toString(), streamIdMap)
+        return text
+    }
+
+    /**
+     * Gives the Log Stream ID at a given line of a given document.
+     *
+     * The given document uri must have already been processed by this
+     * class, otherwise an error will be thrown.
+     *
+     * * @param lineNumber The line number of the document. Starts at 0, NOT 1!
+     */
+    public getLogStreamNameAtLine(
+        uri: vscode.Uri,
+        lineNumber: number
+    ): NonNullable<CloudWatchLogsGroupInfo['streamName']> {
+        let lineToLogStreamMap = this.lineToLogStreamMapResolver.get(uri.toString())
+        if (lineToLogStreamMap === undefined) {
+            // Document was not initialized yet, we will initialize and try again.
+            this.provideTextDocumentContent(uri)
+            lineToLogStreamMap = this.lineToLogStreamMapResolver.get(uri.toString())
+            if (lineToLogStreamMap === undefined) {
+                throw new Error(`${this.provideTextDocumentContent.name}() should have prevented this error.`)
+            }
+        }
+
+        const logStreamName = lineToLogStreamMap.get(lineNumber)
+        if (logStreamName === undefined) {
+            throw new Error(`Line number was not set in LineToLogStreamMap: ${lineNumber}`)
+        }
+        return logStreamName
+    }
+}
+
+export function getActiveDocumentUri(registry: LogDataRegistry) {
+    const currentEditor = vscode.window.activeTextEditor
+    if (!currentEditor) {
+        throw new Error('cwl: Failed to identify active editor.')
+    }
+
+    const activeUri = currentEditor.document.uri
+    if (!registry.isRegistered(activeUri)) {
+        throw new Error('cwl: Document open has unregistered uri.')
+    }
+
+    return activeUri
+}
diff --git a/packages/core/src/awsService/cloudWatchLogs/document/logStreamsCodeLensProvider.ts b/packages/core/src/awsService/cloudWatchLogs/document/logStreamsCodeLensProvider.ts
new file mode 100644
index 00000000000..9c6409d7318
--- /dev/null
+++ b/packages/core/src/awsService/cloudWatchLogs/document/logStreamsCodeLensProvider.ts
@@ -0,0 +1,112 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { CLOUDWATCH_LOGS_SCHEME } from '../../../shared/constants'
+import { CloudWatchLogsGroupInfo, LogDataRegistry } from '../registry/logDataRegistry'
+import { CloudWatchLogsSettings, cwlUriSchema, isLogStreamUri } from '../cloudWatchLogsUtils'
+import { LogDataDocumentProvider } from './logDataDocumentProvider'
+
+type IdWithLine = { streamId: string; lineNum: number }
+
+export class LogStreamCodeLensProvider implements vscode.CodeLensProvider {
+    /**
+     * Constructor
+     *
+     * @param documentProvider We specifically want {@link LogDataDocumentProvider} since it manages the stream
+     *                         id map which this class will read data from.
+     */
+    public constructor(
+        private readonly registry: LogDataRegistry,
+        private readonly documentProvider: LogDataDocumentProvider
+    ) {}
+
+    private _onDidChangeCodeLenses = new vscode.EventEmitter<void>()
+    public get onDidChangeCodeLenses(): vscode.Event<void> {
+        return this._onDidChangeCodeLenses.event
+    }
+
+    public async provideCodeLenses(
+        document: vscode.TextDocument,
+        token: vscode.CancellationToken
+    ): Promise<vscode.CodeLens[] | null | undefined> {
+        const uri = document.uri
+
+        if (uri.scheme !== CLOUDWATCH_LOGS_SCHEME || isLogStreamUri(uri)) {
+            return []
+        }
+
+        const logGroupInfo = cwlUriSchema.parse(uri).logGroupInfo
+
+        if (logGroupInfo.streamName) {
+            // This means we have a stream file not a log search.
+            return
+        }
+
+        const codelenses: vscode.CodeLens[] = []
+
+        const linesToGenerateCodeLens = await this.getStartingLineOfEachStreamId(document)
+
+        // Create a code lens at the start of each Log Stream in the document
+        for (const idWithLine of linesToGenerateCodeLens) {
+            codelenses.push(this.createLogStreamCodeLens(logGroupInfo, idWithLine))
+        }
+        return codelenses
+    }
+
+    createLogStreamCodeLens(logGroupInfo: CloudWatchLogsGroupInfo, idWithLine: IdWithLine): vscode.CodeLens {
+        const settings = new CloudWatchLogsSettings()
+        const limit = settings.get('limit', 1000)
+        const cwlArgs = {
+            logGroupInfo: { ...logGroupInfo, streamName: idWithLine.streamId },
+            parameters: { limit: limit },
+        }
+        const streamUri = cwlUriSchema.form(cwlArgs)
+        const cmd: vscode.Command = {
+            command: 'aws.loadLogStreamFile',
+            arguments: [streamUri, this.registry],
+            title: 'View Full Log Stream...',
+            tooltip: 'Open the full Log Stream associated with these search results',
+        }
+        const codeLensLocation = new vscode.Range(idWithLine.lineNum, 0, idWithLine.lineNum, 0)
+        return new vscode.CodeLens(codeLensLocation, cmd)
+    }
+
+    /**
+     * Gets the Log Stream Id + Line number it starts at for each Log Stream
+     * in the given document.
+     */
+    private async getStartingLineOfEachStreamId(document: vscode.TextDocument): Promise<IdWithLine[]> {
+        const result: IdWithLine[] = []
+
+        let currLine = 0
+        let lastStreamId = ''
+        while (currLine < document.lineCount - 1) {
+            const currStreamId = this.documentProvider.getLogStreamNameAtLine(document.uri, currLine)
+
+            if (currStreamId === undefined) {
+                throw new Error(`uriToStreamIdMap does not reflect the latest content of: ${document.uri.toString()}`)
+            }
+
+            if (currStreamId === lastStreamId) {
+                currLine++
+                continue
+            }
+            result.push({ streamId: currStreamId, lineNum: currLine })
+            currLine++
+            lastStreamId = currStreamId
+        }
+        return result
+    }
+}
+
+export async function loadAndOpenInitialLogStreamFile(uri: vscode.Uri, registry: LogDataRegistry): Promise<void> {
+    const td = await vscode.workspace.openTextDocument(uri)
+    await Promise.all([
+        vscode.window.showTextDocument(td),
+        vscode.languages.setTextDocumentLanguage(td, 'log'),
+        registry.fetchNextLogEvents(uri),
+    ])
+}
diff --git a/packages/core/src/awsService/cloudWatchLogs/document/textContent.ts b/packages/core/src/awsService/cloudWatchLogs/document/textContent.ts
new file mode 100644
index 00000000000..7b415c586b1
--- /dev/null
+++ b/packages/core/src/awsService/cloudWatchLogs/document/textContent.ts
@@ -0,0 +1,55 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { formatDateTimestamp } from '../../../shared/datetime'
+import { CloudWatchLogsEvent, CloudWatchLogsGroupInfo } from '../registry/logDataRegistry'
+
+export const timestampSpaceEquivalent = '                             '
+
+/**
+ * CWL output text can consist of Log Events from multiple different
+ * Log Streams. This map type is intended to map a specific line to
+ * its respective Log Stream
+ */
+export type LineToLogStreamMap = Map<number, NonNullable<CloudWatchLogsGroupInfo['streamName']>>
+
+export function generateTextFromLogEvents(
+    events: CloudWatchLogsEvent[],
+    formatting?: { timestamps?: boolean }
+): { text: string; streamIdMap: LineToLogStreamMap } {
+    const inlineNewLineRegex = /((\r\n)|\n|\r)(?!$)/g
+    // if no timestamp for some reason, entering a blank of equal length (29 characters long)
+
+    const streamIdMap: LineToLogStreamMap = new Map()
+    let text: string = ''
+    let lineNumber = 0
+    for (const event of events) {
+        let line: string = event.message ?? ''
+        if (formatting?.timestamps) {
+            // TODO: Handle different timezones and unix timestamps?
+            const timestamp = event.timestamp
+                ? formatDateTimestamp(true, new Date(event.timestamp))
+                : timestampSpaceEquivalent
+            line = timestamp.concat('\t', line)
+            // log entries containing newlines are indented to the same length as the timestamp.
+            line = line.replace(inlineNewLineRegex, `\n${timestampSpaceEquivalent}\t`)
+        }
+
+        if (!line.endsWith('\n')) {
+            line = line.concat('\n')
+        }
+
+        const lineBreaks = (line.match(/\n/g) || []).length
+        if (event.logStreamName) {
+            for (let currentLine = lineNumber; currentLine <= lineNumber + lineBreaks - 1; currentLine++) {
+                streamIdMap.set(currentLine, event.logStreamName)
+            }
+        }
+        lineNumber += lineBreaks
+
+        text = text.concat(line)
+    }
+    return { text, streamIdMap }
+}
diff --git a/packages/core/src/awsService/cloudWatchLogs/explorer/cloudWatchLogsNode.ts b/packages/core/src/awsService/cloudWatchLogs/explorer/cloudWatchLogsNode.ts
new file mode 100644
index 00000000000..5d3891bd07e
--- /dev/null
+++ b/packages/core/src/awsService/cloudWatchLogs/explorer/cloudWatchLogsNode.ts
@@ -0,0 +1,69 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as vscode from 'vscode'
+
+import { CloudWatchLogsClient } from '../../../shared/clients/cloudWatchLogs'
+
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { toMap, updateInPlace, toArrayAsync } from '../../../shared/utilities/collectionUtils'
+import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
+import { makeChildrenNodes } from '../../../shared/treeview/utils'
+import { LogGroupNode } from './logGroupNode'
+import { LogGroup } from '@aws-sdk/client-cloudwatch-logs'
+
+export abstract class CloudWatchLogsBase extends AWSTreeNodeBase {
+    protected readonly logGroupNodes: Map<string, LogGroupNode>
+    protected abstract readonly placeholderMessage: string
+
+    public constructor(
+        label: string,
+        public override readonly regionCode: string,
+        protected readonly cloudwatchClient: CloudWatchLogsClient
+    ) {
+        super(label, vscode.TreeItemCollapsibleState.Collapsed)
+        this.logGroupNodes = new Map<string, LogGroupNode>()
+    }
+
+    protected abstract getLogGroups(client: CloudWatchLogsClient): Promise<Map<string, LogGroup>>
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        return await makeChildrenNodes({
+            getChildNodes: async () => {
+                await this.updateChildren()
+
+                return [...this.logGroupNodes.values()]
+            },
+            getNoChildrenPlaceholderNode: async () => new PlaceholderNode(this, this.placeholderMessage),
+            sort: (nodeA, nodeB) => nodeA.name.localeCompare(nodeB.name),
+        })
+    }
+
+    public async updateChildren(): Promise<void> {
+        const logGroups = await this.getLogGroups(this.cloudwatchClient)
+
+        updateInPlace(
+            this.logGroupNodes,
+            logGroups.keys(),
+            (key) => this.logGroupNodes.get(key)!.update(logGroups.get(key)!),
+            (key) => new LogGroupNode(this.regionCode, logGroups.get(key)!)
+        )
+    }
+}
+export class CloudWatchLogsNode extends CloudWatchLogsBase {
+    protected readonly placeholderMessage = localize('AWS.explorerNode.cloudWatchLogs.nologs', '[No log groups found]')
+
+    public constructor(regionCode: string, client = new CloudWatchLogsClient(regionCode)) {
+        super('CloudWatch Logs', regionCode, client)
+        this.contextValue = 'awsCloudWatchLogParentNode'
+    }
+
+    protected async getLogGroups(client: CloudWatchLogsClient): Promise<Map<string, LogGroup>> {
+        return toMap(await toArrayAsync(client.describeLogGroups()), (configuration) => configuration.logGroupName)
+    }
+}
diff --git a/packages/core/src/awsService/cloudWatchLogs/explorer/logGroupNode.ts b/packages/core/src/awsService/cloudWatchLogs/explorer/logGroupNode.ts
new file mode 100644
index 00000000000..12c2e9dd0a8
--- /dev/null
+++ b/packages/core/src/awsService/cloudWatchLogs/explorer/logGroupNode.ts
@@ -0,0 +1,48 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as os from 'os'
+import { AWSResourceNode } from '../../../shared/treeview/nodes/awsResourceNode'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { getIcon } from '../../../shared/icons'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { LogGroup } from '@aws-sdk/client-cloudwatch-logs'
+
+export const contextValueCloudwatchLog = 'awsCloudWatchLogNode'
+
+export class LogGroupNode extends AWSTreeNodeBase implements AWSResourceNode {
+    public constructor(
+        public override readonly regionCode: string,
+        public logGroup: LogGroup
+    ) {
+        super('')
+        this.update(logGroup)
+        this.iconPath = getIcon('aws-cloudwatch-log-group')
+        this.contextValue = contextValueCloudwatchLog
+        this.command = {
+            command: 'aws.cwl.viewLogStream',
+            title: localize('AWS.command.cloudWatchLogs.viewLogStream', 'View Log Stream'),
+            arguments: [this],
+        }
+    }
+
+    public update(logGroup: LogGroup): void {
+        this.logGroup = logGroup
+        this.label = this.logGroup.logGroupName || ''
+        this.tooltip = `${this.logGroup.logGroupName}${os.EOL}${this.logGroup.arn}`
+    }
+
+    public get name(): string {
+        return this.logGroup.logGroupName!
+    }
+
+    public get arn(): string {
+        if (this.logGroup.arn === undefined) {
+            throw new Error('Log Group Arn expected but not found')
+        }
+
+        return this.logGroup.arn
+    }
+}
diff --git a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts
new file mode 100644
index 00000000000..a2364f07460
--- /dev/null
+++ b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSession.ts
@@ -0,0 +1,167 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import * as AWS from '@aws-sdk/types'
+import {
+    CloudWatchLogsClient,
+    type CloudWatchLogsClientConfig,
+    StartLiveTailCommand,
+    StartLiveTailResponseStream,
+} from '@aws-sdk/client-cloudwatch-logs'
+import { LogStreamFilterResponse } from '../wizard/liveTailLogStreamSubmenu'
+import { CloudWatchLogsSettings } from '../cloudWatchLogsUtils'
+import globals from '../../../shared/extensionGlobals'
+import { Settings } from '../../../shared/settings'
+import { ToolkitError } from '../../../shared/errors'
+import { createLiveTailURIFromArgs } from './liveTailSessionRegistry'
+import { getUserAgent } from '../../../shared/telemetry/util'
+import { convertToTimeString } from '../../../shared/datetime'
+
+export type LiveTailSessionConfiguration = {
+    logGroupArn: string
+    logStreamFilter?: LogStreamFilterResponse
+    logEventFilterPattern?: string
+    region: string
+    awsCredentials: AWS.Credentials
+}
+
+export type LiveTailSessionClient = {
+    cwlClient: CloudWatchLogsClient
+    abortController: AbortController
+}
+
+export class LiveTailSession {
+    private liveTailClient: LiveTailSessionClient
+    private _logGroupArn: string
+    private logStreamFilter?: LogStreamFilterResponse
+    private logEventFilterPattern?: string
+    private _maxLines: number
+    private _uri: vscode.Uri
+    private statusBarItem: vscode.StatusBarItem
+    private startTime: number | undefined
+    private endTime: number | undefined
+    private _eventRate: number
+    private _isSampled: boolean
+
+    // While session is running, used to update the StatusBar each half second.
+    private statusBarUpdateTimer: NodeJS.Timer | undefined
+
+    static settings = new CloudWatchLogsSettings(Settings.instance)
+
+    public constructor(configuration: LiveTailSessionConfiguration) {
+        this._logGroupArn = configuration.logGroupArn
+        this.logStreamFilter = configuration.logStreamFilter
+        this.logEventFilterPattern = configuration.logEventFilterPattern
+        const cwlClientProps: CloudWatchLogsClientConfig = {
+            credentials: configuration.awsCredentials,
+            region: configuration.region,
+            customUserAgent: getUserAgent(),
+        }
+        const endpointUrl = globals.awsContext.getCredentialEndpointUrl()
+        if (endpointUrl !== undefined) {
+            cwlClientProps.endpoint = endpointUrl
+        }
+        this.liveTailClient = {
+            cwlClient: new CloudWatchLogsClient(cwlClientProps),
+            abortController: new AbortController(),
+        }
+        this._maxLines = LiveTailSession.settings.get('limit', 10000)
+        this._uri = createLiveTailURIFromArgs(configuration)
+        this.statusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, 0)
+        this._eventRate = 0
+        this._isSampled = false
+    }
+
+    public get maxLines() {
+        return this._maxLines
+    }
+
+    public get uri() {
+        return this._uri
+    }
+
+    public get logGroupArn() {
+        return this._logGroupArn
+    }
+
+    public set eventRate(rate: number) {
+        this._eventRate = rate
+    }
+
+    public set isSampled(isSampled: boolean) {
+        this._isSampled = isSampled
+    }
+
+    public async startLiveTailSession(): Promise<AsyncIterable<StartLiveTailResponseStream>> {
+        const commandOutput = await this.liveTailClient.cwlClient.send(this.buildStartLiveTailCommand(), {
+            abortSignal: this.liveTailClient.abortController.signal,
+        })
+        if (!commandOutput.responseStream) {
+            throw new ToolkitError('LiveTail session response stream is undefined.')
+        }
+        this.startTime = globals.clock.Date.now()
+        this.endTime = undefined
+        this.statusBarUpdateTimer = globals.clock.setInterval(() => {
+            this.updateStatusBarItemText()
+        }, 500)
+        return commandOutput.responseStream
+    }
+
+    public stopLiveTailSession() {
+        this.endTime = globals.clock.Date.now()
+        this.statusBarItem.dispose()
+        globals.clock.clearInterval(this.statusBarUpdateTimer)
+        this.liveTailClient.abortController.abort()
+        this.liveTailClient.cwlClient.destroy()
+    }
+
+    public getLiveTailSessionDuration(): number {
+        // Never started
+        if (this.startTime === undefined) {
+            return 0
+        }
+        // Currently running
+        if (this.endTime === undefined) {
+            return globals.clock.Date.now() - this.startTime
+        }
+        return this.endTime - this.startTime
+    }
+
+    public buildStartLiveTailCommand(): StartLiveTailCommand {
+        let logStreamNamePrefix = undefined
+        let logStreamName = undefined
+        if (this.logStreamFilter) {
+            if (this.logStreamFilter.type === 'prefix') {
+                logStreamNamePrefix = this.logStreamFilter.filter
+                logStreamName = undefined
+            } else if (this.logStreamFilter.type === 'specific') {
+                logStreamName = this.logStreamFilter.filter
+                logStreamNamePrefix = undefined
+            }
+        }
+
+        return new StartLiveTailCommand({
+            logGroupIdentifiers: [this.logGroupArn],
+            logStreamNamePrefixes: logStreamNamePrefix ? [logStreamNamePrefix] : undefined,
+            logStreamNames: logStreamName ? [logStreamName] : undefined,
+            logEventFilterPattern: this.logEventFilterPattern ? this.logEventFilterPattern : undefined,
+        })
+    }
+
+    public showStatusBarItem(shouldShow: boolean) {
+        shouldShow ? this.statusBarItem.show() : this.statusBarItem.hide()
+    }
+
+    public updateStatusBarItemText() {
+        const elapsedTime = this.getLiveTailSessionDuration()
+        const timeString = convertToTimeString(elapsedTime)
+        const sampledString = this._isSampled ? 'Yes' : 'No'
+        this.statusBarItem.text = `Tailing: ${timeString}, ${this._eventRate} events/sec, Sampled: ${sampledString}`
+    }
+
+    public get isAborted() {
+        return this.liveTailClient.abortController.signal.aborted
+    }
+}
diff --git a/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts
new file mode 100644
index 00000000000..988725edc87
--- /dev/null
+++ b/packages/core/src/awsService/cloudWatchLogs/registry/liveTailSessionRegistry.ts
@@ -0,0 +1,34 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { cloudwatchLogsLiveTailScheme } from '../../../shared/constants'
+import { LiveTailSession, LiveTailSessionConfiguration } from './liveTailSession'
+
+export class LiveTailSessionRegistry extends Map<string, LiveTailSession> {
+    static #instance: LiveTailSessionRegistry
+
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+
+    public constructor() {
+        super()
+    }
+}
+
+export function createLiveTailURIFromArgs(sessionData: LiveTailSessionConfiguration): vscode.Uri {
+    let uriStr = `${cloudwatchLogsLiveTailScheme}:${sessionData.region}:${sessionData.logGroupArn}`
+
+    if (sessionData.logStreamFilter) {
+        if (sessionData.logStreamFilter.type !== 'all') {
+            uriStr += `:${sessionData.logStreamFilter.type}:${sessionData.logStreamFilter.filter}`
+        } else {
+            uriStr += `:${sessionData.logStreamFilter.type}`
+        }
+    }
+    uriStr += sessionData.logEventFilterPattern ? `:${sessionData.logEventFilterPattern}` : ''
+
+    return vscode.Uri.parse(uriStr)
+}
diff --git a/packages/core/src/awsService/cloudWatchLogs/registry/logDataRegistry.ts b/packages/core/src/awsService/cloudWatchLogs/registry/logDataRegistry.ts
new file mode 100644
index 00000000000..1bbe0ce06f2
--- /dev/null
+++ b/packages/core/src/awsService/cloudWatchLogs/registry/logDataRegistry.ts
@@ -0,0 +1,332 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { CloudWatchLogsSettings, uriToKey, msgKey, cwlUriSchema } from '../cloudWatchLogsUtils'
+import { CloudWatchLogsClient } from '../../../shared/clients/cloudWatchLogs'
+import { waitTimeout } from '../../../shared/utilities/timeoutUtils'
+import { Messages } from '../../../shared/utilities/messages'
+import { pageableToCollection } from '../../../shared/utilities/collectionUtils'
+import { Settings } from '../../../shared/settings'
+import * as CloudWatchLogs from '@aws-sdk/client-cloudwatch-logs'
+// TODO: Add debug logging statements
+
+/** Uri as a string */
+export type UriString = string
+/**
+ * Operations and persistence for CloudWatch Log Data (events from a single logstream or events from log group search)
+ */
+export class LogDataRegistry {
+    private readonly _onDidChange: vscode.EventEmitter<vscode.Uri> = new vscode.EventEmitter<vscode.Uri>()
+
+    static #instance: LogDataRegistry
+
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+
+    public constructor(
+        public readonly configuration: CloudWatchLogsSettings = new CloudWatchLogsSettings(Settings.instance),
+        private readonly registry: Map<UriString, CloudWatchLogsData> = new Map()
+    ) {}
+
+    /**
+     * Event fired on log content change
+     */
+    public get onDidChange(): vscode.Event<vscode.Uri> {
+        return this._onDidChange.event
+    }
+
+    /** Disposes registry structures associated with the given document. Does not dispose the document itself. */
+    public disposeRegistryData(uri: vscode.Uri): void {
+        this.registry.delete(uriToKey(uri))
+    }
+
+    /**
+     * Returns whether or not the log is registered.
+     * @param uri Document URI
+     */
+    public isRegistered(uri: vscode.Uri): boolean {
+        return this.registry.has(uriToKey(uri))
+    }
+
+    public fetchCachedLogEvents(uri: vscode.Uri): CloudWatchLogsEvent[] {
+        if (!this.isRegistered(uri)) {
+            this.registerInitialLog(uri)
+        }
+        return this.getRegisteredLog(uri).events
+    }
+
+    /**
+     * Retrieves the next set of data for a log and adds it to the registry. Data can either be added to the front of the log (`'head'`) or end (`'tail'`)
+     * @param uri Document URI
+     * @param headOrTail Determines update behavior: `'head'` retrieves the most recent previous token and appends data to the top of the log, `'tail'` does the opposite. Default: `'tail'`
+     * @param getLogEventsFromUriComponentsFn Override for testing purposes.
+     */
+    public async fetchNextLogEvents(
+        uri: vscode.Uri,
+        headOrTail: 'head' | 'tail' = 'tail'
+    ): Promise<CloudWatchLogsEvent[]> {
+        if (!this.isRegistered(uri)) {
+            this.registerInitialLog(uri)
+        }
+
+        const logData = this.getRegisteredLog(uri)
+        const request: CloudWatchLogsResponse = {
+            events: [],
+            nextForwardToken: logData.next?.token,
+            nextBackwardToken: logData.previous?.token,
+        }
+
+        const isHead = headOrTail === 'head'
+
+        // We are at the earliest data and trying to go back in time, there is nothing to see.
+        // If we don't return now, redundant data will be retrieved.
+        if (isHead && logData.previous?.token === undefined) {
+            // show something so the user doesn't think nothing happened.
+            await Messages.putMessage(
+                msgKey(logData.logGroupInfo),
+                `Loading from: '${logData.logGroupInfo.groupName}'`,
+                undefined,
+                500
+            )
+            return []
+        }
+
+        const stream = pageableToCollection(
+            (r: typeof request) =>
+                logData.retrieveLogsFunction(
+                    logData.logGroupInfo,
+                    logData.parameters,
+                    isHead ? r.nextBackwardToken : r.nextForwardToken
+                ),
+            request,
+            isHead ? 'nextBackwardToken' : 'nextForwardToken'
+        )
+
+        async function firstOrLast<T>(
+            iterable: AsyncIterable<T>,
+            predicate: (item: T) => boolean
+        ): Promise<T | undefined> {
+            let last: T | undefined
+            for await (const item of iterable) {
+                if (predicate((last = item))) {
+                    return item
+                }
+            }
+            return last
+        }
+
+        const msgTimeout = await Messages.putMessage(
+            msgKey(logData.logGroupInfo),
+            `Loading from: '${logData.logGroupInfo.groupName}'`
+        )
+        const responseData = await firstOrLast(stream, (resp) => resp.events.length > 0).finally(() => {
+            msgTimeout.dispose()
+        })
+
+        if (!responseData) {
+            return []
+        }
+
+        const newData =
+            headOrTail === 'head'
+                ? (responseData.events ?? []).concat(logData.events)
+                : logData.events.concat(responseData.events ?? [])
+
+        const tokens: Pick<CloudWatchLogsData, 'next' | 'previous'> = {}
+        // update if no token exists or if the token is updated in the correct direction.
+        if (!logData.previous || headOrTail === 'head') {
+            const token = responseData.nextBackwardToken
+            if (token) {
+                tokens.previous = { token }
+            }
+        }
+        if (!logData.next || headOrTail === 'tail') {
+            const token = responseData.nextForwardToken ?? request.nextForwardToken
+            if (token) {
+                tokens.next = { token }
+            }
+        }
+        this.setLogData(uri, {
+            ...logData,
+            ...tokens,
+            events: newData,
+        })
+
+        this._onDidChange.fire(uri)
+        return newData
+    }
+
+    public setBusyStatus(uri: vscode.Uri, isBusy: boolean): void {
+        const log = this.getRegisteredLog(uri)
+        if (log) {
+            this.setLogData(uri, {
+                ...log,
+                busy: isBusy,
+            })
+        }
+    }
+
+    public getBusyStatus(uri: vscode.Uri): boolean {
+        const log = this.getRegisteredLog(uri)
+        return (log && log.busy) ?? false
+    }
+
+    protected setLogData(uri: vscode.Uri, newData: CloudWatchLogsData): void {
+        this.registry.set(uriToKey(uri), newData)
+    }
+
+    protected getLogData(uri: vscode.Uri): CloudWatchLogsData | undefined {
+        return this.registry.get(uriToKey(uri))
+    }
+
+    public registerInitialLog(
+        uri: vscode.Uri,
+        retrieveLogsFunction: CloudWatchLogsAction = filterLogEventsFromUri
+    ): void {
+        if (this.isRegistered(uri)) {
+            throw new Error(`Already registered: ${uri.toString()}`)
+        }
+        const data = cwlUriSchema.parse(uri)
+        this.setLogData(uri, initLogData(data.logGroupInfo, data.parameters, retrieveLogsFunction))
+    }
+
+    public getRegisteredLog(uri: vscode.Uri): CloudWatchLogsData {
+        const logData = this.getLogData(uri)
+        if (!logData) {
+            throw Error(`Cannot get data for unregistered uri: ${uri.toString()}`)
+        }
+        return logData
+    }
+}
+
+/**
+ * @param completeTimeout True to close the vscode cancel window when request is completed.
+ */
+export async function filterLogEventsFromUri(
+    logGroupInfo: CloudWatchLogsGroupInfo,
+    parameters: CloudWatchLogsParameters,
+    nextToken?: string,
+    completeTimeout = false
+): Promise<CloudWatchLogsResponse> {
+    const client = new CloudWatchLogsClient(logGroupInfo.regionName)
+
+    const cwlParameters: CloudWatchLogs.FilterLogEventsRequest = {
+        logGroupName: logGroupInfo.groupName,
+        filterPattern: parameters.filterPattern,
+        nextToken,
+        limit: parameters.limit,
+    }
+
+    if (logGroupInfo.streamName !== undefined) {
+        cwlParameters.logStreamNames = [logGroupInfo.streamName]
+    }
+
+    if (parameters.startTime && parameters.endTime) {
+        cwlParameters.startTime = parameters.startTime
+        cwlParameters.endTime = parameters.endTime
+    }
+
+    cwlParameters.logStreamNames = []
+
+    if (parameters.streamNameOptions) {
+        cwlParameters.logStreamNames.concat(parameters.streamNameOptions)
+    }
+
+    if (logGroupInfo.streamName) {
+        cwlParameters.logStreamNames.push(logGroupInfo.streamName)
+    }
+
+    if (cwlParameters.logStreamNames.length === 0) {
+        // API fails on empty array
+        delete cwlParameters.logStreamNames
+    }
+
+    const msgTimeout = await Messages.putMessage(msgKey(logGroupInfo), `Loading from: '${logGroupInfo.groupName}'`, {
+        message: logGroupInfo.streamName ?? '',
+    })
+
+    const responsePromise = client.filterLogEvents(cwlParameters)
+    const response = await waitTimeout(responsePromise, msgTimeout, { allowUndefined: false, completeTimeout })
+
+    // Use heuristic of last token as backward token and next token as forward to generalize token form.
+    // Note that this may become inconsistent if the contents of the calls are changing as they are being made.
+    // However, this fail wouldn't really impact customers.
+    if (response) {
+        return {
+            events: response.events ? response.events : [],
+            nextForwardToken: response.nextToken,
+            nextBackwardToken: nextToken,
+        }
+    } else {
+        throw new Error('cwl: filterLogEvents returned null')
+    }
+}
+
+/** Creates a log data container including a log fetcher which will populate the data if called. */
+export function initLogData(
+    logGroupInfo: CloudWatchLogsGroupInfo,
+    parameters: CloudWatchLogsParameters,
+    retrieveLogsFunction: CloudWatchLogsAction
+): CloudWatchLogsData {
+    return {
+        events: [],
+        parameters: parameters,
+        logGroupInfo: logGroupInfo,
+        retrieveLogsFunction: retrieveLogsFunction,
+        busy: false,
+    }
+}
+
+export type CloudWatchLogsArgs = {
+    logGroupInfo: CloudWatchLogsGroupInfo
+    parameters: CloudWatchLogsParameters
+}
+
+export type CloudWatchLogsGroupInfo = {
+    groupName: string
+    regionName: string
+    streamName?: string
+}
+
+export type CloudWatchLogsParameters = {
+    filterPattern?: string
+    startTime?: number
+    endTime?: number
+    limit?: number
+    streamNameOptions?: string[]
+}
+
+export type CloudWatchLogsResponse = {
+    events: CloudWatchLogs.FilteredLogEvent[]
+    nextForwardToken?: string
+    nextBackwardToken?: string
+}
+
+export type CloudWatchLogsAction = (
+    logGroupInfo: CloudWatchLogsGroupInfo,
+    apiParameters: CloudWatchLogsParameters,
+    nextToken?: string
+) => Promise<CloudWatchLogsResponse>
+
+export type CloudWatchLogsEvent = CloudWatchLogs.OutputLogEvent & {
+    logStreamName?: string
+    eventId?: string
+}
+
+export class CloudWatchLogsData {
+    events: CloudWatchLogsEvent[] = []
+    parameters: CloudWatchLogsParameters = {}
+    logGroupInfo!: CloudWatchLogsGroupInfo
+    retrieveLogsFunction!: CloudWatchLogsAction
+    next?: {
+        token: string
+    }
+    previous?: {
+        token: string
+    }
+    busy: boolean = false
+}
diff --git a/packages/core/src/awsService/cloudWatchLogs/timeFilterSubmenu.ts b/packages/core/src/awsService/cloudWatchLogs/timeFilterSubmenu.ts
new file mode 100644
index 00000000000..0bb3cd9670d
--- /dev/null
+++ b/packages/core/src/awsService/cloudWatchLogs/timeFilterSubmenu.ts
@@ -0,0 +1,223 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Prompter, PromptResult } from '../../shared/ui/prompter'
+import { InputBoxPrompter } from '../../shared/ui/inputPrompter'
+import { QuickPickPrompter, DataQuickPickItem, createQuickPick } from '../../shared/ui/pickerPrompter'
+import { createInputBox } from '../../shared/ui/inputPrompter'
+import { isValidResponse, StepEstimator } from '../../shared/wizards/wizard'
+import { createCommonButtons } from '../../shared/ui/buttons'
+import * as nls from 'vscode-nls'
+import { CloudWatchLogsParameters } from './registry/logDataRegistry'
+
+const localize = nls.loadMessageBundle()
+
+export function isViewAllEvents(response: TimeFilterResponse) {
+    return response.start === response.end
+}
+
+export interface TimeFilterResponse {
+    // # of miliseconds since january 1, 1970 since thats what API expects.
+    readonly start: number
+    readonly end: number
+}
+
+const customRange = Symbol('customRange')
+
+export class TimeFilterSubmenu extends Prompter<TimeFilterResponse> {
+    // TODO: Generalize submenu code between this and the region Submenu.
+    private currentState: 'custom-range' | 'recent-range' = 'recent-range'
+    private steps?: [current: number, total: number]
+    public defaultPrompter: QuickPickPrompter<typeof customRange | number> = this.createMenuPrompter()
+
+    public constructor(private readonly oldData?: Pick<CloudWatchLogsParameters, 'startTime' | 'endTime'>) {
+        super()
+    }
+
+    private get recentTimeItems(): DataQuickPickItem<number>[] {
+        const options: DataQuickPickItem<number>[] = []
+        // appromixate 31 days as month length (better to overshoot)
+        options.push({
+            label: 'All time',
+            data: 0,
+        })
+        options.push({
+            label: 'Last 15 minutes',
+            data: 15,
+        })
+        options.push({
+            label: 'Last hour',
+            data: 60,
+        })
+        options.push({
+            label: 'Last 3 Hours',
+            data: 60 * 3,
+        })
+        options.push({
+            label: 'Last 24 Hours',
+            data: 60 * 24,
+        })
+        options.push({
+            label: 'Last 3 Days',
+            data: 60 * 24 * 3,
+        })
+        options.push({
+            label: 'Last week',
+            data: 60 * 24 * 7,
+        })
+        options.push({
+            label: 'Last month',
+            data: 60 * 24 * 31,
+        })
+        options.push({
+            label: 'Last 3 months',
+            data: 60 * 24 * 31 * 3,
+        })
+        options.push({
+            label: 'Last year',
+            data: 60 * 24 * 365,
+        })
+        return options
+    }
+
+    public createMenuPrompter() {
+        const prompter = createQuickPick<number | typeof customRange>(this.recentTimeItems, {
+            title: 'Select Time Filter',
+            buttons: createCommonButtons(),
+        })
+
+        prompter.quickPick.items = [
+            ...prompter.quickPick.items,
+            {
+                label: 'Custom time range',
+                data: customRange,
+                detail: `YYYY/MM/DD-YYYY/MM/DD`,
+            },
+        ]
+
+        return prompter
+    }
+
+    private switchState(newState: 'custom-range' | 'recent-range') {
+        this.currentState = newState
+    }
+
+    public createDateBox(): InputBoxPrompter {
+        return createInputBox({
+            title: 'Enter custom date range',
+            placeholder: 'YYYY/MM/DD-YYYY/MM/DD',
+            value: this.formatTimesToDateRange(this.oldData?.startTime, this.oldData?.endTime),
+            validateInput: (input) => this.validateDate(input),
+            buttons: createCommonButtons(),
+        })
+    }
+
+    protected async promptUser(): Promise<PromptResult<TimeFilterResponse>> {
+        while (true) {
+            switch (this.currentState) {
+                case 'recent-range': {
+                    const prompter = this.createMenuPrompter()
+                    this.steps && prompter.setSteps(this.steps[0], this.steps[1])
+
+                    const resp = await prompter.prompt()
+                    if (resp === customRange) {
+                        this.switchState('custom-range')
+                    } else if (isValidResponse(resp)) {
+                        const [endTime, startTime] = [new Date(), new Date()]
+                        startTime.setMinutes(endTime.getMinutes() - resp)
+
+                        return { start: startTime.valueOf(), end: endTime.valueOf() }
+                    } else {
+                        return undefined
+                    }
+
+                    break
+                }
+                case 'custom-range': {
+                    const resp = await this.createDateBox().prompt()
+                    if (isValidResponse(resp)) {
+                        const [startTime, endTime] = this.parseDateRange(resp)
+
+                        return { start: startTime.valueOf(), end: endTime.valueOf() }
+                    }
+
+                    this.switchState('recent-range')
+
+                    break
+                }
+            }
+        }
+    }
+
+    public validateDate(input: string) {
+        const parts = input.split('-')
+
+        if (parts.length !== 2) {
+            return localize('AWS.cwl.validateDate.notTwoDates', 'String must include two dates seperated by `-`')
+        }
+        const [startTime, endTime] = parts
+
+        if (!Date.parse(startTime)) {
+            return localize('AWS.cwl.validateDate.startTimeInvalid', 'starting time format is invalid, use YYYY/MM/DD')
+        }
+        if (!Date.parse(endTime)) {
+            return localize('AWS.cwl.validateDate.endTimeInvalid', 'ending time format is valid, use YYYY/MM/DD')
+        }
+        const regEx = /^\d{4}\/\d{2}\/\d{2}$/
+        if (!startTime.match(regEx) || !endTime.match(regEx)) {
+            return localize('AWS.cwl.validateDate.dateFormat', 'enter date in format YYYY/MM/DD-YYYY/MM/DD')
+        }
+        if (startTime === endTime) {
+            return localize('AWS.cwl.validateDate.sameDateError', 'must enter two different dates for valid range')
+        }
+        if (Date.parse(startTime) > Date.parse(endTime)) {
+            return localize('AWS.cwl.validateDate.startBeforeEndDate', 'first date must occur before second date')
+        }
+    }
+
+    public setSteps(current: number, total: number): void {
+        this.steps = [current, total]
+    }
+
+    private parseDateRange(resp: string) {
+        const parts = resp.split('-')
+
+        return [this.parseDate(parts[0]), this.parseDate(parts[1])]
+    }
+
+    private parseDate(date: string) {
+        const [year, month, day] = date.split('/').map(Number)
+        return new Date(Date.UTC(year, month - 1, day))
+    }
+
+    /**
+     * Formats a given start and end time in milliseconds to
+     * a string in the format 'YYYY/MM/DD-YYYY/MM/DD'
+     *
+     * Returns undefined if any of the times are not provided.
+     */
+    public formatTimesToDateRange(startTimeMillis?: number, endTimeMillis?: number): string | undefined {
+        if (startTimeMillis === undefined || endTimeMillis === undefined) {
+            return undefined
+        }
+        const startDate = new Date(startTimeMillis)
+        const endDate = new Date(endTimeMillis)
+
+        // Convert to string with format: YYYY/MM/DD
+        const allDashes = new RegExp('-', 'g')
+        const formattedStartDate = startDate.toISOString().split('T')[0].replace(allDashes, '/')
+        const formattedEndDate = endDate.toISOString().split('T')[0].replace(allDashes, '/')
+
+        return `${formattedStartDate}-${formattedEndDate}`
+    }
+
+    // Unused
+    public get recentItem(): any {
+        return
+    }
+
+    public set recentItem(response: any) {}
+    public setStepEstimator(estimator: StepEstimator<TimeFilterResponse>): void {}
+}
diff --git a/packages/core/src/awsService/cloudWatchLogs/wizard/liveTailLogStreamSubmenu.ts b/packages/core/src/awsService/cloudWatchLogs/wizard/liveTailLogStreamSubmenu.ts
new file mode 100644
index 00000000000..6a9d24a5c34
--- /dev/null
+++ b/packages/core/src/awsService/cloudWatchLogs/wizard/liveTailLogStreamSubmenu.ts
@@ -0,0 +1,163 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { Prompter, PromptResult } from '../../../shared/ui/prompter'
+import { CloudWatchLogsClient } from '../../../shared/clients/cloudWatchLogs'
+import { createCommonButtons } from '../../../shared/ui/buttons'
+import { createInputBox, InputBoxPrompter } from '../../../shared/ui/inputPrompter'
+import { createQuickPick, DataQuickPickItem, QuickPickPrompter } from '../../../shared/ui/pickerPrompter'
+import { pageableToCollection } from '../../../shared/utilities/collectionUtils'
+import * as CloudWatchLogs from '@aws-sdk/client-cloudwatch-logs'
+import { isValidResponse, StepEstimator } from '../../../shared/wizards/wizard'
+import { isNonNullable } from '../../../shared/utilities/tsUtils'
+import {
+    startLiveTailHelpUrl,
+    startLiveTailLogStreamNamesHelpUrl,
+    startLiveTailLogStreamPrefixHelpUrl,
+} from '../../../shared/constants'
+
+export type LogStreamFilterType = 'menu' | 'prefix' | 'specific' | 'all'
+
+export interface LogStreamFilterResponse {
+    readonly filter?: string
+    readonly type: LogStreamFilterType
+}
+
+export class LogStreamFilterSubmenu extends Prompter<LogStreamFilterResponse> {
+    private logStreamPrefixRegEx = /^[^:*]*$/
+    private currentState: LogStreamFilterType = 'menu'
+    private steps?: [current: number, total: number]
+    private region: string
+    private logGroupArn: string
+    public defaultPrompter: QuickPickPrompter<LogStreamFilterType> = this.createMenuPrompter()
+
+    public constructor(logGroupArn: string, region: string) {
+        super()
+        this.region = region
+        this.logGroupArn = logGroupArn
+    }
+
+    public createMenuPrompter() {
+        const helpUri = startLiveTailHelpUrl
+        const prompter = createQuickPick(this.menuOptions, {
+            title: 'Include log events from...',
+            buttons: createCommonButtons(helpUri),
+        })
+        return prompter
+    }
+
+    private get menuOptions(): DataQuickPickItem<LogStreamFilterType>[] {
+        const options: DataQuickPickItem<LogStreamFilterType>[] = []
+        options.push({
+            label: 'All Log Streams',
+            data: 'all',
+        })
+        options.push({
+            label: 'Specific Log Stream',
+            data: 'specific',
+        })
+        options.push({
+            label: 'Log Streams matching prefix',
+            data: 'prefix',
+        })
+        return options
+    }
+
+    public createLogStreamPrefixBox(): InputBoxPrompter {
+        const helpUri = startLiveTailLogStreamPrefixHelpUrl
+        return createInputBox({
+            title: 'Enter Log Stream prefix',
+            placeholder: 'log stream prefix (case sensitive; empty matches all)',
+            prompt: 'Only log events in Log Streams whose name starts with the supplied prefix will be included.',
+            validateInput: (input) => this.validateLogStreamPrefix(input),
+            buttons: createCommonButtons(helpUri),
+        })
+    }
+
+    public validateLogStreamPrefix(prefix: string) {
+        if (prefix.length > 512) {
+            return 'Log Stream prefix cannot be longer than 512 characters'
+        }
+
+        if (!this.logStreamPrefixRegEx.test(prefix)) {
+            return 'Log Stream prefix must match pattern: [^:*]*'
+        }
+    }
+
+    public createLogStreamSelector(): QuickPickPrompter<string> {
+        const helpUri = startLiveTailLogStreamNamesHelpUrl
+        const client = new CloudWatchLogsClient(this.region)
+        const request: CloudWatchLogs.DescribeLogStreamsRequest = {
+            logGroupIdentifier: this.logGroupArn,
+            orderBy: 'LastEventTime',
+            descending: true,
+        }
+        const requester = (request: CloudWatchLogs.DescribeLogStreamsRequest) => client.describeLogStreams(request)
+        const collection = pageableToCollection(requester, request, 'nextToken', 'logStreams')
+
+        const items = collection
+            .filter(isNonNullable)
+            .map((streams) => streams!.map((stream) => ({ data: stream.logStreamName!, label: stream.logStreamName! })))
+
+        return createQuickPick(items, {
+            title: 'Select Log Stream',
+            buttons: createCommonButtons(helpUri),
+        })
+    }
+
+    private switchState(newState: LogStreamFilterType) {
+        this.currentState = newState
+    }
+
+    protected async promptUser(): Promise<PromptResult<LogStreamFilterResponse>> {
+        while (true) {
+            switch (this.currentState) {
+                case 'menu': {
+                    const prompter = this.createMenuPrompter()
+                    this.steps && prompter.setSteps(this.steps[0], this.steps[1])
+
+                    const resp = await prompter.prompt()
+                    if (resp === 'prefix') {
+                        this.switchState('prefix')
+                    } else if (resp === 'specific') {
+                        this.switchState('specific')
+                    } else if (resp === 'all') {
+                        return { filter: undefined, type: resp }
+                    } else {
+                        return undefined
+                    }
+
+                    break
+                }
+                case 'prefix': {
+                    const resp = await this.createLogStreamPrefixBox().prompt()
+                    if (isValidResponse(resp)) {
+                        return { filter: resp, type: 'prefix' }
+                    }
+                    this.switchState('menu')
+                    break
+                }
+                case 'specific': {
+                    const resp = await this.createLogStreamSelector().prompt()
+                    if (isValidResponse(resp)) {
+                        return { filter: resp, type: 'specific' }
+                    }
+                    this.switchState('menu')
+                    break
+                }
+            }
+        }
+    }
+
+    public setSteps(current: number, total: number): void {
+        this.steps = [current, total]
+    }
+
+    // Unused
+    public get recentItem(): any {
+        return
+    }
+    public set recentItem(response: any) {}
+    public setStepEstimator(estimator: StepEstimator<LogStreamFilterResponse>): void {}
+}
diff --git a/packages/core/src/awsService/cloudWatchLogs/wizard/tailLogGroupWizard.ts b/packages/core/src/awsService/cloudWatchLogs/wizard/tailLogGroupWizard.ts
new file mode 100644
index 00000000000..02166e3a85f
--- /dev/null
+++ b/packages/core/src/awsService/cloudWatchLogs/wizard/tailLogGroupWizard.ts
@@ -0,0 +1,111 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+import globals from '../../../shared/extensionGlobals'
+import { ToolkitError } from '../../../shared/errors'
+import { CloudWatchLogsClient } from '../../../shared/clients/cloudWatchLogs'
+import { cwlFilterPatternHelpUrl } from '../../../shared/constants'
+import { createBackButton, createExitButton, createHelpButton } from '../../../shared/ui/buttons'
+import { RegionSubmenu, RegionSubmenuResponse } from '../../../shared/ui/common/regionSubmenu'
+import { createInputBox } from '../../../shared/ui/inputPrompter'
+import { DataQuickPickItem } from '../../../shared/ui/pickerPrompter'
+import { Wizard } from '../../../shared/wizards/wizard'
+import { CloudWatchLogsGroupInfo } from '../registry/logDataRegistry'
+import { LogStreamFilterResponse, LogStreamFilterSubmenu } from './liveTailLogStreamSubmenu'
+
+const localize = nls.loadMessageBundle()
+
+export interface TailLogGroupWizardResponse {
+    regionLogGroupSubmenuResponse: RegionSubmenuResponse<string>
+    logStreamFilter: LogStreamFilterResponse
+    filterPattern: string
+}
+
+export class TailLogGroupWizard extends Wizard<TailLogGroupWizardResponse> {
+    public constructor(logGroupInfo?: CloudWatchLogsGroupInfo, logStreamInfo?: LogStreamFilterResponse) {
+        super({
+            initState: {
+                regionLogGroupSubmenuResponse: logGroupInfo
+                    ? {
+                          data: buildLogGroupArn(logGroupInfo.groupName, logGroupInfo.regionName),
+                          region: logGroupInfo.regionName,
+                      }
+                    : undefined,
+                logStreamFilter: logStreamInfo ?? undefined,
+            },
+        })
+        this.form.regionLogGroupSubmenuResponse.bindPrompter(createRegionLogGroupSubmenu)
+        this.form.logStreamFilter.bindPrompter((state) => {
+            if (!state.regionLogGroupSubmenuResponse?.data) {
+                throw new ToolkitError('Log Group name is null')
+            }
+            return new LogStreamFilterSubmenu(
+                state.regionLogGroupSubmenuResponse.data,
+                state.regionLogGroupSubmenuResponse.region
+            )
+        })
+        this.form.filterPattern.bindPrompter((state) => createFilterPatternPrompter())
+    }
+}
+
+export function createRegionLogGroupSubmenu(): RegionSubmenu<string> {
+    return new RegionSubmenu(
+        getLogGroupQuickPickOptions,
+        {
+            title: localize('AWS.cwl.tailLogGroup.logGroupPromptTitle', 'Select Log Group to tail'),
+            buttons: [createExitButton()],
+        },
+        { title: localize('AWS.cwl.tailLogGroup.regionPromptTitle', 'Select Region for Log Group') },
+        'Log Groups'
+    )
+}
+
+async function getLogGroupQuickPickOptions(regionCode: string): Promise<DataQuickPickItem<string>[]> {
+    const client = new CloudWatchLogsClient(regionCode)
+    const logGroups = client.describeLogGroups()
+
+    const logGroupsOptions: DataQuickPickItem<string>[] = []
+
+    for await (const logGroupObject of logGroups) {
+        if (!logGroupObject.arn || !logGroupObject.logGroupName) {
+            throw new ToolkitError('Log Group name or arn is undefined')
+        }
+
+        logGroupsOptions.push({
+            label: logGroupObject.logGroupName,
+            data: formatLogGroupArn(logGroupObject.arn),
+        })
+    }
+
+    return logGroupsOptions
+}
+
+export function buildLogGroupArn(logGroupName: string, region: string): string {
+    if (logGroupName.startsWith('arn:')) {
+        return logGroupName
+    }
+    const awsAccountId = globals.awsContext.getCredentialAccountId()
+    if (awsAccountId === undefined) {
+        throw new ToolkitError(
+            `Failed to construct Arn for Log Group because awsAccountId is undefined. Log Group: ${logGroupName}`
+        )
+    }
+    return `arn:aws:logs:${region}:${awsAccountId}:log-group:${logGroupName}`
+}
+
+function formatLogGroupArn(logGroupArn: string): string {
+    return logGroupArn.endsWith(':*') ? logGroupArn.substring(0, logGroupArn.length - 2) : logGroupArn
+}
+
+export function createFilterPatternPrompter() {
+    const helpUri = cwlFilterPatternHelpUrl
+    return createInputBox({
+        title: 'Provide log event filter pattern',
+        placeholder: 'filter pattern (case sensitive; empty matches all)',
+        prompt: 'Optional filter to include only log events that match the supplied pattern.',
+        buttons: [createHelpButton(helpUri), createBackButton(), createExitButton()],
+    })
+}
diff --git a/packages/core/src/awsService/ec2/activation.ts b/packages/core/src/awsService/ec2/activation.ts
new file mode 100644
index 00000000000..18660732754
--- /dev/null
+++ b/packages/core/src/awsService/ec2/activation.ts
@@ -0,0 +1,88 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { ExtContext } from '../../shared/extensions'
+import { Commands } from '../../shared/vscode/commands2'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { Ec2InstanceNode, tryRefreshNode } from './explorer/ec2InstanceNode'
+import { copyTextCommand } from '../../awsexplorer/commands/copyText'
+import { Ec2Node } from './explorer/ec2ParentNode'
+import {
+    openRemoteConnection,
+    openTerminal,
+    rebootInstance,
+    startInstance,
+    stopInstance,
+    linkToLaunchInstance,
+    openLogDocument,
+} from './commands'
+import { Ec2ConnecterMap } from './connectionManagerMap'
+import { ec2LogsScheme } from '../../shared/constants'
+import { Ec2LogDocumentProvider } from './ec2LogDocumentProvider'
+
+const connectionManagers = new Ec2ConnecterMap()
+
+export async function activate(ctx: ExtContext): Promise<void> {
+    ctx.extensionContext.subscriptions.push(
+        vscode.workspace.registerTextDocumentContentProvider(ec2LogsScheme, new Ec2LogDocumentProvider())
+    )
+    ctx.extensionContext.subscriptions.push(
+        Commands.register('aws.ec2.openTerminal', async (node?: Ec2InstanceNode) => {
+            await telemetry.ec2_connectToInstance.run(async (span) => {
+                span.record({ ec2ConnectionType: 'ssm' })
+                await openTerminal(connectionManagers, node)
+            })
+        }),
+
+        Commands.register('aws.ec2.copyInstanceId', async (node: Ec2InstanceNode) => {
+            await copyTextCommand(node, 'id')
+        }),
+        Commands.register('aws.ec2.viewLogs', async (node?: Ec2InstanceNode) => {
+            await openLogDocument(node)
+        }),
+
+        Commands.register('aws.ec2.openRemoteConnection', async (node?: Ec2Node) => {
+            await telemetry.ec2_connectToInstance.run(async (span) => {
+                span.record({ ec2ConnectionType: 'remoteWorkspace' })
+                await openRemoteConnection(connectionManagers, node)
+            })
+        }),
+
+        Commands.register('aws.ec2.startInstance', async (node?: Ec2Node) => {
+            await telemetry.ec2_changeState.run(async (span) => {
+                span.record({ ec2InstanceState: 'start' })
+                await startInstance(node)
+                await tryRefreshNode(node)
+            })
+        }),
+
+        Commands.register('aws.ec2.stopInstance', async (node?: Ec2Node) => {
+            await telemetry.ec2_changeState.run(async (span) => {
+                span.record({ ec2InstanceState: 'stop' })
+                await stopInstance(node)
+                await tryRefreshNode(node)
+            })
+        }),
+
+        Commands.register('aws.ec2.rebootInstance', async (node?: Ec2Node) => {
+            await telemetry.ec2_changeState.run(async (span) => {
+                span.record({ ec2InstanceState: 'reboot' })
+                await rebootInstance(node)
+                await tryRefreshNode(node)
+            })
+        }),
+
+        Commands.register('aws.ec2.linkToLaunch', async (node?: Ec2Node) => {
+            await telemetry.ec2_launchInstance.run(async (span) => {
+                await linkToLaunchInstance(node)
+            })
+        })
+    )
+}
+
+export async function deactivate(): Promise<void> {
+    // eslint-disable-next-line unicorn/no-array-for-each
+    connectionManagers.forEach(async (manager) => await manager.dispose())
+}
diff --git a/packages/core/src/awsService/ec2/commands.ts b/packages/core/src/awsService/ec2/commands.ts
new file mode 100644
index 00000000000..f0eefe80359
--- /dev/null
+++ b/packages/core/src/awsService/ec2/commands.ts
@@ -0,0 +1,61 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { Ec2InstanceNode } from './explorer/ec2InstanceNode'
+import { Ec2Node } from './explorer/ec2ParentNode'
+import { Ec2Instance, Ec2Client } from '../../shared/clients/ec2'
+import { copyToClipboard } from '../../shared/utilities/messages'
+import { ec2LogSchema } from './ec2LogDocumentProvider'
+import { getAwsConsoleUrl } from '../../shared/awsConsole'
+import { showRegionPrompter } from '../../auth/utils'
+import { openUrl } from '../../shared/utilities/vsCodeUtils'
+import { showFile } from '../../shared/utilities/textDocumentUtilities'
+import { Ec2ConnecterMap } from './connectionManagerMap'
+import { getSelection } from './prompter'
+
+export async function openTerminal(connectionManagers: Ec2ConnecterMap, node?: Ec2Node) {
+    const selection = await getSelection(node)
+    const connectionManager = connectionManagers.getOrInit(selection.region)
+    await connectionManager.attemptToOpenEc2Terminal(selection)
+}
+
+export async function openRemoteConnection(connectionManagers: Ec2ConnecterMap, node?: Ec2Node) {
+    const selection = await getSelection(node)
+    const connectionManager = connectionManagers.getOrInit(selection.region)
+    await connectionManager.tryOpenRemoteConnection(selection)
+}
+
+export async function startInstance(node?: Ec2Node) {
+    const prompterFilter = (instance: Ec2Instance) => instance.LastSeenStatus !== 'running'
+    const selection = await getSelection(node, prompterFilter)
+    const client = new Ec2Client(selection.region)
+    await client.startInstanceWithCancel(selection.instanceId)
+}
+
+export async function stopInstance(node?: Ec2Node) {
+    const prompterFilter = (instance: Ec2Instance) => instance.LastSeenStatus !== 'stopped'
+    const selection = await getSelection(node, prompterFilter)
+    const client = new Ec2Client(selection.region)
+    await client.stopInstanceWithCancel(selection.instanceId)
+}
+
+export async function rebootInstance(node?: Ec2Node) {
+    const selection = await getSelection(node)
+    const client = new Ec2Client(selection.region)
+    await client.rebootInstanceWithCancel(selection.instanceId)
+}
+
+export async function linkToLaunchInstance(node?: Ec2Node) {
+    const region = node ? node.regionCode : (await showRegionPrompter('Select Region', '')).id
+    const url = getAwsConsoleUrl('ec2-launch', region)
+    await openUrl(url)
+}
+
+export async function copyInstanceId(instanceId: string): Promise<void> {
+    await copyToClipboard(instanceId, 'Id')
+}
+
+export async function openLogDocument(node?: Ec2InstanceNode): Promise<void> {
+    return await showFile(ec2LogSchema.form(await getSelection(node)))
+}
diff --git a/packages/core/src/awsService/ec2/connectionManagerMap.ts b/packages/core/src/awsService/ec2/connectionManagerMap.ts
new file mode 100644
index 00000000000..fa1a258fa2f
--- /dev/null
+++ b/packages/core/src/awsService/ec2/connectionManagerMap.ts
@@ -0,0 +1,26 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { getLogger } from '../../shared/logger/logger'
+import { Ec2Connecter } from './model'
+
+export class Ec2ConnecterMap extends Map<string, Ec2Connecter> {
+    private static warnSize: number = 25
+
+    public getOrInit(regionCode: string) {
+        return this.has(regionCode) ? this.get(regionCode)! : this.initManager(regionCode)
+    }
+
+    private initManager(regionCode: string): Ec2Connecter {
+        if (this.size >= Ec2ConnecterMap.warnSize) {
+            getLogger().warn(
+                `Connection manager exceeded threshold of ${Ec2ConnecterMap.warnSize} with ${this.size} active connections`
+            )
+        }
+        const newConnectionManager = new Ec2Connecter(regionCode)
+        this.set(regionCode, newConnectionManager)
+        return newConnectionManager
+    }
+}
diff --git a/packages/core/src/awsService/ec2/ec2LogDocumentProvider.ts b/packages/core/src/awsService/ec2/ec2LogDocumentProvider.ts
new file mode 100644
index 00000000000..2f42e79a5d7
--- /dev/null
+++ b/packages/core/src/awsService/ec2/ec2LogDocumentProvider.ts
@@ -0,0 +1,42 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { Ec2Selection } from './prompter'
+import { Ec2Client } from '../../shared/clients/ec2'
+import { ec2LogsScheme } from '../../shared/constants'
+import { UriSchema } from '../../shared/utilities/uriUtils'
+
+export class Ec2LogDocumentProvider implements vscode.TextDocumentContentProvider {
+    public constructor() {}
+
+    public async provideTextDocumentContent(uri: vscode.Uri): Promise<string> {
+        if (!ec2LogSchema.isValid(uri)) {
+            throw new Error(`Invalid EC2 Logs URI: ${uri.toString()}`)
+        }
+        const ec2Selection = ec2LogSchema.parse(uri)
+        const ec2Client = new Ec2Client(ec2Selection.region)
+        const consoleOutput = await ec2Client.getConsoleOutput(ec2Selection.instanceId, false)
+        return consoleOutput.Output
+    }
+}
+
+export const ec2LogSchema = new UriSchema<Ec2Selection>(parseEc2Uri, formEc2Uri)
+
+function parseEc2Uri(uri: vscode.Uri): Ec2Selection {
+    const parts = uri.path.split(':')
+
+    if (uri.scheme !== ec2LogsScheme) {
+        throw new Error(`URI ${uri} is not parseable for EC2 Logs`)
+    }
+
+    return {
+        instanceId: parts[1],
+        region: parts[0],
+    }
+}
+
+function formEc2Uri(selection: Ec2Selection): vscode.Uri {
+    return vscode.Uri.parse(`${ec2LogsScheme}:${selection.region}:${selection.instanceId}`)
+}
diff --git a/packages/core/src/awsService/ec2/explorer/ec2InstanceNode.ts b/packages/core/src/awsService/ec2/explorer/ec2InstanceNode.ts
new file mode 100644
index 00000000000..70726c863aa
--- /dev/null
+++ b/packages/core/src/awsService/ec2/explorer/ec2InstanceNode.ts
@@ -0,0 +1,115 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { Ec2Client, getNameOfInstance } from '../../../shared/clients/ec2'
+import { AWSResourceNode } from '../../../shared/treeview/nodes/awsResourceNode'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { Ec2Instance } from '../../../shared/clients/ec2'
+import globals from '../../../shared/extensionGlobals'
+import { getIconCode } from '../utils'
+import { Ec2Selection } from '../prompter'
+import { Ec2Node, Ec2ParentNode } from './ec2ParentNode'
+import { getLogger } from '../../../shared/logger/logger'
+import { InstanceStateName } from '@aws-sdk/client-ec2'
+
+export const Ec2InstanceRunningContext = 'awsEc2RunningNode'
+export const Ec2InstanceStoppedContext = 'awsEc2StoppedNode'
+export const Ec2InstancePendingContext = 'awsEc2PendingNode'
+
+type Ec2InstanceNodeContext = 'awsEc2RunningNode' | 'awsEc2StoppedNode' | 'awsEc2PendingNode'
+
+export class Ec2InstanceNode extends AWSTreeNodeBase implements AWSResourceNode {
+    public constructor(
+        public readonly parent: Ec2ParentNode,
+        public readonly client: Ec2Client,
+        public override readonly regionCode: string,
+        private readonly partitionId: string,
+        // XXX: this variable is marked as readonly, but the 'status' attribute is updated when polling the nodes.
+        public readonly instance: Ec2Instance
+    ) {
+        super('')
+        this.parent.addChild(this)
+        this.updateInstance(instance)
+        this.id = this.InstanceId
+    }
+
+    public updateInstance(newInstance: Ec2Instance) {
+        this.setInstanceStatus(newInstance.LastSeenStatus)
+        this.label = `${this.name} (${this.InstanceId}) ${this.instance.LastSeenStatus.toUpperCase()}`
+        this.contextValue = this.getContext()
+        this.iconPath = new vscode.ThemeIcon(getIconCode(this.instance))
+        this.tooltip = `${this.name}\n${this.InstanceId}\n${this.instance.LastSeenStatus}\n${this.arn}`
+
+        if (this.isPending()) {
+            this.parent.trackPendingNode(this.InstanceId)
+        }
+    }
+
+    public isPending(): boolean {
+        return this.getStatus() !== 'running' && this.getStatus() !== 'stopped'
+    }
+
+    public async updateStatus() {
+        const newStatus = await this.client.getInstanceStatus(this.InstanceId)
+        this.updateInstance({ ...this.instance, LastSeenStatus: newStatus })
+    }
+
+    private getContext(): Ec2InstanceNodeContext {
+        if (this.instance.LastSeenStatus === 'running') {
+            return Ec2InstanceRunningContext
+        }
+
+        if (this.instance.LastSeenStatus === 'stopped') {
+            return Ec2InstanceStoppedContext
+        }
+
+        return Ec2InstancePendingContext
+    }
+
+    public setInstanceStatus(instanceStatus: InstanceStateName) {
+        this.instance.LastSeenStatus = instanceStatus
+    }
+
+    public toSelection(): Ec2Selection {
+        return {
+            region: this.regionCode,
+            instanceId: this.InstanceId,
+        }
+    }
+
+    public getStatus(): InstanceStateName {
+        return this.instance.LastSeenStatus
+    }
+
+    public get name(): string {
+        return this.instance.Name ?? getNameOfInstance(this.instance) ?? `(no name)`
+    }
+
+    public get InstanceId(): string {
+        return this.instance.InstanceId!
+    }
+
+    public get arn(): string {
+        return `arn:${this.partitionId}:ec2:${
+            this.regionCode
+        }:${globals.awsContext.getCredentialAccountId()}:instance/${this.InstanceId}`
+    }
+
+    public async refreshNode(): Promise<void> {
+        await this.updateStatus()
+        await vscode.commands.executeCommand('aws.refreshAwsExplorerNode', this)
+    }
+}
+
+export async function tryRefreshNode(node?: Ec2Node) {
+    if (node) {
+        const n = node instanceof Ec2InstanceNode ? node.parent : node
+        try {
+            await n.refreshNode()
+        } catch (e) {
+            getLogger().error('refreshNode failed: %s', (e as Error).message)
+        }
+    }
+}
diff --git a/packages/core/src/awsService/ec2/explorer/ec2ParentNode.ts b/packages/core/src/awsService/ec2/explorer/ec2ParentNode.ts
new file mode 100644
index 00000000000..88da65536c8
--- /dev/null
+++ b/packages/core/src/awsService/ec2/explorer/ec2ParentNode.ts
@@ -0,0 +1,102 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { makeChildrenNodes } from '../../../shared/treeview/utils'
+import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
+import { Ec2InstanceNode } from './ec2InstanceNode'
+import { Ec2Client } from '../../../shared/clients/ec2'
+import { updateInPlace } from '../../../shared/utilities/collectionUtils'
+import { PollingSet } from '../../../shared/utilities/pollingSet'
+
+export const parentContextValue = 'awsEc2ParentNode'
+export type Ec2Node = Ec2InstanceNode | Ec2ParentNode
+
+export class Ec2ParentNode extends AWSTreeNodeBase {
+    protected readonly placeHolderMessage = '[No EC2 Instances Found]'
+    protected ec2InstanceNodes: Map<string, Ec2InstanceNode>
+    public override readonly contextValue: string = parentContextValue
+    public readonly pollingSet: PollingSet<string> = new PollingSet(5000, this.updatePendingNodes.bind(this))
+
+    public constructor(
+        public override readonly regionCode: string,
+        public readonly partitionId: string,
+        protected readonly ec2Client: Ec2Client
+    ) {
+        super('EC2', vscode.TreeItemCollapsibleState.Collapsed)
+        this.ec2InstanceNodes = new Map<string, Ec2InstanceNode>()
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        const result = await makeChildrenNodes({
+            getChildNodes: async () => {
+                await this.updateChildren()
+
+                return [...this.ec2InstanceNodes.values()]
+            },
+            getNoChildrenPlaceholderNode: async () => new PlaceholderNode(this, this.placeHolderMessage),
+            sort: (nodeA, nodeB) => nodeA.name.localeCompare(nodeB.name),
+        })
+        return result
+    }
+
+    public trackPendingNode(instanceId: string) {
+        if (!this.ec2InstanceNodes.has(instanceId)) {
+            throw new Error(`Attempt to track ec2 node ${instanceId} that isn't a child`)
+        }
+        this.pollingSet.add(instanceId)
+    }
+    // TODO: make use of childNodeLoader to avoid loading all of this at once.
+    public async updateChildren(): Promise<void> {
+        const instanceMap = await this.ec2Client
+            .getInstances()
+            .flatten()
+            .toMap((instance) => instance.InstanceId)
+
+        updateInPlace(
+            this.ec2InstanceNodes,
+            instanceMap.keys(),
+            (key) => this.ec2InstanceNodes.get(key)!.updateInstance(instanceMap.get(key)!),
+            (key) => new Ec2InstanceNode(this, this.ec2Client, this.regionCode, this.partitionId, instanceMap.get(key)!)
+        )
+    }
+
+    public getInstanceNode(instanceId: string): Ec2InstanceNode {
+        const childNode = this.ec2InstanceNodes.get(instanceId)
+        if (childNode) {
+            return childNode
+        } else {
+            throw new Error(`Node with id ${instanceId} from polling set not found`)
+        }
+    }
+
+    private async updatePendingNodes() {
+        for (const instanceId of this.pollingSet.values()) {
+            const childNode = this.getInstanceNode(instanceId)
+            await this.updatePendingNode(childNode)
+        }
+    }
+
+    private async updatePendingNode(node: Ec2InstanceNode) {
+        await node.updateStatus()
+        if (!node.isPending()) {
+            this.pollingSet.delete(node.InstanceId)
+            await node.refreshNode()
+        }
+    }
+
+    public async clearChildren() {
+        this.ec2InstanceNodes = new Map<string, Ec2InstanceNode>()
+    }
+
+    public addChild(node: Ec2InstanceNode) {
+        this.ec2InstanceNodes.set(node.InstanceId, node)
+    }
+
+    public async refreshNode(): Promise<void> {
+        await this.clearChildren()
+        await vscode.commands.executeCommand('aws.refreshAwsExplorerNode', this)
+    }
+}
diff --git a/packages/core/src/awsService/ec2/model.ts b/packages/core/src/awsService/ec2/model.ts
new file mode 100644
index 00000000000..ad37357fe89
--- /dev/null
+++ b/packages/core/src/awsService/ec2/model.ts
@@ -0,0 +1,368 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { Ec2Selection } from './prompter'
+import { getOrInstallCli } from '../../shared/utilities/cliUtils'
+import { isCloud9 } from '../../shared/extensionUtilities'
+import { ToolkitError } from '../../shared/errors'
+import { SsmClient } from '../../shared/clients/ssm'
+import { Ec2Client } from '../../shared/clients/ec2'
+import {
+    VscodeRemoteConnection,
+    createBoundProcess,
+    ensureDependencies,
+    getDeniedSsmActions,
+    openRemoteTerminal,
+    promptToAddInlinePolicy,
+} from '../../shared/remoteSession'
+import { IamClient, IamRole } from '../../shared/clients/iam'
+import { ErrorInformation } from '../../shared/errors'
+import {
+    sshAgentSocketVariable,
+    SshError,
+    startSshAgent,
+    startVscodeRemote,
+    testSshConnection,
+} from '../../shared/extensions/ssh'
+import { getLogger } from '../../shared/logger/logger'
+import { CancellationError, Timeout, waitUntil } from '../../shared/utilities/timeoutUtils'
+import { showMessageWithCancel } from '../../shared/utilities/messages'
+import { SshConfig } from '../../shared/sshConfig'
+import { SshKeyPair } from './sshKeyPair'
+import { Ec2SessionTracker } from './remoteSessionManager'
+import { getEc2SsmEnv } from './utils'
+import { Session, StartSessionResponse } from '@aws-sdk/client-ssm'
+
+export type Ec2ConnectErrorCode = 'EC2SSMStatus' | 'EC2SSMPermission' | 'EC2SSMTestConnect' | 'EC2SSMAgentStatus'
+
+export interface Ec2RemoteEnv extends VscodeRemoteConnection {
+    selection: Ec2Selection
+    keyPair: SshKeyPair
+    ssmSession: StartSessionResponse
+}
+
+export type Ec2OS = 'Amazon Linux' | 'Ubuntu' | 'macOS'
+interface RemoteUser {
+    os: Ec2OS
+    name: string
+}
+
+export class Ec2Connecter implements vscode.Disposable {
+    protected ssm: SsmClient
+    protected ec2Client: Ec2Client
+    protected iamClient: IamClient
+    protected sessionManager: Ec2SessionTracker
+
+    private policyDocumentationUri = vscode.Uri.parse(
+        'https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-getting-started-instance-profile.html'
+    )
+
+    private ssmAgentDocumentationUri = vscode.Uri.parse(
+        'https://docs.aws.amazon.com/systems-manager/latest/userguide/ssm-agent.html'
+    )
+
+    public constructor(readonly regionCode: string) {
+        this.ssm = this.createSsmSdkClient()
+        this.ec2Client = this.createEc2SdkClient()
+        this.iamClient = this.createIamSdkClient()
+        this.sessionManager = new Ec2SessionTracker(regionCode, this.ssm)
+    }
+
+    protected createSsmSdkClient(): SsmClient {
+        return new SsmClient(this.regionCode)
+    }
+
+    protected createEc2SdkClient(): Ec2Client {
+        return new Ec2Client(this.regionCode)
+    }
+
+    protected createIamSdkClient(): IamClient {
+        return new IamClient(this.regionCode)
+    }
+
+    public async addActiveSession(sessionId: string, instanceId: string): Promise<void> {
+        await this.sessionManager.addSession(instanceId, sessionId)
+    }
+
+    public async dispose(): Promise<void> {
+        await this.sessionManager.dispose()
+    }
+
+    public isConnectedTo(instanceId: string): boolean {
+        return this.sessionManager.isConnectedTo(instanceId)
+    }
+
+    public async getAttachedIamRole(instanceId: string): Promise<IamRole | undefined> {
+        const IamInstanceProfile = await this.ec2Client.getAttachedIamInstanceProfile(instanceId)
+        if (IamInstanceProfile && IamInstanceProfile.Arn) {
+            const IamRole = await this.iamClient.getIAMRoleFromInstanceProfile(IamInstanceProfile.Arn)
+            return IamRole
+        }
+    }
+
+    public async hasProperPermissions(IamRoleArn: string): Promise<boolean> {
+        const deniedActions = await getDeniedSsmActions(this.iamClient, IamRoleArn)
+
+        return deniedActions.length === 0
+    }
+
+    public async isInstanceRunning(instanceId: string): Promise<boolean> {
+        const instanceStatus = await this.ec2Client.getInstanceStatus(instanceId)
+        return instanceStatus === 'running'
+    }
+
+    protected throwConnectionError(message: string, selection: Ec2Selection, errorInfo: ErrorInformation) {
+        const generalErrorMessage = `Unable to connect to target instance ${selection.instanceId} on region ${selection.region}. `
+        throw new ToolkitError(generalErrorMessage + message, errorInfo)
+    }
+
+    private async checkForInstanceStatusError(selection: Ec2Selection): Promise<void> {
+        const isInstanceRunning = await this.isInstanceRunning(selection.instanceId)
+
+        if (!isInstanceRunning) {
+            const message = 'Ensure the target instance is running.'
+            this.throwConnectionError(message, selection, { code: 'EC2SSMStatus' })
+        }
+    }
+
+    private async checkForInstancePermissionsError(selection: Ec2Selection): Promise<void> {
+        const IamRole = await this.getAttachedIamRole(selection.instanceId)
+
+        if (!IamRole) {
+            const message = `No IAM role attached to instance: ${selection.instanceId}`
+            this.throwConnectionError(message, selection, {
+                code: 'EC2SSMPermission',
+                documentationUri: this.policyDocumentationUri,
+            })
+        }
+
+        const hasPermission = await this.hasProperPermissions(IamRole!.Arn)
+
+        if (!hasPermission) {
+            const policiesAdded = await promptToAddInlinePolicy(this.iamClient, IamRole!.Arn!)
+
+            if (!policiesAdded) {
+                throw new CancellationError('user')
+            }
+        }
+    }
+
+    public async checkForInstanceSsmError(
+        selection: Ec2Selection,
+        options?: Partial<{ interval: number; timeout: number }>
+    ): Promise<void> {
+        const isSsmAgentRunning = await waitUntil(
+            async () => (await this.ssm.getInstanceAgentPingStatus(selection.instanceId)) === 'Online',
+            { interval: options?.interval ?? 500, timeout: options?.timeout ?? 5000 }
+        )
+
+        if (!isSsmAgentRunning) {
+            this.throwConnectionError('Is SSM Agent running on the target instance?', selection, {
+                code: 'EC2SSMAgentStatus',
+                documentationUri: this.ssmAgentDocumentationUri,
+            })
+        }
+    }
+
+    public async checkForStartSessionError(selection: Ec2Selection): Promise<void> {
+        await this.checkForInstanceStatusError(selection)
+
+        await this.checkForInstancePermissionsError(selection)
+
+        await this.checkForInstanceSsmError(selection)
+    }
+
+    private async openSessionInTerminal(session: Session, selection: Ec2Selection) {
+        const ssmPlugin = await getOrInstallCli('session-manager-plugin', !isCloud9)
+        const shellArgs = [JSON.stringify(session), selection.region, 'StartSession']
+        const terminalOptions = {
+            name: `${selection.region}/${selection.instanceId}`,
+            shellPath: ssmPlugin,
+            shellArgs: shellArgs,
+        }
+
+        await openRemoteTerminal(terminalOptions, () => this.ssm.terminateSession(session)).catch((err) => {
+            throw ToolkitError.chain(err, 'Failed to open ec2 instance.')
+        })
+    }
+
+    public async attemptToOpenEc2Terminal(selection: Ec2Selection): Promise<void> {
+        await this.checkForStartSessionError(selection)
+        try {
+            const response = await this.ssm.startSession(selection.instanceId)
+            await this.openSessionInTerminal(response, selection)
+        } catch (err: unknown) {
+            this.throwConnectionError('', selection, err as Error)
+        }
+    }
+
+    public async tryOpenRemoteConnection(selection: Ec2Selection): Promise<void> {
+        await this.checkForStartSessionError(selection)
+
+        const remoteUser = await this.getRemoteUser(selection.instanceId)
+        const remoteEnv = await this.prepareEc2RemoteEnvWithProgress(selection, remoteUser)
+        const testSession = await this.ssm.startSession(selection.instanceId, 'AWS-StartSSHSession')
+        try {
+            await testSshConnection(
+                remoteEnv.SessionProcess,
+                remoteEnv.hostname,
+                remoteEnv.sshPath,
+                remoteUser.name,
+                testSession
+            )
+            await startVscodeRemote(
+                remoteEnv.SessionProcess,
+                remoteEnv.hostname,
+                '/',
+                remoteEnv.vscPath,
+                remoteUser.name
+            )
+        } catch (err) {
+            const message = err instanceof SshError ? `Testing SSM connection to instance failed: ${err.message}` : ''
+            this.throwConnectionError(message, selection, { ...(err as Error), code: 'EC2SSMTestConnect' })
+        } finally {
+            await this.ssm.terminateSession(testSession)
+        }
+    }
+
+    public async prepareEc2RemoteEnvWithProgress(
+        selection: Ec2Selection,
+        remoteUser: RemoteUser
+    ): Promise<Ec2RemoteEnv> {
+        const timeout = new Timeout(60000)
+        await showMessageWithCancel('AWS: Opening remote connection...', timeout)
+        const remoteEnv = await this.prepareEc2RemoteEnv(selection, remoteUser).finally(() => timeout.cancel())
+        return remoteEnv
+    }
+
+    private async startSSMSession(instanceId: string): Promise<StartSessionResponse> {
+        const ssmSession = await this.ssm.startSession(instanceId, 'AWS-StartSSHSession')
+        await this.addActiveSession(instanceId, ssmSession.SessionId!)
+        return ssmSession
+    }
+
+    public async prepareEc2RemoteEnv(selection: Ec2Selection, remoteUser: RemoteUser): Promise<Ec2RemoteEnv> {
+        const logger = this.configureRemoteConnectionLogger(selection.instanceId)
+        const { ssm, vsc, ssh } = (await ensureDependencies()).unwrap()
+        const keyPair = await this.configureSshKeys(selection, remoteUser)
+        const hostnamePrefix = 'aws-ec2-'
+        const hostname = `${hostnamePrefix}${selection.instanceId}`
+        const sshConfig = new SshConfig(ssh, hostnamePrefix, 'ec2_connect', keyPair.getPrivateKeyPath())
+
+        const config = await sshConfig.ensureValid()
+        if (config.isErr()) {
+            const err = config.err()
+            getLogger().error(`ec2: failed to add ssh config section: ${err.message}`)
+
+            throw err
+        }
+
+        const ssmSession = await this.startSSMSession(selection.instanceId)
+
+        const vars = getEc2SsmEnv(selection, ssm, ssmSession)
+        getLogger().debug(`ec2: connect script logs at ${vars.LOG_FILE_LOCATION}`)
+
+        const envProvider = async () => {
+            return { [sshAgentSocketVariable]: await startSshAgent(), ...vars }
+        }
+        const SessionProcess = createBoundProcess(envProvider).extend({
+            onStdout: logger,
+            onStderr: logger,
+            rejectOnErrorCode: true,
+        })
+
+        return {
+            hostname,
+            envProvider,
+            sshPath: ssh,
+            vscPath: vsc,
+            SessionProcess,
+            selection,
+            keyPair,
+            ssmSession,
+        }
+    }
+
+    private configureRemoteConnectionLogger(instanceId: string) {
+        const logPrefix = `ec2 (${instanceId})`
+        const logger = (data: string) => getLogger().verbose(`${logPrefix}: ${data}`)
+        return logger
+    }
+
+    public async configureSshKeys(selection: Ec2Selection, remoteUser: RemoteUser): Promise<SshKeyPair> {
+        const keyPair = await SshKeyPair.getSshKeyPair(`aws-ec2-key`, 30000)
+        await this.sendSshKeyToInstance(selection, keyPair, remoteUser)
+        return keyPair
+    }
+
+    /** Removes old key(s) that we added to the remote ~/.ssh/authorized_keys file. */
+    public async tryCleanKeys(
+        instanceId: string,
+        hintComment: string,
+        hostOS: Ec2OS,
+        remoteAuthorizedKeysPath: string
+    ) {
+        try {
+            const deleteExistingKeyCommand = getRemoveLinesCommand(hintComment, hostOS, remoteAuthorizedKeysPath)
+            await this.sendCommandAndWait(instanceId, deleteExistingKeyCommand)
+        } catch (e) {
+            getLogger().warn(`ec2: failed to clean keys: %O`, e)
+        }
+    }
+
+    private async sendCommandAndWait(instanceId: string, command: string) {
+        return await this.ssm.sendCommandAndWait(instanceId, 'AWS-RunShellScript', {
+            commands: [command],
+        })
+    }
+
+    public async sendSshKeyToInstance(
+        selection: Ec2Selection,
+        sshKeyPair: SshKeyPair,
+        remoteUser: RemoteUser
+    ): Promise<void> {
+        const sshPubKey = await sshKeyPair.getPublicKey()
+        const hintComment = '#AWSToolkitForVSCode'
+
+        const remoteAuthorizedKeysPath = `/home/${remoteUser.name}/.ssh/authorized_keys`
+
+        const appendStr = (s: string) => `echo "${s}" >> ${remoteAuthorizedKeysPath}`
+        const writeKeyCommand = appendStr([sshPubKey.replace('\n', ''), hintComment].join(' '))
+
+        await this.tryCleanKeys(selection.instanceId, hintComment, remoteUser.os, remoteAuthorizedKeysPath)
+        await this.sendCommandAndWait(selection.instanceId, writeKeyCommand)
+    }
+
+    public async getRemoteUser(instanceId: string): Promise<RemoteUser> {
+        const os = await this.ssm.getTargetPlatformName(instanceId)
+        if (os === 'Amazon Linux') {
+            return { name: 'ec2-user', os }
+        }
+
+        if (os === 'Ubuntu') {
+            return { name: 'ubuntu', os }
+        }
+
+        throw new ToolkitError(`Unrecognized OS name ${os} on instance ${instanceId}`, { code: 'UnknownEc2OS' })
+    }
+}
+
+/**
+ * Generate bash command (as string) to remove lines containing `pattern`.
+ * @param pattern pattern for deleted lines.
+ * @param filepath filepath (as string) to target with the command.
+ * @returns bash command to remove lines from file.
+ */
+export function getRemoveLinesCommand(pattern: string, hostOS: Ec2OS, filepath: string): string {
+    if (pattern.includes('/')) {
+        throw new ToolkitError(`ec2: cannot match pattern containing '/', given: ${pattern}`)
+    }
+    // Linux allows not passing extension to -i, whereas macOS requires zero length extension.
+    return `sed -i${isLinux(hostOS) ? '' : " ''"} /${pattern}/d ${filepath}`
+}
+
+function isLinux(os: Ec2OS): boolean {
+    return os === 'Amazon Linux' || os === 'Ubuntu'
+}
diff --git a/packages/core/src/awsService/ec2/prompter.ts b/packages/core/src/awsService/ec2/prompter.ts
new file mode 100644
index 00000000000..64d96e00f51
--- /dev/null
+++ b/packages/core/src/awsService/ec2/prompter.ts
@@ -0,0 +1,88 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { RegionSubmenu, RegionSubmenuResponse } from '../../shared/ui/common/regionSubmenu'
+import { DataQuickPickItem } from '../../shared/ui/pickerPrompter'
+import { Ec2Client, Ec2Instance } from '../../shared/clients/ec2'
+import { isValidResponse } from '../../shared/wizards/wizard'
+import { CancellationError } from '../../shared/utilities/timeoutUtils'
+import { getIconCode } from './utils'
+import { Ec2Node } from './explorer/ec2ParentNode'
+import { Ec2InstanceNode } from './explorer/ec2InstanceNode'
+import { AsyncCollection } from '../../shared/utilities/asyncCollection'
+
+export type InstanceFilter = (instance: Ec2Instance) => boolean
+export interface Ec2Selection {
+    instanceId: string
+    region: string
+}
+
+interface Ec2PrompterOptions {
+    instanceFilter: InstanceFilter
+    getInstancesFromRegion: (regionCode: string) => AsyncCollection<Ec2Instance[]>
+}
+
+export class Ec2Prompter {
+    protected instanceFilter: InstanceFilter
+    protected getInstancesFromRegion: (regionCode: string) => AsyncCollection<Ec2Instance[]>
+
+    public constructor(options?: Partial<Ec2PrompterOptions>) {
+        this.instanceFilter = options?.instanceFilter ?? ((_) => true)
+        this.getInstancesFromRegion =
+            options?.getInstancesFromRegion ?? ((regionCode: string) => new Ec2Client(regionCode).getInstances())
+    }
+
+    public static getLabel(instance: Ec2Instance) {
+        const icon = `$(${getIconCode(instance)})`
+        return `${instance.Name ?? '(no name)'} \t ${icon} ${instance.LastSeenStatus.toUpperCase()}`
+    }
+
+    public static asQuickPickItem(instance: Ec2Instance): DataQuickPickItem<string> {
+        return {
+            label: Ec2Prompter.getLabel(instance),
+            detail: instance.InstanceId,
+            data: instance.InstanceId,
+        }
+    }
+
+    public static getSelectionFromResponse(response: RegionSubmenuResponse<string>): Ec2Selection {
+        return {
+            instanceId: response.data,
+            region: response.region,
+        }
+    }
+
+    public async promptUser(): Promise<Ec2Selection> {
+        const prompter = this.createEc2ConnectPrompter()
+        const response = await prompter.prompt()
+
+        if (isValidResponse(response)) {
+            return Ec2Prompter.getSelectionFromResponse(response)
+        } else {
+            throw new CancellationError('user')
+        }
+    }
+
+    public getInstancesAsQuickPickItems(region: string): AsyncIterable<DataQuickPickItem<string>[]> {
+        return this.getInstancesFromRegion(region).map((instancePage: Ec2Instance[]) =>
+            instancePage.filter(this.instanceFilter).map((i) => Ec2Prompter.asQuickPickItem(i))
+        )
+    }
+
+    private createEc2ConnectPrompter(): RegionSubmenu<string> {
+        return new RegionSubmenu(
+            (region) => this.getInstancesAsQuickPickItems(region),
+            { title: 'Select EC2 Instance', matchOnDetail: true },
+            { title: 'Select Region for EC2 Instance' },
+            'Instances'
+        )
+    }
+}
+
+export async function getSelection(node?: Ec2Node, instanceFilter?: InstanceFilter): Promise<Ec2Selection> {
+    const prompter = new Ec2Prompter({ instanceFilter })
+    const selection = node && node instanceof Ec2InstanceNode ? node.toSelection() : await prompter.promptUser()
+    return selection
+}
diff --git a/packages/core/src/awsService/ec2/remoteSessionManager.ts b/packages/core/src/awsService/ec2/remoteSessionManager.ts
new file mode 100644
index 00000000000..12cc77ba617
--- /dev/null
+++ b/packages/core/src/awsService/ec2/remoteSessionManager.ts
@@ -0,0 +1,40 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { SsmClient } from '../../shared/clients/ssm'
+import { Disposable } from 'vscode'
+
+export class Ec2SessionTracker extends Map<string, string> implements Disposable {
+    public constructor(
+        readonly regionCode: string,
+        protected ssm: SsmClient
+    ) {
+        super()
+    }
+
+    public async addSession(instanceId: string, sessionId: string): Promise<void> {
+        if (this.isConnectedTo(instanceId)) {
+            const existingSessionId = this.get(instanceId)!
+            await this.ssm.terminateSessionFromId(existingSessionId)
+            this.set(instanceId, sessionId)
+        } else {
+            this.set(instanceId, sessionId)
+        }
+    }
+
+    private async disconnectEnv(instanceId: string): Promise<void> {
+        await this.ssm.terminateSessionFromId(this.get(instanceId)!)
+        this.delete(instanceId)
+    }
+
+    public async dispose(): Promise<void> {
+        // eslint-disable-next-line unicorn/no-array-for-each
+        this.forEach(async (_sessionId, instanceId) => await this.disconnectEnv(instanceId))
+    }
+
+    public isConnectedTo(instanceId: string): boolean {
+        return this.has(instanceId)
+    }
+}
diff --git a/packages/core/src/awsService/ec2/sshKeyPair.ts b/packages/core/src/awsService/ec2/sshKeyPair.ts
new file mode 100644
index 00000000000..75e1426bf26
--- /dev/null
+++ b/packages/core/src/awsService/ec2/sshKeyPair.ts
@@ -0,0 +1,134 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import os from 'os'
+import globals from '../../shared/extensionGlobals'
+import { fs } from '../../shared/fs/fs'
+import { ToolkitError } from '../../shared/errors'
+import { tryRun } from '../../shared/utilities/pathFind'
+import { Timeout } from '../../shared/utilities/timeoutUtils'
+import { findAsync } from '../../shared/utilities/collectionUtils'
+import { RunParameterContext } from '../../shared/utilities/processUtils'
+import path from 'path'
+
+type sshKeyType = 'rsa' | 'ed25519'
+
+export class SshKeyPair {
+    private publicKeyPath: string
+    private lifeTimeout: Timeout
+
+    private constructor(
+        private readonly keyPath: string,
+        lifetime: number
+    ) {
+        this.publicKeyPath = `${this.keyPath}.pub`
+        this.lifeTimeout = new Timeout(lifetime)
+
+        this.lifeTimeout.onCompletion(async () => {
+            await this.delete()
+        })
+    }
+
+    private static getKeypath(keyName: string): string {
+        return path.join(globals.context.globalStorageUri.fsPath, keyName)
+    }
+
+    public static async getSshKeyPair(keyName: string, lifetime: number) {
+        const keyPath = SshKeyPair.getKeypath(keyName)
+        await SshKeyPair.generateSshKeyPair(keyPath)
+        return new SshKeyPair(keyPath, lifetime)
+    }
+
+    private static isValidKeyPath(keyPath: string): boolean {
+        const relative = path.relative(globals.context.globalStorageUri.fsPath, keyPath)
+        return relative !== undefined && !relative.startsWith('..') && !path.isAbsolute(relative) && keyPath.length > 4
+    }
+
+    private static assertValidKeypath(keyPath: string, message: string): void | never {
+        if (!SshKeyPair.isValidKeyPath(keyPath)) {
+            throw new ToolkitError(message)
+        }
+    }
+
+    private static async assertGenerated(keyPath: string, keyGenerated: boolean): Promise<never | void> {
+        if (!keyGenerated) {
+            throw new ToolkitError('ec2: Unable to generate ssh key pair with either ed25519 or rsa')
+        }
+
+        if (!(await fs.exists(keyPath))) {
+            throw new ToolkitError(`ec2: Failed to generate keys, resulting key not found at ${keyPath}`)
+        }
+    }
+
+    public static async generateSshKeyPair(keyPath: string): Promise<void> {
+        const keyGenerated = await SshKeyPair.tryKeyTypes(keyPath, ['ed25519', 'rsa'])
+        // Should already be the case, but just in case we assert permissions.
+        // skip on Windows since it only allows write permission to be changed.
+        if (!globals.isWeb && os.platform() !== 'win32') {
+            await fs.chmod(keyPath, 0o600)
+            await SshKeyPair.assertGenerated(keyPath, keyGenerated)
+        }
+    }
+    /**
+     * Attempts to generate an ssh key pair. Returns true if successful, false otherwise.
+     * @param keyPath where to generate key.
+     * @param keyType type of key to generate.
+     */
+    public static async tryKeyGen(keyPath: string, keyType: sshKeyType): Promise<boolean> {
+        const overrideKeys = async (_t: string, proc: RunParameterContext) => {
+            await proc.send('yes')
+        }
+        return await tryRun(
+            'ssh-keygen',
+            ['-t', keyType, '-N', '', '-q', '-f', keyPath],
+            'yes',
+            /^(?!.*Unknown key type).*/i,
+            {
+                onStdout: overrideKeys,
+                timeout: new Timeout(5000),
+            }
+        )
+    }
+
+    public static async tryKeyTypes(keyPath: string, keyTypes: sshKeyType[]): Promise<boolean> {
+        const keyTypeUsed = await findAsync(keyTypes, async (type) => await this.tryKeyGen(keyPath, type))
+        return keyTypeUsed !== undefined
+    }
+
+    public getPublicKeyPath(): string {
+        return this.publicKeyPath
+    }
+
+    public getPrivateKeyPath(): string {
+        return this.keyPath
+    }
+
+    public async getPublicKey(): Promise<string> {
+        const contents = await fs.readFileText(this.publicKeyPath)
+        return contents
+    }
+
+    public async delete(): Promise<void> {
+        SshKeyPair.assertValidKeypath(
+            this.keyPath,
+            `ec2: keyPath became invalid after creation, not deleting key at ${this.keyPath}`
+        )
+        await fs.delete(this.keyPath, { force: true })
+        await fs.delete(this.publicKeyPath, { force: true })
+
+        if (!this.lifeTimeout.completed) {
+            this.lifeTimeout.cancel()
+        }
+    }
+
+    public async isDeleted(): Promise<boolean> {
+        const privateKeyDeleted = !(await fs.existsFile(this.getPrivateKeyPath()))
+        const publicKeyDeleted = !(await fs.existsFile(this.getPublicKeyPath()))
+        return privateKeyDeleted || publicKeyDeleted
+    }
+
+    public timeAlive(): number {
+        return this.lifeTimeout.elapsedTime
+    }
+}
diff --git a/packages/core/src/awsService/ec2/utils.ts b/packages/core/src/awsService/ec2/utils.ts
new file mode 100644
index 00000000000..a86f358eab9
--- /dev/null
+++ b/packages/core/src/awsService/ec2/utils.ts
@@ -0,0 +1,50 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Ec2Instance } from '../../shared/clients/ec2'
+import { copyToClipboard } from '../../shared/utilities/messages'
+import { Ec2Selection } from './prompter'
+import { sshLogFileLocation } from '../../shared/sshConfig'
+import { StartSessionResponse } from '@aws-sdk/client-ssm'
+import { getLogger } from '../../shared/logger/logger'
+
+export function getIconCode(instance: Ec2Instance) {
+    if (instance.LastSeenStatus === 'running') {
+        return 'pass'
+    }
+
+    if (instance.LastSeenStatus === 'stopped') {
+        return 'circle-slash'
+    }
+
+    if (instance.LastSeenStatus === 'terminated') {
+        return 'stop'
+    }
+
+    return 'loading~spin'
+}
+
+export async function copyInstanceId(instanceId: string): Promise<void> {
+    await copyToClipboard(instanceId, 'Id')
+}
+
+export function getEc2SsmEnv(
+    selection: Ec2Selection,
+    ssmPath: string,
+    session: StartSessionResponse
+): NodeJS.ProcessEnv {
+    return Object.assign(
+        {
+            AWS_REGION: selection.region,
+            AWS_SSM_CLI: ssmPath,
+            LOG_FILE_LOCATION: sshLogFileLocation('ec2', selection.instanceId),
+            STREAM_URL: session.StreamUrl,
+            SESSION_ID: session.SessionId,
+            TOKEN: session.TokenValue,
+            DEBUG_LOG: getLogger().logLevelEnabled('debug') ? 1 : 0,
+        },
+        process.env
+    )
+}
diff --git a/packages/core/src/awsService/ecr/activation.ts b/packages/core/src/awsService/ecr/activation.ts
new file mode 100644
index 00000000000..e690d298c9f
--- /dev/null
+++ b/packages/core/src/awsService/ecr/activation.ts
@@ -0,0 +1,38 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { copyTagUri } from './commands/copyTagUri'
+import { copyRepositoryUri } from './commands/copyRepositoryUri'
+import { createRepository } from './commands/createRepository'
+import { deleteRepository } from './commands/deleteRepository'
+import { EcrNode } from './explorer/ecrNode'
+import { EcrRepositoryNode } from './explorer/ecrRepositoryNode'
+import { EcrTagNode } from './explorer/ecrTagNode'
+import { deleteTag } from './commands/deleteTag'
+import { Commands } from '../../shared/vscode/commands2'
+
+/**
+ * Activates ECR components.
+ */
+export async function activate(extensionContext: vscode.ExtensionContext): Promise<void> {
+    extensionContext.subscriptions.push(
+        Commands.register('aws.ecr.createRepository', async (node: EcrNode) => {
+            await createRepository(node)
+        }),
+        Commands.register('aws.ecr.deleteRepository', async (node: EcrRepositoryNode) => {
+            await deleteRepository(node)
+        }),
+        Commands.register('aws.ecr.copyRepositoryUri', async (node: EcrRepositoryNode) => {
+            await copyRepositoryUri(node)
+        }),
+        Commands.register('aws.ecr.copyTagUri', async (node: EcrTagNode) => {
+            await copyTagUri(node)
+        }),
+        Commands.register('aws.ecr.deleteTag', async (node: EcrTagNode) => {
+            await deleteTag(node)
+        })
+    )
+}
diff --git a/packages/core/src/awsService/ecr/commands/copyRepositoryUri.ts b/packages/core/src/awsService/ecr/commands/copyRepositoryUri.ts
new file mode 100644
index 00000000000..87e37d13a6c
--- /dev/null
+++ b/packages/core/src/awsService/ecr/commands/copyRepositoryUri.ts
@@ -0,0 +1,14 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { copyToClipboard } from '../../../shared/utilities/messages'
+import { EcrRepositoryNode } from '../explorer/ecrRepositoryNode'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+
+export async function copyRepositoryUri(node: EcrRepositoryNode): Promise<void> {
+    const uri = node.repository.repositoryUri
+    await copyToClipboard(uri, 'URI')
+    telemetry.ecr_copyRepositoryUri.emit()
+}
diff --git a/packages/core/src/awsService/ecr/commands/copyTagUri.ts b/packages/core/src/awsService/ecr/commands/copyTagUri.ts
new file mode 100644
index 00000000000..21b71cb4476
--- /dev/null
+++ b/packages/core/src/awsService/ecr/commands/copyTagUri.ts
@@ -0,0 +1,14 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { EcrTagNode } from '../explorer/ecrTagNode'
+import { copyToClipboard } from '../../../shared/utilities/messages'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+
+export async function copyTagUri(node: EcrTagNode): Promise<void> {
+    const uri = `${node.repository.repositoryUri}:${node.tag}`
+    await copyToClipboard(uri, 'URI')
+    telemetry.ecr_copyTagUri.emit()
+}
diff --git a/packages/core/src/awsService/ecr/commands/createRepository.ts b/packages/core/src/awsService/ecr/commands/createRepository.ts
new file mode 100644
index 00000000000..d2c75ff3c46
--- /dev/null
+++ b/packages/core/src/awsService/ecr/commands/createRepository.ts
@@ -0,0 +1,47 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../../../shared/logger/logger'
+import { EcrNode } from '../explorer/ecrNode'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { showViewLogsMessage } from '../../../shared/utilities/messages'
+import { validateRepositoryName } from '../utils'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+
+export async function createRepository(node: EcrNode): Promise<void> {
+    getLogger().debug('createRepository called for %O', node)
+
+    const repositoryName = await vscode.window.showInputBox({
+        prompt: localize('AWS.ecr.createRepository.prompt', 'Enter a new repository name'),
+        placeHolder: localize('AWS.ecr.createRepository.placeHolder', 'Repository Name'),
+        validateInput: validateRepositoryName,
+    })
+
+    if (!repositoryName) {
+        getLogger().info('createRepository cancelled')
+        telemetry.ecr_createRepository.emit({ result: 'Cancelled' })
+        return
+    }
+
+    getLogger().info(`Creating repository ${repositoryName}`)
+    try {
+        const repository = await node.createRepository(repositoryName)
+
+        getLogger().info('created repository: %O', repository)
+        void vscode.window.showInformationMessage(
+            localize('AWS.ecr.createRepository.success', 'Created repository: {0}', repositoryName)
+        )
+        telemetry.ecr_createRepository.emit({ result: 'Succeeded' })
+    } catch (e) {
+        getLogger().error(`Failed to create repository ${repositoryName}: %s`, e)
+        void showViewLogsMessage(
+            localize('AWS.ecr.createRepository.failure', 'Failed to create repository: {0}', repositoryName)
+        )
+        telemetry.ecr_createRepository.emit({ result: 'Failed' })
+    } finally {
+        await vscode.commands.executeCommand('aws.refreshAwsExplorerNode', node)
+    }
+}
diff --git a/packages/core/src/awsService/ecr/commands/deleteRepository.ts b/packages/core/src/awsService/ecr/commands/deleteRepository.ts
new file mode 100644
index 00000000000..ec14841d0d6
--- /dev/null
+++ b/packages/core/src/awsService/ecr/commands/deleteRepository.ts
@@ -0,0 +1,55 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../../../shared/logger/logger'
+import { EcrRepositoryNode } from '../explorer/ecrRepositoryNode'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { showViewLogsMessage } from '../../../shared/utilities/messages'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+
+export async function deleteRepository(node: EcrRepositoryNode): Promise<void> {
+    getLogger().debug('DeleteRepository called for %O', node)
+
+    const repositoryName = node.repository.repositoryName
+
+    const isConfirmed = await showConfirmationDialog(repositoryName)
+    if (!isConfirmed) {
+        getLogger().info('DeleteRepository cancelled')
+        telemetry.ecr_deleteRepository.emit({ result: 'Cancelled' })
+        return
+    }
+
+    getLogger().info(`Deleting repository ${repositoryName}`)
+    try {
+        await node.deleteRepository()
+
+        getLogger().info(`deleted repository: ${repositoryName}`)
+
+        void vscode.window.showInformationMessage(
+            localize('AWS.ecr.deleteRepository.success', 'Deleted repository: {0}', repositoryName)
+        )
+        telemetry.ecr_deleteRepository.emit({ result: 'Succeeded' })
+    } catch (e) {
+        getLogger().error(`Failed to delete repository ${repositoryName}: %s`, e)
+        void showViewLogsMessage(
+            localize('AWS.ecr.deleteRepository.failure', 'Failed to delete repository: {0}', repositoryName)
+        )
+        telemetry.ecr_deleteRepository.emit({ result: 'Failed' })
+    } finally {
+        await vscode.commands.executeCommand('aws.refreshAwsExplorerNode', node.parent)
+    }
+}
+
+async function showConfirmationDialog(repositoryName: string): Promise<boolean> {
+    const prompt = localize('AWS.s3.deleteBucket.prompt', 'Enter {0} to confirm deletion', repositoryName)
+    const confirmationInput = await vscode.window.showInputBox({
+        prompt,
+        placeHolder: repositoryName,
+        validateInput: (input) => (input !== repositoryName ? prompt : undefined),
+    })
+
+    return confirmationInput === repositoryName
+}
diff --git a/packages/core/src/awsService/ecr/commands/deleteTag.ts b/packages/core/src/awsService/ecr/commands/deleteTag.ts
new file mode 100644
index 00000000000..a037db0934b
--- /dev/null
+++ b/packages/core/src/awsService/ecr/commands/deleteTag.ts
@@ -0,0 +1,58 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { EcrTagNode } from '../explorer/ecrTagNode'
+import { getLogger } from '../../../shared/logger/logger'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { showConfirmationMessage, showViewLogsMessage } from '../../../shared/utilities/messages'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+
+export async function deleteTag(node: EcrTagNode): Promise<void> {
+    getLogger().debug('deleteTag called for %O', node)
+    const ok = await showConfirmationMessage({
+        prompt: localize(
+            'AWS.ecr.deleteTag.prompt',
+            'Are you sure you want to delete tag {0} from repository {1}',
+            node.tag,
+            node.repository.repositoryName
+        ),
+        confirm: localize('AWS.generic.delete', 'Delete'),
+        cancel: localize('AWS.generic.cancel', 'Cancel'),
+    })
+    if (!ok) {
+        getLogger().info(`Cancelled delete tag ${node.tag} from repository ${node.repository.repositoryName}`)
+        telemetry.ecr_deleteTags.emit({ result: 'Cancelled', value: 1 })
+        return
+    }
+    try {
+        await node.deleteTag()
+
+        getLogger().info(`Successfully deleted tag ${node.tag} from repository ${node.repository.repositoryName}`)
+
+        void vscode.window.showInformationMessage(
+            localize(
+                'AWS.ecr.deleteTag.success',
+                'Deleted tag {0} from repository {1}',
+                node.tag,
+                node.repository.repositoryName
+            )
+        )
+        telemetry.ecr_deleteTags.emit({ result: 'Succeeded', value: 1 })
+    } catch (e) {
+        getLogger().error(`Failed to delete tag ${node.tag} from repository ${node.repository.repositoryName}: %s`, e)
+        void showViewLogsMessage(
+            localize(
+                'AWS.ecr.deleteTag.failure',
+                'Failed to delete tag {0} from repository {1}',
+                node.tag,
+                node.repository.repositoryName
+            )
+        )
+        telemetry.ecr_deleteTags.emit({ result: 'Failed', value: 1 })
+    } finally {
+        await vscode.commands.executeCommand('aws.refreshAwsExplorerNode', node.parent)
+    }
+}
diff --git a/packages/core/src/awsService/ecr/explorer/ecrNode.ts b/packages/core/src/awsService/ecr/explorer/ecrNode.ts
new file mode 100644
index 00000000000..a4a0279a289
--- /dev/null
+++ b/packages/core/src/awsService/ecr/explorer/ecrNode.ts
@@ -0,0 +1,47 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
+import { makeChildrenNodes } from '../../../shared/treeview/utils'
+import { toArrayAsync } from '../../../shared/utilities/collectionUtils'
+import { inspect } from 'util'
+import { EcrClient } from '../../../shared/clients/ecrClient'
+import { EcrRepositoryNode } from './ecrRepositoryNode'
+
+/**
+ * An AWS Explorer node representing S3.
+ *
+ * Contains buckets for a specific region as child nodes.
+ */
+export class EcrNode extends AWSTreeNodeBase {
+    public constructor(private readonly ecr: EcrClient) {
+        super('ECR', vscode.TreeItemCollapsibleState.Collapsed)
+        this.contextValue = 'awsEcrNode'
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        return await makeChildrenNodes({
+            getChildNodes: async () => {
+                const response = await toArrayAsync(this.ecr.describeRepositories())
+
+                return response.map((item) => new EcrRepositoryNode(this, this.ecr, item))
+            },
+            getNoChildrenPlaceholderNode: async () =>
+                new PlaceholderNode(this, localize('AWS.explorerNode.ecr.noRepositories', '[No repositories found]')),
+            sort: (item1, item2) => item1.repository.repositoryName.localeCompare(item2.repository.repositoryName),
+        })
+    }
+
+    public async createRepository(repositoryName: string): Promise<void> {
+        await this.ecr.createRepository(repositoryName)
+    }
+
+    public [inspect.custom](): string {
+        return 'ECRNode'
+    }
+}
diff --git a/packages/core/src/awsService/ecr/explorer/ecrRepositoryNode.ts b/packages/core/src/awsService/ecr/explorer/ecrRepositoryNode.ts
new file mode 100644
index 00000000000..8f4d9960607
--- /dev/null
+++ b/packages/core/src/awsService/ecr/explorer/ecrRepositoryNode.ts
@@ -0,0 +1,51 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { AWSResourceNode } from '../../../shared/treeview/nodes/awsResourceNode'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { EcrNode } from './ecrNode'
+import { EcrClient, EcrRepository } from '../../../shared/clients/ecrClient'
+
+import { makeChildrenNodes } from '../../../shared/treeview/utils'
+import { toArrayAsync } from '../../../shared/utilities/collectionUtils'
+import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { EcrTagNode } from './ecrTagNode'
+import { getIcon } from '../../../shared/icons'
+
+export class EcrRepositoryNode extends AWSTreeNodeBase implements AWSResourceNode {
+    name: string = this.repository.repositoryName
+    arn: string = this.repository.repositoryArn
+    public override readonly regionCode: string
+
+    constructor(
+        public readonly parent: EcrNode,
+        private readonly ecr: EcrClient,
+        public readonly repository: EcrRepository
+    ) {
+        super(repository.repositoryName, vscode.TreeItemCollapsibleState.Collapsed)
+        this.iconPath = getIcon('aws-ecr-registry')
+        this.contextValue = 'awsEcrRepositoryNode'
+        this.regionCode = ecr.regionCode
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        return await makeChildrenNodes({
+            getChildNodes: async () => {
+                const response = await toArrayAsync(this.ecr.describeTags(this.repository.repositoryName))
+
+                return response.map((item) => new EcrTagNode(this, this.ecr, this.repository, item))
+            },
+            getNoChildrenPlaceholderNode: async () =>
+                new PlaceholderNode(this, localize('AWS.explorerNode.ecr.noTags', '[No tags found]')),
+            sort: (item1, item2) => item1.tag.localeCompare(item2.tag),
+        })
+    }
+
+    public async deleteRepository(): Promise<void> {
+        await this.ecr.deleteRepository(this.repository.repositoryName)
+    }
+}
diff --git a/src/ecr/explorer/ecrTagNode.ts b/packages/core/src/awsService/ecr/explorer/ecrTagNode.ts
similarity index 75%
rename from src/ecr/explorer/ecrTagNode.ts
rename to packages/core/src/awsService/ecr/explorer/ecrTagNode.ts
index fe0befb5520..88b0357b61a 100644
--- a/src/ecr/explorer/ecrTagNode.ts
+++ b/packages/core/src/awsService/ecr/explorer/ecrTagNode.ts
@@ -1,11 +1,11 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as vscode from 'vscode'
-import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
-import { EcrClient, EcrRepository } from '../../shared/clients/ecrClient'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { EcrClient, EcrRepository } from '../../../shared/clients/ecrClient'
 import { EcrRepositoryNode } from './ecrRepositoryNode'
 
 export class EcrTagNode extends AWSTreeNodeBase {
diff --git a/packages/core/src/awsService/ecr/utils.ts b/packages/core/src/awsService/ecr/utils.ts
new file mode 100644
index 00000000000..64f46e4856e
--- /dev/null
+++ b/packages/core/src/awsService/ecr/utils.ts
@@ -0,0 +1,37 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { localize } from '../../shared/utilities/vsCodeUtils'
+
+/**
+ * Validates an ECR repository name. There are actually more rules, but they aren't documented, so
+ * let the service fail the creation if one of the more complicated rules is violated
+ *
+ * @see https://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_Repository.html
+ * @returns undefined if the name passes validation. Otherwise, a localized error message is returned.
+ */
+export function validateRepositoryName(name: string): string | undefined {
+    if (!/^[a-z]/.test(name)) {
+        return localize(
+            'AWS.ecr.validateRepoName.error.invalidStart',
+            'Repository name must start with a lowercase letter'
+        )
+    }
+
+    if (!/^[a-z0-9\-_/]+$/.test(name)) {
+        return localize(
+            'AWS.ecr.validateRepoName.error.invalidCharacters',
+            'Repository name must only contain lowercase letters, numbers, hyphens, underscores, and forward slashes'
+        )
+    }
+
+    // See the APIReference document above for the source of this. ^ and $ added to make sure
+    // it matches the whole string
+    if (!/^(?:[a-z0-9]+(?:[._-][a-z0-9]+)*\/)*[a-z0-9]+(?:[._-][a-z0-9]+)*$/.test(name)) {
+        return localize('AWS.ecr.validateRepoName.error.invalidString', 'Invalid repository name')
+    }
+
+    return undefined
+}
diff --git a/packages/core/src/awsService/ecs/activation.ts b/packages/core/src/awsService/ecs/activation.ts
new file mode 100644
index 00000000000..bd0dbe7069b
--- /dev/null
+++ b/packages/core/src/awsService/ecs/activation.ts
@@ -0,0 +1,36 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { ExtContext } from '../../shared/extensions'
+import { ecsDocumentationUrl } from '../../shared/constants'
+import { Commands } from '../../shared/vscode/commands2'
+import { openTaskInTerminal, runCommandInContainer, toggleExecuteCommandFlag } from './commands'
+import { getResourceFromTreeNode } from '../../shared/treeview/utils'
+import { Instance } from '../../shared/utilities/typeConstructors'
+import { Service } from './model'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { openUrl } from '../../shared/utilities/vsCodeUtils'
+
+export async function activate(ctx: ExtContext): Promise<void> {
+    ctx.extensionContext.subscriptions.push(runCommandInContainer.register(), openTaskInTerminal.register())
+    ctx.extensionContext.subscriptions.push(
+        Commands.register('aws.ecs.enableEcsExec', (param?: unknown) => {
+            return telemetry.ecs_enableExecuteCommand.run(async () => {
+                const service = getResourceFromTreeNode(param, Instance(Service))
+                await toggleExecuteCommandFlag(service)
+            })
+        }),
+        Commands.register('aws.ecs.disableEcsExec', (param?: unknown) => {
+            return telemetry.ecs_disableExecuteCommand.run(async () => {
+                const service = getResourceFromTreeNode(param, Instance(Service))
+                await toggleExecuteCommandFlag(service)
+            })
+        }),
+        Commands.register('aws.ecs.viewDocumentation', async () => {
+            void openUrl(vscode.Uri.parse(ecsDocumentationUrl))
+        })
+    )
+}
diff --git a/packages/core/src/awsService/ecs/commands.ts b/packages/core/src/awsService/ecs/commands.ts
new file mode 100644
index 00000000000..acf3daa8047
--- /dev/null
+++ b/packages/core/src/awsService/ecs/commands.ts
@@ -0,0 +1,156 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as vscode from 'vscode'
+import globals from '../../shared/extensionGlobals'
+import { ToolkitPromptSettings } from '../../shared/settings'
+import { ChildProcess } from '../../shared/utilities/processUtils'
+import { showMessageWithCancel, showOutputMessage } from '../../shared/utilities/messages'
+import { removeAnsi } from '../../shared/utilities/textUtilities'
+import { CancellationError, Timeout } from '../../shared/utilities/timeoutUtils'
+import { Commands } from '../../shared/vscode/commands2'
+import { EcsSettings } from './util'
+import { CommandWizard, CommandWizardState } from './wizards/executeCommand'
+import { isUserCancelledError, ToolkitError } from '../../shared/errors'
+import { getResourceFromTreeNode } from '../../shared/treeview/utils'
+import { Container, Service } from './model'
+import { Instance } from '../../shared/utilities/typeConstructors'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { openRemoteTerminal } from '../../shared/remoteSession'
+import { formatDateTimestamp } from '../../shared/datetime'
+
+async function runCommandWizard(
+    param?: unknown,
+    command?: string
+): Promise<CommandWizardState & { container: Container }> {
+    const container = getResourceFromTreeNode(param, Instance(Container))
+
+    const wizard = new CommandWizard(
+        container,
+        ToolkitPromptSettings.instance.isPromptEnabled('ecsRunCommand'),
+        command
+    )
+    const response = await wizard.run()
+
+    if (!response) {
+        throw new CancellationError('user')
+    }
+
+    if (response.confirmation === 'suppress') {
+        await ToolkitPromptSettings.instance.disablePrompt('ecsRunCommand')
+    }
+
+    return { container, ...response }
+}
+
+export enum EcsRunCommandPrompt {
+    Enable = 'ecsRunCommandEnable',
+    Disable = 'ecsRunCommandDisable',
+}
+
+export async function toggleExecuteCommandFlag(
+    service: Service,
+    window = vscode.window,
+    settings = ToolkitPromptSettings.instance
+): Promise<void> {
+    const yes = localize('AWS.generic.response.yes', 'Yes')
+    const yesDontAskAgain = localize('AWS.message.prompt.yesDontAskAgain', "Yes, don't ask again")
+    const no = localize('AWS.generic.response.no', 'No')
+
+    const isNotEnabled = !service.description.enableExecuteCommand ?? false
+    const prompt = isNotEnabled ? EcsRunCommandPrompt.Enable : EcsRunCommandPrompt.Disable
+
+    const warningMessage = isNotEnabled
+        ? localize(
+              'AWS.command.ecs.runCommandInContainer.warning.enableExecuteFlag',
+              'Enabling command execution will change the state of resources in your AWS account, including but not limited to stopping and restarting the service.\nAltering the state of resources while the Execute Command is enabled can lead to unpredictable results.\n Continue?'
+          )
+        : localize(
+              'AWS.command.ecs.runCommandInContainer.warning.disableExecuteFlag',
+              'Disabling command execution will change the state of resources in your AWS account, including but not limited to stopping and restarting the service.\n Continue?'
+          )
+
+    if (settings.isPromptEnabled(prompt)) {
+        const choice = await window.showWarningMessage(warningMessage, yes, yesDontAskAgain, no)
+        if (choice === undefined || choice === no) {
+            throw new CancellationError('user')
+        } else if (choice === yesDontAskAgain) {
+            await settings.disablePrompt(prompt)
+        }
+    }
+
+    await service.toggleExecuteCommand()
+}
+
+export const runCommandInContainer = Commands.declare('aws.ecs.runCommandInContainer', () => (obj?: unknown) => {
+    return telemetry.ecs_runExecuteCommand.run(async (span) => {
+        span.record({ ecsExecuteCommandType: 'command' })
+
+        const { container, task, command } = await runCommandWizard(obj)
+        const timeout = new Timeout(600000)
+        void showMessageWithCancel('Running command...', timeout)
+
+        try {
+            const { path, args, dispose } = await container.prepareCommandForTask(command, task)
+            showOutputMessage(
+                `${formatDateTimestamp(false)}:  Container: "${
+                    container.description.name
+                }" Task ID: "${task}" Command: "${command}"`,
+                globals.outputChannel
+            )
+
+            const proc = new ChildProcess(path, args, { logging: 'noparams' })
+            await proc
+                .run({
+                    timeout,
+                    rejectOnError: true,
+                    rejectOnErrorCode: true,
+                    // TODO: `showOutputMessage` should not be writing to the logs...
+                    onStdout: (text) => {
+                        showOutputMessage(removeAnsi(text), globals.outputChannel)
+                    },
+                    onStderr: (text) => {
+                        showOutputMessage(removeAnsi(text), globals.outputChannel)
+                    },
+                })
+                .finally(dispose)
+        } catch (err) {
+            if (isUserCancelledError(err)) {
+                showOutputMessage('Cancelled command execution', globals.outputChannel)
+            }
+
+            const failedMessage = localize(
+                'AWS.ecs.runCommandInContainer.error',
+                'Failed to execute command in container.'
+            )
+            throw ToolkitError.chain(err, failedMessage)
+        } finally {
+            timeout.dispose()
+        }
+    })
+})
+
+export const openTaskInTerminal = Commands.declare('aws.ecs.openTaskInTerminal', () => (obj?: unknown) => {
+    return telemetry.ecs_runExecuteCommand.run(async (span) => {
+        span.record({ ecsExecuteCommandType: 'shell' })
+
+        const startCommand = new EcsSettings().get('openTerminalCommand')
+        const { container, task, command } = await runCommandWizard(obj, startCommand)
+        const session = await container.prepareCommandForTask(command, task)
+
+        const terminalOptions = {
+            name: `${container.description.name}/${task}`,
+            shellPath: session.path,
+            shellArgs: session.args,
+        }
+
+        await openRemoteTerminal(terminalOptions, session.dispose).catch((err) => {
+            throw ToolkitError.chain(err, localize('AWS.ecs.openTaskInTerminal.error', 'Failed to open terminal.'))
+        })
+    })
+})
diff --git a/packages/core/src/awsService/ecs/model.ts b/packages/core/src/awsService/ecs/model.ts
new file mode 100644
index 00000000000..57f49576e25
--- /dev/null
+++ b/packages/core/src/awsService/ecs/model.ts
@@ -0,0 +1,212 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as vscode from 'vscode'
+import { Cluster as SdkCluster, ContainerDefinition, Service as SdkService, Task } from '@aws-sdk/client-ecs'
+import { DefaultEcsClient } from '../../shared/clients/ecsClient'
+import { ResourceTreeNode } from '../../shared/treeview/resource'
+import { getIcon } from '../../shared/icons'
+import { AsyncCollection } from '../../shared/utilities/asyncCollection'
+import { prepareCommand } from './util'
+
+function createValidTaskFilter(containerName: string) {
+    return function (t: Task): t is Task & { taskArn: string } {
+        const managed = !!t.containers?.find(
+            (c) => c?.name === containerName && c.managedAgents?.find((a) => a.name === 'ExecuteCommandAgent')
+        )
+
+        return t.taskArn !== undefined && managed
+    }
+}
+
+interface ContainerDescription extends ContainerDefinition {
+    readonly clusterArn: string
+    readonly taskRoleArn: string
+    readonly enableExecuteCommand?: boolean
+}
+
+export class Container {
+    public readonly id = this.description.name!
+
+    public constructor(
+        private readonly client: DefaultEcsClient,
+        public readonly serviceName: string,
+        public readonly description: ContainerDescription
+    ) {}
+
+    public async listTasks() {
+        const resp = await this.client.listTasks({
+            cluster: this.description.clusterArn,
+            serviceName: this.serviceName,
+        })
+        const tasks = await this.client.describeTasks(this.description.clusterArn, resp)
+
+        return tasks.filter(createValidTaskFilter(this.description.name!))
+    }
+
+    public prepareCommandForTask(command: string, task: string) {
+        return prepareCommand(this.client, command, this.description.taskRoleArn, {
+            task,
+            container: this.description.name!,
+            cluster: this.description.clusterArn,
+        })
+    }
+
+    public getTreeItem() {
+        const item = new vscode.TreeItem(this.description.name!)
+
+        return Object.assign(item, {
+            iconPath: getIcon('aws-ecs-container'),
+            contextValue: this.description.enableExecuteCommand
+                ? 'awsEcsContainerNodeExecEnabled'
+                : 'awsEcsContainerNodeExecDisabled',
+        })
+    }
+
+    public toTreeNode(): ResourceTreeNode<this> {
+        return new ResourceTreeNode(this)
+    }
+}
+
+export class Service {
+    public readonly id = this.description.serviceArn!
+    public readonly arn = this.description.serviceArn!
+
+    private readonly onDidChangeEmitter = new vscode.EventEmitter<void>()
+    public readonly onDidChangeTreeItem = this.onDidChangeEmitter.event
+
+    public constructor(
+        private readonly client: DefaultEcsClient,
+        public readonly description: SdkService
+    ) {}
+
+    public async listContainers(): Promise<Container[]> {
+        const definition = await this.getDefinition()
+        const containers = definition.containerDefinitions ?? []
+
+        return containers.map(
+            (c) =>
+                new Container(this.client, this.description.serviceName!, {
+                    ...c,
+                    enableExecuteCommand: this.description.enableExecuteCommand,
+                    taskRoleArn: definition.taskRoleArn!,
+                    clusterArn: this.description.clusterArn!,
+                })
+        )
+    }
+
+    public async getDefinition() {
+        if (!this.description.taskDefinition) {
+            throw new Error(`No task definition found for ECS service ${this.id}`)
+        }
+
+        const resp = await this.client.describeTaskDefinition(this.description.taskDefinition!)
+
+        return resp.taskDefinition!
+    }
+
+    public getTreeItem() {
+        const item = new vscode.TreeItem(this.description.serviceName!)
+        item.description = this.description.status
+        item.iconPath = getIcon('aws-ecs-service')
+        item.tooltip = `${this.description.serviceArn}\nTask Definition: ${this.description.taskDefinition}`
+        item.contextValue = this.description.enableExecuteCommand
+            ? 'awsEcsServiceNode.ENABLED'
+            : 'awsEcsServiceNode.DISABLED'
+
+        return item
+    }
+
+    public async toggleExecuteCommand() {
+        await this.client.updateService({
+            cluster: this.description.clusterArn!,
+            service: this.description.serviceName!,
+            forceNewDeployment: true,
+            enableExecuteCommand: !this.description.enableExecuteCommand,
+        })
+
+        this.description.enableExecuteCommand = !this.description.enableExecuteCommand
+        this.onDidChangeEmitter.fire()
+    }
+
+    public toTreeNode(): ResourceTreeNode<this, Container> {
+        return new ResourceTreeNode(this, {
+            placeholder: localize('AWS.explorerNode.ecs.noContainers', '[No Containers found]'),
+            childrenProvider: {
+                onDidChange: this.onDidChangeEmitter.event,
+                listResources: async () => {
+                    const containers = await this.listContainers()
+
+                    return containers.map((c) => c.toTreeNode())
+                },
+            },
+        })
+    }
+}
+
+export class Cluster {
+    public readonly id = this.cluster.clusterArn!
+
+    public constructor(
+        private readonly client: DefaultEcsClient,
+        private readonly cluster: SdkCluster
+    ) {}
+
+    public listServices(): AsyncCollection<Service[]> {
+        return this.client
+            .listServices({ cluster: this.cluster.clusterArn! })
+            .map((services) => services.map((s) => new Service(this.client, s)))
+    }
+
+    public getTreeItem() {
+        const item = new vscode.TreeItem(this.cluster.clusterName!)
+        item.tooltip = this.cluster.clusterArn!
+        item.iconPath = getIcon('aws-ecs-cluster')
+        item.contextValue = 'awsEcsClusterNode'
+
+        return item
+    }
+
+    public toTreeNode(): ResourceTreeNode<this, Service> {
+        return new ResourceTreeNode(this, {
+            placeholder: localize('AWS.explorerNode.ecs.noContainers', '[No Containers found]'),
+            childrenProvider: {
+                paginated: true,
+                listResources: () => this.listServices().map((services) => services.map((s) => s.toTreeNode())),
+            },
+        })
+    }
+}
+
+class Ecs {
+    public readonly id = 'ecs'
+    public constructor(private readonly client: DefaultEcsClient) {}
+
+    public getTreeItem() {
+        const item = new vscode.TreeItem('ECS')
+        item.contextValue = 'awsEcsNode'
+
+        return item
+    }
+
+    public listClusters(): AsyncCollection<Cluster[]> {
+        return this.client.listClusters().map((clusters) => clusters.map((c) => new Cluster(this.client, c)))
+    }
+}
+
+export function getEcsRootNode(region: string) {
+    const controller = new Ecs(new DefaultEcsClient(region))
+
+    return new ResourceTreeNode(controller, {
+        placeholder: localize('AWS.explorerNode.ecs.noClusters', '[No Clusters found]'),
+        childrenProvider: {
+            paginated: true,
+            listResources: () => controller.listClusters().map((clusters) => clusters.map((c) => c.toTreeNode())),
+        },
+    })
+}
diff --git a/packages/core/src/awsService/ecs/util.ts b/packages/core/src/awsService/ecs/util.ts
new file mode 100644
index 00000000000..c25c2291048
--- /dev/null
+++ b/packages/core/src/awsService/ecs/util.ts
@@ -0,0 +1,108 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../../shared/extensionGlobals'
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import { EcsClient } from '../../shared/clients/ecsClient'
+import { IamClient } from '../../shared/clients/iam'
+import { ToolkitError } from '../../shared/errors'
+import { isCloud9 } from '../../shared/extensionUtilities'
+import { getOrInstallCli } from '../../shared/utilities/cliUtils'
+import { Session, TaskDefinition } from '@aws-sdk/client-ecs'
+import { getLogger } from '../../shared/logger/logger'
+import { SSMClient, TerminateSessionCommand } from '@aws-sdk/client-ssm'
+import { fromExtensionManifest } from '../../shared/settings'
+import { ecsTaskPermissionsUrl } from '../../shared/constants'
+
+interface EcsTaskIdentifer {
+    readonly task: string
+    readonly cluster: string
+    readonly container: string
+}
+
+/**
+ * See also: https://github.com/aws-containers/amazon-ecs-exec-checker
+ */
+export async function checkPermissionsForSsm(
+    client: IamClient,
+    task: Pick<TaskDefinition, 'taskRoleArn'>
+): Promise<void | never> {
+    if (!task.taskRoleArn) {
+        throw new ToolkitError('Containers must have a task role ARN', {
+            code: 'NoTaskRoleArn',
+            documentationUri: ecsTaskPermissionsUrl,
+        })
+    }
+
+    // https://github.com/aws-containers/amazon-ecs-exec-checker/blob/b1d163bd95c5b6f915e2bb3ad810e6f2aecae985/check-ecs-exec.sh#L536-L539
+    const deniedActions = await client.getDeniedActions({
+        PolicySourceArn: task.taskRoleArn,
+        ActionNames: [
+            'ssmmessages:CreateControlChannel',
+            'ssmmessages:CreateDataChannel',
+            'ssmmessages:OpenControlChannel',
+            'ssmmessages:OpenDataChannel',
+        ],
+    })
+
+    if (deniedActions.length !== 0) {
+        const deniedMsg = deniedActions.map((o) => o.EvalActionName).join(', ')
+        const message = localize(
+            'AWS.command.ecs.runCommandInContainer.missingPermissions',
+            'Insufficient permissions to execute command, ensure the [task role is configured]({0}). Task role {1} is not authorized to perform: {2}',
+            ecsTaskPermissionsUrl.toString(),
+            task.taskRoleArn,
+            deniedMsg
+        )
+
+        throw new ToolkitError(message, {
+            code: 'MissingPermissions',
+            documentationUri: ecsTaskPermissionsUrl,
+            details: { deniedActions: deniedActions.map((a) => a.EvalActionName) },
+        })
+    }
+}
+
+export async function prepareCommand(
+    client: EcsClient,
+    command: string,
+    taskRoleArn: string,
+    task: EcsTaskIdentifer
+): Promise<{ path: string; args: string[]; dispose: () => void }> {
+    const ssmPlugin = await getOrInstallCli('session-manager-plugin', !isCloud9())
+
+    let session: Session
+    try {
+        session = (await client.executeCommand({ ...task, command })).session!
+    } catch (execErr) {
+        await checkPermissionsForSsm(new IamClient(globals.regionProvider.defaultRegionId), {
+            taskRoleArn: taskRoleArn,
+        }).catch((permErr) => {
+            throw ToolkitError.chain(permErr, `${execErr}`)
+        })
+
+        throw execErr
+    }
+
+    const args = [JSON.stringify(session), client.regionCode, 'StartSession']
+
+    async function terminateSession() {
+        const sessionId = session.sessionId!
+        const ssm = globals.sdkClientBuilderV3.createAwsService({
+            serviceClient: SSMClient,
+            clientOptions: { region: client.regionCode },
+        })
+        ssm.send(new TerminateSessionCommand({ SessionId: sessionId })).catch((err) => {
+            getLogger().warn(`ecs: failed to terminate session "${sessionId}": %s`, err)
+        })
+    }
+
+    return { path: ssmPlugin, args, dispose: () => void terminateSession() }
+}
+
+export class EcsSettings extends fromExtensionManifest('aws.ecs', { openTerminalCommand: String }) {}
diff --git a/src/ecs/wizards/executeCommand.ts b/packages/core/src/awsService/ecs/wizards/executeCommand.ts
similarity index 84%
rename from src/ecs/wizards/executeCommand.ts
rename to packages/core/src/awsService/ecs/wizards/executeCommand.ts
index 3b0bdec9524..a3db19a998c 100644
--- a/src/ecs/wizards/executeCommand.ts
+++ b/packages/core/src/awsService/ecs/wizards/executeCommand.ts
@@ -1,15 +1,15 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ecsExecToolkitGuideUrl } from '../../shared/constants'
-import { codicon, getIcon } from '../../shared/icons'
-import { createCommonButtons } from '../../shared/ui/buttons'
-import { createInputBox } from '../../shared/ui/inputPrompter'
-import { createQuickPick, DataQuickPickItem } from '../../shared/ui/pickerPrompter'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { WIZARD_EXIT, Wizard, WIZARD_BACK } from '../../shared/wizards/wizard'
+import { ecsExecToolkitGuideUrl } from '../../../shared/constants'
+import { codicon, getIcon } from '../../../shared/icons'
+import { createCommonButtons } from '../../../shared/ui/buttons'
+import { createInputBox } from '../../../shared/ui/inputPrompter'
+import { createQuickPick, DataQuickPickItem } from '../../../shared/ui/pickerPrompter'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { WIZARD_EXIT, Wizard, WIZARD_BACK } from '../../../shared/wizards/wizard'
 import { Container } from '../model'
 
 export interface CommandWizardState {
@@ -21,7 +21,7 @@ export interface CommandWizardState {
 function createTaskPrompter(node: Container) {
     const taskItems = (async () => {
         // Filter for only 'Running' tasks
-        return (await node.listTasks()).map(task => {
+        return (await node.listTasks()).map((task) => {
             // TODO: get task definition name and include it in the item detail
             // The last 32 digits of the task arn is the task identifier
             const taskId = task.taskArn.substring(task.taskArn.length - 32)
@@ -100,7 +100,7 @@ export class CommandWizard extends Wizard<CommandWizardState> {
         this.form.task.bindPrompter(() => createTaskPrompter(container))
         this.form.command.bindPrompter(() => createCommandPrompter(container))
         if (shouldShowConfirmation) {
-            this.form.confirmation.bindPrompter(state =>
+            this.form.confirmation.bindPrompter((state) =>
                 createConfirmationPrompter(container, state.task!, state.command!)
             )
         }
diff --git a/packages/core/src/awsService/iot/activation.ts b/packages/core/src/awsService/iot/activation.ts
new file mode 100644
index 00000000000..ab28ee788b3
--- /dev/null
+++ b/packages/core/src/awsService/iot/activation.ts
@@ -0,0 +1,97 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { IotThingNode } from './explorer/iotThingNode'
+import { ExtContext } from '../../shared/extensions'
+import { IotThingFolderNode } from './explorer/iotThingFolderNode'
+import { createThingCommand } from './commands/createThing'
+import { deleteThingCommand } from './commands/deleteThing'
+import { IotCertificateNode, IotCertWithPoliciesNode, IotThingCertNode } from './explorer/iotCertificateNode'
+import { detachThingCertCommand } from './commands/detachCert'
+import { IotPolicyCertNode, IotPolicyWithVersionsNode } from './explorer/iotPolicyNode'
+import { detachPolicyCommand } from './commands/detachPolicy'
+import { deletePolicyCommand } from './commands/deletePolicy'
+import {
+    activateCertificateCommand,
+    deactivateCertificateCommand,
+    revokeCertificateCommand,
+} from './commands/updateCert'
+import { deleteCertCommand } from './commands/deleteCert'
+import { IotCertsFolderNode } from './explorer/iotCertFolderNode'
+import { createCertificateCommand } from './commands/createCert'
+import { attachCertificateCommand } from './commands/attachCertificate'
+import { attachPolicyCommand } from './commands/attachPolicy'
+import { IotPolicyFolderNode } from './explorer/iotPolicyFolderNode'
+import { createPolicyCommand } from './commands/createPolicy'
+import { IotNode } from './explorer/iotNodes'
+import { copyEndpointCommand } from './commands/copyEndpoint'
+import { IotPolicyVersionNode } from './explorer/iotPolicyVersionNode'
+import { deletePolicyVersionCommand } from './commands/deletePolicyVersion'
+import { setDefaultPolicy } from './commands/setDefaultPolicy'
+import { createPolicyVersionCommand } from './commands/createPolicyVersion'
+import { viewPolicyVersionCommand } from './commands/viewPolicyVersion'
+import { Commands } from '../../shared/vscode/commands2'
+
+/**
+ * Activate IoT components.
+ */
+export async function activate(context: ExtContext): Promise<void> {
+    context.extensionContext.subscriptions.push(
+        Commands.register('aws.iot.createThing', async (node: IotThingFolderNode) => {
+            await createThingCommand(node)
+        }),
+        Commands.register('aws.iot.deleteThing', async (node: IotThingNode) => {
+            await deleteThingCommand(node)
+        }),
+        Commands.register('aws.iot.createCert', async (node: IotCertsFolderNode) => {
+            await createCertificateCommand(node)
+        }),
+        Commands.register('aws.iot.deleteCert', async (node: IotCertWithPoliciesNode) => {
+            await deleteCertCommand(node)
+        }),
+        Commands.register('aws.iot.attachCert', async (node: IotThingNode) => {
+            await attachCertificateCommand(node)
+        }),
+        Commands.register('aws.iot.detachCert', async (node: IotThingCertNode) => {
+            await detachThingCertCommand(node)
+        }),
+        Commands.register('aws.iot.createPolicy', async (node: IotPolicyFolderNode) => {
+            await createPolicyCommand(node)
+        }),
+        Commands.register('aws.iot.deletePolicy', async (node: IotPolicyWithVersionsNode) => {
+            await deletePolicyCommand(node)
+        }),
+        Commands.register('aws.iot.attachPolicy', async (node: IotCertWithPoliciesNode) => {
+            await attachPolicyCommand(node)
+        }),
+        Commands.register('aws.iot.detachPolicy', async (node: IotPolicyCertNode) => {
+            await detachPolicyCommand(node)
+        }),
+        Commands.register('aws.iot.activateCert', async (node: IotCertificateNode) => {
+            await activateCertificateCommand(node)
+        }),
+        Commands.register('aws.iot.deactivateCert', async (node: IotCertificateNode) => {
+            await deactivateCertificateCommand(node)
+        }),
+        Commands.register('aws.iot.revokeCert', async (node: IotCertificateNode) => {
+            await revokeCertificateCommand(node)
+        }),
+        Commands.register('aws.iot.createPolicyVersion', async (node: IotPolicyWithVersionsNode) => {
+            await createPolicyVersionCommand(node)
+        }),
+        Commands.register('aws.iot.deletePolicyVersion', async (node: IotPolicyVersionNode) => {
+            await deletePolicyVersionCommand(node)
+        }),
+        Commands.register('aws.iot.setDefaultPolicy', async (node: IotPolicyVersionNode) => {
+            await setDefaultPolicy(node)
+        }),
+        Commands.register('aws.iot.viewPolicyVersion', async (node: IotPolicyVersionNode) => {
+            await viewPolicyVersionCommand(node)
+        }),
+        Commands.register('aws.iot.copyEndpoint', async (node: IotNode) => {
+            await copyEndpointCommand(node)
+        })
+    )
+}
diff --git a/packages/core/src/awsService/iot/commands/attachCertificate.ts b/packages/core/src/awsService/iot/commands/attachCertificate.ts
new file mode 100644
index 00000000000..684160dafbf
--- /dev/null
+++ b/packages/core/src/awsService/iot/commands/attachCertificate.ts
@@ -0,0 +1,93 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../../../shared/logger/logger'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { IotThingNode } from '../explorer/iotThingNode'
+import { showViewLogsMessage } from '../../../shared/utilities/messages'
+import { createQuickPick, DataQuickPickItem } from '../../../shared/ui/pickerPrompter'
+import { PromptResult } from '../../../shared/ui/prompter'
+import { IotClient } from '../../../shared/clients/iotClient'
+import { isValidResponse } from '../../../shared/wizards/wizard'
+import { Certificate, ListCertificatesResponse } from '@aws-sdk/client-iot'
+
+export type CertGen = typeof getCertList
+
+/**
+ * Attaches a certificate to the thing represented by the given node.
+ *
+ * Prompts the user to select a certificate
+ * Attaches the certificate.
+ * Refreshes the thing node.
+ */
+export async function attachCertificateCommand(node: IotThingNode, promptFun = promptForCert): Promise<void> {
+    getLogger().debug('AttachCertificate called for %O', node)
+
+    const thingName = node.thing.name
+
+    const cert = await promptFun(node.iot, getCertList)
+    if (!isValidResponse(cert)) {
+        getLogger().info('No certificate chosen')
+        return undefined
+    }
+    getLogger().info('Picker returned: %O', cert)
+    try {
+        await node.iot.attachThingPrincipal({ thingName, principal: cert.certificateArn! })
+    } catch (e) {
+        getLogger().error(`Failed to attach certificate ${cert.certificateId}: %s`, e)
+        void showViewLogsMessage(
+            localize('AWS.iot.attachCert.error', 'Failed to attach certificate {0}', cert.certificateId)
+        )
+        return undefined
+    }
+
+    getLogger().debug('Attached certificate %O', cert.certificateId)
+
+    // Refresh the Thing node
+    await node.refreshNode()
+}
+
+/**
+ * Prompts the user to pick a certificate to attach.
+ */
+async function promptForCert(iot: IotClient, certFetch: CertGen): Promise<PromptResult<Certificate>> {
+    const placeHolder: DataQuickPickItem<Certificate> = {
+        label: 'No certificates found',
+        data: undefined,
+    }
+    const picker = createQuickPick(certFetch(iot), {
+        title: localize('AWS.iot.attachCert', 'Select a certificate'),
+        noItemsFoundItem: placeHolder,
+        buttons: [vscode.QuickInputButtons.Back],
+    })
+    return picker.prompt()
+}
+
+/**
+ * Async generator function to get the list of certificates when creating a quick pick.
+ */
+async function* getCertList(iot: IotClient) {
+    let marker: string | undefined = undefined
+    let filteredCerts: Certificate[]
+    do {
+        try {
+            const certResponse: ListCertificatesResponse = await iot.listCertificates({ marker })
+            marker = certResponse.nextMarker
+
+            /* These fields should always be defined when using the above API,
+             * but we filter here anyway for when we use ! later. */
+            filteredCerts =
+                certResponse.certificates?.filter(
+                    (cert) => cert.certificateArn && cert.certificateId && cert.status && cert.creationDate
+                ) ?? []
+        } catch (e) {
+            getLogger().error(`Failed to retrieve certificates: %s`, e)
+            void showViewLogsMessage(localize('AWS.iot.attachCert.error', 'Failed to retrieve certificates'))
+            return
+        }
+        yield filteredCerts.map((cert) => ({ label: cert.certificateId!, data: cert }))
+    } while (marker !== undefined)
+}
diff --git a/packages/core/src/awsService/iot/commands/attachPolicy.ts b/packages/core/src/awsService/iot/commands/attachPolicy.ts
new file mode 100644
index 00000000000..add93a022fd
--- /dev/null
+++ b/packages/core/src/awsService/iot/commands/attachPolicy.ts
@@ -0,0 +1,106 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../../../shared/logger/logger'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { showViewLogsMessage } from '../../../shared/utilities/messages'
+import { createQuickPick, DataQuickPickItem } from '../../../shared/ui/pickerPrompter'
+import { PromptResult } from '../../../shared/ui/prompter'
+import { IotClient } from '../../../shared/clients/iotClient'
+import { isValidResponse } from '../../../shared/wizards/wizard'
+import { IotCertWithPoliciesNode, IotThingCertNode } from '../explorer/iotCertificateNode'
+import { ListPoliciesResponse, Policy } from '@aws-sdk/client-iot'
+import { IotNode } from '../explorer/iotNodes'
+
+export type PolicyGen = typeof getPolicyList
+
+/**
+ * Attaches a policy to the certificate represented by the given node.
+ *
+ * Prompts the user to select a policy.
+ * Attaches the policy.
+ * Refreshes the certificate node.
+ */
+export async function attachPolicyCommand(
+    node: IotThingCertNode | IotCertWithPoliciesNode,
+    promptFun = promptForPolicy
+): Promise<void> {
+    getLogger().debug('AttachPolicy called for %O', node)
+
+    const certArn = node.certificate.arn
+
+    const policy = await promptFun(node.iot, getPolicyList)
+    if (!isValidResponse(policy)) {
+        getLogger().info('No policy chosen')
+        return undefined
+    }
+    getLogger().info('Picker returned: %O', policy)
+    try {
+        await node.iot.attachPolicy({ policyName: policy.policyName!, target: certArn })
+    } catch (e) {
+        getLogger().error(`Failed to attach policy ${policy.policyName}: %s`, e)
+        void showViewLogsMessage(localize('AWS.iot.attachCert.error', 'Failed to attach policy {0}', policy.policyName))
+        return undefined
+    }
+
+    getLogger().debug('Attached policy %O', policy.policyName)
+
+    /* Refresh both things and certificates nodes so the status is updated in
+     * both trees. */
+    const baseNode = getBaseNode(node)
+    await baseNode.thingFolderNode?.refreshNode()
+    await baseNode.certFolderNode?.refreshNode()
+}
+
+/**
+ * Gets the node at the root of the IoT tree. This is so nodes in multiple
+ * subtrees can be refreshed when an action affects more than one node.
+ */
+function getBaseNode(node: IotThingCertNode | IotCertWithPoliciesNode): IotNode {
+    if (node instanceof IotThingCertNode) {
+        return node.parent.parent.parent
+    }
+    return node.parent.parent
+}
+
+/**
+ * Prompts the user to pick a policy to attach.
+ */
+async function promptForPolicy(iot: IotClient, policyFetch: PolicyGen): Promise<PromptResult<Policy>> {
+    const placeHolder: DataQuickPickItem<Policy> = {
+        label: 'No policies found',
+        data: undefined,
+    }
+    const picker = createQuickPick(policyFetch(iot), {
+        title: localize('AWS.iot.attachPolicy', 'Select a policy'),
+        noItemsFoundItem: placeHolder,
+        buttons: [vscode.QuickInputButtons.Back],
+    })
+    return picker.prompt()
+}
+
+/**
+ * Async generator function to get the list of policies when creating a quick pick.
+ */
+async function* getPolicyList(iot: IotClient) {
+    let marker: string | undefined = undefined
+    let filteredPolicies: Policy[]
+    do {
+        try {
+            const policyResponse: ListPoliciesResponse = await iot.listPolicies({ marker })
+            marker = policyResponse.nextMarker
+
+            /* The policy name and arn should always be defined when using the
+             * above API, but we filter here anyway for when we use ! later. */
+            filteredPolicies = policyResponse.policies?.filter((policy) => policy.policyArn && policy.policyName) ?? []
+        } catch (e) {
+            getLogger().error(`Failed to retrieve policies: %s`, e)
+            void showViewLogsMessage(localize('AWS.iot.attachPolicy.error', 'Failed to retrieve policies'))
+            return
+        }
+        yield filteredPolicies.map((policy) => ({ label: policy.policyName!, data: policy }))
+    } while (marker !== undefined)
+}
diff --git a/packages/core/src/awsService/iot/commands/copyEndpoint.ts b/packages/core/src/awsService/iot/commands/copyEndpoint.ts
new file mode 100644
index 00000000000..0846250c5cb
--- /dev/null
+++ b/packages/core/src/awsService/iot/commands/copyEndpoint.ts
@@ -0,0 +1,30 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { IotNode } from '../explorer/iotNodes'
+import { showViewLogsMessage } from '../../../shared/utilities/messages'
+import { copyToClipboard } from '../../../shared/utilities/messages'
+import { getLogger } from '../../../shared/logger/logger'
+
+/**
+ * Copies the path to the folder or file represented by the given node.
+ *
+ * Note that the path does not contain the bucket name or a leading slash.
+ */
+export async function copyEndpointCommand(node: IotNode): Promise<void> {
+    getLogger().debug('CopyPath called for %O', node)
+
+    let endpoint: string
+    try {
+        endpoint = await node.getEndpoint()
+    } catch (e) {
+        getLogger().error('Failed to retrieve endpoint: %s', e)
+        void showViewLogsMessage(localize('AWS.iot.copyEndpoint.error', 'Failed to retrieve endpoint'))
+        return
+    }
+
+    await copyToClipboard(endpoint, 'URL')
+}
diff --git a/packages/core/src/awsService/iot/commands/createCert.ts b/packages/core/src/awsService/iot/commands/createCert.ts
new file mode 100644
index 00000000000..7cd9d4b62ed
--- /dev/null
+++ b/packages/core/src/awsService/iot/commands/createCert.ts
@@ -0,0 +1,156 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as path from 'path'
+import { getLogger } from '../../../shared/logger/logger'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { showViewLogsMessage } from '../../../shared/utilities/messages'
+import { IotCertsFolderNode } from '../explorer/iotCertFolderNode'
+import { fileExists } from '../../../shared/filesystemUtilities'
+import { CreateKeysAndCertificateResponse } from '@aws-sdk/client-iot'
+import { fs } from '../../../shared/fs/fs'
+
+// eslint-disable-next-line @typescript-eslint/naming-convention
+const MODE_RW_R_R = 0o644 // File permission 0644 rw-r--r-- for PEM files.
+// eslint-disable-next-line @typescript-eslint/naming-convention
+const PEM_FILE_ENCODING = 'ascii'
+
+/**
+ * Command to create a certificate key pair and save them to the filesystem.
+ */
+export async function createCertificateCommand(
+    node: IotCertsFolderNode,
+    promptFunc = promptForSaveLocation,
+    saveFunc = saveCredentials
+): Promise<void> {
+    getLogger().debug('CreateCertificate called for %O', node)
+
+    const folderLocation = await promptFunc()
+    if (!folderLocation) {
+        getLogger().info('CreateCertificate canceled: No folder selected')
+        return
+    }
+
+    let certificate: CreateKeysAndCertificateResponse
+
+    try {
+        certificate = await node.iot.createCertificateAndKeys({
+            setAsActive: false,
+        })
+    } catch (e) {
+        getLogger().error('Failed to create certificate: %s', e)
+        void showViewLogsMessage(localize('AWS.iot.createCert.error', 'Failed to create certificate'))
+        return undefined
+    }
+
+    const certId = certificate!.certificateId
+    const certPem = certificate!.certificatePem
+    const privateKey = certificate!.keyPair?.PrivateKey
+    const publicKey = certificate!.keyPair?.PublicKey
+
+    if (!certPem || !privateKey || !publicKey) {
+        getLogger().error('Could not download certificate. Certificate is missing either the PEM or key pair.')
+        void showViewLogsMessage(localize('AWS.iot.createCert.error', 'Failed to create certificate'))
+        return undefined
+    }
+
+    getLogger().info(`Downloaded certificate ${certId}`)
+    void vscode.window.showInformationMessage(localize('AWS.iot.createCert.success', 'Created certificate {0}', certId))
+
+    // Save resources
+    const saveSuccessful = await saveFunc(folderLocation, certId!, certPem, privateKey, publicKey)
+    if (!saveSuccessful) {
+        // Delete the certificate if the key pair cannot be saved
+        try {
+            await node.iot.deleteCertificate({ certificateId: certId! })
+        } catch (e) {
+            getLogger().error(`Failed to delete Certificate ${certId}: %s`, e)
+            void showViewLogsMessage(localize('AWS.iot.deleteCert.error', 'Failed to delete Certificate {0}', certId))
+        }
+    }
+
+    // Refresh the Certificate Folder node
+    await node.refreshNode()
+}
+
+/**
+ * Prompts for folder in which to save certificate and keys
+ */
+async function promptForSaveLocation(): Promise<vscode.Uri | undefined> {
+    const folderLocation = await vscode.window.showOpenDialog({
+        openLabel: localize('AWS.iot.downloadCert.openButton', 'Save certificate here'),
+        canSelectFolders: true,
+        canSelectFiles: false,
+        canSelectMany: false,
+    })
+
+    if (!folderLocation || folderLocation.length === 0) {
+        return undefined
+    }
+
+    return folderLocation[0]
+}
+
+/**
+ * Saves certificate and key pair to the file system
+ * @returns `true` if writes succeed, else `false`.
+ */
+async function saveCredentials(
+    basePath: vscode.Uri,
+    certName: string,
+    certPem: string,
+    privateKey: string,
+    publicKey: string
+): Promise<boolean> {
+    const dir = basePath.fsPath
+    const certPath = path.join(dir, `${certName}-certificate.pem.crt`)
+    const privateKeyPath = path.join(dir, `${certName}-private.pem.key`)
+    const publicKeyPath = path.join(dir, `${certName}-public.pem.key`)
+
+    const certExists = await fileExists(certPath)
+    const privateKeyExists = await fileExists(privateKeyPath)
+    const publicKeyExists = await fileExists(publicKeyPath)
+
+    if (certExists) {
+        getLogger().error('Certificate path %s already exists', certPath)
+        void vscode.window.showErrorMessage(
+            localize('AWS.iot.createCert.error', 'Failed to create certificate. Path {0} already exists.', certPath)
+        )
+        return false
+    }
+    if (privateKeyExists) {
+        getLogger().error('Key path %s already exists', privateKeyPath)
+        void vscode.window.showErrorMessage(
+            localize(
+                'AWS.iot.createCert.error',
+                'Failed to create certificate. Path {0} already exists.',
+                privateKeyPath
+            )
+        )
+        return false
+    }
+    if (publicKeyExists) {
+        getLogger().error('Key path %s already exists', publicKeyPath)
+        void vscode.window.showErrorMessage(
+            localize(
+                'AWS.iot.createCert.error',
+                'Failed to create certificate. Path {0} already exists.',
+                publicKeyPath
+            )
+        )
+        return false
+    }
+    try {
+        await fs.writeFile(certPath, certPem, { encoding: PEM_FILE_ENCODING, mode: MODE_RW_R_R })
+        await fs.writeFile(privateKeyPath, privateKey, { encoding: PEM_FILE_ENCODING, mode: MODE_RW_R_R })
+        await fs.writeFile(publicKeyPath, publicKey, { encoding: PEM_FILE_ENCODING, mode: MODE_RW_R_R })
+    } catch (e) {
+        getLogger().error('Could not save certificate: %s', e)
+        void showViewLogsMessage(localize('AWS.iot.createCert.saveError', 'Failed to save certificate'))
+        return false
+    }
+    return true
+}
diff --git a/packages/core/src/awsService/iot/commands/createPolicy.ts b/packages/core/src/awsService/iot/commands/createPolicy.ts
new file mode 100644
index 00000000000..1bb04618d7f
--- /dev/null
+++ b/packages/core/src/awsService/iot/commands/createPolicy.ts
@@ -0,0 +1,98 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../../../shared/logger/logger'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { showViewLogsMessage } from '../../../shared/utilities/messages'
+import { IotPolicyFolderNode } from '../explorer/iotPolicyFolderNode'
+import { fs } from '../../../shared/fs/fs'
+
+/**
+ * Creates a policy from a policy document.
+ */
+export async function createPolicyCommand(node: IotPolicyFolderNode, getPolicyDoc = getPolicyDocument): Promise<void> {
+    getLogger().debug('CreatePolicy called for %O', node)
+
+    const data = await getPolicyDoc()
+    if (!data) {
+        return
+    }
+
+    const policyName = await vscode.window.showInputBox({
+        prompt: localize('AWS.iot.createPolicy.prompt', 'Enter a new policy name'),
+        placeHolder: localize('AWS.iot.createPolicy.placeHolder', 'Policy Name'),
+        validateInput: validatePolicyName,
+    })
+
+    if (!policyName) {
+        getLogger().info('CreatePolicy canceled')
+        return
+    }
+
+    try {
+        // Parse to ensure this is a valid JSON
+        const policyJSON = JSON.parse(data.toString())
+        await node.iot.createPolicy({ policyName, policyDocument: JSON.stringify(policyJSON) })
+        void vscode.window.showInformationMessage(
+            localize('AWS.iot.createPolicy.success', 'Created Policy {0}', policyName)
+        )
+    } catch (e) {
+        getLogger().error('Failed to create policy document: %s', e)
+        void showViewLogsMessage(localize('AWS.iot.createPolicy.error', 'Failed to create policy {0}', policyName))
+        return
+    }
+
+    // Refresh the Policy Folder node
+    await node.refreshNode()
+}
+
+export async function getPolicyDocument(): Promise<Uint8Array | undefined> {
+    const fileLocation = await vscode.window.showOpenDialog({
+        canSelectFolders: false,
+        canSelectFiles: true,
+        canSelectMany: false,
+        filters: { JSON: ['json'] },
+    })
+
+    if (!fileLocation || fileLocation.length === 0) {
+        getLogger().info('CreatePolicy canceled: No document selected')
+        return undefined
+    }
+
+    const policyLocation = fileLocation[0]
+
+    let data: Uint8Array
+    try {
+        data = await fs.readFileBytes(policyLocation.fsPath)
+    } catch (e) {
+        getLogger().error('Failed to read policy document: %s', e)
+        void showViewLogsMessage(localize('AWS.iot.createPolicy.error', 'Failed to read policy document'))
+        return undefined
+    }
+
+    return data
+}
+
+/**
+ * Validates a Policy name for the CreatePolicy API. See
+ * https://docs.aws.amazon.com/iot/latest/apireference/API_CreatePolicy.html
+ * for more information. Pattern: `[\w+=,.@-]+`.
+ */
+function validatePolicyName(name: string): string | undefined {
+    if (name.length < 1 || name.length > 128) {
+        return localize(
+            'AWS.iot.validatePolicyName.error.invalidLength',
+            'Policy name must be between 1 and 128 characters long'
+        )
+    }
+    if (!/^[\w+=,.@-]+$/.test(name)) {
+        return localize(
+            'AWS.iot.validatePolicyName.error.invalidCharacters',
+            'Policy name must contain only alphanumeric characters and/or the following: +=.,@-'
+        )
+    }
+    return undefined
+}
diff --git a/packages/core/src/awsService/iot/commands/createPolicyVersion.ts b/packages/core/src/awsService/iot/commands/createPolicyVersion.ts
new file mode 100644
index 00000000000..4719277a5ec
--- /dev/null
+++ b/packages/core/src/awsService/iot/commands/createPolicyVersion.ts
@@ -0,0 +1,50 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../../../shared/logger/logger'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { showViewLogsMessage } from '../../../shared/utilities/messages'
+import { IotPolicyWithVersionsNode } from '../explorer/iotPolicyNode'
+import { getPolicyDocument } from './createPolicy'
+
+/**
+ * Creates a new policy version from a policy document.
+ */
+export async function createPolicyVersionCommand(
+    node: IotPolicyWithVersionsNode,
+    getPolicyDoc = getPolicyDocument
+): Promise<void> {
+    getLogger().debug('CreatePolicyVersion called for %O', node)
+
+    const policyName = node.policy.name
+
+    const data = await getPolicyDoc()
+    if (!data) {
+        return
+    }
+
+    try {
+        // Parse to ensure this is a valid JSON
+        const policyJSON = JSON.parse(data.toString())
+        await node.iot.createPolicyVersion({
+            policyName,
+            policyDocument: JSON.stringify(policyJSON),
+            setAsDefault: true,
+        })
+        void vscode.window.showInformationMessage(
+            localize('AWS.iot.createPolicy.success', 'Created new version of {0}', policyName)
+        )
+    } catch (e) {
+        getLogger().error('Failed to create new policy version: %s', e)
+        void showViewLogsMessage(
+            localize('AWS.iot.createPolicyVersion.error', 'Failed to create new version of {0}', policyName)
+        )
+        return
+    }
+
+    // Refresh the node
+    node.refresh()
+}
diff --git a/packages/core/src/awsService/iot/commands/createThing.ts b/packages/core/src/awsService/iot/commands/createThing.ts
new file mode 100644
index 00000000000..8909d894911
--- /dev/null
+++ b/packages/core/src/awsService/iot/commands/createThing.ts
@@ -0,0 +1,69 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../../../shared/logger/logger'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { showViewLogsMessage } from '../../../shared/utilities/messages'
+import { IotThingFolderNode } from '../explorer/iotThingFolderNode'
+
+/**
+ * Creates an IoT Thing.
+ *
+ * Prompts the user for the thing name.
+ * Creates the thing.
+ * Refreshes the node.
+ */
+export async function createThingCommand(node: IotThingFolderNode): Promise<void> {
+    getLogger().debug('CreateThing called for: %O', node)
+
+    const thingName = await vscode.window.showInputBox({
+        prompt: localize('AWS.iot.createThing.prompt', 'Enter a new Thing name'),
+        placeHolder: localize('AWS.iot.createThing.placeHolder', 'Thing Name'),
+        validateInput: validateThingName,
+    })
+
+    if (!thingName) {
+        getLogger().info('CreateThing canceled')
+        return
+    }
+
+    getLogger().info(`Creating thing: ${thingName}`)
+    try {
+        const thing = await node.iot.createThing({ thingName })
+
+        getLogger().info('Created thing: %O', thing)
+        void vscode.window.showInformationMessage(
+            localize('AWS.iot.createThing.success', 'Created Thing {0}', thingName)
+        )
+    } catch (e) {
+        getLogger().error(`Failed to create Thing ${thingName}: %s`, e)
+        void showViewLogsMessage(localize('AWS.iot.createThing.error', 'Failed to create Thing: {0}', thingName))
+    }
+
+    // Refresh the Things Folder node
+    await node.refreshNode()
+}
+
+/**
+ * Validates a Thing name for the CreateThing API. See
+ * https://docs.aws.amazon.com/iot/latest/apireference/API_CreateThing.html
+ * for more information. Pattern: `[a-zA-Z0-9:_-]+`.
+ */
+function validateThingName(name: string): string | undefined {
+    if (name.length < 1 || name.length > 128) {
+        return localize(
+            'AWS.iot.validateThingName.error.invalidLength',
+            'Thing name must be between 1 and 128 characters long'
+        )
+    }
+    if (!/^[a-zA-Z0-9:_-]+$/.test(name)) {
+        return localize(
+            'AWS.iot.validateThingName.error.invalidCharacters',
+            'Thing name must only contain alphanumeric characters, hyphens, underscores, or colons'
+        )
+    }
+    return undefined
+}
diff --git a/packages/core/src/awsService/iot/commands/deleteCert.ts b/packages/core/src/awsService/iot/commands/deleteCert.ts
new file mode 100644
index 00000000000..592bbb66339
--- /dev/null
+++ b/packages/core/src/awsService/iot/commands/deleteCert.ts
@@ -0,0 +1,111 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as localizedText from '../../../shared/localizedText'
+import { getLogger } from '../../../shared/logger/logger'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { showViewLogsMessage, showConfirmationMessage } from '../../../shared/utilities/messages'
+import { IotCertWithPoliciesNode } from '../explorer/iotCertificateNode'
+
+/**
+ * Deletes the certificate represented by the given node.
+ *
+ * Checks if certificate is not attached to any things.
+ * Prompts the user for confirmation.
+ * Deletes the policy.
+ * Refreshes the parent node.
+ */
+export async function deleteCertCommand(node: IotCertWithPoliciesNode): Promise<void> {
+    getLogger().debug('DeleteThing called for %O', node)
+
+    const certArn = node.certificate.arn
+
+    if (node.certificate.activeStatus === 'ACTIVE') {
+        getLogger().error('Certificate is active')
+        void vscode.window.showErrorMessage(
+            localize('AWS.iot.deleteCert.activeError', 'Active certificates cannot be deleted')
+        )
+        return
+    }
+
+    try {
+        const things = await node.iot.listThingsForCert({ principal: certArn })
+        if (things.length > 0) {
+            getLogger().error(`Certificate ${node.certificate.id} has attached Things`)
+            void vscode.window.showErrorMessage(
+                localize(
+                    'AWS.iot.deleteCert.attachedError',
+                    'Cannot delete certificate. Certificate has attached resources: {0}',
+                    things.join(', ')
+                )
+            )
+            return
+        }
+    } catch (e) {
+        getLogger().error(`Failed to retrieve Things attached to cert ${node.certificate.id}: %s`, e)
+        void showViewLogsMessage(
+            localize('AWS.iot.deleteCert.retrieveError', 'Failed to retrieve {0} attached to certificate', 'Things')
+        )
+        return
+    }
+
+    const isConfirmed = await showConfirmationMessage({
+        prompt: localize(
+            'AWS.iot.deleteCert.prompt',
+            'Are you sure you want to delete Certificate {0}?',
+            node.certificate.id
+        ),
+        confirm: localizedText.localizedDelete,
+        cancel: localizedText.cancel,
+    })
+    if (!isConfirmed) {
+        getLogger().info('DeleteCert canceled')
+        return
+    }
+
+    let forceDelete: boolean = false
+    try {
+        const policies = (await node.iot.listPrincipalPolicies({ principal: certArn })).policies
+        if (policies?.length ?? 0 > 0) {
+            forceDelete = await showConfirmationMessage({
+                prompt: localize(
+                    'AWS.iot.deleteCert.attachedError',
+                    'Certificate has attached {0}',
+                    'policies. Delete anyway?'
+                ),
+                confirm: localizedText.localizedDelete,
+                cancel: localizedText.cancel,
+            })
+            if (!forceDelete) {
+                getLogger().info('DeleteCert canceled')
+                return
+            }
+        }
+    } catch (e) {
+        getLogger().error(`Failed to retrieve Policies attached to cert ${node.certificate.id}: %s`, e)
+        void showViewLogsMessage(
+            localize('AWS.iot.deleteCert.retrieveError', 'Failed to retrieve {0} attached to certificate', 'policies')
+        )
+    }
+
+    getLogger().info(`Deleting certificate ${node.certificate.id}`)
+    try {
+        await node.iot.deleteCertificate({ certificateId: node.certificate.id, forceDelete: forceDelete })
+
+        getLogger().info(`deleted certificate: ${node.certificate.id}`)
+        void vscode.window.showInformationMessage(
+            localize('AWS.iot.deleteCert.success', 'Deleted certificate: {0}', node.certificate.id)
+        )
+    } catch (e) {
+        getLogger().error(`Failed to delete Certificate ${node.certificate.id}: %s`, e)
+        void showViewLogsMessage(
+            localize('AWS.iot.deleteCert.error', 'Failed to delete certificate: {0}', node.certificate.id)
+        )
+    }
+
+    // Refresh the Certificate Folder node
+    await node.parent.refreshNode()
+}
diff --git a/packages/core/src/awsService/iot/commands/deletePolicy.ts b/packages/core/src/awsService/iot/commands/deletePolicy.ts
new file mode 100644
index 00000000000..4d09ffd0a26
--- /dev/null
+++ b/packages/core/src/awsService/iot/commands/deletePolicy.ts
@@ -0,0 +1,78 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as localizedText from '../../../shared/localizedText'
+import { getLogger } from '../../../shared/logger/logger'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { IotPolicyWithVersionsNode } from '../explorer/iotPolicyNode'
+import { showViewLogsMessage, showConfirmationMessage } from '../../../shared/utilities/messages'
+
+/**
+ * Deletes the policy represented by the given node.
+ *
+ * Checks if policy is not attached to any certificates.
+ * Prompts the user for confirmation.
+ * Deletes the policy.
+ * Refreshes the parent node.
+ */
+export async function deletePolicyCommand(node: IotPolicyWithVersionsNode): Promise<void> {
+    getLogger().debug('DeletePolicy called for %O', node)
+
+    const policyName = node.policy.name
+
+    const isConfirmed = await showConfirmationMessage({
+        prompt: localize('AWS.iot.deletePolicy.prompt', 'Are you sure you want to delete Policy {0}?', policyName),
+        confirm: localizedText.localizedDelete,
+        cancel: localizedText.cancel,
+    })
+    if (!isConfirmed) {
+        getLogger().info('DeletePolicy canceled')
+        return
+    }
+
+    getLogger().info(`Deleting policy ${policyName}`)
+    try {
+        const certs = await node.iot.listPolicyTargets({ policyName })
+        if (certs.length > 0) {
+            getLogger().error(`Policy ${policyName} has attached Certificates`)
+            void vscode.window.showErrorMessage(
+                localize(
+                    'AWS.iot.deletePolicy.attachedError',
+                    'Cannot delete {0}. Policy has attached certificates: {1}',
+                    policyName,
+                    certs.join(', ')
+                )
+            )
+            return
+        }
+        const versions = node.iot.listPolicyVersions({ policyName })
+        let numVersions: number = 0
+        for await (const _version of versions) {
+            numVersions++
+        }
+        if (numVersions !== 1) {
+            getLogger().error(`Policy ${policyName} has non-default versions`)
+            void vscode.window.showErrorMessage(
+                localize('AWS.iot.deletePolicy.versionError', 'Policy {0} has non-default versions', policyName)
+            )
+            return
+        }
+        await node.iot.deletePolicy({ policyName })
+
+        getLogger().info(`deleted Policy: ${policyName}`)
+        void vscode.window.showInformationMessage(
+            localize('AWS.iot.deletePolicy.success', 'Deleted Policy: {0}', node.policy.name)
+        )
+    } catch (e) {
+        getLogger().error(`Failed to delete Policy: ${policyName}: %s`, e)
+        void showViewLogsMessage(
+            localize('AWS.iot.deletePolicy.error', 'Failed to delete Policy: {0}', node.policy.name)
+        )
+    }
+
+    // Refresh the Policy Folder node
+    await node.parent.refreshNode()
+}
diff --git a/packages/core/src/awsService/iot/commands/deletePolicyVersion.ts b/packages/core/src/awsService/iot/commands/deletePolicyVersion.ts
new file mode 100644
index 00000000000..b34708c4ee2
--- /dev/null
+++ b/packages/core/src/awsService/iot/commands/deletePolicyVersion.ts
@@ -0,0 +1,68 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as localizedText from '../../../shared/localizedText'
+import { getLogger } from '../../../shared/logger/logger'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { showViewLogsMessage, showConfirmationMessage } from '../../../shared/utilities/messages'
+import { IotPolicyVersionNode } from '../explorer/iotPolicyVersionNode'
+
+/**
+ * Deletes the policy version represented by the given node.
+ *
+ * Prompts the user for confirmation.
+ * Deletes the policy version.
+ * Refreshes the parent node.
+ */
+export async function deletePolicyVersionCommand(node: IotPolicyVersionNode): Promise<void> {
+    getLogger().debug('DeletePolicyVersion called for %O', node)
+
+    const policyName = node.policy.name
+    const policyVersionId = node.version.versionId!
+
+    const isConfirmed = await showConfirmationMessage({
+        prompt: localize(
+            'AWS.iot.deletePolicyVersion.prompt',
+            'Are you sure you want to delete Version {0} of Policy {1}?',
+            policyVersionId,
+            policyName
+        ),
+        confirm: localizedText.localizedDelete,
+        cancel: localizedText.cancel,
+    })
+    if (!isConfirmed) {
+        getLogger().info('DeletePolicyVersion canceled')
+        return
+    }
+
+    getLogger().info(`Deleting version ${policyVersionId} of policy ${policyName}`)
+    try {
+        await node.iot.deletePolicyVersion({ policyName, policyVersionId })
+
+        getLogger().info(`deleted Policy Version: ${policyVersionId}`)
+        void vscode.window.showInformationMessage(
+            localize(
+                'AWS.iot.deletePolicyVersion.success',
+                'Deleted Version {0} of Policy {1}',
+                policyVersionId,
+                policyName
+            )
+        )
+    } catch (e) {
+        getLogger().error(`Failed to delete Policy Version: ${policyVersionId}: %s`, e)
+        void showViewLogsMessage(
+            localize(
+                'AWS.iot.deletePolicyVersion.error',
+                'Failed to delete Version {0} of Policy {1}',
+                policyVersionId,
+                policyName
+            )
+        )
+    }
+
+    // Refresh the policy node
+    await node.parent.refreshNode()
+}
diff --git a/packages/core/src/awsService/iot/commands/deleteThing.ts b/packages/core/src/awsService/iot/commands/deleteThing.ts
new file mode 100644
index 00000000000..4aecb0d126a
--- /dev/null
+++ b/packages/core/src/awsService/iot/commands/deleteThing.ts
@@ -0,0 +1,63 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as localizedText from '../../../shared/localizedText'
+import { getLogger } from '../../../shared/logger/logger'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { IotThingNode } from '../explorer/iotThingNode'
+import { showViewLogsMessage, showConfirmationMessage } from '../../../shared/utilities/messages'
+
+/**
+ * Deletes the thing represented by the given node.
+ *
+ * Prompts the user for confirmation.
+ * Deletes the thing.
+ * Refreshes the parent node.
+ */
+export async function deleteThingCommand(node: IotThingNode): Promise<void> {
+    getLogger().debug('DeleteThing called for %O', node)
+
+    const thingName = node.thing.name
+
+    const isConfirmed = await showConfirmationMessage({
+        prompt: localize('AWS.iot.deleteThing.prompt', 'Are you sure you want to delete Thing {0}?', thingName),
+        confirm: localizedText.localizedDelete,
+        cancel: localizedText.cancel,
+    })
+    if (!isConfirmed) {
+        getLogger().info('DeleteThing canceled')
+        return
+    }
+
+    getLogger().info(`Deleting thing ${thingName}`)
+    try {
+        const principalList = (await node.iot.listThingPrincipals({ thingName })).principals
+        if (principalList?.length ?? 0 > 0) {
+            getLogger().error(`Thing ${thingName} has attached principals: %O`, principalList)
+            void vscode.window.showErrorMessage(
+                localize(
+                    'AWS.iot.deleteThing.error',
+                    'Cannot delete Thing {0}. Thing {0} has attached principals: {1}',
+                    thingName,
+                    principalList?.join(', ')
+                )
+            )
+            return undefined
+        }
+        await node.iot.deleteThing({ thingName })
+
+        getLogger().info(`deleted Thing: ${thingName}`)
+        void vscode.window.showInformationMessage(
+            localize('AWS.iot.deleteThing.success', 'Deleted Thing: {0}', thingName)
+        )
+    } catch (e) {
+        getLogger().error(`Failed to delete Thing: ${thingName}: %s`, e)
+        void showViewLogsMessage(localize('AWS.iot.deleteThing.error', 'Failed to delete Thing: {0}', thingName))
+    }
+
+    // Refresh the Things Folder node
+    await node.parent.refreshNode()
+}
diff --git a/packages/core/src/awsService/iot/commands/detachCert.ts b/packages/core/src/awsService/iot/commands/detachCert.ts
new file mode 100644
index 00000000000..536869894dc
--- /dev/null
+++ b/packages/core/src/awsService/iot/commands/detachCert.ts
@@ -0,0 +1,54 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as localizedText from '../../../shared/localizedText'
+import { getLogger } from '../../../shared/logger/logger'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { IotThingCertNode } from '../explorer/iotCertificateNode'
+import { showViewLogsMessage, showConfirmationMessage } from '../../../shared/utilities/messages'
+
+/**
+ * Detaches a certificate from an IoT Thing.
+ *
+ * Prompts the user for confirmation.
+ * Detaches the certificate.
+ * Refreshes the parent node.
+ */
+export async function detachThingCertCommand(node: IotThingCertNode): Promise<void> {
+    getLogger().debug('DetachCert called for %O', node)
+
+    const certId = node.certificate.id
+    const certArn = node.certificate.arn
+    const thingName = node.parent.thing.name
+
+    const isConfirmed = await showConfirmationMessage({
+        prompt: localize(
+            'AWS.iot.detachCert.prompt',
+            'Are you sure you want to detach certificate from Thing {0}?',
+            thingName
+        ),
+        confirm: localize('AWS.iot.detachCert.confirm', 'Detach'),
+        cancel: localizedText.cancel,
+    })
+    if (!isConfirmed) {
+        getLogger().info('DetachCert canceled')
+        return
+    }
+
+    getLogger().info(`Detaching certificate: ${certId}`)
+    try {
+        await node.iot.detachThingPrincipal({ thingName, principal: certArn })
+
+        getLogger().info(`detached certificate from Thing: ${thingName}`)
+        void vscode.window.showInformationMessage(localize('AWS.iot.detachCert.success', 'Detached: {0}', certId))
+    } catch (e) {
+        getLogger().error(`Failed to detach certificate: ${certId}: %s`, e)
+        void showViewLogsMessage(localize('AWS.iot.detachCert.error', 'Failed to detach: {0}', certId))
+    }
+
+    // Refresh the parent Thing node
+    await node.parent.refreshNode()
+}
diff --git a/packages/core/src/awsService/iot/commands/detachPolicy.ts b/packages/core/src/awsService/iot/commands/detachPolicy.ts
new file mode 100644
index 00000000000..a85ad8fe5a2
--- /dev/null
+++ b/packages/core/src/awsService/iot/commands/detachPolicy.ts
@@ -0,0 +1,73 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as localizedText from '../../../shared/localizedText'
+import { getLogger } from '../../../shared/logger/logger'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { showViewLogsMessage, showConfirmationMessage } from '../../../shared/utilities/messages'
+import { IotPolicyCertNode } from '../explorer/iotPolicyNode'
+import { IotPolicyFolderNode } from '../explorer/iotPolicyFolderNode'
+import { IotCertificateNode, IotCertWithPoliciesNode, IotThingCertNode } from '../explorer/iotCertificateNode'
+import { IotNode } from '../explorer/iotNodes'
+
+/**
+ * Detaches an IoT Policy from a certificate.
+ *
+ * Prompts the user for confirmation.
+ * Detaches the policy.
+ * Refreshes the parent node.
+ */
+export async function detachPolicyCommand(node: IotPolicyCertNode): Promise<void> {
+    getLogger().debug('DetachPolicy called for %O', node)
+
+    const policyName = node.policy.name
+    if (node.parent instanceof IotPolicyFolderNode) {
+        return undefined
+    }
+    const certId = node.parent.certificate.id
+    const certArn = node.parent.certificate.arn
+
+    const isConfirmed = await showConfirmationMessage({
+        prompt: localize('AWS.iot.detachPolicy.prompt', 'Are you sure you want to detach policy {0}?', policyName),
+        confirm: localize('AWS.iot.detachCert.confirm', 'Detach'),
+        cancel: localizedText.cancel,
+    })
+    if (!isConfirmed) {
+        getLogger().info('DetachCert canceled')
+        return
+    }
+
+    getLogger().info(`Detaching certificate: ${certId}`)
+    try {
+        await node.iot.detachPolicy({ policyName, target: certArn })
+
+        getLogger().info(`detached policy: ${policyName}`)
+        void vscode.window.showInformationMessage(localize('AWS.iot.detachPolicy.success', 'Detached: {0}', policyName))
+    } catch (e) {
+        getLogger().error(`Failed to detach certificate: ${certId}: %s`, e)
+        void showViewLogsMessage(localize('AWS.iot.detachPolicy.error', 'Failed to detach: {0}', policyName))
+    }
+
+    /* Refresh both things and certificates nodes so the status is updated in
+     * both trees. */
+    const baseNode = getBaseNode(node.parent)
+    await baseNode?.thingFolderNode?.refreshNode()
+    await baseNode?.certFolderNode?.refreshNode()
+}
+
+/**
+ * Gets the node at the root of the IoT tree. This is so nodes in multiple
+ * subtrees can be refreshed when an action affects more than one node.
+ */
+function getBaseNode(node: IotCertificateNode): IotNode | undefined {
+    if (node instanceof IotThingCertNode) {
+        return node.parent.parent.parent
+    }
+    if (node instanceof IotCertWithPoliciesNode) {
+        return node.parent.parent
+    }
+    return undefined
+}
diff --git a/packages/core/src/awsService/iot/commands/setDefaultPolicy.ts b/packages/core/src/awsService/iot/commands/setDefaultPolicy.ts
new file mode 100644
index 00000000000..8e406719bff
--- /dev/null
+++ b/packages/core/src/awsService/iot/commands/setDefaultPolicy.ts
@@ -0,0 +1,44 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../../../shared/logger/logger'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { IotPolicyVersionNode } from '../explorer/iotPolicyVersionNode'
+import { showViewLogsMessage } from '../../../shared/utilities/messages'
+import { IotPolicyWithVersionsNode } from '../explorer/iotPolicyNode'
+
+/**
+ * Copies the path to the folder or file represented by the given node.
+ *
+ * Note that the path does not contain the bucket name or a leading slash.
+ */
+export async function setDefaultPolicy(node: IotPolicyVersionNode): Promise<void> {
+    getLogger().debug('SetDefaultPolicy called for %O', node)
+
+    try {
+        await node.iot.setDefaultPolicyVersion({
+            policyName: node.policy.name,
+            policyVersionId: node.version.versionId!,
+        })
+        void vscode.window.showInformationMessage(
+            localize(
+                'AWS.iot.setDefaultPolicy.success',
+                'Set {0} as default version of {1}',
+                node.version.versionId,
+                node.policy.name
+            )
+        )
+    } catch (e) {
+        getLogger().error('Failed to set default policy version: %s', e)
+        void showViewLogsMessage(localize('AWS.iot.setDefaultPolicy.error', 'Failed to set default policy version'))
+    }
+
+    await refreshBase(node.parent)
+}
+
+async function refreshBase(node: IotPolicyWithVersionsNode): Promise<void> {
+    return vscode.commands.executeCommand('aws.refreshAwsExplorerNode', node)
+}
diff --git a/packages/core/src/awsService/iot/commands/updateCert.ts b/packages/core/src/awsService/iot/commands/updateCert.ts
new file mode 100644
index 00000000000..53a7aa34181
--- /dev/null
+++ b/packages/core/src/awsService/iot/commands/updateCert.ts
@@ -0,0 +1,157 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as localizedText from '../../../shared/localizedText'
+import { getLogger } from '../../../shared/logger/logger'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { IotCertificateNode } from '../explorer/iotCertificateNode'
+import { showViewLogsMessage, showConfirmationMessage } from '../../../shared/utilities/messages'
+import { IotThingNode } from '../explorer/iotThingNode'
+import { IotCertsFolderNode } from '../explorer/iotCertFolderNode'
+import { IotNode } from '../explorer/iotNodes'
+
+const statusRevoked = 'REVOKED'
+const statusActive = 'ACTIVE'
+const statusInactive = 'INACTIVE'
+
+/**
+ * Deactivates an active certificate.
+ *
+ * Prompts the user for confirmation.
+ * Deactivates the certificate.
+ * Refreshes the parent node.
+ */
+export async function deactivateCertificateCommand(node: IotCertificateNode): Promise<void> {
+    getLogger().debug('DeactivateCert called for %O', node)
+
+    const certId = node.certificate.id
+
+    const isConfirmed = await showConfirmationMessage({
+        prompt: localize(
+            'AWS.iot.deactivateCert.prompt',
+            'Are you sure you want to deactivate certificate {0}?',
+            certId
+        ),
+        confirm: localize('AWS.iot.deactivateCert.confirm', 'Deactivate'),
+        cancel: localizedText.cancel,
+    })
+    if (!isConfirmed) {
+        getLogger().info('DeactivateCert canceled')
+        return
+    }
+
+    getLogger().info(`Deactivating certificate ${certId}`)
+    try {
+        await node.iot.updateCertificate({ certificateId: certId, newStatus: statusInactive })
+
+        getLogger().info(`deactivated certificate: ${certId}`)
+        void vscode.window.showInformationMessage(
+            localize('AWS.iot.deactivateCert.success', 'Deactivated: {0}', node.certificate.id)
+        )
+    } catch (e) {
+        getLogger().error(`Failed to deactivate certificate ${certId}: %s`, e)
+        void showViewLogsMessage(
+            localize('AWS.iot.deactivateCert.error', 'Failed to deactivate: {0}', node.certificate.id)
+        )
+    }
+
+    /* Refresh both things and certificates nodes so the status is updated in
+     * both trees. */
+    const baseNode = getBaseNode(node.parent)
+    await baseNode.thingFolderNode?.refreshNode()
+    await baseNode.certFolderNode?.refreshNode()
+}
+
+/**
+ * Activates an inactive certificate.
+ *
+ * Prompts the user for confirmation.
+ * Activates the certificate.
+ * Refreshes the parent node.
+ */
+export async function activateCertificateCommand(node: IotCertificateNode): Promise<void> {
+    getLogger().debug('ActivateCert called for %O', node)
+
+    const certId = node.certificate.id
+
+    const isConfirmed = await showConfirmationMessage({
+        prompt: localize('AWS.iot.activateCert.prompt', 'Are you sure you want to activate certificate {0}?', certId),
+        confirm: localize('AWS.iot.activateCert.confirm', 'Activate'),
+        cancel: localizedText.cancel,
+    })
+    if (!isConfirmed) {
+        getLogger().info('ActivateCert canceled')
+        return
+    }
+
+    getLogger().info(`Activating certificate ${certId}`)
+    try {
+        await node.iot.updateCertificate({ certificateId: certId, newStatus: statusActive })
+
+        getLogger().info(`activated certificate: ${certId}`)
+        void vscode.window.showInformationMessage(
+            localize('AWS.iot.activateCert.success', 'Activated: {0}', node.certificate.id)
+        )
+    } catch (e) {
+        getLogger().error(`Failed to activate certificate ${certId}: %s`, e)
+        void showViewLogsMessage(localize('AWS.iot.activateCert.error', 'Failed to activate: {0}', node.certificate.id))
+    }
+
+    /* Refresh both things and certificates nodes so the status is updated in
+     * both trees. */
+    const baseNode = getBaseNode(node.parent)
+    await baseNode.thingFolderNode?.refreshNode()
+    await baseNode.certFolderNode?.refreshNode()
+}
+
+/**
+ * Revokes an active certificate.
+ *
+ * Prompts the user for confirmation.
+ * Revokes the certificate.
+ * Refreshes the parent node.
+ */
+export async function revokeCertificateCommand(node: IotCertificateNode): Promise<void> {
+    getLogger().debug('RevokeCert called for %O', node)
+
+    const certId = node.certificate.id
+
+    const isConfirmed = await showConfirmationMessage({
+        prompt: localize('AWS.iot.revokeCert.prompt', 'Are you sure you want to revoke certificate {0}?', certId),
+        confirm: localize('AWS.iot.revokeCert.confirm', 'Revoke'),
+        cancel: localizedText.cancel,
+    })
+    if (!isConfirmed) {
+        getLogger().info('RevokeCert canceled')
+        return
+    }
+
+    getLogger().info(`Revoking certificate: ${certId}`)
+    try {
+        await node.iot.updateCertificate({ certificateId: certId, newStatus: statusRevoked })
+
+        getLogger().info(`revoked certificate: ${certId}`)
+        void vscode.window.showInformationMessage(
+            localize('AWS.iot.revokeCert.success', 'Revoked: {0}', node.certificate.id)
+        )
+    } catch (e) {
+        getLogger().error(`Failed to revoke certificate ${certId}: %s`, e)
+        void showViewLogsMessage(localize('AWS.iot.revokeCert.error', 'Failed to revoke: {0}', node.certificate.id))
+    }
+
+    /* Refresh both things and certificates nodes so the status is updated in
+     * both trees. */
+    const baseNode = getBaseNode(node.parent)
+    await baseNode.thingFolderNode?.refreshNode()
+    await baseNode.certFolderNode?.refreshNode()
+}
+
+function getBaseNode(node: IotThingNode | IotCertsFolderNode): IotNode {
+    if (node instanceof IotThingNode) {
+        return node.parent.parent
+    }
+    return node.parent
+}
diff --git a/packages/core/src/awsService/iot/commands/viewPolicyVersion.ts b/packages/core/src/awsService/iot/commands/viewPolicyVersion.ts
new file mode 100644
index 00000000000..a6c33bbeb86
--- /dev/null
+++ b/packages/core/src/awsService/iot/commands/viewPolicyVersion.ts
@@ -0,0 +1,47 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { getLogger } from '../../../shared/logger/logger'
+import { getTabSizeSetting } from '../../../shared/utilities/editorUtilities'
+import { IotPolicyVersionNode } from '../explorer/iotPolicyVersionNode'
+import { showViewLogsMessage } from '../../../shared/utilities/messages'
+
+export async function viewPolicyVersionCommand(node: IotPolicyVersionNode) {
+    getLogger().debug('viewPolicyVersion called for %O', node)
+
+    const policyVersionId = node.version.versionId!
+    const policyName = node.policy.name
+
+    try {
+        const policy = await node.iot.getPolicyVersion({ policyName, policyVersionId })
+        const document = policy.policyDocument!
+
+        await showPolicyContent(document)
+    } catch (e) {
+        getLogger().error('Failed to retrieve policy document')
+        void showViewLogsMessage(localize('AWS.iot.viewPolicyVersion.error', 'Failed to retrieve policy document'))
+        return undefined
+    }
+}
+
+export function policyFormatter(rawPolicyContent: string, tabSize: number = getTabSizeSetting()): string {
+    const prettyPolicyContent = JSON.stringify(JSON.parse(rawPolicyContent), undefined, tabSize)
+
+    return prettyPolicyContent
+}
+
+export async function showPolicyContent(
+    rawPolicyContent: string,
+    tabSize: number = getTabSizeSetting()
+): Promise<void> {
+    const prettyPolicyContent = policyFormatter(rawPolicyContent, tabSize)
+    const newDoc = await vscode.workspace.openTextDocument({
+        language: 'json',
+        content: prettyPolicyContent,
+    })
+    await vscode.window.showTextDocument(newDoc, vscode.ViewColumn.One, false)
+}
diff --git a/packages/core/src/awsService/iot/explorer/iotCertFolderNode.ts b/packages/core/src/awsService/iot/explorer/iotCertFolderNode.ts
new file mode 100644
index 00000000000..240da3136f4
--- /dev/null
+++ b/packages/core/src/awsService/iot/explorer/iotCertFolderNode.ts
@@ -0,0 +1,104 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { IotClient } from '../../../shared/clients/iotClient'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { LoadMoreNode } from '../../../shared/treeview/nodes/loadMoreNode'
+import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
+import { makeChildrenNodes } from '../../../shared/treeview/utils'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { ChildNodeLoader } from '../../../awsexplorer/childNodeLoader'
+import { ChildNodePage } from '../../../awsexplorer/childNodeLoader'
+import { inspect } from 'util'
+import { getLogger } from '../../../shared/logger/logger'
+import { IotCertWithPoliciesNode } from './iotCertificateNode'
+import { IotNode } from './iotNodes'
+import { Settings } from '../../../shared/settings'
+import { ClassToInterfaceType } from '../../../shared/utilities/tsUtils'
+
+/**
+ * Represents the group of all IoT Certificates.
+ */
+export class IotCertsFolderNode extends AWSTreeNodeBase implements LoadMoreNode {
+    private readonly childLoader = new ChildNodeLoader(this, (token) => this.loadPage(token))
+
+    public constructor(
+        public readonly iot: IotClient,
+        public readonly parent: IotNode,
+        protected readonly settings: ClassToInterfaceType<Settings> = Settings.instance
+    ) {
+        super('Certificates', vscode.TreeItemCollapsibleState.Collapsed)
+        this.tooltip = 'IoT Certificates'
+        this.contextValue = 'awsIotCertsNode'
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        return await makeChildrenNodes({
+            getChildNodes: async () => this.childLoader.getChildren(),
+            getNoChildrenPlaceholderNode: async () =>
+                new PlaceholderNode(this, localize('AWS.explorerNode.iot.noCerts', '[No Certificates found]')),
+        })
+    }
+
+    public async loadMoreChildren(): Promise<void> {
+        await this.childLoader.loadMoreChildren()
+    }
+
+    public isLoadingMoreChildren(): boolean {
+        return this.childLoader.isLoadingMoreChildren()
+    }
+
+    public clearChildren(): void {
+        this.childLoader.clearChildren()
+    }
+
+    private async loadPage(continuationToken: string | undefined): Promise<ChildNodePage<IotCertWithPoliciesNode>> {
+        getLogger().debug(`Loading page for %O using continuationToken %s`, this, continuationToken)
+        const response = await this.iot.listCertificates({
+            marker: continuationToken,
+            pageSize: this.getMaxItemsPerPage(),
+        })
+
+        const newCerts =
+            response.certificates
+                ?.filter((cert) => cert.certificateArn && cert.certificateId && cert.status && cert.creationDate)
+                .map(
+                    async (cert) =>
+                        new IotCertWithPoliciesNode(
+                            {
+                                arn: cert.certificateArn!,
+                                id: cert.certificateId!,
+                                activeStatus: cert.status!,
+                                creationDate: cert.creationDate!,
+                            },
+                            this,
+                            this.iot,
+                            await this.iot.listThingsForCert({ principal: cert.certificateArn! })
+                        )
+                ) ?? []
+
+        const resolvedCerts = await Promise.all(newCerts)
+
+        getLogger().debug(`Loaded certificates: %O`, newCerts)
+        return {
+            newContinuationToken: response.nextMarker ?? undefined,
+            newChildren: [...resolvedCerts],
+        }
+    }
+
+    public async refreshNode(): Promise<void> {
+        this.clearChildren()
+        return vscode.commands.executeCommand('aws.refreshAwsExplorerNode', this)
+    }
+
+    public [inspect.custom](): string {
+        return `IotCertificates`
+    }
+
+    private getMaxItemsPerPage(): number | undefined {
+        return this.settings.getSection('aws').get<number>('iot.maxItemsPerPage')
+    }
+}
diff --git a/packages/core/src/awsService/iot/explorer/iotCertificateNode.ts b/packages/core/src/awsService/iot/explorer/iotCertificateNode.ts
new file mode 100644
index 00000000000..a90afec36b5
--- /dev/null
+++ b/packages/core/src/awsService/iot/explorer/iotCertificateNode.ts
@@ -0,0 +1,157 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { ChildNodePage } from '../../../awsexplorer/childNodeLoader'
+import { IotClient, IotCertificate } from '../../../shared/clients/iotClient'
+
+import { AWSResourceNode } from '../../../shared/treeview/nodes/awsResourceNode'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { LoadMoreNode } from '../../../shared/treeview/nodes/loadMoreNode'
+import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
+import { makeChildrenNodes } from '../../../shared/treeview/utils'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { ChildNodeLoader } from '../../../awsexplorer/childNodeLoader'
+import { inspect } from 'util'
+import { getLogger } from '../../../shared/logger/logger'
+import { IotCertsFolderNode } from './iotCertFolderNode'
+import { IotThingNode } from './iotThingNode'
+import { IotPolicyCertNode } from './iotPolicyNode'
+import { getIcon } from '../../../shared/icons'
+import { truncate } from '../../../shared/utilities/textUtilities'
+import { Settings } from '../../../shared/settings'
+import { ClassToInterfaceType } from '../../../shared/utilities/tsUtils'
+import { formatLocalized } from '../../../shared/datetime'
+
+const contextBase = 'awsIotCertificateNode'
+/**
+ * Represents an IoT Certificate that may have either a Thing Node or the
+ * Certificate Folder Node as a parent.
+ */
+export abstract class IotCertificateNode extends AWSTreeNodeBase implements AWSResourceNode {
+    private readonly childLoader = new ChildNodeLoader(this, (token) => this.loadPage(token))
+
+    public constructor(
+        public readonly certificate: IotCertificate,
+        public readonly parent: IotCertsFolderNode | IotThingNode,
+        public readonly iot: IotClient,
+        collapsibleState: vscode.TreeItemCollapsibleState,
+        public readonly things?: string[],
+        protected readonly settings: ClassToInterfaceType<Settings> = Settings.instance
+    ) {
+        // Show only 8 characters in the explorer instead of the full 64. The entire
+        // ID can be copied from the context menu or viewed when hovered over.
+        super(truncate(certificate.id, 8), collapsibleState)
+
+        this.tooltip = localize(
+            'AWS.explorerNode.iot.certTooltip',
+            '{0}\nStatus: {1}\nCreated: {2}{3}',
+            this.certificate.id,
+            this.certificate.activeStatus,
+            formatLocalized(this.certificate.creationDate),
+            (things?.length ?? 0 > 0) ? `\nAttached to: ${things!.join(', ')}` : ''
+        )
+        this.iconPath = getIcon('aws-iot-certificate')
+        this.description = `\t[${this.certificate.activeStatus}]`
+        this.contextValue = `${contextBase}.${this.certificate.activeStatus}`
+    }
+
+    public update(): void {
+        return undefined
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        return await makeChildrenNodes({
+            getChildNodes: async () => this.childLoader.getChildren(),
+            getNoChildrenPlaceholderNode: async () =>
+                new PlaceholderNode(this, localize('AWS.explorerNode.iot.noPolicy', '[No Policies found]')),
+        })
+    }
+
+    public async loadMoreChildren(): Promise<void> {
+        await this.childLoader.loadMoreChildren()
+    }
+
+    public isLoadingMoreChildren(): boolean {
+        return this.childLoader.isLoadingMoreChildren()
+    }
+
+    public clearChildren(): void {
+        this.childLoader.clearChildren()
+    }
+
+    private async loadPage(continuationToken: string | undefined): Promise<ChildNodePage<IotPolicyCertNode>> {
+        getLogger().debug(`Loading page for %O using continuationToken %s`, this, continuationToken)
+        const response = await this.iot.listPrincipalPolicies({
+            principal: this.certificate.arn,
+            marker: continuationToken,
+            pageSize: this.getMaxItemsPerPage(),
+        })
+
+        const newPolicies =
+            response.policies
+                ?.filter((policy) => policy.policyArn && policy.policyName)
+                .map(
+                    (policy) =>
+                        new IotPolicyCertNode({ arn: policy.policyArn!, name: policy.policyName! }, this, this.iot)
+                ) ?? []
+
+        getLogger().debug(`Loaded policies: %O`, newPolicies)
+        return {
+            newContinuationToken: response.nextMarker ?? undefined,
+            newChildren: [...newPolicies],
+        }
+    }
+
+    public async refreshNode(): Promise<void> {
+        this.clearChildren()
+        return vscode.commands.executeCommand('aws.refreshAwsExplorerNode', this)
+    }
+
+    private getMaxItemsPerPage(): number | undefined {
+        return this.settings.getSection('aws').get<number>('iot.maxItemsPerPage')
+    }
+
+    public get arn(): string {
+        return this.certificate.arn
+    }
+
+    public get name(): string {
+        return this.certificate.id
+    }
+
+    public [inspect.custom](): string {
+        return `IotCertificateNode (certificate=${this.certificate.id})`
+    }
+}
+
+export class IotThingCertNode extends IotCertificateNode {
+    public constructor(
+        public override readonly certificate: IotCertificate,
+        public override readonly parent: IotThingNode,
+        public override readonly iot: IotClient,
+        public override readonly things?: string[],
+        protected override readonly settings: ClassToInterfaceType<Settings> = Settings.instance
+    ) {
+        super(certificate, parent, iot, vscode.TreeItemCollapsibleState.Collapsed, things, settings)
+        this.contextValue = `${contextBase}.Things.${this.certificate.activeStatus}`
+    }
+}
+
+/**
+ * Represents an IoT Certificate with the Certificate Folder Node as parent.
+ */
+export class IotCertWithPoliciesNode extends IotCertificateNode implements LoadMoreNode {
+    public constructor(
+        public override readonly certificate: IotCertificate,
+        public override readonly parent: IotCertsFolderNode,
+        public override readonly iot: IotClient,
+        public override readonly things?: string[],
+        protected override readonly settings: ClassToInterfaceType<Settings> = Settings.instance
+    ) {
+        super(certificate, parent, iot, vscode.TreeItemCollapsibleState.Collapsed, things, settings)
+        this.contextValue = `${contextBase}.Policies.${this.certificate.activeStatus}`
+    }
+}
diff --git a/src/iot/explorer/iotNodes.ts b/packages/core/src/awsService/iot/explorer/iotNodes.ts
similarity index 83%
rename from src/iot/explorer/iotNodes.ts
rename to packages/core/src/awsService/iot/explorer/iotNodes.ts
index b3a5771cce8..aaab68b3fd2 100644
--- a/src/iot/explorer/iotNodes.ts
+++ b/packages/core/src/awsService/iot/explorer/iotNodes.ts
@@ -1,14 +1,14 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as vscode from 'vscode'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { IotClient } from '../../shared/clients/iotClient'
-import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
-import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
-import { makeChildrenNodes } from '../../shared/treeview/utils'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { IotClient } from '../../../shared/clients/iotClient'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
+import { makeChildrenNodes } from '../../../shared/treeview/utils'
 import { inspect } from 'util'
 import { IotThingFolderNode } from './iotThingFolderNode'
 import { IotCertsFolderNode } from './iotCertFolderNode'
diff --git a/packages/core/src/awsService/iot/explorer/iotPolicyFolderNode.ts b/packages/core/src/awsService/iot/explorer/iotPolicyFolderNode.ts
new file mode 100644
index 00000000000..ed7a39270d5
--- /dev/null
+++ b/packages/core/src/awsService/iot/explorer/iotPolicyFolderNode.ts
@@ -0,0 +1,106 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { IotClient } from '../../../shared/clients/iotClient'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { LoadMoreNode } from '../../../shared/treeview/nodes/loadMoreNode'
+import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
+import { makeChildrenNodes } from '../../../shared/treeview/utils'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { ChildNodeLoader } from '../../../awsexplorer/childNodeLoader'
+import { ChildNodePage } from '../../../awsexplorer/childNodeLoader'
+import { inspect } from 'util'
+import { getLogger } from '../../../shared/logger/logger'
+import { IotPolicyWithVersionsNode } from './iotPolicyNode'
+import { IotNode } from './iotNodes'
+import { Settings } from '../../../shared/settings'
+import { ClassToInterfaceType } from '../../../shared/utilities/tsUtils'
+
+// Length of certificate ID. The certificate ID is the last segment of the ARN.
+const certIdLength = 64
+
+// Number of digits of the certificate ID to show
+const certPreviewLength = 8
+
+/**
+ * Represents the group of all IoT Policies.
+ */
+export class IotPolicyFolderNode extends AWSTreeNodeBase implements LoadMoreNode {
+    private readonly childLoader = new ChildNodeLoader(this, (token) => this.loadPage(token))
+
+    public constructor(
+        public readonly iot: IotClient,
+        public readonly parent: IotNode,
+        protected readonly settings: ClassToInterfaceType<Settings> = Settings.instance
+    ) {
+        super('Policies', vscode.TreeItemCollapsibleState.Collapsed)
+        this.tooltip = 'IoT Policies'
+        this.contextValue = 'awsIotPoliciesNode'
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        return await makeChildrenNodes({
+            getChildNodes: async () => this.childLoader.getChildren(),
+            getNoChildrenPlaceholderNode: async () =>
+                new PlaceholderNode(this, localize('AWS.explorerNode.iot.noPolicy', '[No Policies found]')),
+        })
+    }
+
+    public async loadMoreChildren(): Promise<void> {
+        await this.childLoader.loadMoreChildren()
+    }
+
+    public isLoadingMoreChildren(): boolean {
+        return this.childLoader.isLoadingMoreChildren()
+    }
+
+    public clearChildren(): void {
+        this.childLoader.clearChildren()
+    }
+
+    private async loadPage(continuationToken: string | undefined): Promise<ChildNodePage<IotPolicyWithVersionsNode>> {
+        getLogger().debug(`Loading page for %O using continuationToken %s`, this, continuationToken)
+        const response = await this.iot.listPolicies({
+            marker: continuationToken,
+            pageSize: this.getMaxItemsPerPage(),
+        })
+        const newPolicies =
+            response.policies
+                ?.filter((policy) => policy.policyArn && policy.policyName)
+                .map(
+                    async (policy) =>
+                        new IotPolicyWithVersionsNode(
+                            { arn: policy.policyArn!, name: policy.policyName! },
+                            this,
+                            this.iot,
+                            (await this.iot.listPolicyTargets({ policyName: policy.policyName! })).map((certId) =>
+                                certId.slice(-certIdLength, -certIdLength + certPreviewLength)
+                            )
+                        )
+                ) ?? []
+
+        const resolvedPolicies = await Promise.all(newPolicies)
+
+        getLogger().debug(`Loaded policies: %O`, newPolicies)
+        return {
+            newContinuationToken: response.nextMarker ?? undefined,
+            newChildren: [...resolvedPolicies],
+        }
+    }
+
+    public async refreshNode(): Promise<void> {
+        this.clearChildren()
+        return vscode.commands.executeCommand('aws.refreshAwsExplorerNode', this)
+    }
+
+    public [inspect.custom](): string {
+        return `IotPolicies`
+    }
+
+    private getMaxItemsPerPage(): number | undefined {
+        return this.settings.getSection('aws').get<number>('iot.maxItemsPerPage')
+    }
+}
diff --git a/packages/core/src/awsService/iot/explorer/iotPolicyNode.ts b/packages/core/src/awsService/iot/explorer/iotPolicyNode.ts
new file mode 100644
index 00000000000..ce104a5e7fa
--- /dev/null
+++ b/packages/core/src/awsService/iot/explorer/iotPolicyNode.ts
@@ -0,0 +1,120 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { IotClient, IotPolicy } from '../../../shared/clients/iotClient'
+
+import { AWSResourceNode } from '../../../shared/treeview/nodes/awsResourceNode'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { inspect } from 'util'
+import { IotPolicyFolderNode } from './iotPolicyFolderNode'
+import { IotCertificateNode } from './iotCertificateNode'
+import { IotPolicyVersionNode } from './iotPolicyVersionNode'
+import { makeChildrenNodes } from '../../../shared/treeview/utils'
+import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
+import { toArrayAsync, toMap, updateInPlace } from '../../../shared/utilities/collectionUtils'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { getIcon } from '../../../shared/icons'
+import { Settings } from '../../../shared/settings'
+import { ClassToInterfaceType } from '../../../shared/utilities/tsUtils'
+import { PolicyVersion } from '@aws-sdk/client-iot'
+
+/**
+ * Represents an IoT Policy that may have either a Certificate Node or the
+ * Policy Folder Node as a parent.
+ */
+export class IotPolicyNode extends AWSTreeNodeBase implements AWSResourceNode {
+    public constructor(
+        public readonly policy: IotPolicy,
+        public readonly parent: IotPolicyFolderNode | IotCertificateNode,
+        public readonly iot: IotClient,
+        collapsibleState: vscode.TreeItemCollapsibleState,
+        certs?: string[],
+        protected readonly settings: ClassToInterfaceType<Settings> = Settings.instance
+    ) {
+        super(policy.name, collapsibleState)
+        this.tooltip = localize(
+            'AWS.explorerNode.iot.policyToolTip',
+            '{0}{1}',
+            policy.name,
+            (certs?.length ?? 0 > 0) ? `\nAttached to: ${certs?.join(', ')}` : ''
+        )
+        this.iconPath = getIcon('aws-iot-policy')
+        this.contextValue = 'awsIotPolicyNode.Certificates'
+    }
+
+    public get arn(): string {
+        return this.policy.arn
+    }
+
+    public get name(): string {
+        return this.policy.name
+    }
+
+    public [inspect.custom](): string {
+        return `IotPolicyNode (policy=${this.policy.name})`
+    }
+}
+
+export class IotPolicyCertNode extends IotPolicyNode {
+    public constructor(
+        public override readonly policy: IotPolicy,
+        public override readonly parent: IotCertificateNode,
+        public override readonly iot: IotClient,
+        protected override readonly settings: ClassToInterfaceType<Settings> = Settings.instance
+    ) {
+        super(policy, parent, iot, vscode.TreeItemCollapsibleState.None, undefined, settings)
+        this.contextValue = 'awsIotPolicyNode.Certificates'
+    }
+}
+
+export class IotPolicyWithVersionsNode extends IotPolicyNode {
+    private readonly versionNodes: Map<string, IotPolicyVersionNode>
+
+    public constructor(
+        public override readonly policy: IotPolicy,
+        public override readonly parent: IotPolicyFolderNode,
+        public override readonly iot: IotClient,
+        certs?: string[],
+        protected override readonly settings: ClassToInterfaceType<Settings> = Settings.instance
+    ) {
+        super(policy, parent, iot, vscode.TreeItemCollapsibleState.Collapsed, certs, settings)
+        this.contextValue = 'awsIotPolicyNode.WithVersions'
+        this.versionNodes = new Map<string, IotPolicyVersionNode>()
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        return await makeChildrenNodes({
+            getChildNodes: async () => {
+                await this.updateChildren()
+
+                return [...this.versionNodes.values()]
+            },
+            sort: (a: IotPolicyVersionNode, b: IotPolicyVersionNode) => {
+                return b.version.createDate!.getTime() - a.version.createDate!.getTime()
+            },
+            getNoChildrenPlaceholderNode: async () =>
+                new PlaceholderNode(this, localize('AWS.explorerNode.iot.noVersions', '[No Policy Versions found]')),
+        })
+    }
+
+    public async updateChildren(): Promise<void> {
+        const versions: Map<string, PolicyVersion> = toMap(
+            await toArrayAsync(this.iot.listPolicyVersions({ policyName: this.policy.name })),
+            (version) => version.versionId
+        )
+
+        updateInPlace(
+            this.versionNodes,
+            versions.keys(),
+            (key) => this.versionNodes.get(key)!.update(versions.get(key)!),
+            (key) => new IotPolicyVersionNode(this.policy, versions.get(key)!, false, this, this.iot)
+        )
+    }
+
+    public async refreshNode(): Promise<void> {
+        return vscode.commands.executeCommand('aws.refreshAwsExplorerNode', this)
+    }
+}
diff --git a/packages/core/src/awsService/iot/explorer/iotPolicyVersionNode.ts b/packages/core/src/awsService/iot/explorer/iotPolicyVersionNode.ts
new file mode 100644
index 00000000000..bd85eb6e8c5
--- /dev/null
+++ b/packages/core/src/awsService/iot/explorer/iotPolicyVersionNode.ts
@@ -0,0 +1,69 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { PolicyVersion } from '@aws-sdk/client-iot'
+import { IotClient, IotPolicy } from '../../../shared/clients/iotClient'
+import { AWSResourceNode } from '../../../shared/treeview/nodes/awsResourceNode'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { inspect } from 'util'
+import { IotPolicyWithVersionsNode } from './iotPolicyNode'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { formatLocalized } from '../../../shared/datetime'
+
+/**
+ * Represents an IoT Policy that may have either a Certificate Node or the
+ * Policy Folder Node as a parent.
+ */
+export class IotPolicyVersionNode extends AWSTreeNodeBase implements AWSResourceNode {
+    public constructor(
+        public policy: IotPolicy,
+        public version: PolicyVersion,
+        public isDefault: boolean,
+        public readonly parent: IotPolicyWithVersionsNode,
+        public readonly iot: IotClient
+    ) {
+        super(
+            localize(
+                'AWS.explorerNode.iot.versionName',
+                'Version {0}{1}',
+                version.versionId,
+                version.isDefaultVersion ? '*' : ''
+            )
+        )
+        this.update(version)
+    }
+
+    public update(version: PolicyVersion): void {
+        this.version = version
+        this.isDefault = version.isDefaultVersion ?? false
+        this.tooltip = localize(
+            'AWS.explorerNode.iot.versionTooltip',
+            'Policy: {0}\nVersion: {1}\n{2}Created: {3}',
+            this.policy.name,
+            this.version.versionId,
+            this.isDefault ? 'DEFAULT\n' : '',
+            formatLocalized(this.version.createDate)
+        )
+        this.label = localize(
+            'AWS.explorerNode.iot.versionName',
+            'Version {0}{1}',
+            version.versionId,
+            version.isDefaultVersion ? '*' : ''
+        )
+        this.contextValue = 'awsIotPolicyVersionNode.' + (this.isDefault ? 'DEFAULT' : 'NONDEFAULT')
+    }
+
+    public get arn(): string {
+        return this.parent.arn
+    }
+
+    public get name(): string {
+        return this.parent.name
+    }
+
+    public [inspect.custom](): string {
+        return `IotPolicyNode (policy=${this.policy.name})`
+    }
+}
diff --git a/packages/core/src/awsService/iot/explorer/iotThingFolderNode.ts b/packages/core/src/awsService/iot/explorer/iotThingFolderNode.ts
new file mode 100644
index 00000000000..e3dee64c896
--- /dev/null
+++ b/packages/core/src/awsService/iot/explorer/iotThingFolderNode.ts
@@ -0,0 +1,91 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { IotClient } from '../../../shared/clients/iotClient'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { LoadMoreNode } from '../../../shared/treeview/nodes/loadMoreNode'
+import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
+import { makeChildrenNodes } from '../../../shared/treeview/utils'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { ChildNodeLoader } from '../../../awsexplorer/childNodeLoader'
+import { ChildNodePage } from '../../../awsexplorer/childNodeLoader'
+import { IotThingNode } from './iotThingNode'
+import { inspect } from 'util'
+import { getLogger } from '../../../shared/logger/logger'
+import { IotNode } from './iotNodes'
+import { Settings } from '../../../shared/settings'
+import { ClassToInterfaceType } from '../../../shared/utilities/tsUtils'
+
+/**
+ * Represents the group of all IoT Things.
+ */
+export class IotThingFolderNode extends AWSTreeNodeBase implements LoadMoreNode {
+    private readonly childLoader = new ChildNodeLoader(this, (token) => this.loadPage(token))
+
+    public constructor(
+        public readonly iot: IotClient,
+        public readonly parent: IotNode,
+        protected readonly settings: ClassToInterfaceType<Settings> = Settings.instance
+    ) {
+        super('Things', vscode.TreeItemCollapsibleState.Collapsed)
+        this.tooltip = 'IoT Things'
+        this.contextValue = 'awsIotThingsNode'
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        return await makeChildrenNodes({
+            getChildNodes: async () => this.childLoader.getChildren(),
+            getNoChildrenPlaceholderNode: async () =>
+                new PlaceholderNode(this, localize('AWS.explorerNode.iot.noThings', '[No Things found]')),
+        })
+    }
+
+    public async loadMoreChildren(): Promise<void> {
+        await this.childLoader.loadMoreChildren()
+    }
+
+    public isLoadingMoreChildren(): boolean {
+        return this.childLoader.isLoadingMoreChildren()
+    }
+
+    public clearChildren(): void {
+        this.childLoader.clearChildren()
+    }
+
+    private async loadPage(continuationToken: string | undefined): Promise<ChildNodePage<IotThingNode>> {
+        getLogger().debug(`Loading page for %O using continuationToken %s`, this, continuationToken)
+        const response = await this.iot.listThings({
+            nextToken: continuationToken,
+            maxResults: this.getMaxItemsPerPage(),
+        })
+
+        let newThings: IotThingNode[] = []
+        if (response.things) {
+            newThings = response.things
+                .filter((thing) => thing.thingName && thing.thingArn)
+                .map((thing) => new IotThingNode({ name: thing.thingName!, arn: thing.thingArn! }, this, this.iot))
+        }
+
+        getLogger().debug(`Loaded things: %O`, newThings)
+        return {
+            newContinuationToken: response.nextToken ?? undefined,
+            newChildren: [...newThings],
+        }
+    }
+
+    public async refreshNode(): Promise<void> {
+        this.clearChildren()
+        return vscode.commands.executeCommand('aws.refreshAwsExplorerNode', this)
+    }
+
+    public [inspect.custom](): string {
+        return `IotThings`
+    }
+
+    private getMaxItemsPerPage(): number | undefined {
+        return this.settings.getSection('aws').get<number>('iot.maxItemsPerPage')
+    }
+}
diff --git a/packages/core/src/awsService/iot/explorer/iotThingNode.ts b/packages/core/src/awsService/iot/explorer/iotThingNode.ts
new file mode 100644
index 00000000000..c6bc14014a3
--- /dev/null
+++ b/packages/core/src/awsService/iot/explorer/iotThingNode.ts
@@ -0,0 +1,115 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { ChildNodePage } from '../../../awsexplorer/childNodeLoader'
+import { IotThing, IotClient } from '../../../shared/clients/iotClient'
+
+import { AWSResourceNode } from '../../../shared/treeview/nodes/awsResourceNode'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { LoadMoreNode } from '../../../shared/treeview/nodes/loadMoreNode'
+import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
+import { makeChildrenNodes } from '../../../shared/treeview/utils'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { ChildNodeLoader } from '../../../awsexplorer/childNodeLoader'
+import { inspect } from 'util'
+import { getLogger } from '../../../shared/logger/logger'
+import { IotThingFolderNode } from './iotThingFolderNode'
+import { IotThingCertNode } from './iotCertificateNode'
+import { getIcon } from '../../../shared/icons'
+import { Settings } from '../../../shared/settings'
+import { ClassToInterfaceType } from '../../../shared/utilities/tsUtils'
+
+/**
+ * Represents an IoT Thing that may have attached certificates.
+ */
+export class IotThingNode extends AWSTreeNodeBase implements AWSResourceNode, LoadMoreNode {
+    private readonly childLoader = new ChildNodeLoader(this, (token) => this.loadPage(token))
+
+    public constructor(
+        public readonly thing: IotThing,
+        public readonly parent: IotThingFolderNode,
+        public readonly iot: IotClient,
+        protected readonly settings: ClassToInterfaceType<Settings> = Settings.instance
+    ) {
+        super(thing.name, vscode.TreeItemCollapsibleState.Collapsed)
+        this.tooltip = thing.name
+        this.iconPath = getIcon('aws-iot-thing')
+        this.contextValue = 'awsIotThingNode'
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        return await makeChildrenNodes({
+            getChildNodes: async () => this.childLoader.getChildren(),
+            getNoChildrenPlaceholderNode: async () =>
+                new PlaceholderNode(this, localize('AWS.explorerNode.iot.noCerts', '[No Certificates found]')),
+        })
+    }
+
+    public async loadMoreChildren(): Promise<void> {
+        await this.childLoader.loadMoreChildren()
+    }
+
+    public isLoadingMoreChildren(): boolean {
+        return this.childLoader.isLoadingMoreChildren()
+    }
+
+    public clearChildren(): void {
+        this.childLoader.clearChildren()
+    }
+
+    private async loadPage(continuationToken: string | undefined): Promise<ChildNodePage<IotThingCertNode>> {
+        getLogger().debug(`Loading page for %O using continuationToken %s`, this, continuationToken)
+        const response = await this.iot.listThingCertificates({
+            thingName: this.thing.name,
+            nextToken: continuationToken,
+            maxResults: this.getMaxItemsPerPage(),
+        })
+
+        const newCerts =
+            response.certificates
+                ?.filter((cert) => cert.certificateArn && cert.certificateId && cert.status && cert.creationDate)
+                .map(
+                    (cert) =>
+                        new IotThingCertNode(
+                            {
+                                arn: cert.certificateArn!,
+                                id: cert.certificateId!,
+                                activeStatus: cert.status!,
+                                creationDate: cert.creationDate!,
+                            },
+                            this,
+                            this.iot
+                        )
+                ) ?? []
+
+        getLogger().debug(`Loaded certificates: %O`, newCerts)
+        return {
+            newContinuationToken: response.nextToken ?? undefined,
+            newChildren: [...newCerts],
+        }
+    }
+
+    public get arn(): string {
+        return this.thing.arn
+    }
+
+    public get name(): string {
+        return this.thing.name
+    }
+
+    public async refreshNode(): Promise<void> {
+        this.clearChildren()
+        return vscode.commands.executeCommand('aws.refreshAwsExplorerNode', this)
+    }
+
+    public [inspect.custom](): string {
+        return `IotThingNode (thing=${this.thing.name})`
+    }
+
+    private getMaxItemsPerPage(): number | undefined {
+        return this.settings.getSection('aws').get<number>('iot.maxItemsPerPage')
+    }
+}
diff --git a/packages/core/src/awsService/redshift/activation.ts b/packages/core/src/awsService/redshift/activation.ts
new file mode 100644
index 00000000000..e7af970c26a
--- /dev/null
+++ b/packages/core/src/awsService/redshift/activation.ts
@@ -0,0 +1,144 @@
+/* eslint-disable header/header */
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { ExtContext } from '../../shared/extensions'
+import * as vscode from 'vscode'
+import { RedshiftNotebookSerializer } from './notebook/redshiftNotebookSerializer'
+import { RedshiftNotebookController } from './notebook/redshiftNotebookController'
+import { CellStatusBarItemProvider } from './notebook/cellStatusBarItemProvider'
+import { Commands } from '../../shared/vscode/commands2'
+import { NotebookConnectionWizard, RedshiftNodeConnectionWizard } from './wizards/connectionWizard'
+import { deleteConnection, ConnectionParams, ConnectionType } from './models/models'
+import { DefaultRedshiftClient } from '../../shared/clients/redshiftClient'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { RedshiftWarehouseNode } from './explorer/redshiftWarehouseNode'
+import { ToolkitError } from '../../shared/errors'
+import { showViewLogsMessage } from '../../shared/utilities/messages'
+import { showConnectionMessage } from './messageUtils'
+import globals from '../../shared/extensionGlobals'
+
+export async function activate(ctx: ExtContext): Promise<void> {
+    if ('NotebookEdit' in vscode) {
+        ctx.extensionContext.subscriptions.push(
+            vscode.workspace.registerNotebookSerializer('aws-redshift-sql-notebook', new RedshiftNotebookSerializer())
+        )
+        vscode.notebooks.registerNotebookCellStatusBarItemProvider(
+            'aws-redshift-sql-notebook',
+            new CellStatusBarItemProvider()
+        )
+        const redshiftNotebookController = new RedshiftNotebookController()
+        ctx.extensionContext.subscriptions.push(
+            Commands.register(
+                'aws.redshift.notebookConnectClicked',
+                getNotebookConnectClickedHandler(ctx, redshiftNotebookController)
+            )
+        )
+
+        ctx.extensionContext.subscriptions.push(
+            Commands.register(
+                'aws.redshift.createNotebookClicked',
+                getCreateNotebookClickedHandler(redshiftNotebookController)
+            )
+        )
+
+        ctx.extensionContext.subscriptions.push(
+            Commands.register('aws.redshift.editConnection', getEditConnectionHandler())
+        )
+
+        ctx.extensionContext.subscriptions.push(
+            Commands.register('aws.redshift.deleteConnection', getDeleteConnectionHandler())
+        )
+    }
+}
+
+function getCreateNotebookClickedHandler(redshiftNotebookController: RedshiftNotebookController) {
+    return async (parentNode: RedshiftWarehouseNode) => {
+        try {
+            const region = parentNode.redshiftClient.regionCode
+            const celldata = new vscode.NotebookCellData(vscode.NotebookCellKind.Code, '', 'sql')
+            celldata.metadata = { connectionParams: parentNode.connectionParams }
+            const nbdata = new vscode.NotebookData([celldata])
+            nbdata.metadata = { connectionParams: parentNode.connectionParams }
+            const nbdoc = await vscode.workspace.openNotebookDocument('aws-redshift-sql-notebook', nbdata)
+            await (vscode.window as any).showNotebookDocument(nbdoc)
+            redshiftNotebookController.redshiftClient = new DefaultRedshiftClient(region)
+        } catch (e) {
+            const err = e as Error
+            void showViewLogsMessage(
+                localize('AWS.command.notebook.fail', 'Failed to create notebook: {0}', err.message)
+            )
+        }
+    }
+}
+
+function getNotebookConnectClickedHandler(ctx: ExtContext, redshiftNotebookController: RedshiftNotebookController) {
+    return async (cell: vscode.NotebookCell, refreshCellStatusBar: () => void) => {
+        const warehouseConnectionWizard = new NotebookConnectionWizard(ctx.regionProvider)
+        let connectionParams: ConnectionParams | undefined = await warehouseConnectionWizard.run()
+        if (!connectionParams) {
+            return
+        }
+        redshiftNotebookController.redshiftClient = new DefaultRedshiftClient(connectionParams.region!.id)
+        try {
+            const redshiftClient = (redshiftNotebookController.redshiftClient = new DefaultRedshiftClient(
+                connectionParams.region!.id
+            ))
+            if (connectionParams.connectionType === ConnectionType.DatabaseUser) {
+                const secretArnFetched = await redshiftClient.createSecretFromConnectionParams(connectionParams)
+                if (!secretArnFetched) {
+                    throw new ToolkitError('secret arn could not be fetched')
+                }
+                connectionParams.secret = secretArnFetched
+            }
+            await redshiftNotebookController.redshiftClient.listDatabases(connectionParams!)
+            showConnectionMessage(connectionParams.warehouseIdentifier, undefined)
+        } catch (error) {
+            showConnectionMessage(connectionParams.warehouseIdentifier, error as Error)
+            connectionParams = undefined
+        }
+        const edit = new vscode.WorkspaceEdit()
+        // NotebookEdit is  only available for engine version > 1.68.0
+        const nbEdit = (vscode as any).NotebookEdit.updateNotebookMetadata({
+            connectionParams: connectionParams,
+        })
+        edit.set(cell.notebook.uri, [nbEdit])
+        await vscode.workspace.applyEdit(edit)
+        refreshCellStatusBar()
+    }
+}
+
+function getEditConnectionHandler() {
+    return async (redshiftWarehouseNode: RedshiftWarehouseNode) => {
+        try {
+            const connectionParams = await new RedshiftNodeConnectionWizard(redshiftWarehouseNode).run()
+            if (connectionParams) {
+                if (connectionParams.connectionType === ConnectionType.DatabaseUser) {
+                    const secretArnFetched =
+                        await redshiftWarehouseNode.redshiftClient.createSecretFromConnectionParams(connectionParams)
+                    if (!secretArnFetched) {
+                        throw new Error('secret arn could not be fetched')
+                    }
+                    connectionParams.secret = secretArnFetched
+                }
+                redshiftWarehouseNode.setConnectionParams(connectionParams)
+                await globals.globalState.saveRedshiftConnection(
+                    redshiftWarehouseNode.arn,
+                    redshiftWarehouseNode.connectionParams
+                )
+                await vscode.commands.executeCommand('aws.refreshAwsExplorerNode', redshiftWarehouseNode)
+            }
+        } catch (error) {
+            showConnectionMessage(redshiftWarehouseNode.name, error as Error)
+        }
+    }
+}
+
+function getDeleteConnectionHandler() {
+    return async (redshiftWarehouseNode: RedshiftWarehouseNode) => {
+        redshiftWarehouseNode.connectionParams = undefined
+        await globals.globalState.saveRedshiftConnection(redshiftWarehouseNode.arn, deleteConnection)
+        await vscode.commands.executeCommand('aws.refreshAwsExplorerNode', redshiftWarehouseNode)
+    }
+}
diff --git a/packages/core/src/awsService/redshift/explorer/redshiftDatabaseNode.ts b/packages/core/src/awsService/redshift/explorer/redshiftDatabaseNode.ts
new file mode 100644
index 00000000000..d882e507972
--- /dev/null
+++ b/packages/core/src/awsService/redshift/explorer/redshiftDatabaseNode.ts
@@ -0,0 +1,79 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { DefaultRedshiftClient } from '../../../shared/clients/redshiftClient'
+import { makeChildrenNodes } from '../../../shared/treeview/utils'
+import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { RedshiftSchemaNode } from './redshiftSchemaNode'
+import { ConnectionParams } from '../models/models'
+import { LoadMoreNode } from '../../../shared/treeview/nodes/loadMoreNode'
+import { ChildNodeLoader, ChildNodePage } from '../../../awsexplorer/childNodeLoader'
+import { getIcon } from '../../../shared/icons'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { showViewLogsFetchMessage } from '../messageUtils'
+
+export class RedshiftDatabaseNode extends AWSTreeNodeBase implements LoadMoreNode {
+    private readonly childLoader = new ChildNodeLoader(this, (token) => this.loadPage(token))
+
+    public constructor(
+        public readonly databaseName: string,
+        private readonly redshiftClient: DefaultRedshiftClient,
+        private readonly connectionParams: ConnectionParams
+    ) {
+        super(databaseName, vscode.TreeItemCollapsibleState.Collapsed)
+        this.contextValue = 'awsReshiftDatabaseNode'
+        this.tooltip = databaseName
+        this.iconPath = getIcon('aws-redshift-database')
+    }
+
+    public async loadMoreChildren(): Promise<void> {
+        await this.childLoader.loadMoreChildren()
+    }
+
+    public isLoadingMoreChildren(): boolean {
+        return this.childLoader.isLoadingMoreChildren()
+    }
+
+    public clearChildren(): void {
+        this.childLoader.clearChildren()
+    }
+
+    private async loadPage(token?: string): Promise<ChildNodePage<RedshiftSchemaNode>> {
+        return telemetry.redshift_listSchemas.run(async () => {
+            const newChildren: RedshiftSchemaNode[] = []
+            try {
+                // this ensures that when listing schemas (thereafter, when we list tables) we maintain the database name for which we're listing schemas/tables.
+                if (this.connectionParams.database !== this.databaseName) {
+                    this.connectionParams.database = this.databaseName
+                }
+                const listSchemaResponse = await this.redshiftClient.listSchemas(this.connectionParams, token)
+                if (listSchemaResponse.Schemas?.sort()) {
+                    newChildren.push(
+                        ...listSchemaResponse.Schemas.map((schema) => {
+                            return new RedshiftSchemaNode(schema, this.redshiftClient, this.connectionParams)
+                        })
+                    )
+                }
+                return {
+                    newChildren: newChildren,
+                    newContinuationToken: listSchemaResponse.NextToken,
+                }
+            } catch (error) {
+                showViewLogsFetchMessage('schemas', this.databaseName, error as Error)
+                return Promise.reject(error)
+            }
+        })
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        return await makeChildrenNodes({
+            getChildNodes: async () => this.childLoader.getChildren(),
+            getNoChildrenPlaceholderNode: async () =>
+                new PlaceholderNode(this, localize('AWS.explorerNode.redshiftClient.noSchemas', 'No schemas found')),
+        })
+    }
+}
diff --git a/packages/core/src/awsService/redshift/explorer/redshiftNode.ts b/packages/core/src/awsService/redshift/explorer/redshiftNode.ts
new file mode 100644
index 00000000000..4c245b7f4de
--- /dev/null
+++ b/packages/core/src/awsService/redshift/explorer/redshiftNode.ts
@@ -0,0 +1,157 @@
+/*!
+ * Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// eslint-disable-next-line header/header
+import * as vscode from 'vscode'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
+import { makeChildrenNodes } from '../../../shared/treeview/utils'
+import { inspect } from 'util'
+import { DefaultRedshiftClient } from '../../../shared/clients/redshiftClient'
+import { RedshiftWarehouseNode } from './redshiftWarehouseNode'
+import { RedshiftWarehouseType } from '../models/models'
+import { AWSResourceNode } from '../../../shared/treeview/nodes/awsResourceNode'
+import { LoadMoreNode } from '../../../shared/treeview/nodes/loadMoreNode'
+import { ChildNodeLoader, ChildNodePage } from '../../../awsexplorer/childNodeLoader'
+import { getLogger } from '../../../shared/logger/logger'
+
+/**
+ * An AWS Explorer node representing Redshift.
+ *
+ * Contains clusters for a specific region as child nodes.
+ */
+export class RedshiftNode extends AWSTreeNodeBase implements LoadMoreNode {
+    private readonly childLoader = new ChildNodeLoader(this, (token) => this.loadPage(token))
+
+    // the constructor below single parameter : 'redshiftClient' which is an instance of the DefaultRedshiftClient used for interacting with Redshift services.
+    public constructor(public readonly redshiftClient: DefaultRedshiftClient) {
+        super('Redshift', vscode.TreeItemCollapsibleState.Collapsed)
+        this.contextValue = 'awsRedshiftNode'
+    }
+
+    public async loadMoreChildren(): Promise<void> {
+        await this.childLoader.loadMoreChildren()
+    }
+
+    public isLoadingMoreChildren(): boolean {
+        return this.childLoader.isLoadingMoreChildren()
+    }
+
+    public clearChildren(): void {
+        this.childLoader.clearChildren()
+    }
+
+    /**
+     * Loads a page of provisioned clusters and serverless workgroups
+     * There are four cases:
+     * 1. @param token is undefined -> this is only for the first load use-case, then loads both provisioned clusters and serverless workgroups
+     * 2. @param token is defined but one of the underlying tokens is empty string -> loads the next page for the non-empty one.
+     * 3. @param token is defined but both of the underlying tokens are empty string (this is not a real case since we handle this at the end)
+     * 4. @param token is defined and none of the underlying tokens are empty -> loads both
+     * @param token compositeContinuationToken (@link: CompositeContinuationToken) stringified
+     * @returns
+     */
+    private async loadPage(token?: string): Promise<ChildNodePage<RedshiftWarehouseNode>> {
+        let newProvisionedToken: string
+        let newServerlessToken: string
+        let newChildrenNodes: RedshiftWarehouseNode[] = []
+        if (token) {
+            const compositeContinuationToken = JSON.parse(token) as CompositeContinuationToken
+            ;[newChildrenNodes, newProvisionedToken, newServerlessToken] =
+                await this.loadNodes(compositeContinuationToken)
+        } else {
+            ;[newChildrenNodes, newProvisionedToken, newServerlessToken] = await this.loadNodes(undefined)
+        }
+
+        // This check is needed since ChildNodeLoader will continue to show the Load more button if the newContinuationToken is not undefined
+        if (newProvisionedToken === '' && newServerlessToken === '') {
+            return {
+                newChildren: newChildrenNodes,
+                newContinuationToken: undefined,
+            }
+        } else {
+            return {
+                newChildren: newChildrenNodes,
+                newContinuationToken: JSON.stringify({
+                    provisionedToken: newProvisionedToken,
+                    serverlessToken: newServerlessToken,
+                }),
+            }
+        }
+    }
+
+    private async loadNodes(
+        compositeContinuationToken: CompositeContinuationToken | undefined
+    ): Promise<[RedshiftWarehouseNode[], string, string]> {
+        const childNodes: RedshiftWarehouseNode[] = []
+        let newServerlessToken: string = ''
+        let newProvisionedToken: string = ''
+        // Handle provisioned clusters
+        if (compositeContinuationToken === undefined || compositeContinuationToken.provisionedToken !== '') {
+            const response = await this.redshiftClient.describeProvisionedClusters(
+                compositeContinuationToken?.provisionedToken
+            )
+            if (response.Clusters) {
+                const provisionedNodes = response.Clusters.map((cluster) => {
+                    return new RedshiftWarehouseNode(
+                        this,
+                        {
+                            arn: cluster.ClusterNamespaceArn,
+                            name: cluster.ClusterIdentifier,
+                        } as AWSResourceNode,
+                        RedshiftWarehouseType.PROVISIONED
+                    )
+                })
+                childNodes.push(...provisionedNodes)
+                newProvisionedToken = response.Marker ?? ''
+            }
+        }
+        // Handle serverless workgroups
+        if (compositeContinuationToken === undefined || compositeContinuationToken.serverlessToken !== '') {
+            try {
+                const response = await this.redshiftClient.listServerlessWorkgroups(
+                    compositeContinuationToken?.serverlessToken
+                )
+                if (response.workgroups) {
+                    const serverlessNodes = response.workgroups.map((workgroup) => {
+                        return new RedshiftWarehouseNode(
+                            this,
+                            { arn: workgroup.workgroupArn, name: workgroup.workgroupName } as AWSResourceNode,
+                            RedshiftWarehouseType.SERVERLESS
+                        )
+                    })
+                    childNodes.push(...serverlessNodes)
+                    newServerlessToken = response.nextToken ?? ''
+                }
+            } catch (error) {
+                getLogger().error("Serverless workgroup operation isn't supported or failed: %O", error)
+                // Continue without interrupting the provisioned cluster loading
+            }
+        }
+        return [childNodes, newProvisionedToken, newServerlessToken]
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        return await makeChildrenNodes({
+            getChildNodes: async () => this.childLoader.getChildren(),
+            getNoChildrenPlaceholderNode: async () =>
+                new PlaceholderNode(this, localize('AWS.explorerNode.redshiftClient.noClusters', 'No cluster found')),
+        })
+    }
+
+    public async createCluster(clusterName: string): Promise<void> {
+        // Code for creating redshiftClient cluster
+    }
+
+    public [inspect.custom](): string {
+        return 'RedshiftNode'
+    }
+}
+
+interface CompositeContinuationToken {
+    provisionedToken: string
+    serverlessToken: string
+}
diff --git a/packages/core/src/awsService/redshift/explorer/redshiftSchemaNode.ts b/packages/core/src/awsService/redshift/explorer/redshiftSchemaNode.ts
new file mode 100644
index 00000000000..4b257e4d1ed
--- /dev/null
+++ b/packages/core/src/awsService/redshift/explorer/redshiftSchemaNode.ts
@@ -0,0 +1,78 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { DefaultRedshiftClient } from '../../../shared/clients/redshiftClient'
+import { makeChildrenNodes } from '../../../shared/treeview/utils'
+import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { RedshiftTableNode } from './redshiftTableNode'
+import { ConnectionParams } from '../models/models'
+import { ChildNodeLoader, ChildNodePage } from '../../../awsexplorer/childNodeLoader'
+import { LoadMoreNode } from '../../../shared/treeview/nodes/loadMoreNode'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { getIcon } from '../../../shared/icons'
+import { showViewLogsFetchMessage } from '../messageUtils'
+
+export class RedshiftSchemaNode extends AWSTreeNodeBase implements LoadMoreNode {
+    private readonly childLoader = new ChildNodeLoader(this, (token) => this.loadPage(token))
+    public constructor(
+        public readonly schemaName: string,
+        public readonly redshiftClient: DefaultRedshiftClient,
+        private readonly connectionParams: ConnectionParams
+    ) {
+        super(schemaName, vscode.TreeItemCollapsibleState.Collapsed)
+        this.contextValue = 'awsRedshiftSchemaNode'
+        this.tooltip = schemaName
+        this.iconPath = getIcon('aws-redshift-schema')
+    }
+
+    public async loadMoreChildren(): Promise<void> {
+        await this.childLoader.loadMoreChildren()
+    }
+
+    public isLoadingMoreChildren(): boolean {
+        return this.childLoader.isLoadingMoreChildren()
+    }
+
+    public clearChildren(): void {
+        this.childLoader.clearChildren()
+    }
+
+    private async loadPage(token?: string): Promise<ChildNodePage<RedshiftTableNode>> {
+        return telemetry.redshift_listTables.run(async () => {
+            const newChildren: RedshiftTableNode[] = []
+            try {
+                const listTablesResponse = await this.redshiftClient.listTables(
+                    this.connectionParams,
+                    this.schemaName,
+                    token
+                )
+                if (listTablesResponse.Tables?.sort()) {
+                    newChildren.push(
+                        ...listTablesResponse.Tables.filter((table) => !table.name?.endsWith('_pkey')).map((table) => {
+                            return new RedshiftTableNode(table.name ?? 'UnknownTable')
+                        })
+                    )
+                }
+                return {
+                    newChildren: newChildren,
+                    newContinuationToken: listTablesResponse.NextToken,
+                }
+            } catch (error) {
+                showViewLogsFetchMessage('tables', this.schemaName, error as Error)
+                return Promise.reject(error)
+            }
+        })
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        return await makeChildrenNodes({
+            getChildNodes: async () => this.childLoader.getChildren(),
+            getNoChildrenPlaceholderNode: async () =>
+                new PlaceholderNode(this, localize('AWS.explorerNode.redshiftClient.noTables', 'No tables found')),
+        })
+    }
+}
diff --git a/packages/core/src/awsService/redshift/explorer/redshiftTableNode.ts b/packages/core/src/awsService/redshift/explorer/redshiftTableNode.ts
new file mode 100644
index 00000000000..f590dab45f3
--- /dev/null
+++ b/packages/core/src/awsService/redshift/explorer/redshiftTableNode.ts
@@ -0,0 +1,17 @@
+/*!
+ * Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+// eslint-disable-next-line header/header
+import * as vscode from 'vscode'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { getIcon } from '../../../shared/icons'
+
+export class RedshiftTableNode extends AWSTreeNodeBase {
+    public constructor(public readonly tableName: string) {
+        super(tableName, vscode.TreeItemCollapsibleState.None)
+        this.contextValue = 'awsRedshiftTableNode'
+        this.tooltip = tableName
+        this.iconPath = getIcon('aws-redshift-table')
+    }
+}
diff --git a/packages/core/src/awsService/redshift/explorer/redshiftWarehouseNode.ts b/packages/core/src/awsService/redshift/explorer/redshiftWarehouseNode.ts
new file mode 100644
index 00000000000..26947893c82
--- /dev/null
+++ b/packages/core/src/awsService/redshift/explorer/redshiftWarehouseNode.ts
@@ -0,0 +1,178 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { AWSResourceNode } from '../../../shared/treeview/nodes/awsResourceNode'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import * as vscode from 'vscode'
+import globals from '../../../shared/extensionGlobals'
+import { RedshiftNode } from './redshiftNode'
+import { makeChildrenNodes } from '../../../shared/treeview/utils'
+import { RedshiftDatabaseNode } from './redshiftDatabaseNode'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { LoadMoreNode } from '../../../shared/treeview/nodes/loadMoreNode'
+import { ChildNodeLoader, ChildNodePage } from '../../../awsexplorer/childNodeLoader'
+import { DefaultRedshiftClient } from '../../../shared/clients/redshiftClient'
+import { deleteConnection, ConnectionParams, ConnectionType, RedshiftWarehouseType } from '../models/models'
+import { RedshiftNodeConnectionWizard } from '../wizards/connectionWizard'
+import { ListDatabasesResponse } from '@aws-sdk/client-redshift-data'
+import { getIcon } from '../../../shared/icons'
+import { AWSCommandTreeNode } from '../../../shared/treeview/nodes/awsCommandTreeNode'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { createLogsConnectionMessage, showConnectionMessage } from '../messageUtils'
+
+export class CreateNotebookNode extends AWSCommandTreeNode {
+    constructor(parent: RedshiftWarehouseNode) {
+        super(parent, 'Create-Notebook', 'aws.redshift.createNotebookClicked', [parent])
+        this.iconPath = getIcon('vscode-debug-start')
+    }
+    toJSON() {
+        // Exclude the 'redshiftWarehouse' property from serialization
+        return { ...this, parent: undefined }
+    }
+}
+
+export class RedshiftWarehouseNode extends AWSTreeNodeBase implements AWSResourceNode, LoadMoreNode {
+    private readonly childLoader = new ChildNodeLoader(this, (token) => this.loadPage(token))
+    public arn: string
+    public name: string
+    public redshiftClient: DefaultRedshiftClient
+    public connectionParams?: ConnectionParams
+
+    constructor(
+        public readonly parent: RedshiftNode,
+        public readonly redshiftWarehouse: AWSResourceNode,
+        public readonly warehouseType: RedshiftWarehouseType
+    ) {
+        super(redshiftWarehouse.name, vscode.TreeItemCollapsibleState.Collapsed)
+        this.tooltip = redshiftWarehouse.name
+        this.contextValue = 'awsRedshiftWarehouseNode'
+        this.arn = redshiftWarehouse.arn
+        this.name = redshiftWarehouse.name
+        this.redshiftClient = parent.redshiftClient
+        const existingConnectionParams = globals.globalState.getRedshiftConnection(this.arn)
+        if (existingConnectionParams && existingConnectionParams !== deleteConnection) {
+            this.connectionParams = existingConnectionParams as ConnectionParams
+            this.iconPath = getIcon('aws-redshift-cluster-connected')
+        } else {
+            this.iconPath = getIcon('aws-redshift-cluster')
+        }
+    }
+
+    public setConnectionParams(connectionParams: ConnectionParams) {
+        this.connectionParams = connectionParams
+    }
+
+    public async loadMoreChildren(): Promise<void> {
+        await this.childLoader.loadMoreChildren()
+    }
+
+    public isLoadingMoreChildren(): boolean {
+        return this.childLoader.isLoadingMoreChildren()
+    }
+
+    public clearChildren(): void {
+        this.childLoader.clearChildren()
+    }
+
+    private async loadPage(token?: string): Promise<ChildNodePage<AWSTreeNodeBase>> {
+        return telemetry.redshift_listDatabases.run(async () => {
+            const childNodes: RedshiftDatabaseNode[] = []
+            // this.connectionParams cannot null here because loadPage should be called only after the connection wizard runs.
+            try {
+                const listDatabasesResponse: ListDatabasesResponse = await this.redshiftClient.listDatabases(
+                    this.connectionParams!,
+                    token
+                )
+
+                if (listDatabasesResponse.Databases?.sort()) {
+                    childNodes.push(
+                        ...listDatabasesResponse.Databases.map((db) => {
+                            return new RedshiftDatabaseNode(db, this.redshiftClient, this.connectionParams!)
+                        })
+                    )
+                }
+
+                return {
+                    newContinuationToken: listDatabasesResponse.NextToken,
+                    newChildren: childNodes,
+                }
+            } catch (error) {
+                createLogsConnectionMessage(this.redshiftWarehouse.name, error as Error)
+                return Promise.reject(error)
+            }
+        })
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        return await makeChildrenNodes({
+            getChildNodes: async () => {
+                this.childLoader.clearChildren()
+                const existingConnectionParams = globals.globalState.getRedshiftConnection(this.arn)
+                if (existingConnectionParams && existingConnectionParams === deleteConnection) {
+                    // connection is deleted but explorer is not refreshed: return clickToEstablishConnectionNode
+                    await globals.globalState.saveRedshiftConnection(this.arn, undefined)
+                    return this.getClickToEstablishConnectionNode()
+                } else if (existingConnectionParams) {
+                    // valid connectionParams: update the redshiftWarehouseNode
+                    this.connectionParams = existingConnectionParams
+                } else {
+                    // No connectionParams: trigger connection wizard to get user input
+                    this.connectionParams = await new RedshiftNodeConnectionWizard(this).run()
+                    if (!this.connectionParams) {
+                        return this.getClickToEstablishConnectionNode()
+                    }
+
+                    if (this.connectionParams.connectionType === ConnectionType.DatabaseUser) {
+                        const secretArnFetched = await this.redshiftClient.createSecretFromConnectionParams(
+                            this.connectionParams
+                        )
+                        if (!secretArnFetched) {
+                            throw new Error('secret arn could not be fetched')
+                        }
+                        this.connectionParams.secret = secretArnFetched
+                    }
+                }
+                try {
+                    const childNodes = await this.childLoader.getChildren()
+                    const startButtonNode = new CreateNotebookNode(this)
+                    childNodes.unshift(startButtonNode)
+                    await globals.globalState.saveRedshiftConnection(this.arn, this.connectionParams)
+                    return childNodes
+                } catch (error) {
+                    showConnectionMessage(this.redshiftWarehouse.name, error as Error)
+                    await globals.globalState.saveRedshiftConnection(this.arn, undefined)
+                    return this.getRetryNode()
+                }
+            },
+            getNoChildrenPlaceholderNode: async () => this.getClickToEstablishConnectionNode()[0],
+        })
+    }
+
+    private getClickToEstablishConnectionNode(): AWSCommandTreeNode[] {
+        return [
+            new AWSCommandTreeNode(
+                this,
+                localize('AWS.redshift.clickToEstablishConnection', 'Click to connect'),
+                'aws.refreshAwsExplorerNode',
+                [this]
+            ),
+        ]
+    }
+
+    private getRetryNode(): AWSCommandTreeNode[] {
+        return [
+            new AWSCommandTreeNode(
+                this,
+                localize('AWS.redshift.connectionError.retry', 'Unable to get databases, click here to retry'),
+                'aws.refreshAwsExplorerNode',
+                [this]
+            ),
+        ]
+    }
+
+    toJSON() {
+        // Exclude the 'redshiftWarehouse' property from serialization
+        return { ...this, redshiftWarehouse: undefined }
+    }
+}
diff --git a/packages/core/src/awsService/redshift/messageUtils.ts b/packages/core/src/awsService/redshift/messageUtils.ts
new file mode 100644
index 00000000000..a1e8420b84d
--- /dev/null
+++ b/packages/core/src/awsService/redshift/messageUtils.ts
@@ -0,0 +1,49 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../../shared/extensionGlobals'
+import { getLogger } from '../../shared/logger/logger'
+import { showViewLogsMessage } from '../../shared/utilities/messages'
+
+/**
+ * Show the connection message in output channel. Log the error message if connection fails.
+ * @param warehouseIdentifier
+ * @param error
+ */
+export function showConnectionMessage(warehouseIdentifier: string, error: Error | undefined) {
+    const outputChannel = globals.outputChannel
+    outputChannel.show(true)
+    const outputMessage = createLogsConnectionMessage(warehouseIdentifier, error)
+    outputChannel.appendLine(outputMessage)
+}
+
+/**
+ * Create the connection message and log the error if the connection fails.
+ * @param warehouseIdentifier
+ * @param error
+ * @returns the connection message to show
+ */
+export function createLogsConnectionMessage(warehouseIdentifier: string, error: Error | undefined): string {
+    let connectionMessage = ''
+    if (!error) {
+        connectionMessage = `Redshift: connected to: ${warehouseIdentifier}`
+    } else {
+        connectionMessage = `Redshift: failed to connect to: ${warehouseIdentifier}: ${(error as Error).message}`
+        getLogger().error(connectionMessage)
+    }
+    return connectionMessage
+}
+
+/**
+ * Log the fetching error message and show a window with "View Logs" button
+ * @param fetchType
+ * @param identifier
+ * @param error
+ */
+export function showViewLogsFetchMessage(fetchType: string, identifier: string, error: Error) {
+    const message = `Redshift: failed to fetch ${fetchType} for ${identifier}: ${(error as Error).message}`
+    getLogger().error(message)
+    void showViewLogsMessage(message)
+}
diff --git a/packages/core/src/awsService/redshift/models/models.ts b/packages/core/src/awsService/redshift/models/models.ts
new file mode 100644
index 00000000000..603cf495fb6
--- /dev/null
+++ b/packages/core/src/awsService/redshift/models/models.ts
@@ -0,0 +1,34 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Region } from '../../../shared/regions/endpoints'
+
+// Sigil treated such that the connection wizard is not triggered during explorer node refresh after
+// connection deletion.
+export const deleteConnection = 'DELETE_CONNECTION' as const
+
+export class ConnectionParams {
+    constructor(
+        public readonly connectionType: ConnectionType,
+        public database: string,
+        public readonly warehouseIdentifier: string,
+        public readonly warehouseType: RedshiftWarehouseType,
+        public username?: string,
+        public readonly region?: Region,
+        public password?: string,
+        public secret?: string
+    ) {}
+}
+
+export enum ConnectionType {
+    DatabaseUser = 'Database user name and password',
+    SecretsManager = 'AWS Secrets Manager',
+    TempCreds = 'Temporary credentials',
+}
+
+export enum RedshiftWarehouseType {
+    PROVISIONED,
+    SERVERLESS,
+}
diff --git a/packages/core/src/awsService/redshift/notebook/cellStatusBarItemProvider.ts b/packages/core/src/awsService/redshift/notebook/cellStatusBarItemProvider.ts
new file mode 100644
index 00000000000..7846ead15eb
--- /dev/null
+++ b/packages/core/src/awsService/redshift/notebook/cellStatusBarItemProvider.ts
@@ -0,0 +1,53 @@
+/* eslint-disable header/header */
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    CancellationToken,
+    NotebookCell,
+    NotebookCellStatusBarAlignment,
+    NotebookCellStatusBarItem,
+    NotebookCellStatusBarItemProvider,
+    ProviderResult,
+    Command,
+    EventEmitter,
+} from 'vscode'
+import { getIcon } from '../../../shared/icons'
+
+export class CellStatusBarItemProvider implements NotebookCellStatusBarItemProvider {
+    private _item: NotebookCellStatusBarItem
+    private _onDidChangeCellStatusBarItems = new EventEmitter<void>()
+    onDidChangeCellStatusBarItems = this._onDidChangeCellStatusBarItems.event
+
+    public constructor() {
+        this._item = new NotebookCellStatusBarItem(
+            `${getIcon('vscode-notebook-state-error')} Connect`,
+            NotebookCellStatusBarAlignment.Right
+        )
+    }
+
+    provideCellStatusBarItems(
+        cell: NotebookCell,
+        token: CancellationToken
+    ): ProviderResult<NotebookCellStatusBarItem | NotebookCellStatusBarItem[]> {
+        const metadata = cell.notebook.metadata
+        if (metadata?.connectionParams) {
+            this._item.text = `${getIcon('vscode-notebook-state-success')} Connected to ${
+                metadata.connectionParams?.warehouseIdentifier
+            }`
+        } else {
+            this._item.text = `${getIcon('vscode-notebook-state-error')} Connect`
+        }
+        this._item.command = {
+            command: 'aws.redshift.notebookConnectClicked',
+            arguments: [cell, this.refreshCellStatusBar.bind(this)],
+        } as Command
+        return [this._item]
+    }
+
+    refreshCellStatusBar() {
+        this._onDidChangeCellStatusBarItems.fire()
+    }
+}
diff --git a/packages/core/src/awsService/redshift/notebook/redshiftNotebookController.ts b/packages/core/src/awsService/redshift/notebook/redshiftNotebookController.ts
new file mode 100644
index 00000000000..f71b93362ee
--- /dev/null
+++ b/packages/core/src/awsService/redshift/notebook/redshiftNotebookController.ts
@@ -0,0 +1,146 @@
+/* eslint-disable header/header */
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { DefaultRedshiftClient } from '../../../shared/clients/redshiftClient'
+import { ConnectionParams } from '../models/models'
+import { ColumnMetadata, Field } from '@aws-sdk/client-redshift-data'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+
+export class RedshiftNotebookController {
+    readonly id = 'aws-redshift-sql-notebook'
+    public readonly label = 'Redshift SQL notebook'
+    readonly supportedLanguages = ['sql']
+
+    private _executionOrder = 0
+    private readonly _controller: vscode.NotebookController
+
+    constructor(public redshiftClient?: DefaultRedshiftClient) {
+        this._controller = vscode.notebooks.createNotebookController(this.id, 'aws-redshift-sql-notebook', this.label)
+        this._controller.supportedLanguages = this.supportedLanguages
+        this._controller.supportsExecutionOrder = true
+        this._controller.executeHandler = this._executeAll.bind(this)
+    }
+
+    dispose(): void {
+        this._controller.dispose()
+    }
+
+    private async _executeAll(
+        cells: vscode.NotebookCell[],
+        _notebook: vscode.NotebookDocument,
+        _controller: vscode.NotebookController
+    ): Promise<void> {
+        for (const cell of cells) {
+            await this._doExecution(cell)
+        }
+    }
+
+    private async _doExecution(cell: vscode.NotebookCell): Promise<void> {
+        const execution = this._controller.createNotebookCellExecution(cell)
+        execution.executionOrder = ++this._executionOrder
+        execution.start(Date.now())
+        let success = false
+        try {
+            // Used  Promise.race to handle both execution and cancellation
+            const resultPromise = this.executeCell(cell)
+            const cancellationPromise = new Promise<vscode.NotebookCellOutput>((_, reject) => {
+                execution.token.onCancellationRequested(() => {
+                    reject(new Error('Cell execution was cancelled.'))
+                })
+            })
+            const cellOutput = await Promise.race([resultPromise, cancellationPromise])
+            success = true
+            await execution.replaceOutput([cellOutput])
+        } catch (err: unknown) {
+            await execution.replaceOutput([
+                new vscode.NotebookCellOutput([vscode.NotebookCellOutputItem.error(err as Error)]),
+            ])
+            success = false
+        } finally {
+            execution.end(success, Date.now())
+        }
+    }
+
+    private async executeCell(cell: vscode.NotebookCell): Promise<vscode.NotebookCellOutput> {
+        return telemetry.redshift_executeQuery.run(async () => {
+            const connectionParams = cell.notebook.metadata?.connectionParams as ConnectionParams
+            // check cell connection before execute the query
+            if (connectionParams === undefined) {
+                throw Error('This cell is not connected to any cluster or workgroup.')
+            }
+
+            // This handles cases where the users had connected to the database with the wizard in a previous session and they opened and closed the editor
+            if (!this.redshiftClient && connectionParams) {
+                this.redshiftClient = new DefaultRedshiftClient(connectionParams.region!.id)
+            }
+
+            let executionId: string | undefined
+            let columnMetadata: ColumnMetadata[] | undefined
+            const records: Field[][] = []
+            let nextToken: string | undefined
+            // get all the pages of the result
+            do {
+                const result = await this.redshiftClient!.executeQuery(
+                    connectionParams,
+                    cell.document.getText(),
+                    nextToken,
+                    executionId
+                )
+                if (result && result.statementResultResponse.Records) {
+                    nextToken = result.statementResultResponse.NextToken
+                    executionId = result.executionId
+                    columnMetadata = result.statementResultResponse.ColumnMetadata
+                    records.push(...result.statementResultResponse.Records)
+                } else {
+                    return new vscode.NotebookCellOutput([
+                        vscode.NotebookCellOutputItem.text('Query completed — No rows returned.', 'text/plain'),
+                    ])
+                }
+            } while (nextToken)
+
+            if (columnMetadata) {
+                const columnNames: string[] = columnMetadata.map((column) => column.name || 'UnknownColumnName')
+                if (columnNames) {
+                    const htmlTable = this.getAsTable(connectionParams, columnNames, records)
+                    return new vscode.NotebookCellOutput([vscode.NotebookCellOutputItem.text(htmlTable, 'text/html')])
+                } else {
+                    throw Error('Column metadata did not contain column names')
+                }
+            } else {
+                throw Error('Result did not contain column metadata')
+            }
+        })
+    }
+
+    public getAsTable(connectionParams: ConnectionParams, columns: string[], records: Field[][]) {
+        if (!records || records.length === 0) {
+            return '<p>No records to display<p>'
+        }
+        let tableHtml = `<p>Results from ${connectionParams.warehouseIdentifier} - database: ${connectionParams.database}</p><table><thead><tr>`
+
+        // Adding column headers
+        for (const column of columns) {
+            tableHtml += `<th>${column}</th>`
+        }
+        tableHtml += '</tr></thead><tbody>'
+
+        // Adding data rows
+        for (const row of records) {
+            tableHtml += '<tr>'
+            for (let columnIndex = 0; columnIndex < columns.length; columnIndex++) {
+                let cellValue: undefined
+                if (Object.keys(row[columnIndex])[0] !== 'isNull') {
+                    cellValue = Object.values(row[columnIndex])[0]
+                }
+                tableHtml += `<td>${cellValue}</td>`
+            }
+            tableHtml += '<tr>'
+        }
+        tableHtml += '</tbody></table>'
+        return tableHtml
+    }
+}
diff --git a/packages/core/src/awsService/redshift/notebook/redshiftNotebookSerializer.ts b/packages/core/src/awsService/redshift/notebook/redshiftNotebookSerializer.ts
new file mode 100644
index 00000000000..cdbcdb94768
--- /dev/null
+++ b/packages/core/src/awsService/redshift/notebook/redshiftNotebookSerializer.ts
@@ -0,0 +1,67 @@
+/* eslint-disable header/header */
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+
+interface RawNotebookData {
+    cells: RawNotebookCell[]
+}
+
+interface RawNotebookCell {
+    language: string
+    value: string
+    kind: vscode.NotebookCellKind
+    metadata: { [key: string]: any }
+    editable?: boolean
+}
+
+export class RedshiftNotebookSerializer implements vscode.NotebookSerializer {
+    public readonly label: string = 'Redshift notebook serializer'
+
+    public async deserializeNotebook(data: Uint8Array, token: vscode.CancellationToken): Promise<vscode.NotebookData> {
+        const contents = new TextDecoder().decode(data) // convert to String to make JSON object
+
+        // Read file contents
+        let raw: RawNotebookData
+        try {
+            raw = JSON.parse(contents) as RawNotebookData
+        } catch {
+            raw = { cells: [] }
+        }
+
+        // Create array of Notebook cells for the VS Code API from file contents
+        const metadata = raw.cells[0]?.metadata ?? {}
+        const cells = raw.cells.map((item) => {
+            const newCell = new vscode.NotebookCellData(item.kind, item.value, item.language)
+            return newCell
+        })
+
+        const notebookData = new vscode.NotebookData(cells)
+        notebookData.metadata = metadata
+        // Pass read and formatted Notebook Data to VS Code to display Notebook with saved cells
+        return notebookData
+    }
+
+    public async serializeNotebook(
+        notebookData: vscode.NotebookData,
+        token: vscode.CancellationToken
+    ): Promise<Uint8Array> {
+        // Map the Notebook data into the format we want to save the Notebook data as
+        const contents: RawNotebookData = { cells: [] }
+
+        for (const cell of notebookData.cells) {
+            contents.cells.push({
+                kind: cell.kind,
+                language: cell.languageId,
+                value: cell.value,
+                metadata: notebookData.metadata ?? {},
+            })
+        }
+
+        // Give a string of all the data to save and VS Code will handle the rest
+        return new TextEncoder().encode(JSON.stringify(contents))
+    }
+}
diff --git a/packages/core/src/awsService/redshift/wizards/connectionWizard.ts b/packages/core/src/awsService/redshift/wizards/connectionWizard.ts
new file mode 100644
index 00000000000..251cfd22e20
--- /dev/null
+++ b/packages/core/src/awsService/redshift/wizards/connectionWizard.ts
@@ -0,0 +1,284 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Wizard } from '../../../shared/wizards/wizard'
+import { createInputBox } from '../../../shared/ui/inputPrompter'
+import { createQuickPick, DataQuickPickItem, QuickPickPrompter } from '../../../shared/ui/pickerPrompter'
+import { createCommonButtons } from '../../../shared/ui/buttons'
+import { ConnectionParams, ConnectionType, RedshiftWarehouseType } from '../models/models'
+import { RedshiftWarehouseNode } from '../explorer/redshiftWarehouseNode'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { DefaultRedshiftClient } from '../../../shared/clients/redshiftClient'
+import { Region } from '../../../shared/regions/endpoints'
+import { RegionProvider } from '../../../shared/regions/regionProvider'
+import { createRegionPrompter } from '../../../shared/ui/common/region'
+import { ClustersMessage } from '@aws-sdk/client-redshift'
+import { Prompter } from '../../../shared/ui/prompter'
+import { ListSecretsResponse } from '@aws-sdk/client-secrets-manager'
+import { SecretsManagerClient } from '../../../shared/clients/secretsManagerClient'
+import { redshiftHelpUrl } from '../../../shared/constants'
+
+export class RedshiftNodeConnectionWizard extends Wizard<ConnectionParams> {
+    public constructor(node: RedshiftWarehouseNode) {
+        super({
+            initState: {
+                warehouseIdentifier: node.name,
+                warehouseType: node.warehouseType,
+            },
+        })
+        this.form.connectionType.bindPrompter(
+            (state) => getConnectionTypePrompter(node.connectionParams?.connectionType, state?.warehouseType),
+            {
+                relativeOrder: 1,
+            }
+        )
+
+        this.form.database.bindPrompter(getDatabasePrompter, {
+            relativeOrder: 2,
+        })
+        this.form.username.bindPrompter(getUsernamePrompter, {
+            showWhen: (state) =>
+                (state.database !== undefined && state.connectionType === ConnectionType.TempCreds) ||
+                state.connectionType === ConnectionType.DatabaseUser,
+            relativeOrder: 3,
+        })
+        this.form.password.bindPrompter(getPasswordPrompter, {
+            showWhen: (state) => state.username !== undefined && state.connectionType === ConnectionType.DatabaseUser,
+            relativeOrder: 4,
+        })
+
+        this.form.secret.bindPrompter((state) => getSecretPrompter(node.redshiftClient.regionCode), {
+            showWhen: (state) => state.database !== undefined && state.connectionType === ConnectionType.SecretsManager,
+            relativeOrder: 4,
+        })
+    }
+}
+
+export class NotebookConnectionWizard extends Wizard<ConnectionParams> {
+    static readonly SERVERLESSPREFIX = 'Serverless:'
+    public constructor(
+        regionProvider: RegionProvider,
+        region?: Region | undefined,
+        warehouseIdentifier?: string | undefined,
+        warehouseType?: RedshiftWarehouseType,
+        connectionType?: ConnectionType | undefined,
+        database?: string | undefined,
+        username?: string | undefined,
+        secret?: string | undefined
+    ) {
+        super({
+            initState: {
+                connectionType: connectionType,
+                database: database,
+                username: username,
+                warehouseIdentifier: warehouseIdentifier,
+                region: region,
+                warehouseType: warehouseType,
+                secret: secret,
+            },
+        })
+
+        this.form.region.bindPrompter(
+            () => {
+                const regions = regionProvider
+                    .getRegions()
+                    .filter((r) => regionProvider.isServiceInRegion('redshift', r.id))
+                return createRegionPrompter(regions)
+            },
+            { relativeOrder: 1 }
+        )
+
+        this.form.warehouseIdentifier.bindPrompter((state) => getWarehouseIdentifierPrompter(state.region!.id), {
+            relativeOrder: 2,
+        })
+
+        this.form.warehouseType.setDefault((state) => {
+            if (!state.warehouseType && state.warehouseIdentifier) {
+                if (state.warehouseIdentifier?.startsWith(NotebookConnectionWizard.SERVERLESSPREFIX)) {
+                    state.warehouseType = RedshiftWarehouseType.SERVERLESS
+                    state.warehouseIdentifier = state.warehouseIdentifier.replace(
+                        NotebookConnectionWizard.SERVERLESSPREFIX,
+                        ''
+                    )
+                    return RedshiftWarehouseType.SERVERLESS
+                } else {
+                    state.warehouseType = RedshiftWarehouseType.PROVISIONED
+                    return RedshiftWarehouseType.PROVISIONED
+                }
+            }
+        })
+        this.form.connectionType.bindPrompter((state) => getConnectionTypePrompter(undefined, state?.warehouseType), {
+            relativeOrder: 3,
+        })
+
+        this.form.database.bindPrompter(getDatabasePrompter, { relativeOrder: 4 })
+        this.form.username.bindPrompter(getUsernamePrompter, {
+            showWhen: (state) =>
+                (state.database !== undefined && state.connectionType === ConnectionType.TempCreds) ||
+                state.connectionType === ConnectionType.DatabaseUser,
+            relativeOrder: 5,
+        })
+        this.form.password.bindPrompter(getPasswordPrompter, {
+            showWhen: (state) => state.username !== undefined && state.connectionType === ConnectionType.DatabaseUser,
+            relativeOrder: 6,
+        })
+
+        this.form.secret.bindPrompter((state) => getSecretPrompter(state.region!.id), {
+            showWhen: (state) => state.database !== undefined && state.connectionType === ConnectionType.SecretsManager,
+            relativeOrder: 5,
+        })
+    }
+}
+
+function getUsernamePrompter(): Prompter<string> {
+    return createInputBox({
+        value: '',
+        title: localize('AWS.redshift.username', 'Enter the username you want to use to connect to the database'),
+        buttons: createCommonButtons(redshiftHelpUrl),
+        placeholder: 'Enter username',
+        validateInput: (value) => {
+            return value.trim() ? undefined : localize('AWS.redshift.usernameValidation', 'Username cannot be empty')
+        },
+    })
+}
+
+function getPasswordPrompter(): Prompter<string> {
+    return createInputBox({
+        value: '',
+        title: localize('AWS.redshift.password', 'Enter password'),
+        buttons: createCommonButtons(redshiftHelpUrl),
+        placeholder: 'Enter password',
+        validateInput: (value) => {
+            return value.trim() ? undefined : localize('AWS.redshift.passwordValidation', 'Password cannot be empty')
+        },
+        password: true,
+    })
+}
+
+function getDatabasePrompter(): Prompter<string> {
+    return createInputBox({
+        value: '',
+        title: localize('AWS.redshift.database', 'Enter the name of the database you want to connect to'),
+        buttons: createCommonButtons(redshiftHelpUrl),
+        placeholder: 'Enter database name',
+        validateInput: (value) => {
+            return value.trim() ? undefined : localize('AWS.redshift.databaseValidation', 'Database cannot be empty')
+        },
+    })
+}
+
+function createSelectConnectionQuickPick(items: DataQuickPickItem<ConnectionType>[]): Prompter<ConnectionType> {
+    return createQuickPick(items, {
+        title: localize('AWS.redshift.connectionType', 'Select Connection Type'),
+        buttons: createCommonButtons(redshiftHelpUrl),
+        placeholder: 'Select Connection Type',
+    })
+}
+
+function getConnectionTypePrompter(
+    existingConnectionType: ConnectionType | undefined,
+    warehouseType?: RedshiftWarehouseType
+): Prompter<ConnectionType> {
+    const items: DataQuickPickItem<ConnectionType>[] = Object.values(ConnectionType).map((type) => ({
+        label: type,
+        data: type,
+    }))
+    if (existingConnectionType) {
+        const updatedItems = items.map((item) => {
+            if (item.data === existingConnectionType) {
+                return {
+                    ...item,
+                    label: `${existingConnectionType} - current`,
+                }
+            }
+            return item
+        })
+        const selectedUpdatedItems =
+            warehouseType === RedshiftWarehouseType.SERVERLESS ? [updatedItems[0], updatedItems[1]] : updatedItems
+        return createSelectConnectionQuickPick(selectedUpdatedItems)
+    } else {
+        // Determine which items to use based on warehouseType
+        const selectedItems = warehouseType === RedshiftWarehouseType.SERVERLESS ? [items[0], items[1]] : items
+        return createSelectConnectionQuickPick(selectedItems)
+    }
+}
+
+async function* fetchWarehouses(redshiftClient: DefaultRedshiftClient) {
+    let serverlessToken: string | undefined
+    let provisionedToken: string | undefined
+    let hasMoreServerless = true
+    let hasMoreProvisioned = true
+    while (hasMoreProvisioned || hasMoreServerless) {
+        if (hasMoreProvisioned) {
+            const provisionedResponse: ClustersMessage =
+                await redshiftClient.describeProvisionedClusters(provisionedToken)
+            provisionedToken = provisionedResponse.Marker
+            hasMoreProvisioned = provisionedToken !== undefined
+            if (provisionedResponse.Clusters) {
+                for await (const cluster of provisionedResponse.Clusters) {
+                    yield [
+                        {
+                            label: cluster.ClusterIdentifier || 'UnknownProvisionedCluster',
+                            data: cluster.ClusterIdentifier || 'UnknownProvisionedCluster',
+                        },
+                    ]
+                }
+            }
+        }
+        if (hasMoreServerless) {
+            const serverlessResponse = await redshiftClient.listServerlessWorkgroups(serverlessToken)
+            serverlessToken = serverlessResponse.nextToken
+            hasMoreServerless = serverlessToken !== undefined
+            if (serverlessResponse.workgroups) {
+                for await (const workgroup of serverlessResponse.workgroups) {
+                    yield [
+                        {
+                            label: `${NotebookConnectionWizard.SERVERLESSPREFIX} ${
+                                workgroup.workgroupName ?? 'UnknownServerlessWorkgroup'
+                            }`,
+                            data: `${NotebookConnectionWizard.SERVERLESSPREFIX}${
+                                workgroup.workgroupName ?? 'UnknownServerlessWorkgroup'
+                            }`,
+                        },
+                    ]
+                }
+            }
+        }
+    }
+}
+
+function getWarehouseIdentifierPrompter(region: string): QuickPickPrompter<string> {
+    const redshiftClient = new DefaultRedshiftClient(region)
+
+    return createQuickPick(fetchWarehouses(redshiftClient), {
+        title: localize('AWS.redshift.chooseAWarehousePrompt', 'Choose a warehouse to connect to'),
+        buttons: createCommonButtons(redshiftHelpUrl),
+        placeholder: 'Choose a warehouse to connect to',
+    })
+}
+
+function getSecretPrompter(region: string): QuickPickPrompter<string> {
+    const secretsManagerClient = new SecretsManagerClient(region)
+    return createQuickPick(fetchSecretList(secretsManagerClient), {
+        title: localize('AWS.redshift.chooseSecretPrompt', 'Choose a secret'),
+        buttons: createCommonButtons(redshiftHelpUrl),
+        placeholder: 'Choose a secret',
+    })
+}
+
+async function* fetchSecretList(secretsManagerClient: SecretsManagerClient) {
+    const secretFilter = 'Redshift'
+    const listSecretsResponse: ListSecretsResponse = await secretsManagerClient.listSecrets(secretFilter)
+    if (listSecretsResponse.SecretList) {
+        for await (const secret of listSecretsResponse.SecretList) {
+            yield [
+                {
+                    label: secret.Name || 'UnknownSecret',
+                    data: secret.ARN || 'UnknownSecret',
+                },
+            ]
+        }
+    }
+}
diff --git a/packages/core/src/awsService/s3/activation.ts b/packages/core/src/awsService/s3/activation.ts
new file mode 100644
index 00000000000..85a050582ad
--- /dev/null
+++ b/packages/core/src/awsService/s3/activation.ts
@@ -0,0 +1,94 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { copyPathCommand } from './commands/copyPath'
+import { createBucketCommand } from './commands/createBucket'
+import { createFolderCommand } from './commands/createFolder'
+import { deleteBucketCommand } from './commands/deleteBucket'
+import { deleteFileCommand } from './commands/deleteFile'
+import { downloadFileAsCommand } from './commands/downloadFileAs'
+import { presignedURLCommand } from './commands/presignedURL'
+import { editFileCommand, openFileReadModeCommand } from './commands/openFile'
+import { uploadFileCommand } from './commands/uploadFile'
+import { uploadFileToParentCommand } from './commands/uploadFileToParent'
+import { S3BucketNode } from './explorer/s3BucketNode'
+import { S3FolderNode } from './explorer/s3FolderNode'
+import { S3Node } from './explorer/s3Nodes'
+import { S3FileNode } from './explorer/s3FileNode'
+import { ExtContext } from '../../shared/extensions'
+import { S3FileViewerManager, s3EditScheme, s3ReadScheme } from './fileViewerManager'
+import { VirtualFileSystem } from '../../shared/virtualFilesystem'
+import { Commands } from '../../shared/vscode/commands2'
+
+import * as nls from 'vscode-nls'
+import { S3Client } from '../../shared/clients/s3'
+import { TreeNode } from '../../shared/treeview/resourceTreeDataProvider'
+import { getSourceNode } from '../../shared/utilities/treeNodeUtils'
+const localize = nls.loadMessageBundle()
+
+/**
+ * Activates S3 components.
+ */
+
+export async function activate(ctx: ExtContext): Promise<void> {
+    const fs = new VirtualFileSystem(
+        localize('AWS.s3.fileViewer.genericError', 'Unable to open S3 file, try reopening from the explorer')
+    )
+    const manager = new S3FileViewerManager((region) => new S3Client(region), fs)
+
+    ctx.extensionContext.subscriptions.push(manager)
+    ctx.extensionContext.subscriptions.push(
+        vscode.workspace.registerFileSystemProvider(s3EditScheme, fs, { isCaseSensitive: true }),
+        vscode.workspace.registerFileSystemProvider(s3ReadScheme, fs, { isReadonly: true, isCaseSensitive: true }),
+        Commands.register('aws.s3.copyPath', async (node: S3FolderNode | S3FileNode) => {
+            await copyPathCommand(node)
+        }),
+        Commands.register('aws.s3.presignedURL', async (node: S3FileNode) => {
+            await presignedURLCommand(node)
+        }),
+        Commands.register('aws.s3.downloadFileAs', async (node: S3FileNode) => {
+            await downloadFileAsCommand(node)
+        }),
+        Commands.register('aws.s3.openFile', async (node: S3FileNode) => {
+            await openFileReadModeCommand(node, manager)
+        }),
+        Commands.register('aws.s3.editFile', async (uriOrNode: vscode.Uri | S3FileNode) => {
+            await editFileCommand(uriOrNode, manager)
+        }),
+        Commands.register(
+            { id: 'aws.s3.uploadFile', autoconnect: true },
+            async (node?: S3BucketNode | S3FolderNode | TreeNode) => {
+                if (!node) {
+                    const awsContext = ctx.awsContext
+                    const regionCode = awsContext.getCredentialDefaultRegion()
+                    const s3Client = new S3Client(regionCode)
+                    const document = vscode.window.activeTextEditor?.document.uri
+                    await uploadFileCommand(s3Client, document)
+                } else {
+                    const sourceNode = getSourceNode<S3BucketNode>(node)
+                    await uploadFileCommand(sourceNode.s3, sourceNode)
+                }
+            }
+        ),
+        Commands.register('aws.s3.uploadFileToParent', async (node: S3FileNode) => {
+            await uploadFileToParentCommand(node)
+        }),
+        Commands.register('aws.s3.createBucket', async (node: S3Node) => {
+            await createBucketCommand(node)
+        }),
+        Commands.register('aws.s3.createFolder', async (node: S3BucketNode | S3FolderNode | TreeNode) => {
+            const sourceNode = getSourceNode<S3BucketNode>(node)
+            await createFolderCommand(sourceNode)
+        }),
+        Commands.register('aws.s3.deleteBucket', async (node: S3BucketNode | TreeNode) => {
+            const sourceNode = getSourceNode<S3BucketNode>(node)
+            await deleteBucketCommand(sourceNode)
+        }),
+        Commands.register('aws.s3.deleteFile', async (node: S3FileNode) => {
+            await deleteFileCommand(node)
+        })
+    )
+}
diff --git a/packages/core/src/awsService/s3/commands/copyPath.ts b/packages/core/src/awsService/s3/commands/copyPath.ts
new file mode 100644
index 00000000000..0671a97aa87
--- /dev/null
+++ b/packages/core/src/awsService/s3/commands/copyPath.ts
@@ -0,0 +1,18 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { copyToClipboard } from '../../../shared/utilities/messages'
+import { S3FolderNode } from '../explorer/s3FolderNode'
+import { S3FileNode } from '../explorer/s3FileNode'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+
+/**
+ * Copies the path to the folder or file represented by the given node.
+ *
+ * Note that the path does not contain the bucket name or a leading slash.
+ */
+export async function copyPathCommand(node: S3FolderNode | S3FileNode): Promise<void> {
+    await telemetry.s3_copyPath.run(() => copyToClipboard(node.path, 'path'))
+}
diff --git a/packages/core/src/awsService/s3/commands/createBucket.ts b/packages/core/src/awsService/s3/commands/createBucket.ts
new file mode 100644
index 00000000000..cd451a9da5e
--- /dev/null
+++ b/packages/core/src/awsService/s3/commands/createBucket.ts
@@ -0,0 +1,56 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../../../shared/logger/logger'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { S3Node } from '../explorer/s3Nodes'
+import { validateBucketName } from '../util'
+import { ToolkitError } from '../../../shared/errors'
+import { CancellationError } from '../../../shared/utilities/timeoutUtils'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+
+/**
+ * Creates a bucket in the s3 region represented by the given node.
+ *
+ * Prompts the user for the bucket name, applying basic validations.
+ * Creates the bucket.
+ * Refreshes the node.
+ */
+export async function createBucketCommand(node: S3Node): Promise<void> {
+    await telemetry.s3_createBucket.run(async () => {
+        const bucketName = await vscode.window.showInputBox({
+            prompt: localize('AWS.s3.createBucket.prompt', 'Enter a new bucket name'),
+            placeHolder: localize('AWS.s3.createBucket.placeHolder', 'Bucket Name'),
+            validateInput: validateBucketName,
+        })
+
+        if (!bucketName) {
+            throw new CancellationError('user')
+        }
+
+        getLogger().info(`Creating bucket: ${bucketName}`)
+        const bucket = await node
+            .createBucket({ bucketName })
+            .catch((e) => {
+                const message = localize(
+                    'AWS.s3.createBucket.error.general',
+                    'Failed to create bucket: {0}',
+                    bucketName
+                )
+                throw ToolkitError.chain(e, message)
+            })
+            .finally(() => refreshNode(node))
+
+        getLogger().info('Created bucket: %O', bucket)
+        void vscode.window.showInformationMessage(
+            localize('AWS.s3.createBucket.success', 'Created bucket: {0}', bucketName)
+        )
+    })
+}
+
+async function refreshNode(node: S3Node): Promise<void> {
+    return vscode.commands.executeCommand('aws.refreshAwsExplorerNode', node)
+}
diff --git a/packages/core/src/awsService/s3/commands/createFolder.ts b/packages/core/src/awsService/s3/commands/createFolder.ts
new file mode 100644
index 00000000000..d56cb0c14cd
--- /dev/null
+++ b/packages/core/src/awsService/s3/commands/createFolder.ts
@@ -0,0 +1,82 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { DEFAULT_DELIMITER } from '../../../shared/clients/s3'
+import { getLogger } from '../../../shared/logger/logger'
+import { S3BucketNode } from '../explorer/s3BucketNode'
+import { S3FolderNode } from '../explorer/s3FolderNode'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { readablePath } from '../util'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { CancellationError } from '../../../shared/utilities/timeoutUtils'
+import { ToolkitError } from '../../../shared/errors'
+
+/**
+ * Creates a subfolder in the bucket or folder represented by the given node.
+ *
+ * Prompts the user for the folder name, applying basic validations.
+ * Creates the folder.
+ * Refreshes the node.
+ *
+ * Node that the node is reset to displaying its first page of results.
+ * The folder that is created won't necessary fall on the first page.
+ * The user may need to load more pages to see the created folder reflected in the tree.
+ */
+export async function createFolderCommand(node: S3BucketNode | S3FolderNode): Promise<void> {
+    getLogger().debug('CreateFolder called for %O', node)
+
+    await telemetry.s3_createFolder.run(async () => {
+        const folderName = await vscode.window.showInputBox({
+            prompt: localize('AWS.s3.createFolder.prompt', 'Enter a folder to create in {0}', readablePath(node)),
+            placeHolder: localize('AWS.s3.createFolder.placeHolder', 'Folder Name'),
+            validateInput: validateFolderName,
+        })
+
+        if (!folderName) {
+            throw new CancellationError('user')
+        }
+
+        const path = node.path + folderName + DEFAULT_DELIMITER
+        getLogger().info(`Creating folder "${path}" in bucket '${node.bucket.Name}'`)
+
+        const { folder } = await node
+            .createFolder({ path, bucketName: node.bucket.Name })
+            .catch((e) => {
+                const message = localize(
+                    'AWS.s3.createFolder.error.general',
+                    'Failed to create folder: {0}',
+                    folderName
+                )
+                throw ToolkitError.chain(e, message)
+            })
+            .finally(() => refreshNode(node))
+
+        getLogger().info('created folder: %O', folder)
+        void vscode.window.showInformationMessage(
+            localize('AWS.s3.createFolder.success', 'Created folder: {0}', folderName)
+        )
+    })
+}
+
+function validateFolderName(name: string): string | undefined {
+    if (name.includes(DEFAULT_DELIMITER)) {
+        return localize(
+            'AWS.s3.createFolder.error.illegalCharacter',
+            `Folder name must not contain '{0}'`,
+            DEFAULT_DELIMITER
+        )
+    }
+
+    if (name === '') {
+        return localize('AWS.s3.createFolder.error.emptyName', 'Folder name must not be empty')
+    }
+    return undefined
+}
+
+async function refreshNode(node: S3BucketNode | S3FolderNode): Promise<void> {
+    node.clearChildren()
+    return vscode.commands.executeCommand('aws.refreshAwsExplorerNode', node)
+}
diff --git a/packages/core/src/awsService/s3/commands/deleteBucket.ts b/packages/core/src/awsService/s3/commands/deleteBucket.ts
new file mode 100644
index 00000000000..9390f93cf52
--- /dev/null
+++ b/packages/core/src/awsService/s3/commands/deleteBucket.ts
@@ -0,0 +1,78 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../../../shared/logger/logger'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { S3BucketNode } from '../explorer/s3BucketNode'
+import { S3Node } from '../explorer/s3Nodes'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { CancellationError } from '../../../shared/utilities/timeoutUtils'
+import { ToolkitError } from '../../../shared/errors'
+
+/**
+ * Deletes the bucket represented by the given node.
+ *
+ * Prompts the user for confirmation (user must type the bucket name).
+ * Empties and deletes the bucket, showing a progress bar.
+ * Refreshes the parent node.
+ *
+ * Note that this just repeatedly calls list and delete to empty the bucket before deletion.
+ * Failures during the emptying or deleting step can leave the bucket in a state where
+ * some (or all) objects are deleted, but the bucket remains.
+ *
+ * This is unfortunate, but it's still a valuable feature and partial failures
+ * don't result in a state of too much confusion for the user.
+ */
+export async function deleteBucketCommand(node: S3BucketNode): Promise<void> {
+    getLogger().debug('DeleteBucket called for %O', node)
+
+    await telemetry.s3_deleteBucket.run(async () => {
+        const isConfirmed = await showConfirmationDialog(node.bucket.Name)
+        if (!isConfirmed) {
+            throw new CancellationError('user')
+        }
+
+        getLogger().info(`Deleting bucket: ${node.bucket.Name}`)
+        await deleteWithProgress(node)
+            .catch((e) => {
+                const message = localize(
+                    'AWS.s3.deleteBucket.error.general',
+                    'Failed to delete bucket {0}',
+                    node.bucket.Name
+                )
+                throw ToolkitError.chain(e, message)
+            })
+            .finally(() => refreshNode(node.parent))
+        getLogger().info(`deleted bucket: ${node.bucket.Name}`)
+    })
+}
+
+async function showConfirmationDialog(bucketName: string): Promise<boolean> {
+    const prompt = localize('AWS.s3.deleteBucket.prompt', 'Enter {0} to confirm deletion', bucketName)
+    const confirmationInput = await vscode.window.showInputBox({
+        prompt,
+        placeHolder: bucketName,
+        validateInput: (input) => (input !== bucketName ? prompt : undefined),
+    })
+
+    return confirmationInput === bucketName
+}
+
+async function deleteWithProgress(node: S3BucketNode): Promise<void> {
+    return vscode.window.withProgress(
+        {
+            location: vscode.ProgressLocation.Notification,
+            title: localize('AWS.s3.deleteBucket.progressTitle', 'Deleting {0}...', node.bucket.Name),
+        },
+        () => {
+            return node.deleteBucket()
+        }
+    )
+}
+
+async function refreshNode(node: S3Node): Promise<void> {
+    return vscode.commands.executeCommand('aws.refreshAwsExplorerNode', node)
+}
diff --git a/packages/core/src/awsService/s3/commands/deleteFile.ts b/packages/core/src/awsService/s3/commands/deleteFile.ts
new file mode 100644
index 00000000000..cb54331b3aa
--- /dev/null
+++ b/packages/core/src/awsService/s3/commands/deleteFile.ts
@@ -0,0 +1,65 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as localizedText from '../../../shared/localizedText'
+import { getLogger } from '../../../shared/logger/logger'
+import { addCodiconToString } from '../../../shared/utilities/textUtilities'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { S3BucketNode } from '../explorer/s3BucketNode'
+import { S3FileNode } from '../explorer/s3FileNode'
+import { S3FolderNode } from '../explorer/s3FolderNode'
+import { readablePath } from '../util'
+import { showConfirmationMessage } from '../../../shared/utilities/messages'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { CancellationError } from '../../../shared/utilities/timeoutUtils'
+import { ToolkitError } from '../../../shared/errors'
+
+const deleteFileDisplayTimeoutMs = 2000
+
+/**
+ * Deletes the file represented by the given node.
+ *
+ * Prompts the user for confirmation.
+ * Deletes the file.
+ * Shows status bar message.
+ * Refreshes the parent node.
+ */
+export async function deleteFileCommand(node: S3FileNode): Promise<void> {
+    const filePath = readablePath(node)
+    getLogger().debug('DeleteFile called for %O', node)
+
+    await telemetry.s3_deleteObject.run(async () => {
+        const isConfirmed = await showConfirmationMessage({
+            prompt: localize('AWS.s3.deleteFile.prompt', 'Are you sure you want to delete file {0}?', filePath),
+            confirm: localizedText.localizedDelete,
+            cancel: localizedText.cancel,
+        })
+        if (!isConfirmed) {
+            throw new CancellationError('user')
+        }
+
+        getLogger().info(`Deleting file ${filePath}`)
+
+        await node
+            .deleteFile()
+            .catch((e) => {
+                const message = localize('AWS.s3.deleteFile.error.general', 'Failed to delete file {0}', node.file.name)
+                throw ToolkitError.chain(e, message)
+            })
+            .finally(() => refreshNode(node.parent))
+
+        getLogger().info(`deleted file: ${filePath}`)
+        vscode.window.setStatusBarMessage(
+            addCodiconToString('trash', localize('AWS.deleteFile.success', 'Deleted: {0}', node.file.name)),
+            deleteFileDisplayTimeoutMs
+        )
+    })
+}
+
+async function refreshNode(node: S3BucketNode | S3FolderNode): Promise<void> {
+    node.clearChildren()
+    return vscode.commands.executeCommand('aws.refreshAwsExplorerNode', node)
+}
diff --git a/src/s3/commands/downloadFileAs.ts b/packages/core/src/awsService/s3/commands/downloadFileAs.ts
similarity index 75%
rename from src/s3/commands/downloadFileAs.ts
rename to packages/core/src/awsService/s3/commands/downloadFileAs.ts
index bfe36920551..396875b3bd6 100644
--- a/src/s3/commands/downloadFileAs.ts
+++ b/packages/core/src/awsService/s3/commands/downloadFileAs.ts
@@ -1,25 +1,24 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as path from 'path'
 import * as vscode from 'vscode'
 
-import { getDefaultDownloadPath, setDefaultDownloadPath } from '../../shared/filesystemUtilities'
-import { Window } from '../../shared/vscode/window'
+import { getDefaultDownloadPath, setDefaultDownloadPath } from '../../../shared/filesystemUtilities'
 import { S3FileNode } from '../explorer/s3FileNode'
 import { readablePath } from '../util'
 import { progressReporter } from '../progressReporter'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { showOutputMessage } from '../../shared/utilities/messages'
-import { DefaultS3Client, S3Client } from '../../shared/clients/s3Client'
-import { Timeout, CancellationError } from '../../shared/utilities/timeoutUtils'
-import { ToolkitError } from '../../shared/errors'
-import { streamToBuffer, streamToFile } from '../../shared/utilities/streamUtilities'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { showOutputMessage } from '../../../shared/utilities/messages'
+import { S3Client } from '../../../shared/clients/s3'
+import { Timeout, CancellationError } from '../../../shared/utilities/timeoutUtils'
+import { ToolkitError } from '../../../shared/errors'
+import { streamToBuffer, streamToFile } from '../../../shared/utilities/streamUtilities'
 import { S3File } from '../fileViewerManager'
-import globals from '../../shared/extensionGlobals'
-import { telemetry } from '../../shared/telemetry/telemetry'
+import globals from '../../../shared/extensionGlobals'
+import { telemetry } from '../../../shared/telemetry/telemetry'
 
 interface DownloadFileOptions {
     /**
@@ -33,10 +32,6 @@ interface DownloadFileOptions {
      * If provided then the promise will not resolve into a Buffer.
      */
     readonly saveLocation?: vscode.Uri
-    /**
-     * Different window object to use for displaying progress
-     */
-    readonly window?: Window
     /**
      * Timeout associated with the download. If provided, it is assumed that
      * the download is also cancellable.
@@ -60,7 +55,7 @@ async function downloadS3File(
     file: S3File,
     options?: FileOptions | BufferOptions
 ): Promise<Buffer | void> {
-    const downloadStream = await client.downloadFileStream(file.bucket.name, file.key)
+    const downloadStream = await client.downloadFileStream(file.bucket.Name, file.key)
     const result = options?.saveLocation
         ? streamToFile(downloadStream, options.saveLocation)
         : streamToBuffer(downloadStream, file.sizeBytes)
@@ -68,7 +63,7 @@ async function downloadS3File(
     options?.timeout?.token.onCancellationRequested(({ agent }) => downloadStream.destroy(new CancellationError(agent)))
 
     if (options?.progressLocation) {
-        ;(options.window ?? Window.vscode()).withProgress(
+        void vscode.window.withProgress(
             {
                 location: options.progressLocation,
                 title: localize('AWS.s3.downloadFile.progressTitle', 'Downloading {0}...', file.name),
@@ -80,7 +75,7 @@ async function downloadS3File(
                 token.onCancellationRequested(() => downloadStream.destroy(new CancellationError('user')))
                 downloadStream.on('data', report)
 
-                return new Promise<void>(resolve => result.finally(resolve))
+                return new Promise<void>((resolve) => result.finally(resolve))
             }
         )
     }
@@ -91,9 +86,9 @@ async function downloadS3File(
 export async function downloadFile(file: S3File, options: FileOptions): Promise<void>
 export async function downloadFile(file: S3File, options?: BufferOptions): Promise<Buffer>
 export async function downloadFile(file: S3File, options?: FileOptions | BufferOptions): Promise<Buffer | void> {
-    const client = options?.client ?? new DefaultS3Client(file.bucket.region)
+    const client = options?.client ?? new S3Client(file.bucket.BucketRegion)
 
-    return downloadS3File(client, file, options).catch(err => {
+    return downloadS3File(client, file, options).catch((err) => {
         const message = localize('AWS.s3.downloadFile.error.general', 'Failed to download file {0}', file.name)
 
         throw ToolkitError.chain(err, message, {
@@ -110,29 +105,24 @@ export async function downloadFile(file: S3File, options?: FileOptions | BufferO
  * Downloads the file (showing a progress bar).
  * Shows the output channel with "download completed" message.
  */
-export async function downloadFileAsCommand(
-    node: S3FileNode,
-    window = Window.vscode(),
-    outputChannel = globals.outputChannel
-): Promise<void> {
+export async function downloadFileAsCommand(node: S3FileNode, outputChannel = globals.outputChannel): Promise<void> {
     const { bucket, file } = node
     const sourcePath = readablePath(node)
 
     await telemetry.s3_downloadObject.run(async () => {
-        const downloadPath = getDefaultDownloadPath()
+        const downloadPath = await getDefaultDownloadPath()
 
-        const saveLocation = await promptForSaveLocation(file.name, window, downloadPath)
+        const saveLocation = await promptForSaveLocation(file.name, downloadPath)
         if (!saveLocation) {
             throw new CancellationError('user')
         }
-        setDefaultDownloadPath(saveLocation.fsPath)
+        await setDefaultDownloadPath(saveLocation.fsPath)
 
         showOutputMessage(`Downloading "${sourcePath}" to: ${saveLocation}`, outputChannel)
 
         await downloadFile(
             { ...file, bucket },
             {
-                window,
                 saveLocation,
                 client: node.s3,
                 progressLocation: vscode.ProgressLocation.Notification,
@@ -143,11 +133,7 @@ export async function downloadFileAsCommand(
     })
 }
 
-async function promptForSaveLocation(
-    fileName: string,
-    window: Window,
-    saveLocation: string
-): Promise<vscode.Uri | undefined> {
+async function promptForSaveLocation(fileName: string, saveLocation: string): Promise<vscode.Uri | undefined> {
     const extension = path.extname(fileName)
 
     // Insertion order matters, as it determines the ordering in the filters dropdown
@@ -157,7 +143,7 @@ async function promptForSaveLocation(
         : { 'All Files': ['*'] }
 
     const downloadPath = path.join(saveLocation, fileName)
-    return window.showSaveDialog({
+    return vscode.window.showSaveDialog({
         defaultUri: vscode.Uri.file(downloadPath),
         saveLabel: localize('AWS.s3.downloadFile.saveButton', 'Download'),
         filters: filters,
diff --git a/packages/core/src/awsService/s3/commands/openFile.ts b/packages/core/src/awsService/s3/commands/openFile.ts
new file mode 100644
index 00000000000..9f7a6713d08
--- /dev/null
+++ b/packages/core/src/awsService/s3/commands/openFile.ts
@@ -0,0 +1,63 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { S3FileNode } from '../explorer/s3FileNode'
+import { S3FileViewerManager, S3Tab } from '../fileViewerManager'
+import { downloadFileAsCommand } from './downloadFileAs'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+
+const sizeLimit = 50 * Math.pow(10, 6)
+
+export async function openFileReadModeCommand(
+    node: S3FileNode,
+    manager: S3FileViewerManager
+): Promise<S3Tab | undefined> {
+    if (await isFileSizeValid(node.file.sizeBytes, node)) {
+        return telemetry.s3_openEditor.run(() => manager.openInReadMode({ bucket: node.bucket, ...node.file }))
+    }
+}
+
+export async function editFileCommand(
+    uriOrNode: vscode.Uri | S3FileNode,
+    manager: S3FileViewerManager
+): Promise<S3Tab | undefined> {
+    if (uriOrNode instanceof S3FileNode) {
+        const size = uriOrNode.file.sizeBytes
+
+        if (!(await isFileSizeValid(size, uriOrNode))) {
+            return
+        }
+
+        return telemetry.s3_editObject.run(() =>
+            manager.openInEditMode({ bucket: uriOrNode.bucket, ...uriOrNode.file })
+        )
+    }
+
+    return telemetry.s3_editObject.run(() => manager.openInEditMode(uriOrNode))
+}
+
+async function isFileSizeValid(size: number | undefined, fileNode: S3FileNode): Promise<boolean> {
+    if (size && size > sizeLimit) {
+        const downloadAs = localize('AWS.s3.button.downloadAs', 'Download as..')
+        void vscode.window
+            .showErrorMessage(
+                localize(
+                    'AWS.s3.fileViewer.error.invalidSize',
+                    'Files over 50MB cannot be viewed and instead must be downloaded manually.'
+                ),
+                downloadAs
+            )
+            .then(async (response) => {
+                if (response === downloadAs) {
+                    await downloadFileAsCommand(fileNode)
+                }
+            })
+        return false
+    }
+
+    return true
+}
diff --git a/packages/core/src/awsService/s3/commands/presignedURL.ts b/packages/core/src/awsService/s3/commands/presignedURL.ts
new file mode 100644
index 00000000000..f641345bae9
--- /dev/null
+++ b/packages/core/src/awsService/s3/commands/presignedURL.ts
@@ -0,0 +1,67 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { SignedUrlRequest } from '../../../shared/clients/s3'
+import { copyToClipboard } from '../../../shared/utilities/messages'
+import { S3FileNode } from '../explorer/s3FileNode'
+import * as vscode from 'vscode'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { invalidNumberWarning } from '../../../shared/localizedText'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { ToolkitError } from '../../../shared/errors'
+
+export async function presignedURLCommand(node: S3FileNode): Promise<void> {
+    await telemetry.s3_copyUrl.run(async (span) => {
+        span.record({ presigned: true })
+
+        const validTime = await promptTime(node.file.key)
+        const s3Client = node.s3
+        const request: SignedUrlRequest = {
+            bucketName: node.bucket.Name,
+            key: node.file.key,
+            time: validTime * 60,
+        }
+
+        const url = await s3Client.getSignedUrlForObject(request).catch((e) => {
+            throw ToolkitError.chain(
+                e,
+                'Error creating the presigned URL. Make sure you have access to the requested file.'
+            )
+        })
+
+        await copyToClipboard(url, 'URL')
+    })
+}
+
+export async function promptTime(fileName: string): Promise<number> {
+    const timeStr = await vscode.window.showInputBox({
+        value: '15',
+        prompt: localize(
+            'AWS.s3.promptTime.prompt',
+            'Specify the time (minutes) until URL will expire for path: {0}',
+            fileName
+        ),
+        placeHolder: localize('AWS.s3.promptTime.placeHolder', 'Defaults to 15 minutes'),
+        validateInput: validateTime,
+    })
+
+    const time = Number(timeStr)
+
+    if (isNaN(time) || time < 0) {
+        throw new ToolkitError('The provided expiration time is not a positive number', { code: 'InvalidInput' })
+    }
+
+    return time
+}
+
+function validateTime(time: string): string | undefined {
+    const number = Number(time)
+
+    if (isNaN(Number(time)) || !Number.isSafeInteger(number) || Number(time) <= 0) {
+        return invalidNumberWarning
+    }
+
+    return undefined
+}
diff --git a/packages/core/src/awsService/s3/commands/uploadFile.ts b/packages/core/src/awsService/s3/commands/uploadFile.ts
new file mode 100644
index 00000000000..a6a4a275440
--- /dev/null
+++ b/packages/core/src/awsService/s3/commands/uploadFile.ts
@@ -0,0 +1,600 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as path from 'path'
+import * as mime from 'mime-types'
+import * as vscode from 'vscode'
+import { statSync } from 'fs' // eslint-disable-line no-restricted-imports
+import { getLogger } from '../../../shared/logger/logger'
+import { S3Node } from '../explorer/s3Nodes'
+import { readablePath } from '../util'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { showOutputMessage } from '../../../shared/utilities/messages'
+import { createQuickPick, promptUser, verifySinglePickerOutput } from '../../../shared/ui/picker'
+import { addCodiconToString } from '../../../shared/utilities/textUtilities'
+import { S3Bucket, Folder, S3Client } from '../../../shared/clients/s3'
+import { createBucketCommand } from './createBucket'
+import { S3BucketNode } from '../explorer/s3BucketNode'
+import { S3FolderNode } from '../explorer/s3FolderNode'
+import * as localizedText from '../../../shared/localizedText'
+import { CancellationError } from '../../../shared/utilities/timeoutUtils'
+import { progressReporter } from '../progressReporter'
+import globals from '../../../shared/extensionGlobals'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { Upload } from '@aws-sdk/lib-storage'
+
+export interface FileSizeBytes {
+    /**
+     * Returns the file size in bytes.
+     */
+    (file: vscode.Uri): number
+}
+
+interface UploadRequest {
+    bucketName: string
+    key: string
+    fileLocation: vscode.Uri
+    fileSizeBytes: number
+    s3Client: S3Client
+    ongoingUpload?: Upload
+}
+
+/**
+ * Wizard to upload a file.
+ *
+ * @param s3Client account to upload the file to
+ * @param nodeOrDocument node to upload to or file currently open, if undefined then there was no active editor
+ *
+ */
+export async function uploadFileCommand(
+    s3Client: S3Client,
+    nodeOrDocument: S3BucketNode | S3FolderNode | vscode.Uri | undefined,
+    fileSizeBytes: FileSizeBytes = statFile,
+    getBucket = promptUserForBucket,
+    getFile = getFilesToUpload,
+    outputChannel = globals.outputChannel
+): Promise<void> {
+    let node: S3BucketNode | S3FolderNode | undefined
+    let document: vscode.Uri | undefined
+    const uploadRequests: UploadRequest[] = []
+
+    if (nodeOrDocument) {
+        if (nodeOrDocument instanceof S3BucketNode || nodeOrDocument instanceof S3FolderNode) {
+            node = nodeOrDocument as S3BucketNode | S3FolderNode
+            document = undefined
+        } else {
+            node = undefined
+            document = nodeOrDocument as vscode.Uri
+        }
+    } else {
+        node = undefined
+        document = undefined
+    }
+
+    const fileToUploadRequest = (bucketName: string, key: string, file: vscode.Uri) => ({
+        bucketName,
+        key: key,
+        fileLocation: file,
+        fileSizeBytes: fileSizeBytes(file),
+        s3Client,
+    })
+
+    if (node) {
+        const filesToUpload = await getFile(undefined)
+
+        if (!filesToUpload) {
+            showOutputMessage(
+                localize('AWS.message.error.uploadFileCommand.noFileSelected', 'No file selected, cancelling upload'),
+                outputChannel
+            )
+            getLogger().info('UploadFile cancelled')
+            telemetry.s3_uploadObject.emit({ result: 'Cancelled' })
+            return
+        }
+
+        uploadRequests.push(
+            ...filesToUpload.map((file) => {
+                const key = node!.path + path.basename(file.fsPath)
+                return fileToUploadRequest(node!.bucket.Name, key, file)
+            })
+        )
+        if (node instanceof S3FolderNode) {
+            globals.globalState.tryUpdate('aws.lastUploadedToS3Folder', {
+                bucket: node.bucket,
+                folder: node.folder,
+            })
+        }
+    } else {
+        while (true) {
+            const filesToUpload = await getFile(document)
+
+            if (!filesToUpload || filesToUpload.length === 0) {
+                // if file is undefined, means the back button was pressed(there is no step before) or no file was selected
+                // thus break the loop of the 'wizard'
+                showOutputMessage(
+                    localize(
+                        'AWS.message.error.uploadFileCommand.noFileSelected',
+                        'No file selected, cancelling upload'
+                    ),
+                    outputChannel
+                )
+                getLogger().info('UploadFile cancelled')
+                telemetry.s3_uploadObject.emit({ result: 'Cancelled' })
+                return
+            }
+
+            const bucketResponse = await getBucket(s3Client).catch((e) => {})
+
+            if (!bucketResponse) {
+                telemetry.s3_uploadObject.emit({ result: 'Failed' })
+                return
+            }
+
+            if (typeof bucketResponse === 'string') {
+                if (bucketResponse === 'back') {
+                    continue
+                }
+
+                showOutputMessage(
+                    localize(
+                        'AWS.message.error.uploadFileCommand.noBucketSelected',
+                        'No bucket selected, cancelling upload'
+                    ),
+                    outputChannel
+                )
+                getLogger().info('No bucket selected, cancelling upload')
+                telemetry.s3_uploadObject.emit({ result: 'Cancelled' })
+                return
+            }
+
+            const bucketName = bucketResponse.bucket!.Name
+            if (!bucketName) {
+                throw Error(`bucketResponse is not a S3.Bucket`)
+            }
+
+            uploadRequests.push(
+                ...filesToUpload.map((file) => {
+                    const key =
+                        bucketResponse.folder !== undefined
+                            ? bucketResponse.folder.path + path.basename(file.fsPath)
+                            : path.basename(file.fsPath)
+                    return fileToUploadRequest(bucketName, key, file)
+                })
+            )
+
+            if (bucketResponse.folder) {
+                globals.globalState.tryUpdate('aws.lastUploadedToS3Folder', {
+                    bucket: bucketResponse.bucket,
+                    folder: bucketResponse.folder,
+                })
+            }
+
+            break
+        }
+    }
+
+    await runBatchUploads(uploadRequests, outputChannel)
+
+    void vscode.commands.executeCommand('aws.refreshAwsExplorer', true)
+}
+
+async function promptForFileLocation(): Promise<vscode.Uri[] | undefined> {
+    const fileLocations = await vscode.window.showOpenDialog({
+        canSelectMany: true,
+        openLabel: localize('AWS.s3.uploadFile.openButton', 'Upload'),
+    })
+
+    return fileLocations
+}
+
+function statFile(file: vscode.Uri) {
+    return statSync(file.fsPath).size
+}
+
+/**
+ * Continously attempts to upload the files until all succeed or the user cancels.
+ */
+async function runBatchUploads(uploadRequests: UploadRequest[], outputChannel = globals.outputChannel): Promise<void> {
+    let failedRequests = await uploadBatchOfFiles(uploadRequests, outputChannel)
+
+    showOutputMessage(
+        localize(
+            'AWS.s3.uploadFile.complete',
+            'Uploaded {0}/{1} files',
+            uploadRequests.length - failedRequests.length,
+            uploadRequests.length
+        ),
+        outputChannel
+    )
+
+    while (failedRequests.length > 0) {
+        const failedKeys = failedRequests.map((request) => request.key)
+        getLogger().error(`List of requests failed to upload:\n${failedRequests.toString().split(',').join('\n')}`)
+
+        if (failedRequests.length > 5) {
+            showOutputMessage(
+                localize(
+                    'AWS.s3.uploadFile.failedMany',
+                    'Failed uploads:\n{0}\nSee logs for full list of failed items',
+                    failedKeys.toString().split(',').slice(0, 5).join('\n')
+                ),
+                outputChannel
+            )
+        } else {
+            showOutputMessage(
+                localize(
+                    'AWS.s3.uploadFile.failed',
+                    'Failed uploads:\n{0}',
+                    failedKeys.toString().split(',').join('\n')
+                ),
+                outputChannel
+            )
+        }
+        // at least one request failed
+        const response = await vscode.window.showErrorMessage(
+            localize(
+                'AWS.s3.uploadFile.retryPrompt',
+                'S3 Upload: {0}/{1} failed.',
+                failedRequests.length,
+                uploadRequests.length
+            ),
+            localizedText.retry,
+            localizedText.skip
+        )
+
+        if (response === localizedText.retry) {
+            // No tail call optimization in node :(
+            failedRequests = await uploadBatchOfFiles(failedRequests, outputChannel)
+        } else {
+            break
+        }
+    }
+}
+
+/**
+ * Uploads an array of requests to their specified s3 location.
+ *
+ * @returns array of unsuccessful requests
+ */
+
+async function uploadBatchOfFiles(
+    uploadRequests: UploadRequest[],
+    outputChannel = globals.outputChannel
+): Promise<UploadRequest[]> {
+    const totalBytes = uploadRequests.map((r) => r.fileSizeBytes).reduce((a, b) => a + b, 0)
+    const response = await vscode.window.withProgress(
+        {
+            cancellable: true,
+            location: vscode.ProgressLocation.Notification,
+            title: localize(
+                'AWS.s3.uploadFile.progressTitle.batch',
+                'Uploading {0} files to {1}',
+                uploadRequests.length,
+                uploadRequests[0].bucketName
+            ),
+        },
+        async (progress, token) => {
+            let requestIdx: number = 0
+            const failedRequests: UploadRequest[] = []
+
+            token.onCancellationRequested((e) => {
+                if (uploadRequests[requestIdx].ongoingUpload) {
+                    void uploadRequests[requestIdx].ongoingUpload?.abort()
+                }
+                return failedRequests
+            })
+
+            while (!token.isCancellationRequested && requestIdx < uploadRequests.length) {
+                const request = uploadRequests[requestIdx]
+                const fileName = path.basename(request.key)
+                const destinationPath = readablePath({ bucket: { Name: request.bucketName }, path: request.key })
+                showOutputMessage(
+                    localize('AWS.s3.uploadFile.startUpload', 'Uploading file {0} to {1}', fileName, destinationPath),
+                    outputChannel
+                )
+                let remainder = 0
+                let lastLoaded = 0
+                // TODO: don't use `withProgress`, it makes it hard to have control over the individual outputs
+                // For now we will hide the noisy info to the channel.
+                const progressWithCount: typeof progress = {
+                    report(value) {
+                        const loaded = ((value.increment ?? 0) / 100) * request.fileSizeBytes + remainder
+                        const rounded = Math.floor(loaded)
+                        const increment = ((rounded - lastLoaded) / totalBytes) * 100
+
+                        remainder = loaded - rounded
+                        lastLoaded = rounded
+                        progress.report({ message: `${fileName} (${value.message})`, increment })
+                    },
+                }
+
+                const uploadResult = await uploadWithProgress(request, progressWithCount, token).catch((err) => {
+                    showOutputMessage(
+                        localize(
+                            'AWS.s3.uploadFile.error.general',
+                            'Failed to upload file {0}: {1}',
+                            fileName,
+                            err.message
+                        ),
+                        outputChannel
+                    )
+
+                    return request
+                })
+
+                if (uploadResult) {
+                    // this request failed to upload
+                    failedRequests.push(uploadResult)
+                }
+
+                requestIdx += 1
+            }
+
+            return failedRequests.concat(uploadRequests.slice(requestIdx))
+        }
+    )
+
+    telemetry.s3_uploadObject.emit({
+        result: response.length > 0 ? 'Failed' : 'Succeeded',
+        value: uploadRequests.length,
+        failedCount: response.length,
+        successCount: uploadRequests.length - response.length,
+    })
+
+    return response
+}
+
+/**
+ * Uploads a single request to s3 with a progress window
+ *
+ * @param request File to be uploaded
+ * @param progress Progress to report to
+ * @param token Cancellation token
+ * @returns The same request if failed, undefined otherwise
+ */
+async function uploadWithProgress(
+    request: UploadRequest,
+    progress: vscode.Progress<{ message?: string; increment?: number }>,
+    token: vscode.CancellationToken
+): Promise<UploadRequest | undefined> {
+    const progressListener = progressReporter(progress, {
+        reportMessage: true,
+        totalBytes: request.fileSizeBytes,
+    })
+
+    const currentStream = await request.s3Client.uploadFile({
+        bucketName: request.bucketName,
+        key: request.key,
+        content: request.fileLocation,
+        progressListener,
+        contentType: mime.contentType(path.extname(request.fileLocation.fsPath)) || undefined,
+    })
+
+    progressListener(0)
+    request.ongoingUpload = currentStream
+
+    const cancelled = new Promise<void>((_, reject) => {
+        token.onCancellationRequested((e) => {
+            void currentStream.abort()
+            reject(new CancellationError('user'))
+        })
+    })
+
+    await Promise.race([currentStream.done(), cancelled])
+
+    return (request.ongoingUpload = undefined)
+}
+
+export interface BucketQuickPickItem extends vscode.QuickPickItem {
+    bucket: (Partial<S3Bucket> & { Name: string }) | undefined
+    folder?: Folder | undefined
+}
+
+interface SavedFolder {
+    bucket: S3Bucket
+    folder: Folder
+}
+
+// TODO:: extract and reuse logic from sam deploy wizard (bucket selection)
+/**
+ * Will display a quick pick with the list of all buckets owned by the user.
+ * @param s3client client to get the list of buckets
+ *
+ * @returns Bucket selected by the user, 'back' or 'cancel'
+ *
+ * @throws Error if there is an error calling s3
+ */
+export async function promptUserForBucket(
+    s3client: S3Client,
+    promptUserFunction = promptUser,
+    createBucket = createBucketCommand
+): Promise<BucketQuickPickItem | 'cancel' | 'back'> {
+    let allBuckets: S3Bucket[]
+    try {
+        allBuckets = (await s3client.listBuckets()).buckets
+    } catch (e) {
+        getLogger().error('Failed to list buckets from client %O', e)
+        void vscode.window.showErrorMessage(
+            localize('AWS.message.error.promptUserForBucket.listBuckets', 'Failed to list buckets from client')
+        )
+        throw new Error('Failed to list buckets from client')
+    }
+
+    const s3Buckets = allBuckets.filter((bucket) => {
+        return bucket && bucket.Name
+    })
+
+    const createNewBucket: BucketQuickPickItem = {
+        label: localize('AWS.command.s3.createBucket', 'Create new bucket'),
+        bucket: undefined,
+    }
+    const bucketItems: BucketQuickPickItem[] = s3Buckets.map((bucket) => {
+        return {
+            label: bucket.Name!,
+            bucket,
+        }
+    })
+
+    const lastTouchedFolder = globals.globalState.tryGet<SavedFolder>('aws.lastTouchedS3Folder', Object)
+    let lastFolderItem: BucketQuickPickItem | undefined = undefined
+    if (lastTouchedFolder) {
+        lastFolderItem = {
+            label: lastTouchedFolder.folder.name,
+            description: '(last opened S3 folder)',
+            bucket: { Name: lastTouchedFolder.bucket.Name },
+            folder: lastTouchedFolder.folder,
+        }
+    }
+
+    const lastUploadedToFolder = globals.globalState.tryGet<SavedFolder>('aws.lastUploadedToS3Folder', Object)
+    let lastUploadedFolderItem: BucketQuickPickItem | undefined = undefined
+    if (lastUploadedToFolder) {
+        lastUploadedFolderItem = {
+            label: lastUploadedToFolder.folder.name,
+            description: '(last uploaded-to S3 folder)',
+            bucket: { Name: lastUploadedToFolder.bucket.Name },
+            folder: lastUploadedToFolder.folder,
+        }
+    }
+
+    const folderItems = []
+    if (lastUploadedFolderItem !== undefined) {
+        folderItems.push(lastUploadedFolderItem)
+    }
+    // de-dupe if folders are the same
+    if (
+        lastFolderItem !== undefined &&
+        (lastUploadedFolderItem === undefined || lastFolderItem.folder?.path !== lastUploadedFolderItem.folder?.path)
+    ) {
+        folderItems.push(lastFolderItem)
+    }
+
+    const items: BucketQuickPickItem[] = [
+        ...(folderItems.length > 0
+            ? [
+                  {
+                      label: localize('AWS.s3.uploadFile.folderSeparator', 'Folders'),
+                      kind: vscode.QuickPickItemKind.Separator,
+                      bucket: undefined,
+                  } as BucketQuickPickItem,
+              ]
+            : []),
+        ...folderItems,
+        {
+            label: localize('AWS.s3.uploadFile.bucketSeparator', 'Buckets'),
+            kind: vscode.QuickPickItemKind.Separator,
+            bucket: undefined,
+        } as BucketQuickPickItem,
+        ...bucketItems,
+        createNewBucket,
+    ]
+
+    const picker = createQuickPick({
+        options: {
+            canPickMany: false,
+            ignoreFocusOut: true,
+            title: localize('AWS.message.selectBucket', 'Select an S3 bucket or folder to upload to'),
+            step: 2,
+            totalSteps: 2,
+        },
+        items,
+        buttons: [vscode.QuickInputButtons.Back],
+    })
+    const response = verifySinglePickerOutput(
+        await promptUserFunction({
+            picker: picker,
+            onDidTriggerButton: (button, resolve, reject) => {
+                if (button === vscode.QuickInputButtons.Back) {
+                    resolve([
+                        {
+                            label: 'back',
+                            bucket: undefined,
+                        },
+                    ])
+                }
+            },
+        })
+    )
+
+    if (!response) {
+        return 'cancel'
+    }
+
+    if (!response.bucket) {
+        if (response.label === 'back') {
+            return response.label
+        }
+        if (response.label === 'Create new bucket') {
+            const s3Node = new S3Node(s3client)
+            await createBucket(s3Node)
+            return promptUserForBucket(s3client)
+        }
+    } else {
+        return response
+    }
+    return 'cancel'
+}
+
+/**
+ * Gets the open file in the current editor
+ * Asks the user to browse for more files
+ * If no file is open it prompts the user to select file
+ * @param document document to use as currently open
+ *
+ * @returns file selected by the user
+ */
+export async function getFilesToUpload(
+    document?: vscode.Uri,
+    promptUserFunction = promptUser
+): Promise<vscode.Uri[] | undefined> {
+    let fileLocations: vscode.Uri[] | undefined
+
+    if (!document) {
+        fileLocations = await promptForFileLocation()
+    } else {
+        fileLocations = [document]
+        const fileNameToDisplay = path.basename(fileLocations[0].fsPath)
+
+        const fileOption: vscode.QuickPickItem = {
+            label: addCodiconToString('file', fileNameToDisplay),
+        }
+        const selectMore: vscode.QuickPickItem = {
+            label: localize('AWS.message.browseMoreFiles', 'Browse for more files...'),
+        }
+
+        const picker = createQuickPick({
+            options: {
+                canPickMany: false,
+                ignoreFocusOut: true,
+                title: localize('AWS.message.selectFileUpload', 'Select a file to upload'),
+                step: 1,
+                totalSteps: 2,
+            },
+            items: [fileOption, selectMore],
+            buttons: [vscode.QuickInputButtons.Back],
+        })
+
+        const response = verifySinglePickerOutput(
+            await promptUserFunction({
+                picker: picker,
+                onDidTriggerButton: (button, resolve, reject) => {
+                    if (button === vscode.QuickInputButtons.Back) {
+                        resolve(undefined)
+                    }
+                },
+            })
+        )
+
+        if (!response) {
+            return
+        }
+
+        if (response.label === selectMore.label) {
+            fileLocations = await promptForFileLocation()
+        }
+    }
+
+    return fileLocations
+}
diff --git a/src/s3/commands/uploadFileToParent.ts b/packages/core/src/awsService/s3/commands/uploadFileToParent.ts
similarity index 77%
rename from src/s3/commands/uploadFileToParent.ts
rename to packages/core/src/awsService/s3/commands/uploadFileToParent.ts
index fe157a4f89e..211ceb326e6 100644
--- a/src/s3/commands/uploadFileToParent.ts
+++ b/packages/core/src/awsService/s3/commands/uploadFileToParent.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { getLogger } from '../../shared/logger'
+import { getLogger } from '../../../shared/logger/logger'
 import { S3FileNode } from '../explorer/s3FileNode'
 import { uploadFileCommand } from './uploadFile'
 
diff --git a/packages/core/src/awsService/s3/explorer/s3BucketNode.ts b/packages/core/src/awsService/s3/explorer/s3BucketNode.ts
new file mode 100644
index 00000000000..631c55f1414
--- /dev/null
+++ b/packages/core/src/awsService/s3/explorer/s3BucketNode.ts
@@ -0,0 +1,116 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { ChildNodePage } from '../../../awsexplorer/childNodeLoader'
+import { S3Bucket, CreateFolderRequest, CreateFolderResponse, S3Client } from '../../../shared/clients/s3'
+
+import { AWSResourceNode } from '../../../shared/treeview/nodes/awsResourceNode'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { LoadMoreNode } from '../../../shared/treeview/nodes/loadMoreNode'
+import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
+import { makeChildrenNodes } from '../../../shared/treeview/utils'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { ChildNodeLoader } from '../../../awsexplorer/childNodeLoader'
+import { S3FileNode } from './s3FileNode'
+import { S3FolderNode } from './s3FolderNode'
+import { inspect } from 'util'
+import { getLogger } from '../../../shared/logger/logger'
+import { S3Node } from './s3Nodes'
+import { getIcon } from '../../../shared/icons'
+import { Settings } from '../../../shared/settings'
+import { ClassToInterfaceType } from '../../../shared/utilities/tsUtils'
+
+/**
+ * Represents an S3 bucket that may contain folders and/or objects.
+ */
+export class S3BucketNode extends AWSTreeNodeBase implements AWSResourceNode, LoadMoreNode {
+    private readonly childLoader = new ChildNodeLoader(this, (token) => this.loadPage(token))
+
+    public constructor(
+        public readonly bucket: S3Bucket,
+        public readonly parent: S3Node,
+        public readonly s3: S3Client,
+        protected readonly settings: ClassToInterfaceType<Settings> = Settings.instance
+    ) {
+        super(bucket.Name, vscode.TreeItemCollapsibleState.Collapsed)
+        this.tooltip = bucket.Name
+        this.iconPath = getIcon('aws-s3-bucket')
+        this.contextValue = 'awsS3BucketNode'
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        return await makeChildrenNodes({
+            getChildNodes: async () => this.childLoader.getChildren(),
+            getNoChildrenPlaceholderNode: async () =>
+                new PlaceholderNode(this, localize('AWS.explorerNode.s3.noObjects', '[No Objects found]')),
+        })
+    }
+
+    public async loadMoreChildren(): Promise<void> {
+        await this.childLoader.loadMoreChildren()
+    }
+
+    public isLoadingMoreChildren(): boolean {
+        return this.childLoader.isLoadingMoreChildren()
+    }
+
+    public clearChildren(): void {
+        this.childLoader.clearChildren()
+    }
+
+    private async loadPage(continuationToken: string | undefined): Promise<ChildNodePage<S3FolderNode | S3FileNode>> {
+        getLogger().debug(`Loading page for %O using continuationToken %s`, this, continuationToken)
+        const response = await this.s3.listFiles({
+            bucketName: this.bucket.Name,
+            continuationToken,
+            maxResults: this.getMaxItemsPerPage(),
+        })
+
+        const newFolders = response.folders.map((folder) => new S3FolderNode(this.bucket, folder, this.s3))
+        const newFiles = response.files.map((file) => new S3FileNode(this.bucket, file, this, this.s3))
+
+        getLogger().debug(`Loaded folders: %O and files: %O`, newFolders, newFiles)
+        return {
+            newContinuationToken: response.continuationToken,
+            newChildren: [...newFolders, ...newFiles],
+        }
+    }
+
+    /**
+     * See {@link S3Client.createFolder}.
+     */
+    public async createFolder(request: CreateFolderRequest): Promise<CreateFolderResponse> {
+        return this.s3.createFolder(request)
+    }
+
+    /**
+     * See {@link S3Client.deleteBucket}.
+     */
+    public async deleteBucket(): Promise<void> {
+        await this.s3.deleteBucket({ bucketName: this.bucket.Name })
+    }
+
+    public get arn(): string {
+        return this.bucket.Arn
+    }
+
+    public get name(): string {
+        return this.bucket.Name
+    }
+
+    public get path(): string {
+        // Even though the bucket is the "root", there is no '/' prefix on objects inside
+        return ''
+    }
+
+    public [inspect.custom](): string {
+        return `S3BucketNode (bucket=${this.bucket.Name})`
+    }
+
+    private getMaxItemsPerPage(): number | undefined {
+        return this.settings.getSection('aws').get<number>('s3.maxItemsPerPage')
+    }
+}
diff --git a/packages/core/src/awsService/s3/explorer/s3FileNode.ts b/packages/core/src/awsService/s3/explorer/s3FileNode.ts
new file mode 100644
index 00000000000..37ee6334353
--- /dev/null
+++ b/packages/core/src/awsService/s3/explorer/s3FileNode.ts
@@ -0,0 +1,84 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import bytes from 'bytes'
+import { S3Bucket, DownloadFileRequest, File, S3Client } from '../../../shared/clients/s3'
+import { AWSResourceNode } from '../../../shared/treeview/nodes/awsResourceNode'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { inspect } from 'util'
+import { S3BucketNode } from './s3BucketNode'
+import { S3FolderNode } from './s3FolderNode'
+import globals from '../../../shared/extensionGlobals'
+import { getIcon } from '../../../shared/icons'
+import { formatLocalized, getRelativeDate } from '../../../shared/datetime'
+
+/**
+ * Represents an object in an S3 bucket.
+ */
+export class S3FileNode extends AWSTreeNodeBase implements AWSResourceNode {
+    public constructor(
+        public readonly bucket: S3Bucket,
+        public readonly file: File,
+        public readonly parent: S3BucketNode | S3FolderNode,
+        public readonly s3: S3Client,
+        now: Date = new globals.clock.Date()
+    ) {
+        super(file.name)
+        if (file.sizeBytes !== undefined && file.lastModified) {
+            const readableSize = formatBytes(file.sizeBytes)
+
+            this.tooltip = localize(
+                'AWS.explorerNode.s3.fileTooltip',
+                '{0}\nSize: {1}\nLast Modified: {2}',
+                this.file.key,
+                readableSize,
+                formatLocalized(file.lastModified)
+            )
+            this.description = `${readableSize}, ${getRelativeDate(file.lastModified, now)}`
+        }
+        this.iconPath = getIcon('vscode-file')
+        this.contextValue = 'awsS3FileNode'
+        this.command = {
+            command: 'aws.s3.openFile',
+            title: localize('AWS.command.s3.openFile', 'Open File'),
+            arguments: [this],
+        }
+    }
+
+    /**
+     * See {@link S3Client.downloadFile}.
+     */
+    public async downloadFile(request: DownloadFileRequest): Promise<void> {
+        return this.s3.downloadFile(request)
+    }
+
+    /**
+     * See {@link S3Client.deleteFile}.
+     */
+    public async deleteFile(): Promise<void> {
+        await this.s3.deleteObject({ bucketName: this.bucket.Name, key: this.file.key })
+    }
+
+    public get arn(): string {
+        return this.file.arn
+    }
+
+    public get name(): string {
+        return this.file.name
+    }
+
+    public get path(): string {
+        return this.file.key
+    }
+
+    public [inspect.custom](): string {
+        return `S3FileNode (bucket=${this.bucket.Name}, file=${this.file.key}}`
+    }
+}
+
+function formatBytes(numBytes: number): string {
+    return bytes(numBytes, { unitSeparator: ' ', decimalPlaces: 0 })
+}
diff --git a/packages/core/src/awsService/s3/explorer/s3FolderNode.ts b/packages/core/src/awsService/s3/explorer/s3FolderNode.ts
new file mode 100644
index 00000000000..7eea80f3aec
--- /dev/null
+++ b/packages/core/src/awsService/s3/explorer/s3FolderNode.ts
@@ -0,0 +1,106 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { S3Bucket, CreateFolderRequest, CreateFolderResponse, Folder, S3Client } from '../../../shared/clients/s3'
+import { AWSResourceNode } from '../../../shared/treeview/nodes/awsResourceNode'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { LoadMoreNode } from '../../../shared/treeview/nodes/loadMoreNode'
+import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
+import { makeChildrenNodes } from '../../../shared/treeview/utils'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { ChildNodeLoader } from '../../../awsexplorer/childNodeLoader'
+import { ChildNodePage } from '../../../awsexplorer/childNodeLoader'
+import { S3FileNode } from './s3FileNode'
+import { inspect } from 'util'
+import { getLogger } from '../../../shared/logger/logger'
+import { getIcon } from '../../../shared/icons'
+import { Settings } from '../../../shared/settings'
+import { ClassToInterfaceType } from '../../../shared/utilities/tsUtils'
+
+/**
+ * Represents a folder in an S3 bucket that may contain subfolders and/or objects.
+ */
+export class S3FolderNode extends AWSTreeNodeBase implements AWSResourceNode, LoadMoreNode {
+    private readonly childLoader = new ChildNodeLoader(this, (token) => this.loadPage(token))
+
+    public constructor(
+        public readonly bucket: S3Bucket,
+        public readonly folder: Folder,
+        public readonly s3: S3Client,
+        protected readonly settings: ClassToInterfaceType<Settings> = Settings.instance
+    ) {
+        super(folder.name, vscode.TreeItemCollapsibleState.Collapsed)
+        this.tooltip = folder.path
+        this.iconPath = getIcon('vscode-folder')
+        this.contextValue = 'awsS3FolderNode'
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        return await makeChildrenNodes({
+            getChildNodes: async () => this.childLoader.getChildren(),
+            getNoChildrenPlaceholderNode: async () =>
+                new PlaceholderNode(this, localize('AWS.explorerNode.s3.noObjects', '[No Objects found]')),
+        })
+    }
+
+    public async loadMoreChildren(): Promise<void> {
+        await this.childLoader.loadMoreChildren()
+    }
+
+    public isLoadingMoreChildren(): boolean {
+        return this.childLoader.isLoadingMoreChildren()
+    }
+
+    public clearChildren(): void {
+        this.childLoader.clearChildren()
+    }
+
+    private async loadPage(continuationToken: string | undefined): Promise<ChildNodePage<S3FolderNode | S3FileNode>> {
+        getLogger().debug(`Loading page for %O using continuationToken %s`, this, continuationToken)
+        const response = await this.s3.listFiles({
+            bucketName: this.bucket.Name,
+            folderPath: this.folder.path,
+            continuationToken,
+            maxResults: this.getMaxItemsPerPage(),
+        })
+
+        const newFolders = response.folders.map((folder) => new S3FolderNode(this.bucket, folder, this.s3))
+        const newFiles = response.files.map((file) => new S3FileNode(this.bucket, file, this, this.s3))
+
+        getLogger().debug(`Loaded folders: %O and files: %O`, newFolders, newFiles)
+        return {
+            newContinuationToken: response.continuationToken,
+            newChildren: [...newFolders, ...newFiles],
+        }
+    }
+
+    /**
+     * See {@link S3Client.createFolder}.
+     */
+    public async createFolder(request: CreateFolderRequest): Promise<CreateFolderResponse> {
+        return this.s3.createFolder(request)
+    }
+
+    public get arn(): string {
+        return this.folder.arn
+    }
+
+    public get name(): string {
+        return this.folder.name
+    }
+
+    public get path(): string {
+        return this.folder.path
+    }
+
+    public [inspect.custom](): string {
+        return `S3FolderNode (bucket=${this.bucket.Name}, folder=${this.folder.path})`
+    }
+
+    private getMaxItemsPerPage(): number | undefined {
+        return this.settings.getSection('aws').get<number>('s3.maxItemsPerPage')
+    }
+}
diff --git a/packages/core/src/awsService/s3/explorer/s3Nodes.ts b/packages/core/src/awsService/s3/explorer/s3Nodes.ts
new file mode 100644
index 00000000000..fcc7b9e5410
--- /dev/null
+++ b/packages/core/src/awsService/s3/explorer/s3Nodes.ts
@@ -0,0 +1,48 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { localize } from '../../../shared/utilities/vsCodeUtils'
+import { CreateBucketRequest, CreateBucketResponse, S3Client } from '../../../shared/clients/s3'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
+import { makeChildrenNodes } from '../../../shared/treeview/utils'
+import { S3BucketNode } from './s3BucketNode'
+import { inspect } from 'util'
+
+/**
+ * An AWS Explorer node representing S3.
+ *
+ * Contains buckets for a specific region as child nodes.
+ */
+export class S3Node extends AWSTreeNodeBase {
+    public constructor(private readonly s3: S3Client) {
+        super('S3', vscode.TreeItemCollapsibleState.Collapsed)
+        this.contextValue = 'awsS3Node'
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        return await makeChildrenNodes({
+            getChildNodes: async () => {
+                const response = await this.s3.listBuckets()
+
+                return response.buckets.map((bucket) => new S3BucketNode(bucket, this, this.s3))
+            },
+            getNoChildrenPlaceholderNode: async () =>
+                new PlaceholderNode(this, localize('AWS.explorerNode.s3.noBuckets', '[No Buckets found]')),
+        })
+    }
+
+    /**
+     * See {@link S3Client.createBucket}.
+     */
+    public async createBucket(request: CreateBucketRequest): Promise<CreateBucketResponse> {
+        return this.s3.createBucket(request)
+    }
+
+    public [inspect.custom](): string {
+        return 'S3Node'
+    }
+}
diff --git a/src/s3/fileViewerManager.ts b/packages/core/src/awsService/s3/fileViewerManager.ts
similarity index 76%
rename from src/s3/fileViewerManager.ts
rename to packages/core/src/awsService/s3/fileViewerManager.ts
index 6538dc78ea8..883971513e9 100644
--- a/src/s3/fileViewerManager.ts
+++ b/packages/core/src/awsService/s3/fileViewerManager.ts
@@ -1,22 +1,22 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as path from 'path'
 import * as vscode from 'vscode'
 import * as mime from 'mime-types'
-import * as S3 from '../shared/clients/s3Client'
-import { getLogger } from '../shared/logger'
-import { showConfirmationMessage } from '../shared/utilities/messages'
-import { localize } from '../shared/utilities/vsCodeUtils'
-import { CancellationError } from '../shared/utilities/timeoutUtils'
+import * as S3 from '../../shared/clients/s3'
+import { getLogger } from '../../shared/logger/logger'
+import { showConfirmationMessage } from '../../shared/utilities/messages'
+import { localize, openUrl } from '../../shared/utilities/vsCodeUtils'
+import { CancellationError } from '../../shared/utilities/timeoutUtils'
 import { downloadFile } from './commands/downloadFileAs'
-import { s3FileViewerHelpUrl } from '../shared/constants'
-import { FileProvider, VirualFileSystem } from '../shared/virtualFilesystem'
-import { PromptSettings } from '../shared/settings'
-import { telemetry } from '../shared/telemetry/telemetry'
-import { ToolkitError } from '../shared/errors'
+import { s3FileViewerHelpUrl } from '../../shared/constants'
+import { FileProvider, VirtualFileSystem } from '../../shared/virtualFilesystem'
+import { ToolkitPromptSettings } from '../../shared/settings'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { ToolkitError } from '../../shared/errors'
 
 export const s3EditScheme = 's3'
 export const s3ReadScheme = 's3-readonly'
@@ -38,7 +38,7 @@ export interface S3Tab {
 // TODO: just use this everywhere? A bucket-less S3 file doesn't make sense.
 // Combines the File and Bucket interface as they mostly belong together
 export interface S3File extends S3.File {
-    readonly bucket: S3.Bucket
+    readonly bucket: S3.S3Bucket
 }
 
 export class S3FileProvider implements FileProvider {
@@ -46,13 +46,16 @@ export class S3FileProvider implements FileProvider {
     private readonly _file: { -readonly [P in keyof S3File]: S3File[P] }
     public readonly onDidChange = this._onDidChange.event
 
-    public constructor(private readonly client: S3.S3Client, file: S3File) {
+    public constructor(
+        private readonly client: S3.S3Client,
+        file: S3File
+    ) {
         this._file = { ...file }
     }
 
     public async refresh(): Promise<void> {
         const { bucket, key } = this._file
-        const stats = await this.client.headObject({ bucketName: bucket.name, key })
+        const stats = await this.client.headObject({ bucketName: bucket.Name, key })
 
         this.updateETag(stats.ETag)
         this._file.sizeBytes = stats.ContentLength ?? this._file.sizeBytes
@@ -61,7 +64,7 @@ export class S3FileProvider implements FileProvider {
     }
 
     public async read(): Promise<Uint8Array> {
-        return telemetry.s3_downloadObject.run(span => {
+        return telemetry.s3_downloadObject.run((span) => {
             span.record({ component: 'viewer' })
 
             const result = downloadFile(this._file, {
@@ -87,7 +90,7 @@ export class S3FileProvider implements FileProvider {
     }
 
     public async write(content: Uint8Array): Promise<void> {
-        return telemetry.s3_uploadObject.run(async span => {
+        return telemetry.s3_uploadObject.run(async (span) => {
             span.record({ component: 'viewer' })
 
             const mimeType = mime.contentType(path.extname(this._file.name)) || undefined
@@ -95,10 +98,10 @@ export class S3FileProvider implements FileProvider {
                 .uploadFile({
                     content,
                     key: this._file.key,
-                    bucketName: this._file.bucket.name,
+                    bucketName: this._file.bucket.Name,
                     contentType: this._file.ContentType ?? mimeType,
                 })
-                .then(u => u.promise())
+                .then((u) => u.done())
 
             this.updateETag(result.ETag)
             this._file.lastModified = new Date()
@@ -123,27 +126,29 @@ export class S3FileViewerManager {
 
     public constructor(
         private readonly clientFactory: S3ClientFactory,
-        private readonly fs: VirualFileSystem,
-        private readonly window: typeof vscode.window = vscode.window,
-        private readonly settings = PromptSettings.instance,
+        private readonly fs: VirtualFileSystem,
+        private readonly settings = ToolkitPromptSettings.instance,
         private readonly schemes = { read: s3ReadScheme, edit: s3EditScheme }
     ) {
         this.disposables.push(this.registerTabCleanup())
     }
 
-    /**
-     * Removes all active editors as well as any underlying files
-     */
+    /** Disposes all active editors and underlying files. */
+    public async closeEditors(): Promise<void> {
+        await Promise.all(Object.values(this.activeTabs).map((v) => v?.dispose()))
+    }
+
+    /** Disposes all active editors, underlying files, providers, and other resources. */
     public async dispose(): Promise<void> {
         await Promise.all([
-            ...Object.values(this.activeTabs).map(v => v?.dispose()),
-            ...Object.values(this.providers).map(v => v?.dispose()),
+            ...Object.values(this.activeTabs).map((v) => v?.dispose()),
+            ...Object.values(this.providers).map((v) => v?.dispose()),
         ])
         vscode.Disposable.from(...this.disposables).dispose()
     }
 
     private registerTabCleanup(): vscode.Disposable {
-        return vscode.workspace.onDidCloseTextDocument(async doc => {
+        return vscode.workspace.onDidCloseTextDocument(async (doc) => {
             const key = this.fs.uriToKey(doc.uri)
             await this.activeTabs[key]?.dispose()
         })
@@ -164,13 +169,13 @@ export class S3FileViewerManager {
             const contentType = mime.contentType(path.extname(fsPath))
             if (!contentType || mime.charset(contentType) !== 'UTF-8') {
                 await vscode.commands.executeCommand('vscode.open', fileUri)
-                return this.window.visibleTextEditors.find(
-                    e => this.fs.uriToKey(e.document.uri) === this.fs.uriToKey(fileUri)
+                return vscode.window.visibleTextEditors.find(
+                    (e) => this.fs.uriToKey(e.document.uri) === this.fs.uriToKey(fileUri)
                 )
             }
 
             const document = await vscode.workspace.openTextDocument(fileUri)
-            return await this.window.showTextDocument(document, options)
+            return await vscode.window.showTextDocument(document, options)
         } catch (err) {
             throw ToolkitError.chain(err, 'Failed to open document', { code: 'FailedToOpen' })
         }
@@ -178,8 +183,12 @@ export class S3FileViewerManager {
 
     private async closeEditor(editor: vscode.TextEditor | undefined): Promise<void> {
         if (editor && !editor.document.isClosed) {
-            await this.window.showTextDocument(editor.document, { preserveFocus: false })
-            await vscode.commands.executeCommand('workbench.action.closeActiveEditor')
+            await vscode.window.showTextDocument(editor.document, { preserveFocus: false }).then(
+                (r) => vscode.commands.executeCommand('workbench.action.closeActiveEditor'),
+                (e) => {
+                    getLogger().warn('S3FileViewer: showTextDocument failed to open: "%s"', editor.document.uri)
+                }
+            )
         }
     }
 
@@ -194,7 +203,7 @@ export class S3FileViewerManager {
                 continue
             } else if (activeTab.editor) {
                 getLogger().verbose(`S3FileViewer: Editor already opened, refocusing`)
-                await this.window.showTextDocument(activeTab.editor.document)
+                await vscode.window.showTextDocument(activeTab.editor.document)
             } else {
                 getLogger().verbose(`S3FileViewer: Reopening non-text document`)
                 await vscode.commands.executeCommand('vscode.open', uri)
@@ -210,9 +219,9 @@ export class S3FileViewerManager {
      *
      * @param file
      */
-    public async openInReadMode(file: S3File): Promise<void> {
+    public async openInReadMode(file: S3File): Promise<S3Tab | undefined> {
         const contentType = mime.contentType(path.extname(file.name))
-        const isTextDocument = contentType && mime.charset(contentType) == 'UTF-8'
+        const isTextDocument = contentType && mime.charset(contentType) === 'UTF-8'
 
         const uri = this.fileToUri(file, TabMode.Read)
         if (await this.tryFocusTab(uri, uri.with({ scheme: this.schemes.edit }))) {
@@ -224,7 +233,7 @@ export class S3FileViewerManager {
             return this.openInEditMode(file)
         }
 
-        await this.createTab(file, TabMode.Read)
+        return this.createTab(file, TabMode.Read)
     }
 
     /**
@@ -233,7 +242,7 @@ export class S3FileViewerManager {
      *
      * @param uriOrFile to be opened
      */
-    public async openInEditMode(uriOrFile: vscode.Uri | S3File): Promise<void> {
+    public async openInEditMode(uriOrFile: vscode.Uri | S3File): Promise<S3Tab | undefined> {
         const uri = uriOrFile instanceof vscode.Uri ? uriOrFile : this.fileToUri(uriOrFile, TabMode.Edit)
         const activeTab = await this.tryFocusTab(uri, uri.with({ scheme: this.schemes.read }))
         const file = activeTab?.file ?? uriOrFile
@@ -243,23 +252,23 @@ export class S3FileViewerManager {
         }
 
         if (file instanceof vscode.Uri) {
-            throw new Error('Unable to open file in edit mode without a valid editor.')
+            throw new TypeError('Unable to open file in edit mode without a valid editor.')
         }
 
         await activeTab?.dispose()
-        this.showEditNotification()
+        void this.showEditNotification()
 
-        await this.createTab(file, TabMode.Edit)
+        return this.createTab(file, TabMode.Edit)
     }
 
     private registerProvider(file: S3File, uri: vscode.Uri): vscode.Disposable {
-        const provider = new S3FileProvider(this.clientFactory(file.bucket.region), file)
+        const provider = new S3FileProvider(this.clientFactory(file.bucket.BucketRegion), file)
 
         return vscode.Disposable.from(
             this.fs.registerProvider(uri, provider),
             provider.onDidChange(() => {
                 // TODO: find the correct node instead of refreshing it all
-                vscode.commands.executeCommand('aws.refreshAwsExplorer', true)
+                void vscode.commands.executeCommand('aws.refreshAwsExplorer', true)
             })
         )
     }
@@ -267,7 +276,7 @@ export class S3FileViewerManager {
     /**
      * Creates a new tab based on the mode
      */
-    private async createTab(file: S3File, mode: TabMode): Promise<void> {
+    private async createTab(file: S3File, mode: TabMode): Promise<S3Tab | undefined> {
         if (!(await this.canContinueDownload(file))) {
             throw new CancellationError('user')
         }
@@ -292,6 +301,8 @@ export class S3FileViewerManager {
                 }
             },
         }
+
+        return this.activeTabs[key]
     }
 
     private async canContinueDownload(file: S3File): Promise<boolean> {
@@ -326,7 +337,7 @@ export class S3FileViewerManager {
             cancel: localize('AWS.generic.cancel', 'Cancel'),
         }
 
-        if (!(await showConfirmationMessage(args, this.window))) {
+        if (!(await showConfirmationMessage(args))) {
             getLogger().debug(`FileViewer: User cancelled download`)
             return false
         }
@@ -335,7 +346,7 @@ export class S3FileViewerManager {
     }
 
     private async showEditNotification(): Promise<void> {
-        if (!(await this.settings.isPromptEnabled(promptOnEditKey))) {
+        if (!this.settings.isPromptEnabled(promptOnEditKey)) {
             return
         }
 
@@ -347,13 +358,13 @@ export class S3FileViewerManager {
         const dontShow = localize('AWS.s3.fileViewer.button.dismiss', "Don't show again")
         const help = localize('AWS.generic.message.learnMore', 'Learn more')
 
-        await this.window.showWarningMessage(message, dontShow, help).then<unknown>(selection => {
+        await vscode.window.showWarningMessage(message, dontShow, help).then<unknown>((selection) => {
             if (selection === dontShow) {
                 return this.settings.disablePrompt(promptOnEditKey)
             }
 
             if (selection === help) {
-                return vscode.env.openExternal(vscode.Uri.parse(s3FileViewerHelpUrl, true))
+                return openUrl(vscode.Uri.parse(s3FileViewerHelpUrl, true))
             }
         })
     }
@@ -362,7 +373,7 @@ export class S3FileViewerManager {
         const scheme = mode === TabMode.Read ? this.schemes.read : this.schemes.edit
 
         return vscode.Uri.parse(`${scheme}:`, true).with({
-            path: ['', file.bucket.region, file.bucket.name, file.key].join('/'),
+            path: ['', file.bucket.BucketRegion, file.bucket.Name, file.key].join('/'),
         })
     }
 }
diff --git a/src/s3/progressReporter.ts b/packages/core/src/awsService/s3/progressReporter.ts
similarity index 94%
rename from src/s3/progressReporter.ts
rename to packages/core/src/awsService/s3/progressReporter.ts
index 06b6234448d..9ccf371d191 100644
--- a/src/s3/progressReporter.ts
+++ b/packages/core/src/awsService/s3/progressReporter.ts
@@ -1,13 +1,13 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as vscode from 'vscode'
 import { inspect } from 'util'
 import { throttle } from 'lodash'
-import { getLogger } from '../shared/logger/logger'
-import * as bytes from 'bytes'
+import { getLogger } from '../../shared/logger/logger'
+import bytes from 'bytes'
 
 const defaultReportingIntervalMillis = 250
 
@@ -38,7 +38,7 @@ export function progressReporter(
         { leading: true, trailing: false }
     )
 
-    return newBytes => {
+    return (newBytes) => {
         reporter.update(newBytes)
 
         if (reporter.done) {
@@ -74,7 +74,7 @@ class ProgressReporter {
         this._totalBytes = options?.totalBytes
         if (this._totalBytes !== undefined) {
             if (!Number.isInteger(this._totalBytes)) {
-                throw new Error(`totalBytes: ${this._totalBytes} must be an integer`)
+                throw new TypeError(`totalBytes: ${this._totalBytes} must be an integer`)
             }
             if (this._totalBytes < 0) {
                 throw new Error(`totalBytes ${this._totalBytes} cannot be negative`)
@@ -137,7 +137,7 @@ class ProgressReporter {
      */
     public update(newBytes: number): void {
         if (!Number.isInteger(newBytes)) {
-            throw new Error(`newBytes: ${newBytes} must be an integer`)
+            throw new TypeError(`newBytes: ${newBytes} must be an integer`)
         } else if (newBytes < 0) {
             throw new Error(`newBytes: ${newBytes} cannot be negative`)
         } else if (this._totalBytes !== undefined && newBytes > this._totalBytes) {
diff --git a/packages/core/src/awsService/s3/util.ts b/packages/core/src/awsService/s3/util.ts
new file mode 100644
index 00000000000..39c3bf01044
--- /dev/null
+++ b/packages/core/src/awsService/s3/util.ts
@@ -0,0 +1,71 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { localize } from '../../shared/utilities/vsCodeUtils'
+/**
+ * Creates a readable path to an s3 bucket or object (e.g. s3://...).
+ *
+ * This is the format used by AWS CLI.
+ * @see https://docs.aws.amazon.com/cli/latest/reference/s3/#path-argument-type
+ *
+ * @param bucket contains the name of the bucket.
+ * @param path to the object, or an empty string if this is the root of the bucket.
+ * @returns the readable path to the s3 bucket or object (e.g. s3://...).
+ */
+export function readablePath({ bucket, path }: { bucket: { Name: string }; path: string }): string {
+    return path ? `s3://${bucket.Name}/${path}` : `s3://${bucket.Name}`
+}
+
+/**
+ * Validates an S3 bucket name.
+ *
+ * @see https://docs.aws.amazon.com/AmazonS3/latest/dev/BucketRestrictions.html#bucketnamingrules
+ * @returns undefined if the name passes validation. Otherwise, an error message is returned.
+ */
+export function validateBucketName(name: string): string | undefined {
+    if (name.length < 3 || name.length > 63) {
+        return localize(
+            'AWS.s3.validateBucketName.error.invalidLength',
+            'Bucket name must be between 3 and 63 characters long'
+        )
+    }
+
+    if (!/^[a-z0-9]/.test(name)) {
+        return localize(
+            'AWS.s3.validateBucketName.error.invalidStart',
+            'Bucket name must start with a lowercase letter or number'
+        )
+    }
+
+    if (!/[a-z0-9]$/.test(name)) {
+        return localize(
+            'AWS.s3.validateBucketName.error.invalidEnd',
+            'Bucket name must end with a lowercase letter or number'
+        )
+    }
+
+    if (!/^[a-z0-9\-.]+$/.test(name)) {
+        return localize(
+            'AWS.s3.validateBucketName.error.invalidCharacters',
+            'Bucket name must only contain lowercase letters, numbers, hyphens, and periods'
+        )
+    }
+
+    if (name.includes('..') || name.includes('.-') || name.includes('-.')) {
+        return localize(
+            'AWS.s3.validateBucketName.error.misusedPeriods',
+            'Periods in bucket name must be surrounded by a lowercase letter or number'
+        )
+    }
+
+    if (/^\d{1,3}\.\d{1,3}\.\d{1,3}.\d{1,3}$/.test(name)) {
+        return localize(
+            'AWS.s3.validateBucketName.error.resemblesIpAddress',
+            'Bucket name must not resemble an IP address'
+        )
+    }
+
+    return undefined
+}
diff --git a/packages/core/src/awsService/sagemaker/activation.ts b/packages/core/src/awsService/sagemaker/activation.ts
new file mode 100644
index 00000000000..da8392ebad4
--- /dev/null
+++ b/packages/core/src/awsService/sagemaker/activation.ts
@@ -0,0 +1,82 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as path from 'path'
+import * as vscode from 'vscode'
+import { Commands } from '../../shared/vscode/commands2'
+import { SagemakerSpaceNode } from './explorer/sagemakerSpaceNode'
+import { SagemakerParentNode } from './explorer/sagemakerParentNode'
+import * as uriHandlers from './uriHandlers'
+import { openRemoteConnect, filterSpaceAppsByDomainUserProfiles, stopSpace } from './commands'
+import { updateIdleFile, startMonitoringTerminalActivity, ActivityCheckInterval } from './utils'
+import { ExtContext } from '../../shared/extensions'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { isSageMaker, UserActivity } from '../../shared/extensionUtilities'
+
+let terminalActivityInterval: NodeJS.Timeout | undefined
+
+export async function activate(ctx: ExtContext): Promise<void> {
+    ctx.extensionContext.subscriptions.push(
+        uriHandlers.register(ctx),
+        Commands.register('aws.sagemaker.openRemoteConnection', async (node: SagemakerSpaceNode) => {
+            if (!validateNode(node)) {
+                return
+            }
+            await telemetry.sagemaker_openRemoteConnection.run(async () => {
+                await openRemoteConnect(node, ctx.extensionContext)
+            })
+        }),
+
+        Commands.register('aws.sagemaker.filterSpaceApps', async (node: SagemakerParentNode) => {
+            await telemetry.sagemaker_filterSpaces.run(async () => {
+                await filterSpaceAppsByDomainUserProfiles(node)
+            })
+        }),
+
+        Commands.register('aws.sagemaker.stopSpace', async (node: SagemakerSpaceNode) => {
+            if (!validateNode(node)) {
+                return
+            }
+            await telemetry.sagemaker_stopSpace.run(async () => {
+                await stopSpace(node, ctx.extensionContext)
+            })
+        })
+    )
+
+    // If running in SageMaker AI Space, track user activity for autoshutdown feature
+    if (isSageMaker('SMAI')) {
+        // Use /tmp/ directory so the file is cleared on each reboot to prevent stale timestamps.
+        const tmpDirectory = '/tmp/'
+        const idleFilePath = path.join(tmpDirectory, '.sagemaker-last-active-timestamp')
+
+        const userActivity = new UserActivity(ActivityCheckInterval)
+        userActivity.onUserActivity(() => updateIdleFile(idleFilePath))
+
+        terminalActivityInterval = startMonitoringTerminalActivity(idleFilePath)
+
+        // Write initial timestamp
+        await updateIdleFile(idleFilePath)
+
+        ctx.extensionContext.subscriptions.push(userActivity, {
+            dispose: () => {
+                if (terminalActivityInterval) {
+                    clearInterval(terminalActivityInterval)
+                    terminalActivityInterval = undefined
+                }
+            },
+        })
+    }
+}
+
+/**
+ * Checks if a node  is undefined and shows a warning message if so.
+ */
+function validateNode(node: unknown): boolean {
+    if (!node) {
+        void vscode.window.showWarningMessage('Space information is being refreshed. Please try again shortly.')
+        return false
+    }
+    return true
+}
diff --git a/packages/core/src/awsService/sagemaker/commands.ts b/packages/core/src/awsService/sagemaker/commands.ts
new file mode 100644
index 00000000000..717d1608ff1
--- /dev/null
+++ b/packages/core/src/awsService/sagemaker/commands.ts
@@ -0,0 +1,250 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+import { SagemakerConstants } from './explorer/constants'
+import { SagemakerParentNode } from './explorer/sagemakerParentNode'
+import { DomainKeyDelimiter } from './utils'
+import { startVscodeRemote } from '../../shared/extensions/ssh'
+import { getLogger } from '../../shared/logger/logger'
+import { SagemakerSpaceNode, tryRefreshNode } from './explorer/sagemakerSpaceNode'
+import { isRemoteWorkspace } from '../../shared/vscode/env'
+import _ from 'lodash'
+import { prepareDevEnvConnection, tryRemoteConnection } from './model'
+import { ExtContext } from '../../shared/extensions'
+import { SagemakerClient } from '../../shared/clients/sagemaker'
+import { ToolkitError } from '../../shared/errors'
+import { showConfirmationMessage } from '../../shared/utilities/messages'
+import { RemoteSessionError } from '../../shared/remoteSession'
+import { ConnectFromRemoteWorkspaceMessage, InstanceTypeError } from './constants'
+import { SagemakerUnifiedStudioSpaceNode } from '../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioSpaceNode'
+
+const localize = nls.loadMessageBundle()
+
+export async function filterSpaceAppsByDomainUserProfiles(parentNode: SagemakerParentNode): Promise<void> {
+    if (parentNode.domainUserProfiles.size === 0) {
+        // if parentNode has not been expanded, domainUserProfiles will be empty
+        // if so, this will attempt to populate domainUserProfiles
+        await parentNode.updateChildren()
+        if (parentNode.domainUserProfiles.size === 0) {
+            getLogger().info(SagemakerConstants.NoSpaceToFilter)
+            void vscode.window.showInformationMessage(SagemakerConstants.NoSpaceToFilter)
+            return
+        }
+    }
+
+    // Sort by domain name and user profile
+    const sortedDomainUserProfiles = new Map(
+        [...parentNode.domainUserProfiles].sort((a, b) => {
+            const domainNameA = a[1].domain.DomainName || ''
+            const domainNameB = b[1].domain.DomainName || ''
+
+            const [_domainIdA, userProfileA] = a[0].split(DomainKeyDelimiter)
+            const [_domainIdB, userProfileB] = b[0].split(DomainKeyDelimiter)
+
+            return domainNameA.localeCompare(domainNameB) || userProfileA.localeCompare(userProfileB)
+        })
+    )
+
+    const previousSelection = await parentNode.getSelectedDomainUsers()
+    const items: (vscode.QuickPickItem & { key: string })[] = []
+
+    for (const [key, userMetadata] of sortedDomainUserProfiles) {
+        const [_, userProfile] = key.split(DomainKeyDelimiter)
+        items.push({
+            label: userProfile,
+            detail: `In domain: ${userMetadata.domain?.DomainName}`,
+            picked: previousSelection.has(key),
+            key,
+        })
+    }
+
+    const placeholder = localize(SagemakerConstants.FilterPlaceholderKey, SagemakerConstants.FilterPlaceholderMessage)
+    const result = await vscode.window.showQuickPick(items, {
+        placeHolder: placeholder,
+        canPickMany: true,
+        matchOnDetail: true,
+    })
+
+    if (!result) {
+        return // User canceled.
+    }
+
+    const newSelection = result.map((r) => r.key)
+    if (newSelection.length !== previousSelection.size || newSelection.some((key) => !previousSelection.has(key))) {
+        parentNode.saveSelectedDomainUsers(newSelection)
+        await vscode.commands.executeCommand('aws.refreshAwsExplorerNode', parentNode)
+    }
+}
+
+export async function deeplinkConnect(
+    ctx: ExtContext,
+    connectionIdentifier: string,
+    session: string,
+    wsUrl: string,
+    token: string,
+    domain: string,
+    appType?: string
+) {
+    getLogger().debug(
+        `sm:deeplinkConnect: connectionIdentifier: ${connectionIdentifier} session: ${session} wsUrl: ${wsUrl} token: ${token}`
+    )
+
+    if (isRemoteWorkspace()) {
+        void vscode.window.showErrorMessage(ConnectFromRemoteWorkspaceMessage)
+        return
+    }
+
+    try {
+        const remoteEnv = await prepareDevEnvConnection(
+            connectionIdentifier,
+            ctx.extensionContext,
+            'sm_dl',
+            false /* isSMUS */,
+            undefined /* node */,
+            session,
+            wsUrl,
+            token,
+            domain,
+            appType
+        )
+
+        await startVscodeRemote(
+            remoteEnv.SessionProcess,
+            remoteEnv.hostname,
+            '/home/sagemaker-user',
+            remoteEnv.vscPath,
+            'sagemaker-user'
+        )
+    } catch (err: any) {
+        getLogger().error(
+            `sm:OpenRemoteConnect: Unable to connect to target space with arn: ${connectionIdentifier} error: ${err}`
+        )
+
+        if (![RemoteSessionError.MissingExtension, RemoteSessionError.ExtensionVersionTooLow].includes(err.code)) {
+            throw err
+        }
+    }
+}
+
+export async function stopSpace(
+    node: SagemakerSpaceNode | SagemakerUnifiedStudioSpaceNode,
+    ctx: vscode.ExtensionContext,
+    sageMakerClient?: SagemakerClient
+) {
+    await tryRefreshNode(node)
+    if (node.getStatus() === 'Stopped' || node.getStatus() === 'Stopping') {
+        void vscode.window.showWarningMessage(`Space ${node.spaceApp.SpaceName} is already in Stopped/Stopping state.`)
+        return
+    } else if (node.getStatus() === 'Starting') {
+        void vscode.window.showWarningMessage(
+            `Space ${node.spaceApp.SpaceName} is in Starting state. Wait until it is Running to attempt stop again.`
+        )
+        return
+    }
+    const spaceName = node.spaceApp.SpaceName!
+    const confirmed = await showConfirmationMessage({
+        prompt: `You are about to stop this space. Any active resource will also be stopped. Are you sure you want to stop the space?`,
+        confirm: 'Stop Space',
+        cancel: 'Cancel',
+        type: 'warning',
+    })
+
+    if (!confirmed) {
+        return
+    }
+    //  In case of SMUS, we pass in a SM Client and for SM AI, it creates a new SM Client.
+    const client = sageMakerClient ? sageMakerClient : new SagemakerClient(node.regionCode)
+    try {
+        await client.deleteApp({
+            DomainId: node.spaceApp.DomainId!,
+            SpaceName: spaceName,
+            AppType: node.spaceApp.App!.AppType!,
+            AppName: node.spaceApp.App?.AppName,
+        })
+    } catch (err) {
+        const error = err as Error
+        if (error.name === 'AccessDeniedException') {
+            throw new ToolkitError('You do not have permission to stop spaces. Please contact your administrator', {
+                cause: error,
+                code: error.name,
+            })
+        } else {
+            throw new ToolkitError(`Failed to stop space ${spaceName}: ${(error as Error).message}`, {
+                cause: error,
+                code: error.name,
+            })
+        }
+    }
+    await tryRefreshNode(node)
+}
+
+export async function openRemoteConnect(
+    node: SagemakerSpaceNode | SagemakerUnifiedStudioSpaceNode,
+    ctx: vscode.ExtensionContext,
+    sageMakerClient?: SagemakerClient
+) {
+    if (isRemoteWorkspace()) {
+        void vscode.window.showErrorMessage(ConnectFromRemoteWorkspaceMessage)
+        return
+    }
+
+    const spaceName = node.spaceApp.SpaceName!
+    await tryRefreshNode(node)
+
+    // for Stopped SM spaces - check instance type before showing progress
+    if (node.getStatus() === 'Stopped') {
+        //  In case of SMUS, we pass in a SM Client and for SM AI, it creates a new SM Client.
+        const client = sageMakerClient ? sageMakerClient : new SagemakerClient(node.regionCode)
+
+        try {
+            await client.startSpace(spaceName, node.spaceApp.DomainId!)
+            await tryRefreshNode(node)
+            const appType = node.spaceApp.SpaceSettingsSummary?.AppType
+            if (!appType) {
+                throw new ToolkitError('AppType is undefined for the selected space. Cannot start remote connection.', {
+                    code: 'undefinedAppType',
+                })
+            }
+
+            // Only start showing progress after instance type validation
+            return await vscode.window.withProgress(
+                {
+                    location: vscode.ProgressLocation.Notification,
+                    cancellable: false,
+                    title: `Connecting to ${spaceName}`,
+                },
+                async (progress) => {
+                    progress.report({ message: 'Starting the space.' })
+                    await client.waitForAppInService(node.spaceApp.DomainId!, spaceName, appType)
+                    await tryRemoteConnection(node, ctx, progress)
+                }
+            )
+        } catch (err: any) {
+            // Ignore InstanceTypeError since it means the user decided not to use an instanceType with more memory
+            // just return without showing progress
+            if (err.code === InstanceTypeError) {
+                return
+            }
+            throw new ToolkitError(`Remote connection failed: ${(err as Error).message}`, {
+                cause: err as Error,
+                code: err.code,
+            })
+        }
+    } else if (node.getStatus() === 'Running') {
+        // For running spaces, show progress
+        return await vscode.window.withProgress(
+            {
+                location: vscode.ProgressLocation.Notification,
+                cancellable: false,
+                title: `Connecting to ${spaceName}`,
+            },
+            async (progress) => {
+                await tryRemoteConnection(node, ctx, progress)
+            }
+        )
+    }
+}
diff --git a/packages/core/src/awsService/sagemaker/constants.ts b/packages/core/src/awsService/sagemaker/constants.ts
new file mode 100644
index 00000000000..1fc51a1d20d
--- /dev/null
+++ b/packages/core/src/awsService/sagemaker/constants.ts
@@ -0,0 +1,31 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export const ConnectFromRemoteWorkspaceMessage =
+    'Unable to establish new remote connection. Your last active VS Code window is connected to a remote workspace. To open a new SageMaker Studio connection, select your local VS Code window and try again.'
+
+export const InstanceTypeError = 'InstanceTypeError'
+
+export const InstanceTypeMinimum = 'ml.t3.large'
+
+export const InstanceTypeInsufficientMemory: Record<string, string> = {
+    'ml.t3.medium': 'ml.t3.large',
+    'ml.c7i.large': 'ml.c7i.xlarge',
+    'ml.c6i.large': 'ml.c6i.xlarge',
+    'ml.c6id.large': 'ml.c6id.xlarge',
+    'ml.c5.large': 'ml.c5.xlarge',
+}
+
+export const InstanceTypeInsufficientMemoryMessage = (
+    spaceName: string,
+    chosenInstanceType: string,
+    recommendedInstanceType: string
+) => {
+    return `Unable to create app for [${spaceName}] because instanceType [${chosenInstanceType}] is not supported for remote access enabled spaces. Use instanceType with at least 8 GiB memory. Would you like to start your space with instanceType [${recommendedInstanceType}]?`
+}
+
+export const InstanceTypeNotSelectedMessage = (spaceName: string) => {
+    return `No instanceType specified for [${spaceName}]. ${InstanceTypeMinimum} is the default instance type, which meets minimum 8 GiB memory requirements for remote access. Continuing will start your space with instanceType [${InstanceTypeMinimum}] and remotely connect.`
+}
diff --git a/packages/core/src/awsService/sagemaker/credentialMapping.ts b/packages/core/src/awsService/sagemaker/credentialMapping.ts
new file mode 100644
index 00000000000..e84b16bb415
--- /dev/null
+++ b/packages/core/src/awsService/sagemaker/credentialMapping.ts
@@ -0,0 +1,204 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as path from 'path'
+import * as os from 'os'
+import { fs } from '../../shared/fs/fs'
+import globals from '../../shared/extensionGlobals'
+import { ToolkitError } from '../../shared/errors'
+import { DevSettings } from '../../shared/settings'
+import { Auth } from '../../auth/auth'
+import { SpaceMappings, SsmConnectionInfo } from './types'
+import { getLogger } from '../../shared/logger/logger'
+import { parseArn } from './detached-server/utils'
+import { SagemakerUnifiedStudioSpaceNode } from '../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioSpaceNode'
+import { SageMakerUnifiedStudioSpacesParentNode } from '../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioSpacesParentNode'
+
+const mappingFileName = '.sagemaker-space-profiles'
+const mappingFilePath = path.join(os.homedir(), '.aws', mappingFileName)
+
+export async function loadMappings(): Promise<SpaceMappings> {
+    try {
+        if (!(await fs.existsFile(mappingFilePath))) {
+            return {}
+        }
+
+        const raw = await fs.readFileText(mappingFilePath)
+        return raw ? JSON.parse(raw) : {}
+    } catch (error) {
+        getLogger().error(`Failed to load space mappings from ${mappingFilePath}:`, error)
+        return {}
+    }
+}
+
+export async function saveMappings(data: SpaceMappings): Promise<void> {
+    try {
+        await fs.writeFile(mappingFilePath, JSON.stringify(data, undefined, 2), {
+            mode: 0o600,
+            atomic: true,
+        })
+    } catch (error) {
+        getLogger().error(`Failed to save space mappings to ${mappingFilePath}:`, error)
+    }
+}
+
+/**
+ * Persists the current profile to the appropriate space mapping based on connection type and profile format.
+ * @param spaceArn - The arn for the SageMaker space.
+ */
+export async function persistLocalCredentials(spaceArn: string): Promise<void> {
+    const currentProfileId = Auth.instance.getCurrentProfileId()
+    if (!currentProfileId) {
+        throw new ToolkitError('No current profile ID available for saving space credentials.')
+    }
+
+    if (currentProfileId.startsWith('sso:')) {
+        const credentials = globals.loginManager.store.credentialsCache[currentProfileId]
+        await setSpaceSsoProfile(
+            spaceArn,
+            credentials.credentials.accessKeyId,
+            credentials.credentials.secretAccessKey,
+            credentials.credentials.sessionToken ?? ''
+        )
+    } else {
+        await setSpaceIamProfile(spaceArn, currentProfileId)
+    }
+}
+
+/**
+ * Persists the current selected SMUS Project Role creds to the appropriate space mapping.
+ * @param spaceArn - The identifier for the SageMaker Space.
+ */
+export async function persistSmusProjectCreds(spaceArn: string, node: SagemakerUnifiedStudioSpaceNode): Promise<void> {
+    const nodeParent = node.getParent() as SageMakerUnifiedStudioSpacesParentNode
+    const authProvider = nodeParent.getAuthProvider()
+    const projectId = nodeParent.getProjectId()
+    const projectAuthProvider = await authProvider.getProjectCredentialProvider(projectId)
+    await projectAuthProvider.getCredentials()
+    await setSmusSpaceSsoProfile(spaceArn, projectId)
+    // Trigger SSH credential refresh for the project
+    projectAuthProvider.startProactiveCredentialRefresh()
+}
+
+/**
+ * Persists deep link credentials for a SageMaker space using a derived refresh URL based on environment.
+ *
+ * @param spaceArn - ARN of the SageMaker space.
+ * @param domain - The domain ID associated with the space.
+ * @param session - SSM session ID.
+ * @param wsUrl - SSM WebSocket URL.
+ * @param token - Bearer token for the session.
+ */
+export async function persistSSMConnection(
+    spaceArn: string,
+    domain: string,
+    session?: string,
+    wsUrl?: string,
+    token?: string,
+    appType?: string
+): Promise<void> {
+    const { region } = parseArn(spaceArn)
+    const endpoint = DevSettings.instance.get('endpoints', {})['sagemaker'] ?? ''
+
+    let appSubDomain = 'jupyterlab'
+    if (appType && appType.toLowerCase() === 'codeeditor') {
+        appSubDomain = 'code-editor'
+    }
+
+    let envSubdomain: string
+
+    if (endpoint.includes('beta')) {
+        envSubdomain = 'devo'
+    } else if (endpoint.includes('gamma')) {
+        envSubdomain = 'loadtest'
+    } else {
+        envSubdomain = 'studio'
+    }
+
+    // Use the standard AWS domain for 'studio' (prod).
+    // For non-prod environments, use the obfuscated domain 'asfiovnxocqpcry.com'.
+    const baseDomain =
+        envSubdomain === 'studio'
+            ? `studio.${region}.sagemaker.aws`
+            : `${envSubdomain}.studio.${region}.asfiovnxocqpcry.com`
+
+    const refreshUrl = `https://studio-${domain}.${baseDomain}/${appSubDomain}`
+    await setSpaceCredentials(spaceArn, refreshUrl, {
+        sessionId: session ?? '-',
+        url: wsUrl ?? '-',
+        token: token ?? '-',
+    })
+}
+
+/**
+ * Sets or updates an IAM credential profile for a given space.
+ * @param spaceArn - The name of the SageMaker space.
+ * @param profileName - The local AWS profile name to associate.
+ */
+export async function setSpaceIamProfile(spaceArn: string, profileName: string): Promise<void> {
+    const data = await loadMappings()
+    data.localCredential ??= {}
+    data.localCredential[spaceArn] = { type: 'iam', profileName }
+    await saveMappings(data)
+}
+
+/**
+ * Sets or updates an SSO credential profile for a given space.
+ * @param spaceArn - The arn of the SageMaker space.
+ * @param accessKey - Temporary access key from SSO.
+ * @param secret - Temporary secret key from SSO.
+ * @param token - Session token from SSO.
+ */
+export async function setSpaceSsoProfile(
+    spaceArn: string,
+    accessKey: string,
+    secret: string,
+    token: string
+): Promise<void> {
+    const data = await loadMappings()
+    data.localCredential ??= {}
+    data.localCredential[spaceArn] = { type: 'sso', accessKey, secret, token }
+    await saveMappings(data)
+}
+
+/**
+ * Sets the SM Space to map to SageMaker Unified Studio Project.
+ * @param spaceArn - The arn of the SageMaker Unified Studio space.
+ * @param projectId - The project ID associated with the SageMaker Unified Studio space.
+ */
+export async function setSmusSpaceSsoProfile(spaceArn: string, projectId: string): Promise<void> {
+    const data = await loadMappings()
+    data.localCredential ??= {}
+    data.localCredential[spaceArn] = { type: 'sso', smusProjectId: projectId }
+    await saveMappings(data)
+}
+
+/**
+ * Stores SSM connection information for a given space, typically from a deep link session.
+ * This initializes the request as 'fresh' and includes a refresh URL if provided.
+ * @param spaceArn - The arn of the SageMaker space.
+ * @param refreshUrl - URL to use for refreshing session tokens.
+ * @param credentials - The session information used to initiate the connection.
+ */
+export async function setSpaceCredentials(
+    spaceArn: string,
+    refreshUrl: string,
+    credentials: SsmConnectionInfo
+): Promise<void> {
+    const data = await loadMappings()
+    data.deepLink ??= {}
+
+    data.deepLink[spaceArn] = {
+        refreshUrl,
+        requests: {
+            'initial-connection': {
+                ...credentials,
+                status: 'fresh',
+            },
+        },
+    }
+
+    await saveMappings(data)
+}
diff --git a/packages/core/src/awsService/sagemaker/detached-server/credentials.ts b/packages/core/src/awsService/sagemaker/detached-server/credentials.ts
new file mode 100644
index 00000000000..748679309c8
--- /dev/null
+++ b/packages/core/src/awsService/sagemaker/detached-server/credentials.ts
@@ -0,0 +1,67 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { fromIni } from '@aws-sdk/credential-providers'
+import { LocalCredentialProfile } from '../types'
+import { readMapping } from './utils'
+
+/**
+ * Resolves AWS credentials for a given SageMaker space connection identifier
+ * using the 'lc' (local connection) credential mapping.
+ *
+ * Supported profile types:
+ * - 'iam': Looks up credentials from AWS config using profile name.
+ * - 'sso': Uses accessKey, secret, and sessionToken from the mapping file.
+ *
+ * @param connectionIdentifier - The ARN or space ID used to locate the profile in the mapping.
+ * @returns A Promise that resolves to AWS credentials compatible with AWS SDK v3.
+ * @throws If the profile is missing, malformed, or unsupported.
+ */
+export async function resolveCredentialsFor(connectionIdentifier: string): Promise<any> {
+    const mapping = await readMapping()
+    const profile = mapping.localCredential?.[connectionIdentifier] as LocalCredentialProfile
+
+    if (!profile) {
+        throw new Error(`No profile found for "${connectionIdentifier}"`)
+    }
+
+    switch (profile.type) {
+        case 'iam': {
+            const name = profile.profileName?.split(':')[1]
+            if (!name) {
+                throw new Error(`Invalid IAM profile name for "${connectionIdentifier}"`)
+            }
+            return fromIni({ profile: name })
+        }
+        case 'sso': {
+            if ('accessKey' in profile && 'secret' in profile && 'token' in profile) {
+                const { accessKey, secret, token } = profile
+                if (!accessKey || !secret || !token) {
+                    throw new Error(`Missing SSO credentials for "${connectionIdentifier}"`)
+                }
+                return {
+                    accessKeyId: accessKey,
+                    secretAccessKey: secret,
+                    sessionToken: token,
+                }
+            } else if ('smusProjectId' in profile) {
+                // Handle SMUS project ID case
+                const { accessKey, secret, token } = mapping.smusProjects?.[profile.smusProjectId] || {}
+                if (!accessKey || !secret || !token) {
+                    throw new Error(`Missing ProjectRole credentials for SMUS Space "${connectionIdentifier}"`)
+                }
+                return {
+                    accessKeyId: accessKey,
+                    secretAccessKey: secret,
+                    sessionToken: token,
+                }
+            } else {
+                throw new Error(`Missing SSO credentials for "${connectionIdentifier}"`)
+            }
+        }
+        default:
+            throw new Error(`Unsupported profile type "${profile}"`)
+    }
+}
diff --git a/packages/core/src/awsService/sagemaker/detached-server/errorPage.ts b/packages/core/src/awsService/sagemaker/detached-server/errorPage.ts
new file mode 100644
index 00000000000..bff3e62ae61
--- /dev/null
+++ b/packages/core/src/awsService/sagemaker/detached-server/errorPage.ts
@@ -0,0 +1,148 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Disabled: detached server files cannot import vscode.
+/* eslint-disable no-restricted-imports */
+import { randomUUID } from 'crypto'
+import { join } from 'path'
+import { promises as fs } from 'fs'
+import os from 'os'
+import { SageMakerServiceException } from '@amzn/sagemaker-client'
+import { open } from './utils'
+
+export enum ExceptionType {
+    ACCESS_DENIED = 'AccessDeniedException',
+    DEFAULT = 'Default',
+    EXPIRED_TOKEN = 'ExpiredTokenException',
+    INTERNAL_FAILURE = 'InternalFailure',
+    RESOURCE_LIMIT_EXCEEDED = 'ResourceLimitExceeded',
+    THROTTLING = 'ThrottlingException',
+    VALIDATION = 'ValidationException',
+}
+
+export const getVSCodeErrorTitle = (error: SageMakerServiceException): string => {
+    const exceptionType = error.name as ExceptionType
+
+    if (exceptionType in ErrorText.StartSession) {
+        return ErrorText.StartSession[exceptionType].Title
+    }
+
+    return ErrorText.StartSession[ExceptionType.DEFAULT].Title
+}
+
+export const getVSCodeErrorText = (error: SageMakerServiceException, isSmus?: boolean): string => {
+    const exceptionType = error.name as ExceptionType
+
+    switch (exceptionType) {
+        case ExceptionType.ACCESS_DENIED:
+        case ExceptionType.VALIDATION:
+            return ErrorText.StartSession[exceptionType].Text.replace('{message}', error.message)
+        case ExceptionType.EXPIRED_TOKEN:
+            // Use SMUS-specific message if in SMUS context
+            return isSmus
+                ? ErrorText.StartSession[ExceptionType.EXPIRED_TOKEN].SmusText
+                : ErrorText.StartSession[exceptionType].Text
+        case ExceptionType.INTERNAL_FAILURE:
+        case ExceptionType.RESOURCE_LIMIT_EXCEEDED:
+        case ExceptionType.THROTTLING:
+            return ErrorText.StartSession[exceptionType].Text
+        default:
+            return ErrorText.StartSession[ExceptionType.DEFAULT].Text.replace('{exceptionType}', exceptionType)
+    }
+}
+
+export const ErrorText = {
+    StartSession: {
+        [ExceptionType.ACCESS_DENIED]: {
+            Title: 'Remote access denied',
+            Text: 'Unable to connect because: [{message}]',
+        },
+        [ExceptionType.DEFAULT]: {
+            Title: 'Unexpected system error',
+            Text: 'We encountered an unexpected error: [{exceptionType}]. Please contact your administrator and provide them with this error so they can investigate the issue.',
+        },
+        [ExceptionType.EXPIRED_TOKEN]: {
+            Title: 'Authentication expired',
+            Text: 'Your session has expired. Please refresh your credentials and try again.',
+            SmusText:
+                'Your session has expired. This is likely due to network connectivity issues after machine sleep/resume. Please wait 10-30 seconds for automatic credential refresh, then try again. If the issue persists, try reconnecting through AWS Toolkit.',
+        },
+        [ExceptionType.INTERNAL_FAILURE]: {
+            Title: 'Failed to connect remotely to VSCode',
+            Text: 'Unable to establish remote connection to VSCode. This could be due to several factors. Please try again by clicking the VSCode button. If the problem persists, please contact your admin.',
+        },
+        [ExceptionType.RESOURCE_LIMIT_EXCEEDED]: {
+            Title: 'Connection limit reached',
+            Text: 'You have 10 active remote connections to this space. Stop an existing connection to start a new one.',
+        },
+        [ExceptionType.THROTTLING]: {
+            Title: 'Too many connection attempts',
+            Text: "You're connecting too quickly. Wait a moment and try again.",
+        },
+        [ExceptionType.VALIDATION]: {
+            Title: 'Configuration error',
+            Text: 'The operation cannot be completed due to: [{message}]',
+        },
+    },
+}
+
+export async function openErrorPage(title: string, message: string) {
+    const html = `<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8" />
+    <title>${title}</title>
+    <style>
+        body {
+            margin: 0;
+            padding: 32px 0 0 0;
+            background-color: #1e1e2f;
+            color: #f1f1f1;
+            font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
+            display: flex;
+            justify-content: center;
+        }
+
+        .card {
+            background-color: #2d2d3c;
+            padding: 40px;
+            border-radius: 12px;
+            box-shadow: 0 4px 14px rgba(0, 0, 0, 0.3);
+            text-align: center;
+            max-width: 480px;
+            width: 90%;
+        }
+
+        .error-icon {
+            font-size: 25px;
+            color: #f44336;
+            margin-bottom: 20px;
+        }
+
+        .title {
+            font-size: 14px;
+            font-weight: 700;
+            margin-bottom: 12px;
+        }
+
+        .message {
+            font-size: 14px;
+            color: #cccccc;
+        }
+    </style>
+</head>
+<body>
+    <div class="card">
+        <div class="error-icon">❌</div>
+        <div class="title">${title}</div>
+        <div class="message">${message}</div>
+    </div>
+</body>
+</html>`
+
+    const filePath = join(os.tmpdir(), `sagemaker-error-${randomUUID()}.html`)
+    await fs.writeFile(filePath, html, 'utf8')
+    await open(filePath)
+}
diff --git a/packages/core/src/awsService/sagemaker/detached-server/routes/getSession.ts b/packages/core/src/awsService/sagemaker/detached-server/routes/getSession.ts
new file mode 100644
index 00000000000..0c9ce74ad30
--- /dev/null
+++ b/packages/core/src/awsService/sagemaker/detached-server/routes/getSession.ts
@@ -0,0 +1,59 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Disabled: detached server files cannot import vscode.
+/* eslint-disable aws-toolkits/no-console-log */
+import { IncomingMessage, ServerResponse } from 'http'
+import { startSagemakerSession, parseArn, isSmusConnection } from '../utils'
+import { resolveCredentialsFor } from '../credentials'
+import url from 'url'
+import { SageMakerServiceException } from '@amzn/sagemaker-client'
+import { getVSCodeErrorText, getVSCodeErrorTitle, openErrorPage } from '../errorPage'
+
+export async function handleGetSession(req: IncomingMessage, res: ServerResponse): Promise<void> {
+    const parsedUrl = url.parse(req.url || '', true)
+    const connectionIdentifier = parsedUrl.query.connection_identifier as string
+
+    if (!connectionIdentifier) {
+        res.writeHead(400, { 'Content-Type': 'text/plain' })
+        res.end(`Missing required query parameter: "connection_identifier" (${connectionIdentifier})`)
+        return
+    }
+
+    let credentials
+    try {
+        credentials = await resolveCredentialsFor(connectionIdentifier)
+    } catch (err) {
+        console.error('Failed to resolve credentials:', err)
+        res.writeHead(500, { 'Content-Type': 'text/plain' })
+        res.end((err as Error).message)
+        return
+    }
+
+    const { region } = parseArn(connectionIdentifier)
+    // Detect if this is a SMUS connection for specialized error handling
+    const isSmus = await isSmusConnection(connectionIdentifier)
+
+    try {
+        const session = await startSagemakerSession({ region, connectionIdentifier, credentials })
+        res.writeHead(200, { 'Content-Type': 'application/json' })
+        res.end(
+            JSON.stringify({
+                SessionId: session.SessionId,
+                StreamUrl: session.StreamUrl,
+                TokenValue: session.TokenValue,
+            })
+        )
+    } catch (err) {
+        const error = err as SageMakerServiceException
+        console.error(`Failed to start SageMaker session for ${connectionIdentifier}:`, err)
+        const errorTitle = getVSCodeErrorTitle(error)
+        const errorText = getVSCodeErrorText(error, isSmus)
+        await openErrorPage(errorTitle, errorText)
+        res.writeHead(500, { 'Content-Type': 'text/plain' })
+        res.end('Failed to start SageMaker session')
+        return
+    }
+}
diff --git a/packages/core/src/awsService/sagemaker/detached-server/routes/getSessionAsync.ts b/packages/core/src/awsService/sagemaker/detached-server/routes/getSessionAsync.ts
new file mode 100644
index 00000000000..f8dad504067
--- /dev/null
+++ b/packages/core/src/awsService/sagemaker/detached-server/routes/getSessionAsync.ts
@@ -0,0 +1,70 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Disabled: detached server files cannot import vscode.
+/* eslint-disable aws-toolkits/no-console-log */
+import { IncomingMessage, ServerResponse } from 'http'
+import url from 'url'
+import { SessionStore } from '../sessionStore'
+import { open, parseArn, readServerInfo } from '../utils'
+
+export async function handleGetSessionAsync(req: IncomingMessage, res: ServerResponse): Promise<void> {
+    const parsedUrl = url.parse(req.url || '', true)
+    const connectionIdentifier = parsedUrl.query.connection_identifier as string
+    const requestId = parsedUrl.query.request_id as string
+
+    if (!connectionIdentifier || !requestId) {
+        res.writeHead(400, { 'Content-Type': 'text/plain' })
+        res.end(
+            `Missing required query parameters: "connection_identifier" (${connectionIdentifier}), "request_id" (${requestId})`
+        )
+        return
+    }
+
+    const store = new SessionStore()
+
+    try {
+        const freshEntry = await store.getFreshEntry(connectionIdentifier, requestId)
+
+        if (freshEntry) {
+            res.writeHead(200, { 'Content-Type': 'application/json' })
+            res.end(
+                JSON.stringify({
+                    SessionId: freshEntry.sessionId,
+                    StreamUrl: freshEntry.url,
+                    TokenValue: freshEntry.token,
+                })
+            )
+            return
+        }
+
+        const status = await store.getStatus(connectionIdentifier, requestId)
+        if (status === 'pending') {
+            res.writeHead(204)
+            res.end()
+            return
+        } else if (status === 'not-started') {
+            const serverInfo = await readServerInfo()
+            const refreshUrl = await store.getRefreshUrl(connectionIdentifier)
+            const { spaceName } = parseArn(connectionIdentifier)
+
+            const url = `${refreshUrl}/${encodeURIComponent(spaceName)}?remote_access_token_refresh=true&reconnect_identifier=${encodeURIComponent(
+                connectionIdentifier
+            )}&reconnect_request_id=${encodeURIComponent(requestId)}&reconnect_callback_url=${encodeURIComponent(
+                `http://localhost:${serverInfo.port}/refresh_token`
+            )}`
+
+            await open(url)
+            res.writeHead(202, { 'Content-Type': 'text/plain' })
+            res.end('Session is not ready yet. Please retry in a few seconds.')
+            await store.markPending(connectionIdentifier, requestId)
+            return
+        }
+    } catch (err) {
+        console.error('Error handling session async request:', err)
+        res.writeHead(500, { 'Content-Type': 'text/plain' })
+        res.end('Unexpected error')
+    }
+}
diff --git a/packages/core/src/awsService/sagemaker/detached-server/routes/refreshToken.ts b/packages/core/src/awsService/sagemaker/detached-server/routes/refreshToken.ts
new file mode 100644
index 00000000000..34152aa0423
--- /dev/null
+++ b/packages/core/src/awsService/sagemaker/detached-server/routes/refreshToken.ts
@@ -0,0 +1,46 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Disabled: detached server files cannot import vscode.
+/* eslint-disable aws-toolkits/no-console-log */
+import { IncomingMessage, ServerResponse } from 'http'
+import url from 'url'
+import { SessionStore } from '../sessionStore'
+
+export async function handleRefreshToken(req: IncomingMessage, res: ServerResponse): Promise<void> {
+    const parsedUrl = url.parse(req.url || '', true)
+    const connectionIdentifier = parsedUrl.query.connection_identifier as string
+    const requestId = parsedUrl.query.request_id as string
+    const wsUrl = parsedUrl.query.ws_url as string
+    const token = parsedUrl.query.token as string
+    const sessionId = parsedUrl.query.session as string
+
+    const store = new SessionStore()
+
+    if (!connectionIdentifier || !requestId || !wsUrl || !token || !sessionId) {
+        res.writeHead(400, { 'Content-Type': 'text/plain' })
+        res.end(
+            `Missing required parameters:\n` +
+                `  connection_identifier: ${connectionIdentifier ?? 'undefined'}\n` +
+                `  request_id: ${requestId ?? 'undefined'}\n` +
+                `  url: ${wsUrl ?? 'undefined'}\n` +
+                `  token: ${token ?? 'undefined'}\n` +
+                `  sessionId: ${sessionId ?? 'undefined'}`
+        )
+        return
+    }
+
+    try {
+        await store.setSession(connectionIdentifier, requestId, { sessionId, token, url: wsUrl })
+    } catch (err) {
+        console.error('Failed to save session token:', err)
+        res.writeHead(500, { 'Content-Type': 'text/plain' })
+        res.end('Failed to save session token')
+        return
+    }
+
+    res.writeHead(200)
+    res.end('Session token refreshed successfully')
+}
diff --git a/packages/core/src/awsService/sagemaker/detached-server/server.ts b/packages/core/src/awsService/sagemaker/detached-server/server.ts
new file mode 100644
index 00000000000..e785516146c
--- /dev/null
+++ b/packages/core/src/awsService/sagemaker/detached-server/server.ts
@@ -0,0 +1,107 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Disabled: detached server files cannot import vscode.
+/* eslint-disable aws-toolkits/no-console-log */
+/* eslint-disable no-restricted-imports */
+import http, { IncomingMessage, ServerResponse } from 'http'
+import { handleGetSession } from './routes/getSession'
+import { handleGetSessionAsync } from './routes/getSessionAsync'
+import { handleRefreshToken } from './routes/refreshToken'
+import url from 'url'
+import * as os from 'os'
+import fs from 'fs'
+import { execFile } from 'child_process'
+
+const pollInterval = 30 * 60 * 100 // 30 minutes
+
+const server = http.createServer((req: IncomingMessage, res: ServerResponse) => {
+    const parsedUrl = url.parse(req.url || '', true)
+
+    switch (parsedUrl.pathname) {
+        case '/get_session':
+            return handleGetSession(req, res)
+        case '/get_session_async':
+            return handleGetSessionAsync(req, res)
+        case '/refresh_token':
+            return handleRefreshToken(req, res)
+        default:
+            res.writeHead(404, { 'Content-Type': 'text/plain' })
+            res.end(`Not Found: ${req.url}`)
+    }
+})
+
+server.listen(0, '127.0.0.1', async () => {
+    const address = server.address()
+    if (address && typeof address === 'object') {
+        const port = address.port
+        const pid = process.pid
+
+        console.log(`Detached server listening on http://127.0.0.1:${port} (pid: ${pid})`)
+
+        const filePath = process.env.SAGEMAKER_LOCAL_SERVER_FILE_PATH
+        if (!filePath) {
+            throw new Error('SAGEMAKER_LOCAL_SERVER_FILE_PATH environment variable is not set')
+        }
+
+        const data = { pid, port }
+        console.log(`Writing local endpoint info to ${filePath}`)
+
+        fs.writeFileSync(filePath, JSON.stringify(data, undefined, 2), 'utf-8')
+    } else {
+        console.error('Failed to retrieve assigned port')
+        process.exit(0)
+    }
+    await monitorVSCodeAndExit()
+})
+
+function checkVSCodeWindows(): Promise<boolean> {
+    return new Promise((resolve) => {
+        const platform = os.platform()
+
+        if (platform === 'win32') {
+            execFile('tasklist', ['/FI', 'IMAGENAME eq Code.exe'], (err, stdout) => {
+                if (err) {
+                    resolve(false)
+                    return
+                }
+                resolve(/Code\.exe/i.test(stdout))
+            })
+        } else if (platform === 'darwin') {
+            execFile('ps', ['aux'], (err, stdout) => {
+                if (err) {
+                    resolve(false)
+                    return
+                }
+
+                const found = stdout
+                    .split('\n')
+                    .some((line) => /Visual Studio Code( - Insiders)?\.app\/Contents\/MacOS\/Electron/.test(line))
+                resolve(found)
+            })
+        } else {
+            execFile('ps', ['-A', '-o', 'comm'], (err, stdout) => {
+                if (err) {
+                    resolve(false)
+                    return
+                }
+
+                const found = stdout.split('\n').some((line) => /^(code(-insiders)?|electron)$/i.test(line.trim()))
+                resolve(found)
+            })
+        }
+    })
+}
+
+async function monitorVSCodeAndExit() {
+    while (true) {
+        const found = await checkVSCodeWindows()
+        if (!found) {
+            console.log('No VSCode windows found. Shutting down detached server.')
+            process.exit(0)
+        }
+        await new Promise((r) => setTimeout(r, pollInterval))
+    }
+}
diff --git a/packages/core/src/awsService/sagemaker/detached-server/sessionStore.ts b/packages/core/src/awsService/sagemaker/detached-server/sessionStore.ts
new file mode 100644
index 00000000000..04098f68c89
--- /dev/null
+++ b/packages/core/src/awsService/sagemaker/detached-server/sessionStore.ts
@@ -0,0 +1,136 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { SsmConnectionInfo } from '../types'
+import { readMapping, writeMapping } from './utils'
+
+export type SessionStatus = 'pending' | 'fresh' | 'consumed' | 'not-started'
+
+export class SessionStore {
+    async getRefreshUrl(connectionId: string) {
+        const mapping = await readMapping()
+
+        if (!mapping.deepLink) {
+            throw new Error('No deepLink mapping found')
+        }
+
+        const entry = mapping.deepLink[connectionId]
+        if (!entry) {
+            throw new Error(`No mapping found for connectionId: "${connectionId}"`)
+        }
+
+        if (!entry.refreshUrl) {
+            throw new Error(`No refreshUrl found for connectionId: "${connectionId}"`)
+        }
+
+        return entry.refreshUrl
+    }
+
+    async getFreshEntry(connectionId: string, requestId: string) {
+        const mapping = await readMapping()
+
+        if (!mapping.deepLink) {
+            throw new Error('No deepLink mapping found')
+        }
+
+        const entry = mapping.deepLink[connectionId]
+        if (!entry) {
+            throw new Error(`No mapping found for connectionId: "${connectionId}"`)
+        }
+
+        const requests = entry.requests
+        const initialEntry = requests['initial-connection']
+        if (initialEntry?.status === 'fresh') {
+            await this.markConsumed(connectionId, 'initial-connection')
+            return initialEntry
+        }
+
+        const asyncEntry = requests[requestId]
+        if (asyncEntry?.status === 'fresh') {
+            delete requests[requestId]
+            await writeMapping(mapping)
+            return asyncEntry
+        }
+
+        return undefined
+    }
+
+    async getStatus(connectionId: string, requestId: string) {
+        const mapping = await readMapping()
+
+        if (!mapping.deepLink) {
+            throw new Error('No deepLink mapping found')
+        }
+        const entry = mapping.deepLink[connectionId]
+        if (!entry) {
+            throw new Error(`No mapping found for connectionId: "${connectionId}"`)
+        }
+
+        const status = entry.requests?.[requestId]?.status
+        return status ?? 'not-started'
+    }
+
+    async markConsumed(connectionId: string, requestId: string) {
+        const mapping = await readMapping()
+
+        if (!mapping.deepLink) {
+            throw new Error('No deepLink mapping found')
+        }
+        const entry = mapping.deepLink[connectionId]
+        if (!entry) {
+            throw new Error(`No mapping found for connectionId: "${connectionId}"`)
+        }
+
+        const requests = entry.requests
+        if (!requests[requestId]) {
+            throw new Error(`No request entry found for requestId: "${requestId}"`)
+        }
+
+        requests[requestId].status = 'consumed'
+        await writeMapping(mapping)
+    }
+
+    async markPending(connectionId: string, requestId: string) {
+        const mapping = await readMapping()
+
+        if (!mapping.deepLink) {
+            throw new Error('No deepLink mapping found')
+        }
+        const entry = mapping.deepLink[connectionId]
+        if (!entry) {
+            throw new Error(`No mapping found for connectionId: "${connectionId}"`)
+        }
+
+        entry.requests[requestId] = {
+            sessionId: '',
+            token: '',
+            url: '',
+            status: 'pending',
+        }
+
+        await writeMapping(mapping)
+    }
+
+    async setSession(connectionId: string, requestId: string, ssmConnectionInfo: SsmConnectionInfo) {
+        const mapping = await readMapping()
+
+        if (!mapping.deepLink) {
+            throw new Error('No deepLink mapping found')
+        }
+        const entry = mapping.deepLink[connectionId]
+        if (!entry) {
+            throw new Error(`No mapping found for connectionId: "${connectionId}"`)
+        }
+
+        entry.requests[requestId] = {
+            sessionId: ssmConnectionInfo.sessionId,
+            token: ssmConnectionInfo.token,
+            url: ssmConnectionInfo.url,
+            status: ssmConnectionInfo.status ?? 'fresh',
+        }
+
+        await writeMapping(mapping)
+    }
+}
diff --git a/packages/core/src/awsService/sagemaker/detached-server/utils.ts b/packages/core/src/awsService/sagemaker/detached-server/utils.ts
new file mode 100644
index 00000000000..d4c963c40ff
--- /dev/null
+++ b/packages/core/src/awsService/sagemaker/detached-server/utils.ts
@@ -0,0 +1,176 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Disabled: detached server files cannot import vscode.
+/* eslint-disable aws-toolkits/no-console-log */
+/* eslint-disable no-restricted-imports */
+import { ServerInfo } from '../types'
+import { promises as fs } from 'fs'
+import { SageMakerClient, StartSessionCommand } from '@amzn/sagemaker-client'
+import os from 'os'
+import { join } from 'path'
+import { SpaceMappings } from '../types'
+import open from 'open'
+import { ConfiguredRetryStrategy } from '@smithy/util-retry'
+export { open }
+
+export const mappingFilePath = join(os.homedir(), '.aws', '.sagemaker-space-profiles')
+const tempFilePath = `${mappingFilePath}.tmp`
+
+// Simple file lock to prevent concurrent writes
+let isWriting = false
+const writeQueue: Array<() => Promise<void>> = []
+
+// Currently SSM registration happens asynchronously with App launch, which can lead to
+// StartSession Internal Failure when connecting to a fresly-started Space.
+// To mitigate, spread out retries over multiple seconds instead of sending all retries within a second.
+// Backoff sequence: 1500ms, 2250ms, 3375ms
+// Retry timing: 1500ms, 3750ms, 7125ms
+const startSessionRetryStrategy = new ConfiguredRetryStrategy(3, (attempt: number) => 1000 * 1.5 ** attempt)
+
+/**
+ * Reads the local endpoint info file (default or via env) and returns pid & port.
+ * @throws Error if the file is missing, invalid JSON, or missing fields
+ */
+export async function readServerInfo(): Promise<ServerInfo> {
+    const filePath = process.env.SAGEMAKER_LOCAL_SERVER_FILE_PATH
+    if (!filePath) {
+        throw new Error('Environment variable SAGEMAKER_LOCAL_SERVER_FILE_PATH is not set')
+    }
+
+    try {
+        const content = await fs.readFile(filePath, 'utf-8')
+        const data = JSON.parse(content)
+        if (typeof data.pid !== 'number' || typeof data.port !== 'number') {
+            throw new TypeError(`Invalid server info format in ${filePath}`)
+        }
+        return { pid: data.pid, port: data.port }
+    } catch (err: any) {
+        if (err.code === 'ENOENT') {
+            throw new Error(`Server info file not found at ${filePath}`)
+        }
+        throw new Error(`Failed to read server info: ${err.message ?? String(err)}`)
+    }
+}
+
+/**
+ * Parses a SageMaker ARN to extract region, account ID, and space name.
+ * Supports formats like:
+ *   arn:aws:sagemaker:<region>:<account_id>:space/<domain>/<space_name>
+ *   or sm_lc_arn:aws:sagemaker:<region>:<account_id>:space__d-xxxx__<name>
+ *
+ * If the input is prefixed with an identifier (e.g. "sagemaker-user@"), the function will strip it.
+ *
+ * @param arn - The full SageMaker ARN string
+ * @returns An object containing the region, accountId, and spaceName
+ * @throws If the ARN format is invalid
+ */
+export function parseArn(arn: string): { region: string; accountId: string; spaceName: string } {
+    const cleanedArn = arn.includes('@') ? arn.split('@')[1] : arn
+    const regex = /^arn:aws:sagemaker:(?<region>[^:]+):(?<account_id>\d+):space[/:].+$/i
+    const match = cleanedArn.match(regex)
+
+    if (!match?.groups) {
+        throw new Error(`Invalid SageMaker ARN format: "${arn}"`)
+    }
+
+    // Extract space name from the end of the ARN (after the last forward slash)
+    const spaceName = cleanedArn.split('/').pop()
+    if (!spaceName) {
+        throw new Error(`Could not extract space name from ARN: "${arn}"`)
+    }
+
+    return {
+        region: match.groups.region,
+        accountId: match.groups.account_id,
+        spaceName: spaceName,
+    }
+}
+
+export async function startSagemakerSession({ region, connectionIdentifier, credentials }: any) {
+    const endpoint = process.env.SAGEMAKER_ENDPOINT || `https://sagemaker.${region}.amazonaws.com`
+    const client = new SageMakerClient({ region, credentials, endpoint, retryStrategy: startSessionRetryStrategy })
+    const command = new StartSessionCommand({ ResourceIdentifier: connectionIdentifier })
+    return client.send(command)
+}
+
+/**
+ * Reads the mapping file and parses it as JSON.
+ * Throws if the file doesn't exist or is malformed.
+ */
+export async function readMapping() {
+    try {
+        const content = await fs.readFile(mappingFilePath, 'utf-8')
+        console.log(`Mapping file path: ${mappingFilePath}`)
+        return JSON.parse(content)
+    } catch (err) {
+        throw new Error(`Failed to read mapping file: ${err instanceof Error ? err.message : String(err)}`)
+    }
+}
+
+/**
+ * Processes the write queue to ensure only one write operation happens at a time.
+ */
+async function processWriteQueue() {
+    if (isWriting || writeQueue.length === 0) {
+        return
+    }
+
+    isWriting = true
+    try {
+        while (writeQueue.length > 0) {
+            const writeOperation = writeQueue.shift()!
+            await writeOperation()
+        }
+    } finally {
+        isWriting = false
+    }
+}
+
+/**
+ * Detects if the connection identifier is using SMUS credentials
+ * @param connectionIdentifier - The connection identifier to check
+ * @returns Promise<boolean> - true if SMUS, false otherwise
+ */
+export async function isSmusConnection(connectionIdentifier: string): Promise<boolean> {
+    try {
+        const mapping = await readMapping()
+        const profile = mapping.localCredential?.[connectionIdentifier]
+
+        // Check if profile exists and has smusProjectId
+        return profile && 'smusProjectId' in profile
+    } catch (err) {
+        // If we can't read the mapping, assume not SMUS to avoid breaking existing functionality
+        return false
+    }
+}
+
+/**
+ * Writes the mapping to a temp file and atomically renames it to the target path.
+ * Uses a queue to prevent race conditions when multiple requests try to write simultaneously.
+ */
+export async function writeMapping(mapping: SpaceMappings) {
+    return new Promise<void>((resolve, reject) => {
+        const writeOperation = async () => {
+            try {
+                // Generate unique temp file name to avoid conflicts
+                const uniqueTempPath = `${tempFilePath}.${process.pid}.${Date.now()}`
+
+                const json = JSON.stringify(mapping, undefined, 2)
+                await fs.writeFile(uniqueTempPath, json)
+                await fs.rename(uniqueTempPath, mappingFilePath)
+                resolve()
+            } catch (err) {
+                reject(new Error(`Failed to write mapping file: ${err instanceof Error ? err.message : String(err)}`))
+            }
+        }
+
+        writeQueue.push(writeOperation)
+
+        // ProcessWriteQueue handles its own errors via individual operation callbacks
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
+        processWriteQueue()
+    })
+}
diff --git a/packages/core/src/awsService/sagemaker/explorer/constants.ts b/packages/core/src/awsService/sagemaker/explorer/constants.ts
new file mode 100644
index 00000000000..b9d7c3348b5
--- /dev/null
+++ b/packages/core/src/awsService/sagemaker/explorer/constants.ts
@@ -0,0 +1,20 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export abstract class SagemakerConstants {
+    static readonly PlaceHolderMessage = '[No Sagemaker Spaces Found]'
+    static readonly EnableIdentityFilteringSetting = 'aws.sagemaker.studio.spaces.enableIdentityFiltering'
+    static readonly SelectedDomainUsersState = 'aws.sagemaker.selectedDomainUsers'
+    static readonly FilterPlaceholderKey = 'aws.filterSagemakerSpacesPlaceholder'
+    static readonly FilterPlaceholderMessage = 'Filter spaces by user profile or domain (unselect to hide)'
+    static readonly NoSpaceToFilter = 'No spaces to filter'
+
+    static readonly IamUserArnRegex = /^arn:aws[a-z\-]*:iam::\d{12}:user\/?([a-zA-Z_0-9+=,.@\-_]+)$/
+    static readonly IamSessionArnRegex =
+        /^arn:aws[a-z\-]*:sts::\d{12}:assumed-role\/?[a-zA-Z_0-9+=,.@\-_]+\/([a-zA-Z_0-9+=,.@\-_]+)$/
+    static readonly IdentityCenterArnRegex =
+        /^arn:aws[a-z\-]*:sts::\d{12}:assumed-role\/?AWSReservedSSO[a-zA-Z_0-9+=,.@\-_]+\/([a-zA-Z_0-9+=,.@\-_]+)$/
+    static readonly SpecialCharacterRegex = /[+=,.@\-_]/g
+}
diff --git a/packages/core/src/awsService/sagemaker/explorer/sagemakerParentNode.ts b/packages/core/src/awsService/sagemaker/explorer/sagemakerParentNode.ts
new file mode 100644
index 00000000000..104eb7662a2
--- /dev/null
+++ b/packages/core/src/awsService/sagemaker/explorer/sagemakerParentNode.ts
@@ -0,0 +1,214 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { GetCallerIdentityCommandOutput } from '@aws-sdk/client-sts'
+import { DescribeDomainResponse } from '@amzn/sagemaker-client'
+import { SagemakerClient, SagemakerSpaceApp } from '../../../shared/clients/sagemaker'
+import { DefaultStsClient } from '../../../shared/clients/stsClient'
+import globals from '../../../shared/extensionGlobals'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
+import { makeChildrenNodes } from '../../../shared/treeview/utils'
+import { updateInPlace } from '../../../shared/utilities/collectionUtils'
+import { isRemoteWorkspace } from '../../../shared/vscode/env'
+import { SagemakerConstants } from './constants'
+import { SagemakerSpaceNode } from './sagemakerSpaceNode'
+import { getDomainSpaceKey, getDomainUserProfileKey, getSpaceAppsForUserProfile } from '../utils'
+import { PollingSet } from '../../../shared/utilities/pollingSet'
+import { getRemoteAppMetadata } from '../remoteUtils'
+
+export const parentContextValue = 'awsSagemakerParentNode'
+
+export type SelectedDomainUsers = [string, string[]][]
+export type SelectedDomainUsersByRegion = [string, SelectedDomainUsers][]
+
+export interface UserProfileMetadata {
+    domain: DescribeDomainResponse
+}
+export class SagemakerParentNode extends AWSTreeNodeBase {
+    protected sagemakerSpaceNodes: Map<string, SagemakerSpaceNode>
+    protected stsClient: DefaultStsClient
+    public override readonly contextValue: string = parentContextValue
+    domainUserProfiles: Map<string, UserProfileMetadata> = new Map()
+    spaceApps: Map<string, SagemakerSpaceApp> = new Map()
+    callerIdentity: Partial<GetCallerIdentityCommandOutput> = {}
+    public readonly pollingSet: PollingSet<string> = new PollingSet(5000, this.updatePendingNodes.bind(this))
+
+    public constructor(
+        public override readonly regionCode: string,
+        protected readonly sagemakerClient: SagemakerClient
+    ) {
+        super('SageMaker AI', vscode.TreeItemCollapsibleState.Collapsed)
+        this.sagemakerSpaceNodes = new Map<string, SagemakerSpaceNode>()
+        this.stsClient = new DefaultStsClient(regionCode)
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        const result = await makeChildrenNodes({
+            getChildNodes: async () => {
+                await this.updateChildren()
+                return [...this.sagemakerSpaceNodes.values()]
+            },
+            getNoChildrenPlaceholderNode: async () => new PlaceholderNode(this, SagemakerConstants.PlaceHolderMessage),
+            sort: (nodeA, nodeB) => nodeA.name.localeCompare(nodeB.name),
+        })
+
+        return result
+    }
+
+    public trackPendingNode(domainSpaceKey: string) {
+        this.pollingSet.add(domainSpaceKey)
+    }
+
+    private async updatePendingNodes() {
+        for (const spaceKey of this.pollingSet.values()) {
+            const childNode = this.getSpaceNodes(spaceKey)
+            await this.updatePendingSpaceNode(childNode)
+        }
+    }
+
+    private async updatePendingSpaceNode(node: SagemakerSpaceNode) {
+        await node.updateSpaceAppStatus()
+        if (!node.isPending()) {
+            this.pollingSet.delete(node.DomainSpaceKey)
+            await node.refreshNode()
+        }
+    }
+
+    public getSpaceNodes(spaceKey: string): SagemakerSpaceNode {
+        const childNode = this.sagemakerSpaceNodes.get(spaceKey)
+        if (childNode) {
+            return childNode
+        } else {
+            throw new Error(`Node with id ${spaceKey} from polling set not found`)
+        }
+    }
+
+    public async getLocalSelectedDomainUsers(): Promise<string[]> {
+        /**
+         * By default, filter userProfileNames that match the detected IAM user, IAM assumed role
+         * session name, or Identity Center username
+         * */
+        const iamMatches =
+            this.callerIdentity.Arn?.match(SagemakerConstants.IamUserArnRegex) ||
+            this.callerIdentity.Arn?.match(SagemakerConstants.IamSessionArnRegex)
+        const idcMatches = this.callerIdentity.Arn?.match(SagemakerConstants.IdentityCenterArnRegex)
+
+        const matches =
+            /**
+             *  Only filter IAM users / assumed-role sessions if the user has enabled this option
+             *  Or filter Identity Center username if user is authenticated via IdC
+             * */
+            iamMatches && vscode.workspace.getConfiguration().get(SagemakerConstants.EnableIdentityFilteringSetting)
+                ? iamMatches
+                : idcMatches
+                  ? idcMatches
+                  : undefined
+
+        const userProfilePrefix =
+            matches && matches.length >= 2
+                ? `${matches[1].replaceAll(SagemakerConstants.SpecialCharacterRegex, '-')}-`
+                : ''
+
+        return getSpaceAppsForUserProfile([...this.spaceApps.values()], userProfilePrefix)
+    }
+
+    public async getRemoteSelectedDomainUsers(): Promise<string[]> {
+        const remoteAppMetadata = await getRemoteAppMetadata()
+        return getSpaceAppsForUserProfile(
+            [...this.spaceApps.values()],
+            remoteAppMetadata.UserProfileName,
+            remoteAppMetadata.DomainId
+        )
+    }
+
+    public async getDefaultSelectedDomainUsers(): Promise<string[]> {
+        if (isRemoteWorkspace()) {
+            return this.getRemoteSelectedDomainUsers()
+        } else {
+            return this.getLocalSelectedDomainUsers()
+        }
+    }
+
+    public async getSelectedDomainUsers(): Promise<Set<string>> {
+        const selectedDomainUsersByRegionMap = new Map(
+            globals.globalState.get<SelectedDomainUsersByRegion>(SagemakerConstants.SelectedDomainUsersState, [])
+        )
+
+        const selectedDomainUsersMap = new Map(selectedDomainUsersByRegionMap.get(this.regionCode))
+        const defaultSelectedDomainUsers = await this.getDefaultSelectedDomainUsers()
+        const cachedDomainUsers = selectedDomainUsersMap.get(this.callerIdentity.Arn || '')
+
+        if (cachedDomainUsers && cachedDomainUsers.length > 0) {
+            return new Set(cachedDomainUsers)
+        } else {
+            return new Set(defaultSelectedDomainUsers)
+        }
+    }
+
+    public saveSelectedDomainUsers(selectedDomainUsers: string[]) {
+        const selectedDomainUsersByRegionMap = new Map(
+            globals.globalState.get<SelectedDomainUsersByRegion>(SagemakerConstants.SelectedDomainUsersState, [])
+        )
+
+        const selectedDomainUsersMap = new Map(selectedDomainUsersByRegionMap.get(this.regionCode))
+
+        if (this.callerIdentity.Arn) {
+            selectedDomainUsersMap?.set(this.callerIdentity.Arn, selectedDomainUsers)
+            selectedDomainUsersByRegionMap?.set(this.regionCode, [...selectedDomainUsersMap])
+
+            globals.globalState.tryUpdate(SagemakerConstants.SelectedDomainUsersState, [
+                ...selectedDomainUsersByRegionMap,
+            ])
+        }
+    }
+
+    public async updateChildren(): Promise<void> {
+        const [spaceApps, domains] = await this.sagemakerClient.fetchSpaceAppsAndDomains()
+        this.spaceApps = spaceApps
+
+        this.callerIdentity = await this.stsClient.getCallerIdentity()
+        const selectedDomainUsers = await this.getSelectedDomainUsers()
+        this.domainUserProfiles.clear()
+
+        for (const app of spaceApps.values()) {
+            const domainId = app.DomainId
+            const userProfile = app.OwnershipSettingsSummary?.OwnerUserProfileName
+            if (!domainId || !userProfile) {
+                continue
+            }
+
+            // populate domainUserProfiles for filtering
+            const domainUserProfileKey = getDomainUserProfileKey(domainId, userProfile)
+            const domainSpaceKey = getDomainSpaceKey(domainId, app.SpaceName || '')
+
+            this.domainUserProfiles.set(domainUserProfileKey, {
+                domain: domains.get(domainId) as DescribeDomainResponse,
+            })
+
+            if (!selectedDomainUsers.has(domainUserProfileKey) && app.SpaceName) {
+                spaceApps.delete(domainSpaceKey)
+                continue
+            }
+        }
+
+        updateInPlace(
+            this.sagemakerSpaceNodes,
+            spaceApps.keys(),
+            (key) => this.sagemakerSpaceNodes.get(key)!.updateSpace(spaceApps.get(key)!),
+            (key) => new SagemakerSpaceNode(this, this.sagemakerClient, this.regionCode, spaceApps.get(key)!)
+        )
+    }
+
+    public async clearChildren() {
+        this.sagemakerSpaceNodes = new Map<string, SagemakerSpaceNode>()
+    }
+
+    public async refreshNode(): Promise<void> {
+        await this.clearChildren()
+        await vscode.commands.executeCommand('aws.refreshAwsExplorerNode', this)
+    }
+}
diff --git a/packages/core/src/awsService/sagemaker/explorer/sagemakerSpaceNode.ts b/packages/core/src/awsService/sagemaker/explorer/sagemakerSpaceNode.ts
new file mode 100644
index 00000000000..1d93d325193
--- /dev/null
+++ b/packages/core/src/awsService/sagemaker/explorer/sagemakerSpaceNode.ts
@@ -0,0 +1,104 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { SagemakerClient, SagemakerSpaceApp } from '../../../shared/clients/sagemaker'
+import { AWSResourceNode } from '../../../shared/treeview/nodes/awsResourceNode'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { SagemakerParentNode } from './sagemakerParentNode'
+import { getLogger } from '../../../shared/logger/logger'
+import { SagemakerUnifiedStudioSpaceNode } from '../../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioSpaceNode'
+import { SagemakerSpace } from '../sagemakerSpace'
+
+export class SagemakerSpaceNode extends AWSTreeNodeBase implements AWSResourceNode {
+    private smSpace: SagemakerSpace
+    public constructor(
+        public readonly parent: SagemakerParentNode,
+        public readonly client: SagemakerClient,
+        public override readonly regionCode: string,
+        public readonly spaceApp: SagemakerSpaceApp
+    ) {
+        super('')
+        this.smSpace = new SagemakerSpace(this.client, this.regionCode, this.spaceApp)
+        this.updateSpace(spaceApp)
+        this.contextValue = this.smSpace.getContext()
+    }
+
+    public updateSpace(spaceApp: SagemakerSpaceApp) {
+        this.smSpace.updateSpace(spaceApp)
+        this.updateFromSpace()
+        if (this.isPending()) {
+            this.parent.trackPendingNode(this.DomainSpaceKey)
+        }
+    }
+
+    private updateFromSpace() {
+        this.label = this.smSpace.label
+        this.description = this.smSpace.description
+        this.tooltip = this.smSpace.tooltip
+        this.iconPath = this.smSpace.iconPath
+        this.contextValue = this.smSpace.contextValue
+    }
+
+    public isPending(): boolean {
+        return this.smSpace.isPending()
+    }
+
+    public getStatus(): string {
+        return this.smSpace.getStatus()
+    }
+
+    public async getAppStatus() {
+        return this.smSpace.getAppStatus()
+    }
+
+    public get name(): string {
+        return this.smSpace.name
+    }
+
+    public get arn(): string {
+        return this.smSpace.arn
+    }
+
+    public async getAppArn() {
+        return this.smSpace.getAppArn()
+    }
+
+    public async getSpaceArn() {
+        return this.smSpace.getSpaceArn()
+    }
+
+    public async updateSpaceAppStatus() {
+        await this.smSpace.updateSpaceAppStatus()
+        this.updateFromSpace()
+        if (this.isPending()) {
+            this.parent.trackPendingNode(this.DomainSpaceKey)
+        }
+    }
+
+    public get DomainSpaceKey(): string {
+        return this.spaceApp.DomainSpaceKey!
+    }
+
+    public async refreshNode(): Promise<void> {
+        await this.updateSpaceAppStatus()
+        await vscode.commands.executeCommand('aws.refreshAwsExplorerNode', this)
+    }
+}
+
+export async function tryRefreshNode(node?: SagemakerSpaceNode | SagemakerUnifiedStudioSpaceNode) {
+    if (node) {
+        try {
+            // For SageMaker spaces, refresh just the individual space node to avoid expensive
+            // operation of refreshing all spaces in the domain
+            await node.updateSpaceAppStatus()
+            node instanceof SagemakerSpaceNode
+                ? await vscode.commands.executeCommand('aws.refreshAwsExplorerNode', node)
+                : await node.refreshNode()
+        } catch (e) {
+            getLogger().error('refreshNode failed: %s', (e as Error).message)
+        }
+    }
+}
diff --git a/packages/core/src/awsService/sagemaker/model.ts b/packages/core/src/awsService/sagemaker/model.ts
new file mode 100644
index 00000000000..e25e8791d4f
--- /dev/null
+++ b/packages/core/src/awsService/sagemaker/model.ts
@@ -0,0 +1,247 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Disabled: detached server files cannot import vscode.
+/* eslint-disable no-restricted-imports */
+import * as vscode from 'vscode'
+import { sshAgentSocketVariable, startSshAgent, startVscodeRemote } from '../../shared/extensions/ssh'
+import { createBoundProcess, ensureDependencies } from '../../shared/remoteSession'
+import { SshConfig } from '../../shared/sshConfig'
+import * as path from 'path'
+import { persistLocalCredentials, persistSmusProjectCreds, persistSSMConnection } from './credentialMapping'
+import * as os from 'os'
+import _ from 'lodash'
+import { fs } from '../../shared/fs/fs'
+import * as nodefs from 'fs'
+import { getSmSsmEnv, spawnDetachedServer } from './utils'
+import { getLogger } from '../../shared/logger/logger'
+import { DevSettings } from '../../shared/settings'
+import { ToolkitError } from '../../shared/errors'
+import { SagemakerSpaceNode } from './explorer/sagemakerSpaceNode'
+import { sleep } from '../../shared/utilities/timeoutUtils'
+import { SagemakerUnifiedStudioSpaceNode } from '../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioSpaceNode'
+
+const logger = getLogger('sagemaker')
+
+export async function tryRemoteConnection(
+    node: SagemakerSpaceNode | SagemakerUnifiedStudioSpaceNode,
+    ctx: vscode.ExtensionContext,
+    progress: vscode.Progress<{ message?: string; increment?: number }>
+) {
+    const spaceArn = (await node.getSpaceArn()) as string
+    const isSMUS = node instanceof SagemakerUnifiedStudioSpaceNode
+    const remoteEnv = await prepareDevEnvConnection(spaceArn, ctx, 'sm_lc', isSMUS, node)
+    try {
+        progress.report({ message: 'Opening remote session' })
+        await startVscodeRemote(
+            remoteEnv.SessionProcess,
+            remoteEnv.hostname,
+            '/home/sagemaker-user',
+            remoteEnv.vscPath,
+            'sagemaker-user'
+        )
+    } catch (err) {
+        getLogger().info(
+            `sm:OpenRemoteConnect: Unable to connect to target space with arn: ${await node.getAppArn()} error: ${err}`
+        )
+    }
+}
+
+export async function prepareDevEnvConnection(
+    spaceArn: string,
+    ctx: vscode.ExtensionContext,
+    connectionType: string,
+    isSMUS: boolean,
+    node: SagemakerSpaceNode | SagemakerUnifiedStudioSpaceNode | undefined,
+    session?: string,
+    wsUrl?: string,
+    token?: string,
+    domain?: string,
+    appType?: string
+) {
+    const remoteLogger = configureRemoteConnectionLogger()
+    const { ssm, vsc, ssh } = (await ensureDependencies()).unwrap()
+
+    // Check timeout setting for remote SSH connections
+    const remoteSshConfig = vscode.workspace.getConfiguration('remote.SSH')
+    const current = remoteSshConfig.get<number>('connectTimeout')
+    if (typeof current === 'number' && current < 120) {
+        await remoteSshConfig.update('connectTimeout', 120, vscode.ConfigurationTarget.Global)
+        void vscode.window.showInformationMessage(
+            'Updated "remote.SSH.connectTimeout" to 120 seconds to improve stability.'
+        )
+    }
+
+    const hostnamePrefix = connectionType
+    const hostname = `${hostnamePrefix}_${spaceArn.replace(/\//g, '__').replace(/:/g, '_._')}`
+
+    // save space credential mapping
+    if (connectionType === 'sm_lc') {
+        if (!isSMUS) {
+            await persistLocalCredentials(spaceArn)
+        } else {
+            await persistSmusProjectCreds(spaceArn, node as SagemakerUnifiedStudioSpaceNode)
+        }
+    } else if (connectionType === 'sm_dl') {
+        await persistSSMConnection(spaceArn, domain ?? '', session, wsUrl, token, appType)
+    }
+
+    await startLocalServer(ctx)
+    await removeKnownHost(hostname)
+
+    const sshConfig = new SshConfig(ssh, 'sm_', 'sagemaker_connect')
+    const config = await sshConfig.ensureValid()
+    if (config.isErr()) {
+        const err = config.err()
+        logger.error(`sagemaker: failed to add ssh config section: ${err.message}`)
+        throw err
+    }
+
+    // set envirionment variables
+    const vars = getSmSsmEnv(ssm, path.join(ctx.globalStorageUri.fsPath, 'sagemaker-local-server-info.json'))
+    logger.info(`connect script logs at ${vars.LOG_FILE_LOCATION}`)
+
+    const envProvider = async () => {
+        return { [sshAgentSocketVariable]: await startSshAgent(), ...vars }
+    }
+    const SessionProcess = createBoundProcess(envProvider).extend({
+        onStdout: remoteLogger,
+        onStderr: remoteLogger,
+        rejectOnErrorCode: true,
+    })
+
+    return {
+        hostname,
+        envProvider,
+        sshPath: ssh,
+        vscPath: vsc,
+        SessionProcess,
+    }
+}
+
+export function configureRemoteConnectionLogger() {
+    const logPrefix = 'sagemaker:'
+    const logger = (data: string) => getLogger().info(`${logPrefix}: ${data}`)
+    return logger
+}
+
+export async function startLocalServer(ctx: vscode.ExtensionContext) {
+    const storagePath = ctx.globalStorageUri.fsPath
+    const serverPath = ctx.asAbsolutePath(path.join('dist/src/awsService/sagemaker/detached-server/', 'server.js'))
+    const outLog = path.join(storagePath, 'sagemaker-local-server.out.log')
+    const errLog = path.join(storagePath, 'sagemaker-local-server.err.log')
+    const infoFilePath = path.join(storagePath, 'sagemaker-local-server-info.json')
+
+    logger.info(`sagemaker-local-server.*.log at ${storagePath}`)
+
+    const customEndpoint = DevSettings.instance.get('endpoints', {})['sagemaker']
+
+    await stopLocalServer(ctx)
+
+    const child = spawnDetachedServer(process.execPath, [serverPath], {
+        cwd: path.dirname(serverPath),
+        detached: true,
+        stdio: ['ignore', nodefs.openSync(outLog, 'a'), nodefs.openSync(errLog, 'a')],
+        env: {
+            ...process.env,
+            SAGEMAKER_ENDPOINT: customEndpoint,
+            SAGEMAKER_LOCAL_SERVER_FILE_PATH: infoFilePath,
+        },
+    })
+
+    child.unref()
+
+    // Wait for the info file to appear (timeout after 10 seconds)
+    const maxRetries = 20
+    const delayMs = 500
+    for (let i = 0; i < maxRetries; i++) {
+        if (await fs.existsFile(infoFilePath)) {
+            logger.debug('Detected server info file.')
+            return
+        }
+        await sleep(delayMs)
+    }
+
+    throw new ToolkitError(`Timed out waiting for local server info file: ${infoFilePath}`)
+}
+
+interface LocalServerInfo {
+    pid: number
+    port: string
+}
+
+export async function stopLocalServer(ctx: vscode.ExtensionContext): Promise<void> {
+    const infoFilePath = path.join(ctx.globalStorageUri.fsPath, 'sagemaker-local-server-info.json')
+
+    if (!(await fs.existsFile(infoFilePath))) {
+        logger.debug('no server info file found. nothing to stop.')
+        return
+    }
+
+    let pid: number | undefined
+    try {
+        const content = await fs.readFileText(infoFilePath)
+        const infoJson = JSON.parse(content) as LocalServerInfo
+        pid = infoJson.pid
+    } catch (err: any) {
+        throw ToolkitError.chain(err, 'failed to parse server info file')
+    }
+
+    if (typeof pid === 'number' && !isNaN(pid)) {
+        try {
+            process.kill(pid)
+            logger.debug(`stopped local server with PID ${pid}`)
+        } catch (err: any) {
+            if (err.code === 'ESRCH') {
+                logger.warn(`no process found with PID ${pid}. It may have already exited.`)
+            } else {
+                throw ToolkitError.chain(err, 'failed to stop local server')
+            }
+        }
+    } else {
+        logger.warn('no valid PID found in info file.')
+    }
+
+    try {
+        await fs.delete(infoFilePath)
+        logger.debug('removed server info file.')
+    } catch (err: any) {
+        logger.warn(`could not delete info file: ${err.message ?? err}`)
+    }
+}
+
+export async function removeKnownHost(hostname: string): Promise<void> {
+    const knownHostsPath = path.join(os.homedir(), '.ssh', 'known_hosts')
+
+    if (!(await fs.existsFile(knownHostsPath))) {
+        logger.warn(`known_hosts not found at ${knownHostsPath}`)
+        return
+    }
+
+    let lines: string[]
+    try {
+        const content = await fs.readFileText(knownHostsPath)
+        lines = content.split('\n')
+    } catch (err: any) {
+        throw ToolkitError.chain(err, 'Failed to read known_hosts file')
+    }
+
+    const updatedLines = lines.filter((line) => {
+        const entryHostname = line.split(' ')[0].split(',')
+        // Hostnames in the known_hosts file seem to be always lowercase, but keeping the case-sensitive check just in
+        // case. Originally we were only doing the case-sensitive check which caused users to get a host
+        // identification error when reconnecting to a Space after it was restarted.
+        return !entryHostname.includes(hostname) && !entryHostname.includes(hostname.toLowerCase())
+    })
+
+    if (updatedLines.length !== lines.length) {
+        try {
+            await fs.writeFile(knownHostsPath, updatedLines.join('\n'), { atomic: true })
+            logger.debug(`Removed '${hostname}' from known_hosts`)
+        } catch (err: any) {
+            throw ToolkitError.chain(err, 'Failed to write updated known_hosts file')
+        }
+    }
+}
diff --git a/packages/core/src/awsService/sagemaker/remoteUtils.ts b/packages/core/src/awsService/sagemaker/remoteUtils.ts
new file mode 100644
index 00000000000..9ff8d8ca177
--- /dev/null
+++ b/packages/core/src/awsService/sagemaker/remoteUtils.ts
@@ -0,0 +1,48 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { fs } from '../../shared/fs/fs'
+import { SagemakerClient } from '../../shared/clients/sagemaker'
+import { RemoteAppMetadata } from './utils'
+import { getLogger } from '../../shared/logger/logger'
+import { parseArn } from './detached-server/utils'
+
+export async function getRemoteAppMetadata(): Promise<RemoteAppMetadata> {
+    try {
+        const metadataPath = '/opt/ml/metadata/resource-metadata.json'
+        const metadataContent = await fs.readFileText(metadataPath)
+        const metadata = JSON.parse(metadataContent)
+
+        const domainId = metadata.DomainId
+        const spaceName = metadata.SpaceName
+
+        if (!domainId || !spaceName) {
+            throw new Error('DomainId or SpaceName not found in metadata file')
+        }
+
+        const { region } = parseArn(metadata.ResourceArn)
+
+        const client = new SagemakerClient(region)
+        const spaceDetails = await client.describeSpace({ DomainId: domainId, SpaceName: spaceName })
+
+        const userProfileName = spaceDetails.OwnershipSettings?.OwnerUserProfileName
+
+        if (!userProfileName) {
+            throw new Error('OwnerUserProfileName not found in space details')
+        }
+
+        return {
+            DomainId: domainId,
+            UserProfileName: userProfileName,
+        }
+    } catch (error) {
+        const logger = getLogger()
+        logger.error(`getRemoteAppMetadata: Failed to read metadata file, using fallback values: ${error}`)
+        return {
+            DomainId: '',
+            UserProfileName: '',
+        }
+    }
+}
diff --git a/packages/core/src/awsService/sagemaker/sagemakerSpace.ts b/packages/core/src/awsService/sagemaker/sagemakerSpace.ts
new file mode 100644
index 00000000000..14ac03d9c0e
--- /dev/null
+++ b/packages/core/src/awsService/sagemaker/sagemakerSpace.ts
@@ -0,0 +1,229 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as path from 'path'
+import { AppType } from '@aws-sdk/client-sagemaker'
+import { SagemakerClient, SagemakerSpaceApp } from '../../shared/clients/sagemaker'
+import { getIcon, IconPath } from '../../shared/icons'
+import { generateSpaceStatus, updateIdleFile, startMonitoringTerminalActivity, ActivityCheckInterval } from './utils'
+import { UserActivity } from '../../shared/extensionUtilities'
+import { getLogger } from '../../shared/logger/logger'
+
+export class SagemakerSpace {
+    public label: string = ''
+    public contextValue: string = ''
+    public description?: string
+    private spaceApp: SagemakerSpaceApp
+    public tooltip?: vscode.MarkdownString
+    public iconPath?: IconPath
+    public refreshCallback?: () => Promise<void>
+
+    public constructor(
+        private readonly client: SagemakerClient,
+        public readonly regionCode: string,
+        spaceApp: SagemakerSpaceApp,
+        private readonly isSMUSSpace: boolean = false
+    ) {
+        this.spaceApp = spaceApp
+        this.updateSpace(spaceApp)
+        this.contextValue = this.getContext()
+    }
+
+    public updateSpace(spaceApp: SagemakerSpaceApp) {
+        this.setSpaceStatus(spaceApp.Status ?? '', spaceApp.App?.Status ?? '')
+        // Only update RemoteAccess property to minimize impact due to minor structural differences between variables
+        if (this.spaceApp.SpaceSettingsSummary && spaceApp.SpaceSettingsSummary?.RemoteAccess) {
+            this.spaceApp.SpaceSettingsSummary.RemoteAccess = spaceApp.SpaceSettingsSummary.RemoteAccess
+        }
+        this.label = this.buildLabel()
+        this.description = this.isSMUSSpace ? undefined : this.buildDescription()
+        this.tooltip = new vscode.MarkdownString(this.buildTooltip())
+        this.iconPath = this.getAppIcon()
+        this.contextValue = this.getContext()
+    }
+
+    public setSpaceStatus(spaceStatus: string, appStatus: string) {
+        this.spaceApp.Status = spaceStatus
+        if (this.spaceApp.App) {
+            this.spaceApp.App.Status = appStatus
+        }
+    }
+
+    public isPending(): boolean {
+        return this.getStatus() !== 'Running' && this.getStatus() !== 'Stopped'
+    }
+
+    public getStatus(): string {
+        return generateSpaceStatus(this.spaceApp.Status, this.spaceApp.App?.Status)
+    }
+
+    public async getAppStatus() {
+        const app = await this.client.describeApp({
+            DomainId: this.spaceApp.DomainId,
+            AppName: this.spaceApp.App?.AppName,
+            AppType: this.spaceApp.SpaceSettingsSummary?.AppType,
+            SpaceName: this.spaceApp.SpaceName,
+        })
+
+        return app.Status ?? 'Unknown'
+    }
+
+    public get name(): string {
+        return this.spaceApp.SpaceName ?? `(no name)`
+    }
+
+    public get arn(): string {
+        return 'placeholder-arn'
+    }
+
+    // TODO: Verify this method is still needed to retrieve the app ARN or build based on provided details
+    public async getAppArn() {
+        const appDetails = await this.client.describeApp({
+            DomainId: this.spaceApp.DomainId,
+            AppName: this.spaceApp.App?.AppName,
+            AppType: this.spaceApp?.SpaceSettingsSummary?.AppType,
+            SpaceName: this.spaceApp.SpaceName,
+        })
+
+        return appDetails.AppArn
+    }
+
+    // TODO: Verify this method is still needed to retrieve the app ARN or build based on provided details
+    public async getSpaceArn() {
+        const spaceDetails = await this.client.describeSpace({
+            DomainId: this.spaceApp.DomainId,
+            SpaceName: this.spaceApp.SpaceName,
+        })
+
+        return spaceDetails.SpaceArn
+    }
+
+    public async updateSpaceAppStatus() {
+        const space = await this.client.describeSpace({
+            DomainId: this.spaceApp.DomainId,
+            SpaceName: this.spaceApp.SpaceName,
+        })
+
+        const app = await this.client.describeApp({
+            DomainId: this.spaceApp.DomainId,
+            AppName: this.spaceApp.App?.AppName,
+            AppType: this.spaceApp?.SpaceSettingsSummary?.AppType,
+            SpaceName: this.spaceApp.SpaceName,
+        })
+
+        // AWS DescribeSpace API returns full details with property names like 'SpaceSettings'
+        // but our internal SagemakerSpaceApp type expects 'SpaceSettingsSummary' (from ListSpaces API)
+        // We destructure and rename properties to maintain type compatibility
+        const {
+            SpaceSettings: spaceSettingsSummary,
+            OwnershipSettings: ownershipSettingsSummary,
+            SpaceSharingSettings: spaceSharingSettingsSummary,
+            ...spaceDetails
+        } = space
+        this.updateSpace({
+            SpaceSettingsSummary: spaceSettingsSummary,
+            OwnershipSettingsSummary: ownershipSettingsSummary,
+            SpaceSharingSettingsSummary: spaceSharingSettingsSummary,
+            ...spaceDetails,
+            App: app,
+            DomainSpaceKey: this.spaceApp.DomainSpaceKey,
+        })
+    }
+
+    public buildLabel(): string {
+        const status = generateSpaceStatus(this.spaceApp.Status, this.spaceApp.App?.Status)
+        return `${this.name} (${status})`
+    }
+
+    public buildDescription(): string {
+        return `${this.spaceApp.SpaceSharingSettingsSummary?.SharingType ?? 'Unknown'} space`
+    }
+
+    public buildTooltip() {
+        const spaceName = this.spaceApp?.SpaceName ?? '-'
+        const appType = this.spaceApp?.SpaceSettingsSummary?.AppType || '-'
+        const domainId = this.spaceApp?.DomainId ?? '-'
+        const owner = this.spaceApp?.OwnershipSettingsSummary?.OwnerUserProfileName || '-'
+        const instanceType = this.spaceApp?.App?.ResourceSpec?.InstanceType ?? '-'
+        if (this.isSMUSSpace) {
+            return `**Space:** ${spaceName} \n\n**Application:** ${appType} \n\n**Instance Type:** ${instanceType}`
+        }
+        return `**Space:** ${spaceName} \n\n**Application:** ${appType} \n\n**Domain ID:** ${domainId} \n\n**User Profile:** ${owner}`
+    }
+
+    public getAppIcon() {
+        const appType = this.spaceApp.SpaceSettingsSummary?.AppType
+        if (appType === AppType.JupyterLab) {
+            return getIcon('aws-sagemaker-jupyter-lab')
+        }
+        if (appType === AppType.CodeEditor) {
+            return getIcon('aws-sagemaker-code-editor')
+        }
+    }
+
+    public getContext(): string {
+        const status = this.getStatus()
+        if (status === 'Running' && this.spaceApp.SpaceSettingsSummary?.RemoteAccess === 'ENABLED') {
+            return 'awsSagemakerSpaceRunningRemoteEnabledNode'
+        } else if (status === 'Running' && this.spaceApp.SpaceSettingsSummary?.RemoteAccess === 'DISABLED') {
+            return 'awsSagemakerSpaceRunningRemoteDisabledNode'
+        } else if (status === 'Running' && this.isSMUSSpace) {
+            return 'awsSagemakerSpaceRunningNode'
+        } else if (status === 'Stopped' && this.spaceApp.SpaceSettingsSummary?.RemoteAccess === 'ENABLED') {
+            return 'awsSagemakerSpaceStoppedRemoteEnabledNode'
+        } else if (
+            (status === 'Stopped' && !this.spaceApp.SpaceSettingsSummary?.RemoteAccess) ||
+            this.spaceApp.SpaceSettingsSummary?.RemoteAccess === 'DISABLED'
+        ) {
+            return 'awsSagemakerSpaceStoppedRemoteDisabledNode'
+        }
+        return this.isSMUSSpace ? 'smusSpaceNode' : 'awsSagemakerSpaceNode'
+    }
+
+    public get DomainSpaceKey(): string {
+        return this.spaceApp.DomainSpaceKey!
+    }
+}
+
+/**
+ * Sets up user activity monitoring for SageMaker spaces
+ */
+export async function setupUserActivityMonitoring(extensionContext: vscode.ExtensionContext): Promise<void> {
+    const logger = getLogger()
+    logger.info('setupUserActivityMonitoring: Starting user activity monitoring setup')
+
+    const tmpDirectory = '/tmp/'
+    const idleFilePath = path.join(tmpDirectory, '.sagemaker-last-active-timestamp')
+    logger.debug(`setupUserActivityMonitoring: Using idle file path: ${idleFilePath}`)
+
+    try {
+        const userActivity = new UserActivity(ActivityCheckInterval)
+        userActivity.onUserActivity(() => {
+            logger.debug('setupUserActivityMonitoring: User activity detected, updating idle file')
+            void updateIdleFile(idleFilePath)
+        })
+
+        let terminalActivityInterval: NodeJS.Timeout | undefined = startMonitoringTerminalActivity(idleFilePath)
+        logger.debug('setupUserActivityMonitoring: Started terminal activity monitoring')
+        // Write initial timestamp
+        await updateIdleFile(idleFilePath)
+        logger.info('setupUserActivityMonitoring: Initial timestamp written successfully')
+        extensionContext.subscriptions.push(userActivity, {
+            dispose: () => {
+                logger.info('setupUserActivityMonitoring: Disposing user activity monitoring')
+                if (terminalActivityInterval) {
+                    clearInterval(terminalActivityInterval)
+                    terminalActivityInterval = undefined
+                }
+            },
+        })
+
+        logger.info('setupUserActivityMonitoring: User activity monitoring setup completed successfully')
+    } catch (error) {
+        logger.error(`setupUserActivityMonitoring: Error during setup: ${error}`)
+        throw error
+    }
+}
diff --git a/packages/core/src/awsService/sagemaker/types.ts b/packages/core/src/awsService/sagemaker/types.ts
new file mode 100644
index 00000000000..82f4d4f92d6
--- /dev/null
+++ b/packages/core/src/awsService/sagemaker/types.ts
@@ -0,0 +1,32 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export interface SpaceMappings {
+    localCredential?: { [spaceName: string]: LocalCredentialProfile }
+    deepLink?: { [spaceName: string]: DeeplinkSession }
+    smusProjects?: { [smusProjectId: string]: { accessKey: string; secret: string; token: string } }
+}
+
+export type LocalCredentialProfile =
+    | { type: 'iam'; profileName: string }
+    | { type: 'sso'; accessKey: string; secret: string; token: string }
+    | { type: 'sso'; smusProjectId: string }
+
+export interface DeeplinkSession {
+    requests: Record<string, SsmConnectionInfo>
+    refreshUrl?: string
+}
+
+export interface SsmConnectionInfo {
+    sessionId: string
+    url: string
+    token: string
+    status?: 'fresh' | 'consumed' | 'pending'
+}
+
+export interface ServerInfo {
+    pid: number
+    port: number
+}
diff --git a/packages/core/src/awsService/sagemaker/uriHandlers.ts b/packages/core/src/awsService/sagemaker/uriHandlers.ts
new file mode 100644
index 00000000000..6f1143d9054
--- /dev/null
+++ b/packages/core/src/awsService/sagemaker/uriHandlers.ts
@@ -0,0 +1,43 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { SearchParams } from '../../shared/vscode/uriHandler'
+import { deeplinkConnect } from './commands'
+import { ExtContext } from '../../shared/extensions'
+import { telemetry } from '../../shared/telemetry/telemetry'
+
+export function register(ctx: ExtContext) {
+    async function connectHandler(params: ReturnType<typeof parseConnectParams>) {
+        await telemetry.sagemaker_deeplinkConnect.run(async () => {
+            await deeplinkConnect(
+                ctx,
+                params.connection_identifier,
+                params.session,
+                `${params.ws_url}&cell-number=${params['cell-number']}`,
+                params.token,
+                params.domain,
+                params.app_type
+            )
+        })
+    }
+
+    return vscode.Disposable.from(ctx.uriHandler.onPath('/connect/sagemaker', connectHandler, parseConnectParams))
+}
+
+export function parseConnectParams(query: SearchParams) {
+    const requiredParams = query.getFromKeysOrThrow(
+        'connection_identifier',
+        'domain',
+        'user_profile',
+        'session',
+        'ws_url',
+        'cell-number',
+        'token'
+    )
+    const optionalParams = query.getFromKeys('app_type')
+
+    return { ...requiredParams, ...optionalParams }
+}
diff --git a/packages/core/src/awsService/sagemaker/utils.ts b/packages/core/src/awsService/sagemaker/utils.ts
new file mode 100644
index 00000000000..33cc5880bee
--- /dev/null
+++ b/packages/core/src/awsService/sagemaker/utils.ts
@@ -0,0 +1,156 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as cp from 'child_process' // eslint-disable-line no-restricted-imports
+import * as path from 'path'
+import { AppStatus, SpaceStatus } from '@aws-sdk/client-sagemaker'
+import { SagemakerSpaceApp } from '../../shared/clients/sagemaker'
+import { sshLogFileLocation } from '../../shared/sshConfig'
+import { fs } from '../../shared/fs/fs'
+import { getLogger } from '../../shared/logger/logger'
+
+export const DomainKeyDelimiter = '__'
+
+export function getDomainSpaceKey(domainId: string, spaceName: string): string {
+    return `${domainId}${DomainKeyDelimiter}${spaceName}`
+}
+
+export function getDomainUserProfileKey(domainId: string, userProfileName: string): string {
+    return `${domainId}${DomainKeyDelimiter}${userProfileName}`
+}
+
+export function generateSpaceStatus(spaceStatus?: string, appStatus?: string) {
+    if (
+        spaceStatus === SpaceStatus.Failed ||
+        spaceStatus === SpaceStatus.Delete_Failed ||
+        spaceStatus === SpaceStatus.Update_Failed ||
+        (appStatus === AppStatus.Failed && spaceStatus !== SpaceStatus.Updating)
+    ) {
+        return 'Failed'
+    }
+
+    if (spaceStatus === SpaceStatus.InService && appStatus === AppStatus.InService) {
+        return 'Running'
+    }
+
+    if (spaceStatus === SpaceStatus.InService && appStatus === AppStatus.Pending) {
+        return 'Starting'
+    }
+
+    if (spaceStatus === SpaceStatus.Updating) {
+        return 'Updating'
+    }
+
+    if (spaceStatus === SpaceStatus.InService && appStatus === AppStatus.Deleting) {
+        return 'Stopping'
+    }
+
+    if (spaceStatus === SpaceStatus.InService && (appStatus === AppStatus.Deleted || !appStatus)) {
+        return 'Stopped'
+    }
+
+    if (spaceStatus === SpaceStatus.Deleting) {
+        return 'Deleting'
+    }
+
+    return 'Unknown'
+}
+
+export interface RemoteAppMetadata {
+    DomainId: string
+    UserProfileName: string
+}
+
+export function getSpaceAppsForUserProfile(
+    spaceApps: SagemakerSpaceApp[],
+    userProfilePrefix: string,
+    domainId?: string
+): string[] {
+    return spaceApps.reduce((result: string[], app: SagemakerSpaceApp) => {
+        if (app.OwnershipSettingsSummary?.OwnerUserProfileName?.startsWith(userProfilePrefix)) {
+            if (domainId && app.DomainId !== domainId) {
+                return result
+            }
+            result.push(
+                getDomainUserProfileKey(app.DomainId || '', app.OwnershipSettingsSummary?.OwnerUserProfileName || '')
+            )
+        }
+
+        return result
+    }, [] as string[])
+}
+
+export function getSmSsmEnv(ssmPath: string, sagemakerLocalServerPath: string): NodeJS.ProcessEnv {
+    return Object.assign(
+        {
+            AWS_SSM_CLI: ssmPath,
+            SAGEMAKER_LOCAL_SERVER_FILE_PATH: sagemakerLocalServerPath,
+            LOF_FILE_LOCATION: sshLogFileLocation('sagemaker', 'blah'),
+        },
+        process.env
+    )
+}
+
+export function spawnDetachedServer(...args: Parameters<typeof cp.spawn>) {
+    return cp.spawn(...args)
+}
+
+export const ActivityCheckInterval = 60000
+
+/**
+ * Updates the idle file with the current timestamp
+ */
+export async function updateIdleFile(idleFilePath: string): Promise<void> {
+    try {
+        const timestamp = new Date().toISOString()
+        await fs.writeFile(idleFilePath, timestamp)
+    } catch (error) {
+        getLogger().error(`Failed to update SMAI idle file: ${error}`)
+    }
+}
+
+/**
+ * Checks for terminal activity by reading the /dev/pts directory and comparing modification times of the files.
+ *
+ * The /dev/pts directory is used in Unix-like operating systems to represent pseudo-terminal (PTY) devices.
+ * Each active terminal session is assigned a PTY device. These devices are represented as files within the /dev/pts directory.
+ * When a terminal session has activity, such as when a user inputs commands or output is written to the terminal,
+ * the modification time (mtime) of the corresponding PTY device file is updated. By monitoring the modification
+ * times of the files in the /dev/pts directory, we can detect terminal activity.
+ *
+ * If activity is detected (i.e., if any PTY device file was modified within the CHECK_INTERVAL), this function
+ * updates the last activity timestamp.
+ */
+export async function checkTerminalActivity(idleFilePath: string): Promise<void> {
+    try {
+        const files = await fs.readdir('/dev/pts')
+        const now = Date.now()
+
+        for (const [fileName] of files) {
+            const filePath = path.join('/dev/pts', fileName)
+            try {
+                const stats = await fs.stat(filePath)
+                const mtime = new Date(stats.mtime).getTime()
+                if (now - mtime < ActivityCheckInterval) {
+                    await updateIdleFile(idleFilePath)
+                    return
+                }
+            } catch (err) {
+                getLogger().error(`Error reading file stats:`, err)
+            }
+        }
+    } catch (err) {
+        getLogger().error(`Error reading /dev/pts directory:`, err)
+    }
+}
+
+/**
+ * Starts monitoring terminal activity by setting an interval to check for activity in the /dev/pts directory.
+ */
+export function startMonitoringTerminalActivity(idleFilePath: string): NodeJS.Timeout {
+    return setInterval(async () => {
+        await checkTerminalActivity(idleFilePath)
+    }, ActivityCheckInterval)
+}
diff --git a/packages/core/src/awsexplorer/activation.ts b/packages/core/src/awsexplorer/activation.ts
new file mode 100644
index 00000000000..ec4c23ccd79
--- /dev/null
+++ b/packages/core/src/awsexplorer/activation.ts
@@ -0,0 +1,217 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { deleteCloudFormation } from '../lambda/commands/deleteCloudFormation'
+import { CloudFormationStackNode } from '../lambda/explorer/cloudFormationNodes'
+import globals from '../shared/extensionGlobals'
+import { isCloud9, isSageMaker } from '../shared/extensionUtilities'
+import { ExtContext, VSCODE_EXTENSION_ID } from '../shared/extensions'
+import { getLogger } from '../shared/logger/logger'
+import { RegionProvider } from '../shared/regions/regionProvider'
+import { AWSResourceNode } from '../shared/treeview/nodes/awsResourceNode'
+import { AWSTreeNodeBase } from '../shared/treeview/nodes/awsTreeNodeBase'
+import { Commands } from '../shared/vscode/commands2'
+import { downloadStateMachineDefinition } from '../stepFunctions/commands/downloadStateMachineDefinition'
+import { executeStateMachine } from '../stepFunctions/vue/executeStateMachine/executeStateMachine'
+import { StateMachineNode } from '../stepFunctions/explorer/stepFunctionsNodes'
+import { AwsExplorer } from './awsExplorer'
+import { copyTextCommand } from './commands/copyText'
+import { loadMoreChildrenCommand } from './commands/loadMoreChildren'
+import { checkExplorerForDefaultRegion } from './defaultRegion'
+import { ToolView } from './toolView'
+import { telemetry } from '../shared/telemetry/telemetry'
+import { CdkRootNode } from '../awsService/cdk/explorer/rootNode'
+import { CodeCatalystRootNode } from '../codecatalyst/explorer'
+import { CodeCatalystAuthenticationProvider } from '../codecatalyst/auth'
+import { S3FolderNode } from '../awsService/s3/explorer/s3FolderNode'
+import { AmazonQNode, refreshAmazonQ, refreshAmazonQRootNode } from '../amazonq/explorer/amazonQTreeNode'
+import { activateViewsShared, registerToolView } from './activationShared'
+import { isExtensionInstalled } from '../shared/utilities/vsCodeUtils'
+import { CommonAuthViewProvider } from '../login/webview/commonAuthViewProvider'
+import { setContext } from '../shared/vscode/setContext'
+import { TreeNode } from '../shared/treeview/resourceTreeDataProvider'
+import { getSourceNode } from '../shared/utilities/treeNodeUtils'
+import { openAwsCFNConsoleCommand, openAwsConsoleCommand } from '../shared/awsConsole'
+import { StackNameNode } from '../awsService/appBuilder/explorer/nodes/deployedStack'
+import { LambdaFunctionNodeDecorationProvider } from '../lambda/explorer/lambdaFunctionNodeDecorationProvider'
+
+/**
+ * Activates the AWS Explorer UI and related functionality.
+ *
+ * IMPORTANT: Views that should work in all vscode environments (node or web)
+ * should be setup in {@link activateViewsShared}.
+ */
+export async function activate(args: {
+    context: ExtContext
+    regionProvider: RegionProvider
+    toolkitOutputChannel: vscode.OutputChannel
+}): Promise<void> {
+    const awsExplorer = new AwsExplorer(globals.context, args.regionProvider)
+
+    const view = vscode.window.createTreeView(awsExplorer.viewProviderId, {
+        treeDataProvider: awsExplorer,
+        showCollapseAll: true,
+    })
+    view.onDidExpandElement((element) => {
+        if (element.element instanceof S3FolderNode) {
+            globals.globalState.tryUpdate('aws.lastTouchedS3Folder', {
+                bucket: element.element.bucket,
+                folder: element.element.folder,
+            })
+        }
+        if (element.element.serviceId) {
+            telemetry.aws_expandExplorerNode.emit({ serviceType: element.element.serviceId, result: 'Succeeded' })
+        }
+    })
+    globals.context.subscriptions.push(
+        view,
+        vscode.window.registerFileDecorationProvider(LambdaFunctionNodeDecorationProvider.getInstance())
+    )
+
+    await registerAwsExplorerCommands(args.context, awsExplorer, args.toolkitOutputChannel)
+
+    telemetry.vscode_activeRegions.emit({ value: args.regionProvider.getExplorerRegions().length })
+
+    args.context.extensionContext.subscriptions.push(
+        args.context.awsContext.onDidChangeContext(async (credentialsChangedEvent) => {
+            getLogger().verbose(`Credentials changed (${credentialsChangedEvent.profileName}), updating AWS Explorer`)
+            awsExplorer.refresh()
+
+            if (credentialsChangedEvent.profileName) {
+                await checkExplorerForDefaultRegion(args.regionProvider, awsExplorer)
+            }
+        })
+    )
+
+    const authProvider = CodeCatalystAuthenticationProvider.fromContext(args.context.extensionContext)
+    const codecatalystViewNode: ToolView[] = []
+    let codecatalystNode: CodeCatalystRootNode | undefined
+
+    const shouldShowCodeCatalyst = !(isCloud9('classic') || isSageMaker())
+    if (shouldShowCodeCatalyst) {
+        codecatalystNode = new CodeCatalystRootNode(authProvider)
+        codecatalystViewNode.push({
+            nodes: [codecatalystNode],
+            view: 'aws.codecatalyst',
+            refreshCommands: [
+                (provider) => {
+                    codecatalystNode!.addRefreshEmitter(() => provider.refresh())
+                },
+            ],
+        })
+    }
+    // CodeCatalyst view may not be present. Wrap VS Code-owned command to avoid warning toasts if missing
+    args.context.extensionContext.subscriptions.push(
+        Commands.register(`aws.codecatalyst.maybeFocus`, async () => {
+            if (shouldShowCodeCatalyst) {
+                // vs code-owned command
+                await vscode.commands.executeCommand('aws.codecatalyst.focus')
+            }
+        })
+    )
+
+    const amazonQViewNode: ToolView[] = []
+    if (
+        isExtensionInstalled(VSCODE_EXTENSION_ID.amazonq) ||
+        globals.globalState.get<boolean>('aws.toolkit.amazonq.dismissed')
+    ) {
+        await setContext('aws.toolkit.amazonq.dismissed', true)
+    }
+
+    // We should create the tree even if it's dismissed, in case the user installs Amazon Q later.
+    amazonQViewNode.push({
+        nodes: [AmazonQNode.instance],
+        view: 'aws.amazonq.codewhisperer',
+        refreshCommands: [refreshAmazonQ, refreshAmazonQRootNode],
+    })
+
+    const viewNodes: ToolView[] = [
+        ...amazonQViewNode,
+        ...codecatalystViewNode,
+        { nodes: [CdkRootNode.instance], view: 'aws.cdk', refreshCommands: [CdkRootNode.instance.refreshCdkExplorer] },
+    ]
+    for (const viewNode of viewNodes) {
+        registerToolView(viewNode, args.context.extensionContext)
+    }
+
+    const toolkitAuthProvider = new CommonAuthViewProvider(args.context.extensionContext, 'toolkit')
+    args.context.extensionContext.subscriptions.push(
+        vscode.window.registerWebviewViewProvider(toolkitAuthProvider.viewType, toolkitAuthProvider, {
+            webviewOptions: {
+                retainContextWhenHidden: true,
+            },
+        }),
+        // Hacky way for a webview to call setLoginService().
+        vscode.commands.registerCommand('aws.explorer.setLoginService', (serviceToShow?: string) => {
+            if (toolkitAuthProvider.webView && 'setLoginService' in toolkitAuthProvider.webView.server) {
+                toolkitAuthProvider.webView.server.setLoginService(serviceToShow)
+            }
+        })
+    )
+}
+
+async function registerAwsExplorerCommands(
+    context: ExtContext,
+    awsExplorer: AwsExplorer,
+    toolkitOutputChannel: vscode.OutputChannel
+): Promise<void> {
+    context.extensionContext.subscriptions.push(
+        Commands.register({ id: 'aws.showRegion', autoconnect: false }, async () => {
+            try {
+                await globals.awsContextCommands.onCommandShowRegion()
+            } finally {
+                telemetry.aws_setRegion.emit()
+                telemetry.vscode_activeRegions.emit({ value: awsExplorer.getRegionNodesSize() })
+            }
+        }),
+        Commands.register({ id: 'aws.refreshAwsExplorer', autoconnect: true }, async (passive: boolean = false) => {
+            awsExplorer.refresh()
+
+            if (!passive) {
+                telemetry.aws_refreshExplorer.emit()
+            }
+        }),
+        Commands.register(
+            { id: 'aws.deleteCloudFormation', autoconnect: true },
+            async (node: CloudFormationStackNode) =>
+                await deleteCloudFormation(() => awsExplorer.refresh(node.parent), node)
+        ),
+        Commands.register(
+            { id: 'aws.downloadStateMachineDefinition', autoconnect: true },
+            async (node: StateMachineNode) =>
+                await downloadStateMachineDefinition({
+                    stateMachineNode: node,
+                    outputChannel: toolkitOutputChannel,
+                })
+        )
+    )
+
+    context.extensionContext.subscriptions.push(
+        Commands.register(
+            'aws.executeStateMachine',
+            async (node: StateMachineNode) => await executeStateMachine(context, node)
+        ),
+        Commands.register('aws.copyArn', async (node: AWSResourceNode | TreeNode) => {
+            const sourceNode = getSourceNode<AWSResourceNode>(node)
+            await copyTextCommand(sourceNode, 'ARN')
+        }),
+        Commands.register('aws.copyName', async (node: AWSResourceNode | TreeNode) => {
+            const sourceNode = getSourceNode<AWSResourceNode>(node)
+            await copyTextCommand(sourceNode, 'name')
+        }),
+        Commands.register('aws.openAwsConsole', async (node: AWSResourceNode | TreeNode) => {
+            const sourceNode = getSourceNode<AWSResourceNode>(node)
+            await openAwsConsoleCommand(sourceNode)
+        }),
+        Commands.register('aws.openAwsCFNConsole', async (node: StackNameNode) => {
+            await openAwsCFNConsoleCommand(node)
+        }),
+        Commands.register('aws.refreshAwsExplorerNode', async (element: AWSTreeNodeBase | undefined) => {
+            awsExplorer.refresh(element)
+        }),
+        loadMoreChildrenCommand.register(awsExplorer)
+    )
+}
diff --git a/packages/core/src/awsexplorer/activationShared.ts b/packages/core/src/awsexplorer/activationShared.ts
new file mode 100644
index 00000000000..9f488a35c36
--- /dev/null
+++ b/packages/core/src/awsexplorer/activationShared.ts
@@ -0,0 +1,32 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { createToolView, ToolView } from './toolView'
+import { telemetry } from '../shared/telemetry/telemetry'
+import { CdkRootNode } from '../awsService/cdk/explorer/rootNode'
+
+/**
+ * Activates vscode Views (eg tree view) that work in any vscode environment (nodejs or browser).
+ */
+export async function activateViewsShared(context: vscode.ExtensionContext): Promise<void> {}
+
+export function registerToolView(viewNode: ToolView, context: vscode.ExtensionContext) {
+    const toolView = createToolView(viewNode)
+    context.subscriptions.push(toolView)
+    if (viewNode.view === 'aws.cdk') {
+        // Legacy CDK behavior. Mostly useful for C9 as they do not have inline buttons.
+        toolView.onDidChangeVisibility(({ visible }) => visible && CdkRootNode.instance.refresh())
+    }
+
+    toolView.onDidExpandElement((e) => {
+        if (e.element.resource instanceof CdkRootNode) {
+            // Legacy CDK metric, remove this when we add something generic
+            telemetry.cdk_appExpanded.emit()
+        }
+    })
+
+    return toolView
+}
diff --git a/src/awsexplorer/awsExplorer.ts b/packages/core/src/awsexplorer/awsExplorer.ts
similarity index 82%
rename from src/awsexplorer/awsExplorer.ts
rename to packages/core/src/awsexplorer/awsExplorer.ts
index 7b207137178..63707527173 100644
--- a/src/awsexplorer/awsExplorer.ts
+++ b/packages/core/src/awsexplorer/awsExplorer.ts
@@ -1,13 +1,13 @@
 /*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as vscode from 'vscode'
-import { Auth, AuthNode, useIamCredentials } from '../credentials/auth'
+import { Auth } from '../auth/auth'
 import { getIdeProperties } from '../shared/extensionUtilities'
 import { getIcon } from '../shared/icons'
-import { getLogger, Logger } from '../shared/logger'
+import { getLogger, Logger } from '../shared/logger/logger'
 import { RegionProvider } from '../shared/regions/regionProvider'
 import { RefreshableAwsTreeProvider } from '../shared/treeview/awsTreeProvider'
 import { AWSCommandTreeNode } from '../shared/treeview/nodes/awsCommandTreeNode'
@@ -17,6 +17,8 @@ import { intersection, toMap, updateInPlace } from '../shared/utilities/collecti
 import { once } from '../shared/utilities/functionUtils'
 import { localize } from '../shared/utilities/vsCodeUtils'
 import { RegionNode } from './regionNode'
+import { AuthNode } from '../auth/utils'
+import { Commands } from '../shared/vscode/commands2'
 
 export class AwsExplorer implements vscode.TreeDataProvider<AWSTreeNodeBase>, RefreshableAwsTreeProvider {
     public viewProviderId: string = 'aws.explorer'
@@ -74,7 +76,7 @@ export class AwsExplorer implements vscode.TreeDataProvider<AWSTreeNodeBase>, Re
             }
         } catch (err) {
             const error = err as Error
-            this.logger.error(`Error getting children for node ${element?.label ?? 'Root Node'}: %s`, error)
+            this.logger.error(`Error getting children for node %O: %s`, element?.label ?? 'Root Node', error)
 
             childNodes.splice(
                 0,
@@ -105,12 +107,14 @@ export class AwsExplorer implements vscode.TreeDataProvider<AWSTreeNodeBase>, Re
         const conn = this.auth.activeConnection
         if (conn !== undefined && conn.type !== 'iam') {
             // TODO: this should show up as a child node?
-            const selectIamNode = useIamCredentials.build(this.auth).asTreeNode({
-                // label: `No IAM credentials linked to ${conn.label}`,
-                // iconPath: getIcon('vscode-circle-slash'),
-                label: 'Select IAM Credentials to View Resources',
-                iconPath: getIcon('vscode-sync'),
-            })
+            const selectIamNode = (await Commands.getOrThrow('_aws.toolkit.auth.useIamCredentials'))
+                .build(this.auth)
+                .asTreeNode({
+                    // label: `No IAM credentials linked to ${conn.label}`,
+                    // iconPath: getIcon('vscode-circle-slash'),
+                    label: 'Select IAM Credentials to View Resources',
+                    iconPath: getIcon('vscode-sync'),
+                })
 
             return [this.getAuthNode(), new TreeShim(selectIamNode)]
         } else if (conn === undefined || conn.state !== 'valid') {
@@ -119,13 +123,13 @@ export class AwsExplorer implements vscode.TreeDataProvider<AWSTreeNodeBase>, Re
 
         const partitionRegions = this.regionProvider.getRegions()
         const userVisibleRegionCodes = this.regionProvider.getExplorerRegions()
-        const regionMap = toMap(partitionRegions, r => r.id)
+        const regionMap = toMap(partitionRegions, (r) => r.id)
 
         updateInPlace(
             this.regionNodes,
             intersection(regionMap.keys(), userVisibleRegionCodes),
-            key => this.regionNodes.get(key)!.update(regionMap.get(key)!),
-            key => new RegionNode(regionMap.get(key)!, this.regionProvider)
+            (key) => this.regionNodes.get(key)!.update(regionMap.get(key)!),
+            (key) => new RegionNode(regionMap.get(key)!, this.regionProvider)
         )
 
         if (this.regionNodes.size === 0) {
diff --git a/src/awsexplorer/childNodeCache.ts b/packages/core/src/awsexplorer/childNodeCache.ts
similarity index 96%
rename from src/awsexplorer/childNodeCache.ts
rename to packages/core/src/awsexplorer/childNodeCache.ts
index 97aa8a2e09b..da4bbbd8519 100644
--- a/src/awsexplorer/childNodeCache.ts
+++ b/packages/core/src/awsexplorer/childNodeCache.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/src/awsexplorer/childNodeLoader.ts b/packages/core/src/awsexplorer/childNodeLoader.ts
similarity index 96%
rename from src/awsexplorer/childNodeLoader.ts
rename to packages/core/src/awsexplorer/childNodeLoader.ts
index 41c50f7e98d..bb3997a558b 100644
--- a/src/awsexplorer/childNodeLoader.ts
+++ b/packages/core/src/awsexplorer/childNodeLoader.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -7,7 +7,7 @@ import { AWSTreeNodeBase } from '../shared/treeview/nodes/awsTreeNodeBase'
 import { LoadMoreNode } from '../shared/treeview/nodes/loadMoreNode'
 import { MoreResultsNode } from './moreResultsNode'
 import { ChildNodeCache } from './childNodeCache'
-import * as AsyncLock from 'async-lock'
+import AsyncLock from 'async-lock'
 
 const lockKey = 'ChildNodeLoader'
 
diff --git a/packages/core/src/awsexplorer/commands/copyText.ts b/packages/core/src/awsexplorer/commands/copyText.ts
new file mode 100644
index 00000000000..4fbb0244bb8
--- /dev/null
+++ b/packages/core/src/awsexplorer/commands/copyText.ts
@@ -0,0 +1,28 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { copyToClipboard } from '../../shared/utilities/messages'
+import { AWSResourceNode } from '../../shared/treeview/nodes/awsResourceNode'
+import { TreeShim } from '../../shared/treeview/utils'
+
+export type copyableText = 'ARN' | 'name' | 'id'
+
+export async function copyTextCommand(
+    node: AWSResourceNode | TreeShim<AWSResourceNode>,
+    text: copyableText
+): Promise<void> {
+    node = node instanceof TreeShim ? node.node.resource : node
+    switch (text) {
+        case 'ARN':
+            await copyToClipboard(node.arn, text)
+            break
+        case 'name':
+            await copyToClipboard(node.name, text)
+            break
+        case 'id':
+            await copyToClipboard(node.id!, text)
+            break
+    }
+}
diff --git a/src/awsexplorer/commands/loadMoreChildren.ts b/packages/core/src/awsexplorer/commands/loadMoreChildren.ts
similarity index 91%
rename from src/awsexplorer/commands/loadMoreChildren.ts
rename to packages/core/src/awsexplorer/commands/loadMoreChildren.ts
index fe98777401b..6bc37b770e2 100644
--- a/src/awsexplorer/commands/loadMoreChildren.ts
+++ b/packages/core/src/awsexplorer/commands/loadMoreChildren.ts
@@ -1,10 +1,10 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import { localize } from '../../shared/utilities/vsCodeUtils'
-import { getLogger } from '../../shared/logger'
+import { getLogger } from '../../shared/logger/logger'
 import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
 import { LoadMoreNode } from '../../shared/treeview/nodes/loadMoreNode'
 import { AwsExplorer } from '../awsExplorer'
diff --git a/packages/core/src/awsexplorer/defaultRegion.ts b/packages/core/src/awsexplorer/defaultRegion.ts
new file mode 100644
index 00000000000..be28e4ec6d6
--- /dev/null
+++ b/packages/core/src/awsexplorer/defaultRegion.ts
@@ -0,0 +1,22 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { AwsExplorer } from './awsExplorer'
+import { RegionProvider } from '../shared/regions/regionProvider'
+
+export async function checkExplorerForDefaultRegion(
+    regionProvider: RegionProvider,
+    awsExplorer: AwsExplorer
+): Promise<void> {
+    const profileRegion = regionProvider.defaultRegionId
+
+    const explorerRegions = new Set(regionProvider.getExplorerRegions())
+    if (explorerRegions.has(profileRegion)) {
+        return
+    }
+
+    await regionProvider.updateExplorerRegions([...explorerRegions, profileRegion])
+    awsExplorer.refresh()
+}
diff --git a/src/awsexplorer/moreResultsNode.ts b/packages/core/src/awsexplorer/moreResultsNode.ts
similarity index 93%
rename from src/awsexplorer/moreResultsNode.ts
rename to packages/core/src/awsexplorer/moreResultsNode.ts
index a533e8cc02a..de09541aed7 100644
--- a/src/awsexplorer/moreResultsNode.ts
+++ b/packages/core/src/awsexplorer/moreResultsNode.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/packages/core/src/awsexplorer/regionNode.ts b/packages/core/src/awsexplorer/regionNode.ts
new file mode 100644
index 00000000000..d78bcbec2a4
--- /dev/null
+++ b/packages/core/src/awsexplorer/regionNode.ts
@@ -0,0 +1,182 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { TreeItemCollapsibleState } from 'vscode'
+import { ApiGatewayNode } from '../awsService/apigateway/explorer/apiGatewayNodes'
+import { SchemasNode } from '../eventSchemas/explorer/schemasNode'
+import { CloudFormationNode } from '../lambda/explorer/cloudFormationNodes'
+import { CloudWatchLogsNode } from '../awsService/cloudWatchLogs/explorer/cloudWatchLogsNode'
+import { LambdaNode } from '../lambda/explorer/lambdaNodes'
+import { S3Node } from '../awsService/s3/explorer/s3Nodes'
+import { EcrNode } from '../awsService/ecr/explorer/ecrNode'
+import { RedshiftNode } from '../awsService/redshift/explorer/redshiftNode'
+import { IotNode } from '../awsService/iot/explorer/iotNodes'
+import { Region } from '../shared/regions/endpoints'
+import { defaultPartition, RegionProvider } from '../shared/regions/regionProvider'
+import { AWSTreeNodeBase } from '../shared/treeview/nodes/awsTreeNodeBase'
+import { StepFunctionsNode } from '../stepFunctions/explorer/stepFunctionsNodes'
+import { SsmDocumentNode } from '../ssmDocument/explorer/ssmDocumentNode'
+import { ResourcesNode } from '../dynamicResources/explorer/nodes/resourcesNode'
+import { AppRunnerNode } from '../awsService/apprunner/explorer/apprunnerNode'
+import { DocumentDBNode } from '../docdb/explorer/docdbNode'
+import { DefaultDocumentDBClient } from '../shared/clients/docdbClient'
+import { AppRunnerClient } from '../shared/clients/apprunner'
+import { DefaultEcrClient } from '../shared/clients/ecrClient'
+import { DefaultRedshiftClient } from '../shared/clients/redshiftClient'
+import { DefaultIotClient } from '../shared/clients/iotClient'
+import { S3Client } from '../shared/clients/s3'
+import { DefaultSchemaClient } from '../shared/clients/schemaClient'
+import { getEcsRootNode } from '../awsService/ecs/model'
+import { compareTreeItems, TreeShim } from '../shared/treeview/utils'
+import { Ec2ParentNode } from '../awsService/ec2/explorer/ec2ParentNode'
+import { Ec2Client } from '../shared/clients/ec2'
+import { SagemakerParentNode } from '../awsService/sagemaker/explorer/sagemakerParentNode'
+import { SagemakerClient } from '../shared/clients/sagemaker'
+
+interface ServiceNode {
+    allRegions?: boolean
+    serviceId: string
+    /**
+     * Decides if the node should be shown. Example:
+     * ```
+     * when: () => DevSettings.instance.isDevMode()
+     * ```
+     */
+    when?: () => boolean
+    createFn: (regionCode: string, partitionId: string) => any
+}
+
+const serviceCandidates: ServiceNode[] = [
+    {
+        serviceId: 'apigateway',
+        createFn: (regionCode: string, partitionId: string) => new ApiGatewayNode(partitionId, regionCode),
+    },
+    {
+        serviceId: 'apprunner',
+        createFn: (regionCode: string) => new AppRunnerNode(regionCode, new AppRunnerClient(regionCode)),
+    },
+    {
+        serviceId: 'cloudformation',
+        createFn: (regionCode: string) => new CloudFormationNode(regionCode),
+    },
+    {
+        serviceId: 'docdb',
+        createFn: (regionCode: string) => new DocumentDBNode(DefaultDocumentDBClient.create(regionCode)),
+    },
+    {
+        serviceId: 'logs',
+        createFn: (regionCode: string) => new CloudWatchLogsNode(regionCode),
+    },
+    {
+        serviceId: 'ec2',
+        createFn: (regionCode: string, partitionId: string) =>
+            new Ec2ParentNode(regionCode, partitionId, new Ec2Client(regionCode)),
+    },
+    {
+        serviceId: 'ecr',
+        createFn: (regionCode: string) => new EcrNode(new DefaultEcrClient(regionCode)),
+    },
+    {
+        serviceId: 'redshift',
+        createFn: (regionCode: string) => new RedshiftNode(new DefaultRedshiftClient(regionCode)),
+    },
+    {
+        serviceId: 'ecs',
+        createFn: (regionCode: string) => new TreeShim(getEcsRootNode(regionCode)),
+    },
+    {
+        serviceId: 'iot',
+        createFn: (regionCode: string) => new IotNode(new DefaultIotClient(regionCode)),
+    },
+    {
+        serviceId: 'lambda',
+        createFn: (regionCode: string) => new LambdaNode(regionCode),
+    },
+    {
+        serviceId: 's3',
+        createFn: (regionCode: string) => new S3Node(new S3Client(regionCode)),
+    },
+    {
+        serviceId: 'api.sagemaker',
+        createFn: (regionCode: string) => new SagemakerParentNode(regionCode, new SagemakerClient(regionCode)),
+    },
+    {
+        serviceId: 'schemas',
+        createFn: (regionCode: string) => new SchemasNode(new DefaultSchemaClient(regionCode)),
+    },
+    {
+        serviceId: 'states',
+        createFn: (regionCode: string) => new StepFunctionsNode(regionCode),
+    },
+    {
+        serviceId: 'ssm',
+        createFn: (regionCode: string) => new SsmDocumentNode(regionCode),
+    },
+    {
+        allRegions: true,
+        serviceId: 'cloudcontrol',
+        createFn: (regionCode: string) => new ResourcesNode(regionCode),
+    },
+]
+
+/**
+ * An AWS Explorer node representing a region.
+ * Contains resource types as child nodes (for example, nodes representing
+ * an account's Lambda Functions and CloudFormation stacks for this region)
+ */
+export class RegionNode extends AWSTreeNodeBase {
+    private region: Region
+    public override readonly regionCode: string
+
+    public get regionName(): string {
+        return this.region.name
+    }
+
+    public constructor(
+        region: Region,
+        private readonly regionProvider: RegionProvider
+    ) {
+        super(region.name, TreeItemCollapsibleState.Expanded)
+        this.contextValue = 'awsRegionNode'
+        this.region = region
+        this.regionCode = region.id
+        this.update(region)
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        //  Services that are candidates to add to the region explorer.
+        //  `serviceId`s are checked against ~/resources/endpoints.json to see whether or not the service is available in the given region.
+        //  If the service is available, we use the `createFn` to generate the node for the region.
+        //  This interface exists so we can add additional nodes to the array (otherwise Typescript types the array to what's already in the array at creation)
+        const partitionId = this.regionProvider.getPartitionId(this.regionCode) ?? defaultPartition
+        const childNodes: AWSTreeNodeBase[] = []
+        for (const service of serviceCandidates) {
+            if (service.when !== undefined && !service.when()) {
+                continue
+            }
+            if (service.allRegions || this.regionProvider.isServiceInRegion(service.serviceId, this.regionCode)) {
+                const node = service.createFn(this.regionCode, partitionId)
+                if (node !== undefined) {
+                    node.serviceId = service.serviceId
+                    childNodes.push(node)
+                }
+            }
+        }
+
+        return this.sortNodes(childNodes)
+    }
+
+    private sortNodes(nodes: AWSTreeNodeBase[]) {
+        return nodes.sort((a, b) => {
+            // Always sort `ResourcesNode` at the bottom
+            return a instanceof ResourcesNode ? 1 : b instanceof ResourcesNode ? -1 : compareTreeItems(a, b)
+        })
+    }
+    public update(region: Region): void {
+        this.region = region
+        this.label = this.regionName
+        this.tooltip = `${this.regionName} [${this.regionCode}]`
+    }
+}
diff --git a/packages/core/src/awsexplorer/toolView.ts b/packages/core/src/awsexplorer/toolView.ts
new file mode 100644
index 00000000000..99d20fbdb3a
--- /dev/null
+++ b/packages/core/src/awsexplorer/toolView.ts
@@ -0,0 +1,41 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { ResourceTreeDataProvider, TreeNode } from '../shared/treeview/resourceTreeDataProvider'
+
+export interface ToolView {
+    nodes: TreeNode[]
+    view: string
+    refreshCommands: ((provider: ResourceTreeDataProvider) => void)[]
+}
+
+/**
+ * The 'local' explorer is represented as 'Developer Tools' in the UI. We use a different name within
+ * source code to differentiate between _Toolkit developers_ and _Toolkit users_.
+ *
+ * Components placed under this view do not strictly need to be 'local'. They just need to place greater
+ * emphasis on the developer's local development environment.
+ */
+export function createToolView(viewNode: ToolView): vscode.TreeView<TreeNode> {
+    const treeDataProvider = new ResourceTreeDataProvider({ getChildren: () => getChildren(viewNode.nodes) })
+    for (const refreshCommand of viewNode.refreshCommands ?? []) {
+        refreshCommand(treeDataProvider)
+    }
+
+    return vscode.window.createTreeView(viewNode.view, { treeDataProvider })
+}
+
+async function getChildren(roots: TreeNode[]) {
+    const nodes: TreeNode[] = []
+
+    for (const node of roots) {
+        if (node.getChildren) {
+            nodes.push(...(await node.getChildren()))
+        }
+    }
+
+    return nodes
+}
diff --git a/packages/core/src/codecatalyst/activation.ts b/packages/core/src/codecatalyst/activation.ts
new file mode 100644
index 00000000000..db5ff9e12f0
--- /dev/null
+++ b/packages/core/src/codecatalyst/activation.ts
@@ -0,0 +1,179 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as uriHandlers from './uriHandlers'
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+import { ExtContext } from '../shared/extensions'
+import { CodeCatalystRemoteSourceProvider } from './repos/remoteSourceProvider'
+import { CodeCatalystCommands, codecatalystConnectionsCmd } from './commands'
+import { GitExtension } from '../shared/extensions/git'
+import { CodeCatalystAuthenticationProvider } from './auth'
+import { registerDevfileWatcher, updateDevfileCommand } from './devfile'
+import { DevEnvClient } from '../shared/clients/devenvClient'
+import { watchRestartingDevEnvs } from './reconnect'
+import { ToolkitPromptSettings } from '../shared/settings'
+import { dontShow } from '../shared/localizedText'
+import { getIdeProperties } from '../shared/extensionUtilities'
+import { Commands } from '../shared/vscode/commands2'
+import { getCodeCatalystConfig } from '../shared/clients/codecatalystClient'
+import { isDevenvVscode } from './utils'
+import { codeCatalystConnectCommand, getThisDevEnv } from './model'
+import { getLogger } from '../shared/logger/logger'
+import { DevEnvActivityStarter } from './devEnv'
+import { learnMoreCommand, onboardCommand, reauth } from './explorer'
+import { isInDevEnv } from '../shared/vscode/env'
+import { hasScopes, scopesCodeWhispererCore, getTelemetryMetadataForConn } from '../auth/connection'
+import { telemetry } from '../shared/telemetry/telemetry'
+import { asStringifiedStack } from '../shared/telemetry/spans'
+
+const localize = nls.loadMessageBundle()
+
+/**
+ * Activate CodeCatalyst functionality.
+ */
+export async function activate(ctx: ExtContext): Promise<void> {
+    const authProvider = CodeCatalystAuthenticationProvider.fromContext(ctx.extensionContext)
+    const commands = new CodeCatalystCommands(authProvider)
+    const remoteSourceProvider = new CodeCatalystRemoteSourceProvider(commands, authProvider)
+
+    codeCatalystConnectCommand.register()
+    reauth.register()
+    onboardCommand.register()
+    updateDevfileCommand.register()
+    learnMoreCommand.register()
+
+    await authProvider.restore()
+
+    // Forget Amazon Q connections while we transition to separate auth sessions per extension.
+    // Note: credentials on disk in the dev env cannot have Q scopes, so it will never be forgotten.
+    // TODO: Remove after some time?
+    if (authProvider.isConnected() && hasScopes(authProvider.activeConnection!, scopesCodeWhispererCore)) {
+        await telemetry.function_call.run(
+            async () => {
+                await telemetry.auth_modifyConnection.run(async () => {
+                    const conn = authProvider.activeConnection
+                    telemetry.record({
+                        action: 'forget',
+                        source: asStringifiedStack(telemetry.getFunctionStack()),
+                        connectionState: conn ? authProvider.auth.getConnectionState(conn) : undefined,
+                        ...(await getTelemetryMetadataForConn(conn)),
+                    })
+
+                    await authProvider.secondaryAuth.forgetConnection()
+                })
+            },
+            { emit: false, functionId: { name: 'activate', class: 'CodeCatalyst' } }
+        )
+    }
+
+    ctx.extensionContext.subscriptions.push(
+        uriHandlers.register(ctx.uriHandler, CodeCatalystCommands.declared),
+        ...Object.values(CodeCatalystCommands.declared).map((c) => c.register(commands)),
+        codecatalystConnectionsCmd.register(),
+        Commands.register('aws.codecatalyst.signout', () => {
+            return authProvider.secondaryAuth.deleteConnection()
+        })
+    )
+
+    await GitExtension.instance.registerRemoteSourceProvider(remoteSourceProvider).then((disposable) => {
+        ctx.extensionContext.subscriptions.push(disposable)
+    })
+
+    await GitExtension.instance
+        .registerCredentialsProvider({
+            getCredentials(uri: vscode.Uri) {
+                if (uri.authority.endsWith(getCodeCatalystConfig().gitHostname)) {
+                    return commands.withClient((client) => authProvider.getCredentialsForGit(client))
+                }
+            },
+        })
+        .then((disposable) => ctx.extensionContext.subscriptions.push(disposable))
+
+    watchRestartingDevEnvs(ctx, authProvider)
+
+    const thisDevenv = (await getThisDevEnv(authProvider))?.unwrapOrElse((err) => {
+        getLogger().error('codecatalyst: failed to get current Dev Enviroment: %s', err)
+        return undefined
+    })
+
+    if (!thisDevenv) {
+        if (isInDevEnv()) {
+            getLogger().info('codecatalyst: Dev Environment timeout=unknown')
+        } else {
+            getLogger().verbose('codecatalyst: not a Dev Environment ($__DEV_ENVIRONMENT_ID is undefined)')
+        }
+    } else {
+        ctx.extensionContext.subscriptions.push(DevEnvClient.instance)
+        if (DevEnvClient.instance.id) {
+            ctx.extensionContext.subscriptions.push(registerDevfileWatcher(DevEnvClient.instance))
+        }
+
+        const timeoutMin = thisDevenv.summary.inactivityTimeoutMinutes
+        const timeout = timeoutMin === 0 ? 'never' : `${timeoutMin} min`
+        getLogger().info('codecatalyst: Dev Environment timeout=%s, ides=%O', timeout, thisDevenv.summary.ides)
+        if (thisDevenv && !isDevenvVscode(thisDevenv.summary.ides)) {
+            // Prevent Toolkit from reconnecting to a "non-vscode" devenv by actively closing it.
+            // Can happen if devenv is switched to ides="cloud9", etc.
+            // TODO: Is this needed without cloud9 check?
+            void vscode.commands.executeCommand('workbench.action.remote.close')
+            return
+        }
+
+        await showReadmeFileOnFirstLoad(ctx.extensionContext.workspaceState)
+
+        const settings = ToolkitPromptSettings.instance
+        if (settings.isPromptEnabled('remoteConnected')) {
+            const message = localize(
+                'AWS.codecatalyst.connectedMessage',
+                'Welcome to your Amazon CodeCatalyst Dev Environment. For more options and information, view Dev Environment settings ({0} Extension > CodeCatalyst).',
+                getIdeProperties().company
+            )
+            const openDevEnvSettings = localize('AWS.codecatalyst.openDevEnvSettings', 'Open Dev Environment Settings')
+            void vscode.window.showInformationMessage(message, dontShow, openDevEnvSettings).then(async (selection) => {
+                if (selection === dontShow) {
+                    await settings.disablePrompt('remoteConnected')
+                } else if (selection === openDevEnvSettings) {
+                    await CodeCatalystCommands.declared.openDevEnvSettings.execute()
+                }
+            })
+        }
+    }
+
+    // This must always be called on activation
+    DevEnvActivityStarter.init(authProvider)
+}
+
+async function showReadmeFileOnFirstLoad(workspaceState: vscode.ExtensionContext['workspaceState']): Promise<void> {
+    getLogger().debug('codecatalyst: showReadmeFileOnFirstLoad()')
+    // Check dev env state to see if this is the first time the user has connected to a dev env
+    const isFirstLoad = workspaceState.get('aws.codecatalyst.devEnv.isFirstLoad', true)
+
+    if (!isFirstLoad) {
+        getLogger().info('codecatalyst: is not first load, skipping showing README.md')
+        return
+    }
+
+    // Determine expected readme file location
+    const readmePath = `README.md`
+
+    // Find readme file in workspace
+    const readmeUri = await vscode.workspace.findFiles(readmePath).then((files) => {
+        if (files.length === 0) {
+            return undefined
+        }
+        return files[0]
+    })
+
+    if (readmeUri === undefined) {
+        getLogger().debug(`codecatalyst: README.md not found in path '${readmePath}'`)
+        return
+    }
+
+    // Show rendered readme file to user
+    await vscode.commands.executeCommand('markdown.showPreview', readmeUri)
+
+    await workspaceState.update('aws.codecatalyst.devEnv.isFirstLoad', false)
+}
diff --git a/packages/core/src/codecatalyst/auth.ts b/packages/core/src/codecatalyst/auth.ts
new file mode 100644
index 00000000000..f1d3ea82954
--- /dev/null
+++ b/packages/core/src/codecatalyst/auth.ts
@@ -0,0 +1,430 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { onAccessDeniedException, CodeCatalystClient, createClient } from '../shared/clients/codecatalystClient'
+import { Auth } from '../auth/auth'
+import * as localizedText from '../shared/localizedText'
+import { getSecondaryAuth, setScopes } from '../auth/secondaryAuth'
+import { getLogger } from '../shared/logger/logger'
+import globals from '../shared/extensionGlobals'
+import { ToolkitError, isAwsError } from '../shared/errors'
+import { MetricName, MetricShapes, telemetry } from '../shared/telemetry/telemetry'
+import { openUrl } from '../shared/utilities/vsCodeUtils'
+import {
+    scopesSsoAccountAccess,
+    scopesCodeCatalyst,
+    SsoConnection,
+    Connection,
+    isBuilderIdConnection,
+    isSsoConnection,
+    createSsoProfile,
+    isValidCodeCatalystConnection,
+    isIdcSsoConnection,
+    hasExactScopes,
+} from '../auth/connection'
+import { createBuilderIdConnection } from '../auth/utils'
+import { showReauthenticateMessage } from '../shared/utilities/messages'
+import { ToolkitPromptSettings } from '../shared/settings'
+import { setContext } from '../shared/vscode/setContext'
+import { withTelemetryContext } from '../shared/telemetry/util'
+import { builderIdStartUrl } from '../auth/sso/constants'
+
+// Secrets stored on the macOS keychain appear as individual entries for each key
+// This is fine so long as the user has only a few accounts. Otherwise this should
+// store secrets as a map.
+export class CodeCatalystAuthStorage {
+    public constructor(private readonly secrets: vscode.SecretStorage) {}
+
+    public async getPat(username: string): Promise<string | undefined> {
+        return this.secrets.get(`codecatalyst.pat.${username}`)
+    }
+
+    public async storePat(username: string, pat: string): Promise<void> {
+        await this.secrets.store(`codecatalyst.pat.${username}`, pat)
+    }
+}
+
+export const onboardingUrl = vscode.Uri.parse('https://codecatalyst.aws/onboarding/view')
+
+/**
+ * AWS account scopes are intended to be included. Some codepaths that use defaultScopes may depend on these scopes.
+ */
+export const defaultScopes = [...scopesSsoAccountAccess, ...scopesCodeCatalyst]
+
+export const isUpgradeableConnection = (conn: Connection): conn is SsoConnection =>
+    isSsoConnection(conn) && !isValidCodeCatalystConnection(conn)
+
+export function setCodeCatalystConnectedContext(isConnected: boolean) {
+    return setContext('aws.codecatalyst.connected', isConnected)
+}
+
+type ConnectionState = {
+    onboarded: boolean
+    scopeExpired: boolean
+}
+
+const authClassName = 'AuthCodeCatalyst'
+
+export class CodeCatalystAuthenticationProvider {
+    public readonly onDidChangeActiveConnection = this.secondaryAuth.onDidChangeActiveConnection
+    public readonly onAccessDeniedException = onAccessDeniedException
+    private readonly onDidChangeEmitter = new vscode.EventEmitter<void>()
+    public readonly onDidChange = this.onDidChangeEmitter.event
+
+    public constructor(
+        protected readonly storage: CodeCatalystAuthStorage,
+        public readonly auth = Auth.instance,
+        public readonly secondaryAuth = getSecondaryAuth(
+            auth,
+            'codecatalyst',
+            'CodeCatalyst',
+            isValidCodeCatalystConnection
+        )
+    ) {
+        this.onDidChangeActiveConnection(async () => {
+            if (this.activeConnection) {
+                await this.setScopeExpired(this.activeConnection, false)
+            }
+            await setCodeCatalystConnectedContext(this.isConnectionValid())
+            this.onDidChangeEmitter.fire()
+        })
+
+        this.onAccessDeniedException(async (showReauthPrompt: boolean) => {
+            await this.accessDeniedExceptionHandler(showReauthPrompt)
+            this.onDidChangeEmitter.fire()
+        })
+
+        // set initial context in case event does not trigger
+        void setCodeCatalystConnectedContext(this.isConnectionValid())
+    }
+
+    public get activeConnection() {
+        return this.secondaryAuth.activeConnection
+    }
+
+    public get isUsingSavedConnection() {
+        return this.secondaryAuth.hasSavedConnection
+    }
+
+    public async setScopeExpired(conn: SsoConnection, isExpired: boolean) {
+        await this.updateConnectionState(conn, { scopeExpired: isExpired })
+    }
+
+    public isScopeExpired(conn: SsoConnection): boolean {
+        return this.getConnectionState(conn).scopeExpired
+    }
+
+    public isConnectionValid(): boolean {
+        return (
+            this.activeConnection !== undefined &&
+            !this.secondaryAuth.isConnectionExpired &&
+            !this.isScopeExpired(this.activeConnection)
+        )
+    }
+
+    // Get rid of this? Not sure where to put PAT code.
+    public async getPat(client: CodeCatalystClient, username = client.identity.name): Promise<string> {
+        const stored = await this.storage.getPat(username)
+
+        if (stored) {
+            return stored
+        }
+
+        const resp = await client.createAccessToken({ name: 'aws-toolkits-vscode-token' })
+        await this.storage.storePat(username, resp.secret)
+
+        return resp.secret
+    }
+
+    public async getCredentialsForGit(client: CodeCatalystClient) {
+        getLogger().verbose(`codecatalyst (git): attempting to provide credentials`)
+
+        const username = client.identity.name
+
+        try {
+            return {
+                username,
+                password: await this.getPat(client, username),
+            }
+        } catch (err) {
+            getLogger().verbose(`codecatalyst (git): failed to get credentials for user "${username}": %s`, err)
+        }
+    }
+
+    public async restore() {
+        await this.secondaryAuth.restoreConnection()
+    }
+
+    private async accessDeniedExceptionHandler(showReauthPrompt: boolean = true) {
+        if (!this.isConnectionValid()) {
+            return
+        }
+
+        await this.setScopeExpired(this.activeConnection!, true)
+        await setCodeCatalystConnectedContext(this.isConnectionValid())
+
+        // showReauthPrompt is true primarily when a user interaction triggered the ADE
+        if (showReauthPrompt) {
+            void this.showReauthenticationPrompt(this.activeConnection!)
+        }
+    }
+
+    public async showReauthenticationPrompt(conn: SsoConnection): Promise<void> {
+        await showReauthenticateMessage({
+            message: localizedText.connectionExpired('CodeCatalyst'),
+            connect: localizedText.connect,
+            suppressId: 'codeCatalystConnectionExpired',
+            settings: ToolkitPromptSettings.instance,
+            reauthFunc: async () => {
+                await this.reauthenticate(conn)
+            },
+        })
+    }
+
+    public async promptOnboarding(): Promise<void> {
+        const message = `Using CodeCatalyst requires onboarding with a Space. Sign up with CodeCatalyst to get started.`
+        const openBrowser = 'Open Browser'
+        const resp = await vscode.window.showInformationMessage(message, { modal: true }, openBrowser)
+        if (resp === openBrowser) {
+            await openUrl(onboardingUrl)
+        }
+
+        // Mark the current execution as cancelled regardless of the user response. We could poll here instead, waiting
+        // for the user to onboard. But that might take a while.
+        throw new ToolkitError('Not onboarded with CodeCatalyst', { code: 'NotOnboarded', cancelled: true })
+    }
+
+    /**
+     * Return a Builder ID connection that works with CodeCatalyst.
+     *
+     * This cannot create a Builder ID, but will return an existing Builder ID,
+     * upgrading the scopes if necessary.
+     */
+    public async tryGetBuilderIdConnection(): Promise<SsoConnection> {
+        if (this.activeConnection && isBuilderIdConnection(this.activeConnection)) {
+            return this.activeConnection
+        }
+
+        type ConnectionFlowEvent = Partial<MetricShapes[MetricName]> & {
+            readonly codecatalyst_connectionFlow: 'Create' | 'Switch' | 'Upgrade' // eslint-disable-line @typescript-eslint/naming-convention
+        }
+
+        const existingBuilderId = (await this.auth.listConnections()).find(isBuilderIdConnection)
+        if (isValidCodeCatalystConnection(existingBuilderId)) {
+            // A Builder ID with the correct scopes already exists so we can use this immediately
+            await this.secondaryAuth.useNewConnection(existingBuilderId)
+            return this.activeConnection!
+        }
+
+        const conn = (await this.auth.listConnections()).find(isBuilderIdConnection)
+
+        if (conn === undefined) {
+            telemetry.record({
+                codecatalyst_connectionFlow: 'Create',
+            } satisfies ConnectionFlowEvent as MetricShapes[MetricName])
+
+            const newConn = await createBuilderIdConnection(this.auth, defaultScopes)
+            if (this.auth.activeConnection?.id !== newConn.id) {
+                await this.secondaryAuth.useNewConnection(newConn)
+            }
+
+            return newConn
+        }
+
+        const upgrade = async () => {
+            telemetry.record({
+                codecatalyst_connectionFlow: 'Upgrade',
+            } satisfies ConnectionFlowEvent as MetricShapes[MetricName])
+
+            return this.secondaryAuth.addScopes(conn, defaultScopes)
+        }
+
+        if (this.auth.activeConnection?.id !== conn.id) {
+            telemetry.record({
+                codecatalyst_connectionFlow: 'Switch',
+            } satisfies ConnectionFlowEvent as MetricShapes[MetricName])
+
+            if (isUpgradeableConnection(conn)) {
+                await upgrade()
+            }
+
+            return (await this.secondaryAuth.useNewConnection(conn)) as SsoConnection
+        }
+
+        if (isUpgradeableConnection(conn)) {
+            return upgrade()
+        }
+
+        throw new ToolkitError('Not connected to CodeCatalyst', { code: 'NoConnectionBadState' })
+    }
+
+    public isConnected(): boolean {
+        return this.activeConnection !== undefined
+    }
+
+    public isBuilderIdInUse(): boolean {
+        return this.isConnected() && isBuilderIdConnection(this.activeConnection)
+    }
+
+    public isEnterpriseSsoInUse(): boolean {
+        return this.isConnected() && isIdcSsoConnection(this.activeConnection)
+    }
+
+    @withTelemetryContext({ name: 'connectToAwsBuilderId', class: authClassName })
+    public async connectToAwsBuilderId(): Promise<SsoConnection> {
+        let conn: SsoConnection
+        let isConnectionOnboarded: boolean
+
+        try {
+            conn = await this.tryGetBuilderIdConnection()
+
+            if (this.auth.getConnectionState(conn) === 'invalid') {
+                conn = await this.reauthenticate(conn)
+            }
+
+            isConnectionOnboarded = await this.isConnectionOnboarded(conn, true)
+        } catch (e) {
+            throw ToolkitError.chain(e, 'Failed to connect to Builder ID', {
+                code: 'FailedToConnect',
+            })
+        }
+
+        if (!isConnectionOnboarded) {
+            await this.promptOnboarding()
+        }
+
+        return (await this.secondaryAuth.useNewConnection(conn)) as SsoConnection
+    }
+
+    @withTelemetryContext({ name: 'connectToEnterpriseSso', class: authClassName })
+    public async connectToEnterpriseSso(startUrl: string, region: string): Promise<SsoConnection> {
+        let conn: SsoConnection | undefined
+        let isConnectionOnboarded: boolean
+
+        try {
+            conn = (await this.auth.listConnections()).find(
+                (c): c is SsoConnection => isSsoConnection(c) && c.startUrl.toLowerCase() === startUrl.toLowerCase()
+            )
+
+            if (!conn) {
+                conn = await this.auth.createConnection(createSsoProfile(startUrl, region, defaultScopes))
+            } else if (!isValidCodeCatalystConnection(conn)) {
+                conn = await this.secondaryAuth.addScopes(conn, defaultScopes)
+            }
+
+            if (this.auth.getConnectionState(conn) === 'invalid') {
+                conn = await this.reauthenticate(conn)
+            }
+
+            isConnectionOnboarded = await this.isConnectionOnboarded(conn, true)
+        } catch (e) {
+            throw ToolkitError.chain(e, 'Failed to connect to IAM Identity Center', {
+                code: 'FailedToConnect',
+            })
+        }
+
+        if (!isConnectionOnboarded) {
+            await this.promptOnboarding()
+        }
+
+        return (await this.secondaryAuth.useNewConnection(conn)) as SsoConnection
+    }
+
+    /**
+     * Try to ensure a specific connection is active.
+     */
+    @withTelemetryContext({ name: 'tryConnectTo', class: authClassName })
+    public async tryConnectTo(connection: { startUrl: string; region: string }) {
+        if (!this.isConnectionValid() || connection.startUrl !== this.activeConnection!.startUrl) {
+            if (connection.startUrl === builderIdStartUrl) {
+                await this.connectToAwsBuilderId()
+            } else {
+                await this.connectToEnterpriseSso(connection.startUrl, connection.region)
+            }
+        }
+    }
+
+    @withTelemetryContext({ name: 'reauthenticate', class: authClassName })
+    public async reauthenticate(conn: SsoConnection) {
+        try {
+            let connToReauth = conn
+            // Sanity check - connections with other scopes should have been forced out at this point.
+            if (!hasExactScopes(conn, defaultScopes)) {
+                const newConn = await setScopes(conn, defaultScopes)
+                connToReauth = await this.secondaryAuth.useNewConnection(newConn)
+            }
+
+            return await this.auth.reauthenticate(connToReauth)
+        } catch (err) {
+            throw ToolkitError.chain(err, 'Unable to reauthenticate CodeCatalyst connection.')
+        }
+    }
+
+    private getStates(): Record<string, ConnectionState> {
+        return globals.globalState.tryGet<Record<string, ConnectionState>>('codecatalyst.connections', Object, {})
+    }
+
+    public tryGetConnectionState(conn: SsoConnection): ConnectionState | undefined {
+        return this.getStates()[conn.id]
+    }
+    public getConnectionState(conn: SsoConnection): ConnectionState {
+        return (
+            this.tryGetConnectionState(conn) ?? {
+                onboarded: false,
+                scopeExpired: false,
+            }
+        )
+    }
+
+    private async setConnectionState(conn: SsoConnection, state: ConnectionState) {
+        await globals.globalState.update('codecatalyst.connections', {
+            ...this.getStates(),
+            [conn.id]: state,
+        })
+    }
+
+    private async updateConnectionState(conn: SsoConnection, state: Partial<ConnectionState>) {
+        const initial = this.getConnectionState(conn)
+        await this.setConnectionState(conn, { ...initial, ...state })
+    }
+
+    public async isConnectionOnboarded(conn: SsoConnection, recheck = false) {
+        const state = this.tryGetConnectionState(conn)
+        if (state !== undefined && !recheck) {
+            return state.onboarded
+        }
+
+        try {
+            await createClient(conn)
+            await this.updateConnectionState(conn, { onboarded: true })
+
+            return true
+        } catch (e) {
+            if (isOnboardingException(e) && this.auth.getConnectionState(conn) === 'valid') {
+                await this.updateConnectionState(conn, { onboarded: false })
+
+                return false
+            }
+
+            throw e
+        }
+
+        function isOnboardingException(e: unknown) {
+            // `GetUserDetails` returns `AccessDeniedException` if the user has not onboarded
+            return isAwsError(e) && e.code === 'AccessDeniedException' && e.message.includes('GetUserDetails')
+        }
+    }
+
+    static #instance: CodeCatalystAuthenticationProvider | undefined
+
+    public static get instance(): CodeCatalystAuthenticationProvider | undefined {
+        return CodeCatalystAuthenticationProvider.#instance
+    }
+
+    public static fromContext(ctx: Pick<vscode.ExtensionContext, 'secrets'>) {
+        return (this.#instance ??= new this(new CodeCatalystAuthStorage(ctx.secrets)))
+    }
+}
diff --git a/packages/core/src/codecatalyst/commands.ts b/packages/core/src/codecatalyst/commands.ts
new file mode 100644
index 00000000000..509d9b40d01
--- /dev/null
+++ b/packages/core/src/codecatalyst/commands.ts
@@ -0,0 +1,371 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../shared/extensionGlobals'
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as vscode from 'vscode'
+import { selectCodeCatalystRepository, selectCodeCatalystResource } from './wizards/selectResource'
+import { openCodeCatalystUrl } from './utils'
+import { CodeCatalystAuthenticationProvider } from './auth'
+import { Commands, VsCodeCommandArg, placeholder } from '../shared/vscode/commands2'
+import { CodeCatalystClient, CodeCatalystResource, createClient } from '../shared/clients/codecatalystClient'
+import { DevEnvironmentId, getConnectedDevEnv, openDevEnv } from './model'
+import { showConfigureDevEnv } from './vue/configure/backend'
+import { showCreateDevEnv } from './vue/create/backend'
+import { CancellationError } from '../shared/utilities/timeoutUtils'
+import { ToolkitError, errorCode } from '../shared/errors'
+import { telemetry } from '../shared/telemetry/telemetry'
+import { showConfirmationMessage } from '../shared/utilities/messages'
+import { AccountStatus } from '../shared/telemetry/telemetryClient'
+import { SsoConnection } from '../auth/connection'
+import { isInDevEnv, isRemoteWorkspace } from '../shared/vscode/env'
+import { commandPalette } from '../codewhisperer/commands/types'
+import { CreateDevEnvironmentRequest, UpdateDevEnvironmentRequest } from '@aws-sdk/client-codecatalyst'
+
+/** "List CodeCatalyst Commands" command. */
+export async function listCommands(): Promise<void> {
+    await vscode.commands.executeCommand('workbench.action.quickOpen', '> CodeCatalyst')
+}
+
+/** "Clone CodeCatalyst Repository" command. */
+export async function cloneCodeCatalystRepo(client: CodeCatalystClient, url?: vscode.Uri): Promise<void> {
+    let resource: { name: string; project: string; org: string }
+    if (!url) {
+        const r = await selectCodeCatalystRepository(client, false)
+        if (!r) {
+            throw new CancellationError('user')
+        }
+        resource = { name: r.name, project: r.project.name, org: r.org.name }
+    } else {
+        const [_, org, project, repo] = url.path.slice(1).split('/')
+        if (!org || !project || !repo) {
+            throw new Error(`Invalid CodeCatalyst URL: unable to parse repository`)
+        }
+        resource = { name: repo, project, org }
+    }
+
+    const uri = await client.getRepoCloneUrl({
+        spaceName: resource.org,
+        projectName: resource.project,
+        sourceRepositoryName: resource.name,
+    })
+    await vscode.commands.executeCommand('git.clone', uri)
+}
+
+/**
+ * Implements commands:
+ * - "Open CodeCatalyst Space"
+ * - "Open CodeCatalyst Project"
+ * - "Open CodeCatalyst Repository"
+ */
+export async function openCodeCatalystResource(
+    client: CodeCatalystClient,
+    kind: CodeCatalystResource['type']
+): Promise<void> {
+    const resource = await selectCodeCatalystResource(client, kind)
+
+    if (!resource) {
+        throw new CancellationError('user')
+    }
+
+    openCodeCatalystUrl(resource)
+}
+
+export async function stopDevEnv(
+    client: CodeCatalystClient,
+    devenv: DevEnvironmentId,
+    opts?: { readonly showPrompt?: boolean }
+): Promise<void> {
+    if (opts?.showPrompt) {
+        const confirmed = await showConfirmationMessage({
+            prompt: localize(
+                'aws.codecatalyst.stopDevEnv.confirm',
+                'Stopping the Dev Environment will end all processes. Continue?'
+            ),
+        })
+
+        if (!confirmed) {
+            throw new CancellationError('user')
+        }
+    }
+
+    await client.stopDevEnvironment({
+        id: devenv.id,
+        projectName: devenv.project.name,
+        spaceName: devenv.org.name,
+    })
+}
+
+export async function deleteDevEnv(client: CodeCatalystClient, devenv: DevEnvironmentId): Promise<void> {
+    await client.deleteDevEnvironment({
+        id: devenv.id,
+        projectName: devenv.project.name,
+        spaceName: devenv.org.name,
+    })
+}
+
+export type DevEnvironmentSettings = Pick<
+    CreateDevEnvironmentRequest,
+    'alias' | 'instanceType' | 'inactivityTimeoutMinutes' | 'persistentStorage'
+>
+
+export type UpdateDevEnvironmentSettings = Pick<
+    UpdateDevEnvironmentRequest,
+    'alias' | 'instanceType' | 'inactivityTimeoutMinutes'
+>
+
+export async function updateDevEnv(
+    client: CodeCatalystClient,
+    devenv: DevEnvironmentId,
+    settings: UpdateDevEnvironmentSettings
+) {
+    return client.updateDevEnvironment({
+        ...settings,
+        id: devenv.id,
+        projectName: devenv.project.name,
+        spaceName: devenv.org.name,
+    })
+}
+
+function createClientInjector(authProvider: CodeCatalystAuthenticationProvider): ClientInjector {
+    return async (command, ...args) => {
+        telemetry.record({ userId: AccountStatus.NotSet })
+
+        await authProvider.restore()
+        const conn = authProvider.activeConnection
+        if (!conn) {
+            // TODO: In the future, it would be very nice to open a connection picker here.
+            throw new ToolkitError('Not connected to CodeCatalyst', { code: 'NoConnectionBadState' })
+        }
+        const validatedConn = await validateConnection(conn, authProvider)
+        const client = await createClient(validatedConn)
+        telemetry.record({ userId: client.identity.id })
+
+        return command(client, ...args)
+    }
+}
+
+/**
+ * Returns a connection that is ensured to be authenticated.
+ *
+ * Provides the user the ability to re-authenticate if needed,
+ * otherwise throwing an error.
+ */
+async function validateConnection(
+    conn: SsoConnection,
+    authProvider: CodeCatalystAuthenticationProvider
+): Promise<SsoConnection> {
+    if (authProvider.auth.getConnectionState(conn) === 'valid') {
+        return conn
+    }
+
+    // Have user try to log in
+    const loginMessage = localize('aws.auth.invalidConnection', 'Connection is invalid or expired, login again?')
+    const result = await vscode.window.showErrorMessage(loginMessage, 'Login')
+
+    if (result !== 'Login') {
+        throw new ToolkitError('User cancelled login.', { cancelled: true, code: errorCode.invalidConnection })
+    }
+
+    conn = await authProvider.reauthenticate(conn)
+
+    // Log in attempt failed
+    if (authProvider.auth.getConnectionState(conn) !== 'valid') {
+        throw new ToolkitError('Login failed.', { code: errorCode.invalidConnection })
+    }
+
+    return conn
+}
+
+function createCommandDecorator(commands: CodeCatalystCommands): CommandDecorator {
+    return (command) =>
+        (...args) =>
+            commands.withClient(command, ...args)
+}
+
+interface CodeCatalystCommand<T extends any[], U> {
+    (client: CodeCatalystClient, ...args: T): U | Promise<U>
+}
+
+interface ClientInjector {
+    <T extends any[], U>(command: CodeCatalystCommand<T, U>, ...args: T): Promise<U>
+}
+
+interface CommandDecorator {
+    <T extends any[], U>(command: CodeCatalystCommand<T, U>): (...args: T) => Promise<U>
+}
+
+type Inject<T, U> = T extends (...args: infer P) => infer R
+    ? P extends [U, ...infer L]
+        ? (...args: L) => R
+        : never
+    : never
+
+type WithClient<T> = Parameters<Inject<T, CodeCatalystClient>>
+
+class RemoteContextError extends ToolkitError {
+    constructor() {
+        super('Cannot connect from a remote context. Try again from a local VS Code instance.', {
+            code: 'ConnectedToRemote',
+        })
+    }
+}
+
+export const codecatalystConnectionsCmd = Commands.declare(
+    'aws.codecatalyst.manageConnections',
+    () => () =>
+        void vscode.commands.executeCommand(
+            'aws.toolkit.auth.manageConnections',
+            placeholder,
+            'codecatalystDeveloperTools',
+            'codecatalyst'
+        )
+)
+
+export class CodeCatalystCommands {
+    public readonly withClient: ClientInjector
+    public readonly bindClient = createCommandDecorator(this)
+
+    public constructor(private authProvider: CodeCatalystAuthenticationProvider) {
+        this.withClient = createClientInjector(authProvider)
+    }
+
+    public listCommands() {
+        return listCommands()
+    }
+
+    public cloneRepo(_?: VsCodeCommandArg, ...args: WithClient<typeof cloneCodeCatalystRepo>) {
+        return this.withClient(cloneCodeCatalystRepo, ...args)
+    }
+
+    public createDevEnv(_?: VsCodeCommandArg): Promise<void> {
+        if (isRemoteWorkspace() && isInDevEnv()) {
+            throw new RemoteContextError()
+        }
+        return this.withClient(showCreateDevEnv, globals.context, CodeCatalystCommands.declared)
+    }
+
+    public openResource(...args: WithClient<typeof openCodeCatalystResource>) {
+        return this.withClient(openCodeCatalystResource, ...args)
+    }
+
+    public stopDevEnv(...args: WithClient<typeof stopDevEnv>) {
+        return this.withClient(stopDevEnv, ...args).then(() => {
+            void vscode.commands.executeCommand('workbench.action.remote.close')
+        })
+    }
+
+    public deleteDevEnv(...args: WithClient<typeof deleteDevEnv>) {
+        return this.withClient(deleteDevEnv, ...args)
+    }
+
+    public updateDevEnv(...args: WithClient<typeof updateDevEnv>) {
+        telemetry.record({
+            codecatalyst_updateDevEnvironmentLocationType: 'remote',
+        })
+
+        return this.withClient(updateDevEnv, ...args)
+    }
+
+    public openSpace() {
+        return this.openResource('org')
+    }
+
+    public openProject() {
+        return this.openResource('project')
+    }
+
+    public openRepository() {
+        return this.openResource('repo')
+    }
+
+    public async openDevfile(uri: vscode.Uri) {
+        await vscode.window.showTextDocument(uri)
+    }
+
+    public async openDevEnv(
+        _?: VsCodeCommandArg,
+        id?: DevEnvironmentId,
+        targetPath?: string,
+        connection?: { startUrl: string; region: string }
+    ): Promise<void> {
+        if (isRemoteWorkspace() && isInDevEnv()) {
+            throw new RemoteContextError()
+        }
+
+        const devenv = id ?? (await this.selectDevEnv())
+
+        // TODO(sijaden): add named timestamp markers for granular duration info
+        //
+        // right now this command may prompt the user if they came from the explorer or command palette
+        // need to be careful of mapping explosion so this granular data would either need
+        // to be flattened or we restrict the names to a pre-determined set
+        if (id === undefined) {
+            telemetry.record({ source: commandPalette })
+        }
+
+        if (connection !== undefined) {
+            await this.authProvider.tryConnectTo(connection)
+        } else if (!this.authProvider.isConnectionValid()) {
+            void codecatalystConnectionsCmd.execute()
+            return
+        }
+
+        return this.withClient(openDevEnv, devenv, targetPath)
+    }
+
+    public async openDevEnvSettings(): Promise<void> {
+        const devenv = await this.withClient(getConnectedDevEnv)
+
+        return this.withClient(showConfigureDevEnv, globals.context, devenv, CodeCatalystCommands.declared)
+    }
+
+    private async selectDevEnv(): Promise<DevEnvironmentId> {
+        const devenv = await this.withClient(selectCodeCatalystResource, 'devEnvironment' as const)
+
+        if (!devenv) {
+            throw new CancellationError('user')
+        }
+
+        return devenv
+    }
+
+    public static fromContext(ctx: Pick<vscode.ExtensionContext, 'secrets'>) {
+        const auth = CodeCatalystAuthenticationProvider.fromContext(ctx)
+
+        return new this(auth)
+    }
+
+    public static readonly declared = {
+        openResource: Commands.from(this).declareOpenResource('aws.codecatalyst.openResource'),
+        listCommands: Commands.from(this).declareListCommands('aws.codecatalyst.listCommands'),
+        openSpace: Commands.from(this).declareOpenSpace('aws.codecatalyst.openOrg'),
+        openProject: Commands.from(this).declareOpenProject('aws.codecatalyst.openProject'),
+        openRepository: Commands.from(this).declareOpenRepository('aws.codecatalyst.openRepo'),
+        stopDevEnv: Commands.from(this).declareStopDevEnv('aws.codecatalyst.stopDevEnv'),
+        deleteDevEnv: Commands.from(this).declareDeleteDevEnv('aws.codecatalyst.deleteDevEnv'),
+        openDevEnvSettings: Commands.from(this).declareOpenDevEnvSettings('aws.codecatalyst.openDevEnvSettings'),
+        openDevfile: Commands.from(this).declareOpenDevfile('aws.codecatalyst.openDevfile'),
+        cloneRepo: Commands.from(this).declareCloneRepo({
+            id: 'aws.codecatalyst.cloneRepo',
+            telemetryName: 'codecatalyst_localClone',
+        }),
+        createDevEnv: Commands.from(this).declareCreateDevEnv({
+            id: 'aws.codecatalyst.createDevEnv',
+            telemetryName: 'codecatalyst_createDevEnvironment',
+        }),
+        updateDevEnv: Commands.from(this).declareUpdateDevEnv({
+            id: 'aws.codecatalyst.updateDevEnv',
+            telemetryName: 'codecatalyst_updateDevEnvironmentSettings',
+        }),
+        openDevEnv: Commands.from(this).declareOpenDevEnv({
+            id: 'aws.codecatalyst.openDevEnv',
+            telemetryName: 'codecatalyst_connect',
+        }),
+    } as const
+}
diff --git a/packages/core/src/codecatalyst/devEnv.ts b/packages/core/src/codecatalyst/devEnv.ts
new file mode 100644
index 00000000000..962c772eb2f
--- /dev/null
+++ b/packages/core/src/codecatalyst/devEnv.ts
@@ -0,0 +1,286 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { DevEnvironment } from '../shared/clients/codecatalystClient'
+import { DevEnvActivity, DevEnvClient } from '../shared/clients/devenvClient'
+import globals from '../shared/extensionGlobals'
+import * as vscode from 'vscode'
+import { waitUntil } from '../shared/utilities/timeoutUtils'
+import { getLogger } from '../shared/logger/logger'
+import { CodeCatalystAuthenticationProvider } from './auth'
+import { getThisDevEnv } from './model'
+import { isInDevEnv } from '../shared/vscode/env'
+import { shared } from '../shared/utilities/functionUtils'
+import { DevSettings } from '../shared/settings'
+
+/** Starts the {@link DevEnvActivity} Hearbeat mechanism. */
+export class DevEnvActivityStarter {
+    private static _instance: DevEnvActivityStarter | undefined = undefined
+
+    /**
+     * Trys to start the {@link DevEnvActivity} heartbeat.
+     * This mechanism keeps the Dev Env from timing out.
+     */
+    public static init(authProvider: CodeCatalystAuthenticationProvider) {
+        if (!isInDevEnv()) {
+            getLogger().debug('codecatalyst: not in a devenv, skipping DevEnvActivity setup')
+            return
+        }
+
+        DevEnvActivityStarter._instance ??= new DevEnvActivityStarter(authProvider)
+        DevEnvActivityStarter._instance.retryStartActivityHeartbeat().catch((e) => {
+            getLogger().error('retryStartActivityHeartbeat failed: %s', (e as Error).message)
+        })
+    }
+
+    private devEnvActivity: DevEnvActivity | undefined = undefined
+    private onDidChangeAuth: ReturnType<typeof this.authProvider.onDidChangeActiveConnection>
+
+    protected constructor(private readonly authProvider: CodeCatalystAuthenticationProvider) {
+        this.onDidChangeAuth = authProvider.onDidChangeActiveConnection(() => {
+            this.tryStartActivityHeartbeat(true).catch((e) => {
+                getLogger().error('tryStartActivityHeartbeat failed: %s', (e as Error).message)
+            })
+        })
+        globals.context.subscriptions.push(this.onDidChangeAuth)
+    }
+
+    /**
+     * Keeps executing {@link DevEnvActivityStarter.tryStartActivityHeartbeat} on an interval until it succeeds.
+     * After a certain amount of time this will stop retrying.
+     */
+    private async retryStartActivityHeartbeat() {
+        return waitUntil(
+            async () => {
+                await this.tryStartActivityHeartbeat(false)
+                return !!this.devEnvActivity
+            },
+            { interval: 20_000, timeout: 60_000 * 5 }
+        )
+    }
+
+    /** Trys to start the Activity Heartbeat mechanism */
+    private tryStartActivityHeartbeat = shared(async (reauth: boolean) => {
+        if (!!this.devEnvActivity && !reauth) {
+            return
+        }
+
+        const thisDevenv = (await getThisDevEnv(this.authProvider))?.unwrapOrElse((err) => {
+            getLogger().warn('codecatalyst: failed to get current devenv: %s', err)
+            return undefined
+        })
+
+        if (!thisDevenv && reauth) {
+            getLogger().warn('codecatalyst: failed to get devenv after reauthenticate attempt')
+            return
+        } else if (!thisDevenv) {
+            const connection = this.authProvider.activeConnection
+            if (connection) {
+                void vscode.window
+                    .showErrorMessage('CodeCatalyst: Reauthenticate your connection.', 'Reauthenticate')
+                    .then(async (res) => {
+                        if (res !== 'Reauthenticate') {
+                            return
+                        }
+                        await this.authProvider.reauthenticate(connection)
+                    })
+            }
+            getLogger().warn(
+                'codecatalyst: starting DevEnvActivity heartbeat without auth (unknown inactivityTimeoutMinutes)'
+            )
+        }
+
+        const devenvTimeoutMs = DevSettings.instance.get('devenvTimeoutMs', 0)
+        if (devenvTimeoutMs) {
+            getLogger().warn('codecatalyst: using devenvTimeoutMs=%d', devenvTimeoutMs)
+        }
+        // If user is not authenticated, assume 15 minutes.
+        const inactivityTimeoutMin =
+            devenvTimeoutMs > 0 ? devenvTimeoutMs / 60000 : (thisDevenv?.summary.inactivityTimeoutMinutes ?? 15)
+        if (!shouldSendActivity(inactivityTimeoutMin)) {
+            getLogger().info(
+                `codecatalyst: disabling DevEnvActivity heartbeat: configured to never timeout (inactivityTimeoutMinutes=${inactivityTimeoutMin})`
+            )
+            return
+        }
+
+        const devEnvActivity = await DevEnvActivity.create(thisDevenv?.devenvClient ?? DevEnvClient.instance)
+        if (!devEnvActivity) {
+            getLogger().error('codecatalyst: failed to start DevEnvActivity heartbeat, devenv may timeout')
+            return
+        }
+
+        if (this.devEnvActivity) {
+            // Special case: user authenticated, so reinitialize with the correct `inactivityTimeoutMinutes`.
+            this.devEnvActivity.dispose()
+        }
+
+        // Everything is good, we can start the activity heartbeat now
+        devEnvActivity.setUpdateActivityOnIdeActivity(true)
+
+        // Setup the "shutdown imminent" message. Skip this if we aren't authenticated, because we
+        // don't know the actual `inactivityTimeoutMinutes`.
+        if (thisDevenv) {
+            const inactivityMessage = new InactivityMessage()
+            await inactivityMessage.init(inactivityTimeoutMin, devEnvActivity)
+            globals.context.subscriptions.push(inactivityMessage)
+            this.onDidChangeAuth.dispose() // Don't need to wait for reauth now.
+            getLogger().debug('codecatalyst: setup InactivityMessage')
+        }
+
+        globals.context.subscriptions.push(devEnvActivity)
+        this.devEnvActivity = devEnvActivity
+    })
+}
+
+/**
+ * Should we send activity heartbeat?
+ *
+ * If inactivityTimeoutMinutes=0 then it never expires, so Toolkit doesn't need to send heartbeat.
+ */
+export function shouldSendActivity(inactivityTimeoutMin: DevEnvironment['inactivityTimeoutMinutes']): boolean {
+    // This value is initialized when the dev env is first created. If it is updated, MDE restarts
+    // the dev env and this extension will grab the new value on startup.
+    // https://docs.aws.amazon.com/codecatalyst/latest/APIReference/API_UpdateDevEnvironment.html#codecatalyst-UpdateDevEnvironment-request-inactivityTimeoutMinutes
+    return inactivityTimeoutMin > 0
+}
+
+/** Shows a "Dev env will shutdown in x minutes due to inactivity" warning. */
+export class InactivityMessage implements vscode.Disposable {
+    #showMessageTimer: NodeJS.Timeout | undefined
+    /** Show a message this many minutes before auto-shutdown. */
+    public readonly shutdownWarningThreshold = 5
+
+    /**
+     * Creates a timer which will show warning messsage(s) when the dev env is nearing auto-shutdown because of inactivity.
+     *
+     * @param maxInactivityMinutes Maximum inactivity allowed before auto-shutdown.
+     * @param devEnvActivity DevEnvActivity client
+     * @param oneMin Milliseconds in a "minute". Used in tests.
+     */
+    async init(
+        maxInactivityMinutes: DevEnvironment['inactivityTimeoutMinutes'],
+        devEnvActivity: DevEnvActivity,
+        oneMin: number = 60_000
+    ) {
+        // Send an initial update to the dev env on startup
+        await devEnvActivity.sendActivityUpdate()
+
+        // Reset (redefine) the timer whenever user is active.
+        devEnvActivity.onActivityUpdate(async (lastActivity) => {
+            this.clear()
+
+            const { millisToWait, minutesSinceActivity } = this.millisUntilNextWholeMinute(lastActivity, oneMin)
+            const minutesUntilShutdown = Math.round(maxInactivityMinutes - minutesSinceActivity)
+            const minutesUntilMessage = Math.round(Math.max(0, minutesUntilShutdown - this.shutdownWarningThreshold))
+            const timerInterval = millisToWait + minutesUntilMessage * oneMin
+
+            if (timerInterval <= 10 * oneMin || DevSettings.instance.get('devenvTimeoutMs', 0)) {
+                getLogger().debug(
+                    'InactivityMessage: minutesUntilMessage=%d timerInterval=%d',
+                    minutesUntilMessage,
+                    timerInterval
+                )
+            }
+
+            /** Wait until we are {@link InactivityMessage.shutdownWarningThreshold} minutes before shutdown. */
+            this.#showMessageTimer = globals.clock.setTimeout(() => {
+                const userIsActive = () => {
+                    devEnvActivity.sendActivityUpdate().catch((e) => {
+                        getLogger().error('DevEnvActivity.sendActivityUpdate failed: %s', (e as Error).message)
+                    })
+                }
+
+                const willRefreshOnStaleTimestamp = async () => await devEnvActivity.isLocalActivityStale()
+
+                this.clear()
+                this.show(
+                    Math.round(Math.max(0, minutesSinceActivity + minutesUntilMessage)),
+                    Math.round(Math.max(0, minutesUntilShutdown - minutesUntilMessage)),
+                    userIsActive,
+                    willRefreshOnStaleTimestamp
+                ).catch((e) => {
+                    getLogger().error('InactivityMessage.show failed: %s', (e as Error).message)
+                })
+            }, timerInterval)
+        })
+    }
+
+    /**
+     * The latest activity timestamp may not always be the current time, it may be from the past.
+     * So the amount of time that has passed since that timestamp may not be a whole minute.
+     *
+     * This returns the amount of time we need to wait until the next whole minute, along with how many
+     * minutes would have passed assuming the caller waitied until the next minute.
+     *
+     * Eg:
+     *   - 1 minute and 29 seconds have passed since the given timestamp.
+     *   - returns { millisToWait: 31_000, minutesSinceActivity: 2}
+     */
+    private millisUntilNextWholeMinute(
+        latestTimestamp: number,
+        oneMin: number
+    ): { millisToWait: number; minutesSinceActivity: number } {
+        const millisSinceLastActivity = Date.now() - latestTimestamp
+        const millisToNextMinute = millisSinceLastActivity % oneMin
+
+        const millisToWait = millisToNextMinute !== 0 ? oneMin - millisToNextMinute : 0
+        const minutesSinceActivity = (millisSinceLastActivity + millisToWait) / oneMin
+
+        return { millisToWait, minutesSinceActivity }
+    }
+
+    /**
+     * Show the warning message
+     *
+     * @param minutesUserWasInactive total minutes user was inactive.
+     * @param minutesUntilShutdown remaining minutes until shutdown.
+     * @param userIsActive Call this to signal that user is active.
+     * @param willRefreshOnStaleTimestamp sanity checks with the dev env api that the latest activity timestamp
+     *                                    is the same as what this client has locally. If stale, the warning message
+     *                                    will be refreshed asynchronously. Returns true if the message will be refreshed.
+     */
+    async show(
+        minutesUserWasInactive: number,
+        minutesUntilShutdown: number,
+        userIsActive: () => void,
+        willRefreshOnStaleTimestamp: () => Promise<boolean>
+    ) {
+        getLogger().debug(
+            'InactivityMessage.show: minutesUserWasInactive=%d minutesUntilShutdown=%d',
+            minutesUserWasInactive,
+            minutesUntilShutdown
+        )
+
+        if (await willRefreshOnStaleTimestamp()) {
+            return
+        }
+
+        const imHere = "I'm here!"
+        return vscode.window
+            .showWarningMessage(
+                `Your CodeCatalyst Dev Environment has been inactive for ${minutesUserWasInactive} minutes, and will stop soon.`,
+                { modal: true },
+                imHere
+            )
+            .then((res) => {
+                if (res === imHere) {
+                    userIsActive()
+                }
+            })
+    }
+
+    /** Cancels or disposes the existing message and timer. */
+    clear() {
+        if (this.#showMessageTimer) {
+            clearTimeout(this.#showMessageTimer)
+            this.#showMessageTimer = undefined
+        }
+    }
+
+    dispose() {
+        this.clear()
+    }
+}
diff --git a/src/codecatalyst/devfile.ts b/packages/core/src/codecatalyst/devfile.ts
similarity index 85%
rename from src/codecatalyst/devfile.ts
rename to packages/core/src/codecatalyst/devfile.ts
index 42683f56c5e..f8a857e2555 100644
--- a/src/codecatalyst/devfile.ts
+++ b/packages/core/src/codecatalyst/devfile.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -10,13 +10,13 @@ import * as vscode from 'vscode'
 import * as path from 'path'
 import { DevEnvClient } from '../shared/clients/devenvClient'
 import { DevfileRegistry, devfileGlobPattern } from '../shared/fs/devfileRegistry'
-import { getLogger } from '../shared/logger'
+import { getLogger } from '../shared/logger/logger'
 import { Commands } from '../shared/vscode/commands2'
 import { checkUnsavedChanges } from '../shared/utilities/workspaceUtils'
 import { ToolkitError } from '../shared/errors'
 
 async function updateDevfile(uri: vscode.Uri): Promise<void> {
-    const client = new DevEnvClient()
+    const client = DevEnvClient.instance
     if (!client.isCodeCatalystDevEnv()) {
         throw new Error('Cannot update devfile outside a Dev Environment')
     }
@@ -42,12 +42,12 @@ async function updateDevfile(uri: vscode.Uri): Promise<void> {
     // TODO: accurate telemetry is hard to capture here
 }
 
-export const updateDevfileCommand = Commands.register(
+export const updateDevfileCommand = Commands.declare(
     {
         id: 'aws.codecatalyst.updateDevfile',
         telemetryName: 'codecatalyst_updateDevfile',
     },
-    updateDevfile
+    () => (uri) => updateDevfile(uri)
 )
 
 type Workspace = Pick<typeof vscode.workspace, 'onDidSaveTextDocument'>
@@ -60,17 +60,17 @@ export class DevfileCodeLensProvider implements vscode.CodeLensProvider {
 
     public constructor(
         registry: DevfileRegistry,
-        private readonly client = new DevEnvClient(),
+        private readonly client = DevEnvClient.instance,
         workspace: Workspace = vscode.workspace
     ) {
         this.disposables.push(this._onDidChangeCodeLenses)
         this.disposables.push(
-            workspace.onDidSaveTextDocument(async document => {
-                if (!registry.getRegisteredItem(document.fileName)) {
+            workspace.onDidSaveTextDocument(async (document) => {
+                if (!registry.getItem(document.fileName)) {
                     return
                 }
 
-                await this.handleUpdate(document).catch(err => {
+                await this.handleUpdate(document).catch((err) => {
                     getLogger().debug(`codecatalyst: devfile codelens failure: ${err?.message}`)
                 })
             })
@@ -110,7 +110,10 @@ export class DevfileCodeLensProvider implements vscode.CodeLensProvider {
 export function registerDevfileWatcher(devenvClient: DevEnvClient): vscode.Disposable {
     const registry = new DevfileRegistry()
     const codelensProvider = new DevfileCodeLensProvider(registry, devenvClient)
-    registry.addWatchPattern(devfileGlobPattern)
+    registry.addWatchPatterns([devfileGlobPattern])
+    registry.rebuild().catch((e) => {
+        getLogger().error('WatchedFiles.rebuild failed: %s', (e as Error).message)
+    })
 
     const codelensDisposable = vscode.languages.registerCodeLensProvider(
         {
diff --git a/packages/core/src/codecatalyst/explorer.ts b/packages/core/src/codecatalyst/explorer.ts
new file mode 100644
index 00000000000..af3d6a20474
--- /dev/null
+++ b/packages/core/src/codecatalyst/explorer.ts
@@ -0,0 +1,228 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { DevEnvironment } from '../shared/clients/codecatalystClient'
+import { addColor, getIcon } from '../shared/icons'
+import { TreeNode } from '../shared/treeview/resourceTreeDataProvider'
+import { Commands } from '../shared/vscode/commands2'
+import { CodeCatalystAuthenticationProvider } from './auth'
+import { CodeCatalystCommands, codecatalystConnectionsCmd } from './commands'
+import { ConnectedDevEnv, getDevfileLocation, getThisDevEnv } from './model'
+import * as codecatalyst from './model'
+import { getLogger } from '../shared/logger/logger'
+import { SsoConnection } from '../auth/connection'
+import { openUrl } from '../shared/utilities/vsCodeUtils'
+
+export const learnMoreCommand = Commands.declare('aws.learnMore', () => async (docsUrl: vscode.Uri) => {
+    return openUrl(docsUrl)
+})
+
+export const reauth = Commands.declare(
+    '_aws.codecatalyst.reauthenticate',
+    () => async (conn: SsoConnection, authProvider: CodeCatalystAuthenticationProvider) => {
+        await authProvider.reauthenticate(conn)
+    }
+)
+
+export const onboardCommand = Commands.declare(
+    '_aws.codecatalyst.onboard',
+    () => async (authProvider: CodeCatalystAuthenticationProvider) => {
+        void authProvider.promptOnboarding()
+    }
+)
+
+async function getLocalCommands(auth: CodeCatalystAuthenticationProvider) {
+    const docsUrl = codecatalyst.docs.overview
+    const learnMoreNode = learnMoreCommand.build(docsUrl).asTreeNode({
+        label: 'Learn more about CodeCatalyst',
+        iconPath: getIcon('vscode-question'),
+    })
+
+    // There is a connection, but it is expired, or CodeCatalyst scopes are expired.
+    if (auth.activeConnection && !auth.isConnectionValid()) {
+        return [
+            reauth.build(auth.activeConnection, auth).asTreeNode({
+                label: 'Re-authenticate to connect',
+                iconPath: addColor(getIcon('vscode-debug-disconnect'), 'notificationsErrorIcon.foreground'),
+            }),
+            learnMoreNode,
+        ]
+    }
+
+    if (!auth.activeConnection) {
+        return [
+            codecatalystConnectionsCmd.build().asTreeNode({
+                label: 'Sign in to get started',
+                iconPath: getIcon('vscode-account'),
+            }),
+            learnMoreNode,
+        ]
+    }
+
+    // We are connected but not onboarded, so show them button to onboard
+    if (!(await auth.isConnectionOnboarded(auth.activeConnection))) {
+        return [
+            onboardCommand.build(auth).asTreeNode({
+                label: 'Onboard CodeCatalyst to get started',
+                iconPath: getIcon('vscode-account'),
+            }),
+            learnMoreNode,
+        ]
+    }
+
+    return [
+        CodeCatalystCommands.declared.cloneRepo.build().asTreeNode({
+            label: 'Clone Repository',
+            iconPath: getIcon('vscode-symbol-namespace'),
+        }),
+        CodeCatalystCommands.declared.openDevEnv.build().asTreeNode({
+            label: 'Open Dev Environment',
+            iconPath: getIcon('vscode-vm-connect'),
+        }),
+        CodeCatalystCommands.declared.createDevEnv.build().asTreeNode({
+            label: 'Create Dev Environment',
+            iconPath: getIcon('vscode-add'),
+        }),
+        CodeCatalystCommands.declared.listCommands.build().asTreeNode({
+            label: 'Show CodeCatalyst Commands',
+            iconPath: getIcon('vscode-list-flat'), // TODO(sijaden): use better icon
+        }),
+    ]
+}
+
+function getRemoteCommands(currentDevEnv: DevEnvironment, devfileLocation: vscode.Uri) {
+    return [
+        CodeCatalystCommands.declared.stopDevEnv.build(currentDevEnv, { showPrompt: true }).asTreeNode({
+            label: 'Stop Dev Environment',
+            iconPath: getIcon('vscode-stop-circle'),
+        }),
+        CodeCatalystCommands.declared.openDevEnvSettings.build().asTreeNode({
+            label: 'Open Settings',
+            iconPath: getIcon('vscode-settings-gear'),
+        }),
+        CodeCatalystCommands.declared.openDevfile.build(devfileLocation).asTreeNode({
+            label: 'Open Devfile',
+            iconPath: getIcon('vscode-symbol-namespace'),
+            description: vscode.workspace.asRelativePath(devfileLocation),
+        }),
+    ]
+}
+
+export class CodeCatalystRootNode implements TreeNode {
+    public readonly id = 'codecatalyst'
+    public readonly resource = this.devenv
+
+    private readonly onDidChangeEmitter = new vscode.EventEmitter<void>()
+
+    public readonly onDidChangeVisibility = this.onDidChangeEmitter.event
+    public readonly onDidChangeTreeItem = this.onDidChangeEmitter.event
+    public readonly onDidChangeChildren = this.onDidChangeEmitter.event
+
+    private refreshEmitters: (() => void)[] = []
+
+    private devenv?: ConnectedDevEnv
+    private resolveDevEnv: Promise<boolean> | undefined = undefined
+
+    public constructor(private readonly authProvider: CodeCatalystAuthenticationProvider) {
+        this.addRefreshEmitter(() => this.onDidChangeEmitter.fire())
+
+        this.authProvider.onDidChange(() => {
+            for (const fire of this.refreshEmitters) {
+                fire()
+            }
+        })
+    }
+
+    public async getChildren(): Promise<TreeNode[]> {
+        await this.initDevEnvLoad()
+
+        if (!this.devenv) {
+            return getLocalCommands(this.authProvider)
+        }
+
+        const devfileLocation = await getDevfileLocation(this.devenv.devenvClient)
+
+        return getRemoteCommands(this.devenv.summary, devfileLocation)
+    }
+
+    /**
+     * HACK: Since this is assumed to be an immediate child of the
+     * root, we return undefined.
+     *
+     * TODO: Look to have a base root class to extend so we do not
+     * need to implement this here.
+     * @returns
+     */
+    getParent(): TreeNode<unknown> | undefined {
+        return undefined
+    }
+
+    public async getTreeItem() {
+        await this.initDevEnvLoad()
+
+        await this.authProvider.restore()
+
+        const item = new vscode.TreeItem('CodeCatalyst', vscode.TreeItemCollapsibleState.Collapsed)
+        item.contextValue = this.authProvider.isUsingSavedConnection
+            ? 'awsCodeCatalystNodeSaved'
+            : 'awsCodeCatalystNode'
+
+        if (this.devenv !== undefined) {
+            item.description = 'Connected to Dev Environment'
+            item.iconPath = addColor(getIcon('vscode-pass'), 'testing.iconPassed')
+        } else {
+            item.description = this.getDescription()
+        }
+
+        return item
+    }
+
+    private getDescription(): string {
+        if (this.authProvider.activeConnection) {
+            if (this.authProvider.secondaryAuth.isConnectionExpired) {
+                return 'Expired Connection'
+            }
+            if (this.authProvider.isBuilderIdInUse()) {
+                return 'AWS Builder ID Connected'
+            }
+            if (this.authProvider.isEnterpriseSsoInUse()) {
+                return 'IAM Identity Center Connected'
+            }
+        }
+        return ''
+    }
+
+    public addRefreshEmitter(emitter: () => void) {
+        this.refreshEmitters.push(emitter)
+    }
+
+    /**
+     * CALL THIS BEFORE USING `this.devenv`
+     * Ensures that the node has attempted to load the `devenv` field by
+     * creating a promise that can be awaited if init has already begun and is being called elsewhere.
+     */
+    private async initDevEnvLoad() {
+        if (this.resolveDevEnv) {
+            await this.resolveDevEnv
+            return
+        }
+        let resolve: ((val: boolean) => void) | undefined
+        if (this.resolveDevEnv === undefined) {
+            this.resolveDevEnv = new Promise<boolean>((res) => {
+                resolve = res
+            })
+        }
+
+        this.devenv = (await getThisDevEnv(this.authProvider))?.unwrapOrElse((e) => {
+            const err = e as Error
+            getLogger().warn('codecatalyst: failed to get current Dev Enviroment: %s', err.message)
+            return undefined
+        })
+        if (resolve !== undefined) {
+            resolve(true)
+        }
+    }
+}
diff --git a/packages/core/src/codecatalyst/model.ts b/packages/core/src/codecatalyst/model.ts
new file mode 100644
index 00000000000..0451f9be95b
--- /dev/null
+++ b/packages/core/src/codecatalyst/model.ts
@@ -0,0 +1,309 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../shared/extensionGlobals'
+
+import * as vscode from 'vscode'
+import * as path from 'path'
+import {
+    createClient,
+    CodeCatalystClient,
+    DevEnvironment,
+    CodeCatalystRepo,
+    getCodeCatalystConfig,
+} from '../shared/clients/codecatalystClient'
+import { DevEnvClient } from '../shared/clients/devenvClient'
+import { getLogger } from '../shared/logger/logger'
+import { AsyncCollection, toCollection } from '../shared/utilities/asyncCollection'
+import { getCodeCatalystSpaceName, getCodeCatalystProjectName, getCodeCatalystDevEnvId } from '../shared/vscode/env'
+import { sshAgentSocketVariable, startSshAgent, startVscodeRemote } from '../shared/extensions/ssh'
+import { isDevenvVscode } from './utils'
+import { Timeout } from '../shared/utilities/timeoutUtils'
+import { Commands } from '../shared/vscode/commands2'
+import { areEqual } from '../shared/utilities/pathUtils'
+import { fileExists } from '../shared/filesystemUtilities'
+import { CodeCatalystAuthenticationProvider } from './auth'
+import { ToolkitError } from '../shared/errors'
+import { Result } from '../shared/utilities/result'
+import { EnvProvider, VscodeRemoteConnection, createBoundProcess, ensureDependencies } from '../shared/remoteSession'
+import { SshConfig, sshLogFileLocation } from '../shared/sshConfig'
+import { fs } from '../shared/fs/fs'
+
+export type DevEnvironmentId = Pick<DevEnvironment, 'id' | 'org' | 'project'>
+export const connectScriptPrefix = 'codecatalyst_connect'
+
+export const docs = {
+    main: vscode.Uri.parse('https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/codecatalyst-service'),
+    overview: vscode.Uri.parse(
+        'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/codecatalyst-overview.html'
+    ),
+    devenv: vscode.Uri.parse(
+        'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/codecatalyst-devenvironment.html'
+    ),
+    setup: vscode.Uri.parse('https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/codecatalyst-setup.html'),
+    troubleshoot: vscode.Uri.parse(
+        'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/codecatalyst-troubleshoot.html'
+    ),
+} as const
+
+export function getCodeCatalystSsmEnv(region: string, ssmPath: string, devenv: DevEnvironmentId): NodeJS.ProcessEnv {
+    return Object.assign(
+        {
+            AWS_REGION: region,
+            AWS_SSM_CLI: ssmPath,
+            CODECATALYST_ENDPOINT: getCodeCatalystConfig().endpoint,
+            BEARER_TOKEN_LOCATION: bearerTokenCacheLocation(devenv.id),
+            LOG_FILE_LOCATION: sshLogFileLocation('codecatalyst', devenv.id),
+            SPACE_NAME: devenv.org.name,
+            PROJECT_NAME: devenv.project.name,
+            DEVENV_ID: devenv.id,
+        },
+        process.env
+    )
+}
+
+export function createCodeCatalystEnvProvider(
+    client: CodeCatalystClient,
+    ssmPath: string,
+    devenv: DevEnvironment,
+    useSshAgent: boolean = true
+): EnvProvider {
+    return async () => {
+        await cacheBearerToken(await client.getBearerToken(), devenv.id)
+        const vars = getCodeCatalystSsmEnv(client.regionCode, ssmPath, devenv)
+
+        return useSshAgent ? { [sshAgentSocketVariable]: await startSshAgent(), ...vars } : vars
+    }
+}
+
+export async function cacheBearerToken(bearerToken: string, devenvId: string): Promise<void> {
+    await fs.writeFile(bearerTokenCacheLocation(devenvId), `${bearerToken}`, 'utf8')
+}
+
+export function bearerTokenCacheLocation(devenvId: string): string {
+    return path.join(globals.context.globalStorageUri.fsPath, `codecatalyst.${devenvId}.token`)
+}
+
+export interface ConnectedDevEnv {
+    readonly summary: DevEnvironment
+    readonly devenvClient: DevEnvClient
+}
+
+export async function getConnectedDevEnv(
+    codeCatalystClient: CodeCatalystClient,
+    devenvClient = DevEnvClient.instance
+): Promise<ConnectedDevEnv> {
+    const devEnvId = devenvClient.id
+    if (!devEnvId) {
+        throw new ToolkitError('Not connected to a dev environment', { code: 'NotConnectedToDevEnv' })
+    }
+
+    const projectName = getCodeCatalystProjectName()
+    const spaceName = getCodeCatalystSpaceName()
+
+    if (!projectName || !spaceName) {
+        throw new Error('No project or space name found')
+    }
+
+    const summary = await codeCatalystClient.getDevEnvironment({
+        projectName: projectName,
+        spaceName: spaceName,
+        id: devEnvId,
+    })
+
+    return { summary, devenvClient: devenvClient }
+}
+
+/**
+ * Gets the current devenv that Toolkit is running in, if any.
+ */
+export async function getThisDevEnv(authProvider: CodeCatalystAuthenticationProvider) {
+    if (!getCodeCatalystDevEnvId()) {
+        return
+    }
+
+    try {
+        await authProvider.restore()
+        const conn = authProvider.activeConnection
+        if (conn !== undefined && authProvider.auth.getConnectionState(conn) === 'valid') {
+            const client = await createClient(conn)
+            return Result.ok(await getConnectedDevEnv(client))
+        }
+    } catch (err) {
+        return Result.err(err)
+    }
+}
+
+/**
+ * Everything needed to connect to a dev environment via VS Code or `ssh`
+ */
+interface DevEnvConnection extends VscodeRemoteConnection {
+    readonly devenv: DevEnvironment
+}
+
+export async function prepareDevEnvConnection(
+    client: CodeCatalystClient,
+    { id, org, project }: DevEnvironmentId,
+    { topic, timeout }: { topic?: string; timeout?: Timeout } = {}
+): Promise<DevEnvConnection> {
+    const { ssm, vsc, ssh } = (await ensureDependencies()).unwrap()
+    const hostNamePrefix = 'aws-devenv-'
+    const sshConfig = new SshConfig(ssh, hostNamePrefix, connectScriptPrefix)
+    const config = await sshConfig.ensureValid()
+
+    if (config.isErr()) {
+        const err = config.err()
+        getLogger().error(`codecatalyst: failed to add ssh config section: ${err.message}`)
+
+        throw err
+    }
+
+    const runningDevEnv = await client.startDevEnvironmentWithProgress({
+        id,
+        spaceName: org.name,
+        projectName: project.name,
+    })
+
+    const hostname = `${hostNamePrefix}${id}`
+    const logPrefix = topic ? `codecatalyst ${topic} (${id})` : `codecatalyst (${id})`
+    const logger = (data: string) => getLogger().verbose(`${logPrefix}: ${data}`)
+    const envProvider = createCodeCatalystEnvProvider(client, ssm, runningDevEnv)
+    const SessionProcess = createBoundProcess(envProvider).extend({
+        timeout,
+        onStdout: logger,
+        onStderr: logger,
+        rejectOnErrorCode: true,
+    })
+
+    return {
+        hostname,
+        devenv: runningDevEnv,
+        envProvider,
+        sshPath: ssh,
+        vscPath: vsc,
+        SessionProcess,
+    }
+}
+
+/**
+ * Starts the given devenv, waits, and connects a new vscode instance when the devenv is ready.
+ *
+ * @param client CodeCatalyst service client
+ * @param devenv DevEnvironment to open
+ * @param targetPath vscode workspace (default: "/projects/[repo]")
+ */
+export async function openDevEnv(
+    client: CodeCatalystClient,
+    devenv: DevEnvironmentId,
+    targetPath?: string
+): Promise<void> {
+    const env = await prepareDevEnvConnection(client, devenv, { topic: 'connect' })
+
+    if (!targetPath) {
+        const repo = env.devenv.repositories.length === 1 ? env.devenv.repositories[0].repositoryName : undefined
+        targetPath = repo ? `/projects/${repo}` : '/projects'
+    }
+    await startVscodeRemote(env.SessionProcess, env.hostname, targetPath, env.vscPath)
+}
+
+// The "codecatalyst_connect" metric should really be splt into two parts:
+// 1. the setup/launch from the local machine
+// 2. toolkit initialization on the remote
+//
+// Recording metrics like this is a lot more involved so for now we'll
+// assume that if the first step succeeds, the user probably succeeded
+// in connecting to the devenv
+export const codeCatalystConnectCommand = Commands.declare(
+    {
+        id: '_aws.codecatalyst.connect',
+        telemetryName: 'codecatalyst_connect',
+    },
+    () => (client, devenv, targetPath) => openDevEnv(client, devenv, targetPath)
+)
+
+export async function getDevfileLocation(client: DevEnvClient, root?: vscode.Uri) {
+    const rootDirectory = root ?? vscode.workspace.workspaceFolders?.[0].uri
+    if (!rootDirectory) {
+        throw new Error('No root directory or Dev Environment folder found')
+    }
+
+    async function checkDefaultLocations(rootDirectory: vscode.Uri): Promise<vscode.Uri> {
+        // Check the projects root location
+        const devfileRoot = vscode.Uri.joinPath(vscode.Uri.parse('/projects'), 'devfile.yaml')
+        if (await fileExists(devfileRoot.fsPath)) {
+            return devfileRoot
+        }
+
+        // Check the location relative to the current directory
+        const projectRoot = vscode.Uri.joinPath(rootDirectory, 'devfile.yaml')
+        if (await fileExists(projectRoot.fsPath)) {
+            return projectRoot
+        }
+
+        throw new Error('Devfile location was not found')
+    }
+
+    // TODO(sijaden): should make this load greedily and continously poll
+    // latency is very high for some reason
+    const devfileLocation = await client.getStatus().then((r) => r.location)
+    if (!devfileLocation) {
+        return checkDefaultLocations(rootDirectory)
+    }
+
+    if (areEqual(undefined, rootDirectory.fsPath, '/projects')) {
+        return vscode.Uri.joinPath(rootDirectory, devfileLocation)
+    }
+
+    // we have /projects/repo, where MDE may or may not return [repo]/devfile.yaml
+    const repo = path.basename(rootDirectory.fsPath)
+    const splitDevfilePath = devfileLocation.split('/')
+    const devfilePath = vscode.Uri.joinPath(rootDirectory, 'devfile.yaml')
+    if (repo === splitDevfilePath[0] && (await fileExists(devfilePath.fsPath))) {
+        return devfilePath
+    }
+
+    const baseLocation = vscode.Uri.joinPath(rootDirectory, devfileLocation)
+    if (await fileExists(baseLocation.fsPath)) {
+        return baseLocation
+    }
+
+    return checkDefaultLocations(rootDirectory)
+}
+
+/**
+ * Given a collection of CodeCatalyst repos, try to find a corresponding devenv, if any
+ */
+export function associateDevEnv(
+    client: CodeCatalystClient,
+    repos: AsyncCollection<CodeCatalystRepo>
+): AsyncCollection<CodeCatalystRepo & { devEnv?: DevEnvironment }> {
+    return toCollection(async function* () {
+        const devenvs = await client
+            .listResources('devEnvironment')
+            .flatten()
+            .filter((env) => env.repositories.length > 0 && isDevenvVscode(env.ides))
+            .toMap((env) => `${env.org.name}.${env.project.name}.${env.repositories[0].repositoryName}`)
+
+        yield* repos.map((repo) => ({
+            ...repo,
+            devEnv: devenvs.get(`${repo.org.name}.${repo.project.name}.${repo.name}`),
+        }))
+    })
+}
+
+export interface DevEnvMemento {
+    /** True if the extension is watching the status of the devenv to try and reconnect. */
+    attemptingReconnect?: boolean
+    /** Unix time of the most recent connection. */
+    previousConnectionTimestamp: number
+    /** Previous open vscode workspace directory. */
+    previousVscodeWorkspace: string
+    /** CodeCatalyst Space (Org) Name */
+    spaceName: string
+    /** CodeCatalyst Project name */
+    projectName: string
+    /** CodeCatalyst Alias */
+    alias: string | undefined
+}
diff --git a/packages/core/src/codecatalyst/reconnect.ts b/packages/core/src/codecatalyst/reconnect.ts
new file mode 100644
index 00000000000..9e0ab491f38
--- /dev/null
+++ b/packages/core/src/codecatalyst/reconnect.ts
@@ -0,0 +1,296 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+import * as vscode from 'vscode'
+import { CodeCatalystClient, createClient, DevEnvironment } from '../shared/clients/codecatalystClient'
+import { ExtContext } from '../shared/extensions'
+import { getLogger } from '../shared/logger/logger'
+import { sleep } from '../shared/utilities/timeoutUtils'
+import { DevEnvironmentSettings } from './commands'
+import { codeCatalystConnectCommand, DevEnvironmentId, DevEnvMemento } from './model'
+import { showViewLogsMessage } from '../shared/utilities/messages'
+import { CodeCatalystAuthenticationProvider } from './auth'
+import { getCodeCatalystDevEnvId } from '../shared/vscode/env'
+import globals from '../shared/extensionGlobals'
+import { isDevenvVscode } from './utils'
+import { telemetry } from '../shared/telemetry/telemetry'
+import { SsoConnection } from '../auth/connection'
+
+const localize = nls.loadMessageBundle()
+
+const reconnectTimer = 5000
+const maxReconnectTime = 10 * 60 * 1000
+
+export function watchRestartingDevEnvs(ctx: ExtContext, authProvider: CodeCatalystAuthenticationProvider) {
+    let restartHandled = false
+    authProvider.onDidChangeActiveConnection(async (conn) => {
+        if (restartHandled || conn === undefined || authProvider.auth.getConnectionState(conn) !== 'valid') {
+            return
+        }
+        getLogger().info(`codecatalyst: reconnect: onDidChangeActiveConnection: startUrl=${conn.startUrl}`)
+
+        const envId = getCodeCatalystDevEnvId()
+        handleRestart(conn, ctx, envId)
+        restartHandled = true
+    })
+}
+
+function handleRestart(conn: SsoConnection, ctx: ExtContext, envId: string | undefined) {
+    if (envId !== undefined) {
+        const pendingReconnects = globals.globalState.get<Record<string, DevEnvMemento>>('CODECATALYST_RECONNECT') ?? {}
+        if (envId in pendingReconnects) {
+            const devenv = pendingReconnects[envId]
+            const devenvName = getDevEnvName(devenv.alias, envId)
+            getLogger().info(`codecatalyst: ssh session reconnected to devenv: ${devenvName}`)
+            void vscode.window.showInformationMessage(
+                localize('AWS.codecatalyst.reconnect.success', 'Reconnected to Dev Environment: {0}', devenvName)
+            )
+            delete pendingReconnects[envId]
+            globals.globalState.tryUpdate('CODECATALYST_RECONNECT', pendingReconnects)
+        }
+    } else {
+        getLogger().info('codecatalyst: attempting to poll dev environments')
+
+        // Reconnect devenvs (if coming from a restart)
+        reconnectDevEnvs(conn).catch((err) => {
+            getLogger().error(`codecatalyst: error while resuming devenvs: ${err}`)
+        })
+    }
+}
+
+/**
+ * Attempt to poll for connection in all valid devenvs
+ * @param conn a connection that may be used for CodeCatalyst
+ * @param ctx the extension context
+ */
+async function reconnectDevEnvs(conn: SsoConnection): Promise<void> {
+    const pendingDevEnvs = globals.globalState.tryGet<Record<string, DevEnvMemento>>(
+        'CODECATALYST_RECONNECT',
+        Object,
+        {}
+    )
+    const validDevEnvs = filterInvalidDevEnvs(pendingDevEnvs)
+    if (Object.keys(validDevEnvs).length === 0) {
+        return
+    }
+
+    const devenvNames = []
+    for (const [id, devenv] of Object.entries(validDevEnvs)) {
+        devenvNames.push(getDevEnvName(devenv.alias, id))
+    }
+
+    const polledDevEnvs = devenvNames.join(', ')
+    const progressTitle = localize(
+        'AWS.codecatalyst.reconnect.restarting',
+        'Dev Environments restarting: {0}',
+        polledDevEnvs
+    )
+    await vscode.window.withProgress(
+        {
+            location: vscode.ProgressLocation.Notification,
+        },
+        async (progress, token) => {
+            progress.report({ message: progressTitle })
+            const client = await createClient(conn)
+
+            return pollDevEnvs(client, progress, token, validDevEnvs)
+        }
+    )
+}
+
+/**
+ * Filter out devenvs who are expired OR are already attempting to reconnect.
+ * @param devenvs All of the possible in devenvs to check
+ */
+function filterInvalidDevEnvs(devenvs: Record<string, DevEnvMemento>) {
+    for (const reconnectDevEnvId in devenvs) {
+        const devenvDetail = devenvs[reconnectDevEnvId]
+        if (isExpired(devenvDetail.previousConnectionTimestamp) || devenvDetail.attemptingReconnect) {
+            delete devenvs[reconnectDevEnvId]
+        }
+    }
+    return devenvs
+}
+
+/**
+ * Ensure that all devenvs that are currently being looked at set to attempting to reconnect so that they are not looked at
+ * by any other instance of VSCode.
+ * @param devenvs
+ */
+function setWatchedDevEnvStatus(devenvs: Record<string, DevEnvMemento>, watchStatus: boolean) {
+    for (const [id, detail] of Object.entries(devenvs)) {
+        devenvs[id] = { ...detail, attemptingReconnect: watchStatus }
+    }
+    return globals.globalState.update('CODECATALYST_RECONNECT', devenvs)
+}
+
+/**
+ * Continuously poll all the devenvs until they are either:
+ *      1. Available for re-opening, in which case re-open them automatically
+ *      2. In a terminating state or expired, in which case no longer watch the devenv
+ *      3. Failed to start, in which case notify the user
+ * @param client A connected client
+ * @param devenvs All VALID devenvs that are not being watched by any other VSCode instance
+ */
+async function pollDevEnvs(
+    client: CodeCatalystClient,
+    progress: vscode.Progress<{ message: string }>,
+    token: vscode.CancellationToken,
+    devenvs: Record<string, DevEnvMemento>
+) {
+    // Ensure that all devenvs that you want to look at are attempting reconnection
+    // and won't be watched by any other VSCode instance
+    await setWatchedDevEnvStatus(devenvs, true)
+
+    const shouldCloseRootInstance = Object.keys(devenvs).length === 1
+    getLogger().info(`codecatalyst: reconnect: pollDevEnvs: ${Object.keys(devenvs).length}`)
+
+    while (Object.keys(devenvs).length > 0) {
+        if (token.isCancellationRequested) {
+            await setWatchedDevEnvStatus(devenvs, false)
+            return
+        }
+
+        for (const id in devenvs) {
+            const details = devenvs[id]
+            const devenvName = getDevEnvName(details.alias, id)
+
+            try {
+                const metadata = await client.getDevEnvironment({
+                    id: id,
+                    spaceName: details.spaceName,
+                    projectName: details.projectName,
+                })
+
+                const ide = metadata.ides?.[0]?.name
+                getLogger().info(`codecatalyst: reconnect: ides=${ide} statusReason=${metadata.statusReason}`)
+
+                if (metadata?.status === 'RUNNING') {
+                    progress.report({
+                        message: `Dev Environment ${devenvName} is now running. Attempting to reconnect.`,
+                    })
+
+                    openReconnectedDevEnv(client, id, details, shouldCloseRootInstance).catch((e) => {
+                        getLogger().error('openReconnectedDevEnv failed: %s', (e as Error).message)
+                    })
+
+                    // Don't watch this devenv, it is already being re-opened in SSH.
+                    delete devenvs[id]
+                } else if (!isDevenvVscode(metadata.ides)) {
+                    // Technically vscode _can_ connect to a ideRuntime=jetbrains devenv, but
+                    // we refuse to anyway so that the experience is consistent since that devenv
+                    // is not capable of connecting to a devenv that lacks their runtime/bootstrap files.
+                    const ide = metadata.ides?.[0]
+                    const toIde = ide ? ` to "${ide.name}"` : ''
+                    progress.report({ message: `Dev Environment ${devenvName} was switched${toIde}` })
+                    // Don't watch devenv that is no longer connectable.
+                    delete devenvs[id]
+                } else if (isTerminating(metadata)) {
+                    progress.report({ message: `Dev Environment ${devenvName} is terminating` })
+                    // Don't watch devenv that is terminating.
+                    delete devenvs[id]
+                } else if (isExpired(details.previousConnectionTimestamp)) {
+                    progress.report({ message: `Dev Environment ${devenvName} has expired` })
+                }
+            } catch {
+                await failDevEnv(id)
+                delete devenvs[id]
+                void showViewLogsMessage(
+                    localize('AWS.codecatalyst.reconnect', 'Unable to reconnect to ${0}', devenvName)
+                )
+            }
+        }
+        await sleep(reconnectTimer)
+    }
+}
+
+function isTerminating(devenv: Pick<DevEnvironment, 'status'>): boolean {
+    if (!devenv.status) {
+        return false
+    }
+    return devenv.status === 'FAILED' || devenv.status === 'DELETING' || devenv.status === 'DELETED'
+}
+
+function isExpired(previousConnectionTime: number): boolean {
+    return Date.now() - previousConnectionTime > maxReconnectTime
+}
+
+/**
+ * When a devenv fails, remove it from globalState so we no longer watch it in the future
+ * @param devenvId the id of the deveng to fail
+ */
+function failDevEnv(devenvId: string) {
+    const curr = globals.globalState.tryGet<Record<string, DevEnvMemento>>('CODECATALYST_RECONNECT', Object, {})
+    delete curr[devenvId]
+    return globals.globalState.update('CODECATALYST_RECONNECT', curr)
+}
+
+async function openReconnectedDevEnv(
+    client: CodeCatalystClient,
+    id: string,
+    devenv: DevEnvMemento,
+    closeRootInstance: boolean
+): Promise<void> {
+    const identifier: DevEnvironmentId = {
+        id,
+        org: { name: devenv.spaceName },
+        project: { name: devenv.projectName },
+    }
+
+    await telemetry.runRoot(async () => {
+        telemetry.record({ source: 'Reconnect' })
+        await codeCatalystConnectCommand.execute(client, identifier, devenv.previousVscodeWorkspace)
+
+        // When we only have 1 devenv to watch we might as well close the local vscode instance
+        if (closeRootInstance) {
+            // A brief delay ensures that metrics are saved from the connect command
+            await sleep(5000).then(() => vscode.commands.executeCommand('workbench.action.closeWindow'))
+        }
+    })
+}
+
+function getDevEnvName(alias: string | undefined, id: string) {
+    return alias && alias !== '' ? alias : id
+}
+
+export function isLongReconnect(oldSettings: DevEnvironmentSettings, newSettings: DevEnvironmentSettings): boolean {
+    return (
+        newSettings.inactivityTimeoutMinutes !== undefined &&
+        newSettings.instanceType !== undefined &&
+        (oldSettings.inactivityTimeoutMinutes !== newSettings.inactivityTimeoutMinutes ||
+            oldSettings.instanceType !== newSettings.instanceType)
+    )
+}
+
+export function saveReconnectionInformation(devenv: DevEnvironmentId & Pick<DevEnvironment, 'alias'>): Thenable<void> {
+    const pendingReconnects = globals.globalState.tryGet<Record<string, DevEnvMemento>>(
+        'CODECATALYST_RECONNECT',
+        Object,
+        {}
+    )
+    const workspaceFolders = vscode.workspace.workspaceFolders
+    const currentWorkspace =
+        workspaceFolders !== undefined && workspaceFolders.length > 0 ? workspaceFolders[0].uri.fsPath : '/projects'
+    pendingReconnects[devenv.id] = {
+        previousVscodeWorkspace: currentWorkspace,
+        spaceName: devenv.org.name,
+        projectName: devenv.project.name,
+        attemptingReconnect: false,
+        previousConnectionTimestamp: Date.now(),
+        alias: devenv.alias,
+    }
+    return globals.globalState.update('CODECATALYST_RECONNECT', pendingReconnects)
+}
+
+export function removeReconnectionInformation(devenv: DevEnvironmentId): Thenable<void> {
+    const pendingReconnects = globals.globalState.tryGet<Record<string, DevEnvMemento>>(
+        'CODECATALYST_RECONNECT',
+        Object,
+        {}
+    )
+    delete pendingReconnects[devenv.id]
+    return globals.globalState.update('CODECATALYST_RECONNECT', pendingReconnects)
+}
diff --git a/src/codecatalyst/repos/remoteSourceProvider.ts b/packages/core/src/codecatalyst/repos/remoteSourceProvider.ts
similarity index 95%
rename from src/codecatalyst/repos/remoteSourceProvider.ts
rename to packages/core/src/codecatalyst/repos/remoteSourceProvider.ts
index bc14d0e26fc..55be5dac223 100644
--- a/src/codecatalyst/repos/remoteSourceProvider.ts
+++ b/packages/core/src/codecatalyst/repos/remoteSourceProvider.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -53,7 +53,7 @@ export class CodeCatalystRemoteSourceProvider implements RemoteSourceProvider {
     }
 
     public async getRemoteSources(query?: string): Promise<RemoteSource[] | undefined> {
-        return this.commands.withClient(async client => {
+        return this.commands.withClient(async (client) => {
             const intoRemote = async (repo: CodeCatalystRepo): Promise<RemoteSource> => {
                 const resource = { name: repo.name, project: repo.project.name, org: repo.org.name }
                 const url = await client.getRepoCloneUrl({
diff --git a/packages/core/src/codecatalyst/uriHandlers.ts b/packages/core/src/codecatalyst/uriHandlers.ts
new file mode 100644
index 00000000000..7e4f9080519
--- /dev/null
+++ b/packages/core/src/codecatalyst/uriHandlers.ts
@@ -0,0 +1,79 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { SearchParams, UriHandler } from '../shared/vscode/uriHandler'
+import { getCodeCatalystConfig } from '../shared/clients/codecatalystClient'
+import { CodeCatalystCommands } from './commands'
+import { defaultSsoRegion } from '../auth/connection'
+import { getLogger } from '../shared/logger/logger'
+import { builderIdStartUrl } from '../auth/sso/constants'
+
+type ConnectParams = {
+    devEnvironmentId: string
+    spaceName: string
+    projectName: string
+    sso?: {
+        startUrl: string
+        region: string
+    }
+}
+
+export function register(
+    handler: UriHandler,
+    commands: Pick<typeof CodeCatalystCommands.declared, 'cloneRepo' | 'openDevEnv'>
+) {
+    async function cloneHandler(params: ReturnType<typeof parseCloneParams>) {
+        if (params.url.authority.endsWith(getCodeCatalystConfig().gitHostname)) {
+            await commands.cloneRepo.execute(undefined, params.url)
+        } else {
+            await vscode.commands.executeCommand('git.clone', params.url.toString())
+        }
+    }
+
+    async function connectHandler(params: ConnectParams) {
+        await commands.openDevEnv.execute(
+            undefined,
+            {
+                id: params.devEnvironmentId,
+                org: { name: params.spaceName },
+                project: { name: params.projectName },
+            },
+            undefined,
+            params.sso
+        )
+    }
+
+    return vscode.Disposable.from(
+        handler.onPath('/clone', cloneHandler, parseCloneParams),
+        handler.onPath('/connect/codecatalyst', connectHandler, parseConnectParams),
+        handler.onPath('/connect/caws', connectHandler, parseConnectParamsOld) // FIXME: remove this before GA
+    )
+}
+
+function parseCloneParams(query: SearchParams) {
+    return { url: query.getAsOrThrow('url', 'A URL must be provided', (v) => vscode.Uri.parse(v, true)) }
+}
+
+export function parseConnectParams(query: SearchParams): ConnectParams {
+    const params = query.getFromKeysOrThrow('devEnvironmentId', 'spaceName', 'projectName')
+
+    try {
+        const ssoParams = query.getFromKeysOrThrow('sso_start_url', 'sso_region')
+        return { ...params, sso: { startUrl: ssoParams.sso_start_url, region: ssoParams.sso_region } }
+    } catch {
+        getLogger().debug(`No IdC SSO params provided in CodeCatalyst URI, defaulting to Builder ID.`)
+        return { ...params, sso: { startUrl: builderIdStartUrl, region: defaultSsoRegion } }
+    }
+}
+
+function parseConnectParamsOld(query: SearchParams): ConnectParams {
+    const params = query.getFromKeysOrThrow('devEnvironmentId', 'organizationName', 'projectName')
+    return {
+        devEnvironmentId: params.devEnvironmentId,
+        spaceName: params.organizationName,
+        projectName: params.projectName,
+    }
+}
diff --git a/packages/core/src/codecatalyst/utils.ts b/packages/core/src/codecatalyst/utils.ts
new file mode 100644
index 00000000000..3f9cf6fe0bf
--- /dev/null
+++ b/packages/core/src/codecatalyst/utils.ts
@@ -0,0 +1,60 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Ide } from '@aws-sdk/client-codecatalyst'
+import * as vscode from 'vscode'
+import { CodeCatalystResource, getCodeCatalystConfig } from '../shared/clients/codecatalystClient'
+import { pushIf } from '../shared/utilities/collectionUtils'
+import { getLogger } from '../shared/logger/logger'
+
+/**
+ * Builds a web URL from the given CodeCatalyst object.
+ */
+export function toCodeCatalystUrl(resource: CodeCatalystResource): string {
+    const prefix = `https://${getCodeCatalystConfig().hostname}/spaces`
+
+    const format = (org: string, proj?: string, repo?: string, branch?: string) => {
+        const parts = [prefix, org]
+        pushIf(parts, !!proj, 'projects', proj)
+        pushIf(parts, !!repo, 'source-repositories', repo)
+        pushIf(parts, !!branch, 'branch', 'refs', 'heads', branch)
+
+        return parts.concat('view').join('/')
+    }
+
+    switch (resource.type) {
+        case 'org':
+            return format(resource.name)
+        case 'project':
+            return format(resource.org.name, resource.name)
+        case 'repo':
+            return format(resource.org.name, resource.project.name, resource.name)
+        case 'branch':
+            return format(resource.org.name, resource.project.name, resource.repo.name, resource.name)
+        case 'devEnvironment':
+            // There's currently no page to view an individual devenv.
+            // This may be changed to direct to the underlying repository instead
+            return [prefix, resource.org.name, 'projects', resource.project.name, 'dev-environments'].join('/')
+    }
+}
+
+export function getHelpUrl(): string {
+    return `https://${getCodeCatalystConfig().hostname}/help`
+}
+
+/**
+ * Builds a web URL from the given CodeCatalyst object.
+ */
+export function openCodeCatalystUrl(o: CodeCatalystResource) {
+    const url = toCodeCatalystUrl(o)
+    vscode.env.openExternal(vscode.Uri.parse(url)).then(undefined, (e) => {
+        getLogger().error('openExternal failed: %s', (e as Error).message)
+    })
+}
+
+/** Returns true if the dev env has a "vscode" IDE runtime. */
+export function isDevenvVscode(ides: Ide[] | undefined): boolean {
+    return ides !== undefined && ides.some((ide) => ide.name === 'VSCode')
+}
diff --git a/src/codecatalyst/vue/compute.vue b/packages/core/src/codecatalyst/vue/compute.vue
similarity index 100%
rename from src/codecatalyst/vue/compute.vue
rename to packages/core/src/codecatalyst/vue/compute.vue
diff --git a/packages/core/src/codecatalyst/vue/configure/backend.ts b/packages/core/src/codecatalyst/vue/configure/backend.ts
new file mode 100644
index 00000000000..e5dd360cac7
--- /dev/null
+++ b/packages/core/src/codecatalyst/vue/configure/backend.ts
@@ -0,0 +1,210 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+import { ConnectedDevEnv, DevEnvironmentId, getDevfileLocation } from '../../model'
+import { CodeCatalystCommands, DevEnvironmentSettings } from '../../commands'
+import { VueWebview } from '../../../webviews/main'
+import { Prompter } from '../../../shared/ui/prompter'
+import { isValidResponse } from '../../../shared/wizards/wizard'
+import { sleep } from '../../../shared/utilities/timeoutUtils'
+import { GetStatusResponse } from '../../../shared/clients/devenvClient'
+import { openCodeCatalystUrl } from '../../utils'
+import { assertHasProps } from '../../../shared/utilities/tsUtils'
+import {
+    createAliasPrompter,
+    createInstancePrompter,
+    createTimeoutPrompter,
+    getAllInstanceDescriptions,
+    isValidSubscriptionType,
+} from '../../wizards/devenvSettings'
+import { updateDevfileCommand } from '../../devfile'
+import { showViewLogsMessage } from '../../../shared/utilities/messages'
+import { isLongReconnect, removeReconnectionInformation, saveReconnectionInformation } from '../../reconnect'
+import { CodeCatalystClient, DevEnvironment } from '../../../shared/clients/codecatalystClient'
+
+const localize = nls.loadMessageBundle()
+
+export class CodeCatalystConfigureWebview extends VueWebview {
+    public static readonly sourcePath: string = 'src/codecatalyst/vue/configure/index.js'
+    public readonly id = 'configureCodeCatalyst'
+
+    public readonly onDidChangeDevfile = new vscode.EventEmitter<GetStatusResponse>()
+
+    public constructor(
+        private readonly client: CodeCatalystClient,
+        private readonly devenv: ConnectedDevEnv,
+        private readonly commands: typeof CodeCatalystCommands.declared
+    ) {
+        super(CodeCatalystConfigureWebview.sourcePath)
+    }
+
+    public init() {
+        return this.devenv.summary
+    }
+
+    public getAllInstanceDescriptions() {
+        return getAllInstanceDescriptions()
+    }
+
+    public async getDevfileLocation() {
+        const location = await getDevfileLocation(this.devenv.devenvClient)
+        return vscode.workspace.asRelativePath(location)
+    }
+
+    public async openDevfile() {
+        const location = await getDevfileLocation(this.devenv.devenvClient)
+        return this.commands.openDevfile.execute(location)
+    }
+
+    public async updateDevfile(location: string) {
+        // TODO(sijaden): we should be able to store the absolute URI somewhere?
+        const rootDirectory = vscode.workspace.workspaceFolders?.[0].uri
+        if (!rootDirectory) {
+            throw new Error('No workspace folder found')
+        }
+
+        await updateDevfileCommand.execute(vscode.Uri.joinPath(rootDirectory, location))
+    }
+
+    public async stopDevEnv(id: DevEnvironmentId) {
+        return this.commands.stopDevEnv.execute(id)
+    }
+
+    public async deleteDevEnv(id: DevEnvironmentId) {
+        return this.commands.deleteDevEnv.execute(id)
+    }
+
+    public async updateDevEnv(
+        id: Pick<DevEnvironment, 'id' | 'org' | 'project' | 'alias'>,
+        settings: DevEnvironmentSettings
+    ) {
+        if (isLongReconnect(this.devenv.summary, settings)) {
+            try {
+                await saveReconnectionInformation(id)
+                const resp = await this.commands.updateDevEnv.execute(id, settings)
+                if (resp === undefined) {
+                    await removeReconnectionInformation(id)
+                } else {
+                    reportClosingMessage()
+                }
+
+                return resp
+            } catch (err) {
+                await removeReconnectionInformation(id)
+                throw err
+            }
+        } else {
+            return this.commands.updateDevEnv.execute(id, settings)
+        }
+    }
+
+    public async showLogsMessage(title: string): Promise<string | undefined> {
+        return showViewLogsMessage(title)
+    }
+
+    public async editSetting(
+        settings: DevEnvironmentSettings,
+        key: keyof DevEnvironmentSettings
+    ): Promise<DevEnvironmentSettings> {
+        const spaceName = this.devenv.summary.org.name
+        const subscriptionType = await this.client
+            .getSubscription({ spaceName })
+            .then((resp) => (isValidSubscriptionType(resp.subscriptionType) ? resp.subscriptionType : 'FREE'))
+
+        async function prompt(prompter: Prompter<any>) {
+            prompter.recentItem = settings[key]
+            const response = await prompter.prompt()
+
+            if (isValidResponse(response)) {
+                return { ...settings, [key]: response }
+            } else {
+                return settings
+            }
+        }
+
+        switch (key) {
+            case 'alias':
+                return prompt(createAliasPrompter())
+            case 'instanceType':
+                return prompt(createInstancePrompter(subscriptionType))
+            case 'inactivityTimeoutMinutes':
+                return prompt(createTimeoutPrompter())
+            case 'persistentStorage':
+                throw new Error('Persistent storage cannot be changed after creation')
+        }
+    }
+
+    public openBranch(): void {
+        const repo = this.devenv.summary.repositories?.[0]
+        assertHasProps(repo, 'branchName')
+        openCodeCatalystUrl({
+            type: 'branch',
+            name: repo.branchName,
+            repo: { name: repo.repositoryName },
+            org: { name: this.devenv.summary.org.name },
+            project: { name: this.devenv.summary.project.name },
+        })
+    }
+}
+
+const Panel = VueWebview.compilePanel(CodeCatalystConfigureWebview)
+let activePanel: InstanceType<typeof Panel> | undefined
+let subscriptions: vscode.Disposable[] | undefined
+
+export async function showConfigureDevEnv(
+    client: CodeCatalystClient,
+    ctx: vscode.ExtensionContext,
+    devenv: ConnectedDevEnv,
+    commands: typeof CodeCatalystCommands.declared
+): Promise<void> {
+    activePanel ??= new Panel(ctx, client, devenv, commands)
+    const webview = await activePanel.show({
+        title: localize('AWS.view.configureDevEnv.title', 'Dev Environment Settings'),
+        viewColumn: vscode.ViewColumn.Active,
+    })
+
+    if (!subscriptions) {
+        const poller = pollDevfile(devenv, activePanel.server)
+        subscriptions = [
+            poller,
+            webview.onDidDispose(() => {
+                vscode.Disposable.from(...(subscriptions ?? [])).dispose()
+                activePanel = undefined
+                subscriptions = undefined
+            }),
+        ]
+    }
+}
+
+function pollDevfile(devenv: ConnectedDevEnv, server: CodeCatalystConfigureWebview): vscode.Disposable {
+    let done = false
+
+    void (async () => {
+        while (!done) {
+            const resp = await devenv.devenvClient.getStatus()
+            if (resp.status === 'CHANGED') {
+                server.onDidChangeDevfile.fire({ ...resp, actionId: 'devfile' })
+            }
+            await sleep(2500)
+        }
+    })()
+
+    return { dispose: () => (done = true) }
+}
+
+function reportClosingMessage(): void {
+    void vscode.window.withProgress(
+        {
+            location: vscode.ProgressLocation.Notification,
+            title: 'Session ended. Session will restore when the Dev Environment is available again.',
+        },
+        async (progress, token) => {
+            await sleep(2500)
+            await vscode.commands.executeCommand('workbench.action.remote.close')
+        }
+    )
+}
diff --git a/packages/core/src/codecatalyst/vue/configure/index.ts b/packages/core/src/codecatalyst/vue/configure/index.ts
new file mode 100644
index 00000000000..fbd8dd1fb18
--- /dev/null
+++ b/packages/core/src/codecatalyst/vue/configure/index.ts
@@ -0,0 +1,16 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { createApp } from 'vue'
+import component from './root.vue'
+
+const create = () => createApp(component)
+const app = create()
+app.mount('#vue-app')
+
+window.addEventListener('remount', () => {
+    app.unmount()
+    create().mount('#vue-app')
+})
diff --git a/src/codecatalyst/vue/configure/root.vue b/packages/core/src/codecatalyst/vue/configure/root.vue
similarity index 100%
rename from src/codecatalyst/vue/configure/root.vue
rename to packages/core/src/codecatalyst/vue/configure/root.vue
diff --git a/packages/core/src/codecatalyst/vue/create/backend.ts b/packages/core/src/codecatalyst/vue/create/backend.ts
new file mode 100644
index 00000000000..102c6329653
--- /dev/null
+++ b/packages/core/src/codecatalyst/vue/create/backend.ts
@@ -0,0 +1,284 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as vscode from 'vscode'
+import { CodeCatalystCommands, DevEnvironmentSettings } from '../../commands'
+import { VueWebview } from '../../../webviews/main'
+import { Prompter } from '../../../shared/ui/prompter'
+import { isValidResponse } from '../../../shared/wizards/wizard'
+import {
+    createAliasPrompter,
+    createInstancePrompter,
+    createStoragePrompter,
+    createTimeoutPrompter,
+    getAllInstanceDescriptions,
+    isValidSubscriptionType,
+} from '../../wizards/devenvSettings'
+import { showViewLogsMessage } from '../../../shared/utilities/messages'
+import {
+    CodeCatalystBranch,
+    CodeCatalystOrg,
+    CodeCatalystProject,
+    CodeCatalystClient,
+    DevEnvironment,
+    isThirdPartyRepo,
+} from '../../../shared/clients/codecatalystClient'
+import { CancellationError } from '../../../shared/utilities/timeoutUtils'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { isNonNullable } from '../../../shared/utilities/tsUtils'
+import { createOrgPrompter, createProjectPrompter } from '../../wizards/selectResource'
+import { GetSourceRepositoryCloneUrlsRequest } from '@aws-sdk/client-codecatalyst'
+import { QuickPickPrompter } from '../../../shared/ui/pickerPrompter'
+
+interface LinkedResponse {
+    readonly type: 'linked'
+    readonly selectedSpace: Pick<CodeCatalystOrg, 'name'>
+    readonly selectedProject: CodeCatalystProject
+    readonly selectedBranch: CodeCatalystBranch
+    readonly newBranch: string
+}
+
+interface EmptyResponse {
+    readonly type: 'none'
+    readonly selectedSpace: Pick<CodeCatalystOrg, 'name'>
+    readonly selectedProject: CodeCatalystProject
+}
+
+export type SourceResponse = LinkedResponse | EmptyResponse
+
+export class CodeCatalystCreateWebview extends VueWebview {
+    public static readonly sourcePath: string = 'src/codecatalyst/vue/create/index.js'
+    public readonly id = 'createCodeCatalyst'
+
+    private projectPrompter?: QuickPickPrompter<CodeCatalystProject>
+    private spacePrompter?: QuickPickPrompter<CodeCatalystOrg>
+
+    public constructor(
+        private readonly client: CodeCatalystClient,
+        private readonly commands: typeof CodeCatalystCommands.declared,
+        private readonly onComplete: (devenv?: DevEnvironment) => void
+    ) {
+        super(CodeCatalystCreateWebview.sourcePath)
+
+        // triggers pre-loading of Spaces
+        this.spacePrompter = createOrgPrompter(client)
+    }
+
+    public close() {
+        this.dispose()
+        this.onComplete()
+    }
+
+    /**
+     * Opens a quick pick that lists all Spaces of the user.
+     *
+     * @returns Space if it was selected, otherwise undefined due to user cancellation.
+     */
+    public async quickPickSpace(): Promise<CodeCatalystOrg | undefined> {
+        this.spacePrompter = this.spacePrompter ?? createOrgPrompter(this.client)
+        const selectedSpace = await this.spacePrompter.prompt()
+        this.spacePrompter = undefined // We want the prompter to be re-created on subsequent calls
+
+        if (!isValidResponse(selectedSpace)) {
+            return undefined
+        }
+
+        // This will initiate preloading of the projects
+        this.projectPrompter = createProjectPrompter(this.client, selectedSpace?.name)
+
+        return selectedSpace
+    }
+
+    /**
+     * Opens a quick pick that lists all Projects from a given Space.
+     *
+     * @param spaceName Space to show Projects from
+     * @returns Project if it was selected, otherwise undefined due to user cancellation.
+     */
+    public async quickPickProject(spaceName: CodeCatalystOrg['name']): Promise<CodeCatalystProject | undefined> {
+        this.projectPrompter = this.projectPrompter ?? createProjectPrompter(this.client, spaceName)
+        const selectedProject = await this.projectPrompter.prompt()
+        this.projectPrompter = undefined // We want the prompter to be re-created on subsequent calls
+
+        if (!isValidResponse(selectedProject)) {
+            return undefined
+        }
+
+        return selectedProject
+    }
+
+    public async getBranches(project: CodeCatalystProject) {
+        const repos = this.client
+            .listSourceRepositories({
+                spaceName: project.org.name,
+                projectName: project.name,
+            })
+            .flatten()
+
+        const branches = repos.map((r) =>
+            this.client
+                .listBranches({
+                    spaceName: r.org.name,
+                    projectName: r.project.name,
+                    sourceRepositoryName: r.name,
+                })
+                .flatten()
+                .promise()
+        )
+
+        return branches.flatten().promise()
+    }
+
+    public isThirdPartyRepo(codeCatalystRepo: GetSourceRepositoryCloneUrlsRequest): Promise<boolean> {
+        return isThirdPartyRepo(this.client, codeCatalystRepo)
+    }
+
+    public getAllInstanceDescriptions() {
+        return getAllInstanceDescriptions()
+    }
+
+    public async showLogsMessage(title: string): Promise<string | undefined> {
+        return showViewLogsMessage(title)
+    }
+
+    public async editSetting(
+        settings: DevEnvironmentSettings,
+        key: keyof DevEnvironmentSettings,
+        org?: Pick<CodeCatalystOrg, 'name'>
+    ): Promise<DevEnvironmentSettings> {
+        const subscriptionType = isNonNullable(org)
+            ? await this.client
+                  .getSubscription({ spaceName: org.name })
+                  .then((resp) => (isValidSubscriptionType(resp.subscriptionType) ? resp.subscriptionType : 'FREE'))
+            : 'FREE'
+
+        async function prompt(prompter: Prompter<any>) {
+            prompter.recentItem = settings[key]
+            const response = await prompter.prompt()
+
+            if (isValidResponse(response)) {
+                return { ...settings, [key]: response }
+            } else {
+                return settings
+            }
+        }
+
+        switch (key) {
+            case 'alias':
+                return prompt(createAliasPrompter())
+            case 'instanceType':
+                return prompt(createInstancePrompter(subscriptionType))
+            case 'inactivityTimeoutMinutes':
+                return prompt(createTimeoutPrompter())
+            case 'persistentStorage':
+                return prompt(createStoragePrompter(subscriptionType))
+        }
+    }
+
+    public async submit(settings: DevEnvironmentSettings, source: SourceResponse) {
+        const devenv = await this.createDevEnvOfType(settings, source)
+        void this.commands.openDevEnv.execute(undefined, devenv)
+    }
+
+    public async createDevEnvOfType(settings: DevEnvironmentSettings, source: SourceResponse) {
+        const devenv: DevEnvironment = await (() => {
+            switch (source.type) {
+                case 'none':
+                    return this.createEmptyDevEnv(settings, source)
+                case 'linked':
+                    return this.createLinkedDevEnv(settings, source)
+            }
+        })()
+
+        telemetry.record({
+            source: 'Webview',
+            codecatalyst_createDevEnvironmentRepoType: source.type,
+        })
+
+        this.onComplete(devenv)
+        return devenv
+    }
+
+    private async createEmptyDevEnv(settings: DevEnvironmentSettings, source: EmptyResponse) {
+        return this.client.createDevEnvironment({
+            ides: [{ name: 'VSCode' }],
+            projectName: source.selectedProject.name,
+            spaceName: source.selectedProject.org.name,
+            ...settings,
+        })
+    }
+
+    private async createLinkedDevEnv(settings: DevEnvironmentSettings, source: LinkedResponse) {
+        const isNewBranch = !!source.newBranch
+        if (isNewBranch) {
+            await this.client.createSourceBranch({
+                name: source.newBranch,
+                spaceName: source.selectedProject.org.name,
+                projectName: source.selectedProject.name,
+                sourceRepositoryName: source.selectedBranch.repo.name,
+                headCommitId: source.selectedBranch.headCommitId,
+            })
+        }
+
+        const branchName = isNewBranch ? source.newBranch : source.selectedBranch.name.replace('refs/heads/', '')
+        return this.client.createDevEnvironment({
+            ides: [{ name: 'VSCode' }],
+            projectName: source.selectedProject.name,
+            spaceName: source.selectedProject.org.name,
+            repositories: [
+                {
+                    repositoryName: source.selectedBranch.repo.name,
+                    branchName,
+                },
+            ],
+            ...settings,
+        })
+    }
+}
+
+// TODO(sijaden): de-dupe this basic init pattern for webviews
+// the logic here is mainly to preserve the same panel in case the
+// user re-runs a command, which is fairly common
+const Panel = VueWebview.compilePanel(CodeCatalystCreateWebview)
+let activePanel: InstanceType<typeof Panel> | undefined
+let subscriptions: vscode.Disposable[] | undefined
+let submitPromise: Promise<void> | undefined
+
+export async function showCreateDevEnv(
+    client: CodeCatalystClient,
+    ctx: vscode.ExtensionContext,
+    commands: typeof CodeCatalystCommands.declared
+): Promise<void> {
+    submitPromise ??= new Promise<void>((resolve, reject) => {
+        activePanel ??= new Panel(ctx, client, commands, (devenv) => {
+            if (devenv === undefined) {
+                reject(new CancellationError('user'))
+            } else {
+                resolve()
+            }
+        })
+    })
+
+    const webview = await activePanel!.show({
+        title: localize('AWS.view.createDevEnv.title', 'Create a CodeCatalyst Dev Environment'),
+        viewColumn: vscode.ViewColumn.Active,
+    })
+
+    if (!subscriptions) {
+        subscriptions = [
+            webview.onDidDispose(() => {
+                vscode.Disposable.from(...(subscriptions ?? [])).dispose()
+                activePanel = undefined
+                subscriptions = undefined
+                submitPromise = undefined
+            }),
+        ]
+    }
+
+    return submitPromise
+}
diff --git a/packages/core/src/codecatalyst/vue/create/index.ts b/packages/core/src/codecatalyst/vue/create/index.ts
new file mode 100644
index 00000000000..fbd8dd1fb18
--- /dev/null
+++ b/packages/core/src/codecatalyst/vue/create/index.ts
@@ -0,0 +1,16 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { createApp } from 'vue'
+import component from './root.vue'
+
+const create = () => createApp(component)
+const app = create()
+app.mount('#vue-app')
+
+window.addEventListener('remount', () => {
+    app.unmount()
+    create().mount('#vue-app')
+})
diff --git a/src/codecatalyst/vue/create/root.vue b/packages/core/src/codecatalyst/vue/create/root.vue
similarity index 100%
rename from src/codecatalyst/vue/create/root.vue
rename to packages/core/src/codecatalyst/vue/create/root.vue
diff --git a/packages/core/src/codecatalyst/vue/create/source.vue b/packages/core/src/codecatalyst/vue/create/source.vue
new file mode 100644
index 00000000000..c3e8e60d293
--- /dev/null
+++ b/packages/core/src/codecatalyst/vue/create/source.vue
@@ -0,0 +1,349 @@
+<template>
+    <div class="modes mb-16">
+        <label class="mode-container" :data-disabled="model.type !== 'linked'">
+            <input class="radio" type="radio" name="mode" id="from-code-catalyst" v-model="model.type" value="linked" />
+            <span class="ml-8 option-label" style="padding: 0px">Use an existing CodeCatalyst repository</span>
+        </label>
+
+        <label class="mode-container" :data-disabled="model.type !== 'none'">
+            <input class="radio" type="radio" name="mode" id="from-none" v-model="model.type" value="none" />
+            <span class="ml-8 option-label" style="padding: 0px">Create an empty Dev Environment</span>
+        </label>
+    </div>
+
+    <div class="source-pickers" v-if="model.type === 'linked'">
+        <div class="modes flex-sizing mt-16">
+            <span class="flex-sizing mt-8">
+                <label class="option-label soft">Space</label>
+                <button class="project-button" @click="quickPickSpace()">
+                    {{ selectedSpaceName }}
+                    <span class="icon icon-lg icon-vscode-edit edit-icon"></span>
+                </button>
+            </span>
+
+            <span class="flex-sizing mt-8">
+                <label class="option-label soft">Project</label>
+                <button class="project-button" @click="quickPickProject()" :disabled="!isSpaceSelected">
+                    {{ selectedProjectName }}
+                    <span class="icon icon-lg icon-vscode-edit edit-icon"></span>
+                </button>
+            </span>
+        </div>
+
+        <div class="modes flex-sizing mt-16">
+            <!-- Existing branch -->
+            <span class="flex-sizing">
+                <label class="options-label soft mb-8" style="display: block" for="branch-picker">Branch</label>
+                <select
+                    id="branch-picker"
+                    class="picker"
+                    :disabled="!model.selectedProject"
+                    v-model="model.selectedBranch"
+                    @input="update"
+                >
+                    <option disabled :value="undefined">{{ branchPlaceholder }}</option>
+                    <option v-for="branch in availableBranches" :key="branch.id" :value="branch">
+                        {{ branchName(branch) }}
+                    </option>
+                </select>
+            </span>
+
+            <!-- New Branch -->
+            <span class="flex-sizing">
+                <label class="options-label soft mb-8" style="display: block" for="branch-input"
+                    >Create Branch - Optional for CodeCatalyst Repos</label
+                >
+                <input
+                    id="branch-input"
+                    type="text"
+                    :placeholder="newBranchNamePlaceholder"
+                    :disabled="!newBranchNameAllowed"
+                    v-model="model.newBranch"
+                    @input="update"
+                />
+
+                <div class="input-validation" v-if="branchError">{{ branchError }}</div>
+            </span>
+        </div>
+    </div>
+
+    <div class="source-pickers" v-if="model.type === 'none'">
+        <div class="modes flex-sizing mt-16">
+            <span class="flex-sizing mt-8">
+                <label class="option-label soft">Space</label>
+                <button class="project-button" @click="quickPickSpace()">
+                    {{ selectedSpaceName }}
+                    <span class="icon icon-lg icon-vscode-edit edit-icon"></span>
+                </button>
+            </span>
+
+            <span class="flex-sizing mt-8">
+                <label class="option-label soft">Project</label>
+                <button class="project-button" @click="quickPickProject()" :disabled="!isSpaceSelected">
+                    {{ selectedProjectName }}
+                    <span class="icon icon-lg icon-vscode-edit edit-icon"></span>
+                </button>
+            </span>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue'
+import { CodeCatalystBranch, CodeCatalystProject } from '../../../shared/clients/codecatalystClient'
+import { WebviewClientFactory } from '../../../webviews/client'
+import { createClass, createType } from '../../../webviews/util'
+import { CodeCatalystCreateWebview, SourceResponse } from './backend'
+
+const client = WebviewClientFactory.create<CodeCatalystCreateWebview>()
+
+type SourceModel = Partial<SourceResponse & { branchError: string }>
+
+export function isValidSource(source: SourceModel): source is SourceResponse {
+    if (source.type === 'linked') {
+        return !!source.selectedProject && !!source.selectedBranch && !source.branchError
+    } else if (source.type === 'none') {
+        return !!source.selectedProject
+    }
+
+    return false
+}
+
+export const VueModel = createClass<SourceModel>({ type: 'linked' })
+
+export default defineComponent({
+    name: 'source-code',
+    props: {
+        modelValue: {
+            type: createType(VueModel),
+            default: new VueModel(),
+        },
+    },
+    data() {
+        return {
+            projects: [] as CodeCatalystProject[],
+            branches: {} as Record<string, CodeCatalystBranch[] | undefined>,
+            loadingProjects: false,
+            loadingBranches: {} as Record<string, boolean | undefined>,
+            newBranchNameAllowed: false,
+            newBranchNamePlaceholder: 'Select branch first...',
+        }
+    },
+    async created() {
+        this.loadingProjects = true
+    },
+    watch: {
+        async 'model.selectedProject'(project?: CodeCatalystProject) {
+            this.useFirstBranch()
+
+            if (project && !this.branches[project.name]) {
+                this.loadingBranches[project.name] = true
+                this.branches[project.name] ??= await client.getBranches(project).finally(() => {
+                    this.loadingBranches[project.name] = false
+                })
+                this.useFirstBranch()
+            }
+        },
+        async 'model.selectedBranch'(branch?: CodeCatalystBranch) {
+            if (this.model.type !== 'linked' || branch === undefined) {
+                this.newBranchNameAllowed = false
+                this.newBranchNamePlaceholder = ''
+                return
+            }
+
+            // Disable user input for new branch name while calculating
+            this.newBranchNameAllowed = false
+            this.newBranchNamePlaceholder = 'Loading...'
+
+            // Clear the existing new branch value so user does not see it
+            const previousNewBranch = this.model.newBranch
+            this.$emit('update:modelValue', { ...this.model, newBranch: undefined })
+
+            // Only want to allow users to set a branch name if first party repo
+            const isThirdPartyRepo = await client.isThirdPartyRepo({
+                spaceName: branch.org.name,
+                projectName: branch.project.name,
+                sourceRepositoryName: branch.repo.name,
+            })
+            if (isThirdPartyRepo) {
+                this.newBranchNamePlaceholder = 'Not Applicable for Linked Repo'
+                this.newBranchNameAllowed = false
+                // Clear the new branch in case one was already selected
+                this.$emit('update:modelValue', { ...this.model, newBranch: undefined })
+            } else {
+                // First Party
+                this.newBranchNamePlaceholder = 'branch-name'
+                this.newBranchNameAllowed = true
+                // Since this can have a new branch, set this back to what it previously was
+                this.$emit('update:modelValue', { ...this.model, newBranch: previousNewBranch })
+            }
+        },
+    },
+    computed: {
+        model() {
+            return this.modelValue
+        },
+        loading() {
+            if (this.model.type !== 'linked' || !this.model.selectedProject) {
+                return false
+            }
+
+            return this.loadingBranches[this.model.selectedProject.name] ?? false
+        },
+        branchPlaceholder() {
+            if (this.loading) {
+                return 'Loading...'
+            }
+
+            return (this.availableBranches?.length ?? 0) === 0 ? 'No branches found' : 'Select a branch'
+        },
+        availableBranches() {
+            if (this.model.type !== 'linked' || !this.model.selectedProject) {
+                return []
+            }
+
+            return this.branches[this.model.selectedProject.name]
+        },
+        branchError() {
+            if (this.model.type !== 'linked' || !this.model.newBranch) {
+                return
+            }
+
+            const branch = this.model.newBranch
+            if (!!branch && this.availableBranches?.find(b => b.name === `refs/heads/${branch}`) !== undefined) {
+                return 'Branch already exists'
+            }
+        },
+        isSpaceSelected() {
+            return !!this.model.selectedSpace
+        },
+        isProjectSelected() {
+            return !!this.model.selectedProject
+        },
+        selectedSpaceName() {
+            if (this.model.selectedSpace === undefined) {
+                return 'Not Selected'
+            }
+            return this.model.selectedSpace.name
+        },
+        selectedProjectName() {
+            if (this.model.selectedProject === undefined) {
+                return 'Not Selected'
+            }
+            return this.model.selectedProject.name
+        },
+    },
+    methods: {
+        update() {
+            this.model.branchError = this.branchError
+            this.$emit('update:modelValue', this.model)
+        },
+        branchName(branch: CodeCatalystBranch) {
+            return `${branch.repo.name} / ${branch.name.replace('refs/heads/', '')}`
+        },
+        useFirstBranch() {
+            if (this.model.type !== 'linked') {
+                return
+            }
+
+            Object.assign<typeof this.model, Partial<SourceModel>>(this.model, {
+                selectedBranch: this.availableBranches?.[0],
+            })
+            this.update()
+        },
+        async quickPickSpace() {
+            const space = await client.quickPickSpace()
+            if (space === undefined) {
+                return
+            }
+            this.$emit('update:modelValue', { ...this.modelValue, selectedSpace: space, selectedProject: undefined })
+        },
+        async quickPickProject() {
+            const selectedSpace = this.modelValue.selectedSpace
+            if (selectedSpace === undefined) {
+                return
+            }
+
+            const project = await client.quickPickProject(selectedSpace.name)
+            if (project === undefined) {
+                return
+            }
+            this.$emit('update:modelValue', { ...this.modelValue, selectedProject: project })
+        },
+    },
+    emits: {
+        'update:modelValue': (value: InstanceType<typeof VueModel>) => true,
+    },
+})
+</script>
+
+<style scope>
+.picker {
+    min-width: 300px;
+    width: 100%;
+    box-sizing: border-box;
+}
+
+.source-pickers {
+    margin-top: 16px;
+    display: flex;
+    flex-flow: wrap;
+    column-gap: 16px;
+}
+
+.modes {
+    display: flex;
+    column-gap: 16px;
+}
+
+.flex-sizing {
+    flex: 1;
+}
+
+.mode-container {
+    display: flex;
+    flex: 1;
+    border: 1px solid gray;
+    padding: 8px;
+    max-width: calc((1 / 3 * 100%) - (2 / 3 * 32px));
+    align-items: center;
+}
+
+.config-item {
+    display: inline;
+    margin-left: 8px;
+}
+
+.mode-container[data-disabled='false'] {
+    border: 1px solid var(--vscode-focusBorder);
+}
+
+body.vscode-dark .mode-container[data-disabled='true'] .config-item {
+    filter: brightness(0.8);
+}
+
+body.vscode-light .mode-container[data-disabled='true'] .config-item {
+    filter: brightness(1.2);
+}
+
+#repository-url {
+    min-width: 300px;
+}
+
+#branch-input {
+    min-width: 300px;
+    width: 100%;
+    box-sizing: border-box;
+}
+
+.project-button {
+    background-color: transparent;
+    padding-left: 0;
+    padding-right: 0;
+    font-weight: bold;
+}
+
+.edit-icon {
+    color: #0078d7;
+}
+</style>
diff --git a/src/codecatalyst/vue/devfile.vue b/packages/core/src/codecatalyst/vue/devfile.vue
similarity index 100%
rename from src/codecatalyst/vue/devfile.vue
rename to packages/core/src/codecatalyst/vue/devfile.vue
diff --git a/src/codecatalyst/vue/summary.vue b/packages/core/src/codecatalyst/vue/summary.vue
similarity index 99%
rename from src/codecatalyst/vue/summary.vue
rename to packages/core/src/codecatalyst/vue/summary.vue
index 20887ce0e27..38ac2e1d18c 100644
--- a/src/codecatalyst/vue/summary.vue
+++ b/packages/core/src/codecatalyst/vue/summary.vue
@@ -157,7 +157,7 @@ export default defineComponent({
 
 #stop-icon {
     color: var(--vscode-debugIcon-stopForeground);
-    padding: 4px;
+    margin-right: 5px;
     vertical-align: -0.2em;
 }
 </style>
diff --git a/src/codecatalyst/wizards/devenvSettings.ts b/packages/core/src/codecatalyst/wizards/devenvSettings.ts
similarity index 85%
rename from src/codecatalyst/wizards/devenvSettings.ts
rename to packages/core/src/codecatalyst/wizards/devenvSettings.ts
index 1150c0a73a2..676b65fb74c 100644
--- a/src/codecatalyst/wizards/devenvSettings.ts
+++ b/packages/core/src/codecatalyst/wizards/devenvSettings.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -10,8 +10,8 @@ import { Prompter } from '../../shared/ui/prompter'
 import { toTitleCase } from '../../shared/utilities/textUtilities'
 
 const devenvOptions = settings['environment']
-export type InstanceType = keyof typeof devenvOptions['instanceType']
-export type SubscriptionType = typeof subscriptionTypes[number]
+export type InstanceType = keyof (typeof devenvOptions)['instanceType']
+export type SubscriptionType = (typeof subscriptionTypes)[number]
 
 const subscriptionTypes = ['FREE', 'STANDARD'] as const
 
@@ -19,7 +19,7 @@ export function isValidSubscriptionType(type = ''): type is SubscriptionType {
     return (subscriptionTypes as readonly string[]).includes(type)
 }
 
-interface InstanceDescription {
+export interface InstanceDescription {
     name: string
     specs: string
 }
@@ -50,7 +50,9 @@ export function getInstanceDescription(type: InstanceType): InstanceDescription
 
 export function getAllInstanceDescriptions(): { [key: string]: InstanceDescription } {
     const desc: { [key: string]: InstanceDescription } = {}
-    entries(devenvOptions.instanceType).forEach(([k]) => (desc[k] = getInstanceDescription(k)))
+    for (const [k] of entries(devenvOptions.instanceType)) {
+        desc[k] = getInstanceDescription(k)
+    }
     return desc
 }
 
@@ -72,14 +74,14 @@ export function createTimeoutPrompter(): Prompter<number> {
     return createInputBox({
         title: 'Timeout Length',
         placeholder: 'Timeout length in minutes',
-        validateInput: resp => (Number.isNaN(Number(resp)) ? 'Timeout must be a number' : undefined),
-    }).transform(r => Number(r))
+        validateInput: (resp) => (Number.isNaN(Number(resp)) ? 'Timeout must be a number' : undefined),
+    }).transform(Number)
 }
 
 export function createAliasPrompter(): InputBoxPrompter {
     return createInputBox({
         title: 'Edit Alias',
-        validateInput: value => {
+        validateInput: (value) => {
             if (value?.length > 128) {
                 return 'Dev Environment alias cannot be longer than 128 characters'
             }
@@ -89,7 +91,7 @@ export function createAliasPrompter(): InputBoxPrompter {
 
 export function createStoragePrompter(subscriptionType: SubscriptionType): QuickPickPrompter<{ sizeInGiB: number }> {
     const isSupported = (v: number) => subscriptionType !== 'FREE' || v === 16
-    const items = settings.environment.persistentStorageSize.map(v => ({
+    const items = settings.environment.persistentStorageSize.map((v) => ({
         data: { sizeInGiB: v },
         label: `${v} GB`,
         description: isSupported(v) ? '' : 'unavailable in current organization billing tier',
diff --git a/src/codecatalyst/wizards/parameterDescriptions.json b/packages/core/src/codecatalyst/wizards/parameterDescriptions.json
similarity index 100%
rename from src/codecatalyst/wizards/parameterDescriptions.json
rename to packages/core/src/codecatalyst/wizards/parameterDescriptions.json
diff --git a/packages/core/src/codecatalyst/wizards/selectResource.ts b/packages/core/src/codecatalyst/wizards/selectResource.ts
new file mode 100644
index 00000000000..54e3bb20951
--- /dev/null
+++ b/packages/core/src/codecatalyst/wizards/selectResource.ts
@@ -0,0 +1,238 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as codecatalyst from '../../shared/clients/codecatalystClient'
+import { createCommonButtons, createRefreshButton } from '../../shared/ui/buttons'
+import {
+    createQuickPick,
+    DataQuickPickItem,
+    ExtendedQuickPickOptions,
+    QuickPickPrompter,
+} from '../../shared/ui/pickerPrompter'
+import { AsyncCollection } from '../../shared/utilities/asyncCollection'
+import { isValidResponse } from '../../shared/wizards/wizard'
+import { associateDevEnv, docs } from '../model'
+import { getHelpUrl, isDevenvVscode } from '../utils'
+import { getLogger } from '../../shared/logger/logger'
+import { getRelativeDate } from '../../shared/datetime'
+
+export function createRepoLabel(r: codecatalyst.CodeCatalystRepo): string {
+    return `${r.org.name} / ${r.project.name} / ${r.name}`
+}
+
+/**
+ * Maps CodeCatalystFoo objects to `vscode.QuickPickItem` objects.
+ */
+export function asQuickpickItem<T extends codecatalyst.CodeCatalystResource>(resource: T): DataQuickPickItem<T> {
+    switch (resource.type) {
+        case 'project':
+            return {
+                label: `${resource.org.name} / ${resource.name}`,
+                description: resource.description,
+                data: resource,
+            }
+        case 'repo':
+            return {
+                label: createRepoLabel(resource),
+                description: resource.description,
+                data: resource,
+            }
+        case 'devEnvironment':
+            return { ...fromDevEnv(resource), data: resource }
+        case 'org':
+            return { label: resource.name, detail: resource.description, data: resource }
+        default:
+            return { label: resource.name, data: resource }
+    }
+}
+
+function fromDevEnv(env: codecatalyst.DevEnvironment): Omit<DataQuickPickItem<unknown>, 'data'> {
+    const labelParts = [] as string[]
+
+    if (env.status === 'RUNNING') {
+        labelParts.push('$(pass)')
+    } else {
+        labelParts.push('$(circle-slash)') // TODO(sijaden): get actual 'stopped' icon
+    }
+
+    labelParts.push(env.alias ? env.alias : env.id)
+
+    const repo = env.repositories[0]
+    const branchName = repo?.branchName?.replace('refs/heads/', '')
+    const repoLabel = repo
+        ? branchName
+            ? `${repo.repositoryName}/${branchName}`
+            : repo.repositoryName
+        : '(no repository)'
+
+    const statusLabel = env.status === 'RUNNING' ? 'RUNNING - IN USE' : env.status
+    const desc = `${statusLabel} ${getRelativeDate(env.lastUpdatedTime)}`
+
+    return {
+        label: labelParts.join(' '),
+        description: desc,
+        detail: `${env.org.name}/${env.project.name}/${repoLabel}`,
+    }
+}
+
+function createResourcePrompter<T extends codecatalyst.CodeCatalystResource>(
+    resources: AsyncCollection<T[]>,
+    helpUri: vscode.Uri,
+    presentation: Omit<ExtendedQuickPickOptions<T>, 'buttons'>
+): QuickPickPrompter<T> {
+    const refresh = createRefreshButton()
+    const items = resources.map((p) => p.map(asQuickpickItem))
+    const prompter = createQuickPick(items, {
+        buttons: [refresh, ...createCommonButtons(helpUri)],
+        ...presentation,
+        matchOnDetail: true,
+    })
+
+    refresh.onClick = () => {
+        prompter.clearAndLoadItems(items).catch((e) => {
+            getLogger().error('clearAndLoadItems failed: %s', (e as Error).message)
+        })
+    }
+
+    return prompter
+}
+
+export function createOrgPrompter(
+    client: codecatalyst.CodeCatalystClient
+): QuickPickPrompter<codecatalyst.CodeCatalystOrg> {
+    const helpUri = docs.main
+    return createResourcePrompter(client.listSpaces(), helpUri, {
+        title: 'Select a CodeCatalyst Organization',
+        placeholder: 'Search for an Organization',
+    })
+}
+
+export function createProjectPrompter(
+    client: codecatalyst.CodeCatalystClient,
+    spaceName?: codecatalyst.CodeCatalystOrg['name']
+): QuickPickPrompter<codecatalyst.CodeCatalystProject> {
+    const helpUri = docs.main
+    const projects = spaceName ? client.listProjects({ spaceName }) : client.listResources('project')
+
+    return createResourcePrompter(projects, helpUri, {
+        title: 'Select a CodeCatalyst Project',
+        placeholder: 'Search for a Project',
+    })
+}
+
+export function createRepoPrompter(
+    client: codecatalyst.CodeCatalystClient,
+    proj?: codecatalyst.CodeCatalystProject,
+    thirdParty?: boolean
+): QuickPickPrompter<codecatalyst.CodeCatalystRepo> {
+    const helpUri = docs.main
+    const repos = proj
+        ? client.listSourceRepositories({ spaceName: proj.org.name, projectName: proj.name }, thirdParty)
+        : client.listResources('repo', thirdParty)
+
+    return createResourcePrompter(repos, helpUri, {
+        title: 'Select a CodeCatalyst Repository',
+        placeholder: 'Search for a CodeCatalyst Repository',
+    })
+}
+
+export function createDevEnvPrompter(
+    client: codecatalyst.CodeCatalystClient,
+    proj?: codecatalyst.CodeCatalystProject
+): QuickPickPrompter<codecatalyst.DevEnvironment> {
+    const helpUri = docs.devenv
+    const envs = proj ? client.listDevEnvironments(proj) : client.listResources('devEnvironment')
+    const filtered = envs.map((arr) => arr.filter((env) => isDevenvVscode(env.ides)))
+    const isData = <T>(obj: T | DataQuickPickItem<T>['data']): obj is T => {
+        return typeof obj !== 'function' && isValidResponse(obj)
+    }
+
+    return createResourcePrompter(filtered, helpUri, {
+        title: 'Select a CodeCatalyst Dev Environment',
+        placeholder: 'Search for a Dev Environment',
+        compare: (a, b) => {
+            if (isData(a.data) && isData(b.data)) {
+                return b.data.lastUpdatedTime.getTime() - a.data.lastUpdatedTime.getTime()
+            }
+
+            return 0
+        },
+    })
+}
+
+type ResourceType = codecatalyst.CodeCatalystResource['type']
+
+export async function selectCodeCatalystResource<T extends ResourceType>(
+    client: codecatalyst.CodeCatalystClient,
+    type: T & ResourceType
+): Promise<(codecatalyst.CodeCatalystResource & { type: typeof type }) | undefined> {
+    const prompter = (() => {
+        switch (type as ResourceType) {
+            case 'org':
+                return createOrgPrompter(client)
+            case 'project':
+                return createProjectPrompter(client)
+            case 'repo':
+                return createRepoPrompter(client)
+            case 'branch':
+                throw new Error('Picking a branch is not supported')
+            case 'devEnvironment':
+                return createDevEnvPrompter(client)
+        }
+    })()
+
+    const response = await prompter.prompt()
+    return isValidResponse(response) ? (response as codecatalyst.CodeCatalystResource & { type: T }) : undefined
+}
+
+export async function selectCodeCatalystRepository(
+    client: codecatalyst.CodeCatalystClient,
+    includeThirdPartyRepos?: boolean
+): Promise<codecatalyst.CodeCatalystRepo | undefined> {
+    const prompter = createRepoPrompter(client, undefined, includeThirdPartyRepos)
+    const response = await prompter.prompt()
+    return isValidResponse(response) ? response : undefined
+}
+
+/**
+ * Special-case of {@link createRepoPrompter} for creating a new devenv
+ */
+export async function selectRepoForDevEnv(
+    client: codecatalyst.CodeCatalystClient
+): Promise<codecatalyst.CodeCatalystRepo | undefined> {
+    const repos = associateDevEnv(client, client.listResources('repo').flatten())
+
+    const refresh = createRefreshButton()
+    const items = repos.map((repo) => [
+        {
+            ...asQuickpickItem(repo),
+            invalidSelection: repo.devEnv !== undefined,
+            description: repo.devEnv ? `Repository already has a Dev Environment` : '',
+        },
+    ])
+
+    const prompter = createQuickPick(items, {
+        buttons: [refresh, ...createCommonButtons(getHelpUrl())],
+        title: 'Select a CodeCatalyst Repository',
+        placeholder: 'Search for a Repository',
+        compare: (a, b) => {
+            if (a.invalidSelection === b.invalidSelection) {
+                return 0
+            }
+
+            return a.invalidSelection ? 1 : b.invalidSelection ? -1 : 0
+        },
+    })
+
+    refresh.onClick = () => {
+        prompter.clearAndLoadItems(items).catch((e) => {
+            getLogger().error('clearAndLoadItems failed: %s', (e as Error).message)
+        })
+    }
+
+    const response = await prompter.prompt()
+    return isValidResponse(response) ? response : undefined
+}
diff --git a/packages/core/src/codewhisperer/activation.ts b/packages/core/src/codewhisperer/activation.ts
new file mode 100644
index 00000000000..e037657958d
--- /dev/null
+++ b/packages/core/src/codewhisperer/activation.ts
@@ -0,0 +1,488 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+import * as CodeWhispererConstants from './models/constants'
+import {
+    CodeSuggestionsState,
+    CodeScansState,
+    SecurityTreeViewFilterState,
+    AggregatedCodeScanIssue,
+    CodeScanIssue,
+    CodeIssueGroupingStrategyState,
+} from './models/model'
+import { CodeWhispererSettings } from './util/codewhispererSettings'
+import { ExtContext } from '../shared/extensions'
+import { CodeWhispererTracker } from './tracker/codewhispererTracker'
+import * as codewhispererClient from './client/codewhisperer'
+import { getLogger } from '../shared/logger/logger'
+import {
+    enableCodeSuggestions,
+    toggleCodeSuggestions,
+    showReferenceLog,
+    showLogs,
+    showSecurityScan,
+    showLearnMore,
+    showSsoSignIn,
+    showFreeTierLimit,
+    updateReferenceLog,
+    showIntroduction,
+    reconnect,
+    openSecurityIssuePanel,
+    selectCustomizationPrompt,
+    notifyNewCustomizationsCmd,
+    connectWithCustomization,
+    applySecurityFix,
+    signoutCodeWhisperer,
+    toggleCodeScans,
+    registerToolkitApiCallback,
+    showFileScan,
+    clearFilters,
+    generateFix,
+    explainIssue,
+    ignoreIssue,
+    rejectFix,
+    showSecurityIssueFilters,
+    regenerateFix,
+    ignoreAllIssues,
+    focusIssue,
+    showCodeIssueGroupingQuickPick,
+    selectRegionProfileCommand,
+} from './commands/basicCommands'
+import { ReferenceLogViewProvider } from './service/referenceLogViewProvider'
+import { ReferenceHoverProvider } from './service/referenceHoverProvider'
+import { ReferenceInlineProvider } from './service/referenceInlineProvider'
+import {
+    disposeSecurityDiagnostic,
+    securityScanRender,
+    updateSecurityDiagnosticCollection,
+} from './service/diagnosticsProvider'
+import { SecurityPanelViewProvider, openEditorAtRange } from './views/securityPanelViewProvider'
+import { Commands, registerCommandErrorHandler, registerDeclaredCommands } from '../shared/vscode/commands2'
+import { refreshStatusBar } from './service/statusBar'
+import { AuthUtil } from './util/authUtil'
+import { ImportAdderProvider } from './service/importAdderProvider'
+import { openUrl } from '../shared/utilities/vsCodeUtils'
+import { notifyNewCustomizations, onProfileChangedListener } from './util/customizationUtil'
+import { CodeWhispererCommandBackend, CodeWhispererCommandDeclarations } from './commands/gettingStartedPageCommands'
+import { SecurityIssueHoverProvider } from './service/securityIssueHoverProvider'
+import { SecurityIssueCodeActionProvider } from './service/securityIssueCodeActionProvider'
+import { listCodeWhispererCommands } from './ui/statusBarMenu'
+import { debounceStartSecurityScan } from './commands/startSecurityScan'
+import { securityScanLanguageContext } from './util/securityScanLanguageContext'
+import { registerWebviewErrorHandler } from '../webviews/server'
+import { logAndShowError, logAndShowWebviewError } from '../shared/utilities/logAndShowUtils'
+import { openSettings } from '../shared/settings'
+import { telemetry } from '../shared/telemetry/telemetry'
+import { FeatureConfigProvider } from '../shared/featureConfig'
+import { SecurityIssueProvider } from './service/securityIssueProvider'
+import { SecurityIssueTreeViewProvider } from './service/securityIssueTreeViewProvider'
+import { setContext } from '../shared/vscode/setContext'
+import { syncSecurityIssueWebview } from './views/securityIssue/securityIssueWebview'
+import { detectCommentAboveLine } from '../shared/utilities/commentUtils'
+import { activateEditTracking } from './nextEditPrediction/activation'
+import { notifySelectDeveloperProfile } from './region/utils'
+
+let localize: nls.LocalizeFunc
+
+export async function activate(context: ExtContext): Promise<void> {
+    localize = nls.loadMessageBundle()
+
+    // Import old CodeWhisperer settings into Amazon Q
+    await CodeWhispererSettings.instance.importSettings()
+
+    // initialize AuthUtil earlier to make sure it can listen to connection change events.
+    const auth = AuthUtil.instance
+    auth.initCodeWhispererHooks()
+
+    // TODO: is this indirection useful?
+    registerDeclaredCommands(
+        context.extensionContext.subscriptions,
+        CodeWhispererCommandDeclarations.instance,
+        new CodeWhispererCommandBackend(context.extensionContext)
+    )
+
+    /**
+     * CodeWhisperer security panel
+     */
+    const securityPanelViewProvider = new SecurityPanelViewProvider(context.extensionContext)
+    context.extensionContext.subscriptions.push(
+        vscode.window.registerWebviewViewProvider(SecurityPanelViewProvider.viewType, securityPanelViewProvider)
+    )
+
+    // TODO: this is already done in packages/core/src/extensionCommon.ts, why doesn't amazonq use that?
+    registerCommandErrorHandler((info, error) => {
+        const defaultMessage = localize('AWS.generic.message.error', 'Failed to run command: {0}', info.id)
+        void logAndShowError(localize, error, info.id, defaultMessage)
+    })
+
+    // TODO: this is already done in packages/core/src/extensionCommon.ts, why doesn't amazonq use that?
+    registerWebviewErrorHandler((error: unknown, webviewId: string, command: string) => {
+        return logAndShowWebviewError(localize, error, webviewId, command)
+    })
+
+    /**
+     * Service control
+     */
+    const client = new codewhispererClient.DefaultCodeWhispererClient()
+
+    // Service initialization
+    ReferenceInlineProvider.instance
+    ImportAdderProvider.instance
+
+    context.extensionContext.subscriptions.push(
+        // register toolkit api callback
+        registerToolkitApiCallback.register(),
+        signoutCodeWhisperer.register(auth),
+        /**
+         * Configuration change
+         */
+        vscode.workspace.onDidChangeConfiguration(async (configurationChangeEvent) => {
+            if (configurationChangeEvent.affectsConfiguration('amazonQ.showCodeWithReferences')) {
+                ReferenceLogViewProvider.instance.update()
+                if (auth.isEnterpriseSsoInUse()) {
+                    await vscode.window
+                        .showInformationMessage(
+                            CodeWhispererConstants.ssoConfigAlertMessage,
+                            CodeWhispererConstants.settingsLearnMore
+                        )
+                        .then(async (resp) => {
+                            if (resp === CodeWhispererConstants.settingsLearnMore) {
+                                void openUrl(vscode.Uri.parse(CodeWhispererConstants.learnMoreUri))
+                            }
+                        })
+                }
+            }
+
+            if (configurationChangeEvent.affectsConfiguration('editor.inlineSuggest.enabled')) {
+                await vscode.window
+                    .showInformationMessage(
+                        CodeWhispererConstants.reloadWindowPrompt,
+                        CodeWhispererConstants.reloadWindow
+                    )
+                    .then((selected) => {
+                        if (selected === CodeWhispererConstants.reloadWindow) {
+                            void vscode.commands.executeCommand('workbench.action.reloadWindow')
+                        }
+                    })
+            }
+
+            if (configurationChangeEvent.affectsConfiguration('amazonQ.ignoredSecurityIssues')) {
+                const ignoredIssues = CodeWhispererSettings.instance.getIgnoredSecurityIssues()
+                toggleIssuesVisibility((issue) => !ignoredIssues.includes(issue.title))
+            }
+        }),
+        /**
+         * Open Configuration
+         */
+        Commands.register('aws.amazonq.configure', async (id) => {
+            if (id === 'codewhisperer') {
+                await vscode.commands.executeCommand(
+                    'workbench.action.openSettings',
+                    `@id:amazonQ.showCodeWithReferences`
+                )
+            } else {
+                await openSettings('amazonQ')
+            }
+        }),
+        // TODO port this to lsp
+        // Commands.register('aws.amazonq.refreshAnnotation', async (forceProceed: boolean) => {
+        //     telemetry.record({
+        //         traceId: TelemetryHelper.instance.traceId,
+        //     })
+
+        //     const editor = vscode.window.activeTextEditor
+        //     if (editor) {
+        //         if (forceProceed) {
+        //             await container.lineAnnotationController.refresh(editor, 'codewhisperer', true)
+        //         } else {
+        //             await container.lineAnnotationController.refresh(editor, 'codewhisperer')
+        //         }
+        //     }
+        // }),
+        // show introduction
+        showIntroduction.register(),
+        // toggle code suggestions
+        toggleCodeSuggestions.register(CodeSuggestionsState.instance),
+        // toggle code scans
+        toggleCodeScans.register(CodeScansState.instance),
+        // enable code suggestions
+        enableCodeSuggestions.register(context),
+        // project scan
+        showSecurityScan.register(context, securityPanelViewProvider, client),
+        // on demand file scan
+        showFileScan.register(context, securityPanelViewProvider, client),
+        // show security issue webview panel
+        openSecurityIssuePanel.register(context),
+        // sign in with sso or AWS ID
+        showSsoSignIn.register(),
+        // show reconnect prompt
+        reconnect.register(),
+        // learn more about CodeWhisperer
+        showLearnMore.register(),
+        // show free tier limit
+        showFreeTierLimit.register(),
+        // update reference log instance
+        updateReferenceLog.register(),
+        // refresh codewhisperer status bar
+        refreshStatusBar.register(),
+        // generate code fix
+        generateFix.register(client, context),
+        // regenerate code fix
+        regenerateFix.register(),
+        // apply suggested fix
+        applySecurityFix.register(),
+        // reject suggested fix
+        rejectFix.register(context.extensionContext),
+        // ignore issues by title
+        ignoreAllIssues.register(),
+        // ignore single issue
+        ignoreIssue.register(),
+        // explain issue
+        explainIssue.register(),
+        // quick pick with codewhisperer options
+        listCodeWhispererCommands.register(),
+        // quick pick with security issues tree filters
+        showSecurityIssueFilters.register(),
+        // quick pick code issue grouping strategy
+        showCodeIssueGroupingQuickPick.register(),
+        // reset security issue filters
+        clearFilters.register(),
+        // handle security issues tree item clicked
+        focusIssue.register(),
+        // refresh the treeview on every change
+        SecurityTreeViewFilterState.instance.onDidChangeState((e) => {
+            SecurityIssueTreeViewProvider.instance.refresh()
+        }),
+        // refresh treeview when grouping strategy changes
+        CodeIssueGroupingStrategyState.instance.onDidChangeState((e) => {
+            SecurityIssueTreeViewProvider.instance.refresh()
+        }),
+        // show a no match state
+        SecurityIssueTreeViewProvider.instance.onDidChangeTreeData((e) => {
+            const noMatches =
+                Array.isArray(e) &&
+                e.length === 0 &&
+                SecurityIssueProvider.instance.issues.some((group) => group.issues.some((issue) => issue.visible))
+            void setContext('aws.amazonq.security.noMatches', noMatches)
+        }),
+        // select customization
+        selectCustomizationPrompt.register(),
+        // notify new customizations
+        notifyNewCustomizationsCmd.register(),
+        selectRegionProfileCommand.register(),
+
+        // direct CodeWhisperer connection setup with customization
+        connectWithCustomization.register(),
+
+        vscode.languages.registerHoverProvider(
+            [...CodeWhispererConstants.platformLanguageIds],
+            ReferenceHoverProvider.instance
+        ),
+        vscode.window.registerWebviewViewProvider(ReferenceLogViewProvider.viewType, ReferenceLogViewProvider.instance),
+        showReferenceLog.register(),
+        showLogs.register(),
+        vscode.languages.registerCodeLensProvider(
+            [...CodeWhispererConstants.platformLanguageIds],
+            ReferenceInlineProvider.instance
+        ),
+        vscode.languages.registerCodeLensProvider(
+            [...CodeWhispererConstants.platformLanguageIds, { scheme: 'untitled' }],
+            ImportAdderProvider.instance
+        ),
+        vscode.languages.registerHoverProvider(
+            [...CodeWhispererConstants.securityScanLanguageIds],
+            SecurityIssueHoverProvider.instance
+        ),
+        vscode.languages.registerCodeActionsProvider(
+            [...CodeWhispererConstants.securityScanLanguageIds],
+            SecurityIssueCodeActionProvider.instance
+        ),
+        vscode.commands.registerCommand('aws.amazonq.openEditorAtRange', openEditorAtRange),
+        auth.regionProfileManager.onDidChangeRegionProfile(onProfileChangedListener)
+    )
+
+    // run the auth startup code with context for telemetry
+    await telemetry.function_call.run(
+        async () => {
+            await auth.restore()
+            await auth.clearExtraConnections()
+
+            if (auth.isConnectionExpired()) {
+                auth.showReauthenticatePrompt().catch((e) => {
+                    const defaulMsg = localize('AWS.generic.message.error', 'Failed to reauth:')
+                    void logAndShowError(localize, e, 'showReauthenticatePrompt', defaulMsg)
+                })
+                if (auth.isEnterpriseSsoInUse()) {
+                    await auth.notifySessionConfiguration()
+                }
+            }
+
+            if (auth.requireProfileSelection()) {
+                await notifySelectDeveloperProfile()
+            }
+        },
+        { emit: false, functionId: { name: 'activateCwCore' } }
+    )
+
+    if (auth.isValidEnterpriseSsoInUse()) {
+        await notifyNewCustomizations()
+    }
+    if (auth.isBuilderIdInUse()) {
+        await CodeScansState.instance.setScansEnabled(false)
+    }
+
+    /**
+     * CodeWhisperer auto scans
+     */
+    setSubscriptionsForAutoScans()
+
+    setSubscriptionsForCodeIssues()
+
+    function shouldRunAutoScan(editor: vscode.TextEditor | undefined, isScansEnabled?: boolean) {
+        return (
+            (isScansEnabled ?? CodeScansState.instance.isScansEnabled()) &&
+            !CodeScansState.instance.isMonthlyQuotaExceeded() &&
+            auth.isConnectionValid() &&
+            !auth.isBuilderIdInUse() &&
+            editor &&
+            editor.document.uri.scheme === 'file' &&
+            securityScanLanguageContext.isLanguageSupported(editor.document.languageId)
+        )
+    }
+
+    function setSubscriptionsForAutoScans() {
+        // Initial scan when the editor opens for the first time
+        const editor = vscode.window.activeTextEditor
+        if (editor && shouldRunAutoScan(editor) && editor.document.getText().length > 0) {
+            void debounceStartSecurityScan(
+                securityPanelViewProvider,
+                editor,
+                client,
+                context.extensionContext,
+                CodeWhispererConstants.CodeAnalysisScope.FILE_AUTO,
+                false
+            )
+        }
+
+        context.extensionContext.subscriptions.push(
+            // Trigger scan if focus switches to a different file
+            vscode.window.onDidChangeActiveTextEditor((editor) => {
+                const codewhispererDiagnostics = editor
+                    ? securityScanRender.securityDiagnosticCollection
+                          ?.get(editor.document.uri)
+                          ?.filter(({ source }) => source === CodeWhispererConstants.codewhispererDiagnosticSourceLabel)
+                    : undefined
+
+                if (
+                    editor &&
+                    shouldRunAutoScan(editor) &&
+                    editor.document.getText().length > 0 &&
+                    (!codewhispererDiagnostics || codewhispererDiagnostics?.length === 0)
+                ) {
+                    void debounceStartSecurityScan(
+                        securityPanelViewProvider,
+                        editor,
+                        client,
+                        context.extensionContext,
+                        CodeWhispererConstants.CodeAnalysisScope.FILE_AUTO,
+                        false
+                    )
+                }
+            }),
+            // Trigger scan if the file contents change
+            vscode.workspace.onDidChangeTextDocument(async (event) => {
+                const editor = vscode.window.activeTextEditor
+                if (
+                    editor &&
+                    shouldRunAutoScan(editor) &&
+                    event.document === editor.document &&
+                    event.contentChanges.length > 0
+                ) {
+                    void debounceStartSecurityScan(
+                        securityPanelViewProvider,
+                        editor,
+                        client,
+                        context.extensionContext,
+                        CodeWhispererConstants.CodeAnalysisScope.FILE_AUTO,
+                        false
+                    )
+                }
+            })
+        )
+
+        // Trigger scan if the toggle has just been enabled
+        CodeScansState.instance.onDidChangeState((isScansEnabled) => {
+            const editor = vscode.window.activeTextEditor
+            if (editor && shouldRunAutoScan(editor, isScansEnabled) && editor.document.getText().length > 0) {
+                void debounceStartSecurityScan(
+                    securityPanelViewProvider,
+                    editor,
+                    client,
+                    context.extensionContext,
+                    CodeWhispererConstants.CodeAnalysisScope.FILE_AUTO,
+                    false
+                )
+            }
+        })
+    }
+
+    void FeatureConfigProvider.instance.fetchFeatureConfigs().catch((error) => {
+        getLogger().error('Failed to fetch feature configs - %s', error)
+    })
+
+    await Commands.tryExecute('aws.amazonq.refreshConnectionCallback')
+
+    function setSubscriptionsForCodeIssues() {
+        context.extensionContext.subscriptions.push(
+            vscode.workspace.onDidChangeTextDocument(async (e) => {
+                if (e.document.uri.scheme !== 'file') {
+                    return
+                }
+                const diagnostics = securityScanRender.securityDiagnosticCollection?.get(e.document.uri)
+                if (!diagnostics || diagnostics.length === 0) {
+                    return
+                }
+                disposeSecurityDiagnostic(e)
+
+                SecurityIssueProvider.instance.handleDocumentChange(e)
+                SecurityIssueTreeViewProvider.instance.refresh()
+                await syncSecurityIssueWebview(context)
+
+                toggleIssuesVisibility((issue, filePath) =>
+                    filePath !== e.document.uri.fsPath
+                        ? issue.visible
+                        : !detectCommentAboveLine(
+                              e.document,
+                              issue.startLine,
+                              CodeWhispererConstants.amazonqIgnoreNextLine
+                          )
+                )
+            }),
+            vscode.window.createTreeView(SecurityIssueTreeViewProvider.viewType, {
+                treeDataProvider: SecurityIssueTreeViewProvider.instance,
+            })
+        )
+    }
+
+    activateEditTracking(context)
+}
+
+export async function shutdown() {
+    await CodeWhispererTracker.getTracker().shutdown()
+}
+
+function toggleIssuesVisibility(visibleCondition: (issue: CodeScanIssue, filePath: string) => boolean) {
+    const updatedIssues: AggregatedCodeScanIssue[] = SecurityIssueProvider.instance.issues.map((group) => ({
+        ...group,
+        issues: group.issues.map((issue) => ({ ...issue, visible: visibleCondition(issue, group.filePath) })),
+    }))
+    for (const issue of updatedIssues) {
+        updateSecurityDiagnosticCollection(issue)
+    }
+    SecurityIssueProvider.instance.issues = updatedIssues
+    SecurityIssueTreeViewProvider.instance.refresh()
+}
diff --git a/packages/core/src/codewhisperer/client/codewhisperer.ts b/packages/core/src/codewhisperer/client/codewhisperer.ts
new file mode 100644
index 00000000000..22ae0447d0a
--- /dev/null
+++ b/packages/core/src/codewhisperer/client/codewhisperer.ts
@@ -0,0 +1,326 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { AWSError, Credentials, Service } from 'aws-sdk'
+import globals from '../../shared/extensionGlobals'
+import * as CodeWhispererClient from './codewhispererclient'
+import * as CodeWhispererUserClient from './codewhispereruserclient'
+import { SendTelemetryEventRequest } from './codewhispereruserclient'
+import { ServiceOptions } from '../../shared/awsClientBuilder'
+import { hasVendedIamCredentials } from '../../auth/auth'
+import { CodeWhispererSettings } from '../util/codewhispererSettings'
+import { PromiseResult } from 'aws-sdk/lib/request'
+import { AuthUtil } from '../util/authUtil'
+import { isSsoConnection } from '../../auth/connection'
+import apiConfig = require('./service-2.json')
+import userApiConfig = require('./user-service-2.json')
+import { session } from '../util/codeWhispererSession'
+import { getLogger } from '../../shared/logger/logger'
+import { getClientId, getOptOutPreference, getOperatingSystem } from '../../shared/telemetry/util'
+import { extensionVersion, getServiceEnvVarConfig } from '../../shared/vscode/env'
+import { DevSettings } from '../../shared/settings'
+import { CodeWhispererConfig } from '../models/model'
+
+const keepAliveHeader = 'keep-alive-codewhisperer'
+
+export function getCodewhispererConfig(): CodeWhispererConfig {
+    const clientConfig = AuthUtil.instance.regionProfileManager.clientConfig
+    return {
+        ...DevSettings.instance.getServiceConfig('codewhispererService', clientConfig),
+
+        // Environment variable overrides
+        ...getServiceEnvVarConfig('codewhisperer', Object.keys(clientConfig)),
+    }
+}
+
+export type ProgrammingLanguage = Readonly<
+    CodeWhispererClient.ProgrammingLanguage | CodeWhispererUserClient.ProgrammingLanguage
+>
+export type FileContext = Readonly<CodeWhispererClient.FileContext | CodeWhispererUserClient.FileContext>
+export type ListRecommendationsRequest = Readonly<
+    CodeWhispererClient.ListRecommendationsRequest | CodeWhispererUserClient.GenerateCompletionsRequest
+>
+export type GenerateRecommendationsRequest = Readonly<CodeWhispererClient.GenerateRecommendationsRequest>
+export type RecommendationsList = CodeWhispererClient.RecommendationsList | CodeWhispererUserClient.Completions
+export type ListRecommendationsResponse =
+    | CodeWhispererClient.ListRecommendationsResponse
+    | CodeWhispererUserClient.GenerateCompletionsResponse
+export type GenerateRecommendationsResponse = CodeWhispererClient.GenerateRecommendationsResponse
+export type Recommendation = CodeWhispererClient.Recommendation | CodeWhispererUserClient.Completion
+export type Completion = CodeWhispererUserClient.Completion
+export type Reference = CodeWhispererClient.Reference | CodeWhispererUserClient.Reference
+export type References = CodeWhispererClient.References | CodeWhispererUserClient.References
+export type CreateUploadUrlRequest = Readonly<
+    CodeWhispererClient.CreateUploadUrlRequest | CodeWhispererUserClient.CreateUploadUrlRequest
+>
+export type CreateCodeScanRequest = Readonly<
+    CodeWhispererClient.CreateCodeScanRequest | CodeWhispererUserClient.StartCodeAnalysisRequest
+>
+export type GetCodeScanRequest = Readonly<
+    CodeWhispererClient.GetCodeScanRequest | CodeWhispererUserClient.GetCodeAnalysisRequest
+>
+export type ListCodeScanFindingsRequest = Readonly<
+    CodeWhispererClient.ListCodeScanFindingsRequest | CodeWhispererUserClient.ListCodeAnalysisFindingsRequest
+>
+export type SupplementalContext = Readonly<
+    CodeWhispererClient.SupplementalContext | CodeWhispererUserClient.SupplementalContext
+>
+// eslint-disable-next-line @typescript-eslint/no-duplicate-type-constituents
+export type ArtifactType = Readonly<CodeWhispererClient.ArtifactType | CodeWhispererUserClient.ArtifactType>
+export type ArtifactMap = Readonly<CodeWhispererClient.ArtifactMap | CodeWhispererUserClient.ArtifactMap>
+export type ListCodeScanFindingsResponse =
+    | CodeWhispererClient.ListCodeScanFindingsResponse
+    | CodeWhispererUserClient.ListCodeAnalysisFindingsResponse
+export type CreateUploadUrlResponse =
+    | CodeWhispererClient.CreateUploadUrlResponse
+    | CodeWhispererUserClient.CreateUploadUrlResponse
+export type CreateCodeScanResponse =
+    | CodeWhispererClient.CreateCodeScanResponse
+    | CodeWhispererUserClient.StartCodeAnalysisResponse
+export type Import = CodeWhispererUserClient.Import
+export type Imports = CodeWhispererUserClient.Imports
+
+export class DefaultCodeWhispererClient {
+    private async createSdkClient(): Promise<CodeWhispererClient> {
+        const isOptedOut = CodeWhispererSettings.instance.isOptoutEnabled()
+        const cwsprConfig = getCodewhispererConfig()
+        return (await globals.sdkClientBuilder.createAwsService(
+            Service,
+            {
+                apiConfig: apiConfig,
+                region: cwsprConfig.region,
+                credentials: await AuthUtil.instance.getCredentials(),
+                endpoint: cwsprConfig.endpoint,
+                onRequestSetup: [
+                    (req) => {
+                        if (req.operation === 'listRecommendations') {
+                            req.on('build', () => {
+                                req.httpRequest.headers['x-amzn-codewhisperer-optout'] = `${isOptedOut}`
+                            })
+                        }
+                        // This logic is for backward compatability with legacy SDK v2 behavior for refreshing
+                        // credentials. Once the Toolkit adds a file watcher for credentials it won't be needed.
+
+                        if (hasVendedIamCredentials()) {
+                            req.on('retry', (resp) => {
+                                if (
+                                    resp.error?.code === 'AccessDeniedException' &&
+                                    resp.error.message.match(/expired/i)
+                                ) {
+                                    AuthUtil.instance.reauthenticate().catch((e) => {
+                                        getLogger().error('reauthenticate failed: %s', (e as Error).message)
+                                    })
+                                    resp.error.retryable = true
+                                }
+                            })
+                        }
+                    },
+                ],
+            } as ServiceOptions,
+            undefined
+        )) as CodeWhispererClient
+    }
+
+    async createUserSdkClient(maxRetries?: number): Promise<CodeWhispererUserClient> {
+        const isOptedOut = CodeWhispererSettings.instance.isOptoutEnabled()
+        session.setFetchCredentialStart()
+        const bearerToken = await AuthUtil.instance.getBearerToken()
+        session.setSdkApiCallStart()
+        const cwsprConfig = getCodewhispererConfig()
+        return (await globals.sdkClientBuilder.createAwsService(
+            Service,
+            {
+                apiConfig: userApiConfig,
+                region: cwsprConfig.region,
+                endpoint: cwsprConfig.endpoint,
+                maxRetries: maxRetries,
+                credentials: new Credentials({ accessKeyId: 'xxx', secretAccessKey: 'xxx' }),
+                onRequestSetup: [
+                    (req) => {
+                        req.on('build', ({ httpRequest }) => {
+                            httpRequest.headers['Authorization'] = `Bearer ${bearerToken}`
+                        })
+                        if (req.operation === 'generateCompletions') {
+                            req.on('build', () => {
+                                req.httpRequest.headers['x-amzn-codewhisperer-optout'] = `${isOptedOut}`
+                                req.httpRequest.headers['Connection'] = keepAliveHeader
+                            })
+                        }
+                    },
+                ],
+            } as ServiceOptions,
+            undefined
+        )) as CodeWhispererUserClient
+    }
+
+    private isBearerTokenAuth(): boolean {
+        return isSsoConnection(AuthUtil.instance.conn)
+    }
+
+    public async generateRecommendations(
+        request: GenerateRecommendationsRequest
+    ): Promise<GenerateRecommendationsResponse> {
+        return (await this.createSdkClient()).generateRecommendations(request).promise()
+    }
+
+    public async listRecommendations(request: ListRecommendationsRequest): Promise<ListRecommendationsResponse> {
+        if (this.isBearerTokenAuth()) {
+            return await (await this.createUserSdkClient()).generateCompletions(request).promise()
+        }
+        return (await this.createSdkClient()).listRecommendations(request).promise()
+    }
+
+    public async createUploadUrl(
+        request: CreateUploadUrlRequest
+    ): Promise<PromiseResult<CreateUploadUrlResponse, AWSError>> {
+        if (this.isBearerTokenAuth()) {
+            return (await this.createUserSdkClient()).createUploadUrl(request).promise()
+        }
+        return (await this.createSdkClient()).createCodeScanUploadUrl(request).promise()
+    }
+
+    public async createCodeScan(
+        request: CreateCodeScanRequest
+    ): Promise<PromiseResult<CreateCodeScanResponse, AWSError>> {
+        if (this.isBearerTokenAuth()) {
+            return (await this.createUserSdkClient()).startCodeAnalysis(request).promise()
+        }
+        return (await this.createSdkClient()).createCodeScan(request).promise()
+    }
+
+    public async getCodeScan(
+        request: GetCodeScanRequest
+    ): Promise<PromiseResult<CodeWhispererClient.GetCodeScanResponse, AWSError>> {
+        if (this.isBearerTokenAuth()) {
+            return (await this.createUserSdkClient()).getCodeAnalysis(request).promise()
+        }
+        return (await this.createSdkClient()).getCodeScan(request).promise()
+    }
+
+    public async listCodeScanFindings(
+        request: ListCodeScanFindingsRequest,
+        profileArn: string | undefined
+    ): Promise<PromiseResult<ListCodeScanFindingsResponse, AWSError>> {
+        if (this.isBearerTokenAuth()) {
+            const req = {
+                jobId: request.jobId,
+                nextToken: request.nextToken,
+                codeAnalysisFindingsSchema: 'codeanalysis/findings/1.0',
+                profileArn: profileArn,
+            } as CodeWhispererUserClient.ListCodeAnalysisFindingsRequest
+            return (await this.createUserSdkClient()).listCodeAnalysisFindings(req).promise()
+        }
+        return (await this.createSdkClient())
+            .listCodeScanFindings(request as CodeWhispererClient.ListCodeScanFindingsRequest)
+            .promise()
+    }
+
+    public async sendTelemetryEvent(request: SendTelemetryEventRequest) {
+        const requestWithCommonFields: SendTelemetryEventRequest = {
+            ...request,
+            optOutPreference: getOptOutPreference(),
+            userContext: {
+                ideCategory: 'VSCODE',
+                operatingSystem: getOperatingSystem(),
+                product: 'CodeWhisperer', // TODO: update this?
+                clientId: getClientId(globals.globalState),
+                ideVersion: extensionVersion,
+                pluginVersion: extensionVersion,
+            },
+            profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,
+        }
+        if (!AuthUtil.instance.isValidEnterpriseSsoInUse() && !globals.telemetry.telemetryEnabled) {
+            return
+        }
+        const response = await (await this.createUserSdkClient()).sendTelemetryEvent(requestWithCommonFields).promise()
+        getLogger().debug(`codewhisperer: sendTelemetryEvent requestID: ${response.$response.requestId}`)
+    }
+
+    /**
+     * @description Use this function to start the transformation job.
+     * @param request
+     * @returns transformationJobId - String id for the Job
+     */
+    public async codeModernizerStartCodeTransformation(
+        request: CodeWhispererUserClient.StartTransformationRequest
+    ): Promise<PromiseResult<CodeWhispererUserClient.StartTransformationResponse, AWSError>> {
+        return (await this.createUserSdkClient()).startTransformation(request).promise()
+    }
+
+    /**
+     * @description Use this function to stop the transformation job.
+     * @param request
+     * @returns transformationJobId - String id for the Job
+     */
+    public async codeModernizerStopCodeTransformation(
+        request: CodeWhispererUserClient.StopTransformationRequest
+    ): Promise<PromiseResult<CodeWhispererUserClient.StopTransformationResponse, AWSError>> {
+        return (await this.createUserSdkClient()).stopTransformation(request).promise()
+    }
+
+    /**
+     * @description Use this function to get the status of the code transformation. We should
+     * be polling this function periodically to get updated results. When this function
+     * returns PARTIALLY_COMPLETED or COMPLETED we know the transformation is done.
+     */
+    public async codeModernizerGetCodeTransformation(
+        request: CodeWhispererUserClient.GetTransformationRequest
+    ): Promise<PromiseResult<CodeWhispererUserClient.GetTransformationResponse, AWSError>> {
+        // instead of the default of 3 retries, use 8 retries for this API which is polled every 5 seconds
+        return (await this.createUserSdkClient(8)).getTransformation(request).promise()
+    }
+
+    /**
+     * @description During client-side build, or after the job has been PAUSED we need to get user intervention.
+     * Once that user action has been handled we can resume the transformation job.
+     * @params transformationJobId - String id returned from StartCodeTransformationResponse
+     * @params userActionStatus - String to determine what action the user took, if any.
+     */
+    public async codeModernizerResumeTransformation(
+        request: CodeWhispererUserClient.ResumeTransformationRequest
+    ): Promise<PromiseResult<CodeWhispererUserClient.ResumeTransformationResponse, AWSError>> {
+        return (await this.createUserSdkClient(8)).resumeTransformation(request).promise()
+    }
+
+    /**
+     * @description After starting a transformation use this function to display the LLM
+     * transformation plan to the user.
+     * @params transformationJobId - String id returned from StartCodeTransformationResponse
+     */
+    public async codeModernizerGetCodeTransformationPlan(
+        request: CodeWhispererUserClient.GetTransformationPlanRequest
+    ): Promise<PromiseResult<CodeWhispererUserClient.GetTransformationPlanResponse, AWSError>> {
+        // instead of the default of 3 retries, use 8 retries for this API which is polled every 5 seconds
+        return (await this.createUserSdkClient(8)).getTransformationPlan(request).promise()
+    }
+
+    public async startCodeFixJob(
+        request: CodeWhispererUserClient.StartCodeFixJobRequest
+    ): Promise<PromiseResult<CodeWhispererUserClient.StartCodeFixJobResponse, AWSError>> {
+        return (await this.createUserSdkClient()).startCodeFixJob(request).promise()
+    }
+
+    public async getCodeFixJob(
+        request: CodeWhispererUserClient.GetCodeFixJobRequest
+    ): Promise<PromiseResult<CodeWhispererUserClient.GetCodeFixJobResponse, AWSError>> {
+        return (await this.createUserSdkClient()).getCodeFixJob(request).promise()
+    }
+
+    public async startTestGeneration(
+        request: CodeWhispererUserClient.StartTestGenerationRequest
+    ): Promise<PromiseResult<CodeWhispererUserClient.StartTestGenerationResponse, AWSError>> {
+        return (await this.createUserSdkClient()).startTestGeneration(request).promise()
+    }
+
+    public async getTestGeneration(
+        request: CodeWhispererUserClient.GetTestGenerationRequest
+    ): Promise<PromiseResult<CodeWhispererUserClient.GetTestGenerationResponse, AWSError>> {
+        return (await this.createUserSdkClient()).getTestGeneration(request).promise()
+    }
+}
+
+export const codeWhispererClient = new DefaultCodeWhispererClient()
+
+export class CognitoCredentialsError extends Error {}
diff --git a/packages/core/src/codewhisperer/client/service-2.json b/packages/core/src/codewhisperer/client/service-2.json
new file mode 100644
index 00000000000..3e063c38a10
--- /dev/null
+++ b/packages/core/src/codewhisperer/client/service-2.json
@@ -0,0 +1,1283 @@
+{
+    "version": "2.0",
+    "metadata": {
+        "apiVersion": "2022-06-15",
+        "endpointPrefix": "codewhisperer",
+        "jsonVersion": "1.0",
+        "protocol": "json",
+        "serviceFullName": "AWS CodeWhisperer",
+        "serviceId": "CodeWhisperer",
+        "signatureVersion": "v4",
+        "signingName": "codewhisperer",
+        "targetPrefix": "AWSCodeWhispererService",
+        "uid": "codewhisperer-2022-06-15"
+    },
+    "operations": {
+        "CreateCodeScan": {
+            "name": "CreateCodeScan",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": {
+                "shape": "CreateCodeScanRequest"
+            },
+            "output": {
+                "shape": "CreateCodeScanResponse"
+            },
+            "errors": [
+                {
+                    "shape": "ThrottlingException"
+                },
+                {
+                    "shape": "ConflictException"
+                },
+                {
+                    "shape": "ResourceNotFoundException"
+                },
+                {
+                    "shape": "InternalServerException"
+                },
+                {
+                    "shape": "ValidationException"
+                },
+                {
+                    "shape": "AccessDeniedException"
+                }
+            ],
+            "idempotent": true
+        },
+        "CreateCodeScanUploadUrl": {
+            "name": "CreateCodeScanUploadUrl",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": {
+                "shape": "CreateUploadUrlRequest"
+            },
+            "output": {
+                "shape": "CreateUploadUrlResponse"
+            },
+            "errors": [
+                {
+                    "shape": "ThrottlingException"
+                },
+                {
+                    "shape": "InternalServerException"
+                },
+                {
+                    "shape": "ValidationException"
+                },
+                {
+                    "shape": "AccessDeniedException"
+                }
+            ],
+            "idempotent": true
+        },
+        "CreateProfile": {
+            "name": "CreateProfile",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": {
+                "shape": "CreateProfileRequest"
+            },
+            "output": {
+                "shape": "CreateProfileResponse"
+            },
+            "errors": [
+                {
+                    "shape": "ThrottlingException"
+                },
+                {
+                    "shape": "ConflictException"
+                },
+                {
+                    "shape": "ResourceNotFoundException"
+                },
+                {
+                    "shape": "InternalServerException"
+                },
+                {
+                    "shape": "ValidationException"
+                },
+                {
+                    "shape": "AccessDeniedException"
+                }
+            ]
+        },
+        "DeleteProfile": {
+            "name": "DeleteProfile",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": {
+                "shape": "DeleteProfileRequest"
+            },
+            "output": {
+                "shape": "DeleteProfileResponse"
+            },
+            "errors": [
+                {
+                    "shape": "ThrottlingException"
+                },
+                {
+                    "shape": "ConflictException"
+                },
+                {
+                    "shape": "ResourceNotFoundException"
+                },
+                {
+                    "shape": "InternalServerException"
+                },
+                {
+                    "shape": "ValidationException"
+                },
+                {
+                    "shape": "AccessDeniedException"
+                }
+            ]
+        },
+        "GenerateRecommendations": {
+            "name": "GenerateRecommendations",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": {
+                "shape": "GenerateRecommendationsRequest"
+            },
+            "output": {
+                "shape": "GenerateRecommendationsResponse"
+            },
+            "errors": [
+                {
+                    "shape": "ThrottlingException"
+                },
+                {
+                    "shape": "InternalServerException"
+                },
+                {
+                    "shape": "ValidationException"
+                },
+                {
+                    "shape": "AccessDeniedException"
+                }
+            ]
+        },
+        "GetAccessToken": {
+            "name": "GetAccessToken",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": {
+                "shape": "GetAccessTokenRequest"
+            },
+            "output": {
+                "shape": "GetAccessTokenResponse"
+            },
+            "errors": [
+                {
+                    "shape": "InternalServerException"
+                },
+                {
+                    "shape": "ValidationException"
+                },
+                {
+                    "shape": "AccessDeniedException"
+                }
+            ]
+        },
+        "GetCodeScan": {
+            "name": "GetCodeScan",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": {
+                "shape": "GetCodeScanRequest"
+            },
+            "output": {
+                "shape": "GetCodeScanResponse"
+            },
+            "errors": [
+                {
+                    "shape": "ThrottlingException"
+                },
+                {
+                    "shape": "ResourceNotFoundException"
+                },
+                {
+                    "shape": "InternalServerException"
+                },
+                {
+                    "shape": "ValidationException"
+                },
+                {
+                    "shape": "AccessDeniedException"
+                }
+            ]
+        },
+        "ListCodeScanFindings": {
+            "name": "ListCodeScanFindings",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": {
+                "shape": "ListCodeScanFindingsRequest"
+            },
+            "output": {
+                "shape": "ListCodeScanFindingsResponse"
+            },
+            "errors": [
+                {
+                    "shape": "ThrottlingException"
+                },
+                {
+                    "shape": "ResourceNotFoundException"
+                },
+                {
+                    "shape": "InternalServerException"
+                },
+                {
+                    "shape": "ValidationException"
+                },
+                {
+                    "shape": "AccessDeniedException"
+                }
+            ]
+        },
+        "ListProfiles": {
+            "name": "ListProfiles",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": {
+                "shape": "ListProfilesRequest"
+            },
+            "output": {
+                "shape": "ListProfilesResponse"
+            },
+            "errors": [
+                {
+                    "shape": "ThrottlingException"
+                },
+                {
+                    "shape": "InternalServerException"
+                },
+                {
+                    "shape": "ValidationException"
+                },
+                {
+                    "shape": "AccessDeniedException"
+                }
+            ]
+        },
+        "ListRecommendations": {
+            "name": "ListRecommendations",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": {
+                "shape": "ListRecommendationsRequest"
+            },
+            "output": {
+                "shape": "ListRecommendationsResponse"
+            },
+            "errors": [
+                {
+                    "shape": "ThrottlingException"
+                },
+                {
+                    "shape": "InternalServerException"
+                },
+                {
+                    "shape": "ValidationException"
+                },
+                {
+                    "shape": "AccessDeniedException"
+                }
+            ]
+        },
+        "ListTagsForResource": {
+            "name": "ListTagsForResource",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": {
+                "shape": "ListTagsForResourceRequest"
+            },
+            "output": {
+                "shape": "ListTagsForResourceResponse"
+            },
+            "errors": [
+                {
+                    "shape": "ThrottlingException"
+                },
+                {
+                    "shape": "ResourceNotFoundException"
+                },
+                {
+                    "shape": "InternalServerException"
+                },
+                {
+                    "shape": "ValidationException"
+                },
+                {
+                    "shape": "AccessDeniedException"
+                }
+            ]
+        },
+        "TagResource": {
+            "name": "TagResource",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": {
+                "shape": "TagResourceRequest"
+            },
+            "output": {
+                "shape": "TagResourceResponse"
+            },
+            "errors": [
+                {
+                    "shape": "ThrottlingException"
+                },
+                {
+                    "shape": "ResourceNotFoundException"
+                },
+                {
+                    "shape": "InternalServerException"
+                },
+                {
+                    "shape": "ValidationException"
+                },
+                {
+                    "shape": "AccessDeniedException"
+                }
+            ]
+        },
+        "UntagResource": {
+            "name": "UntagResource",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": {
+                "shape": "UntagResourceRequest"
+            },
+            "output": {
+                "shape": "UntagResourceResponse"
+            },
+            "errors": [
+                {
+                    "shape": "ThrottlingException"
+                },
+                {
+                    "shape": "ResourceNotFoundException"
+                },
+                {
+                    "shape": "InternalServerException"
+                },
+                {
+                    "shape": "ValidationException"
+                },
+                {
+                    "shape": "AccessDeniedException"
+                }
+            ]
+        },
+        "UpdateProfile": {
+            "name": "UpdateProfile",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": {
+                "shape": "UpdateProfileRequest"
+            },
+            "output": {
+                "shape": "UpdateProfileResponse"
+            },
+            "errors": [
+                {
+                    "shape": "ThrottlingException"
+                },
+                {
+                    "shape": "ConflictException"
+                },
+                {
+                    "shape": "ResourceNotFoundException"
+                },
+                {
+                    "shape": "InternalServerException"
+                },
+                {
+                    "shape": "ValidationException"
+                },
+                {
+                    "shape": "AccessDeniedException"
+                }
+            ]
+        }
+    },
+    "shapes": {
+        "AccessDeniedException": {
+            "type": "structure",
+            "required": ["message"],
+            "members": {
+                "message": {
+                    "shape": "String"
+                }
+            },
+            "exception": true
+        },
+        "ArtifactMap": {
+            "type": "map",
+            "key": {
+                "shape": "ArtifactType"
+            },
+            "value": {
+                "shape": "UploadId"
+            },
+            "max": 64,
+            "min": 1
+        },
+        "ArtifactType": {
+            "type": "string",
+            "enum": ["SourceCode", "BuiltJars"]
+        },
+        "Base64EncodedPaginationToken": {
+            "type": "string",
+            "max": 2048,
+            "min": 1,
+            "pattern": "(?:[A-Za-z0-9\\+/]{4})*(?:[A-Za-z0-9\\+/]{2}\\=\\=|[A-Za-z0-9\\+/]{3}\\=)?"
+        },
+        "CodeScanFindingsSchema": {
+            "type": "string",
+            "enum": ["codescan/findings/1.0"]
+        },
+        "CodeScanStatus": {
+            "type": "string",
+            "enum": ["Completed", "Pending", "Failed"]
+        },
+        "ConflictException": {
+            "type": "structure",
+            "required": ["message"],
+            "members": {
+                "message": {
+                    "shape": "String"
+                }
+            },
+            "exception": true
+        },
+        "CreateCodeScanRequest": {
+            "type": "structure",
+            "required": ["artifacts", "programmingLanguage"],
+            "members": {
+                "artifacts": {
+                    "shape": "ArtifactMap"
+                },
+                "programmingLanguage": {
+                    "shape": "ProgrammingLanguage"
+                },
+                "clientToken": {
+                    "shape": "CreateCodeScanRequestClientTokenString",
+                    "idempotencyToken": true
+                }
+            }
+        },
+        "CreateCodeScanRequestClientTokenString": {
+            "type": "string",
+            "max": 256,
+            "min": 1
+        },
+        "CreateCodeScanResponse": {
+            "type": "structure",
+            "required": ["jobId", "status"],
+            "members": {
+                "jobId": {
+                    "shape": "CreateCodeScanResponseJobIdString"
+                },
+                "status": {
+                    "shape": "CodeScanStatus"
+                },
+                "errorMessage": {
+                    "shape": "String"
+                }
+            }
+        },
+        "CreateCodeScanResponseJobIdString": {
+            "type": "string",
+            "max": 256,
+            "min": 1
+        },
+        "CreateProfileRequest": {
+            "type": "structure",
+            "required": ["identitySource", "profileName", "referenceTrackerConfiguration"],
+            "members": {
+                "identitySource": {
+                    "shape": "IdentitySource"
+                },
+                "profileName": {
+                    "shape": "ProfileName"
+                },
+                "referenceTrackerConfiguration": {
+                    "shape": "ReferenceTrackerConfiguration"
+                },
+                "clientToken": {
+                    "shape": "IdempotencyToken",
+                    "idempotencyToken": true
+                },
+                "kmsKeyArn": {
+                    "shape": "ResourceArn"
+                },
+                "tags": {
+                    "shape": "TagList"
+                }
+            }
+        },
+        "CreateProfileResponse": {
+            "type": "structure",
+            "required": ["profileArn"],
+            "members": {
+                "profileArn": {
+                    "shape": "ResourceArn"
+                }
+            }
+        },
+        "CreateUploadUrlRequest": {
+            "type": "structure",
+            "members": {
+                "contentMd5": {
+                    "shape": "CreateUploadUrlRequestContentMd5String"
+                },
+                "artifactType": {
+                    "shape": "ArtifactType"
+                }
+            }
+        },
+        "CreateUploadUrlRequestContentMd5String": {
+            "type": "string",
+            "max": 128,
+            "min": 1
+        },
+        "CreateUploadUrlResponse": {
+            "type": "structure",
+            "required": ["uploadId", "uploadUrl"],
+            "members": {
+                "uploadId": {
+                    "shape": "UploadId"
+                },
+                "uploadUrl": {
+                    "shape": "PreSignedUrl"
+                },
+                "kmsKeyArn": {
+                    "shape": "ResourceArn"
+                }
+            }
+        },
+        "DeleteProfileRequest": {
+            "type": "structure",
+            "required": ["profileArn"],
+            "members": {
+                "profileArn": {
+                    "shape": "ResourceArn"
+                }
+            }
+        },
+        "DeleteProfileResponse": {
+            "type": "structure",
+            "members": {}
+        },
+        "FileContext": {
+            "type": "structure",
+            "required": ["leftFileContent", "rightFileContent", "filename", "programmingLanguage"],
+            "members": {
+                "leftFileContent": {
+                    "shape": "FileContextLeftFileContentString"
+                },
+                "rightFileContent": {
+                    "shape": "FileContextRightFileContentString"
+                },
+                "filename": {
+                    "shape": "FileContextFilenameString"
+                },
+                "fileUri": {
+                    "shape": "FileContextFileUriString"
+                },
+                "programmingLanguage": {
+                    "shape": "ProgrammingLanguage"
+                }
+            }
+        },
+        "FileContextFileUriString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1,
+            "sensitive": true
+        },
+        "FileContextFilenameString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1
+        },
+        "FileContextLeftFileContentString": {
+            "type": "string",
+            "max": 10240,
+            "min": 0,
+            "sensitive": true
+        },
+        "FileContextRightFileContentString": {
+            "type": "string",
+            "max": 10240,
+            "min": 0,
+            "sensitive": true
+        },
+        "SupplementalContext": {
+            "type": "structure",
+            "required": ["filePath", "content"],
+            "members": {
+                "filePath": {
+                    "shape": "SupplementalContextFilePathString"
+                },
+                "content": {
+                    "shape": "SupplementalContextContentString"
+                }
+            }
+        },
+        "SupplementalContextFilePathString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1,
+            "sensitive": true
+        },
+        "SupplementalContextContentString": {
+            "type": "string",
+            "max": 5120,
+            "min": 0,
+            "sensitive": true
+        },
+        "SupplementalContextList": {
+            "type": "list",
+            "member": {
+                "shape": "SupplementalContext"
+            },
+            "max": 10,
+            "min": 0
+        },
+        "GenerateRecommendationsRequest": {
+            "type": "structure",
+            "required": ["fileContext"],
+            "members": {
+                "fileContext": {
+                    "shape": "FileContext"
+                },
+                "supplementalContexts": {
+                    "shape": "SupplementalContextList"
+                },
+                "maxResults": {
+                    "shape": "GenerateRecommendationsRequestMaxResultsInteger"
+                },
+                "nextToken": {
+                    "shape": "GenerateRecommendationsRequestNextTokenString"
+                },
+                "referenceTrackerConfiguration": {
+                    "shape": "ReferenceTrackerConfiguration"
+                }
+            }
+        },
+        "GenerateRecommendationsRequestMaxResultsInteger": {
+            "type": "integer",
+            "box": true,
+            "max": 10,
+            "min": 1
+        },
+        "GenerateRecommendationsRequestNextTokenString": {
+            "type": "string",
+            "max": 2048,
+            "min": 0,
+            "pattern": "(?:[A-Za-z0-9\\+/]{4})*(?:[A-Za-z0-9\\+/]{2}\\=\\=|[A-Za-z0-9\\+/]{3}\\=)?"
+        },
+        "GenerateRecommendationsResponse": {
+            "type": "structure",
+            "members": {
+                "recommendations": {
+                    "shape": "RecommendationsList"
+                },
+                "nextToken": {
+                    "shape": "String"
+                }
+            }
+        },
+        "GetAccessTokenRequest": {
+            "type": "structure",
+            "required": ["identityToken"],
+            "members": {
+                "identityToken": {
+                    "shape": "GetAccessTokenRequestIdentityTokenString"
+                }
+            }
+        },
+        "GetAccessTokenRequestIdentityTokenString": {
+            "type": "string",
+            "max": 1024,
+            "min": 0,
+            "sensitive": true
+        },
+        "GetAccessTokenResponse": {
+            "type": "structure",
+            "members": {
+                "accessToken": {
+                    "shape": "SensitiveString"
+                }
+            }
+        },
+        "GetCodeScanRequest": {
+            "type": "structure",
+            "required": ["jobId"],
+            "members": {
+                "jobId": {
+                    "shape": "GetCodeScanRequestJobIdString"
+                }
+            }
+        },
+        "GetCodeScanRequestJobIdString": {
+            "type": "string",
+            "max": 256,
+            "min": 1
+        },
+        "GetCodeScanResponse": {
+            "type": "structure",
+            "required": ["status"],
+            "members": {
+                "status": {
+                    "shape": "CodeScanStatus"
+                },
+                "errorMessage": {
+                    "shape": "String"
+                }
+            }
+        },
+        "IdempotencyToken": {
+            "type": "string",
+            "max": 256,
+            "min": 1
+        },
+        "IdentityDetails": {
+            "type": "structure",
+            "members": {
+                "ssoIdentityDetails": {
+                    "shape": "SSOIdentityDetails"
+                }
+            },
+            "union": true
+        },
+        "IdentitySource": {
+            "type": "structure",
+            "members": {
+                "ssoIdentitySource": {
+                    "shape": "SSOIdentitySource"
+                }
+            },
+            "union": true
+        },
+        "Import": {
+            "type": "structure",
+            "members": {
+                "statement": {
+                    "shape": "ImportStatementString"
+                }
+            }
+        },
+        "ImportStatementString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1,
+            "sensitive": true
+        },
+        "Imports": {
+            "type": "list",
+            "member": {
+                "shape": "Import"
+            },
+            "max": 10,
+            "min": 0
+        },
+        "InternalServerException": {
+            "type": "structure",
+            "required": ["message"],
+            "members": {
+                "message": {
+                    "shape": "String"
+                }
+            },
+            "exception": true,
+            "fault": true,
+            "retryable": {
+                "throttling": false
+            }
+        },
+        "ListCodeScanFindingsRequest": {
+            "type": "structure",
+            "required": ["jobId", "codeScanFindingsSchema"],
+            "members": {
+                "jobId": {
+                    "shape": "ListCodeScanFindingsRequestJobIdString"
+                },
+                "nextToken": {
+                    "shape": "PaginationToken"
+                },
+                "codeScanFindingsSchema": {
+                    "shape": "CodeScanFindingsSchema"
+                }
+            }
+        },
+        "ListCodeScanFindingsRequestJobIdString": {
+            "type": "string",
+            "max": 256,
+            "min": 1
+        },
+        "ListCodeScanFindingsResponse": {
+            "type": "structure",
+            "required": ["codeScanFindings"],
+            "members": {
+                "nextToken": {
+                    "shape": "PaginationToken"
+                },
+                "codeScanFindings": {
+                    "shape": "String"
+                }
+            }
+        },
+        "ListProfilesRequest": {
+            "type": "structure",
+            "members": {
+                "maxResults": {
+                    "shape": "ListProfilesRequestMaxResultsInteger"
+                },
+                "nextToken": {
+                    "shape": "Base64EncodedPaginationToken"
+                }
+            }
+        },
+        "ListProfilesRequestMaxResultsInteger": {
+            "type": "integer",
+            "box": true,
+            "max": 100,
+            "min": 1
+        },
+        "ListProfilesResponse": {
+            "type": "structure",
+            "required": ["profiles"],
+            "members": {
+                "profiles": {
+                    "shape": "ProfileList"
+                },
+                "nextToken": {
+                    "shape": "Base64EncodedPaginationToken"
+                }
+            }
+        },
+        "ListRecommendationsRequest": {
+            "type": "structure",
+            "required": ["fileContext"],
+            "members": {
+                "fileContext": {
+                    "shape": "FileContext"
+                },
+                "maxResults": {
+                    "shape": "ListRecommendationsRequestMaxResultsInteger"
+                },
+                "supplementalContexts": {
+                    "shape": "SupplementalContextList"
+                },
+                "nextToken": {
+                    "shape": "ListRecommendationsRequestNextTokenString"
+                },
+                "referenceTrackerConfiguration": {
+                    "shape": "ReferenceTrackerConfiguration"
+                }
+            }
+        },
+        "ListRecommendationsRequestMaxResultsInteger": {
+            "type": "integer",
+            "box": true,
+            "max": 10,
+            "min": 1
+        },
+        "ListRecommendationsRequestNextTokenString": {
+            "type": "string",
+            "max": 2048,
+            "min": 0,
+            "pattern": "(?:[A-Za-z0-9\\+/]{4})*(?:[A-Za-z0-9\\+/]{2}\\=\\=|[A-Za-z0-9\\+/]{3}\\=)?"
+        },
+        "ListRecommendationsResponse": {
+            "type": "structure",
+            "members": {
+                "recommendations": {
+                    "shape": "RecommendationsList"
+                },
+                "nextToken": {
+                    "shape": "String"
+                }
+            }
+        },
+        "ListTagsForResourceRequest": {
+            "type": "structure",
+            "required": ["resourceName"],
+            "members": {
+                "resourceName": {
+                    "shape": "ResourceArn"
+                }
+            }
+        },
+        "ListTagsForResourceResponse": {
+            "type": "structure",
+            "members": {
+                "tags": {
+                    "shape": "TagList"
+                }
+            }
+        },
+        "PaginationToken": {
+            "type": "string",
+            "max": 2048,
+            "min": 1,
+            "pattern": "\\S+"
+        },
+        "PreSignedUrl": {
+            "type": "string",
+            "max": 2048,
+            "min": 1
+        },
+        "Profile": {
+            "type": "structure",
+            "required": ["arn", "identityDetails", "profileName", "referenceTrackerConfiguration"],
+            "members": {
+                "arn": {
+                    "shape": "ResourceArn"
+                },
+                "identityDetails": {
+                    "shape": "IdentityDetails"
+                },
+                "profileName": {
+                    "shape": "ProfileName"
+                },
+                "referenceTrackerConfiguration": {
+                    "shape": "ReferenceTrackerConfiguration"
+                },
+                "kmsKeyArn": {
+                    "shape": "ResourceArn"
+                }
+            }
+        },
+        "ProfileList": {
+            "type": "list",
+            "member": {
+                "shape": "Profile"
+            }
+        },
+        "ProfileName": {
+            "type": "string",
+            "max": 100,
+            "min": 1,
+            "pattern": "[a-zA-Z][a-zA-Z0-9_-]*"
+        },
+        "ProgrammingLanguage": {
+            "type": "structure",
+            "required": ["languageName"],
+            "members": {
+                "languageName": {
+                    "shape": "ProgrammingLanguageLanguageNameString"
+                }
+            }
+        },
+        "ProgrammingLanguageLanguageNameString": {
+            "type": "string",
+            "max": 128,
+            "min": 1,
+            "pattern": "(python|javascript|java|csharp|typescript|c|cpp|go|kotlin|php|ruby|rust|scala|shell|sql)"
+        },
+        "Recommendation": {
+            "type": "structure",
+            "required": ["content"],
+            "members": {
+                "content": {
+                    "shape": "RecommendationContentString"
+                },
+                "references": {
+                    "shape": "References"
+                },
+                "mostRelevantMissingImports": {
+                    "shape": "Imports"
+                }
+            }
+        },
+        "RecommendationContentString": {
+            "type": "string",
+            "max": 5120,
+            "min": 1,
+            "sensitive": true
+        },
+        "RecommendationsList": {
+            "type": "list",
+            "member": {
+                "shape": "Recommendation"
+            },
+            "max": 10,
+            "min": 0
+        },
+        "RecommendationsWithReferencesPreference": {
+            "type": "string",
+            "enum": ["BLOCK", "ALLOW"]
+        },
+        "Reference": {
+            "type": "structure",
+            "members": {
+                "licenseName": {
+                    "shape": "ReferenceLicenseNameString"
+                },
+                "repository": {
+                    "shape": "ReferenceRepositoryString"
+                },
+                "url": {
+                    "shape": "ReferenceUrlString"
+                },
+                "recommendationContentSpan": {
+                    "shape": "Span"
+                }
+            }
+        },
+        "ReferenceLicenseNameString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1
+        },
+        "ReferenceRepositoryString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1
+        },
+        "ReferenceTrackerConfiguration": {
+            "type": "structure",
+            "required": ["recommendationsWithReferences"],
+            "members": {
+                "recommendationsWithReferences": {
+                    "shape": "RecommendationsWithReferencesPreference"
+                }
+            }
+        },
+        "ReferenceUrlString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1
+        },
+        "References": {
+            "type": "list",
+            "member": {
+                "shape": "Reference"
+            },
+            "max": 10,
+            "min": 0
+        },
+        "ResourceArn": {
+            "type": "string",
+            "max": 1224,
+            "min": 0
+        },
+        "ResourceNotFoundException": {
+            "type": "structure",
+            "required": ["message"],
+            "members": {
+                "message": {
+                    "shape": "String"
+                }
+            },
+            "exception": true
+        },
+        "SSOIdentityDetails": {
+            "type": "structure",
+            "required": ["instanceArn", "oidcClientId"],
+            "members": {
+                "instanceArn": {
+                    "shape": "ResourceArn"
+                },
+                "oidcClientId": {
+                    "shape": "String"
+                }
+            }
+        },
+        "SSOIdentitySource": {
+            "type": "structure",
+            "required": ["instanceArn"],
+            "members": {
+                "instanceArn": {
+                    "shape": "ResourceArn"
+                }
+            }
+        },
+        "SensitiveString": {
+            "type": "string",
+            "sensitive": true
+        },
+        "Span": {
+            "type": "structure",
+            "members": {
+                "start": {
+                    "shape": "SpanStartInteger"
+                },
+                "end": {
+                    "shape": "SpanEndInteger"
+                }
+            }
+        },
+        "SpanEndInteger": {
+            "type": "integer",
+            "box": true,
+            "min": 0
+        },
+        "SpanStartInteger": {
+            "type": "integer",
+            "box": true,
+            "min": 0
+        },
+        "String": {
+            "type": "string"
+        },
+        "Tag": {
+            "type": "structure",
+            "required": ["key", "value"],
+            "members": {
+                "key": {
+                    "shape": "TagKey"
+                },
+                "value": {
+                    "shape": "TagValue"
+                }
+            }
+        },
+        "TagKey": {
+            "type": "string",
+            "max": 128,
+            "min": 1
+        },
+        "TagKeyList": {
+            "type": "list",
+            "member": {
+                "shape": "TagKey"
+            },
+            "max": 200,
+            "min": 0
+        },
+        "TagList": {
+            "type": "list",
+            "member": {
+                "shape": "Tag"
+            },
+            "max": 200,
+            "min": 0
+        },
+        "TagResourceRequest": {
+            "type": "structure",
+            "required": ["resourceName", "tags"],
+            "members": {
+                "resourceName": {
+                    "shape": "ResourceArn"
+                },
+                "tags": {
+                    "shape": "TagList"
+                }
+            }
+        },
+        "TagResourceResponse": {
+            "type": "structure",
+            "members": {}
+        },
+        "TagValue": {
+            "type": "string",
+            "max": 256,
+            "min": 0
+        },
+        "ThrottlingException": {
+            "type": "structure",
+            "required": ["message"],
+            "members": {
+                "message": {
+                    "shape": "String"
+                }
+            },
+            "exception": true,
+            "retryable": {
+                "throttling": false
+            }
+        },
+        "UntagResourceRequest": {
+            "type": "structure",
+            "required": ["resourceName", "tagKeys"],
+            "members": {
+                "resourceName": {
+                    "shape": "ResourceArn"
+                },
+                "tagKeys": {
+                    "shape": "TagKeyList"
+                }
+            }
+        },
+        "UntagResourceResponse": {
+            "type": "structure",
+            "members": {}
+        },
+        "UpdateProfileRequest": {
+            "type": "structure",
+            "required": ["profileArn"],
+            "members": {
+                "profileArn": {
+                    "shape": "ResourceArn"
+                },
+                "profileName": {
+                    "shape": "ProfileName"
+                },
+                "referenceTrackerConfiguration": {
+                    "shape": "ReferenceTrackerConfiguration"
+                },
+                "kmsKeyArn": {
+                    "shape": "ResourceArn"
+                }
+            }
+        },
+        "UpdateProfileResponse": {
+            "type": "structure",
+            "required": ["profileArn"],
+            "members": {
+                "profileArn": {
+                    "shape": "ResourceArn"
+                }
+            }
+        },
+        "UploadId": {
+            "type": "string",
+            "max": 128,
+            "min": 1
+        },
+        "ValidationException": {
+            "type": "structure",
+            "required": ["message"],
+            "members": {
+                "message": {
+                    "shape": "String"
+                }
+            },
+            "exception": true
+        }
+    }
+}
diff --git a/packages/core/src/codewhisperer/client/user-service-2.json b/packages/core/src/codewhisperer/client/user-service-2.json
new file mode 100644
index 00000000000..619ce74aa5b
--- /dev/null
+++ b/packages/core/src/codewhisperer/client/user-service-2.json
@@ -0,0 +1,4914 @@
+{
+    "version": "2.0",
+    "metadata": {
+        "apiVersion": "2022-11-11",
+        "endpointPrefix": "amazoncodewhispererservice",
+        "jsonVersion": "1.0",
+        "protocol": "json",
+        "serviceFullName": "Amazon CodeWhisperer",
+        "serviceId": "CodeWhispererRuntime",
+        "signingName": "amazoncodewhispererservice",
+        "targetPrefix": "AmazonCodeWhispererService",
+        "uid": "codewhispererruntime-2022-11-11"
+    },
+    "operations": {
+        "CreateArtifactUploadUrl": {
+            "name": "CreateArtifactUploadUrl",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "CreateUploadUrlRequest" },
+            "output": { "shape": "CreateUploadUrlResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>Creates a pre-signed, S3 write URL for uploading a repository zip archive.</p>",
+            "idempotent": true
+        },
+        "CreateSubscriptionToken": {
+            "name": "CreateSubscriptionToken",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "CreateSubscriptionTokenRequest" },
+            "output": { "shape": "CreateSubscriptionTokenResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "ConflictException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "idempotent": true
+        },
+        "CreateTaskAssistConversation": {
+            "name": "CreateTaskAssistConversation",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "CreateTaskAssistConversationRequest" },
+            "output": { "shape": "CreateTaskAssistConversationResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "ServiceQuotaExceededException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>API to create task assist conversation.</p>"
+        },
+        "CreateUploadUrl": {
+            "name": "CreateUploadUrl",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "CreateUploadUrlRequest" },
+            "output": { "shape": "CreateUploadUrlResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "ConflictException" },
+                { "shape": "ServiceQuotaExceededException" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>Creates a pre-signed, S3 write URL for uploading a repository zip archive.</p>",
+            "idempotent": true
+        },
+        "CreateUserMemoryEntry": {
+            "name": "CreateUserMemoryEntry",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "CreateUserMemoryEntryInput" },
+            "output": { "shape": "CreateUserMemoryEntryOutput" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "ServiceQuotaExceededException" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>API to create a single user memory entry</p>",
+            "idempotent": true
+        },
+        "CreateWorkspace": {
+            "name": "CreateWorkspace",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "CreateWorkspaceRequest" },
+            "output": { "shape": "CreateWorkspaceResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "ConflictException" },
+                { "shape": "ServiceQuotaExceededException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>Create a workspace based on a workspace root</p>"
+        },
+        "DeleteTaskAssistConversation": {
+            "name": "DeleteTaskAssistConversation",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "DeleteTaskAssistConversationRequest" },
+            "output": { "shape": "DeleteTaskAssistConversationResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>API to delete task assist conversation.</p>"
+        },
+        "DeleteUserMemoryEntry": {
+            "name": "DeleteUserMemoryEntry",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "DeleteUserMemoryEntryInput" },
+            "output": { "shape": "DeleteUserMemoryEntryOutput" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>API to delete a single user memory entry</p>",
+            "idempotent": true
+        },
+        "DeleteWorkspace": {
+            "name": "DeleteWorkspace",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "DeleteWorkspaceRequest" },
+            "output": { "shape": "DeleteWorkspaceResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>Delete a workspace based on a workspaceId</p>"
+        },
+        "GenerateCompletions": {
+            "name": "GenerateCompletions",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "GenerateCompletionsRequest" },
+            "output": { "shape": "GenerateCompletionsResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>Generate completions based on the provided file context in a paginated response.</p>"
+        },
+        "GetCodeAnalysis": {
+            "name": "GetCodeAnalysis",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "GetCodeAnalysisRequest" },
+            "output": { "shape": "GetCodeAnalysisResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>Gets the metadata of a code analysis job.</p>"
+        },
+        "GetCodeFixJob": {
+            "name": "GetCodeFixJob",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "GetCodeFixJobRequest" },
+            "output": { "shape": "GetCodeFixJobResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ]
+        },
+        "GetTaskAssistCodeGeneration": {
+            "name": "GetTaskAssistCodeGeneration",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "GetTaskAssistCodeGenerationRequest" },
+            "output": { "shape": "GetTaskAssistCodeGenerationResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "ConflictException" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>API to get status of task assist code generation.</p>"
+        },
+        "GetTestGeneration": {
+            "name": "GetTestGeneration",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "GetTestGenerationRequest" },
+            "output": { "shape": "GetTestGenerationResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>API to get test generation job.</p>"
+        },
+        "GetTransformation": {
+            "name": "GetTransformation",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "GetTransformationRequest" },
+            "output": { "shape": "GetTransformationResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>API to get code transformation status.</p>"
+        },
+        "GetTransformationPlan": {
+            "name": "GetTransformationPlan",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "GetTransformationPlanRequest" },
+            "output": { "shape": "GetTransformationPlanResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>API to get code transformation status.</p>"
+        },
+        "GetUsageLimits": {
+            "name": "GetUsageLimits",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "GetUsageLimitsRequest" },
+            "output": { "shape": "GetUsageLimitsResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>API to get current usage limits</p>"
+        },
+        "ListAvailableCustomizations": {
+            "name": "ListAvailableCustomizations",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "ListAvailableCustomizationsRequest" },
+            "output": { "shape": "ListAvailableCustomizationsResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ]
+        },
+        "ListAvailableModels": {
+            "name": "ListAvailableModels",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "ListAvailableModelsRequest" },
+            "output": { "shape": "ListAvailableModelsResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ]
+        },
+        "ListAvailableProfiles": {
+            "name": "ListAvailableProfiles",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "ListAvailableProfilesRequest" },
+            "output": { "shape": "ListAvailableProfilesResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ]
+        },
+        "ListCodeAnalysisFindings": {
+            "name": "ListCodeAnalysisFindings",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "ListCodeAnalysisFindingsRequest" },
+            "output": { "shape": "ListCodeAnalysisFindingsResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>Lists the findings from a particular code analysis job.</p>"
+        },
+        "ListEvents": {
+            "name": "ListEvents",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "ListEventsRequest" },
+            "output": { "shape": "ListEventsResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>List events for agent activity</p>"
+        },
+        "ListFeatureEvaluations": {
+            "name": "ListFeatureEvaluations",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "ListFeatureEvaluationsRequest" },
+            "output": { "shape": "ListFeatureEvaluationsResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>Return configruations for each feature that has been setup for A/B testing.</p>"
+        },
+        "ListUserMemoryEntries": {
+            "name": "ListUserMemoryEntries",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "ListUserMemoryEntriesInput" },
+            "output": { "shape": "ListUserMemoryEntriesOutput" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>API to list user memories</p>"
+        },
+        "ListWorkspaceMetadata": {
+            "name": "ListWorkspaceMetadata",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "ListWorkspaceMetadataRequest" },
+            "output": { "shape": "ListWorkspaceMetadataResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>List workspace metadata based on a workspace root</p>"
+        },
+        "PushTelemetryEvent": {
+            "name": "PushTelemetryEvent",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "PushTelemetryEventRequest" },
+            "output": { "shape": "PushTelemetryEventResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>API to push telemetry events to CloudWatch, DataHub and EventBridge.</p>",
+            "idempotent": true
+        },
+        "ResumeTransformation": {
+            "name": "ResumeTransformation",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "ResumeTransformationRequest" },
+            "output": { "shape": "ResumeTransformationResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>API to resume transformation job.</p>"
+        },
+        "SendTelemetryEvent": {
+            "name": "SendTelemetryEvent",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "SendTelemetryEventRequest" },
+            "output": { "shape": "SendTelemetryEventResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>API to record telemetry events.</p>",
+            "idempotent": true
+        },
+        "StartCodeAnalysis": {
+            "name": "StartCodeAnalysis",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "StartCodeAnalysisRequest" },
+            "output": { "shape": "StartCodeAnalysisResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "ConflictException" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>Starts a code analysis job</p>",
+            "idempotent": true
+        },
+        "StartCodeFixJob": {
+            "name": "StartCodeFixJob",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "StartCodeFixJobRequest" },
+            "output": { "shape": "StartCodeFixJobResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ]
+        },
+        "StartTaskAssistCodeGeneration": {
+            "name": "StartTaskAssistCodeGeneration",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "StartTaskAssistCodeGenerationRequest" },
+            "output": { "shape": "StartTaskAssistCodeGenerationResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "ConflictException" },
+                { "shape": "ServiceQuotaExceededException" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>API to start task assist code generation.</p>"
+        },
+        "StartTestGeneration": {
+            "name": "StartTestGeneration",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "StartTestGenerationRequest" },
+            "output": { "shape": "StartTestGenerationResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "ConflictException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>API to start test generation.</p>",
+            "idempotent": true
+        },
+        "StartTransformation": {
+            "name": "StartTransformation",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "StartTransformationRequest" },
+            "output": { "shape": "StartTransformationResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "ConflictException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>API to start code translation.</p>"
+        },
+        "StopTransformation": {
+            "name": "StopTransformation",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "StopTransformationRequest" },
+            "output": { "shape": "StopTransformationResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" }
+            ],
+            "documentation": "<p>API to stop code transformation status.</p>"
+        },
+        "UpdateUsageLimits": {
+            "name": "UpdateUsageLimits",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": { "shape": "UpdateUsageLimitsRequest" },
+            "output": { "shape": "UpdateUsageLimitsResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "InternalServerException" },
+                { "shape": "ValidationException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "UpdateUsageLimitQuotaExceededException" }
+            ],
+            "documentation": "<p>API to update usage limits for enterprise customers</p>"
+        }
+    },
+    "shapes": {
+        "AccessDeniedException": {
+            "type": "structure",
+            "required": ["message"],
+            "members": {
+                "message": { "shape": "String" },
+                "reason": { "shape": "AccessDeniedExceptionReason" }
+            },
+            "documentation": "<p>This exception is thrown when the user does not have sufficient access to perform this action.</p>",
+            "exception": true
+        },
+        "AccessDeniedExceptionReason": {
+            "type": "string",
+            "documentation": "<p>Reason for AccessDeniedException</p>",
+            "enum": [
+                "UNAUTHORIZED_CUSTOMIZATION_RESOURCE_ACCESS",
+                "UNAUTHORIZED_WORKSPACE_CONTEXT_FEATURE_ACCESS",
+                "TEMPORARILY_SUSPENDED",
+                "FEATURE_NOT_SUPPORTED"
+            ]
+        },
+        "ActivationToken": {
+            "type": "string",
+            "max": 11,
+            "min": 11
+        },
+        "ActiveFunctionalityList": {
+            "type": "list",
+            "member": { "shape": "FunctionalityName" },
+            "max": 10,
+            "min": 0
+        },
+        "AdditionalContentEntry": {
+            "type": "structure",
+            "required": ["name", "description"],
+            "members": {
+                "name": {
+                    "shape": "AdditionalContentEntryNameString",
+                    "documentation": "<p>The name/identifier for this context entry</p>"
+                },
+                "description": {
+                    "shape": "AdditionalContentEntryDescriptionString",
+                    "documentation": "<p>A description of what this context entry represents</p>"
+                },
+                "innerContext": {
+                    "shape": "AdditionalContentEntryInnerContextString",
+                    "documentation": "<p>The actual contextual content</p>"
+                }
+            },
+            "documentation": "<p>Structure representing a single entry of additional contextual content</p>"
+        },
+        "AdditionalContentEntryDescriptionString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1,
+            "sensitive": true
+        },
+        "AdditionalContentEntryInnerContextString": {
+            "type": "string",
+            "max": 8192,
+            "min": 1,
+            "sensitive": true
+        },
+        "AdditionalContentEntryNameString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1,
+            "pattern": "[a-z]+(?:-[a-z0-9]+)*",
+            "sensitive": true
+        },
+        "AdditionalContentList": {
+            "type": "list",
+            "member": { "shape": "AdditionalContentEntry" },
+            "documentation": "<p>A list of additional content entries, limited to 20 items</p>",
+            "max": 20,
+            "min": 0
+        },
+        "AgentTaskType": {
+            "type": "string",
+            "documentation": "<p>Type of agent task</p>",
+            "enum": ["vibe", "spectask"]
+        },
+        "AgenticChatEventStatus": {
+            "type": "string",
+            "enum": ["SUCCEEDED", "CANCELLED", "FAILED"]
+        },
+        "AppStudioState": {
+            "type": "structure",
+            "required": ["namespace", "propertyName", "propertyContext"],
+            "members": {
+                "namespace": {
+                    "shape": "AppStudioStateNamespaceString",
+                    "documentation": "<p>The namespace of the context. Examples: 'ui.Button', 'ui.Table.DataSource', 'ui.Table.RowActions.Button', 'logic.invokeAWS', 'logic.JavaScript'</p>"
+                },
+                "propertyName": {
+                    "shape": "AppStudioStatePropertyNameString",
+                    "documentation": "<p>The name of the property. Examples: 'visibility', 'disability', 'value', 'code'</p>"
+                },
+                "propertyValue": {
+                    "shape": "AppStudioStatePropertyValueString",
+                    "documentation": "<p>The value of the property.</p>"
+                },
+                "propertyContext": {
+                    "shape": "AppStudioStatePropertyContextString",
+                    "documentation": "<p>Context about how the property is used</p>"
+                }
+            },
+            "documentation": "<p>Description of a user's context when they are calling Q Chat from AppStudio</p>"
+        },
+        "AppStudioStateNamespaceString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1,
+            "sensitive": true
+        },
+        "AppStudioStatePropertyContextString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1,
+            "sensitive": true
+        },
+        "AppStudioStatePropertyNameString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1,
+            "sensitive": true
+        },
+        "AppStudioStatePropertyValueString": {
+            "type": "string",
+            "max": 10240,
+            "min": 0,
+            "sensitive": true
+        },
+        "ApplicationProperties": {
+            "type": "structure",
+            "required": ["tenantId", "applicationArn", "tenantUrl", "applicationType"],
+            "members": {
+                "tenantId": { "shape": "TenantId" },
+                "applicationArn": { "shape": "ResourceArn" },
+                "tenantUrl": { "shape": "Url" },
+                "applicationType": { "shape": "FunctionalityName" }
+            }
+        },
+        "ApplicationPropertiesList": {
+            "type": "list",
+            "member": { "shape": "ApplicationProperties" }
+        },
+        "ArtifactId": {
+            "type": "string",
+            "max": 126,
+            "min": 1,
+            "pattern": "[a-zA-Z0-9-_]+"
+        },
+        "ArtifactMap": {
+            "type": "map",
+            "key": { "shape": "ArtifactType" },
+            "value": { "shape": "UploadId" },
+            "max": 64,
+            "min": 1
+        },
+        "ArtifactType": {
+            "type": "string",
+            "enum": ["SourceCode", "BuiltJars"]
+        },
+        "AssistantResponseMessage": {
+            "type": "structure",
+            "required": ["content"],
+            "members": {
+                "messageId": { "shape": "MessageId" },
+                "content": {
+                    "shape": "AssistantResponseMessageContentString",
+                    "documentation": "<p>The content of the text message in markdown format.</p>"
+                },
+                "supplementaryWebLinks": {
+                    "shape": "SupplementaryWebLinks",
+                    "documentation": "<p>Web References</p>"
+                },
+                "references": {
+                    "shape": "References",
+                    "documentation": "<p>Code References</p>"
+                },
+                "followupPrompt": {
+                    "shape": "FollowupPrompt",
+                    "documentation": "<p>Followup Prompt</p>"
+                },
+                "toolUses": {
+                    "shape": "ToolUses",
+                    "documentation": "<p>ToolUse Request</p>"
+                },
+                "cachePoint": {
+                    "shape": "CachePoint",
+                    "documentation": "<p>Indicates whether this message is a cache point</p>"
+                },
+                "reasoningContent": {
+                    "shape": "ReasoningContent",
+                    "documentation": "<p>Model's internal reasoning process, either as readable text or redacted binary content</p>"
+                }
+            },
+            "documentation": "<p>Markdown text message.</p>"
+        },
+        "AssistantResponseMessageContentString": {
+            "type": "string",
+            "min": 0,
+            "sensitive": true
+        },
+        "AttributesMap": {
+            "type": "map",
+            "key": { "shape": "AttributesMapKeyString" },
+            "value": { "shape": "StringList" },
+            "documentation": "<p>Attributes is a map of key-value pairs</p>"
+        },
+        "AttributesMapKeyString": {
+            "type": "string",
+            "max": 128,
+            "min": 1
+        },
+        "Base64EncodedPaginationToken": {
+            "type": "string",
+            "max": 2048,
+            "min": 1,
+            "pattern": "(?:[A-Za-z0-9\\+/]{4})*(?:[A-Za-z0-9\\+/]{2}\\=\\=|[A-Za-z0-9\\+/]{3}\\=)?"
+        },
+        "Blob": { "type": "blob" },
+        "Boolean": {
+            "type": "boolean",
+            "box": true
+        },
+        "ByUserAnalytics": {
+            "type": "structure",
+            "required": ["toggle"],
+            "members": {
+                "s3Uri": { "shape": "S3Uri" },
+                "toggle": { "shape": "OptInFeatureToggle" }
+            }
+        },
+        "CachePoint": {
+            "type": "structure",
+            "required": ["type"],
+            "members": {
+                "type": { "shape": "CachePointType" }
+            }
+        },
+        "CachePointType": {
+            "type": "string",
+            "enum": ["default"]
+        },
+        "ChangeLogGranularityType": {
+            "type": "string",
+            "enum": ["STANDARD", "BUSINESS"]
+        },
+        "ChangeLogOptions": {
+            "type": "structure",
+            "required": ["granularity"],
+            "members": {
+                "granularity": { "shape": "ChangeLogGranularityType" }
+            }
+        },
+        "ChatAddMessageEvent": {
+            "type": "structure",
+            "required": ["conversationId", "messageId"],
+            "members": {
+                "conversationId": { "shape": "ConversationId" },
+                "messageId": { "shape": "MessageId" },
+                "customizationArn": { "shape": "CustomizationArn" },
+                "userIntent": { "shape": "UserIntent" },
+                "hasCodeSnippet": { "shape": "Boolean" },
+                "programmingLanguage": { "shape": "ProgrammingLanguage" },
+                "activeEditorTotalCharacters": { "shape": "Integer" },
+                "timeToFirstChunkMilliseconds": { "shape": "Double" },
+                "timeBetweenChunks": { "shape": "timeBetweenChunks" },
+                "fullResponselatency": { "shape": "Double" },
+                "requestLength": { "shape": "Integer" },
+                "responseLength": { "shape": "Integer" },
+                "numberOfCodeBlocks": { "shape": "Integer" },
+                "hasProjectLevelContext": { "shape": "Boolean" },
+                "result": { "shape": "AgenticChatEventStatus" }
+            }
+        },
+        "ChatHistory": {
+            "type": "list",
+            "member": { "shape": "ChatMessage" },
+            "documentation": "<p>Indicates Participant in Chat conversation</p>",
+            "min": 0
+        },
+        "ChatInteractWithMessageEvent": {
+            "type": "structure",
+            "required": ["conversationId", "messageId"],
+            "members": {
+                "conversationId": { "shape": "ConversationId" },
+                "messageId": { "shape": "MessageId" },
+                "customizationArn": { "shape": "CustomizationArn" },
+                "interactionType": { "shape": "ChatMessageInteractionType" },
+                "interactionTarget": { "shape": "ChatInteractWithMessageEventInteractionTargetString" },
+                "acceptedCharacterCount": { "shape": "Integer" },
+                "acceptedLineCount": { "shape": "Integer" },
+                "acceptedSnippetHasReference": { "shape": "Boolean" },
+                "hasProjectLevelContext": { "shape": "Boolean" },
+                "userIntent": { "shape": "UserIntent" },
+                "addedIdeDiagnostics": { "shape": "IdeDiagnosticList" },
+                "removedIdeDiagnostics": { "shape": "IdeDiagnosticList" }
+            }
+        },
+        "ChatInteractWithMessageEventInteractionTargetString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1
+        },
+        "ChatMessage": {
+            "type": "structure",
+            "members": {
+                "userInputMessage": { "shape": "UserInputMessage" },
+                "assistantResponseMessage": { "shape": "AssistantResponseMessage" }
+            },
+            "union": true
+        },
+        "ChatMessageInteractionType": {
+            "type": "string",
+            "documentation": "<p>Chat Message Interaction Type</p>",
+            "enum": [
+                "INSERT_AT_CURSOR",
+                "COPY_SNIPPET",
+                "COPY",
+                "CLICK_LINK",
+                "CLICK_BODY_LINK",
+                "CLICK_FOLLOW_UP",
+                "HOVER_REFERENCE",
+                "UPVOTE",
+                "DOWNVOTE",
+                "AGENTIC_CODE_ACCEPTED"
+            ]
+        },
+        "ChatTriggerType": {
+            "type": "string",
+            "documentation": "<p>Trigger Reason for Chat</p>",
+            "enum": ["MANUAL", "DIAGNOSTIC", "INLINE_CHAT"]
+        },
+        "ChatUserModificationEvent": {
+            "type": "structure",
+            "required": ["conversationId", "messageId", "modificationPercentage"],
+            "members": {
+                "conversationId": { "shape": "ConversationId" },
+                "customizationArn": { "shape": "CustomizationArn" },
+                "messageId": { "shape": "MessageId" },
+                "programmingLanguage": { "shape": "ProgrammingLanguage" },
+                "modificationPercentage": { "shape": "Double" },
+                "hasProjectLevelContext": { "shape": "Boolean" }
+            }
+        },
+        "ClientCacheConfig": {
+            "type": "structure",
+            "members": {
+                "useClientCachingOnly": { "shape": "Boolean" }
+            }
+        },
+        "ClientId": {
+            "type": "string",
+            "max": 255,
+            "min": 1
+        },
+        "CodeAnalysisFindingsSchema": {
+            "type": "string",
+            "enum": ["codeanalysis/findings/1.0"]
+        },
+        "CodeAnalysisScope": {
+            "type": "string",
+            "enum": ["FILE", "PROJECT", "AGENTIC"]
+        },
+        "CodeAnalysisStatus": {
+            "type": "string",
+            "enum": ["Completed", "Pending", "Failed"]
+        },
+        "CodeAnalysisUploadContext": {
+            "type": "structure",
+            "required": ["codeScanName"],
+            "members": {
+                "codeScanName": { "shape": "CodeScanName" }
+            }
+        },
+        "CodeCoverageEvent": {
+            "type": "structure",
+            "required": ["programmingLanguage", "acceptedCharacterCount", "totalCharacterCount", "timestamp"],
+            "members": {
+                "customizationArn": { "shape": "CustomizationArn" },
+                "programmingLanguage": { "shape": "ProgrammingLanguage" },
+                "acceptedCharacterCount": { "shape": "PrimitiveInteger" },
+                "totalCharacterCount": { "shape": "PrimitiveInteger" },
+                "timestamp": { "shape": "Timestamp" },
+                "unmodifiedAcceptedCharacterCount": { "shape": "PrimitiveInteger" },
+                "totalNewCodeCharacterCount": { "shape": "PrimitiveInteger" },
+                "totalNewCodeLineCount": { "shape": "PrimitiveInteger" },
+                "userWrittenCodeCharacterCount": { "shape": "CodeCoverageEventUserWrittenCodeCharacterCountInteger" },
+                "userWrittenCodeLineCount": { "shape": "CodeCoverageEventUserWrittenCodeLineCountInteger" },
+                "addedCharacterCount": { "shape": "CodeCoverageEventAddedCharacterCountInteger" }
+            }
+        },
+        "CodeCoverageEventAddedCharacterCountInteger": {
+            "type": "integer",
+            "min": 0
+        },
+        "CodeCoverageEventUserWrittenCodeCharacterCountInteger": {
+            "type": "integer",
+            "min": 0
+        },
+        "CodeCoverageEventUserWrittenCodeLineCountInteger": {
+            "type": "integer",
+            "min": 0
+        },
+        "CodeDescription": {
+            "type": "structure",
+            "required": ["href"],
+            "members": {
+                "href": {
+                    "shape": "CodeDescriptionHrefString",
+                    "documentation": "<p>An URI to open with more information about the diagnostic error.</p>"
+                }
+            },
+            "documentation": "<p>Structure to capture a description for an error code.</p>"
+        },
+        "CodeDescriptionHrefString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1,
+            "sensitive": true
+        },
+        "CodeFixAcceptanceEvent": {
+            "type": "structure",
+            "required": ["jobId"],
+            "members": {
+                "jobId": { "shape": "String" },
+                "ruleId": { "shape": "String" },
+                "detectorId": { "shape": "String" },
+                "findingId": { "shape": "String" },
+                "programmingLanguage": { "shape": "ProgrammingLanguage" },
+                "linesOfCodeAccepted": { "shape": "Integer" },
+                "charsOfCodeAccepted": { "shape": "Integer" }
+            }
+        },
+        "CodeFixGenerationEvent": {
+            "type": "structure",
+            "required": ["jobId"],
+            "members": {
+                "jobId": { "shape": "String" },
+                "ruleId": { "shape": "String" },
+                "detectorId": { "shape": "String" },
+                "findingId": { "shape": "String" },
+                "programmingLanguage": { "shape": "ProgrammingLanguage" },
+                "linesOfCodeGenerated": { "shape": "Integer" },
+                "charsOfCodeGenerated": { "shape": "Integer" }
+            }
+        },
+        "CodeFixJobStatus": {
+            "type": "string",
+            "enum": ["Succeeded", "InProgress", "Failed"]
+        },
+        "CodeFixName": {
+            "type": "string",
+            "documentation": "<p>Code fix name</p>",
+            "max": 128,
+            "min": 1,
+            "pattern": "[a-zA-Z0-9-_$:.]*"
+        },
+        "CodeFixUploadContext": {
+            "type": "structure",
+            "required": ["codeFixName"],
+            "members": {
+                "codeFixName": { "shape": "CodeFixName" }
+            }
+        },
+        "CodeGenerationId": {
+            "type": "string",
+            "documentation": "<p>ID which represents a single code generation in a conversation</p>",
+            "max": 128,
+            "min": 1
+        },
+        "CodeGenerationStatus": {
+            "type": "structure",
+            "required": ["status", "currentStage"],
+            "members": {
+                "status": { "shape": "CodeGenerationWorkflowStatus" },
+                "currentStage": { "shape": "CodeGenerationWorkflowStage" }
+            }
+        },
+        "CodeGenerationStatusDetail": {
+            "type": "string",
+            "documentation": "<p>Detailed message about the code generation status</p>",
+            "sensitive": true
+        },
+        "CodeGenerationWorkflowStage": {
+            "type": "string",
+            "enum": ["InitialCodeGeneration", "CodeRefinement"]
+        },
+        "CodeGenerationWorkflowStatus": {
+            "type": "string",
+            "enum": ["InProgress", "Complete", "Failed"]
+        },
+        "CodeScanEvent": {
+            "type": "structure",
+            "required": ["programmingLanguage", "codeScanJobId", "timestamp"],
+            "members": {
+                "programmingLanguage": { "shape": "ProgrammingLanguage" },
+                "codeScanJobId": { "shape": "CodeScanJobId" },
+                "timestamp": { "shape": "Timestamp" },
+                "codeAnalysisScope": { "shape": "CodeAnalysisScope" }
+            },
+            "documentation": "<p>Published when a security scan or code review starts</p>"
+        },
+        "CodeScanFailedEvent": {
+            "type": "structure",
+            "required": ["programmingLanguage", "codeScanJobId", "timestamp"],
+            "members": {
+                "programmingLanguage": { "shape": "ProgrammingLanguage" },
+                "codeScanJobId": { "shape": "CodeScanJobId" },
+                "timestamp": { "shape": "Timestamp" },
+                "codeAnalysisScope": { "shape": "CodeAnalysisScope" }
+            },
+            "documentation": "<p>Published when a security scan or code review fails</p>"
+        },
+        "CodeScanJobId": {
+            "type": "string",
+            "max": 128,
+            "min": 1
+        },
+        "CodeScanName": {
+            "type": "string",
+            "documentation": "<p>Code analysis scan name</p>",
+            "max": 128,
+            "min": 1
+        },
+        "CodeScanRemediationsEvent": {
+            "type": "structure",
+            "members": {
+                "programmingLanguage": { "shape": "ProgrammingLanguage" },
+                "CodeScanRemediationsEventType": { "shape": "CodeScanRemediationsEventType" },
+                "timestamp": { "shape": "Timestamp" },
+                "detectorId": { "shape": "String" },
+                "findingId": { "shape": "String" },
+                "ruleId": { "shape": "String" },
+                "component": { "shape": "String" },
+                "reason": { "shape": "String" },
+                "result": { "shape": "String" },
+                "includesFix": { "shape": "Boolean" }
+            }
+        },
+        "CodeScanRemediationsEventType": {
+            "type": "string",
+            "documentation": "<p>Code Scan Remediations Interaction Type</p>",
+            "enum": ["CODESCAN_ISSUE_HOVER", "CODESCAN_ISSUE_APPLY_FIX", "CODESCAN_ISSUE_VIEW_DETAILS"]
+        },
+        "CodeScanSucceededEvent": {
+            "type": "structure",
+            "required": ["programmingLanguage", "codeScanJobId", "timestamp", "numberOfFindings"],
+            "members": {
+                "programmingLanguage": { "shape": "ProgrammingLanguage" },
+                "codeScanJobId": { "shape": "CodeScanJobId" },
+                "timestamp": { "shape": "Timestamp" },
+                "numberOfFindings": { "shape": "PrimitiveInteger" },
+                "codeAnalysisScope": { "shape": "CodeAnalysisScope" }
+            },
+            "documentation": "<p>Published when a security scan or code review completes successfully</p>"
+        },
+        "Completion": {
+            "type": "structure",
+            "required": ["content"],
+            "members": {
+                "content": { "shape": "CompletionContentString" },
+                "references": { "shape": "References" },
+                "mostRelevantMissingImports": { "shape": "Imports" }
+            }
+        },
+        "CompletionContentString": {
+            "type": "string",
+            "max": 5120,
+            "min": 1,
+            "sensitive": true
+        },
+        "CompletionType": {
+            "type": "string",
+            "enum": ["BLOCK", "LINE"]
+        },
+        "Completions": {
+            "type": "list",
+            "member": { "shape": "Completion" },
+            "max": 10,
+            "min": 0
+        },
+        "ConflictException": {
+            "type": "structure",
+            "required": ["message"],
+            "members": {
+                "message": { "shape": "String" },
+                "reason": { "shape": "ConflictExceptionReason" }
+            },
+            "documentation": "<p>This exception is thrown when the action to perform could not be completed because the resource is in a conflicting state.</p>",
+            "exception": true
+        },
+        "ConflictExceptionReason": {
+            "type": "string",
+            "documentation": "<p>Reason for ConflictException</p>",
+            "enum": ["CUSTOMER_KMS_KEY_INVALID_KEY_POLICY", "CUSTOMER_KMS_KEY_DISABLED", "MISMATCHED_KMS_KEY"]
+        },
+        "ConsoleState": {
+            "type": "structure",
+            "members": {
+                "region": { "shape": "String" },
+                "consoleUrl": { "shape": "SensitiveString" },
+                "serviceId": { "shape": "String" },
+                "serviceConsolePage": { "shape": "String" },
+                "serviceSubconsolePage": { "shape": "String" },
+                "taskName": { "shape": "SensitiveString" }
+            },
+            "documentation": "<p>Information about the state of the AWS management console page from which the user is calling</p>"
+        },
+        "ContentChecksumType": {
+            "type": "string",
+            "enum": ["SHA_256"]
+        },
+        "ContentType": {
+            "type": "string",
+            "documentation": "<p>The type of content</p>",
+            "enum": ["FILE", "PROMPT", "CODE", "WORKSPACE"]
+        },
+        "ContextTruncationScheme": {
+            "type": "string",
+            "documentation": "<p>Workspace context truncation schemes based on usecase</p>",
+            "enum": ["ANALYSIS", "GUMBY"]
+        },
+        "ConversationId": {
+            "type": "string",
+            "documentation": "<p>ID which represents a multi-turn conversation</p>",
+            "max": 128,
+            "min": 1
+        },
+        "ConversationState": {
+            "type": "structure",
+            "required": ["currentMessage", "chatTriggerType"],
+            "members": {
+                "conversationId": {
+                    "shape": "ConversationId",
+                    "documentation": "<p>Unique identifier for the chat conversation stream</p>"
+                },
+                "workspaceId": {
+                    "shape": "UUID",
+                    "documentation": "<p>Unique identifier for remote workspace</p>"
+                },
+                "history": {
+                    "shape": "ChatHistory",
+                    "documentation": "<p>Holds the history of chat messages.</p>"
+                },
+                "currentMessage": {
+                    "shape": "ChatMessage",
+                    "documentation": "<p>Holds the current message being processed or displayed.</p>"
+                },
+                "chatTriggerType": {
+                    "shape": "ChatTriggerType",
+                    "documentation": "<p>Trigger Reason for Chat</p>"
+                },
+                "customizationArn": { "shape": "ResourceArn" },
+                "agentContinuationId": {
+                    "shape": "UUID",
+                    "documentation": "<p>Unique identifier for the agent task execution</p>"
+                },
+                "agentTaskType": { "shape": "AgentTaskType" }
+            },
+            "documentation": "<p>Structure to represent the current state of a chat conversation.</p>"
+        },
+        "CreateSubscriptionTokenRequest": {
+            "type": "structure",
+            "members": {
+                "clientToken": {
+                    "shape": "IdempotencyToken",
+                    "idempotencyToken": true
+                },
+                "statusOnly": { "shape": "Boolean" }
+            }
+        },
+        "CreateSubscriptionTokenResponse": {
+            "type": "structure",
+            "required": ["status"],
+            "members": {
+                "encodedVerificationUrl": { "shape": "EncodedVerificationUrl" },
+                "token": { "shape": "ActivationToken" },
+                "status": { "shape": "SubscriptionStatus" }
+            }
+        },
+        "CreateTaskAssistConversationRequest": {
+            "type": "structure",
+            "members": {
+                "profileArn": { "shape": "ProfileArn" }
+            },
+            "documentation": "<p>Structure to represent bootstrap conversation request.</p>"
+        },
+        "CreateTaskAssistConversationResponse": {
+            "type": "structure",
+            "required": ["conversationId"],
+            "members": {
+                "conversationId": { "shape": "ConversationId" }
+            },
+            "documentation": "<p>Structure to represent bootstrap conversation response.</p>"
+        },
+        "CreateUploadUrlRequest": {
+            "type": "structure",
+            "members": {
+                "contentMd5": { "shape": "CreateUploadUrlRequestContentMd5String" },
+                "contentChecksum": { "shape": "CreateUploadUrlRequestContentChecksumString" },
+                "contentChecksumType": { "shape": "ContentChecksumType" },
+                "contentLength": { "shape": "CreateUploadUrlRequestContentLengthLong" },
+                "artifactType": { "shape": "ArtifactType" },
+                "uploadIntent": { "shape": "UploadIntent" },
+                "uploadContext": { "shape": "UploadContext" },
+                "uploadId": { "shape": "UploadId" },
+                "profileArn": { "shape": "ProfileArn" }
+            }
+        },
+        "CreateUploadUrlRequestContentChecksumString": {
+            "type": "string",
+            "max": 512,
+            "min": 1,
+            "sensitive": true
+        },
+        "CreateUploadUrlRequestContentLengthLong": {
+            "type": "long",
+            "box": true,
+            "min": 1
+        },
+        "CreateUploadUrlRequestContentMd5String": {
+            "type": "string",
+            "max": 128,
+            "min": 1,
+            "sensitive": true
+        },
+        "CreateUploadUrlResponse": {
+            "type": "structure",
+            "required": ["uploadId", "uploadUrl"],
+            "members": {
+                "uploadId": { "shape": "UploadId" },
+                "uploadUrl": { "shape": "PreSignedUrl" },
+                "kmsKeyArn": { "shape": "ResourceArn" },
+                "requestHeaders": { "shape": "RequestHeaders" }
+            }
+        },
+        "CreateUserMemoryEntryInput": {
+            "type": "structure",
+            "required": ["memoryEntryString", "origin"],
+            "members": {
+                "memoryEntryString": { "shape": "CreateUserMemoryEntryInputMemoryEntryStringString" },
+                "origin": { "shape": "Origin" },
+                "profileArn": {
+                    "shape": "CreateUserMemoryEntryInputProfileArnString",
+                    "documentation": "<p>ProfileArn for the managing Q Profile</p>"
+                },
+                "clientToken": {
+                    "shape": "IdempotencyToken",
+                    "idempotencyToken": true
+                }
+            }
+        },
+        "CreateUserMemoryEntryInputMemoryEntryStringString": {
+            "type": "string",
+            "max": 500,
+            "min": 1,
+            "sensitive": true
+        },
+        "CreateUserMemoryEntryInputProfileArnString": {
+            "type": "string",
+            "min": 1,
+            "pattern": "arn:aws:(codewhisperer|transform):[-.a-z0-9]{1,63}:\\d{12}:profile/([a-zA-Z0-9]){12}"
+        },
+        "CreateUserMemoryEntryOutput": {
+            "type": "structure",
+            "required": ["memoryEntry"],
+            "members": {
+                "memoryEntry": { "shape": "MemoryEntry" }
+            }
+        },
+        "CreateWorkspaceRequest": {
+            "type": "structure",
+            "required": ["workspaceRoot"],
+            "members": {
+                "workspaceRoot": { "shape": "CreateWorkspaceRequestWorkspaceRootString" },
+                "profileArn": { "shape": "ProfileArn" }
+            }
+        },
+        "CreateWorkspaceRequestWorkspaceRootString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1,
+            "sensitive": true
+        },
+        "CreateWorkspaceResponse": {
+            "type": "structure",
+            "required": ["workspace"],
+            "members": {
+                "workspace": { "shape": "WorkspaceMetadata" }
+            }
+        },
+        "CursorState": {
+            "type": "structure",
+            "members": {
+                "position": {
+                    "shape": "Position",
+                    "documentation": "<p>Represents a cursor position in a Text Document</p>"
+                },
+                "range": {
+                    "shape": "Range",
+                    "documentation": "<p>Represents a text selection in a Text Document</p>"
+                }
+            },
+            "documentation": "<p>Represents the state of the Cursor in an Editor</p>",
+            "union": true
+        },
+        "Customization": {
+            "type": "structure",
+            "required": ["arn"],
+            "members": {
+                "arn": { "shape": "CustomizationArn" },
+                "name": { "shape": "CustomizationName" },
+                "description": { "shape": "Description" },
+                "modelId": { "shape": "ModelId" }
+            }
+        },
+        "CustomizationArn": {
+            "type": "string",
+            "max": 950,
+            "min": 0,
+            "pattern": "arn:[-.a-z0-9]{1,63}:codewhisperer:([-.a-z0-9]{0,63}:){2}([a-zA-Z0-9-_:/]){1,1023}"
+        },
+        "CustomizationName": {
+            "type": "string",
+            "max": 100,
+            "min": 1,
+            "pattern": "[a-zA-Z][a-zA-Z0-9_-]*"
+        },
+        "Customizations": {
+            "type": "list",
+            "member": { "shape": "Customization" }
+        },
+        "DashboardAnalytics": {
+            "type": "structure",
+            "required": ["toggle"],
+            "members": {
+                "toggle": { "shape": "OptInFeatureToggle" }
+            }
+        },
+        "DeleteTaskAssistConversationRequest": {
+            "type": "structure",
+            "required": ["conversationId"],
+            "members": {
+                "conversationId": { "shape": "ConversationId" },
+                "profileArn": { "shape": "ProfileArn" }
+            },
+            "documentation": "<p>Structure to represent bootstrap conversation request.</p>"
+        },
+        "DeleteTaskAssistConversationResponse": {
+            "type": "structure",
+            "required": ["conversationId"],
+            "members": {
+                "conversationId": { "shape": "ConversationId" }
+            },
+            "documentation": "<p>Structure to represent bootstrap conversation response.</p>"
+        },
+        "DeleteUserMemoryEntryInput": {
+            "type": "structure",
+            "required": ["id"],
+            "members": {
+                "id": { "shape": "DeleteUserMemoryEntryInputIdString" },
+                "profileArn": {
+                    "shape": "DeleteUserMemoryEntryInputProfileArnString",
+                    "documentation": "<p>ProfileArn for the managing Q Profile</p>"
+                }
+            }
+        },
+        "DeleteUserMemoryEntryInputIdString": {
+            "type": "string",
+            "max": 36,
+            "min": 36,
+            "pattern": "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}"
+        },
+        "DeleteUserMemoryEntryInputProfileArnString": {
+            "type": "string",
+            "min": 1,
+            "pattern": "arn:aws:(codewhisperer|transform):[-.a-z0-9]{1,63}:\\d{12}:profile/([a-zA-Z0-9]){12}"
+        },
+        "DeleteUserMemoryEntryOutput": {
+            "type": "structure",
+            "members": {}
+        },
+        "DeleteWorkspaceRequest": {
+            "type": "structure",
+            "required": ["workspaceId"],
+            "members": {
+                "workspaceId": { "shape": "UUID" },
+                "profileArn": { "shape": "ProfileArn" }
+            }
+        },
+        "DeleteWorkspaceResponse": {
+            "type": "structure",
+            "members": {}
+        },
+        "Description": {
+            "type": "string",
+            "max": 256,
+            "min": 0,
+            "pattern": "[\\sa-zA-Z0-9_-]*"
+        },
+        "Diagnostic": {
+            "type": "structure",
+            "members": {
+                "textDocumentDiagnostic": {
+                    "shape": "TextDocumentDiagnostic",
+                    "documentation": "<p>Diagnostics originating from a TextDocument</p>"
+                },
+                "runtimeDiagnostic": {
+                    "shape": "RuntimeDiagnostic",
+                    "documentation": "<p>Diagnostics originating from a Runtime</p>"
+                }
+            },
+            "documentation": "<p>Represents a Diagnostic message</p>",
+            "union": true
+        },
+        "DiagnosticLocation": {
+            "type": "structure",
+            "required": ["uri", "range"],
+            "members": {
+                "uri": { "shape": "DiagnosticLocationUriString" },
+                "range": { "shape": "Range" }
+            },
+            "documentation": "<p>Represents a location inside a resource, such as a line inside a text file.</p>"
+        },
+        "DiagnosticLocationUriString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1,
+            "sensitive": true
+        },
+        "DiagnosticRelatedInformation": {
+            "type": "structure",
+            "required": ["location", "message"],
+            "members": {
+                "location": {
+                    "shape": "DiagnosticLocation",
+                    "documentation": "<p>The location of this related diagnostic information.</p>"
+                },
+                "message": {
+                    "shape": "DiagnosticRelatedInformationMessageString",
+                    "documentation": "<p>The message of this related diagnostic information.</p>"
+                }
+            },
+            "documentation": "<p>Represents a related message and source code location for a diagnostic.</p>"
+        },
+        "DiagnosticRelatedInformationList": {
+            "type": "list",
+            "member": { "shape": "DiagnosticRelatedInformation" },
+            "documentation": "<p>List of DiagnosticRelatedInformation</p>",
+            "max": 1024,
+            "min": 0
+        },
+        "DiagnosticRelatedInformationMessageString": {
+            "type": "string",
+            "max": 1024,
+            "min": 0,
+            "sensitive": true
+        },
+        "DiagnosticSeverity": {
+            "type": "string",
+            "documentation": "<p>Diagnostic Error types</p>",
+            "enum": ["ERROR", "WARNING", "INFORMATION", "HINT"]
+        },
+        "DiagnosticTag": {
+            "type": "string",
+            "documentation": "<p>The diagnostic tags.</p>",
+            "enum": ["UNNECESSARY", "DEPRECATED"]
+        },
+        "DiagnosticTagList": {
+            "type": "list",
+            "member": { "shape": "DiagnosticTag" },
+            "documentation": "<p>List of DiagnosticTag</p>",
+            "max": 1024,
+            "min": 0
+        },
+        "Dimension": {
+            "type": "structure",
+            "members": {
+                "name": { "shape": "DimensionNameString" },
+                "value": { "shape": "DimensionValueString" }
+            }
+        },
+        "DimensionList": {
+            "type": "list",
+            "member": { "shape": "Dimension" },
+            "max": 30,
+            "min": 0
+        },
+        "DimensionNameString": {
+            "type": "string",
+            "max": 255,
+            "min": 1,
+            "pattern": "[-a-zA-Z0-9._]*"
+        },
+        "DimensionValueString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1,
+            "pattern": "[-a-zA-Z0-9._]*"
+        },
+        "DocFolderLevel": {
+            "type": "string",
+            "documentation": "<p>Specifies the folder depth level where the document should be generated</p>",
+            "enum": ["SUB_FOLDER", "ENTIRE_WORKSPACE"]
+        },
+        "DocGenerationEvent": {
+            "type": "structure",
+            "required": ["conversationId"],
+            "members": {
+                "conversationId": { "shape": "ConversationId" },
+                "numberOfAddChars": { "shape": "PrimitiveInteger" },
+                "numberOfAddLines": { "shape": "PrimitiveInteger" },
+                "numberOfAddFiles": { "shape": "PrimitiveInteger" },
+                "userDecision": { "shape": "DocUserDecision" },
+                "interactionType": { "shape": "DocInteractionType" },
+                "userIdentity": { "shape": "String" },
+                "numberOfNavigation": { "shape": "PrimitiveInteger" },
+                "folderLevel": { "shape": "DocFolderLevel" }
+            },
+            "documentation": "<p>Deprecated: use DocV2AcceptanceEvent for tracking acceptance and DocV2GenerationEvent for tracking generation</p>"
+        },
+        "DocInteractionType": {
+            "type": "string",
+            "documentation": "<p>Tracks whether user chose to generate a new document, update an existing one, or edit document</p>",
+            "enum": ["GENERATE_README", "UPDATE_README", "EDIT_README"]
+        },
+        "DocUserDecision": {
+            "type": "string",
+            "enum": ["ACCEPT", "REJECT"]
+        },
+        "DocV2AcceptanceEvent": {
+            "type": "structure",
+            "required": [
+                "conversationId",
+                "numberOfAddedChars",
+                "numberOfAddedLines",
+                "numberOfAddedFiles",
+                "userDecision",
+                "interactionType",
+                "numberOfNavigations",
+                "folderLevel"
+            ],
+            "members": {
+                "conversationId": { "shape": "ConversationId" },
+                "numberOfAddedChars": { "shape": "DocV2AcceptanceEventNumberOfAddedCharsInteger" },
+                "numberOfAddedLines": { "shape": "DocV2AcceptanceEventNumberOfAddedLinesInteger" },
+                "numberOfAddedFiles": { "shape": "DocV2AcceptanceEventNumberOfAddedFilesInteger" },
+                "userDecision": { "shape": "DocUserDecision" },
+                "interactionType": { "shape": "DocInteractionType" },
+                "numberOfNavigations": { "shape": "DocV2AcceptanceEventNumberOfNavigationsInteger" },
+                "folderLevel": { "shape": "DocFolderLevel" }
+            },
+            "documentation": "<p>Interaction event for /doc, emitted when user accepts or rejects the generated content</p>"
+        },
+        "DocV2AcceptanceEventNumberOfAddedCharsInteger": {
+            "type": "integer",
+            "min": 0
+        },
+        "DocV2AcceptanceEventNumberOfAddedFilesInteger": {
+            "type": "integer",
+            "min": 0
+        },
+        "DocV2AcceptanceEventNumberOfAddedLinesInteger": {
+            "type": "integer",
+            "min": 0
+        },
+        "DocV2AcceptanceEventNumberOfNavigationsInteger": {
+            "type": "integer",
+            "min": 0
+        },
+        "DocV2GenerationEvent": {
+            "type": "structure",
+            "required": [
+                "conversationId",
+                "numberOfGeneratedChars",
+                "numberOfGeneratedLines",
+                "numberOfGeneratedFiles"
+            ],
+            "members": {
+                "conversationId": { "shape": "ConversationId" },
+                "numberOfGeneratedChars": { "shape": "DocV2GenerationEventNumberOfGeneratedCharsInteger" },
+                "numberOfGeneratedLines": { "shape": "DocV2GenerationEventNumberOfGeneratedLinesInteger" },
+                "numberOfGeneratedFiles": { "shape": "DocV2GenerationEventNumberOfGeneratedFilesInteger" },
+                "interactionType": { "shape": "DocInteractionType" },
+                "numberOfNavigations": { "shape": "DocV2GenerationEventNumberOfNavigationsInteger" },
+                "folderLevel": { "shape": "DocFolderLevel" }
+            },
+            "documentation": "<p>Generation event for /doc, emitted when user requests document generation</p>"
+        },
+        "DocV2GenerationEventNumberOfGeneratedCharsInteger": {
+            "type": "integer",
+            "min": 0
+        },
+        "DocV2GenerationEventNumberOfGeneratedFilesInteger": {
+            "type": "integer",
+            "min": 0
+        },
+        "DocV2GenerationEventNumberOfGeneratedLinesInteger": {
+            "type": "integer",
+            "min": 0
+        },
+        "DocV2GenerationEventNumberOfNavigationsInteger": {
+            "type": "integer",
+            "min": 0
+        },
+        "Document": {
+            "type": "structure",
+            "members": {},
+            "document": true
+        },
+        "DocumentSymbol": {
+            "type": "structure",
+            "required": ["name", "type"],
+            "members": {
+                "name": {
+                    "shape": "DocumentSymbolNameString",
+                    "documentation": "<p>Name of the Document Symbol</p>"
+                },
+                "type": {
+                    "shape": "SymbolType",
+                    "documentation": "<p>Symbol type - DECLARATION / USAGE</p>"
+                },
+                "source": {
+                    "shape": "DocumentSymbolSourceString",
+                    "documentation": "<p>Symbol package / source for FullyQualified names</p>"
+                }
+            }
+        },
+        "DocumentSymbolNameString": {
+            "type": "string",
+            "max": 256,
+            "min": 1
+        },
+        "DocumentSymbolSourceString": {
+            "type": "string",
+            "max": 256,
+            "min": 1
+        },
+        "DocumentSymbols": {
+            "type": "list",
+            "member": { "shape": "DocumentSymbol" },
+            "max": 1000,
+            "min": 0
+        },
+        "DocumentationIntentContext": {
+            "type": "structure",
+            "required": ["type"],
+            "members": {
+                "scope": { "shape": "DocumentationIntentContextScopeString" },
+                "type": { "shape": "DocumentationType" },
+                "changeLogOptions": { "shape": "ChangeLogOptions" }
+            }
+        },
+        "DocumentationIntentContextScopeString": {
+            "type": "string",
+            "max": 4096,
+            "min": 1,
+            "sensitive": true
+        },
+        "DocumentationType": {
+            "type": "string",
+            "enum": ["README", "CHANGE_LOG"]
+        },
+        "Double": {
+            "type": "double",
+            "box": true
+        },
+        "Edit": {
+            "type": "structure",
+            "required": ["content"],
+            "members": {
+                "content": { "shape": "EditContentString" },
+                "references": { "shape": "References" }
+            }
+        },
+        "EditContentString": {
+            "type": "string",
+            "max": 5120,
+            "min": 1,
+            "sensitive": true
+        },
+        "EditorState": {
+            "type": "structure",
+            "members": {
+                "document": {
+                    "shape": "TextDocument",
+                    "documentation": "<p>Represents currently edited file</p>"
+                },
+                "cursorState": {
+                    "shape": "CursorState",
+                    "documentation": "<p>Position of the cursor</p>"
+                },
+                "relevantDocuments": {
+                    "shape": "RelevantDocumentList",
+                    "documentation": "<p>Represents IDE provided relevant files</p>"
+                },
+                "useRelevantDocuments": {
+                    "shape": "Boolean",
+                    "documentation": "<p>Whether service should use relevant document in prompt</p>"
+                },
+                "workspaceFolders": {
+                    "shape": "WorkspaceFolderList",
+                    "documentation": "<p>Represents IDE provided list of workspace folders</p>"
+                }
+            },
+            "documentation": "<p>Represents the state of an Editor</p>"
+        },
+        "EncodedVerificationUrl": {
+            "type": "string",
+            "max": 8192,
+            "min": 1
+        },
+        "EnvState": {
+            "type": "structure",
+            "members": {
+                "operatingSystem": {
+                    "shape": "EnvStateOperatingSystemString",
+                    "documentation": "<p>The name of the operating system in use</p>"
+                },
+                "currentWorkingDirectory": {
+                    "shape": "EnvStateCurrentWorkingDirectoryString",
+                    "documentation": "<p>The current working directory of the environment</p>"
+                },
+                "environmentVariables": {
+                    "shape": "EnvironmentVariables",
+                    "documentation": "<p>The environment variables set in the current environment</p>"
+                },
+                "timezoneOffset": {
+                    "shape": "EnvStateTimezoneOffsetInteger",
+                    "documentation": "<p>Local timezone offset of the client. For more information, see documentation https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getTimezoneOffset</p>"
+                }
+            },
+            "documentation": "<p>State related to the user's environment</p>"
+        },
+        "EnvStateCurrentWorkingDirectoryString": {
+            "type": "string",
+            "max": 256,
+            "min": 1,
+            "sensitive": true
+        },
+        "EnvStateOperatingSystemString": {
+            "type": "string",
+            "max": 32,
+            "min": 1,
+            "pattern": "(macos|linux|windows)"
+        },
+        "EnvStateTimezoneOffsetInteger": {
+            "type": "integer",
+            "box": true,
+            "max": 1440,
+            "min": -1440
+        },
+        "EnvironmentVariable": {
+            "type": "structure",
+            "members": {
+                "key": {
+                    "shape": "EnvironmentVariableKeyString",
+                    "documentation": "<p>The key of an environment variable</p>"
+                },
+                "value": {
+                    "shape": "EnvironmentVariableValueString",
+                    "documentation": "<p>The value of an environment variable</p>"
+                }
+            },
+            "documentation": "<p>An environment variable</p>"
+        },
+        "EnvironmentVariableKeyString": {
+            "type": "string",
+            "max": 256,
+            "min": 1,
+            "sensitive": true
+        },
+        "EnvironmentVariableValueString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1,
+            "sensitive": true
+        },
+        "EnvironmentVariables": {
+            "type": "list",
+            "member": { "shape": "EnvironmentVariable" },
+            "documentation": "<p>A list of environment variables</p>",
+            "max": 100,
+            "min": 0
+        },
+        "ErrorDetails": {
+            "type": "string",
+            "max": 2048,
+            "min": 0
+        },
+        "Event": {
+            "type": "structure",
+            "required": ["eventId", "generationId", "eventTimestamp", "eventType", "eventBlob"],
+            "members": {
+                "eventId": { "shape": "UUID" },
+                "generationId": { "shape": "UUID" },
+                "eventTimestamp": { "shape": "SyntheticTimestamp_date_time" },
+                "eventType": { "shape": "EventType" },
+                "eventBlob": { "shape": "EventBlob" }
+            }
+        },
+        "EventBlob": {
+            "type": "blob",
+            "max": 400000,
+            "min": 1,
+            "sensitive": true
+        },
+        "EventList": {
+            "type": "list",
+            "member": { "shape": "Event" },
+            "max": 10,
+            "min": 1
+        },
+        "EventType": {
+            "type": "string",
+            "max": 100,
+            "min": 1
+        },
+        "ExternalIdentityDetails": {
+            "type": "structure",
+            "members": {
+                "issuerUrl": { "shape": "IssuerUrl" },
+                "clientId": { "shape": "ClientId" },
+                "scimEndpoint": { "shape": "String" }
+            }
+        },
+        "FeatureDevCodeAcceptanceEvent": {
+            "type": "structure",
+            "required": ["conversationId", "linesOfCodeAccepted", "charactersOfCodeAccepted"],
+            "members": {
+                "conversationId": { "shape": "ConversationId" },
+                "linesOfCodeAccepted": { "shape": "FeatureDevCodeAcceptanceEventLinesOfCodeAcceptedInteger" },
+                "charactersOfCodeAccepted": { "shape": "FeatureDevCodeAcceptanceEventCharactersOfCodeAcceptedInteger" },
+                "programmingLanguage": { "shape": "ProgrammingLanguage" }
+            }
+        },
+        "FeatureDevCodeAcceptanceEventCharactersOfCodeAcceptedInteger": {
+            "type": "integer",
+            "min": 0
+        },
+        "FeatureDevCodeAcceptanceEventLinesOfCodeAcceptedInteger": {
+            "type": "integer",
+            "min": 0
+        },
+        "FeatureDevCodeGenerationEvent": {
+            "type": "structure",
+            "required": ["conversationId", "linesOfCodeGenerated", "charactersOfCodeGenerated"],
+            "members": {
+                "conversationId": { "shape": "ConversationId" },
+                "linesOfCodeGenerated": { "shape": "FeatureDevCodeGenerationEventLinesOfCodeGeneratedInteger" },
+                "charactersOfCodeGenerated": {
+                    "shape": "FeatureDevCodeGenerationEventCharactersOfCodeGeneratedInteger"
+                },
+                "programmingLanguage": { "shape": "ProgrammingLanguage" }
+            }
+        },
+        "FeatureDevCodeGenerationEventCharactersOfCodeGeneratedInteger": {
+            "type": "integer",
+            "min": 0
+        },
+        "FeatureDevCodeGenerationEventLinesOfCodeGeneratedInteger": {
+            "type": "integer",
+            "min": 0
+        },
+        "FeatureDevEvent": {
+            "type": "structure",
+            "required": ["conversationId"],
+            "members": {
+                "conversationId": { "shape": "ConversationId" }
+            }
+        },
+        "FeatureEvaluation": {
+            "type": "structure",
+            "required": ["feature", "variation", "value"],
+            "members": {
+                "feature": { "shape": "FeatureName" },
+                "variation": { "shape": "FeatureVariation" },
+                "value": { "shape": "FeatureValue" }
+            }
+        },
+        "FeatureEvaluationsList": {
+            "type": "list",
+            "member": { "shape": "FeatureEvaluation" },
+            "max": 50,
+            "min": 0
+        },
+        "FeatureName": {
+            "type": "string",
+            "max": 128,
+            "min": 1,
+            "pattern": "[-a-zA-Z0-9._]*"
+        },
+        "FeatureValue": {
+            "type": "structure",
+            "members": {
+                "boolValue": { "shape": "Boolean" },
+                "doubleValue": { "shape": "Double" },
+                "longValue": { "shape": "Long" },
+                "stringValue": { "shape": "FeatureValueStringType" }
+            },
+            "union": true
+        },
+        "FeatureValueStringType": {
+            "type": "string",
+            "max": 512,
+            "min": 0
+        },
+        "FeatureVariation": {
+            "type": "string",
+            "max": 128,
+            "min": 1,
+            "pattern": "[-a-zA-Z0-9._]*"
+        },
+        "FileContext": {
+            "type": "structure",
+            "required": ["leftFileContent", "rightFileContent", "filename", "programmingLanguage"],
+            "members": {
+                "leftFileContent": { "shape": "FileContextLeftFileContentString" },
+                "rightFileContent": { "shape": "FileContextRightFileContentString" },
+                "filename": { "shape": "FileContextFilenameString" },
+                "fileUri": { "shape": "FileContextFileUriString" },
+                "programmingLanguage": { "shape": "ProgrammingLanguage" }
+            }
+        },
+        "FileContextFileUriString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1,
+            "sensitive": true
+        },
+        "FileContextFilenameString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1,
+            "sensitive": true
+        },
+        "FileContextLeftFileContentString": {
+            "type": "string",
+            "max": 10240,
+            "min": 0,
+            "sensitive": true
+        },
+        "FileContextRightFileContentString": {
+            "type": "string",
+            "max": 10240,
+            "min": 0,
+            "sensitive": true
+        },
+        "FollowupPrompt": {
+            "type": "structure",
+            "required": ["content"],
+            "members": {
+                "content": {
+                    "shape": "FollowupPromptContentString",
+                    "documentation": "<p>The content of the text message in markdown format.</p>"
+                },
+                "userIntent": {
+                    "shape": "UserIntent",
+                    "documentation": "<p>User Intent</p>"
+                }
+            },
+            "documentation": "<p>Followup Prompt for the Assistant Response</p>"
+        },
+        "FollowupPromptContentString": {
+            "type": "string",
+            "max": 4096,
+            "min": 0,
+            "sensitive": true
+        },
+        "FunctionalityName": {
+            "type": "string",
+            "enum": [
+                "COMPLETIONS",
+                "ANALYSIS",
+                "CONVERSATIONS",
+                "TASK_ASSIST",
+                "TRANSFORMATIONS",
+                "CHAT_CUSTOMIZATION",
+                "TRANSFORMATIONS_WEBAPP",
+                "FEATURE_DEVELOPMENT"
+            ],
+            "max": 64,
+            "min": 1
+        },
+        "GenerateCompletionsRequest": {
+            "type": "structure",
+            "required": ["fileContext"],
+            "members": {
+                "fileContext": { "shape": "FileContext" },
+                "editorState": { "shape": "EditorState" },
+                "maxResults": { "shape": "GenerateCompletionsRequestMaxResultsInteger" },
+                "predictionTypes": { "shape": "PredictionTypes" },
+                "nextToken": { "shape": "GenerateCompletionsRequestNextTokenString" },
+                "referenceTrackerConfiguration": { "shape": "ReferenceTrackerConfiguration" },
+                "supplementalContexts": { "shape": "SupplementalContextList" },
+                "customizationArn": { "shape": "CustomizationArn" },
+                "optOutPreference": { "shape": "OptOutPreference" },
+                "userContext": { "shape": "UserContext" },
+                "profileArn": { "shape": "ProfileArn" },
+                "workspaceId": { "shape": "UUID" },
+                "modelId": { "shape": "ModelId" }
+            }
+        },
+        "GenerateCompletionsRequestMaxResultsInteger": {
+            "type": "integer",
+            "box": true,
+            "max": 10,
+            "min": 1
+        },
+        "GenerateCompletionsRequestNextTokenString": {
+            "type": "string",
+            "max": 2048,
+            "min": 0,
+            "pattern": "(?:[A-Za-z0-9\\+/]{4})*(?:[A-Za-z0-9\\+/]{2}\\=\\=|[A-Za-z0-9\\+/]{3}\\=)?",
+            "sensitive": true
+        },
+        "GenerateCompletionsResponse": {
+            "type": "structure",
+            "members": {
+                "predictions": { "shape": "Predictions" },
+                "completions": { "shape": "Completions" },
+                "nextToken": { "shape": "SensitiveString" },
+                "modelId": { "shape": "ModelId" }
+            }
+        },
+        "GetCodeAnalysisRequest": {
+            "type": "structure",
+            "required": ["jobId"],
+            "members": {
+                "jobId": { "shape": "GetCodeAnalysisRequestJobIdString" },
+                "profileArn": { "shape": "ProfileArn" }
+            }
+        },
+        "GetCodeAnalysisRequestJobIdString": {
+            "type": "string",
+            "max": 256,
+            "min": 1
+        },
+        "GetCodeAnalysisResponse": {
+            "type": "structure",
+            "required": ["status"],
+            "members": {
+                "status": { "shape": "CodeAnalysisStatus" },
+                "errorMessage": { "shape": "SensitiveString" }
+            }
+        },
+        "GetCodeFixJobRequest": {
+            "type": "structure",
+            "required": ["jobId"],
+            "members": {
+                "jobId": { "shape": "GetCodeFixJobRequestJobIdString" },
+                "profileArn": { "shape": "ProfileArn" }
+            }
+        },
+        "GetCodeFixJobRequestJobIdString": {
+            "type": "string",
+            "max": 256,
+            "min": 1,
+            "pattern": ".*[A-Za-z0-9-:]+.*"
+        },
+        "GetCodeFixJobResponse": {
+            "type": "structure",
+            "members": {
+                "jobStatus": { "shape": "CodeFixJobStatus" },
+                "suggestedFix": { "shape": "SuggestedFix" }
+            }
+        },
+        "GetTaskAssistCodeGenerationRequest": {
+            "type": "structure",
+            "required": ["conversationId", "codeGenerationId"],
+            "members": {
+                "conversationId": { "shape": "ConversationId" },
+                "codeGenerationId": { "shape": "CodeGenerationId" },
+                "profileArn": { "shape": "ProfileArn" }
+            },
+            "documentation": "<p>Request for getting task assist code generation.</p>"
+        },
+        "GetTaskAssistCodeGenerationResponse": {
+            "type": "structure",
+            "required": ["conversationId", "codeGenerationStatus"],
+            "members": {
+                "conversationId": { "shape": "ConversationId" },
+                "codeGenerationStatus": { "shape": "CodeGenerationStatus" },
+                "codeGenerationStatusDetail": { "shape": "CodeGenerationStatusDetail" },
+                "codeGenerationRemainingIterationCount": { "shape": "Integer" },
+                "codeGenerationTotalIterationCount": { "shape": "Integer" }
+            },
+            "documentation": "<p>Response for getting task assist code generation status.</p>"
+        },
+        "GetTestGenerationRequest": {
+            "type": "structure",
+            "required": ["testGenerationJobGroupName", "testGenerationJobId"],
+            "members": {
+                "testGenerationJobGroupName": { "shape": "TestGenerationJobGroupName" },
+                "testGenerationJobId": { "shape": "UUID" },
+                "profileArn": { "shape": "ProfileArn" }
+            },
+            "documentation": "<p>Structure to represent get test generation request.</p>"
+        },
+        "GetTestGenerationResponse": {
+            "type": "structure",
+            "members": {
+                "testGenerationJob": { "shape": "TestGenerationJob" }
+            },
+            "documentation": "<p>Structure to represent get test generation response.</p>"
+        },
+        "GetTransformationPlanRequest": {
+            "type": "structure",
+            "required": ["transformationJobId"],
+            "members": {
+                "transformationJobId": { "shape": "TransformationJobId" },
+                "profileArn": { "shape": "ProfileArn" }
+            },
+            "documentation": "<p>Structure to represent get code transformation plan request.</p>"
+        },
+        "GetTransformationPlanResponse": {
+            "type": "structure",
+            "required": ["transformationPlan"],
+            "members": {
+                "transformationPlan": { "shape": "TransformationPlan" }
+            },
+            "documentation": "<p>Structure to represent get code transformation plan response.</p>"
+        },
+        "GetTransformationRequest": {
+            "type": "structure",
+            "required": ["transformationJobId"],
+            "members": {
+                "transformationJobId": { "shape": "TransformationJobId" },
+                "profileArn": { "shape": "ProfileArn" }
+            },
+            "documentation": "<p>Structure to represent get code transformation request.</p>"
+        },
+        "GetTransformationResponse": {
+            "type": "structure",
+            "required": ["transformationJob"],
+            "members": {
+                "transformationJob": { "shape": "TransformationJob" }
+            },
+            "documentation": "<p>Structure to represent get code transformation response.</p>"
+        },
+        "GetUsageLimitsRequest": {
+            "type": "structure",
+            "members": {
+                "profileArn": {
+                    "shape": "ProfileArn",
+                    "documentation": "<p>The ARN of the Q Developer profile. Required for enterprise customers, optional for Builder ID users.</p>"
+                }
+            }
+        },
+        "GetUsageLimitsResponse": {
+            "type": "structure",
+            "required": ["limits", "daysUntilReset"],
+            "members": {
+                "limits": { "shape": "UsageLimits" },
+                "daysUntilReset": {
+                    "shape": "Integer",
+                    "documentation": "<p>Number of days remaining until the usage metrics reset</p>"
+                }
+            }
+        },
+        "GitState": {
+            "type": "structure",
+            "members": {
+                "status": {
+                    "shape": "GitStateStatusString",
+                    "documentation": "<p>The output of the command <code>git status --porcelain=v1 -b</code></p>"
+                }
+            },
+            "documentation": "<p>State related to the Git VSC</p>"
+        },
+        "GitStateStatusString": {
+            "type": "string",
+            "max": 4096,
+            "min": 0,
+            "sensitive": true
+        },
+        "IdeCategory": {
+            "type": "string",
+            "enum": ["JETBRAINS", "VSCODE", "CLI", "JUPYTER_MD", "JUPYTER_SM", "ECLIPSE", "VISUAL_STUDIO"],
+            "max": 64,
+            "min": 1
+        },
+        "IdeDiagnostic": {
+            "type": "structure",
+            "required": ["ideDiagnosticType"],
+            "members": {
+                "range": {
+                    "shape": "Range",
+                    "documentation": "<p>The range at which the message applies.</p>"
+                },
+                "source": {
+                    "shape": "IdeDiagnosticSourceString",
+                    "documentation": "<p>A human-readable string describing the source of the diagnostic</p>"
+                },
+                "severity": {
+                    "shape": "DiagnosticSeverity",
+                    "documentation": "<p>Diagnostic Error type</p>"
+                },
+                "ideDiagnosticType": {
+                    "shape": "IdeDiagnosticType",
+                    "documentation": "<p>Type of the diagnostic</p>"
+                }
+            },
+            "documentation": "<p>Structure to represent metadata about a Diagnostic from user local IDE</p>"
+        },
+        "IdeDiagnosticList": {
+            "type": "list",
+            "member": { "shape": "IdeDiagnostic" },
+            "documentation": "<p>List of IDE Diagnostics</p>",
+            "max": 1024,
+            "min": 0
+        },
+        "IdeDiagnosticSourceString": {
+            "type": "string",
+            "max": 1024,
+            "min": 0,
+            "sensitive": true
+        },
+        "IdeDiagnosticType": {
+            "type": "string",
+            "enum": ["SYNTAX_ERROR", "TYPE_ERROR", "REFERENCE_ERROR", "BEST_PRACTICE", "SECURITY", "OTHER"]
+        },
+        "IdempotencyToken": {
+            "type": "string",
+            "max": 256,
+            "min": 1
+        },
+        "IdentityDetails": {
+            "type": "structure",
+            "members": {
+                "ssoIdentityDetails": { "shape": "SSOIdentityDetails" },
+                "externalIdentityDetails": { "shape": "ExternalIdentityDetails" }
+            },
+            "union": true
+        },
+        "ImageBlock": {
+            "type": "structure",
+            "required": ["format", "source"],
+            "members": {
+                "format": { "shape": "ImageFormat" },
+                "source": { "shape": "ImageSource" }
+            },
+            "documentation": "<p>Represents the image source itself and the format of the image.</p>"
+        },
+        "ImageBlocks": {
+            "type": "list",
+            "member": { "shape": "ImageBlock" },
+            "max": 10,
+            "min": 0
+        },
+        "ImageFormat": {
+            "type": "string",
+            "enum": ["png", "jpeg", "gif", "webp"]
+        },
+        "ImageSource": {
+            "type": "structure",
+            "members": {
+                "bytes": { "shape": "ImageSourceBytesBlob" }
+            },
+            "documentation": "<p>Image bytes</p>",
+            "sensitive": true,
+            "union": true
+        },
+        "ImageSourceBytesBlob": {
+            "type": "blob",
+            "max": 10000000,
+            "min": 1
+        },
+        "Import": {
+            "type": "structure",
+            "members": {
+                "statement": { "shape": "ImportStatementString" }
+            }
+        },
+        "ImportStatementString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1,
+            "sensitive": true
+        },
+        "Imports": {
+            "type": "list",
+            "member": { "shape": "Import" },
+            "max": 10,
+            "min": 0
+        },
+        "InlineChatEvent": {
+            "type": "structure",
+            "required": ["requestId", "timestamp"],
+            "members": {
+                "requestId": { "shape": "UUID" },
+                "timestamp": { "shape": "Timestamp" },
+                "inputLength": { "shape": "PrimitiveInteger" },
+                "numSelectedLines": { "shape": "PrimitiveInteger" },
+                "numSuggestionAddChars": { "shape": "PrimitiveInteger" },
+                "numSuggestionAddLines": { "shape": "PrimitiveInteger" },
+                "numSuggestionDelChars": { "shape": "PrimitiveInteger" },
+                "numSuggestionDelLines": { "shape": "PrimitiveInteger" },
+                "codeIntent": { "shape": "Boolean" },
+                "userDecision": { "shape": "InlineChatUserDecision" },
+                "responseStartLatency": { "shape": "Double" },
+                "responseEndLatency": { "shape": "Double" },
+                "programmingLanguage": { "shape": "ProgrammingLanguage" }
+            }
+        },
+        "InlineChatUserDecision": {
+            "type": "string",
+            "enum": ["ACCEPT", "REJECT", "DISMISS"]
+        },
+        "InputType": {
+            "type": "string",
+            "documentation": "<p>Types of input that can be processed by the model</p>",
+            "enum": ["IMAGE", "TEXT"]
+        },
+        "Integer": {
+            "type": "integer",
+            "box": true
+        },
+        "Intent": {
+            "type": "string",
+            "enum": ["DEV", "DOC"]
+        },
+        "IntentContext": {
+            "type": "structure",
+            "members": {
+                "documentation": { "shape": "DocumentationIntentContext" }
+            },
+            "union": true
+        },
+        "InternalServerException": {
+            "type": "structure",
+            "required": ["message"],
+            "members": {
+                "message": { "shape": "String" },
+                "reason": { "shape": "InternalServerExceptionReason" }
+            },
+            "documentation": "<p>This exception is thrown when an unexpected error occurred during the processing of a request.</p>",
+            "exception": true,
+            "fault": true,
+            "retryable": { "throttling": false }
+        },
+        "InternalServerExceptionReason": {
+            "type": "string",
+            "documentation": "<p>Reason for InternalServerException</p>",
+            "enum": ["MODEL_TEMPORARILY_UNAVAILABLE"]
+        },
+        "IssuerUrl": {
+            "type": "string",
+            "max": 255,
+            "min": 1
+        },
+        "LineRangeList": {
+            "type": "list",
+            "member": { "shape": "Range" }
+        },
+        "ListAvailableCustomizationsRequest": {
+            "type": "structure",
+            "members": {
+                "maxResults": { "shape": "ListAvailableCustomizationsRequestMaxResultsInteger" },
+                "nextToken": { "shape": "Base64EncodedPaginationToken" },
+                "profileArn": { "shape": "ProfileArn" }
+            }
+        },
+        "ListAvailableCustomizationsRequestMaxResultsInteger": {
+            "type": "integer",
+            "box": true,
+            "max": 100,
+            "min": 1
+        },
+        "ListAvailableCustomizationsResponse": {
+            "type": "structure",
+            "required": ["customizations"],
+            "members": {
+                "customizations": { "shape": "Customizations" },
+                "nextToken": { "shape": "Base64EncodedPaginationToken" }
+            }
+        },
+        "ListAvailableModelsRequest": {
+            "type": "structure",
+            "required": ["origin"],
+            "members": {
+                "origin": {
+                    "shape": "Origin",
+                    "documentation": "<p>The origin context for which to list available models</p>"
+                },
+                "maxResults": {
+                    "shape": "ListAvailableModelsRequestMaxResultsInteger",
+                    "documentation": "<p>Maximum number of models to return in a single response</p>"
+                },
+                "nextToken": {
+                    "shape": "Base64EncodedPaginationToken",
+                    "documentation": "<p>Token for retrieving the next page of results</p>"
+                },
+                "profileArn": {
+                    "shape": "ProfileArn",
+                    "documentation": "<p>ARN of the profile to use for model filtering</p>"
+                },
+                "modelProvider": {
+                    "shape": "ModelProvider",
+                    "documentation": "<p>Provider of AI models</p>"
+                }
+            }
+        },
+        "ListAvailableModelsRequestMaxResultsInteger": {
+            "type": "integer",
+            "box": true,
+            "max": 100,
+            "min": 1
+        },
+        "ListAvailableModelsResponse": {
+            "type": "structure",
+            "required": ["models"],
+            "members": {
+                "models": {
+                    "shape": "Models",
+                    "documentation": "<p>List of available models</p>"
+                },
+                "nextToken": {
+                    "shape": "Base64EncodedPaginationToken",
+                    "documentation": "<p>Token for retrieving the next page of results</p>"
+                }
+            }
+        },
+        "ListAvailableProfilesRequest": {
+            "type": "structure",
+            "members": {
+                "maxResults": { "shape": "ListAvailableProfilesRequestMaxResultsInteger" },
+                "nextToken": { "shape": "Base64EncodedPaginationToken" }
+            }
+        },
+        "ListAvailableProfilesRequestMaxResultsInteger": {
+            "type": "integer",
+            "box": true,
+            "max": 10,
+            "min": 1
+        },
+        "ListAvailableProfilesResponse": {
+            "type": "structure",
+            "required": ["profiles"],
+            "members": {
+                "profiles": { "shape": "ProfileList" },
+                "nextToken": { "shape": "Base64EncodedPaginationToken" }
+            }
+        },
+        "ListCodeAnalysisFindingsRequest": {
+            "type": "structure",
+            "required": ["jobId", "codeAnalysisFindingsSchema"],
+            "members": {
+                "jobId": { "shape": "ListCodeAnalysisFindingsRequestJobIdString" },
+                "nextToken": { "shape": "PaginationToken" },
+                "codeAnalysisFindingsSchema": { "shape": "CodeAnalysisFindingsSchema" },
+                "profileArn": { "shape": "ProfileArn" }
+            }
+        },
+        "ListCodeAnalysisFindingsRequestJobIdString": {
+            "type": "string",
+            "max": 256,
+            "min": 1
+        },
+        "ListCodeAnalysisFindingsResponse": {
+            "type": "structure",
+            "required": ["codeAnalysisFindings"],
+            "members": {
+                "nextToken": { "shape": "PaginationToken" },
+                "codeAnalysisFindings": { "shape": "SensitiveString" }
+            }
+        },
+        "ListEventsRequest": {
+            "type": "structure",
+            "required": ["conversationId"],
+            "members": {
+                "conversationId": { "shape": "UUID" },
+                "maxResults": { "shape": "ListEventsRequestMaxResultsInteger" },
+                "nextToken": { "shape": "NextToken" }
+            }
+        },
+        "ListEventsRequestMaxResultsInteger": {
+            "type": "integer",
+            "box": true,
+            "max": 50,
+            "min": 1
+        },
+        "ListEventsResponse": {
+            "type": "structure",
+            "required": ["conversationId", "events"],
+            "members": {
+                "conversationId": { "shape": "UUID" },
+                "events": { "shape": "EventList" },
+                "nextToken": { "shape": "NextToken" }
+            }
+        },
+        "ListFeatureEvaluationsRequest": {
+            "type": "structure",
+            "required": ["userContext"],
+            "members": {
+                "userContext": { "shape": "UserContext" },
+                "profileArn": { "shape": "ProfileArn" }
+            }
+        },
+        "ListFeatureEvaluationsResponse": {
+            "type": "structure",
+            "required": ["featureEvaluations"],
+            "members": {
+                "featureEvaluations": { "shape": "FeatureEvaluationsList" }
+            }
+        },
+        "ListUserMemoryEntriesInput": {
+            "type": "structure",
+            "members": {
+                "maxResults": { "shape": "ListUserMemoryEntriesInputMaxResultsInteger" },
+                "profileArn": {
+                    "shape": "ListUserMemoryEntriesInputProfileArnString",
+                    "documentation": "<p>ProfileArn for the managing Q Profile</p>"
+                },
+                "nextToken": { "shape": "ListUserMemoryEntriesInputNextTokenString" }
+            }
+        },
+        "ListUserMemoryEntriesInputMaxResultsInteger": {
+            "type": "integer",
+            "box": true,
+            "max": 100,
+            "min": 1
+        },
+        "ListUserMemoryEntriesInputNextTokenString": {
+            "type": "string",
+            "min": 1,
+            "pattern": "[A-Za-z0-9_-]+"
+        },
+        "ListUserMemoryEntriesInputProfileArnString": {
+            "type": "string",
+            "min": 1,
+            "pattern": "arn:aws:(codewhisperer|transform):[-.a-z0-9]{1,63}:\\d{12}:profile/([a-zA-Z0-9]){12}"
+        },
+        "ListUserMemoryEntriesOutput": {
+            "type": "structure",
+            "required": ["memoryEntries"],
+            "members": {
+                "memoryEntries": { "shape": "MemoryEntryList" },
+                "nextToken": { "shape": "ListUserMemoryEntriesOutputNextTokenString" }
+            }
+        },
+        "ListUserMemoryEntriesOutputNextTokenString": {
+            "type": "string",
+            "min": 1,
+            "pattern": "[A-Za-z0-9_-]+"
+        },
+        "ListWorkspaceMetadataRequest": {
+            "type": "structure",
+            "members": {
+                "workspaceRoot": { "shape": "ListWorkspaceMetadataRequestWorkspaceRootString" },
+                "nextToken": { "shape": "String" },
+                "maxResults": { "shape": "Integer" },
+                "profileArn": { "shape": "ProfileArn" }
+            }
+        },
+        "ListWorkspaceMetadataRequestWorkspaceRootString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1,
+            "sensitive": true
+        },
+        "ListWorkspaceMetadataResponse": {
+            "type": "structure",
+            "required": ["workspaces"],
+            "members": {
+                "workspaces": { "shape": "WorkspaceList" },
+                "nextToken": { "shape": "String" }
+            }
+        },
+        "Long": {
+            "type": "long",
+            "box": true
+        },
+        "MemoryEntry": {
+            "type": "structure",
+            "required": ["id", "memoryEntryString", "metadata"],
+            "members": {
+                "id": {
+                    "shape": "MemoryEntryIdString",
+                    "documentation": "<p>A unique identifier for a single memory entry</p>"
+                },
+                "memoryEntryString": { "shape": "MemoryEntryMemoryEntryStringString" },
+                "metadata": { "shape": "MemoryEntryMetadata" }
+            },
+            "documentation": "<p>MemoryEntry corresponds to a single user memory</p>"
+        },
+        "MemoryEntryIdString": {
+            "type": "string",
+            "max": 36,
+            "min": 36,
+            "pattern": "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}"
+        },
+        "MemoryEntryList": {
+            "type": "list",
+            "member": { "shape": "MemoryEntry" },
+            "documentation": "<p>List of user memories</p>"
+        },
+        "MemoryEntryMemoryEntryStringString": {
+            "type": "string",
+            "max": 500,
+            "min": 1,
+            "sensitive": true
+        },
+        "MemoryEntryMetadata": {
+            "type": "structure",
+            "required": ["origin", "createdAt", "updatedAt"],
+            "members": {
+                "origin": { "shape": "Origin" },
+                "attributes": { "shape": "AttributesMap" },
+                "createdAt": { "shape": "Timestamp" },
+                "updatedAt": { "shape": "Timestamp" },
+                "memoryStatus": { "shape": "MemoryStatus" }
+            },
+            "documentation": "<p>Metadata for a single memory entry</p>"
+        },
+        "MemoryStatus": {
+            "type": "string",
+            "documentation": "<p>Status of user memory</p>",
+            "enum": ["DECRYPTION_FAILURE", "VALID"]
+        },
+        "MessageId": {
+            "type": "string",
+            "documentation": "<p>Unique identifier for the chat message</p>",
+            "max": 128,
+            "min": 0
+        },
+        "MetricData": {
+            "type": "structure",
+            "required": ["metricName", "metricValue", "timestamp", "product"],
+            "members": {
+                "metricName": { "shape": "MetricDataMetricNameString" },
+                "metricValue": { "shape": "Double" },
+                "timestamp": { "shape": "Timestamp" },
+                "product": { "shape": "MetricDataProductString" },
+                "dimensions": { "shape": "DimensionList" }
+            }
+        },
+        "MetricDataMetricNameString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1,
+            "pattern": "[-a-zA-Z0-9._]*"
+        },
+        "MetricDataProductString": {
+            "type": "string",
+            "max": 128,
+            "min": 1,
+            "pattern": "[-a-zA-Z0-9._]*"
+        },
+        "Model": {
+            "type": "structure",
+            "required": ["modelId"],
+            "members": {
+                "modelId": {
+                    "shape": "ModelId",
+                    "documentation": "<p>Unique identifier for the model</p>"
+                },
+                "modelName": {
+                    "shape": "ModelName",
+                    "documentation": "<p>User-facing display name</p>"
+                },
+                "description": {
+                    "shape": "ModelDescription",
+                    "documentation": "<p>Description of the model</p>"
+                },
+                "rateMultiplier": {
+                    "shape": "ModelRateMultiplierDouble",
+                    "documentation": "<p>Rate multiplier of the model</p>"
+                },
+                "rateUnit": {
+                    "shape": "ModelRateUnitString",
+                    "documentation": "<p>Unit for the rate multiplier</p>"
+                },
+                "tokenLimits": {
+                    "shape": "TokenLimits",
+                    "documentation": "<p>Limits on token usage for this model</p>"
+                },
+                "supportedInputTypes": {
+                    "shape": "SupportedInputTypesList",
+                    "documentation": "<p>List of input types supported by this model</p>"
+                },
+                "supportsPromptCache": {
+                    "shape": "Boolean",
+                    "documentation": "<p>Whether the model supports prompt caching</p>"
+                }
+            }
+        },
+        "ModelDescription": {
+            "type": "string",
+            "max": 256,
+            "min": 0,
+            "pattern": "[\\sa-zA-Z0-9_.-]*"
+        },
+        "ModelId": {
+            "type": "string",
+            "documentation": "<p>Unique identifier for the model</p>",
+            "max": 1024,
+            "min": 1,
+            "pattern": "[a-zA-Z0-9_:.-]+"
+        },
+        "ModelName": {
+            "type": "string",
+            "documentation": "<p>Identifier for the model Name</p>",
+            "max": 1024,
+            "min": 1,
+            "pattern": "[a-zA-Z0-9-_. ]+"
+        },
+        "ModelProvider": {
+            "type": "string",
+            "documentation": "<p>Provider of AI models</p>",
+            "enum": ["DEFAULT"]
+        },
+        "ModelRateMultiplierDouble": {
+            "type": "double",
+            "box": true,
+            "max": 100.0,
+            "min": 0
+        },
+        "ModelRateUnitString": {
+            "type": "string",
+            "max": 100,
+            "min": 0
+        },
+        "Models": {
+            "type": "list",
+            "member": { "shape": "Model" }
+        },
+        "NextToken": {
+            "type": "string",
+            "max": 1000,
+            "min": 0
+        },
+        "Notifications": {
+            "type": "list",
+            "member": { "shape": "NotificationsFeature" },
+            "max": 10,
+            "min": 0
+        },
+        "NotificationsFeature": {
+            "type": "structure",
+            "required": ["feature", "toggle"],
+            "members": {
+                "feature": { "shape": "FeatureName" },
+                "toggle": { "shape": "OptInFeatureToggle" }
+            }
+        },
+        "OperatingSystem": {
+            "type": "string",
+            "enum": ["MAC", "WINDOWS", "LINUX"],
+            "max": 64,
+            "min": 1
+        },
+        "OptInFeatureToggle": {
+            "type": "string",
+            "enum": ["ON", "OFF"]
+        },
+        "OptInFeatures": {
+            "type": "structure",
+            "members": {
+                "promptLogging": { "shape": "PromptLogging" },
+                "byUserAnalytics": { "shape": "ByUserAnalytics" },
+                "dashboardAnalytics": { "shape": "DashboardAnalytics" },
+                "notifications": { "shape": "Notifications" },
+                "workspaceContext": { "shape": "WorkspaceContext" }
+            }
+        },
+        "OptOutPreference": {
+            "type": "string",
+            "enum": ["OPTIN", "OPTOUT"]
+        },
+        "Origin": {
+            "type": "string",
+            "documentation": "<p>Enum to represent the origin application conversing with Sidekick.</p>",
+            "enum": [
+                "CHATBOT",
+                "CONSOLE",
+                "DOCUMENTATION",
+                "MARKETING",
+                "MOBILE",
+                "SERVICE_INTERNAL",
+                "UNIFIED_SEARCH",
+                "UNKNOWN",
+                "MD",
+                "IDE",
+                "SAGE_MAKER",
+                "CLI",
+                "AI_EDITOR",
+                "OPENSEARCH_DASHBOARD",
+                "GITLAB",
+                "Q_DEV_BEXT",
+                "MD_IDE",
+                "MD_CE",
+                "SM_AI_STUDIO_IDE",
+                "INLINE_CHAT"
+            ]
+        },
+        "PackageInfo": {
+            "type": "structure",
+            "members": {
+                "executionCommand": { "shape": "SensitiveString" },
+                "buildCommand": { "shape": "SensitiveString" },
+                "buildOrder": { "shape": "PackageInfoBuildOrderInteger" },
+                "testFramework": { "shape": "String" },
+                "packageSummary": { "shape": "PackageInfoPackageSummaryString" },
+                "packagePlan": { "shape": "PackageInfoPackagePlanString" },
+                "targetFileInfoList": { "shape": "TargetFileInfoList" }
+            }
+        },
+        "PackageInfoBuildOrderInteger": {
+            "type": "integer",
+            "box": true,
+            "min": 0
+        },
+        "PackageInfoList": {
+            "type": "list",
+            "member": { "shape": "PackageInfo" }
+        },
+        "PackageInfoPackagePlanString": {
+            "type": "string",
+            "max": 30720,
+            "min": 0,
+            "sensitive": true
+        },
+        "PackageInfoPackageSummaryString": {
+            "type": "string",
+            "max": 30720,
+            "min": 0,
+            "sensitive": true
+        },
+        "PaginationToken": {
+            "type": "string",
+            "max": 2048,
+            "min": 1,
+            "pattern": "\\S+"
+        },
+        "Position": {
+            "type": "structure",
+            "required": ["line", "character"],
+            "members": {
+                "line": {
+                    "shape": "Integer",
+                    "documentation": "<p>Line position in a document.</p>"
+                },
+                "character": {
+                    "shape": "Integer",
+                    "documentation": "<p>Character offset on a line in a document (zero-based)</p>"
+                }
+            },
+            "documentation": "<p>Indicates Cursor postion in a Text Document</p>"
+        },
+        "PreSignedUrl": {
+            "type": "string",
+            "max": 2048,
+            "min": 1,
+            "sensitive": true
+        },
+        "Prediction": {
+            "type": "structure",
+            "members": {
+                "completion": { "shape": "Completion" },
+                "edit": { "shape": "Edit" }
+            },
+            "union": true
+        },
+        "PredictionType": {
+            "type": "string",
+            "enum": ["COMPLETIONS", "EDITS"]
+        },
+        "PredictionTypes": {
+            "type": "list",
+            "member": { "shape": "PredictionType" }
+        },
+        "Predictions": {
+            "type": "list",
+            "member": { "shape": "Prediction" },
+            "max": 10,
+            "min": 0
+        },
+        "PreviousEditorStateMetadata": {
+            "type": "structure",
+            "required": ["timeOffset"],
+            "members": {
+                "timeOffset": { "shape": "Integer" }
+            }
+        },
+        "PrimitiveInteger": { "type": "integer" },
+        "Profile": {
+            "type": "structure",
+            "required": ["arn", "profileName"],
+            "members": {
+                "arn": { "shape": "ProfileArn" },
+                "identityDetails": { "shape": "IdentityDetails" },
+                "profileName": { "shape": "ProfileName" },
+                "description": { "shape": "ProfileDescription" },
+                "referenceTrackerConfiguration": { "shape": "ReferenceTrackerConfiguration" },
+                "kmsKeyArn": { "shape": "ResourceArn" },
+                "activeFunctionalities": { "shape": "ActiveFunctionalityList" },
+                "status": { "shape": "ProfileStatus" },
+                "errorDetails": { "shape": "ErrorDetails" },
+                "resourcePolicy": { "shape": "ResourcePolicy" },
+                "profileType": { "shape": "ProfileType" },
+                "optInFeatures": { "shape": "OptInFeatures" },
+                "permissionUpdateRequired": { "shape": "Boolean" },
+                "applicationProperties": { "shape": "ApplicationPropertiesList" }
+            }
+        },
+        "ProfileArn": {
+            "type": "string",
+            "max": 950,
+            "min": 0,
+            "pattern": "arn:aws:(codewhisperer|transform):[-.a-z0-9]{1,63}:\\d{12}:profile/([a-zA-Z0-9]){12}"
+        },
+        "ProfileDescription": {
+            "type": "string",
+            "max": 256,
+            "min": 1,
+            "pattern": "[\\sa-zA-Z0-9_-]*"
+        },
+        "ProfileList": {
+            "type": "list",
+            "member": { "shape": "Profile" }
+        },
+        "ProfileName": {
+            "type": "string",
+            "max": 100,
+            "min": 1,
+            "pattern": "[a-zA-Z][a-zA-Z0-9_-]*"
+        },
+        "ProfileStatus": {
+            "type": "string",
+            "enum": ["ACTIVE", "CREATING", "CREATE_FAILED", "UPDATING", "UPDATE_FAILED", "DELETING", "DELETE_FAILED"]
+        },
+        "ProfileType": {
+            "type": "string",
+            "enum": ["Q_DEVELOPER", "CODEWHISPERER"]
+        },
+        "ProgrammingLanguage": {
+            "type": "structure",
+            "required": ["languageName"],
+            "members": {
+                "languageName": { "shape": "ProgrammingLanguageLanguageNameString" }
+            },
+            "documentation": "<p>Programming Languages supported by CodeWhisperer</p>"
+        },
+        "ProgrammingLanguageLanguageNameString": {
+            "type": "string",
+            "max": 128,
+            "min": 1,
+            "pattern": "(python|javascript|java|csharp|typescript|c|cpp|go|kotlin|php|ruby|rust|scala|shell|sql|json|yaml|vue|tf|tsx|jsx|plaintext|systemverilog|dart|lua|swift|hcl|powershell|r|abap)"
+        },
+        "ProgressUpdates": {
+            "type": "list",
+            "member": { "shape": "TransformationProgressUpdate" }
+        },
+        "PromptLogging": {
+            "type": "structure",
+            "required": ["s3Uri", "toggle"],
+            "members": {
+                "s3Uri": { "shape": "S3Uri" },
+                "toggle": { "shape": "OptInFeatureToggle" }
+            }
+        },
+        "PushTelemetryEventRequest": {
+            "type": "structure",
+            "required": ["eventType", "event"],
+            "members": {
+                "clientToken": {
+                    "shape": "IdempotencyToken",
+                    "idempotencyToken": true
+                },
+                "eventType": { "shape": "String" },
+                "event": { "shape": "Document" }
+            }
+        },
+        "PushTelemetryEventResponse": {
+            "type": "structure",
+            "members": {}
+        },
+        "Range": {
+            "type": "structure",
+            "required": ["start", "end"],
+            "members": {
+                "start": {
+                    "shape": "Position",
+                    "documentation": "<p>The range's start position.</p>"
+                },
+                "end": {
+                    "shape": "Position",
+                    "documentation": "<p>The range's end position.</p>"
+                }
+            },
+            "documentation": "<p>Indicates Range / Span in a Text Document</p>"
+        },
+        "ReasoningContent": {
+            "type": "structure",
+            "members": {
+                "reasoningText": { "shape": "ReasoningText" },
+                "redactedContent": {
+                    "shape": "Blob",
+                    "documentation": "<p>Reasoning content that was encrypted by the model provider</p>"
+                }
+            },
+            "documentation": "<p>The entire reasoning content that the model used to return the output</p>",
+            "sensitive": true,
+            "union": true
+        },
+        "ReasoningText": {
+            "type": "structure",
+            "required": ["text"],
+            "members": {
+                "text": { "shape": "SensitiveString" },
+                "signature": {
+                    "shape": "SensitiveString",
+                    "documentation": "<p>A token that verifies that the reasoning text was generated by the model</p>"
+                }
+            },
+            "sensitive": true
+        },
+        "RecommendationsWithReferencesPreference": {
+            "type": "string",
+            "documentation": "<p>Recommendations with references setting for CodeWhisperer</p>",
+            "enum": ["BLOCK", "ALLOW"]
+        },
+        "Reference": {
+            "type": "structure",
+            "members": {
+                "licenseName": {
+                    "shape": "ReferenceLicenseNameString",
+                    "documentation": "<p>License name</p>"
+                },
+                "repository": {
+                    "shape": "ReferenceRepositoryString",
+                    "documentation": "<p>Code Repsitory for the associated reference</p>"
+                },
+                "url": {
+                    "shape": "ReferenceUrlString",
+                    "documentation": "<p>Respository URL</p>"
+                },
+                "recommendationContentSpan": {
+                    "shape": "Span",
+                    "documentation": "<p>Span / Range for the Reference</p>"
+                }
+            },
+            "documentation": "<p>Code Reference / Repository details</p>"
+        },
+        "ReferenceLicenseNameString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1
+        },
+        "ReferenceRepositoryString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1
+        },
+        "ReferenceTrackerConfiguration": {
+            "type": "structure",
+            "required": ["recommendationsWithReferences"],
+            "members": {
+                "recommendationsWithReferences": { "shape": "RecommendationsWithReferencesPreference" }
+            }
+        },
+        "ReferenceUrlString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1
+        },
+        "References": {
+            "type": "list",
+            "member": { "shape": "Reference" },
+            "max": 10,
+            "min": 0
+        },
+        "RelevantDocumentList": {
+            "type": "list",
+            "member": { "shape": "RelevantTextDocument" },
+            "max": 100,
+            "min": 0
+        },
+        "RelevantTextDocument": {
+            "type": "structure",
+            "required": ["relativeFilePath"],
+            "members": {
+                "relativeFilePath": {
+                    "shape": "RelevantTextDocumentRelativeFilePathString",
+                    "documentation": "<p>Filepath relative to the root of the workspace</p>"
+                },
+                "programmingLanguage": {
+                    "shape": "ProgrammingLanguage",
+                    "documentation": "<p>The text document's language identifier.</p>"
+                },
+                "text": {
+                    "shape": "RelevantTextDocumentTextString",
+                    "documentation": "<p>Content of the text document</p>"
+                },
+                "documentSymbols": {
+                    "shape": "DocumentSymbols",
+                    "documentation": "<p>DocumentSymbols parsed from a text document</p>"
+                },
+                "type": {
+                    "shape": "ContentType",
+                    "documentation": "<p>The type of content(file, prompt, symbol, or workspace)</p>"
+                }
+            },
+            "documentation": "<p>Represents an IDE retrieved relevant Text Document / File</p>"
+        },
+        "RelevantTextDocumentRelativeFilePathString": {
+            "type": "string",
+            "max": 4096,
+            "min": 1,
+            "sensitive": true
+        },
+        "RelevantTextDocumentTextString": {
+            "type": "string",
+            "max": 40960,
+            "min": 0,
+            "sensitive": true
+        },
+        "RequestHeaderKey": {
+            "type": "string",
+            "max": 64,
+            "min": 1
+        },
+        "RequestHeaderValue": {
+            "type": "string",
+            "max": 256,
+            "min": 1
+        },
+        "RequestHeaders": {
+            "type": "map",
+            "key": { "shape": "RequestHeaderKey" },
+            "value": { "shape": "RequestHeaderValue" },
+            "max": 16,
+            "min": 1,
+            "sensitive": true
+        },
+        "ResourceArn": {
+            "type": "string",
+            "max": 1224,
+            "min": 0,
+            "pattern": "arn:([-.a-z0-9]{1,63}:){2}([-.a-z0-9]{0,63}:){2}([a-zA-Z0-9-_:/]){1,1023}"
+        },
+        "ResourceNotFoundException": {
+            "type": "structure",
+            "required": ["message"],
+            "members": {
+                "message": { "shape": "String" }
+            },
+            "documentation": "<p>This exception is thrown when describing a resource that does not exist.</p>",
+            "exception": true
+        },
+        "ResourcePolicy": {
+            "type": "structure",
+            "required": ["effect"],
+            "members": {
+                "effect": { "shape": "ResourcePolicyEffect" }
+            }
+        },
+        "ResourcePolicyEffect": {
+            "type": "string",
+            "enum": ["ALLOW", "DENY"]
+        },
+        "ResumeTransformationRequest": {
+            "type": "structure",
+            "required": ["transformationJobId"],
+            "members": {
+                "transformationJobId": { "shape": "TransformationJobId" },
+                "userActionStatus": { "shape": "TransformationUserActionStatus" },
+                "profileArn": { "shape": "ProfileArn" }
+            },
+            "documentation": "<p>Structure to represent stop code transformation request.</p>"
+        },
+        "ResumeTransformationResponse": {
+            "type": "structure",
+            "required": ["transformationStatus"],
+            "members": {
+                "transformationStatus": { "shape": "TransformationStatus" }
+            },
+            "documentation": "<p>Structure to represent stop code transformation response.</p>"
+        },
+        "RuntimeDiagnostic": {
+            "type": "structure",
+            "required": ["source", "severity", "message"],
+            "members": {
+                "source": {
+                    "shape": "RuntimeDiagnosticSourceString",
+                    "documentation": "<p>A human-readable string describing the source of the diagnostic</p>"
+                },
+                "severity": {
+                    "shape": "DiagnosticSeverity",
+                    "documentation": "<p>Diagnostic Error type</p>"
+                },
+                "message": {
+                    "shape": "RuntimeDiagnosticMessageString",
+                    "documentation": "<p>The diagnostic's message.</p>"
+                }
+            },
+            "documentation": "<p>Structure to represent metadata about a Runtime Diagnostics</p>"
+        },
+        "RuntimeDiagnosticMessageString": {
+            "type": "string",
+            "max": 1024,
+            "min": 0,
+            "sensitive": true
+        },
+        "RuntimeDiagnosticSourceString": {
+            "type": "string",
+            "max": 1024,
+            "min": 0,
+            "sensitive": true
+        },
+        "S3Uri": {
+            "type": "string",
+            "max": 1024,
+            "min": 1,
+            "pattern": "s3://((?!xn--)[a-z0-9](?![^/]*[.]{2})[a-z0-9-.]{1,61}[a-z0-9](?<!-s3alias)(?<!--ol-s3)(?<!([0-9]{1,3}\\.)([0-9]{1,3}\\.)([0-9]{1,3}\\.)([0-9]{1,3})))/(.{0,1024})"
+        },
+        "SSOIdentityDetails": {
+            "type": "structure",
+            "required": ["instanceArn", "oidcClientId"],
+            "members": {
+                "instanceArn": { "shape": "ResourceArn" },
+                "oidcClientId": { "shape": "String" },
+                "ssoRegion": { "shape": "SSORegion" }
+            }
+        },
+        "SSORegion": {
+            "type": "string",
+            "max": 63,
+            "min": 1,
+            "pattern": "[-a-z0-9]{1,63}"
+        },
+        "SendTelemetryEventRequest": {
+            "type": "structure",
+            "required": ["telemetryEvent"],
+            "members": {
+                "clientToken": {
+                    "shape": "IdempotencyToken",
+                    "idempotencyToken": true
+                },
+                "telemetryEvent": { "shape": "TelemetryEvent" },
+                "optOutPreference": { "shape": "OptOutPreference" },
+                "userContext": { "shape": "UserContext" },
+                "profileArn": { "shape": "ProfileArn" },
+                "modelId": { "shape": "ModelId" }
+            }
+        },
+        "SendTelemetryEventResponse": {
+            "type": "structure",
+            "members": {}
+        },
+        "SensitiveDocument": {
+            "type": "structure",
+            "members": {},
+            "document": true,
+            "sensitive": true
+        },
+        "SensitiveString": {
+            "type": "string",
+            "sensitive": true
+        },
+        "ServiceQuotaExceededException": {
+            "type": "structure",
+            "required": ["message"],
+            "members": {
+                "message": { "shape": "String" },
+                "reason": { "shape": "ServiceQuotaExceededExceptionReason" }
+            },
+            "documentation": "<p>This exception is thrown when request was denied due to caller exceeding their usage limits</p>",
+            "exception": true
+        },
+        "ServiceQuotaExceededExceptionReason": {
+            "type": "string",
+            "documentation": "<p>Reason for ServiceQuotaExceededException</p>",
+            "enum": ["CONVERSATION_LIMIT_EXCEEDED", "MONTHLY_REQUEST_COUNT", "OVERAGE_REQUEST_LIMIT_EXCEEDED"]
+        },
+        "ShellHistory": {
+            "type": "list",
+            "member": { "shape": "ShellHistoryEntry" },
+            "documentation": "<p>A list of shell history entries</p>",
+            "max": 20,
+            "min": 0
+        },
+        "ShellHistoryEntry": {
+            "type": "structure",
+            "required": ["command"],
+            "members": {
+                "command": {
+                    "shape": "ShellHistoryEntryCommandString",
+                    "documentation": "<p>The shell command that was run</p>"
+                },
+                "directory": {
+                    "shape": "ShellHistoryEntryDirectoryString",
+                    "documentation": "<p>The directory the command was ran in</p>"
+                },
+                "exitCode": {
+                    "shape": "Integer",
+                    "documentation": "<p>The exit code of the command after it finished</p>"
+                },
+                "stdout": {
+                    "shape": "ShellHistoryEntryStdoutString",
+                    "documentation": "<p>The stdout from the command</p>"
+                },
+                "stderr": {
+                    "shape": "ShellHistoryEntryStderrString",
+                    "documentation": "<p>The stderr from the command</p>"
+                }
+            },
+            "documentation": "<p>An single entry in the shell history</p>"
+        },
+        "ShellHistoryEntryCommandString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1,
+            "sensitive": true
+        },
+        "ShellHistoryEntryDirectoryString": {
+            "type": "string",
+            "max": 256,
+            "min": 1,
+            "sensitive": true
+        },
+        "ShellHistoryEntryStderrString": {
+            "type": "string",
+            "max": 4096,
+            "min": 0,
+            "sensitive": true
+        },
+        "ShellHistoryEntryStdoutString": {
+            "type": "string",
+            "max": 4096,
+            "min": 0,
+            "sensitive": true
+        },
+        "ShellState": {
+            "type": "structure",
+            "required": ["shellName"],
+            "members": {
+                "shellName": {
+                    "shape": "ShellStateShellNameString",
+                    "documentation": "<p>The name of the current shell</p>"
+                },
+                "shellHistory": {
+                    "shape": "ShellHistory",
+                    "documentation": "<p>The history previous shell commands for the current shell</p>"
+                }
+            },
+            "documentation": "<p>Represents the state of a shell</p>"
+        },
+        "ShellStateShellNameString": {
+            "type": "string",
+            "max": 32,
+            "min": 1,
+            "pattern": "(zsh|bash|fish|pwsh|nu)"
+        },
+        "Span": {
+            "type": "structure",
+            "members": {
+                "start": { "shape": "SpanStartInteger" },
+                "end": { "shape": "SpanEndInteger" }
+            },
+            "documentation": "<p>Represents span in a text.</p>"
+        },
+        "SpanEndInteger": {
+            "type": "integer",
+            "box": true,
+            "min": 0
+        },
+        "SpanStartInteger": {
+            "type": "integer",
+            "box": true,
+            "min": 0
+        },
+        "StartCodeAnalysisRequest": {
+            "type": "structure",
+            "required": ["artifacts", "programmingLanguage"],
+            "members": {
+                "artifacts": { "shape": "ArtifactMap" },
+                "programmingLanguage": { "shape": "ProgrammingLanguage" },
+                "clientToken": {
+                    "shape": "StartCodeAnalysisRequestClientTokenString",
+                    "idempotencyToken": true
+                },
+                "scope": { "shape": "CodeAnalysisScope" },
+                "codeScanName": { "shape": "CodeScanName" },
+                "profileArn": { "shape": "ProfileArn" }
+            }
+        },
+        "StartCodeAnalysisRequestClientTokenString": {
+            "type": "string",
+            "max": 256,
+            "min": 1
+        },
+        "StartCodeAnalysisResponse": {
+            "type": "structure",
+            "required": ["jobId", "status"],
+            "members": {
+                "jobId": { "shape": "StartCodeAnalysisResponseJobIdString" },
+                "status": { "shape": "CodeAnalysisStatus" },
+                "errorMessage": { "shape": "SensitiveString" }
+            }
+        },
+        "StartCodeAnalysisResponseJobIdString": {
+            "type": "string",
+            "max": 256,
+            "min": 1
+        },
+        "StartCodeFixJobRequest": {
+            "type": "structure",
+            "required": ["snippetRange", "uploadId"],
+            "members": {
+                "snippetRange": { "shape": "Range" },
+                "uploadId": { "shape": "UploadId" },
+                "description": { "shape": "StartCodeFixJobRequestDescriptionString" },
+                "ruleId": { "shape": "StartCodeFixJobRequestRuleIdString" },
+                "codeFixName": { "shape": "CodeFixName" },
+                "referenceTrackerConfiguration": { "shape": "ReferenceTrackerConfiguration" },
+                "profileArn": { "shape": "ProfileArn" }
+            }
+        },
+        "StartCodeFixJobRequestDescriptionString": {
+            "type": "string",
+            "max": 5000,
+            "min": 1,
+            "sensitive": true
+        },
+        "StartCodeFixJobRequestRuleIdString": {
+            "type": "string",
+            "max": 256,
+            "min": 1,
+            "pattern": ".*[A-Za-z0-9-]+.*"
+        },
+        "StartCodeFixJobResponse": {
+            "type": "structure",
+            "members": {
+                "jobId": { "shape": "StartCodeFixJobResponseJobIdString" },
+                "status": { "shape": "CodeFixJobStatus" }
+            }
+        },
+        "StartCodeFixJobResponseJobIdString": {
+            "type": "string",
+            "max": 256,
+            "min": 1,
+            "pattern": ".*[A-Za-z0-9-:]+.*"
+        },
+        "StartTaskAssistCodeGenerationRequest": {
+            "type": "structure",
+            "required": ["conversationState", "workspaceState"],
+            "members": {
+                "conversationState": { "shape": "ConversationState" },
+                "workspaceState": { "shape": "WorkspaceState" },
+                "taskAssistPlan": { "shape": "TaskAssistPlan" },
+                "codeGenerationId": { "shape": "CodeGenerationId" },
+                "currentCodeGenerationId": { "shape": "CodeGenerationId" },
+                "intent": { "shape": "Intent" },
+                "intentContext": { "shape": "IntentContext" },
+                "profileArn": { "shape": "ProfileArn" }
+            },
+            "documentation": "<p>Structure to represent start code generation request.</p>"
+        },
+        "StartTaskAssistCodeGenerationResponse": {
+            "type": "structure",
+            "required": ["conversationId", "codeGenerationId"],
+            "members": {
+                "conversationId": { "shape": "ConversationId" },
+                "codeGenerationId": { "shape": "CodeGenerationId" }
+            },
+            "documentation": "<p>Structure to represent start code generation response.</p>"
+        },
+        "StartTestGenerationRequest": {
+            "type": "structure",
+            "required": ["uploadId", "targetCodeList", "userInput"],
+            "members": {
+                "uploadId": { "shape": "UploadId" },
+                "targetCodeList": { "shape": "TargetCodeList" },
+                "userInput": {
+                    "shape": "StartTestGenerationRequestUserInputString",
+                    "documentation": "<p>The content of user input.</p>"
+                },
+                "testGenerationJobGroupName": { "shape": "TestGenerationJobGroupName" },
+                "clientToken": {
+                    "shape": "StartTestGenerationRequestClientTokenString",
+                    "idempotencyToken": true
+                },
+                "profileArn": { "shape": "ProfileArn" },
+                "referenceTrackerConfiguration": { "shape": "ReferenceTrackerConfiguration" }
+            },
+            "documentation": "<p>Structure to represent test generation request.</p>"
+        },
+        "StartTestGenerationRequestClientTokenString": {
+            "type": "string",
+            "max": 256,
+            "min": 1
+        },
+        "StartTestGenerationRequestUserInputString": {
+            "type": "string",
+            "max": 4096,
+            "min": 0,
+            "sensitive": true
+        },
+        "StartTestGenerationResponse": {
+            "type": "structure",
+            "members": {
+                "testGenerationJob": { "shape": "TestGenerationJob" }
+            },
+            "documentation": "<p>Structure to represent code transformation response.</p>"
+        },
+        "StartTransformationRequest": {
+            "type": "structure",
+            "required": ["workspaceState", "transformationSpec"],
+            "members": {
+                "workspaceState": { "shape": "WorkspaceState" },
+                "transformationSpec": { "shape": "TransformationSpec" },
+                "profileArn": { "shape": "ProfileArn" }
+            },
+            "documentation": "<p>Structure to represent code transformation request.</p>"
+        },
+        "StartTransformationResponse": {
+            "type": "structure",
+            "required": ["transformationJobId"],
+            "members": {
+                "transformationJobId": { "shape": "TransformationJobId" }
+            },
+            "documentation": "<p>Structure to represent code transformation response.</p>"
+        },
+        "StepId": {
+            "type": "string",
+            "max": 126,
+            "min": 1
+        },
+        "StopTransformationRequest": {
+            "type": "structure",
+            "required": ["transformationJobId"],
+            "members": {
+                "transformationJobId": { "shape": "TransformationJobId" },
+                "profileArn": { "shape": "ProfileArn" }
+            },
+            "documentation": "<p>Structure to represent stop code transformation request.</p>"
+        },
+        "StopTransformationResponse": {
+            "type": "structure",
+            "required": ["transformationStatus"],
+            "members": {
+                "transformationStatus": { "shape": "TransformationStatus" }
+            },
+            "documentation": "<p>Structure to represent stop code transformation response.</p>"
+        },
+        "String": { "type": "string" },
+        "StringList": {
+            "type": "list",
+            "member": { "shape": "StringListMemberString" },
+            "documentation": "<p>A list of strings</p>",
+            "max": 50,
+            "min": 0
+        },
+        "StringListMemberString": {
+            "type": "string",
+            "max": 256,
+            "min": 1,
+            "sensitive": true
+        },
+        "SubscriptionStatus": {
+            "type": "string",
+            "enum": ["INACTIVE", "ACTIVE"]
+        },
+        "SuggestedFix": {
+            "type": "structure",
+            "members": {
+                "codeDiff": { "shape": "SuggestedFixCodeDiffString" },
+                "description": { "shape": "SuggestedFixDescriptionString" },
+                "references": { "shape": "References" }
+            }
+        },
+        "SuggestedFixCodeDiffString": {
+            "type": "string",
+            "max": 200000,
+            "min": 0,
+            "sensitive": true
+        },
+        "SuggestedFixDescriptionString": {
+            "type": "string",
+            "max": 2000,
+            "min": 1,
+            "sensitive": true
+        },
+        "SuggestionState": {
+            "type": "string",
+            "enum": ["ACCEPT", "REJECT", "DISCARD", "EMPTY", "MERGE"]
+        },
+        "SuggestionType": {
+            "type": "string",
+            "enum": ["COMPLETIONS", "EDITS"]
+        },
+        "SupplementalContext": {
+            "type": "structure",
+            "required": ["filePath", "content"],
+            "members": {
+                "filePath": { "shape": "SupplementalContextFilePathString" },
+                "content": { "shape": "SupplementalContextContentString" },
+                "type": { "shape": "SupplementalContextType" },
+                "metadata": { "shape": "SupplementalContextMetadata" }
+            }
+        },
+        "SupplementalContextContentString": {
+            "type": "string",
+            "max": 10240,
+            "min": 1,
+            "sensitive": true
+        },
+        "SupplementalContextFilePathString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1,
+            "sensitive": true
+        },
+        "SupplementalContextList": {
+            "type": "list",
+            "member": { "shape": "SupplementalContext" },
+            "max": 20,
+            "min": 0
+        },
+        "SupplementalContextMetadata": {
+            "type": "structure",
+            "members": {
+                "previousEditorStateMetadata": { "shape": "PreviousEditorStateMetadata" }
+            },
+            "union": true
+        },
+        "SupplementalContextType": {
+            "type": "string",
+            "enum": ["PreviousEditorState", "WorkspaceContext"]
+        },
+        "SupplementaryWebLink": {
+            "type": "structure",
+            "required": ["url", "title"],
+            "members": {
+                "url": {
+                    "shape": "SupplementaryWebLinkUrlString",
+                    "documentation": "<p>URL of the web reference link.</p>"
+                },
+                "title": {
+                    "shape": "SupplementaryWebLinkTitleString",
+                    "documentation": "<p>Title of the web reference link.</p>"
+                },
+                "snippet": {
+                    "shape": "SupplementaryWebLinkSnippetString",
+                    "documentation": "<p>Relevant text snippet from the link.</p>"
+                }
+            },
+            "documentation": "<p>Represents an additional reference link retured with the Chat message</p>"
+        },
+        "SupplementaryWebLinkSnippetString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1,
+            "sensitive": true
+        },
+        "SupplementaryWebLinkTitleString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1,
+            "sensitive": true
+        },
+        "SupplementaryWebLinkUrlString": {
+            "type": "string",
+            "max": 2048,
+            "min": 1,
+            "sensitive": true
+        },
+        "SupplementaryWebLinks": {
+            "type": "list",
+            "member": { "shape": "SupplementaryWebLink" },
+            "max": 10,
+            "min": 0
+        },
+        "SupportedInputTypesList": {
+            "type": "list",
+            "member": { "shape": "InputType" },
+            "documentation": "<p>List of supported input types for the model</p>"
+        },
+        "SymbolType": {
+            "type": "string",
+            "enum": ["DECLARATION", "USAGE"]
+        },
+        "SyntheticTimestamp_date_time": {
+            "type": "timestamp",
+            "timestampFormat": "iso8601"
+        },
+        "TargetCode": {
+            "type": "structure",
+            "required": ["relativeTargetPath"],
+            "members": {
+                "relativeTargetPath": {
+                    "shape": "TargetCodeRelativeTargetPathString",
+                    "documentation": "<p>The file path relative to the root of the workspace, could be a single file or a folder.</p>"
+                },
+                "targetLineRangeList": { "shape": "LineRangeList" }
+            }
+        },
+        "TargetCodeList": {
+            "type": "list",
+            "member": { "shape": "TargetCode" },
+            "min": 1
+        },
+        "TargetCodeRelativeTargetPathString": {
+            "type": "string",
+            "max": 4096,
+            "min": 1,
+            "sensitive": true
+        },
+        "TargetFileInfo": {
+            "type": "structure",
+            "members": {
+                "filePath": { "shape": "SensitiveString" },
+                "testFilePath": { "shape": "SensitiveString" },
+                "testCoverage": { "shape": "TargetFileInfoTestCoverageInteger" },
+                "fileSummary": { "shape": "TargetFileInfoFileSummaryString" },
+                "filePlan": { "shape": "TargetFileInfoFilePlanString" },
+                "codeReferences": { "shape": "References" },
+                "numberOfTestMethods": { "shape": "TargetFileInfoNumberOfTestMethodsInteger" }
+            }
+        },
+        "TargetFileInfoFilePlanString": {
+            "type": "string",
+            "max": 30720,
+            "min": 0,
+            "sensitive": true
+        },
+        "TargetFileInfoFileSummaryString": {
+            "type": "string",
+            "max": 30720,
+            "min": 0,
+            "sensitive": true
+        },
+        "TargetFileInfoList": {
+            "type": "list",
+            "member": { "shape": "TargetFileInfo" }
+        },
+        "TargetFileInfoNumberOfTestMethodsInteger": {
+            "type": "integer",
+            "box": true,
+            "min": 0
+        },
+        "TargetFileInfoTestCoverageInteger": {
+            "type": "integer",
+            "box": true,
+            "max": 100,
+            "min": 0
+        },
+        "TaskAssistPlan": {
+            "type": "list",
+            "member": { "shape": "TaskAssistPlanStep" },
+            "min": 0
+        },
+        "TaskAssistPlanStep": {
+            "type": "structure",
+            "required": ["filePath", "description"],
+            "members": {
+                "filePath": {
+                    "shape": "TaskAssistPlanStepFilePathString",
+                    "documentation": "<p>File path on which the step is working on.</p>"
+                },
+                "description": {
+                    "shape": "TaskAssistPlanStepDescriptionString",
+                    "documentation": "<p>Description on the step.</p>"
+                },
+                "startLine": {
+                    "shape": "TaskAssistPlanStepStartLineInteger",
+                    "documentation": "<p>Start line number of the related changes.</p>"
+                },
+                "endLine": {
+                    "shape": "TaskAssistPlanStepEndLineInteger",
+                    "documentation": "<p>End line number of the related changes.</p>"
+                },
+                "action": {
+                    "shape": "TaskAssistPlanStepAction",
+                    "documentation": "<p>Type of the action.</p>"
+                }
+            },
+            "documentation": "<p>Structured plan step for a task assist plan.</p>"
+        },
+        "TaskAssistPlanStepAction": {
+            "type": "string",
+            "documentation": "<p>Action for task assist plan step</p>",
+            "enum": ["MODIFY", "CREATE", "DELETE", "UNKNOWN"]
+        },
+        "TaskAssistPlanStepDescriptionString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1
+        },
+        "TaskAssistPlanStepEndLineInteger": {
+            "type": "integer",
+            "box": true,
+            "min": 0
+        },
+        "TaskAssistPlanStepFilePathString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1
+        },
+        "TaskAssistPlanStepStartLineInteger": {
+            "type": "integer",
+            "box": true,
+            "min": 0
+        },
+        "TaskAssistPlanningUploadContext": {
+            "type": "structure",
+            "required": ["conversationId"],
+            "members": {
+                "conversationId": { "shape": "ConversationId" }
+            }
+        },
+        "TelemetryEvent": {
+            "type": "structure",
+            "members": {
+                "userTriggerDecisionEvent": { "shape": "UserTriggerDecisionEvent" },
+                "codeCoverageEvent": { "shape": "CodeCoverageEvent" },
+                "userModificationEvent": { "shape": "UserModificationEvent" },
+                "codeScanEvent": { "shape": "CodeScanEvent" },
+                "codeScanSucceededEvent": { "shape": "CodeScanSucceededEvent" },
+                "codeScanFailedEvent": { "shape": "CodeScanFailedEvent" },
+                "codeScanRemediationsEvent": { "shape": "CodeScanRemediationsEvent" },
+                "codeFixGenerationEvent": { "shape": "CodeFixGenerationEvent" },
+                "codeFixAcceptanceEvent": { "shape": "CodeFixAcceptanceEvent" },
+                "metricData": { "shape": "MetricData" },
+                "chatAddMessageEvent": { "shape": "ChatAddMessageEvent" },
+                "chatInteractWithMessageEvent": { "shape": "ChatInteractWithMessageEvent" },
+                "chatUserModificationEvent": { "shape": "ChatUserModificationEvent" },
+                "terminalUserInteractionEvent": { "shape": "TerminalUserInteractionEvent" },
+                "featureDevEvent": { "shape": "FeatureDevEvent" },
+                "featureDevCodeGenerationEvent": { "shape": "FeatureDevCodeGenerationEvent" },
+                "featureDevCodeAcceptanceEvent": { "shape": "FeatureDevCodeAcceptanceEvent" },
+                "inlineChatEvent": { "shape": "InlineChatEvent" },
+                "transformEvent": { "shape": "TransformEvent" },
+                "docGenerationEvent": { "shape": "DocGenerationEvent" },
+                "docV2GenerationEvent": { "shape": "DocV2GenerationEvent" },
+                "docV2AcceptanceEvent": { "shape": "DocV2AcceptanceEvent" },
+                "testGenerationEvent": { "shape": "TestGenerationEvent" }
+            },
+            "union": true
+        },
+        "TenantId": {
+            "type": "string",
+            "max": 1024,
+            "min": 1
+        },
+        "TerminalUserInteractionEvent": {
+            "type": "structure",
+            "members": {
+                "terminalUserInteractionEventType": { "shape": "TerminalUserInteractionEventType" },
+                "terminal": { "shape": "String" },
+                "terminalVersion": { "shape": "String" },
+                "shell": { "shape": "String" },
+                "shellVersion": { "shape": "String" },
+                "duration": { "shape": "Integer" },
+                "timeToSuggestion": { "shape": "Integer" },
+                "isCompletionAccepted": { "shape": "Boolean" },
+                "cliToolCommand": { "shape": "String" }
+            }
+        },
+        "TerminalUserInteractionEventType": {
+            "type": "string",
+            "documentation": "<p>CodeWhisperer terminal Interaction Type</p>",
+            "enum": ["CODEWHISPERER_TERMINAL_TRANSLATION_ACTION", "CODEWHISPERER_TERMINAL_COMPLETION_INSERTED"]
+        },
+        "TestGenerationEvent": {
+            "type": "structure",
+            "required": ["jobId", "groupName"],
+            "members": {
+                "jobId": { "shape": "UUID" },
+                "groupName": { "shape": "TestGenerationJobGroupName" },
+                "timestamp": { "shape": "Timestamp" },
+                "ideCategory": { "shape": "IdeCategory" },
+                "programmingLanguage": { "shape": "ProgrammingLanguage" },
+                "numberOfUnitTestCasesGenerated": { "shape": "Integer" },
+                "numberOfUnitTestCasesAccepted": { "shape": "Integer" },
+                "linesOfCodeGenerated": { "shape": "Integer" },
+                "linesOfCodeAccepted": { "shape": "Integer" },
+                "charsOfCodeGenerated": { "shape": "Integer" },
+                "charsOfCodeAccepted": { "shape": "Integer" }
+            }
+        },
+        "TestGenerationJob": {
+            "type": "structure",
+            "required": ["testGenerationJobId", "testGenerationJobGroupName", "status", "creationTime"],
+            "members": {
+                "testGenerationJobId": { "shape": "UUID" },
+                "testGenerationJobGroupName": { "shape": "TestGenerationJobGroupName" },
+                "status": { "shape": "TestGenerationJobStatus" },
+                "shortAnswer": { "shape": "SensitiveString" },
+                "creationTime": { "shape": "Timestamp" },
+                "progressRate": { "shape": "TestGenerationJobProgressRateInteger" },
+                "jobStatusReason": { "shape": "String" },
+                "jobSummary": { "shape": "TestGenerationJobJobSummaryString" },
+                "jobPlan": { "shape": "TestGenerationJobJobPlanString" },
+                "packageInfoList": { "shape": "PackageInfoList" }
+            },
+            "documentation": "<p>Represents a test generation job</p>"
+        },
+        "TestGenerationJobGroupName": {
+            "type": "string",
+            "documentation": "<p>Test generation job group name</p>",
+            "max": 128,
+            "min": 1,
+            "pattern": "[a-zA-Z0-9-_]+"
+        },
+        "TestGenerationJobJobPlanString": {
+            "type": "string",
+            "max": 30720,
+            "min": 0,
+            "sensitive": true
+        },
+        "TestGenerationJobJobSummaryString": {
+            "type": "string",
+            "max": 30720,
+            "min": 0,
+            "sensitive": true
+        },
+        "TestGenerationJobProgressRateInteger": {
+            "type": "integer",
+            "box": true,
+            "max": 100,
+            "min": 0
+        },
+        "TestGenerationJobStatus": {
+            "type": "string",
+            "enum": ["IN_PROGRESS", "FAILED", "COMPLETED"]
+        },
+        "TextDocument": {
+            "type": "structure",
+            "required": ["relativeFilePath"],
+            "members": {
+                "relativeFilePath": {
+                    "shape": "TextDocumentRelativeFilePathString",
+                    "documentation": "<p>Filepath relative to the root of the workspace</p>"
+                },
+                "programmingLanguage": {
+                    "shape": "ProgrammingLanguage",
+                    "documentation": "<p>The text document's language identifier.</p>"
+                },
+                "text": {
+                    "shape": "TextDocumentTextString",
+                    "documentation": "<p>Content of the text document</p>"
+                },
+                "documentSymbols": {
+                    "shape": "DocumentSymbols",
+                    "documentation": "<p>DocumentSymbols parsed from a text document</p>"
+                }
+            },
+            "documentation": "<p>Represents a Text Document / File</p>"
+        },
+        "TextDocumentDiagnostic": {
+            "type": "structure",
+            "required": ["document", "range", "source", "severity", "message"],
+            "members": {
+                "document": {
+                    "shape": "TextDocument",
+                    "documentation": "<p>Represents a Text Document associated with Diagnostic</p>"
+                },
+                "range": {
+                    "shape": "Range",
+                    "documentation": "<p>The range at which the message applies.</p>"
+                },
+                "source": {
+                    "shape": "SensitiveString",
+                    "documentation": "<p>A human-readable string describing the source of the diagnostic</p>"
+                },
+                "severity": {
+                    "shape": "DiagnosticSeverity",
+                    "documentation": "<p>Diagnostic Error type</p>"
+                },
+                "message": {
+                    "shape": "TextDocumentDiagnosticMessageString",
+                    "documentation": "<p>The diagnostic's message.</p>"
+                },
+                "code": {
+                    "shape": "TextDocumentDiagnosticCodeString",
+                    "documentation": "<p>The diagnostic's code, which might appear in the user interface.</p>"
+                },
+                "codeDescription": {
+                    "shape": "CodeDescription",
+                    "documentation": "<p>An optional property to describe the error code.</p>"
+                },
+                "tags": {
+                    "shape": "DiagnosticTagList",
+                    "documentation": "<p>Additional metadata about the diagnostic.</p>"
+                },
+                "relatedInformation": {
+                    "shape": "DiagnosticRelatedInformationList",
+                    "documentation": "<p>an array of related diagnostic information, e.g. when symbol-names within a scope collide all definitions can be marked via this property.</p>"
+                },
+                "data": {
+                    "shape": "TextDocumentDiagnosticDataString",
+                    "documentation": "<p>A data entry field that is preserved between a <code>textDocument/publishDiagnostics</code> notification and <code>textDocument/codeAction</code> request.</p>"
+                }
+            },
+            "documentation": "<p>Structure to represent metadata about a TextDocument Diagnostic</p>"
+        },
+        "TextDocumentDiagnosticCodeString": {
+            "type": "string",
+            "max": 1024,
+            "min": 0,
+            "sensitive": true
+        },
+        "TextDocumentDiagnosticDataString": {
+            "type": "string",
+            "max": 4096,
+            "min": 0,
+            "sensitive": true
+        },
+        "TextDocumentDiagnosticMessageString": {
+            "type": "string",
+            "max": 1024,
+            "min": 0,
+            "sensitive": true
+        },
+        "TextDocumentRelativeFilePathString": {
+            "type": "string",
+            "max": 4096,
+            "min": 1,
+            "sensitive": true
+        },
+        "TextDocumentTextString": {
+            "type": "string",
+            "max": 40000,
+            "min": 0,
+            "sensitive": true
+        },
+        "ThrottlingException": {
+            "type": "structure",
+            "required": ["message"],
+            "members": {
+                "message": { "shape": "String" },
+                "reason": { "shape": "ThrottlingExceptionReason" }
+            },
+            "documentation": "<p>This exception is thrown when request was denied due to request throttling.</p>",
+            "exception": true,
+            "retryable": { "throttling": true }
+        },
+        "ThrottlingExceptionReason": {
+            "type": "string",
+            "documentation": "<p>Reason for ThrottlingException</p>",
+            "enum": ["DAILY_REQUEST_COUNT", "MONTHLY_REQUEST_COUNT", "INSUFFICIENT_MODEL_CAPACITY"]
+        },
+        "Timestamp": { "type": "timestamp" },
+        "TokenLimits": {
+            "type": "structure",
+            "members": {
+                "maxInputTokens": {
+                    "shape": "TokenLimitsMaxInputTokensInteger",
+                    "documentation": "<p>Maximum number of input tokens the model can process</p>"
+                },
+                "maxOutputTokens": {
+                    "shape": "TokenLimitsMaxOutputTokensInteger",
+                    "documentation": "<p>Maximum number of output tokens the model can produce</p>"
+                }
+            }
+        },
+        "TokenLimitsMaxInputTokensInteger": {
+            "type": "integer",
+            "box": true,
+            "min": 1
+        },
+        "TokenLimitsMaxOutputTokensInteger": {
+            "type": "integer",
+            "box": true,
+            "min": 1
+        },
+        "Tool": {
+            "type": "structure",
+            "members": {
+                "toolSpecification": { "shape": "ToolSpecification" },
+                "cachePoint": { "shape": "CachePoint" }
+            },
+            "documentation": "<p>Information about a tool that can be used.</p>",
+            "union": true
+        },
+        "ToolDescription": {
+            "type": "string",
+            "documentation": "<p>The description for the tool.</p>",
+            "max": 10240,
+            "min": 1,
+            "sensitive": true
+        },
+        "ToolInputSchema": {
+            "type": "structure",
+            "members": {
+                "json": { "shape": "SensitiveDocument" }
+            },
+            "documentation": "<p>The input schema for the tool in JSON format.</p>"
+        },
+        "ToolName": {
+            "type": "string",
+            "documentation": "<p>The name for the tool.</p>",
+            "max": 64,
+            "min": 0,
+            "pattern": "[a-zA-Z0-9_-]+",
+            "sensitive": true
+        },
+        "ToolResult": {
+            "type": "structure",
+            "required": ["toolUseId", "content"],
+            "members": {
+                "toolUseId": { "shape": "ToolUseId" },
+                "content": {
+                    "shape": "ToolResultContent",
+                    "documentation": "<p>Content of the tool result.</p>"
+                },
+                "status": { "shape": "ToolResultStatus" }
+            },
+            "documentation": "<p>A tool result that contains the results for a tool request that was previously made.</p>"
+        },
+        "ToolResultContent": {
+            "type": "list",
+            "member": { "shape": "ToolResultContentBlock" }
+        },
+        "ToolResultContentBlock": {
+            "type": "structure",
+            "members": {
+                "text": {
+                    "shape": "ToolResultContentBlockTextString",
+                    "documentation": "<p>A tool result that is text.</p>"
+                },
+                "json": {
+                    "shape": "SensitiveDocument",
+                    "documentation": "<p>A tool result that is JSON format data.</p>"
+                }
+            },
+            "union": true
+        },
+        "ToolResultContentBlockTextString": {
+            "type": "string",
+            "max": 10000000,
+            "min": 0,
+            "sensitive": true
+        },
+        "ToolResultStatus": {
+            "type": "string",
+            "documentation": "<p>Status of the tools result.</p>",
+            "enum": ["success", "error"]
+        },
+        "ToolResults": {
+            "type": "list",
+            "member": { "shape": "ToolResult" }
+        },
+        "ToolSpecification": {
+            "type": "structure",
+            "required": ["inputSchema", "name"],
+            "members": {
+                "inputSchema": { "shape": "ToolInputSchema" },
+                "name": { "shape": "ToolName" },
+                "description": { "shape": "ToolDescription" }
+            },
+            "documentation": "<p>The specification for the tool.</p>"
+        },
+        "ToolUse": {
+            "type": "structure",
+            "required": ["toolUseId", "name", "input"],
+            "members": {
+                "toolUseId": { "shape": "ToolUseId" },
+                "name": { "shape": "ToolName" },
+                "input": {
+                    "shape": "SensitiveDocument",
+                    "documentation": "<p>The input to pass to the tool.</p>"
+                }
+            },
+            "documentation": "<p>Contains information about a tool that the model is requesting be run. The model uses the result from the tool to generate a response.</p>"
+        },
+        "ToolUseId": {
+            "type": "string",
+            "documentation": "<p>The ID for the tool request.</p>",
+            "max": 64,
+            "min": 0,
+            "pattern": "[a-zA-Z0-9_-]+"
+        },
+        "ToolUses": {
+            "type": "list",
+            "member": { "shape": "ToolUse" }
+        },
+        "Tools": {
+            "type": "list",
+            "member": { "shape": "Tool" }
+        },
+        "TransformEvent": {
+            "type": "structure",
+            "required": ["jobId"],
+            "members": {
+                "jobId": { "shape": "TransformationJobId" },
+                "timestamp": { "shape": "Timestamp" },
+                "ideCategory": { "shape": "IdeCategory" },
+                "programmingLanguage": { "shape": "ProgrammingLanguage" },
+                "linesOfCodeChanged": { "shape": "Integer" },
+                "charsOfCodeChanged": { "shape": "Integer" },
+                "linesOfCodeSubmitted": { "shape": "Integer" }
+            }
+        },
+        "TransformationDotNetRuntimeEnv": {
+            "type": "string",
+            "enum": ["NET_5_0", "NET_6_0", "NET_7_0", "NET_8_0", "NET_9_0", "NET_STANDARD_2_0"]
+        },
+        "TransformationDownloadArtifact": {
+            "type": "structure",
+            "members": {
+                "downloadArtifactType": { "shape": "TransformationDownloadArtifactType" },
+                "downloadArtifactId": { "shape": "ArtifactId" }
+            }
+        },
+        "TransformationDownloadArtifactType": {
+            "type": "string",
+            "enum": ["ClientInstructions", "Logs", "GeneratedCode"]
+        },
+        "TransformationDownloadArtifacts": {
+            "type": "list",
+            "member": { "shape": "TransformationDownloadArtifact" },
+            "max": 10,
+            "min": 0
+        },
+        "TransformationJavaRuntimeEnv": {
+            "type": "string",
+            "enum": ["JVM_8", "JVM_11", "JVM_17", "JVM_21"]
+        },
+        "TransformationJob": {
+            "type": "structure",
+            "members": {
+                "jobId": { "shape": "TransformationJobId" },
+                "transformationSpec": { "shape": "TransformationSpec" },
+                "status": { "shape": "TransformationStatus" },
+                "reason": { "shape": "String" },
+                "creationTime": { "shape": "Timestamp" },
+                "startExecutionTime": { "shape": "Timestamp" },
+                "endExecutionTime": { "shape": "Timestamp" }
+            },
+            "documentation": "<p>Represent a Transformation Job</p>"
+        },
+        "TransformationJobId": {
+            "type": "string",
+            "documentation": "<p>Identifier for the Transformation Job</p>",
+            "max": 128,
+            "min": 1
+        },
+        "TransformationLanguage": {
+            "type": "string",
+            "enum": ["JAVA_8", "JAVA_11", "JAVA_17", "JAVA_21", "C_SHARP", "COBOL", "PL_I", "JCL"]
+        },
+        "TransformationLanguages": {
+            "type": "list",
+            "member": { "shape": "TransformationLanguage" }
+        },
+        "TransformationMainframeRuntimeEnv": {
+            "type": "string",
+            "enum": ["MAINFRAME"]
+        },
+        "TransformationOperatingSystemFamily": {
+            "type": "string",
+            "enum": ["WINDOWS", "LINUX"]
+        },
+        "TransformationPlan": {
+            "type": "structure",
+            "required": ["transformationSteps"],
+            "members": {
+                "transformationSteps": { "shape": "TransformationSteps" }
+            }
+        },
+        "TransformationPlatformConfig": {
+            "type": "structure",
+            "members": {
+                "operatingSystemFamily": { "shape": "TransformationOperatingSystemFamily" }
+            }
+        },
+        "TransformationProgressUpdate": {
+            "type": "structure",
+            "required": ["name", "status"],
+            "members": {
+                "name": { "shape": "String" },
+                "status": { "shape": "TransformationProgressUpdateStatus" },
+                "description": { "shape": "String" },
+                "startTime": { "shape": "Timestamp" },
+                "endTime": { "shape": "Timestamp" },
+                "downloadArtifacts": { "shape": "TransformationDownloadArtifacts" }
+            }
+        },
+        "TransformationProgressUpdateStatus": {
+            "type": "string",
+            "enum": ["IN_PROGRESS", "COMPLETED", "FAILED", "PAUSED", "AWAITING_CLIENT_ACTION", "SKIPPED"]
+        },
+        "TransformationProjectArtifactDescriptor": {
+            "type": "structure",
+            "members": {
+                "sourceCodeArtifact": { "shape": "TransformationSourceCodeArtifactDescriptor" }
+            },
+            "union": true
+        },
+        "TransformationProjectState": {
+            "type": "structure",
+            "members": {
+                "language": { "shape": "TransformationLanguage" },
+                "runtimeEnv": { "shape": "TransformationRuntimeEnv" },
+                "platformConfig": { "shape": "TransformationPlatformConfig" },
+                "projectArtifact": { "shape": "TransformationProjectArtifactDescriptor" }
+            }
+        },
+        "TransformationRuntimeEnv": {
+            "type": "structure",
+            "members": {
+                "java": { "shape": "TransformationJavaRuntimeEnv" },
+                "dotNet": { "shape": "TransformationDotNetRuntimeEnv" },
+                "mainframe": { "shape": "TransformationMainframeRuntimeEnv" }
+            },
+            "union": true
+        },
+        "TransformationSourceCodeArtifactDescriptor": {
+            "type": "structure",
+            "members": {
+                "languages": { "shape": "TransformationLanguages" },
+                "runtimeEnv": { "shape": "TransformationRuntimeEnv" }
+            }
+        },
+        "TransformationSpec": {
+            "type": "structure",
+            "members": {
+                "transformationType": { "shape": "TransformationType" },
+                "source": { "shape": "TransformationProjectState" },
+                "target": { "shape": "TransformationProjectState" }
+            }
+        },
+        "TransformationStatus": {
+            "type": "string",
+            "enum": [
+                "CREATED",
+                "ACCEPTED",
+                "REJECTED",
+                "STARTED",
+                "PREPARING",
+                "PREPARED",
+                "PLANNING",
+                "PLANNED",
+                "TRANSFORMING",
+                "TRANSFORMED",
+                "FAILED",
+                "COMPLETED",
+                "PARTIALLY_COMPLETED",
+                "STOPPING",
+                "STOPPED",
+                "PAUSED",
+                "RESUMED"
+            ]
+        },
+        "TransformationStep": {
+            "type": "structure",
+            "required": ["id", "name", "description", "status"],
+            "members": {
+                "id": { "shape": "StepId" },
+                "name": { "shape": "String" },
+                "description": { "shape": "String" },
+                "status": { "shape": "TransformationStepStatus" },
+                "progressUpdates": { "shape": "ProgressUpdates" },
+                "startTime": { "shape": "Timestamp" },
+                "endTime": { "shape": "Timestamp" }
+            }
+        },
+        "TransformationStepStatus": {
+            "type": "string",
+            "enum": ["CREATED", "COMPLETED", "PARTIALLY_COMPLETED", "STOPPED", "FAILED", "PAUSED", "SKIPPED"]
+        },
+        "TransformationSteps": {
+            "type": "list",
+            "member": { "shape": "TransformationStep" }
+        },
+        "TransformationType": {
+            "type": "string",
+            "enum": ["LANGUAGE_UPGRADE", "DOCUMENT_GENERATION"]
+        },
+        "TransformationUploadArtifactType": {
+            "type": "string",
+            "enum": ["Dependencies", "ClientBuildResult"]
+        },
+        "TransformationUploadContext": {
+            "type": "structure",
+            "required": ["jobId", "uploadArtifactType"],
+            "members": {
+                "jobId": { "shape": "TransformationJobId" },
+                "uploadArtifactType": { "shape": "TransformationUploadArtifactType" }
+            }
+        },
+        "TransformationUserActionStatus": {
+            "type": "string",
+            "enum": ["COMPLETED", "REJECTED"]
+        },
+        "UUID": {
+            "type": "string",
+            "max": 36,
+            "min": 36
+        },
+        "UpdateUsageLimitQuotaExceededException": {
+            "type": "structure",
+            "required": ["message"],
+            "members": {
+                "message": { "shape": "String" }
+            },
+            "documentation": "<p>Exception thrown when the number of usage limit update requests exceeds the monthly quota (default 3 requests per month)</p>",
+            "exception": true
+        },
+        "UpdateUsageLimitsRequest": {
+            "type": "structure",
+            "required": ["accountId", "featureType", "requestedLimit"],
+            "members": {
+                "accountId": { "shape": "String" },
+                "accountlessUserId": { "shape": "String" },
+                "featureType": { "shape": "UsageLimitType" },
+                "requestedLimit": { "shape": "Long" },
+                "justification": { "shape": "String" }
+            }
+        },
+        "UpdateUsageLimitsResponse": {
+            "type": "structure",
+            "required": ["status"],
+            "members": {
+                "status": { "shape": "UsageLimitUpdateRequestStatus" },
+                "approvedLimit": { "shape": "Long" },
+                "remainingRequestsThisMonth": { "shape": "Integer" }
+            }
+        },
+        "UploadContext": {
+            "type": "structure",
+            "members": {
+                "taskAssistPlanningUploadContext": { "shape": "TaskAssistPlanningUploadContext" },
+                "transformationUploadContext": { "shape": "TransformationUploadContext" },
+                "codeAnalysisUploadContext": { "shape": "CodeAnalysisUploadContext" },
+                "codeFixUploadContext": { "shape": "CodeFixUploadContext" },
+                "workspaceContextUploadContext": { "shape": "WorkspaceContextUploadContext" }
+            },
+            "union": true
+        },
+        "UploadId": {
+            "type": "string",
+            "documentation": "<p>Upload ID returned by CreateUploadUrl API</p>",
+            "max": 128,
+            "min": 1
+        },
+        "UploadIntent": {
+            "type": "string",
+            "documentation": "<p>Upload Intent</p>",
+            "enum": [
+                "TRANSFORMATION",
+                "TASK_ASSIST_PLANNING",
+                "AUTOMATIC_FILE_SECURITY_SCAN",
+                "FULL_PROJECT_SECURITY_SCAN",
+                "UNIT_TESTS_GENERATION",
+                "CODE_FIX_GENERATION",
+                "WORKSPACE_CONTEXT",
+                "AGENTIC_CODE_REVIEW"
+            ]
+        },
+        "Url": {
+            "type": "string",
+            "max": 1024,
+            "min": 1
+        },
+        "UsageLimitList": {
+            "type": "structure",
+            "required": ["type", "currentUsageLimit", "totalUsageLimit"],
+            "members": {
+                "type": { "shape": "UsageLimitType" },
+                "currentUsageLimit": { "shape": "Long" },
+                "totalUsageLimit": { "shape": "Long" },
+                "percentUsed": { "shape": "Double" }
+            }
+        },
+        "UsageLimitType": {
+            "type": "string",
+            "enum": ["CODE_COMPLETIONS", "AGENTIC_REQUEST", "AI_EDITOR", "TRANSFORM"]
+        },
+        "UsageLimitUpdateRequestStatus": {
+            "type": "string",
+            "enum": ["APPROVED", "PENDING_REVIEW", "REJECTED"]
+        },
+        "UsageLimits": {
+            "type": "list",
+            "member": { "shape": "UsageLimitList" },
+            "max": 10,
+            "min": 0
+        },
+        "UserContext": {
+            "type": "structure",
+            "required": ["ideCategory", "operatingSystem", "product"],
+            "members": {
+                "ideCategory": { "shape": "IdeCategory" },
+                "operatingSystem": { "shape": "OperatingSystem" },
+                "product": { "shape": "UserContextProductString" },
+                "clientId": { "shape": "UUID" },
+                "ideVersion": { "shape": "String" },
+                "pluginVersion": { "shape": "UserContextPluginVersionString" },
+                "lspVersion": { "shape": "UserContextLspVersionString" }
+            }
+        },
+        "UserContextLspVersionString": {
+            "type": "string",
+            "max": 50,
+            "min": 0
+        },
+        "UserContextPluginVersionString": {
+            "type": "string",
+            "max": 50,
+            "min": 0
+        },
+        "UserContextProductString": {
+            "type": "string",
+            "max": 128,
+            "min": 1,
+            "pattern": "[-a-zA-Z0-9._]*"
+        },
+        "UserInputMessage": {
+            "type": "structure",
+            "required": ["content"],
+            "members": {
+                "content": {
+                    "shape": "UserInputMessageContentString",
+                    "documentation": "<p>The content of the chat message.</p>"
+                },
+                "userInputMessageContext": {
+                    "shape": "UserInputMessageContext",
+                    "documentation": "<p>Chat message context associated with the Chat Message.</p>"
+                },
+                "userIntent": {
+                    "shape": "UserIntent",
+                    "documentation": "<p>User Intent.</p>"
+                },
+                "origin": {
+                    "shape": "Origin",
+                    "documentation": "<p>User Input Origin.</p>"
+                },
+                "images": {
+                    "shape": "ImageBlocks",
+                    "documentation": "<p>Images associated with the Chat Message.</p>"
+                },
+                "modelId": {
+                    "shape": "ModelId",
+                    "documentation": "<p>Unique identifier for the model used in this conversation</p>"
+                },
+                "cachePoint": {
+                    "shape": "CachePoint",
+                    "documentation": "<p>Indicates whether to add a cache point after the current message</p>"
+                },
+                "clientCacheConfig": {
+                    "shape": "ClientCacheConfig",
+                    "documentation": "<p>Client cache config</p>"
+                }
+            },
+            "documentation": "<p>Structure to represent a chat input message from User.</p>"
+        },
+        "UserInputMessageContentString": {
+            "type": "string",
+            "max": 10000000,
+            "min": 0,
+            "sensitive": true
+        },
+        "UserInputMessageContext": {
+            "type": "structure",
+            "members": {
+                "editorState": {
+                    "shape": "EditorState",
+                    "documentation": "<p>Editor state chat message context.</p>"
+                },
+                "shellState": {
+                    "shape": "ShellState",
+                    "documentation": "<p>Shell state chat message context.</p>"
+                },
+                "gitState": {
+                    "shape": "GitState",
+                    "documentation": "<p>Git state chat message context.</p>"
+                },
+                "envState": {
+                    "shape": "EnvState",
+                    "documentation": "<p>Environment state chat message context.</p>"
+                },
+                "appStudioContext": {
+                    "shape": "AppStudioState",
+                    "documentation": "<p>The state of a user's AppStudio UI when sending a message.</p>"
+                },
+                "diagnostic": {
+                    "shape": "Diagnostic",
+                    "documentation": "<p>Diagnostic chat message context.</p>"
+                },
+                "consoleState": {
+                    "shape": "ConsoleState",
+                    "documentation": "<p>Contextual information about the environment from which the user is calling.</p>"
+                },
+                "userSettings": {
+                    "shape": "UserSettings",
+                    "documentation": "<p>Settings information, e.g., whether the user has enabled cross-region API calls.</p>"
+                },
+                "additionalContext": {
+                    "shape": "AdditionalContentList",
+                    "documentation": "<p>List of additional contextual content entries that can be included with the message.</p>"
+                },
+                "toolResults": {
+                    "shape": "ToolResults",
+                    "documentation": "<p>ToolResults for the requested ToolUses.</p>"
+                },
+                "tools": {
+                    "shape": "Tools",
+                    "documentation": "<p>Tools that can be used.</p>"
+                }
+            },
+            "documentation": "<p>Additional Chat message context associated with the Chat Message</p>"
+        },
+        "UserIntent": {
+            "type": "string",
+            "documentation": "<p>User Intent</p>",
+            "enum": [
+                "SUGGEST_ALTERNATE_IMPLEMENTATION",
+                "APPLY_COMMON_BEST_PRACTICES",
+                "IMPROVE_CODE",
+                "SHOW_EXAMPLES",
+                "CITE_SOURCES",
+                "EXPLAIN_LINE_BY_LINE",
+                "EXPLAIN_CODE_SELECTION",
+                "GENERATE_CLOUDFORMATION_TEMPLATE",
+                "GENERATE_UNIT_TESTS",
+                "CODE_GENERATION"
+            ]
+        },
+        "UserModificationEvent": {
+            "type": "structure",
+            "required": [
+                "sessionId",
+                "requestId",
+                "programmingLanguage",
+                "modificationPercentage",
+                "timestamp",
+                "acceptedCharacterCount",
+                "unmodifiedAcceptedCharacterCount"
+            ],
+            "members": {
+                "sessionId": { "shape": "UUID" },
+                "requestId": { "shape": "UUID" },
+                "programmingLanguage": { "shape": "ProgrammingLanguage" },
+                "modificationPercentage": { "shape": "Double" },
+                "customizationArn": { "shape": "CustomizationArn" },
+                "timestamp": { "shape": "Timestamp" },
+                "acceptedCharacterCount": { "shape": "PrimitiveInteger" },
+                "unmodifiedAcceptedCharacterCount": { "shape": "PrimitiveInteger" },
+                "addedCharacterCount": { "shape": "UserModificationEventAddedCharacterCountInteger" },
+                "unmodifiedAddedCharacterCount": {
+                    "shape": "UserModificationEventUnmodifiedAddedCharacterCountInteger"
+                }
+            }
+        },
+        "UserModificationEventAddedCharacterCountInteger": {
+            "type": "integer",
+            "min": 0
+        },
+        "UserModificationEventUnmodifiedAddedCharacterCountInteger": {
+            "type": "integer",
+            "min": 0
+        },
+        "UserSettings": {
+            "type": "structure",
+            "members": {
+                "hasConsentedToCrossRegionCalls": { "shape": "Boolean" }
+            },
+            "documentation": "<p>Settings information passed by the Q widget</p>"
+        },
+        "UserTriggerDecisionEvent": {
+            "type": "structure",
+            "required": [
+                "sessionId",
+                "requestId",
+                "programmingLanguage",
+                "completionType",
+                "suggestionState",
+                "recommendationLatencyMilliseconds",
+                "timestamp"
+            ],
+            "members": {
+                "sessionId": { "shape": "UUID" },
+                "requestId": { "shape": "UUID" },
+                "customizationArn": { "shape": "CustomizationArn" },
+                "programmingLanguage": { "shape": "ProgrammingLanguage" },
+                "completionType": { "shape": "CompletionType" },
+                "suggestionState": { "shape": "SuggestionState" },
+                "recommendationLatencyMilliseconds": { "shape": "Double" },
+                "timestamp": { "shape": "Timestamp" },
+                "triggerToResponseLatencyMilliseconds": { "shape": "Double" },
+                "suggestionReferenceCount": { "shape": "PrimitiveInteger" },
+                "generatedLine": { "shape": "PrimitiveInteger" },
+                "numberOfRecommendations": { "shape": "PrimitiveInteger" },
+                "perceivedLatencyMilliseconds": { "shape": "Double" },
+                "acceptedCharacterCount": { "shape": "PrimitiveInteger" },
+                "addedIdeDiagnostics": { "shape": "IdeDiagnosticList" },
+                "removedIdeDiagnostics": { "shape": "IdeDiagnosticList" },
+                "addedCharacterCount": { "shape": "UserTriggerDecisionEventAddedCharacterCountInteger" },
+                "deletedCharacterCount": { "shape": "UserTriggerDecisionEventDeletedCharacterCountInteger" },
+                "streakLength": { "shape": "UserTriggerDecisionEventStreakLengthInteger" },
+                "suggestionType": { "shape": "SuggestionType" }
+            }
+        },
+        "UserTriggerDecisionEventAddedCharacterCountInteger": {
+            "type": "integer",
+            "min": 0
+        },
+        "UserTriggerDecisionEventDeletedCharacterCountInteger": {
+            "type": "integer",
+            "min": 0
+        },
+        "UserTriggerDecisionEventStreakLengthInteger": {
+            "type": "integer",
+            "min": -1
+        },
+        "ValidationException": {
+            "type": "structure",
+            "required": ["message"],
+            "members": {
+                "message": { "shape": "String" },
+                "reason": { "shape": "ValidationExceptionReason" }
+            },
+            "documentation": "<p>This exception is thrown when the input fails to satisfy the constraints specified by the service.</p>",
+            "exception": true
+        },
+        "ValidationExceptionReason": {
+            "type": "string",
+            "documentation": "<p>Reason for ValidationException</p>",
+            "enum": [
+                "INVALID_CONVERSATION_ID",
+                "CONTENT_LENGTH_EXCEEDS_THRESHOLD",
+                "INVALID_KMS_GRANT",
+                "INVALID_MODEL_ID"
+            ]
+        },
+        "WorkspaceContext": {
+            "type": "structure",
+            "required": ["toggle"],
+            "members": {
+                "toggle": { "shape": "OptInFeatureToggle" }
+            }
+        },
+        "WorkspaceContextUploadContext": {
+            "type": "structure",
+            "required": ["workspaceId", "relativePath", "programmingLanguage"],
+            "members": {
+                "workspaceId": { "shape": "UUID" },
+                "relativePath": { "shape": "SensitiveString" },
+                "programmingLanguage": { "shape": "ProgrammingLanguage" }
+            }
+        },
+        "WorkspaceFolderList": {
+            "type": "list",
+            "member": { "shape": "WorkspaceFolderListMemberString" },
+            "max": 100,
+            "min": 0
+        },
+        "WorkspaceFolderListMemberString": {
+            "type": "string",
+            "max": 4096,
+            "min": 1,
+            "sensitive": true
+        },
+        "WorkspaceList": {
+            "type": "list",
+            "member": { "shape": "WorkspaceMetadata" }
+        },
+        "WorkspaceMetadata": {
+            "type": "structure",
+            "required": ["workspaceId", "workspaceStatus"],
+            "members": {
+                "workspaceId": { "shape": "UUID" },
+                "workspaceStatus": { "shape": "WorkspaceStatus" },
+                "environmentAddress": { "shape": "SensitiveString" },
+                "environmentId": { "shape": "SensitiveString" }
+            }
+        },
+        "WorkspaceState": {
+            "type": "structure",
+            "required": ["uploadId", "programmingLanguage"],
+            "members": {
+                "uploadId": {
+                    "shape": "UploadId",
+                    "documentation": "<p>Upload ID representing an Upload using a PreSigned URL</p>"
+                },
+                "programmingLanguage": {
+                    "shape": "ProgrammingLanguage",
+                    "documentation": "<p>Primary programming language of the Workspace</p>"
+                },
+                "contextTruncationScheme": {
+                    "shape": "ContextTruncationScheme",
+                    "documentation": "<p>Workspace context truncation schemes based on usecase</p>"
+                }
+            },
+            "documentation": "<p>Represents a Workspace state uploaded to S3 for Async Code Actions</p>"
+        },
+        "WorkspaceStatus": {
+            "type": "string",
+            "enum": ["CREATED", "PENDING", "READY", "CONNECTED", "DELETING"]
+        },
+        "timeBetweenChunks": {
+            "type": "list",
+            "member": { "shape": "Double" },
+            "max": 100,
+            "min": 0
+        }
+    }
+}
diff --git a/packages/core/src/codewhisperer/commands/basicCommands.ts b/packages/core/src/codewhisperer/commands/basicCommands.ts
new file mode 100644
index 00000000000..ec1b5ae6e63
--- /dev/null
+++ b/packages/core/src/codewhisperer/commands/basicCommands.ts
@@ -0,0 +1,855 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { CodewhispererCodeScanIssueApplyFix, Component, telemetry } from '../../shared/telemetry/telemetry'
+import { ExtContext, VSCODE_EXTENSION_ID } from '../../shared/extensions'
+import { Commands, VsCodeCommandArg, placeholder } from '../../shared/vscode/commands2'
+import * as CodeWhispererConstants from '../models/constants'
+import { DefaultCodeWhispererClient } from '../client/codewhisperer'
+import { confirmStopSecurityScan, startSecurityScan } from './startSecurityScan'
+import { SecurityPanelViewProvider } from '../views/securityPanelViewProvider'
+import {
+    CodeScanIssue,
+    CodeScansState,
+    codeScanState,
+    CodeSuggestionsState,
+    onDemandFileScanState,
+    SecurityIssueFilters,
+    SecurityTreeViewFilterState,
+    severities,
+    vsCodeState,
+} from '../models/model'
+import { connectToEnterpriseSso, getStartUrl } from '../util/getStartUrl'
+import { showCodeWhispererConnectionPrompt } from '../util/showSsoPrompt'
+import { ReferenceLogViewProvider } from '../service/referenceLogViewProvider'
+import { AuthUtil } from '../util/authUtil'
+import { getLogger } from '../../shared/logger/logger'
+import { isExtensionActive, isExtensionInstalled, localize, openUrl } from '../../shared/utilities/vsCodeUtils'
+import {
+    getPersistedCustomizations,
+    notifyNewCustomizations,
+    selectCustomization,
+    showCustomizationPrompt,
+} from '../util/customizationUtil'
+import {
+    closeSecurityIssueWebview,
+    isSecurityIssueWebviewOpen,
+    showSecurityIssueWebview,
+    updateSecurityIssueWebview,
+} from '../views/securityIssue/securityIssueWebview'
+import { Mutable } from '../../shared/utilities/tsUtils'
+import { CodeWhispererSource } from './types'
+import { TelemetryHelper } from '../util/telemetryHelper'
+import { Auth } from '../../auth/auth'
+import { AwsConnection } from '../../auth/connection'
+import { once } from '../../shared/utilities/functionUtils'
+import { focusAmazonQPanel } from '../../codewhispererChat/commands/registerCommands'
+import { removeDiagnostic } from '../service/diagnosticsProvider'
+import { SsoAccessTokenProvider } from '../../auth/sso/ssoAccessTokenProvider'
+import { ToolkitError, getTelemetryReason, getTelemetryReasonDesc } from '../../shared/errors'
+import { isRemoteWorkspace } from '../../shared/vscode/env'
+import { isBuilderIdConnection } from '../../auth/connection'
+import globals from '../../shared/extensionGlobals'
+import { getVscodeCliPath } from '../../shared/utilities/pathFind'
+import { tryRun } from '../../shared/utilities/pathFind'
+import { IssueItem, SecurityIssueTreeViewProvider } from '../service/securityIssueTreeViewProvider'
+import { SecurityIssueProvider } from '../service/securityIssueProvider'
+import { CodeWhispererSettings } from '../util/codewhispererSettings'
+import { closeDiff, getPatchedCode } from '../../shared/utilities/diffUtils'
+import { insertCommentAboveLine } from '../../shared/utilities/commentUtils'
+import path from 'path'
+import { UserWrittenCodeTracker } from '../tracker/userWrittenCodeTracker'
+import { parsePatch } from 'diff'
+import { createCodeIssueGroupingStrategyPrompter } from '../ui/prompters'
+import { cancel, confirm } from '../../shared/localizedText'
+import { showQuickPick } from '../../shared/ui/pickerPrompter'
+import { i18n } from '../../shared/i18n-helper'
+
+const MessageTimeOut = 5_000
+
+export const toggleCodeSuggestions = Commands.declare(
+    { id: 'aws.amazonq.toggleCodeSuggestion', compositeKey: { 1: 'source' } },
+    (suggestionState: CodeSuggestionsState) => async (_: VsCodeCommandArg, source: CodeWhispererSource) => {
+        await telemetry.aws_modifySetting.run(async (span) => {
+            span.record({
+                settingId: CodeWhispererConstants.autoSuggestionConfig.settingId,
+            })
+
+            const isSuggestionsEnabled = await suggestionState.toggleSuggestions()
+
+            span.record({
+                settingState: isSuggestionsEnabled
+                    ? CodeWhispererConstants.autoSuggestionConfig.activated
+                    : CodeWhispererConstants.autoSuggestionConfig.deactivated,
+            })
+            vsCodeState.isFreeTierLimitReached = false
+
+            void vscode.window.setStatusBarMessage(
+                isSuggestionsEnabled
+                    ? 'Amazon Q: Auto-Suggestions are currently running.'
+                    : 'Amazon Q: Auto-Suggestions are currently paused.',
+                MessageTimeOut
+            )
+        })
+    }
+)
+
+export const enableCodeSuggestions = Commands.declare(
+    'aws.amazonq.enableCodeSuggestions',
+    (context: ExtContext) =>
+        async (isAuto: boolean = true) => {
+            await CodeSuggestionsState.instance.setSuggestionsEnabled(isAuto)
+            vsCodeState.isFreeTierLimitReached = false
+            await vscode.commands.executeCommand('aws.amazonq.refreshStatusBar')
+        }
+)
+
+export const toggleCodeScans = Commands.declare(
+    { id: 'aws.codeWhisperer.toggleCodeScan', compositeKey: { 1: 'source' } },
+    (scansState: CodeScansState) => async (_: VsCodeCommandArg, source: CodeWhispererSource) => {
+        await telemetry.aws_modifySetting.run(async (span) => {
+            if (isBuilderIdConnection(AuthUtil.instance.conn)) {
+                throw new Error(`Auto-scans are not supported with the Amazon Builder ID connection.`)
+            }
+            span.record({
+                settingId: CodeWhispererConstants.autoScansConfig.settingId,
+            })
+
+            const isScansEnabled = await scansState.toggleScans()
+            span.record({
+                settingState: isScansEnabled
+                    ? CodeWhispererConstants.autoScansConfig.activated
+                    : CodeWhispererConstants.autoScansConfig.deactivated,
+            })
+
+            await vscode.commands.executeCommand('aws.amazonq.refreshStatusBar')
+            void vscode.window.setStatusBarMessage(
+                isScansEnabled
+                    ? 'Amazon Q: Auto-Scans are currently running.'
+                    : 'Amazon Q: Auto-Scans are currently paused.',
+                MessageTimeOut
+            )
+        })
+    }
+)
+
+export const showReferenceLog = Commands.declare(
+    { id: 'aws.amazonq.openReferencePanel', compositeKey: { 1: 'source' } },
+    () => async (_: VsCodeCommandArg, source: CodeWhispererSource) => {
+        if (_ !== placeholder) {
+            source = 'ellipsesMenu'
+        }
+        await vscode.commands.executeCommand(`${ReferenceLogViewProvider.viewType}.focus`)
+    }
+)
+
+export const showLogs = Commands.declare(
+    { id: 'aws.amazonq.showLogs', compositeKey: { 1: 'source' } },
+    () => async (_: VsCodeCommandArg, source: CodeWhispererSource) => {
+        if (_ !== placeholder) {
+            source = 'ellipsesMenu'
+        }
+
+        // Show warning message without buttons - just informational
+        void vscode.window.showWarningMessage(
+            'Log files may contain sensitive information such as account IDs, resource names, and other data. Be careful when sharing these logs.'
+        )
+
+        // Get the log directory path
+        const logFolderPath = globals.context.logUri?.fsPath
+        const path = require('path')
+        const logFilePath = path.join(logFolderPath, 'Amazon Q Logs.log')
+        if (logFilePath) {
+            // Open the log directory in the OS file explorer directly
+            await vscode.commands.executeCommand('revealFileInOS', vscode.Uri.file(logFilePath))
+        } else {
+            // Fallback: show error if log path is not available
+            void vscode.window.showErrorMessage('Log location not available.')
+        }
+    }
+)
+
+export const showIntroduction = Commands.declare('aws.amazonq.introduction', () => async () => {
+    void openUrl(vscode.Uri.parse(CodeWhispererConstants.learnMoreUriGeneral))
+})
+
+export const showSecurityScan = Commands.declare(
+    { id: 'aws.amazonq.security.scan', compositeKey: { 1: 'source' } },
+    (context: ExtContext, securityPanelViewProvider: SecurityPanelViewProvider, client: DefaultCodeWhispererClient) =>
+        async (_: VsCodeCommandArg, source: CodeWhispererSource, initiatedByChat: boolean, scanUuid?: string) => {
+            if (AuthUtil.instance.isConnectionExpired()) {
+                await AuthUtil.instance.notifyReauthenticate()
+            }
+            if (codeScanState.isNotStarted()) {
+                // User intends to start as "Start Security Scan" is shown in the explorer tree
+                codeScanState.setToRunning()
+                void startSecurityScan(
+                    securityPanelViewProvider,
+                    undefined,
+                    client,
+                    context.extensionContext,
+                    CodeWhispererConstants.CodeAnalysisScope.PROJECT,
+                    initiatedByChat,
+                    undefined,
+                    scanUuid
+                )
+            } else if (codeScanState.isRunning()) {
+                // User intends to stop as "Stop Security Scan" is shown in the explorer tree
+                // Cancel only when the code scan state is "Running"
+                await confirmStopSecurityScan(
+                    codeScanState,
+                    initiatedByChat,
+                    CodeWhispererConstants.CodeAnalysisScope.PROJECT,
+                    undefined
+                )
+            }
+            vsCodeState.isFreeTierLimitReached = false
+        }
+)
+
+export const showFileScan = Commands.declare(
+    { id: 'aws.amazonq.security.filescan', compositeKey: { 1: 'source' } },
+    (context: ExtContext, securityPanelViewProvider: SecurityPanelViewProvider, client: DefaultCodeWhispererClient) =>
+        async (_: VsCodeCommandArg, source: CodeWhispererSource, scanUuid?: string) => {
+            if (AuthUtil.instance.isConnectionExpired()) {
+                await AuthUtil.instance.notifyReauthenticate()
+            }
+            const editor = vscode.window.activeTextEditor
+            if (onDemandFileScanState.isNotStarted()) {
+                onDemandFileScanState.setToRunning()
+                void startSecurityScan(
+                    securityPanelViewProvider,
+                    editor,
+                    client,
+                    context.extensionContext,
+                    CodeWhispererConstants.CodeAnalysisScope.FILE_ON_DEMAND,
+                    true,
+                    undefined,
+                    scanUuid
+                )
+            } else if (onDemandFileScanState.isRunning()) {
+                // TODO: Pending with progress bar implementation in the Q chat Panel
+                // User intends to stop the scan from Q chat panel.
+                // Cancel only when the file scan state is "Running"
+                await confirmStopSecurityScan(
+                    onDemandFileScanState,
+                    true,
+                    CodeWhispererConstants.CodeAnalysisScope.FILE_ON_DEMAND,
+                    editor?.document.fileName
+                )
+            }
+            vsCodeState.isFreeTierLimitReached = false
+        }
+)
+
+export const selectCustomizationPrompt = Commands.declare(
+    { id: 'aws.amazonq.selectCustomization', compositeKey: { 1: 'source' } },
+    () => async (_: VsCodeCommandArg, source: CodeWhispererSource) => {
+        if (isBuilderIdConnection(AuthUtil.instance.conn)) {
+            throw new Error(`Select Customizations are not supported with the Amazon Builder ID connection.`)
+        }
+        telemetry.ui_click.emit({ elementId: 'cw_selectCustomization_Cta' })
+        void showCustomizationPrompt().then()
+    }
+)
+
+export const selectRegionProfileCommand = Commands.declare(
+    { id: 'aws.amazonq.selectRegionProfile', compositeKey: { 1: 'source' } },
+    () => async (_: VsCodeCommandArg, source: CodeWhispererSource) => {
+        const quickPickItems = AuthUtil.instance.regionProfileManager.generateQuickPickItem()
+
+        await showQuickPick(quickPickItems, {
+            title: localize('AWS.amazonq.profile.quickPick.title', 'Select a Profile'),
+            placeholder: localize(
+                'AWS.amazonq.profile.quickPick.placeholder',
+                'You can choose from the following profiles:'
+            ),
+            recentlyUsed: i18n('AWS.codewhisperer.customization.selected'),
+        })
+    }
+)
+
+export const reconnect = Commands.declare(
+    { id: 'aws.amazonq.reconnect', compositeKey: { 1: 'source' } },
+    () => async (_: VsCodeCommandArg, source: CodeWhispererSource) => await AuthUtil.instance.reauthenticate()
+)
+
+/** @deprecated in favor of the `Add Connection` page */
+export const showSsoSignIn = Commands.declare('aws.amazonq.sso', () => async () => {
+    telemetry.ui_click.emit({ elementId: 'cw_signUp_Cta' })
+    await showCodeWhispererConnectionPrompt()
+})
+
+// Shortcut command to directly connect to Identity Center or prompt start URL entry
+// It can optionally set a customization too based on given values to match on
+
+// This command is only declared and registered in Amazon Q if Q exists
+export const connectWithCustomization = Commands.declare(
+    { id: 'aws.codeWhisperer.connect', compositeKey: { 0: 'source' } },
+    /**
+     * This command supports the following arguments:
+     * @param source - an identifier for who used this command. This value is not explicitly used in the function, but is used elsewhere.
+     * startUrl and region. If both arguments are provided they will be used, otherwise
+     *  the command prompts for them interactively.
+     * customizationArn: select customization by ARN. If provided, `customizationNamePrefix` is ignored.
+     * customizationNamePrefix: select customization by prefix, if `customizationArn` is `undefined`.
+     */
+    () =>
+        async (
+            source: string,
+            startUrl?: string,
+            region?: string,
+            customizationArn?: string,
+            customizationNamePrefix?: string
+        ) => {
+            SsoAccessTokenProvider.authSource = source
+            if (startUrl && region) {
+                await connectToEnterpriseSso(startUrl, region)
+            } else {
+                await getStartUrl()
+            }
+
+            // No customization match information given, exit early.
+            if (!customizationArn && !customizationNamePrefix) {
+                return
+            }
+
+            let persistedCustomizations = getPersistedCustomizations()
+
+            // Check if any customizations have already been persisted.
+            // If not, call `notifyNewCustomizations` to handle it then recheck.
+            if (persistedCustomizations.length === 0) {
+                await notifyNewCustomizations()
+                persistedCustomizations = getPersistedCustomizations()
+            }
+
+            // If given an ARN, assume a specific customization is desired and find an entry that matches it. Ignores the prefix logic.
+            // Otherwise if only a prefix is given, find an entry that matches it.
+            // Backwards compatible with previous implementation.
+            const match = customizationArn
+                ? persistedCustomizations.find((c) => c.arn === customizationArn)
+                : persistedCustomizations.find((c) => c.name?.startsWith(customizationNamePrefix as string))
+
+            // If no match is found, nothing to do :)
+            if (!match) {
+                getLogger().error(
+                    `No customization match found: arn=${customizationArn} prefix=${customizationNamePrefix}`
+                )
+                return
+            }
+            // Since we selected based on a match, we'll reuse the persisted values.
+            await selectCustomization(match)
+        }
+)
+
+export const showLearnMore = Commands.declare(
+    { id: 'aws.amazonq._learnMore', compositeKey: { 0: 'source' } },
+    () => async (source: CodeWhispererSource) => {
+        telemetry.ui_click.emit({ elementId: 'cw_learnMore_Cta' })
+        void openUrl(vscode.Uri.parse(CodeWhispererConstants.learnMoreUriGeneral))
+    }
+)
+
+// TODO: Use a different URI
+export const showFreeTierLimit = Commands.declare(
+    { id: 'aws.amazonq.freeTierLimit', compositeKey: { 1: 'source' } },
+    () => async (_: VsCodeCommandArg, source: CodeWhispererSource) => {
+        void openUrl(vscode.Uri.parse(CodeWhispererConstants.learnMoreUri))
+    }
+)
+
+export const updateReferenceLog = Commands.declare(
+    {
+        id: 'aws.amazonq.updateReferenceLog',
+        logging: false,
+    },
+    () => () => {
+        ReferenceLogViewProvider.instance.update()
+    }
+)
+
+export const openSecurityIssuePanel = Commands.declare(
+    'aws.amazonq.openSecurityIssuePanel',
+    (context: ExtContext) => async (issue: CodeScanIssue | IssueItem, filePath: string) => {
+        const targetIssue: CodeScanIssue = issue instanceof IssueItem ? issue.issue : issue
+        const targetFilePath: string = issue instanceof IssueItem ? issue.filePath : filePath
+        await showSecurityIssueWebview(context.extensionContext, targetIssue, targetFilePath)
+        telemetry.codewhisperer_codeScanIssueViewDetails.emit({
+            findingId: targetIssue.findingId,
+            detectorId: targetIssue.detectorId,
+            ruleId: targetIssue.ruleId,
+            credentialStartUrl: AuthUtil.instance.startUrl,
+            autoDetected: targetIssue.autoDetected,
+        })
+        TelemetryHelper.instance.sendCodeScanRemediationsEvent(
+            undefined,
+            'CODESCAN_ISSUE_VIEW_DETAILS',
+            targetIssue.detectorId,
+            targetIssue.findingId,
+            targetIssue.ruleId,
+            undefined,
+            undefined,
+            undefined,
+            !!targetIssue.suggestedFixes.length
+        )
+    }
+)
+
+export const notifyNewCustomizationsCmd = Commands.declare(
+    { id: 'aws.amazonq.notifyNewCustomizations', logging: false },
+    () => () => {
+        notifyNewCustomizations().catch((e) => {
+            getLogger().error('notifyNewCustomizations failed: %s', (e as Error).message)
+        })
+    }
+)
+
+function focusQAfterDelay() {
+    // this command won't work without a small delay after install
+    globals.clock.setTimeout(() => {
+        focusAmazonQPanel.execute(placeholder, 'startDelay').catch((e) => {
+            getLogger().error('focusAmazonQPanel failed: %s', e)
+        })
+    }, 1000)
+}
+
+/**
+ * Actually install Amazon Q.
+ * Sometimes reload VS Code window after installation is necessary
+ * to properly activate extension. In that case, VS Code will prompt user to reload.
+ */
+export const installAmazonQExtension = Commands.declare(
+    { id: 'aws.toolkit.installAmazonQExtension', logging: true },
+    () => async () => {
+        if (isRemoteWorkspace()) {
+            /**
+             * due to a bug in https://github.com/microsoft/vscode/pull/206381/files#diff-efa08c29460835c0ffa740d751c34078033fd6cb6c7b031500fb31f524655de2R360
+             * installExtension will fail on remote environments when the amazon q extension is already installed locally.
+             * Until thats fixed we need to manually install the amazon q extension using the cli
+             */
+            const vscPath = await getVscodeCliPath()
+            if (!vscPath) {
+                throw new ToolkitError('installAmazonQ: Unable to find VSCode CLI path', {
+                    code: 'CodeCLINotFound',
+                })
+            }
+            await vscode.window.withProgress(
+                {
+                    location: vscode.ProgressLocation.Notification,
+                    cancellable: false,
+                },
+                (progress, token) => {
+                    progress.report({ message: 'Installing Amazon Q' })
+                    return tryRun(vscPath, ['--install-extension', VSCODE_EXTENSION_ID.amazonq])
+                }
+            )
+            return
+        }
+        await vscode.commands.executeCommand('workbench.extensions.installExtension', VSCODE_EXTENSION_ID.amazonq)
+
+        // jump to Amazon Q extension view after install.
+        focusQAfterDelay()
+    }
+)
+
+export const applySecurityFix = Commands.declare(
+    'aws.amazonq.applySecurityFix',
+    () => async (issue: CodeScanIssue | IssueItem, filePath: string, source: Component) => {
+        const targetIssue: CodeScanIssue = issue instanceof IssueItem ? issue.issue : issue
+        const targetFilePath: string = issue instanceof IssueItem ? issue.filePath : filePath
+        const targetSource: Component = issue instanceof IssueItem ? 'tree' : source
+        const [suggestedFix] = targetIssue.suggestedFixes
+        if (!suggestedFix || !targetFilePath || !suggestedFix.code) {
+            return
+        }
+
+        const applyFixTelemetryEntry: Mutable<CodewhispererCodeScanIssueApplyFix> = {
+            detectorId: targetIssue.detectorId,
+            findingId: targetIssue.findingId,
+            ruleId: targetIssue.ruleId,
+            component: targetSource,
+            result: 'Succeeded',
+            credentialStartUrl: AuthUtil.instance.startUrl,
+            codeFixAction: 'applyFix',
+            autoDetected: targetIssue.autoDetected,
+            codewhispererCodeScanJobId: targetIssue.scanJobId,
+        }
+        let languageId = undefined
+        try {
+            UserWrittenCodeTracker.instance.onQStartsMakingEdits()
+            const document = await vscode.workspace.openTextDocument(targetFilePath)
+            languageId = document.languageId
+            const updatedContent = await getPatchedCode(targetFilePath, suggestedFix.code)
+            if (!updatedContent) {
+                void vscode.window.showErrorMessage(CodeWhispererConstants.codeFixAppliedFailedMessage)
+                throw Error('Failed to get updated content from applying diff patch')
+            }
+
+            const edit = new vscode.WorkspaceEdit()
+            const diffs = parsePatch(suggestedFix.code)
+            for (const diff of diffs) {
+                for (const hunk of [...diff.hunks].reverse()) {
+                    const startLine = document.lineAt(hunk.oldStart - 1)
+                    const endLine = document.lineAt(hunk.oldStart - 1 + hunk.oldLines - 1)
+                    const range = new vscode.Range(startLine.range.start, endLine.range.end)
+
+                    const newText = updatedContent
+                        .split('\n')
+                        .slice(hunk.newStart - 1, hunk.newStart - 1 + hunk.newLines)
+                        .join('\n')
+
+                    edit.replace(document.uri, range, newText)
+                }
+            }
+            const isApplied = await vscode.workspace.applyEdit(edit)
+            if (isApplied) {
+                void document.save().then((didSave) => {
+                    if (!didSave) {
+                        getLogger().error('Apply fix command failed to save the document.')
+                    }
+                })
+            } else {
+                throw Error('Failed to apply edit to the workspace.')
+            }
+            // add accepted references to reference log, if any
+            const fileName = path.basename(targetFilePath)
+            const time = new Date().toLocaleString()
+            // TODO: this is duplicated in controller.ts for test. Fix this later.
+            if (suggestedFix.references) {
+                for (const reference of suggestedFix.references) {
+                    getLogger().debug('Processing reference: %O', reference)
+                    // Log values for debugging
+                    getLogger().debug('suggested fix code: %s', suggestedFix.code)
+                    getLogger().debug('updated content: %s', updatedContent)
+                    getLogger().debug(
+                        'start: %d, end: %d',
+                        reference.recommendationContentSpan?.start,
+                        reference.recommendationContentSpan?.end
+                    )
+                    // given a start and end index, figure out which line number they belong to when splitting a string on /n characters
+                    const getLineNumber = (content: string, index: number): number => {
+                        const lines = content.slice(0, index).split('\n')
+                        return lines.length
+                    }
+                    const startLine = getLineNumber(updatedContent, reference.recommendationContentSpan!.start!)
+                    const endLine = getLineNumber(updatedContent, reference.recommendationContentSpan!.end!)
+                    getLogger().debug('startLine: %d, endLine: %d', startLine, endLine)
+                    const code = updatedContent.slice(
+                        reference.recommendationContentSpan?.start,
+                        reference.recommendationContentSpan?.end
+                    )
+                    getLogger().debug('Extracted code slice: %s', code)
+                    const referenceLog =
+                        `[${time}] Accepted recommendation ` +
+                        CodeWhispererConstants.referenceLogText(
+                            `<br><code>${code}</code><br>`,
+                            reference.licenseName!,
+                            reference.repository!,
+                            fileName,
+                            startLine === endLine ? `(line at ${startLine})` : `(lines from ${startLine} to ${endLine})`
+                        ) +
+                        '<br>'
+                    getLogger().debug('Adding reference log: %s', referenceLog)
+                    ReferenceLogViewProvider.instance.addReferenceLog(referenceLog)
+                }
+            }
+
+            removeDiagnostic(document.uri, targetIssue)
+            SecurityIssueProvider.instance.removeIssue(document.uri, targetIssue)
+            SecurityIssueTreeViewProvider.instance.refresh()
+
+            await closeSecurityIssueWebview(targetIssue.findingId)
+            await closeDiff(targetFilePath)
+            await vscode.window.showTextDocument(document, { viewColumn: vscode.ViewColumn.One })
+            const linesLength = suggestedFix.code.split('\n').length
+            const charsLength = suggestedFix.code.length
+            if (targetIssue.fixJobId) {
+                TelemetryHelper.instance.sendCodeFixAcceptanceEvent(
+                    targetIssue.fixJobId,
+                    languageId,
+                    targetIssue.ruleId,
+                    targetIssue.detectorId,
+                    linesLength,
+                    charsLength
+                )
+            }
+        } catch (err) {
+            getLogger().error(`Apply fix command failed. ${err}`)
+            applyFixTelemetryEntry.result = 'Failed'
+            applyFixTelemetryEntry.reason = getTelemetryReason(err)
+            applyFixTelemetryEntry.reasonDesc = getTelemetryReasonDesc(err)
+        } finally {
+            telemetry.codewhisperer_codeScanIssueApplyFix.emit(applyFixTelemetryEntry)
+            TelemetryHelper.instance.sendCodeScanRemediationsEvent(
+                languageId,
+                'CODESCAN_ISSUE_APPLY_FIX',
+                targetIssue.detectorId,
+                targetIssue.findingId,
+                targetIssue.ruleId,
+                source,
+                applyFixTelemetryEntry.reasonDesc,
+                applyFixTelemetryEntry.result,
+                !!targetIssue.suggestedFixes.length
+            )
+            UserWrittenCodeTracker.instance.onQFinishesEdits()
+        }
+    }
+)
+
+export const signoutCodeWhisperer = Commands.declare(
+    { id: 'aws.amazonq.signout', compositeKey: { 1: 'source' } },
+    (auth: AuthUtil) => async (_: VsCodeCommandArg, source: CodeWhispererSource) => {
+        await auth.secondaryAuth.deleteConnection()
+        SecurityIssueTreeViewProvider.instance.refresh()
+        return focusAmazonQPanel.execute(placeholder, source).catch((e) => {
+            getLogger().error('focusAmazonQPanel failed: %s', e)
+            return undefined
+        })
+    }
+)
+
+let _toolkitApi: any = undefined
+
+const registerToolkitApiCallbackOnce = once(() => {
+    getLogger().info(`toolkitApi: Registering callbacks of toolkit api`)
+    const auth = Auth.instance
+
+    auth.onDidChangeConnectionState(async (e) => {
+        if (_toolkitApi && 'declareConnection' in _toolkitApi) {
+            const id = e.id
+            const conn = await auth.getConnection({ id })
+            if (conn?.type === 'sso') {
+                getLogger().info(`toolkitApi: declare connection ${id}`)
+                _toolkitApi.declareConnection(
+                    {
+                        ssoRegion: conn.ssoRegion,
+                        startUrl: conn.startUrl,
+                    },
+                    'Amazon Q'
+                )
+            }
+        }
+    })
+    auth.onDidDeleteConnection(async (event) => {
+        if (_toolkitApi && 'undeclareConnection' in _toolkitApi && event.storedProfile?.type === 'sso') {
+            const startUrl = event.storedProfile.startUrl
+            getLogger().info(`toolkitApi: undeclare connection ${event.connId} with starturl: ${startUrl}`)
+            _toolkitApi.undeclareConnection({ startUrl })
+        }
+    })
+})
+
+export const registerToolkitApiCallback = Commands.declare(
+    { id: 'aws.amazonq.refreshConnectionCallback' },
+    () => async (toolkitApi?: any) => {
+        // Early return if already registered to avoid duplicate work
+        if (_toolkitApi) {
+            getLogger().debug('Toolkit API callback already registered, skipping')
+            return
+        }
+
+        // While the Q/CW exposes an API for the Toolkit to register callbacks on auth changes,
+        // we need to do it manually here because the Toolkit would have been unable to call
+        // this API if the Q/CW extension started afterwards (and this code block is running).
+        if (isExtensionInstalled(VSCODE_EXTENSION_ID.awstoolkit)) {
+            getLogger().info(`Trying to register toolkit callback. Toolkit is installed,
+                        toolkit activated = ${isExtensionActive(VSCODE_EXTENSION_ID.awstoolkit)}`)
+            if (toolkitApi) {
+                // when this command is executed by AWS Toolkit activation
+                _toolkitApi = toolkitApi.getApi(VSCODE_EXTENSION_ID.amazonq)
+            } else if (isExtensionActive(VSCODE_EXTENSION_ID.awstoolkit)) {
+                // when this command is executed by Amazon Q activation
+                const toolkitExt = vscode.extensions.getExtension(VSCODE_EXTENSION_ID.awstoolkit)
+                _toolkitApi = toolkitExt?.exports?.getApi(VSCODE_EXTENSION_ID.amazonq)
+            }
+            if (_toolkitApi) {
+                registerToolkitApiCallbackOnce()
+                // Declare current conn immediately
+                const currentConn = AuthUtil.instance.conn
+                if (currentConn?.type === 'sso') {
+                    _toolkitApi.declareConnection(
+                        {
+                            type: currentConn.type,
+                            ssoRegion: currentConn.ssoRegion,
+                            startUrl: currentConn.startUrl,
+                            id: currentConn.id,
+                        } as AwsConnection,
+                        'Amazon Q'
+                    )
+                }
+            }
+        }
+    }
+)
+
+export const clearFilters = Commands.declare(
+    { id: 'aws.amazonq.securityIssuesTreeFilter.clearFilters' },
+    () => async () => {
+        await SecurityTreeViewFilterState.instance.resetFilters()
+    }
+)
+
+export const generateFix = Commands.declare(
+    { id: 'aws.amazonq.security.generateFix' },
+    (client: DefaultCodeWhispererClient, context: ExtContext) =>
+        async (
+            issueItem: IssueItem,
+            filePath: string,
+            source: Component,
+            refresh: boolean = false,
+            shouldOpenSecurityIssuePanel: boolean = true
+        ) => {
+            await vscode.commands.executeCommand('aws.amazonq.generateFix', issueItem.issue, issueItem.filePath)
+        }
+)
+
+export const rejectFix = Commands.declare(
+    { id: 'aws.amazonq.security.rejectFix' },
+    (context: vscode.ExtensionContext) => async (issue: CodeScanIssue | IssueItem | undefined, filePath: string) => {
+        const targetIssue: CodeScanIssue | undefined = issue instanceof IssueItem ? issue.issue : issue
+        const targetFilePath: string = issue instanceof IssueItem ? issue.filePath : filePath
+        if (!targetIssue) {
+            return
+        }
+        const updatedIssue: CodeScanIssue = { ...targetIssue, suggestedFixes: [] }
+        await updateSecurityIssueWebview({
+            issue: updatedIssue,
+            context,
+            filePath: targetFilePath,
+            shouldRefreshView: false,
+        })
+
+        SecurityIssueProvider.instance.updateIssue(updatedIssue, targetFilePath)
+        SecurityIssueTreeViewProvider.instance.refresh()
+        await closeDiff(targetFilePath)
+
+        return updatedIssue
+    }
+)
+
+export const regenerateFix = Commands.declare(
+    { id: 'aws.amazonq.security.regenerateFix' },
+    () => async (issue: CodeScanIssue | IssueItem | undefined, filePath: string, source: Component) => {}
+)
+
+export const explainIssue = Commands.declare(
+    { id: 'aws.amazonq.security.explain' },
+    () => async (issueItem: IssueItem) => {
+        await vscode.commands.executeCommand('aws.amazonq.explainIssue', issueItem.issue, issueItem.filePath)
+    }
+)
+
+export const ignoreAllIssues = Commands.declare(
+    { id: 'aws.amazonq.security.ignoreAll' },
+    () => async (issue: CodeScanIssue | IssueItem, source: Component) => {
+        const targetIssue: CodeScanIssue = issue instanceof IssueItem ? issue.issue : issue
+        const targetSource: Component = issue instanceof IssueItem ? 'tree' : source
+        const resp = await vscode.window.showWarningMessage(
+            CodeWhispererConstants.ignoreAllIssuesMessage(targetIssue.title),
+            confirm,
+            cancel
+        )
+        if (resp === confirm) {
+            await telemetry.codewhisperer_codeScanIssueIgnore.run(async () => {
+                const ignoredIssues = CodeWhispererSettings.instance.getIgnoredSecurityIssues()
+                if (!ignoredIssues.includes(targetIssue.title)) {
+                    await CodeWhispererSettings.instance.addToIgnoredSecurityIssuesList(targetIssue.title)
+                }
+                await closeSecurityIssueWebview(targetIssue.findingId)
+
+                telemetry.record({
+                    component: targetSource,
+                    credentialStartUrl: AuthUtil.instance.startUrl,
+                    detectorId: targetIssue.detectorId,
+                    findingId: targetIssue.findingId,
+                    ruleId: targetIssue.ruleId,
+                    variant: 'all',
+                    autoDetected: targetIssue.autoDetected,
+                })
+            })
+        }
+    }
+)
+
+export const ignoreIssue = Commands.declare(
+    { id: 'aws.amazonq.security.ignore' },
+    () => async (issue: CodeScanIssue | IssueItem, filePath: string, source: Component) => {
+        await telemetry.codewhisperer_codeScanIssueIgnore.run(async () => {
+            const targetIssue: CodeScanIssue = issue instanceof IssueItem ? issue.issue : issue
+            const targetFilePath: string = issue instanceof IssueItem ? issue.filePath : filePath
+            const targetSource: Component = issue instanceof IssueItem ? 'tree' : source
+            const document = await vscode.workspace.openTextDocument(targetFilePath)
+
+            const documentIsVisible = vscode.window.visibleTextEditors.some((editor) => editor.document === document)
+            if (!documentIsVisible) {
+                await vscode.window.showTextDocument(document, {
+                    selection: new vscode.Range(targetIssue.startLine, 0, targetIssue.endLine, 0),
+                    preserveFocus: true,
+                    preview: true,
+                    viewColumn: vscode.ViewColumn.One,
+                })
+            }
+            insertCommentAboveLine(document, targetIssue.startLine, CodeWhispererConstants.amazonqIgnoreNextLine)
+            await closeSecurityIssueWebview(targetIssue.findingId)
+
+            telemetry.record({
+                component: targetSource,
+                credentialStartUrl: AuthUtil.instance.startUrl,
+                detectorId: targetIssue.detectorId,
+                findingId: targetIssue.findingId,
+                ruleId: targetIssue.ruleId,
+                autoDetected: targetIssue.autoDetected,
+            })
+        })
+    }
+)
+
+export const showSecurityIssueFilters = Commands.declare({ id: 'aws.amazonq.security.showFilters' }, () => async () => {
+    const filterState = SecurityTreeViewFilterState.instance.getState()
+    const quickPickItems: vscode.QuickPickItem[] = severities.map((severity) => ({
+        label: severity,
+        picked: filterState.severity[severity],
+    }))
+    const result = await vscode.window.showQuickPick(quickPickItems, {
+        title: localize('aws.commands.amazonq.filterIssues', 'Filter Issues'),
+        placeHolder: localize('aws.amazonq.security.showFilters.placeholder', 'Select code issues to show'),
+        canPickMany: true,
+    })
+    if (result) {
+        await SecurityTreeViewFilterState.instance.setState({
+            ...filterState,
+            severity: severities.reduce(
+                (p, c) => ({ ...p, [c]: result.map(({ label }) => label).includes(c) }),
+                {}
+            ) as SecurityIssueFilters['severity'],
+        })
+    }
+})
+
+export const showCodeIssueGroupingQuickPick = Commands.declare(
+    { id: 'aws.amazonq.codescan.showGroupingStrategy' },
+    () => async () => {
+        const prompter = createCodeIssueGroupingStrategyPrompter()
+        await prompter.prompt()
+    }
+)
+
+export const focusIssue = Commands.declare(
+    { id: 'aws.amazonq.security.focusIssue' },
+    () => async (issue: CodeScanIssue, filePath: string) => {
+        const document = await vscode.workspace.openTextDocument(filePath)
+        void vscode.window.showTextDocument(document, {
+            selection: new vscode.Range(issue.startLine, 0, issue.endLine, 0),
+            preserveFocus: true,
+            preview: true,
+            viewColumn: vscode.ViewColumn.One,
+        })
+
+        if (isSecurityIssueWebviewOpen()) {
+            void vscode.commands.executeCommand('aws.amazonq.openSecurityIssuePanel', issue, filePath)
+        }
+    }
+)
diff --git a/packages/core/src/codewhisperer/commands/gettingStartedPageCommands.ts b/packages/core/src/codewhisperer/commands/gettingStartedPageCommands.ts
new file mode 100644
index 00000000000..ab7c8e00afc
--- /dev/null
+++ b/packages/core/src/codewhisperer/commands/gettingStartedPageCommands.ts
@@ -0,0 +1,42 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { CommandDeclarations, Commands, VsCodeCommandArg } from '../../shared/vscode/commands2'
+import { showCodeWhispererWebview } from '../vue/backend'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { AmazonQPromptSettings } from '../../shared/settings'
+import { CodeWhispererSource } from './types'
+/**
+ * The methods with backend logic for the Codewhisperer Getting Started Page commands.
+ */
+export class CodeWhispererCommandBackend {
+    constructor(private readonly extContext: vscode.ExtensionContext) {}
+    public async showGettingStartedPage(_: VsCodeCommandArg, source: CodeWhispererSource) {
+        if (_ !== undefined) {
+            source = 'vscodeComponent'
+        }
+
+        const prompts = AmazonQPromptSettings.instance
+        // To check the condition If the user has already seen the welcome message
+        if (!prompts.isPromptEnabled('codeWhispererNewWelcomeMessage')) {
+            telemetry.ui_click.emit({ elementId: 'codewhisperer_Learn_ButtonClick', passive: true })
+        }
+        return showCodeWhispererWebview(this.extContext, source)
+    }
+}
+/**
+ * Declared commands related to CodeWhisperer in the toolkit.
+ */
+export class CodeWhispererCommandDeclarations implements CommandDeclarations<CodeWhispererCommandBackend> {
+    static #instance: CodeWhispererCommandDeclarations
+
+    static get instance(): CodeWhispererCommandDeclarations {
+        return (this.#instance ??= new CodeWhispererCommandDeclarations())
+    }
+    public readonly declared = {
+        showGettingStartedPage:
+            Commands.from(CodeWhispererCommandBackend).declareShowGettingStartedPage('aws.amazonq.gettingStarted'),
+    } as const
+}
diff --git a/packages/core/src/codewhisperer/commands/invokeRecommendation.ts b/packages/core/src/codewhisperer/commands/invokeRecommendation.ts
new file mode 100644
index 00000000000..37fcb965774
--- /dev/null
+++ b/packages/core/src/codewhisperer/commands/invokeRecommendation.ts
@@ -0,0 +1,45 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { vsCodeState, ConfigurationEntry } from '../models/model'
+import { resetIntelliSenseState } from '../util/globalStateUtil'
+import { DefaultCodeWhispererClient } from '../client/codewhisperer'
+import { RecommendationHandler } from '../service/recommendationHandler'
+import { session } from '../util/codeWhispererSession'
+import { RecommendationService } from '../service/recommendationService'
+
+/**
+ * This function is for manual trigger CodeWhisperer
+ */
+
+export async function invokeRecommendation(
+    editor: vscode.TextEditor,
+    client: DefaultCodeWhispererClient,
+    config: ConfigurationEntry
+) {
+    if (!editor || !config.isManualTriggerEnabled) {
+        return
+    }
+
+    /**
+     * Skip when output channel gains focus and invoke
+     */
+    if (editor.document.languageId === 'Log') {
+        return
+    }
+    /**
+     * When using intelliSense, if invocation position changed, reject previous active recommendations
+     */
+    if (vsCodeState.isIntelliSenseActive && editor.selection.active !== session.startPos) {
+        resetIntelliSenseState(
+            config.isManualTriggerEnabled,
+            config.isAutomatedTriggerEnabled,
+            RecommendationHandler.instance.isValidResponse()
+        )
+    }
+
+    await RecommendationService.instance.generateRecommendation(client, editor, 'OnDemand', config, undefined)
+}
diff --git a/packages/core/src/codewhisperer/commands/onAcceptance.ts b/packages/core/src/codewhisperer/commands/onAcceptance.ts
new file mode 100644
index 00000000000..e13c197cefd
--- /dev/null
+++ b/packages/core/src/codewhisperer/commands/onAcceptance.ts
@@ -0,0 +1,85 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { vsCodeState, OnRecommendationAcceptanceEntry } from '../models/model'
+import { runtimeLanguageContext } from '../util/runtimeLanguageContext'
+import { CodeWhispererTracker } from '../tracker/codewhispererTracker'
+import { CodeWhispererCodeCoverageTracker } from '../tracker/codewhispererCodeCoverageTracker'
+import { getLogger } from '../../shared/logger/logger'
+import { handleExtraBrackets } from '../util/closingBracketUtil'
+import { RecommendationHandler } from '../service/recommendationHandler'
+import { ReferenceLogViewProvider } from '../service/referenceLogViewProvider'
+import { ReferenceHoverProvider } from '../service/referenceHoverProvider'
+import path from 'path'
+
+/**
+ * This function is called when user accepts a intelliSense suggestion or an inline suggestion
+ */
+export async function onAcceptance(acceptanceEntry: OnRecommendationAcceptanceEntry) {
+    RecommendationHandler.instance.cancelPaginatedRequest()
+    /**
+     * Format document
+     */
+    if (acceptanceEntry.editor) {
+        const languageContext = runtimeLanguageContext.getLanguageContext(
+            acceptanceEntry.editor.document.languageId,
+            path.extname(acceptanceEntry.editor.document.fileName)
+        )
+        const start = acceptanceEntry.range.start
+        const end = acceptanceEntry.range.end
+
+        // codewhisperer will be doing editing while formatting.
+        // formatting should not trigger consoals auto trigger
+        vsCodeState.isCodeWhispererEditing = true
+        /**
+         * Mitigation to right context handling mainly for auto closing bracket use case
+         */
+        try {
+            await handleExtraBrackets(acceptanceEntry.editor, end, start)
+        } catch (error) {
+            getLogger().error(`${error} in handleAutoClosingBrackets`)
+        }
+        // move cursor to end of suggestion before doing code format
+        // after formatting, the end position will still be editor.selection.active
+        acceptanceEntry.editor.selection = new vscode.Selection(end, end)
+
+        vsCodeState.isCodeWhispererEditing = false
+        CodeWhispererTracker.getTracker().enqueue({
+            time: new Date(),
+            fileUrl: acceptanceEntry.editor.document.uri,
+            originalString: acceptanceEntry.editor.document.getText(new vscode.Range(start, end)),
+            startPosition: start,
+            endPosition: end,
+            requestId: acceptanceEntry.requestId,
+            sessionId: acceptanceEntry.sessionId,
+            index: acceptanceEntry.acceptIndex,
+            triggerType: acceptanceEntry.triggerType,
+            completionType: acceptanceEntry.completionType,
+            language: languageContext.language,
+        })
+        const insertedCoderange = new vscode.Range(start, end)
+        CodeWhispererCodeCoverageTracker.getTracker(languageContext.language)?.countAcceptedTokens(
+            insertedCoderange,
+            acceptanceEntry.editor.document.getText(insertedCoderange),
+            acceptanceEntry.editor.document.fileName
+        )
+        if (acceptanceEntry.references !== undefined) {
+            const referenceLog = ReferenceLogViewProvider.getReferenceLog(
+                acceptanceEntry.recommendation,
+                acceptanceEntry.references,
+                acceptanceEntry.editor
+            )
+            ReferenceLogViewProvider.instance.addReferenceLog(referenceLog)
+            ReferenceHoverProvider.instance.addCodeReferences(
+                acceptanceEntry.recommendation,
+                acceptanceEntry.references
+            )
+        }
+    }
+
+    // at the end of recommendation acceptance, report user decisions and clear recommendations.
+    RecommendationHandler.instance.reportUserDecisions(acceptanceEntry.acceptIndex)
+}
diff --git a/packages/core/src/codewhisperer/commands/onInlineAcceptance.ts b/packages/core/src/codewhisperer/commands/onInlineAcceptance.ts
new file mode 100644
index 00000000000..d193af056f7
--- /dev/null
+++ b/packages/core/src/codewhisperer/commands/onInlineAcceptance.ts
@@ -0,0 +1,145 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as CodeWhispererConstants from '../models/constants'
+import { vsCodeState, OnRecommendationAcceptanceEntry } from '../models/model'
+import { runtimeLanguageContext } from '../util/runtimeLanguageContext'
+import { CodeWhispererTracker } from '../tracker/codewhispererTracker'
+import { CodeWhispererCodeCoverageTracker } from '../tracker/codewhispererCodeCoverageTracker'
+import { getLogger } from '../../shared/logger/logger'
+import { RecommendationHandler } from '../service/recommendationHandler'
+import { sleep } from '../../shared/utilities/timeoutUtils'
+import { handleExtraBrackets } from '../util/closingBracketUtil'
+import { Commands } from '../../shared/vscode/commands2'
+import { isInlineCompletionEnabled } from '../util/commonUtil'
+import { onAcceptance } from './onAcceptance'
+import * as codewhispererClient from '../client/codewhisperer'
+import {
+    CodewhispererCompletionType,
+    CodewhispererLanguage,
+    CodewhispererTriggerType,
+} from '../../shared/telemetry/telemetry.gen'
+import { ReferenceLogViewProvider } from '../service/referenceLogViewProvider'
+import { ReferenceHoverProvider } from '../service/referenceHoverProvider'
+import { ImportAdderProvider } from '../service/importAdderProvider'
+import { session } from '../util/codeWhispererSession'
+import path from 'path'
+import { RecommendationService } from '../service/recommendationService'
+import { Container } from '../service/serviceContainer'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { TelemetryHelper } from '../util/telemetryHelper'
+import { UserWrittenCodeTracker } from '../tracker/userWrittenCodeTracker'
+
+export const acceptSuggestion = Commands.declare(
+    'aws.amazonq.accept',
+    (context: vscode.ExtensionContext) =>
+        async (
+            range: vscode.Range,
+            effectiveRange: vscode.Range,
+            acceptIndex: number,
+            recommendation: string,
+            requestId: string,
+            sessionId: string,
+            triggerType: CodewhispererTriggerType,
+            completionType: CodewhispererCompletionType,
+            language: CodewhispererLanguage,
+            references: codewhispererClient.References
+        ) => {
+            telemetry.record({
+                traceId: TelemetryHelper.instance.traceId,
+            })
+
+            RecommendationService.instance.incrementAcceptedCount()
+            const editor = vscode.window.activeTextEditor
+            await Container.instance.lineAnnotationController.refresh(editor, 'codewhisperer')
+            const onAcceptanceFunc = isInlineCompletionEnabled() ? onInlineAcceptance : onAcceptance
+            await onAcceptanceFunc({
+                editor,
+                range,
+                effectiveRange,
+                acceptIndex,
+                recommendation,
+                requestId,
+                sessionId,
+                triggerType,
+                completionType,
+                language,
+                references,
+            })
+        }
+)
+/**
+ * This function is called when user accepts a intelliSense suggestion or an inline suggestion
+ */
+export async function onInlineAcceptance(acceptanceEntry: OnRecommendationAcceptanceEntry) {
+    RecommendationHandler.instance.cancelPaginatedRequest()
+    RecommendationHandler.instance.disposeInlineCompletion()
+
+    if (acceptanceEntry.editor) {
+        await sleep(CodeWhispererConstants.vsCodeCursorUpdateDelay)
+        const languageContext = runtimeLanguageContext.getLanguageContext(
+            acceptanceEntry.editor.document.languageId,
+            path.extname(acceptanceEntry.editor.document.fileName)
+        )
+        const start = acceptanceEntry.range.start
+        const end = acceptanceEntry.editor.selection.active
+
+        vsCodeState.isCodeWhispererEditing = true
+        /**
+         * Mitigation to right context handling mainly for auto closing bracket use case
+         */
+        try {
+            // Do not handle extra bracket if there is a right context merge
+            if (acceptanceEntry.recommendation === session.recommendations[acceptanceEntry.acceptIndex].content) {
+                await handleExtraBrackets(acceptanceEntry.editor, end, acceptanceEntry.effectiveRange.start)
+            }
+            await ImportAdderProvider.instance.onAcceptRecommendation(
+                acceptanceEntry.editor,
+                session.recommendations[acceptanceEntry.acceptIndex],
+                start.line
+            )
+        } catch (error) {
+            getLogger().error(`${error} in handling extra brackets or imports`)
+        } finally {
+            vsCodeState.isCodeWhispererEditing = false
+        }
+
+        CodeWhispererTracker.getTracker().enqueue({
+            time: new Date(),
+            fileUrl: acceptanceEntry.editor.document.uri,
+            originalString: acceptanceEntry.editor.document.getText(new vscode.Range(start, end)),
+            startPosition: start,
+            endPosition: end,
+            requestId: acceptanceEntry.requestId,
+            sessionId: acceptanceEntry.sessionId,
+            index: acceptanceEntry.acceptIndex,
+            triggerType: acceptanceEntry.triggerType,
+            completionType: acceptanceEntry.completionType,
+            language: languageContext.language,
+        })
+        const insertedCoderange = new vscode.Range(start, end)
+        CodeWhispererCodeCoverageTracker.getTracker(languageContext.language)?.countAcceptedTokens(
+            insertedCoderange,
+            acceptanceEntry.editor.document.getText(insertedCoderange),
+            acceptanceEntry.editor.document.fileName
+        )
+        UserWrittenCodeTracker.instance.onQFinishesEdits()
+        if (acceptanceEntry.references !== undefined) {
+            const referenceLog = ReferenceLogViewProvider.getReferenceLog(
+                acceptanceEntry.recommendation,
+                acceptanceEntry.references,
+                acceptanceEntry.editor
+            )
+            ReferenceLogViewProvider.instance.addReferenceLog(referenceLog)
+            ReferenceHoverProvider.instance.addCodeReferences(
+                acceptanceEntry.recommendation,
+                acceptanceEntry.references
+            )
+        }
+
+        RecommendationHandler.instance.reportUserDecisions(acceptanceEntry.acceptIndex)
+    }
+}
diff --git a/packages/core/src/codewhisperer/commands/startCodeFixGeneration.ts b/packages/core/src/codewhisperer/commands/startCodeFixGeneration.ts
new file mode 100644
index 00000000000..f0118eef46a
--- /dev/null
+++ b/packages/core/src/codewhisperer/commands/startCodeFixGeneration.ts
@@ -0,0 +1,131 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { fs } from '../../shared/fs/fs'
+import { getLogger } from '../../shared/logger/logger'
+import {
+    createCodeFixJob,
+    getCodeFixJob,
+    getPresignedUrlAndUpload,
+    pollCodeFixJobStatus,
+    throwIfCancelled,
+} from '../service/codeFixHandler'
+import { ArtifactMap, DefaultCodeWhispererClient } from '../client/codewhisperer'
+import { codeFixState, CodeScanIssue } from '../models/model'
+import { CreateCodeFixError } from '../models/errors'
+import AdmZip from 'adm-zip'
+import path from 'path'
+import { TelemetryHelper } from '../util/telemetryHelper'
+import { tempDirPath } from '../../shared/filesystemUtilities'
+import { CodeWhispererSettings } from '../util/codewhispererSettings'
+import { AuthUtil } from '../util/authUtil'
+import { saveDocumentIfDirty } from '../../shared/utilities/textDocumentUtilities'
+
+export async function startCodeFixGeneration(
+    client: DefaultCodeWhispererClient,
+    issue: CodeScanIssue,
+    filePath: string,
+    codeFixName: string
+) {
+    const profile = AuthUtil.instance.regionProfileManager.activeRegionProfile
+    /**
+     * Step 0: Initial code fix telemetry
+     */
+    // TODO: Telemetry
+    let jobId
+    let linesOfFixGenerated
+    let charsOfFixGenerated
+    try {
+        getLogger().verbose(
+            `Starting code fix generation for lines ${issue.startLine + 1} through ${issue.endLine} of file ${filePath}`
+        )
+
+        /**
+         * Step 1: Generate zip
+         */
+        throwIfCancelled()
+
+        // Save the file if it has unsaved changes to ensure the latest content is included in the zip
+        await saveDocumentIfDirty(filePath)
+        const admZip = new AdmZip()
+        admZip.addLocalFile(filePath)
+
+        const zipFilePath = path.join(tempDirPath, 'codefix.zip')
+        admZip.writeZip(zipFilePath)
+
+        /**
+         * Step 2: Get presigned Url, upload and clean up
+         */
+        let artifactMap: ArtifactMap = {}
+        try {
+            artifactMap = await getPresignedUrlAndUpload(client, zipFilePath, codeFixName, profile)
+        } finally {
+            await fs.delete(zipFilePath)
+        }
+
+        /**
+         * Step 3: Create code fix job
+         */
+        throwIfCancelled()
+        const codeFixJob = await createCodeFixJob(
+            client,
+            artifactMap.SourceCode,
+            {
+                start: { line: issue.startLine + 1, character: 0 },
+                end: { line: issue.endLine, character: 0 },
+            },
+            issue.recommendation.text,
+            {
+                recommendationsWithReferences: CodeWhispererSettings.instance.isSuggestionsWithCodeReferencesEnabled()
+                    ? 'ALLOW'
+                    : 'BLOCK',
+            },
+            codeFixName,
+            issue.ruleId,
+            profile
+        )
+        if (codeFixJob.status === 'Failed') {
+            throw new CreateCodeFixError()
+        }
+        jobId = codeFixJob.jobId
+        issue.fixJobId = codeFixJob.jobId
+        getLogger().verbose(`Created code fix job.`)
+
+        /**
+         * Step 4: Polling mechanism on code fix job status
+         */
+        throwIfCancelled()
+        const jobStatus = await pollCodeFixJobStatus(client, String(codeFixJob.jobId), profile)
+        if (jobStatus === 'Failed') {
+            getLogger().verbose(`Code fix generation failed.`)
+            throw new CreateCodeFixError()
+        }
+
+        /**
+         * Step 5: Process and render code fix results
+         */
+        throwIfCancelled()
+        getLogger().verbose(`Code fix job succeeded and start processing result.`)
+
+        const { suggestedFix } = await getCodeFixJob(client, String(codeFixJob.jobId), profile)
+        // eslint-disable-next-line aws-toolkits/no-json-stringify-in-log
+        getLogger().verbose(`Suggested fix: ${JSON.stringify(suggestedFix)}`)
+        return { suggestedFix, jobId }
+    } catch (err) {
+        getLogger().error('Code fix generation failed: %s', err)
+        throw err
+    } finally {
+        codeFixState.setToNotStarted()
+        if (jobId) {
+            TelemetryHelper.instance.sendCodeFixGenerationEvent(
+                jobId,
+                issue.language,
+                issue.ruleId,
+                issue.detectorId,
+                linesOfFixGenerated,
+                charsOfFixGenerated
+            )
+        }
+    }
+}
diff --git a/packages/core/src/codewhisperer/commands/startSecurityScan.ts b/packages/core/src/codewhisperer/commands/startSecurityScan.ts
new file mode 100644
index 00000000000..ba9f4f9d926
--- /dev/null
+++ b/packages/core/src/codewhisperer/commands/startSecurityScan.ts
@@ -0,0 +1,553 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+import { ArtifactMap, DefaultCodeWhispererClient } from '../client/codewhisperer'
+import { initSecurityScanRender } from '../service/diagnosticsProvider'
+import { SecurityPanelViewProvider } from '../views/securityPanelViewProvider'
+import { getLogger } from '../../shared/logger/logger'
+import { makeLogger } from '../../shared/logger/activation'
+import * as CodeWhispererConstants from '../models/constants'
+import {
+    getPresignedUrlAndUpload,
+    createScanJob,
+    pollScanJobStatus,
+    listScanResults,
+    throwIfCancelled,
+    getLoggerForScope,
+} from '../service/securityScanHandler'
+import { runtimeLanguageContext } from '../util/runtimeLanguageContext'
+import {
+    AggregatedCodeScanIssue,
+    CodeScansState,
+    CodeScanState,
+    codeScanState,
+    CodeScanStoppedError,
+    CodeScanTelemetryEntry,
+    onDemandFileScanState,
+    OnDemandFileScanState,
+} from '../models/model'
+import { cancel, ok } from '../../shared/localizedText'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { ToolkitError, getTelemetryReasonDesc, isAwsError } from '../../shared/errors'
+import { AuthUtil } from '../util/authUtil'
+import path from 'path'
+import { ZipMetadata, ZipUtil } from '../util/zipUtil'
+import { debounce } from 'lodash'
+import { once } from '../../shared/utilities/functionUtils'
+import { randomUUID } from '../../shared/crypto'
+import { CodeAnalysisScope, ProjectSizeExceededErrorMessage, SecurityScanStep } from '../models/constants'
+import {
+    CodeScanJobFailedError,
+    CreateCodeScanFailedError,
+    MaximumFileScanReachedError,
+    MaximumProjectScanReachedError,
+    SecurityScanError,
+} from '../models/errors'
+import { SecurityIssueTreeViewProvider } from '../service/securityIssueTreeViewProvider'
+import { ChatSessionManager } from '../../amazonqScan/chat/storages/chatSession'
+import { TelemetryHelper } from '../util/telemetryHelper'
+
+const localize = nls.loadMessageBundle()
+export const stopScanButton = localize('aws.codewhisperer.stopscan', 'Stop Scan')
+
+/**
+ * Creates the vscode OutputChannel and Toolkit logger used by Security Scan, exactly once.
+ *
+ * To avoid cluttering the Output channels list, do not call this until it's actually needed.
+ *
+ * @returns Logger and OutputChannel created on the first invocation.
+ */
+const getLogOutputChan = once(() => {
+    const codeScanOutpuChan = vscode.window.createOutputChannel('Amazon Q Security Scan Logs')
+    const codeScanLogger = makeLogger({
+        logLevel: 'info',
+        outputChannels: [codeScanOutpuChan],
+    })
+    return [codeScanLogger, codeScanOutpuChan] as const
+})
+
+export function startSecurityScanWithProgress(
+    securityPanelViewProvider: SecurityPanelViewProvider,
+    editor: vscode.TextEditor | undefined,
+    client: DefaultCodeWhispererClient,
+    context: vscode.ExtensionContext,
+    scope: CodeWhispererConstants.CodeAnalysisScope,
+    initiatedByChat: boolean
+) {
+    return vscode.window.withProgress(
+        {
+            location: vscode.ProgressLocation.Notification,
+            title:
+                scope === CodeWhispererConstants.CodeAnalysisScope.PROJECT
+                    ? CodeWhispererConstants.runningSecurityScan
+                    : CodeWhispererConstants.runningFileScan,
+            cancellable: false,
+        },
+        async () => {
+            await startSecurityScan(securityPanelViewProvider, editor, client, context, scope, initiatedByChat)
+        }
+    )
+}
+
+export const debounceStartSecurityScan = debounce(
+    startSecurityScan,
+    CodeWhispererConstants.autoScanDebounceDelaySeconds * 1000
+)
+
+export async function startSecurityScan(
+    securityPanelViewProvider: SecurityPanelViewProvider,
+    editor: vscode.TextEditor | undefined,
+    client: DefaultCodeWhispererClient,
+    context: vscode.ExtensionContext,
+    scope: CodeWhispererConstants.CodeAnalysisScope,
+    initiatedByChat: boolean,
+    zipUtil: ZipUtil = new ZipUtil(),
+    scanUuid?: string
+) {
+    if (scope === CodeAnalysisScope.AGENTIC) {
+        throw new CreateCodeScanFailedError('Cannot use Agentic scope')
+    }
+    const profile = AuthUtil.instance.regionProfileManager.activeRegionProfile
+    const logger = getLoggerForScope(scope)
+    /**
+     * Step 0: Initial Code Scan telemetry
+     */
+    const codeScanStartTime = performance.now()
+    if (scope === CodeAnalysisScope.FILE_AUTO) {
+        CodeScansState.instance.setLatestScanTime(codeScanStartTime)
+    }
+    let serviceInvocationStartTime = 0
+    const codeScanTelemetryEntry: CodeScanTelemetryEntry = {
+        codewhispererLanguage: editor
+            ? runtimeLanguageContext.getLanguageContext(
+                  editor.document.languageId,
+                  path.extname(editor.document.fileName)
+              ).language
+            : 'plaintext',
+        codewhispererCodeScanSrcPayloadBytes: 0,
+        codewhispererCodeScanSrcZipFileBytes: 0,
+        codewhispererCodeScanLines: 0,
+        duration: 0,
+        contextTruncationDuration: 0,
+        artifactsUploadDuration: 0,
+        codeScanServiceInvocationsDuration: 0,
+        result: 'Succeeded',
+        codewhispererCodeScanTotalIssues: 0,
+        codewhispererCodeScanIssuesWithFixes: 0,
+        credentialStartUrl: AuthUtil.instance.startUrl,
+        codewhispererCodeScanScope: scope,
+        source: initiatedByChat ? 'chat' : 'menu',
+    }
+    const fileName = editor?.document.fileName
+    const scanState = scope === CodeAnalysisScope.PROJECT ? codeScanState : onDemandFileScanState
+    try {
+        logger.verbose(`Starting security scan `)
+        /**
+         * Step 1: Generate zip
+         */
+        throwIfCancelled(scope, codeScanStartTime)
+        if (initiatedByChat) {
+            scanState.getChatControllers()?.scanProgress.fire({
+                tabID: ChatSessionManager.Instance.getSession().tabID,
+                step: SecurityScanStep.GENERATE_ZIP,
+                scope,
+                fileName,
+                scanUuid,
+            })
+        }
+        const zipMetadata = await zipUtil.generateZip(editor?.document.uri, scope)
+        const projectPaths = zipUtil.getProjectPaths()
+
+        const contextTruncationStartTime = performance.now()
+        codeScanTelemetryEntry.contextTruncationDuration = performance.now() - contextTruncationStartTime
+        logger.verbose(`Complete project context processing.`)
+        codeScanTelemetryEntry.codewhispererCodeScanSrcPayloadBytes = zipMetadata.srcPayloadSizeInBytes
+        codeScanTelemetryEntry.codewhispererCodeScanBuildPayloadBytes = zipMetadata.buildPayloadSizeInBytes
+        codeScanTelemetryEntry.codewhispererCodeScanSrcZipFileBytes = zipMetadata.zipFileSizeInBytes
+        codeScanTelemetryEntry.codewhispererCodeScanLines = zipMetadata.lines
+        if (zipMetadata.language) {
+            codeScanTelemetryEntry.codewhispererLanguage = zipMetadata.language
+        }
+
+        /**
+         * Step 2: Get presigned Url, upload and clean up
+         */
+
+        throwIfCancelled(scope, codeScanStartTime)
+        if (initiatedByChat) {
+            scanState.getChatControllers()?.scanProgress.fire({
+                tabID: ChatSessionManager.Instance.getSession().tabID,
+                step: SecurityScanStep.UPLOAD_TO_S3,
+                scope,
+                fileName,
+                scanUuid,
+            })
+        }
+        let artifactMap: ArtifactMap = {}
+        const uploadStartTime = performance.now()
+        const scanName = randomUUID()
+        try {
+            artifactMap = await getPresignedUrlAndUpload(client, zipMetadata, scope, scanName, profile)
+        } finally {
+            await zipUtil.removeTmpFiles(zipMetadata, scope)
+            codeScanTelemetryEntry.artifactsUploadDuration = performance.now() - uploadStartTime
+        }
+
+        /**
+         * Step 3:  Create scan job
+         */
+        throwIfCancelled(scope, codeScanStartTime)
+        if (initiatedByChat) {
+            scanState.getChatControllers()?.scanProgress.fire({
+                tabID: ChatSessionManager.Instance.getSession().tabID,
+                step: SecurityScanStep.CREATE_SCAN_JOB,
+                scope,
+                fileName,
+                scanUuid,
+            })
+        }
+        serviceInvocationStartTime = performance.now()
+        const scanJob = await createScanJob(
+            client,
+            artifactMap,
+            codeScanTelemetryEntry.codewhispererLanguage,
+            scope,
+            scanName,
+            profile
+        )
+        if (scanJob.status === 'Failed') {
+            logger.verbose(`${scanJob.errorMessage}`)
+            const errorMessage = scanJob.errorMessage ?? 'CreateCodeScanFailed'
+            throw new CreateCodeScanFailedError(errorMessage)
+        }
+        logger.verbose(`Created security scan job.`)
+        codeScanTelemetryEntry.codewhispererCodeScanJobId = scanJob.jobId
+
+        /**
+         * Step 4:  Polling mechanism on scan job status
+         */
+        throwIfCancelled(scope, codeScanStartTime)
+        if (initiatedByChat) {
+            scanState.getChatControllers()?.scanProgress.fire({
+                tabID: ChatSessionManager.Instance.getSession().tabID,
+                step: SecurityScanStep.POLL_SCAN_STATUS,
+                scope,
+                fileName,
+                scanUuid,
+            })
+        }
+        // pass profile
+        const jobStatus = await pollScanJobStatus(client, scanJob.jobId, scope, codeScanStartTime, profile)
+        if (jobStatus === 'Failed') {
+            logger.verbose(`Security scan failed.`)
+            throw new CodeScanJobFailedError()
+        }
+
+        /**
+         * Step 5: Process and render scan results
+         */
+        throwIfCancelled(scope, codeScanStartTime)
+        if (initiatedByChat) {
+            scanState.getChatControllers()?.scanProgress.fire({
+                tabID: ChatSessionManager.Instance.getSession().tabID,
+                step: SecurityScanStep.PROCESS_SCAN_RESULTS,
+                scope,
+                fileName,
+                scanUuid,
+            })
+        }
+        logger.verbose(`Security scan job succeeded and start processing result.`)
+        const securityRecommendationCollection = await listScanResults(
+            client,
+            scanJob.jobId,
+            CodeWhispererConstants.codeScanFindingsSchema,
+            projectPaths,
+            scope,
+            editor,
+            profile
+        )
+        for (const issue of securityRecommendationCollection
+            .flatMap(({ issues }) => issues)
+            .filter(({ visible, autoDetected }) => visible && !autoDetected)) {
+            telemetry.codewhisperer_codeScanIssueDetected.emit({
+                autoDetected: issue.autoDetected,
+                codewhispererCodeScanJobId: issue.scanJobId,
+                detectorId: issue.detectorId,
+                findingId: issue.findingId,
+                includesFix: issue.suggestedFixes.length > 0,
+                ruleId: issue.ruleId,
+                result: 'Succeeded',
+            })
+        }
+        const { total, withFixes } = securityRecommendationCollection.reduce(
+            (accumulator, current) => ({
+                total: accumulator.total + current.issues.length,
+                withFixes: accumulator.withFixes + current.issues.filter((i) => i.suggestedFixes.length > 0).length,
+            }),
+            { total: 0, withFixes: 0 }
+        )
+        codeScanTelemetryEntry.codewhispererCodeScanTotalIssues = total
+        codeScanTelemetryEntry.codewhispererCodeScanIssuesWithFixes = withFixes
+        throwIfCancelled(scope, codeScanStartTime)
+        logger.verbose(`Security scan totally found ${total} issues. ${withFixes} of them have fixes.`)
+        /**
+         * initiatedByChat is true for PROJECT and FILE_ON_DEMAND scopes,
+         * initiatedByChat is false for PROJECT and FILE_AUTO scopes
+         */
+        if (initiatedByChat) {
+            showScanResultsInChat(
+                securityPanelViewProvider,
+                securityRecommendationCollection,
+                editor,
+                context,
+                scope,
+                zipMetadata,
+                total,
+                scanUuid
+            )
+        } else {
+            showSecurityScanResults(securityRecommendationCollection, editor, context, scope, zipMetadata, total)
+        }
+        TelemetryHelper.instance.sendCodeScanSucceededEvent(
+            codeScanTelemetryEntry.codewhispererLanguage,
+            scanJob.jobId,
+            total,
+            scope
+        )
+
+        logger.verbose(`Security scan completed.`)
+    } catch (error) {
+        getLogger().error('Security scan failed. %O', error)
+        if (error instanceof CodeScanStoppedError) {
+            codeScanState.getChatControllers()?.scanCancelled.fire({
+                tabID: ChatSessionManager.Instance.getSession().tabID,
+                scanUuid,
+            })
+            codeScanTelemetryEntry.result = 'Cancelled'
+        } else if (isAwsError(error) && error.code === 'ThrottlingException') {
+            codeScanTelemetryEntry.result = 'Failed'
+            if (
+                scope === CodeAnalysisScope.PROJECT &&
+                error.message.includes(CodeWhispererConstants.scansLimitReachedErrorMessage)
+            ) {
+                const maximumProjectScanReachedError = new MaximumProjectScanReachedError()
+                getLogger().error(maximumProjectScanReachedError.customerFacingMessage)
+                errorPromptHelper(maximumProjectScanReachedError, scope, initiatedByChat, fileName, scanUuid)
+                // TODO: Should we set a graphical state?
+                // We shouldn't set vsCodeState.isFreeTierLimitReached here because it will hide CW and Q chat options.
+            } else if (scope === CodeAnalysisScope.PROJECT) {
+                getLogger().error(error.message)
+                errorPromptHelper(
+                    new SecurityScanError(
+                        error.code,
+                        (error as any).statusCode?.toString() ?? '',
+                        'Too many requests, please wait before trying again.'
+                    ),
+                    scope,
+                    initiatedByChat,
+                    fileName,
+                    scanUuid
+                )
+            } else {
+                const maximumFileScanReachedError = new MaximumFileScanReachedError()
+                getLogger().error(maximumFileScanReachedError.customerFacingMessage)
+                errorPromptHelper(maximumFileScanReachedError, scope, initiatedByChat, fileName, scanUuid)
+                CodeScansState.instance.setMonthlyQuotaExceeded()
+            }
+        } else {
+            codeScanTelemetryEntry.result = 'Failed'
+            errorPromptHelper(
+                new SecurityScanError(
+                    (error as any).code ?? 'unknown error',
+                    (error as any).statusCode?.toString() ?? '',
+                    'Encountered an unexpected error when processing the request, please try again'
+                ),
+                scope,
+                initiatedByChat,
+                fileName
+            )
+        }
+        codeScanTelemetryEntry.reasonDesc =
+            (error as ToolkitError)?.code === 'ContentLengthError'
+                ? 'Payload size limit reached'
+                : getTelemetryReasonDesc(error)
+        codeScanTelemetryEntry.reason = (error as ToolkitError)?.code ?? 'DefaultError'
+        if (codeScanTelemetryEntry.codewhispererCodeScanJobId) {
+            TelemetryHelper.instance.sendCodeScanFailedEvent(
+                codeScanTelemetryEntry.codewhispererLanguage,
+                codeScanTelemetryEntry.codewhispererCodeScanJobId,
+                scope
+            )
+        }
+    } finally {
+        const scanState = scope === CodeAnalysisScope.PROJECT ? codeScanState : onDemandFileScanState
+        scanState.setToNotStarted()
+        scanState.getChatControllers()?.scanStopped.fire({
+            tabID: ChatSessionManager.Instance.getSession().tabID,
+            scanUuid,
+        })
+        codeScanTelemetryEntry.duration = performance.now() - codeScanStartTime
+        codeScanTelemetryEntry.codeScanServiceInvocationsDuration = performance.now() - serviceInvocationStartTime
+        await emitCodeScanTelemetry(codeScanTelemetryEntry)
+    }
+}
+
+export function showSecurityScanResults(
+    securityRecommendationCollection: AggregatedCodeScanIssue[],
+    editor: vscode.TextEditor | undefined,
+    context: vscode.ExtensionContext,
+    scope: CodeWhispererConstants.CodeAnalysisScope,
+    zipMetadata: ZipMetadata,
+    totalIssues: number
+) {
+    initSecurityScanRender(securityRecommendationCollection, editor, scope)
+
+    if (scope === CodeWhispererConstants.CodeAnalysisScope.PROJECT) {
+        populateCodeScanLogStream(zipMetadata.scannedFiles)
+    }
+}
+
+export function showScanResultsInChat(
+    securityPanelViewProvider: SecurityPanelViewProvider,
+    securityRecommendationCollection: AggregatedCodeScanIssue[],
+    editor: vscode.TextEditor | undefined,
+    context: vscode.ExtensionContext,
+    scope: CodeWhispererConstants.CodeAnalysisScope,
+    zipMetadata: ZipMetadata,
+    totalIssues: number,
+    scanUuid: string | undefined
+) {
+    const tabID = ChatSessionManager.Instance.getSession().tabID
+    const eventData = {
+        message: 'Show Findings in the Chat panel',
+        totalIssues,
+        securityRecommendationCollection,
+        fileName: scope === CodeAnalysisScope.FILE_ON_DEMAND ? [...zipMetadata.scannedFiles][0] : undefined,
+        tabID,
+        scope,
+        scanUuid,
+    }
+    switch (scope) {
+        case CodeAnalysisScope.PROJECT:
+            codeScanState.getChatControllers()?.showSecurityScan.fire(eventData)
+            break
+        case CodeAnalysisScope.FILE_ON_DEMAND:
+            onDemandFileScanState.getChatControllers()?.showSecurityScan.fire(eventData)
+            break
+        default:
+            break
+    }
+
+    initSecurityScanRender(securityRecommendationCollection, editor, scope)
+    if (totalIssues > 0) {
+        SecurityIssueTreeViewProvider.focus()
+    }
+
+    populateCodeScanLogStream(zipMetadata.scannedFiles)
+    if (scope === CodeAnalysisScope.PROJECT) {
+        showScanCompletedNotification(totalIssues, zipMetadata.scannedFiles)
+    }
+}
+
+export async function emitCodeScanTelemetry(codeScanTelemetryEntry: CodeScanTelemetryEntry) {
+    codeScanTelemetryEntry.codewhispererCodeScanProjectBytes = 0
+    telemetry.codewhisperer_securityScan.emit({
+        ...codeScanTelemetryEntry,
+        passive: codeScanTelemetryEntry.codewhispererCodeScanScope === CodeAnalysisScope.FILE_AUTO,
+    })
+}
+
+export function errorPromptHelper(
+    error: SecurityScanError,
+    scope: CodeAnalysisScope,
+    initiatedByChat: boolean,
+    fileName?: string,
+    scanUuid?: string
+) {
+    if (scope === CodeAnalysisScope.FILE_AUTO) {
+        return
+    }
+    if (initiatedByChat) {
+        const state = scope === CodeAnalysisScope.PROJECT ? codeScanState : onDemandFileScanState
+        state.getChatControllers()?.errorThrown.fire({
+            error,
+            tabID: ChatSessionManager.Instance.getSession().tabID,
+            scope,
+            fileName,
+            scanUuid,
+        })
+    }
+    if (error.code !== 'NoSourceFilesError') {
+        // Skip showing warning messages during tests to avoid interfering with test dialogs
+        if (process.env.NODE_ENV !== 'test') {
+            void vscode.window.showWarningMessage(getErrorMessage(error), ok)
+        }
+    }
+}
+
+function getErrorMessage(error: any): string {
+    switch (error.code) {
+        case 'ContentLengthError':
+            return ProjectSizeExceededErrorMessage
+        case 'MaximumProjectScanReachedError':
+        case 'MaximumFileScanReachedError':
+            return CodeWhispererConstants.monthlyLimitReachedNotification
+        default:
+            return error.customerFacingMessage
+    }
+}
+
+function populateCodeScanLogStream(scannedFiles: Set<string>) {
+    const [codeScanLogger, codeScanOutpuChan] = getLogOutputChan()
+    const numScannedFiles = scannedFiles.size
+    // Clear log
+    codeScanOutpuChan.clear()
+    if (numScannedFiles === 1) {
+        codeScanLogger.info(`${numScannedFiles} file was scanned during the last Security Scan.`)
+    } else {
+        codeScanLogger.info(`${numScannedFiles} files were scanned during the last Security Scan.`)
+    }
+    // Log all the scanned files to codeScanLogger
+    for (const file of scannedFiles) {
+        const uri = vscode.Uri.file(file)
+        codeScanLogger.info(`File scanned: ${uri.fsPath}`)
+    }
+}
+
+export async function confirmStopSecurityScan(
+    state: CodeScanState | OnDemandFileScanState,
+    initiatedByChat: boolean,
+    scope: CodeWhispererConstants.CodeAnalysisScope,
+    fileName: string | undefined,
+    scanUuid?: string
+) {
+    // Confirm if user wants to stop security scan
+    const resp = await vscode.window.showWarningMessage(CodeWhispererConstants.stopScanMessage, stopScanButton, cancel)
+    if (resp === stopScanButton && state.isRunning()) {
+        getLogger().verbose('User requested to stop security scan. Stopping security scan.')
+        state.setToCancelling()
+        if (initiatedByChat) {
+            const scanState = scope === CodeAnalysisScope.PROJECT ? codeScanState : onDemandFileScanState
+            const scopeText = scope === CodeAnalysisScope.PROJECT ? 'Project' : 'File'
+            scanState.getChatControllers()?.errorThrown.fire({
+                error: scopeText + CodeWhispererConstants.stopScanMessageInChat,
+                tabID: ChatSessionManager.Instance.getSession().tabID,
+                scope,
+                fileName,
+            })
+        }
+    }
+}
+
+function showScanCompletedNotification(total: number, scannedFiles: Set<string>) {
+    const items = [CodeWhispererConstants.showScannedFilesMessage]
+    void vscode.window.showInformationMessage(`Code Review Completed`, ...items).then((value) => {
+        if (total > 0 && value === CodeWhispererConstants.showScannedFilesMessage) {
+            SecurityIssueTreeViewProvider.focus()
+        }
+    })
+}
diff --git a/packages/core/src/codewhisperer/commands/startTransformByQ.ts b/packages/core/src/codewhisperer/commands/startTransformByQ.ts
new file mode 100644
index 00000000000..410465a55c1
--- /dev/null
+++ b/packages/core/src/codewhisperer/commands/startTransformByQ.ts
@@ -0,0 +1,867 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as fs from 'fs' // eslint-disable-line no-restricted-imports
+import path from 'path'
+import { getLogger } from '../../shared/logger/logger'
+import * as CodeWhispererConstants from '../models/constants'
+import * as localizedText from '../../shared/localizedText'
+import {
+    transformByQState,
+    StepProgress,
+    JDKVersion,
+    jobPlanProgress,
+    FolderInfo,
+    ZipManifest,
+    TransformationType,
+    TransformationCandidateProject,
+    RegionProfile,
+    sessionJobHistory,
+} from '../models/model'
+import {
+    createZipManifest,
+    downloadAndExtractResultArchive,
+    downloadHilResultArchive,
+    findDownloadArtifactStep,
+    getArtifactsFromProgressUpdate,
+    getTransformationSteps,
+    pollTransformationJob,
+    resumeTransformationJob,
+    startJob,
+    stopJob,
+    throwIfCancelled,
+    updateJobHistory,
+    uploadPayload,
+    zipCode,
+} from '../service/transformByQ/transformApiHandler'
+import {
+    getJavaProjects,
+    getOpenProjects,
+    validateOpenProjects,
+} from '../service/transformByQ/transformProjectValidationHandler'
+import {
+    prepareProjectDependencies,
+    runMavenDependencyUpdateCommands,
+} from '../service/transformByQ/transformMavenHandler'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { CodeTransformTelemetryState } from '../../amazonqGumby/telemetry/codeTransformTelemetryState'
+import { calculateTotalLatency } from '../../amazonqGumby/telemetry/codeTransformTelemetry'
+import { MetadataResult } from '../../shared/telemetry/telemetryClient'
+import { submitFeedback } from '../../feedback/vue/submitFeedback'
+import { placeholder } from '../../shared/vscode/commands2'
+import {
+    AlternateDependencyVersionsNotFoundError,
+    JobStartError,
+    ModuleUploadError,
+    PollJobError,
+    TransformationPreBuildError,
+} from '../../amazonqGumby/errors'
+import { ChatSessionManager } from '../../amazonqGumby/chat/storages/chatSession'
+import {
+    getCodeIssueSnippetFromPom,
+    getDependenciesFolderInfo,
+    getJsonValuesFromManifestFile,
+    highlightPomIssueInProject,
+    parseVersionsListFromPomFile,
+    writeAndShowBuildLogs,
+} from '../service/transformByQ/transformFileHandler'
+import { sleep } from '../../shared/utilities/timeoutUtils'
+import DependencyVersions from '../../amazonqGumby/models/dependencies'
+import { dependencyNoAvailableVersions } from '../../amazonqGumby/models/constants'
+import { HumanInTheLoopManager } from '../service/transformByQ/humanInTheLoopManager'
+import { setContext } from '../../shared/vscode/setContext'
+import globals from '../../shared/extensionGlobals'
+import { convertDateToTimestamp } from '../../shared/datetime'
+import { findStringInDirectory } from '../../shared/utilities/workspaceUtils'
+import { makeTemporaryToolkitFolder } from '../../shared/filesystemUtilities'
+import { AuthUtil } from '../util/authUtil'
+import {
+    cleanupTempJobFiles,
+    createMetadataFile,
+    JobMetadata,
+    writeToHistoryFile,
+} from '../service/transformByQ/transformationHistoryHandler'
+
+export function getFeedbackCommentData() {
+    const jobId = transformByQState.getJobId()
+    const s = `Q CodeTransformation jobId: ${jobId ? jobId : 'none'}`
+    return s
+}
+
+export async function processLanguageUpgradeTransformFormInput(
+    pathToProject: string,
+    fromJDKVersion: JDKVersion,
+    toJDKVersion: JDKVersion
+) {
+    transformByQState.setTransformationType(TransformationType.LANGUAGE_UPGRADE)
+    transformByQState.setProjectName(path.basename(pathToProject))
+    transformByQState.setProjectPath(pathToProject)
+    transformByQState.setSourceJDKVersion(fromJDKVersion)
+    transformByQState.setTargetJDKVersion(toJDKVersion)
+}
+
+export async function processSQLConversionTransformFormInput(pathToProject: string, schema: string) {
+    transformByQState.setTransformationType(TransformationType.SQL_CONVERSION)
+    transformByQState.setProjectName(path.basename(pathToProject))
+    transformByQState.setProjectPath(pathToProject)
+    transformByQState.setSchema(schema)
+    // use dummy values of JDK8 & JDK17 so that startJob API can be called
+    transformByQState.setSourceJDKVersion(JDKVersion.JDK8)
+    transformByQState.setTargetJDKVersion(JDKVersion.JDK17)
+}
+
+export async function compileProject() {
+    try {
+        const dependenciesFolder: FolderInfo = await getDependenciesFolderInfo()
+        transformByQState.setDependencyFolderInfo(dependenciesFolder)
+        const projectPath = transformByQState.getProjectPath()
+        await prepareProjectDependencies(dependenciesFolder.path, projectPath)
+    } catch (err) {
+        // open build-logs.txt file to show user error logs
+        await writeAndShowBuildLogs(true)
+        throw err
+    }
+}
+
+export function startInterval() {
+    const intervalId = setInterval(() => {
+        void vscode.commands.executeCommand(
+            'aws.amazonq.showPlanProgressInHub',
+            CodeTransformTelemetryState.instance.getStartTime()
+        )
+        updateJobHistory()
+    }, CodeWhispererConstants.transformationJobPollingIntervalSeconds * 1000)
+    transformByQState.setIntervalId(intervalId)
+}
+
+export async function startTransformByQ() {
+    // Set the default state variables for our store and the UI
+    const transformStartTime = globals.clock.Date.now()
+    await setTransformationToRunningState()
+
+    try {
+        const profile = AuthUtil.instance.regionProfileManager.activeRegionProfile
+        // Set webview UI to poll for progress
+        startInterval()
+
+        // step 1: CreateUploadUrl and upload code
+        const uploadId = await preTransformationUploadCode()
+
+        // step 2: StartJob and store the returned jobId in TransformByQState
+        const jobId = await startTransformationJob(uploadId, transformStartTime, profile)
+
+        // step 3 (intermediate step): show transformation-plan.md file
+        await pollTransformationStatusUntilPlanReady(jobId)
+
+        // step 4: poll until artifacts are ready to download
+        await humanInTheLoopRetryLogic(jobId, profile)
+    } catch (error: any) {
+        await transformationJobErrorHandler(error)
+    } finally {
+        await postTransformationJob()
+        await cleanupTransformationJob()
+    }
+}
+
+/**
+ *  The whileLoop condition WaitingUserInput is set inside pollTransformationStatusUntilComplete
+ *  when we see a `PAUSED` state. If this is the case once completeHumanInTheLoopWork the
+ *  WaitingUserInput should still be set until pollTransformationStatusUntilComplete is called again.
+ *  We only don't want to continue calling pollTransformationStatusUntilComplete if there is no HIL
+ *  state ever engaged or we have reached our max amount of HIL retries.
+ */
+export async function humanInTheLoopRetryLogic(jobId: string, profile: RegionProfile | undefined) {
+    let status = ''
+    try {
+        status = await pollTransformationStatusUntilComplete(jobId, profile)
+        if (status === 'PAUSED') {
+            const hilStatusFailure = await initiateHumanInTheLoopPrompt(jobId)
+            if (hilStatusFailure) {
+                // resume polling
+                void humanInTheLoopRetryLogic(jobId, profile)
+            }
+        } else {
+            await finalizeTransformByQ(status)
+        }
+    } catch (error) {
+        status = 'FAILED'
+        await finalizeTransformByQ(status)
+        throw error
+    }
+}
+
+export async function finalizeTransformByQ(status: string) {
+    try {
+        // Set the result state variables for our store and the UI
+        await finalizeTransformationJob(status)
+    } catch (error: any) {
+        await transformationJobErrorHandler(error)
+    }
+}
+
+export async function preTransformationUploadCode() {
+    await vscode.commands.executeCommand('aws.amazonq.transformationHub.focus')
+
+    void vscode.window.showInformationMessage(CodeWhispererConstants.jobStartedNotification, {
+        title: localizedText.ok,
+    })
+
+    let uploadId = ''
+    throwIfCancelled()
+    try {
+        await telemetry.codeTransform_uploadProject.run(async () => {
+            telemetry.record({ codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId() })
+
+            const transformZipManifest = new ZipManifest()
+            // if the user chose to skip unit tests, add the custom build command here
+            transformZipManifest.customBuildCommand = transformByQState.getCustomBuildCommand()
+            const zipCodeResult = await zipCode({
+                // dependenciesFolder will be undefined for SQL conversions since we don't compileProject
+                dependenciesFolder: transformByQState.getDependencyFolderInfo(),
+                projectPath: transformByQState.getProjectPath(),
+                zipManifest: transformZipManifest,
+            })
+
+            const payloadFilePath = zipCodeResult.tempFilePath
+            const zipSize = zipCodeResult.fileSize
+
+            telemetry.record({
+                codeTransformTotalByteSize: zipSize,
+            })
+
+            transformByQState.setPayloadFilePath(payloadFilePath)
+            uploadId = await uploadPayload(payloadFilePath, AuthUtil.instance.regionProfileManager.activeRegionProfile)
+            telemetry.record({ codeTransformJobId: uploadId }) // uploadId is re-used as jobId
+        })
+    } catch (err) {
+        const errorMessage = (err as Error).message
+        transformByQState.setJobFailureErrorNotification(
+            `${CodeWhispererConstants.failedToUploadProjectNotification} ${errorMessage}`
+        )
+        transformByQState.setJobFailureErrorChatMessage(
+            `${CodeWhispererConstants.failedToUploadProjectChatMessage} ${errorMessage}`
+        )
+
+        transformByQState.getChatControllers()?.errorThrown.fire({
+            error: new ModuleUploadError(),
+            tabID: ChatSessionManager.Instance.getSession().tabID,
+        })
+        getLogger().error(errorMessage)
+        throw err
+    }
+
+    throwIfCancelled()
+    await sleep(2000) // sleep before starting job to prevent ThrottlingException
+
+    return uploadId
+}
+
+export async function initiateHumanInTheLoopPrompt(jobId: string) {
+    try {
+        const profile = AuthUtil.instance.regionProfileManager.activeRegionProfile
+        const humanInTheLoopManager = HumanInTheLoopManager.instance
+        // 1) We need to call GetTransformationPlan to get artifactId
+        const transformationSteps = await getTransformationSteps(jobId, profile)
+        const { transformationStep, progressUpdate } = findDownloadArtifactStep(transformationSteps)
+
+        if (!transformationStep || !progressUpdate) {
+            throw new Error('Transformation step or progress update is undefined')
+        }
+
+        const { artifactId, artifactType } = getArtifactsFromProgressUpdate(progressUpdate)
+
+        // Early exit safeguard incase artifactId or artifactType are undefined
+        if (!artifactId || !artifactType) {
+            throw new Error('artifactId or artifactType is undefined')
+        }
+
+        // 2) We need to call DownloadResultArchive to get the manifest and pom.xml
+        const { pomFileVirtualFileReference, manifestFileVirtualFileReference } = await downloadHilResultArchive(
+            jobId,
+            artifactId,
+            humanInTheLoopManager.getTmpDownloadsDir()
+        )
+        humanInTheLoopManager.setPomFileVirtualFileReference(pomFileVirtualFileReference)
+        const manifestFileValues = await getJsonValuesFromManifestFile(manifestFileVirtualFileReference)
+        humanInTheLoopManager.setManifestFileValues(manifestFileValues)
+
+        // 3) We need to replace version in pom.xml
+        const newPomFileVirtualFileReference = await humanInTheLoopManager.createPomFileCopy(
+            humanInTheLoopManager.getTmpDependencyListDir(),
+            pomFileVirtualFileReference
+        )
+        humanInTheLoopManager.setNewPomFileVirtualFileReference(newPomFileVirtualFileReference)
+        await humanInTheLoopManager.replacePomFileVersion(
+            newPomFileVirtualFileReference,
+            manifestFileValues.sourcePomVersion
+        )
+
+        const codeSnippet = await getCodeIssueSnippetFromPom(newPomFileVirtualFileReference)
+        // Let the user know we've entered the loop in the chat
+        transformByQState.getChatControllers()?.humanInTheLoopStartIntervention.fire({
+            tabID: ChatSessionManager.Instance.getSession().tabID,
+            codeSnippet,
+        })
+
+        // 4) We need to run maven commands on that pom.xml to get available versions
+        const compileFolderInfo = humanInTheLoopManager.getCompileDependencyListFolderInfo()
+        runMavenDependencyUpdateCommands(compileFolderInfo)
+        const xmlString = await humanInTheLoopManager.getDependencyListXmlOutput()
+        const { latestVersion, majorVersions, minorVersions, status } = await parseVersionsListFromPomFile(xmlString)
+
+        if (status === dependencyNoAvailableVersions) {
+            // let user know and early exit for human in the loop happened because no upgrade versions available
+            const error = new AlternateDependencyVersionsNotFoundError()
+
+            transformByQState.getChatControllers()?.errorThrown.fire({
+                error,
+                tabID: ChatSessionManager.Instance.getSession().tabID,
+            })
+
+            throw error
+        }
+
+        const dependencies = new DependencyVersions(
+            latestVersion,
+            majorVersions,
+            minorVersions,
+            manifestFileValues.sourcePomVersion
+        )
+
+        // 5) We need to wait for user input
+        // This is asynchronous, so we have to wait to be called to complete this loop
+        transformByQState.getChatControllers()?.humanInTheLoopPromptUserForDependency.fire({
+            tabID: ChatSessionManager.Instance.getSession().tabID,
+            dependencies,
+        })
+    } catch (err: any) {
+        try {
+            // Regardless of the error,
+            // Continue transformation flow
+            await terminateHILEarly(jobId)
+        } finally {
+            transformByQState.getChatControllers()?.errorThrown.fire({
+                error: err,
+                tabID: ChatSessionManager.Instance.getSession().tabID,
+            })
+        }
+        CodeTransformTelemetryState.instance.setCodeTransformMetaDataField({
+            errorMessage: err.message,
+        })
+        await HumanInTheLoopManager.instance.cleanUpArtifacts()
+        return true
+    } finally {
+        await sleep(1000)
+        telemetry.codeTransform_humanInTheLoop.emit({
+            codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+            codeTransformJobId: jobId,
+            codeTransformMetadata: CodeTransformTelemetryState.instance.getCodeTransformMetaDataString(),
+            result: MetadataResult.Fail,
+            // TODO: make a generic reason field for telemetry logging so we don't log sensitive PII data
+            reason: 'Runtime error occurred',
+        })
+    }
+    return false
+}
+
+export async function openHilPomFile() {
+    const humanInTheLoopManager = HumanInTheLoopManager.instance
+    await highlightPomIssueInProject(
+        humanInTheLoopManager.getNewPomFileVirtualFileReference(),
+        HumanInTheLoopManager.instance.diagnosticCollection,
+        humanInTheLoopManager.getManifestFileValues().sourcePomVersion
+    )
+}
+
+export async function terminateHILEarly(jobID: string) {
+    // Call resume with "REJECTED" state which will put our service
+    // back into the normal flow and will not trigger HIL again for this step
+    await resumeTransformationJob(jobID, 'REJECTED')
+}
+
+export async function finishHumanInTheLoop(selectedDependency?: string) {
+    let successfulFeedbackLoop = true
+    const jobId = transformByQState.getJobId()
+    let hilResult: MetadataResult = MetadataResult.Pass
+    const profile = AuthUtil.instance.regionProfileManager.activeRegionProfile
+    try {
+        if (!selectedDependency) {
+            throw new Error('No dependency selected')
+        }
+        const humanInTheLoopManager = HumanInTheLoopManager.instance
+        const manifestFileValues = humanInTheLoopManager.getManifestFileValues()
+        const getUserInputValue = selectedDependency
+
+        CodeTransformTelemetryState.instance.setCodeTransformMetaDataField({
+            dependencyVersionSelected: selectedDependency,
+        })
+        // 6) We need to add user input to that pom.xml,
+        // original pom.xml is intact somewhere, and run maven compile
+        const userInputPomFileVirtualFileReference = await humanInTheLoopManager.createPomFileCopy(
+            humanInTheLoopManager.getUserDependencyUpdateDir(),
+            humanInTheLoopManager.getPomFileVirtualFileReference()
+        )
+        await humanInTheLoopManager.replacePomFileVersion(userInputPomFileVirtualFileReference, getUserInputValue)
+
+        // 7) We need to take that output of maven and use CreateUploadUrl
+        const uploadFolderInfo = humanInTheLoopManager.getUploadFolderInfo()
+        await prepareProjectDependencies(uploadFolderInfo.path, uploadFolderInfo.path)
+        // zipCode side effects deletes the uploadFolderInfo right away
+        const uploadResult = await zipCode({
+            dependenciesFolder: uploadFolderInfo,
+            zipManifest: createZipManifest({
+                hilZipParams: {
+                    pomGroupId: manifestFileValues.pomGroupId,
+                    pomArtifactId: manifestFileValues.pomArtifactId,
+                    targetPomVersion: getUserInputValue,
+                },
+            }),
+        })
+
+        await uploadPayload(uploadResult.tempFilePath, profile, {
+            transformationUploadContext: {
+                jobId,
+                uploadArtifactType: 'Dependencies',
+            },
+        })
+
+        // inform user in chat
+        transformByQState.getChatControllers()?.humanInTheLoopSelectionUploaded.fire({
+            tabID: ChatSessionManager.Instance.getSession().tabID,
+        })
+
+        // 8) Once code has been uploaded we will restart the job
+        await resumeTransformationJob(jobId, 'COMPLETED')
+
+        void humanInTheLoopRetryLogic(jobId, profile)
+    } catch (err: any) {
+        successfulFeedbackLoop = false
+        CodeTransformTelemetryState.instance.setCodeTransformMetaDataField({
+            errorMessage: err.message,
+        })
+        hilResult = MetadataResult.Fail
+
+        // If anything went wrong in HIL state, we should restart the job
+        // with the rejected state
+        await terminateHILEarly(jobId)
+        void humanInTheLoopRetryLogic(jobId, profile)
+    } finally {
+        telemetry.codeTransform_humanInTheLoop.emit({
+            codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+            codeTransformJobId: jobId,
+            codeTransformMetadata: CodeTransformTelemetryState.instance.getCodeTransformMetaDataString(),
+            result: hilResult,
+            reason: hilResult === MetadataResult.Fail ? 'Runtime error occurred' : undefined,
+        })
+        await HumanInTheLoopManager.instance.cleanUpArtifacts()
+    }
+
+    return successfulFeedbackLoop
+}
+
+export async function startTransformationJob(
+    uploadId: string,
+    transformStartTime: number,
+    profile: RegionProfile | undefined
+) {
+    let jobId = ''
+    try {
+        await telemetry.codeTransform_jobStart.run(async () => {
+            telemetry.record({ codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId() })
+
+            jobId = await startJob(uploadId, profile)
+            getLogger().info(`CodeTransformation: jobId: ${jobId}`)
+
+            telemetry.record({
+                codeTransformJobId: jobId,
+                codeTransformRunTimeLatency: calculateTotalLatency(transformStartTime),
+            })
+        })
+
+        // create local history folder(s) and store metadata
+        const metadata: JobMetadata = {
+            jobId: jobId,
+            projectName: transformByQState.getProjectName(),
+            transformationType: transformByQState.getTransformationType() ?? TransformationType.LANGUAGE_UPGRADE,
+            sourceJDKVersion: transformByQState.getSourceJDKVersion() ?? JDKVersion.JDK8,
+            targetJDKVersion: transformByQState.getTargetJDKVersion() ?? JDKVersion.JDK17,
+            customDependencyVersionFilePath: transformByQState.getCustomDependencyVersionFilePath(),
+            customBuildCommand: transformByQState.getCustomBuildCommand(),
+            targetJavaHome: transformByQState.getTargetJavaHome() ?? '',
+            projectPath: transformByQState.getProjectPath(),
+            startTime: transformByQState.getStartTime(),
+        }
+
+        const jobHistoryPath = await createMetadataFile(transformByQState.getPayloadFilePath(), metadata)
+        transformByQState.setJobHistoryPath(jobHistoryPath)
+    } catch (error) {
+        getLogger().error(`CodeTransformation: ${CodeWhispererConstants.failedToStartJobNotification}`, error)
+        const errorMessage = (error as Error).message.toLowerCase()
+        if (errorMessage.includes('too many active running jobs')) {
+            transformByQState.setJobFailureErrorNotification(CodeWhispererConstants.tooManyJobsNotification)
+            transformByQState.setJobFailureErrorChatMessage(CodeWhispererConstants.tooManyJobsChatMessage)
+        } else if (errorMessage.includes('lines of code limit breached')) {
+            transformByQState.setJobFailureErrorNotification(
+                CodeWhispererConstants.linesOfCodeLimitBreachedNotification
+            )
+            transformByQState.setJobFailureErrorChatMessage(CodeWhispererConstants.linesOfCodeLimitBreachedChatMessage)
+        } else {
+            transformByQState.setJobFailureErrorNotification(
+                `${CodeWhispererConstants.failedToStartJobNotification} ${errorMessage}`
+            )
+            transformByQState.setJobFailureErrorChatMessage(
+                `${CodeWhispererConstants.failedToStartJobChatMessage} ${errorMessage}`
+            )
+        }
+        throw new JobStartError()
+    }
+
+    await sleep(5000) // sleep before polling job status to prevent ThrottlingException
+    throwIfCancelled()
+
+    return jobId
+}
+
+export async function pollTransformationStatusUntilPlanReady(jobId: string, profile?: RegionProfile) {
+    try {
+        await pollTransformationJob(jobId, CodeWhispererConstants.validStatesForPlanGenerated, profile)
+    } catch (error) {
+        getLogger().error(`CodeTransformation: ${CodeWhispererConstants.failedToCompleteJobNotification}`, error)
+
+        if (!transformByQState.getJobFailureErrorNotification()) {
+            transformByQState.setJobFailureErrorNotification(CodeWhispererConstants.failedToCompleteJobNotification)
+        }
+        if (!transformByQState.getJobFailureErrorChatMessage()) {
+            transformByQState.setJobFailureErrorChatMessage(CodeWhispererConstants.failedToCompleteJobChatMessage)
+        }
+
+        // try to download pre-build error logs if available
+        let pathToLog = ''
+        try {
+            const tempToolkitFolder = await makeTemporaryToolkitFolder()
+            const tempBuildLogsDir = path.join(tempToolkitFolder, 'q-transformation-build-logs')
+            await downloadAndExtractResultArchive(jobId, tempBuildLogsDir)
+            pathToLog = path.join(tempBuildLogsDir, 'buildCommandOutput.log')
+            transformByQState.setPreBuildLogFilePath(pathToLog)
+        } catch (e) {
+            transformByQState.setPreBuildLogFilePath('')
+            getLogger().error(
+                'CodeTransformation: failed to download any possible build error logs: ' + (e as Error).message
+            )
+            throw e
+        }
+
+        if (fs.existsSync(pathToLog) && !transformByQState.isCancelled()) {
+            throw new TransformationPreBuildError()
+        } else {
+            // not strictly needed to reset path here and above; doing it just to represent unavailable logs
+            transformByQState.setPreBuildLogFilePath('')
+            throw new PollJobError()
+        }
+    }
+    if (transformByQState.getTransformationType() === TransformationType.SQL_CONVERSION) {
+        // for now, no plan shown with SQL conversions. later, we may add one
+        return
+    }
+    jobPlanProgress['generatePlan'] = StepProgress.Succeeded
+    throwIfCancelled()
+}
+
+export async function pollTransformationStatusUntilComplete(jobId: string, profile: RegionProfile | undefined) {
+    let status = ''
+    try {
+        status = await pollTransformationJob(jobId, CodeWhispererConstants.validStatesForCheckingDownloadUrl, profile)
+    } catch (error) {
+        getLogger().error(`CodeTransformation: ${CodeWhispererConstants.failedToCompleteJobNotification}`, error)
+        if (!transformByQState.getJobFailureErrorNotification()) {
+            transformByQState.setJobFailureErrorNotification(CodeWhispererConstants.failedToCompleteJobNotification)
+        }
+        if (!transformByQState.getJobFailureErrorChatMessage()) {
+            transformByQState.setJobFailureErrorChatMessage(CodeWhispererConstants.failedToCompleteJobChatMessage)
+        }
+        throw new PollJobError()
+    }
+
+    return status
+}
+
+export async function finalizeTransformationJob(status: string) {
+    if (!(status === 'COMPLETED' || status === 'PARTIALLY_COMPLETED')) {
+        getLogger().error(`CodeTransformation: ${CodeWhispererConstants.failedToCompleteJobNotification}`)
+        jobPlanProgress['transformCode'] = StepProgress.Failed
+        if (!transformByQState.getJobFailureErrorNotification()) {
+            transformByQState.setJobFailureErrorNotification(CodeWhispererConstants.failedToCompleteJobNotification)
+        }
+        if (!transformByQState.getJobFailureErrorChatMessage()) {
+            transformByQState.setJobFailureErrorChatMessage(CodeWhispererConstants.failedToCompleteJobChatMessage)
+        }
+        throw new Error('Job was not successful nor partially successful')
+    }
+    transformByQState.setToSucceeded()
+    if (status === 'PARTIALLY_COMPLETED') {
+        transformByQState.setToPartiallySucceeded()
+    }
+    await vscode.commands.executeCommand('aws.amazonq.transformationHub.reviewChanges.reveal')
+    jobPlanProgress['transformCode'] = StepProgress.Succeeded
+}
+
+export async function getValidLanguageUpgradeCandidateProjects() {
+    const openProjects = await getOpenProjects()
+    const javaMavenProjects = await validateOpenProjects(openProjects)
+    getLogger().info(`CodeTransformation: found ${javaMavenProjects.length} projects eligible for language upgrade`)
+    return javaMavenProjects
+}
+
+export async function getValidSQLConversionCandidateProjects() {
+    const embeddedSQLProjects: TransformationCandidateProject[] = []
+    await telemetry.codeTransform_validateProject.run(async () => {
+        telemetry.record({
+            codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+        })
+        const openProjects = await getOpenProjects()
+        const javaProjects = await getJavaProjects(openProjects)
+        let resultLog = ''
+        for (const project of javaProjects) {
+            // as long as at least one of these strings is found, project contains embedded SQL statements
+            const searchStrings = ['oracle.jdbc.', 'jdbc:oracle:', 'jdbc:odbc:']
+            for (const str of searchStrings) {
+                const spawnResult = await findStringInDirectory(str, project.path)
+                // just for telemetry purposes
+                if (spawnResult.error || spawnResult.stderr) {
+                    resultLog += `search error: ${JSON.stringify(spawnResult)}--`
+                } else {
+                    resultLog += `search complete (exit code: ${spawnResult.exitCode})--`
+                }
+                getLogger().info(`CodeTransformation: searching for ${str} in ${project.path}, result = ${resultLog}`)
+                if (spawnResult.exitCode === 0) {
+                    embeddedSQLProjects.push(project)
+                    break
+                }
+            }
+        }
+        getLogger().info(
+            `CodeTransformation: found ${embeddedSQLProjects.length} projects with embedded SQL statements`
+        )
+        telemetry.record({
+            codeTransformMetadata: resultLog,
+        })
+    })
+    return embeddedSQLProjects
+}
+
+export async function setTransformationToRunningState() {
+    await setContextVariables()
+    await vscode.commands.executeCommand('aws.amazonq.transformationHub.reviewChanges.reset')
+    transformByQState.setToRunning()
+    jobPlanProgress['uploadCode'] = StepProgress.Pending
+    jobPlanProgress['buildCode'] = StepProgress.Pending
+    jobPlanProgress['generatePlan'] = StepProgress.Pending
+    jobPlanProgress['transformCode'] = StepProgress.Pending
+    transformByQState.resetPlanSteps()
+    transformByQState.resetSessionJobHistory()
+    transformByQState.setJobId('') // so that details for last job are not overwritten when running one job after another
+    transformByQState.setPolledJobStatus('') // so that previous job's status does not display at very beginning of this job
+    transformByQState.setHasSeenTransforming(false)
+
+    CodeTransformTelemetryState.instance.setStartTime()
+    transformByQState.setStartTime(
+        convertDateToTimestamp(new Date(CodeTransformTelemetryState.instance.getStartTime()))
+    )
+
+    await vscode.commands.executeCommand('workbench.view.extension.aws-codewhisperer-transformation-hub')
+}
+
+export async function postTransformationJob() {
+    updateJobHistory()
+    if (jobPlanProgress['uploadCode'] !== StepProgress.Succeeded) {
+        jobPlanProgress['uploadCode'] = StepProgress.Failed
+    }
+    if (jobPlanProgress['buildCode'] !== StepProgress.Succeeded) {
+        jobPlanProgress['buildCode'] = StepProgress.Failed
+    }
+    if (jobPlanProgress['generatePlan'] !== StepProgress.Succeeded) {
+        jobPlanProgress['generatePlan'] = StepProgress.Failed
+    }
+    if (jobPlanProgress['transformCode'] !== StepProgress.Succeeded) {
+        jobPlanProgress['transformCode'] = StepProgress.Failed
+    }
+
+    let chatMessage = transformByQState.getJobFailureErrorChatMessage()
+    if (transformByQState.isSucceeded()) {
+        chatMessage = CodeWhispererConstants.jobCompletedChatMessage
+    } else if (transformByQState.isPartiallySucceeded()) {
+        chatMessage = CodeWhispererConstants.jobPartiallyCompletedChatMessage
+    }
+
+    if (transformByQState.getSourceJDKVersion() !== transformByQState.getTargetJDKVersion()) {
+        chatMessage += CodeWhispererConstants.upgradeLibrariesMessage
+    }
+
+    transformByQState.getChatControllers()?.transformationFinished.fire({
+        message: chatMessage,
+        tabID: ChatSessionManager.Instance.getSession().tabID,
+    })
+    const durationInMs = calculateTotalLatency(CodeTransformTelemetryState.instance.getStartTime())
+    const resultStatusMessage = transformByQState.getStatus()
+
+    telemetry.codeTransform_totalRunTime.emit({
+        codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+        codeTransformJobId: transformByQState.getJobId(),
+        codeTransformResultStatusMessage: resultStatusMessage,
+        codeTransformRunTimeLatency: durationInMs,
+        reason: transformByQState.getPolledJobStatus(),
+        result:
+            transformByQState.isSucceeded() || transformByQState.isPartiallySucceeded()
+                ? MetadataResult.Pass
+                : MetadataResult.Fail,
+    })
+
+    let notificationMessage = ''
+
+    if (transformByQState.isSucceeded()) {
+        notificationMessage = CodeWhispererConstants.jobCompletedNotification
+        if (transformByQState.getSourceJDKVersion() !== transformByQState.getTargetJDKVersion()) {
+            notificationMessage += CodeWhispererConstants.upgradeLibrariesMessage
+        }
+        void vscode.window.showInformationMessage(notificationMessage, {
+            title: localizedText.ok,
+        })
+    } else if (transformByQState.isPartiallySucceeded()) {
+        notificationMessage = CodeWhispererConstants.jobPartiallyCompletedNotification
+        if (transformByQState.getSourceJDKVersion() !== transformByQState.getTargetJDKVersion()) {
+            notificationMessage += CodeWhispererConstants.upgradeLibrariesMessage
+        }
+        void vscode.window
+            .showInformationMessage(notificationMessage, CodeWhispererConstants.amazonQFeedbackText)
+            .then((choice) => {
+                if (choice === CodeWhispererConstants.amazonQFeedbackText) {
+                    void submitFeedback(
+                        placeholder,
+                        CodeWhispererConstants.amazonQFeedbackKey,
+                        getFeedbackCommentData()
+                    )
+                }
+            })
+    }
+
+    await cleanupTempJobFiles(
+        transformByQState.getJobHistoryPath(),
+        transformByQState.getPolledJobStatus(),
+        transformByQState.getPayloadFilePath()
+    )
+
+    // attempt download for user
+    // TODO: refactor as explained here https://github.com/aws/aws-toolkit-vscode/pull/6519/files#r1946873107
+    if (transformByQState.isSucceeded() || transformByQState.isPartiallySucceeded()) {
+        await vscode.commands.executeCommand('aws.amazonq.transformationHub.reviewChanges.startReview')
+    }
+
+    // store job details and diff path locally (history)
+    // TODO: ideally when job is cancelled, should be stored as CANCELLED instead of FAILED (remove this if statement after bug is fixed)
+    if (!transformByQState.isCancelled()) {
+        const latest = sessionJobHistory[transformByQState.getJobId()]
+        await writeToHistoryFile(
+            latest.startTime,
+            latest.projectName,
+            latest.status,
+            latest.duration,
+            transformByQState.getJobId(),
+            transformByQState.getJobHistoryPath(),
+            latest.transformationType,
+            latest.sourceJDKVersion,
+            latest.targetJDKVersion,
+            latest.customDependencyVersionsFilePath,
+            latest.customBuildCommand
+        )
+    }
+}
+
+export async function transformationJobErrorHandler(error: any) {
+    if (!transformByQState.isCancelled()) {
+        // means some other error occurred; cancellation already handled by now with stopTransformByQ
+        transformByQState.setToFailed()
+        transformByQState.setPolledJobStatus('FAILED')
+        // jobFailureErrorNotification should always be defined here
+        transformByQState.setJobFailureErrorChatMessage(
+            transformByQState.getJobFailureErrorChatMessage() ?? CodeWhispererConstants.failedToCompleteJobChatMessage
+        )
+    } else {
+        transformByQState.setToCancelled()
+        transformByQState.setPolledJobStatus('CANCELLED')
+    }
+    getLogger().error(`CodeTransformation: ${error.message}`)
+
+    transformByQState.getChatControllers()?.errorThrown.fire({
+        error,
+        tabID: ChatSessionManager.Instance.getSession().tabID,
+    })
+}
+
+export async function cleanupTransformationJob() {
+    clearInterval(transformByQState.getIntervalId())
+    transformByQState.setJobDefaults()
+    await setContext('gumby.isStopButtonAvailable', false)
+    await vscode.commands.executeCommand(
+        'aws.amazonq.showPlanProgressInHub',
+        CodeTransformTelemetryState.instance.getStartTime()
+    )
+    CodeTransformTelemetryState.instance.resetCodeTransformMetaDataField()
+}
+
+export async function stopTransformByQ(jobId: string) {
+    await telemetry.codeTransform_jobIsCancelledByUser.run(async () => {
+        telemetry.record({
+            codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+            codeTransformJobId: jobId,
+        })
+        if (transformByQState.isRunning()) {
+            getLogger().info('CodeTransformation: User requested to stop transformation. Stopping transformation.')
+            transformByQState.setToCancelled()
+            transformByQState.setPolledJobStatus('CANCELLED')
+            await setContext('gumby.isStopButtonAvailable', false)
+            try {
+                await stopJob(jobId)
+                void vscode.window
+                    .showErrorMessage(
+                        CodeWhispererConstants.jobCancelledNotification,
+                        CodeWhispererConstants.amazonQFeedbackText
+                    )
+                    .then((choice) => {
+                        if (choice === CodeWhispererConstants.amazonQFeedbackText) {
+                            void submitFeedback(
+                                placeholder,
+                                CodeWhispererConstants.amazonQFeedbackKey,
+                                getFeedbackCommentData()
+                            )
+                        }
+                    })
+            } catch (err) {
+                void vscode.window
+                    .showErrorMessage(
+                        CodeWhispererConstants.errorStoppingJobNotification,
+                        CodeWhispererConstants.amazonQFeedbackText
+                    )
+                    .then((choice) => {
+                        if (choice === CodeWhispererConstants.amazonQFeedbackText) {
+                            void submitFeedback(
+                                placeholder,
+                                CodeWhispererConstants.amazonQFeedbackKey,
+                                getFeedbackCommentData()
+                            )
+                        }
+                    })
+                getLogger().error(`CodeTransformation: Error stopping transformation ${err}`)
+            }
+        }
+    })
+}
+
+async function setContextVariables() {
+    await setContext('gumby.wasQCodeTransformationUsed', true)
+    await setContext('gumby.isStopButtonAvailable', true)
+    await setContext('gumby.isPlanAvailable', false)
+    await setContext('gumby.isSummaryAvailable', false)
+}
diff --git a/packages/core/src/codewhisperer/commands/types.ts b/packages/core/src/codewhisperer/commands/types.ts
new file mode 100644
index 00000000000..cec28829507
--- /dev/null
+++ b/packages/core/src/codewhisperer/commands/types.ts
@@ -0,0 +1,40 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ExtStartUpSources } from '../../shared/telemetry/util'
+import { CompositeKey, Commands, vscodeComponent } from '../../shared/vscode/commands2'
+
+/** Indicates a CodeWhisperer command was executed through a tree node */
+export const cwTreeNodeSource = 'codewhispererTreeNode'
+/** Indicates a CodeWhisperer command was executed through a quick pick item */
+export const cwQuickPickSource = 'codewhispererQuickPick'
+/** Indicates a CodeWhisperer command was executed through the Amazon Q chat pane */
+export const amazonQChatSource = 'amazonQChat'
+/** Indicates a CodeWhisperer command was executed during the first start of the extension */
+export const firstStartUpSource = ExtStartUpSources.firstStartUp
+/** Indicates a CodeWhisperer command was executed as a result of selecting an ellipses menu item */
+export const cwEllipsesMenu = 'ellipsesMenu'
+/** Indicates a CodeWhisperer command was executed from the command palette */
+export const commandPalette = 'commandPalette'
+/** Indicates a CodeWhisperer command was executed as a result of a toast message interaction */
+export const toastMessage = 'toastMessage'
+
+/**
+ * Indicates what caused the CodeWhisperer command to be executed, since a command can be executed from different "sources"
+ *
+ * This source is mainly used for telemetry purposes, setting the `source` field in the command execution metric.
+ *
+ * **This is typically used in conjunction with {@link CompositeKey} and {@link Commands} even though
+ * the value may not be explicitly used.**
+ */
+export type CodeWhispererSource =
+    | typeof cwQuickPickSource
+    | typeof cwTreeNodeSource
+    | typeof vscodeComponent
+    | typeof amazonQChatSource
+    | typeof firstStartUpSource
+    | typeof cwEllipsesMenu
+    | typeof commandPalette
+    | typeof toastMessage
diff --git a/packages/core/src/codewhisperer/index.ts b/packages/core/src/codewhisperer/index.ts
new file mode 100644
index 00000000000..066e5ca2fcb
--- /dev/null
+++ b/packages/core/src/codewhisperer/index.ts
@@ -0,0 +1,108 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export { activate, shutdown } from './activation'
+export * from './util/authUtil'
+export * from './models/model'
+export * from './models/constants'
+export * from './commands/basicCommands'
+export * from './commands/types'
+export type {
+    TransformationProgressUpdate,
+    TransformationStep,
+    FeatureEvaluation,
+    ListFeatureEvaluationsResponse,
+    GenerateCompletionsRequest,
+    Completion,
+    SendTelemetryEventResponse,
+    TelemetryEvent,
+    InlineChatEvent,
+    Customization,
+} from './client/codewhispereruserclient.d.ts'
+export type { default as CodeWhispererUserClient } from './client/codewhispereruserclient.d.ts'
+export { SecurityPanelViewProvider } from './views/securityPanelViewProvider'
+export { isInlineCompletionEnabled } from './util/commonUtil'
+export {
+    DefaultCodeWhispererClient,
+    Recommendation,
+    ListCodeScanFindingsResponse,
+    ListRecommendationsResponse,
+    RecommendationsList,
+    FileContext,
+    ListRecommendationsRequest,
+    GenerateRecommendationsRequest,
+    codeWhispererClient,
+} from './client/codewhisperer'
+export { listCodeWhispererCommands, listCodeWhispererCommandsId } from './ui/statusBarMenu'
+export { InlineCompletionService } from './service/inlineCompletionService'
+export { refreshStatusBar, CodeWhispererStatusBarManager } from './service/statusBar'
+export { SecurityIssueHoverProvider } from './service/securityIssueHoverProvider'
+export { SecurityIssueCodeActionProvider } from './service/securityIssueCodeActionProvider'
+export {
+    SecurityIssueTreeViewProvider,
+    SecurityViewTreeItem,
+    FileItem,
+    IssueItem,
+    SeverityItem,
+} from './service/securityIssueTreeViewProvider'
+export { onAcceptance } from './commands/onAcceptance'
+export { CodeWhispererTracker } from './tracker/codewhispererTracker'
+export { CodeWhispererUserGroupSettings } from './util/userGroupUtil'
+export { session } from './util/codeWhispererSession'
+export { onInlineAcceptance } from './commands/onInlineAcceptance'
+export { stopTransformByQ } from './commands/startTransformByQ'
+export { featureDefinitions, FeatureConfigProvider } from '../shared/featureConfig'
+export { ReferenceInlineProvider } from './service/referenceInlineProvider'
+export { ReferenceHoverProvider } from './service/referenceHoverProvider'
+export { CWInlineCompletionItemProvider } from './service/inlineCompletionItemProvider'
+export { ClassifierTrigger } from './service/classifierTrigger'
+export { ReferenceLogViewProvider } from './service/referenceLogViewProvider'
+export { RecommendationService } from './service/recommendationService'
+export { ImportAdderProvider } from './service/importAdderProvider'
+export { LicenseUtil } from './util/licenseUtil'
+export { SecurityIssueProvider } from './service/securityIssueProvider'
+export { listScanResults, mapToAggregatedList, pollScanJobStatus } from './service/securityScanHandler'
+export { TelemetryHelper } from './util/telemetryHelper'
+export { LineSelection, LineTracker } from './tracker/lineTracker'
+export { BM25Okapi } from './util/supplementalContext/rankBm25'
+export { runtimeLanguageContext, RuntimeLanguageContext } from './util/runtimeLanguageContext'
+export * as startSecurityScan from './commands/startSecurityScan'
+export * from './util/supplementalContext/utgUtils'
+export * from './util/supplementalContext/crossFileContextUtil'
+export * from './util/editorContext'
+export { acceptSuggestion } from './commands/onInlineAcceptance'
+export * from './util/showSsoPrompt'
+export * from './util/securityScanLanguageContext'
+export * from './util/importAdderUtil'
+export * from './util/globalStateUtil'
+export * from './util/zipUtil'
+export * from './util/diagnosticsUtil'
+export * from './util/commonUtil'
+export * from './util/closingBracketUtil'
+export * from './util/supplementalContext/codeParsingUtil'
+export * from './util/supplementalContext/supplementalContextUtil'
+export * from './util/codewhispererSettings'
+export * as supplementalContextUtil from './util/supplementalContext/supplementalContextUtil'
+export * from './service/diagnosticsProvider'
+export * as diagnosticsProvider from './service/diagnosticsProvider'
+export * from './ui/codeWhispererNodes'
+export { SecurityScanError, SecurityScanTimedOutError } from '../codewhisperer/models/errors'
+export * as CodeWhispererConstants from '../codewhisperer/models/constants'
+export {
+    getSelectedCustomization,
+    setSelectedCustomization,
+    baseCustomization,
+    onProfileChangedListener,
+    CustomizationProvider,
+} from './util/customizationUtil'
+export { Container } from './service/serviceContainer'
+export * from './util/gitUtil'
+export * from './ui/prompters'
+export { UserWrittenCodeTracker } from './tracker/userWrittenCodeTracker'
+export { RegionProfileManager, defaultServiceConfig } from './region/regionProfileManager'
+export { DocumentChangedSource, KeyStrokeHandler, DefaultDocumentChangedType } from './service/keyStrokeHandler'
+export { RecommendationHandler } from './service/recommendationHandler'
+export { CodeWhispererCodeCoverageTracker } from './tracker/codewhispererCodeCoverageTracker'
+export { invokeRecommendation } from './commands/invokeRecommendation'
diff --git a/packages/core/src/codewhisperer/indexNode.ts b/packages/core/src/codewhisperer/indexNode.ts
new file mode 100644
index 00000000000..1d053989510
--- /dev/null
+++ b/packages/core/src/codewhisperer/indexNode.ts
@@ -0,0 +1,22 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * This module is a superset of index.ts. Index.ts is for "common" code.
+ *
+ * The only exports that should be set in this module are those that only run
+ * in Node.js environments.
+ */
+export * from './index'
+
+export { HumanInTheLoopManager } from './service/transformByQ/humanInTheLoopManager'
+export * from './service/transformByQ/transformApiHandler'
+export {
+    DiffModel,
+    AddedChangeNode,
+    ModifiedChangeNode,
+} from './service/transformByQ/transformationResultsViewProvider'
+export { parseVersionsListFromPomFile } from './service/transformByQ/transformFileHandler'
+export { validateOpenProjects, getOpenProjects } from './service/transformByQ/transformProjectValidationHandler'
diff --git a/packages/core/src/codewhisperer/models/constants.ts b/packages/core/src/codewhisperer/models/constants.ts
new file mode 100644
index 00000000000..81736d478da
--- /dev/null
+++ b/packages/core/src/codewhisperer/models/constants.ts
@@ -0,0 +1,949 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Automated and manual trigger
+ */
+export const invocationTimeIntervalThreshold = 2 // seconds
+
+export const promiseTimeoutLimit = 15 // seconds
+
+export const invocationKeyThreshold = 15
+
+export const idleTimerPollPeriod = 25 // milliseconds
+
+export const showRecommendationTimerPollPeriod = 25
+
+export const specialCharactersList = ['{', '[', '(', ':', '\t', '\n']
+
+export const AWSTemplateKeyWords = ['AWSTemplateFormatVersion', 'Resources', 'AWS::', 'Description']
+
+export const AWSTemplateCaseInsensitiveKeyWords = ['cloudformation', 'cfn', 'template', 'description']
+
+export const JsonConfigFileNamingConvention = new Set([
+    'app.json',
+    'appsettings.json',
+    'bower.json',
+    'composer.json',
+    'db.json',
+    'manifest.json',
+    'package.json',
+    'schema.json',
+    'settings.json',
+    'tsconfig.json',
+    'vcpkg.json',
+])
+
+export const normalTextChangeRegex = /[A-Za-z0-9]/g
+
+export const autoSuggestionConfig = {
+    settingId: 'codewhisperer_autoSuggestionActivation',
+    activated: 'Activated',
+    deactivated: 'Deactivated',
+}
+
+export const autoScansConfig = {
+    settingId: 'codewhisperer_autoScansActivation',
+    activated: 'Activated',
+    deactivated: 'Deactivated',
+}
+
+/**
+ * EditorCon context
+ */
+export const charactersLimit = 10240
+
+export const filenameCharsLimit = 1024
+
+export const naturalLanguage = 'en-US'
+
+export const maxRecommendations = 1
+
+export const space = ' '
+
+export const lineBreak = '\n'
+
+export const lineBreakWin = '\r\n'
+
+export const supplementalContextTimeoutInMs = 100
+
+export const supplementalContextMaxTotalLength = 20480
+
+export const editorStateMaxLength = 40000
+
+/**
+ * Ux of recommendations
+ */
+export const labelLength = 20
+
+export const completionDetail = 'Amazon Q'
+
+/**
+ * CodeWhisperer in configuration
+ */
+export const codewhisperer = 'Amazon Q'
+
+// use vscode languageId here / Supported languages
+// TODO: Dropped Cloud9 support - do we need Cloud9-commented entries here?
+export const platformLanguageIds = [
+    'java',
+    'python',
+    'javascript',
+    'javascriptreact',
+    'typescript',
+    'typescriptreact',
+    'csharp',
+    'c',
+    'cpp',
+    'c_cpp', // Cloud9 reports C++ files with this language-id.
+    'go',
+    'kotlin',
+    'php',
+    'ruby',
+    'rust',
+    'scala',
+    'shellscript',
+    'sh', // Cloud9 reports bash files with this language-id
+    'sql',
+    'golang', // Cloud9 reports Go files with this language-id
+    'json',
+    'yaml',
+    'tf',
+    'hcl',
+    'terraform',
+    'terragrunt',
+    'packer',
+    'plaintext',
+    'jsonc',
+    'systemverilog',
+    'verilog',
+    'powershell',
+    'dart',
+    'lua',
+    'r',
+    'swift',
+    'vue',
+] as const
+
+export type PlatformLanguageId = (typeof platformLanguageIds)[number]
+
+/**
+ * Prompt
+ */
+export const pendingResponse = 'Waiting for Amazon Q...'
+
+export const runningSecurityScan = 'Reviewing project for code issues...'
+
+export const runningFileScan = 'Reviewing current file for code issues...'
+
+export const noSuggestions = 'No suggestions from Amazon Q'
+
+export const noInlineSuggestionsMsg = 'No suggestions from Amazon Q'
+
+export const licenseFilter = 'Amazon Q suggestions were filtered due to reference settings'
+
+/**
+ * the interval of the background thread invocation, which is triggered by the timer
+ */
+export const defaultCheckPeriodMillis = 1000 * 60 * 5
+/**
+ * Key bindings JSON file path
+ */
+export const keyBindingPathMac = 'Library/Application Support/Code/User/keybindings.json'
+
+export const keyBindingPathLinux = '.config/Code/User/keybindings.json'
+
+export const keyBindingPathWin = 'Code/User/keybindings.json'
+
+/**
+ * Length of left context preview in output channel
+ */
+export const contextPreviewLen = 20
+
+/**
+ * Unsupported language cache
+ */
+export const unsupportedLanguagesCacheTTL = 10 * 60 * 60 * 1000
+
+export const unsupportedLanguagesKey = 'CODEWHISPERER_UNSUPPORTED_LANGUAGES_KEY'
+
+export const serviceActiveKey = 'CODEWHISPERER_SERVICE_ACTIVE'
+
+export const inlinehintKey = 'CODEWHISPERER_HINT_DISPLAYED'
+
+export type AnnotationChangeSource = 'codewhisperer' | 'selection' | 'editor' | 'content'
+
+export const learnMoreUriGeneral = 'https://aws.amazon.com/q/developer/'
+
+export const learnMoreUri = 'https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/q-in-IDE-setup.html'
+
+export const customLearnMoreUri = 'https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/customizations.html'
+
+export const securityScanLearnMoreUri = 'https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/security-scans.html'
+
+export const identityPoolID = 'us-east-1:70717e99-906f-4add-908c-bd9074a2f5b9'
+
+/**
+ * Delay for making requests once the user stops typing. Without a delay, inline suggestions request is triggered every keystroke.
+ */
+export const inlineCompletionsDebounceDelay = 200
+
+// add 200ms more delay on top of inline default 30-50ms
+export const inlineSuggestionShowDelay = 200
+
+export const referenceLog = 'Code Reference Log'
+
+export const suggestionDetailReferenceText = (licenses: string) =>
+    `Reference code under ${licenses}. View full details in Code Reference Log.`
+
+export const hoverInlayText = (licenseName: string | undefined, repository: string | undefined) =>
+    `Reference code under the ${licenseName} license from repository ${repository}`
+
+export const referenceLogText = (
+    code: string,
+    license: string,
+    repository: string,
+    filePath: string,
+    lineInfo: string
+) =>
+    `with code ${code} provided with reference under ${license} from repository ${repository}. Added to ${filePath} ${lineInfo}.`
+
+export const referenceLogPromptText = `Don\'t want suggestions that include code with references? Uncheck this option in
+    <a href="#" onclick="openSettings();return false;">Amazon Q: Settings</a>`
+
+export const referenceLogPromptTextEnterpriseSSO =
+    'Your organization controls whether suggestions include code with references. To update these settings, please contact your admin.'
+/**
+ * Security Scan
+ */
+export const codeScanJavaPayloadSizeLimitBytes = Math.pow(2, 20) // 1 MB
+
+export const codeScanCsharpPayloadSizeLimitBytes = Math.pow(2, 20) // 1 MB
+
+export const codeScanRubyPayloadSizeLimitBytes = 200 * Math.pow(2, 10) // 200 KB
+
+export const codeScanGoPayloadSizeLimitBytes = 200 * Math.pow(2, 10) // 200 KB
+
+export const codeScanPythonPayloadSizeLimitBytes = 200 * Math.pow(2, 10) // 200 KB
+
+export const codeScanCFPayloadSizeLimitBytes = 200 * Math.pow(2, 10) // 200 KB
+
+export const codeScanTerraformPayloadSizeLimitBytes = 200 * Math.pow(2, 10) // 200 KB
+
+export const codeScanJavascriptPayloadSizeLimitBytes = 200 * Math.pow(2, 10) // 200 KB
+
+export const fileScanPayloadSizeLimitBytes = 200 * Math.pow(2, 10) // 200 KB
+
+export const fileScanUploadIntent = 'AUTOMATIC_FILE_SECURITY_SCAN'
+
+export const projectScanPayloadSizeLimitBytes = 1 * Math.pow(2, 30) // 1GB
+
+export const projectScanUploadIntent = 'FULL_PROJECT_SECURITY_SCAN'
+
+export const codeScanTruncDirPrefix = 'codewhisperer_scan'
+
+export const TestGenerationTruncDirPrefix = 'Q_TestGeneration'
+
+export const codeScanZipExt = '.zip'
+
+export const contextTruncationTimeoutSeconds = 10
+
+export const standardScanTimeoutMs = 900_000 // 15 minutes
+
+export const expressScanTimeoutMs = 60_000
+
+export const codeFixJobTimeoutMs = 120_000
+
+export const projectSizeCalculateTimeoutSeconds = 10
+
+export const codeScanJobPollingIntervalSeconds = 1
+
+export const codeFixJobPollingIntervalMs = 5_000
+
+export const fileScanPollingDelaySeconds = 10
+
+export const projectScanPollingDelaySeconds = 30
+
+export const codeFixJobPollingDelayMs = 10_000
+
+export const testGenPollingDelaySeconds = 10
+
+export const testGenJobPollingIntervalMilliseconds = 1000
+
+export const testGenJobTimeoutMilliseconds = 60 * 10 * 1000 // 10 minutes
+
+export const testGenUploadIntent = 'UNIT_TESTS_GENERATION'
+
+export const codeFixUploadIntent = 'CODE_FIX_GENERATION'
+
+export const artifactTypeSource = 'SourceCode'
+
+export const codeScanFindingsSchema = 'codescan/findings/1.0'
+
+export const autoScanDebounceDelaySeconds = 30
+
+export const codewhispererDiagnosticSourceLabel = 'Amazon Q '
+
+// use vscode languageId here / Supported languages
+export const securityScanLanguageIds = [
+    'java',
+    'python',
+    'javascript',
+    'javascriptreact',
+    'typescript',
+    'typescriptreact',
+    'csharp',
+    'go',
+    'ruby',
+    // Cloud9 reports Go files with this language-id
+    // TODO: Dropped Cloud9 support - is this still needed?
+    'golang',
+    'json',
+    'yaml',
+    'tf',
+    'hcl',
+    'terraform',
+    'terragrunt',
+    'packer',
+    'plaintext',
+    'jsonc',
+    'c',
+    'cpp',
+    'php',
+    'xml',
+    'toml',
+    'pip-requirements',
+    'java-properties',
+    'go.mod',
+    'go.sum',
+    'kotlin',
+    'scala',
+    'sh',
+    'shell',
+    'shellscript',
+    'brazilPackageConfig',
+] as const
+
+export type SecurityScanLanguageId = (typeof securityScanLanguageIds)[number]
+
+export const sasRuleId = 'sbom-software-assurance-services'
+
+// wait time for editor to update editor.selection.active (in milliseconds)
+export const vsCodeCursorUpdateDelay = 10
+
+export const reloadWindow = 'Reload Now'
+
+export const reloadWindowPrompt =
+    'Inline suggestion settings changed. The current window needs to be reloaded for Amazon Q to use these changes.'
+
+export const ssoConfigAlertMessage = `This setting is controlled by your organization\’s admin and has been reset to the value they\’ve specified.`
+
+export const ssoConfigAlertMessageShareData = `This setting doesn\’t apply, since you are in Professional tier`
+
+export const settingsLearnMore = 'Learn More about Amazon Q Settings'
+
+export const freeTierLimitReached = 'You have reached the monthly fair use limit of code recommendations.'
+
+export const freeTierLimitReachedCodeScan = 'You have reached the monthly quota of code reviews.'
+
+export const scansLimitReachedErrorMessage =
+    'Maximum com.amazon.aws.codewhisperer.StartCodeAnalysis reached for this month.'
+
+export const utgLimitReached =
+    'Maximum com.amazon.aws.codewhisperer.runtime.StartTestGeneration reached for this month.'
+
+export const DefaultCodeScanErrorMessage =
+    'Amazon Q encountered an error while reviewing for code issues. Try again later.'
+
+export const defaultTestGenErrorMessage = 'Amazon Q encountered an error while generating tests. Try again later.'
+
+export const defaultCodeFixErrorMessage = 'Amazon Q encountered an error while generating code fixes. Try again later.'
+
+export const FileSizeExceededErrorMessage = `Amazon Q: The selected file exceeds the input artifact limit. Try again with a smaller file. For more information about review limits, see the [Amazon Q documentation](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/security-scans.html#quotas).`
+
+export const ProjectSizeExceededErrorMessage = `Amazon Q: The selected workspace exceeds the input artifact limit. Try again with a smaller workspace. For more information about review limits, see the [Amazon Q documentation](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/security-scans.html#quotas).`
+
+export const monthlyLimitReachedNotification =
+    "You've reached the monthly quota for Amazon Q Developer's agent capabilities. You can try again next month. For more information on usage limits, see the Amazon Q Developer pricing page."
+
+export const noSourceFilesErrorMessage = 'Amazon Q: workspace does not contain valid files to review'
+
+export const noActiveFileErrorMessage = 'Amazon Q: Open valid file to run a file review'
+
+export const UploadArtifactToS3ErrorMessage = `Amazon Q is unable to upload your workspace artifacts to Amazon S3 for security reviews. For more information, see the [Amazon Q documentation](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/security_iam_manage-access-with-policies.html#data-perimeters).`
+
+export const throttlingLearnMore = `Learn More`
+
+export const throttlingMessage = `Maximum recommendation count reached for this month`
+
+export const fileScansThrottlingMessage = `Maximum file reviews count reached for this month`
+
+export const projectScansThrottlingMessage = `Maximum workspace review count reached for this month`
+
+export const connectionChangeMessage = `Keep using Amazon Q with `
+
+// TODO: align this text with service side
+export const invalidCustomizationMessage = `You are not authorized to access`
+
+export const failedToConnectAwsBuilderId = `Failed to connect to AWS Builder ID`
+
+export const failedToConnectIamIdentityCenter = `Failed to connect to IAM Identity Center`
+
+export const stopScanMessage =
+    'Stop security review? This review will be counted as one complete review towards your monthly security review limits.'
+
+// TODO: Change the Text according to the UX
+export const stopScanMessageInChat = 'Review is stopped. Retry reviews by selecting below options'
+
+export const showScannedFilesMessage = 'View Code Issues'
+
+export const ignoreAllIssuesMessage = (issueTitle: string) => {
+    return `Are you sure you want to ignore all "${issueTitle}" issues? Amazon Q will not show these issues for future reviews. You can manage a list of your ignored issues in the Amazon Q extension settings.`
+}
+
+export const updateInlineLockKey = 'CODEWHISPERER_INLINE_UPDATE_LOCK_KEY'
+
+export const newCustomizationMessage = 'You have access to new Amazon Q customizations.'
+
+// Start of QCT Strings
+
+export const uploadZipSizeLimitInBytes = 2000000000 // 2GB
+
+export const maxBufferSize = 1024 * 1024 * 8 // this is 8MB; the default max buffer size for stdout for spawnSync is 1MB
+
+export const transformationJobPollingIntervalSeconds = 5
+
+export const defaultLanguage = 'Java'
+
+export const contentChecksumType = 'SHA_256'
+
+export const uploadIntent = 'TRANSFORMATION'
+
+export const transformationType = 'LANGUAGE_UPGRADE'
+
+// initial build succeeded
+export const validStatesForBuildSucceeded = [
+    'PREPARED',
+    'PLANNING',
+    'PLANNED',
+    'TRANSFORMING',
+    'TRANSFORMED',
+    'PARTIALLY_COMPLETED',
+    'COMPLETED',
+]
+
+// plan must be available
+export const validStatesForPlanGenerated = [
+    'PLANNED',
+    'TRANSFORMING',
+    'TRANSFORMED',
+    'PARTIALLY_COMPLETED',
+    'COMPLETED',
+]
+
+export const failureStates = ['FAILED', 'STOPPING', 'STOPPED', 'REJECTED']
+
+export const pausedStates = ['PAUSED']
+
+// if status is COMPLETED or PARTIALLY_COMPLETED we can download artifacts
+export const validStatesForCheckingDownloadUrl = [
+    'COMPLETED',
+    'PARTIALLY_COMPLETED',
+    'FAILED',
+    'STOPPING',
+    'STOPPED',
+    'REJECTED',
+]
+
+export const amazonQFeedbackKey = 'Amazon Q'
+
+export const amazonQFeedbackText = 'Submit feedback'
+
+export const codeTransformTroubleshootStartJobFailed =
+    'https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/transform-java.html#quotas-java-transformation-ide'
+
+export const codeTransformTroubleshootProjectSize =
+    'https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/troubleshooting-code-transformation.html#reduce-project-size'
+
+export const codeTransformTroubleshootMvnFailure =
+    'https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/troubleshooting-code-transformation.html#maven-commands-failing'
+
+export const codeTransformTroubleshootConfigureProxy =
+    'https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/troubleshooting-code-transformation.html#configure-proxy'
+
+export const codeTransformTroubleshootDownloadExpired =
+    'https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/troubleshooting-code-transformation.html#download-24-hrs'
+
+export const codeTransformTroubleshootAllowS3Access =
+    'https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/troubleshooting-code-transformation.html#allowlist-s3-bucket'
+
+export const codeTransformTroubleshootUploadError =
+    'https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/troubleshooting-code-transformation.html#project-upload-fail'
+
+export const codeTransformTroubleshootDownloadError =
+    'https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/troubleshooting-code-transformation.html#download-code-fail'
+
+export const codeTransformPrereqDoc =
+    'https://docs.aws.amazon.com/amazonq/latest/aws-builder-use-ug/code-transformation.html#prerequisites'
+
+export const codeTransformBillingText = (linesOfCode: number) =>
+    `<p>${linesOfCode} lines of code were submitted for transformation. If you reach the quota for lines of code included in your subscription, you will be charged $${codeTransformBillingRate} for each additional line of code. You might be charged up to $${(
+        linesOfCode * codeTransformBillingRate
+    ).toFixed(
+        2
+    )} for this transformation. To avoid being charged, stop the transformation job before it completes. For more information on pricing and quotas, see [Amazon Q Developer pricing](${linkToBillingInfo}).</p>`
+
+export const codeTransformBillingRate = 0.003
+
+export const codeTransformLocThreshold = 100000
+
+export const jobStartedChatMessage =
+    'I am starting to transform your code. It can take 10 to 30 minutes to upgrade your code, depending on the size of your project. To monitor progress, go to the Transformation Hub. If I run into any issues, I might pause the transformation to get input from you on how to proceed.'
+
+export const chooseTransformationObjective = `I can help you with the following tasks:\n- Upgrade your Java 8, Java 11, and Java 17 codebases to Java 17 or Java 21.\n- Upgrade Java 17 or Java 21 code with up-to-date libraries and other dependencies.\n- Convert embedded SQL code for Oracle to PostgreSQL database migrations in AWS DMS. [Learn more](https://docs.aws.amazon.com/dms/latest/userguide/schema-conversion-embedded-sql.html).\n\nWhat would you like to do? You can enter "language upgrade" or "sql conversion".`
+
+export const chooseTransformationObjectivePlaceholder = 'Enter "language upgrade" or "sql conversion"'
+
+export const userPatchDescriptionChatMessage = (version: string) => `
+If you'd like to update and test your code with fewer changes at a time, I can divide the transformation results into separate diff patches. If applicable to your application, I can split up the diffs up into the following groups of upgrades. Here are the upgrades included in each diff:
+
+• Minimal Compatible Library Upgrade to Java ${version}: Dependencies to the minimum compatible versions in Java ${version}, including Springboot, JUnit, and PowerMockito.
+
+• Popular Enterprise Specifications Application Frameworks: Popular enterprise and application frameworks like Jakarta EE, Hibernate, and Micronaut 3.
+
+• HTTP Client Utilities Web Frameworks: HTTP client libraries, Apache Commons utilities, and Struts frameworks.
+
+• Testing Tools Frameworks: Testing tools like ArchUnit, Mockito, and TestContainers and build tools like Jenkins and Maven Wrapper. 
+
+• Miscellaneous Processing Documentation: Upgrades ORMs, XML processing, and Swagger to SpringDoc/OpenAPI.
+
+• Deprecated API replacement, dependency upgrades, and formatting: Replaces deprecated APIs, makes additional dependency version upgrades, and formats code changes.
+`
+
+export const uploadingCodeStepMessage = 'Upload your code'
+
+export const buildCodeStepMessage = 'Analyze uploaded code in secure environment'
+
+export const generatePlanStepMessage = 'Generate transformation plan'
+
+export const transformStepMessage = 'Transform your code'
+
+export const filesUploadedMessage =
+    'Files have been uploaded to Amazon Q, transformation job has been accepted and is preparing to start.'
+
+export const planningMessage = 'Amazon Q is analyzing your code in order to generate a transformation plan.'
+
+export const transformingMessage = 'Amazon Q is transforming your code.'
+
+export const stoppingJobMessage = 'Stopping the transformation...'
+
+export const buildingCodeMessage =
+    'Amazon Q is building your code using Java JAVA_VERSION_HERE in a secure build environment.'
+
+export const scanningProjectMessage =
+    'Amazon Q is reviewing the project files and getting ready to start the job. To start the job, Amazon Q needs to upload the project artifacts. Once that is done, Amazon Q can start the transformation job. The estimated time for this operation ranges from a few seconds to several minutes.'
+
+export const failedStepMessage = 'The step failed, fetching additional details...'
+
+export const jobCompletedMessage = 'The transformation completed.'
+
+export const noChangesMadeMessage = "I didn't make any changes for this transformation."
+
+export const noOngoingJobMessage = 'No ongoing job.'
+
+export const noJobHistoryMessage = 'No job history'
+
+export const jobStartedNotification =
+    'Amazon Q is transforming your code. It can take 10 to 30 minutes to upgrade your code, depending on the size of your project. To monitor progress, go to the Transformation Hub.'
+
+export const openTransformationHubButtonText = 'Open Transformation Hub'
+
+export const startTransformationButtonText = 'Start a new transformation'
+
+export const viewSummaryButtonText = 'View summary'
+
+export const stopTransformationButtonText = 'Stop transformation'
+
+export const checkingForProjectsChatMessage = 'Checking for eligible projects...'
+
+export const buildStartedChatMessage =
+    'I am building your project. This can take up to 10 minutes, depending on the size of your project.'
+
+export const buildSucceededChatMessage = 'I was able to build your project and will start transforming your code soon.'
+
+export const buildSucceededNotification =
+    'Amazon Q was able to build your project and will start transforming your code soon.'
+
+export const absolutePathDetectedMessage = (numPaths: number, buildFile: string, listOfPaths: string) =>
+    `I detected ${numPaths} potential absolute file path(s) in your ${buildFile} file: **${listOfPaths}**. Absolute file paths might cause issues when I build your code. Any errors will show up in the build log.`
+
+export const selectSQLMetadataFileHelpMessage =
+    'Okay, I can convert the embedded SQL code for your Oracle to PostgreSQL transformation. To get started, upload the zipped metadata file from your schema conversion in AWS Data Migration Service (DMS). To retrieve the metadata file:\n1. Open your database migration project in the AWS DMS console.\n2. Open the schema conversion and choose **Convert the embedded SQL in your application**.\n3. Once you complete the conversion, close the project and go to the S3 bucket where your project is stored.\n4. Open the folder and find the project folder ("sct-project").\n5. Download the object inside the project folder. This will be a zip file.\n\nFor more info, refer to the [documentation](https://docs.aws.amazon.com/dms/latest/userguide/schema-conversion-embedded-sql.html).'
+
+export const invalidMetadataFileUnsupportedSourceDB =
+    'I can only convert SQL for migrations from an Oracle source database. The provided .sct file indicates another source database for this migration.'
+
+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 = (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."
+
+export const invalidMetadataFileNoSctFile =
+    "An .sct file is required for transformation. Make sure that you've uploaded the .zip file you retrieved from your schema conversion in AWS DMS."
+
+export const invalidFromToJdkChatMessage =
+    "I can't transform a project from Java 21 to Java 17, but I can upgrade Java 21 code with up to date libraries and other dependencies. Try again with a supported language upgrade."
+
+export const sqlMetadataFileReceived =
+    'I found the following source database, target database, and host based on the schema conversion metadata you provided:'
+
+export const failedToStartJobChatMessage =
+    "Sorry, I couldn't begin the transformation. Please try starting the transformation again."
+
+export const failedToStartJobNotification =
+    'Amazon Q could not begin the transformation. Please try starting the transformation again.'
+
+export const tooManyJobsChatMessage = `Sorry, I couldn't begin the transformation. You have too many active transformations running. Please try again after your other transformations have completed. For more information, see the [Amazon Q documentation](${codeTransformTroubleshootStartJobFailed}).`
+
+export const tooManyJobsNotification = `Amazon Q could not begin the transformation. You have too many active transformations running. Please try again after your other transformations have completed. For more information, see the [Amazon Q documentation](${codeTransformTroubleshootStartJobFailed}).`
+
+export const linesOfCodeLimitBreachedChatMessage = `Sorry, I couldn't begin the transformation. You have exceeded the lines of code limit. For more information, see the [Amazon Q documentation](${codeTransformTroubleshootStartJobFailed}).`
+
+export const linesOfCodeLimitBreachedNotification = `Amazon Q could not begin the transformation. You have exceeded the lines of code limit. For more information, see the [Amazon Q documentation](${codeTransformTroubleshootStartJobFailed}).`
+
+export const failedToUploadProjectChatMessage =
+    "Sorry, I couldn't upload your project. Please try starting the transformation again."
+
+export const failedToUploadProjectNotification =
+    'Amazon Q could not upload your project. Please try starting the transformation again.'
+
+export const failedToGetPlanChatMessage =
+    "Sorry, I couldn't create the transformation plan to upgrade your project. Please try starting the transformation again."
+
+export const failedToGetPlanNotification =
+    'Amazon Q could not create the transformation plan to upgrade your project. Please try starting the transformation again.'
+
+export const failedToCompleteJobChatMessage =
+    "Sorry, I couldn't complete the transformation. Please try starting the transformation again."
+
+export const failedToCompleteJobNotification =
+    'Amazon Q could not complete the transformation. Please try starting the transformation again.'
+
+export const failedToCompleteJobGenericChatMessage = "Sorry, I couldn't complete the transformation."
+
+export const failedToCompleteJobGenericNotification = 'Amazon Q could not complete the transformation.'
+
+export const genericErrorMessage =
+    'Sorry, I am experiencing technical issues at the moment. Please try again in a few minutes.'
+
+export const jobCancelledChatMessage =
+    'If you want to start another transformation, choose **Start a new transformation**.'
+
+export const jobCancelledNotification = 'You cancelled the transformation.'
+
+export const continueWithoutHilMessage = 'I will continue transforming your code without upgrading this dependency.'
+
+export const continueWithoutConfigFileMessage =
+    'Ok, I will continue the transformation without additional dependency upgrade information.'
+
+export const receivedValidConfigFileMessage =
+    'The dependency upgrade file looks good. I will use this information to upgrade the dependencies you specified.'
+
+export const chooseConfigFileMessageJdkUpgrade =
+    'Would you like to provide a dependency upgrade file? You can specify first party dependencies and their versions in a YAML file, and I will upgrade them during the JDK upgrade transformation. For an example dependency upgrade file, see the [documentation](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/code-transformation.html#dependency-upgrade-file).'
+
+export const chooseConfigFileMessageLibraryUpgrade =
+    'Would you like to provide a dependency upgrade file? You can specify third party dependencies and their versions in a YAML file, and I will only upgrade these dependencies during the library upgrade transformation. For an example dependency upgrade file, see the [documentation](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/code-transformation.html#dependency-upgrade-file).'
+
+export const enterJavaHomePlaceholder = 'Enter the path to your Java installation'
+
+export const openNewTabPlaceholder = 'Open a new tab to chat with Q'
+
+export const jobCompletedChatMessage =
+    'I completed your transformation. You can review the diff to see my proposed changes and accept or reject them. The transformation summary has details about the changes I am proposing. '
+
+export const jobCompletedNotification =
+    'Amazon Q transformed your code. You can review the diff to see my proposed changes and accept or reject them. The transformation summary has details about the changes. '
+
+export const upgradeLibrariesMessage =
+    'After successfully transforming to Java 17 or 21, an additional transformation is required to upgrade your libraries and dependencies. Choose the same source code version and target code version (for example, 17 to 17) to do this.'
+
+export const jobPartiallyCompletedChatMessage = `I transformed part of your code. You can review the diff to see my proposed changes and accept or reject them. The transformation summary has details about the files I updated and the errors that prevented a complete transformation. `
+
+export const jobPartiallyCompletedNotification = `Amazon Q transformed part of your code. You can review the diff to see my proposed changes and accept or reject them. The transformation summary has details about the files I updated and the errors that prevented a complete transformation. `
+
+export const noPomXmlFoundChatMessage = `I couldn\'t find a project that I can upgrade. I couldn\'t find a pom.xml file in any of your open projects, nor could I find any embedded SQL statements. Currently, I can upgrade Java 8, 11, or 17 projects built on Maven, or Oracle SQL to PostgreSQL statements in Java projects. For more information, see the [Amazon Q documentation](${codeTransformPrereqDoc}).`
+
+export const noJavaHomeFoundChatMessage = `Sorry, I couldn\'t locate your Java installation. For more information, see the [Amazon Q documentation](${codeTransformPrereqDoc}).`
+
+export const dependencyVersionsErrorMessage =
+    'I could not find any other versions of this dependency in your local Maven repository. Try transforming the dependency to make it compatible with your target Java version, and then try transforming this module again.'
+
+export const errorUploadingWithExpiredUrl = `The upload error may have been caused by the expiration of the S3 pre-signed URL that was used to upload code artifacts to Q Code Transformation. The S3 pre-signed URL expires in 30 minutes. This could be caused by any delays introduced by intermediate services in your network infrastructure. Please investigate your network configuration and consider allowlisting 'amazonq-code-transformation-us-east-1-c6160f047e0.s3.amazonaws.com' to skip any reviewing that might delay the upload. For more information, see the [Amazon Q documentation](${codeTransformTroubleshootAllowS3Access}).`
+
+export const socketConnectionFailed =
+    'Please check your network connectivity or firewall configuration, and then try again.'
+
+export const selfSignedCertificateError = `This might have been caused by your IDE not trusting the certificate of your HTTP proxy. Ensure all certificates for your proxy client have been configured in your IDE, and then retry transformation. For more information, see the [Amazon Q documentation](${codeTransformTroubleshootConfigureProxy}).`
+
+export const errorStoppingJobChatMessage = "Sorry, I couldn't stop the transformation."
+
+export const errorStoppingJobNotification = 'Amazon Q could not stop the transformation.'
+
+export const errorDownloadingDiffChatMessage = `Sorry, I couldn\'t download the diff with your upgraded code. Please try downloading it again. For more information, see the [Amazon Q documentation](${codeTransformTroubleshootDownloadError}).`
+
+export const errorDownloadingDiffNotification = `Amazon Q could not download the diff with your upgraded code. Please try downloading it again. For more information, see the [Amazon Q documentation](${codeTransformTroubleshootDownloadError}).`
+
+export const errorDownloadingExpiredDiff = `Your transformation is not available anymore. Your code and transformation summary are deleted 24 hours after the transformation completes. Please try starting the transformation again. For more information, see the [Amazon Q documentation](${codeTransformTroubleshootDownloadExpired}).`
+
+export const errorDeserializingDiffChatMessage = `Sorry, I couldn\'t parse the diff with your upgraded code. Please try starting the transformation again. For more information, see the [Amazon Q documentation](${codeTransformTroubleshootDownloadError}).`
+
+export const errorDeserializingDiffNotification = `Amazon Q could not parse the diff with your upgraded code. Please try starting the transformation again. For more information, see the [Amazon Q documentation](${codeTransformTroubleshootDownloadError}).`
+
+export const viewProposedChangesChatMessage =
+    'Download complete. You can view a summary of the transformation and accept or reject the proposed changes in the Transformation Hub.'
+
+export const viewProposedChangesNotification =
+    'Download complete. You can view a summary of the transformation and accept or reject the proposed changes in the Transformation Hub.'
+
+export const changesAppliedChatMessageOneDiff = 'I applied the changes to your project.'
+
+export const changesAppliedNotificationOneDiff = 'Amazon Q applied the changes to your project'
+
+export const noOpenProjectsFoundChatMessage = `I couldn\'t find a project that I can upgrade. Currently, I support Java 8, Java 11, Java 17, and Java 21 projects built on Maven. Make sure your project is open in the IDE. For more information, see the [Amazon Q documentation](${codeTransformPrereqDoc}).`
+
+export const noOpenFileFoundChatMessage = `Sorry, there isn't a source file open right now that I can generate a test for. Make sure you open a source file so I can generate tests.`
+
+export const invalidFileTypeChatMessage = `Sorry, your current active window is not a source code file. Make sure you select a source file as your primary context.`
+
+export const noOpenProjectsFoundChatTestGenMessage = `Sorry, I couldn\'t find a project to generate tests`
+
+export const unitTestGenerationCancelMessage = 'Unit test generation cancelled.'
+
+export const tooManyRequestErrorMessage = 'Too many requests. Please wait before retrying.'
+
+export const noJavaProjectsFoundChatMessage = `I couldn\'t find a project that I can upgrade. Currently, I support Java 8, Java 11, Java 17, and Java 21 projects built on Maven. Make sure your project is open in the IDE. For more information, see the [Amazon Q documentation](${codeTransformPrereqDoc}).`
+
+export const linkToDocsHome = 'https://docs.aws.amazon.com/amazonq/latest/aws-builder-use-ug/code-transformation.html'
+
+export const linkToBillingInfo = 'https://aws.amazon.com/q/developer/pricing/'
+
+export const dependencyFolderName = 'transformation_dependencies_temp_'
+
+export const cleanTestCompileErrorChatMessage = `I could not run \`mvn clean test-compile\` to build your project. For more information, see the [Amazon Q documentation](${codeTransformTroubleshootMvnFailure}).`
+
+export const cleanTestCompileErrorNotification = `Amazon Q could not run \`mvn clean test-compile\` to build your project. For more information, see the [Amazon Q documentation](${codeTransformTroubleshootMvnFailure}).`
+
+export const enterJavaHomeChatMessage = 'Enter the path to JDK'
+
+export const projectPromptChatMessage =
+    "I can upgrade your Java project. To start the transformation, I need some information from you. Choose the project you want to upgrade and the target code version to upgrade to. Then, choose Confirm.\n\nAfter successfully transforming to Java 17 or 21, an additional transformation is required to upgrade your libraries and dependencies. Choose the same source code version and target code version (for example, 17 to 17) to do this.\n\nI will perform the transformation based on your project's requests, descriptions, and content. To maintain security, avoid including external, unvetted artifacts in your project repository prior to starting the transformation and always validate transformed code for both functionality and security. Do not turn off or close your machine during the transformation because a stable network connection is required."
+
+export const windowsJavaHomeHelpChatMessage =
+    'To find the JDK path, run the following commands in a new terminal: `cd "C:/Program Files/Java"` and then `dir`. If you see your JDK version, run `cd <version>` and then `cd` to show the path.'
+
+export const macJavaVersionHomeHelpChatMessage = (version: number) =>
+    `To find the JDK path, run the following command in a new terminal:  \`/usr/libexec/java_home -v ${version}\``
+
+export const linuxJavaHomeHelpChatMessage =
+    'To find the JDK path, run the following command in a new terminal: `update-java-alternatives --list`'
+
+export const JDK8VersionNumber = '52'
+
+export const JDK11VersionNumber = '55'
+
+export const chooseProjectFormTitle = 'Choose a project to transform'
+
+export const chooseSourceVersionFormTitle = 'Choose the source code version'
+
+export const chooseTargetVersionFormTitle = 'Choose the target code version'
+
+export const chooseSchemaFormTitle = 'Choose the schema of the database'
+
+export const chooseProjectSchemaFormMessage = 'To continue, choose the project and schema for this transformation.'
+
+export const skipUnitTestsFormTitle = 'Choose to skip unit tests'
+
+export const skipUnitTestsFormMessage =
+    'I will build generated code in your local environment, not on the server side. For information on how I scan code to reduce security risks associated with building the code in your local environment, see the [documentation](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/code-transformation.html#java-local-builds).\n\nI will build your project using `mvn clean test` by default. If you would like me to build your project without running unit tests, I will use `mvn clean test-compile`.'
+
+export const runUnitTestsMessage = 'Run unit tests'
+
+export const doNotSkipUnitTestsBuildCommand = 'clean test'
+
+export const skipUnitTestsMessage = 'Skip unit tests'
+
+export const skipUnitTestsBuildCommand = 'clean test-compile'
+
+export const planTitle = 'Code Transformation plan by Amazon Q'
+
+export const planIntroductionMessage =
+    'Amazon Q reviewed your code and generated a transformation plan. Amazon Q will suggest code changes according to the plan, and you can review the updated code before accepting changes to your files.'
+
+export const planHeaderMessage = 'Planned transformation changes'
+
+export const planDisclaimerMessage =
+    'Amazon Q will use the proposed changes as guidance during the transformation. The final code updates might differ from this plan.'
+
+export const formattedStringMap = new Map([
+    ['linesOfCode', 'Lines of code in your application'],
+    ['plannedDependencyChanges', 'Dependencies to be replaced'],
+    ['plannedDeprecatedApiChanges', 'Deprecated code instances to be replaced'],
+    ['plannedFileChanges', 'Files to be changed'],
+    ['dependencyName', 'Dependency'],
+    ['action', 'Action'],
+    ['currentVersion', 'Current version'],
+    ['targetVersion', 'Target version'],
+    ['relativePath', 'File'],
+    ['apiFullyQualifiedName', 'Deprecated code'],
+    ['numChangedFiles', 'Files to be changed'],
+])
+
+export const refreshInProgressChatMessage = 'A job refresh is currently in progress. Please wait for it to complete.'
+
+export const refreshingJobChatMessage = (jobId: string) =>
+    `I am now resuming your job (id: ${jobId}). This can take 10 to 30 minutes to complete.`
+
+export const jobHistoryButtonText = 'Open job history'
+
+export const viewHistoryMessage = (numInProgress: number) =>
+    numInProgress > 0
+        ? `You have ${numInProgress} job${numInProgress > 1 ? 's' : ''} in progress. You can resume ${numInProgress > 1 ? 'them' : 'it'} in the transformation history table.`
+        : 'View previous transformations run from the IDE'
+
+export const transformationHistoryTableDescription =
+    'This table lists the most recent jobs that you have run in the past 30 days. To open the diff patch and summary files, click the provided links. To get an updated job status, click the refresh icon. The diff patch and summary will appear once they are available.<br><br>' +
+    'Jobs with a status of FAILED may still be in progress. Resume these jobs within 12 hours of starting the job to get an updated job status and artifacts.'
+
+export const refreshErrorChatMessage =
+    "Sorry, I couldn't refresh the job. Please try again or start a new transformation."
+
+export const refreshErrorNotification = (jobId: string) => `There was an error refreshing this job. Job Id: ${jobId}`
+
+export const refreshCompletedChatMessage =
+    'Job refresh completed. Please see the transformation history table for the updated status and artifacts.'
+
+export const refreshCompletedNotification = (jobId: string) => `Job refresh completed. (Job Id: ${jobId})`
+
+export const refreshNoUpdatesNotification = (jobId: string) => `No updates. (Job Id: ${jobId})`
+
+// end of QCT Strings
+
+export enum UserGroup {
+    Classifier = 'Classifier',
+    CrossFile = 'CrossFile',
+    Control = 'Control',
+    RightContext = 'RightContext',
+}
+
+export const isClassifierEnabledKey = 'CODEWHISPERER_CLASSIFIER_TRIGGER_ENABLED'
+
+export const supplemetalContextFetchingTimeoutMsg = 'Amazon Q supplemental context fetching timeout'
+
+export const codeFixAppliedFailedMessage = 'Failed to apply suggested code fix.'
+
+export const runSecurityScanButtonTitle = 'Run security review'
+
+export const startProjectScan = 'Review Project'
+
+export const startFileScan = 'Review Current File in Focus'
+
+export const noOpenProjectsFound = `Sorry, I couldn\'t find a project in the workspace. Open a project in your IDE and retry the review.`
+
+export const noOpenFileFound = `Sorry, I couldn\'t find an active file in the editor. Open a file in your IDE and retry the review.`
+
+export const crossFileContextConfig = {
+    numberOfChunkToFetch: 60,
+    topK: 3,
+    numberOfLinesEachChunk: 50,
+    maximumTotalLength: 20480,
+    maxLengthEachChunk: 10240,
+    maxContextCount: 5,
+}
+
+export const utgConfig = {
+    maxSegmentSize: 10200,
+}
+
+export enum CodeAnalysisScope {
+    FILE_AUTO = 'FILE_AUTO',
+    FILE_ON_DEMAND = 'FILE_ON_DEMAND',
+    PROJECT = 'PROJECT',
+    AGENTIC = 'AGENTIC',
+}
+
+export enum TestGenerationJobStatus {
+    IN_PROGRESS = 'IN_PROGRESS',
+    FAILED = 'FAILED',
+    COMPLETED = 'COMPLETED',
+}
+
+export enum FeatureUseCase {
+    TEST_GENERATION = 'TEST_GENERATION',
+    CODE_SCAN = 'CODE_SCAN',
+}
+
+export const amazonqIgnoreNextLine = 'amazonq-ignore-next-line'
+
+export enum TestGenerationBuildStep {
+    START_STEP,
+    INSTALL_DEPENDENCIES,
+    RUN_BUILD,
+    RUN_EXECUTION_TESTS,
+    FIXING_TEST_CASES,
+    PROCESS_TEST_RESULTS,
+}
+
+export enum SecurityScanStep {
+    GENERATE_ZIP,
+    UPLOAD_TO_S3,
+    CREATE_SCAN_JOB,
+    POLL_SCAN_STATUS,
+    PROCESS_SCAN_RESULTS,
+}
+
+export const amazonqCodeIssueDetailsTabTitle = 'Code Issue Details'
+
+export const testGenExcludePatterns = [
+    '**/annotation-generated-src/*',
+    '**/annotation-generated-tst/*',
+    '**/build/*',
+    '**/env/*',
+    '**/release-info/*',
+    '**/*.jar',
+    '**/*.exe',
+    '**/*.a',
+    '**/*.map',
+    '**/*.graph',
+    '**/*.so',
+    '**/*.csv',
+    '**/*.dylib',
+    '**/*.parquet',
+    '**/*.xlsx',
+    '**/*.tar.gz',
+    '**/*.tar',
+    '**/*.pack',
+    '**/*.pkg',
+    '**/*.pkl',
+    '**/*.deb',
+    '**/*.model',
+]
+
+export const predictionTrackerDefaultConfig = {
+    maxStorageSizeKb: 5000,
+    debounceIntervalMs: 2000,
+    maxAgeMs: 30000,
+    maxSupplementalContext: 15,
+}
+
+export const codeReviewFindingsSuffix = '_codeReviewFindings'
+export const displayFindingsSuffix = '_displayFindings'
+
+export const displayFindingsDetectorName = 'DisplayFindings'
+export const findingsSuffix = '_codeReviewFindings'
diff --git a/packages/core/src/codewhisperer/models/errors.ts b/packages/core/src/codewhisperer/models/errors.ts
new file mode 100644
index 00000000000..34927f01c0a
--- /dev/null
+++ b/packages/core/src/codewhisperer/models/errors.ts
@@ -0,0 +1,184 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { ToolkitError } from '../../shared/errors'
+import { i18n } from '../../shared/i18n-helper'
+import {
+    DefaultCodeScanErrorMessage,
+    FileSizeExceededErrorMessage,
+    ProjectSizeExceededErrorMessage,
+    UploadArtifactToS3ErrorMessage,
+    defaultCodeFixErrorMessage,
+    defaultTestGenErrorMessage,
+    noActiveFileErrorMessage,
+    noSourceFilesErrorMessage,
+} from './constants'
+
+export class SecurityScanError extends ToolkitError {
+    constructor(
+        error: string,
+        code: string,
+        public customerFacingMessage: string
+    ) {
+        super(error, { code })
+    }
+}
+
+export class FileSizeExceededError extends SecurityScanError {
+    constructor() {
+        super('Payload size limit reached', 'FileSizeExceeded', FileSizeExceededErrorMessage)
+    }
+}
+
+export class ProjectSizeExceededError extends SecurityScanError {
+    constructor() {
+        super('Payload size limit reached', 'ProjectSizeExceeded', ProjectSizeExceededErrorMessage)
+    }
+}
+
+export class DefaultError extends SecurityScanError {
+    constructor() {
+        super('Security scan failed.', 'DefaultError', DefaultCodeScanErrorMessage)
+    }
+}
+
+export class InvalidSourceZipError extends SecurityScanError {
+    constructor() {
+        super('Failed to create valid source zip', 'InvalidSourceZip', DefaultCodeScanErrorMessage)
+    }
+}
+
+export class NoSourceFilesError extends SecurityScanError {
+    constructor() {
+        super('Project does not contain valid files.', 'NoSourceFilesError', noSourceFilesErrorMessage)
+    }
+}
+
+export class NoActiveFileError extends SecurityScanError {
+    constructor() {
+        super('Open valid file to run a file scan', 'NoActiveFileError', noActiveFileErrorMessage)
+    }
+}
+
+export class CreateUploadUrlError extends SecurityScanError {
+    constructor(error: string) {
+        super(error, 'CreateUploadUrlError', DefaultCodeScanErrorMessage)
+    }
+}
+
+export class UploadArtifactToS3Error extends SecurityScanError {
+    constructor(error: string) {
+        super(error, 'UploadArtifactToS3Error', UploadArtifactToS3ErrorMessage)
+    }
+}
+
+export class CreateCodeScanError extends SecurityScanError {
+    constructor(error: string) {
+        super(error, 'CreateCodeScanError', DefaultCodeScanErrorMessage)
+    }
+}
+
+export class CreateCodeScanFailedError extends SecurityScanError {
+    constructor(error: string) {
+        super(error, 'CreateCodeScanFailedError', DefaultCodeScanErrorMessage)
+    }
+}
+
+export class SecurityScanTimedOutError extends SecurityScanError {
+    constructor() {
+        super('Security Scan failed. Amazon Q timed out.', 'SecurityScanTimedOutError', DefaultCodeScanErrorMessage)
+    }
+}
+
+export class CodeScanJobFailedError extends SecurityScanError {
+    constructor() {
+        super('Security scan failed.', 'CodeScanJobFailedError', DefaultCodeScanErrorMessage)
+    }
+}
+
+export class MaximumFileScanReachedError extends SecurityScanError {
+    constructor() {
+        super(
+            'Maximum file review count reached for this month.',
+            'MaximumFileScanReachedError',
+            i18n('AWS.amazonq.featureDev.error.monthlyLimitReached')
+        )
+    }
+}
+
+export class MaximumProjectScanReachedError extends SecurityScanError {
+    constructor() {
+        super(
+            'Maximum project review count reached for this month',
+            'MaximumProjectScanReachedError',
+            i18n('AWS.amazonq.featureDev.error.monthlyLimitReached')
+        )
+    }
+}
+
+export class TestGenError extends ToolkitError {
+    constructor(
+        error: string,
+        code: string,
+        public customerFacingMessage: string
+    ) {
+        super(error, { code })
+    }
+}
+
+export class TestGenTimedOutError extends TestGenError {
+    constructor() {
+        super('Test generation failed. Amazon Q timed out.', 'TestGenTimedOutError', defaultTestGenErrorMessage)
+    }
+}
+
+export class TestGenStoppedError extends TestGenError {
+    constructor() {
+        super('Test generation stopped by user.', 'TestGenCancelled', defaultTestGenErrorMessage)
+    }
+}
+
+export class TestGenFailedError extends TestGenError {
+    constructor(error?: string) {
+        super(error ?? 'Test generation failed', 'TestGenFailedError', defaultTestGenErrorMessage)
+    }
+}
+
+export class CodeFixError extends ToolkitError {
+    constructor(
+        error: string,
+        code: string,
+        public customerFacingMessage: string
+    ) {
+        super(error, { code })
+    }
+}
+
+export class CreateCodeFixError extends CodeFixError {
+    constructor() {
+        super('Code fix generation failed', 'CreateCodeFixFailed', defaultCodeFixErrorMessage)
+    }
+}
+
+export class CodeFixJobTimedOutError extends CodeFixError {
+    constructor() {
+        super('Code fix generation failed. Amazon Q timed out.', 'CodeFixTimedOutError', defaultCodeFixErrorMessage)
+    }
+}
+
+export class CodeFixJobStoppedError extends CodeFixError {
+    constructor() {
+        super('Code fix generation stopped by user.', 'CodeFixCancelled', defaultCodeFixErrorMessage)
+    }
+}
+
+export class MonthlyCodeFixLimitError extends CodeFixError {
+    constructor() {
+        super(
+            i18n('AWS.amazonq.codefix.error.monthlyLimitReached'),
+            MonthlyCodeFixLimitError.name,
+            defaultCodeFixErrorMessage
+        )
+    }
+}
diff --git a/packages/core/src/codewhisperer/models/model.ts b/packages/core/src/codewhisperer/models/model.ts
new file mode 100644
index 00000000000..f074fe74bd6
--- /dev/null
+++ b/packages/core/src/codewhisperer/models/model.ts
@@ -0,0 +1,1216 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { ToolkitError } from '../../shared/errors'
+import { getIcon, Icon } from '../../shared/icons'
+import {
+    CodewhispererCodeScanScope,
+    CodewhispererCompletionType,
+    CodewhispererLanguage,
+    CodewhispererTriggerType,
+    MetricBase,
+    Result,
+} from '../../shared/telemetry/telemetry'
+import { References } from '../client/codewhisperer'
+import globals from '../../shared/extensionGlobals'
+import { ChatControllerEventEmitters } from '../../amazonqGumby/chat/controller/controller'
+import { TransformationSteps } from '../client/codewhispereruserclient'
+import { Messenger } from '../../amazonqGumby/chat/controller/messenger/messenger'
+import { ScanChatControllerEventEmitters } from '../../amazonqScan/controller'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+
+// unavoidable global variables
+interface VsCodeState {
+    /**
+     * Flag indicates intelli sense pop up is active or not
+     * Adding this since VS Code intelliSense API does not expose this variable
+     */
+    isIntelliSenseActive: boolean
+    /**
+     * Flag indicates whether codewhisperer is doing vscode.TextEditor.edit
+     */
+    isCodeWhispererEditing: boolean
+    /**
+     * Keeps track of whether or not recommendations are currently running
+     */
+    isRecommendationsActive: boolean
+    /**
+     * Timestamp of previous user edit
+     */
+    lastUserModificationTime: number
+
+    isFreeTierLimitReached: boolean
+
+    lastManualTriggerTime: number
+}
+
+export const vsCodeState: VsCodeState = {
+    isIntelliSenseActive: false,
+    isCodeWhispererEditing: false,
+    // hack to globally keep track of whether or not recommendations are currently running. This allows us to know
+    // when recommendations have ran during e2e tests
+    isRecommendationsActive: false,
+    lastUserModificationTime: 0,
+    isFreeTierLimitReached: false,
+    lastManualTriggerTime: 0,
+}
+
+export interface CodeWhispererConfig {
+    readonly region: string
+    readonly endpoint: string
+}
+
+export interface RegionProfile {
+    name: string
+    region: string
+    arn: string
+    description: string
+}
+
+export type UtgStrategy = 'byName' | 'byContent'
+
+export type CrossFileStrategy = 'opentabs' | 'codemap' | 'bm25' | 'default'
+
+export type SupplementalContextStrategy = CrossFileStrategy | UtgStrategy | 'empty'
+
+export interface CodeWhispererSupplementalContext {
+    isUtg: boolean
+    isProcessTimeout: boolean
+    supplementalContextItems: CodeWhispererSupplementalContextItem[]
+    contentsLength: number
+    latency: number
+    strategy: SupplementalContextStrategy
+}
+
+export interface CodeWhispererSupplementalContextItem {
+    content: string
+    filePath: string
+    score?: number
+}
+
+// This response struct can contain more info as needed
+export interface GetRecommendationsResponse {
+    readonly result: 'Succeeded' | 'Failed'
+    readonly recommendationCount: number
+    readonly errorMessage: string | undefined
+}
+
+/** Manages the state of CodeWhisperer code suggestions */
+export class CodeSuggestionsState {
+    /** The initial state if suggestion state was not defined */
+    #fallback: boolean
+    #onDidChangeState = new vscode.EventEmitter<boolean>()
+    /** Set a callback for when the state of code suggestions changes */
+    onDidChangeState = this.#onDidChangeState.event
+
+    static #instance: CodeSuggestionsState
+    static get instance() {
+        return (this.#instance ??= new this())
+    }
+
+    protected constructor(fallback: boolean = true) {
+        this.#fallback = fallback
+    }
+
+    async toggleSuggestions() {
+        const autoTriggerEnabled = this.isSuggestionsEnabled()
+        const toSet: boolean = !autoTriggerEnabled
+        await globals.globalState.update('CODEWHISPERER_AUTO_TRIGGER_ENABLED', toSet)
+        this.#onDidChangeState.fire(toSet)
+        return toSet
+    }
+
+    async setSuggestionsEnabled(isEnabled: boolean) {
+        if (this.isSuggestionsEnabled() !== isEnabled) {
+            await this.toggleSuggestions()
+        }
+    }
+
+    isSuggestionsEnabled(): boolean {
+        const isEnabled = globals.globalState.tryGet('CODEWHISPERER_AUTO_TRIGGER_ENABLED', Boolean)
+        return isEnabled !== undefined ? isEnabled : this.#fallback
+    }
+}
+
+export interface AcceptedSuggestionEntry {
+    readonly time: Date
+    readonly fileUrl: vscode.Uri
+    readonly originalString: string
+    readonly startPosition: vscode.Position
+    readonly endPosition: vscode.Position
+    readonly requestId: string
+    readonly sessionId: string
+    readonly index: number
+    readonly triggerType: CodewhispererTriggerType
+    readonly completionType: CodewhispererCompletionType
+    readonly language: CodewhispererLanguage
+}
+
+export interface OnRecommendationAcceptanceEntry {
+    readonly editor: vscode.TextEditor | undefined
+    readonly range: vscode.Range
+    readonly effectiveRange: vscode.Range
+    readonly acceptIndex: number
+    readonly recommendation: string
+    readonly requestId: string
+    readonly sessionId: string
+    readonly triggerType: CodewhispererTriggerType
+    readonly completionType: CodewhispererCompletionType
+    readonly language: CodewhispererLanguage
+    readonly references: References | undefined
+}
+
+export interface ConfigurationEntry {
+    readonly isShowMethodsEnabled: boolean
+    readonly isManualTriggerEnabled: boolean
+    readonly isAutomatedTriggerEnabled: boolean
+    readonly isSuggestionsWithCodeReferencesEnabled: boolean
+}
+
+export interface InlineCompletionItem {
+    content: string
+    index: number
+}
+
+/**
+ *  Q Security Scans
+ */
+
+enum ScanStatus {
+    NotStarted,
+    Running,
+    Cancelling,
+}
+
+type IconPath = { light: vscode.Uri; dark: vscode.Uri; toString: () => string } | Icon
+
+abstract class BaseScanState {
+    protected scanState: ScanStatus = ScanStatus.NotStarted
+
+    protected chatControllers: ScanChatControllerEventEmitters | undefined = undefined
+
+    public isNotStarted(): boolean {
+        return this.scanState === ScanStatus.NotStarted
+    }
+
+    public isRunning(): boolean {
+        return this.scanState === ScanStatus.Running
+    }
+
+    public isCancelling(): boolean {
+        return this.scanState === ScanStatus.Cancelling
+    }
+
+    public setToNotStarted(): void {
+        this.scanState = ScanStatus.NotStarted
+    }
+
+    public setToCancelling(): void {
+        this.scanState = ScanStatus.Cancelling
+    }
+
+    public setToRunning(): void {
+        this.scanState = ScanStatus.Running
+    }
+
+    public getPrefixTextForButton(): string {
+        switch (this.scanState) {
+            case ScanStatus.NotStarted:
+                return 'Run'
+            case ScanStatus.Running:
+                return 'Stop'
+            case ScanStatus.Cancelling:
+                return 'Stopping'
+        }
+    }
+
+    public setChatControllers(controllers: ScanChatControllerEventEmitters) {
+        this.chatControllers = controllers
+    }
+    public getChatControllers() {
+        return this.chatControllers
+    }
+
+    public abstract getIconForButton(): IconPath
+}
+
+export class CodeScanState extends BaseScanState {
+    public getIconForButton(): IconPath {
+        switch (this.scanState) {
+            case ScanStatus.NotStarted:
+                return getIcon('vscode-debug-all')
+            case ScanStatus.Running:
+                return getIcon('vscode-stop-circle')
+            case ScanStatus.Cancelling:
+                return getIcon('vscode-loading~spin')
+        }
+    }
+}
+
+export class OnDemandFileScanState extends BaseScanState {
+    public getIconForButton(): IconPath {
+        switch (this.scanState) {
+            case ScanStatus.NotStarted:
+                return getIcon('vscode-debug-all')
+            case ScanStatus.Running:
+                return getIcon('vscode-stop-circle')
+            case ScanStatus.Cancelling:
+                return getIcon('vscode-icons:loading~spin')
+        }
+    }
+}
+export const codeScanState: CodeScanState = new CodeScanState()
+export const onDemandFileScanState: OnDemandFileScanState = new OnDemandFileScanState()
+
+export class CodeScansState {
+    /** The initial state if scan state was not defined */
+    #fallback: boolean
+    #onDidChangeState = new vscode.EventEmitter<boolean>()
+    /** Set a callback for when state of code scans changes */
+    onDidChangeState = this.#onDidChangeState.event
+
+    private exceedsMonthlyQuota = false
+    private latestScanTime: number | undefined = undefined
+
+    static #instance: CodeScansState
+    static get instance() {
+        return (this.#instance ??= new this())
+    }
+
+    protected constructor(fallback: boolean = false) {
+        this.#fallback = fallback
+    }
+
+    async toggleScans() {
+        const autoScansEnabled = this.isScansEnabled()
+        const toSet: boolean = !autoScansEnabled
+        await globals.globalState.update('CODEWHISPERER_AUTO_SCANS_ENABLED', toSet)
+        this.#onDidChangeState.fire(toSet)
+        return toSet
+    }
+
+    async setScansEnabled(isEnabled: boolean) {
+        if (this.isScansEnabled() !== isEnabled) {
+            await this.toggleScans()
+        }
+    }
+
+    isScansEnabled(): boolean {
+        const isEnabled = globals.globalState.tryGet('CODEWHISPERER_AUTO_SCANS_ENABLED', Boolean)
+        return isEnabled !== undefined ? isEnabled : this.#fallback
+    }
+
+    setMonthlyQuotaExceeded() {
+        this.exceedsMonthlyQuota = true
+    }
+
+    isMonthlyQuotaExceeded() {
+        return this.exceedsMonthlyQuota
+    }
+
+    setLatestScanTime(time: number) {
+        this.latestScanTime = time
+    }
+
+    getLatestScanTime() {
+        return this.latestScanTime
+    }
+}
+
+export class CodeScanStoppedError extends ToolkitError {
+    constructor() {
+        super('Security scan stopped by user.', { cancelled: true })
+    }
+}
+
+export interface CodeScanTelemetryEntry extends MetricBase {
+    codewhispererCodeScanJobId?: string
+    codewhispererLanguage: CodewhispererLanguage
+    codewhispererCodeScanProjectBytes?: number
+    codewhispererCodeScanSrcPayloadBytes: number
+    codewhispererCodeScanBuildPayloadBytes?: number
+    codewhispererCodeScanSrcZipFileBytes: number
+    codewhispererCodeScanBuildZipFileBytes?: number
+    codewhispererCodeScanLines: number
+    duration: number
+    contextTruncationDuration: number
+    artifactsUploadDuration: number
+    codeScanServiceInvocationsDuration: number
+    result: Result
+    reason?: string
+    reasonDesc?: string
+    codewhispererCodeScanTotalIssues: number
+    codewhispererCodeScanIssuesWithFixes: number
+    credentialStartUrl: string | undefined
+    codewhispererCodeScanScope: CodewhispererCodeScanScope
+    source?: string
+}
+
+export interface RecommendationDescription {
+    text: string
+    markdown: string
+}
+
+export interface Recommendation {
+    text: string
+    url: string
+}
+
+export interface SuggestedFix {
+    description: string
+    code?: string
+    references?: References
+}
+
+export interface Remediation {
+    recommendation: Recommendation
+    suggestedFixes: SuggestedFix[]
+}
+
+export interface CodeLine {
+    content: string
+    number: number
+}
+
+enum CodeFixStatus {
+    NotStarted,
+    Running,
+    Cancelling,
+}
+
+export class CodeFixState {
+    // Define a constructor for this class
+    private codeFixState: CodeFixStatus = CodeFixStatus.NotStarted
+
+    public isNotStarted() {
+        return this.codeFixState === CodeFixStatus.NotStarted
+    }
+
+    public isRunning() {
+        return this.codeFixState === CodeFixStatus.Running
+    }
+
+    public isCancelling() {
+        return this.codeFixState === CodeFixStatus.Cancelling
+    }
+
+    public setToNotStarted() {
+        this.codeFixState = CodeFixStatus.NotStarted
+    }
+
+    public setToCancelling() {
+        this.codeFixState = CodeFixStatus.Cancelling
+    }
+
+    public setToRunning() {
+        this.codeFixState = CodeFixStatus.Running
+    }
+}
+
+export const codeFixState: CodeFixState = new CodeFixState()
+
+/**
+ * Security Scan Interfaces
+ */
+
+export interface RawCodeScanIssue {
+    filePath: string
+    startLine: number
+    endLine: number
+    title: string
+    description: RecommendationDescription
+    detectorId: string
+    detectorName: string
+    findingId: string
+    ruleId?: string
+    relatedVulnerabilities: string[]
+    severity: string
+    remediation: Remediation
+    codeSnippet: CodeLine[]
+}
+
+export interface CodeScanIssue {
+    startLine: number
+    endLine: number
+    comment: string
+    title: string
+    description: RecommendationDescription
+    detectorId: string
+    detectorName: string
+    findingId: string
+    ruleId?: string
+    relatedVulnerabilities: string[]
+    severity: string
+    recommendation: Recommendation
+    suggestedFixes: SuggestedFix[]
+    visible: boolean
+    scanJobId: string
+    language: string
+    fixJobId?: string
+    autoDetected?: boolean
+}
+
+export interface AggregatedCodeScanIssue {
+    filePath: string
+    issues: CodeScanIssue[]
+}
+
+export interface SecurityPanelItem {
+    path: string
+    range: vscode.Range
+    severity: vscode.DiagnosticSeverity
+    message: string
+    issue: CodeScanIssue
+    decoration: vscode.DecorationOptions
+}
+
+export interface SecurityPanelSet {
+    path: string
+    uri: vscode.Uri
+    items: SecurityPanelItem[]
+}
+
+export const severities = ['Critical', 'High', 'Medium', 'Low', 'Info'] as const
+export type Severity = (typeof severities)[number]
+
+export interface SecurityIssueFilters {
+    severity: {
+        Critical: boolean
+        High: boolean
+        Medium: boolean
+        Low: boolean
+        Info: boolean
+    }
+}
+const defaultVisibilityState: SecurityIssueFilters = {
+    severity: {
+        Critical: true,
+        High: true,
+        Medium: true,
+        Low: true,
+        Info: true,
+    },
+}
+
+export class SecurityTreeViewFilterState {
+    #fallback: SecurityIssueFilters
+    #onDidChangeState = new vscode.EventEmitter<SecurityIssueFilters>()
+    onDidChangeState = this.#onDidChangeState.event
+
+    static #instance: SecurityTreeViewFilterState
+    static get instance() {
+        return (this.#instance ??= new this())
+    }
+
+    protected constructor(fallback: SecurityIssueFilters = defaultVisibilityState) {
+        this.#fallback = fallback
+    }
+
+    public getState(): SecurityIssueFilters {
+        return globals.globalState.tryGet('aws.amazonq.securityIssueFilters', Object) ?? this.#fallback
+    }
+
+    public async setState(state: SecurityIssueFilters) {
+        await globals.globalState.update('aws.amazonq.securityIssueFilters', state)
+        this.#onDidChangeState.fire(state)
+    }
+
+    public getHiddenSeverities() {
+        return Object.entries(this.getState().severity)
+            .filter(([_, value]) => !value)
+            .map(([key]) => key)
+    }
+
+    public resetFilters() {
+        return this.setState(defaultVisibilityState)
+    }
+}
+
+export enum CodeIssueGroupingStrategy {
+    Severity = 'Severity',
+    FileLocation = 'FileLocation',
+}
+const defaultCodeIssueGroupingStrategy = CodeIssueGroupingStrategy.Severity
+
+export const codeIssueGroupingStrategies = Object.values(CodeIssueGroupingStrategy)
+export const codeIssueGroupingStrategyLabel: Record<CodeIssueGroupingStrategy, string> = {
+    [CodeIssueGroupingStrategy.Severity]: localize('AWS.amazonq.scans.severity', 'Severity'),
+    [CodeIssueGroupingStrategy.FileLocation]: localize('AWS.amazonq.scans.fileLocation', 'File Location'),
+}
+
+export class CodeIssueGroupingStrategyState {
+    #fallback: CodeIssueGroupingStrategy
+    #onDidChangeState = new vscode.EventEmitter<CodeIssueGroupingStrategy>()
+    onDidChangeState = this.#onDidChangeState.event
+
+    static #instance: CodeIssueGroupingStrategyState
+    static get instance() {
+        return (this.#instance ??= new this())
+    }
+
+    protected constructor(fallback: CodeIssueGroupingStrategy = defaultCodeIssueGroupingStrategy) {
+        this.#fallback = fallback
+    }
+
+    public getState(): CodeIssueGroupingStrategy {
+        const state = globals.globalState.tryGet('aws.amazonq.codescan.groupingStrategy', String)
+        return this.isValidGroupingStrategy(state) ? state : this.#fallback
+    }
+
+    public async setState(_state: unknown) {
+        const state = this.isValidGroupingStrategy(_state) ? _state : this.#fallback
+        await globals.globalState.update('aws.amazonq.codescan.groupingStrategy', state)
+        this.#onDidChangeState.fire(state)
+    }
+
+    private isValidGroupingStrategy(strategy: unknown): strategy is CodeIssueGroupingStrategy {
+        return Object.values(CodeIssueGroupingStrategy).includes(strategy as CodeIssueGroupingStrategy)
+    }
+
+    public reset() {
+        return this.setState(this.#fallback)
+    }
+}
+
+/**
+ *  Q - Transform
+ */
+
+// for internal use; store status of job
+export enum TransformByQStatus {
+    NotStarted = 'Not Started',
+    Running = 'Running', // includes creating job, uploading code, analyzing, testing, transforming, etc.
+    WaitingUserInput = 'WaitingForUserInput', // The human in the loop, this period is waiting for user input to continue
+    Cancelled = 'Cancelled', // if user manually cancels
+    Failed = 'Failed', // if job is rejected or if any other error experienced; user will receive specific error message
+    Succeeded = 'Succeeded',
+    PartiallySucceeded = 'Partially Succeeded',
+}
+
+export enum TransformationType {
+    LANGUAGE_UPGRADE = 'Language Upgrade',
+    SQL_CONVERSION = 'SQL Conversion',
+}
+
+export enum TransformByQReviewStatus {
+    NotStarted = 'NotStarted',
+    PreparingReview = 'PreparingReview',
+    InReview = 'InReview',
+}
+
+export enum StepProgress {
+    NotStarted = 'Not Started',
+    Pending = 'Pending',
+    Succeeded = 'Succeeded',
+    Failed = 'Failed',
+}
+
+export enum JDKVersion {
+    JDK8 = '8',
+    JDK11 = '11',
+    JDK17 = '17',
+    JDK21 = '21',
+    UNSUPPORTED = 'UNSUPPORTED',
+}
+
+export enum DB {
+    ORACLE = 'ORACLE',
+    RDS_POSTGRESQL = 'POSTGRESQL',
+    AURORA_POSTGRESQL = 'AURORA_POSTGRESQL',
+    OTHER = 'OTHER',
+}
+
+export enum BuildSystem {
+    Maven = 'Maven',
+    Gradle = 'Gradle',
+    Unknown = 'Unknown',
+}
+
+export class ZipManifest {
+    sourcesRoot: string = 'sources/'
+    dependenciesRoot: string = 'dependencies/'
+    version: string = '1.0'
+    hilCapabilities: string[] = ['HIL_1pDependency_VersionUpgrade']
+    transformCapabilities: string[] = ['EXPLAINABILITY_V1', 'SELECTIVE_TRANSFORMATION_V2', 'CLIENT_SIDE_BUILD', 'IDE']
+    noInteractiveMode: boolean = true
+    dependencyUpgradeConfigFile?: string = undefined
+    compilationsJsonFile: string = 'compilations.json'
+    customBuildCommand: string = 'clean test'
+    requestedConversions?: {
+        sqlConversion?: {
+            source?: string
+            target?: string
+            schema?: string
+            host?: string
+            sctFileName?: string
+        }
+    }
+}
+
+export interface IHilZipManifestParams {
+    pomGroupId: string
+    pomArtifactId: string
+    targetPomVersion: string
+    dependenciesRoot?: string
+}
+export class HilZipManifest {
+    hilCapability: string = 'HIL_1pDependency_VersionUpgrade'
+    hilInput: IHilZipManifestParams = {
+        pomGroupId: '',
+        pomArtifactId: '',
+        targetPomVersion: '',
+        dependenciesRoot: 'dependencies/',
+    }
+    constructor({ pomGroupId, pomArtifactId, targetPomVersion }: IHilZipManifestParams) {
+        this.hilInput.pomGroupId = pomGroupId
+        this.hilInput.pomArtifactId = pomArtifactId
+        this.hilInput.targetPomVersion = targetPomVersion
+    }
+}
+
+export enum DropdownStep {
+    STEP_1 = 1,
+    STEP_2 = 2,
+}
+
+export const jobPlanProgress: {
+    uploadCode: StepProgress
+    buildCode: StepProgress
+    generatePlan: StepProgress
+    transformCode: StepProgress
+} = {
+    uploadCode: StepProgress.NotStarted,
+    buildCode: StepProgress.NotStarted,
+    generatePlan: StepProgress.NotStarted,
+    transformCode: StepProgress.NotStarted,
+}
+
+export let sessionJobHistory: {
+    [jobId: string]: {
+        startTime: string
+        projectName: string
+        status: string
+        duration: string
+        transformationType: string
+        sourceJDKVersion: string
+        targetJDKVersion: string
+        customDependencyVersionsFilePath: string
+        customBuildCommand: string
+    }
+} = {}
+
+export class TransformByQState {
+    private transformByQState: TransformByQStatus = TransformByQStatus.NotStarted
+
+    private transformationType: TransformationType | undefined = undefined
+
+    private projectName: string = ''
+    private projectPath: string = ''
+
+    private startTime: string = ''
+
+    private jobId: string = ''
+
+    private sourceJDKVersion: JDKVersion | undefined = undefined
+
+    private targetJDKVersion: JDKVersion | undefined = undefined
+
+    private jdkVersionToPath: Map<JDKVersion, string> = new Map()
+
+    private customBuildCommand: string = ''
+
+    private sourceDB: DB | undefined = undefined
+
+    private targetDB: DB | undefined = undefined
+
+    private schema: string = ''
+
+    private schemaOptions: Set<string> = new Set()
+
+    private sourceServerName: string = ''
+
+    private metadataPathSQL: string = ''
+
+    private customVersionPath: string = ''
+
+    private linesOfCodeSubmitted: number | undefined = undefined
+
+    private planFilePath: string = ''
+    private summaryFilePath: string = ''
+    private preBuildLogFilePath: string = ''
+    private jobHistoryPath: string = ''
+
+    private resultArchiveFilePath: string = ''
+    private projectCopyFilePath: string = ''
+
+    private polledJobStatus: string = ''
+
+    private hasSeenTransforming: boolean = false
+
+    private payloadFilePath: string = ''
+
+    private jobFailureErrorNotification: string | undefined = undefined
+
+    private jobFailureErrorChatMessage: string | undefined = undefined
+
+    private buildLog: string = ''
+
+    private mavenName: string = ''
+
+    private sourceJavaHome: string | undefined = undefined
+
+    private targetJavaHome: string | undefined = undefined
+
+    private chatControllers: ChatControllerEventEmitters | undefined = undefined
+    private chatMessenger: Messenger | undefined = undefined
+
+    private dependencyFolderInfo: FolderInfo | undefined = undefined
+
+    private planSteps: TransformationSteps | undefined = undefined
+
+    private intervalId: NodeJS.Timeout | undefined = undefined
+
+    private refreshInProgress: boolean = false
+
+    public isNotStarted() {
+        return this.transformByQState === TransformByQStatus.NotStarted
+    }
+
+    public isRunning() {
+        return this.transformByQState === TransformByQStatus.Running
+    }
+
+    public isCancelled() {
+        return this.transformByQState === TransformByQStatus.Cancelled
+    }
+
+    public isFailed() {
+        return this.transformByQState === TransformByQStatus.Failed
+    }
+
+    public isSucceeded() {
+        return this.transformByQState === TransformByQStatus.Succeeded
+    }
+
+    public isPartiallySucceeded() {
+        return this.transformByQState === TransformByQStatus.PartiallySucceeded
+    }
+
+    public isRefreshInProgress() {
+        return this.refreshInProgress
+    }
+
+    public getHasSeenTransforming() {
+        return this.hasSeenTransforming
+    }
+
+    public getTransformationType() {
+        return this.transformationType
+    }
+
+    public getProjectName() {
+        return this.projectName
+    }
+
+    public getProjectPath() {
+        return this.projectPath
+    }
+
+    public getCustomBuildCommand() {
+        return this.customBuildCommand
+    }
+
+    public getLinesOfCodeSubmitted() {
+        return this.linesOfCodeSubmitted
+    }
+
+    public getPreBuildLogFilePath() {
+        return this.preBuildLogFilePath
+    }
+
+    public getStartTime() {
+        return this.startTime
+    }
+
+    public getJobId() {
+        return this.jobId
+    }
+
+    public getSourceJDKVersion() {
+        return this.sourceJDKVersion
+    }
+
+    public getTargetJDKVersion() {
+        return this.targetJDKVersion
+    }
+
+    public getPathFromJdkVersion(version: JDKVersion | undefined) {
+        if (version) {
+            return this.jdkVersionToPath.get(version)
+        } else {
+            return undefined
+        }
+    }
+
+    public getSourceDB() {
+        return this.sourceDB
+    }
+
+    public getTargetDB() {
+        return this.targetDB
+    }
+
+    public getSchema() {
+        return this.schema
+    }
+
+    public getSchemaOptions() {
+        return this.schemaOptions
+    }
+
+    public getSourceServerName() {
+        return this.sourceServerName
+    }
+
+    public getMetadataPathSQL() {
+        return this.metadataPathSQL
+    }
+
+    public getCustomDependencyVersionFilePath() {
+        return this.customVersionPath
+    }
+
+    public getStatus() {
+        return this.transformByQState
+    }
+
+    public getPolledJobStatus() {
+        return this.polledJobStatus
+    }
+
+    public getPlanFilePath() {
+        return this.planFilePath
+    }
+
+    public getSummaryFilePath() {
+        return this.summaryFilePath
+    }
+
+    public getJobHistoryPath() {
+        return this.jobHistoryPath
+    }
+
+    public getResultArchiveFilePath() {
+        return this.resultArchiveFilePath
+    }
+
+    public getProjectCopyFilePath() {
+        return this.projectCopyFilePath
+    }
+
+    public getPayloadFilePath() {
+        return this.payloadFilePath
+    }
+
+    public getJobFailureErrorNotification() {
+        return this.jobFailureErrorNotification
+    }
+
+    public getJobFailureErrorChatMessage() {
+        return this.jobFailureErrorChatMessage
+    }
+
+    public getBuildLog() {
+        return this.buildLog
+    }
+
+    public getMavenName() {
+        return this.mavenName
+    }
+
+    public getSourceJavaHome() {
+        return this.sourceJavaHome
+    }
+
+    public getTargetJavaHome() {
+        return this.targetJavaHome
+    }
+
+    public setJdkVersionToPath(jdkVersion: JDKVersion | undefined, path: string) {
+        if (jdkVersion) {
+            this.jdkVersionToPath.set(jdkVersion, path)
+        }
+    }
+
+    public getChatControllers() {
+        return this.chatControllers
+    }
+
+    public getChatMessenger() {
+        return this.chatMessenger
+    }
+
+    public getDependencyFolderInfo(): FolderInfo | undefined {
+        return this.dependencyFolderInfo
+    }
+
+    public getPlanSteps() {
+        return this.planSteps
+    }
+
+    public getIntervalId() {
+        return this.intervalId
+    }
+
+    public appendToBuildLog(message: string) {
+        this.buildLog += `${message}\n\n`
+    }
+
+    public clearBuildLog() {
+        this.buildLog = ''
+    }
+
+    public setToNotStarted() {
+        this.transformByQState = TransformByQStatus.NotStarted
+    }
+
+    public setToRunning() {
+        this.transformByQState = TransformByQStatus.Running
+    }
+
+    public setToCancelled() {
+        this.transformByQState = TransformByQStatus.Cancelled
+    }
+
+    public setToFailed() {
+        this.transformByQState = TransformByQStatus.Failed
+    }
+
+    public setToSucceeded() {
+        this.transformByQState = TransformByQStatus.Succeeded
+    }
+
+    public setToPartiallySucceeded() {
+        this.transformByQState = TransformByQStatus.PartiallySucceeded
+    }
+
+    public setRefreshInProgress(inProgress: boolean) {
+        this.refreshInProgress = inProgress
+    }
+
+    public setHasSeenTransforming(hasSeen: boolean) {
+        this.hasSeenTransforming = hasSeen
+    }
+
+    public setTransformationType(type: TransformationType) {
+        this.transformationType = type
+    }
+
+    public setProjectName(name: string) {
+        this.projectName = name
+    }
+
+    public setProjectPath(path: string) {
+        this.projectPath = path
+    }
+
+    public setCustomBuildCommand(command: string) {
+        this.customBuildCommand = command
+    }
+
+    public setLinesOfCodeSubmitted(lines: number) {
+        this.linesOfCodeSubmitted = lines
+    }
+
+    public setStartTime(time: string) {
+        this.startTime = time
+    }
+
+    public setJobId(id: string) {
+        this.jobId = id
+    }
+
+    public setSourceJDKVersion(version: JDKVersion | undefined) {
+        this.sourceJDKVersion = version
+    }
+
+    public setTargetJDKVersion(version: JDKVersion) {
+        this.targetJDKVersion = version
+    }
+
+    public setSourceDB(db: DB) {
+        this.sourceDB = db
+    }
+
+    public setTargetDB(db: DB) {
+        this.targetDB = db
+    }
+
+    public setSchema(schema: string) {
+        this.schema = schema
+    }
+
+    public setSchemaOptions(schemaOptions: Set<string>) {
+        this.schemaOptions = schemaOptions
+    }
+
+    public setSourceServerName(serverName: string) {
+        this.sourceServerName = serverName
+    }
+
+    public setMetadataPathSQL(path: string) {
+        this.metadataPathSQL = path
+    }
+
+    public setCustomDependencyVersionFilePath(path: string) {
+        this.customVersionPath = path
+    }
+
+    public setPlanFilePath(filePath: string) {
+        this.planFilePath = filePath
+    }
+
+    public setPolledJobStatus(status: string) {
+        this.polledJobStatus = status
+    }
+
+    public setSummaryFilePath(filePath: string) {
+        this.summaryFilePath = filePath
+    }
+
+    public setJobHistoryPath(filePath: string) {
+        this.jobHistoryPath = filePath
+    }
+
+    public setResultArchiveFilePath(filePath: string) {
+        this.resultArchiveFilePath = filePath
+    }
+
+    public setProjectCopyFilePath(filePath: string) {
+        this.projectCopyFilePath = filePath
+    }
+
+    public setPayloadFilePath(payloadFilePath: string) {
+        this.payloadFilePath = payloadFilePath
+    }
+
+    public setJobFailureErrorNotification(errorNotification: string) {
+        this.jobFailureErrorNotification = errorNotification
+    }
+
+    public setJobFailureErrorChatMessage(errorChatMessage: string) {
+        this.jobFailureErrorChatMessage = errorChatMessage
+    }
+
+    public setMavenName(mavenName: string) {
+        this.mavenName = mavenName
+    }
+
+    public setSourceJavaHome(javaHome: string) {
+        this.sourceJavaHome = javaHome
+    }
+
+    public setTargetJavaHome(javaHome: string) {
+        this.targetJavaHome = javaHome
+    }
+
+    public setChatControllers(controllers: ChatControllerEventEmitters) {
+        this.chatControllers = controllers
+    }
+
+    public setChatMessenger(messenger: Messenger) {
+        this.chatMessenger = messenger
+    }
+
+    public setDependencyFolderInfo(folderInfo: FolderInfo) {
+        this.dependencyFolderInfo = folderInfo
+    }
+
+    public setIntervalId(id: NodeJS.Timeout | undefined) {
+        this.intervalId = id
+    }
+
+    public setPlanSteps(steps: TransformationSteps) {
+        this.planSteps = steps
+    }
+
+    public setPreBuildLogFilePath(path: string) {
+        this.preBuildLogFilePath = path
+    }
+
+    public resetPlanSteps() {
+        this.planSteps = undefined
+    }
+
+    public resetSessionJobHistory() {
+        sessionJobHistory = {}
+    }
+
+    public setJobDefaults() {
+        this.setToNotStarted()
+        this.refreshInProgress = false
+        this.hasSeenTransforming = false
+        this.jobFailureErrorNotification = undefined
+        this.jobFailureErrorChatMessage = undefined
+        this.payloadFilePath = ''
+        this.metadataPathSQL = ''
+        this.customVersionPath = ''
+        this.sourceJDKVersion = undefined
+        this.targetJDKVersion = undefined
+        this.sourceDB = undefined
+        this.targetDB = undefined
+        this.sourceServerName = ''
+        this.schemaOptions.clear()
+        this.schema = ''
+        this.buildLog = ''
+        this.customBuildCommand = ''
+        this.intervalId = undefined
+        this.jobHistoryPath = ''
+    }
+}
+
+export const transformByQState: TransformByQState = new TransformByQState()
+
+export class TransformByQStoppedError extends ToolkitError {
+    constructor() {
+        super('Transform by Q stopped by user.', { cancelled: true })
+    }
+}
+
+export interface TransformationCandidateProject {
+    name: string
+    path: string
+    JDKVersion?: JDKVersion
+}
+
+export interface FolderInfo {
+    path: string
+    name: string
+}
+
+export interface Reference {
+    licenseName?: string
+    repository?: string
+    url?: string
+    recommendationContentSpan?: {
+        start: number
+        end: number
+    }
+}
+
+// TODO: remove ShortAnswer because it will be deprecated
+export interface ShortAnswer {
+    testFilePath: string
+    buildCommands: string[]
+    planSummary: string
+    sourceFilePath?: string
+    testFramework?: string
+    executionCommands?: string[]
+    testCoverage?: number
+    stopIteration?: string
+    errorMessage?: string
+    codeReferences?: References
+    numberOfTestMethods?: number
+}
diff --git a/packages/core/src/codewhisperer/nextEditPrediction/activation.ts b/packages/core/src/codewhisperer/nextEditPrediction/activation.ts
new file mode 100644
index 00000000000..f302cec2ad5
--- /dev/null
+++ b/packages/core/src/codewhisperer/nextEditPrediction/activation.ts
@@ -0,0 +1,32 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { PredictionTracker } from './predictionTracker'
+import { PredictionKeyStrokeHandler } from './predictionKeyStrokeHandler'
+import { getLogger } from '../../shared/logger/logger'
+import { ExtContext } from '../../shared/extensions'
+
+export let predictionTracker: PredictionTracker | undefined
+let keyStrokeHandler: PredictionKeyStrokeHandler | undefined
+
+export function activateEditTracking(context: ExtContext): void {
+    try {
+        predictionTracker = new PredictionTracker(context.extensionContext)
+
+        keyStrokeHandler = new PredictionKeyStrokeHandler(predictionTracker)
+        context.extensionContext.subscriptions.push(
+            vscode.Disposable.from({
+                dispose: () => {
+                    keyStrokeHandler?.dispose()
+                },
+            })
+        )
+
+        getLogger('nextEditPrediction').debug('Next Edit Prediction activated')
+    } catch (error) {
+        getLogger('nextEditPrediction').error(`Error in activateEditTracking: ${error}`)
+    }
+}
diff --git a/packages/core/src/codewhisperer/nextEditPrediction/diffContextGenerator.ts b/packages/core/src/codewhisperer/nextEditPrediction/diffContextGenerator.ts
new file mode 100644
index 00000000000..9f379b82a4e
--- /dev/null
+++ b/packages/core/src/codewhisperer/nextEditPrediction/diffContextGenerator.ts
@@ -0,0 +1,154 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as diff from 'diff'
+import { getLogger } from '../../shared/logger/logger'
+import * as codewhispererClient from '../client/codewhisperer'
+import { supplementalContextMaxTotalLength, charactersLimit } from '../models/constants'
+
+const logger = getLogger('nextEditPrediction')
+
+/**
+ * Generates a unified diff format between old and new file contents
+ */
+function generateUnifiedDiffWithTimestamps(
+    oldFilePath: string,
+    newFilePath: string,
+    oldContent: string,
+    newContent: string,
+    oldTimestamp: number,
+    newTimestamp: number,
+    contextSize: number = 3
+): string {
+    const patchResult = diff.createTwoFilesPatch(
+        oldFilePath,
+        newFilePath,
+        oldContent,
+        newContent,
+        String(oldTimestamp),
+        String(newTimestamp),
+        { context: contextSize }
+    )
+
+    // Remove unused headers
+    const lines = patchResult.split('\n')
+    if (lines.length >= 2 && lines[0].startsWith('Index:')) {
+        lines.splice(0, 2)
+        return lines.join('\n')
+    }
+
+    return patchResult
+}
+
+export interface SnapshotContent {
+    filePath: string
+    content: string
+    timestamp: number
+}
+
+/**
+ * Generates supplemental contexts from snapshot contents and current content
+ *
+ * @param filePath - Path to the file
+ * @param currentContent - Current content of the file
+ * @param snapshotContents - List of snapshot contents sorted by timestamp (oldest first)
+ * @param maxContexts - Maximum number of supplemental contexts to return
+ * @returns Array of SupplementalContext objects, T_0 being the snapshot of current file content:
+ *  U0: udiff of T_0 and T_1
+ *  U1: udiff of T_0 and T_2
+ *  U2: udiff of T_0 and T_3
+ */
+export function generateDiffContexts(
+    filePath: string,
+    currentContent: string,
+    snapshotContents: SnapshotContent[],
+    maxContexts: number
+): codewhispererClient.SupplementalContext[] {
+    if (snapshotContents.length === 0) {
+        return []
+    }
+
+    const supplementalContexts: codewhispererClient.SupplementalContext[] = []
+    const currentTimestamp = Date.now()
+
+    for (let i = snapshotContents.length - 1; i >= 0; i--) {
+        const snapshot = snapshotContents[i]
+        try {
+            const unifiedDiff = generateUnifiedDiffWithTimestamps(
+                snapshot.filePath,
+                filePath,
+                snapshot.content,
+                currentContent,
+                snapshot.timestamp,
+                currentTimestamp
+            )
+
+            supplementalContexts.push({
+                filePath: snapshot.filePath,
+                content: unifiedDiff,
+                type: 'PreviousEditorState',
+                metadata: {
+                    previousEditorStateMetadata: {
+                        timeOffset: currentTimestamp - snapshot.timestamp,
+                    },
+                },
+            })
+        } catch (err) {
+            logger.error(`Failed to generate diff: ${err}`)
+        }
+    }
+
+    const trimmedContext = trimSupplementalContexts(supplementalContexts, maxContexts)
+    logger.debug(
+        `supplemental contexts: ${trimmedContext.length} contexts, total size: ${trimmedContext.reduce((sum, ctx) => sum + ctx.content.length, 0)} characters`
+    )
+    return trimmedContext
+}
+
+/**
+ * Trims the supplementalContexts array to ensure it doesn't exceed the max number
+ * of contexts or total character length limit
+ *
+ * @param supplementalContexts - Array of SupplementalContext objects (already sorted with newest first)
+ * @param maxContexts - Maximum number of supplemental contexts allowed
+ * @returns Trimmed array of SupplementalContext objects
+ */
+export function trimSupplementalContexts(
+    supplementalContexts: codewhispererClient.SupplementalContext[],
+    maxContexts: number
+): codewhispererClient.SupplementalContext[] {
+    if (supplementalContexts.length === 0) {
+        return supplementalContexts
+    }
+
+    // First filter out any individual context that exceeds the character limit
+    let result = supplementalContexts.filter((context) => {
+        return context.content.length <= charactersLimit
+    })
+
+    // Then limit by max number of contexts
+    if (result.length > maxContexts) {
+        result = result.slice(0, maxContexts)
+    }
+
+    // Lastly enforce total character limit
+    let totalLength = 0
+    let i = 0
+
+    while (i < result.length) {
+        totalLength += result[i].content.length
+        if (totalLength > supplementalContextMaxTotalLength) {
+            break
+        }
+        i++
+    }
+
+    if (i === result.length) {
+        return result
+    }
+
+    const trimmedContexts = result.slice(0, i)
+    return trimmedContexts
+}
diff --git a/packages/core/src/codewhisperer/nextEditPrediction/predictionKeyStrokeHandler.ts b/packages/core/src/codewhisperer/nextEditPrediction/predictionKeyStrokeHandler.ts
new file mode 100644
index 00000000000..b09272f0d8b
--- /dev/null
+++ b/packages/core/src/codewhisperer/nextEditPrediction/predictionKeyStrokeHandler.ts
@@ -0,0 +1,117 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { PredictionTracker } from './predictionTracker'
+
+/**
+ * Monitors document changes in the editor and track them for prediction.
+ */
+export class PredictionKeyStrokeHandler {
+    private disposables: vscode.Disposable[] = []
+    private tracker: PredictionTracker
+    private shadowCopies: Map<string, string> = new Map()
+
+    /**
+     * Creates a new PredictionKeyStrokeHandler
+     * @param context The extension context
+     * @param tracker The prediction tracker instance
+     * @param config Configuration options
+     */
+    constructor(tracker: PredictionTracker) {
+        this.tracker = tracker
+
+        // Initialize shadow copies for currently visible editors when extension starts
+        this.initializeVisibleDocuments()
+
+        // Register event handlers
+        this.registerVisibleDocumentListener()
+        this.registerTextDocumentChangeListener()
+    }
+
+    /**
+     * Initializes shadow copies for all currently visible text editors
+     */
+    private initializeVisibleDocuments(): void {
+        const editors = vscode.window.visibleTextEditors
+
+        for (const editor of editors) {
+            if (editor.document.uri.scheme === 'file') {
+                this.updateShadowCopy(editor.document)
+            }
+        }
+    }
+
+    /**
+     * Registers listeners for visibility events to maintain shadow copies of document content
+     * Only store and update shadow copies for currently visible editors
+     * And remove shadow copies for files that are no longer visible
+     * And edits are processed only if a shadow copy exists
+     * This avoids the memory problem if hidden files are bulk edited, i.e. with global find/replace
+     */
+    private registerVisibleDocumentListener(): void {
+        // Track when documents become visible (switched to)
+        const visibleDisposable = vscode.window.onDidChangeVisibleTextEditors((editors) => {
+            const currentVisibleFiles = new Set<string>()
+
+            for (const editor of editors) {
+                if (editor.document.uri.scheme === 'file') {
+                    const filePath = editor.document.uri.fsPath
+                    currentVisibleFiles.add(filePath)
+                    this.updateShadowCopy(editor.document)
+                }
+            }
+
+            for (const filePath of this.shadowCopies.keys()) {
+                if (!currentVisibleFiles.has(filePath)) {
+                    this.shadowCopies.delete(filePath)
+                }
+            }
+        })
+
+        this.disposables.push(visibleDisposable)
+    }
+
+    private updateShadowCopy(document: vscode.TextDocument): void {
+        if (document.uri.scheme === 'file') {
+            this.shadowCopies.set(document.uri.fsPath, document.getText())
+        }
+    }
+
+    /**
+     * Registers listener for text document changes to send to tracker
+     */
+    private registerTextDocumentChangeListener(): void {
+        // Listen for document changes
+        const changeDisposable = vscode.workspace.onDidChangeTextDocument(async (event) => {
+            const filePath = event.document.uri.fsPath
+            const prevContent = this.shadowCopies.get(filePath)
+
+            // Skip if there are no content changes or if the file is not visible
+            if (
+                event.contentChanges.length === 0 ||
+                event.document.uri.scheme !== 'file' ||
+                prevContent === undefined
+            ) {
+                return
+            }
+
+            await this.tracker.processEdit(event.document, prevContent)
+            this.updateShadowCopy(event.document)
+        })
+
+        this.disposables.push(changeDisposable)
+    }
+
+    /**
+     * Disposes of all resources used by this handler
+     */
+    public dispose(): void {
+        for (const disposable of this.disposables) {
+            disposable.dispose()
+        }
+        this.disposables = []
+    }
+}
diff --git a/packages/core/src/codewhisperer/nextEditPrediction/predictionTracker.ts b/packages/core/src/codewhisperer/nextEditPrediction/predictionTracker.ts
new file mode 100644
index 00000000000..1bfafb53114
--- /dev/null
+++ b/packages/core/src/codewhisperer/nextEditPrediction/predictionTracker.ts
@@ -0,0 +1,236 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../../shared/logger/logger'
+import * as diffGenerator from './diffContextGenerator'
+import * as codewhispererClient from '../client/codewhisperer'
+import { predictionTrackerDefaultConfig } from '../models/constants'
+import globals from '../../shared/extensionGlobals'
+
+// defaul values are stored in codewhisperer/model/constants
+export interface FileTrackerConfig {
+    maxStorageSizeKb: number
+    debounceIntervalMs: number
+    maxAgeMs: number
+    maxSupplementalContext: number
+}
+
+/**
+ * Represents a snapshot of a file at a specific point in time
+ */
+export interface FileSnapshot {
+    filePath: string
+    size: number
+    timestamp: number
+    content: string
+}
+
+export class PredictionTracker {
+    private snapshots: Map<string, FileSnapshot[]> = new Map()
+    private logger = getLogger('nextEditPrediction')
+    readonly config: FileTrackerConfig
+    private storageSize: number = 0
+
+    constructor(extensionContext: vscode.ExtensionContext, config?: Partial<FileTrackerConfig>) {
+        this.config = {
+            ...predictionTrackerDefaultConfig,
+            ...config,
+        }
+    }
+
+    /**
+     * Processes an edit to a document and takes a snapshot if needed
+     * @param document The document being edited
+     * @param previousContent The content of the document before the edit
+     */
+    public async processEdit(document: vscode.TextDocument, previousContent: string): Promise<void> {
+        const filePath = document.uri.fsPath
+
+        try {
+            // Get existing snapshots for this file
+            const fileSnapshots = this.snapshots.get(filePath) || []
+            const timestamp = globals.clock.Date.now()
+
+            // Anti-throttling, only add snap shot after the debounce is cleared
+            const shouldAddSnapshot =
+                fileSnapshots.length === 0 ||
+                timestamp - fileSnapshots[fileSnapshots.length - 1].timestamp > this.config.debounceIntervalMs
+
+            if (!shouldAddSnapshot) {
+                return
+            }
+
+            const content = previousContent
+            const size = Buffer.byteLength(content, 'utf8')
+            const snapshot: FileSnapshot = {
+                filePath,
+                size,
+                timestamp,
+                content,
+            }
+
+            fileSnapshots.push(snapshot)
+            this.snapshots.set(filePath, fileSnapshots)
+            this.storageSize += size
+            this.logger.debug(
+                `Snapshot taken for file: ${filePath}, total snapshots: ${this.getTotalSnapshotCount()}, total size: ${Math.round(this.storageSize / 1024)} KB`
+            )
+
+            await this.enforceMemoryLimits()
+            this.enforceTimeLimits(snapshot)
+        } catch (err) {
+            this.logger.error(`Failed to save snapshot: ${err}`)
+        }
+    }
+
+    /**
+     * Sets up a timeout to delete the given snapshot after it exceeds the max age
+     */
+    private enforceTimeLimits(snapshot: FileSnapshot): void {
+        const fileSnapshots = this.snapshots.get(snapshot.filePath)
+        if (fileSnapshots === undefined) {
+            return
+        }
+
+        setTimeout(() => {
+            // find the snapshot and remove it
+            const index = fileSnapshots.indexOf(snapshot)
+            if (index !== -1) {
+                fileSnapshots.splice(index, 1)
+                this.storageSize -= snapshot.size
+                if (fileSnapshots.length === 0) {
+                    this.snapshots.delete(snapshot.filePath)
+                }
+                this.logger.debug(
+                    `Snapshot deleted (aged out) for file: ${snapshot.filePath}, remaining snapshots: ${this.getTotalSnapshotCount()}, new size: ${Math.round(this.storageSize / 1024)} KB`
+                )
+            }
+        }, this.config.maxAgeMs)
+    }
+
+    /**
+     * Enforces memory limits by removing old snapshots if necessary
+     */
+    private async enforceMemoryLimits(): Promise<void> {
+        while (this.storageSize > this.config.maxStorageSizeKb * 1024) {
+            const oldestFile = this.findOldestFile()
+            if (!oldestFile) {
+                break
+            }
+
+            const fileSnapshots = this.snapshots.get(oldestFile)
+            if (!fileSnapshots || fileSnapshots.length === 0) {
+                this.snapshots.delete(oldestFile)
+                continue
+            }
+
+            const removedSnapshot = fileSnapshots.shift()
+            if (removedSnapshot) {
+                this.storageSize -= removedSnapshot.size
+                this.logger.debug(
+                    `Snapshot deleted (memory limit) for file: ${removedSnapshot.filePath}, remaining snapshots: ${this.getTotalSnapshotCount()}, new size: ${Math.round(this.storageSize / 1024)} KB`
+                )
+            }
+
+            if (fileSnapshots.length === 0) {
+                this.snapshots.delete(oldestFile)
+            }
+        }
+    }
+
+    /**
+     * Finds the file with the oldest snapshot
+     * @returns The file path of the oldest snapshot
+     */
+    private findOldestFile(): string | undefined {
+        let oldestTime = Number.MAX_SAFE_INTEGER
+        let oldestFile: string | undefined
+
+        for (const [filePath, snapshots] of this.snapshots.entries()) {
+            if (snapshots.length === 0) {
+                continue
+            }
+
+            const oldestSnapshot = snapshots[0]
+            if (oldestSnapshot.timestamp < oldestTime) {
+                oldestTime = oldestSnapshot.timestamp
+                oldestFile = filePath
+            }
+        }
+
+        return oldestFile
+    }
+
+    /**
+     * Gets all snapshots for a specific file
+     * @param filePath The path to the file
+     * @returns Array of snapshots for the file
+     */
+    public getFileSnapshots(filePath: string): FileSnapshot[] {
+        return this.snapshots.get(filePath) || []
+    }
+
+    /**
+     * Gets all tracked files
+     * @returns Array of file paths
+     */
+    public getTrackedFiles(): string[] {
+        return Array.from(this.snapshots.keys())
+    }
+
+    public getTotalSnapshotCount(): number {
+        return Array.from(this.snapshots.values()).reduce((count, snapshots) => count + snapshots.length, 0)
+    }
+
+    public async getSnapshotContent(snapshot: FileSnapshot): Promise<string> {
+        return snapshot.content
+    }
+
+    /**
+     * Generates unified diffs between adjacent snapshots of a file
+     * and between the newest snapshot and the current file content
+     *
+     * @returns Array of SupplementalContext objects containing diffs between snapshots and current content
+     */
+    public async generatePredictionSupplementalContext(): Promise<codewhispererClient.SupplementalContext[]> {
+        try {
+            const activeEditor = vscode.window.activeTextEditor
+            if (activeEditor === undefined) {
+                return []
+            }
+            const filePath = activeEditor.document.uri.fsPath
+            const currentContent = activeEditor.document.getText()
+            const snapshots = this.getFileSnapshots(filePath)
+
+            if (snapshots.length === 0) {
+                return []
+            }
+
+            // Create SnapshotContent array from snapshots
+            const snapshotContents: diffGenerator.SnapshotContent[] = snapshots.map((snapshot) => ({
+                filePath: snapshot.filePath,
+                content: snapshot.content,
+                timestamp: snapshot.timestamp,
+            }))
+
+            // Use the diffGenerator module to generate supplemental contexts
+            return diffGenerator.generateDiffContexts(
+                filePath,
+                currentContent,
+                snapshotContents,
+                this.config.maxSupplementalContext
+            )
+        } catch (err) {
+            // this ensures we are not breaking inline requests
+            this.logger.error(`Failed to generate prediction supplemental context: ${err}`)
+            return []
+        }
+    }
+
+    public getTotalSize() {
+        return this.storageSize
+    }
+}
diff --git a/packages/core/src/codewhisperer/paginators.json b/packages/core/src/codewhisperer/paginators.json
new file mode 100644
index 00000000000..19508654dad
--- /dev/null
+++ b/packages/core/src/codewhisperer/paginators.json
@@ -0,0 +1,19 @@
+{
+    "pagination": {
+        "ListCodeScanFindings": {
+            "input_token": "nextToken",
+            "output_token": "nextToken"
+        },
+        "ListProfiles": {
+            "input_token": "nextToken",
+            "output_token": "nextToken",
+            "limit_key": "maxResults",
+            "result_key": "profiles"
+        },
+        "ListRecommendations": {
+            "input_token": "nextToken",
+            "output_token": "nextToken",
+            "limit_key": "maxResults"
+        }
+    }
+}
diff --git a/packages/core/src/codewhisperer/region/regionProfileManager.ts b/packages/core/src/codewhisperer/region/regionProfileManager.ts
new file mode 100644
index 00000000000..aab2ed04dab
--- /dev/null
+++ b/packages/core/src/codewhisperer/region/regionProfileManager.ts
@@ -0,0 +1,416 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getIcon } from '../../shared/icons'
+import { DataQuickPickItem } from '../../shared/ui/pickerPrompter'
+import { CodeWhispererConfig, RegionProfile } from '../models/model'
+import { showConfirmationMessage } from '../../shared/utilities/messages'
+import {
+    Connection,
+    isBuilderIdConnection,
+    isIdcSsoConnection,
+    isSsoConnection,
+    SsoConnection,
+} from '../../auth/connection'
+import globals from '../../shared/extensionGlobals'
+import { once } from '../../shared/utilities/functionUtils'
+import CodeWhispererUserClient from '../client/codewhispereruserclient'
+import { AwsCredentialIdentity } from '@aws-sdk/types'
+import { Service } from 'aws-sdk'
+import { ServiceOptions } from '../../shared/awsClientBuilder'
+import userApiConfig = require('../client/user-service-2.json')
+import { createConstantMap } from '../../shared/utilities/tsUtils'
+import { getLogger } from '../../shared/logger/logger'
+import { pageableToCollection } from '../../shared/utilities/collectionUtils'
+import { parse } from '@aws-sdk/util-arn-parser'
+import { isAwsError, ToolkitError } from '../../shared/errors'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { Commands } from '../../shared/vscode/commands2'
+import { CachedResource } from '../../shared/utilities/resourceCache'
+
+// TODO: is there a better way to manage all endpoint strings in one place?
+export const defaultServiceConfig: CodeWhispererConfig = {
+    region: 'us-east-1',
+    endpoint: 'https://codewhisperer.us-east-1.amazonaws.com/',
+}
+
+// Hack until we have a single discovery endpoint. We will call each endpoint one by one to fetch profile before then.
+const endpoints = createConstantMap({
+    'us-east-1': 'https://q.us-east-1.amazonaws.com/',
+    'eu-central-1': 'https://q.eu-central-1.amazonaws.com/',
+})
+
+/**
+ * 'user' -> users change the profile through Q menu
+ * 'auth' -> users change the profile through webview profile selector page
+ * 'update' -> plugin auto select the profile on users' behalf as there is only 1 profile
+ * 'reload' -> on plugin restart, plugin will try to reload previous selected profile
+ */
+export type ProfileSwitchIntent = 'user' | 'auth' | 'update' | 'reload' | 'customization'
+
+export type ProfileChangedEvent = {
+    profile: RegionProfile | undefined
+    intent: ProfileSwitchIntent
+}
+
+export class RegionProfileManager {
+    private static logger = getLogger()
+    private _activeRegionProfile: RegionProfile | undefined
+    private _onDidChangeRegionProfile = new vscode.EventEmitter<ProfileChangedEvent>()
+    public readonly onDidChangeRegionProfile = this._onDidChangeRegionProfile.event
+
+    // Store the last API results (for UI propuse) so we don't need to call service again if doesn't require "latest" result
+    private _profiles: RegionProfile[] = []
+
+    private readonly cache = new (class extends CachedResource<RegionProfile[]> {
+        constructor(private readonly profileProvider: () => Promise<RegionProfile[]>) {
+            super(
+                'aws.amazonq.regionProfiles.cache',
+                3600000,
+                {
+                    resource: {
+                        locked: false,
+                        timestamp: 0,
+                        result: undefined,
+                    },
+                },
+                { timeout: 15000, interval: 500, truthy: true }
+            )
+        }
+
+        override resourceProvider(): Promise<RegionProfile[]> {
+            return this.profileProvider()
+        }
+    })(this.listRegionProfile.bind(this))
+
+    get activeRegionProfile() {
+        const conn = this.connectionProvider()
+        if (isBuilderIdConnection(conn)) {
+            return undefined
+        }
+        return this._activeRegionProfile
+    }
+
+    get clientConfig(): CodeWhispererConfig {
+        const conn = this.connectionProvider()
+        if (!conn) {
+            throw new ToolkitError('trying to get client configuration without credential')
+        }
+
+        // builder id should simply use default IAD
+        if (isBuilderIdConnection(conn)) {
+            return defaultServiceConfig
+        }
+
+        // idc
+        const p = this.activeRegionProfile
+        if (p) {
+            const region = p.region
+            const endpoint = endpoints.get(p.region)
+            if (endpoint === undefined) {
+                RegionProfileManager.logger.error(
+                    `Not found endpoint for region ${region}, not able to initialize a codewhisperer client`
+                )
+                throw new ToolkitError(`Q client configuration error, endpoint not found for region ${region}`)
+            }
+            return {
+                region: region,
+                endpoint: endpoint,
+            }
+        }
+
+        return defaultServiceConfig
+    }
+
+    get profiles(): RegionProfile[] {
+        return this._profiles
+    }
+
+    constructor(private readonly connectionProvider: () => Connection | undefined) {}
+
+    async getProfiles(): Promise<RegionProfile[]> {
+        return this.cache.getResource()
+    }
+
+    async listRegionProfile(): Promise<RegionProfile[]> {
+        this._profiles = []
+
+        const conn = this.connectionProvider()
+        if (conn === undefined || !isSsoConnection(conn)) {
+            return []
+        }
+        const availableProfiles: RegionProfile[] = []
+        const failedRegions: string[] = []
+
+        for (const [region, endpoint] of endpoints.entries()) {
+            const client = await this._createQClient(region, endpoint, conn as SsoConnection)
+            const requester = async (request: CodeWhispererUserClient.ListAvailableProfilesRequest) =>
+                client.listAvailableProfiles(request).promise()
+            const request: CodeWhispererUserClient.ListAvailableProfilesRequest = {}
+            try {
+                const profiles = await pageableToCollection(requester, request, 'nextToken', 'profiles')
+                    .flatten()
+                    .promise()
+                const mappedPfs = profiles.map((it) => {
+                    let accntId = ''
+                    try {
+                        accntId = parse(it.arn).accountId
+                    } catch (e) {}
+
+                    return {
+                        name: it.profileName,
+                        region: region,
+                        arn: it.arn,
+                        description: accntId,
+                    }
+                })
+
+                availableProfiles.push(...mappedPfs)
+                RegionProfileManager.logger.debug(`Found ${mappedPfs.length} profiles in region ${region}`)
+            } catch (e) {
+                const logMsg = isAwsError(e) ? `requestId=${e.requestId}; message=${e.message}` : (e as Error).message
+                RegionProfileManager.logger.error(`Failed to list profiles for region ${region}: ${logMsg}`)
+                failedRegions.push(region)
+            }
+        }
+
+        // Throw error if any regional API calls failed and no profiles are available
+        if (failedRegions.length > 0 && availableProfiles.length === 0) {
+            throw new ToolkitError(`Failed to list Q Developer profiles for regions: ${failedRegions.join(', ')}`, {
+                code: 'ListQDeveloperProfilesFailed',
+            })
+        }
+
+        // Throw an error if all listAvailableProfile calls succeeded, but user has no Q developer profiles
+        // This is not an expected state
+        if (failedRegions.length === 0 && availableProfiles.length === 0) {
+            throw new ToolkitError('This user has no Q Developer profiles', { code: 'QDeveloperProfileNotFound' })
+        }
+
+        this._profiles = availableProfiles
+        return availableProfiles
+    }
+
+    async switchRegionProfile(regionProfile: RegionProfile | undefined, source: ProfileSwitchIntent) {
+        const conn = this.connectionProvider()
+        if (conn === undefined || !isIdcSsoConnection(conn)) {
+            return
+        }
+
+        if (regionProfile && this.activeRegionProfile && regionProfile.arn === this.activeRegionProfile.arn) {
+            return
+        }
+
+        // TODO: make it typesafe
+        const ssoConn = this.connectionProvider() as SsoConnection
+
+        // only prompt to users when users switch from A profile to B profile
+        if (source !== 'customization' && this.activeRegionProfile !== undefined && regionProfile !== undefined) {
+            const response = await showConfirmationMessage({
+                prompt: localize(
+                    'AWS.amazonq.profile.confirmation',
+                    "Do you want to change your Q Developer profile to '{0}'?\n When you change profiles, you will no longer have access to your current customizations, chats, code reviews, or any other code or content being generated by Amazon Q",
+                    regionProfile?.name
+                ),
+                confirm: 'Switch profiles',
+                cancel: 'Cancel',
+                type: 'info',
+            })
+
+            if (!response) {
+                telemetry.amazonq_didSelectProfile.emit({
+                    source: source,
+                    amazonQProfileRegion: this.activeRegionProfile?.region ?? 'not-set',
+                    ssoRegion: ssoConn.ssoRegion,
+                    result: 'Cancelled',
+                    credentialStartUrl: ssoConn.startUrl,
+                    profileCount: this.profiles.length,
+                })
+                return
+            }
+        }
+
+        if (source === 'reload' || source === 'update') {
+            telemetry.amazonq_profileState.emit({
+                source: source,
+                amazonQProfileRegion: regionProfile?.region ?? 'not-set',
+                result: 'Succeeded',
+            })
+        } else {
+            telemetry.amazonq_didSelectProfile.emit({
+                source: source,
+                amazonQProfileRegion: regionProfile?.region ?? 'not-set',
+                ssoRegion: ssoConn.ssoRegion,
+                result: 'Succeeded',
+                credentialStartUrl: ssoConn.startUrl,
+                profileCount: this.profiles.length,
+            })
+        }
+
+        await this._switchRegionProfile(regionProfile, source)
+    }
+
+    private async _switchRegionProfile(regionProfile: RegionProfile | undefined, source: ProfileSwitchIntent) {
+        this._activeRegionProfile = regionProfile
+
+        this._onDidChangeRegionProfile.fire({
+            profile: regionProfile,
+            intent: source,
+        })
+        // dont show if it's a default (fallback)
+        if (regionProfile && this.profiles.length > 1) {
+            void vscode.window.showInformationMessage(`You are using the ${regionProfile.name} profile for Q.`).then()
+        }
+
+        // persist to state
+        await this.persistSelectRegionProfile()
+
+        // Force status bar to reflect this change in state
+        await Commands.tryExecute('aws.amazonq.refreshStatusBar')
+    }
+
+    restoreProfileSelection = once(async () => {
+        const conn = this.connectionProvider()
+        if (conn) {
+            await this.restoreRegionProfile(conn)
+        }
+    })
+
+    // Note: should be called after [AuthUtil.instance.conn] returns non null
+    async restoreRegionProfile(conn: Connection) {
+        const previousSelected = this.loadPersistedRegionProfle()[conn.id] || undefined
+        if (!previousSelected) {
+            return
+        }
+
+        await this.switchRegionProfile(previousSelected, 'reload')
+    }
+
+    private loadPersistedRegionProfle(): { [label: string]: RegionProfile } {
+        const previousPersistedState = globals.globalState.tryGet<{ [label: string]: RegionProfile }>(
+            'aws.amazonq.regionProfiles',
+            Object,
+            {}
+        )
+
+        return previousPersistedState
+    }
+
+    async persistSelectRegionProfile() {
+        const conn = this.connectionProvider()
+
+        // default has empty arn and shouldn't be persisted because it's just a fallback
+        if (!conn || this.activeRegionProfile === undefined) {
+            return
+        }
+
+        // persist connectionId to profileArn
+        const previousPersistedState = globals.globalState.tryGet<{ [label: string]: RegionProfile }>(
+            'aws.amazonq.regionProfiles',
+            Object,
+            {}
+        )
+
+        previousPersistedState[conn.id] = this.activeRegionProfile
+        await globals.globalState.update('aws.amazonq.regionProfiles', previousPersistedState)
+    }
+
+    async generateQuickPickItem(): Promise<DataQuickPickItem<string>[]> {
+        const selected = this.activeRegionProfile
+        let profiles: RegionProfile[] = []
+        try {
+            profiles = await this.getProfiles()
+        } catch (e) {
+            return [
+                {
+                    label: '[Failed to list available profiles]',
+                    detail: `${(e as Error).message}`,
+                    data: '',
+                },
+            ]
+        }
+        const icon = getIcon('vscode-account')
+        const quickPickItems: DataQuickPickItem<string>[] = profiles.map((it) => {
+            const label = it.name
+            const onClick = async () => {
+                await this.switchRegionProfile(it, 'user')
+            }
+            const data = it.arn
+            const description = it.region
+            const isRecentlyUsed = selected ? selected.arn === it.arn : false
+
+            return {
+                label: `${icon} ${label}`,
+                onClick: onClick,
+                data: data,
+                description: description,
+                recentlyUsed: isRecentlyUsed,
+                detail: it.description,
+            }
+        })
+
+        return quickPickItems
+    }
+
+    async invalidateProfile(arn: string | undefined) {
+        if (arn) {
+            if (this.activeRegionProfile && this.activeRegionProfile.arn === arn) {
+                this._activeRegionProfile = undefined
+            }
+
+            const profiles = this.loadPersistedRegionProfle()
+            const updatedProfiles = Object.fromEntries(
+                Object.entries(profiles).filter(([connId, profile]) => profile.arn !== arn)
+            )
+            await globals.globalState.update('aws.amazonq.regionProfiles', updatedProfiles)
+        }
+    }
+
+    // Should be called on connection changed in case users change to a differnet connection and use the wrong resultset.
+    async clearCache() {
+        await this.cache.clearCache()
+    }
+
+    // TODO: Should maintain sdk client in a better way
+    async createQClient(profile: RegionProfile): Promise<CodeWhispererUserClient> {
+        const conn = this.connectionProvider()
+        if (conn === undefined || !isSsoConnection(conn)) {
+            throw new Error('No valid SSO connection')
+        }
+        const endpoint = endpoints.get(profile.region)
+        if (!endpoint) {
+            throw new Error(`trying to initiatize Q client with unrecognizable region ${profile.region}`)
+        }
+        return this._createQClient(profile.region, endpoint, conn)
+    }
+
+    // Visible for testing only, do not use this directly, please use createQClient(profile)
+    async _createQClient(region: string, endpoint: string, conn: SsoConnection): Promise<CodeWhispererUserClient> {
+        const token = (await conn.getToken()).accessToken
+        const serviceOption: ServiceOptions = {
+            apiConfig: userApiConfig,
+            region: region,
+            endpoint: endpoint,
+            credentials: { accessKeyId: 'xxx', secretAccessKey: 'xxx' } as AwsCredentialIdentity,
+            onRequestSetup: [
+                (req) => {
+                    req.on('build', ({ httpRequest }) => {
+                        httpRequest.headers['Authorization'] = `Bearer ${token}`
+                    })
+                },
+            ],
+        } as ServiceOptions
+
+        const c = (await globals.sdkClientBuilder.createAwsService(
+            Service,
+            serviceOption,
+            undefined
+        )) as CodeWhispererUserClient
+
+        return c
+    }
+}
diff --git a/packages/core/src/codewhisperer/region/utils.ts b/packages/core/src/codewhisperer/region/utils.ts
new file mode 100644
index 00000000000..dd988f74a30
--- /dev/null
+++ b/packages/core/src/codewhisperer/region/utils.ts
@@ -0,0 +1,49 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+import { AmazonQPromptSettings } from '../../shared/settings'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import vscode from 'vscode'
+import { selectRegionProfileCommand } from '../commands/basicCommands'
+import { placeholder } from '../../shared/vscode/commands2'
+import { toastMessage } from '../commands/types'
+
+/**
+ * Creates a toast message telling the user they need to select a Developer Profile
+ */
+export async function notifySelectDeveloperProfile() {
+    const suppressId = 'amazonQSelectDeveloperProfile'
+    const settings = AmazonQPromptSettings.instance
+    const shouldShow = settings.isPromptEnabled(suppressId)
+    if (!shouldShow) {
+        return
+    }
+
+    const message = localize(
+        'aws.amazonq.profile.mustSelectMessage',
+        'You must select a Q Developer Profile for Amazon Q features to work.'
+    )
+    const selectProfile = 'Select Profile'
+    const dontShowAgain = 'Dont Show Again'
+
+    await telemetry.toolkit_showNotification.run(async () => {
+        telemetry.record({ id: 'mustSelectDeveloperProfileMessage' })
+        void vscode.window.showWarningMessage(message, selectProfile, dontShowAgain).then(async (resp) => {
+            await telemetry.toolkit_invokeAction.run(async () => {
+                if (resp === selectProfile) {
+                    // Show Profile
+                    telemetry.record({ action: 'select' })
+                    void selectRegionProfileCommand.execute(placeholder, toastMessage)
+                } else if (resp === dontShowAgain) {
+                    telemetry.record({ action: 'dontShowAgain' })
+                    await settings.disablePrompt(suppressId)
+                } else {
+                    telemetry.record({ action: 'ignore' })
+                }
+            })
+        })
+    })
+}
diff --git a/packages/core/src/codewhisperer/service/classifierTrigger.ts b/packages/core/src/codewhisperer/service/classifierTrigger.ts
new file mode 100644
index 00000000000..842d5312e68
--- /dev/null
+++ b/packages/core/src/codewhisperer/service/classifierTrigger.ts
@@ -0,0 +1,609 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import os from 'os'
+import * as vscode from 'vscode'
+import { CodewhispererAutomatedTriggerType } from '../../shared/telemetry/telemetry'
+import { extractContextForCodeWhisperer } from '../util/editorContext'
+import { TelemetryHelper } from '../util/telemetryHelper'
+import { ProgrammingLanguage } from '../client/codewhispereruserclient'
+
+interface normalizedCoefficients {
+    readonly lineNum: number
+    readonly lenLeftCur: number
+    readonly lenLeftPrev: number
+    readonly lenRight: number
+}
+/*
+ uses ML classifier to determine if user input should trigger CWSPR service
+ */
+export class ClassifierTrigger {
+    static #instance: ClassifierTrigger
+
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+
+    // ML classifier trigger threshold
+    private triggerThreshold = 0.43
+
+    // ML classifier coefficients
+    // os coefficient
+    private osCoefficientMap: Readonly<Record<string, number>> = {
+        'Mac OS X': -0.1552,
+        'Windows 10': -0.0238,
+        Windows: 0.0412,
+        win32: -0.0559,
+    }
+
+    // trigger type coefficient
+    private triggerTypeCoefficientMap: Readonly<Record<string, number>> = {
+        SpecialCharacters: 0.0209,
+        Enter: 0.2853,
+    }
+
+    private languageCoefficientMap: Readonly<Record<string, number>> = {
+        java: -0.4622,
+        javascript: -0.4688,
+        python: -0.3052,
+        typescript: -0.6084,
+        tsx: -0.6084,
+        jsx: -0.4688,
+        shell: -0.4718,
+        ruby: -0.7356,
+        sql: -0.4937,
+        rust: -0.4309,
+        kotlin: -0.4739,
+        php: -0.3917,
+        csharp: -0.3475,
+        go: -0.3504,
+        scala: -0.534,
+        cpp: -0.1734,
+        json: 0,
+        yaml: -0.3,
+        tf: -0.55,
+    }
+
+    // other metadata coefficient
+    private lineNumCoefficient = -0.0416
+    private lengthOfLeftCurrentCoefficient = -1.1747
+    private lengthOfLeftPrevCoefficient = 0.4033
+    private lengthOfRightCoefficient = -0.3321
+    private prevDecisionAcceptCoefficient = 0.5397
+    private prevDecisionRejectCoefficient = -0.1656
+    private prevDecisionOtherCoefficient = 0
+    private ideVscode = -0.1905
+    private lengthLeft0To5 = -0.8756
+    private lengthLeft5To10 = -0.5463
+    private lengthLeft10To20 = -0.4081
+    private lengthLeft20To30 = -0.3272
+    private lengthLeft30To40 = -0.2442
+    private lengthLeft40To50 = -0.1471
+
+    // intercept of logistic regression classifier
+    private intercept = 0.3738713
+
+    private maxx: normalizedCoefficients = {
+        lineNum: 4631.0,
+        lenLeftCur: 157.0,
+        lenLeftPrev: 176.0,
+        lenRight: 10239.0,
+    }
+
+    private minn: normalizedCoefficients = {
+        lineNum: 0.0,
+        lenLeftCur: 0.0,
+        lenLeftPrev: 0.0,
+        lenRight: 0.0,
+    }
+
+    // character and keywords coefficient
+    private charCoefficient: Readonly<Record<string, number>> = {
+        throw: 1.5868,
+        ';': -1.268,
+        any: -1.1565,
+        '7': -1.1347,
+        false: -1.1307,
+        nil: -1.0653,
+        elif: 1.0122,
+        '9': -1.0098,
+        pass: -1.0058,
+        True: -1.0002,
+        False: -0.9434,
+        '6': -0.9222,
+        true: -0.9142,
+        None: -0.9027,
+        '8': -0.9013,
+        break: -0.8475,
+        '}': -0.847,
+        '5': -0.8414,
+        '4': -0.8197,
+        '1': -0.8085,
+        '\\': -0.8019,
+        static: -0.7748,
+        '0': -0.77,
+        end: -0.7617,
+        '(': 0.7239,
+        '/': -0.7104,
+        where: -0.6981,
+        readonly: -0.6741,
+        async: -0.6723,
+        '3': -0.654,
+        continue: -0.6413,
+        struct: -0.64,
+        try: -0.6369,
+        float: -0.6341,
+        using: 0.6079,
+        '@': 0.6016,
+        '|': 0.5993,
+        impl: 0.5808,
+        private: -0.5746,
+        for: 0.5741,
+        '2': -0.5634,
+        let: -0.5187,
+        foreach: 0.5186,
+        select: -0.5148,
+        export: -0.5,
+        mut: -0.4921,
+        ')': -0.463,
+        ']': -0.4611,
+        when: 0.4602,
+        virtual: -0.4583,
+        extern: -0.4465,
+        catch: 0.4446,
+        new: 0.4394,
+        val: -0.4339,
+        map: 0.4284,
+        case: 0.4271,
+        throws: 0.4221,
+        null: -0.4197,
+        protected: -0.4133,
+        q: 0.4125,
+        except: 0.4115,
+        ': ': 0.4072,
+        '^': -0.407,
+        ' ': 0.4066,
+        $: 0.3981,
+        this: 0.3962,
+        switch: 0.3947,
+        '*': -0.3931,
+        module: 0.3912,
+        array: 0.385,
+        '=': 0.3828,
+        p: 0.3728,
+        ON: 0.3708,
+        '`': 0.3693,
+        u: 0.3658,
+        a: 0.3654,
+        require: 0.3646,
+        '>': -0.3644,
+        const: -0.3476,
+        o: 0.3423,
+        sizeof: 0.3416,
+        object: 0.3362,
+        w: 0.3345,
+        print: 0.3344,
+        range: 0.3336,
+        if: 0.3324,
+        abstract: -0.3293,
+        var: -0.3239,
+        i: 0.321,
+        while: 0.3138,
+        J: 0.3137,
+        c: 0.3118,
+        await: -0.3072,
+        from: 0.3057,
+        f: 0.302,
+        echo: 0.2995,
+        '#': 0.2984,
+        e: 0.2962,
+        r: 0.2925,
+        mod: 0.2893,
+        loop: 0.2874,
+        t: 0.2832,
+        '~': 0.282,
+        final: -0.2816,
+        del: 0.2785,
+        override: -0.2746,
+        ref: -0.2737,
+        h: 0.2693,
+        m: 0.2681,
+        '{': 0.2674,
+        implements: 0.2672,
+        inline: -0.2642,
+        match: 0.2613,
+        with: -0.261,
+        x: 0.2597,
+        namespace: -0.2596,
+        operator: 0.2573,
+        double: -0.2563,
+        source: -0.2482,
+        import: -0.2419,
+        NULL: -0.2399,
+        l: 0.239,
+        or: 0.2378,
+        s: 0.2366,
+        then: 0.2354,
+        W: 0.2354,
+        y: 0.2333,
+        local: 0.2288,
+        is: 0.2282,
+        n: 0.2254,
+        '+': -0.2251,
+        G: 0.223,
+        public: -0.2229,
+        WHERE: 0.2224,
+        list: 0.2204,
+        Q: 0.2204,
+        '[': 0.2136,
+        VALUES: 0.2134,
+        H: 0.2105,
+        g: 0.2094,
+        else: -0.208,
+        bool: -0.2066,
+        long: -0.2059,
+        R: 0.2025,
+        S: 0.2021,
+        d: 0.2003,
+        V: 0.1974,
+        K: -0.1961,
+        '<': 0.1958,
+        debugger: -0.1929,
+        NOT: -0.1911,
+        b: 0.1907,
+        boolean: -0.1891,
+        z: -0.1866,
+        LIKE: -0.1793,
+        raise: 0.1782,
+        L: 0.1768,
+        fn: 0.176,
+        delete: 0.1714,
+        unsigned: -0.1675,
+        auto: -0.1648,
+        finally: 0.1616,
+        k: 0.1599,
+        as: 0.156,
+        instanceof: 0.1558,
+        '&': 0.1554,
+        E: 0.1551,
+        M: 0.1542,
+        I: 0.1503,
+        Y: 0.1493,
+        typeof: 0.1475,
+        j: 0.1445,
+        INTO: 0.1442,
+        IF: 0.1437,
+        next: 0.1433,
+        undef: -0.1427,
+        THEN: -0.1416,
+        v: 0.1415,
+        C: 0.1383,
+        P: 0.1353,
+        AND: -0.1345,
+        constructor: 0.1337,
+        void: -0.1336,
+        class: -0.1328,
+        defer: 0.1316,
+        begin: 0.1306,
+        FROM: -0.1304,
+        SET: 0.1291,
+        decimal: -0.1278,
+        friend: 0.1277,
+        SELECT: -0.1265,
+        event: 0.1259,
+        lambda: 0.1253,
+        enum: 0.1215,
+        A: 0.121,
+        lock: 0.1187,
+        ensure: 0.1184,
+        '%': 0.1177,
+        isset: 0.1175,
+        O: 0.1174,
+        '.': 0.1146,
+        UNION: -0.1145,
+        alias: -0.1129,
+        template: -0.1102,
+        WHEN: 0.1093,
+        rescue: 0.1083,
+        DISTINCT: -0.1074,
+        trait: -0.1073,
+        D: 0.1062,
+        in: 0.1045,
+        internal: -0.1029,
+        ',': 0.1027,
+        static_cast: 0.1016,
+        do: -0.1005,
+        OR: 0.1003,
+        AS: -0.1001,
+        interface: 0.0996,
+        super: 0.0989,
+        B: 0.0963,
+        U: 0.0962,
+        T: 0.0943,
+        CALL: -0.0918,
+        BETWEEN: -0.0915,
+        N: 0.0897,
+        yield: 0.0867,
+        done: -0.0857,
+        string: -0.0837,
+        out: -0.0831,
+        volatile: -0.0819,
+        retry: 0.0816,
+        '?': -0.0796,
+        number: -0.0791,
+        short: 0.0787,
+        sealed: -0.0776,
+        package: 0.0765,
+        OPEN: -0.0756,
+        base: 0.0735,
+        and: 0.0729,
+        exit: 0.0726,
+        _: 0.0721,
+        keyof: -0.072,
+        def: 0.0713,
+        crate: -0.0706,
+        '-': -0.07,
+        FUNCTION: 0.0692,
+        declare: -0.0678,
+        include: 0.0671,
+        COUNT: -0.0669,
+        INDEX: -0.0666,
+        CLOSE: -0.0651,
+        fi: -0.0644,
+        uint: 0.0624,
+        params: 0.0575,
+        HAVING: 0.0575,
+        byte: -0.0575,
+        clone: -0.0552,
+        char: -0.054,
+        func: 0.0538,
+        never: -0.053,
+        unset: -0.0524,
+        unless: -0.051,
+        esac: -0.0509,
+        shift: -0.0507,
+        require_once: 0.0486,
+        ELSE: -0.0477,
+        extends: 0.0461,
+        elseif: 0.0452,
+        mutable: -0.0451,
+        asm: 0.0449,
+        '!': 0.0446,
+        LIMIT: 0.0444,
+        ushort: -0.0438,
+        '"': -0.0433,
+        Z: 0.0431,
+        exec: -0.0431,
+        IS: -0.0429,
+        DECLARE: -0.0425,
+        __LINE__: -0.0424,
+        BEGIN: -0.0418,
+        typedef: 0.0414,
+        EXIT: -0.0412,
+        "'": 0.041,
+        function: -0.0393,
+        dyn: -0.039,
+        wchar_t: -0.0388,
+        unique: -0.0383,
+        include_once: 0.0367,
+        stackalloc: 0.0359,
+        RETURN: -0.0356,
+        const_cast: 0.035,
+        MAX: 0.0341,
+        assert: -0.0331,
+        JOIN: -0.0328,
+        use: 0.0318,
+        GET: 0.0317,
+        VIEW: 0.0314,
+        move: 0.0308,
+        typename: 0.0308,
+        die: 0.0305,
+        asserts: -0.0304,
+        reinterpret_cast: -0.0302,
+        USING: -0.0289,
+        elsif: -0.0285,
+        FIRST: -0.028,
+        self: -0.0278,
+        RETURNING: -0.0278,
+        symbol: -0.0273,
+        OFFSET: 0.0263,
+        bigint: 0.0253,
+        register: -0.0237,
+        union: -0.0227,
+        return: -0.0227,
+        until: -0.0224,
+        endfor: -0.0213,
+        implicit: -0.021,
+        LOOP: 0.0195,
+        pub: 0.0182,
+        global: 0.0179,
+        EXCEPTION: 0.0175,
+        delegate: 0.0173,
+        signed: -0.0163,
+        FOR: 0.0156,
+        unsafe: 0.014,
+        NEXT: -0.0133,
+        IN: 0.0129,
+        MIN: -0.0123,
+        go: -0.0112,
+        type: -0.0109,
+        explicit: -0.0107,
+        eval: -0.0104,
+        int: -0.0099,
+        CASE: -0.0096,
+        END: 0.0084,
+        UPDATE: 0.0074,
+        default: 0.0072,
+        chan: 0.0068,
+        fixed: 0.0066,
+        not: -0.0052,
+        X: -0.0047,
+        endforeach: 0.0031,
+        goto: 0.0028,
+        empty: 0.0022,
+        checked: 0.0012,
+        F: -0.001,
+    }
+
+    public getThreshold() {
+        return this.triggerThreshold
+    }
+
+    public recordClassifierResultForManualTrigger(editor: vscode.TextEditor) {
+        this.shouldTriggerFromClassifier(undefined, editor, undefined, true)
+    }
+
+    public recordClassifierResultForAutoTrigger(
+        editor: vscode.TextEditor,
+        triggerType?: CodewhispererAutomatedTriggerType,
+        event?: vscode.TextDocumentChangeEvent
+    ) {
+        if (!triggerType) {
+            return
+        }
+        this.shouldTriggerFromClassifier(event, editor, triggerType, true)
+    }
+
+    public shouldTriggerFromClassifier(
+        event: vscode.TextDocumentChangeEvent | undefined,
+        editor: vscode.TextEditor,
+        autoTriggerType: string | undefined,
+        shouldRecordResult: boolean = false
+    ): boolean {
+        const fileContext = extractContextForCodeWhisperer(editor)
+        const osPlatform = this.normalizeOsName(os.platform(), os.version())
+        const char = event ? event.contentChanges[0].text : ''
+        const lineNum = editor.selection.active.line
+        const classifierResult = this.getClassifierResult(
+            fileContext.leftFileContent,
+            fileContext.rightFileContent,
+            osPlatform,
+            autoTriggerType,
+            char,
+            lineNum,
+            fileContext.programmingLanguage
+        )
+
+        const threshold = this.getThreshold()
+
+        const shouldTrigger = classifierResult > threshold
+        if (shouldRecordResult) {
+            TelemetryHelper.instance.setClassifierResult(classifierResult)
+            TelemetryHelper.instance.setClassifierThreshold(threshold)
+        }
+        return shouldTrigger
+    }
+
+    private getClassifierResult(
+        leftContext: string,
+        rightContext: string,
+        os: string,
+        triggerType: string | undefined,
+        char: string,
+        lineNum: number,
+        language: ProgrammingLanguage
+    ): number {
+        const leftContextLines = leftContext.split(/\r?\n/)
+        const leftContextAtCurrentLine = leftContextLines[leftContextLines.length - 1]
+        const tokens = leftContextAtCurrentLine.trim().split(' ')
+        let keyword = ''
+        const lastToken = tokens[tokens.length - 1]
+        if (lastToken && lastToken.length > 1) {
+            keyword = lastToken
+        }
+        const lengthOfLeftCurrent = leftContextLines[leftContextLines.length - 1].length
+        const lengthOfLeftPrev = leftContextLines[leftContextLines.length - 2]?.length ?? 0
+        const lengthOfRight = rightContext.trim().length
+
+        const triggerTypeCoefficient: number = this.triggerTypeCoefficientMap[triggerType || ''] ?? 0
+        const osCoefficient: number = this.osCoefficientMap[os] ?? 0
+        const charCoefficient: number = this.charCoefficient[char] ?? 0
+        const keyWordCoefficient: number = this.charCoefficient[keyword] ?? 0
+        const ideCoefficient = this.ideVscode
+
+        const previousDecision = TelemetryHelper.instance.getLastTriggerDecisionForClassifier()
+        const languageCoefficients = Object.values(this.languageCoefficientMap)
+        const avrgCoefficient =
+            languageCoefficients.length > 0
+                ? languageCoefficients.reduce((a, b) => a + b) / languageCoefficients.length
+                : 0
+        const languageCoefficient = this.languageCoefficientMap[language.languageName] ?? avrgCoefficient
+
+        let previousDecisionCoefficient = 0
+        if (previousDecision === 'Accept') {
+            previousDecisionCoefficient = this.prevDecisionAcceptCoefficient
+        } else if (previousDecision === 'Reject') {
+            previousDecisionCoefficient = this.prevDecisionRejectCoefficient
+        } else if (previousDecision === 'Discard' || previousDecision === 'Empty') {
+            previousDecisionCoefficient = this.prevDecisionOtherCoefficient
+        }
+
+        let leftContextLengthCoefficient = 0
+        if (leftContext.length >= 0 && leftContext.length < 5) {
+            leftContextLengthCoefficient = this.lengthLeft0To5
+        } else if (leftContext.length >= 5 && leftContext.length < 10) {
+            leftContextLengthCoefficient = this.lengthLeft5To10
+        } else if (leftContext.length >= 10 && leftContext.length < 20) {
+            leftContextLengthCoefficient = this.lengthLeft10To20
+        } else if (leftContext.length >= 20 && leftContext.length < 30) {
+            leftContextLengthCoefficient = this.lengthLeft20To30
+        } else if (leftContext.length >= 30 && leftContext.length < 40) {
+            leftContextLengthCoefficient = this.lengthLeft30To40
+        } else if (leftContext.length >= 40 && leftContext.length < 50) {
+            leftContextLengthCoefficient = this.lengthLeft40To50
+        }
+
+        const result =
+            (this.lengthOfRightCoefficient * (lengthOfRight - this.minn.lenRight)) /
+                (this.maxx.lenRight - this.minn.lenRight) +
+            (this.lengthOfLeftCurrentCoefficient * (lengthOfLeftCurrent - this.minn.lenLeftCur)) /
+                (this.maxx.lenLeftCur - this.minn.lenLeftCur) +
+            (this.lengthOfLeftPrevCoefficient * (lengthOfLeftPrev - this.minn.lenLeftPrev)) /
+                (this.maxx.lenLeftPrev - this.minn.lenLeftPrev) +
+            (this.lineNumCoefficient * (lineNum - this.minn.lineNum)) / (this.maxx.lineNum - this.minn.lineNum) +
+            osCoefficient +
+            triggerTypeCoefficient +
+            charCoefficient +
+            keyWordCoefficient +
+            ideCoefficient +
+            this.intercept +
+            previousDecisionCoefficient +
+            languageCoefficient +
+            leftContextLengthCoefficient
+
+        return sigmoid(result)
+    }
+
+    private normalizeOsName(name: string, version: string | undefined): string {
+        const lowercaseName = name.toLowerCase()
+        if (lowercaseName.includes('windows')) {
+            if (!version) {
+                return 'Windows'
+            } else if (version.includes('Windows NT 10') || version.startsWith('10')) {
+                return 'Windows 10'
+            } else if (version.includes('6.1')) {
+                return 'Windows 7'
+            } else if (version.includes('6.3')) {
+                return 'Windows 8.1'
+            } else {
+                return 'Windows'
+            }
+        } else if (
+            lowercaseName.includes('macos') ||
+            lowercaseName.includes('mac os') ||
+            lowercaseName.includes('darwin')
+        ) {
+            return 'Mac OS X'
+        } else if (lowercaseName.includes('linux')) {
+            return 'Linux'
+        } else {
+            return name
+        }
+    }
+}
+
+const sigmoid = (x: number) => {
+    return 1 / (1 + Math.exp(-x))
+}
diff --git a/packages/core/src/codewhisperer/service/codeFixHandler.ts b/packages/core/src/codewhisperer/service/codeFixHandler.ts
new file mode 100644
index 00000000000..68dc25e7cf3
--- /dev/null
+++ b/packages/core/src/codewhisperer/service/codeFixHandler.ts
@@ -0,0 +1,127 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { CodeWhispererUserClient, RegionProfile } from '../indexNode'
+import * as CodeWhispererConstants from '../models/constants'
+import { codeFixState } from '../models/model'
+import { ArtifactMap, CreateUploadUrlRequest, DefaultCodeWhispererClient } from '../client/codewhisperer'
+import {
+    CodeFixJobStoppedError,
+    CodeFixJobTimedOutError,
+    CreateCodeFixError,
+    CreateUploadUrlError,
+    MonthlyCodeFixLimitError,
+} from '../models/errors'
+import { uploadArtifactToS3 } from './securityScanHandler'
+import { getLogger } from '../../shared/logger/logger'
+import { isAwsError } from '../../shared/errors'
+import { sleep } from '../../shared/utilities/timeoutUtils'
+
+export async function getPresignedUrlAndUpload(
+    client: DefaultCodeWhispererClient,
+    zipFilePath: string,
+    codeFixName: string,
+    profile: RegionProfile | undefined
+) {
+    const srcReq: CreateUploadUrlRequest = {
+        artifactType: 'SourceCode',
+        uploadIntent: CodeWhispererConstants.codeFixUploadIntent,
+        uploadContext: { codeFixUploadContext: { codeFixName } },
+        profileArn: profile?.arn,
+    }
+    getLogger().verbose(`Prepare for uploading src context...`)
+    const srcResp = await client.createUploadUrl(srcReq).catch((err) => {
+        getLogger().error('Failed getting presigned url for uploading src context. %O', err)
+        throw new CreateUploadUrlError(err.message)
+    })
+    getLogger().verbose(`CreateUploadUrlRequest requestId: ${srcResp.$response.requestId}`)
+    getLogger().verbose(`Complete Getting presigned Url for uploading src context.`)
+    getLogger().verbose(`Uploading src context...`)
+    await uploadArtifactToS3(zipFilePath, srcResp, CodeWhispererConstants.FeatureUseCase.CODE_SCAN)
+    getLogger().verbose(`Complete uploading src context.`)
+    const artifactMap: ArtifactMap = {
+        SourceCode: srcResp.uploadId,
+    }
+    return artifactMap
+}
+
+export async function createCodeFixJob(
+    client: DefaultCodeWhispererClient,
+    uploadId: string,
+    snippetRange: CodeWhispererUserClient.Range,
+    description: string,
+    referenceTrackerConfiguration: CodeWhispererUserClient.ReferenceTrackerConfiguration,
+    codeFixName?: string,
+    ruleId?: string,
+    profile?: RegionProfile
+) {
+    getLogger().verbose(`Creating code fix job...`)
+    const req: CodeWhispererUserClient.StartCodeFixJobRequest = {
+        uploadId,
+        snippetRange,
+        codeFixName,
+        ruleId,
+        description,
+        referenceTrackerConfiguration,
+        profileArn: profile?.arn,
+    }
+
+    const resp = await client.startCodeFixJob(req).catch((err) => {
+        getLogger().error('Failed creating code fix job. %O', err)
+        if (isAwsError(err) && err.code === 'ThrottlingException' && err.message.includes('reached for this month')) {
+            throw new MonthlyCodeFixLimitError()
+        }
+        throw new CreateCodeFixError()
+    })
+    getLogger().info(`AmazonQ generate fix Request id: ${resp.$response.requestId}`)
+    return resp
+}
+
+export async function pollCodeFixJobStatus(client: DefaultCodeWhispererClient, jobId: string, profile?: RegionProfile) {
+    const pollingStartTime = performance.now()
+    await sleep(CodeWhispererConstants.codeFixJobPollingDelayMs)
+
+    getLogger().verbose(`Polling code fix job status...`)
+    let status: string | undefined = 'InProgress'
+    while (true) {
+        throwIfCancelled()
+        const req: CodeWhispererUserClient.GetCodeFixJobRequest = {
+            jobId,
+            profileArn: profile?.arn,
+        }
+        const resp = await client.getCodeFixJob(req)
+        getLogger().verbose(`GetCodeFixJobRequest requestId: ${resp.$response.requestId}`)
+        if (resp.jobStatus !== 'InProgress') {
+            status = resp.jobStatus
+            getLogger().verbose(`Code fix job status: ${status}`)
+            getLogger().verbose(`Complete polling code fix job status.`)
+            break
+        }
+        throwIfCancelled()
+        await sleep(CodeWhispererConstants.codeFixJobPollingIntervalMs)
+        const elapsedTime = performance.now() - pollingStartTime
+        if (elapsedTime > CodeWhispererConstants.codeFixJobTimeoutMs) {
+            getLogger().verbose(`Code fix job status: ${status}`)
+            getLogger().verbose(`Code fix job failed. Amazon Q timed out.`)
+            throw new CodeFixJobTimedOutError()
+        }
+    }
+    return status
+}
+
+export async function getCodeFixJob(client: DefaultCodeWhispererClient, jobId: string, profile?: RegionProfile) {
+    const req: CodeWhispererUserClient.GetCodeFixJobRequest = {
+        jobId,
+        profileArn: profile?.arn,
+    }
+    const resp = await client.getCodeFixJob(req)
+    return resp
+}
+
+export function throwIfCancelled() {
+    if (codeFixState.isCancelling()) {
+        throw new CodeFixJobStoppedError()
+    }
+}
diff --git a/packages/core/src/codewhisperer/service/diagnosticsProvider.ts b/packages/core/src/codewhisperer/service/diagnosticsProvider.ts
new file mode 100644
index 00000000000..b7a950bba5c
--- /dev/null
+++ b/packages/core/src/codewhisperer/service/diagnosticsProvider.ts
@@ -0,0 +1,170 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { CodeScanIssue, AggregatedCodeScanIssue } from '../models/model'
+import { CodeAnalysisScope, codewhispererDiagnosticSourceLabel } from '../models/constants'
+import { SecurityIssueTreeViewProvider } from './securityIssueTreeViewProvider'
+import { SecurityIssueProvider } from './securityIssueProvider'
+
+export interface SecurityDiagnostic extends vscode.Diagnostic {
+    findingId?: string
+}
+
+interface SecurityScanRender {
+    securityDiagnosticCollection: vscode.DiagnosticCollection | undefined
+    initialized: boolean
+}
+
+export const securityScanRender: SecurityScanRender = {
+    securityDiagnosticCollection: undefined,
+    initialized: false,
+}
+
+export function initSecurityScanRender(
+    securityRecommendationList: AggregatedCodeScanIssue[],
+    editor: vscode.TextEditor | undefined,
+    scope: CodeAnalysisScope,
+    fromQCA: boolean = true
+) {
+    // fromQCA parameter is used to determine if the findings are coming from QCA or from displayFindings tool.
+    // if the incoming findings are from QCA review, then keep only existing findings from displayFindings
+    // if the incoming findings are not from QCA review, then keep only the existing QCA findings
+    securityScanRender.securityDiagnosticCollection = createSecurityDiagnosticCollection()
+    securityScanRender.initialized = false
+    if (scope === CodeAnalysisScope.FILE_ON_DEMAND && editor) {
+        securityScanRender.securityDiagnosticCollection?.delete(editor.document.uri)
+    } else if (scope === CodeAnalysisScope.PROJECT) {
+        securityScanRender.securityDiagnosticCollection?.clear()
+    }
+    for (const securityRecommendation of securityRecommendationList) {
+        updateSecurityDiagnosticCollection(securityRecommendation)
+        updateSecurityIssuesForProviders(securityRecommendation, scope === CodeAnalysisScope.FILE_AUTO, fromQCA)
+    }
+    securityScanRender.initialized = true
+}
+
+function updateSecurityIssuesForProviders(
+    securityRecommendation: AggregatedCodeScanIssue,
+    isAutoScope?: boolean,
+    fromQCA: boolean = true
+) {
+    if (isAutoScope) {
+        SecurityIssueProvider.instance.mergeIssues(securityRecommendation)
+    } else {
+        SecurityIssueProvider.instance.mergeIssuesDisplayFindings(securityRecommendation, fromQCA)
+    }
+    SecurityIssueTreeViewProvider.instance.refresh()
+}
+
+export function updateSecurityDiagnosticCollection(securityRecommendation: AggregatedCodeScanIssue) {
+    const filePath = securityRecommendation.filePath
+    const uri = vscode.Uri.file(filePath)
+    const securityDiagnosticCollection = createSecurityDiagnosticCollection()
+    const securityDiagnostics: vscode.Diagnostic[] = vscode.languages
+        .getDiagnostics(uri)
+        .filter((diagnostic) => diagnostic.source === codewhispererDiagnosticSourceLabel)
+    for (const securityIssue of securityRecommendation.issues) {
+        const existingDiagnosticIndex = securityDiagnostics.findIndex(
+            (diagnostic) =>
+                (diagnostic.message === securityIssue.title &&
+                    diagnostic.range.start.line === securityIssue.startLine &&
+                    diagnostic.range.end.line === securityIssue.endLine) ||
+                (diagnostic.message === 'Re-scan to validate the fix: ' + securityIssue.title &&
+                    diagnostic.range.start.line === securityIssue.startLine &&
+                    diagnostic.range.end.line === securityIssue.startLine)
+        )
+        if (existingDiagnosticIndex !== -1) {
+            securityDiagnostics.splice(existingDiagnosticIndex, 1)
+        }
+        if (securityIssue.visible) {
+            securityDiagnostics.push(createSecurityDiagnostic(securityIssue))
+        }
+    }
+    securityDiagnosticCollection.set(uri, securityDiagnostics)
+}
+
+export function createSecurityDiagnostic(securityIssue: CodeScanIssue) {
+    const range = new vscode.Range(securityIssue.startLine, 0, securityIssue.endLine, 0)
+    const securityDiagnostic: SecurityDiagnostic = new vscode.Diagnostic(
+        range,
+        securityIssue.title,
+        vscode.DiagnosticSeverity.Warning
+    )
+    securityDiagnostic.source = codewhispererDiagnosticSourceLabel
+    securityDiagnostic.code = securityIssue.ruleId
+    securityDiagnostic.findingId = securityIssue.findingId
+    return securityDiagnostic
+}
+
+export function createSecurityDiagnosticCollection() {
+    if (securityScanRender.securityDiagnosticCollection === undefined) {
+        securityScanRender.securityDiagnosticCollection =
+            vscode.languages.createDiagnosticCollection('Amazon Q Security Scan')
+    }
+    return securityScanRender.securityDiagnosticCollection
+}
+
+export function disposeSecurityDiagnostic(event: vscode.TextDocumentChangeEvent) {
+    const uri = event.document.uri
+    if (!securityScanRender.initialized || !securityScanRender.securityDiagnosticCollection?.has(uri)) {
+        return
+    }
+    const currentSecurityDiagnostics = securityScanRender.securityDiagnosticCollection?.get(uri)
+    const newSecurityDiagnostics: vscode.Diagnostic[] = []
+
+    const { changedRange, changedText, lineOffset } = event.contentChanges.reduce(
+        (acc, change) => ({
+            changedRange: acc.changedRange.union(change.range),
+            changedText: acc.changedText + change.text,
+            lineOffset: acc.lineOffset + getLineOffset(change.range, change.text),
+        }),
+        {
+            changedRange: event.contentChanges[0].range,
+            changedText: '',
+            lineOffset: 0,
+        }
+    )
+
+    if (currentSecurityDiagnostics) {
+        for (const issue of currentSecurityDiagnostics) {
+            const intersection = changedRange.intersection(issue.range)
+            if (
+                issue.severity === vscode.DiagnosticSeverity.Warning &&
+                intersection &&
+                (/\S/.test(changedText) || changedText === '')
+            ) {
+                issue.severity = vscode.DiagnosticSeverity.Information
+                issue.message = 'Re-scan to validate the fix: ' + issue.message
+                issue.range = new vscode.Range(intersection.start, intersection.start)
+            } else if (issue.range.start.line >= changedRange.end.line) {
+                issue.range = new vscode.Range(
+                    issue.range.start.line + lineOffset,
+                    issue.range.start.character,
+                    issue.range.end.line + lineOffset,
+                    issue.range.end.character
+                )
+            }
+            newSecurityDiagnostics.push(issue)
+        }
+    }
+    securityScanRender.securityDiagnosticCollection?.set(uri, newSecurityDiagnostics)
+}
+
+function getLineOffset(range: vscode.Range, text: string) {
+    const originLines = range.end.line - range.start.line + 1
+    const changedLines = text.split('\n').length
+    return changedLines - originLines
+}
+
+export function removeDiagnostic(uri: vscode.Uri, issue: CodeScanIssue) {
+    const currentSecurityDiagnostics = securityScanRender.securityDiagnosticCollection?.get(uri)
+    if (currentSecurityDiagnostics) {
+        const newSecurityDiagnostics = currentSecurityDiagnostics.filter((diagnostic: SecurityDiagnostic) => {
+            return diagnostic.findingId !== issue.findingId
+        })
+        securityScanRender.securityDiagnosticCollection?.set(uri, newSecurityDiagnostics)
+    }
+}
diff --git a/packages/core/src/codewhisperer/service/importAdderProvider.ts b/packages/core/src/codewhisperer/service/importAdderProvider.ts
new file mode 100644
index 00000000000..98b7c36adfd
--- /dev/null
+++ b/packages/core/src/codewhisperer/service/importAdderProvider.ts
@@ -0,0 +1,132 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { Recommendation } from '../client/codewhisperer'
+import { CodeWhispererSettings } from '../util/codewhispererSettings'
+import { findLineToInsertImportStatement } from '../util/importAdderUtil'
+import { application } from '../util/codeWhispererApplication'
+
+/**
+ * ImportAdderProvider
+ * For each code suggestion provided by CodeWhisperer,
+ * it may contain un-imported variables. In this case,
+ * the backend will also return the missing imports in the response
+ * This provide will render a codeLens hint on screen to inform user
+ * that once user accept the recommendation, import statement will also be inserted.
+ */
+export class ImportAdderProvider implements vscode.CodeLensProvider {
+    private codeLens: vscode.CodeLens | undefined
+
+    private _onDidChangeCodeLenses: vscode.EventEmitter<void> = new vscode.EventEmitter<void>()
+    public readonly onDidChangeCodeLenses: vscode.Event<void> = this._onDidChangeCodeLenses.event
+    // This is the vsc languageIds that import adder service supports.
+    private readonly supportedLanguages: string[] = ['java', 'javascript', 'javascriptreact', 'python']
+
+    static #instance: ImportAdderProvider
+
+    constructor() {
+        application().clearCodeWhispererUIListener((_) => {
+            this.clear()
+        })
+    }
+
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+
+    public async onAcceptRecommendation(
+        editor: vscode.TextEditor,
+        r: Recommendation | undefined,
+        firstLineOfRecommendation: number
+    ) {
+        this.clear()
+        if (this.isNotEnabled(editor.document.languageId)) {
+            return
+        }
+        if (
+            r &&
+            'mostRelevantMissingImports' in r &&
+            r.mostRelevantMissingImports &&
+            r.mostRelevantMissingImports!.length > 0
+        ) {
+            const line = findLineToInsertImportStatement(editor, firstLineOfRecommendation)
+            let mergedStatements = ``
+            // eslint-disable-next-line unicorn/no-array-for-each
+            r.mostRelevantMissingImports?.forEach(async (i) => {
+                // trust service response that this to-be-added import is necessary
+                if (i.statement) {
+                    mergedStatements += i.statement + '\n'
+                }
+            })
+            await editor.edit(
+                (builder) => {
+                    builder.insert(new vscode.Position(line, 0), mergedStatements)
+                },
+                { undoStopAfter: true, undoStopBefore: true }
+            )
+        }
+    }
+
+    private isNotEnabled(languageId: string): boolean {
+        return (
+            !this.supportedLanguages.includes(languageId) ||
+            !CodeWhispererSettings.instance.isImportRecommendationEnabled()
+        )
+    }
+
+    public onShowRecommendation(
+        document: vscode.TextDocument,
+        line: number,
+        r: Recommendation
+    ): vscode.CodeLens | undefined {
+        if (this.isNotEnabled(document.languageId)) {
+            return undefined
+        }
+        this.codeLens = undefined
+        // show it under the inline toolbar if current line is not the last line
+        line = document.lineCount > line + 1 ? line + 1 : line
+        if (
+            'mostRelevantMissingImports' in r &&
+            r.mostRelevantMissingImports !== undefined &&
+            r.mostRelevantMissingImports.length > 0
+        ) {
+            const n = r.mostRelevantMissingImports.length
+            const stmt = r.mostRelevantMissingImports[0].statement
+            let message = ''
+            if (n === 1) {
+                message = `If you accept, "${stmt}" will also be added.`
+            } else if (n === 2) {
+                message = `If you accept, "${stmt}" and 1 other import will also be added.`
+            } else {
+                message = `If you accept, "${stmt}" and ${n - 1} other imports will also be added.`
+            }
+            const codeLens = new vscode.CodeLens(new vscode.Range(line, 0, line, 1))
+            codeLens.command = {
+                title: message,
+                tooltip: 'Import statement',
+                command: '',
+            }
+            this.codeLens = codeLens
+        }
+        this._onDidChangeCodeLenses.fire()
+        return this.codeLens
+    }
+
+    public clear() {
+        this.codeLens = undefined
+        this._onDidChangeCodeLenses.fire()
+    }
+
+    public provideCodeLenses(
+        document: vscode.TextDocument,
+        token: vscode.CancellationToken
+    ): vscode.CodeLens[] | Thenable<vscode.CodeLens[]> {
+        if (this.codeLens) {
+            return [this.codeLens]
+        }
+        return []
+    }
+}
diff --git a/packages/core/src/codewhisperer/service/inlineCompletionItemProvider.ts b/packages/core/src/codewhisperer/service/inlineCompletionItemProvider.ts
new file mode 100644
index 00000000000..a6c424c321d
--- /dev/null
+++ b/packages/core/src/codewhisperer/service/inlineCompletionItemProvider.ts
@@ -0,0 +1,194 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import vscode, { Position } from 'vscode'
+import { getPrefixSuffixOverlap } from '../util/commonUtil'
+import { Recommendation } from '../client/codewhisperer'
+import { session } from '../util/codeWhispererSession'
+import { TelemetryHelper } from '../util/telemetryHelper'
+import { runtimeLanguageContext } from '../util/runtimeLanguageContext'
+import { ReferenceInlineProvider } from './referenceInlineProvider'
+import { ImportAdderProvider } from './importAdderProvider'
+import { application } from '../util/codeWhispererApplication'
+import path from 'path'
+import { UserWrittenCodeTracker } from '../tracker/userWrittenCodeTracker'
+
+export class CWInlineCompletionItemProvider implements vscode.InlineCompletionItemProvider {
+    private activeItemIndex: number | undefined
+    private nextMove: number
+    private recommendations: Recommendation[]
+    private requestId: string
+    private startPos: Position
+    private nextToken: string
+
+    private _onDidShow: vscode.EventEmitter<void> = new vscode.EventEmitter<void>()
+    public readonly onDidShow: vscode.Event<void> = this._onDidShow.event
+
+    public constructor(
+        itemIndex: number | undefined,
+        firstMove: number,
+        recommendations: Recommendation[],
+        requestId: string,
+        startPos: Position,
+        nextToken: string
+    ) {
+        this.activeItemIndex = itemIndex
+        this.nextMove = firstMove
+        this.recommendations = recommendations
+        this.requestId = requestId
+        this.startPos = startPos
+        this.nextToken = nextToken
+    }
+
+    get getActiveItemIndex() {
+        return this.activeItemIndex
+    }
+
+    public clearActiveItemIndex() {
+        this.activeItemIndex = undefined
+    }
+
+    // iterate suggestions and stop at index 0 or index len - 1
+    private getIteratingIndexes() {
+        const len = this.recommendations.length
+        const startIndex = this.activeItemIndex ? this.activeItemIndex : 0
+        const index = []
+        if (this.nextMove === 0) {
+            for (let i = 0; i < len; i++) {
+                index.push((startIndex + i) % len)
+            }
+        } else if (this.nextMove === -1) {
+            for (let i = startIndex - 1; i >= 0; i--) {
+                index.push(i)
+            }
+            index.push(startIndex)
+        } else {
+            for (let i = startIndex + 1; i < len; i++) {
+                index.push(i)
+            }
+            index.push(startIndex)
+        }
+        return index
+    }
+
+    truncateOverlapWithRightContext(document: vscode.TextDocument, suggestion: string, pos: vscode.Position): string {
+        const trimmedSuggestion = suggestion.trim()
+        // limit of 5000 for right context matching
+        const rightContext = document.getText(new vscode.Range(pos, document.positionAt(document.offsetAt(pos) + 5000)))
+        const overlap = getPrefixSuffixOverlap(trimmedSuggestion, rightContext)
+        const overlapIndex = suggestion.lastIndexOf(overlap)
+        if (overlapIndex >= 0) {
+            const truncated = suggestion.slice(0, overlapIndex)
+            return truncated.trim().length ? truncated : ''
+        } else {
+            return suggestion
+        }
+    }
+
+    getInlineCompletionItem(
+        document: vscode.TextDocument,
+        r: Recommendation,
+        start: vscode.Position,
+        end: vscode.Position,
+        index: number,
+        prefix: string
+    ): vscode.InlineCompletionItem | undefined {
+        if (!r.content.startsWith(prefix)) {
+            return undefined
+        }
+        const effectiveStart = document.positionAt(document.offsetAt(start) + prefix.length)
+        const truncatedSuggestion = this.truncateOverlapWithRightContext(document, r.content, end)
+        if (truncatedSuggestion.length === 0) {
+            if (session.getSuggestionState(index) !== 'Showed') {
+                session.setSuggestionState(index, 'Discard')
+            }
+            return undefined
+        }
+        TelemetryHelper.instance.lastSuggestionInDisplay = truncatedSuggestion
+        return {
+            insertText: truncatedSuggestion,
+            range: new vscode.Range(start, end),
+            command: {
+                command: 'aws.amazonq.accept',
+                title: 'On acceptance',
+                arguments: [
+                    new vscode.Range(start, end),
+                    new vscode.Range(effectiveStart, end),
+                    index,
+                    truncatedSuggestion,
+                    this.requestId,
+                    session.sessionId,
+                    session.triggerType,
+                    session.getCompletionType(index),
+                    runtimeLanguageContext.getLanguageContext(document.languageId, path.extname(document.fileName))
+                        .language,
+                    r.references,
+                ],
+            },
+        }
+    }
+
+    // the returned completion items will always only contain one valid item
+    // this is to trace the current index of visible completion item
+    // so that reference tracker can show
+    // This hack can be removed once inlineCompletionAdditions API becomes public
+    provideInlineCompletionItems(
+        document: vscode.TextDocument,
+        position: vscode.Position,
+        _context: vscode.InlineCompletionContext,
+        _token: vscode.CancellationToken
+    ): vscode.ProviderResult<vscode.InlineCompletionItem[] | vscode.InlineCompletionList> {
+        if (position.line < 0 || position.isBefore(this.startPos)) {
+            application()._clearCodeWhispererUIListener.fire()
+            this.activeItemIndex = undefined
+            return
+        }
+
+        // There's a chance that the startPos is no longer valid in the current document (e.g.
+        // when CodeWhisperer got triggered by 'Enter', the original startPos is with indentation
+        // but then this indentation got removed by VSCode when another new line is inserted,
+        // before the code reaches here). In such case, we need to update the startPos to be a
+        // valid one. Otherwise, inline completion which utilizes this position will function
+        // improperly.
+        const start = document.validatePosition(this.startPos)
+        const end = position
+        const iteratingIndexes = this.getIteratingIndexes()
+        const prefix = document.getText(new vscode.Range(start, end)).replace(/\r\n/g, '\n')
+        const matchedCount = session.recommendations.filter(
+            (r) => r.content.length > 0 && r.content.startsWith(prefix) && r.content !== prefix
+        ).length
+        for (const i of iteratingIndexes) {
+            const r = session.recommendations[i]
+            const item = this.getInlineCompletionItem(document, r, start, end, i, prefix)
+            if (item === undefined) {
+                continue
+            }
+            this.activeItemIndex = i
+            session.setSuggestionState(i, 'Showed')
+            ReferenceInlineProvider.instance.setInlineReference(this.startPos.line, r.content, r.references)
+            ImportAdderProvider.instance.onShowRecommendation(document, this.startPos.line, r)
+            this.nextMove = 0
+            TelemetryHelper.instance.setFirstSuggestionShowTime()
+            session.setPerceivedLatency()
+            UserWrittenCodeTracker.instance.onQStartsMakingEdits()
+            this._onDidShow.fire()
+            if (matchedCount >= 2 || this.nextToken !== '') {
+                const result = [item]
+                for (let j = 0; j < matchedCount - 1; j++) {
+                    result.push({
+                        insertText: `${
+                            typeof item.insertText === 'string' ? item.insertText : item.insertText.value
+                        }${j}`,
+                        range: item.range,
+                    })
+                }
+                return result
+            }
+            return [item]
+        }
+        application()._clearCodeWhispererUIListener.fire()
+        this.activeItemIndex = undefined
+        return []
+    }
+}
diff --git a/packages/core/src/codewhisperer/service/inlineCompletionService.ts b/packages/core/src/codewhisperer/service/inlineCompletionService.ts
new file mode 100644
index 00000000000..cd37663af49
--- /dev/null
+++ b/packages/core/src/codewhisperer/service/inlineCompletionService.ts
@@ -0,0 +1,163 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { CodeSuggestionsState, ConfigurationEntry, GetRecommendationsResponse, vsCodeState } from '../models/model'
+import * as CodeWhispererConstants from '../models/constants'
+import { DefaultCodeWhispererClient } from '../client/codewhisperer'
+import { RecommendationHandler } from './recommendationHandler'
+import { CodewhispererAutomatedTriggerType, CodewhispererTriggerType } from '../../shared/telemetry/telemetry'
+import { showTimedMessage } from '../../shared/utilities/messages'
+import { getLogger } from '../../shared/logger/logger'
+import { TelemetryHelper } from '../util/telemetryHelper'
+import { AuthUtil } from '../util/authUtil'
+import { shared } from '../../shared/utilities/functionUtils'
+import { ClassifierTrigger } from './classifierTrigger'
+import { session } from '../util/codeWhispererSession'
+import { noSuggestions } from '../models/constants'
+import { CodeWhispererStatusBarManager } from './statusBar'
+
+export class InlineCompletionService {
+    private maxPage = 100
+    private statusBar: CodeWhispererStatusBarManager
+    private _showRecommendationTimer?: NodeJS.Timer
+
+    constructor(statusBar: CodeWhispererStatusBarManager = CodeWhispererStatusBarManager.instance) {
+        this.statusBar = statusBar
+
+        RecommendationHandler.instance.onDidReceiveRecommendation((e) => {
+            this.startShowRecommendationTimer()
+        })
+
+        CodeSuggestionsState.instance.onDidChangeState(() => {
+            return this.statusBar.refreshStatusBar()
+        })
+    }
+
+    static #instance: InlineCompletionService
+
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+
+    filePath(): string | undefined {
+        return RecommendationHandler.instance.documentUri?.fsPath
+    }
+
+    private sharedTryShowRecommendation = shared(
+        RecommendationHandler.instance.tryShowRecommendation.bind(RecommendationHandler.instance)
+    )
+
+    private startShowRecommendationTimer() {
+        if (this._showRecommendationTimer) {
+            clearInterval(this._showRecommendationTimer)
+            this._showRecommendationTimer = undefined
+        }
+        this._showRecommendationTimer = setInterval(() => {
+            const delay = Date.now() - vsCodeState.lastUserModificationTime
+            if (delay < CodeWhispererConstants.inlineSuggestionShowDelay) {
+                return
+            }
+            this.sharedTryShowRecommendation()
+                .catch((e) => {
+                    getLogger().error('tryShowRecommendation failed: %s', (e as Error).message)
+                })
+                .finally(() => {
+                    if (this._showRecommendationTimer) {
+                        clearInterval(this._showRecommendationTimer)
+                        this._showRecommendationTimer = undefined
+                    }
+                })
+        }, CodeWhispererConstants.showRecommendationTimerPollPeriod)
+    }
+
+    async getPaginatedRecommendation(
+        client: DefaultCodeWhispererClient,
+        editor: vscode.TextEditor,
+        triggerType: CodewhispererTriggerType,
+        config: ConfigurationEntry,
+        autoTriggerType?: CodewhispererAutomatedTriggerType,
+        event?: vscode.TextDocumentChangeEvent
+    ): Promise<GetRecommendationsResponse> {
+        if (vsCodeState.isCodeWhispererEditing || RecommendationHandler.instance.isSuggestionVisible()) {
+            return {
+                result: 'Failed',
+                errorMessage: 'Amazon Q is already running',
+                recommendationCount: 0,
+            }
+        }
+
+        // Call report user decisions once to report recommendations leftover from last invocation.
+        RecommendationHandler.instance.reportUserDecisions(-1)
+        TelemetryHelper.instance.setInvokeSuggestionStartTime()
+        ClassifierTrigger.instance.recordClassifierResultForAutoTrigger(editor, autoTriggerType, event)
+
+        const triggerChar = event?.contentChanges[0]?.text
+        if (autoTriggerType === 'SpecialCharacters' && triggerChar) {
+            TelemetryHelper.instance.setTriggerCharForUserTriggerDecision(triggerChar)
+        }
+        const isAutoTrigger = triggerType === 'AutoTrigger'
+        if (AuthUtil.instance.isConnectionExpired()) {
+            await AuthUtil.instance.notifyReauthenticate(isAutoTrigger)
+            return {
+                result: 'Failed',
+                errorMessage: 'auth',
+                recommendationCount: 0,
+            }
+        }
+
+        await this.statusBar.setLoading()
+
+        RecommendationHandler.instance.checkAndResetCancellationTokens()
+        RecommendationHandler.instance.documentUri = editor.document.uri
+        let response: GetRecommendationsResponse = {
+            result: 'Failed',
+            errorMessage: undefined,
+            recommendationCount: 0,
+        }
+        try {
+            let page = 0
+            while (page < this.maxPage) {
+                response = await RecommendationHandler.instance.getRecommendations(
+                    client,
+                    editor,
+                    triggerType,
+                    config,
+                    autoTriggerType,
+                    true,
+                    page
+                )
+                if (RecommendationHandler.instance.checkAndResetCancellationTokens()) {
+                    RecommendationHandler.instance.reportUserDecisions(-1)
+                    await vscode.commands.executeCommand('aws.amazonq.refreshStatusBar')
+                    if (triggerType === 'OnDemand' && session.recommendations.length === 0) {
+                        void showTimedMessage(response.errorMessage ? response.errorMessage : noSuggestions, 2000)
+                    }
+                    return {
+                        result: 'Failed',
+                        errorMessage: 'cancelled',
+                        recommendationCount: 0,
+                    }
+                }
+                if (!RecommendationHandler.instance.hasNextToken()) {
+                    break
+                }
+                page++
+            }
+        } catch (error) {
+            getLogger().error(`Error ${error} in getPaginatedRecommendation`)
+        }
+        await vscode.commands.executeCommand('aws.amazonq.refreshStatusBar')
+        if (triggerType === 'OnDemand' && session.recommendations.length === 0) {
+            void showTimedMessage(response.errorMessage ? response.errorMessage : noSuggestions, 2000)
+        }
+        TelemetryHelper.instance.tryRecordClientComponentLatency()
+
+        return {
+            result: 'Succeeded',
+            errorMessage: undefined,
+            recommendationCount: session.recommendations.length,
+        }
+    }
+}
diff --git a/packages/core/src/codewhisperer/service/keyStrokeHandler.ts b/packages/core/src/codewhisperer/service/keyStrokeHandler.ts
new file mode 100644
index 00000000000..312e31c248a
--- /dev/null
+++ b/packages/core/src/codewhisperer/service/keyStrokeHandler.ts
@@ -0,0 +1,267 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { DefaultCodeWhispererClient } from '../client/codewhisperer'
+import * as CodeWhispererConstants from '../models/constants'
+import { ConfigurationEntry } from '../models/model'
+import { getLogger } from '../../shared/logger/logger'
+import { RecommendationHandler } from './recommendationHandler'
+import { CodewhispererAutomatedTriggerType } from '../../shared/telemetry/telemetry'
+import { getTabSizeSetting } from '../../shared/utilities/editorUtilities'
+import { isInlineCompletionEnabled } from '../util/commonUtil'
+import { ClassifierTrigger } from './classifierTrigger'
+import { extractContextForCodeWhisperer } from '../util/editorContext'
+import { RecommendationService } from './recommendationService'
+
+/**
+ * This class is for CodeWhisperer auto trigger
+ */
+export class KeyStrokeHandler {
+    /**
+     * Special character which automated triggers codewhisperer
+     */
+    public specialChar: string
+    /**
+     * Key stroke count for automated trigger
+     */
+
+    private idleTriggerTimer?: NodeJS.Timer
+
+    public lastInvocationTime?: number
+
+    constructor() {
+        this.specialChar = ''
+    }
+
+    static #instance: KeyStrokeHandler
+
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+
+    public startIdleTimeTriggerTimer(
+        event: vscode.TextDocumentChangeEvent,
+        editor: vscode.TextEditor,
+        client: DefaultCodeWhispererClient,
+        config: ConfigurationEntry
+    ) {
+        if (this.idleTriggerTimer) {
+            clearInterval(this.idleTriggerTimer)
+            this.idleTriggerTimer = undefined
+        }
+        if (!this.shouldTriggerIdleTime()) {
+            return
+        }
+        this.idleTriggerTimer = setInterval(() => {
+            const duration = (Date.now() - RecommendationHandler.instance.lastInvocationTime) / 1000
+            if (duration < CodeWhispererConstants.invocationTimeIntervalThreshold) {
+                return
+            }
+
+            this.invokeAutomatedTrigger('IdleTime', editor, client, config, event)
+                .catch((e) => {
+                    getLogger().error('invokeAutomatedTrigger failed: %s', (e as Error).message)
+                })
+                .finally(() => {
+                    if (this.idleTriggerTimer) {
+                        clearInterval(this.idleTriggerTimer)
+                        this.idleTriggerTimer = undefined
+                    }
+                })
+        }, CodeWhispererConstants.idleTimerPollPeriod)
+    }
+
+    public shouldTriggerIdleTime(): boolean {
+        if (isInlineCompletionEnabled() && RecommendationService.instance.isRunning) {
+            return false
+        }
+        return true
+    }
+
+    async processKeyStroke(
+        event: vscode.TextDocumentChangeEvent,
+        editor: vscode.TextEditor,
+        client: DefaultCodeWhispererClient,
+        config: ConfigurationEntry
+    ): Promise<void> {
+        try {
+            if (!config.isAutomatedTriggerEnabled) {
+                return
+            }
+
+            // Skip when output channel gains focus and invoke
+            if (editor.document.languageId === 'Log') {
+                return
+            }
+
+            const { rightFileContent } = extractContextForCodeWhisperer(editor)
+            const rightContextLines = rightFileContent.split(/\r?\n/)
+            const rightContextAtCurrentLine = rightContextLines[0]
+            // we do not want to trigger when there is immediate right context on the same line
+            // with "}" being an exception because of IDE auto-complete
+            if (
+                rightContextAtCurrentLine.length &&
+                !rightContextAtCurrentLine.startsWith(' ') &&
+                rightContextAtCurrentLine.trim() !== '}' &&
+                rightContextAtCurrentLine.trim() !== ')'
+            ) {
+                return
+            }
+
+            let triggerType: CodewhispererAutomatedTriggerType | undefined
+            const changedSource = new DefaultDocumentChangedType(event.contentChanges).checkChangeSource()
+
+            switch (changedSource) {
+                case DocumentChangedSource.EnterKey: {
+                    triggerType = 'Enter'
+                    break
+                }
+                case DocumentChangedSource.SpecialCharsKey: {
+                    triggerType = 'SpecialCharacters'
+                    break
+                }
+                case DocumentChangedSource.RegularKey: {
+                    triggerType = ClassifierTrigger.instance.shouldTriggerFromClassifier(event, editor, triggerType)
+                        ? 'Classifier'
+                        : undefined
+                    break
+                }
+                default: {
+                    break
+                }
+            }
+
+            if (triggerType) {
+                await this.invokeAutomatedTrigger(triggerType, editor, client, config, event)
+            }
+        } catch (error) {
+            getLogger().verbose(`Automated Trigger Exception : ${error}`)
+        }
+    }
+
+    async invokeAutomatedTrigger(
+        autoTriggerType: CodewhispererAutomatedTriggerType,
+        editor: vscode.TextEditor,
+        client: DefaultCodeWhispererClient,
+        config: ConfigurationEntry,
+        event: vscode.TextDocumentChangeEvent
+    ): Promise<void> {
+        if (!editor) {
+            return
+        }
+
+        // RecommendationHandler.instance.reportUserDecisionOfRecommendation(editor, -1)
+        await RecommendationService.instance.generateRecommendation(
+            client,
+            editor,
+            'AutoTrigger',
+            config,
+            autoTriggerType
+        )
+    }
+}
+
+export abstract class DocumentChangedType {
+    constructor(protected readonly contentChanges: ReadonlyArray<vscode.TextDocumentContentChangeEvent>) {
+        this.contentChanges = contentChanges
+    }
+
+    abstract checkChangeSource(): DocumentChangedSource
+
+    // Enter key should always start with ONE '\n' or '\r\n' and potentially following spaces due to IDE reformat
+    protected isEnterKey(str: string): boolean {
+        if (str.length === 0) {
+            return false
+        }
+        return (
+            (str.startsWith('\r\n') && str.substring(2).trim() === '') ||
+            (str[0] === '\n' && str.substring(1).trim() === '')
+        )
+    }
+
+    // Tab should consist of space char only ' ' and the length % tabSize should be 0
+    protected isTabKey(str: string): boolean {
+        const tabSize = getTabSizeSetting()
+        if (str.length % tabSize === 0 && str.trim() === '') {
+            return true
+        }
+        return false
+    }
+
+    protected isUserTypingSpecialChar(str: string): boolean {
+        return ['(', '()', '[', '[]', '{', '{}', ':'].includes(str)
+    }
+
+    protected isSingleLine(str: string): boolean {
+        let newLineCounts = 0
+        for (const ch of str) {
+            if (ch === '\n') {
+                newLineCounts += 1
+            }
+        }
+
+        // since pressing Enter key possibly will generate string like '\n        ' due to indention
+        if (this.isEnterKey(str)) {
+            return true
+        }
+        if (newLineCounts >= 1) {
+            return false
+        }
+        return true
+    }
+}
+
+export class DefaultDocumentChangedType extends DocumentChangedType {
+    constructor(contentChanges: ReadonlyArray<vscode.TextDocumentContentChangeEvent>) {
+        super(contentChanges)
+    }
+
+    checkChangeSource(): DocumentChangedSource {
+        if (this.contentChanges.length === 0) {
+            return DocumentChangedSource.Unknown
+        }
+
+        // event.contentChanges.length will be 2 when user press Enter key multiple times
+        if (this.contentChanges.length > 2) {
+            return DocumentChangedSource.Reformatting
+        }
+
+        // Case when event.contentChanges.length === 1
+        const changedText = this.contentChanges[0].text
+
+        if (this.isSingleLine(changedText)) {
+            if (changedText === '') {
+                return DocumentChangedSource.Deletion
+            } else if (this.isEnterKey(changedText)) {
+                return DocumentChangedSource.EnterKey
+            } else if (this.isTabKey(changedText)) {
+                return DocumentChangedSource.TabKey
+            } else if (this.isUserTypingSpecialChar(changedText)) {
+                return DocumentChangedSource.SpecialCharsKey
+            } else if (changedText.length === 1) {
+                return DocumentChangedSource.RegularKey
+            } else if (new RegExp('^[ ]+$').test(changedText)) {
+                // single line && single place reformat should consist of space chars only
+                return DocumentChangedSource.Reformatting
+            } else {
+                return DocumentChangedSource.Unknown
+            }
+        }
+
+        // Won't trigger cwspr on multi-line changes
+        return DocumentChangedSource.Unknown
+    }
+}
+
+export enum DocumentChangedSource {
+    SpecialCharsKey = 'SpecialCharsKey',
+    RegularKey = 'RegularKey',
+    TabKey = 'TabKey',
+    EnterKey = 'EnterKey',
+    Reformatting = 'Reformatting',
+    Deletion = 'Deletion',
+    Unknown = 'Unknown',
+}
diff --git a/packages/core/src/codewhisperer/service/recommendationHandler.ts b/packages/core/src/codewhisperer/service/recommendationHandler.ts
new file mode 100644
index 00000000000..1cd64ccbe4b
--- /dev/null
+++ b/packages/core/src/codewhisperer/service/recommendationHandler.ts
@@ -0,0 +1,731 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { extensionVersion } from '../../shared/vscode/env'
+import { RecommendationsList, DefaultCodeWhispererClient, CognitoCredentialsError } from '../client/codewhisperer'
+import * as EditorContext from '../util/editorContext'
+import * as CodeWhispererConstants from '../models/constants'
+import { ConfigurationEntry, GetRecommendationsResponse, vsCodeState } from '../models/model'
+import { runtimeLanguageContext } from '../util/runtimeLanguageContext'
+import { ServiceException } from '@smithy/smithy-client'
+import { isServiceException } from '../../shared/errors'
+import { TelemetryHelper } from '../util/telemetryHelper'
+import { getLogger } from '../../shared/logger/logger'
+import { hasVendedIamCredentials } from '../../auth/auth'
+import {
+    asyncCallWithTimeout,
+    isInlineCompletionEnabled,
+    isVscHavingRegressionInlineCompletionApi,
+} from '../util/commonUtil'
+import { showTimedMessage } from '../../shared/utilities/messages'
+import {
+    CodewhispererAutomatedTriggerType,
+    CodewhispererCompletionType,
+    CodewhispererGettingStartedTask,
+    CodewhispererTriggerType,
+    telemetry,
+} from '../../shared/telemetry/telemetry'
+import { CodeWhispererCodeCoverageTracker } from '../tracker/codewhispererCodeCoverageTracker'
+import { invalidCustomizationMessage } from '../models/constants'
+import { getSelectedCustomization, switchToBaseCustomizationAndNotify } from '../util/customizationUtil'
+import { session } from '../util/codeWhispererSession'
+import { Commands } from '../../shared/vscode/commands2'
+import globals from '../../shared/extensionGlobals'
+import { noSuggestions, updateInlineLockKey } from '../models/constants'
+import AsyncLock from 'async-lock'
+import { AuthUtil } from '../util/authUtil'
+import { CWInlineCompletionItemProvider } from './inlineCompletionItemProvider'
+import { application } from '../util/codeWhispererApplication'
+import { openUrl } from '../../shared/utilities/vsCodeUtils'
+import { indent } from '../../shared/utilities/textUtilities'
+import path from 'path'
+import { isIamConnection } from '../../auth/connection'
+import { UserWrittenCodeTracker } from '../tracker/userWrittenCodeTracker'
+import { BaseLanguageClient } from 'vscode-languageclient'
+
+/**
+ * This class is for getRecommendation/listRecommendation API calls and its states
+ * It does not contain UI/UX related logic
+ */
+
+/**
+ * Commands as a level of indirection so that declare doesn't intercept any registrations for the
+ * language server implementation.
+ *
+ * Otherwise you'll get:
+ *     "Unable to launch amazonq language server: Command "aws.amazonq.rejectCodeSuggestion" has already been declared by the Toolkit"
+ */
+function createCommands() {
+    // below commands override VS Code inline completion commands
+    const prevCommand = Commands.declare('editor.action.inlineSuggest.showPrevious', () => async () => {
+        await RecommendationHandler.instance.showRecommendation(-1)
+    })
+    const nextCommand = Commands.declare('editor.action.inlineSuggest.showNext', () => async () => {
+        await RecommendationHandler.instance.showRecommendation(1)
+    })
+
+    const rejectCommand = Commands.declare('aws.amazonq.rejectCodeSuggestion', () => async () => {
+        telemetry.record({
+            traceId: TelemetryHelper.instance.traceId,
+        })
+
+        await vscode.commands.executeCommand('editor.action.inlineSuggest.hide')
+        RecommendationHandler.instance.reportUserDecisions(-1)
+        await Commands.tryExecute('aws.amazonq.refreshAnnotation')
+    })
+
+    return {
+        prevCommand,
+        nextCommand,
+        rejectCommand,
+    }
+}
+
+const lock = new AsyncLock({ maxPending: 1 })
+
+export class RecommendationHandler {
+    public lastInvocationTime: number
+    // TODO: remove this requestId
+    public requestId: string
+    private nextToken: string
+    private cancellationToken: vscode.CancellationTokenSource
+    private _onDidReceiveRecommendation: vscode.EventEmitter<void> = new vscode.EventEmitter<void>()
+    public readonly onDidReceiveRecommendation: vscode.Event<void> = this._onDidReceiveRecommendation.event
+    private inlineCompletionProvider?: CWInlineCompletionItemProvider
+    private inlineCompletionProviderDisposable?: vscode.Disposable
+    private reject: vscode.Disposable
+    private next: vscode.Disposable
+    private prev: vscode.Disposable
+    private _timer?: NodeJS.Timer
+    private languageClient?: BaseLanguageClient
+    documentUri: vscode.Uri | undefined = undefined
+
+    constructor() {
+        this.requestId = ''
+        this.nextToken = ''
+        this.lastInvocationTime = Date.now() - CodeWhispererConstants.invocationTimeIntervalThreshold * 1000
+        this.cancellationToken = new vscode.CancellationTokenSource()
+        this.prev = new vscode.Disposable(() => {})
+        this.next = new vscode.Disposable(() => {})
+        this.reject = new vscode.Disposable(() => {})
+    }
+
+    static #instance: RecommendationHandler
+
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+
+    isValidResponse(): boolean {
+        return session.recommendations.some((r) => r.content.trim() !== '')
+    }
+
+    setLanguageClient(languageClient: BaseLanguageClient) {
+        this.languageClient = languageClient
+    }
+
+    async getServerResponse(
+        triggerType: CodewhispererTriggerType,
+        isManualTriggerOn: boolean,
+        promise: Promise<any>
+    ): Promise<any> {
+        const timeoutMessage = hasVendedIamCredentials()
+            ? 'Generate recommendation timeout.'
+            : 'List recommendation timeout'
+        if (isManualTriggerOn && triggerType === 'OnDemand' && hasVendedIamCredentials()) {
+            return vscode.window.withProgress(
+                {
+                    location: vscode.ProgressLocation.Notification,
+                    title: CodeWhispererConstants.pendingResponse,
+                    cancellable: false,
+                },
+                async () => {
+                    return await asyncCallWithTimeout(
+                        promise,
+                        timeoutMessage,
+                        CodeWhispererConstants.promiseTimeoutLimit * 1000
+                    )
+                }
+            )
+        }
+        return await asyncCallWithTimeout(promise, timeoutMessage, CodeWhispererConstants.promiseTimeoutLimit * 1000)
+    }
+
+    async getTaskTypeFromEditorFileName(filePath: string): Promise<CodewhispererGettingStartedTask | undefined> {
+        if (filePath.includes('CodeWhisperer_generate_suggestion')) {
+            return 'autoTrigger'
+        } else if (filePath.includes('CodeWhisperer_manual_invoke')) {
+            return 'manualTrigger'
+        } else if (filePath.includes('CodeWhisperer_use_comments')) {
+            return 'commentAsPrompt'
+        } else if (filePath.includes('CodeWhisperer_navigate_suggestions')) {
+            return 'navigation'
+        } else if (filePath.includes('Generate_unit_tests')) {
+            return 'unitTest'
+        } else {
+            return undefined
+        }
+    }
+
+    async getRecommendations(
+        client: DefaultCodeWhispererClient,
+        editor: vscode.TextEditor,
+        triggerType: CodewhispererTriggerType,
+        config: ConfigurationEntry,
+        autoTriggerType?: CodewhispererAutomatedTriggerType,
+        pagination: boolean = true,
+        page: number = 0,
+        generate: boolean = isIamConnection(AuthUtil.instance.conn)
+    ): Promise<GetRecommendationsResponse> {
+        let invocationResult: 'Succeeded' | 'Failed' = 'Failed'
+        let errorMessage: string | undefined = undefined
+        let errorCode: string | undefined = undefined
+
+        if (!editor) {
+            return Promise.resolve<GetRecommendationsResponse>({
+                result: invocationResult,
+                errorMessage: errorMessage,
+                recommendationCount: 0,
+            })
+        }
+        let recommendations: RecommendationsList = []
+        let requestId = ''
+        let sessionId = ''
+        let reason = ''
+        let startTime = 0
+        let latency = 0
+        let nextToken = ''
+        let shouldRecordServiceInvocation = true
+        session.language = runtimeLanguageContext.getLanguageContext(
+            editor.document.languageId,
+            path.extname(editor.document.fileName)
+        ).language
+        session.taskType = await this.getTaskTypeFromEditorFileName(editor.document.fileName)
+
+        if (pagination && !generate) {
+            if (page === 0) {
+                session.requestContext = await EditorContext.buildListRecommendationRequest(
+                    editor as vscode.TextEditor,
+                    this.nextToken,
+                    config.isSuggestionsWithCodeReferencesEnabled,
+                    this.languageClient
+                )
+            } else {
+                session.requestContext = {
+                    request: {
+                        ...session.requestContext.request,
+                        // Putting nextToken assignment in the end so it overwrites the existing nextToken
+                        nextToken: this.nextToken,
+                    },
+                    supplementalMetadata: session.requestContext.supplementalMetadata,
+                }
+            }
+        } else {
+            session.requestContext = await EditorContext.buildGenerateRecommendationRequest(editor as vscode.TextEditor)
+        }
+        const request = session.requestContext.request
+        // record preprocessing end time
+        TelemetryHelper.instance.setPreprocessEndTime()
+
+        // set start pos for non pagination call or first pagination call
+        if (!pagination || (pagination && page === 0)) {
+            session.startPos = editor.selection.active
+            session.startCursorOffset = editor.document.offsetAt(session.startPos)
+            session.leftContextOfCurrentLine = EditorContext.getLeftContext(editor, session.startPos.line)
+            session.triggerType = triggerType
+            session.autoTriggerType = autoTriggerType
+
+            /**
+             * Validate request
+             */
+            if (!EditorContext.validateRequest(request)) {
+                getLogger().verbose('Invalid Request: %O', request)
+                const languageName = request.fileContext.programmingLanguage.languageName
+                if (!runtimeLanguageContext.isLanguageSupported(languageName)) {
+                    errorMessage = `${languageName} is currently not supported by Amazon Q inline suggestions`
+                }
+                return Promise.resolve<GetRecommendationsResponse>({
+                    result: invocationResult,
+                    errorMessage: errorMessage,
+                    recommendationCount: 0,
+                })
+            }
+        }
+
+        try {
+            startTime = Date.now()
+            this.lastInvocationTime = startTime
+            const mappedReq = runtimeLanguageContext.mapToRuntimeLanguage(request)
+            const codewhispererPromise =
+                pagination && !generate
+                    ? client.listRecommendations(mappedReq)
+                    : client.generateRecommendations(mappedReq)
+            const resp = await this.getServerResponse(triggerType, config.isManualTriggerEnabled, codewhispererPromise)
+            TelemetryHelper.instance.setSdkApiCallEndTime()
+            latency = startTime !== 0 ? Date.now() - startTime : 0
+            if ('recommendations' in resp) {
+                recommendations = (resp && resp.recommendations) || []
+            } else {
+                recommendations = (resp && resp.completions) || []
+            }
+            invocationResult = 'Succeeded'
+            requestId = resp?.$response && resp?.$response?.requestId
+            nextToken = resp?.nextToken ? resp?.nextToken : ''
+            sessionId = resp?.$response?.httpResponse?.headers['x-amzn-sessionid']
+            TelemetryHelper.instance.setFirstResponseRequestId(requestId)
+            if (page === 0) {
+                session.setTimeToFirstRecommendation(Date.now())
+            }
+            if (nextToken === '') {
+                TelemetryHelper.instance.setAllPaginationEndTime()
+            }
+        } catch (error) {
+            if (error instanceof CognitoCredentialsError) {
+                shouldRecordServiceInvocation = false
+            }
+            if (latency === 0) {
+                latency = startTime !== 0 ? Date.now() - startTime : 0
+            }
+            getLogger().error('amazonq inline-suggest: Invocation Exception : %s', (error as Error).message)
+            if (isServiceException(error)) {
+                errorMessage = error.message
+                requestId = error.$metadata.requestId || ''
+                errorCode = error.name
+                reason = `CodeWhisperer Invocation Exception: ${error?.name ?? 'unknown'}`
+                await this.onThrottlingException(error, triggerType)
+
+                if (error?.name === 'AccessDeniedException' && errorMessage?.includes('no identity-based policy')) {
+                    getLogger().error('amazonq inline-suggest: AccessDeniedException : %s', (error as Error).message)
+                    void vscode.window
+                        .showErrorMessage(`CodeWhisperer: ${error?.message}`, CodeWhispererConstants.settingsLearnMore)
+                        .then(async (resp) => {
+                            if (resp === CodeWhispererConstants.settingsLearnMore) {
+                                void openUrl(vscode.Uri.parse(CodeWhispererConstants.learnMoreUri))
+                            }
+                        })
+                    await vscode.commands.executeCommand('aws.amazonq.enableCodeSuggestions', false)
+                }
+            } else {
+                errorMessage = error instanceof Error ? error.message : String(error)
+                reason = error ? String(error) : 'unknown'
+            }
+        } finally {
+            const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone
+
+            let msg = indent(
+                `codewhisperer: request-id: ${requestId},
+                timestamp(epoch): ${Date.now()},
+                timezone: ${timezone},
+                datetime: ${new Date().toLocaleString([], { timeZone: timezone })},
+                vscode version: '${vscode.version}',
+                extension version: '${extensionVersion}',
+                filename: '${EditorContext.getFileName(editor)}',
+                left context of line:  '${session.leftContextOfCurrentLine}',
+                line number: ${session.startPos.line},
+                character location: ${session.startPos.character},
+                latency: ${latency} ms.
+                Recommendations:`,
+                4,
+                true
+            ).trimStart()
+            for (const [index, item] of recommendations.entries()) {
+                msg += `\n    ${index.toString().padStart(2, '0')}: ${indent(item.content, 8, true).trim()}`
+                session.requestIdList.push(requestId)
+            }
+            getLogger().debug(msg)
+            if (invocationResult === 'Succeeded') {
+                CodeWhispererCodeCoverageTracker.getTracker(session.language)?.incrementServiceInvocationCount()
+                UserWrittenCodeTracker.instance.onQFeatureInvoked()
+            } else {
+                if (
+                    (errorMessage?.includes(invalidCustomizationMessage) && errorCode === 'AccessDeniedException') ||
+                    errorCode === 'ResourceNotFoundException'
+                ) {
+                    getLogger()
+                        .debug(`The selected customization is no longer available. Retrying with the default model.
+                    Failed request id: ${requestId}`)
+                    await switchToBaseCustomizationAndNotify()
+                    await this.getRecommendations(
+                        client,
+                        editor,
+                        triggerType,
+                        config,
+                        autoTriggerType,
+                        pagination,
+                        page,
+                        true
+                    )
+                }
+            }
+
+            if (shouldRecordServiceInvocation) {
+                TelemetryHelper.instance.recordServiceInvocationTelemetry(
+                    requestId,
+                    sessionId,
+                    session.recommendations.length + recommendations.length - 1,
+                    invocationResult,
+                    latency,
+                    session.language,
+                    session.taskType,
+                    reason,
+                    session.requestContext.supplementalMetadata
+                )
+            }
+        }
+
+        if (this.isCancellationRequested()) {
+            return Promise.resolve<GetRecommendationsResponse>({
+                result: invocationResult,
+                errorMessage: errorMessage,
+                recommendationCount: session.recommendations.length,
+            })
+        }
+
+        const typedPrefix = editor.document
+            .getText(new vscode.Range(session.startPos, editor.selection.active))
+            .replace('\r\n', '\n')
+        if (recommendations.length > 0) {
+            TelemetryHelper.instance.setTypeAheadLength(typedPrefix.length)
+            // mark suggestions that does not match typeahead when arrival as Discard
+            // these suggestions can be marked as Showed if typeahead can be removed with new inline API
+            for (const [i, r] of recommendations.entries()) {
+                const recommendationIndex = i + session.recommendations.length
+                if (
+                    !r.content.startsWith(typedPrefix) &&
+                    session.getSuggestionState(recommendationIndex) === undefined
+                ) {
+                    session.setSuggestionState(recommendationIndex, 'Discard')
+                }
+                session.setCompletionType(recommendationIndex, r)
+            }
+            session.recommendations = pagination ? session.recommendations.concat(recommendations) : recommendations
+            if (isInlineCompletionEnabled() && this.hasAtLeastOneValidSuggestion(typedPrefix)) {
+                this._onDidReceiveRecommendation.fire()
+            }
+        }
+
+        this.requestId = requestId
+        session.sessionId = sessionId
+        this.nextToken = nextToken
+
+        // send Empty userDecision event if user receives no recommendations in this session at all.
+        if (invocationResult === 'Succeeded' && nextToken === '') {
+            // case 1: empty list of suggestion []
+            if (session.recommendations.length === 0) {
+                session.requestIdList.push(requestId)
+                // Received an empty list of recommendations
+                TelemetryHelper.instance.recordUserDecisionTelemetryForEmptyList(
+                    session.requestIdList,
+                    sessionId,
+                    page,
+                    runtimeLanguageContext.getLanguageContext(
+                        editor.document.languageId,
+                        path.extname(editor.document.fileName)
+                    ).language,
+                    session.requestContext.supplementalMetadata
+                )
+            }
+            // case 2: non empty list of suggestion but with (a) empty content or (b) non-matching typeahead
+            else if (!this.hasAtLeastOneValidSuggestion(typedPrefix)) {
+                this.reportUserDecisions(-1)
+            }
+        }
+        return Promise.resolve<GetRecommendationsResponse>({
+            result: invocationResult,
+            errorMessage: errorMessage,
+            recommendationCount: session.recommendations.length,
+        })
+    }
+
+    hasAtLeastOneValidSuggestion(typedPrefix: string): boolean {
+        return session.recommendations.some((r) => r.content.trim() !== '' && r.content.startsWith(typedPrefix))
+    }
+
+    cancelPaginatedRequest() {
+        this.nextToken = ''
+        this.cancellationToken.cancel()
+    }
+
+    isCancellationRequested() {
+        return this.cancellationToken.token.isCancellationRequested
+    }
+
+    checkAndResetCancellationTokens() {
+        if (this.isCancellationRequested()) {
+            this.cancellationToken.dispose()
+            this.cancellationToken = new vscode.CancellationTokenSource()
+            this.nextToken = ''
+            return true
+        }
+        return false
+    }
+    /**
+     * Clear recommendation state
+     */
+    clearRecommendations() {
+        session.requestIdList = []
+        session.recommendations = []
+        session.suggestionStates = new Map<number, string>()
+        session.completionTypes = new Map<number, CodewhispererCompletionType>()
+        this.requestId = ''
+        session.sessionId = ''
+        this.nextToken = ''
+        session.requestContext.supplementalMetadata = undefined
+    }
+
+    async clearInlineCompletionStates() {
+        try {
+            vsCodeState.isCodeWhispererEditing = false
+            application()._clearCodeWhispererUIListener.fire()
+            this.cancelPaginatedRequest()
+            this.clearRecommendations()
+            this.disposeInlineCompletion()
+            await vscode.commands.executeCommand('aws.amazonq.refreshStatusBar')
+            // fix a regression that requires user to hit Esc twice to clear inline ghost text
+            // because disposing a provider does not clear the UX
+            if (isVscHavingRegressionInlineCompletionApi()) {
+                await vscode.commands.executeCommand('editor.action.inlineSuggest.hide')
+            }
+        } finally {
+            this.clearRejectionTimer()
+        }
+    }
+
+    reportDiscardedUserDecisions() {
+        for (const [i, _] of session.recommendations.entries()) {
+            session.setSuggestionState(i, 'Discard')
+        }
+        this.reportUserDecisions(-1)
+    }
+
+    /**
+     * Emits telemetry reflecting user decision for current recommendation.
+     */
+    reportUserDecisions(acceptIndex: number) {
+        if (session.sessionId === '' || this.requestId === '') {
+            return
+        }
+        TelemetryHelper.instance.recordUserDecisionTelemetry(
+            session.requestIdList,
+            session.sessionId,
+            session.recommendations,
+            acceptIndex,
+            session.recommendations.length,
+            session.completionTypes,
+            session.suggestionStates,
+            session.requestContext.supplementalMetadata
+        )
+        if (isInlineCompletionEnabled()) {
+            this.clearInlineCompletionStates().catch((e) => {
+                getLogger().error('clearInlineCompletionStates failed: %s', (e as Error).message)
+            })
+        }
+    }
+
+    hasNextToken(): boolean {
+        return this.nextToken !== ''
+    }
+
+    canShowRecommendationInIntelliSense(
+        editor: vscode.TextEditor,
+        showPrompt: boolean = false,
+        response: GetRecommendationsResponse
+    ): boolean {
+        const reject = () => {
+            this.reportUserDecisions(-1)
+        }
+        if (!this.isValidResponse()) {
+            if (showPrompt) {
+                void showTimedMessage(response.errorMessage ? response.errorMessage : noSuggestions, 3000)
+            }
+            reject()
+            return false
+        }
+        // do not show recommendation if cursor is before invocation position
+        // also mark as Discard
+        if (editor.selection.active.isBefore(session.startPos)) {
+            for (const [i, _] of session.recommendations.entries()) {
+                session.setSuggestionState(i, 'Discard')
+            }
+            reject()
+            return false
+        }
+
+        // do not show recommendation if typeahead does not match
+        // also mark as Discard
+        const typedPrefix = editor.document.getText(
+            new vscode.Range(
+                session.startPos.line,
+                session.startPos.character,
+                editor.selection.active.line,
+                editor.selection.active.character
+            )
+        )
+        if (!session.recommendations[0].content.startsWith(typedPrefix.trimStart())) {
+            for (const [i, _] of session.recommendations.entries()) {
+                session.setSuggestionState(i, 'Discard')
+            }
+            reject()
+            return false
+        }
+        return true
+    }
+
+    async onThrottlingException(awsError: ServiceException, triggerType: CodewhispererTriggerType) {
+        if (
+            awsError.name === 'ThrottlingException' &&
+            awsError.message.includes(CodeWhispererConstants.throttlingMessage)
+        ) {
+            if (triggerType === 'OnDemand') {
+                void vscode.window.showErrorMessage(CodeWhispererConstants.freeTierLimitReached)
+            }
+            vsCodeState.isFreeTierLimitReached = true
+        }
+    }
+
+    public disposeInlineCompletion() {
+        this.inlineCompletionProviderDisposable?.dispose()
+        this.inlineCompletionProvider = undefined
+    }
+
+    private disposeCommandOverrides() {
+        this.prev.dispose()
+        this.reject.dispose()
+        this.next.dispose()
+    }
+
+    // These commands override the vs code inline completion commands
+    // They are subscribed when suggestion starts and disposed when suggestion is accepted/rejected
+    // to avoid impacting other plugins or user who uses this API
+    private registerCommandOverrides() {
+        const { prevCommand, nextCommand, rejectCommand } = createCommands()
+        this.prev = prevCommand.register()
+        this.next = nextCommand.register()
+        this.reject = rejectCommand.register()
+    }
+
+    subscribeSuggestionCommands() {
+        this.disposeCommandOverrides()
+        this.registerCommandOverrides()
+        globals.context.subscriptions.push(this.prev)
+        globals.context.subscriptions.push(this.next)
+        globals.context.subscriptions.push(this.reject)
+    }
+
+    async showRecommendation(indexShift: number, noSuggestionVisible: boolean = false) {
+        await lock.acquire(updateInlineLockKey, async () => {
+            if (!vscode.window.state.focused) {
+                this.reportDiscardedUserDecisions()
+                return
+            }
+            const inlineCompletionProvider = new CWInlineCompletionItemProvider(
+                this.inlineCompletionProvider?.getActiveItemIndex,
+                indexShift,
+                session.recommendations,
+                this.requestId,
+                session.startPos,
+                this.nextToken
+            )
+            this.inlineCompletionProviderDisposable?.dispose()
+            // when suggestion is active, registering a new provider will let VS Code invoke inline API automatically
+            this.inlineCompletionProviderDisposable = vscode.languages.registerInlineCompletionItemProvider(
+                Object.assign([], CodeWhispererConstants.platformLanguageIds),
+                inlineCompletionProvider
+            )
+            this.inlineCompletionProvider = inlineCompletionProvider
+
+            if (isVscHavingRegressionInlineCompletionApi() && !noSuggestionVisible) {
+                // fix a regression in new VS Code when disposing and re-registering
+                // a new provider does not auto refresh the inline suggestion widget
+                // by manually refresh it
+                await vscode.commands.executeCommand('editor.action.inlineSuggest.hide')
+                await vscode.commands.executeCommand('editor.action.inlineSuggest.trigger')
+            }
+            if (noSuggestionVisible) {
+                await vscode.commands.executeCommand(`editor.action.inlineSuggest.trigger`)
+                this.sendPerceivedLatencyTelemetry()
+            }
+        })
+    }
+
+    async onEditorChange() {
+        this.reportUserDecisions(-1)
+    }
+
+    async onFocusChange() {
+        this.reportUserDecisions(-1)
+    }
+
+    async onCursorChange(e: vscode.TextEditorSelectionChangeEvent) {
+        // we do not want to reset the states for keyboard events because they can be typeahead
+        if (
+            e.kind !== vscode.TextEditorSelectionChangeKind.Keyboard &&
+            vscode.window.activeTextEditor === e.textEditor
+        ) {
+            application()._clearCodeWhispererUIListener.fire()
+            // when cursor change due to mouse movement we need to reset the active item index for inline
+            if (e.kind === vscode.TextEditorSelectionChangeKind.Mouse) {
+                this.inlineCompletionProvider?.clearActiveItemIndex()
+            }
+        }
+    }
+
+    isSuggestionVisible(): boolean {
+        return this.inlineCompletionProvider?.getActiveItemIndex !== undefined
+    }
+
+    async tryShowRecommendation() {
+        const editor = vscode.window.activeTextEditor
+        if (editor === undefined) {
+            return
+        }
+        if (this.isSuggestionVisible()) {
+            // do not force refresh the tooltip to avoid suggestion "flashing"
+            return
+        }
+        if (
+            editor.selection.active.isBefore(session.startPos) ||
+            editor.document.uri.fsPath !== this.documentUri?.fsPath
+        ) {
+            for (const [i, _] of session.recommendations.entries()) {
+                session.setSuggestionState(i, 'Discard')
+            }
+            this.reportUserDecisions(-1)
+        } else if (session.recommendations.length > 0) {
+            await this.showRecommendation(0, true)
+        }
+    }
+
+    private clearRejectionTimer() {
+        if (this._timer !== undefined) {
+            clearInterval(this._timer)
+            this._timer = undefined
+        }
+    }
+
+    private sendPerceivedLatencyTelemetry() {
+        if (vscode.window.activeTextEditor) {
+            const languageContext = runtimeLanguageContext.getLanguageContext(
+                vscode.window.activeTextEditor.document.languageId,
+                vscode.window.activeTextEditor.document.fileName.substring(
+                    vscode.window.activeTextEditor.document.fileName.lastIndexOf('.') + 1
+                )
+            )
+            telemetry.codewhisperer_perceivedLatency.emit({
+                codewhispererRequestId: this.requestId,
+                codewhispererSessionId: session.sessionId,
+                codewhispererTriggerType: session.triggerType,
+                codewhispererCompletionType: session.getCompletionType(0),
+                codewhispererCustomizationArn: getSelectedCustomization().arn,
+                codewhispererLanguage: languageContext.language,
+                duration: Date.now() - this.lastInvocationTime,
+                passive: true,
+                credentialStartUrl: AuthUtil.instance.startUrl,
+                result: 'Succeeded',
+            })
+        }
+    }
+}
diff --git a/packages/core/src/codewhisperer/service/recommendationService.ts b/packages/core/src/codewhisperer/service/recommendationService.ts
new file mode 100644
index 00000000000..de78b435913
--- /dev/null
+++ b/packages/core/src/codewhisperer/service/recommendationService.ts
@@ -0,0 +1,122 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { ConfigurationEntry, GetRecommendationsResponse } from '../models/model'
+import { isInlineCompletionEnabled } from '../util/commonUtil'
+import {
+    CodewhispererAutomatedTriggerType,
+    CodewhispererTriggerType,
+    telemetry,
+} from '../../shared/telemetry/telemetry'
+import { InlineCompletionService } from '../service/inlineCompletionService'
+import { ClassifierTrigger } from './classifierTrigger'
+import { DefaultCodeWhispererClient } from '../client/codewhisperer'
+import { randomUUID } from '../../shared/crypto'
+import { TelemetryHelper } from '../util/telemetryHelper'
+import { AuthUtil } from '../util/authUtil'
+
+export interface SuggestionActionEvent {
+    readonly editor: vscode.TextEditor | undefined
+    readonly isRunning: boolean
+    readonly triggerType: CodewhispererTriggerType
+    readonly response: GetRecommendationsResponse | undefined
+}
+
+export class RecommendationService {
+    static #instance: RecommendationService
+
+    private _isRunning: boolean = false
+    get isRunning() {
+        return this._isRunning
+    }
+
+    private _onSuggestionActionEvent = new vscode.EventEmitter<SuggestionActionEvent>()
+    get suggestionActionEvent(): vscode.Event<SuggestionActionEvent> {
+        return this._onSuggestionActionEvent.event
+    }
+
+    private _acceptedSuggestionCount: number = 0
+    get acceptedSuggestionCount() {
+        return this._acceptedSuggestionCount
+    }
+
+    private _totalValidTriggerCount: number = 0
+    get totalValidTriggerCount() {
+        return this._totalValidTriggerCount
+    }
+
+    public static get instance() {
+        return (this.#instance ??= new RecommendationService())
+    }
+
+    incrementAcceptedCount() {
+        this._acceptedSuggestionCount++
+    }
+
+    incrementValidTriggerCount() {
+        this._totalValidTriggerCount++
+    }
+
+    async generateRecommendation(
+        client: DefaultCodeWhispererClient,
+        editor: vscode.TextEditor,
+        triggerType: CodewhispererTriggerType,
+        config: ConfigurationEntry,
+        autoTriggerType?: CodewhispererAutomatedTriggerType,
+        event?: vscode.TextDocumentChangeEvent
+    ) {
+        // TODO: should move all downstream auth check(inlineCompletionService, recommendationHandler etc) to here(upstream) instead of spreading everywhere
+        if (AuthUtil.instance.isConnected() && AuthUtil.instance.requireProfileSelection()) {
+            return
+        }
+
+        if (this._isRunning) {
+            return
+        }
+
+        /**
+         * Use an existing trace ID if invoked through a command (e.g., manual invocation),
+         * otherwise generate a new trace ID
+         */
+        const traceId = telemetry.attributes?.traceId ?? randomUUID()
+        TelemetryHelper.instance.setTraceId(traceId)
+        await telemetry.withTraceId(async () => {
+            if (isInlineCompletionEnabled()) {
+                if (triggerType === 'OnDemand') {
+                    ClassifierTrigger.instance.recordClassifierResultForManualTrigger(editor)
+                }
+
+                this._isRunning = true
+                let response: GetRecommendationsResponse | undefined = undefined
+
+                try {
+                    this._onSuggestionActionEvent.fire({
+                        editor: editor,
+                        isRunning: true,
+                        triggerType: triggerType,
+                        response: undefined,
+                    })
+
+                    response = await InlineCompletionService.instance.getPaginatedRecommendation(
+                        client,
+                        editor,
+                        triggerType,
+                        config,
+                        autoTriggerType,
+                        event
+                    )
+                } finally {
+                    this._isRunning = false
+                    this._onSuggestionActionEvent.fire({
+                        editor: editor,
+                        isRunning: false,
+                        triggerType: triggerType,
+                        response: response,
+                    })
+                }
+            }
+        }, traceId)
+    }
+}
diff --git a/src/codewhisperer/service/referenceHoverProvider.ts b/packages/core/src/codewhisperer/service/referenceHoverProvider.ts
similarity index 90%
rename from src/codewhisperer/service/referenceHoverProvider.ts
rename to packages/core/src/codewhisperer/service/referenceHoverProvider.ts
index d220d113f89..bce371994b5 100644
--- a/src/codewhisperer/service/referenceHoverProvider.ts
+++ b/packages/core/src/codewhisperer/service/referenceHoverProvider.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -31,9 +31,9 @@ export class ReferenceHoverProvider implements vscode.HoverProvider {
                 let refLength = codeRef.code.length
                 let refCode = codeRef.code
                 if (
-                    reference.recommendationContentSpan != undefined &&
-                    reference.recommendationContentSpan.start != undefined &&
-                    reference.recommendationContentSpan.end != undefined
+                    reference.recommendationContentSpan !== undefined &&
+                    reference.recommendationContentSpan.start !== undefined &&
+                    reference.recommendationContentSpan.end !== undefined
                 ) {
                     refLength = reference.recommendationContentSpan.end - reference.recommendationContentSpan.start
                     refCode = codeRef.code.substring(
@@ -47,7 +47,7 @@ export class ReferenceHoverProvider implements vscode.HoverProvider {
                     new vscode.Range(document.positionAt(leftOffset), document.positionAt(rightOffset))
                 )
                 const index = subDocument.indexOf(refCode)
-                if (index != -1) {
+                if (index !== -1) {
                     return new vscode.Hover(
                         CodeWhispererConstants.hoverInlayText(reference.licenseName, reference.repository),
                         new vscode.Range(
diff --git a/src/codewhisperer/service/referenceInlineProvider.ts b/packages/core/src/codewhisperer/service/referenceInlineProvider.ts
similarity index 79%
rename from src/codewhisperer/service/referenceInlineProvider.ts
rename to packages/core/src/codewhisperer/service/referenceInlineProvider.ts
index f2e8d7f50d1..6fe0cf122f2 100644
--- a/src/codewhisperer/service/referenceInlineProvider.ts
+++ b/packages/core/src/codewhisperer/service/referenceInlineProvider.ts
@@ -1,16 +1,16 @@
 /*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as vscode from 'vscode'
 import * as CodeWhispererConstants from '../models/constants'
-import { getLogger } from '../../shared/logger'
+import { getLogger } from '../../shared/logger/logger'
 import { References } from '../client/codewhisperer'
 import { LicenseUtil } from '../util/licenseUtil'
 import { isInlineCompletionEnabled } from '../util/commonUtil'
-
-const performance = globalThis.performance ?? require('perf_hooks').performance
+import { application } from '../util/codeWhispererApplication'
+import { placeholder } from '../../shared/vscode/commands2'
 
 /**
  * ReferenceInlineProvider
@@ -22,7 +22,11 @@ export class ReferenceInlineProvider implements vscode.CodeLensProvider {
     private _onDidChangeCodeLenses: vscode.EventEmitter<void> = new vscode.EventEmitter<void>()
     public readonly onDidChangeCodeLenses: vscode.Event<void> = this._onDidChangeCodeLenses.event
 
-    constructor() {}
+    constructor() {
+        application().clearCodeWhispererUIListener((_) => {
+            this.removeInlineReference()
+        })
+    }
 
     static #instance: ReferenceInlineProvider
 
@@ -31,7 +35,7 @@ export class ReferenceInlineProvider implements vscode.CodeLensProvider {
     }
 
     public setInlineReference(line: number, suggestion: string, references: References | undefined) {
-        const startTime = performance.now()
+        const startTime = Date.now()
         this.ranges = []
         this.refs = []
         if (
@@ -49,7 +53,7 @@ export class ReferenceInlineProvider implements vscode.CodeLensProvider {
         const licenses = [...n].join(', ')
         this.ranges.push(new vscode.Range(line, 0, line, 1))
         this.refs.push(CodeWhispererConstants.suggestionDetailReferenceText(licenses))
-        const duration = performance.now() - startTime
+        const duration = Date.now() - startTime
         if (duration > 100) {
             getLogger().warn(`setInlineReference takes ${duration}ms`)
         }
@@ -66,18 +70,19 @@ export class ReferenceInlineProvider implements vscode.CodeLensProvider {
         document: vscode.TextDocument,
         token: vscode.CancellationToken
     ): vscode.CodeLens[] | Thenable<vscode.CodeLens[]> {
-        const startTime = performance.now()
+        const startTime = Date.now()
         const codeLenses: vscode.CodeLens[] = []
         for (let i = 0; i < this.ranges.length; i++) {
             const codeLens = new vscode.CodeLens(this.ranges[i])
             codeLens.command = {
                 title: this.refs[i],
                 tooltip: 'Reference code',
-                command: 'aws.codeWhisperer.openReferencePanel',
+                command: 'aws.amazonq.openReferencePanel',
+                arguments: [placeholder, 'codelens'],
             }
             codeLenses.push(codeLens)
         }
-        const duration = performance.now() - startTime
+        const duration = Date.now() - startTime
         if (duration > 100) {
             getLogger().warn(`setInlineReference takes ${duration}ms`)
         }
diff --git a/packages/core/src/codewhisperer/service/referenceLogViewProvider.ts b/packages/core/src/codewhisperer/service/referenceLogViewProvider.ts
new file mode 100644
index 00000000000..d51424b1c46
--- /dev/null
+++ b/packages/core/src/codewhisperer/service/referenceLogViewProvider.ts
@@ -0,0 +1,188 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { LicenseUtil } from '../util/licenseUtil'
+import * as CodeWhispererConstants from '../models/constants'
+import { CodeWhispererSettings } from '../util/codewhispererSettings'
+import globals from '../../shared/extensionGlobals'
+import { AuthUtil } from '../util/authUtil'
+import { session } from '../util/codeWhispererSession'
+import CodeWhispererClient from '../client/codewhispererclient'
+import CodeWhispererUserClient from '../client/codewhispereruserclient'
+import { InlineCompletionItemWithReferences } from '@aws/language-server-runtimes-types'
+
+export class ReferenceLogViewProvider implements vscode.WebviewViewProvider {
+    public static readonly viewType = 'aws.codeWhisperer.referenceLog'
+    private _view?: vscode.WebviewView
+    private _referenceLogs: string[] = []
+    private _extensionUri: vscode.Uri = globals.context.extensionUri
+    constructor() {}
+    static #instance: ReferenceLogViewProvider
+
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+
+    public resolveWebviewView(
+        webviewView: vscode.WebviewView,
+        context: vscode.WebviewViewResolveContext<unknown>,
+        token: vscode.CancellationToken
+    ): void | Thenable<void> {
+        this._view = webviewView
+
+        this._view.webview.options = {
+            // Allow scripts in the webview
+            enableScripts: true,
+            localResourceRoots: [this._extensionUri],
+        }
+        this._view.webview.html = this.getHtml(
+            webviewView.webview,
+            CodeWhispererSettings.instance.isSuggestionsWithCodeReferencesEnabled()
+        )
+        this._view.webview.onDidReceiveMessage(async (data) => {
+            await vscode.commands.executeCommand('aws.amazonq.configure', 'codewhisperer')
+        })
+    }
+
+    public update() {
+        if (this._view) {
+            const showPrompt = CodeWhispererSettings.instance.isSuggestionsWithCodeReferencesEnabled()
+            this._view.webview.html = this.getHtml(this._view.webview, showPrompt)
+        }
+    }
+
+    public static getReferenceLog(recommendation: string, references: Reference[], editor: vscode.TextEditor): string {
+        const filePath = editor.document.uri.path
+        const time = new Date().toLocaleString()
+        let text = ``
+        for (const reference of references) {
+            const standardReference = toStandardReference(reference)
+            if (
+                standardReference.position === undefined ||
+                standardReference.position.start === undefined ||
+                standardReference.position.end === undefined
+            ) {
+                continue
+            }
+            const { start, end } = standardReference.position
+            const code = recommendation.substring(start, end)
+            const firstCharLineNumber = editor.document.positionAt(session.startCursorOffset + start).line + 1
+            const lastCharLineNumber = editor.document.positionAt(session.startCursorOffset + end - 1).line + 1
+            let lineInfo = ``
+            if (firstCharLineNumber === lastCharLineNumber) {
+                lineInfo = `(line at ${firstCharLineNumber})`
+            } else {
+                lineInfo = `(lines from ${firstCharLineNumber} to ${lastCharLineNumber})`
+            }
+            if (text !== '') {
+                text += `And `
+            }
+
+            let license = `<a href=${LicenseUtil.getLicenseHtml(standardReference.licenseName)}>${standardReference.licenseName}</a>`
+            let repository = standardReference.repository?.length ? standardReference.repository : 'unknown'
+            if (standardReference.url?.length) {
+                repository = `<a href=${standardReference.url}>${standardReference.repository}</a>`
+                license = `<b><i>${standardReference.licenseName || 'unknown'}</i></b>`
+            }
+
+            text +=
+                CodeWhispererConstants.referenceLogText(
+                    `<br><code>${code}</code><br>`,
+                    license,
+                    repository,
+                    filePath,
+                    lineInfo
+                ) + ' <br>'
+        }
+        if (text === ``) {
+            return ''
+        }
+        return `[${time}] Accepted recommendation ${text}<br>`
+    }
+
+    public addReferenceLog(referenceLog: string) {
+        if (referenceLog !== '') {
+            this._referenceLogs.push(referenceLog)
+        }
+        this.update()
+    }
+    private getHtml(webview: vscode.Webview, showPrompt: boolean): string {
+        const styleVSCodeUri = webview.asWebviewUri(
+            vscode.Uri.joinPath(this._extensionUri, 'src', 'codewhisperer', 'views/css/codewhispererReferenceLog.css')
+        )
+
+        let prompt = ''
+        if (showPrompt) {
+            if (AuthUtil.instance.isEnterpriseSsoInUse()) {
+                prompt = CodeWhispererConstants.referenceLogPromptTextEnterpriseSSO
+            } else {
+                prompt = CodeWhispererConstants.referenceLogPromptText
+            }
+        }
+
+        return `<!DOCTYPE html>
+            <html lang="en">
+            <head>
+                <link rel="stylesheet" href="${styleVSCodeUri}">
+            </head>
+            <body>
+                <p>${prompt} </p>
+                <p> ${this._referenceLogs.join('')} </p>
+                <script>
+                const vscode = acquireVsCodeApi();
+                function openSettings() {
+                    vscode.postMessage('aws.explorer.focus')
+                }
+                </script>
+            </body>
+            </html>`
+    }
+}
+
+/**
+ * Reference log needs to support references directly from CW, as well as those from Flare. These references have different shapes, so we standarize them here.
+ */
+type GetInnerType<T> = T extends (infer U)[] ? U : never
+type Reference =
+    | CodeWhispererClient.Reference
+    | CodeWhispererUserClient.Reference
+    | GetInnerType<InlineCompletionItemWithReferences['references']>
+
+type StandardizedReference = {
+    licenseName?: string
+    position?: {
+        start?: number
+        end?: number
+    }
+    repository?: string
+    url?: string
+}
+
+/**
+ * Convert a general reference to the standardized format expected by the reference log.
+ * @param ref
+ * @returns
+ */
+function toStandardReference(ref: Reference): StandardizedReference {
+    const isCWReference = (ref: any) => ref.recommendationContentSpan !== undefined
+
+    if (isCWReference(ref)) {
+        const castRef = ref as CodeWhispererClient.Reference
+        return {
+            licenseName: castRef.licenseName!,
+            position: { start: castRef.recommendationContentSpan?.start, end: castRef.recommendationContentSpan?.end },
+            repository: castRef.repository,
+            url: castRef.url,
+        }
+    }
+    const castRef = ref as GetInnerType<InlineCompletionItemWithReferences['references']>
+    return {
+        licenseName: castRef.licenseName,
+        position: { start: castRef.position?.startCharacter, end: castRef.position?.endCharacter },
+        repository: castRef.referenceName,
+        url: castRef.referenceUrl,
+    }
+}
diff --git a/packages/core/src/codewhisperer/service/securityIssueCodeActionProvider.ts b/packages/core/src/codewhisperer/service/securityIssueCodeActionProvider.ts
new file mode 100644
index 00000000000..4dc7bceebe7
--- /dev/null
+++ b/packages/core/src/codewhisperer/service/securityIssueCodeActionProvider.ts
@@ -0,0 +1,106 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { SecurityIssueProvider } from './securityIssueProvider'
+import { CodeScanIssue } from '../models/model'
+import { Component } from '../../shared/telemetry/telemetry'
+import { amazonqCodeIssueDetailsTabTitle } from '../models/constants'
+
+export class SecurityIssueCodeActionProvider implements vscode.CodeActionProvider {
+    static #instance: SecurityIssueCodeActionProvider
+    private issueProvider = SecurityIssueProvider.instance
+
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+
+    public provideCodeActions(
+        document: vscode.TextDocument,
+        range: vscode.Range | vscode.Selection,
+        _context: vscode.CodeActionContext,
+        _token: vscode.CancellationToken
+    ): vscode.CodeAction[] {
+        const codeActions: vscode.CodeAction[] = []
+
+        for (const group of this.issueProvider.issues) {
+            if (document.fileName !== group.filePath) {
+                continue
+            }
+
+            for (const issue of group.issues) {
+                if (!issue.visible) {
+                    continue
+                }
+                const issueRange = new vscode.Range(issue.startLine, 0, issue.endLine, 0)
+                if (issueRange.contains(range)) {
+                    const [suggestedFix] = issue.suggestedFixes
+                    if (suggestedFix) {
+                        const fixIssue = new vscode.CodeAction(
+                            `Amazon Q: Fix "${issue.title}"`,
+                            vscode.CodeActionKind.QuickFix
+                        )
+                        const args: [CodeScanIssue, string, Component] = [issue, group.filePath, 'quickfix']
+                        fixIssue.command = {
+                            title: 'Fix with Amazon Q',
+                            command: 'aws.amazonq.applySecurityFix',
+                            arguments: args,
+                        }
+                        codeActions.push(fixIssue)
+                    }
+                    const openIssue = new vscode.CodeAction(
+                        `Amazon Q: View details for "${issue.title}"`,
+                        vscode.CodeActionKind.QuickFix
+                    )
+                    const args: [CodeScanIssue, string] = [issue, group.filePath]
+                    openIssue.command = {
+                        title: `Open "${amazonqCodeIssueDetailsTabTitle}"`,
+                        command: 'aws.amazonq.openSecurityIssuePanel',
+                        arguments: args,
+                    }
+                    codeActions.push(openIssue)
+
+                    const explainWithQ = new vscode.CodeAction(
+                        `Amazon Q: Explain "${issue.title}"`,
+                        vscode.CodeActionKind.QuickFix
+                    )
+                    const explainWithQArgs = [issue, group.filePath]
+                    explainWithQ.command = {
+                        title: 'Explain with Amazon Q',
+                        command: 'aws.amazonq.explainIssue',
+                        arguments: explainWithQArgs,
+                    }
+                    codeActions.push(explainWithQ)
+
+                    const ignoreIssue = new vscode.CodeAction(
+                        `Amazon Q: Ignore this "${issue.title}" issue`,
+                        vscode.CodeActionKind.QuickFix
+                    )
+                    const ignoreIssueArgs = [issue, group.filePath, 'quickfix']
+                    ignoreIssue.command = {
+                        title: 'Ignore this issue',
+                        command: 'aws.amazonq.security.ignore',
+                        arguments: ignoreIssueArgs,
+                    }
+                    codeActions.push(ignoreIssue)
+
+                    const ignoreAllIssues = new vscode.CodeAction(
+                        `Amazon Q: Ignore all "${issue.title}" issues`,
+                        vscode.CodeActionKind.QuickFix
+                    )
+                    const ignoreAllIssuesArgs = [issue, 'quickfix']
+                    ignoreAllIssues.command = {
+                        title: 'Ignore similar issues',
+                        command: 'aws.amazonq.security.ignoreAll',
+                        arguments: ignoreAllIssuesArgs,
+                    }
+                    codeActions.push(ignoreAllIssues)
+                }
+            }
+        }
+
+        return codeActions
+    }
+}
diff --git a/packages/core/src/codewhisperer/service/securityIssueHoverProvider.ts b/packages/core/src/codewhisperer/service/securityIssueHoverProvider.ts
new file mode 100644
index 00000000000..bb9fe2cafa4
--- /dev/null
+++ b/packages/core/src/codewhisperer/service/securityIssueHoverProvider.ts
@@ -0,0 +1,131 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { CodeScanIssue } from '../models/model'
+import globals from '../../shared/extensionGlobals'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import path from 'path'
+import { AuthUtil } from '../util/authUtil'
+import { TelemetryHelper } from '../util/telemetryHelper'
+import { SecurityIssueProvider } from './securityIssueProvider'
+
+export class SecurityIssueHoverProvider implements vscode.HoverProvider {
+    static #instance: SecurityIssueHoverProvider
+    private issueProvider: SecurityIssueProvider = SecurityIssueProvider.instance
+
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+
+    public provideHover(
+        document: vscode.TextDocument,
+        position: vscode.Position,
+        _token: vscode.CancellationToken
+    ): vscode.Hover {
+        const contents: vscode.MarkdownString[] = []
+
+        for (const group of this.issueProvider.issues) {
+            if (document.fileName !== group.filePath) {
+                continue
+            }
+
+            for (const issue of group.issues) {
+                if (!issue.visible) {
+                    continue
+                }
+                const range = new vscode.Range(issue.startLine, 0, issue.endLine, 0)
+                if (range.contains(position)) {
+                    contents.push(this._getContent(group.filePath, issue))
+                    telemetry.codewhisperer_codeScanIssueHover.emit({
+                        findingId: issue.findingId,
+                        detectorId: issue.detectorId,
+                        ruleId: issue.ruleId,
+                        includesFix: !!issue.suggestedFixes.length,
+                        credentialStartUrl: AuthUtil.instance.startUrl,
+                        autoDetected: issue.autoDetected,
+                    })
+                    TelemetryHelper.instance.sendCodeScanRemediationsEvent(
+                        document.languageId,
+                        'CODESCAN_ISSUE_HOVER',
+                        issue.detectorId,
+                        issue.findingId,
+                        issue.ruleId,
+                        undefined,
+                        undefined,
+                        undefined,
+                        !!issue.suggestedFixes.length
+                    )
+                }
+            }
+        }
+
+        return new vscode.Hover(contents)
+    }
+
+    private _getContent(filePath: string, issue: CodeScanIssue) {
+        const markdownString = new vscode.MarkdownString()
+        markdownString.isTrusted = true
+        markdownString.supportHtml = true
+        markdownString.supportThemeIcons = true
+        markdownString.baseUri = vscode.Uri.file(path.join(globals.context.extensionPath, 'resources/images/'))
+
+        const [suggestedFix] = issue.suggestedFixes
+
+        markdownString.appendMarkdown(`## ${issue.title} ${this._makeSeverityBadge(issue.severity)}\n`)
+        markdownString.appendMarkdown(
+            `${suggestedFix?.code && suggestedFix.description !== '' ? suggestedFix.description : issue.recommendation.text}\n\n`
+        )
+
+        const explainWithQCommand = this._getCommandMarkdown(
+            'aws.amazonq.explainIssue',
+            [issue, filePath],
+            'comment',
+            'Explain',
+            'Explain with Amazon Q'
+        )
+        markdownString.appendMarkdown(explainWithQCommand)
+
+        const generateFixCommand = this._getCommandMarkdown(
+            'aws.amazonq.generateFix',
+            [issue, filePath],
+            'wrench',
+            'Fix',
+            'Fix with Amazon Q'
+        )
+        markdownString.appendMarkdown(' | ' + generateFixCommand)
+
+        const ignoreIssueCommand = this._getCommandMarkdown(
+            'aws.amazonq.security.ignore',
+            [issue, filePath, 'hover'],
+            'error',
+            'Ignore',
+            'Ignore Issue'
+        )
+        markdownString.appendMarkdown(' | ' + ignoreIssueCommand)
+
+        const ignoreSimilarIssuesCommand = this._getCommandMarkdown(
+            'aws.amazonq.security.ignoreAll',
+            [issue, 'hover'],
+            'error',
+            'Ignore All',
+            'Ignore Similar Issues'
+        )
+        markdownString.appendMarkdown(' | ' + ignoreSimilarIssuesCommand)
+
+        return markdownString
+    }
+
+    private _getCommandMarkdown(command: string, args: any, icon: string, text: string, description: string) {
+        const commandUri = vscode.Uri.parse(`command:${command}?${encodeURIComponent(JSON.stringify(args))}`)
+        return `[$(${icon}) ${text}](${commandUri} '${description}')\n`
+    }
+
+    private _makeSeverityBadge(severity: string) {
+        if (!severity) {
+            return ''
+        }
+        return `![${severity}](severity-${severity.toLowerCase()}.svg)`
+    }
+}
diff --git a/packages/core/src/codewhisperer/service/securityIssueProvider.ts b/packages/core/src/codewhisperer/service/securityIssueProvider.ts
new file mode 100644
index 00000000000..01f1cd880bd
--- /dev/null
+++ b/packages/core/src/codewhisperer/service/securityIssueProvider.ts
@@ -0,0 +1,196 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { AggregatedCodeScanIssue, CodeScanIssue, SuggestedFix } from '../models/model'
+import { randomUUID } from '../../shared/crypto'
+import { displayFindingsDetectorName } from '../models/constants'
+
+export class SecurityIssueProvider {
+    static #instance: SecurityIssueProvider
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+
+    private _issues: AggregatedCodeScanIssue[] = []
+    public get issues() {
+        return this._issues
+    }
+
+    public set issues(issues: AggregatedCodeScanIssue[]) {
+        this._issues = issues
+    }
+
+    private _id: string = randomUUID()
+    public get id() {
+        return this._id
+    }
+
+    public set id(id: string) {
+        this._id = id
+    }
+
+    public handleDocumentChange(event: vscode.TextDocumentChangeEvent) {
+        // handleDocumentChange function may be triggered while testing by our own code generation.
+        if (!event.contentChanges || event.contentChanges.length === 0) {
+            return
+        }
+        const { changedRange, changedText, lineOffset } = event.contentChanges.reduce(
+            (acc, change) => ({
+                changedRange: acc.changedRange.union(change.range),
+                changedText: acc.changedText + change.text,
+                lineOffset: acc.lineOffset + this._getLineOffset(change.range, change.text),
+            }),
+            {
+                changedRange: event.contentChanges[0].range,
+                changedText: '',
+                lineOffset: 0,
+            }
+        )
+
+        this._issues = this._issues.map((group) => {
+            if (group.filePath !== event.document.fileName) {
+                return group
+            }
+            return {
+                ...group,
+                issues: group.issues
+                    .filter((issue) => {
+                        const range = new vscode.Range(
+                            issue.startLine,
+                            0,
+                            issue.startLine === issue.endLine ? issue.endLine + 1 : issue.endLine,
+                            0
+                        )
+
+                        const intersection = changedRange.intersection(range)
+                        return !(intersection && (/\S/.test(changedText) || changedText === ''))
+                    })
+                    .map((issue) => {
+                        if (issue.startLine < changedRange.end.line) {
+                            return issue
+                        }
+                        return {
+                            ...issue,
+                            startLine: issue.startLine + lineOffset,
+                            endLine: issue.endLine + lineOffset,
+                            suggestedFixes: issue.suggestedFixes.map((fix) =>
+                                this._offsetSuggestedFix(fix, lineOffset)
+                            ),
+                        }
+                    }),
+            }
+        })
+    }
+
+    private _getLineOffset(range: vscode.Range, text: string) {
+        const originLines = range.end.line - range.start.line + 1
+        const changedLines = text.split('\n').length
+        return changedLines - originLines
+    }
+
+    private _offsetSuggestedFix(suggestedFix: SuggestedFix, lines: number): SuggestedFix {
+        return {
+            ...suggestedFix,
+            code: suggestedFix.code?.replace(
+                /^(@@ -)(\d+)(,\d+ \+)(\d+)(,\d+ @@)/,
+                function (_fullMatch, ...groups: string[]) {
+                    return (
+                        groups[0] +
+                        String(parseInt(groups[1]) + lines) +
+                        groups[2] +
+                        String(parseInt(groups[3]) + lines) +
+                        groups[4]
+                    )
+                }
+            ),
+            references:
+                suggestedFix.references?.map((ref) => ({
+                    ...ref,
+                    recommendationContentSpan: {
+                        ...ref.recommendationContentSpan,
+                        start: Number(ref.recommendationContentSpan?.start) + lines,
+                        end: Number(ref.recommendationContentSpan?.end) + lines,
+                    },
+                })) ?? [],
+        }
+    }
+
+    public removeIssue(uri: vscode.Uri, issue: CodeScanIssue) {
+        this._issues = this._issues.map((group) => {
+            if (group.filePath !== uri.fsPath) {
+                return group
+            }
+            return {
+                ...group,
+                issues: group.issues.filter((i) => i.findingId !== issue.findingId),
+            }
+        })
+    }
+
+    public updateIssue(issue: CodeScanIssue, filePath?: string) {
+        this._issues = this._issues.map((group) => {
+            if (filePath && group.filePath !== filePath) {
+                return group
+            }
+            return {
+                ...group,
+                issues: group.issues.map((i) => (i.findingId === issue.findingId ? issue : i)),
+            }
+        })
+    }
+
+    public mergeIssues(newIssues: AggregatedCodeScanIssue) {
+        const existingGroup = this._issues.find((group) => group.filePath === newIssues.filePath)
+        if (!existingGroup) {
+            this._issues.push(newIssues)
+            return
+        }
+
+        this._issues = this._issues.map((group) =>
+            group.filePath !== newIssues.filePath
+                ? group
+                : {
+                      ...group,
+                      issues: [
+                          ...group.issues,
+                          ...newIssues.issues.filter((issue) => !this.isExistingIssue(issue, newIssues.filePath)),
+                      ],
+                  }
+        )
+    }
+
+    public mergeIssuesDisplayFindings(newIssues: AggregatedCodeScanIssue, fromQCA: boolean) {
+        const existingGroup = this._issues.find((group) => group.filePath === newIssues.filePath)
+        if (!existingGroup) {
+            this._issues.push(newIssues)
+            return
+        }
+
+        this._issues = this._issues.map((group) =>
+            group.filePath !== newIssues.filePath
+                ? group
+                : {
+                      ...group,
+                      issues: [
+                          ...group.issues.filter(
+                              // if the incoming findings are from QCA review, then keep only existing findings from displayFindings
+                              // if the incoming findings are not from QCA review, then keep only the existing QCA findings
+                              (issue) => fromQCA === (issue.detectorName === displayFindingsDetectorName)
+                          ),
+                          ...newIssues.issues,
+                      ],
+                  }
+        )
+    }
+
+    private isExistingIssue(issue: CodeScanIssue, filePath: string) {
+        return this._issues
+            .find((group) => group.filePath === filePath)
+            ?.issues.find(
+                (i) => i.title === issue.title && i.startLine === issue.startLine && i.endLine === issue.endLine
+            )
+    }
+}
diff --git a/packages/core/src/codewhisperer/service/securityIssueTreeViewProvider.ts b/packages/core/src/codewhisperer/service/securityIssueTreeViewProvider.ts
new file mode 100644
index 00000000000..9990b50fd96
--- /dev/null
+++ b/packages/core/src/codewhisperer/service/securityIssueTreeViewProvider.ts
@@ -0,0 +1,217 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import path from 'path'
+import {
+    CodeIssueGroupingStrategy,
+    CodeIssueGroupingStrategyState,
+    CodeScanIssue,
+    SecurityTreeViewFilterState,
+    severities,
+    Severity,
+} from '../models/model'
+import globals from '../../shared/extensionGlobals'
+import { getLogger } from '../../shared/logger/logger'
+import { SecurityIssueProvider } from './securityIssueProvider'
+import { sasRuleId } from '../models/constants'
+
+export type SecurityViewTreeItem = FileItem | IssueItem | SeverityItem
+type CodeScanIssueWithFilePath = CodeScanIssue & { filePath: string }
+
+export class SecurityIssueTreeViewProvider implements vscode.TreeDataProvider<SecurityViewTreeItem> {
+    public static readonly viewType = 'aws.amazonq.SecurityIssuesTree'
+
+    private _onDidChangeTreeData: vscode.EventEmitter<
+        SecurityViewTreeItem | SecurityViewTreeItem[] | undefined | null | void
+    > = new vscode.EventEmitter<SecurityViewTreeItem | SecurityViewTreeItem[] | undefined | null | void>()
+    readonly onDidChangeTreeData: vscode.Event<
+        SecurityViewTreeItem | SecurityViewTreeItem[] | undefined | null | void
+    > = this._onDidChangeTreeData.event
+
+    static #instance: SecurityIssueTreeViewProvider
+    private issueProvider = SecurityIssueProvider.instance
+
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+
+    public getTreeItem(element: SecurityViewTreeItem): vscode.TreeItem | Thenable<vscode.TreeItem> {
+        return element
+    }
+
+    public getChildren(element?: SecurityViewTreeItem | undefined): vscode.ProviderResult<SecurityViewTreeItem[]> {
+        const groupingStrategy = CodeIssueGroupingStrategyState.instance.getState()
+        switch (groupingStrategy) {
+            case CodeIssueGroupingStrategy.FileLocation:
+                return this.getChildrenGroupedByFileLocation(element)
+            case CodeIssueGroupingStrategy.Severity:
+            default:
+                return this.getChildrenGroupedBySeverity(element)
+        }
+    }
+
+    private getChildrenGroupedBySeverity(element: SecurityViewTreeItem | undefined) {
+        const filterHiddenSeverities = (severity: Severity) =>
+            !SecurityTreeViewFilterState.instance.getHiddenSeverities().includes(severity)
+
+        if (element instanceof SeverityItem) {
+            return element.issues
+                .filter((issue) => issue.visible)
+                .sort((a, b) => a.filePath.localeCompare(b.filePath) || a.startLine - b.startLine)
+                .map((issue) => new IssueItem(issue.filePath, issue))
+        }
+        const result = severities.filter(filterHiddenSeverities).map(
+            (severity) =>
+                new SeverityItem(
+                    severity,
+                    this.issueProvider.issues.reduce(
+                        (accumulator, current) =>
+                            accumulator.concat(
+                                current.issues
+                                    .filter((issue) => issue.severity === severity)
+                                    .filter((issue) => issue.visible)
+                                    .map((issue) => ({ ...issue, filePath: current.filePath }))
+                            ),
+                        [] as CodeScanIssueWithFilePath[]
+                    )
+                )
+        )
+
+        this._onDidChangeTreeData.fire(result)
+        return result
+    }
+
+    private getChildrenGroupedByFileLocation(element: SecurityViewTreeItem | undefined) {
+        const filterHiddenSeverities = (issue: CodeScanIssue) =>
+            !SecurityTreeViewFilterState.instance.getHiddenSeverities().includes(issue.severity)
+
+        if (element instanceof FileItem) {
+            return element.issues
+                .filter(filterHiddenSeverities)
+                .filter((issue) => issue.visible)
+                .sort((a, b) => a.startLine - b.startLine)
+                .map((issue) => new IssueItem(element.filePath, issue))
+        }
+
+        const result = this.issueProvider.issues
+            .filter((group) => group.issues.some(filterHiddenSeverities))
+            .filter((group) => group.issues.some((issue) => issue.visible))
+            .sort((a, b) => a.filePath.localeCompare(b.filePath))
+            .map((group) => new FileItem(group.filePath, group.issues.filter(filterHiddenSeverities)))
+        this._onDidChangeTreeData.fire(result)
+        return result
+    }
+
+    public refresh(): void {
+        this._onDidChangeTreeData.fire()
+    }
+
+    public static focus() {
+        void vscode.commands.executeCommand('aws.amazonq.SecurityIssuesTree.focus').then(undefined, (e) => {
+            getLogger().error('SecurityIssuesTree focus failed: %s', e.message)
+        })
+    }
+}
+
+enum ContextValue {
+    FILE = 'file',
+    ISSUE_WITH_FIX = 'issueWithFix',
+    ISSUE_WITHOUT_FIX = 'issueWithoutFix',
+    ISSUE_WITH_FIX_DISABLED = 'issueWithFixDisabled',
+    SEVERITY = 'severity',
+}
+
+export class SeverityItem extends vscode.TreeItem {
+    constructor(
+        public readonly severity: string,
+        public readonly issues: CodeScanIssueWithFilePath[]
+    ) {
+        super(severity)
+        this.description = `${this.issues.length} ${this.issues.length === 1 ? 'issue' : 'issues'}`
+        this.iconPath = this.getSeverityIcon()
+        this.contextValue = ContextValue.SEVERITY
+        this.collapsibleState = this.getCollapsibleState()
+    }
+
+    private getSeverityIcon() {
+        return globals.context.asAbsolutePath(`resources/icons/aws/amazonq/severity-${this.severity.toLowerCase()}.svg`)
+    }
+
+    private getCollapsibleState() {
+        return this.severity === 'Critical' || this.severity === 'High'
+            ? vscode.TreeItemCollapsibleState.Expanded
+            : vscode.TreeItemCollapsibleState.Collapsed
+    }
+}
+
+export class FileItem extends vscode.TreeItem {
+    constructor(
+        public readonly filePath: string,
+        public readonly issues: CodeScanIssue[]
+    ) {
+        super(path.basename(filePath), vscode.TreeItemCollapsibleState.Expanded)
+        this.resourceUri = vscode.Uri.file(this.filePath)
+        this.description = vscode.workspace.asRelativePath(path.dirname(this.filePath))
+        this.iconPath = new vscode.ThemeIcon('file')
+        this.contextValue = ContextValue.FILE
+    }
+}
+
+export class IssueItem extends vscode.TreeItem {
+    constructor(
+        public readonly filePath: string,
+        public readonly issue: CodeScanIssue
+    ) {
+        super(issue.title, vscode.TreeItemCollapsibleState.None)
+        this.description = this.getDescription()
+        this.iconPath = this.getSeverityIcon()
+        this.tooltip = this.getTooltipMarkdown()
+        this.command = {
+            title: 'Focus Issue',
+            command: 'aws.amazonq.security.focusIssue',
+            arguments: [this.issue, this.filePath],
+        }
+        this.contextValue = this.getContextValue()
+    }
+
+    private getSeverityImage() {
+        return globals.context.asAbsolutePath(`resources/images/severity-${this.issue.severity.toLowerCase()}.svg`)
+    }
+
+    private getSeverityIcon() {
+        const iconPath = globals.context.asAbsolutePath(
+            `resources/icons/aws/amazonq/severity-${this.issue.severity.toLowerCase()}.svg`
+        )
+        const groupingStrategy = CodeIssueGroupingStrategyState.instance.getState()
+        return groupingStrategy !== CodeIssueGroupingStrategy.Severity ? iconPath : undefined
+    }
+
+    private getDescription() {
+        const positionStr = `[Ln ${this.issue.startLine + 1}]`
+        const groupingStrategy = CodeIssueGroupingStrategyState.instance.getState()
+        return groupingStrategy !== CodeIssueGroupingStrategy.FileLocation
+            ? `${path.basename(this.filePath)} ${positionStr}`
+            : positionStr
+    }
+
+    private getContextValue() {
+        return this.issue.ruleId === sasRuleId
+            ? ContextValue.ISSUE_WITH_FIX_DISABLED
+            : this.issue.suggestedFixes.length === 0 || !this.issue.suggestedFixes[0].code
+              ? ContextValue.ISSUE_WITHOUT_FIX
+              : ContextValue.ISSUE_WITH_FIX
+    }
+
+    private getTooltipMarkdown() {
+        const markdown = new vscode.MarkdownString()
+        markdown.isTrusted = true
+        markdown.supportHtml = true
+        markdown.supportThemeIcons = true
+        markdown.appendMarkdown(`## ${this.issue.title} ![${this.issue.severity}](${this.getSeverityImage()})\n`)
+        markdown.appendMarkdown(this.issue.recommendation.text)
+
+        return markdown
+    }
+}
diff --git a/packages/core/src/codewhisperer/service/securityScanHandler.ts b/packages/core/src/codewhisperer/service/securityScanHandler.ts
new file mode 100644
index 00000000000..14485642aed
--- /dev/null
+++ b/packages/core/src/codewhisperer/service/securityScanHandler.ts
@@ -0,0 +1,465 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { DefaultCodeWhispererClient } from '../client/codewhisperer'
+import { getLogger } from '../../shared/logger/logger'
+import * as vscode from 'vscode'
+import {
+    AggregatedCodeScanIssue,
+    CodeScanIssue,
+    CodeScansState,
+    codeScanState,
+    CodeScanStoppedError,
+    onDemandFileScanState,
+    RegionProfile,
+} from '../models/model'
+import { sleep } from '../../shared/utilities/timeoutUtils'
+import * as codewhispererClient from '../client/codewhisperer'
+import * as CodeWhispererConstants from '../models/constants'
+import { existsSync, statSync, readFileSync } from 'fs' // eslint-disable-line no-restricted-imports
+import { RawCodeScanIssue } from '../models/model'
+import * as crypto from 'crypto'
+import path = require('path')
+import { pageableToCollection } from '../../shared/utilities/collectionUtils'
+import { ArtifactMap, CreateUploadUrlRequest, CreateUploadUrlResponse } from '../client/codewhispereruserclient'
+import { TelemetryHelper } from '../util/telemetryHelper'
+import request, { RequestError } from '../../shared/request'
+import { ZipMetadata } from '../util/zipUtil'
+import { getNullLogger } from '../../shared/logger/logger'
+import {
+    CreateCodeScanError,
+    CreateUploadUrlError,
+    InvalidSourceZipError,
+    SecurityScanTimedOutError,
+    UploadArtifactToS3Error,
+} from '../models/errors'
+import { getTelemetryReasonDesc } from '../../shared/errors'
+import { CodeWhispererSettings } from '../util/codewhispererSettings'
+import { detectCommentAboveLine } from '../../shared/utilities/commentUtils'
+import { runtimeLanguageContext } from '../util/runtimeLanguageContext'
+import { FeatureUseCase } from '../models/constants'
+import { AmazonqCreateUpload, Span, telemetry } from '../../shared/telemetry/telemetry'
+import { AuthUtil } from '../util/authUtil'
+
+export async function listScanResults(
+    client: DefaultCodeWhispererClient,
+    jobId: string,
+    codeScanFindingsSchema: string,
+    projectPaths: string[],
+    scope: CodeWhispererConstants.CodeAnalysisScope,
+    editor: vscode.TextEditor | undefined,
+    profile?: RegionProfile
+) {
+    const logger = getLoggerForScope(scope)
+    const codeScanIssueMap: Map<string, RawCodeScanIssue[]> = new Map()
+    const aggregatedCodeScanIssueList: AggregatedCodeScanIssue[] = []
+    const requester = (request: codewhispererClient.ListCodeScanFindingsRequest) =>
+        client.listCodeScanFindings(request, profile?.arn)
+    const request: codewhispererClient.ListCodeScanFindingsRequest = {
+        jobId,
+        codeAnalysisFindingsSchema: codeScanFindingsSchema,
+        profileArn: profile?.arn,
+    }
+    const collection = pageableToCollection(requester, request, 'nextToken')
+    const issues = await collection
+        .flatten()
+        .map((resp) => {
+            logger.verbose(`ListCodeScanFindingsRequest requestId: ${resp.$response.requestId}`)
+            if ('codeScanFindings' in resp) {
+                return resp.codeScanFindings
+            }
+            return resp.codeAnalysisFindings
+        })
+        .promise()
+    for (const issue of issues) {
+        mapToAggregatedList(codeScanIssueMap, issue, editor, scope)
+    }
+    for (const [key, issues] of codeScanIssueMap.entries()) {
+        // Project path example: /Users/username/project
+        // Key example: project/src/main/java/com/example/App.java
+        const mappedProjectPaths: Set<string> = new Set()
+        for (const projectPath of projectPaths) {
+            // There could be multiple projectPaths with the same parent dir
+            // In that case, make sure to break out of this loop after a filePath is found
+            // or else it might result in duplicate findings.
+            const filePath = path.join(projectPath, '..', key)
+            if (existsSync(filePath) && statSync(filePath).isFile()) {
+                mappedProjectPaths.add(filePath)
+                const document = await vscode.workspace.openTextDocument(filePath)
+                const aggregatedCodeScanIssue: AggregatedCodeScanIssue = {
+                    filePath: filePath,
+                    issues: issues.map((issue) => mapRawToCodeScanIssue(issue, document, jobId, scope)),
+                }
+                aggregatedCodeScanIssueList.push(aggregatedCodeScanIssue)
+                break
+            }
+        }
+        const maybeAbsolutePath = `/${key}`
+        if (
+            !mappedProjectPaths.has(maybeAbsolutePath) &&
+            existsSync(maybeAbsolutePath) &&
+            statSync(maybeAbsolutePath).isFile()
+        ) {
+            const document = await vscode.workspace.openTextDocument(maybeAbsolutePath)
+            const aggregatedCodeScanIssue: AggregatedCodeScanIssue = {
+                filePath: maybeAbsolutePath,
+                issues: issues.map((issue) => mapRawToCodeScanIssue(issue, document, jobId, scope)),
+            }
+            aggregatedCodeScanIssueList.push(aggregatedCodeScanIssue)
+        }
+    }
+    return aggregatedCodeScanIssueList
+}
+
+function mapRawToCodeScanIssue(
+    issue: RawCodeScanIssue,
+    document: vscode.TextDocument,
+    jobId: string,
+    scope: CodeWhispererConstants.CodeAnalysisScope
+): CodeScanIssue {
+    const isIssueTitleIgnored = CodeWhispererSettings.instance.getIgnoredSecurityIssues().includes(issue.title)
+    const isSingleIssueIgnored = detectCommentAboveLine(
+        document,
+        issue.startLine - 1,
+        CodeWhispererConstants.amazonqIgnoreNextLine
+    )
+    const language = runtimeLanguageContext.getLanguageContext(
+        document.languageId,
+        path.extname(document.fileName)
+    ).language
+    return {
+        startLine: issue.startLine - 1 >= 0 ? issue.startLine - 1 : 0,
+        endLine: issue.endLine,
+        comment: `${issue.title.trim()}: ${issue.description.text.trim()}`,
+        title: issue.title,
+        description: issue.description,
+        detectorId: issue.detectorId,
+        detectorName: issue.detectorName,
+        findingId: issue.findingId,
+        ruleId: issue.ruleId,
+        relatedVulnerabilities: issue.relatedVulnerabilities,
+        severity: issue.severity,
+        recommendation: issue.remediation.recommendation,
+        suggestedFixes: issue.remediation.suggestedFixes,
+        visible: !isIssueTitleIgnored && !isSingleIssueIgnored,
+        scanJobId: jobId,
+        language,
+        autoDetected: scope === CodeWhispererConstants.CodeAnalysisScope.FILE_AUTO,
+    }
+}
+
+export function mapToAggregatedList(
+    codeScanIssueMap: Map<string, RawCodeScanIssue[]>,
+    json: string,
+    editor: vscode.TextEditor | undefined,
+    scope: CodeWhispererConstants.CodeAnalysisScope
+) {
+    const codeScanIssues: RawCodeScanIssue[] = JSON.parse(json)
+    const filteredIssues = codeScanIssues.filter((issue) => {
+        if (
+            (scope === CodeWhispererConstants.CodeAnalysisScope.FILE_AUTO ||
+                scope === CodeWhispererConstants.CodeAnalysisScope.FILE_ON_DEMAND) &&
+            editor
+        ) {
+            for (let lineNumber = issue.startLine; lineNumber <= issue.endLine; lineNumber++) {
+                const line = editor.document.lineAt(lineNumber - 1)?.text
+                const codeContent = issue.codeSnippet.find((codeIssue) => codeIssue.number === lineNumber)?.content
+                if (codeContent?.includes('***')) {
+                    // CodeSnippet contains redacted code so we can't do a direct comparison
+                    return line.length === codeContent.length
+                } else {
+                    return line === codeContent
+                }
+            }
+        }
+        return true
+    })
+
+    for (const issue of filteredIssues) {
+        const filePath = issue.filePath
+        if (codeScanIssueMap.has(filePath)) {
+            if (!isExistingIssue(issue, codeScanIssueMap)) {
+                codeScanIssueMap.get(filePath)?.push(issue)
+            } else {
+                getLogger().warn('Found duplicate issue %O, ignoring...', issue)
+            }
+        } else {
+            codeScanIssueMap.set(filePath, [issue])
+        }
+    }
+}
+
+function isDuplicateIssue(issueA: RawCodeScanIssue, issueB: RawCodeScanIssue) {
+    return (
+        issueA.filePath === issueB.filePath &&
+        issueA.title === issueB.title &&
+        issueA.startLine === issueB.startLine &&
+        issueA.endLine === issueB.endLine
+    )
+}
+
+function isExistingIssue(issue: RawCodeScanIssue, codeScanIssueMap: Map<string, RawCodeScanIssue[]>) {
+    return codeScanIssueMap.get(issue.filePath)?.some((existingIssue) => isDuplicateIssue(issue, existingIssue))
+}
+
+export async function pollScanJobStatus(
+    client: DefaultCodeWhispererClient,
+    jobId: string,
+    scope: CodeWhispererConstants.CodeAnalysisScope,
+    codeScanStartTime: number,
+    profile?: RegionProfile
+) {
+    const pollingStartTime = performance.now()
+    // We don't expect to get results immediately, so sleep for some time initially to not make unnecessary calls
+    await sleep(getPollingDelayMsForScope(scope))
+
+    const logger = getLoggerForScope(scope)
+    logger.verbose(`Polling scan job status...`)
+    let status: string = 'Pending'
+    while (true) {
+        throwIfCancelled(scope, codeScanStartTime)
+        const req: codewhispererClient.GetCodeScanRequest = {
+            jobId: jobId,
+            profileArn: profile?.arn,
+        }
+        const resp = await client.getCodeScan(req)
+        logger.verbose(`GetCodeScanRequest requestId: ${resp.$response.requestId}`)
+        if (resp.status !== 'Pending') {
+            status = resp.status
+            logger.verbose(`Scan job status: ${status}`)
+            logger.verbose(`Complete Polling scan job status.`)
+            break
+        }
+        throwIfCancelled(scope, codeScanStartTime)
+        await sleep(CodeWhispererConstants.codeScanJobPollingIntervalSeconds * 1000)
+        const elapsedTime = performance.now() - pollingStartTime
+        if (elapsedTime > getPollingTimeoutMsForScope(scope)) {
+            logger.verbose(`Scan job status: ${status}`)
+            logger.verbose(`Security Scan failed. Amazon Q timed out.`)
+            throw new SecurityScanTimedOutError()
+        }
+    }
+    return status
+}
+
+export async function createScanJob(
+    client: DefaultCodeWhispererClient,
+    artifactMap: codewhispererClient.ArtifactMap,
+    languageId: string,
+    scope: CodeWhispererConstants.CodeAnalysisScope,
+    scanName: string,
+    profile?: RegionProfile
+) {
+    const logger = getLoggerForScope(scope)
+    logger.verbose(`Creating scan job...`)
+    const codeAnalysisScope = scope === CodeWhispererConstants.CodeAnalysisScope.FILE_AUTO ? 'FILE' : 'PROJECT'
+    const req: codewhispererClient.CreateCodeScanRequest = {
+        artifacts: artifactMap,
+        programmingLanguage: {
+            languageName: languageId,
+        },
+        scope: codeAnalysisScope,
+        codeScanName: scanName,
+        profileArn: profile?.arn,
+    }
+    const resp = await client.createCodeScan(req).catch((err) => {
+        getLogger().error(`Failed creating scan job. Request id: ${err.requestId}`)
+        if (
+            err.message === CodeWhispererConstants.scansLimitReachedErrorMessage &&
+            err.code === 'ThrottlingException'
+        ) {
+            throw err
+        }
+        throw new CreateCodeScanError(err)
+    })
+    getLogger().info(
+        `Amazon Q Code Review requestId: ${resp.$response.requestId} and Amazon Q Code Review jobId: ${resp.jobId}`
+    )
+    TelemetryHelper.instance.sendCodeScanEvent(languageId, resp.$response.requestId)
+    return resp
+}
+
+export async function getPresignedUrlAndUpload(
+    client: DefaultCodeWhispererClient,
+    zipMetadata: ZipMetadata,
+    scope: CodeWhispererConstants.CodeAnalysisScope,
+    scanName: string,
+    profile?: RegionProfile
+) {
+    const artifactMap = await telemetry.amazonq_createUpload.run(async (span) => {
+        const logger = getLoggerForScope(scope)
+        if (zipMetadata.zipFilePath === '') {
+            getLogger().error('Failed to create valid source zip')
+            throw new InvalidSourceZipError()
+        }
+        const uploadIntent = getUploadIntent(scope)
+        span.record({
+            amazonqUploadIntent: uploadIntent,
+            amazonqRepositorySize: zipMetadata.srcPayloadSizeInBytes,
+            credentialStartUrl: AuthUtil.instance.startUrl,
+        })
+        const srcReq: CreateUploadUrlRequest = {
+            contentMd5: getMd5(zipMetadata.zipFilePath),
+            artifactType: 'SourceCode',
+            uploadIntent: uploadIntent,
+            uploadContext: {
+                codeAnalysisUploadContext: {
+                    codeScanName: scanName,
+                },
+            },
+            profileArn: profile?.arn,
+        }
+        logger.verbose(`Prepare for uploading src context...`)
+        const srcResp = await client.createUploadUrl(srcReq).catch((err) => {
+            getLogger().error(`Failed getting presigned url for uploading src context. Request id: ${err.requestId}`)
+            span.record({ requestId: err.requestId })
+            throw new CreateUploadUrlError(err.message)
+        })
+        logger.verbose(`CreateUploadUrlRequest request id: ${srcResp.$response.requestId}`)
+        logger.verbose(`Complete Getting presigned Url for uploading src context.`)
+        logger.verbose(`Uploading src context...`)
+        await uploadArtifactToS3(zipMetadata.zipFilePath, srcResp, FeatureUseCase.CODE_SCAN, scope, span)
+        logger.verbose(`Complete uploading src context.`)
+        const artifactMap: ArtifactMap = {
+            SourceCode: srcResp.uploadId,
+        }
+        return artifactMap
+    })
+    return artifactMap
+}
+
+function getUploadIntent(scope: CodeWhispererConstants.CodeAnalysisScope) {
+    if (
+        scope === CodeWhispererConstants.CodeAnalysisScope.PROJECT ||
+        scope === CodeWhispererConstants.CodeAnalysisScope.FILE_ON_DEMAND
+    ) {
+        return CodeWhispererConstants.projectScanUploadIntent
+    } else {
+        return CodeWhispererConstants.fileScanUploadIntent
+    }
+}
+
+export function getMd5(fileName: string) {
+    const hasher = crypto.createHash('md5')
+    hasher.update(readFileSync(fileName))
+    return hasher.digest('base64')
+}
+
+export function throwIfCancelled(scope: CodeWhispererConstants.CodeAnalysisScope, codeScanStartTime: number) {
+    switch (scope) {
+        case CodeWhispererConstants.CodeAnalysisScope.PROJECT:
+            if (codeScanState.isCancelling()) {
+                throw new CodeScanStoppedError()
+            }
+            break
+        case CodeWhispererConstants.CodeAnalysisScope.FILE_ON_DEMAND:
+            if (onDemandFileScanState.isCancelling()) {
+                throw new CodeScanStoppedError()
+            }
+            break
+        case CodeWhispererConstants.CodeAnalysisScope.FILE_AUTO: {
+            const latestCodeScanStartTime = CodeScansState.instance.getLatestScanTime()
+            if (
+                !CodeScansState.instance.isScansEnabled() ||
+                (latestCodeScanStartTime && latestCodeScanStartTime > codeScanStartTime)
+            ) {
+                throw new CodeScanStoppedError()
+            }
+            break
+        }
+        default:
+            getLogger().warn(`Unknown code analysis scope: ${scope}`)
+            break
+    }
+}
+// TODO: Refactor this
+export async function uploadArtifactToS3(
+    fileName: string,
+    resp: CreateUploadUrlResponse,
+    featureUseCase: FeatureUseCase,
+    scope?: CodeWhispererConstants.CodeAnalysisScope,
+    span?: Span<AmazonqCreateUpload>
+) {
+    const logger = getLoggerForScope(scope)
+    const encryptionContext = `{"uploadId":"${resp.uploadId}"}`
+    const headersObj: Record<string, string> = {
+        'Content-MD5': getMd5(fileName),
+        'x-amz-server-side-encryption': 'aws:kms',
+        'Content-Type': 'application/zip',
+        'x-amz-server-side-encryption-context': Buffer.from(encryptionContext, 'utf8').toString('base64'),
+    }
+
+    if (resp.kmsKeyArn !== '' && resp.kmsKeyArn !== undefined) {
+        headersObj['x-amz-server-side-encryption-aws-kms-key-id'] = resp.kmsKeyArn
+    }
+
+    let requestId: string | undefined = undefined
+    let id2: string | undefined = undefined
+    let responseCode: string = ''
+
+    try {
+        const response = await request.fetch('PUT', resp.uploadUrl, {
+            body: readFileSync(fileName),
+            headers: resp?.requestHeaders ?? headersObj,
+        }).response
+        logger.debug(`StatusCode: ${response.status}, Text: ${response.statusText}`)
+        requestId = response.headers?.get('x-amz-request-id') ?? undefined
+        id2 = response.headers?.get('x-amz-id-2') ?? undefined
+        responseCode = response.status.toString()
+    } catch (error) {
+        if (span && error instanceof RequestError) {
+            requestId = error.response.headers.get('x-amz-request-id') ?? undefined
+            id2 = error.response.headers.get('x-amz-id-2') ?? undefined
+            responseCode = error.code.toString()
+        }
+        let errorMessage = ''
+        const isCodeScan = featureUseCase === FeatureUseCase.CODE_SCAN
+        const featureType = isCodeScan ? 'security scans' : 'unit test generation'
+        const defaultMessage = isCodeScan ? 'Security scan failed.' : 'Test generation failed.'
+        getLogger().error(
+            `Amazon Q is unable to upload workspace artifacts to Amazon S3 for ${featureType}. ` +
+                'For more information, see the Amazon Q documentation or contact your network or organization administrator.'
+        )
+        const errorDesc = getTelemetryReasonDesc(error)
+        if (errorDesc?.includes('"PUT" request failed with code "403"')) {
+            errorMessage = '"PUT" request failed with code "403"'
+        } else if (errorDesc?.includes('"PUT" request failed with code "503"')) {
+            errorMessage = '"PUT" request failed with code "503"'
+        } else {
+            errorMessage = errorDesc ?? defaultMessage
+        }
+        throw new UploadArtifactToS3Error(errorMessage)
+    } finally {
+        getLogger().debug(`Upload to S3 response details: x-amz-request-id: ${requestId}, x-amz-id-2: ${id2}`)
+        if (span) {
+            span.record({
+                requestId: requestId,
+                requestId2: id2,
+                requestServiceType: 's3',
+                httpStatusCode: responseCode,
+            })
+        }
+    }
+}
+
+// TODO: Refactor this
+export function getLoggerForScope(scope?: CodeWhispererConstants.CodeAnalysisScope) {
+    return scope === CodeWhispererConstants.CodeAnalysisScope.FILE_AUTO ? getNullLogger() : getLogger()
+}
+
+function getPollingDelayMsForScope(scope: CodeWhispererConstants.CodeAnalysisScope) {
+    return (
+        (scope === CodeWhispererConstants.CodeAnalysisScope.FILE_AUTO ||
+        scope === CodeWhispererConstants.CodeAnalysisScope.FILE_ON_DEMAND
+            ? CodeWhispererConstants.fileScanPollingDelaySeconds
+            : CodeWhispererConstants.projectScanPollingDelaySeconds) * 1000
+    )
+}
+
+function getPollingTimeoutMsForScope(scope: CodeWhispererConstants.CodeAnalysisScope) {
+    return scope === CodeWhispererConstants.CodeAnalysisScope.FILE_AUTO
+        ? CodeWhispererConstants.expressScanTimeoutMs
+        : CodeWhispererConstants.standardScanTimeoutMs
+}
diff --git a/packages/core/src/codewhisperer/service/serviceContainer.ts b/packages/core/src/codewhisperer/service/serviceContainer.ts
new file mode 100644
index 00000000000..7215a73c616
--- /dev/null
+++ b/packages/core/src/codewhisperer/service/serviceContainer.ts
@@ -0,0 +1,44 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { AuthUtil } from '../util/authUtil'
+import { LineAnnotationController } from '../views/lineAnnotationController'
+import { ActiveStateController } from '../views/activeStateController'
+import { LineTracker } from '../tracker/lineTracker'
+
+/**
+ * Container for CodeWhisperer sub-components
+ * Please utilize this container class as the bridge to access other components to avoid create singleton objects when it's not necessary.
+ * Example:
+ * class SubComponent {
+ *      constructor(private readonly container: Container) {}
+ *
+ *      public doSomething() {
+ *          const isConnected = this.container.authProvider.isConnected()
+ *          this.anotherComponent.update(isConnected)
+ *      }
+ * }
+ */
+export class Container {
+    static #instance: Container | undefined
+
+    static get instance(): Container {
+        return (Container.#instance ??= new Container(AuthUtil.instance))
+    }
+
+    readonly lineTracker: LineTracker
+    readonly lineAnnotationController: LineAnnotationController
+    readonly activeStateController: ActiveStateController
+
+    protected constructor(readonly auth: AuthUtil) {
+        this.lineTracker = new LineTracker()
+        this.lineAnnotationController = new LineAnnotationController(this)
+        this.activeStateController = new ActiveStateController(this)
+    }
+
+    ready() {
+        this.lineTracker.ready()
+    }
+}
diff --git a/packages/core/src/codewhisperer/service/statusBar.ts b/packages/core/src/codewhisperer/service/statusBar.ts
new file mode 100644
index 00000000000..6aacfec73b7
--- /dev/null
+++ b/packages/core/src/codewhisperer/service/statusBar.ts
@@ -0,0 +1,147 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { CodeSuggestionsState } from '../models/model'
+import { AuthUtil } from '../util/authUtil'
+import { getSelectedCustomization } from '../util/customizationUtil'
+import { codicon, getIcon } from '../../shared/icons'
+import { Commands } from '../../shared/vscode/commands2'
+import { listCodeWhispererCommandsId } from '../ui/statusBarMenu'
+
+export class CodeWhispererStatusBarManager {
+    private statusBar: CodeWhispererStatusBar
+
+    constructor(statusBar: CodeWhispererStatusBar = CodeWhispererStatusBar.instance) {
+        this.statusBar = statusBar
+
+        CodeSuggestionsState.instance.onDidChangeState(() => {
+            return this.refreshStatusBar()
+        })
+    }
+
+    static #instance: CodeWhispererStatusBarManager
+
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+
+    /** Updates the status bar to represent the latest CW state */
+    refreshStatusBar() {
+        if (AuthUtil.instance.isConnectionValid()) {
+            if (AuthUtil.instance.requireProfileSelection()) {
+                return this.setState('needsProfile')
+            }
+            return this.setState('ok')
+        } else if (AuthUtil.instance.isConnectionExpired()) {
+            return this.setState('expired')
+        } else {
+            return this.setState('notConnected')
+        }
+    }
+
+    /**
+     * Sets the status bar in to a "loading state", effectively showing
+     * the spinning circle.
+     *
+     * When loading is done, call {@link refreshStatusBar} to update the
+     * status bar to the latest state.
+     */
+    async setLoading(): Promise<void> {
+        await this.setState('loading')
+    }
+
+    private async setState(state: keyof typeof states) {
+        switch (state) {
+            case 'loading': {
+                await this.statusBar.setState('loading')
+                break
+            }
+            case 'ok': {
+                await this.statusBar.setState('ok', CodeSuggestionsState.instance.isSuggestionsEnabled())
+                break
+            }
+            case 'expired': {
+                await this.statusBar.setState('expired')
+                break
+            }
+            case 'notConnected': {
+                await this.statusBar.setState('notConnected')
+                break
+            }
+            case 'needsProfile': {
+                await this.statusBar.setState('needsProfile')
+                break
+            }
+        }
+    }
+}
+
+/** The states that the completion service can be in */
+const states = {
+    loading: 'loading',
+    ok: 'ok',
+    expired: 'expired',
+    notConnected: 'notConnected',
+    needsProfile: 'needsProfile',
+} as const
+
+class CodeWhispererStatusBar {
+    protected statusBar: vscode.StatusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 1)
+
+    static #instance: CodeWhispererStatusBar
+    static get instance() {
+        return (this.#instance ??= new this())
+    }
+
+    protected constructor() {}
+
+    async setState(state: keyof Omit<typeof states, 'ok'>): Promise<void>
+    async setState(status: keyof Pick<typeof states, 'ok'>, isSuggestionsEnabled: boolean): Promise<void>
+    async setState(status: keyof typeof states, isSuggestionsEnabled?: boolean): Promise<void> {
+        const statusBar = this.statusBar
+        statusBar.command = listCodeWhispererCommandsId
+        statusBar.backgroundColor = undefined
+
+        const title = 'Amazon Q'
+        switch (status) {
+            case 'loading': {
+                const selectedCustomization = getSelectedCustomization()
+                statusBar.text = codicon` ${getIcon('vscode-loading~spin')} ${title}${
+                    selectedCustomization.arn === '' ? '' : ` | ${selectedCustomization.name}`
+                }`
+                break
+            }
+            case 'ok': {
+                const selectedCustomization = getSelectedCustomization()
+                const icon = isSuggestionsEnabled ? getIcon('vscode-debug-start') : getIcon('vscode-debug-pause')
+                statusBar.text = codicon`${icon} ${title}${
+                    selectedCustomization.arn === '' ? '' : ` | ${selectedCustomization.name}`
+                }`
+                break
+            }
+
+            case 'expired': {
+                statusBar.text = codicon` ${getIcon('vscode-debug-disconnect')} ${title}`
+                statusBar.backgroundColor = new vscode.ThemeColor('statusBarItem.warningBackground')
+                break
+            }
+            case 'needsProfile':
+            case 'notConnected':
+                statusBar.text = codicon` ${getIcon('vscode-chrome-close')} ${title}`
+                statusBar.backgroundColor = new vscode.ThemeColor('statusBarItem.errorBackground')
+                break
+        }
+
+        statusBar.show()
+    }
+}
+
+/** In this module due to circular dependency issues */
+export const refreshStatusBar = Commands.declare(
+    { id: 'aws.amazonq.refreshStatusBar', logging: false },
+    () => async () => {
+        await CodeWhispererStatusBarManager.instance.refreshStatusBar()
+    }
+)
diff --git a/packages/core/src/codewhisperer/service/transformByQ/humanInTheLoopManager.ts b/packages/core/src/codewhisperer/service/transformByQ/humanInTheLoopManager.ts
new file mode 100644
index 00000000000..1646864e066
--- /dev/null
+++ b/packages/core/src/codewhisperer/service/transformByQ/humanInTheLoopManager.ts
@@ -0,0 +1,128 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import * as os from 'os'
+import path from 'path'
+import { FolderInfo, transformByQState } from '../../models/model'
+import fs from '../../../shared/fs/fs'
+import { createPomCopy, replacePomVersion } from './transformFileHandler'
+import { getLogger } from '../../../shared/logger/logger'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { CodeTransformTelemetryState } from '../../../amazonqGumby/telemetry/codeTransformTelemetryState'
+import { MetadataResult } from '../../../shared/telemetry/telemetryClient'
+
+export interface IManifestFile {
+    pomArtifactId: string
+    pomFolderName: string
+    hilCapability: string
+    pomGroupId: string
+    sourcePomVersion: string
+}
+
+/**
+ * @description This class helps encapsulate the "human in the loop" behavior of Amazon Q transform. Users
+ * will be prompted for input during the transformation process. Amazon Q will make some temporary folders
+ * and take action on behalf of the user. To make sure those actions are executed and cleanup up properly,
+ * we have encapsulated in this class.
+ */
+export class HumanInTheLoopManager {
+    public readonly diagnosticCollection = vscode.languages.createDiagnosticCollection('hilPomFileDiagnostics')
+
+    private readonly osTmpDir = os.tmpdir()
+    private readonly localPathToXmlDependencyList = '/target/dependency-updates-aggregate-report.xml'
+    private readonly pomReplacementDelimiter = '*****'
+    private readonly tmpDownloadsFolderName = 'q-hil-dependency-artifacts'
+    private readonly tmpDependencyListFolderName = 'q-pom-dependency-list'
+    private readonly userDependencyUpdateFolderName = 'q-pom-dependency-update'
+    private readonly tmpDependencyListDir = path.join(this.osTmpDir, this.tmpDependencyListFolderName)
+    private readonly userDependencyUpdateDir = path.join(this.osTmpDir, this.userDependencyUpdateFolderName)
+    private readonly tmpDownloadsDir = path.join(this.osTmpDir, this.tmpDownloadsFolderName)
+
+    private tmpSessionFiles: string[] = []
+    private pomFileVirtualFileReference!: vscode.Uri
+    private manifestFileValues!: IManifestFile
+    private newPomFileVirtualFileReference!: vscode.Uri
+
+    public getTmpDependencyListDir = () => this.tmpDependencyListDir
+    public getUserDependencyUpdateDir = () => this.userDependencyUpdateDir
+    public getTmpDownloadsDir = () => this.tmpDownloadsDir
+    public getPomFileVirtualFileReference = () => this.pomFileVirtualFileReference
+    public getManifestFileValues = () => this.manifestFileValues
+    public getNewPomFileVirtualFileReference = () => this.newPomFileVirtualFileReference
+
+    public setPomFileVirtualFileReference = (file: vscode.Uri) => (this.pomFileVirtualFileReference = file)
+    public setManifestFileValues = (manifestFileValues: IManifestFile) => (this.manifestFileValues = manifestFileValues)
+    public setNewPomFileVirtualFileReference = (file: vscode.Uri) => (this.newPomFileVirtualFileReference = file)
+
+    public getUploadFolderInfo = (): FolderInfo => {
+        return {
+            name: this.userDependencyUpdateFolderName,
+            path: this.userDependencyUpdateDir,
+        }
+    }
+
+    public getCompileDependencyListFolderInfo = (): FolderInfo => {
+        return {
+            name: this.tmpDependencyListFolderName,
+            path: this.tmpDependencyListDir,
+        }
+    }
+
+    public getDependencyListXmlOutput = async () =>
+        await fs.readFileText(path.join(this.tmpDependencyListDir, this.localPathToXmlDependencyList))
+
+    public createPomFileCopy = async (outputDirectoryPath: string, pomFileVirtualFileReference: vscode.Uri) => {
+        const newPomCopyRef = await createPomCopy(outputDirectoryPath, pomFileVirtualFileReference, 'pom.xml')
+        this.tmpSessionFiles.push(newPomCopyRef.fsPath)
+        return newPomCopyRef
+    }
+
+    public replacePomFileVersion = async (pomFileVirtualFileReference: vscode.Uri, version: string) =>
+        await replacePomVersion(pomFileVirtualFileReference, version, this.pomReplacementDelimiter)
+
+    public cleanUpArtifacts = async () => {
+        try {
+            await fs.delete(this.userDependencyUpdateDir, { recursive: true })
+        } catch (e: any) {
+            this.logArtifactError(e)
+        }
+        try {
+            await fs.delete(this.tmpDependencyListDir, { recursive: true })
+        } catch (e: any) {
+            this.logArtifactError(e)
+        }
+        try {
+            await fs.delete(this.tmpDownloadsDir, { recursive: true })
+        } catch (e: any) {
+            this.logArtifactError(e)
+        }
+        for (let i = 0; i < this.tmpSessionFiles.length; i++) {
+            try {
+                await fs.delete(this.tmpSessionFiles[i], { recursive: true })
+            } catch (e: any) {
+                this.logArtifactError(e)
+            }
+        }
+        this.tmpSessionFiles = []
+    }
+
+    private logArtifactError(e: any) {
+        const errorMessage = 'Error cleaning up artifacts'
+        const artifactCleanUpErrorMessage = (e: any) => `CodeTransformation: ${errorMessage} = ${e?.message}`
+        getLogger().error(artifactCleanUpErrorMessage(e))
+        telemetry.codeTransform_logGeneralError.emit({
+            codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+            codeTransformJobId: transformByQState.getJobId(),
+            result: MetadataResult.Fail,
+            reason: errorMessage,
+        })
+    }
+
+    static #instance: HumanInTheLoopManager | undefined
+
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+}
diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts b/packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts
new file mode 100644
index 00000000000..c2934dc24ba
--- /dev/null
+++ b/packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts
@@ -0,0 +1,1041 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import * as nodefs from 'fs' // eslint-disable-line no-restricted-imports
+import * as path from 'path'
+import * as os from 'os'
+import * as codeWhisperer from '../../client/codewhisperer'
+import * as crypto from 'crypto'
+import * as CodeWhispererConstants from '../../models/constants'
+import {
+    FolderInfo,
+    HilZipManifest,
+    IHilZipManifestParams,
+    jobPlanProgress,
+    RegionProfile,
+    sessionJobHistory,
+    StepProgress,
+    TransformationType,
+    transformByQState,
+    TransformByQStatus,
+    TransformByQStoppedError,
+    ZipManifest,
+} from '../../models/model'
+import { getLogger } from '../../../shared/logger/logger'
+import {
+    CreateUploadUrlResponse,
+    ProgressUpdates,
+    TransformationProgressUpdate,
+    TransformationSteps,
+    TransformationUserActionStatus,
+    UploadContext,
+} from '../../client/codewhispereruserclient'
+import { sleep } from '../../../shared/utilities/timeoutUtils'
+import AdmZip from 'adm-zip'
+import globals from '../../../shared/extensionGlobals'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { CodeTransformTelemetryState } from '../../../amazonqGumby/telemetry/codeTransformTelemetryState'
+import { calculateTotalLatency } from '../../../amazonqGumby/telemetry/codeTransformTelemetry'
+import { MetadataResult } from '../../../shared/telemetry/telemetryClient'
+import request from '../../../shared/request'
+import { JobStoppedError } from '../../../amazonqGumby/errors'
+import { createLocalBuildUploadZip, extractOriginalProjectSources, writeAndShowBuildLogs } from './transformFileHandler'
+import { createCodeWhispererChatStreamingClient } from '../../../shared/clients/codewhispererChatClient'
+import { downloadExportResultArchive } from '../../../shared/utilities/download'
+import { ExportContext, ExportIntent, TransformationDownloadArtifactType } from '@amzn/codewhisperer-streaming'
+import fs from '../../../shared/fs/fs'
+import { encodeHTML } from '../../../shared/utilities/textUtilities'
+import { convertToTimeString } from '../../../shared/datetime'
+import { getAuthType } from '../../../auth/utils'
+import { UserWrittenCodeTracker } from '../../tracker/userWrittenCodeTracker'
+import { setContext } from '../../../shared/vscode/setContext'
+import { AuthUtil } from '../../util/authUtil'
+import { DiffModel } from './transformationResultsViewProvider'
+import { spawnSync } from 'child_process' // eslint-disable-line no-restricted-imports
+
+export function getSha256(buffer: Buffer) {
+    const hasher = crypto.createHash('sha256')
+    hasher.update(buffer)
+    return hasher.digest('base64')
+}
+
+export function throwIfCancelled() {
+    if (transformByQState.isCancelled()) {
+        throw new TransformByQStoppedError()
+    }
+}
+
+export function updateJobHistory() {
+    if (transformByQState.getJobId() !== '' && transformByQState.getSourceJDKVersion() !== undefined) {
+        sessionJobHistory[transformByQState.getJobId()] = {
+            startTime: transformByQState.getStartTime(),
+            projectName: transformByQState.getProjectName(),
+            status: transformByQState.getPolledJobStatus(),
+            duration: convertToTimeString(calculateTotalLatency(CodeTransformTelemetryState.instance.getStartTime())),
+            transformationType: transformByQState.getTransformationType() ?? 'N/A',
+            sourceJDKVersion:
+                transformByQState.getTransformationType() === TransformationType.LANGUAGE_UPGRADE
+                    ? (transformByQState.getSourceJDKVersion() ?? 'N/A')
+                    : 'N/A',
+            targetJDKVersion:
+                transformByQState.getTransformationType() === TransformationType.LANGUAGE_UPGRADE
+                    ? (transformByQState.getTargetJDKVersion() ?? 'N/A')
+                    : 'N/A',
+            customDependencyVersionsFilePath:
+                transformByQState.getTransformationType() === TransformationType.LANGUAGE_UPGRADE
+                    ? transformByQState.getCustomDependencyVersionFilePath() || 'N/A'
+                    : 'N/A',
+            customBuildCommand:
+                transformByQState.getTransformationType() === TransformationType.LANGUAGE_UPGRADE
+                    ? transformByQState.getCustomBuildCommand() || 'N/A'
+                    : 'N/A',
+        }
+    }
+    return sessionJobHistory
+}
+
+export function getHeadersObj(sha256: string, kmsKeyArn: string | undefined) {
+    let headersObj = {}
+    if (kmsKeyArn === undefined || kmsKeyArn.length === 0) {
+        headersObj = {
+            'x-amz-checksum-sha256': sha256,
+            'Content-Type': 'application/zip',
+        }
+    } else {
+        headersObj = {
+            'x-amz-checksum-sha256': sha256,
+            'Content-Type': 'application/zip',
+            'x-amz-server-side-encryption': 'aws:kms',
+            'x-amz-server-side-encryption-aws-kms-key-id': kmsKeyArn,
+        }
+    }
+    return headersObj
+}
+
+// Consider enhancing the S3 client to include this functionality
+export async function uploadArtifactToS3(
+    fileName: string,
+    resp: CreateUploadUrlResponse,
+    sha256: string,
+    buffer: Buffer
+) {
+    throwIfCancelled()
+    try {
+        const uploadFileByteSize = (await nodefs.promises.stat(fileName)).size
+        getLogger().info(
+            `CodeTransformation: Uploading project artifact at %s with checksum %s using uploadId: %s and size %s kB`,
+            fileName,
+            sha256,
+            resp.uploadId,
+            Math.round(uploadFileByteSize / 1000)
+        )
+
+        let response = undefined
+        /* The existing S3 client has built-in retries but it requires the bucket name, so until
+         * CreateUploadUrl can be modified to return the S3 bucket name, manually implement retries.
+         * Alternatively, when waitUntil supports a fixed number of retries and retriableCodes, use that.
+         */
+        const retriableCodes = [408, 429, 500, 502, 503, 504]
+        for (let i = 0; i < 4; i++) {
+            try {
+                response = await request.fetch('PUT', resp.uploadUrl, {
+                    body: buffer,
+                    headers: getHeadersObj(sha256, resp.kmsKeyArn),
+                }).response
+                getLogger().info(`CodeTransformation: upload to S3 status on attempt ${i + 1}/4 = ${response.status}`)
+                if (response.status === 200) {
+                    break
+                }
+                throw new Error(
+                    `Upload failed, status = ${response.status}; full response: ${JSON.stringify(response)}`
+                )
+            } catch (e: any) {
+                if (response && !retriableCodes.includes(response.status)) {
+                    throw new Error(`Upload failed with status code = ${response.status}; did not automatically retry`)
+                }
+                if (i !== 3) {
+                    await sleep(1000 * Math.pow(2, i))
+                }
+            }
+        }
+        if (!response || response.status !== 200) {
+            const uploadFailedError = `Upload failed after up to 4 attempts with status code = ${response?.status ?? 'unavailable'}`
+            getLogger().error(`CodeTransformation: ${uploadFailedError}`)
+            throw new Error(uploadFailedError)
+        }
+        getLogger().info('CodeTransformation: Upload to S3 succeeded')
+    } catch (e: any) {
+        let errorMessage = `The upload failed due to: ${(e as Error).message}. For more information, see the [Amazon Q documentation](${CodeWhispererConstants.codeTransformTroubleshootUploadError})`
+        if (errorMessage.includes('Request has expired')) {
+            errorMessage = CodeWhispererConstants.errorUploadingWithExpiredUrl
+        } else if (errorMessage.includes('Failed to establish a socket connection')) {
+            errorMessage = CodeWhispererConstants.socketConnectionFailed
+        } else if (errorMessage.includes('self signed certificate in certificate chain')) {
+            errorMessage = CodeWhispererConstants.selfSignedCertificateError
+        }
+        getLogger().error(`CodeTransformation: UploadZip error = ${e}`)
+        throw new Error(errorMessage)
+    }
+}
+
+export async function resumeTransformationJob(jobId: string, userActionStatus: TransformationUserActionStatus) {
+    try {
+        const response = await codeWhisperer.codeWhispererClient.codeModernizerResumeTransformation({
+            transformationJobId: jobId,
+            userActionStatus, // can be "COMPLETED" or "REJECTED"
+        })
+        getLogger().info(
+            `CodeTransformation: resumeTransformation API status code = ${response.$response.httpResponse.statusCode}`
+        )
+        return response.transformationStatus
+    } catch (e: any) {
+        const errorMessage = `Resuming the job failed due to: ${(e as Error).message}`
+        getLogger().error(`CodeTransformation: ResumeTransformation error = %O`, e)
+        throw new Error(errorMessage)
+    }
+}
+
+export async function stopJob(jobId: string) {
+    if (!jobId) {
+        return
+    }
+
+    getLogger().info(`CodeTransformation: Stopping transformation job with ID: ${jobId}`)
+
+    try {
+        await codeWhisperer.codeWhispererClient.codeModernizerStopCodeTransformation({
+            transformationJobId: jobId,
+        })
+    } catch (e: any) {
+        getLogger().error(`CodeTransformation: StopTransformation error = %O`, e)
+        throw new Error('Stop job failed')
+    }
+}
+
+export async function uploadPayload(
+    payloadFileName: string,
+    profile: RegionProfile | undefined,
+    uploadContext?: UploadContext
+) {
+    const buffer = Buffer.from(await fs.readFileBytes(payloadFileName))
+    const sha256 = getSha256(buffer)
+
+    throwIfCancelled()
+    let response = undefined
+    try {
+        response = await codeWhisperer.codeWhispererClient.createUploadUrl({
+            contentChecksum: sha256,
+            contentChecksumType: CodeWhispererConstants.contentChecksumType,
+            uploadIntent: CodeWhispererConstants.uploadIntent,
+            uploadContext,
+            profileArn: profile?.arn,
+        })
+    } catch (e: any) {
+        const errorMessage = `Creating the upload URL failed due to: ${(e as Error).message}`
+        getLogger().error(`CodeTransformation: CreateUploadUrl error: = %O`, e)
+        throw new Error(errorMessage)
+    }
+
+    getLogger().info('CodeTransformation: created upload URL successfully')
+
+    try {
+        await uploadArtifactToS3(payloadFileName, response, sha256, buffer)
+    } catch (e: any) {
+        const errorMessage = (e as Error).message
+        getLogger().error(`CodeTransformation: UploadArtifactToS3 error: = ${errorMessage}`)
+        throw new Error(errorMessage)
+    }
+
+    // UploadContext only exists for subsequent uploads, and they will return a uploadId that is NOT
+    // the jobId. Only the initial call will uploadId be the jobId
+    if (!uploadContext) {
+        transformByQState.setJobId(encodeHTML(response.uploadId))
+    }
+    jobPlanProgress['uploadCode'] = StepProgress.Succeeded
+    if (transformByQState.getTransformationType() === TransformationType.SQL_CONVERSION) {
+        // if doing a SQL conversion, we don't build the code or generate a plan, so mark these steps as succeeded immediately so that next step renders
+        jobPlanProgress['buildCode'] = StepProgress.Succeeded
+        jobPlanProgress['generatePlan'] = StepProgress.Succeeded
+    }
+    updateJobHistory()
+    return response.uploadId
+}
+
+/**
+ * Array of file extensions used by Maven as metadata in the local repository.
+ * Files with these extensions influence Maven's behavior during compile time,
+ * particularly in checking the availability of source repositories and potentially
+ * re-downloading dependencies if the source is not accessible. Removing these
+ * files can prevent Maven from attempting to download dependencies again.
+ */
+const mavenExcludedExtensions = ['.repositories', '.sha1']
+
+// exclude .DS_Store (not relevant) and Maven executables (can cause permissions issues when building if user has not ran 'chmod')
+const sourceExcludedExtensions = ['.DS_Store', 'mvnw', 'mvnw.cmd']
+
+/**
+ * Determines if the specified file path corresponds to a Maven metadata file
+ * by checking against known metadata file extensions. This is used to identify
+ * files that might trigger Maven to recheck or redownload dependencies from source repositories.
+ *
+ * @param path The file path to evaluate for exclusion based on its extension.
+ * @returns {boolean} Returns true if the path ends with an extension associated with Maven metadata files; otherwise, false.
+ */
+function isExcludedDependencyFile(path: string): boolean {
+    return mavenExcludedExtensions.some((extension) => path.endsWith(extension))
+}
+
+// do not zip the .DS_Store file as it may appear in the diff.patch
+function isExcludedSourceFile(path: string): boolean {
+    return sourceExcludedExtensions.some((extension) => path.endsWith(extension))
+}
+
+// zip all dependency files and all source files
+// excludes "target" (contains large JARs) plus ".git", ".idea", and ".github" (may appear in diff.patch)
+export function getFilesRecursively(dir: string, isDependenciesFolder: boolean): string[] {
+    const entries = nodefs.readdirSync(dir, { withFileTypes: true })
+    const files = entries.flatMap((entry) => {
+        const res = path.resolve(dir, entry.name)
+        if (entry.isDirectory()) {
+            if (isDependenciesFolder) {
+                // include all dependency files
+                return getFilesRecursively(res, isDependenciesFolder)
+            } else if (
+                entry.name !== 'target' &&
+                entry.name !== '.git' &&
+                entry.name !== '.idea' &&
+                entry.name !== '.github'
+            ) {
+                // exclude the above directories when zipping source code
+                return getFilesRecursively(res, isDependenciesFolder)
+            } else {
+                return []
+            }
+        } else {
+            return [res]
+        }
+    })
+    return files
+}
+
+interface IZipManifestParams {
+    hilZipParams?: IHilZipManifestParams
+}
+export function createZipManifest({ hilZipParams }: IZipManifestParams) {
+    const zipManifest = hilZipParams ? new HilZipManifest(hilZipParams) : new ZipManifest()
+    return zipManifest
+}
+
+interface IZipCodeParams {
+    dependenciesFolder?: FolderInfo
+    projectPath?: string
+    zipManifest: ZipManifest | HilZipManifest
+}
+
+interface ZipCodeResult {
+    tempFilePath: string
+    fileSize: number
+}
+
+export async function zipCode(
+    { dependenciesFolder, projectPath, zipManifest }: IZipCodeParams,
+    zip: AdmZip = new AdmZip()
+) {
+    let tempFilePath = undefined
+    try {
+        throwIfCancelled()
+
+        // if no project Path is passed in, we are not uploaded the source folder
+        // we only upload dependencies for human in the loop work
+        if (projectPath) {
+            const sourceFiles = getFilesRecursively(projectPath, false)
+            let sourceFilesSize = 0
+            for (const file of sourceFiles) {
+                if (nodefs.statSync(file).isDirectory() || isExcludedSourceFile(file)) {
+                    getLogger().info('CodeTransformation: Skipping file')
+                    continue
+                }
+                const relativePath = path.relative(projectPath, file)
+                const paddedPath = path.join('sources', relativePath)
+                zip.addLocalFile(file, path.dirname(paddedPath))
+                sourceFilesSize += (await nodefs.promises.stat(file)).size
+            }
+            getLogger().info(`CodeTransformation: source code files size = ${sourceFilesSize}`)
+        }
+
+        if (
+            transformByQState.getTransformationType() === TransformationType.SQL_CONVERSION &&
+            zipManifest instanceof ZipManifest
+        ) {
+            // note that zipManifest must be a ZipManifest since only other option is HilZipManifest which is not used for SQL conversions
+            const metadataZip = new AdmZip(transformByQState.getMetadataPathSQL())
+            zipManifest.requestedConversions = {
+                sqlConversion: {
+                    source: transformByQState.getSourceDB(),
+                    target: transformByQState.getTargetDB(),
+                    schema: transformByQState.getSchema(),
+                    host: transformByQState.getSourceServerName(),
+                    sctFileName: metadataZip.getEntries().filter((entry) => entry.name.endsWith('.sct'))[0].name,
+                },
+            }
+            for (const entry of metadataZip.getEntries()) {
+                zip.addFile(path.join(zipManifest.dependenciesRoot, entry.name), entry.getData())
+            }
+            const sqlMetadataSize = (await nodefs.promises.stat(transformByQState.getMetadataPathSQL())).size
+            getLogger().info(`CodeTransformation: SQL metadata file size = ${sqlMetadataSize}`)
+        }
+
+        throwIfCancelled()
+
+        let dependencyFiles: string[] = []
+        if (dependenciesFolder && (await fs.exists(dependenciesFolder.path))) {
+            dependencyFiles = getFilesRecursively(dependenciesFolder.path, true)
+        }
+
+        if (dependenciesFolder && dependencyFiles.length > 0) {
+            let dependencyFilesSize = 0
+            for (const file of dependencyFiles) {
+                if (isExcludedDependencyFile(file)) {
+                    continue
+                }
+                const relativePath = path.relative(dependenciesFolder.path, file)
+                if (relativePath.includes('compilations.json')) {
+                    let fileContents = await nodefs.promises.readFile(file, 'utf-8')
+                    if (os.platform() === 'win32') {
+                        fileContents = fileContents.replace(/\\\\/g, '/')
+                    }
+                    zip.addFile('compilations.json', Buffer.from(fileContents, 'utf-8'))
+                } else {
+                    zip.addLocalFile(file, path.dirname(relativePath))
+                }
+                dependencyFilesSize += (await nodefs.promises.stat(file)).size
+            }
+            getLogger().info(`CodeTransformation: dependency files size = ${dependencyFilesSize}`)
+        }
+
+        if (transformByQState.getCustomDependencyVersionFilePath() && zipManifest instanceof ZipManifest) {
+            zip.addLocalFile(
+                transformByQState.getCustomDependencyVersionFilePath(),
+                'sources',
+                'dependency_upgrade.yml'
+            )
+            zipManifest.dependencyUpgradeConfigFile = 'dependency_upgrade.yml'
+        }
+
+        zip.addFile('manifest.json', Buffer.from(JSON.stringify(zipManifest)), 'utf-8')
+
+        throwIfCancelled()
+
+        tempFilePath = path.join(os.tmpdir(), 'zipped-code.zip')
+        await fs.writeFile(tempFilePath, zip.toBuffer())
+        if (dependenciesFolder?.path) {
+            await fs.delete(dependenciesFolder.path, { recursive: true, force: true })
+        }
+    } catch (e: any) {
+        getLogger().error(`CodeTransformation: zipCode error = ${e}`)
+        throw Error('Failed to zip project')
+    }
+
+    const fileSize = (await nodefs.promises.stat(tempFilePath)).size
+
+    getLogger().info(`CodeTransformation: created ZIP of size ${fileSize} at ${tempFilePath}`)
+
+    return { tempFilePath: tempFilePath, fileSize: fileSize } as ZipCodeResult
+}
+
+export async function startJob(uploadId: string, profile: RegionProfile | undefined) {
+    const sourceLanguageVersion = `JAVA_${transformByQState.getSourceJDKVersion()}`
+    const targetLanguageVersion = `JAVA_${transformByQState.getTargetJDKVersion()}`
+    try {
+        const response = await codeWhisperer.codeWhispererClient.codeModernizerStartCodeTransformation({
+            workspaceState: {
+                uploadId: uploadId,
+                programmingLanguage: { languageName: CodeWhispererConstants.defaultLanguage.toLowerCase() },
+            },
+            transformationSpec: {
+                transformationType: CodeWhispererConstants.transformationType, // shared b/w language upgrades & sql conversions for now
+                source: { language: sourceLanguageVersion }, // dummy value of JDK8 used for SQL conversions just so that this API can be called
+                target: { language: targetLanguageVersion }, // JAVA_17 or JAVA_21
+            },
+            profileArn: profile?.arn,
+        })
+        getLogger().info('CodeTransformation: called startJob API successfully')
+        return response.transformationJobId
+    } catch (e: any) {
+        const errorMessage = `Starting the job failed due to: ${(e as Error).message}`
+        getLogger().error(`CodeTransformation: StartTransformation error = %O`, e)
+        throw new Error(errorMessage)
+    }
+}
+
+export function getImageAsBase64(filePath: string) {
+    const fileContents = nodefs.readFileSync(filePath, { encoding: 'base64' })
+    return `data:image/svg+xml;base64,${fileContents}`
+}
+
+/*
+ * Given the icon name from core/resources/icons/aws/amazonq, get the appropriate icon according to the user's theme.
+ * ex. getIcon('transform-file') returns the 'transform-file-light.svg' icon if user has a light theme enabled,
+ * otherwise 'transform-file-dark.svg' is returned.
+ */
+export function getTransformationIcon(name: string) {
+    let iconPath = ''
+    switch (name) {
+        case 'linesOfCode':
+            iconPath = 'transform-variables'
+            break
+        case 'plannedDependencyChanges':
+            iconPath = 'transform-dependencies'
+            break
+        case 'plannedDeprecatedApiChanges':
+            iconPath = 'transform-step-into'
+            break
+        case 'plannedFileChanges':
+            iconPath = 'transform-file'
+            break
+        case 'upArrow':
+            iconPath = 'transform-arrow'
+            break
+        case 'transformLogo':
+            return getImageAsBase64(globals.context.asAbsolutePath('resources/icons/aws/amazonq/transform-logo.svg'))
+        default:
+            iconPath = 'transform-default'
+            break
+    }
+    const themeColor = vscode.window.activeColorTheme.kind
+    if (themeColor === vscode.ColorThemeKind.Light || themeColor === vscode.ColorThemeKind.HighContrastLight) {
+        iconPath += '-light.svg'
+    } else {
+        iconPath += '-dark.svg'
+    }
+    return getImageAsBase64(globals.context.asAbsolutePath(path.join('resources/icons/aws/amazonq', iconPath)))
+}
+
+export function getFormattedString(s: string) {
+    return CodeWhispererConstants.formattedStringMap.get(s) ?? s
+}
+
+export function addTableMarkdown(plan: string, stepId: string, tableMapping: { [key: string]: string[] }) {
+    const tableObjects = tableMapping[stepId]
+    if (!tableObjects || tableObjects.length === 0 || tableObjects.every((table: string) => table === '')) {
+        // no tables for this stepId
+        return plan
+    }
+    const tables: any[] = []
+    // eslint-disable-next-line unicorn/no-array-for-each
+    tableObjects.forEach((tableObj: string) => {
+        try {
+            const table = JSON.parse(tableObj)
+            if (table) {
+                tables.push(table)
+            }
+        } catch (e) {
+            getLogger().error(`CodeTransformation: Failed to parse table JSON, skipping: ${e}`)
+        }
+    })
+
+    if (tables.every((table: any) => table.rows.length === 0)) {
+        // empty tables for this stepId
+        plan += `\n\nThere are no ${tables[0].name.toLowerCase()} to display.\n\n`
+        return plan
+    }
+    // table name and columns are shared, so only add to plan once
+    plan += `\n\n\n${tables[0].name}\n|`
+    const columns = tables[0].columnNames
+    // eslint-disable-next-line unicorn/no-array-for-each
+    columns.forEach((columnName: string) => {
+        plan += ` ${getFormattedString(columnName)} |`
+    })
+    plan += '\n|'
+    // eslint-disable-next-line unicorn/no-array-for-each
+    columns.forEach((_: any) => {
+        plan += '-----|'
+    })
+    // add all rows of all tables
+    // eslint-disable-next-line unicorn/no-array-for-each
+    tables.forEach((table: any) => {
+        // eslint-disable-next-line unicorn/no-array-for-each
+        table.rows.forEach((row: any) => {
+            plan += '\n|'
+            // eslint-disable-next-line unicorn/no-array-for-each
+            columns.forEach((columnName: string) => {
+                if (columnName === 'relativePath') {
+                    // add markdown link only for file paths
+                    plan += ` [${row[columnName]}](${row[columnName]}) |`
+                } else {
+                    plan += ` ${row[columnName]} |`
+                }
+            })
+        })
+    })
+    plan += '\n\n'
+    return plan
+}
+
+export function getTableMapping(stepZeroProgressUpdates: ProgressUpdates) {
+    const map: { [key: string]: string[] } = {}
+    for (const update of stepZeroProgressUpdates) {
+        if (!map[update.name]) {
+            map[update.name] = []
+        }
+        // empty string allows us to skip this table when rendering
+        map[update.name].push(update.description ?? '')
+    }
+    return map
+}
+
+export function getJobStatisticsHtml(jobStatistics: any) {
+    let htmlString = ''
+    if (jobStatistics.length === 0) {
+        return htmlString
+    }
+    htmlString += `<div style="flex: 1; margin-left: 20px; border: 1px solid #424750; border-radius: 8px; padding: 10px;">`
+    // eslint-disable-next-line unicorn/no-array-for-each
+    jobStatistics.forEach((stat: { name: string; value: string }) => {
+        if (stat.name === 'linesOfCode') {
+            htmlString += `<p style="margin-bottom: 4px"><img src="${getTransformationIcon(
+                stat.name
+            )}" style="vertical-align: middle;"> ${getFormattedString(stat.name)}: ${stat.value}</p>`
+        }
+    })
+    htmlString += `</div>`
+    return htmlString
+}
+
+export async function getTransformationPlan(jobId: string, profile: RegionProfile | undefined) {
+    let response = undefined
+    try {
+        response = await codeWhisperer.codeWhispererClient.codeModernizerGetCodeTransformationPlan({
+            transformationJobId: jobId,
+            profileArn: profile?.arn,
+        })
+
+        const stepZeroProgressUpdates = response.transformationPlan.transformationSteps[0].progressUpdates
+
+        if (!stepZeroProgressUpdates || stepZeroProgressUpdates.length === 0) {
+            // means backend API response wrong and table data is missing
+            throw new Error('No progress updates found in step 0')
+        }
+
+        // gets a mapping between the ID ('name' field) of each progressUpdate (substep) and the associated table
+        const tableMapping = getTableMapping(stepZeroProgressUpdates)
+
+        const jobStatistics = JSON.parse(tableMapping['0'][0]).rows // ID of '0' reserved for job statistics table; only 1 table there
+
+        // get logo directly since we only use one logo regardless of color theme
+        const logoIcon = getTransformationIcon('transformLogo')
+
+        const arrowIcon = getTransformationIcon('upArrow')
+
+        let plan = `<style>table {border: 1px solid #424750;}</style>\n\n<a id="top"></a><br><p style="font-size: 24px;"><img src="${logoIcon}" style="margin-right: 15px; vertical-align: middle;"></img><b>${CodeWhispererConstants.planTitle}</b></p><br>`
+        const authType = await getAuthType()
+        const linesOfCode = Number(
+            jobStatistics.find((stat: { name: string; value: string }) => stat.name === 'linesOfCode').value
+        )
+        transformByQState.setLinesOfCodeSubmitted(linesOfCode)
+        if (authType === 'iamIdentityCenter' && linesOfCode > CodeWhispererConstants.codeTransformLocThreshold) {
+            plan += CodeWhispererConstants.codeTransformBillingText(linesOfCode)
+        }
+        plan += `<div style="display: flex;"><div style="flex: 1; border: 1px solid #424750; border-radius: 8px; padding: 10px;"><p>${
+            CodeWhispererConstants.planIntroductionMessage
+        }</p></div>${getJobStatisticsHtml(jobStatistics)}</div>`
+        plan += `<div style="margin-top: 32px; border: 1px solid #424750; border-radius: 8px; padding: 10px;"><p style="font-size: 18px; margin-bottom: 4px;"><b>${CodeWhispererConstants.planHeaderMessage}</b></p><i>${CodeWhispererConstants.planDisclaimerMessage} <a href="https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/code-transformation.html">Read more.</a></i><br><br>`
+        for (const step of response.transformationPlan.transformationSteps.slice(1)) {
+            plan += `<div style="border: 1px solid #424750; border-radius: 8px; padding: 20px;"><div style="display:flex; justify-content:space-between; align-items:center;"><p style="font-size: 16px; margin-bottom: 4px;">${step.name}</p><a href="#top">Scroll to top <img src="${arrowIcon}" style="vertical-align: middle"></a></div><p>${step.description}</p>`
+            plan = addTableMarkdown(plan, step.id, tableMapping)
+            plan += `</div><br>`
+        }
+        plan += `</div><br>`
+        return plan
+    } catch (e: any) {
+        const errorMessage = (e as Error).message
+        getLogger().error(`CodeTransformation: GetTransformationPlan error = %O`, e)
+
+        // GetTransformationPlan API call failed, but if response is defined, a display/parsing error occurred, so continue transformation
+        if (response === undefined) {
+            throw new Error(errorMessage)
+        }
+    }
+}
+
+export async function getTransformationSteps(jobId: string, profile: RegionProfile | undefined) {
+    try {
+        const response = await codeWhisperer.codeWhispererClient.codeModernizerGetCodeTransformationPlan({
+            transformationJobId: jobId,
+            profileArn: profile?.arn,
+        })
+        return response.transformationPlan.transformationSteps.slice(1) // skip step 0 (contains supplemental info)
+    } catch (e: any) {
+        getLogger().error(`CodeTransformation: GetTransformationPlan error = %O`, e)
+        throw e
+    }
+}
+
+export async function pollTransformationJob(jobId: string, validStates: string[], profile: RegionProfile | undefined) {
+    let status: string = ''
+    let isPlanComplete = false
+    while (true) {
+        throwIfCancelled()
+        try {
+            const response = await codeWhisperer.codeWhispererClient.codeModernizerGetCodeTransformation({
+                transformationJobId: jobId,
+                profileArn: profile?.arn,
+            })
+            status = response.transformationJob.status!
+            if (CodeWhispererConstants.validStatesForBuildSucceeded.includes(status)) {
+                jobPlanProgress['buildCode'] = StepProgress.Succeeded
+            }
+            if (status === 'TRANSFORMING') {
+                transformByQState.setHasSeenTransforming(true)
+            }
+            // emit metric when job status changes
+            if (status !== transformByQState.getPolledJobStatus()) {
+                telemetry.codeTransform_jobStatusChanged.emit({
+                    codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+                    codeTransformJobId: jobId,
+                    codeTransformStatus: status,
+                    result: MetadataResult.Pass,
+                    codeTransformPreviousStatus: transformByQState.getPolledJobStatus(),
+                })
+            }
+            transformByQState.setPolledJobStatus(status)
+            getLogger().info(`CodeTransformation: polled job status = ${status}`)
+
+            const errorMessage = response.transformationJob.reason
+            if (errorMessage !== undefined) {
+                getLogger().error(
+                    `CodeTransformation: GetTransformation returned transformation error reason = ${errorMessage}`
+                )
+                transformByQState.setJobFailureErrorChatMessage(
+                    `${CodeWhispererConstants.failedToCompleteJobGenericChatMessage} ${errorMessage}`
+                )
+                transformByQState.setJobFailureErrorNotification(
+                    `${CodeWhispererConstants.failedToCompleteJobGenericNotification} ${errorMessage}`
+                )
+            }
+
+            if (
+                CodeWhispererConstants.validStatesForPlanGenerated.includes(status) &&
+                transformByQState.getTransformationType() === TransformationType.LANGUAGE_UPGRADE &&
+                !isPlanComplete
+            ) {
+                const plan = await openTransformationPlan(jobId, profile)
+                if (plan?.toLowerCase().includes('dependency changes')) {
+                    // final plan is complete; show to user
+                    isPlanComplete = true
+                }
+                // for JDK upgrades without a YAML file, we show a static plan so no need to keep refreshing it
+                if (
+                    plan &&
+                    transformByQState.getSourceJDKVersion() !== transformByQState.getTargetJDKVersion() &&
+                    !transformByQState.getCustomDependencyVersionFilePath()
+                ) {
+                    isPlanComplete = true
+                }
+            }
+
+            if (validStates.includes(status)) {
+                break
+            }
+
+            // TO-DO: later, handle case where PlannerAgent needs to run mvn dependency:tree during PLANNING stage; not needed for now
+            if (
+                transformByQState.getHasSeenTransforming() &&
+                transformByQState.getTransformationType() === TransformationType.LANGUAGE_UPGRADE
+            ) {
+                // client-side build is N/A for SQL conversions
+                await attemptLocalBuild()
+            }
+
+            /**
+             * If we find a paused state, we need the user to take action. We will set the global
+             * state for polling status and early exit.
+             */
+            if (CodeWhispererConstants.pausedStates.includes(status)) {
+                transformByQState.setPolledJobStatus(TransformByQStatus.WaitingUserInput)
+                break
+            }
+            /*
+             * Below IF is only relevant for pollTransformationStatusUntilPlanReady, when pollTransformationStatusUntilComplete
+             * is called, we break above on validStatesForCheckingDownloadUrl and check final status in finalizeTransformationJob
+             */
+            if (CodeWhispererConstants.failureStates.includes(status)) {
+                throw new JobStoppedError()
+            }
+            await sleep(CodeWhispererConstants.transformationJobPollingIntervalSeconds * 1000)
+        } catch (e: any) {
+            getLogger().error(`CodeTransformation: error = %O`, e)
+            throw e
+        }
+    }
+    return status
+}
+
+async function openTransformationPlan(jobId: string, profile?: RegionProfile) {
+    let plan = undefined
+    try {
+        plan = await getTransformationPlan(jobId, profile)
+    } catch (error) {
+        // means API call failed
+        getLogger().error(`CodeTransformation: ${CodeWhispererConstants.failedToCompleteJobNotification}`, error)
+        transformByQState.setJobFailureErrorNotification(
+            `${CodeWhispererConstants.failedToGetPlanNotification} ${(error as Error).message}`
+        )
+        transformByQState.setJobFailureErrorChatMessage(
+            `${CodeWhispererConstants.failedToGetPlanChatMessage} ${(error as Error).message}`
+        )
+        throw new Error('Get plan failed')
+    }
+
+    if (plan) {
+        const planFilePath = path.join(transformByQState.getProjectPath(), 'transformation-plan.md')
+        nodefs.writeFileSync(planFilePath, plan)
+        await vscode.commands.executeCommand('markdown.showPreview', vscode.Uri.file(planFilePath))
+        transformByQState.setPlanFilePath(planFilePath)
+        await setContext('gumby.isPlanAvailable', true)
+    }
+    return plan
+}
+
+async function attemptLocalBuild() {
+    const jobId = transformByQState.getJobId()
+    let artifactId
+    try {
+        artifactId = await getClientInstructionArtifactId(jobId)
+        getLogger().info(`CodeTransformation: found artifactId = ${artifactId}`)
+    } catch (e: any) {
+        // don't throw error so that we can try to get progress updates again in next polling cycle
+        getLogger().error(`CodeTransformation: failed to get client instruction artifact ID = %O`, e)
+    }
+    if (artifactId) {
+        const clientInstructionsPath = await downloadClientInstructions(jobId, artifactId)
+        getLogger().info(
+            `CodeTransformation: downloaded clientInstructions with diff.patch at: ${clientInstructionsPath}`
+        )
+        await processClientInstructions(jobId, clientInstructionsPath, artifactId)
+    }
+}
+
+async function getClientInstructionArtifactId(jobId: string) {
+    const steps = await getTransformationSteps(jobId, AuthUtil.instance.regionProfileManager.activeRegionProfile)
+    const progressUpdate = findDownloadArtifactProgressUpdate(steps)
+
+    let artifactId = undefined
+    if (progressUpdate?.downloadArtifacts) {
+        artifactId = progressUpdate.downloadArtifacts[0].downloadArtifactId
+    }
+    return artifactId
+}
+
+async function downloadClientInstructions(jobId: string, artifactId: string) {
+    const exportDestination = `downloadClientInstructions_${jobId}_${artifactId}`
+    const exportZipPath = path.join(os.tmpdir(), exportDestination)
+
+    const exportContext: ExportContext = {
+        transformationExportContext: {
+            downloadArtifactType: TransformationDownloadArtifactType.CLIENT_INSTRUCTIONS,
+            downloadArtifactId: artifactId,
+        },
+    }
+
+    await downloadAndExtractResultArchive(jobId, exportZipPath, exportContext)
+    return path.join(exportZipPath, 'diff.patch')
+}
+
+async function processClientInstructions(jobId: string, clientInstructionsPath: any, artifactId: string) {
+    const destinationPath = path.join(os.tmpdir(), `originalCopy_${jobId}_${artifactId}`)
+    await extractOriginalProjectSources(destinationPath)
+    getLogger().info(`CodeTransformation: copied project to ${destinationPath}`)
+    const diffContents = await fs.readFileText(clientInstructionsPath)
+    if (diffContents.trim()) {
+        // show user the diff.patch
+        const doc = await vscode.workspace.openTextDocument(clientInstructionsPath)
+        await vscode.window.showTextDocument(doc, { viewColumn: vscode.ViewColumn.One })
+        const diffModel = new DiffModel()
+        diffModel.parseDiff(clientInstructionsPath, path.join(destinationPath, 'sources'), true)
+    } else {
+        // still need to set the project copy so that we can use it below
+        transformByQState.setProjectCopyFilePath(path.join(destinationPath, 'sources'))
+        getLogger().info(`CodeTransformation: diff.patch is empty`)
+    }
+    await runClientSideBuild(transformByQState.getProjectCopyFilePath(), artifactId)
+}
+
+export async function runClientSideBuild(projectCopyDir: string, clientInstructionArtifactId: string) {
+    const baseCommand = transformByQState.getMavenName()
+    const args = ['clean']
+    if (transformByQState.getCustomBuildCommand() === CodeWhispererConstants.skipUnitTestsBuildCommand) {
+        args.push('test-compile')
+    } else {
+        args.push('test')
+    }
+    const environment = { ...process.env, JAVA_HOME: transformByQState.getTargetJavaHome() }
+
+    const argString = args.join(' ')
+    const spawnResult = spawnSync(baseCommand, args, {
+        cwd: projectCopyDir,
+        shell: true,
+        encoding: 'utf-8',
+        env: environment,
+    })
+
+    const buildLogs = `Intermediate build result from running mvn ${argString}:\n\n${spawnResult.stdout}`
+    transformByQState.clearBuildLog()
+    transformByQState.appendToBuildLog(buildLogs)
+    await writeAndShowBuildLogs()
+
+    const uploadZipDir = path.join(
+        os.tmpdir(),
+        `clientInstructionsResult_${transformByQState.getJobId()}_${clientInstructionArtifactId}`
+    )
+    const uploadZipPath = await createLocalBuildUploadZip(uploadZipDir, spawnResult.status, spawnResult.stdout)
+
+    // upload build results
+    const uploadContext: UploadContext = {
+        transformationUploadContext: {
+            jobId: transformByQState.getJobId(),
+            uploadArtifactType: 'ClientBuildResult',
+        },
+    }
+    getLogger().info(`CodeTransformation: uploading client build results at ${uploadZipPath} and resuming job now`)
+    try {
+        await uploadPayload(uploadZipPath, AuthUtil.instance.regionProfileManager.activeRegionProfile, uploadContext)
+        await resumeTransformationJob(transformByQState.getJobId(), 'COMPLETED')
+    } catch (err: any) {
+        getLogger().error(`CodeTransformation: upload client build results / resumeTransformation error = %O`, err)
+        transformByQState.setJobFailureErrorChatMessage(
+            `${CodeWhispererConstants.failedToCompleteJobGenericChatMessage} ${err.message}`
+        )
+        transformByQState.setJobFailureErrorNotification(
+            `${CodeWhispererConstants.failedToCompleteJobGenericNotification} ${err.message}`
+        )
+        // in case server-side execution times out, still call resumeTransformationJob
+        if (err.message.includes('find a step in desired state:AWAITING_CLIENT_ACTION')) {
+            getLogger().info('CodeTransformation: resuming job after server-side execution timeout')
+            await resumeTransformationJob(transformByQState.getJobId(), 'COMPLETED')
+        } else {
+            throw err
+        }
+    } finally {
+        await fs.delete(projectCopyDir, { recursive: true })
+        await fs.delete(uploadZipDir, { recursive: true })
+        await fs.delete(uploadZipPath, { force: true })
+        const exportZipDir = path.join(
+            os.tmpdir(),
+            `downloadClientInstructions_${transformByQState.getJobId()}_${clientInstructionArtifactId}`
+        )
+        await fs.delete(exportZipDir, { recursive: true })
+        getLogger().info(
+            `CodeTransformation: deleted projectCopy, clientInstructionsResult, and downloadClientInstructions directories/files`
+        )
+    }
+}
+
+export function getArtifactsFromProgressUpdate(progressUpdate: TransformationProgressUpdate) {
+    const artifactType = progressUpdate?.downloadArtifacts?.[0]?.downloadArtifactType
+    const artifactId = progressUpdate?.downloadArtifacts?.[0]?.downloadArtifactId
+    return {
+        artifactId,
+        artifactType,
+    }
+}
+
+// used for client-side build
+export function findDownloadArtifactProgressUpdate(transformationSteps: TransformationSteps) {
+    return transformationSteps
+        .flatMap((step) => step.progressUpdates ?? [])
+        .find(
+            (update) => update.status === 'AWAITING_CLIENT_ACTION' && update.downloadArtifacts?.[0]?.downloadArtifactId
+        )
+}
+
+// used for HIL
+export function findDownloadArtifactStep(transformationSteps: TransformationSteps) {
+    for (let i = 0; i < transformationSteps.length; i++) {
+        const progressUpdates = transformationSteps[i].progressUpdates
+        if (progressUpdates?.length) {
+            for (let j = 0; j < progressUpdates.length; j++) {
+                if (
+                    progressUpdates[j].downloadArtifacts?.[0]?.downloadArtifactType ||
+                    progressUpdates[j].downloadArtifacts?.[0]?.downloadArtifactId
+                ) {
+                    return {
+                        transformationStep: transformationSteps[i],
+                        progressUpdate: progressUpdates[j],
+                    }
+                }
+            }
+        }
+    }
+    return {
+        transformationStep: undefined,
+        progressUpdate: undefined,
+    }
+}
+
+export async function downloadResultArchive(jobId: string, pathToArchive: string, exportContext?: ExportContext) {
+    const cwStreamingClient = await createCodeWhispererChatStreamingClient()
+
+    try {
+        const args = exportContext
+            ? {
+                  exportId: jobId,
+                  exportIntent: ExportIntent.TRANSFORMATION,
+                  exportContext: exportContext,
+              }
+            : {
+                  exportId: jobId,
+                  exportIntent: ExportIntent.TRANSFORMATION,
+              }
+        await downloadExportResultArchive(
+            cwStreamingClient,
+            args,
+            pathToArchive,
+            AuthUtil.instance.regionProfileManager.activeRegionProfile
+        )
+    } catch (e: any) {
+        getLogger().error(`CodeTransformation: ExportResultArchive error = %O`, e)
+        throw e
+    } finally {
+        cwStreamingClient.destroy()
+        UserWrittenCodeTracker.instance.onQFeatureInvoked()
+    }
+}
+
+export async function downloadAndExtractResultArchive(
+    jobId: string,
+    pathToArchiveDir: string,
+    exportContext?: ExportContext
+) {
+    const archivePathExists = await fs.existsDir(pathToArchiveDir)
+    if (!archivePathExists) {
+        await fs.mkdir(pathToArchiveDir)
+    }
+
+    const pathToArchive = path.join(pathToArchiveDir, 'ExportResultsArchive.zip')
+
+    let downloadErrorMessage = undefined
+    try {
+        // Download and deserialize the zip
+        await downloadResultArchive(jobId, pathToArchive, exportContext)
+        const zip = new AdmZip(pathToArchive)
+        zip.extractAllTo(pathToArchiveDir)
+        getLogger().info(`CodeTransformation: downloaded result archive to: ${pathToArchiveDir}`)
+    } catch (e) {
+        downloadErrorMessage = (e as Error).message
+        getLogger().error(`CodeTransformation: ExportResultArchive error = %O`, e)
+        throw new Error('Error downloading transformation result artifacts: ' + downloadErrorMessage)
+    }
+}
+
+export async function downloadHilResultArchive(jobId: string, downloadArtifactId: string, pathToArchiveDir: string) {
+    await downloadAndExtractResultArchive(jobId, pathToArchiveDir)
+
+    // manifest.json
+    // pomFolder/pom.xml or manifest has pomFolderName path
+    const manifestFileVirtualFileReference = vscode.Uri.file(path.join(pathToArchiveDir, 'manifest.json'))
+    const pomFileVirtualFileReference = vscode.Uri.file(path.join(pathToArchiveDir, 'pomFolder', 'pom.xml'))
+    return { manifestFileVirtualFileReference, pomFileVirtualFileReference }
+}
diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformFileHandler.ts b/packages/core/src/codewhisperer/service/transformByQ/transformFileHandler.ts
new file mode 100644
index 00000000000..b16ea64022c
--- /dev/null
+++ b/packages/core/src/codewhisperer/service/transformByQ/transformFileHandler.ts
@@ -0,0 +1,438 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+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
+import { BuildSystem, DB, FolderInfo, transformByQState } from '../../models/model'
+import fs from '../../../shared/fs/fs'
+import globals from '../../../shared/extensionGlobals'
+import { ChatSessionManager } from '../../../amazonqGumby/chat/storages/chatSession'
+import { AbsolutePathDetectedError } from '../../../amazonqGumby/errors'
+import { getLogger } from '../../../shared/logger/logger'
+import AdmZip from 'adm-zip'
+import { IManifestFile } from './humanInTheLoopManager'
+import { ExportResultArchiveStructure } from '../../../shared/utilities/download'
+import { isFileNotFoundError } from '../../../shared/errors'
+
+export async function getDependenciesFolderInfo(): Promise<FolderInfo> {
+    const dependencyFolderName = `${CodeWhispererConstants.dependencyFolderName}${globals.clock.Date.now()}`
+    const dependencyFolderPath = path.join(os.tmpdir(), dependencyFolderName)
+    await fs.mkdir(dependencyFolderPath)
+    return {
+        name: dependencyFolderName,
+        path: dependencyFolderPath,
+    }
+}
+
+export async function writeAndShowBuildLogs(isLocalInstall: boolean = false) {
+    const logFilePath = path.join(os.tmpdir(), 'build-logs.txt')
+    writeFileSync(logFilePath, transformByQState.getBuildLog())
+    const doc = await vscode.workspace.openTextDocument(logFilePath)
+    const logs = transformByQState.getBuildLog().toLowerCase()
+    if (logs.includes('intermediate build result') || logs.includes('maven jar failed')) {
+        // only show the log if the build failed; show it in second column for intermediate builds only
+        const options = isLocalInstall ? undefined : { viewColumn: vscode.ViewColumn.Two }
+        await vscode.window.showTextDocument(doc, options)
+    }
+}
+
+export async function createLocalBuildUploadZip(baseDir: string, exitCode: number | null, stdout: string) {
+    const manifestFilePath = path.join(baseDir, 'manifest.json')
+    const buildResultsManifest = {
+        capability: 'CLIENT_SIDE_BUILD',
+        exitCode: exitCode,
+        commandLogFileName: 'build-output.log',
+    }
+    const formattedManifest = JSON.stringify(buildResultsManifest)
+    await fs.writeFile(manifestFilePath, formattedManifest)
+
+    const buildLogsFilePath = path.join(baseDir, 'build-output.log')
+    await fs.writeFile(buildLogsFilePath, stdout)
+
+    const zip = new AdmZip()
+    zip.addLocalFile(buildLogsFilePath)
+    zip.addLocalFile(manifestFilePath)
+
+    const zipPath = `${baseDir}.zip`
+    zip.writeZip(zipPath)
+    getLogger().info(`CodeTransformation: created local build upload zip at ${zipPath}`)
+    return zipPath
+}
+
+// extract the 'sources' directory of the upload ZIP so that we can apply the diff.patch to a copy of the source code
+export async function extractOriginalProjectSources(destinationPath: string) {
+    const zip = new AdmZip(transformByQState.getPayloadFilePath())
+    const zipEntries = zip.getEntries()
+    for (const zipEntry of zipEntries) {
+        if (zipEntry.entryName.startsWith('sources')) {
+            zip.extractEntryTo(zipEntry, destinationPath, true, true)
+        }
+    }
+}
+
+export async function checkBuildSystem(projectPath: string) {
+    const mavenBuildFilePath = path.join(projectPath, 'pom.xml')
+    if (existsSync(mavenBuildFilePath)) {
+        return BuildSystem.Maven
+    }
+    return BuildSystem.Unknown
+}
+
+export async function parseBuildFile() {
+    try {
+        const absolutePaths = ['users/', 'system/', 'volumes/', 'c:\\', 'd:\\']
+        const alias = path.basename(os.homedir())
+        absolutePaths.push(alias)
+        const buildFilePath = path.join(transformByQState.getProjectPath(), 'pom.xml')
+        if (existsSync(buildFilePath)) {
+            const buildFileContents = readFileSync(buildFilePath).toString().toLowerCase()
+            const detectedPaths = []
+            for (const absolutePath of absolutePaths) {
+                if (buildFileContents.includes(absolutePath)) {
+                    detectedPaths.push(absolutePath)
+                }
+            }
+            if (detectedPaths.length > 0) {
+                const warningMessage = CodeWhispererConstants.absolutePathDetectedMessage(
+                    detectedPaths.length,
+                    path.basename(buildFilePath),
+                    detectedPaths.join(', ')
+                )
+                transformByQState.getChatControllers()?.errorThrown.fire({
+                    error: new AbsolutePathDetectedError(warningMessage),
+                    tabID: ChatSessionManager.Instance.getSession().tabID,
+                })
+                getLogger().info('CodeTransformation: absolute path potentially in build file')
+                return warningMessage
+            }
+        }
+    } catch (err: any) {
+        // swallow error
+        getLogger().error(`CodeTransformation: error scanning for absolute paths, tranformation continuing: ${err}`)
+    }
+    return undefined
+}
+
+// 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 `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 dependencies) {
+            const errorMessage = validateItem(item, false)
+            if (errorMessage) {
+                return errorMessage
+            }
+        }
+        for (const item of plugins) {
+            const errorMessage = validateItem(item, true)
+            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, isPlugin: boolean) {
+    const validOriginTypes = ['FIRST_PARTY', 'THIRD_PARTY']
+    if (!isPlugin && !/^[^\s:]+:[^\s:]+$/.test(item.identifier)) {
+        getLogger().info(`CodeTransformation: Invalid identifier format: ${item.identifier}`)
+        return `Invalid dependency identifier format: \`${item.identifier}\`. Must be in format \`groupId:artifactId\` without spaces`
+    }
+    if (isPlugin && !item.identifier?.trim()) {
+        getLogger().info('CodeTransformation: Missing identifier in plugin')
+        return 'Missing `identifier` in plugin'
+    }
+    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
+}
+
+export async function validateSQLMetadataFile(fileContents: string, message: any) {
+    try {
+        const sctData = await xml2js.parseStringPromise(fileContents)
+        const dbEntities = sctData['tree']['instances'][0]['ProjectModel'][0]['entities'][0]
+        const sourceDB = dbEntities['sources'][0]['DbServer'][0]['$']['vendor'].trim().toUpperCase()
+        const targetDB = dbEntities['targets'][0]['DbServer'][0]['$']['vendor'].trim().toUpperCase()
+        const sourceServerName = dbEntities['sources'][0]['DbServer'][0]['$']['name'].trim()
+        transformByQState.setSourceServerName(sourceServerName)
+        if (sourceDB !== DB.ORACLE) {
+            transformByQState.getChatMessenger()?.sendUnrecoverableErrorResponse('unsupported-source-db', message.tabID)
+            return false
+        } else if (targetDB !== DB.AURORA_POSTGRESQL && targetDB !== DB.RDS_POSTGRESQL) {
+            transformByQState.getChatMessenger()?.sendUnrecoverableErrorResponse('unsupported-target-db', message.tabID)
+            return false
+        }
+        transformByQState.setSourceDB(sourceDB)
+        transformByQState.setTargetDB(targetDB)
+
+        const serverNodeLocations =
+            sctData['tree']['instances'][0]['ProjectModel'][0]['relations'][0]['server-node-location']
+        const schemaNames = new Set<string>()
+        // eslint-disable-next-line unicorn/no-array-for-each
+        serverNodeLocations.forEach((serverNodeLocation: any) => {
+            const schemaNodes = serverNodeLocation['FullNameNodeInfoList'][0]['nameParts'][0][
+                'FullNameNodeInfo'
+            ].filter((node: any) => node['$']['typeNode'].toLowerCase() === 'schema')
+            // eslint-disable-next-line unicorn/no-array-for-each
+            schemaNodes.forEach((node: any) => {
+                schemaNames.add(node['$']['nameNode'].toUpperCase())
+            })
+        })
+        transformByQState.setSchemaOptions(schemaNames) // user will choose one of these
+        getLogger().info(
+            `CodeTransformation: Parsed .sct file with source DB: ${sourceDB}, target DB: ${targetDB}, source host name: ${sourceServerName}, and schema names: ${Array.from(schemaNames)}`
+        )
+    } catch (err: any) {
+        getLogger().error('CodeTransformation: Error parsing .sct file. %O', err)
+        transformByQState.getChatMessenger()?.sendUnrecoverableErrorResponse('error-parsing-sct-file', message.tabID)
+        return false
+    }
+    return true
+}
+
+export function setMaven() {
+    // avoid using maven wrapper since we can run into permissions issues
+    transformByQState.setMavenName('mvn')
+}
+
+export async function openBuildLogFile() {
+    const logFilePath = transformByQState.getPreBuildLogFilePath()
+    const doc = await vscode.workspace.openTextDocument(logFilePath)
+    await vscode.window.showTextDocument(doc)
+}
+
+export async function createPomCopy(
+    dirname: string,
+    pomFileVirtualFileReference: vscode.Uri,
+    fileName: string
+): Promise<vscode.Uri> {
+    const newFilePath = path.join(dirname, fileName)
+    const pomFileContents = await fs.readFileText(pomFileVirtualFileReference.fsPath)
+    const directoryExits = await fs.exists(dirname)
+    if (!directoryExits) {
+        await fs.mkdir(dirname)
+    }
+    await fs.writeFile(newFilePath, pomFileContents)
+    return vscode.Uri.file(newFilePath)
+}
+
+export async function replacePomVersion(pomFileVirtualFileReference: vscode.Uri, version: string, delimiter: string) {
+    const pomFileText = await fs.readFileText(pomFileVirtualFileReference.fsPath)
+    const pomFileTextWithNewVersion = pomFileText.replace(delimiter, version)
+    writeFileSync(pomFileVirtualFileReference.fsPath, pomFileTextWithNewVersion)
+}
+
+export async function getJsonValuesFromManifestFile(
+    manifestFileVirtualFileReference: vscode.Uri
+): Promise<IManifestFile> {
+    const manifestFileContents = await fs.readFileText(manifestFileVirtualFileReference.fsPath)
+    const jsonValues = JSON.parse(manifestFileContents.toString())
+    return {
+        hilCapability: jsonValues?.hilType,
+        pomFolderName: jsonValues?.pomFolderName,
+        sourcePomVersion: jsonValues?.sourcePomVersion || '1.0',
+        pomArtifactId: jsonValues?.pomArtifactId,
+        pomGroupId: jsonValues?.pomGroupId,
+    }
+}
+
+export interface IHighlightPomIssueParams {
+    pomFileVirtualFileReference: vscode.Uri
+    currentVersion: string
+    latestVersion: string
+    latestMajorVersion: string
+}
+
+export async function highlightPomIssueInProject(
+    pomFileVirtualFileReference: vscode.Uri,
+    collection: vscode.DiagnosticCollection,
+    currentVersion: string
+) {
+    const diagnostics = vscode.languages.getDiagnostics(pomFileVirtualFileReference)
+
+    // Open the editor and set this pom to activeTextEditor
+    await vscode.window.showTextDocument(pomFileVirtualFileReference, {
+        preview: true,
+    })
+
+    // Find line number for "latestVersion" or set to first line in file
+    const highlightLineNumberVersion = findLineNumber(
+        pomFileVirtualFileReference,
+        `<version>${currentVersion}</version>`
+    )
+    if (highlightLineNumberVersion) {
+        await setHilAnnotationObjectDetails(highlightLineNumberVersion)
+        await addDiagnosticOverview(collection, diagnostics, highlightLineNumberVersion)
+    }
+}
+
+async function addDiagnosticOverview(
+    collection: vscode.DiagnosticCollection,
+    diagnostics: vscode.Diagnostic[],
+    lineNumber: number = 0
+) {
+    // Get the diff editor
+    const documentUri = vscode.window.activeTextEditor?.document?.uri
+    if (documentUri) {
+        collection.clear()
+        diagnostics = [
+            {
+                code: 'Amazon Q',
+                message: 'Amazon Q experienced an issue upgrading this dependency version',
+                range: new vscode.Range(new vscode.Position(lineNumber, 0), new vscode.Position(lineNumber, 50)),
+                severity: vscode.DiagnosticSeverity.Error,
+                relatedInformation: [
+                    new vscode.DiagnosticRelatedInformation(
+                        new vscode.Location(
+                            documentUri,
+                            new vscode.Range(new vscode.Position(1, 0), new vscode.Position(1, 50))
+                        ),
+                        'This dependency is not compatible with a Java 17 upgrade. Use Amazon Q chat to upgrade the version of this dependency to a Java 17 compatible version.'
+                    ),
+                ],
+                tags: [1, 2],
+            },
+        ]
+        collection.set(documentUri, diagnostics)
+    }
+}
+
+export async function getCodeIssueSnippetFromPom(pomFileVirtualFileReference: vscode.Uri) {
+    // TODO[gumby]: not great that we read this file multiple times
+    const pomFileContents = await fs.readFileText(pomFileVirtualFileReference.fsPath)
+
+    const dependencyRegEx = /<dependencies\b[^>]*>(.*?)<\/dependencies>/ms
+    const match = dependencyRegEx.exec(pomFileContents)
+    const snippet = match ? match[0] : ''
+
+    // Remove white space and convert to 2 space indented code snippet
+    return snippet.trim()
+}
+
+async function setHilAnnotationObjectDetails(lineNumber: number = 0) {
+    // Get active diff editor
+    const diffEditor = vscode.window.activeTextEditor
+    const backgroundColor = new vscode.ThemeColor('editor.wordHighlightBackground')
+    const highlightDecorationType = vscode.window.createTextEditorDecorationType({
+        backgroundColor,
+        isWholeLine: true,
+        overviewRulerColor: new vscode.ThemeColor('warning'),
+    })
+
+    // Set the decorations
+    diffEditor?.setDecorations(highlightDecorationType, [
+        {
+            range: new vscode.Range(lineNumber, 0, lineNumber, 50),
+        },
+    ])
+}
+
+function findLineNumber(uri: vscode.Uri, searchString: string): number | undefined {
+    const textDocument = vscode.workspace.textDocuments.find((doc) => doc.uri.toString() === uri.toString())
+    if (!textDocument) {
+        return undefined
+    }
+
+    const text = textDocument.getText()
+    let lineNumber = 0
+    const lines = text.split('\n')
+
+    for (const line of lines) {
+        if (line.includes(searchString)) {
+            return lineNumber
+        }
+        lineNumber++
+    }
+
+    return undefined
+}
+
+export interface IParsedXmlDependencyOutput {
+    latestVersion: string
+    majorVersions: string[]
+    minorVersions: string[]
+    status?: string
+}
+export async function parseVersionsListFromPomFile(xmlString: string): Promise<IParsedXmlDependencyOutput> {
+    const parser = new xml2js.Parser()
+    const parsedOutput = await parser.parseStringPromise(xmlString)
+
+    const report = parsedOutput.DependencyUpdatesReport.dependencies[0].dependency[0]
+
+    const latestVersion = report?.lastVersion?.[0]
+    const majorVersions = report?.majors?.[0]?.major || []
+    const minorVersions = report?.minors?.[0]?.minor || []
+    const status = report.status?.[0]
+
+    return { latestVersion, majorVersions, minorVersions, status }
+}
+
+/**
+ * Saves a copy of the diff patch, summary, and build logs (if any) locally
+ *
+ * @param pathToArchiveDir path to the archive directory where the artifacts are unzipped
+ * @param pathToDestinationDir destination directory (will create directories if path doesn't exist already)
+ */
+export async function copyArtifacts(pathToArchiveDir: string, pathToDestinationDir: string) {
+    // create destination path if doesn't exist already
+    // mkdir() will not raise an error if path exists
+    await fs.mkdir(pathToDestinationDir)
+
+    const diffPath = path.join(pathToArchiveDir, ExportResultArchiveStructure.PathToDiffPatch)
+    const summaryPath = path.join(pathToArchiveDir, ExportResultArchiveStructure.PathToSummary)
+
+    try {
+        await fs.copy(diffPath, path.join(pathToDestinationDir, 'diff.patch'))
+        // make summary directory if needed
+        await fs.mkdir(path.join(pathToDestinationDir, 'summary'))
+        await fs.copy(summaryPath, path.join(pathToDestinationDir, 'summary', 'summary.md'))
+    } catch (error) {
+        getLogger().error('Code Transformation: Error saving local copy of artifacts: %s', (error as Error).message)
+    }
+
+    const buildLogsPath = path.join(path.dirname(summaryPath), 'buildCommandOutput.log')
+    try {
+        await fs.copy(buildLogsPath, path.join(pathToDestinationDir, 'summary', 'buildCommandOutput.log'))
+    } catch (error) {
+        // build logs won't exist for SQL conversions (not an error)
+        if (!isFileNotFoundError(error)) {
+            getLogger().error(
+                'Code Transformation: Error saving local copy of build logs: %s',
+                (error as Error).message
+            )
+        }
+    }
+}
diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformMavenHandler.ts b/packages/core/src/codewhisperer/service/transformByQ/transformMavenHandler.ts
new file mode 100644
index 00000000000..22fcd1e6fa1
--- /dev/null
+++ b/packages/core/src/codewhisperer/service/transformByQ/transformMavenHandler.ts
@@ -0,0 +1,107 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { FolderInfo, transformByQState } from '../../models/model'
+import { getLogger } from '../../../shared/logger/logger'
+import * as CodeWhispererConstants from '../../models/constants'
+// Consider using ChildProcess once we finalize all spawnSync calls
+import { spawnSync } from 'child_process' // eslint-disable-line no-restricted-imports
+import { setMaven } from './transformFileHandler'
+import { throwIfCancelled } from './transformApiHandler'
+import { sleep } from '../../../shared/utilities/timeoutUtils'
+import path from 'path'
+import globals from '../../../shared/extensionGlobals'
+
+function collectDependenciesAndMetadata(dependenciesFolderPath: string, workingDirPath: string) {
+    getLogger().info('CodeTransformation: running mvn clean test-compile with maven JAR')
+
+    const baseCommand = transformByQState.getMavenName() // always 'mvn'
+    const jarPath = globals.context.asAbsolutePath(path.join('resources', 'amazonQCT', 'QCT-Maven-1-0-156-0.jar'))
+
+    getLogger().info('CodeTransformation: running Maven extension with JAR')
+
+    const args = [
+        `-Dmaven.ext.class.path="${jarPath}"`,
+        `-Dcom.amazon.aws.developer.transform.jobDirectory="${dependenciesFolderPath}"`,
+        'clean',
+        'test-compile',
+    ]
+
+    let environment = process.env
+    if (transformByQState.getSourceJavaHome() !== undefined) {
+        environment = { ...process.env, JAVA_HOME: transformByQState.getSourceJavaHome() }
+    }
+
+    const spawnResult = spawnSync(baseCommand, args, {
+        cwd: workingDirPath,
+        shell: true,
+        encoding: 'utf-8',
+        env: environment,
+    })
+
+    getLogger().info(
+        `CodeTransformation: Ran mvn clean test-compile with maven JAR; status code = ${spawnResult.status}}`
+    )
+
+    if (spawnResult.status !== 0) {
+        let errorLog = ''
+        errorLog += spawnResult.error ? JSON.stringify(spawnResult.error) : ''
+        errorLog += `${spawnResult.stderr}\n${spawnResult.stdout}`
+        errorLog = errorLog.toLowerCase().replace('elasticgumby', 'QCT')
+        transformByQState.appendToBuildLog(`mvn clean test-compile with maven JAR failed:\n${errorLog}`)
+        getLogger().error(`CodeTransformation: Error in running mvn clean test-compile with maven JAR = ${errorLog}`)
+        throw new Error('mvn clean test-compile with maven JAR failed')
+    }
+    getLogger().info(
+        `CodeTransformation: mvn clean test-compile with maven JAR succeeded; dependencies copied to ${dependenciesFolderPath}`
+    )
+}
+
+export async function prepareProjectDependencies(dependenciesFolderPath: string, workingDirPath: string) {
+    setMaven()
+    // pause to give chat time to update
+    await sleep(100)
+    try {
+        collectDependenciesAndMetadata(dependenciesFolderPath, workingDirPath)
+    } catch (err) {
+        getLogger().error('CodeTransformation: collectDependenciesAndMetadata failed')
+        void vscode.window.showErrorMessage(CodeWhispererConstants.cleanTestCompileErrorNotification)
+        throw err
+    }
+    throwIfCancelled()
+    void vscode.window.showInformationMessage(CodeWhispererConstants.buildSucceededNotification)
+}
+
+export function runMavenDependencyUpdateCommands(dependenciesFolder: FolderInfo) {
+    const baseCommand = transformByQState.getMavenName()
+
+    const args = [
+        'versions:dependency-updates-aggregate-report',
+        `-DoutputDirectory=${dependenciesFolder.path}`,
+        '-DonlyProjectDependencies=true',
+        '-DdependencyUpdatesReportFormats=xml',
+    ]
+
+    let environment = process.env
+
+    if (transformByQState.getSourceJavaHome()) {
+        environment = { ...process.env, JAVA_HOME: transformByQState.getSourceJavaHome() }
+    }
+
+    const spawnResult = spawnSync(baseCommand, args, {
+        // default behavior is looks for pom.xml in this root
+        cwd: dependenciesFolder.path,
+        shell: true,
+        encoding: 'utf-8',
+        env: environment,
+        maxBuffer: CodeWhispererConstants.maxBufferSize,
+    })
+
+    if (spawnResult.status !== 0) {
+        throw new Error(spawnResult.stderr)
+    } else {
+        return spawnResult.stdout
+    }
+}
diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformProjectValidationHandler.ts b/packages/core/src/codewhisperer/service/transformByQ/transformProjectValidationHandler.ts
new file mode 100644
index 00000000000..ebc2caeda4c
--- /dev/null
+++ b/packages/core/src/codewhisperer/service/transformByQ/transformProjectValidationHandler.ts
@@ -0,0 +1,74 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { BuildSystem, TransformationCandidateProject } from '../../models/model'
+import * as vscode from 'vscode'
+import {
+    NoJavaProjectsFoundError,
+    NoMavenJavaProjectsFoundError,
+    NoOpenProjectsError,
+} from '../../../amazonqGumby/errors'
+import { checkBuildSystem } from './transformFileHandler'
+
+export async function getOpenProjects(): Promise<TransformationCandidateProject[]> {
+    const folders = vscode.workspace.workspaceFolders
+
+    if (folders === undefined || folders.length === 0) {
+        throw new NoOpenProjectsError()
+    }
+
+    const openProjects: TransformationCandidateProject[] = []
+    for (const folder of folders) {
+        openProjects.push({
+            name: folder.name,
+            path: folder.uri.fsPath,
+        })
+    }
+
+    return openProjects
+}
+
+export async function getJavaProjects(projects: TransformationCandidateProject[]) {
+    const javaProjects = []
+    for (const project of projects) {
+        const projectPath = project.path
+        const javaFiles = await vscode.workspace.findFiles(
+            new vscode.RelativePattern(projectPath!, '**/*.java'),
+            '**/node_modules/**',
+            1
+        )
+        if (javaFiles.length > 0) {
+            javaProjects.push(project)
+        }
+    }
+    if (javaProjects.length === 0) {
+        throw new NoJavaProjectsFoundError()
+    }
+    return javaProjects
+}
+
+async function getMavenJavaProjects(javaProjects: TransformationCandidateProject[]) {
+    const mavenJavaProjects = []
+
+    for (const project of javaProjects) {
+        const projectPath = project.path
+        const buildSystem = await checkBuildSystem(projectPath!)
+        if (buildSystem === BuildSystem.Maven) {
+            mavenJavaProjects.push(project)
+        }
+    }
+
+    if (mavenJavaProjects.length === 0) {
+        throw new NoMavenJavaProjectsFoundError()
+    }
+
+    return mavenJavaProjects
+}
+
+// This function filters all open projects by first searching for a .java file and then searching for a pom.xml file in all projects.
+export async function validateOpenProjects(projects: TransformationCandidateProject[]) {
+    const javaProjects = await getJavaProjects(projects)
+    const mavenJavaProjects = await getMavenJavaProjects(javaProjects)
+    return mavenJavaProjects
+}
diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformationHistoryHandler.ts b/packages/core/src/codewhisperer/service/transformByQ/transformationHistoryHandler.ts
new file mode 100644
index 00000000000..6aba818b4fc
--- /dev/null
+++ b/packages/core/src/codewhisperer/service/transformByQ/transformationHistoryHandler.ts
@@ -0,0 +1,416 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import fs from '../../../shared/fs/fs'
+import path from 'path'
+import os from 'os'
+import * as CodeWhispererConstants from '../../models/constants'
+import { JDKVersion, TransformationType, transformByQState } from '../../models/model'
+import { getLogger } from '../../../shared/logger/logger'
+import { codeWhispererClient } from '../../../codewhisperer/client/codewhisperer'
+import { downloadAndExtractResultArchive, pollTransformationJob } from './transformApiHandler'
+import { ChatSessionManager } from '../../../amazonqGumby/chat/storages/chatSession'
+import { AuthUtil } from '../../util/authUtil'
+import { setMaven } from './transformFileHandler'
+import { convertToTimeString, isWithin30Days } from '../../../shared/datetime'
+import { copyArtifacts } from './transformFileHandler'
+
+export interface HistoryObject {
+    startTime: string
+    projectName: string
+    status: string
+    duration: string
+    diffPath: string
+    summaryPath: string
+    jobId: string
+    transformationType: string
+    sourceJDKVersion: string
+    targetJDKVersion: string
+    customDependencyVersionFilePath: string
+    customBuildCommand: string
+}
+
+export interface JobMetadata {
+    jobId: string
+    projectName: string
+    transformationType: TransformationType
+    sourceJDKVersion: JDKVersion
+    targetJDKVersion: JDKVersion
+    customDependencyVersionFilePath: string
+    customBuildCommand: string
+    targetJavaHome: string
+    projectPath: string
+    startTime: string
+}
+
+/**
+ * Reads 'transformation_history.tsv' (history) file
+ *
+ * @returns history array of 10 most recent jobs from within past 30 days
+ */
+export async function readHistoryFile(): Promise<HistoryObject[]> {
+    const history: HistoryObject[] = []
+    const jobHistoryFilePath = path.join(os.homedir(), '.aws', 'transform', 'transformation_history.tsv')
+
+    if (!(await fs.existsFile(jobHistoryFilePath))) {
+        return history
+    }
+
+    const historyFile = await fs.readFileText(jobHistoryFilePath)
+    const jobs = historyFile.split('\n')
+    jobs.shift() // removes headers
+
+    // Process from end, stop at 10 valid entries
+    for (let i = jobs.length - 1; i >= 0 && history.length < 10; i--) {
+        const job = jobs[i]
+        if (job && isWithin30Days(job.split('\t')[0])) {
+            const jobInfo = job.split('\t')
+            history.push({
+                startTime: jobInfo[0],
+                projectName: jobInfo[1],
+                status: jobInfo[2],
+                duration: jobInfo[3],
+                diffPath: jobInfo[4],
+                summaryPath: jobInfo[5],
+                jobId: jobInfo[6],
+                transformationType: jobInfo[7],
+                sourceJDKVersion: jobInfo[8],
+                targetJDKVersion: jobInfo[9],
+                customDependencyVersionFilePath: jobInfo[10],
+                customBuildCommand: jobInfo[11],
+            })
+        }
+    }
+    return history
+}
+
+/**
+ * Creates temporary metadata JSON file with transformation config info and saves a copy of upload zip
+ *
+ * These files are used when a job is resumed after interruption
+ *
+ * @param payloadFilePath path to upload zip
+ * @param metadata
+ * @returns
+ */
+export async function createMetadataFile(payloadFilePath: string, metadata: JobMetadata): Promise<string> {
+    const jobHistoryPath = path.join(os.homedir(), '.aws', 'transform', metadata.projectName, metadata.jobId)
+
+    // create job history folders
+    await fs.mkdir(jobHistoryPath)
+
+    // save a copy of the upload zip
+    try {
+        await fs.copy(payloadFilePath, path.join(jobHistoryPath, 'zipped-code.zip'))
+    } catch (error) {
+        getLogger().error('Code Transformation: error saving copy of upload zip: %s', (error as Error).message)
+    }
+
+    // create metadata file with transformation config info
+    try {
+        await fs.writeFile(path.join(jobHistoryPath, 'metadata.json'), JSON.stringify(metadata))
+    } catch (error) {
+        getLogger().error('Code Transformation: error creating metadata file: %s', (error as Error).message)
+    }
+
+    return jobHistoryPath
+}
+
+/**
+ * Writes job details to history file
+ *
+ * @param startTime job start timestamp (ex. "01/01/23, 12:00 AM")
+ * @param projectName
+ * @param status
+ * @param duration job duration in hr / min / sec format (ex. "1 hr 15 min")
+ * @param jobId
+ * @param jobHistoryPath path to where job's history details are stored (ex. "~/.aws/transform/proj_name/job_id")
+ */
+export async function writeToHistoryFile(
+    startTime: string,
+    projectName: string,
+    status: string,
+    duration: string,
+    jobId: string,
+    jobHistoryPath: string,
+    transformationType: string,
+    sourceJDKVersion: string,
+    targetJDKVersion: string,
+    customDependencyVersionFilePath: string,
+    customBuildCommand: string
+) {
+    const historyLogFilePath = path.join(os.homedir(), '.aws', 'transform', 'transformation_history.tsv')
+    // create transform folder if necessary
+    if (!(await fs.existsFile(historyLogFilePath))) {
+        await fs.mkdir(path.dirname(historyLogFilePath))
+        // create headers of new transformation history file
+        await fs.writeFile(
+            historyLogFilePath,
+            'date\tproject_name\tstatus\tduration\tdiff_patch\tsummary\tjob_id\ttransformation_type\tsource_jdk_version\ttarget_jdk_version\tcustom_dependency_version_file_path\tcustom_build_command\n'
+        )
+    }
+    const artifactsExist = status === 'COMPLETED' || status === 'PARTIALLY_COMPLETED'
+    const fields = [
+        startTime,
+        projectName,
+        status,
+        duration,
+        artifactsExist ? path.join(jobHistoryPath, 'diff.patch') : '',
+        artifactsExist ? path.join(jobHistoryPath, 'summary', 'summary.md') : '',
+        jobId,
+        transformationType,
+        sourceJDKVersion,
+        targetJDKVersion,
+        customDependencyVersionFilePath,
+        customBuildCommand,
+    ]
+
+    const jobDetails = fields.join('\t') + '\n'
+    await fs.appendFile(historyLogFilePath, jobDetails)
+
+    // update Transformation Hub table
+    await vscode.commands.executeCommand('aws.amazonq.transformationHub.updateContent', 'job history', undefined, true)
+}
+
+/**
+ * Delete temporary files at the end of a transformation
+ *
+ * @param jobHistoryPath path to history directory for this job
+ * @param jobStatus final transformation status
+ * @param payloadFilePath path to original upload zip; providing this param will also delete any temp build logs
+ */
+export async function cleanupTempJobFiles(jobHistoryPath: string, jobStatus: string, payloadFilePath?: string) {
+    if (payloadFilePath) {
+        // delete original upload ZIP
+        await fs.delete(payloadFilePath, { force: true })
+        // delete temporary build logs file
+        const logFilePath = path.join(os.tmpdir(), 'build-logs.txt')
+        await fs.delete(logFilePath, { force: true })
+    }
+
+    // delete metadata file and upload zip copy if no longer need them (i.e. will not be resuming)
+    if (jobStatus !== 'FAILED') {
+        await fs.delete(path.join(jobHistoryPath, 'metadata.json'), { force: true })
+        await fs.delete(path.join(jobHistoryPath, 'zipped-code.zip'), { force: true })
+    }
+}
+
+/* Job refresh-related functions */
+
+export async function refreshJob(jobId: string, currentStatus: string, projectName: string) {
+    // fetch status from server
+    let status = ''
+    let duration = ''
+    if (currentStatus === 'COMPLETED' || currentStatus === 'PARTIALLY_COMPLETED') {
+        // job is already completed, no need to fetch status
+        status = currentStatus
+    } else {
+        try {
+            const response = await codeWhispererClient.codeModernizerGetCodeTransformation({
+                transformationJobId: jobId,
+                profileArn: undefined,
+            })
+            status = response.transformationJob.status ?? currentStatus
+            if (response.transformationJob.endExecutionTime && response.transformationJob.creationTime) {
+                duration = convertToTimeString(
+                    response.transformationJob.endExecutionTime.getTime() -
+                        response.transformationJob.creationTime.getTime()
+                )
+            }
+
+            getLogger().debug(
+                'Code Transformation: Job refresh - Fetched status for job id: %s\n{Status: %s; Duration: %s}',
+                jobId,
+                status,
+                duration
+            )
+        } catch (error) {
+            const errorMessage = (error as Error).message
+            getLogger().error('Code Transformation: Error fetching status (job id: %s): %s', jobId, errorMessage)
+            if (errorMessage.includes('not authorized to make this call')) {
+                // job not available on backend
+                status = 'FAILED' // won't allow retries for this job
+            } else {
+                // some other error (e.g. network error)
+                return
+            }
+        }
+    }
+
+    // retrieve artifacts and updated duration if available
+    let jobHistoryPath: string = ''
+    if (status === 'COMPLETED' || status === 'PARTIALLY_COMPLETED') {
+        // artifacts should be available to download
+        jobHistoryPath = await retrieveArtifacts(jobId, projectName)
+
+        await cleanupTempJobFiles(path.join(os.homedir(), '.aws', 'transform', projectName, jobId), status)
+    } else if (CodeWhispererConstants.validStatesForBuildSucceeded.includes(status)) {
+        // still in progress on server side
+        if (transformByQState.isRunning()) {
+            getLogger().warn(
+                'Code Transformation: There is a job currently running (id: %s). Cannot resume another job (id: %s)',
+                transformByQState.getJobId(),
+                jobId
+            )
+            return
+        }
+        transformByQState.setRefreshInProgress(true)
+        const messenger = transformByQState.getChatMessenger()
+        const tabID = ChatSessionManager.Instance.getSession().tabID
+        messenger?.sendJobRefreshInProgressMessage(tabID!, jobId)
+        await vscode.commands.executeCommand('aws.amazonq.transformationHub.updateContent', 'job history') // refreshing the table disables all jobs' refresh buttons while this one is resuming
+
+        // resume job and bring to completion
+        try {
+            status = await resumeJob(jobId, projectName, status)
+        } catch (error) {
+            getLogger().error('Code Transformation: Error resuming job (id: %s): %s', jobId, (error as Error).message)
+            transformByQState.setJobDefaults()
+            messenger?.sendJobFinishedMessage(tabID!, CodeWhispererConstants.refreshErrorChatMessage)
+            void vscode.window.showErrorMessage(CodeWhispererConstants.refreshErrorNotification(jobId))
+            await vscode.commands.executeCommand('aws.amazonq.transformationHub.updateContent', 'job history')
+            return
+        }
+
+        // download artifacts if available
+        if (
+            CodeWhispererConstants.validStatesForCheckingDownloadUrl.includes(status) &&
+            !CodeWhispererConstants.failureStates.includes(status)
+        ) {
+            duration = convertToTimeString(Date.now() - new Date(transformByQState.getStartTime()).getTime())
+            jobHistoryPath = await retrieveArtifacts(jobId, projectName)
+        }
+
+        // reset state
+        transformByQState.setJobDefaults()
+        messenger?.sendJobFinishedMessage(tabID!, CodeWhispererConstants.refreshCompletedChatMessage)
+    } else {
+        // FAILED or STOPPED job
+        getLogger().info('Code Transformation: No artifacts available to download (job status = %s)', status)
+        if (status === 'FAILED') {
+            // if job failed on backend, mark it to disable the refresh button
+            status = 'FAILED_BE' // this will be truncated to just 'FAILED' in the table
+        }
+        await cleanupTempJobFiles(path.join(os.homedir(), '.aws', 'transform', projectName, jobId), status)
+    }
+
+    if (status === currentStatus && !jobHistoryPath) {
+        // no changes, no need to update file/table
+        void vscode.window.showInformationMessage(CodeWhispererConstants.refreshNoUpdatesNotification(jobId))
+        return
+    }
+
+    void vscode.window.showInformationMessage(CodeWhispererConstants.refreshCompletedNotification(jobId))
+    // update local file and history table
+
+    await updateHistoryFile(status, duration, jobHistoryPath, jobId)
+}
+
+async function retrieveArtifacts(jobId: string, projectName: string) {
+    const resultsPath = path.join(os.homedir(), '.aws', 'transform', projectName, 'results') // temporary directory for extraction
+    let jobHistoryPath = path.join(os.homedir(), '.aws', 'transform', projectName, jobId)
+
+    if (await fs.existsFile(path.join(jobHistoryPath, 'diff.patch'))) {
+        getLogger().info('Code Transformation: Diff patch already exists for job id: %s', jobId)
+        jobHistoryPath = ''
+    } else {
+        try {
+            await downloadAndExtractResultArchive(jobId, resultsPath)
+            await copyArtifacts(resultsPath, jobHistoryPath)
+        } catch (error) {
+            jobHistoryPath = ''
+        } finally {
+            // delete temporary extraction directory
+            await fs.delete(resultsPath, { recursive: true, force: true })
+        }
+    }
+    return jobHistoryPath
+}
+
+async function updateHistoryFile(status: string, duration: string, jobHistoryPath: string, jobId: string) {
+    const history: string[][] = []
+    const historyLogFilePath = path.join(os.homedir(), '.aws', 'transform', 'transformation_history.tsv')
+    if (await fs.existsFile(historyLogFilePath)) {
+        const historyFile = await fs.readFileText(historyLogFilePath)
+        const jobs = historyFile.split('\n')
+        jobs.shift() // removes headers
+        if (jobs.length > 0) {
+            for (const job of jobs) {
+                if (job) {
+                    const jobInfo = job.split('\t')
+                    // 0: startTime, 1: projectName, 2: status, 3: duration, 4: diffPath, 5: summaryPath, 6: jobId
+                    // 7: transformationType, 8: sourceJDKVersion, 9: targetJDKVersion, 10: customDependencyVersionFilePath, 11: customBuildCommand
+                    if (jobInfo[6] === jobId) {
+                        // update any values if applicable
+                        jobInfo[2] = status
+                        if (duration) {
+                            jobInfo[3] = duration
+                        }
+                        if (jobHistoryPath) {
+                            jobInfo[4] = path.join(jobHistoryPath, 'diff.patch')
+                            jobInfo[5] = path.join(jobHistoryPath, 'summary', 'summary.md')
+                        }
+                    }
+                    history.push(jobInfo)
+                }
+            }
+        }
+    }
+
+    if (history.length === 0) {
+        return
+    }
+
+    // rewrite file
+    await fs.writeFile(
+        historyLogFilePath,
+        'date\tproject_name\tstatus\tduration\tdiff_patch\tsummary\tjob_id\ttransformation_type\tsource_jdk_version\ttarget_jdk_version\tcustom_dependency_version_file_path\tcustom_build_command\n'
+    )
+    const tsvContent = history.map((row) => row.join('\t')).join('\n') + '\n'
+    await fs.appendFile(historyLogFilePath, tsvContent)
+
+    // update table content
+    await vscode.commands.executeCommand('aws.amazonq.transformationHub.updateContent', 'job history', undefined, true)
+}
+
+async function resumeJob(jobId: string, projectName: string, status: string) {
+    // set state to prepare to resume job
+    await setupTransformationState(jobId, projectName, status)
+    // resume polling the job
+    return await pollAndCompleteTransformation(jobId)
+}
+
+async function setupTransformationState(jobId: string, projectName: string, status: string) {
+    transformByQState.setJobId(jobId)
+    transformByQState.setPolledJobStatus(status)
+    transformByQState.setJobHistoryPath(path.join(os.homedir(), '.aws', 'transform', projectName, jobId))
+
+    const metadata: JobMetadata = JSON.parse(
+        await fs.readFileText(path.join(transformByQState.getJobHistoryPath(), 'metadata.json'))
+    )
+    transformByQState.setTransformationType(metadata.transformationType)
+    transformByQState.setSourceJDKVersion(metadata.sourceJDKVersion)
+    transformByQState.setTargetJDKVersion(metadata.targetJDKVersion)
+    transformByQState.setCustomDependencyVersionFilePath(metadata.customDependencyVersionFilePath)
+    transformByQState.setPayloadFilePath(
+        path.join(os.homedir(), '.aws', 'transform', projectName, jobId, 'zipped-code.zip')
+    )
+    setMaven()
+    transformByQState.setCustomBuildCommand(metadata.customBuildCommand)
+    transformByQState.setTargetJavaHome(metadata.targetJavaHome)
+    transformByQState.setProjectPath(metadata.projectPath)
+    transformByQState.setStartTime(metadata.startTime)
+}
+
+async function pollAndCompleteTransformation(jobId: string) {
+    const status = await pollTransformationJob(
+        jobId,
+        CodeWhispererConstants.validStatesForCheckingDownloadUrl,
+        AuthUtil.instance.regionProfileManager.activeRegionProfile
+    )
+    await cleanupTempJobFiles(transformByQState.getJobHistoryPath(), status, transformByQState.getPayloadFilePath())
+    return status
+}
diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformationHubViewProvider.ts b/packages/core/src/codewhisperer/service/transformByQ/transformationHubViewProvider.ts
new file mode 100644
index 00000000000..97e69570c76
--- /dev/null
+++ b/packages/core/src/codewhisperer/service/transformByQ/transformationHubViewProvider.ts
@@ -0,0 +1,675 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import globals from '../../../shared/extensionGlobals'
+import * as CodeWhispererConstants from '../../models/constants'
+import {
+    StepProgress,
+    TransformationType,
+    jobPlanProgress,
+    sessionJobHistory,
+    transformByQState,
+} from '../../models/model'
+import { getLogger } from '../../../shared/logger/logger'
+import { getTransformationSteps } from './transformApiHandler'
+import {
+    TransformationSteps,
+    ProgressUpdates,
+    TransformationStatus,
+} from '../../../codewhisperer/client/codewhispereruserclient'
+import { startInterval } from '../../commands/startTransformByQ'
+import { CodeTransformTelemetryState } from '../../../amazonqGumby/telemetry/codeTransformTelemetryState'
+import { convertToTimeString } from '../../../shared/datetime'
+import { AuthUtil } from '../../util/authUtil'
+import { refreshJob, readHistoryFile, HistoryObject } from './transformationHistoryHandler'
+
+export class TransformationHubViewProvider implements vscode.WebviewViewProvider {
+    public static readonly viewType = 'aws.amazonq.transformationHub'
+    private _view?: vscode.WebviewView
+    private lastClickedButton: string = ''
+    private _extensionUri: vscode.Uri = globals.context.extensionUri
+    private transformationHistory: HistoryObject[] = []
+    constructor() {}
+    static #instance: TransformationHubViewProvider
+
+    public async updateContent(
+        button: 'job history' | 'plan progress',
+        startTime: number = CodeTransformTelemetryState.instance.getStartTime(),
+        historyFileUpdated?: boolean
+    ) {
+        this.lastClickedButton = button
+        if (historyFileUpdated) {
+            this.transformationHistory = await readHistoryFile()
+        }
+        if (this._view) {
+            if (this.lastClickedButton === 'job history') {
+                clearInterval(transformByQState.getIntervalId())
+                transformByQState.setIntervalId(undefined)
+                this._view!.webview.html = this.showJobHistory()
+            } else {
+                if (transformByQState.getIntervalId() === undefined && transformByQState.isRunning()) {
+                    startInterval()
+                }
+                await this.showPlanProgress(startTime)
+                    .then((jobPlanProgress) => {
+                        this._view!.webview.html = jobPlanProgress
+                    })
+                    .catch((e) => {
+                        getLogger().error('showPlanProgress failed: %s', (e as Error).message)
+                    })
+            }
+        }
+    }
+
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+
+    public async resolveWebviewView(
+        webviewView: vscode.WebviewView,
+        context: vscode.WebviewViewResolveContext<unknown>,
+        token: vscode.CancellationToken
+    ) {
+        this._view = webviewView
+
+        this._view.webview.onDidReceiveMessage((message) => {
+            switch (message.command) {
+                case 'refreshJob':
+                    void refreshJob(message.jobId, message.currentStatus, message.projectName)
+                    break
+                case 'openSummaryPreview':
+                    void vscode.commands.executeCommand('markdown.showPreview', vscode.Uri.file(message.filePath))
+                    break
+                case 'openDiffFile':
+                    void vscode.commands.executeCommand('vscode.open', vscode.Uri.file(message.filePath))
+                    break
+            }
+        })
+
+        this._view.webview.options = {
+            enableScripts: true,
+            localResourceRoots: [this._extensionUri],
+        }
+
+        this.transformationHistory = await readHistoryFile()
+        if (this.lastClickedButton === 'job history') {
+            this._view!.webview.html = this.showJobHistory()
+        } else {
+            this.showPlanProgress(globals.clock.Date.now())
+                .then((jobPlanProgress) => {
+                    this._view!.webview.html = jobPlanProgress
+                })
+                .catch((e) => {
+                    getLogger().error('showPlanProgress failed: %s', (e as Error).message)
+                })
+        }
+    }
+
+    private showJobHistory(): string {
+        const jobsToDisplay: HistoryObject[] = [...this.transformationHistory]
+        if (transformByQState.isRunning()) {
+            const current = sessionJobHistory[transformByQState.getJobId()]
+            jobsToDisplay.unshift({
+                startTime: current.startTime,
+                projectName: current.projectName,
+                status: current.status,
+                duration: current.duration,
+                diffPath: '',
+                summaryPath: '',
+                jobId: transformByQState.getJobId(),
+                transformationType: current.transformationType,
+                sourceJDKVersion: current.sourceJDKVersion,
+                targetJDKVersion: current.targetJDKVersion,
+                customDependencyVersionFilePath: current.customDependencyVersionsFilePath,
+                customBuildCommand: current.customBuildCommand,
+            })
+        }
+        return `<!DOCTYPE html>
+            <html lang="en">
+            <head>
+            <title>Transformation Hub</title>
+            <style>
+                td, th {
+                    padding: 10px;
+                }
+            </style>
+            </head>
+            <body>
+            <p><b>Transformation History</b></p>
+            <p>${CodeWhispererConstants.transformationHistoryTableDescription}</p>
+            ${
+                jobsToDisplay.length === 0
+                    ? `<p><br>${CodeWhispererConstants.noJobHistoryMessage}</p>`
+                    : this.getTableMarkup(jobsToDisplay)
+            }
+            <script>
+                const vscode = acquireVsCodeApi();
+                
+                document.addEventListener('click', (event) => {
+                    if (event.target.classList.contains('refresh-btn')) {
+                        const jobId = event.target.getAttribute('row-id');
+                        const projectName = event.target.getAttribute('proj-name');
+                        const status = event.target.getAttribute('status');
+                        vscode.postMessage({
+                            command: 'refreshJob',
+                            jobId: jobId,
+                            projectName: projectName,
+                            currentStatus: status
+                        });
+                    }
+
+                    if (event.target.classList.contains('summary-link')) {
+                        event.preventDefault();
+                        const summaryPath = event.target.getAttribute('summary-path');
+                        vscode.postMessage({
+                            command: 'openSummaryPreview',
+                            filePath: summaryPath
+                        });
+                    }
+
+                    if (event.target.classList.contains('diff-link')) {
+                        event.preventDefault();
+                        const diffPath = event.target.getAttribute('diff-path');
+                        vscode.postMessage({
+                            command: 'openDiffFile',
+                            filePath: diffPath
+                        });
+                    }
+                });
+            </script>
+            </body>
+            </html>`
+    }
+
+    private getTableMarkup(history: HistoryObject[]) {
+        return `
+            <style>
+            .refresh-btn {
+                border: none;
+                background: none;
+                cursor: pointer;
+                font-size: 16px;
+                color: inherit;
+            }
+            .refresh-btn:disabled {
+                opacity: 0.3;
+                cursor: not-allowed;
+            }
+            td:last-child {
+                text-align: center;
+            }
+            </style>
+            <table border="1" style="border-collapse:collapse">
+                <thead>
+                    <tr>
+                        <th>Date</th>
+                        <th>Project</th>
+                        <th>Status</th>
+                        <th>Duration</th>
+                        <th>Diff Patch</th>
+                        <th>Summary File</th>
+                        <th>Job Id</th>
+                        <th>Refresh Job</th>
+                        <th>Transformation Type</th>
+                        <th>Source JDK Version</th>
+                        <th>Target JDK Version</th>
+                        <th>Custom Dependency Version File Path</th>
+                        <th>Custom Build Command</th>
+                    </tr>
+                </thead>
+                <tbody>
+                ${history
+                    .map(
+                        (job) => `
+                    <tr>
+                        <td>${job.startTime}</td>
+                        <td>${job.projectName}</td>
+                        <td>${job.status === 'FAILED_BE' ? 'FAILED' : job.status}</td>
+                        <td>${job.duration}</td>
+                        <td>${job.diffPath ? `<a href="#" class="diff-link" diff-path="${job.diffPath}">diff.patch</a>` : ''}</td>
+                        <td>${job.summaryPath ? `<a href="#" class="summary-link" summary-path="${job.summaryPath}">summary.md</a>` : ''}</td>
+                        <td>${job.jobId}</td>
+                        <td>
+                            <button 
+                                class="refresh-btn" 
+                                row-id="${job.jobId}"
+                                proj-name="${job.projectName}"
+                                status="${job.status}"
+                                ${
+                                    transformByQState.isRunning() || transformByQState.isRefreshInProgress()
+                                        ? 'disabled title="A job is ongoing"'
+                                        : job.status === 'CANCELLED' ||
+                                            job.status === 'STOPPED' ||
+                                            job.status === 'FAILED_BE'
+                                          ? 'disabled title="Unable to refresh this job"'
+                                          : ''
+                                }
+                                
+                            >
+                                ↻
+                            </button>
+                        </td>
+                        <td>${job.transformationType ?? ''}</td>
+                        <td>${job.sourceJDKVersion ?? ''}</td>
+                        <td>${job.targetJDKVersion ?? ''}</td>
+                        <td>${job.customDependencyVersionFilePath ?? ''}</td>
+                        <td>${job.customBuildCommand ? `mvn ${job.customBuildCommand}` : ''}</td>
+                    </tr>
+                `
+                    )
+                    .join('')}
+                </tbody>
+            </table>
+        `
+    }
+
+    private generateTransformationStepMarkup(
+        name: string,
+        startTime: Date | undefined,
+        endTime: Date | undefined,
+        previousStatus: string,
+        isFirstStep: boolean,
+        isLastStep: boolean,
+        stepProgress: StepProgress,
+        stepId: number,
+        isCurrentlyProcessing: boolean
+    ) {
+        // include check for the previous step not being CREATED, as this means it has finished, so we can display the next step
+        if (startTime && endTime && (isFirstStep || previousStatus !== 'CREATED')) {
+            const stepTime = endTime.toLocaleDateString('en-US', {
+                hour: '2-digit',
+                minute: '2-digit',
+                second: '2-digit',
+            })
+            const stepDuration = convertToTimeString(endTime.getTime() - startTime.getTime())
+            const isAllStepsComplete = isLastStep && (stepProgress === StepProgress.Succeeded || StepProgress.Failed)
+            return `
+                <p class="step ${isAllStepsComplete ? 'active' : ''}" id="step-${stepId}">
+                    ${this.getProgressIconMarkup(stepProgress)} ${name} 
+                    <span id="step-duration">[finished on ${stepTime}] ${stepDuration}</span>
+                </p>`
+        } else if (previousStatus !== 'CREATED' && isCurrentlyProcessing) {
+            return `
+                <p class="step active" id="step-${stepId}")>
+                    ${this.getProgressIconMarkup(stepProgress)} ${name}
+                </p>`
+        } else if (previousStatus !== 'CREATED') {
+            return `
+                <p class="step" id="step-${stepId}")>
+                    ${this.getProgressIconMarkup(stepProgress)} ${name}
+                </p>`
+        }
+    }
+
+    private stepStatusToStepProgress(stepStatus: string, transformFailed: boolean) {
+        if (stepStatus === 'COMPLETED' || stepStatus === 'PARTIALLY_COMPLETED') {
+            return StepProgress.Succeeded
+        } else if (stepStatus === 'STOPPED' || stepStatus === 'FAILED' || transformFailed) {
+            return StepProgress.Failed
+        } else {
+            return StepProgress.Pending
+        }
+    }
+
+    private selectSubstepIcon(status: string) {
+        switch (status) {
+            case 'IN_PROGRESS':
+                // In case transform is cancelled by user, the state transitions to not started after some time.
+                // This may contradict the last result from the API, so need to be handled here.
+                if (transformByQState.isNotStarted()) {
+                    return '<p><span class="status-FAILED"> 𐔧 </span></p>'
+                }
+                return '<p><span class="spinner status-PENDING"> ↻ </span></p>'
+            case 'COMPLETED':
+                return '<p><span class="status-COMPLETED"> ✓ </span></p>'
+            case 'AWAITING_CLIENT_ACTION':
+                return '<p><span class="spinner status-PENDING"> ↻ </span></p>'
+            case 'FAILED':
+            default:
+                return '<p><span class="status-FAILED"> 𐔧 </span></p>'
+        }
+    }
+
+    private generateSubstepMarkup(progressUpdates: ProgressUpdates, stepId: number, stepTitle: string) {
+        const substepParagraphs = []
+        for (const subStep of progressUpdates) {
+            substepParagraphs.push(`
+            <div class="substep-container">
+                <div class="substep-icon">${this.selectSubstepIcon(subStep.status)}</div>
+                <div>
+                    <p>${subStep.name}</p>
+                    ${subStep.description ? `<p class="status-${subStep.status}"> ${subStep.description}</p>` : ''}
+                </div>
+            </div>
+            `)
+        }
+        return `<div class="substep" id="substep-${stepId}">
+        <p><b>${stepTitle}</b></p>
+        ${substepParagraphs.join('\n')}
+        </div>`
+    }
+
+    /**
+     * Generates markup for each step in a transformation plan
+     * @param planSteps The transformation steps of the transformation plan
+     * @param isTransformFailed boolean of if the transform failed during the transformation step
+     * @returns Tuple where first element is the markup for the steps and the second element is the markup of all substeps
+     */
+    private getTransformationStepProgressMarkup(
+        planSteps: TransformationSteps | undefined,
+        isTransformFailed: boolean
+    ) {
+        const steps = []
+        const substeps = []
+        if (planSteps !== undefined) {
+            const stepStatuses = []
+            for (const step of planSteps) {
+                stepStatuses.push(step.status)
+            }
+            let lastPendingStep = undefined
+            for (let i = 0; i < planSteps.length; i++) {
+                const step = planSteps[i]
+                const stepProgress = this.stepStatusToStepProgress(step.status, isTransformFailed)
+                lastPendingStep =
+                    lastPendingStep === undefined && stepProgress === StepProgress.Pending ? i : lastPendingStep
+                const stepMarkup = this.generateTransformationStepMarkup(
+                    step.name,
+                    step.startTime,
+                    step.endTime,
+                    stepStatuses[i - 1],
+                    i === 0,
+                    i === planSteps.length - 1,
+                    stepProgress,
+                    i,
+                    lastPendingStep === i
+                )
+                steps.push(stepMarkup)
+                if (step.progressUpdates) {
+                    substeps.push(this.generateSubstepMarkup(step.progressUpdates, i, step.name))
+                }
+            }
+        }
+
+        return [steps.join(''), substeps.join('\n')]
+    }
+
+    private getLatestGenericStepDetails(currentJobStatus: TransformationStatus) {
+        switch (currentJobStatus) {
+            case 'CREATED':
+            case 'ACCEPTED':
+            case 'STARTED':
+                return CodeWhispererConstants.filesUploadedMessage
+            case 'PREPARING':
+            case 'PREPARED':
+                // for SQL conversions, skip to transformingMessage since we don't build the code
+                return transformByQState.getTransformationType() === TransformationType.SQL_CONVERSION
+                    ? CodeWhispererConstants.transformingMessage
+                    : CodeWhispererConstants.buildingCodeMessage.replace(
+                          'JAVA_VERSION_HERE',
+                          transformByQState.getSourceJDKVersion() ?? ''
+                      )
+            case 'PLANNING':
+            case 'PLANNED':
+                // for SQL conversions, skip to transformingMessage since we don't generate a plan
+                return transformByQState.getTransformationType() === TransformationType.SQL_CONVERSION
+                    ? CodeWhispererConstants.transformingMessage
+                    : CodeWhispererConstants.planningMessage
+            case 'TRANSFORMING':
+            case 'TRANSFORMED':
+            case 'COMPLETED':
+            case 'PARTIALLY_COMPLETED':
+                return CodeWhispererConstants.transformingMessage
+            case 'STOPPING':
+            case 'STOPPED':
+                return CodeWhispererConstants.stoppingJobMessage
+            case 'FAILED':
+            case 'REJECTED':
+                return CodeWhispererConstants.failedStepMessage
+            default:
+                if (transformByQState.isCancelled()) {
+                    return CodeWhispererConstants.stoppingJobMessage
+                } else if (transformByQState.isFailed()) {
+                    return CodeWhispererConstants.failedStepMessage
+                } else if (transformByQState.isRunning()) {
+                    return CodeWhispererConstants.scanningProjectMessage
+                } else if (transformByQState.isPartiallySucceeded() || transformByQState.isSucceeded()) {
+                    return CodeWhispererConstants.jobCompletedMessage // this should never have to be shown since substeps will block the generic details, added for completeness
+                } else {
+                    return CodeWhispererConstants.noOngoingJobMessage
+                }
+        }
+    }
+
+    public async showPlanProgress(startTime: number): Promise<string> {
+        const styleSheet = this._view?.webview.asWebviewUri(
+            vscode.Uri.joinPath(this._extensionUri, 'resources', 'css', 'amazonqTransformationHub.css')
+        )
+        const simpleStep = (icon: string, text: string, isActive: boolean) => {
+            return isActive
+                ? `<p class="simple-step active">${icon} ${text}</p>`
+                : `<p class="simple-step">${icon} ${text}</p>`
+        }
+
+        let planSteps = transformByQState.getPlanSteps()
+        // no plan for SQL conversions
+        if (
+            transformByQState.getTransformationType() !== TransformationType.SQL_CONVERSION &&
+            jobPlanProgress['generatePlan'] === StepProgress.Succeeded &&
+            transformByQState.isRunning()
+        ) {
+            try {
+                planSteps = await getTransformationSteps(
+                    transformByQState.getJobId(),
+                    AuthUtil.instance.regionProfileManager.activeRegionProfile
+                )
+                transformByQState.setPlanSteps(planSteps)
+            } catch (e: any) {
+                // no-op; re-use current plan steps and try again in next polling cycle
+                getLogger().error(
+                    `CodeTransformation: failed to get plan steps to show updates in transformation hub, continuing transformation; error = %O`,
+                    e
+                )
+            }
+        }
+        let progressHtml
+        // for each step that has succeeded, increment activeStepId by 1
+        let activeStepId = [
+            jobPlanProgress.uploadCode,
+            jobPlanProgress.buildCode,
+            jobPlanProgress.generatePlan,
+            jobPlanProgress.transformCode,
+        ]
+            .map((it) => (it === StepProgress.Succeeded ? 1 : 0) as number)
+            .reduce((prev, current) => prev + current)
+        // When we receive plan step details, we want those to be active -> increment activeStepId
+        activeStepId += planSteps === undefined || planSteps.length === 0 ? 0 : 1
+
+        if (jobPlanProgress['transformCode'] !== StepProgress.NotStarted) {
+            const waitingMarkup = simpleStep(
+                this.getProgressIconMarkup(jobPlanProgress['uploadCode']),
+                CodeWhispererConstants.uploadingCodeStepMessage,
+                activeStepId === 0
+            )
+            const buildMarkup =
+                activeStepId >= 1 && transformByQState.getTransformationType() !== TransformationType.SQL_CONVERSION // for SQL conversions, don't show buildCode step
+                    ? simpleStep(
+                          this.getProgressIconMarkup(jobPlanProgress['buildCode']),
+                          CodeWhispererConstants.buildCodeStepMessage,
+                          activeStepId === 1
+                      )
+                    : ''
+            const planMarkup =
+                activeStepId >= 2 && transformByQState.getTransformationType() !== TransformationType.SQL_CONVERSION // for SQL conversions, don't show generatePlan step
+                    ? simpleStep(
+                          this.getProgressIconMarkup(jobPlanProgress['generatePlan']),
+                          CodeWhispererConstants.generatePlanStepMessage,
+                          activeStepId === 2
+                      )
+                    : ''
+            const transformMarkup =
+                activeStepId >= 3
+                    ? simpleStep(
+                          this.getProgressIconMarkup(jobPlanProgress['transformCode']),
+                          CodeWhispererConstants.transformStepMessage,
+                          activeStepId === 3
+                      )
+                    : ''
+
+            const isTransformFailed = jobPlanProgress['transformCode'] === StepProgress.Failed
+            const progress = this.getTransformationStepProgressMarkup(planSteps, isTransformFailed)
+            const latestGenericStepDetails = this.getLatestGenericStepDetails(transformByQState.getPolledJobStatus())
+            const jobId = transformByQState.getJobId()
+            progressHtml = `
+            <div id="progress" class="column">
+                <p><b>Transformation Progress</b> <span id="runningTime"></span></p>
+                <p>${jobId ? `Job ID: ${jobId}` : ''}</p>
+                ${waitingMarkup}
+                ${buildMarkup}
+                ${planMarkup}
+                ${transformMarkup}
+                ${progress[0]}
+            </div>
+            <div id="stepdetails" class="column">
+                <div class="substep center ${
+                    transformByQState.isNotStarted() ? 'blocked' : ''
+                }" id="generic-step-details">
+                    <div class="column--container">
+                        <div class="center-flex substep-icon"><p class="center-flex"><span class="spinner status-PENDING"> ↻ </span></p></div>
+                        <div><p>${latestGenericStepDetails}</p></div>
+                    </div>
+                </div>
+                ${progress[1]}
+            </div>
+            `
+        } else {
+            progressHtml = `
+            <div id="progress" class="column">
+                <p><b>Transformation Progress</b></p>
+                <p>No job ongoing</p>
+            </div>`
+        }
+        return `<!DOCTYPE html>
+            <html lang="en">
+            
+            <head>
+                <title>Transformation Hub</title>
+                <link href="${styleSheet}" rel="stylesheet">
+            </head>
+            <body>
+            <div class="wrapper">
+                <div style="flex:1; overflow: auto;">
+                    <div class="column--container">
+                        ${progressHtml}
+                    </div>
+                </div>
+            </div>
+            <script>
+                let intervalId = undefined;
+                let runningTime = "";
+
+                function updateTimer() {
+                    if (${transformByQState.isRunning()}) {
+                        runningTime = convertToTimeString(Date.now() - ${startTime});
+                        document.getElementById("runningTime").textContent = "Time elapsed: " + runningTime;
+                    } else {
+                        clearInterval(intervalId);
+                    }
+                }
+
+                // copied from textUtilities.ts
+                function convertToTimeString(durationInMs) {
+                    const time = new Date(durationInMs);
+                    const hours = time.getUTCHours();
+                    const minutes = time.getUTCMinutes();
+                    const seconds = time.getUTCSeconds();
+                    let timeString = seconds + " sec"
+                    if (minutes > 0) {
+                        timeString = minutes + " min " + timeString
+                    }
+                    if (hours > 0) {
+                        timeString = hours + " hr " + timeString
+                    }
+                    return timeString
+                }
+
+                function clearActiveSteps(){
+                    const activeSteps = document.querySelectorAll(".active")
+                    for(const step of activeSteps){
+                        step.classList.remove("active")
+                    }
+                }
+
+                function showStepDetails(item) {
+                    const visibleSubSteps = document.querySelectorAll(".visible");
+                    const substep = document.getElementById(item.id.replace("step-", "substep-"))
+                    clearActiveSteps()
+                    for(const visibleSubStep of visibleSubSteps){                
+                        visibleSubStep.classList.remove("visible")
+                        document.getElementById(visibleSubStep.id.replace("substep-", "step-")).classList.remove("active")
+                    }
+                    
+                    substep.classList.add("visible")
+                    item.classList.add("active")
+                    document.getElementById("generic-step-details").classList.add("blocked")
+                }
+
+                function handleSimpleStepClicked(item) {  
+                    clearActiveSteps()
+                    item.classList.add("active")
+                    if(document.getElementById("generic-step-details").classList.contains("blocked")){
+                        return
+                    }
+                    document.getElementById("generic-step-details").classList.add("visible")
+                }
+
+
+                function addShowSubstepEventListeners() {
+                    const steps = document.getElementsByClassName("step");
+                    for(const item of steps) {
+                        item.addEventListener("click", (event) => {
+                            showStepDetails(item)
+                        })
+                    }
+                }
+
+                function addHighlightStepWithoutSubstepListeners() {
+                    const steps = document.getElementsByClassName("simple-step");
+                    for(const item of steps) {
+                        item.addEventListener("click", (event) => {
+                            handleSimpleStepClicked(item)
+                        })
+                    }
+                }
+
+                function showCurrentActiveSubstep() {
+                    const activeStep = document.getElementsByClassName("active")[0]
+                    if(activeStep && activeStep.classList.contains("step")){
+                        showStepDetails(activeStep)
+                    } else if(activeStep && activeStep.classList.contains("simple-step")){
+                        handleSimpleStepClicked(activeStep)
+                    }
+                }
+
+                intervalId = setInterval(updateTimer, 1000);
+                addShowSubstepEventListeners();
+                addHighlightStepWithoutSubstepListeners();
+                showCurrentActiveSubstep();
+                updateTimer()
+            </script>
+            </body>
+            </html>`
+    }
+
+    private getProgressIconMarkup(stepStatus: StepProgress) {
+        if (stepStatus === StepProgress.Succeeded) {
+            return `<span class="status-COMPLETED"> ✓ </span>`
+        } else if (stepStatus === StepProgress.Pending) {
+            return `<span class="spinner status-PENDING"> ↻ </span>`
+        } else {
+            return `<span class="status-PENDING"> ✓ </span>`
+        }
+    }
+}
diff --git a/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts b/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts
new file mode 100644
index 00000000000..68d11b800fc
--- /dev/null
+++ b/packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts
@@ -0,0 +1,536 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import AdmZip from 'adm-zip'
+import os from 'os'
+import fs from 'fs' // eslint-disable-line no-restricted-imports
+import { parsePatch, applyPatches, ParsedDiff } from 'diff'
+import path from 'path'
+import vscode from 'vscode'
+import { ExportIntent } from '@amzn/codewhisperer-streaming'
+import { TransformByQReviewStatus, transformByQState, TransformationType } from '../../models/model'
+import { ExportResultArchiveStructure, downloadExportResultArchive } from '../../../shared/utilities/download'
+import { getLogger } from '../../../shared/logger/logger'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { CodeTransformTelemetryState } from '../../../amazonqGumby/telemetry/codeTransformTelemetryState'
+import * as CodeWhispererConstants from '../../models/constants'
+import { createCodeWhispererChatStreamingClient } from '../../../shared/clients/codewhispererChatClient'
+import { ChatSessionManager } from '../../../amazonqGumby/chat/storages/chatSession'
+import { setContext } from '../../../shared/vscode/setContext'
+import * as codeWhisperer from '../../client/codewhisperer'
+import { UserWrittenCodeTracker } from '../../tracker/userWrittenCodeTracker'
+import { AuthUtil } from '../../util/authUtil'
+import { copyArtifacts } from './transformFileHandler'
+
+export abstract class ProposedChangeNode {
+    abstract readonly resourcePath: string
+
+    abstract generateCommand(): vscode.Command
+    abstract generateDescription(): string
+    abstract saveFile(): void
+
+    public saveChange(): void {
+        try {
+            this.saveFile()
+        } catch (err) {
+            // to do: file system-related error handling
+            if (err instanceof Error) {
+                getLogger().error(err.message)
+            }
+        }
+    }
+
+    reviewState: ReviewState = ReviewState.ToReview
+}
+
+export class ModifiedChangeNode extends ProposedChangeNode {
+    readonly originalPath: string
+    readonly tmpChangedPath: string
+    override resourcePath: string
+
+    constructor(originalPath: string, tmpChangedPath: string) {
+        super()
+        this.originalPath = originalPath
+        this.tmpChangedPath = tmpChangedPath
+
+        this.resourcePath = tmpChangedPath
+    }
+
+    override generateCommand(): vscode.Command {
+        return {
+            command: 'vscode.diff',
+            arguments: [vscode.Uri.file(this.originalPath), vscode.Uri.file(this.tmpChangedPath)],
+            title: `${path.basename(this.originalPath)}: Original <-> ${path.basename(this.tmpChangedPath)}`,
+        }
+    }
+    override generateDescription(): string {
+        return 'M'
+    }
+
+    override saveFile(): void {
+        fs.copyFileSync(this.tmpChangedPath, this.originalPath)
+    }
+}
+
+export class AddedChangeNode extends ProposedChangeNode {
+    readonly pathToTmpFile: string
+    readonly pathToWorkspaceFile: string
+
+    override resourcePath: string
+
+    constructor(pathToWorkspaceFile: string, pathToTmpFile: string) {
+        super()
+        this.pathToWorkspaceFile = pathToWorkspaceFile
+        this.pathToTmpFile = pathToTmpFile
+
+        this.resourcePath = pathToTmpFile
+    }
+
+    override generateCommand(): vscode.Command {
+        return {
+            command: 'vscode.open',
+            arguments: [vscode.Uri.file(this.pathToTmpFile)],
+            title: 'Added Change',
+        }
+    }
+    override generateDescription(): string {
+        return 'A'
+    }
+
+    override saveFile(): void {
+        // create parent directory before copying files (ex. for the summary/ and assets/ folders)
+        const parentDir = path.dirname(this.pathToWorkspaceFile)
+        if (!fs.existsSync(parentDir)) {
+            fs.mkdirSync(parentDir, { recursive: true })
+        }
+        fs.copyFileSync(this.pathToTmpFile, this.pathToWorkspaceFile)
+    }
+}
+
+export class PatchFileNode {
+    label: string
+    readonly patchFilePath: string
+    children: ProposedChangeNode[] = []
+
+    constructor(patchFilePath: string) {
+        this.patchFilePath = patchFilePath
+        this.label = path.basename(patchFilePath)
+    }
+}
+
+enum ReviewState {
+    ToReview,
+    Reviewed_Accepted,
+    Reviewed_Rejected,
+}
+
+export class DiffModel {
+    patchFileNodes: PatchFileNode[] = []
+    currentPatchIndex: number = 0
+
+    /**
+     * This function creates a copy of the changed files of the user's project so that the diff.patch can be applied to them
+     * @param pathToWorkspace Path to the project that was transformed
+     * @param changedFiles List of files that were changed
+     * @returns Path to the folder containing the copied files
+     */
+    public copyProject(pathToWorkspace: string, changedFiles: ParsedDiff[]) {
+        const pathToTmpSrcDir = path.join(os.tmpdir(), `project-copy-${Date.now()}`)
+        fs.mkdirSync(pathToTmpSrcDir)
+        for (const file of changedFiles) {
+            const pathToTmpFile = path.join(pathToTmpSrcDir, file.oldFileName!.substring(2))
+            // use mkdirsSync to create parent directories in pathToTmpFile too
+            fs.mkdirSync(path.dirname(pathToTmpFile), { recursive: true })
+            const pathToOldFile = path.join(pathToWorkspace, file.oldFileName!.substring(2))
+            // pathToOldFile will not exist for new files such as summary.md
+            if (fs.existsSync(pathToOldFile)) {
+                fs.copyFileSync(pathToOldFile, pathToTmpFile)
+            }
+        }
+        return pathToTmpSrcDir
+    }
+
+    /**
+     * @param pathToDiff Path to the diff.patch file expected to be located in the archive returned by ExportResultsArchive
+     * @param pathToWorkspace Path to the project that was transformed
+     * @returns List of nodes containing the paths of files that were modified, added, or removed
+     */
+    public parseDiff(pathToDiff: string, pathToWorkspace: string, isIntermediateBuild: boolean = false): PatchFileNode {
+        this.patchFileNodes = []
+        const diffContents = fs.readFileSync(pathToDiff, 'utf8')
+
+        if (!diffContents.trim()) {
+            getLogger().error(`CodeTransformation: diff.patch file is empty`)
+            throw new Error(CodeWhispererConstants.noChangesMadeMessage)
+        }
+
+        getLogger().info(`CodeTransformation: parsing patch file at ${pathToDiff}`)
+
+        let changedFiles = parsePatch(diffContents)
+        // exclude dependency_upgrade.yml from patch application
+        changedFiles = changedFiles.filter((file) => !file.oldFileName?.includes('dependency_upgrade'))
+        getLogger().info('CodeTransformation: parsed patch file successfully')
+        // if doing intermediate client-side build, pathToWorkspace is the path to the unzipped project's 'sources' directory (re-using upload ZIP)
+        // otherwise, we are at the very end of the transformation and need to copy the changed files in the project to show the diff(s)
+        const pathToTmpSrcDir = isIntermediateBuild ? pathToWorkspace : this.copyProject(pathToWorkspace, changedFiles)
+        transformByQState.setProjectCopyFilePath(pathToTmpSrcDir)
+
+        applyPatches(changedFiles, {
+            loadFile: function (fileObj, callback) {
+                // load original contents of file
+                const filePath = path.join(pathToWorkspace, fileObj.oldFileName!.substring(2))
+                if (!fs.existsSync(filePath)) {
+                    // must be a new file (ex. summary.md), so pass empty string as original contents and do not pass error
+                    callback(undefined, '')
+                } else {
+                    // must be a modified file (most common), so pass original contents
+                    const fileContents = fs.readFileSync(filePath, 'utf-8')
+                    callback(undefined, fileContents)
+                }
+            },
+            // by now, 'content' contains the changes from the patch
+            patched: function (fileObj, content, callback) {
+                const filePath = path.join(pathToTmpSrcDir, fileObj.newFileName!.substring(2))
+                // write changed contents to the copy of the original file (or create a new file)
+                fs.writeFileSync(filePath, content)
+                callback(undefined)
+            },
+            complete: function (err) {
+                if (err) {
+                    getLogger().error(`CodeTransformation: ${err} when applying patch`)
+                } else {
+                    getLogger().info('CodeTransformation: Patch applied successfully')
+                }
+            },
+        })
+        const patchFileNode = new PatchFileNode(pathToDiff)
+        patchFileNode.children = changedFiles.flatMap((file) => {
+            /* ex. file.oldFileName = 'a/src/java/com/project/component/MyFile.java'
+             * ex. file.newFileName = 'b/src/java/com/project/component/MyFile.java'
+             * use substring(2) to ignore the 'a/' and 'b/'
+             */
+            const originalPath = path.join(pathToWorkspace, file.oldFileName!.substring(2))
+            const tmpChangedPath = path.join(pathToTmpSrcDir, file.newFileName!.substring(2))
+
+            const originalFileExists = fs.existsSync(originalPath)
+            const changedFileExists = fs.existsSync(tmpChangedPath)
+
+            if (originalFileExists && changedFileExists) {
+                return new ModifiedChangeNode(originalPath, tmpChangedPath)
+            } else if (!originalFileExists && changedFileExists) {
+                return new AddedChangeNode(originalPath, tmpChangedPath)
+            }
+            return []
+        })
+        this.patchFileNodes.push(patchFileNode)
+        return patchFileNode
+    }
+
+    public getChanges() {
+        return this.patchFileNodes.flatMap((patchFileNode) => patchFileNode.children)
+    }
+
+    public getRoot() {
+        return this.patchFileNodes.length > 0 ? this.patchFileNodes[0] : undefined
+    }
+
+    public saveChanges() {
+        for (const patchFileNode of this.patchFileNodes) {
+            for (const changeNode of patchFileNode.children) {
+                changeNode.saveChange()
+            }
+        }
+    }
+
+    public rejectChanges() {
+        this.clearChanges()
+    }
+
+    public clearChanges() {
+        this.patchFileNodes = []
+        this.currentPatchIndex = 0
+    }
+}
+
+export class TransformationResultsProvider implements vscode.TreeDataProvider<ProposedChangeNode | PatchFileNode> {
+    public static readonly viewType = 'aws.amazonq.transformationProposedChangesTree'
+
+    private _onDidChangeTreeData: vscode.EventEmitter<any> = new vscode.EventEmitter<any>()
+    readonly onDidChangeTreeData: vscode.Event<any> = this._onDidChangeTreeData.event
+
+    constructor(private readonly model: DiffModel) {}
+
+    public refresh(): any {
+        this._onDidChangeTreeData.fire(undefined)
+    }
+
+    public getTreeItem(element: ProposedChangeNode | PatchFileNode): vscode.TreeItem {
+        if (element instanceof PatchFileNode) {
+            return {
+                label: element.label,
+                collapsibleState: vscode.TreeItemCollapsibleState.Expanded,
+            }
+        } else {
+            return {
+                resourceUri: vscode.Uri.file(element.resourcePath),
+                command: element.generateCommand(),
+                description: element.generateDescription(),
+            }
+        }
+    }
+
+    /*
+    Here we check if the element is a PatchFileNode instance. If it is, we return its 
+    children array, which contains ProposedChangeNode instances. This ensures that when the user expands a 
+    PatchFileNode (representing a diff.patch file), its children (proposed change nodes) are displayed as indented nodes under it.
+    */
+    public getChildren(
+        element?: ProposedChangeNode | PatchFileNode
+    ): (ProposedChangeNode | PatchFileNode)[] | Thenable<(ProposedChangeNode | PatchFileNode)[]> {
+        if (!element) {
+            return this.model.patchFileNodes
+        } else if (element instanceof PatchFileNode) {
+            return element.children
+        } else {
+            return Promise.resolve([])
+        }
+    }
+
+    public getParent(element: ProposedChangeNode | PatchFileNode): PatchFileNode | undefined {
+        if (element instanceof ProposedChangeNode) {
+            const patchFileNode = this.model.patchFileNodes.find((p) => p.children.includes(element))
+            return patchFileNode
+        }
+        return undefined
+    }
+}
+
+export class ProposedTransformationExplorer {
+    private changeViewer: vscode.TreeView<PatchFileNode>
+
+    public static TmpDir = os.tmpdir()
+
+    constructor(context: vscode.ExtensionContext) {
+        const diffModel = new DiffModel()
+        const transformDataProvider = new TransformationResultsProvider(diffModel)
+        this.changeViewer = vscode.window.createTreeView(TransformationResultsProvider.viewType, {
+            treeDataProvider: transformDataProvider,
+        })
+
+        let patchFiles: string[] = []
+        let singlePatchFile: string = ''
+
+        const reset = async () => {
+            await setContext('gumby.transformationProposalReviewInProgress', false)
+            await setContext('gumby.reviewState', TransformByQReviewStatus.NotStarted)
+
+            // delete result archive after changes cleared; summary is under ResultArchiveFilePath
+            if (fs.existsSync(transformByQState.getResultArchiveFilePath())) {
+                fs.rmSync(transformByQState.getResultArchiveFilePath(), { recursive: true, force: true })
+            }
+            if (fs.existsSync(transformByQState.getProjectCopyFilePath())) {
+                fs.rmSync(transformByQState.getProjectCopyFilePath(), { recursive: true, force: true })
+            }
+
+            diffModel.clearChanges()
+            // update summary path to where it is locally after user accepts changes, so that View Summary button works
+            transformByQState.setSummaryFilePath(
+                path.join(transformByQState.getProjectPath(), ExportResultArchiveStructure.PathToSummary)
+            )
+            transformByQState.setProjectCopyFilePath('')
+            transformByQState.setResultArchiveFilePath('')
+            transformDataProvider.refresh()
+        }
+
+        vscode.commands.registerCommand('aws.amazonq.transformationHub.reviewChanges.refresh', () =>
+            transformDataProvider.refresh()
+        )
+
+        vscode.commands.registerCommand('aws.amazonq.transformationHub.reviewChanges.reset', async () => await reset())
+
+        vscode.commands.registerCommand('aws.amazonq.transformationHub.reviewChanges.reveal', async () => {
+            await setContext('gumby.transformationProposalReviewInProgress', true)
+            const root = diffModel.getRoot()
+            if (root) {
+                await this.changeViewer.reveal(root, {
+                    expand: true,
+                })
+            }
+        })
+
+        vscode.commands.registerCommand('aws.amazonq.transformationHub.summary.reveal', async () => {
+            if (fs.existsSync(transformByQState.getSummaryFilePath())) {
+                await vscode.commands.executeCommand(
+                    'markdown.showPreview',
+                    vscode.Uri.file(transformByQState.getSummaryFilePath())
+                )
+            }
+        })
+
+        vscode.commands.registerCommand('aws.amazonq.transformationHub.reviewChanges.startReview', async () => {
+            await setContext('gumby.reviewState', TransformByQReviewStatus.PreparingReview)
+
+            const pathToArchive = path.join(
+                ProposedTransformationExplorer.TmpDir,
+                transformByQState.getJobId(),
+                'ExportResultsArchive.zip'
+            )
+            let exportResultsArchiveSize = 0
+            let downloadErrorMessage = undefined
+
+            const cwStreamingClient = await createCodeWhispererChatStreamingClient()
+            try {
+                await telemetry.codeTransform_downloadArtifact.run(async () => {
+                    telemetry.record({
+                        codeTransformArtifactType: 'ClientInstructions',
+                        codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+                        codeTransformJobId: transformByQState.getJobId(),
+                    })
+
+                    await downloadExportResultArchive(
+                        cwStreamingClient,
+                        {
+                            exportId: transformByQState.getJobId(),
+                            exportIntent: ExportIntent.TRANSFORMATION,
+                        },
+                        pathToArchive,
+                        AuthUtil.instance.regionProfileManager.activeRegionProfile
+                    )
+
+                    getLogger().info('CodeTransformation: downloaded results successfully')
+                    // Update downloaded artifact size
+                    exportResultsArchiveSize = (await fs.promises.stat(pathToArchive)).size
+
+                    telemetry.record({ codeTransformTotalByteSize: exportResultsArchiveSize })
+                })
+            } catch (e: any) {
+                // user can retry the download
+                downloadErrorMessage = (e as Error).message
+                if (downloadErrorMessage.includes('Encountered an unexpected error when processing the request')) {
+                    downloadErrorMessage = CodeWhispererConstants.errorDownloadingExpiredDiff
+                }
+                void vscode.window.showErrorMessage(
+                    `${CodeWhispererConstants.errorDownloadingDiffNotification} The download failed due to: ${downloadErrorMessage}`
+                )
+                transformByQState.getChatControllers()?.transformationFinished.fire({
+                    message: `${CodeWhispererConstants.errorDownloadingDiffChatMessage} The download failed due to: ${downloadErrorMessage}`,
+                    tabID: ChatSessionManager.Instance.getSession().tabID,
+                })
+                await setContext('gumby.reviewState', TransformByQReviewStatus.NotStarted)
+                getLogger().error(`CodeTransformation: ExportResultArchive error = ${downloadErrorMessage}`)
+                throw new Error('Error downloading diff')
+            } finally {
+                cwStreamingClient.destroy()
+                UserWrittenCodeTracker.instance.onQFeatureInvoked()
+            }
+
+            let deserializeErrorMessage = undefined
+            let pathContainingArchive = ''
+            patchFiles = [] // reset patchFiles if there was a previous transformation
+
+            try {
+                // Download and deserialize the zip
+                pathContainingArchive = path.dirname(pathToArchive)
+                const zip = new AdmZip(pathToArchive)
+                zip.extractAllTo(pathContainingArchive)
+                const files = fs.readdirSync(path.join(pathContainingArchive, ExportResultArchiveStructure.PathToPatch))
+                singlePatchFile = path.join(pathContainingArchive, ExportResultArchiveStructure.PathToPatch, files[0])
+                patchFiles.push(singlePatchFile)
+                diffModel.parseDiff(patchFiles[0], transformByQState.getProjectPath())
+
+                await setContext('gumby.reviewState', TransformByQReviewStatus.InReview)
+                transformDataProvider.refresh()
+                transformByQState.setSummaryFilePath(
+                    path.join(pathContainingArchive, ExportResultArchiveStructure.PathToSummary)
+                )
+
+                await copyArtifacts(pathContainingArchive, transformByQState.getJobHistoryPath())
+
+                transformByQState.setResultArchiveFilePath(pathContainingArchive)
+                await setContext('gumby.isSummaryAvailable', true)
+
+                // Do not await this so that the summary reveals without user needing to close this notification
+                void vscode.window.showInformationMessage(CodeWhispererConstants.viewProposedChangesNotification)
+                transformByQState.getChatControllers()?.transformationFinished.fire({
+                    message: CodeWhispererConstants.viewProposedChangesChatMessage,
+                    tabID: ChatSessionManager.Instance.getSession().tabID,
+                })
+                await vscode.commands.executeCommand('aws.amazonq.transformationHub.summary.reveal')
+            } catch (e: any) {
+                deserializeErrorMessage = (e as Error).message
+                getLogger().error(`CodeTransformation: ParseDiff error = ${deserializeErrorMessage}`)
+                transformByQState.getChatControllers()?.transformationFinished.fire({
+                    message: `${CodeWhispererConstants.errorDeserializingDiffChatMessage} ${deserializeErrorMessage}`,
+                    tabID: ChatSessionManager.Instance.getSession().tabID,
+                })
+                void vscode.window.showErrorMessage(
+                    `${CodeWhispererConstants.errorDeserializingDiffNotification} ${deserializeErrorMessage}`
+                )
+            }
+
+            try {
+                const metricsPath = path.join(pathContainingArchive, ExportResultArchiveStructure.PathToMetrics)
+                const metricsData = JSON.parse(fs.readFileSync(metricsPath, 'utf8'))
+
+                await codeWhisperer.codeWhispererClient.sendTelemetryEvent({
+                    telemetryEvent: {
+                        transformEvent: {
+                            jobId: transformByQState.getJobId(),
+                            timestamp: new Date(),
+                            ideCategory: 'VSCODE',
+                            programmingLanguage: {
+                                languageName:
+                                    transformByQState.getTransformationType() === TransformationType.LANGUAGE_UPGRADE
+                                        ? 'java'
+                                        : 'sql',
+                            },
+                            linesOfCodeChanged: metricsData.linesOfCodeChanged,
+                            charsOfCodeChanged: metricsData.charactersOfCodeChanged,
+                            linesOfCodeSubmitted: transformByQState.getLinesOfCodeSubmitted(), // currently unavailable for SQL conversions
+                        },
+                    },
+                })
+            } catch (err: any) {
+                // log error, but continue to show user diff.patch with results
+                getLogger().error(`CodeTransformation: SendTelemetryEvent error = ${err.message}`)
+            }
+        })
+
+        vscode.commands.registerCommand('aws.amazonq.transformationHub.reviewChanges.acceptChanges', async () => {
+            telemetry.codeTransform_submitSelection.run(() => {
+                getLogger().info('CodeTransformation: accepted changes')
+                diffModel.saveChanges()
+                telemetry.record({
+                    codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+                    codeTransformJobId: transformByQState.getJobId(),
+                    userChoice: 'acceptChanges',
+                })
+            })
+            void vscode.window.showInformationMessage(CodeWhispererConstants.changesAppliedNotificationOneDiff)
+            transformByQState.getChatControllers()?.transformationFinished.fire({
+                message: CodeWhispererConstants.changesAppliedChatMessageOneDiff,
+                tabID: ChatSessionManager.Instance.getSession().tabID,
+            })
+            // reset after applying the patch
+            await reset()
+        })
+
+        vscode.commands.registerCommand('aws.amazonq.transformationHub.reviewChanges.rejectChanges', async () => {
+            await telemetry.codeTransform_submitSelection.run(async () => {
+                getLogger().info('CodeTransformation: rejected changes')
+                diffModel.rejectChanges()
+                await reset()
+                telemetry.record({
+                    codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
+                    codeTransformJobId: transformByQState.getJobId(),
+                    userChoice: 'rejectChanges',
+                })
+            })
+            transformByQState.getChatControllers()?.transformationFinished.fire({
+                tabID: ChatSessionManager.Instance.getSession().tabID,
+            })
+        })
+    }
+}
diff --git a/packages/core/src/codewhisperer/tracker/codewhispererCodeCoverageTracker.ts b/packages/core/src/codewhisperer/tracker/codewhispererCodeCoverageTracker.ts
new file mode 100644
index 00000000000..0989f022245
--- /dev/null
+++ b/packages/core/src/codewhisperer/tracker/codewhispererCodeCoverageTracker.ts
@@ -0,0 +1,319 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../../shared/logger/logger'
+import * as CodeWhispererConstants from '../models/constants'
+import globals from '../../shared/extensionGlobals'
+import { vsCodeState } from '../models/model'
+import { CodewhispererLanguage, telemetry } from '../../shared/telemetry/telemetry'
+import { runtimeLanguageContext } from '../util/runtimeLanguageContext'
+import { TelemetryHelper } from '../util/telemetryHelper'
+import { AuthUtil } from '../util/authUtil'
+import { getSelectedCustomization } from '../util/customizationUtil'
+import { codeWhispererClient as client } from '../client/codewhisperer'
+import { isAwsError } from '../../shared/errors'
+import { getUnmodifiedAcceptedTokens } from '../util/commonUtil'
+
+interface CodeWhispererToken {
+    range: vscode.Range
+    text: string
+    accepted: number
+}
+
+const autoClosingKeystrokeInputs = ['[]', '{}', '()', '""', "''"]
+
+/**
+ * This singleton class is mainly used for calculating the code written by codeWhisperer
+ * TODO: Remove this tracker, uses user written code tracker instead.
+ * This is kept in codebase for server side backward compatibility until service fully switch to user written code
+ */
+export class CodeWhispererCodeCoverageTracker {
+    private _acceptedTokens: { [key: string]: CodeWhispererToken[] }
+    private _totalTokens: { [key: string]: number }
+    private _timer?: NodeJS.Timer
+    private _startTime: number
+    private _language: CodewhispererLanguage
+    private _serviceInvocationCount: number
+
+    private constructor(language: CodewhispererLanguage) {
+        this._acceptedTokens = {}
+        this._totalTokens = {}
+        this._startTime = 0
+        this._language = language
+        this._serviceInvocationCount = 0
+    }
+
+    public get serviceInvocationCount(): number {
+        return this._serviceInvocationCount
+    }
+
+    public get acceptedTokens(): { [key: string]: CodeWhispererToken[] } {
+        return this._acceptedTokens
+    }
+
+    public get totalTokens(): { [key: string]: number } {
+        return this._totalTokens
+    }
+
+    public isActive(): boolean {
+        return TelemetryHelper.instance.isTelemetryEnabled() && AuthUtil.instance.isConnected()
+    }
+
+    public incrementServiceInvocationCount() {
+        this._serviceInvocationCount += 1
+    }
+
+    public flush() {
+        if (!this.isActive()) {
+            this._totalTokens = {}
+            this._acceptedTokens = {}
+            this.closeTimer()
+            return
+        }
+        try {
+            this.emitCodeWhispererCodeContribution()
+        } catch (error) {
+            getLogger().error(`Encountered ${error} when emitting code contribution metric`)
+        }
+    }
+
+    // TODO: Improve the range tracking of the accepted recommendation
+    // TODO: use the editor of the filename, not the current editor
+    public updateAcceptedTokensCount(editor: vscode.TextEditor) {
+        const filename = editor.document.fileName
+        if (filename in this._acceptedTokens) {
+            for (let i = 0; i < this._acceptedTokens[filename].length; i++) {
+                const oldText = this._acceptedTokens[filename][i].text
+                const newText = editor.document.getText(this._acceptedTokens[filename][i].range)
+                this._acceptedTokens[filename][i].accepted = getUnmodifiedAcceptedTokens(oldText, newText)
+            }
+        }
+    }
+
+    public emitCodeWhispererCodeContribution() {
+        let totalTokens = 0
+        for (const filename in this._totalTokens) {
+            totalTokens += this._totalTokens[filename]
+        }
+        if (vscode.window.activeTextEditor) {
+            this.updateAcceptedTokensCount(vscode.window.activeTextEditor)
+        }
+        // the accepted characters without counting user modification
+        let acceptedTokens = 0
+        // the accepted characters after calculating user modification
+        let unmodifiedAcceptedTokens = 0
+        for (const filename in this._acceptedTokens) {
+            for (const v of this._acceptedTokens[filename]) {
+                if (filename in this._totalTokens && this._totalTokens[filename] >= v.accepted) {
+                    unmodifiedAcceptedTokens += v.accepted
+                    acceptedTokens += v.text.length
+                }
+            }
+        }
+        const percentCount = ((acceptedTokens / totalTokens) * 100).toFixed(2)
+        const percentage = Math.round(parseInt(percentCount))
+        const selectedCustomization = getSelectedCustomization()
+        if (this._serviceInvocationCount <= 0) {
+            getLogger().debug(`Skip emiting code contribution metric`)
+            return
+        }
+        telemetry.codewhisperer_codePercentage.emit({
+            codewhispererTotalTokens: totalTokens,
+            codewhispererLanguage: this._language,
+            codewhispererAcceptedTokens: unmodifiedAcceptedTokens,
+            codewhispererSuggestedTokens: acceptedTokens,
+            codewhispererPercentage: percentage ? percentage : 0,
+            successCount: this._serviceInvocationCount,
+            codewhispererCustomizationArn: selectedCustomization.arn === '' ? undefined : selectedCustomization.arn,
+            credentialStartUrl: AuthUtil.instance.startUrl,
+        })
+
+        client
+            .sendTelemetryEvent({
+                telemetryEvent: {
+                    codeCoverageEvent: {
+                        customizationArn: selectedCustomization.arn === '' ? undefined : selectedCustomization.arn,
+                        programmingLanguage: {
+                            languageName: runtimeLanguageContext.toRuntimeLanguage(this._language),
+                        },
+                        acceptedCharacterCount: acceptedTokens,
+                        unmodifiedAcceptedCharacterCount: unmodifiedAcceptedTokens,
+                        totalCharacterCount: totalTokens,
+                        timestamp: new Date(Date.now()),
+                    },
+                },
+                profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,
+            })
+            .then()
+            .catch((error) => {
+                let requestId: string | undefined
+                if (isAwsError(error)) {
+                    requestId = error.requestId
+                }
+
+                getLogger().debug(
+                    `Failed to sendTelemetryEvent to CodeWhisperer, requestId: ${requestId ?? ''}, message: ${
+                        error.message
+                    }`
+                )
+            })
+    }
+
+    private tryStartTimer() {
+        if (this._timer !== undefined) {
+            return
+        }
+        const currentDate = new globals.clock.Date()
+        this._startTime = currentDate.getTime()
+        this._timer = setTimeout(() => {
+            try {
+                const currentTime = new globals.clock.Date().getTime()
+                const delay: number = CodeWhispererConstants.defaultCheckPeriodMillis
+                const diffTime: number = this._startTime + delay
+                if (diffTime <= currentTime) {
+                    let totalTokens = 0
+                    for (const filename in this._totalTokens) {
+                        totalTokens += this._totalTokens[filename]
+                    }
+                    if (totalTokens > 0) {
+                        this.flush()
+                    } else {
+                        getLogger().debug(
+                            `CodeWhispererCodeCoverageTracker: skipped telemetry due to empty tokens array`
+                        )
+                    }
+                }
+            } catch (e) {
+                getLogger().verbose(`Exception Thrown from CodeWhispererCodeCoverageTracker: ${e}`)
+            } finally {
+                this.resetTracker()
+                this.closeTimer()
+            }
+        }, CodeWhispererConstants.defaultCheckPeriodMillis)
+    }
+
+    private resetTracker() {
+        this._totalTokens = {}
+        this._acceptedTokens = {}
+        this._startTime = 0
+        this._serviceInvocationCount = 0
+    }
+
+    private closeTimer() {
+        if (this._timer !== undefined) {
+            clearTimeout(this._timer)
+            this._timer = undefined
+        }
+    }
+
+    public addAcceptedTokens(filename: string, token: CodeWhispererToken) {
+        if (!(filename in this._acceptedTokens)) {
+            this._acceptedTokens[filename] = []
+        }
+        this._acceptedTokens[filename].push(token)
+    }
+
+    public addTotalTokens(filename: string, count: number) {
+        if (!(filename in this._totalTokens)) {
+            this._totalTokens[filename] = 0
+        }
+        this._totalTokens[filename] += count
+        if (this._totalTokens[filename] < 0) {
+            this._totalTokens[filename] = 0
+        }
+    }
+
+    public countAcceptedTokens(range: vscode.Range, text: string, filename: string) {
+        if (!this.isActive()) {
+            return
+        }
+        // generate accepted recommendation token and stored in collection
+        this.addAcceptedTokens(filename, { range: range, text: text, accepted: text.length })
+        this.addTotalTokens(filename, text.length)
+    }
+
+    // For below 2 edge cases
+    // 1. newline character with indentation
+    // 2. 2 character insertion of closing brackets
+    public getCharacterCountFromComplexEvent(e: vscode.TextDocumentChangeEvent) {
+        function countChanges(cond: boolean, text: string): number {
+            if (!cond) {
+                return 0
+            }
+            if ((text.startsWith('\n') || text.startsWith('\r\n')) && text.trim().length === 0) {
+                return 1
+            }
+            if (autoClosingKeystrokeInputs.includes(text)) {
+                return 2
+            }
+            return 0
+        }
+        if (e.contentChanges.length === 2) {
+            const text1 = e.contentChanges[0].text
+            const text2 = e.contentChanges[1].text
+            const text2Count = countChanges(text1.length === 0, text2)
+            const text1Count = countChanges(text2.length === 0, text1)
+            return text2Count > 0 ? text2Count : text1Count
+        } else if (e.contentChanges.length === 1) {
+            return countChanges(true, e.contentChanges[0].text)
+        }
+        return 0
+    }
+
+    public isFromUserKeystroke(e: vscode.TextDocumentChangeEvent) {
+        return e.contentChanges.length === 1 && e.contentChanges[0].text.length === 1
+    }
+
+    public countTotalTokens(e: vscode.TextDocumentChangeEvent) {
+        // ignore no contentChanges. ignore contentChanges from other plugins (formatters)
+        // only include contentChanges from user keystroke input(one character input).
+        // Also ignore deletion events due to a known issue of tracking deleted CodeWhiperer tokens.
+        if (!runtimeLanguageContext.isLanguageSupported(e.document.languageId) || vsCodeState.isCodeWhispererEditing) {
+            return
+        }
+        // a user keystroke input can be
+        // 1. content change with 1 character insertion
+        // 2. newline character with indentation
+        // 3. 2 character insertion of closing brackets
+        if (this.isFromUserKeystroke(e)) {
+            this.tryStartTimer()
+            this.addTotalTokens(e.document.fileName, 1)
+        } else if (this.getCharacterCountFromComplexEvent(e) !== 0) {
+            this.tryStartTimer()
+            const characterIncrease = this.getCharacterCountFromComplexEvent(e)
+            this.addTotalTokens(e.document.fileName, characterIncrease)
+        }
+        // also include multi character input within 50 characters (not from CWSPR)
+        else if (
+            e.contentChanges.length === 1 &&
+            e.contentChanges[0].text.length > 1 &&
+            TelemetryHelper.instance.lastSuggestionInDisplay !== e.contentChanges[0].text
+        ) {
+            const multiCharInputSize = e.contentChanges[0].text.length
+
+            // select 50 as the cut-off threshold for counting user input.
+            // ignore all white space multi char input, this usually comes from reformat.
+            if (multiCharInputSize < 50 && e.contentChanges[0].text.trim().length > 0) {
+                this.addTotalTokens(e.document.fileName, multiCharInputSize)
+            }
+        }
+    }
+
+    public static readonly instances = new Map<CodewhispererLanguage, CodeWhispererCodeCoverageTracker>()
+
+    public static getTracker(language: string): CodeWhispererCodeCoverageTracker | undefined {
+        if (!runtimeLanguageContext.isLanguageSupported(language)) {
+            return undefined
+        }
+        const cwsprLanguage = runtimeLanguageContext.normalizeLanguage(language)
+        if (!cwsprLanguage) {
+            return undefined
+        }
+        const instance = this.instances.get(cwsprLanguage) ?? new this(cwsprLanguage)
+        this.instances.set(cwsprLanguage, instance)
+        return instance
+    }
+}
diff --git a/packages/core/src/codewhisperer/tracker/codewhispererTracker.ts b/packages/core/src/codewhisperer/tracker/codewhispererTracker.ts
new file mode 100644
index 00000000000..ca19c87505f
--- /dev/null
+++ b/packages/core/src/codewhisperer/tracker/codewhispererTracker.ts
@@ -0,0 +1,238 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import globals from '../../shared/extensionGlobals'
+import { distance } from 'fastest-levenshtein'
+import { AcceptedSuggestionEntry } from '../models/model'
+import { getLogger } from '../../shared/logger/logger'
+import { AmazonqModifyCode, telemetry } from '../../shared/telemetry/telemetry'
+import { AuthUtil } from '../util/authUtil'
+import { InsertedCode } from '../../codewhispererChat/controllers/chat/model'
+import { codeWhispererClient } from '../client/codewhisperer'
+import { logSendTelemetryEventFailure } from '../../codewhispererChat/controllers/chat/telemetryHelper'
+import { Timeout } from '../../shared/utilities/timeoutUtils'
+import { getSelectedCustomization } from '../util/customizationUtil'
+import { isAwsError } from '../../shared/errors'
+import { undefinedIfEmpty } from '../../shared/utilities/textUtilities'
+import { getUnmodifiedAcceptedTokens } from '../util/commonUtil'
+
+/**
+ * This singleton class is mainly used for calculating the percentage of user modification.
+ * The current calculation method is (Levenshtein edit distance / acceptedSuggestion.length).
+ */
+export class CodeWhispererTracker {
+    private _eventQueue: (AcceptedSuggestionEntry | InsertedCode)[]
+    private _timer?: Timeout
+    private static instance: CodeWhispererTracker
+
+    /**
+     * the interval of the background thread invocation, which is triggered by the timer
+     */
+    private static readonly defaultCheckPeriodMillis = 1000 * 60 * 1 // 1 minute in milliseconds
+    /**
+     * modification should be recorded at least 5 minutes after accepted into the editor
+     */
+    private static readonly defaultModificationIntervalMillis = 1000 * 60 * 5 // 5 minutes in milliseconds
+
+    /**
+     * This is to avoid user overflowing the eventQueue by spamming accepted suggestions
+     */
+    private static readonly defaultMaxQueueSize = 10000
+
+    private constructor() {
+        this._eventQueue = []
+    }
+
+    public enqueue(suggestion: AcceptedSuggestionEntry | InsertedCode) {
+        if (!globals.telemetry.telemetryEnabled) {
+            return
+        }
+
+        if (this._eventQueue.length >= 0) {
+            this.startTimer().catch((e) => {
+                getLogger().error('startTimer failed: %s', (e as Error).message)
+            })
+        }
+
+        if (this._eventQueue.length >= CodeWhispererTracker.defaultMaxQueueSize) {
+            this._eventQueue.shift()
+        }
+        this._eventQueue.push(suggestion)
+    }
+
+    public async flush() {
+        if (!globals.telemetry.telemetryEnabled) {
+            this._eventQueue = []
+            this.closeTimer()
+            return
+        }
+
+        const currentTime = new Date()
+        const newEventQueue: (AcceptedSuggestionEntry | InsertedCode)[] = []
+        for (const suggestion of this._eventQueue) {
+            if (
+                currentTime.getTime() - suggestion.time.getTime() >
+                CodeWhispererTracker.defaultModificationIntervalMillis
+            ) {
+                await this.emitTelemetryOnSuggestion(suggestion)
+            } else {
+                newEventQueue.push(suggestion)
+            }
+        }
+
+        this._eventQueue = newEventQueue
+        if (this._eventQueue.length === 0) {
+            this.closeTimer()
+        }
+    }
+
+    public async emitTelemetryOnSuggestion(suggestion: AcceptedSuggestionEntry | InsertedCode) {
+        let percentage = 1.0
+        let currString = ''
+        const customizationArn = undefinedIfEmpty(getSelectedCustomization().arn)
+
+        try {
+            if (suggestion.fileUrl?.scheme !== '') {
+                const document = await vscode.workspace.openTextDocument(suggestion.fileUrl)
+                if (document) {
+                    currString = document.getText(new vscode.Range(suggestion.startPosition, suggestion.endPosition))
+                    percentage = this.checkDiff(currString, suggestion.originalString)
+                }
+            }
+        } catch (e) {
+            getLogger().verbose(`Exception Thrown from CodeWhispererTracker: ${e}`)
+            return
+        } finally {
+            if ('conversationID' in suggestion) {
+                const event: AmazonqModifyCode = {
+                    cwsprChatConversationId: suggestion.conversationID,
+                    cwsprChatMessageId: suggestion.messageID,
+                    cwsprChatModificationPercentage: percentage ? percentage : 0,
+                    credentialStartUrl: AuthUtil.instance.startUrl,
+                }
+
+                telemetry.amazonq_modifyCode.emit(event)
+
+                codeWhispererClient
+                    .sendTelemetryEvent({
+                        telemetryEvent: {
+                            chatUserModificationEvent: {
+                                conversationId: event.cwsprChatConversationId,
+                                messageId: event.cwsprChatMessageId,
+                                modificationPercentage: event.cwsprChatModificationPercentage,
+                                customizationArn: customizationArn,
+                            },
+                        },
+                    })
+                    .then()
+                    .catch(logSendTelemetryEventFailure)
+            } else {
+                telemetry.codewhisperer_userModification.emit({
+                    codewhispererRequestId: suggestion.requestId ? suggestion.requestId : 'undefined',
+                    codewhispererSessionId: suggestion.sessionId ? suggestion.sessionId : undefined,
+                    codewhispererTriggerType: suggestion.triggerType,
+                    codewhispererSuggestionIndex: suggestion.index ? suggestion.index : 0,
+                    codewhispererModificationPercentage: percentage ? percentage : 0,
+                    codewhispererCompletionType: suggestion.completionType,
+                    codewhispererLanguage: suggestion.language,
+                    credentialStartUrl: AuthUtil.instance.startUrl,
+                    codewhispererCharactersAccepted: suggestion.originalString.length,
+                    codewhispererCharactersModified: 0, // TODO: currently we don't have an accurate number for this field with existing implementation
+                })
+
+                codeWhispererClient
+                    .sendTelemetryEvent({
+                        telemetryEvent: {
+                            userModificationEvent: {
+                                sessionId: suggestion.sessionId,
+                                requestId: suggestion.requestId,
+                                programmingLanguage: { languageName: suggestion.language },
+                                // deprecated % value and should not be used by service side
+                                modificationPercentage: percentage,
+                                customizationArn: customizationArn,
+                                timestamp: new Date(),
+                                acceptedCharacterCount: suggestion.originalString.length,
+                                unmodifiedAcceptedCharacterCount: getUnmodifiedAcceptedTokens(
+                                    suggestion.originalString,
+                                    currString
+                                ),
+                            },
+                        },
+                        profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,
+                    })
+                    .then()
+                    .catch((error) => {
+                        let requestId: string | undefined
+                        if (isAwsError(error)) {
+                            requestId = error.requestId
+                        }
+
+                        getLogger().debug(
+                            `Failed to send UserModificationEvent to CodeWhisperer, requestId: ${requestId ?? ''}, message: ${
+                                error.message
+                            }`
+                        )
+                    })
+            }
+        }
+    }
+
+    /**
+     * This function calculates the Levenshtein edit distance of currString from original accepted String
+     * then return a percentage against the length of accepted string (capped by 1,0)
+     * @param currString the current string in the same location as the previously accepted suggestion
+     * @param acceptedString the accepted suggestion that was inserted into the editor
+     */
+    public checkDiff(currString?: string, acceptedString?: string): number {
+        if (!currString || !acceptedString || currString.length === 0 || acceptedString.length === 0) {
+            return 1.0
+        }
+
+        const diff = distance(currString, acceptedString)
+        return Math.min(1.0, diff / acceptedString.length)
+    }
+
+    public async startTimer() {
+        if (!this._timer) {
+            this._timer = new Timeout(CodeWhispererTracker.defaultCheckPeriodMillis)
+            this._timer.onCompletion(async () => {
+                try {
+                    await this.flush()
+                } finally {
+                    if (this._timer !== undefined) {
+                        this._timer!.refresh()
+                    }
+                }
+            })
+        }
+    }
+
+    public closeTimer() {
+        if (this._timer !== undefined) {
+            this._timer.cancel()
+            this._timer = undefined
+        }
+    }
+
+    public async shutdown() {
+        this.closeTimer()
+
+        if (globals.telemetry.telemetryEnabled) {
+            try {
+                await this.flush()
+            } finally {
+                this._eventQueue = []
+            }
+        }
+    }
+
+    public static getTracker(): CodeWhispererTracker {
+        if (!CodeWhispererTracker.instance) {
+            CodeWhispererTracker.instance = new CodeWhispererTracker()
+        }
+        return CodeWhispererTracker.instance
+    }
+}
diff --git a/packages/core/src/codewhisperer/tracker/lineTracker.ts b/packages/core/src/codewhisperer/tracker/lineTracker.ts
new file mode 100644
index 00000000000..7fce5ef9534
--- /dev/null
+++ b/packages/core/src/codewhisperer/tracker/lineTracker.ts
@@ -0,0 +1,179 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { isTextEditor } from '../../shared/utilities/editorUtilities'
+import { setContext } from '../../shared/vscode/setContext'
+
+export interface LineSelection {
+    anchor: number
+    active: number
+}
+
+export interface LinesChangeEvent {
+    readonly editor: vscode.TextEditor | undefined
+    readonly selections: LineSelection[] | undefined
+
+    readonly reason: 'editor' | 'selection' | 'content'
+}
+
+/**
+ * This class providees a single interface to manage and access users' "line" selections
+ * Callers could use it by subscribing onDidChangeActiveLines to do UI updates or logic needed to be executed when line selections get changed
+ */
+export class LineTracker implements vscode.Disposable {
+    private _onDidChangeActiveLines = new vscode.EventEmitter<LinesChangeEvent>()
+    get onDidChangeActiveLines(): vscode.Event<LinesChangeEvent> {
+        return this._onDidChangeActiveLines.event
+    }
+
+    private _editor: vscode.TextEditor | undefined
+    private _disposable: vscode.Disposable | undefined
+
+    private _selections: LineSelection[] | undefined
+    get selections(): LineSelection[] | undefined {
+        return this._selections
+    }
+
+    private _onReady: vscode.EventEmitter<void> = new vscode.EventEmitter<void>()
+    get onReady(): vscode.Event<void> {
+        return this._onReady.event
+    }
+
+    private _ready: boolean = false
+    get isReady() {
+        return this._ready
+    }
+
+    constructor() {
+        this._disposable = vscode.Disposable.from(
+            vscode.window.onDidChangeActiveTextEditor(async (e) => {
+                await this.onActiveTextEditorChanged(e)
+            }),
+            vscode.window.onDidChangeTextEditorSelection(async (e) => {
+                await this.onTextEditorSelectionChanged(e)
+            }),
+            vscode.workspace.onDidChangeTextDocument((e) => {
+                this.onContentChanged(e)
+            })
+        )
+
+        queueMicrotask(async () => await this.onActiveTextEditorChanged(vscode.window.activeTextEditor))
+    }
+
+    dispose() {
+        this._disposable?.dispose()
+    }
+
+    ready() {
+        if (this._ready) {
+            throw new Error('Linetracker is already activated')
+        }
+
+        this._ready = true
+        queueMicrotask(() => this._onReady.fire())
+    }
+
+    // @VisibleForTesting
+    async onActiveTextEditorChanged(editor: vscode.TextEditor | undefined) {
+        if (editor === this._editor) {
+            return
+        }
+
+        this._editor = editor
+        this._selections = toLineSelections(editor?.selections)
+        if (this._selections && this._selections[0]) {
+            const s = this._selections.map((item) => item.active + 1)
+            await setContext('codewhisperer.activeLine', s)
+        }
+
+        this.notifyLinesChanged('editor')
+    }
+
+    // @VisibleForTesting
+    async onTextEditorSelectionChanged(e: vscode.TextEditorSelectionChangeEvent) {
+        // If this isn't for our cached editor and its not a real editor -- kick out
+        if (this._editor !== e.textEditor && !isTextEditor(e.textEditor)) {
+            return
+        }
+
+        const selections = toLineSelections(e.selections)
+        if (this._editor === e.textEditor && this.includes(selections)) {
+            return
+        }
+
+        this._editor = e.textEditor
+        this._selections = selections
+        if (this._selections && this._selections[0]) {
+            const s = this._selections.map((item) => item.active + 1)
+            await setContext('codewhisperer.activeLine', s)
+        }
+
+        this.notifyLinesChanged('selection')
+    }
+
+    // @VisibleForTesting
+    onContentChanged(e: vscode.TextDocumentChangeEvent) {
+        const editor = vscode.window.activeTextEditor
+        if (e.document === editor?.document && e.contentChanges.length > 0 && isTextEditor(editor)) {
+            this._editor = editor
+            this._selections = toLineSelections(this._editor?.selections)
+
+            this.notifyLinesChanged('content')
+        }
+    }
+
+    notifyLinesChanged(reason: 'editor' | 'selection' | 'content') {
+        const e: LinesChangeEvent = { editor: this._editor, selections: this.selections, reason: reason }
+        this._onDidChangeActiveLines.fire(e)
+    }
+
+    includes(selections: LineSelection[]): boolean
+    includes(line: number, options?: { activeOnly: boolean }): boolean
+    includes(lineOrSelections: number | LineSelection[], options?: { activeOnly: boolean }): boolean {
+        if (typeof lineOrSelections !== 'number') {
+            return isIncluded(lineOrSelections, this._selections)
+        }
+
+        if (this._selections === undefined || this._selections.length === 0) {
+            return false
+        }
+
+        const line = lineOrSelections
+        const activeOnly = options?.activeOnly ?? true
+
+        for (const selection of this._selections) {
+            if (
+                line === selection.active ||
+                (!activeOnly &&
+                    ((selection.anchor >= line && line >= selection.active) ||
+                        (selection.active >= line && line >= selection.anchor)))
+            ) {
+                return true
+            }
+        }
+        return false
+    }
+}
+
+function isIncluded(selections: LineSelection[] | undefined, within: LineSelection[] | undefined): boolean {
+    if (selections === undefined && within === undefined) {
+        return true
+    }
+    if (selections === undefined || within === undefined || selections.length !== within.length) {
+        return false
+    }
+
+    return selections.every((s, i) => {
+        const match = within[i]
+        return s.active === match.active && s.anchor === match.anchor
+    })
+}
+
+function toLineSelections(selections: readonly vscode.Selection[]): LineSelection[]
+function toLineSelections(selections: readonly vscode.Selection[] | undefined): LineSelection[] | undefined
+function toLineSelections(selections: readonly vscode.Selection[] | undefined) {
+    return selections?.map((s) => ({ active: s.active.line, anchor: s.anchor.line }))
+}
diff --git a/packages/core/src/codewhisperer/tracker/userWrittenCodeTracker.ts b/packages/core/src/codewhisperer/tracker/userWrittenCodeTracker.ts
new file mode 100644
index 00000000000..7dfb14b5745
--- /dev/null
+++ b/packages/core/src/codewhisperer/tracker/userWrittenCodeTracker.ts
@@ -0,0 +1,196 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../../shared/logger/logger'
+import { runtimeLanguageContext } from '../util/runtimeLanguageContext'
+import { AuthUtil } from '../util/authUtil'
+import { getSelectedCustomization } from '../util/customizationUtil'
+import { codeWhispererClient as client } from '../client/codewhisperer'
+import { isAwsError } from '../../shared/errors'
+import { undefinedIfEmpty } from '../../shared/utilities/textUtilities'
+import { CodewhispererLanguage } from '../../shared/telemetry/telemetry'
+import globals from '../../shared/extensionGlobals'
+
+/**
+ * This singleton class is mainly used for calculating the user written code
+ * for active Amazon Q users.
+ * It reports the user written code per 5 minutes when the user is coding and using Amazon Q features
+ */
+export class UserWrittenCodeTracker {
+    private _userWrittenNewCodeCharacterCount: Map<CodewhispererLanguage, number>
+    private _userWrittenNewCodeLineCount: Map<CodewhispererLanguage, number>
+    private _qIsMakingEdits: boolean
+    private _timer?: NodeJS.Timer
+    private _qUsageCount: number
+    private _lastQInvocationTime: number
+
+    static #instance: UserWrittenCodeTracker
+    private static copySnippetThreshold = 50
+    private static resetQIsEditingTimeoutMs = 2 * 60 * 1000
+    private static defaultCheckPeriodMillis = 5 * 60 * 1000
+
+    private constructor() {
+        this._userWrittenNewCodeLineCount = new Map<CodewhispererLanguage, number>()
+        this._userWrittenNewCodeCharacterCount = new Map<CodewhispererLanguage, number>()
+        this._qUsageCount = 0
+        this._qIsMakingEdits = false
+        this._timer = undefined
+        this._lastQInvocationTime = 0
+    }
+
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+
+    public isActive(): boolean {
+        return globals.telemetry.telemetryEnabled && AuthUtil.instance.isConnected()
+    }
+
+    // this should be invoked whenever there is a successful Q feature invocation
+    // for all Q features
+    public onQFeatureInvoked() {
+        this._qUsageCount += 1
+        this._lastQInvocationTime = Date.now()
+    }
+
+    public onQStartsMakingEdits() {
+        this._qIsMakingEdits = true
+    }
+
+    public onQFinishesEdits() {
+        this._qIsMakingEdits = false
+    }
+
+    public getUserWrittenCharacters(language: CodewhispererLanguage) {
+        return this._userWrittenNewCodeCharacterCount.get(language) || 0
+    }
+
+    public getUserWrittenLines(language: CodewhispererLanguage) {
+        return this._userWrittenNewCodeLineCount.get(language) || 0
+    }
+
+    public reset() {
+        this._userWrittenNewCodeLineCount = new Map<CodewhispererLanguage, number>()
+        this._userWrittenNewCodeCharacterCount = new Map<CodewhispererLanguage, number>()
+        this._qUsageCount = 0
+        this._qIsMakingEdits = false
+        this._lastQInvocationTime = 0
+        if (this._timer !== undefined) {
+            clearTimeout(this._timer)
+            this._timer = undefined
+        }
+    }
+
+    public emitCodeContributions() {
+        const selectedCustomization = getSelectedCustomization()
+
+        for (const [language, charCount] of this._userWrittenNewCodeCharacterCount) {
+            const lineCount = this.getUserWrittenLines(language)
+            if (charCount > 0) {
+                client
+                    .sendTelemetryEvent({
+                        telemetryEvent: {
+                            codeCoverageEvent: {
+                                customizationArn: undefinedIfEmpty(selectedCustomization.arn),
+                                programmingLanguage: {
+                                    languageName: runtimeLanguageContext.toRuntimeLanguage(language),
+                                },
+                                acceptedCharacterCount: 0,
+                                totalCharacterCount: 0,
+                                timestamp: new Date(Date.now()),
+                                userWrittenCodeCharacterCount: charCount,
+                                userWrittenCodeLineCount: lineCount,
+                            },
+                        },
+                    })
+                    .then()
+                    .catch((error) => {
+                        let requestId: string | undefined
+                        if (isAwsError(error)) {
+                            requestId = error.requestId
+                        }
+                        getLogger().debug(
+                            `Failed to sendTelemetryEvent, requestId: ${requestId ?? ''}, message: ${error.message}`
+                        )
+                    })
+            }
+        }
+    }
+
+    private tryStartTimer() {
+        if (this._timer !== undefined) {
+            return
+        }
+        if (!this.isActive()) {
+            getLogger().debug(`Skip emiting code contribution metric. Telemetry disabled or not logged in. `)
+            this.reset()
+            return
+        }
+        const startTime = Date.now()
+        this._timer = setTimeout(() => {
+            try {
+                const currentTime = Date.now()
+                const delay: number = UserWrittenCodeTracker.defaultCheckPeriodMillis
+                const diffTime: number = startTime + delay
+                if (diffTime <= currentTime) {
+                    if (this._qUsageCount <= 0) {
+                        getLogger().debug(`Skip emiting code contribution metric. There is no active Amazon Q usage. `)
+                        return
+                    }
+                    if (this._userWrittenNewCodeCharacterCount.size === 0) {
+                        getLogger().debug(`Skip emiting code contribution metric. There is no new code added. `)
+                        return
+                    }
+                    this.emitCodeContributions()
+                }
+            } catch (e) {
+                getLogger().verbose(`Exception Thrown from QCodeGenTracker: ${e}`)
+            } finally {
+                this.reset()
+            }
+        }, UserWrittenCodeTracker.defaultCheckPeriodMillis)
+    }
+
+    private countNewLines(str: string) {
+        return str.split('\n').length - 1
+    }
+
+    public onTextDocumentChange(e: vscode.TextDocumentChangeEvent) {
+        // do not count code written by Q as user written code
+        if (
+            !runtimeLanguageContext.isLanguageSupported(e.document.languageId) ||
+            e.contentChanges.length === 0 ||
+            this._qIsMakingEdits
+        ) {
+            // if the boolean of qIsMakingEdits was incorrectly set to true
+            // due to unhandled edge cases or early terminated code paths
+            // reset it back to false after a reasonable period of time
+            if (this._qIsMakingEdits) {
+                if (Date.now() - this._lastQInvocationTime > UserWrittenCodeTracker.resetQIsEditingTimeoutMs) {
+                    getLogger().warn(`Reset Q is editing state to false.`)
+                    this._qIsMakingEdits = false
+                }
+            }
+            return
+        }
+        const contentChange = e.contentChanges[0]
+        // if user copies code into the editor for more than 50 characters
+        // do not count this as total new code, this will skew the data,
+        // reporting highly inflated user written code
+        if (contentChange.text.length > UserWrittenCodeTracker.copySnippetThreshold) {
+            return
+        }
+        const language = runtimeLanguageContext.normalizeLanguage(e.document.languageId)
+        if (language) {
+            const charCount = this.getUserWrittenCharacters(language)
+            this._userWrittenNewCodeCharacterCount.set(language, charCount + contentChange.text.length)
+            const lineCount = this.getUserWrittenLines(language)
+            this._userWrittenNewCodeLineCount.set(language, lineCount + this.countNewLines(contentChange.text))
+            // start 5 min data reporting once valid user input is detected
+            this.tryStartTimer()
+        }
+    }
+}
diff --git a/packages/core/src/codewhisperer/ui/codeWhispererNodes.ts b/packages/core/src/codewhisperer/ui/codeWhispererNodes.ts
new file mode 100644
index 00000000000..c1934ec6a73
--- /dev/null
+++ b/packages/core/src/codewhisperer/ui/codeWhispererNodes.ts
@@ -0,0 +1,263 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import vscode from 'vscode'
+import { addColor, codicon, getIcon } from '../../shared/icons'
+import { DataQuickPickItem } from '../../shared/ui/pickerPrompter'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { Commands, placeholder } from '../../shared/vscode/commands2'
+import {
+    toggleCodeSuggestions,
+    showReferenceLog,
+    showLearnMore,
+    showFreeTierLimit,
+    reconnect,
+    selectCustomizationPrompt,
+    signoutCodeWhisperer,
+    showIntroduction,
+    toggleCodeScans,
+    selectRegionProfileCommand,
+} from '../commands/basicCommands'
+import { CodeWhispererCommandDeclarations } from '../commands/gettingStartedPageCommands'
+import { CodeScansState, RegionProfile } from '../models/model'
+import { getNewCustomizationsAvailable, getSelectedCustomization } from '../util/customizationUtil'
+import { cwQuickPickSource } from '../commands/types'
+import { AuthUtil } from '../util/authUtil'
+import { submitFeedback } from '../../feedback/vue/submitFeedback'
+import { focusAmazonQPanel } from '../../codewhispererChat/commands/registerCommands'
+import { isWeb } from '../../shared/extensionGlobals'
+import { getLogger } from '../../shared/logger/logger'
+
+export function createAutoSuggestions(running: boolean): DataQuickPickItem<'autoSuggestions'> {
+    const labelResume = localize('AWS.codewhisperer.resumeCodeWhispererNode.label', 'Resume Auto-Suggestions')
+    const iconResume = getIcon('vscode-debug-start')
+    const labelPause = localize('AWS.codewhisperer.pauseCodeWhispererNode.label', 'Pause Auto-Suggestions')
+    const iconPause = getIcon('vscode-debug-pause')
+
+    return {
+        data: 'autoSuggestions',
+        label: running ? codicon`${iconPause} ${labelPause}` : codicon`${iconResume} ${labelResume}`,
+        description: running ? 'Currently RUNNING' : 'Currently PAUSED',
+        onClick: () => toggleCodeSuggestions.execute(placeholder, cwQuickPickSource),
+    } as DataQuickPickItem<'autoSuggestions'>
+}
+
+export function createAutoScans(running: boolean): DataQuickPickItem<'autoScans'> {
+    const labelResume = localize('AWS.codewhisperer.resumeCodeWhispererNode.label', 'Resume Auto-Reviews')
+    const iconResume = getIcon('vscode-debug-alt')
+    const labelPause = localize('AWS.codewhisperer.pauseCodeWhispererNode.label', 'Pause Auto-Reviews')
+    const iconPause = getIcon('vscode-debug-pause')
+    const monthlyQuotaExceeded = CodeScansState.instance.isMonthlyQuotaExceeded()
+
+    return {
+        data: 'autoScans',
+        label: running ? codicon`${iconPause} ${labelPause}` : codicon`${iconResume} ${labelResume}`,
+        description: monthlyQuotaExceeded ? 'Monthly quota exceeded' : running ? 'RUNNING' : 'PAUSED',
+        onClick: () => toggleCodeScans.execute(placeholder, cwQuickPickSource),
+    } as DataQuickPickItem<'autoScans'>
+}
+
+export function createOpenReferenceLog(): DataQuickPickItem<'openReferenceLog'> {
+    const label = localize('AWS.codewhisperer.openReferenceLogNode.label', 'Open Code Reference Log')
+    const icon = getIcon('vscode-code')
+
+    return {
+        data: 'openReferenceLog',
+        label: codicon`${icon} ${label}`,
+        onClick: () => showReferenceLog.execute(placeholder, cwQuickPickSource),
+    } as DataQuickPickItem<'openReferenceLog'>
+}
+
+export function createReconnect(): DataQuickPickItem<'reconnect'> {
+    const label = localize('aws.amazonq.reconnectNode.label', 'Re-authenticate to connect')
+    const icon = addColor(getIcon('vscode-debug-disconnect'), 'notificationsErrorIcon.foreground')
+
+    return {
+        data: 'reconnect',
+        label: codicon`${icon} ${label}`,
+        onClick: () => reconnect.execute(placeholder, cwQuickPickSource),
+    }
+}
+
+export function createLearnMore(): DataQuickPickItem<'learnMore'> {
+    const label = localize('AWS.codewhisperer.learnMoreNode.label', 'Learn more about Amazon Q')
+    const icon = getIcon('vscode-question')
+
+    return {
+        data: 'learnMore',
+        label: codicon`${icon} ${label}`,
+        onClick: () => showLearnMore.execute(cwQuickPickSource),
+    } as DataQuickPickItem<'learnMore'>
+}
+
+export function createFreeTierLimitMet(): DataQuickPickItem<'freeTierLimitMet'> {
+    const label = localize('AWS.codewhisperer.freeTierLimitMetNode.label', 'Free Tier Limit Met')
+    const icon = getIcon('vscode-error')
+
+    return {
+        data: 'freeTierLimitMet',
+        label: codicon`${icon} ${label}`,
+        onClick: () => showFreeTierLimit.execute(placeholder, cwQuickPickSource),
+    }
+}
+
+export function createSelectCustomization(): DataQuickPickItem<'selectCustomization'> {
+    const selectedCustomization = getSelectedCustomization()
+    const newCustomizationsAmount = getNewCustomizationsAvailable()
+
+    const label = localize('AWS.codewhisperer.selectCustomizationNode.label', 'Select Customization')
+    const icon = getIcon('vscode-settings')
+    const description =
+        newCustomizationsAmount > 0 ? `${newCustomizationsAmount} new available` : `Using ${selectedCustomization.name}`
+
+    return {
+        data: 'selectCustomization',
+        label: codicon`${icon} ${label}`,
+        description: description,
+        onClick: () => selectCustomizationPrompt.execute(placeholder, cwQuickPickSource),
+    } as DataQuickPickItem<'selectCustomization'>
+}
+
+export function createSelectRegionProfileNode(
+    profile: RegionProfile | undefined
+): DataQuickPickItem<'selectRegionProfile'> {
+    const selectedRegionProfile = profile
+
+    const label = profile ? 'Change Profile' : '(Required) Select Profile'
+    const icon = getIcon('vscode-arrow-swap')
+    const description = selectedRegionProfile
+        ? `Current profile: ${selectedRegionProfile.name}`
+        : 'A profile MUST be selected for features to work'
+
+    return {
+        data: 'selectRegionProfile',
+        label: codicon`${icon} ${label}`,
+        onClick: async () => {
+            await selectRegionProfileCommand.execute(placeholder, cwQuickPickSource)
+        },
+        description: description,
+        picked: profile === undefined,
+    }
+}
+
+/* Opens the Learn CodeWhisperer Page */
+export function createGettingStarted(): DataQuickPickItem<'gettingStarted'> {
+    const label = localize('AWS.codewhisperer.gettingStartedNode.label', 'Try inline suggestion examples')
+    const icon = getIcon('vscode-rocket')
+    return {
+        data: 'gettingStarted',
+        label: codicon`${icon} ${label}`,
+        onClick: () =>
+            CodeWhispererCommandDeclarations.instance.declared.showGettingStartedPage.execute(
+                placeholder,
+                cwQuickPickSource
+            ),
+    } as DataQuickPickItem<'gettingStarted'>
+}
+
+export function createManageSubscription(): DataQuickPickItem<'manageSubscription'> {
+    const label = localize('AWS.command.manageSubscription', 'Manage Q Developer Pro Subscription')
+    // const kind = AuthUtil.instance.isBuilderIdInUse() ? 'AWS Builder ID' : 'IAM Identity Center'
+
+    return {
+        data: 'manageSubscription',
+        label: label,
+        iconPath: getIcon('vscode-link-external'),
+        onClick: () => Commands.tryExecute('aws.amazonq.manageSubscription'),
+    } as DataQuickPickItem<'manageSubscription'>
+}
+
+export function createSignout(): DataQuickPickItem<'signout'> {
+    const label = localize('AWS.codewhisperer.signoutNode.label', 'Sign Out')
+    const icon = getIcon('vscode-export')
+    const connection = AuthUtil.instance.isBuilderIdInUse() ? 'AWS Builder ID' : 'IAM Identity Center'
+
+    return {
+        data: 'signout',
+        label: codicon`${icon} ${label}`,
+        description: `Connected with ${connection}`,
+        onClick: () => signoutCodeWhisperer.execute(placeholder, cwQuickPickSource),
+    } as DataQuickPickItem<'signout'>
+}
+
+export function createSettingsNode(): DataQuickPickItem<'openCodeWhispererSettings'> {
+    return {
+        data: 'openCodeWhispererSettings',
+        label: 'Open Settings',
+        iconPath: getIcon('vscode-settings-gear'),
+        onClick: () => Commands.tryExecute('aws.amazonq.configure'),
+    } as DataQuickPickItem<'openCodeWhispererSettings'>
+}
+
+export function createFeedbackNode(): DataQuickPickItem<'sendFeedback'> {
+    return {
+        data: 'sendFeedback',
+        label: 'Send Feedback',
+        iconPath: getIcon('vscode-thumbsup'),
+        onClick: () => submitFeedback(placeholder, 'Amazon Q'),
+    } as DataQuickPickItem<'sendFeedback'>
+}
+
+export function createGitHubNode(): DataQuickPickItem<'visitGithub'> {
+    return {
+        data: 'visitGithub',
+        label: 'Connect with us on Github',
+        iconPath: getIcon('vscode-github-alt'),
+        onClick: () => Commands.tryExecute('aws.amazonq.github'),
+    } as DataQuickPickItem<'visitGithub'>
+}
+
+/* Opens the AWS Docs for CodeWhisperer */
+export function createDocumentationNode(): DataQuickPickItem<'viewDocumentation'> {
+    return {
+        data: 'viewDocumentation',
+        label: 'View Documentation',
+        iconPath: getIcon('vscode-symbol-ruler'),
+        onClick: () => showIntroduction.execute(),
+    } as DataQuickPickItem<'viewDocumentation'>
+}
+
+export function createSeparator(label: string = ''): DataQuickPickItem<'separator'> {
+    return {
+        kind: vscode.QuickPickItemKind.Separator,
+        data: 'separator',
+        label,
+    }
+}
+
+export function switchToAmazonQNode(): DataQuickPickItem<'openChatPanel'> {
+    return {
+        data: 'openChatPanel',
+        label: 'Open Chat Panel',
+        iconPath: getIcon('vscode-comment'),
+        onClick: () =>
+            focusAmazonQPanel.execute(placeholder, 'codewhispererQuickPick').catch((e) => {
+                getLogger().error('focusAmazonQPanel failed: %s', e)
+            }),
+    }
+}
+
+export function createSignIn(): DataQuickPickItem<'signIn'> {
+    const label = localize('AWS.codewhisperer.signInNode.label', 'Sign in to get started')
+    const icon = getIcon('vscode-account')
+
+    let onClick = () => {
+        focusAmazonQPanel.execute(placeholder, 'codewhispererQuickPick').catch((e) => {
+            getLogger().error('focusAmazonQPanel failed: %s', e)
+        })
+    }
+    if (isWeb()) {
+        // TODO: nkomonen, call a Command instead
+        onClick = () => {
+            void AuthUtil.instance.connectToAwsBuilderId()
+        }
+    }
+
+    return {
+        data: 'signIn',
+        label: codicon`${icon} ${label}`,
+        onClick,
+    }
+}
diff --git a/packages/core/src/codewhisperer/ui/prompters.ts b/packages/core/src/codewhisperer/ui/prompters.ts
new file mode 100644
index 00000000000..95541d84a82
--- /dev/null
+++ b/packages/core/src/codewhisperer/ui/prompters.ts
@@ -0,0 +1,34 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    codeIssueGroupingStrategies,
+    CodeIssueGroupingStrategy,
+    codeIssueGroupingStrategyLabel,
+    CodeIssueGroupingStrategyState,
+} from '../models/model'
+import { createQuickPick, QuickPickPrompter } from '../../shared/ui/pickerPrompter'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+
+export function createCodeIssueGroupingStrategyPrompter(): QuickPickPrompter<CodeIssueGroupingStrategy> {
+    const groupingStrategy = CodeIssueGroupingStrategyState.instance.getState()
+    const prompter = createQuickPick(
+        codeIssueGroupingStrategies.map((strategy) => ({
+            data: strategy,
+            label: codeIssueGroupingStrategyLabel[strategy],
+        })),
+        {
+            title: localize('AWS.amazonq.scans.groupIssues', 'Group Issues'),
+            placeholder: localize('AWS.amazonq.scans.groupIssues.placeholder', 'Select how to group code issues'),
+        }
+    )
+    prompter.quickPick.activeItems = prompter.quickPick.items.filter((item) => item.data === groupingStrategy)
+    prompter.quickPick.onDidChangeSelection(async (items) => {
+        const [item] = items
+        await CodeIssueGroupingStrategyState.instance.setState(item.data)
+        prompter.quickPick.hide()
+    })
+    return prompter
+}
diff --git a/packages/core/src/codewhisperer/ui/statusBarMenu.ts b/packages/core/src/codewhisperer/ui/statusBarMenu.ts
new file mode 100644
index 00000000000..345ae641a78
--- /dev/null
+++ b/packages/core/src/codewhisperer/ui/statusBarMenu.ts
@@ -0,0 +1,136 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    createAutoSuggestions,
+    createOpenReferenceLog,
+    createLearnMore,
+    createFreeTierLimitMet,
+    createSelectCustomization,
+    createReconnect,
+    createGettingStarted,
+    createManageSubscription,
+    createSignout,
+    createSeparator,
+    createSettingsNode,
+    createFeedbackNode,
+    createGitHubNode,
+    createDocumentationNode,
+    createAutoScans,
+    createSignIn,
+    switchToAmazonQNode,
+    createSelectRegionProfileNode,
+} from './codeWhispererNodes'
+import { hasVendedIamCredentials, hasVendedCredentialsFromMetadata } from '../../auth/auth'
+import { AuthUtil } from '../util/authUtil'
+import { DataQuickPickItem, createQuickPick } from '../../shared/ui/pickerPrompter'
+import { CodeScansState, CodeSuggestionsState, vsCodeState } from '../models/model'
+import { Commands } from '../../shared/vscode/commands2'
+import { createExitButton } from '../../shared/ui/buttons'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { getLogger } from '../../shared/logger/logger'
+
+function getAmazonQCodeWhispererNodes() {
+    const autoTriggerEnabled = CodeSuggestionsState.instance.isSuggestionsEnabled()
+    const autoScansEnabled = CodeScansState.instance.isScansEnabled()
+    if (AuthUtil.instance.isConnectionExpired()) {
+        return [createReconnect(), createLearnMore()]
+    }
+
+    if (!AuthUtil.instance.isConnected()) {
+        return [createSignIn(), createLearnMore()]
+    }
+
+    if (AuthUtil.instance.isConnected() && AuthUtil.instance.requireProfileSelection()) {
+        return []
+    }
+
+    if (vsCodeState.isFreeTierLimitReached) {
+        if (hasVendedIamCredentials()) {
+            return [createFreeTierLimitMet(), createOpenReferenceLog()]
+        }
+        return [createFreeTierLimitMet(), createOpenReferenceLog(), createSeparator('Other Features')]
+    }
+
+    if (hasVendedIamCredentials()) {
+        return [createAutoSuggestions(autoTriggerEnabled), createOpenReferenceLog()]
+    }
+
+    return [
+        // CodeWhisperer
+        createSeparator('Inline Suggestions'),
+        createAutoSuggestions(autoTriggerEnabled),
+        createOpenReferenceLog(),
+        createGettingStarted(), // "Learn" node : opens Learn CodeWhisperer page
+
+        // Security scans
+        createSeparator('Code Reviews'),
+        ...(AuthUtil.instance.isBuilderIdInUse() ? [] : [createAutoScans(autoScansEnabled)]),
+
+        // Amazon Q + others
+        createSeparator('Other Features'),
+        ...(AuthUtil.instance.isValidEnterpriseSsoInUse() && AuthUtil.instance.isCustomizationFeatureEnabled
+            ? [createSelectCustomization()]
+            : []),
+        switchToAmazonQNode(),
+    ]
+}
+
+export function getQuickPickItems(): DataQuickPickItem<string>[] {
+    const isUsingEnterpriseSso = AuthUtil.instance.isValidEnterpriseSsoInUse()
+    const regionProfile = AuthUtil.instance.regionProfileManager.activeRegionProfile
+
+    const children = [
+        // If the user has signed in but not selected a region, we strongly indicate they need to select
+        // a profile, otherwise features will not work.
+        ...(isUsingEnterpriseSso && !regionProfile ? [createSelectRegionProfileNode(undefined)] : []),
+
+        ...getAmazonQCodeWhispererNodes(),
+
+        // Generic Nodes
+        createSeparator('Connect / Help'),
+        createFeedbackNode(),
+        createGitHubNode(),
+        createDocumentationNode(),
+
+        // Add settings and signout
+        createSeparator(),
+        createSettingsNode(),
+        ...(isUsingEnterpriseSso && regionProfile ? [createSelectRegionProfileNode(regionProfile)] : []),
+        ...(AuthUtil.instance.isConnected() && !hasVendedIamCredentials() && !hasVendedCredentialsFromMetadata()
+            ? [...(AuthUtil.instance.isBuilderIdInUse() ? [createManageSubscription()] : []), createSignout()]
+            : []),
+    ]
+
+    return children
+}
+
+export const listCodeWhispererCommandsId = 'aws.amazonq.listCommands'
+export const listCodeWhispererCommands = Commands.declare({ id: listCodeWhispererCommandsId }, () => () => {
+    telemetry.ui_click.emit({ elementId: 'cw_statusBarMenu' })
+    Commands.tryExecute('aws.amazonq.refreshAnnotation', true)
+        .then()
+        .catch((e) => {
+            getLogger().debug(
+                `codewhisperer: running into error while executing command { refreshAnnotation } on user clicking statusbar: ${e}`
+            )
+        })
+    return createQuickPick(getQuickPickItems(), {
+        title: 'Amazon Q',
+        buttons: [createExitButton()],
+        ignoreFocusOut: false,
+    }).prompt()
+})
+
+/**
+ * Does what {@link listCodeWhispererCommands} does, must only be used by the walkthrough for telemetry
+ * purposes.
+ */
+export const listCodeWhispererCommandsWalkthrough = Commands.declare(
+    `_aws.amazonq.walkthrough.listCommands`,
+    () => async () => {
+        await listCodeWhispererCommands.execute()
+    }
+)
diff --git a/packages/core/src/codewhisperer/util/authUtil.ts b/packages/core/src/codewhisperer/util/authUtil.ts
new file mode 100644
index 00000000000..e5177e7b578
--- /dev/null
+++ b/packages/core/src/codewhisperer/util/authUtil.ts
@@ -0,0 +1,587 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as localizedText from '../../shared/localizedText'
+import { Auth } from '../../auth/auth'
+import { ToolkitError, isNetworkError, tryRun } from '../../shared/errors'
+import { getSecondaryAuth, setScopes } from '../../auth/secondaryAuth'
+import { isSageMaker } from '../../shared/extensionUtilities'
+import { AmazonQPromptSettings } from '../../shared/settings'
+import {
+    scopesCodeWhispererCore,
+    createBuilderIdProfile,
+    hasScopes,
+    SsoConnection,
+    createSsoProfile,
+    Connection,
+    isIamConnection,
+    isSsoConnection,
+    isBuilderIdConnection,
+    scopesCodeWhispererChat,
+    scopesFeatureDev,
+    scopesGumby,
+    isIdcSsoConnection,
+    hasExactScopes,
+    getTelemetryMetadataForConn,
+    ProfileNotFoundError,
+} from '../../auth/connection'
+import { getLogger } from '../../shared/logger/logger'
+import { Commands, placeholder } from '../../shared/vscode/commands2'
+import { vsCodeState } from '../models/model'
+import { onceChanged, once } from '../../shared/utilities/functionUtils'
+import { indent } from '../../shared/utilities/textUtilities'
+import { showReauthenticateMessage } from '../../shared/utilities/messages'
+import { showAmazonQWalkthroughOnce } from '../../amazonq/onboardingPage/walkthrough'
+import { setContext } from '../../shared/vscode/setContext'
+import { isInDevEnv } from '../../shared/vscode/env'
+import { openUrl } from '../../shared/utilities/vsCodeUtils'
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { asStringifiedStack } from '../../shared/telemetry/spans'
+import { withTelemetryContext } from '../../shared/telemetry/util'
+import { focusAmazonQPanel } from '../../codewhispererChat/commands/registerCommands'
+import { throttle } from 'lodash'
+import { RegionProfileManager } from '../region/regionProfileManager'
+
+/** Backwards compatibility for connections w pre-chat scopes */
+export const codeWhispererCoreScopes = [...scopesCodeWhispererCore]
+export const codeWhispererChatScopes = [...codeWhispererCoreScopes, ...scopesCodeWhispererChat]
+export const amazonQScopes = [...codeWhispererChatScopes, ...scopesGumby, ...scopesFeatureDev]
+
+/**
+ * "Core" are the CW scopes that existed before the addition of new scopes
+ * for Amazon Q.
+ */
+export const isValidCodeWhispererCoreConnection = (conn?: Connection): conn is Connection => {
+    return (
+        (isSageMaker() && isIamConnection(conn)) || (isSsoConnection(conn) && hasScopes(conn, codeWhispererCoreScopes))
+    )
+}
+/** Superset that includes all of CodeWhisperer + Amazon Q */
+export const isValidAmazonQConnection = (conn?: Connection): conn is Connection => {
+    return (
+        (isSageMaker() && isIamConnection(conn)) ||
+        ((isSsoConnection(conn) || isBuilderIdConnection(conn)) &&
+            isValidCodeWhispererCoreConnection(conn) &&
+            hasScopes(conn, amazonQScopes))
+    )
+}
+
+const authClassName = 'AuthQ'
+
+export class AuthUtil {
+    static #instance: AuthUtil
+    protected static readonly logIfChanged = onceChanged((s: string) => getLogger().info(s))
+
+    private reauthenticatePromptShown: boolean = false
+    private _isCustomizationFeatureEnabled: boolean = false
+
+    // user should only see that screen once.
+    // TODO: move to memento
+    public hasAlreadySeenMigrationAuthScreen: boolean = false
+
+    public get isCustomizationFeatureEnabled(): boolean {
+        return this._isCustomizationFeatureEnabled
+    }
+
+    // This boolean controls whether the Select Customization node will be visible. A change to this value
+    // means that the old UX was wrong and must refresh the devTool tree.
+    public set isCustomizationFeatureEnabled(value: boolean) {
+        if (this._isCustomizationFeatureEnabled === value) {
+            return
+        }
+        this._isCustomizationFeatureEnabled = value
+        void Commands.tryExecute('aws.amazonq.refreshStatusBar')
+    }
+
+    public readonly secondaryAuth = getSecondaryAuth(
+        this.auth,
+        'codewhisperer',
+        'Amazon Q',
+        isValidCodeWhispererCoreConnection
+    )
+    public readonly restore = () => this.secondaryAuth.restoreConnection()
+
+    public constructor(
+        public readonly auth = Auth.instance,
+        public readonly regionProfileManager = new RegionProfileManager(() => this.conn)
+    ) {}
+
+    public initCodeWhispererHooks = once(() => {
+        this.auth.onDidChangeConnectionState(async (e) => {
+            getLogger().info(`codewhisperer: connection changed to ${e.state}: ${e.id}`)
+            if (e.state !== 'authenticating') {
+                await this.refreshCodeWhisperer()
+            }
+
+            await this.setVscodeContextProps()
+        })
+
+        this.secondaryAuth.onDidChangeActiveConnection(async () => {
+            getLogger().info(`codewhisperer: active connection changed`)
+            if (this.isValidEnterpriseSsoInUse()) {
+                void vscode.commands.executeCommand('aws.amazonq.notifyNewCustomizations')
+                await this.regionProfileManager.restoreProfileSelection()
+            }
+            vsCodeState.isFreeTierLimitReached = false
+            await Promise.all([
+                // onDidChangeActiveConnection may trigger before these modules are activated.
+                Commands.tryExecute('aws.amazonq.refreshStatusBar'),
+                Commands.tryExecute('aws.amazonq.updateReferenceLog'),
+            ])
+
+            await this.setVscodeContextProps()
+
+            // To check valid connection
+            if (this.isValidEnterpriseSsoInUse() || (this.isBuilderIdInUse() && !this.isConnectionExpired())) {
+                await showAmazonQWalkthroughOnce()
+            }
+
+            if (!this.isConnected()) {
+                await this.regionProfileManager.invalidateProfile(this.regionProfileManager.activeRegionProfile?.arn)
+                await this.regionProfileManager.clearCache()
+            }
+        })
+
+        this.regionProfileManager.onDidChangeRegionProfile(async () => {
+            await this.setVscodeContextProps()
+        })
+    })
+
+    public async setVscodeContextProps() {
+        // if users are "pending profile selection", they're not fully connected and require profile selection for Q usage
+        // requireProfileSelection() always returns false for builderID users
+        await setContext('aws.codewhisperer.connected', this.isConnected() && !this.requireProfileSelection())
+        const doShowAmazonQLoginView =
+            !this.isConnected() || this.isConnectionExpired() || this.requireProfileSelection()
+        await setContext('aws.amazonq.showLoginView', doShowAmazonQLoginView)
+        await setContext('aws.codewhisperer.connectionExpired', this.isConnectionExpired())
+        await setContext('aws.amazonq.connectedSsoIdc', isIdcSsoConnection(this.conn))
+    }
+
+    public reformatStartUrl(startUrl: string | undefined) {
+        return !startUrl ? undefined : startUrl.replace(/[\/#]+$/g, '')
+    }
+
+    // current active cwspr connection
+    public get conn() {
+        return this.secondaryAuth.activeConnection
+    }
+
+    // TODO: move this to the shared auth.ts
+    public get startUrl(): string | undefined {
+        // Reformat the url to remove any trailing '/' and `#`
+        // e.g. https://view.awsapps.com/start/# will become https://view.awsapps.com/start
+        return isSsoConnection(this.conn) ? this.reformatStartUrl(this.conn?.startUrl) : undefined
+    }
+
+    public get isUsingSavedConnection() {
+        return this.conn !== undefined && this.secondaryAuth.hasSavedConnection
+    }
+
+    public isConnected(): boolean {
+        return this.conn !== undefined
+    }
+
+    public isEnterpriseSsoInUse(): boolean {
+        const conn = this.conn
+        // we have an sso that isn't builder id, must be IdC by process of elimination
+        const isUsingEnterpriseSso = conn?.type === 'sso' && !isBuilderIdConnection(conn)
+        return conn !== undefined && isUsingEnterpriseSso
+    }
+
+    // If there is an active SSO connection
+    public isValidEnterpriseSsoInUse(): boolean {
+        return this.isEnterpriseSsoInUse() && !this.isConnectionExpired()
+    }
+
+    public isBuilderIdInUse(): boolean {
+        return this.conn !== undefined && isBuilderIdConnection(this.conn)
+    }
+
+    @withTelemetryContext({ name: 'connectToAwsBuilderId', class: authClassName })
+    public async connectToAwsBuilderId(): Promise<SsoConnection> {
+        let conn = (await this.auth.listConnections()).find(isBuilderIdConnection)
+
+        if (!conn) {
+            conn = await this.auth.createConnection(createBuilderIdProfile(amazonQScopes))
+        } else if (!isValidAmazonQConnection(conn)) {
+            conn = await this.secondaryAuth.addScopes(conn, amazonQScopes)
+        }
+
+        if (this.auth.getConnectionState(conn) === 'invalid') {
+            conn = await this.auth.reauthenticate(conn)
+        }
+
+        return (await this.secondaryAuth.useNewConnection(conn)) as SsoConnection
+    }
+
+    @withTelemetryContext({ name: 'connectToEnterpriseSso', class: authClassName })
+    public async connectToEnterpriseSso(startUrl: string, region: string): Promise<SsoConnection> {
+        let conn = (await this.auth.listConnections()).find(
+            (conn): conn is SsoConnection =>
+                isSsoConnection(conn) && conn.startUrl.toLowerCase() === startUrl.toLowerCase()
+        )
+
+        if (!conn) {
+            conn = await this.auth.createConnection(createSsoProfile(startUrl, region, amazonQScopes))
+        } else if (!isValidAmazonQConnection(conn)) {
+            conn = await this.secondaryAuth.addScopes(conn, amazonQScopes)
+        }
+
+        if (this.auth.getConnectionState(conn) === 'invalid') {
+            conn = await this.auth.reauthenticate(conn)
+        }
+
+        return (await this.secondaryAuth.useNewConnection(conn)) as SsoConnection
+    }
+
+    public static get instance() {
+        if (this.#instance !== undefined) {
+            return this.#instance
+        }
+
+        const self = (this.#instance = new this())
+        return self
+    }
+
+    @withTelemetryContext({ name: 'getBearerToken', class: authClassName })
+    public async getBearerToken(): Promise<string> {
+        await this.restore()
+
+        if (this.conn === undefined) {
+            throw new ToolkitError('No connection found', { code: 'NoConnection' })
+        }
+
+        if (!isSsoConnection(this.conn)) {
+            throw new ToolkitError('Connection is not an SSO connection', { code: 'BadConnectionType' })
+        }
+
+        try {
+            const bearerToken = await this.conn.getToken()
+            return bearerToken.accessToken
+        } catch (err) {
+            if (err instanceof ProfileNotFoundError) {
+                // Expected that connection would be deleted by conn.getToken()
+                focusAmazonQPanel.execute(placeholder, 'profileNotFoundSignout').catch((e) => {
+                    getLogger().error('focusAmazonQPanel failed: %s', e)
+                })
+            }
+            throw err
+        }
+    }
+
+    @withTelemetryContext({ name: 'getCredentials', class: authClassName })
+    public async getCredentials() {
+        await this.restore()
+
+        if (this.conn === undefined) {
+            throw new ToolkitError('No connection found', { code: 'NoConnection' })
+        }
+
+        if (!isIamConnection(this.conn)) {
+            throw new ToolkitError('Connection is not an IAM connection', { code: 'BadConnectionType' })
+        }
+
+        return this.conn.getCredentials()
+    }
+
+    public isConnectionValid(log: boolean = true): boolean {
+        const connectionValid = this.conn !== undefined && !this.secondaryAuth.isConnectionExpired
+
+        if (log) {
+            this.logConnection()
+        }
+
+        return connectionValid
+    }
+
+    public isConnectionExpired(log: boolean = true): boolean {
+        const connectionExpired =
+            this.secondaryAuth.isConnectionExpired &&
+            this.conn !== undefined &&
+            isValidCodeWhispererCoreConnection(this.conn)
+
+        if (log) {
+            this.logConnection()
+        }
+
+        return connectionExpired
+    }
+
+    requireProfileSelection(): boolean {
+        if (isBuilderIdConnection(this.conn)) {
+            return false
+        }
+        return isIdcSsoConnection(this.conn) && this.regionProfileManager.activeRegionProfile === undefined
+    }
+
+    private logConnection() {
+        const logStr = indent(
+            `codewhisperer: connection states
+            connection isValid=${this.isConnectionValid(false)},
+            connection isValidCodewhispererCoreConnection=${isValidCodeWhispererCoreConnection(this.conn)},
+            connection isExpired=${this.isConnectionExpired(false)},
+            secondaryAuth isExpired=${this.secondaryAuth.isConnectionExpired},
+            connection isUndefined=${this.conn === undefined}`,
+            4,
+            true
+        )
+
+        AuthUtil.logIfChanged(logStr)
+    }
+
+    @withTelemetryContext({ name: 'reauthenticate', class: authClassName })
+    public async reauthenticate() {
+        try {
+            if (this.conn?.type !== 'sso') {
+                return
+            }
+
+            if (!hasExactScopes(this.conn, amazonQScopes)) {
+                const conn = await setScopes(this.conn, amazonQScopes, this.auth)
+                await this.secondaryAuth.useNewConnection(conn)
+            }
+
+            await this.auth.reauthenticate(this.conn)
+        } catch (err) {
+            throw ToolkitError.chain(err, 'Unable to authenticate connection')
+        } finally {
+            await this.setVscodeContextProps()
+        }
+    }
+
+    public async refreshCodeWhisperer() {
+        vsCodeState.isFreeTierLimitReached = false
+        await Commands.tryExecute('aws.amazonq.refreshStatusBar')
+    }
+
+    @withTelemetryContext({ name: 'showReauthenticatePrompt', class: authClassName })
+    public async showReauthenticatePrompt(isAutoTrigger?: boolean) {
+        if (isAutoTrigger && this.reauthenticatePromptShown) {
+            return
+        }
+
+        await showReauthenticateMessage({
+            message: localizedText.connectionExpired('Amazon Q'),
+            connect: localizedText.reauthenticate,
+            suppressId: 'codeWhispererConnectionExpired',
+            settings: AmazonQPromptSettings.instance,
+            reauthFunc: async () => {
+                await this.reauthenticate()
+            },
+        })
+
+        if (isAutoTrigger) {
+            this.reauthenticatePromptShown = true
+        }
+    }
+
+    public async notifySessionConfiguration() {
+        const suppressId = 'amazonQSessionConfigurationMessage'
+        const settings = AmazonQPromptSettings.instance
+        const shouldShow = settings.isPromptEnabled(suppressId)
+        if (!shouldShow) {
+            return
+        }
+
+        const message = localize(
+            'aws.amazonq.sessionConfiguration.message',
+            'Your maximum session length for Amazon Q can be extended to 90 days by your administrator. For more information, refer to How to extend the session duration for Amazon Q in the IDE in the IAM Identity Center User Guide.'
+        )
+
+        const learnMoreUrl = vscode.Uri.parse(
+            'https://docs.aws.amazon.com/singlesignon/latest/userguide/configure-user-session.html#90-day-extended-session-duration'
+        )
+        await telemetry.toolkit_showNotification.run(async () => {
+            telemetry.record({ id: 'sessionExtension' })
+            void vscode.window.showInformationMessage(message, localizedText.learnMore).then(async (resp) => {
+                await telemetry.toolkit_invokeAction.run(async () => {
+                    if (resp === localizedText.learnMore) {
+                        telemetry.record({ action: 'learnMore' })
+                        await openUrl(learnMoreUrl)
+                    } else {
+                        telemetry.record({ action: 'dismissSessionExtensionNotification' })
+                    }
+                    await settings.disablePrompt(suppressId)
+                })
+            })
+        })
+    }
+
+    @withTelemetryContext({ name: 'notifyReauthenticate', class: authClassName })
+    public async notifyReauthenticate(isAutoTrigger?: boolean) {
+        void this.showReauthenticatePrompt(isAutoTrigger)
+        await this.setVscodeContextProps()
+    }
+
+    public isValidCodeTransformationAuthUser(): boolean {
+        return (this.isEnterpriseSsoInUse() || this.isBuilderIdInUse()) && this.isConnectionValid()
+    }
+
+    /**
+     * Asynchronously returns a snapshot of the overall auth state of CodeWhisperer + Chat features.
+     * It guarantees the latest state is correct at the risk of modifying connection state.
+     * If this guarantee is not required, use sync method getChatAuthStateSync()
+     *
+     * By default, network errors are ignored when determining auth state since they may be silently
+     * recoverable later.
+     *
+     * THROTTLE: This function is called in rapid succession by Amazon Q features and can lead to
+     *           a barrage of disk access and/or token refreshes. We throttle to deal with this.
+     *
+     *           Note we do an explicit cast of the return type due to Lodash types incorrectly indicating
+     *           a FeatureAuthState or undefined can be returned. But since we set `leading: true`
+     *           it will always return FeatureAuthState
+     */
+    public getChatAuthState = throttle(() => this._getChatAuthState(), 2000, {
+        leading: true,
+    }) as () => Promise<FeatureAuthState>
+    /**
+     * IMPORTANT: Only use this if you do NOT want to swallow network errors, otherwise use {@link getChatAuthState()}
+     * @param ignoreNetErr swallows network errors
+     */
+    @withTelemetryContext({ name: 'getChatAuthState', class: authClassName })
+    public async _getChatAuthState(ignoreNetErr: boolean = true): Promise<FeatureAuthState> {
+        // The state of the connection may not have been properly validated
+        // and the current state we see may be stale, so refresh for latest state.
+        if (ignoreNetErr) {
+            await tryRun(
+                () => this.auth.refreshConnectionState(this.conn),
+                (err) => !isNetworkError(err),
+                'getChatAuthState: Cannot refresh connection state due to network error: %s'
+            )
+        } else {
+            await this.auth.refreshConnectionState(this.conn)
+        }
+
+        return this.getChatAuthStateSync(this.conn)
+    }
+
+    /**
+     * Synchronously returns a snapshot of the overall auth state of CodeWhisperer + Chat features without
+     * validating or modifying the connection state. It is possible that the connection
+     * is invalid/valid, but the current state displays something else. To guarantee the true state,
+     * use async method getChatAuthState()
+     */
+    public getChatAuthStateSync(conn = this.conn): FeatureAuthState {
+        if (conn === undefined) {
+            return buildFeatureAuthState(AuthStates.disconnected)
+        }
+
+        if (!isSsoConnection(conn) && !isSageMaker()) {
+            throw new ToolkitError(`Connection "${conn.id}" is not a valid type: ${conn.type}`)
+        }
+
+        // default to expired to indicate reauth is needed if unmodified
+        const state: FeatureAuthState = buildFeatureAuthState(AuthStates.expired)
+
+        if (this.isConnectionExpired()) {
+            return state
+        }
+
+        if (isBuilderIdConnection(conn) || isIdcSsoConnection(conn) || isSageMaker()) {
+            // TODO: refactor
+            if (isValidCodeWhispererCoreConnection(conn)) {
+                if (this.requireProfileSelection()) {
+                    state[Features.codewhispererCore] = AuthStates.pendingProfileSelection
+                } else {
+                    state[Features.codewhispererCore] = AuthStates.connected
+                }
+            }
+            if (isValidAmazonQConnection(conn)) {
+                if (this.requireProfileSelection()) {
+                    for (const v of Object.values(Features)) {
+                        state[v as Feature] = AuthStates.pendingProfileSelection
+                    }
+                } else {
+                    for (const v of Object.values(Features)) {
+                        state[v as Feature] = AuthStates.connected
+                    }
+                }
+            }
+        }
+
+        return state
+    }
+
+    /**
+     * Edge Case: Due to a change in behaviour/functionality, there are potential extra
+     * auth connections that the Amazon Q extension has cached. We need to remove these
+     * as they are irrelevant to the Q extension and can cause issues.
+     */
+    public async clearExtraConnections(): Promise<void> {
+        const currentQConn = this.conn
+        // Q currently only maintains 1 connection at a time, so we assume everything else is extra.
+        // IMPORTANT: In the case Q starts to manage multiple connections, this implementation will need to be updated.
+        const allOtherConnections = (await this.auth.listConnections()).filter((c) => c.id !== currentQConn?.id)
+        for (const conn of allOtherConnections) {
+            getLogger().warn(`forgetting extra amazon q connection: %O`, conn)
+            await telemetry.auth_modifyConnection.run(
+                async () => {
+                    telemetry.record({
+                        connectionState: Auth.instance.getConnectionState(conn) ?? 'undefined',
+                        source: asStringifiedStack(telemetry.getFunctionStack()),
+                        ...(await getTelemetryMetadataForConn(conn)),
+                    })
+
+                    if (isInDevEnv()) {
+                        telemetry.record({ action: 'forget' })
+                        // in a Dev Env the connection may be used by code catalyst, so we forget instead of fully deleting
+                        await this.auth.forgetConnection(conn)
+                    } else {
+                        telemetry.record({ action: 'delete' })
+                        await this.auth.deleteConnection(conn)
+                    }
+                },
+                { functionId: { name: 'clearExtraConnections', class: authClassName } }
+            )
+        }
+    }
+}
+
+export type FeatureAuthState = { [feature in Feature]: AuthState }
+export type Feature = (typeof Features)[keyof typeof Features]
+export type AuthState = (typeof AuthStates)[keyof typeof AuthStates]
+
+export const AuthStates = {
+    /** The current connection is working and supports this feature. */
+    connected: 'connected',
+    /** No connection exists, so this feature cannot be used*/
+    disconnected: 'disconnected',
+    /**
+     * The current connection exists, but needs to be reauthenticated for this feature to work
+     *
+     * Look to use {@link AuthUtil.reauthenticate()}
+     */
+    expired: 'expired',
+    /**
+     * A connection exists, but does not support this feature.
+     *
+     * Eg: We are currently using Builder ID, but must use Identity Center.
+     */
+    unsupported: 'unsupported',
+    /**
+     * The current connection exists and isn't expired,
+     * but fetching/refreshing the token resulted in a network error.
+     */
+    connectedWithNetworkError: 'connectedWithNetworkError',
+    pendingProfileSelection: 'pendingProfileSelection',
+} as const
+const Features = {
+    codewhispererCore: 'codewhispererCore',
+    codewhispererChat: 'codewhispererChat',
+    amazonQ: 'amazonQ',
+} as const
+
+function buildFeatureAuthState(state: AuthState): FeatureAuthState {
+    return {
+        codewhispererCore: state,
+        codewhispererChat: state,
+        amazonQ: state,
+    }
+}
diff --git a/packages/core/src/codewhisperer/util/closingBracketUtil.ts b/packages/core/src/codewhisperer/util/closingBracketUtil.ts
new file mode 100644
index 00000000000..4892c5694b4
--- /dev/null
+++ b/packages/core/src/codewhisperer/util/closingBracketUtil.ts
@@ -0,0 +1,263 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ * Reference: https://github.com/aws/aws-toolkit-vscode/blob/amazonq/v1.74.0/packages/core/src/codewhisperer/util/closingBracketUtil.ts
+ */
+
+import * as vscode from 'vscode'
+import * as CodeWhispererConstants from '../models/constants'
+
+interface bracketMapType {
+    [k: string]: string
+}
+
+const quotes = ["'", '"', '`']
+const parenthesis = ['(', '[', '{', ')', ']', '}', '<', '>']
+
+const closeToOpen: bracketMapType = {
+    ')': '(',
+    ']': '[',
+    '}': '{',
+    '>': '<',
+}
+
+const openToClose: bracketMapType = {
+    '(': ')',
+    '[': ']',
+    '{': '}',
+    '<': '>',
+}
+
+/**
+ * LeftContext | Recommendation | RightContext
+ * This function aims to resolve symbols which are redundant and need to be removed
+ * The high level logic is as followed
+ *   1. Pair non-paired closing symbols(parenthesis, brackets, quotes) existing in the "recommendation" with non-paired symbols existing in the "leftContext"
+ *   2. Remove non-paired closing symbols existing in the "rightContext"
+ * @param endPosition: end position of the effective recommendation written by CodeWhisperer
+ * @param startPosition: start position of the effective recommendation by CodeWhisperer
+ *
+ * for example given file context ('|' is where we trigger the service):
+ * anArray.pu|
+ * recommendation returned: "sh(element);"
+ * typeahead: "sh("
+ * the effective recommendation written by CodeWhisperer: "element);"
+ */
+export async function handleExtraBrackets(
+    editor: vscode.TextEditor,
+    endPosition: vscode.Position,
+    startPosition: vscode.Position
+) {
+    const recommendation = editor.document.getText(new vscode.Range(startPosition, endPosition))
+    const endOffset = editor.document.offsetAt(endPosition)
+    const startOffset = editor.document.offsetAt(startPosition)
+    const leftContext = editor.document.getText(
+        new vscode.Range(
+            startPosition,
+            editor.document.positionAt(Math.max(startOffset - CodeWhispererConstants.charactersLimit, 0))
+        )
+    )
+
+    const rightContext = editor.document.getText(
+        new vscode.Range(
+            editor.document.positionAt(endOffset),
+            editor.document.positionAt(endOffset + CodeWhispererConstants.charactersLimit)
+        )
+    )
+    const bracketsToRemove = getBracketsToRemove(
+        editor,
+        recommendation,
+        leftContext,
+        rightContext,
+        endPosition,
+        startPosition
+    )
+
+    const quotesToRemove = getQuotesToRemove(
+        editor,
+        recommendation,
+        leftContext,
+        rightContext,
+        endPosition,
+        startPosition
+    )
+
+    const symbolsToRemove = [...bracketsToRemove, ...quotesToRemove]
+
+    if (symbolsToRemove.length) {
+        await removeBracketsFromRightContext(editor, symbolsToRemove, endPosition)
+    }
+}
+
+const removeBracketsFromRightContext = async (
+    editor: vscode.TextEditor,
+    idxToRemove: number[],
+    endPosition: vscode.Position
+) => {
+    const offset = editor.document.offsetAt(endPosition)
+
+    await editor.edit(
+        (editBuilder) => {
+            for (const idx of idxToRemove) {
+                const range = new vscode.Range(
+                    editor.document.positionAt(offset + idx),
+                    editor.document.positionAt(offset + idx + 1)
+                )
+                editBuilder.delete(range)
+            }
+        },
+        { undoStopAfter: false, undoStopBefore: false }
+    )
+}
+
+function getBracketsToRemove(
+    editor: vscode.TextEditor,
+    recommendation: string,
+    leftContext: string,
+    rightContext: string,
+    end: vscode.Position,
+    start: vscode.Position
+) {
+    const unpairedClosingsInReco = nonClosedClosingParen(recommendation)
+    const unpairedOpeningsInLeftContext = nonClosedOpneingParen(leftContext, unpairedClosingsInReco.length)
+    const unpairedClosingsInRightContext = nonClosedClosingParen(rightContext)
+
+    const toRemove: number[] = []
+
+    let i = 0
+    let j = 0
+    let k = 0
+    while (i < unpairedOpeningsInLeftContext.length && j < unpairedClosingsInReco.length) {
+        const opening = unpairedOpeningsInLeftContext[i]
+        const closing = unpairedClosingsInReco[j]
+
+        const isPaired = closeToOpen[closing.char] === opening.char
+        const rightContextCharToDelete = unpairedClosingsInRightContext[k]
+
+        if (isPaired) {
+            if (rightContextCharToDelete && rightContextCharToDelete.char === closing.char) {
+                const rightContextStart = editor.document.offsetAt(end) + 1
+                const symbolPosition = editor.document.positionAt(
+                    rightContextStart + rightContextCharToDelete.strOffset
+                )
+                const lineCnt = recommendation.split('\n').length - 1
+                const isSameline = symbolPosition.line - lineCnt === start.line
+
+                if (isSameline) {
+                    toRemove.push(rightContextCharToDelete.strOffset)
+                }
+
+                k++
+            }
+        }
+
+        i++
+        j++
+    }
+
+    return toRemove
+}
+
+function getQuotesToRemove(
+    editor: vscode.TextEditor,
+    recommendation: string,
+    leftContext: string,
+    rightContext: string,
+    endPosition: vscode.Position,
+    startPosition: vscode.Position
+) {
+    let leftQuote: string | undefined = undefined
+    let leftIndex: number | undefined = undefined
+    for (let i = leftContext.length - 1; i >= 0; i--) {
+        const char = leftContext[i]
+        if (quotes.includes(char)) {
+            leftQuote = char
+            leftIndex = leftContext.length - i
+            break
+        }
+    }
+
+    let rightQuote: string | undefined = undefined
+    let rightIndex: number | undefined = undefined
+    for (let i = 0; i < rightContext.length; i++) {
+        const char = rightContext[i]
+        if (quotes.includes(char)) {
+            rightQuote = char
+            rightIndex = i
+            break
+        }
+    }
+
+    let quoteCountInReco = 0
+    if (leftQuote && rightQuote && leftQuote === rightQuote) {
+        for (const char of recommendation) {
+            if (quotes.includes(char) && char === leftQuote) {
+                quoteCountInReco++
+            }
+        }
+    }
+
+    if (leftIndex !== undefined && rightIndex !== undefined && quoteCountInReco % 2 !== 0) {
+        const p = editor.document.positionAt(editor.document.offsetAt(endPosition) + rightIndex)
+
+        if (endPosition.line === startPosition.line && endPosition.line === p.line) {
+            return [rightIndex]
+        }
+    }
+
+    return []
+}
+
+function nonClosedOpneingParen(str: string, cnt?: number): { char: string; strOffset: number }[] {
+    const resultSet: { char: string; strOffset: number }[] = []
+    const stack: string[] = []
+
+    for (let i = str.length - 1; i >= 0; i--) {
+        const char = str[i]
+        if (char! in parenthesis) {
+            continue
+        }
+
+        if (char in closeToOpen) {
+            stack.push(char)
+            if (cnt && cnt === resultSet.length) {
+                return resultSet
+            }
+        } else if (char in openToClose) {
+            if (stack.length !== 0 && stack[stack.length - 1] === openToClose[char]) {
+                stack.pop()
+            } else {
+                resultSet.push({ char: char, strOffset: i })
+            }
+        }
+    }
+
+    return resultSet
+}
+
+function nonClosedClosingParen(str: string, cnt?: number): { char: string; strOffset: number }[] {
+    const resultSet: { char: string; strOffset: number }[] = []
+    const stack: string[] = []
+
+    for (let i = 0; i < str.length; i++) {
+        const char = str[i]
+        if (char! in parenthesis) {
+            continue
+        }
+
+        if (char in openToClose) {
+            stack.push(char)
+            if (cnt && cnt === resultSet.length) {
+                return resultSet
+            }
+        } else if (char in closeToOpen) {
+            if (stack.length !== 0 && stack[stack.length - 1] === closeToOpen[char]) {
+                stack.pop()
+            } else {
+                resultSet.push({ char: char, strOffset: i })
+            }
+        }
+    }
+
+    return resultSet
+}
diff --git a/packages/core/src/codewhisperer/util/codeWhispererApplication.ts b/packages/core/src/codewhisperer/util/codeWhispererApplication.ts
new file mode 100644
index 00000000000..e9e4947d9e1
--- /dev/null
+++ b/packages/core/src/codewhisperer/util/codeWhispererApplication.ts
@@ -0,0 +1,19 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import vscode from 'vscode'
+
+class CodeWhispererApplication {
+    static #instance: CodeWhispererApplication
+
+    readonly _clearCodeWhispererUIListener: vscode.EventEmitter<void> = new vscode.EventEmitter<void>()
+    public readonly clearCodeWhispererUIListener: vscode.Event<void> = this._clearCodeWhispererUIListener.event
+
+    public static get instance() {
+        return (this.#instance ??= new CodeWhispererApplication())
+    }
+}
+
+export const application = () => CodeWhispererApplication.instance
diff --git a/packages/core/src/codewhisperer/util/codeWhispererSession.ts b/packages/core/src/codewhisperer/util/codeWhispererSession.ts
new file mode 100644
index 00000000000..4a529941004
--- /dev/null
+++ b/packages/core/src/codewhisperer/util/codeWhispererSession.ts
@@ -0,0 +1,126 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import {
+    CodewhispererCompletionType,
+    CodewhispererLanguage,
+    CodewhispererGettingStartedTask,
+    CodewhispererAutomatedTriggerType,
+    CodewhispererTriggerType,
+} from '../../shared/telemetry/telemetry.gen'
+import { GenerateRecommendationsRequest, ListRecommendationsRequest, Recommendation } from '../client/codewhisperer'
+import { Position } from 'vscode'
+import { CodeWhispererSupplementalContext, vsCodeState } from '../models/model'
+import { FileDiagnostic, getDiagnosticsOfCurrentFile } from './diagnosticsUtil'
+
+class CodeWhispererSession {
+    static #instance: CodeWhispererSession
+
+    // Per-session states
+    sessionId = ''
+    requestIdList: string[] = []
+    startPos = new Position(0, 0)
+    startCursorOffset = 0
+    leftContextOfCurrentLine = ''
+    requestContext: {
+        request: ListRecommendationsRequest | GenerateRecommendationsRequest
+        supplementalMetadata: CodeWhispererSupplementalContext | undefined
+    } = { request: {} as any, supplementalMetadata: {} as any }
+    language: CodewhispererLanguage = 'python'
+    taskType: CodewhispererGettingStartedTask | undefined
+    triggerType: CodewhispererTriggerType = 'OnDemand'
+    autoTriggerType: CodewhispererAutomatedTriggerType | undefined
+
+    // Various states of recommendations
+    recommendations: Recommendation[] = []
+    suggestionStates = new Map<number, string>()
+    completionTypes = new Map<number, CodewhispererCompletionType>()
+
+    // Some other variables for client component latency
+    fetchCredentialStartTime = 0
+    sdkApiCallStartTime = 0
+    invokeSuggestionStartTime = 0
+    preprocessEndTime = 0
+    timeToFirstRecommendation = 0
+    firstSuggestionShowTime = 0
+    perceivedLatency = 0
+    diagnosticsBeforeAccept: FileDiagnostic | undefined = undefined
+
+    public static get instance() {
+        return (this.#instance ??= new CodeWhispererSession())
+    }
+
+    setFetchCredentialStart() {
+        if (this.fetchCredentialStartTime === 0 && this.invokeSuggestionStartTime !== 0) {
+            this.fetchCredentialStartTime = Date.now()
+        }
+    }
+
+    setSdkApiCallStart() {
+        if (this.sdkApiCallStartTime === 0 && this.fetchCredentialStartTime !== 0) {
+            this.sdkApiCallStartTime = Date.now()
+        }
+    }
+
+    setTimeToFirstRecommendation(timeToFirstRecommendation: number) {
+        if (this.invokeSuggestionStartTime) {
+            this.timeToFirstRecommendation = timeToFirstRecommendation - this.invokeSuggestionStartTime
+        }
+        this.diagnosticsBeforeAccept = getDiagnosticsOfCurrentFile()
+    }
+
+    setSuggestionState(index: number, value: string) {
+        this.suggestionStates.set(index, value)
+    }
+
+    getSuggestionState(index: number): string | undefined {
+        return this.suggestionStates.get(index)
+    }
+
+    setCompletionType(index: number, recommendation: Recommendation) {
+        const nonBlankLines = recommendation.content.split('\n').filter((line) => line.trim() !== '').length
+        this.completionTypes.set(index, nonBlankLines > 1 ? 'Block' : 'Line')
+    }
+
+    getCompletionType(index: number): CodewhispererCompletionType {
+        return this.completionTypes.get(index) || 'Line'
+    }
+
+    getPerceivedLatency(triggerType: CodewhispererTriggerType) {
+        if (triggerType === 'OnDemand') {
+            return this.timeToFirstRecommendation
+        } else {
+            return session.firstSuggestionShowTime - vsCodeState.lastUserModificationTime
+        }
+    }
+
+    setPerceivedLatency() {
+        if (this.perceivedLatency !== 0) {
+            return
+        }
+        if (this.triggerType === 'OnDemand') {
+            this.perceivedLatency = this.timeToFirstRecommendation
+        } else {
+            this.perceivedLatency = this.firstSuggestionShowTime - vsCodeState.lastUserModificationTime
+        }
+    }
+
+    reset() {
+        this.sessionId = ''
+        this.requestContext = { request: {} as any, supplementalMetadata: {} as any }
+        this.requestIdList = []
+        this.startPos = new Position(0, 0)
+        this.startCursorOffset = 0
+        this.leftContextOfCurrentLine = ''
+        this.language = 'python'
+        this.triggerType = 'OnDemand'
+        this.recommendations = []
+        this.suggestionStates.clear()
+        this.completionTypes.clear()
+        this.diagnosticsBeforeAccept = undefined
+    }
+}
+
+// TODO: convert this to a function call
+export const session = CodeWhispererSession.instance
diff --git a/packages/core/src/codewhisperer/util/codewhispererSettings.ts b/packages/core/src/codewhisperer/util/codewhispererSettings.ts
new file mode 100644
index 00000000000..80f5d1f2a0d
--- /dev/null
+++ b/packages/core/src/codewhisperer/util/codewhispererSettings.ts
@@ -0,0 +1,102 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { ArrayConstructor } from '../../shared/utilities/typeConstructors'
+import { fromExtensionManifest, migrateSetting } from '../../shared/settings'
+
+const description = {
+    showCodeWithReferences: Boolean,
+    importRecommendationForInlineCodeSuggestions: Boolean, // eslint-disable-line id-length
+    shareContentWithAWS: Boolean,
+    workspaceIndex: Boolean,
+    workspaceIndexWorkerThreads: Number,
+    workspaceIndexUseGPU: Boolean,
+    workspaceIndexMaxSize: Number,
+    workspaceIndexMaxFileSize: Number,
+    workspaceIndexCacheDirPath: String,
+    workspaceIndexIgnoreFilePatterns: ArrayConstructor(String),
+    allowFeatureDevelopmentToRunCodeAndTests: Object,
+    ignoredSecurityIssues: ArrayConstructor(String),
+}
+
+export class CodeWhispererSettings extends fromExtensionManifest('amazonQ', description) {
+    // TODO: Remove after a few releases
+    public async importSettings() {
+        await migrateSetting(
+            { key: 'amazonQ.showInlineCodeSuggestionsWithCodeReferences', type: Boolean },
+            { key: 'amazonQ.showCodeWithReferences' }
+        )
+    }
+    public isSuggestionsWithCodeReferencesEnabled(): boolean {
+        return this.get(`showCodeWithReferences`, false)
+    }
+    public isImportRecommendationEnabled(): boolean {
+        return this.get(`importRecommendationForInlineCodeSuggestions`, false)
+    }
+
+    public isOptoutEnabled(): boolean {
+        const value = this.get('shareContentWithAWS', true)
+        return !value
+    }
+    public isLocalIndexEnabled(): boolean {
+        return this.get('workspaceIndex', false)
+    }
+
+    public async enableLocalIndex() {
+        await this.update('workspaceIndex', true)
+    }
+
+    public isLocalIndexGPUEnabled(): boolean {
+        return this.get('workspaceIndexUseGPU', false)
+    }
+
+    public getIndexWorkerThreads(): number {
+        // minimal 0 threads
+        return Math.max(this.get('workspaceIndexWorkerThreads', 0), 0)
+    }
+
+    public getMaxIndexSize(): number {
+        // minimal 1MB
+        return Math.max(this.get('workspaceIndexMaxSize', 2048), 1)
+    }
+
+    public getMaxIndexFileSize(): number {
+        // minimal 1MB
+        return Math.max(this.get('workspaceIndexMaxFileSize', 10), 1)
+    }
+
+    public getIndexCacheDirPath(): string {
+        return this.get('workspaceIndexCacheDirPath', '')
+    }
+
+    public getIndexIgnoreFilePatterns(): string[] {
+        return this.get('workspaceIndexIgnoreFilePatterns', [])
+    }
+
+    public getAutoBuildSetting(): { [key: string]: boolean } {
+        return this.get('allowFeatureDevelopmentToRunCodeAndTests', {})
+    }
+
+    public async updateAutoBuildSetting(projectName: string, setting: boolean) {
+        const projects = this.getAutoBuildSetting()
+
+        projects[projectName] = setting
+
+        await this.update('allowFeatureDevelopmentToRunCodeAndTests', projects)
+    }
+
+    public getIgnoredSecurityIssues(): string[] {
+        return this.get('ignoredSecurityIssues', [])
+    }
+
+    public async addToIgnoredSecurityIssuesList(issueTitle: string) {
+        await this.update('ignoredSecurityIssues', [...this.getIgnoredSecurityIssues(), issueTitle])
+    }
+
+    static #instance: CodeWhispererSettings
+
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+}
diff --git a/packages/core/src/codewhisperer/util/commonUtil.ts b/packages/core/src/codewhisperer/util/commonUtil.ts
new file mode 100644
index 00000000000..d2df78f1369
--- /dev/null
+++ b/packages/core/src/codewhisperer/util/commonUtil.ts
@@ -0,0 +1,87 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as semver from 'semver'
+import { distance } from 'fastest-levenshtein'
+import { getInlineSuggestEnabled } from '../../shared/utilities/editorUtilities'
+import {
+    AWSTemplateCaseInsensitiveKeyWords,
+    AWSTemplateKeyWords,
+    JsonConfigFileNamingConvention,
+} from '../models/constants'
+
+export function getLocalDatetime() {
+    const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone
+    return new Date().toLocaleString([], { timeZone: timezone })
+}
+
+export function asyncCallWithTimeout<T>(asyncPromise: Promise<T>, message: string, timeLimit: number): Promise<T> {
+    let timeoutHandle: NodeJS.Timeout
+    const timeoutPromise = new Promise((_resolve, reject) => {
+        timeoutHandle = setTimeout(() => reject(new Error(message)), timeLimit)
+    })
+    return Promise.race([asyncPromise, timeoutPromise]).then((result) => {
+        clearTimeout(timeoutHandle)
+        return result as T
+    })
+}
+
+export function isInlineCompletionEnabled() {
+    return getInlineSuggestEnabled()
+}
+
+// This is the VS Code version that started to have regressions in inline completion API
+export function isVscHavingRegressionInlineCompletionApi() {
+    return semver.gte(vscode.version, '1.78.0') && getInlineSuggestEnabled()
+}
+
+export function getFileExt(languageId: string) {
+    switch (languageId) {
+        case 'java':
+            return '.java'
+        case 'python':
+            return '.py'
+        default:
+            break
+    }
+    return undefined
+}
+
+/**
+ * Returns the longest overlap between the Suffix of firstString and Prefix of second string
+ * getPrefixSuffixOverlap("adwg31", "31ggrs") = "31"
+ */
+export function getPrefixSuffixOverlap(firstString: string, secondString: string) {
+    let i = Math.min(firstString.length, secondString.length)
+    while (i > 0) {
+        if (secondString.slice(0, i) === firstString.slice(-i)) {
+            break
+        }
+        i--
+    }
+    return secondString.slice(0, i)
+}
+
+export function checkLeftContextKeywordsForJson(fileName: string, leftFileContent: string, language: string): boolean {
+    if (
+        language === 'json' &&
+        !AWSTemplateKeyWords.some((substring) => leftFileContent.includes(substring)) &&
+        !AWSTemplateCaseInsensitiveKeyWords.some((substring) => leftFileContent.toLowerCase().includes(substring)) &&
+        !JsonConfigFileNamingConvention.has(fileName.toLowerCase())
+    ) {
+        return true
+    }
+    return false
+}
+
+// With edit distance, complicate usermodification can be considered as simple edit(add, delete, replace),
+// and thus the unmodified part of recommendation length can be deducted/approximated
+// ex. (modified > original): originalRecom: foo -> modifiedRecom: fobarbarbaro, distance = 9, delta = 12 - 9 = 3
+// ex. (modified == original): originalRecom: helloworld -> modifiedRecom: HelloWorld, distance = 2, delta = 10 - 2 = 8
+// ex. (modified < original): originalRecom: CodeWhisperer -> modifiedRecom: CODE, distance = 12, delta = 13 - 12 = 1
+export function getUnmodifiedAcceptedTokens(origin: string, after: string) {
+    return Math.max(origin.length, after.length) - distance(origin, after)
+}
diff --git a/packages/core/src/codewhisperer/util/customizationUtil.ts b/packages/core/src/codewhisperer/util/customizationUtil.ts
new file mode 100644
index 00000000000..600317c53e0
--- /dev/null
+++ b/packages/core/src/codewhisperer/util/customizationUtil.ts
@@ -0,0 +1,457 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../../shared/extensionGlobals'
+import { customLearnMoreUri, newCustomizationMessage } from '../models/constants'
+import { localize, openUrl } from '../../shared/utilities/vsCodeUtils'
+import { AuthUtil } from './authUtil'
+import * as vscode from 'vscode'
+import { createCommonButtons } from '../../shared/ui/buttons'
+import { DataQuickPickItem, showQuickPick } from '../../shared/ui/pickerPrompter'
+import CodeWhispererUserClient, { Customization, ResourceArn } from '../client/codewhispereruserclient'
+import { codicon, getIcon } from '../../shared/icons'
+import { getLogger } from '../../shared/logger/logger'
+import { showMessageWithUrl } from '../../shared/utilities/messages'
+import { parse } from '@aws-sdk/util-arn-parser'
+import { Commands } from '../../shared/vscode/commands2'
+import { RegionProfile, vsCodeState } from '../models/model'
+import { pageableToCollection } from '../../shared/utilities/collectionUtils'
+import { isAwsError } from '../../shared/errors'
+import { ProfileChangedEvent } from '../region/regionProfileManager'
+
+export class CustomizationProvider {
+    readonly region: string
+    constructor(
+        private readonly client: CodeWhispererUserClient,
+        private readonly profile: RegionProfile
+    ) {
+        this.region = profile.region
+    }
+
+    async listAvailableCustomizations(): Promise<Customization[]> {
+        const requester = async (request: CodeWhispererUserClient.ListAvailableCustomizationsRequest) =>
+            this.client.listAvailableCustomizations(request).promise()
+
+        try {
+            const request = { profileArn: this.profile.arn }
+            const customizations = await pageableToCollection(requester, request, 'nextToken', 'customizations')
+                .flatten()
+                .promise()
+
+            return customizations
+        } catch (e) {
+            const logMsg = isAwsError(e) ? `requestId=${e.requestId}; message=${e.message}` : (e as Error).message
+            getLogger().error(`failed to listAvailableCustomizations: ${logMsg}`)
+            return []
+        }
+    }
+
+    static async init(profile: RegionProfile): Promise<CustomizationProvider> {
+        const client = await AuthUtil.instance.regionProfileManager.createQClient(profile)
+        return new CustomizationProvider(client, profile)
+    }
+}
+
+export const onProfileChangedListener: (event: ProfileChangedEvent) => any = async (event) => {
+    // Skip because customization means the following validation has been done
+    if (event.intent === 'customization') {
+        return
+    }
+    const logger = getLogger()
+    if (!event.profile) {
+        await setSelectedCustomization(baseCustomization)
+        return
+    }
+
+    // Validate user still has access to the selected customization.
+    const selectedCustomization = getSelectedCustomization()
+    // No need to validate base customization which has empty arn.
+    if (selectedCustomization.arn.length > 0) {
+        const customizationProvider = await CustomizationProvider.init(event.profile)
+        const customizations = await customizationProvider.listAvailableCustomizations()
+
+        const r = customizations.find((it) => it.arn === selectedCustomization.arn)
+        if (!r) {
+            logger.debug(
+                `profile ${event.profile.name} doesnt have access to customization ${selectedCustomization.name} but has access to ${customizations.map((it) => it.name)}`
+            )
+            await switchToBaseCustomizationAndNotify()
+        }
+    }
+}
+
+/**
+ *
+ * @param availableCustomizations
+ * @returns customization diff of availableCustomizations vs. persisted customizations
+ */
+export const getNewCustomizations = (availableCustomizations: Customization[]) => {
+    const persistedCustomizations = getPersistedCustomizations()
+    return availableCustomizations.filter((c) => !persistedCustomizations.map((p) => p.arn).includes(c.arn))
+}
+
+export async function notifyNewCustomizations() {
+    let availableCustomizations: Customization[] = []
+    try {
+        availableCustomizations = await getAvailableCustomizationsList()
+        AuthUtil.instance.isCustomizationFeatureEnabled = true
+    } catch (error) {
+        // On receiving any error, we will disable the customization feature
+        AuthUtil.instance.isCustomizationFeatureEnabled = false
+        await setSelectedCustomization(baseCustomization)
+        getLogger().error(`Failed to fetch customizations: %O`, error)
+        return
+    }
+
+    const selectedCustomization = getSelectedCustomization()
+    if (!isSelectedCustomizationAvailable(availableCustomizations, selectedCustomization)) {
+        await switchToBaseCustomizationAndNotify()
+    }
+
+    const newCustomizations = getNewCustomizations(availableCustomizations)
+    await setPersistedCustomizations(availableCustomizations)
+
+    if (newCustomizations.length === 0) {
+        return
+    }
+
+    await setNewCustomizationsAvailable(newCustomizations.length)
+
+    const select = localize(
+        'AWS.codewhisperer.customization.notification.new_customizations.select',
+        'Select Customization'
+    )
+    const learnMore = localize(
+        'AWS.codewhisperer.customization.notification.new_customizations.learn_more',
+        'Learn More'
+    )
+    void vscode.window.showInformationMessage(newCustomizationMessage, select, learnMore).then(async (resp) => {
+        if (resp === select) {
+            showCustomizationPrompt().catch((e) => {
+                getLogger().error('showCustomizationPrompt failed: %s', (e as Error).message)
+            })
+        } else if (resp === learnMore) {
+            // TODO: figure out the right uri
+            void openUrl(vscode.Uri.parse(customLearnMoreUri))
+        }
+    })
+}
+
+// Return true when either it's the default option or the selected one is in the ones we fetched from upstream.
+export const isSelectedCustomizationAvailable = (available: Customization[], selected: Customization) => {
+    return selected.arn === '' || available.map((c) => c.arn).includes(selected.arn)
+}
+
+export const baseCustomization = {
+    arn: '',
+    name: localize('AWS.codewhisperer.customization.base.label', 'Amazon Q foundation (Default)'),
+    description: localize(
+        'AWS.codewhisperer.customization.base.detail',
+        'Receive suggestions from Amazon Q base model'
+    ),
+}
+
+/**
+ * @returns customization selected by users, `baseCustomization` if none is selected
+ */
+export const getSelectedCustomization = (): Customization => {
+    if (
+        !AuthUtil.instance.isCustomizationFeatureEnabled ||
+        !AuthUtil.instance.isValidEnterpriseSsoInUse() ||
+        !AuthUtil.instance.conn
+    ) {
+        return baseCustomization
+    }
+
+    const selectedCustomizationArr = globals.globalState.tryGet<{ [label: string]: Customization }>(
+        'CODEWHISPERER_SELECTED_CUSTOMIZATION',
+        Object,
+        {}
+    )
+    const selectedCustomization = selectedCustomizationArr[AuthUtil.instance.conn.label]
+
+    if (selectedCustomization && selectedCustomization.name !== '') {
+        return selectedCustomization
+    } else {
+        return baseCustomization
+    }
+}
+
+/**
+ * @param customization customization to select
+ * @param isOverride if the API call is made from us (Q) but not users' intent, set isOverride to TRUE
+ * Override happens when ALL following conditions are met
+ *  1. service returns non-empty override customization arn, refer to [featureConfig.ts]
+ *  2. the override customization arn is different from the previous override customization if any. The purpose is to only do override once on users' behalf.
+ */
+export const setSelectedCustomization = async (customization: Customization, isOverride: boolean = false) => {
+    if (!AuthUtil.instance.isValidEnterpriseSsoInUse() || !AuthUtil.instance.conn) {
+        return
+    }
+    if (isOverride) {
+        const previousOverride = globals.globalState.tryGet<string>('aws.amazonq.customization.overrideV2', String)
+        if (customization.arn === previousOverride) {
+            return
+        }
+    }
+    const selectedCustomizationObj = globals.globalState.tryGet<{ [label: string]: Customization }>(
+        'CODEWHISPERER_SELECTED_CUSTOMIZATION',
+        Object,
+        {}
+    )
+    selectedCustomizationObj[AuthUtil.instance.conn.label] = customization
+    getLogger().debug(`Selected customization ${customization.name} for ${AuthUtil.instance.conn.label}`)
+
+    await globals.globalState.update('CODEWHISPERER_SELECTED_CUSTOMIZATION', selectedCustomizationObj)
+    if (isOverride) {
+        await globals.globalState.update('aws.amazonq.customization.overrideV2', customization.arn)
+    }
+    vsCodeState.isFreeTierLimitReached = false
+    await Commands.tryExecute('aws.amazonq.refreshStatusBar')
+
+    // hack: triggers amazon q to send the customizations back to flare
+    await Commands.tryExecute('aws.amazonq.updateCustomizations')
+}
+
+export const getPersistedCustomizations = (): Customization[] => {
+    if (!AuthUtil.instance.isValidEnterpriseSsoInUse() || !AuthUtil.instance.conn) {
+        return []
+    }
+    const persistedCustomizationsObj = globals.globalState.tryGet<{ [label: string]: Customization[] }>(
+        'CODEWHISPERER_PERSISTED_CUSTOMIZATIONS',
+        Object,
+        {}
+    )
+    return persistedCustomizationsObj[AuthUtil.instance.conn.label] || []
+}
+
+export const setPersistedCustomizations = async (customizations: Customization[]) => {
+    if (!AuthUtil.instance.isValidEnterpriseSsoInUse() || !AuthUtil.instance.conn) {
+        return
+    }
+    const persistedCustomizationsObj = globals.globalState.tryGet<{ [label: string]: Customization[] }>(
+        'CODEWHISPERER_PERSISTED_CUSTOMIZATIONS',
+        Object,
+        {}
+    )
+    persistedCustomizationsObj[AuthUtil.instance.conn.label] = customizations
+    await globals.globalState.update('CODEWHISPERER_PERSISTED_CUSTOMIZATIONS', persistedCustomizationsObj)
+}
+
+export const getNewCustomizationsAvailable = () => {
+    return globals.globalState.tryGet('aws.amazonq.codewhisperer.newCustomizations', Number, 0)
+}
+
+export const setNewCustomizationsAvailable = async (num: number) => {
+    await globals.globalState.update('aws.amazonq.codewhisperer.newCustomizations', num)
+    vsCodeState.isFreeTierLimitReached = false
+}
+
+export async function showCustomizationPrompt() {
+    await setNewCustomizationsAvailable(0)
+    await showQuickPick(createCustomizationItems(), {
+        title: localize('AWS.codewhisperer.customization.quickPick.title', 'Select a Customization'),
+        placeholder: localize(
+            'AWS.codewhisperer.customization.quickPick.placeholder',
+            'You have access to the following customizations'
+        ),
+        buttons: createCommonButtons() as vscode.QuickInputButton[],
+        compare: (a, b) => {
+            if (a.invalidSelection) {
+                return -1
+            }
+            if (b.invalidSelection) {
+                return 1
+            }
+            return a.label < b.label ? -1 : 1
+        },
+        recentlyUsed: localize('AWS.codewhisperer.customization.selected', '   Connected'),
+    })
+}
+
+const createCustomizationItems = async () => {
+    const items = []
+    const availableCustomizations = await getAvailableCustomizationsList()
+
+    // Order matters
+    // 1. read the old snapshot of customizations
+    const persistedCustomizations = getPersistedCustomizations()
+
+    // 2. update the customizations snapshot with the latest
+    await setPersistedCustomizations(availableCustomizations)
+
+    const selectedCustomization = getSelectedCustomization()
+    if (!isSelectedCustomizationAvailable(availableCustomizations, selectedCustomization)) {
+        await switchToBaseCustomizationAndNotify()
+    }
+
+    if (availableCustomizations.length === 0) {
+        items.push(createBaseCustomizationItem())
+
+        void showMessageWithUrl(
+            localize(
+                'AWS.codewhisperer.customization.noCustomizations.description',
+                'You dont have access to any Amazon Q customization. Contact your admin for access.'
+            ),
+            customLearnMoreUri,
+            localize('AWS.codewhisperer.customization.notification.new_customizations.learn_more', 'Learn More'),
+            'info'
+        )
+        return items
+    }
+
+    const persistedArns = persistedCustomizations.map((c) => c.arn)
+    const customizationNameToCount = availableCustomizations.reduce((map, customization) => {
+        if (customization.name) {
+            map.set(customization.name, (map.get(customization.name) || 0) + 1)
+        }
+
+        return map
+    }, new Map<string, number>())
+
+    items.push(createBaseCustomizationItem())
+    items.push(
+        ...availableCustomizations.map((c) => {
+            let shouldPrefixAccountId = false
+            if (c.name) {
+                const cnt = customizationNameToCount.get(c.name) || 0
+                if (cnt > 1) {
+                    shouldPrefixAccountId = true
+                }
+            }
+
+            return createCustomizationItem(c, persistedArns, shouldPrefixAccountId)
+        })
+    )
+    return items
+}
+
+const createBaseCustomizationItem = () => {
+    const label = codicon`${getIcon('vscode-circuit-board')} ${localize(
+        'AWS.codewhisperer.customization.base.label',
+        'Amazon Q foundation (Default)'
+    )}`
+    const selectedArn = getSelectedCustomization().arn
+    return {
+        label: label,
+        onClick: async () => {
+            await selectCustomization(baseCustomization)
+        },
+        detail: localize(
+            'AWS.codewhisperer.customization.base.description',
+            'Receive suggestions from Amazon Q base model'
+        ),
+        description: renderDescriptionText(label),
+        recentlyUsed: selectedArn === baseCustomization.arn,
+    } as DataQuickPickItem<string>
+}
+
+/**
+ * When users click "select customizations", we're showing ALL customizations across different profiles.
+ * Thus If users select the customization, we also change the profile if the customization is accessible from a different profile.
+ */
+const createCustomizationItem = (
+    customization: Customization & { profile: RegionProfile },
+    persistedArns: (ResourceArn | undefined)[],
+    shouldPrefixAccountId: boolean
+) => {
+    const accountId = parse(customization.arn).accountId
+    const displayedName = customization.name
+        ? shouldPrefixAccountId
+            ? accountId
+                ? `${customization.name} (${accountId})`
+                : `${customization.name} (${customization.profile.name})`
+            : `${customization.name} (${customization.profile.name})`
+        : 'unknown'
+
+    const isNewCustomization = !persistedArns.includes(customization.arn)
+    const label = codicon`${getIcon('vscode-circuit-board')} ${displayedName}`
+    const selectedArn = getSelectedCustomization().arn
+    return {
+        label: label,
+        onClick: async () => {
+            const profile = AuthUtil.instance.regionProfileManager.activeRegionProfile
+            if (profile && customization.profile.arn !== profile.arn) {
+                await AuthUtil.instance.regionProfileManager.switchRegionProfile(customization.profile, 'customization')
+            }
+            await selectCustomization(customization)
+        },
+        detail:
+            customization.description !== ''
+                ? customization.description
+                : localize('AWS.codewhisperer.customization.no.description.text', 'No description provided'),
+        description: renderDescriptionText(label, isNewCustomization),
+        data: customization.arn,
+        recentlyUsed: selectedArn === customization.arn,
+    } as DataQuickPickItem<string>
+}
+
+export const selectCustomization = async (customization: Customization) => {
+    // If the newly selected customization is same as the old one, do nothing
+    const selectedCustomization = getSelectedCustomization()
+    if (selectedCustomization.arn === customization.arn) {
+        return
+    }
+    await setSelectedCustomization(customization)
+    const suffix =
+        customization.arn === baseCustomization.arn ? customization.name : `${customization.name} customization.`
+    void vscode.window.showInformationMessage(
+        localize(
+            'AWS.codewhisperer.customization.selected.message',
+            'Amazon Q suggestions are now coming from the {0}',
+            suffix
+        )
+    )
+}
+
+// Return all customizations across different profiles and associate the customization with the source profile
+export const getAvailableCustomizationsList = async () => {
+    const items: (Customization & { profile: RegionProfile })[] = []
+    const profiles: RegionProfile[] = []
+    try {
+        const r = await AuthUtil.instance.regionProfileManager.getProfiles()
+        profiles.push(...r)
+    } catch (e) {
+        getLogger().error(`Failed to list customizations because listAvailableProfiles failed %s`, (e as Error).message)
+        return []
+    }
+
+    for (const profile of profiles) {
+        const provider = await CustomizationProvider.init(profile)
+        const customizations = await provider.listAvailableCustomizations()
+
+        for (const c of customizations) {
+            items.push({
+                ...c,
+                profile: profile,
+            })
+        }
+    }
+
+    return items
+}
+
+// show notification that selected customization is not available, switching back to base
+export const switchToBaseCustomizationAndNotify = async () => {
+    await setSelectedCustomization(baseCustomization)
+    const selectCustomizationLabel = localize(
+        'AWS.codewhisperer.customization.notification.selectCustomization',
+        'Select Another Customization'
+    )
+    const selection = await vscode.window.showWarningMessage(
+        localize(
+            'AWS.codewhisperer.customization.notification.selected_customization_not_available',
+            'Selected Amazon Q customization is not available. Contact your administrator. Your instance of Amazon Q is using the foundation model.'
+        ),
+        selectCustomizationLabel
+    )
+    if (selection === selectCustomizationLabel) {
+        await showCustomizationPrompt()
+    }
+}
+
+const renderDescriptionText = (label: string, isNewCustomization: boolean = false) => {
+    return isNewCustomization ? '   New' : ''
+}
diff --git a/packages/core/src/codewhisperer/util/diagnosticsUtil.ts b/packages/core/src/codewhisperer/util/diagnosticsUtil.ts
new file mode 100644
index 00000000000..5a34c3e4430
--- /dev/null
+++ b/packages/core/src/codewhisperer/util/diagnosticsUtil.ts
@@ -0,0 +1,117 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import * as crypto from 'crypto'
+import { IdeDiagnostic } from '../client/codewhispereruserclient'
+
+export function getDiagnosticsOfCurrentFile(): FileDiagnostic | undefined {
+    if (vscode.window.activeTextEditor) {
+        return {
+            diagnostics: vscode.languages.getDiagnostics(vscode.window.activeTextEditor.document.uri),
+            filepath: vscode.window.activeTextEditor.document.uri.fsPath,
+        }
+    }
+    return undefined
+}
+
+export type FileDiagnostic = {
+    filepath: string
+    diagnostics: vscode.Diagnostic[]
+}
+
+export function getDiagnosticsDifferences(
+    oldDiagnostics: FileDiagnostic | undefined,
+    newDiagnostics: FileDiagnostic | undefined
+): { added: vscode.Diagnostic[]; removed: vscode.Diagnostic[] } {
+    const result: { added: vscode.Diagnostic[]; removed: vscode.Diagnostic[] } = { added: [], removed: [] }
+    if (
+        oldDiagnostics === undefined ||
+        newDiagnostics === undefined ||
+        newDiagnostics.filepath !== oldDiagnostics.filepath
+    ) {
+        return result
+    }
+
+    // Create maps using diagnostic key for uniqueness
+    const oldMap = new Map(oldDiagnostics.diagnostics.map((d) => [getDiagnosticKey(d), d]))
+    const newMap = new Map(newDiagnostics.diagnostics.map((d) => [getDiagnosticKey(d), d]))
+
+    // Get added diagnostics (in new but not in old)
+    result.added = [...newMap.values()].filter((d) => !oldMap.has(getDiagnosticKey(d)))
+
+    // Get removed diagnostics (in old but not in new)
+    result.removed = [...oldMap.values()].filter((d) => !newMap.has(getDiagnosticKey(d)))
+
+    return result
+}
+
+export function toIdeDiagnostics(diagnostic: vscode.Diagnostic): IdeDiagnostic {
+    const severity =
+        diagnostic.severity === vscode.DiagnosticSeverity.Error
+            ? 'ERROR'
+            : diagnostic.severity === vscode.DiagnosticSeverity.Warning
+              ? 'WARNING'
+              : diagnostic.severity === vscode.DiagnosticSeverity.Hint
+                ? 'HINT'
+                : 'INFORMATION'
+
+    return {
+        ideDiagnosticType: getDiagnosticsType(diagnostic.message),
+        severity: severity,
+        source: diagnostic.source,
+        range: {
+            start: {
+                line: diagnostic.range.start.line,
+                character: diagnostic.range.start.character,
+            },
+            end: {
+                line: diagnostic.range.end.line,
+                character: diagnostic.range.end.character,
+            },
+        },
+    }
+}
+
+export function getDiagnosticsType(message: string): string {
+    const errorTypes = new Map([
+        ['SYNTAX_ERROR', ['expected', 'indent', 'syntax']],
+        ['TYPE_ERROR', ['type', 'cast']],
+        ['REFERENCE_ERROR', ['undefined', 'not defined', 'undeclared', 'reference']],
+        ['BEST_PRACTICE', ['deprecated', 'unused', 'uninitialized', 'not initialized']],
+        ['SECURITY', ['security', 'vulnerability']],
+    ])
+
+    const lowercaseMessage = message.toLowerCase()
+
+    for (const [errorType, keywords] of errorTypes) {
+        if (keywords.some((keyword) => lowercaseMessage.includes(keyword))) {
+            return errorType
+        }
+    }
+
+    return 'OTHER'
+}
+
+/**
+ * Generates a unique MD5 hash key for a VS Code diagnostic object.
+ *
+ * @param diagnostic - A VS Code Diagnostic object containing information about a code diagnostic
+ * @returns A 32-character hexadecimal MD5 hash string that uniquely identifies the diagnostic
+ *
+ * @description
+ * Creates a deterministic hash by combining the diagnostic's message, severity, code, and source.
+ * This hash can be used as a unique identifier for deduplication or tracking purposes.
+ * Note: range is not in the hashed string because a diagnostic can move and its range can change within the editor
+ */
+function getDiagnosticKey(diagnostic: vscode.Diagnostic): string {
+    const jsonStr = JSON.stringify({
+        message: diagnostic.message,
+        severity: diagnostic.severity,
+        code: diagnostic.code,
+        source: diagnostic.source,
+    })
+
+    return crypto.createHash('md5').update(jsonStr).digest('hex')
+}
diff --git a/packages/core/src/codewhisperer/util/editorContext.ts b/packages/core/src/codewhisperer/util/editorContext.ts
new file mode 100644
index 00000000000..9ea3020dba4
--- /dev/null
+++ b/packages/core/src/codewhisperer/util/editorContext.ts
@@ -0,0 +1,427 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as codewhispererClient from '../client/codewhisperer'
+import * as path from 'path'
+import * as CodeWhispererConstants from '../models/constants'
+import { getTabSizeSetting } from '../../shared/utilities/editorUtilities'
+import { truncate } from '../../shared/utilities/textUtilities'
+import { getLogger } from '../../shared/logger/logger'
+import { runtimeLanguageContext } from './runtimeLanguageContext'
+import { fetchSupplementalContext } from './supplementalContext/supplementalContextUtil'
+import { editorStateMaxLength, supplementalContextTimeoutInMs } from '../models/constants'
+import { getSelectedCustomization } from './customizationUtil'
+import { selectFrom } from '../../shared/utilities/tsUtils'
+import { checkLeftContextKeywordsForJson } from './commonUtil'
+import { CodeWhispererSupplementalContext } from '../models/model'
+import { getOptOutPreference } from '../../shared/telemetry/util'
+import { indent } from '../../shared/utilities/textUtilities'
+import { isInDirectory } from '../../shared/filesystemUtilities'
+import { AuthUtil } from './authUtil'
+import { predictionTracker } from '../nextEditPrediction/activation'
+import { BaseLanguageClient } from 'vscode-languageclient'
+
+let tabSize: number = getTabSizeSetting()
+
+function getEnclosingNotebook(editor: vscode.TextEditor): vscode.NotebookDocument | undefined {
+    // For notebook cells, find the existing notebook with a cell that matches the current editor.
+    return vscode.workspace.notebookDocuments.find(
+        (nb) =>
+            nb.notebookType === 'jupyter-notebook' && nb.getCells().some((cell) => cell.document === editor.document)
+    )
+}
+
+export function getNotebookContext(
+    notebook: vscode.NotebookDocument,
+    editor: vscode.TextEditor,
+    languageName: string,
+    caretLeftFileContext: string,
+    caretRightFileContext: string
+) {
+    // Expand the context for a cell inside of a noteboo with whatever text fits from the preceding and subsequent cells
+    const allCells = notebook.getCells()
+    const cellIndex = allCells.findIndex((cell) => cell.document === editor.document)
+    // Extract text from prior cells if there is enough room in left file context
+    if (caretLeftFileContext.length < CodeWhispererConstants.charactersLimit - 1) {
+        const leftCellsText = getNotebookCellsSliceContext(
+            allCells.slice(0, cellIndex),
+            CodeWhispererConstants.charactersLimit - (caretLeftFileContext.length + 1),
+            languageName,
+            true
+        )
+        if (leftCellsText.length > 0) {
+            caretLeftFileContext = addNewlineIfMissing(leftCellsText) + caretLeftFileContext
+        }
+    }
+    // Extract text from subsequent cells if there is enough room in right file context
+    if (caretRightFileContext.length < CodeWhispererConstants.charactersLimit - 1) {
+        const rightCellsText = getNotebookCellsSliceContext(
+            allCells.slice(cellIndex + 1),
+            CodeWhispererConstants.charactersLimit - (caretRightFileContext.length + 1),
+            languageName,
+            false
+        )
+        if (rightCellsText.length > 0) {
+            caretRightFileContext = addNewlineIfMissing(caretRightFileContext) + rightCellsText
+        }
+    }
+    return { caretLeftFileContext, caretRightFileContext }
+}
+
+export function getNotebookCellContext(cell: vscode.NotebookCell, referenceLanguage?: string): string {
+    // Extract the text verbatim if the cell is code and the cell has the same language.
+    // Otherwise, add the correct comment string for the reference language
+    const cellText = cell.document.getText()
+    if (
+        cell.kind === vscode.NotebookCellKind.Markup ||
+        (runtimeLanguageContext.normalizeLanguage(cell.document.languageId) ?? cell.document.languageId) !==
+            referenceLanguage
+    ) {
+        const commentPrefix = runtimeLanguageContext.getSingleLineCommentPrefix(referenceLanguage)
+        if (commentPrefix === '') {
+            return cellText
+        }
+        return cell.document
+            .getText()
+            .split('\n')
+            .map((line) => `${commentPrefix}${line}`)
+            .join('\n')
+    }
+    return cellText
+}
+
+export function getNotebookCellsSliceContext(
+    cells: vscode.NotebookCell[],
+    maxLength: number,
+    referenceLanguage: string,
+    fromStart: boolean
+): string {
+    // Extract context from array of notebook cells that fits inside `maxLength` characters,
+    // from either the start or the end of the array.
+    let output: string[] = []
+    if (!fromStart) {
+        cells = cells.reverse()
+    }
+    cells.some((cell) => {
+        const cellText = addNewlineIfMissing(getNotebookCellContext(cell, referenceLanguage))
+        if (cellText.length > 0) {
+            if (cellText.length >= maxLength) {
+                if (fromStart) {
+                    output.push(cellText.substring(0, maxLength))
+                } else {
+                    output.push(cellText.substring(cellText.length - maxLength))
+                }
+                return true
+            }
+            output.push(cellText)
+            maxLength -= cellText.length
+        }
+    })
+    if (!fromStart) {
+        output = output.reverse()
+    }
+    return output.join('')
+}
+
+export function addNewlineIfMissing(text: string): string {
+    if (text.length > 0 && !text.endsWith('\n')) {
+        text += '\n'
+    }
+    return text
+}
+
+export function extractContextForCodeWhisperer(editor: vscode.TextEditor): codewhispererClient.FileContext {
+    const document = editor.document
+    const curPos = editor.selection.active
+    const offset = document.offsetAt(curPos)
+
+    let caretLeftFileContext = editor.document.getText(
+        new vscode.Range(
+            document.positionAt(offset - CodeWhispererConstants.charactersLimit),
+            document.positionAt(offset)
+        )
+    )
+    let caretRightFileContext = editor.document.getText(
+        new vscode.Range(
+            document.positionAt(offset),
+            document.positionAt(offset + CodeWhispererConstants.charactersLimit)
+        )
+    )
+    let languageName = 'plaintext'
+    if (!checkLeftContextKeywordsForJson(document.fileName, caretLeftFileContext, editor.document.languageId)) {
+        languageName = runtimeLanguageContext.resolveLang(editor.document)
+    }
+    if (editor.document.uri.scheme === 'vscode-notebook-cell') {
+        const notebook = getEnclosingNotebook(editor)
+        if (notebook) {
+            ;({ caretLeftFileContext, caretRightFileContext } = getNotebookContext(
+                notebook,
+                editor,
+                languageName,
+                caretLeftFileContext,
+                caretRightFileContext
+            ))
+        }
+    }
+
+    return {
+        fileUri: editor.document.uri.toString().substring(0, CodeWhispererConstants.filenameCharsLimit),
+        filename: getFileRelativePath(editor),
+        programmingLanguage: {
+            languageName: languageName,
+        },
+        leftFileContent: caretLeftFileContext,
+        rightFileContent: caretRightFileContext,
+    } as codewhispererClient.FileContext
+}
+
+export function getFileName(editor: vscode.TextEditor): string {
+    const fileName = path.basename(editor.document.fileName)
+    return fileName.substring(0, CodeWhispererConstants.filenameCharsLimit)
+}
+
+export function getFileRelativePath(editor: vscode.TextEditor): string {
+    const fileName = path.basename(editor.document.fileName)
+    let relativePath = ''
+    const workspaceFolder = vscode.workspace.getWorkspaceFolder(editor.document.uri)
+    if (!workspaceFolder) {
+        relativePath = fileName
+    } else {
+        const workspacePath = workspaceFolder.uri.fsPath
+        const filePath = editor.document.uri.fsPath
+        relativePath = path.relative(workspacePath, filePath)
+    }
+    // For notebook files, we want to use the programming language for each cell for the code suggestions, so change
+    // the filename sent in the request to reflect that language
+    if (relativePath.endsWith('.ipynb')) {
+        const fileExtension = runtimeLanguageContext.getLanguageExtensionForNotebook(editor.document.languageId)
+        if (fileExtension !== undefined) {
+            const filenameWithNewExtension = relativePath.substring(0, relativePath.length - 5) + fileExtension
+            return filenameWithNewExtension.substring(0, CodeWhispererConstants.filenameCharsLimit)
+        }
+    }
+    return relativePath.substring(0, CodeWhispererConstants.filenameCharsLimit)
+}
+
+async function getWorkspaceId(editor: vscode.TextEditor): Promise<string | undefined> {
+    try {
+        const workspaceIds: { workspaces: { workspaceRoot: string; workspaceId: string }[] } =
+            await vscode.commands.executeCommand('aws.amazonq.getWorkspaceId')
+        for (const item of workspaceIds.workspaces) {
+            const path = vscode.Uri.parse(item.workspaceRoot).fsPath
+            if (isInDirectory(path, editor.document.uri.fsPath)) {
+                return item.workspaceId
+            }
+        }
+    } catch (err) {
+        getLogger().warn(`No workspace id found ${err}`)
+    }
+    return undefined
+}
+
+export async function buildListRecommendationRequest(
+    editor: vscode.TextEditor,
+    nextToken: string,
+    allowCodeWithReference: boolean,
+    languageClient?: BaseLanguageClient
+): Promise<{
+    request: codewhispererClient.ListRecommendationsRequest
+    supplementalMetadata: CodeWhispererSupplementalContext | undefined
+}> {
+    const fileContext = extractContextForCodeWhisperer(editor)
+
+    const tokenSource = new vscode.CancellationTokenSource()
+    setTimeout(() => {
+        tokenSource.cancel()
+    }, supplementalContextTimeoutInMs)
+
+    const supplementalContexts = await fetchSupplementalContext(editor, tokenSource.token, languageClient)
+
+    logSupplementalContext(supplementalContexts)
+
+    // Get predictionSupplementalContext from PredictionTracker
+    let predictionSupplementalContext: codewhispererClient.SupplementalContext[] = []
+    if (predictionTracker) {
+        predictionSupplementalContext = await predictionTracker.generatePredictionSupplementalContext()
+    }
+
+    const selectedCustomization = getSelectedCustomization()
+    const completionSupplementalContext: codewhispererClient.SupplementalContext[] = supplementalContexts
+        ? supplementalContexts.supplementalContextItems.map((v) => {
+              return selectFrom(v, 'content', 'filePath')
+          })
+        : []
+
+    const profile = AuthUtil.instance.regionProfileManager.activeRegionProfile
+
+    const editorState = getEditorState(editor, fileContext)
+
+    // Combine inline and prediction supplemental contexts
+    const finalSupplementalContext = completionSupplementalContext.concat(predictionSupplementalContext)
+    return {
+        request: {
+            fileContext: fileContext,
+            nextToken: nextToken,
+            referenceTrackerConfiguration: {
+                recommendationsWithReferences: allowCodeWithReference ? 'ALLOW' : 'BLOCK',
+            },
+            supplementalContexts: finalSupplementalContext,
+            editorState: editorState,
+            maxResults: CodeWhispererConstants.maxRecommendations,
+            customizationArn: selectedCustomization.arn === '' ? undefined : selectedCustomization.arn,
+            optOutPreference: getOptOutPreference(),
+            workspaceId: await getWorkspaceId(editor),
+            profileArn: profile?.arn,
+        },
+        supplementalMetadata: supplementalContexts,
+    }
+}
+
+export async function buildGenerateRecommendationRequest(editor: vscode.TextEditor): Promise<{
+    request: codewhispererClient.GenerateRecommendationsRequest
+    supplementalMetadata: CodeWhispererSupplementalContext | undefined
+}> {
+    const fileContext = extractContextForCodeWhisperer(editor)
+
+    const tokenSource = new vscode.CancellationTokenSource()
+    // the supplement context fetch mechanisms each has a timeout of supplementalContextTimeoutInMs
+    // adding 10 ms for overall timeout as buffer
+    setTimeout(() => {
+        tokenSource.cancel()
+    }, supplementalContextTimeoutInMs + 10)
+    const supplementalContexts = await fetchSupplementalContext(editor, tokenSource.token)
+
+    logSupplementalContext(supplementalContexts)
+
+    return {
+        request: {
+            fileContext: fileContext,
+            maxResults: CodeWhispererConstants.maxRecommendations,
+            supplementalContexts: supplementalContexts?.supplementalContextItems ?? [],
+        },
+        supplementalMetadata: supplementalContexts,
+    }
+}
+
+export function validateRequest(
+    req: codewhispererClient.ListRecommendationsRequest | codewhispererClient.GenerateRecommendationsRequest
+): boolean {
+    const isLanguageNameValid =
+        req.fileContext.programmingLanguage.languageName !== undefined &&
+        req.fileContext.programmingLanguage.languageName.length >= 1 &&
+        req.fileContext.programmingLanguage.languageName.length <= 128 &&
+        (runtimeLanguageContext.isLanguageSupported(req.fileContext.programmingLanguage.languageName) ||
+            runtimeLanguageContext.isFileFormatSupported(
+                req.fileContext.filename.substring(req.fileContext.filename.lastIndexOf('.') + 1)
+            ))
+    const isFileNameValid = !(req.fileContext.filename === undefined || req.fileContext.filename.length < 1)
+    const isFileContextValid = !(
+        req.fileContext.leftFileContent.length > CodeWhispererConstants.charactersLimit ||
+        req.fileContext.rightFileContent.length > CodeWhispererConstants.charactersLimit
+    )
+    if (isFileNameValid && isLanguageNameValid && isFileContextValid) {
+        return true
+    }
+    return false
+}
+
+export function updateTabSize(val: number): void {
+    tabSize = val
+}
+
+export function getTabSize(): number {
+    return tabSize
+}
+
+export function getEditorState(editor: vscode.TextEditor, fileContext: codewhispererClient.FileContext): any {
+    try {
+        const cursorPosition = editor.selection.active
+        const cursorOffset = editor.document.offsetAt(cursorPosition)
+        const documentText = editor.document.getText()
+
+        // Truncate if document content is too large (defined in constants.ts)
+        let fileText = documentText
+        if (documentText.length > editorStateMaxLength) {
+            const halfLength = Math.floor(editorStateMaxLength / 2)
+
+            // Use truncate function to get the text around the cursor position
+            const leftPart = truncate(documentText.substring(0, cursorOffset), -halfLength, '')
+            const rightPart = truncate(documentText.substring(cursorOffset), halfLength, '')
+
+            fileText = leftPart + rightPart
+        }
+
+        return {
+            document: {
+                programmingLanguage: {
+                    languageName: fileContext.programmingLanguage.languageName,
+                },
+                relativeFilePath: fileContext.filename,
+                text: fileText,
+            },
+            cursorState: {
+                position: {
+                    line: editor.selection.active.line,
+                    character: editor.selection.active.character,
+                },
+            },
+        }
+    } catch (error) {
+        getLogger().error(`Error generating editor state: ${error}`)
+        return undefined
+    }
+}
+
+export function getLeftContext(editor: vscode.TextEditor, line: number): string {
+    let lineText = ''
+    try {
+        if (editor && editor.document.lineAt(line)) {
+            lineText = editor.document.lineAt(line).text
+            if (lineText.length > CodeWhispererConstants.contextPreviewLen) {
+                lineText =
+                    '...' +
+                    lineText.substring(
+                        lineText.length - CodeWhispererConstants.contextPreviewLen - 1,
+                        lineText.length - 1
+                    )
+            }
+        }
+    } catch (error) {
+        getLogger().error(`Error when getting left context ${error}`)
+    }
+
+    return lineText
+}
+
+function logSupplementalContext(supplementalContext: CodeWhispererSupplementalContext | undefined) {
+    if (!supplementalContext) {
+        return
+    }
+
+    let logString = indent(
+        `CodeWhispererSupplementalContext:
+        isUtg: ${supplementalContext.isUtg},
+        isProcessTimeout: ${supplementalContext.isProcessTimeout},
+        contentsLength: ${supplementalContext.contentsLength},
+        latency: ${supplementalContext.latency}
+        strategy: ${supplementalContext.strategy}`,
+        4,
+        true
+    ).trimStart()
+
+    for (const [index, context] of supplementalContext.supplementalContextItems.entries()) {
+        logString += indent(`\nChunk ${index}:\n`, 4, true)
+        logString += indent(
+            `Path: ${context.filePath}
+            Length: ${context.content.length}
+            Score: ${context.score}`,
+            8,
+            true
+        )
+    }
+
+    getLogger().debug(logString)
+}
diff --git a/packages/core/src/codewhisperer/util/getStartUrl.ts b/packages/core/src/codewhisperer/util/getStartUrl.ts
new file mode 100644
index 00000000000..0d9ca7617ff
--- /dev/null
+++ b/packages/core/src/codewhisperer/util/getStartUrl.ts
@@ -0,0 +1,43 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as CodeWhispererConstants from '../models/constants'
+import { isValidResponse } from '../../shared/wizards/wizard'
+import { AuthUtil, amazonQScopes } from './authUtil'
+import { CancellationError } from '../../shared/utilities/timeoutUtils'
+import { ToolkitError } from '../../shared/errors'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { createStartUrlPrompter, showRegionPrompter } from '../../auth/utils'
+import { Region } from '../../shared/regions/endpoints'
+import { Commands } from '../../shared/vscode/commands2'
+import { vsCodeState } from '../models/model'
+
+export const getStartUrl = async () => {
+    const inputBox = await createStartUrlPrompter('IAM Identity Center', amazonQScopes)
+    const userInput = await inputBox.prompt()
+    if (!isValidResponse(userInput)) {
+        telemetry.ui_click.emit({ elementId: 'connection_optionescapecancel' })
+        throw new CancellationError('user')
+    }
+    telemetry.ui_click.emit({ elementId: 'connection_startUrl' })
+    const region = await showRegionPrompter()
+    telemetry.ui_click.emit({ elementId: 'connection_region' })
+    return connectToEnterpriseSso(userInput, region.id)
+}
+
+export async function connectToEnterpriseSso(startUrl: string, region: Region['id']) {
+    let conn
+    try {
+        conn = await AuthUtil.instance.connectToEnterpriseSso(startUrl, region)
+    } catch (e) {
+        throw ToolkitError.chain(e, CodeWhispererConstants.failedToConnectIamIdentityCenter, {
+            code: 'FailedToConnect',
+        })
+    }
+    vsCodeState.isFreeTierLimitReached = false
+    await Commands.tryExecute('aws.amazonq.enableCodeSuggestions')
+
+    return conn
+}
diff --git a/packages/core/src/codewhisperer/util/gitUtil.ts b/packages/core/src/codewhisperer/util/gitUtil.ts
new file mode 100644
index 00000000000..09cd9a6116f
--- /dev/null
+++ b/packages/core/src/codewhisperer/util/gitUtil.ts
@@ -0,0 +1,37 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { removeAnsi } from '../../shared/utilities/textUtilities'
+import { getLogger } from '../../shared/logger/logger'
+import { ChildProcess, ChildProcessOptions } from '../../shared/utilities/processUtils'
+import { Uri } from 'vscode'
+
+export async function isGitRepo(folder: Uri): Promise<boolean> {
+    const childProcess = new ChildProcess('git', ['rev-parse', '--is-inside-work-tree'])
+
+    let output = ''
+    const runOptions: ChildProcessOptions = {
+        rejectOnError: true,
+        rejectOnErrorCode: true,
+        onStdout: (text) => {
+            output += text
+            getLogger().verbose(removeAnsi(text))
+        },
+        onStderr: (text) => {
+            getLogger().error(removeAnsi(text))
+        },
+        spawnOptions: {
+            cwd: folder.fsPath,
+        },
+    }
+
+    try {
+        await childProcess.run(runOptions)
+        return output.trim() === 'true'
+    } catch (err) {
+        getLogger().warn(`Failed to run command \`${childProcess.toString()}\`: ${err}`)
+        return false
+    }
+}
diff --git a/src/codewhisperer/util/globalStateUtil.ts b/packages/core/src/codewhisperer/util/globalStateUtil.ts
similarity index 87%
rename from src/codewhisperer/util/globalStateUtil.ts
rename to packages/core/src/codewhisperer/util/globalStateUtil.ts
index 641ade41264..55376a83546 100644
--- a/src/codewhisperer/util/globalStateUtil.ts
+++ b/packages/core/src/codewhisperer/util/globalStateUtil.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/packages/core/src/codewhisperer/util/importAdderUtil.ts b/packages/core/src/codewhisperer/util/importAdderUtil.ts
new file mode 100644
index 00000000000..fa53944def0
--- /dev/null
+++ b/packages/core/src/codewhisperer/util/importAdderUtil.ts
@@ -0,0 +1,89 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { Recommendation } from '../client/codewhisperer'
+import { CodeWhispererSettings } from './codewhispererSettings'
+
+export function findLineToInsertImportStatement(editor: vscode.TextEditor, firstLineOfRecommendation: number): number {
+    let line = findLineOfLastImportStatement(editor, firstLineOfRecommendation)
+    if (line === -1) {
+        line = findLineOfFirstCode(editor, firstLineOfRecommendation)
+    }
+    return line
+}
+
+export function findLineOfFirstCode(editor: vscode.TextEditor, firstLineOfRecommendation: number): number {
+    const lang = editor.document.languageId
+    for (let i = 0; i <= firstLineOfRecommendation; i++) {
+        const text = editor.document.lineAt(i).text
+        if (lang === 'python') {
+            // skip #, empty line
+            if (!text.match(/^\s*#/) && !text.match(/^\s*$/)) {
+                return i
+            }
+        } else if (lang === 'javascript' || lang === 'jsx') {
+            // skip //, /*, *, */, empty line
+            if (
+                !text.match(/^\s*\/\//) &&
+                !text.match(/\s*use\s+strict/) &&
+                !text.match(/^\s*$/) &&
+                !text.match(/^\s*\/\s*\*/) &&
+                !text.match(/^\s*\*/) &&
+                !text.match(/^\s*\*\s*\//)
+            ) {
+                return i
+            }
+        } else if (lang === 'java') {
+            // skip //, /*, *, */, package, empty line
+            if (
+                !text.match(/^\s*\/\//) &&
+                !text.match(/^\s*package\s+\S+/) &&
+                !text.match(/^\s*$/) &&
+                !text.match(/^\s*\/\s*\*/) &&
+                !text.match(/^\s*\*/) &&
+                !text.match(/^\s*\*\s*\//)
+            ) {
+                return i
+            }
+        }
+    }
+    return 0
+}
+
+export function findLineOfLastImportStatement(editor: vscode.TextEditor, firstLineOfRecommendation: number): number {
+    const lang = editor.document.languageId
+    for (let i = firstLineOfRecommendation; i >= 0; i--) {
+        const text = editor.document.lineAt(i).text
+        if (lang === 'python') {
+            if (text.match(/^\s*import\s+\S+/) || text.match(/^\s*from\s+\S+/)) {
+                return i + 1
+            }
+        } else if (lang === 'javascript' || lang === 'jsx') {
+            if (text.match(/^\s*import\s+\S+/) || text.match(/=\s*require\s*\(\s*\S+\s*\)\s*;/)) {
+                return i + 1
+            }
+        } else if (lang === 'java') {
+            if (text.match(/^\s*import\s+\S+\s*;/)) {
+                return i + 1
+            }
+        }
+    }
+    return -1
+}
+
+/* Returns the number of imports in a recommendation
+ *  return undefined if the API response field is missing or import is disabled
+ */
+export function getImportCount(recommendation: Recommendation): number | undefined {
+    if (
+        'mostRelevantMissingImports' in recommendation &&
+        recommendation.mostRelevantMissingImports !== undefined &&
+        CodeWhispererSettings.instance.isImportRecommendationEnabled()
+    ) {
+        return recommendation.mostRelevantMissingImports.length
+    }
+    return undefined
+}
diff --git a/src/codewhisperer/util/licenseUtil.ts b/packages/core/src/codewhisperer/util/licenseUtil.ts
similarity index 98%
rename from src/codewhisperer/util/licenseUtil.ts
rename to packages/core/src/codewhisperer/util/licenseUtil.ts
index 314d8142cb0..d21cd093e12 100644
--- a/src/codewhisperer/util/licenseUtil.ts
+++ b/packages/core/src/codewhisperer/util/licenseUtil.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -463,7 +463,7 @@ export class LicenseUtil {
     }
 
     public static getLicenseHtml(licenseName: string | undefined): string {
-        if (licenseName != undefined && licenseName in this._licenseLookup) {
+        if (licenseName !== undefined && licenseName in this._licenseLookup) {
             return this._licenseLookup[licenseName]
         }
         return `https://spdx.org/licenses`
@@ -471,11 +471,13 @@ export class LicenseUtil {
 
     public static getUniqueLicenseNames(references: References | undefined): Set<string> {
         const n = new Set<string>()
-        references?.forEach(r => {
-            if (r.licenseName) {
-                n.add(r.licenseName)
+        if (references) {
+            for (const r of references) {
+                if (r.licenseName) {
+                    n.add(r.licenseName)
+                }
             }
-        })
+        }
         return n
     }
 }
diff --git a/packages/core/src/codewhisperer/util/runtimeLanguageContext.ts b/packages/core/src/codewhisperer/util/runtimeLanguageContext.ts
new file mode 100644
index 00000000000..b87db0a65e8
--- /dev/null
+++ b/packages/core/src/codewhisperer/util/runtimeLanguageContext.ts
@@ -0,0 +1,362 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../../shared/logger/logger'
+import { CodewhispererLanguage } from '../../shared/telemetry/telemetry.gen'
+import { createConstantMap, ConstantMap } from '../../shared/utilities/tsUtils'
+import * as codewhispererClient from '../client/codewhisperer'
+import * as CodeWhispererConstants from '../models/constants'
+import * as path from 'path'
+
+type RuntimeLanguage = Exclude<CodewhispererLanguage, 'jsx' | 'tsx' | 'systemVerilog'> | 'systemverilog'
+
+const runtimeLanguageSet: ReadonlySet<RuntimeLanguage> = new Set([
+    'c',
+    'cpp',
+    'csharp',
+    'go',
+    'java',
+    'javascript',
+    'kotlin',
+    'php',
+    'python',
+    'powershell',
+    'r',
+    'dart',
+    'ruby',
+    'rust',
+    'scala',
+    'shell',
+    'sql',
+    'swift',
+    'lua',
+    'vue',
+    'typescript',
+    'json',
+    'yaml',
+    'tf',
+    'systemverilog',
+])
+
+export class RuntimeLanguageContext {
+    /**
+     * Key: Union set of CodewhispererLanguageId and PlatformLanguageId (VSC, C9 etc.)
+     * Value: CodeWhispererLanguageId
+     */
+    private supportedLanguageMap: ConstantMap<
+        CodeWhispererConstants.PlatformLanguageId | CodewhispererLanguage,
+        CodewhispererLanguage
+    >
+
+    /**
+     * A map storing CodeWhisperer supported programming language with key: language extension and value: vscLanguageId
+     * Key: language extension
+     * Value: vscLanguageId
+     */
+    private supportedLanguageExtensionMap: ConstantMap<string, CodewhispererLanguage>
+
+    /**
+     * A map storing single-line comment prefixes for different languages
+     * Key: CodewhispererLanguage
+     * Value: Comment prefix string
+     */
+    private languageSingleLineCommentPrefixMap: ConstantMap<CodewhispererLanguage, string>
+
+    constructor() {
+        this.supportedLanguageMap = createConstantMap<
+            Exclude<CodeWhispererConstants.PlatformLanguageId | CodewhispererLanguage, 'plaintext'>,
+            CodewhispererLanguage
+        >({
+            c: 'c',
+            cpp: 'cpp',
+            csharp: 'csharp',
+            c_cpp: 'cpp',
+            go: 'go',
+            golang: 'go',
+            hcl: 'tf',
+            java: 'java',
+            javascript: 'javascript',
+            javascriptreact: 'jsx',
+            json: 'json',
+            jsonc: 'json',
+            jsx: 'jsx',
+            kotlin: 'kotlin',
+            packer: 'tf',
+            php: 'php',
+            python: 'python',
+            ruby: 'ruby',
+            rust: 'rust',
+            scala: 'scala',
+            sh: 'shell',
+            shell: 'shell',
+            shellscript: 'shell',
+            sql: 'sql',
+            terraform: 'tf',
+            terragrunt: 'tf',
+            tf: 'tf',
+            tsx: 'tsx',
+            typescript: 'typescript',
+            typescriptreact: 'tsx',
+            yml: 'yaml',
+            yaml: 'yaml',
+            dart: 'dart',
+            lua: 'lua',
+            powershell: 'powershell',
+            r: 'r',
+            swift: 'swift',
+            systemVerilog: 'systemVerilog',
+            systemverilog: 'systemVerilog',
+            verilog: 'systemVerilog',
+            vue: 'vue',
+            abap: 'abap',
+        })
+        this.supportedLanguageExtensionMap = createConstantMap<string, CodewhispererLanguage>({
+            c: 'c',
+            h: 'c',
+            cpp: 'cpp',
+            cc: 'cpp',
+            'c++': 'cpp',
+            cs: 'csharp',
+            go: 'go',
+            hcl: 'tf',
+            java: 'java',
+            js: 'javascript',
+            json: 'json',
+            jsonc: 'json',
+            jsx: 'jsx',
+            kt: 'kotlin',
+            txt: 'plaintext',
+            php: 'php',
+            py: 'python',
+            rb: 'ruby',
+            rs: 'rust',
+            scala: 'scala',
+            sh: 'shell',
+            sql: 'sql',
+            tf: 'tf',
+            tsx: 'tsx',
+            ts: 'typescript',
+            yaml: 'yaml',
+            yml: 'yaml',
+            sv: 'systemVerilog',
+            svh: 'systemVerilog',
+            vh: 'systemVerilog',
+            dart: 'dart',
+            lua: 'lua',
+            wlua: 'lua',
+            swift: 'swift',
+            vue: 'vue',
+            ps1: 'powershell',
+            psm1: 'powershell',
+            r: 'r',
+            abap: 'abap',
+        })
+        this.languageSingleLineCommentPrefixMap = createConstantMap<CodewhispererLanguage, string>({
+            c: '// ',
+            cpp: '// ',
+            csharp: '// ',
+            dart: '// ',
+            go: '// ',
+            hcl: '# ',
+            java: '// ',
+            javascript: '// ',
+            json: '// ',
+            jsonc: '// ',
+            jsx: '// ',
+            kotlin: '// ',
+            lua: '-- ',
+            php: '// ',
+            plaintext: '',
+            powershell: '# ',
+            python: '# ',
+            r: '# ',
+            ruby: '# ',
+            rust: '// ',
+            scala: '// ',
+            shell: '# ',
+            sql: '-- ',
+            swift: '// ',
+            systemVerilog: '// ',
+            tf: '# ',
+            tsx: '// ',
+            typescript: '// ',
+            vue: '', // vue lacks a single-line comment prefix
+            yaml: '# ',
+            yml: '# ',
+            abap: '',
+        })
+    }
+
+    public resolveLang(doc: vscode.TextDocument): CodewhispererLanguage {
+        return this.normalizeLanguage(doc.languageId) || this.byFileExt(doc) || 'plaintext'
+    }
+
+    /**
+     * To add a new platform language id:
+     * 1. add new platform language ID constant in the file codewhisperer/constant.ts
+     * 2. add corresponding CodeWhispererLanguage mapping in the constructor of RuntimeLanguageContext
+     * @param languageId : vscode language id or codewhisperer language name
+     * @returns normalized language id of type CodewhispererLanguage if any, otherwise undefined
+     */
+    public normalizeLanguage(languageId?: string): CodewhispererLanguage | undefined {
+        return this.supportedLanguageMap.get(languageId)
+    }
+
+    /**
+     * Get the comment prefix for a given language
+     * @param language The language to get comment prefix for
+     * @returns The comment prefix string, or empty string if not found
+     */
+    public getSingleLineCommentPrefix(language?: string): string {
+        const normalizedLanguage = this.normalizeLanguage(language)
+        return normalizedLanguage ? (this.languageSingleLineCommentPrefixMap.get(normalizedLanguage) ?? '') : ''
+    }
+
+    /**
+     * Normalize client side language id to service aware language id (service is not aware of jsx/tsx)
+     * Only used when invoking CodeWhisperer service API, for client usage please use normalizeLanguage
+     * Client side CodewhispererLanguage is a superset of NormalizedLanguageId
+     */
+    public toRuntimeLanguage(language: CodewhispererLanguage): RuntimeLanguage {
+        switch (language) {
+            case 'jsx':
+                return 'javascript'
+
+            case 'tsx':
+                return 'typescript'
+
+            case 'systemVerilog':
+                return 'systemverilog'
+
+            default:
+                if (!runtimeLanguageSet.has(language)) {
+                    getLogger().error(`codewhisperer: unknown runtime language ${language}`)
+                }
+                return language
+        }
+    }
+
+    /**
+     * This is for notebook files map to a new filename with the corresponding language extension
+     * @param languageId : vscode language id or codewhisperer language name
+     * @returns corresponding language extension if any, otherwise undefined
+     */
+    public getLanguageExtensionForNotebook(languageId?: string): string | undefined {
+        return [...this.supportedLanguageExtensionMap.entries()].find(
+            ([, language]) => language === this.normalizeLanguage(languageId)
+        )?.[0]
+    }
+
+    /**
+     * @param languageId : vscode language id or codewhisperer language name, fileExtension: extension of the selected file
+     * @returns An object with a field language: CodewhispererLanguage, if no corresponding CodewhispererLanguage ID, plaintext is returned
+     */
+    public getLanguageContext(languageId?: string, fileExtension?: string): { language: CodewhispererLanguage } {
+        const extensionToLanguageMap: Record<string, CodewhispererLanguage> = {
+            tf: 'tf',
+            hcl: 'tf',
+            json: 'json',
+            yaml: 'yaml',
+            yml: 'yaml',
+            sv: 'systemVerilog',
+            svh: 'systemVerilog',
+            vh: 'systemVerilog',
+            dart: 'dart',
+            lua: 'lua',
+            wlua: 'lua',
+            swift: 'swift',
+            vue: 'vue',
+            ps1: 'powershell',
+            psm1: 'powershell',
+            r: 'r',
+            // Add more mappings if needed
+        }
+
+        if (languageId === 'plaintext' && fileExtension !== undefined) {
+            const languages = extensionToLanguageMap[fileExtension]
+            if (languages) {
+                return { language: languages }
+            }
+        }
+        return { language: this.normalizeLanguage(languageId) ?? 'plaintext' }
+    }
+
+    /**
+     * Mapping the field ProgrammingLanguage of codewhisperer generateRecommendationRequest | listRecommendationRequest to
+     * its Codewhisperer runtime language e.g. jsx -> typescript, typescript -> typescript
+     * @param request : cwspr generateRecommendationRequest | ListRecommendationRequest
+     * @returns request with source language name mapped to cwspr runtime language
+     */
+    public mapToRuntimeLanguage<
+        T extends codewhispererClient.ListRecommendationsRequest | codewhispererClient.GenerateRecommendationsRequest,
+    >(request: T): T {
+        const fileContext = request.fileContext
+        const runtimeLanguage: codewhispererClient.ProgrammingLanguage = {
+            languageName: this.toRuntimeLanguage(
+                runtimeLanguageContext.getLanguageContext(
+                    request.fileContext.programmingLanguage.languageName,
+                    request.fileContext.filename.substring(request.fileContext.filename.lastIndexOf('.') + 1)
+                ).language
+            ),
+        }
+
+        return {
+            ...request,
+            fileContext: {
+                ...fileContext,
+                programmingLanguage: runtimeLanguage,
+            },
+        }
+    }
+
+    public isLanguageSupported(languageId: string): boolean
+    public isLanguageSupported(doc: vscode.TextDocument): boolean
+    public isLanguageSupported(arg: string | vscode.TextDocument): boolean {
+        if (typeof arg === 'string') {
+            const normalizedLanguageId = this.normalizeLanguage(arg)
+            const byLanguageId = !normalizedLanguageId || normalizedLanguageId === 'plaintext' ? false : true
+
+            return byLanguageId
+        } else {
+            const normalizedLanguageId = this.normalizeLanguage(arg.languageId)
+            const byLanguageId = !normalizedLanguageId || normalizedLanguageId === 'plaintext' ? false : true
+            const byFileExtension = this.byFileExt(arg) !== undefined
+
+            return byLanguageId || byFileExtension
+        }
+    }
+
+    /**
+     *
+     * @param fileFormat : vscode editor filecontext filename extension
+     * @returns  true if the fileformat is supported by CodeWhisperer otherwise false
+     */
+    public isFileFormatSupported(fileFormat: string): boolean {
+        const language = this.supportedLanguageExtensionMap.get(fileFormat)
+        return language !== undefined && language !== 'plaintext'
+    }
+
+    /**
+     * @param fileExtension: extension of the selected file
+     * @returns corresponding vscode language id if any, otherwise undefined
+     */
+    public getLanguageFromFileExtension(fileExtension: string) {
+        return this.supportedLanguageExtensionMap.get(fileExtension)
+    }
+
+    private byFileExt(doc: vscode.TextDocument): CodewhispererLanguage | undefined {
+        const extension = path.extname(doc.uri.fsPath)
+        const byExt = this.supportedLanguageExtensionMap.get(extension.substring(1))
+
+        if (byExt === 'plaintext') {
+            return undefined
+        }
+
+        return byExt
+    }
+}
+
+export const runtimeLanguageContext = new RuntimeLanguageContext()
diff --git a/packages/core/src/codewhisperer/util/securityScanLanguageContext.ts b/packages/core/src/codewhisperer/util/securityScanLanguageContext.ts
new file mode 100644
index 00000000000..100e837b947
--- /dev/null
+++ b/packages/core/src/codewhisperer/util/securityScanLanguageContext.ts
@@ -0,0 +1,64 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { CodewhispererLanguage } from '../../shared/telemetry/telemetry.gen'
+import { ConstantMap, createConstantMap } from '../../shared/utilities/tsUtils'
+import * as CodeWhispererConstants from '../models/constants'
+
+export class SecurityScanLanguageContext {
+    private supportedLanguageMap: ConstantMap<CodeWhispererConstants.SecurityScanLanguageId, CodewhispererLanguage>
+
+    constructor() {
+        this.supportedLanguageMap = createConstantMap<
+            CodeWhispererConstants.SecurityScanLanguageId,
+            CodewhispererLanguage
+        >({
+            java: 'java',
+            python: 'python',
+            javascript: 'javascript',
+            javascriptreact: 'javascript',
+            typescript: 'typescript',
+            typescriptreact: 'typescript',
+            csharp: 'csharp',
+            go: 'go',
+            golang: 'go',
+            ruby: 'ruby',
+            json: 'json',
+            jsonc: 'json',
+            yaml: 'yaml',
+            tf: 'tf',
+            hcl: 'tf',
+            terraform: 'tf',
+            terragrunt: 'tf',
+            packer: 'tf',
+            plaintext: 'plaintext',
+            c: 'c',
+            cpp: 'cpp',
+            php: 'php',
+            xml: 'plaintext', // xml does not exist in CodewhispererLanguage
+            toml: 'plaintext',
+            'pip-requirements': 'plaintext',
+            'java-properties': 'plaintext',
+            'go.mod': 'plaintext',
+            'go.sum': 'plaintext',
+            kotlin: 'kotlin',
+            scala: 'scala',
+            sh: 'shell',
+            shell: 'shell',
+            shellscript: 'shell',
+            brazilPackageConfig: 'plaintext',
+        })
+    }
+
+    public normalizeLanguage(languageId?: string): CodewhispererLanguage | undefined {
+        return this.supportedLanguageMap.get(languageId)
+    }
+
+    public isLanguageSupported(languageId: string): boolean {
+        const lang = this.normalizeLanguage(languageId)
+        return lang !== undefined && lang !== 'plaintext'
+    }
+}
+
+export const securityScanLanguageContext = new SecurityScanLanguageContext()
diff --git a/packages/core/src/codewhisperer/util/showSsoPrompt.ts b/packages/core/src/codewhisperer/util/showSsoPrompt.ts
new file mode 100644
index 00000000000..13af4cf771f
--- /dev/null
+++ b/packages/core/src/codewhisperer/util/showSsoPrompt.ts
@@ -0,0 +1,67 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../../shared/logger/logger'
+import { getStartUrl } from './getStartUrl'
+import { showQuickPick } from '../../shared/ui/pickerPrompter'
+import { AuthUtil } from './authUtil'
+import { failedToConnectAwsBuilderId } from '../models/constants'
+import { isValidResponse } from '../../shared/wizards/wizard'
+import { CancellationError } from '../../shared/utilities/timeoutUtils'
+import { ToolkitError } from '../../shared/errors'
+import { createCommonButtons } from '../../shared/ui/buttons'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { createBuilderIdItem, createSsoItem, createIamItem } from '../../auth/utils'
+import { Commands } from '../../shared/vscode/commands2'
+import { vsCodeState } from '../models/model'
+
+export const showCodeWhispererConnectionPrompt = async () => {
+    const items = [createBuilderIdItem(), createSsoItem(), createCodeWhispererIamItem()]
+
+    const resp = await showQuickPick(items, {
+        title: 'Amazon Q: Add Connection to AWS',
+        placeholder: 'Select a connection option to start using Amazon Q',
+        buttons: createCommonButtons() as vscode.QuickInputButton[],
+    })
+
+    if (!isValidResponse(resp)) {
+        telemetry.ui_click.emit({ elementId: 'connection_optionescapecancel' })
+        throw new CancellationError('user')
+    }
+    switch (resp) {
+        case 'iam':
+            throw new Error('IAM is not supported')
+        case 'sso': {
+            return await getStartUrl()
+        }
+        case 'builderId': {
+            return await awsIdSignIn()
+        }
+    }
+}
+
+export async function awsIdSignIn() {
+    getLogger().info('selected AWS ID sign in')
+    let conn
+    try {
+        conn = await AuthUtil.instance.connectToAwsBuilderId()
+    } catch (e) {
+        throw ToolkitError.chain(e, failedToConnectAwsBuilderId, { code: 'FailedToConnect' })
+    }
+    vsCodeState.isFreeTierLimitReached = false
+    await Commands.tryExecute('aws.amazonq.enableCodeSuggestions')
+
+    return conn
+}
+
+export const createCodeWhispererIamItem = () => {
+    const item = createIamItem()
+    item.detail = 'Not supported by Amazon Q'
+    item.description = 'not supported'
+    item.invalidSelection = true
+
+    return item
+}
diff --git a/packages/core/src/codewhisperer/util/supplementalContext/codeParsingUtil.ts b/packages/core/src/codewhisperer/util/supplementalContext/codeParsingUtil.ts
new file mode 100644
index 00000000000..c73a2eebaa4
--- /dev/null
+++ b/packages/core/src/codewhisperer/util/supplementalContext/codeParsingUtil.ts
@@ -0,0 +1,130 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import path = require('path')
+import { normalize } from '../../../shared/utilities/pathUtils'
+
+// TODO: functionExtractionPattern, classExtractionPattern, imposrtStatementRegex are not scalable and we will deprecate and remove the usage in the near future
+export interface utgLanguageConfig {
+    extension: string
+    testFilenamePattern: RegExp[]
+    functionExtractionPattern?: RegExp
+    classExtractionPattern?: RegExp
+    importStatementRegExp?: RegExp
+}
+
+export const utgLanguageConfigs: Record<string, utgLanguageConfig> = {
+    // Java regexes are not working efficiently for class or function extraction
+    java: {
+        extension: '.java',
+        testFilenamePattern: [/^(.+)Test(\.java)$/, /(.+)Tests(\.java)$/, /Test(.+)(\.java)$/],
+        functionExtractionPattern:
+            /(?:(?:public|private|protected)\s+)(?:static\s+)?(?:[\w<>]+\s+)?(\w+)\s*\([^)]*\)\s*(?:(?:throws\s+\w+)?\s*)[{;]/gm, // TODO: Doesn't work for generice <T> T functions.
+        classExtractionPattern: /(?<=^|\n)\s*public\s+class\s+(\w+)/gm, // TODO: Verify these.
+        importStatementRegExp: /import .*\.([a-zA-Z0-9]+);/,
+    },
+    python: {
+        extension: '.py',
+        testFilenamePattern: [/^test_(.+)(\.py)$/, /^(.+)_test(\.py)$/],
+        functionExtractionPattern: /def\s+([a-zA-Z_][a-zA-Z0-9_]*)\s*\(/g, // Worked fine
+        classExtractionPattern: /^class\s+(\w+)\s*:/gm,
+        importStatementRegExp: /from (.*) import.*/,
+    },
+    typescript: {
+        extension: '.ts',
+        testFilenamePattern: [/^(.+)\.test(\.ts|\.tsx)$/, /^(.+)\.spec(\.ts|\.tsx)$/],
+    },
+    javascript: {
+        extension: '.js',
+        testFilenamePattern: [/^(.+)\.test(\.js|\.jsx)$/, /^(.+)\.spec(\.js|\.jsx)$/],
+    },
+    typescriptreact: {
+        extension: '.tsx',
+        testFilenamePattern: [/^(.+)\.test(\.ts|\.tsx)$/, /^(.+)\.spec(\.ts|\.tsx)$/],
+    },
+    javascriptreact: {
+        extension: '.jsx',
+        testFilenamePattern: [/^(.+)\.test(\.js|\.jsx)$/, /^(.+)\.spec(\.js|\.jsx)$/],
+    },
+}
+
+export function extractFunctions(fileContent: string, regex?: RegExp) {
+    if (!regex) {
+        return []
+    }
+    const functionNames: string[] = []
+    let match: RegExpExecArray | null
+
+    while ((match = regex.exec(fileContent)) !== null) {
+        functionNames.push(match[1])
+    }
+    return functionNames
+}
+
+export function extractClasses(fileContent: string, regex?: RegExp) {
+    if (!regex) {
+        return []
+    }
+    const classNames: string[] = []
+    let match: RegExpExecArray | null
+
+    while ((match = regex.exec(fileContent)) !== null) {
+        classNames.push(match[1])
+    }
+    return classNames
+}
+
+export function countSubstringMatches(arr1: string[], arr2: string[]): number {
+    let count = 0
+    for (const str1 of arr1) {
+        for (const str2 of arr2) {
+            if (str2.toLowerCase().includes(str1.toLowerCase())) {
+                count++
+            }
+        }
+    }
+    return count
+}
+
+export async function isTestFile(
+    filePath: string,
+    languageConfig: {
+        languageId: vscode.TextDocument['languageId']
+        fileContent?: string
+    }
+): Promise<boolean> {
+    const normalizedFilePath = normalize(filePath)
+    const pathContainsTest =
+        normalizedFilePath.includes('tests/') ||
+        normalizedFilePath.includes('test/') ||
+        normalizedFilePath.includes('tst/')
+    const fileNameMatchTestPatterns = isTestFileByName(normalizedFilePath, languageConfig.languageId)
+
+    if (pathContainsTest || fileNameMatchTestPatterns) {
+        return true
+    }
+
+    return false
+}
+
+function isTestFileByName(filePath: string, language: vscode.TextDocument['languageId']): boolean {
+    const languageConfig = utgLanguageConfigs[language]
+    if (!languageConfig) {
+        // We have enabled the support only for python and Java for this check
+        // as we depend on Regex for this validation.
+        return false
+    }
+    const testFilenamePattern = languageConfig.testFilenamePattern
+
+    const filename = path.basename(filePath)
+    for (const pattern of testFilenamePattern) {
+        if (pattern.test(filename)) {
+            return true
+        }
+    }
+
+    return false
+}
diff --git a/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts b/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts
new file mode 100644
index 00000000000..aa732a5d70a
--- /dev/null
+++ b/packages/core/src/codewhisperer/util/supplementalContext/crossFileContextUtil.ts
@@ -0,0 +1,400 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import path = require('path')
+import { BM25Document, BM25Okapi } from './rankBm25'
+import {
+    crossFileContextConfig,
+    supplementalContextTimeoutInMs,
+    supplementalContextMaxTotalLength,
+} from '../../models/constants'
+import { isTestFile } from './codeParsingUtil'
+import { getFileDistance } from '../../../shared/filesystemUtilities'
+import { getOpenFilesInWindow } from '../../../shared/utilities/editorUtilities'
+import { getLogger } from '../../../shared/logger/logger'
+import {
+    CodeWhispererSupplementalContext,
+    CodeWhispererSupplementalContextItem,
+    SupplementalContextStrategy,
+} from '../../models/model'
+import { waitUntil } from '../../../shared/utilities/timeoutUtils'
+import { FeatureConfigProvider } from '../../../shared/featureConfig'
+import fs from '../../../shared/fs/fs'
+import { BaseLanguageClient } from 'vscode-languageclient'
+
+import { GetSupplementalContextParams, getSupplementalContextRequestType } from '@aws/language-server-runtimes/protocol'
+type CrossFileSupportedLanguage =
+    | 'java'
+    | 'python'
+    | 'javascript'
+    | 'typescript'
+    | 'javascriptreact'
+    | 'typescriptreact'
+
+// TODO: ugly, can we make it prettier? like we have to manually type 'java', 'javascriptreact' which is error prone
+// TODO: Move to another config file or constants file
+// Supported language to its corresponding file ext
+const supportedLanguageToDialects: Readonly<Record<CrossFileSupportedLanguage, Set<string>>> = {
+    java: new Set<string>(['.java']),
+    python: new Set<string>(['.py']),
+    javascript: new Set<string>(['.js', '.jsx']),
+    javascriptreact: new Set<string>(['.js', '.jsx']),
+    typescript: new Set<string>(['.ts', '.tsx']),
+    typescriptreact: new Set<string>(['.ts', '.tsx']),
+}
+
+function isCrossFileSupported(languageId: string): languageId is CrossFileSupportedLanguage {
+    return Object.keys(supportedLanguageToDialects).includes(languageId)
+}
+
+interface Chunk {
+    fileName: string
+    content: string
+    nextContent: string
+    score?: number
+}
+
+/**
+ * `none`: supplementalContext is not supported
+ * `opentabs`: opentabs_BM25
+ * `codemap`: repomap + opentabs BM25
+ * `bm25`: global_BM25
+ * `default`: repomap + global_BM25
+ */
+type SupplementalContextConfig = 'none' | 'opentabs' | 'codemap' | 'bm25' | 'default'
+
+export async function fetchSupplementalContextForSrc(
+    editor: vscode.TextEditor,
+    cancellationToken: vscode.CancellationToken,
+    languageClient?: BaseLanguageClient
+): Promise<Pick<CodeWhispererSupplementalContext, 'supplementalContextItems' | 'strategy'> | undefined> {
+    const supplementalContextConfig = getSupplementalContextConfig(editor.document.languageId)
+
+    // not supported case
+    if (supplementalContextConfig === 'none') {
+        return undefined
+    }
+
+    // fallback to opentabs if projectContext timeout
+    const opentabsContextPromise = waitUntil(
+        async function () {
+            return await fetchOpentabsContext(editor, cancellationToken)
+        },
+        { timeout: supplementalContextTimeoutInMs, interval: 5, truthy: false }
+    )
+
+    // opentabs context will use bm25 and users' open tabs to fetch supplemental context
+    if (supplementalContextConfig === 'opentabs') {
+        const supContext = (await opentabsContextPromise) ?? []
+        return {
+            supplementalContextItems: supContext,
+            strategy: supContext.length === 0 ? 'empty' : 'opentabs',
+        }
+    }
+
+    // codemap will use opentabs context plus repomap if it's present
+    if (supplementalContextConfig === 'codemap') {
+        let strategy: SupplementalContextStrategy = 'empty'
+        let hasCodemap: boolean = false
+        let hasOpentabs: boolean = false
+        const opentabsContextAndCodemap = await waitUntil(
+            async function () {
+                const result: CodeWhispererSupplementalContextItem[] = []
+                const opentabsContext = await fetchOpentabsContext(editor, cancellationToken)
+                const codemap = await fetchProjectContext(editor, 'codemap', languageClient)
+
+                function addToResult(items: CodeWhispererSupplementalContextItem[]) {
+                    for (const item of items) {
+                        const curLen = result.reduce((acc, i) => acc + i.content.length, 0)
+                        if (curLen + item.content.length < supplementalContextMaxTotalLength) {
+                            result.push(item)
+                        }
+                    }
+                }
+
+                if (codemap && codemap.length > 0) {
+                    addToResult(codemap)
+                    hasCodemap = true
+                }
+
+                if (opentabsContext && opentabsContext.length > 0) {
+                    addToResult(opentabsContext)
+                    hasOpentabs = true
+                }
+
+                return result
+            },
+            { timeout: supplementalContextTimeoutInMs, interval: 5, truthy: false }
+        )
+
+        if (hasCodemap) {
+            strategy = 'codemap'
+        } else if (hasOpentabs) {
+            strategy = 'opentabs'
+        } else {
+            strategy = 'empty'
+        }
+
+        return {
+            supplementalContextItems: opentabsContextAndCodemap ?? [],
+            strategy: strategy,
+        }
+    }
+
+    // global bm25 without repomap
+    if (supplementalContextConfig === 'bm25') {
+        const projectBM25Promise = waitUntil(
+            async function () {
+                return await fetchProjectContext(editor, 'bm25', languageClient)
+            },
+            { timeout: supplementalContextTimeoutInMs, interval: 5, truthy: false }
+        )
+
+        const [projectContext, opentabsContext] = await Promise.all([projectBM25Promise, opentabsContextPromise])
+        if (projectContext && projectContext.length > 0) {
+            return {
+                supplementalContextItems: projectContext,
+                strategy: 'bm25',
+            }
+        }
+
+        const supContext = opentabsContext ?? []
+        return {
+            supplementalContextItems: supContext,
+            strategy: supContext.length === 0 ? 'empty' : 'opentabs',
+        }
+    }
+
+    // global bm25 with repomap
+    const projectContextAndCodemapPromise = waitUntil(
+        async function () {
+            return await fetchProjectContext(editor, 'default', languageClient)
+        },
+        { timeout: supplementalContextTimeoutInMs, interval: 5, truthy: false }
+    )
+
+    const [projectContext, opentabsContext] = await Promise.all([
+        projectContextAndCodemapPromise,
+        opentabsContextPromise,
+    ])
+    if (projectContext && projectContext.length > 0) {
+        return {
+            supplementalContextItems: projectContext,
+            strategy: 'default',
+        }
+    }
+
+    return {
+        supplementalContextItems: opentabsContext ?? [],
+        strategy: 'opentabs',
+    }
+}
+
+export async function fetchProjectContext(
+    editor: vscode.TextEditor,
+    target: 'default' | 'codemap' | 'bm25',
+    languageclient?: BaseLanguageClient
+): Promise<CodeWhispererSupplementalContextItem[]> {
+    try {
+        if (languageclient) {
+            const request: GetSupplementalContextParams = {
+                filePath: editor.document.uri.fsPath,
+            }
+            const response = await languageclient.sendRequest(getSupplementalContextRequestType.method, request)
+            return response as CodeWhispererSupplementalContextItem[]
+        }
+    } catch (error) {
+        return []
+    }
+    return []
+}
+
+export async function fetchOpentabsContext(
+    editor: vscode.TextEditor,
+    cancellationToken: vscode.CancellationToken
+): Promise<CodeWhispererSupplementalContextItem[] | undefined> {
+    const codeChunksCalculated = crossFileContextConfig.numberOfChunkToFetch
+
+    // Step 1: Get relevant cross files to refer
+    const relevantCrossFilePaths = await getCrossFileCandidates(editor)
+
+    // Step 2: Split files to chunks with upper bound on chunkCount
+    // We restrict the total number of chunks to improve on latency.
+    // Chunk linking is required as we want to pass the next chunk value for matched chunk.
+    let chunkList: Chunk[] = []
+    for (const relevantFile of relevantCrossFilePaths) {
+        const chunks: Chunk[] = await splitFileToChunks(relevantFile, crossFileContextConfig.numberOfLinesEachChunk)
+        const linkedChunks = linkChunks(chunks)
+        chunkList.push(...linkedChunks)
+        if (chunkList.length >= codeChunksCalculated) {
+            break
+        }
+    }
+
+    // it's required since chunkList.push(...) is likely giving us a list of size > 60
+    chunkList = chunkList.slice(0, codeChunksCalculated)
+
+    // Step 3: Generate Input chunk (10 lines left of cursor position)
+    // and Find Best K chunks w.r.t input chunk using BM25
+    const inputChunk: Chunk = getInputChunk(editor)
+    const bestChunks: Chunk[] = findBestKChunkMatches(inputChunk, chunkList, crossFileContextConfig.topK)
+
+    // Step 4: Transform best chunks to supplemental contexts
+    const supplementalContexts: CodeWhispererSupplementalContextItem[] = []
+    let totalLength = 0
+    for (const chunk of bestChunks) {
+        totalLength += chunk.nextContent.length
+
+        if (totalLength > crossFileContextConfig.maximumTotalLength) {
+            break
+        }
+
+        supplementalContexts.push({
+            filePath: chunk.fileName,
+            content: chunk.nextContent,
+            score: chunk.score,
+        })
+    }
+
+    // DO NOT send code chunk with empty content
+    getLogger().debug(`CodeWhisperer finished fetching crossfile context out of ${relevantCrossFilePaths.length} files`)
+    return supplementalContexts
+}
+
+function findBestKChunkMatches(chunkInput: Chunk, chunkReferences: Chunk[], k: number): Chunk[] {
+    const chunkContentList = chunkReferences.map((chunk) => chunk.content)
+
+    // performBM25Scoring returns the output in a sorted order (descending of scores)
+    const top3: BM25Document[] = new BM25Okapi(chunkContentList).topN(chunkInput.content, crossFileContextConfig.topK)
+
+    return top3.map((doc) => {
+        // reference to the original metadata since BM25.top3 will sort the result
+        const chunkIndex = doc.index
+        const chunkReference = chunkReferences[chunkIndex]
+        return {
+            content: chunkReference.content,
+            fileName: chunkReference.fileName,
+            nextContent: chunkReference.nextContent,
+            score: doc.score,
+        }
+    })
+}
+
+/* This extract 10 lines to the left of the cursor from trigger file.
+ * This will be the inputquery to bm25 matching against list of cross-file chunks
+ */
+function getInputChunk(editor: vscode.TextEditor) {
+    const chunkSize = crossFileContextConfig.numberOfLinesEachChunk
+    const cursorPosition = editor.selection.active
+    const startLine = Math.max(cursorPosition.line - chunkSize, 0)
+    const endLine = Math.max(cursorPosition.line - 1, 0)
+    const inputChunkContent = editor.document.getText(
+        new vscode.Range(startLine, 0, endLine, editor.document.lineAt(endLine).text.length)
+    )
+    const inputChunk: Chunk = { fileName: editor.document.fileName, content: inputChunkContent, nextContent: '' }
+    return inputChunk
+}
+
+/**
+ * Util to decide if we need to fetch crossfile context since CodeWhisperer CrossFile Context feature is gated by userGroup and language level
+ * @param languageId: VSCode language Identifier
+ * @returns specifically returning undefined if the langueage is not supported,
+ * otherwise true/false depending on if the language is fully supported or not belonging to the user group
+ */
+function getSupplementalContextConfig(languageId: vscode.TextDocument['languageId']): SupplementalContextConfig {
+    if (!isCrossFileSupported(languageId)) {
+        return 'none'
+    }
+
+    const group = FeatureConfigProvider.instance.getProjectContextGroup()
+    switch (group) {
+        default:
+            return 'codemap'
+    }
+}
+
+/**
+ * This linking is required from science experimentations to pass the next contnet chunk
+ * when a given chunk context passes the match in BM25.
+ * Special handling is needed for last(its next points to its own) and first chunk
+ */
+export function linkChunks(chunks: Chunk[]) {
+    const updatedChunks: Chunk[] = []
+
+    // This additional chunk is needed to create a next pointer to chunk 0.
+    const firstChunk = chunks[0]
+    const firstChunkSubContent = firstChunk.content.split('\n').slice(0, 3).join('\n').trimEnd()
+    const newFirstChunk = {
+        fileName: firstChunk.fileName,
+        content: firstChunkSubContent,
+        nextContent: firstChunk.content,
+    }
+    updatedChunks.push(newFirstChunk)
+
+    const n = chunks.length
+    for (let i = 0; i < n; i++) {
+        const chunk = chunks[i]
+        const nextChunk = i < n - 1 ? chunks[i + 1] : chunk
+
+        chunk.nextContent = nextChunk.content
+        updatedChunks.push(chunk)
+    }
+
+    return updatedChunks
+}
+
+export async function splitFileToChunks(filePath: string, chunkSize: number): Promise<Chunk[]> {
+    const chunks: Chunk[] = []
+
+    const fileContent = (await fs.readFileText(filePath)).trimEnd()
+    const lines = fileContent.split('\n')
+
+    for (let i = 0; i < lines.length; i += chunkSize) {
+        const chunkContent = lines.slice(i, Math.min(i + chunkSize, lines.length)).join('\n')
+        const chunk = { fileName: filePath, content: chunkContent.trimEnd(), nextContent: '' }
+        chunks.push(chunk)
+    }
+    return chunks
+}
+
+/**
+ * This function will return relevant cross files sorted by file distance for the given editor file
+ * by referencing open files, imported files and same package files.
+ */
+export async function getCrossFileCandidates(editor: vscode.TextEditor): Promise<string[]> {
+    const targetFile = editor.document.uri.fsPath
+    const language = editor.document.languageId as CrossFileSupportedLanguage
+    const dialects = supportedLanguageToDialects[language]
+
+    /**
+     * Consider a file which
+     * 1. is different from the target
+     * 2. has the same file extension or it's one of the dialect of target file (e.g .js vs. .jsx)
+     * 3. is not a test file
+     */
+    const unsortedCandidates = await getOpenFilesInWindow(async (candidateFile) => {
+        return (
+            targetFile !== candidateFile &&
+            (path.extname(targetFile) === path.extname(candidateFile) ||
+                (dialects && dialects.has(path.extname(candidateFile)))) &&
+            !(await isTestFile(candidateFile, { languageId: language }))
+        )
+    })
+
+    return unsortedCandidates
+        .map((candidate) => {
+            return {
+                file: candidate,
+                fileDistance: getFileDistance(targetFile, candidate),
+            }
+        })
+        .sort((file1, file2) => {
+            return file1.fileDistance - file2.fileDistance
+        })
+        .map((fileToDistance) => {
+            return fileToDistance.file
+        })
+}
diff --git a/packages/core/src/codewhisperer/util/supplementalContext/rankBm25.ts b/packages/core/src/codewhisperer/util/supplementalContext/rankBm25.ts
new file mode 100644
index 00000000000..a2c77e0b10f
--- /dev/null
+++ b/packages/core/src/codewhisperer/util/supplementalContext/rankBm25.ts
@@ -0,0 +1,137 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Implementation inspired by https://github.com/dorianbrown/rank_bm25/blob/990470ebbe6b28c18216fd1a8b18fe7446237dd6/rank_bm25.py#L52
+
+export interface BM25Document {
+    content: string
+    /** The score that the document receives. */
+    score: number
+
+    index: number
+}
+
+export abstract class BM25 {
+    protected readonly corpusSize: number
+    protected readonly avgdl: number
+    protected readonly idf: Map<string, number> = new Map()
+    protected readonly docLen: number[] = []
+    protected readonly docFreqs: Map<string, number>[] = []
+    protected readonly nd: Map<string, number> = new Map()
+
+    constructor(
+        protected readonly corpus: string[],
+        protected readonly tokenizer: (str: string) => string[] = defaultTokenizer,
+        protected readonly k1: number,
+        protected readonly b: number,
+        protected readonly epsilon: number
+    ) {
+        this.corpusSize = corpus.length
+
+        let numDoc = 0
+        for (const document of corpus.map((document) => {
+            return tokenizer(document)
+        })) {
+            this.docLen.push(document.length)
+            numDoc += document.length
+
+            const frequencies = new Map<string, number>()
+            for (const word of document) {
+                frequencies.set(word, (frequencies.get(word) || 0) + 1)
+            }
+            this.docFreqs.push(frequencies)
+
+            for (const [word, _] of frequencies.entries()) {
+                this.nd.set(word, (this.nd.get(word) || 0) + 1)
+            }
+        }
+
+        this.avgdl = numDoc / this.corpusSize
+
+        this.calIdf(this.nd)
+    }
+
+    abstract calIdf(nd: Map<string, number>): void
+
+    abstract score(query: string): BM25Document[]
+
+    topN(query: string, n: number): BM25Document[] {
+        const notSorted = this.score(query)
+        const sorted = notSorted.sort((a, b) => b.score - a.score)
+        return sorted.slice(0, Math.min(n, sorted.length))
+    }
+}
+
+export class BM25Okapi extends BM25 {
+    constructor(corpus: string[], tokenizer: (str: string) => string[] = defaultTokenizer) {
+        super(corpus, tokenizer, 1.5, 0.75, 0.25)
+    }
+
+    calIdf(nd: Map<string, number>): void {
+        let idfSum = 0
+
+        const negativeIdfs: string[] = []
+        for (const [word, freq] of nd) {
+            const idf = Math.log(this.corpusSize - freq + 0.5) - Math.log(freq + 0.5)
+            this.idf.set(word, idf)
+            idfSum += idf
+
+            if (idf < 0) {
+                negativeIdfs.push(word)
+            }
+        }
+
+        const averageIdf = idfSum / this.idf.size
+        const eps = this.epsilon * averageIdf
+        for (const word of negativeIdfs) {
+            this.idf.set(word, eps)
+        }
+    }
+
+    score(query: string): BM25Document[] {
+        const queryWords = defaultTokenizer(query)
+        return this.docFreqs.map((docFreq, index) => {
+            let score = 0
+            for (const [_, queryWord] of queryWords.entries()) {
+                const queryWordFreqForDocument = docFreq.get(queryWord) || 0
+                const numerator = (this.idf.get(queryWord) || 0.0) * queryWordFreqForDocument * (this.k1 + 1)
+                const denominator =
+                    queryWordFreqForDocument + this.k1 * (1 - this.b + (this.b * this.docLen[index]) / this.avgdl)
+
+                score += numerator / denominator
+            }
+
+            return {
+                content: this.corpus[index],
+                score: score,
+                index: index,
+            }
+        })
+    }
+}
+
+// TODO: This is a very simple tokenizer, we want to replace this by more sophisticated one.
+function defaultTokenizer(content: string): string[] {
+    const regex = /\w+/g
+    const words = content.split(' ')
+    const result = []
+    for (const word of words) {
+        const wordList = findAll(word, regex)
+        result.push(...wordList)
+    }
+
+    return result
+}
+
+function findAll(str: string, re: RegExp): string[] {
+    let match: RegExpExecArray | null
+    const matches: string[] = []
+
+    while ((match = re.exec(str)) !== null) {
+        matches.push(match[0])
+    }
+
+    return matches
+}
diff --git a/packages/core/src/codewhisperer/util/supplementalContext/supplementalContextUtil.ts b/packages/core/src/codewhisperer/util/supplementalContext/supplementalContextUtil.ts
new file mode 100644
index 00000000000..3a8d66b8b42
--- /dev/null
+++ b/packages/core/src/codewhisperer/util/supplementalContext/supplementalContextUtil.ts
@@ -0,0 +1,139 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { fetchSupplementalContextForTest } from './utgUtils'
+import { fetchSupplementalContextForSrc } from './crossFileContextUtil'
+import { isTestFile } from './codeParsingUtil'
+import * as vscode from 'vscode'
+import { CancellationError } from '../../../shared/utilities/timeoutUtils'
+import { ToolkitError } from '../../../shared/errors'
+import { getLogger } from '../../../shared/logger/logger'
+import { CodeWhispererSupplementalContext } from '../../models/model'
+import * as os from 'os'
+import { crossFileContextConfig } from '../../models/constants'
+import { BaseLanguageClient } from 'vscode-languageclient'
+
+export async function fetchSupplementalContext(
+    editor: vscode.TextEditor,
+    cancellationToken: vscode.CancellationToken,
+    languageClient?: BaseLanguageClient
+): Promise<CodeWhispererSupplementalContext | undefined> {
+    const timesBeforeFetching = Date.now()
+
+    const isUtg = await isTestFile(editor.document.uri.fsPath, {
+        languageId: editor.document.languageId,
+        fileContent: editor.document.getText(),
+    })
+
+    let supplementalContextPromise: Promise<
+        Pick<CodeWhispererSupplementalContext, 'supplementalContextItems' | 'strategy'> | undefined
+    >
+
+    if (isUtg) {
+        supplementalContextPromise = fetchSupplementalContextForTest(editor, cancellationToken)
+    } else {
+        supplementalContextPromise = fetchSupplementalContextForSrc(editor, cancellationToken, languageClient)
+    }
+
+    return supplementalContextPromise
+        .then((value) => {
+            if (value) {
+                const resBeforeTruncation = {
+                    isUtg: isUtg,
+                    isProcessTimeout: false,
+                    supplementalContextItems: value.supplementalContextItems.filter(
+                        (item) => item.content.trim().length !== 0
+                    ),
+                    contentsLength: value.supplementalContextItems.reduce((acc, curr) => acc + curr.content.length, 0),
+                    latency: Date.now() - timesBeforeFetching,
+                    strategy: value.strategy,
+                }
+
+                return truncateSuppelementalContext(resBeforeTruncation)
+            } else {
+                return undefined
+            }
+        })
+        .catch((err) => {
+            if (err instanceof ToolkitError && err.cause instanceof CancellationError) {
+                return {
+                    isUtg: isUtg,
+                    isProcessTimeout: true,
+                    supplementalContextItems: [],
+                    contentsLength: 0,
+                    latency: Date.now() - timesBeforeFetching,
+                    strategy: 'empty',
+                }
+            } else {
+                getLogger().error(
+                    `Fail to fetch supplemental context for target file ${editor.document.fileName}: ${err}`
+                )
+                return undefined
+            }
+        })
+}
+
+/**
+ * Requirement
+ * - Maximum 5 supplemental context.
+ * - Each chunk can't exceed 10240 characters
+ * - Sum of all chunks can't exceed 20480 characters
+ */
+export function truncateSuppelementalContext(
+    context: CodeWhispererSupplementalContext
+): CodeWhispererSupplementalContext {
+    let c = context.supplementalContextItems.map((item) => {
+        if (item.content.length > crossFileContextConfig.maxLengthEachChunk) {
+            return {
+                ...item,
+                content: truncateLineByLine(item.content, crossFileContextConfig.maxLengthEachChunk),
+            }
+        } else {
+            return item
+        }
+    })
+
+    if (c.length > crossFileContextConfig.maxContextCount) {
+        c = c.slice(0, crossFileContextConfig.maxContextCount)
+    }
+
+    let curTotalLength = c.reduce((acc, cur) => {
+        return acc + cur.content.length
+    }, 0)
+    while (curTotalLength >= 20480 && c.length - 1 >= 0) {
+        const last = c[c.length - 1]
+        c = c.slice(0, -1)
+        curTotalLength -= last.content.length
+    }
+
+    return {
+        ...context,
+        supplementalContextItems: c,
+        contentsLength: curTotalLength,
+    }
+}
+
+export function truncateLineByLine(input: string, l: number): string {
+    const maxLength = l > 0 ? l : -1 * l
+    if (input.length === 0) {
+        return ''
+    }
+
+    const shouldAddNewLineBack = input.endsWith(os.EOL)
+    let lines = input.trim().split(os.EOL)
+    let curLen = input.length
+    while (curLen > maxLength && lines.length - 1 >= 0) {
+        const last = lines[lines.length - 1]
+        lines = lines.slice(0, -1)
+        curLen -= last.length + 1
+    }
+
+    const r = lines.join(os.EOL)
+    if (shouldAddNewLineBack) {
+        return r + os.EOL
+    } else {
+        return r
+    }
+}
diff --git a/packages/core/src/codewhisperer/util/supplementalContext/utgUtils.ts b/packages/core/src/codewhisperer/util/supplementalContext/utgUtils.ts
new file mode 100644
index 00000000000..0d33969773e
--- /dev/null
+++ b/packages/core/src/codewhisperer/util/supplementalContext/utgUtils.ts
@@ -0,0 +1,229 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as path from 'path'
+import { fs } from '../../../shared/fs/fs'
+import * as vscode from 'vscode'
+import {
+    countSubstringMatches,
+    extractClasses,
+    extractFunctions,
+    isTestFile,
+    utgLanguageConfig,
+    utgLanguageConfigs,
+} from './codeParsingUtil'
+import { ToolkitError } from '../../../shared/errors'
+import { supplemetalContextFetchingTimeoutMsg } from '../../models/constants'
+import { CancellationError } from '../../../shared/utilities/timeoutUtils'
+import { utgConfig } from '../../models/constants'
+import { getOpenFilesInWindow } from '../../../shared/utilities/editorUtilities'
+import { getLogger } from '../../../shared/logger/logger'
+import { CodeWhispererSupplementalContext, CodeWhispererSupplementalContextItem, UtgStrategy } from '../../models/model'
+
+const utgSupportedLanguages: vscode.TextDocument['languageId'][] = ['java', 'python']
+
+type UtgSupportedLanguage = (typeof utgSupportedLanguages)[number]
+
+function isUtgSupportedLanguage(languageId: vscode.TextDocument['languageId']): languageId is UtgSupportedLanguage {
+    return utgSupportedLanguages.includes(languageId)
+}
+
+export function shouldFetchUtgContext(languageId: vscode.TextDocument['languageId']): boolean | undefined {
+    if (!isUtgSupportedLanguage(languageId)) {
+        return undefined
+    }
+
+    return languageId === 'java'
+}
+
+/**
+ * This function attempts to find a focal file for the given trigger file.
+ * Attempt 1: If naming patterns followed correctly, source file can be found by name referencing.
+ * Attempt 2: Compare the function and class names of trigger file and all other open files in editor
+ * to find the closest match.
+ * Once found the focal file, we split it into multiple pieces as supplementalContext.
+ * @param editor
+ * @returns
+ */
+export async function fetchSupplementalContextForTest(
+    editor: vscode.TextEditor,
+    cancellationToken: vscode.CancellationToken
+): Promise<Pick<CodeWhispererSupplementalContext, 'supplementalContextItems' | 'strategy'> | undefined> {
+    const shouldProceed = shouldFetchUtgContext(editor.document.languageId)
+
+    if (!shouldProceed) {
+        return shouldProceed === undefined ? undefined : { supplementalContextItems: [], strategy: 'empty' }
+    }
+
+    const languageConfig = utgLanguageConfigs[editor.document.languageId]
+
+    // TODO (Metrics): 1. Total number of calls to fetchSupplementalContextForTest
+    throwIfCancelled(cancellationToken)
+
+    let crossSourceFile = await findSourceFileByName(editor, languageConfig, cancellationToken)
+    if (crossSourceFile) {
+        // TODO (Metrics): 2. Success count for fetchSourceFileByName (find source file by name)
+        getLogger().debug(`CodeWhisperer finished fetching utg context by file name`)
+        return {
+            supplementalContextItems: await generateSupplementalContextFromFocalFile(
+                crossSourceFile,
+                'byName',
+                cancellationToken
+            ),
+            strategy: 'byName',
+        }
+    }
+    throwIfCancelled(cancellationToken)
+
+    crossSourceFile = await findSourceFileByContent(editor, languageConfig, cancellationToken)
+    if (crossSourceFile) {
+        // TODO (Metrics): 3. Success count for fetchSourceFileByContent (find source file by content)
+        getLogger().debug(`CodeWhisperer finished fetching utg context by file content`)
+        return {
+            supplementalContextItems: await generateSupplementalContextFromFocalFile(
+                crossSourceFile,
+                'byContent',
+                cancellationToken
+            ),
+            strategy: 'byContent',
+        }
+    }
+
+    // TODO (Metrics): 4. Failure count - when unable to find focal file (supplemental context empty)
+    getLogger().debug(`CodeWhisperer failed to fetch utg context`)
+    return {
+        supplementalContextItems: [],
+        strategy: 'empty',
+    }
+}
+
+async function generateSupplementalContextFromFocalFile(
+    filePath: string,
+    strategy: UtgStrategy,
+    cancellationToken: vscode.CancellationToken
+): Promise<CodeWhispererSupplementalContextItem[]> {
+    const fileContent = await fs.readFileText(vscode.Uri.parse(filePath!).fsPath)
+
+    // DO NOT send code chunk with empty content
+    if (fileContent.trim().length === 0) {
+        return []
+    }
+
+    return [
+        {
+            filePath: filePath,
+            content: 'UTG\n' + fileContent.slice(0, Math.min(fileContent.length, utgConfig.maxSegmentSize)),
+        },
+    ]
+}
+
+async function findSourceFileByContent(
+    editor: vscode.TextEditor,
+    languageConfig: utgLanguageConfig,
+    cancellationToken: vscode.CancellationToken
+): Promise<string | undefined> {
+    const testFileContent = await fs.readFileText(editor.document.fileName)
+    const testElementList = extractFunctions(testFileContent, languageConfig.functionExtractionPattern)
+
+    throwIfCancelled(cancellationToken)
+
+    testElementList.push(...extractClasses(testFileContent, languageConfig.classExtractionPattern))
+
+    throwIfCancelled(cancellationToken)
+
+    let sourceFilePath: string | undefined = undefined
+    let maxMatchCount = 0
+
+    if (testElementList.length === 0) {
+        // TODO: Add metrics here, as unable to parse test file using Regex.
+        return sourceFilePath
+    }
+
+    const relevantFilePaths = await getRelevantUtgFiles(editor)
+
+    throwIfCancelled(cancellationToken)
+
+    // TODO (Metrics):Add metrics for relevantFilePaths length
+    for (const filePath of relevantFilePaths) {
+        throwIfCancelled(cancellationToken)
+
+        const fileContent = await fs.readFileText(filePath)
+        const elementList = extractFunctions(fileContent, languageConfig.functionExtractionPattern)
+        elementList.push(...extractClasses(fileContent, languageConfig.classExtractionPattern))
+        const matchCount = countSubstringMatches(elementList, testElementList)
+        if (matchCount > maxMatchCount) {
+            maxMatchCount = matchCount
+            sourceFilePath = filePath
+        }
+    }
+    return sourceFilePath
+}
+
+async function getRelevantUtgFiles(editor: vscode.TextEditor): Promise<string[]> {
+    const targetFile = editor.document.uri.fsPath
+    const language = editor.document.languageId
+
+    return await getOpenFilesInWindow(async (candidateFile) => {
+        return (
+            targetFile !== candidateFile &&
+            path.extname(targetFile) === path.extname(candidateFile) &&
+            !(await isTestFile(candidateFile, { languageId: language }))
+        )
+    })
+}
+
+export function guessSrcFileName(
+    testFileName: string,
+    languageId: vscode.TextDocument['languageId']
+): string | undefined {
+    const languageConfig = utgLanguageConfigs[languageId]
+    if (!languageConfig) {
+        return undefined
+    }
+
+    for (const pattern of languageConfig.testFilenamePattern) {
+        try {
+            const match = testFileName.match(pattern)
+            if (match) {
+                return match[1] + match[2]
+            }
+        } catch (err) {
+            if (err instanceof Error) {
+                getLogger().error(
+                    `codewhisperer: error while guessing source file name from file ${testFileName} and pattern ${pattern}: ${err.message}`
+                )
+            }
+        }
+    }
+
+    return undefined
+}
+
+async function findSourceFileByName(
+    editor: vscode.TextEditor,
+    languageConfig: utgLanguageConfig,
+    cancellationToken: vscode.CancellationToken
+): Promise<string | undefined> {
+    const testFileName = path.basename(editor.document.fileName)
+    const assumedSrcFileName = guessSrcFileName(testFileName, editor.document.languageId)
+    if (!assumedSrcFileName) {
+        return undefined
+    }
+
+    const sourceFiles = await vscode.workspace.findFiles(`**/${assumedSrcFileName}`)
+
+    throwIfCancelled(cancellationToken)
+
+    if (sourceFiles.length > 0) {
+        return sourceFiles[0].toString()
+    }
+    return undefined
+}
+
+function throwIfCancelled(token: vscode.CancellationToken): void | never {
+    if (token.isCancellationRequested) {
+        throw new ToolkitError(supplemetalContextFetchingTimeoutMsg, { cause: new CancellationError('timeout') })
+    }
+}
diff --git a/packages/core/src/codewhisperer/util/telemetryHelper.ts b/packages/core/src/codewhisperer/util/telemetryHelper.ts
new file mode 100644
index 00000000000..72f88ab9dc2
--- /dev/null
+++ b/packages/core/src/codewhisperer/util/telemetryHelper.ts
@@ -0,0 +1,881 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import globals from '../../shared/extensionGlobals'
+
+import { runtimeLanguageContext } from './runtimeLanguageContext'
+import { codeWhispererClient as client, RecommendationsList } from '../client/codewhisperer'
+import { LicenseUtil } from './licenseUtil'
+import {
+    CodewhispererGettingStartedTask,
+    CodewhispererLanguage,
+    CodewhispererPreviousSuggestionState,
+    CodewhispererUserDecision,
+    CodewhispererUserTriggerDecision,
+    telemetry,
+} from '../../shared/telemetry/telemetry'
+import { CodewhispererCompletionType, CodewhispererSuggestionState } from '../../shared/telemetry/telemetry'
+import { getImportCount } from './importAdderUtil'
+import { CodeWhispererSettings } from './codewhispererSettings'
+import { getSelectedCustomization } from './customizationUtil'
+import { AuthUtil } from './authUtil'
+import { isAwsError } from '../../shared/errors'
+import { getLogger } from '../../shared/logger/logger'
+import { session } from './codeWhispererSession'
+import { CodeWhispererSupplementalContext } from '../models/model'
+import { FeatureConfigProvider } from '../../shared/featureConfig'
+import CodeWhispererUserClient, { CodeScanRemediationsEventType } from '../client/codewhispereruserclient'
+import { CodeAnalysisScope as CodeAnalysisScopeClientSide } from '../models/constants'
+import { sleep } from '../../shared/utilities/timeoutUtils'
+import { getDiagnosticsDifferences, getDiagnosticsOfCurrentFile, toIdeDiagnostics } from './diagnosticsUtil'
+import { Auth } from '../../auth/auth'
+
+export class TelemetryHelper {
+    // Some variables for client component latency
+    private _sdkApiCallEndTime = 0
+    get sdkApiCallEndTime(): number {
+        return this._sdkApiCallEndTime
+    }
+    private _allPaginationEndTime = 0
+    get allPaginationEndTime(): number {
+        return this._allPaginationEndTime
+    }
+    private _firstResponseRequestId = ''
+    get firstResponseRequestId(): string {
+        return this._firstResponseRequestId
+    }
+    // variables for user trigger decision
+    // these will be cleared after a invocation session
+    private sessionDecisions: CodewhispererUserTriggerDecision[] = []
+    private triggerChar?: string = undefined
+    private prevTriggerDecision?: CodewhispererPreviousSuggestionState
+    private typeAheadLength = 0
+    private timeSinceLastModification = 0
+    private lastTriggerDecisionTime = 0
+    private classifierResult?: number = undefined
+    private classifierThreshold?: number = undefined
+    // variables for tracking end to end sessions
+    public traceId: string = 'notSet'
+
+    // use this to distinguish DocumentChangeEvent from CWSPR or from other sources
+    public lastSuggestionInDisplay = ''
+
+    constructor() {}
+
+    static #instance: TelemetryHelper
+
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+
+    public recordServiceInvocationTelemetry(
+        requestId: string,
+        sessionId: string,
+        lastSuggestionIndex: number,
+        result: 'Succeeded' | 'Failed',
+        duration: number | undefined,
+        language: CodewhispererLanguage,
+        taskType: CodewhispererGettingStartedTask | undefined,
+        reason: string,
+        supplementalContextMetadata?: CodeWhispererSupplementalContext | undefined
+    ) {
+        const event = {
+            codewhispererAutomatedTriggerType: session.autoTriggerType,
+            codewhispererCursorOffset: session.startCursorOffset,
+            codewhispererCustomizationArn: getSelectedCustomization().arn,
+            CodewhispererGettingStartedTask: taskType,
+            codewhispererImportRecommendationEnabled: CodeWhispererSettings.instance.isImportRecommendationEnabled(),
+            codewhispererLastSuggestionIndex: lastSuggestionIndex,
+            codewhispererLanguage: language,
+            codewhispererLineNumber: session.startPos.line,
+            codewhispererRequestId: requestId ? requestId : undefined,
+            codewhispererSessionId: sessionId ? sessionId : undefined,
+            codewhispererSupplementalContextIsUtg: supplementalContextMetadata?.isUtg,
+            codewhispererSupplementalContextLatency: supplementalContextMetadata?.latency,
+            codewhispererSupplementalContextLength: supplementalContextMetadata?.contentsLength,
+            codewhispererSupplementalContextTimeout: supplementalContextMetadata?.isProcessTimeout,
+            codewhispererTriggerType: session.triggerType,
+            credentialStartUrl: AuthUtil.instance.startUrl,
+            duration: duration || 0,
+            reason: reason ? reason.substring(0, 200) : undefined,
+            result,
+            traceId: this.traceId,
+        }
+        telemetry.codewhisperer_serviceInvocation.emit(event)
+    }
+
+    public recordUserDecisionTelemetryForEmptyList(
+        requestIdList: string[],
+        sessionId: string,
+        paginationIndex: number,
+        language: CodewhispererLanguage,
+        supplementalContextMetadata?: CodeWhispererSupplementalContext | undefined
+    ) {
+        const selectedCustomization = getSelectedCustomization()
+        const profile = AuthUtil.instance.regionProfileManager.activeRegionProfile
+
+        telemetry.codewhisperer_userTriggerDecision.emit({
+            codewhispererAutomatedTriggerType: session.autoTriggerType,
+            codewhispererClassifierResult: this.classifierResult,
+            codewhispererClassifierThreshold: this.classifierThreshold,
+            codewhispererCompletionType: 'Line',
+            codewhispererCursorOffset: session.startCursorOffset,
+            codewhispererCustomizationArn: selectedCustomization.arn === '' ? undefined : selectedCustomization.arn,
+            codewhispererFeatureEvaluations: FeatureConfigProvider.instance.getFeatureConfigsTelemetry(),
+            codewhispererFirstRequestId: requestIdList[0],
+            codewhispererGettingStartedTask: session.taskType,
+            codewhispererLanguage: language,
+            codewhispererLineNumber: session.startPos.line,
+            codewhispererPreviousSuggestionState: this.prevTriggerDecision,
+            codewhispererSessionId: sessionId,
+            codewhispererSuggestionCount: 0,
+            codewhispererSuggestionImportCount: 0,
+            codewhispererSuggestionState: 'Empty',
+            codewhispererSupplementalContextIsUtg: supplementalContextMetadata?.isUtg,
+            codewhispererSupplementalContextLength: supplementalContextMetadata?.contentsLength,
+            // eslint-disable-next-line id-length
+            codewhispererSupplementalContextStrategyId: supplementalContextMetadata?.strategy,
+            codewhispererSupplementalContextTimeout: supplementalContextMetadata?.isProcessTimeout,
+            codewhispererTimeSinceLastDocumentChange: this.timeSinceLastModification
+                ? this.timeSinceLastModification
+                : undefined,
+            codewhispererTimeSinceLastUserDecision: this.lastTriggerDecisionTime
+                ? Date.now() - this.lastTriggerDecisionTime
+                : undefined,
+            codewhispererTimeToFirstRecommendation: session.timeToFirstRecommendation,
+            codewhispererTriggerType: session.triggerType,
+            codewhispererTypeaheadLength: this.typeAheadLength,
+            credentialStartUrl: AuthUtil.instance.startUrl,
+            traceId: this.traceId,
+        })
+
+        client
+            .sendTelemetryEvent({
+                telemetryEvent: {
+                    userTriggerDecisionEvent: {
+                        sessionId: sessionId,
+                        requestId: requestIdList[0],
+                        customizationArn: selectedCustomization.arn === '' ? undefined : selectedCustomization.arn,
+                        programmingLanguage: {
+                            languageName: runtimeLanguageContext.toRuntimeLanguage(language),
+                        },
+                        completionType: 'LINE',
+                        suggestionState: 'EMPTY',
+                        recommendationLatencyMilliseconds: 0,
+                        triggerToResponseLatencyMilliseconds: session.timeToFirstRecommendation,
+                        perceivedLatencyMilliseconds: session.perceivedLatency,
+                        timestamp: new Date(Date.now()),
+                        suggestionReferenceCount: 0,
+                        generatedLine: 0,
+                        numberOfRecommendations: 0,
+                        acceptedCharacterCount: 0,
+                    },
+                },
+                profileArn: profile?.arn,
+            })
+            .then()
+            .catch((error) => {
+                let requestId: string | undefined
+                if (isAwsError(error)) {
+                    requestId = error.requestId
+                }
+
+                getLogger().error(`Failed to invoke sendTelemetryEvent, requestId: ${requestId ?? ''}`)
+            })
+    }
+
+    /**
+     * This function is to record the user decision on each of the suggestion in the list of CodeWhisperer recommendations.
+     * @param recommendations the recommendations
+     * @param acceptIndex the index of the accepted suggestion in the corresponding list of CodeWhisperer response.
+     * If this function is not called on acceptance, then acceptIndex == -1
+     * @param languageId the language ID of the current document in current active editor
+     * @param paginationIndex the index of pagination calls
+     * @param recommendationSuggestionState the key-value mapping from index to suggestion state
+     */
+
+    public recordUserDecisionTelemetry(
+        requestIdList: string[],
+        sessionId: string,
+        recommendations: RecommendationsList,
+        acceptIndex: number,
+        paginationIndex: number,
+        completionTypes: Map<number, CodewhispererCompletionType>,
+        recommendationSuggestionState?: Map<number, string>,
+        supplementalContextMetadata?: CodeWhispererSupplementalContext | undefined
+    ) {
+        const events: CodewhispererUserDecision[] = []
+        // emit user decision telemetry
+        for (const [i, _elem] of recommendations.entries()) {
+            let uniqueSuggestionReferences: string | undefined = undefined
+            const uniqueLicenseSet = LicenseUtil.getUniqueLicenseNames(_elem.references)
+            if (uniqueLicenseSet.size > 0) {
+                uniqueSuggestionReferences = JSON.stringify(Array.from(uniqueLicenseSet))
+            }
+            if (_elem.content.length === 0) {
+                recommendationSuggestionState?.set(i, 'Empty')
+            }
+            const event: CodewhispererUserDecision = {
+                // TODO: maintain a list of RecommendationContexts with both recommendation and requestId in it, instead of two separate list items.
+                codewhispererCompletionType: this.getCompletionType(i, completionTypes),
+                codewhispererGettingStartedTask: session.taskType,
+                codewhispererLanguage: session.language,
+                codewhispererPaginationProgress: paginationIndex,
+                codewhispererRequestId: requestIdList[i],
+                codewhispererSessionId: sessionId ? sessionId : undefined,
+                codewhispererSuggestionImportCount: getImportCount(_elem),
+                codewhispererSuggestionIndex: i,
+                codewhispererSuggestionState: this.getSuggestionState(i, acceptIndex, recommendationSuggestionState),
+                codewhispererSuggestionReferenceCount: _elem.references ? _elem.references.length : 0,
+                codewhispererSuggestionReferences: uniqueSuggestionReferences,
+                codewhispererSupplementalContextIsUtg: supplementalContextMetadata?.isUtg,
+                codewhispererSupplementalContextLength: supplementalContextMetadata?.contentsLength,
+                codewhispererSupplementalContextTimeout: supplementalContextMetadata?.isProcessTimeout,
+                codewhispererTriggerType: session.triggerType,
+                credentialStartUrl: AuthUtil.instance.startUrl,
+                traceId: this.traceId,
+            }
+            events.push(event)
+        }
+
+        // aggregate suggestion references count
+        const referenceCount = this.getAggregatedSuggestionReferenceCount(events)
+
+        // aggregate user decision events at requestId level
+        const aggregatedEvent = this.aggregateUserDecisionByRequest(events, requestIdList[0], sessionId)
+        if (aggregatedEvent) {
+            this.sessionDecisions.push(aggregatedEvent)
+        }
+
+        // TODO: use a ternary for this
+        let acceptedRecommendationContent
+        if (acceptIndex !== -1 && recommendations[acceptIndex] !== undefined) {
+            acceptedRecommendationContent = recommendations[acceptIndex].content
+        } else {
+            acceptedRecommendationContent = ''
+        }
+
+        // after we have all request level user decisions, aggregate them at session level and send
+        this.sendUserTriggerDecisionTelemetry(
+            sessionId,
+            acceptedRecommendationContent,
+            referenceCount,
+            supplementalContextMetadata
+        )
+    }
+
+    public aggregateUserDecisionByRequest(
+        events: CodewhispererUserDecision[],
+        requestId: string,
+        sessionId: string,
+        supplementalContextMetadata?: CodeWhispererSupplementalContext | undefined
+    ) {
+        // the request level user decision will contain information from both the service_invocation event
+        // and the user_decision events for recommendations within that request
+        if (!events.length) {
+            return
+        }
+        const aggregated: CodewhispererUserTriggerDecision = {
+            codewhispererAutomatedTriggerType: session.autoTriggerType,
+            codewhispererCompletionType: events[0].codewhispererCompletionType,
+            codewhispererCursorOffset: session.startCursorOffset,
+            codewhispererFirstRequestId: requestId,
+            codewhispererGettingStartedTask: session.taskType,
+            codewhispererLanguage: events[0].codewhispererLanguage,
+            codewhispererLineNumber: session.startPos.line,
+            codewhispererSessionId: sessionId,
+            codewhispererSuggestionCount: events.length,
+            codewhispererSuggestionImportCount: events
+                .map((e) => e.codewhispererSuggestionImportCount || 0)
+                .reduce((a, b) => a + b, 0),
+            codewhispererSuggestionState: this.getAggregatedSuggestionState(events),
+            codewhispererSupplementalContextIsUtg: supplementalContextMetadata?.isUtg,
+            codewhispererSupplementalContextLength: supplementalContextMetadata?.contentsLength,
+            codewhispererSupplementalContextTimeout: supplementalContextMetadata?.isProcessTimeout,
+            codewhispererTriggerType: events[0].codewhispererTriggerType,
+            codewhispererTypeaheadLength: 0,
+            credentialStartUrl: events[0].credentialStartUrl,
+            traceId: this.traceId,
+        }
+        return aggregated
+    }
+
+    public sendUserTriggerDecisionTelemetry(
+        sessionId: string,
+        acceptedRecommendationContent: string,
+        referenceCount: number,
+        supplementalContextMetadata?: CodeWhispererSupplementalContext | undefined
+    ) {
+        // the user trigger decision will aggregate information from request level user decisions within one session
+        // and add additional session level insights
+        if (!this.sessionDecisions.length) {
+            return
+        }
+
+        // TODO: add partial acceptance related metrics
+        const autoTriggerType = this.sessionDecisions[0].codewhispererAutomatedTriggerType
+        const language = this.sessionDecisions[0].codewhispererLanguage
+        const aggregatedCompletionType = this.sessionDecisions[0].codewhispererCompletionType
+        const aggregatedSuggestionState = this.getAggregatedSuggestionState(this.sessionDecisions)
+        const selectedCustomization = getSelectedCustomization()
+        const profile = AuthUtil.instance.regionProfileManager.activeRegionProfile
+        const generatedLines =
+            acceptedRecommendationContent.trim() === '' ? 0 : acceptedRecommendationContent.split('\n').length
+        const suggestionCount = this.sessionDecisions
+            .map((e) => e.codewhispererSuggestionCount)
+            .reduce((a, b) => a + b, 0)
+
+        const aggregated: CodewhispererUserTriggerDecision = {
+            codewhispererAutomatedTriggerType: autoTriggerType,
+            codewhispererCharactersAccepted: acceptedRecommendationContent.length,
+            codewhispererClassifierResult: this.classifierResult,
+            codewhispererClassifierThreshold: this.classifierThreshold,
+            codewhispererCompletionType: aggregatedCompletionType,
+            codewhispererCursorOffset: this.sessionDecisions[0].codewhispererCursorOffset,
+            codewhispererCustomizationArn: selectedCustomization.arn === '' ? undefined : selectedCustomization.arn,
+            codewhispererFeatureEvaluations: FeatureConfigProvider.instance.getFeatureConfigsTelemetry(),
+            codewhispererFirstRequestId: this.sessionDecisions[0].codewhispererFirstRequestId,
+            codewhispererGettingStartedTask: session.taskType,
+            codewhispererLanguage: language,
+            codewhispererLineNumber: this.sessionDecisions[0].codewhispererLineNumber,
+            codewhispererPreviousSuggestionState: this.prevTriggerDecision,
+            codewhispererSessionId: this.sessionDecisions[0].codewhispererSessionId,
+            codewhispererSuggestionCount: suggestionCount,
+            codewhispererSuggestionImportCount: this.sessionDecisions
+                .map((e) => e.codewhispererSuggestionImportCount || 0)
+                .reduce((a, b) => a + b, 0),
+            codewhispererSuggestionState: aggregatedSuggestionState,
+            codewhispererSupplementalContextIsUtg: supplementalContextMetadata?.isUtg,
+            codewhispererSupplementalContextLength: supplementalContextMetadata?.contentsLength,
+            // eslint-disable-next-line id-length
+            codewhispererSupplementalContextStrategyId: supplementalContextMetadata?.strategy,
+            codewhispererSupplementalContextTimeout: supplementalContextMetadata?.isProcessTimeout,
+            codewhispererTimeSinceLastDocumentChange: this.timeSinceLastModification
+                ? this.timeSinceLastModification
+                : undefined,
+            codewhispererTimeSinceLastUserDecision: this.lastTriggerDecisionTime
+                ? Date.now() - this.lastTriggerDecisionTime
+                : undefined,
+            codewhispererTimeToFirstRecommendation: session.timeToFirstRecommendation,
+            codewhispererTriggerCharacter: autoTriggerType === 'SpecialCharacters' ? this.triggerChar : undefined,
+            codewhispererTriggerType: this.sessionDecisions[0].codewhispererTriggerType,
+            codewhispererTypeaheadLength: this.typeAheadLength,
+            credentialStartUrl: this.sessionDecisions[0].credentialStartUrl,
+            traceId: this.traceId,
+        }
+        telemetry.codewhisperer_userTriggerDecision.emit(aggregated)
+        this.prevTriggerDecision = this.getAggregatedSuggestionState(this.sessionDecisions)
+        this.lastTriggerDecisionTime = Date.now()
+
+        // When we send a userTriggerDecision for neither Accept nor Reject, service side should not use this value
+        // and client side will set this value to 0.0.
+        let e2eLatency = session.firstSuggestionShowTime - session.invokeSuggestionStartTime
+        if (aggregatedSuggestionState !== 'Reject' && aggregatedSuggestionState !== 'Accept') {
+            e2eLatency = 0.0
+        }
+
+        const userTriggerDecisionEvent: CodeWhispererUserClient.UserTriggerDecisionEvent = {
+            sessionId: sessionId,
+            requestId: this.sessionDecisions[0].codewhispererFirstRequestId,
+            customizationArn: selectedCustomization.arn === '' ? undefined : selectedCustomization.arn,
+            programmingLanguage: {
+                languageName: runtimeLanguageContext.toRuntimeLanguage(this.sessionDecisions[0].codewhispererLanguage),
+            },
+            completionType: this.getSendTelemetryCompletionType(aggregatedCompletionType),
+            suggestionState: this.getSendTelemetrySuggestionState(aggregatedSuggestionState),
+            recommendationLatencyMilliseconds: e2eLatency,
+            triggerToResponseLatencyMilliseconds: session.timeToFirstRecommendation,
+            perceivedLatencyMilliseconds: session.perceivedLatency,
+            timestamp: new Date(Date.now()),
+            suggestionReferenceCount: referenceCount,
+            generatedLine: generatedLines,
+            numberOfRecommendations: suggestionCount,
+            acceptedCharacterCount: acceptedRecommendationContent.length,
+            suggestionType: 'COMPLETIONS',
+        }
+        this.resetUserTriggerDecisionTelemetry()
+
+        const sendEvent = () =>
+            client
+                .sendTelemetryEvent({
+                    telemetryEvent: { userTriggerDecisionEvent: userTriggerDecisionEvent },
+                    profileArn: profile?.arn,
+                })
+                .catch((error) => {
+                    const requestId = isAwsError(error) ? error.requestId : undefined
+                    getLogger().debug(
+                        `Failed to sendTelemetryEvent to CodeWhisperer, requestId: ${requestId ?? ''}, message: ${error.message}`
+                    )
+                })
+
+        if (userTriggerDecisionEvent.suggestionState === 'ACCEPT' && Auth.instance.isInternalAmazonUser()) {
+            // wait 1 seconds for the user installed 3rd party LSP
+            // to update its diagnostics.
+            void sleep(1000).then(() => {
+                const diagnosticDiff = getDiagnosticsDifferences(
+                    session.diagnosticsBeforeAccept,
+                    getDiagnosticsOfCurrentFile()
+                )
+                userTriggerDecisionEvent.addedIdeDiagnostics = diagnosticDiff.added.map((it) => toIdeDiagnostics(it))
+                userTriggerDecisionEvent.removedIdeDiagnostics = diagnosticDiff.removed.map((it) =>
+                    toIdeDiagnostics(it)
+                )
+                void sendEvent()
+            })
+        } else {
+            void sendEvent()
+        }
+    }
+
+    public getLastTriggerDecisionForClassifier() {
+        if (this.lastTriggerDecisionTime && Date.now() - this.lastTriggerDecisionTime <= 2 * 60 * 1000) {
+            return this.prevTriggerDecision
+        }
+    }
+
+    public setClassifierResult(classifierResult: number) {
+        this.classifierResult = classifierResult
+    }
+
+    public setClassifierThreshold(classifierThreshold: number) {
+        this.classifierThreshold = classifierThreshold
+    }
+
+    public setTriggerCharForUserTriggerDecision(triggerChar: string) {
+        this.triggerChar = triggerChar
+    }
+
+    public setTypeAheadLength(typeAheadLength: number) {
+        this.typeAheadLength = typeAheadLength
+    }
+
+    public setTimeSinceLastModification(timeSinceLastModification: number) {
+        this.timeSinceLastModification = timeSinceLastModification
+    }
+
+    public setTraceId(traceId: string) {
+        this.traceId = traceId
+    }
+
+    private resetUserTriggerDecisionTelemetry() {
+        this.sessionDecisions = []
+        this.triggerChar = ''
+        this.typeAheadLength = 0
+        this.timeSinceLastModification = 0
+        session.timeToFirstRecommendation = 0
+        session.perceivedLatency = 0
+        this.classifierResult = undefined
+        this.classifierThreshold = undefined
+    }
+
+    private getSendTelemetryCompletionType(completionType: CodewhispererCompletionType) {
+        return completionType === 'Block' ? 'BLOCK' : 'LINE'
+    }
+
+    private getAggregatedSuggestionState(
+        // if there is any Accept within the session, mark the session as Accept
+        // if there is any Reject within the session, mark the session as Reject
+        // if all recommendations within the session are empty, mark the session as Empty
+        // otherwise mark the session as Discard
+        events: CodewhispererUserDecision[] | CodewhispererUserTriggerDecision[]
+    ): CodewhispererPreviousSuggestionState {
+        let isEmpty = true
+        for (const event of events) {
+            if (event.codewhispererSuggestionState === 'Accept') {
+                return 'Accept'
+            } else if (event.codewhispererSuggestionState === 'Reject') {
+                return 'Reject'
+            } else if (event.codewhispererSuggestionState !== 'Empty') {
+                isEmpty = false
+            }
+        }
+        return isEmpty ? 'Empty' : 'Discard'
+    }
+
+    private getSendTelemetrySuggestionState(state: CodewhispererPreviousSuggestionState) {
+        if (state === 'Accept') {
+            return 'ACCEPT'
+        } else if (state === 'Reject') {
+            return 'REJECT'
+        } else if (state === 'Discard') {
+            return 'DISCARD'
+        }
+        return 'EMPTY'
+    }
+
+    private getAggregatedSuggestionReferenceCount(
+        events: CodewhispererUserDecision[]
+        // if there is reference for accepted recommendation within the session, mark the reference number
+        // as 1, otherwise mark the session as 0
+    ) {
+        for (const event of events) {
+            if (event.codewhispererSuggestionState === 'Accept' && event.codewhispererSuggestionReferenceCount !== 0) {
+                return 1
+            }
+        }
+        return 0
+    }
+
+    public getSuggestionState(
+        i: number,
+        acceptIndex: number,
+        recommendationSuggestionState?: Map<number, string>
+    ): CodewhispererSuggestionState {
+        const state = recommendationSuggestionState?.get(i)
+        if (state && ['Empty', 'Filter', 'Discard'].includes(state)) {
+            return state as CodewhispererSuggestionState
+        } else if (recommendationSuggestionState !== undefined && recommendationSuggestionState.get(i) !== 'Showed') {
+            return 'Unseen'
+        }
+        if (acceptIndex === -1) {
+            return 'Reject'
+        }
+        return i === acceptIndex ? 'Accept' : 'Ignore'
+    }
+
+    public getCompletionType(i: number, completionTypes: Map<number, CodewhispererCompletionType>) {
+        return completionTypes.get(i) || 'Line'
+    }
+
+    public isTelemetryEnabled(): boolean {
+        return globals.telemetry.telemetryEnabled
+    }
+
+    public resetClientComponentLatencyTime() {
+        session.invokeSuggestionStartTime = 0
+        session.preprocessEndTime = 0
+        session.sdkApiCallStartTime = 0
+        this._sdkApiCallEndTime = 0
+        session.fetchCredentialStartTime = 0
+        session.firstSuggestionShowTime = 0
+        this._allPaginationEndTime = 0
+        this._firstResponseRequestId = ''
+    }
+
+    public setPreprocessEndTime() {
+        if (session.preprocessEndTime !== 0) {
+            getLogger().warn(`inline completion preprocessEndTime has been set and not reset correctly`)
+        }
+        session.preprocessEndTime = Date.now()
+    }
+
+    /** This method is assumed to be invoked first at the start of execution **/
+    public setInvokeSuggestionStartTime() {
+        this.resetClientComponentLatencyTime()
+        session.invokeSuggestionStartTime = Date.now()
+    }
+
+    public setSdkApiCallEndTime() {
+        if (this._sdkApiCallEndTime === 0 && session.sdkApiCallStartTime !== 0) {
+            this._sdkApiCallEndTime = Date.now()
+        }
+    }
+
+    public setAllPaginationEndTime() {
+        if (this._allPaginationEndTime === 0 && this._sdkApiCallEndTime !== 0) {
+            this._allPaginationEndTime = Date.now()
+        }
+    }
+
+    public setFirstSuggestionShowTime() {
+        if (session.firstSuggestionShowTime === 0 && this._sdkApiCallEndTime !== 0) {
+            session.firstSuggestionShowTime = Date.now()
+        }
+    }
+
+    public setFirstResponseRequestId(requestId: string) {
+        if (this._firstResponseRequestId === '') {
+            this._firstResponseRequestId = requestId
+        }
+    }
+
+    // report client component latency after all pagination call finish
+    // and at least one suggestion is shown to the user
+    public tryRecordClientComponentLatency() {
+        if (session.firstSuggestionShowTime === 0 || this._allPaginationEndTime === 0) {
+            return
+        }
+        telemetry.codewhisperer_clientComponentLatency.emit({
+            codewhispererAllCompletionsLatency: this._allPaginationEndTime - session.sdkApiCallStartTime,
+            codewhispererCompletionType: 'Line',
+            codewhispererCredentialFetchingLatency: session.sdkApiCallStartTime - session.fetchCredentialStartTime,
+            codewhispererCustomizationArn: getSelectedCustomization().arn,
+            codewhispererEndToEndLatency: session.firstSuggestionShowTime - session.invokeSuggestionStartTime,
+            codewhispererFirstCompletionLatency: this._sdkApiCallEndTime - session.sdkApiCallStartTime,
+            codewhispererLanguage: session.language,
+            codewhispererPostprocessingLatency: session.firstSuggestionShowTime - this._sdkApiCallEndTime,
+            codewhispererPreprocessingLatency: session.preprocessEndTime - session.invokeSuggestionStartTime,
+            codewhispererRequestId: this._firstResponseRequestId,
+            codewhispererSessionId: session.sessionId,
+            codewhispererTriggerType: session.triggerType,
+            credentialStartUrl: AuthUtil.instance.startUrl,
+        })
+    }
+    public sendCodeScanEvent(languageId: string, jobId: string) {
+        getLogger().debug(`start sendCodeScanEvent: jobId: "${jobId}", languageId: "${languageId}"`)
+
+        client
+            .sendTelemetryEvent({
+                telemetryEvent: {
+                    codeScanEvent: {
+                        programmingLanguage: {
+                            languageName: runtimeLanguageContext.toRuntimeLanguage(languageId as CodewhispererLanguage),
+                        },
+                        codeScanJobId: jobId,
+                        timestamp: new Date(Date.now()),
+                    },
+                },
+                profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,
+            })
+            .then()
+            .catch((error) => {
+                let requestId: string | undefined
+                if (isAwsError(error)) {
+                    requestId = error.requestId
+                }
+
+                getLogger().debug(
+                    `Failed to sendCodeScanEvent to CodeWhisperer, requestId: ${requestId ?? ''}, message: ${
+                        error.message
+                    }`
+                )
+            })
+    }
+
+    public sendCodeScanSucceededEvent(
+        language: string,
+        jobId: string,
+        numberOfFindings: number,
+        scope: CodeAnalysisScopeClientSide
+    ) {
+        client
+            .sendTelemetryEvent({
+                telemetryEvent: {
+                    codeScanSucceededEvent: {
+                        programmingLanguage: {
+                            languageName: runtimeLanguageContext.toRuntimeLanguage(language as CodewhispererLanguage),
+                        },
+                        codeScanJobId: jobId,
+                        numberOfFindings: numberOfFindings,
+                        timestamp: new Date(Date.now()),
+                        codeAnalysisScope: scope === CodeAnalysisScopeClientSide.FILE_AUTO ? 'FILE' : 'PROJECT',
+                    },
+                },
+                profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,
+            })
+            .then()
+            .catch((error) => {
+                let requestId: string | undefined
+                if (isAwsError(error)) {
+                    requestId = error.requestId
+                }
+
+                getLogger().debug(
+                    `Failed to sendTelemetryEvent for code scan success, requestId: ${requestId ?? ''}, message: ${
+                        error.message
+                    }`
+                )
+            })
+    }
+
+    public sendCodeScanFailedEvent(language: string, jobId: string, scope: CodeAnalysisScopeClientSide) {
+        client
+            .sendTelemetryEvent({
+                telemetryEvent: {
+                    codeScanFailedEvent: {
+                        programmingLanguage: {
+                            languageName: runtimeLanguageContext.toRuntimeLanguage(language as CodewhispererLanguage),
+                        },
+                        codeScanJobId: jobId,
+                        codeAnalysisScope: scope === CodeAnalysisScopeClientSide.FILE_AUTO ? 'FILE' : 'PROJECT',
+                        timestamp: new Date(Date.now()),
+                    },
+                },
+                profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,
+            })
+            .then()
+            .catch((error) => {
+                let requestId: string | undefined
+                if (isAwsError(error)) {
+                    requestId = error.requestId
+                }
+                getLogger().debug(
+                    `Failed to sendTelemetryEvent for code scan failure, requestId: ${requestId ?? ''}, message: ${
+                        error.message
+                    }`
+                )
+            })
+    }
+
+    public sendCodeFixGenerationEvent(
+        jobId: string,
+        language?: string,
+        ruleId?: string,
+        detectorId?: string,
+        linesOfCodeGenerated?: number,
+        charsOfCodeGenerated?: number
+    ) {
+        client
+            .sendTelemetryEvent({
+                telemetryEvent: {
+                    codeFixGenerationEvent: {
+                        programmingLanguage: {
+                            languageName: runtimeLanguageContext.toRuntimeLanguage(language as CodewhispererLanguage),
+                        },
+                        jobId,
+                        ruleId,
+                        detectorId,
+                        linesOfCodeGenerated,
+                        charsOfCodeGenerated,
+                    },
+                },
+                profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,
+            })
+            .then()
+            .catch((error) => {
+                let requestId: string | undefined
+                if (isAwsError(error)) {
+                    requestId = error.requestId
+                }
+                getLogger().debug(
+                    `Failed to sendTelemetryEvent for code fix generation, requestId: ${requestId ?? ''}, message: ${
+                        error.message
+                    }`
+                )
+            })
+    }
+
+    public sendCodeFixAcceptanceEvent(
+        jobId: string,
+        language?: string,
+        ruleId?: string,
+        detectorId?: string,
+        linesOfCodeAccepted?: number,
+        charsOfCodeAccepted?: number
+    ) {
+        client
+            .sendTelemetryEvent({
+                telemetryEvent: {
+                    codeFixAcceptanceEvent: {
+                        programmingLanguage: {
+                            languageName: runtimeLanguageContext.toRuntimeLanguage(language as CodewhispererLanguage),
+                        },
+                        jobId,
+                        ruleId,
+                        detectorId,
+                        linesOfCodeAccepted,
+                        charsOfCodeAccepted,
+                    },
+                },
+                profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,
+            })
+            .then()
+            .catch((error) => {
+                let requestId: string | undefined
+                if (isAwsError(error)) {
+                    requestId = error.requestId
+                }
+                getLogger().debug(
+                    `Failed to sendTelemetryEvent for code fix acceptance, requestId: ${requestId ?? ''}, message: ${
+                        error.message
+                    }`
+                )
+            })
+    }
+
+    public sendTestGenerationEvent(
+        groupName: string,
+        jobId: string,
+        language?: string,
+        numberOfUnitTestCasesGenerated?: number,
+        numberOfUnitTestCasesAccepted?: number,
+        linesOfCodeGenerated?: number,
+        linesOfCodeAccepted?: number,
+        charsOfCodeGenerated?: number,
+        charsOfCodeAccepted?: number
+    ) {
+        client
+            .sendTelemetryEvent({
+                telemetryEvent: {
+                    testGenerationEvent: {
+                        programmingLanguage: {
+                            languageName: runtimeLanguageContext.toRuntimeLanguage(language as CodewhispererLanguage),
+                        },
+                        jobId,
+                        groupName,
+                        ideCategory: 'VSCODE',
+                        numberOfUnitTestCasesGenerated,
+                        numberOfUnitTestCasesAccepted,
+                        linesOfCodeGenerated,
+                        linesOfCodeAccepted,
+                        charsOfCodeGenerated,
+                        charsOfCodeAccepted,
+                        timestamp: new Date(Date.now()),
+                    },
+                },
+                profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,
+            })
+            .then()
+            .catch((error) => {
+                let requestId: string | undefined
+                if (isAwsError(error)) {
+                    requestId = error.requestId
+                }
+                getLogger().debug(
+                    `Failed to sendTelemetryEvent for test generation, requestId: ${requestId ?? ''}, message: ${
+                        error.message
+                    }`
+                )
+            })
+    }
+
+    public sendCodeScanRemediationsEvent(
+        languageId?: string,
+        codeScanRemediationEventType?: CodeScanRemediationsEventType,
+        detectorId?: string,
+        findingId?: string,
+        ruleId?: string,
+        component?: string,
+        reason?: string,
+        result?: string,
+        includesFix?: boolean
+    ) {
+        client
+            .sendTelemetryEvent({
+                telemetryEvent: {
+                    codeScanRemediationsEvent: {
+                        programmingLanguage: languageId
+                            ? {
+                                  languageName: runtimeLanguageContext.toRuntimeLanguage(
+                                      languageId as CodewhispererLanguage
+                                  ),
+                              }
+                            : undefined,
+                        CodeScanRemediationsEventType: codeScanRemediationEventType,
+                        detectorId: detectorId,
+                        findingId: findingId,
+                        ruleId: ruleId,
+                        component: component,
+                        reason: reason,
+                        result: result,
+                        includesFix: includesFix,
+                        timestamp: new Date(Date.now()),
+                    },
+                },
+                profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,
+            })
+            .then()
+            .catch((error) => {
+                let requestId: string | undefined
+                if (isAwsError(error)) {
+                    requestId = error.requestId
+                }
+                getLogger().debug(
+                    `Failed to sendCodeScanRemediationsEvent to CodeWhisperer, requestId: ${
+                        requestId ?? ''
+                    }, message: ${error.message}`
+                )
+            })
+    }
+}
diff --git a/packages/core/src/codewhisperer/util/userGroupUtil.ts b/packages/core/src/codewhisperer/util/userGroupUtil.ts
new file mode 100644
index 00000000000..e704e084ef8
--- /dev/null
+++ b/packages/core/src/codewhisperer/util/userGroupUtil.ts
@@ -0,0 +1,73 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { UserGroup } from '../models/constants'
+import globals from '../../shared/extensionGlobals'
+import { extensionVersion } from '../../shared/vscode/env'
+
+export class CodeWhispererUserGroupSettings {
+    private _userGroup: UserGroup | undefined
+    private _version: string | undefined
+
+    public get userGroup(): UserGroup {
+        if (!this._userGroup) {
+            return this.determineUserGroupIfNeeded()
+        } else {
+            return this._userGroup
+        }
+    }
+
+    // Visible for testing, DO NOT use on production
+    public set userGroup(userGroup: UserGroup) {
+        this._userGroup = userGroup
+    }
+
+    public get version(): string | undefined {
+        return this._version
+    }
+
+    // for testing purpose
+    public reset() {
+        this._userGroup = undefined
+        this._version = undefined
+    }
+
+    private determineUserGroupIfNeeded(): UserGroup {
+        const userGroupMetadata = globals.globalState.get<{ group: UserGroup; version: string }>(
+            'CODEWHISPERER_USER_GROUP'
+        )
+        // use the same userGroup setting if and only if they are the same version of plugin
+        if (userGroupMetadata && userGroupMetadata.version && userGroupMetadata.version === extensionVersion) {
+            this._userGroup = userGroupMetadata.group
+            this._version = userGroupMetadata.version
+            return userGroupMetadata.group
+        }
+
+        // otherwise, reassign group and reset the version
+        this._version = extensionVersion
+        this._userGroup = this.guessUserGroup()
+
+        globals.globalState.tryUpdate('CODEWHISPERER_USER_GROUP', {
+            group: this._userGroup,
+            version: this._version,
+        })
+
+        return this._userGroup
+    }
+
+    private guessUserGroup(): UserGroup {
+        return UserGroup.Control
+    }
+
+    static #instance: CodeWhispererUserGroupSettings | undefined
+
+    public static get instance() {
+        return (this.#instance ??= new CodeWhispererUserGroupSettings())
+    }
+
+    public static getUserGroup() {
+        return CodeWhispererUserGroupSettings.instance.userGroup
+    }
+}
diff --git a/packages/core/src/codewhisperer/util/zipUtil.ts b/packages/core/src/codewhisperer/util/zipUtil.ts
new file mode 100644
index 00000000000..719116efdc7
--- /dev/null
+++ b/packages/core/src/codewhisperer/util/zipUtil.ts
@@ -0,0 +1,580 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import path from 'path'
+import { tempDirPath } from '../../shared/filesystemUtilities'
+import { getLogger } from '../../shared/logger/logger'
+import * as CodeWhispererConstants from '../models/constants'
+import { ToolkitError } from '../../shared/errors'
+import { fs } from '../../shared/fs/fs'
+import { getLoggerForScope } from '../service/securityScanHandler'
+import { runtimeLanguageContext } from './runtimeLanguageContext'
+import { CodewhispererLanguage } from '../../shared/telemetry/telemetry.gen'
+import { CurrentWsFolders, collectFiles, defaultExcludePatterns } from '../../shared/utilities/workspaceUtils'
+import {
+    FileSizeExceededError,
+    NoActiveFileError,
+    NoSourceFilesError,
+    ProjectSizeExceededError,
+} from '../models/errors'
+import { FeatureUseCase } from '../models/constants'
+import { ChildProcess, ChildProcessOptions } from '../../shared/utilities/processUtils'
+import { removeAnsi } from '../../shared/utilities/textUtilities'
+import { normalize } from '../../shared/utilities/pathUtils'
+import { ZipStream } from '../../shared/utilities/zipStream'
+
+export interface ZipMetadata {
+    rootDir: string
+    zipFilePath: string
+    scannedFiles: Set<string>
+    srcPayloadSizeInBytes: number
+    buildPayloadSizeInBytes: number
+    zipFileSizeInBytes: number
+    lines: number
+    language: CodewhispererLanguage | undefined
+}
+
+export const ZipConstants = {
+    newlineRegex: /\r?\n/,
+    gitignoreFilename: '.gitignore',
+    knownBinaryFileExts: ['.class'],
+    codeDiffFilePath: 'codeDiff/code.diff',
+}
+
+interface GitDiffOptions {
+    projectPath: string
+    projectName: string
+    filePath?: string
+    scope?: CodeWhispererConstants.CodeAnalysisScope
+}
+
+export class ZipUtil {
+    protected _pickedSourceFiles: Set<string> = new Set<string>()
+    protected _pickedBuildFiles: Set<string> = new Set<string>()
+    protected _totalSize: number = 0
+    protected _totalBuildSize: number = 0
+    protected _tmpDir: string = tempDirPath
+    protected _zipDir: string = ''
+    protected _totalLines: number = 0
+    protected _fetchedDirs: Set<string> = new Set<string>()
+    protected _language: CodewhispererLanguage | undefined
+    protected _timestamp: string = Date.now().toString()
+    constructor() {}
+
+    getFileScanPayloadSizeLimitInBytes(): number {
+        return CodeWhispererConstants.fileScanPayloadSizeLimitBytes
+    }
+
+    getProjectScanPayloadSizeLimitInBytes(): number {
+        return CodeWhispererConstants.projectScanPayloadSizeLimitBytes
+    }
+
+    public getProjectPaths() {
+        const workspaceFolders = vscode.workspace.workspaceFolders
+        return workspaceFolders?.map((folder) => folder.uri.fsPath) ?? []
+    }
+
+    public getProjectPath(filePath: string) {
+        const fileUri = vscode.Uri.file(filePath)
+        const workspaceFolder = vscode.workspace.getWorkspaceFolder(fileUri)
+        return workspaceFolder?.uri.fsPath
+    }
+
+    protected async getTextContent(uri: vscode.Uri) {
+        const document = await vscode.workspace.openTextDocument(uri)
+        const content = document.getText()
+        return content
+    }
+
+    public reachSizeLimit(size: number, scope: CodeWhispererConstants.CodeAnalysisScope): boolean {
+        if (
+            scope === CodeWhispererConstants.CodeAnalysisScope.FILE_AUTO ||
+            scope === CodeWhispererConstants.CodeAnalysisScope.FILE_ON_DEMAND
+        ) {
+            return size > this.getFileScanPayloadSizeLimitInBytes()
+        } else {
+            return size > this.getProjectScanPayloadSizeLimitInBytes()
+        }
+    }
+
+    public willReachSizeLimit(current: number, adding: number): boolean {
+        const willReachLimit = current + adding > this.getProjectScanPayloadSizeLimitInBytes()
+        return willReachLimit
+    }
+
+    protected async zipFile(uri: vscode.Uri | undefined, scope: CodeWhispererConstants.CodeAnalysisScope) {
+        if (!uri) {
+            throw new NoActiveFileError()
+        }
+        const zip = new ZipStream()
+
+        const content = await this.getTextContent(uri)
+
+        const workspaceFolder = vscode.workspace.getWorkspaceFolder(uri)
+        if (workspaceFolder) {
+            // Note: workspaceFolder.name is not the same as the file system folder name,
+            // use the fsPath value instead
+            const projectName = path.basename(workspaceFolder.uri.fsPath)
+            // Set includeWorkspaceFolder to false because we are already manually prepending the projectName
+            const relativePath = vscode.workspace.asRelativePath(uri, false)
+            const zipEntryPath = this.getZipEntryPath(projectName, relativePath)
+            zip.writeString(content, zipEntryPath)
+
+            if (scope === CodeWhispererConstants.CodeAnalysisScope.FILE_ON_DEMAND) {
+                const gitDiffContent = `+++ b/${normalize(zipEntryPath)}` // Sending file path in payload for LLM code review
+                zip.writeString(gitDiffContent, ZipConstants.codeDiffFilePath)
+            }
+        } else {
+            zip.writeString(content, uri.fsPath)
+        }
+
+        this._pickedSourceFiles.add(uri.fsPath)
+        this._totalSize += (await fs.stat(uri.fsPath)).size
+        this._totalLines += content.split(ZipConstants.newlineRegex).length
+
+        if (this.reachSizeLimit(this._totalSize, scope)) {
+            throw new FileSizeExceededError()
+        }
+        const zipFilePath = this.getZipDirPath(FeatureUseCase.CODE_SCAN) + CodeWhispererConstants.codeScanZipExt
+        await zip.finalizeToFile(zipFilePath)
+        return zipFilePath
+    }
+
+    protected getZipEntryPath(projectName: string, relativePath: string) {
+        return path.join(projectName, relativePath)
+    }
+
+    /**
+     * Processes a directory and adds its contents to a zip archive while preserving the directory structure.
+     *
+     * @param zip - The AdmZip instance to add files and directories to
+     * @param metadataDir - The absolute path to the directory to process
+     *
+     * @remarks
+     * This function:
+     * - Creates empty directory entries in the zip for each directory
+     * - Recursively processes all subdirectories
+     * - Adds all files to the zip while maintaining relative paths
+     * - Handles errors for individual file operations without stopping the overall process
+     *
+     * The files in the zip will be stored under a root directory named after the input directory's basename.
+     *
+     * @throws May throw errors from filesystem operations or zip creation
+     *
+     * @example
+     * ```typescript
+     * const zip = new AdmZip();
+     * await processMetadataDir(zip, '/path/to/directory');
+     * ```
+     */
+    protected async processMetadataDir(zip: ZipStream, metadataDir: string) {
+        const metadataDirName = path.basename(metadataDir)
+        // Helper function to add empty directory to zip
+        const addEmptyDirectory = (dirPath: string) => {
+            const relativePath = path.relative(metadataDir, dirPath)
+            const pathWithMetadata = path.join(metadataDirName, relativePath, '/')
+            zip.writeString('', pathWithMetadata)
+        }
+
+        // Recursive function to process directories
+        const processDirectory = async (dirPath: string) => {
+            const entries = await vscode.workspace.fs.readDirectory(vscode.Uri.file(dirPath))
+            addEmptyDirectory(dirPath)
+
+            for (const [fileName, fileType] of entries) {
+                const filePath = path.join(dirPath, fileName)
+
+                if (fileType === vscode.FileType.File) {
+                    try {
+                        const fileUri = vscode.Uri.file(filePath)
+                        const relativePath = path.relative(metadataDir, filePath)
+                        const pathWithMetadata = path.join(metadataDirName, relativePath)
+                        zip.writeFile(fileUri.fsPath, pathWithMetadata)
+                    } catch (error) {
+                        getLogger().error(`Failed to add file ${filePath} to zip: ${error}`)
+                    }
+                } else if (fileType === vscode.FileType.Directory) {
+                    // Recursively process subdirectory
+                    await processDirectory(filePath)
+                }
+            }
+        }
+        await processDirectory(metadataDir)
+    }
+
+    protected async zipProject(useCase: FeatureUseCase, projectPath?: string, metadataDir?: string) {
+        const zip = new ZipStream()
+        let projectPaths = []
+        if (useCase === FeatureUseCase.TEST_GENERATION && projectPath) {
+            projectPaths.push(projectPath)
+        } else {
+            projectPaths = this.getProjectPaths()
+        }
+        if (useCase === FeatureUseCase.CODE_SCAN) {
+            await this.processCombinedGitDiff(zip, projectPaths, '', CodeWhispererConstants.CodeAnalysisScope.PROJECT)
+        }
+        const languageCount = new Map<CodewhispererLanguage, number>()
+
+        await this.processSourceFiles(zip, languageCount, projectPaths, useCase)
+        if (metadataDir) {
+            await this.processMetadataDir(zip, metadataDir)
+        }
+        if (useCase !== FeatureUseCase.TEST_GENERATION) {
+            this.processOtherFiles(zip, languageCount)
+        }
+
+        if (languageCount.size === 0) {
+            throw new NoSourceFilesError()
+        }
+        this._language = [...languageCount.entries()].reduce((a, b) => (b[1] > a[1] ? b : a))[0]
+        const zipFilePath = this.getZipDirPath(useCase) + CodeWhispererConstants.codeScanZipExt
+        await zip.finalizeToFile(zipFilePath)
+        return zipFilePath
+    }
+
+    protected async processCombinedGitDiff(
+        zip: ZipStream,
+        projectPaths: string[],
+        filePath?: string,
+        scope?: CodeWhispererConstants.CodeAnalysisScope
+    ) {
+        let gitDiffContent = ''
+        for (const projectPath of projectPaths) {
+            const projectName = path.basename(projectPath)
+            // Get diff content
+            gitDiffContent += await this.executeGitDiff({
+                projectPath,
+                projectName,
+                filePath,
+                scope,
+            })
+        }
+        if (gitDiffContent) {
+            zip.writeString(gitDiffContent, ZipConstants.codeDiffFilePath)
+        }
+    }
+
+    private async getGitUntrackedFiles(projectPath: string): Promise<string | undefined> {
+        const checkNewFileArgs = ['ls-files', '--others', '--exclude-standard']
+        const checkProcess = new ChildProcess('git', checkNewFileArgs)
+
+        try {
+            let output = ''
+            await checkProcess.run({
+                rejectOnError: true,
+                rejectOnErrorCode: true,
+                onStdout: (text) => {
+                    output += text
+                },
+                spawnOptions: {
+                    cwd: projectPath,
+                },
+            })
+            return output
+        } catch (err) {
+            getLogger().warn(`Failed to check if file is new: ${err}`)
+            return undefined
+        }
+    }
+
+    private async generateNewFileDiff(projectPath: string, projectName: string, relativePath: string): Promise<string> {
+        let diffContent = ''
+
+        const gitArgs = [
+            'diff',
+            '--no-index',
+            `--src-prefix=a/${projectName}/`,
+            `--dst-prefix=b/${projectName}/`,
+            '/dev/null', // Use /dev/null as the old file
+            relativePath,
+        ]
+
+        const childProcess = new ChildProcess('git', gitArgs)
+        const runOptions: ChildProcessOptions = {
+            rejectOnError: false,
+            rejectOnErrorCode: false,
+            onStdout: (text) => {
+                diffContent += text
+                getLogger().verbose(removeAnsi(text))
+            },
+            onStderr: (text) => {
+                getLogger().error(removeAnsi(text))
+            },
+            spawnOptions: {
+                cwd: projectPath,
+            },
+        }
+
+        try {
+            await childProcess.run(runOptions)
+            return diffContent
+        } catch (err) {
+            getLogger().warn(`Failed to run diff command: ${err}`)
+            return ''
+        }
+    }
+
+    private async generateHeadDiff(projectPath: string, projectName: string, relativePath?: string): Promise<string> {
+        let diffContent = ''
+
+        const gitArgs = [
+            'diff',
+            'HEAD',
+            `--src-prefix=a/${projectName}/`,
+            `--dst-prefix=b/${projectName}/`,
+            ...(relativePath ? [relativePath] : []),
+        ]
+
+        const childProcess = new ChildProcess('git', gitArgs)
+
+        const runOptions: ChildProcessOptions = {
+            rejectOnError: true,
+            rejectOnErrorCode: true,
+            onStdout: (text) => {
+                diffContent += text
+                getLogger().verbose(removeAnsi(text))
+            },
+            onStderr: (text) => {
+                getLogger().error(removeAnsi(text))
+            },
+            spawnOptions: {
+                cwd: projectPath,
+            },
+        }
+
+        try {
+            await childProcess.run(runOptions)
+            return diffContent
+        } catch (err) {
+            getLogger().warn(`Failed to run command \`${childProcess.toString()}\`: ${err}`)
+            return ''
+        }
+    }
+
+    private async executeGitDiff(options: GitDiffOptions): Promise<string> {
+        const { projectPath, projectName, filePath, scope } = options
+        const isProjectScope = scope === CodeWhispererConstants.CodeAnalysisScope.PROJECT
+
+        const untrackedFilesString = await this.getGitUntrackedFiles(projectPath)
+        const untrackedFilesArray = untrackedFilesString?.trim()?.split('\n')?.filter(Boolean)
+
+        if (isProjectScope && untrackedFilesArray && !untrackedFilesArray.length) {
+            return await this.generateHeadDiff(projectPath, projectName)
+        }
+
+        let diffContent = ''
+
+        if (isProjectScope) {
+            diffContent = await this.generateHeadDiff(projectPath, projectName)
+
+            if (untrackedFilesArray) {
+                const untrackedDiffs = await Promise.all(
+                    untrackedFilesArray.map((file) => this.generateNewFileDiff(projectPath, projectName, file))
+                )
+                diffContent += untrackedDiffs.join('')
+            }
+        } else if (!isProjectScope && filePath) {
+            const relativeFilePath = path.relative(projectPath, filePath)
+
+            const newFileDiff = await this.generateNewFileDiff(projectPath, projectName, relativeFilePath)
+            diffContent = this.rewriteDiff(newFileDiff)
+        }
+        return diffContent
+    }
+
+    private rewriteDiff(inputStr: string): string {
+        const lines = inputStr.split('\n')
+        const rewrittenLines = lines.slice(0, 5).map((line) => {
+            line = line.replace(/\\\\/g, '/')
+            line = line.replace(/("a\/[^"]*)/g, (match, p1) => p1)
+            line = line.replace(/("b\/[^"]*)/g, (match, p1) => p1)
+            line = line.replace(/"/g, '')
+
+            return line
+        })
+        const outputLines = [...rewrittenLines, ...lines.slice(5)]
+        const outputStr = outputLines.join('\n')
+
+        return outputStr
+    }
+
+    protected async processSourceFiles(
+        zip: ZipStream,
+        languageCount: Map<CodewhispererLanguage, number>,
+        projectPaths: string[] | undefined,
+        useCase: FeatureUseCase
+    ) {
+        if (!projectPaths || projectPaths.length === 0) {
+            return
+        }
+
+        const sourceFiles = await collectFiles(
+            projectPaths,
+            (useCase === FeatureUseCase.TEST_GENERATION
+                ? [...(vscode.workspace.workspaceFolders ?? [])].sort(
+                      (a, b) => b.uri.fsPath.length - a.uri.fsPath.length
+                  )
+                : vscode.workspace.workspaceFolders) as CurrentWsFolders,
+            {
+                maxTotalSizeBytes: this.getProjectScanPayloadSizeLimitInBytes(),
+                excludePatterns:
+                    useCase === FeatureUseCase.TEST_GENERATION
+                        ? [...CodeWhispererConstants.testGenExcludePatterns, ...defaultExcludePatterns]
+                        : defaultExcludePatterns,
+            }
+        )
+        for (const file of sourceFiles) {
+            const projectName = path.basename(file.workspaceFolder.uri.fsPath)
+            const zipEntryPath = this.getZipEntryPath(projectName, file.relativeFilePath)
+
+            if (ZipConstants.knownBinaryFileExts.includes(path.extname(file.fileUri.fsPath))) {
+                if (useCase === FeatureUseCase.TEST_GENERATION) {
+                    continue
+                }
+                await this.processBinaryFile(zip, file.fileUri, zipEntryPath)
+            } else {
+                const isFileOpenAndDirty = this.isFileOpenAndDirty(file.fileUri)
+                const fileContent = isFileOpenAndDirty ? await this.getTextContent(file.fileUri) : file.fileContent
+                this.processTextFile(zip, file.fileUri, fileContent, languageCount, zipEntryPath)
+            }
+        }
+    }
+
+    protected processOtherFiles(zip: ZipStream, languageCount: Map<CodewhispererLanguage, number>) {
+        for (const document of vscode.workspace.textDocuments
+            .filter((document) => document.uri.scheme === 'file')
+            .filter((document) => vscode.workspace.getWorkspaceFolder(document.uri) === undefined)) {
+            this.processTextFile(zip, document.uri, document.getText(), languageCount, document.uri.fsPath)
+        }
+    }
+
+    protected async processTestCoverageFiles(targetPath: string) {
+        // TODO: will be removed post release
+        const coverageFilePatterns = ['**/coverage.xml', '**/coverage.json', '**/coverage.txt']
+        let files: vscode.Uri[] = []
+
+        for (const pattern of coverageFilePatterns) {
+            files = await vscode.workspace.findFiles(pattern)
+            if (files.length > 0) {
+                break
+            }
+        }
+
+        await Promise.all(
+            files.map(async (file) => {
+                const fileName = path.basename(file.path)
+                const targetFilePath = path.join(targetPath, fileName)
+                await fs.copy(file.path, targetFilePath)
+            })
+        )
+    }
+
+    protected processTextFile(
+        zip: ZipStream,
+        uri: vscode.Uri,
+        fileContent: string,
+        languageCount: Map<CodewhispererLanguage, number>,
+        zipEntryPath: string
+    ) {
+        const fileSize = Buffer.from(fileContent).length
+
+        if (
+            this.reachSizeLimit(this._totalSize, CodeWhispererConstants.CodeAnalysisScope.PROJECT) ||
+            this.willReachSizeLimit(this._totalSize, fileSize)
+        ) {
+            throw new ProjectSizeExceededError()
+        }
+        this._pickedSourceFiles.add(uri.fsPath)
+        this._totalSize += fileSize
+        this._totalLines += fileContent.split(ZipConstants.newlineRegex).length
+
+        this.incrementCountForLanguage(uri, languageCount)
+        zip.writeString(fileContent, zipEntryPath)
+    }
+
+    protected async processBinaryFile(zip: ZipStream, uri: vscode.Uri, zipEntryPath: string) {
+        const fileSize = (await fs.stat(uri.fsPath)).size
+
+        if (
+            this.reachSizeLimit(this._totalSize, CodeWhispererConstants.CodeAnalysisScope.PROJECT) ||
+            this.willReachSizeLimit(this._totalSize, fileSize)
+        ) {
+            throw new ProjectSizeExceededError()
+        }
+        this._pickedSourceFiles.add(uri.fsPath)
+        this._totalSize += fileSize
+
+        zip.writeFile(uri.fsPath, path.dirname(zipEntryPath))
+    }
+
+    protected incrementCountForLanguage(uri: vscode.Uri, languageCount: Map<CodewhispererLanguage, number>) {
+        const fileExtension = path.extname(uri.fsPath).slice(1)
+        const language = runtimeLanguageContext.getLanguageFromFileExtension(fileExtension)
+        if (language && language !== 'plaintext') {
+            languageCount.set(language, (languageCount.get(language) || 0) + 1)
+        }
+    }
+
+    protected isFileOpenAndDirty(uri: vscode.Uri) {
+        return vscode.workspace.textDocuments.some((document) => document.uri.fsPath === uri.fsPath && document.isDirty)
+    }
+
+    public getZipDirPath(useCase: FeatureUseCase): string {
+        if (this._zipDir === '') {
+            const prefix =
+                useCase === FeatureUseCase.TEST_GENERATION
+                    ? CodeWhispererConstants.TestGenerationTruncDirPrefix
+                    : CodeWhispererConstants.codeScanTruncDirPrefix
+
+            this._zipDir = path.join(this._tmpDir, `${prefix}_${this._timestamp}`)
+        }
+        return this._zipDir
+    }
+
+    public async generateZip(
+        uri: vscode.Uri | undefined,
+        scope: CodeWhispererConstants.CodeAnalysisScope
+    ): Promise<ZipMetadata> {
+        try {
+            const zipDirPath = this.getZipDirPath(FeatureUseCase.CODE_SCAN)
+            let zipFilePath: string
+            if (
+                scope === CodeWhispererConstants.CodeAnalysisScope.FILE_AUTO ||
+                scope === CodeWhispererConstants.CodeAnalysisScope.FILE_ON_DEMAND
+            ) {
+                zipFilePath = await this.zipFile(uri, scope)
+            } else if (scope === CodeWhispererConstants.CodeAnalysisScope.PROJECT) {
+                zipFilePath = await this.zipProject(FeatureUseCase.CODE_SCAN)
+            } else {
+                throw new ToolkitError(`Unknown code analysis scope: ${scope}`)
+            }
+
+            getLoggerForScope(scope).debug(`Picked source files: [${[...this._pickedSourceFiles].join(', ')}]`)
+            const zipFileSize = (await fs.stat(zipFilePath)).size
+            return {
+                rootDir: zipDirPath,
+                zipFilePath: zipFilePath,
+                srcPayloadSizeInBytes: this._totalSize,
+                scannedFiles: new Set([...this._pickedSourceFiles, ...this._pickedBuildFiles]),
+                zipFileSizeInBytes: zipFileSize,
+                buildPayloadSizeInBytes: this._totalBuildSize,
+                lines: this._totalLines,
+                language: this._language,
+            }
+        } catch (error) {
+            getLogger().error('Zip error caused by: %O', error)
+            throw error
+        }
+    }
+
+    // TODO: Refactor this
+    public async removeTmpFiles(zipMetadata: ZipMetadata, scope?: CodeWhispererConstants.CodeAnalysisScope) {
+        const logger = getLoggerForScope(scope)
+        logger.verbose(`Cleaning up temporary files...`)
+        await fs.delete(zipMetadata.zipFilePath, { force: true })
+        await fs.delete(zipMetadata.rootDir, { recursive: true, force: true })
+        logger.verbose(`Complete cleaning up temporary files.`)
+    }
+}
diff --git a/packages/core/src/codewhisperer/views/activeStateController.ts b/packages/core/src/codewhisperer/views/activeStateController.ts
new file mode 100644
index 00000000000..614003d02ff
--- /dev/null
+++ b/packages/core/src/codewhisperer/views/activeStateController.ts
@@ -0,0 +1,126 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { LineSelection, LinesChangeEvent } from '../tracker/lineTracker'
+import { isTextEditor } from '../../shared/utilities/editorUtilities'
+import { subscribeOnce } from '../../shared/utilities/vsCodeUtils'
+import { Container } from '../service/serviceContainer'
+import { cancellableDebounce } from '../../shared/utilities/functionUtils'
+
+export class ActiveStateController implements vscode.Disposable {
+    private readonly _disposable: vscode.Disposable
+    private _editor: vscode.TextEditor | undefined
+
+    private readonly cwLineHintDecoration: vscode.TextEditorDecorationType =
+        vscode.window.createTextEditorDecorationType({
+            after: {
+                margin: '0 0 0 3em',
+                contentText: 'Amazon Q is generating...',
+                textDecoration: 'none',
+                fontWeight: 'normal',
+                fontStyle: 'normal',
+                color: 'var(--vscode-editorCodeLens-foreground)',
+            },
+            rangeBehavior: vscode.DecorationRangeBehavior.OpenOpen,
+            isWholeLine: true,
+        })
+
+    constructor(private readonly container: Container) {
+        this._disposable = vscode.Disposable.from(
+            this.container.lineTracker.onDidChangeActiveLines(async (e) => {
+                await this.onActiveLinesChanged(e)
+            }),
+            subscribeOnce(this.container.lineTracker.onReady)(async (_) => {
+                await this.onReady()
+            }),
+            this.container.auth.auth.onDidChangeConnectionState(async (e) => {
+                if (e.state !== 'authenticating') {
+                    await this._refresh(vscode.window.activeTextEditor)
+                }
+            }),
+            this.container.auth.secondaryAuth.onDidChangeActiveConnection(async () => {
+                await this._refresh(vscode.window.activeTextEditor)
+            })
+        )
+    }
+
+    dispose() {
+        this._disposable.dispose()
+    }
+
+    private _isReady: boolean = false
+
+    private async onReady(): Promise<void> {
+        this._isReady = true
+        await this._refresh(vscode.window.activeTextEditor)
+    }
+
+    private async onActiveLinesChanged(e: LinesChangeEvent) {
+        if (!this._isReady) {
+            return
+        }
+
+        await this.refreshDebounced.promise(e.editor)
+    }
+
+    clear(editor: vscode.TextEditor | undefined) {
+        if (this._editor && this._editor !== editor) {
+            this._editor.setDecorations(this.cwLineHintDecoration, [])
+        }
+
+        editor?.setDecorations(this.cwLineHintDecoration, [])
+    }
+
+    readonly refreshDebounced = cancellableDebounce(async (editor: vscode.TextEditor | undefined) => {
+        await this._refresh(editor)
+    }, 1000)
+
+    private async _refresh(editor: vscode.TextEditor | undefined, shouldDisplay?: boolean) {
+        if (!editor && !this._editor) {
+            return
+        }
+
+        const selections = this.container.lineTracker.selections
+        if (!editor || !selections || !isTextEditor(editor)) {
+            this.clear(this._editor)
+            return
+        }
+
+        if (this._editor !== editor) {
+            // Clear any annotations on the previously active editor
+            this.clear(this._editor)
+            this._editor = editor
+        }
+
+        // Make sure the editor hasn't died since the await above and that we are still on the same line(s)
+        if (!editor.document || !this.container.lineTracker.includes(selections)) {
+            return
+        }
+
+        if (!this.container.auth.isConnectionValid()) {
+            this.clear(this._editor)
+            return
+        }
+
+        if (shouldDisplay !== undefined) {
+            await this.updateDecorations(editor, selections, shouldDisplay)
+        } else {
+            await this.updateDecorations(editor, selections, true)
+        }
+    }
+
+    async updateDecorations(editor: vscode.TextEditor, lines: LineSelection[], shouldDisplay: boolean) {
+        const range = editor.document.validateRange(
+            new vscode.Range(lines[0].active, lines[0].active, lines[0].active, lines[0].active)
+        )
+
+        if (shouldDisplay) {
+            editor.setDecorations(this.cwLineHintDecoration, [range])
+        } else {
+            editor.setDecorations(this.cwLineHintDecoration, [])
+        }
+    }
+}
diff --git a/src/codewhisperer/views/css/codewhispererReferenceLog.css b/packages/core/src/codewhisperer/views/css/codewhispererReferenceLog.css
similarity index 100%
rename from src/codewhisperer/views/css/codewhispererReferenceLog.css
rename to packages/core/src/codewhisperer/views/css/codewhispererReferenceLog.css
diff --git a/src/codewhisperer/views/css/securityPanel.css b/packages/core/src/codewhisperer/views/css/securityPanel.css
similarity index 100%
rename from src/codewhisperer/views/css/securityPanel.css
rename to packages/core/src/codewhisperer/views/css/securityPanel.css
diff --git a/packages/core/src/codewhisperer/views/lineAnnotationController.ts b/packages/core/src/codewhisperer/views/lineAnnotationController.ts
new file mode 100644
index 00000000000..c449f5ab1d9
--- /dev/null
+++ b/packages/core/src/codewhisperer/views/lineAnnotationController.ts
@@ -0,0 +1,486 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as os from 'os'
+import { LineSelection, LinesChangeEvent } from '../tracker/lineTracker'
+import { isTextEditor } from '../../shared/utilities/editorUtilities'
+import { cancellableDebounce } from '../../shared/utilities/functionUtils'
+import { subscribeOnce } from '../../shared/utilities/vsCodeUtils'
+import { AnnotationChangeSource, inlinehintKey } from '../models/constants'
+import globals from '../../shared/extensionGlobals'
+import { Container } from '../service/serviceContainer'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { getLogger } from '../../shared/logger/logger'
+import { runtimeLanguageContext } from '../util/runtimeLanguageContext'
+import { setContext } from '../../shared/vscode/setContext'
+
+const case3TimeWindow = 30000 // 30 seconds
+
+const maxSmallIntegerV8 = 2 ** 30 // Max number that can be stored in V8's smis (small integers)
+
+function fromId(id: string | undefined): AnnotationState | undefined {
+    switch (id) {
+        case AutotriggerState.id:
+            return new AutotriggerState()
+        case PressTabState.id:
+            return new AutotriggerState()
+        case ManualtriggerState.id:
+            return new ManualtriggerState()
+        case TryMoreExState.id:
+            return new TryMoreExState()
+        case EndState.id:
+            return new EndState()
+        case InlineChatState.id:
+            return new InlineChatState()
+        default:
+            return undefined
+    }
+}
+
+interface AnnotationState {
+    id: string
+    suppressWhileRunning: boolean
+    decorationRenderOptions?: vscode.ThemableDecorationAttachmentRenderOptions
+
+    text: () => string
+    updateState(changeSource: AnnotationChangeSource, force: boolean): AnnotationState | undefined
+    isNextState(state: AnnotationState | undefined): boolean
+}
+
+/**
+ * case 1: How Cwspr triggers
+ * Trigger Criteria:
+ *  User opens an editor file &&
+ *      CW is not providing a suggestion &&
+ *      User has not accepted any suggestion
+ *
+ * Exit criteria:
+ *  User accepts 1 suggestion
+ *
+ */
+export class AutotriggerState implements AnnotationState {
+    static id = 'codewhisperer_learnmore_case_1'
+    id = AutotriggerState.id
+
+    suppressWhileRunning = true
+    text = () => 'Amazon Q Tip 1/3: Start typing to get suggestions ([ESC] to exit)'
+    static acceptedCount = 0
+
+    updateState(changeSource: AnnotationChangeSource, force: boolean): AnnotationState | undefined {
+        return undefined
+    }
+
+    isNextState(state: AnnotationState | undefined): boolean {
+        return state instanceof ManualtriggerState
+    }
+}
+
+/**
+ * case 1-a: Tab to accept
+ * Trigger Criteria:
+ *  Case 1 &&
+ *      Inline suggestion is being shown
+ *
+ * Exit criteria:
+ *  User accepts 1 suggestion
+ */
+export class PressTabState implements AnnotationState {
+    static id = 'codewhisperer_learnmore_case_1a'
+    id = PressTabState.id
+
+    suppressWhileRunning = false
+
+    text = () => 'Amazon Q Tip 1/3: Press [TAB] to accept ([ESC] to exit)'
+
+    updateState(changeSource: AnnotationChangeSource, force: boolean): AnnotationState | undefined {
+        return new AutotriggerState().updateState(changeSource, force)
+    }
+
+    isNextState(state: AnnotationState | undefined): boolean {
+        return state instanceof ManualtriggerState
+    }
+}
+
+/**
+ * case 2: Manual trigger
+ * Trigger Criteria:
+ *  User exists case 1 &&
+ *      User navigates to a new line
+ *
+ * Exit criteria:
+ *  User inokes manual trigger shortcut
+ */
+export class ManualtriggerState implements AnnotationState {
+    static id = 'codewhisperer_learnmore_case_2'
+    id = ManualtriggerState.id
+
+    suppressWhileRunning = true
+
+    text = () => {
+        if (os.platform() === 'win32') {
+            return 'Amazon Q Tip 2/3: Invoke suggestions with [Alt] + [C] ([ESC] to exit)'
+        }
+
+        return 'Amazon Q Tip 2/3: Invoke suggestions with [Option] + [C] ([ESC] to exit)'
+    }
+    hasManualTrigger: boolean = false
+    hasValidResponse: boolean = false
+
+    updateState(changeSource: AnnotationChangeSource, force: boolean): AnnotationState | undefined {
+        if (this.hasManualTrigger && this.hasValidResponse) {
+            if (changeSource !== 'codewhisperer') {
+                return new TryMoreExState()
+            } else {
+                return undefined
+            }
+        } else {
+            return this
+        }
+    }
+
+    isNextState(state: AnnotationState | undefined): boolean {
+        return state instanceof TryMoreExState
+    }
+}
+
+/**
+ * case 3: Learn more
+ * Trigger Criteria:
+ *  User exists case 2 &&
+ *      User navigates to a new line
+ *
+ * Exit criteria:
+ *  User accepts or rejects the suggestion
+ */
+export class TryMoreExState implements AnnotationState {
+    static id = 'codewhisperer_learnmore_case_3'
+    id = TryMoreExState.id
+
+    suppressWhileRunning = true
+
+    text = () => 'Amazon Q Tip 3/3: For settings, open the Amazon Q menu from the status bar ([ESC] to exit)'
+    updateState(changeSource: AnnotationChangeSource, force: boolean): AnnotationState {
+        if (force) {
+            return new EndState()
+        }
+        return this
+    }
+
+    isNextState(state: AnnotationState | undefined): boolean {
+        return state instanceof EndState
+    }
+
+    static triggerCount: number = 0
+    static learnmoeCount: number = 0
+}
+
+export class EndState implements AnnotationState {
+    static id = 'codewhisperer_learnmore_end'
+    id = EndState.id
+
+    suppressWhileRunning = true
+    text = () => ''
+    updateState(changeSource: AnnotationChangeSource, force: boolean): AnnotationState {
+        return this
+    }
+    isNextState(state: AnnotationState): boolean {
+        return false
+    }
+}
+
+export class InlineChatState implements AnnotationState {
+    static id = 'amazonq_annotation_inline_chat'
+    id = InlineChatState.id
+    suppressWhileRunning = false
+
+    text = () => {
+        if (os.platform() === 'darwin') {
+            return 'Amazon Q: Edit \u2318I'
+        }
+        return 'Amazon Q: Edit (Ctrl+I)'
+    }
+    updateState(_changeSource: AnnotationChangeSource, _force: boolean): AnnotationState {
+        return this
+    }
+    isNextState(_state: AnnotationState | undefined): boolean {
+        return false
+    }
+}
+
+/**
+ * There are
+ * - existing users
+ * - new users
+ *   -- new users who has not seen tutorial
+ *   -- new users who has seen tutorial
+ *
+ * "existing users" should have the context key "CODEWHISPERER_AUTO_TRIGGER_ENABLED"
+ * "new users who has seen tutorial" should have the context key "inlineKey" and "CODEWHISPERER_AUTO_TRIGGER_ENABLED"
+ * the remaining grouop of users should belong to "new users who has not seen tutorial"
+ */
+export class LineAnnotationController implements vscode.Disposable {
+    private readonly _disposable: vscode.Disposable
+    private _editor: vscode.TextEditor | undefined
+
+    private _currentState: AnnotationState
+
+    private readonly cwLineHintDecoration: vscode.TextEditorDecorationType =
+        vscode.window.createTextEditorDecorationType({
+            after: {
+                margin: '0 0 0 3em',
+                // "borderRadius" and "padding" are not available on "after" type of decoration, this is a hack to inject these css prop to "after" content. Refer to https://github.com/microsoft/vscode/issues/68845
+                textDecoration: ';border-radius:0.25rem;padding:0rem 0.5rem;',
+                width: 'fit-content',
+            },
+            rangeBehavior: vscode.DecorationRangeBehavior.OpenOpen,
+        })
+
+    constructor(private readonly container: Container) {
+        const cachedState = fromId(globals.globalState.get<string>(inlinehintKey))
+        const cachedAutotriggerEnabled = globals.globalState.get<boolean>('CODEWHISPERER_AUTO_TRIGGER_ENABLED')
+
+        // new users (has or has not seen tutorial)
+        if (cachedAutotriggerEnabled === undefined || cachedState !== undefined) {
+            this._currentState = cachedState ?? new AutotriggerState()
+            getLogger().debug(
+                `codewhisperer: new user login, activating inline tutorial. (autotriggerEnabled=${cachedAutotriggerEnabled}; inlineState=${cachedState?.id})`
+            )
+        } else {
+            this._currentState = new EndState()
+            getLogger().debug(`codewhisperer: existing user login, disabling inline tutorial.`)
+        }
+
+        this._disposable = vscode.Disposable.from(
+            subscribeOnce(this.container.lineTracker.onReady)(async (_) => {
+                await this.onReady()
+            }),
+            this.container.lineTracker.onDidChangeActiveLines(async (e) => {
+                await this.onActiveLinesChanged(e)
+            }),
+            this.container.auth.auth.onDidChangeConnectionState(async (e) => {
+                if (e.state !== 'authenticating') {
+                    await this.refresh(vscode.window.activeTextEditor, 'editor')
+                }
+            }),
+            this.container.auth.secondaryAuth.onDidChangeActiveConnection(async () => {
+                await this.refresh(vscode.window.activeTextEditor, 'editor')
+            })
+        )
+    }
+
+    dispose() {
+        this._disposable.dispose()
+    }
+
+    private _isReady: boolean = false
+
+    private async onReady(): Promise<void> {
+        this._isReady = !(this._currentState instanceof EndState)
+        await this._refresh(vscode.window.activeTextEditor, 'editor')
+    }
+
+    isTutorialDone(): boolean {
+        return this._currentState.id === new EndState().id
+    }
+
+    isInlineChatHint(): boolean {
+        return this._currentState.id === new InlineChatState().id
+    }
+
+    async dismissTutorial() {
+        this._currentState = new EndState()
+        await setContext('aws.codewhisperer.tutorial.workInProgress', false)
+        await globals.globalState.update(inlinehintKey, this._currentState.id)
+    }
+
+    /**
+     * Trys to show the inline hint, if the tutorial is not finished it will not be shown
+     */
+    async tryShowInlineHint(): Promise<boolean> {
+        if (this.isTutorialDone()) {
+            this._isReady = true
+            this._currentState = new InlineChatState()
+            return true
+        }
+        return false
+    }
+
+    async tryHideInlineHint(): Promise<boolean> {
+        if (this._currentState instanceof InlineChatState) {
+            this._currentState = new EndState()
+            return true
+        }
+        return false
+    }
+
+    private async onActiveLinesChanged(e: LinesChangeEvent) {
+        if (!this._isReady) {
+            return
+        }
+
+        this.clear()
+
+        await this.refresh(e.editor, e.reason)
+    }
+
+    clear() {
+        this._editor?.setDecorations(this.cwLineHintDecoration, [])
+    }
+
+    async refresh(editor: vscode.TextEditor | undefined, source: AnnotationChangeSource, force?: boolean) {
+        if (force) {
+            this.refreshDebounced.cancel()
+            await this._refresh(editor, source, true)
+        } else {
+            await this.refreshDebounced.promise(editor, source)
+        }
+    }
+
+    private readonly refreshDebounced = cancellableDebounce(
+        async (editor: vscode.TextEditor | undefined, source: AnnotationChangeSource, force?: boolean) => {
+            await this._refresh(editor, source, force)
+        },
+        250
+    )
+
+    private async _refresh(editor: vscode.TextEditor | undefined, source: AnnotationChangeSource, force?: boolean) {
+        if (!this._isReady) {
+            this.clear()
+            return
+        }
+
+        if (this.isTutorialDone()) {
+            this.clear()
+            return
+        }
+
+        if (editor === undefined && this._editor === undefined) {
+            this.clear()
+            return
+        }
+
+        const selections = this.container.lineTracker.selections
+        if (editor === undefined || selections === undefined || !isTextEditor(editor)) {
+            this.clear()
+            return
+        }
+
+        if (this._editor !== editor) {
+            // Clear any annotations on the previously active editor
+            this.clear()
+            this._editor = editor
+        }
+
+        // Make sure the editor hasn't died since the await above and that we are still on the same line(s)
+        if (editor.document === undefined || !this.container.lineTracker.includes(selections)) {
+            this.clear()
+            return
+        }
+
+        if (!this.container.auth.isConnectionValid()) {
+            this.clear()
+            return
+        }
+
+        // Disable Tips when language is not supported by Amazon Q.
+        if (!runtimeLanguageContext.isLanguageSupported(editor.document)) {
+            return
+        }
+
+        await this.updateDecorations(editor, selections, source, force)
+    }
+
+    private async updateDecorations(
+        editor: vscode.TextEditor,
+        lines: LineSelection[],
+        source: AnnotationChangeSource,
+        force?: boolean
+    ) {
+        const range = editor.document.validateRange(
+            new vscode.Range(lines[0].active, maxSmallIntegerV8, lines[0].active, maxSmallIntegerV8)
+        )
+
+        const decorationOptions = this.getInlineDecoration(editor, lines, source, force) as
+            | vscode.DecorationOptions
+            | undefined
+
+        if (decorationOptions === undefined) {
+            this.clear()
+            await setContext('aws.codewhisperer.tutorial.workInProgress', false)
+            return
+        } else if (this.isTutorialDone()) {
+            // special case
+            // Endstate is meaningless and doesnt need to be rendered
+            this.clear()
+            await this.dismissTutorial()
+            return
+        } else if (decorationOptions.renderOptions?.after?.contentText === new TryMoreExState().text()) {
+            // special case
+            // case 3 exit criteria is to fade away in 30s
+            setTimeout(async () => {
+                await this.refresh(editor, source, true)
+            }, case3TimeWindow)
+        }
+
+        decorationOptions.range = range
+
+        await globals.globalState.update(inlinehintKey, this._currentState.id)
+        if (!this.isInlineChatHint()) {
+            await setContext('aws.codewhisperer.tutorial.workInProgress', true)
+        }
+        editor.setDecorations(this.cwLineHintDecoration, [decorationOptions])
+    }
+
+    getInlineDecoration(
+        editor: vscode.TextEditor,
+        lines: LineSelection[],
+        source: AnnotationChangeSource,
+        force?: boolean
+    ): Partial<vscode.DecorationOptions> | undefined {
+        const isCWRunning = true
+
+        const textOptions: vscode.ThemableDecorationAttachmentRenderOptions = {
+            contentText: '',
+            fontWeight: 'normal',
+            fontStyle: 'normal',
+            textDecoration: 'none',
+            color: 'var(--vscode-editor-background)',
+            backgroundColor: 'var(--vscode-foreground)',
+        }
+
+        if (isCWRunning && this._currentState.suppressWhileRunning) {
+            return undefined
+        }
+
+        const updatedState: AnnotationState | undefined = this._currentState.updateState(source, force ?? false)
+
+        if (updatedState === undefined) {
+            return undefined
+        }
+
+        if (this._currentState.isNextState(updatedState)) {
+            // special case because PressTabState is part of case_1 (1a) which possibly jumps directly from case_1a to case_2 and miss case_1
+            if (this._currentState instanceof PressTabState) {
+                telemetry.ui_click.emit({ elementId: AutotriggerState.id, passive: true })
+            }
+            telemetry.ui_click.emit({ elementId: this._currentState.id, passive: true })
+        }
+
+        // update state
+        this._currentState = updatedState
+
+        // take snapshot of accepted session so that we can compre if there is delta -> users accept 1 suggestion after seeing this state
+        AutotriggerState.acceptedCount = 0
+        // take snapshot of total trigger count so that we can compare if there is delta -> users accept/reject suggestions after seeing this state
+        TryMoreExState.triggerCount = 0
+
+        textOptions.contentText = this._currentState.text()
+
+        return {
+            renderOptions: { after: textOptions },
+        }
+    }
+}
diff --git a/packages/core/src/codewhisperer/views/securityIssue/securityIssueWebview.ts b/packages/core/src/codewhisperer/views/securityIssue/securityIssueWebview.ts
new file mode 100644
index 00000000000..632283215ab
--- /dev/null
+++ b/packages/core/src/codewhisperer/views/securityIssue/securityIssueWebview.ts
@@ -0,0 +1,287 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { VueWebview } from '../../../webviews/main'
+import { CodeScanIssue } from '../../models/model'
+import {
+    CodeFixAction,
+    CodewhispererCodeScanIssueApplyFix,
+    Component,
+    telemetry,
+} from '../../../shared/telemetry/telemetry'
+import { copyToClipboard } from '../../../shared/utilities/messages'
+import { EditorContentController } from '../../../amazonq/commons/controllers/contentController'
+import { SecurityIssueProvider } from '../../service/securityIssueProvider'
+import { getPatchedCode, previewDiff } from '../../../shared/utilities/diffUtils'
+import { amazonqCodeIssueDetailsTabTitle } from '../../models/constants'
+import { AuthUtil } from '../../util/authUtil'
+import { Mutable } from '../../../shared/utilities/tsUtils'
+import { ExtContext } from '../../../shared/extensions'
+
+export class SecurityIssueWebview extends VueWebview {
+    public static readonly sourcePath: string = 'src/codewhisperer/views/securityIssue/vue/index.js'
+    public readonly id = 'aws.codeWhisperer.securityIssue'
+    public readonly onChangeIssue = new vscode.EventEmitter<CodeScanIssue | undefined>()
+    public readonly onChangeFilePath = new vscode.EventEmitter<string | undefined>()
+    public readonly onChangeGenerateFixLoading = new vscode.EventEmitter<boolean>()
+    public readonly onChangeGenerateFixError = new vscode.EventEmitter<string | null | undefined>()
+
+    private issue: CodeScanIssue | undefined
+    private filePath: string | undefined
+    private isGenerateFixLoading: boolean = false
+    private generateFixError: string | null | undefined = undefined
+
+    public constructor() {
+        super(SecurityIssueWebview.sourcePath)
+    }
+
+    public getIssue() {
+        return this.issue
+    }
+
+    public setIssue(issue: CodeScanIssue) {
+        this.issue = issue
+        this.onChangeIssue.fire(issue)
+    }
+
+    public setFilePath(filePath: string) {
+        this.filePath = filePath
+        this.onChangeFilePath.fire(filePath)
+    }
+
+    public applyFix() {
+        const args: [CodeScanIssue | undefined, string | undefined, Component] = [this.issue, this.filePath, 'webview']
+        void vscode.commands.executeCommand('aws.amazonq.applySecurityFix', ...args)
+    }
+
+    public explainWithQ() {
+        const args = [this.issue]
+        void this.navigateToFile()?.then(() => {
+            void vscode.commands.executeCommand('aws.amazonq.explainIssue', ...args)
+        })
+    }
+
+    public getRelativePath() {
+        if (this.filePath) {
+            return vscode.workspace.asRelativePath(this.filePath)
+        }
+        return ''
+    }
+
+    public navigateToFile(showRange = true) {
+        if (this.issue && this.filePath) {
+            const range = new vscode.Range(this.issue.startLine, 0, this.issue.endLine, 0)
+            return vscode.workspace.openTextDocument(this.filePath).then((doc) => {
+                void vscode.window.showTextDocument(doc, {
+                    selection: showRange ? range : undefined,
+                    viewColumn: vscode.ViewColumn.One,
+                    preview: true,
+                })
+            })
+        }
+    }
+
+    public closeWebview(findingId: string) {
+        if (this.issue?.findingId === findingId) {
+            this.dispose()
+        }
+    }
+
+    public getIsGenerateFixLoading() {
+        return this.isGenerateFixLoading
+    }
+
+    public setIsGenerateFixLoading(isGenerateFixLoading: boolean) {
+        this.isGenerateFixLoading = isGenerateFixLoading
+        this.onChangeGenerateFixLoading.fire(isGenerateFixLoading)
+    }
+
+    public getGenerateFixError() {
+        return this.generateFixError
+    }
+
+    public setGenerateFixError(generateFixError: string | null | undefined) {
+        this.generateFixError = generateFixError
+        this.onChangeGenerateFixError.fire(generateFixError)
+    }
+
+    public generateFix() {
+        const args = [this.issue]
+        void this.navigateToFile()?.then(() => {
+            void vscode.commands.executeCommand('aws.amazonq.generateFix', ...args)
+        })
+    }
+
+    public regenerateFix() {
+        void vscode.commands.executeCommand('aws.amazonq.security.regenerateFix', this.issue, this.filePath, 'webview')
+    }
+
+    public rejectFix() {
+        void vscode.commands.executeCommand('aws.amazonq.security.rejectFix', this.issue, this.filePath)
+    }
+
+    public ignoreIssue() {
+        void vscode.commands.executeCommand('aws.amazonq.security.ignore', this.issue, this.filePath, 'webview')
+    }
+
+    public ignoreAllIssues() {
+        void vscode.commands.executeCommand('aws.amazonq.security.ignoreAll', this.issue, 'webview')
+    }
+
+    createApplyFixTelemetryEntry(fixAction: CodeFixAction): Mutable<CodewhispererCodeScanIssueApplyFix> {
+        return {
+            detectorId: this.issue!.detectorId,
+            findingId: this.issue!.findingId,
+            ruleId: this.issue!.ruleId,
+            component: 'webview',
+            result: 'Succeeded',
+            credentialStartUrl: AuthUtil.instance.startUrl,
+            codeFixAction: fixAction,
+        }
+    }
+
+    public async copyFixedCode() {
+        telemetry.ui_click.emit({ elementId: 'codeReviewGeneratedFix_copyCodeFix' })
+        const fixedCode = await this.getFixedCode()
+        if (!fixedCode || fixedCode.length === 0) {
+            return
+        }
+        void copyToClipboard(fixedCode, 'suggested code fix')
+        const copyFixedCodeTelemetryEntry = this.createApplyFixTelemetryEntry('copyDiff')
+        telemetry.codewhisperer_codeScanIssueApplyFix.emit(copyFixedCodeTelemetryEntry)
+    }
+
+    public async insertAtCursor() {
+        telemetry.ui_click.emit({ elementId: 'codeReviewGeneratedFix_insertCodeFixAtCursor' })
+        const fixedCode = await this.getFixedCode()
+        if (!fixedCode || fixedCode.length === 0) {
+            return
+        }
+        const controller = new EditorContentController()
+        await this.navigateToFile(false)
+        controller.insertTextAtCursorPosition(fixedCode, () => {})
+        const copyFixedCodeTelemetryEntry = this.createApplyFixTelemetryEntry('insertAtCursor')
+        telemetry.codewhisperer_codeScanIssueApplyFix.emit(copyFixedCodeTelemetryEntry)
+    }
+
+    public async openDiff() {
+        telemetry.ui_click.emit({ elementId: 'codeReviewGeneratedFix_openCodeFixDiff' })
+        const [suggestedFix] = this.issue?.suggestedFixes ?? []
+        if (!this.filePath || !suggestedFix || !suggestedFix.code) {
+            return
+        }
+        await previewDiff(this.filePath, suggestedFix.code)
+        const copyFixedCodeTelemetryEntry = this.createApplyFixTelemetryEntry('openDiff')
+        telemetry.codewhisperer_codeScanIssueApplyFix.emit(copyFixedCodeTelemetryEntry)
+    }
+
+    public async getLanguageId() {
+        if (!this.filePath) {
+            return
+        }
+        const document = await vscode.workspace.openTextDocument(this.filePath)
+        return document.languageId
+    }
+
+    public async getFixedCode(snippetMode = true) {
+        const [suggestedFix] = this.issue?.suggestedFixes ?? []
+        if (!this.filePath || !suggestedFix || !suggestedFix.code || !this.issue) {
+            return ''
+        }
+        const patchedCode = await getPatchedCode(this.filePath, suggestedFix.code, snippetMode)
+        return patchedCode
+    }
+}
+
+const Panel = VueWebview.compilePanel(SecurityIssueWebview)
+let activePanel: InstanceType<typeof Panel> | undefined
+
+export async function showSecurityIssueWebview(ctx: vscode.ExtensionContext, issue: CodeScanIssue, filePath: string) {
+    activePanel ??= new Panel(ctx)
+    activePanel.server.setIssue(issue)
+    activePanel.server.setFilePath(filePath)
+    activePanel.server.setIsGenerateFixLoading(false)
+    activePanel.server.setGenerateFixError(undefined)
+
+    const webviewPanel = await activePanel.show({
+        title: amazonqCodeIssueDetailsTabTitle,
+        viewColumn: vscode.ViewColumn.Beside,
+        cssFiles: ['securityIssue.css'],
+    })
+    webviewPanel.iconPath = {
+        light: vscode.Uri.joinPath(ctx.extensionUri, 'resources/icons/aws/amazonq/q-squid-ink.svg'),
+        dark: vscode.Uri.joinPath(ctx.extensionUri, 'resources/icons/aws/amazonq/q-white.svg'),
+    }
+
+    webviewPanel.onDidDispose(() => (activePanel = undefined))
+}
+
+export function isSecurityIssueWebviewOpen() {
+    return activePanel !== undefined
+}
+
+export async function closeSecurityIssueWebview(findingId: string) {
+    activePanel?.server.closeWebview(findingId)
+}
+
+export async function syncSecurityIssueWebview(context: ExtContext) {
+    const activeIssueId = activePanel?.server.getIssue()?.findingId
+    if (!activeIssueId) {
+        return
+    }
+    const updatedIssue = SecurityIssueProvider.instance.issues
+        .flatMap(({ issues }) => issues)
+        .find((issue) => issue.findingId === activeIssueId)
+    await updateSecurityIssueWebview({
+        issue: updatedIssue,
+        context: context.extensionContext,
+        shouldRefreshView: false,
+    })
+}
+
+export async function getWebviewActiveIssueId() {
+    return activePanel?.server.getIssue()?.findingId
+}
+
+type WebviewParams = {
+    issue?: CodeScanIssue
+    filePath?: string
+    isGenerateFixLoading?: boolean
+    generateFixError?: string | null
+    shouldRefreshView: boolean
+    context: vscode.ExtensionContext
+}
+export async function updateSecurityIssueWebview({
+    issue,
+    filePath,
+    isGenerateFixLoading,
+    generateFixError,
+    shouldRefreshView,
+    context,
+}: WebviewParams): Promise<void> {
+    if (!activePanel) {
+        return
+    }
+    if (issue) {
+        activePanel.server.setIssue(issue)
+    }
+    if (filePath) {
+        activePanel.server.setFilePath(filePath)
+    }
+    if (isGenerateFixLoading !== undefined) {
+        activePanel.server.setIsGenerateFixLoading(isGenerateFixLoading)
+    }
+    if (generateFixError !== undefined) {
+        activePanel.server.setGenerateFixError(generateFixError)
+    }
+    if (shouldRefreshView && filePath && issue) {
+        await showSecurityIssueWebview(context, issue, filePath)
+    }
+}
+
+export function getIsGenerateFixLoading() {
+    return activePanel?.server.getIsGenerateFixLoading()
+}
diff --git a/packages/core/src/codewhisperer/views/securityIssue/vue/index.ts b/packages/core/src/codewhisperer/views/securityIssue/vue/index.ts
new file mode 100644
index 00000000000..47e135649ac
--- /dev/null
+++ b/packages/core/src/codewhisperer/views/securityIssue/vue/index.ts
@@ -0,0 +1,18 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * This module is run within the webview, and will mount the Vue app.
+ */
+
+import { createApp } from 'vue'
+import component from './root.vue'
+
+const create = () => createApp(component)
+const app = create()
+
+app.mount('#vue-app')
+window.addEventListener('remount', () => {
+    app.unmount()
+    create().mount('#vue-app')
+})
diff --git a/packages/core/src/codewhisperer/views/securityIssue/vue/root.vue b/packages/core/src/codewhisperer/views/securityIssue/vue/root.vue
new file mode 100644
index 00000000000..0bd4cce4d0c
--- /dev/null
+++ b/packages/core/src/codewhisperer/views/securityIssue/vue/root.vue
@@ -0,0 +1,378 @@
+/*! * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */
+
+<template>
+    <div class="mb-16">
+        <div class="container button-container" style="justify-content: space-between; top: 0">
+            <h1>{{ title }} <img class="severity" :src="severityImage" :alt="severity" /></h1>
+        </div>
+
+        <div class="mt-16">
+            <span v-html="recommendationTextHtml"></span>
+        </div>
+
+        <hr />
+
+        <div class="flex-container mt-16">
+            <div>
+                <b
+                    >Common Weakness <br />
+                    Enumeration (CWE)</b
+                >
+                <p>
+                    <template v-for="(cwe, index) in relatedVulnerabilities">
+                        <template v-if="index > 0"> , </template>
+                        <a :href="getCweUrl(cwe)">
+                            {{ cwe }} <span class="icon icon-sm icon-vscode-link-external"></span>
+                        </a>
+                    </template>
+                </p>
+                <p v-if="!relatedVulnerabilities || relatedVulnerabilities.length === 0">-</p>
+            </div>
+
+            <div>
+                <b>Detector library</b>
+                <p v-if="!detectorUrl || !detectorUrl.length">-</p>
+                <p v-else>
+                    <a :href="detectorUrl">
+                        {{ detectorName }} <span class="icon icon-sm icon-vscode-link-external"></span>
+                    </a>
+                </p>
+            </div>
+
+            <div>
+                <b>File path</b>
+                <p>
+                    <a href="#" @click="navigateToFile"> {{ relativePath }} [Ln {{ startLine + 1 }}] </a>
+                </p>
+            </div>
+        </div>
+
+        <div
+            v-if="isFixAvailable || isGenerateFixLoading || generateFixError || isFixDescriptionAvailable"
+            ref="codeFixSection"
+        >
+            <hr />
+
+            <h3>Suggested code fix preview</h3>
+            <pre v-if="isGenerateFixLoading" class="center"><div class="dot-typing"></div></pre>
+            <pre v-if="generateFixError" class="center error">{{ generateFixError }}</pre>
+            <div class="code-block">
+                <span v-if="isFixAvailable" v-html="suggestedFixHtml"></span>
+                <div v-if="isFixAvailable" class="code-diff-actions" ref="codeFixAction">
+                    <button class="code-diff-action-button" @click="copyFixedCode">
+                        <span class="icon icon-md icon-vscode-copy"></span> Copy
+                    </button>
+                    <button class="code-diff-action-button" @click="openDiff">
+                        <span class="icon icon-md icon-vscode-diff"></span> Open diff
+                    </button>
+                </div>
+            </div>
+
+            <div v-if="isFixDescriptionAvailable && !isGenerateFixLoading">
+                <h4 v-if="!suggestedFixDescription.includes('No code fix generated')">Why are we recommending this?</h4>
+                <span v-html="suggestedFixDescription"></span>
+            </div>
+        </div>
+    </div>
+
+    <div class="mt-16 mb-16 container button-container container-bottom">
+        <button
+            v-if="!isFixAvailable"
+            @click="generateFix"
+            class="mr-8 button-theme-primary"
+            :disabled="isGenerateFixLoading || isGenerateFixDisabled"
+        >
+            Generate Fix
+        </button>
+        <button v-if="isFixAvailable" @click="applyFix" class="mr-8 button-theme-primary">Accept Fix</button>
+        <button
+            v-if="isFixAvailable"
+            @click="regenerateFix"
+            class="mr-8 button-theme-secondary"
+            :disabled="isGenerateFixDisabled"
+        >
+            Regenerate Fix
+        </button>
+        <button @click="explainWithQ" class="mr-8 button-theme-secondary">Explain</button>
+        <button @click="ignoreIssue" class="mr-8 button-theme-secondary">Ignore</button>
+        <button @click="ignoreAllIssues" class="mr-8 button-theme-secondary">Ignore All</button>
+    </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue'
+import { SecurityIssueWebview } from '../securityIssueWebview'
+import { WebviewClientFactory } from '../../../../webviews/client'
+import infoSeverity from '../../../../../resources/images/severity-info.svg'
+import lowSeverity from '../../../../../resources/images/severity-low.svg'
+import mediumSeverity from '../../../../../resources/images/severity-medium.svg'
+import highSeverity from '../../../../../resources/images/severity-high.svg'
+import criticalSeverity from '../../../../../resources/images/severity-critical.svg'
+import markdownIt from 'markdown-it'
+import hljs from 'highlight.js'
+import { CodeScanIssue } from '../../../models/model'
+import { sasRuleId } from '../../../models/constants'
+
+const client = WebviewClientFactory.create<SecurityIssueWebview>()
+const severityImages: Record<string, string> = {
+    info: infoSeverity,
+    low: lowSeverity,
+    medium: mediumSeverity,
+    high: highSeverity,
+    critical: criticalSeverity,
+}
+
+const md = markdownIt({
+    highlight: function (str, lang, attrRaw): string {
+        const attrs = attrRaw.split(/\s+/g)
+        const showLineNumbers = attrs.includes('showLineNumbers')
+        const startFrom = parseInt(attrRaw.match(/startFrom=(\d+)/)?.[1] ?? '1')
+        const highlightStart = parseInt(attrRaw.match(/highlightStart=(\d+)/)?.[1] ?? '0')
+        const highlightEnd = parseInt(attrRaw.match(/highlightEnd=(\d+)/)?.[1] ?? '0')
+        if (lang) {
+            try {
+                const highlighted = hljs.highlight(str, {
+                    language: hljs.getLanguage(lang) ? lang : 'plaintext',
+                    ignoreIllegals: true,
+                }).value
+                let result = highlighted
+                    .trimEnd()
+                    .split('\n')
+                    .map((line) => {
+                        if (line.startsWith('+')) {
+                            return `<span class="hljs-addition">${line}</span>`
+                        } else if (line.startsWith('-')) {
+                            return `<span class="hljs-deletion">${line}</span>`
+                        }
+                        return line
+                    })
+                    .join('\n')
+                if (showLineNumbers) {
+                    result = applyLineNumbers(result, startFrom - 1)
+                }
+                if (highlightStart && highlightEnd) {
+                    result = applyHighlight(result, startFrom - 1, highlightStart, highlightEnd)
+                }
+                return result
+            } catch (__) {}
+        }
+
+        return ''
+    },
+})
+
+const applyLineNumbers = (code: string, lineNumberOffset = 0) => {
+    const lines = code.split('\n')
+    const rows = lines.map((line, idx) => {
+        const lineNumber = idx + 1 + lineNumberOffset
+        return `<div class="line-number">${lineNumber}</div>${line}`
+    })
+    return rows.join('\n')
+}
+
+const applyHighlight = (code: string, lineNumberOffset = 0, highlightStart: number, highlightEnd: number) => {
+    const lines = code.split('\n')
+    const rows = lines.map((line, idx) => {
+        const lineNumber = idx + 1 + lineNumberOffset
+        if (lineNumber >= highlightStart && lineNumber < highlightEnd) {
+            return `<div class="highlight reference-tracker">${line}</div>`
+        }
+        return line
+    })
+    return rows.join('\n')
+}
+
+export default defineComponent({
+    data() {
+        return {
+            title: '',
+            detectorId: '',
+            detectorName: '',
+            detectorUrl: '',
+            severity: '',
+            recommendationText: '',
+            suggestedFix: '',
+            suggestedFixDescription: '',
+            isFixAvailable: false,
+            isFixDescriptionAvailable: false,
+            relatedVulnerabilities: [] as string[],
+            startLine: 0,
+            endLine: 0,
+            relativePath: '',
+            isGenerateFixLoading: false,
+            generateFixError: undefined as string | null | undefined,
+            languageId: 'plaintext',
+            fixedCode: '',
+            referenceText: '',
+            referenceSpan: [0, 0],
+            isGenerateFixDisabled: false,
+        }
+    },
+    created() {
+        this.getData()
+        this.setupEventListeners()
+    },
+    beforeMount() {
+        this.getData()
+    },
+    methods: {
+        async getData() {
+            const issue = await client.getIssue()
+            if (issue) {
+                this.updateFromIssue(issue)
+            }
+            const relativePath = await client.getRelativePath()
+            this.updateRelativePath(relativePath)
+            const isGenerateFixLoading = await client.getIsGenerateFixLoading()
+            const generateFixError = await client.getGenerateFixError()
+            this.updateGenerateFixState(isGenerateFixLoading, generateFixError)
+            const languageId = await client.getLanguageId()
+            if (languageId) {
+                this.updateLanguageId(languageId)
+            }
+            const fixedCode = await client.getFixedCode()
+            this.updateFixedCode(fixedCode)
+        },
+        setupEventListeners() {
+            client.onChangeIssue(async (issue) => {
+                if (issue) {
+                    this.updateFromIssue(issue)
+                }
+                const fixedCode = await client.getFixedCode()
+                this.updateFixedCode(fixedCode)
+                this.scrollTo('codeFixActions')
+            })
+            client.onChangeFilePath(async (filePath) => {
+                const relativePath = await client.getRelativePath()
+                this.updateRelativePath(relativePath)
+
+                const languageId = await client.getLanguageId()
+                if (languageId) {
+                    this.updateLanguageId(languageId)
+                }
+            })
+            client.onChangeGenerateFixLoading((isGenerateFixLoading) => {
+                this.isGenerateFixLoading = isGenerateFixLoading
+                this.scrollTo('codeFixSection')
+            })
+            client.onChangeGenerateFixError((generateFixError) => {
+                this.generateFixError = generateFixError
+            })
+        },
+        updateRelativePath(relativePath: string) {
+            this.relativePath = relativePath
+        },
+        updateGenerateFixState(isGenerateFixLoading: boolean, generateFixError: string | null | undefined) {
+            this.isGenerateFixLoading = isGenerateFixLoading
+            this.generateFixError = generateFixError
+        },
+        updateLanguageId(languageId: string) {
+            this.languageId = languageId
+        },
+        updateFixedCode(fixedCode: string) {
+            this.fixedCode = fixedCode.replaceAll('\n\\ No newline at end of file', '')
+        },
+        updateFromIssue(issue: CodeScanIssue) {
+            const [suggestedFix] = issue.suggestedFixes
+
+            this.title = issue.title
+            this.detectorId = issue.detectorId
+            this.detectorName = issue.detectorName
+            this.detectorUrl = issue.recommendation.url
+            this.relatedVulnerabilities = issue.relatedVulnerabilities
+            this.severity = issue.severity
+            this.recommendationText = issue.recommendation.text
+            this.startLine = issue.startLine
+            this.endLine = issue.endLine
+            this.isFixAvailable = false
+            this.isFixDescriptionAvailable = false
+            this.isGenerateFixDisabled = issue.ruleId === sasRuleId
+            if (suggestedFix) {
+                this.isFixAvailable = !!suggestedFix.code && suggestedFix.code?.trim() !== ''
+                this.suggestedFix = suggestedFix.code ?? ''
+                if (
+                    suggestedFix.description?.trim() !== '' &&
+                    suggestedFix.description?.trim() !== 'Suggested remediation:'
+                ) {
+                    this.isFixDescriptionAvailable = true
+                }
+                this.suggestedFixDescription = md.render(suggestedFix.description)
+
+                const [reference] = suggestedFix.references ?? []
+                if (
+                    reference &&
+                    reference.recommendationContentSpan?.start &&
+                    reference.recommendationContentSpan.end
+                ) {
+                    this.referenceText = `Reference code under <i>${reference.licenseName}</i> license from repository <code>${reference.repository}</code>`
+                    this.referenceSpan = [
+                        reference.recommendationContentSpan.start,
+                        reference.recommendationContentSpan.end,
+                    ]
+                }
+            }
+        },
+        getCweUrl(cwe: string) {
+            const num = cwe.split('-').pop()
+            return `https://cwe.mitre.org/data/definitions/${num}.html`
+        },
+        applyFix() {
+            client.applyFix()
+        },
+        explainWithQ() {
+            client.explainWithQ()
+        },
+        navigateToFile() {
+            client.navigateToFile()
+        },
+        generateFix() {
+            client.generateFix()
+        },
+        regenerateFix() {
+            client.regenerateFix()
+        },
+        rejectFix() {
+            client.rejectFix()
+        },
+        ignoreIssue() {
+            client.ignoreIssue()
+        },
+        ignoreAllIssues() {
+            client.ignoreAllIssues()
+        },
+        copyFixedCode() {
+            client.copyFixedCode()
+        },
+        insertAtCursor() {
+            client.insertAtCursor()
+        },
+        openDiff() {
+            client.openDiff()
+        },
+        computeSuggestedFixHtml() {
+            if (!this.isFixAvailable) {
+                return
+            }
+            return md.render(`
+\`\`\`${this.languageId} 
+${this.suggestedFix.replaceAll('--- buggyCode\n', '').replaceAll('+++ fixCode\n', '')}
+\`\`\`
+      `)
+        },
+        scrollTo(refName: string) {
+            this.$nextTick(() => this.$refs?.[refName]?.scrollIntoView({ behavior: 'smooth' }))
+        },
+    },
+    computed: {
+        severityImage() {
+            return severityImages[this.severity.toLowerCase()]
+        },
+        recommendationTextHtml() {
+            return md.render(this.recommendationText)
+        },
+        suggestedFixHtml() {
+            return this.computeSuggestedFixHtml()
+        },
+    },
+})
+</script>
diff --git a/src/codewhisperer/views/securityPanelViewProvider.ts b/packages/core/src/codewhisperer/views/securityPanelViewProvider.ts
similarity index 88%
rename from src/codewhisperer/views/securityPanelViewProvider.ts
rename to packages/core/src/codewhisperer/views/securityPanelViewProvider.ts
index 1da6d0843a5..5f3b6cece70 100644
--- a/src/codewhisperer/views/securityPanelViewProvider.ts
+++ b/packages/core/src/codewhisperer/views/securityPanelViewProvider.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -8,19 +8,17 @@ import { SecurityPanelSet, SecurityPanelItem, AggregatedCodeScanIssue } from '..
 import { getLocalDatetime } from '../util/commonUtil'
 
 function makeUri(...args: Parameters<typeof openEditorAtRange>): vscode.Uri {
-    return vscode.Uri.parse(`command:aws.codeWhisperer.openEditorAtRange?${encodeURIComponent(JSON.stringify(args))}`)
+    return vscode.Uri.parse(`command:aws.amazonq.openEditorAtRange?${encodeURIComponent(JSON.stringify(args))}`)
 }
 
-async function openEditorAtRange(path: string, startLine: number, endLine: number) {
+export async function openEditorAtRange(path: string, startLine: number, endLine: number) {
     const uri = vscode.Uri.parse(path)
-    await vscode.window.showTextDocument(uri, { preview: false, preserveFocus: true }).then(e => {
+    await vscode.window.showTextDocument(uri, { preview: false, preserveFocus: true }).then((e) => {
         e.selection = new vscode.Selection(startLine, 0, endLine, 0)
         e.revealRange(new vscode.Range(startLine, 0, endLine, 0), vscode.TextEditorRevealType.InCenterIfOutsideViewport)
     })
 }
 
-vscode.commands.registerCommand('aws.codeWhisperer.openEditorAtRange', openEditorAtRange)
-
 export class SecurityPanelViewProvider implements vscode.WebviewViewProvider {
     public static readonly viewType = 'aws.codeWhisperer.securityPanel'
     private view?: vscode.WebviewView
@@ -90,9 +88,9 @@ export class SecurityPanelViewProvider implements vscode.WebviewViewProvider {
                 this.packageName
             }</span> found <span class="total">${total}</span> issues</p>`
         )
-        this.panelSets.forEach((panelSet, index) => {
+        for (const [index, panelSet] of this.panelSets.entries()) {
             this.addLine(panelSet, index)
-        })
+        }
         this.update()
         if (editor) {
             this.setDecoration(editor, editor.document.uri)
@@ -109,40 +107,40 @@ export class SecurityPanelViewProvider implements vscode.WebviewViewProvider {
     private addLine(panelSet: SecurityPanelSet, index: number) {
         const filePath = panelSet.path
         const fileName = filePath.substring(Number(filePath.lastIndexOf('/')) + 1)
-        const handleId = 'handle'.concat(new Date().getTime().toString()).concat(index.toString())
+        const handleId = 'handle'.concat(Date.now().toString()).concat(index.toString())
         this.dynamicLog.push(
             `<section class="accordion"><input type="checkbox" name="collapse" id="${handleId}" checked="checked"><div class="handle" ><label for="${handleId}">${fileName}</label></div>`
         )
-        panelSet.items.forEach(item => {
+        for (const item of panelSet.items) {
             if (item.severity === vscode.DiagnosticSeverity.Warning) {
                 this.dynamicLog.push(`${this.addClickableWarningItem(item)}`)
             } else {
                 this.dynamicLog.push(`${this.addClickableInfoItem(item)}`)
             }
-        })
+        }
         this.dynamicLog.push(`</section>`)
     }
 
     private persistLines() {
-        this.panelSets.forEach((panelSet, index) => {
+        for (const [index, panelSet] of this.panelSets.entries()) {
             this.persistLine(panelSet, index)
-        })
+        }
     }
 
     private persistLine(panelSet: SecurityPanelSet, index: number) {
         const filePath = panelSet.path
         const fileName = filePath.substring(Number(filePath.lastIndexOf('/')) + 1)
-        const handleId = 'handle'.concat(new Date().getTime().toString()).concat(index.toString())
+        const handleId = 'handle'.concat(Date.now().toString()).concat(index.toString())
         this.persistLog.push(
             `<section class="accordion"><input type="checkbox" name="collapse" id="${handleId}" checked="checked"><div class="handle" ><label for="${handleId}">${fileName}</label></div>`
         )
-        panelSet.items.forEach(item => {
+        for (const item of panelSet.items) {
             if (item.severity === vscode.DiagnosticSeverity.Warning) {
                 this.persistLog.push(`${this.addUnclickableWarningItem(item)}`)
             } else {
                 this.persistLog.push(`${this.addUnclickableInfoItem(item)}`)
             }
-        })
+        }
         this.persistLog.push(`</section>`)
     }
 
@@ -173,13 +171,13 @@ export class SecurityPanelViewProvider implements vscode.WebviewViewProvider {
     }
 
     private createPanelSets(securityRecommendationCollection: AggregatedCodeScanIssue[]) {
-        securityRecommendationCollection.forEach(securityRecommendation => {
+        for (const securityRecommendation of securityRecommendationCollection) {
             const panelSet: SecurityPanelSet = {
                 path: securityRecommendation.filePath,
                 uri: vscode.Uri.parse(securityRecommendation.filePath),
                 items: [],
             }
-            securityRecommendation.issues.forEach(issue => {
+            for (const issue of securityRecommendation.issues) {
                 panelSet.items.push({
                     path: securityRecommendation.filePath,
                     range: new vscode.Range(issue.startLine, 0, issue.endLine, 0),
@@ -191,9 +189,9 @@ export class SecurityPanelViewProvider implements vscode.WebviewViewProvider {
                         hoverMessage: issue.comment,
                     },
                 })
-            })
+            }
             this.panelSets.push(panelSet)
-        })
+        }
     }
 
     private getHtml(webview: vscode.Webview): string {
@@ -215,8 +213,8 @@ export class SecurityPanelViewProvider implements vscode.WebviewViewProvider {
     }
 
     private getHtmlContent(): string {
-        if (this.persistLog.length == 0) {
-            return 'No security issues have been detected in the workspace.'
+        if (this.persistLog.length === 0) {
+            return 'No code issues have been detected in the workspace.'
         }
         return this.persistLog.join('') + this.dynamicLog.join('')
     }
@@ -234,15 +232,15 @@ export class SecurityPanelViewProvider implements vscode.WebviewViewProvider {
     public setDecoration(editor: vscode.TextEditor, uri: vscode.Uri) {
         editor.setDecorations(this.getDecorator(), [])
         const rangesToRend: vscode.DecorationOptions[] = []
-        this.panelSets.forEach(panelSet => {
+        for (const panelSet of this.panelSets) {
             if (panelSet.uri.fsPath === uri.fsPath) {
-                panelSet.items.forEach(item => {
+                for (const item of panelSet.items) {
                     if (item.severity === vscode.DiagnosticSeverity.Warning) {
                         rangesToRend.push(item.decoration)
                     }
-                })
+                }
             }
-        })
+        }
         if (rangesToRend.length > 0) {
             editor.setDecorations(this.getDecorator(), rangesToRend)
         }
@@ -253,7 +251,7 @@ export class SecurityPanelViewProvider implements vscode.WebviewViewProvider {
         if (this.panelSets.length === 0) {
             return
         }
-        const index = this.panelSets.findIndex(panelSet => panelSet.uri.fsPath === uri.fsPath)
+        const index = this.panelSets.findIndex((panelSet) => panelSet.uri.fsPath === uri.fsPath)
         if (index === -1) {
             return
         }
@@ -263,6 +261,7 @@ export class SecurityPanelViewProvider implements vscode.WebviewViewProvider {
         const changedText = event.contentChanges[0].text
         const lineOffset = this.getLineOffset(changedRange, changedText)
 
+        // eslint-disable-next-line unicorn/no-array-for-each
         currentPanelSet.items.forEach((item, index, items) => {
             const intersection = changedRange.intersection(item.range)
             if (
@@ -284,9 +283,9 @@ export class SecurityPanelViewProvider implements vscode.WebviewViewProvider {
         })
         this.panelSets[index] = currentPanelSet
         this.dynamicLog = []
-        this.panelSets.forEach((panelSet, index) => {
+        for (const [index, panelSet] of this.panelSets.entries()) {
             this.addLine(panelSet, index)
-        })
+        }
         this.update()
         if (editor) {
             this.setDecoration(editor, editor.document.uri)
diff --git a/packages/core/src/codewhisperer/vue/backend.ts b/packages/core/src/codewhisperer/vue/backend.ts
new file mode 100644
index 00000000000..0f4701fb745
--- /dev/null
+++ b/packages/core/src/codewhisperer/vue/backend.ts
@@ -0,0 +1,169 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+import * as os from 'os'
+import * as vscode from 'vscode'
+import * as path from 'path'
+import { VueWebview } from '../../webviews/main'
+import globals from '../../shared/extensionGlobals'
+import { telemetry, CodewhispererLanguage, CodewhispererGettingStartedTask } from '../../shared/telemetry/telemetry'
+import { fs } from '../../shared/fs/fs'
+import { getLogger } from '../../shared/logger/logger'
+import { AmazonQPromptSettings } from '../../shared/settings'
+import { CodeWhispererSource } from '../commands/types'
+import { submitFeedback } from '../../feedback/vue/submitFeedback'
+import { placeholder } from '../../shared/vscode/commands2'
+
+export type OSType = 'Mac' | 'RestOfOS'
+export class CodeWhispererWebview extends VueWebview {
+    public static readonly sourcePath: string = 'src/codewhisperer/vue/index.js'
+    public readonly id = 'CodeWhispererWebview'
+
+    public constructor() {
+        super(CodeWhispererWebview.sourcePath)
+    }
+
+    private isFileSaved: boolean = false
+    private getLocalFilePath(fileName: string): string {
+        // This will store the files in the global storage path of VSCode
+        return path.join(globals.context.globalStorageUri.fsPath, fileName)
+    }
+
+    // This function opens TypeScript/JavaScript/Python/Java/C# file in the editor.
+    async openFile(name: [fileName: string, fileContent: string]): Promise<void> {
+        const fileName = name[0]
+        const fileContent = name[1]
+
+        const localFilePath = this.getLocalFilePath(fileName)
+        if ((await fs.existsFile(localFilePath)) && this.isFileSaved) {
+            const fileUri = vscode.Uri.file(localFilePath)
+            await vscode.workspace.openTextDocument(fileUri).then(async (doc) => {
+                await vscode.window.showTextDocument(doc, vscode.ViewColumn.Active).then((editor) => {
+                    const endOfDocument = new vscode.Position(
+                        doc.lineCount - 1,
+                        doc.lineAt(doc.lineCount - 1).text.length
+                    )
+                    editor.selection = new vscode.Selection(endOfDocument, endOfDocument)
+                })
+            })
+        } else {
+            await this.saveFileLocally(localFilePath, fileContent)
+        }
+    }
+
+    // This function saves and open the file in the editor.
+    private async saveFileLocally(localFilePath: string, fileContent: string): Promise<void> {
+        try {
+            await fs.writeFile(localFilePath, fileContent)
+            this.isFileSaved = true
+            // Opening the text document
+            await vscode.workspace.openTextDocument(localFilePath).then(async (doc) => {
+                await vscode.window.showTextDocument(doc, vscode.ViewColumn.Active).then((editor) => {
+                    // Set the selection to the end of the document
+                    const endOfDocument = new vscode.Position(
+                        doc.lineCount - 1,
+                        doc.lineAt(doc.lineCount - 1).text.length
+                    )
+                    editor.selection = new vscode.Selection(endOfDocument, endOfDocument)
+                })
+            })
+        } catch (error) {
+            void vscode.window.showErrorMessage(
+                localize(
+                    'AWS.message.error.codewhispererLearnPage.saveFileLocally',
+                    'There was an error in saving the file, check log for details.'
+                )
+            )
+        }
+    }
+
+    // This function returns the OS type of the machine used in Shortcuts and Generate Suggestion Sections
+    public getOSType(): OSType {
+        return os.platform() === 'darwin' ? 'Mac' : 'RestOfOS'
+    }
+
+    // This function opens the Keyboard shortcuts in VSCode
+    async openShortCuts(): Promise<void> {
+        await vscode.commands.executeCommand('workbench.action.openGlobalKeybindings', 'codewhisperer')
+    }
+
+    // This function opens the Feedback CodeWhisperer page in the webview
+    async openFeedBack(): Promise<void> {
+        return submitFeedback(placeholder, 'Amazon Q')
+    }
+
+    // ------Telemetry------
+    /** This represents the cause for the webview to open, whether a certain button was clicked or it opened automatically */
+    #codeWhispererSource?: CodeWhispererSource
+
+    setSource(source: CodeWhispererSource | undefined) {
+        if (this.#codeWhispererSource) {
+            return
+        }
+        this.#codeWhispererSource = source
+    }
+
+    emitUiClick(id: CodeWhispererUiClick) {
+        telemetry.ui_click.emit({
+            elementId: id,
+            passive: true,
+        })
+    }
+    // Telemetry for CodeWhisperer Try Example with two params Language and Task Type
+    emitTryExampleClick(languageSelected: CodewhispererLanguage, taskType: CodewhispererGettingStartedTask) {
+        telemetry.codewhisperer_onboardingClick.emit({
+            codewhispererLanguage: languageSelected,
+            codewhispererGettingStartedTask: taskType,
+        })
+    }
+}
+// List of all events that are emitted from the webview of CodeWhisperer
+export type CodeWhispererUiClick =
+    | 'codewhisperer_Resources_Documentation'
+    | 'codewhisperer_Resources_Feedback'
+    | 'codewhisperer_Prompt_Eng'
+    | 'codewhisperer_Commands_KeyboardShortcutsEditor'
+    | 'codewhisperer_ScanCode_LearnMore'
+    | 'codewhisperer_GenerateSuggestions_LearnMore'
+    | 'codewhisperer_Learn_PageOpen'
+
+const Panel = VueWebview.compilePanel(CodeWhispererWebview)
+let activePanel: InstanceType<typeof Panel> | undefined
+let subscriptions: vscode.Disposable[] | undefined
+
+// This function is called when the extension is activated : Webview of CodeWhisperer
+export async function showCodeWhispererWebview(
+    ctx: vscode.ExtensionContext,
+    source: CodeWhispererSource | undefined
+): Promise<void> {
+    activePanel ??= new Panel(ctx)
+    activePanel.server.setSource(source)
+    if (activePanel === undefined) {
+        getLogger().error(`codewhisperer: failed to load Learn CodeWhisperer Page`)
+        return
+    }
+    const webview = await activePanel!.show({
+        title: localize('AWS.view.gettingStartedPage.title', `Learn Amazon Q`),
+        viewColumn: vscode.ViewColumn.Active,
+    })
+
+    if (!subscriptions) {
+        subscriptions = [
+            webview.onDidDispose(() => {
+                vscode.Disposable.from(...(subscriptions ?? [])).dispose()
+                activePanel = undefined
+                subscriptions = undefined
+            }),
+        ]
+        const prompts = AmazonQPromptSettings.instance
+        // To check the condition If the user has already seen the welcome message
+        if (prompts.isPromptEnabled('codeWhispererNewWelcomeMessage')) {
+            telemetry.ui_click.emit({ elementId: 'codewhisperer_Learn_PageOpen', passive: true })
+        } else {
+            telemetry.ui_click.emit({ elementId: 'codewhisperer_Learn_PageOpen', passive: false })
+        }
+    }
+}
diff --git a/packages/core/src/codewhisperer/vue/genSuggestionTab.vue b/packages/core/src/codewhisperer/vue/genSuggestionTab.vue
new file mode 100644
index 00000000000..b4191e9e73b
--- /dev/null
+++ b/packages/core/src/codewhisperer/vue/genSuggestionTab.vue
@@ -0,0 +1,228 @@
+<!-- This Vue File provides Sandbox files for experimenting CodeWhisperer and generating code suggestions -->
+<template>
+    <div class="generateSuggestionDiv">
+        <div class="generateSuggestionHeaderDiv">
+            <div class="generateSuggestionHeader">Generate code suggestions with examples</div>
+        </div>
+        <!-- Tab -->
+        <div>
+            <div class="tableDivSub" v-for="(row, index) in tabs[activeTab].tableData" :key="index">
+                <div v-for="(column, columnIndex) in [row.column1, row.column2, row.column3]" :key="columnIndex">
+                    <div
+                        :class="[
+                            'generateSuggestionTabRow',
+                            columnIndex % 2 === 1 ? 'generateSuggestionTabMachineColorGroup1' : '',
+                        ]"
+                    >
+                        <div class="generateSuggestionTabRowLabel">
+                            <template v-if="columnIndex === 0"> Generate code suggestions as you type </template>
+                            <template v-else-if="columnIndex === 1">
+                                Generate code suggestions manually using
+                                <div class="generateSuggestionTabMachine">
+                                    <div class="col2" v-if="osState === 'Mac'">Option</div>
+                                    <div class="col2" v-else>Alt</div>
+                                    <div class="generateSuggestionTabMachineText">+</div>
+                                    <div class="col2">C</div>
+                                </div>
+                            </template>
+                            <template v-else> Generate unit test cases </template>
+                        </div>
+                        <button class="tryExample" @click="onClick(column, tabs[activeTab].label)">Try example</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="generateSuggestionDescription">
+            Amazon Q inline suggestions supports 15 programming languages, including TypeScript, JavaScript, Python,
+            Java, and C#.
+            <a
+                class="generateSuggestionLearnMore"
+                href="https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/q-language-ide-support.html"
+                @click="emitUiClick('codewhisperer_GenerateSuggestions_LearnMore')"
+                >Learn more</a
+            >
+        </div>
+    </div>
+</template>
+<script lang="ts">
+import { defineComponent } from 'vue'
+import { CodeWhispererWebview } from './backend'
+import TelemetryClient from '../../codewhisperer/vue/telemetry.vue'
+import { WebviewClientFactory } from '../../webviews/client'
+import { CodewhispererLanguage, CodewhispererGettingStartedTask } from '../../shared/telemetry/telemetry'
+const client = WebviewClientFactory.create<CodeWhispererWebview>()
+
+export default defineComponent({
+    name: 'GenerateSuggestionTab',
+    components: {},
+    extends: TelemetryClient,
+    data() {
+        return {
+            activeTab: parseInt(sessionStorage.getItem('activeTab') || '0'),
+            osState: '',
+            tabs: [
+                {
+                    label: 'Python',
+                    tableData: [
+                        {
+                            column1: [
+                                'AmazonQ_generate_suggestion.py',
+                                `# TODO: place your cursor at the end of line 6 and press Enter to generate a suggestion.${'\n'}# Tip: press tab to accept the suggestion.${'\n'}${'\n'}fake_users = [${'\n'}    { "name": "User 1", "id": "user1", "city": "San Francisco", "state": "CA" },\n]`,
+                            ],
+                            column2: [
+                                'AmazonQ_manual_invoke.py',
+                                `# TODO: Press either Option + C on MacOS or Alt + C on Windows on a new line.${'\n'}${'\n'}# Function to upload a file to an S3 bucket.${'\n'}`,
+                            ],
+                            column3: [
+                                'Generate_unit_tests.py',
+                                `# TODO: Ask Amazon Q to write unit tests.${'\n'}${'\n'}def sum(a, b):${'\n'}    """${'\n'}    Function to sum two numbers.${'\n'}${'\n'}    Args:${'\n'}    - a: First number.${'\n'}    - b: Second number.${'\n'}${'\n'}    Returns:${'\n'}    - Sum of the two numbers.${'\n'}    """${'\n'}    return a + b${'\n'}${'\n'}# Write a test case for the above function.${'\n'}`,
+                            ],
+                        },
+                    ],
+                },
+            ],
+        }
+    },
+    mounted() {
+        this.showOS()
+    },
+    methods: {
+        onClick(names: string[], label: string) {
+            let taskType: CodewhispererGettingStartedTask = 'autoTrigger'
+            const fileName = names[0]
+            if (fileName.startsWith('AmazonQ_generate_suggestion')) {
+                taskType = 'autoTrigger'
+            } else if (fileName.startsWith('AmazonQ_manual_invoke')) {
+                taskType = 'manualTrigger'
+            } else {
+                taskType = 'unitTest'
+            }
+            const telemetryLabel: CodewhispererLanguage = 'python'
+
+            client.emitTryExampleClick(telemetryLabel, taskType)
+            client.openFile([names[0], names[1]])
+        },
+        async showOS() {
+            this.osState = await client.getOSType()
+        },
+        activeTabFunction(index: number) {
+            this.activeTab = index
+            sessionStorage.setItem('activeTab', index.toString())
+        },
+    },
+})
+</script>
+<style>
+.generateSuggestionDiv {
+    width: 100%;
+    margin-right: 5%;
+    height: auto;
+    display: flex;
+    flex-direction: column;
+    margin-bottom: 40px;
+}
+.generateSuggestionHeaderDiv {
+    display: flex;
+    flex-direction: column;
+    gap: 6px;
+    margin-bottom: 15px;
+}
+.generateSuggestionHeader {
+    font-family: Verdana;
+    font-size: 18px;
+    font-weight: 860;
+    line-height: 24px;
+    letter-spacing: 0em;
+    text-align: left;
+}
+.generateSuggestionDescription {
+    font-family: Verdana;
+    font-size: 14px;
+    font-weight: 510;
+    line-height: 21px;
+    padding-top: 20px;
+    letter-spacing: 0em;
+    text-align: left;
+}
+.generateSuggestionLearnMore {
+    font-size: 14px;
+    text-decoration: none;
+    cursor: pointer;
+    color: #0097fb;
+}
+.generateSuggestionTabRow {
+    display: flex;
+    flex-direction: row;
+    height: 26px;
+    gap: 10px;
+    padding-left: 10px;
+    padding-right: 25px;
+    padding-top: 15px;
+    padding-bottom: 15px;
+    align-items: center;
+    justify-content: space-between;
+}
+.generateSuggestionTabRowLabel {
+    font-family: Verdana;
+    font-size: 14px;
+    font-weight: 350;
+    line-height: 17px;
+    text-align: left;
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+}
+.generateSuggestionTabMachine {
+    display: flex;
+    flex-direction: row;
+    padding-left: 10px;
+}
+.generateSuggestionTabMachineColorGroup1 {
+    background-color: var(--vscode-editorWidget-background);
+}
+.generateSuggestionTabMachineText {
+    padding-left: 5px;
+    padding-right: 10px;
+    padding-top: 4px;
+    font-family: Verdana;
+    text-align: center;
+    align-items: center;
+    justify-content: center;
+    font-size: 18px;
+    font-weight: 350;
+}
+.tableDivSub {
+    margin-top: 10px;
+    border-collapse: collapse;
+    width: 100%;
+    border-radius: 8px;
+    border: 1.12px solid #424750;
+}
+
+.col2 {
+    border: 1px solid #555353;
+    border-radius: 3px;
+    width: fit-content;
+    padding: 2px 10px;
+    margin-right: 5px;
+    color: #ffffff;
+    background: linear-gradient(0deg, #3d3d3d, #3d3d3d), linear-gradient(0deg, #555353, #555353);
+    font-family: Verdana;
+    font-size: 13px;
+    font-weight: 400;
+    line-height: 19px;
+    letter-spacing: 0em;
+    text-align: left;
+    justify-content: center;
+    justify-items: center;
+    align-items: center;
+}
+.tryExample {
+    justify-content: end;
+    height: fit-content;
+    width: fit-content;
+    padding: 6.7 12.3;
+}
+</style>
diff --git a/packages/core/src/codewhisperer/vue/index.ts b/packages/core/src/codewhisperer/vue/index.ts
new file mode 100644
index 00000000000..47e135649ac
--- /dev/null
+++ b/packages/core/src/codewhisperer/vue/index.ts
@@ -0,0 +1,18 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * This module is run within the webview, and will mount the Vue app.
+ */
+
+import { createApp } from 'vue'
+import component from './root.vue'
+
+const create = () => createApp(component)
+const app = create()
+
+app.mount('#vue-app')
+window.addEventListener('remount', () => {
+    app.unmount()
+    create().mount('#vue-app')
+})
diff --git a/packages/core/src/codewhisperer/vue/root.vue b/packages/core/src/codewhisperer/vue/root.vue
new file mode 100644
index 00000000000..61bc72737f8
--- /dev/null
+++ b/packages/core/src/codewhisperer/vue/root.vue
@@ -0,0 +1,188 @@
+<!-- This Vue File provides Header and body of Getting Started Page of CodeWhisperer-->
+<template>
+    <div>
+        <!-- Header -->
+        <div class="headerDiv">
+            <!-- Logo + Title -->
+            <div class="logoIcon">
+                <!-- Icon -->
+                <svg width="100" height="100" viewBox="0 0 71 71" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <g clip-path="url(#clip0_331_37336)">
+                        <path
+                            d="M30.1307 1.46438L8.83068 13.7563C5.45818 15.7087 3.37256 19.3031 3.37256 23.2081V47.8067C3.37256 51.6969 5.45818 55.306 8.83068 57.2585L30.1307 69.5504C33.5032 71.5029 37.6596 71.5029 41.0321 69.5504L62.3321 57.2585C65.7046 55.306 67.7903 51.7117 67.7903 47.8067V23.2081C67.7903 19.3179 65.7046 15.7087 62.3321 13.7563L41.0321 1.46438C37.6596 -0.488125 33.5032 -0.488125 30.1307 1.46438Z"
+                            fill="url(#paint0_linear_331_37336)"
+                        />
+                        <path
+                            d="M54.1966 21.6843L38.2364 12.469C37.5116 12.0401 36.5354 11.833 35.5739 11.833C34.6124 11.833 33.651 12.0401 32.9114 12.469L16.9512 21.6843C15.4868 22.5274 14.2887 24.5982 14.2887 26.2845V44.7149C14.2887 46.4011 15.4868 48.472 16.9512 49.3151L32.9114 58.5303C33.6362 58.9593 34.6124 59.1663 35.5739 59.1663C36.5354 59.1663 37.4968 58.9593 38.2364 58.5303L54.1966 49.3151C55.661 48.472 56.8591 46.4011 56.8591 44.7149V26.2845C56.8591 24.5982 55.661 22.5274 54.1966 21.6843ZM36.0029 54.7141C36.0029 54.7141 35.7958 54.7584 35.5887 54.7584C35.3816 54.7584 35.2337 54.7288 35.1745 54.7141L19.1699 45.4693C19.0072 45.3213 18.8002 44.9515 18.7558 44.7445V26.2549C18.8002 26.0478 19.022 25.678 19.1699 25.5301L35.1745 16.2853C35.1745 16.2853 35.3816 16.2409 35.5887 16.2409C35.7958 16.2409 35.9437 16.2705 36.0029 16.2853L52.0075 25.5301C52.1702 25.678 52.3772 26.0478 52.4216 26.2549V42.6588L40.0262 35.4997V33.5472C40.0262 33.1626 39.8191 32.8224 39.4937 32.6301L36.1212 30.6776C35.9585 30.5888 35.7662 30.5297 35.5887 30.5297C35.4112 30.5297 35.2189 30.574 35.0562 30.6776L31.6837 32.6301C31.3583 32.8224 31.1512 33.1774 31.1512 33.5472V37.4374C31.1512 37.822 31.3583 38.1622 31.6837 38.3545L35.0562 40.307C35.2189 40.3957 35.4112 40.4549 35.5887 40.4549C35.7662 40.4549 35.9585 40.4105 36.1212 40.307L37.8074 39.3307L50.2029 46.4899L36.0029 54.6845V54.7141Z"
+                            fill="white"
+                        />
+                    </g>
+                    <defs>
+                        <linearGradient
+                            id="paint0_linear_331_37336"
+                            x1="64.1515"
+                            y1="-5.31021"
+                            x2="10.5465"
+                            y2="71.2515"
+                            gradientUnits="userSpaceOnUse"
+                        >
+                            <stop stop-color="#A7F8FF" />
+                            <stop offset="0.03" stop-color="#9DF1FF" />
+                            <stop offset="0.08" stop-color="#84E1FF" />
+                            <stop offset="0.15" stop-color="#5AC7FF" />
+                            <stop offset="0.22" stop-color="#21A2FF" />
+                            <stop offset="0.26" stop-color="#008DFF" />
+                            <stop offset="0.66" stop-color="#7F33FF" />
+                            <stop offset="0.99" stop-color="#39127D" />
+                        </linearGradient>
+                        <clipPath id="clip0_331_37336">
+                            <rect width="71" height="71" fill="white" />
+                        </clipPath>
+                    </defs>
+                </svg>
+                <!-- Text -->
+                <div class="titleDiv">
+                    <div class="titleHeader">Amazon Q inline code suggestions</div>
+                    <div class="titleSubHeader">
+                        An AI assistant that reimagines your experience across the entire development lifecycle
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- Body -->
+        <div class="body">
+            <!-- Functionality -->
+            <div class="bodySubDiv">
+                <GenerateSuggestionTab />
+            </div>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue'
+import GenerateSuggestionTab from './genSuggestionTab.vue'
+
+export default defineComponent({
+    name: 'Getting_Started',
+    components: {
+        GenerateSuggestionTab,
+    },
+    data() {
+        return {
+            bannerVisible: true,
+            active: parseInt(sessionStorage.getItem('active') || '0'),
+        }
+    },
+    mounted() {
+        /* 
+                We use Session Storage here because we need to store the the first time signin user and Existing first time signin state globally. According to this we need to display the banner.
+                This can be done by storing the state. We can not use local state for this. 
+                Default the value of Key: Active is 0 after the DOM is mounted it is updated to 1.
+            */
+        sessionStorage.setItem('active', '1')
+    },
+    methods: {
+        //Triggered only for the first time
+        closeStatusBar() {
+            this.bannerVisible = false
+        },
+    },
+})
+</script>
+<style>
+.headerDiv {
+    display: flex;
+    flex-direction: column;
+}
+
+.banner {
+    padding-left: 30px;
+    padding-right: 30px;
+    background-color: #0a4265;
+    border-radius: 10px;
+    display: flex;
+    height: 48px;
+    align-items: center;
+    /* border: 1px solid #f5f5f5; */
+}
+.bannerDiv {
+    display: flex;
+    flex-direction: row;
+    flex: 0.95;
+    align-items: center;
+    justify-content: left;
+    gap: 20px;
+}
+.infoIcon {
+    margin-top: 3px;
+    justify-content: left;
+}
+.bannerDescription {
+    color: #f5f5f5;
+    font-family: Verdana;
+    font-size: 14px;
+    font-weight: 350;
+    text-align: left;
+    justify-content: left;
+}
+.closeBanner {
+    cursor: pointer;
+    color: #ffffff;
+    align-items: center;
+    flex: 0.05;
+    text-align: right;
+    padding-top: 5px;
+}
+.logoIcon {
+    display: flex;
+    flex-direction: row;
+    justify-content: left;
+    align-items: center;
+    padding-top: 25px;
+    padding-bottom: 30px;
+    padding-left: 60px;
+    height: auto;
+}
+.titleDiv {
+    display: flex;
+    flex-direction: column;
+    padding-left: 20px;
+    padding-top: 10px;
+    padding-bottom: 10px;
+}
+.titleHeader {
+    font-family: Verdana;
+    font-size: 24px;
+    font-weight: 860;
+    line-height: 12px;
+    letter-spacing: 0em;
+    text-align: left;
+}
+.titleSubHeader {
+    font-family: Verdana;
+    font-size: 14px;
+    font-weight: 400;
+    padding-top: 10px;
+    line-height: 21px;
+    letter-spacing: 0em;
+    text-align: left;
+}
+.body {
+    display: flex;
+    flex-wrap: wrap-reverse;
+    height: auto;
+    justify-content: left;
+    gap: 5%;
+    justify-items: left;
+    padding-left: 60px;
+}
+.bodySubDiv {
+    display: flex;
+    flex-direction: column;
+    width: 860;
+    height: auto;
+    justify-items: start;
+    align-items: start;
+}
+</style>
diff --git a/packages/core/src/codewhisperer/vue/telemetry.vue b/packages/core/src/codewhisperer/vue/telemetry.vue
new file mode 100644
index 00000000000..4714f5f1825
--- /dev/null
+++ b/packages/core/src/codewhisperer/vue/telemetry.vue
@@ -0,0 +1,22 @@
+<!-- This Vue File is used Telemetry for CodeWhisperer-->
+<script lang="ts">
+import { defineComponent } from 'vue'
+import { WebviewClientFactory } from '../../webviews/client'
+import { CodeWhispererUiClick, CodeWhispererWebview } from './backend'
+
+const client = WebviewClientFactory.create<CodeWhispererWebview>()
+
+/**
+ * Other Components can extend this to access to these
+ * methods from within the HTML without, otherwise they need to
+ * define another method which does the same thing.
+ */
+export default defineComponent({
+    name: 'TelemetryClient',
+    methods: {
+        emitUiClick(id: CodeWhispererUiClick) {
+            client.emitUiClick(id)
+        },
+    },
+})
+</script>
diff --git a/packages/core/src/codewhispererChat/app.ts b/packages/core/src/codewhispererChat/app.ts
new file mode 100644
index 00000000000..3916e571956
--- /dev/null
+++ b/packages/core/src/codewhispererChat/app.ts
@@ -0,0 +1,240 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { EventEmitter } from 'vscode'
+import { ChatController as CwChatController } from '../codewhispererChat/controllers/chat/controller'
+import { UIMessageListener } from './view/messages/messageListener'
+import { AmazonQAppInitContext } from '../amazonq/apps/initContext'
+import { MessageListener } from '../amazonq/messages/messageListener'
+import { MessagePublisher } from '../amazonq/messages/messagePublisher'
+import {
+    ViewDiff,
+    ChatItemFeedbackMessage,
+    ChatItemVotedMessage,
+    CopyCodeToClipboard,
+    FooterInfoLinkClick,
+    InsertCodeAtCursorPosition,
+    PromptMessage,
+    ResponseBodyLinkClickMessage,
+    SourceLinkClickMessage,
+    StopResponseMessage,
+    TabChangedMessage,
+    TabClosedMessage,
+    TabCreatedMessage,
+    TriggerTabIDReceived,
+    UIFocusMessage,
+    AcceptDiff,
+    QuickCommandGroupActionClick,
+    FileClick,
+    TabBarButtonClick,
+    SaveChatMessage,
+} from './controllers/chat/model'
+import { EditorContextCommand, registerCommands } from './commands/registerCommands'
+import {
+    ContextSelectedMessage,
+    CustomFormActionMessage,
+    DetailedListActionClickMessage,
+    DetailedListFilterChangeMessage,
+    DetailedListItemSelectMessage,
+} from './view/connector/connector'
+
+export function init(appContext: AmazonQAppInitContext) {
+    const cwChatControllerEventEmitters = {
+        processPromptChatMessage: new EventEmitter<PromptMessage>(),
+        processTabCreatedMessage: new EventEmitter<TabCreatedMessage>(),
+        processTabClosedMessage: new EventEmitter<TabClosedMessage>(),
+        processTabChangedMessage: new EventEmitter<TabChangedMessage>(),
+        processInsertCodeAtCursorPosition: new EventEmitter<InsertCodeAtCursorPosition>(),
+        processAcceptDiff: new EventEmitter<AcceptDiff>(),
+        processViewDiff: new EventEmitter<ViewDiff>(),
+        processCopyCodeToClipboard: new EventEmitter<CopyCodeToClipboard>(),
+        processContextMenuCommand: new EventEmitter<EditorContextCommand>(),
+        processTriggerTabIDReceived: new EventEmitter<TriggerTabIDReceived>(),
+        processStopResponseMessage: new EventEmitter<StopResponseMessage>(),
+        processChatItemVotedMessage: new EventEmitter<ChatItemVotedMessage>(),
+        processChatItemFeedbackMessage: new EventEmitter<ChatItemFeedbackMessage>(),
+        processUIFocusMessage: new EventEmitter<UIFocusMessage>(),
+        processSourceLinkClick: new EventEmitter<SourceLinkClickMessage>(),
+        processResponseBodyLinkClick: new EventEmitter<ResponseBodyLinkClickMessage>(),
+        processFooterInfoLinkClick: new EventEmitter<FooterInfoLinkClick>(),
+        processContextCommandUpdateMessage: new EventEmitter<any>(),
+        processQuickCommandGroupActionClicked: new EventEmitter<QuickCommandGroupActionClick>(),
+        processCustomFormAction: new EventEmitter<CustomFormActionMessage>(),
+        processContextSelected: new EventEmitter<ContextSelectedMessage>(),
+        processFileClick: new EventEmitter<FileClick>(),
+        processTabBarButtonClick: new EventEmitter<TabBarButtonClick>(),
+        processSaveChat: new EventEmitter<SaveChatMessage>(),
+        processDetailedListFilterChangeMessage: new EventEmitter<DetailedListFilterChangeMessage>(),
+        processDetailedListItemSelectMessage: new EventEmitter<DetailedListItemSelectMessage>(),
+        processDetailedListActionClickMessage: new EventEmitter<DetailedListActionClickMessage>(),
+    }
+
+    const cwChatControllerMessageListeners = {
+        processPromptChatMessage: new MessageListener<PromptMessage>(
+            cwChatControllerEventEmitters.processPromptChatMessage
+        ),
+        processTabCreatedMessage: new MessageListener<TabCreatedMessage>(
+            cwChatControllerEventEmitters.processTabCreatedMessage
+        ),
+        processTabClosedMessage: new MessageListener<TabClosedMessage>(
+            cwChatControllerEventEmitters.processTabClosedMessage
+        ),
+        processTabChangedMessage: new MessageListener<TabChangedMessage>(
+            cwChatControllerEventEmitters.processTabChangedMessage
+        ),
+        processInsertCodeAtCursorPosition: new MessageListener<InsertCodeAtCursorPosition>(
+            cwChatControllerEventEmitters.processInsertCodeAtCursorPosition
+        ),
+        processAcceptDiff: new MessageListener<AcceptDiff>(cwChatControllerEventEmitters.processAcceptDiff),
+        processViewDiff: new MessageListener<ViewDiff>(cwChatControllerEventEmitters.processViewDiff),
+        processCopyCodeToClipboard: new MessageListener<CopyCodeToClipboard>(
+            cwChatControllerEventEmitters.processCopyCodeToClipboard
+        ),
+        processContextMenuCommand: new MessageListener<EditorContextCommand>(
+            cwChatControllerEventEmitters.processContextMenuCommand
+        ),
+        processTriggerTabIDReceived: new MessageListener<TriggerTabIDReceived>(
+            cwChatControllerEventEmitters.processTriggerTabIDReceived
+        ),
+        processStopResponseMessage: new MessageListener<StopResponseMessage>(
+            cwChatControllerEventEmitters.processStopResponseMessage
+        ),
+        processChatItemVotedMessage: new MessageListener<ChatItemVotedMessage>(
+            cwChatControllerEventEmitters.processChatItemVotedMessage
+        ),
+        processChatItemFeedbackMessage: new MessageListener<ChatItemFeedbackMessage>(
+            cwChatControllerEventEmitters.processChatItemFeedbackMessage
+        ),
+        processUIFocusMessage: new MessageListener<UIFocusMessage>(cwChatControllerEventEmitters.processUIFocusMessage),
+        processSourceLinkClick: new MessageListener<SourceLinkClickMessage>(
+            cwChatControllerEventEmitters.processSourceLinkClick
+        ),
+        processResponseBodyLinkClick: new MessageListener<ResponseBodyLinkClickMessage>(
+            cwChatControllerEventEmitters.processResponseBodyLinkClick
+        ),
+        processFooterInfoLinkClick: new MessageListener<FooterInfoLinkClick>(
+            cwChatControllerEventEmitters.processFooterInfoLinkClick
+        ),
+        processContextCommandUpdateMessage: new MessageListener<void>(
+            cwChatControllerEventEmitters.processContextCommandUpdateMessage
+        ),
+        processQuickCommandGroupActionClicked: new MessageListener<QuickCommandGroupActionClick>(
+            cwChatControllerEventEmitters.processQuickCommandGroupActionClicked
+        ),
+        processCustomFormAction: new MessageListener<CustomFormActionMessage>(
+            cwChatControllerEventEmitters.processCustomFormAction
+        ),
+        processContextSelected: new MessageListener<ContextSelectedMessage>(
+            cwChatControllerEventEmitters.processContextSelected
+        ),
+        processFileClick: new MessageListener<FileClick>(cwChatControllerEventEmitters.processFileClick),
+        processTabBarButtonClick: new MessageListener<TabBarButtonClick>(
+            cwChatControllerEventEmitters.processTabBarButtonClick
+        ),
+        processSaveChat: new MessageListener<SaveChatMessage>(cwChatControllerEventEmitters.processSaveChat),
+        processDetailedListFilterChangeMessage: new MessageListener<DetailedListFilterChangeMessage>(
+            cwChatControllerEventEmitters.processDetailedListFilterChangeMessage
+        ),
+        processDetailedListItemSelectMessage: new MessageListener<DetailedListItemSelectMessage>(
+            cwChatControllerEventEmitters.processDetailedListItemSelectMessage
+        ),
+        processDetailedListActionClickMessage: new MessageListener<DetailedListActionClickMessage>(
+            cwChatControllerEventEmitters.processDetailedListActionClickMessage
+        ),
+    }
+
+    const cwChatControllerMessagePublishers = {
+        processPromptChatMessage: new MessagePublisher<PromptMessage>(
+            cwChatControllerEventEmitters.processPromptChatMessage
+        ),
+        processTabCreatedMessage: new MessagePublisher<TabCreatedMessage>(
+            cwChatControllerEventEmitters.processTabCreatedMessage
+        ),
+        processTabClosedMessage: new MessagePublisher<TabClosedMessage>(
+            cwChatControllerEventEmitters.processTabClosedMessage
+        ),
+        processTabChangedMessage: new MessagePublisher<TabChangedMessage>(
+            cwChatControllerEventEmitters.processTabChangedMessage
+        ),
+        processInsertCodeAtCursorPosition: new MessagePublisher<InsertCodeAtCursorPosition>(
+            cwChatControllerEventEmitters.processInsertCodeAtCursorPosition
+        ),
+        processAcceptDiff: new MessagePublisher<AcceptDiff>(cwChatControllerEventEmitters.processAcceptDiff),
+        processViewDiff: new MessagePublisher<ViewDiff>(cwChatControllerEventEmitters.processViewDiff),
+        processCopyCodeToClipboard: new MessagePublisher<CopyCodeToClipboard>(
+            cwChatControllerEventEmitters.processCopyCodeToClipboard
+        ),
+        processContextMenuCommand: new MessagePublisher<EditorContextCommand>(
+            cwChatControllerEventEmitters.processContextMenuCommand
+        ),
+        processTriggerTabIDReceived: new MessagePublisher<TriggerTabIDReceived>(
+            cwChatControllerEventEmitters.processTriggerTabIDReceived
+        ),
+        processStopResponseMessage: new MessagePublisher<StopResponseMessage>(
+            cwChatControllerEventEmitters.processStopResponseMessage
+        ),
+        processChatItemVotedMessage: new MessagePublisher<ChatItemVotedMessage>(
+            cwChatControllerEventEmitters.processChatItemVotedMessage
+        ),
+        processChatItemFeedbackMessage: new MessagePublisher<ChatItemFeedbackMessage>(
+            cwChatControllerEventEmitters.processChatItemFeedbackMessage
+        ),
+        processUIFocusMessage: new MessagePublisher<UIFocusMessage>(
+            cwChatControllerEventEmitters.processUIFocusMessage
+        ),
+        processSourceLinkClick: new MessagePublisher<SourceLinkClickMessage>(
+            cwChatControllerEventEmitters.processSourceLinkClick
+        ),
+        processResponseBodyLinkClick: new MessagePublisher<ResponseBodyLinkClickMessage>(
+            cwChatControllerEventEmitters.processResponseBodyLinkClick
+        ),
+        processFooterInfoLinkClick: new MessagePublisher<FooterInfoLinkClick>(
+            cwChatControllerEventEmitters.processFooterInfoLinkClick
+        ),
+        processContextCommandUpdateMessage: new MessagePublisher<void>(
+            cwChatControllerEventEmitters.processContextCommandUpdateMessage
+        ),
+        processQuickCommandGroupActionClicked: new MessagePublisher<QuickCommandGroupActionClick>(
+            cwChatControllerEventEmitters.processQuickCommandGroupActionClicked
+        ),
+        processCustomFormAction: new MessagePublisher<CustomFormActionMessage>(
+            cwChatControllerEventEmitters.processCustomFormAction
+        ),
+        processContextSelected: new MessagePublisher<ContextSelectedMessage>(
+            cwChatControllerEventEmitters.processContextSelected
+        ),
+        processFileClick: new MessagePublisher<FileClick>(cwChatControllerEventEmitters.processFileClick),
+        processTabBarButtonClick: new MessagePublisher<TabBarButtonClick>(
+            cwChatControllerEventEmitters.processTabBarButtonClick
+        ),
+        processSaveChat: new MessagePublisher<SaveChatMessage>(cwChatControllerEventEmitters.processSaveChat),
+        processDetailedListActionClickMessage: new MessagePublisher<DetailedListActionClickMessage>(
+            cwChatControllerEventEmitters.processDetailedListActionClickMessage
+        ),
+        processDetailedListFilterChangeMessage: new MessagePublisher<DetailedListFilterChangeMessage>(
+            cwChatControllerEventEmitters.processDetailedListFilterChangeMessage
+        ),
+        processDetailedListItemSelectMessage: new MessagePublisher<DetailedListItemSelectMessage>(
+            cwChatControllerEventEmitters.processDetailedListItemSelectMessage
+        ),
+    }
+
+    new CwChatController(
+        cwChatControllerMessageListeners,
+        appContext.getAppsToWebViewMessagePublisher(),
+        appContext.onDidChangeAmazonQVisibility.event
+    )
+
+    const cwChatUIInputEventEmitter = new EventEmitter<any>()
+
+    new UIMessageListener({
+        chatControllerMessagePublishers: cwChatControllerMessagePublishers,
+        webViewMessageListener: new MessageListener<any>(cwChatUIInputEventEmitter),
+    })
+
+    appContext.registerWebViewToAppMessagePublisher(new MessagePublisher<any>(cwChatUIInputEventEmitter), 'cwc')
+
+    registerCommands()
+}
diff --git a/packages/core/src/codewhispererChat/clients/chat/v0/chat.ts b/packages/core/src/codewhispererChat/clients/chat/v0/chat.ts
new file mode 100644
index 00000000000..c32f67cdac5
--- /dev/null
+++ b/packages/core/src/codewhispererChat/clients/chat/v0/chat.ts
@@ -0,0 +1,84 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { SendMessageCommandOutput, SendMessageRequest } from '@amzn/amazon-q-developer-streaming-client'
+import { GenerateAssistantResponseCommandOutput, GenerateAssistantResponseRequest } from '@amzn/codewhisperer-streaming'
+import * as vscode from 'vscode'
+import { ToolkitError } from '../../../../shared/errors'
+import { createCodeWhispererChatStreamingClient } from '../../../../shared/clients/codewhispererChatClient'
+import { createQDeveloperStreamingClient } from '../../../../shared/clients/qDeveloperChatClient'
+import { UserWrittenCodeTracker } from '../../../../codewhisperer/tracker/userWrittenCodeTracker'
+
+export class ChatSession {
+    private sessionId?: string
+    /**
+     * True if messages from local history have been sent to session.
+     */
+    localHistoryHydrated: boolean = false
+
+    contexts: Map<string, { first: number; second: number }[]> = new Map()
+    // TODO: doesn't handle the edge case when two files share the same relativePath string but from different root
+    // e.g. root_a/file1 vs root_b/file1
+    relativePathToWorkspaceRoot: Map<string, string> = new Map()
+    public get sessionIdentifier(): string | undefined {
+        return this.sessionId
+    }
+
+    public tokenSource!: vscode.CancellationTokenSource
+
+    constructor() {
+        this.createNewTokenSource()
+    }
+
+    createNewTokenSource() {
+        this.tokenSource = new vscode.CancellationTokenSource()
+    }
+
+    public setSessionID(id?: string) {
+        this.sessionId = id
+    }
+    async chatIam(chatRequest: SendMessageRequest): Promise<SendMessageCommandOutput> {
+        const client = await createQDeveloperStreamingClient()
+
+        const response = await client.sendMessage(chatRequest)
+        if (!response.sendMessageResponse) {
+            throw new ToolkitError(
+                `Empty chat response. Session id: ${this.sessionId} Request ID: ${response.$metadata.requestId}`
+            )
+        }
+
+        const responseStream = response.sendMessageResponse
+        for await (const event of responseStream) {
+            if ('messageMetadataEvent' in event) {
+                this.sessionId = event.messageMetadataEvent?.conversationId
+                break
+            }
+        }
+
+        UserWrittenCodeTracker.instance.onQFeatureInvoked()
+        return response
+    }
+
+    async chatSso(chatRequest: GenerateAssistantResponseRequest): Promise<GenerateAssistantResponseCommandOutput> {
+        const client = await createCodeWhispererChatStreamingClient()
+
+        if (this.sessionId !== undefined && chatRequest.conversationState !== undefined) {
+            chatRequest.conversationState.conversationId = this.sessionId
+        }
+
+        const response = await client.generateAssistantResponse(chatRequest)
+        if (!response.generateAssistantResponseResponse) {
+            throw new ToolkitError(
+                `Empty chat response. Session id: ${this.sessionId} Request ID: ${response.$metadata.requestId}`
+            )
+        }
+
+        this.sessionId = response.conversationId
+
+        UserWrittenCodeTracker.instance.onQFeatureInvoked()
+
+        return response
+    }
+}
diff --git a/packages/core/src/codewhispererChat/clients/chat/v0/model.ts b/packages/core/src/codewhispererChat/clients/chat/v0/model.ts
new file mode 100644
index 00000000000..60a0cc64367
--- /dev/null
+++ b/packages/core/src/codewhispererChat/clients/chat/v0/model.ts
@@ -0,0 +1,155 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export type ContextKey = string
+export type ContextKeys = ContextKey[]
+
+export interface MatchPolicy {
+    readonly should?: ContextKeys
+    readonly must?: ContextKeys
+    readonly mustNot?: ContextKeys
+}
+
+export interface Context {
+    readonly matchPolicy?: MatchPolicy
+}
+
+export interface FullyQualifiedName {
+    readonly source?: SourceIdentifier
+    readonly symbol?: SymbolIdentifier
+}
+
+export type FullyQualifiedNamesUsages = FullyQualifiedName[]
+
+export type Name = string
+
+export type SymbolIdentifier = Name[]
+
+export type SourceIdentifier = Name[]
+export type FullyQualifiedNames = FullyQualifiedName[]
+export interface FullyQualifiedNamesDeclarationsUsages {
+    readonly used?: FullyQualifiedNamesUsages
+}
+
+export type SimpleName = string
+export type SimpleNames = SimpleName[]
+
+export interface CodeQuery {
+    readonly simpleNames?: SimpleNames
+    readonly fullyQualifiedNames?: FullyQualifiedNamesDeclarationsUsages
+}
+
+export interface EditorContext {
+    readonly fileContent?: string
+    readonly language?: string
+    readonly query?: string
+    readonly code?: string
+    readonly context?: Context
+    readonly codeQuery?: CodeQuery
+}
+
+export enum ApiDocsType {
+    RequestMatchedFqn,
+    RelatedFrequentlyUsedFqn,
+}
+
+class ApiDocsMetadata {
+    constructor(public canonicalExample?: CanonicalExample) {}
+}
+
+class CanonicalExample {
+    constructor(
+        public url: string,
+        public body: string
+    ) {}
+}
+
+export interface ChatApiDocsSuggestion {
+    readonly url?: string
+    readonly title?: string
+    readonly body?: string
+    readonly ancestor?: string | null
+    readonly type: ApiDocsType
+    readonly metadata?: ApiDocsMetadata
+}
+
+export interface ChatSuggestion {
+    readonly url: string
+    readonly title: string
+    readonly body: string
+    readonly context: string[]
+    readonly metadata: SuggestionMetadata
+    readonly type: string
+}
+
+interface StackExchangeMetadata {
+    readonly answerCount: number
+    readonly isAccepted: boolean
+    readonly score: number
+    readonly lastActivityDate: number
+}
+
+interface SuggestionMetadata {
+    readonly StackOverflow?: StackExchangeMetadata
+    readonly StackExchange?: StackExchangeMetadata
+}
+
+export interface FollowUp {
+    readonly type: FollowUpType
+    readonly message?: string
+    readonly attachedSuggestions?: ChatSuggestion[]
+    readonly attachedApiDocsSuggestions?: ChatApiDocsSuggestion[]
+}
+
+export interface ChatRequest {
+    readonly message: string
+    readonly editorContext: EditorContext
+    readonly attachedSuggestions: ChatSuggestion[]
+    readonly attachedApiDocsSuggestions: ChatApiDocsSuggestion[]
+}
+export interface FollowUpRequest {
+    readonly followUp: FollowUp
+    readonly editorContext?: EditorContext
+}
+
+export interface IdeTriggerRequest {
+    readonly trigger: string
+    readonly editorContext?: EditorContext
+}
+
+// @ts-ignore
+export interface ChatEvent {
+    readonly messageId: string
+    readonly header?: Header
+    readonly token?: string
+    readonly followUps?: SuggestedFollowUp[]
+    readonly suggestions?: ChatSuggestion[]
+    readonly query?: string
+}
+
+interface Header {
+    readonly sender: string
+    readonly responseTo: string
+    readonly sequenceId: string
+}
+
+export enum FollowUpType {
+    Alternatives,
+    CommonPractices,
+    Improvements,
+    MoreExamples,
+    CiteSources,
+    LineByLine,
+    ExplainInDetail,
+    Generated,
+}
+
+interface SuggestedFollowUp {
+    readonly type: FollowUpType
+    readonly pillText?: string
+    readonly prompt?: string
+    readonly message?: string
+    readonly attachedSuggestions?: ChatSuggestion[]
+    readonly attachedApiDocsSuggestions?: ChatApiDocsSuggestion[]
+}
diff --git a/packages/core/src/codewhispererChat/commands/registerCommands.ts b/packages/core/src/codewhispererChat/commands/registerCommands.ts
new file mode 100644
index 00000000000..8ec1f7ac759
--- /dev/null
+++ b/packages/core/src/codewhispererChat/commands/registerCommands.ts
@@ -0,0 +1,71 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { commandPalette } from '../../codewhisperer/commands/types'
+import { CodeScanIssue } from '../../codewhisperer/models/model'
+import { Commands, VsCodeCommandArg, placeholder } from '../../shared/vscode/commands2'
+
+/**
+ * Opens the Amazon Q panel, showing the correct View that should
+ * be shown in it.
+ */
+export const focusAmazonQPanel = Commands.declare(
+    { id: `aws.amazonq.focusChat`, compositeKey: { 1: 'source' } },
+    () => async (_: VsCodeCommandArg, source: string) => {
+        /**
+         * The Amazon Q panel is the window that opens when you click the Q icon
+         * on the sidebar. Within this panel we can render different Views.
+         *
+         * The logic for determining which view is show is currently determined by
+         * the value of the context `aws.amazonq.showLoginView`.
+         * So when we try to focus the following Views, only one will show depending
+         * on the context.
+         */
+        await Commands.tryExecute('aws.amazonq.AmazonQChatView.focus')
+        await Commands.tryExecute('aws.amazonq.AmazonCommonAuth.focus')
+    }
+)
+
+/**
+ * {@link focusAmazonQPanel} but only used for the keybinding since we cannot
+ * explicitly set the `source` in the package.json definition
+ */
+export const focusAmazonQPanelKeybinding = Commands.declare('_aws.amazonq.focusChat.keybinding', () => async () => {
+    await focusAmazonQPanel.execute(placeholder, 'keybinding')
+})
+
+export function registerCommands() {
+    /**
+     * make these no-ops, since theres still callers that need to be deprecated
+     */
+    Commands.register('aws.amazonq.updateContextCommandItems', () => {})
+}
+
+export type EditorContextBaseCommandType =
+    | 'aws.amazonq.explainCode'
+    | 'aws.amazonq.refactorCode'
+    | 'aws.amazonq.fixCode'
+    | 'aws.amazonq.optimizeCode'
+    | 'aws.amazonq.sendToPrompt'
+    | 'aws.amazonq.generateUnitTests'
+
+export type CodeScanIssueCommandType = 'aws.amazonq.explainIssue'
+
+export type EditorContextCommandType = EditorContextBaseCommandType | CodeScanIssueCommandType
+
+export type EditorContextCommandTriggerType = 'contextMenu' | 'keybinding' | typeof commandPalette | 'click'
+
+export interface EditorContextCommandBase {
+    type: EditorContextBaseCommandType
+    triggerType: EditorContextCommandTriggerType
+}
+
+export interface EditorContextCommandWithIssue {
+    type: CodeScanIssueCommandType
+    triggerType: EditorContextCommandTriggerType
+    issue: CodeScanIssue
+}
+
+export type EditorContextCommand = EditorContextCommandBase | EditorContextCommandWithIssue
diff --git a/packages/core/src/codewhispererChat/constants.ts b/packages/core/src/codewhispererChat/constants.ts
new file mode 100644
index 00000000000..84dd2dae292
--- /dev/null
+++ b/packages/core/src/codewhispererChat/constants.ts
@@ -0,0 +1,42 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as path from 'path'
+import fs from '../shared/fs/fs'
+import { ContextLengths } from './controllers/chat/model'
+
+export const promptFileExtension = '.md'
+
+// limit for each entry of @prompt, @rules, @files and @folder
+export const additionalContentInnerContextLimit = 8192
+
+export const aditionalContentNameLimit = 1024
+
+// limit for each chunk of @workspace
+export const workspaceChunkMaxSize = 40_960
+
+export const getUserPromptsDirectory = () => {
+    return path.join(fs.getUserHomeDir(), '.aws', 'amazonq', 'prompts')
+}
+
+export const createSavedPromptCommandId = 'create-saved-prompt'
+
+export const defaultContextLengths: ContextLengths = {
+    additionalContextLengths: {
+        fileContextLength: 0,
+        promptContextLength: 0,
+        ruleContextLength: 0,
+    },
+    truncatedAdditionalContextLengths: {
+        fileContextLength: 0,
+        promptContextLength: 0,
+        ruleContextLength: 0,
+    },
+    workspaceContextLength: 0,
+    truncatedWorkspaceContextLength: 0,
+    userInputContextLength: 0,
+    truncatedUserInputContextLength: 0,
+    focusFileContextLength: 0,
+    truncatedFocusFileContextLength: 0,
+}
diff --git a/packages/core/src/codewhispererChat/controllers/chat/chatRequest/converter.ts b/packages/core/src/codewhispererChat/controllers/chat/chatRequest/converter.ts
new file mode 100644
index 00000000000..b4b17f35a64
--- /dev/null
+++ b/packages/core/src/codewhispererChat/controllers/chat/chatRequest/converter.ts
@@ -0,0 +1,330 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ConversationState, CursorState, DocumentSymbol, SymbolType, TextDocument } from '@amzn/codewhisperer-streaming'
+import { AdditionalContentEntryAddition, ChatTriggerType, RelevantTextDocumentAddition, TriggerPayload } from '../model'
+import { undefinedIfEmpty } from '../../../../shared/utilities/textUtilities'
+import { getLogger } from '../../../../shared/logger/logger'
+import { messageToChatMessage } from '../../../../shared/db/chatDb/util'
+
+const fqnNameSizeDownLimit = 1
+const fqnNameSizeUpLimit = 256
+export const supportedLanguagesList = [
+    'python',
+    'javascript',
+    'java',
+    'csharp',
+    'typescript',
+    'c',
+    'cpp',
+    'go',
+    'kotlin',
+    'php',
+    'ruby',
+    'rust',
+    'scala',
+    'shell',
+    'sql',
+]
+
+export const filePathSizeLimit = 4_000
+
+export function triggerPayloadToChatRequest(triggerPayload: TriggerPayload): {
+    conversationState: ConversationState
+    profileArn?: string
+} {
+    // Flexible truncation logic
+    const remainingPayloadSize = 100_000
+
+    // Type A context: Preserving user input as much as possible
+    const userInputTruncationInfo = preserveContexts(triggerPayload, remainingPayloadSize, ChatContextType.UserInput)
+
+    // Type B1(prompts) context: Preserving @prompt as much as possible
+    const userSpecificPromptsTruncationInfo = preserveContexts(
+        triggerPayload,
+        userInputTruncationInfo.remainingPayloadSize,
+        ChatContextType.UserSpecificPrompts
+    )
+
+    // Type C context: Preserving current file context as much as possible
+    const currentFileTruncationInfo = preserveContexts(
+        triggerPayload,
+        userSpecificPromptsTruncationInfo.remainingPayloadSize,
+        ChatContextType.CurrentFile
+    )
+
+    // Type B1(rules) context: Preserving rules as much as possible
+    const userSpecificRulesTruncationInfo = preserveContexts(
+        triggerPayload,
+        currentFileTruncationInfo.remainingPayloadSize,
+        ChatContextType.UserSpecificRules
+    )
+
+    // Type B2(explicit @files) context: Preserving files as much as possible
+    const userSpecificFilesTruncationInfo = preserveContexts(
+        triggerPayload,
+        userSpecificRulesTruncationInfo.remainingPayloadSize,
+        ChatContextType.UserSpecificFiles
+    )
+
+    // Type B3 @workspace context: Preserving workspace as much as possible
+    const workspaceTruncationInfo = preserveContexts(
+        triggerPayload,
+        userSpecificFilesTruncationInfo.remainingPayloadSize,
+        ChatContextType.Workspace
+    )
+
+    getLogger().debug(
+        `current request total payload size: ${userInputTruncationInfo.sizeAfter + currentFileTruncationInfo.sizeAfter + userSpecificRulesTruncationInfo.sizeAfter + userSpecificFilesTruncationInfo.sizeAfter + workspaceTruncationInfo.sizeAfter}`
+    )
+
+    // Filter out empty innerContext from additionalContents
+    if (triggerPayload.additionalContents !== undefined) {
+        triggerPayload.additionalContents = triggerPayload.additionalContents.filter(
+            (content) => content.innerContext !== undefined && content.innerContext !== ''
+        )
+    }
+
+    // Filter out empty text from relevantTextDocuments
+    triggerPayload.relevantTextDocuments = triggerPayload.relevantTextDocuments.filter(
+        (doc) => doc.text !== undefined && doc.text !== ''
+    )
+
+    let document: TextDocument | undefined = undefined
+    let cursorState: CursorState | undefined = undefined
+
+    if (triggerPayload.filePath !== undefined && triggerPayload.filePath !== '') {
+        const documentSymbolFqns: DocumentSymbol[] = []
+        if (triggerPayload.codeQuery?.fullyQualifiedNames?.used) {
+            for (const fqn of triggerPayload.codeQuery.fullyQualifiedNames.used) {
+                const elem = {
+                    name: fqn.symbol?.join('.') ?? '',
+                    type: SymbolType.USAGE,
+                    source: fqn.source?.join('.'),
+                }
+
+                if (
+                    elem.name.length >= fqnNameSizeDownLimit &&
+                    elem.name.length < fqnNameSizeUpLimit &&
+                    (elem.source === undefined ||
+                        (elem.source.length >= fqnNameSizeDownLimit && elem.source.length < fqnNameSizeUpLimit))
+                ) {
+                    documentSymbolFqns.push(elem)
+                }
+            }
+        }
+
+        let programmingLanguage
+        if (
+            triggerPayload.fileLanguage !== undefined &&
+            triggerPayload.fileLanguage !== '' &&
+            supportedLanguagesList.includes(triggerPayload.fileLanguage)
+        ) {
+            programmingLanguage = { languageName: triggerPayload.fileLanguage }
+        }
+
+        document = {
+            relativeFilePath: triggerPayload.filePath ? triggerPayload.filePath.substring(0, filePathSizeLimit) : '',
+            text: triggerPayload.fileText,
+            programmingLanguage: programmingLanguage,
+            documentSymbols: documentSymbolFqns,
+        }
+
+        if (triggerPayload.codeSelection?.start) {
+            cursorState = {
+                range: {
+                    start: {
+                        line: triggerPayload.codeSelection.start.line,
+                        character: triggerPayload.codeSelection.start.character,
+                    },
+                    end: {
+                        line: triggerPayload.codeSelection.end.line,
+                        character: triggerPayload.codeSelection.end.character,
+                    },
+                },
+            }
+        }
+    }
+
+    // service will throw validation exception if string is empty
+    const customizationArn: string | undefined = undefinedIfEmpty(triggerPayload.customization.arn)
+    const chatTriggerType = triggerPayload.trigger === ChatTriggerType.InlineChatMessage ? 'INLINE_CHAT' : 'MANUAL'
+    const history =
+        triggerPayload.history &&
+        triggerPayload.history.length > 0 &&
+        triggerPayload.history.map((chat) => messageToChatMessage(chat))
+
+    return {
+        conversationState: {
+            currentMessage: {
+                userInputMessage: {
+                    content: triggerPayload.message,
+                    userInputMessageContext: {
+                        editorState: {
+                            document,
+                            cursorState,
+                            relevantDocuments: triggerPayload.relevantTextDocuments,
+                            useRelevantDocuments: triggerPayload.useRelevantDocuments,
+                        },
+                        additionalContext: triggerPayload.additionalContents,
+                    },
+                    userIntent: triggerPayload.userIntent,
+                },
+            },
+            chatTriggerType,
+            customizationArn: customizationArn,
+            history: history || undefined,
+        },
+        profileArn: triggerPayload.profile?.arn,
+    }
+}
+
+function preserveContexts(
+    triggerPayload: TriggerPayload,
+    remainingPayloadSize: number,
+    contextType: ChatContextType
+): FlexibleTruncationInfo {
+    const typeToContextMap = new Map<
+        ChatContextType,
+        string | AdditionalContentEntryAddition[] | RelevantTextDocumentAddition[]
+    >([
+        [ChatContextType.UserInput, triggerPayload.message],
+        [ChatContextType.CurrentFile, triggerPayload.fileText],
+        [ChatContextType.UserSpecificPrompts, triggerPayload.additionalContents],
+        [ChatContextType.UserSpecificRules, triggerPayload.additionalContents],
+        [ChatContextType.UserSpecificFiles, triggerPayload.additionalContents],
+        [ChatContextType.Workspace, triggerPayload.relevantTextDocuments],
+    ])
+
+    let truncationInfo = {
+        remainingPayloadSize: remainingPayloadSize,
+        sizeBefore: 0,
+        sizeAfter: 0,
+        textAfter: '',
+    }
+
+    const contexts = typeToContextMap.get(contextType)
+    switch (contextType) {
+        case ChatContextType.UserInput:
+            truncationInfo = truncate(contexts as string, truncationInfo)
+            triggerPayload.message = truncationInfo.textAfter
+            triggerPayload.contextLengths.truncatedUserInputContextLength = truncationInfo.sizeAfter
+            break
+        case ChatContextType.CurrentFile:
+            truncationInfo = truncate(contexts as string, truncationInfo)
+            triggerPayload.fileText = truncationInfo.textAfter
+            triggerPayload.contextLengths.truncatedFocusFileContextLength = truncationInfo.sizeAfter
+            break
+        case ChatContextType.UserSpecificPrompts:
+            truncationInfo = truncateUserSpecificContexts(
+                contexts as AdditionalContentEntryAddition[],
+                truncationInfo,
+                'prompt'
+            )
+            triggerPayload.contextLengths.truncatedAdditionalContextLengths.promptContextLength =
+                truncationInfo.sizeAfter
+            break
+        case ChatContextType.UserSpecificRules:
+            truncationInfo = truncateUserSpecificContexts(
+                contexts as AdditionalContentEntryAddition[],
+                truncationInfo,
+                'rule'
+            )
+            triggerPayload.contextLengths.truncatedAdditionalContextLengths.ruleContextLength = truncationInfo.sizeAfter
+            break
+        case ChatContextType.UserSpecificFiles:
+            truncationInfo = truncateUserSpecificContexts(
+                contexts as AdditionalContentEntryAddition[],
+                truncationInfo,
+                'file'
+            )
+            triggerPayload.contextLengths.truncatedAdditionalContextLengths.fileContextLength = truncationInfo.sizeAfter
+            break
+        case ChatContextType.Workspace:
+            truncationInfo = truncateWorkspaceContexts(contexts as RelevantTextDocumentAddition[], truncationInfo)
+            triggerPayload.contextLengths.truncatedWorkspaceContextLength = truncationInfo.sizeAfter
+            break
+        default:
+            getLogger().warn(`Unexpected context type: ${contextType}`)
+            return truncationInfo
+    }
+
+    getLogger().debug(
+        `Current request context size: type: ${contextType}, before: ${truncationInfo.sizeBefore}, after: ${truncationInfo.sizeAfter}`
+    )
+    return truncationInfo
+}
+
+function truncateUserSpecificContexts(
+    contexts: AdditionalContentEntryAddition[],
+    truncationInfo: FlexibleTruncationInfo,
+    type: string
+): FlexibleTruncationInfo {
+    for (const context of contexts) {
+        if (context.type !== type || !context.innerContext) {
+            continue
+        }
+        truncationInfo = truncate(context.innerContext, truncationInfo)
+        context.innerContext = truncationInfo.textAfter
+    }
+    return truncationInfo
+}
+
+function truncateWorkspaceContexts(
+    contexts: RelevantTextDocumentAddition[],
+    truncationInfo: FlexibleTruncationInfo
+): FlexibleTruncationInfo {
+    for (const context of contexts) {
+        if (!context.text) {
+            continue
+        }
+        truncationInfo = truncate(context.text, truncationInfo)
+        context.text = truncationInfo.textAfter
+    }
+    return truncationInfo
+}
+
+function truncate(
+    textBefore: string,
+    truncationInfo: FlexibleTruncationInfo,
+    isCurrentFile: boolean = false
+): FlexibleTruncationInfo {
+    const sizeBefore = truncationInfo.sizeBefore + textBefore.length
+
+    // for all other types of contexts, we simply truncate the tail,
+    // for current file context, since it's expanded from the middle context, we truncate head and tail to preserve middle context
+    const middle = Math.floor(textBefore.length / 2)
+    const halfRemaining = Math.floor(truncationInfo.remainingPayloadSize / 2)
+    const startPos = isCurrentFile ? middle - halfRemaining : 0
+    const endPos = isCurrentFile
+        ? middle + (truncationInfo.remainingPayloadSize - halfRemaining)
+        : Math.min(textBefore.length, truncationInfo.remainingPayloadSize)
+    const textAfter = textBefore.substring(startPos, endPos)
+
+    const sizeAfter = truncationInfo.sizeAfter + textAfter.length
+    const remainingPayloadSize = truncationInfo.remainingPayloadSize - textAfter.length
+    return {
+        remainingPayloadSize,
+        sizeBefore,
+        sizeAfter,
+        textAfter,
+    }
+}
+
+type FlexibleTruncationInfo = {
+    readonly remainingPayloadSize: number
+    readonly sizeBefore: number
+    readonly sizeAfter: number
+    readonly textAfter: string
+}
+
+export enum ChatContextType {
+    UserInput = 'userInput',
+    CurrentFile = 'currentFile',
+    UserSpecificPrompts = 'userSpecificPrompts',
+    UserSpecificRules = 'userSpecificRules',
+    UserSpecificFiles = 'userSpecificFiles',
+    Workspace = 'workspace',
+}
diff --git a/packages/core/src/codewhispererChat/controllers/chat/controller.ts b/packages/core/src/codewhispererChat/controllers/chat/controller.ts
new file mode 100644
index 00000000000..1be0c0332f5
--- /dev/null
+++ b/packages/core/src/codewhispererChat/controllers/chat/controller.ts
@@ -0,0 +1,1171 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as path from 'path'
+import * as vscode from 'vscode'
+import { Event as VSCodeEvent, Uri, workspace, window, ViewColumn, Position, Selection } from 'vscode'
+import { EditorContextExtractor } from '../../editor/context/extractor'
+import { ChatSessionStorage } from '../../storages/chatSession'
+import { Messenger, MessengerResponseType, StaticTextResponseType } from './messenger/messenger'
+import {
+    PromptMessage,
+    ChatTriggerType,
+    TriggerPayload,
+    TabClosedMessage,
+    InsertCodeAtCursorPosition,
+    TriggerTabIDReceived,
+    StopResponseMessage,
+    CopyCodeToClipboard,
+    ChatItemVotedMessage,
+    ChatItemFeedbackMessage,
+    TabCreatedMessage,
+    TabChangedMessage,
+    UIFocusMessage,
+    SourceLinkClickMessage,
+    ResponseBodyLinkClickMessage,
+    ChatPromptCommandType,
+    FooterInfoLinkClick,
+    ViewDiff,
+    AcceptDiff,
+    QuickCommandGroupActionClick,
+    DocumentReference,
+    FileClick,
+    RelevantTextDocumentAddition,
+    TabBarButtonClick,
+    SaveChatMessage,
+} from './model'
+import {
+    AppToWebViewMessageDispatcher,
+    ContextSelectedMessage,
+    CustomFormActionMessage,
+    DetailedListActionClickMessage,
+    DetailedListFilterChangeMessage,
+    DetailedListItemSelectMessage,
+} from '../../view/connector/connector'
+import { MessagePublisher } from '../../../amazonq/messages/messagePublisher'
+import { MessageListener } from '../../../amazonq/messages/messageListener'
+import { EditorContentController } from '../../../amazonq/commons/controllers/contentController'
+import { EditorContextCommand } from '../../commands/registerCommands'
+import { PromptsGenerator } from './prompts/promptsGenerator'
+import { TriggerEventsStorage } from '../../storages/triggerEvents'
+import { SendMessageRequest } from '@amzn/amazon-q-developer-streaming-client'
+import { CodeWhispererStreamingServiceException } from '@amzn/codewhisperer-streaming'
+import { UserIntentRecognizer } from './userIntent/userIntentRecognizer'
+import { CWCTelemetryHelper, recordTelemetryChatRunCommand } from './telemetryHelper'
+import { CodeWhispererTracker } from '../../../codewhisperer/tracker/codewhispererTracker'
+import { getLogger } from '../../../shared/logger/logger'
+import { triggerPayloadToChatRequest } from './chatRequest/converter'
+import { AuthUtil } from '../../../codewhisperer/util/authUtil'
+import { openUrl } from '../../../shared/utilities/vsCodeUtils'
+import { randomUUID } from '../../../shared/crypto'
+import { CodeWhispererSettings } from '../../../codewhisperer/util/codewhispererSettings'
+import { getSelectedCustomization } from '../../../codewhisperer/util/customizationUtil'
+import { getHttpStatusCode, AwsClientResponseError } from '../../../shared/errors'
+import { uiEventRecorder } from '../../../amazonq/util/eventRecorder'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { isSsoConnection } from '../../../auth/connection'
+import { inspect } from '../../../shared/utilities/collectionUtils'
+import { DefaultAmazonQAppInitContext } from '../../../amazonq/apps/initContext'
+import globals from '../../../shared/extensionGlobals'
+import { MynahIconsType, MynahUIDataModel, QuickActionCommand } from '@aws/mynah-ui'
+import { workspaceCommand } from '../../../amazonq/webview/ui/tabs/constants'
+import fs from '../../../shared/fs/fs'
+import { FeatureConfigProvider, Features } from '../../../shared/featureConfig'
+import { i18n } from '../../../shared/i18n-helper'
+import {
+    getUserPromptsDirectory,
+    promptFileExtension,
+    createSavedPromptCommandId,
+    defaultContextLengths,
+} from '../../constants'
+import { ChatSession } from '../../clients/chat/v0/chat'
+import { Database } from '../../../shared/db/chatDb/chatDb'
+import { TabBarController } from './tabBarController'
+
+export interface ChatControllerMessagePublishers {
+    readonly processPromptChatMessage: MessagePublisher<PromptMessage>
+    readonly processTabCreatedMessage: MessagePublisher<TabCreatedMessage>
+    readonly processTabClosedMessage: MessagePublisher<TabClosedMessage>
+    readonly processTabChangedMessage: MessagePublisher<TabChangedMessage>
+    readonly processInsertCodeAtCursorPosition: MessagePublisher<InsertCodeAtCursorPosition>
+    readonly processAcceptDiff: MessagePublisher<AcceptDiff>
+    readonly processViewDiff: MessagePublisher<ViewDiff>
+    readonly processCopyCodeToClipboard: MessagePublisher<CopyCodeToClipboard>
+    readonly processContextMenuCommand: MessagePublisher<EditorContextCommand>
+    readonly processTriggerTabIDReceived: MessagePublisher<TriggerTabIDReceived>
+    readonly processStopResponseMessage: MessagePublisher<StopResponseMessage>
+    readonly processChatItemVotedMessage: MessagePublisher<ChatItemVotedMessage>
+    readonly processChatItemFeedbackMessage: MessagePublisher<ChatItemFeedbackMessage>
+    readonly processUIFocusMessage: MessagePublisher<UIFocusMessage>
+    readonly processSourceLinkClick: MessagePublisher<SourceLinkClickMessage>
+    readonly processResponseBodyLinkClick: MessagePublisher<ResponseBodyLinkClickMessage>
+    readonly processFooterInfoLinkClick: MessagePublisher<FooterInfoLinkClick>
+    readonly processContextCommandUpdateMessage: MessagePublisher<void>
+    readonly processQuickCommandGroupActionClicked: MessagePublisher<QuickCommandGroupActionClick>
+    readonly processCustomFormAction: MessagePublisher<CustomFormActionMessage>
+    readonly processContextSelected: MessagePublisher<ContextSelectedMessage>
+    readonly processFileClick: MessagePublisher<FileClick>
+    readonly processTabBarButtonClick: MessagePublisher<TabBarButtonClick>
+    readonly processSaveChat: MessagePublisher<SaveChatMessage>
+    readonly processDetailedListFilterChangeMessage: MessagePublisher<DetailedListFilterChangeMessage>
+    readonly processDetailedListItemSelectMessage: MessagePublisher<DetailedListItemSelectMessage>
+    readonly processDetailedListActionClickMessage: MessagePublisher<DetailedListActionClickMessage>
+}
+
+export interface ChatControllerMessageListeners {
+    readonly processPromptChatMessage: MessageListener<PromptMessage>
+    readonly processTabCreatedMessage: MessageListener<TabCreatedMessage>
+    readonly processTabClosedMessage: MessageListener<TabClosedMessage>
+    readonly processTabChangedMessage: MessageListener<TabChangedMessage>
+    readonly processInsertCodeAtCursorPosition: MessageListener<InsertCodeAtCursorPosition>
+    readonly processAcceptDiff: MessageListener<AcceptDiff>
+    readonly processViewDiff: MessageListener<ViewDiff>
+    readonly processCopyCodeToClipboard: MessageListener<CopyCodeToClipboard>
+    readonly processContextMenuCommand: MessageListener<EditorContextCommand>
+    readonly processTriggerTabIDReceived: MessageListener<TriggerTabIDReceived>
+    readonly processStopResponseMessage: MessageListener<StopResponseMessage>
+    readonly processChatItemVotedMessage: MessageListener<ChatItemVotedMessage>
+    readonly processChatItemFeedbackMessage: MessageListener<ChatItemFeedbackMessage>
+    readonly processUIFocusMessage: MessageListener<UIFocusMessage>
+    readonly processSourceLinkClick: MessageListener<SourceLinkClickMessage>
+    readonly processResponseBodyLinkClick: MessageListener<ResponseBodyLinkClickMessage>
+    readonly processFooterInfoLinkClick: MessageListener<FooterInfoLinkClick>
+    readonly processContextCommandUpdateMessage: MessageListener<void>
+    readonly processQuickCommandGroupActionClicked: MessageListener<QuickCommandGroupActionClick>
+    readonly processCustomFormAction: MessageListener<CustomFormActionMessage>
+    readonly processContextSelected: MessageListener<ContextSelectedMessage>
+    readonly processFileClick: MessageListener<FileClick>
+    readonly processTabBarButtonClick: MessageListener<TabBarButtonClick>
+    readonly processSaveChat: MessageListener<SaveChatMessage>
+    readonly processDetailedListFilterChangeMessage: MessageListener<DetailedListFilterChangeMessage>
+    readonly processDetailedListItemSelectMessage: MessageListener<DetailedListItemSelectMessage>
+    readonly processDetailedListActionClickMessage: MessageListener<DetailedListActionClickMessage>
+}
+
+export class ChatController {
+    private readonly sessionStorage: ChatSessionStorage
+    private readonly triggerEventsStorage: TriggerEventsStorage
+    private readonly messenger: Messenger
+    private readonly editorContextExtractor: EditorContextExtractor
+    private readonly editorContentController: EditorContentController
+    private readonly tabBarController: TabBarController
+    private readonly promptGenerator: PromptsGenerator
+    private readonly userIntentRecognizer: UserIntentRecognizer
+    private readonly telemetryHelper: CWCTelemetryHelper
+    private userPromptsWatcher: vscode.FileSystemWatcher | undefined
+    private chatHistoryDb = Database.getInstance()
+    private cancelTokenSource: vscode.CancellationTokenSource = new vscode.CancellationTokenSource()
+
+    public constructor(
+        private readonly chatControllerMessageListeners: ChatControllerMessageListeners,
+        appsToWebViewMessagePublisher: MessagePublisher<any>,
+        onDidChangeAmazonQVisibility: VSCodeEvent<boolean>
+    ) {
+        this.sessionStorage = new ChatSessionStorage()
+        this.triggerEventsStorage = new TriggerEventsStorage()
+        this.telemetryHelper = CWCTelemetryHelper.init(this.sessionStorage, this.triggerEventsStorage)
+        this.messenger = new Messenger(
+            new AppToWebViewMessageDispatcher(appsToWebViewMessagePublisher),
+            this.telemetryHelper
+        )
+        this.editorContextExtractor = new EditorContextExtractor()
+        this.editorContentController = new EditorContentController()
+        this.promptGenerator = new PromptsGenerator()
+        this.userIntentRecognizer = new UserIntentRecognizer()
+        this.tabBarController = new TabBarController(this.messenger)
+
+        onDidChangeAmazonQVisibility((visible) => {
+            if (visible) {
+                this.telemetryHelper.recordOpenChat()
+            } else {
+                this.telemetryHelper.recordCloseChat()
+            }
+        })
+
+        AuthUtil.instance.regionProfileManager.onDidChangeRegionProfile(() => {
+            this.cancelTokenSource.cancel()
+        })
+
+        this.chatControllerMessageListeners.processPromptChatMessage.onMessage((data) => {
+            const uiEvents = uiEventRecorder.get(data.tabID)
+            if (uiEvents) {
+                uiEventRecorder.set(data.tabID, {
+                    events: {
+                        featureReceivedMessage: globals.clock.Date.now(),
+                    },
+                })
+            }
+            /**
+             * traceId is only instrumented for chat-prompt but not for things
+             * like follow-up-was-clicked. In those cases we fallback to a different
+             * uuid
+             **/
+            return telemetry.withTraceId(() => {
+                return this.processPromptChatMessage(data)
+            }, uiEvents?.traceId ?? randomUUID())
+        })
+
+        this.chatControllerMessageListeners.processTabCreatedMessage.onMessage((data) => {
+            return this.processTabCreateMessage(data)
+        })
+
+        this.chatControllerMessageListeners.processTabClosedMessage.onMessage((data) => {
+            return this.processTabCloseMessage(data)
+        })
+
+        this.chatControllerMessageListeners.processTabChangedMessage.onMessage((data) => {
+            return this.processTabChangedMessage(data)
+        })
+
+        this.chatControllerMessageListeners.processInsertCodeAtCursorPosition.onMessage((data) => {
+            return this.processInsertCodeAtCursorPosition(data)
+        })
+
+        this.chatControllerMessageListeners.processAcceptDiff.onMessage((data) => {
+            return this.processAcceptDiff(data)
+        })
+
+        this.chatControllerMessageListeners.processViewDiff.onMessage((data) => {
+            return this.processViewDiff(data)
+        })
+
+        this.chatControllerMessageListeners.processCopyCodeToClipboard.onMessage((data) => {
+            return this.processCopyCodeToClipboard(data)
+        })
+
+        this.chatControllerMessageListeners.processContextMenuCommand.onMessage((data) => {
+            return this.processContextMenuCommand(data)
+        })
+
+        this.chatControllerMessageListeners.processTriggerTabIDReceived.onMessage((data) => {
+            return this.processTriggerTabIDReceived(data)
+        })
+
+        this.chatControllerMessageListeners.processStopResponseMessage.onMessage((data) => {
+            return this.processStopResponseMessage(data)
+        })
+
+        this.chatControllerMessageListeners.processChatItemVotedMessage.onMessage((data) => {
+            return this.processChatItemVotedMessage(data)
+        })
+
+        this.chatControllerMessageListeners.processChatItemFeedbackMessage.onMessage((data) => {
+            return this.processChatItemFeedbackMessage(data)
+        })
+
+        this.chatControllerMessageListeners.processUIFocusMessage.onMessage((data) => {
+            return this.processUIFocusMessage(data)
+        })
+
+        this.chatControllerMessageListeners.processSourceLinkClick.onMessage((data) => {
+            return this.processSourceLinkClick(data)
+        })
+        this.chatControllerMessageListeners.processResponseBodyLinkClick.onMessage((data) => {
+            return this.processResponseBodyLinkClick(data)
+        })
+        this.chatControllerMessageListeners.processFooterInfoLinkClick.onMessage((data) => {
+            return this.processFooterInfoLinkClick(data)
+        })
+        this.chatControllerMessageListeners.processContextCommandUpdateMessage.onMessage(() => {
+            return this.processContextCommandUpdateMessage()
+        })
+        this.chatControllerMessageListeners.processQuickCommandGroupActionClicked.onMessage((data) => {
+            return this.processQuickCommandGroupActionClicked(data)
+        })
+        this.chatControllerMessageListeners.processCustomFormAction.onMessage((data) => {
+            return this.processCustomFormAction(data)
+        })
+        this.chatControllerMessageListeners.processContextSelected.onMessage((data) => {
+            return this.processContextSelected(data)
+        })
+        this.chatControllerMessageListeners.processFileClick.onMessage((data) => {
+            return this.processFileClickMessage(data)
+        })
+        this.chatControllerMessageListeners.processTabBarButtonClick.onMessage((data) => {
+            return this.tabBarController.processTabBarButtonClick(data)
+        })
+        this.chatControllerMessageListeners.processSaveChat.onMessage((data) => {
+            return this.tabBarController.processSaveChat(data)
+        })
+        this.chatControllerMessageListeners.processDetailedListActionClickMessage.onMessage((data) => {
+            return this.tabBarController.processActionClickMessage(data)
+        })
+        this.chatControllerMessageListeners.processDetailedListFilterChangeMessage.onMessage((data) => {
+            return this.tabBarController.processFilterChangeMessage(data)
+        })
+        this.chatControllerMessageListeners.processDetailedListItemSelectMessage.onMessage((data) => {
+            return this.tabBarController.processItemSelectMessage(data)
+        })
+        AuthUtil.instance.regionProfileManager.onDidChangeRegionProfile(() => {
+            this.sessionStorage.deleteAllSessions()
+        })
+    }
+
+    private registerUserPromptsWatcher() {
+        if (this.userPromptsWatcher) {
+            return
+        }
+        this.userPromptsWatcher = vscode.workspace.createFileSystemWatcher(
+            new vscode.RelativePattern(vscode.Uri.file(getUserPromptsDirectory()), `*${promptFileExtension}`),
+            false,
+            true,
+            false
+        )
+        this.userPromptsWatcher.onDidCreate(() => this.processContextCommandUpdateMessage())
+        this.userPromptsWatcher.onDidDelete(() => this.processContextCommandUpdateMessage())
+        globals.context.subscriptions.push(this.userPromptsWatcher)
+    }
+
+    private processFooterInfoLinkClick(click: FooterInfoLinkClick) {
+        this.openLinkInExternalBrowser(click)
+    }
+
+    private openLinkInExternalBrowser(
+        click: ResponseBodyLinkClickMessage | SourceLinkClickMessage | FooterInfoLinkClick
+    ) {
+        this.telemetryHelper.recordInteractWithMessage(click)
+        void openUrl(Uri.parse(click.link))
+    }
+
+    private processResponseBodyLinkClick(click: ResponseBodyLinkClickMessage) {
+        this.openLinkInExternalBrowser(click)
+    }
+
+    private processSourceLinkClick(click: SourceLinkClickMessage) {
+        this.openLinkInExternalBrowser(click)
+    }
+
+    private processQuickActionCommand(message: PromptMessage) {
+        this.editorContextExtractor
+            .extractContextForTrigger('QuickAction')
+            .then((context) => {
+                const triggerID = randomUUID()
+
+                const quickActionCommand = message.command as ChatPromptCommandType
+
+                this.messenger.sendQuickActionMessage(quickActionCommand, triggerID)
+
+                this.triggerEventsStorage.addTriggerEvent({
+                    id: triggerID,
+                    tabID: message.tabID,
+                    message: undefined,
+                    type: 'quick_action',
+                    quickAction: quickActionCommand,
+                    context,
+                })
+
+                if (quickActionCommand === 'help') {
+                    void this.generateStaticTextResponse('quick-action-help', triggerID)
+                    recordTelemetryChatRunCommand('help')
+                    return
+                }
+            })
+            .catch((e) => {
+                this.processException(e, '')
+            })
+    }
+
+    private async processChatItemFeedbackMessage(message: ChatItemFeedbackMessage) {
+        await this.telemetryHelper.recordFeedback(message)
+    }
+
+    private async processChatItemVotedMessage(message: ChatItemVotedMessage) {
+        this.telemetryHelper.recordInteractWithMessage(message)
+    }
+
+    private async processStopResponseMessage(message: StopResponseMessage) {
+        const session = this.sessionStorage.getSession(message.tabID)
+        session.tokenSource.cancel()
+    }
+
+    private async processTriggerTabIDReceived(message: TriggerTabIDReceived) {
+        this.triggerEventsStorage.updateTriggerEventTabIDFromUnknown(message.triggerID, message.tabID)
+    }
+
+    private async processInsertCodeAtCursorPosition(message: InsertCodeAtCursorPosition) {
+        this.editorContentController.insertTextAtCursorPosition(message.code, (editor, cursorStart) => {
+            CodeWhispererTracker.getTracker().enqueue({
+                conversationID: this.telemetryHelper.getConversationId(message.tabID) ?? '',
+                messageID: message.messageId,
+                userIntent: message.userIntent,
+                time: new Date(),
+                fileUrl: editor.document.uri,
+                startPosition: cursorStart,
+                endPosition: editor.selection.active,
+                originalString: message.code,
+            })
+        })
+        this.telemetryHelper.recordInteractWithMessage(message)
+    }
+
+    private async processAcceptDiff(message: AcceptDiff) {
+        const context = this.triggerEventsStorage.getTriggerEvent((message.data as any)?.triggerID) || ''
+        this.editorContentController
+            .acceptDiff({ ...message, ...context })
+            .then(() => {
+                this.telemetryHelper.recordInteractWithMessage(message)
+            })
+            .catch((error) => {
+                this.telemetryHelper.recordInteractWithMessage(message, { result: 'Failed' })
+            })
+    }
+
+    private async processViewDiff(message: ViewDiff) {
+        const context = this.triggerEventsStorage.getTriggerEvent((message.data as any)?.triggerID) || ''
+        this.editorContentController
+            .viewDiff({ ...message, ...context })
+            .then(() => {
+                this.telemetryHelper.recordInteractWithMessage(message)
+            })
+            .catch((error) => {
+                this.telemetryHelper.recordInteractWithMessage(message, { result: 'Failed' })
+            })
+    }
+
+    private async processCopyCodeToClipboard(message: CopyCodeToClipboard) {
+        this.telemetryHelper.recordInteractWithMessage(message)
+    }
+
+    private async processTabCreateMessage(message: TabCreatedMessage) {
+        // this.telemetryHelper.recordOpenChat(message.tabOpenInteractionType)
+    }
+
+    private async processTabCloseMessage(message: TabClosedMessage) {
+        this.sessionStorage.deleteSession(message.tabID)
+        this.triggerEventsStorage.removeTabEvents(message.tabID)
+        // this.telemetryHelper.recordCloseChat(message.tabID)
+        this.chatHistoryDb.updateTabOpenState(message.tabID, false)
+    }
+
+    private async processTabChangedMessage(message: TabChangedMessage) {
+        if (message.prevTabID) {
+            this.telemetryHelper.recordExitFocusConversation(message.prevTabID)
+        }
+        this.telemetryHelper.recordEnterFocusConversation(message.tabID)
+    }
+
+    private async processUIFocusMessage(message: UIFocusMessage) {
+        switch (message.type) {
+            case 'focus':
+                this.telemetryHelper.recordEnterFocusChat()
+                break
+            case 'blur':
+                this.telemetryHelper.recordExitFocusChat()
+                break
+        }
+    }
+
+    private async processContextCommandUpdateMessage() {
+        // when UI is ready, refresh the context commands
+        this.tabBarController.loadChats()
+        this.registerUserPromptsWatcher()
+        const contextCommand: MynahUIDataModel['contextCommands'] = [
+            {
+                commands: [
+                    ...workspaceCommand.commands,
+                    {
+                        command: i18n('AWS.amazonq.context.folders.title'),
+                        children: [
+                            {
+                                groupName: i18n('AWS.amazonq.context.folders.title'),
+                                commands: [],
+                            },
+                        ],
+                        description: i18n('AWS.amazonq.context.folders.description'),
+                        icon: 'folder' as MynahIconsType,
+                    },
+                    {
+                        command: i18n('AWS.amazonq.context.files.title'),
+                        children: [
+                            {
+                                groupName: i18n('AWS.amazonq.context.files.title'),
+                                commands: [],
+                            },
+                        ],
+                        description: i18n('AWS.amazonq.context.files.description'),
+                        icon: 'file' as MynahIconsType,
+                    },
+                    {
+                        command: i18n('AWS.amazonq.context.code.title'),
+                        children: [
+                            {
+                                groupName: i18n('AWS.amazonq.context.code.title'),
+                                commands: [],
+                            },
+                        ],
+                        description: i18n('AWS.amazonq.context.code.description'),
+                        icon: 'code-block' as MynahIconsType,
+                    },
+                    {
+                        command: i18n('AWS.amazonq.context.prompts.title'),
+                        children: [
+                            {
+                                groupName: i18n('AWS.amazonq.context.prompts.title'),
+                                commands: [],
+                            },
+                        ],
+                        description: i18n('AWS.amazonq.context.prompts.description'),
+                        icon: 'magic' as MynahIconsType,
+                    },
+                ],
+            },
+        ]
+
+        const feature = FeatureConfigProvider.getFeature(Features.highlightCommand)
+        const commandName = feature?.value.stringValue
+        if (commandName) {
+            const commandDescription = feature.variation
+            contextCommand.push({
+                groupName: 'Additional Commands',
+                commands: [{ command: commandName, description: commandDescription }],
+            })
+        }
+        const promptsCmd: QuickActionCommand = contextCommand[0].commands?.[4]
+
+        // Check for user prompts
+        try {
+            const userPromptsDirectory = getUserPromptsDirectory()
+            const directoryExists = await fs.exists(userPromptsDirectory)
+            if (directoryExists) {
+                const systemPromptFiles = await fs.readdir(userPromptsDirectory)
+                promptsCmd.children?.[0].commands.push(
+                    ...systemPromptFiles
+                        .filter(([name]) => name.endsWith(promptFileExtension))
+                        .map(([name]) => ({
+                            command: path.basename(name, promptFileExtension),
+                            icon: 'magic' as MynahIconsType,
+                            id: 'prompt',
+                            // label: 'file' as ContextCommandItemType,
+                            route: [userPromptsDirectory, name],
+                        }))
+                )
+            }
+        } catch (e) {
+            getLogger().verbose(`Could not read prompts from ~/.aws/prompts: ${e}`)
+        }
+
+        // Add create prompt button to the bottom of the prompts list
+        promptsCmd.children?.[0].commands.push({
+            command: i18n('AWS.amazonq.savedPrompts.action'),
+            id: createSavedPromptCommandId,
+            icon: 'list-add' as MynahIconsType,
+        })
+
+        this.messenger.sendContextCommandData(contextCommand)
+    }
+
+    private handlePromptCreate(tabID: string) {
+        this.messenger.showCustomForm(
+            tabID,
+            [
+                {
+                    id: 'prompt-name',
+                    type: 'textinput',
+                    mandatory: true,
+                    autoFocus: true,
+                    title: i18n('AWS.amazonq.savedPrompts.title'),
+                    placeholder: i18n('AWS.amazonq.savedPrompts.placeholder'),
+                    description: i18n('AWS.amazonq.savedPrompts.description'),
+                },
+            ],
+            [
+                { id: 'cancel-create-prompt', text: i18n('AWS.generic.cancel'), status: 'clear' },
+                { id: 'submit-create-prompt', text: i18n('AWS.amazonq.savedPrompts.create'), status: 'main' },
+            ],
+            `Create a saved prompt`
+        )
+    }
+
+    private processQuickCommandGroupActionClicked(message: QuickCommandGroupActionClick) {
+        if (message.actionId === createSavedPromptCommandId) {
+            this.handlePromptCreate(message.tabID)
+        }
+    }
+
+    private async processCustomFormAction(message: CustomFormActionMessage) {
+        if (message.action.id === 'submit-create-prompt') {
+            const userPromptsDirectory = getUserPromptsDirectory()
+
+            const title = message.action.formItemValues?.['prompt-name']
+            const newFilePath = path.join(
+                userPromptsDirectory,
+                title ? `${title}${promptFileExtension}` : `default${promptFileExtension}`
+            )
+            const newFileContent = new Uint8Array(Buffer.from(''))
+            await fs.writeFile(newFilePath, newFileContent, { mode: 0o600 })
+            const newFileDoc = await vscode.workspace.openTextDocument(newFilePath)
+            await vscode.window.showTextDocument(newFileDoc)
+            telemetry.ui_click.emit({ elementId: 'amazonq_createSavedPrompt' })
+        }
+    }
+
+    private async processContextSelected(message: ContextSelectedMessage) {
+        if (message.tabID && message.contextItem.id === createSavedPromptCommandId) {
+            this.handlePromptCreate(message.tabID)
+        }
+    }
+    private async processFileClickMessage(message: FileClick) {
+        const session = this.sessionStorage.getSession(message.tabID)
+        const lineRanges = session.contexts.get(message.filePath)
+
+        if (!lineRanges) {
+            return
+        }
+
+        // Check if clicked file is in a different workspace root
+        const projectRoot =
+            session.relativePathToWorkspaceRoot.get(message.filePath) || workspace.workspaceFolders?.[0]?.uri.fsPath
+        if (!projectRoot) {
+            return
+        }
+        let absoluteFilePath = path.join(projectRoot, message.filePath)
+
+        // Handle clicking on a user prompt outside the workspace
+        if (message.filePath.endsWith(promptFileExtension)) {
+            try {
+                await vscode.workspace.fs.stat(vscode.Uri.file(absoluteFilePath))
+            } catch {
+                absoluteFilePath = path.join(getUserPromptsDirectory(), message.filePath)
+            }
+        }
+
+        try {
+            // Open the file in VSCode
+            const document = await workspace.openTextDocument(absoluteFilePath)
+            const editor = await window.showTextDocument(document, ViewColumn.Active)
+
+            // Create multiple selections based on line ranges
+            const selections: Selection[] = lineRanges
+                .filter(({ first, second }) => first !== -1 && second !== -1)
+                .map(({ first, second }) => {
+                    const startPosition = new Position(first - 1, 0) // Convert 1-based to 0-based
+                    const endPosition = new Position(second - 1, document.lineAt(second - 1).range.end.character)
+                    return new Selection(
+                        startPosition.line,
+                        startPosition.character,
+                        endPosition.line,
+                        endPosition.character
+                    )
+                })
+
+            // Apply multiple selections to the editor
+            if (selections.length > 0) {
+                editor.selection = selections[0] // Set the first selection as active
+                editor.selections = selections // Apply multiple selections
+                editor.revealRange(selections[0], vscode.TextEditorRevealType.InCenter)
+            }
+        } catch (error) {}
+    }
+
+    private processException(e: any, tabID: string) {
+        let errorMessage = ''
+        let requestID = undefined
+        const defaultMessage = 'Failed to get response'
+        if (typeof e === 'string') {
+            errorMessage = e.toUpperCase()
+        } else if (e instanceof SyntaxError) {
+            // Workaround to handle case when LB returns web-page with error and our client doesn't return proper exception
+            errorMessage = AwsClientResponseError.tryExtractReasonFromSyntaxError(e) ?? defaultMessage
+        } else if (e instanceof CodeWhispererStreamingServiceException) {
+            errorMessage = e.message
+            requestID = e.$metadata.requestId
+        } else if (e instanceof Error) {
+            errorMessage = e.message
+        }
+
+        this.messenger.sendErrorMessage(errorMessage, tabID, requestID)
+        getLogger().error(`error: ${errorMessage} tabID: ${tabID} requestID: ${requestID}`)
+
+        this.sessionStorage.deleteSession(tabID)
+    }
+
+    private async processContextMenuCommand(command: EditorContextCommand) {
+        // Just open the chat panel in this case
+        if (!this.editorContextExtractor.isCodeBlockSelected() && command.type === 'aws.amazonq.sendToPrompt') {
+            return
+        }
+
+        this.editorContextExtractor
+            .extractContextForTrigger('ContextMenu')
+            .then(async (context) => {
+                const triggerID = randomUUID()
+                if (command.type === 'aws.amazonq.generateUnitTests') {
+                    DefaultAmazonQAppInitContext.instance.getAppsToWebViewMessagePublisher().publish({
+                        sender: 'testChat',
+                        command: 'test',
+                        type: 'chatMessage',
+                    })
+                    // For non-supported languages, we'll just open the standard chat.
+                    return
+                }
+
+                if (context?.focusAreaContext?.codeBlock === undefined) {
+                    throw 'Sorry, I cannot help with the selected language code snippet'
+                }
+
+                const prompt = this.promptGenerator.generateForContextMenuCommand(command)
+
+                if (command.type === 'aws.amazonq.explainIssue') {
+                    this.messenger.sendEditorContextCommandMessage(
+                        command.type,
+                        context.activeFileContext?.fileText
+                            ?.split('\n')
+                            .slice(command.issue.startLine, command.issue.endLine)
+                            .join('') ?? '',
+                        triggerID,
+                        command.issue
+                    )
+                } else {
+                    this.messenger.sendEditorContextCommandMessage(
+                        command.type,
+                        context?.focusAreaContext?.codeBlock ?? '',
+                        triggerID
+                    )
+                }
+
+                if (command.type === 'aws.amazonq.sendToPrompt') {
+                    // No need for response if send the code to prompt
+                    return
+                }
+
+                this.triggerEventsStorage.addTriggerEvent({
+                    id: triggerID,
+                    tabID: undefined,
+                    message: prompt,
+                    type: 'editor_context_command',
+                    context,
+                    command,
+                })
+
+                return this.generateResponse(
+                    {
+                        message: prompt,
+                        trigger: ChatTriggerType.ChatMessage,
+                        query: undefined,
+                        codeSelection: context?.focusAreaContext?.selectionInsideExtendedCodeBlock,
+                        fileText: context?.focusAreaContext?.extendedCodeBlock ?? '',
+                        fileLanguage: context?.activeFileContext?.fileLanguage,
+                        filePath: context?.activeFileContext?.filePath,
+                        matchPolicy: context?.activeFileContext?.matchPolicy,
+                        codeQuery: context?.focusAreaContext?.names,
+                        userIntent: this.userIntentRecognizer.getFromContextMenuCommand(command),
+                        customization: getSelectedCustomization(),
+                        profile: AuthUtil.instance.regionProfileManager.activeRegionProfile,
+                        additionalContents: [],
+                        relevantTextDocuments: [],
+                        documentReferences: [],
+                        useRelevantDocuments: false,
+                        contextLengths: {
+                            ...defaultContextLengths,
+                        },
+                        context: [],
+                    },
+                    triggerID
+                )
+            })
+            .catch((e) => {
+                this.processException(e, '')
+            })
+    }
+
+    private async processPromptChatMessage(message: PromptMessage) {
+        if (message.message === undefined) {
+            this.messenger.sendErrorMessage('chatMessage should be set', message.tabID, undefined)
+            return
+        }
+        try {
+            switch (message.command) {
+                case 'follow-up-was-clicked':
+                    await this.processFollowUp(message)
+                    this.telemetryHelper.recordInteractWithMessage(message)
+                    break
+                case 'onboarding-page-cwc-button-clicked':
+                case 'chat-prompt':
+                    await this.processPromptMessageAsNewThread(message)
+                    break
+                default:
+                    await this.processCommandMessage(message)
+            }
+        } catch (e) {
+            this.processException(e, message.tabID)
+        }
+    }
+
+    private async processCommandMessage(message: PromptMessage) {
+        if (message.command === undefined) {
+            return
+        }
+        switch (message.command) {
+            case 'clear':
+                this.sessionStorage.deleteSession(message.tabID)
+                this.triggerEventsStorage.removeTabEvents(message.tabID)
+                recordTelemetryChatRunCommand('clear')
+                this.chatHistoryDb.clearTab(message.tabID)
+                return
+            default:
+                this.processQuickActionCommand(message)
+        }
+    }
+
+    private async processFollowUp(message: PromptMessage) {
+        try {
+            const lastTriggerEvent = this.triggerEventsStorage.getLastTriggerEventByTabID(message.tabID)
+
+            if (lastTriggerEvent === undefined) {
+                throw "It's impossible to ask follow-ups on empty tabs"
+            }
+
+            const triggerID = randomUUID()
+            this.triggerEventsStorage.addTriggerEvent({
+                id: triggerID,
+                tabID: message.tabID,
+                message: message.message,
+                type: 'follow_up',
+                context: lastTriggerEvent.context,
+            })
+
+            return this.generateResponse(
+                {
+                    message: message.message ?? '',
+                    trigger: ChatTriggerType.ChatMessage,
+                    query: message.message,
+                    codeSelection: lastTriggerEvent.context?.focusAreaContext?.selectionInsideExtendedCodeBlock,
+                    fileText: lastTriggerEvent.context?.focusAreaContext?.extendedCodeBlock ?? '',
+                    fileLanguage: lastTriggerEvent.context?.activeFileContext?.fileLanguage,
+                    filePath: lastTriggerEvent.context?.activeFileContext?.filePath,
+                    matchPolicy: lastTriggerEvent.context?.activeFileContext?.matchPolicy,
+                    codeQuery: lastTriggerEvent.context?.focusAreaContext?.names,
+                    userIntent: message.userIntent,
+                    customization: getSelectedCustomization(),
+                    profile: AuthUtil.instance.regionProfileManager.activeRegionProfile,
+                    contextLengths: {
+                        ...defaultContextLengths,
+                    },
+                    relevantTextDocuments: [],
+                    additionalContents: [],
+                    documentReferences: [],
+                    useRelevantDocuments: false,
+                    context: [],
+                },
+                triggerID
+            )
+        } catch (e) {
+            this.processException(e, message.tabID)
+        }
+    }
+
+    private async processPromptMessageAsNewThread(message: PromptMessage) {
+        this.editorContextExtractor
+            .extractContextForTrigger('ChatMessage')
+            .then((context) => {
+                const triggerID = randomUUID()
+                this.triggerEventsStorage.addTriggerEvent({
+                    id: triggerID,
+                    tabID: message.tabID,
+                    message: message.message,
+                    type: 'chat_message',
+                    context,
+                })
+                return this.generateResponse(
+                    {
+                        message: message.message ?? '',
+                        trigger: ChatTriggerType.ChatMessage,
+                        query: message.message,
+                        codeSelection: context?.focusAreaContext?.selectionInsideExtendedCodeBlock,
+                        fileText: context?.focusAreaContext?.extendedCodeBlock ?? '',
+                        fileLanguage: context?.activeFileContext?.fileLanguage,
+                        filePath: context?.activeFileContext?.filePath,
+                        matchPolicy: context?.activeFileContext?.matchPolicy,
+                        codeQuery: context?.focusAreaContext?.names,
+                        userIntent: this.userIntentRecognizer.getFromPromptChatMessage(message),
+                        customization: getSelectedCustomization(),
+                        profile: AuthUtil.instance.regionProfileManager.activeRegionProfile,
+                        context: message.context ?? [],
+                        relevantTextDocuments: [],
+                        additionalContents: [],
+                        documentReferences: [],
+                        useRelevantDocuments: false,
+                        contextLengths: {
+                            ...defaultContextLengths,
+                        },
+                    },
+                    triggerID
+                )
+            })
+            .catch((e) => {
+                this.processException(e, message.tabID)
+            })
+    }
+
+    private async generateStaticTextResponse(responseType: StaticTextResponseType, triggerID: string) {
+        // Loop while we waiting for tabID to be set
+        const triggerEvent = this.triggerEventsStorage.getTriggerEvent(triggerID)
+        if (triggerEvent === undefined) {
+            return
+        }
+
+        if (triggerEvent.tabID === 'no-available-tabs') {
+            return
+        }
+
+        if (triggerEvent.tabID === undefined) {
+            setTimeout(() => {
+                this.generateStaticTextResponse(responseType, triggerID).catch((e) => {
+                    getLogger().error('generateStaticTextResponse failed: %s', (e as Error).message)
+                })
+            }, 20)
+            return
+        }
+
+        const tabID = triggerEvent.tabID
+
+        const credentialsState = await AuthUtil.instance.getChatAuthState()
+
+        if (credentialsState.codewhispererChat !== 'connected' && credentialsState.codewhispererCore !== 'connected') {
+            await this.messenger.sendAuthNeededExceptionMessage(credentialsState, tabID, triggerID)
+            return
+        }
+
+        this.messenger.sendStaticTextResponse(responseType, triggerID, tabID)
+    }
+
+    /**
+     * @returns A Uri array of prompt files in each workspace root's .amazonq/rules directory
+     */
+    private async collectWorkspaceRules(): Promise<string[]> {
+        const rulesFiles: string[] = []
+
+        if (!vscode.workspace.workspaceFolders) {
+            return rulesFiles
+        }
+
+        for (const folder of vscode.workspace.workspaceFolders) {
+            const rulesPath = path.join(folder.uri.fsPath, '.amazonq', 'rules')
+            const folderExists = await fs.exists(rulesPath)
+
+            if (folderExists) {
+                const entries = await fs.readdir(rulesPath)
+
+                for (const [name, type] of entries) {
+                    if (type === vscode.FileType.File && name.endsWith(promptFileExtension)) {
+                        rulesFiles.push(path.join(rulesPath, name))
+                    }
+                }
+            }
+        }
+
+        return rulesFiles
+    }
+
+    private async resolveContextCommandPayload(triggerPayload: TriggerPayload, session: ChatSession) {
+        const contextCommands: any[] = []
+
+        // Check for workspace rules to add to context
+        const workspaceRules = await this.collectWorkspaceRules()
+        if (workspaceRules.length > 0) {
+            contextCommands.push(
+                ...workspaceRules.map((rule) => {
+                    const workspaceFolderPath =
+                        vscode.workspace.getWorkspaceFolder(vscode.Uri.parse(rule))?.uri?.path || ''
+                    return {
+                        workspaceFolder: workspaceFolderPath,
+                        type: 'file' as any,
+                        relativePath: path.relative(workspaceFolderPath, rule),
+                    }
+                })
+            )
+        }
+        triggerPayload.workspaceRulesCount = workspaceRules.length
+
+        for (const context of triggerPayload.context) {
+            if (typeof context !== 'string' && context.route && context.route.length === 2) {
+                contextCommands.push({
+                    workspaceFolder: context.route[0] || '',
+                    type: (context.label || '') as any,
+                    relativePath: context.route[1] || '',
+                    id: context.id,
+                })
+            }
+        }
+
+        if (contextCommands.length === 0) {
+            return []
+        }
+        const workspaceFolders = (vscode.workspace.workspaceFolders ?? []).map((folder) => folder.uri.fsPath)
+        if (!workspaceFolders) {
+            return []
+        }
+        workspaceFolders.sort()
+    }
+
+    private async generateResponse(
+        triggerPayload: TriggerPayload & { projectContextQueryLatencyMs?: number },
+        triggerID: string
+    ) {
+        const triggerEvent = this.triggerEventsStorage.getTriggerEvent(triggerID)
+        if (triggerEvent === undefined) {
+            return
+        }
+
+        if (triggerEvent.tabID === 'no-available-tabs') {
+            return
+        }
+
+        if (triggerEvent.tabID === undefined) {
+            setTimeout(() => {
+                this.generateResponse(triggerPayload, triggerID).catch((e) => {
+                    getLogger().error('generateResponse failed: %s', (e as Error).message)
+                })
+            }, 20)
+            return
+        }
+
+        const tabID = triggerEvent.tabID
+
+        const credentialsState = await AuthUtil.instance.getChatAuthState()
+
+        if (
+            !(credentialsState.codewhispererChat === 'connected' && credentialsState.codewhispererCore === 'connected')
+        ) {
+            await this.messenger.sendAuthNeededExceptionMessage(credentialsState, tabID, triggerID)
+            return
+        }
+
+        const session = this.sessionStorage.getSession(tabID)
+        if (!session.localHistoryHydrated) {
+            triggerPayload.history = this.chatHistoryDb.getMessages(triggerEvent.tabID, 10)
+            session.localHistoryHydrated = true
+        }
+        await this.resolveContextCommandPayload(triggerPayload, session)
+        triggerPayload.useRelevantDocuments = triggerPayload.context.some(
+            (context) => typeof context !== 'string' && context.command === '@workspace'
+        )
+        if (triggerPayload.useRelevantDocuments) {
+            triggerPayload.message = triggerPayload.message.replace(/@workspace/, '')
+            if (CodeWhispererSettings.instance.isLocalIndexEnabled()) {
+            } else {
+                this.messenger.sendOpenSettingsMessage(triggerID, tabID)
+                return
+            }
+        }
+
+        triggerPayload.contextLengths.userInputContextLength = triggerPayload.message.length
+        triggerPayload.contextLengths.focusFileContextLength = triggerPayload.fileText.length
+        const request = triggerPayloadToChatRequest(triggerPayload)
+        triggerPayload.documentReferences = this.mergeRelevantTextDocuments(triggerPayload.relevantTextDocuments)
+
+        // Update context transparency after it's truncated dynamically to show users only the context sent.
+        const relativePathsOfMergedRelevantDocuments = triggerPayload.documentReferences.map(
+            (doc) => doc.relativeFilePath
+        )
+        const seen: string[] = []
+        for (const additionalContent of triggerPayload.additionalContents) {
+            const relativePath = additionalContent.relativePath
+            if (!relativePathsOfMergedRelevantDocuments.includes(relativePath) && !seen.includes(relativePath)) {
+                triggerPayload.documentReferences.push({
+                    relativeFilePath: relativePath,
+                    lineRanges:
+                        additionalContent.name === 'symbol'
+                            ? [{ first: additionalContent.startLine, second: additionalContent.endLine }]
+                            : [{ first: -1, second: -1 }],
+                })
+                seen.push(relativePath)
+            }
+        }
+        for (const doc of triggerPayload.documentReferences) {
+            session.contexts.set(doc.relativeFilePath, doc.lineRanges)
+        }
+
+        getLogger().debug(
+            `request from tab: ${tabID} conversationID: ${session.sessionIdentifier} request: ${inspect(request, {
+                depth: 12,
+            })}`
+        )
+        let response: MessengerResponseType | undefined = undefined
+        session.createNewTokenSource()
+        // TODO: onProfileChanged, abort previous response?
+        try {
+            this.messenger.sendInitalStream(tabID, triggerID, triggerPayload.documentReferences)
+            this.telemetryHelper.setConversationStreamStartTime(tabID)
+            if (isSsoConnection(AuthUtil.instance.conn)) {
+                const { $metadata, generateAssistantResponseResponse } = await session.chatSso(request)
+                response = {
+                    $metadata: $metadata,
+                    message: generateAssistantResponseResponse,
+                }
+            } else {
+                const { $metadata, sendMessageResponse } = await session.chatIam(request as SendMessageRequest)
+                response = {
+                    $metadata: $metadata,
+                    message: sendMessageResponse,
+                }
+            }
+            this.telemetryHelper.recordEnterFocusConversation(triggerEvent.tabID)
+            this.telemetryHelper.recordStartConversation(triggerEvent, triggerPayload)
+            if (session.sessionIdentifier) {
+                this.chatHistoryDb.addMessage(tabID, 'cwc', session.sessionIdentifier, {
+                    body: triggerPayload.message,
+                    type: 'prompt' as any,
+                })
+            }
+
+            getLogger().info(
+                `response to tab: ${tabID} conversationID: ${session.sessionIdentifier} requestID: ${
+                    response.$metadata.requestId
+                } metadata: ${inspect(response.$metadata, { depth: 12 })}`
+            )
+            this.cancelTokenSource = new vscode.CancellationTokenSource()
+            await this.messenger.sendAIResponse(
+                response,
+                session,
+                tabID,
+                triggerID,
+                triggerPayload,
+                this.cancelTokenSource.token
+            )
+        } catch (e: any) {
+            this.telemetryHelper.recordMessageResponseError(triggerPayload, tabID, getHttpStatusCode(e) ?? 0)
+            // clears session, record telemetry before this call
+            this.processException(e, tabID)
+        }
+    }
+
+    private mergeRelevantTextDocuments(documents: RelevantTextDocumentAddition[]): DocumentReference[] {
+        if (documents.length === 0) {
+            return []
+        }
+        return Object.entries(
+            documents.reduce<Record<string, { first: number; second: number }[]>>((acc, doc) => {
+                if (!doc.relativeFilePath || doc.startLine === undefined || doc.endLine === undefined) {
+                    return acc // Skip invalid documents
+                }
+
+                if (!acc[doc.relativeFilePath]) {
+                    acc[doc.relativeFilePath] = []
+                }
+                acc[doc.relativeFilePath].push({ first: doc.startLine, second: doc.endLine })
+                return acc
+            }, {})
+        ).map(([filePath, ranges]) => {
+            // Sort by startLine
+            const sortedRanges = ranges.sort((a, b) => a.first - b.first)
+
+            const mergedRanges: { first: number; second: number }[] = []
+            for (const { first, second } of sortedRanges) {
+                if (mergedRanges.length === 0 || mergedRanges[mergedRanges.length - 1].second < first - 1) {
+                    // If no overlap, add new range
+                    mergedRanges.push({ first, second })
+                } else {
+                    // Merge overlapping or consecutive ranges
+                    mergedRanges[mergedRanges.length - 1].second = Math.max(
+                        mergedRanges[mergedRanges.length - 1].second,
+                        second
+                    )
+                }
+            }
+
+            return { relativeFilePath: filePath, lineRanges: mergedRanges }
+        })
+    }
+}
diff --git a/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts b/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts
new file mode 100644
index 00000000000..ab059ecb22d
--- /dev/null
+++ b/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts
@@ -0,0 +1,567 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { waitUntil } from '../../../../shared/utilities/timeoutUtils'
+import {
+    AppToWebViewMessageDispatcher,
+    AuthNeededException,
+    CodeReference,
+    ContextCommandData,
+    EditorContextCommandMessage,
+    ExportChatMessage,
+    OpenSettingsMessage,
+    OpenDetailedListMessage,
+    QuickActionMessage,
+    RestoreTabMessage,
+    ShowCustomFormMessage,
+    UpdateDetailedListMessage,
+    CloseDetailedListMessage,
+    SelectTabMessage,
+} from '../../../view/connector/connector'
+import { EditorContextCommandType } from '../../../commands/registerCommands'
+import { ChatResponseStream as qdevChatResponseStream } from '@amzn/amazon-q-developer-streaming-client'
+import {
+    ChatResponseStream as cwChatResponseStream,
+    CodeWhispererStreamingServiceException,
+    SupplementaryWebLink,
+} from '@amzn/codewhisperer-streaming'
+import { ChatMessage, ErrorMessage, FollowUp, Suggestion } from '../../../view/connector/connector'
+import { ChatSession } from '../../../clients/chat/v0/chat'
+import { ChatException } from './model'
+import { CWCTelemetryHelper } from '../telemetryHelper'
+import { ChatPromptCommandType, DocumentReference, TriggerPayload } from '../model'
+import { getHttpStatusCode, getRequestId, ToolkitError } from '../../../../shared/errors'
+import { keys } from '../../../../shared/utilities/tsUtils'
+import { getLogger } from '../../../../shared/logger/logger'
+import { FeatureAuthState } from '../../../../codewhisperer/util/authUtil'
+import { CodeScanIssue } from '../../../../codewhisperer/models/model'
+import { marked } from 'marked'
+import { JSDOM } from 'jsdom'
+import { extractCodeBlockLanguage } from '../../../../shared/markdown'
+import { extractAuthFollowUp } from '../../../../amazonq/util/authUtils'
+import { helpMessage } from '../../../../amazonq/webview/ui/texts/constants'
+import { ChatItem, ChatItemButton, ChatItemFormItem, DetailedList, MynahUIDataModel } from '@aws/mynah-ui'
+import { Database } from '../../../../shared/db/chatDb/chatDb'
+import { TabType } from '../../../../amazonq/webview/ui/storages/tabsStorage'
+
+export type StaticTextResponseType = 'quick-action-help' | 'onboarding-help' | 'transform' | 'help'
+
+export type MessengerResponseType = {
+    $metadata: { requestId?: string; httpStatusCode?: number }
+    message?: AsyncIterable<cwChatResponseStream | qdevChatResponseStream>
+}
+
+export class Messenger {
+    chatHistoryDb = Database.getInstance()
+
+    public constructor(
+        private readonly dispatcher: AppToWebViewMessageDispatcher,
+        private readonly telemetryHelper: CWCTelemetryHelper
+    ) {}
+
+    public async sendAuthNeededExceptionMessage(credentialState: FeatureAuthState, tabID: string, triggerID: string) {
+        const { message, authType } = extractAuthFollowUp(credentialState)
+        this.dispatcher.sendAuthNeededExceptionMessage(
+            new AuthNeededException(
+                {
+                    message,
+                    authType,
+                    triggerID,
+                },
+                tabID
+            )
+        )
+    }
+
+    public sendInitalStream(
+        tabID: string,
+        triggerID: string,
+        mergedRelevantDocuments: DocumentReference[] | undefined
+    ) {
+        this.dispatcher.sendChatMessage(
+            new ChatMessage(
+                {
+                    message: '',
+                    messageType: 'answer-stream',
+                    followUps: undefined,
+                    followUpsHeader: undefined,
+                    relatedSuggestions: undefined,
+                    triggerID,
+                    messageID: triggerID,
+                    userIntent: undefined,
+                    codeBlockLanguage: undefined,
+                    contextList: mergedRelevantDocuments,
+                },
+                tabID
+            )
+        )
+    }
+    /**
+     * Tries to calculate the total number of code blocks.
+     * NOTES:
+     *  - Not correct on all examples. Some may cause it to return 0 unexpectedly.
+     *  - Plans in place (as of 4/22/2024) to move this server side.
+     *  - See original pr: https://github.com/aws/aws-toolkit-vscode/pull/4761 for more details.
+     * @param message raw message response from codewhisperer client.
+     * @returns count of multi-line code blocks in response.
+     */
+    public async countTotalNumberOfCodeBlocks(message: string): Promise<number> {
+        // TODO: remove this when moved to server-side.
+        if (message === undefined) {
+            return 0
+        }
+
+        // To Convert Markdown text to HTML using marked library
+        const html = await marked(message)
+
+        const dom = new JSDOM(html)
+        const document = dom.window.document
+
+        // Search for <pre> elements containing <code> elements
+        const codeBlocks = document.querySelectorAll('pre > code')
+
+        return codeBlocks.length
+    }
+
+    public async sendAIResponse(
+        response: MessengerResponseType,
+        session: ChatSession,
+        tabID: string,
+        triggerID: string,
+        triggerPayload: TriggerPayload,
+        cancelToken: vscode.CancellationToken
+    ) {
+        let message = ''
+        const messageID = response.$metadata.requestId ?? ''
+        let codeReference: CodeReference[] = []
+        let followUps: FollowUp[] = []
+        let relatedSuggestions: Suggestion[] = []
+        let codeBlockLanguage: string = 'plaintext'
+
+        if (response.message === undefined) {
+            throw new ToolkitError(
+                `Empty response from CodeWhisperer Streaming service. Request ID: ${response.$metadata.requestId}`
+            )
+        }
+        this.telemetryHelper.setResponseStreamStartTime(tabID)
+
+        let cwsprChatHasProjectContext = false
+        if (
+            triggerPayload.relevantTextDocuments &&
+            triggerPayload.relevantTextDocuments.length > 0 &&
+            triggerPayload.useRelevantDocuments === true
+        ) {
+            cwsprChatHasProjectContext = true
+        }
+        const additionalCounts = this.telemetryHelper.getAdditionalContextCounts(triggerPayload)
+
+        this.telemetryHelper.setResponseFromAdditionalContext(messageID, {
+            cwsprChatHasProjectContext,
+            cwsprChatRuleContextCount: triggerPayload.workspaceRulesCount,
+            cwsprChatFileContextCount: additionalCounts.fileContextCount,
+            cwsprChatFolderContextCount: additionalCounts.folderContextCount,
+            cwsprChatPromptContextCount: additionalCounts.promptContextCount,
+        })
+
+        const eventCounts = new Map<string, number>()
+        waitUntil(
+            async () => {
+                for await (const chatEvent of response.message!) {
+                    if (cancelToken.isCancellationRequested) {
+                        return
+                    }
+                    for (const key of keys(chatEvent)) {
+                        if ((chatEvent[key] as any) !== undefined) {
+                            eventCounts.set(key, (eventCounts.get(key) ?? 0) + 1)
+                        }
+                    }
+
+                    if (session.tokenSource.token.isCancellationRequested) {
+                        return true
+                    }
+
+                    if (
+                        chatEvent.codeReferenceEvent?.references !== undefined &&
+                        chatEvent.codeReferenceEvent.references.length > 0
+                    ) {
+                        codeReference = [
+                            ...codeReference,
+                            ...chatEvent.codeReferenceEvent.references.map((reference) => ({
+                                ...reference,
+                                recommendationContentSpan: {
+                                    start: reference.recommendationContentSpan?.start ?? 0,
+                                    end: reference.recommendationContentSpan?.end ?? 0,
+                                },
+                                information: `Reference code under **${reference.licenseName}** license from repository \`${reference.repository}\``,
+                            })),
+                        ]
+                    }
+
+                    if (
+                        chatEvent.assistantResponseEvent?.content !== undefined &&
+                        chatEvent.assistantResponseEvent.content.length > 0
+                    ) {
+                        message += chatEvent.assistantResponseEvent.content
+                        if (codeBlockLanguage === 'plaintext') {
+                            codeBlockLanguage = extractCodeBlockLanguage(message)
+                        }
+                        this.dispatcher.sendChatMessage(
+                            new ChatMessage(
+                                {
+                                    message: message,
+                                    messageType: 'answer-part',
+                                    followUps: undefined,
+                                    followUpsHeader: undefined,
+                                    relatedSuggestions: undefined,
+                                    codeReference,
+                                    triggerID,
+                                    messageID,
+                                    userIntent: triggerPayload.userIntent,
+                                    codeBlockLanguage: codeBlockLanguage,
+                                    contextList: undefined,
+                                },
+                                tabID
+                            )
+                        )
+                        this.telemetryHelper.setResponseStreamTimeForChunks(tabID)
+                    }
+
+                    if (chatEvent.supplementaryWebLinksEvent?.supplementaryWebLinks !== undefined) {
+                        let suggestionIndex = 0
+                        const newSuggestions: Suggestion[] =
+                            chatEvent.supplementaryWebLinksEvent.supplementaryWebLinks.map(
+                                (s: SupplementaryWebLink) =>
+                                    new Suggestion({
+                                        title: s.title ?? '',
+                                        url: s.url ?? '',
+                                        body: s.snippet ?? '',
+                                        id: suggestionIndex++,
+                                        context: [],
+                                    })
+                            )
+                        relatedSuggestions.push(...newSuggestions)
+                    }
+
+                    if (chatEvent.followupPromptEvent?.followupPrompt !== undefined) {
+                        const followUp = chatEvent.followupPromptEvent.followupPrompt
+                        followUps.push({
+                            type: followUp.userIntent ?? '',
+                            pillText: followUp.content ?? '',
+                            prompt: followUp.content ?? '',
+                        })
+                    }
+                }
+                return true
+            },
+            { timeout: 60000, truthy: true }
+        )
+            .catch((error: any) => {
+                let errorMessage = 'Error reading chat stream.'
+                let statusCode = undefined
+                let requestID = undefined
+
+                if (error instanceof CodeWhispererStreamingServiceException) {
+                    errorMessage = error.message
+                    statusCode = getHttpStatusCode(error) ?? 0
+                    requestID = getRequestId(error)
+                }
+
+                this.showChatExceptionMessage(
+                    { errorMessage, statusCode: statusCode?.toString(), sessionID: undefined },
+                    tabID,
+                    requestID
+                )
+                getLogger().error(`error: ${errorMessage} tabID: ${tabID} requestID: ${requestID}`)
+
+                followUps = []
+                relatedSuggestions = []
+                this.telemetryHelper.recordMessageResponseError(triggerPayload, tabID, statusCode ?? 0)
+            })
+            .finally(async () => {
+                if (session.sessionIdentifier) {
+                    this.chatHistoryDb.addMessage(tabID, 'cwc', session.sessionIdentifier, {
+                        body: message,
+                        type: 'answer' as any,
+                        codeReference: codeReference as any,
+                        relatedContent: { title: 'Sources', content: relatedSuggestions as any },
+                    })
+                }
+                if (triggerPayload.relevantTextDocuments && triggerPayload.relevantTextDocuments.length > 0) {
+                    this.dispatcher.sendChatMessage(
+                        new ChatMessage(
+                            {
+                                message:
+                                    message +
+                                    ` \n\nBy the way, I'm still indexing this project for full context from your workspace. I may have a better response in a few minutes when it's complete if you'd like to try again then.`,
+                                messageType: 'answer-part',
+                                followUps: undefined,
+                                followUpsHeader: undefined,
+                                relatedSuggestions: undefined,
+                                triggerID,
+                                messageID,
+                                userIntent: triggerPayload.userIntent,
+                                codeBlockLanguage: codeBlockLanguage,
+                                contextList: undefined,
+                            },
+                            tabID
+                        )
+                    )
+                }
+
+                if (relatedSuggestions.length !== 0) {
+                    this.dispatcher.sendChatMessage(
+                        new ChatMessage(
+                            {
+                                message: undefined,
+                                messageType: 'answer-part',
+                                followUpsHeader: undefined,
+                                followUps: undefined,
+                                relatedSuggestions,
+                                triggerID,
+                                messageID,
+                                userIntent: triggerPayload.userIntent,
+                                codeBlockLanguage: undefined,
+                                contextList: undefined,
+                            },
+                            tabID
+                        )
+                    )
+                }
+
+                this.dispatcher.sendChatMessage(
+                    new ChatMessage(
+                        {
+                            message: undefined,
+                            messageType: 'answer',
+                            followUps: followUps,
+                            followUpsHeader: undefined,
+                            relatedSuggestions: undefined,
+                            triggerID,
+                            messageID,
+                            userIntent: triggerPayload.userIntent,
+                            codeBlockLanguage: undefined,
+                            contextList: undefined,
+                        },
+                        tabID
+                    )
+                )
+
+                getLogger().info(
+                    `All events received. requestId=%s counts=%s`,
+                    response.$metadata.requestId,
+                    Object.fromEntries(eventCounts)
+                )
+
+                this.telemetryHelper.setResponseStreamTotalTime(tabID)
+
+                const responseCode = response?.$metadata.httpStatusCode ?? 0
+                this.telemetryHelper.recordAddMessage(triggerPayload, {
+                    followUpCount: followUps.length,
+                    suggestionCount: relatedSuggestions.length,
+                    tabID: tabID,
+                    messageLength: message.length,
+                    messageID,
+                    responseCode,
+                    codeReferenceCount: codeReference.length,
+                    totalNumberOfCodeBlocksInResponse: await this.countTotalNumberOfCodeBlocks(message),
+                })
+            })
+    }
+
+    public sendErrorMessage(errorMessage: string | undefined, tabID: string, requestID: string | undefined) {
+        this.showChatExceptionMessage(
+            {
+                errorMessage: errorMessage,
+                sessionID: undefined,
+                statusCode: undefined,
+            },
+            tabID,
+            requestID
+        )
+    }
+
+    private editorContextMenuCommandVerbs: Map<EditorContextCommandType, string> = new Map([
+        ['aws.amazonq.explainCode', 'Explain'],
+        ['aws.amazonq.explainIssue', 'Explain'],
+        ['aws.amazonq.refactorCode', 'Refactor'],
+        ['aws.amazonq.fixCode', 'Fix'],
+        ['aws.amazonq.optimizeCode', 'Optimize'],
+        ['aws.amazonq.sendToPrompt', 'Send to prompt'],
+        ['aws.amazonq.generateUnitTests', 'Generate unit tests for'],
+    ])
+
+    public sendStaticTextResponse(type: StaticTextResponseType, triggerID: string, tabID: string) {
+        let message
+        let followUps
+        let followUpsHeader
+        switch (type) {
+            case 'quick-action-help':
+                message = helpMessage
+                break
+            case 'onboarding-help':
+                message = `### What I can do:
+                \n\n- Answer questions about AWS
+                \n\n- Answer questions about general programming concepts
+                \n\n- Explain what a line of code or code function does
+                \n\n- Write unit tests and code
+                \n\n- Debug and fix code
+                \n\n- Refactor code`
+                followUps = [
+                    {
+                        type: '',
+                        pillText: 'Should I use AWS Lambda or EC2 for a scalable web application backend?',
+                        prompt: 'Should I use AWS Lambda or EC2 for a scalable web application backend?',
+                    },
+                    {
+                        type: '',
+                        pillText: 'What is the syntax of declaring a variable in TypeScript?',
+                        prompt: 'What is the syntax of declaring a variable in TypeScript?',
+                    },
+                    {
+                        type: '',
+                        pillText: 'Write code for uploading a file to an s3 bucket in typescript',
+                        prompt: 'Write code for uploading a file to an s3 bucket in typescript',
+                    },
+                ]
+                followUpsHeader = 'Try Examples:'
+                break
+        }
+
+        this.dispatcher.sendChatMessage(
+            new ChatMessage(
+                {
+                    message,
+                    messageType: 'answer',
+                    followUpsHeader,
+                    followUps,
+                    relatedSuggestions: undefined,
+                    triggerID,
+                    messageID: 'static_message_' + triggerID,
+                    userIntent: undefined,
+                    codeBlockLanguage: undefined,
+                    contextList: undefined,
+                },
+                tabID
+            )
+        )
+    }
+
+    public sendQuickActionMessage(quickAction: ChatPromptCommandType, triggerID: string) {
+        let message = ''
+        switch (quickAction) {
+            case 'help':
+                message = 'How can Amazon Q help me?'
+                break
+        }
+
+        this.dispatcher.sendQuickActionMessage(
+            new QuickActionMessage({
+                message,
+                triggerID,
+            })
+        )
+    }
+
+    public sendEditorContextCommandMessage(
+        command: EditorContextCommandType,
+        selectedCode: string,
+        triggerID: string,
+        issue?: CodeScanIssue
+    ) {
+        // Remove newlines and spaces before and after the code
+        const trimmedCode = selectedCode.trimStart().trimEnd()
+
+        let message
+        if (command === 'aws.amazonq.sendToPrompt') {
+            message = ['\n```\n', trimmedCode, '\n```'].join('')
+        } else if (command === 'aws.amazonq.explainIssue' && issue) {
+            message = [
+                this.editorContextMenuCommandVerbs.get(command),
+                ` the "${issue.title}" issue in the following code:`,
+                '\n```\n',
+                trimmedCode,
+                '\n```',
+            ].join('')
+        } else {
+            message = [
+                this.editorContextMenuCommandVerbs.get(command),
+                ' the following part of my code:',
+                '\n```\n',
+                trimmedCode,
+                '\n```',
+            ].join('')
+        }
+
+        this.dispatcher.sendEditorContextCommandMessage(
+            new EditorContextCommandMessage({ message, triggerID, command })
+        )
+    }
+
+    private showChatExceptionMessage(e: ChatException, tabID: string, requestID: string | undefined) {
+        let message = 'This error is reported to the team automatically. We will attempt to fix it as soon as possible.'
+        if (e.errorMessage !== undefined) {
+            message += `\n\nDetails: ${e.errorMessage}`
+        }
+
+        if (e.statusCode !== undefined) {
+            message += `\n\nStatus Code: ${e.statusCode}`
+        }
+        if (e.sessionID !== undefined) {
+            message += `\n\nSession ID: ${e.sessionID}`
+        }
+        if (requestID !== undefined) {
+            message += `\n\nRequest ID: ${requestID}`
+        }
+
+        this.dispatcher.sendErrorMessage(
+            new ErrorMessage('An error occurred while processing your request.', message.trimEnd().trimStart(), tabID)
+        )
+    }
+
+    public sendOpenSettingsMessage(triggerId: string, tabID: string) {
+        this.dispatcher.sendOpenSettingsMessage(new OpenSettingsMessage(tabID))
+    }
+
+    public sendRestoreTabMessage(historyId: string, tabType: TabType, chats: ChatItem[], exportTab?: boolean) {
+        this.dispatcher.sendRestoreTabMessage(new RestoreTabMessage(historyId, tabType, chats, exportTab))
+    }
+
+    public sendOpenDetailedListMessage(tabId: string, listType: string, data: DetailedList) {
+        this.dispatcher.sendOpenDetailedListMessage(new OpenDetailedListMessage(tabId, listType, data))
+    }
+
+    public sendUpdateDetailedListMessage(listType: string, data: DetailedList) {
+        this.dispatcher.sendUpdateDetailedListMessage(new UpdateDetailedListMessage(listType, data))
+    }
+
+    public sendCloseDetailedListMessage(listType: string) {
+        this.dispatcher.sendCloseDetailedListMessage(new CloseDetailedListMessage(listType))
+    }
+
+    public sendSerializeTabMessage(tabId: string, uri: string, format: 'html' | 'markdown') {
+        this.dispatcher.sendSerializeTabMessage(new ExportChatMessage(tabId, format, uri))
+    }
+
+    public sendSelectTabMessage(tabId: string, eventID?: string) {
+        this.dispatcher.sendSelectTabMessage(new SelectTabMessage(tabId, eventID))
+    }
+
+    public sendContextCommandData(contextCommands: MynahUIDataModel['contextCommands']) {
+        this.dispatcher.sendContextCommandData(new ContextCommandData(contextCommands))
+    }
+
+    public showCustomForm(
+        tabID: string,
+        formItems?: ChatItemFormItem[],
+        buttons?: ChatItemButton[],
+        title?: string,
+        description?: string
+    ) {
+        this.dispatcher.sendShowCustomFormMessage(
+            new ShowCustomFormMessage(tabID, formItems, buttons, title, description)
+        )
+    }
+}
diff --git a/packages/core/src/codewhispererChat/controllers/chat/messenger/model.ts b/packages/core/src/codewhispererChat/controllers/chat/messenger/model.ts
new file mode 100644
index 00000000000..c5d5eb92dd2
--- /dev/null
+++ b/packages/core/src/codewhispererChat/controllers/chat/messenger/model.ts
@@ -0,0 +1,10 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export interface ChatException {
+    readonly errorMessage: string | undefined
+    readonly sessionID: string | undefined
+    readonly statusCode: string | undefined
+}
diff --git a/packages/core/src/codewhispererChat/controllers/chat/model.ts b/packages/core/src/codewhispererChat/controllers/chat/model.ts
new file mode 100644
index 00000000000..04da124aecc
--- /dev/null
+++ b/packages/core/src/codewhispererChat/controllers/chat/model.ts
@@ -0,0 +1,261 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { AdditionalContentEntry, RelevantTextDocument, UserIntent } from '@amzn/codewhisperer-streaming'
+import { MatchPolicy, CodeQuery } from '../../clients/chat/v0/model'
+import { Selection } from 'vscode'
+import { TabOpenType } from '../../../amazonq/webview/ui/storages/tabsStorage'
+import { CodeReference } from '../../view/connector/connector'
+import { Customization } from '../../../codewhisperer/client/codewhispereruserclient'
+import { QuickActionCommand } from '@aws/mynah-ui'
+import { Message } from '../../../shared/db/chatDb/util'
+import { RegionProfile } from '../../../codewhisperer/models/model'
+
+export interface TriggerTabIDReceived {
+    tabID: string
+    triggerID: string
+}
+
+export interface TabCreatedMessage {
+    tabID: string
+    tabOpenInteractionType: TabOpenType
+}
+
+export interface TabClosedMessage {
+    tabID: string
+}
+
+export interface TabChangedMessage {
+    tabID: string
+    prevTabID?: string
+}
+
+export interface UIFocusMessage {
+    command: string
+    type: 'focus' | 'blur'
+}
+
+export interface InsertCodeAtCursorPosition {
+    command: string | undefined
+    tabID: string
+    messageId: string
+    userIntent: UserIntent | undefined
+    code: string
+    insertionTargetType: string | undefined
+    codeReference: CodeReference[] | undefined
+    eventId: string
+    codeBlockIndex: number
+    totalCodeBlocks: number
+    codeBlockLanguage: string
+}
+
+export interface CopyCodeToClipboard {
+    command: string | undefined
+    tabID: string
+    messageId: string
+    userIntent: UserIntent | undefined
+    code: string
+    insertionTargetType: string | undefined
+    codeReference: CodeReference[] | undefined
+    eventId: string
+    codeBlockIndex: number
+    totalCodeBlocks: number
+    codeBlockLanguage: string
+}
+
+export interface AcceptDiff {
+    command: string | undefined
+    tabID: string // rename tabId
+    messageId: string
+    actionId: string
+    data: string
+    code: string
+    referenceTrackerInformation?: CodeReference[]
+    eventId: string
+    codeBlockIndex?: number
+    totalCodeBlocks?: number
+}
+export interface ViewDiff {
+    command: string | undefined
+    tabID: string // rename tabId
+    messageId: string
+    actionId: string
+    data: string
+    code: string
+    referenceTrackerInformation?: CodeReference[]
+    eventId: string
+    codeBlockIndex?: number
+    totalCodeBlocks?: number
+}
+
+export type ChatPromptCommandType =
+    | 'help'
+    | 'clear'
+    | 'follow-up-was-clicked'
+    | 'onboarding-page-cwc-button-clicked'
+    | 'chat-prompt'
+    | 'transform'
+
+export interface PromptMessage {
+    message: string | undefined
+    messageId: string
+    command: ChatPromptCommandType | undefined
+    userIntent: UserIntent | undefined
+    tabID: string
+    context?: string[] | QuickActionCommand[]
+}
+
+export interface PromptAnswer {
+    messageLength: number
+    tabID: string
+    suggestionCount: number
+    followUpCount: number
+    messageID: string
+    responseCode: number
+    codeReferenceCount: number
+    totalNumberOfCodeBlocksInResponse: number
+}
+
+export interface StopResponseMessage {
+    tabID: string
+}
+
+export interface SourceLinkClickMessage {
+    command: string | undefined
+    tabID: string
+    messageId: string
+    link: string
+}
+
+export interface ResponseBodyLinkClickMessage {
+    command: string | undefined
+    tabID: string
+    messageId: string
+    link: string
+}
+
+export interface FooterInfoLinkClick {
+    command: string
+    tabID: string
+    link: string
+}
+
+export interface TabBarButtonClick {
+    tabID: string
+    buttonId: string
+}
+
+export interface SaveChatMessage {
+    serializedChat: string
+    uri: string
+}
+
+export interface QuickCommandGroupActionClick {
+    command: string
+    actionId: string
+    tabID: string
+}
+
+export interface FileClick {
+    command: string
+    tabID: string
+    messageId: string
+    filePath: string
+}
+
+export interface ChatItemVotedMessage {
+    tabID: string
+    command: string
+    vote: 'upvote' | 'downvote'
+    messageId: string
+}
+
+export interface ChatItemFeedbackMessage {
+    messageId: string
+    tabID: string
+    command: string
+    selectedOption: string
+    comment?: string
+}
+
+export enum ChatTriggerType {
+    ChatMessage = 'ChatMessage',
+    InlineChatMessage = 'InlineChatMessage',
+}
+
+export interface TriggerPayload {
+    readonly query: string | undefined
+    readonly codeSelection: Selection | undefined
+    readonly trigger: ChatTriggerType
+    fileText: string
+    readonly fileLanguage: string | undefined
+    readonly filePath: string | undefined
+    message: string
+    readonly matchPolicy: MatchPolicy | undefined
+    readonly codeQuery: CodeQuery | undefined
+    readonly userIntent: UserIntent | undefined
+    readonly customization: Customization
+    readonly profile: RegionProfile | undefined
+    readonly context: string[] | QuickActionCommand[]
+    relevantTextDocuments: RelevantTextDocumentAddition[]
+    additionalContents: AdditionalContentEntryAddition[]
+    // a reference to all documents used in chat payload
+    // for providing better context transparency
+    documentReferences: DocumentReference[]
+    useRelevantDocuments: boolean
+    traceId?: string
+    contextLengths: ContextLengths
+    workspaceRulesCount?: number
+    history?: Message[]
+}
+
+export type ContextLengths = {
+    additionalContextLengths: AdditionalContextLengths
+    truncatedAdditionalContextLengths: AdditionalContextLengths
+    workspaceContextLength: number
+    truncatedWorkspaceContextLength: number
+    userInputContextLength: number
+    truncatedUserInputContextLength: number
+    focusFileContextLength: number
+    truncatedFocusFileContextLength: number
+}
+
+export type AdditionalContextLengths = {
+    fileContextLength: number
+    promptContextLength: number
+    ruleContextLength: number
+}
+
+export type AdditionalContextInfo = {
+    cwsprChatFileContextCount?: number
+    cwsprChatFolderContextCount?: number
+    cwsprChatPromptContextCount?: number
+    cwsprChatRuleContextCount?: number
+    cwsprChatHasProjectContext?: boolean
+}
+
+export type LineInfo = { startLine: number; endLine: number }
+
+// TODO move this to API definition (or just use this across the codebase)
+export type RelevantTextDocumentAddition = RelevantTextDocument & LineInfo
+
+export type AdditionalContentEntryAddition = AdditionalContentEntry & { type: string; relativePath: string } & LineInfo
+
+export interface DocumentReference {
+    readonly relativeFilePath: string
+    readonly lineRanges: Array<{ first: number; second: number }>
+}
+
+export interface InsertedCode {
+    readonly conversationID: string
+    readonly messageID: string
+    readonly userIntent: UserIntent | undefined
+    readonly time: Date
+    readonly fileUrl: vscode.Uri
+    readonly startPosition: vscode.Position
+    readonly endPosition: vscode.Position
+    readonly originalString: string
+}
diff --git a/packages/core/src/codewhispererChat/controllers/chat/prompts/promptsGenerator.ts b/packages/core/src/codewhispererChat/controllers/chat/prompts/promptsGenerator.ts
new file mode 100644
index 00000000000..6abecda2f8c
--- /dev/null
+++ b/packages/core/src/codewhispererChat/controllers/chat/prompts/promptsGenerator.ts
@@ -0,0 +1,27 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { EditorContextBaseCommandType, EditorContextCommand } from '../../../commands/registerCommands'
+
+// TODO: It's a workaround for the demo, we need to remove it after backend will be ready
+
+export class PromptsGenerator {
+    private editorContextMenuCommandVerbs: Map<EditorContextBaseCommandType, string> = new Map([
+        ['aws.amazonq.explainCode', 'Explain'],
+        ['aws.amazonq.refactorCode', 'Refactor'],
+        ['aws.amazonq.fixCode', 'Fix'],
+        ['aws.amazonq.optimizeCode', 'Optimize'],
+        ['aws.amazonq.sendToPrompt', 'Send to prompt'],
+    ])
+
+    public generateForContextMenuCommand(command: EditorContextCommand): string {
+        if (command.type === 'aws.amazonq.explainIssue') {
+            return `Explain the issue "${command.issue.title}" (${JSON.stringify(
+                command.issue
+            )}) and generate code demonstrating the fix`
+        }
+        return [this.editorContextMenuCommandVerbs.get(command.type), ' the selected codeblock'].join('')
+    }
+}
diff --git a/packages/core/src/codewhispererChat/controllers/chat/tabBarController.ts b/packages/core/src/codewhispererChat/controllers/chat/tabBarController.ts
new file mode 100644
index 00000000000..13088e096f8
--- /dev/null
+++ b/packages/core/src/codewhispererChat/controllers/chat/tabBarController.ts
@@ -0,0 +1,181 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import fs from '../../../shared/fs/fs'
+import {
+    DetailedListActionClickMessage,
+    DetailedListFilterChangeMessage,
+    DetailedListItemSelectMessage,
+} from '../../view/connector/connector'
+import * as vscode from 'vscode'
+import { Messenger } from './messenger/messenger'
+import { Database } from '../../../shared/db/chatDb/chatDb'
+import { TabBarButtonClick, SaveChatMessage } from './model'
+import { Conversation, messageToChatItem, Tab } from '../../../shared/db/chatDb/util'
+import { DetailedListItemGroup, MynahIconsType } from '@aws/mynah-ui'
+
+export class TabBarController {
+    private readonly messenger: Messenger
+    private chatHistoryDb = Database.getInstance()
+    private loadedChats: boolean = false
+    private searchTimeout: NodeJS.Timeout | undefined = undefined
+    private readonly DebounceTime = 300 // milliseconds
+
+    constructor(messenger: Messenger) {
+        this.messenger = messenger
+    }
+    async processActionClickMessage(msg: DetailedListActionClickMessage) {
+        if (msg.listType === 'history') {
+            if (msg.action.text === 'Delete') {
+                this.chatHistoryDb.deleteHistory(msg.action.id)
+                this.messenger.sendUpdateDetailedListMessage('history', { list: this.generateHistoryList() })
+            } else if (msg.action.text === 'Export') {
+                // If conversation is already open, export it
+                const openTabId = this.chatHistoryDb.getOpenTabId(msg.action.id)
+                if (openTabId) {
+                    await this.exportChatButtonClicked({ tabID: openTabId, buttonId: 'export_chat' })
+                } // If conversation is not open, restore it before exporting
+                else {
+                    const selectedTab = this.chatHistoryDb.getTab(msg.action.id)
+                    this.restoreTab(selectedTab, true)
+                }
+            }
+        }
+    }
+
+    async processFilterChangeMessage(msg: DetailedListFilterChangeMessage) {
+        if (msg.listType === 'history') {
+            const searchFilter = msg.filterValues['search']
+            if (typeof searchFilter !== 'string') {
+                return
+            }
+
+            // Clear any pending search
+            if (this.searchTimeout) {
+                clearTimeout(this.searchTimeout)
+            }
+
+            // Set new timeout for this search
+            this.searchTimeout = setTimeout(() => {
+                const searchResults = this.chatHistoryDb.searchMessages(searchFilter)
+                this.messenger.sendUpdateDetailedListMessage('history', { list: searchResults })
+            }, this.DebounceTime)
+        }
+    }
+
+    // If selected is conversation is already open, select that tab. Else, open new tab with conversation.
+    processItemSelectMessage(msg: DetailedListItemSelectMessage) {
+        if (msg.listType === 'history') {
+            const historyID = msg.item.id
+            if (historyID) {
+                const openTabID = this.chatHistoryDb.getOpenTabId(historyID)
+                if (!openTabID) {
+                    const selectedTab = this.chatHistoryDb.getTab(historyID)
+                    this.restoreTab(selectedTab)
+                } else {
+                    this.messenger.sendSelectTabMessage(openTabID, historyID)
+                }
+                this.messenger.sendCloseDetailedListMessage('history')
+            }
+        }
+    }
+
+    restoreTab(selectedTab?: Tab | null, exportTab?: boolean) {
+        if (selectedTab) {
+            this.messenger.sendRestoreTabMessage(
+                selectedTab.historyId,
+                selectedTab.tabType,
+                selectedTab.conversations.flatMap((conv: Conversation) =>
+                    conv.messages.map((message) => messageToChatItem(message))
+                ),
+                exportTab
+            )
+        }
+    }
+
+    loadChats() {
+        if (this.loadedChats) {
+            return
+        }
+        this.loadedChats = true
+        const openConversations = this.chatHistoryDb.getOpenTabs()
+        if (openConversations) {
+            for (const conversation of openConversations) {
+                if (conversation.conversations && conversation.conversations.length > 0) {
+                    this.restoreTab(conversation)
+                }
+            }
+        }
+    }
+
+    async historyButtonClicked(message: TabBarButtonClick) {
+        this.messenger.sendOpenDetailedListMessage(message.tabID, 'history', {
+            header: { title: 'Chat history' },
+            filterOptions: [
+                {
+                    type: 'textinput',
+                    icon: 'search' as MynahIconsType,
+                    id: 'search',
+                    placeholder: 'Search...',
+                    autoFocus: true,
+                },
+            ],
+            list: this.generateHistoryList(),
+        })
+    }
+
+    generateHistoryList(): DetailedListItemGroup[] {
+        const historyItems = this.chatHistoryDb.getHistory()
+        return historyItems.length > 0 ? historyItems : [{ children: [{ description: 'No chat history found' }] }]
+    }
+
+    async processSaveChat(message: SaveChatMessage) {
+        try {
+            await fs.writeFile(message.uri, message.serializedChat)
+        } catch (error) {
+            void vscode.window.showErrorMessage('An error occurred while exporting your chat.')
+        }
+    }
+
+    async processTabBarButtonClick(message: TabBarButtonClick) {
+        switch (message.buttonId) {
+            case 'history_sheet':
+                await this.historyButtonClicked(message)
+                break
+            case 'export_chat':
+                await this.exportChatButtonClicked(message)
+                break
+        }
+    }
+
+    private async exportChatButtonClicked(message: TabBarButtonClick) {
+        const defaultFileName = `q-dev-chat-${new Date().toISOString().split('T')[0]}.md`
+        const workspaceFolders = vscode.workspace.workspaceFolders
+        let defaultUri
+
+        if (workspaceFolders && workspaceFolders.length > 0) {
+            // Use the first workspace folder as root
+            defaultUri = vscode.Uri.joinPath(workspaceFolders[0].uri, defaultFileName)
+        } else {
+            // Fallback if no workspace is open
+            defaultUri = vscode.Uri.file(defaultFileName)
+        }
+
+        const saveUri = await vscode.window.showSaveDialog({
+            filters: {
+                Markdown: ['md'],
+                HTML: ['html'],
+            },
+            defaultUri,
+            title: 'Export chat',
+        })
+
+        if (saveUri) {
+            // Determine format from file extension
+            const format = saveUri.fsPath.endsWith('.md') ? 'markdown' : 'html'
+            this.messenger.sendSerializeTabMessage(message.tabID, saveUri.fsPath, format)
+        }
+    }
+}
diff --git a/packages/core/src/codewhispererChat/controllers/chat/telemetryHelper.ts b/packages/core/src/codewhispererChat/controllers/chat/telemetryHelper.ts
new file mode 100644
index 00000000000..ac914e77b6b
--- /dev/null
+++ b/packages/core/src/codewhispererChat/controllers/chat/telemetryHelper.ts
@@ -0,0 +1,716 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { UserIntent } from '@amzn/codewhisperer-streaming'
+import {
+    AmazonqAddMessage,
+    AmazonqInteractWithMessage,
+    CwsprChatCommandType,
+    CwsprChatInteractionType,
+    CwsprChatTriggerInteraction,
+    CwsprChatUserIntent,
+    Result,
+    telemetry,
+} from '../../../shared/telemetry/telemetry'
+import { ChatSessionStorage } from '../../storages/chatSession'
+import {
+    AcceptDiff,
+    ViewDiff,
+    ChatItemFeedbackMessage,
+    ChatItemVotedMessage,
+    CopyCodeToClipboard,
+    FooterInfoLinkClick,
+    InsertCodeAtCursorPosition,
+    PromptAnswer,
+    PromptMessage,
+    ResponseBodyLinkClickMessage,
+    SourceLinkClickMessage,
+    TriggerPayload,
+    AdditionalContextInfo,
+} from './model'
+import { TriggerEvent, TriggerEventsStorage } from '../../storages/triggerEvents'
+import globals from '../../../shared/extensionGlobals'
+import { getLogger } from '../../../shared/logger/logger'
+import { codeWhispererClient } from '../../../codewhisperer/client/codewhisperer'
+import { isAwsError } from '../../../shared/errors'
+import CodeWhispererUserClient, {
+    ChatMessageInteractionType,
+} from '../../../codewhisperer/client/codewhispereruserclient'
+import { supportedLanguagesList } from '../chat/chatRequest/converter'
+import { AuthUtil } from '../../../codewhisperer/util/authUtil'
+import { getSelectedCustomization } from '../../../codewhisperer/util/customizationUtil'
+import { undefinedIfEmpty } from '../../../shared/utilities/textUtilities'
+import { sleep } from '../../../shared/utilities/timeoutUtils'
+import {
+    FileDiagnostic,
+    getDiagnosticsDifferences,
+    getDiagnosticsOfCurrentFile,
+    toIdeDiagnostics,
+} from '../../../codewhisperer/util/diagnosticsUtil'
+import { Auth } from '../../../auth/auth'
+
+export function logSendTelemetryEventFailure(error: any) {
+    let requestId: string | undefined
+    if (isAwsError(error)) {
+        requestId = error.requestId
+    }
+
+    getLogger().debug(
+        `Failed to sendTelemetryEvent to CodeWhisperer, requestId: ${requestId ?? ''}, message: ${error.message}`
+    )
+}
+
+export function recordTelemetryChatRunCommand(type: CwsprChatCommandType, command?: string) {
+    telemetry.amazonq_runCommand.emit({
+        result: 'Succeeded',
+        cwsprChatCommandType: type,
+        cwsprChatCommandName: command,
+        credentialStartUrl: AuthUtil.instance.startUrl,
+    })
+}
+
+export class CWCTelemetryHelper {
+    static instance: CWCTelemetryHelper
+    private sessionStorage: ChatSessionStorage
+    private triggerEventsStorage: TriggerEventsStorage
+    private responseStreamStartTime: Map<string, number> = new Map()
+    private responseStreamTotalTime: Map<string, number> = new Map()
+    private conversationStreamStartTime: Map<string, number> = new Map()
+    private conversationStreamTotalTime: Map<string, number> = new Map()
+    private responseStreamTimeForChunks: Map<string, number[]> = new Map()
+    private responseWithContextInfo: Map<string, AdditionalContextInfo> = new Map()
+
+    // Keeps track of when chunks of data were displayed in a tab
+    private displayTimeForChunks: Map<string, number[]> = new Map()
+
+    /**
+     * Stores payload information about a message response until
+     * the full round trip time finishes and addMessage telemetry
+     * is sent
+     */
+    private messageStorage: Map<
+        string,
+        {
+            triggerPayload: TriggerPayload
+            message: PromptAnswer
+        }
+    > = new Map()
+
+    private documentDiagnostics: FileDiagnostic | undefined = undefined
+
+    constructor(sessionStorage: ChatSessionStorage, triggerEventsStorage: TriggerEventsStorage) {
+        this.sessionStorage = sessionStorage
+        this.triggerEventsStorage = triggerEventsStorage
+    }
+
+    public setDocumentDiagnostics() {
+        this.documentDiagnostics = getDiagnosticsOfCurrentFile()
+    }
+
+    public static init(sessionStorage: ChatSessionStorage, triggerEventsStorage: TriggerEventsStorage) {
+        const lastInstance = CWCTelemetryHelper.instance
+        if (lastInstance !== undefined) {
+            return lastInstance
+        }
+
+        getLogger().debug('CWCTelemetryHelper: Initialized new telemetry helper')
+        const instance = new CWCTelemetryHelper(sessionStorage, triggerEventsStorage)
+        CWCTelemetryHelper.instance = instance
+        return instance
+    }
+
+    private getUserIntentForTelemetry(userIntent: UserIntent | undefined): CwsprChatUserIntent | undefined {
+        switch (userIntent) {
+            case UserIntent.EXPLAIN_CODE_SELECTION:
+                return 'explainCodeSelection'
+            case UserIntent.SUGGEST_ALTERNATE_IMPLEMENTATION:
+                return 'suggestAlternateImplementation'
+            case UserIntent.APPLY_COMMON_BEST_PRACTICES:
+                return 'applyCommonBestPractices'
+            case UserIntent.IMPROVE_CODE:
+                return 'improveCode'
+            case UserIntent.CITE_SOURCES:
+                return 'citeSources'
+            case UserIntent.EXPLAIN_LINE_BY_LINE:
+                return 'explainLineByLine'
+            case UserIntent.SHOW_EXAMPLES:
+                return 'showExample'
+            case UserIntent.GENERATE_UNIT_TESTS:
+                return 'generateUnitTests'
+            default:
+                return undefined
+        }
+    }
+
+    public recordOpenChat() {
+        telemetry.amazonq_openChat.emit({ result: 'Succeeded', passive: true })
+    }
+
+    public recordCloseChat() {
+        telemetry.amazonq_closeChat.emit({ result: 'Succeeded', passive: true })
+    }
+
+    public recordEnterFocusChat() {
+        telemetry.amazonq_enterFocusChat.emit({ result: 'Succeeded', passive: true })
+    }
+
+    public recordExitFocusChat() {
+        telemetry.amazonq_exitFocusChat.emit({ result: 'Succeeded', passive: true })
+    }
+
+    public async recordFeedback(message: ChatItemFeedbackMessage) {
+        const logger = getLogger()
+        try {
+            await globals.telemetry.postFeedback({
+                comment: JSON.stringify({
+                    type: 'codewhisperer-chat-answer-feedback',
+                    conversationId: this.getConversationId(message.tabID) ?? '',
+                    messageId: message.messageId,
+                    reason: message.selectedOption,
+                    userComment: message.comment,
+                }),
+                sentiment: 'Negative',
+            })
+        } catch (err) {
+            const errorMessage = (err as Error).message || 'Failed to submit feedback'
+            logger.error(`CodeWhispererChat answer feedback failed: "Negative": ${errorMessage}`)
+
+            this.recordFeedbackResult('Failed')
+
+            return errorMessage
+        }
+
+        logger.info(`CodeWhispererChat answer feedback sent: "Negative"`)
+
+        this.recordFeedbackResult('Succeeded')
+    }
+
+    private recordFeedbackResult(feedbackResult: Result) {
+        telemetry.feedback_result.emit({ result: feedbackResult })
+    }
+
+    public recordInteractWithMessage(
+        message:
+            | AcceptDiff
+            | InsertCodeAtCursorPosition
+            | CopyCodeToClipboard
+            | PromptMessage
+            | ChatItemVotedMessage
+            | SourceLinkClickMessage
+            | ResponseBodyLinkClickMessage
+            | FooterInfoLinkClick
+            | ViewDiff,
+        { result }: { result: Result } = { result: 'Succeeded' }
+    ) {
+        const conversationId = this.getConversationId(message.tabID)
+        let event: AmazonqInteractWithMessage | undefined
+        let additionalContextInfo = undefined
+        const messageId = (message as any).messageId
+        if (messageId) {
+            additionalContextInfo = this.responseWithContextInfo.get(messageId)
+        }
+        switch (message.command) {
+            case 'insert_code_at_cursor_position':
+                message = message as InsertCodeAtCursorPosition
+                event = {
+                    result,
+                    cwsprChatConversationId: conversationId ?? '',
+                    credentialStartUrl: AuthUtil.instance.startUrl,
+                    cwsprChatMessageId: message.messageId,
+                    cwsprChatUserIntent: this.getUserIntentForTelemetry(message.userIntent),
+                    cwsprChatInteractionType: 'insertAtCursor',
+                    cwsprChatAcceptedCharactersLength: message.code.length,
+                    cwsprChatAcceptedNumberOfLines: message.code.split('\n').length,
+                    cwsprChatInteractionTarget: message.insertionTargetType,
+                    cwsprChatHasReference: message.codeReference && message.codeReference.length > 0,
+                    cwsprChatCodeBlockIndex: message.codeBlockIndex,
+                    cwsprChatTotalCodeBlocks: message.totalCodeBlocks,
+                    cwsprChatProgrammingLanguage: message.codeBlockLanguage,
+                }
+                break
+            case 'code_was_copied_to_clipboard':
+                message = message as CopyCodeToClipboard
+                event = {
+                    result,
+                    cwsprChatConversationId: conversationId ?? '',
+                    credentialStartUrl: AuthUtil.instance.startUrl,
+                    cwsprChatMessageId: message.messageId,
+                    cwsprChatUserIntent: this.getUserIntentForTelemetry(message.userIntent),
+                    cwsprChatInteractionType: 'copySnippet',
+                    cwsprChatAcceptedCharactersLength: message.code.length,
+                    cwsprChatInteractionTarget: message.insertionTargetType,
+                    cwsprChatHasReference: message.codeReference && message.codeReference.length > 0,
+                    cwsprChatCodeBlockIndex: message.codeBlockIndex,
+                    cwsprChatTotalCodeBlocks: message.totalCodeBlocks,
+                    cwsprChatProgrammingLanguage: message.codeBlockLanguage,
+                }
+                break
+            case 'accept_diff':
+                message = message as AcceptDiff
+                event = {
+                    result,
+                    cwsprChatConversationId: conversationId ?? '',
+                    cwsprChatMessageId: message.messageId,
+                    cwsprChatInteractionType: 'acceptDiff',
+                    credentialStartUrl: AuthUtil.instance.startUrl,
+                    cwsprChatAcceptedCharactersLength: message.code.length,
+                    cwsprChatHasReference:
+                        message.referenceTrackerInformation && message.referenceTrackerInformation.length > 0,
+                    cwsprChatCodeBlockIndex: message.codeBlockIndex,
+                    cwsprChatTotalCodeBlocks: message.totalCodeBlocks,
+                }
+                break
+            case 'view_diff':
+                message = message as ViewDiff
+                event = {
+                    result,
+                    cwsprChatConversationId: conversationId ?? '',
+                    cwsprChatMessageId: message.messageId,
+                    cwsprChatInteractionType: 'viewDiff',
+                    credentialStartUrl: AuthUtil.instance.startUrl,
+                    cwsprChatAcceptedCharactersLength: message.code.length,
+                    cwsprChatHasReference:
+                        message.referenceTrackerInformation && message.referenceTrackerInformation.length > 0,
+                    cwsprChatCodeBlockIndex: message.codeBlockIndex,
+                    cwsprChatTotalCodeBlocks: message.totalCodeBlocks,
+                }
+                break
+            case 'follow-up-was-clicked':
+                message = message as PromptMessage
+                event = {
+                    result,
+                    cwsprChatConversationId: conversationId ?? '',
+                    credentialStartUrl: AuthUtil.instance.startUrl,
+                    cwsprChatMessageId: message.messageId,
+                    cwsprChatInteractionType: 'clickFollowUp',
+                }
+                break
+            case 'chat-item-voted':
+                message = message as ChatItemVotedMessage
+                event = {
+                    result,
+                    cwsprChatMessageId: message.messageId,
+                    cwsprChatConversationId: conversationId ?? '',
+                    credentialStartUrl: AuthUtil.instance.startUrl,
+                    cwsprChatInteractionType: message.vote,
+                }
+                break
+            case 'source-link-click':
+                message = message as SourceLinkClickMessage
+                event = {
+                    result,
+                    cwsprChatMessageId: message.messageId,
+                    cwsprChatConversationId: conversationId ?? '',
+                    credentialStartUrl: AuthUtil.instance.startUrl,
+                    cwsprChatInteractionType: 'clickLink',
+                    cwsprChatInteractionTarget: message.link,
+                }
+                break
+            case 'response-body-link-click':
+                message = message as ResponseBodyLinkClickMessage
+                event = {
+                    result,
+                    cwsprChatMessageId: message.messageId,
+                    cwsprChatConversationId: conversationId ?? '',
+                    credentialStartUrl: AuthUtil.instance.startUrl,
+                    cwsprChatInteractionType: 'clickBodyLink',
+                    cwsprChatInteractionTarget: message.link,
+                }
+                break
+            case 'footer-info-link-click':
+                message = message as FooterInfoLinkClick
+                event = {
+                    result,
+                    cwsprChatMessageId: 'footer',
+                    cwsprChatConversationId: conversationId ?? '',
+                    credentialStartUrl: AuthUtil.instance.startUrl,
+                    cwsprChatInteractionType: 'clickBodyLink',
+                    cwsprChatInteractionTarget: message.link,
+                }
+                break
+        }
+
+        if (!event) {
+            return
+        }
+        telemetry.amazonq_interactWithMessage.emit({ ...event, ...additionalContextInfo })
+
+        const interactWithMessageEvent: CodeWhispererUserClient.ChatInteractWithMessageEvent = {
+            conversationId: event.cwsprChatConversationId,
+            messageId: event.cwsprChatMessageId,
+            interactionType: this.getCWClientTelemetryInteractionType(event.cwsprChatInteractionType),
+            interactionTarget: event.cwsprChatInteractionTarget,
+            acceptedCharacterCount: event.cwsprChatAcceptedCharactersLength,
+            acceptedLineCount: event.cwsprChatAcceptedNumberOfLines,
+            acceptedSnippetHasReference: false,
+            hasProjectLevelContext: this.responseWithContextInfo.get(event.cwsprChatMessageId)
+                ?.cwsprChatHasProjectContext,
+            customizationArn: undefinedIfEmpty(getSelectedCustomization().arn),
+        }
+        if (interactWithMessageEvent.interactionType === 'INSERT_AT_CURSOR' && Auth.instance.isInternalAmazonUser()) {
+            // wait 1 seconds for the user installed 3rd party LSP
+            // to update its diagnostics.
+            void sleep(1000).then(() => {
+                const diagnosticDiff = getDiagnosticsDifferences(
+                    this.documentDiagnostics,
+                    getDiagnosticsOfCurrentFile()
+                )
+                interactWithMessageEvent.addedIdeDiagnostics = diagnosticDiff.added.map((it) => toIdeDiagnostics(it))
+                interactWithMessageEvent.removedIdeDiagnostics = diagnosticDiff.removed.map((it) =>
+                    toIdeDiagnostics(it)
+                )
+                codeWhispererClient
+                    .sendTelemetryEvent({
+                        telemetryEvent: {
+                            chatInteractWithMessageEvent: interactWithMessageEvent,
+                        },
+                    })
+                    .then()
+                    .catch(logSendTelemetryEventFailure)
+            })
+        } else {
+            codeWhispererClient
+                .sendTelemetryEvent({
+                    telemetryEvent: {
+                        chatInteractWithMessageEvent: interactWithMessageEvent,
+                    },
+                    profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,
+                })
+                .then()
+                .catch(logSendTelemetryEventFailure)
+        }
+    }
+
+    private getCWClientTelemetryInteractionType(type: CwsprChatInteractionType): ChatMessageInteractionType {
+        switch (type) {
+            case 'copySnippet':
+                return 'COPY_SNIPPET'
+            case 'insertAtCursor':
+                return 'INSERT_AT_CURSOR'
+            case 'clickFollowUp':
+                return 'CLICK_FOLLOW_UP'
+            case 'clickLink':
+                return 'CLICK_LINK'
+            case 'clickBodyLink':
+                return 'CLICK_BODY_LINK'
+            case 'upvote':
+                return 'UPVOTE'
+            case 'downvote':
+                return 'DOWNVOTE'
+            case 'acceptDiff':
+                return 'ACCEPT_DIFF'
+            case 'viewDiff':
+                return 'VIEW_DIFF'
+            default:
+                return 'UNKNOWN'
+        }
+    }
+
+    private getTriggerInteractionFromTriggerEvent(triggerEvent: TriggerEvent | undefined): CwsprChatTriggerInteraction {
+        switch (triggerEvent?.type) {
+            case 'editor_context_command':
+                return triggerEvent.command?.triggerType === 'keybinding' ? 'hotkeys' : 'contextMenu'
+            case 'follow_up':
+            case 'chat_message':
+            default:
+                return 'click'
+        }
+    }
+
+    public recordStartConversation(
+        triggerEvent: TriggerEvent,
+        triggerPayload: TriggerPayload & { projectContextQueryLatencyMs?: number }
+    ) {
+        if (triggerEvent.tabID === undefined) {
+            return
+        }
+
+        if (this.triggerEventsStorage.getTriggerEventsByTabID(triggerEvent.tabID).length > 1) {
+            return
+        }
+
+        const telemetryUserIntent = this.getUserIntentForTelemetry(triggerPayload.userIntent)
+
+        telemetry.amazonq_startConversation.emit({
+            result: 'Succeeded',
+            cwsprChatConversationId: this.getConversationId(triggerEvent.tabID) ?? '',
+            cwsprChatTriggerInteraction: this.getTriggerInteractionFromTriggerEvent(triggerEvent),
+            cwsprChatConversationType: 'Chat',
+            cwsprChatUserIntent: telemetryUserIntent,
+            cwsprChatHasCodeSnippet: triggerPayload.codeSelection && !triggerPayload.codeSelection.isEmpty,
+            cwsprChatProgrammingLanguage: triggerPayload.fileLanguage,
+            credentialStartUrl: AuthUtil.instance.startUrl,
+            cwsprChatHasProjectContext: triggerPayload.relevantTextDocuments
+                ? triggerPayload.relevantTextDocuments.length > 0 && triggerPayload.useRelevantDocuments === true
+                : false,
+            cwsprChatProjectContextQueryMs: triggerPayload.projectContextQueryLatencyMs,
+        })
+    }
+
+    /**
+     * Store the trigger payload and message until the full message round trip finishes
+     *
+     * @calls emitAddMessage when the full message round trip finishes
+     */
+    public recordAddMessage(triggerPayload: TriggerPayload, message: PromptAnswer) {
+        this.messageStorage.set(message.tabID, {
+            triggerPayload,
+            message,
+        })
+    }
+
+    public getAdditionalContextCounts(triggerPayload: TriggerPayload) {
+        const counts = {
+            fileContextCount: 0,
+            folderContextCount: 0,
+            promptContextCount: 0,
+        }
+
+        if (triggerPayload.context) {
+            for (const context of triggerPayload.context) {
+                if (typeof context !== 'string') {
+                    if (context.id === 'file') {
+                        counts.fileContextCount++
+                    } else if (context.id === 'folder') {
+                        counts.folderContextCount++
+                    } else if (context.id === 'prompt') {
+                        counts.promptContextCount++
+                    }
+                }
+            }
+        }
+
+        return counts
+    }
+
+    public emitAddMessage(tabID: string, fullDisplayLatency: number, traceId: string, startTime?: number) {
+        const payload = this.messageStorage.get(tabID)
+        if (!payload) {
+            return
+        }
+
+        const { triggerPayload, message } = payload
+
+        const triggerEvent = this.triggerEventsStorage.getLastTriggerEventByTabID(message.tabID)
+        const hasProjectLevelContext =
+            triggerPayload.relevantTextDocuments &&
+            triggerPayload.relevantTextDocuments.length > 0 &&
+            triggerPayload.useRelevantDocuments === true
+
+        const contextCounts = this.getAdditionalContextCounts(triggerPayload)
+
+        const event: AmazonqAddMessage = {
+            result: 'Succeeded',
+            cwsprChatConversationId: this.getConversationId(message.tabID) ?? '',
+            cwsprChatMessageId: message.messageID,
+            cwsprChatTriggerInteraction: this.getTriggerInteractionFromTriggerEvent(triggerEvent),
+            cwsprChatUserIntent: this.getUserIntentForTelemetry(triggerPayload.userIntent),
+            cwsprChatHasCodeSnippet: triggerPayload.codeSelection && !triggerPayload.codeSelection.isEmpty,
+            cwsprChatProgrammingLanguage: triggerPayload.fileLanguage,
+            cwsprChatActiveEditorTotalCharacters: triggerPayload.fileText.length,
+            cwsprChatActiveEditorImportCount: triggerPayload.codeQuery?.fullyQualifiedNames?.used?.length,
+            cwsprChatResponseCodeSnippetCount: message.totalNumberOfCodeBlocksInResponse,
+            cwsprChatResponseCode: message.responseCode,
+            cwsprChatSourceLinkCount: message.suggestionCount,
+            cwsprChatReferencesCount: message.codeReferenceCount,
+            cwsprChatFollowUpCount: message.followUpCount,
+            cwsprChatTimeToFirstChunk: this.getResponseStreamTimeToFirstChunk(message.tabID),
+            cwsprChatTimeBetweenChunks: JSON.stringify(
+                this.getTimeBetweenChunks(message.tabID, this.responseStreamTimeForChunks)
+            ),
+            cwsprChatFullResponseLatency: this.responseStreamTotalTime.get(message.tabID) ?? 0,
+            cwsprChatTimeToFirstDisplay: this.getFirstDisplayTime(tabID, startTime),
+            cwsprChatTimeToFirstUsableChunk: this.getFirstUsableChunkTime(message.tabID) ?? 0,
+            cwsprChatFullServerResponseLatency: this.conversationStreamTotalTime.get(message.tabID) ?? 0,
+            cwsprChatTimeBetweenDisplays: JSON.stringify(this.getTimeBetweenChunks(tabID, this.displayTimeForChunks)),
+            cwsprChatFullDisplayLatency: fullDisplayLatency,
+            cwsprChatRequestLength: triggerPayload.message.length,
+            cwsprChatResponseLength: message.messageLength,
+            cwsprChatConversationType: 'Chat',
+            credentialStartUrl: AuthUtil.instance.startUrl,
+            codewhispererCustomizationArn: triggerPayload.customization.arn,
+            cwsprChatHasProjectContext: hasProjectLevelContext,
+            cwsprChatHasContextList: triggerPayload.documentReferences.length > 0,
+            cwsprChatFolderContextCount: contextCounts.folderContextCount,
+            cwsprChatFileContextCount: contextCounts.fileContextCount,
+            cwsprChatFileContextLength: triggerPayload.contextLengths.additionalContextLengths.fileContextLength,
+            cwsprChatFileContextTruncatedLength:
+                triggerPayload.contextLengths.truncatedAdditionalContextLengths.fileContextLength,
+            cwsprChatRuleContextCount: triggerPayload.workspaceRulesCount,
+            cwsprChatRuleContextLength: triggerPayload.contextLengths.additionalContextLengths.ruleContextLength,
+            cwsprChatRuleContextTruncatedLength:
+                triggerPayload.contextLengths.truncatedAdditionalContextLengths.ruleContextLength,
+            cwsprChatPromptContextCount: contextCounts.promptContextCount,
+            cwsprChatPromptContextLength: triggerPayload.contextLengths.additionalContextLengths.promptContextLength,
+            cwsprChatPromptContextTruncatedLength:
+                triggerPayload.contextLengths.truncatedAdditionalContextLengths.promptContextLength,
+            cwsprChatFocusFileContextLength: triggerPayload.contextLengths.focusFileContextLength,
+            cwsprChatFocusFileContextTruncatedLength: triggerPayload.contextLengths.truncatedFocusFileContextLength,
+            cwsprChatUserInputContextLength: triggerPayload.contextLengths.userInputContextLength,
+            cwsprChatUserInputContextTruncatedLength: triggerPayload.contextLengths.truncatedUserInputContextLength,
+            cwsprChatWorkspaceContextLength: triggerPayload.contextLengths.workspaceContextLength,
+            cwsprChatWorkspaceContextTruncatedLength: triggerPayload.contextLengths.truncatedWorkspaceContextLength,
+            traceId,
+        }
+
+        telemetry.amazonq_addMessage.emit(event)
+        const language = this.isProgrammingLanguageSupported(triggerPayload.fileLanguage)
+            ? { languageName: triggerPayload.fileLanguage as string }
+            : undefined
+
+        codeWhispererClient
+            .sendTelemetryEvent({
+                telemetryEvent: {
+                    chatAddMessageEvent: {
+                        conversationId: event.cwsprChatConversationId,
+                        messageId: event.cwsprChatMessageId,
+                        userIntent: triggerPayload.userIntent,
+                        hasCodeSnippet: event.cwsprChatHasCodeSnippet,
+                        ...(language !== undefined ? { programmingLanguage: language } : {}),
+                        activeEditorTotalCharacters: event.cwsprChatActiveEditorTotalCharacters,
+                        timeToFirstChunkMilliseconds: event.cwsprChatTimeToFirstChunk,
+                        timeBetweenChunks: this.getTimeBetweenChunks(message.tabID, this.responseStreamTimeForChunks),
+                        fullResponselatency: event.cwsprChatFullResponseLatency,
+                        requestLength: event.cwsprChatRequestLength,
+                        responseLength: event.cwsprChatResponseLength,
+                        numberOfCodeBlocks: event.cwsprChatResponseCodeSnippetCount,
+                        hasProjectLevelContext: hasProjectLevelContext,
+                        customizationArn: undefinedIfEmpty(getSelectedCustomization().arn),
+                    },
+                },
+                profileArn: AuthUtil.instance.regionProfileManager.activeRegionProfile?.arn,
+            })
+            .then()
+            .catch(logSendTelemetryEventFailure)
+
+        this.messageStorage.delete(tabID)
+    }
+
+    public recordMessageResponseError(triggerPayload: TriggerPayload, tabID: string, responseCode: number) {
+        const triggerEvent = this.triggerEventsStorage.getLastTriggerEventByTabID(tabID)
+
+        telemetry.amazonq_messageResponseError.emit({
+            result: 'Succeeded',
+            cwsprChatConversationId: this.getConversationId(tabID) ?? '',
+            cwsprChatTriggerInteraction: this.getTriggerInteractionFromTriggerEvent(triggerEvent),
+            cwsprChatUserIntent: this.getUserIntentForTelemetry(triggerPayload.userIntent),
+            cwsprChatHasCodeSnippet: !triggerPayload.codeSelection?.isEmpty,
+            cwsprChatProgrammingLanguage: triggerPayload.fileLanguage,
+            cwsprChatActiveEditorTotalCharacters: triggerPayload.fileText?.length,
+            cwsprChatActiveEditorImportCount: triggerPayload.codeQuery?.fullyQualifiedNames?.used?.length,
+            cwsprChatResponseCode: responseCode,
+            cwsprChatRequestLength: triggerPayload.message?.length ?? 0,
+            cwsprChatConversationType: 'Chat',
+            credentialStartUrl: AuthUtil.instance.startUrl,
+        })
+    }
+
+    public recordEnterFocusConversation(tabID: string) {
+        const conversationId = this.getConversationId(tabID)
+        if (conversationId) {
+            telemetry.amazonq_enterFocusConversation.emit({
+                result: 'Succeeded',
+                cwsprChatConversationId: conversationId,
+            })
+        }
+    }
+
+    public recordExitFocusConversation(tabID: string) {
+        const conversationId = this.getConversationId(tabID)
+        if (conversationId) {
+            telemetry.amazonq_exitFocusConversation.emit({
+                result: 'Succeeded',
+                cwsprChatConversationId: conversationId,
+            })
+        }
+    }
+
+    public setResponseStreamStartTime(tabID: string) {
+        this.responseStreamStartTime.set(tabID, performance.now())
+        this.responseStreamTimeForChunks.set(tabID, [performance.now()])
+        this.displayTimeForChunks.set(tabID, [])
+    }
+
+    public setResponseStreamTimeForChunks(tabID: string) {
+        const chunkTimes = this.responseStreamTimeForChunks.get(tabID) ?? []
+        this.responseStreamTimeForChunks.set(tabID, [...chunkTimes, performance.now()])
+    }
+
+    public setDisplayTimeForChunks(tabID: string, time: number) {
+        const chunkTimes = this.displayTimeForChunks.get(tabID) ?? []
+        this.displayTimeForChunks.set(tabID, [...chunkTimes, time])
+    }
+
+    public setResponseFromAdditionalContext(messageId: string, additionalContextInfo: AdditionalContextInfo) {
+        this.responseWithContextInfo.set(messageId, additionalContextInfo)
+    }
+
+    public setConversationStreamStartTime(tabID: string) {
+        this.conversationStreamStartTime.set(tabID, performance.now())
+    }
+
+    private getResponseStreamTimeToFirstChunk(tabID: string): number {
+        const chunkTimes = this.responseStreamTimeForChunks.get(tabID) ?? [0, 0]
+        if (chunkTimes.length === 1) {
+            return Math.round(performance.now() - chunkTimes[0])
+        }
+        return Math.round(chunkTimes[1] - chunkTimes[0])
+    }
+
+    /**
+     * Finds the time between when a user pressed enter and the first chunk appears in the UI
+     */
+    private getFirstDisplayTime(tabID: string, startTime?: number) {
+        if (!startTime) {
+            return 0
+        }
+        const chunkTimes = this.displayTimeForChunks.get(tabID) ?? [0]
+        return Math.round(chunkTimes[0] - startTime)
+    }
+
+    private getFirstUsableChunkTime(tabID: string) {
+        const startTime = this.conversationStreamStartTime.get(tabID) ?? 0
+        const chunkTimes = this.responseStreamTimeForChunks.get(tabID) ?? [0, 0]
+        // first chunk is the start time, we use the second because thats the first actual usable chunk time
+        return Math.round(chunkTimes[1] - startTime)
+    }
+
+    private getTimeBetweenChunks(tabID: string, chunks: Map<string, number[]>): number[] {
+        try {
+            const chunkDeltaTimes: number[] = []
+            const chunkTimes = chunks.get(tabID) ?? [0]
+            for (let idx = 0; idx < chunkTimes.length - 1; idx++) {
+                chunkDeltaTimes.push(Math.round(chunkTimes[idx + 1] - chunkTimes[idx]))
+            }
+
+            return chunkDeltaTimes.slice(0, 100)
+        } catch (e) {
+            getLogger().debug(`Failed to get response time between chunks, message: ${e}`)
+            return []
+        }
+    }
+
+    public setResponseStreamTotalTime(tabID: string) {
+        // time from when the requests started streaming until the end of the stream
+        const totalStreamingTime = performance.now() - (this.responseStreamStartTime.get(tabID) ?? 0)
+        this.responseStreamTotalTime.set(tabID, Math.round(totalStreamingTime))
+
+        // time from the initial server request, including creating the conversation id, until the end of the stream
+        const totalConversationTime = performance.now() - (this.conversationStreamStartTime.get(tabID) ?? 0)
+        this.conversationStreamTotalTime.set(tabID, Math.round(totalConversationTime))
+    }
+
+    public getConversationId(tabID: string): string | undefined {
+        return this.sessionStorage.getSession(tabID).sessionIdentifier
+    }
+
+    private isProgrammingLanguageSupported(programmingLanguage: string | undefined) {
+        return (
+            programmingLanguage !== undefined &&
+            programmingLanguage !== '' &&
+            supportedLanguagesList.includes(programmingLanguage)
+        )
+    }
+}
diff --git a/packages/core/src/codewhispererChat/controllers/chat/userIntent/userIntentRecognizer.ts b/packages/core/src/codewhispererChat/controllers/chat/userIntent/userIntentRecognizer.ts
new file mode 100644
index 00000000000..4e3eabc0bc8
--- /dev/null
+++ b/packages/core/src/codewhispererChat/controllers/chat/userIntent/userIntentRecognizer.ts
@@ -0,0 +1,47 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { UserIntent } from '@amzn/codewhisperer-streaming'
+import { EditorContextCommand } from '../../../commands/registerCommands'
+import { PromptMessage } from '../model'
+import { Auth } from '../../../../auth/auth'
+
+export class UserIntentRecognizer {
+    public getFromContextMenuCommand(command: EditorContextCommand): UserIntent | undefined {
+        switch (command.type) {
+            case 'aws.amazonq.explainCode':
+                return UserIntent.EXPLAIN_CODE_SELECTION
+            case 'aws.amazonq.refactorCode':
+                return UserIntent.SUGGEST_ALTERNATE_IMPLEMENTATION
+            case 'aws.amazonq.fixCode':
+                return UserIntent.APPLY_COMMON_BEST_PRACTICES
+            case 'aws.amazonq.optimizeCode':
+                return UserIntent.IMPROVE_CODE
+            case 'aws.amazonq.generateUnitTests':
+                return UserIntent.GENERATE_UNIT_TESTS
+            default:
+                return undefined
+        }
+    }
+
+    public getFromPromptChatMessage(prompt: PromptMessage): UserIntent | undefined {
+        if (prompt.message === undefined) {
+            return undefined
+        }
+
+        if (prompt.message.startsWith('Explain')) {
+            return UserIntent.EXPLAIN_CODE_SELECTION
+        } else if (prompt.message.startsWith('Refactor')) {
+            return UserIntent.SUGGEST_ALTERNATE_IMPLEMENTATION
+        } else if (prompt.message.startsWith('Fix')) {
+            return UserIntent.APPLY_COMMON_BEST_PRACTICES
+        } else if (prompt.message.startsWith('Optimize')) {
+            return UserIntent.IMPROVE_CODE
+        } else if (prompt.message.startsWith('Generate unit tests') && Auth.instance.isInternalAmazonUser()) {
+            return UserIntent.GENERATE_UNIT_TESTS
+        }
+        return undefined
+    }
+}
diff --git a/packages/core/src/codewhispererChat/editor/codelens.ts b/packages/core/src/codewhispererChat/editor/codelens.ts
new file mode 100644
index 00000000000..4df72d776d6
--- /dev/null
+++ b/packages/core/src/codewhispererChat/editor/codelens.ts
@@ -0,0 +1,172 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import vscode from 'vscode'
+import globals from '../../shared/extensionGlobals'
+import { ToolkitError } from '../../shared/errors'
+import { Commands, placeholder } from '../../shared/vscode/commands2'
+import { platform } from 'os'
+import { focusAmazonQPanel } from '../commands/registerCommands'
+import { AuthStates, AuthUtil } from '../../codewhisperer/util/authUtil'
+import { inlinehintKey } from '../../codewhisperer/models/constants'
+import { EndState } from '../../codewhisperer/views/lineAnnotationController'
+
+/** When the user clicks the CodeLens that prompts user to try Amazon Q chat */
+export const tryChatCodeLensCommand = Commands.declare(`_aws.amazonq.tryChatCodeLens`, () => async () => {
+    await focusAmazonQPanel.execute(placeholder, 'codeLens')
+})
+
+/**
+ * As part of hinting at users to use Amazon Q Chat, we will show codelenses
+ * prompting them a certain amount of time/uses. Then after
+ * a certain amount of times we will never show it again.
+ *
+ * This codelens appears above every clicked line.
+ */
+export class TryChatCodeLensProvider implements vscode.CodeLensProvider {
+    private _onDidChangeCodeLenses = new vscode.EventEmitter<void>()
+    onDidChangeCodeLenses: vscode.Event<void> = this._onDidChangeCodeLenses.event
+
+    /** How many times we've shown the CodeLens */
+    private count: number = 0
+    /** How many times we want to show the CodeLens */
+    static readonly maxCount = 10
+    static readonly debounceMillis: number = 700
+
+    private static providerDisposable: vscode.Disposable | undefined = undefined
+    private disposables: vscode.Disposable[] = []
+
+    // Assumption: Amazon Q is visible by default and codelens should be hidden
+    private isAmazonQVisible: boolean = true
+
+    constructor(
+        isAmazonQVisibleEvent: vscode.Event<boolean>,
+        private readonly cursorPositionIfValid = () => TryChatCodeLensProvider._resolveCursorPosition()
+    ) {
+        // when we want to recalculate the codelens
+        this.disposables.push(
+            vscode.window.onDidChangeActiveTextEditor(() => this._onDidChangeCodeLenses.fire()),
+            vscode.window.onDidChangeTextEditorSelection(() => this._onDidChangeCodeLenses.fire())
+        )
+
+        isAmazonQVisibleEvent((visible) => {
+            this.isAmazonQVisible = visible
+            this._onDidChangeCodeLenses.fire()
+        })
+    }
+
+    static async register(isAmazonQVisible: vscode.Event<boolean>): Promise<boolean> {
+        const shouldShow = globals.globalState.tryGet('aws.amazonq.showTryChatCodeLens', Boolean, true)
+        if (!shouldShow) {
+            return false
+        }
+
+        if (this.providerDisposable) {
+            throw new ToolkitError(`${this.name} can only be registered once.`)
+        }
+
+        const provider = new TryChatCodeLensProvider(isAmazonQVisible)
+        this.providerDisposable = vscode.languages.registerCodeLensProvider({ scheme: 'file' }, provider)
+        globals.context.subscriptions.push(provider)
+        return true
+    }
+
+    provideCodeLenses(
+        document: vscode.TextDocument,
+        token: vscode.CancellationToken
+    ): vscode.ProviderResult<vscode.CodeLens[]> {
+        return new Promise((resolve) => {
+            token.onCancellationRequested(() => resolve([]))
+
+            /**
+             * Disable Codelens if
+             * - lineAnnotationController is visible (i.e not in end state)
+             * - Amazon Q chat is visible
+             */
+            const isLineAnnotationVisible = globals.globalState.tryGet(inlinehintKey, String)
+            if ((isLineAnnotationVisible && isLineAnnotationVisible !== EndState.id) || this.isAmazonQVisible) {
+                return resolve([])
+            }
+
+            if (AuthUtil.instance.getChatAuthStateSync().amazonQ !== AuthStates.connected) {
+                return resolve([])
+            }
+
+            if (this.count >= TryChatCodeLensProvider.maxCount) {
+                // We only want to show this code lens a certain amount of times
+                // to not annoy customers. The following ensures it is never shown again.
+                this.dispose()
+                return resolve([])
+            }
+
+            // We use a timeout as a leading debounce so that the user must
+            // wait on a specific line for a certain amount of time until we show the codelens.
+            // This prevents spamming code lenses if the user changes multiple lines quickly.
+            globals.clock.setTimeout(() => {
+                const position = this.cursorPositionIfValid()
+                if (token.isCancellationRequested || position === undefined) {
+                    return resolve([])
+                }
+
+                resolve([
+                    {
+                        range: new vscode.Range(position, position),
+                        isResolved: true,
+                        command: {
+                            command: tryChatCodeLensCommand.id,
+                            title: `Amazon Q: open chat with (${resolveModifierKey()} + i) - showing ${
+                                TryChatCodeLensProvider.maxCount - this.count
+                            } more times`,
+                        },
+                    },
+                ])
+
+                this.count++
+            }, TryChatCodeLensProvider.debounceMillis)
+        })
+    }
+
+    /**
+     * Resolves the current cursor position in the active document
+     * if the criteria are met.
+     */
+    private static _resolveCursorPosition(): vscode.Position | undefined {
+        const activeEditor = vscode.window.activeTextEditor
+        const activeDocument = activeEditor?.document
+        const textSelection = activeEditor?.selection
+        if (
+            !activeEditor ||
+            !activeDocument ||
+            activeEditor.selections.length > 1 || // is multi-cursor select
+            !textSelection?.isSingleLine ||
+            activeDocument.lineAt(textSelection.start.line).text.length === 0 // is empty line
+        ) {
+            return undefined
+        }
+
+        return textSelection.start
+    }
+
+    dispose() {
+        globals.globalState.tryUpdate('aws.amazonq.showTryChatCodeLens', false)
+        TryChatCodeLensProvider.providerDisposable?.dispose()
+        for (const d of this.disposables) {
+            d.dispose()
+        }
+    }
+}
+
+export function resolveModifierKey() {
+    const platformName = platform()
+    switch (platformName) {
+        case 'win32':
+            return 'ctrl'
+        case 'linux':
+            return 'meta'
+        case 'darwin':
+            return 'cmd'
+        default:
+            return 'ctrl'
+    }
+}
diff --git a/packages/core/src/codewhispererChat/editor/context/extractor.ts b/packages/core/src/codewhispererChat/editor/context/extractor.ts
new file mode 100644
index 00000000000..9d3865038ef
--- /dev/null
+++ b/packages/core/src/codewhispererChat/editor/context/extractor.ts
@@ -0,0 +1,74 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { FocusAreaContextExtractor } from './focusArea/focusAreaExtractor'
+import { FocusAreaContext } from './focusArea/model'
+import { FileContextExtractor } from './file/fileExtractor'
+import { FileContext } from './file/model'
+import { EditorContext } from './model'
+import { window } from 'vscode'
+
+export type TriggerType = 'ChatMessage' | 'ContextMenu' | 'QuickAction'
+
+export class EditorContextExtractor {
+    private readonly activeFileContextExtractor: FileContextExtractor
+    private readonly focusAreaContextExtractor: FocusAreaContextExtractor
+
+    public constructor() {
+        this.activeFileContextExtractor = new FileContextExtractor()
+        this.focusAreaContextExtractor = new FocusAreaContextExtractor()
+    }
+
+    public async extractContextForTrigger(triggerType: TriggerType): Promise<EditorContext | undefined> {
+        switch (triggerType) {
+            case 'ChatMessage':
+                return {
+                    activeFileContext: await this.extractActiveFileContext(),
+                    focusAreaContext: await this.extractActiveEditorCodeSelectionContext(),
+                }
+            case 'ContextMenu':
+                return {
+                    activeFileContext: await this.extractActiveFileContext(),
+                    focusAreaContext: await this.extractActiveEditorCodeSelectionContext(),
+                }
+            case 'QuickAction':
+                return {
+                    activeFileContext: undefined,
+                    focusAreaContext: undefined,
+                }
+        }
+        return undefined
+    }
+
+    private async extractActiveEditorCodeSelectionContext(): Promise<FocusAreaContext | undefined> {
+        const editor = window.activeTextEditor
+        if (editor === undefined) {
+            return undefined
+        }
+
+        return this.focusAreaContextExtractor.extract(editor)
+    }
+
+    public isCodeBlockSelected(): boolean {
+        const editor = window.activeTextEditor
+        if (editor === undefined) {
+            return false
+        }
+
+        return this.focusAreaContextExtractor.isCodeBlockSelected(editor)
+    }
+
+    private async extractActiveFileContext(): Promise<FileContext | undefined> {
+        const editor = window.activeTextEditor
+        if (editor === undefined) {
+            return undefined
+        }
+        const currentFile = editor.document
+        if (currentFile === undefined) {
+            return undefined
+        }
+        return this.activeFileContextExtractor.extract(currentFile)
+    }
+}
diff --git a/packages/core/src/codewhispererChat/editor/context/file/fileExtractor.ts b/packages/core/src/codewhispererChat/editor/context/file/fileExtractor.ts
new file mode 100644
index 00000000000..7606fe0708c
--- /dev/null
+++ b/packages/core/src/codewhispererChat/editor/context/file/fileExtractor.ts
@@ -0,0 +1,57 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { TextDocument } from 'vscode'
+import { extractLanguageNameFromFile, extractAdditionalLanguageMatchPoliciesFromFile } from './languages'
+import { MatchPolicy } from '../../../clients/chat/v0/model'
+import { readImports } from './importReader'
+import { FileContext } from './model'
+
+export class FileContextExtractor {
+    public async extract(file: TextDocument): Promise<FileContext> {
+        const fileText = file.getText()
+        const fileLanguage = extractLanguageNameFromFile(file)
+        const filePath = file.fileName
+        const matchPolicy = await this.extractMatchPolicyFromFile(file, false)
+
+        return {
+            fileText,
+            fileLanguage,
+            filePath,
+            matchPolicy,
+        }
+    }
+
+    private async extractMatchPolicyFromFile(file: TextDocument, isCodeSelected: boolean): Promise<MatchPolicy> {
+        const languageId = file.languageId
+
+        const language = extractLanguageNameFromFile(file)
+        const additionalLanguageContext = extractAdditionalLanguageMatchPoliciesFromFile(file)
+        const should = additionalLanguageContext
+        const must = new Set<string>()
+        if (language !== undefined) {
+            if (isCodeSelected) {
+                must.add(language)
+            } else {
+                should.add(language)
+            }
+        }
+
+        if (languageId !== undefined) {
+            const imports = await readImports(file.getText(), languageId)
+            for (const importKey of imports.filter(function (elem, index, self) {
+                return index === self.indexOf(elem) && elem !== languageId
+            })) {
+                should.add(importKey)
+            }
+        }
+
+        return {
+            must: Array.from(must),
+            should: Array.from(should),
+            mustNot: [],
+        }
+    }
+}
diff --git a/packages/core/src/codewhispererChat/editor/context/file/importReader.ts b/packages/core/src/codewhispererChat/editor/context/file/importReader.ts
new file mode 100644
index 00000000000..ff99a183bd9
--- /dev/null
+++ b/packages/core/src/codewhispererChat/editor/context/file/importReader.ts
@@ -0,0 +1,25 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { extractContextFromJavaImports } from './javaImportReader'
+
+export async function readImports(text: string, languageId: string): Promise<string[]> {
+    const names: any = {}
+    //  TODO: call findNames from @aws/fully-qualified-names for imports
+    //  after promise not resolving issue is fixed
+
+    if (names.fullyQualified === undefined) {
+        return []
+    }
+    if (languageId === 'java') {
+        return extractContextFromJavaImports(names)
+    } else {
+        const imports = names.fullyQualified?.declaredSymbols
+            .map((symbol: { source: string[] }): string => {
+                return symbol.source[0].replace('@', '')
+            })
+            .filter((source: string) => source.length !== 0)
+        return imports
+    }
+}
diff --git a/packages/core/src/codewhispererChat/editor/context/file/javaImportReader.ts b/packages/core/src/codewhispererChat/editor/context/file/javaImportReader.ts
new file mode 100644
index 00000000000..b66a6c44936
--- /dev/null
+++ b/packages/core/src/codewhispererChat/editor/context/file/javaImportReader.ts
@@ -0,0 +1,58 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export interface JavaImport {
+    readonly tld: string
+    readonly organisation?: string
+    readonly packages?: string[]
+}
+
+export function extractContextFromJavaImports(names: any): string[] {
+    return names.fullyQualified?.declaredSymbols
+        .map((symbol: any): JavaImport => {
+            const sourcesCount = symbol.source.length
+            return {
+                tld: symbol.source[0],
+                organisation: sourcesCount > 1 ? symbol.source[1] : undefined,
+                packages: sourcesCount > 2 ? symbol.source.slice(2) : undefined,
+            }
+        })
+        .map((javaImport: JavaImport): string => {
+            const importStatement = toString(javaImport)
+            if (commonJavaImportsPrefixesRegex.test(importStatement)) {
+                return ''
+            } else if (importStatement.startsWith(awsJavaSdkV1Prefix)) {
+                // @ts-ignore
+                return javaImport.packages?.at(1) ?? ''
+            } else if (importStatement.startsWith(awsJavaSdkV2Prefix)) {
+                // @ts-ignore
+                return javaImport.packages?.at(2) ?? ''
+            } else {
+                // @ts-ignore
+                return javaImport.packages?.at(0) ?? javaImport.organisation ?? javaImport.tld
+            }
+        })
+        .filter((context: string) => context !== '')
+}
+
+function toString(javaImport: JavaImport): string {
+    let importSegments: string[] = []
+    importSegments.push(javaImport.tld)
+    if (javaImport.organisation !== undefined) {
+        importSegments.push(javaImport.organisation)
+    }
+    if (javaImport.packages !== undefined) {
+        importSegments = importSegments.concat(javaImport.packages)
+    }
+    return importSegments.join('.') + '.'
+}
+
+const commonJavaImportsPrefixesRegex = new RegExp(
+    '^(java.|javax.|org.slf4j.|org.apache.log4j.|org.apache.logging.log4j.|org.junit.|org.testng.)'
+)
+
+const awsJavaSdkV1Prefix = 'com.amazonaws.services'
+
+const awsJavaSdkV2Prefix = 'software.amazon.awssdk.services'
diff --git a/packages/core/src/codewhispererChat/editor/context/file/languages.ts b/packages/core/src/codewhispererChat/editor/context/file/languages.ts
new file mode 100644
index 00000000000..51887eaf31b
--- /dev/null
+++ b/packages/core/src/codewhispererChat/editor/context/file/languages.ts
@@ -0,0 +1,176 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { TextDocument } from 'vscode'
+
+const defaultLanguages = [
+    'yaml',
+    'xsl',
+    'xml',
+    'vue',
+    'tex',
+    'typescript',
+    'swift',
+    'stylus',
+    'sql',
+    'slim',
+    'shaderlab',
+    'sass',
+    'rust',
+    'ruby',
+    'r',
+    'python',
+    'pug',
+    'powershell',
+    'php',
+    'perl',
+    'markdown',
+    'makefile',
+    'lua',
+    'less',
+    'latex',
+    'json',
+    'javascript',
+    'java',
+    'ini',
+    'html',
+    'haml',
+    'handlebars',
+    'groovy',
+    'go',
+    'diff',
+    'css',
+    'c',
+    'coffeescript',
+    'clojure',
+    'bibtex',
+    'abap',
+]
+
+export function extractLanguageNameFromFile(file: TextDocument): string | undefined {
+    const languageId = file.languageId
+
+    if (languageId === undefined) {
+        return undefined
+    }
+    if (defaultLanguages.includes(languageId)) {
+        return languageId
+    }
+    switch (languageId) {
+        case 'bat':
+            return 'bat'
+        case 'cpp':
+            return 'c++'
+        case 'csharp':
+            return 'c#'
+        case 'cuda-cpp':
+            return 'c++'
+        case 'dockerfile':
+            return 'dockerfile'
+        case 'fsharp':
+            return 'f#'
+        case 'git-commit':
+            return 'git'
+        case 'git-rebase':
+            return 'git'
+        case 'javascriptreact':
+            return 'javascript'
+        case 'jsonc':
+            return 'json'
+        case 'objective-c':
+            return 'objective-c'
+        case 'objective-cpp':
+            return 'objective-c++'
+        case 'perl6':
+            return 'raku'
+        case 'plaintext':
+            return undefined
+        case 'jade':
+            return 'pug'
+        case 'razor':
+            return 'razor'
+        case 'scss':
+            return 'sass'
+        case 'shellscript':
+            return 'sh'
+        case 'typescriptreact':
+            return 'typescript'
+        case 'vb':
+            return 'visual-basic'
+        case 'vue-html':
+            return 'vue'
+        default:
+            if (['javascript', 'node'].some((identifier) => languageId.includes(identifier))) {
+                return 'javascript'
+            } else if (languageId.includes('typescript')) {
+                return 'typescript'
+            } else if (languageId.includes('python')) {
+                return 'python'
+            }
+            return undefined
+    }
+}
+
+// eslint-disable-next-line id-length
+export function extractAdditionalLanguageMatchPoliciesFromFile(file: TextDocument): Set<string> {
+    const languageId = file.languageId
+
+    if (languageId === undefined || defaultLanguages.includes(languageId)) {
+        return new Set<string>()
+    }
+    switch (languageId) {
+        case 'bat':
+            return new Set<string>(['windows'])
+        case 'cpp':
+            return new Set<string>()
+        case 'csharp':
+            return new Set<string>()
+        case 'cuda-cpp':
+            return new Set<string>(['cuda'])
+        case 'dockerfile':
+            return new Set<string>(['docker'])
+        case 'fsharp':
+            return new Set<string>()
+        case 'git-commit':
+            return new Set<string>(['commit'])
+        case 'git-rebase':
+            return new Set<string>(['rebase'])
+        case 'javascriptreact':
+            return new Set<string>(['react'])
+        case 'jsonc':
+            return new Set<string>(['comments'])
+        case 'objective-c':
+            return new Set<string>()
+        case 'objective-cpp':
+            return new Set<string>()
+        case 'perl6':
+            return new Set<string>(['perl'])
+        case 'plaintext':
+            return new Set<string>()
+        case 'jade':
+            return new Set<string>()
+        case 'razor':
+            return new Set<string>(['html'])
+        case 'scss':
+            return new Set<string>(['scss', 'css'])
+        case 'shellscript':
+            return new Set<string>()
+        case 'typescriptreact':
+            return new Set<string>(['react'])
+        case 'vb':
+            return new Set<string>()
+        case 'vue-html':
+            return new Set<string>(['html'])
+        default:
+            if (['javascript', 'node'].some((identifier) => languageId.includes(identifier))) {
+                return new Set<string>()
+            } else if (languageId.includes('typescript')) {
+                return new Set<string>()
+            } else if (languageId.includes('python')) {
+                return new Set<string>()
+            }
+            return new Set<string>()
+    }
+}
diff --git a/packages/core/src/codewhispererChat/editor/context/file/model.ts b/packages/core/src/codewhispererChat/editor/context/file/model.ts
new file mode 100644
index 00000000000..42b0846b0cc
--- /dev/null
+++ b/packages/core/src/codewhispererChat/editor/context/file/model.ts
@@ -0,0 +1,13 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { MatchPolicy } from '../../../clients/chat/v0/model'
+
+export interface FileContext {
+    readonly fileText: string | undefined
+    readonly fileLanguage: string | undefined
+    readonly filePath: string | undefined
+    readonly matchPolicy: MatchPolicy | undefined
+}
diff --git a/packages/core/src/codewhispererChat/editor/context/focusArea/focusAreaExtractor.ts b/packages/core/src/codewhispererChat/editor/context/focusArea/focusAreaExtractor.ts
new file mode 100644
index 00000000000..d782f7147ff
--- /dev/null
+++ b/packages/core/src/codewhispererChat/editor/context/focusArea/focusAreaExtractor.ts
@@ -0,0 +1,280 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { TextEditor, Selection, TextDocument, Range } from 'vscode'
+
+import { FocusAreaContext, FullyQualifiedName } from './model'
+
+const focusAreaCharLimit = 40_000
+
+export class FocusAreaContextExtractor {
+    public isCodeBlockSelected(editor: TextEditor): boolean {
+        if (editor.document === undefined) {
+            return false
+        }
+
+        // It means we don't really have a selection, but cursor position only
+        if (
+            editor.selection.start.line === editor.selection.end.line &&
+            editor.selection.start.character === editor.selection.end.character
+        ) {
+            return false
+        }
+
+        return true
+    }
+
+    public async extract(editor: TextEditor): Promise<FocusAreaContext | undefined> {
+        if (editor.document === undefined) {
+            return undefined
+        }
+
+        let importantRange: Range = editor.selection
+
+        // It means we don't really have a selection, but cursor position only
+        if (!this.isCodeBlockSelected(editor)) {
+            // Select the whole line
+            importantRange = editor.document.lineAt(importantRange.start.line).range
+        }
+
+        //  TODO: call findNamesWithInExtent from @aws/fully-qualified-names
+        //  after promise not resolving issue is fixed
+        const names = {}
+        const [simpleNames] = this.prepareSimpleNames(names)
+        const [usedFullyQualifiedNames] = this.prepareFqns(names)
+
+        importantRange = this.trimRangeAccordingToLimits(editor.document, importantRange, focusAreaCharLimit)
+        const codeBlock = this.getRangeText(editor.document, importantRange)
+        const extendedCodeBlockRange = this.getExtendedCodeBlockRange(
+            editor.document,
+            importantRange,
+            focusAreaCharLimit
+        )
+
+        return {
+            extendedCodeBlock: this.getRangeText(editor.document, extendedCodeBlockRange),
+            codeBlock: codeBlock,
+            selectionInsideExtendedCodeBlock: this.getSelectionInsideExtendedCodeBlock(
+                editor.selection,
+                extendedCodeBlockRange
+            ),
+            names:
+                simpleNames.length === 0 && usedFullyQualifiedNames.length === 0
+                    ? undefined
+                    : {
+                          simpleNames,
+                          fullyQualifiedNames: {
+                              used: usedFullyQualifiedNames,
+                          },
+                      },
+        }
+    }
+
+    private getSelectionInsideExtendedCodeBlock(
+        originSelection: Selection,
+        extendedCodeBlockRange: Range
+    ): Selection | undefined {
+        if (
+            originSelection.start.line === originSelection.end.line &&
+            originSelection.start.character === originSelection.end.character
+        ) {
+            return undefined
+        }
+
+        return new Selection(
+            originSelection.start.line - extendedCodeBlockRange.start.line,
+            originSelection.start.line === extendedCodeBlockRange.start.line
+                ? originSelection.start.character - extendedCodeBlockRange.start.character
+                : originSelection.start.character,
+            originSelection.end.line - extendedCodeBlockRange.start.line,
+            originSelection.end.line === extendedCodeBlockRange.end.line
+                ? originSelection.end.character - extendedCodeBlockRange.start.character
+                : originSelection.end.character
+        )
+    }
+
+    // Function to extend the code block range
+    private getExtendedCodeBlockRange(document: TextDocument, importantRange: Range, charLimit: number): Range {
+        // Flag to add line before or after
+        let addLineBefore = true
+        // Loop while range can still be extended
+        while (
+            !(importantRange.start.line === 0 && importantRange.start.character === 0) ||
+            !(
+                importantRange.end.line === document.lineCount - 1 &&
+                importantRange.end.character === document.lineAt(document.lineCount - 1).range.end.character
+            )
+        ) {
+            let tmpRange: Range | undefined = undefined
+            if (addLineBefore) {
+                // Check if we have characters left in the beginning of the current line
+                if (importantRange.start.character !== 0) {
+                    tmpRange = new Range(
+                        importantRange.start.line,
+                        0,
+                        importantRange.end.line,
+                        importantRange.end.character
+                    )
+                } else if (importantRange.start.line !== 0) {
+                    tmpRange = new Range(
+                        importantRange.start.line - 1,
+                        document.lineAt(importantRange.start.line - 1).range.end.character,
+                        importantRange.end.line,
+                        importantRange.end.character
+                    )
+                }
+
+                // Flip flag for next iteration
+                addLineBefore = false
+            } else {
+                // Check if we have characters left in the end of the current line
+                if (importantRange.end.character !== document.lineAt(importantRange.end.line).range.end.character) {
+                    tmpRange = new Range(
+                        importantRange.start.line,
+                        importantRange.start.character,
+                        importantRange.end.line,
+                        document.lineAt(importantRange.end.line).range.end.character
+                    )
+                } else if (importantRange.end.line !== document.lineCount - 1) {
+                    tmpRange = new Range(
+                        importantRange.start.line,
+                        importantRange.start.character,
+                        importantRange.end.line + 1,
+                        0
+                    )
+                }
+
+                // Flip flag for next iteration
+                addLineBefore = true
+            }
+
+            // Check if tmp range was set
+            if (tmpRange === undefined) {
+                continue
+            }
+            // Check character length of tmp range
+            if (this.getRangeText(document, tmpRange).length >= charLimit) {
+                // Break loop if too long
+                break
+            }
+
+            // Update important range
+            importantRange = tmpRange
+        }
+
+        return importantRange
+    }
+
+    private trimRangeAccordingToLimits(document: TextDocument, range: Range, charLimit: number): Range {
+        while (
+            this.getRangeText(document, range).length > charLimit &&
+            (range.start.line !== range.end.line ||
+                (range.start.line === range.end.line && range.start.character !== range.end.character))
+        ) {
+            if (range.end.line === range.start.line) {
+                range = new Range(
+                    range.start.line,
+                    range.start.character,
+                    range.start.line,
+                    range.start.character +
+                        charLimit -
+                        this.getRangeText(
+                            document,
+                            new Range(range.start.line, range.start.character, range.start.line, range.start.character)
+                        ).length -
+                        1
+                )
+            } else {
+                const selectionSizeWithoutLastLine = this.getRangeText(
+                    document,
+                    new Range(
+                        range.start.line,
+                        range.start.character,
+                        range.end.line - 1,
+                        document.lineAt(range.end.line - 1).range.end.character
+                    )
+                ).length
+                if (selectionSizeWithoutLastLine > charLimit) {
+                    range = new Range(
+                        range.start.line,
+                        range.start.character,
+                        range.end.line - 1,
+                        document.lineAt(range.end.line - 1).range.end.character
+                    )
+                } else {
+                    range = new Range(
+                        range.start.line,
+                        range.start.character,
+                        range.end.line,
+                        charLimit - selectionSizeWithoutLastLine - 1
+                    )
+                    return range
+                }
+            }
+        }
+
+        return range
+    }
+
+    private getRangeText(document: TextDocument, range: Range): string {
+        return document.getText(range)
+    }
+
+    private prepareFqns(names: any): [FullyQualifiedName[], boolean] {
+        if (names === undefined || !names.fullyQualified) {
+            return [[], false]
+        }
+        const dedupedUsedFullyQualifiedNames: Map<string, FullyQualifiedName> = new Map(
+            names.fullyQualified.usedSymbols.map((name: any) => [
+                JSON.stringify([name.source, name.symbol]),
+                { source: name.source, symbol: name.symbol },
+            ])
+        )
+        const usedFullyQualifiedNames = Array.from(dedupedUsedFullyQualifiedNames.values())
+
+        const maxUsedFullyQualifiedNamesLength = 25
+
+        if (usedFullyQualifiedNames.length > maxUsedFullyQualifiedNamesLength) {
+            const usedFullyQualifiedNamesSorted = usedFullyQualifiedNames.sort(
+                (name, other) => name.source.length + name.symbol.length - (other.source.length + other.symbol.length)
+            )
+            return [usedFullyQualifiedNamesSorted.slice(0, maxUsedFullyQualifiedNamesLength), true]
+        }
+
+        return [usedFullyQualifiedNames, false]
+    }
+
+    private prepareSimpleNames(names: any): [string[], boolean] {
+        if (names === undefined || !names.simple) {
+            return [[], false]
+        }
+        let simpleNames: string[] = names.simple.usedSymbols
+            .concat(names.simple.declaredSymbols)
+            .filter(function (elem: any) {
+                const trimmedElem = elem.symbol.trim()
+                return trimmedElem.length < 129 && trimmedElem.length > 1
+            })
+            .map(function (elem: any) {
+                return elem.symbol.trim()
+            })
+
+        const maxSimpleNamesLength = 100
+
+        let listWasLongerThanMaxLenght = false
+
+        if (simpleNames.length > maxSimpleNamesLength) {
+            listWasLongerThanMaxLenght = true
+
+            simpleNames = [...new Set(simpleNames)]
+
+            if (simpleNames.length > maxSimpleNamesLength) {
+                simpleNames = simpleNames.sort((a, b) => a.length - b.length)
+                simpleNames.splice(0, simpleNames.length - maxSimpleNamesLength)
+            }
+        }
+
+        return [simpleNames, listWasLongerThanMaxLenght]
+    }
+}
diff --git a/packages/core/src/codewhispererChat/editor/context/focusArea/model.ts b/packages/core/src/codewhispererChat/editor/context/focusArea/model.ts
new file mode 100644
index 00000000000..482c35d00b8
--- /dev/null
+++ b/packages/core/src/codewhispererChat/editor/context/focusArea/model.ts
@@ -0,0 +1,25 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Selection } from 'vscode'
+
+export interface CodeNames {
+    simpleNames: string[]
+    fullyQualifiedNames: {
+        used: FullyQualifiedName[]
+    }
+}
+
+export interface FullyQualifiedName {
+    readonly source: string[]
+    readonly symbol: string[]
+}
+
+export interface FocusAreaContext {
+    readonly codeBlock: string
+    readonly extendedCodeBlock: string
+    readonly selectionInsideExtendedCodeBlock: Selection | undefined
+    readonly names: CodeNames | undefined
+}
diff --git a/packages/core/src/codewhispererChat/editor/context/model.ts b/packages/core/src/codewhispererChat/editor/context/model.ts
new file mode 100644
index 00000000000..30e0511c387
--- /dev/null
+++ b/packages/core/src/codewhispererChat/editor/context/model.ts
@@ -0,0 +1,12 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { FocusAreaContext } from './focusArea/model'
+import { FileContext } from './file/model'
+
+export interface EditorContext {
+    readonly activeFileContext: FileContext | undefined
+    readonly focusAreaContext: FocusAreaContext | undefined
+}
diff --git a/packages/core/src/codewhispererChat/index.ts b/packages/core/src/codewhispererChat/index.ts
new file mode 100644
index 00000000000..b47115fbc4a
--- /dev/null
+++ b/packages/core/src/codewhispererChat/index.ts
@@ -0,0 +1,17 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export { FocusAreaContextExtractor } from './editor/context/focusArea/focusAreaExtractor'
+export { TryChatCodeLensProvider, resolveModifierKey, tryChatCodeLensCommand } from './editor/codelens'
+export { focusAmazonQPanel } from './commands/registerCommands'
+export { ChatSession } from './clients/chat/v0/chat'
+export { triggerPayloadToChatRequest, filePathSizeLimit } from './controllers/chat/chatRequest/converter'
+export { ChatTriggerType, PromptMessage, TriggerPayload } from './controllers/chat/model'
+export { UserIntentRecognizer } from './controllers/chat/userIntent/userIntentRecognizer'
+export { EditorContextExtractor } from './editor/context/extractor'
+export { ChatSessionStorage } from './storages/chatSession'
+export { TriggerEventsStorage } from './storages/triggerEvents'
+export { ReferenceLogController } from './view/messages/referenceLogController'
+export { extractLanguageNameFromFile } from './editor/context/file/languages'
diff --git a/packages/core/src/codewhispererChat/storages/chatSession.ts b/packages/core/src/codewhispererChat/storages/chatSession.ts
new file mode 100644
index 00000000000..378d84e4237
--- /dev/null
+++ b/packages/core/src/codewhispererChat/storages/chatSession.ts
@@ -0,0 +1,30 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ChatSession } from '../clients/chat/v0/chat'
+
+export class ChatSessionStorage {
+    private sessions: Map<string, ChatSession> = new Map()
+
+    public getSession(tabID: string): ChatSession {
+        const sessionFromStorage = this.sessions.get(tabID)
+        if (sessionFromStorage !== undefined) {
+            return sessionFromStorage
+        }
+
+        const newSession = new ChatSession()
+        this.sessions.set(tabID, newSession)
+
+        return newSession
+    }
+
+    public deleteSession(tabID: string) {
+        this.sessions.delete(tabID)
+    }
+
+    public deleteAllSessions() {
+        this.sessions.clear()
+    }
+}
diff --git a/packages/core/src/codewhispererChat/storages/triggerEvents.ts b/packages/core/src/codewhispererChat/storages/triggerEvents.ts
new file mode 100644
index 00000000000..1bbf08b6de9
--- /dev/null
+++ b/packages/core/src/codewhispererChat/storages/triggerEvents.ts
@@ -0,0 +1,89 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { EditorContextCommand } from '../commands/registerCommands'
+import { EditorContext } from '../editor/context/model'
+
+export type TriggerEventType =
+    | 'chat_message'
+    | 'editor_context_command'
+    | 'follow_up'
+    | 'onboarding_page_interaction'
+    | 'quick_action'
+    | 'inline_chat'
+
+export interface TriggerEvent {
+    readonly id: string
+    tabID: string | undefined
+    readonly context: EditorContext | undefined
+    readonly message: string | undefined
+    readonly type: TriggerEventType
+    readonly command?: EditorContextCommand
+    readonly quickAction?: string
+}
+
+export class TriggerEventsStorage {
+    private triggerEvents: Map<string, TriggerEvent> = new Map()
+    private triggerEventsByTabID: Map<string, TriggerEvent[]> = new Map()
+
+    public removeTabEvents(tabID: string) {
+        const events = this.triggerEventsByTabID.get(tabID) ?? []
+        // eslint-disable-next-line unicorn/no-array-for-each
+        events.forEach((event: TriggerEvent) => {
+            this.triggerEvents.delete(event.id)
+        })
+
+        this.triggerEventsByTabID.delete(tabID)
+    }
+
+    public getLastTriggerEventByTabID(tabID: string): TriggerEvent | undefined {
+        const events = this.triggerEventsByTabID.get(tabID) ?? []
+
+        if (events.length === 0) {
+            return undefined
+        }
+
+        return events[events.length - 1]
+    }
+
+    private pushEventToTriggerEventsByTabID(event: TriggerEvent) {
+        if (event.tabID === undefined) {
+            return
+        }
+        const currentEventsList = this.triggerEventsByTabID.get(event.tabID) ?? []
+        currentEventsList.push(event)
+        this.triggerEventsByTabID.set(event.tabID, currentEventsList)
+    }
+
+    public addTriggerEvent(event: TriggerEvent) {
+        this.triggerEvents.set(event.id, event)
+        this.pushEventToTriggerEventsByTabID(event)
+    }
+
+    public removeTriggerEvent(id: string) {
+        this.triggerEvents.delete(id)
+    }
+
+    public updateTriggerEventTabIDFromUnknown(id: string, tabID: string) {
+        const currentTriggerEvent = this.triggerEvents.get(id)
+
+        if (currentTriggerEvent === undefined || currentTriggerEvent.tabID !== undefined) {
+            return
+        }
+
+        currentTriggerEvent.tabID = tabID
+
+        this.triggerEvents.set(id, currentTriggerEvent)
+        this.pushEventToTriggerEventsByTabID(currentTriggerEvent)
+    }
+
+    public getTriggerEvent(id: string): TriggerEvent | undefined {
+        return this.triggerEvents.get(id)
+    }
+
+    public getTriggerEventsByTabID(tabID: string): TriggerEvent[] {
+        return this.triggerEventsByTabID.get(tabID) ?? []
+    }
+}
diff --git a/packages/core/src/codewhispererChat/view/connector/connector.ts b/packages/core/src/codewhispererChat/view/connector/connector.ts
new file mode 100644
index 00000000000..6632819688a
--- /dev/null
+++ b/packages/core/src/codewhispererChat/view/connector/connector.ts
@@ -0,0 +1,463 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { MessagePublisher } from '../../../amazonq/messages/messagePublisher'
+import { EditorContextCommandType } from '../../commands/registerCommands'
+import { AuthFollowUpType } from '../../../amazonq/auth/model'
+import {
+    ChatItem,
+    ChatItemButton,
+    ChatItemFormItem,
+    DetailedList,
+    DetailedListItem,
+    MynahUIDataModel,
+    QuickActionCommand,
+} from '@aws/mynah-ui'
+import { DocumentReference } from '../../controllers/chat/model'
+import { TabType } from '../../../amazonq/webview/ui/storages/tabsStorage'
+
+class UiMessage {
+    readonly time: number = Date.now()
+    readonly sender: string = 'CWChat'
+    readonly type: string = ''
+
+    public constructor(public tabID: string | undefined) {}
+}
+
+export class ErrorMessage extends UiMessage {
+    readonly title!: string
+    readonly message!: string
+    override type = 'errorMessage'
+
+    constructor(title: string, message: string, tabID: string) {
+        super(tabID)
+        this.title = title
+        this.message = message
+    }
+}
+
+interface SearchSuggestionCommonProps {
+    readonly title: string
+    readonly url: string
+    readonly body: string
+    readonly id: number
+}
+
+class SearchSuggestionCommon {
+    readonly title!: string
+    readonly url!: string
+    readonly body!: string
+    readonly id!: number
+
+    constructor(props: SearchSuggestionCommonProps) {
+        this.title = props.title
+        this.url = props.url
+        this.body = props.body
+        this.id = props.id
+    }
+}
+
+export class APIDocsSuggestion extends SearchSuggestionCommon {
+    readonly metadata!: APIDocsSuggestionMetadata
+}
+
+interface APIDocsSuggestionMetadata {
+    readonly canonicalExample: CodeExample
+}
+
+interface CodeExample {
+    readonly url: string
+    readonly body: string
+}
+
+export interface SuggestionProps extends SearchSuggestionCommonProps {
+    readonly metadata?: SuggestionMetadata
+    readonly context: string[]
+}
+
+export class Suggestion extends SearchSuggestionCommon {
+    readonly metadata?: SuggestionMetadata
+    readonly context: string[]
+
+    constructor(props: SuggestionProps) {
+        super(props)
+        this.metadata = props.metadata
+        this.context = props.context
+    }
+}
+
+interface SuggestionMetadata {
+    readonly stackOverflow: StackOverflowMetadata
+}
+
+interface StackOverflowMetadata {
+    readonly answerCount: number
+    readonly isAccepted: boolean
+    readonly score: number
+    readonly lastActivityDate: Date
+}
+
+export class SearchView extends UiMessage {
+    readonly suggestions: Suggestion[] | undefined
+    readonly apiDocsSuggestions: APIDocsSuggestion[] | undefined
+    readonly enableAPIDocsTab: boolean = false
+    override type = 'drawNewSearchViewState'
+}
+
+export type ChatMessageType = 'answer-stream' | 'answer-part' | 'answer'
+
+export interface CodeReference {
+    licenseName?: string
+    repository?: string
+    url?: string
+    recommendationContentSpan?: {
+        start?: number
+        end?: number
+    }
+}
+
+export interface AuthNeededExceptionProps {
+    readonly message: string
+    readonly authType: AuthFollowUpType
+    readonly triggerID: string
+}
+
+export class AuthNeededException extends UiMessage {
+    readonly message: string
+    readonly authType: AuthFollowUpType
+    readonly triggerID: string
+    override type = 'authNeededException'
+
+    constructor(props: AuthNeededExceptionProps, tabID: string) {
+        super(tabID)
+        this.message = props.message
+        this.triggerID = props.triggerID
+        this.authType = props.authType
+    }
+}
+
+export class OpenSettingsMessage extends UiMessage {
+    override type = 'openSettingsMessage'
+}
+
+export class RestoreTabMessage extends UiMessage {
+    override type = 'restoreTabMessage'
+    readonly tabType: TabType
+    readonly chats: ChatItem[]
+    readonly historyId: string
+    readonly exportTab?: boolean
+
+    constructor(historyId: string, tabType: TabType, chats: ChatItem[], exportTab?: boolean) {
+        super(undefined)
+        this.chats = chats
+        this.tabType = tabType
+        this.historyId = historyId
+        this.exportTab = exportTab
+    }
+}
+
+export class OpenDetailedListMessage extends UiMessage {
+    override type = 'openDetailedListMessage'
+    readonly detailedList: DetailedList
+    listType: string
+
+    constructor(tabID: string, listType: string, data: DetailedList) {
+        super(tabID)
+        this.listType = listType
+        this.detailedList = data
+    }
+}
+
+export class UpdateDetailedListMessage extends UiMessage {
+    override type = 'updateDetailedListMessage'
+    readonly detailedList: DetailedList
+    listType: string
+
+    constructor(listType: string, data: DetailedList) {
+        super(undefined)
+        this.listType = listType
+        this.detailedList = data
+    }
+}
+
+export class CloseDetailedListMessage extends UiMessage {
+    override type = 'closeDetailedListMessage'
+    listType: string
+
+    constructor(listType: string) {
+        super(undefined)
+        this.listType = listType
+    }
+}
+
+export class ExportChatMessage extends UiMessage {
+    override type = 'exportChatMessage'
+    readonly format: 'markdown' | 'html'
+    readonly uri: string
+
+    constructor(tabID: string, format: 'markdown' | 'html', uri: string) {
+        super(tabID)
+        this.format = format
+        this.uri = uri
+    }
+}
+
+export class SelectTabMessage extends UiMessage {
+    override type = 'selectTabMessage'
+    readonly eventID?: string
+
+    constructor(tabID: string, eventID?: string) {
+        super(tabID)
+        this.eventID = eventID
+    }
+}
+
+export class DetailedListFilterChangeMessage extends UiMessage {
+    override type = 'detailedListFilterChangeMessage'
+    readonly listType: string
+    readonly filterValues: Record<string, any>
+    readonly isValid: boolean
+
+    constructor(listType: string, filterValues: Record<string, any>, isValid: boolean) {
+        super(undefined)
+        this.listType = listType
+        this.filterValues = filterValues
+        this.isValid = isValid
+    }
+}
+
+export class DetailedListItemSelectMessage extends UiMessage {
+    override type = 'detailedListItemSelectMessage'
+    readonly listType: string
+    readonly item: DetailedListItem
+
+    constructor(listType: string, item: DetailedListItem) {
+        super(undefined)
+        this.listType = listType
+        this.item = item
+    }
+}
+
+export class DetailedListActionClickMessage extends UiMessage {
+    override type = 'detailedListActionClickMessage'
+    readonly listType: string
+    action: ChatItemButton
+
+    constructor(listType: string, action: ChatItemButton) {
+        super(undefined)
+        this.listType = listType
+        this.action = action
+    }
+}
+
+export class ContextCommandData extends UiMessage {
+    readonly data: MynahUIDataModel['contextCommands']
+    override type = 'contextCommandData'
+    constructor(data: MynahUIDataModel['contextCommands']) {
+        super('tab-1')
+        this.data = data
+    }
+}
+
+export class CustomFormActionMessage extends UiMessage {
+    override type = 'customFormActionMessage'
+    readonly action: {
+        id: string
+        text?: string | undefined
+        formItemValues?: Record<string, string> | undefined
+    }
+
+    constructor(
+        tabID: string,
+        action: {
+            id: string
+            text?: string | undefined
+            formItemValues?: Record<string, string> | undefined
+        }
+    ) {
+        super(tabID)
+        this.action = action
+    }
+}
+
+export class ShowCustomFormMessage extends UiMessage {
+    override type = 'showCustomFormMessage'
+    readonly formItems?: ChatItemFormItem[]
+    readonly buttons?: ChatItemButton[]
+    readonly title?: string
+    readonly description?: string
+
+    constructor(
+        tabID: string,
+        formItems?: ChatItemFormItem[],
+        buttons?: ChatItemButton[],
+        title?: string,
+        description?: string
+    ) {
+        super(tabID)
+        this.formItems = formItems
+        this.buttons = buttons
+        this.title = title
+        this.description = description
+    }
+}
+
+export class ContextSelectedMessage extends UiMessage {
+    override type = 'contextSelectedMessage'
+    readonly contextItem: QuickActionCommand
+
+    constructor(tabID: string, contextItem: QuickActionCommand) {
+        super(tabID)
+        this.contextItem = contextItem
+    }
+}
+
+export interface ChatMessageProps {
+    readonly message: string | undefined
+    readonly messageType: ChatMessageType
+    readonly followUps: FollowUp[] | undefined
+    readonly followUpsHeader: string | undefined
+    readonly relatedSuggestions: Suggestion[] | undefined
+    readonly codeReference?: CodeReference[]
+    readonly triggerID: string
+    readonly messageID: string
+    readonly userIntent: string | undefined
+    readonly codeBlockLanguage: string | undefined
+    readonly contextList: DocumentReference[] | undefined
+}
+
+export class ChatMessage extends UiMessage {
+    readonly message: string | undefined
+    readonly messageType: ChatMessageType
+    readonly followUps: FollowUp[] | undefined
+    readonly codeReference: CodeReference[] | undefined
+    readonly relatedSuggestions: Suggestion[] | undefined
+    readonly searchResults: Suggestion[] | undefined
+    readonly followUpsHeader: string | undefined
+    readonly triggerID: string
+    readonly messageID: string | undefined
+    readonly userIntent: string | undefined
+    readonly codeBlockLanguage: string | undefined
+    readonly contextList: DocumentReference[] | undefined
+    override type = 'chatMessage'
+
+    constructor(props: ChatMessageProps, tabID: string) {
+        super(tabID)
+        this.message = props.message
+        this.messageType = props.messageType
+        this.followUps = props.followUps
+        this.followUpsHeader = props.followUpsHeader
+        this.relatedSuggestions = props.relatedSuggestions
+        this.codeReference = props.codeReference
+        this.triggerID = props.triggerID
+        this.messageID = props.messageID
+        this.userIntent = props.userIntent
+        this.codeBlockLanguage = props.codeBlockLanguage
+        this.contextList = props.contextList
+    }
+}
+
+export interface FollowUp {
+    readonly type: string
+    readonly pillText: string
+    readonly prompt: string
+}
+
+export interface EditorContextCommandMessageProps {
+    readonly message: string
+    readonly triggerID: string
+    readonly command?: EditorContextCommandType
+}
+
+export class EditorContextCommandMessage extends UiMessage {
+    readonly message: string
+    readonly triggerID: string
+    readonly command?: EditorContextCommandType
+    override type = 'editorContextCommandMessage'
+
+    constructor(props: EditorContextCommandMessageProps) {
+        super(undefined)
+        this.message = props.message
+        this.triggerID = props.triggerID
+        this.command = props.command
+    }
+}
+
+export interface QuickActionMessageProps {
+    readonly message: string
+    readonly triggerID: string
+}
+
+export class QuickActionMessage extends UiMessage {
+    readonly message: string
+    readonly triggerID: string
+    override type = 'editorContextCommandMessage'
+
+    constructor(props: QuickActionMessageProps) {
+        super(undefined)
+        this.message = props.message
+        this.triggerID = props.triggerID
+    }
+}
+
+export class AppToWebViewMessageDispatcher {
+    constructor(private readonly appsToWebViewMessagePublisher: MessagePublisher<any>) {}
+
+    public sendErrorMessage(message: ErrorMessage) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendChatMessage(message: ChatMessage) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendEditorContextCommandMessage(message: EditorContextCommandMessage) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendQuickActionMessage(message: QuickActionMessage) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendAuthNeededExceptionMessage(message: AuthNeededException) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendOpenSettingsMessage(message: OpenSettingsMessage) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendRestoreTabMessage(message: RestoreTabMessage) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendOpenDetailedListMessage(message: OpenDetailedListMessage) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendUpdateDetailedListMessage(message: UpdateDetailedListMessage) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendCloseDetailedListMessage(message: CloseDetailedListMessage) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendSerializeTabMessage(message: ExportChatMessage) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendSelectTabMessage(message: SelectTabMessage) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendContextCommandData(message: ContextCommandData) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+
+    public sendShowCustomFormMessage(message: ShowCustomFormMessage) {
+        this.appsToWebViewMessagePublisher.publish(message)
+    }
+}
diff --git a/packages/core/src/codewhispererChat/view/messages/messageListener.ts b/packages/core/src/codewhispererChat/view/messages/messageListener.ts
new file mode 100644
index 00000000000..8ad59acb0a7
--- /dev/null
+++ b/packages/core/src/codewhispererChat/view/messages/messageListener.ts
@@ -0,0 +1,359 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { MessageListener } from '../../../amazonq/messages/messageListener'
+import { ExtensionMessage } from '../../../amazonq/webview/ui/commands'
+import { AuthController } from '../../../amazonq/auth/controller'
+import { ChatControllerMessagePublishers } from '../../controllers/chat/controller'
+import { ReferenceLogController } from './referenceLogController'
+import { getLogger } from '../../../shared/logger/logger'
+import { openSettingsId } from '../../../shared/settings'
+import { Database } from '../../../shared/db/chatDb/chatDb'
+
+export interface UIMessageListenerProps {
+    readonly chatControllerMessagePublishers: ChatControllerMessagePublishers
+    readonly webViewMessageListener: MessageListener<any>
+}
+
+export class UIMessageListener {
+    private chatControllerMessagePublishers: ChatControllerMessagePublishers
+    private webViewMessageListener: MessageListener<any>
+    private referenceLogController: ReferenceLogController
+    private authController: AuthController
+
+    constructor(props: UIMessageListenerProps) {
+        this.chatControllerMessagePublishers = props.chatControllerMessagePublishers
+        this.webViewMessageListener = props.webViewMessageListener
+        this.referenceLogController = new ReferenceLogController()
+        this.authController = new AuthController()
+
+        this.webViewMessageListener.onMessage((msg) => {
+            this.handleMessage(msg)
+        })
+    }
+
+    private handleMessage(msg: ExtensionMessage) {
+        switch (msg.command) {
+            case 'help':
+            case 'clear':
+            case 'transform':
+            case 'chat-prompt':
+                this.processChatMessage(msg)
+                break
+            case 'new-tab-was-created':
+                this.processNewTabWasCreated(msg)
+                break
+            case 'tab-was-removed':
+                this.processTabWasRemoved(msg)
+                break
+            case 'tab-was-changed':
+                this.processTabWasChanged(msg)
+                break
+            case 'auth-follow-up-was-clicked':
+                this.processAuthFollowUpWasClicked(msg)
+                break
+            case 'follow-up-was-clicked':
+                if (msg.followUp?.prompt !== undefined) {
+                    this.processChatMessage({
+                        chatMessage: msg.followUp.prompt,
+                        tabID: msg.tabID,
+                        command: msg.command,
+                        messageId: msg.messageId,
+                        userIntent: msg.followUp.type,
+                    })
+                }
+                break
+            case 'accept_diff':
+                this.processAcceptDiff(msg)
+                break
+            case 'view_diff':
+                this.processViewDiff(msg)
+                break
+            case 'code_was_copied_to_clipboard':
+                this.processCodeWasCopiedToClipboard(msg)
+                break
+            case 'insert_code_at_cursor_position':
+                this.processInsertCodeAtCursorPosition(msg)
+                break
+            case 'trigger-tabID-received':
+                this.processTriggerTabIDReceived(msg)
+                break
+            case 'stop-response':
+                this.stopResponse(msg)
+                break
+            case 'chat-item-voted':
+                this.chatItemVoted(msg)
+                break
+            case 'chat-item-feedback':
+                this.chatItemFeedback(msg).catch((e) => {
+                    getLogger().error('chatItemFeedback failed: %s', (e as Error).message)
+                })
+                break
+            case 'ui-focus':
+                this.processUIFocus(msg)
+                break
+            case 'source-link-click':
+                this.processSourceLinkClick(msg)
+                break
+            case 'response-body-link-click':
+                this.processResponseBodyLinkClick(msg)
+                break
+            case 'footer-info-link-click':
+                this.processFooterInfoLinkClick(msg)
+                break
+            case 'open-settings':
+                this.processOpenSettings(msg)
+                break
+            case 'ui-is-ready':
+                this.processUIIsReady()
+                break
+            case 'quick-command-group-action-click':
+                this.quickCommandGroupActionClicked(msg)
+                break
+            case 'form-action-click':
+                this.processCustomFormAction(msg)
+                break
+            case 'context-selected':
+                this.processContextSelected(msg)
+                break
+            case 'file-click':
+                this.fileClick(msg)
+                break
+            case 'tab-restored':
+                this.tabRestored(msg)
+                break
+            case 'tab-bar-button-clicked':
+                this.tabBarButtonClicked(msg)
+                break
+            case 'save-chat':
+                this.saveChat(msg)
+                break
+            case 'detailed-list-filter-change':
+                this.processDetailedListFilterChange(msg)
+                break
+            case 'detailed-list-item-select':
+                this.processDetailedListItemSelect(msg)
+                break
+            case 'detailed-list-action-click':
+                this.processDetailedListActionClick(msg)
+                break
+        }
+    }
+
+    private processDetailedListFilterChange(msg: any) {
+        this.chatControllerMessagePublishers.processDetailedListFilterChangeMessage.publish(msg)
+    }
+    private processDetailedListItemSelect(msg: any) {
+        this.chatControllerMessagePublishers.processDetailedListItemSelectMessage.publish(msg)
+    }
+    private processDetailedListActionClick(msg: any) {
+        this.chatControllerMessagePublishers.processDetailedListActionClickMessage.publish(msg)
+    }
+
+    private tabRestored(msg: any) {
+        const chatHistoryDb = Database.getInstance()
+        chatHistoryDb.setHistoryIdMapping(msg.newTabId, msg.historyId)
+        if (msg.exportTab) {
+            this.chatControllerMessagePublishers.processTabBarButtonClick.publish({
+                tabID: msg.newTabId,
+                buttonId: 'export_chat',
+            })
+        }
+        chatHistoryDb.updateTabOpenState(msg.newTabId, true)
+    }
+
+    private saveChat(msg: any) {
+        this.chatControllerMessagePublishers.processSaveChat.publish({
+            uri: msg.uri,
+            serializedChat: msg.serializedChat,
+        })
+    }
+
+    private tabBarButtonClicked(msg: any) {
+        this.chatControllerMessagePublishers.processTabBarButtonClick.publish({
+            tabID: msg.tabID,
+            buttonId: msg.buttonId,
+        })
+    }
+
+    private processUIIsReady() {
+        this.chatControllerMessagePublishers.processContextCommandUpdateMessage.publish()
+    }
+
+    private processCustomFormAction(msg: any) {
+        this.chatControllerMessagePublishers.processCustomFormAction.publish({ tabID: msg.tabID, ...msg })
+    }
+
+    private processContextSelected(msg: any) {
+        this.chatControllerMessagePublishers.processContextSelected.publish({ tabID: msg.tabID, ...msg })
+    }
+
+    private quickCommandGroupActionClicked(msg: any) {
+        this.chatControllerMessagePublishers.processQuickCommandGroupActionClicked.publish({
+            tabID: msg.tabID,
+            actionId: msg.actionId,
+            command: 'quick-command-group-action-click',
+        })
+    }
+
+    private processOpenSettings(msg: any) {
+        void openSettingsId(`amazonQ.workspaceIndex`)
+    }
+
+    private processAuthFollowUpWasClicked(msg: any) {
+        this.authController.handleAuth(msg.authType)
+    }
+    private processFooterInfoLinkClick(msg: any) {
+        this.chatControllerMessagePublishers.processFooterInfoLinkClick.publish({
+            tabID: msg.tabID,
+            link: msg.link,
+            command: 'footer-info-link-click',
+        })
+    }
+    private processResponseBodyLinkClick(msg: any) {
+        this.chatControllerMessagePublishers.processResponseBodyLinkClick.publish({
+            command: msg.command,
+            messageId: msg.messageId,
+            tabID: msg.tabID,
+            link: msg.link,
+        })
+    }
+
+    private processSourceLinkClick(msg: any) {
+        this.chatControllerMessagePublishers.processSourceLinkClick.publish({
+            command: msg.command,
+            messageId: msg.messageId,
+            tabID: msg.tabID,
+            link: msg.link,
+        })
+    }
+
+    private processUIFocus(msg: any) {
+        this.chatControllerMessagePublishers.processUIFocusMessage.publish({
+            command: msg.command,
+            type: msg.type,
+        })
+    }
+
+    private processTriggerTabIDReceived(msg: any) {
+        this.chatControllerMessagePublishers.processTriggerTabIDReceived.publish({
+            tabID: msg.tabID,
+            triggerID: msg.triggerID,
+        })
+    }
+
+    private processInsertCodeAtCursorPosition(msg: any) {
+        this.referenceLogController.addReferenceLog(msg.codeReference, (msg.code as string) ?? '')
+        this.chatControllerMessagePublishers.processInsertCodeAtCursorPosition.publish({
+            command: msg.command,
+            tabID: msg.tabID,
+            messageId: msg.messageId,
+            userIntent: msg.userIntent,
+            code: msg.code,
+            insertionTargetType: msg.insertionTargetType,
+            codeReference: msg.codeReference,
+            eventId: msg.eventId,
+            codeBlockIndex: msg.codeBlockIndex,
+            totalCodeBlocks: msg.totalCodeBlocks,
+            codeBlockLanguage: msg.codeBlockLanguage,
+        })
+    }
+
+    private processAcceptDiff(msg: any) {
+        this.chatControllerMessagePublishers.processAcceptDiff.publish({
+            command: msg.command,
+            tabID: msg.tabID || msg.tabId,
+            ...msg,
+        })
+    }
+
+    private processViewDiff(msg: any) {
+        this.chatControllerMessagePublishers.processViewDiff.publish({
+            command: msg.command,
+            tabID: msg.tabID || msg.tabId,
+            ...msg,
+        })
+    }
+
+    private processCodeWasCopiedToClipboard(msg: any) {
+        this.chatControllerMessagePublishers.processCopyCodeToClipboard.publish({
+            command: msg.command,
+            tabID: msg.tabID,
+            messageId: msg.messageId,
+            userIntent: msg.userIntent,
+            code: msg.code,
+            insertionTargetType: msg.insertionTargetType,
+            codeReference: msg.codeReference,
+            eventId: msg.eventId,
+            codeBlockIndex: msg.codeBlockIndex,
+            totalCodeBlocks: msg.totalCodeBlocks,
+            codeBlockLanguage: msg.codeBlockLanguage,
+        })
+    }
+
+    private processTabWasRemoved(msg: any) {
+        this.chatControllerMessagePublishers.processTabClosedMessage.publish({
+            tabID: msg.tabID,
+        })
+    }
+
+    private processNewTabWasCreated(msg: any) {
+        this.chatControllerMessagePublishers.processTabCreatedMessage.publish({
+            tabID: msg.tabID,
+            tabOpenInteractionType: msg.tabOpenInteractionType,
+        })
+    }
+
+    private processTabWasChanged(msg: any) {
+        this.chatControllerMessagePublishers.processTabChangedMessage.publish({
+            tabID: msg.tabID,
+            prevTabID: msg.prevTabID,
+        })
+    }
+
+    private processChatMessage(msg: any) {
+        this.chatControllerMessagePublishers.processPromptChatMessage.publish({
+            message: msg.chatMessage,
+            command: msg.command,
+            tabID: msg.tabID,
+            messageId: msg.messageId,
+            userIntent: msg.userIntent !== '' ? msg.userIntent : undefined,
+            context: msg.chatContext,
+        })
+    }
+
+    private stopResponse(msg: any) {
+        this.chatControllerMessagePublishers.processStopResponseMessage.publish({
+            tabID: msg.tabID,
+        })
+    }
+
+    private chatItemVoted(msg: any) {
+        this.chatControllerMessagePublishers.processChatItemVotedMessage.publish({
+            tabID: msg.tabID,
+            command: msg.command,
+            vote: msg.vote,
+            messageId: msg.messageId,
+        })
+    }
+
+    private async chatItemFeedback(msg: any) {
+        this.chatControllerMessagePublishers.processChatItemFeedbackMessage.publish({
+            messageId: msg.messageId,
+            tabID: msg.tabID,
+            command: msg.command,
+            selectedOption: msg.selectedOption,
+            comment: msg.comment,
+        })
+    }
+
+    private fileClick(msg: any) {
+        this.chatControllerMessagePublishers.processFileClick.publish({
+            messageId: msg.messageId,
+            tabID: msg.tabID,
+            command: msg.command,
+            filePath: msg.filePath,
+        })
+    }
+}
diff --git a/packages/core/src/codewhispererChat/view/messages/referenceLogController.ts b/packages/core/src/codewhispererChat/view/messages/referenceLogController.ts
new file mode 100644
index 00000000000..c48ca188053
--- /dev/null
+++ b/packages/core/src/codewhispererChat/view/messages/referenceLogController.ts
@@ -0,0 +1,18 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { window } from 'vscode'
+import { CodeReference } from '../connector/connector'
+import { ReferenceLogViewProvider } from '../../../codewhisperer/service/referenceLogViewProvider'
+
+export class ReferenceLogController {
+    public addReferenceLog(codeReference: CodeReference[] | undefined, code: string) {
+        const editor = window.activeTextEditor
+        if (codeReference !== undefined && editor !== undefined) {
+            const referenceLog = ReferenceLogViewProvider.getReferenceLog(code, codeReference, editor)
+            ReferenceLogViewProvider.instance.addReferenceLog(referenceLog)
+        }
+    }
+}
diff --git a/packages/core/src/commands.ts b/packages/core/src/commands.ts
new file mode 100644
index 00000000000..f69a8dd173c
--- /dev/null
+++ b/packages/core/src/commands.ts
@@ -0,0 +1,192 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * AWS Toolkit extension commands and implementations.
+ * TODO: We should drop this into packages/toolkit, but some of the commands are required for running tests.
+ * Tests in the core lib cannot yet work with extension activation from packages/toolkit, so the core lib is
+ * activated from ./extension.ts instead.
+ * A pre-req for moving this is also moving the Toolkit related tests to packages/toolkit.
+ */
+
+import * as vscode from 'vscode'
+import globals, { isWeb } from './shared/extensionGlobals'
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import { Auth } from './auth/auth'
+import { TreeNode } from './shared/treeview/resourceTreeDataProvider'
+import { getResourceFromTreeNode } from './shared/treeview/utils'
+import { Connection, createSsoProfile } from './auth/connection'
+import {
+    createIamItem,
+    createSsoItem,
+    createBuilderIdItem,
+    createStartUrlPrompter,
+    showRegionPrompter,
+    createBuilderIdConnection,
+    signout,
+    promptAndUseConnection,
+} from './auth/utils'
+import { showCodeWhispererConnectionPrompt } from './codewhisperer/util/showSsoPrompt'
+import { CommonAuthWebview } from './login/webview/vue/backend'
+import { AuthSource, AuthSources } from './login/webview/util'
+import { ServiceItemId, isServiceItemId } from './login/webview/vue/types'
+import { authHelpUrl } from './shared/constants'
+import { getIdeProperties } from './shared/extensionUtilities'
+import { telemetry } from './shared/telemetry/telemetry'
+import { createCommonButtons } from './shared/ui/buttons'
+import { showQuickPick } from './shared/ui/pickerPrompter'
+import { Instance } from './shared/utilities/typeConstructors'
+import { openUrl } from './shared/utilities/vsCodeUtils'
+import { Commands, VsCodeCommandArg, placeholder, vscodeComponent } from './shared/vscode/commands2'
+import { isValidResponse } from './shared/wizards/wizard'
+import { CancellationError } from './shared/utilities/timeoutUtils'
+import { ToolkitError } from './shared/errors'
+import { getContext, setContext } from './shared/vscode/setContext'
+
+function switchConnections(auth: Auth | TreeNode | unknown) {
+    if (!(auth instanceof Auth)) {
+        try {
+            auth = getResourceFromTreeNode(auth, Instance(Auth))
+        } catch {
+            // Fall back in case this command is called from something in package.json.
+            // If so, then the value of auth will be unusable.
+            auth = Auth.instance
+        }
+    }
+
+    return promptAndUseConnection(auth as Auth)
+}
+
+export function registerCommands(context: vscode.ExtensionContext) {
+    const addConnection = Commands.register(
+        { id: 'aws.toolkit.auth.addConnection', telemetryThrottleMs: false },
+        async () => {
+            const items = [createBuilderIdItem(), createSsoItem(), createIamItem()]
+
+            const resp = await showQuickPick(items, {
+                title: localize('aws.auth.addConnection.title', 'Add a Connection to {0}', getIdeProperties().company),
+                placeholder: localize('aws.auth.addConnection.placeholder', 'Select a connection option'),
+                buttons: createCommonButtons() as vscode.QuickInputButton[],
+            })
+            if (!isValidResponse(resp)) {
+                telemetry.ui_click.emit({ elementId: 'connection_optionescapecancel' })
+                throw new CancellationError('user')
+            }
+
+            switch (resp) {
+                case 'iam':
+                    return await globals.awsContextCommands.onCommandCreateCredentialsProfile()
+                case 'sso': {
+                    const startUrlPrompter = await createStartUrlPrompter('IAM Identity Center')
+                    const startUrl = await startUrlPrompter.prompt()
+                    if (!isValidResponse(startUrl)) {
+                        throw new CancellationError('user')
+                    }
+                    telemetry.ui_click.emit({ elementId: 'connection_startUrl' })
+
+                    const region = await showRegionPrompter()
+
+                    const conn = await Auth.instance.createConnection(createSsoProfile(startUrl, region.id))
+                    return Auth.instance.useConnection(conn)
+                }
+                case 'builderId': {
+                    return createBuilderIdConnection(Auth.instance)
+                }
+            }
+        }
+    )
+
+    const manageConnections = Commands.register(
+        { id: 'aws.toolkit.auth.manageConnections', compositeKey: { 1: 'source' } },
+        async (_: VsCodeCommandArg, source: AuthSource, serviceToShow?: ServiceItemId, blocking?: boolean) => {
+            if (_ !== placeholder) {
+                source = AuthSources.vscodeComponent
+            }
+
+            if (isWeb()) {
+                // TODO: CW no longer exists in toolkit. This should be moved to Amazon Q
+                if (source.toLowerCase().includes('codewhisperer')) {
+                    // Show CW specific quick pick for CW connections
+                    return showCodeWhispererConnectionPrompt()
+                }
+                return addConnection.execute()
+            }
+
+            if (!isServiceItemId(serviceToShow)) {
+                serviceToShow = undefined
+            }
+
+            CommonAuthWebview.authSource = source
+            await vscode.commands.executeCommand('aws.explorer.setLoginService', serviceToShow)
+            await setContext('aws.explorer.showAuthView', true)
+
+            // While the auth view is open, we want to be blocking (if the command has been specified to be blocking)
+            const authWindowPromise = new Promise<void>((resolve) => {
+                if (!blocking) {
+                    resolve()
+                }
+
+                const check = globals.clock.setInterval(() => {
+                    if (getContext('aws.explorer.showAuthView') === false) {
+                        clearInterval(check)
+                        resolve()
+                    }
+                }, 500)
+            })
+
+            await vscode.commands.executeCommand('aws.toolkit.AmazonCommonAuth.focus')
+            await authWindowPromise
+        }
+    )
+
+    context.subscriptions.push(
+        addConnection,
+        manageConnections,
+        Commands.register('aws.toolkit.auth.help', async () => {
+            await openUrl(vscode.Uri.parse(authHelpUrl))
+            telemetry.aws_help.emit()
+        }),
+        Commands.register('aws.toolkit.auth.switchConnections', (auth: Auth | TreeNode | unknown) => {
+            telemetry.ui_click.emit({ elementId: 'devtools_connectToAws' })
+            return switchConnections(auth)
+        }),
+        Commands.register('_aws.toolkit.auth.useIamCredentials', (auth: Auth) => {
+            telemetry.ui_click.emit({ elementId: 'explorer_IAMselect_VSCode' })
+            return promptAndUseConnection(auth, 'iam')
+        }),
+        Commands.register('aws.toolkit.credentials.edit', () => globals.awsContextCommands.onCommandEditCredentials()),
+        Commands.register('aws.toolkit.credentials.profile.create', async () => {
+            try {
+                await globals.awsContextCommands.onCommandCreateCredentialsProfile()
+            } finally {
+                telemetry.aws_createCredentials.emit()
+            }
+        }),
+        Commands.register('aws.toolkit.login', async () => {
+            const connections = await Auth.instance.listConnections()
+            if (connections.length === 0) {
+                const source: AuthSource = vscodeComponent
+                return manageConnections.execute(placeholder, source)
+            } else {
+                return switchConnections(Auth.instance)
+            }
+        }),
+        Commands.register('aws.toolkit.auth.signout', async () => {
+            telemetry.ui_click.emit({ elementId: 'devtools_signout' })
+            await signout(Auth.instance)
+        }),
+        Commands.register('_aws.toolkit.auth.autoConnect', Auth.instance.tryAutoConnect),
+        Commands.register('_aws.toolkit.auth.reauthenticate', async (auth: Auth, conn: Connection) => {
+            try {
+                return await auth.reauthenticate(conn)
+            } catch (err) {
+                throw ToolkitError.chain(err, 'Unable to authenticate connection')
+            }
+        })
+    )
+}
diff --git a/packages/core/src/dev/activation.ts b/packages/core/src/dev/activation.ts
new file mode 100644
index 00000000000..16b5d7e53ad
--- /dev/null
+++ b/packages/core/src/dev/activation.ts
@@ -0,0 +1,585 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { createCommonButtons } from '../shared/ui/buttons'
+import { createQuickPick } from '../shared/ui/pickerPrompter'
+import { SkipPrompter } from '../shared/ui/common/skipPrompter'
+import { DevSettings } from '../shared/settings'
+import { FileProvider, VirtualFileSystem } from '../shared/virtualFilesystem'
+import { Commands } from '../shared/vscode/commands2'
+import { createInputBox } from '../shared/ui/inputPrompter'
+import { Wizard } from '../shared/wizards/wizard'
+import { deleteDevEnvCommand, installVsixCommand, openTerminalCommand } from './codecatalyst'
+import { isAnySsoConnection } from '../auth/connection'
+import { Auth } from '../auth/auth'
+import { getLogger } from '../shared/logger/logger'
+import { entries } from '../shared/utilities/tsUtils'
+import { getEnvironmentSpecificMemento } from '../shared/utilities/mementos'
+import { setContext } from '../shared/vscode/setContext'
+import { telemetry } from '../shared/telemetry/telemetry'
+import { getSessionId } from '../shared/telemetry/util'
+import { NotificationsController } from '../notifications/controller'
+import { DevNotificationsState } from '../notifications/types'
+import { QuickPickItem } from 'vscode'
+import { ChildProcess } from '../shared/utilities/processUtils'
+
+interface MenuOption {
+    readonly label: string
+    readonly description?: string
+    readonly detail?: string
+    readonly executor: (ctx: vscode.ExtensionContext) => Promise<unknown> | unknown
+}
+
+export type DevFunction =
+    | 'installVsix'
+    | 'openTerminal'
+    | 'deleteDevEnv'
+    | 'editStorage'
+    | 'resetState'
+    | 'showEnvVars'
+    | 'deleteSsoConnections'
+    | 'expireSsoConnections'
+    | 'editAuthConnections'
+    | 'notificationsSend'
+    | 'forceIdeCrash'
+    | 'startChildProcess'
+
+export type DevOptions = {
+    context: vscode.ExtensionContext
+    auth: () => Auth
+    notificationsController: () => NotificationsController
+    menuOptions?: DevFunction[]
+}
+
+let targetContext: vscode.ExtensionContext
+let globalState: vscode.Memento
+let targetAuth: Auth
+let targetNotificationsController: NotificationsController
+
+/**
+ * Defines AWS Toolkit developer tools.
+ *
+ * Options are displayed as quick-pick items. The {@link MenuOption.executor} callback is ran
+ * on selection. There is no support for name-spacing. Just add the relevant
+ * feature/module as a description so it can be moved around easier.
+ */
+const menuOptions: () => Record<DevFunction, MenuOption> = () => {
+    return {
+        installVsix: {
+            label: 'Install VSIX on Remote Environment',
+            description: 'CodeCatalyst',
+            detail: 'Automatically upload/install a VSIX to a remote host',
+            executor: installVsixCommand,
+        },
+        openTerminal: {
+            label: 'Open Remote Terminal',
+            description: 'CodeCatalyst',
+            detail: 'Opens a new terminal connected to the remote environment',
+            executor: openTerminalCommand,
+        },
+        deleteDevEnv: {
+            label: 'Delete Workspace',
+            description: 'CodeCatalyst',
+            detail: 'Deletes the selected Dev Environment',
+            executor: deleteDevEnvCommand,
+        },
+        editStorage: {
+            label: 'Show or Edit globalState',
+            description: 'VS Code',
+            detail: 'Shows all globalState values, or edit a globalState/secret item',
+            executor: openStorageFromInput,
+        },
+        resetState: {
+            label: 'Reset feature state',
+            detail: 'Quick reset the state of extension components or features',
+            executor: resetState,
+        },
+        showEnvVars: {
+            label: 'Show Environment Variables',
+            description: 'AWS Toolkit',
+            detail: 'Shows all environment variable values',
+            executor: () => showState('envvars'),
+        },
+        deleteSsoConnections: {
+            label: 'Auth: Delete SSO Connections',
+            detail: 'Deletes all SSO Connections the extension is using.',
+            executor: deleteSsoConnections,
+        },
+        expireSsoConnections: {
+            label: 'Auth: Expire SSO Connections',
+            detail: 'Force expires all SSO Connections, in to a "needs reauthentication" state.',
+            executor: expireSsoConnections,
+        },
+        editAuthConnections: {
+            label: 'Auth: Edit Connections',
+            detail: 'Opens editor to all Auth Connections the extension is using.',
+            executor: editSsoConnections,
+        },
+        notificationsSend: {
+            label: 'Notifications: Send Notifications',
+            detail: 'Send JSON notifications for testing.',
+            executor: editNotifications,
+        },
+        forceIdeCrash: {
+            label: 'Crash: Force IDE ExtHost Crash',
+            detail: `Will SIGKILL ExtHost, { pid: ${process.pid}, sessionId: '${getSessionId().slice(0, 8)}-...' }, but the IDE itself will not crash.`,
+            executor: forceQuitIde,
+        },
+        startChildProcess: {
+            label: 'ChildProcess: Start child process',
+            detail: 'Start ChildProcess from our utility wrapper for testing',
+            executor: startChildProcess,
+        },
+    }
+}
+
+/**
+ * Provides (readonly, as opposed to `ObjectEditor`) content for the aws-dev2:/ URI scheme.
+ *
+ * ```
+ * aws-dev2:/state/envvars
+ * aws-dev2:/state/globalstate
+ * ```
+ *
+ * TODO: This only purpose of this provider is to avoid an annoying unsaved, empty document that
+ * re-appears after vscode restart. Ideally there should be only one scheme (aws-dev:/).
+ */
+export class DevDocumentProvider implements vscode.TextDocumentContentProvider {
+    provideTextDocumentContent(uri: vscode.Uri): string {
+        if (uri.path.startsWith('/envvars')) {
+            let s = 'Environment variables known to AWS Toolkit:\n\n'
+            for (const [k, v] of Object.entries(process.env)) {
+                s += `${k}=${v}\n`
+            }
+            return s
+        } else if (uri.path.startsWith('/globalstate')) {
+            // lol hax
+            // as of November 2023, all of a memento's properties are stored as property `f` when minified
+            return JSON.stringify((globalState as any).f, undefined, 4)
+        } else {
+            return `unknown URI path: ${uri}`
+        }
+    }
+}
+
+/**
+ * Enables internal developer tools.
+ *
+ * Commands prefixed with `AWS (Developer)` will appear so long as a developer setting is active.
+ *
+ * See {@link DevSettings} for more information.
+ */
+export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
+    const devSettings = DevSettings.instance
+
+    ctx.subscriptions.push(
+        devSettings.onDidChangeActiveSettings(updateDevMode),
+        vscode.workspace.registerTextDocumentContentProvider('aws-dev2', new DevDocumentProvider()),
+        // "AWS (Developer): Open Developer Menu"
+        vscode.commands.registerCommand('aws.dev.openMenu', async () => {
+            await vscode.commands.executeCommand('_aws.dev.invokeMenu', {
+                context: ctx,
+                auth: () => Auth.instance,
+                notificationsController: () => NotificationsController.instance,
+            })
+        }),
+        // Internal command to open dev menu for a specific context and options
+        vscode.commands.registerCommand('_aws.dev.invokeMenu', (opts: DevOptions) => {
+            targetContext = opts.context
+            // eslint-disable-next-line aws-toolkits/no-banned-usages
+            globalState = targetContext.globalState
+            targetAuth = opts.auth()
+            targetNotificationsController = opts.notificationsController()
+            const options = menuOptions()
+            void openMenu(
+                entries(options)
+                    .filter((e) => (opts.menuOptions ?? Object.keys(options)).includes(e[0]))
+                    .map((e) => e[1])
+            )
+        })
+    )
+
+    await updateDevMode()
+
+    const editor = new ObjectEditor()
+    ctx.subscriptions.push(openStorageCommand.register(editor))
+}
+
+async function openMenu(options: MenuOption[]): Promise<void> {
+    const items = options.map((v) => ({
+        label: v.label,
+        detail: v.detail,
+        description: v.description,
+        skipEstimate: true,
+        data: v.executor,
+    }))
+
+    const prompter = createQuickPick(items, {
+        title: 'Developer Menu',
+        buttons: createCommonButtons(),
+        matchOnDescription: true,
+        matchOnDetail: true,
+    })
+
+    await prompter.prompt()
+}
+
+function isSecrets(obj: vscode.Memento | vscode.SecretStorage): obj is vscode.SecretStorage {
+    return (obj as vscode.SecretStorage).store !== undefined
+}
+
+class VirtualObjectFile implements FileProvider {
+    private mTime = 0
+    private size = 0
+    private readonly onDidChangeEmitter = new vscode.EventEmitter<void>()
+    public readonly onDidChange = this.onDidChangeEmitter.event
+
+    public constructor(
+        private readonly storage: vscode.Memento | vscode.SecretStorage,
+        private readonly key: string
+    ) {}
+
+    /** Emits an event indicating this file's content has changed */
+    public refresh() {
+        /**
+         * Per {@link vscode.FileSystemProvider.onDidChangeFile}, if the mTime and/or size does not change, new file content may
+         * not be retrieved due to optimizations. Without this, when we emit a change the text editor did not update.
+         */
+        this.mTime++
+        this.onDidChangeEmitter.fire()
+    }
+
+    public stat(): { ctime: number; mtime: number; size: number } {
+        // This would need to be filled out to track conflicts
+        return { ctime: 0, mtime: this.mTime, size: this.size }
+    }
+
+    public async read(): Promise<Uint8Array> {
+        const encoder = new TextEncoder()
+
+        const data = encoder.encode(await this.readStore(this.key))
+        this.size = data.length
+        return data
+    }
+
+    public async write(content: Uint8Array): Promise<void> {
+        const decoder = new TextDecoder()
+        const value = JSON.parse(decoder.decode(content))
+
+        await this.updateStore(this.key, value)
+        this.refresh()
+    }
+
+    private async readStore(key: string): Promise<string> {
+        // Could potentially show `undefined` in the editor instead of an empty string
+        if (isSecrets(this.storage)) {
+            const value = (await this.storage.get(key)) ?? ''
+            return JSON.stringify(JSON.parse(value), undefined, 4)
+        } else {
+            if (key === '') {
+                return '(empty key)'
+            }
+            return JSON.stringify(this.storage.get(key, {}), undefined, 4)
+        }
+    }
+
+    private async updateStore(key: string, value: unknown): Promise<unknown> {
+        if (isSecrets(this.storage)) {
+            return this.storage.store(key, JSON.stringify(value))
+        } else {
+            return this.storage.update(key, value)
+        }
+    }
+}
+
+interface Tab {
+    readonly editor: vscode.TextEditor
+    readonly virtualFile: VirtualObjectFile
+    dispose(): void
+}
+
+class ObjectEditor {
+    private static readonly scheme = 'aws-dev'
+
+    private readonly fs = new VirtualFileSystem()
+    private readonly tabs: Map<string, Tab> = new Map()
+
+    public constructor() {
+        vscode.workspace.onDidCloseTextDocument((doc) => {
+            const key = this.fs.uriToKey(doc.uri)
+            this.tabs.get(key)?.dispose()
+            this.tabs.delete(key)
+        })
+
+        vscode.workspace.registerFileSystemProvider(ObjectEditor.scheme, this.fs)
+    }
+
+    public async openStorage(type: 'globalsView' | 'globals' | 'secrets' | 'auth', key: string) {
+        switch (type) {
+            case 'globalsView':
+                return showState('globalstate')
+            case 'globals':
+                return this.openState(globalState, key)
+            case 'secrets':
+                return this.openState(targetContext.secrets, key)
+            case 'auth':
+                // Auth memento is determined in a different way
+                return this.openState(getEnvironmentSpecificMemento(globalState), key)
+        }
+    }
+
+    private async openState(storage: vscode.Memento | vscode.SecretStorage, key: string) {
+        const uri = this.uriFromKey(key, storage)
+        const tab = this.tabs.get(this.fs.uriToKey(uri))
+
+        if (tab) {
+            tab.virtualFile.refresh()
+            await vscode.window.showTextDocument(tab.editor.document)
+            return tab.virtualFile
+        } else {
+            const newTab = await this.createTab(storage, key)
+            const newKey = this.fs.uriToKey(newTab.editor.document.uri)
+            this.tabs.set(newKey, newTab)
+            return newTab.virtualFile
+        }
+    }
+
+    private async createTab(storage: vscode.Memento | vscode.SecretStorage, key: string): Promise<Tab> {
+        const virtualFile = new VirtualObjectFile(storage, key)
+        let disposable: vscode.Disposable
+        let document: vscode.TextDocument
+        if (key !== '') {
+            const uri = this.uriFromKey(key, storage)
+            disposable = this.fs.registerProvider(uri, virtualFile)
+            document = await vscode.workspace.openTextDocument(uri)
+        } else {
+            // don't tie it to a URI so you can't save this view
+            const stream = await virtualFile.read()
+            document = await vscode.workspace.openTextDocument({
+                content: new TextDecoder().decode(stream),
+            })
+        }
+        const withLanguage = await vscode.languages.setTextDocumentLanguage(document, 'json')
+
+        return {
+            editor: await vscode.window.showTextDocument(withLanguage),
+            virtualFile,
+            dispose: () => disposable.dispose(),
+        }
+    }
+
+    private uriFromKey(key: string, storage: vscode.Memento | vscode.SecretStorage): vscode.Uri {
+        const prefix = isSecrets(storage) ? 'secrets' : 'globals'
+
+        return vscode.Uri.parse(`${ObjectEditor.scheme}:`, true).with({
+            path: `/${prefix}/${key}-${targetContext.extension.id}`,
+        })
+    }
+}
+
+async function openStorageFromInput() {
+    const wizard = new (class extends Wizard<{ target: 'globalsView' | 'globals' | 'secrets'; key: string }> {
+        constructor() {
+            super()
+
+            this.form.target.bindPrompter(() =>
+                createQuickPick(
+                    [
+                        { label: 'Show all globalState', data: 'globalsView' },
+                        { label: 'Edit globalState', data: 'globals' },
+                        { label: 'Secrets', data: 'secrets' },
+                    ],
+                    {
+                        title: 'Select a storage type',
+                    }
+                )
+            )
+
+            this.form.key.bindPrompter(({ target }) => {
+                if (target === 'secrets') {
+                    return createInputBox({
+                        title: 'Enter a key',
+                    })
+                } else if (target === 'globalsView') {
+                    return new SkipPrompter()
+                } else if (target === 'globals') {
+                    // List all globalState keys in the quickpick menu.
+                    const items = globalState
+                        .keys()
+                        .map((key) => {
+                            return {
+                                label: key,
+                                data: key,
+                            }
+                        })
+                        .sort((a, b) => {
+                            return a.data.localeCompare(b.data)
+                        })
+
+                    return createQuickPick(items, { title: 'Select a key' })
+                } else {
+                    throw new Error('invalid storage target')
+                }
+            })
+        }
+    })()
+
+    const response = await wizard.run()
+
+    if (response) {
+        return openStorageCommand.execute(response.target, response.key)
+    }
+}
+
+type ResettableFeature = {
+    name: string
+    executor: () => Promise<void> | void
+} & QuickPickItem
+
+/**
+ * Extend this array with features that may need state resets often for
+ * testing purposes. It will appear as an entry in the "Reset feature state" menu.
+ */
+const resettableFeatures: readonly ResettableFeature[] = [
+    {
+        name: 'notifications',
+        label: 'Notifications',
+        detail: 'Resets memory/global state for the notifications panel (includes dismissed, onReceive).',
+        executor: resetNotificationsState,
+    },
+] as const
+
+// TODO this is *somewhat* similar to `openStorageFromInput`. If we need another
+// one of these prompters, can we make it generic?
+async function resetState() {
+    const wizard = new (class extends Wizard<{ target: string; key: string }> {
+        constructor() {
+            super()
+
+            this.form.target.bindPrompter(() =>
+                createQuickPick(
+                    resettableFeatures.map((f) => {
+                        return {
+                            data: f.name,
+                            label: f.label,
+                            detail: f.detail,
+                        }
+                    }),
+                    {
+                        title: 'Select a feature/component to reset',
+                    }
+                )
+            )
+
+            this.form.key.bindPrompter(({ target }) => {
+                if (target && resettableFeatures.some((f) => f.name === target)) {
+                    return new SkipPrompter()
+                }
+                throw new Error('invalid feature target')
+            })
+        }
+    })()
+
+    const response = await wizard.run()
+
+    if (response) {
+        return resettableFeatures.find((f) => f.name === response.target)?.executor()
+    }
+}
+
+async function editSsoConnections() {
+    void openStorageCommand.execute('auth', 'auth.profiles')
+}
+
+async function deleteSsoConnections() {
+    const conns = targetAuth.listConnections()
+    const ssoConns = (await conns).filter(isAnySsoConnection)
+    await Promise.all(ssoConns.map((conn) => targetAuth.deleteConnection(conn)))
+    void vscode.window.showInformationMessage(`Deleted: ${ssoConns.map((c) => c.startUrl).join(', ')}`)
+}
+
+async function expireSsoConnections() {
+    return telemetry.function_call.run(
+        async () => {
+            const conns = targetAuth.listConnections()
+            const ssoConns = (await conns).filter(isAnySsoConnection)
+            await Promise.all(ssoConns.map((conn) => targetAuth.expireConnection(conn)))
+            void vscode.window.showInformationMessage(`Expired: ${ssoConns.map((c) => c.startUrl).join(', ')}`)
+        },
+        { emit: false, functionId: { name: 'expireSsoConnectionsDev' } }
+    )
+}
+
+export function forceQuitIde() {
+    // This current process is the ExtensionHost. Killing it will cause all the extensions to crash
+    // for the current ExtensionHost (unless using "extensions.experimental.affinity").
+    // The IDE instance itself will remaing running, but a new ExtHost will spawn within it.
+    // The PPID (parent process) is vscode itself, killing it crashes all vscode instances.
+    const vsCodePid = process.pid
+    process.kill(vsCodePid, 'SIGKILL') // SIGTERM would be the graceful shutdown
+}
+
+async function showState(path: string) {
+    const uri = vscode.Uri.parse(`aws-dev2://state/${path}-${targetContext.extension.id}`)
+    const doc = await vscode.workspace.openTextDocument(uri)
+    await vscode.window.showTextDocument(doc, { preview: false })
+}
+
+export const openStorageCommand = Commands.from(ObjectEditor).declareOpenStorage('_aws.dev.openStorage')
+
+export async function updateDevMode() {
+    await setContext('aws.isDevMode', DevSettings.instance.isDevMode())
+}
+
+async function resetNotificationsState() {
+    await targetNotificationsController.reset()
+}
+
+async function editNotifications() {
+    const storageKey = 'aws.notifications.dev'
+    const current = globalState.get(storageKey) ?? {}
+    const isValid = (item: any) => {
+        if (typeof item !== 'object' || !Array.isArray(item.startUp) || !Array.isArray(item.emergency)) {
+            return false
+        }
+        return true
+    }
+    if (!isValid(current)) {
+        // Set a default state if the developer does not have it or it's malformed.
+        await globalState.update(storageKey, { startUp: [], emergency: [] } as DevNotificationsState)
+    }
+
+    // Monitor for when the global state is updated.
+    // A notification will be sent based on the contents.
+    const virtualFile = await openStorageCommand.execute('globals', storageKey)
+    virtualFile?.onDidChange(async () => {
+        const val = globalState.get(storageKey) as DevNotificationsState
+        if (!isValid(val)) {
+            void vscode.window.showErrorMessage(
+                'Dev mode: invalid notification object provided. State data must take the form: { "startUp": ToolkitNotification[], "emergency": ToolkitNotification[] }'
+            )
+            return
+        }
+
+        // This relies on the controller being built with DevFetcher, as opposed to
+        // the default RemoteFetcher. DevFetcher will check for notifications in the
+        // global state, which was just modified.
+        await targetNotificationsController.pollForStartUp()
+        await targetNotificationsController.pollForEmergencies()
+    })
+}
+
+async function startChildProcess() {
+    const result = await createInputBox({
+        title: 'Enter a command',
+    }).prompt()
+    if (result) {
+        const [command, ...args] = result?.toString().split(' ') ?? []
+        getLogger().info(`Starting child process: '${command}'`)
+        const processResult = await ChildProcess.run(command, args, { collect: true })
+        getLogger().info(`Child process exited with code ${processResult.exitCode}`)
+    }
+}
diff --git a/packages/core/src/dev/beta.ts b/packages/core/src/dev/beta.ts
new file mode 100644
index 00000000000..329907aa5a3
--- /dev/null
+++ b/packages/core/src/dev/beta.ts
@@ -0,0 +1,192 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as path from 'path'
+import * as nls from 'vscode-nls'
+import * as vscode from 'vscode'
+import AdmZip from 'adm-zip'
+import got from 'got'
+import globals from '../shared/extensionGlobals'
+import { getLogger } from '../shared/logger/logger'
+import fs from '../shared/fs/fs'
+import { VSCODE_EXTENSION_ID } from '../shared/extensions'
+import { makeTemporaryToolkitFolder } from '../shared/filesystemUtilities'
+import { reloadWindowPrompt } from '../shared/utilities/vsCodeUtils'
+import { isUserCancelledError, ToolkitError } from '../shared/errors'
+import { telemetry } from '../shared/telemetry/telemetry'
+import { cast } from '../shared/utilities/typeConstructors'
+import { CancellationError } from '../shared/utilities/timeoutUtils'
+import { isAmazonQ, productName } from '../shared/extensionUtilities'
+import * as devConfig from './config'
+import { isReleaseVersion } from '../shared/vscode/env'
+import { getRelativeDate } from '../shared/datetime'
+
+const localize = nls.loadMessageBundle()
+const logger = getLogger('dev/beta')
+
+const downloadIntervalMs = 1000 * 60 * 60 * 3 // 3 hours (8 times/day).
+
+interface BetaToolkit {
+    readonly needUpdate: boolean
+    readonly lastCheck: number
+}
+
+function getBetaToolkitData(vsixUrl: string): BetaToolkit | undefined {
+    return globals.globalState.tryGet<Record<string, BetaToolkit>>('dev.beta', Object, {})[vsixUrl]
+}
+
+async function updateBetaToolkitData(vsixUrl: string, data: BetaToolkit) {
+    await globals.globalState.update('dev.beta', {
+        ...globals.globalState.get<Record<string, BetaToolkit>>('dev.beta', {}),
+        [vsixUrl]: data,
+    })
+}
+
+/**
+ * Set up "beta" update monitoring.
+ */
+export async function activate(ctx: vscode.ExtensionContext) {
+    const betaUrl = isAmazonQ() ? devConfig.betaUrl.amazonq : devConfig.betaUrl.toolkit
+    if (!isReleaseVersion() && betaUrl) {
+        ctx.subscriptions.push(watchBetaVSIX(betaUrl))
+    }
+}
+
+/**
+ * Watch the beta VSIX daily for changes.
+ * If this is the first time we are watching the beta version or if its been 24 hours since it was last checked then try to prompt for update
+ */
+export function watchBetaVSIX(vsixUrl: string): vscode.Disposable {
+    const toolkit = getBetaToolkitData(vsixUrl)
+    const lastCheckRel = toolkit ? getRelativeDate(new Date(toolkit.lastCheck)) : ''
+    logger.info('watching beta artifacts url (lastCheck: %s): %s', lastCheckRel, vsixUrl)
+
+    if (!toolkit || toolkit.needUpdate || Date.now() - toolkit.lastCheck > downloadIntervalMs) {
+        runAutoUpdate(vsixUrl).catch((e) => {
+            logger.error('runAutoUpdate failed: %s', (e as Error).message)
+        })
+    }
+
+    const interval = globals.clock.setInterval(() => runAutoUpdate(vsixUrl), downloadIntervalMs)
+    return { dispose: () => clearInterval(interval) }
+}
+
+async function runAutoUpdate(vsixUrl: string) {
+    logger.debug(`checking url for a new version: %s`, vsixUrl)
+
+    try {
+        await telemetry.aws_autoUpdateBeta.run(() => checkBetaUrl(vsixUrl))
+    } catch (e) {
+        if (!isUserCancelledError(e)) {
+            logger.warn('beta extension auto-update failed: %s', e)
+        }
+    }
+}
+
+/**
+ * Prompt to update the beta extension when required
+ */
+async function checkBetaUrl(vsixUrl: string): Promise<void> {
+    const resp = await got(vsixUrl).buffer()
+    const latestBetaInfo = await getExtensionInfo(resp)
+    const extId = isAmazonQ() ? VSCODE_EXTENSION_ID.amazonq : VSCODE_EXTENSION_ID.awstoolkit
+    if (extId !== `${latestBetaInfo.publisher}.${latestBetaInfo.name}`) {
+        throw new ToolkitError('URL does not point to an AWS Toolkit artifact', { code: 'InvalidExtensionName' })
+    }
+
+    const currentVersion = vscode.extensions.getExtension(extId)?.packageJSON.version
+    if (latestBetaInfo.version !== currentVersion) {
+        const tmpFolder = await makeTemporaryToolkitFolder()
+        const betaPath = vscode.Uri.joinPath(vscode.Uri.file(tmpFolder), path.basename(vsixUrl))
+        await fs.writeFile(betaPath, resp)
+
+        try {
+            await promptInstallToolkit(betaPath, latestBetaInfo.version, vsixUrl)
+        } finally {
+            await fs.delete(tmpFolder, { recursive: true })
+        }
+    } else {
+        await updateBetaToolkitData(vsixUrl, {
+            lastCheck: Date.now(),
+            needUpdate: false,
+        })
+    }
+}
+
+interface ExtensionInfo {
+    readonly name: string
+    readonly version: string
+    readonly publisher: string
+}
+
+/**
+ * Get information about the extension or error if no version could be found
+ *
+ * @param extension The URI of the extension on disk or the raw data
+ * @returns The version + name of the extension
+ * @throws Error if the extension manifest could not be found or parsed
+ */
+async function getExtensionInfo(extension: Buffer): Promise<ExtensionInfo>
+async function getExtensionInfo(extensionLocation: vscode.Uri): Promise<ExtensionInfo>
+async function getExtensionInfo(extensionOrLocation: vscode.Uri | Buffer): Promise<ExtensionInfo> {
+    const fileNameOrData = extensionOrLocation instanceof vscode.Uri ? extensionOrLocation.fsPath : extensionOrLocation
+    const packageFile = new AdmZip(fileNameOrData).getEntry('extension/package.json')
+    const packageJSON = packageFile?.getData().toString()
+    if (!packageJSON) {
+        throw new ToolkitError('Extension does not have a `package.json`', { code: 'NoPackageJson' })
+    }
+
+    try {
+        const data = JSON.parse(packageJSON)
+
+        return {
+            name: cast(data.name, String),
+            version: cast(data.version, String),
+            publisher: cast(data.publisher, String),
+        }
+    } catch (e) {
+        throw ToolkitError.chain(e, 'Unable to parse extension data', { code: 'BadParse' })
+    }
+}
+
+async function promptInstallToolkit(pluginPath: vscode.Uri, newVersion: string, vsixUrl: string): Promise<void> {
+    const vsixName = path.basename(pluginPath.fsPath)
+    const installBtn = localize('AWS.missingExtension.install', 'Install...')
+
+    const response = await vscode.window.showInformationMessage(
+        localize(
+            'AWS.dev.beta.updatePrompt',
+            'New version of {0} is available at the [beta URL]({1}). Install the new version "{2}" to continue using the beta.',
+            productName(),
+            vsixUrl,
+            newVersion
+        ),
+        installBtn
+    )
+
+    switch (response) {
+        case installBtn:
+            try {
+                logger.info(`installing artifact: ${vsixName}`)
+                await vscode.commands.executeCommand('workbench.extensions.installExtension', pluginPath)
+                await updateBetaToolkitData(vsixUrl, {
+                    lastCheck: Date.now(),
+                    needUpdate: false,
+                })
+                reloadWindowPrompt(
+                    localize('AWS.dev.beta.reloadPrompt', 'Reload now to use the new beta {0}.', productName())
+                )
+            } catch (e) {
+                throw ToolkitError.chain(e, `Failed to install ${vsixName}`, { code: 'FailedExtensionInstall' })
+            }
+            break
+        case undefined:
+            await updateBetaToolkitData(vsixUrl, {
+                lastCheck: Date.now(),
+                needUpdate: true,
+            })
+            throw new CancellationError('user')
+    }
+}
diff --git a/src/dev/codecatalyst.ts b/packages/core/src/dev/codecatalyst.ts
similarity index 80%
rename from src/dev/codecatalyst.ts
rename to packages/core/src/dev/codecatalyst.ts
index 28f23ece9e7..d9dd4e9e5a9 100644
--- a/src/dev/codecatalyst.ts
+++ b/packages/core/src/dev/codecatalyst.ts
@@ -1,20 +1,18 @@
 /*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as glob from 'glob'
-import * as fs from 'fs-extra'
+import { glob } from 'glob'
 import * as path from 'path'
 import * as vscode from 'vscode'
 import * as manifest from '../../package.json'
-import { promisify } from 'util'
-import { getLogger } from '../shared/logger'
+import { getLogger } from '../shared/logger/logger'
 import { selectCodeCatalystResource } from '../codecatalyst/wizards/selectResource'
-import { ExtContext, VSCODE_EXTENSION_ID } from '../shared/extensions'
+import { VSCODE_EXTENSION_ID } from '../shared/extensions'
 import { DevEnvironment, CodeCatalystClient } from '../shared/clients/codecatalystClient'
 import { prepareDevEnvConnection } from '../codecatalyst/model'
-import { ChildProcess } from '../shared/utilities/childProcess'
+import { ChildProcess } from '../shared/utilities/processUtils'
 import { Timeout } from '../shared/utilities/timeoutUtils'
 import { CodeCatalystCommands } from '../codecatalyst/commands'
 import { showViewLogsMessage } from '../shared/utilities/messages'
@@ -22,14 +20,18 @@ import { startVscodeRemote } from '../shared/extensions/ssh'
 import { isValidResponse } from '../shared/wizards/wizard'
 import { createQuickPick } from '../shared/ui/pickerPrompter'
 import { createCommonButtons } from '../shared/ui/buttons'
+import { fs } from '../shared/fs/fs'
 
 type LazyProgress<T> = vscode.Progress<T> & vscode.Disposable & { getToken(): Timeout }
 
+/**
+ * Progress dialog that does not show until `report()` is called.
+ */
 function lazyProgress<T extends Record<string, any>>(timeout: Timeout): LazyProgress<T> {
     let dispose!: () => void
     let progress: vscode.Progress<T>
     const location = vscode.ProgressLocation.Notification
-    const thenable = new Promise<void>(resolve => {
+    const thenable = new Promise<void>((resolve) => {
         dispose = resolve
         timeout.token.onCancellationRequested(() => resolve)
     })
@@ -37,11 +39,11 @@ function lazyProgress<T extends Record<string, any>>(timeout: Timeout): LazyProg
     return {
         dispose,
         getToken: () => timeout,
-        report: value => {
+        report: (value) => {
             if (!progress) {
-                vscode.window.withProgress({ location, cancellable: true }, (p, t) => {
+                void vscode.window.withProgress({ location, cancellable: true }, (p, t) => {
                     progress = p
-                    t.onCancellationRequested(e => timeout.cancel())
+                    t.onCancellationRequested((e) => timeout.cancel())
                     return thenable
                 })
             }
@@ -50,8 +52,8 @@ function lazyProgress<T extends Record<string, any>>(timeout: Timeout): LazyProg
     }
 }
 
-export async function openTerminalCommand(ctx: ExtContext) {
-    const commands = CodeCatalystCommands.fromContext(ctx.extensionContext)
+export async function openTerminalCommand(ctx: vscode.ExtensionContext) {
+    const commands = CodeCatalystCommands.fromContext(ctx)
     const progress = lazyProgress<{ message: string }>(new Timeout(900000))
 
     await commands.withClient(openTerminal, progress).finally(() => progress.dispose())
@@ -80,10 +82,10 @@ async function openTerminal(client: CodeCatalystClient, progress: LazyProgress<{
     vscode.window.createTerminal(options).show()
 }
 
-export async function installVsixCommand(ctx: ExtContext) {
-    const commands = CodeCatalystCommands.fromContext(ctx.extensionContext)
+export async function installVsixCommand(ctx: vscode.ExtensionContext) {
+    const commands = CodeCatalystCommands.fromContext(ctx)
 
-    await commands.withClient(async client => {
+    await commands.withClient(async (client) => {
         const env = await selectCodeCatalystResource(client, 'devEnvironment')
         if (!env) {
             return
@@ -94,27 +96,21 @@ export async function installVsixCommand(ctx: ExtContext) {
             await installVsix(ctx, client, progress, env).finally(() => progress.dispose())
         } catch (err) {
             getLogger().error(`installVsixCommand: installation failed: %O`, err)
-            showViewLogsMessage('VSIX installation failed')
+            void showViewLogsMessage('VSIX installation failed')
         }
     })
 }
 
 async function promptVsix(
-    ctx: ExtContext,
+    ctx: vscode.ExtensionContext,
     progress?: LazyProgress<{ message: string }>
 ): Promise<vscode.Uri | undefined> {
     const folders = (vscode.workspace.workspaceFolders ?? [])
-        .map(f => f.uri)
-        .concat(vscode.Uri.file(ctx.extensionContext.extensionPath))
-
-    enum ExtensionMode {
-        Production = 1,
-        Development = 2,
-        Test = 3,
-    }
+        .map((f) => f.uri)
+        .concat(vscode.Uri.file(ctx.extensionPath))
 
-    const isDevelopmentWindow = ctx.extensionContext.extensionMode === ExtensionMode.Development
-    const extPath = isDevelopmentWindow ? ctx.extensionContext.extensionPath : folders[0].fsPath
+    const isDevelopmentWindow = ctx.extensionMode === vscode.ExtensionMode.Development
+    const extPath = isDevelopmentWindow ? ctx.extensionPath : folders[0].fsPath
 
     const packageNew = {
         label: 'Create new VSIX',
@@ -169,14 +165,14 @@ async function promptVsix(
         yield [seps.shift()!, packageNew, localInstall]
 
         for (const f of folders) {
-            const paths = await promisify(glob)('*.vsix', { cwd: f.fsPath })
-            const uris = paths.map(v => vscode.Uri.file(path.join(f.fsPath, v)))
+            const paths = await glob('*.vsix', { cwd: f.fsPath })
+            const uris = paths.map((v) => vscode.Uri.file(path.join(f.fsPath, v)))
 
             if (uris.length > 0 && seps.length > 0) {
                 yield [seps.shift()!]
             }
 
-            yield uris.map(v => ({
+            yield uris.map((v) => ({
                 label: path.basename(v.fsPath),
                 detail: v.fsPath,
                 data: v,
@@ -197,12 +193,12 @@ async function promptVsix(
  * Bootstrap an environment for remote development/debugging
  */
 async function installVsix(
-    ctx: ExtContext,
+    ctx: vscode.ExtensionContext,
     client: CodeCatalystClient,
     progress: LazyProgress<{ message: string }>,
     env: DevEnvironment
 ): Promise<void> {
-    const resp = await promptVsix(ctx, progress).then(r => r?.fsPath)
+    const resp = await promptVsix(ctx, progress).then((r) => r?.fsPath)
 
     if (!resp) {
         return
@@ -221,14 +217,14 @@ async function installVsix(
     if (path.extname(resp) !== '.vsix') {
         progress.report({ message: 'Copying extension...' })
 
-        const packageData = await fs.readFile(path.join(resp, 'package.json'), 'utf-8')
+        const packageData = await fs.readFileText(path.join(resp, 'package.json'))
         const targetManfiest: typeof manifest = JSON.parse(packageData)
         const destName = `${extPath}/${extId}-${targetManfiest.version}`
         const source = `${resp}${path.sep}`
 
         // Using `.vscodeignore` would be nice here but `rsync` doesn't understand glob patterns
         const excludes = ['.git/', 'node_modules/', '/src/', '/scripts/', '/dist/src/test/']
-            .map(p => ['--exclude', p])
+            .map((p) => ['--exclude', p])
             .reduce((a, b) => a.concat(b))
 
         const installCommand = [`cd ${destName}`, 'npm i --ignore-scripts'].join(' && ')
@@ -247,7 +243,7 @@ async function installVsix(
             .split('-')
             .reverse()
             .slice(0, 2)
-            .map(s => s.replace('.vsix', ''))
+            .map((s) => s.replace('.vsix', ''))
         const destName = [extId, ...suffixParts.reverse()].join('-')
 
         const installCmd = [
@@ -266,10 +262,10 @@ async function installVsix(
     await startVscodeRemote(SessionProcess, hostname, '/projects', vscPath)
 }
 
-export async function deleteDevEnvCommand(ctx: ExtContext) {
-    const commands = CodeCatalystCommands.fromContext(ctx.extensionContext)
+export async function deleteDevEnvCommand(ctx: vscode.ExtensionContext) {
+    const commands = CodeCatalystCommands.fromContext(ctx)
 
-    await commands.withClient(async client => {
+    await commands.withClient(async (client) => {
         const devenv = await selectCodeCatalystResource(client, 'devEnvironment')
         if (!devenv) {
             return
diff --git a/packages/core/src/dev/config.ts b/packages/core/src/dev/config.ts
new file mode 100644
index 00000000000..d5fa49b2426
--- /dev/null
+++ b/packages/core/src/dev/config.ts
@@ -0,0 +1,12 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// This file is for internal testing.
+// Nothing in this file should have a truthy value on mainline
+
+export const betaUrl = {
+    amazonq: '',
+    toolkit: '',
+}
diff --git a/packages/core/src/dev/index.ts b/packages/core/src/dev/index.ts
new file mode 100644
index 00000000000..111920c99ee
--- /dev/null
+++ b/packages/core/src/dev/index.ts
@@ -0,0 +1,7 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export { DevOptions, updateDevMode } from './activation'
+export * as beta from './beta'
diff --git a/packages/core/src/docdb/activation.ts b/packages/core/src/docdb/activation.ts
new file mode 100644
index 00000000000..62b61d5e490
--- /dev/null
+++ b/packages/core/src/docdb/activation.ts
@@ -0,0 +1,125 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Commands } from '../shared/vscode/commands2'
+import { ExtContext } from '../shared/extensions'
+import { DBResourceNode } from './explorer/dbResourceNode'
+import { DocumentDBNode } from './explorer/docdbNode'
+import { DBClusterNode } from './explorer/dbClusterNode'
+import { DBInstanceNode } from './explorer/dbInstanceNode'
+import { addRegion } from './commands/addRegion'
+import { createCluster } from './commands/createCluster'
+import { deleteCluster } from './commands/deleteCluster'
+import { renameCluster } from './commands/renameCluster'
+import { startCluster } from './commands/startCluster'
+import { stopCluster } from './commands/stopCluster'
+import { createInstance } from './commands/createInstance'
+import { deleteInstance } from './commands/deleteInstance'
+import { modifyInstance } from './commands/modifyInstance'
+import { rebootInstance } from './commands/rebootInstance'
+import { renameInstance } from './commands/renameInstance'
+import { addTag, listTags, removeTag } from './commands/tagCommands'
+import { Uri } from 'vscode'
+import { openUrl } from '../shared/utilities/vsCodeUtils'
+import { getLogger } from '../shared/logger/logger'
+
+/**
+ * A utility function to automatically invoke trackChanges after a command.
+ */
+
+function withTrackChanges<T extends DBResourceNode>(
+    command: (node: T) => Promise<void>,
+    commandName: string = 'UnnamedCommand'
+): (node: T) => Promise<void> {
+    return async (node: T) => {
+        const arn = node.arn || 'UnknownARN'
+        const startTime = new Date().toISOString()
+
+        getLogger().info(
+            `[${startTime}] Executing command "${commandName}" for resource with ARN: ${arn}. Tracking changes will be invoked post-execution.`
+        )
+
+        await command(node)
+
+        const endTime = new Date().toISOString()
+        getLogger().info(
+            `[${endTime}] Successfully executed command "${commandName}" for resource with ARN: ${arn}. Invoking trackChanges now.`
+        )
+
+        await node.trackChangesWithWaitProcessingStatus()
+    }
+}
+
+/**
+ * Activates DocumentDB components.
+ */
+export async function activate(ctx: ExtContext): Promise<void> {
+    ctx.extensionContext.subscriptions.push(
+        Commands.register('aws.docdb.createCluster', async (node?: DocumentDBNode) => {
+            await createCluster(node)
+        }),
+
+        Commands.register('aws.docdb.deleteCluster', withTrackChanges<DBClusterNode>(deleteCluster, 'deleteCluster')),
+
+        Commands.register('aws.docdb.renameCluster', withTrackChanges<DBClusterNode>(renameCluster, 'renameCluster')),
+
+        Commands.register('aws.docdb.startCluster', withTrackChanges<DBClusterNode>(startCluster, 'startCluster')),
+
+        Commands.register('aws.docdb.stopCluster', withTrackChanges<DBClusterNode>(stopCluster, 'stopCluster')),
+
+        Commands.register('aws.docdb.addRegion', withTrackChanges<DBClusterNode>(addRegion, 'addRegion')),
+
+        Commands.register(
+            'aws.docdb.createInstance',
+            withTrackChanges<DBClusterNode>(createInstance, 'createInstance')
+        ),
+
+        Commands.register(
+            'aws.docdb.deleteInstance',
+            withTrackChanges<DBInstanceNode>(deleteInstance, 'deleteInstance')
+        ),
+
+        Commands.register(
+            'aws.docdb.modifyInstance',
+            withTrackChanges<DBInstanceNode>(modifyInstance, 'modifyInstance')
+        ),
+
+        Commands.register(
+            'aws.docdb.rebootInstance',
+            withTrackChanges<DBInstanceNode>(rebootInstance, 'rebootInstance')
+        ),
+
+        Commands.register(
+            'aws.docdb.renameInstance',
+            withTrackChanges<DBInstanceNode>(renameInstance, 'renameInstance')
+        ),
+
+        Commands.register('aws.docdb.listTags', async (node: DBResourceNode) => {
+            await listTags(node)
+        }),
+
+        Commands.register('aws.docdb.addTag', async (node: DBResourceNode) => {
+            await addTag(node)
+        }),
+
+        Commands.register('aws.docdb.removeTag', async (node: DBResourceNode) => {
+            await removeTag(node)
+        }),
+
+        Commands.register('aws.docdb.viewConsole', async (node?: DBResourceNode) => {
+            await node?.openInBrowser()
+        }),
+
+        Commands.register('aws.docdb.viewDocs', async () => {
+            await openUrl(
+                Uri.parse('https://docs.aws.amazon.com/documentdb/latest/developerguide/get-started-guide.html')
+            )
+        }),
+
+        Commands.register('aws.docdb.copyEndpoint', async (node?: DBResourceNode) => {
+            await node?.copyEndpoint()
+        })
+    )
+}
diff --git a/packages/core/src/docdb/commands/addRegion.ts b/packages/core/src/docdb/commands/addRegion.ts
new file mode 100644
index 00000000000..ab3e6d1b721
--- /dev/null
+++ b/packages/core/src/docdb/commands/addRegion.ts
@@ -0,0 +1,165 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../../shared/logger/logger'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { DBClusterNode } from '../explorer/dbClusterNode'
+import { DBGlobalClusterNode } from '../explorer/dbGlobalClusterNode'
+import { DefaultDocumentDBClient } from '../../shared/clients/docdbClient'
+import { ToolkitError } from '../../shared/errors'
+import { showViewLogsMessage } from '../../shared/utilities/messages'
+import { isValidResponse } from '../../shared/wizards/wizard'
+import { CancellationError } from '../../shared/utilities/timeoutUtils'
+import { CreateGlobalClusterWizard } from '../wizards/createGlobalClusterWizard'
+import { CreateDBClusterMessage } from '@aws-sdk/client-docdb'
+import { createInstancesForCluster } from './createCluster'
+import { isSupportedGlobalInstanceClass } from '../utils'
+
+export async function addRegion(node: DBClusterNode | DBGlobalClusterNode): Promise<void> {
+    if (!node) {
+        throw new ToolkitError('No node specified for AddRegion')
+    }
+
+    return telemetry.docdb_addRegion.run(async () => {
+        let globalClusterName = undefined
+
+        if (node.cluster.StorageEncrypted) {
+            void vscode.window.showErrorMessage('Encrypted clusters are not supported')
+            return
+        }
+
+        if (node instanceof DBClusterNode) {
+            if (node.clusterRole !== 'regional') {
+                void vscode.window.showErrorMessage('Only regional clusters are supported')
+                return
+            }
+
+            if (node.cluster.DBClusterMembers?.length === 0) {
+                void vscode.window.showErrorMessage(
+                    localize(
+                        'AWS.docdb.addRegion.noInstances',
+                        'Cluster must have at least one instance to add a region'
+                    )
+                )
+                throw new ToolkitError('Cluster must have at least one instance to add a region', { cancelled: true })
+            }
+
+            const unsupportedInstanceFound = node.instances.find(
+                (instance) => !isSupportedGlobalInstanceClass(instance.DBInstanceClass!)
+            )
+
+            if (unsupportedInstanceFound) {
+                void vscode.window.showErrorMessage(
+                    localize(
+                        'AWS.docdb.addRegion.unsupportedInstanceClass',
+                        'Instance class {0} not supported for global cluster.  Upgrade the instances then try again.',
+                        unsupportedInstanceFound.DBInstanceClass
+                    )
+                )
+                throw new ToolkitError('Instance class not supported for global cluster', {
+                    cancelled: true,
+                    code: 'docdbInstanceClassNotSupported',
+                })
+            }
+        } else {
+            globalClusterName = node.cluster.GlobalClusterIdentifier
+
+            if (node.cluster.GlobalClusterMembers!.length > 4) {
+                void vscode.window.showErrorMessage(
+                    localize('AWS.docdb.addRegion.maxRegions', 'Global clusters can have a maximum of 5 regions')
+                )
+                throw new ToolkitError('Global clusters can have a maximum of 5 regions', {
+                    cancelled: true,
+                    code: 'docdbMaxRegionsInUse',
+                })
+            }
+        }
+
+        if (!node.isAvailable) {
+            void vscode.window.showErrorMessage(localize('AWS.docdb.clusterStopped', 'Cluster must be running'))
+            throw new ToolkitError('Cluster not available', { cancelled: true, code: 'docdbClusterStopped' })
+        }
+
+        const wizard = new CreateGlobalClusterWizard(node.regionCode, node.cluster.EngineVersion, node.client, {
+            initState: { GlobalClusterName: globalClusterName },
+        })
+        const response = await wizard.run()
+
+        if (!isValidResponse(response)) {
+            throw new CancellationError('user')
+        }
+
+        const regionCode = response.RegionCode
+        let input: CreateDBClusterMessage
+        let clusterName = response.GlobalClusterName
+
+        try {
+            if (node instanceof DBClusterNode) {
+                // Create new global cluster from regional cluster
+                const primaryCluster = node.cluster
+
+                getLogger().info(`docdb: Creating global cluster: ${clusterName}`)
+                const globalCluster = await node.client.createGlobalCluster({
+                    GlobalClusterIdentifier: response.GlobalClusterName,
+                    SourceDBClusterIdentifier: primaryCluster.DBClusterArn,
+                })
+
+                input = {
+                    GlobalClusterIdentifier: globalCluster?.GlobalClusterIdentifier,
+                    DBClusterIdentifier: response.Cluster.DBClusterIdentifier,
+                    DeletionProtection: primaryCluster.DeletionProtection,
+                    Engine: primaryCluster.Engine,
+                    EngineVersion: primaryCluster.EngineVersion,
+                    StorageType: primaryCluster.StorageType,
+                    StorageEncrypted: globalCluster?.StorageEncrypted,
+                }
+            } else {
+                // Add secondary cluster to global cluster
+                const globalCluster = node.cluster
+
+                input = {
+                    GlobalClusterIdentifier: globalClusterName,
+                    DBClusterIdentifier: response.Cluster.DBClusterIdentifier,
+                    DeletionProtection: globalCluster.DeletionProtection,
+                    Engine: globalCluster.Engine,
+                    EngineVersion: globalCluster.EngineVersion,
+                    StorageEncrypted: globalCluster.StorageEncrypted,
+                }
+            }
+
+            clusterName = response.Cluster.DBClusterIdentifier
+            getLogger().info(`docdb: Creating secondary cluster: ${clusterName} in region ${regionCode}`)
+
+            const client = DefaultDocumentDBClient.create(regionCode)
+            const newCluster = await client.createCluster(input)
+
+            if (response.Cluster.DBInstanceCount) {
+                await createInstancesForCluster(
+                    client,
+                    clusterName,
+                    response.Cluster.DBInstanceClass,
+                    response.Cluster.DBInstanceCount
+                )
+            }
+
+            getLogger().info('docdb: Created cluster: %O', newCluster)
+            void vscode.window.showInformationMessage(localize('AWS.docdb.addRegion.success', 'Region added'))
+
+            if (node instanceof DBClusterNode) {
+                node?.parent.refresh()
+            } else {
+                node?.refresh()
+            }
+        } catch (e) {
+            getLogger().error(`docdb: Failed to create cluster ${clusterName}: %s`, e)
+            void showViewLogsMessage(
+                localize('AWS.docdb.createCluster.error', 'Failed to create cluster: {0}', clusterName)
+            )
+            throw ToolkitError.chain(e, `Failed to create cluster ${clusterName}`)
+        }
+    })
+}
diff --git a/packages/core/src/docdb/commands/createCluster.ts b/packages/core/src/docdb/commands/createCluster.ts
new file mode 100644
index 00000000000..62689319158
--- /dev/null
+++ b/packages/core/src/docdb/commands/createCluster.ts
@@ -0,0 +1,105 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { ToolkitError } from '../../shared/errors'
+import { getLogger } from '../../shared/logger/logger'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { showViewLogsMessage } from '../../shared/utilities/messages'
+import { DocumentDBNode } from '../explorer/docdbNode'
+import { CreateClusterWizard } from '../wizards/createClusterWizard'
+import { CreateClusterInput } from '@aws-sdk/client-docdb-elastic'
+import { DocDBEngine, DocumentDBClient } from '../../shared/clients/docdbClient'
+
+/**
+ * Creates a DocumentDB cluster.
+ *
+ * Prompts the user for the cluster name.
+ * Creates the cluster.
+ * Refreshes the node.
+ */
+export async function createCluster(node?: DocumentDBNode) {
+    getLogger().debug('docdb: CreateCluster called for: %O', node)
+
+    await telemetry.docdb_createCluster.run(async (span) => {
+        if (!node) {
+            throw new ToolkitError('No node specified for CreateCluster')
+        }
+
+        span.record({ awsRegion: node?.client.regionCode })
+        const wizard = new CreateClusterWizard(node?.client, {})
+        const result = await wizard.run()
+
+        if (!result) {
+            getLogger().debug('docdb: createCluster cancelled')
+            throw new ToolkitError('User cancelled createCluster wizard', { cancelled: true })
+        }
+
+        const clusterName = result.RegionalCluster?.DBClusterIdentifier ?? result.ElasticCluster?.clusterName
+        getLogger().info(`docdb: Creating cluster: ${clusterName}`)
+        let cluster
+
+        try {
+            if (result.ClusterType === 'elastic') {
+                cluster = await node.client.createElasticCluster(result.ElasticCluster as CreateClusterInput)
+            } else {
+                cluster = await node.client.createCluster(result.RegionalCluster)
+
+                // create instances for cluster
+                if (cluster && result.RegionalCluster.DBInstanceCount) {
+                    await createInstancesForCluster(
+                        node.client,
+                        clusterName,
+                        result.RegionalCluster.DBInstanceClass,
+                        result.RegionalCluster.DBInstanceCount
+                    )
+                }
+            }
+
+            getLogger().info('docdb: Created cluster: %O', cluster)
+            void vscode.window.showInformationMessage(
+                localize('AWS.docdb.createCluster.success', 'Created cluster: {0}', clusterName)
+            )
+
+            node?.refresh()
+            return cluster
+        } catch (e) {
+            getLogger().error(`docdb: Failed to create cluster ${clusterName}: %s`, e)
+            void showViewLogsMessage(
+                localize('AWS.docdb.createCluster.error', 'Failed to create cluster: {0}', clusterName)
+            )
+            throw ToolkitError.chain(e, `Failed to create cluster ${clusterName}`)
+        }
+    })
+}
+
+export async function createInstancesForCluster(
+    client: DocumentDBClient,
+    clusterName: string,
+    instanceClass: string = 'db.t3.medium',
+    instanceCount: number
+) {
+    const tasks = []
+
+    for (let index = 0; index < instanceCount; index++) {
+        tasks.push(
+            client.createInstance({
+                Engine: DocDBEngine,
+                DBClusterIdentifier: clusterName,
+                DBInstanceIdentifier: index === 0 ? clusterName : `${clusterName}${index + 1}`,
+                DBInstanceClass: instanceClass,
+            })
+        )
+    }
+
+    try {
+        await Promise.all(tasks)
+    } catch (e) {
+        throw ToolkitError.chain(e, `Failed to create instance for cluster ${clusterName}`, {
+            code: 'docdbCreateInstanceForCluster',
+        })
+    }
+}
diff --git a/packages/core/src/docdb/commands/createInstance.ts b/packages/core/src/docdb/commands/createInstance.ts
new file mode 100644
index 00000000000..34e7808ce62
--- /dev/null
+++ b/packages/core/src/docdb/commands/createInstance.ts
@@ -0,0 +1,86 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { ToolkitError } from '../../shared/errors'
+import { getLogger } from '../../shared/logger/logger'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { showViewLogsMessage } from '../../shared/utilities/messages'
+import { DBClusterNode } from '../explorer/dbClusterNode'
+import { CreateInstanceWizard } from '../wizards/createInstanceWizard'
+import { CreateDBInstanceMessage } from '@aws-sdk/client-docdb'
+import { DocDBEngine, MaxInstanceCount } from '../../shared/clients/docdbClient'
+
+/**
+ * Creates a DocumentDB instance.
+ *
+ * Prompts the user for the instance name and class.
+ * Creates the instance.
+ * Refreshes the cluster node.
+ */
+export async function createInstance(node: DBClusterNode) {
+    getLogger().debug('docdb: CreateInstance called for: %O', node)
+
+    await telemetry.docdb_createInstance.run(async () => {
+        if (!node) {
+            throw new ToolkitError('No node specified for CreateInstance')
+        }
+
+        const instances = await node.client.listInstances([node.arn])
+        if (instances.length >= MaxInstanceCount) {
+            void vscode.window.showInformationMessage(
+                localize('AWS.docdb.createInstance.limitReached', 'Max instances in use')
+            )
+            throw new ToolkitError('Max instances in use', { code: 'documentDBMaxInstancesInUse' })
+        }
+
+        const generateInstanceName = (clusterName: string) =>
+            instances.length === 0 ? clusterName : `${clusterName}${++instances.length}`
+
+        const options = {
+            implicitState: {
+                DBInstanceIdentifier: generateInstanceName(node.cluster.DBClusterIdentifier ?? ''),
+                DBInstanceClass: instances[0]?.DBInstanceClass,
+            },
+        }
+        const wizard = new CreateInstanceWizard(node.regionCode, node.cluster, options, node.client)
+
+        const result = await wizard.run()
+
+        if (!result) {
+            getLogger().debug('docdb: CreateInstance cancelled')
+            throw new ToolkitError('User cancelled createInstance wizard', { cancelled: true })
+        }
+
+        const instanceName = result.DBInstanceIdentifier
+        getLogger().info(`docdb: Creating instance: ${instanceName}`)
+
+        try {
+            const request: CreateDBInstanceMessage = {
+                Engine: DocDBEngine,
+                DBClusterIdentifier: node.cluster.DBClusterIdentifier,
+                DBInstanceIdentifier: result.DBInstanceIdentifier,
+                DBInstanceClass: result.DBInstanceClass !== '' ? result.DBInstanceClass : undefined,
+            }
+
+            const instance = await node.createInstance(request)
+
+            getLogger().info('docdb: Created instance: %O', instance)
+            void vscode.window.showInformationMessage(
+                localize('AWS.docdb.createInstance.success', 'Creating instance: {0}', instanceName)
+            )
+
+            node.refresh()
+            return instance
+        } catch (e) {
+            getLogger().error(`docdb: Failed to create instance ${instanceName}: %s`, e)
+            void showViewLogsMessage(
+                localize('AWS.docdb.createInstance.error', 'Failed to create instance: {0}', instanceName)
+            )
+            throw ToolkitError.chain(e, `Failed to create instance ${instanceName}`)
+        }
+    })
+}
diff --git a/packages/core/src/docdb/commands/deleteCluster.ts b/packages/core/src/docdb/commands/deleteCluster.ts
new file mode 100644
index 00000000000..bb725ae2ab1
--- /dev/null
+++ b/packages/core/src/docdb/commands/deleteCluster.ts
@@ -0,0 +1,108 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { ToolkitError } from '../../shared/errors'
+import { getLogger } from '../../shared/logger/logger'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { showViewLogsMessage } from '../../shared/utilities/messages'
+import { DBClusterNode } from '../explorer/dbClusterNode'
+import { showQuickPick } from '../../shared/ui/pickerPrompter'
+import { formatDate, formatTime } from '../../shared/date'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { DBElasticClusterNode } from '../explorer/dbElasticClusterNode'
+import { assertNodeAvailable } from '../utils'
+
+/**
+ * Deletes a DocumentDB cluster.
+ *
+ * Prompts the user for confirmation, and whether to keep a snapshot
+ * Deletes the cluster and all instances.
+ * Refreshes the cluster node.
+ */
+export async function deleteCluster(node: DBClusterNode | DBElasticClusterNode) {
+    getLogger().debug('docdb: DeleteCluster called for: %O', node)
+
+    await telemetry.docdb_deleteCluster.run(async (span) => {
+        assertNodeAvailable(node, 'DeleteCluster')
+        const clusterName = node.name
+        const isRegionalCluster = node instanceof DBClusterNode
+
+        if (isRegionalCluster && node.cluster.DeletionProtection) {
+            void vscode.window.showErrorMessage(
+                localize(
+                    'AWS.docdb.deleteCluster.protected',
+                    'Clusters cannot be deleted while deletion protection is enabled'
+                )
+            )
+            throw new ToolkitError('Deletion protection is active', {
+                cancelled: true,
+                code: 'docdbDeletionProtectionInUse',
+            })
+        }
+
+        const takeSnapshot = await showQuickPick(
+            [
+                { label: localize('AWS.generic.response.yes', 'Yes'), data: true },
+                { label: localize('AWS.generic.response.no', 'No'), data: false },
+            ],
+            {
+                title: localize(
+                    'AWS.docdb.deleteCluster.promptSnapshot',
+                    'Delete Cluster - Keep a snapshot of the data?'
+                ),
+            }
+        )
+
+        if (takeSnapshot === undefined) {
+            getLogger().debug('docdb: DeleteCluster cancelled')
+            throw new ToolkitError('User cancelled deleteCluster wizard', { cancelled: true })
+        }
+
+        const isConfirmed = await showConfirmationDialog()
+        if (!isConfirmed) {
+            getLogger().debug('docdb: DeleteCluster cancelled')
+            throw new ToolkitError('User cancelled deleteCluster wizard', { cancelled: true })
+        }
+
+        try {
+            getLogger().debug(`docdb: Deleting cluster: ${clusterName}`)
+
+            let finalSnapshotId: string | undefined = undefined
+            if (takeSnapshot) {
+                finalSnapshotId = `${clusterName}-${formatDate()}-${formatTime()}`
+            }
+
+            const cluster = await node.deleteCluster(finalSnapshotId)
+
+            void vscode.window.showInformationMessage(
+                localize('AWS.docdb.deleteCluster.success', 'Deleting cluster: {0}', clusterName)
+            )
+
+            await node.waitUntilStatusChanged()
+            node.parent.refresh()
+            getLogger().info('docdb: Deleted cluster: %O', cluster)
+            return cluster
+        } catch (e) {
+            getLogger().error(`docdb: Failed to delete cluster ${clusterName}: %s`, e)
+            void showViewLogsMessage(
+                localize('AWS.docdb.deleteCluster.error', 'Failed to delete cluster: {0}', clusterName)
+            )
+            throw ToolkitError.chain(e, `Failed to delete cluster ${clusterName}`)
+        }
+    })
+}
+
+async function showConfirmationDialog(): Promise<boolean> {
+    const prompt = localize('AWS.docdb.deleteCluster.prompt', "Enter 'delete entire cluster' to confirm deletion")
+    const confirmValue = localize('AWS.docdb.deleteCluster.confirmValue', 'delete entire cluster').toLowerCase()
+    const confirmationInput = await vscode.window.showInputBox({
+        prompt,
+        placeHolder: confirmValue,
+        validateInput: (input) => (input?.toLowerCase() !== confirmValue ? prompt : undefined),
+    })
+
+    return confirmationInput === confirmValue
+}
diff --git a/packages/core/src/docdb/commands/deleteInstance.ts b/packages/core/src/docdb/commands/deleteInstance.ts
new file mode 100644
index 00000000000..6202d317a07
--- /dev/null
+++ b/packages/core/src/docdb/commands/deleteInstance.ts
@@ -0,0 +1,78 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { ToolkitError } from '../../shared/errors'
+import { getLogger } from '../../shared/logger/logger'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { showViewLogsMessage } from '../../shared/utilities/messages'
+import { DBInstanceNode } from '../explorer/dbInstanceNode'
+import { DBClusterNode } from '../explorer/dbClusterNode'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { assertNodeAvailable } from '../utils'
+
+/**
+ * Deletes a DocumentDB instance.
+ *
+ * Prompts the user for confirmation.
+ * Deletes the instance.
+ * Refreshes the parent cluster node.
+ */
+export async function deleteInstance(node: DBInstanceNode) {
+    getLogger().debug('docdb: DeleteInstance called for: %O', node)
+
+    await telemetry.docdb_deleteInstance.run(async () => {
+        assertNodeAvailable(node, 'DeleteInstance')
+        const parent = node.parent as DBClusterNode
+        const client = parent.client
+        const instanceName = node.instance.DBInstanceIdentifier ?? ''
+
+        if (!parent?.isAvailable) {
+            void vscode.window.showErrorMessage(
+                localize('AWS.docdb.deleteInstance.clusterStopped', 'Cluster must be started to delete instances')
+            )
+            throw new ToolkitError('Cluster not running', { cancelled: true })
+        }
+
+        const isConfirmed = await showConfirmationDialog(instanceName)
+        if (!isConfirmed) {
+            getLogger().debug('docdb: DeleteInstance cancelled')
+            throw new ToolkitError('User cancelled deleteInstance', { cancelled: true })
+        }
+
+        try {
+            getLogger().info(`docdb: Deleting instance: ${instanceName}`)
+
+            const instance = await client.deleteInstance({
+                DBInstanceIdentifier: instanceName,
+            })
+
+            getLogger().info('docdb: Deleted instance: %O', instance)
+            void vscode.window.showInformationMessage(
+                localize('AWS.docdb.deleteInstance.success', 'Deleting instance: {0}', instanceName)
+            )
+
+            parent.refresh()
+            return instance
+        } catch (e) {
+            getLogger().error(`docdb: Failed to delete instance ${instanceName}: %s`, e)
+            void showViewLogsMessage(
+                localize('AWS.docdb.deleteInstance.error', 'Failed to delete instance: {0}', instanceName)
+            )
+            throw ToolkitError.chain(e, `Failed to delete instance ${instanceName}`)
+        }
+    })
+}
+
+async function showConfirmationDialog(instanceName: string): Promise<boolean> {
+    const prompt = localize('AWS.docdb.deleteInstance.prompt', 'Enter {0} to confirm deletion', instanceName)
+    const confirmationInput = await vscode.window.showInputBox({
+        prompt,
+        placeHolder: instanceName,
+        validateInput: (input) => (input !== instanceName ? prompt : undefined),
+    })
+
+    return confirmationInput === instanceName
+}
diff --git a/packages/core/src/docdb/commands/modifyInstance.ts b/packages/core/src/docdb/commands/modifyInstance.ts
new file mode 100644
index 00000000000..3df5febaf45
--- /dev/null
+++ b/packages/core/src/docdb/commands/modifyInstance.ts
@@ -0,0 +1,98 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { ToolkitError } from '../../shared/errors'
+import { getLogger } from '../../shared/logger/logger'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { showViewLogsMessage } from '../../shared/utilities/messages'
+import { DBInstanceNode } from '../explorer/dbInstanceNode'
+import { DBCluster, ModifyDBInstanceMessage } from '@aws-sdk/client-docdb'
+import { DBStorageType, DocumentDBClient } from '../../shared/clients/docdbClient'
+import { createQuickPick, DataQuickPickItem } from '../../shared/ui/pickerPrompter'
+import { isValidResponse } from '../../shared/wizards/wizard'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { assertNodeAvailable } from '../utils'
+
+/**
+ * Modifies a DocumentDB instance.
+ *
+ * Prompts the user for the instance class.
+ * Updates the instance.
+ * Refreshes the node.
+ */
+export async function modifyInstance(node: DBInstanceNode) {
+    getLogger().debug('docdb: ModifyInstance called for: %O', node)
+
+    await telemetry.docdb_resizeInstance.run(async () => {
+        assertNodeAvailable(node, 'ModifyInstance')
+        const instanceName = node.instance.DBInstanceIdentifier
+        const parent = node.parent
+
+        const quickPickItems = await getInstanceClassOptions(parent.client, parent.cluster)
+        const newInstanceClass = await promptForInstanceClass(quickPickItems, node.instance.DBInstanceClass ?? '')
+
+        if (!newInstanceClass) {
+            getLogger().debug('docdb: ModifyInstance cancelled')
+            throw new ToolkitError('User cancelled modifyInstance wizard', { cancelled: true })
+        }
+
+        try {
+            const request: ModifyDBInstanceMessage = {
+                DBInstanceIdentifier: instanceName,
+                DBInstanceClass: newInstanceClass,
+                ApplyImmediately: true,
+            }
+
+            const instance = await parent.client.modifyInstance(request)
+
+            getLogger().info('docdb: Modified instance: %O', instanceName)
+            void vscode.window.showInformationMessage(
+                localize('AWS.docdb.modifyInstance.success', 'Modified instance: {0}', instanceName)
+            )
+
+            await node.waitUntilStatusChanged()
+            parent.refresh()
+            return instance
+        } catch (e) {
+            getLogger().error(`docdb: Failed to modify instance ${instanceName}: %s`, e)
+            void showViewLogsMessage(
+                localize('AWS.docdb.modifyInstance.error', 'Failed to modify instance: {0}', instanceName)
+            )
+            throw ToolkitError.chain(e, `Failed to modify instance ${instanceName}`)
+        }
+    })
+}
+
+async function getInstanceClassOptions(
+    client: DocumentDBClient,
+    cluster: DBCluster
+): Promise<DataQuickPickItem<string>[]> {
+    const options = await client.listInstanceClassOptions(
+        cluster.EngineVersion,
+        cluster.StorageType ?? DBStorageType.Standard
+    )
+
+    const items: DataQuickPickItem<string>[] = options.map((option) => {
+        return {
+            data: option.DBInstanceClass,
+            label: option.DBInstanceClass ?? '(unknown)',
+        }
+    })
+
+    return items
+}
+
+async function promptForInstanceClass(items: any[], currentValue: string) {
+    const prompter = createQuickPick<string>(items, {
+        title: localize('AWS.docdb.createInstance.instanceClass.prompt', 'Select instance class'),
+        value: currentValue,
+    })
+
+    prompter.recentItem = items.find((item) => item.data === currentValue)
+
+    const response = await prompter.prompt()
+    return isValidResponse(response) ? response : undefined
+}
diff --git a/packages/core/src/docdb/commands/rebootInstance.ts b/packages/core/src/docdb/commands/rebootInstance.ts
new file mode 100644
index 00000000000..ab706803d87
--- /dev/null
+++ b/packages/core/src/docdb/commands/rebootInstance.ts
@@ -0,0 +1,60 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as localizedText from '../../shared/localizedText'
+import { ToolkitError } from '../../shared/errors'
+import { getLogger } from '../../shared/logger/logger'
+import { CancellationError } from '../../shared/utilities/timeoutUtils'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { showConfirmationMessage, showViewLogsMessage } from '../../shared/utilities/messages'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { DBInstanceNode } from '../explorer/dbInstanceNode'
+import { assertNodeAvailable } from '../utils'
+
+/**
+ * Reboots a DocumentDB instance.
+ * Refreshes the parent node.
+ */
+export async function rebootInstance(node: DBInstanceNode) {
+    getLogger().debug('docdb: RebootInstance called for: %O', node)
+
+    await telemetry.docdb_rebootInstance.run(async () => {
+        assertNodeAvailable(node, 'RebootInstance')
+
+        const isConfirmed = await showConfirmationMessage({
+            prompt: localize(
+                'AWS.docdb.rebootInstance.prompt',
+                'Are you sure you want to reboot instance {0}?',
+                node.name
+            ),
+            confirm: localizedText.yes,
+            cancel: localizedText.cancel,
+        })
+        if (!isConfirmed) {
+            getLogger().debug('docdb: RebootInstance canceled')
+            throw new CancellationError('user')
+        }
+
+        const instanceName = node.instance.DBInstanceIdentifier
+        try {
+            const instance = await node.rebootInstance()
+
+            getLogger().info('docdb: Rebooting instance: %s', instanceName)
+            void vscode.window.showInformationMessage(
+                localize('AWS.docdb.rebootInstance.success', 'Rebooting instance: {0}', instanceName)
+            )
+
+            node.parent.refresh()
+            return instance
+        } catch (e) {
+            getLogger().error(`docdb: Failed to reboot instance ${instanceName}: %s`, e)
+            void showViewLogsMessage(
+                localize('AWS.docdb.rebootInstance.error', 'Failed to reboot instance: {0}', instanceName)
+            )
+            throw ToolkitError.chain(e, `Failed to reboot instance ${instanceName}`)
+        }
+    })
+}
diff --git a/packages/core/src/docdb/commands/renameCluster.ts b/packages/core/src/docdb/commands/renameCluster.ts
new file mode 100644
index 00000000000..f64ae7b1d98
--- /dev/null
+++ b/packages/core/src/docdb/commands/renameCluster.ts
@@ -0,0 +1,61 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { ToolkitError } from '../../shared/errors'
+import { getLogger } from '../../shared/logger/logger'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { showViewLogsMessage } from '../../shared/utilities/messages'
+import { assertNodeAvailable, validateClusterName } from '../utils'
+import { DBClusterNode } from '../explorer/dbClusterNode'
+import { DBGlobalClusterNode } from '../explorer/dbGlobalClusterNode'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { sleep } from '../../shared/utilities/timeoutUtils'
+
+/**
+ * Renames a DocumentDB cluster.
+ *
+ * Prompts the user for the new cluster name
+ * Updates the cluster.
+ * Refreshes the node.
+ */
+export async function renameCluster(node: DBClusterNode | DBGlobalClusterNode) {
+    getLogger().debug('docdb: RenameCluster called for: %O', node)
+
+    await telemetry.docdb_renameCluster.run(async () => {
+        assertNodeAvailable(node, 'RenameCluster')
+        const clusterName = node.name
+
+        const newClusterName = await vscode.window.showInputBox({
+            prompt: localize('AWS.docdb.renameCluster.prompt', 'New cluster name'),
+            value: clusterName,
+            validateInput: validateClusterName,
+        })
+
+        if (!newClusterName) {
+            getLogger().debug('docdb: RenameCluster cancelled')
+            throw new ToolkitError('User cancelled renameCluster', { cancelled: true })
+        }
+
+        try {
+            const cluster = await node.renameCluster(newClusterName)
+
+            getLogger().info('docdb: Renamed cluster: %O', cluster)
+            void vscode.window.showInformationMessage(
+                localize('AWS.docdb.renameCluster.success', 'Updated cluster: {0}', clusterName)
+            )
+
+            await sleep(1000) // wait for server to update status
+            node.parent.refresh()
+            return cluster
+        } catch (e) {
+            getLogger().error(`docdb: Failed to rename cluster ${clusterName}: %s`, e)
+            void showViewLogsMessage(
+                localize('AWS.docdb.renameCluster.error', 'Failed to rename cluster: {0}', clusterName)
+            )
+            throw ToolkitError.chain(e, `Failed to rename cluster ${clusterName}`)
+        }
+    })
+}
diff --git a/packages/core/src/docdb/commands/renameInstance.ts b/packages/core/src/docdb/commands/renameInstance.ts
new file mode 100644
index 00000000000..414f780e521
--- /dev/null
+++ b/packages/core/src/docdb/commands/renameInstance.ts
@@ -0,0 +1,58 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../../shared/logger/logger'
+import { ToolkitError } from '../../shared/errors'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { showViewLogsMessage } from '../../shared/utilities/messages'
+import { assertNodeAvailable, validateInstanceName } from '../utils'
+import { DBInstanceNode } from '../explorer/dbInstanceNode'
+import { telemetry } from '../../shared/telemetry/telemetry'
+
+/**
+ * Renames a DocumentDB instance.
+ *
+ * Prompts the user for the new instance name
+ * Updates the instance.
+ * Refreshes the node.
+ */
+export async function renameInstance(node: DBInstanceNode) {
+    getLogger().debug('docdb: RenameInstance called for: %O', node)
+
+    await telemetry.docdb_renameInstance.run(async () => {
+        assertNodeAvailable(node, 'RenameInstance')
+        const instanceName = node.instance.DBInstanceIdentifier
+
+        const newInstanceName = await vscode.window.showInputBox({
+            prompt: localize('AWS.docdb.renameInstance.prompt', 'New instance name'),
+            value: instanceName,
+            validateInput: validateInstanceName,
+        })
+
+        if (!newInstanceName) {
+            getLogger().debug('docdb: RenameInstance cancelled')
+            throw new ToolkitError('User cancelled renameInstance', { cancelled: true })
+        }
+
+        try {
+            const instance = await node.renameInstance(newInstanceName)
+
+            getLogger().info('docdb: Renamed instance: %O', instance)
+            void vscode.window.showInformationMessage(
+                localize('AWS.docdb.renameInstance.success', 'Updated instance: {0}', instanceName)
+            )
+
+            node.refresh()
+            return instance
+        } catch (e) {
+            getLogger().error(`docdb: Failed to rename instance ${instanceName}: %s`, e)
+            void showViewLogsMessage(
+                localize('AWS.docdb.renameInstance.error', 'Failed to rename instance: {0}', instanceName)
+            )
+            throw ToolkitError.chain(e, `Failed to rename instance ${instanceName}`)
+        }
+    })
+}
diff --git a/packages/core/src/docdb/commands/startCluster.ts b/packages/core/src/docdb/commands/startCluster.ts
new file mode 100644
index 00000000000..60dbda80e70
--- /dev/null
+++ b/packages/core/src/docdb/commands/startCluster.ts
@@ -0,0 +1,22 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../../shared/logger/logger'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { DBClusterNode } from '../explorer/dbClusterNode'
+
+export function startCluster(node?: DBClusterNode): Promise<void> {
+    return telemetry.docdb_startCluster.run(async () => {
+        if (node?.arn && node?.regionCode) {
+            await node.client.startCluster(node.arn)
+            getLogger().info('docdb: Start cluster: %O', node.name)
+            void vscode.window.showInformationMessage(
+                localize('AWS.docdb.startCluster.success', 'Starting cluster: {0}', node.name)
+            )
+        }
+    })
+}
diff --git a/packages/core/src/docdb/commands/stopCluster.ts b/packages/core/src/docdb/commands/stopCluster.ts
new file mode 100644
index 00000000000..46f23f3eab9
--- /dev/null
+++ b/packages/core/src/docdb/commands/stopCluster.ts
@@ -0,0 +1,39 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as localizedText from '../../shared/localizedText'
+import { getLogger } from '../../shared/logger/logger'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { CancellationError } from '../../shared/utilities/timeoutUtils'
+import { showConfirmationMessage } from '../../shared/utilities/messages'
+import { DBClusterNode } from '../explorer/dbClusterNode'
+
+export function stopCluster(node?: DBClusterNode): Promise<void> {
+    return telemetry.docdb_stopCluster.run(async () => {
+        if (node?.arn && node?.regionCode) {
+            const isConfirmed = await showConfirmationMessage({
+                prompt: localize(
+                    'AWS.docdb.stopCluster.prompt',
+                    'Are you sure you want to stop cluster {0}?',
+                    node.name
+                ),
+                confirm: localizedText.yes,
+                cancel: localizedText.cancel,
+            })
+            if (!isConfirmed) {
+                getLogger().debug('docdb: StopCluster cancelled')
+                throw new CancellationError('user')
+            }
+
+            await node.client.stopCluster(node.arn)
+            getLogger().info('docdb: Stop cluster: %O', node.name)
+            void vscode.window.showInformationMessage(
+                localize('AWS.docdb.stopCluster.success', 'Stopping cluster: {0}', node.name)
+            )
+        }
+    })
+}
diff --git a/packages/core/src/docdb/commands/tagCommands.ts b/packages/core/src/docdb/commands/tagCommands.ts
new file mode 100644
index 00000000000..d3c46176adb
--- /dev/null
+++ b/packages/core/src/docdb/commands/tagCommands.ts
@@ -0,0 +1,112 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../../shared/logger/logger'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { DBResourceNode } from '../explorer/dbResourceNode'
+import { DataQuickPickItem, showQuickPick } from '../../shared/ui/pickerPrompter'
+import { ToolkitError } from '../../shared/errors'
+
+export async function listTags(node: DBResourceNode): Promise<void> {
+    return telemetry.docdb_listTags.run(async () => {
+        const tagMap = await node.listTags()
+        const tags = Object.entries(tagMap ?? {}).map(([key, value]) => `• ${key} = ${value}`)
+        const detail = tags.length ? tags.join('\r\n') : '[No tags assigned]'
+
+        const addCommandText = localize('AWS.docdb.tags.add', 'Add tag...')
+        const removeCommandText = tags.length ? localize('AWS.docdb.tags.remove', 'Remove...') : ''
+        const commands = tags.length ? [addCommandText, removeCommandText] : [addCommandText]
+
+        const response = await vscode.window.showInformationMessage(
+            `Tags for ${node.name}:`,
+            { modal: true, detail },
+            ...commands
+        )
+
+        switch (response) {
+            case addCommandText:
+                await addTag(node)
+                break
+            case removeCommandText:
+                await removeTag(node)
+                break
+        }
+    })
+}
+
+export async function addTag(node: DBResourceNode): Promise<void> {
+    return telemetry.docdb_addTag.run(async () => {
+        const key = await vscode.window.showInputBox({
+            title: 'Add Tag',
+            prompt: localize('AWS.docdb.tags.add.keyPrompt', 'Enter a key for the new tag'),
+            validateInput: (input) => validateTag(input, 1, 'key'),
+        })
+        if (key === undefined) {
+            getLogger().info('docdb: AddTag cancelled')
+            throw new ToolkitError('User cancelled', { cancelled: true })
+        }
+
+        const value = await vscode.window.showInputBox({
+            title: 'Add Tag',
+            prompt: localize('AWS.docdb.tags.add.valuePrompt', 'Enter the value for the new tag (optional)'),
+            validateInput: (input) => validateTag(input, 0, 'value'),
+        })
+        if (value === undefined) {
+            getLogger().info('docdb: AddTag cancelled')
+            throw new ToolkitError('User cancelled', { cancelled: true })
+        }
+
+        const tag = { [key.trim()]: value.trim() }
+        await node.client.addResourceTags({ resourceArn: node.arn, tags: tag })
+        getLogger().info('docdb: Added resource tag for: %O', node.name)
+        void vscode.window.showInformationMessage(localize('AWS.docdb.tags.add.success', 'Tag added'))
+    })
+}
+
+export async function removeTag(node: DBResourceNode): Promise<void> {
+    return telemetry.docdb_removeTag.run(async () => {
+        const tagMap = await node.listTags()
+        const items = Object.entries(tagMap ?? {}).map<DataQuickPickItem<string>>(([key, value]) => {
+            return {
+                data: key,
+                label: key,
+                description: value,
+            }
+        })
+        if (items.length === 0) {
+            return
+        }
+
+        const resp = await showQuickPick(items, {
+            title: localize('AWS.docdb.tags.remove.title', 'Remove a tag from {0}', node.name),
+        })
+
+        if (resp === undefined) {
+            getLogger().info('docdb: RemoveTag cancelled')
+            throw new ToolkitError('User cancelled', { cancelled: true })
+        }
+
+        await node.client.removeResourceTags({ resourceArn: node.arn, tagKeys: [resp] })
+        getLogger().info('docdb: Removed resource tag for: %O', node.name)
+        void vscode.window.showInformationMessage(localize('AWS.docdb.tags.remove.success', 'Tag removed'))
+    })
+}
+
+export function validateTag(input: string, minLength: number, name: string): string | undefined {
+    if (input.trim().length < minLength) {
+        return localize('AWS.docdb.validateTag.error.invalidLength', `Tag ${name} cannot be blank`)
+    }
+
+    if (!/^([\p{L}\p{Z}\p{N}\._:/=+\-@]*)$/u.test(input)) {
+        return localize(
+            'AWS.docdb.validateTag.error.invalidCharacters',
+            `Tag ${name} may only contain unicode letters, digits, whitespace, or one of these symbols: _ . : / = + - @`
+        )
+    }
+
+    return undefined
+}
diff --git a/packages/core/src/docdb/explorer/dbClusterNode.ts b/packages/core/src/docdb/explorer/dbClusterNode.ts
new file mode 100644
index 00000000000..5544523d6f9
--- /dev/null
+++ b/packages/core/src/docdb/explorer/dbClusterNode.ts
@@ -0,0 +1,192 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as os from 'os'
+import * as vscode from 'vscode'
+import { inspect } from 'util'
+import { copyToClipboard } from '../../shared/utilities/messages'
+import { makeChildrenNodes } from '../../shared/treeview/utils'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { CreateDBInstanceMessage, DBCluster, ModifyDBClusterMessage } from '@aws-sdk/client-docdb'
+import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
+import { DBResourceNode } from './dbResourceNode'
+import { DBInstanceNode } from './dbInstanceNode'
+import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
+import { DBInstance, DocumentDBClient } from '../../shared/clients/docdbClient'
+import { DocDBContext } from './docdbContext'
+import { toTitleCase } from '../../shared/utilities/textUtilities'
+import { getAwsConsoleUrl } from '../../shared/awsConsole'
+import { getLogger } from '../../shared/logger/logger'
+
+export type DBClusterRole = 'global' | 'regional' | 'primary' | 'secondary'
+
+/**
+ * An AWS Explorer node representing DocumentDB clusters.
+ *
+ * Contains instances for a specific cluster as child nodes.
+ */
+export class DBClusterNode extends DBResourceNode {
+    override name = this.cluster.DBClusterIdentifier!
+    override arn = this.cluster.DBClusterArn!
+    public instances: DBInstance[] = []
+    private childNodes: DBInstanceNode[] = []
+
+    constructor(
+        public readonly parent: AWSTreeNodeBase,
+        readonly cluster: DBCluster,
+        client: DocumentDBClient,
+        readonly clusterRole: DBClusterRole = 'regional'
+    ) {
+        super(client, cluster.DBClusterIdentifier ?? '[Cluster]', vscode.TreeItemCollapsibleState.Collapsed)
+        getLogger().debug(`NEW DBClusterNode: ${cluster.DBClusterArn}`)
+        this.arn = cluster.DBClusterArn ?? ''
+        this.name = cluster.DBClusterIdentifier ?? ''
+        this.contextValue = this.getContext()
+        this.iconPath = new vscode.ThemeIcon(
+            this.isAvailable ? 'layers-active' : this.isStopped ? 'layers-dot' : 'loading~spin'
+        )
+        this.description = this.getDescription()
+        this.tooltip = `${this.name}${os.EOL}Engine: ${this.cluster.EngineVersion}${os.EOL}Status: ${this.cluster.Status}`
+        if (this.isStatusRequiringPolling()) {
+            getLogger().debug(`${this.arn} requires polling.`)
+            this.trackChanges()
+        } else {
+            getLogger().debug(`${this.arn} does NOT require polling.`)
+        }
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        getLogger().debug(`DBClusterNode.getChildren() called`)
+        return telemetry.docdb_listInstances.run(async () => {
+            return await makeChildrenNodes({
+                getChildNodes: async () => {
+                    this.instances = (await this.client.listInstances([this.arn])).map((i) => {
+                        const member = this.cluster.DBClusterMembers?.find(
+                            (m) => m.DBInstanceIdentifier === i.DBInstanceIdentifier
+                        )
+                        return { ...i, ...member }
+                    })
+                    const nodes = this.instances.map((instance) => new DBInstanceNode(this, instance))
+                    this.childNodes = nodes
+                    return nodes
+                },
+                getNoChildrenPlaceholderNode: async () => {
+                    const title = localize('AWS.explorerNode.docdb.addInstance', 'Add instance...')
+                    const placeholder = new PlaceholderNode(this, title)
+                    placeholder.contextValue = 'awsDocDB.placeholder'
+                    placeholder.command = { title, command: 'aws.docdb.createInstance', arguments: [this] }
+                    return placeholder
+                },
+                sort: (item1, item2) => item1.name.localeCompare(item2.name),
+            })
+        })
+    }
+
+    private getContext() {
+        const context = `${DocDBContext.Cluster}-${this.clusterRole}`
+        if (this.isAvailable) {
+            return `${context}-running`
+        } else if (this.isStopped) {
+            return `${context}-stopped`
+        }
+        return context
+    }
+
+    public getDescription(): string | boolean {
+        const role = toTitleCase(this.clusterRole)
+        if (!this.isAvailable) {
+            return `${role} cluster • ${toTitleCase(this.status ?? ' ')}`
+        }
+        return `${role} cluster`
+    }
+
+    public async createInstance(request: CreateDBInstanceMessage): Promise<DBInstance | undefined> {
+        return await this.client.createInstance(request)
+    }
+
+    public async renameCluster(clusterName: string): Promise<DBCluster | undefined> {
+        const request: ModifyDBClusterMessage = {
+            DBClusterIdentifier: this.cluster.DBClusterIdentifier,
+            NewDBClusterIdentifier: clusterName,
+            ApplyImmediately: true,
+        }
+        const response = await this.client.modifyCluster(request)
+        this.name = response?.DBClusterIdentifier ?? this.name
+        return response
+    }
+
+    public async deleteCluster(finalSnapshotId: string | undefined): Promise<DBCluster | undefined> {
+        const instances = await this.client.listInstances([this.arn])
+
+        const tasks = []
+        for (const instance of instances) {
+            tasks.push(
+                this.client.deleteInstance({
+                    DBInstanceIdentifier: instance.DBInstanceIdentifier,
+                })
+            )
+        }
+        await Promise.all(tasks)
+
+        return await this.client.deleteCluster({
+            DBClusterIdentifier: this.cluster.DBClusterIdentifier,
+            FinalDBSnapshotIdentifier: finalSnapshotId,
+            SkipFinalSnapshot: finalSnapshotId === undefined,
+        })
+    }
+
+    override get status() {
+        return this.cluster.Status
+    }
+
+    override async getStatus() {
+        const clusters = await this.client.listClusters(this.arn)
+        const cluster = clusters[0]
+
+        if (!cluster) {
+            getLogger().warn(`No cluster found for ARN: ${this.arn}`)
+            return undefined
+        }
+
+        getLogger().debug(`Get Status: status ${cluster.Status} for cluster ${this.arn}`)
+
+        this.cluster.Status = cluster.Status
+        return cluster.Status
+    }
+
+    override getConsoleUrl() {
+        return getAwsConsoleUrl('docdb', this.regionCode).with({
+            fragment: `cluster-details/${this.name}`,
+        })
+    }
+
+    override copyEndpoint() {
+        if (this.cluster.Endpoint) {
+            return copyToClipboard(this.cluster.Endpoint, this.name)
+        }
+        return Promise.reject()
+    }
+
+    override refreshTree(): void {
+        getLogger().debug(`(DBClusterNode) Refreshing tree for instance: ${this.arn}`)
+        this.refresh()
+        this.parent.refresh()
+    }
+
+    override clearTimer(): void {
+        this.pollingSet.delete(this.arn)
+        this.pollingSet.clearTimer()
+        for (const node of this.childNodes) {
+            getLogger().debug(`(clearTimer) Removing Polling from node: ${node.arn}`)
+            node.pollingSet.delete(node.arn)
+            node.pollingSet.clearTimer()
+        }
+    }
+
+    public override [inspect.custom](): string {
+        return 'DBClusterNode'
+    }
+}
diff --git a/packages/core/src/docdb/explorer/dbElasticClusterNode.ts b/packages/core/src/docdb/explorer/dbElasticClusterNode.ts
new file mode 100644
index 00000000000..d228c3bbefd
--- /dev/null
+++ b/packages/core/src/docdb/explorer/dbElasticClusterNode.ts
@@ -0,0 +1,117 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { inspect } from 'util'
+import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
+import { DBResourceNode } from './dbResourceNode'
+import { DBElasticCluster, DocumentDBClient } from '../../shared/clients/docdbClient'
+import { DocDBContext } from './docdbContext'
+import { copyToClipboard } from '../../shared/utilities/messages'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { getAwsConsoleUrl } from '../../shared/awsConsole'
+import { getLogger } from '../../shared/logger/logger'
+
+/**
+ * An AWS Explorer node representing DocumentDB elastic clusters.
+ */
+export class DBElasticClusterNode extends DBResourceNode {
+    override name = this.cluster.clusterName!
+    override arn = this.cluster.clusterArn!
+
+    constructor(
+        public readonly parent: AWSTreeNodeBase,
+        public cluster: DBElasticCluster,
+        client: DocumentDBClient
+    ) {
+        super(client, cluster.clusterName ?? '[Cluster]', vscode.TreeItemCollapsibleState.None)
+        this.contextValue = this.getContext()
+        this.iconPath = new vscode.ThemeIcon(
+            this.isAvailable ? 'layers-active' : this.isStopped ? 'layers-dot' : 'loading~spin'
+        )
+        this.description = this.getDescription()
+        this.tooltip = `${this.name}\nStatus: ${this.status}`
+        if (this.isStatusRequiringPolling()) {
+            getLogger().debug(`${this.arn} requires polling.`)
+            this.trackChanges()
+        } else {
+            getLogger().debug(`${this.arn} does NOT require polling.`)
+        }
+    }
+
+    private getContext() {
+        if (this.isAvailable) {
+            return `${DocDBContext.ElasticCluster}-running`
+        } else if (this.isStopped) {
+            return `${DocDBContext.ElasticCluster}-stopped`
+        }
+        return DocDBContext.ElasticCluster
+    }
+
+    public getDescription(): string | boolean {
+        if (!this.isAvailable) {
+            return `Elastic cluster • ${this.status}`
+        }
+        return 'Elastic cluster'
+    }
+
+    public async deleteCluster(finalSnapshotId: string | undefined): Promise<DBElasticCluster | undefined> {
+        if (finalSnapshotId !== undefined) {
+            void vscode.window.showInformationMessage(
+                localize('AWS.docdb.deleteCluster.snapshot', 'Taking snapshot of cluster: {0}', this.name)
+            )
+
+            await this.client.createClusterSnapshot({
+                clusterArn: this.cluster.clusterArn,
+                snapshotName: finalSnapshotId,
+            })
+        }
+        return await this.client.deleteElasticCluster(this.arn)
+    }
+
+    override get status() {
+        return this.cluster.status?.toLowerCase()
+    }
+
+    override async getStatus() {
+        const cluster = await this.client.getElasticCluster(this.arn)
+        getLogger().debug(`Get Status: status ${cluster?.status} for elastic-cluster ${this.arn}`)
+        this.cluster.status = cluster?.status
+        return cluster?.status?.toLowerCase()
+    }
+
+    override get isAvailable() {
+        return this.status === 'active'
+    }
+
+    override getConsoleUrl() {
+        return getAwsConsoleUrl('docdb', this.regionCode).with({
+            fragment: `elastic-cluster-details/${this.arn}`,
+        })
+    }
+
+    override async copyEndpoint() {
+        // get the full cluster record if we don't have it already
+        if (this.cluster.clusterEndpoint === undefined) {
+            this.cluster = (await this.client.getElasticCluster(this.arn)) ?? this.cluster
+        }
+        await copyToClipboard(this.cluster.clusterEndpoint!, this.name)
+    }
+
+    override clearTimer(): void {
+        this.pollingSet.delete(this.arn)
+        this.pollingSet.clearTimer()
+    }
+
+    override refreshTree(): void {
+        getLogger().debug(`(DBElasticClusterNode) Refreshing tree for instance: ${this.arn}`)
+        this.refresh()
+        this.parent.refresh()
+    }
+
+    public override [inspect.custom](): string {
+        return 'DBElasticClusterNode'
+    }
+}
diff --git a/packages/core/src/docdb/explorer/dbGlobalClusterNode.ts b/packages/core/src/docdb/explorer/dbGlobalClusterNode.ts
new file mode 100644
index 00000000000..7ab15e01a15
--- /dev/null
+++ b/packages/core/src/docdb/explorer/dbGlobalClusterNode.ts
@@ -0,0 +1,167 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { inspect } from 'util'
+import { makeChildrenNodes } from '../../shared/treeview/utils'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
+import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
+import { DBClusterNode, DBClusterRole } from './dbClusterNode'
+import { DefaultDocumentDBClient, DocumentDBClient } from '../../shared/clients/docdbClient'
+import { DBCluster, GlobalCluster, GlobalClusterMember, ModifyGlobalClusterMessage } from '@aws-sdk/client-docdb'
+import { DBResourceNode } from './dbResourceNode'
+import { DocDBContext } from './docdbContext'
+import { copyToClipboard } from '../../shared/utilities/messages'
+import { getAwsConsoleUrl } from '../../shared/awsConsole'
+import { getLogger } from '../../shared/logger/logger'
+
+function getRegionFromArn(arn: string) {
+    const match = arn.match(/:rds:([^:]+):.*:cluster:/)
+    return match?.at(1)
+}
+
+/**
+ * An AWS Explorer node representing DocumentDB global clusters.
+ *
+ * Contains regional clusters of a global cluster as child nodes.
+ */
+export class DBGlobalClusterNode extends DBResourceNode {
+    override name = this.cluster.GlobalClusterIdentifier!
+    override arn = this.cluster.GlobalClusterArn!
+    readonly clusterRole: DBClusterRole = 'global'
+
+    constructor(
+        public readonly parent: AWSTreeNodeBase,
+        readonly cluster: GlobalCluster,
+        private readonly clusterMap: Map<string, [DBCluster, DocumentDBClient]>,
+        client: DocumentDBClient
+    ) {
+        super(client, cluster.GlobalClusterIdentifier ?? '[Cluster]', vscode.TreeItemCollapsibleState.Collapsed)
+        this.arn = cluster.GlobalClusterArn ?? ''
+        this.name = cluster.GlobalClusterIdentifier ?? ''
+        this.contextValue = this.getContext()
+        this.iconPath = new vscode.ThemeIcon('globe') // TODO: determine icon for global cluster
+        this.description = 'Global cluster'
+        this.tooltip = `${this.name}\nEngine: ${this.cluster.EngineVersion}\nStatus: ${this.cluster.Status} (read-only)`
+        if (this.isStatusRequiringPolling()) {
+            getLogger().debug(`${this.arn} requires polling.`)
+            this.trackChanges()
+        } else {
+            getLogger().debug(`${this.arn} does NOT require polling.`)
+        }
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        return telemetry.docdb_listInstances.run(async () => {
+            return await makeChildrenNodes({
+                getChildNodes: async () => {
+                    const members = this.cluster.GlobalClusterMembers ?? []
+                    await this.getMemberClusters(members)
+
+                    const nodes = members.map((member) => {
+                        const memberRole: DBClusterRole = member.IsWriter ? 'primary' : 'secondary'
+                        const [cluster, client] = this.clusterMap.get(member.DBClusterArn!) ?? []
+
+                        return new DBClusterNode(this, cluster!, client!, memberRole)
+                    })
+
+                    return nodes
+                },
+                getNoChildrenPlaceholderNode: async () =>
+                    new PlaceholderNode(this, localize('AWS.explorerNode.docdb.noClusters', '[No Clusters found]')),
+                sort: (item1, item2) => {
+                    if (item1.clusterRole === 'primary') {
+                        return -1
+                    }
+                    if (item2.clusterRole === 'primary') {
+                        return 1
+                    }
+                    return item1.name.localeCompare(item2.name)
+                },
+            })
+        })
+    }
+
+    private getContext() {
+        if (this.isAvailable) {
+            return `${DocDBContext.GlobalCluster}-running`
+        } else if (this.status === 'stopped') {
+            return `${DocDBContext.GlobalCluster}-stopped`
+        }
+        return DocDBContext.GlobalCluster
+    }
+
+    // retrieve member cluster details from other regions
+    private async getMemberClusters(members: GlobalClusterMember[]): Promise<void> {
+        await Promise.all(
+            members.map(async (member) => {
+                if (!this.clusterMap.has(member.DBClusterArn!)) {
+                    const regionCode = getRegionFromArn(member.DBClusterArn!)
+                    if (regionCode) {
+                        const client = DefaultDocumentDBClient.create(regionCode)
+                        const [cluster] = await client.listClusters(member.DBClusterArn!)
+                        this.clusterMap.set(member.DBClusterArn!, [cluster, client])
+                    }
+                }
+            })
+        )
+    }
+
+    public async renameCluster(clusterName: string): Promise<DBCluster | undefined> {
+        const request: ModifyGlobalClusterMessage = {
+            GlobalClusterIdentifier: this.cluster.GlobalClusterIdentifier,
+            NewGlobalClusterIdentifier: clusterName,
+        }
+        const response = await this.client.modifyGlobalCluster(request)
+        this.name = response?.GlobalClusterIdentifier ?? this.name
+        return response
+    }
+
+    override get status() {
+        return this.cluster.Status
+    }
+
+    override async getStatus() {
+        const client = DefaultDocumentDBClient.create(this.regionCode)
+        const clusters = await client.listClusters(this.arn)
+        const cluster = clusters[0]
+
+        if (!cluster) {
+            getLogger().warn(`No global cluster found for ARN: ${this.arn}`)
+            return undefined
+        }
+
+        getLogger().debug(`Get Status: status ${cluster.Status} for global cluster ${this.arn}`)
+        this.cluster.Status = cluster.Status
+        return cluster.Status
+    }
+
+    override copyEndpoint(): Promise<void> {
+        return copyToClipboard(this.cluster.GlobalClusterResourceId!, this.name)
+    }
+
+    override getConsoleUrl(): vscode.Uri {
+        return getAwsConsoleUrl('docdb', this.regionCode).with({
+            fragment: `global-cluster-details/${this.name}`,
+        })
+    }
+
+    override refreshTree(): void {
+        getLogger().debug(`(DBGlobalClusterNode) Refreshing tree for instance: ${this.arn}`)
+        this.refresh()
+        this.parent.refresh()
+    }
+
+    override clearTimer(): void {
+        this.pollingSet.delete(this.arn)
+        this.pollingSet.clearTimer()
+    }
+
+    public override [inspect.custom](): string {
+        return 'DBGlobalClusterNode'
+    }
+}
diff --git a/packages/core/src/docdb/explorer/dbInstanceNode.ts b/packages/core/src/docdb/explorer/dbInstanceNode.ts
new file mode 100644
index 00000000000..3a839971e08
--- /dev/null
+++ b/packages/core/src/docdb/explorer/dbInstanceNode.ts
@@ -0,0 +1,119 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { inspect } from 'util'
+import { DBInstance } from '../../shared/clients/docdbClient'
+import { DocDBContext, DocDBNodeContext } from './docdbContext'
+import { DBResourceNode } from './dbResourceNode'
+import { DBClusterNode } from './dbClusterNode'
+import { ModifyDBInstanceMessage } from '@aws-sdk/client-docdb'
+import { copyToClipboard } from '../../shared/utilities/messages'
+import { getAwsConsoleUrl } from '../../shared/awsConsole'
+import { getLogger } from '../../shared/logger/logger'
+import { toTitleCase } from '../../shared/utilities/textUtilities'
+
+/**
+ * An AWS Explorer node representing a DocumentDB instance.
+ */
+export class DBInstanceNode extends DBResourceNode {
+    override name = this.instance.DBInstanceIdentifier!
+    override arn = this.instance.DBInstanceArn!
+
+    constructor(
+        public readonly parent: DBClusterNode,
+        readonly instance: DBInstance
+    ) {
+        super(parent.client, instance.DBInstanceIdentifier ?? '[Instance]', vscode.TreeItemCollapsibleState.None)
+        getLogger().debug(`NEW DBInstanceNode: ${instance.DBInstanceArn}`)
+        this.description = this.makeDescription()
+        this.contextValue = this.getContext()
+        this.iconPath = this.isAvailable || this.isStopped ? undefined : new vscode.ThemeIcon('loading~spin')
+        this.tooltip = `${this.name}\nClass: ${this.instance.DBInstanceClass}\nStatus: ${this.status}`
+        getLogger().debug(`Parent of ${instance.DBInstanceArn} is ${parent.arn}`)
+        if (this.isStatusRequiringPolling()) {
+            getLogger().debug(`${instance.DBInstanceArn} requires polling.`)
+            this.trackChanges()
+        } else {
+            getLogger().debug(`${instance.DBInstanceArn} does NOT require polling.`)
+        }
+    }
+
+    public override isStatusRequiringPolling(): boolean {
+        const instanceRequiresPolling = super.isStatusRequiringPolling()
+        const parentRequiresPolling = this.parent.isStatusRequiringPolling()
+        const requiresPolling = instanceRequiresPolling || parentRequiresPolling
+
+        getLogger().debug(
+            `isStatusRequiringPolling (DBInstanceNode): Instance ${this.arn} requires polling: ${instanceRequiresPolling}, Parent ${this.parent.arn} requires polling: ${parentRequiresPolling}, Combined result: ${requiresPolling}`
+        )
+
+        return requiresPolling
+    }
+
+    private makeDescription(): string {
+        const type = this.instance.IsClusterWriter ? 'Primary' : 'Replica'
+        if (this.getContext() !== DocDBContext.InstanceAvailable) {
+            return `${toTitleCase(this.status ?? ' ')} ${type} instance`
+        }
+        return `${type} instance • ${this.instance.DBInstanceClass}`
+    }
+
+    private getContext(): DocDBNodeContext {
+        if (this.isAvailable) {
+            return DocDBContext.InstanceAvailable
+        }
+        return DocDBContext.Instance
+    }
+
+    public async rebootInstance(): Promise<boolean> {
+        const client = this.parent.client
+        return await client.rebootInstance(this.instance.DBInstanceIdentifier!)
+    }
+
+    public async renameInstance(instanceName: string): Promise<DBInstance | undefined> {
+        const request: ModifyDBInstanceMessage = {
+            DBInstanceIdentifier: this.instance.DBInstanceIdentifier,
+            NewDBInstanceIdentifier: instanceName,
+            ApplyImmediately: true,
+        }
+        return await this.parent.client.modifyInstance(request)
+    }
+
+    override get status() {
+        return this.instance.DBInstanceStatus
+    }
+
+    override async getStatus() {
+        const instance = await this.parent.client.getInstance(this.instance.DBInstanceIdentifier!)
+        this.instance.DBInstanceStatus = instance?.DBInstanceStatus
+        return instance?.DBInstanceStatus
+    }
+
+    override getConsoleUrl() {
+        return getAwsConsoleUrl('docdb', this.regionCode).with({
+            fragment: `instance-details/${this.name}`,
+        })
+    }
+
+    override copyEndpoint() {
+        return copyToClipboard(this.instance.Endpoint?.Address ?? '', this.name)
+    }
+
+    override refreshTree(): void {
+        getLogger().debug(`(DBInstanceNode) Refreshing tree for instance: ${this.arn}`)
+        this.refresh()
+        this.parent.refreshTree()
+    }
+
+    override clearTimer(): void {
+        this.pollingSet.delete(this.arn)
+        this.pollingSet.clearTimer()
+    }
+
+    public override [inspect.custom](): string {
+        return 'DBInstanceNode'
+    }
+}
diff --git a/packages/core/src/docdb/explorer/dbResourceNode.ts b/packages/core/src/docdb/explorer/dbResourceNode.ts
new file mode 100644
index 00000000000..259a867024c
--- /dev/null
+++ b/packages/core/src/docdb/explorer/dbResourceNode.ts
@@ -0,0 +1,175 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { inspect } from 'util'
+import { AWSResourceNode } from '../../shared/treeview/nodes/awsResourceNode'
+import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
+import { DocumentDBClient } from '../../shared/clients/docdbClient'
+import { waitUntil } from '../../shared/utilities/timeoutUtils'
+import { getLogger } from '../../shared/logger/logger'
+import { PollingSet } from '../../shared/utilities/pollingSet'
+
+/** An AWS Explorer node representing a DocumentDB resource. */
+export abstract class DBResourceNode extends AWSTreeNodeBase implements AWSResourceNode {
+    public override readonly regionCode: string
+    public abstract readonly arn: string
+    public abstract readonly name: string
+    public readonly pollingSet: PollingSet<string> = new PollingSet(30000, this.updateNodeStatus.bind(this))
+    private static readonly globalPollingArns: Set<string> = new Set<string>()
+    public processingStatuses = new Set<string>([
+        'creating',
+        'modifying',
+        'rebooting',
+        'starting',
+        'stopping',
+        'renaming',
+    ])
+
+    protected constructor(
+        public readonly client: DocumentDBClient,
+        label: string,
+        collapsibleState?: vscode.TreeItemCollapsibleState
+    ) {
+        super(label, collapsibleState)
+        this.regionCode = client.regionCode
+        getLogger().debug(`NEW DBResourceNode`)
+    }
+
+    public isStatusRequiringPolling(): boolean {
+        const currentStatus = this.status?.toLowerCase()
+        const isProcessingStatus = currentStatus !== undefined && this.processingStatuses.has(currentStatus)
+        getLogger().debug(
+            `isStatusRequiringPolling (DBResourceNode):: Checking if status "${currentStatus}" for ARN: ${this.arn} requires polling: ${isProcessingStatus}`
+        )
+        return isProcessingStatus
+    }
+
+    public [inspect.custom](): string {
+        return 'DBResourceNode'
+    }
+
+    public abstract get status(): string | undefined
+
+    public abstract getStatus(): Promise<string | undefined>
+
+    public abstract refreshTree(): void
+
+    public abstract clearTimer(): void
+
+    public get isAvailable(): boolean {
+        return this.status === 'available'
+    }
+
+    public get isStopped(): boolean {
+        return this.status === 'stopped'
+    }
+
+    public get isPolling(): boolean {
+        const isPolling = DBResourceNode.globalPollingArns.has(this.arn)
+        getLogger().debug(`isPolling: ARN ${this.arn} is ${isPolling ? '' : 'not '}being polled.`)
+        return isPolling
+    }
+
+    public set isPolling(value: boolean) {
+        if (value) {
+            if (!this.isPolling) {
+                DBResourceNode.globalPollingArns.add(this.arn)
+                getLogger().info(`Polling started for ARN: ${this.arn}`)
+            } else {
+                getLogger().info(`Polling already active for ARN: ${this.arn}`)
+            }
+        } else {
+            if (this.isPolling) {
+                DBResourceNode.globalPollingArns.delete(this.arn)
+                getLogger().info(`Polling stopped for ARN: ${this.arn}`)
+            } else {
+                getLogger().info(`Polling was not active for ARN: ${this.arn}`)
+            }
+        }
+    }
+
+    public async waitUntilStatusChanged(
+        checkProcessingStatuses: boolean = false,
+        timeout: number = 1200000,
+        interval: number = 5000
+    ): Promise<boolean> {
+        await waitUntil(
+            async () => {
+                const status = await this.getStatus()
+                if (checkProcessingStatuses) {
+                    const isProcessingStatus = status !== undefined && this.processingStatuses.has(status.toLowerCase())
+                    getLogger().debug('docdb: waitUntilStatusChangedToProcessingStatus: %O', isProcessingStatus)
+                    return isProcessingStatus
+                } else {
+                    const hasStatusChanged = status !== this.status
+                    getLogger().debug('docdb: waitUntilStatusChanged (status): %O', hasStatusChanged)
+                    return hasStatusChanged
+                }
+            },
+            { timeout, interval, truthy: true }
+        )
+        this.refreshTree()
+        return false
+    }
+
+    public async trackChangesWithWaitProcessingStatus() {
+        getLogger().debug(
+            `Preparing to track changes with waiting a processing status for ARN: ${this.arn}; condition: ${this.isPolling};`
+        )
+        if (!this.isPolling) {
+            this.isPolling = true
+            await this.waitUntilStatusChanged(true, 60000, 1000)
+            getLogger().debug(`Tracking changes for a processing status wait is over`)
+            this.pollingSet.add(this.arn)
+            getLogger().debug(`Tracking changes for ARN: ${this.arn}; condition: ${this.isPolling};`)
+        } else {
+            getLogger().debug(`ARN: ${this.arn} already being tracked`)
+        }
+    }
+
+    public trackChanges() {
+        getLogger().debug(`Preparing to track immediately for ARN: ${this.arn}; condition: ${this.isPolling};`)
+        if (!this.isPolling) {
+            this.isPolling = true
+            this.pollingSet.add(this.arn)
+            getLogger().debug(`Tracking changes for ARN: ${this.arn}; condition: ${this.isPolling};`)
+        } else {
+            getLogger().debug(`ARN: ${this.arn} already being tracked`)
+        }
+    }
+
+    public async listTags() {
+        return await this.client.listResourceTags(this.arn)
+    }
+
+    public abstract copyEndpoint(): Promise<void>
+
+    public abstract getConsoleUrl(): vscode.Uri
+
+    public openInBrowser() {
+        return vscode.env.openExternal(this.getConsoleUrl())
+    }
+
+    private async updateNodeStatus() {
+        const currentStatus = this.status
+        const newStatus = await this.getStatus()
+        getLogger().debug(
+            `docdb: ${this.arn} updateNodeStatus (new status): ${newStatus} (old status): ${currentStatus}`
+        )
+        if (currentStatus !== newStatus) {
+            getLogger().info(`docdb: ${this.arn} status: ${newStatus}, refreshing UI`)
+            this.refreshTree()
+        }
+        if (!this.isStatusRequiringPolling()) {
+            getLogger().info(`docdb: ${this.arn} status: ${newStatus}, refreshing UI`)
+            getLogger().debug(`pollingSet delete ${this.arn} updateNodeStatus`)
+            this.pollingSet.delete(this.arn)
+            this.pollingSet.clearTimer()
+            this.isPolling = false
+            this.refreshTree()
+        }
+    }
+}
diff --git a/packages/core/src/docdb/explorer/docdbContext.ts b/packages/core/src/docdb/explorer/docdbContext.ts
new file mode 100644
index 00000000000..23e2b2fbbad
--- /dev/null
+++ b/packages/core/src/docdb/explorer/docdbContext.ts
@@ -0,0 +1,14 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export const DocDBContext = {
+    Cluster: 'awsDocDB-cluster',
+    ElasticCluster: 'awsDocDB-cluster-elastic',
+    GlobalCluster: 'awsDocDB-cluster-global',
+    Instance: 'awsDocDB-instance',
+    InstanceAvailable: 'awsDocDB-instance-available',
+} as const
+
+export type DocDBNodeContext = (typeof DocDBContext)[keyof typeof DocDBContext]
diff --git a/packages/core/src/docdb/explorer/docdbNode.ts b/packages/core/src/docdb/explorer/docdbNode.ts
new file mode 100644
index 00000000000..e94e7c41152
--- /dev/null
+++ b/packages/core/src/docdb/explorer/docdbNode.ts
@@ -0,0 +1,88 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { inspect } from 'util'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
+import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
+import { makeChildrenNodes } from '../../shared/treeview/utils'
+import { DBElasticCluster, DocumentDBClient } from '../../shared/clients/docdbClient'
+import { DBClusterNode } from './dbClusterNode'
+import { DBElasticClusterNode } from './dbElasticClusterNode'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { DBGlobalClusterNode } from './dbGlobalClusterNode'
+import { DBCluster } from '@aws-sdk/client-docdb'
+import { getLogger } from '../../shared/logger/logger'
+import { DBResourceNode } from './dbResourceNode'
+
+/**
+ * An AWS Explorer node representing DocumentDB.
+ *
+ * Contains clusters for a specific region as child nodes.
+ */
+export class DocumentDBNode extends AWSTreeNodeBase {
+    public override readonly regionCode: string
+
+    public constructor(public readonly client: DocumentDBClient) {
+        super('DocumentDB', vscode.TreeItemCollapsibleState.Collapsed)
+        this.contextValue = 'awsDocDBNode'
+        this.regionCode = client.regionCode
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        return telemetry.docdb_listClusters.run(async () => {
+            return await makeChildrenNodes({
+                getChildNodes: () => {
+                    return this.getClusterNodes()
+                },
+                getNoChildrenPlaceholderNode: async () =>
+                    new PlaceholderNode(this, localize('AWS.explorerNode.docdb.noClusters', '[No Clusters found]')),
+                sort: (item1, item2) => item1.name.localeCompare(item2.name),
+            })
+        })
+    }
+
+    private async getClusterNodes() {
+        const [globalClusters, clusters, elasticClusters] = await Promise.all([
+            this.client.listGlobalClusters(),
+            this.client.listClusters(),
+            this.client.listElasticClusters(),
+        ])
+
+        // contains clusters that are part of a global cluster
+        const globalClusterMap = new Map<string, [DBCluster, DocumentDBClient]>()
+
+        for (const globalCluster of globalClusters) {
+            for (const member of globalCluster.GlobalClusterMembers ?? []) {
+                const match = clusters.find((c) => c.DBClusterArn === member.DBClusterArn)
+                if (match?.DBClusterArn) {
+                    globalClusterMap.set(match.DBClusterArn, [match, this.client])
+                }
+            }
+        }
+
+        // contains clusters that are not part of a global cluster
+        const regionalClusters = clusters.filter((c) => !globalClusterMap.has(c.DBClusterArn!))
+
+        const nodes: DBResourceNode[] = []
+        nodes.push(
+            ...globalClusters.map((cluster) => new DBGlobalClusterNode(this, cluster, globalClusterMap, this.client))
+        )
+        getLogger().info(`Repopulating child regional clusters...`)
+        nodes.push(...regionalClusters.map((cluster) => new DBClusterNode(this, cluster, this.client)))
+        nodes.push(
+            ...elasticClusters.map(
+                (cluster) => new DBElasticClusterNode(this, cluster as DBElasticCluster, this.client)
+            )
+        )
+
+        return nodes
+    }
+
+    public [inspect.custom](): string {
+        return 'DocumentDBNode'
+    }
+}
diff --git a/packages/core/src/docdb/utils.ts b/packages/core/src/docdb/utils.ts
new file mode 100644
index 00000000000..09b71d9fdf9
--- /dev/null
+++ b/packages/core/src/docdb/utils.ts
@@ -0,0 +1,154 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { ToolkitError } from '../shared/errors'
+import { localize } from '../shared/utilities/vsCodeUtils'
+import { DBInstanceNode } from './explorer/dbInstanceNode'
+import { DBResourceNode } from './explorer/dbResourceNode'
+
+/**
+ * Validates a cluster name for the CreateCluster API.
+ * @see https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/docdb/command/CreateDBClusterCommand/
+ * @returns undefined if the name passes validation. Otherwise, an error message is returned.
+ */
+export function validateClusterName(name: string): string | undefined {
+    if (name.length < 1 || name.length > 63) {
+        return localize(
+            'AWS.docdb.validateClusterName.error.invalidLength',
+            'Cluster name must be between 1 and 63 characters long'
+        )
+    }
+
+    if (!/^[a-z]/.test(name)) {
+        return localize(
+            'AWS.docdb.validateClusterName.error.invalidStart',
+            'Cluster name must start with a lowercase letter'
+        )
+    }
+
+    if (/-$/.test(name) || /--/.test(name)) {
+        return localize(
+            'AWS.docdb.validateClusterName.error.invalidEnd',
+            'Cluster name cannot end with a hyphen or contain 2 consecutive hyphens'
+        )
+    }
+
+    if (!/^[a-z0-9\-]+$/.test(name)) {
+        return localize(
+            'AWS.docdb.validateClusterName.error.invalidCharacters',
+            'Cluster name must only contain lowercase letters, numbers, and hyphens'
+        )
+    }
+
+    return undefined
+}
+
+/**
+ * Validates a username
+ * @see https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/docdb/command/CreateDBClusterCommand/
+ * @returns undefined if the name passes validation. Otherwise, an error message is returned.
+ */
+export function validateUsername(name: string): string | undefined {
+    if (name.length < 1 || name.length > 63) {
+        return localize(
+            'AWS.docdb.validateUsername.error.invalidLength',
+            'Username name must be between 1 and 63 characters long'
+        )
+    }
+
+    if (!/^[a-zA-Z]/.test(name)) {
+        return localize('AWS.docdb.validateUsername.error.invalidStart', 'Username must start with a letter')
+    }
+
+    if (!/^[a-zA-Z0-9]+$/.test(name)) {
+        return localize(
+            'AWS.docdb.validateUsername.error.invalidCharacters',
+            'Username must only contain letters and numbers'
+        )
+    }
+
+    return undefined
+}
+
+/**
+ * Validates a password
+ * @see https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/docdb/command/CreateDBClusterCommand/
+ * @returns undefined if validation passes. Otherwise, an error message is returned.
+ */
+export function validatePassword(password: string): string | undefined {
+    if (password.length < 8 || password.length > 100) {
+        return localize(
+            'AWS.docdb.validatePassword.error.invalidLength',
+            'Password must be between 8 and 100 characters long'
+        )
+    }
+
+    if (/["\/\@]/.test(password) || !/^[ -~]*$/.test(password)) {
+        return localize(
+            'AWS.docdb.validatePassword.error.invalidCharacters',
+            'Password must only contain printable ASCII characters (except for slash, double quotes and @ symbol)'
+        )
+    }
+
+    return undefined
+}
+
+/**
+ * Validates an instance name for the CreateInstance API.
+ * @see https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/docdb/command/CreateDBInstanceCommand/
+ * @returns undefined if the name passes validation. Otherwise, an error message is returned.
+ */
+export function validateInstanceName(name: string): string | undefined {
+    if (name.length < 1 || name.length > 63) {
+        return localize(
+            'AWS.docdb.validateInstanceName.error.invalidLength',
+            'Instance name must be between 1 and 63 characters long'
+        )
+    }
+
+    if (!/^[a-z]/.test(name)) {
+        return localize(
+            'AWS.docdb.validateInstanceName.error.invalidStart',
+            'Instance name must start with a lowercase letter'
+        )
+    }
+
+    if (/-$/.test(name) || /--/.test(name)) {
+        return localize(
+            'AWS.docdb.validateInstanceName.error.invalidEnd',
+            'Instance name cannot end with a hyphen or contain 2 consecutive hyphens'
+        )
+    }
+
+    if (!/^[a-z0-9\-]+$/.test(name)) {
+        return localize(
+            'AWS.docdb.validateInstanceName.error.invalidCharacters',
+            'Instance name must only contain lowercase letters, numbers, and hyphens'
+        )
+    }
+
+    return undefined
+}
+
+export function isSupportedGlobalInstanceClass(instanceClass: string) {
+    return /(t3|t4g|r4)/.test(instanceClass) === false
+}
+
+export function assertNodeAvailable(node: DBResourceNode | undefined, action: string) {
+    if (!node) {
+        throw new ToolkitError(`No node specified for ${action}`)
+    }
+
+    if (!node.isAvailable) {
+        if (node instanceof DBInstanceNode) {
+            void vscode.window.showErrorMessage(localize('AWS.docdb.instanceStopped', 'Instance must be running'))
+            throw new ToolkitError('Instance not running', { cancelled: true, code: 'docdbInstanceNotAvailable' })
+        }
+
+        void vscode.window.showErrorMessage(localize('AWS.docdb.clusterStopped', 'Cluster must be running'))
+        throw new ToolkitError('Cluster not running', { cancelled: true, code: 'docdbClusterStopped' })
+    }
+}
diff --git a/packages/core/src/docdb/wizards/createClusterWizard.ts b/packages/core/src/docdb/wizards/createClusterWizard.ts
new file mode 100644
index 00000000000..5e81dd89c63
--- /dev/null
+++ b/packages/core/src/docdb/wizards/createClusterWizard.ts
@@ -0,0 +1,82 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { createCommonButtons } from '../../shared/ui/buttons'
+import { createExitPrompter } from '../../shared/ui/common/exitPrompter'
+import { DataQuickPickItem, createQuickPick } from '../../shared/ui/pickerPrompter'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { Wizard, WizardOptions } from '../../shared/wizards/wizard'
+import { RegionalClusterConfiguration, RegionalClusterWizard } from './regionalClusterWizard'
+import { ElasticClusterConfiguration, ElasticClusterWizard } from './elasticClusterWizard'
+import { DocumentDBClient } from '../../shared/clients/docdbClient'
+
+const DocDBClusterHelpUrl =
+    'https://docs.aws.amazon.com/documentdb/latest/developerguide/docdb-using-elastic-clusters.html'
+
+type ClusterType = 'regional' | 'elastic' | undefined
+
+export interface CreateClusterState {
+    ClusterType: ClusterType
+    readonly RegionalCluster: RegionalClusterConfiguration
+    readonly ElasticCluster: ElasticClusterConfiguration
+}
+
+/**
+ * A wizard to prompt configuration of a new cluster
+ */
+export class CreateClusterWizard extends Wizard<CreateClusterState> {
+    title: string
+    constructor(
+        readonly client: DocumentDBClient,
+        options: WizardOptions<CreateClusterState> = {}
+    ) {
+        super({
+            initState: options.initState,
+            implicitState: options.implicitState,
+            exitPrompterProvider: createExitPrompter,
+        })
+        this.title = localize('AWS.docdb.createCluster.title', 'Create DocumentDB Cluster')
+    }
+
+    public override async init(): Promise<this> {
+        this.form.ClusterType.bindPrompter(() => createClusterTypePrompter())
+
+        const regionalClusterWizard = await new RegionalClusterWizard(this.client, this.title).init()
+        this.form.RegionalCluster.applyBoundForm(regionalClusterWizard.boundForm, {
+            showWhen: (state) => state.ClusterType === 'regional',
+        })
+
+        const elasticClusterWizard = new ElasticClusterWizard(this.client, this.title)
+        this.form.ElasticCluster.applyBoundForm(elasticClusterWizard.boundForm, {
+            showWhen: (state) => state.ClusterType === 'elastic',
+        })
+
+        return this
+    }
+}
+
+function createClusterTypePrompter() {
+    const regionalType: DataQuickPickItem<ClusterType> = {
+        data: 'regional',
+        label: localize('AWS.docdb.createCluster.clusterType.regional.label', 'Instance Based Cluster'),
+        detail: localize(
+            'AWS.docdb.createCluster.clusterType.regional.detail',
+            'Instance based cluster can scale your database to millions of reads per second and up to 128 TiB of storage capacity. With instance based clusters you can choose your instance type based on your requirements.'
+        ),
+    }
+    const elasticType: DataQuickPickItem<ClusterType> = {
+        data: 'elastic',
+        label: localize('AWS.docdb.createCluster.clusterType.elastic.label', 'Elastic Cluster'),
+        detail: localize(
+            'AWS.docdb.createCluster.clusterType.elastic.detail',
+            'Elastic clusters can scale your database to millions of reads and writes per second, with petabytes of storage capacity. Elastic clusters support MongoDB compatible sharding APIs. With Elastic Clusters, you do not need to choose, manage or upgrade instances.'
+        ),
+    }
+
+    return createQuickPick([regionalType, elasticType], {
+        title: localize('AWS.docdb.createCluster.clusterType.prompt', 'Cluster type'),
+        buttons: createCommonButtons(DocDBClusterHelpUrl),
+    })
+}
diff --git a/packages/core/src/docdb/wizards/createGlobalClusterWizard.ts b/packages/core/src/docdb/wizards/createGlobalClusterWizard.ts
new file mode 100644
index 00000000000..de88522dff4
--- /dev/null
+++ b/packages/core/src/docdb/wizards/createGlobalClusterWizard.ts
@@ -0,0 +1,74 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../../shared/extensionGlobals'
+import { DocDBEngine, DocumentDBClient } from '../../shared/clients/docdbClient'
+import { createExitPrompter } from '../../shared/ui/common/exitPrompter'
+import { createRegionPrompter } from '../../shared/ui/common/region'
+import { createInputBox } from '../../shared/ui/inputPrompter'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { Wizard, WizardOptions } from '../../shared/wizards/wizard'
+import { validateClusterName } from '../utils'
+import { RegionalClusterConfiguration, RegionalClusterWizard } from './regionalClusterWizard'
+
+const DocDBGlobalHelpUrl = 'https://docs.aws.amazon.com/documentdb/latest/developerguide/global-clusters.html'
+
+export interface CreateGlobalClusterState {
+    RegionCode: string
+    GlobalClusterName: string
+    readonly Cluster: RegionalClusterConfiguration
+}
+
+/**
+ * A wizard to prompt configuration of a new global cluster
+ */
+export class CreateGlobalClusterWizard extends Wizard<CreateGlobalClusterState> {
+    constructor(
+        readonly region: string,
+        readonly engineVersion: string | undefined,
+        readonly client: DocumentDBClient,
+        options: WizardOptions<CreateGlobalClusterState> = {}
+    ) {
+        super({
+            initState: options.initState,
+            implicitState: options.implicitState,
+            exitPrompterProvider: createExitPrompter,
+        })
+    }
+
+    public override async init(): Promise<this> {
+        this.form.RegionCode.bindPrompter(async () => {
+            const regions = globals.regionProvider.getRegions().filter((r) => r.id !== this.region)
+            return createRegionPrompter(regions, {
+                serviceFilter: DocDBEngine,
+                title: localize('AWS.docdb.addRegion.region.prompt', 'Secondary region'),
+                helpUrl: DocDBGlobalHelpUrl,
+            }).transform((region) => region.id)
+        })
+
+        this.form.GlobalClusterName.bindPrompter(
+            () =>
+                createInputBox({
+                    title: localize('AWS.docdb.addRegion.name.title', 'Global Cluster Id'),
+                    prompt: localize(
+                        'AWS.docdb.addRegion.name.prompt',
+                        'Specify a unique identifier for the global cluster'
+                    ),
+                    validateInput: validateClusterName,
+                }),
+            {
+                showWhen: (state) => state.GlobalClusterName === undefined,
+            }
+        )
+
+        const title = localize('AWS.docdb.addRegion.cluster.title', 'Secondary cluster')
+        const regionalClusterWizard = await new RegionalClusterWizard(this.client, title, false, {
+            initState: { EngineVersion: this.engineVersion },
+        }).init()
+        this.form.Cluster.applyBoundForm(regionalClusterWizard.boundForm)
+
+        return this
+    }
+}
diff --git a/packages/core/src/docdb/wizards/createInstanceWizard.ts b/packages/core/src/docdb/wizards/createInstanceWizard.ts
new file mode 100644
index 00000000000..8bf5b952e02
--- /dev/null
+++ b/packages/core/src/docdb/wizards/createInstanceWizard.ts
@@ -0,0 +1,96 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { DBCluster, OrderableDBInstanceOption } from '@aws-sdk/client-docdb'
+import { DefaultDocumentDBClient, DocumentDBClient, DBStorageType } from '../../shared/clients/docdbClient'
+import { validateInstanceName } from '../utils'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { Wizard, WizardOptions } from '../../shared/wizards/wizard'
+import { createInputBox } from '../../shared/ui/inputPrompter'
+import { createExitPrompter } from '../../shared/ui/common/exitPrompter'
+import { DataQuickPickItem, createQuickPick } from '../../shared/ui/pickerPrompter'
+import { createCommonButtons } from '../../shared/ui/buttons'
+import { SkipPrompter } from '../../shared/ui/common/skipPrompter'
+
+const DocDBHelpUrl = 'https://docs.aws.amazon.com/documentdb/latest/developerguide/db-instances.html'
+
+export interface CreateInstanceState {
+    DBInstanceIdentifier: string
+    DBInstanceClass: string
+}
+
+/**
+ * A wizard to prompt configuration of a new instance
+ */
+export class CreateInstanceWizard extends Wizard<CreateInstanceState> {
+    title: string
+    cluster: DBCluster
+    constructor(
+        region: string,
+        cluster: DBCluster,
+        options: WizardOptions<CreateInstanceState> = {},
+        readonly client: DocumentDBClient = DefaultDocumentDBClient.create(region)
+    ) {
+        super({
+            initState: {
+                ...options.initState,
+            },
+            implicitState: options.implicitState,
+            exitPrompterProvider: createExitPrompter,
+        })
+        this.cluster = cluster
+        this.client = client
+        this.title = localize('AWS.docdb.createInstance.title', 'Add Instance')
+    }
+
+    public override async init(): Promise<this> {
+        const form = this.form
+
+        form.DBInstanceIdentifier.bindPrompter(() =>
+            createInputBox({
+                step: 1,
+                title: this.title,
+                prompt: localize('AWS.docdb.createInstance.name.prompt', 'Instance Name'),
+                placeholder: localize('AWS.docdb.createInstance.name.placeholder', 'Specify a unique identifier'),
+                validateInput: validateInstanceName,
+            })
+        )
+
+        form.DBInstanceClass.bindPrompter(async (state) => await this.createInstanceClassPrompter(state.stepCache))
+
+        return this
+    }
+
+    private async createInstanceClassPrompter(cache: { [key: string]: any }) {
+        const cachedOptions: OrderableDBInstanceOption[] = cache[this.client.regionCode]
+        const options =
+            cachedOptions ??
+            (await this.client.listInstanceClassOptions(
+                this.cluster.EngineVersion,
+                this.cluster.StorageType ?? DBStorageType.Standard
+            ))
+        cache[this.client.regionCode] = options
+
+        const items: DataQuickPickItem<string>[] = options.map((option) => {
+            return {
+                data: option.DBInstanceClass,
+                label: option.DBInstanceClass ?? '(unknown)',
+                description: undefined,
+                detail: undefined,
+                recentlyUsed: false,
+            }
+        })
+
+        if (items.length === 0) {
+            return new SkipPrompter<string>()
+        }
+
+        return createQuickPick(items, {
+            step: 2,
+            title: localize('AWS.docdb.createInstance.instanceClass.prompt', 'Select instance class'),
+            buttons: createCommonButtons(DocDBHelpUrl),
+        })
+    }
+}
diff --git a/packages/core/src/docdb/wizards/elasticClusterWizard.ts b/packages/core/src/docdb/wizards/elasticClusterWizard.ts
new file mode 100644
index 00000000000..b28d2f20751
--- /dev/null
+++ b/packages/core/src/docdb/wizards/elasticClusterWizard.ts
@@ -0,0 +1,132 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { DocumentDBClient } from '../../shared/clients/docdbClient'
+import { validateClusterName, validatePassword, validateUsername } from '../utils'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { Wizard } from '../../shared/wizards/wizard'
+import { createInputBox } from '../../shared/ui/inputPrompter'
+import { DataQuickPickItem, createQuickPick } from '../../shared/ui/pickerPrompter'
+import { createCommonButtons } from '../../shared/ui/buttons'
+import { Auth, CreateClusterInput } from '@aws-sdk/client-docdb-elastic'
+import { Prompter } from '../../shared/ui/prompter'
+
+const DocDBElasticHelpUrl = 'https://docs.aws.amazon.com/documentdb/latest/developerguide/elastic-how-it-works.html'
+const DefaultShardCount = 2
+const DefaultCapacity = 2
+
+export interface ElasticClusterConfiguration extends Partial<CreateClusterInput> {}
+
+/**
+ * A wizard to prompt configuration of a new cluster
+ */
+export class ElasticClusterWizard extends Wizard<ElasticClusterConfiguration> {
+    constructor(
+        readonly client: DocumentDBClient,
+        readonly title: string
+    ) {
+        super()
+        this.client = client
+        const form = this.form
+
+        form.clusterName.bindPrompter(() =>
+            createInputBox({
+                title: this.title,
+                prompt: localize('AWS.docdb.createCluster.name.prompt', 'Specify a unique cluster name'),
+                validateInput: validateClusterName,
+                buttons: createCommonButtons(DocDBElasticHelpUrl),
+            })
+        )
+
+        form.adminUserName.bindPrompter(() => createUsernamePrompter(this.title))
+        form.adminUserPassword.bindPrompter(() => createPasswordPrompter(this.title))
+        form.authType.setDefault(() => Auth.PLAIN_TEXT)
+        form.shardCount.bindPrompter(() => createShardCountPrompter(this.title), {
+            setDefault: () => DefaultShardCount,
+        })
+        form.shardInstanceCount.bindPrompter(
+            () =>
+                createQuickPick(instanceCountItems(2), {
+                    title: localize(
+                        'AWS.docdb.createCluster.dbInstanceCount.prompt',
+                        'The number of replica instances applying to all shards in the elastic cluster'
+                    ),
+                    buttons: createCommonButtons(DocDBElasticHelpUrl),
+                }),
+            { setDefault: () => 2 }
+        )
+        form.shardCapacity.bindPrompter(() => createShardCapacityPrompter(this.title), {
+            setDefault: () => DefaultCapacity,
+        })
+
+        return this
+    }
+}
+
+function createUsernamePrompter(title: string) {
+    return createInputBox({
+        title,
+        prompt: localize('AWS.docdb.createCluster.username.prompt', 'Specify a login username'),
+        validateInput: validateUsername,
+        buttons: createCommonButtons(DocDBElasticHelpUrl),
+    })
+}
+
+function createPasswordPrompter(title: string) {
+    return createInputBox({
+        title,
+        prompt: localize('AWS.docdb.createCluster.password.prompt', 'Specify a login password (8 characters minimum)'),
+        password: true,
+        validateInput: validatePassword,
+        buttons: createCommonButtons(DocDBElasticHelpUrl),
+    })
+}
+
+function createShardCountPrompter(title: string): Prompter<number> {
+    const maxShardCount = 32
+    const prompter = createInputBox({
+        title,
+        prompt: localize('AWS.docdb.createCluster.shardCount.prompt', 'Number of shards the Elastic Cluster will use'),
+        validateInput: (value) => {
+            const num = parseInt(value)
+            if (num < 1 || num > maxShardCount || isNaN(num)) {
+                return localize(
+                    'AWS.docdb.createCluster.shardCount.invalidValue',
+                    `Enter a numeric value between 1 and ${maxShardCount}`
+                )
+            }
+            return undefined
+        },
+        buttons: createCommonButtons(DocDBElasticHelpUrl),
+    })
+    return prompter.transform((value) => parseInt(value))
+}
+
+function createShardCapacityPrompter(title: string): Prompter<number> {
+    const items = [2, 4, 8, 16, 32, 64].map<DataQuickPickItem<number>>((data) => ({
+        data,
+        label: data.toString(),
+    }))
+    return createQuickPick(items, {
+        title,
+        placeholder: localize('AWS.docdb.createCluster.shardCapacity.placeholder', 'vCPU capacity of shard instances'),
+        buttons: createCommonButtons(DocDBElasticHelpUrl),
+    })
+}
+
+function instanceCountItems(defaultCount: number, max: number = 16): DataQuickPickItem<number>[] {
+    const items = []
+    for (let i = 1; i <= max; i++) {
+        const item: DataQuickPickItem<number> = {
+            label: i.toString(),
+            data: i,
+            description: i === defaultCount ? '(recommended)' : undefined,
+        }
+
+        items.push(item)
+    }
+
+    return items
+}
diff --git a/packages/core/src/docdb/wizards/regionalClusterWizard.ts b/packages/core/src/docdb/wizards/regionalClusterWizard.ts
new file mode 100644
index 00000000000..069c4f6d36a
--- /dev/null
+++ b/packages/core/src/docdb/wizards/regionalClusterWizard.ts
@@ -0,0 +1,206 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { CreateDBClusterCommandInput } from '@aws-sdk/client-docdb'
+import { DBStorageType, DocDBEngine, DocumentDBClient, MaxInstanceCount } from '../../shared/clients/docdbClient'
+import { isSupportedGlobalInstanceClass, validateClusterName, validatePassword, validateUsername } from '../utils'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { Wizard, WizardOptions } from '../../shared/wizards/wizard'
+import { createInputBox } from '../../shared/ui/inputPrompter'
+import { DataQuickPickItem, createQuickPick } from '../../shared/ui/pickerPrompter'
+import { createCommonButtons } from '../../shared/ui/buttons'
+import { SkipPrompter } from '../../shared/ui/common/skipPrompter'
+
+const DocDBClusterHelpUrl = 'https://docs.aws.amazon.com/documentdb/latest/developerguide/db-cluster-parameters.html'
+
+export interface RegionalClusterConfiguration extends CreateDBClusterCommandInput {
+    DBClusterIdentifier: string
+    // These options cannot be changed later
+    EngineVersion: string
+    MasterUsername: string
+    MasterUserPassword: string
+    StorageEncrypted: boolean
+    KmsKeyId?: string | undefined
+    DBSubnetGroupName?: string | undefined
+    VpcSecurityGroupIds?: string[] | undefined
+    // Instance fields
+    DBInstanceCount?: number | undefined
+    DBInstanceClass?: string | undefined
+}
+
+/**
+ * A wizard to prompt configuration of a new cluster
+ */
+export class RegionalClusterWizard extends Wizard<RegionalClusterConfiguration> {
+    constructor(
+        readonly client: DocumentDBClient,
+        readonly title: string,
+        readonly isPrimaryCluster: boolean = true,
+        options: WizardOptions<RegionalClusterConfiguration> = {}
+    ) {
+        super(options)
+        this.client = client
+    }
+
+    public override async init(): Promise<this> {
+        const form = this.form
+
+        form.DBClusterIdentifier.bindPrompter(
+            () =>
+                createInputBox({
+                    step: 1,
+                    title: this.title,
+                    prompt: localize('AWS.docdb.createCluster.name.prompt', 'Specify a unique cluster name'),
+                    validateInput: validateClusterName,
+                    buttons: createCommonButtons(DocDBClusterHelpUrl),
+                }),
+            { relativeOrder: 1 }
+        )
+
+        form.Engine.setDefault(() => DocDBEngine)
+        form.EngineVersion.bindPrompter(async () => await createEngineVersionPrompter(this.client), {
+            showWhen: () => this.isPrimaryCluster,
+            setDefault: () => this.options.initState?.EngineVersion,
+        })
+        form.MasterUsername.bindPrompter(() => createUsernamePrompter(this.title), {
+            showWhen: () => this.isPrimaryCluster,
+        })
+        form.MasterUserPassword.bindPrompter(() => createPasswordPrompter(this.title), {
+            showWhen: () => this.isPrimaryCluster,
+        })
+        form.StorageEncrypted.bindPrompter(() => createEncryptedStoragePrompter(), {
+            showWhen: () => this.isPrimaryCluster,
+        })
+
+        form.DBInstanceCount.bindPrompter(
+            () =>
+                createQuickPick(instanceCountItems(3), {
+                    title: localize('AWS.docdb.createCluster.dbInstanceCount.prompt', 'Number of instances'),
+                    buttons: createCommonButtons(DocDBClusterHelpUrl),
+                }),
+            {
+                setDefault: () => 3,
+            }
+        )
+
+        form.DBInstanceClass.bindPrompter(
+            async (state) =>
+                await createInstanceClassPrompter(this.client, state.EngineVersion!, this.isPrimaryCluster),
+            {
+                setDefault: () => 'db.t3.medium',
+                showWhen: (state) => state.DBInstanceCount! > 0,
+            }
+        )
+
+        return this
+    }
+}
+
+function createUsernamePrompter(title: string) {
+    return createInputBox({
+        step: 3,
+        title,
+        prompt: localize('AWS.docdb.createCluster.username.prompt', 'Specify a login username'),
+        validateInput: validateUsername,
+        buttons: createCommonButtons(DocDBClusterHelpUrl),
+    })
+}
+
+function createPasswordPrompter(title: string) {
+    return createInputBox({
+        step: 4,
+        title,
+        prompt: localize('AWS.docdb.createCluster.password.prompt', 'Specify a login password (8 characters minimum)'),
+        password: true,
+        validateInput: validatePassword,
+        buttons: createCommonButtons(DocDBClusterHelpUrl),
+    })
+}
+
+function createEncryptedStoragePrompter() {
+    return createQuickPick(
+        [
+            {
+                label: localize('AWS.docdb.createCluster.storage.encrypted', 'Encrypt'),
+                description: '(recommended)',
+                data: true,
+            },
+            {
+                label: localize('AWS.docdb.createCluster.storage.notEncrypted', "Don't encrypt"),
+                data: false,
+            },
+        ],
+        {
+            title: localize('AWS.docdb.createCluster.storageEncrypted.prompt', 'Specify storage encryption'),
+            buttons: createCommonButtons(DocDBClusterHelpUrl),
+        }
+    )
+}
+
+async function createEngineVersionPrompter(docdbClient: DocumentDBClient) {
+    const versions = await docdbClient.listEngineVersions()
+    // sort in descending order
+    versions.sort((a, b) => b.EngineVersion!.localeCompare(a.EngineVersion!))
+
+    const items: DataQuickPickItem<string>[] = versions.map((v) => {
+        return {
+            label: v.EngineVersion ?? '',
+            data: v.EngineVersion,
+        }
+    })
+
+    if (items.length === 0) {
+        items.push({ label: '5.0.0 (default)', data: '5.0.0' })
+    }
+
+    items[0].picked = true
+
+    return createQuickPick(items, {
+        title: localize('AWS.docdb.createCluster.engineVersion.prompt', 'Select engine version'),
+        buttons: createCommonButtons(DocDBClusterHelpUrl),
+    })
+}
+
+async function createInstanceClassPrompter(
+    docdbClient: DocumentDBClient,
+    engineVersion: string,
+    isPrimaryCluster: boolean
+) {
+    const options = await docdbClient.listInstanceClassOptions(engineVersion, DBStorageType.Standard)
+
+    const items: DataQuickPickItem<string>[] = options
+        .filter((option) => isPrimaryCluster || isSupportedGlobalInstanceClass(option.DBInstanceClass!))
+        .map((option) => ({
+            data: option.DBInstanceClass,
+            label: option.DBInstanceClass ?? '(unknown)',
+            description: undefined,
+            detail: undefined,
+        }))
+
+    if (items.length === 0) {
+        return new SkipPrompter<string>()
+    }
+
+    return createQuickPick(items, {
+        title: localize('AWS.docdb.createInstance.instanceClass.prompt', 'Select instance class'),
+        buttons: createCommonButtons(DocDBClusterHelpUrl),
+    })
+}
+
+// TODO: Make this it's own picker class
+function instanceCountItems(defaultCount: number, max: number = MaxInstanceCount): DataQuickPickItem<number>[] {
+    const items = []
+
+    for (let index = 1; index <= max; index++) {
+        const item: DataQuickPickItem<number> = {
+            label: index.toString(),
+            data: index,
+            description: index === defaultCount ? '(recommended)' : undefined,
+        }
+        items.push(item)
+    }
+
+    return items
+}
diff --git a/packages/core/src/dynamicResources/activation.ts b/packages/core/src/dynamicResources/activation.ts
new file mode 100644
index 00000000000..a40002ae128
--- /dev/null
+++ b/packages/core/src/dynamicResources/activation.ts
@@ -0,0 +1,131 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+import { ResourceCodeLensProvider } from '../shared/codelens/resourceCodeLensProvider'
+import { configureResources } from './commands/configure'
+import { copyIdentifier } from './commands/copyIdentifier'
+import { deleteResource } from './commands/deleteResource'
+import { getDiagnostics, openResource } from './commands/openResource'
+import { saveResource } from './commands/saveResource'
+import { ResourcesNode } from './explorer/nodes/resourcesNode'
+import { ResourceNode } from './explorer/nodes/resourceNode'
+import { ResourceTypeNode } from './explorer/nodes/resourceTypeNode'
+import { resourceFileGlobPattern } from './awsResourceManager'
+import { Commands } from '../shared/vscode/commands2'
+import globals from '../shared/extensionGlobals'
+import { openUrl } from '../shared/utilities/vsCodeUtils'
+
+const localize = nls.loadMessageBundle()
+
+/**
+ * Activates Resources components.
+ */
+export async function activate(context: vscode.ExtensionContext): Promise<void> {
+    const resourceDiagnostics = vscode.languages.createDiagnosticCollection(
+        localize('AWS.explorerNode.resources.label', 'Resources')
+    )
+    const resourceManager = globals.resourceManager
+
+    context.subscriptions.push(
+        vscode.workspace.registerTextDocumentContentProvider('awsResource', new VirtualDocumentProvider()),
+        Commands.register('aws.resources.openResourcePreview', async (node: ResourceNode) => {
+            await openResource({
+                source: node,
+                preview: true,
+                resourceManager,
+                diagnostics: resourceDiagnostics,
+            })
+        }),
+        Commands.register('aws.resources.copyIdentifier', async (node: ResourceNode) => {
+            await copyIdentifier(node.parent.typeName, node.identifier)
+        }),
+        Commands.register('aws.resources.configure', async (node: ResourcesNode) => {
+            if (await configureResources()) {
+                node.refresh()
+            }
+        }),
+        Commands.register('aws.resources.createResource', async (node: ResourceTypeNode) => {
+            await resourceManager.new(node)
+        }),
+        Commands.register('aws.resources.deleteResource', async (node: ResourceNode) => {
+            if (await deleteResource(node.parent.cloudControl, node.parent.typeName, node.identifier)) {
+                await resourceManager.close(resourceManager.toUri(node)!)
+                node.parent.clearChildren()
+                node.parent.refresh()
+            }
+        }),
+        Commands.register('aws.resources.updateResource', async (node: ResourceNode) => {
+            await openResource({
+                source: node,
+                preview: false,
+                resourceManager,
+                diagnostics: resourceDiagnostics,
+            })
+        }),
+        Commands.register('aws.resources.updateResourceInline', async (uri: vscode.Uri) => {
+            await openResource({
+                source: uri,
+                preview: false,
+                resourceManager,
+                diagnostics: resourceDiagnostics,
+            })
+        }),
+        vscode.workspace.onDidSaveTextDocument(async (doc: vscode.TextDocument) => {
+            return await saveResource(doc, resourceManager, resourceDiagnostics)
+        }),
+        Commands.register('aws.resources.saveResource', async (uri: vscode.Uri) => {
+            await vscode.window.showTextDocument(uri)
+            await vscode.commands.executeCommand('workbench.action.files.save')
+        }),
+        Commands.register('aws.resources.closeResource', async (uri: vscode.Uri) => {
+            if (resourceManager.fromUri(uri) instanceof ResourceNode) {
+                await openResource({
+                    source: uri,
+                    preview: true,
+                    resourceManager,
+                    diagnostics: resourceDiagnostics,
+                })
+                resourceDiagnostics.delete(uri)
+            } else {
+                await resourceManager.close(uri)
+            }
+        }),
+        Commands.register('aws.resources.viewDocs', async (node: ResourceTypeNode) => {
+            await openUrl(vscode.Uri.parse(node.metadata.documentation))
+        }),
+        vscode.workspace.onDidChangeTextDocument((textDocumentEvent) => {
+            if (resourceDiagnostics.has(textDocumentEvent.document.uri)) {
+                let diagnostics: vscode.Diagnostic[] = []
+                const resource = resourceManager.fromUri(textDocumentEvent.document.uri)
+                if (resource instanceof ResourceNode) {
+                    const schema = resourceManager.getSchema(resource.parent.typeName)
+                    if (schema) {
+                        diagnostics = getDiagnostics(schema, textDocumentEvent.document)
+                    }
+                }
+                resourceDiagnostics.set(textDocumentEvent.document.uri, diagnostics)
+            }
+        }),
+        vscode.workspace.onDidCloseTextDocument((closeDocumentEvent) => {
+            return resourceManager.close(closeDocumentEvent.uri, true)
+        }),
+        vscode.languages.registerCodeLensProvider(
+            {
+                language: 'json',
+                scheme: 'file',
+                pattern: resourceFileGlobPattern,
+            },
+            new ResourceCodeLensProvider(resourceManager)
+        )
+    )
+}
+
+export class VirtualDocumentProvider implements vscode.TextDocumentContentProvider {
+    provideTextDocumentContent(uri: vscode.Uri): string {
+        return uri.query
+    }
+}
diff --git a/src/dynamicResources/awsResourceManager.ts b/packages/core/src/dynamicResources/awsResourceManager.ts
similarity index 96%
rename from src/dynamicResources/awsResourceManager.ts
rename to packages/core/src/dynamicResources/awsResourceManager.ts
index bf30526e2b5..6dbcc64e1ec 100644
--- a/src/dynamicResources/awsResourceManager.ts
+++ b/packages/core/src/dynamicResources/awsResourceManager.ts
@@ -1,13 +1,12 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { writeFileSync } from 'fs'
-import { remove } from 'fs-extra'
+import { writeFileSync } from 'fs' // eslint-disable-line no-restricted-imports
 import * as path from 'path'
 import * as vscode from 'vscode'
-import { CloudFormationClient } from '../shared/clients/cloudFormationClient'
+import { CloudFormationClient } from '../shared/clients/cloudFormation'
 import {
     getNonexistentFilename,
     makeTemporaryToolkitFolder,
@@ -18,8 +17,8 @@ import { getLogger } from '../shared/logger/logger'
 import { getTabSizeSetting } from '../shared/utilities/editorUtilities'
 import { ResourceNode } from './explorer/nodes/resourceNode'
 import { ResourceTypeNode } from './explorer/nodes/resourceTypeNode'
-import { isCloud9 } from '../shared/extensionUtilities'
 import globals from '../shared/extensionGlobals'
+import { fs } from '../shared/fs/fs'
 
 export const resourceFileGlobPattern = '**/*.awsResource.json'
 
@@ -72,7 +71,7 @@ export class AwsResourceManager {
             }
 
             const doc = await vscode.workspace.openTextDocument(uri)
-            if (existing && !isCloud9()) {
+            if (existing) {
                 await this.close(existing)
             }
 
@@ -97,7 +96,7 @@ export class AwsResourceManager {
             }
 
             if (uri.scheme === 'file') {
-                remove(uri.fsPath)
+                await fs.delete(uri.fsPath)
 
                 globals.schemaService.registerMapping({
                     uri,
@@ -157,7 +156,7 @@ export class AwsResourceManager {
         await this.initialize()
 
         const normalizedTypeName = getNormalizedTypeName(typeName)
-        const filename = getNonexistentFilename(
+        const filename = await getNonexistentFilename(
             this.folder!,
             encodeURIComponent(identifier),
             `.${normalizedTypeName}.awsResource.json`
diff --git a/src/dynamicResources/commands/configure.ts b/packages/core/src/dynamicResources/commands/configure.ts
similarity index 93%
rename from src/dynamicResources/commands/configure.ts
rename to packages/core/src/dynamicResources/commands/configure.ts
index fa2c30bc03b..e2ce2a54517 100644
--- a/src/dynamicResources/commands/configure.ts
+++ b/packages/core/src/dynamicResources/commands/configure.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -40,7 +40,7 @@ export async function configureResources(settings = new ResourcesSettings()): Pr
     if (result) {
         await settings.update(
             'enabledResources',
-            result.map(res => res.label)
+            result.map((res) => res.label)
         )
         telemetry.dynamicresource_selectResources.emit()
         return true
diff --git a/packages/core/src/dynamicResources/commands/copyIdentifier.ts b/packages/core/src/dynamicResources/commands/copyIdentifier.ts
new file mode 100644
index 00000000000..11f1f684997
--- /dev/null
+++ b/packages/core/src/dynamicResources/commands/copyIdentifier.ts
@@ -0,0 +1,12 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { copyToClipboard } from '../../shared/utilities/messages'
+
+export async function copyIdentifier(typeName: string, identifier: string) {
+    await copyToClipboard(identifier, 'identifier')
+    telemetry.dynamicresource_copyIdentifier.emit({ resourceType: typeName })
+}
diff --git a/src/dynamicResources/commands/deleteResource.ts b/packages/core/src/dynamicResources/commands/deleteResource.ts
similarity index 80%
rename from src/dynamicResources/commands/deleteResource.ts
rename to packages/core/src/dynamicResources/commands/deleteResource.ts
index 454340ae214..8ed475aea61 100644
--- a/src/dynamicResources/commands/deleteResource.ts
+++ b/packages/core/src/dynamicResources/commands/deleteResource.ts
@@ -1,14 +1,13 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as vscode from 'vscode'
 import * as nls from 'vscode-nls'
-import { Window } from '../../shared/vscode/window'
 import { getLogger } from '../../shared/logger/logger'
 import { showConfirmationMessage, showViewLogsMessage } from '../../shared/utilities/messages'
-import { CloudControlClient } from '../../shared/clients/cloudControlClient'
+import { CloudControlClient } from '../../shared/clients/cloudControl'
 import globals from '../../shared/extensionGlobals'
 import { telemetry } from '../../shared/telemetry/telemetry'
 import { millisecondsSince, Result } from '../../shared/telemetry/telemetry'
@@ -17,29 +16,25 @@ const localize = nls.loadMessageBundle()
 export async function deleteResource(
     cloudControl: CloudControlClient,
     typeName: string,
-    identifier: string,
-    window = Window.vscode()
+    identifier: string
 ): Promise<boolean> {
     getLogger().info(`deleteResource called for type ${typeName} identifier ${identifier}`)
-    const ok = await showConfirmationMessage(
-        {
-            prompt: localize('aws.resources.deleteResource.prompt', 'Delete resource {0} ({1})?', identifier, typeName),
-            confirm: localize('AWS.generic.delete', 'Delete'),
-            cancel: localize('AWS.generic.cancel', 'Cancel'),
-        },
-        window
-    )
+    const ok = await showConfirmationMessage({
+        prompt: localize('aws.resources.deleteResource.prompt', 'Delete resource {0} ({1})?', identifier, typeName),
+        confirm: localize('AWS.generic.delete', 'Delete'),
+        cancel: localize('AWS.generic.cancel', 'Cancel'),
+    })
     if (!ok) {
         getLogger().info(`Cancelled delete resource type ${typeName} identifier ${identifier}`)
         return false
     }
 
-    return await window.withProgress(
+    return await vscode.window.withProgress(
         {
             location: vscode.ProgressLocation.Notification,
             cancellable: false,
         },
-        async progress => {
+        async (progress) => {
             let result: Result = 'Succeeded'
             const startTime = new globals.clock.Date()
 
@@ -55,7 +50,7 @@ export async function deleteResource(
 
                 getLogger().info(`Deleted resource type ${typeName} identifier ${identifier}`)
 
-                window.showInformationMessage(
+                void vscode.window.showInformationMessage(
                     localize('aws.resources.deleteResource.success', 'Deleted resource {0} ({1})', identifier, typeName)
                 )
                 return true
@@ -66,7 +61,7 @@ export async function deleteResource(
                     getLogger().warn(
                         `Resource type ${typeName} does not support DELETE action in ${cloudControl.regionCode}`
                     )
-                    window.showWarningMessage(
+                    void vscode.window.showWarningMessage(
                         localize(
                             'aws.resources.deleteResource.unsupported',
                             'Resource type {0} does not currently support delete in {1}',
@@ -78,14 +73,13 @@ export async function deleteResource(
                 }
                 result = 'Failed'
                 getLogger().error(`Failed to delete resource type ${typeName} identifier ${identifier}: %s`, e)
-                showViewLogsMessage(
+                void showViewLogsMessage(
                     localize(
                         'aws.resources.deleteResource.failure',
                         'Failed to delete resource {0} ({1})',
                         identifier,
                         typeName
-                    ),
-                    window
+                    )
                 )
                 return false
             } finally {
diff --git a/src/dynamicResources/commands/openResource.ts b/packages/core/src/dynamicResources/commands/openResource.ts
similarity index 89%
rename from src/dynamicResources/commands/openResource.ts
rename to packages/core/src/dynamicResources/commands/openResource.ts
index 9d958fc3335..8b4cb24ca76 100644
--- a/src/dynamicResources/commands/openResource.ts
+++ b/packages/core/src/dynamicResources/commands/openResource.ts
@@ -1,11 +1,10 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as vscode from 'vscode'
 import * as nls from 'vscode-nls'
-import { Window } from '../../shared/vscode/window'
 import { getLogger } from '../../shared/logger/logger'
 import { Result } from '../../shared/telemetry/telemetry'
 import { ResourceNode } from '../explorer/nodes/resourceNode'
@@ -13,27 +12,24 @@ import { AwsResourceManager, TypeSchema } from '../awsResourceManager'
 import { telemetry } from '../../shared/telemetry/telemetry'
 const localize = nls.loadMessageBundle()
 
-export async function openResource(
-    opts: {
-        source: ResourceNode | vscode.Uri
-        preview: boolean
-        resourceManager: AwsResourceManager
-        diagnostics: vscode.DiagnosticCollection
-    },
-    window = Window.vscode()
-): Promise<void> {
+export async function openResource(opts: {
+    source: ResourceNode | vscode.Uri
+    preview: boolean
+    resourceManager: AwsResourceManager
+    diagnostics: vscode.DiagnosticCollection
+}): Promise<void> {
     const resource = opts.source instanceof vscode.Uri ? opts.resourceManager.fromUri(opts.source) : opts.source
     if (!resource || !(resource instanceof ResourceNode)) {
         throw new Error('could not resolve resource')
     }
     getLogger().info(`openResource called for type ${resource.parent.typeName} identifier ${resource.identifier}`)
 
-    return await window.withProgress(
+    return await vscode.window.withProgress(
         {
             location: vscode.ProgressLocation.Notification,
             cancellable: false,
         },
-        async progress => {
+        async (progress) => {
             let result: Result = 'Succeeded'
 
             progress.report({
@@ -43,7 +39,7 @@ export async function openResource(
             try {
                 const editor = await opts.resourceManager.open(resource, opts.preview)
                 if (!opts.preview) {
-                    vscode.window.showWarningMessage(
+                    void vscode.window.showWarningMessage(
                         localize(
                             'aws.resources.editResource.notice',
                             'You are editing an AWS resource. Any saved changes will be reflected on the remote resource.'
@@ -64,7 +60,7 @@ export async function openResource(
                     resource.parent.typeName
                 )
 
-                window.showErrorMessage(errorMessage)
+                void vscode.window.showErrorMessage(errorMessage)
                 getLogger().error('Error opening resource: %s', error)
                 result = 'Failed'
             } finally {
diff --git a/src/dynamicResources/commands/saveResource.ts b/packages/core/src/dynamicResources/commands/saveResource.ts
similarity index 88%
rename from src/dynamicResources/commands/saveResource.ts
rename to packages/core/src/dynamicResources/commands/saveResource.ts
index 154df09261f..be395bc7f48 100644
--- a/src/dynamicResources/commands/saveResource.ts
+++ b/packages/core/src/dynamicResources/commands/saveResource.ts
@@ -1,11 +1,10 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as vscode from 'vscode'
 import * as nls from 'vscode-nls'
-import { Window } from '../../shared/vscode/window'
 import { getLogger } from '../../shared/logger/logger'
 import { showViewLogsMessage } from '../../shared/utilities/messages'
 import { millisecondsSince, Result } from '../../shared/telemetry/telemetry'
@@ -13,8 +12,8 @@ import { compare, Operation } from 'fast-json-patch'
 import { ResourceNode } from '../explorer/nodes/resourceNode'
 import { ResourceTypeNode } from '../explorer/nodes/resourceTypeNode'
 import { AwsResourceManager } from '../awsResourceManager'
-import { CloudControlClient } from '../../shared/clients/cloudControlClient'
-import { CloudControl } from 'aws-sdk'
+import { CloudControlClient } from '../../shared/clients/cloudControl'
+import { ResourceDescription } from '@aws-sdk/client-cloudcontrol'
 import globals from '../../shared/extensionGlobals'
 import { telemetry } from '../../shared/telemetry/telemetry'
 
@@ -35,7 +34,7 @@ export async function saveResource(
                     resource.clearChildren()
                     await vscode.commands.executeCommand('aws.refreshAwsExplorerNode', resource)
                     const resourceNodes = (await resource.getChildren()) as ResourceNode[]
-                    const newNode = resourceNodes.find(node => node.identifier === identifier)
+                    const newNode = resourceNodes.find((node) => node.identifier === identifier)
                     if (newNode) {
                         await resourceManager.open(newNode, true)
                     }
@@ -71,15 +70,14 @@ export async function saveResource(
 export async function createResource(
     typeName: string,
     definition: string,
-    cloudControl: CloudControlClient,
-    window = Window.vscode()
+    cloudControl: CloudControlClient
 ): Promise<string | undefined> {
-    return await window.withProgress(
+    return await vscode.window.withProgress(
         {
             location: vscode.ProgressLocation.Notification,
             cancellable: false,
         },
-        async progress => {
+        async (progress) => {
             const startTime = new globals.clock.Date()
             let result: Result = 'Succeeded'
 
@@ -93,7 +91,7 @@ export async function createResource(
                 })
                 const identifier = result.ProgressEvent!.Identifier!
                 getLogger().info(`Created resource type ${typeName} identifier ${identifier}`)
-                window.showInformationMessage(
+                void vscode.window.showInformationMessage(
                     localize('aws.resources.createResource.success', 'Created resource {0} ({1})', identifier, typeName)
                 )
                 return identifier
@@ -104,7 +102,7 @@ export async function createResource(
                     getLogger().warn(
                         `Resource type ${typeName} does not support CREATE action in ${cloudControl.regionCode}`
                     )
-                    window.showWarningMessage(
+                    void vscode.window.showWarningMessage(
                         localize(
                             'aws.resources.createResource.unsupported',
                             '{0} does not currently support resource creation in {1}',
@@ -115,9 +113,8 @@ export async function createResource(
                 } else {
                     result = 'Failed'
                     getLogger().error(`Failed to create resource type ${typeName}: %O`, error.message)
-                    showViewLogsMessage(
-                        localize('aws.resources.createResource.failure', 'Failed to create resource ({0})', typeName),
-                        window
+                    void showViewLogsMessage(
+                        localize('aws.resources.createResource.failure', 'Failed to create resource ({0})', typeName)
                     )
                     throw e
                 }
@@ -138,15 +135,14 @@ export async function updateResource(
     identifier: string,
     definition: string,
     cloudControl: CloudControlClient,
-    window = Window.vscode(),
     diff?: Operation[]
 ): Promise<boolean> {
-    return await window.withProgress(
+    return await vscode.window.withProgress(
         {
             location: vscode.ProgressLocation.Notification,
             cancellable: false,
         },
-        async progress => {
+        async (progress) => {
             const startTime = new globals.clock.Date()
             let result: Result = 'Succeeded'
             try {
@@ -162,7 +158,7 @@ export async function updateResource(
 
                 if (patch.length === 0) {
                     result = 'Cancelled'
-                    window.showWarningMessage(
+                    void vscode.window.showWarningMessage(
                         localize(
                             'aws.resources.updateResource.noDiff',
                             'Update cancelled - no diff between local and remote definitions',
@@ -180,7 +176,7 @@ export async function updateResource(
                 })
                 getLogger().info(`Updated resource type ${typeName} identifier ${identifier}`)
 
-                window.showInformationMessage(
+                void vscode.window.showInformationMessage(
                     localize('aws.resources.updateResource.success', 'Updated resource {0} ({1})', identifier, typeName)
                 )
                 return true
@@ -191,7 +187,7 @@ export async function updateResource(
                     getLogger().warn(
                         `Resource type ${typeName} does not support UPDATE action in ${cloudControl.regionCode}`
                     )
-                    window.showWarningMessage(
+                    void vscode.window.showWarningMessage(
                         localize(
                             'aws.resources.createResource.unsupported',
                             '{0} does not currently support resource updating in {1}',
@@ -206,14 +202,13 @@ export async function updateResource(
                         `Failed to update resource type ${typeName} identifier ${identifier}: %O`,
                         error.message
                     )
-                    showViewLogsMessage(
+                    void showViewLogsMessage(
                         localize(
                             'aws.resources.updateResource.failure',
                             'Failed to update resource {0} ({1})',
                             identifier,
                             typeName
-                        ),
-                        window
+                        )
                     )
                     throw e
                 }
@@ -229,7 +224,7 @@ export async function updateResource(
     )
 }
 
-function computeDiff(currentDefinition: CloudControl.ResourceDescription, updatedDefinition: string): Operation[] {
+function computeDiff(currentDefinition: ResourceDescription, updatedDefinition: string): Operation[] {
     const current = JSON.parse(currentDefinition.Properties!)
     const updated = JSON.parse(updatedDefinition)
     return compare(current, updated)
@@ -239,5 +234,5 @@ export function updateDiagnostics(err: Error, doc: vscode.TextDocument, diagnost
     const range = new vscode.Range(doc.positionAt(0), doc.positionAt(doc.getText().length))
     const diag = new vscode.Diagnostic(range, err.message)
     diagnostics.set(doc.uri, [diag])
-    vscode.commands.executeCommand('workbench.actions.view.problems')
+    void vscode.commands.executeCommand('workbench.actions.view.problems')
 }
diff --git a/packages/core/src/dynamicResources/explorer/nodes/resourceNode.ts b/packages/core/src/dynamicResources/explorer/nodes/resourceNode.ts
new file mode 100644
index 00000000000..28e655abc9b
--- /dev/null
+++ b/packages/core/src/dynamicResources/explorer/nodes/resourceNode.ts
@@ -0,0 +1,35 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { ResourceTypeNode } from './resourceTypeNode'
+import { parse, validate } from '@aws-sdk/util-arn-parser'
+
+const localize = nls.loadMessageBundle()
+
+export class ResourceNode extends AWSTreeNodeBase {
+    public constructor(
+        public readonly parent: ResourceTypeNode,
+        public readonly identifier: string,
+        public override contextValue?: string
+    ) {
+        super('')
+        this.contextValue = contextValue ?? 'ResourceNode'
+        const friendlyName = this.getFriendlyName(identifier)
+        this.label = friendlyName
+        this.tooltip = identifier
+        this.command = {
+            title: localize('AWS.generic.preview', 'Preview'),
+            command: 'aws.resources.openResourcePreview',
+            arguments: [this],
+        }
+    }
+
+    private getFriendlyName(identifier: string): string {
+        return validate(identifier) ? parse(identifier).resource : identifier
+    }
+}
diff --git a/src/dynamicResources/explorer/nodes/resourceTypeNode.ts b/packages/core/src/dynamicResources/explorer/nodes/resourceTypeNode.ts
similarity index 84%
rename from src/dynamicResources/explorer/nodes/resourceTypeNode.ts
rename to packages/core/src/dynamicResources/explorer/nodes/resourceTypeNode.ts
index 1b450060b4f..afc21ff5d16 100644
--- a/src/dynamicResources/explorer/nodes/resourceTypeNode.ts
+++ b/packages/core/src/dynamicResources/explorer/nodes/resourceTypeNode.ts
@@ -1,12 +1,12 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as vscode from 'vscode'
 import { ChildNodeLoader, ChildNodePage } from '../../../awsexplorer/childNodeLoader'
-import { CloudControlClient } from '../../../shared/clients/cloudControlClient'
-import { getLogger } from '../../../shared/logger'
+import { CloudControlClient } from '../../../shared/clients/cloudControl'
+import { getLogger } from '../../../shared/logger/logger'
 import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
 import { LoadMoreNode } from '../../../shared/treeview/nodes/loadMoreNode'
 import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
@@ -15,9 +15,9 @@ import { localize } from '../../../shared/utilities/vsCodeUtils'
 import { ResourcesNode } from './resourcesNode'
 import { ResourceNode } from './resourceNode'
 import { Result } from '../../../shared/telemetry/telemetry'
-import { CloudControl } from 'aws-sdk'
+import { ResourceDescription } from '@aws-sdk/client-cloudcontrol'
 import { ResourceTypeMetadata } from '../../model/resources'
-import { DefaultS3Client } from '../../../shared/clients/s3Client'
+import { S3Client } from '../../../shared/clients/s3'
 import { telemetry } from '../../../shared/telemetry/telemetry'
 
 export const contextValueResourceOperations: any = {
@@ -30,7 +30,7 @@ export const contextValueResource = 'ResourceNode'
 const unavailableResource = localize('AWS.explorerNode.resources.unavailable', 'Unavailable in region')
 
 export class ResourceTypeNode extends AWSTreeNodeBase implements LoadMoreNode {
-    private readonly childLoader: ChildNodeLoader = new ChildNodeLoader(this, token => this.loadPage(token))
+    private readonly childLoader: ChildNodeLoader = new ChildNodeLoader(this, (token) => this.loadPage(token))
     private readonly childContextValue: string
 
     public constructor(
@@ -45,7 +45,7 @@ export class ResourceTypeNode extends AWSTreeNodeBase implements LoadMoreNode {
         )
         this.tooltip = typeName
         const supportedOperations = metadata.operations
-            ? metadata.operations.map(op => contextValueResourceOperations[op])
+            ? metadata.operations.map((op) => contextValueResourceOperations[op])
             : Object.values(contextValueResourceOperations)
 
         if (!metadata.available) {
@@ -113,9 +113,9 @@ export class ResourceTypeNode extends AWSTreeNodeBase implements LoadMoreNode {
 
         // S3::Bucket's resource handler LIST is not regionalized at this time
         if (this.typeName === 'AWS::S3::Bucket') {
-            const s3 = new DefaultS3Client(this.parent.region)
+            const s3 = new S3Client(this.parent.region)
             const buckets = await s3.listBuckets()
-            newResources = buckets.buckets.map(bucket => new ResourceNode(this, bucket.name, this.childContextValue))
+            newResources = buckets.buckets.map((bucket) => new ResourceNode(this, bucket.Name, this.childContextValue))
         } else {
             const response = await this.cloudControl.listResources({
                 TypeName: this.typeName,
@@ -123,15 +123,12 @@ export class ResourceTypeNode extends AWSTreeNodeBase implements LoadMoreNode {
             })
 
             newResources = response.ResourceDescriptions
-                ? response.ResourceDescriptions.reduce(
-                      (accumulator: ResourceNode[], current: CloudControl.ResourceDescription) => {
-                          if (current.Identifier) {
-                              accumulator.push(new ResourceNode(this, current.Identifier, this.childContextValue))
-                          }
-                          return accumulator
-                      },
-                      []
-                  )
+                ? response.ResourceDescriptions.reduce((accumulator: ResourceNode[], current: ResourceDescription) => {
+                      if (current.Identifier) {
+                          accumulator.push(new ResourceNode(this, current.Identifier, this.childContextValue))
+                      }
+                      return accumulator
+                  }, [])
                 : []
             nextToken = response.NextToken
         }
diff --git a/src/dynamicResources/explorer/nodes/resourcesNode.ts b/packages/core/src/dynamicResources/explorer/nodes/resourcesNode.ts
similarity index 80%
rename from src/dynamicResources/explorer/nodes/resourcesNode.ts
rename to packages/core/src/dynamicResources/explorer/nodes/resourcesNode.ts
index 95829f4b5c1..65cc8c09d3b 100644
--- a/src/dynamicResources/explorer/nodes/resourcesNode.ts
+++ b/packages/core/src/dynamicResources/explorer/nodes/resourcesNode.ts
@@ -1,21 +1,20 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as vscode from 'vscode'
 import * as nls from 'vscode-nls'
-import { CloudFormationClient, DefaultCloudFormationClient } from '../../../shared/clients/cloudFormationClient'
+import { CloudFormationClient } from '../../../shared/clients/cloudFormation'
 import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
 import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
 import { makeChildrenNodes } from '../../../shared/treeview/utils'
 import { toArrayAsync, updateInPlace } from '../../../shared/utilities/collectionUtils'
 import { ResourceTypeNode } from './resourceTypeNode'
-import { CloudFormation } from 'aws-sdk'
-import { CloudControlClient, DefaultCloudControlClient } from '../../../shared/clients/cloudControlClient'
+import { CloudControlClient } from '../../../shared/clients/cloudControl'
 import { memoizedGetResourceTypes, ResourceTypeMetadata } from '../../model/resources'
-import { isCloud9 } from '../../../shared/extensionUtilities'
 import { ResourcesSettings } from '../../commands/configure'
+import { TypeSummary } from '@aws-sdk/client-cloudformation'
 
 const localize = nls.loadMessageBundle()
 
@@ -24,8 +23,8 @@ export class ResourcesNode extends AWSTreeNodeBase {
 
     public constructor(
         public readonly region: string,
-        public readonly cloudFormation: CloudFormationClient = new DefaultCloudFormationClient(region),
-        private readonly cloudControl: CloudControlClient = new DefaultCloudControlClient(region),
+        public readonly cloudFormation: CloudFormationClient = new CloudFormationClient(region),
+        private readonly cloudControl: CloudControlClient = new CloudControlClient(region),
         private readonly settings = new ResourcesSettings()
     ) {
         super(localize('AWS.explorerNode.resources.label', 'Resources'), vscode.TreeItemCollapsibleState.Collapsed)
@@ -57,14 +56,13 @@ export class ResourcesNode extends AWSTreeNodeBase {
 
     public async updateChildren(): Promise<void> {
         const resourceTypes = memoizedGetResourceTypes()
-        const defaultResources = isCloud9() ? Array.from(resourceTypes.keys()) : []
-        const enabledResources = this.settings.get('enabledResources', defaultResources)
+        const enabledResources = this.settings.get('enabledResources', [])
 
         // Use the most recently update type definition per-type
         const types = await toArrayAsync(this.cloudFormation.listTypes())
         types.sort((a, b) => (a.LastUpdated?.getTime() ?? 0) - (b.LastUpdated?.getTime() ?? 0))
 
-        const availableTypes: Map<string, CloudFormation.TypeSummary> = new Map()
+        const availableTypes: Map<string, TypeSummary> = new Map()
         for (const type of types) {
             if (type.TypeName) {
                 availableTypes.set(type.TypeName!, type)
@@ -74,8 +72,8 @@ export class ResourcesNode extends AWSTreeNodeBase {
         updateInPlace(
             this.resourceTypeNodes,
             enabledResources,
-            key => this.resourceTypeNodes.get(key)!.clearChildren(),
-            key => {
+            (key) => this.resourceTypeNodes.get(key)!.clearChildren(),
+            (key) => {
                 const metadata = resourceTypes.get(key) ?? ({} as ResourceTypeMetadata)
                 metadata.available = availableTypes.has(key)
                 return new ResourceTypeNode(this, key, this.cloudControl, metadata)
diff --git a/src/dynamicResources/model/resources.ts b/packages/core/src/dynamicResources/model/resources.ts
similarity index 93%
rename from src/dynamicResources/model/resources.ts
rename to packages/core/src/dynamicResources/model/resources.ts
index c4ea844509a..fcf92a3255e 100644
--- a/src/dynamicResources/model/resources.ts
+++ b/packages/core/src/dynamicResources/model/resources.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/src/dynamicResources/model/supported_resources.json b/packages/core/src/dynamicResources/model/supported_resources.json
similarity index 100%
rename from src/dynamicResources/model/supported_resources.json
rename to packages/core/src/dynamicResources/model/supported_resources.json
diff --git a/packages/core/src/eventSchemas/activation.ts b/packages/core/src/eventSchemas/activation.ts
new file mode 100644
index 00000000000..5e68b7df069
--- /dev/null
+++ b/packages/core/src/eventSchemas/activation.ts
@@ -0,0 +1,38 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { downloadSchemaItemCode } from '../eventSchemas/commands/downloadSchemaItemCode'
+import { createSearchSchemasWebView } from './vue/searchSchemas'
+import { viewSchemaItem } from '../eventSchemas/commands/viewSchemaItem'
+import { RegistryItemNode } from '../eventSchemas/explorer/registryItemNode'
+import { SchemaItemNode } from '../eventSchemas/explorer/schemaItemNode'
+import { SchemasNode } from '../eventSchemas/explorer/schemasNode'
+import { ExtContext } from '../shared/extensions'
+import { Commands } from '../shared/vscode/commands2'
+
+/**
+ * Activate Schemas functionality for the extension.
+ */
+export async function activate(context: ExtContext): Promise<void> {
+    await registerSchemasCommands(context)
+}
+
+async function registerSchemasCommands(context: ExtContext): Promise<void> {
+    context.extensionContext.subscriptions.push(
+        Commands.register('aws.viewSchemaItem', async (node: SchemaItemNode) => await viewSchemaItem(node)),
+        Commands.register(
+            'aws.downloadSchemaItemCode',
+            async (node: SchemaItemNode) => await downloadSchemaItemCode(node, context.outputChannel)
+        ),
+        Commands.register(
+            'aws.searchSchema',
+            async (node: SchemasNode) => await createSearchSchemasWebView(context, node)
+        ),
+        Commands.register(
+            'aws.searchSchemaPerRegistry',
+            async (node: RegistryItemNode) => await createSearchSchemasWebView(context, node)
+        )
+    )
+}
diff --git a/src/eventSchemas/commands/downloadSchemaItemCode.ts b/packages/core/src/eventSchemas/commands/downloadSchemaItemCode.ts
similarity index 91%
rename from src/eventSchemas/commands/downloadSchemaItemCode.ts
rename to packages/core/src/eventSchemas/commands/downloadSchemaItemCode.ts
index 95d780104c8..0abc1e340e2 100644
--- a/src/eventSchemas/commands/downloadSchemaItemCode.ts
+++ b/packages/core/src/eventSchemas/commands/downloadSchemaItemCode.ts
@@ -1,18 +1,18 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as nls from 'vscode-nls'
 const localize = nls.loadMessageBundle()
-import { Schemas } from 'aws-sdk'
+import { PutCodeBindingResponse } from '@aws-sdk/client-schemas'
 import fs = require('fs')
 import path = require('path')
 import * as vscode from 'vscode'
 import { SchemaClient } from '../../shared/clients/schemaClient'
 import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../../shared/filesystemUtilities'
 import * as localizedText from '../../shared/localizedText'
-import { getLogger, Logger } from '../../shared/logger'
+import { getLogger, Logger } from '../../shared/logger/logger'
 import { Result } from '../../shared/telemetry/telemetry'
 import { SchemaItemNode } from '../explorer/schemaItemNode'
 import { getLanguageDetails } from '../models/schemaCodeLangs'
@@ -23,7 +23,7 @@ import {
     SchemaCodeDownloadWizardResponse,
 } from '../wizards/schemaCodeDownloadWizard'
 
-import * as admZip from 'adm-zip'
+import admZip from 'adm-zip'
 import globals from '../../shared/extensionGlobals'
 import { telemetry } from '../../shared/telemetry/telemetry'
 
@@ -48,7 +48,7 @@ export async function downloadSchemaItemCode(node: SchemaItemNode, outputChannel
             return
         }
 
-        vscode.window.showInformationMessage(
+        void vscode.window.showInformationMessage(
             localize(
                 'AWS.message.info.schemas.downloadCodeBindings.start',
                 'Downloading code for schema {0}...',
@@ -67,7 +67,7 @@ export async function downloadSchemaItemCode(node: SchemaItemNode, outputChannel
         }
         const schemaCodeDownloader = createSchemaCodeDownloaderObject(node.client, outputChannel)
         const coreCodeFilePath = await schemaCodeDownloader.downloadCode(request)
-        vscode.window.showInformationMessage(
+        void vscode.window.showInformationMessage(
             localize(
                 'AWS.message.info.schemas.downloadCodeBindings.finished',
                 'Downloaded code for schema {0}!',
@@ -89,7 +89,7 @@ export async function downloadSchemaItemCode(node: SchemaItemNode, outputChannel
         if (error instanceof UserNotifiedError && error.message) {
             errorMessage = error.message
         }
-        vscode.window.showErrorMessage(errorMessage)
+        void vscode.window.showErrorMessage(errorMessage)
         logger.error('Error downloading schema: %s', error)
     } finally {
         telemetry.schemas_download.emit({ result: downloadResult })
@@ -138,9 +138,9 @@ export class SchemaCodeDownloader {
             zipContents = await this.downloader.download(request)
         } catch (err) {
             const error = err as Error
-            if (error.name == 'ResourceNotFound') {
-                //If the code generation wasn't previously kicked off, do so
-                vscode.window.showInformationMessage(
+            if (error.name === 'ResourceNotFound') {
+                // If the code generation wasn't previously kicked off, do so
+                void vscode.window.showInformationMessage(
                     localize(
                         'AWS.message.info.schemas.downloadCodeBindings.generate',
                         '{0}: Generating code (this may take a few seconds the first time)...',
@@ -149,11 +149,11 @@ export class SchemaCodeDownloader {
                 )
                 await this.generator.generate(request)
 
-                //Then, poll for completion
+                // Then, poll for completion
                 await this.poller.pollForCompletion(request)
 
-                //Download generated code bindings
-                vscode.window.showInformationMessage(
+                // Download generated code bindings
+                void vscode.window.showInformationMessage(
                     localize(
                         'AWS.message.info.schemas.downloadCodeBindings.downloading',
                         '{0}: Downloading code...',
@@ -165,7 +165,7 @@ export class SchemaCodeDownloader {
                 throw err // Unexpected exception, throw
             }
         }
-        vscode.window.showInformationMessage(
+        void vscode.window.showInformationMessage(
             localize(
                 'AWS.message.info.schemas.downloadCodeBindings.extracting',
                 '{0}: Extracting/copying code...',
@@ -180,10 +180,8 @@ export class SchemaCodeDownloader {
 export class CodeGenerator {
     public constructor(public client: SchemaClient) {}
 
-    public async generate(
-        codeDownloadRequest: SchemaCodeDownloadRequestDetails
-    ): Promise<Schemas.PutCodeBindingResponse> {
-        let response: Schemas.PutCodeBindingResponse
+    public async generate(codeDownloadRequest: SchemaCodeDownloadRequestDetails): Promise<PutCodeBindingResponse> {
+        let response: PutCodeBindingResponse
         try {
             response = await this.client.putCodeBinding(
                 codeDownloadRequest.language,
@@ -236,7 +234,7 @@ export class CodeGenerationStatusPoller {
                 )
             }
 
-            await new Promise<void>(resolve => globals.clock.setTimeout(resolve, retryInterval))
+            await new Promise<void>((resolve) => globals.clock.setTimeout(resolve, retryInterval))
         }
         throw new UserNotifiedError(
             localize(
@@ -274,7 +272,7 @@ export class CodeDownloader {
 
             return zipContents
         } else {
-            throw new Error('Response body should be Buffer type')
+            throw new TypeError('Response body should be Buffer type')
         }
     }
 }
@@ -294,7 +292,7 @@ export class CodeExtractor {
             const codeZipFile = path.join(codeZipDir, fileName)
             const destinationDirectory = request.destinationDirectory.fsPath
 
-            //write binary data into a temp zip file in a temp directory
+            // write binary data into a temp zip file in a temp directory
             const zipContentsBinary = new Uint8Array(zipContents)
             const fd = fs.openSync(codeZipFile, 'w')
             fs.writeSync(fd, zipContentsBinary, 0, zipContentsBinary.byteLength, 0)
@@ -318,7 +316,7 @@ export class CodeExtractor {
 
             return undefined
         } finally {
-            tryRemoveFolder(codeZipDir)
+            await tryRemoveFolder(codeZipDir)
         }
     }
 
@@ -328,7 +326,7 @@ export class CodeExtractor {
         const zipEntries = zip.getEntries()
         const detectedCollisions: string[] = []
 
-        zipEntries.forEach(function (zipEntry) {
+        for (const zipEntry of zipEntries) {
             if (zipEntry.isDirectory) {
                 // Ignore directories because those can/will merged
             } else {
@@ -337,7 +335,7 @@ export class CodeExtractor {
                     detectedCollisions.push(intendedDestinationPath)
                 }
             }
-        })
+        }
 
         if (detectedCollisions.length > 0) {
             this.writeToOutputChannel(detectedCollisions)
diff --git a/src/eventSchemas/commands/viewSchemaItem.ts b/packages/core/src/eventSchemas/commands/viewSchemaItem.ts
similarity index 85%
rename from src/eventSchemas/commands/viewSchemaItem.ts
rename to packages/core/src/eventSchemas/commands/viewSchemaItem.ts
index c9c66c137a9..cc40911ea98 100644
--- a/src/eventSchemas/commands/viewSchemaItem.ts
+++ b/packages/core/src/eventSchemas/commands/viewSchemaItem.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -7,7 +7,7 @@ import * as nls from 'vscode-nls'
 const localize = nls.loadMessageBundle()
 
 import * as vscode from 'vscode'
-import { getLogger, Logger } from '../../shared/logger'
+import { getLogger, Logger } from '../../shared/logger/logger'
 import { Result } from '../../shared/telemetry/telemetry'
 import { getTabSizeSetting } from '../../shared/utilities/editorUtilities'
 import { SchemaItemNode } from '../explorer/schemaItemNode'
@@ -23,7 +23,7 @@ export async function viewSchemaItem(node: SchemaItemNode) {
     } catch (err) {
         viewResult = 'Failed'
         const error = err as Error
-        vscode.window.showErrorMessage(
+        void vscode.window.showErrorMessage(
             localize(
                 'AWS.message.error.schemas.viewSchema.could_not_open',
                 'Could not fetch and display schema {0} contents',
@@ -51,5 +51,5 @@ export async function showSchemaContent(
         language: 'json',
     })
     const editor = await vscode.window.showTextDocument(newDoc, vscode.ViewColumn.One, false)
-    await editor.edit(edit => edit.insert(new vscode.Position(/*line*/ 0, /*character*/ 0), prettySchemaContent))
+    await editor.edit((edit) => edit.insert(new vscode.Position(/* line*/ 0, /* character*/ 0), prettySchemaContent))
 }
diff --git a/packages/core/src/eventSchemas/explorer/registryItemNode.ts b/packages/core/src/eventSchemas/explorer/registryItemNode.ts
new file mode 100644
index 00000000000..8141259b955
--- /dev/null
+++ b/packages/core/src/eventSchemas/explorer/registryItemNode.ts
@@ -0,0 +1,79 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import { RegistrySummary } from '@aws-sdk/client-schemas'
+import * as os from 'os'
+import * as vscode from 'vscode'
+
+import { listSchemaItems } from '../utils'
+
+import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
+import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
+import { makeChildrenNodes } from '../../shared/treeview/utils'
+import { toMapAsync, updateInPlace } from '../../shared/utilities/collectionUtils'
+import { SchemaItemNode } from './schemaItemNode'
+import { getIcon } from '../../shared/icons'
+import { SchemaClient } from '../../shared/clients/schemaClient'
+
+export class RegistryItemNode extends AWSTreeNodeBase {
+    private readonly schemaNodes: Map<string, SchemaItemNode>
+    public override readonly regionCode: string = this.client.regionCode
+
+    public constructor(
+        private registryItemOutput: RegistrySummary,
+        private readonly client: SchemaClient
+    ) {
+        super('', vscode.TreeItemCollapsibleState.Collapsed)
+
+        this.update(registryItemOutput)
+        this.contextValue = 'awsRegistryItemNode'
+        this.schemaNodes = new Map<string, SchemaItemNode>()
+        this.iconPath = getIcon('aws-schemas-registry')
+    }
+
+    public get registryName(): string {
+        return (
+            this.registryItemOutput.RegistryName ||
+            localize('AWS.explorerNode.registry.registryName.Not.Found', 'Registry name not found')
+        )
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        return await makeChildrenNodes({
+            getChildNodes: async () => {
+                await this.updateChildren()
+
+                return [...this.schemaNodes.values()]
+            },
+            getNoChildrenPlaceholderNode: async () =>
+                new PlaceholderNode(this, localize('AWS.explorerNode.registry.noSchemas', '[No Registry Schemas]')),
+            sort: (nodeA, nodeB) => nodeA.schemaName.localeCompare(nodeB.schemaName),
+        })
+    }
+
+    public update(registryItemOutput: RegistrySummary): void {
+        this.registryItemOutput = registryItemOutput
+        this.label = `${this.registryName}`
+        let registryArn = ''
+        if (this.registryItemOutput.RegistryArn) {
+            registryArn = `${os.EOL}${this.registryItemOutput.RegistryArn}`
+        }
+        this.tooltip = `${this.registryName}${registryArn}`
+    }
+
+    public async updateChildren(): Promise<void> {
+        const schemas = await toMapAsync(listSchemaItems(this.client, this.registryName), (schema) => schema.SchemaName)
+
+        updateInPlace(
+            this.schemaNodes,
+            schemas.keys(),
+            (key) => this.schemaNodes.get(key)!.update(schemas.get(key)!),
+            (key) => new SchemaItemNode(schemas.get(key)!, this.client, this.registryName)
+        )
+    }
+}
diff --git a/src/eventSchemas/explorer/schemaItemNode.ts b/packages/core/src/eventSchemas/explorer/schemaItemNode.ts
similarity index 83%
rename from src/eventSchemas/explorer/schemaItemNode.ts
rename to packages/core/src/eventSchemas/explorer/schemaItemNode.ts
index b59a2c36e80..790834e165c 100644
--- a/src/eventSchemas/explorer/schemaItemNode.ts
+++ b/packages/core/src/eventSchemas/explorer/schemaItemNode.ts
@@ -1,10 +1,9 @@
 /*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Schemas } from 'aws-sdk'
-
+import { SchemaSummary, SchemaVersionSummary } from '@aws-sdk/client-schemas'
 import * as os from 'os'
 import { SchemaClient } from '../../shared/clients/schemaClient'
 
@@ -15,7 +14,7 @@ import { localize } from '../../shared/utilities/vsCodeUtils'
 
 export class SchemaItemNode extends AWSTreeNodeBase {
     public constructor(
-        private schemaItem: Schemas.SchemaSummary,
+        private schemaItem: SchemaSummary,
         public readonly client: SchemaClient,
         public readonly registryName: string
     ) {
@@ -30,7 +29,7 @@ export class SchemaItemNode extends AWSTreeNodeBase {
         }
     }
 
-    public update(schemaItem: Schemas.SchemaSummary): void {
+    public update(schemaItem: SchemaSummary): void {
         this.schemaItem = schemaItem
         this.label = this.schemaItem.SchemaName || ''
         let schemaArn = ''
@@ -50,7 +49,7 @@ export class SchemaItemNode extends AWSTreeNodeBase {
         return response.Content!
     }
 
-    public async listSchemaVersions(): Promise<Schemas.SchemaVersionSummary[]> {
+    public async listSchemaVersions(): Promise<SchemaVersionSummary[]> {
         const versions = await toArrayAsync(this.client.listSchemaVersions(this.registryName, this.schemaName))
 
         return versions
diff --git a/src/eventSchemas/explorer/schemasNode.ts b/packages/core/src/eventSchemas/explorer/schemasNode.ts
similarity index 86%
rename from src/eventSchemas/explorer/schemasNode.ts
rename to packages/core/src/eventSchemas/explorer/schemasNode.ts
index 512043bccbd..4f9b584b82e 100644
--- a/src/eventSchemas/explorer/schemasNode.ts
+++ b/packages/core/src/eventSchemas/explorer/schemasNode.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -40,13 +40,13 @@ export class SchemasNode extends AWSTreeNodeBase {
     }
 
     public async updateChildren(): Promise<void> {
-        const registries = await toMapAsync(listRegistryItems(this.client), registry => registry.RegistryName)
+        const registries = await toMapAsync(listRegistryItems(this.client), (registry) => registry.RegistryName)
 
         updateInPlace(
             this.registryNodes,
             registries.keys(),
-            key => this.registryNodes.get(key)!.update(registries.get(key)!),
-            key => new RegistryItemNode(registries.get(key)!, this.client)
+            (key) => this.registryNodes.get(key)!.update(registries.get(key)!),
+            (key) => new RegistryItemNode(registries.get(key)!, this.client)
         )
     }
 }
diff --git a/src/eventSchemas/models/schemaCodeGenUtils.ts b/packages/core/src/eventSchemas/models/schemaCodeGenUtils.ts
similarity index 75%
rename from src/eventSchemas/models/schemaCodeGenUtils.ts
rename to packages/core/src/eventSchemas/models/schemaCodeGenUtils.ts
index 4577105777d..155b600b82d 100644
--- a/src/eventSchemas/models/schemaCodeGenUtils.ts
+++ b/packages/core/src/eventSchemas/models/schemaCodeGenUtils.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -65,24 +65,20 @@ class CodeGenPackageBuilder {
 
     public append(segment: string): CodeGenPackageBuilder {
         if (this.builder.length > 0) {
-            this.builder = this.builder.concat(IdentifierFormatter.packageSeparator)
+            this.builder = this.builder.concat(packageSeparator)
         }
-        this.builder = this.builder.concat(IdentifierFormatter.toValidIdentifier(segment.toLowerCase()))
+        this.builder = this.builder.concat(toValidIdentifier(segment.toLowerCase()))
 
         return this
     }
 }
 
-export namespace IdentifierFormatter {
-    export const packageSeparator = '.'
-    const potentialPackageSeparator = '@'
-    const notValidIdentifierRegex = new RegExp(`[^a-zA-Z0-9_${potentialPackageSeparator}]`, 'g')
-    const potentialPackageSeparatorRegex = new RegExp(potentialPackageSeparator, 'g')
-    const underscore = '_'
+export const packageSeparator = '.'
+const potentialPackageSeparator = '@'
+const notValidIdentifierRegex = new RegExp(`[^a-zA-Z0-9_${potentialPackageSeparator}]`, 'g')
+const potentialPackageSeparatorRegex = new RegExp(potentialPackageSeparator, 'g')
+const underscore = '_'
 
-    export function toValidIdentifier(name: string): string {
-        return name
-            .replace(notValidIdentifierRegex, underscore)
-            .replace(potentialPackageSeparatorRegex, packageSeparator)
-    }
+export function toValidIdentifier(name: string): string {
+    return name.replace(notValidIdentifierRegex, underscore).replace(potentialPackageSeparatorRegex, packageSeparator)
 }
diff --git a/src/eventSchemas/models/schemaCodeLangs.ts b/packages/core/src/eventSchemas/models/schemaCodeLangs.ts
similarity index 85%
rename from src/eventSchemas/models/schemaCodeLangs.ts
rename to packages/core/src/eventSchemas/models/schemaCodeLangs.ts
index 93b6e22e0da..fe83459251a 100644
--- a/src/eventSchemas/models/schemaCodeLangs.ts
+++ b/packages/core/src/eventSchemas/models/schemaCodeLangs.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Runtime } from 'aws-sdk/clients/lambda'
+import { Runtime } from '@aws-sdk/client-lambda'
 import { Set as ImmutableSet } from 'immutable'
 import { goRuntimes } from '../../lambda/models/samLambdaRuntime'
 
@@ -54,7 +54,16 @@ export function getLanguageDetails(language: SchemaCodeLangs): {
 }
 
 export function supportsEventBridgeTemplates(runtime: Runtime): boolean {
-    return ['python3.7', 'python3.8', 'python3.9', 'go1.x'].includes(runtime)
+    return [
+        'python3.7',
+        'python3.8',
+        'python3.9',
+        'python3.10',
+        'python3.11',
+        'python3.12',
+        'python3.13',
+        'go1.x',
+    ].includes(runtime)
 }
 
 export function getApiValueForSchemasDownload(runtime: Runtime): string {
diff --git a/src/eventSchemas/providers/schemasDataProvider.ts b/packages/core/src/eventSchemas/providers/schemasDataProvider.ts
similarity index 79%
rename from src/eventSchemas/providers/schemasDataProvider.ts
rename to packages/core/src/eventSchemas/providers/schemasDataProvider.ts
index 5324ea0516a..e0717b6b6d3 100644
--- a/src/eventSchemas/providers/schemasDataProvider.ts
+++ b/packages/core/src/eventSchemas/providers/schemasDataProvider.ts
@@ -1,13 +1,13 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as AWS from '@aws-sdk/types'
-import { Schemas } from 'aws-sdk'
 import { SchemaClient } from '../../shared/clients/schemaClient'
-import { getLogger, Logger } from '../../shared/logger'
+import { getLogger, Logger } from '../../shared/logger/logger'
 import { toArrayAsync } from '../../shared/utilities/collectionUtils'
+import { SchemaSummary } from '@aws-sdk/client-schemas'
 
 export class Cache {
     public constructor(public readonly credentialsRegionDataList: credentialsRegionDataListMap[]) {}
@@ -26,7 +26,7 @@ export interface regionRegistryMap {
 
 export interface registrySchemasMap {
     registryName: string
-    schemaList: Schemas.SchemaSummary[]
+    schemaList: SchemaSummary[]
 }
 
 /**
@@ -40,23 +40,23 @@ export class SchemasDataProvider {
 
     public async getRegistries(region: string, client: SchemaClient, credentials: AWS.Credentials) {
         const cachedRegion = this.cache.credentialsRegionDataList
-            .filter(x => x.credentials === credentials)
+            .filter((x) => x.credentials === credentials)
             .shift()
-            ?.regionDataList.filter(x => x.region === region)
+            ?.regionDataList.filter((x) => x.region === region)
             .shift()
 
         try {
             // if region is not cached, make api query and retain results
             if (!cachedRegion || cachedRegion.registryNames.length === 0) {
                 const registrySummary = await toArrayAsync(client.listRegistries())
-                const registryNames = registrySummary.map(x => x.RegistryName!)
+                const registryNames = registrySummary.map((x) => x.RegistryName!)
                 this.pushRegionDataIntoCache(region, registryNames, [], credentials)
 
                 return registryNames
             }
         } catch (err) {
             const error = err as Error
-            this.logger.error('Error retrieving registries: %s', error)
+            this.logger.error('Failed to get registries: %s', error)
 
             return undefined
         }
@@ -66,17 +66,17 @@ export class SchemasDataProvider {
 
     public async getSchemas(region: string, registryName: string, client: SchemaClient, credentials: AWS.Credentials) {
         const registrySchemasMapList = this.cache.credentialsRegionDataList
-            .filter(x => x.credentials === credentials)
+            .filter((x) => x.credentials === credentials)
             .shift()
-            ?.regionDataList.filter(x => x.region === region)
+            ?.regionDataList.filter((x) => x.region === region)
             .shift()?.registrySchemasMapList
-        let schemas = registrySchemasMapList?.filter(x => x.registryName === registryName).shift()?.schemaList
+        let schemas = registrySchemasMapList?.filter((x) => x.registryName === registryName).shift()?.schemaList
         try {
             // if no schemas found, make api query and retain results given that registryName && region already cached
             if (!schemas || schemas.length === 0) {
                 schemas = await toArrayAsync(client.listSchemas(registryName))
                 const singleItem: registrySchemasMap = { registryName: registryName, schemaList: schemas }
-                //wizard setup always calls getRegistries method prior to getSchemas, so this shouldn't be undefined
+                // wizard setup always calls getRegistries method prior to getSchemas, so this shouldn't be undefined
                 if (!registrySchemasMapList) {
                     this.pushRegionDataIntoCache(region, [], [singleItem], credentials)
                 }
@@ -87,7 +87,7 @@ export class SchemasDataProvider {
             }
         } catch (err) {
             const error = err as Error
-            this.logger.error('Error retrieving schemas: %s', error)
+            this.logger.error('Failed to get schemas: %s', error)
 
             return undefined
         }
@@ -107,7 +107,9 @@ export class SchemasDataProvider {
             registrySchemasMapList: registrySchemasMapList,
         }
 
-        const cachedCredential = this.cache.credentialsRegionDataList.filter(x => x.credentials === credentials).shift()
+        const cachedCredential = this.cache.credentialsRegionDataList
+            .filter((x) => x.credentials === credentials)
+            .shift()
         cachedCredential?.regionDataList.push(regionData)
 
         if (!cachedCredential) {
diff --git a/src/eventSchemas/templates/schemasAppTemplateUtils.ts b/packages/core/src/eventSchemas/templates/schemasAppTemplateUtils.ts
similarity index 93%
rename from src/eventSchemas/templates/schemasAppTemplateUtils.ts
rename to packages/core/src/eventSchemas/templates/schemasAppTemplateUtils.ts
index 5082198c84c..51bbaca2695 100644
--- a/src/eventSchemas/templates/schemasAppTemplateUtils.ts
+++ b/packages/core/src/eventSchemas/templates/schemasAppTemplateUtils.ts
@@ -1,10 +1,10 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import _ = require('lodash')
-import { IdentifierFormatter, SchemaCodeGenUtils } from '../../eventSchemas/models/schemaCodeGenUtils'
+import { SchemaCodeGenUtils, toValidIdentifier } from '../../eventSchemas/models/schemaCodeGenUtils'
 import { SchemaClient } from '../../shared/clients/schemaClient'
 
 const xAmazonEventSource = 'x-amazon-events-source'
@@ -92,13 +92,13 @@ function buildRootSchemaEventName(schemaNode: any, awsEventNode: any) {
     if (_.isString(refValue) && refValue.includes(componentsSchemasPath)) {
         const awsEventDetailRef = refValue.split(componentsSchemasPath).pop()
         if (!_.isEmpty(awsEventDetailRef)) {
-            return IdentifierFormatter.toValidIdentifier(awsEventDetailRef!)
+            return toValidIdentifier(awsEventDetailRef!)
         }
     }
 
     const schemaRoots = _.keysIn(_.get(schemaNode, components.concat('.', schemas)))
     if (!_.isEmpty(schemaRoots)) {
-        return IdentifierFormatter.toValidIdentifier(schemaRoots[0])
+        return toValidIdentifier(schemaRoots[0])
     }
 
     return undefined
diff --git a/packages/core/src/eventSchemas/utils.ts b/packages/core/src/eventSchemas/utils.ts
new file mode 100644
index 00000000000..a42d4a26829
--- /dev/null
+++ b/packages/core/src/eventSchemas/utils.ts
@@ -0,0 +1,54 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import { RegistrySummary, SchemaSummary, SearchSchemaSummary } from '@aws-sdk/client-schemas'
+import * as vscode from 'vscode'
+import { SchemaClient } from '../shared/clients/schemaClient'
+
+export async function* listRegistryItems(client: SchemaClient): AsyncIterableIterator<RegistrySummary> {
+    const status = vscode.window.setStatusBarMessage(
+        localize('AWS.message.statusBar.loading.registries', 'Loading Registry Items...')
+    )
+
+    try {
+        yield* client.listRegistries()
+    } finally {
+        status.dispose()
+    }
+}
+
+export async function* listSchemaItems(
+    client: SchemaClient,
+    registryName: string
+): AsyncIterableIterator<SchemaSummary> {
+    const status = vscode.window.setStatusBarMessage(
+        localize('AWS.message.statusBar.loading.schemaItems', 'Loading Schema Items...')
+    )
+
+    try {
+        yield* client.listSchemas(registryName)
+    } finally {
+        status.dispose()
+    }
+}
+
+export async function* searchSchemas(
+    client: SchemaClient,
+    keyword: string,
+    registryName: string
+): AsyncIterableIterator<SearchSchemaSummary> {
+    const status = vscode.window.setStatusBarMessage(
+        localize('AWS.message.statusBar.searching.schemas', 'Searching Schemas...')
+    )
+
+    try {
+        yield* client.searchSchemas(keyword, registryName)
+    } finally {
+        status.dispose()
+    }
+}
diff --git a/packages/core/src/eventSchemas/vue/index.ts b/packages/core/src/eventSchemas/vue/index.ts
new file mode 100644
index 00000000000..eac937636d8
--- /dev/null
+++ b/packages/core/src/eventSchemas/vue/index.ts
@@ -0,0 +1,16 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { createApp } from 'vue'
+import component from './searchSchemas.vue'
+
+const create = () => createApp(component)
+const app = create()
+app.mount('#vue-app')
+
+window.addEventListener('remount', () => {
+    app.unmount()
+    create().mount('#vue-app')
+})
diff --git a/src/eventSchemas/vue/searchSchemas.ts b/packages/core/src/eventSchemas/vue/searchSchemas.ts
similarity index 88%
rename from src/eventSchemas/vue/searchSchemas.ts
rename to packages/core/src/eventSchemas/vue/searchSchemas.ts
index fec3955895f..7d5c71fa3b0 100644
--- a/src/eventSchemas/vue/searchSchemas.ts
+++ b/packages/core/src/eventSchemas/vue/searchSchemas.ts
@@ -1,11 +1,11 @@
 /*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as nls from 'vscode-nls'
 const localize = nls.loadMessageBundle()
-import { Schemas } from 'aws-sdk'
+import { SchemaSummary, SearchSchemaSummary } from '@aws-sdk/client-schemas'
 import * as vscode from 'vscode'
 import { downloadSchemaItemCode } from '../commands/downloadSchemaItemCode'
 import { RegistryItemNode } from '../explorer/registryItemNode'
@@ -14,7 +14,7 @@ import { SchemasNode } from '../explorer/schemasNode'
 import { listRegistryItems, searchSchemas } from '../utils'
 import { DefaultSchemaClient, SchemaClient } from '../../shared/clients/schemaClient'
 
-import { getLogger, Logger } from '../../shared/logger'
+import { getLogger, Logger } from '../../shared/logger/logger'
 import { Result } from '../../shared/telemetry/telemetry'
 import { toArrayAsync } from '../../shared/utilities/collectionUtils'
 import { getTabSizeSetting } from '../../shared/utilities/editorUtilities'
@@ -37,15 +37,15 @@ interface InitialData {
 }
 
 export class SearchSchemasWebview extends VueWebview {
+    public static readonly sourcePath: string = 'src/eventSchemas/vue/index.js'
     public readonly id = 'remoteInvoke'
-    public readonly source = 'src/eventSchemas/vue/index.js'
 
     public constructor(
         private readonly channel: vscode.OutputChannel,
         private readonly client: SchemaClient,
         private readonly data: InitialData
     ) {
-        super()
+        super(SearchSchemasWebview.sourcePath)
     }
 
     public init() {
@@ -93,7 +93,7 @@ export class SearchSchemasWebview extends VueWebview {
     }
 
     public async downloadCodeBindings(summary: SchemaVersionedSummary) {
-        const schemaItem: Schemas.SchemaSummary = {
+        const schemaItem: SchemaSummary = {
             SchemaName: getSchemaNameFromTitle(summary.Title),
         }
         const schemaItemNode = new SchemaItemNode(schemaItem, this.client, summary.RegistryName)
@@ -113,7 +113,9 @@ export async function createSearchSchemasWebView(context: ExtContext, node: Regi
         const client = new DefaultSchemaClient(node.regionCode)
         const registryNames = await getRegistryNames(node, client)
         if (registryNames.length === 0) {
-            vscode.window.showInformationMessage(localize('AWS.schemas.search.no_registries', 'No Schema Registries'))
+            void vscode.window.showInformationMessage(
+                localize('AWS.schemas.search.no_registries', 'No Schema Registries')
+            )
 
             return
         }
@@ -149,11 +151,13 @@ export async function getRegistryNames(node: RegistryItemNode | SchemasNode, cli
     if (node instanceof SchemasNode) {
         try {
             const registries = await toArrayAsync(listRegistryItems(client))
-            registries.forEach(element => registryNames.push(element.RegistryName!))
+            for (const element of registries) {
+                registryNames.push(element.RegistryName!)
+            }
         } catch (err) {
             const error = err as Error
             getLogger().error(error)
-            vscode.window.showErrorMessage(
+            void vscode.window.showErrorMessage(
                 localize('AWS.message.error.schemas.search.failed_to_load_resources', 'Error loading Schemas resources')
             )
         }
@@ -193,7 +197,7 @@ export async function getSearchListForSingleRegistry(
         const err = error as Error
         getLogger().error(err)
 
-        vscode.window.showErrorMessage(
+        void vscode.window.showErrorMessage(
             localize(
                 'AWS.message.error.schemas.search.failed_to_search_registry',
                 'Unable to search registry {0}',
@@ -213,7 +217,7 @@ export async function getSearchResults(
     let results: SchemaVersionedSummary[] = []
 
     await Promise.all(
-        registries.map(async registryName => {
+        registries.map(async (registryName) => {
             let prefix = ''
             if (registries.length !== 1) {
                 prefix = registryName.concat('/')
@@ -226,12 +230,12 @@ export async function getSearchResults(
     return results
 }
 
-export function getSchemaVersionedSummary(searchSummary: Schemas.SearchSchemaSummary[], prefix: string) {
-    const results = searchSummary.map(searchSchemaSummary => ({
+export function getSchemaVersionedSummary(searchSummary: SearchSchemaSummary[], prefix: string) {
+    const results = searchSummary.map((searchSchemaSummary) => ({
         RegistryName: searchSchemaSummary.RegistryName!,
         Title: prefix.concat(searchSchemaSummary.SchemaName!),
         VersionList: searchSchemaSummary
-            .SchemaVersions!.map(summary => summary.SchemaVersion!)
+            .SchemaVersions!.map((summary) => summary.SchemaVersion!)
             .sort(sortNumericStringsInDescendingOrder),
     }))
 
diff --git a/src/eventSchemas/vue/searchSchemas.vue b/packages/core/src/eventSchemas/vue/searchSchemas.vue
similarity index 100%
rename from src/eventSchemas/vue/searchSchemas.vue
rename to packages/core/src/eventSchemas/vue/searchSchemas.vue
diff --git a/src/eventSchemas/wizards/schemaCodeDownloadWizard.ts b/packages/core/src/eventSchemas/wizards/schemaCodeDownloadWizard.ts
similarity index 94%
rename from src/eventSchemas/wizards/schemaCodeDownloadWizard.ts
rename to packages/core/src/eventSchemas/wizards/schemaCodeDownloadWizard.ts
index 7df5caea744..4db9d29ba27 100644
--- a/src/eventSchemas/wizards/schemaCodeDownloadWizard.ts
+++ b/packages/core/src/eventSchemas/wizards/schemaCodeDownloadWizard.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -26,6 +26,7 @@ import * as codeLang from '../models/schemaCodeLangs'
 
 import { SchemaItemNode } from '../explorer/schemaItemNode'
 import { recentlyUsed } from '../../shared/localizedText'
+import { openUrl } from '../../shared/utilities/vsCodeUtils'
 
 export interface SchemaCodeDownloadWizardContext {
     readonly schemaLangs: ImmutableSet<codeLang.SchemaCodeLangs>
@@ -64,7 +65,7 @@ export class DefaultSchemaCodeDownloadWizardContext extends WizardContext implem
                 totalSteps: this.totalSteps,
             },
             buttons: [this.helpButton, vscode.QuickInputButtons.Back],
-            items: this.schemaLangs.toArray().map(language => ({
+            items: this.schemaLangs.toArray().map((language) => ({
                 label: language,
                 alwaysShow: language === currLanguage,
                 description: language === currLanguage ? recentlyUsed : '',
@@ -77,7 +78,7 @@ export class DefaultSchemaCodeDownloadWizardContext extends WizardContext implem
                 if (button === vscode.QuickInputButtons.Back) {
                     resolve(undefined)
                 } else if (button === this.helpButton) {
-                    vscode.env.openExternal(vscode.Uri.parse(eventBridgeSchemasDocUrl))
+                    void openUrl(vscode.Uri.parse(eventBridgeSchemasDocUrl))
                 }
             },
         })
@@ -102,7 +103,7 @@ export class DefaultSchemaCodeDownloadWizardContext extends WizardContext implem
                 totalSteps: this.totalSteps,
             },
             buttons: [this.helpButton, vscode.QuickInputButtons.Back],
-            items: versions!.map(schemaVersion => ({
+            items: versions!.map((schemaVersion) => ({
                 label: schemaVersion.SchemaVersion!,
                 alwaysShow: schemaVersion.SchemaVersion === currSchemaVersion,
                 description: schemaVersion === currSchemaVersion ? recentlyUsed : '',
@@ -115,7 +116,7 @@ export class DefaultSchemaCodeDownloadWizardContext extends WizardContext implem
                 if (button === vscode.QuickInputButtons.Back) {
                     resolve(undefined)
                 } else if (button === this.helpButton) {
-                    vscode.env.openExternal(vscode.Uri.parse(eventBridgeSchemasDocUrl))
+                    void openUrl(vscode.Uri.parse(eventBridgeSchemasDocUrl))
                 }
             },
         })
diff --git a/packages/core/src/extension.ts b/packages/core/src/extension.ts
new file mode 100644
index 00000000000..e400c3e0ddb
--- /dev/null
+++ b/packages/core/src/extension.ts
@@ -0,0 +1,220 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * This module contains shared code between the main extension and browser/web
+ * extension entrypoints.
+ *
+ * See `arch_develop.md` in `docs/` for more info.
+ */
+
+import vscode from 'vscode'
+import * as nls from 'vscode-nls'
+
+import globals, { initialize, isWeb } from './shared/extensionGlobals'
+import { join } from 'path'
+import { Commands } from './shared/vscode/commands2'
+import { endpointsFileUrl, githubCreateIssueUrl, githubUrl } from './shared/constants'
+import { getIdeProperties, aboutExtension, getDocUrl, isSageMaker } from './shared/extensionUtilities'
+import { logAndShowError, logAndShowWebviewError } from './shared/utilities/logAndShowUtils'
+import { telemetry } from './shared/telemetry/telemetry'
+import { openUrl } from './shared/utilities/vsCodeUtils'
+import { activateViewsShared } from './awsexplorer/activationShared'
+import fs from './shared/fs/fs'
+import * as errors from './shared/errors'
+import { activate as activateLogger } from './shared/logger/activation'
+import { initializeComputeRegion } from './shared/extensionUtilities'
+import { activate as activateTelemetry } from './shared/telemetry/activation'
+import { DefaultAwsContext } from './shared/awsContext'
+import { Settings } from './shared/settings'
+import { DefaultAWSClientBuilder } from './shared/awsClientBuilder'
+import { initialize as initializeAuth } from './auth/activation'
+import { LoginManager } from './auth/deprecated/loginManager'
+import { CredentialsStore } from './auth/credentials/store'
+import { initializeAwsCredentialsStatusBarItem } from './auth/ui/statusBarItem'
+import { RegionProvider, getEndpointsFromFetcher } from './shared/regions/regionProvider'
+import { getMachineId, isAutomation } from './shared/vscode/env'
+import { registerCommandErrorHandler } from './shared/vscode/commands2'
+import { registerWebviewErrorHandler } from './webviews/server'
+import { ExtContext, VSCODE_EXTENSION_ID } from './shared/extensions'
+import { getSamCliContext } from './shared/sam/cli/samCliContext'
+import { UriHandler } from './shared/vscode/uriHandler'
+import { disableAwsSdkWarning } from './shared/awsClientBuilder'
+import { FileResourceFetcher } from './shared/resourcefetcher/fileResourceFetcher'
+import { ResourceFetcher } from './shared/resourcefetcher/resourcefetcher'
+import { registerCommands } from './commands'
+
+// In web mode everything must be in a single file, so things like the endpoints file will not be available.
+// The following imports the endpoints file, which causes webpack to bundle it in the final output file
+import endpoints from '../resources/endpoints.json'
+import { showViewLogsMessage } from './shared/utilities/messages'
+import { AWSClientBuilderV3 } from './shared/awsClientBuilderV3'
+import { setupUninstallHandler } from './shared/handleUninstall'
+import { maybeShowMinVscodeWarning } from './shared/extensionStartup'
+import { getLogger } from './shared/logger/logger'
+import { setContext } from './shared/vscode/setContext'
+
+disableAwsSdkWarning()
+
+let localize: nls.LocalizeFunc
+
+/**
+ * Activation/setup code that is shared by the regular (nodejs) extension AND web mode extension.
+ * Most setup code should live here, unless there is a reason not to.
+ */
+export async function activateCommon(
+    context: vscode.ExtensionContext,
+    contextPrefix: string,
+    isWeb: boolean
+): Promise<ExtContext> {
+    localize = nls.loadMessageBundle()
+
+    initialize(context, isWeb)
+    const homeDirLogs = await fs.init(context, (homeDir) => {
+        void showViewLogsMessage(`Invalid home directory (check $HOME): "${homeDir}"`)
+    })
+    errors.init(fs.getUsername(), isAutomation())
+    await initializeComputeRegion()
+
+    globals.contextPrefix = '' // todo: disconnect supplied argument
+
+    registerCommandErrorHandler((info, error) => {
+        const defaultMessage = localize('AWS.generic.message.error', 'Failed to run command: {0}', info.id)
+        void logAndShowError(localize, error, info.id, defaultMessage)
+    })
+
+    registerWebviewErrorHandler((error: unknown, webviewId: string, command: string) => {
+        return logAndShowWebviewError(localize, error, webviewId, command)
+    })
+
+    // Setup the logger
+    const toolkitOutputChannel = vscode.window.createOutputChannel('AWS Toolkit', { log: true })
+    const toolkitLogChannel = vscode.window.createOutputChannel('AWS Toolkit Logs', { log: true })
+    await activateLogger(context, contextPrefix, toolkitLogChannel, toolkitOutputChannel)
+    globals.outputChannel = toolkitOutputChannel
+    globals.logOutputChannel = toolkitLogChannel
+
+    if (homeDirLogs.length > 0) {
+        getLogger().error('fs.init: invalid home directory given by env vars: %O', homeDirLogs)
+    }
+
+    void maybeShowMinVscodeWarning('1.83.0')
+
+    // setup globals
+    globals.machineId = await getMachineId()
+    globals.awsContext = new DefaultAwsContext()
+    globals.sdkClientBuilder = new DefaultAWSClientBuilder(globals.awsContext)
+    globals.sdkClientBuilderV3 = new AWSClientBuilderV3(globals.awsContext)
+    globals.loginManager = new LoginManager(globals.awsContext, new CredentialsStore())
+
+    // order matters here
+    globals.manifestPaths.endpoints = context.asAbsolutePath(join('resources', 'endpoints.json'))
+    globals.manifestPaths.lambdaSampleRequests = context.asAbsolutePath(
+        join('resources', 'vs-lambda-sample-request-manifest.xml')
+    )
+    globals.regionProvider = RegionProvider.fromEndpointsProvider(makeEndpointsProvider())
+
+    // telemetry
+    await activateTelemetry(context, globals.awsContext, Settings.instance, 'AWS Toolkit For VS Code')
+
+    // set context var to identify if its SageMaker Unified Studio or not
+    await setContext('aws.isSageMakerUnifiedStudio', isSageMaker('SMUS'))
+
+    // Create this now, but don't call vscode.window.registerUriHandler() until after all
+    // Toolkit services have a chance to register their path handlers. #4105
+    globals.uriHandler = new UriHandler()
+
+    // Generic extension commands
+    registerGenericCommands(context, contextPrefix)
+
+    // Toolkit specific commands
+    registerCommands(context)
+    context.subscriptions.push(
+        // No-op command used for decoration-only codelenses.
+        vscode.commands.registerCommand('aws.doNothingCommand', () => {}),
+        // "Show AWS Commands..."
+        Commands.register('aws.listCommands', () =>
+            vscode.commands.executeCommand('workbench.action.quickOpen', `> ${getIdeProperties().company}:`)
+        ),
+        // register URLs in extension menu
+        Commands.register(`aws.toolkit.help`, async () => {
+            void openUrl(getDocUrl())
+            telemetry.aws_help.emit()
+        })
+    )
+
+    // Handle AWS Toolkit un-installation.
+    setupUninstallHandler(VSCODE_EXTENSION_ID.awstoolkit, context.extension.id, context)
+
+    // auth
+    await initializeAuth(globals.loginManager)
+    await initializeAwsCredentialsStatusBarItem(globals.awsContext, context)
+
+    const extContext: ExtContext = {
+        extensionContext: context,
+        awsContext: globals.awsContext,
+        samCliContext: getSamCliContext,
+        regionProvider: globals.regionProvider,
+        outputChannel: globals.outputChannel,
+        telemetryService: globals.telemetry,
+        uriHandler: globals.uriHandler,
+        credentialsStore: globals.loginManager.store,
+    }
+
+    await activateViewsShared(extContext.extensionContext)
+
+    return extContext
+}
+
+/** Deactivation code that is shared between nodejs and web implementations */
+export async function deactivateCommon() {
+    await globals.telemetry.shutdown()
+}
+/**
+ * Registers generic commands used by both web and node versions of the toolkit.
+ */
+export function registerGenericCommands(extensionContext: vscode.ExtensionContext, contextPrefix: string) {
+    extensionContext.subscriptions.push(
+        // register URLs in extension menu
+        Commands.register(`aws.${contextPrefix}.github`, async () => {
+            void openUrl(vscode.Uri.parse(githubUrl))
+            telemetry.aws_showExtensionSource.emit()
+        }),
+        Commands.register(`aws.${contextPrefix}.createIssueOnGitHub`, async () => {
+            void openUrl(vscode.Uri.parse(githubCreateIssueUrl))
+            telemetry.aws_reportPluginIssue.emit()
+        }),
+        Commands.register(`aws.${contextPrefix}.aboutExtension`, async () => {
+            await aboutExtension()
+        })
+    )
+}
+
+/**
+ * Returns an object that provides AWS service endpoints that the toolkit supports.
+ *
+ * https://docs.aws.amazon.com/general/latest/gr/rande.html
+ */
+export function makeEndpointsProvider() {
+    let localManifestFetcher: ResourceFetcher<string>
+    let remoteManifestFetcher: ResourceFetcher<Response>
+    if (isWeb()) {
+        localManifestFetcher = { get: async () => JSON.stringify(endpoints) }
+        // Cannot use HttpResourceFetcher due to web mode breaking on import
+        remoteManifestFetcher = { get: async () => await fetch(endpointsFileUrl) }
+    } else {
+        localManifestFetcher = new FileResourceFetcher(globals.manifestPaths.endpoints)
+        // HACK: HttpResourceFetcher breaks web mode when imported, so we use webpack.IgnorePlugin()
+        // to exclude it from the bundle.
+        // TODO: Make HttpResourceFetcher web mode compatible
+        const { HttpResourceFetcher } = require('./shared/resourcefetcher/httpResourceFetcher')
+        remoteManifestFetcher = new HttpResourceFetcher(endpointsFileUrl, { showUrl: true })
+    }
+
+    return {
+        local: () => getEndpointsFromFetcher(localManifestFetcher),
+        remote: () => getEndpointsFromFetcher(remoteManifestFetcher),
+    }
+}
diff --git a/packages/core/src/extensionNode.ts b/packages/core/src/extensionNode.ts
new file mode 100644
index 00000000000..a8a7855913e
--- /dev/null
+++ b/packages/core/src/extensionNode.ts
@@ -0,0 +1,376 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+
+import * as codecatalyst from './codecatalyst/activation'
+import { activate as activateAppBuilder } from './awsService/appBuilder/activation'
+import { activate as activateAwsExplorer } from './awsexplorer/activation'
+import { activate as activateCloudWatchLogs } from './awsService/cloudWatchLogs/activation'
+import { activate as activateSchemas } from './eventSchemas/activation'
+import { activate as activateLambda } from './lambda/activation'
+import { activate as activateCloudFormationTemplateRegistry } from './shared/cloudformation/activation'
+import { AwsContextCommands } from './shared/awsContextCommands'
+import {
+    getIdeProperties,
+    getExtEnvironmentDetails,
+    isSageMaker,
+    showWelcomeMessage,
+} from './shared/extensionUtilities'
+import { getLogger, Logger } from './shared/logger/logger'
+import { activate as activateEcr } from './awsService/ecr/activation'
+import { activate as activateEc2, deactivate as deactivateEc2 } from './awsService/ec2/activation'
+import { activate as activateSam } from './shared/sam/activation'
+import { activate as activateS3 } from './awsService/s3/activation'
+import * as filetypes from './shared/filetypes'
+import { activate as activateApiGateway } from './awsService/apigateway/activation'
+import { activate as activateStepFunctions } from './stepFunctions/activation'
+import { activate as activateStepFunctionsWorkflowStudio } from './stepFunctions/workflowStudio/activation'
+import { activate as activateSsmDocument } from './ssmDocument/activation'
+import { activate as activateDynamicResources } from './dynamicResources/activation'
+import { activate as activateEcs } from './awsService/ecs/activation'
+import { activate as activateAppRunner } from './awsService/apprunner/activation'
+import { activate as activateIot } from './awsService/iot/activation'
+import { activate as activateDev } from './dev/activation'
+import * as beta from './dev/beta'
+import { activate as activateApplicationComposer } from './applicationcomposer/activation'
+import { activate as activateRedshift } from './awsService/redshift/activation'
+import { activate as activateDocumentDb } from './docdb/activation'
+import { activate as activateIamPolicyChecks } from './awsService/accessanalyzer/activation'
+import { activate as activateNotifications } from './notifications/activation'
+import { activate as activateSagemaker } from './awsService/sagemaker/activation'
+import { activate as activateSageMakerUnifiedStudio } from './sagemakerunifiedstudio/activation'
+import { SchemaService } from './shared/schemas'
+import { AwsResourceManager } from './dynamicResources/awsResourceManager'
+import globals from './shared/extensionGlobals'
+import { Experiments, Settings, showSettingsFailedMsg } from './shared/settings'
+import { isReleaseVersion } from './shared/vscode/env'
+import { AuthStatus, AuthUserState, telemetry } from './shared/telemetry/telemetry'
+import { ExtStartUpSources } from './shared/telemetry/util'
+import { Auth } from './auth/auth'
+import { getTelemetryMetadataForConn } from './auth/connection'
+import { registerSubmitFeedback } from './feedback/vue/submitFeedback'
+import { activateCommon, deactivateCommon } from './extension'
+import { learnMoreAmazonQCommand, qExtensionPageCommand, dismissQTree } from './amazonq/explorer/amazonQChildrenNodes'
+import { codeWhispererCoreScopes } from './codewhisperer/util/authUtil'
+import { installAmazonQExtension } from './codewhisperer/commands/basicCommands'
+import { VSCODE_EXTENSION_ID } from './shared/extensions'
+import { isExtensionInstalled } from './shared/utilities/vsCodeUtils'
+import { ExtensionUse, getAuthFormIdsFromConnection, initializeCredentialsProviderManager } from './auth/utils'
+import { activate as activateThreatComposerEditor } from './threatComposer/activation'
+import { isSsoConnection, hasScopes } from './auth/connection'
+import { CrashMonitoring } from './shared/crashMonitoring'
+import { setContext } from './shared/vscode/setContext'
+import { AuthFormId } from './login/webview/vue/types'
+
+let localize: nls.LocalizeFunc
+
+/**
+ * The entrypoint for the nodejs version of the toolkit
+ *
+ * **CONTRIBUTORS** If you are adding code to this function prioritize adding it to
+ * {@link activateCommon} if appropriate
+ */
+export async function activate(context: vscode.ExtensionContext) {
+    const activationStartedOn = Date.now()
+    localize = nls.loadMessageBundle()
+    const contextPrefix = 'toolkit'
+
+    try {
+        // IMPORTANT: If you are doing setup that should also work in web mode (browser), it should be done in the function below
+        const extContext = await activateCommon(context, contextPrefix, false)
+
+        // Intentionally do not await since this can be slow and non-critical
+        void (await CrashMonitoring.instance())?.start()
+
+        initializeCredentialsProviderManager()
+
+        const toolkitEnvDetails = getExtEnvironmentDetails()
+        // Splits environment details by new line, filter removes the empty string
+        for (const line of toolkitEnvDetails.split(/\r?\n/).filter(Boolean)) {
+            getLogger().info(line)
+        }
+
+        globals.awsContextCommands = new AwsContextCommands(globals.regionProvider, Auth.instance)
+        globals.schemaService = new SchemaService()
+        globals.resourceManager = new AwsResourceManager(context)
+
+        const settings = Settings.instance
+        const experiments = Experiments.instance
+
+        experiments.onDidChange(({ key }) => {
+            telemetry.aws_experimentActivation.run((span) => {
+                // Record the key prior to reading the setting as `get` may throw
+                span.record({ experimentId: key })
+                span.record({ experimentState: experiments.get(key) ? 'activated' : 'deactivated' })
+            })
+        })
+
+        await globals.schemaService.start()
+        filetypes.activate()
+
+        try {
+            await activateDev(context)
+            await beta.activate(context)
+        } catch (error) {
+            getLogger().debug(`Developer Tools (internal): failed to activate: ${(error as Error).message}`)
+        }
+
+        context.subscriptions.push(registerSubmitFeedback(context, 'AWS Toolkit', contextPrefix))
+
+        // do not enable codecatalyst for sagemaker
+        // TODO: remove setContext if SageMaker adds the context to their IDE
+        if (!isSageMaker()) {
+            await setContext('aws.isSageMaker', false)
+            await codecatalyst.activate(extContext)
+        } else {
+            await setContext('aws.isSageMaker', true)
+        }
+
+        // wrap auth related setup in a context for telemetry
+        await telemetry.function_call.run(
+            async () => {
+                // Clean up remaining logins after codecatalyst activated and ran its cleanup.
+                // Because we are splitting auth sessions by extension, we can't use Amazon Q
+                // connections anymore.
+                // TODO: Remove after some time?
+                for (const conn of await Auth.instance.listConnections()) {
+                    if (isSsoConnection(conn) && hasScopes(conn, codeWhispererCoreScopes)) {
+                        getLogger().debug(
+                            `forgetting connection: ${conn.id} with starturl/scopes: ${conn.startUrl} / %O`,
+                            conn.scopes
+                        )
+                        await Auth.instance.forgetConnection(conn)
+                    }
+                }
+            },
+            { emit: false, functionId: { name: 'activate', class: 'ExtensionNodeCore' } }
+        )
+
+        await activateCloudFormationTemplateRegistry(context)
+
+        await activateAwsExplorer({
+            context: extContext,
+            regionProvider: globals.regionProvider,
+            toolkitOutputChannel: globals.outputChannel,
+        })
+
+        await activateAppRunner(extContext)
+
+        await activateApiGateway({
+            extContext: extContext,
+            outputChannel: globals.outputChannel,
+        })
+
+        await activateLambda(extContext)
+
+        await activateSsmDocument(context, globals.awsContext, globals.regionProvider, globals.outputChannel)
+
+        await activateSam(extContext)
+
+        await activateS3(extContext)
+
+        await activateEc2(extContext)
+
+        await activateEcr(context)
+
+        await activateCloudWatchLogs(context, settings)
+
+        await activateDynamicResources(context)
+
+        await activateIot(extContext)
+
+        await activateEcs(extContext)
+
+        await activateSchemas(extContext)
+
+        await activateSagemaker(extContext)
+
+        if (!isSageMaker()) {
+            // Amazon Q Tree setup.
+            learnMoreAmazonQCommand.register()
+            qExtensionPageCommand.register()
+            dismissQTree.register()
+            installAmazonQExtension.register()
+
+            await handleAmazonQInstall()
+        }
+
+        await activateSageMakerUnifiedStudio(context)
+
+        await activateApplicationComposer(context)
+        await activateThreatComposerEditor(context)
+
+        await activateStepFunctions(context, globals.awsContext, globals.outputChannel)
+
+        await activateStepFunctionsWorkflowStudio()
+
+        await activateRedshift(extContext)
+
+        await activateAppBuilder(extContext)
+
+        await activateDocumentDb(extContext)
+
+        await activateIamPolicyChecks(extContext)
+
+        context.subscriptions.push(
+            vscode.window.registerUriHandler({
+                handleUri: (uri) =>
+                    telemetry.runRoot(() => {
+                        telemetry.record({ source: 'UriHandler' })
+
+                        return globals.uriHandler.handleUri(uri)
+                    }),
+            })
+        )
+
+        showWelcomeMessage(context)
+
+        const settingsValid = await settings.isReadable()
+        if (!settingsValid) {
+            void showSettingsFailedMsg('read')
+        }
+        recordToolkitInitialization(activationStartedOn, settingsValid, getLogger())
+
+        if (!isReleaseVersion()) {
+            globals.telemetry.assertPassiveTelemetry(globals.didReload)
+        }
+
+        // TODO: Should probably emit for web as well.
+        // Will the web metric look the same?
+        telemetry.auth_userState.emit({
+            passive: true,
+            result: 'Succeeded',
+            source: ExtensionUse.instance.sourceForTelemetry(),
+            ...(await getAuthState()),
+        })
+
+        void activateNotifications(context, getAuthState)
+    } catch (error) {
+        const stacktrace = (error as Error).stack?.split('\n')
+        // truncate if the stacktrace is unusually long
+        if (stacktrace !== undefined && stacktrace.length > 40) {
+            stacktrace.length = 40
+        }
+        getLogger().error(
+            localize(
+                'AWS.channel.aws.toolkit.activation.error',
+                'Error Activating {0} Toolkit: {1} \n{2}',
+                getIdeProperties().company,
+                (error as Error).message,
+                stacktrace?.join('\n')
+            )
+        )
+        throw error
+    }
+}
+
+export async function deactivate() {
+    // Run concurrently to speed up execution. stop() does not throw so it is safe
+    await Promise.all([await (await CrashMonitoring.instance())?.shutdown(), deactivateCommon(), deactivateEc2()])
+    globals.sdkClientBuilderV3.clearServiceCache()
+    await globals.resourceManager.dispose()
+}
+
+async function handleAmazonQInstall() {
+    const dismissedInstall = globals.globalState.get<boolean>('aws.toolkit.amazonqInstall.dismissed')
+    if (dismissedInstall) {
+        return
+    }
+
+    if (isExtensionInstalled(VSCODE_EXTENSION_ID.amazonq)) {
+        await globals.globalState.update('aws.toolkit.amazonqInstall.dismissed', true)
+        return
+    }
+
+    await telemetry.toolkit_showNotification.run(async () => {
+        telemetry.record({ id: 'amazonQStandaloneChange' })
+        void vscode.window
+            .showInformationMessage(
+                'Try Amazon Q, a generative AI assistant, with chat and code suggestions.',
+                'Install',
+                'Learn More'
+            )
+            .then(async (resp) => {
+                await telemetry.toolkit_invokeAction.run(async () => {
+                    telemetry.record({
+                        source: ExtensionUse.instance.isFirstUse()
+                            ? ExtStartUpSources.firstStartUp
+                            : ExtStartUpSources.none,
+                    })
+
+                    if (resp === 'Learn More') {
+                        // Clicking learn more will open the q extension page
+                        telemetry.record({ action: 'learnMore' })
+                        await qExtensionPageCommand.execute()
+                        return
+                    }
+
+                    if (resp === 'Install') {
+                        telemetry.record({ action: 'installAmazonQ' })
+                        await installAmazonQExtension.execute()
+                    } else {
+                        telemetry.record({ action: 'dismissQNotification' })
+                    }
+                    await globals.globalState.update('aws.toolkit.amazonqInstall.dismissed', true)
+                })
+            })
+    })
+}
+
+function recordToolkitInitialization(activationStartedOn: number, settingsValid: boolean, logger?: Logger) {
+    try {
+        const activationFinishedOn = Date.now()
+        const duration = activationFinishedOn - activationStartedOn
+
+        if (settingsValid) {
+            telemetry.toolkit_init.emit({ duration, result: 'Succeeded' })
+        } else {
+            telemetry.toolkit_init.emit({ duration, result: 'Failed', reason: 'UserSettingsRead' })
+        }
+    } catch (err) {
+        logger?.error(err as Error)
+    }
+}
+
+async function getAuthState(): Promise<Omit<AuthUserState, 'source'>> {
+    let authStatus: AuthStatus = 'notConnected'
+    const enabledConnections: Set<AuthFormId> = new Set()
+    const enabledScopes: Set<string> = new Set()
+    if (Auth.instance.hasConnections) {
+        authStatus = 'expired'
+        for (const conn of await Auth.instance.listConnections()) {
+            const state = Auth.instance.getConnectionState(conn)
+            if (state === 'valid') {
+                authStatus = 'connected'
+            }
+
+            for (const id of getAuthFormIdsFromConnection(conn)) {
+                enabledConnections.add(id)
+            }
+            if (isSsoConnection(conn)) {
+                if (conn.scopes) {
+                    for (const s of conn.scopes) {
+                        enabledScopes.add(s)
+                    }
+                }
+            }
+        }
+    }
+
+    // There may be other SSO connections in toolkit, but there is no use case for
+    // displaying registration info for non-active connections at this time.
+    const activeConn = Auth.instance.activeConnection
+    if (activeConn?.type === 'sso') {
+        telemetry.record(await getTelemetryMetadataForConn(activeConn))
+    }
+
+    return {
+        authStatus,
+        authEnabledConnections: [...enabledConnections].sort().join(','),
+        authScopes: [...enabledScopes].sort().join(','),
+    }
+}
diff --git a/packages/core/src/extensionWeb.ts b/packages/core/src/extensionWeb.ts
new file mode 100644
index 00000000000..01fa0f667db
--- /dev/null
+++ b/packages/core/src/extensionWeb.ts
@@ -0,0 +1,34 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from './shared/logger/logger'
+import { activateCommon, deactivateCommon } from './extension'
+import { activateWebShared } from './extensionWebShared'
+
+export async function activate(context: vscode.ExtensionContext) {
+    const contextPrefix = 'toolkit'
+
+    await activateWebShared(context)
+
+    try {
+        // IMPORTANT: Any new activation code should be done in the function below unless
+        // it is web mode specific activation code.
+        // This should happen as early as possible, as initialize() must be called before
+        // isWeb() calls will work.
+        await activateCommon(context, contextPrefix, true)
+    } catch (error) {
+        const stacktrace = (error as Error).stack?.split('\n')
+        // truncate if the stacktrace is unusually long
+        if (stacktrace !== undefined && stacktrace.length > 40) {
+            stacktrace.length = 40
+        }
+        getLogger().error(`Failed to activate extension`, error)
+    }
+}
+
+export async function deactivate() {
+    await deactivateCommon()
+}
diff --git a/packages/core/src/extensionWebShared.ts b/packages/core/src/extensionWebShared.ts
new file mode 100644
index 00000000000..1a62ab723a4
--- /dev/null
+++ b/packages/core/src/extensionWebShared.ts
@@ -0,0 +1,28 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from './shared/logger/logger'
+import os from 'os'
+
+/**
+ * This executes the web activation code that all extensions share. So any extension supporting web
+ * should run this as part of their web activation.
+ */
+export async function activateWebShared(context: vscode.ExtensionContext) {
+    try {
+        patchOsVersion()
+    } catch (error) {
+        getLogger().error(`Failed activation in extensionWebShared:`, error)
+    }
+}
+
+/**
+ * The browserfied version of os does not have a `version()` method,
+ * so we patch it.
+ */
+function patchOsVersion() {
+    ;(os.version as any) = () => '1.0.0'
+}
diff --git a/packages/core/src/feedback/index.ts b/packages/core/src/feedback/index.ts
new file mode 100644
index 00000000000..8392d4e6949
--- /dev/null
+++ b/packages/core/src/feedback/index.ts
@@ -0,0 +1,6 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export { registerSubmitFeedback } from './vue/submitFeedback'
diff --git a/packages/core/src/feedback/vue/index.ts b/packages/core/src/feedback/vue/index.ts
new file mode 100644
index 00000000000..becfc1774d3
--- /dev/null
+++ b/packages/core/src/feedback/vue/index.ts
@@ -0,0 +1,16 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { createApp } from 'vue'
+import component from './submitFeedback.vue'
+
+const create = () => createApp(component)
+const app = create()
+app.mount('#vue-app')
+
+window.addEventListener('remount', () => {
+    app.unmount()
+    create().mount('#vue-app')
+})
diff --git a/packages/core/src/feedback/vue/submitFeedback.ts b/packages/core/src/feedback/vue/submitFeedback.ts
new file mode 100644
index 00000000000..928c0eb3249
--- /dev/null
+++ b/packages/core/src/feedback/vue/submitFeedback.ts
@@ -0,0 +1,128 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../../shared/extensionGlobals'
+import { getLogger } from '../../shared/logger/logger'
+import * as vscode from 'vscode'
+import { TelemetryService } from '../../shared/telemetry/telemetryService'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { VueWebview, VueWebviewPanel } from '../../webviews/main'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { Commands, RegisteredCommand, VsCodeCommandArg, placeholder } from '../../shared/vscode/commands2'
+import { i18n } from '../../shared/i18n-helper'
+
+export interface FeedbackMessage {
+    comment: string
+    sentiment: string
+}
+
+export class FeedbackWebview extends VueWebview {
+    public static readonly sourcePath: string = 'src/feedback/vue/index.js'
+    public readonly id = 'submitFeedback'
+
+    public constructor(
+        private readonly telemetry: TelemetryService,
+        private readonly feedbackName: string,
+        /** Arbitrary caller-defined data appended to comment when sending the feedback request. */
+        private commentData?: string
+    ) {
+        super(FeedbackWebview.sourcePath)
+    }
+    public async getFeedbackName(): Promise<string | void> {
+        return this.feedbackName
+    }
+
+    public async submit(message: FeedbackMessage): Promise<string | void> {
+        const logger = getLogger()
+
+        if (!message.sentiment) {
+            return 'Choose a reaction (smile/frown)'
+        }
+
+        if (message.comment.length < 188) {
+            return 'Please add atleast 100 characters in the template describing your issue.'
+        }
+
+        if (this.commentData) {
+            message.comment = `${message.comment}\n\n${this.commentData}`
+        }
+
+        try {
+            await this.telemetry.postFeedback({
+                comment: message.comment,
+                sentiment: message.sentiment,
+            })
+        } catch (err) {
+            const errorMessage = (err as Error).message || 'Failed to submit feedback'
+            logger.error(`feedback failed: "${message.sentiment}": ${errorMessage}`)
+
+            telemetry.feedback_result.emit({ result: 'Failed' })
+
+            return errorMessage
+        }
+
+        logger.info(`feedback sent: "${message.sentiment}"`)
+
+        telemetry.feedback_result.emit({ result: 'Succeeded' })
+
+        this.dispose()
+
+        void vscode.window.showInformationMessage(
+            localize('AWS.message.info.submitFeedback.success', 'Thanks for the feedback!')
+        )
+    }
+}
+
+type FeedbackId = 'AWS Toolkit' | 'Amazon Q' | 'Infrastructure Composer' | 'Threat Composer' | 'Workflow Studio'
+
+let _submitFeedback:
+    | RegisteredCommand<(_: VsCodeCommandArg, id: FeedbackId, commentData?: string) => Promise<void>>
+    | undefined
+
+/**
+ * @param id Feedback name
+ * @param commentData Arbitrary caller-defined data appended to the comment when sending the
+ * feedback request.
+ */
+export function submitFeedback(_: VsCodeCommandArg, id: FeedbackId, commentData?: string) {
+    if (_submitFeedback === undefined) {
+        getLogger().error(
+            'Attempted to access "submitFeedback" command, but it was never initialized.' +
+                '\nThis should be initialized during extension activation.'
+        )
+        throw new Error(i18n('AWS.amazonq.featureDev.error.submitFeedback'))
+    }
+    return _submitFeedback.execute(_, id, commentData)
+}
+
+export function registerSubmitFeedback(context: vscode.ExtensionContext, defaultId: FeedbackId, contextPrefix: string) {
+    _submitFeedback = Commands.register(
+        { id: `aws.${contextPrefix}.submitFeedback`, autoconnect: false },
+        async (_: VsCodeCommandArg, id: FeedbackId, commentData?: string) => {
+            if (_ !== placeholder) {
+                // No args exist, we must supply them
+                id = defaultId
+            }
+            await showFeedbackView(context, id, commentData)
+        }
+    )
+    getLogger().info(`initialized \'submitFeedback\' command with default feedback id: ${defaultId}`)
+
+    return _submitFeedback
+}
+
+let activeWebview: VueWebviewPanel | undefined
+
+export async function showFeedbackView(context: vscode.ExtensionContext, feedbackName: string, commentData?: string) {
+    const Panel = VueWebview.compilePanel(FeedbackWebview)
+    activeWebview ??= new Panel(context, globals.telemetry, feedbackName, commentData)
+
+    const webviewPanel = await activeWebview.show({
+        title: localize('AWS.submitFeedback.title', 'Send Feedback'),
+        cssFiles: ['submitFeedback.css'],
+    })
+
+    webviewPanel.onDidDispose(() => (activeWebview = undefined))
+}
diff --git a/packages/core/src/feedback/vue/submitFeedback.vue b/packages/core/src/feedback/vue/submitFeedback.vue
new file mode 100644
index 00000000000..b97233ba494
--- /dev/null
+++ b/packages/core/src/feedback/vue/submitFeedback.vue
@@ -0,0 +1,132 @@
+/*! * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */
+
+<template>
+    <div>
+        <div class="container button-container" style="justify-content: space-between">
+            <h1>Feedback for {{ feedbackName }}</h1>
+            <div id="error" v-if="error !== ''" style="margin-right: 10px">
+                <strong>{{ error }}</strong>
+            </div>
+            <div>
+                <input v-if="isSubmitting" type="submit" value="Submitting..." disabled />
+                <input v-else type="submit" @click="submitFeedback" :disabled="comment.length > 2000" value="Send" />
+            </div>
+        </div>
+
+        <h3 id="sentiment-heading">How was your experience?</h3>
+        <div>
+            <input id="positive-sentiment" type="radio" value="Positive" v-model="sentiment" />
+            <label for="positive-sentiment"></label>
+            <input id="negative-sentiment" type="radio" value="Negative" v-model="sentiment" />
+            <label for="negative-sentiment"></label>
+        </div>
+
+        <h3 id="feedback-heading">Feedback</h3>
+
+        <div>
+            <div>
+                <div style="margin-bottom: 10px">
+                    <div>
+                        <em
+                            >Feedback is <b>anonymous</b>. If you need a reply,
+                            <a href="https://github.com/aws/aws-toolkit-vscode/issues/new/choose"
+                                >contact us on GitHub</a
+                            >.</em
+                        >
+                    </div>
+                    <div style="margin-top: 10px">
+                        <em>For helpful feedback, please include:</em>
+                        <ul style="margin-top: 5px; margin-bottom: 5px">
+                            <li>
+                                <em><strong>Issue:</strong> A brief summary of the issue or suggestion</em>
+                            </li>
+                            <li>
+                                <em
+                                    ><strong>Reproduction Steps:</strong> Clear steps to reproduce the issue (if
+                                    applicable)</em
+                                >
+                            </li>
+                            <li>
+                                <em
+                                    ><strong>Expected vs. Actual:</strong> What you expected and what actually
+                                    happened</em
+                                >
+                            </li>
+                        </ul>
+                    </div>
+                    <br />
+                    <div>
+                        <em>
+                            Don't add personally identifiable information (PII), confidential or sensitive information
+                            in your feedback. Please remove any PII when sharing file paths, error messages, etc.
+                        </em>
+                        <div
+                            style="float: right; font-size: smaller"
+                            id="remaining"
+                            :class="comment.length > 2000 ? 'exceeds-max-length' : ''"
+                        >
+                            {{ 2000 - comment.length }} characters remaining
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <textarea style="width: 100%; margin-bottom: 10px" rows="10" cols="90" v-model="comment"></textarea>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue'
+import { WebviewClientFactory } from '../../webviews/client'
+import saveData from '../../webviews/mixins/saveData'
+import { FeedbackWebview } from './submitFeedback'
+
+const client = WebviewClientFactory.create<FeedbackWebview>()
+
+export default defineComponent({
+    data() {
+        return {
+            comment: `Issue:
+
+Reproduction Steps:
+1. 
+2. 
+3. 
+
+Expected Behavior: 
+
+Actual Behavior: `,
+            sentiment: '',
+            isSubmitting: false,
+            error: '',
+            feedbackName: '',
+        }
+    },
+    created() {
+        this.getName()
+    },
+    methods: {
+        async submitFeedback() {
+            this.error = ''
+            this.isSubmitting = true
+            console.log('Submitting feedback...')
+            // identifier to help us (internally) know that feedback came from either Amazon Q or AWS Toolkit
+            // TODO: rework this and align with JetBrains?
+            const resp = await client.submit({
+                comment: this.feedbackName ? `${this.feedbackName} ${this.comment}` : this.comment,
+                sentiment: this.sentiment,
+            })
+
+            this.error = resp ?? ''
+            this.isSubmitting = false
+        },
+        async getName() {
+            const fbName = await client.getFeedbackName()
+            if (typeof fbName === 'string') {
+                this.feedbackName = fbName
+            }
+        },
+    },
+    mixins: [saveData],
+})
+</script>
diff --git a/packages/core/src/lambda/activation.ts b/packages/core/src/lambda/activation.ts
new file mode 100644
index 00000000000..9b010eceff8
--- /dev/null
+++ b/packages/core/src/lambda/activation.ts
@@ -0,0 +1,279 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as path from 'path'
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+
+import { FunctionConfiguration } from '@aws-sdk/client-lambda'
+import { deleteLambda } from './commands/deleteLambda'
+import { uploadLambdaCommand } from './commands/uploadLambda'
+import { LambdaFunctionNode } from './explorer/lambdaFunctionNode'
+import { downloadLambdaCommand, openLambdaFile } from './commands/downloadLambda'
+import { tryRemoveFolder } from '../shared/filesystemUtilities'
+import { invokeRemoteLambda } from './vue/remoteInvoke/invokeLambda'
+import { registerSamDebugInvokeVueCommand, registerSamInvokeVueCommand } from './vue/configEditor/samInvokeBackend'
+import { Commands } from '../shared/vscode/commands2'
+import { DefaultLambdaClient } from '../shared/clients/lambdaClient'
+import { copyLambdaUrl } from './commands/copyLambdaUrl'
+import { generateLambdaNodeFromResource, ResourceNode } from '../awsService/appBuilder/explorer/nodes/resourceNode'
+import { isTreeNode, TreeNode } from '../shared/treeview/resourceTreeDataProvider'
+import { getSourceNode } from '../shared/utilities/treeNodeUtils'
+import { tailLogGroup } from '../awsService/cloudWatchLogs/commands/tailLogGroup'
+import { liveTailRegistry, liveTailCodeLensProvider } from '../awsService/cloudWatchLogs/activation'
+import { getFunctionLogGroupName } from '../awsService/cloudWatchLogs/activation'
+import { ToolkitError, isError } from '../shared/errors'
+import { LogStreamFilterResponse } from '../awsService/cloudWatchLogs/wizard/liveTailLogStreamSubmenu'
+import { tempDirPath } from '../shared/filesystemUtilities'
+import fs from '../shared/fs/fs'
+import {
+    confirmOutdatedChanges,
+    deleteFilesInFolder,
+    deployFromTemp,
+    getReadme,
+    openLambdaFolderForEdit,
+    watchForUpdates,
+} from './commands/editLambda'
+import { compareCodeSha, getFunctionInfo, getTempLocation, setFunctionInfo } from './utils'
+import { registerLambdaUriHandler } from './uriHandlers'
+import globals from '../shared/extensionGlobals'
+
+const localize = nls.loadMessageBundle()
+import { activateRemoteDebugging } from './remoteDebugging/ldkController'
+import { ExtContext } from '../shared/extensions'
+
+async function openReadme() {
+    const readmeUri = vscode.Uri.file(await getReadme())
+    // We only want to do it if there's not a readme already
+    const isPreviewOpen = vscode.window.tabGroups.all.some((group) =>
+        group.tabs.some((tab) => tab.label.includes('README'))
+    )
+    if (!isPreviewOpen) {
+        await vscode.commands.executeCommand('markdown.showPreviewToSide', readmeUri)
+    }
+}
+
+async function quickEditActivation() {
+    if (vscode.workspace.workspaceFolders) {
+        for (const workspaceFolder of vscode.workspace.workspaceFolders) {
+            // Making the comparison case insensitive because Windows can have `C\` or `c\`
+            const workspacePath = workspaceFolder.uri.fsPath.toLowerCase()
+            const tempPath = path.join(tempDirPath, 'lambda').toLowerCase()
+            if (workspacePath.includes(tempPath)) {
+                const name = path.basename(workspaceFolder.uri.fsPath)
+                const region = path.basename(path.dirname(workspaceFolder.uri.fsPath))
+
+                const lambda = { name, region, configuration: undefined }
+
+                watchForUpdates(lambda, vscode.Uri.file(workspacePath))
+
+                await openReadme()
+
+                // Open handler function
+                try {
+                    const handler = await getFunctionInfo(lambda, 'handlerFile')
+                    const lambdaLocation = path.join(workspacePath, handler)
+                    await openLambdaFile(lambdaLocation, vscode.ViewColumn.One)
+                } catch (e) {
+                    void vscode.window.showWarningMessage(
+                        localize('AWS.lambda.openFile.failure', `Failed to determine handler location: ${e}`)
+                    )
+                }
+
+                // Check if there are changes that need overwritten
+                try {
+                    // Checking if there are changes that need to be overwritten
+                    const prompt = localize(
+                        'AWS.lambda.download.confirmOutdatedSync',
+                        'There are changes to your function in the cloud since you last edited locally, do you want to overwrite your local changes?'
+                    )
+
+                    // Adding delay to give the authentication time to catch up
+                    await new Promise((resolve) => globals.clock.setTimeout(resolve, 1000))
+
+                    const overwriteChanges = !(await compareCodeSha(lambda))
+                        ? await confirmOutdatedChanges(prompt)
+                        : false
+                    if (overwriteChanges) {
+                        // Close all open tabs from this workspace
+                        const workspaceUri = vscode.Uri.file(workspacePath)
+                        for (const tabGroup of vscode.window.tabGroups.all) {
+                            const tabsToClose = tabGroup.tabs.filter(
+                                (tab) =>
+                                    tab.input instanceof vscode.TabInputText &&
+                                    tab.input.uri.fsPath.startsWith(workspaceUri.fsPath)
+                            )
+                            if (tabsToClose.length > 0) {
+                                await vscode.window.tabGroups.close(tabsToClose)
+                            }
+                        }
+
+                        // Delete all files in the directory
+                        await deleteFilesInFolder(workspacePath)
+
+                        // Show message to user about next steps
+                        void vscode.window.showInformationMessage(
+                            localize(
+                                'AWS.lambda.refresh.complete',
+                                'Local workspace cleared. Navigate to the Toolkit explorer to get fresh code from the cloud.'
+                            )
+                        )
+
+                        await setFunctionInfo(lambda, { undeployed: false })
+
+                        // Remove workspace folder
+                        const workspaceIndex = vscode.workspace.workspaceFolders?.findIndex(
+                            (folder) => folder.uri.fsPath.toLowerCase() === workspacePath
+                        )
+                        if (workspaceIndex !== undefined && workspaceIndex >= 0) {
+                            vscode.workspace.updateWorkspaceFolders(workspaceIndex, 1)
+                        }
+                    }
+                } catch (e) {
+                    void vscode.window.showWarningMessage(
+                        localize(
+                            'AWS.lambda.pull.failure',
+                            `Failed to pull latest changes from the cloud, you can still edit locally: ${e}`
+                        )
+                    )
+                }
+            }
+        }
+    }
+}
+
+/**
+ * Activates Lambda components.
+ */
+export async function activate(context: ExtContext): Promise<void> {
+    void quickEditActivation()
+
+    context.extensionContext.subscriptions.push(
+        Commands.register('aws.deleteLambda', async (node: LambdaFunctionNode | TreeNode) => {
+            const sourceNode = getSourceNode<LambdaFunctionNode>(node)
+            await deleteLambda(sourceNode.configuration, new DefaultLambdaClient(sourceNode.regionCode))
+            await vscode.commands.executeCommand('aws.refreshAwsExplorerNode', sourceNode.parent)
+        }),
+        Commands.register('aws.invokeLambda', async (node: LambdaFunctionNode | TreeNode) => {
+            let source: string = 'AwsExplorerRemoteInvoke'
+            if (isTreeNode(node)) {
+                // if appbuilder, create lambda node on the fly
+                let tmpNode: LambdaFunctionNode | undefined = getSourceNode<LambdaFunctionNode>(node)
+                if (!tmpNode) {
+                    // failed to extract, meaning this is appbuilder function node
+                    tmpNode = await generateLambdaNodeFromResource(node.resource as any)
+                }
+                node = tmpNode
+                source = 'AppBuilderRemoteInvoke'
+            }
+            await invokeRemoteLambda(context, {
+                outputChannel: context.outputChannel,
+                functionNode: node,
+                source: source,
+            })
+        }),
+
+        // Capture debug finished events, and delete the temporary directory if it exists
+        vscode.debug.onDidTerminateDebugSession(async (session) => {
+            if (
+                session.configuration?.sam?.buildDir === undefined &&
+                session.configuration?.baseBuildDir !== undefined
+            ) {
+                await tryRemoveFolder(session.configuration.baseBuildDir)
+            }
+        }),
+
+        Commands.register('aws.downloadLambda', async (node: LambdaFunctionNode | TreeNode) => {
+            const sourceNode = getSourceNode<LambdaFunctionNode>(node)
+            await downloadLambdaCommand(sourceNode)
+        }),
+
+        Commands.register({ id: 'aws.uploadLambda', autoconnect: true }, async (arg?: unknown) => {
+            if (arg instanceof LambdaFunctionNode) {
+                await uploadLambdaCommand({
+                    name: arg.functionName,
+                    region: arg.regionCode,
+                    configuration: arg.configuration,
+                })
+            } else if (arg instanceof vscode.Uri) {
+                await uploadLambdaCommand(undefined, arg)
+            } else {
+                await uploadLambdaCommand()
+            }
+        }),
+
+        Commands.register({ id: 'aws.quickDeployLambda' }, async (node: LambdaFunctionNode) => {
+            const functionName = node.configuration.FunctionName!
+            const region = node.regionCode
+            const lambda = { name: functionName, region, configuration: node.configuration }
+            const tempLocation = getTempLocation(functionName, region)
+
+            if (await fs.existsDir(tempLocation)) {
+                await deployFromTemp(lambda, vscode.Uri.file(tempLocation))
+            }
+        }),
+
+        Commands.register('aws.openLambdaFile', async (path: string) => {
+            await openLambdaFile(path)
+        }),
+
+        Commands.register('aws.lambda.openWorkspace', async (node: LambdaFunctionNode) => {
+            await openLambdaFolderForEdit(node.functionName, node.regionCode)
+        }),
+
+        Commands.register('aws.copyLambdaUrl', async (node: LambdaFunctionNode | TreeNode) => {
+            const sourceNode = getSourceNode<LambdaFunctionNode>(node)
+            await copyLambdaUrl(sourceNode, new DefaultLambdaClient(sourceNode.regionCode))
+        }),
+
+        registerSamInvokeVueCommand(context.extensionContext),
+
+        Commands.register('aws.launchDebugConfigForm', async (node: ResourceNode) =>
+            registerSamDebugInvokeVueCommand(context.extensionContext, { resource: node })
+        ),
+
+        Commands.register('aws.appBuilder.tailLogs', async (node: LambdaFunctionNode | TreeNode) => {
+            let functionConfiguration: FunctionConfiguration
+            try {
+                let tmpNode: LambdaFunctionNode | undefined = getSourceNode<LambdaFunctionNode>(node)
+                if (!tmpNode && isTreeNode(node)) {
+                    // failed to extract, meaning this is appbuilder function node
+                    tmpNode = await generateLambdaNodeFromResource(node.resource as any)
+                }
+                functionConfiguration = tmpNode.configuration
+                const logGroupInfo = {
+                    regionName: tmpNode.regionCode,
+                    groupName: getFunctionLogGroupName(functionConfiguration),
+                }
+
+                const source = isTreeNode(node) ? 'AppBuilder' : 'AwsExplorerLambdaNode'
+                // Show all log streams without having to choose
+                const logStreamFilterData: LogStreamFilterResponse = { type: 'all' }
+                await tailLogGroup(
+                    liveTailRegistry,
+                    source,
+                    liveTailCodeLensProvider,
+                    logGroupInfo,
+                    logStreamFilterData
+                )
+            } catch (err) {
+                if (isError(err as Error, 'ResourceNotFoundException', "LogGroup doesn't exist.")) {
+                    // If we caught this error, then we know `functionConfiguration` actually has a value
+                    throw ToolkitError.chain(
+                        err,
+                        `Unable to fetch logs. Log group for function '${functionConfiguration!.FunctionName}' does not exist. ` +
+                            'Invoking your function at least once will create the log group.'
+                    )
+                } else {
+                    throw err
+                }
+            }
+        }),
+
+        registerLambdaUriHandler()
+    )
+
+    void activateRemoteDebugging()
+}
diff --git a/packages/core/src/lambda/commands/copyLambdaUrl.ts b/packages/core/src/lambda/commands/copyLambdaUrl.ts
new file mode 100644
index 00000000000..835525d0610
--- /dev/null
+++ b/packages/core/src/lambda/commands/copyLambdaUrl.ts
@@ -0,0 +1,59 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { DefaultLambdaClient, LambdaClient } from '../../shared/clients/lambdaClient'
+import { LambdaFunctionNode } from '../explorer/lambdaFunctionNode'
+import { copyToClipboard } from '../../shared/utilities/messages'
+import { addCodiconToString } from '../../shared/utilities/textUtilities'
+import { createQuickPick, QuickPickPrompter } from '../../shared/ui/pickerPrompter'
+import { isValidResponse } from '../../shared/wizards/wizard'
+import { FunctionUrlConfig } from '@aws-sdk/client-lambda'
+import { CancellationError } from '../../shared/utilities/timeoutUtils'
+import { lambdaFunctionUrlConfigUrl } from '../../shared/constants'
+
+export const noLambdaFuncMessage = `No URL for Lambda function. [How to create URL.](${lambdaFunctionUrlConfigUrl})`
+
+export async function copyLambdaUrl(
+    node: Pick<LambdaFunctionNode, 'name' | 'regionCode'>,
+    client: LambdaClient = new DefaultLambdaClient(node.regionCode),
+    quickPickUrl = _quickPickUrl
+): Promise<void> {
+    const configs = await client.getFunctionUrlConfigs(node.name)
+
+    if (configs.length === 0) {
+        void vscode.window.showWarningMessage(noLambdaFuncMessage)
+        vscode.window.setStatusBarMessage(addCodiconToString('circle-slash', 'No URL for Lambda function.'), 5000)
+    } else {
+        let url: string | undefined = undefined
+        if (configs.length > 1) {
+            url = await quickPickUrl(configs)
+        } else {
+            url = configs[0].FunctionUrl
+        }
+
+        if (url) {
+            await copyToClipboard(url, 'URL')
+        }
+    }
+}
+
+async function _quickPickUrl(configList: FunctionUrlConfig[]): Promise<string | undefined> {
+    const res = await createLambdaFuncUrlPrompter(configList).prompt()
+    if (!isValidResponse(res)) {
+        throw new CancellationError('user')
+    }
+    return res
+}
+
+export function createLambdaFuncUrlPrompter(configList: FunctionUrlConfig[]): QuickPickPrompter<string> {
+    const items = configList
+        .filter((c) => c.FunctionArn && c.FunctionUrl)
+        .map((c) => ({
+            label: c.FunctionArn!,
+            data: c.FunctionUrl!,
+        }))
+    return createQuickPick(items, { title: 'Select function to copy url from.' })
+}
diff --git a/src/lambda/commands/createNewSamApp.ts b/packages/core/src/lambda/commands/createNewSamApp.ts
similarity index 88%
rename from src/lambda/commands/createNewSamApp.ts
rename to packages/core/src/lambda/commands/createNewSamApp.ts
index 49efcc04af1..7801976c435 100644
--- a/src/lambda/commands/createNewSamApp.ts
+++ b/packages/core/src/lambda/commands/createNewSamApp.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -22,7 +22,7 @@ import { ActivationReloadState, SamInitState } from '../../shared/activationRelo
 import { AwsContext } from '../../shared/awsContext'
 
 import { fileExists, isInDirectory, readFileAsString } from '../../shared/filesystemUtilities'
-import { getLogger } from '../../shared/logger'
+import { getLogger } from '../../shared/logger/logger'
 import { RegionProvider } from '../../shared/regions/regionProvider'
 import { getSamCliVersion, getSamCliContext, SamCliContext } from '../../shared/sam/cli/samCliContext'
 import { runSamCliInit, SamCliInitArgs } from '../../shared/sam/cli/samCliInit'
@@ -39,15 +39,16 @@ import { isTemplateTargetProperties } from '../../shared/sam/debugger/awsSamDebu
 import { TemplateTargetProperties } from '../../shared/sam/debugger/awsSamDebugConfiguration'
 import { openLaunchJsonFile } from '../../shared/sam/debugger/commands/addSamDebugConfiguration'
 import { waitUntil } from '../../shared/utilities/timeoutUtils'
-import { debugNewSamAppUrl, launchConfigDocUrl } from '../../shared/constants'
-import { getIdeProperties, isCloud9 } from '../../shared/extensionUtilities'
-import { execSync } from 'child_process'
-import { writeFile } from 'fs-extra'
+import { getIdeProperties, getDebugNewSamAppDocUrl, getLaunchConfigDocUrl } from '../../shared/extensionUtilities'
 import { checklogs } from '../../shared/localizedText'
 import globals from '../../shared/extensionGlobals'
 import { telemetry } from '../../shared/telemetry/telemetry'
-import { LambdaArchitecture, Result, Runtime } from '../../shared/telemetry/telemetry'
+import { LambdaArchitecture, Result, Runtime as TelemetryRuntime } from '../../shared/telemetry/telemetry'
+import { Runtime } from '@aws-sdk/client-lambda'
 import { getTelemetryReason, getTelemetryResult } from '../../shared/errors'
+import { openUrl, replaceVscodeVars } from '../../shared/utilities/vsCodeUtils'
+import { fs } from '../../shared/fs/fs'
+import { ChildProcess } from '../../shared/utilities/processUtils'
 
 export const samInitTemplateFiles: string[] = ['template.yaml', 'template.yml']
 export const samInitReadmeFile: string = 'README.TOOLKIT.md'
@@ -62,6 +63,7 @@ export async function resumeCreateNewSamApp(
     let samVersion: string | undefined
     const samInitState: SamInitState | undefined = activationReloadState.getSamInitState()
     try {
+        getLogger().debug('SAM: resumeCreateNewSamApp')
         const templateUri = vscode.Uri.file(samInitState!.template!)
         const readmeUri = vscode.Uri.file(samInitState!.readme!)
         const folder = vscode.workspace.getWorkspaceFolder(templateUri)
@@ -70,7 +72,7 @@ export async function resumeCreateNewSamApp(
             reason = 'error'
             // Should never happen, because `samInitState.path` is only set if
             // `uri` is in the newly-added workspace folder.
-            vscode.window.showErrorMessage(
+            void vscode.window.showErrorMessage(
                 localize(
                     'AWS.samcli.initWizard.source.error.notInWorkspace',
                     "Could not open file '{0}'. If this file exists on disk, try adding it to your workspace.",
@@ -87,7 +89,7 @@ export async function resumeCreateNewSamApp(
             extContext,
             folder,
             templateUri,
-            samInitState?.isImage ? (samInitState?.runtime as Runtime | undefined) : undefined
+            samInitState?.isImage ? samInitState?.runtime : undefined
         )
         const tryOpenReadme = await writeToolkitReadme(readmeUri.fsPath, configs)
         if (tryOpenReadme) {
@@ -98,7 +100,7 @@ export async function resumeCreateNewSamApp(
         reason = 'error'
 
         globals.outputChannel.show(true)
-        getLogger('channel').error(
+        getLogger().error(
             localize('AWS.samcli.initWizard.resume.error', 'Error resuming SAM Application creation. {0}', checklogs())
         )
 
@@ -111,7 +113,7 @@ export async function resumeCreateNewSamApp(
             lambdaArchitecture: arch,
             result: createResult,
             reason: reason,
-            runtime: samInitState?.runtime as Runtime,
+            runtime: samInitState?.runtime as TelemetryRuntime,
             version: samVersion,
         })
     }
@@ -145,7 +147,9 @@ export async function createNewSamApplication(
 
         const credentials = await awsContext.getCredentials()
         samVersion = await getSamCliVersion(samCliContext)
-        const schemaRegions = regionProvider.getRegions().filter(r => regionProvider.isServiceInRegion('schemas', r.id))
+        const schemaRegions = regionProvider
+            .getRegions()
+            .filter((r) => regionProvider.isServiceInRegion('schemas', r.id))
         const defaultRegion = awsContext.getCredentialDefaultRegion()
 
         const config = await new CreateNewSamAppWizard({
@@ -191,7 +195,7 @@ export async function createNewSamApplication(
             initArguments.baseImage = `amazon/${createRuntime}-base`
         } else {
             lambdaPackageType = 'Zip'
-            initArguments.runtime = createRuntime
+            initArguments.runtime! = createRuntime
             // in theory, templates could be provided with image-based lambdas, but that is currently not supported by SAM
             initArguments.template = config.template
         }
@@ -210,7 +214,9 @@ export async function createNewSamApplication(
         // Needs to be done or else gopls won't start
         if (goRuntimes.includes(createRuntime)) {
             try {
-                execSync('go mod tidy', { cwd: path.join(path.dirname(templateUri.fsPath), 'hello-world') })
+                await ChildProcess.run('go', ['mod', 'tidy'], {
+                    spawnOptions: { cwd: path.join(path.dirname(templateUri.fsPath), 'hello-world') },
+                })
             } catch (err) {
                 getLogger().warn(
                     localize(
@@ -231,7 +237,7 @@ export async function createNewSamApplication(
                 destinationDirectory: vscode.Uri.file(destinationDirectory),
             }
             schemaCodeDownloader = createSchemaCodeDownloaderObject(client!, globals.outputChannel)
-            getLogger('channel').info(
+            getLogger().info(
                 localize(
                     'AWS.message.info.schemas.downloadCodeBindings.start',
                     'Downloading code for schema {0}...',
@@ -241,7 +247,7 @@ export async function createNewSamApplication(
 
             await schemaCodeDownloader!.downloadCode(request!)
 
-            vscode.window.showInformationMessage(
+            void vscode.window.showInformationMessage(
                 localize(
                     'AWS.message.info.schemas.downloadCodeBindings.finished',
                     'Downloaded code for schema {0}!',
@@ -270,7 +276,7 @@ export async function createNewSamApplication(
         // Race condition where SAM app is created but template doesn't register in time.
         // Poll for 5 seconds, otherwise direct user to codelens.
         const isTemplateRegistered = await waitUntil(
-            async () => globals.templateRegistry.getRegisteredItem(templateUri),
+            async () => (await globals.templateRegistry).getItem(templateUri),
             {
                 timeout: 5000,
                 interval: 500,
@@ -289,7 +295,10 @@ export async function createNewSamApplication(
             )
             tryOpenReadme = await writeToolkitReadme(readmeUri.fsPath, newLaunchConfigs)
             if (newLaunchConfigs && newLaunchConfigs.length > 0) {
-                showCompletionNotification(config.name, `"${newLaunchConfigs.map(config => config.name).join('", "')}"`)
+                void showCompletionNotification(
+                    config.name,
+                    `"${newLaunchConfigs.map((config) => config.name).join('", "')}"`
+                )
             }
             reason = 'complete'
         } else {
@@ -297,7 +306,7 @@ export async function createNewSamApplication(
             reason = 'fileNotFound'
 
             const helpText = localize('AWS.generic.message.getHelp', 'Get Help...')
-            vscode.window
+            void vscode.window
                 .showWarningMessage(
                     localize(
                         'AWS.samcli.initWizard.launchConfigFail',
@@ -307,9 +316,9 @@ export async function createNewSamApplication(
                     ),
                     helpText
                 )
-                .then(async buttonText => {
+                .then(async (buttonText) => {
                     if (buttonText === helpText) {
-                        vscode.env.openExternal(vscode.Uri.parse(launchConfigDocUrl))
+                        void openUrl(getLaunchConfigDocUrl())
                     }
                 })
         }
@@ -326,7 +335,7 @@ export async function createNewSamApplication(
         reason = getTelemetryReason(err)
 
         globals.outputChannel.show(true)
-        getLogger('channel').error(
+        getLogger().error(
             localize('AWS.samcli.initWizard.general.error', 'Error creating new SAM Application. {0}', checklogs())
         )
 
@@ -340,7 +349,7 @@ export async function createNewSamApplication(
             lambdaArchitecture: initArguments?.architecture,
             result: createResult,
             reason: reason,
-            runtime: createRuntime,
+            runtime: createRuntime as TelemetryRuntime,
             version: samVersion,
         })
     }
@@ -367,7 +376,7 @@ export async function getProjectUri(
             return vscode.Uri.file(cfnTemplatePath)
         }
     }
-    vscode.window.showWarningMessage(
+    void vscode.window.showWarningMessage(
         localize(
             'AWS.samcli.initWizard.source.error.notFound',
             'Project created successfully, but {0} file not found: {1}',
@@ -392,10 +401,9 @@ export async function addInitialLaunchConfiguration(
     if (configurations) {
         // add configurations that target the new template file
         const targetDir: string = path.dirname(targetUri.fsPath)
-        const filtered = configurations.filter(config => {
+        const filtered = configurations.filter((config) => {
             let templatePath: string = (config.invokeTarget as TemplateTargetProperties).templatePath
-            // TODO: write utility function that does this for other variables too
-            templatePath = templatePath.replace('${workspaceFolder}', folder.uri.fsPath)
+            templatePath = replaceVscodeVars(templatePath, folder.uri.fsPath)
 
             return (
                 isTemplateTargetProperties(config.invokeTarget) &&
@@ -405,12 +413,12 @@ export async function addInitialLaunchConfiguration(
 
         // optional for ZIP-lambdas but required for Image-lambdas
         if (runtime !== undefined) {
-            filtered.forEach(configuration => {
+            for (const configuration of filtered) {
                 if (!configuration.lambda) {
                     configuration.lambda = {}
                 }
                 configuration.lambda.runtime = runtime
-            })
+            }
         }
 
         await launchConfiguration.addDebugConfigurations(filtered)
@@ -435,7 +443,7 @@ async function showCompletionNotification(appName: string, configs: string): Pro
     if (action === openJson) {
         await openLaunchJsonFile()
     } else if (action === learnMore) {
-        vscode.env.openExternal(vscode.Uri.parse(debugNewSamAppUrl))
+        void openUrl(getDebugNewSamAppDocUrl())
     }
 }
 
@@ -461,12 +469,10 @@ export async function writeToolkitReadme(
             .replace(/\$\{LISTOFCONFIGURATIONS\}/g, configString)
             .replace(
                 /\$\{DOCURL\}/g,
-                isCloud9()
-                    ? 'https://docs.aws.amazon.com/cloud9/latest/user-guide/serverless-apps-toolkit.html'
-                    : 'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/serverless-apps.html'
+                'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/serverless-apps.html'
             )
 
-        await writeFile(readmeLocation, readme)
+        await fs.writeFile(readmeLocation, readme)
         getLogger().debug(`writeToolkitReadme: wrote file: %O`, readmeLocation)
 
         return true
diff --git a/packages/core/src/lambda/commands/deleteCloudFormation.ts b/packages/core/src/lambda/commands/deleteCloudFormation.ts
new file mode 100644
index 00000000000..035e7110c86
--- /dev/null
+++ b/packages/core/src/lambda/commands/deleteCloudFormation.ts
@@ -0,0 +1,73 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as vscode from 'vscode'
+import { CloudFormationClient } from '../../shared/clients/cloudFormation'
+
+import * as localizedText from '../../shared/localizedText'
+import { getLogger, Logger } from '../../shared/logger/logger'
+import { Result } from '../../shared/telemetry/telemetry'
+import { CloudFormationStackNode } from '../explorer/cloudFormationNodes'
+import { showConfirmationMessage } from '../../shared/utilities/messages'
+import { getIdeProperties } from '../../shared/extensionUtilities'
+import { telemetry } from '../../shared/telemetry/telemetry'
+
+export async function deleteCloudFormation(refresh: () => void, node?: CloudFormationStackNode) {
+    const logger: Logger = getLogger()
+    let deleteResult: Result = 'Succeeded'
+    const stackName = node?.stackName ?? ''
+    try {
+        if (!node) {
+            deleteResult = 'Failed'
+            void vscode.window.showErrorMessage(
+                localize(
+                    'AWS.message.error.cloudFormation.unsupported',
+                    'Unable to delete a CloudFormation Stack. No stack provided.'
+                )
+            )
+
+            return
+        }
+
+        const userResponse = await showConfirmationMessage({
+            prompt: localize(
+                'AWS.message.prompt.deleteCloudFormation',
+                'Are you sure you want to delete {0}?',
+                stackName
+            ),
+            confirm: localizedText.localizedDelete,
+            cancel: localizedText.cancel,
+        })
+
+        if (userResponse) {
+            const client = new CloudFormationClient(node.regionCode)
+
+            await client.deleteStack(stackName)
+
+            void vscode.window.showInformationMessage(
+                localize('AWS.message.info.cloudFormation.delete', 'Deleted CloudFormation Stack {0}', stackName)
+            )
+
+            refresh()
+        }
+    } catch (err) {
+        deleteResult = 'Failed'
+        logger.error(err as Error)
+
+        void vscode.window.showInformationMessage(
+            localize(
+                'AWS.message.error.cloudFormation.delete',
+                'An error occurred while deleting {0}. Please check the stack events on the {1} Console',
+                stackName,
+                getIdeProperties().company
+            )
+        )
+    } finally {
+        telemetry.cloudformation_delete.emit({ result: deleteResult })
+    }
+}
diff --git a/packages/core/src/lambda/commands/deleteLambda.ts b/packages/core/src/lambda/commands/deleteLambda.ts
new file mode 100644
index 00000000000..c6290eab3c6
--- /dev/null
+++ b/packages/core/src/lambda/commands/deleteLambda.ts
@@ -0,0 +1,62 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as localizedText from '../../shared/localizedText'
+import { DefaultLambdaClient } from '../../shared/clients/lambdaClient'
+import { Result } from '../../shared/telemetry/telemetry'
+import { showConfirmationMessage, showViewLogsMessage } from '../../shared/utilities/messages'
+import { FunctionConfiguration } from '@aws-sdk/client-lambda'
+import { getLogger } from '../../shared/logger/logger'
+import { telemetry } from '../../shared/telemetry/telemetry'
+
+async function confirmDeletion(functionName: string): Promise<boolean> {
+    return showConfirmationMessage({
+        prompt: localize(
+            'AWS.command.deleteLambda.confirm',
+            "Are you sure you want to delete lambda function '{0}'?",
+            functionName
+        ),
+        confirm: localizedText.localizedDelete,
+        cancel: localizedText.cancel,
+    })
+}
+
+export async function deleteLambda(
+    lambda: Pick<FunctionConfiguration, 'FunctionName'>,
+    client: Pick<DefaultLambdaClient, 'deleteFunction'>
+): Promise<void> {
+    if (!lambda.FunctionName) {
+        telemetry.lambda_delete.emit({ duration: 0, result: 'Failed' })
+
+        throw new TypeError('Lambda does not have a function name')
+    }
+
+    let deleteResult: Result = 'Succeeded'
+
+    try {
+        if (await confirmDeletion(lambda.FunctionName)) {
+            await client.deleteFunction(lambda.FunctionName)
+        } else {
+            deleteResult = 'Cancelled'
+        }
+    } catch (err) {
+        deleteResult = 'Failed'
+        getLogger().error(`Failed to delete lambda function "${lambda.FunctionName}": %s`, err)
+        const message = localize(
+            'AWS.command.deleteLambda.error',
+            "There was an error deleting lambda function '{0}'",
+            lambda.FunctionName
+        )
+
+        void showViewLogsMessage(message)
+    } finally {
+        telemetry.lambda_delete.emit({
+            result: deleteResult,
+        })
+    }
+}
diff --git a/packages/core/src/lambda/commands/downloadLambda.ts b/packages/core/src/lambda/commands/downloadLambda.ts
new file mode 100644
index 00000000000..baf82b5b30c
--- /dev/null
+++ b/packages/core/src/lambda/commands/downloadLambda.ts
@@ -0,0 +1,300 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import AdmZip from 'adm-zip'
+import * as _ from 'lodash'
+import * as path from 'path'
+import * as vscode from 'vscode'
+import { LambdaFunctionNode } from '../explorer/lambdaFunctionNode'
+import { showConfirmationMessage } from '../../shared/utilities/messages'
+import { LaunchConfiguration, getReferencedHandlerPaths } from '../../shared/debug/launchConfiguration'
+
+import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../../shared/filesystemUtilities'
+import * as localizedText from '../../shared/localizedText'
+import { getLogger } from '../../shared/logger/logger'
+import { HttpResourceFetcher } from '../../shared/resourcefetcher/node/httpResourceFetcher'
+import { createCodeAwsSamDebugConfig } from '../../shared/sam/debugger/awsSamDebugConfiguration'
+import * as pathutils from '../../shared/utilities/pathUtils'
+import { localize } from '../../shared/utilities/vsCodeUtils'
+import { addFolderToWorkspace } from '../../shared/utilities/workspaceUtils'
+import { promptUserForLocation, WizardContext } from '../../shared/wizards/multiStepWizard'
+import { getLambdaDetails } from '../utils'
+import { Progress } from 'got/dist/source'
+import { DefaultLambdaClient } from '../../shared/clients/lambdaClient'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { Result, Runtime } from '../../shared/telemetry/telemetry'
+import { fs } from '../../shared/fs/fs'
+import { LambdaFunction } from './uploadLambda'
+import globals from '../../shared/extensionGlobals'
+
+// Workspace state key for Lambda function ARN to local path cache
+const LAMBDA_ARN_CACHE_KEY = 'aws.lambda.functionArnToLocalPathCache' // eslint-disable-line @typescript-eslint/naming-convention
+
+async function setLambdaArnCache(functionArn: string, localPath: string): Promise<void> {
+    try {
+        const cache: Record<string, string> = globals.context.workspaceState.get(LAMBDA_ARN_CACHE_KEY, {})
+        cache[functionArn] = localPath
+        await globals.context.workspaceState.update(LAMBDA_ARN_CACHE_KEY, cache)
+        getLogger().debug(`lambda: cached local path for function ARN: ${functionArn} -> ${localPath}`)
+    } catch (error) {
+        getLogger().error(`lambda: failed to cache local path for function ARN: ${functionArn}`, error)
+    }
+}
+
+export function getCachedLocalPath(functionArn: string): string | undefined {
+    const cache: Record<string, string> = globals.context.workspaceState.get(LAMBDA_ARN_CACHE_KEY, {})
+    return cache[functionArn]
+}
+
+export async function downloadLambdaCommand(functionNode: LambdaFunctionNode) {
+    const result = await runDownloadLambda(functionNode)
+    // check if result is Result
+    if (result instanceof vscode.Uri) {
+        return
+    }
+
+    telemetry.lambda_import.emit({
+        result,
+        runtime: functionNode.configuration.Runtime as Runtime | undefined,
+    })
+}
+
+export async function runDownloadLambda(
+    functionNode: LambdaFunctionNode,
+    returnDir: boolean = false
+): Promise<Result | vscode.Uri> {
+    const workspaceFolders = vscode.workspace.workspaceFolders || []
+    const functionName = functionNode.configuration.FunctionName!
+
+    if (workspaceFolders.length === 0) {
+        void vscode.window.showErrorMessage(
+            localize(
+                'AWS.lambda.download.noWorkspaceFolders',
+                'Open a workspace and add a folder to it before downloading a Lambda function.'
+            )
+        )
+        return 'Cancelled'
+    }
+    const selectedUri = await promptUserForLocation(new WizardContext(), { step: 1, totalSteps: 1 })
+    if (!selectedUri) {
+        return 'Cancelled'
+    }
+
+    const downloadLocation = path.join(selectedUri.fsPath, functionName, path.sep)
+    const downloadLocationName = vscode.workspace.asRelativePath(downloadLocation, true)
+
+    if (await fs.exists(downloadLocation)) {
+        const isConfirmed = await showConfirmationMessage({
+            prompt: localize(
+                'AWS.lambda.download.prompt',
+                'Downloading {0} into: {1}\nExisting directory will be overwritten: {0}\nProceed with download?',
+                functionName,
+                downloadLocationName
+            ),
+            confirm: localize('AWS.lambda.download.download', 'Download'),
+            cancel: localizedText.cancel,
+        })
+
+        if (!isConfirmed) {
+            getLogger().info('DownloadLambda cancelled')
+            return 'Cancelled'
+        }
+
+        // customer accepted, we should make sure the target dir is clean
+        await fs.delete(downloadLocation, { recursive: true })
+    }
+
+    return await downloadLambdaInLocation(
+        { name: functionName, region: functionNode.regionCode, configuration: functionNode.configuration },
+        downloadLocationName,
+        downloadLocation,
+        workspaceFolders,
+        selectedUri,
+        returnDir
+    )
+}
+
+export async function downloadLambdaInLocation(
+    lambda: LambdaFunction,
+    downloadLocationName: string,
+    downloadLocation: string,
+    workspaceFolders?: readonly vscode.WorkspaceFolder[],
+    selectedUri?: vscode.Uri,
+    returnDir: boolean = false
+): Promise<Result | vscode.Uri> {
+    const result = await vscode.window.withProgress<Result>(
+        {
+            location: vscode.ProgressLocation.Notification,
+            cancellable: false,
+            title: localize(
+                'AWS.lambda.download.status',
+                'Downloading Lambda function {0} into {1}...',
+                lambda.name,
+                downloadLocationName
+            ),
+        },
+        async (progress) => {
+            let lambdaLocation: string
+
+            try {
+                await downloadAndUnzipLambda(progress, lambda, downloadLocation)
+                // Cache the mapping of function ARN to downloaded location
+                if (lambda.configuration?.FunctionArn) {
+                    await setLambdaArnCache(lambda.configuration.FunctionArn, downloadLocation)
+                }
+                lambdaLocation = path.join(downloadLocation, getLambdaDetails(lambda.configuration!).fileName)
+                if (!(await fs.exists(lambdaLocation))) {
+                    // if file ext is mjs, change to js or vice versa
+                    const currentExt = path.extname(lambdaLocation)
+                    const alternativeExt = currentExt === '.mjs' ? '.js' : '.mjs'
+                    const alternativePath = lambdaLocation.replace(currentExt, alternativeExt)
+
+                    if (await fs.exists(alternativePath)) {
+                        lambdaLocation = alternativePath
+                    }
+                }
+            } catch (e) {
+                // initial download failed or runtime is unsupported.
+                // show error and return a failure
+                const err = e as Error
+                getLogger().error(err)
+                void vscode.window.showErrorMessage(
+                    localize(
+                        'AWS.lambda.download.downloadError',
+                        'Error downloading Lambda function {0}: {1}',
+                        lambda.configuration!.FunctionArn!,
+                        err.message
+                    )
+                )
+
+                return 'Failed'
+            }
+
+            try {
+                await vscode.commands.executeCommand('workbench.action.focusFirstEditorGroup')
+                await openLambdaFile(lambdaLocation)
+                if (workspaceFolders) {
+                    if (
+                        workspaceFolders.filter((val) => {
+                            return selectedUri === val.uri
+                        }).length === 0
+                    ) {
+                        await addFolderToWorkspace({ uri: selectedUri! }, true)
+                    }
+                    const workspaceFolder = vscode.workspace.getWorkspaceFolder(vscode.Uri.file(downloadLocation))!
+
+                    await addLaunchConfigEntry(lambdaLocation, lambda, workspaceFolder)
+                }
+                return 'Succeeded'
+            } catch (e) {
+                // failed to open handler file or add launch config.
+                // not a failure since the function is downloaded to a workspace directory.
+                return 'Succeeded'
+            }
+        }
+    )
+
+    if (returnDir) {
+        return vscode.Uri.file(downloadLocation)
+    } else {
+        return result
+    }
+}
+
+async function downloadAndUnzipLambda(
+    progress: vscode.Progress<{
+        message?: string | undefined
+        increment?: number | undefined
+    }>,
+    lambda: LambdaFunction,
+    extractLocation: string,
+    lambdaClient = new DefaultLambdaClient(lambda.region)
+): Promise<void> {
+    const functionArn = lambda.configuration!.FunctionArn!
+    let tempDir: string | undefined
+    try {
+        tempDir = await makeTemporaryToolkitFolder()
+        const downloadLocation = path.join(tempDir, 'function.zip')
+
+        const response = await lambdaClient.getFunction(functionArn)
+        const codeLocation = response.Code!.Location!
+
+        // arbitrary increments since there's no "busy" state for progress bars
+        progress.report({ message: 'Starting download' })
+
+        const fetcher = new HttpResourceFetcher(codeLocation, {
+            showUrl: false,
+            friendlyName: 'Lambda Function .zip file',
+        })
+        const streams = fetcher.get(downloadLocation)
+
+        let last: number = 0
+        streams.requestStream.on('downloadProgress', (p: Progress) => {
+            // I think these are bytes...
+            const message = p.total ? `Downloading ${p.transferred}/${p.total} bytes` : 'Downloading...'
+            const increment = p.total ? ((p.transferred - last) / p.total) * 100 : 0
+            last = p.transferred
+            progress.report({ message, increment })
+        })
+
+        await streams
+        progress.report({ message: 'Extracting...' })
+        new AdmZip(downloadLocation).extractAllTo(extractLocation, true)
+    } finally {
+        await tryRemoveFolder(tempDir)
+    }
+}
+
+export async function openLambdaFile(lambdaLocation: string, viewColumn?: vscode.ViewColumn): Promise<void> {
+    if (!(await fs.exists(lambdaLocation))) {
+        const warning = localize(
+            'AWS.lambda.download.fileNotFound',
+            'Handler file {0} not found in downloaded function.',
+            lambdaLocation
+        )
+        getLogger().warn(warning)
+        void vscode.window.showWarningMessage(warning)
+        throw new Error()
+    }
+    await vscode.commands.executeCommand('workbench.action.focusFirstEditorGroup')
+    const doc = await vscode.workspace.openTextDocument(vscode.Uri.file(lambdaLocation))
+    await vscode.window.showTextDocument(doc, viewColumn)
+}
+
+async function addLaunchConfigEntry(
+    lambdaLocation: string,
+    lambda: LambdaFunction,
+    workspaceFolder: vscode.WorkspaceFolder
+): Promise<void> {
+    const handler = lambda.configuration!.Handler!
+
+    const samDebugConfig = createCodeAwsSamDebugConfig(
+        workspaceFolder,
+        handler,
+        computeLambdaRoot(lambdaLocation, lambda),
+        lambda.configuration!.Runtime!
+    )
+
+    const launchConfig = new LaunchConfiguration(vscode.Uri.file(lambdaLocation))
+    const refPaths = await getReferencedHandlerPaths(launchConfig)
+    if (!refPaths.has(pathutils.normalize(path.join(path.dirname(lambdaLocation), handler)))) {
+        await launchConfig.addDebugConfiguration(samDebugConfig)
+    }
+}
+
+/**
+ * Computes the Lambda root.
+ * We cannot assume that the Lambda root is the dirname since CodeUri is not a required field (can be merged with handler)
+ * @param lambdaLocation Lambda handler file location
+ * @param functionNode Function node
+ */
+function computeLambdaRoot(lambdaLocation: string, lambda: LambdaFunction): string {
+    const lambdaDetails = getLambdaDetails(lambda.configuration!)
+    const normalizedLocation = pathutils.normalize(lambdaLocation)
+
+    const lambdaIndex = normalizedLocation.indexOf(`/${lambdaDetails.fileName}`)
+
+    return lambdaIndex > -1 ? normalizedLocation.slice(0, lambdaIndex) : path.dirname(normalizedLocation)
+}
diff --git a/packages/core/src/lambda/commands/editLambda.ts b/packages/core/src/lambda/commands/editLambda.ts
new file mode 100644
index 00000000000..5ea8169d280
--- /dev/null
+++ b/packages/core/src/lambda/commands/editLambda.ts
@@ -0,0 +1,285 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+import { LambdaFunctionNode } from '../explorer/lambdaFunctionNode'
+import { downloadLambdaInLocation, openLambdaFile } from './downloadLambda'
+import { LambdaFunction, runUploadDirectory } from './uploadLambda'
+import {
+    compareCodeSha,
+    getFunctionInfo,
+    getLambdaDetails,
+    getTempLocation,
+    lambdaTempPath,
+    setFunctionInfo,
+} from '../utils'
+import { showConfirmationMessage } from '../../shared/utilities/messages'
+import fs from '../../shared/fs/fs'
+import globals from '../../shared/extensionGlobals'
+import { LambdaFunctionNodeDecorationProvider } from '../explorer/lambdaFunctionNodeDecorationProvider'
+import path from 'path'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { ToolkitError } from '../../shared/errors'
+import { getFunctionWithCredentials } from '../../shared/clients/lambdaClient'
+import { getLogger } from '../../shared/logger/logger'
+
+const localize = nls.loadMessageBundle()
+
+let lastPromptTime = Date.now() - 5000
+
+export function watchForUpdates(lambda: LambdaFunction, projectUri: vscode.Uri): void {
+    const watcher = vscode.workspace.createFileSystemWatcher(new vscode.RelativePattern(projectUri, '*'))
+    const startTime = globals.clock.Date.now()
+
+    watcher.onDidChange(async (fileUri) => {
+        await promptForSync(lambda, projectUri, fileUri)
+    })
+
+    watcher.onDidCreate(async (fileUri) => {
+        // When the code is downloaded and the watcher is set, this will immediately trigger the onDidCreate
+        // To avoid this, we must check that the file was actually created AFTER the watcher was created
+        if ((await fs.stat(fileUri.fsPath)).ctime < startTime) {
+            return
+        }
+        await promptForSync(lambda, projectUri, fileUri)
+    })
+
+    watcher.onDidDelete(async (fileUri) => {
+        // We don't want to sync if the whole directory has been deleted or emptied
+        if (fileUri.fsPath !== projectUri.fsPath) {
+            // Check if directory is empty before prompting for sync
+            try {
+                const entries = await fs.readdir(projectUri.fsPath)
+                if (entries.length > 0) {
+                    await promptForSync(lambda, projectUri, fileUri)
+                }
+            } catch (err) {
+                getLogger().debug(`Failed to check Lambda directory contents: ${err}`)
+            }
+        }
+    })
+}
+
+// Creating this function for testing, can't mock the vscode.window in the tests
+export async function promptDeploy() {
+    const confirmItem = localize('AWS.lambda.upload.sync', 'Deploy')
+    const cancelItem = localize('AWS.lambda.upload.noSync', 'No, thanks')
+    const response = await vscode.window.showInformationMessage(
+        localize('AWS.lambda.upload.confirmSync', 'Would you like to deploy these changes to the cloud?'),
+        confirmItem,
+        cancelItem
+    )
+    return response === confirmItem
+}
+
+export async function promptForSync(lambda: LambdaFunction, projectUri: vscode.Uri, fileUri: vscode.Uri) {
+    if (!(await fs.existsDir(projectUri.fsPath)) || globals.clock.Date.now() - lastPromptTime < 5000) {
+        return
+    }
+
+    await setFunctionInfo(lambda, {
+        undeployed: true,
+    })
+
+    await LambdaFunctionNodeDecorationProvider.getInstance().addBadge(
+        fileUri,
+        vscode.Uri.from({ scheme: 'lambda', path: `${lambda.region}/${lambda.name}` })
+    )
+
+    lastPromptTime = globals.clock.Date.now()
+    if (await promptDeploy()) {
+        await deployFromTemp(lambda, projectUri)
+    }
+}
+
+export async function confirmOutdatedChanges(prompt: string): Promise<boolean> {
+    return await showConfirmationMessage({
+        prompt,
+        confirm: localize('AWS.lambda.upload.overwrite', 'Overwrite'),
+        cancel: localize('AWS.lambda.upload.noOverwrite', 'Cancel'),
+    })
+}
+
+export async function deployFromTemp(lambda: LambdaFunction, projectUri: vscode.Uri) {
+    return telemetry.lambda_quickDeploy.run(async () => {
+        const prompt = localize(
+            'AWS.lambda.upload.confirmOutdatedSync',
+            'There are changes to your Function in the cloud after you created this local copy, overwrite anyway?'
+        )
+
+        const isShaDifferent = !(await compareCodeSha(lambda))
+        const overwriteChanges = isShaDifferent ? await confirmOutdatedChanges(prompt) : true
+
+        if (overwriteChanges) {
+            // Reset the lastPrompt time because we don't want to retrigger the watcher flow
+            lastPromptTime = globals.clock.Date.now()
+            await vscode.workspace.saveAll()
+            try {
+                await runUploadDirectory(lambda, 'zip', projectUri)
+            } catch {
+                throw new ToolkitError('Failed to deploy Lambda function', { code: 'deployFailure' })
+            }
+            await setFunctionInfo(lambda, {
+                lastDeployed: globals.clock.Date.now(),
+                undeployed: false,
+            })
+            await LambdaFunctionNodeDecorationProvider.getInstance().removeBadge(
+                projectUri,
+                vscode.Uri.from({ scheme: 'lambda', path: `${lambda.region}/${lambda.name}` })
+            )
+            if (isShaDifferent) {
+                telemetry.record({ action: 'overwriteChanges' })
+            }
+        } else {
+            telemetry.record({ action: 'cancelOverwrite' })
+        }
+    })
+}
+
+export async function deleteFilesInFolder(location: string) {
+    const entries = await fs.readdir(location)
+    await Promise.all(
+        entries.map((entry) => fs.delete(path.join(location, entry[0]), { recursive: true, force: true }))
+    )
+}
+
+export async function editLambdaCommand(functionNode: LambdaFunctionNode) {
+    const region = functionNode.regionCode
+    const functionName = functionNode.configuration.FunctionName!
+    return await editLambda({ name: functionName, region, configuration: functionNode.configuration }, 'explorer')
+}
+
+export async function overwriteChangesForEdit(lambda: LambdaFunction, downloadLocation: string) {
+    try {
+        // Clear directory contents instead of deleting to avoid Windows EBUSY errors
+        if (await fs.existsDir(downloadLocation)) {
+            await deleteFilesInFolder(downloadLocation)
+        } else {
+            await fs.mkdir(downloadLocation)
+        }
+
+        await downloadLambdaInLocation(lambda, 'local', downloadLocation)
+
+        // Watching for updates, then setting info, then removing the badges must be done in this order
+        // This is because the files creating can throw the watcher, which sometimes leads to changes being marked as undeployed
+        watchForUpdates(lambda, vscode.Uri.file(downloadLocation))
+
+        await setFunctionInfo(lambda, {
+            lastDeployed: globals.clock.Date.now(),
+            undeployed: false,
+            sha: lambda.configuration!.CodeSha256,
+            handlerFile: getLambdaDetails(lambda.configuration!).fileName,
+        })
+        await LambdaFunctionNodeDecorationProvider.getInstance().removeBadge(
+            vscode.Uri.file(downloadLocation),
+            vscode.Uri.from({ scheme: 'lambda', path: `${lambda.region}/${lambda.name}` })
+        )
+    } catch {
+        throw new ToolkitError('Failed to download Lambda function', { code: 'failedDownload' })
+    }
+}
+
+export async function editLambda(lambda: LambdaFunction, source?: 'workspace' | 'explorer') {
+    return await telemetry.lambda_quickEditFunction.run(async () => {
+        telemetry.record({ source })
+        const downloadLocation = getTempLocation(lambda.name, lambda.region)
+
+        // We don't want to do anything if the folder already exists as a workspace folder, it means it's already being edited
+        if (vscode.workspace.workspaceFolders?.some((folder) => folder.uri.fsPath === downloadLocation)) {
+            return downloadLocation
+        }
+
+        const prompt = localize(
+            'AWS.lambda.download.confirmOutdatedSync',
+            'There are changes to your function in the cloud since you last edited locally, do you want to overwrite your local changes?'
+        )
+
+        // We want to overwrite changes in the following cases:
+        // 1. There is no code sha locally (getCodeShaLocal returns falsy)
+        // 2. There is a code sha locally, it does not match the one remotely, and the user confirms they want to overwrite it
+        const localExists = !!(await getFunctionInfo(lambda, 'sha'))
+        // This record tells us if they're attempting to edit a function they've edited before
+        telemetry.record({ action: localExists ? 'existingEdit' : 'newEdit' })
+
+        const isDirectoryEmpty = (await fs.existsDir(downloadLocation))
+            ? (await fs.readdir(downloadLocation)).length === 0
+            : true
+
+        const overwriteChanges =
+            !localExists ||
+            isDirectoryEmpty ||
+            (!(await compareCodeSha(lambda)) ? await confirmOutdatedChanges(prompt) : false)
+
+        if (overwriteChanges) {
+            await overwriteChangesForEdit(lambda, downloadLocation)
+        } else if (source === 'explorer') {
+            // If the source is the explorer, we want to open, otherwise we just wait to open in the workspace
+            const lambdaLocation = path.join(downloadLocation, getLambdaDetails(lambda.configuration!).fileName)
+            await openLambdaFile(lambdaLocation)
+            watchForUpdates(lambda, vscode.Uri.file(downloadLocation))
+        }
+
+        return downloadLocation
+    })
+}
+
+export async function openLambdaFolderForEdit(name: string, region: string) {
+    const downloadLocation = getTempLocation(name, region)
+
+    // Do all authentication work before opening workspace to avoid race condition
+    const getFunctionOutput = await getFunctionWithCredentials(region, name)
+    const configuration = getFunctionOutput.Configuration
+
+    // Download and set up Lambda code before opening workspace
+    await editLambda(
+        {
+            name,
+            region,
+            configuration: configuration as any,
+        },
+        'workspace'
+    )
+
+    try {
+        await vscode.commands.executeCommand('vscode.openFolder', vscode.Uri.file(downloadLocation), {
+            newWindow: true,
+            noRecentEntry: true,
+        })
+    } catch (e) {
+        throw new ToolkitError(`Failed to open your function as a workspace: ${e}`, { code: 'folderOpenFailure' })
+    }
+}
+
+export async function getReadme(): Promise<string> {
+    const readmeSource = path.join('resources', 'markdown', 'lambdaEdit.md')
+    const readmeDestination = path.join(lambdaTempPath, 'README.md')
+    try {
+        const readmeContent = await fs.readFileText(globals.context.asAbsolutePath(readmeSource))
+        await fs.writeFile(readmeDestination, readmeContent)
+    } catch (e) {
+        getLogger().info(`Failed to copy content for Lambda README: ${e}`)
+    }
+
+    try {
+        const createStackIconSource = path.join('resources', 'icons', 'aws', 'lambda', 'create-stack-light.svg')
+        const createStackIconDestination = path.join(lambdaTempPath, 'create-stack.svg')
+        await fs.copy(globals.context.asAbsolutePath(createStackIconSource), createStackIconDestination)
+
+        // Copy VS Code built-in icons
+        const vscodeIconPath = path.join('resources', 'icons', 'vscode', 'light')
+
+        const invokeIconSource = path.join(vscodeIconPath, 'run.svg')
+        const invokeIconDestination = path.join(lambdaTempPath, 'invoke.svg')
+        await fs.copy(globals.context.asAbsolutePath(invokeIconSource), invokeIconDestination)
+
+        const deployIconSource = path.join(vscodeIconPath, 'cloud-upload.svg')
+        const deployIconDestination = path.join(lambdaTempPath, 'deploy.svg')
+        await fs.copy(globals.context.asAbsolutePath(deployIconSource), deployIconDestination)
+    } catch (e) {
+        getLogger().info(`Failed to copy content for Lambda README: ${e}`)
+    }
+
+    return readmeDestination
+}
diff --git a/packages/core/src/lambda/commands/listSamResources.ts b/packages/core/src/lambda/commands/listSamResources.ts
new file mode 100644
index 00000000000..80d13a1c71b
--- /dev/null
+++ b/packages/core/src/lambda/commands/listSamResources.ts
@@ -0,0 +1,43 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../../shared/logger/logger'
+import { runSamCliListResource } from '../../shared/sam/cli/samCliListResources'
+
+export interface StackResource {
+    LogicalResourceId: string
+    PhysicalResourceId: string
+}
+
+/*
+This function return exclusively the deployed resources
+Newly added but yet-to-be deployed resources are not included in this result
+*/
+export async function getDeployedResources(params: any) {
+    try {
+        const samCliListResourceOutput = await runSamCliListResource(params.listResourcesParams, params.invoker).then(
+            (output) => parseSamListResourceOutput(output)
+        )
+        // Filter out resources that are not deployed
+        return samCliListResourceOutput.filter((resource) => resource.PhysicalResourceId !== '-')
+    } catch (err) {
+        const error = err as Error
+        getLogger().error(error)
+    }
+}
+
+function parseSamListResourceOutput(output: any): StackResource[] {
+    try {
+        if ((Array.isArray(output) && output.length === 0) || '[]' === output) {
+            // Handle if the output is instance or stringify version of an empty array to avoid parsing error
+            return []
+        }
+        return JSON.parse(output) as StackResource[]
+    } catch (error: any) {
+        void vscode.window.showErrorMessage(`Failed to parse SAM CLI output: ${error.message}`)
+        return []
+    }
+}
diff --git a/src/lambda/commands/uploadLambda.ts b/packages/core/src/lambda/commands/uploadLambda.ts
similarity index 81%
rename from src/lambda/commands/uploadLambda.ts
rename to packages/core/src/lambda/commands/uploadLambda.ts
index a465160c45f..98149674587 100644
--- a/src/lambda/commands/uploadLambda.ts
+++ b/packages/core/src/lambda/commands/uploadLambda.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -8,32 +8,26 @@ import * as nls from 'vscode-nls'
 
 const localize = nls.loadMessageBundle()
 
-import * as AdmZip from 'adm-zip'
-import * as fs from 'fs-extra'
+import AdmZip from 'adm-zip'
 import * as path from 'path'
+import { fs } from '../../shared/fs/fs'
 import { showConfirmationMessage, showViewLogsMessage } from '../../shared/utilities/messages'
-import {
-    fileExists,
-    cloud9Findfile,
-    makeTemporaryToolkitFolder,
-    tryRemoveFolder,
-} from '../../shared/filesystemUtilities'
+import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../../shared/filesystemUtilities'
 import * as localizedText from '../../shared/localizedText'
-import { getLogger } from '../../shared/logger'
+import { getLogger } from '../../shared/logger/logger'
 import { SamCliBuildInvocation } from '../../shared/sam/cli/samCliBuild'
 import { getSamCliContext } from '../../shared/sam/cli/samCliContext'
 import { SamTemplateGenerator } from '../../shared/templates/sam/samTemplateGenerator'
-import { Window } from '../../shared/vscode/window'
 import { addCodiconToString } from '../../shared/utilities/textUtilities'
 import { getLambdaDetails, listLambdaFunctions } from '../utils'
-import { getIdeProperties, isCloud9 } from '../../shared/extensionUtilities'
+import { getIdeProperties } from '../../shared/extensionUtilities'
 import { createQuickPick, DataQuickPickItem } from '../../shared/ui/pickerPrompter'
 import { createCommonButtons } from '../../shared/ui/buttons'
 import { StepEstimator, Wizard, WIZARD_BACK } from '../../shared/wizards/wizard'
 import { createSingleFileDialog } from '../../shared/ui/common/openDialog'
 import { Prompter, PromptResult } from '../../shared/ui/prompter'
 import { ToolkitError } from '../../shared/errors'
-import { FunctionConfiguration } from 'aws-sdk/clients/lambda'
+import { FunctionConfiguration } from '@aws-sdk/client-lambda'
 import globals from '../../shared/extensionGlobals'
 import { toArrayAsync } from '../../shared/utilities/collectionUtils'
 import { fromExtensionManifest } from '../../shared/settings'
@@ -53,7 +47,9 @@ class LambdaSettings extends fromExtensionManifest('aws.lambda', { recentlyUploa
         try {
             return this.get('recentlyUploaded')
         } catch (error) {
-            this.delete('recentlyUploaded')
+            this.delete('recentlyUploaded').catch((e) => {
+                getLogger().error('TypedSettings.delete() failed: %s', (e as Error).message)
+            })
         }
     }
 
@@ -112,10 +108,10 @@ export async function uploadLambdaCommand(lambdaArg?: LambdaFunction, path?: vsc
     } catch (err) {
         result = 'Failed'
         if (err instanceof ToolkitError) {
-            showViewLogsMessage(`Could not upload lambda: ${err.message}`)
+            void showViewLogsMessage(`Could not upload lambda: ${err.message}`)
             getLogger().error(`Lambda upload failed: %O`, err.cause ?? err)
         } else {
-            showViewLogsMessage(`Could not upload lambda (unexpected exception)`)
+            void showViewLogsMessage(`Could not upload lambda (unexpected exception)`)
             getLogger().error(`Lambda upload failed: %s`, err)
         }
     } finally {
@@ -126,7 +122,7 @@ export async function uploadLambdaCommand(lambdaArg?: LambdaFunction, path?: vsc
         if (result === 'Succeeded') {
             const profile = globals.awsContext.getCredentialProfileName()
             if (profile && lambda) {
-                LambdaSettings.instance.setRecentLambda(profile, lambda.region, lambda.name)
+                await LambdaSettings.instance.setRecentLambda(profile, lambda.region, lambda.name)
             }
         }
     }
@@ -185,7 +181,7 @@ function createConfirmDeploymentPrompter(lambda: LambdaFunction) {
     // TODO(sijaden): make this a quick pick? Tried to keep as close to possible as the original impl.
     return new (class extends Prompter<boolean> {
         protected promptUser(): Promise<PromptResult<boolean>> {
-            return confirmLambdaDeployment(lambda).then(res => res || WIZARD_BACK)
+            return confirmLambdaDeployment(lambda).then((res) => res || WIZARD_BACK)
         }
 
         // Stubs. Need to thin-out the `Prompter` interface to avoid this.
@@ -208,16 +204,15 @@ export interface UploadLambdaWizardState {
 }
 
 export class UploadLambdaWizard extends Wizard<UploadLambdaWizardState> {
-    constructor(lambda?: LambdaFunction, invokePath?: vscode.Uri) {
-        super({ initState: { lambda } })
-        this.form.lambda.region.bindPrompter(() => createRegionPrompter().transform(region => region.id))
+    public override async init(): Promise<this> {
+        this.form.lambda.region.bindPrompter(() => createRegionPrompter().transform((region) => region.id))
 
-        if (invokePath) {
+        if (this.invokePath) {
             this.form.uploadType.setDefault('directory')
-            if (fs.statSync(invokePath.fsPath).isFile()) {
-                this.form.targetUri.setDefault(vscode.Uri.file(path.dirname(invokePath.fsPath)))
+            if (await fs.existsFile(this.invokePath.fsPath)) {
+                this.form.targetUri.setDefault(vscode.Uri.file(path.dirname(this.invokePath.fsPath)))
             } else {
-                this.form.targetUri.setDefault(invokePath)
+                this.form.targetUri.setDefault(this.invokePath)
             }
         } else {
             this.form.uploadType.bindPrompter(() => createUploadTypePrompter())
@@ -239,9 +234,9 @@ export class UploadLambdaWizard extends Wizard<UploadLambdaWizardState> {
             })
         }
 
-        this.form.lambda.name.bindPrompter(state => {
+        this.form.lambda.name.bindPrompter((state) => {
             // invoking from the command palette passes no arguments
-            if (!invokePath) {
+            if (!this.invokePath) {
                 if (state.uploadType === 'directory') {
                     return createFunctionNamePrompter(state.lambda!.region!, state.targetUri)
                 } else {
@@ -252,10 +247,10 @@ export class UploadLambdaWizard extends Wizard<UploadLambdaWizardState> {
                     )
                 }
             } else {
-                return createFunctionNamePrompter(state.lambda!.region!, invokePath)
+                return createFunctionNamePrompter(state.lambda!.region!, this.invokePath)
             }
         })
-        if (lambda) {
+        if (this.lambda) {
             this.form.directoryBuildType.bindPrompter(() => createBuildPrompter(), {
                 showWhen: ({ uploadType }) => uploadType === 'directory',
             })
@@ -263,7 +258,16 @@ export class UploadLambdaWizard extends Wizard<UploadLambdaWizardState> {
             this.form.directoryBuildType.setDefault('zip')
         }
 
-        this.form.confirmedDeploy.bindPrompter(state => createConfirmDeploymentPrompter(state.lambda!))
+        this.form.confirmedDeploy.bindPrompter((state) => createConfirmDeploymentPrompter(state.lambda!))
+
+        return this
+    }
+
+    constructor(
+        readonly lambda?: LambdaFunction,
+        readonly invokePath?: vscode.Uri
+    ) {
+        super({ initState: { lambda } })
     }
 }
 
@@ -273,21 +277,16 @@ export class UploadLambdaWizard extends Wizard<UploadLambdaWizardState> {
  * @param type Whether to zip or sam build the directory
  * @param window Wrapper around vscode.window functionality for testing
  */
-async function runUploadDirectory(
-    lambda: LambdaFunction,
-    type: 'zip' | 'sam',
-    parentDir: vscode.Uri,
-    window = Window.vscode()
-) {
+export async function runUploadDirectory(lambda: LambdaFunction, type: 'zip' | 'sam', parentDir: vscode.Uri) {
     if (type === 'sam' && lambda.configuration) {
         return await runUploadLambdaWithSamBuild({ ...lambda, configuration: lambda.configuration }, parentDir)
     } else {
-        return await window.withProgress(
+        return await vscode.window.withProgress(
             {
                 location: vscode.ProgressLocation.Notification,
                 cancellable: false,
             },
-            async progress => {
+            async (progress) => {
                 return await zipAndUploadDirectory(lambda, parentDir.fsPath, progress)
             }
         )
@@ -304,29 +303,22 @@ async function runUploadDirectory(
  * @param parentDir Parent dir to build
  * @param window Wrapper around vscode.window functionality for testing
  */
-async function runUploadLambdaWithSamBuild(
-    lambda: Required<LambdaFunction>,
-    parentDir: vscode.Uri,
-    window = Window.vscode()
-) {
+async function runUploadLambdaWithSamBuild(lambda: Required<LambdaFunction>, parentDir: vscode.Uri) {
     // Detect if handler is present and provide strong guidance against proceeding if not.
     try {
         const handlerFile = path.join(parentDir.fsPath, getLambdaDetails(lambda.configuration).fileName)
-        if (!(await fileExists(handlerFile))) {
-            const isConfirmed = await showConfirmationMessage(
-                {
-                    prompt: localize(
-                        'AWS.lambda.upload.handlerNotFound',
-                        "{0} Toolkit can't find a file corresponding to handler: {1} at filepath {2}.\n\nThis directory likely will not work with this function.\n\nProceed with upload anyway?",
-                        getIdeProperties().company,
-                        lambda.configuration.Handler,
-                        handlerFile
-                    ),
-                    confirm: localizedText.yes,
-                    cancel: localizedText.no,
-                },
-                window
-            )
+        if (!(await fs.exists(handlerFile))) {
+            const isConfirmed = await showConfirmationMessage({
+                prompt: localize(
+                    'AWS.lambda.upload.handlerNotFound',
+                    "{0} Toolkit can't find a file corresponding to handler: {1} at filepath {2}.\n\nThis directory likely will not work with this function.\n\nProceed with upload anyway?",
+                    getIdeProperties().company,
+                    lambda.configuration.Handler,
+                    handlerFile
+                ),
+                confirm: localizedText.yes,
+                cancel: localizedText.no,
+            })
 
             if (!isConfirmed) {
                 getLogger().info('Handler file not found. Aborting runUploadLambdaWithSamBuild')
@@ -340,12 +332,12 @@ async function runUploadLambdaWithSamBuild(
         )
     }
 
-    return await window.withProgress(
+    return await vscode.window.withProgress(
         {
             location: vscode.ProgressLocation.Notification,
             cancellable: false,
         },
-        async progress => {
+        async (progress) => {
             let tempDir: string | undefined
             try {
                 const invoker = getSamCliContext().invoker
@@ -402,19 +394,16 @@ async function runUploadLambdaWithSamBuild(
  * @param lambda LambdaFunction
  * @param window Wrapper around vscode.window functionality for testing
  */
-async function confirmLambdaDeployment(lambda: LambdaFunction, window = Window.vscode()): Promise<boolean> {
-    const isConfirmed = await showConfirmationMessage(
-        {
-            prompt: localize(
-                'AWS.lambda.upload.confirm',
-                'This will immediately publish the selected code as the $LATEST version of Lambda: {0}.\n\nContinue?',
-                lambda.name
-            ),
-            confirm: localizedText.yes,
-            cancel: localizedText.no,
-        },
-        window
-    )
+async function confirmLambdaDeployment(lambda: LambdaFunction): Promise<boolean> {
+    const isConfirmed = await showConfirmationMessage({
+        prompt: localize(
+            'AWS.lambda.upload.confirm',
+            'This will immediately publish the selected code as the $LATEST version of Lambda: {0}.\n\nContinue?',
+            lambda.name
+        ),
+        confirm: localizedText.yes,
+        cancel: localizedText.no,
+    })
 
     if (!isConfirmed) {
         getLogger().info('UploadLambda confirmation cancelled.')
@@ -423,14 +412,14 @@ async function confirmLambdaDeployment(lambda: LambdaFunction, window = Window.v
     return isConfirmed
 }
 
-async function runUploadLambdaZipFile(lambda: LambdaFunction, zipFileUri: vscode.Uri, window = Window.vscode()) {
-    return await window.withProgress(
+async function runUploadLambdaZipFile(lambda: LambdaFunction, zipFileUri: vscode.Uri) {
+    return await vscode.window.withProgress(
         {
             location: vscode.ProgressLocation.Notification,
             cancellable: false,
         },
-        async progress => {
-            const zipFile = await fs.readFile(zipFileUri.fsPath).catch(err => {
+        async (progress) => {
+            const zipFile = await fs.readFileBytes(zipFileUri.fsPath).catch((err) => {
                 throw new ToolkitError('Failed to read zip', { cause: err })
             })
             return await uploadZipBuffer(lambda, zipFile, progress)
@@ -457,7 +446,7 @@ async function zipAndUploadDirectory(
         const zip = new AdmZip()
         zip.addLocalFolder(path)
         zip.toBuffer(resolve, reject)
-    }).catch(err => {
+    }).catch((err) => {
         throw new ToolkitError('Failed to archive directory', { cause: err })
     })
 
@@ -473,7 +462,7 @@ async function zipAndUploadDirectory(
  */
 async function uploadZipBuffer(
     lambda: LambdaFunction,
-    zip: Buffer,
+    zip: Uint8Array,
     progress: vscode.Progress<{
         message?: string | undefined
         increment?: number | undefined
@@ -483,49 +472,44 @@ async function uploadZipBuffer(
     progress.report({
         message: localize('AWS.lambda.upload.progress.uploadingArchive', 'Uploading archive to Lambda...'),
     })
-    await lambdaClient.updateFunctionCode(lambda.name, zip).catch(err => {
+    await lambdaClient.updateFunctionCode(lambda.name, zip).catch((err) => {
         throw new ToolkitError('Failed to upload zip archive', { cause: err })
     })
 
-    Window.vscode().showInformationMessage(
+    void vscode.window.showInformationMessage(
         localize('AWS.lambda.upload.done', 'Uploaded Lambda function: {0}', lambda.name)
     )
 }
 
-export async function findApplicationJsonFile(
-    startPath: vscode.Uri,
-    cloud9 = isCloud9()
-): Promise<vscode.Uri | undefined> {
-    if (!(await fileExists(startPath.fsPath))) {
+export async function findApplicationJsonFile(startPath: vscode.Uri): Promise<vscode.Uri | undefined> {
+    if (!(await fs.exists(startPath.fsPath))) {
         getLogger().error(
             'findApplicationJsonFile() invalid path (not accessible or does not exist): "%s"',
             startPath.fsPath
         )
         return undefined
     }
-    const isdir = fs.statSync(startPath.fsPath).isDirectory()
+    const isdir = await fs.existsDir(startPath.fsPath)
     const parentDir = isdir ? startPath.fsPath : path.dirname(startPath.fsPath)
-    const found = cloud9
-        ? await cloud9Findfile(parentDir, '.application.json')
-        : await vscode.workspace.findFiles(
-              new vscode.RelativePattern(parentDir, '**/.application.json'),
-              // exclude:
-              // - null      = NO excludes apply
-              // - undefined = default excludes apply (e.g. the `files.exclude` setting but not `search.exclude`).
-              // eslint-disable-next-line no-null/no-null
-              null,
-              1
-          )
+    const found = await vscode.workspace.findFiles(
+        new vscode.RelativePattern(parentDir, '**/.application.json'),
+        // exclude:
+        // - null      = NO excludes apply
+        // - undefined = default excludes apply (e.g. the `files.exclude` setting but not `search.exclude`).
+        // eslint-disable-next-line unicorn/no-null
+        null,
+        1
+    )
     if (!found || found.length === 0) {
         getLogger().debug('uploadLambda: .application.json not found in: "%s"', parentDir)
     }
     return found[0]
 }
 
-export function getFunctionNames(file: vscode.Uri, region: string): string[] | undefined {
+export async function getFunctionNames(file: vscode.Uri, region: string): Promise<string[] | undefined> {
     try {
         const names: string[] = []
-        const appData = JSON.parse(fs.readFileSync(file.fsPath, { encoding: 'utf-8' }).toString())
+        const appData = JSON.parse(await fs.readFileText(file.fsPath))
         if (appData['Functions']) {
             const functions = Object.keys(appData['Functions'])
             if (functions) {
@@ -550,14 +534,14 @@ async function listAllLambdaNames(region: string, path?: vscode.Uri) {
     // Get Lambda functions from .application.json #2588
     if (path) {
         const appFile = await findApplicationJsonFile(path)
-        const namesFromAppFile = appFile ? getFunctionNames(appFile, region) : undefined
+        const namesFromAppFile = appFile ? await getFunctionNames(appFile, region) : undefined
         if (!appFile) {
             getLogger().debug('lambda: .application.json not found')
         } else if (!namesFromAppFile) {
             getLogger().debug('lambda: no functions in .application.json for region: %s', region)
         } else {
             lambdaFunctionNames.push(
-                ...namesFromAppFile.map(n => {
+                ...namesFromAppFile.map((n) => {
                     return {
                         label: n,
                         description: localize('AWS.lambda.upload.fromAppJson', 'from .application.json'),
@@ -612,7 +596,7 @@ function createFunctionNamePrompter(region: string, path?: vscode.Uri) {
             'aws.lambda.upload.manualEntry.placeholder',
             'Filter or enter existing function name or ARN'
         ),
-        filterBoxInputSettings: { label: 'Existing lambda function: ', transform: input => input },
+        filterBoxInputSettings: { label: 'Existing lambda function: ', transform: (input) => input },
     })
 
     return prompter
diff --git a/src/lambda/config/configureParameterOverrides.ts b/packages/core/src/lambda/config/configureParameterOverrides.ts
similarity index 92%
rename from src/lambda/config/configureParameterOverrides.ts
rename to packages/core/src/lambda/config/configureParameterOverrides.ts
index 685ca8d6bc5..70e9d1936d8 100644
--- a/src/lambda/config/configureParameterOverrides.ts
+++ b/packages/core/src/lambda/config/configureParameterOverrides.ts
@@ -1,10 +1,10 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as vscode from 'vscode'
-import { getLogger } from '../../shared/logger'
+import { getLogger } from '../../shared/logger/logger'
 import { getNormalizedRelativePath } from '../../shared/utilities/pathUtils'
 import { getChildrenRange } from '../../shared/utilities/symbolUtilities'
 import { getTabSize } from '../../shared/utilities/textDocumentUtilities'
@@ -70,7 +70,7 @@ export async function configureParameterOverrides(
         const { json, isDirty } = populator.getResults()
 
         if (isDirty) {
-            await editor.edit(eb => {
+            await editor.edit((eb) => {
                 eb.replace(
                     new vscode.Range(
                         editor.document.positionAt(0),
@@ -124,21 +124,21 @@ async function getParameterOverridesRange(
         return defaultRange
     }
 
-    const templatesSymbol = symbols.find(c => c.name === 'templates')
+    const templatesSymbol = symbols.find((c) => c.name === 'templates')
     if (!templatesSymbol) {
         logger.warn(`Invalid format for document ${editor.document.uri}`)
 
         return defaultRange
     }
 
-    const templateSymbol = templatesSymbol.children.find(c => c.name === relativeTemplatePath)
+    const templateSymbol = templatesSymbol.children.find((c) => c.name === relativeTemplatePath)
     if (!templateSymbol) {
         logger.warn(`Cannot find template section '${relativeTemplatePath}' in: ${editor.document.uri}`)
 
         return defaultRange
     }
 
-    const parameterOverridesSymbol = templateSymbol.children.find(c => c.name === 'parameterOverrides')
+    const parameterOverridesSymbol = templateSymbol.children.find((c) => c.name === 'parameterOverrides')
     if (!parameterOverridesSymbol) {
         logger.warn(`Cannot find parameterOverrides section for '${relativeTemplatePath}' in: ${editor.document.uri}`)
 
diff --git a/src/lambda/config/parameterUtils.ts b/packages/core/src/lambda/config/parameterUtils.ts
similarity index 94%
rename from src/lambda/config/parameterUtils.ts
rename to packages/core/src/lambda/config/parameterUtils.ts
index 240ccf8b988..3849e466b05 100644
--- a/src/lambda/config/parameterUtils.ts
+++ b/packages/core/src/lambda/config/parameterUtils.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -8,7 +8,7 @@
 // "templates.json" support.
 //
 import * as vscode from 'vscode'
-import { CloudFormation } from '../../shared/cloudformation/cloudformation'
+import * as CloudFormation from '../../shared/cloudformation/cloudformation'
 import { getNormalizedRelativePath } from '../../shared/utilities/pathUtils'
 import { load as loadTemplatesConfig } from '../config/templates'
 
diff --git a/src/lambda/config/samParameterCompletionItemProvider.ts b/packages/core/src/lambda/config/samParameterCompletionItemProvider.ts
similarity index 86%
rename from src/lambda/config/samParameterCompletionItemProvider.ts
rename to packages/core/src/lambda/config/samParameterCompletionItemProvider.ts
index 60f2dcf4e99..f408733f886 100644
--- a/src/lambda/config/samParameterCompletionItemProvider.ts
+++ b/packages/core/src/lambda/config/samParameterCompletionItemProvider.ts
@@ -1,12 +1,12 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as path from 'path'
 import * as vscode from 'vscode'
-import { CloudFormation } from '../../shared/cloudformation/cloudformation'
-import { getLogger, Logger } from '../../shared/logger'
+import * as CloudFormation from '../../shared/cloudformation/cloudformation'
+import { getLogger, Logger } from '../../shared/logger/logger'
 import { getChildrenRange, loadSymbols, LoadSymbolsContext } from '../../shared/utilities/symbolUtilities'
 import { getParameterNames } from '../config/parameterUtils'
 
@@ -70,8 +70,8 @@ export class SamParameterCompletionItemProvider implements vscode.CompletionItem
         const templateParameterNames = await getParameterNames(templateUri, this.context)
 
         return templateParameterNames
-            .filter(name => !prefix || name.startsWith(prefix))
-            .map(name => {
+            .filter((name) => !prefix || name.startsWith(prefix))
+            .map((name) => {
                 const completionItem: vscode.CompletionItem = {
                     kind: vscode.CompletionItemKind.Reference,
                     label: name,
@@ -106,18 +106,18 @@ async function getTemplateUri({
     symbols: vscode.DocumentSymbol[]
     position: vscode.Position
 }): Promise<vscode.Uri | undefined> {
-    const templates = symbols.find(symbol => symbol.name === 'templates')
+    const templates = symbols.find((symbol) => symbol.name === 'templates')
     if (!templates) {
         return undefined
     }
 
-    const template = templates.children.find(child => child.range.contains(position))
+    const template = templates.children.find((child) => child.range.contains(position))
     if (!template) {
         return undefined
     }
 
     // Only offer suggestions inside the 'parameterOverrides' property.
-    const parameterOverrides = template.children.find(child => child.name === 'parameterOverrides')
+    const parameterOverrides = template.children.find((child) => child.name === 'parameterOverrides')
     if (!parameterOverrides) {
         return undefined
     }
@@ -129,7 +129,7 @@ async function getTemplateUri({
 
     // Ensure that position is at a parameter name, not a value.
     if (parameterOverrides.children) {
-        const override = parameterOverrides.children.find(child => child.range.contains(position))
+        const override = parameterOverrides.children.find((child) => child.range.contains(position))
         if (override) {
             if (!override.selectionRange.contains(position)) {
                 return undefined
diff --git a/packages/core/src/lambda/config/templates.ts b/packages/core/src/lambda/config/templates.ts
new file mode 100644
index 00000000000..52beae0e953
--- /dev/null
+++ b/packages/core/src/lambda/config/templates.ts
@@ -0,0 +1,442 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Use jsonc-parser.parse instead of JSON.parse, as JSONC can handle comments. VS Code uses jsonc-parser
+// under the hood to provide symbols for JSON documents, so this will keep us consistent with VS code.
+import * as jsonParser from 'jsonc-parser'
+import * as os from 'os'
+import * as _path from 'path'
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+import * as fsUtils from '../../shared/filesystemUtilities'
+import { getLogger, Logger } from '../../shared/logger/logger'
+import { ReadonlyJsonObject } from '../../shared/sam/debugger/awsSamDebugConfiguration'
+import { getTabSizeSetting } from '../../shared/utilities/editorUtilities'
+import { getNormalizedRelativePath } from '../../shared/utilities/pathUtils'
+import { saveDocumentIfDirty } from '../../shared/utilities/textDocumentUtilities'
+import { access } from 'fs/promises'
+import { fs } from '../../shared/fs/fs'
+
+const localize = nls.loadMessageBundle()
+
+export interface TemplatesConfig {
+    templates: {
+        [relativePath: string]: TemplateConfig | undefined
+    }
+}
+
+export interface TemplateConfig {
+    parameterOverrides?: {
+        [key: string]: string | undefined
+    }
+    handlers?: {
+        [handler: string]: HandlerConfig | undefined
+    }
+}
+
+export interface HandlerConfig {
+    event: Record<string, unknown>
+    environmentVariables: {
+        [name: string]: string
+    }
+    dockerNetwork?: string
+    useContainer?: boolean
+}
+
+export function generateDefaultHandlerConfig(): HandlerConfig {
+    return {
+        event: {},
+        environmentVariables: {},
+        dockerNetwork: undefined,
+        useContainer: undefined,
+    }
+}
+
+/**
+ * TODO: remove? still needed?
+ */
+export async function getHandlerConfig(params: {
+    handlerName: string
+    documentUri: vscode.Uri
+    samTemplate: vscode.Uri
+}): Promise<HandlerConfig> {
+    const workspaceFolder = vscode.workspace.getWorkspaceFolder(params.documentUri)
+    if (!workspaceFolder) {
+        return generateDefaultHandlerConfig()
+    }
+
+    const config: HandlerConfig = await getLocalLambdaConfiguration(
+        workspaceFolder,
+        params.handlerName,
+        params.samTemplate
+    )
+
+    return config
+}
+
+async function getLocalLambdaConfiguration(
+    workspaceFolder: vscode.WorkspaceFolder,
+    handler: string,
+    samTemplate: vscode.Uri
+): Promise<HandlerConfig> {
+    try {
+        const configPath: string = getTemplatesConfigPath(workspaceFolder.uri.fsPath)
+        const templateRelativePath = getNormalizedRelativePath(workspaceFolder.uri.fsPath, samTemplate.fsPath)
+
+        await saveDocumentIfDirty(configPath)
+
+        let rawConfig: string = '{}'
+        if (await fsUtils.fileExists(configPath)) {
+            rawConfig = await fsUtils.readFileAsString(configPath)
+        }
+
+        const configPopulationResult = new TemplatesConfigPopulator(rawConfig)
+            .ensureTemplateHandlerSectionExists(templateRelativePath, handler)
+            .getResults()
+
+        const config: TemplatesConfig = loadTemplatesConfigFromJson(configPopulationResult.json)
+
+        return config.templates[templateRelativePath]!.handlers![handler]!
+    } catch (e) {
+        if (e instanceof TemplatesConfigFieldTypeError) {
+            showTemplatesConfigurationError(e)
+        }
+
+        throw e
+    }
+}
+
+export interface LoadTemplatesConfigContext {
+    fileExists(path: string): Thenable<boolean>
+    readFile(path: string): Thenable<string>
+    saveDocumentIfDirty(editorPath: string): Thenable<void>
+}
+
+export class DefaultLoadTemplatesConfigContext implements LoadTemplatesConfigContext {
+    public readonly fileExists = fsUtils.fileExists
+    public readonly readFile = fsUtils.readFileAsString
+
+    public readonly saveDocumentIfDirty = saveDocumentIfDirty
+}
+
+export function getTemplatesConfigPath(workspaceFolderPath: string): string {
+    return _path.join(workspaceFolderPath, '.aws', 'templates.json')
+}
+
+export async function load(
+    workspaceFolderPath: string,
+    context: LoadTemplatesConfigContext = new DefaultLoadTemplatesConfigContext()
+): Promise<TemplatesConfig> {
+    const templatesConfigPath = getTemplatesConfigPath(workspaceFolderPath)
+
+    return await loadTemplatesConfig(templatesConfigPath, context)
+}
+
+async function loadTemplatesConfig(
+    path: string,
+    context: LoadTemplatesConfigContext = new DefaultLoadTemplatesConfigContext()
+): Promise<TemplatesConfig> {
+    try {
+        await context.saveDocumentIfDirty(path)
+
+        if (!(await context.fileExists(path))) {
+            return {
+                templates: {},
+            }
+        }
+
+        const raw = await context.readFile(path)
+
+        return loadTemplatesConfigFromJson(raw)
+    } catch (err) {
+        if (Array.isArray(err) && (err as any[]).length === 1) {
+            throw new Error(`Could not load .aws/templates.json: ${(err as any[])[0]}`)
+        }
+
+        throw new Error(`Could not load .aws/templates.json: ${err}`)
+    }
+}
+
+export function loadTemplatesConfigFromJson(json: string): TemplatesConfig {
+    const errors: jsonParser.ParseError[] = []
+    const config = jsonParser.parse(json, errors) as TemplatesConfig
+    if (errors.length > 0) {
+        const message =
+            errors.length === 1
+                ? ` ${formatParseError(errors[0])}`
+                : `${os.EOL}${errors.map(formatParseError).join(os.EOL)}`
+
+        throw new Error(`Could not parse .aws/templates.json:${message}`)
+    }
+
+    return config
+}
+
+export function showTemplatesConfigurationError(
+    error: TemplatesConfigFieldTypeError,
+    showErrorMessage: typeof vscode.window.showErrorMessage = vscode.window.showErrorMessage
+): void {
+    const logger: Logger = getLogger()
+
+    void showErrorMessage(
+        localize(
+            'AWS.lambda.configure.error.fieldtype',
+            'Your templates.json file has an issue. {0} was detected as {1} instead of one of the following: [{2}]. Please change or remove this field, and try again.',
+            error.jsonPath.join('.'),
+            error.actualType,
+            error.expectedTypes.join(', ')
+        )
+    )
+
+    logger.error(
+        `Error detected in templates.json: ${error.message}. Field: ${error.jsonPath.join(
+            '.'
+        )}, expected one of: [${error.expectedTypes.join(', ')}], was: ${error.actualType}`
+    )
+}
+
+export async function ensureTemplatesConfigFileExists(path: string): Promise<void> {
+    await fs.mkdir(_path.dirname(path))
+    try {
+        await access(path)
+    } catch {
+        await fs.writeFile(path, '{}')
+    }
+}
+
+function formatParseError(error: jsonParser.ParseError) {
+    return `${getParseErrorDescription(error.error)} at offset ${error.offset}, length ${error.length}`
+}
+
+// Reverse enum mappings are only generated for non-const numerical enums,
+// but ParseErrorCode is a const enum. So we have to reverse-map manually.
+function getParseErrorDescription(code: jsonParser.ParseErrorCode): string {
+    switch (code) {
+        case jsonParser.ParseErrorCode.CloseBraceExpected:
+            return 'close brace expected'
+        case jsonParser.ParseErrorCode.CloseBracketExpected:
+            return 'close bracket expected'
+        case jsonParser.ParseErrorCode.ColonExpected:
+            return 'colon expected'
+        case jsonParser.ParseErrorCode.CommaExpected:
+            return 'command expected'
+        case jsonParser.ParseErrorCode.EndOfFileExpected:
+            return 'end of file expected'
+        case jsonParser.ParseErrorCode.InvalidCharacter:
+            return 'invalid character'
+        case jsonParser.ParseErrorCode.InvalidCommentToken:
+            return 'invalid comment token'
+        case jsonParser.ParseErrorCode.InvalidEscapeCharacter:
+            return 'invalid escape character'
+        case jsonParser.ParseErrorCode.InvalidNumberFormat:
+            return 'invalid number format'
+        case jsonParser.ParseErrorCode.InvalidSymbol:
+            return 'invalid symbol'
+        case jsonParser.ParseErrorCode.InvalidUnicode:
+            return 'invalid unicode'
+        case jsonParser.ParseErrorCode.PropertyNameExpected:
+            return 'property name expected'
+        case jsonParser.ParseErrorCode.UnexpectedEndOfComment:
+            return 'unexpected end of comment'
+        case jsonParser.ParseErrorCode.UnexpectedEndOfNumber:
+            return 'unexpected end of number'
+        case jsonParser.ParseErrorCode.UnexpectedEndOfString:
+            return 'unexpected end of string'
+        case jsonParser.ParseErrorCode.ValueExpected:
+            return 'value expected'
+        // By omitting the default case, we force the compiler to yell at us
+        // if any enum members are added/removed/changed.
+    }
+}
+
+export class TemplatesConfigFieldTypeError extends Error {
+    public readonly jsonPath: jsonParser.JSONPath
+    public readonly expectedTypes: jsonParser.NodeType[]
+    public readonly actualType: jsonParser.NodeType
+
+    public constructor(params: {
+        message?: string
+        jsonPath: jsonParser.JSONPath
+        expectedTypes: jsonParser.NodeType[]
+        actualType: jsonParser.NodeType
+    }) {
+        super(params.message)
+
+        this.jsonPath = params.jsonPath
+        this.expectedTypes = params.expectedTypes
+        this.actualType = params.actualType
+    }
+}
+
+export class TemplatesConfigPopulator {
+    private isDirty: boolean = false
+
+    public constructor(
+        private json: string,
+        private readonly modificationOptions: jsonParser.ModificationOptions = {
+            formattingOptions: {
+                insertSpaces: true,
+                tabSize: getTabSizeSetting(),
+            },
+        }
+    ) {}
+
+    public ensureTemplateSectionExists(templateRelativePath: string): TemplatesConfigPopulator {
+        this.ensureTemplatesSectionExists()
+
+        this.ensureJsonPropertyExists(['templates', templateRelativePath], {})
+
+        return this
+    }
+
+    public ensureTemplateHandlerSectionExists(templateRelativePath: string, handler: string): TemplatesConfigPopulator {
+        this.ensureTemplateHandlersSectionExists(templateRelativePath)
+
+        this.ensureJsonPropertyExists(['templates', templateRelativePath, 'handlers', handler], {
+            event: {},
+            environmentVariables: {},
+        })
+
+        return this
+    }
+
+    public ensureTemplateHandlerPropertiesExist(
+        templateRelativePath: string,
+        handler: string
+    ): TemplatesConfigPopulator {
+        this.ensureTemplateHandlerSectionExists(templateRelativePath, handler)
+
+        this.ensureJsonPropertyExists(['templates', templateRelativePath, 'handlers', handler, 'event'], {})
+
+        this.ensureJsonPropertyExists(
+            ['templates', templateRelativePath, 'handlers', handler, 'environmentVariables'],
+            {}
+        )
+
+        return this
+    }
+
+    public ensureTemplateParameterOverrideExists(
+        templateRelativePath: string,
+        parameterName: string
+    ): TemplatesConfigPopulator {
+        this.ensureTemplateParamOverrideSectionExists(templateRelativePath)
+
+        this.ensureJsonPropertyExists(['templates', templateRelativePath, 'parameterOverrides', parameterName], '', [
+            'string',
+            'null',
+        ])
+
+        return this
+    }
+
+    public getResults(): {
+        isDirty: boolean
+        json: string
+    } {
+        return {
+            isDirty: this.isDirty,
+            json: this.json,
+        }
+    }
+
+    private ensureJsonPropertyExists(
+        jsonPath: jsonParser.JSONPath,
+        value: any,
+        allowedTypes: jsonParser.NodeType[] = ['object', 'null']
+    ) {
+        const root = jsonParser.parseTree(this.json)
+        const node = jsonParser.findNodeAtLocation(root!, jsonPath)
+        const allowedTypesSet = new Set(allowedTypes)
+
+        if (node && !allowedTypesSet.has(node.type)) {
+            throw new TemplatesConfigFieldTypeError({
+                message: 'Invalid configuration',
+                jsonPath: jsonPath,
+                actualType: node.type,
+                expectedTypes: allowedTypes,
+            })
+        }
+
+        if (!node || node.type === 'null') {
+            const edits = jsonParser.modify(this.json, jsonPath, value, this.modificationOptions)
+
+            if (edits.length > 0) {
+                this.json = jsonParser.applyEdits(this.json, edits)
+                this.isDirty = true
+            }
+        }
+    }
+
+    private ensureTemplatesSectionExists(): TemplatesConfigPopulator {
+        this.ensureJsonPropertyExists(['templates'], {})
+
+        return this
+    }
+
+    private ensureTemplateHandlersSectionExists(templateRelativePath: string): TemplatesConfigPopulator {
+        this.ensureTemplateSectionExists(templateRelativePath)
+
+        this.ensureJsonPropertyExists(['templates', templateRelativePath, 'handlers'], {})
+
+        return this
+    }
+
+    private ensureTemplateParamOverrideSectionExists(templateRelativePath: string): TemplatesConfigPopulator {
+        this.ensureTemplateSectionExists(templateRelativePath)
+
+        this.ensureJsonPropertyExists(['templates', templateRelativePath, 'parameterOverrides'], {})
+
+        return this
+    }
+}
+
+/**
+ * Returns a previously-configured event payload if the following are true (`undefined` if false):
+ * * old `.aws/templates.json` file exists and is valid JSON
+ * * handler exists in `.aws/templates.json`
+ * @param workspaceFolder Current workspace folder
+ * @param handler Function's handler
+ * @param samTemplate Originating SAM Template
+ */
+export async function getExistingConfiguration(
+    workspaceFolder: vscode.WorkspaceFolder,
+    handler: string,
+    samTemplate: vscode.Uri
+): Promise<
+    | {
+          eventJson?: ReadonlyJsonObject
+          environmentVariables?: { [key: string]: string }
+          dockerNetwork?: string
+          useContainer?: boolean
+      }
+    | undefined
+> {
+    const configPath: string = getTemplatesConfigPath(workspaceFolder.uri.fsPath)
+
+    if (await fsUtils.fileExists(configPath)) {
+        const templateRelativePath = getNormalizedRelativePath(workspaceFolder.uri.fsPath, samTemplate.fsPath)
+        try {
+            const json = JSON.parse(await fsUtils.readFileAsString(configPath)) as TemplatesConfig
+            const handlerData = json.templates[templateRelativePath]?.handlers?.[handler]
+            if (handlerData) {
+                return {
+                    eventJson: handlerData.event as any,
+                    environmentVariables: handlerData.environmentVariables,
+                    dockerNetwork: handlerData.dockerNetwork,
+                    useContainer: handlerData.useContainer,
+                }
+            }
+        } catch (e) {
+            // json was not parseable
+            const err = e as Error
+            getLogger().info(`Error parsing the legacy configuration file: ${err.message}`)
+
+            return undefined
+        }
+    }
+
+    return undefined
+}
diff --git a/packages/core/src/lambda/constants.ts b/packages/core/src/lambda/constants.ts
new file mode 100644
index 00000000000..95cca715d20
--- /dev/null
+++ b/packages/core/src/lambda/constants.ts
@@ -0,0 +1,9 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { hostedFilesBaseUrl } from '../shared/constants'
+
+export const sampleRequestBase: string = 'LambdaSampleFunctions/SampleRequests'
+export const sampleRequestPath: string = `${hostedFilesBaseUrl}${sampleRequestBase}/`
+export const sampleRequestManifestPath: string = `${hostedFilesBaseUrl}${sampleRequestBase}/manifest.xml`
diff --git a/src/lambda/explorer/cloudFormationNodes.ts b/packages/core/src/lambda/explorer/cloudFormationNodes.ts
similarity index 76%
rename from src/lambda/explorer/cloudFormationNodes.ts
rename to packages/core/src/lambda/explorer/cloudFormationNodes.ts
index dbf05a026ae..4ef298a391e 100644
--- a/src/lambda/explorer/cloudFormationNodes.ts
+++ b/packages/core/src/lambda/explorer/cloudFormationNodes.ts
@@ -1,15 +1,15 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as nls from 'vscode-nls'
 const localize = nls.loadMessageBundle()
 
-import { CloudFormation, Lambda } from 'aws-sdk'
+import { FunctionConfiguration } from '@aws-sdk/client-lambda'
 import * as os from 'os'
 import * as vscode from 'vscode'
-import { DefaultCloudFormationClient } from '../../shared/clients/cloudFormationClient'
+import { CloudFormationClient, StackSummary } from '../../shared/clients/cloudFormation'
 import { DefaultLambdaClient } from '../../shared/clients/lambdaClient'
 
 import { AWSResourceNode } from '../../shared/treeview/nodes/awsResourceNode'
@@ -28,7 +28,7 @@ export class CloudFormationNode extends AWSTreeNodeBase {
 
     public constructor(
         public override readonly regionCode: string,
-        private readonly client = new DefaultCloudFormationClient(regionCode)
+        private readonly client = new CloudFormationClient(regionCode)
     ) {
         super('CloudFormation', vscode.TreeItemCollapsibleState.Collapsed)
         this.stackNodes = new Map<string, CloudFormationStackNode>()
@@ -49,13 +49,13 @@ export class CloudFormationNode extends AWSTreeNodeBase {
     }
 
     public async updateChildren(): Promise<void> {
-        const stacks = await toMapAsync(listCloudFormationStacks(this.client), stack => stack.StackId)
+        const stacks = await toMapAsync(listCloudFormationStacks(this.client), (stack) => stack.StackId)
 
         updateInPlace(
             this.stackNodes,
             stacks.keys(),
-            key => this.stackNodes.get(key)!.update(stacks.get(key)!),
-            key => new CloudFormationStackNode(this, this.regionCode, stacks.get(key)!)
+            (key) => this.stackNodes.get(key)!.update(stacks.get(key)!),
+            (key) => new CloudFormationStackNode(this, this.regionCode, stacks.get(key)!)
         )
     }
 }
@@ -66,9 +66,9 @@ export class CloudFormationStackNode extends AWSTreeNodeBase implements AWSResou
     public constructor(
         public readonly parent: AWSTreeNodeBase,
         public override readonly regionCode: string,
-        private stackSummary: CloudFormation.StackSummary,
+        private stackSummary: StackSummary,
         private readonly lambdaClient = new DefaultLambdaClient(regionCode),
-        private readonly cloudformationClient = new DefaultCloudFormationClient(regionCode)
+        private readonly cloudformationClient = new CloudFormationClient(regionCode)
     ) {
         super('', vscode.TreeItemCollapsibleState.Collapsed)
 
@@ -78,7 +78,7 @@ export class CloudFormationStackNode extends AWSTreeNodeBase implements AWSResou
         this.iconPath = getIcon('aws-cloudformation-stack')
     }
 
-    public get stackId(): CloudFormation.StackId | undefined {
+    public get stackId(): string | undefined {
         return this.stackSummary.StackId
     }
 
@@ -94,7 +94,7 @@ export class CloudFormationStackNode extends AWSTreeNodeBase implements AWSResou
         return this.stackName
     }
 
-    public get stackName(): CloudFormation.StackName {
+    public get stackName(): string {
         return this.stackSummary.StackName
     }
 
@@ -114,7 +114,7 @@ export class CloudFormationStackNode extends AWSTreeNodeBase implements AWSResou
         })
     }
 
-    public update(stackSummary: CloudFormation.StackSummary): void {
+    public update(stackSummary: StackSummary): void {
         this.stackSummary = stackSummary
         this.label = `${this.stackName} [${stackSummary.StackStatus}]`
         this.tooltip = `${this.stackName}${os.EOL}${this.stackId}`
@@ -122,16 +122,16 @@ export class CloudFormationStackNode extends AWSTreeNodeBase implements AWSResou
 
     private async updateChildren(): Promise<void> {
         const resources: string[] = await this.resolveLambdaResources()
-        const functions: Map<string, Lambda.FunctionConfiguration> = toMap(
+        const functions: Map<string, FunctionConfiguration> = toMap(
             await toArrayAsync(listLambdaFunctions(this.lambdaClient)),
-            functionInfo => functionInfo.FunctionName
+            (functionInfo) => functionInfo.FunctionName
         )
 
         updateInPlace(
             this.functionNodes,
             intersection(resources, functions.keys()),
-            key => this.functionNodes.get(key)!.update(functions.get(key)!),
-            key => makeCloudFormationLambdaFunctionNode(this, this.regionCode, functions.get(key)!)
+            (key) => this.functionNodes.get(key)!.update(functions.get(key)!),
+            (key) => makeCloudFormationLambdaFunctionNode(this, this.regionCode, functions.get(key)!)
         )
     }
 
@@ -139,8 +139,8 @@ export class CloudFormationStackNode extends AWSTreeNodeBase implements AWSResou
         const response = await this.cloudformationClient.describeStackResources(this.stackSummary.StackName)
 
         if (response.StackResources) {
-            return response.StackResources.filter(it => it.ResourceType.includes('Lambda::Function')).map(
-                it => it.PhysicalResourceId || 'none'
+            return response.StackResources.filter((it) => it.ResourceType.includes('Lambda::Function')).map(
+                (it) => it.PhysicalResourceId || 'none'
             )
         }
 
@@ -151,10 +151,9 @@ export class CloudFormationStackNode extends AWSTreeNodeBase implements AWSResou
 function makeCloudFormationLambdaFunctionNode(
     parent: AWSTreeNodeBase,
     regionCode: string,
-    configuration: Lambda.FunctionConfiguration
+    configuration: FunctionConfiguration
 ): LambdaFunctionNode {
-    const node = new LambdaFunctionNode(parent, regionCode, configuration)
-    node.contextValue = contextValueCloudformationLambdaFunction
+    const node = new LambdaFunctionNode(parent, regionCode, configuration, contextValueCloudformationLambdaFunction)
 
     return node
 }
diff --git a/packages/core/src/lambda/explorer/lambdaFunctionFileNode.ts b/packages/core/src/lambda/explorer/lambdaFunctionFileNode.ts
new file mode 100644
index 00000000000..422de99b31f
--- /dev/null
+++ b/packages/core/src/lambda/explorer/lambdaFunctionFileNode.ts
@@ -0,0 +1,38 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { AWSResourceNode } from '../../shared/treeview/nodes/awsResourceNode'
+import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
+import { LambdaFunctionNode } from './lambdaFunctionNode'
+import { getIcon } from '../../shared/icons'
+import { isCloud9 } from '../../shared/extensionUtilities'
+import { LambdaFunctionFolderNode } from './lambdaFunctionFolderNode'
+
+export class LambdaFunctionFileNode extends AWSTreeNodeBase implements AWSResourceNode {
+    public constructor(
+        public readonly parent: LambdaFunctionNode | LambdaFunctionFolderNode,
+        public readonly filename: string,
+        public readonly path: string
+    ) {
+        super(filename)
+        this.iconPath = getIcon('vscode-file')
+        this.contextValue = 'lambdaFunctionFileNode'
+        this.command = !isCloud9()
+            ? {
+                  command: 'aws.openLambdaFile',
+                  title: 'Open file',
+                  arguments: [path],
+              }
+            : undefined
+    }
+
+    public get arn(): string {
+        return ''
+    }
+
+    public get name(): string {
+        return ''
+    }
+}
diff --git a/packages/core/src/lambda/explorer/lambdaFunctionFolderNode.ts b/packages/core/src/lambda/explorer/lambdaFunctionFolderNode.ts
new file mode 100644
index 00000000000..7c67d482666
--- /dev/null
+++ b/packages/core/src/lambda/explorer/lambdaFunctionFolderNode.ts
@@ -0,0 +1,60 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { AWSResourceNode } from '../../shared/treeview/nodes/awsResourceNode'
+import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
+import { LambdaFunctionNode } from './lambdaFunctionNode'
+import { fs } from '../../shared/fs/fs'
+import { getIcon } from '../../shared/icons'
+import { makeChildrenNodes } from '../../shared/treeview/utils'
+import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
+import { localize } from 'vscode-nls'
+import path from 'path'
+import { LambdaFunctionFileNode } from './lambdaFunctionFileNode'
+
+export class LambdaFunctionFolderNode extends AWSTreeNodeBase implements AWSResourceNode {
+    public constructor(
+        public readonly parent: LambdaFunctionNode | LambdaFunctionFolderNode,
+        public readonly filename: string,
+        public readonly path: string
+    ) {
+        super(filename, vscode.TreeItemCollapsibleState.Collapsed)
+        this.iconPath = getIcon('vscode-folder')
+        this.contextValue = 'lambdaFunctionFolderNode'
+    }
+
+    public get arn(): string {
+        return ''
+    }
+
+    public get name(): string {
+        return ''
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        return await makeChildrenNodes({
+            getChildNodes: async () => this.loadFunctionFiles(),
+            getNoChildrenPlaceholderNode: async () =>
+                new PlaceholderNode(this, localize('AWS.explorerNode.s3.noObjects', '[No Objects found]')),
+        })
+    }
+
+    public async loadFunctionFiles(): Promise<AWSTreeNodeBase[]> {
+        const nodes: AWSTreeNodeBase[] = []
+        const files = await fs.readdir(this.path)
+        for (const file of files) {
+            const [fileName, type] = file
+            const filePath = path.join(this.path, fileName)
+            if (type === vscode.FileType.Directory) {
+                nodes.push(new LambdaFunctionFolderNode(this, fileName, filePath))
+            } else {
+                nodes.push(new LambdaFunctionFileNode(this, fileName, filePath))
+            }
+        }
+
+        return nodes
+    }
+}
diff --git a/packages/core/src/lambda/explorer/lambdaFunctionNode.ts b/packages/core/src/lambda/explorer/lambdaFunctionNode.ts
new file mode 100644
index 00000000000..3d2f05a99fa
--- /dev/null
+++ b/packages/core/src/lambda/explorer/lambdaFunctionNode.ts
@@ -0,0 +1,114 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { FunctionConfiguration } from '@aws-sdk/client-lambda'
+import * as os from 'os'
+import * as vscode from 'vscode'
+import { getIcon } from '../../shared/icons'
+
+import { AWSResourceNode } from '../../shared/treeview/nodes/awsResourceNode'
+import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
+import { editLambdaCommand } from '../commands/editLambda'
+import { fs } from '../../shared/fs/fs'
+import { makeChildrenNodes } from '../../shared/treeview/utils'
+import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
+import path from 'path'
+import { localize } from 'vscode-nls'
+import { LambdaFunctionFolderNode } from './lambdaFunctionFolderNode'
+import { LambdaFunctionFileNode } from './lambdaFunctionFileNode'
+
+export const contextValueLambdaFunction = 'awsRegionFunctionNode'
+export const contextValueLambdaFunctionImportable = 'awsRegionFunctionNodeDownloadable'
+// Without "Convert to SAM application"
+export const contextValueLambdaFunctionDownloadOnly = 'awsRegionFunctionNodeDownloadableOnly'
+
+function isLambdaFunctionDownloadable(contextValue?: string): boolean {
+    return (
+        contextValue === contextValueLambdaFunctionImportable || contextValue === contextValueLambdaFunctionDownloadOnly
+    )
+}
+
+export class LambdaFunctionNode extends AWSTreeNodeBase implements AWSResourceNode {
+    public constructor(
+        public readonly parent: AWSTreeNodeBase,
+        public override readonly regionCode: string,
+        public configuration: FunctionConfiguration,
+        public override readonly contextValue?: string,
+        public localDir?: string,
+        public projectRoot?: vscode.Uri,
+        public logicalId?: string
+    ) {
+        super(
+            `${configuration.FunctionArn}`,
+            isLambdaFunctionDownloadable(contextValue)
+                ? vscode.TreeItemCollapsibleState.Collapsed
+                : vscode.TreeItemCollapsibleState.None
+        )
+        this.update(configuration)
+        this.resourceUri = vscode.Uri.from({ scheme: 'lambda', path: `${regionCode}/${configuration.FunctionName}` })
+        this.iconPath = getIcon('aws-lambda-function')
+        this.contextValue = contextValue
+    }
+
+    public update(configuration: FunctionConfiguration): void {
+        this.configuration = configuration
+        this.label = this.configuration.FunctionName || ''
+        this.tooltip = `${this.configuration.FunctionName}${os.EOL}${this.configuration.FunctionArn}`
+        if (this.contextValue === contextValueLambdaFunction) {
+            this.tooltip += `${os.EOL} This function is not downloadable`
+        }
+    }
+
+    public get functionName(): string {
+        return this.configuration.FunctionName || ''
+    }
+
+    public get arn(): string {
+        if (this.configuration.FunctionArn === undefined) {
+            throw new Error('FunctionArn expected but not found')
+        }
+
+        return this.configuration.FunctionArn
+    }
+
+    public get name(): string {
+        if (this.configuration.FunctionName === undefined) {
+            throw new Error('FunctionName expected but not found')
+        }
+
+        return this.configuration.FunctionName
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        if (!isLambdaFunctionDownloadable(this.contextValue)) {
+            return []
+        }
+
+        return await makeChildrenNodes({
+            getChildNodes: async () => {
+                const path = await editLambdaCommand(this)
+                return path ? this.loadFunctionFiles(path) : []
+            },
+            getNoChildrenPlaceholderNode: async () =>
+                new PlaceholderNode(this, localize('AWS.explorerNode.lambda.noFiles', '[No files found]')),
+        })
+    }
+
+    public async loadFunctionFiles(tmpPath: string): Promise<AWSTreeNodeBase[]> {
+        const nodes: AWSTreeNodeBase[] = []
+        const files = await fs.readdir(tmpPath)
+        for (const file of files) {
+            const [fileName, type] = file
+            const filePath = path.join(tmpPath, fileName)
+            if (type === vscode.FileType.Directory) {
+                nodes.push(new LambdaFunctionFolderNode(this, fileName, filePath))
+            } else {
+                nodes.push(new LambdaFunctionFileNode(this, fileName, filePath))
+            }
+        }
+
+        return nodes
+    }
+}
diff --git a/packages/core/src/lambda/explorer/lambdaFunctionNodeDecorationProvider.ts b/packages/core/src/lambda/explorer/lambdaFunctionNodeDecorationProvider.ts
new file mode 100644
index 00000000000..b31de940991
--- /dev/null
+++ b/packages/core/src/lambda/explorer/lambdaFunctionNodeDecorationProvider.ts
@@ -0,0 +1,107 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { fs } from '../../shared/fs/fs'
+import path from 'path'
+import { getFunctionInfo } from '../utils'
+import { LambdaFunction } from '../commands/uploadLambda'
+
+export class LambdaFunctionNodeDecorationProvider implements vscode.FileDecorationProvider {
+    // Make it a singleton so that it's easier to access
+    private static instance: LambdaFunctionNodeDecorationProvider
+    private readonly _onDidChangeFileDecorations = new vscode.EventEmitter<vscode.Uri | undefined>()
+    readonly onDidChangeFileDecorations = this._onDidChangeFileDecorations.event
+
+    private constructor() {}
+
+    public static getInstance(): LambdaFunctionNodeDecorationProvider {
+        if (!LambdaFunctionNodeDecorationProvider.instance) {
+            LambdaFunctionNodeDecorationProvider.instance = new LambdaFunctionNodeDecorationProvider()
+        }
+        return LambdaFunctionNodeDecorationProvider.instance
+    }
+
+    async provideFileDecoration(uri: vscode.Uri): Promise<vscode.FileDecoration | undefined> {
+        const badge = {
+            badge: 'M',
+            color: new vscode.ThemeColor('gitDecoration.modifiedResourceForeground'),
+            tooltip: 'This function has undeployed changes',
+            propagate: true,
+        }
+
+        if (uri.scheme === 'lambda') {
+            const [region, name] = uri.path.split('/')
+            const lambda: LambdaFunction = { region, name }
+            if (await getFunctionInfo(lambda, 'undeployed')) {
+                badge.propagate = false
+                return badge
+            }
+        } else {
+            try {
+                const lambda = this.getLambdaFromPath(uri)
+                if (lambda && (await this.isFileModifiedAfterDeployment(uri.fsPath, lambda))) {
+                    return badge
+                }
+            } catch {
+                return undefined
+            }
+        }
+    }
+
+    public async addBadge(fileUri: vscode.Uri, functionUri: vscode.Uri) {
+        this._onDidChangeFileDecorations.fire(vscode.Uri.file(fileUri.fsPath))
+        this._onDidChangeFileDecorations.fire(functionUri)
+    }
+
+    public async removeBadge(fileUri: vscode.Uri, functionUri: vscode.Uri) {
+        // We need to propagate the badge removal down to all files in the dir
+        for (const path of await this.getFilePaths(fileUri.fsPath)) {
+            const subUri = vscode.Uri.file(path)
+            this._onDidChangeFileDecorations.fire(subUri)
+        }
+        this._onDidChangeFileDecorations.fire(functionUri)
+    }
+
+    private async getFilePaths(basePath: string) {
+        const files = await fs.readdir(basePath)
+        const subFiles: string[] = [basePath]
+        for (const file of files) {
+            const [fileName, type] = file
+            const filePath = path.join(basePath, fileName)
+            if (type === vscode.FileType.Directory) {
+                subFiles.push(...(await this.getFilePaths(filePath)))
+            } else {
+                subFiles.push(filePath)
+            }
+        }
+
+        return subFiles
+    }
+
+    private getLambdaFromPath(uri: vscode.Uri): LambdaFunction {
+        const pathParts = uri.fsPath.split(path.sep)
+        const lambdaIndex = pathParts.indexOf('lambda')
+        if (lambdaIndex === -1 || lambdaIndex + 2 >= pathParts.length) {
+            throw new Error('Invalid path')
+        }
+        const region = pathParts[lambdaIndex + 1]
+        const name = pathParts[lambdaIndex + 2]
+        return { region, name }
+    }
+
+    private async isFileModifiedAfterDeployment(filePath: string, lambda: LambdaFunction): Promise<boolean> {
+        try {
+            const { lastDeployed, undeployed } = await getFunctionInfo(lambda)
+            if (!lastDeployed || !undeployed) {
+                return false
+            }
+
+            const fileStat = await fs.stat(filePath)
+            return fileStat.mtime > lastDeployed
+        } catch {
+            return false
+        }
+    }
+}
diff --git a/packages/core/src/lambda/explorer/lambdaNodes.ts b/packages/core/src/lambda/explorer/lambdaNodes.ts
new file mode 100644
index 00000000000..dd753ce5594
--- /dev/null
+++ b/packages/core/src/lambda/explorer/lambdaNodes.ts
@@ -0,0 +1,88 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import { FunctionConfiguration } from '@aws-sdk/client-lambda'
+import * as vscode from 'vscode'
+import { DefaultLambdaClient } from '../../shared/clients/lambdaClient'
+
+import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
+import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
+import { makeChildrenNodes } from '../../shared/treeview/utils'
+import { toArrayAsync, toMap, updateInPlace } from '../../shared/utilities/collectionUtils'
+import { listLambdaFunctions, isHotReloadingFunction } from '../utils'
+import {
+    contextValueLambdaFunction,
+    contextValueLambdaFunctionImportable,
+    contextValueLambdaFunctionDownloadOnly,
+    LambdaFunctionNode,
+} from './lambdaFunctionNode'
+import { samLambdaImportableRuntimes } from '../models/samLambdaRuntime'
+import { isLocalStackConnection } from '../../auth/utils'
+
+/**
+ * An AWS Explorer node representing the Lambda Service.
+ * Contains Lambda Functions for a specific region as child nodes.
+ */
+export class LambdaNode extends AWSTreeNodeBase {
+    private readonly functionNodes: Map<string, LambdaFunctionNode>
+
+    public constructor(
+        public override readonly regionCode: string,
+        private readonly client = new DefaultLambdaClient(regionCode)
+    ) {
+        super('Lambda', vscode.TreeItemCollapsibleState.Collapsed)
+        this.functionNodes = new Map<string, LambdaFunctionNode>()
+        this.contextValue = 'awsLambdaNode'
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        return await makeChildrenNodes({
+            getChildNodes: async () => {
+                await this.updateChildren()
+
+                return [...this.functionNodes.values()]
+            },
+            getNoChildrenPlaceholderNode: async () =>
+                new PlaceholderNode(this, localize('AWS.explorerNode.lambda.noFunctions', '[No Functions found]')),
+            sort: (nodeA, nodeB) => nodeA.functionName.localeCompare(nodeB.functionName),
+        })
+    }
+
+    public async updateChildren(): Promise<void> {
+        const functions: Map<string, FunctionConfiguration> = toMap(
+            await toArrayAsync(listLambdaFunctions(this.client)),
+            (configuration) => configuration.FunctionName
+        )
+
+        updateInPlace(
+            this.functionNodes,
+            functions.keys(),
+            (key) => this.functionNodes.get(key)!.update(functions.get(key)!),
+            (key) => makeLambdaFunctionNode(this, this.regionCode, functions.get(key)!)
+        )
+    }
+}
+
+function makeLambdaFunctionNode(
+    parent: AWSTreeNodeBase,
+    regionCode: string,
+    configuration: FunctionConfiguration
+): LambdaFunctionNode {
+    let contextValue = contextValueLambdaFunction
+    const isImportableRuntime = configuration.Runtime && samLambdaImportableRuntimes.contains(configuration.Runtime)
+    if (isLocalStackConnection()) {
+        if (isImportableRuntime && !isHotReloadingFunction(configuration?.CodeSha256)) {
+            contextValue = contextValueLambdaFunctionDownloadOnly
+        }
+    } else if (isImportableRuntime) {
+        contextValue = contextValueLambdaFunctionImportable
+    }
+    const node = new LambdaFunctionNode(parent, regionCode, configuration, contextValue)
+
+    return node
+}
diff --git a/src/lambda/local/debugConfiguration.ts b/packages/core/src/lambda/local/debugConfiguration.ts
similarity index 80%
rename from src/lambda/local/debugConfiguration.ts
rename to packages/core/src/lambda/local/debugConfiguration.ts
index 60db6e1ee95..bfccf03b070 100644
--- a/src/lambda/local/debugConfiguration.ts
+++ b/packages/core/src/lambda/local/debugConfiguration.ts
@@ -1,11 +1,11 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as path from 'path'
 import * as vscode from 'vscode'
-import { CloudFormation } from '../../shared/cloudformation/cloudformation'
+import * as CloudFormation from '../../shared/cloudformation/cloudformation'
 import {
     AwsSamDebuggerConfiguration,
     awsSamDebugTargetTypes,
@@ -18,14 +18,14 @@ import { tryGetAbsolutePath } from '../../shared/utilities/workspaceUtils'
 import { Architecture, RuntimeFamily } from '../models/samLambdaRuntime'
 import { SamLaunchRequestArgs } from '../../shared/sam/debugger/awsSamDebugger'
 
-import { getLogger } from '../../shared/logger'
+import { getLogger } from '../../shared/logger/logger'
 import globals from '../../shared/extensionGlobals'
 
 /**
  * Magic path on the Docker image.
  * https://github.com/aws/aws-sam-cli/blob/2201b17bff0a438b934abbb53f6c76eff9ccfa6d/samcli/local/docker/lambda_container.py#L25
  */
-export const dotnetCoreDebuggerPath = '/tmp/lambci_debug_files/vsdbg'
+export const dotnetDebuggerPath = '/tmp/lambci_debug_files/vsdbg'
 export const goDebuggerPath = '/tmp/lambci_debug_files'
 
 export interface NodejsDebugConfiguration extends SamLaunchRequestArgs {
@@ -54,22 +54,8 @@ export interface PythonDebugConfiguration extends SamLaunchRequestArgs {
     readonly pathMappings: PythonPathMapping[]
 }
 
-/** Alternative (Cloud9) Python debugger: ikp3db */
-export interface PythonCloud9DebugConfiguration extends SamLaunchRequestArgs {
-    readonly runtimeFamily: RuntimeFamily.Python
-    /** Passed to "sam build --manifest …" */
-    readonly manifestPath: string | undefined
-
-    // Fields expected by the Cloud9 debug adapter.
-    // (Cloud9 sourcefile: debugger-vscode-mainthread-adapter.ts)
-    readonly port: number
-    readonly address: string
-    readonly localRoot: string
-    readonly remoteRoot: string
-}
-
-export interface DotNetCoreDebugConfiguration extends SamLaunchRequestArgs {
-    readonly runtimeFamily: RuntimeFamily.DotNetCore
+export interface DotNetDebugConfiguration extends SamLaunchRequestArgs {
+    readonly runtimeFamily: RuntimeFamily.DotNet
     processName: string
     pipeTransport: PipeTransport
     windows: {
@@ -90,7 +76,7 @@ export interface GoDebugConfiguration extends SamLaunchRequestArgs {
 export interface PipeTransport {
     pipeProgram: 'sh' | 'powershell'
     pipeArgs: string[]
-    debuggerPath: typeof dotnetCoreDebuggerPath
+    debuggerPath: typeof dotnetDebuggerPath
     pipeCwd: string
 }
 
@@ -100,10 +86,10 @@ export interface PipeTransport {
  * - For "code" configs this is the `projectRoot` field.
  * - For "template" configs this is the `CodeUri` field in the template.
  */
-export function getCodeRoot(
+export async function getCodeRoot(
     folder: vscode.WorkspaceFolder | undefined,
     config: AwsSamDebuggerConfiguration
-): string | undefined {
+): Promise<string | undefined> {
     switch (config.invokeTarget.target) {
         case 'code': {
             const codeInvoke = config.invokeTarget as CodeTargetProperties
@@ -112,11 +98,11 @@ export function getCodeRoot(
         case 'api':
         case 'template': {
             const templateInvoke = config.invokeTarget as TemplateTargetProperties
-            const template = getTemplate(folder, config)
+            const template = await getTemplate(folder, config)
             if (!template) {
                 return undefined
             }
-            const templateResource = getTemplateResource(folder, config)
+            const templateResource = await getTemplateResource(folder, config)
             if (!templateResource?.Properties) {
                 return undefined
             }
@@ -142,10 +128,10 @@ export function getCodeRoot(
 /**
  * Gets the lambda handler name specified in the given config.
  */
-export function getHandlerName(
+export async function getHandlerName(
     folder: vscode.WorkspaceFolder | undefined,
     config: AwsSamDebuggerConfiguration
-): string {
+): Promise<string> {
     switch (config.invokeTarget.target) {
         case 'code': {
             const codeInvoke = config.invokeTarget as CodeTargetProperties
@@ -153,11 +139,11 @@ export function getHandlerName(
         }
         case 'api':
         case 'template': {
-            const template = getTemplate(folder, config)
+            const template = await getTemplate(folder, config)
             if (!template) {
                 return ''
             }
-            const templateResource = getTemplateResource(folder, config)
+            const templateResource = await getTemplateResource(folder, config)
             if (CloudFormation.isImageLambdaResource(templateResource?.Properties)) {
                 return config.invokeTarget.logicalId
             }
@@ -171,7 +157,7 @@ export function getHandlerName(
         }
         default: {
             // Should never happen.
-            vscode.window.showErrorMessage(
+            void vscode.window.showErrorMessage(
                 localize(
                     'AWS.sam.debugger.invalidTarget',
                     'Debug Configuration has an unsupported target type. Supported types: {0}',
@@ -184,16 +170,16 @@ export function getHandlerName(
 }
 
 /** Gets a template object from the given config. */
-export function getTemplate(
+export async function getTemplate(
     folder: vscode.WorkspaceFolder | undefined,
     config: AwsSamDebuggerConfiguration
-): CloudFormation.Template | undefined {
+): Promise<CloudFormation.Template | undefined> {
     if (!['api', 'template'].includes(config.invokeTarget.target)) {
         return undefined
     }
     const templateInvoke = config.invokeTarget as TemplateTargetProperties
     const fullPath = tryGetAbsolutePath(folder, templateInvoke.templatePath)
-    const cfnTemplate = globals.templateRegistry.getRegisteredItem(fullPath)?.item
+    const cfnTemplate = (await globals.templateRegistry).getItem(fullPath)?.item
     return cfnTemplate
 }
 
@@ -201,15 +187,15 @@ export function getTemplate(
  * Gets the template resources object specified by the `logicalId`
  * field (if the config has `target=template` or `target=api`).
  */
-export function getTemplateResource(
+export async function getTemplateResource(
     folder: vscode.WorkspaceFolder | undefined,
     config: AwsSamDebuggerConfiguration
-): CloudFormation.Resource | undefined {
+): Promise<CloudFormation.Resource | undefined> {
     if (!['api', 'template'].includes(config.invokeTarget.target)) {
         return undefined
     }
     const templateInvoke = config.invokeTarget as TemplateTargetProperties
-    const cfnTemplate = getTemplate(folder, config)
+    const cfnTemplate = await getTemplate(folder, config)
     if (!cfnTemplate) {
         throw Error(`template not found (not registered?): ${templateInvoke.templatePath}`)
     }
@@ -231,8 +217,8 @@ export function getTemplateResource(
  *
  * Intended for use only by the language-specific `makeConfig` functions.
  */
-export function isImageLambdaConfig(config: SamLaunchRequestArgs): boolean {
-    const templateResource = getTemplateResource(config.workspaceFolder, config)
+export async function isImageLambdaConfig(config: SamLaunchRequestArgs): Promise<boolean> {
+    const templateResource = await getTemplateResource(config.workspaceFolder, config)
 
     return CloudFormation.isImageLambdaResource(templateResource?.Properties)
 }
@@ -256,8 +242,8 @@ export function getArchitecture(
         const isArch = isArchitecture(arch)
 
         if (!isArch) {
-            getLogger('channel').warn('SAM Invoke: Invalid architecture. Defaulting to x86_64.')
-            vscode.window.showWarningMessage(
+            getLogger().warn('SAM Invoke: Invalid architecture. Defaulting to x86_64.')
+            void vscode.window.showWarningMessage(
                 localize(
                     'AWS.output.sam.invalidArchitecture',
                     'Invalid architecture specified in {0}. Defaulting to x86_64 architecture for invocation.',
diff --git a/src/lambda/models/samLambdaRuntime.ts b/packages/core/src/lambda/models/samLambdaRuntime.ts
similarity index 77%
rename from src/lambda/models/samLambdaRuntime.ts
rename to packages/core/src/lambda/models/samLambdaRuntime.ts
index 2a66ee2b4b2..985e947afc9 100644
--- a/src/lambda/models/samLambdaRuntime.ts
+++ b/packages/core/src/lambda/models/samLambdaRuntime.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -7,20 +7,22 @@ import * as nls from 'vscode-nls'
 const localize = nls.loadMessageBundle()
 
 import * as vscode from 'vscode'
-import { Runtime } from 'aws-sdk/clients/lambda'
+import { Runtime } from '@aws-sdk/client-lambda'
 import { Map as ImmutableMap, Set as ImmutableSet } from 'immutable'
 import { isCloud9 } from '../../shared/extensionUtilities'
 import { PrompterButtons } from '../../shared/ui/buttons'
 import { createQuickPick, DataQuickPickItem, QuickPickPrompter } from '../../shared/ui/pickerPrompter'
 import { supportedLambdaRuntimesUrl } from '../../shared/constants'
+import { openUrl } from '../../shared/utilities/vsCodeUtils'
 
 export enum RuntimeFamily {
     Unknown,
     Python,
     NodeJS,
-    DotNetCore,
+    DotNet,
     Go,
     Java,
+    Ruby,
 }
 
 export type RuntimePackageType = 'Image' | 'Zip'
@@ -28,15 +30,48 @@ export type RuntimePackageType = 'Image' | 'Zip'
 // TODO: Consolidate all of the runtime constructs into a single <Runtime, Set<Runtime>> map
 //       We should be able to eliminate a fair amount of redundancy with that.
 export const nodeJsRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>([
+    'nodejs22.x' as Runtime,
+    'nodejs20.x',
     'nodejs18.x',
     'nodejs16.x',
     'nodejs14.x',
-    'nodejs12.x',
 ])
-export const pythonRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>(['python3.9', 'python3.8', 'python3.7'])
+export function getNodeMajorVersion(version?: string): number | undefined {
+    if (!version) {
+        return undefined
+    }
+
+    const match = version.match(/^nodejs(\d+)\./)
+
+    if (match) {
+        return Number(match[1])
+    } else {
+        return undefined
+    }
+}
+
+export const pythonRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>([
+    'python3.13' as Runtime,
+    'python3.12',
+    'python3.11',
+    'python3.10',
+    'python3.9',
+    'python3.8',
+    'python3.7',
+])
 export const goRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>(['go1.x'])
-export const javaRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>(['java11', 'java8', 'java8.al2'])
-export const dotNetRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>(['dotnetcore3.1', 'dotnet6'])
+export const javaRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>([
+    'java17',
+    'java11',
+    'java8',
+    'java8.al2',
+    'java21',
+])
+export const dotNetRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>(['dotnet6', 'dotnet8'])
+export const rubyRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>(['ruby3.2', 'ruby3.3', 'ruby3.4' as Runtime])
+
+// Image runtimes are not a direct subset of valid ZIP lambda types
+const dotnet50 = 'dotnet5.0' as Runtime
 
 /**
  * Deprecated runtimes can be found at https://docs.aws.amazon.com/lambda/latest/dg/runtime-support-policy.html
@@ -54,13 +89,27 @@ export const deprecatedRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>([
     'nodejs6.10',
     'nodejs8.10',
     'nodejs10.x',
+    'nodejs12.x',
+    'ruby2.5',
+    'ruby2.7',
 ])
 const defaultRuntimes = ImmutableMap<RuntimeFamily, Runtime>([
-    [RuntimeFamily.NodeJS, 'nodejs14.x'],
-    [RuntimeFamily.Python, 'python3.9'],
-    [RuntimeFamily.DotNetCore, 'dotnetcore3.1'],
+    [RuntimeFamily.NodeJS, 'nodejs22.x' as Runtime],
+    [RuntimeFamily.Python, 'python3.13' as Runtime],
+    [RuntimeFamily.DotNet, 'dotnet8'],
     [RuntimeFamily.Go, 'go1.x'],
-    [RuntimeFamily.Java, 'java11'],
+    [RuntimeFamily.Java, 'java21'],
+    [RuntimeFamily.Ruby, 'ruby3.3'],
+])
+
+export const mapFamilyToDebugType = ImmutableMap<RuntimeFamily, string>([
+    [RuntimeFamily.NodeJS, 'node'],
+    [RuntimeFamily.Python, 'python'],
+    [RuntimeFamily.DotNet, 'csharp'],
+    [RuntimeFamily.Go, 'go'],
+    [RuntimeFamily.Java, 'java'],
+    [RuntimeFamily.Ruby, 'ruby'],
+    [RuntimeFamily.Unknown, 'unknown'],
 ])
 
 export const samZipLambdaRuntimes: ImmutableSet<Runtime> = ImmutableSet.union([
@@ -74,10 +123,12 @@ export const samZipLambdaRuntimes: ImmutableSet<Runtime> = ImmutableSet.union([
 export const samArmLambdaRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>([
     'python3.9',
     'python3.8',
+    'nodejs22.x' as Runtime,
+    'nodejs20.x',
     'nodejs18.x',
     'nodejs16.x',
     'nodejs14.x',
-    'nodejs12.x',
+    'java17',
     'java11',
     'java8.al2',
 ])
@@ -87,14 +138,16 @@ export const samArmLambdaRuntimes: ImmutableSet<Runtime> = ImmutableSet<Runtime>
 const cloud9SupportedRuntimes: ImmutableSet<Runtime> = ImmutableSet.union([nodeJsRuntimes, pythonRuntimes])
 
 // only interpreted languages are importable as compiled languages won't provide a useful artifact for editing.
-export const samLambdaImportableRuntimes: ImmutableSet<Runtime> = ImmutableSet.union([nodeJsRuntimes, pythonRuntimes])
+export const samLambdaImportableRuntimes: ImmutableSet<Runtime> = ImmutableSet.union([
+    nodeJsRuntimes,
+    pythonRuntimes,
+    rubyRuntimes,
+])
 
 export function samLambdaCreatableRuntimes(cloud9: boolean = isCloud9()): ImmutableSet<Runtime> {
     return cloud9 ? cloud9SupportedRuntimes : samZipLambdaRuntimes
 }
 
-// Image runtimes are not a direct subset of valid ZIP lambda types
-const dotnet50 = 'dotnet5.0'
 export function samImageLambdaRuntimes(cloud9: boolean = isCloud9()): ImmutableSet<Runtime> {
     // Note: SAM also supports ruby, but Toolkit does not.
     return ImmutableSet<Runtime>([...samLambdaCreatableRuntimes(cloud9), ...(cloud9 ? [] : [dotnet50])])
@@ -120,7 +173,7 @@ export function getDependencyManager(runtime: Runtime): DependencyManager[] {
     throw new Error(`Runtime ${runtime} does not have an associated DependencyManager`)
 }
 
-export function getFamily(runtime: string): RuntimeFamily {
+export function getFamily(runtime: Runtime): RuntimeFamily {
     if (deprecatedRuntimes.has(runtime)) {
         handleDeprecatedRuntime(runtime)
     } else if (nodeJsRuntimes.has(runtime)) {
@@ -128,18 +181,20 @@ export function getFamily(runtime: string): RuntimeFamily {
     } else if (pythonRuntimes.has(runtime)) {
         return RuntimeFamily.Python
     } else if (dotNetRuntimes.has(runtime) || runtime === dotnet50) {
-        return RuntimeFamily.DotNetCore
+        return RuntimeFamily.DotNet
     } else if (goRuntimes.has(runtime)) {
         return RuntimeFamily.Go
     } else if (javaRuntimes.has(runtime)) {
         return RuntimeFamily.Java
+    } else if (rubyRuntimes.has(runtime)) {
+        return RuntimeFamily.Ruby
     }
     return RuntimeFamily.Unknown
 }
 
 function handleDeprecatedRuntime(runtime: Runtime) {
     const moreInfo = localize('AWS.generic.message.learnMore', 'Learn More')
-    vscode.window
+    void vscode.window
         .showErrorMessage(
             localize(
                 'AWS.samcli.deprecatedRuntime',
@@ -148,9 +203,9 @@ function handleDeprecatedRuntime(runtime: Runtime) {
             ),
             moreInfo
         )
-        .then(button => {
+        .then((button) => {
             if (button === moreInfo) {
-                vscode.env.openExternal(vscode.Uri.parse(supportedLambdaRuntimesUrl))
+                void openUrl(vscode.Uri.parse(supportedLambdaRuntimesUrl))
             }
         })
     throw new Error(`Runtime ${runtime} is deprecated, see: ${supportedLambdaRuntimesUrl}`)
@@ -177,11 +232,15 @@ export function getRuntimeFamily(langId: string): RuntimeFamily {
         case 'javascript':
             return RuntimeFamily.NodeJS
         case 'csharp':
-            return RuntimeFamily.DotNetCore
+            return RuntimeFamily.DotNet
         case 'python':
             return RuntimeFamily.Python
         case 'go':
             return RuntimeFamily.Go
+        case 'java':
+            return RuntimeFamily.Java
+        case 'ruby':
+            return RuntimeFamily.Ruby
         default:
             return RuntimeFamily.Unknown
     }
@@ -190,7 +249,7 @@ export function getRuntimeFamily(langId: string): RuntimeFamily {
 /**
  * Provides the default runtime for a given `RuntimeFamily` or undefined if the runtime is invalid.
  */
-export function getDefaultRuntime(runtime: RuntimeFamily): string | undefined {
+export function getDefaultRuntime(runtime: RuntimeFamily): Runtime | undefined {
     return defaultRuntimes.get(runtime)
 }
 
@@ -204,7 +263,7 @@ function getRuntimesForFamily(family: RuntimeFamily): ImmutableSet<Runtime> | un
             return nodeJsRuntimes
         case RuntimeFamily.Python:
             return pythonRuntimes
-        case RuntimeFamily.DotNetCore:
+        case RuntimeFamily.DotNet:
             return dotNetRuntimes
         case RuntimeFamily.Go:
             return goRuntimes
@@ -234,14 +293,14 @@ export function createRuntimeQuickPick(params: {
     totalSteps?: number
 }): QuickPickPrompter<RuntimeAndPackage> {
     const zipRuntimes = params.runtimeFamily
-        ? getRuntimesForFamily(params.runtimeFamily) ?? samLambdaCreatableRuntimes()
+        ? (getRuntimesForFamily(params.runtimeFamily) ?? samLambdaCreatableRuntimes())
         : samLambdaCreatableRuntimes()
 
     const zipRuntimeItems = zipRuntimes
         // remove uncreatable runtimes
-        .filter(value => samLambdaCreatableRuntimes().has(value))
+        .filter((value) => samLambdaCreatableRuntimes().has(value))
         .toArray()
-        .map(runtime => ({
+        .map((runtime) => ({
             data: { runtime, packageType: 'Zip' } as RuntimeAndPackage,
             label: runtime,
         }))
@@ -251,7 +310,7 @@ export function createRuntimeQuickPick(params: {
     let imageRuntimeItems: DataQuickPickItem<RuntimeAndPackage>[] = []
     if (params.showImageRuntimes) {
         imageRuntimeItems = samImageLambdaRuntimes()
-            .map(runtime => ({
+            .map((runtime) => ({
                 data: { runtime, packageType: 'Image' } as RuntimeAndPackage,
                 label: `${runtime} (Image)`,
             }))
diff --git a/packages/core/src/lambda/models/samTemplates.ts b/packages/core/src/lambda/models/samTemplates.ts
new file mode 100644
index 00000000000..ace9c93faf6
--- /dev/null
+++ b/packages/core/src/lambda/models/samTemplates.ts
@@ -0,0 +1,124 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as semver from 'semver'
+import { Runtime } from '@aws-sdk/client-lambda'
+import { Set as ImmutableSet } from 'immutable'
+import { supportsEventBridgeTemplates } from '../../../src/eventSchemas/models/schemaCodeLangs'
+import { RuntimePackageType } from './samLambdaRuntime'
+import { getIdeProperties } from '../../shared/extensionUtilities'
+
+export const helloWorldTemplate = localize(
+    'AWS.samcli.initWizard.template.helloWorld.name',
+    '{0} SAM Hello World',
+    getIdeProperties().company
+)
+export const eventBridgeHelloWorldTemplate = localize(
+    'AWS.samcli.initWizard.template.helloWorld.name',
+    '{0} SAM EventBridge Hello World',
+    getIdeProperties().company
+)
+export const eventBridgeStarterAppTemplate = localize(
+    'AWS.samcli.initWizard.template.helloWorld.name',
+    '{0} SAM EventBridge App from Scratch',
+    getIdeProperties().company
+)
+export const stepFunctionsSampleApp = localize(
+    'AWS.samcli.initWizard.template.helloWorld.name',
+    '{0} Step Functions Sample App',
+    getIdeProperties().company
+)
+export const typeScriptBackendTemplate = 'App Backend using TypeScript'
+export const repromptUserForTemplate = 'REQUIRES_AWS_CREDENTIALS_REPROMPT_USER_FOR_TEMPLATE'
+
+export const cliVersionStepFunctionsTemplate = '0.52.0'
+
+export type SamTemplate = string
+
+export function getSamTemplateWizardOption(
+    runtime: Runtime,
+    packageType: RuntimePackageType,
+    samCliVersion: string
+): ImmutableSet<SamTemplate> {
+    const templateOptions = Array<SamTemplate>(helloWorldTemplate)
+
+    if (packageType === 'Image') {
+        // only supports hello world for now
+        return ImmutableSet<SamTemplate>(templateOptions)
+    }
+
+    if (supportsEventBridgeTemplates(runtime)) {
+        templateOptions.push(eventBridgeHelloWorldTemplate, eventBridgeStarterAppTemplate)
+    }
+
+    if (supportsStepFuntionsTemplate(samCliVersion)) {
+        templateOptions.push(stepFunctionsSampleApp)
+    }
+
+    if (supportsTypeScriptBackendTemplate(runtime)) {
+        templateOptions.push(typeScriptBackendTemplate)
+    }
+
+    return ImmutableSet<SamTemplate>(templateOptions)
+}
+
+export function getSamCliTemplateParameter(templateSelected: SamTemplate): string {
+    switch (templateSelected) {
+        case helloWorldTemplate:
+            return 'hello-world'
+        case eventBridgeHelloWorldTemplate:
+            return 'eventBridge-hello-world'
+        case eventBridgeStarterAppTemplate:
+            return 'eventBridge-schema-app'
+        case stepFunctionsSampleApp:
+            return 'step-functions-sample-app'
+        case typeScriptBackendTemplate:
+            return 'quick-start-typescript-app'
+        default:
+            throw new Error(`${templateSelected} is not valid sam template`)
+    }
+}
+
+export function getTemplateDescription(template: SamTemplate): string {
+    switch (template) {
+        case helloWorldTemplate:
+            return localize('AWS.samcli.initWizard.template.helloWorld.description', 'A basic SAM app')
+        case eventBridgeHelloWorldTemplate:
+            return localize(
+                'AWS.samcli.initWizard.template.eventBridge_helloWorld.description',
+                'Invokes a Lambda for every EC2 instance state change in your account'
+            )
+        case eventBridgeStarterAppTemplate:
+            return localize(
+                'AWS.samcli.initWizard.template.eventBridge_starterApp.description',
+                'Invokes a Lambda based on a dynamic event trigger for an EventBridge Schema of your choice'
+            )
+        case stepFunctionsSampleApp:
+            return localize(
+                'AWS.samcli.initWizard.template.stepFunctionsSampleApp.description',
+                'Orchestrates multiple Lambdas to execute a stock trading workflow on an hourly schedule'
+            )
+        case typeScriptBackendTemplate:
+            return localize(
+                'AWS.samcli.initWizard.template.typeScriptBackendTemplate.description',
+                'A sample TypeScript backend app with Lambda and DynamoDB'
+            )
+        default:
+            throw new Error(`No description found for template ${template}`)
+    }
+}
+
+export function supportsStepFuntionsTemplate(samCliVersion: string): boolean {
+    if (!samCliVersion) {
+        return false
+    }
+    return semver.gte(samCliVersion, cliVersionStepFunctionsTemplate)
+}
+
+export function supportsTypeScriptBackendTemplate(runtime: Runtime): boolean {
+    return runtime === 'nodejs16.x'
+}
diff --git a/packages/core/src/lambda/models/sampleRequest.ts b/packages/core/src/lambda/models/sampleRequest.ts
new file mode 100644
index 00000000000..7e90cf631e5
--- /dev/null
+++ b/packages/core/src/lambda/models/sampleRequest.ts
@@ -0,0 +1,9 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export class SampleRequest {
+    public name: string | undefined
+    public filename: string | undefined
+}
diff --git a/packages/core/src/lambda/remoteDebugging/lambdaDebugger.ts b/packages/core/src/lambda/remoteDebugging/lambdaDebugger.ts
new file mode 100644
index 00000000000..152d5913737
--- /dev/null
+++ b/packages/core/src/lambda/remoteDebugging/lambdaDebugger.ts
@@ -0,0 +1,75 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import globals from '../../shared/extensionGlobals'
+import { FunctionConfiguration } from '@aws-sdk/client-lambda'
+import { getLogger } from '../../shared/logger/logger'
+
+const logger = getLogger()
+
+export const remoteDebugSnapshotString = 'aws.lambda.remoteDebugSnapshot'
+
+export interface DebugConfig {
+    functionArn: string
+    functionName: string
+    port: number | undefined
+    localRoot: string
+    remoteRoot: string
+    skipFiles: string[]
+    shouldPublishVersion: boolean
+    lambdaRuntime?: string // Lambda runtime (e.g., nodejs18.x)
+    debuggerRuntime?: string // VS Code debugger runtime (e.g., node)
+    outFiles?: string[]
+    sourceMap?: boolean
+    justMyCode?: boolean
+    projectName?: string
+    otherDebugParams?: string
+    lambdaTimeout?: number
+    layerArn?: string
+    handlerFile?: string
+    samFunctionLogicalId?: string // SAM function logical ID for auto-detecting outFiles
+    samProjectRoot?: vscode.Uri // SAM project root for auto-detecting outFiles
+    isLambdaRemote: boolean // false if LocalStack connection
+}
+
+/**
+ * Interface for debugging AWS Lambda functions remotely.
+ *
+ * This interface defines the contract for implementing remote debugging
+ * for Lambda functions.
+ *
+ * Implementations of this interface handle the lifecycle of remote debugging sessions,
+ * including checking health, set up, necessary deployment, and later clean up
+ */
+export interface LambdaDebugger {
+    checkHealth(): Promise<void>
+    setup(
+        progress: vscode.Progress<{ message?: string; increment?: number }>,
+        functionConfig: FunctionConfiguration,
+        region: string
+    ): Promise<void>
+    waitForSetup(
+        progress: vscode.Progress<{ message?: string; increment?: number }>,
+        functionConfig: FunctionConfiguration,
+        region: string
+    ): Promise<void>
+    waitForFunctionUpdates(progress: vscode.Progress<{ message?: string; increment?: number }>): Promise<void>
+    cleanup(functionConfig: FunctionConfiguration): Promise<void>
+}
+
+// this should be called when the debug session is started
+export async function persistLambdaSnapshot(config: FunctionConfiguration | undefined): Promise<void> {
+    try {
+        await globals.globalState.update(remoteDebugSnapshotString, config)
+    } catch (error) {
+        // TODO raise toolkit error
+        logger.error(`Error persisting debug sessions: ${error}`)
+    }
+}
+
+export function getLambdaSnapshot(): FunctionConfiguration | undefined {
+    return globals.globalState.get<FunctionConfiguration>(remoteDebugSnapshotString)
+}
diff --git a/packages/core/src/lambda/remoteDebugging/ldkClient.ts b/packages/core/src/lambda/remoteDebugging/ldkClient.ts
new file mode 100644
index 00000000000..020d13d5ef2
--- /dev/null
+++ b/packages/core/src/lambda/remoteDebugging/ldkClient.ts
@@ -0,0 +1,481 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { FunctionConfiguration } from '@aws-sdk/client-lambda'
+import {
+    CloseTunnelCommand,
+    IoTSecureTunnelingClient,
+    ListTunnelsCommand,
+    OpenTunnelCommand,
+    RotateTunnelAccessTokenCommand,
+} from '@aws-sdk/client-iotsecuretunneling'
+import { getClientId } from '../../shared/telemetry/util'
+import { DefaultLambdaClient } from '../../shared/clients/lambdaClient'
+import { LocalProxy } from './localProxy'
+import globals from '../../shared/extensionGlobals'
+import { getLogger } from '../../shared/logger/logger'
+import { getIoTSTClientWithAgent, getLambdaClientWithAgent, getLambdaDebugUserAgent } from './utils'
+import { ToolkitError } from '../../shared/errors'
+import * as nls from 'vscode-nls'
+
+const localize = nls.loadMessageBundle()
+
+export function isTunnelInfo(data: TunnelInfo): data is TunnelInfo {
+    return (
+        typeof data === 'object' &&
+        data !== null &&
+        typeof data.tunnelID === 'string' &&
+        typeof data.sourceToken === 'string' &&
+        typeof data.destinationToken === 'string'
+    )
+}
+
+export interface TunnelInfo {
+    tunnelID: string
+    sourceToken: string
+    destinationToken: string
+}
+
+async function callUpdateFunctionConfiguration(
+    lambda: DefaultLambdaClient,
+    config: FunctionConfiguration,
+    waitForUpdate: boolean
+): Promise<FunctionConfiguration> {
+    // Update function configuration back to original values
+    return await lambda.updateFunctionConfiguration(
+        {
+            FunctionName: config.FunctionName!,
+            Timeout: config.Timeout,
+            Layers: config.Layers?.map((layer) => layer.Arn!).filter(Boolean) || [],
+            Environment: {
+                Variables: config.Environment?.Variables ?? {},
+            },
+        },
+        {
+            maxRetries: 5,
+            initialDelayMs: 2000,
+            backoffMultiplier: 2,
+            waitForUpdate: waitForUpdate,
+        }
+    )
+}
+
+export class LdkClient {
+    static #instance: LdkClient
+    private localProxy: LocalProxy | undefined
+    private static instanceCreating = false
+    private lambdaClientCache: Map<string, DefaultLambdaClient> = new Map()
+    private iotSTClientCache: Map<string, IoTSecureTunnelingClient> = new Map()
+
+    constructor() {}
+
+    public static get instance() {
+        if (this.#instance !== undefined) {
+            return this.#instance
+        }
+        if (this.instanceCreating) {
+            getLogger().warn(
+                localize(
+                    'AWS.lambda.ldkClient.multipleInstancesError',
+                    'Attempt to create multiple LdkClient instances simultaneously'
+                )
+            )
+        }
+        // Set flag to prevent recursive instance creation
+        this.instanceCreating = true
+        try {
+            const self = (this.#instance = new this())
+            return self
+        } finally {
+            this.instanceCreating = false
+        }
+    }
+
+    /**
+     * Get or create a cached Lambda client for the specified region
+     */
+    private getLambdaClient(region: string): DefaultLambdaClient {
+        if (!this.lambdaClientCache.has(region)) {
+            this.lambdaClientCache.set(region, getLambdaClientWithAgent(region, getLambdaDebugUserAgent()))
+        }
+        return this.lambdaClientCache.get(region)!
+    }
+
+    private getIoTSTClient(region: string): IoTSecureTunnelingClient {
+        if (!this.iotSTClientCache.has(region)) {
+            this.iotSTClientCache.set(region, getIoTSTClientWithAgent(region))
+        }
+        return this.iotSTClientCache.get(region)!
+    }
+    /**
+     * Clean up all resources held by this client
+     * Should be called when the extension is deactivated
+     */
+    public dispose(): void {
+        if (this.localProxy) {
+            this.localProxy.stop()
+            this.localProxy = undefined
+        }
+        // Clear the Lambda client cache
+        this.iotSTClientCache.clear()
+        this.lambdaClientCache.clear()
+    }
+
+    // Create or reuse tunnel
+    async createOrReuseTunnel(region: string): Promise<TunnelInfo | undefined> {
+        try {
+            // Get VSCode UUID using getClientId from telemetry.utils.ts
+            const vscodeUuid = getClientId(globals.globalState)
+
+            // Create IoTSecureTunneling client
+            const iotSecureTunneling = this.getIoTSTClient(region)
+
+            // Define tunnel identifier
+            const tunnelIdentifier = `RemoteDebugging+${vscodeUuid}`
+            const timeoutInMinutes = 720
+            // List existing tunnels
+            const listTunnelsResponse = await iotSecureTunneling.send(new ListTunnelsCommand({}))
+
+            // Find tunnel with our identifier
+            const existingTunnel = listTunnelsResponse.tunnelSummaries?.find(
+                (tunnel) => tunnel.description === tunnelIdentifier && tunnel.status?.toLowerCase() === 'open'
+            )
+
+            if (existingTunnel && existingTunnel.tunnelId) {
+                const timeCreated = existingTunnel?.createdAt ? new Date(existingTunnel.createdAt) : new Date()
+                const expiryTime = new Date(timeCreated.getTime() + timeoutInMinutes * 60 * 1000)
+                const currentTime = new Date()
+                const minutesRemaining = (expiryTime.getTime() - currentTime.getTime()) / (60 * 1000)
+
+                if (minutesRemaining >= 15) {
+                    // Rotate access tokens for the existing tunnel
+                    const rotateResponse = await this.refreshTunnelTokens(existingTunnel.tunnelId, region)
+
+                    return rotateResponse
+                } else {
+                    // Close tunnel if less than 15 minutes remaining
+                    await iotSecureTunneling.send(
+                        new CloseTunnelCommand({
+                            tunnelId: existingTunnel.tunnelId,
+                            delete: false,
+                        })
+                    )
+
+                    getLogger().info(`Closed tunnel ${existingTunnel.tunnelId} with less than 15 minutes remaining`)
+                }
+            }
+
+            // Create new tunnel
+            const openTunnelResponse = await iotSecureTunneling.send(
+                new OpenTunnelCommand({
+                    description: tunnelIdentifier,
+                    timeoutConfig: {
+                        maxLifetimeTimeoutMinutes: timeoutInMinutes, // 12 hours
+                    },
+                    destinationConfig: {
+                        services: ['WSS'],
+                    },
+                })
+            )
+
+            getLogger().info(`Created new tunnel with ID: ${openTunnelResponse.tunnelId}`)
+
+            return {
+                tunnelID: openTunnelResponse.tunnelId || '',
+                sourceToken: openTunnelResponse.sourceAccessToken || '',
+                destinationToken: openTunnelResponse.destinationAccessToken || '',
+            }
+        } catch (error) {
+            throw ToolkitError.chain(error, 'Error creating/reusing tunnel')
+        }
+    }
+
+    // Refresh tunnel tokens
+    async refreshTunnelTokens(tunnelId: string, region: string): Promise<TunnelInfo | undefined> {
+        try {
+            const iotSecureTunneling = this.getIoTSTClient(region)
+            const rotateResponse = await iotSecureTunneling.send(
+                new RotateTunnelAccessTokenCommand({
+                    tunnelId: tunnelId,
+                    clientMode: 'ALL',
+                })
+            )
+
+            return {
+                tunnelID: tunnelId,
+                sourceToken: rotateResponse.sourceAccessToken || '',
+                destinationToken: rotateResponse.destinationAccessToken || '',
+            }
+        } catch (error) {
+            throw ToolkitError.chain(error, 'Error refreshing tunnel tokens')
+        }
+    }
+
+    async getFunctionDetail(functionArn: string): Promise<FunctionConfiguration | undefined> {
+        try {
+            const region = getRegionFromArn(functionArn)
+            if (!region) {
+                getLogger().error(
+                    localize(
+                        'AWS.lambda.ldkClient.couldNotDetermineRegion',
+                        'Could not determine region from Lambda ARN'
+                    )
+                )
+                return undefined
+            }
+            const client = this.getLambdaClient(region)
+            const configuration = (await client.getFunction(functionArn)).Configuration as FunctionConfiguration
+            // get function detail
+            // return function detail
+            return configuration
+        } catch (error) {
+            getLogger().warn(`Error getting function detail:${error}`)
+            return undefined
+        }
+    }
+
+    // Create debug deployment to given lambda function
+    // save a snapshot of the current config to global : aws.lambda.remoteDebugContext
+    // we are 1: changing function timeout to 15 minute
+    // 2: adding the ldk layer LDK_LAYER_ARN_X86_64 or LDK_LAYER_ARN_ARM64 (ignore if already added, fail if 5 layer already there)
+    // 3: adding two param to lambda environment variable
+    // {AWS_LAMBDA_EXEC_WRAPPER:/opt/bin/ldk_wrapper, AWS_LDK_DESTINATION_TOKEN: destinationToken }
+    async createDebugDeployment(
+        config: FunctionConfiguration,
+        destinationToken: string,
+        lambdaTimeout: number,
+        shouldPublishVersion: boolean,
+        ldkLayerArn: string,
+        progress: vscode.Progress<{ message?: string | undefined; increment?: number | undefined }>
+    ): Promise<string> {
+        try {
+            if (!config.FunctionArn || !config.FunctionName) {
+                throw new Error(localize('AWS.lambda.ldkClient.functionArnMissing', 'Function ARN is missing'))
+            }
+            const region = getRegionFromArn(config.FunctionArn ?? '')
+            if (!region) {
+                throw new Error(
+                    localize(
+                        'AWS.lambda.ldkClient.couldNotDetermineRegion',
+                        'Could not determine region from Lambda ARN'
+                    )
+                )
+            }
+
+            // fix out of bound timeout
+            if (lambdaTimeout && (lambdaTimeout > 900 || lambdaTimeout <= 0)) {
+                lambdaTimeout = 900
+            }
+
+            // Inform user about the changes that will be made
+
+            progress.report({ message: localize('AWS.lambda.ldkClient.applyingChanges', 'Applying changes...') })
+
+            // Determine architecture and select appropriate layer
+
+            const layers = config.Layers || []
+
+            // Check if LDK layer is already added
+            const ldkLayerExists = layers.some(
+                (layer) => layer.Arn?.includes('LDKLayerX86') || layer.Arn?.includes('LDKLayerArm64')
+            )
+
+            // Check if we have room to add a layer (max 5)
+            if (!ldkLayerExists && layers.length >= 5) {
+                throw new Error(
+                    localize(
+                        'AWS.lambda.ldkClient.cannotAddLdkLayer',
+                        'Cannot add LDK layer: Lambda function already has 5 layers'
+                    )
+                )
+            }
+            // Create updated layers list
+            const updatedLayers = ldkLayerExists
+                ? layers.map((layer) => layer.Arn!).filter(Boolean)
+                : [...layers.map((layer) => layer.Arn!).filter(Boolean), ldkLayerArn]
+
+            // Create updated environment variables
+            const currentEnv = config.Environment?.Variables || {}
+            const updatedEnv: { [key: string]: string } = {
+                ...currentEnv,
+                AWS_LAMBDA_EXEC_WRAPPER: '/opt/bin/ldk_wrapper',
+                AWS_LAMBDA_DEBUG_ON_LATEST: shouldPublishVersion ? 'false' : 'true',
+                AWS_LDK_DESTINATION_TOKEN: destinationToken,
+            }
+            if (currentEnv['AWS_LAMBDA_EXEC_WRAPPER']) {
+                updatedEnv.ORIGINAL_AWS_LAMBDA_EXEC_WRAPPER = currentEnv['AWS_LAMBDA_EXEC_WRAPPER']
+            }
+
+            if (getLogger().logLevelEnabled('debug')) {
+                updatedEnv.RUST_LOG = 'debug'
+            }
+
+            // Create Lambda client using AWS SDK
+            const lambda = this.getLambdaClient(region)
+
+            // Update function configuration
+            if (!config.FunctionArn || !config.FunctionName) {
+                throw new Error('Function ARN is missing')
+            }
+
+            // Create a temporary config for the update
+            const updateConfig: FunctionConfiguration = {
+                FunctionName: config.FunctionName,
+                Timeout: lambdaTimeout ?? 900, // 15 minutes
+                Layers: updatedLayers.map((arn) => ({ Arn: arn })),
+                Environment: {
+                    Variables: updatedEnv,
+                },
+            }
+
+            await callUpdateFunctionConfiguration(lambda, updateConfig, true)
+
+            // publish version
+            let version = '$Latest'
+            if (shouldPublishVersion) {
+                // should somehow return version for debugging
+                const versionResp = await lambda.publishVersion(config.FunctionName, { waitForUpdate: true })
+                version = versionResp.Version ?? ''
+                // remove debug deployment in a non-blocking way
+                void Promise.resolve(
+                    callUpdateFunctionConfiguration(lambda, config, false).then(() => {
+                        progress.report({
+                            message: localize(
+                                'AWS.lambda.ldkClient.debugDeploymentCompleted',
+                                'Debug deployment completed successfully'
+                            ),
+                        })
+                    })
+                )
+            }
+            return version
+        } catch (error) {
+            getLogger().error(`Error creating debug deployment: ${error}`)
+            if (error instanceof Error) {
+                throw new ToolkitError(`Failed to create debug deployment: ${error.message}`)
+            }
+            return 'Failed'
+        }
+    }
+
+    // Remove debug deployment from the given lambda function
+    // use the snapshot we took before create debug deployment
+    // we are 1: reverting timeout to it's original snapshot
+    // 2: reverting layer status according to it's original snapshot
+    // 3: reverting environment back to it's original snapshot
+    async removeDebugDeployment(config: FunctionConfiguration, check: boolean = true): Promise<boolean> {
+        try {
+            if (!config.FunctionArn || !config.FunctionName) {
+                throw new Error('Function ARN is missing')
+            }
+            const region = getRegionFromArn(config.FunctionArn ?? '')
+            if (!region) {
+                throw new Error('Could not determine region from Lambda ARN')
+            }
+
+            if (check) {
+                const currentConfig = await this.getFunctionDetail(config.FunctionArn)
+                if (
+                    currentConfig?.Timeout === config?.Timeout &&
+                    currentConfig?.Layers?.length === config?.Layers?.length
+                ) {
+                    // nothing to remove
+                    return true
+                }
+            }
+
+            // Create Lambda client using AWS SDK
+            const lambda = this.getLambdaClient(region)
+
+            // Update function configuration back to original values
+            await callUpdateFunctionConfiguration(lambda, config, false)
+
+            return true
+        } catch (error) {
+            // no need to raise, even this failed we want the following to execute
+            throw ToolkitError.chain(error, 'Error removing debug deployment')
+        }
+    }
+
+    async deleteDebugVersion(functionArn: string, qualifier: string) {
+        try {
+            const region = getRegionFromArn(functionArn)
+            if (!region) {
+                throw new Error('Could not determine region from Lambda ARN')
+            }
+            const lambda = this.getLambdaClient(region)
+            await lambda.deleteFunction(functionArn, qualifier)
+            return true
+        } catch (error) {
+            getLogger().error('Error deleting debug version: %O', error)
+            return false
+        }
+    }
+
+    // Start proxy with better resource management
+    async startProxy(region: string, sourceToken: string, port: number = 0): Promise<boolean> {
+        try {
+            getLogger().info(`Starting direct proxy for region:${region}`)
+
+            // Clean up any existing proxy thoroughly
+            if (this.localProxy) {
+                getLogger().info('Stopping existing proxy before starting a new one')
+                this.localProxy.stop()
+                this.localProxy = undefined
+
+                // Small delay to ensure resources are released
+                await new Promise((resolve) => setTimeout(resolve, 100))
+            }
+
+            // Create and start a new local proxy
+            this.localProxy = new LocalProxy()
+
+            // Start the proxy and get the assigned port
+            const localPort = await this.localProxy.start(region, sourceToken, port)
+            getLogger().info(`Local proxy started successfully on port ${localPort}`)
+            return true
+        } catch (error) {
+            getLogger().error(`Failed to start proxy: ${error}`)
+            if (this.localProxy) {
+                this.localProxy.stop()
+                this.localProxy = undefined
+            }
+            throw ToolkitError.chain(error, 'Failed to start proxy')
+        }
+    }
+
+    // Stop proxy with proper cleanup and reference handling
+    async stopProxy(): Promise<boolean> {
+        try {
+            getLogger().info(`Stopping proxy`)
+
+            if (this.localProxy) {
+                // Ensure proper resource cleanup
+                this.localProxy.stop()
+
+                // Force delete the reference to allow GC
+                this.localProxy = undefined
+
+                getLogger().info('Local proxy stopped successfully')
+            } else {
+                getLogger().info('No active local proxy to stop')
+            }
+
+            return true
+        } catch (error) {
+            throw ToolkitError.chain(error, 'Error stopping proxy')
+        }
+    }
+}
+
+// Helper function to extract region from ARN
+export function getRegionFromArn(arn: string | undefined): string | undefined {
+    if (!arn) {
+        return undefined
+    }
+    const parts = arn.split(':')
+    return parts.length >= 4 ? parts[3] : undefined
+}
diff --git a/packages/core/src/lambda/remoteDebugging/ldkController.ts b/packages/core/src/lambda/remoteDebugging/ldkController.ts
new file mode 100644
index 00000000000..5dfbd653dc1
--- /dev/null
+++ b/packages/core/src/lambda/remoteDebugging/ldkController.ts
@@ -0,0 +1,811 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../../shared/logger/logger'
+import globals from '../../shared/extensionGlobals'
+import { FunctionConfiguration, Runtime } from '@aws-sdk/client-lambda'
+import { getRegionFromArn, LdkClient } from './ldkClient'
+import { getFamily, mapFamilyToDebugType } from '../models/samLambdaRuntime'
+import { findJavaPath } from '../../shared/utilities/pathFind'
+import { ToolkitError } from '../../shared/errors'
+import { showConfirmationMessage, showMessage } from '../../shared/utilities/messages'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import * as nls from 'vscode-nls'
+import path from 'path'
+import { glob } from 'glob'
+import { Commands } from '../../shared/vscode/commands2'
+import { getLambdaSnapshot, persistLambdaSnapshot, type LambdaDebugger, type DebugConfig } from './lambdaDebugger'
+import { RemoteLambdaDebugger } from './remoteLambdaDebugger'
+import { LocalStackLambdaDebugger } from './localStackLambdaDebugger'
+import { fs } from '../../shared/fs/fs'
+import { detectCdkProjects } from '../../awsService/cdk/explorer/detectCdkProjects'
+
+const localize = nls.loadMessageBundle()
+const logger = getLogger()
+
+// Map debug types to their corresponding VS Code extension IDs
+const mapDebugTypeToExtensionId = new Map<string, string[]>([
+    ['python', ['ms-python.python']],
+    ['java', ['redhat.java', 'vscjava.vscode-java-debug']],
+    ['node', ['ms-vscode.js-debug']],
+])
+
+const mapExtensionToBackup = new Map<string, string>([['ms-vscode.js-debug', 'ms-vscode.js-debug-nightly']])
+
+// Helper function to create a human-readable diff message
+function createDiffMessage(
+    config: FunctionConfiguration,
+    currentConfig: FunctionConfiguration,
+    isRevert: boolean = true
+): string {
+    let message = isRevert ? 'The following changes will be reverted:\n\n' : 'The following changes will be made:\n\n'
+
+    message +=
+        '1. Timeout: ' +
+        (currentConfig.Timeout || 'default') +
+        ' seconds → ' +
+        (config.Timeout || 'default') +
+        ' seconds\n'
+
+    message += '2. Layers: '
+    const hasLdkLayer = currentConfig.Layers?.some(
+        (layer) => layer.Arn?.includes('LDKLayerX86') || layer.Arn?.includes('LDKLayerArm64')
+    )
+
+    message += hasLdkLayer ? 'Remove LDK layer\n' : 'No Change\n'
+
+    message += '3. Environment Variables: Remove AWS_LAMBDA_EXEC_WRAPPER and AWS_LDK_DESTINATION_TOKEN\n'
+
+    return message
+}
+
+/**
+ * Attempts to revert an existing debug configuration if one exists
+ * @returns true if revert was successful or no config exists, false if revert failed or user chose not to revert
+ */
+export async function revertExistingConfig(): Promise<boolean> {
+    try {
+        // Check if a debug context exists from a previous session
+        const savedConfig = getLambdaSnapshot()
+
+        if (!savedConfig) {
+            // No existing config to revert
+            return true
+        }
+
+        // clear the snapshot for it's corrupted
+        if (!savedConfig.FunctionArn || !savedConfig.FunctionName) {
+            logger.error('Function ARN or Function Name is missing, cannot revert')
+            void (await persistLambdaSnapshot(undefined))
+            return true
+        }
+
+        // compare with current config
+        const currentConfig = await LdkClient.instance.getFunctionDetail(savedConfig.FunctionArn)
+        // could be permission issues, or user has deleted previous function, we should remove the snapshot
+        if (!currentConfig) {
+            logger.error('Failed to get current function state, cannot revert')
+            void (await persistLambdaSnapshot(undefined))
+            return true
+        }
+
+        if (
+            currentConfig?.Timeout === savedConfig?.Timeout &&
+            currentConfig?.Layers?.length === savedConfig?.Layers?.length
+        ) {
+            // No changes needed, remove the snapshot
+            void (await persistLambdaSnapshot(undefined))
+            return true
+        }
+
+        // Create a diff message to show what will be changed
+        const diffMessage = currentConfig
+            ? createDiffMessage(savedConfig, currentConfig, true)
+            : 'Failed to get current function state'
+
+        const response = await showConfirmationMessage({
+            prompt: localize(
+                'AWS.lambda.remoteDebug.revertPreviousDeployment',
+                'A previous debug deployment was detected for {0}. Would you like to revert those changes before proceeding?\n\n{1}',
+                savedConfig.FunctionName,
+                diffMessage
+            ),
+            confirm: localize('AWS.lambda.remoteDebug.revert', 'Revert'),
+            cancel: localize('AWS.lambda.remoteDebug.dontShowAgain', "Don't show again"),
+            type: 'warning',
+        })
+
+        if (!response) {
+            // User chose not to revert, remove the snapshot
+            void (await persistLambdaSnapshot(undefined))
+            return true
+        }
+
+        await LdkClient.instance.removeDebugDeployment(savedConfig, false)
+        await persistLambdaSnapshot(undefined)
+        void showMessage(
+            'info',
+            localize(
+                'AWS.lambda.remoteDebug.successfullyReverted',
+                'Successfully reverted changes to {0}',
+                savedConfig.FunctionName
+            )
+        )
+
+        return true
+    } catch (error) {
+        throw ToolkitError.chain(error, `Error in revertExistingConfig`)
+    }
+}
+
+export async function activateRemoteDebugging(): Promise<void> {
+    try {
+        globals.context.subscriptions.push(
+            Commands.register('aws.lambda.remoteDebugging.clearSnapshot', async () => {
+                void (await persistLambdaSnapshot(undefined))
+            })
+        )
+    } catch (error) {
+        logger.error(`Error in registering clearSnapshot command:${error}`)
+    }
+
+    try {
+        logger.info('Remote debugging is initiated')
+
+        // Use the revertExistingConfig function to handle any existing debug configurations
+        await revertExistingConfig()
+
+        // Initialize RemoteDebugController to ensure proper startup state
+        RemoteDebugController.instance.ensureCleanState()
+    } catch (error) {
+        // show warning
+        void vscode.window.showWarningMessage(`Error in activateRemoteDebugging: ${error}`)
+        logger.error(`Error in activateRemoteDebugging:${error}`)
+    }
+}
+
+/**
+ * Try to auto-detect outFile for TypeScript debugging (SAM or CDK)
+ * @param debugConfig Debug configuration
+ * @param functionConfig Lambda function configuration
+ * @returns The auto-detected outFile path or undefined
+ */
+export async function tryAutoDetectOutFile(
+    debugConfig: DebugConfig,
+    functionConfig: FunctionConfiguration
+): Promise<string | undefined> {
+    // Only works for TypeScript files
+    if (
+        !debugConfig.handlerFile ||
+        (!debugConfig.handlerFile.endsWith('.ts') && !debugConfig.handlerFile.endsWith('.tsx'))
+    ) {
+        return undefined
+    }
+
+    // Try SAM detection first using the provided parameters
+    if (debugConfig.samFunctionLogicalId && debugConfig.samProjectRoot) {
+        // if proj root is ..../sam-proj/
+        // build dir will be ..../sam-proj/.aws-sam/build/{LogicalID}/
+        const samBuildPath = vscode.Uri.joinPath(
+            debugConfig.samProjectRoot,
+            '.aws-sam',
+            'build',
+            debugConfig.samFunctionLogicalId
+        )
+
+        if (await fs.exists(samBuildPath)) {
+            getLogger().info(`SAM outFile auto-detected: ${samBuildPath.fsPath}`)
+            return samBuildPath.fsPath
+        }
+    }
+
+    // If SAM detection didn't work, try CDK detection using the function name
+    if (!functionConfig.FunctionName) {
+        return undefined
+    }
+
+    try {
+        // Find which workspace contains the handler file
+        const workspaceFolder = vscode.workspace.getWorkspaceFolder(vscode.Uri.file(debugConfig.handlerFile))
+        if (!workspaceFolder) {
+            return undefined
+        }
+
+        // Detect CDK projects in the workspace
+        const cdkProjects = await detectCdkProjects([workspaceFolder])
+
+        for (const project of cdkProjects) {
+            // Check if CDK project contains the handler file
+            const cdkProjectDir = vscode.Uri.joinPath(project.cdkJsonUri, '..')
+            // Normalize paths for comparison (handles Windows path separators and case)
+            const normalizedHandlerPath = path.normalize(debugConfig.handlerFile).toLowerCase()
+            const normalizedCdkPath = path.normalize(cdkProjectDir.fsPath).toLowerCase()
+            if (!normalizedHandlerPath.startsWith(normalizedCdkPath)) {
+                continue
+            }
+
+            // Get the cdk.out directory
+            const cdkOutDir = vscode.Uri.joinPath(project.treeUri, '..')
+
+            // Look for template.json files in cdk.out directory
+            const pattern = new vscode.RelativePattern(cdkOutDir.fsPath, '*.template.json')
+            const templateFiles = await vscode.workspace.findFiles(pattern)
+
+            for (const templateFile of templateFiles) {
+                try {
+                    // Read and parse the template.json file
+                    const templateContent = await fs.readFileText(templateFile)
+                    const template = JSON.parse(templateContent)
+
+                    // Search through resources for a Lambda function with matching FunctionName
+                    for (const [_, resource] of Object.entries(template.Resources || {})) {
+                        const res = resource as any
+                        if (
+                            res.Type === 'AWS::Lambda::Function' &&
+                            res.Properties?.FunctionName === functionConfig.FunctionName
+                        ) {
+                            // Found the matching function, extract the asset path from metadata
+                            const assetPath = res.Metadata?.['aws:asset:path']
+                            if (assetPath) {
+                                const assetDir = vscode.Uri.joinPath(cdkOutDir, assetPath)
+
+                                // Check if the asset directory exists
+                                if (await fs.exists(assetDir)) {
+                                    getLogger().info(`CDK outFile auto-detected from template.json: ${assetDir.fsPath}`)
+                                    return assetDir.fsPath
+                                }
+                            }
+                        }
+                    }
+                } catch (error) {
+                    getLogger().debug(`Failed to parse template file ${templateFile.fsPath}: ${error}`)
+                }
+            }
+        }
+    } catch (error) {
+        getLogger().warn(`Failed to auto-detect CDK outFile: ${error}`)
+    }
+
+    return undefined
+}
+
+/**
+ * Helper function to check if a string is a valid VSCode glob pattern
+ */
+function isVscodeGlob(pattern: string): boolean {
+    // Check for common glob patterns: *, **, ?, [], {}
+    return /[*?[\]{}]/.test(pattern)
+}
+
+/**
+ * Helper function to validate source map files exist for given outFiles patterns
+ */
+async function validateSourceMapFiles(outFiles: string[]): Promise<boolean> {
+    const allAreGlobs = outFiles.every((pattern) => isVscodeGlob(pattern))
+    if (!allAreGlobs) {
+        return false
+    }
+
+    try {
+        let jsfileCount = 0
+        let mapfileCount = 0
+        const jsFiles = await glob(outFiles, { ignore: 'node_modules/**' })
+
+        for (const file of jsFiles) {
+            if (file.includes('js')) {
+                jsfileCount += 1
+            }
+            if (file.includes('.map')) {
+                mapfileCount += 1
+            }
+        }
+
+        return jsfileCount === 0 || mapfileCount === 0 ? false : true
+    } catch (error) {
+        getLogger().warn(`Error validating source map files: ${error}`)
+        return false
+    }
+}
+
+function processOutFiles(outFiles: string[], localRoot: string): string[] {
+    const processedOutFiles: string[] = []
+
+    for (let outFile of outFiles) {
+        if (!outFile.includes('*')) {
+            // add * in the end
+            outFile = path.join(outFile, '*')
+        }
+        if (!path.isAbsolute(outFile)) {
+            // Find which workspace contains the localRoot path
+            const workspaceFolders = vscode.workspace.workspaceFolders
+            if (workspaceFolders) {
+                let matchingWorkspace: vscode.WorkspaceFolder | undefined
+
+                // Check if localRoot is within any workspace
+                for (const workspace of workspaceFolders) {
+                    const absoluteLocalRoot = path.resolve(localRoot)
+                    const workspacePath = workspace.uri.fsPath
+
+                    if (absoluteLocalRoot.startsWith(workspacePath)) {
+                        matchingWorkspace = workspace
+                        break
+                    }
+                }
+
+                if (matchingWorkspace) {
+                    // Join workspace folder with the relative outFile path
+                    processedOutFiles.push(path.join(matchingWorkspace.uri.fsPath, outFile))
+                } else {
+                    // If no matching workspace found, use the original outFile
+                    processedOutFiles.push(outFile)
+                }
+            } else {
+                // No workspace folders, use the original outFile
+                processedOutFiles.push(outFile)
+            }
+        } else {
+            // Already absolute path, use as is
+            processedOutFiles.push(outFile)
+        }
+    }
+    return processedOutFiles
+}
+
+async function getVscodeDebugConfig(
+    functionConfig: FunctionConfiguration,
+    debugConfig: DebugConfig
+): Promise<vscode.DebugConfiguration> {
+    // Parse and validate otherDebugParams if provided
+    let additionalParams: Record<string, any> = {}
+    if (debugConfig.otherDebugParams) {
+        try {
+            const parsed = JSON.parse(debugConfig.otherDebugParams)
+            if (typeof parsed === 'object' && !Array.isArray(parsed)) {
+                additionalParams = parsed
+                getLogger().info('Additional debug parameters parsed successfully: %O ', additionalParams)
+            } else {
+                void vscode.window.showWarningMessage(
+                    localize(
+                        'AWS.lambda.remoteDebug.invalidDebugParams',
+                        'Other Debug Parameters must be a valid JSON object. The parameter will be ignored.'
+                    )
+                )
+                getLogger().warn(`Invalid otherDebugParams format: expected object, got ${typeof parsed}`)
+            }
+        } catch (error) {
+            void vscode.window.showWarningMessage(
+                localize(
+                    'AWS.lambda.remoteDebug.failedToParseDebugParams',
+                    'Failed to parse Other Debug Parameters as JSON: {0}. The parameter will be ignored.',
+                    error instanceof Error ? error.message : 'Invalid JSON'
+                )
+            )
+            getLogger().warn(`Failed to parse otherDebugParams as JSON: ${error}`)
+        }
+    }
+
+    const debugSessionName = `Debug ${functionConfig.FunctionArn!.split(':').pop()}`
+
+    // Define debugConfig before the try block
+    const debugType = mapFamilyToDebugType.get(getFamily(functionConfig.Runtime!), 'unknown')
+    let vsCodeDebugConfig: vscode.DebugConfiguration
+    switch (debugType) {
+        case 'node':
+            // Try to auto-detect outFiles for TypeScript if not provided
+            if (debugConfig.sourceMap && !debugConfig.outFiles && debugConfig.handlerFile) {
+                const autoDetectedOutFile = await tryAutoDetectOutFile(debugConfig, functionConfig)
+                if (autoDetectedOutFile) {
+                    debugConfig.outFiles = [autoDetectedOutFile]
+                    getLogger().info(`outFile auto-detected: ${autoDetectedOutFile}`)
+                }
+            }
+
+            // source map support
+            if (debugConfig.sourceMap && debugConfig.outFiles) {
+                // process outFiles first, if they are relative path (not starting with /),
+                // check local root path is located in which workspace. Then join workspace Folder with outFiles
+
+                // Update debugConfig with processed outFiles
+                debugConfig.outFiles = processOutFiles(debugConfig.outFiles, debugConfig.localRoot)
+
+                // Use glob to search if there are any matching js file or source map file
+                const hasSourceMaps = await validateSourceMapFiles(debugConfig.outFiles)
+
+                if (hasSourceMaps) {
+                    // support mapping common sam cli location
+                    additionalParams['sourceMapPathOverrides'] = {
+                        ...additionalParams['sourceMapPathOverrides'],
+                        '?:*/T/?:*/*': path.join(debugConfig.localRoot, '*'),
+                    }
+                    debugConfig.localRoot = debugConfig.outFiles[0].split('*')[0]
+                } else {
+                    debugConfig.sourceMap = false
+                    debugConfig.outFiles = undefined
+                    await showMessage(
+                        'warn',
+                        localize(
+                            'AWS.lambda.remoteDebug.outFileNotFound',
+                            'outFiles not valid or no js and map file found in outFiles, debug will continue without sourceMap support'
+                        )
+                    )
+                }
+            }
+            vsCodeDebugConfig = {
+                type: debugType,
+                request: 'attach',
+                name: debugSessionName,
+                address: 'localhost',
+                port: debugConfig.port,
+                localRoot: debugConfig.localRoot,
+                remoteRoot: debugConfig.remoteRoot,
+                skipFiles: debugConfig.skipFiles,
+                sourceMaps: debugConfig.sourceMap,
+                outFiles: debugConfig.outFiles,
+                continueOnAttach: debugConfig.outFiles ? false : true,
+                stopOnEntry: false,
+                timeout: 60000,
+                ...additionalParams, // Merge additional debug parameters
+            }
+            break
+        case 'python':
+            vsCodeDebugConfig = {
+                type: debugType,
+                request: 'attach',
+                name: debugSessionName,
+                port: debugConfig.port,
+                cwd: debugConfig.localRoot,
+                pathMappings: [
+                    {
+                        localRoot: debugConfig.localRoot,
+                        remoteRoot: debugConfig.remoteRoot,
+                    },
+                ],
+                justMyCode: debugConfig.justMyCode ?? true,
+                ...additionalParams, // Merge additional debug parameters
+            }
+            break
+        case 'java':
+            vsCodeDebugConfig = {
+                type: debugType,
+                request: 'attach',
+                name: debugSessionName,
+                hostName: 'localhost',
+                port: debugConfig.port,
+                sourcePaths: [debugConfig.localRoot],
+                projectName: debugConfig.projectName,
+                timeout: 60000,
+                ...additionalParams, // Merge additional debug parameters
+            }
+            break
+        default:
+            throw new ToolkitError(`Unsupported debug type: ${debugType}`)
+    }
+    getLogger().info('VS Code debug configuration: %O', vsCodeDebugConfig)
+    return vsCodeDebugConfig
+}
+
+export class RemoteDebugController {
+    static #instance: RemoteDebugController
+    isDebugging: boolean = false
+    qualifier: string | undefined = undefined
+    debugger: LambdaDebugger | undefined = undefined
+    private lastDebugStartTime: number = 0
+    // private debugSession: DebugSession | undefined
+    private debugSessionDisposables: Map<string, vscode.Disposable> = new Map()
+    private debugTypeSource: 'remoteDebug' | 'LocalStackDebug' = 'remoteDebug'
+
+    public static get instance() {
+        if (this.#instance !== undefined) {
+            return this.#instance
+        }
+
+        const self = (this.#instance = new this())
+        return self
+    }
+
+    constructor() {}
+
+    /**
+     * Ensures the controller is in a clean state at startup or before a new operation
+     */
+    public ensureCleanState(): void {
+        this.isDebugging = false
+        this.qualifier = undefined
+
+        // Clean up any leftover disposables
+        for (const [key, disposable] of this.debugSessionDisposables.entries()) {
+            try {
+                disposable.dispose()
+            } catch (e) {
+                // Ignore errors during startup cleanup
+            }
+            this.debugSessionDisposables.delete(key)
+        }
+    }
+
+    public supportCodeDownload(runtime: Runtime | undefined, codeSha256: string | undefined = ''): boolean {
+        if (!runtime) {
+            return false
+        }
+        // Incompatible with LocalStack hot-reloading
+        if (codeSha256?.startsWith('hot-reloading')) {
+            return false
+        }
+        try {
+            return ['node', 'python'].includes(mapFamilyToDebugType.get(getFamily(runtime)) ?? '')
+        } catch {
+            // deprecated runtime
+            return false
+        }
+    }
+
+    public supportRuntimeRemoteDebug(runtime: Runtime | undefined): boolean {
+        if (!runtime) {
+            return false
+        }
+        try {
+            return ['node', 'python', 'java'].includes(mapFamilyToDebugType.get(getFamily(runtime)) ?? '')
+        } catch {
+            return false
+        }
+    }
+
+    public async installDebugExtension(runtime: Runtime | undefined): Promise<boolean | undefined> {
+        if (!runtime) {
+            throw new ToolkitError('Runtime is undefined')
+        }
+
+        const debugType = mapFamilyToDebugType.get(getFamily(runtime))
+        if (!debugType) {
+            throw new ToolkitError(`Debug type is undefined for runtime ${runtime}`)
+        }
+        // Install needed debug extension based on runtime
+        const extensions = mapDebugTypeToExtensionId.get(debugType)
+        if (extensions) {
+            for (const extension of extensions) {
+                const extensionObj = vscode.extensions.getExtension(extension)
+                const backupExtensionObj = vscode.extensions.getExtension(mapExtensionToBackup.get(extension) ?? '')
+
+                if (!extensionObj && !backupExtensionObj) {
+                    // Extension is not installed, install it
+                    const choice = await showConfirmationMessage({
+                        prompt: localize(
+                            'AWS.lambda.remoteDebug.extensionNotInstalled',
+                            'You need to install the {0} extension to debug {1} functions. Would you like to install it now?',
+                            extension,
+                            debugType
+                        ),
+                        confirm: localize('AWS.lambda.remoteDebug.install', 'Install'),
+                        cancel: localize('AWS.lambda.remoteDebug.cancel', 'Cancel'),
+                        type: 'warning',
+                    })
+                    if (!choice) {
+                        return false
+                    }
+                    await vscode.commands.executeCommand('workbench.extensions.installExtension', extension)
+                    if (vscode.extensions.getExtension(extension) === undefined) {
+                        return false
+                    }
+                }
+            }
+        }
+
+        if (debugType === 'java' && !(await findJavaPath())) {
+            // jvm not available
+            const choice = await showConfirmationMessage({
+                prompt: localize(
+                    'AWS.lambda.remoteDebug.jvmNotInstalled',
+                    'You need to install a JVM to debug Java functions. Would you like to install it now?'
+                ),
+                confirm: localize('AWS.lambda.remoteDebug.install', 'Install'),
+                cancel: localize('AWS.lambda.remoteDebug.continueAnyway', 'Continue Anyway'),
+                type: 'warning',
+            })
+            // open https://developers.redhat.com/products/openjdk/download
+            if (choice) {
+                await vscode.env.openExternal(
+                    vscode.Uri.parse('https://developers.redhat.com/products/openjdk/download')
+                )
+                return false
+            }
+        }
+        // passed all checks
+        return true
+    }
+
+    public async startDebugging(functionArn: string, runtime: string, debugConfig: DebugConfig): Promise<void> {
+        if (debugConfig.isLambdaRemote) {
+            this.debugTypeSource = 'remoteDebug'
+            this.debugger = new RemoteLambdaDebugger(debugConfig, {
+                getQualifier: () => {
+                    return this.qualifier
+                },
+                setQualifier: (qualifier) => {
+                    this.qualifier = qualifier
+                },
+            })
+        } else {
+            this.debugTypeSource = 'LocalStackDebug'
+            this.debugger = new LocalStackLambdaDebugger(debugConfig)
+        }
+        if (this.isDebugging) {
+            getLogger().error('Debug already in progress, remove debug setup to restart')
+            return
+        }
+
+        await telemetry.lambda_remoteDebugStart.run(async (span) => {
+            // Create a copy of debugConfig without functionName and functionArn for telemetry
+            const debugConfigForTelemetry: Partial<DebugConfig> = { ...debugConfig }
+            debugConfigForTelemetry.functionName = undefined
+            debugConfigForTelemetry.functionArn = undefined
+            debugConfigForTelemetry.localRoot = undefined
+
+            span.record({
+                source: this.debugTypeSource,
+                passive: false,
+                action: JSON.stringify(debugConfigForTelemetry),
+            })
+            this.lastDebugStartTime = Date.now()
+            await vscode.window.withProgress(
+                {
+                    location: vscode.ProgressLocation.Notification,
+                    title: 'Setting up debug session',
+                    cancellable: false,
+                },
+                async (progress) => {
+                    // Reset state before starting
+                    this.ensureCleanState()
+
+                    getLogger().info(`Starting debugger for ${functionArn}`)
+
+                    const region = getRegionFromArn(functionArn)
+                    if (!region) {
+                        throw new ToolkitError('Could not determine region from Lambda ARN')
+                    }
+
+                    // Check if runtime / region is supported for remote debugging
+                    if (!this.supportRuntimeRemoteDebug(runtime as Runtime)) {
+                        throw new ToolkitError(
+                            `Runtime ${runtime} is not supported for remote debugging. ` +
+                                `Only Python, Node.js, and Java runtimes are supported.`
+                        )
+                    }
+
+                    // Ensure the remote connection is reachable before calling lambda.GetFunction in revertExistingConfig()
+                    await this.debugger?.checkHealth()
+
+                    // Check if a snapshot already exists and revert if needed
+                    // Use the revertExistingConfig function from ldkController
+                    progress.report({ message: 'Checking if snapshot exists...' })
+                    const revertResult = await revertExistingConfig()
+
+                    // If revert failed and user didn't choose to ignore, abort the deployment
+                    if (revertResult === false) {
+                        return
+                    }
+                    try {
+                        // Anything fails before this point doesn't requires reverting
+                        this.isDebugging = true
+
+                        // the following will contain changes that requires reverting.
+                        // Create a snapshot of lambda config before debug
+                        // let's preserve this config to a global variable at here
+                        // we will use this config to revert the changes back to it once was, once confirm it's success, update the global to undefined
+                        // if somehow the changes failed to revert, in init phase(activate remote debugging), we will detect this config and prompt user to revert the changes
+                        // get function config again in case anything changed
+                        const functionConfig = await LdkClient.instance.getFunctionDetail(functionArn)
+                        if (!functionConfig?.Runtime || !functionConfig?.FunctionArn) {
+                            throw new ToolkitError('Could not retrieve Lambda function configuration')
+                        }
+                        await persistLambdaSnapshot(functionConfig)
+
+                        // Record runtime in telemetry
+                        span.record({
+                            runtimeString: functionConfig.Runtime as any,
+                        })
+
+                        await this.debugger?.setup(progress, functionConfig, region)
+
+                        const vscodeDebugConfig = await getVscodeDebugConfig(functionConfig, debugConfig)
+                        // show every field in debugConfig
+                        // getLogger().info(`Debug configuration created successfully ${JSON.stringify(debugConfig)}`)
+
+                        await this.debugger?.waitForSetup(progress, functionConfig, region)
+
+                        progress.report({ message: 'Starting debugger...' })
+                        // Start debugging in a non-blocking way
+                        void Promise.resolve(vscode.debug.startDebugging(undefined, vscodeDebugConfig)).then(
+                            async (debugStarted) => {
+                                if (!debugStarted) {
+                                    // this could be triggered by another stop debugging, let's check state before stopping.
+                                    throw new ToolkitError('Failed to start debug session')
+                                }
+                            }
+                        )
+
+                        const debugSessionEndDisposable = vscode.debug.onDidTerminateDebugSession(async (session) => {
+                            if (session.name === vscodeDebugConfig.name) {
+                                void (await this.stopDebugging())
+                            }
+                        })
+
+                        await this.debugger?.waitForFunctionUpdates(progress)
+
+                        // Store the disposable
+                        this.debugSessionDisposables.set(functionConfig.FunctionArn, debugSessionEndDisposable)
+                        progress.report({
+                            message: `Debug session setup completed for ${functionConfig.FunctionArn.split(':').pop()}`,
+                        })
+                    } catch (error) {
+                        try {
+                            await this.stopDebugging()
+                        } catch (errStop) {
+                            getLogger().error(
+                                'encountered following error when stopping debug for failed debug session:'
+                            )
+                            getLogger().error(errStop as Error)
+                        }
+
+                        throw ToolkitError.chain(error, 'Error StartDebugging')
+                    }
+                }
+            )
+        })
+    }
+
+    public async stopDebugging(): Promise<void> {
+        await telemetry.lambda_remoteDebugStop.run(async (span) => {
+            if (!this.isDebugging) {
+                void showMessage(
+                    'info',
+                    localize('AWS.lambda.remoteDebug.debugNotInProgress', 'Debug is not in progress')
+                )
+                return
+            }
+            // use sessionDuration to record debug duration
+            span.record({
+                sessionDuration: this.lastDebugStartTime === 0 ? 0 : Date.now() - this.lastDebugStartTime,
+                source: this.debugTypeSource,
+            })
+            try {
+                await vscode.window.withProgress(
+                    {
+                        location: vscode.ProgressLocation.Notification,
+                        title: 'Stopping debug session',
+                        cancellable: false,
+                    },
+                    async (progress) => {
+                        progress.report({ message: 'Stopping debugging...' })
+
+                        // First attempt to clean up resources from Lambda
+                        const savedConfig = getLambdaSnapshot()
+                        if (!savedConfig?.FunctionArn) {
+                            getLogger().error('No saved configuration found during cleanup')
+                            throw new ToolkitError('No saved configuration found during cleanup')
+                        }
+
+                        const disposable = this.debugSessionDisposables.get(savedConfig.FunctionArn)
+                        if (disposable) {
+                            disposable.dispose()
+                            this.debugSessionDisposables.delete(savedConfig.FunctionArn)
+                        }
+                        await this.debugger?.cleanup(savedConfig)
+
+                        progress.report({ message: `Debug session stopped` })
+                    }
+                )
+                void showMessage(
+                    'info',
+                    localize('AWS.lambda.remoteDebug.debugSessionStopped', 'Debug session stopped')
+                )
+            } catch (error) {
+                throw ToolkitError.chain(error, 'error when stopping remote debug')
+            } finally {
+                this.isDebugging = false
+            }
+        })
+    }
+}
diff --git a/packages/core/src/lambda/remoteDebugging/ldkLayers.ts b/packages/core/src/lambda/remoteDebugging/ldkLayers.ts
new file mode 100644
index 00000000000..f0c5dff2c02
--- /dev/null
+++ b/packages/core/src/lambda/remoteDebugging/ldkLayers.ts
@@ -0,0 +1,46 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+interface RegionAccountMapping {
+    [region: string]: string
+}
+
+// Map region to account ID
+export const regionToAccount: RegionAccountMapping = {
+    'us-east-1': '166855510987',
+    'ap-northeast-1': '435951944084',
+    'us-west-1': '397974708477',
+    'us-west-2': '116489046076',
+    'us-east-2': '372632330791',
+    'ca-central-1': '816313119386',
+    'eu-west-1': '020236748984',
+    'eu-west-2': '199003954714',
+    'eu-west-3': '490913546906',
+    'eu-central-1': '944487268028',
+    'eu-north-1': '351516301086',
+    'ap-southeast-1': '812073016575',
+    'ap-southeast-2': '185226997092',
+    'ap-northeast-2': '241511115815',
+    'ap-south-1': '926022987530',
+    'sa-east-1': '313162186107',
+    'ap-east-1': '416298298123',
+    'me-south-1': '511027370648',
+    'me-central-1': '766358817862',
+}
+
+// Global layer version
+const globalLayerVersion = 2
+
+export function getRemoteDebugLayerForArch(region: string, arch: string): string | undefined {
+    const account = regionToAccount[region]
+
+    if (!account) {
+        return undefined
+    }
+
+    const layerName = arch === 'x86_64' ? 'LDKLayerX86' : 'LDKLayerArm64'
+
+    return `arn:aws:lambda:${region}:${account}:layer:${layerName}:${globalLayerVersion}`
+}
diff --git a/packages/core/src/lambda/remoteDebugging/localProxy.ts b/packages/core/src/lambda/remoteDebugging/localProxy.ts
new file mode 100644
index 00000000000..8b228deeb1a
--- /dev/null
+++ b/packages/core/src/lambda/remoteDebugging/localProxy.ts
@@ -0,0 +1,901 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as net from 'net'
+import WebSocket from 'ws'
+import * as crypto from 'crypto'
+import { getLogger } from '../../shared/logger/logger'
+import { v4 as uuidv4 } from 'uuid'
+import * as protobuf from 'protobufjs'
+
+const logger = getLogger()
+
+// Define the message types from the protocol
+enum MessageType {
+    UNKNOWN = 0,
+    DATA = 1,
+    STREAM_START = 2,
+    STREAM_RESET = 3,
+    SESSION_RESET = 4,
+    SERVICE_IDS = 5,
+    CONNECTION_START = 6,
+    CONNECTION_RESET = 7,
+}
+
+// Interface for tunnel info
+export interface TunnelInfo {
+    tunnelId: string
+    sourceToken: string
+    destinationToken: string
+}
+
+// Interface for TCP connection
+interface TcpConnection {
+    socket: net.Socket
+    streamId: number
+    connectionId: number
+}
+
+/**
+ * LocalProxy class that handles WebSocket connection to IoT secure tunneling
+ * and sets up a TCP adapter as a local proxy
+ */
+export class LocalProxy {
+    private ws: WebSocket.WebSocket | undefined = undefined
+    private tcpServer: net.Server | undefined = undefined
+    private tcpConnections: Map<number, TcpConnection> = new Map()
+    private isConnected: boolean = false
+    private reconnectAttempts: number = 0
+    private maxReconnectAttempts: number = 10
+    private reconnectInterval: number = 2500 // 2.5 seconds
+    private pingInterval: NodeJS.Timeout | undefined = undefined
+    private serviceId: string = 'WSS'
+    private currentStreamId: number = 1
+    private nextConnectionId: number = 1
+    private localPort: number = 0
+    private region: string = ''
+    private accessToken: string = ''
+    private Message: protobuf.Type | undefined = undefined
+    private clientToken: string = ''
+    private eventHandlers: { [key: string]: any[] } = {}
+    private isDisposed: boolean = false
+
+    constructor() {
+        void this.loadProtobufDefinition()
+    }
+
+    // Define the protobuf schema as a string constant
+    private static readonly protobufSchema = `
+    syntax = "proto3";
+
+    package com.amazonaws.iot.securedtunneling;
+
+    message Message {
+        Type    type         = 1;
+        int32   streamId     = 2;
+        bool    ignorable    = 3;
+        bytes   payload      = 4;
+        string  serviceId = 5;
+        repeated string availableServiceIds = 6;
+        uint32 connectionId = 7;
+
+        enum Type {
+            UNKNOWN = 0;
+            DATA = 1;
+            STREAM_START = 2;
+            STREAM_RESET = 3;
+            SESSION_RESET = 4;
+            SERVICE_IDS = 5;
+            CONNECTION_START = 6;
+            CONNECTION_RESET = 7;
+        }
+    }`
+
+    /**
+     * Load the protobuf definition from the embedded schema string
+     */
+    private async loadProtobufDefinition(): Promise<void> {
+        try {
+            if (this.Message) {
+                // Already loaded, don't parse again
+                return
+            }
+
+            const root = protobuf.parse(LocalProxy.protobufSchema).root
+            this.Message = root.lookupType('com.amazonaws.iot.securedtunneling.Message')
+
+            if (!this.Message) {
+                throw new Error('Failed to load Message type from protobuf definition')
+            }
+
+            logger.debug('Protobuf definition loaded successfully')
+        } catch (error) {
+            logger.error(`Error loading protobuf definition:${error}`)
+            throw error
+        }
+    }
+
+    /**
+     * Start the local proxy
+     * @param region AWS region
+     * @param sourceToken Source token for the tunnel
+     * @param port Local port to listen on
+     */
+    public async start(region: string, sourceToken: string, port: number = 0): Promise<number> {
+        // Reset disposal state when starting
+        this.isDisposed = false
+
+        this.region = region
+        this.accessToken = sourceToken
+
+        try {
+            // Start TCP server first
+            this.localPort = await this.startTcpServer(port)
+
+            // Then connect to WebSocket
+            await this.connectWebSocket()
+
+            return this.localPort
+        } catch (error) {
+            logger.error(`Failed to start local proxy:${error}`)
+            this.stop()
+            throw error
+        }
+    }
+
+    /**
+     * Stop the local proxy and clean up all resources
+     */
+    public stop(): void {
+        if (this.isDisposed) {
+            logger.debug('LocalProxy already stopped, skipping duplicate stop call')
+            return
+        }
+
+        logger.debug('Stopping LocalProxy and cleaning up resources')
+
+        // Cancel any pending reconnect timeouts
+        if (this.eventHandlers['reconnectTimeouts']) {
+            for (const timeoutId of this.eventHandlers['reconnectTimeouts']) {
+                clearTimeout(timeoutId as NodeJS.Timeout)
+            }
+        }
+
+        this.stopPingInterval()
+        this.closeWebSocket()
+        this.closeTcpServer()
+
+        // Reset all state
+        this.clientToken = ''
+        this.isConnected = false
+        this.reconnectAttempts = 0
+        this.currentStreamId = 1
+        this.nextConnectionId = 1
+        this.localPort = 0
+        this.region = ''
+        this.accessToken = ''
+
+        // Mark as disposed to prevent duplicate stop calls
+        this.isDisposed = true
+
+        // Clear any remaining event handlers reference
+        this.eventHandlers = {}
+    }
+
+    /**
+     * Start the TCP server
+     * @param port Port to listen on (0 for random port)
+     * @returns The port the server is listening on
+     */
+    private startTcpServer(port: number): Promise<number> {
+        return new Promise((resolve, reject) => {
+            try {
+                this.tcpServer = net.createServer((socket) => {
+                    this.handleNewTcpConnection(socket)
+                })
+
+                this.tcpServer.on('error', (err) => {
+                    logger.error(`TCP server error:${err}`)
+                })
+
+                this.tcpServer.listen(port, '127.0.0.1', () => {
+                    const address = this.tcpServer?.address() as net.AddressInfo
+                    this.localPort = address.port
+                    logger.debug(`TCP server listening on port ${this.localPort}`)
+                    resolve(this.localPort)
+                })
+            } catch (error) {
+                logger.error(`Failed to start TCP server:${error}`)
+                reject(error)
+            }
+        })
+    }
+
+    /**
+     * Close the TCP server and all connections
+     */
+    private closeTcpServer(): void {
+        if (this.tcpServer) {
+            logger.debug('Closing TCP server and connections')
+
+            // Remove all listeners from the server
+            this.tcpServer.removeAllListeners('error')
+            this.tcpServer.removeAllListeners('connection')
+            this.tcpServer.removeAllListeners('listening')
+
+            // Close all TCP connections with proper error handling
+            for (const connection of this.tcpConnections.values()) {
+                try {
+                    // Remove all listeners before destroying
+                    connection.socket.removeAllListeners('data')
+                    connection.socket.removeAllListeners('error')
+                    connection.socket.removeAllListeners('close')
+                    connection.socket.destroy()
+                } catch (err) {
+                    logger.error(`Error closing TCP connection: ${err}`)
+                }
+            }
+            this.tcpConnections.clear()
+
+            // Close the server with proper error handling and timeout
+            try {
+                // Set a timeout in case server.close() hangs
+                const serverCloseTimeout = setTimeout(() => {
+                    logger.warn('TCP server close timed out, forcing closure')
+                    this.tcpServer = undefined
+                }, 5000)
+
+                this.tcpServer.close(() => {
+                    clearTimeout(serverCloseTimeout)
+                    logger.debug('TCP server closed successfully')
+                    this.tcpServer = undefined
+                })
+            } catch (err) {
+                logger.error(`Error closing TCP server: ${err}`)
+                this.tcpServer = undefined
+            }
+        }
+    }
+
+    /**
+     * Handle a new TCP connection with proper resource management
+     * @param socket The TCP socket
+     */
+    private handleNewTcpConnection(socket: net.Socket): void {
+        if (!this.isConnected || this.isDisposed) {
+            logger.warn('WebSocket not connected or proxy disposed, rejecting TCP connection')
+            socket.destroy()
+            return
+        }
+
+        const connectionId = this.nextConnectionId++
+        const streamId = this.currentStreamId
+
+        logger.debug(`New TCP connection: ${connectionId}`)
+
+        // Track event handlers for this connection
+        const handlers: { [event: string]: (...args: any[]) => void } = {}
+
+        // Data handler
+        const dataHandler = (data: Buffer) => {
+            this.sendData(streamId, connectionId, data)
+        }
+        socket.on('data', dataHandler)
+        handlers.data = dataHandler
+
+        // Error handler
+        const errorHandler = (err: Error) => {
+            logger.error(`TCP connection ${connectionId} error: ${err}`)
+            this.sendConnectionReset(streamId, connectionId)
+
+            // Cleanup handlers on error
+            this.cleanupSocketHandlers(socket, handlers)
+        }
+        socket.on('error', errorHandler)
+        handlers.error = errorHandler
+
+        // Close handler
+        const closeHandler = () => {
+            logger.debug(`TCP connection ${connectionId} closed`)
+
+            // Remove from connections map and send reset
+            this.tcpConnections.delete(connectionId)
+            this.sendConnectionReset(streamId, connectionId)
+
+            // Cleanup handlers on close
+            this.cleanupSocketHandlers(socket, handlers)
+        }
+        socket.on('close', closeHandler)
+        handlers.close = closeHandler
+
+        // Set a timeout to close idle connections after 10 minutes
+        const idleTimeout = setTimeout(
+            () => {
+                if (this.tcpConnections.has(connectionId)) {
+                    logger.debug(`Closing idle TCP connection ${connectionId}`)
+                    socket.destroy()
+                }
+            },
+            10 * 60 * 1000
+        )
+
+        // Clear timeout on socket close
+        socket.once('close', () => {
+            clearTimeout(idleTimeout)
+        })
+
+        // Store the connection
+        const connection: TcpConnection = {
+            socket,
+            streamId,
+            connectionId,
+        }
+        this.tcpConnections.set(connectionId, connection)
+
+        // Send StreamStart for the first connection, ConnectionStart for subsequent ones
+        if (connectionId === 1) {
+            this.sendStreamStart(streamId, connectionId)
+        } else {
+            this.sendConnectionStart(streamId, connectionId)
+        }
+    }
+
+    /**
+     * Helper method to clean up socket event handlers
+     * @param socket The socket to clean up
+     * @param handlers The handlers to remove
+     */
+    private cleanupSocketHandlers(socket: net.Socket, handlers: { [event: string]: (...args: any[]) => void }): void {
+        try {
+            if (handlers.data) {
+                socket.removeListener('data', handlers.data as (...args: any[]) => void)
+            }
+            if (handlers.error) {
+                socket.removeListener('error', handlers.error as (...args: any[]) => void)
+            }
+            if (handlers.close) {
+                socket.removeListener('close', handlers.close as (...args: any[]) => void)
+            }
+        } catch (error) {
+            logger.error(`Error cleaning up socket handlers: ${error}`)
+        }
+    }
+
+    /**
+     * Connect to the WebSocket server with proper event tracking
+     */
+    private async connectWebSocket(): Promise<void> {
+        if (this.ws) {
+            this.closeWebSocket()
+        }
+
+        // Reset for new connection
+        this.isDisposed = false
+
+        return new Promise((resolve, reject) => {
+            try {
+                const url = `wss://data.tunneling.iot.${this.region}.amazonaws.com:443/tunnel?local-proxy-mode=source`
+
+                if (!this.clientToken) {
+                    this.clientToken = uuidv4().replace(/-/g, '')
+                }
+
+                this.ws = new WebSocket.WebSocket(url, ['aws.iot.securetunneling-3.0'], {
+                    headers: {
+                        'access-token': this.accessToken,
+                        'client-token': this.clientToken,
+                    },
+                    handshakeTimeout: 30000, // 30 seconds
+                })
+
+                // Track event listeners for proper cleanup
+                this.eventHandlers['wsOpen'] = []
+                this.eventHandlers['wsMessage'] = []
+                this.eventHandlers['wsClose'] = []
+                this.eventHandlers['wsError'] = []
+                this.eventHandlers['wsPing'] = []
+                this.eventHandlers['wsPong'] = []
+
+                // Open handler
+                const openHandler = () => {
+                    logger.debug('WebSocket connected')
+                    this.isConnected = true
+                    this.reconnectAttempts = 0
+                    this.startPingInterval()
+                    resolve()
+                }
+                this.ws.on('open', openHandler)
+                this.eventHandlers['wsOpen'].push(openHandler)
+
+                // Message handler
+                const messageHandler = (data: WebSocket.RawData) => {
+                    this.handleWebSocketMessage(data)
+                }
+                this.ws.on('message', messageHandler)
+                this.eventHandlers['wsMessage'].push(messageHandler)
+
+                // Close handler
+                const closeHandler = (code: number, reason: Buffer) => {
+                    logger.debug(`WebSocket closed: ${code} ${reason.toString()}`)
+                    this.isConnected = false
+                    this.stopPingInterval()
+
+                    // Only attempt reconnect if we haven't explicitly stopped
+                    if (!this.isDisposed) {
+                        void this.attemptReconnect()
+                    }
+                }
+                this.ws.on('close', closeHandler)
+                this.eventHandlers['wsClose'].push(closeHandler)
+
+                // Error handler
+                const errorHandler = (err: Error) => {
+                    logger.error(`WebSocket error: ${err}`)
+                    reject(err)
+                }
+                this.ws.on('error', errorHandler)
+                this.eventHandlers['wsError'].push(errorHandler)
+
+                // Ping handler
+                const pingHandler = (data: Buffer) => {
+                    // Respond to ping with pong
+                    if (this.ws && this.ws.readyState === WebSocket.OPEN) {
+                        this.ws.pong(data)
+                    }
+                }
+                this.ws.on('ping', pingHandler)
+                this.eventHandlers['wsPing'].push(pingHandler)
+
+                // Pong handler
+                const pongHandler = () => {
+                    logger.debug('Received pong')
+                }
+                this.ws.on('pong', pongHandler)
+                this.eventHandlers['wsPong'].push(pongHandler)
+
+                // Set connection timeout
+                const connectionTimeout = setTimeout(() => {
+                    if (this.ws && this.ws.readyState !== WebSocket.OPEN) {
+                        logger.error('WebSocket connection timed out')
+                        this.closeWebSocket()
+                        reject(new Error('WebSocket connection timed out'))
+                    }
+                }, 35000) // 35 seconds (slightly longer than handshake timeout)
+
+                // Add a handler to clear the timeout on successful connection
+                this.ws.once('open', () => {
+                    clearTimeout(connectionTimeout)
+                })
+            } catch (error) {
+                logger.error(`Failed to connect WebSocket: ${error}`)
+                this.isConnected = false
+                reject(error)
+            }
+        })
+    }
+
+    /**
+     * Close the WebSocket connection with proper cleanup
+     */
+    private closeWebSocket(): void {
+        if (this.ws) {
+            try {
+                logger.debug('Closing WebSocket connection')
+
+                // Remove all event listeners before closing
+                this.ws.removeAllListeners('open')
+                this.ws.removeAllListeners('message')
+                this.ws.removeAllListeners('close')
+                this.ws.removeAllListeners('error')
+                this.ws.removeAllListeners('ping')
+                this.ws.removeAllListeners('pong')
+
+                // Try to close gracefully first
+                if (this.ws.readyState === WebSocket.OPEN) {
+                    // Set timeout in case close hangs
+                    const closeTimeout = setTimeout(() => {
+                        logger.warn('WebSocket close timed out, forcing termination')
+                        if (this.ws) {
+                            try {
+                                this.ws.terminate()
+                            } catch (e) {
+                                // Ignore errors on terminate after timeout
+                            }
+                            this.ws = undefined
+                        }
+                    }, 1000)
+
+                    // Try graceful closure first
+                    this.ws.close(1000, 'Normal Closure')
+
+                    // Set up a handler to clear the timeout if close works normally
+                    this.ws.once('close', () => {
+                        clearTimeout(closeTimeout)
+                    })
+                } else {
+                    // If not open, just terminate
+                    this.ws.terminate()
+                }
+            } catch (error) {
+                logger.error(`Error closing WebSocket: ${error}`)
+            } finally {
+                this.ws = undefined
+            }
+        }
+    }
+
+    /**
+     * Start the ping interval to keep the connection alive
+     */
+    private startPingInterval(): void {
+        this.stopPingInterval()
+
+        // Send ping every 30 seconds to keep the connection alive
+        this.pingInterval = setInterval(() => {
+            if (this.ws && this.ws.readyState === WebSocket.OPEN) {
+                logger.debug('Sending ping')
+                try {
+                    this.ws.ping(crypto.randomBytes(16))
+                } catch (error) {
+                    logger.error(`Error sending ping: ${error}`)
+                }
+            } else {
+                // If websocket is no longer open, stop the interval
+                this.stopPingInterval()
+            }
+        }, 30000)
+    }
+
+    /**
+     * Stop the ping interval with better error handling
+     */
+    private stopPingInterval(): void {
+        try {
+            if (this.pingInterval) {
+                clearInterval(this.pingInterval)
+                this.pingInterval = undefined
+                logger.debug('Ping interval stopped')
+            }
+        } catch (error) {
+            logger.error(`Error stopping ping interval: ${error}`)
+            this.pingInterval = undefined
+        }
+    }
+
+    /**
+     * Attempt to reconnect to the WebSocket server with better resource management
+     */
+    private async attemptReconnect(): Promise<void> {
+        if (this.isDisposed) {
+            logger.debug('LocalProxy is disposed, not attempting reconnect')
+            return
+        }
+
+        if (!this.clientToken) {
+            logger.debug('stop retrying, ws closed manually')
+            return
+        }
+
+        if (this.reconnectAttempts >= this.maxReconnectAttempts) {
+            logger.error('Max reconnect attempts reached')
+            // Clean up resources when max attempts reached
+            this.stop()
+            return
+        }
+
+        this.reconnectAttempts++
+        const delay = this.reconnectInterval * Math.pow(1.5, this.reconnectAttempts - 1)
+
+        logger.debug(`Attempting to reconnect in ${delay}ms (attempt ${this.reconnectAttempts})`)
+
+        // Use a tracked timeout that we can clear if needed
+        const reconnectTimeoutId = setTimeout(() => {
+            if (!this.isDisposed) {
+                void this.connectWebSocket().catch((err) => {
+                    logger.error(`Reconnect failed: ${err}`)
+                })
+            } else {
+                logger.debug('Reconnect cancelled because LocalProxy was disposed')
+            }
+        }, delay)
+
+        // Store the timeout ID so it can be cleared if stop() is called
+        if (!this.eventHandlers['reconnectTimeouts']) {
+            this.eventHandlers['reconnectTimeouts'] = []
+        }
+        this.eventHandlers['reconnectTimeouts'].push(reconnectTimeoutId)
+    }
+
+    /**
+     * Handle a WebSocket message
+     * @param data The message data
+     */
+    private handleWebSocketMessage(data: WebSocket.RawData): void {
+        try {
+            // Handle binary data
+            if (Buffer.isBuffer(data)) {
+                let offset = 0
+
+                // Process all messages in the buffer
+                while (offset < data.length) {
+                    // Read the 2-byte length prefix
+                    if (offset + 2 > data.length) {
+                        logger.error('Incomplete message length prefix')
+                        break
+                    }
+
+                    const messageLength = data.readUInt16BE(offset)
+                    offset += 2
+
+                    // Check if we have the complete message
+                    if (offset + messageLength > data.length) {
+                        logger.error('Incomplete message data')
+                        break
+                    }
+
+                    // Extract the message data
+                    const messageData = data.slice(offset, offset + messageLength)
+                    offset += messageLength
+
+                    // Decode and process the message
+                    this.processMessage(messageData)
+                }
+            } else {
+                logger.warn('Received non-buffer WebSocket message')
+            }
+        } catch (error) {
+            logger.error(`Error handling WebSocket message:${error}`)
+        }
+    }
+
+    /**
+     * Process a decoded message
+     * @param messageData The message data
+     */
+    private processMessage(messageData: Buffer): void {
+        try {
+            if (!this.Message) {
+                logger.error('Protobuf Message type not loaded')
+                return
+            }
+
+            // Decode the message
+            const message = this.Message.decode(messageData)
+
+            // Process based on message type
+            const typedMessage = message as any
+            switch (typedMessage.type) {
+                case MessageType.DATA:
+                    this.handleDataMessage(message)
+                    break
+
+                case MessageType.STREAM_RESET:
+                    this.handleStreamReset(message)
+                    break
+
+                case MessageType.CONNECTION_RESET:
+                    this.handleConnectionReset(message)
+                    break
+
+                case MessageType.SESSION_RESET:
+                    this.handleSessionReset()
+                    break
+
+                case MessageType.SERVICE_IDS:
+                    this.handleServiceIds(message)
+                    break
+
+                default:
+                    logger.debug(`Received message of type ${typedMessage.type}`)
+                    break
+            }
+        } catch (error) {
+            logger.error(`Error processing message:${error}`)
+        }
+    }
+
+    /**
+     * Handle a DATA message
+     * @param message The message
+     */
+    private handleDataMessage(message: any): void {
+        const { streamId, connectionId, payload } = message
+
+        // Validate stream ID
+        if (streamId !== this.currentStreamId) {
+            logger.warn(`Received data for invalid stream ID: ${streamId}, current: ${this.currentStreamId}`)
+            return
+        }
+
+        // Find the connection
+        const connection = this.tcpConnections.get(connectionId || 1)
+        if (!connection) {
+            logger.warn(`Received data for unknown connection ID: ${connectionId}`)
+            return
+        }
+
+        logger.debug(`Received data for connection ${connectionId} in stream ${streamId}`)
+
+        // Write data to the TCP socket
+        if (connection.socket.writable) {
+            connection.socket.write(Buffer.from(payload))
+        }
+    }
+
+    /**
+     * Handle a STREAM_RESET message
+     * @param message The message
+     */
+    private handleStreamReset(message: any): void {
+        const { streamId } = message
+
+        logger.debug(`Received STREAM_RESET for stream ${streamId}`)
+
+        // Close all connections for this stream
+        for (const [connectionId, connection] of this.tcpConnections.entries()) {
+            if (connection.streamId === streamId) {
+                connection.socket.destroy()
+                this.tcpConnections.delete(connectionId)
+            }
+        }
+    }
+
+    /**
+     * Handle a CONNECTION_RESET message
+     * @param message The message
+     */
+    private handleConnectionReset(message: any): void {
+        const { streamId, connectionId } = message
+
+        logger.debug(`Received CONNECTION_RESET for connection ${connectionId} in stream ${streamId}`)
+
+        // Close the specific connection
+        const connection = this.tcpConnections.get(connectionId)
+        if (connection) {
+            connection.socket.destroy()
+            this.tcpConnections.delete(connectionId)
+        }
+    }
+
+    /**
+     * Handle a SESSION_RESET message
+     */
+    private handleSessionReset(): void {
+        logger.debug('Received SESSION_RESET')
+
+        // Close all connections
+        for (const connection of this.tcpConnections.values()) {
+            connection.socket.destroy()
+        }
+        this.tcpConnections.clear()
+
+        // Increment stream ID for new connections
+        this.currentStreamId++
+    }
+
+    /**
+     * Handle a SERVICE_IDS message
+     * @param message The message
+     */
+    private handleServiceIds(message: any): void {
+        const { availableServiceIds } = message
+
+        logger.debug(`Received SERVICE_IDS: ${availableServiceIds}`)
+
+        // Validate service IDs
+        if (Array.isArray(availableServiceIds) && availableServiceIds.length > 0) {
+            // Use the first service ID
+            this.serviceId = availableServiceIds[0]
+        }
+    }
+
+    /**
+     * Send a message over the WebSocket
+     * @param messageType The message type
+     * @param streamId The stream ID
+     * @param connectionId The connection ID
+     * @param payload The payload
+     */
+    private sendMessage(messageType: MessageType, streamId: number, connectionId: number, payload?: Buffer): void {
+        if (!this.ws || this.ws.readyState !== WebSocket.OPEN) {
+            logger.warn('WebSocket not connected, cannot send message')
+            return
+        }
+
+        if (!this.Message) {
+            logger.error('Protobuf Message type not loaded')
+            return
+        }
+
+        try {
+            // Create the message
+            const message = {
+                type: messageType,
+                streamId,
+                connectionId,
+                serviceId: this.serviceId,
+            }
+
+            // Add payload if provided
+            const typedMessage: any = message
+            if (payload) {
+                typedMessage.payload = payload
+            }
+
+            // Verify and encode the message
+            const err = this.Message.verify(message)
+            if (err) {
+                throw new Error(`Invalid message: ${err}`)
+            }
+
+            const encodedMessage = this.Message.encode(this.Message.create(message)).finish()
+
+            // Create the frame with 2-byte length prefix
+            const frameLength = encodedMessage.length
+            const frame = Buffer.alloc(2 + frameLength)
+
+            // Write the length prefix
+            frame.writeUInt16BE(frameLength, 0)
+
+            // Copy the encoded message
+            Buffer.from(encodedMessage).copy(frame, 2)
+
+            // Send the frame
+            if (this.ws?.readyState === WebSocket.OPEN) {
+                this.ws.send(frame)
+            } else {
+                logger.warn('WebSocket connection lost before sending message')
+            }
+        } catch (error) {
+            logger.error(`Error sending message: ${error}`)
+        }
+    }
+
+    /**
+     * Send a STREAM_START message
+     * @param streamId The stream ID
+     * @param connectionId The connection ID
+     */
+    private sendStreamStart(streamId: number, connectionId: number): void {
+        logger.debug(`Sending STREAM_START for stream ${streamId}, connection ${connectionId}`)
+        this.sendMessage(MessageType.STREAM_START, streamId, connectionId)
+    }
+
+    /**
+     * Send a CONNECTION_START message
+     * @param streamId The stream ID
+     * @param connectionId The connection ID
+     */
+    private sendConnectionStart(streamId: number, connectionId: number): void {
+        logger.debug(`Sending CONNECTION_START for stream ${streamId}, connection ${connectionId}`)
+        this.sendMessage(MessageType.CONNECTION_START, streamId, connectionId)
+    }
+
+    /**
+     * Send a CONNECTION_RESET message
+     * @param streamId The stream ID
+     * @param connectionId The connection ID
+     */
+    private sendConnectionReset(streamId: number, connectionId: number): void {
+        logger.debug(`Sending CONNECTION_RESET for stream ${streamId}, connection ${connectionId}`)
+        this.sendMessage(MessageType.CONNECTION_RESET, streamId, connectionId)
+    }
+
+    /**
+     * Send data over the WebSocket
+     * @param streamId The stream ID
+     * @param connectionId The connection ID
+     * @param data The data to send
+     */
+    private sendData(streamId: number, connectionId: number, data: Buffer): void {
+        // Split data into chunks if it exceeds the maximum payload size (63kb)
+        const maxChunkSize = 63 * 1024 // 63kb
+
+        for (let offset = 0; offset < data.length; offset += maxChunkSize) {
+            const chunk = data.slice(offset, offset + maxChunkSize)
+            this.sendMessage(MessageType.DATA, streamId, connectionId, chunk)
+        }
+    }
+}
diff --git a/packages/core/src/lambda/remoteDebugging/localStackLambdaDebugger.ts b/packages/core/src/lambda/remoteDebugging/localStackLambdaDebugger.ts
new file mode 100644
index 00000000000..d74b6ac3471
--- /dev/null
+++ b/packages/core/src/lambda/remoteDebugging/localStackLambdaDebugger.ts
@@ -0,0 +1,164 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { FunctionConfiguration } from '@aws-sdk/client-lambda'
+import globals from '../../shared/extensionGlobals'
+import { persistLambdaSnapshot, type LambdaDebugger, type DebugConfig } from './lambdaDebugger'
+import { getLambdaClientWithAgent, getLambdaDebugUserAgent } from './utils'
+import { getLogger } from '../../shared/logger/logger'
+import { ToolkitError } from '../../shared/errors'
+
+export class LocalStackLambdaDebugger implements LambdaDebugger {
+    private debugConfig: DebugConfig
+
+    constructor(debugConfig: DebugConfig) {
+        this.debugConfig = debugConfig
+    }
+
+    public async checkHealth(): Promise<void> {
+        const endpointUrl = globals.awsContext.getCredentialEndpointUrl()
+        const localStackHealthUrl = `${endpointUrl}/_localstack/health`
+        const localStackNotRunningMessage = 'LocalStack is not reachable. Ensure LocalStack is running!'
+        try {
+            const response = await fetch(localStackHealthUrl)
+            if (!response.ok) {
+                getLogger().error(`LocalStack health check failed with status ${response.status}`)
+                throw new ToolkitError(localStackNotRunningMessage)
+            }
+        } catch (error) {
+            throw ToolkitError.chain(error, localStackNotRunningMessage)
+        }
+    }
+
+    public async setup(
+        progress: vscode.Progress<{ message?: string; increment?: number }>,
+        functionConfig: FunctionConfiguration,
+        region: string
+    ): Promise<void> {
+        // No function update and version publishing needed for LocalStack
+        this.debugConfig.shouldPublishVersion = false
+
+        progress.report({ message: 'Creating LocalStack debug configuration...' })
+        const endpointUrl = globals.awsContext.getCredentialEndpointUrl()
+        const localStackLDMUrl = `${endpointUrl}/_aws/lambda/debug_configs/${functionConfig.FunctionArn}:$LATEST`
+        const response = await fetch(localStackLDMUrl, {
+            method: 'PUT',
+            body: JSON.stringify({
+                port: this.debugConfig.port,
+                user_agent: getLambdaDebugUserAgent(),
+            }),
+        })
+
+        if (!response.ok) {
+            const error = await this.errorFromResponse(response)
+            if (error.startsWith('UnsupportedLocalStackVersion')) {
+                void vscode.window.showErrorMessage(`${error}`, 'Update LocalStack Docker image').then((selection) => {
+                    if (selection) {
+                        const terminal = vscode.window.createTerminal('Update LocalStack Docker image')
+                        terminal.show()
+                        terminal.sendText('localstack update docker-images')
+                    }
+                })
+            } else {
+                void vscode.window.showErrorMessage(error)
+            }
+
+            throw ToolkitError.chain(
+                error,
+                `Failed to create LocalStack debug configuration for Lambda function ${functionConfig.FunctionName}.`
+            )
+        }
+
+        const json = await response.json()
+        this.debugConfig.port = json.port
+    }
+
+    private async errorFromResponse(response: Response): Promise<string> {
+        const isXml = response.headers.get('content-type') === 'application/xml'
+        if (isXml) {
+            return 'UnsupportedLocalStackVersion: Your current LocalStack version does not support Lambda remote debugging. Update LocalStack and check your license.'
+        }
+
+        const isJson = response.headers.get('content-type') === 'application/json'
+        if (isJson) {
+            const json = await response.json()
+            if (json.error.type !== undefined && json.error.message !== undefined) {
+                return `${json.error.type}: ${json.error.message}`
+            }
+        }
+
+        return 'Unknown error'
+    }
+
+    public async waitForSetup(
+        progress: vscode.Progress<{ message?: string; increment?: number }>,
+        functionConfig: FunctionConfiguration,
+        region: string
+    ): Promise<void> {
+        if (!functionConfig?.FunctionArn) {
+            throw new ToolkitError('Could not retrieve Lambda function configuration')
+        }
+
+        progress.report({ message: 'Waiting for Lambda function to become Active...' })
+        getLogger().info(`Waiting for ${functionConfig.FunctionArn} to become Active...`)
+        try {
+            await getLambdaClientWithAgent(region).waitForActive(functionConfig.FunctionArn)
+        } catch (error) {
+            throw ToolkitError.chain(error, 'Lambda function failed to become Active.')
+        }
+
+        progress.report({ message: 'Waiting for startup of execution environment and debugger...' })
+        getLogger().info(`Waiting for ${functionConfig.FunctionArn} to startup execution environment and debugger...`)
+        const endpointUrl = globals.awsContext.getCredentialEndpointUrl()
+        const localStackLDMUrl = `${endpointUrl}/_aws/lambda/debug_configs/${functionConfig.FunctionArn}:$LATEST?debug_server_ready_timeout=300`
+        // Blocking call to wait for the Lambda function debug server to be running. LocalStack probes the debug server.
+        const response = await fetch(localStackLDMUrl, { method: 'GET' })
+        if (!response.ok) {
+            const error = await this.errorFromResponse(response)
+            throw ToolkitError.chain(
+                new Error(error),
+                `Failed to startup execution environment or debugger for Lambda function ${functionConfig.FunctionName}.`
+            )
+        }
+
+        const json = await response.json()
+        if (json.is_debug_server_running !== true) {
+            throw new ToolkitError(
+                `Debug server on port ${this.debugConfig.port} is not running for Lambda function ${functionConfig.FunctionName}.`
+            )
+        }
+
+        getLogger().info(`${functionConfig.FunctionArn} is ready for debugging on port ${this.debugConfig.port}.`)
+    }
+
+    public async waitForFunctionUpdates(
+        progress: vscode.Progress<{ message?: string; increment?: number }>
+    ): Promise<void> {
+        // No additional steps needed for LocalStack:
+        // a) Port probing ensures the debug server is ready
+        // b) Invokes for debug-enabled await being served until the debugger is connected
+    }
+
+    public async cleanup(functionConfig: FunctionConfiguration): Promise<void> {
+        await vscode.commands.executeCommand('workbench.action.debug.stop')
+
+        const endpointUrl = globals.awsContext.getCredentialEndpointUrl()
+        const localStackLDMUrl = `${endpointUrl}/_aws/lambda/debug_configs/${functionConfig.FunctionArn}:$LATEST`
+        const response = await fetch(localStackLDMUrl, { method: 'DELETE' })
+        if (!response.ok) {
+            const error = await this.errorFromResponse(response)
+            getLogger().warn(
+                `Failed to remove LocalStack debug configuration for ${functionConfig.FunctionArn}. ${error}`
+            )
+            throw new ToolkitError(
+                `Failed to remove LocalStack debug configuration for Lambda function ${functionConfig.FunctionName}.`
+            )
+        }
+
+        await persistLambdaSnapshot(undefined)
+        getLogger().info(`Removed LocalStack debug configuration for ${functionConfig.FunctionArn}`)
+    }
+}
diff --git a/packages/core/src/lambda/remoteDebugging/remoteLambdaDebugger.ts b/packages/core/src/lambda/remoteDebugging/remoteLambdaDebugger.ts
new file mode 100644
index 00000000000..afc9f83abcd
--- /dev/null
+++ b/packages/core/src/lambda/remoteDebugging/remoteLambdaDebugger.ts
@@ -0,0 +1,155 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { Architecture, FunctionConfiguration } from '@aws-sdk/client-lambda'
+import { persistLambdaSnapshot, type LambdaDebugger, type DebugConfig } from './lambdaDebugger'
+import { getLogger } from '../../shared/logger/logger'
+import { isTunnelInfo, LdkClient } from './ldkClient'
+import type { TunnelInfo } from './ldkClient'
+import { ToolkitError } from '../../shared/errors'
+import { getRemoteDebugLayerForArch } from './ldkLayers'
+
+export function getRemoteDebugLayer(
+    region: string | undefined,
+    architectures: Architecture[] | undefined
+): string | undefined {
+    if (!region || !architectures) {
+        return undefined
+    }
+    if (architectures.includes('x86_64')) {
+        return getRemoteDebugLayerForArch(region, 'x86_64')
+    }
+    if (architectures.includes('arm64')) {
+        return getRemoteDebugLayerForArch(region, 'arm64')
+    }
+    return undefined
+}
+
+export interface QualifierProxy {
+    setQualifier(qualifier: string): void
+    getQualifier(): string | undefined
+}
+
+export class RemoteLambdaDebugger implements LambdaDebugger {
+    private debugConfig: DebugConfig
+    private debugDeployPromise: Promise<string> | undefined
+    private tunnelInfo: TunnelInfo | undefined
+    private qualifierProxy: QualifierProxy
+
+    constructor(debugConfig: DebugConfig, qualifierProxy: QualifierProxy) {
+        this.debugConfig = debugConfig
+        this.qualifierProxy = qualifierProxy
+    }
+
+    public async checkHealth(): Promise<void> {
+        // We assume AWS is always available
+    }
+
+    public async setup(
+        progress: vscode.Progress<{ message?: string; increment?: number }>,
+        functionConfig: FunctionConfiguration,
+        region: string
+    ): Promise<void> {
+        const ldkClient = LdkClient.instance
+        // Create or reuse tunnel
+        progress.report({ message: 'Creating secure tunnel...' })
+        getLogger().info('Creating secure tunnel...')
+        this.tunnelInfo = await ldkClient.createOrReuseTunnel(region)
+        if (!this.tunnelInfo) {
+            throw new ToolkitError(`Empty tunnel info response, please retry: ${this.tunnelInfo}`)
+        }
+
+        if (!isTunnelInfo(this.tunnelInfo)) {
+            throw new ToolkitError(`Invalid tunnel info response: ${this.tunnelInfo}`)
+        }
+        // start update lambda function, await in the end
+        // Create debug deployment
+        progress.report({ message: 'Configuring Lambda function for debugging...' })
+        getLogger().info('Configuring Lambda function for debugging...')
+
+        const layerArn = this.debugConfig.layerArn ?? getRemoteDebugLayer(region, functionConfig.Architectures)
+        if (!layerArn) {
+            throw new ToolkitError(`No Layer Arn is provided`)
+        }
+        // start this request and await in the end
+        this.debugDeployPromise = ldkClient.createDebugDeployment(
+            functionConfig,
+            this.tunnelInfo.destinationToken,
+            this.debugConfig.lambdaTimeout ?? 900,
+            this.debugConfig.shouldPublishVersion,
+            layerArn,
+            progress
+        )
+    }
+
+    public async waitForSetup(
+        progress: vscode.Progress<{ message?: string; increment?: number }>,
+        functionConfig: FunctionConfiguration,
+        region: string
+    ): Promise<void> {
+        if (!this.tunnelInfo) {
+            throw new ToolkitError(`Empty tunnel info response, please retry: ${this.tunnelInfo}`)
+        }
+
+        // Start local proxy with timeout and better error handling
+        progress.report({ message: 'Starting local proxy...' })
+
+        const proxyStartTimeout = new Promise((_, reject) => {
+            setTimeout(() => reject(new Error('Local proxy start timed out')), 30000)
+        })
+
+        const proxyStartAttempt = LdkClient.instance.startProxy(
+            region,
+            this.tunnelInfo.sourceToken,
+            this.debugConfig.port
+        )
+
+        const proxyStarted = await Promise.race([proxyStartAttempt, proxyStartTimeout])
+
+        if (!proxyStarted) {
+            throw new ToolkitError('Failed to start local proxy')
+        }
+        getLogger().info('Local proxy started successfully')
+    }
+
+    public async waitForFunctionUpdates(
+        progress: vscode.Progress<{ message?: string; increment?: number }>
+    ): Promise<void> {
+        // wait until lambda function update is completed
+        progress.report({ message: 'Waiting for function update...' })
+        const qualifier = await this.debugDeployPromise
+        if (!qualifier || qualifier === 'Failed') {
+            throw new ToolkitError('Failed to configure Lambda function for debugging')
+        }
+        // store the published version for debugging in version
+        if (this.debugConfig.shouldPublishVersion) {
+            // we already reverted
+            this.qualifierProxy.setQualifier(qualifier)
+        }
+    }
+
+    public async cleanup(functionConfig: FunctionConfiguration): Promise<void> {
+        const ldkClient = LdkClient.instance
+        if (!functionConfig?.FunctionArn) {
+            throw new ToolkitError('No saved configuration found during cleanup')
+        }
+
+        getLogger().info(`Removing debug deployment for function: ${functionConfig.FunctionName}`)
+
+        await vscode.commands.executeCommand('workbench.action.debug.stop')
+        // Then stop the proxy (with more reliable error handling)
+        getLogger().info('Stopping proxy during cleanup')
+        await ldkClient.stopProxy()
+        // Ensure our resources are properly cleaned up
+        const qualifier = this.qualifierProxy.getQualifier()
+        if (qualifier) {
+            await ldkClient.deleteDebugVersion(functionConfig?.FunctionArn, qualifier)
+        }
+        if (await ldkClient.removeDebugDeployment(functionConfig, true)) {
+            await persistLambdaSnapshot(undefined)
+        }
+    }
+}
diff --git a/packages/core/src/lambda/remoteDebugging/utils.ts b/packages/core/src/lambda/remoteDebugging/utils.ts
new file mode 100644
index 00000000000..8f2ea862556
--- /dev/null
+++ b/packages/core/src/lambda/remoteDebugging/utils.ts
@@ -0,0 +1,42 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { IoTSecureTunnelingClient } from '@aws-sdk/client-iotsecuretunneling'
+import { DefaultLambdaClient } from '../../shared/clients/lambdaClient'
+import { getUserAgent } from '../../shared/telemetry/util'
+import globals from '../../shared/extensionGlobals'
+
+const customUserAgentBase = 'LAMBDA-DEBUG/1.0.0'
+
+export function getLambdaClientWithAgent(region: string, customUserAgent?: string): DefaultLambdaClient {
+    if (!customUserAgent) {
+        customUserAgent = getLambdaUserAgent()
+    }
+    return new DefaultLambdaClient(region, customUserAgent)
+}
+
+// Example user agent:
+// LAMBDA-DEBUG/1.0.0 AWS-Toolkit-For-VSCode/testPluginVersion Visual-Studio-Code/1.102.2 ClientId/11111111-1111-1111-1111-111111111111
+export function getLambdaDebugUserAgent(): string {
+    return `${customUserAgentBase} ${getLambdaUserAgent()}`
+}
+
+// Example user agent:
+// AWS-Toolkit-For-VSCode/testPluginVersion Visual-Studio-Code/1.102.2 ClientId/11111111-1111-1111-1111-111111111111
+export function getLambdaUserAgent(): string {
+    return `${getUserAgent({ includePlatform: true, includeClientId: true })}`
+}
+
+export function getIoTSTClientWithAgent(region: string): IoTSecureTunnelingClient {
+    const customUserAgent = `${customUserAgentBase} ${getUserAgent({ includePlatform: true, includeClientId: true })}`
+    return globals.sdkClientBuilderV3.createAwsService({
+        serviceClient: IoTSecureTunnelingClient,
+        clientOptions: {
+            userAgent: [[customUserAgent]],
+            region,
+        },
+        userAgent: false,
+    })
+}
diff --git a/packages/core/src/lambda/uriHandlers.ts b/packages/core/src/lambda/uriHandlers.ts
new file mode 100644
index 00000000000..8ae1d7b8c35
--- /dev/null
+++ b/packages/core/src/lambda/uriHandlers.ts
@@ -0,0 +1,58 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+
+import { SearchParams } from '../shared/vscode/uriHandler'
+import { openLambdaFolderForEdit } from './commands/editLambda'
+import { showConfirmationMessage } from '../shared/utilities/messages'
+import globals from '../shared/extensionGlobals'
+import { telemetry } from '../shared/telemetry/telemetry'
+import { ToolkitError } from '../shared/errors'
+
+const localize = nls.loadMessageBundle()
+
+export function registerLambdaUriHandler() {
+    async function openFunctionHandler(params: ReturnType<typeof parseOpenParams>) {
+        await telemetry.lambda_uriHandler.run(async () => {
+            try {
+                if (params.isCfn === 'true') {
+                    const response = await showConfirmationMessage({
+                        prompt: localize(
+                            'AWS.lambda.open.confirmInStack',
+                            'The function you are attempting to open is in a CloudFormation stack. Editing the function code could lead to stack drift.'
+                        ),
+                        confirm: localize('AWS.lambda.open.confirmStack', 'Confirm'),
+                        cancel: localize('AWS.lambda.open.cancelStack', 'Cancel'),
+                    })
+                    if (!response) {
+                        return
+                    }
+                }
+                await openLambdaFolderForEdit(params.functionName, params.region)
+            } catch (e) {
+                throw new ToolkitError(`Unable to get function ${params.functionName} in region ${params.region}: ${e}`)
+            }
+        })
+    }
+
+    return vscode.Disposable.from(
+        globals.uriHandler.onPath('/lambda/load-function', openFunctionHandler, parseOpenParams)
+    )
+}
+
+// Sample url:
+// vscode://AmazonWebServices.aws-toolkit-vscode/lambda/load-function?functionName=fnf-func-1&region=us-east-1&isCfn=true
+export function parseOpenParams(query: SearchParams) {
+    return {
+        functionName: query.getOrThrow(
+            'functionName',
+            localize('AWS.lambda.open.missingName', 'A function name must be provided')
+        ),
+        region: query.getOrThrow('region', localize('AWS.lambda.open.missingRegion', 'A region must be provided')),
+        isCfn: query.get('isCfn'),
+    }
+}
diff --git a/packages/core/src/lambda/utils.ts b/packages/core/src/lambda/utils.ts
new file mode 100644
index 00000000000..9b8ffcb884a
--- /dev/null
+++ b/packages/core/src/lambda/utils.ts
@@ -0,0 +1,214 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import path from 'path'
+import xml2js = require('xml2js')
+import { FunctionConfiguration, LayerVersionsListItem } from '@aws-sdk/client-lambda'
+import * as vscode from 'vscode'
+import { CloudFormationClient, StackSummary } from '../shared/clients/cloudFormation'
+import { DefaultLambdaClient, LambdaClient } from '../shared/clients/lambdaClient'
+import { getFamily, getNodeMajorVersion, RuntimeFamily } from './models/samLambdaRuntime'
+import { getLogger } from '../shared/logger/logger'
+import { HttpResourceFetcher } from '../shared/resourcefetcher/httpResourceFetcher'
+import { FileResourceFetcher } from '../shared/resourcefetcher/fileResourceFetcher'
+import { sampleRequestManifestPath } from './constants'
+import globals from '../shared/extensionGlobals'
+import { tempDirPath } from '../shared/filesystemUtilities'
+import { LambdaFunction } from './commands/uploadLambda'
+import { fs } from '../shared/fs/fs'
+
+export async function* listCloudFormationStacks(client: CloudFormationClient): AsyncIterableIterator<StackSummary> {
+    // TODO: this 'loading' message needs to go under each regional entry
+    // in the explorer, and be removed when that region's query completes
+    const status = vscode.window.setStatusBarMessage(
+        localize('AWS.message.statusBar.loading.cloudFormation', 'Loading CloudFormation Stacks...')
+    )
+
+    try {
+        yield* client.listStacks()
+    } finally {
+        status.dispose()
+    }
+}
+
+export async function* listLambdaFunctions(client: LambdaClient): AsyncIterableIterator<FunctionConfiguration> {
+    const status = vscode.window.setStatusBarMessage(
+        localize('AWS.message.statusBar.loading.lambda', 'Loading Lambdas...')
+    )
+
+    try {
+        yield* client.listFunctions()
+    } finally {
+        if (status) {
+            status.dispose()
+        }
+    }
+}
+
+export async function* listLayerVersions(
+    client: LambdaClient,
+    name: string
+): AsyncIterableIterator<LayerVersionsListItem> {
+    const status = vscode.window.setStatusBarMessage(
+        localize('AWS.message.statusBar.loading.lambda', 'Loading Lambda Layer Versions...')
+    )
+
+    try {
+        yield* client.listLayerVersions(name)
+    } finally {
+        if (status) {
+            status.dispose()
+        }
+    }
+}
+
+/**
+ * Returns filename and function name corresponding to a Lambda.FunctionConfiguration
+ * Only works for supported languages (Python/JS)
+ * @param configuration Lambda configuration object from getFunction
+ */
+export function getLambdaDetails(configuration: FunctionConfiguration): {
+    fileName: string
+    functionName: string
+} {
+    let runtimeExtension: string
+    switch (getFamily(configuration.Runtime!)) {
+        case RuntimeFamily.Python:
+            runtimeExtension = 'py'
+            break
+        case RuntimeFamily.NodeJS: {
+            const nodeVersion = getNodeMajorVersion(configuration.Runtime)
+            if (nodeVersion && nodeVersion >= 18) {
+                // node18+ defaults to using the .mjs extension
+                runtimeExtension = 'mjs'
+            } else {
+                runtimeExtension = 'js'
+            }
+            break
+        }
+        case RuntimeFamily.Ruby:
+            runtimeExtension = 'rb'
+            break
+        default:
+            throw new Error(`Toolkit does not currently support imports for runtime: ${configuration.Runtime}`)
+    }
+
+    const handlerArr = configuration.Handler!.split('.')
+
+    return {
+        fileName: `${handlerArr.slice(0, handlerArr.length - 1).join('.')}.${runtimeExtension}`,
+        functionName: handlerArr[handlerArr.length - 1]!,
+    }
+}
+
+export interface SampleRequest {
+    name: string | undefined
+    filename: string | undefined
+}
+
+interface SampleRequestManifest {
+    requests: {
+        request: SampleRequest[]
+    }
+}
+
+export async function getSampleLambdaPayloads(): Promise<SampleRequest[]> {
+    const logger = getLogger()
+    const sampleInput = await getSampleRequestManifest()
+
+    if (!sampleInput) {
+        throw new Error('Unable to retrieve Sample Request manifest')
+    }
+
+    logger.debug(`Loaded: ${sampleInput}`)
+
+    const inputs: SampleRequest[] = []
+
+    xml2js.parseString(sampleInput, { explicitArray: false }, (err: Error | null, result: SampleRequestManifest) => {
+        if (err) {
+            return
+        }
+
+        inputs.push(...result.requests.request)
+    })
+
+    return inputs
+}
+
+async function getSampleRequestManifest(): Promise<string | undefined> {
+    const httpResp = await new HttpResourceFetcher(sampleRequestManifestPath, { showUrl: true }).get()
+    if (!httpResp) {
+        const fileResp = new FileResourceFetcher(globals.manifestPaths.lambdaSampleRequests)
+        return fileResp.get()
+    }
+    return httpResp.text()
+}
+
+function getInfoLocation(lambda: LambdaFunction): string {
+    return path.join(getTempRegionLocation(lambda.region), `.${lambda.name}`)
+}
+
+export async function getCodeShaLive(lambda: LambdaFunction): Promise<string | undefined> {
+    const lambdaClient = new DefaultLambdaClient(lambda.region)
+    const func = await lambdaClient.getFunction(lambda.name)
+    return func.Configuration?.CodeSha256
+}
+
+export async function compareCodeSha(lambda: LambdaFunction): Promise<boolean> {
+    const local = await getFunctionInfo(lambda, 'sha')
+    const remote = await getCodeShaLive(lambda)
+    getLogger().info(`local: ${local}, remote: ${remote}`)
+    return local === remote
+}
+
+export interface FunctionInfo {
+    lastDeployed?: number
+    undeployed?: boolean
+    sha?: string
+    handlerFile?: string
+}
+
+export async function getFunctionInfo<K extends keyof FunctionInfo>(lambda: LambdaFunction, field?: K) {
+    try {
+        const data = JSON.parse(await fs.readFileText(getInfoLocation(lambda)))
+        getLogger().debug('Data returned from getFunctionInfo for %s: %O', lambda.name, data)
+        return field ? data[field] : data
+    } catch {
+        return field ? undefined : {}
+    }
+}
+
+export async function setFunctionInfo(lambda: LambdaFunction, info: Partial<FunctionInfo>) {
+    try {
+        const existing = await getFunctionInfo(lambda)
+        const updated: FunctionInfo = {
+            lastDeployed: info.lastDeployed ?? existing.lastDeployed,
+            undeployed: info.undeployed ?? true,
+            sha: info.sha ?? (await getCodeShaLive(lambda)),
+            handlerFile: info.handlerFile ?? existing.handlerFile,
+        }
+        await fs.writeFile(getInfoLocation(lambda), JSON.stringify(updated))
+    } catch (err) {
+        getLogger().warn(`codesha: unable to save information at key "${lambda.name}: %s"`, err)
+    }
+}
+
+export const lambdaTempPath = path.join(tempDirPath, 'lambda')
+
+export function getTempRegionLocation(region: string) {
+    return path.join(lambdaTempPath, region)
+}
+
+export function getTempLocation(functionName: string, region: string) {
+    return path.join(getTempRegionLocation(region), functionName)
+}
+
+// LocalStack hot-reloading: https://docs.localstack.cloud/aws/tooling/lambda-tools/hot-reloading/
+export function isHotReloadingFunction(codeSha256: string | undefined): boolean {
+    return codeSha256?.startsWith('hot-reloading') ?? false
+}
diff --git a/packages/core/src/lambda/vue/configEditor/index.ts b/packages/core/src/lambda/vue/configEditor/index.ts
new file mode 100644
index 00000000000..270392b1f65
--- /dev/null
+++ b/packages/core/src/lambda/vue/configEditor/index.ts
@@ -0,0 +1,16 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { createApp } from 'vue'
+import component from './samInvokeComponent.vue'
+
+const create = () => createApp(component)
+const app = create()
+app.mount('#vue-app')
+
+window.addEventListener('remount', () => {
+    app.unmount()
+    create().mount('#vue-app')
+})
diff --git a/packages/core/src/lambda/vue/configEditor/samInvoke.css b/packages/core/src/lambda/vue/configEditor/samInvoke.css
new file mode 100644
index 00000000000..9ca2c8ef452
--- /dev/null
+++ b/packages/core/src/lambda/vue/configEditor/samInvoke.css
@@ -0,0 +1,177 @@
+.section-header {
+    margin: 0px;
+    margin-bottom: 10px;
+    display: flex;
+    justify-content: flex-start;
+}
+
+textarea {
+    color: var(--vscode-settings-textInputForeground);
+    background: var(--vscode-settings-textInputBackground);
+    border: 1px solid var(--vscode-settings-textInputBorder);
+}
+
+.config-item {
+    border-bottom: 1px solid var(--vscode-menubar-selectionBackground);
+    display: grid;
+    grid-template-columns: 1fr 3fr;
+    padding: 8px 0px;
+}
+
+.col2 {
+    grid-column: 2;
+}
+
+.data-view {
+    display: none;
+    border: dashed rgb(218, 31, 31) 1px;
+    color: rgb(218, 31, 31);
+}
+
+.required {
+    color: red;
+}
+
+#form-title {
+    font-size: large;
+    font-weight: bold;
+}
+
+.form-buttons {
+    margin-left: 20px;
+}
+
+.margin-bottom-16 {
+    margin-bottom: 16px;
+}
+
+.header-buttons {
+    display: flex;
+    align-items: center;
+    margin-bottom: 20px;
+}
+
+#target-type-selector {
+    margin-bottom: 15px;
+    margin-left: 8px;
+}
+
+.form-row {
+    display: grid;
+    grid-template-columns: 150px 1fr;
+    margin-bottom: 10px;
+}
+
+.form-control {
+    min-width: 170%; /* Set a minimum width */
+    width: 100%; /* Allow the width to adjust based on content */
+    display: inline-block;
+    flex-grow: 1;
+    margin-right: 0.5rem;
+}
+
+.payload-options-button {
+    display: grid;
+    align-items: center;
+    border: none;
+    padding: 5px 10px;
+    cursor: pointer;
+    font-size: 0.9em;
+    margin-bottom: 10px;
+}
+
+.payload-options-buttons {
+    display: flex;
+    align-items: center;
+    margin-top: 10px;
+    margin-bottom: 10px;
+}
+
+.Icontainer {
+    margin-inline: auto;
+    margin-top: 5rem;
+}
+
+.container {
+    width: 574px;
+    height: 824px;
+    top: 18px;
+    gap: 20px;
+    margin: auto;
+    left: 688px;
+    background-color: var(--vscode-editor-background);
+}
+
+.container em {
+    display: block;
+    text-align: justify;
+}
+
+.button-theme-primary {
+    color: var(--vscode-button-foreground);
+    background: var(--vscode-button-background);
+    border: 1px solid var(--vscode-button-border);
+    padding: 8px 12px;
+}
+.button-theme-primary:hover:not(:disabled) {
+    background: var(--vscode-button-hoverBackground);
+    cursor: pointer;
+}
+.button-theme-secondary {
+    color: var(--vscode-button-secondaryForeground);
+    background: var(--vscode-button-secondaryBackground);
+    border: 1px solid var(--vscode-button-border);
+    padding: 8px 12px;
+}
+.button-theme-secondary:hover:not(:disabled) {
+    background: var(--vscode-button-secondaryHoverBackground);
+    cursor: pointer;
+}
+
+.formfield {
+    display: flex;
+    align-items: center;
+    margin-bottom: 0.5rem;
+}
+
+.payload-options-buttons {
+    display: flex;
+    align-items: center;
+    margin-top: 10px;
+    margin-bottom: 10px;
+}
+
+.radio-selector {
+    width: 15px;
+    height: 15px;
+    border-radius: 50%;
+}
+
+.label-selector {
+    padding-left: 7px;
+    font-weight: 500;
+    font-size: 13px;
+    line-height: 15.51px;
+    text-align: center;
+}
+
+.form-row-select {
+    width: 387px;
+    height: 28px;
+    border: 1px;
+    border-radius: 5px;
+    gap: 4px;
+    padding: 2px 8px;
+}
+
+.form-row-event-select {
+    width: 244px;
+    height: 28px;
+    margin-bottom: 15px;
+    margin-left: 8px;
+}
+
+.runtime-description {
+    font-size: 12px;
+    margin-top: 5px;
+}
diff --git a/packages/core/src/lambda/vue/configEditor/samInvokeBackend.ts b/packages/core/src/lambda/vue/configEditor/samInvokeBackend.ts
new file mode 100644
index 00000000000..2084ebe82fe
--- /dev/null
+++ b/packages/core/src/lambda/vue/configEditor/samInvokeBackend.ts
@@ -0,0 +1,512 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as path from 'path'
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+import { LaunchConfiguration } from '../../../shared/debug/launchConfiguration'
+import { getLogger } from '../../../shared/logger/logger'
+import { HttpResourceFetcher } from '../../../shared/resourcefetcher/httpResourceFetcher'
+import {
+    AwsSamDebuggerConfiguration,
+    isCodeTargetProperties,
+    isTemplateTargetProperties,
+    TemplateTargetProperties,
+} from '../../../shared/sam/debugger/awsSamDebugConfiguration'
+import {
+    DefaultAwsSamDebugConfigurationValidator,
+    resolveWorkspaceFolderVariable,
+} from '../../../shared/sam/debugger/awsSamDebugConfigurationValidator'
+import * as input from '../../../shared/ui/input'
+import * as picker from '../../../shared/ui/picker'
+import { addCodiconToString } from '../../../shared/utilities/textUtilities'
+import { sampleRequestPath } from '../../constants'
+import { tryGetAbsolutePath } from '../../../shared/utilities/workspaceUtils'
+import * as CloudFormation from '../../../shared/cloudformation/cloudformation'
+import { openLaunchJsonFile } from '../../../shared/sam/debugger/commands/addSamDebugConfiguration'
+import { getSampleLambdaPayloads } from '../../utils'
+import { samLambdaCreatableRuntimes } from '../../models/samLambdaRuntime'
+import globals from '../../../shared/extensionGlobals'
+import { VueWebview } from '../../../webviews/main'
+import { Commands } from '../../../shared/vscode/commands2'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { fs } from '../../../shared/fs/fs'
+import { ToolkitError } from '../../../shared/errors'
+import { ResourceNode } from '../../../awsService/appBuilder/explorer/nodes/resourceNode'
+
+const localize = nls.loadMessageBundle()
+
+export interface ResourceData {
+    logicalId: string
+    region: string
+    arn: string
+    location: string
+    handler: string
+    runtime: string
+    stackName: string
+    source: string
+    environment?: {
+        Variables: Record<string, any>
+    }
+}
+
+export type AwsSamDebuggerConfigurationLoose = AwsSamDebuggerConfiguration & {
+    invokeTarget: Omit<
+        AwsSamDebuggerConfiguration['invokeTarget'],
+        'templatePath' | 'logicalId' | 'lambdaHandler' | 'projectRoot'
+    > & {
+        templatePath: string
+        logicalId: string
+        lambdaHandler: string
+        projectRoot: string
+    }
+}
+
+interface SampleQuickPickItem extends vscode.QuickPickItem {
+    filename: string
+}
+
+export interface LaunchConfigPickItem extends vscode.QuickPickItem {
+    index: number
+    config?: AwsSamDebuggerConfiguration
+}
+
+export class SamInvokeWebview extends VueWebview {
+    public static readonly sourcePath: string = 'src/lambda/vue/configEditor/index.js'
+    public readonly id = 'createLambda'
+
+    public constructor(
+        private readonly config?: AwsSamDebuggerConfiguration,
+        private readonly data?: ResourceData
+    ) {
+        super(SamInvokeWebview.sourcePath)
+    }
+
+    public getRuntimes() {
+        return samLambdaCreatableRuntimes().toArray().sort()
+    }
+
+    public init() {
+        return this.config
+    }
+
+    public getResourceData() {
+        return this.data
+    }
+
+    public async getSamLaunchConfigs(): Promise<LaunchConfigPickItem[] | undefined> {
+        // TODO: Find a better way to infer this. Might need another arg from the frontend (depends on the context in which the launch config is made?)
+        const workspaceFolder = vscode.workspace.workspaceFolders?.length
+            ? vscode.workspace.workspaceFolders[0]
+            : undefined
+        if (!workspaceFolder) {
+            void vscode.window.showErrorMessage(localize('AWS.lambda.form.noFolder', 'No workspace folder found.'))
+            return
+        }
+        const uri = workspaceFolder.uri
+        const launchConfig = new LaunchConfiguration(uri)
+        const pickerItems = await this.getLaunchConfigQuickPickItems(launchConfig, uri)
+        return pickerItems
+    }
+
+    /**
+     * Open a quick pick containing the names of launch configs in the `launch.json` array.
+     * Filter out non-supported launch configs.
+     */
+    public async loadSamLaunchConfig(): Promise<AwsSamDebuggerConfiguration | undefined> {
+        const pickerItems: LaunchConfigPickItem[] = (await this.getSamLaunchConfigs()) || []
+
+        if (pickerItems.length === 0) {
+            pickerItems.push({
+                index: -1,
+                label: localize('AWS.lambda.form.noDebugConfigs', 'No aws-sam debug configurations found.'),
+                detail: localize('AWS.picker.dynamic.noItemsFound.detail', 'Click here to go back'),
+            })
+        }
+        const qp = picker.createQuickPick({
+            items: pickerItems,
+            options: {
+                title: localize('AWS.lambda.form.selectDebugConfig', 'Select Debug Configuration'),
+            },
+        })
+
+        const choices = await picker.promptUser({
+            picker: qp,
+        })
+        const pickerResponse = picker.verifySinglePickerOutput<LaunchConfigPickItem>(choices)
+
+        if (!pickerResponse || pickerResponse.index === -1) {
+            return
+        }
+        return pickerResponse.config!
+    }
+
+    /**
+     * Open a quick pick containing upstream sample payloads.
+     * Call back into the webview with the contents of the payload to add to the JSON field.
+     */
+    public async getSamplePayload(): Promise<string | undefined> {
+        try {
+            const inputs: SampleQuickPickItem[] = (await getSampleLambdaPayloads()).map((entry) => {
+                return { label: entry.name ?? '', filename: entry.filename ?? '' }
+            })
+
+            const qp = picker.createQuickPick({
+                items: inputs,
+                options: {
+                    title: localize('AWS.lambda.form.pickSampleInput', 'Choose Sample Input'),
+                },
+            })
+
+            const choices = await picker.promptUser({
+                picker: qp,
+            })
+            const pickerResponse = picker.verifySinglePickerOutput<SampleQuickPickItem>(choices)
+
+            if (!pickerResponse) {
+                return
+            }
+            const sampleUrl = `${sampleRequestPath}${pickerResponse.filename}`
+            const resp = await new HttpResourceFetcher(sampleUrl, { showUrl: true }).get()
+            const sample = (await resp?.text()) ?? ''
+
+            return sample
+        } catch (err) {
+            getLogger().error('Error getting manifest data..: %O', err as Error)
+            throw ToolkitError.chain(err, 'getting manifest data')
+        }
+    }
+
+    protected getTemplateRegistry() {
+        return globals.templateRegistry
+    }
+
+    /**
+     * Get all templates in the registry.
+     * Call back into the webview with the registry contents.
+     */
+    public async getTemplate() {
+        const items: (vscode.QuickPickItem & { templatePath: string })[] = []
+        const noTemplate = 'NOTEMPLATEFOUND'
+        for (const template of (await this.getTemplateRegistry()).items) {
+            const resources = template.item.Resources
+            if (resources) {
+                for (const resource of Object.keys(resources)) {
+                    if (
+                        resources[resource]?.Type === CloudFormation.LAMBDA_FUNCTION_TYPE ||
+                        resources[resource]?.Type === CloudFormation.SERVERLESS_FUNCTION_TYPE ||
+                        resources[resource]?.Type === CloudFormation.SERVERLESS_API_TYPE
+                    ) {
+                        items.push({
+                            label: resource,
+                            detail: localize('AWS.lambda.form.selectResource.detail', 'Template: {0}', template.path),
+                            templatePath: template.path,
+                        })
+                    }
+                }
+            }
+        }
+
+        if (items.length === 0) {
+            items.push({
+                label: localize(
+                    'AWS.lambda.form.selectResource.noTemplates',
+                    'No templates with valid SAM functions found.'
+                ),
+                detail: localize('AWS.picker.dynamic.noItemsFound.detail', 'Click here to go back'),
+                templatePath: noTemplate,
+            })
+        }
+
+        const qp = picker.createQuickPick({
+            items,
+            options: {
+                title: localize('AWS.lambda.form.selectResource', 'Select Resource'),
+            },
+        })
+
+        const choices = await picker.promptUser({
+            picker: qp,
+        })
+        const selectedTemplate = picker.verifySinglePickerOutput(choices)
+
+        if (!selectedTemplate || selectedTemplate.templatePath === noTemplate) {
+            return
+        }
+
+        return {
+            logicalId: selectedTemplate.label,
+            template: selectedTemplate.templatePath,
+        }
+    }
+
+    // This method serves as a wrapper around the backend function `openLaunchJsonFile`.
+    // The frontend cannot directly import and invoke backend functions like `openLaunchJsonFile`
+    // because doing so would break the webview environment by introducing server-side logic
+    // into client-side code. Instead, this method acts as an interface or bridge, allowing
+    // the frontend to request the backend to open the launch configuration file without
+    // directly coupling the frontend to backend-specific implementations.
+    public async openLaunchConfig() {
+        await openLaunchJsonFile()
+    }
+
+    public async promptFile() {
+        const fileLocations = await vscode.window.showOpenDialog({
+            openLabel: 'Open',
+        })
+
+        if (!fileLocations || fileLocations.length === 0) {
+            return undefined
+        }
+
+        try {
+            const fileContent = await fs.readFileBytes(fileLocations[0].fsPath)
+            return {
+                sample: fileContent,
+                selectedFilePath: fileLocations[0].fsPath,
+                selectedFile: this.getFileName(fileLocations[0].fsPath),
+            }
+        } catch (e) {
+            getLogger().error('readFileSync: Failed to read file at path %s %O', fileLocations[0].fsPath, e)
+            throw ToolkitError.chain(e, 'Failed to read selected file')
+        }
+    }
+
+    public getFileName(filePath: string): string {
+        return path.basename(filePath)
+    }
+    /**
+     * Open a quick pick containing the names of launch configs in the `launch.json` array, plus a "Create New Entry" entry.
+     * On selecting a name, overwrite the existing entry in the `launch.json` array and resave the file.
+     * On selecting "Create New Entry", prompt the user for a name and save the contents to the end of the `launch.json` array.
+     * @param config Config to save
+     */
+    public async saveLaunchConfig(config: AwsSamDebuggerConfiguration): Promise<void> {
+        const uri = await this.getUriFromLaunchConfig(config)
+        if (!uri) {
+            // TODO Localize
+            void vscode.window.showErrorMessage(
+                'Toolkit requires a target resource in order to save a debug configuration'
+            )
+            return
+        }
+
+        const launchConfig = new LaunchConfiguration(uri)
+        const launchConfigItems = await this.getLaunchConfigQuickPickItems(launchConfig, uri)
+        const pickerItems = [
+            {
+                label: addCodiconToString(
+                    'add',
+                    localize('AWS.command.addSamDebugConfiguration', 'Add Local Invoke and Debug Configuration')
+                ),
+                index: -1,
+                alwaysShow: true,
+            },
+            ...launchConfigItems,
+        ]
+
+        const qp = picker.createQuickPick({
+            items: pickerItems,
+            options: {
+                title: localize('AWS.lambda.form.selectDebugConfig', 'Select Debug Configuration'),
+            },
+        })
+
+        const choices = await picker.promptUser({
+            picker: qp,
+        })
+        const pickerResponse = picker.verifySinglePickerOutput<LaunchConfigPickItem>(choices)
+
+        if (!pickerResponse) {
+            return
+        }
+
+        if (pickerResponse.index === -1) {
+            const ib = input.createInputBox({
+                options: {
+                    prompt: localize('AWS.lambda.form.debugConfigName', 'Input Name For Debug Configuration'),
+                },
+            })
+            const response = await input.promptUser({ inputBox: ib })
+            if (response) {
+                await launchConfig.addDebugConfiguration(finalizeConfig(config, response))
+                await this.openLaunchConfig()
+            }
+        } else {
+            // use existing label
+            await launchConfig.editDebugConfiguration(
+                finalizeConfig(config, pickerResponse.label),
+                pickerResponse.index
+            )
+            await this.openLaunchConfig()
+        }
+    }
+
+    /**
+     * Validate and execute the provided launch config.
+     * TODO: Post validation failures back to webview?
+     * @param config Config to invoke
+     */
+    public async invokeLaunchConfig(config: AwsSamDebuggerConfiguration, source?: string): Promise<void> {
+        const finalConfig = finalizeConfig(
+            resolveWorkspaceFolderVariable(undefined, config),
+            'Editor-Created Debug Config'
+        )
+        const targetUri = await this.getUriFromLaunchConfig(finalConfig)
+        const folder = targetUri ? vscode.workspace.getWorkspaceFolder(targetUri) : undefined
+
+        // startDebugging on VS Code goes through the whole resolution chain
+        await vscode.debug.startDebugging(folder, finalConfig)
+    }
+    public async getLaunchConfigQuickPickItems(
+        launchConfig: LaunchConfiguration,
+        uri: vscode.Uri
+    ): Promise<LaunchConfigPickItem[]> {
+        const existingConfigs = launchConfig.getDebugConfigurations()
+        const samValidator = new DefaultAwsSamDebugConfigurationValidator(vscode.workspace.getWorkspaceFolder(uri))
+        const registry = await globals.templateRegistry
+        const mapped = existingConfigs.map((val, index) => {
+            return {
+                config: val as AwsSamDebuggerConfiguration,
+                index: index,
+                label: val.name,
+            }
+        })
+        // XXX: can't use filter() with async predicate.
+        const filtered: LaunchConfigPickItem[] = []
+        for (const c of mapped) {
+            const valid = await samValidator.validate(c.config, registry, true)
+            if (valid?.isValid) {
+                filtered.push(c)
+            }
+        }
+        return filtered
+    }
+
+    public async getUriFromLaunchConfig(config: AwsSamDebuggerConfiguration): Promise<vscode.Uri | undefined> {
+        let targetPath: string
+        if (isTemplateTargetProperties(config.invokeTarget)) {
+            targetPath = config.invokeTarget.templatePath
+        } else if (isCodeTargetProperties(config.invokeTarget)) {
+            targetPath = config.invokeTarget.projectRoot
+        } else {
+            // error
+            return undefined
+        }
+        if (path.isAbsolute(targetPath)) {
+            return vscode.Uri.file(targetPath)
+        }
+        // TODO: rework this logic (and config variables in general)
+        // we have too many places where we try to resolve these paths when it realistically can be
+        // in a single place. Much less bug-prone when it's centralized.
+        // the following line is a quick-fix for a very narrow edge-case
+        targetPath = targetPath.replace('${workspaceFolder}/', '')
+        const workspaceFolders = vscode.workspace.workspaceFolders || []
+        for (const workspaceFolder of workspaceFolders) {
+            const absolutePath = tryGetAbsolutePath(workspaceFolder, targetPath)
+            if (await fs.exists(absolutePath)) {
+                return vscode.Uri.file(absolutePath)
+            }
+        }
+
+        return undefined
+    }
+}
+
+const WebviewPanel = VueWebview.compilePanel(SamInvokeWebview)
+
+export function registerSamInvokeVueCommand(context: vscode.ExtensionContext): vscode.Disposable {
+    return Commands.register('aws.launchConfigForm', async (launchConfig?: AwsSamDebuggerConfiguration) => {
+        const webview = new WebviewPanel(context, launchConfig)
+        await telemetry.sam_openConfigUi.run(async (span) => {
+            await webview.show({
+                title: localize('AWS.command.launchConfigForm.title', 'Local Invoke and Debug Configuration'),
+                // TODO: make this only open `Beside` when executed via CodeLens
+                viewColumn: vscode.ViewColumn.Beside,
+            })
+        })
+    })
+}
+
+export async function registerSamDebugInvokeVueCommand(
+    context: vscode.ExtensionContext,
+    params: { resource: ResourceNode }
+) {
+    const resource = params?.resource.resource
+    const source = 'AppBuilderLocalInvoke'
+    const launchConfigs = await new LaunchConfiguration(resource.location).getSamDebugConfigurations()
+    const launchConfig = launchConfigs.find(
+        (config) => (config.invokeTarget as TemplateTargetProperties).logicalId === resource.resource.Id
+    )
+
+    const webview = new WebviewPanel(context, launchConfig, {
+        logicalId: resource.resource.Id ?? '',
+        region: resource.region ?? '',
+        location: resource.location.fsPath,
+        handler: resource.resource.Handler!,
+        runtime: launchConfig?.lambda?.runtime ?? resource.resource.Runtime!,
+        arn: resource.functionArn ?? '',
+        stackName: resource.stackName ?? '',
+        environment: resource.resource.Environment,
+        source: source,
+    })
+    await telemetry.sam_openConfigUi.run(async (span) => {
+        telemetry.record({ source: 'AppBuilderDebugger' }),
+            await webview.show({
+                title: localize('AWS.command.launchConfigForm.title', 'Local Invoke and Debug Configuration'),
+                // TODO: make this only open `Beside` when executed via CodeLens
+                viewColumn: vscode.ViewColumn.Beside,
+            })
+    })
+}
+
+export function finalizeConfig(config: AwsSamDebuggerConfiguration, name: string): AwsSamDebuggerConfiguration {
+    const newConfig = doTraverseAndPrune(config)
+    newConfig.name = name
+
+    if (isTemplateTargetProperties(config.invokeTarget)) {
+        newConfig.invokeTarget = {
+            target: config.invokeTarget.target,
+            logicalId: config.invokeTarget.logicalId,
+            templatePath: config.invokeTarget.templatePath,
+        }
+    } else if (isCodeTargetProperties(config.invokeTarget)) {
+        newConfig.invokeTarget = {
+            target: config.invokeTarget.target,
+            lambdaHandler: config.invokeTarget.lambdaHandler,
+            projectRoot: config.invokeTarget.projectRoot,
+        }
+    }
+
+    return newConfig
+}
+
+/**
+ * Removes empty objects, strings, fields, and arrays from a given object.
+ * Use when writing JSON to a file.
+ * @param object
+ * @returns Pruned object
+ */
+function doTraverseAndPrune(object: { [key: string]: any }): any | undefined {
+    const keys = Object.keys(object)
+    const final = JSON.parse(JSON.stringify(object))
+    for (const key of keys) {
+        const val = object[key]
+        if (val === undefined || val === '' || (Array.isArray(val) && val.length === 0)) {
+            delete final[key]
+        } else if (typeof val === 'object') {
+            const pruned = doTraverseAndPrune(val)
+            if (pruned) {
+                final[key] = pruned
+            } else {
+                delete final[key]
+            }
+        }
+    }
+    if (Object.keys(final).length === 0) {
+        return undefined
+    }
+    return final
+}
diff --git a/packages/core/src/lambda/vue/configEditor/samInvokeComponent.vue b/packages/core/src/lambda/vue/configEditor/samInvokeComponent.vue
new file mode 100644
index 00000000000..e7d09c584c9
--- /dev/null
+++ b/packages/core/src/lambda/vue/configEditor/samInvokeComponent.vue
@@ -0,0 +1,400 @@
+/*! * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */
+
+<script src="./samInvokeFrontend" lang="ts"></script>
+<style scoped src="./samInvoke.css"></style>
+
+<template>
+    <div class="container">
+        <form class="invoke-lambda-form">
+            <h1>Local Invoke and Debug Configuration</h1>
+            <div class="header-buttons" id="invoke-button-container">
+                <button
+                    class="button-theme-primary"
+                    :style="{ width: '20%', marginRight: '27%' }"
+                    v-on:click.prevent="launch"
+                >
+                    Invoke
+                </button>
+                <button class="button-theme-secondary" :style="{ marginLeft: '15px' }" v-on:click.prevent="loadConfig">
+                    Load Debug Config
+                </button>
+                <button class="button-theme-secondary" :style="{ marginLeft: '10px' }" v-on:click.prevent="save">
+                    Save Debug Config
+                </button>
+            </div>
+            <p>
+                <em>
+                    Using this form you can create, edit, and run launch-configs of <code>type:aws-sam</code>. When you
+                    <strong>Invoke</strong> the launch config, {{ company }} Toolkit calls SAM CLI and attaches the
+                    debugger to the code running in a local Docker container. open
+                    <a href="#" @click.prevent="openLaunchJson">launch.json</a>.<br />
+                    <br />
+                </em>
+            </p>
+            <settings-panel id="config-panel" title="General configuration" description="" :start-collapsed="false">
+                <div class="form-row">
+                    <div><label>Payload:</label></div>
+                    <div class="payload-options">
+                        <div>
+                            <form>
+                                <div class="formfield">
+                                    <input
+                                        class="radio-selector"
+                                        type="radio"
+                                        id="sampleEvents"
+                                        value="sampleEvents"
+                                        v-model="payloadOption"
+                                        name="payload_request"
+                                        checked
+                                    />
+                                    <label class="label-selector" for="sampleEvents">Inline</label><br />
+                                </div>
+                                <div class="formfield">
+                                    <input
+                                        class="radio-selector"
+                                        type="radio"
+                                        id="localFile"
+                                        value="localFile"
+                                        v-model="payloadOption"
+                                        name="payload_request"
+                                    />
+                                    <label class="label-selector" for="localFile"> Local file</label><br />
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-row" v-if="payloadOption === 'sampleEvents'">
+                    <label :style="{ fontSize: '13px', fontWeight: 500 }">Sample event</label>
+                    <div>
+                        <button class="button-theme-secondary" style="width: 140px" v-on:click.prevent="loadPayload">
+                            Select an event</button
+                        ><br />
+                        <span class="data-view">payload from data: {{ payload }} </span>
+                        <div class="input-validation" v-if="payload.errorMsg">
+                            Error parsing JSON: {{ payload.errorMsg }}
+                        </div>
+                        <br />
+                    </div>
+                    <br />
+                    <textarea
+                        style="width: 100%; margin-bottom: 10px"
+                        rows="5"
+                        cols="60"
+                        v-model="payload.value"
+                    ></textarea>
+                </div>
+                <div v-if="payloadOption === 'localFile'" class="form-row">
+                    <div><label>File</label></div>
+                    <div>
+                        <input type="file" id="file" @change="onFileChange" style="display: none" ref="fileInput" />
+                        <button v-on:click.prevent="promptForFileLocation" class="button-theme-secondary">
+                            Choose file</button
+                        >&nbsp; {{ selectedFile || 'No file selected' }}
+                        <span class="data-view">payload from data: {{ payload }} </span>
+                        <div class="input-validation" v-if="payload.errorMsg">
+                            Error parsing JSON: {{ payload.errorMsg }}
+                        </div>
+                    </div>
+                </div>
+                <div class="config-item">
+                    <label for="target-type-selector">Invoke target type</label>
+                    <select name="target-types" id="target-type-selector" v-model="launchConfig.invokeTarget.target">
+                        <option v-bind:value="type.value" v-for="(type, index) in targetTypes" :key="index">
+                            {{ type.name }}
+                        </option></select
+                    ><span class="data-view">{{ launchConfig.invokeTarget.target }}</span>
+                </div>
+                <div class="target-code" v-if="launchConfig.invokeTarget.target === 'code'">
+                    <div class="config-item">
+                        <label for="select-directory">Project root</label>
+                        <input
+                            id="select-directory"
+                            type="text"
+                            v-model="launchConfig.invokeTarget.projectRoot"
+                            placeholder="Enter a directory"
+                        />
+                        <span class="data-view"
+                            >the selected directory: {{ launchConfig.invokeTarget.projectRoot }}</span
+                        >
+                    </div>
+                    <div class="config-item">
+                        <label for="lambda-handler">Lambda handler</label>
+                        <input
+                            type="text"
+                            placeholder="Enter the lambda handler"
+                            name="lambda-handler"
+                            id="lambda-handler"
+                            v-model="launchConfig.invokeTarget.lambdaHandler"
+                        />
+                        <span class="data-view">lamda handler :{{ launchConfig.invokeTarget.lambdaHandler }}</span>
+                    </div>
+                    <div class="config-item">
+                        <label for="runtime-selector">Runtime</label>
+                        <select name="runtimeType" v-model="launchConfig.lambda.runtime">
+                            <option disabled>Choose a runtime...</option>
+                            <option v-for="(runtime, index) in runtimes" v-bind:value="runtime" :key="index">
+                                {{ runtime }}
+                            </option>
+                        </select>
+                        <span class="data-view">runtime in data: {{ launchConfig.lambda.runtime }}</span>
+                    </div>
+                    <div class="config-item">
+                        <label for="useDebugger">Attach a debugger</label>
+                        <input type="checkbox" id="useDebugger" v-model="useDebugger" name="useDebugger" />
+                    </div>
+                </div>
+                <div class="target-template" v-else-if="launchConfig.invokeTarget.target === 'template'">
+                    <div class="config-item">
+                        <label for="template-path">Template path</label>
+                        <input
+                            id="template-path-button"
+                            type="text"
+                            v-model="launchConfig.invokeTarget.templatePath"
+                            placeholder="Enter the template path..."
+                        /><span class="data-view"
+                            >Template path from data: {{ launchConfig.invokeTarget.templatePath }}</span
+                        >
+                    </div>
+                    <div class="config-item">
+                        <label for="logicalID">Resource (Logical ID)</label>
+                        <div class="form-row">
+                            <div>
+                                <input
+                                    name="template-logical-id"
+                                    id="template-logical-id"
+                                    type="text"
+                                    placeholder="Enter a resource"
+                                    v-model="launchConfig.invokeTarget.logicalId"
+                                    class="form-control"
+                                />
+                            </div>
+                            <div style="margin-left: 105px">
+                                <button
+                                    class="button-theme-secondary"
+                                    :style="{ width: '82%', marginLeft: '19%' }"
+                                    v-on:click.prevent="loadResource"
+                                >
+                                    Select Resource
+                                </button>
+                                <span class="data-view">
+                                    Logical Id from data: {{ launchConfig.invokeTarget.logicalId }}</span
+                                >
+                            </div>
+                        </div>
+                    </div>
+                    <div class="config-item">
+                        <label for="runtime-selector">Runtime</label>
+                        <select name="runtimeType" v-model="launchConfig.lambda.runtime">
+                            <option disabled>Choose a runtime...</option>
+                            <option v-for="(runtime, index) in runtimes" v-bind:value="runtime" :key="index">
+                                {{ runtime }}
+                            </option>
+                        </select>
+                        <span class="data-view">runtime in data: {{ launchConfig.lambda.runtime }}</span>
+                        <p
+                            class="runtime-description"
+                            :style="{ width: '250%', marginBottom: '0.1%', marginLeft: '100%' }"
+                        >
+                            For invoke the runtime defined in the template is used.
+                        </p>
+                    </div>
+                    <div class="config-item">
+                        <label for="useDebugger">Attach a debugger</label>
+                        <input type="checkbox" id="useDebugger" v-model="useDebugger" name="useDebugger" />
+                    </div>
+                </div>
+                <div class="target-apigw" v-else-if="launchConfig.invokeTarget.target === 'api'">
+                    <button v-on:click.prevent="loadResource">Load resource</button><br />
+                    <div class="config-item">
+                        <label for="template-path">Template path</label>
+                        <input
+                            id="template-path-button"
+                            type="text"
+                            v-model="launchConfig.invokeTarget.templatePath"
+                            placeholder="Enter the template path..."
+                        /><span class="data-view"
+                            >Template path from data: {{ launchConfig.invokeTarget.templatePath }}</span
+                        >
+                    </div>
+                    <div class="config-item">
+                        <label for="logicalID">Resource (Logical ID)</label>
+                        <input
+                            name="template-logical-id"
+                            id="template-logical-id"
+                            type="text"
+                            placeholder="Enter a resource"
+                            v-model="launchConfig.invokeTarget.logicalId"
+                        />
+                    </div>
+                    <div class="config-item">
+                        <label for="runtime-selector">Runtime</label>
+                        <select name="runtimeType" v-model="launchConfig.lambda.runtime">
+                            <option disabled>Choose a runtime...</option>
+                            <option v-for="(runtime, index) in runtimes" v-bind:value="runtime" :key="index">
+                                {{ runtime }}
+                            </option>
+                        </select>
+                        <span class="data-view">runtime in data: {{ launchConfig.lambda.runtime }}</span>
+                    </div>
+                    <div class="config-item">
+                        <label for="useDebugger">Attach a debugger</label>
+                        <input type="checkbox" id="useDebugger" v-model="useDebugger" name="useDebugger" />
+                    </div>
+                    <div class="config-item">
+                        <label for="path">Path</label>
+                        <input type="text" v-model="launchConfig.api.path" />
+                    </div>
+                    <div class="config-item">
+                        <label for="http-method-selector">HTTP Method</label>
+                        <select name="http-method" v-model="launchConfig.api.httpMethod">
+                            <option disabled>Choose an HTTP Method</option>
+                            <option
+                                v-for="(method, index) in httpMethods"
+                                v-bind:value="method.toLowerCase()"
+                                :key="index"
+                            >
+                                {{ method }}
+                            </option></select
+                        ><span class="data-view">{{ launchConfig.api.httpMethod }}</span>
+                    </div>
+                    <div class="config-item">
+                        <label for="query-string">Query string</label>
+                        <input
+                            name="query-string"
+                            id="query-string"
+                            type="text"
+                            cols="15"
+                            rows="2"
+                            placeholder="Enter a query"
+                            v-model="launchConfig.api.querystring"
+                        />
+                    </div>
+                    <div class="config-item">
+                        <label for="headers">Headers</label>
+                        <input
+                            type="text"
+                            v-model="headers.value"
+                            placeholder="Enter as valid JSON"
+                            :data-invalid="!!headers.errorMsg"
+                        />
+                        <div class="input-validation col2" v-if="headers.errorMsg">
+                            Error parsing JSON: {{ headers.errorMsg }}
+                        </div>
+                    </div>
+                </div>
+                <div v-else>Select an invoke target</div>
+            </settings-panel>
+            <settings-panel id="more-fields-panel" title="Additional fields" description="" start-collapsed>
+                <h3>aws</h3>
+                <div class="config-item">
+                    <label for="awsConnection">Credentials:</label>
+                    <input type="text" v-model="launchConfig.aws.credentials" />
+                </div>
+                <div class="config-item">
+                    <label for="region">Region</label>
+                    <input type="text" v-model="launchConfig.aws.region" />
+                </div>
+                <h3>lambda</h3>
+                <div class="config-item">
+                    <label for="">Environment variables</label>
+                    <input
+                        type="text"
+                        placeholder="Enter as valid JSON"
+                        v-model="environmentVariables.value"
+                        :data-invalid="!!environmentVariables.errorMsg"
+                    />
+                    <div class="input-validation col2" v-if="environmentVariables.errorMsg">
+                        Error parsing JSON: {{ environmentVariables.errorMsg }}
+                    </div>
+                </div>
+                <div class="config-item">
+                    <label for="memory">Memory (MB)</label>
+                    <input type="number" v-model.number="launchConfig.lambda.memoryMb" />
+                </div>
+                <div class="config-item">
+                    <label for="timeoutSec">Timeout (s)</label>
+                    <input type="number" v-model.number="launchConfig.lambda.timeoutSec" />
+                </div>
+                <!-- <div class="config-item">
+                    <label for="pathMappings">Path Mappings</label>
+                    <input type="text" v-model="launchConfig.lambda.pathMappings" >
+                </div> -->
+                <h3>sam</h3>
+                <div class="config-item">
+                    <label for="buildArguments">Build arguments</label>
+                    <input
+                        type="text"
+                        v-model="launchConfig.sam.buildArguments"
+                        placeholder="Enter as a comma separated list"
+                    />
+                </div>
+                <div class="config-item">
+                    <label for="containerBuild">Container build</label>
+                    <input type="checkbox" name="containerBuild" id="containerBuild" v-model="containerBuild" />
+                </div>
+                <div class="config-item">
+                    <label for="dockerNetwork">Docker network</label>
+                    <input type="text" v-model="launchConfig.sam.dockerNetwork" />
+                </div>
+                <div class="config-item">
+                    <label for="localArguments">Local arguments</label>
+                    <input
+                        type="text"
+                        v-model="launchConfig.sam.localArguments"
+                        placeholder="Enter as a comma separated list"
+                    />
+                </div>
+                <div class="config-item">
+                    <label for="skipNewImageCheck">Skip new image Check</label>
+                    <input
+                        type="checkbox"
+                        name="skipNewImageCheck"
+                        id="skipNewImageCheck"
+                        v-model="skipNewImageCheck"
+                    />
+                </div>
+                <div class="config-item">
+                    <label for="templateParameters">Template - parameters</label>
+                    <input type="text" v-model="parameters.value" :data-invalid="!!parameters.errorMsg" />
+                    <div class="input-validation col2" v-if="parameters.errorMsg">
+                        Error parsing JSON: {{ parameters.errorMsg }}
+                    </div>
+                </div>
+                <h3>api</h3>
+                <div class="config-item">
+                    <label for="querystring">Query string</label>
+                    <input type="text" v-model="launchConfig.api.querystring" />
+                </div>
+                <div class="config-item">
+                    <label for="stageVariables">Stage variables</label>
+                    <input
+                        type="text"
+                        v-model="stageVariables.value"
+                        :data-invalid="!!stageVariables.errorMsg"
+                        placeholder="Enter as valid JSON"
+                    />
+                    <div class="input-validation col2" v-if="stageVariables.errorMsg">
+                        Error parsing JSON: {{ stageVariables.errorMsg }}
+                    </div>
+                </div>
+                <div class="config-item">
+                    <label for="clientCerificateId">Client certificate ID</label>
+                    <input type="text" v-model="launchConfig.api.clientCertificateId" />
+                </div>
+                <div class="config-item">
+                    <label for="apiPayload">API payload</label>
+                    <input
+                        type="text"
+                        v-model="apiPayload.value"
+                        placeholder="Enter as valid JSON"
+                        :data-invalid="!!apiPayload.errorMsg"
+                    />
+                    <div class="input-validation col2" v-if="apiPayload.errorMsg">
+                        Error parsing JSON: {{ apiPayload.errorMsg }}
+                    </div>
+                </div>
+            </settings-panel>
+        </form>
+    </div>
+</template>
diff --git a/packages/core/src/lambda/vue/configEditor/samInvokeFrontend.ts b/packages/core/src/lambda/vue/configEditor/samInvokeFrontend.ts
new file mode 100644
index 00000000000..375e22f4878
--- /dev/null
+++ b/packages/core/src/lambda/vue/configEditor/samInvokeFrontend.ts
@@ -0,0 +1,464 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Disable because it is a front-end file.
+/* eslint-disable aws-toolkits/no-console-log */
+
+import { defineComponent } from 'vue'
+import { AwsSamDebuggerConfiguration } from '../../../shared/sam/debugger/awsSamDebugConfiguration'
+import {
+    AwsSamDebuggerConfigurationLoose,
+    LaunchConfigPickItem,
+    ResourceData,
+    SamInvokeWebview,
+} from './samInvokeBackend'
+import settingsPanel from '../../../webviews/components/settingsPanel.vue'
+import { WebviewClientFactory } from '../../../webviews/client'
+import saveData from '../../../webviews/mixins/saveData'
+
+const client = WebviewClientFactory.create<SamInvokeWebview>()
+
+interface VueDataLaunchPropertyObject {
+    value: string
+    errorMsg: string
+}
+interface SamInvokeVueData {
+    msg: any
+    targetTypes: { [k: string]: string }[]
+    runtimes: string[]
+    company: string
+    httpMethods: string[]
+    launchConfig: AwsSamDebuggerConfigurationLoose
+    payload: VueDataLaunchPropertyObject
+    apiPayload: VueDataLaunchPropertyObject
+    environmentVariables: VueDataLaunchPropertyObject
+    headers: VueDataLaunchPropertyObject
+    stageVariables: VueDataLaunchPropertyObject
+    parameters: VueDataLaunchPropertyObject
+    containerBuild: boolean
+    skipNewImageCheck: boolean
+    selectedConfig: LaunchConfigPickItem
+    payloadOption: string
+    selectedFile: string
+    selectedFilePath: string
+    selectedTestEvent: string
+    TestEvents: string[]
+    showNameInput: boolean
+    newTestEventName: string
+    resourceData: ResourceData | undefined
+    useDebugger: boolean
+}
+
+function newLaunchConfig(existingConfig?: AwsSamDebuggerConfiguration): AwsSamDebuggerConfigurationLoose {
+    return {
+        type: 'aws-sam',
+        request: 'direct-invoke',
+        name: '',
+        aws: {
+            credentials: '',
+            region: '',
+            ...(existingConfig?.aws ? existingConfig.aws : {}),
+        },
+        invokeTarget: {
+            target: 'template',
+            templatePath: '',
+            logicalId: '',
+            lambdaHandler: '',
+            projectRoot: '',
+            ...existingConfig?.invokeTarget,
+        },
+        lambda: {
+            runtime: existingConfig?.lambda?.runtime,
+            memoryMb: undefined,
+            timeoutSec: undefined,
+            environmentVariables: {},
+            ...existingConfig?.lambda,
+            payload: {
+                json: existingConfig?.lambda?.payload?.json ? existingConfig.lambda.payload.json : {},
+                path: existingConfig?.lambda?.payload?.path ? existingConfig.lambda.payload.path : '',
+            },
+
+            // pathMappings: undefined
+        },
+        sam: {
+            buildArguments: undefined,
+            containerBuild: false,
+            dockerNetwork: '',
+            localArguments: undefined,
+            skipNewImageCheck: false,
+            ...(existingConfig?.sam ? existingConfig.sam : {}),
+            template: {
+                parameters: existingConfig?.sam?.template?.parameters ? existingConfig.sam.template.parameters : {},
+            },
+        },
+        api: {
+            path: '',
+            httpMethod: 'get',
+            clientCertificateId: '',
+            querystring: '',
+            headers: {},
+            stageVariables: {},
+            ...(existingConfig?.api ? existingConfig.api : {}),
+            payload: {
+                json: existingConfig?.api?.payload?.json ? existingConfig.api.payload.json : {},
+                path: existingConfig?.api?.payload?.path ? existingConfig.api.payload.path : '',
+            },
+        },
+    }
+}
+
+function initData() {
+    return {
+        containerBuild: false,
+        skipNewImageCheck: false,
+        useDebugger: true,
+        launchConfig: newLaunchConfig(),
+        payload: { value: '', errorMsg: '' },
+        apiPayload: { value: '', errorMsg: '' },
+        environmentVariables: { value: '', errorMsg: '' },
+        parameters: { value: '', errorMsg: '' },
+        headers: { value: '', errorMsg: '' },
+        stageVariables: { value: '', errorMsg: '' },
+        selectedConfig: { index: 0, config: undefined, label: 'new-config' },
+        selectedTestEvent: '',
+        TestEvents: [],
+        showNameInput: false,
+        newTestEventName: '',
+    }
+}
+
+export default defineComponent({
+    name: 'sam-invoke',
+    components: {
+        settingsPanel,
+    },
+    created() {
+        this.setUpWebView()
+    },
+    mixins: [saveData],
+    data(): SamInvokeVueData {
+        return {
+            ...initData(),
+            msg: 'Hello',
+            company: '',
+            targetTypes: [
+                { name: 'Code', value: 'code' },
+                { name: 'Template', value: 'template' },
+                { name: 'API Gateway (Template)', value: 'api' },
+            ],
+            runtimes: [],
+            httpMethods: ['GET', 'POST', 'PUT', 'DELETE', 'HEAD', 'OPTIONS', 'PATCH'],
+            payloadOption: 'sampleEvents',
+            selectedFile: '',
+            selectedFilePath: '',
+            resourceData: undefined,
+        }
+    },
+    methods: {
+        resetJsonErrors() {
+            this.payload.errorMsg = ''
+            this.environmentVariables.errorMsg = ''
+            this.headers.errorMsg = ''
+            this.stageVariables.errorMsg = ''
+        },
+        async launch() {
+            const config = this.formatConfig()
+
+            if (!config) {
+                return // Exit early if config is not available
+            }
+
+            const source = this.resourceData?.source
+
+            client.invokeLaunchConfig(config, source).catch((e: Error) => {
+                console.error(`invokeLaunchConfig failed: ${e.message}`)
+            })
+        },
+        save() {
+            const config = this.formatConfig()
+            config &&
+                client.saveLaunchConfig(config).catch((e) => {
+                    console.error('saveLaunchConfig failed: %s', (e as Error).message)
+                })
+        },
+        loadConfig() {
+            client.loadSamLaunchConfig().then(
+                (config) => this.parseConfig(config),
+                (e) => {
+                    console.error('client.loadSamLaunchConfig failed: %s', (e as Error).message)
+                }
+            )
+        },
+        async parseConfig(config?: AwsSamDebuggerConfiguration) {
+            if (!config) {
+                return
+            }
+            const company = this.company
+            this.clearForm()
+            this.launchConfig = newLaunchConfig(config)
+
+            if (config.lambda?.payload) {
+                this.payload.value = JSON.stringify(config.lambda.payload.json, undefined, 4)
+            }
+
+            const localArgs = config.sam?.localArguments
+
+            if (!localArgs && this.payload.value) {
+                this.payloadOption = 'sampleEvents'
+                this.selectedFile = ''
+            }
+
+            if (localArgs?.includes('-e') || localArgs?.includes('--event')) {
+                const index = localArgs.findIndex((arg) => arg === '-e' || arg === '--event')
+
+                if (index !== -1 && localArgs[index + 1]) {
+                    this.payloadOption = 'localFile'
+                    this.selectedFile = await client.getFileName(localArgs[index + 1])
+                }
+            }
+
+            if (config.lambda?.environmentVariables) {
+                this.environmentVariables.value = JSON.stringify(config.lambda?.environmentVariables)
+            }
+            if (config.sam?.template?.parameters) {
+                this.parameters.value = JSON.stringify(config.sam?.template?.parameters)
+            }
+            if (config.api?.headers) {
+                this.headers.value = JSON.stringify(config.api?.headers)
+            }
+            if (config.api?.stageVariables) {
+                this.stageVariables.value = JSON.stringify(config.api?.stageVariables)
+            }
+            this.containerBuild = config.sam?.containerBuild ?? false
+            this.skipNewImageCheck = config.sam?.skipNewImageCheck ?? false
+            this.msg = `Loaded config: ${config.name}`
+            this.company = company
+        },
+        loadPayload() {
+            this.resetJsonErrors()
+            client.getSamplePayload().then(
+                (sample) => {
+                    if (!sample) {
+                        return
+                    }
+                    this.payload.value = JSON.stringify(JSON.parse(sample), undefined, 4)
+                },
+                (e) => {
+                    console.error('client.getSamplePayload failed: %s', (e as Error).message)
+                }
+            )
+        },
+        loadResource() {
+            this.resetJsonErrors()
+            client.getTemplate().then(
+                (template) => {
+                    if (!template) {
+                        return
+                    }
+                    this.launchConfig.invokeTarget.target = 'template'
+                    this.launchConfig.invokeTarget.logicalId = template.logicalId
+                    this.launchConfig.invokeTarget.templatePath = template.template
+                },
+                (e) => {
+                    console.error('client.getTemplate failed: %s', (e as Error).message)
+                }
+            )
+        },
+        formatFieldToStringArray(field: string | undefined) {
+            if (!field) {
+                return undefined
+            }
+            // Reg ex for a comma with 0 or more whitespace before and/or after
+            const re = /\s*,\s*/g
+            return field.trim().split(re)
+        },
+        formatStringtoJSON(field: VueDataLaunchPropertyObject) {
+            field.errorMsg = ''
+            if (field.value) {
+                try {
+                    return JSON.parse(field.value)
+                } catch (e) {
+                    field.errorMsg = (e as Error).message
+                    throw e
+                }
+            }
+        },
+        async openLaunchJson() {
+            await client.openLaunchConfig()
+        },
+        onFileChange(event: Event) {
+            const input = event.target as HTMLInputElement
+            if (input.files && input.files.length > 0) {
+                const file = input.files[0]
+                this.selectedFile = file.name
+
+                // Use Blob.text() to read the file as text
+                file.text()
+                    .then((text) => {
+                        this.payload.value = text
+                    })
+                    .catch((error) => {
+                        console.error('Error reading file:', error)
+                    })
+            }
+        },
+        async promptForFileLocation() {
+            const resp = await client.promptFile()
+
+            if (resp) {
+                this.selectedFile = resp.selectedFile
+                this.launchConfig.sam = this.launchConfig.sam || {}
+                this.launchConfig.sam.localArguments = this.launchConfig.sam.localArguments || []
+
+                // Ensure only one '-e <filepath>' or '--event <filepath>' exists
+                const eventArgIndex = this.launchConfig.sam.localArguments.findIndex(
+                    (arg) => arg === '-e' || arg === '--event'
+                )
+
+                if (eventArgIndex !== -1 && this.launchConfig.sam.localArguments[eventArgIndex + 1]) {
+                    // Replace the existing file path for either '-e' or '--event'
+                    this.launchConfig.sam.localArguments[eventArgIndex + 1] = resp.selectedFilePath
+                } else {
+                    // Add '-e <filepath>' if not already present
+                    this.launchConfig.sam.localArguments.push('-e', resp.selectedFilePath)
+                }
+            }
+        },
+        showNameField() {
+            this.showNameInput = true
+        },
+        setUpWebView() {
+            client.init().then(
+                (config) => this.parseConfig(config),
+                (e) => {
+                    console.error('client.init failed: %s', (e as Error).message)
+                }
+            )
+
+            if (this.launchConfig.invokeTarget.templatePath === '') {
+                client.getResourceData().then(
+                    (data) => {
+                        this.resourceData = data
+                        if (this.launchConfig && this.resourceData) {
+                            this.launchConfig.invokeTarget.logicalId = this.resourceData.logicalId
+                            this.launchConfig.invokeTarget.templatePath = this.resourceData.location
+                            this.launchConfig.invokeTarget.lambdaHandler = this.resourceData.handler
+                            if (this.launchConfig.lambda) {
+                                this.launchConfig.lambda.runtime = this.resourceData.runtime
+                                if (this.resourceData.environment?.Variables !== undefined) {
+                                    this.environmentVariables.value = JSON.stringify(
+                                        this.resourceData.environment?.Variables
+                                    )
+                                }
+                            }
+                        }
+                    },
+                    (e) => {
+                        console.error('client.getResourceData failed: %s', (e as Error).message)
+                    }
+                )
+            }
+
+            client.getRuntimes().then(
+                (runtimes) => {
+                    this.runtimes = runtimes
+                },
+                (e) => {
+                    console.error('client.getRuntimes failed: %s', (e as Error).message)
+                }
+            )
+
+            client.getCompanyName().then(
+                (o) => {
+                    this.company = o
+                },
+                (e) => {
+                    console.error('client.getCompanyName failed: %s', (e as Error).message)
+                }
+            )
+        },
+        formatConfig() {
+            this.resetJsonErrors()
+
+            let payloadJson, environmentVariablesJson, headersJson, stageVariablesJson, parametersJson, apiPayloadJson
+
+            try {
+                payloadJson = this.formatStringtoJSON(this.payload)
+                environmentVariablesJson = this.formatStringtoJSON(this.environmentVariables)
+                headersJson = this.formatStringtoJSON(this.headers)
+                stageVariablesJson = this.formatStringtoJSON(this.stageVariables)
+                parametersJson = this.formatStringtoJSON(this.parameters)
+                apiPayloadJson = this.formatStringtoJSON(this.apiPayload)
+            } catch {
+                return
+            }
+
+            // Vue internally stores a Proxy for all object-like fields, so the spread operator can
+            // propagate those through to the `postMessage` command, causing an error. We can stop
+            // this by recursively accessing all primitive fields (which is what this line does)
+            const launchConfig: AwsSamDebuggerConfigurationLoose = JSON.parse(JSON.stringify(this.launchConfig))
+            const localArgs = launchConfig.sam?.localArguments
+
+            const removeEventArg = () => {
+                if (localArgs) {
+                    const eventArgIndex = localArgs?.findIndex((arg) => arg === '-e' || arg === '--event')
+                    if (eventArgIndex !== -1) {
+                        // Remove the event argument and its value
+                        localArgs?.splice(eventArgIndex, 2)
+                    }
+                }
+            }
+
+            if (localArgs) {
+                if (this.payload && this.payloadOption !== 'localFile') {
+                    removeEventArg()
+                } else if (this.payloadOption === 'localFile' && this.selectedFile) {
+                    payloadJson = undefined
+                } else {
+                    removeEventArg()
+                }
+            }
+
+            return {
+                ...launchConfig,
+                lambda: {
+                    ...launchConfig.lambda,
+                    payload: {
+                        ...launchConfig.payload,
+                        json: payloadJson,
+                    },
+                    environmentVariables: environmentVariablesJson,
+                },
+                sam: {
+                    ...launchConfig.sam,
+                    buildArguments: this.formatFieldToStringArray(launchConfig.sam?.buildArguments?.toString()),
+                    localArguments: this.formatFieldToStringArray(launchConfig.sam?.localArguments?.toString()),
+                    containerBuild: this.containerBuild,
+                    skipNewImageCheck: this.skipNewImageCheck,
+                    template: {
+                        parameters: parametersJson,
+                    },
+                },
+                api: launchConfig.api
+                    ? {
+                          ...launchConfig.api,
+                          headers: headersJson,
+                          stageVariables: stageVariablesJson,
+                          payload: {
+                              json: apiPayloadJson,
+                          },
+                      }
+                    : undefined,
+                noDebug: !this.useDebugger,
+            }
+        },
+        clearForm() {
+            const init = initData()
+            for (const k of Object.keys(init)) {
+                ;(this as any)[k] = init[k as keyof typeof init]
+            }
+        },
+    },
+})
diff --git a/packages/core/src/lambda/vue/remoteInvoke/index.ts b/packages/core/src/lambda/vue/remoteInvoke/index.ts
new file mode 100644
index 00000000000..a44142fd527
--- /dev/null
+++ b/packages/core/src/lambda/vue/remoteInvoke/index.ts
@@ -0,0 +1,16 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { createApp } from 'vue'
+import component from './remoteInvoke.vue'
+
+const create = () => createApp(component)
+const app = create()
+app.mount('#vue-app')
+
+window.addEventListener('remount', () => {
+    app.unmount()
+    create().mount('#vue-app')
+})
diff --git a/packages/core/src/lambda/vue/remoteInvoke/invokeLambda.ts b/packages/core/src/lambda/vue/remoteInvoke/invokeLambda.ts
new file mode 100644
index 00000000000..c56f43ae199
--- /dev/null
+++ b/packages/core/src/lambda/vue/remoteInvoke/invokeLambda.ts
@@ -0,0 +1,949 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { readFileSync } from 'fs' // eslint-disable-line no-restricted-imports
+import * as _ from 'lodash'
+import * as vscode from 'vscode'
+import { LambdaClient } from '../../../shared/clients/lambdaClient'
+import * as picker from '../../../shared/ui/picker'
+import { ExtContext } from '../../../shared/extensions'
+
+import { getLogger } from '../../../shared/logger/logger'
+import { HttpResourceFetcher } from '../../../shared/resourcefetcher/httpResourceFetcher'
+import { sampleRequestPath } from '../../constants'
+import { LambdaFunctionNode } from '../../explorer/lambdaFunctionNode'
+import { getSampleLambdaPayloads, SampleRequest, isHotReloadingFunction } from '../../utils'
+
+import * as nls from 'vscode-nls'
+import { VueWebview } from '../../../webviews/main'
+import { telemetry, Runtime as TelemetryRuntime } from '../../../shared/telemetry/telemetry'
+import { Runtime } from '@aws-sdk/client-lambda'
+import {
+    runSamCliRemoteTestEvents,
+    SamCliRemoteTestEventsParameters,
+    TestEventsOperation,
+} from '../../../shared/sam/cli/samCliRemoteTestEvent'
+import { getSamCliContext } from '../../../shared/sam/cli/samCliContext'
+import { ToolkitError } from '../../../shared/errors'
+import { basename } from 'path'
+import { decodeBase64 } from '../../../shared/utilities/textUtilities'
+import { RemoteDebugController, revertExistingConfig } from '../../remoteDebugging/ldkController'
+import type { DebugConfig } from '../../remoteDebugging/lambdaDebugger'
+import { getCachedLocalPath, openLambdaFile, runDownloadLambda } from '../../commands/downloadLambda'
+import { getLambdaHandlerFile } from '../../../awsService/appBuilder/utils'
+import { runUploadDirectory } from '../../commands/uploadLambda'
+import fs from '../../../shared/fs/fs'
+import { showConfirmationMessage, showMessage } from '../../../shared/utilities/messages'
+import { getLambdaClientWithAgent, getLambdaDebugUserAgent } from '../../remoteDebugging/utils'
+import { isLocalStackConnection } from '../../../auth/utils'
+import { getRemoteDebugLayer } from '../../remoteDebugging/remoteLambdaDebugger'
+
+const localize = nls.loadMessageBundle()
+
+type Event = {
+    name: string
+    region: string
+    arn: string
+    event?: string
+}
+
+export interface InitialData {
+    FunctionName: string
+    FunctionArn: string
+    FunctionRegion: string
+    InputSamples: SampleRequest[]
+    TestEvents?: string[]
+    Source?: string
+    StackName?: string
+    LogicalId?: string
+    Runtime?: Runtime
+    LocalRootPath?: string
+    LambdaFunctionNode?: LambdaFunctionNode
+    supportCodeDownload?: boolean
+    runtimeSupportsRemoteDebug?: boolean
+    remoteDebugLayer?: string | undefined
+    isLambdaRemote?: boolean
+}
+
+// Debug configuration sub-interface
+export interface DebugConfiguration {
+    debugPort: number | undefined
+    localRootPath: string
+    remoteRootPath: string
+    shouldPublishVersion: boolean
+    lambdaTimeout: number
+    otherDebugParams: string
+}
+
+// Debug state sub-interface
+export interface DebugState {
+    isDebugging: boolean
+    debugTimer: number | undefined
+    debugTimeRemaining: number
+    showDebugTimer: boolean
+    handlerFileAvailable: boolean
+    remoteDebuggingEnabled: boolean
+}
+
+// Runtime-specific debug settings sub-interface
+export interface RuntimeDebugSettings {
+    // Node.js specific
+    sourceMapEnabled: boolean
+    skipFiles: string
+    outFiles: string | undefined
+    // Python specific
+    justMyCode: boolean
+    // Java specific
+    projectName: string
+}
+
+// UI state sub-interface
+export interface UIState {
+    isCollapsed: boolean
+    extraRegionInfo: string
+}
+
+// Payload/Event handling sub-interface
+export interface PayloadData {
+    sampleText: string
+}
+
+export interface RemoteInvokeData {
+    initialData: InitialData
+    debugConfig: DebugConfiguration
+    debugState: DebugState
+    runtimeSettings: RuntimeDebugSettings
+    uiState: UIState
+    payloadData: PayloadData
+}
+
+// Event types for communicating state between backend and frontend
+export type StateChangeEvent = {
+    isDebugging?: boolean
+}
+interface SampleQuickPickItem extends vscode.QuickPickItem {
+    filename: string
+}
+
+export class RemoteInvokeWebview extends VueWebview {
+    public static readonly sourcePath: string = 'src/lambda/vue/remoteInvoke/index.js'
+    public readonly id = 'remoteInvoke'
+
+    // Event emitter for state changes that need to be synchronized with the frontend
+    public readonly onStateChange = new vscode.EventEmitter<StateChangeEvent>()
+
+    // Backend timer that will continue running even when the webview loses focus
+    private debugTimerHandle: NodeJS.Timeout | undefined
+    private debugTimeRemaining: number = 0
+    private isInvoking: boolean = false
+    private debugging: boolean = false
+    private watcherDisposable: vscode.Disposable | undefined
+    private fileWatcherDisposable: vscode.Disposable | undefined
+    private handlerFileAvailable: boolean = false
+    private isStartingDebug: boolean = false
+    private handlerFile: string | undefined
+    public constructor(
+        private readonly channel: vscode.OutputChannel,
+        private readonly client: LambdaClient,
+        private readonly clientDebug: LambdaClient,
+        private readonly data: InitialData
+    ) {
+        super(RemoteInvokeWebview.sourcePath)
+    }
+
+    public init() {
+        this.watcherDisposable = vscode.debug.onDidTerminateDebugSession(async (session: vscode.DebugSession) => {
+            this.resetServerState()
+        })
+        return this.data
+    }
+
+    public resetServerState() {
+        this.stopDebugTimer()
+        this.debugging = false
+        this.isInvoking = false
+        this.isStartingDebug = false
+        this.onStateChange.fire({
+            isDebugging: false,
+        })
+    }
+
+    public async disposeServer() {
+        this.watcherDisposable?.dispose()
+        this.fileWatcherDisposable?.dispose()
+        if (this.debugging && RemoteDebugController.instance.isDebugging) {
+            await this.stopDebugging()
+        }
+        this.dispose()
+    }
+
+    private setupFileWatcher() {
+        // Dispose existing watcher if any
+        this.fileWatcherDisposable?.dispose()
+
+        if (!this.data.LocalRootPath) {
+            return
+        }
+
+        // Create a file system watcher for the local root path
+        const pattern = new vscode.RelativePattern(this.data.LocalRootPath, '**/*')
+        const watcher = vscode.workspace.createFileSystemWatcher(pattern)
+
+        // Set up event handlers for file changes
+        const handleFileChange = async () => {
+            const result = await showMessage(
+                'info',
+                localize(
+                    'AWS.lambda.remoteInvoke.codeChangesDetected',
+                    'Code changes detected in the local directory. Would you like to update the Lambda function {0}@{1}?',
+                    this.data.FunctionName,
+                    this.data.FunctionRegion
+                ),
+                ['Yes', 'No']
+            )
+
+            if (result === 'Yes') {
+                try {
+                    if (this.data.LambdaFunctionNode && this.data.LocalRootPath) {
+                        const lambdaFunction = {
+                            name: this.data.FunctionName,
+                            region: this.data.FunctionRegion,
+                            configuration: this.data.LambdaFunctionNode.configuration,
+                        }
+                        await runUploadDirectory(lambdaFunction, 'zip', vscode.Uri.file(this.data.LocalRootPath))
+                    }
+                } catch (error) {
+                    throw ToolkitError.chain(
+                        error,
+                        localize('AWS.lambda.remoteInvoke.updateFailed', 'Failed to update Lambda function')
+                    )
+                }
+            }
+        }
+
+        // Listen for file changes, creations, and deletions
+        watcher.onDidChange(handleFileChange)
+        watcher.onDidCreate(handleFileChange)
+        watcher.onDidDelete(handleFileChange)
+
+        // Store the disposable so we can clean it up later
+        this.fileWatcherDisposable = watcher
+    }
+
+    // Method to start the backend timer
+    public startDebugTimer() {
+        // Clear any existing timer
+        this.stopDebugTimer()
+
+        this.debugTimeRemaining = 60
+
+        // Create a new timer that ticks every second
+        this.debugTimerHandle = setInterval(async () => {
+            this.debugTimeRemaining--
+
+            // When timer reaches zero, stop debugging
+            if (this.debugTimeRemaining <= 0) {
+                await this.handleTimerExpired()
+            }
+        }, 1000)
+    }
+
+    // Method to stop the timer
+    public stopDebugTimer() {
+        if (this.debugTimerHandle) {
+            clearInterval(this.debugTimerHandle)
+            this.debugTimerHandle = undefined
+            this.debugTimeRemaining = 0
+        }
+    }
+
+    // Handler for timer expiration
+    private async handleTimerExpired() {
+        await this.stopDebugging()
+    }
+
+    public async invokeLambda(input: string, source?: string, remoteDebugEnabled: boolean = false): Promise<void> {
+        let qualifier: string | undefined = undefined
+        // if debugging, focus on the first editor
+        if (remoteDebugEnabled && RemoteDebugController.instance.isDebugging) {
+            await vscode.commands.executeCommand('workbench.action.focusFirstEditorGroup')
+            qualifier = RemoteDebugController.instance.qualifier
+        }
+
+        this.isInvoking = true
+
+        // If debugging is active, reset the timer during invoke
+        if (RemoteDebugController.instance.isDebugging) {
+            this.stopDebugTimer()
+        }
+
+        this.channel.show()
+        this.channel.appendLine('Loading response...')
+        await telemetry.lambda_invokeRemote.run(async (span) => {
+            try {
+                const funcResponse = remoteDebugEnabled
+                    ? await this.clientDebug.invoke(this.data.FunctionArn, input, qualifier)
+                    : await this.client.invoke(this.data.FunctionArn, input, qualifier)
+                const logs = funcResponse.LogResult ? decodeBase64(funcResponse.LogResult) : ''
+                const decodedPayload = funcResponse.Payload ? new TextDecoder().decode(funcResponse.Payload) : ''
+                const payload = decodedPayload || JSON.stringify({})
+
+                this.channel.appendLine(`Invocation result for ${this.data.FunctionArn}`)
+                this.channel.appendLine('Logs:')
+                this.channel.appendLine(logs)
+                this.channel.appendLine('')
+                this.channel.appendLine('Payload:')
+                this.channel.appendLine(String(payload))
+                this.channel.appendLine('')
+            } catch (e) {
+                const error = e as Error
+                this.channel.appendLine(`There was an error invoking ${this.data.FunctionArn}`)
+                this.channel.appendLine(error.toString())
+                this.channel.appendLine('')
+            } finally {
+                let action = remoteDebugEnabled ? 'debug' : 'invoke'
+                if (!this.data.isLambdaRemote) {
+                    action = `${action}LocalStack`
+                }
+                span.record({
+                    passive: false,
+                    source: source,
+                    runtimeString: this.data.Runtime,
+                    action: action,
+                })
+
+                // Update the session state to indicate we've finished invoking
+                this.isInvoking = false
+
+                // If debugging is active, restart the timer
+                if (RemoteDebugController.instance.isDebugging) {
+                    this.startDebugTimer()
+                }
+                this.channel.show()
+            }
+        })
+    }
+
+    public async promptFile() {
+        const fileLocations = await vscode.window.showOpenDialog({
+            openLabel: localize('AWS.lambda.remoteInvoke.open', 'Open'),
+        })
+
+        if (!fileLocations || fileLocations.length === 0) {
+            return undefined
+        }
+
+        try {
+            const fileContent = readFileSync(fileLocations[0].fsPath, { encoding: 'utf8' })
+            return {
+                sample: fileContent,
+                selectedFilePath: fileLocations[0].fsPath,
+                selectedFile: this.getFileName(fileLocations[0].fsPath),
+            }
+        } catch (e) {
+            getLogger().error('readFileSync: Failed to read file at path %s %O', fileLocations[0].fsPath, e)
+            throw ToolkitError.chain(
+                e,
+                localize('AWS.lambda.remoteInvoke.failedToReadFile', 'Failed to read selected file')
+            )
+        }
+    }
+
+    public async promptFolder(): Promise<undefined | string> {
+        const fileLocations = await vscode.window.showOpenDialog({
+            openLabel: localize('AWS.lambda.remoteInvoke.open', 'Open'),
+            canSelectFolders: true,
+            canSelectFiles: false,
+            canSelectMany: false,
+        })
+
+        if (!fileLocations || fileLocations.length === 0) {
+            return undefined
+        }
+        this.data.LocalRootPath = fileLocations[0].fsPath
+        // try to find the handler file in this folder, open it if not opened already
+        if (!(await this.tryOpenHandlerFile())) {
+            const warning = localize(
+                'AWS.lambda.remoteInvoke.handlerFileNotFound',
+                'Handler {0} not found in selected location. Please select the folder that contains the copy of your handler file',
+                this.data.LambdaFunctionNode?.configuration.Handler
+            )
+            getLogger().warn(warning)
+            void showMessage('warn', warning)
+        }
+        return fileLocations[0].fsPath
+    }
+
+    public async tryOpenHandlerFile(path?: string, watchForUpdates: boolean = true): Promise<boolean> {
+        this.handlerFile = undefined
+        if (this.data.LocalRootPath) {
+            // don't watch in appbuilder
+            watchForUpdates = false
+        }
+        if (path) {
+            // path is provided, override init path
+            this.data.LocalRootPath = path
+        }
+        // init path or node not available
+        if (!this.data.LocalRootPath || !this.data.LambdaFunctionNode) {
+            return false
+        }
+
+        const handlerFile = this.data.Runtime
+            ? await getLambdaHandlerFile(
+                  vscode.Uri.file(this.data.LocalRootPath),
+                  '',
+                  this.data.LambdaFunctionNode?.configuration.Handler ?? '',
+                  this.data.Runtime
+              )
+            : undefined
+        if (!handlerFile || !(await fs.exists(handlerFile))) {
+            this.handlerFileAvailable = false
+            return false
+        }
+        this.handlerFileAvailable = true
+        if (watchForUpdates && !isHotReloadingFunction(this.data.LambdaFunctionNode?.configuration.CodeSha256)) {
+            this.setupFileWatcher()
+        }
+        await openLambdaFile(handlerFile.fsPath)
+        this.handlerFile = handlerFile.fsPath
+        return true
+    }
+
+    public async loadFile(fileLocations: string) {
+        return await this.readFile(fileLocations)
+    }
+
+    private async readFile(filePath: string) {
+        if (!filePath) {
+            return undefined
+        }
+        const fileLocation = vscode.Uri.file(filePath)
+        try {
+            const fileContent = readFileSync(fileLocation.fsPath, { encoding: 'utf8' })
+
+            return {
+                sample: fileContent,
+                selectedFilePath: fileLocation.fsPath,
+                selectedFile: this.getFileName(fileLocation.fsPath),
+            }
+        } catch (e) {
+            getLogger().error('readFileSync: Failed to read file at path %s %O', fileLocation.fsPath, e)
+            throw ToolkitError.chain(
+                e,
+                localize('AWS.lambda.remoteInvoke.failedToReadFile', 'Failed to read selected file')
+            )
+        }
+    }
+
+    private getFileName(filePath: string): string {
+        return basename(filePath)
+    }
+
+    public async listRemoteTestEvents(functionArn: string, region: string): Promise<string[]> {
+        try {
+            const params: SamCliRemoteTestEventsParameters = {
+                functionArn: functionArn,
+                operation: TestEventsOperation.List,
+                region: region,
+            }
+            const result = await this.remoteTestEvents(params)
+            return result.split('\n').filter((event) => event.trim() !== '')
+        } catch (error) {
+            // Suppress "lambda-testevent-schemas registry not found" error - this is normal when no test events exist
+            const errorMessage = error instanceof Error ? error.message : String(error)
+            if (
+                errorMessage.includes('lambda-testevent-schemas registry not found') ||
+                errorMessage.includes('There are no saved events')
+            ) {
+                getLogger().debug('No remote test events found for function: %s', functionArn)
+                return []
+            }
+            // Re-throw other errors
+            throw error
+        }
+    }
+
+    public async selectRemoteTestEvent(functionArn: string, region: string): Promise<string | undefined> {
+        let events: string[] = []
+
+        try {
+            events = await this.listRemoteTestEvents(functionArn, region)
+        } catch (error) {
+            getLogger().error('Failed to list remote test events: %O', error)
+            void showMessage(
+                'error',
+                localize('AWS.lambda.remoteInvoke.failedToListEvents', 'Failed to list remote test events')
+            )
+            return undefined
+        }
+
+        if (events.length === 0) {
+            void showMessage(
+                'info',
+                localize(
+                    'AWS.lambda.remoteInvoke.noRemoteEvents',
+                    'No remote test events found. You can create one using "Save as remote event".'
+                )
+            )
+            return undefined
+        }
+
+        const selected = await vscode.window.showQuickPick(events, {
+            placeHolder: localize('AWS.lambda.remoteInvoke.selectRemoteEvent', 'Select a remote test event'),
+            title: localize('AWS.lambda.remoteInvoke.loadRemoteEvent', 'Load Remote Test Event'),
+        })
+
+        if (selected) {
+            const eventData = {
+                name: selected,
+                region: region,
+                arn: functionArn,
+            }
+            const resp = await this.getRemoteTestEvents(eventData)
+            return resp
+        }
+
+        return undefined
+    }
+
+    public async saveRemoteTestEvent(
+        functionArn: string,
+        region: string,
+        eventContent: string
+    ): Promise<string | undefined> {
+        let events: string[] = []
+
+        try {
+            events = await this.listRemoteTestEvents(functionArn, region)
+        } catch (error) {
+            // Log error but continue - user can still create new events
+            getLogger().debug('Failed to list existing remote test events (may not exist yet): %O', error)
+        }
+
+        // Create options for quickpick
+        const createNewOption = '$(add) Create new test event'
+        const options = events.length > 0 ? [createNewOption, ...events] : [createNewOption]
+
+        const selected = await vscode.window.showQuickPick(options, {
+            placeHolder: localize(
+                'AWS.lambda.remoteInvoke.saveEventChoice',
+                'Create new or overwrite existing test event'
+            ),
+            title: localize('AWS.lambda.remoteInvoke.saveRemoteEvent', 'Save as Remote Event'),
+        })
+
+        if (!selected) {
+            return undefined
+        }
+
+        let eventName: string | undefined
+
+        if (selected === createNewOption) {
+            // Prompt for new event name
+            eventName = await vscode.window.showInputBox({
+                prompt: localize('AWS.lambda.remoteInvoke.enterEventName', 'Enter a name for the test event'),
+                placeHolder: localize('AWS.lambda.remoteInvoke.eventNamePlaceholder', 'MyTestEvent'),
+                validateInput: (value) => {
+                    if (!value || value.trim() === '') {
+                        return localize('AWS.lambda.remoteInvoke.eventNameRequired', 'Event name is required')
+                    }
+                    if (events.includes(value)) {
+                        return localize(
+                            'AWS.lambda.remoteInvoke.eventNameExists',
+                            'An event with this name already exists'
+                        )
+                    }
+                    return undefined
+                },
+            })
+        } else {
+            // Use selected existing event name
+            const confirm = await showConfirmationMessage({
+                prompt: localize(
+                    'AWS.lambda.remoteInvoke.overwriteEvent',
+                    'Overwrite existing test event "{0}"?',
+                    selected
+                ),
+                confirm: localize('AWS.lambda.remoteInvoke.overwrite', 'Overwrite'),
+                cancel: 'Cancel',
+                type: 'warning',
+            })
+
+            if (confirm) {
+                eventName = selected
+            }
+        }
+
+        if (eventName) {
+            // Use force flag when overwriting existing events
+            const isOverwriting = selected !== createNewOption
+            const params: SamCliRemoteTestEventsParameters = {
+                functionArn: functionArn,
+                operation: TestEventsOperation.Put,
+                name: eventName,
+                eventSample: eventContent,
+                region: region,
+                force: isOverwriting,
+            }
+            await this.remoteTestEvents(params)
+            return eventName
+        }
+
+        return undefined
+    }
+
+    public async createRemoteTestEvents(putEvent: Event, force: boolean = false) {
+        const params: SamCliRemoteTestEventsParameters = {
+            functionArn: putEvent.arn,
+            operation: TestEventsOperation.Put,
+            name: putEvent.name,
+            eventSample: putEvent.event,
+            region: putEvent.region,
+            force: force,
+        }
+        return await this.remoteTestEvents(params)
+    }
+    public async getRemoteTestEvents(getEvents: Event) {
+        const params: SamCliRemoteTestEventsParameters = {
+            name: getEvents.name,
+            operation: TestEventsOperation.Get,
+            functionArn: getEvents.arn,
+            region: getEvents.region,
+        }
+        return await this.remoteTestEvents(params)
+    }
+
+    private async remoteTestEvents(params: SamCliRemoteTestEventsParameters) {
+        return await runSamCliRemoteTestEvents(params, getSamCliContext().invoker)
+    }
+
+    public async getSamplePayload(): Promise<string | undefined> {
+        try {
+            const inputs: SampleQuickPickItem[] = (await getSampleLambdaPayloads()).map((entry) => {
+                return { label: entry.name ?? '', filename: entry.filename ?? '' }
+            })
+
+            const qp = picker.createQuickPick({
+                items: inputs,
+                options: {
+                    title: localize(
+                        'AWS.lambda.form.pickSampleInput',
+                        'Enter keywords to filter the list of sample events'
+                    ),
+                },
+            })
+
+            const choices = await picker.promptUser({
+                picker: qp,
+            })
+            const pickerResponse = picker.verifySinglePickerOutput<SampleQuickPickItem>(choices)
+
+            if (!pickerResponse) {
+                return
+            }
+            const sampleUrl = `${sampleRequestPath}${pickerResponse.filename}`
+            const resp = await new HttpResourceFetcher(sampleUrl, { showUrl: true }).get()
+            const sample = (await resp?.text()) ?? ''
+
+            return sample
+        } catch (err) {
+            getLogger().error('Error getting manifest data..: %O', err as Error)
+            throw ToolkitError.chain(
+                err,
+                localize('AWS.lambda.remoteInvoke.gettingManifestData', 'getting manifest data')
+            )
+        }
+    }
+
+    // Download lambda code and update the local root path
+    public async downloadRemoteCode(): Promise<string | undefined> {
+        return await telemetry.lambda_import.run(async (span) => {
+            span.record({ runtime: this.data.Runtime as TelemetryRuntime | undefined, source: 'RemoteDebug' })
+            try {
+                if (this.data.LambdaFunctionNode) {
+                    const output = await runDownloadLambda(this.data.LambdaFunctionNode, true)
+                    if (output instanceof vscode.Uri) {
+                        this.data.LocalRootPath = output.fsPath
+                        this.handlerFileAvailable = true
+                        this.setupFileWatcher()
+
+                        return output.fsPath
+                    }
+                } else {
+                    getLogger().error(
+                        localize(
+                            'AWS.lambda.remoteInvoke.lambdaFunctionNodeUndefined',
+                            'LambdaFunctionNode is undefined'
+                        )
+                    )
+                }
+                return undefined
+            } catch (error) {
+                throw ToolkitError.chain(
+                    error,
+                    localize('AWS.lambda.remoteInvoke.failedToDownloadCode', 'Failed to download remote code')
+                )
+            }
+        })
+    }
+
+    // this serves as a lock for invoke
+    public checkReadyToInvoke(): boolean {
+        if (this.isInvoking) {
+            void showMessage(
+                'warn',
+                localize(
+                    'AWS.lambda.remoteInvoke.invokeInProgress',
+                    'A remote invoke is already in progress, please wait for previous invoke, or remove debug setup'
+                )
+            )
+            return false
+        }
+        if (this.isStartingDebug) {
+            void showMessage(
+                'warn',
+                localize(
+                    'AWS.lambda.remoteInvoke.debugSetupInProgress',
+                    'A debugger setup is already in progress, please wait for previous setup to complete, or remove debug setup'
+                )
+            )
+            return false
+        }
+        return true
+    }
+
+    // this check is run when user click remote invoke with remote debugging checked
+    public async checkReadyToDebug(config: DebugConfig): Promise<boolean> {
+        if (!this.data.LambdaFunctionNode) {
+            return false
+        }
+
+        if (!this.handlerFileAvailable) {
+            const result = await showConfirmationMessage({
+                prompt: localize(
+                    'AWS.lambda.remoteInvoke.handlerFileNotLocated',
+                    'The handler file cannot be located in the specified Local Root Path. As a result, remote debugging will not pause at breakpoints.'
+                ),
+                confirm: 'Continue Anyway',
+                cancel: 'Cancel',
+                type: 'warning',
+            })
+            if (!result) {
+                return false
+            }
+        }
+        // check if snapstart is on and we are publishing a version
+        if (
+            config.shouldPublishVersion &&
+            this.data.LambdaFunctionNode.configuration.SnapStart?.ApplyOn === 'PublishedVersions'
+        ) {
+            const result = await showConfirmationMessage({
+                prompt: localize(
+                    'AWS.lambda.remoteInvoke.snapstartWarning',
+                    "This function has Snapstart enabled. If you use Remote Debug with the 'publish version' setting, you'll experience notable delays. For faster debugging, consider disabling the 'publish version' option."
+                ),
+                confirm: 'Continue Anyway',
+                cancel: 'Cancel',
+                type: 'warning',
+            })
+            if (!result) {
+                // didn't confirm
+                getLogger().warn(
+                    localize('AWS.lambda.remoteInvoke.userCanceledSnapstart', 'User canceled Snapstart confirm')
+                )
+                return false
+            }
+        }
+
+        // ready to debug
+        return true
+    }
+
+    public async startDebugging(config: DebugConfig): Promise<boolean> {
+        if (!this.data.LambdaFunctionNode) {
+            return false
+        }
+        if (!(await this.checkReadyToDebug(config))) {
+            return false
+        }
+        this.isStartingDebug = true
+        try {
+            await RemoteDebugController.instance.startDebugging(this.data.FunctionArn, this.data.Runtime ?? 'unknown', {
+                ...config,
+                handlerFile: this.handlerFile,
+                samFunctionLogicalId: this.data.LambdaFunctionNode.logicalId,
+                samProjectRoot: this.data.LambdaFunctionNode.projectRoot,
+            })
+        } catch (e) {
+            throw ToolkitError.chain(
+                e,
+                localize('AWS.lambda.remoteInvoke.failedToStartDebugging', 'Failed to start debugging')
+            )
+        } finally {
+            this.isStartingDebug = false
+        }
+
+        this.startDebugTimer()
+        this.debugging = this.isLDKDebugging()
+        return this.debugging
+    }
+
+    public async stopDebugging(): Promise<boolean> {
+        if (this.isLDKDebugging()) {
+            this.resetServerState()
+            await RemoteDebugController.instance.stopDebugging()
+        }
+        this.debugging = this.isLDKDebugging()
+        return this.debugging
+    }
+
+    public isLDKDebugging(): boolean {
+        return RemoteDebugController.instance.isDebugging
+    }
+
+    public isWebViewDebugging(): boolean {
+        return this.debugging
+    }
+
+    public getIsInvoking(): boolean {
+        return this.isInvoking
+    }
+
+    public getDebugTimeRemaining(): number {
+        return this.debugTimeRemaining
+    }
+
+    public getLocalPath(): string {
+        return this.data.LocalRootPath ?? ''
+    }
+
+    public getHandlerAvailable(): boolean {
+        return this.handlerFileAvailable
+    }
+
+    // prestatus check run at checkbox click
+    public async debugPreCheck(): Promise<boolean> {
+        return await telemetry.lambda_remoteDebugPrecheck.run(async (span) => {
+            span.record({
+                runtimeString: this.data.Runtime,
+                source: this.data.isLambdaRemote ? 'webview' : 'webviewLocalStack',
+            })
+            if (!this.debugging && RemoteDebugController.instance.isDebugging) {
+                // another debug session in progress
+                const result = await showConfirmationMessage({
+                    prompt: localize(
+                        'AWS.lambda.remoteInvoke.debugSessionActive',
+                        'A remote debug session is already active. Stop that for this new session?'
+                    ),
+                    confirm: 'Stop Previous Session',
+                    cancel: 'Cancel',
+                    type: 'warning',
+                })
+
+                if (result) {
+                    // Stop the previous session
+                    if (await this.stopDebugging()) {
+                        getLogger().error(
+                            localize(
+                                'AWS.lambda.remoteInvoke.failedToStopPreviousSession',
+                                'Failed to stop previous debug session.'
+                            )
+                        )
+                        return false
+                    }
+                } else {
+                    // user canceled, Do nothing
+                    return false
+                }
+            }
+
+            const result = await RemoteDebugController.instance.installDebugExtension(this.data.Runtime)
+            if (!result && result === false) {
+                // install failed
+                return false
+            }
+
+            await revertExistingConfig()
+
+            // Check if the function ARN is in the cache and try to open handler file
+            const cachedPath = getCachedLocalPath(this.data.FunctionArn)
+            // only check cache if not comming from appbuilder
+            if (cachedPath && !this.data.LambdaFunctionNode?.localDir) {
+                getLogger().debug(
+                    `lambda: found cached local path for function ARN: ${this.data.FunctionArn} -> ${cachedPath}`
+                )
+                await this.tryOpenHandlerFile(cachedPath, true)
+            }
+
+            // this is comming from appbuilder
+            if (this.data.LambdaFunctionNode?.localDir) {
+                await this.tryOpenHandlerFile(undefined, false)
+            }
+
+            return true
+        })
+    }
+}
+
+export async function invokeRemoteLambda(
+    context: ExtContext,
+    params: {
+        /* TODO: Instead of vague scope-leaking objects: awsContext & element, it would be cleaner if this took:
+         *  {
+         *      lambdaClient: LambdaClient,         // or just invoke/invokeAsync interface of AWS.Lambda (see: lambda.d.ts)
+         *      invokeParams: {functionArn: string} // or Lambda.Types.InvocationRequest (see: lambda.d.ts)
+         *  }
+         */
+        outputChannel: vscode.OutputChannel
+        functionNode: LambdaFunctionNode
+        source?: string
+    }
+) {
+    const inputs = await getSampleLambdaPayloads()
+    const resource: LambdaFunctionNode = params.functionNode
+    const source: string = params.source || 'AwsExplorerRemoteInvoke'
+    const client = getLambdaClientWithAgent(resource.regionCode)
+    const clientDebug = getLambdaClientWithAgent(resource.regionCode, getLambdaDebugUserAgent())
+
+    const Panel = VueWebview.compilePanel(RemoteInvokeWebview)
+
+    // Initialize support and debugging capabilities
+    const runtime = resource.configuration.Runtime
+    const region = resource.regionCode
+    const supportCodeDownload = RemoteDebugController.instance.supportCodeDownload(
+        runtime,
+        resource.configuration.CodeSha256
+    )
+    const runtimeSupportsRemoteDebug = RemoteDebugController.instance.supportRuntimeRemoteDebug(runtime)
+    const remoteDebugLayer = getRemoteDebugLayer(region, resource.configuration.Architectures)
+
+    const wv = new Panel(context.extensionContext, context.outputChannel, client, clientDebug, {
+        FunctionName: resource.configuration.FunctionName ?? '',
+        FunctionArn: resource.configuration.FunctionArn ?? '',
+        FunctionRegion: resource.regionCode,
+        InputSamples: inputs,
+        TestEvents: [],
+        Source: source,
+        Runtime: runtime,
+        LocalRootPath: params.functionNode.localDir,
+        LambdaFunctionNode: params.functionNode,
+        supportCodeDownload: supportCodeDownload,
+        runtimeSupportsRemoteDebug: runtimeSupportsRemoteDebug,
+        remoteDebugLayer: remoteDebugLayer,
+        isLambdaRemote: !isLocalStackConnection(),
+    })
+    // focus on first group so wv will show up in the side
+    await vscode.commands.executeCommand('workbench.action.focusFirstEditorGroup')
+
+    const activePanel = await wv.show({
+        title: localize('AWS.invokeLambda.title', 'Invoke Lambda {0}', resource.configuration.FunctionName),
+        viewColumn: vscode.ViewColumn.Beside,
+    })
+
+    activePanel.onDidDispose(async () => {
+        await wv.server.disposeServer()
+    })
+}
diff --git a/packages/core/src/lambda/vue/remoteInvoke/remoteInvoke.css b/packages/core/src/lambda/vue/remoteInvoke/remoteInvoke.css
new file mode 100644
index 00000000000..c96291b26ae
--- /dev/null
+++ b/packages/core/src/lambda/vue/remoteInvoke/remoteInvoke.css
@@ -0,0 +1,238 @@
+/* Container and Layout */
+.Icontainer {
+    margin-inline: auto;
+    margin-top: 2rem;
+    width: 100%;
+    min-width: 650px;
+}
+
+h1 {
+    text-align: left;
+    margin-bottom: 20px;
+}
+
+/* Remove fixed width for divs to allow responsive behavior */
+div {
+    width: 100%;
+}
+
+/* VSCode Settings Style Layout */
+.vscode-setting-item {
+    margin-bottom: 10px;
+    padding: 5px 0;
+}
+
+.setting-header {
+    display: flex;
+    align-items: center;
+    margin-bottom: 8px;
+}
+
+.setting-title {
+    font-weight: 600;
+    font-size: 14px;
+    margin: 0;
+}
+
+.setting-body {
+    display: flex;
+    align-items: flex-start;
+    gap: 8px;
+}
+
+.setting-description {
+    flex: 1;
+}
+
+.setting-description info-wrap,
+.setting-description info {
+    display: block;
+    margin-bottom: 4px;
+}
+
+.setting-description-full {
+    margin-bottom: 8px;
+}
+
+.setting-description-full info-wrap {
+    display: block;
+    margin-bottom: 4px;
+}
+
+.setting-input-group-full {
+    display: flex;
+    align-items: center;
+    gap: 5px;
+}
+
+.setting-input {
+    flex-grow: 1;
+    margin-right: 2px;
+}
+
+/* Form Layout Classes - Base grid layout shared by multiple classes */
+.form-row,
+.form-row-no-align {
+    display: grid;
+    grid-template-columns: 150px 1fr;
+    margin-bottom: 10px;
+}
+
+.form-row {
+    align-items: center;
+}
+
+.form-double-row {
+    display: grid;
+    grid-template-rows: 20px 1fr;
+    align-items: center;
+}
+
+/* Typography and Text Elements */
+label {
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 10px;
+}
+
+/* Merge info and info-wrap as they share most properties */
+info,
+info-wrap {
+    color: var(--vscode-descriptionForeground);
+    font-weight: 500;
+    font-size: 13px;
+    margin-right: 10px;
+}
+
+info {
+    text-wrap-mode: nowrap;
+}
+
+/* Form Elements */
+span,
+select {
+    display: block;
+}
+
+textarea {
+    color: var(--vscode-settings-textInputForeground);
+    background: var(--vscode-settings-textInputBackground);
+    border: 1px solid var(--vscode-settings-textInputBorder);
+    width: 100%;
+    box-sizing: border-box;
+    resize: none;
+}
+
+/* Button Styles */
+.button-theme-primary,
+.button-theme-inline {
+    border: 1px solid var(--vscode-button-border);
+}
+
+.button-theme-primary {
+    padding: 8px 12px;
+    color: var(--vscode-button-foreground);
+    background: var(--vscode-button-background);
+}
+
+.button-theme-primary:hover:not(:disabled) {
+    background: var(--vscode-button-hoverBackground);
+    cursor: pointer;
+}
+
+.button-theme-inline {
+    padding: 4px 6px;
+    color: var(--vscode-button-secondaryForeground);
+    background: var(--vscode-button-secondaryBackground);
+}
+
+.button-theme-inline:hover:not(:disabled) {
+    background: var(--vscode-button-secondaryHoverBackground);
+    cursor: pointer;
+}
+
+button:disabled {
+    opacity: 0.5;
+    cursor: not-allowed;
+}
+
+/* Payload Section Styles */
+.payload-button-group {
+    display: flex;
+    gap: 5px;
+    margin-bottom: 10px;
+}
+
+.payload-textarea {
+    width: 100%;
+    min-height: 200px;
+    font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
+    font-size: 13px;
+    line-height: 1.5;
+}
+
+/* Collapsible Section */
+.collapsible-section {
+    margin: 15px 0;
+    border: 1px solid var(--vscode-widget-border);
+    border-radius: 4px;
+}
+
+.collapsible-header,
+.collapsible-content {
+    max-width: 96%;
+}
+
+.collapsible-header {
+    padding: 8px 12px;
+    background-color: var(--vscode-sideBarSectionHeader-background);
+    cursor: pointer;
+    font-weight: 500;
+}
+
+.collapsible-content {
+    padding: 10px;
+    border-top: 1px solid var(--vscode-widget-border);
+}
+
+/* Validation and Error Styles */
+.input-error {
+    border: 1px solid var(--vscode-inputValidation-errorBorder) !important;
+    background-color: var(--vscode-inputValidation-errorBackground) !important;
+}
+
+.error-message {
+    color: var(--vscode-inputValidation-errorForeground);
+    font-size: 12px;
+    margin-top: 4px;
+    font-weight: 400;
+    line-height: 1.2;
+}
+
+/* Checkbox and Status Styles */
+.remote-debug-checkbox {
+    width: 18px !important;
+    height: 18px !important;
+    accent-color: var(--vscode-checkbox-foreground);
+    border: 2px solid var(--vscode-checkbox-border) !important;
+    border-radius: 3px !important;
+    background-color: var(--vscode-checkbox-background) !important;
+    cursor: pointer;
+}
+
+.remote-debug-checkbox:checked {
+    background-color: var(--vscode-checkbox-selectBackground) !important;
+    border-color: var(--vscode-checkbox-selectBorder) !important;
+}
+
+.remote-debug-checkbox:disabled {
+    opacity: 0.6;
+    cursor: not-allowed;
+    border-color: var(--vscode-checkbox-border) !important;
+    background-color: var(--vscode-input-background) !important;
+}
+
+.remote-debug-checkbox:focus {
+    outline: 2px solid var(--vscode-focusBorder);
+    outline-offset: 2px;
+}
diff --git a/packages/core/src/lambda/vue/remoteInvoke/remoteInvoke.vue b/packages/core/src/lambda/vue/remoteInvoke/remoteInvoke.vue
new file mode 100644
index 00000000000..62a3de7ce09
--- /dev/null
+++ b/packages/core/src/lambda/vue/remoteInvoke/remoteInvoke.vue
@@ -0,0 +1,338 @@
+/*! * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */
+
+<script src="./remoteInvokeFrontend" lang="ts"></script>
+<style scoped src="./remoteInvoke.css"></style>
+
+<template>
+    <div class="Icontainer">
+        <div><h1>Remote invoke configuration</h1></div>
+        <div class="form-row" style="justify-content: flex-start; height: 28px; align-items: center">
+            <div>
+                <button class="button-theme-primary" v-on:click="sendInput">Remote Invoke</button>
+            </div>
+            <div>
+                <info>Function Name: {{ initialData.FunctionName }}</info>
+            </div>
+        </div>
+
+        <div class="form-row" style="justify-content: flex-start; height: 28px">
+            <label>Resource ARN</label>
+            <info-wrap>{{ initialData.FunctionArn }}</info-wrap>
+        </div>
+        <div class="form-row">
+            <label>Region</label>
+            <info-wrap
+                >{{ initialData.FunctionRegion }}
+                <b v-if="uiState.extraRegionInfo">{{ uiState.extraRegionInfo }}</b></info-wrap
+            >
+        </div>
+        <div class="form-row">
+            <label>Runtime</label>
+            <info>{{ initialData.Runtime }}</info>
+        </div>
+
+        <!-- Remote Debugging Configuration -->
+        <div>
+            <div class="vscode-setting-item">
+                <div class="setting-header">
+                    <label class="setting-title">Remote debugging</label>
+                    <button
+                        v-if="debugState.isDebugging"
+                        class="button-theme-inline"
+                        v-on:click="removeDebugSetup"
+                        style="margin-left: 10px"
+                    >
+                        Remove Debug Setup
+                    </button>
+                    <info v-if="debugState.isDebugging && debugState.showDebugTimer" style="margin-left: 10px"
+                        >Auto remove after 60 second of inactive time</info
+                    >
+                </div>
+                <div class="setting-body">
+                    <input
+                        type="checkbox"
+                        id="attachDebugger"
+                        v-model="debugState.remoteDebuggingEnabled"
+                        @change="debugPreCheck"
+                        :disabled="!initialData.runtimeSupportsRemoteDebug || !initialData.remoteDebugLayer"
+                        class="remote-debug-checkbox"
+                    />
+                    <div class="setting-description">
+                        <info-wrap v-if="initialData.runtimeSupportsRemoteDebug && initialData.remoteDebugLayer">
+                            Remote debugging is not recommended for production environments. The AWS Toolkit modifies
+                            your function by deploying it with an additional layer to enable remote debugging. Your
+                            local code breakpoints are then used to step through the remote function invocation.
+                            <a
+                                href="https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/lambda-remote-debug.html"
+                                >Learn more</a
+                            >
+                        </info-wrap>
+                        <info
+                            v-if="!initialData.runtimeSupportsRemoteDebug && !initialData.remoteDebugLayer"
+                            style="color: var(--vscode-errorForeground)"
+                        >
+                            Runtime {{ initialData.Runtime }} and region {{ initialData.FunctionRegion }} don't support
+                            remote debugging yet
+                        </info>
+                        <info
+                            v-else-if="!initialData.runtimeSupportsRemoteDebug"
+                            style="color: var(--vscode-errorForeground)"
+                        >
+                            Runtime {{ initialData.Runtime }} doesn't support remote debugging
+                        </info>
+                        <info v-else-if="!initialData.remoteDebugLayer" style="color: var(--vscode-errorForeground)">
+                            Region {{ initialData.FunctionRegion }} doesn't support remote debugging yet
+                        </info>
+                    </div>
+                </div>
+            </div>
+
+            <div class="vscode-setting-item" v-if="debugState.remoteDebuggingEnabled">
+                <div class="setting-header">
+                    <label class="setting-title">Local root path</label>
+                </div>
+                <div class="setting-description-full">
+                    <info-wrap v-if="debugState.handlerFileAvailable">
+                        Your handler file has been located. You can now <b>open handler</b> to set breakpoints in this
+                        file for debugging.
+                    </info-wrap>
+                    <info-wrap v-else-if="initialData.supportCodeDownload">
+                        <b>Browse</b> to specify the absolute path to your local directory that contains the handler
+                        file for debugging. Or <b>Download</b> the handler file from your deployed function.
+                    </info-wrap>
+                    <info-wrap v-else>
+                        <b>Browse</b> to specify the absolute path to your local directory that contains the handler
+                        file for debugging.
+                    </info-wrap>
+                </div>
+                <div class="setting-input-group-full">
+                    <input
+                        type="text"
+                        v-model="debugConfig.localRootPath"
+                        placeholder="Enter local root path"
+                        title="The path to your local project root directory containing the source code"
+                        @input="openHandlerWithDelay"
+                        class="setting-input"
+                    />
+                    <button
+                        @click="openHandler"
+                        class="button-theme-inline"
+                        :disabled="!debugState.handlerFileAvailable"
+                        :title="
+                            !debugState.handlerFileAvailable
+                                ? 'Handler file not found. Please specify the correct local root path first.'
+                                : 'Open handler file'
+                        "
+                    >
+                        Open Handler
+                    </button>
+                    <button @click="promptForFolderLocation" class="button-theme-inline">Browse</button>
+                    <button
+                        v-if="initialData.supportCodeDownload"
+                        @click="downloadRemoteCode"
+                        class="button-theme-inline"
+                    >
+                        Download
+                    </button>
+                </div>
+            </div>
+
+            <!-- Collapsible Remote Debug Additional Configuration -->
+            <div class="collapsible-section" v-if="debugState.remoteDebuggingEnabled">
+                <div class="collapsible-header" @click="toggleCollapsible">
+                    <span>{{ uiState.isCollapsed ? '▶' : '▼' }} Remote debug additional configuration</span>
+                </div>
+                <div class="collapsible-content" v-if="!uiState.isCollapsed">
+                    <div class="form-row-no-align">
+                        <label>Remote root path</label>
+                        <div class="form-double-row">
+                            <info style="margin-bottom: 3px"
+                                >Specify path to code directory on remote Lambda function.</info
+                            >
+
+                            <input
+                                type="text"
+                                v-model="debugConfig.remoteRootPath"
+                                placeholder="Default to /var/task, the directory of your deployed lambda code"
+                                title="The path to the code on the remote Lambda function"
+                            />
+                        </div>
+                    </div>
+
+                    <div class="form-row-no-align">
+                        <label>Debug port</label>
+                        <div class="form-double-row">
+                            <info style="margin-bottom: 3px"
+                                >Specify the network port used for the debugger connection.</info
+                            >
+                            <input
+                                type="number"
+                                v-model="debugConfig.debugPort"
+                                @input="onDebugPortChange"
+                                :placeholder="
+                                    initialData.isLambdaRemote
+                                        ? 'Default to 9229, the debug port that will be used for remote debugging'
+                                        : 'Default to a random debug port'
+                                "
+                                :title="
+                                    initialData.isLambdaRemote
+                                        ? 'The network port used for the debugger connection (default to 9229)'
+                                        : 'The network port used for the debugger connection (default to a random port)'
+                                "
+                                :class="{ 'input-error': debugPortError !== '' }"
+                            />
+                            <div v-if="debugPortError" class="error-message">{{ debugPortError }}</div>
+                        </div>
+                    </div>
+
+                    <div v-if="initialData.isLambdaRemote" class="form-row">
+                        <label for="shouldPublishVersionCheckbox">Publish version</label>
+                        <div style="align-items: center">
+                            <input
+                                type="checkbox"
+                                style="margin-right: 5px; vertical-align: middle"
+                                id="shouldPublishVersionCheckbox"
+                                v-model="debugConfig.shouldPublishVersion"
+                            />
+                            <info>Debug with version. If unchecked, Debug $Latest</info>
+                        </div>
+                    </div>
+
+                    <div class="form-row">
+                        <label>Other debug params</label>
+                        <div class="form-double-row">
+                            <input
+                                type="text"
+                                v-model="debugConfig.otherDebugParams"
+                                placeholder='{"smartStep":true,"resolveSourceMapLocations":["out/**/*.js"]}'
+                                title="Additional debug parameters specific to the runtime"
+                                :class="{ 'input-error': otherDebugParamsError !== '' }"
+                            />
+                            <div v-if="otherDebugParamsError" class="error-message">{{ otherDebugParamsError }}</div>
+                        </div>
+                    </div>
+
+                    <div v-if="initialData.isLambdaRemote" class="form-row">
+                        <label>Timeout override</label>
+                        <div class="form-double-row">
+                            <input
+                                type="number"
+                                v-model="debugConfig.lambdaTimeout"
+                                placeholder="Default to 900 (seconds), the time you can debug before lambda timeout, "
+                                title="Specify timeout you want for remote debugging"
+                                :class="{ 'input-error': lambdaTimeoutError !== '' }"
+                            />
+                            <div v-if="lambdaTimeoutError" class="error-message">{{ lambdaTimeoutError }}</div>
+                        </div>
+                    </div>
+
+                    <div v-if="initialData.isLambdaRemote" class="form-row">
+                        <label>Layer override</label>
+                        <div class="form-double-row">
+                            <input
+                                type="text"
+                                v-model="initialData.remoteDebugLayer"
+                                placeholder="Specify debug layer you want for remote debugging"
+                                title="Specify debug layer you want for remote debugging"
+                                :class="{ 'input-error': lambdaLayerError !== '' }"
+                            />
+                            <div v-if="lambdaLayerError" class="error-message">{{ lambdaLayerError }}</div>
+                        </div>
+                    </div>
+
+                    <!-- Node.js/JavaScript specific fields -->
+                    <div v-if="hasRuntimePrefix('nodejs')" class="form-row">
+                        <label for="sourceMapCheckbox">Source map</label>
+                        <div style="align-items: center">
+                            <input
+                                type="checkbox"
+                                style="margin-right: 5px; vertical-align: middle"
+                                id="sourceMapCheckbox"
+                                v-model="runtimeSettings.sourceMapEnabled"
+                            />
+                            <info>Enable source map support</info>
+                        </div>
+                    </div>
+
+                    <div v-if="hasRuntimePrefix('nodejs')" class="form-row">
+                        <label>Skip files</label>
+                        <input
+                            type="text"
+                            v-model="runtimeSettings.skipFiles"
+                            placeholder="Default to /var/runtime/node_modules/**/*.js,<node_internals>/**/*.js"
+                            title="The files to skip debugging"
+                        />
+                    </div>
+
+                    <div v-if="hasRuntimePrefix('nodejs')" class="form-row">
+                        <label>Out files</label>
+                        <input
+                            type="text"
+                            v-model="runtimeSettings.outFiles"
+                            placeholder="./dist/*,./build/*,./.aws-sam/build/<functionName>/*"
+                            title="outFiles to parse sourceMap"
+                        />
+                    </div>
+
+                    <!-- Python specific fields -->
+                    <div v-if="hasRuntimePrefix('python')" class="form-row">
+                        <label for="justMyCodeCheckbox">Just my code</label>
+                        <div style="align-items: center">
+                            <input
+                                type="checkbox"
+                                style="margin-right: 5px; vertical-align: middle"
+                                id="justMyCodeCheckbox"
+                                v-model="runtimeSettings.justMyCode"
+                            />
+                            <info>restricts debugging to user-written code only(ignore system lib)</info>
+                        </div>
+                    </div>
+
+                    <!-- Java specific fields -->
+                    <div v-if="hasRuntimePrefix('java')" class="form-row">
+                        <label>Project name</label>
+                        <input
+                            type="text"
+                            v-model="runtimeSettings.projectName"
+                            placeholder="YourJavaProjectName"
+                            title="The name of the Java project for debugging"
+                        />
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <!-- Payload Section -->
+        <div class="vscode-setting-item">
+            <div class="setting-header">
+                <label class="setting-title">Payload</label>
+            </div>
+            <div class="setting-description-full">
+                <info-wrap>
+                    Enter the JSON payload for your Lambda function invocation. You can <b>Load sample event</b> from
+                    AWS event templates, <b>Load local file</b> from your computer
+                </info-wrap>
+                <info-wrap v-if="initialData.isLambdaRemote"
+                    ><b>Load remote event</b> from your saved test events. You can <b>Save as remote event</b> to save
+                    the event below for future use</info-wrap
+                >
+            </div>
+            <div class="payload-button-group">
+                <button @click="loadSampleEvent" class="button-theme-inline">Load sample event</button>
+                <button @click="promptForFileLocation" class="button-theme-inline">Load local file</button>
+                <button v-if="initialData.isLambdaRemote" @click="loadRemoteTestEvents" class="button-theme-inline">
+                    Load remote event
+                </button>
+                <button v-if="initialData.isLambdaRemote" @click="saveEvent" class="button-theme-inline">
+                    Save as remote event
+                </button>
+            </div>
+            <textarea
+                class="payload-textarea"
+                :rows="textareaRows"
+                v-model="payloadData.sampleText"
+                placeholder='{"key": "value"}'
+            ></textarea>
+        </div>
+    </div>
+</template>
diff --git a/packages/core/src/lambda/vue/remoteInvoke/remoteInvokeFrontend.ts b/packages/core/src/lambda/vue/remoteInvoke/remoteInvokeFrontend.ts
new file mode 100644
index 00000000000..a99b6ac075e
--- /dev/null
+++ b/packages/core/src/lambda/vue/remoteInvoke/remoteInvokeFrontend.ts
@@ -0,0 +1,397 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Disable because it is a front-end file.
+/* eslint-disable aws-toolkits/no-console-log */
+
+import { defineComponent } from 'vue'
+import { WebviewClientFactory } from '../../../webviews/client'
+import saveData from '../../../webviews/mixins/saveData'
+import type { RemoteInvokeData, RemoteInvokeWebview } from './invokeLambda'
+
+const client = WebviewClientFactory.create<RemoteInvokeWebview>()
+const defaultInitialData = {
+    FunctionName: '',
+    FunctionArn: '',
+    FunctionRegion: '',
+    InputSamples: [],
+    FunctionMap: [],
+    TestEvents: [],
+    FunctionStack: '',
+    Source: '',
+    LambdaFunctionNode: undefined,
+    supportCodeDownload: true,
+    runtimeSupportsRemoteDebug: true,
+    remoteDebugLayer: '',
+    isLambdaRemote: true,
+}
+
+export default defineComponent({
+    data(): RemoteInvokeData {
+        return {
+            initialData: { ...defaultInitialData },
+            debugConfig: {
+                debugPort: undefined,
+                localRootPath: '',
+                remoteRootPath: '/var/task',
+                shouldPublishVersion: true,
+                lambdaTimeout: 900,
+                otherDebugParams: '',
+            },
+            debugState: {
+                isDebugging: false,
+                debugTimer: undefined,
+                debugTimeRemaining: 60,
+                showDebugTimer: false,
+                handlerFileAvailable: false,
+                remoteDebuggingEnabled: false,
+            },
+            runtimeSettings: {
+                sourceMapEnabled: true,
+                skipFiles: '/var/runtime/node_modules/**/*.js,<node_internals>/**',
+                justMyCode: true,
+                projectName: '',
+                outFiles: undefined,
+            },
+            uiState: {
+                isCollapsed: true,
+                extraRegionInfo: '',
+            },
+            payloadData: {
+                sampleText: '{}',
+            },
+        }
+    },
+
+    async created() {
+        // Initialize data from backend
+        this.initialData = (await client.init()) ?? this.initialData
+        this.debugConfig.localRootPath = this.initialData.LocalRootPath ?? ''
+
+        // Register for state change events from the backend
+        void client.onStateChange(async () => {
+            await this.syncStateFromWorkspace()
+        })
+
+        // Check for existing session state and load it
+        await this.syncStateFromWorkspace()
+    },
+
+    computed: {
+        // Auto-adjust textarea rows based on content
+        textareaRows(): number {
+            if (!this.payloadData.sampleText) {
+                return 5 // Default minimum rows
+            }
+
+            // Count line breaks to determine basic row count
+            const lineCount = this.payloadData.sampleText.split('\n').length
+            let additionalLine = 0
+            for (const line of this.payloadData.sampleText.split('\n')) {
+                if (line.length > 60) {
+                    additionalLine += Math.floor(line.length / 60)
+                }
+            }
+
+            // Use the larger of line count or estimated lines, with min 5 and max 20
+            const calculatedRows = lineCount + additionalLine
+            return Math.max(5, Math.min(50, calculatedRows))
+        },
+
+        // Validation computed properties
+        debugPortError(): string {
+            if (this.debugConfig.debugPort !== null && this.debugConfig.debugPort !== undefined) {
+                const port = Number(this.debugConfig.debugPort)
+                if (isNaN(port) || port < 1 || port > 65535) {
+                    return 'Debug port must be between 1 and 65535'
+                }
+            }
+            return ''
+        },
+
+        otherDebugParamsError(): string {
+            if (this.debugConfig.otherDebugParams && this.debugConfig.otherDebugParams.trim() !== '') {
+                try {
+                    JSON.parse(this.debugConfig.otherDebugParams)
+                } catch (error) {
+                    return 'Other Debug Params must be a valid JSON object'
+                }
+            }
+            return ''
+        },
+
+        lambdaTimeoutError(): string {
+            if (this.debugConfig.lambdaTimeout !== undefined) {
+                const timeout = Number(this.debugConfig.lambdaTimeout)
+                if (isNaN(timeout) || timeout < 1 || timeout > 900) {
+                    return 'Timeout override must be between 1 and 900 seconds'
+                }
+            }
+            return ''
+        },
+
+        // user can override the default provided layer and bring their own layer
+        // this is useful to support function with code signing config
+        lambdaLayerError(): string {
+            if (this.initialData.remoteDebugLayer && this.initialData.remoteDebugLayer.trim() !== '') {
+                const layerArn = this.initialData.remoteDebugLayer.trim()
+
+                // Validate Lambda layer ARN format
+                // Expected format: arn:aws:lambda:region:account-id:layer:layer-name:version
+                const layerArnRegex = /^arn:aws:lambda:[a-z0-9-]+:\d{12}:layer:[a-zA-Z0-9-_]+:\d+$/
+
+                if (!layerArnRegex.test(layerArn)) {
+                    return 'Layer ARN must be in the format: arn:aws:lambda:<region>:<account-id>:layer:<layer-name>:<version>'
+                }
+
+                // Extract region from ARN to validate it matches the function region
+                const arnParts = layerArn.split(':')
+                if (arnParts.length >= 4) {
+                    const layerRegion = arnParts[3]
+                    if (this.initialData.FunctionRegion && layerRegion !== this.initialData.FunctionRegion) {
+                        return `Layer region (${layerRegion}) must match function region (${this.initialData.FunctionRegion})`
+                    }
+                }
+            }
+            return ''
+        },
+    },
+
+    methods: {
+        // Runtime detection computed properties based on the runtime string
+        hasRuntimePrefix(prefix: string): boolean {
+            const runtime = this.initialData.Runtime || ''
+            return runtime.startsWith(prefix)
+        },
+        // Sync state from workspace storage
+        async syncStateFromWorkspace() {
+            try {
+                // Detect Lambda remote debugging connection
+                this.uiState.extraRegionInfo = this.initialData.isLambdaRemote ? '' : '(LocalStack running)'
+
+                // Update debugging state
+                this.debugState.isDebugging = await client.isWebViewDebugging()
+                this.debugConfig.localRootPath = await client.getLocalPath()
+                this.debugState.handlerFileAvailable = await client.getHandlerAvailable()
+                // Get current session state
+
+                if (this.debugState.isDebugging) {
+                    // Update invoke button state based on session
+                    const isInvoking = await client.getIsInvoking()
+
+                    // If debugging is active and we're not showing the timer,
+                    // calculate and show remaining time
+                    this.clearDebugTimer()
+                    if (this.debugState.isDebugging && !isInvoking) {
+                        await this.startDebugTimer()
+                    }
+                } else {
+                    this.clearDebugTimer()
+                    // no debug session
+                }
+            } catch (error) {
+                console.error('Failed to sync state from workspace:', error)
+            }
+        },
+        async saveEvent() {
+            if (this.initialData.FunctionArn && this.initialData.FunctionRegion) {
+                // Use the backend method that shows a quickpick for save
+                await client.saveRemoteTestEvent(
+                    this.initialData.FunctionArn,
+                    this.initialData.FunctionRegion,
+                    this.payloadData.sampleText
+                )
+            }
+        },
+        async promptForFileLocation() {
+            const resp = await client.promptFile()
+            if (resp) {
+                // Populate the textarea with file content
+                this.payloadData.sampleText = resp.sample
+            }
+        },
+        async promptForFolderLocation() {
+            const resp = await client.promptFolder()
+            if (resp) {
+                this.debugConfig.localRootPath = resp
+                this.debugState.handlerFileAvailable = await client.getHandlerAvailable()
+            }
+        },
+        async debugPreCheck() {
+            if (!this.debugState.remoteDebuggingEnabled) {
+                // don't check if unchecking
+                this.debugState.remoteDebuggingEnabled = false
+                if (this.debugState.isDebugging) {
+                    await client.stopDebugging()
+                }
+            } else {
+                // check when user is checking box
+                this.debugState.remoteDebuggingEnabled = await client.debugPreCheck()
+                this.debugConfig.localRootPath = await client.getLocalPath()
+                this.debugState.handlerFileAvailable = await client.getHandlerAvailable()
+            }
+        },
+
+        async sendInput() {
+            // Tell the backend to set the button state. This state is maintained even if webview loses focus
+            if (this.debugState.remoteDebuggingEnabled) {
+                // check few outof bound issue
+                if (
+                    this.debugConfig.lambdaTimeout &&
+                    (this.debugConfig.lambdaTimeout > 900 || this.debugConfig.lambdaTimeout < 0)
+                ) {
+                    this.debugConfig.lambdaTimeout = 900
+                }
+                if (
+                    this.debugConfig.debugPort &&
+                    (this.debugConfig.debugPort > 65535 || this.debugConfig.debugPort <= 0)
+                ) {
+                    this.debugConfig.debugPort = 9229
+                }
+
+                // acquire invoke lock
+                if (this.debugState.remoteDebuggingEnabled && !(await client.checkReadyToInvoke())) {
+                    return
+                }
+
+                const defaultPort = this.initialData.isLambdaRemote ? 9229 : undefined
+
+                if (!this.debugState.isDebugging) {
+                    this.debugState.isDebugging = await client.startDebugging({
+                        functionArn: this.initialData.FunctionArn,
+                        functionName: this.initialData.FunctionName,
+                        port: this.debugConfig.debugPort ?? defaultPort,
+                        sourceMap: this.runtimeSettings.sourceMapEnabled,
+                        localRoot: this.debugConfig.localRootPath,
+                        shouldPublishVersion: this.debugConfig.shouldPublishVersion,
+                        remoteRoot:
+                            this.debugConfig.remoteRootPath !== '' ? this.debugConfig.remoteRootPath : '/var/task',
+                        skipFiles: (this.runtimeSettings.skipFiles !== ''
+                            ? this.runtimeSettings.skipFiles
+                            : '<node_internals>/**'
+                        ).split(','),
+                        justMyCode: this.runtimeSettings.justMyCode,
+                        projectName: this.runtimeSettings.projectName,
+                        otherDebugParams: this.debugConfig.otherDebugParams,
+                        layerArn: this.initialData.remoteDebugLayer,
+                        lambdaTimeout: this.debugConfig.lambdaTimeout ?? 900,
+                        outFiles: this.runtimeSettings.outFiles?.split(','),
+                        isLambdaRemote: this.initialData.isLambdaRemote ?? true,
+                    })
+                    if (!this.debugState.isDebugging) {
+                        // user cancel or failed to start debugging
+                        return
+                    }
+                }
+                this.debugState.showDebugTimer = false
+            }
+
+            await client.invokeLambda(
+                this.payloadData.sampleText,
+                this.initialData.Source,
+                this.debugState.remoteDebuggingEnabled
+            )
+            await this.syncStateFromWorkspace()
+        },
+
+        async removeDebugSetup() {
+            this.debugState.isDebugging = await client.stopDebugging()
+        },
+
+        async startDebugTimer() {
+            this.debugState.debugTimeRemaining = await client.getDebugTimeRemaining()
+            if (this.debugState.debugTimeRemaining <= 0) {
+                return
+            }
+            this.debugState.showDebugTimer = true
+            this.debugState.debugTimer = window.setInterval(() => {
+                this.debugState.debugTimeRemaining--
+                if (this.debugState.debugTimeRemaining <= 0) {
+                    this.clearDebugTimer()
+                }
+            }, 1000) as number | undefined
+        },
+
+        clearDebugTimer() {
+            if (this.debugState.debugTimer) {
+                window.clearInterval(this.debugState.debugTimer)
+                this.debugState.debugTimeRemaining = 0
+                this.debugState.debugTimer = undefined
+                this.debugState.showDebugTimer = false
+            }
+        },
+
+        toggleCollapsible() {
+            this.uiState.isCollapsed = !this.uiState.isCollapsed
+        },
+
+        async openHandler() {
+            await client.tryOpenHandlerFile()
+        },
+
+        async openHandlerWithDelay() {
+            const preValue = this.debugConfig.localRootPath
+            // user is inputting the dir, only try to open dir if user stopped typing for 1 second
+            await new Promise((resolve) => setTimeout(resolve, 1000))
+            if (preValue !== this.debugConfig.localRootPath) {
+                return
+            }
+            // try open if user stop input for 1 second
+            await client.tryOpenHandlerFile(this.debugConfig.localRootPath)
+            this.debugState.handlerFileAvailable = await client.getHandlerAvailable()
+        },
+
+        async downloadRemoteCode() {
+            try {
+                const path = await client.downloadRemoteCode()
+                if (path) {
+                    this.debugConfig.localRootPath = path
+                    this.debugState.handlerFileAvailable = await client.getHandlerAvailable()
+                }
+            } catch (error) {
+                console.error('Failed to download remote code:', error)
+            }
+        },
+
+        loadSampleEvent() {
+            client.getSamplePayload().then(
+                (sample) => {
+                    if (!sample) {
+                        return
+                    }
+                    this.payloadData.sampleText = JSON.stringify(JSON.parse(sample), undefined, 4)
+                },
+                (e) => {
+                    console.error('client.getSamplePayload failed: %s', (e as Error).message)
+                }
+            )
+        },
+
+        async loadRemoteTestEvents() {
+            if (this.initialData.FunctionArn && this.initialData.FunctionRegion) {
+                // Use the backend method that shows a quickpick
+                const eventContent = await client.selectRemoteTestEvent(
+                    this.initialData.FunctionArn,
+                    this.initialData.FunctionRegion
+                )
+
+                if (eventContent) {
+                    // Populate the textarea with the selected event
+                    this.payloadData.sampleText = JSON.stringify(JSON.parse(eventContent), undefined, 4)
+                }
+            }
+        },
+        onDebugPortChange(event: Event) {
+            const value = (event.target as HTMLInputElement).value
+            if (value === '') {
+                this.debugConfig.debugPort = undefined
+            } else {
+                this.debugConfig.debugPort = Number(value)
+            }
+        },
+    },
+
+    mixins: [saveData],
+})
diff --git a/src/lambda/wizards/samDeployWizard.ts b/packages/core/src/lambda/wizards/samDeployWizard.ts
similarity index 92%
rename from src/lambda/wizards/samDeployWizard.ts
rename to packages/core/src/lambda/wizards/samDeployWizard.ts
index d407b877a0f..365d395e532 100644
--- a/src/lambda/wizards/samDeployWizard.ts
+++ b/packages/core/src/lambda/wizards/samDeployWizard.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -10,9 +10,8 @@ const localize = nls.loadMessageBundle()
 
 import * as path from 'path'
 import * as vscode from 'vscode'
-import { samDeployDocUrl } from '../../shared/constants'
 import * as localizedText from '../../shared/localizedText'
-import { getLogger } from '../../shared/logger'
+import { getLogger } from '../../shared/logger/logger'
 import { createHelpButton } from '../../shared/ui/buttons'
 import * as input from '../../shared/ui/input'
 import * as picker from '../../shared/ui/picker'
@@ -33,15 +32,16 @@ import { getSamCliVersion } from '../../shared/sam/cli/samCliContext'
 import * as semver from 'semver'
 import { minSamCliVersionForImageSupport } from '../../shared/sam/cli/samCliValidator'
 import { ExtContext } from '../../shared/extensions'
-import { validateBucketName } from '../../s3/util'
+import { validateBucketName } from '../../awsService/s3/util'
 import { showViewLogsMessage } from '../../shared/utilities/messages'
-import { getIdeProperties, isCloud9 } from '../../shared/extensionUtilities'
+import { getIdeProperties, getSamDeployDocUrl, isCloud9 } from '../../shared/extensionUtilities'
 import { recentlyUsed } from '../../shared/localizedText'
 import globals from '../../shared/extensionGlobals'
 import { SamCliSettings } from '../../shared/sam/cli/samCliSettings'
 import { getIcon } from '../../shared/icons'
-import { DefaultS3Client } from '../../shared/clients/s3Client'
+import { S3Client } from '../../shared/clients/s3'
 import { telemetry } from '../../shared/telemetry/telemetry'
+import { openUrl } from '../../shared/utilities/vsCodeUtils'
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 const CREATE_NEW_BUCKET = localize('AWS.command.s3.createBucket', 'Create Bucket...')
@@ -206,19 +206,19 @@ export class DefaultSamDeployWizardContext implements SamDeployWizardContext {
     public constructor(readonly extContext: ExtContext) {}
 
     public get workspaceFolders(): vscode.Uri[] | undefined {
-        return (vscode.workspace.workspaceFolders || []).map(f => f.uri)
+        return (vscode.workspace.workspaceFolders || []).map((f) => f.uri)
     }
 
     public async determineIfTemplateHasImages(templatePath: vscode.Uri): Promise<boolean> {
-        const template = globals.templateRegistry.getRegisteredItem(templatePath.fsPath)
+        const template = (await globals.templateRegistry).getItem(templatePath.fsPath)
         const resources = template?.item?.Resources
         if (resources === undefined) {
             return false
         } else {
             return Object.keys(resources)
-                .filter(key => resources[key]?.Type === 'AWS::Serverless::Function')
-                .map(key => resources[key]?.Properties?.PackageType)
-                .some(it => it === 'Image')
+                .filter((key) => resources[key]?.Type === 'AWS::Serverless::Function')
+                .map((key) => resources[key]?.Properties?.PackageType)
+                .includes('Image')
         }
     }
 
@@ -251,7 +251,7 @@ export class DefaultSamDeployWizardContext implements SamDeployWizardContext {
                 if (button === vscode.QuickInputButtons.Back) {
                     resolve(undefined)
                 } else if (button === this.helpButton) {
-                    vscode.env.openExternal(vscode.Uri.parse(samDeployDocUrl))
+                    void openUrl(getSamDeployDocUrl())
                 }
             },
         })
@@ -291,7 +291,7 @@ export class DefaultSamDeployWizardContext implements SamDeployWizardContext {
                         if (button === vscode.QuickInputButtons.Back) {
                             resolve(undefined)
                         } else if (button === this.helpButton) {
-                            vscode.env.openExternal(vscode.Uri.parse(samDeployDocUrl))
+                            void openUrl(getSamDeployDocUrl())
                         }
                     },
                 })
@@ -335,7 +335,7 @@ export class DefaultSamDeployWizardContext implements SamDeployWizardContext {
                         if (button === vscode.QuickInputButtons.Back) {
                             resolve(undefined)
                         } else if (button === this.helpButton) {
-                            vscode.env.openExternal(vscode.Uri.parse(samDeployDocUrl))
+                            void openUrl(getSamDeployDocUrl())
                         }
                     },
                 })
@@ -367,7 +367,7 @@ export class DefaultSamDeployWizardContext implements SamDeployWizardContext {
                 step: step,
                 totalSteps: this.totalSteps + this.additionalSteps,
             },
-            items: partitionRegions.map(region => ({
+            items: partitionRegions.map((region) => ({
                 label: region.name,
                 detail: region.id,
                 // this is the only way to get this to show on going back
@@ -384,7 +384,7 @@ export class DefaultSamDeployWizardContext implements SamDeployWizardContext {
                 if (button === vscode.QuickInputButtons.Back) {
                     resolve(undefined)
                 } else if (button === this.helpButton) {
-                    vscode.env.openExternal(vscode.Uri.parse(samDeployDocUrl))
+                    void openUrl(getSamDeployDocUrl())
                 }
             },
         })
@@ -446,7 +446,11 @@ export class DefaultSamDeployWizardContext implements SamDeployWizardContext {
         // This will background load the S3 buckets and load them all (in one chunk) when the operation completes.
         // Not awaiting lets us display a "loading" quick pick for immediate feedback.
         // Does not use an IteratingQuickPick because listing S3 buckets by region is not a paginated operation.
-        populateS3QuickPick(quickPick, selectedRegion, SamCliSettings.instance, messages, profile, accountId)
+        populateS3QuickPick(quickPick, selectedRegion, SamCliSettings.instance, messages, profile, accountId).catch(
+            (e) => {
+                getLogger().error('populateS3QuickPick: %s', (e as Error).message)
+            }
+        )
 
         const choices = await picker.promptUser<vscode.QuickPickItem>({
             picker: quickPick,
@@ -454,7 +458,7 @@ export class DefaultSamDeployWizardContext implements SamDeployWizardContext {
                 if (button === vscode.QuickInputButtons.Back) {
                     resolve(undefined)
                 } else if (button === this.helpButton) {
-                    vscode.env.openExternal(vscode.Uri.parse(samDeployDocUrl))
+                    void openUrl(getSamDeployDocUrl())
                 } else if (button === createBucket) {
                     resolve([{ label: CREATE_NEW_BUCKET }])
                 } else if (button === enterBucket) {
@@ -510,7 +514,7 @@ export class DefaultSamDeployWizardContext implements SamDeployWizardContext {
                 if (button === vscode.QuickInputButtons.Back) {
                     resolve(undefined)
                 } else if (button === this.helpButton) {
-                    vscode.env.openExternal(vscode.Uri.parse(samDeployDocUrl))
+                    void openUrl(getSamDeployDocUrl())
                 } else if (bucketProps.buttonHandler) {
                     bucketProps.buttonHandler(button, inputBox, resolve, reject)
                 }
@@ -544,7 +548,7 @@ export class DefaultSamDeployWizardContext implements SamDeployWizardContext {
 
         const populator = new IteratorTransformer<EcrRepository, vscode.QuickPickItem>(
             () => new DefaultEcrClient(selectedRegion).describeRepositories(),
-            response => (response === undefined ? [] : [{ label: response.repositoryName, repository: response }])
+            (response) => (response === undefined ? [] : [{ label: response.repositoryName, repository: response }])
         )
         const controller = new picker.IteratingQuickPickController(quickPick, populator)
         controller.startRequests()
@@ -554,7 +558,7 @@ export class DefaultSamDeployWizardContext implements SamDeployWizardContext {
                 if (button === vscode.QuickInputButtons.Back) {
                     resolve(undefined)
                 } else if (button === this.helpButton) {
-                    vscode.env.openExternal(vscode.Uri.parse(samDeployDocUrl))
+                    void openUrl(getSamDeployDocUrl())
                 }
             },
         })
@@ -607,7 +611,7 @@ export class DefaultSamDeployWizardContext implements SamDeployWizardContext {
                 if (button === vscode.QuickInputButtons.Back) {
                     resolve(undefined)
                 } else if (button === this.helpButton) {
-                    vscode.env.openExternal(vscode.Uri.parse(samDeployDocUrl))
+                    void openUrl(getSamDeployDocUrl())
                 }
             },
         })
@@ -638,7 +642,10 @@ export class SamDeployWizard extends MultiStepWizard<SamDeployWizardResponse> {
      * @param context
      * @param commandArg Argument given by VSCode when the "Deploy" command was invoked from a context-menu.
      */
-    public constructor(private readonly context: SamDeployWizardContext, commandArg?: any) {
+    public constructor(
+        private readonly context: SamDeployWizardContext,
+        commandArg?: any
+    ) {
         super()
         if (commandArg && commandArg.path) {
             // "Deploy" command was invoked on a template.yaml file.
@@ -709,7 +716,7 @@ export class SamDeployWizard extends MultiStepWizard<SamDeployWizardResponse> {
             // TODO: remove check when min version is high enough
             const samCliVersion = await getSamCliVersion(this.context.extContext.samCliContext())
             if (semver.lt(samCliVersion, minSamCliVersionForImageSupport)) {
-                vscode.window.showErrorMessage(
+                void vscode.window.showErrorMessage(
                     localize(
                         'AWS.output.sam.no.image.support',
                         'Support for Image-based Lambdas requires a minimum SAM CLI version of 1.13.0.'
@@ -729,7 +736,7 @@ export class SamDeployWizard extends MultiStepWizard<SamDeployWizardResponse> {
         }
 
         const requiredParameterNames = new Set<string>(
-            filter(parameters.keys(), name => parameters.get(name)!.required)
+            filter(parameters.keys(), (name) => parameters.get(name)!.required)
         )
         const overriddenParameters = await this.context.getOverriddenParameters(this.response.template)
         if (!overriddenParameters) {
@@ -765,13 +772,13 @@ export class SamDeployWizard extends MultiStepWizard<SamDeployWizardResponse> {
         return wizardContinue(this.skipOrPromptRegion(this.S3_BUCKET))
     }
 
-    private readonly REGION: WizardStep = async step => {
+    private readonly REGION: WizardStep = async (step) => {
         this.response.region = await this.context.promptUserForRegion(step, this.response.region)
 
         return this.response.region ? wizardContinue(this.S3_BUCKET) : WIZARD_GOBACK
     }
 
-    private readonly S3_BUCKET: WizardStep = async step => {
+    private readonly S3_BUCKET: WizardStep = async (step) => {
         const profile = this.context.extContext.awsContext.getCredentialProfileName() || ''
         const accountId = this.context.extContext.awsContext.getCredentialAccountId() || ''
         const response = await this.context.promptUserForS3Bucket(
@@ -795,18 +802,17 @@ export class SamDeployWizard extends MultiStepWizard<SamDeployWizardResponse> {
             }
 
             try {
-                const s3Client = new DefaultS3Client(this.response.region!)
-                const newBucketName = (await s3Client.createBucket({ bucketName: newBucketRequest })).bucket.name
+                const s3Client = new S3Client(this.response.region!)
+                const newBucketName = (await s3Client.createBucket({ bucketName: newBucketRequest })).bucket.Name
                 this.response.s3Bucket = newBucketName
                 getLogger().info('Created bucket: %O', newBucketName)
-                vscode.window.showInformationMessage(
+                void vscode.window.showInformationMessage(
                     localize('AWS.s3.createBucket.success', 'Created bucket: {0}', newBucketName)
                 )
                 telemetry.s3_createBucket.emit({ result: 'Succeeded' })
             } catch (e) {
-                showViewLogsMessage(
-                    localize('AWS.s3.createBucket.error.general', 'Failed to create bucket: {0}', newBucketRequest),
-                    vscode.window
+                void showViewLogsMessage(
+                    localize('AWS.s3.createBucket.error.general', 'Failed to create bucket: {0}', newBucketRequest)
                 )
                 telemetry.s3_createBucket.emit({ result: 'Failed' })
                 return WIZARD_RETRY
@@ -829,7 +835,7 @@ export class SamDeployWizard extends MultiStepWizard<SamDeployWizardResponse> {
         return this.hasImages ? wizardContinue(this.ECR_REPO) : wizardContinue(this.STACK_NAME)
     }
 
-    private readonly ECR_REPO: WizardStep = async step => {
+    private readonly ECR_REPO: WizardStep = async (step) => {
         const response = await this.context.promptUserForEcrRepo(step, this.response.region, this.response.ecrRepo)
 
         this.response.ecrRepo = response
@@ -859,7 +865,10 @@ class SamTemplateQuickPickItem implements vscode.QuickPickItem {
     public description?: string
     public detail?: string
 
-    public constructor(public readonly uri: vscode.Uri, showWorkspaceFolderDetails: boolean) {
+    public constructor(
+        public readonly uri: vscode.Uri,
+        showWorkspaceFolderDetails: boolean
+    ) {
         this.label = SamTemplateQuickPickItem.getLabel(uri)
 
         if (showWorkspaceFolderDetails) {
@@ -933,15 +942,15 @@ function validateStackName(value: string): string | undefined {
 }
 
 async function getTemplateChoices(...workspaceFolders: vscode.Uri[]): Promise<SamTemplateQuickPickItem[]> {
-    const templateUris = globals.templateRegistry.registeredItems.map(o => vscode.Uri.file(o.path))
+    const templateUris = (await globals.templateRegistry).items.map((o) => vscode.Uri.file(o.path))
     const uriToLabel: Map<vscode.Uri, string> = new Map<vscode.Uri, string>()
     const labelCounts: Map<string, number> = new Map()
 
-    templateUris.forEach(uri => {
+    for (const uri of templateUris) {
         const label = SamTemplateQuickPickItem.getLabel(uri)
         uriToLabel.set(uri, label)
         labelCounts.set(label, 1 + (labelCounts.get(label) || 0))
-    })
+    }
 
     return Array.from(uriToLabel, ([uri, label]) => {
         const showWorkspaceFolderDetails: boolean = (labelCounts.get(label) || 0) > 1
@@ -967,7 +976,7 @@ async function populateS3QuickPick(
     profile?: string,
     accountId?: string
 ): Promise<void> {
-    return new Promise(async resolve => {
+    return new Promise(async (resolve) => {
         const goBack: string = localize('AWS.picker.dynamic.noItemsFound.detail', 'Click here to go back')
         const baseItems: vscode.QuickPickItem[] = []
         const cloud9Bucket = `cloud9-${accountId}-sam-deployments-${selectedRegion}`
@@ -983,7 +992,7 @@ async function populateS3QuickPick(
                 })
             }
         } catch (e) {
-            getLogger().error('Recent bucket JSON not parseable.', e)
+            getLogger().error('Recent bucket JSON not parseable: %O', e)
         }
 
         if (isCloud9() && recent !== cloud9Bucket) {
@@ -998,7 +1007,7 @@ async function populateS3QuickPick(
         }
 
         try {
-            const s3Client = new DefaultS3Client(selectedRegion)
+            const s3Client = new S3Client(selectedRegion)
 
             quickPick.items = [...baseItems]
 
@@ -1016,10 +1025,10 @@ async function populateS3QuickPick(
                 ]
             } else {
                 const bucketItems = buckets
-                    .filter(bucket => bucket.name !== recent && !(isCloud9() && bucket.name === cloud9Bucket))
-                    .map(bucket => {
+                    .filter((bucket) => bucket.Name !== recent && !(isCloud9() && bucket.Name === cloud9Bucket))
+                    .map((bucket) => {
                         return {
-                            label: bucket.name,
+                            label: bucket.Name,
                         }
                     })
 
diff --git a/src/lambda/wizards/samInitWizard.ts b/packages/core/src/lambda/wizards/samInitWizard.ts
similarity index 77%
rename from src/lambda/wizards/samInitWizard.ts
rename to packages/core/src/lambda/wizards/samInitWizard.ts
index 1dca950a6dc..9bd3a1b72fb 100644
--- a/src/lambda/wizards/samInitWizard.ts
+++ b/packages/core/src/lambda/wizards/samInitWizard.ts
@@ -1,16 +1,16 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as nls from 'vscode-nls'
 import * as AWS from '@aws-sdk/types'
-import { Runtime } from 'aws-sdk/clients/lambda'
+import { Runtime } from '@aws-sdk/client-lambda'
 import * as path from 'path'
 import * as vscode from 'vscode'
 import { SchemasDataProvider } from '../../eventSchemas/providers/schemasDataProvider'
 import { DefaultSchemaClient } from '../../shared/clients/schemaClient'
-import { eventBridgeSchemasDocUrl, samInitDocUrl } from '../../shared/constants'
+import { eventBridgeSchemasDocUrl } from '../../shared/constants'
 import {
     Architecture,
     createRuntimeQuickPick,
@@ -28,7 +28,6 @@ import {
 } from '../models/samTemplates'
 import * as semver from 'semver'
 import { minSamCliVersionForArmSupport, minSamCliVersionForImageSupport } from '../../shared/sam/cli/samCliValidator'
-import * as fsutil from '../../shared/filesystemUtilities'
 import { Wizard } from '../../shared/wizards/wizard'
 import { createFolderPrompt } from '../../shared/ui/common/location'
 import { createInputBox, InputBoxPrompter } from '../../shared/ui/inputPrompter'
@@ -37,6 +36,8 @@ import { createRegionPrompter } from '../../shared/ui/common/region'
 import { Region } from '../../shared/regions/endpoints'
 import { createCommonButtons } from '../../shared/ui/buttons'
 import { createExitPrompter } from '../../shared/ui/common/exitPrompter'
+import { getNonexistentFilename } from '../../shared/filesystemUtilities'
+import { getSamInitDocUrl } from '../../shared/extensionUtilities'
 
 const localize = nls.loadMessageBundle()
 
@@ -55,7 +56,7 @@ export interface CreateNewSamAppWizardForm {
 function createRuntimePrompter(samCliVersion: string): QuickPickPrompter<RuntimeAndPackage> {
     return createRuntimeQuickPick({
         showImageRuntimes: semver.gte(samCliVersion, minSamCliVersionForImageSupport),
-        buttons: createCommonButtons(samInitDocUrl),
+        buttons: createCommonButtons(getSamInitDocUrl()),
     })
 }
 
@@ -65,7 +66,7 @@ function createSamTemplatePrompter(
     samCliVersion: string
 ): QuickPickPrompter<SamTemplate> {
     const templates = getSamTemplateWizardOption(currRuntime, packageType, samCliVersion)
-    const items = templates.toArray().map(template => ({
+    const items = templates.toArray().map((template) => ({
         label: template,
         data: template,
         detail: getTemplateDescription(template),
@@ -73,7 +74,7 @@ function createSamTemplatePrompter(
 
     return createQuickPick(items, {
         title: localize('AWS.samcli.initWizard.template.prompt', 'Select a SAM Application Template'),
-        buttons: createCommonButtons(samInitDocUrl),
+        buttons: createCommonButtons(getSamInitDocUrl()),
     })
 }
 
@@ -82,16 +83,16 @@ function createSchemaRegionPrompter(regions: Region[], defaultRegion?: string):
         title: localize('AWS.samcli.initWizard.schemas.region.prompt', 'Select an EventBridge Schemas Region'),
         buttons: createCommonButtons(eventBridgeSchemasDocUrl),
         defaultRegion,
-    }).transform(r => r.id)
+    }).transform((r) => r.id)
 }
 
 function createDependencyPrompter(currRuntime: Runtime): QuickPickPrompter<DependencyManager> {
     const dependencyManagers = getDependencyManager(currRuntime)
-    const items = dependencyManagers.map(dependencyManager => ({ label: dependencyManager }))
+    const items = dependencyManagers.map((dependencyManager) => ({ label: dependencyManager }))
 
     return createLabelQuickPick(items, {
         title: localize('AWS.samcli.initWizard.dependencyManager.prompt', 'Select a Dependency Manager'),
-        buttons: createCommonButtons(samInitDocUrl),
+        buttons: createCommonButtons(getSamInitDocUrl()),
     })
 }
 
@@ -99,9 +100,9 @@ function createRegistryPrompter(region: string, credentials?: AWS.Credentials):
     const client = new DefaultSchemaClient(region)
     const items = SchemasDataProvider.getInstance()
         .getRegistries(region, client, credentials!)
-        .then(registryNames => {
+        .then((registryNames) => {
             if (!registryNames) {
-                vscode.window.showInformationMessage(
+                void vscode.window.showInformationMessage(
                     localize(
                         'AWS.samcli.initWizard.schemas.registry.failed_to_load_resources',
                         'Error loading registries.'
@@ -110,14 +111,14 @@ function createRegistryPrompter(region: string, credentials?: AWS.Credentials):
                 return []
             }
 
-            return registryNames.map(registry => ({
+            return registryNames.map((registry) => ({
                 label: registry,
             }))
         })
 
     return createLabelQuickPick(items, {
         title: localize('AWS.samcli.initWizard.schemas.registry.prompt', 'Select a Registry'),
-        buttons: createCommonButtons(samInitDocUrl),
+        buttons: createCommonButtons(getSamInitDocUrl()),
     })
 }
 
@@ -129,9 +130,9 @@ function createSchemaPrompter(
     const client = new DefaultSchemaClient(region)
     const items = SchemasDataProvider.getInstance()
         .getSchemas(region, registry, client, credentials!)
-        .then(schemas => {
+        .then((schemas) => {
             if (!schemas) {
-                vscode.window.showInformationMessage(
+                void vscode.window.showInformationMessage(
                     localize(
                         'AWS.samcli.initWizard.schemas.failed_to_load_resources',
                         'Error loading schemas in registry {0}.',
@@ -142,13 +143,13 @@ function createSchemaPrompter(
             }
 
             if (schemas.length === 0) {
-                vscode.window.showInformationMessage(
+                void vscode.window.showInformationMessage(
                     localize('AWS.samcli.initWizard.schemas.notFound"', 'No schemas found in registry {0}.', registry)
                 )
                 return []
             }
 
-            return schemas.map(schema => ({
+            return schemas.map((schema) => ({
                 label: schema.SchemaName!,
             }))
         })
@@ -179,7 +180,7 @@ function createNamePrompter(defaultValue: string): InputBoxPrompter {
     return createInputBox({
         value: defaultValue,
         title: localize('AWS.samcli.initWizard.name.prompt', 'Enter a name for your new application'),
-        buttons: createCommonButtons(samInitDocUrl),
+        buttons: createCommonButtons(getSamInitDocUrl()),
         validateInput: validateName,
     })
 }
@@ -187,7 +188,7 @@ function createNamePrompter(defaultValue: string): InputBoxPrompter {
 function createArchitecturePrompter(): QuickPickPrompter<Architecture> {
     return createLabelQuickPick<Architecture>([{ label: 'x86_64' }, { label: 'arm64' }], {
         title: localize('AWS.samcli.initWizard.architecture.prompt', 'Select an Architecture'),
-        buttons: createCommonButtons(samInitDocUrl),
+        buttons: createCommonButtons(getSamInitDocUrl()),
     })
 }
 
@@ -204,15 +205,18 @@ export class CreateNewSamAppWizard extends Wizard<CreateNewSamAppWizardForm> {
 
         this.form.runtimeAndPackage.bindPrompter(() => createRuntimePrompter(context.samCliVersion))
 
-        this.form.dependencyManager.bindPrompter(state => createDependencyPrompter(state.runtimeAndPackage!.runtime!), {
-            showWhen: state =>
-                state.runtimeAndPackage?.runtime !== undefined &&
-                getDependencyManager(state.runtimeAndPackage.runtime).length > 1,
-            setDefault: state =>
-                state.runtimeAndPackage?.runtime !== undefined
-                    ? getDependencyManager(state.runtimeAndPackage.runtime)[0]
-                    : undefined,
-        })
+        this.form.dependencyManager.bindPrompter(
+            (state) => createDependencyPrompter(state.runtimeAndPackage!.runtime!),
+            {
+                showWhen: (state) =>
+                    state.runtimeAndPackage?.runtime !== undefined &&
+                    getDependencyManager(state.runtimeAndPackage.runtime).length > 1,
+                setDefault: (state) =>
+                    state.runtimeAndPackage?.runtime !== undefined
+                        ? getDependencyManager(state.runtimeAndPackage.runtime)[0]
+                        : undefined,
+            }
+        )
 
         // TODO: remove `partial` when updated wizard types gets merged (need to make the PR first of course...)
         function canShowArchitecture(
@@ -227,14 +231,14 @@ export class CreateNewSamAppWizard extends Wizard<CreateNewSamAppWizardForm> {
                 return false
             }
 
-            return samArmLambdaRuntimes.has(state.runtimeAndPackage?.runtime ?? 'unknown')
+            return state.runtimeAndPackage ? samArmLambdaRuntimes.has(state.runtimeAndPackage.runtime) : false
         }
 
         this.form.architecture.bindPrompter(createArchitecturePrompter, {
             showWhen: canShowArchitecture,
         })
 
-        this.form.template.bindPrompter(state =>
+        this.form.template.bindPrompter((state) =>
             createSamTemplatePrompter(
                 state.runtimeAndPackage!.runtime!,
                 state.runtimeAndPackage!.packageType!,
@@ -250,12 +254,12 @@ export class CreateNewSamAppWizard extends Wizard<CreateNewSamAppWizardForm> {
             showWhen: isStarterTemplate,
         })
 
-        this.form.registryName.bindPrompter(form => createRegistryPrompter(form.region!, context.credentials), {
+        this.form.registryName.bindPrompter((form) => createRegistryPrompter(form.region!, context.credentials), {
             showWhen: isStarterTemplate,
         })
 
         this.form.schemaName.bindPrompter(
-            state => createSchemaPrompter(state.region!, state.registryName!, context.credentials),
+            (state) => createSchemaPrompter(state.region!, state.registryName!, context.credentials),
             {
                 showWhen: isStarterTemplate,
             }
@@ -263,7 +267,7 @@ export class CreateNewSamAppWizard extends Wizard<CreateNewSamAppWizardForm> {
 
         this.form.location.bindPrompter(() =>
             createFolderPrompt(vscode.workspace.workspaceFolders ?? [], {
-                buttons: createCommonButtons(samInitDocUrl),
+                buttons: createCommonButtons(getSamInitDocUrl()),
                 title: localize('AWS.samInit.location.title', 'Select the folder for your new SAM application'),
                 browseFolderDetail: localize(
                     'AWS.samInit.location.detail',
@@ -272,15 +276,14 @@ export class CreateNewSamAppWizard extends Wizard<CreateNewSamAppWizardForm> {
             })
         )
 
-        this.form.name.bindPrompter(state =>
-            createNamePrompter(
-                fsutil.getNonexistentFilename(
-                    state.location!.fsPath,
-                    `lambda-${state.runtimeAndPackage!.runtime}`,
-                    '',
-                    99
-                )
+        this.form.name.bindPrompter(async (state) => {
+            const fname = await getNonexistentFilename(
+                state.location!.fsPath,
+                `lambda-${state.runtimeAndPackage!.runtime}`,
+                '',
+                99
             )
-        )
+            return createNamePrompter(fname)
+        })
     }
 }
diff --git a/packages/core/src/login/webview/commonAuthViewProvider.ts b/packages/core/src/login/webview/commonAuthViewProvider.ts
new file mode 100644
index 00000000000..8ad5c71bcd1
--- /dev/null
+++ b/packages/core/src/login/webview/commonAuthViewProvider.ts
@@ -0,0 +1,176 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * This is the webview provider of login ux. It should be created per webview.
+ * Usage:
+ * 1. Create a view in package.json
+ * {
+"type": "webview",
+"id": "aws.AmazonCommonAuth",
+"name": "%AWS.amazonq.login%",
+"when": "!aws.isSageMaker && !aws.amazonq.showView"
+},
+
+* 2. Assign when clause context to this view. Manage the state of when clause context.
+* 3. Init this provider at activation
+* const provider2 = new CommonAuthViewProvider(context, appInitContext.onDidChangeAmazonQVisibility)
+*     context.subscriptions.push(
+window.registerWebviewViewProvider(CommonAuthViewProvider.viewType, provider2, {
+    webviewOptions: {
+        retainContextWhenHidden: true,
+    },
+}),
+* 
+*/
+
+import * as vscode from 'vscode'
+import {
+    WebviewViewProvider,
+    ExtensionContext,
+    WebviewView,
+    WebviewViewResolveContext,
+    CancellationToken,
+    Uri,
+    EventEmitter,
+} from 'vscode'
+import { registerAssetsHttpsFileSystem } from '../../amazonq/webview/assets/assetsHandler'
+import { VueWebview, VueWebviewPanel } from '../../webviews/main'
+import { AmazonQLoginWebview } from './vue/amazonq/backend_amazonq'
+import { ToolkitLoginWebview } from './vue/toolkit/backend_toolkit'
+import { CodeCatalystAuthenticationProvider } from '../../codecatalyst/auth'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { AuthSources } from './util'
+import { AuthFlowStates } from './vue/types'
+import { getTelemetryMetadataForConn } from '../../auth/connection'
+import { AuthUtil } from '../../codewhisperer/util/authUtil'
+import { ExtensionUse } from '../../auth/utils'
+
+export class CommonAuthViewProvider implements WebviewViewProvider {
+    public readonly viewType: string
+
+    webView: VueWebviewPanel<ToolkitLoginWebview | AmazonQLoginWebview> | undefined
+    source: string = ''
+
+    constructor(
+        private readonly extensionContext: ExtensionContext,
+        readonly app: string,
+        private readonly onDidChangeVisibility?: EventEmitter<boolean>
+    ) {
+        this.viewType = `aws.${app}.AmazonCommonAuth`
+
+        registerAssetsHttpsFileSystem(extensionContext)
+        if (app === 'toolkit') {
+            // Create panel bindings using our class
+            const Panel = VueWebview.compilePanel(ToolkitLoginWebview)
+            // `context` is `ExtContext` provided on activation
+            this.webView = new Panel(extensionContext, CodeCatalystAuthenticationProvider.fromContext(extensionContext))
+            this.source = ToolkitLoginWebview.sourcePath
+        } else if (app === 'amazonq') {
+            const Panel = VueWebview.compilePanel(AmazonQLoginWebview)
+            this.webView = new Panel(extensionContext)
+            this.source = AmazonQLoginWebview.sourcePath
+        } else {
+            throw new Error(`invalid app provided to common auth view: ${app}`)
+        }
+    }
+
+    public async resolveWebviewView(
+        webviewView: WebviewView,
+        context: WebviewViewResolveContext,
+        _token: CancellationToken
+    ) {
+        // Our callback won't fire on the first view.
+        if (webviewView.visible) {
+            telemetry.auth_signInPageOpened.emit({
+                result: 'Succeeded',
+                passive: true,
+                source: ExtensionUse.instance.sourceForTelemetry(),
+            })
+        }
+
+        // This will fire whenever the user opens or closes the login page from 'somewhere else'
+        // i.e. NOT when switching from/to the chat window, which uses the same view area.
+        webviewView.onDidChangeVisibility(async () => {
+            if (webviewView.visible) {
+                telemetry.auth_signInPageOpened.emit({
+                    result: 'Succeeded',
+                    passive: true,
+                    source: ExtensionUse.instance.sourceForTelemetry(),
+                })
+            } else {
+                telemetry.auth_signInPageClosed.emit({ result: 'Succeeded', passive: true })
+
+                // Count leaving the webview as a user cancellation.
+                const authState = await this.webView!.server.getAuthState()
+                this.webView!.server.storeMetricMetadata({ result: 'Cancelled' })
+                if (authState === AuthFlowStates.REAUTHNEEDED || authState === AuthFlowStates.REAUTHENTICATING) {
+                    this.webView!.server.storeMetricMetadata({
+                        isReAuth: true,
+                        ...(await getTelemetryMetadataForConn(AuthUtil.instance.conn)),
+                    })
+                } else {
+                    this.webView!.server.storeMetricMetadata({ isReAuth: false })
+                }
+                this.webView!.server.emitAuthMetric()
+                this.webView!.server.cancelAuthFlow()
+
+                // Set after emitting. If users use side bar to return to login, this source is correct
+                // for the next iteration. Otherwise, other sources will be set accordingly by whatever
+                // shows the login page.
+                this.webView!.server.authSource = AuthSources.vscodeComponent
+            }
+
+            this.onDidChangeVisibility?.fire(webviewView.visible)
+        })
+
+        const dist = Uri.joinPath(this.extensionContext.extensionUri, 'dist')
+        const resources = Uri.joinPath(this.extensionContext.extensionUri, 'resources')
+        webviewView.webview.options = {
+            enableScripts: true,
+            enableCommandUris: true,
+            localResourceRoots: [dist, resources],
+        }
+        // register the webview server
+        await this.webView?.setup(webviewView.webview)
+
+        webviewView.webview.html = this._getHtmlForWebview(this.extensionContext.extensionUri, webviewView.webview)
+    }
+
+    private _getHtmlForWebview(extensionURI: Uri, webview: vscode.Webview) {
+        const assetsPath = Uri.joinPath(extensionURI)
+        const javascriptUri = Uri.joinPath(assetsPath, 'dist', this.source)
+        // Get the local path to main script run in the webview, then convert it to a uri we can use in the webview.
+        const scriptUri = webview.asWebviewUri(javascriptUri)
+        const serverHostname = process.env.WEBPACK_DEVELOPER_SERVER
+        const entrypoint =
+            serverHostname !== undefined ? Uri.parse(serverHostname).with({ path: `/${this.source}` }) : scriptUri
+
+        // Get Vue.js from dist/libs directory
+        const vueUri = Uri.joinPath(assetsPath, 'dist', 'libs', 'vue.min.js')
+        const vueScript = webview.asWebviewUri(vueUri)
+
+        return `
+            <!DOCTYPE html>
+            <html lang="en">
+                <head>
+                    <meta charset="UTF-8">
+                    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+                    <title>Base View Extension</title>
+                </head>
+                <body>
+                    <script src="${vueScript.toString()}"></script>  
+                    <script>
+                        const vscode = acquireVsCodeApi();
+                    </script>
+
+                    <div id="vue-app"></div>
+
+                    <script type="text/javascript" src="${entrypoint.toString()}" defer></script>
+                </body>
+            </html>`
+    }
+}
diff --git a/packages/core/src/login/webview/index.ts b/packages/core/src/login/webview/index.ts
new file mode 100644
index 00000000000..80abcc4fd79
--- /dev/null
+++ b/packages/core/src/login/webview/index.ts
@@ -0,0 +1,7 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export { CommonAuthViewProvider } from './commonAuthViewProvider'
+export { CommonAuthWebview } from './vue/backend'
diff --git a/packages/core/src/login/webview/util.ts b/packages/core/src/login/webview/util.ts
new file mode 100644
index 00000000000..c526e387d31
--- /dev/null
+++ b/packages/core/src/login/webview/util.ts
@@ -0,0 +1,28 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { cwQuickPickSource, cwTreeNodeSource, amazonQChatSource } from '../../codewhisperer/commands/types'
+import { ExtStartUpSources } from '../../shared/telemetry/util'
+import { vscodeComponent } from '../../shared/vscode/commands2'
+
+/**
+ * Different places the Add Connection command could be executed from.
+ *
+ * Useful for telemetry.
+ */
+export const AuthSources = {
+    addConnectionQuickPick: 'addConnectionQuickPick',
+    firstStartUp: ExtStartUpSources.firstStartUp,
+    codecatalystDeveloperTools: 'codecatalystDeveloperTools',
+    vscodeComponent: vscodeComponent,
+    cwQuickPick: cwQuickPickSource,
+    cwTreeNode: cwTreeNodeSource,
+    amazonQChat: amazonQChatSource,
+    authNode: 'authNode', // deprecated?
+    appBuilderWalkthrough: 'AppBuilderWalkthrough',
+    unknown: 'unknown',
+} as const
+
+export type AuthSource = (typeof AuthSources)[keyof typeof AuthSources]
diff --git a/packages/core/src/login/webview/vue/amazonq/backend_amazonq.ts b/packages/core/src/login/webview/vue/amazonq/backend_amazonq.ts
new file mode 100644
index 00000000000..a83e99d04b7
--- /dev/null
+++ b/packages/core/src/login/webview/vue/amazonq/backend_amazonq.ts
@@ -0,0 +1,265 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import {
+    AwsConnection,
+    Connection,
+    SsoConnection,
+    getTelemetryMetadataForConn,
+    isSsoConnection,
+} from '../../../../auth/connection'
+import { AuthUtil } from '../../../../codewhisperer/util/authUtil'
+import { CommonAuthWebview } from '../backend'
+import { awsIdSignIn } from '../../../../codewhisperer/util/showSsoPrompt'
+import { connectToEnterpriseSso } from '../../../../codewhisperer/util/getStartUrl'
+import { activateExtension, isExtensionInstalled } from '../../../../shared/utilities/vsCodeUtils'
+import { VSCODE_EXTENSION_ID } from '../../../../shared/extensions'
+import { getLogger } from '../../../../shared/logger/logger'
+import { debounce } from 'lodash'
+import { AuthError, AuthFlowState, userCancelled } from '../types'
+import { ToolkitError } from '../../../../shared/errors'
+import { withTelemetryContext } from '../../../../shared/telemetry/util'
+import { builderIdStartUrl } from '../../../../auth/sso/constants'
+import { RegionProfile } from '../../../../codewhisperer/models/model'
+import { randomUUID } from '../../../../shared/crypto'
+import globals from '../../../../shared/extensionGlobals'
+import { telemetry } from '../../../../shared/telemetry/telemetry'
+import { ProfileSwitchIntent } from '../../../../codewhisperer/region/regionProfileManager'
+
+const className = 'AmazonQLoginWebview'
+export class AmazonQLoginWebview extends CommonAuthWebview {
+    public override id: string = 'aws.amazonq.AmazonCommonAuth'
+    public static sourcePath: string = 'vue/src/login/webview/vue/amazonq/index.js'
+    public override supportsLoadTelemetry: boolean = true
+
+    override onActiveConnectionModified = new vscode.EventEmitter<void>()
+
+    constructor() {
+        super(AmazonQLoginWebview.sourcePath)
+
+        this.setupConnectionEventEmitter()
+    }
+
+    /**
+     * Returns list of connections that are pushed from Toolkit to Amazon Q
+     */
+    async fetchConnections(): Promise<AwsConnection[] | undefined> {
+        if (!isExtensionInstalled(VSCODE_EXTENSION_ID.awstoolkit)) {
+            return undefined
+        }
+        await activateExtension(VSCODE_EXTENSION_ID.awstoolkit)
+        const toolkitExt = vscode.extensions.getExtension(VSCODE_EXTENSION_ID.awstoolkit)
+        const importedApi = toolkitExt?.exports?.getApi(VSCODE_EXTENSION_ID.amazonq)
+        if (importedApi && 'listConnections' in importedApi) {
+            return ((await importedApi?.listConnections()) as AwsConnection[]).filter(
+                // No need to display Builder ID as an existing connection,
+                // users can just select the Builder ID login option and it would have the same effect.
+                (conn) => conn.startUrl !== builderIdStartUrl
+            )
+        }
+        return []
+    }
+
+    async startBuilderIdSetup(): Promise<AuthError | undefined> {
+        getLogger().debug(`called startBuilderIdSetup()`)
+        return await this.ssoSetup('startCodeWhispererBuilderIdSetup', async () => {
+            this.storeMetricMetadata({
+                credentialSourceId: 'awsId',
+                authEnabledFeatures: 'codewhisperer',
+                isReAuth: false,
+            })
+
+            const conn = await awsIdSignIn()
+            this.storeMetricMetadata(await getTelemetryMetadataForConn(conn))
+
+            void vscode.window.showInformationMessage('AmazonQ: Successfully connected to AWS Builder ID')
+        })
+    }
+
+    async startEnterpriseSetup(startUrl: string, region: string): Promise<AuthError | undefined> {
+        getLogger().debug(`called startEnterpriseSetup() with startUrl: '${startUrl}', region: '${region}'`)
+        await globals.globalState.update('recentSso', {
+            startUrl: startUrl,
+            region: region,
+        })
+        return await this.ssoSetup('startCodeWhispererEnterpriseSetup', async () => {
+            this.storeMetricMetadata({
+                credentialStartUrl: startUrl,
+                credentialSourceId: 'iamIdentityCenter',
+                authEnabledFeatures: 'codewhisperer',
+                isReAuth: false,
+            })
+
+            const conn = await connectToEnterpriseSso(startUrl, region)
+            this.storeMetricMetadata(await getTelemetryMetadataForConn(conn))
+
+            void vscode.window.showInformationMessage('AmazonQ: Successfully connected to AWS IAM Identity Center')
+        })
+    }
+
+    async reauthenticateConnection(): Promise<void> {
+        this.isReauthenticating = true
+        this.reauthError = undefined
+
+        try {
+            // Sanity checks
+            if (!AuthUtil.instance.isConnected()) {
+                getLogger().error('amazon Q reauthenticate called on a non-existant connection')
+                throw new ToolkitError('Cannot reauthenticate non-existant connection.')
+            }
+
+            const conn = AuthUtil.instance.conn
+            if (!isSsoConnection(conn)) {
+                getLogger().error('amazon Q reauthenticate called, but the connection is not SSO')
+                throw new ToolkitError('Cannot reauthenticate non-SSO connection.')
+            }
+
+            /**
+             * IMPORTANT: During this process {@link this.onActiveConnectionModified} is triggered. This
+             * causes the reauth page to refresh before the user is actually done the whole reauth flow.
+             */
+            this.reauthError = await this.ssoSetup('reauthenticateAmazonQ', async () => {
+                this.storeMetricMetadata({
+                    authEnabledFeatures: this.getAuthEnabledFeatures(conn),
+                    isReAuth: true,
+                    ...(await getTelemetryMetadataForConn(conn)),
+                })
+                await AuthUtil.instance.reauthenticate()
+                this.storeMetricMetadata({
+                    ...(await getTelemetryMetadataForConn(conn)),
+                })
+            })
+        } finally {
+            this.isReauthenticating = false
+        }
+
+        if (this.reauthError?.id === userCancelled) {
+            // Since reauth was not successful it did not trigger an update in the connection.
+            // We need to pretend it changed so our frontend triggers an update.
+            this.onActiveConnectionModified.fire()
+        }
+    }
+
+    private reauthError: AuthError | undefined = undefined
+    override async getReauthError(): Promise<AuthError | undefined> {
+        return this.reauthError
+    }
+
+    async getActiveConnection(): Promise<Connection | undefined> {
+        return AuthUtil.instance.conn
+    }
+
+    /**
+     * `true` if the actual reauth flow is in progress.
+     *
+     * We need this state since the reauth process triggers
+     * {@link this.onActiveConnectionModified} before it is actually done.
+     * This causes the UI to refresh, and we need to remember that we are
+     * still in the process of reauthenticating.
+     */
+    isReauthenticating: boolean = false
+    private authState: AuthFlowState = 'LOGIN'
+    override async refreshAuthState(): Promise<void> {
+        const featureAuthStates = await AuthUtil.instance.getChatAuthState()
+        if (featureAuthStates.amazonQ === 'expired') {
+            this.authState = this.isReauthenticating ? 'REAUTHENTICATING' : 'REAUTHNEEDED'
+            return
+        } else if (featureAuthStates.amazonQ === 'pendingProfileSelection') {
+            this.authState = 'PENDING_PROFILE_SELECTION'
+            // possible that user starts with "profile selection" state therefore the timeout for auth flow should be disposed otherwise will emit failure
+            this.loadMetadata?.loadTimeout?.dispose()
+            this.loadMetadata = {
+                traceId: randomUUID(),
+                loadTimeout: undefined,
+                start: globals.clock.Date.now(),
+            }
+            return
+        }
+        this.authState = 'LOGIN'
+    }
+
+    override async getAuthState(): Promise<AuthFlowState> {
+        return this.authState
+    }
+
+    @withTelemetryContext({ name: 'signout', class: className })
+    override async signout(): Promise<void> {
+        const conn = AuthUtil.instance.secondaryAuth.activeConnection
+        if (!isSsoConnection(conn)) {
+            throw new ToolkitError(`Cannot signout non-SSO connection, type is: ${conn?.type}`)
+        }
+
+        this.storeMetricMetadata({
+            authEnabledFeatures: this.getAuthEnabledFeatures(conn),
+            isReAuth: true,
+            ...(await getTelemetryMetadataForConn(conn)),
+            result: 'Cancelled',
+        })
+
+        await AuthUtil.instance.secondaryAuth.deleteConnection()
+        this.reauthError = undefined
+
+        this.emitAuthMetric()
+    }
+
+    async listSsoConnections(): Promise<SsoConnection[]> {
+        // Amazon Q only supports 1 connection at a time,
+        // so there isn't a need to de-duplicate connections.
+        return []
+    }
+
+    override startIamCredentialSetup(
+        profileName: string,
+        accessKey: string,
+        secretKey: string
+    ): Promise<AuthError | undefined> {
+        throw new Error('Method not implemented.')
+    }
+
+    /** If users are unauthenticated in Q/CW, we should always display the auth screen. */
+    async quitLoginScreen() {}
+
+    /**
+     * The purpose of returning Error.message is to notify vue frontend that API call fails and to render corresponding error message to users
+     * @returns ProfileList when API call succeeds, otherwise Error.message
+     */
+    override async listRegionProfiles(): Promise<RegionProfile[] | string> {
+        try {
+            return await AuthUtil.instance.regionProfileManager.getProfiles()
+        } catch (e) {
+            const conn = AuthUtil.instance.conn as SsoConnection | undefined
+            telemetry.amazonq_didSelectProfile.emit({
+                source: 'auth',
+                amazonQProfileRegion: AuthUtil.instance.regionProfileManager.activeRegionProfile?.region ?? 'not-set',
+                ssoRegion: conn?.ssoRegion,
+                result: 'Failed',
+                credentialStartUrl: conn?.startUrl,
+                reason: (e as Error).message,
+            })
+
+            return (e as Error).message
+        }
+    }
+
+    override selectRegionProfile(profile: RegionProfile, source: ProfileSwitchIntent) {
+        return AuthUtil.instance.regionProfileManager.switchRegionProfile(profile, source)
+    }
+
+    private setupConnectionEventEmitter(): void {
+        // allows the frontend to listen to Amazon Q auth events from the backend
+        const codeWhispererConnectionChanged = createThrottle(() => this.onActiveConnectionModified.fire())
+        AuthUtil.instance.secondaryAuth.onDidChangeActiveConnection(codeWhispererConnectionChanged)
+        AuthUtil.instance.regionProfileManager.onDidChangeRegionProfile(codeWhispererConnectionChanged)
+
+        /**
+         * Multiple events can be received in rapid succession and if
+         * we execute on the first one it is possible to get a stale
+         * state.
+         */
+        function createThrottle(callback: () => void) {
+            return debounce(callback, 500)
+        }
+    }
+}
diff --git a/packages/core/src/login/webview/vue/amazonq/index.ts b/packages/core/src/login/webview/vue/amazonq/index.ts
new file mode 100644
index 00000000000..0f27e4ff74f
--- /dev/null
+++ b/packages/core/src/login/webview/vue/amazonq/index.ts
@@ -0,0 +1,21 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * This module is run within the webview, and will mount the Vue app.
+ */
+
+import { createApp } from 'vue'
+import component from '../root.vue'
+
+const create = () =>
+    createApp(component, {
+        app: 'AMAZONQ',
+    })
+const app = create()
+
+app.mount('#vue-app')
+window.addEventListener('remount', () => {
+    app.unmount()
+    create().mount('#vue-app')
+})
diff --git a/packages/core/src/login/webview/vue/backend.ts b/packages/core/src/login/webview/vue/backend.ts
new file mode 100644
index 00000000000..c8f1f38d4d7
--- /dev/null
+++ b/packages/core/src/login/webview/vue/backend.ts
@@ -0,0 +1,309 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import globals from '../../../shared/extensionGlobals'
+import { VueWebview } from '../../../webviews/main'
+import { Region } from '../../../shared/regions/endpoints'
+import { getTelemetryReasonDesc, ToolkitError } from '../../../shared/errors'
+import { CancellationError } from '../../../shared/utilities/timeoutUtils'
+import { trustedDomainCancellation } from '../../../auth/sso/model'
+import { handleWebviewError } from '../../../webviews/server'
+import { InvalidGrantException } from '@aws-sdk/client-sso-oidc'
+import {
+    AwsConnection,
+    Connection,
+    hasScopes,
+    scopesCodeCatalyst,
+    scopesCodeWhispererChat,
+    scopesSsoAccountAccess,
+    SsoConnection,
+    TelemetryMetadata,
+} from '../../../auth/connection'
+import { Auth } from '../../../auth/auth'
+import { StaticProfile, StaticProfileKeyErrorMessage } from '../../../auth/credentials/types'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { AuthAddConnection } from '../../../shared/telemetry/telemetry'
+import { AuthSources } from '../util'
+import { AuthEnabledFeatures, AuthError, AuthFlowState, AuthUiClick, userCancelled } from './types'
+import { DevSettings } from '../../../shared/settings'
+import { AuthSSOServer } from '../../../auth/sso/server'
+import { getLogger } from '../../../shared/logger/logger'
+import { isValidUrl } from '../../../shared/utilities/uriUtils'
+import { RegionProfile } from '../../../codewhisperer/models/model'
+import { ProfileSwitchIntent } from '../../../codewhisperer/region/regionProfileManager'
+
+export abstract class CommonAuthWebview extends VueWebview {
+    private readonly className = 'CommonAuthWebview'
+    private metricMetadata: TelemetryMetadata = {}
+
+    // authSource should be set by whatever triggers the auth page flow.
+    // It will be reported in telemetry.
+    static #authSource: string = AuthSources.vscodeComponent
+
+    public static get authSource() {
+        return CommonAuthWebview.#authSource
+    }
+
+    public static set authSource(source: string) {
+        CommonAuthWebview.#authSource = source
+    }
+
+    public get authSource() {
+        return CommonAuthWebview.#authSource
+    }
+
+    public set authSource(source: string) {
+        CommonAuthWebview.#authSource = source
+    }
+
+    public getRegions(): Region[] {
+        return globals.regionProvider.getRegions().reverse()
+    }
+
+    /**
+     * Called when the UI load process is completed, regardless of success or failure
+     *
+     * @param errorMessage IF an error is caught on the frontend, this is the message. It will result in a failure metric.
+     *                     Otherwise we assume success.
+     */
+    public setUiReady(state: 'login' | 'reauth' | 'selectProfile', errorMessage?: string) {
+        if (errorMessage) {
+            this.setLoadFailure(state, errorMessage)
+        } else {
+            this.setDidLoad(state)
+        }
+    }
+
+    /**
+     * This wraps the execution of the given setupFunc() and handles common errors from the SSO setup process.
+     *
+     * @param methodName A value that will help identify which high level function called this method.
+     * @param setupFunc The function which will be executed in a try/catch so that we can handle common errors.
+     * @param postMetrics Whether to emit telemetry.
+     * @returns
+     */
+    async ssoSetup(methodName: string, setupFunc: () => Promise<any>, postMetrics: boolean = true) {
+        const runSetup = async () => {
+            try {
+                await setupFunc()
+                return
+            } catch (e) {
+                getLogger().error('ssoSetup encountered an error: %s', e)
+
+                if (e instanceof ToolkitError && e.code === 'NotOnboarded') {
+                    /**
+                     * Connection is fine, they just skipped onboarding so not an actual error.
+                     *
+                     * The error comes from user cancelling prompt by {@link CodeCatalystAuthenticationProvider.promptOnboarding()}
+                     */
+                    return
+                }
+
+                if (
+                    CancellationError.isUserCancelled(e) ||
+                    (e instanceof ToolkitError && (CancellationError.isUserCancelled(e.cause) || e.cancelled === true))
+                ) {
+                    return { id: userCancelled, text: 'Setup cancelled.' }
+                }
+
+                if (e instanceof ToolkitError && e.cause instanceof InvalidGrantException) {
+                    return {
+                        id: 'invalidGrantException',
+                        text: 'Permissions for this service may not be enabled by your SSO Admin, or the selected region may not be supported.',
+                    }
+                }
+
+                if (
+                    e instanceof ToolkitError &&
+                    (e.code === trustedDomainCancellation || e.cause?.name === trustedDomainCancellation)
+                ) {
+                    return {
+                        id: 'trustedDomainCancellation',
+                        text: `Must 'Open' or 'Configure Trusted Domains', unless you cancelled.`,
+                    }
+                }
+
+                const invalidRequestException = 'InvalidRequestException'
+                if (
+                    (e instanceof Error && e.name === invalidRequestException) ||
+                    (e instanceof ToolkitError && e.cause?.name === invalidRequestException)
+                ) {
+                    return { id: 'badStartUrl', text: `Connection failed. Please verify your start URL.` }
+                }
+
+                // If SSO setup fails we want to be able to show the user an error in the UI, due to this we cannot
+                // throw an error here. So instead this will additionally show an error message that provides more
+                // detailed information.
+                handleWebviewError(e, this.id, methodName)
+
+                return { id: 'defaultFailure', text: 'Failed to setup.' }
+            }
+        }
+
+        // Add context to our telemetry by adding the methodName argument to the function stack
+        const result = await telemetry.function_call.run(
+            async () => {
+                return runSetup()
+            },
+            { emit: false, functionId: { name: methodName, class: this.className } }
+        )
+
+        if (postMetrics) {
+            this.storeMetricMetadata(this.getResultForMetrics(result))
+            this.emitAuthMetric()
+        }
+        this.authSource = AuthSources.vscodeComponent
+
+        return result
+    }
+
+    /** Allows the frontend to subscribe to events emitted by the backend regarding the ACTIVE auth connection changing in some way. */
+    abstract onActiveConnectionModified: vscode.EventEmitter<void>
+
+    abstract startBuilderIdSetup(app: string): Promise<AuthError | undefined>
+
+    abstract startEnterpriseSetup(startUrl: string, region: string, app: string): Promise<AuthError | undefined>
+
+    async getAuthenticatedCredentialsError(data: StaticProfile): Promise<StaticProfileKeyErrorMessage | undefined> {
+        return Auth.instance.authenticateData(data)
+    }
+
+    abstract startIamCredentialSetup(
+        profileName: string,
+        accessKey: string,
+        secretKey: string
+    ): Promise<AuthError | undefined>
+
+    async showResourceExplorer(): Promise<void> {
+        await vscode.commands.executeCommand('aws.explorer.focus')
+    }
+
+    abstract fetchConnections(): Promise<AwsConnection[] | undefined>
+
+    async errorNotification(e: AuthError) {
+        void vscode.window.showInformationMessage(`${e.text}`)
+    }
+
+    abstract quitLoginScreen(): Promise<void>
+
+    /**
+     * NOTE: If we eventually need to be able to specify the connection to reauth, it should
+     * be an arg in this function
+     */
+    abstract reauthenticateConnection(): Promise<void>
+    abstract getReauthError(): Promise<AuthError | undefined>
+
+    abstract getActiveConnection(): Promise<Connection | undefined>
+
+    /** Refreshes the current state of the auth flow, determining what you see in the UI */
+    abstract refreshAuthState(): Promise<void>
+    /** Use {@link refreshAuthState} first to ensure this returns the latest state */
+    abstract getAuthState(): Promise<AuthFlowState>
+
+    abstract signout(): Promise<void>
+
+    /** List current connections known by the extension for the purpose of preventing duplicates. */
+    abstract listSsoConnections(): Promise<SsoConnection[]>
+
+    abstract listRegionProfiles(): Promise<RegionProfile[] | string>
+
+    abstract selectRegionProfile(profile: RegionProfile, source: ProfileSwitchIntent): Promise<void>
+
+    /**
+     * Emit stored metric metadata. Does not reset the stored metric metadata, because it
+     * may be used for additional emits (e.g. user cancels multiple times, user cancels then logs in)
+     */
+    emitAuthMetric() {
+        // We shouldn't report startUrl or region if we aren't reporting IdC
+        if (this.metricMetadata.credentialSourceId !== 'iamIdentityCenter') {
+            delete this.metricMetadata.awsRegion
+            delete this.metricMetadata.credentialStartUrl
+        }
+        telemetry.auth_addConnection.emit({
+            ...this.metricMetadata,
+            source: this.authSource,
+        } as AuthAddConnection)
+    }
+
+    /**
+     * Incrementally store auth metric data during vue, backend sign in logic,
+     * and cancellation flows.
+     */
+    storeMetricMetadata(data: TelemetryMetadata) {
+        this.metricMetadata = { ...this.metricMetadata, ...data }
+    }
+
+    /**
+     * Reset metadata stored by the auth form.
+     */
+    resetStoredMetricMetadata() {
+        this.metricMetadata = {}
+    }
+
+    /**
+     * Determines the status of the metric to report.
+     */
+    getResultForMetrics(error?: AuthError) {
+        const metadata: Partial<TelemetryMetadata> = {}
+        if (error) {
+            if (error.id === userCancelled) {
+                metadata.result = 'Cancelled'
+            } else {
+                metadata.result = 'Failed'
+                metadata.reason = error.id
+                metadata.reasonDesc = getTelemetryReasonDesc(error.text)
+            }
+        } else {
+            metadata.result = 'Succeeded'
+        }
+
+        return metadata
+    }
+
+    /**
+     * The metric when certain elements in the webview are clicked.
+     */
+    emitUiClick(id: AuthUiClick) {
+        telemetry.ui_click.emit({
+            elementId: id,
+        })
+    }
+
+    /**
+     * Return a comma-delimited list of features for which the connection has access to.
+     */
+    getAuthEnabledFeatures(conn: SsoConnection | AwsConnection) {
+        const authEnabledFeatures: AuthEnabledFeatures[] = []
+        if (hasScopes(conn.scopes!, scopesCodeWhispererChat)) {
+            authEnabledFeatures.push('codewhisperer')
+        }
+        if (hasScopes(conn.scopes!, scopesCodeCatalyst)) {
+            authEnabledFeatures.push('codecatalyst')
+        }
+        if (hasScopes(conn.scopes!, scopesSsoAccountAccess)) {
+            authEnabledFeatures.push('awsExplorer')
+        }
+
+        return authEnabledFeatures.join(',')
+    }
+
+    getDefaultSsoProfile(): { startUrl: string; region: string } {
+        const devSettings = DevSettings.instance.get('autofillStartUrl', '')
+        if (devSettings) {
+            return { startUrl: devSettings, region: 'us-east-1' }
+        }
+
+        return globals.globalState.tryGet('recentSso', Object, { startUrl: '', region: 'us-east-1' })
+    }
+
+    cancelAuthFlow() {
+        AuthSSOServer.lastInstance?.cancelCurrentFlow()
+    }
+
+    validateUrl(url: string) {
+        return isValidUrl(url)
+    }
+}
diff --git a/packages/core/src/login/webview/vue/base.css b/packages/core/src/login/webview/vue/base.css
new file mode 100644
index 00000000000..1a4a6297c26
--- /dev/null
+++ b/packages/core/src/login/webview/vue/base.css
@@ -0,0 +1,11 @@
+:root {
+    /* Font-sizes */
+    --font-size-sm: calc(0.75 * var(--font-size-base));
+    --font-size-base: var(--vscode-font-size);
+    --font-size-md: calc(1.25 * var(--font-size-base));
+    --font-size-lg: calc(1.5 * var(--font-size-base));
+    --font-size-xl: calc(1.75 * var(--font-size-base));
+
+    /* Alignment */
+    --auth-container-top: 15%;
+}
diff --git a/packages/core/src/login/webview/vue/login.vue b/packages/core/src/login/webview/vue/login.vue
new file mode 100644
index 00000000000..7973844f4d4
--- /dev/null
+++ b/packages/core/src/login/webview/vue/login.vue
@@ -0,0 +1,845 @@
+<!-- This Vue File is the login webview of AWS Toolkit and Amazon Q.-->
+<template>
+    <div
+        v-bind:class="[disabled ? 'disabled-form' : '']"
+        class="auth-container"
+        :data-app="app"
+        @click="handleDocumentClick"
+        v-if="stage !== 'CONNECTED'"
+    >
+        <div class="logoIcon bottomMargin">
+            <!-- Icon -->
+
+            <svg
+                v-if="app === 'AMAZONQ'"
+                width="71"
+                height="71"
+                viewBox="0 0 71 71"
+                fill="none"
+                xmlns="http://www.w3.org/2000/svg"
+            >
+                <g clip-path="url(#clip0_331_37336)">
+                    <path
+                        d="M30.1307 1.46438L8.83068 13.7563C5.45818 15.7087 3.37256 19.3031 3.37256 23.2081V47.8067C3.37256 51.6969 5.45818 55.306 8.83068 57.2585L30.1307 69.5504C33.5032 71.5029 37.6596 71.5029 41.0321 69.5504L62.3321 57.2585C65.7046 55.306 67.7903 51.7117 67.7903 47.8067V23.2081C67.7903 19.3179 65.7046 15.7087 62.3321 13.7563L41.0321 1.46438C37.6596 -0.488125 33.5032 -0.488125 30.1307 1.46438Z"
+                        fill="url(#paint0_linear_331_37336)"
+                    />
+                    <path
+                        d="M54.1966 21.6843L38.2364 12.469C37.5116 12.0401 36.5354 11.833 35.5739 11.833C34.6124 11.833 33.651 12.0401 32.9114 12.469L16.9512 21.6843C15.4868 22.5274 14.2887 24.5982 14.2887 26.2845V44.7149C14.2887 46.4011 15.4868 48.472 16.9512 49.3151L32.9114 58.5303C33.6362 58.9593 34.6124 59.1663 35.5739 59.1663C36.5354 59.1663 37.4968 58.9593 38.2364 58.5303L54.1966 49.3151C55.661 48.472 56.8591 46.4011 56.8591 44.7149V26.2845C56.8591 24.5982 55.661 22.5274 54.1966 21.6843ZM36.0029 54.7141C36.0029 54.7141 35.7958 54.7584 35.5887 54.7584C35.3816 54.7584 35.2337 54.7288 35.1745 54.7141L19.1699 45.4693C19.0072 45.3213 18.8002 44.9515 18.7558 44.7445V26.2549C18.8002 26.0478 19.022 25.678 19.1699 25.5301L35.1745 16.2853C35.1745 16.2853 35.3816 16.2409 35.5887 16.2409C35.7958 16.2409 35.9437 16.2705 36.0029 16.2853L52.0075 25.5301C52.1702 25.678 52.3772 26.0478 52.4216 26.2549V42.6588L40.0262 35.4997V33.5472C40.0262 33.1626 39.8191 32.8224 39.4937 32.6301L36.1212 30.6776C35.9585 30.5888 35.7662 30.5297 35.5887 30.5297C35.4112 30.5297 35.2189 30.574 35.0562 30.6776L31.6837 32.6301C31.3583 32.8224 31.1512 33.1774 31.1512 33.5472V37.4374C31.1512 37.822 31.3583 38.1622 31.6837 38.3545L35.0562 40.307C35.2189 40.3957 35.4112 40.4549 35.5887 40.4549C35.7662 40.4549 35.9585 40.4105 36.1212 40.307L37.8074 39.3307L50.2029 46.4899L36.0029 54.6845V54.7141Z"
+                        fill="white"
+                    />
+                </g>
+                <defs>
+                    <linearGradient
+                        id="paint0_linear_331_37336"
+                        x1="64.1515"
+                        y1="-5.31021"
+                        x2="10.5465"
+                        y2="71.2515"
+                        gradientUnits="userSpaceOnUse"
+                    >
+                        <stop stop-color="#A7F8FF" />
+                        <stop offset="0.03" stop-color="#9DF1FF" />
+                        <stop offset="0.08" stop-color="#84E1FF" />
+                        <stop offset="0.15" stop-color="#5AC7FF" />
+                        <stop offset="0.22" stop-color="#21A2FF" />
+                        <stop offset="0.26" stop-color="#008DFF" />
+                        <stop offset="0.66" stop-color="#7F33FF" />
+                        <stop offset="0.99" stop-color="#39127D" />
+                    </linearGradient>
+                    <clipPath id="clip0_331_37336">
+                        <rect width="71" height="71" fill="white" />
+                    </clipPath>
+                </defs>
+            </svg>
+            <svg
+                v-if="app === 'TOOLKIT'"
+                width="100"
+                height="80"
+                viewBox="0 0 54 40"
+                fill="none"
+                id="Layer_1"
+                data-name="Layer 1"
+                xmlns="http://www.w3.org/2000/svg"
+            >
+                <path
+                    id="logo-text"
+                    d="M14.09,10.85a4.7,4.7,0,0,0,.19,1.48,7.73,7.73,0,0,0,.54,1.19.77.77,0,0,1,.12.38.64.64,0,0,1-.32.49l-1,.7a.83.83,0,0,1-.44.15.69.69,0,0,1-.49-.23,3.8,3.8,0,0,1-.6-.77q-.25-.42-.51-1a6.14,6.14,0,0,1-4.89,2.3,4.54,4.54,0,0,1-3.32-1.19,4.27,4.27,0,0,1-1.22-3.2A4.28,4.28,0,0,1,3.61,7.75,6.06,6.06,0,0,1,7.69,6.46a12.47,12.47,0,0,1,1.76.13q.92.13,1.91.36V5.73a3.65,3.65,0,0,0-.79-2.66A3.81,3.81,0,0,0,7.86,2.3a7.71,7.71,0,0,0-1.79.22,12.78,12.78,0,0,0-1.79.57,4.55,4.55,0,0,1-.58.22l-.26,0q-.35,0-.35-.52V2a1.09,1.09,0,0,1,.12-.58,1.2,1.2,0,0,1,.47-.35A10.88,10.88,0,0,1,5.77.32,10.19,10.19,0,0,1,8.36,0a6,6,0,0,1,4.35,1.35,5.49,5.49,0,0,1,1.38,4.09ZM7.34,13.38a5.36,5.36,0,0,0,1.72-.31A3.63,3.63,0,0,0,10.63,12,2.62,2.62,0,0,0,11.19,11a5.63,5.63,0,0,0,.16-1.44v-.7a14.35,14.35,0,0,0-1.53-.28,12.37,12.37,0,0,0-1.56-.1,3.84,3.84,0,0,0-2.47.67A2.34,2.34,0,0,0,5,11a2.35,2.35,0,0,0,.61,1.76A2.4,2.4,0,0,0,7.34,13.38Zm13.35,1.8a1,1,0,0,1-.64-.16,1.3,1.3,0,0,1-.35-.65L15.81,1.51a3,3,0,0,1-.15-.67.36.36,0,0,1,.41-.41H17.7a1,1,0,0,1,.65.16,1.4,1.4,0,0,1,.33.65l2.79,11,2.59-11A1.17,1.17,0,0,1,24.39.6a1.1,1.1,0,0,1,.67-.16H26.4a1.1,1.1,0,0,1,.67.16,1.17,1.17,0,0,1,.32.65L30,12.39,32.88,1.25A1.39,1.39,0,0,1,33.22.6a1,1,0,0,1,.65-.16h1.54a.36.36,0,0,1,.41.41,1.36,1.36,0,0,1,0,.26,3.64,3.64,0,0,1-.12.41l-4,12.86a1.3,1.3,0,0,1-.35.65,1,1,0,0,1-.64.16H29.25a1,1,0,0,1-.67-.17,1.26,1.26,0,0,1-.32-.67L25.67,3.64,23.11,14.34a1.26,1.26,0,0,1-.32.67,1,1,0,0,1-.67.17Zm21.36.44a11.28,11.28,0,0,1-2.56-.29,7.44,7.44,0,0,1-1.92-.67,1,1,0,0,1-.61-.93v-.84q0-.52.38-.52a.9.9,0,0,1,.31.06l.42.17a8.77,8.77,0,0,0,1.83.58,9.78,9.78,0,0,0,2,.2,4.48,4.48,0,0,0,2.43-.55,1.76,1.76,0,0,0,.86-1.57,1.61,1.61,0,0,0-.45-1.16A4.29,4.29,0,0,0,43,9.22l-2.41-.76A5.15,5.15,0,0,1,38,6.78a3.94,3.94,0,0,1-.83-2.41,3.7,3.7,0,0,1,.45-1.85,4.47,4.47,0,0,1,1.19-1.37A5.27,5.27,0,0,1,40.51.29,7.4,7.4,0,0,1,42.6,0a8.87,8.87,0,0,1,1.12.07q.57.07,1.08.19t.95.26a4.27,4.27,0,0,1,.7.29,1.59,1.59,0,0,1,.49.41.94.94,0,0,1,.15.55v.79q0,.52-.38.52a1.76,1.76,0,0,1-.64-.2,7.74,7.74,0,0,0-3.2-.64,4.37,4.37,0,0,0-2.21.47,1.6,1.6,0,0,0-.79,1.48,1.58,1.58,0,0,0,.49,1.18,4.94,4.94,0,0,0,1.83.92L44.55,7a5.08,5.08,0,0,1,2.57,1.6A3.76,3.76,0,0,1,47.9,11a4.21,4.21,0,0,1-.44,1.93,4.4,4.4,0,0,1-1.21,1.47,5.43,5.43,0,0,1-1.85.93A8.25,8.25,0,0,1,42.05,15.62Z"
+                />
+                <path
+                    fill="#FF9900"
+                    class="cls-1"
+                    d="M45.19,23.81C39.72,27.85,31.78,30,25,30A36.64,36.64,0,0,1,.22,20.57c-.51-.46-.06-1.09.56-.74A49.78,49.78,0,0,0,25.53,26.4,49.23,49.23,0,0,0,44.4,22.53C45.32,22.14,46.1,23.14,45.19,23.81Z"
+                />
+                <path
+                    fill="#FF9900"
+                    class="cls-1"
+                    d="M47.47,21.21c-.7-.9-4.63-.42-6.39-.21-.53.06-.62-.4-.14-.74,3.13-2.2,8.27-1.57,8.86-.83s-.16,5.89-3.09,8.35c-.45.38-.88.18-.68-.32C46.69,25.8,48.17,22.11,47.47,21.21Z"
+                />
+            </svg>
+        </div>
+        <template v-if="stage === 'START'">
+            <button class="back-button bottomMargin" v-if="app === 'TOOLKIT'" @click="handleBackButtonClick">
+                <svg width="13" height="11" viewBox="0 0 13 11" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <path
+                        d="M4.98667 0.0933332L5.73333 0.786666L1.57333 4.94667H12.0267V5.96H1.57333L5.73333 10.0667L4.98667 10.8133L0.0266666 5.8V5.10667L4.98667 0.0933332Z"
+                        fill="#21A2FF"
+                    />
+                </svg>
+            </button>
+            <div class="auth-container-section">
+                <div class="imported-logins" v-if="importedLogins.length > 0">
+                    <div class="header bottomMargin">Connect with an existing account:</div>
+                    <div v-for="(importedLogin, index) in importedLogins" :key="index">
+                        <SelectableItem
+                            @toggle="toggleItemSelection"
+                            :isSelected="selectedLoginOption === LoginOption.IMPORTED_LOGINS + index"
+                            :itemId="LoginOption.IMPORTED_LOGINS + index"
+                            :itemText="importedLogin.text"
+                            :itemTitle="importedLogin.title"
+                            :itemType="importedLogin.type"
+                            class="selectable-item bottomMargin"
+                        ></SelectableItem>
+                    </div>
+                    <div class="header">Or, choose a sign-in option:</div>
+                </div>
+                <div class="header bottomMargin" v-if="importedLogins.length == 0">Choose a sign-in option:</div>
+                <SelectableItem
+                    v-if="app === 'AMAZONQ'"
+                    @toggle="toggleItemSelection"
+                    :isSelected="selectedLoginOption === LoginOption.BUILDER_ID"
+                    :itemId="LoginOption.BUILDER_ID"
+                    :itemText="'Free to start with a Builder ID.'"
+                    :itemTitle="'Personal account'"
+                    :itemType="LoginOption.BUILDER_ID"
+                    class="selectable-item bottomMargin"
+                ></SelectableItem>
+                <SelectableItem
+                    v-if="app === 'AMAZONQ'"
+                    @toggle="toggleItemSelection"
+                    :isSelected="selectedLoginOption === LoginOption.ENTERPRISE_SSO"
+                    :itemId="LoginOption.ENTERPRISE_SSO"
+                    :itemText="'Best for individual teams or organizations.'"
+                    :itemTitle="'Company account'"
+                    :itemType="LoginOption.ENTERPRISE_SSO"
+                    class="selectable-item bottomMargin"
+                ></SelectableItem>
+                <SelectableItem
+                    v-if="app === 'TOOLKIT'"
+                    @toggle="toggleItemSelection"
+                    :isSelected="selectedLoginOption === LoginOption.ENTERPRISE_SSO"
+                    :itemId="LoginOption.ENTERPRISE_SSO"
+                    :itemText="'Sign in to AWS with single sign-on'"
+                    :itemTitle="'Workforce'"
+                    :itemType="LoginOption.ENTERPRISE_SSO"
+                    class="selectable-item bottomMargin"
+                ></SelectableItem>
+                <SelectableItem
+                    v-if="app === 'TOOLKIT'"
+                    @toggle="toggleItemSelection"
+                    :isSelected="selectedLoginOption === LoginOption.IAM_CREDENTIAL"
+                    :itemId="LoginOption.IAM_CREDENTIAL"
+                    :itemText="'Store keys for use with AWS CLI tools'"
+                    :itemTitle="'IAM Credentials'"
+                    :itemType="LoginOption.IAM_CREDENTIAL"
+                    class="selectable-item bottomMargin"
+                ></SelectableItem>
+                <button
+                    class="continue-button"
+                    id="connection-selection-continue-button"
+                    :disabled="selectedLoginOption === 0"
+                    v-on:click="handleContinueClick()"
+                >
+                    Continue
+                </button>
+            </div>
+        </template>
+        <template v-if="stage === 'SSO_FORM'">
+            <button class="back-button bottomMargin" @click="handleBackButtonClick">
+                <svg width="13" height="11" viewBox="0 0 13 11" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <path
+                        d="M4.98667 0.0933332L5.73333 0.786666L1.57333 4.94667H12.0267V5.96H1.57333L5.73333 10.0667L4.98667 10.8133L0.0266666 5.8V5.10667L4.98667 0.0933332Z"
+                        fill="#21A2FF"
+                    />
+                </svg>
+            </button>
+            <div class="auth-container-section">
+                <div class="header bottomMargin">
+                    Sign in with AWS IAM Identity Center:<br />
+                    <a
+                        class="help-link"
+                        href="https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/q-in-IDE-setup.html#q-in-IDE-setup-pro-auth"
+                        v-if="app === 'AMAZONQ'"
+                        @click="handleHelpLinkClick"
+                    >
+                        <span class="help-link__icon">?</span
+                        ><span class="help-link__label">Need help signing in?</span></a
+                    >
+                </div>
+                <div class="code-catalyst-login" v-if="app === 'TOOLKIT'">
+                    <div style="margin-bottom: 4px"></div>
+                    <div class="subHeader">
+                        Using CodeCatalyst with AWS Builder ID?
+                        <a href="#" @click="handleCodeCatalystSignin()">Skip to sign-in</a>
+                    </div>
+                </div>
+                <div class="title topMargin">Start URL</div>
+                <div class="hint">Provided by your admin or help desk</div>
+                <input
+                    class="urlInput"
+                    type="text"
+                    id="startUrl"
+                    name="startUrl"
+                    @input="handleUrlInput"
+                    v-model="startUrl"
+                    @keydown.enter="handleContinueClick()"
+                />
+                <h4 class="start-url-error">{{ startUrlError }}</h4>
+                <h4 class="start-url-warning">{{ startUrlWarning }}</h4>
+                <div class="title topMargin">Region</div>
+                <div class="hint">AWS Region that hosts identity directory</div>
+                <select
+                    class="regionSelect"
+                    id="regions"
+                    name="regions"
+                    v-model="selectedRegion"
+                    @change="handleRegionInput($event)"
+                >
+                    <option v-for="region in regions" :key="region.id" :value="region.id">
+                        {{ `${region.name} (${region.id})` }}
+                    </option>
+                </select>
+                <button
+                    class="continue-button topMargin"
+                    :disabled="shouldDisableSsoContinue()"
+                    v-on:click="handleContinueClick()"
+                >
+                    Continue
+                </button>
+            </div>
+        </template>
+
+        <template v-if="stage === 'AUTHENTICATING'">
+            <div class="auth-container-section">
+                <div v-if="app === 'TOOLKIT' && profileName.length > 0" class="header bottomMargin">
+                    Connecting to IAM...
+                </div>
+                <div v-else class="header bottomMargin">Authenticating in browser...</div>
+                <button class="continue-button" v-on:click="handleCancelButton()">Cancel</button>
+            </div>
+        </template>
+
+        <template v-if="stage === 'AWS_PROFILE'">
+            <button class="back-button bottomMargin" @click="handleBackButtonClick">
+                <svg width="13" height="11" viewBox="0 0 13 11" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <path
+                        d="M4.98667 0.0933332L5.73333 0.786666L1.57333 4.94667H12.0267V5.96H1.57333L5.73333 10.0667L4.98667 10.8133L0.0266666 5.8V5.10667L4.98667 0.0933332Z"
+                        fill="#21A2FF"
+                    />
+                </svg>
+            </button>
+            <div class="header">IAM Credentials:</div>
+            <div class="hint">Credentials will be added to the appropriate ~/.aws/ files</div>
+            <a
+                class="hint"
+                href="https://docs.aws.amazon.com/sdkref/latest/guide/access-iam-users.html#step1authIamUser"
+                >Learn More</a
+            >
+            <div class="title topMargin">Profile Name</div>
+            <div class="hint">The identifier for these credentials</div>
+            <input
+                class="iamInput bottomMargin"
+                type="text"
+                id="profileName"
+                name="profileName"
+                v-model="profileName"
+                @keydown.enter="handleContinueClick()"
+            />
+            <div class="title">Access Key</div>
+            <input
+                class="iamInput bottomMargin"
+                type="text"
+                id="accessKey"
+                name="accessKey"
+                v-model="accessKey"
+                @keydown.enter="handleContinueClick()"
+            />
+            <div class="title">Secret Key</div>
+            <input
+                class="iamInput bottomMargin"
+                type="text"
+                id="secretKey"
+                name="secretKey"
+                v-model="secretKey"
+                @keydown.enter="handleContinueClick()"
+            />
+            <button class="continue-button" :disabled="shouldDisableIamContinue()" v-on:click="handleContinueClick()">
+                Continue
+            </button>
+        </template>
+    </div>
+</template>
+<script lang="ts">
+import { defineComponent } from 'vue'
+import SelectableItem from './selectableItem.vue'
+import { LoginOption } from './types'
+import { CommonAuthWebview } from './backend'
+import { WebviewClientFactory } from '../../../webviews/client'
+import { Region } from '../../../shared/regions/endpoints'
+import { ssoUrlFormatRegex, ssoUrlFormatMessage, urlInvalidFormatMessage } from '../../../auth/sso/constants'
+
+const client = WebviewClientFactory.create<CommonAuthWebview>()
+
+/** Where the user is currently in the builder id setup process */
+type Stage = 'START' | 'SSO_FORM' | 'CONNECTED' | 'AUTHENTICATING' | 'AWS_PROFILE'
+
+function getCredentialId(loginOption: LoginOption) {
+    switch (loginOption) {
+        case LoginOption.BUILDER_ID:
+            return 'awsId'
+        case LoginOption.ENTERPRISE_SSO:
+            return 'iamIdentityCenter'
+        case LoginOption.IAM_CREDENTIAL:
+            return 'sharedCredentials'
+        default:
+            return undefined
+    }
+}
+
+const authUiClickOptionMap = {
+    [LoginOption.BUILDER_ID]: 'auth_builderIdOption',
+    [LoginOption.ENTERPRISE_SSO]: 'auth_idcOption',
+    [LoginOption.IAM_CREDENTIAL]: 'auth_credentialsOption',
+    [LoginOption.IMPORTED_LOGINS]: 'auth_existingAuthOption',
+}
+
+function getUiClickEvent(loginOption: LoginOption) {
+    return (authUiClickOptionMap as any)[loginOption]
+}
+
+interface ImportedLogin {
+    id: number
+    text: string
+    title: string
+    type: number
+    startUrl: string
+    region: string
+}
+
+export default defineComponent({
+    name: 'Login',
+    components: { SelectableItem },
+    props: {
+        disabled: {
+            type: Boolean,
+            default: false,
+        },
+        app: {
+            type: String,
+            default: '',
+            required: true,
+        },
+    },
+    data() {
+        return {
+            existingStartUrls: [] as string[],
+            importedLogins: [] as ImportedLogin[],
+            selectedLoginOption: LoginOption.NONE,
+            stage: 'START' as Stage,
+            regions: [] as Region[],
+            startUrlError: '',
+            startUrlWarning: '',
+            selectedRegion: '',
+            startUrl: '',
+            app: this.app,
+            LoginOption,
+            profileName: '',
+            accessKey: '',
+            secretKey: '',
+        }
+    },
+    async created() {
+        const defaultSso = await this.getDefaultSso()
+        this.startUrl = defaultSso.startUrl
+        this.selectedRegion = defaultSso.region
+        await this.emitUpdate('created')
+    },
+
+    async mounted() {
+        this.fetchRegions()
+        await this.updateExistingStartUrls()
+        await this.updateImportedConnections()
+
+        // Reset gathered telemetry data each time we view the login page.
+        // The webview panel is reset on each view of the login page by design.
+        client.resetStoredMetricMetadata()
+
+        // Pre-select the first available login option
+        await this.preselectLoginOption()
+        await this.handleUrlInput() // validate the default startUrl
+    },
+    methods: {
+        toggleItemSelection(itemId: number) {
+            this.selectedLoginOption = itemId
+            void client.storeMetricMetadata({
+                credentialSourceId: getCredentialId(itemId),
+            })
+
+            const uiClickEvent = getUiClickEvent(itemId)
+            if (uiClickEvent !== undefined) {
+                void client.emitUiClick(uiClickEvent)
+            }
+        },
+        handleDocumentClick(event: any) {
+            const isClickInsideSelectableItems = event.target.closest('.selectable-item')
+            if (!isClickInsideSelectableItems) {
+                this.selectedLoginOption = 0
+            }
+        },
+        async handleBackButtonClick() {
+            // Count hitting the back button as a user auth cancellation.
+            // This will return the user to select a different login option.
+            if (this.stage === 'START') {
+                // For the toolkit only, the user can also back out to the explorer.
+                // We will not emit another cancellation event here, just a ui_click event.
+                void client.emitUiClick('auth_toolkitCloseButton')
+                void client.quitLoginScreen()
+            } else {
+                await client.storeMetricMetadata({ isReAuth: false, result: 'Cancelled' })
+                void client.emitAuthMetric()
+                void client.emitUiClick('auth_backButton')
+                this.stage = 'START'
+            }
+        },
+        async handleContinueClick() {
+            if (this.stage === 'START') {
+                if (this.selectedLoginOption === LoginOption.BUILDER_ID) {
+                    this.stage = 'AUTHENTICATING'
+                    const error = await client.startBuilderIdSetup(this.app)
+                    if (error) {
+                        this.stage = 'START'
+                        void client.errorNotification(error)
+                    } else {
+                        this.stage = 'CONNECTED'
+                    }
+                } else if (this.selectedLoginOption === LoginOption.ENTERPRISE_SSO) {
+                    this.stage = 'SSO_FORM'
+                    this.$nextTick(() => document.getElementById('startUrl')!.focus())
+                    await client.storeMetricMetadata({ awsRegion: this.selectedRegion })
+                } else if (this.selectedLoginOption >= LoginOption.IMPORTED_LOGINS) {
+                    this.stage = 'AUTHENTICATING'
+                    const selectedConnection =
+                        this.importedLogins[this.selectedLoginOption - LoginOption.IMPORTED_LOGINS]
+
+                    // Imported connections cannot be Builder IDs, they are filtered out in the client.
+                    const error = await client.startEnterpriseSetup(
+                        selectedConnection.startUrl,
+                        selectedConnection.region,
+                        this.app
+                    )
+                    if (error) {
+                        this.stage = 'START'
+                        void client.errorNotification(error)
+                    } else {
+                        this.stage = 'CONNECTED'
+                    }
+                } else if (this.selectedLoginOption === LoginOption.IAM_CREDENTIAL) {
+                    this.stage = 'AWS_PROFILE'
+                    this.$nextTick(() => document.getElementById('profileName')!.focus())
+                }
+            } else if (this.stage === 'SSO_FORM') {
+                if (this.shouldDisableSsoContinue()) {
+                    return
+                }
+                this.stage = 'AUTHENTICATING'
+
+                const error = await client.startEnterpriseSetup(this.startUrl, this.selectedRegion, this.app)
+                if (error) {
+                    this.stage = 'START'
+                    void client.errorNotification(error)
+                } else {
+                    this.stage = 'CONNECTED'
+                }
+            } else if (this.stage === 'AWS_PROFILE') {
+                if (this.shouldDisableIamContinue()) {
+                    return
+                }
+                this.stage = 'AUTHENTICATING'
+                const error = await client.startIamCredentialSetup(this.profileName, this.accessKey, this.secretKey)
+                if (error) {
+                    this.stage = 'START'
+                    void client.errorNotification(error)
+                } else {
+                    this.stage = 'CONNECTED'
+                }
+            }
+            void client.emitUiClick('auth_continueButton')
+        },
+        async handleCodeCatalystSignin() {
+            void client.emitUiClick('auth_codeCatalystSignIn')
+            this.stage = 'AUTHENTICATING'
+            const error = await client.startBuilderIdSetup(this.app)
+            if (error) {
+                this.stage = 'START'
+                void client.errorNotification(error)
+            } else {
+                this.stage = 'CONNECTED'
+            }
+        },
+        async handleUrlInput() {
+            const messages = await resolveStartUrlMessages(this.startUrl, this.existingStartUrls)
+            this.startUrlError = messages.error
+            this.startUrlWarning = messages.warning
+
+            if (!messages.error && !messages.warning) {
+                void client.storeMetricMetadata({
+                    credentialStartUrl: this.startUrl,
+                })
+            }
+
+            async function resolveStartUrlMessages(
+                startUrl: string | undefined,
+                existingStartUrls: string[]
+            ): Promise<{ warning: string; error: string }> {
+                // No URL
+                if (!startUrl) {
+                    return { error: '', warning: '' }
+                }
+
+                // Validate URL format
+                if (!ssoUrlFormatRegex.test(startUrl)) {
+                    console.log('Before Validate')
+                    if (await client.validateUrl(startUrl)) {
+                        console.log('After Validate')
+                        return { error: '', warning: ssoUrlFormatMessage }
+                    } else {
+                        return { error: urlInvalidFormatMessage, warning: '' }
+                    }
+                }
+
+                // Ensure that URL does not exist yet
+                if (existingStartUrls.some((url) => url === startUrl)) {
+                    return {
+                        error: 'A connection for this start URL already exists. Sign out before creating a new one.',
+                        warning: '',
+                    }
+                }
+
+                // URL is valid
+                return { error: '', warning: '' }
+            }
+        },
+        handleRegionInput(event: any) {
+            void client.storeMetricMetadata({
+                awsRegion: event.target.value,
+            })
+            void client.emitUiClick('auth_regionSelection')
+        },
+        async handleCancelButton() {
+            void client.cancelAuthFlow()
+
+            await client.storeMetricMetadata({ isReAuth: false, result: 'Cancelled' })
+            void client.emitAuthMetric()
+            void client.emitUiClick('auth_cancelButton')
+
+            this.stage = 'START'
+        },
+        async fetchRegions() {
+            const regions = await client.getRegions()
+            this.regions = regions
+        },
+        async emitUpdate(cause?: string) {},
+        async updateImportedConnections() {
+            // fetch existing connections of AWS toolkit in Amazon Q
+            // or fetch existing connections of Amazon Q in AWS Toolkit
+            // to reuse connections in AWS Toolkit & Amazon Q
+            const sharedConnections = await client.fetchConnections()
+            sharedConnections
+                ?.filter((c) => !this.existingStartUrls.includes(c.startUrl))
+                .forEach((connection, index) => {
+                    this.importedLogins.push({
+                        id: LoginOption.IMPORTED_LOGINS + index,
+                        text: this.app === 'TOOLKIT' ? 'Used by Amazon Q' : 'Used by AWS Toolkit',
+                        title: `IAM Identity Center ${connection.startUrl}`,
+                        type: LoginOption.ENTERPRISE_SSO,
+                        startUrl: connection.startUrl,
+                        region: connection.ssoRegion,
+                    })
+                })
+
+            this.$forceUpdate()
+        },
+        async updateExistingStartUrls() {
+            this.existingStartUrls = (await client.listSsoConnections()).map((conn) => conn.startUrl)
+        },
+        async getDefaultSso() {
+            return await client.getDefaultSsoProfile()
+        },
+        handleHelpLinkClick() {
+            void client.emitUiClick('auth_helpLink')
+        },
+        async preselectLoginOption() {
+            // Select the first available option for Login
+            if (this.importedLogins.length > 0) {
+                this.selectedLoginOption = LoginOption.IMPORTED_LOGINS
+            } else if (this.app === 'AMAZONQ') {
+                this.selectedLoginOption = LoginOption.BUILDER_ID
+            } else if (this.app === 'TOOLKIT') {
+                this.selectedLoginOption = LoginOption.ENTERPRISE_SSO
+            }
+            this.$forceUpdate()
+        },
+        shouldDisableSsoContinue() {
+            return this.startUrl.length == 0 || this.startUrlError.length > 0 || !this.selectedRegion
+        },
+        shouldDisableIamContinue() {
+            return this.profileName.length <= 0 || this.accessKey.length <= 0 || this.secretKey.length <= 0
+        },
+    },
+})
+
+/**
+ * The ID of the element we will use to determine that the UI has completed its initial load.
+ *
+ * This makes assumptions that we will be in a certain state of the UI (eg showing a form vs. a loading bar).
+ * So if the UI flow changes, this may need to be updated.
+ */
+export function getReadyElementId() {
+    // On every initial load, we ASSUME that the user will always be in the connection selection state,
+    // which is why we specifically look for this button.
+    return 'connection-selection-continue-button'
+}
+</script>
+
+<style scoped>
+@import './base.css';
+
+.selectable-item {
+    margin-bottom: 10px;
+    margin-top: 10px;
+    cursor: pointer;
+}
+.logoIcon {
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: flex-start;
+    height: auto;
+}
+.hint {
+    color: #c6c6c6;
+    margin-bottom: 5px;
+    margin-top: 5px;
+    font-size: var(--font-size-sm);
+    font-weight: 500;
+}
+.vscode-light .hint {
+    color: #3d3a3a;
+}
+.vscode-dark .hint {
+    color: #c6c6c6;
+}
+
+.auth-container {
+    height: auto;
+    margin: auto;
+    position: absolute;
+    top: var(--auth-container-top);
+    max-width: 260px;
+    width: 90vw;
+}
+
+.header {
+    font-size: var(--font-size-base);
+    font-weight: bold;
+}
+
+.vscode-dark .header {
+    color: white;
+}
+.vscode-light .header {
+    color: black;
+}
+
+.title {
+    margin-bottom: 3px;
+    margin-top: 3px;
+    font-size: var(--font-size-base);
+    font-weight: 500;
+}
+.vscode-dark .title {
+    color: white;
+}
+.vscode-light .title {
+    color: black;
+}
+
+.subHeader {
+    font-size: var(--font-size-sm);
+}
+.continue-button {
+    background-color: var(--vscode-button-background);
+    color: white;
+    width: 100%;
+    height: 30px;
+    border: none;
+    border-radius: 4px;
+    font-weight: bold;
+    margin-bottom: 3px;
+    margin-top: 3px;
+    cursor: pointer;
+    font-size: var(--font-size-base);
+}
+.back-button {
+    background: none;
+    border: none;
+    cursor: pointer;
+    color: var(--vscode-button-foreground);
+    height: 13px;
+    display: flex;
+    align-items: center;
+    padding-left: 0;
+}
+.back-button svg {
+    margin-left: 0px;
+}
+.continue-button:disabled {
+    background-color: var(--vscode-input-background);
+    color: #6f6f6f;
+    cursor: not-allowed;
+}
+body.vscode-high-contrast:not(body.vscode-high-contrast-light) .continue-button {
+    background-color: white;
+    color: var(--vscode-input-background);
+}
+
+body.vscode-high-contrast:not(body.vscode-high-contrast-light) .continue-button:disabled {
+    background-color: #6f6f6f;
+    color: var(--vscode-input-background);
+}
+
+body.vscode-high-contrast-light .continue-button {
+    background-color: var(--vscode-button-background);
+    color: white;
+}
+
+body.vscode-high-contrast-light .continue-button:disabled {
+    background-color: #6f6f6f;
+    color: var(--vscode-input-background);
+}
+
+.urlInput {
+    background-color: var(--vscode-input-background);
+    width: 244px;
+    height: 28px;
+    box-sizing: border-box;
+    border: none;
+    padding-left: 8px;
+    padding-right: 8px;
+    padding-top: 6px;
+    padding-bottom: 6px;
+    font-size: var(--font-size-base);
+    font-weight: 400;
+}
+body.vscode-light .urlInput,
+body.vscode-high-contrast-light .urlInput {
+    color: black;
+}
+body.vscode-dark .urlInput,
+body.vscode-high-contrast:not(body.vscode-high-contrast-light) .urlInput {
+    color: #cccccc;
+}
+.iamInput {
+    background-color: var(--vscode-input-background);
+    width: 244px;
+    height: 28px;
+    box-sizing: border-box;
+    border: none;
+    padding-left: 8px;
+    padding-right: 8px;
+    padding-top: 6px;
+    padding-bottom: 6px;
+    font-size: var(--font-size-base);
+    font-weight: 400;
+}
+body.vscode-light .iamInput,
+body.vscode-high-contrast-light .iamInput {
+    color: black;
+}
+
+body.vscode-dark .iamInput,
+body.vscode-high-contrast:not(body.vscode-high-contrast-light) .iamInput {
+    color: #cccccc;
+}
+.regionSelect {
+    background-color: var(--vscode-input-background);
+    width: 244px;
+    margin-bottom: 5px;
+    margin-top: 2px;
+    padding-left: 8px;
+    padding-right: 8px;
+    padding-top: 6px;
+    padding-bottom: 6px;
+    font-size: var(--font-size-base);
+    font-weight: 400;
+}
+body.vscode-light .regionSelect,
+body.vscode-high-contrast-light .regionSelect {
+    color: black;
+}
+
+body.vscode-dark .regionSelect,
+body.vscode-high-contrast:not(body.vscode-high-contrast-light) .regionSelect {
+    color: white;
+}
+.start-url-error {
+    color: #ff0000;
+    font-size: var(--font-size-sm);
+}
+.start-url-warning {
+    color: #dfe216;
+    font-size: var(--font-size-sm);
+}
+#logo {
+    fill: var(--vscode-button-foreground);
+}
+body.vscode-dark #logo-text {
+    fill: white;
+}
+body.vscode-light #logo-text {
+    fill: #232f3e; /* squid ink */
+}
+.bottomMargin {
+    margin-bottom: 12px;
+}
+.topMargin {
+    margin-top: 12px;
+}
+
+.help-link,
+.help-link__icon {
+    align-items: center;
+    display: flex;
+}
+
+.help-link,
+.help-link__label {
+    font-size: 10px;
+    font-weight: 400;
+    margin: 4px 0 0;
+    text-decoration: none;
+}
+
+.help-link__icon {
+    border-radius: 50%;
+    border: 1px solid var(--vscode-textLink-foreground);
+    font-size: 8px;
+    height: 10px;
+    justify-content: center;
+    width: 10px;
+}
+
+.help-link__label {
+    margin: 0;
+    padding: 0 0 0 2px;
+}
+</style>
diff --git a/packages/core/src/login/webview/vue/reauthenticate.vue b/packages/core/src/login/webview/vue/reauthenticate.vue
new file mode 100644
index 00000000000..dbd0c16f6cb
--- /dev/null
+++ b/packages/core/src/login/webview/vue/reauthenticate.vue
@@ -0,0 +1,257 @@
+<!-- This Vue File is a template for AWS Toolkit Reauthentication, configure app to TOOLKIT if for toolkit login
+configure app to AMAZONQ if for Amazon Q login.
+
+DESIGN:
+
+The goal is to have all state managed outside of this Vue file. Instead all state is determined in the backend code
+and the final results are retrieved by the frontend. For this Component to update the root Component must refresh it.
+-->
+<template>
+    <div v-show="doShow" id="reauthenticate-container" :data-app="app">
+        <!-- Icon -->
+        <div id="icon-container">
+            <svg
+                v-if="app === 'AMAZONQ'"
+                width="71"
+                height="71"
+                viewBox="0 0 71 71"
+                fill="none"
+                xmlns="http://www.w3.org/2000/svg"
+            >
+                <g clip-path="url(#clip0_331_37336)">
+                    <path
+                        d="M30.1307 1.46438L8.83068 13.7563C5.45818 15.7087 3.37256 19.3031 3.37256 23.2081V47.8067C3.37256 51.6969 5.45818 55.306 8.83068 57.2585L30.1307 69.5504C33.5032 71.5029 37.6596 71.5029 41.0321 69.5504L62.3321 57.2585C65.7046 55.306 67.7903 51.7117 67.7903 47.8067V23.2081C67.7903 19.3179 65.7046 15.7087 62.3321 13.7563L41.0321 1.46438C37.6596 -0.488125 33.5032 -0.488125 30.1307 1.46438Z"
+                        fill="url(#paint0_linear_331_37336)"
+                    />
+                    <path
+                        d="M54.1966 21.6843L38.2364 12.469C37.5116 12.0401 36.5354 11.833 35.5739 11.833C34.6124 11.833 33.651 12.0401 32.9114 12.469L16.9512 21.6843C15.4868 22.5274 14.2887 24.5982 14.2887 26.2845V44.7149C14.2887 46.4011 15.4868 48.472 16.9512 49.3151L32.9114 58.5303C33.6362 58.9593 34.6124 59.1663 35.5739 59.1663C36.5354 59.1663 37.4968 58.9593 38.2364 58.5303L54.1966 49.3151C55.661 48.472 56.8591 46.4011 56.8591 44.7149V26.2845C56.8591 24.5982 55.661 22.5274 54.1966 21.6843ZM36.0029 54.7141C36.0029 54.7141 35.7958 54.7584 35.5887 54.7584C35.3816 54.7584 35.2337 54.7288 35.1745 54.7141L19.1699 45.4693C19.0072 45.3213 18.8002 44.9515 18.7558 44.7445V26.2549C18.8002 26.0478 19.022 25.678 19.1699 25.5301L35.1745 16.2853C35.1745 16.2853 35.3816 16.2409 35.5887 16.2409C35.7958 16.2409 35.9437 16.2705 36.0029 16.2853L52.0075 25.5301C52.1702 25.678 52.3772 26.0478 52.4216 26.2549V42.6588L40.0262 35.4997V33.5472C40.0262 33.1626 39.8191 32.8224 39.4937 32.6301L36.1212 30.6776C35.9585 30.5888 35.7662 30.5297 35.5887 30.5297C35.4112 30.5297 35.2189 30.574 35.0562 30.6776L31.6837 32.6301C31.3583 32.8224 31.1512 33.1774 31.1512 33.5472V37.4374C31.1512 37.822 31.3583 38.1622 31.6837 38.3545L35.0562 40.307C35.2189 40.3957 35.4112 40.4549 35.5887 40.4549C35.7662 40.4549 35.9585 40.4105 36.1212 40.307L37.8074 39.3307L50.2029 46.4899L36.0029 54.6845V54.7141Z"
+                        fill="white"
+                    />
+                </g>
+                <defs>
+                    <linearGradient
+                        id="paint0_linear_331_37336"
+                        x1="64.1515"
+                        y1="-5.31021"
+                        x2="10.5465"
+                        y2="71.2515"
+                        gradientUnits="userSpaceOnUse"
+                    >
+                        <stop stop-color="#A7F8FF" />
+                        <stop offset="0.03" stop-color="#9DF1FF" />
+                        <stop offset="0.08" stop-color="#84E1FF" />
+                        <stop offset="0.15" stop-color="#5AC7FF" />
+                        <stop offset="0.22" stop-color="#21A2FF" />
+                        <stop offset="0.26" stop-color="#008DFF" />
+                        <stop offset="0.66" stop-color="#7F33FF" />
+                        <stop offset="0.99" stop-color="#39127D" />
+                    </linearGradient>
+                    <clipPath id="clip0_331_37336">
+                        <rect width="71" height="71" fill="white" />
+                    </clipPath>
+                </defs>
+            </svg>
+        </div>
+
+        <div id="content-container">
+            <template v-if="state === 'REAUTHNEEDED'">
+                <div>
+                    <div id="title">Connection to {{ name }} Expired</div>
+                    <div id="call-to-action">Please re-authenticate to continue</div>
+                </div>
+
+                <div>
+                    <button id="reauthenticate-button" v-on:click="reauthenticate">Re-authenticate</button>
+                    <div v-if="errorMessage" id="error-message" style="color: red">{{ errorMessage }}</div>
+                </div>
+
+                <button id="signout" v-on:click="signout">Sign Out</button>
+            </template>
+            <template v-else-if="state === 'REAUTHENTICATING'">
+                <div>
+                    <div>Re-authentication in progress</div>
+                    <button
+                        id="cancel"
+                        style="color: #6f6f6f; background-color: var(--vscode-input-background)"
+                        v-on:click="cancel"
+                    >
+                        Cancel
+                    </button>
+                </div>
+            </template>
+        </div>
+    </div>
+</template>
+<script lang="ts">
+import { PropType, defineComponent } from 'vue'
+import { FeatureId } from './types'
+import { WebviewClientFactory } from '../../../webviews/client'
+import { CommonAuthWebview } from './backend'
+import { AuthFlowStates } from './types'
+
+const client = WebviewClientFactory.create<CommonAuthWebview>()
+
+const FeatureNames: { [key in FeatureId]: string } = {
+    AMAZONQ: 'Amazon Q',
+    TOOLKIT: 'Toolkit',
+} as const
+type FeatureName = (typeof FeatureNames)[keyof typeof FeatureNames]
+
+type ReauthenticationStates = Pick<typeof AuthFlowStates, 'REAUTHNEEDED' | 'REAUTHENTICATING'>
+type ReauthenticationState = ReauthenticationStates[keyof ReauthenticationStates]
+
+export default defineComponent({
+    name: 'Reauthenticate',
+    data() {
+        return {
+            name: '' as FeatureName,
+            errorMessage: '' as String,
+            doShow: false,
+        }
+    },
+    props: {
+        app: {
+            type: String as PropType<FeatureId>,
+            required: true,
+        },
+        state: {
+            type: String as PropType<ReauthenticationState>,
+            required: true,
+        },
+    },
+    async created() {
+        this.name = FeatureNames[this.app]
+
+        const error = await client.getReauthError()
+        this.errorMessage = error ? error.text : ''
+
+        this.doShow = true
+    },
+    methods: {
+        async reauthenticate() {
+            client.emitUiClick('auth_reauthenticate')
+            // NOTE: the following puts the underlying connection in to an "authenticating" state
+            // which triggers our connection change event listener. This triggers the UI to refresh
+            // before it is actually done.
+            await client.reauthenticateConnection()
+        },
+        async signout() {
+            client.emitUiClick('auth_signout')
+            await client.signout()
+        },
+        async cancel() {
+            void client.emitUiClick('auth_reauthCancelButton')
+            await client.cancelAuthFlow()
+        },
+    },
+})
+
+/**
+ * The ID of the element we will use to determine that the UI has completed its initial load.
+ *
+ * This makes assumptions that we will be in a certain state of the UI (eg showing a form vs. a loading bar).
+ * So if the UI flow changes, this may need to be updated.
+ */
+export function getReadyElementId() {
+    return 'reauthenticate-button'
+}
+</script>
+<style>
+@import './base.css';
+
+#reauthenticate-container {
+    height: auto;
+    margin: auto;
+    position: absolute;
+    top: var(--auth-container-top);
+    width: 100%;
+}
+
+/* Immediate children */
+#reauthenticate-container > * {
+    margin-bottom: 2rem;
+}
+
+#content-container {
+    display: flex;
+    flex-direction: column;
+    /* All items are centered vertically */
+    justify-content: space-between;
+    /** The overall height of the container, then spacing is automatic between child elements */
+    height: 7rem;
+    text-align: center;
+}
+
+#content-container > * {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    text-align: center;
+}
+
+#icon-container {
+    display: flex;
+    flex-direction: column;
+    /* justify-content: center; */
+    align-items: center;
+}
+
+#text-container {
+    display: flex;
+    flex-direction: column;
+}
+
+#button-container {
+    display: flex;
+    flex-direction: column;
+}
+
+button#reauthenticate-button {
+    cursor: pointer;
+    background-color: var(--vscode-button-background);
+    color: white;
+    border-radius: 3px;
+    border: none;
+    padding: 0.3rem;
+    width: 80%;
+    user-select: none;
+    max-width: 260px;
+}
+
+button#signout {
+    cursor: pointer;
+    color: var(--vscode-textLink-foreground);
+    border: none;
+    background: none;
+    user-select: none;
+}
+
+button#cancel {
+    background-color: var(--vscode-button-background);
+    color: white;
+    border-radius: 3px;
+    border: none;
+    padding: 0.3rem;
+    width: 80%;
+    font-weight: bold;
+    margin-top: 15px;
+    cursor: pointer;
+}
+
+body.vscode-high-contrast:not(body.vscode-high-contrast-light) button#reauthenticate-button {
+    background-color: white;
+    color: black;
+}
+
+#title {
+    font-weight: bold;
+}
+
+#call-to-action {
+    font-weight: normal;
+}
+
+#error-message {
+    text-align: center;
+}
+</style>
diff --git a/packages/core/src/login/webview/vue/regionProfileSelector.vue b/packages/core/src/login/webview/vue/regionProfileSelector.vue
new file mode 100644
index 00000000000..a793e314a64
--- /dev/null
+++ b/packages/core/src/login/webview/vue/regionProfileSelector.vue
@@ -0,0 +1,317 @@
+<template>
+    <div v-show="doShow" id="profile-selector-container" :data-app="app">
+        <!-- Icon -->
+        <div id="icon-container" class="bottomMargin">
+            <svg
+                v-if="app === 'AMAZONQ'"
+                width="71"
+                height="71"
+                viewBox="0 0 71 71"
+                fill="none"
+                xmlns="http://www.w3.org/2000/svg"
+            >
+                <g clip-path="url(#clip0_331_37336)">
+                    <path
+                        d="M30.1307 1.46438L8.83068 13.7563C5.45818 15.7087 3.37256 19.3031 3.37256 23.2081V47.8067C3.37256 51.6969 5.45818 55.306 8.83068 57.2585L30.1307 69.5504C33.5032 71.5029 37.6596 71.5029 41.0321 69.5504L62.3321 57.2585C65.7046 55.306 67.7903 51.7117 67.7903 47.8067V23.2081C67.7903 19.3179 65.7046 15.7087 62.3321 13.7563L41.0321 1.46438C37.6596 -0.488125 33.5032 -0.488125 30.1307 1.46438Z"
+                        fill="url(#paint0_linear_331_37336)"
+                    />
+                    <path
+                        d="M54.1966 21.6843L38.2364 12.469C37.5116 12.0401 36.5354 11.833 35.5739 11.833C34.6124 11.833 33.651 12.0401 32.9114 12.469L16.9512 21.6843C15.4868 22.5274 14.2887 24.5982 14.2887 26.2845V44.7149C14.2887 46.4011 15.4868 48.472 16.9512 49.3151L32.9114 58.5303C33.6362 58.9593 34.6124 59.1663 35.5739 59.1663C36.5354 59.1663 37.4968 58.9593 38.2364 58.5303L54.1966 49.3151C55.661 48.472 56.8591 46.4011 56.8591 44.7149V26.2845C56.8591 24.5982 55.661 22.5274 54.1966 21.6843ZM36.0029 54.7141C36.0029 54.7141 35.7958 54.7584 35.5887 54.7584C35.3816 54.7584 35.2337 54.7288 35.1745 54.7141L19.1699 45.4693C19.0072 45.3213 18.8002 44.9515 18.7558 44.7445V26.2549C18.8002 26.0478 19.022 25.678 19.1699 25.5301L35.1745 16.2853C35.1745 16.2853 35.3816 16.2409 35.5887 16.2409C35.7958 16.2409 35.9437 16.2705 36.0029 16.2853L52.0075 25.5301C52.1702 25.678 52.3772 26.0478 52.4216 26.2549V42.6588L40.0262 35.4997V33.5472C40.0262 33.1626 39.8191 32.8224 39.4937 32.6301L36.1212 30.6776C35.9585 30.5888 35.7662 30.5297 35.5887 30.5297C35.4112 30.5297 35.2189 30.574 35.0562 30.6776L31.6837 32.6301C31.3583 32.8224 31.1512 33.1774 31.1512 33.5472V37.4374C31.1512 37.822 31.3583 38.1622 31.6837 38.3545L35.0562 40.307C35.2189 40.3957 35.4112 40.4549 35.5887 40.4549C35.7662 40.4549 35.9585 40.4105 36.1212 40.307L37.8074 39.3307L50.2029 46.4899L36.0029 54.6845V54.7141Z"
+                        fill="white"
+                    />
+                </g>
+                <defs>
+                    <linearGradient
+                        id="paint0_linear_331_37336"
+                        x1="64.1515"
+                        y1="-5.31021"
+                        x2="10.5465"
+                        y2="71.2515"
+                        gradientUnits="userSpaceOnUse"
+                    >
+                        <stop stop-color="#A7F8FF" />
+                        <stop offset="0.03" stop-color="#9DF1FF" />
+                        <stop offset="0.08" stop-color="#84E1FF" />
+                        <stop offset="0.15" stop-color="#5AC7FF" />
+                        <stop offset="0.22" stop-color="#21A2FF" />
+                        <stop offset="0.26" stop-color="#008DFF" />
+                        <stop offset="0.66" stop-color="#7F33FF" />
+                        <stop offset="0.99" stop-color="#39127D" />
+                    </linearGradient>
+                    <clipPath id="clip0_331_37336">
+                        <rect width="71" height="71" fill="white" />
+                    </clipPath>
+                </defs>
+            </svg>
+        </div>
+
+        <template v-if="isFirstLoading">
+            <div class="header bottomMargin">Fetching Q Developer profiles...this may take a minute.</div>
+        </template>
+
+        <template v-else>
+            <div class="header">Choose a Q Developer profile</div>
+            <div class="subHeader bottomMargin topMargin">
+                Your administrator has given you access to Q from multiple profiles. Choose the profile that meets your
+                current working needs. You can change your profile at any time.
+                <a href="https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/subscribe-understanding-profile.html"
+                    >More info.</a
+                >
+            </div>
+
+            <div class="bottomMargin">
+                <!-- TODO: should use profile.arn as item-id but not idx, which will require more work to refactor auth flow code path -->
+                <SelectableItem
+                    v-for="(profile, idx) in availableRegionProfiles"
+                    :key="profile.arn"
+                    @toggle="toggleItemSelection"
+                    :item-id="idx"
+                    :item-title="`${profile.name}`"
+                    :item-sub-title="`${profile.region}`"
+                    :item-text="`Account: ${profile.description}`"
+                    :isSelected="selectedRegionProfileIndex === idx"
+                    :class="['selectable-item', { selected: selectedRegionProfileIndex === idx }]"
+                ></SelectableItem>
+            </div>
+
+            <div v-if="errorMessage" id="error-message" class="bottomMargin">
+                We couldn't load your Q Developer profiles. Please try again.
+            </div>
+
+            <div>
+                <template v-if="errorMessage">
+                    <button id="reload" class="continue-button" v-on:click="retryLoadProfiles">Try again</button>
+                    <button id="signout" class="topMargin" v-on:click="signout">Sign Out</button>
+                </template>
+                <template v-else>
+                    <button
+                        class="continue-button"
+                        id="profile-selection-continue-button"
+                        v-on:click="onClickContinue()"
+                        :disabled="isRetryLoading"
+                    >
+                        {{ isRetryLoading ? 'Refreshing' : 'Continue' }}
+                    </button>
+                </template>
+            </div>
+        </template>
+    </div>
+</template>
+<script lang="ts">
+import { PropType, defineComponent } from 'vue'
+import { FeatureId } from './types'
+import { WebviewClientFactory } from '../../../webviews/client'
+import { CommonAuthWebview } from './backend'
+import SelectableItem from './selectableItem.vue'
+import { RegionProfile } from '../../../codewhisperer/models/model'
+
+const client = WebviewClientFactory.create<CommonAuthWebview>()
+
+const FeatureNames: { [key in FeatureId]: string } = {
+    AMAZONQ: 'Amazon Q',
+    TOOLKIT: 'Toolkit',
+} as const
+type FeatureName = (typeof FeatureNames)[keyof typeof FeatureNames]
+
+export default defineComponent({
+    name: 'RegionProfileSelector',
+    components: {
+        SelectableItem,
+    },
+    data() {
+        return {
+            name: '' as FeatureName,
+            errorMessage: '' as String,
+            doShow: false,
+            availableRegionProfiles: [] as RegionProfile[],
+            selectedRegionProfileIndex: 0,
+            isFirstLoading: false,
+            isRetryLoading: false,
+        }
+    },
+    props: {
+        app: {
+            type: String as PropType<FeatureId>,
+            required: true,
+        },
+        state: {
+            type: String,
+            required: true,
+        },
+    },
+    async created() {
+        this.doShow = true
+    },
+    async mounted() {
+        this.firstTimeLoadProfiles()
+    },
+    methods: {
+        toggleItemSelection(itemId: number) {
+            this.selectedRegionProfileIndex = itemId
+        },
+        onClickContinue() {
+            if (this.availableRegionProfiles[this.selectedRegionProfileIndex] !== undefined) {
+                const selectedProfile = this.availableRegionProfiles[this.selectedRegionProfileIndex]
+                client.selectRegionProfile(selectedProfile, 'auth')
+            } else {
+                // TODO: handle error
+            }
+        },
+        async signout() {
+            client.emitUiClick('auth_signout')
+            await client.signout()
+        },
+        // hack to have 2 different flag because we want to render differently for 2 paths
+        async retryLoadProfiles() {
+            this.isRetryLoading = true
+            await this.listAvailableProfiles()
+            this.isRetryLoading = false
+        },
+        firstTimeLoadProfiles() {
+            this.isFirstLoading = true
+            this.listAvailableProfiles().then(() => {
+                this.isFirstLoading = false
+            })
+        },
+        async listAvailableProfiles() {
+            this.errorMessage = ''
+            const r = await client.listRegionProfiles()
+            if (typeof r === 'string') {
+                this.errorMessage = r
+            } else {
+                this.availableRegionProfiles = r
+                // auto select and bypass this profile view if profile count === 1
+                if (this.availableRegionProfiles.length === 1) {
+                    await client.selectRegionProfile(this.availableRegionProfiles[0], 'update')
+                }
+            }
+        },
+    },
+})
+
+/**
+ * The ID of the element we will use to determine that the UI has completed its initial load.
+ *
+ * This makes assumptions that we will be in a certain state of the UI (eg showing a form vs. a loading bar).
+ * So if the UI flow changes, this may need to be updated.
+ */
+export function getReadyElementId() {
+    // On every initial load, we ASSUME that the user will always be in the connection selection state,
+    // which is why we specifically look for this button.
+    return 'profile-selection-continue-button'
+}
+</script>
+<style scoped>
+@import './base.css';
+
+/* TODO: clean up these CSS entries */
+#profile-selector-container {
+    height: auto;
+    margin: auto;
+    position: absolute;
+    top: var(--auth-container-top);
+    max-width: 260px;
+    width: 90vw;
+}
+
+.selectable-item {
+    margin-bottom: 5px;
+    /* margin-top: 10px; */
+    cursor: pointer;
+    width: 100%;
+}
+
+.header {
+    font-size: var(--font-size-base);
+    font-weight: bold;
+}
+
+.vscode-dark .header {
+    color: white;
+}
+.vscode-light .header {
+    color: black;
+}
+
+.title {
+    margin-bottom: 3px;
+    margin-top: 3px;
+    font-size: var(--font-size-base);
+    font-weight: 500;
+}
+.vscode-dark .title {
+    color: white;
+}
+.vscode-light .title {
+    color: black;
+}
+
+.subHeader {
+    font-size: var(--font-size-sm);
+}
+.continue-button {
+    background-color: var(--vscode-button-background);
+    color: white;
+    width: 100%;
+    height: 30px;
+    border: none;
+    border-radius: 4px;
+    font-weight: bold;
+    margin-bottom: 3px;
+    margin-top: 3px;
+    cursor: pointer;
+    font-size: var(--font-size-base);
+}
+
+.continue-button:disabled {
+    background-color: var(--vscode-input-background);
+    color: #6f6f6f;
+    cursor: not-allowed;
+}
+
+body.vscode-high-contrast:not(body.vscode-high-contrast-light) .continue-button {
+    background-color: white;
+    color: var(--vscode-input-background);
+}
+
+body.vscode-high-contrast:not(body.vscode-high-contrast-light) .continue-button:disabled {
+    background-color: #6f6f6f;
+    color: var(--vscode-input-background);
+}
+
+body.vscode-high-contrast-light .continue-button {
+    background-color: var(--vscode-button-background);
+    color: white;
+}
+
+.bottomMargin {
+    margin-bottom: 12px;
+}
+.topMargin {
+    margin-top: 6px;
+}
+
+#icon-container {
+    display: flex;
+    flex-direction: column;
+    /* justify-content: center; */
+    align-items: center;
+}
+
+#error-message {
+    text-align: center;
+    font-size: var(--font-size-base);
+}
+
+button#signout {
+    cursor: pointer;
+    color: var(--vscode-textLink-foreground);
+    border: none;
+    background: none;
+    user-select: none;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+</style>
diff --git a/packages/core/src/login/webview/vue/root.vue b/packages/core/src/login/webview/vue/root.vue
new file mode 100644
index 00000000000..a4afc07f150
--- /dev/null
+++ b/packages/core/src/login/webview/vue/root.vue
@@ -0,0 +1,173 @@
+<!-- This Vue File is a template for AWS Toolkit Login, configure app to TOOLKIT if for toolkit login
+configure app to AMAZONQ if for Amazon Q login
+-->
+<template>
+    <!-- Body -->
+    <div class="body" style="height: 100vh" :data-app="app">
+        <!-- Functionality -->
+        <Login v-if="authFlowState === 'LOGIN'" :app="app"></Login>
+        <Reauthenticate
+            v-else-if="authFlowState === 'REAUTHNEEDED' || authFlowState === 'REAUTHENTICATING'"
+            :app="app"
+            :state="authFlowState"
+            :key="refreshKey"
+        ></Reauthenticate>
+        <RegionProfileSelector
+            v-if="authFlowState === 'PENDING_PROFILE_SELECTION'"
+            :app="app"
+            :state="authFlowState"
+        ></RegionProfileSelector>
+    </div>
+</template>
+<script lang="ts">
+import { PropType, defineComponent } from 'vue'
+import Login, { getReadyElementId as getLoginReadyElementId } from './login.vue'
+import Reauthenticate, { getReadyElementId as getReauthReadyElementId } from './reauthenticate.vue'
+import RegionProfileSelector, { getReadyElementId as getSelectProfileReadyElementId } from './regionProfileSelector.vue'
+import { AuthFlowState, FeatureId } from './types'
+import { WebviewClientFactory } from '../../../webviews/client'
+import { CommonAuthWebview } from './backend'
+
+const client = WebviewClientFactory.create<CommonAuthWebview>()
+
+export default defineComponent({
+    name: 'auth',
+    components: {
+        Login,
+        Reauthenticate,
+        RegionProfileSelector,
+    },
+    data() {
+        return {
+            // Where the user is in the Auth process, this impacts what they see
+            authFlowState: '' as AuthFlowState,
+            // When the value changes the component is forced to rebuild
+            refreshKey: 0,
+        }
+    },
+    props: {
+        app: {
+            type: String as PropType<FeatureId>,
+            required: true,
+        },
+    },
+    async created() {
+        // Any backend auth changes will trigger the webview to refresh
+        client.onActiveConnectionModified(() => {
+            this.refreshAuthState()
+        })
+
+        await this.refreshAuthState()
+
+        // We were recieving the 'load' event before refreshAuthState() resolved (I'm assuming behavior w/ Vue + browser loading not blocking),
+        // so post refreshAuhState() if we detect we already loaded, then execute immediately since the event already happened.
+        if (didLoad) {
+            handleLoaded()
+        } else {
+            window.addEventListener('load', () => {
+                handleLoaded()
+            })
+        }
+    },
+    async updated() {
+        if (didLoad) {
+            handleLoaded()
+        }
+    },
+    methods: {
+        async refreshAuthState() {
+            await client.refreshAuthState()
+            this.authFlowState = await client.getAuthState()
+
+            // Used for telemetry purposes
+            if (this.authFlowState === 'LOGIN') {
+                ;(window as any).uiState = 'login'
+                ;(window as any).uiReadyElementId = getLoginReadyElementId()
+            } else if (this.authFlowState === 'PENDING_PROFILE_SELECTION') {
+                ;(window as any).uiState = 'selectProfile'
+                ;(window as any).uiReadyElementId = getSelectProfileReadyElementId()
+            } else if (this.authFlowState && this.authFlowState !== undefined) {
+                ;(window as any).uiState = 'reauth'
+                ;(window as any).uiReadyElementId = getReauthReadyElementId()
+            }
+
+            this.refreshKey += 1
+        },
+    },
+})
+
+// ---- START ---- The following handles the process of indicating the UI has loaded successfully.
+// TODO: Move this in to a reusable class for other webviews, it feels a bit messy here
+const didPageSetReady: { auth: boolean; selectProfile: boolean } = { auth: false, selectProfile: false }
+
+// Setup error handlers to report. This may not actually be able to catch certain errors that we'd expect,
+// so this may have to be revisited.
+window.onerror = function (message) {
+    const uiState = (window as any).uiState
+    const page: 'auth' | 'selectProfile' = uiState === 'login' || uiState === 'reauth' ? 'auth' : 'selectProfile'
+    if (didPageSetReady[page]) {
+        return
+    }
+
+    setUiReady((window as any).uiState, message.toString())
+}
+document.addEventListener(
+    'error',
+    (e) => {
+        const uiState = (window as any).uiState
+        const page: 'auth' | 'selectProfile' = uiState === 'login' || uiState === 'reauth' ? 'auth' : 'selectProfile'
+        if (didPageSetReady[page]) {
+            return
+        }
+
+        setUiReady((window as any).uiState, e.message)
+    },
+    true
+)
+
+let didLoad = false
+window.addEventListener('load', () => {
+    didLoad = true
+})
+const handleLoaded = () => {
+    // in case some unexpected behavior triggers this flow again, skip since we already emitted for this instance
+    const uiState = (window as any).uiState
+    const page: 'auth' | 'selectProfile' = uiState === 'login' || uiState === 'reauth' ? 'auth' : 'selectProfile'
+    if (didPageSetReady[page]) {
+        return
+    }
+
+    const foundElement = !!document.getElementById((window as any).uiReadyElementId)
+    if (!foundElement) {
+        setUiReady((window as any).uiState, `Could not find element: ${(window as any).uiReadyElementId}`)
+    } else {
+        // Successful load!
+        setUiReady((window as any).uiState)
+    }
+}
+const setUiReady = (state: 'login' | 'reauth' | 'selectProfile', errorMessage?: string) => {
+    client.setUiReady(state, errorMessage)
+
+    const page = state === 'selectProfile' ? 'selectProfile' : 'auth'
+    didPageSetReady[page] = true
+}
+// ---- END ----
+</script>
+<style>
+body {
+    /**
+     * Overriding the margin and padding defined by vscode
+     * https://github.com/microsoft/vscode/blame/54e0cddffb51553e76fb8d65474ba855c30621e8/src/vs/workbench/contrib/webview/browser/pre/index.html
+     */
+    padding: 0;
+}
+
+.body {
+    /* The container takes up the entire height of the screen */
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+    /* All items are centered horizontally */
+    align-items: center;
+}
+</style>
diff --git a/packages/core/src/login/webview/vue/selectableItem.vue b/packages/core/src/login/webview/vue/selectableItem.vue
new file mode 100644
index 00000000000..4e545cb5cea
--- /dev/null
+++ b/packages/core/src/login/webview/vue/selectableItem.vue
@@ -0,0 +1,211 @@
+<template>
+    <div
+        class="item-container-base"
+        tabindex="0"
+        :class="{ selected: isSelected, hovering: isHovering, focussed: isFocused }"
+        :title="itemTitle"
+        @blur="hideFocus"
+        @click="toggleSelection"
+        @focus="showFocus"
+        @keydown.enter="toggleSelection"
+        @mouseover="isHovering = true"
+        @mouseout="isHovering = false"
+    >
+        <div class="icon">
+            <svg
+                v-if="itemType === LoginOption.BUILDER_ID"
+                width="16"
+                height="16"
+                viewBox="0 0 16 16"
+                fill="none"
+                xmlns="http://www.w3.org/2000/svg"
+            >
+                <path
+                    class="svg-path"
+                    fill-rule="evenodd"
+                    clip-rule="evenodd"
+                    d="M8 2C6.68228 2 5.61 3.07228 5.61 4.39C5.61 5.70772 6.68228 6.78 8 6.78C9.31771 6.78 10.39 5.70772 10.39 4.39C10.39 3.07228 9.31772 2 8 2ZM3.61 4.39C3.61 1.96772 5.57771 0 8 0C10.4223 0 12.39 1.96771 12.39 4.39C12.39 5.66447 11.8453 6.81311 10.9762 7.61551C11.1666 7.71116 11.3535 7.81608 11.5368 7.93001C13.5215 9.15787 15 11.3598 15 14V15H1V14C1 11.147 2.63919 8.7213 4.99701 7.59061C4.14356 6.78943 3.61 5.65134 3.61 4.39ZM10.482 9.62922C9.71501 9.15233 8.88729 8.90797 8.00229 8.91L8 8.91C5.59623 8.91 3.5507 10.634 3.09474 13H12.8975C12.601 11.5742 11.6867 10.3744 10.484 9.63047L10.482 9.62922Z"
+                />
+            </svg>
+            <svg
+                v-if="itemType === LoginOption.ENTERPRISE_SSO"
+                width="16"
+                height="16"
+                viewBox="0 0 16 16"
+                fill="none"
+                xmlns="http://www.w3.org/2000/svg"
+            >
+                <path
+                    class="svg-path"
+                    fill-rule="evenodd"
+                    clip-rule="evenodd"
+                    d="M4 3C3.44772 3 3 3.44772 3 4C3 4.55229 3.44772 5 4 5C4.55228 5 5 4.55229 5 4C5 3.44772 4.55228 3 4 3ZM1 4C1 2.34315 2.34315 1 4 1C5.65685 1 7 2.34315 7 4C7 5.65676 5.65701 6.99984 4.00029 7C6.21244 7.00016 8 8.78781 8 11C8 8.78772 9.78771 7 12 7C14.2123 7 16 8.78772 16 11V14C16 14.5523 15.5523 15 15 15H9C8.44771 15 8 14.5523 8 14C8 14.5523 7.55228 15 7 15H1C0.447715 15 0 14.5523 0 14V11C0 8.78772 1.78801 7 4.00029 7C2.34344 7 1 5.65685 1 4ZM12 7C10.3431 7 9 5.65685 9 4C9 2.34315 10.3431 1 12 1C13.6569 1 15 2.34315 15 4C15 5.65685 13.6569 7 12 7ZM11 4C11 3.44772 11.4477 3 12 3C12.5523 3 13 3.44772 13 4C13 4.55229 12.5523 5 12 5C11.4477 5 11 4.55229 11 4ZM10 11C10 9.89228 10.8923 9 12 9C13.1077 9 14 9.89228 14 11V13H10V11ZM2 11C2 9.89228 2.89228 9 4 9C5.10772 9 6 9.89228 6 11V13H2V11Z"
+                />
+            </svg>
+            <svg
+                v-if="itemType === LoginOption.IAM_CREDENTIAL"
+                width="16"
+                height="16"
+                viewBox="0 0 16 16"
+                fill="none"
+                xmlns="http://www.w3.org/2000/svg"
+            >
+                <path
+                    class="svg-path"
+                    fill-rule="evenodd"
+                    clip-rule="evenodd"
+                    d="M10.0042 11C10.0042 11.009 10.002 11.0325 9.99974 11.0548L9.99979 11.0502L10 11L10 10.9993L9.99997 11L9.995 11.1L9.99652 11.0855L9.99974 11.0548C9.978 13.1703 8.62586 15.046 6.62064 15.7331C4.59789 16.4261 2.3583 15.7562 1.0483 14.0663C-0.261694 12.3764 -0.352147 10.0406 0.823246 8.25441C1.89701 6.62271 3.81005 5.77972 5.71121 6.05367L12.3412 0.24769C12.5235 0.0880192 12.7576 0 13 0H15C15.5523 0 16 0.447715 16 1V6C16 6.55228 15.5523 7 15 7H14V8C14 8.55229 13.5523 9 13 9H12V10C12 10.5523 11.5523 11 11 11H10.0042ZM13.376 2L6.65881 7.88231C6.41017 8.10005 6.07001 8.18087 5.75 8.09825C4.50783 7.77752 3.19918 8.28216 2.49395 9.35384C1.78871 10.4255 1.84298 11.827 2.62898 12.841C3.41498 13.8549 4.75873 14.2569 5.97239 13.841C7.18604 13.4252 8.00096 12.2837 8 11.0007L8.00502 10.9C8.03175 10.634 8.03175 10.366 8.00502 10.1C7.94583 9.51115 8.40818 9 9 9H10V8C10 7.44772 10.4477 7 11 7H12V6C12 5.44772 12.4477 5 13 5H14V2H13.376ZM6 10H4V12H6V10Z"
+                />
+            </svg>
+        </div>
+        <div class="text">
+            <div class="title">
+                {{ itemTitle }}
+                <template v-if="itemSubTitle">
+                    - <i>{{ itemSubTitle }}</i>
+                </template>
+            </div>
+            <div class="p" v-if="itemText" :title="itemText">{{ itemText }}</div>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+import { LoginOption } from './types'
+import { defineComponent } from 'vue'
+export default defineComponent({
+    name: 'SelectableItem',
+    components: {},
+    props: {
+        itemId: Number,
+        itemText: String,
+        itemTitle: String,
+        itemSubTitle: String,
+        itemType: Number,
+        isSelected: Boolean,
+        isHovering: Boolean,
+    },
+    data() {
+        return {
+            itemId: this.itemId,
+            itemTitle: this.itemTitle,
+            itemSubTitle: this.itemSubTitle,
+            itemText: this.itemText,
+            isSelected: this.isSelected,
+            isHovering: false,
+            isFocused: false,
+            LoginOption,
+        }
+    },
+    async created() {},
+    methods: {
+        toggleSelection() {
+            this.$emit('toggle', this.itemId)
+        },
+        hideFocus(event: Event) {
+            event.stopPropagation()
+            this.isFocused = false
+        },
+        showFocus(event: Event) {
+            event.stopPropagation()
+            if (!this.isHovering) {
+                this.isFocused = true
+            }
+        },
+    },
+})
+</script>
+
+<style scoped>
+.item-container-base {
+    display: flex;
+    border-width: 1px;
+    border-style: solid;
+    border-color: #625f5f;
+    user-select: none;
+    /* Some items do not have itemText, so we need a consistent height for all items */
+    height: 50px;
+    position: relative;
+}
+.item-container-base.focussed::before {
+    content: attr(title);
+    cursor: default;
+    display: block;
+    font-size: var(--font-size-sm);
+    height: auto;
+    max-width: 130px;
+    padding: 5px;
+    position: absolute;
+    right: 0;
+    transform: translate(0, -100%);
+    word-break: break-all;
+}
+
+.vscode-dark .item-container-base.focussed:before,
+body.vscode-high-contrast:not(body.vscode-high-contrast-light) .item-container-base.focussed:before {
+    background-color: white;
+    color: rgba(0, 0, 0, 0.8);
+}
+.vscode-light .item-container-base.focussed:before,
+body.vscode-high-contrast-light .item-container-base.focussed:before {
+    background-color: rgba(255, 255, 255, 0.8);
+    color: black;
+}
+
+.hovering {
+    border-color: #0e639c;
+}
+
+.selected {
+    border-color: #3675f4;
+}
+
+.title {
+    font-size: var(--font-size-base);
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    margin-bottom: 0.2rem;
+}
+
+.p {
+    font-weight: var(--font-size-base);
+    margin-top: 0.2rem;
+    text-align: justify;
+}
+
+.text {
+    display: flex;
+    flex-direction: column;
+    font-size: var(--font-size-sm);
+    justify-content: center;
+    overflow: hidden;
+}
+
+.vscode-dark .text {
+    color: white;
+}
+.vscode-light .text {
+    color: black;
+}
+.icon {
+    padding-left: 8px;
+    padding-right: 11px;
+    display: flex;
+    align-items: center;
+}
+.vscode-dark .icon .svg-path,
+body.vscode-high-contrast:not(body.vscode-high-contrast-light) .icon .svg-path {
+    fill: white;
+}
+.vscode-light .icon .svg-path,
+body.vscode-high-contrast-light .icon .svg-path {
+    fill: black;
+}
+
+.item-container-base .text .p {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+</style>
diff --git a/packages/core/src/login/webview/vue/toolkit/backend_toolkit.ts b/packages/core/src/login/webview/vue/toolkit/backend_toolkit.ts
new file mode 100644
index 00000000000..f6a80d8c3c2
--- /dev/null
+++ b/packages/core/src/login/webview/vue/toolkit/backend_toolkit.ts
@@ -0,0 +1,195 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { tryAddCredentials } from '../../../../auth/utils'
+import { getLogger } from '../../../../shared/logger/logger'
+import { CommonAuthWebview } from '../backend'
+import {
+    AwsConnection,
+    Connection,
+    SsoConnection,
+    TelemetryMetadata,
+    createSsoProfile,
+    getTelemetryMetadataForConn,
+    isSsoConnection,
+} from '../../../../auth/connection'
+import { Auth } from '../../../../auth/auth'
+import { CodeCatalystAuthenticationProvider } from '../../../../codecatalyst/auth'
+import { AuthError, AuthFlowState } from '../types'
+import { setContext } from '../../../../shared/vscode/setContext'
+import { builderIdStartUrl } from '../../../../auth/sso/constants'
+import { RegionProfile } from '../../../../codewhisperer/models/model'
+import { ProfileSwitchIntent } from '../../../../codewhisperer/region/regionProfileManager'
+import globals from '../../../../shared/extensionGlobals'
+
+export class ToolkitLoginWebview extends CommonAuthWebview {
+    public override id: string = 'aws.toolkit.AmazonCommonAuth'
+    public static sourcePath: string = 'vue/src/login/webview/vue/toolkit/index.js'
+    public override supportsLoadTelemetry: boolean = true
+    private isCodeCatalystLogin = false
+
+    override onActiveConnectionModified: vscode.EventEmitter<void> = new vscode.EventEmitter()
+
+    constructor(private readonly codeCatalystAuth: CodeCatalystAuthenticationProvider) {
+        super(ToolkitLoginWebview.sourcePath)
+    }
+
+    setLoginService(serviceToShow?: string) {
+        this.isCodeCatalystLogin = serviceToShow === 'codecatalyst'
+    }
+
+    async startEnterpriseSetup(startUrl: string, region: string): Promise<AuthError | undefined> {
+        getLogger().debug(`called startEnterpriseSetup() with startUrl: '${startUrl}', region: '${region}'`)
+        const metadata: TelemetryMetadata = {
+            credentialSourceId: 'iamIdentityCenter',
+            credentialStartUrl: startUrl,
+            isReAuth: false,
+        }
+        await globals.globalState.update('recentSso', {
+            startUrl: startUrl,
+            region: region,
+        })
+
+        if (this.isCodeCatalystLogin) {
+            return this.ssoSetup('startCodeCatalystSSOSetup', async () => {
+                this.storeMetricMetadata({ ...metadata })
+
+                const conn = await this.codeCatalystAuth.connectToEnterpriseSso(startUrl, region)
+                this.storeMetricMetadata({
+                    authEnabledFeatures: this.getAuthEnabledFeatures(conn),
+                    ...(await getTelemetryMetadataForConn(conn)),
+                })
+
+                await setContext('aws.explorer.showAuthView', false)
+                await this.showResourceExplorer()
+            })
+        }
+
+        return this.ssoSetup('createIdentityCenterConnection', async () => {
+            this.storeMetricMetadata({ ...metadata })
+
+            const ssoProfile = createSsoProfile(startUrl, region)
+            const conn = await Auth.instance.createConnection(ssoProfile)
+            await Auth.instance.useConnection(conn)
+
+            this.storeMetricMetadata({
+                authEnabledFeatures: this.getAuthEnabledFeatures(conn),
+                ...(await getTelemetryMetadataForConn(conn)),
+            })
+
+            await setContext('aws.explorer.showAuthView', false)
+            void vscode.window.showInformationMessage('Toolkit: Successfully connected to AWS IAM Identity Center')
+            void this.showResourceExplorer()
+        })
+    }
+
+    async startIamCredentialSetup(
+        profileName: string,
+        accessKey: string,
+        secretKey: string
+    ): Promise<AuthError | undefined> {
+        getLogger().debug(`called startIamCredentialSetup()`)
+        // See submitData() in manageCredentials.vue
+        const runAuth = async () => {
+            const data = { aws_access_key_id: accessKey, aws_secret_access_key: secretKey }
+            const error = await this.getAuthenticatedCredentialsError(data)
+            if (error) {
+                return { id: this.id, text: error.error }
+            }
+            try {
+                await tryAddCredentials(profileName, data, true)
+                await setContext('aws.explorer.showAuthView', false)
+                await this.showResourceExplorer()
+            } catch (e) {
+                getLogger().error('Failed submitting credentials %O', e)
+                return { id: this.id, text: e as string }
+            }
+        }
+
+        const result = await runAuth()
+        this.storeMetricMetadata({
+            credentialSourceId: 'sharedCredentials',
+            authEnabledFeatures: 'awsExplorer',
+            ...this.getResultForMetrics(result),
+        })
+        this.emitAuthMetric()
+
+        return result
+    }
+
+    async startBuilderIdSetup(): Promise<AuthError | undefined> {
+        getLogger().debug(`called startBuilderIdSetup()`)
+        return this.ssoSetup('startCodeCatalystBuilderIdSetup', async () => {
+            this.storeMetricMetadata({
+                credentialSourceId: 'awsId',
+                authEnabledFeatures: 'codecatalyst',
+                isReAuth: false,
+            })
+
+            const conn = await this.codeCatalystAuth.connectToAwsBuilderId()
+            this.storeMetricMetadata(await getTelemetryMetadataForConn(conn))
+
+            await setContext('aws.explorer.showAuthView', false)
+            await this.showResourceExplorer()
+        })
+    }
+
+    /**
+     * Returns list of connections that are pushed from other extensions to Toolkit
+     */
+    async fetchConnections(): Promise<AwsConnection[] | undefined> {
+        const connections: AwsConnection[] = []
+        for (const conn of Auth.instance.declaredConnections) {
+            // No need to display Builder ID as an existing connection,
+            // users can just select the Builder ID login option and it would have the same effect.
+            if (conn.startUrl !== builderIdStartUrl) {
+                connections.push({
+                    ssoRegion: conn.ssoRegion,
+                    startUrl: conn.startUrl,
+                } as AwsConnection)
+            }
+        }
+        return connections
+    }
+
+    async listSsoConnections(): Promise<SsoConnection[]> {
+        return (await Auth.instance.listConnections()).filter((conn) => isSsoConnection(conn)) as SsoConnection[]
+    }
+
+    override reauthenticateConnection(): Promise<undefined> {
+        throw new Error('Method not implemented.')
+    }
+    override getActiveConnection(): Promise<Connection | undefined> {
+        throw new Error('Method not implemented.')
+    }
+
+    override async refreshAuthState(): Promise<void> {}
+    override async getAuthState(): Promise<AuthFlowState> {
+        // No need for a reauth page yet, so always show login
+        return 'LOGIN'
+    }
+
+    override signout(): Promise<void> {
+        throw new Error('Method not implemented.')
+    }
+
+    override getReauthError(): Promise<AuthError | undefined> {
+        throw new Error('Method not implemented.')
+    }
+
+    async quitLoginScreen() {
+        await setContext('aws.explorer.showAuthView', false)
+        await this.showResourceExplorer()
+    }
+
+    override listRegionProfiles(): Promise<RegionProfile[] | string> {
+        throw new Error('Method not implemented')
+    }
+
+    override selectRegionProfile(profile: RegionProfile, source: ProfileSwitchIntent): Promise<void> {
+        throw new Error('Method not implemented')
+    }
+}
diff --git a/packages/core/src/login/webview/vue/toolkit/index.ts b/packages/core/src/login/webview/vue/toolkit/index.ts
new file mode 100644
index 00000000000..34fbbedb8c9
--- /dev/null
+++ b/packages/core/src/login/webview/vue/toolkit/index.ts
@@ -0,0 +1,21 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * This module is run within the webview, and will mount the Vue app.
+ */
+
+import { createApp } from 'vue'
+import component from '../root.vue'
+
+const create = () =>
+    createApp(component, {
+        app: 'TOOLKIT',
+    })
+const app = create()
+
+app.mount('#vue-app')
+window.addEventListener('remount', () => {
+    app.unmount()
+    create().mount('#vue-app')
+})
diff --git a/packages/core/src/login/webview/vue/types.ts b/packages/core/src/login/webview/vue/types.ts
new file mode 100644
index 00000000000..c4203dcbe18
--- /dev/null
+++ b/packages/core/src/login/webview/vue/types.ts
@@ -0,0 +1,85 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Types that can be used by both the backend and frontend files
+ */
+
+/**
+ * The identifiers for the different features that use Auth.
+ *
+ * These are important as they represent the specific feature for all parts of the
+ * auth sign setup flows.
+ */
+export const FeatureIds = {
+    TOOLKIT: 'TOOLKIT',
+    AMAZONQ: 'AMAZONQ',
+} as const
+export type FeatureId = (typeof FeatureIds)[keyof typeof FeatureIds]
+
+/**
+ * The type of Auth flows that the user could see.
+ */
+export const AuthFlowStates = {
+    /** User needs to select/setup a connection */
+    LOGIN: 'LOGIN',
+    /**  User has a connection but just needs to reauthenticate it */
+    REAUTHNEEDED: 'REAUTHNEEDED',
+    /**  Reauthentication is currently in progress */
+    REAUTHENTICATING: 'REAUTHENTICATING',
+    PENDING_PROFILE_SELECTION: 'PENDING_PROFILE_SELECTION',
+} as const
+export type AuthFlowState = (typeof AuthFlowStates)[keyof typeof AuthFlowStates]
+
+export enum LoginOption {
+    NONE,
+    BUILDER_ID,
+    ENTERPRISE_SSO,
+    IAM_CREDENTIAL,
+    IMPORTED_LOGINS,
+}
+
+/**
+ * 'elementId' for auth telemetry
+ */
+export type AuthUiClick =
+    | 'auth_backButton'
+    | 'auth_cancelButton'
+    | 'auth_reauthCancelButton'
+    | 'auth_continueButton'
+    | 'auth_idcOption'
+    | 'auth_builderIdOption'
+    | 'auth_credentialsOption'
+    | 'auth_codecatalystOption'
+    | 'auth_existingAuthOption'
+    | 'auth_regionSelection'
+    | 'auth_codeCatalystSignIn'
+    | 'auth_toolkitCloseButton'
+    | 'auth_reauthenticate'
+    | 'auth_signout'
+    | 'auth_helpLink'
+    | 'amazonq_switchToQSignIn'
+
+export const userCancelled = 'userCancelled'
+
+export type AuthEnabledFeatures = 'awsExplorer' | 'codewhisperer' | 'codecatalyst'
+
+export type AuthError = { id: string; text: string }
+
+export type ServiceItemId = 'awsExplorer' | 'codewhisperer' | 'codecatalyst'
+export function isServiceItemId(value: unknown): value is ServiceItemId {
+    return (
+        typeof value === 'string' && (value === 'awsExplorer' || value === 'codewhisperer' || value === 'codecatalyst')
+    )
+}
+
+export type AuthFormId =
+    | 'credentials'
+    | 'builderIdCodeWhisperer'
+    | 'builderIdCodeCatalyst'
+    | 'identityCenterCodeWhisperer'
+    | 'identityCenterCodeCatalyst'
+    | 'identityCenterExplorer'
+    | 'unknown'
diff --git a/packages/core/src/notifications/activation.ts b/packages/core/src/notifications/activation.ts
new file mode 100644
index 00000000000..152f6e1ab62
--- /dev/null
+++ b/packages/core/src/notifications/activation.ts
@@ -0,0 +1,53 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { DevSettings } from '../shared/settings'
+import { DevFetcher, NotificationsController, RemoteFetcher } from './controller'
+import { NotificationsNode } from './panelNode'
+import { getRuleContext } from './rules'
+import globals from '../shared/extensionGlobals'
+import { AuthState } from './types'
+import { getLogger } from '../shared/logger/logger'
+import { oneMinute } from '../shared/datetime'
+
+const logger = getLogger('notifications')
+
+/** Time in MS to poll for emergency notifications */
+const emergencyPollTime = oneMinute * 10
+
+/**
+ * Activate the in-IDE notifications module and begin receiving notifications.
+ *
+ * @param context extension context
+ * @param initialState initial auth state
+ * @param authStateFn fn to get current auth state
+ */
+export async function activate(context: vscode.ExtensionContext, authStateFn: () => Promise<AuthState>) {
+    try {
+        const panelNode = NotificationsNode.instance
+        panelNode.registerView(context)
+
+        const controller = new NotificationsController(
+            panelNode,
+            async () => await getRuleContext(context, await authStateFn()),
+            DevSettings.instance.isDevMode() ? new DevFetcher() : new RemoteFetcher()
+        )
+
+        await controller.pollForStartUp()
+        await controller.pollForEmergencies()
+
+        globals.clock.setInterval(
+            async () => {
+                await controller.pollForEmergencies()
+            },
+            DevSettings.instance.get('notificationsPollInterval', emergencyPollTime)
+        )
+
+        logger.debug('Activated in-IDE notifications polling module')
+    } catch (err) {
+        logger.error('Failed to activate in-IDE notifications module.')
+    }
+}
diff --git a/packages/core/src/notifications/controller.ts b/packages/core/src/notifications/controller.ts
new file mode 100644
index 00000000000..41ec81f8500
--- /dev/null
+++ b/packages/core/src/notifications/controller.ts
@@ -0,0 +1,386 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { ToolkitError } from '../shared/errors'
+import globals from '../shared/extensionGlobals'
+import { globalKey } from '../shared/globalState'
+import {
+    defaultNotificationsState,
+    DevNotificationsState,
+    getNotificationTelemetryId,
+    Notifications,
+    NotificationsState,
+    NotificationsStateConstructor,
+    NotificationType,
+    RuleContext,
+    ToolkitNotification,
+} from './types'
+import { HttpResourceFetcher } from '../shared/resourcefetcher/httpResourceFetcher'
+import { getLogger } from '../shared/logger/logger'
+import { NotificationsNode } from './panelNode'
+import { Commands } from '../shared/vscode/commands2'
+import { RuleEngine } from './rules'
+import { TreeNode } from '../shared/treeview/resourceTreeDataProvider'
+import { FileResourceFetcher } from '../shared/resourcefetcher/fileResourceFetcher'
+import { isAmazonQ } from '../shared/extensionUtilities'
+import { telemetry } from '../shared/telemetry/telemetry'
+import { randomUUID } from '../shared/crypto'
+import { waitUntil } from '../shared/utilities/timeoutUtils'
+
+const logger = getLogger('notifications')
+
+/**
+ * Handles fetching and maintaining the state of in-IDE notifications.
+ * Notifications are constantly polled from a known endpoint and then stored in global state.
+ * The global state is used to compare if there are a change in notifications on the endpoint
+ * or if the endpoint is not reachable.
+ *
+ * This class will send any notifications to {@link NotificationsNode} for display.
+ * Notifications can be dismissed.
+ *
+ * Startup notifications - fetched each start up.
+ * Emergency notifications - fetched at a regular interval.
+ */
+export class NotificationsController {
+    /** Internal memory state that is written to global state upon modification. */
+    private state: NotificationsState
+
+    static #instance: NotificationsController | undefined
+
+    constructor(
+        private readonly notificationsNode: NotificationsNode,
+        private readonly ruleContextFn: () => Promise<RuleContext>,
+        private readonly fetcher: NotificationFetcher = new RemoteFetcher(),
+        public readonly storageKey: globalKey = 'aws.notifications'
+    ) {
+        if (!NotificationsController.#instance) {
+            // Register on first creation only.
+            registerDismissCommand()
+        }
+        NotificationsController.#instance = this
+
+        this.state = this.getDefaultState()
+    }
+
+    public reset() {
+        this.state = defaultNotificationsState()
+        return this.writeState().then(() => this.displayNotifications())
+    }
+
+    public pollForStartUp() {
+        return this.poll('startUp')
+    }
+
+    public pollForEmergencies() {
+        return this.poll('emergency')
+    }
+
+    private async poll(category: NotificationType) {
+        try {
+            // Get latest state in case it was modified by other windows.
+            // It is a minimal read to avoid race conditions.
+            this.readState()
+            await this.fetchNotifications(category)
+        } catch (err: any) {
+            logger.error(`Unable to fetch %s notifications: %s`, category, err)
+        }
+
+        await this.displayNotifications()
+    }
+
+    private async displayNotifications() {
+        const ruleEngine = new RuleEngine(await this.ruleContextFn())
+        const dismissed = new Set(this.state.dismissed)
+        const startUp =
+            this.state.startUp.payload?.notifications.filter(
+                (n) => !dismissed.has(n.id) && ruleEngine.shouldDisplayNotification(n)
+            ) ?? []
+        const emergency = (this.state.emergency.payload?.notifications ?? []).filter((n) =>
+            ruleEngine.shouldDisplayNotification(n)
+        )
+
+        await NotificationsNode.instance.setNotifications(startUp, emergency)
+
+        // Process on-receive behavior for newly received notifications that passes rule engine
+        const wasNewlyReceived = (n: ToolkitNotification) => this.state.newlyReceived.includes(n.id)
+        const newStartUp = startUp.filter(wasNewlyReceived)
+        const newEmergency = emergency.filter(wasNewlyReceived)
+        const newlyReceived = [...newStartUp, ...newEmergency]
+
+        if (newlyReceived.length > 0) {
+            await this.notificationsNode.onReceiveNotifications(newlyReceived)
+            // remove displayed notifications from newlyReceived
+            this.state.newlyReceived = this.state.newlyReceived.filter((id) => !newlyReceived.some((n) => n.id === id))
+            await this.writeState()
+            if (newEmergency.length > 0) {
+                void this.notificationsNode.focusPanel()
+            }
+        }
+    }
+
+    /**
+     * Permanently hides a notification from view. Only 'startUp' notifications can be dismissed.
+     * Users are able to collapse or hide the notifications panel in native VSC if they want to
+     * hide all notifications.
+     */
+    public async dismissNotification(notificationId: string) {
+        logger.debug('Dismissing notification: %s', notificationId)
+
+        this.readState() // Don't overwrite dismissals from other windows
+        this.state.dismissed.push(notificationId)
+        await this.writeState()
+
+        await NotificationsNode.instance.dismissStartUpNotification(notificationId)
+    }
+
+    /**
+     * Fetch notifications from the endpoint and store them in the global state.
+     */
+    private async fetchNotifications(category: NotificationType) {
+        const response = await this.fetcher.fetch(category, this.state[category].eTag)
+        if (!response.content) {
+            logger.verbose('No new notifications for category: %s', category)
+            return
+        }
+        // Parse the notifications
+        const newPayload: Notifications = JSON.parse(response.content)
+        const newNotifications = newPayload.notifications ?? []
+
+        // Get the current notifications
+        const currentNotifications = this.state[category].payload?.notifications ?? []
+        const currentNotificationIds = new Set(currentNotifications.map((n: any) => n.id))
+
+        // Compare and find if there's any notifications newly added
+        const addedNotifications = newNotifications.filter((n: any) => !currentNotificationIds.has(n.id))
+
+        if (addedNotifications.length > 0) {
+            logger.verbose(
+                'New notifications received for category %s, ids: %s',
+                category,
+                addedNotifications.map((n: any) => n.id).join(', ')
+            )
+            this.state.newlyReceived.push(...addedNotifications.map((n: any) => n.id))
+        }
+
+        this.state[category].payload = newPayload
+        this.state[category].eTag = response.eTag
+        await this.writeState()
+
+        logger.verbose(
+            "Fetched notifications JSON for category '%s' with schema version: %s. There were %d notifications.",
+            category,
+            this.state[category].payload?.schemaVersion,
+            this.state[category].payload?.notifications?.length
+        )
+    }
+
+    /**
+     * Write the latest memory state to global state.
+     */
+    private async writeState() {
+        logger.debug('NotificationsController: Updating notifications state at %s', this.storageKey)
+
+        // Clean out anything in 'dismissed' that doesn't exist anymore.
+        const notifications = new Set(
+            [
+                ...(this.state.startUp.payload?.notifications ?? []),
+                ...(this.state.emergency.payload?.notifications ?? []),
+            ].map((n) => n.id)
+        )
+        this.state.dismissed = this.state.dismissed.filter((id) => notifications.has(id))
+
+        await globals.globalState.update(this.storageKey, this.state)
+    }
+
+    /**
+     * Read relevant values from the latest global state to memory. Useful to bring changes from other windows.
+     *
+     * Currently only brings dismissed, so users with multiple vscode instances open do not have issues with
+     * dismissing notifications multiple times. Otherwise, each instance has an independent session for
+     * displaying the notifications (e.g. multiple windows can be blocked in critical emergencies).
+     *
+     * Note: This sort of pattern (reading back and forth from global state in async functions) is prone to
+     * race conditions, which is why we limit the read to the fairly inconsequential `dismissed` property.
+     */
+    private readState() {
+        const state = this.getDefaultState()
+        this.state.dismissed = [...new Set([...this.state.dismissed, ...state.dismissed])]
+    }
+
+    /**
+     * Returns stored notification state, or a default state object if it is invalid or undefined.
+     */
+    private getDefaultState() {
+        return globals.globalState.tryGet<NotificationsState>(
+            this.storageKey,
+            NotificationsStateConstructor,
+            defaultNotificationsState()
+        )
+    }
+
+    static get instance() {
+        if (this.#instance === undefined) {
+            throw new ToolkitError('NotificationsController was accessed before it has been initialized.')
+        }
+
+        return this.#instance
+    }
+}
+
+function registerDismissCommand() {
+    const name = isAmazonQ() ? '_aws.amazonq.notifications.dismiss' : '_aws.toolkit.notifications.dismiss'
+
+    globals.context.subscriptions.push(
+        Commands.register(name, async (node: TreeNode) => {
+            const item = node?.getTreeItem()
+            if (item instanceof vscode.TreeItem && item.command?.arguments) {
+                // The command used to build the TreeNode contains the notification as an argument.
+                /** See {@link NotificationsNode} for more info. */
+                const notification = item.command?.arguments[0] as ToolkitNotification
+
+                await telemetry.ui_click.run(async (span) => {
+                    span.record({ elementId: `${getNotificationTelemetryId(notification)}:DISMISS` })
+                    await NotificationsController.instance.dismissNotification(notification.id)
+                })
+            } else {
+                logger.error(`${name}: Cannot dismiss notification: item is not a vscode.TreeItem`)
+            }
+        })
+    )
+}
+
+export type ResourceResponse = Awaited<ReturnType<HttpResourceFetcher['getNewETagContent']>>
+
+export interface NotificationFetcher {
+    /**
+     * Fetch notifications from some source. If there is no (new) data to fetch, then the response's
+     * content value will be undefined.
+     *
+     * @param type typeof NotificationType
+     * @param versionTag last known version of the data aka ETAG. Can be used to determine if the data changed.
+     */
+    fetch(type: NotificationType, versionTag?: string): Promise<ResourceResponse>
+}
+
+export class RemoteFetcher implements NotificationFetcher {
+    public static readonly retryIntervalMs = 30000
+    public static readonly retryTimeout = RemoteFetcher.retryIntervalMs * 5
+
+    private readonly startUpEndpoint: string =
+        'https://idetoolkits-hostedfiles.amazonaws.com/Notifications/VSCode/startup/1.x.json'
+    private readonly emergencyEndpoint: string =
+        'https://idetoolkits-hostedfiles.amazonaws.com/Notifications/VSCode/emergency/1.x.json'
+
+    constructor(startUpPath?: string, emergencyPath?: string) {
+        this.startUpEndpoint = startUpPath ?? this.startUpEndpoint
+        this.emergencyEndpoint = emergencyPath ?? this.emergencyEndpoint
+    }
+
+    fetch(category: NotificationType, versionTag?: string): Promise<ResourceResponse> {
+        const endpoint = category === 'startUp' ? this.startUpEndpoint : this.emergencyEndpoint
+        const fetcher = new HttpResourceFetcher(endpoint, {
+            showUrl: true,
+        })
+        logger.verbose('Attempting to fetch notifications for category: %s at endpoint: %s', category, endpoint)
+
+        return waitUntil(
+            async () => {
+                try {
+                    return await fetcher.getNewETagContent(versionTag)
+                } catch (err) {
+                    logger.error('Failed to fetch at endpoint: %s, err: %s', endpoint, err)
+                    throw err
+                }
+            },
+            {
+                interval: RemoteFetcher.retryIntervalMs,
+                timeout: RemoteFetcher.retryTimeout,
+                retryOnFail: true,
+                // No exponential backoff - necessary?
+            }
+        )
+    }
+}
+
+/**
+ * Can be used when developing locally. This may be expanded at some point to allow notifications
+ * to be published via github rather than internally.
+ *
+ * versionTag (ETAG) is ignored.
+ */
+export class LocalFetcher implements NotificationFetcher {
+    // Paths relative to running extension root folder (e.g. packages/amazonq/).
+    private readonly startUpLocalPath: string = '../core/src/test/notifications/resources/startup/1.x.json'
+    private readonly emergencyLocalPath: string = '../core/src/test/notifications/resources/emergency/1.x.json'
+
+    constructor(startUpPath?: string, emergencyPath?: string) {
+        this.startUpLocalPath = startUpPath ?? this.startUpLocalPath
+        this.emergencyLocalPath = emergencyPath ?? this.emergencyLocalPath
+    }
+
+    async fetch(category: NotificationType, versionTag?: string): Promise<ResourceResponse> {
+        const uri = category === 'startUp' ? this.startUpLocalPath : this.emergencyLocalPath
+        logger.verbose('Attempting to fetch notifications locally for category: %s at path: %s', category, uri)
+
+        return {
+            content: await new FileResourceFetcher(globals.context.asAbsolutePath(uri)).get(),
+            eTag: 'LOCAL_PATH',
+        }
+    }
+}
+
+/**
+ * Fetches notifications from global state for local testing and verification. It is
+ * an extension of the RemoteFetcher so that devs can still see public notifications
+ * while testing (or while not testing, but they left dev mode on).
+ *
+ * Usage:
+ *   1. Enable dev mode: set `"aws.dev.forceDevMode": true` in your settings.
+ *   2. Open the extension Developer menu.
+ *   3. (optional) Reset the current notification state via the "Reset feature state" option.
+ *   4. Add notifications to the payload via the `Notifications: Edit Notifications` option.
+ *   5. Save to send the notification.
+ *
+ * Save to receive these notifications AND ALSO fetch from the public endpoint.
+ */
+export class DevFetcher extends RemoteFetcher implements NotificationFetcher {
+    constructor(public readonly storageKey: globalKey = 'aws.notifications.dev') {
+        super()
+    }
+
+    override async fetch(category: NotificationType, versionTag?: string): Promise<ResourceResponse> {
+        logger.debug('DevFetcher: Fetching notifications in dev mode for category: %s', category)
+
+        // Fetch the notifications that are currently released to users. Ignore eTag so that the
+        // complete current set of notifications is always returned to devs.
+        const data = await super.fetch(category, undefined)
+
+        const devNotifications: DevNotificationsState | undefined = await globals.globalState.getStrict(
+            this.storageKey,
+            Object
+        )
+
+        if (devNotifications && devNotifications[category] && devNotifications[category].length > 0) {
+            const content: Notifications = data.content
+                ? JSON.parse(data.content)
+                : { notifications: [], schemaVersion: 'devmode' }
+
+            // Give each dev notification a unique ID so the dev doesn't have to keep track of them.
+            content.notifications.push(
+                ...devNotifications[category].map((n) => {
+                    return { ...n, id: `${n.id ?? 'no-id'}_${randomUUID()}` }
+                })
+            )
+
+            return {
+                content: JSON.stringify(content),
+                eTag: data.eTag,
+            }
+        }
+
+        return data
+    }
+}
diff --git a/packages/core/src/notifications/index.ts b/packages/core/src/notifications/index.ts
new file mode 100644
index 00000000000..8e3c6066f88
--- /dev/null
+++ b/packages/core/src/notifications/index.ts
@@ -0,0 +1,7 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export { activate } from './activation'
+export * from './controller'
diff --git a/packages/core/src/notifications/panelNode.ts b/packages/core/src/notifications/panelNode.ts
new file mode 100644
index 00000000000..70a69873ee3
--- /dev/null
+++ b/packages/core/src/notifications/panelNode.ts
@@ -0,0 +1,321 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+import { ResourceTreeDataProvider, TreeNode } from '../shared/treeview/resourceTreeDataProvider'
+import { Command, Commands } from '../shared/vscode/commands2'
+import { Icon, getIcon } from '../shared/icons'
+import { contextKey, setContext } from '../shared/vscode/setContext'
+import { NotificationType, OnReceiveType, ToolkitNotification, getNotificationTelemetryId } from './types'
+import { ToolkitError } from '../shared/errors'
+import { isAmazonQ } from '../shared/extensionUtilities'
+import { getLogger } from '../shared/logger/logger'
+import { registerToolView } from '../awsexplorer/activationShared'
+import { readonlyDocument } from '../shared/utilities/textDocumentUtilities'
+import { openUrl } from '../shared/utilities/vsCodeUtils'
+import { telemetry } from '../shared/telemetry/telemetry'
+import globals from '../shared/extensionGlobals'
+
+const localize = nls.loadMessageBundle()
+const logger = getLogger('notifications')
+
+/**
+ * Controls the "Notifications" side panel/tree in each extension. It takes purely UX actions
+ * and does not determine what notifications to dispaly or how to fetch and store them.
+ */
+export class NotificationsNode implements TreeNode {
+    public static readonly title = localize('AWS.notifications.title', 'Notifications')
+
+    public readonly id = 'notifications'
+    public readonly resource = this
+    public provider?: ResourceTreeDataProvider
+    public startUpNotifications: ToolkitNotification[] = []
+    public emergencyNotifications: ToolkitNotification[] = []
+
+    /** Command executed when a notification item is clicked on in the panel. */
+    private readonly openNotificationCmd: Command
+    private readonly focusCmdStr: string
+    private readonly showContextStr: contextKey
+    private readonly startUpNodeContext: string
+    private readonly emergencyNodeContext: string
+    private view: vscode.TreeView<TreeNode> | undefined
+
+    static #instance: NotificationsNode
+
+    private constructor() {
+        this.openNotificationCmd = Commands.register(
+            isAmazonQ() ? '_aws.amazonq.notifications.open' : '_aws.toolkit.notifications.open',
+            (n: ToolkitNotification) => {
+                return telemetry.ui_click.run((span) => {
+                    span.record({ elementId: getNotificationTelemetryId(n) })
+                    return this.openNotification(n)
+                })
+            }
+        )
+
+        if (isAmazonQ()) {
+            this.focusCmdStr = 'aws.amazonq.notifications.focus'
+            this.showContextStr = 'aws.amazonq.notifications.show'
+            this.startUpNodeContext = 'amazonqNotificationStartUp'
+            this.emergencyNodeContext = 'amazonqNotificationEmergency'
+        } else {
+            this.focusCmdStr = 'aws.toolkit.notifications.focus'
+            this.showContextStr = 'aws.toolkit.notifications.show'
+            this.startUpNodeContext = 'toolkitNotificationStartUp'
+            this.emergencyNodeContext = 'toolkitNotificationEmergency'
+        }
+    }
+
+    public getTreeItem() {
+        const item = new vscode.TreeItem(NotificationsNode.title)
+        item.collapsibleState = vscode.TreeItemCollapsibleState.Collapsed
+        item.contextValue = 'notifications'
+
+        return item
+    }
+
+    public refresh() {
+        const totalNotifications = this.notificationCount()
+        if (this.view) {
+            if (totalNotifications > 0) {
+                this.view.badge = {
+                    tooltip: `${totalNotifications} notification${totalNotifications > 1 ? 's' : ''}`,
+                    value: totalNotifications,
+                }
+                this.view.title = `${NotificationsNode.title} (${totalNotifications})`
+            } else {
+                this.view.badge = undefined
+                this.view.title = NotificationsNode.title
+            }
+        } else {
+            logger.warn('NotificationsNode was refreshed but the view was not initialized!')
+        }
+
+        this.provider?.refresh()
+        return setContext(this.showContextStr, totalNotifications > 0)
+    }
+
+    public getChildren() {
+        const buildNode = (n: ToolkitNotification, type: NotificationType) => {
+            const icon: Icon =
+                type === 'emergency'
+                    ? Object.assign(getIcon('vscode-alert') as Icon, {
+                          color: new vscode.ThemeColor('errorForeground'),
+                      })
+                    : (getIcon('vscode-question') as Icon)
+
+            const title = n.uiRenderInstructions.content['en-US'].title
+            return this.openNotificationCmd.build(n).asTreeNode({
+                label: title,
+                tooltip: title,
+                iconPath: icon,
+                contextValue: type === 'startUp' ? this.startUpNodeContext : this.emergencyNodeContext,
+            })
+        }
+
+        return [
+            ...this.emergencyNotifications.map((n) => buildNode(n, 'emergency')),
+            ...this.startUpNotifications.map((n) => buildNode(n, 'startUp')),
+        ]
+    }
+
+    /**
+     * Sets the current list of notifications. Nodes are generated for each notification.
+     * No other processing is done, see NotificationController.
+     */
+    public async setNotifications(startUp: ToolkitNotification[], emergency: ToolkitNotification[]) {
+        this.startUpNotifications = startUp
+        this.emergencyNotifications = emergency
+        await this.refresh()
+    }
+
+    /**
+     * Deletes a notification node from the panel. This is purely a UX action - nothing happens
+     * to the notification on the backend via this function.
+     *
+     * Only dismisses startup notifications.
+     */
+    public async dismissStartUpNotification(id: string) {
+        this.startUpNotifications = this.startUpNotifications.filter((n) => n.id !== id)
+        await this.refresh()
+    }
+
+    /**
+     * Will uncollapse/unhide the notifications panel from view and focus it.
+     */
+    public focusPanel() {
+        return vscode.commands.executeCommand(this.focusCmdStr)
+    }
+
+    private notificationCount() {
+        return this.startUpNotifications.length + this.emergencyNotifications.length
+    }
+
+    /**
+     * Fired when a notification is clicked on in the panel. It will run any rendering
+     * instructions included in the notification. See {@link ToolkitNotification.uiRenderInstructions}.
+     */
+    public async openNotification(notification: ToolkitNotification) {
+        const onClickType = notification.uiRenderInstructions.onClick.type
+        switch (onClickType) {
+            case 'modal':
+                // Render blocking modal
+                logger.verbose(`rendering modal for notificaiton: ${notification.id} ...`)
+                await this.showInformationWindow(notification, 'modal', false)
+                break
+            case 'openUrl':
+                // Show open url option
+                if (!notification.uiRenderInstructions.onClick.url) {
+                    throw new ToolkitError('No url provided for onclick open url')
+                }
+                logger.verbose(`opening url for notification: ${notification.id} ...`)
+                await openUrl(
+                    vscode.Uri.parse(notification.uiRenderInstructions.onClick.url),
+                    getNotificationTelemetryId(notification)
+                )
+                break
+            case 'openTextDocument':
+                // Display read-only txt document
+                logger.verbose(`showing txt document for notification: ${notification.id} ...`)
+                await telemetry.toolkit_invokeAction.run(async () => {
+                    telemetry.record({
+                        id: getNotificationTelemetryId(notification),
+                        source: getNotificationTelemetryId(notification),
+                        action: onClickType,
+                    })
+                    await readonlyDocument.show(
+                        notification.uiRenderInstructions.content['en-US'].description,
+                        `Notification: ${notification.id}`
+                    )
+                })
+                break
+        }
+    }
+
+    /**
+     * Renders information window with the notification's content and buttons.
+     * Can be either a blocking modal or a bottom-right corner toast
+     * Handles the button click actions based on the button type.
+     */
+    private showInformationWindow(
+        notification: ToolkitNotification,
+        type: OnReceiveType = 'toast',
+        passive: boolean = false
+    ) {
+        const isModal = type === 'modal'
+
+        // modal has to have defined actions (buttons)
+        const buttons = notification.uiRenderInstructions.actions ?? []
+        const buttonLabels = buttons.map((actions) => actions.displayText['en-US'])
+        const detail = notification.uiRenderInstructions.content['en-US'].description
+
+        // we use toastPreview to display as title for toast, since detail won't be shown
+        const title = isModal
+            ? notification.uiRenderInstructions.content['en-US'].title
+            : (notification.uiRenderInstructions.content['en-US'].toastPreview ??
+              notification.uiRenderInstructions.content['en-US'].title)
+
+        telemetry.toolkit_showNotification.emit({
+            id: getNotificationTelemetryId(notification),
+            passive,
+            component: 'editor',
+            result: 'Succeeded',
+        })
+
+        return vscode.window
+            .showInformationMessage(title, { modal: isModal, detail }, ...buttonLabels)
+            .then((response) => {
+                return telemetry.toolkit_invokeAction.run(async (span) => {
+                    span.record({
+                        id: getNotificationTelemetryId(notification),
+                        source: getNotificationTelemetryId(notification),
+                        action: response ?? 'OK',
+                    })
+                    if (response) {
+                        const selectedButton = buttons.find((actions) => actions.displayText['en-US'] === response)
+                        // Different button options
+                        if (selectedButton) {
+                            span.record({ action: selectedButton.type })
+                            switch (selectedButton.type) {
+                                case 'openTextDocument':
+                                    await readonlyDocument.show(
+                                        notification.uiRenderInstructions.content['en-US'].description,
+                                        `Notification: ${notification.id}`
+                                    )
+                                    break
+                                case 'updateAndReload':
+                                    // Give things time to finish executing.
+                                    globals.clock.setTimeout(() => {
+                                        return this.updateAndReload(notification.displayIf.extensionId)
+                                    }, 1000)
+                                    break
+                                case 'openUrl':
+                                    if (selectedButton.url) {
+                                        await openUrl(vscode.Uri.parse(selectedButton.url))
+                                    } else {
+                                        throw new ToolkitError('url not provided')
+                                    }
+                                    break
+                                default:
+                                    throw new ToolkitError('button action not defined')
+                            }
+                        }
+                    }
+                })
+            })
+    }
+
+    public async onReceiveNotifications(notifications: ToolkitNotification[]) {
+        for (const notification of notifications) {
+            void this.showInformationWindow(notification, notification.uiRenderInstructions.onReceive, true)
+        }
+    }
+
+    private async updateAndReload(id: string) {
+        logger.verbose('Updating and reloading the extension...')
+
+        // Publish pending telemetry before it is lost to the window reload.
+        await globals.telemetry.flushRecords()
+
+        await vscode.commands.executeCommand('workbench.extensions.installExtension', id)
+        await vscode.commands.executeCommand('workbench.action.reloadWindow')
+    }
+
+    /**
+     * HACK: Since this is assumed to be an immediate child of the
+     * root, we return undefined.
+     *
+     * TODO: Look to have a base root class to extend so we do not
+     * need to implement this here.
+     * @returns
+     */
+    getParent(): TreeNode<unknown> | undefined {
+        return undefined
+    }
+
+    static get instance() {
+        if (this.#instance === undefined) {
+            this.#instance = new NotificationsNode()
+        }
+
+        return this.#instance
+    }
+
+    registerProvider(provider: ResourceTreeDataProvider) {
+        this.provider = provider
+    }
+
+    registerView(context: vscode.ExtensionContext) {
+        this.view = registerToolView(
+            {
+                nodes: [this],
+                view: isAmazonQ() ? 'aws.amazonq.notifications' : 'aws.toolkit.notifications',
+                refreshCommands: [(provider: ResourceTreeDataProvider) => this.registerProvider(provider)],
+            },
+            context
+        )
+    }
+}
diff --git a/packages/core/src/notifications/rules.ts b/packages/core/src/notifications/rules.ts
new file mode 100644
index 00000000000..ddce795a39e
--- /dev/null
+++ b/packages/core/src/notifications/rules.ts
@@ -0,0 +1,208 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as semver from 'semver'
+import globals from '../shared/extensionGlobals'
+import { ConditionalClause, RuleContext, DisplayIf, CriteriaCondition, ToolkitNotification, AuthState } from './types'
+import { getComputeEnvType, getOperatingSystem } from '../shared/telemetry/util'
+import { isAutomation } from '../shared/vscode/env'
+import { AuthFormId } from '../login/webview/vue/types'
+import { getLogger } from '../shared/logger/logger'
+import { ToolkitError } from '../shared/errors'
+
+const logger = getLogger('notifications')
+/**
+ * Evaluates if a given version fits into the parameters specified by a notification, e.g:
+ *
+ *  extensionVersion: {
+ *      type: 'range',
+ *      lowerInclusive: '1.21.0'
+ *  }
+ *
+ * will match all versions 1.21.0 and up.
+ *
+ * @param version the version to check
+ * @param condition the condition to check against
+ * @returns true if the version satisfies the condition
+ */
+function isValidVersion(version: string, condition: ConditionalClause): boolean {
+    const cleanVersion = version.split('-')[0] // remove any pre-release tags
+    switch (condition.type) {
+        case 'range': {
+            const lowerConstraint =
+                !condition.lowerInclusive ||
+                condition.lowerInclusive === '-inf' ||
+                semver.gte(cleanVersion, condition.lowerInclusive)
+            const upperConstraint =
+                !condition.upperExclusive ||
+                condition.upperExclusive === '+inf' ||
+                semver.lt(cleanVersion, condition.upperExclusive)
+            return lowerConstraint && upperConstraint
+        }
+        case 'exactMatch':
+            return condition.values.some((v) => semver.eq(v, cleanVersion))
+        case 'or':
+            /** Check case where any of the subconditions are true, i.e. one of multiple range or exactMatch conditions */
+            return condition.clauses.some((clause) => isValidVersion(cleanVersion, clause))
+        default:
+            throw new Error(`Unknown clause type: ${(condition as any).type}`)
+    }
+}
+
+/**
+ * Determine whether or not to display a given notification based on whether the
+ * notification requirements fit the extension context provided on initialization.
+ *
+ * Usage:
+ * const myContext = {
+ *   extensionVersion: '4.5.6',
+ *   ...
+ * }
+ *
+ * const ruleEngine = new RuleEngine(myContext)
+ *
+ * notifications.forEach(n => {
+ *   if (ruleEngine.shouldDisplayNotification(n)) {
+ *     // process notification
+ *     ...
+ *   }
+ * })
+ *
+ */
+export class RuleEngine {
+    constructor(private readonly context: RuleContext) {}
+
+    public shouldDisplayNotification(payload: ToolkitNotification) {
+        return this.evaluate(payload.id, payload.displayIf)
+    }
+
+    private evaluate(id: string, condition: DisplayIf): boolean {
+        const currentExt = globals.context.extension.id
+        // if in test, skip the extension id check since its fake
+        if (condition.extensionId !== currentExt && !isAutomation()) {
+            logger.verbose(
+                'notification id: (%s) did NOT pass extension id check, actual ext id: (%s), expected ext id: (%s)',
+                id,
+                currentExt,
+                condition.extensionId
+            )
+            return false
+        }
+
+        if (condition.ideVersion) {
+            if (!isValidVersion(this.context.ideVersion, condition.ideVersion)) {
+                logger.verbose(
+                    'notification id: (%s) did NOT pass IDE version check, actual version: (%s), expected version: (%s)',
+                    id,
+                    this.context.ideVersion,
+                    condition.ideVersion
+                )
+                return false
+            }
+        }
+        if (condition.extensionVersion) {
+            if (!isValidVersion(this.context.extensionVersion, condition.extensionVersion)) {
+                logger.verbose(
+                    'notification id: (%s) did NOT pass extension version check, actual ext version: (%s), expected ext version: (%s)',
+                    id,
+                    this.context.extensionVersion,
+                    condition.extensionVersion
+                )
+                return false
+            }
+        }
+
+        if (condition.additionalCriteria) {
+            for (const criteria of condition.additionalCriteria) {
+                if (!this.evaluateRule(criteria)) {
+                    logger.verbose('notification id: (%s) did NOT pass criteria check: %O', id, criteria)
+                    return false
+                }
+                logger.debug('notification id: (%s) passed criteria check: %O', id, criteria)
+            }
+        }
+
+        return true
+    }
+
+    private evaluateRule(criteria: CriteriaCondition) {
+        const expected = criteria.values
+        const expectedSet = new Set(expected)
+
+        const hasAnyOfExpected = (i: string[]) => i.some((v) => expectedSet.has(v))
+        const isSuperSetOfExpected = (i: string[]) => {
+            const s = new Set(i)
+            return expected.every((v) => s.has(v))
+        }
+        const isEqualSetToExpected = (i: string[]) => {
+            const s = new Set(i)
+            return expected.every((v) => s.has(v)) && i.every((v) => expectedSet.has(v))
+        }
+
+        // Maybe we could abstract these out into some strategy pattern with classes.
+        // But this list is short and its unclear if we need to expand it further.
+        // Also, we might replace this with a common implementation amongst the toolkits.
+        // So... YAGNI
+        switch (criteria.type) {
+            case 'OS':
+                return hasAnyOfExpected([this.context.os])
+            case 'ComputeEnv':
+                return hasAnyOfExpected([this.context.computeEnv])
+            case 'AuthType':
+                return hasAnyOfExpected(this.context.authTypes)
+            case 'AuthRegion':
+                return hasAnyOfExpected(this.context.authRegions)
+            case 'AuthState':
+                return hasAnyOfExpected(this.context.authStates)
+            case 'AuthScopes':
+                return isEqualSetToExpected(this.context.authScopes)
+            case 'ActiveExtensions':
+                return isSuperSetOfExpected(this.context.activeExtensions)
+            default:
+                logger.error('Unknown criteria passed to RuleEngine: %O', criteria)
+                throw new ToolkitError(`Unknown criteria type: ${(criteria as any).type}`)
+        }
+    }
+}
+
+export async function getRuleContext(context: vscode.ExtensionContext, authState: AuthState): Promise<RuleContext> {
+    const authTypes =
+        authState.authEnabledConnections === ''
+            ? []
+            : // TODO: There is a large disconnect in the codebase with how auth "types" are stored, displayed, sent to telemetry, etc.
+              // For now we have this "hack" (more of an inefficiency) until auth code can be properly refactored.
+              (authState.authEnabledConnections.split(',') as AuthFormId[]).map(
+                  (id): RuleContext['authTypes'][number] => {
+                      if (id.includes('builderId')) {
+                          return 'builderId'
+                      } else if (id.includes('identityCenter')) {
+                          return 'identityCenter'
+                      } else if (id.includes('credentials')) {
+                          return 'credentials'
+                      }
+                      return 'unknown'
+                  }
+              )
+    const ruleContext = {
+        ideVersion: vscode.version,
+        extensionVersion: context.extension.packageJSON.version,
+        os: getOperatingSystem(),
+        computeEnv: await getComputeEnvType(),
+        authTypes: [...new Set(authTypes)],
+        authScopes: authState.authScopes ? authState.authScopes?.split(',') : [],
+        activeExtensions: vscode.extensions.all.filter((e) => e.isActive).map((e) => e.id),
+
+        // Toolkit (and eventually Q?) may have multiple connections with different regions and states.
+        // However, this granularity does not seem useful at this time- only the active connection is considered.
+        authRegions: authState.awsRegion ? [authState.awsRegion] : [],
+        authStates: [authState.authStatus],
+    }
+
+    const { activeExtensions, ...loggableRuleContext } = ruleContext
+    logger.debug('getRuleContext() determined rule context: %O', loggableRuleContext)
+
+    return ruleContext
+}
diff --git a/packages/core/src/notifications/types.ts b/packages/core/src/notifications/types.ts
new file mode 100644
index 00000000000..66d5d2e54ea
--- /dev/null
+++ b/packages/core/src/notifications/types.ts
@@ -0,0 +1,186 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { EnvType, OperatingSystem } from '../shared/telemetry/util'
+import { TypeConstructor } from '../shared/utilities/typeConstructors'
+import { AuthUserState, AuthStatus } from '../shared/telemetry/telemetry.gen'
+import { AuthType } from '../auth/connection'
+
+/** Types of information that we can use to determine whether to show a notification or not. */
+
+type OsCriteria = {
+    type: 'OS'
+    values: OperatingSystem[]
+}
+
+type ComputeEnvCriteria = {
+    type: 'ComputeEnv'
+    values: EnvType[]
+}
+
+type AuthTypeCriteria = {
+    type: 'AuthType'
+    values: AuthType[]
+}
+
+type AuthRegionCriteria = {
+    type: 'AuthRegion'
+    values: string[]
+}
+
+type AuthStateCriteria = {
+    type: 'AuthState'
+    values: AuthStatus[]
+}
+
+type AuthScopesCriteria = {
+    type: 'AuthScopes'
+    values: string[] // TODO: Scopes should be typed. Could import here, but don't want to import too much.
+}
+
+type ActiveExtensionsCriteria = {
+    type: 'ActiveExtensions'
+    values: string[]
+}
+
+/** Generic condition where the type determines how the values are evaluated. */
+export type CriteriaCondition =
+    | OsCriteria
+    | ComputeEnvCriteria
+    | AuthTypeCriteria
+    | AuthRegionCriteria
+    | AuthStateCriteria
+    | AuthScopesCriteria
+    | ActiveExtensionsCriteria
+
+/** One of the subconditions (clauses) must match to be valid. */
+export interface OR {
+    readonly type: 'or'
+    readonly clauses: (Range | ExactMatch)[]
+}
+
+/** Version must be within the bounds to be valid. Missing bound indicates that bound is open-ended. */
+export interface Range {
+    readonly type: 'range'
+    readonly lowerInclusive?: string // null means "-inf"
+    readonly upperExclusive?: string // null means "+inf"
+}
+
+/** Version must be equal. */
+export interface ExactMatch {
+    readonly type: 'exactMatch'
+    readonly values: string[]
+}
+
+export type ConditionalClause = Range | ExactMatch | OR
+
+export type OnReceiveType = 'toast' | 'modal'
+export type OnClickType = { type: 'modal' } | { type: 'openTextDocument' } | { type: 'openUrl'; url: string }
+export type ActionType = 'openUrl' | 'updateAndReload' | 'openTextDocument'
+
+/** How to display the notification. */
+export interface UIRenderInstructions {
+    content: {
+        [`en-US`]: {
+            title: string
+            description: string
+            toastPreview?: string // optional property for toast
+        }
+    }
+    onReceive: OnReceiveType
+    onClick: OnClickType
+    actions?: Array<{
+        type: ActionType
+        displayText: {
+            [`en-US`]: string
+        }
+        url?: string // optional property for 'openUrl'
+    }>
+}
+
+/** Condition/criteria section of a notification. */
+export interface DisplayIf {
+    extensionId: string
+    ideVersion?: ConditionalClause
+    extensionVersion?: ConditionalClause
+    additionalCriteria?: CriteriaCondition[]
+}
+
+export interface ToolkitNotification {
+    id: string
+    displayIf: DisplayIf
+    uiRenderInstructions: UIRenderInstructions
+}
+
+export interface Notifications {
+    schemaVersion: string
+    notifications: ToolkitNotification[]
+}
+
+export type NotificationData = {
+    payload?: Notifications
+    eTag?: string
+}
+
+export type NotificationsState = {
+    // Categories
+    startUp: NotificationData
+    emergency: NotificationData
+
+    // Util
+    dismissed: string[]
+    newlyReceived: string[]
+}
+
+export const defaultNotificationsState: () => NotificationsState = () => {
+    return {
+        startUp: {},
+        emergency: {},
+        dismissed: [],
+        newlyReceived: [],
+    }
+}
+
+export const NotificationsStateConstructor: TypeConstructor<NotificationsState> = (v: unknown): NotificationsState => {
+    const isNotificationsState = (v: Partial<NotificationsState>): v is NotificationsState => {
+        const requiredKeys: (keyof NotificationsState)[] = ['startUp', 'emergency', 'dismissed', 'newlyReceived']
+        return (
+            requiredKeys.every((key) => key in v) &&
+            Array.isArray(v.dismissed) &&
+            Array.isArray(v.newlyReceived) &&
+            typeof v.startUp === 'object' &&
+            typeof v.emergency === 'object'
+        )
+    }
+
+    if (v && typeof v === 'object' && isNotificationsState(v)) {
+        return v
+    }
+    throw new Error('Cannot cast to NotificationsState.')
+}
+
+export type NotificationType = keyof Omit<NotificationsState, 'dismissed' | 'newlyReceived'>
+
+export interface RuleContext {
+    readonly ideVersion: typeof vscode.version
+    readonly extensionVersion: string
+    readonly os: OperatingSystem
+    readonly computeEnv: EnvType
+    readonly authTypes: AuthType[]
+    readonly authRegions: string[]
+    readonly authStates: AuthStatus[]
+    readonly authScopes: string[]
+    readonly activeExtensions: string[]
+}
+
+/** Type expected by things that build (or help build) {@link RuleContext} */
+export type AuthState = Omit<AuthUserState, 'source'>
+
+export function getNotificationTelemetryId(n: ToolkitNotification): string {
+    return `TARGETED_NOTIFICATION:${n.id}`
+}
+
+export type DevNotificationsState = { startUp: ToolkitNotification[]; emergency: ToolkitNotification[] }
diff --git a/packages/core/src/sagemakerunifiedstudio/activation.ts b/packages/core/src/sagemakerunifiedstudio/activation.ts
new file mode 100644
index 00000000000..7fefd2eb44a
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/activation.ts
@@ -0,0 +1,23 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { activate as activateConnectionMagicsSelector } from './connectionMagicsSelector/activation'
+import { activate as activateExplorer } from './explorer/activation'
+import { isSageMaker } from '../shared/extensionUtilities'
+import { initializeResourceMetadata } from './shared/utils/resourceMetadataUtils'
+import { setContext } from '../shared/vscode/setContext'
+import { SmusUtils } from './shared/smusUtils'
+
+export async function activate(extensionContext: vscode.ExtensionContext): Promise<void> {
+    // Only run when environment is a SageMaker Unified Studio space
+    if (isSageMaker('SMUS') || isSageMaker('SMUS-SPACE-REMOTE-ACCESS')) {
+        await initializeResourceMetadata()
+        // Setting context before any getContext calls to avoid potential race conditions.
+        await setContext('aws.smus.inSmusSpaceEnvironment', SmusUtils.isInSmusSpaceEnvironment())
+        await activateConnectionMagicsSelector(extensionContext)
+    }
+    await activateExplorer(extensionContext)
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/auth/model.ts b/packages/core/src/sagemakerunifiedstudio/auth/model.ts
new file mode 100644
index 00000000000..6e60fa20e96
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/auth/model.ts
@@ -0,0 +1,68 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { SsoProfile, SsoConnection } from '../../auth/connection'
+
+/**
+ * Scope for SageMaker Unified Studio authentication
+ */
+export const scopeSmus = 'datazone:domain:access'
+
+/**
+ * SageMaker Unified Studio profile extending the base SSO profile
+ */
+export interface SmusProfile extends SsoProfile {
+    readonly domainUrl: string
+    readonly domainId: string
+}
+
+/**
+ * SageMaker Unified Studio connection extending the base SSO connection
+ */
+export interface SmusConnection extends SmusProfile, SsoConnection {
+    readonly id: string
+    readonly label: string
+}
+
+/**
+ * Creates a SageMaker Unified Studio profile
+ * @param domainUrl The SageMaker Unified Studio domain URL
+ * @param domainId The SageMaker Unified Studio domain ID
+ * @param startUrl The SSO start URL (issuer URL)
+ * @param region The AWS region
+ * @returns A SageMaker Unified Studio profile
+ */
+export function createSmusProfile(
+    domainUrl: string,
+    domainId: string,
+    startUrl: string,
+    region: string,
+    scopes = [scopeSmus]
+): SmusProfile & { readonly scopes: string[] } {
+    return {
+        scopes,
+        type: 'sso',
+        startUrl,
+        ssoRegion: region,
+        domainUrl,
+        domainId,
+    }
+}
+
+/**
+ * Checks if a connection is a valid SageMaker Unified Studio connection
+ * @param conn Connection to check
+ * @returns True if the connection is a valid SMUS connection
+ */
+export function isValidSmusConnection(conn?: any): conn is SmusConnection {
+    if (!conn || conn.type !== 'sso') {
+        return false
+    }
+    // Check if the connection has the required SMUS scope
+    const hasScope = Array.isArray(conn.scopes) && conn.scopes.includes(scopeSmus)
+    // Check if the connection has the required SMUS properties
+    const hasSmusProps = 'domainUrl' in conn && 'domainId' in conn
+    return !!hasScope && !!hasSmusProps
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/auth/providers/connectionCredentialsProvider.ts b/packages/core/src/sagemakerunifiedstudio/auth/providers/connectionCredentialsProvider.ts
new file mode 100644
index 00000000000..f060e6477ab
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/auth/providers/connectionCredentialsProvider.ts
@@ -0,0 +1,243 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { getLogger } from '../../../shared/logger/logger'
+import { ToolkitError } from '../../../shared/errors'
+import * as AWS from '@aws-sdk/types'
+import { CredentialsId, CredentialsProvider, CredentialsProviderType } from '../../../auth/providers/credentials'
+
+import { DataZoneClient } from '../../shared/client/datazoneClient'
+import { SmusAuthenticationProvider } from './smusAuthenticationProvider'
+import { CredentialType } from '../../../shared/telemetry/telemetry'
+import { SmusCredentialExpiry, validateCredentialFields } from '../../shared/smusUtils'
+
+/**
+ * Credentials provider for SageMaker Unified Studio Connection credentials
+ * Uses DataZone API to get connection credentials for a specific connection *
+ * This provider implements independent caching with 10-minute expiry
+ */
+export class ConnectionCredentialsProvider implements CredentialsProvider {
+    private readonly logger = getLogger()
+    private credentialCache?: {
+        credentials: AWS.Credentials
+        expiresAt: Date
+    }
+
+    constructor(
+        private readonly smusAuthProvider: SmusAuthenticationProvider,
+        private readonly connectionId: string
+    ) {}
+
+    /**
+     * Gets the connection ID
+     * @returns Connection ID
+     */
+    public getConnectionId(): string {
+        return this.connectionId
+    }
+
+    /**
+     * Gets the credentials ID
+     * @returns Credentials ID
+     */
+    public getCredentialsId(): CredentialsId {
+        return {
+            credentialSource: 'temp',
+            credentialTypeId: `${this.smusAuthProvider.getDomainId()}:${this.connectionId}`,
+        }
+    }
+
+    /**
+     * Gets the provider type
+     * @returns Provider type
+     */
+    public getProviderType(): CredentialsProviderType {
+        return 'temp'
+    }
+
+    /**
+     * Gets the telemetry type
+     * @returns Telemetry type
+     */
+    public getTelemetryType(): CredentialType {
+        return 'other'
+    }
+
+    /**
+     * Gets the default region
+     * @returns Default region
+     */
+    public getDefaultRegion(): string | undefined {
+        return this.smusAuthProvider.getDomainRegion()
+    }
+
+    /**
+     * Gets the domain AWS account ID
+     * @returns Promise resolving to the domain account ID
+     */
+    public async getDomainAccountId(): Promise<string> {
+        return this.smusAuthProvider.getDomainAccountId()
+    }
+
+    /**
+     * Gets the hash code
+     * @returns Hash code
+     */
+    public getHashCode(): string {
+        const hashCode = `smus-connection:${this.smusAuthProvider.getDomainId()}:${this.connectionId}`
+        return hashCode
+    }
+
+    /**
+     * Determines if the provider can auto-connect
+     * @returns Promise resolving to boolean
+     */
+    public async canAutoConnect(): Promise<boolean> {
+        return false // SMUS requires manual authentication
+    }
+
+    /**
+     * Determines if the provider is available
+     * @returns Promise resolving to boolean
+     */
+    public async isAvailable(): Promise<boolean> {
+        try {
+            return this.smusAuthProvider.isConnected()
+        } catch (err) {
+            this.logger.error('SMUS Connection: Error checking if auth provider is connected: %s', err)
+            return false
+        }
+    }
+
+    /**
+     * Gets Connection credentials with independent caching
+     * @returns Promise resolving to credentials
+     */
+    public async getCredentials(): Promise<AWS.Credentials> {
+        this.logger.debug(`SMUS Connection: Getting credentials for connection ${this.connectionId}`)
+
+        // Check cache first (10-minute expiry)
+        if (this.credentialCache && this.credentialCache.expiresAt > new Date()) {
+            this.logger.debug(
+                `SMUS Connection: Using cached connection credentials for connection ${this.connectionId}`
+            )
+            return this.credentialCache.credentials
+        }
+
+        this.logger.debug(
+            `SMUS Connection: Calling GetConnection to fetch credentials for connection ${this.connectionId}`
+        )
+
+        try {
+            const datazoneClient = await DataZoneClient.getInstance(this.smusAuthProvider)
+            const getConnectionResponse = await datazoneClient.getConnection({
+                domainIdentifier: this.smusAuthProvider.getDomainId(),
+                identifier: this.connectionId,
+                withSecret: true,
+            })
+
+            this.logger.debug(`SMUS Connection: Successfully retrieved connection details for ${this.connectionId}`)
+
+            // Extract connection credentials
+            const connectionCredentials = getConnectionResponse.connectionCredentials
+            if (!connectionCredentials) {
+                throw new ToolkitError(
+                    `No connection credentials available in response for connection ${this.connectionId}`,
+                    {
+                        code: 'NoConnectionCredentials',
+                    }
+                )
+            }
+
+            // Validate credential fields
+            validateCredentialFields(
+                connectionCredentials,
+                'InvalidConnectionCredentials',
+                'connection credential response',
+                true
+            )
+
+            // Create AWS credentials with expiration
+            // Use the expiration from the response if available, otherwise default to 10 minutes
+            let expiresAt: Date
+            if (connectionCredentials.expiration) {
+                // The API returns expiration as a string or Date, handle both cases
+                expiresAt =
+                    connectionCredentials.expiration instanceof Date
+                        ? connectionCredentials.expiration
+                        : new Date(connectionCredentials.expiration)
+            } else {
+                expiresAt = new Date(Date.now() + SmusCredentialExpiry.connectionExpiryMs)
+            }
+
+            const awsCredentials: AWS.Credentials = {
+                accessKeyId: connectionCredentials.accessKeyId as string,
+                secretAccessKey: connectionCredentials.secretAccessKey as string,
+                sessionToken: connectionCredentials.sessionToken as string,
+                expiration: expiresAt,
+            }
+
+            // Cache connection credentials (10-minute expiry)
+            const cacheExpiresAt = new Date(Date.now() + SmusCredentialExpiry.connectionExpiryMs)
+            this.credentialCache = {
+                credentials: awsCredentials,
+                expiresAt: cacheExpiresAt,
+            }
+
+            this.logger.debug(
+                `SMUS Connection: Successfully cached connection credentials for connection ${this.connectionId}, expires in %s minutes`,
+                Math.round((cacheExpiresAt.getTime() - Date.now()) / 60000)
+            )
+
+            return awsCredentials
+        } catch (err) {
+            this.logger.error(
+                `SMUS Connection: Failed to get connection credentials for connection ${this.connectionId}: %s`,
+                err
+            )
+
+            // Re-throw ToolkitErrors with specific codes (NoConnectionCredentials, InvalidConnectionCredentials)
+            if (
+                err instanceof ToolkitError &&
+                (err.code === 'NoConnectionCredentials' || err.code === 'InvalidConnectionCredentials')
+            ) {
+                throw err
+            }
+
+            // Wrap other errors in ConnectionCredentialsFetchFailed
+            throw new ToolkitError(`Failed to get connection credentials for ${this.connectionId}: ${err}`, {
+                code: 'ConnectionCredentialsFetchFailed',
+                cause: err instanceof Error ? err : undefined,
+            })
+        }
+    }
+
+    /**
+     * Invalidates cached connection credentials
+     * Clears the internal cache without fetching new credentials
+     */
+    public invalidate(): void {
+        this.logger.debug(`SMUS Connection: Invalidating cached credentials for connection ${this.connectionId}`)
+        // Clear cache to force fresh fetch on next getCredentials() call
+        this.credentialCache = undefined
+        this.logger.debug(
+            `SMUS Connection: Successfully invalidated connection credentials cache for connection ${this.connectionId}`
+        )
+    }
+
+    /**
+     * Disposes of the provider and cleans up resources
+     */
+    public dispose(): void {
+        this.logger.debug(
+            `SMUS Connection: Disposing connection credentials provider for connection ${this.connectionId}`
+        )
+        // Clear cache to clean up resources
+        this.invalidate()
+        this.logger.debug(
+            `SMUS Connection: Successfully disposed connection credentials provider for connection ${this.connectionId}`
+        )
+    }
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/auth/providers/domainExecRoleCredentialsProvider.ts b/packages/core/src/sagemakerunifiedstudio/auth/providers/domainExecRoleCredentialsProvider.ts
new file mode 100644
index 00000000000..968749a9c9c
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/auth/providers/domainExecRoleCredentialsProvider.ts
@@ -0,0 +1,325 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { getLogger } from '../../../shared/logger/logger'
+import { ToolkitError } from '../../../shared/errors'
+import * as AWS from '@aws-sdk/types'
+import { CredentialsId, CredentialsProvider, CredentialsProviderType } from '../../../auth/providers/credentials'
+import fetch from 'node-fetch'
+import globals from '../../../shared/extensionGlobals'
+import { CredentialType } from '../../../shared/telemetry/telemetry'
+import { SmusCredentialExpiry, SmusTimeouts, SmusErrorCodes, validateCredentialFields } from '../../shared/smusUtils'
+
+/**
+ * Credentials provider for SageMaker Unified Studio Domain Execution Role (DER)
+ * Uses SSO tokens to get DER credentials via the /sso/redeem-token endpoint
+ *
+ * This provider implements internal caching with 10-minute expiry and handles
+ * its own credential lifecycle independently
+ */
+export class DomainExecRoleCredentialsProvider implements CredentialsProvider {
+    private readonly logger = getLogger()
+    private credentialCache?: {
+        credentials: AWS.Credentials
+        expiresAt: Date
+    }
+
+    constructor(
+        private readonly domainUrl: string,
+        private readonly domainId: string,
+        private readonly ssoRegion: string,
+        private readonly getAccessToken: () => Promise<string> // Function to get SSO access token for the Connection
+    ) {}
+
+    /**
+     * Gets the domain ID
+     * @returns Domain ID
+     */
+    public getDomainId(): string {
+        return this.domainId
+    }
+
+    /**
+     * Gets the domain URL
+     * @returns Domain URL
+     */
+    public getDomainUrl(): string {
+        return this.domainUrl
+    }
+
+    /**
+     * Gets the credentials ID
+     * @returns Credentials ID
+     */
+    public getCredentialsId(): CredentialsId {
+        return {
+            credentialSource: 'sso',
+            credentialTypeId: this.domainId,
+        }
+    }
+
+    /**
+     * Gets the provider type
+     * @returns Provider type
+     */
+    public getProviderType(): CredentialsProviderType {
+        return 'sso'
+    }
+
+    /**
+     * Gets the telemetry type
+     * @returns Telemetry type
+     */
+    public getTelemetryType(): CredentialType {
+        return 'ssoProfile'
+    }
+
+    /**
+     * Gets the default region
+     * @returns Default region
+     */
+    public getDefaultRegion(): string | undefined {
+        return this.ssoRegion
+    }
+
+    /**
+     * Gets the hash code
+     * @returns Hash code
+     */
+    public getHashCode(): string {
+        const hashCode = `smus-der:${this.domainId}:${this.ssoRegion}`
+        return hashCode
+    }
+
+    /**
+     * Determines if the provider can auto-connect
+     * @returns Promise resolving to boolean
+     */
+    public async canAutoConnect(): Promise<boolean> {
+        return false // SMUS requires manual authentication
+    }
+
+    /**
+     * Determines if the provider is available
+     * @returns Promise resolving to boolean
+     */
+    public async isAvailable(): Promise<boolean> {
+        try {
+            // Check if we can get an access token
+            await this.getAccessToken()
+            return true
+        } catch {
+            return false
+        }
+    }
+
+    /**
+     * Gets Domain Execution Role (DER) credentials with internal caching
+     * @returns Promise resolving to credentials
+     */
+    public async getCredentials(): Promise<AWS.Credentials> {
+        this.logger.debug(`SMUS DER: Getting DER credentials for domain ${this.domainId}`)
+
+        // Check cache first (10-minute expiry with 5-minute buffer for proactive refresh)
+        if (this.credentialCache && this.credentialCache.expiresAt > new Date()) {
+            this.logger.debug(`SMUS DER: Using cached DER credentials for domain ${this.domainId}`)
+            return this.credentialCache.credentials
+        }
+
+        this.logger.debug(`SMUS DER: Fetching credentials from API for domain ${this.domainId}`)
+
+        try {
+            // Get current SSO access token
+            const accessToken = await this.getAccessToken()
+            if (!accessToken) {
+                throw new ToolkitError('No access token available for DER credential refresh', {
+                    code: 'NoTokenAvailable',
+                })
+            }
+
+            this.logger.debug(`SMUS DER: Got access token for refresh for domain ${this.domainId}`)
+
+            // Call SMUS redeem token API to get DER credentials
+            const redeemUrl = new URL('/sso/redeem-token', this.domainUrl)
+            this.logger.debug(`SMUS DER: Calling redeem token endpoint: ${redeemUrl.toString()}`)
+
+            const requestBody = {
+                domainId: this.domainId,
+                accessToken,
+            }
+
+            const requestHeaders = {
+                'Content-Type': 'application/json',
+                Accept: 'application/json',
+                'User-Agent': 'aws-toolkit-vscode',
+            }
+
+            let response
+            try {
+                response = await fetch(redeemUrl.toString(), {
+                    method: 'POST',
+                    headers: requestHeaders,
+                    body: JSON.stringify(requestBody),
+                    timeout: SmusTimeouts.apiCallTimeoutMs,
+                })
+            } catch (fetchError) {
+                // Handle timeout errors specifically
+                if (
+                    fetchError instanceof Error &&
+                    (fetchError.name === 'AbortError' || fetchError.message.includes('timeout'))
+                ) {
+                    throw new ToolkitError(
+                        `Redeem token request timed out after ${SmusTimeouts.apiCallTimeoutMs / 1000} seconds`,
+                        {
+                            code: SmusErrorCodes.ApiTimeout,
+                            cause: fetchError,
+                        }
+                    )
+                }
+                // Re-throw other fetch errors
+                throw fetchError
+            }
+
+            this.logger.debug(`SMUS DER: Redeem token response status: ${response.status} for domain ${this.domainId}`)
+
+            if (!response.ok) {
+                // Try to get response body for more details
+                let responseBody = ''
+                try {
+                    responseBody = await response.text()
+                    this.logger.debug(`SMUS DER: Error response body for domain ${this.domainId}: ${responseBody}`)
+                } catch (bodyErr) {
+                    this.logger.debug(
+                        `SMUS DER: Could not read error response body for domain ${this.domainId}: ${bodyErr}`
+                    )
+                }
+
+                throw new ToolkitError(
+                    `Failed to redeem access token: ${response.status} ${response.statusText}${responseBody ? ` - ${responseBody}` : ''}`,
+                    { code: SmusErrorCodes.RedeemAccessTokenFailed }
+                )
+            }
+
+            const responseText = await response.text()
+
+            const data = JSON.parse(responseText) as {
+                credentials: {
+                    accessKeyId: string
+                    secretAccessKey: string
+                    sessionToken: string
+                    expiration: string
+                }
+            }
+            this.logger.debug(`SMUS DER: Successfully received credentials from API for domain ${this.domainId}`)
+
+            // Validate the response data structure
+            if (!data.credentials) {
+                throw new ToolkitError('Missing credentials object in API response', {
+                    code: 'InvalidCredentialResponse',
+                })
+            }
+
+            const credentials = data.credentials
+
+            // Validate the credential fields
+            validateCredentialFields(credentials, 'InvalidCredentialResponse', 'API response')
+
+            // Create credentials with expiration
+            let credentialExpiresAt: Date
+            if (credentials.expiration) {
+                // Handle both epoch timestamps and ISO date strings
+                let parsedExpiration: Date
+
+                // Check if expiration is a numeric string (epoch timestamp)
+                const expirationNum = Number(credentials.expiration)
+                if (!isNaN(expirationNum) && expirationNum > 0) {
+                    // Treat as epoch timestamp in seconds and convert to milliseconds
+                    const timestampMs = expirationNum * 1000
+                    parsedExpiration = new Date(timestampMs)
+                    this.logger.debug(
+                        `SMUS DER: Parsed epoch timestamp ${credentials.expiration} (seconds) as ${parsedExpiration.toISOString()}`
+                    )
+                } else {
+                    // Treat as ISO date string
+                    parsedExpiration = new Date(credentials.expiration)
+                    if (!isNaN(parsedExpiration.getTime())) {
+                        this.logger.debug(
+                            `SMUS DER: Parsed ISO date string ${credentials.expiration} as ${parsedExpiration.toISOString()}`
+                        )
+                    } else {
+                        this.logger.debug(
+                            `SMUS DER: Failed to parse ISO date string ${credentials.expiration} - invalid date format`
+                        )
+                    }
+                }
+
+                // Check if the parsed date is valid
+                if (isNaN(parsedExpiration.getTime())) {
+                    this.logger.warn(
+                        `SMUS DER: Invalid expiration value: ${credentials.expiration}, using default expiration`
+                    )
+                    credentialExpiresAt = new Date(Date.now() + SmusCredentialExpiry.derExpiryMs)
+                } else {
+                    credentialExpiresAt = parsedExpiration
+                }
+                if (!isNaN(credentialExpiresAt.getTime())) {
+                    this.logger.debug(`SMUS DER: Credential expires at ${credentialExpiresAt.toISOString()}`)
+                } else {
+                    this.logger.debug(`SMUS DER: Invalid credential expiration date, using default`)
+                }
+            } else {
+                this.logger.debug(`SMUS DER: No expiration provided, using default`)
+                credentialExpiresAt = new Date(Date.now() + SmusCredentialExpiry.derExpiryMs)
+            }
+
+            const awsCredentials: AWS.Credentials = {
+                accessKeyId: credentials.accessKeyId as string,
+                secretAccessKey: credentials.secretAccessKey as string,
+                sessionToken: credentials.sessionToken as string,
+                expiration: credentialExpiresAt,
+            }
+
+            // Cache DER credentials with 10-minute expiry (5-minute buffer for proactive refresh)
+            const cacheExpiresAt = new globals.clock.Date(Date.now() + SmusCredentialExpiry.derExpiryMs)
+            this.credentialCache = {
+                credentials: awsCredentials,
+                expiresAt: cacheExpiresAt,
+            }
+
+            this.logger.debug(
+                'SMUS DER: Successfully cached DER credentials for domain %s, cache expires in %s minutes',
+                this.domainId,
+                Math.round((cacheExpiresAt.getTime() - Date.now()) / 60000)
+            )
+
+            return awsCredentials
+        } catch (err) {
+            this.logger.error('SMUS DER: Failed to fetch credentials for domain %s: %s', this.domainId, err)
+            throw new ToolkitError(`Failed to fetch DER credentials for domain ${this.domainId}: ${err}`, {
+                code: 'DerCredentialsFetchFailed',
+                cause: err instanceof Error ? err : undefined,
+            })
+        }
+    }
+
+    /**
+     * Invalidates cached DER credentials
+     * Clears the internal cache without fetching new credentials
+     */
+    public invalidate(): void {
+        this.logger.debug(`SMUS DER: Invalidating cached DER credentials for domain ${this.domainId}`)
+        // Clear cache to force fresh fetch on next getCredentials() call
+        this.credentialCache = undefined
+        this.logger.debug(`SMUS DER: Successfully invalidated DER credentials cache for domain ${this.domainId}`)
+    }
+    /**
+     * Disposes of the provider and cleans up resources
+     */
+    public dispose(): void {
+        this.logger.debug(`SMUS DER: Disposing DER credentials provider for domain ${this.domainId}`)
+        this.invalidate()
+        this.logger.debug(`SMUS DER: Successfully disposed DER credentials provider for domain ${this.domainId}`)
+    }
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/auth/providers/projectRoleCredentialsProvider.ts b/packages/core/src/sagemakerunifiedstudio/auth/providers/projectRoleCredentialsProvider.ts
new file mode 100644
index 00000000000..5eb42e1fd5f
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/auth/providers/projectRoleCredentialsProvider.ts
@@ -0,0 +1,363 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { getLogger } from '../../../shared/logger/logger'
+import { ToolkitError } from '../../../shared/errors'
+import * as AWS from '@aws-sdk/types'
+import { CredentialsId, CredentialsProvider, CredentialsProviderType } from '../../../auth/providers/credentials'
+
+import { DataZoneClient } from '../../shared/client/datazoneClient'
+import { SmusAuthenticationProvider } from './smusAuthenticationProvider'
+import { CredentialType } from '../../../shared/telemetry/telemetry'
+import { SmusCredentialExpiry, validateCredentialFields } from '../../shared/smusUtils'
+import { loadMappings, saveMappings } from '../../../awsService/sagemaker/credentialMapping'
+
+/**
+ * Credentials provider for SageMaker Unified Studio Project Role credentials
+ * Uses Domain Execution Role (DER) credentials to get project-scoped credentials
+ * via the DataZone GetEnvironmentCredentials API
+ *
+ * This provider implements independent caching with 10-minute expiry and can be used
+ * with any AWS SDK client (S3Client, LambdaClient, etc.)
+ */
+export class ProjectRoleCredentialsProvider implements CredentialsProvider {
+    private readonly logger = getLogger()
+    private credentialCache?: {
+        credentials: AWS.Credentials
+        expiresAt: Date
+    }
+    private refreshTimer?: NodeJS.Timeout
+    private readonly refreshInterval = 10 * 60 * 1000 // 10 minutes
+    private readonly checkInterval = 10 * 1000 // 10 seconds - check frequently, refresh based on actual time
+    private sshRefreshActive = false
+    private lastRefreshTime?: Date
+
+    constructor(
+        private readonly smusAuthProvider: SmusAuthenticationProvider,
+        private readonly projectId: string
+    ) {}
+
+    /**
+     * Gets the project ID
+     * @returns Project ID
+     */
+    public getProjectId(): string {
+        return this.projectId
+    }
+
+    /**
+     * Gets the credentials ID
+     * @returns Credentials ID
+     */
+    public getCredentialsId(): CredentialsId {
+        return {
+            credentialSource: 'temp',
+            credentialTypeId: `${this.smusAuthProvider.getDomainId()}:${this.projectId}`,
+        }
+    }
+
+    /**
+     * Gets the provider type
+     * @returns Provider type
+     */
+    public getProviderType(): CredentialsProviderType {
+        return 'temp'
+    }
+
+    /**
+     * Gets the telemetry type
+     * @returns Telemetry type
+     */
+    public getTelemetryType(): CredentialType {
+        return 'other'
+    }
+
+    /**
+     * Gets the default region
+     * @returns Default region
+     */
+    public getDefaultRegion(): string | undefined {
+        return this.smusAuthProvider.getDomainRegion()
+    }
+
+    /**
+     * Gets the hash code
+     * @returns Hash code
+     */
+    public getHashCode(): string {
+        const hashCode = `smus-project:${this.smusAuthProvider.getDomainId()}:${this.projectId}`
+        return hashCode
+    }
+
+    /**
+     * Determines if the provider can auto-connect
+     * @returns Promise resolving to boolean
+     */
+    public async canAutoConnect(): Promise<boolean> {
+        return false // SMUS requires manual authentication
+    }
+
+    /**
+     * Determines if the provider is available
+     * @returns Promise resolving to boolean
+     */
+    public async isAvailable(): Promise<boolean> {
+        return this.smusAuthProvider.isConnected()
+    }
+
+    /**
+     * Gets Project Role credentials with independent caching
+     * @returns Promise resolving to credentials
+     */
+    public async getCredentials(): Promise<AWS.Credentials> {
+        this.logger.debug(`SMUS Project: Getting credentials for project ${this.projectId}`)
+
+        // Check cache first (10-minute expiry)
+        if (this.credentialCache && this.credentialCache.expiresAt > new Date()) {
+            this.logger.debug(`SMUS Project: Using cached project credentials for project ${this.projectId}`)
+            return this.credentialCache.credentials
+        }
+
+        this.logger.debug(`SMUS Project: Fetching project credentials from API for project ${this.projectId}`)
+
+        try {
+            const dataZoneClient = await DataZoneClient.getInstance(this.smusAuthProvider)
+            const response = await dataZoneClient.getProjectDefaultEnvironmentCreds(this.projectId)
+
+            this.logger.debug(
+                `SMUS Project: Successfully received response from GetEnvironmentCredentials API for project ${this.projectId}`
+            )
+
+            // Validate credential fields - credentials are returned directly in the response
+            validateCredentialFields(response, 'InvalidProjectCredentialResponse', 'project credential response')
+
+            // Create AWS credentials with expiration
+            // Use the expiration from the response if available, otherwise default to 10 minutes
+            let expiresAt: Date
+            if (response.expiration) {
+                // The API returns expiration as a string, parse it to Date
+                expiresAt = new Date(response.expiration)
+            } else {
+                expiresAt = new Date(Date.now() + SmusCredentialExpiry.projectExpiryMs)
+            }
+
+            const awsCredentials: AWS.Credentials = {
+                accessKeyId: response.accessKeyId as string,
+                secretAccessKey: response.secretAccessKey as string,
+                sessionToken: response.sessionToken as string,
+                expiration: expiresAt,
+            }
+
+            // Cache project credentials
+            this.credentialCache = {
+                credentials: awsCredentials,
+                expiresAt: expiresAt,
+            }
+
+            this.logger.debug(
+                'SMUS Project: Successfully cached project credentials for project %s, expires in %s minutes',
+                this.projectId,
+                Math.round((expiresAt.getTime() - Date.now()) / 60000)
+            )
+
+            // Write project credentials to mapping file to be used by Sagemaker local server for remote connections
+            await this.writeCredentialsToMapping(awsCredentials)
+
+            return awsCredentials
+        } catch (err) {
+            this.logger.error('SMUS Project: Failed to get project credentials for project %s: %s', this.projectId, err)
+
+            // Handle InvalidGrantException specially - indicates need for reauthentication
+            if (err instanceof Error && err.name === 'InvalidGrantException') {
+                // Invalidate cache when authentication fails
+                this.invalidate()
+                throw new ToolkitError(
+                    `Failed to get project credentials for project ${this.projectId}: ${err.message}. Reauthentication required.`,
+                    {
+                        code: 'InvalidRefreshToken',
+                        cause: err,
+                    }
+                )
+            }
+
+            throw new ToolkitError(`Failed to get project credentials for project ${this.projectId}: ${err}`, {
+                code: 'ProjectCredentialsFetchFailed',
+                cause: err instanceof Error ? err : undefined,
+            })
+        }
+    }
+
+    /**
+     * Writes project credentials to mapping file for local server usage
+     */
+    private async writeCredentialsToMapping(awsCredentials: AWS.Credentials): Promise<void> {
+        try {
+            const mapping = await loadMappings()
+            mapping.smusProjects ??= {}
+            mapping.smusProjects[this.projectId] = {
+                accessKey: awsCredentials.accessKeyId,
+                secret: awsCredentials.secretAccessKey,
+                token: awsCredentials.sessionToken || '',
+            }
+            await saveMappings(mapping)
+        } catch (err) {
+            this.logger.warn('SMUS Project: Failed to write project credentials to mapping file: %s', err)
+        }
+    }
+
+    /**
+     * Starts proactive credential refresh for SSH connections
+     *
+     * Uses an expiry-based approach with safety buffer:
+     * - Checks every 10 seconds using setTimeout
+     * - Refreshes when credentials expire within 5 minutes (safety buffer)
+     * - Falls back to 10-minute time-based refresh if no expiry information available
+     * - Handles sleep/resume because it uses wall-clock time for expiry checks
+     *
+     * This means credentials are refreshed just before they expire, reducing
+     * unnecessary API calls while ensuring credentials remain valid.
+     */
+    public startProactiveCredentialRefresh(): void {
+        if (this.sshRefreshActive) {
+            this.logger.debug(`SMUS Project: SSH refresh already active for project ${this.projectId}`)
+            return
+        }
+
+        this.logger.info(`SMUS Project: Starting SSH credential refresh for project ${this.projectId}`)
+        this.sshRefreshActive = true
+        this.lastRefreshTime = new Date() // Initialize refresh time
+
+        // Start the check timer (checks every 10 seconds, refreshes every 10 minutes based on actual time)
+        this.scheduleNextCheck()
+    }
+
+    /**
+     * Stops proactive credential refresh
+     * Called when SSH connection ends or SMUS disconnects
+     */
+    public stopProactiveCredentialRefresh(): void {
+        if (!this.sshRefreshActive) {
+            return
+        }
+
+        this.logger.info(`SMUS Project: Stopping SSH credential refresh for project ${this.projectId}`)
+        this.sshRefreshActive = false
+        this.lastRefreshTime = undefined
+
+        // Clean up timer
+        if (this.refreshTimer) {
+            clearTimeout(this.refreshTimer)
+            this.refreshTimer = undefined
+        }
+    }
+
+    /**
+     * Schedules the next credential check (every 10 seconds)
+     * Refreshes credentials when they expire within 5 minutes (safety buffer)
+     * Falls back to 10-minute time-based refresh if no expiry information available
+     * This handles sleep/resume scenarios correctly
+     */
+    private scheduleNextCheck(): void {
+        if (!this.sshRefreshActive) {
+            return
+        }
+        // Check every 10 seconds, but only refresh every 10 minutes based on actual time elapsed
+        this.refreshTimer = setTimeout(async () => {
+            try {
+                const now = new Date()
+                // Check if we need to refresh based on actual time elapsed
+                if (this.shouldPerformRefresh(now)) {
+                    await this.refresh()
+                }
+                // Schedule next check if still active
+                if (this.sshRefreshActive) {
+                    this.scheduleNextCheck()
+                }
+            } catch (error) {
+                this.logger.error(
+                    `SMUS Project: Failed to refresh credentials for project ${this.projectId}: %O`,
+                    error
+                )
+                // Continue trying even if refresh fails. Dispose will handle stopping the refresh.
+                if (this.sshRefreshActive) {
+                    this.scheduleNextCheck()
+                }
+            }
+        }, this.checkInterval)
+    }
+
+    /**
+     * Determines if a credential refresh should be performed based on credential expiration
+     * This handles sleep/resume scenarios properly and is more efficient than time-based refresh
+     */
+    private shouldPerformRefresh(now: Date): boolean {
+        if (!this.lastRefreshTime || !this.credentialCache) {
+            // First refresh or no cached credentials
+            this.logger.debug(`SMUS Project: First refresh - no previous credentials for ${this.projectId}`)
+            return true
+        }
+
+        // Check if credentials expire soon (with 5-minute safety buffer)
+        const safetyBufferMs = 5 * 60 * 1000 // 5 minutes before expiry
+        const expiryTime = this.credentialCache.credentials.expiration?.getTime()
+
+        if (!expiryTime) {
+            // No expiry info - fall back to time-based refresh as safety net
+            const timeSinceLastRefresh = now.getTime() - this.lastRefreshTime.getTime()
+            const shouldRefresh = timeSinceLastRefresh >= this.refreshInterval
+            return shouldRefresh
+        }
+
+        const timeUntilExpiry = expiryTime - now.getTime()
+        const shouldRefresh = timeUntilExpiry < safetyBufferMs
+        return shouldRefresh
+    }
+
+    /**
+     * Performs credential refresh by invalidating cache and fetching fresh credentials
+     */
+    private async refresh(): Promise<void> {
+        const now = new Date()
+        const expiryTime = this.credentialCache?.credentials.expiration?.getTime()
+
+        if (expiryTime) {
+            const minutesUntilExpiry = Math.round((expiryTime - now.getTime()) / 60000)
+            this.logger.debug(
+                `SMUS Project: Refreshing credentials for project ${this.projectId} - expires in ${minutesUntilExpiry} minutes`
+            )
+        } else {
+            const minutesSinceLastRefresh = this.lastRefreshTime
+                ? Math.round((now.getTime() - this.lastRefreshTime.getTime()) / 60000)
+                : 0
+            this.logger.debug(
+                `SMUS Project: Refreshing credentials for project ${this.projectId} - time-based refresh after ${minutesSinceLastRefresh} minutes`
+            )
+        }
+
+        await this.getCredentials()
+        this.lastRefreshTime = new Date()
+    }
+
+    /**
+     * Invalidates cached project credentials
+     * Clears the internal cache without fetching new credentials
+     */
+    public invalidate(): void {
+        this.logger.debug(`SMUS Project: Invalidating cached credentials for project ${this.projectId}`)
+        // Clear cache to force fresh fetch on next getCredentials() call
+        this.credentialCache = undefined
+        this.logger.debug(
+            `SMUS Project: Successfully invalidated project credentials cache for project ${this.projectId}`
+        )
+    }
+
+    /**
+     * Disposes of the provider and cleans up resources
+     */
+    public dispose(): void {
+        this.stopProactiveCredentialRefresh()
+        this.invalidate()
+    }
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/auth/providers/smusAuthenticationProvider.ts b/packages/core/src/sagemakerunifiedstudio/auth/providers/smusAuthenticationProvider.ts
new file mode 100644
index 00000000000..6c0f204cbd3
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/auth/providers/smusAuthenticationProvider.ts
@@ -0,0 +1,742 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { Auth } from '../../../auth/auth'
+import { getSecondaryAuth } from '../../../auth/secondaryAuth'
+import { ToolkitError } from '../../../shared/errors'
+import { withTelemetryContext } from '../../../shared/telemetry/util'
+import { SsoConnection } from '../../../auth/connection'
+import { showReauthenticateMessage } from '../../../shared/utilities/messages'
+import * as localizedText from '../../../shared/localizedText'
+import { ToolkitPromptSettings } from '../../../shared/settings'
+import { setContext, getContext } from '../../../shared/vscode/setContext'
+import { getLogger } from '../../../shared/logger/logger'
+import { SmusUtils, SmusErrorCodes, extractAccountIdFromResourceMetadata } from '../../shared/smusUtils'
+import { createSmusProfile, isValidSmusConnection, SmusConnection } from '../model'
+import { DomainExecRoleCredentialsProvider } from './domainExecRoleCredentialsProvider'
+import { ProjectRoleCredentialsProvider } from './projectRoleCredentialsProvider'
+import { ConnectionCredentialsProvider } from './connectionCredentialsProvider'
+import { ConnectionClientStore } from '../../shared/client/connectionClientStore'
+import { getResourceMetadata } from '../../shared/utils/resourceMetadataUtils'
+import { fromIni } from '@aws-sdk/credential-providers'
+import { randomUUID } from '../../../shared/crypto'
+import { DefaultStsClient } from '../../../shared/clients/stsClient'
+import { DataZoneClient } from '../../shared/client/datazoneClient'
+
+/**
+ * Sets the context variable for SageMaker Unified Studio connection state
+ * @param isConnected Whether SMUS is connected
+ */
+export function setSmusConnectedContext(isConnected: boolean): Promise<void> {
+    return setContext('aws.smus.connected', isConnected)
+}
+
+/**
+ * Sets the context variable for SMUS space environment state
+ * @param inSmusSpace Whether we're in SMUS space environment
+ */
+export function setSmusSpaceEnvironmentContext(inSmusSpace: boolean): Promise<void> {
+    return setContext('aws.smus.inSmusSpaceEnvironment', inSmusSpace)
+}
+const authClassName = 'SmusAuthenticationProvider'
+
+/**
+ * Authentication provider for SageMaker Unified Studio
+ * Manages authentication state and credentials for SMUS
+ */
+export class SmusAuthenticationProvider {
+    private readonly logger = getLogger()
+    public readonly onDidChangeActiveConnection = this.secondaryAuth.onDidChangeActiveConnection
+    private readonly onDidChangeEmitter = new vscode.EventEmitter<void>()
+    public readonly onDidChange = this.onDidChangeEmitter.event
+    private credentialsProviderCache = new Map<string, any>()
+    private projectCredentialProvidersCache = new Map<string, ProjectRoleCredentialsProvider>()
+    private connectionCredentialProvidersCache = new Map<string, ConnectionCredentialsProvider>()
+    private cachedDomainAccountId: string | undefined
+    private cachedProjectAccountIds = new Map<string, string>()
+
+    public constructor(
+        public readonly auth = Auth.instance,
+        public readonly secondaryAuth = getSecondaryAuth(
+            auth,
+            'smus',
+            'SageMaker Unified Studio',
+            isValidSmusConnection
+        )
+    ) {
+        this.onDidChangeActiveConnection(async () => {
+            // Stop SSH credential refresh for all projects when connection changes
+            this.stopAllSshCredentialRefresh()
+
+            // Invalidate any cached credentials for the previous connection
+            await this.invalidateAllCredentialsInCache()
+            // Clear credentials provider cache when connection changes
+            this.credentialsProviderCache.clear()
+            // Clear project provider cache when connection changes
+            this.projectCredentialProvidersCache.clear()
+            // Clear connection provider cache when connection changes
+            this.connectionCredentialProvidersCache.clear()
+            // Clear cached domain account ID when connection changes
+            this.cachedDomainAccountId = undefined
+            // Clear cached project account IDs when connection changes
+            this.cachedProjectAccountIds.clear()
+            // Clear all clients in client store when connection changes
+            ConnectionClientStore.getInstance().clearAll()
+            await setSmusConnectedContext(this.isConnected())
+            await setSmusSpaceEnvironmentContext(SmusUtils.isInSmusSpaceEnvironment())
+            this.onDidChangeEmitter.fire()
+        })
+
+        // Set initial context in case event does not trigger
+        void setSmusConnectedContext(this.isConnectionValid())
+        void setSmusSpaceEnvironmentContext(SmusUtils.isInSmusSpaceEnvironment())
+    }
+
+    /**
+     * Stops SSH credential refresh for all projects
+     * Called when SMUS connection changes or extension deactivates
+     */
+    public stopAllSshCredentialRefresh(): void {
+        this.logger.debug('SMUS Auth: Stopping SSH credential refresh for all projects')
+        for (const provider of this.projectCredentialProvidersCache.values()) {
+            provider.stopProactiveCredentialRefresh()
+        }
+    }
+
+    /**
+     * Gets the active connection
+     */
+    public get activeConnection() {
+        if (getContext('aws.smus.inSmusSpaceEnvironment')) {
+            const resourceMetadata = getResourceMetadata()!
+            if (resourceMetadata.AdditionalMetadata!.DataZoneDomainRegion) {
+                return {
+                    domainId: resourceMetadata.AdditionalMetadata!.DataZoneDomainId!,
+                    ssoRegion: resourceMetadata.AdditionalMetadata!.DataZoneDomainRegion!,
+                    // The following fields won't be needed in SMUS space environment
+                    // Craft the domain url with known information
+                    // Use randome id as placeholder
+                    domainUrl: `https://${resourceMetadata.AdditionalMetadata!.DataZoneDomainId!}.sagemaker.${resourceMetadata.AdditionalMetadata!.DataZoneDomainRegion!}.on.aws/`,
+                    id: randomUUID(),
+                }
+            } else {
+                throw new ToolkitError('Domain region not found in metadata file.')
+            }
+        }
+        return this.secondaryAuth.activeConnection
+    }
+
+    /**
+     * Checks if using a saved connection
+     */
+    public get isUsingSavedConnection() {
+        return this.secondaryAuth.hasSavedConnection
+    }
+
+    /**
+     * Checks if the connection is valid
+     */
+    public isConnectionValid(): boolean {
+        // When in SMUS space, the extension is already running in projet context and sign in is not needed
+        // Set isConnectionValid to always true
+        if (getContext('aws.smus.inSmusSpaceEnvironment')) {
+            return true
+        }
+        return this.activeConnection !== undefined && !this.secondaryAuth.isConnectionExpired
+    }
+
+    /**
+     * Checks if connected to SMUS
+     */
+    public isConnected(): boolean {
+        // When in SMUS space, the extension is already running in projet context and sign in is not needed
+        // Set isConnected to always true
+        if (getContext('aws.smus.inSmusSpaceEnvironment')) {
+            return true
+        }
+        return this.activeConnection !== undefined
+    }
+
+    /**
+     * Restores the previous connection
+     * Uses a promise to prevent multiple simultaneous restore calls
+     */
+    public async restore() {
+        await this.secondaryAuth.restoreConnection()
+    }
+
+    /**
+     * Authenticates with SageMaker Unified Studio using a domain URL
+     * @param domainUrl The SageMaker Unified Studio domain URL
+     * @returns Promise resolving to the connection
+     */
+    @withTelemetryContext({ name: 'connectToSmus', class: authClassName })
+    public async connectToSmus(domainUrl: string): Promise<SmusConnection> {
+        const logger = getLogger()
+
+        try {
+            // Extract domain info using SmusUtils
+            const { domainId, region } = SmusUtils.extractDomainInfoFromUrl(domainUrl)
+
+            // Validate domain ID
+            if (!domainId) {
+                throw new ToolkitError('Invalid domain URL format', { code: 'InvalidDomainUrl' })
+            }
+
+            logger.info(`SMUS: Connecting to domain ${domainId} in region ${region}`)
+
+            // Check if we already have a connection for this domain
+            const existingConn = (await this.auth.listConnections()).find(
+                (c): c is SmusConnection =>
+                    isValidSmusConnection(c) && (c as any).domainUrl?.toLowerCase() === domainUrl.toLowerCase()
+            )
+
+            if (existingConn) {
+                const connectionState = this.auth.getConnectionState(existingConn)
+                logger.info(`SMUS: Found existing connection ${existingConn.id} with state: ${connectionState}`)
+
+                // If connection is valid, use it directly without triggering new auth flow
+                if (connectionState === 'valid') {
+                    logger.info('SMUS: Using existing valid connection')
+
+                    // Use the existing connection
+                    const result = await this.secondaryAuth.useNewConnection(existingConn)
+
+                    // Auto-invoke project selection after successful sign-in (but not in SMUS space environment)
+                    if (!SmusUtils.isInSmusSpaceEnvironment()) {
+                        void vscode.commands.executeCommand('aws.smus.switchProject')
+                    }
+
+                    return result
+                }
+
+                // If connection is invalid or expired, reauthenticate
+                if (connectionState === 'invalid') {
+                    logger.info('SMUS: Existing connection is invalid, reauthenticating')
+                    const reauthenticatedConn = await this.reauthenticate(existingConn)
+
+                    // Create the SMUS connection wrapper
+                    const smusConn: SmusConnection = {
+                        ...reauthenticatedConn,
+                        domainUrl,
+                        domainId,
+                    }
+
+                    const result = await this.secondaryAuth.useNewConnection(smusConn)
+                    logger.debug(`SMUS: Reauthenticated connection successfully, id=${result.id}`)
+
+                    // Auto-invoke project selection after successful reauthentication (but not in SMUS space environment)
+                    if (!SmusUtils.isInSmusSpaceEnvironment()) {
+                        void vscode.commands.executeCommand('aws.smus.switchProject')
+                    }
+
+                    return result
+                }
+            }
+
+            // No existing connection found, create a new one
+            logger.info('SMUS: No existing connection found, creating new connection')
+
+            // Get SSO instance info from DataZone
+            const ssoInstanceInfo = await SmusUtils.getSsoInstanceInfo(domainUrl)
+
+            // Create a new connection with appropriate scope based on domain URL
+            const profile = createSmusProfile(domainUrl, domainId, ssoInstanceInfo.issuerUrl, ssoInstanceInfo.region)
+            const newConn = await this.auth.createConnection(profile)
+            logger.debug(`SMUS: Created new connection ${newConn.id}`)
+
+            const smusConn: SmusConnection = {
+                ...newConn,
+                domainUrl,
+                domainId,
+            }
+
+            const result = await this.secondaryAuth.useNewConnection(smusConn)
+
+            // Auto-invoke project selection after successful sign-in (but not in SMUS space environment)
+            if (!SmusUtils.isInSmusSpaceEnvironment()) {
+                void vscode.commands.executeCommand('aws.smus.switchProject')
+            }
+
+            return result
+        } catch (e) {
+            throw ToolkitError.chain(e, 'Failed to connect to SageMaker Unified Studio', {
+                code: 'FailedToConnect',
+            })
+        }
+    }
+
+    /**
+     * Reauthenticates an existing connection
+     * @param conn Connection to reauthenticate
+     * @returns Promise resolving to the reauthenticated connection
+     */
+    @withTelemetryContext({ name: 'reauthenticate', class: authClassName })
+    public async reauthenticate(conn: SsoConnection) {
+        try {
+            return await this.auth.reauthenticate(conn)
+        } catch (err) {
+            throw ToolkitError.chain(err, 'Unable to reauthenticate SageMaker Unified Studio connection.')
+        }
+    }
+
+    /**
+     * Shows a reauthentication prompt to the user
+     * @param conn Connection to reauthenticate
+     */
+    public async showReauthenticationPrompt(conn: SsoConnection): Promise<void> {
+        await showReauthenticateMessage({
+            message: localizedText.connectionExpired('SageMaker Unified Studio'),
+            connect: localizedText.reauthenticate,
+            suppressId: 'smusConnectionExpired',
+            settings: ToolkitPromptSettings.instance,
+            source: 'SageMaker Unified Studio',
+            reauthFunc: async () => {
+                await this.reauthenticate(conn)
+            },
+        })
+    }
+
+    /**
+     * Gets the current SSO access token for the active connection
+     * @returns Promise resolving to the access token string
+     * @throws ToolkitError if unable to retrieve access token
+     */
+    public async getAccessToken(): Promise<string> {
+        const logger = getLogger()
+
+        if (!this.activeConnection) {
+            throw new ToolkitError('No active SMUS connection available', { code: SmusErrorCodes.NoActiveConnection })
+        }
+
+        try {
+            const accessToken = await this.auth.getSsoAccessToken(this.activeConnection)
+            logger.debug(`SMUS: Successfully retrieved SSO access token for connection ${this.activeConnection.id}`)
+
+            return accessToken
+        } catch (err) {
+            logger.error(
+                `SMUS: Failed to retrieve SSO access token for connection ${this.activeConnection.id}: %s`,
+                err
+            )
+
+            // Check if this is a reauth error that should be handled by showing SMUS-specific prompt
+            if (err instanceof ToolkitError && err.code === 'InvalidConnection') {
+                // Re-throw the error to maintain the error flow
+                logger.debug(
+                    `SMUS: Auth connection has been marked invalid - Likely due to expiry. Reauthentication flow will be triggered, ignoring error`
+                )
+            }
+
+            throw new ToolkitError(`Failed to retrieve SSO access token for connection ${this.activeConnection.id}`, {
+                code: SmusErrorCodes.RedeemAccessTokenFailed,
+                cause: err instanceof Error ? err : undefined,
+            })
+        }
+    }
+
+    /**
+     * Gets or creates a project credentials provider for the specified project
+     * @param projectId The project ID to get credentials for
+     * @returns Promise resolving to the project credentials provider
+     */
+    public async getProjectCredentialProvider(projectId: string): Promise<ProjectRoleCredentialsProvider> {
+        const logger = getLogger()
+
+        if (!this.activeConnection) {
+            throw new ToolkitError('No active SMUS connection available', { code: SmusErrorCodes.NoActiveConnection })
+        }
+
+        logger.debug(`SMUS: Getting project provider for project ${projectId}`)
+
+        // Check if we already have a cached provider for this project
+        if (this.projectCredentialProvidersCache.has(projectId)) {
+            logger.debug('SMUS: Using cached project provider')
+            return this.projectCredentialProvidersCache.get(projectId)!
+        }
+
+        logger.debug('SMUS: Creating new project provider')
+        // Create a new project provider and cache it
+        const projectProvider = new ProjectRoleCredentialsProvider(this, projectId)
+        this.projectCredentialProvidersCache.set(projectId, projectProvider)
+
+        logger.debug('SMUS: Cached new project provider')
+
+        return projectProvider
+    }
+
+    /**
+     * Gets or creates a connection credentials provider for the specified connection
+     * @param connectionId The connection ID to get credentials for
+     * @param projectId The project ID that owns the connection
+     * @param region The region for the connection
+     * @returns Promise resolving to the connection credentials provider
+     */
+    public async getConnectionCredentialsProvider(
+        connectionId: string,
+        projectId: string,
+        region: string
+    ): Promise<ConnectionCredentialsProvider> {
+        const logger = getLogger()
+
+        if (!this.activeConnection) {
+            throw new ToolkitError('No active SMUS connection available', { code: SmusErrorCodes.NoActiveConnection })
+        }
+
+        const cacheKey = `${this.activeConnection.domainId}:${projectId}:${connectionId}`
+        logger.debug(`SMUS: Getting connection provider for connection ${connectionId}`)
+
+        // Check if we already have a cached provider for this connection
+        if (this.connectionCredentialProvidersCache.has(cacheKey)) {
+            logger.debug('SMUS: Using cached connection provider')
+            return this.connectionCredentialProvidersCache.get(cacheKey)!
+        }
+
+        logger.debug('SMUS: Creating new connection provider')
+        // Create a new connection provider and cache it
+        const connectionProvider = new ConnectionCredentialsProvider(this, connectionId)
+        this.connectionCredentialProvidersCache.set(cacheKey, connectionProvider)
+
+        logger.debug('SMUS: Cached new connection provider')
+
+        return connectionProvider
+    }
+
+    /**
+     * Gets the domain ID from the active connection
+     * @returns Domain ID
+     */
+    public getDomainId(): string {
+        if (getContext('aws.smus.inSmusSpaceEnvironment')) {
+            return getResourceMetadata()!.AdditionalMetadata!.DataZoneDomainId!
+        }
+
+        if (!this.activeConnection) {
+            throw new ToolkitError('No active SMUS connection available', { code: SmusErrorCodes.NoActiveConnection })
+        }
+        return this.activeConnection.domainId
+    }
+
+    /**
+     * Gets the domain URL from the active connection
+     * @returns Domain URL
+     */
+    public getDomainUrl(): string {
+        if (!this.activeConnection) {
+            throw new ToolkitError('No active SMUS connection available', { code: SmusErrorCodes.NoActiveConnection })
+        }
+        return this.activeConnection.domainUrl
+    }
+
+    /**
+     * Gets the AWS account ID for the active domain connection
+     * In SMUS space environment, extracts from ResourceArn in metadata
+     * Otherwise, makes an STS GetCallerIdentity call using DER credentials and caches the result
+     * @returns Promise resolving to the domain's AWS account ID
+     * @throws ToolkitError if unable to retrieve account ID
+     */
+    public async getDomainAccountId(): Promise<string> {
+        const logger = getLogger()
+
+        // Return cached value if available
+        if (this.cachedDomainAccountId) {
+            logger.debug('SMUS: Using cached domain account ID')
+            return this.cachedDomainAccountId
+        }
+
+        // If in SMUS space environment, extract account ID from resource-metadata file
+        if (getContext('aws.smus.inSmusSpaceEnvironment')) {
+            const accountId = await extractAccountIdFromResourceMetadata()
+
+            // Cache the account ID
+            this.cachedDomainAccountId = accountId
+            logger.debug(`Successfully cached domain account ID: ${accountId}`)
+
+            return accountId
+        }
+
+        if (!this.activeConnection) {
+            throw new ToolkitError('No active SMUS connection available', { code: SmusErrorCodes.NoActiveConnection })
+        }
+
+        // Use existing STS GetCallerIdentity implementation for non-SMUS space environments
+        try {
+            logger.debug('Fetching domain account ID via STS GetCallerIdentity')
+
+            // Get DER credentials provider
+            const derCredProvider = await this.getDerCredentialsProvider()
+
+            // Get the region for STS client
+            const region = this.getDomainRegion()
+
+            // Create STS client with DER credentials
+            const stsClient = new DefaultStsClient(region, await derCredProvider.getCredentials())
+
+            // Make GetCallerIdentity call
+            const callerIdentity = await stsClient.getCallerIdentity()
+
+            if (!callerIdentity.Account) {
+                throw new ToolkitError('Account ID not found in STS GetCallerIdentity response', {
+                    code: SmusErrorCodes.AccountIdNotFound,
+                })
+            }
+
+            // Cache the account ID
+            this.cachedDomainAccountId = callerIdentity.Account
+
+            logger.debug(`Successfully retrieved and cached domain account ID: ${callerIdentity.Account}`)
+
+            return callerIdentity.Account
+        } catch (err) {
+            logger.error(`Failed to retrieve domain account ID: %s`, err)
+
+            throw new ToolkitError('Failed to retrieve AWS account ID for active domain connection', {
+                code: SmusErrorCodes.GetDomainAccountIdFailed,
+                cause: err instanceof Error ? err : undefined,
+            })
+        }
+    }
+
+    /**
+     * Gets the AWS account ID for a specific project using project credentials
+     * In SMUS space environment, extracts from ResourceArn in metadata (same as domain account)
+     * Otherwise, makes an STS GetCallerIdentity call using project credentials
+     * @param projectId The DataZone project ID
+     * @returns Promise resolving to the project's AWS account ID
+     */
+    public async getProjectAccountId(projectId: string): Promise<string> {
+        const logger = getLogger()
+
+        // Return cached value if available
+        if (this.cachedProjectAccountIds.has(projectId)) {
+            logger.debug(`SMUS: Using cached project account ID for project ${projectId}`)
+            return this.cachedProjectAccountIds.get(projectId)!
+        }
+
+        // If in SMUS space environment, extract account ID from resource-metadata file
+        if (getContext('aws.smus.inSmusSpaceEnvironment')) {
+            const accountId = await extractAccountIdFromResourceMetadata()
+
+            // Cache the account ID
+            this.cachedProjectAccountIds.set(projectId, accountId)
+            logger.debug(`Successfully cached project account ID for project ${projectId}: ${accountId}`)
+
+            return accountId
+        }
+
+        if (!this.activeConnection) {
+            throw new ToolkitError('No active SMUS connection available', { code: SmusErrorCodes.NoActiveConnection })
+        }
+
+        // For non-SMUS space environments, use project credentials with STS
+        try {
+            logger.debug('Fetching project account ID via STS GetCallerIdentity with project credentials')
+
+            // Get project credentials
+            const projectCredProvider = await this.getProjectCredentialProvider(projectId)
+            const projectCreds = await projectCredProvider.getCredentials()
+
+            // Get project region from tooling environment
+            const dzClient = await DataZoneClient.getInstance(this)
+            const toolingEnv = await dzClient.getToolingEnvironment(projectId)
+            const projectRegion = toolingEnv.awsAccountRegion
+
+            if (!projectRegion) {
+                throw new ToolkitError('No AWS account region found in tooling environment', {
+                    code: SmusErrorCodes.RegionNotFound,
+                })
+            }
+
+            // Use STS to get account ID from project credentials
+            const stsClient = new DefaultStsClient(projectRegion, projectCreds)
+            const callerIdentity = await stsClient.getCallerIdentity()
+
+            if (!callerIdentity.Account) {
+                throw new ToolkitError('Account ID not found in STS GetCallerIdentity response', {
+                    code: SmusErrorCodes.AccountIdNotFound,
+                })
+            }
+
+            // Cache the account ID
+            this.cachedProjectAccountIds.set(projectId, callerIdentity.Account)
+            logger.debug(
+                `Successfully retrieved and cached project account ID for project ${projectId}: ${callerIdentity.Account}`
+            )
+
+            return callerIdentity.Account
+        } catch (err) {
+            logger.error('Failed to get project account ID: %s', err as Error)
+            throw new ToolkitError(`Failed to get project account ID: ${(err as Error).message}`, {
+                code: SmusErrorCodes.GetProjectAccountIdFailed,
+            })
+        }
+    }
+
+    public getDomainRegion(): string {
+        if (getContext('aws.smus.inSmusSpaceEnvironment')) {
+            const resourceMetadata = getResourceMetadata()!
+            if (resourceMetadata.AdditionalMetadata!.DataZoneDomainRegion) {
+                return resourceMetadata.AdditionalMetadata!.DataZoneDomainRegion
+            } else {
+                throw new ToolkitError('Domain region not found in metadata file.')
+            }
+        }
+
+        if (!this.activeConnection) {
+            throw new ToolkitError('No active SMUS connection available', { code: SmusErrorCodes.NoActiveConnection })
+        }
+        return this.activeConnection.ssoRegion
+    }
+
+    /**
+     * Gets or creates a cached credentials provider for the active connection
+     * @returns Promise resolving to the credentials provider
+     */
+    public async getDerCredentialsProvider(): Promise<any> {
+        const logger = getLogger()
+
+        if (getContext('aws.smus.inSmusSpaceEnvironment')) {
+            // When in SMUS space, DomainExecutionRoleCreds can be found in config file
+            // Read the credentials from credential profile DomainExecutionRoleCreds
+            const credentials = fromIni({ profile: 'DomainExecutionRoleCreds' })
+            return {
+                getCredentials: async () => await credentials(),
+            }
+        }
+
+        if (!this.activeConnection) {
+            throw new ToolkitError('No active SMUS connection available', { code: SmusErrorCodes.NoActiveConnection })
+        }
+
+        // Create a cache key based on the connection details
+        const cacheKey = `${this.activeConnection.ssoRegion}:${this.activeConnection.domainId}`
+
+        logger.debug(`SMUS: Getting credentials provider for cache key: ${cacheKey}`)
+
+        // Check if we already have a cached provider
+        if (this.credentialsProviderCache.has(cacheKey)) {
+            logger.debug('SMUS: Using cached credentials provider')
+            return this.credentialsProviderCache.get(cacheKey)
+        }
+
+        logger.debug('SMUS: Creating new credentials provider')
+
+        // Create a new provider and cache it
+        const provider = new DomainExecRoleCredentialsProvider(
+            this.activeConnection.domainUrl,
+            this.activeConnection.domainId,
+            this.activeConnection.ssoRegion,
+            async () => await this.getAccessToken()
+        )
+
+        this.credentialsProviderCache.set(cacheKey, provider)
+        logger.debug('SMUS: Cached new credentials provider')
+
+        return provider
+    }
+
+    /**
+     * Invalidates all cached credentials (for all connections)
+     * Used during connection changes or logout
+     */
+    private async invalidateAllCredentialsInCache(): Promise<void> {
+        const logger = getLogger()
+        logger.debug('SMUS: Invalidating all cached credentials')
+
+        // Clear all cached DER providers and their internal credentials
+        for (const [cacheKey, provider] of this.credentialsProviderCache.entries()) {
+            try {
+                provider.invalidate() // This will clear the provider's internal cache
+                logger.debug(`SMUS: Invalidated credentials for cache key: ${cacheKey}`)
+            } catch (err) {
+                logger.warn(`SMUS: Failed to invalidate credentials for cache key ${cacheKey}: %s`, err)
+            }
+        }
+
+        // Clear all cached project providers and their internal credentials
+
+        await this.invalidateAllProjectCredentialsInCache()
+        // Clear all cached connection providers and their internal credentials
+        for (const [cacheKey, connectionProvider] of this.connectionCredentialProvidersCache.entries()) {
+            try {
+                connectionProvider.invalidate() // This will clear the connection provider's internal cache
+                logger.debug(`SMUS: Invalidated connection credentials for cache key: ${cacheKey}`)
+            } catch (err) {
+                logger.warn(`SMUS: Failed to invalidate connection credentials for cache key ${cacheKey}: %s`, err)
+            }
+        }
+
+        // Clear cached domain account ID
+        this.cachedDomainAccountId = undefined
+        logger.debug('SMUS: Cleared cached domain account ID')
+
+        // Clear cached project account IDs
+        this.cachedProjectAccountIds.clear()
+        logger.debug('SMUS: Cleared cached project account IDs')
+    }
+
+    /**
+     * Invalidates all project cached credentials
+     */
+    public async invalidateAllProjectCredentialsInCache(): Promise<void> {
+        const logger = getLogger()
+        logger.debug('SMUS: Invalidating all cached project credentials')
+
+        for (const [projectId, projectProvider] of this.projectCredentialProvidersCache.entries()) {
+            try {
+                projectProvider.invalidate() // This will clear the project provider's internal cache
+                logger.debug(`SMUS: Invalidated project credentials for project: ${projectId}`)
+            } catch (err) {
+                logger.warn(`SMUS: Failed to invalidate project credentials for project ${projectId}: %s`, err)
+            }
+        }
+    }
+
+    /**
+     * Stops SSH credential refresh and cleans up resources
+     */
+    public dispose(): void {
+        this.logger.debug('SMUS Auth: Disposing authentication provider and all cached providers')
+
+        // Dispose all project providers
+        for (const provider of this.projectCredentialProvidersCache.values()) {
+            provider.dispose()
+        }
+        this.projectCredentialProvidersCache.clear()
+
+        // Dispose all connection providers
+        for (const provider of this.connectionCredentialProvidersCache.values()) {
+            provider.dispose()
+        }
+        this.connectionCredentialProvidersCache.clear()
+
+        // Dispose all DER providers in the general cache
+        for (const provider of this.credentialsProviderCache.values()) {
+            if (provider && typeof provider.dispose === 'function') {
+                provider.dispose()
+            }
+        }
+        this.credentialsProviderCache.clear()
+
+        // Clear cached domain account ID
+        this.cachedDomainAccountId = undefined
+
+        // Clear cached project account IDs
+        this.cachedProjectAccountIds.clear()
+
+        this.logger.debug('SMUS Auth: Successfully disposed authentication provider')
+    }
+
+    static #instance: SmusAuthenticationProvider | undefined
+
+    public static get instance(): SmusAuthenticationProvider | undefined {
+        return SmusAuthenticationProvider.#instance
+    }
+
+    public static fromContext() {
+        return (this.#instance ??= new this())
+    }
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/activation.ts b/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/activation.ts
new file mode 100644
index 00000000000..97ffadacc69
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/activation.ts
@@ -0,0 +1,80 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { Constants } from './models/constants'
+import {
+    getStatusBarProviders,
+    showConnectionQuickPick,
+    showProjectQuickPick,
+    parseNotebookCells,
+} from './commands/commands'
+
+/**
+ * Activates the SageMaker Unified Studio Connection Magics Selector feature.
+ *
+ * @param extensionContext The extension context
+ */
+export async function activate(extensionContext: vscode.ExtensionContext): Promise<void> {
+    extensionContext.subscriptions.push(
+        vscode.commands.registerCommand(Constants.CONNECTION_COMMAND, () => showConnectionQuickPick()),
+        vscode.commands.registerCommand(Constants.PROJECT_COMMAND, () => showProjectQuickPick())
+    )
+
+    if ('NotebookEdit' in vscode) {
+        const { connectionProvider, projectProvider, separatorProvider } = getStatusBarProviders()
+
+        extensionContext.subscriptions.push(
+            vscode.notebooks.registerNotebookCellStatusBarItemProvider('jupyter-notebook', connectionProvider),
+            vscode.notebooks.registerNotebookCellStatusBarItemProvider('jupyter-notebook', projectProvider),
+            vscode.notebooks.registerNotebookCellStatusBarItemProvider('jupyter-notebook', separatorProvider)
+        )
+
+        extensionContext.subscriptions.push(
+            vscode.window.onDidChangeActiveNotebookEditor(async () => {
+                await parseNotebookCells()
+            })
+        )
+
+        extensionContext.subscriptions.push(vscode.workspace.onDidChangeTextDocument(handleTextDocumentChange))
+
+        void parseNotebookCells()
+    }
+}
+
+/**
+ * Handles text document changes to update status bar when cells are manually edited
+ */
+function handleTextDocumentChange(event: vscode.TextDocumentChangeEvent): void {
+    if (event.document.uri.scheme !== 'vscode-notebook-cell') {
+        return
+    }
+
+    const editor = vscode.window.activeNotebookEditor
+    if (!editor) {
+        return
+    }
+
+    let changedCell: vscode.NotebookCell | undefined
+    for (let i = 0; i < editor.notebook.cellCount; i++) {
+        const cell = editor.notebook.cellAt(i)
+        if (cell.document.uri.toString() === event.document.uri.toString()) {
+            changedCell = cell
+            break
+        }
+    }
+
+    if (changedCell && changedCell.kind === vscode.NotebookCellKind.Code) {
+        const { notebookStateManager } = require('./services/notebookStateManager')
+
+        notebookStateManager.parseCellMagic(changedCell)
+
+        setTimeout(() => {
+            const { connectionProvider, projectProvider } = getStatusBarProviders()
+            connectionProvider.refreshCellStatusBar()
+            projectProvider.refreshCellStatusBar()
+        }, 100)
+    }
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/client/connectedSpaceDataZoneClient.ts b/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/client/connectedSpaceDataZoneClient.ts
new file mode 100644
index 00000000000..8f0998e295f
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/client/connectedSpaceDataZoneClient.ts
@@ -0,0 +1,109 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { DataZone, ListConnectionsCommandOutput } from '@aws-sdk/client-datazone'
+import { getLogger } from '../../../shared/logger/logger'
+
+/**
+ * Represents a DataZone connection
+ */
+export interface DataZoneConnection {
+    connectionId: string
+    name: string
+    type: string
+    props?: Record<string, any>
+}
+
+/**
+ * DataZone client for use in a SageMaker Unified Studio connected space
+ * Uses the user's current AWS credentials (project role credentials)
+ */
+export class ConnectedSpaceDataZoneClient {
+    private datazoneClient: DataZone | undefined
+    private readonly logger = getLogger()
+
+    constructor(
+        private readonly region: string,
+        private readonly customEndpoint?: string
+    ) {}
+
+    /**
+     * Gets the DataZone client, initializing it if necessary
+     * Uses default AWS credentials from the environment (project role)
+     * Supports custom endpoints for non-production environments
+     */
+    private getDataZoneClient(): DataZone {
+        if (!this.datazoneClient) {
+            try {
+                const clientConfig: any = {
+                    region: this.region,
+                }
+
+                // Use custom endpoint if provided (for non-prod environments)
+                if (this.customEndpoint) {
+                    clientConfig.endpoint = this.customEndpoint
+                    this.logger.debug(
+                        `ConnectedSpaceDataZoneClient: Using custom DataZone endpoint: ${this.customEndpoint}`
+                    )
+                } else {
+                    this.logger.debug(
+                        `ConnectedSpaceDataZoneClient: Using default AWS DataZone endpoint for region: ${this.region}`
+                    )
+                }
+
+                this.logger.debug('ConnectedSpaceDataZoneClient: Creating DataZone client with default credentials')
+                this.datazoneClient = new DataZone(clientConfig)
+                this.logger.debug('ConnectedSpaceDataZoneClient: Successfully created DataZone client')
+            } catch (err) {
+                this.logger.error('ConnectedSpaceDataZoneClient: Failed to create DataZone client: %s', err as Error)
+                throw err
+            }
+        }
+        return this.datazoneClient
+    }
+
+    /**
+     * Lists the connections in a DataZone domain and project
+     * @param domainId The DataZone domain identifier
+     * @param projectId The DataZone project identifier
+     * @returns List of connections
+     */
+    public async listConnections(domainId: string, projectId: string): Promise<DataZoneConnection[]> {
+        try {
+            this.logger.info(
+                `ConnectedSpaceDataZoneClient: Listing connections for domain ${domainId}, project ${projectId}`
+            )
+
+            const datazoneClient = this.getDataZoneClient()
+
+            const response: ListConnectionsCommandOutput = await datazoneClient.listConnections({
+                domainIdentifier: domainId,
+                projectIdentifier: projectId,
+            })
+
+            if (!response.items || response.items.length === 0) {
+                this.logger.info(
+                    `ConnectedSpaceDataZoneClient: No connections found for domain ${domainId}, project ${projectId}`
+                )
+                return []
+            }
+
+            const connections: DataZoneConnection[] = response.items.map((connection) => ({
+                connectionId: connection.connectionId || '',
+                name: connection.name || '',
+                type: connection.type || '',
+                props: connection.props || {},
+            }))
+
+            this.logger.info(
+                `ConnectedSpaceDataZoneClient: Found ${connections.length} connections for domain ${domainId}, project ${projectId}`
+            )
+            return connections
+        } catch (err) {
+            this.logger.error('ConnectedSpaceDataZoneClient: Failed to list connections: %s', err as Error)
+            throw err
+        }
+    }
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/commands/commands.ts b/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/commands/commands.ts
new file mode 100644
index 00000000000..01e269004c7
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/commands/commands.ts
@@ -0,0 +1,195 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { connectionOptionsService } from '../services/connectionOptionsService'
+import { notebookStateManager } from '../services/notebookStateManager'
+import {
+    ConnectionStatusBarProvider,
+    ProjectStatusBarProvider,
+    SeparatorStatusBarProvider,
+} from '../providers/notebookStatusBarProviders'
+import { Constants } from '../models/constants'
+
+let connectionProvider: ConnectionStatusBarProvider | undefined
+let projectProvider: ProjectStatusBarProvider | undefined
+let separatorProvider: SeparatorStatusBarProvider | undefined
+
+/**
+ * Gets the status bar providers for registration, auto-initializing if needed
+ */
+export function getStatusBarProviders(): {
+    connectionProvider: ConnectionStatusBarProvider
+    projectProvider: ProjectStatusBarProvider
+    separatorProvider: SeparatorStatusBarProvider
+} {
+    if (!connectionProvider) {
+        connectionProvider = new ConnectionStatusBarProvider(3, Constants.CONNECTION_COMMAND)
+    }
+    if (!projectProvider) {
+        projectProvider = new ProjectStatusBarProvider(2, Constants.PROJECT_COMMAND)
+    }
+    if (!separatorProvider) {
+        separatorProvider = new SeparatorStatusBarProvider(1)
+    }
+
+    return {
+        connectionProvider,
+        projectProvider,
+        separatorProvider,
+    }
+}
+
+/**
+ * Sets the selected connection for a cell and updates the magic command
+ */
+export async function setSelectedConnection(cell: vscode.NotebookCell, connectionLabel: string): Promise<void> {
+    notebookStateManager.setSelectedConnection(cell, connectionLabel, true)
+    await notebookStateManager.updateCellWithMagic(cell)
+}
+
+/**
+ * Sets the selected project for a cell and updates the magic command
+ */
+export async function setSelectedProject(cell: vscode.NotebookCell, projectLabel: string): Promise<void> {
+    notebookStateManager.setSelectedProject(cell, projectLabel)
+    await notebookStateManager.updateCellWithMagic(cell)
+}
+
+/**
+ * Shows a quick pick menu for selecting a connection type and sets the connection for the active cell
+ */
+export async function showConnectionQuickPick(): Promise<void> {
+    const editor = vscode.window.activeNotebookEditor
+    if (!editor) {
+        return
+    }
+
+    const cell = editor.selection.start !== undefined ? editor.notebook.cellAt(editor.selection.start) : undefined
+    if (!cell) {
+        return
+    }
+
+    await connectionOptionsService.updateConnectionAndProjectOptions()
+
+    const connectionOptions = connectionOptionsService.getConnectionOptionsSync()
+
+    // Sort connections based on preferred connection order
+    const sortedOptions = connectionOptions.sort((a, b) => {
+        // Comparison logic
+        const aIndex = Constants.CONNECTION_QUICK_PICK_ORDER.indexOf(a.label as any)
+        const bIndex = Constants.CONNECTION_QUICK_PICK_ORDER.indexOf(b.label as any)
+
+        // If both are in the priority list, sort by their position
+        if (aIndex !== -1 && bIndex !== -1) {
+            return aIndex - bIndex
+        }
+        // If only 'a' is in the priority list, it comes first
+        if (aIndex !== -1) {
+            return -1
+        }
+        // If only 'b' is in the priority list, it comes first
+        if (bIndex !== -1) {
+            return 1
+        }
+        // If neither is in the priority list, maintain original order
+        return 0
+    })
+
+    const quickPickItems: vscode.QuickPickItem[] = sortedOptions.map((option) => {
+        return {
+            label: option.label,
+            description: `(${option.magic})`,
+            iconPath: new vscode.ThemeIcon('plug'),
+        }
+    })
+
+    const selected = await vscode.window.showQuickPick(quickPickItems, {
+        placeHolder: Constants.CONNECTION_QUICK_PICK_LABEL_PLACEHOLDER,
+    })
+
+    if (selected) {
+        const connectionLabel = selected.detail || selected.label
+        await setSelectedConnection(cell, connectionLabel)
+    }
+}
+
+/**
+ * Shows a quick pick menu for selecting a project type and sets the project for the active cell
+ */
+export async function showProjectQuickPick(): Promise<void> {
+    const editor = vscode.window.activeNotebookEditor
+    if (!editor) {
+        return
+    }
+
+    const cell = editor.selection.start !== undefined ? editor.notebook.cellAt(editor.selection.start) : undefined
+    if (!cell) {
+        return
+    }
+
+    const connection = notebookStateManager.getSelectedConnection(cell)
+    if (!connection) {
+        return
+    }
+
+    await connectionOptionsService.updateConnectionAndProjectOptions()
+
+    const options = notebookStateManager.getProjectOptionsForConnection(cell)
+    if (options.length === 0) {
+        return
+    }
+
+    const projectQuickPickItems: vscode.QuickPickItem[] = options.map((option) => {
+        return {
+            label: option.project,
+            description: `(${option.connection})`,
+            iconPath: new vscode.ThemeIcon('server'),
+        }
+    })
+
+    const selected = await vscode.window.showQuickPick(projectQuickPickItems, {
+        placeHolder: Constants.PROJECT_QUICK_PICK_LABEL_PLACEHOLDER,
+    })
+
+    if (selected) {
+        if (!selected.label) {
+            return
+        }
+
+        await setSelectedProject(cell, selected.label)
+    }
+}
+
+/**
+ * Refreshes the status bar items
+ */
+export function refreshStatusBarItems(): void {
+    connectionProvider?.refreshCellStatusBar()
+    projectProvider?.refreshCellStatusBar()
+    separatorProvider?.refreshCellStatusBar()
+}
+
+/**
+ * Parses all notebook cells to current cell magics
+ */
+export async function parseNotebookCells(): Promise<void> {
+    await connectionOptionsService.updateConnectionAndProjectOptions()
+
+    const editor = vscode.window.activeNotebookEditor
+    if (!editor) {
+        return
+    }
+
+    for (let i = 0; i < editor.notebook.cellCount; i++) {
+        const cell = editor.notebook.cellAt(i)
+
+        if (cell.kind === vscode.NotebookCellKind.Code && cell.document.languageId !== 'markdown') {
+            notebookStateManager.parseCellMagic(cell)
+        }
+    }
+
+    refreshStatusBarItems()
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/index.ts b/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/index.ts
new file mode 100644
index 00000000000..0f7f429b5e6
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/index.ts
@@ -0,0 +1,11 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export { activate } from './activation'
+
+export * from './models/constants'
+export * from './models/types'
+export * from './services/connectionOptionsService'
+export * from './services/notebookStateManager'
diff --git a/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/models/constants.ts b/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/models/constants.ts
new file mode 100644
index 00000000000..d94d4c9f3f7
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/models/constants.ts
@@ -0,0 +1,153 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ConnectionTypeProperties } from './types'
+
+export const Constants = {
+    // Connection types
+    CONNECTION_TYPE_EMR_EC2: 'SPARK_EMR_EC2',
+    CONNECTION_TYPE_EMR_SERVERLESS: 'SPARK_EMR_SERVERLESS',
+    CONNECTION_TYPE_GLUE: 'SPARK_GLUE',
+    CONNECTION_TYPE_SPARK: 'SPARK',
+    CONNECTION_TYPE_REDSHIFT: 'REDSHIFT',
+    CONNECTION_TYPE_ATHENA: 'ATHENA',
+    CONNECTION_TYPE_IAM: 'IAM',
+
+    // UI labels and placeholders
+    CONNECTION_QUICK_PICK_LABEL_PLACEHOLDER: 'Select Connection',
+    CONNECTION_STATUS_BAR_ITEM_LABEL: 'Select Connection',
+    CONNECTION_STATUS_BAR_ITEM_ICON: '$(plug)',
+    DEFAULT_CONNECTION_STATUS_BAR_ITEM_LABEL: 'Connection',
+    PROJECT_QUICK_PICK_LABEL_PLACEHOLDER: 'Select Compute',
+    PROJECT_STATUS_BAR_ITEM_LABEL: 'Select Compute',
+    PROJECT_STATUS_BAR_ITEM_ICON: '$(server)',
+    DEFAULT_PROJECT_STATUS_BAR_ITEM_LABEL: 'Compute',
+    CONNECTION_QUICK_PICK_ORDER: ['Local Python', 'PySpark', 'ScalaSpark', 'SQL'] as const,
+
+    // Command IDs
+    CONNECTION_COMMAND: 'aws.smus.connectionmagics.selectConnection',
+    PROJECT_COMMAND: 'aws.smus.connectionmagics.selectProject',
+
+    // Magic string literals
+    LOCAL_PYTHON: 'Local Python',
+    PYSPARK: 'PySpark',
+    SCALA_SPARK: 'ScalaSpark',
+    SQL: 'SQL',
+    MAGIC_PREFIX: '%%',
+    LOCAL_MAGIC: '%%local',
+    NAME_FLAG_LONG: '--name',
+    NAME_FLAG_SHORT: '-n',
+    SAGEMAKER_CONNECTION_METADATA_KEY: 'sagemakerConnection',
+    MARKDOWN_LANGUAGE: 'markdown',
+    PROJECT_PYTHON: 'project.python',
+    PROJECT_SPARK_COMPATIBILITY: 'project.spark.compatibility',
+} as const
+
+/**
+ * Maps connection types to their display properties
+ */
+export const connectionTypePropertiesMap: Record<string, ConnectionTypeProperties> = {
+    [Constants.CONNECTION_TYPE_GLUE]: {
+        labels: ['PySpark', 'SQL'], // Glue supports both PySpark and SQL
+        magic: '%%pyspark',
+        language: 'python',
+        category: 'spark',
+    },
+    [Constants.CONNECTION_TYPE_EMR_EC2]: {
+        labels: ['PySpark', 'SQL'], // EMR supports both PySpark and SQL
+        magic: '%%pyspark',
+        language: 'python',
+        category: 'spark',
+    },
+    [Constants.CONNECTION_TYPE_EMR_SERVERLESS]: {
+        labels: ['PySpark', 'SQL'], // EMR supports both PySpark and SQL
+        magic: '%%pyspark',
+        language: 'python',
+        category: 'spark',
+    },
+    [Constants.CONNECTION_TYPE_REDSHIFT]: {
+        labels: ['SQL'], // Redshift only supports SQL
+        magic: '%%sql',
+        language: 'sql',
+        category: 'sql',
+    },
+    [Constants.CONNECTION_TYPE_ATHENA]: {
+        labels: ['SQL'], // Athena only supports SQL
+        magic: '%%sql',
+        language: 'sql',
+        category: 'sql',
+    },
+}
+
+/**
+ * Maps connection labels to their display properties
+ */
+export const connectionLabelPropertiesMap: Record<
+    string,
+    { description: string; magic: string; language: string; category: string }
+> = {
+    PySpark: {
+        description: 'Python with Spark',
+        magic: '%%pyspark',
+        language: 'python',
+        category: 'spark',
+    },
+    SQL: {
+        description: 'SQL Query',
+        magic: '%%sql',
+        language: 'sql',
+        category: 'sql',
+    },
+    ScalaSpark: {
+        description: 'Scala with Spark',
+        magic: '%%scalaspark',
+        language: 'python', // Scala is not a supported language mode, defaulting to Python
+        category: 'spark',
+    },
+    'Local Python': {
+        description: 'Python',
+        magic: '%%local',
+        language: 'python',
+        category: 'python',
+    },
+    IAM: {
+        description: 'IAM Connection',
+        magic: '%%iam',
+        language: 'python',
+        category: 'iam',
+    },
+}
+
+/**
+ * Maps connection types to their platform display names for grouping
+ */
+export const connectionTypeToComputeNameMap: Record<string, string> = {
+    [Constants.CONNECTION_TYPE_GLUE]: 'Glue',
+    [Constants.CONNECTION_TYPE_REDSHIFT]: 'Redshift',
+    [Constants.CONNECTION_TYPE_ATHENA]: 'Athena',
+    [Constants.CONNECTION_TYPE_EMR_EC2]: 'EMR EC2',
+    [Constants.CONNECTION_TYPE_EMR_SERVERLESS]: 'EMR Serverless',
+}
+
+/**
+ * Maps magic commands to their corresponding connection types
+ */
+export const magicCommandToConnectionMap: Record<string, string> = {
+    '%%spark': 'PySpark',
+    '%%pyspark': 'PySpark',
+    '%%scalaspark': 'ScalaSpark',
+    '%%local': 'Local Python',
+    '%%sql': 'SQL',
+} as const
+
+/**
+ * Default project names for each connection type
+ */
+export const defaultProjectsByConnection: Record<string, readonly string[]> = {
+    'Local Python': ['project.python'],
+    PySpark: ['project.spark.compatibility'],
+    ScalaSpark: ['project.spark.compatibility'],
+    SQL: ['project.spark.compatibility'],
+} as const
diff --git a/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/models/types.ts b/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/models/types.ts
new file mode 100644
index 00000000000..b14daab1ce8
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/models/types.ts
@@ -0,0 +1,68 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * SageMaker Connection Summary interface
+ */
+export interface SageMakerConnectionSummary {
+    name: string
+    type: string
+}
+
+/**
+ * Connection option type definition
+ */
+export interface ConnectionOption {
+    label: string
+    description: string
+    magic: string
+    language: string
+    category: string
+}
+
+/**
+ * Project option group type definition
+ */
+export interface ProjectOptionGroup {
+    connection: string
+    projects: string[]
+}
+
+/**
+ * Project option type definition
+ */
+export interface ProjectOption {
+    connection: string
+    project: string
+}
+
+/**
+ * Connection to project mapping type definition
+ */
+export interface ConnectionProjectMapping {
+    connection: string
+    projectOptions: ProjectOptionGroup[]
+}
+
+/**
+ * Represents the state of a notebook cell's connection settings
+ */
+export interface CellState {
+    connection?: string
+    project?: string
+    isUserSelection?: boolean
+    originalMagicCommand?: string
+    lastParsedContent?: string
+}
+
+/**
+ * Maps connection types to their display properties
+ */
+export interface ConnectionTypeProperties {
+    labels: string[]
+    magic: string
+    language: string
+    category: string
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/providers/notebookStatusBarProviders.ts b/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/providers/notebookStatusBarProviders.ts
new file mode 100644
index 00000000000..8551f615110
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/providers/notebookStatusBarProviders.ts
@@ -0,0 +1,143 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { notebookStateManager } from '../services/notebookStateManager'
+import { Constants } from '../models/constants'
+
+/**
+ * Abstract base class for notebook status bar providers.
+ */
+export abstract class BaseNotebookStatusBarProvider implements vscode.NotebookCellStatusBarItemProvider {
+    protected item: vscode.NotebookCellStatusBarItem
+    protected onDidChangeCellStatusBarItemsEmitter = new vscode.EventEmitter<void>()
+    protected priority: number
+    protected icon?: string
+    protected command?: string
+    protected tooltip?: string
+
+    public constructor(priority: number, icon?: string, command?: string, tooltip?: string) {
+        this.priority = priority
+        this.icon = icon
+        this.command = command
+        this.tooltip = tooltip
+        this.item = new vscode.NotebookCellStatusBarItem('', vscode.NotebookCellStatusBarAlignment.Right)
+        this.item.priority = priority
+    }
+
+    /**
+     * Abstract method that each provider must implement to provide their specific status bar item.
+     */
+    public abstract provideCellStatusBarItems(
+        cell: vscode.NotebookCell,
+        token: vscode.CancellationToken
+    ): vscode.ProviderResult<vscode.NotebookCellStatusBarItem | vscode.NotebookCellStatusBarItem[]>
+
+    /**
+     * Creates a status bar item with the provided text and applies common settings.
+     */
+    protected createStatusBarItem(text: string, isClickable: boolean = true): vscode.NotebookCellStatusBarItem {
+        const displayText = this.icon ? `${this.icon} ${text}` : text
+        const item = new vscode.NotebookCellStatusBarItem(displayText, vscode.NotebookCellStatusBarAlignment.Right)
+        item.priority = this.priority
+
+        if (isClickable && this.command) {
+            item.command = this.command
+            item.tooltip = this.tooltip
+        }
+
+        return item
+    }
+
+    /**
+     * Refreshes the cell status bar items.
+     */
+    public refreshCellStatusBar(): void {
+        this.onDidChangeCellStatusBarItemsEmitter.fire()
+    }
+
+    /**
+     * Event that fires when the cell status bar items have changed.
+     */
+    public get onDidChangeCellStatusBarItems(): vscode.Event<void> {
+        return this.onDidChangeCellStatusBarItemsEmitter.event
+    }
+}
+
+/**
+ * Status bar provider for connection selection in notebook cells.
+ */
+export class ConnectionStatusBarProvider extends BaseNotebookStatusBarProvider {
+    public constructor(priority: number, command: string) {
+        super(priority, Constants.CONNECTION_STATUS_BAR_ITEM_ICON, command, Constants.CONNECTION_STATUS_BAR_ITEM_LABEL)
+    }
+
+    public provideCellStatusBarItems(
+        cell: vscode.NotebookCell,
+        token: vscode.CancellationToken
+    ): vscode.ProviderResult<vscode.NotebookCellStatusBarItem | vscode.NotebookCellStatusBarItem[]> {
+        // Don't show on non-code or markdown code cells
+        if (cell.kind !== vscode.NotebookCellKind.Code || cell.document.languageId === 'markdown') {
+            return undefined
+        }
+
+        const connection = notebookStateManager.getSelectedConnection(cell)
+
+        const displayText = connection || Constants.DEFAULT_CONNECTION_STATUS_BAR_ITEM_LABEL
+        const item = this.createStatusBarItem(displayText)
+
+        return item
+    }
+}
+
+/**
+ * Status bar provider for project selection in notebook cells.
+ */
+export class ProjectStatusBarProvider extends BaseNotebookStatusBarProvider {
+    public constructor(priority: number, command: string) {
+        super(priority, Constants.PROJECT_STATUS_BAR_ITEM_ICON, command, Constants.PROJECT_STATUS_BAR_ITEM_LABEL)
+    }
+
+    public provideCellStatusBarItems(
+        cell: vscode.NotebookCell,
+        token: vscode.CancellationToken
+    ): vscode.ProviderResult<vscode.NotebookCellStatusBarItem | vscode.NotebookCellStatusBarItem[]> {
+        // Don't show on non-code or markdown code cells
+        if (cell.kind !== vscode.NotebookCellKind.Code || cell.document.languageId === 'markdown') {
+            return undefined
+        }
+
+        const project = notebookStateManager.getSelectedProject(cell)
+
+        const displayText = project || Constants.DEFAULT_PROJECT_STATUS_BAR_ITEM_LABEL
+        const item = this.createStatusBarItem(displayText)
+
+        return item
+    }
+}
+
+/**
+ * Status bar provider for displaying a separator between items in notebook cells.
+ */
+export class SeparatorStatusBarProvider extends BaseNotebookStatusBarProvider {
+    public constructor(priority: number, separatorText: string = '|') {
+        super(priority)
+
+        this.item = new vscode.NotebookCellStatusBarItem(separatorText, vscode.NotebookCellStatusBarAlignment.Right)
+        this.item.priority = priority
+    }
+
+    public provideCellStatusBarItems(
+        cell: vscode.NotebookCell,
+        token: vscode.CancellationToken
+    ): vscode.ProviderResult<vscode.NotebookCellStatusBarItem | vscode.NotebookCellStatusBarItem[]> {
+        // Don't show on non-code or markdown code cells
+        if (cell.kind !== vscode.NotebookCellKind.Code || cell.document.languageId === 'markdown') {
+            return undefined
+        }
+
+        return this.item
+    }
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/services/connectionOptionsService.ts b/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/services/connectionOptionsService.ts
new file mode 100644
index 00000000000..901c2e5a60f
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/services/connectionOptionsService.ts
@@ -0,0 +1,293 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { getLogger } from '../../../shared/logger/logger'
+import {
+    Constants,
+    connectionTypePropertiesMap,
+    connectionLabelPropertiesMap,
+    connectionTypeToComputeNameMap,
+} from '../models/constants'
+import {
+    ConnectionOption,
+    ProjectOptionGroup,
+    ConnectionProjectMapping,
+    SageMakerConnectionSummary,
+} from '../models/types'
+import { ConnectedSpaceDataZoneClient } from '../client/connectedSpaceDataZoneClient'
+import { getResourceMetadata } from '../../shared/utils/resourceMetadataUtils'
+
+let datazoneClient: ConnectedSpaceDataZoneClient | undefined
+
+/**
+ * Gets or creates the module-scoped DataZone client instance
+ */
+function getDataZoneClient(): ConnectedSpaceDataZoneClient {
+    if (!datazoneClient) {
+        const resourceMetadata = getResourceMetadata()
+
+        if (!resourceMetadata?.AdditionalMetadata?.DataZoneDomainRegion) {
+            throw new Error('DataZone domain region not found in resource metadata')
+        }
+
+        const region = resourceMetadata.AdditionalMetadata.DataZoneDomainRegion
+        const customEndpoint = resourceMetadata.AdditionalMetadata?.DataZoneEndpoint
+
+        datazoneClient = new ConnectedSpaceDataZoneClient(region, customEndpoint)
+    }
+    return datazoneClient
+}
+
+/**
+ * Service for managing connection options and project mappings
+ */
+class ConnectionOptionsService {
+    private connectionOptions: ConnectionOption[] = []
+    private projectOptions: ConnectionProjectMapping[] = []
+    private cachedConnections: SageMakerConnectionSummary[] = []
+
+    constructor() {}
+
+    /**
+     * Gets the appropriate connection option for a given label
+     */
+    private getConnectionOptionForLabel(label: string): ConnectionOption | undefined {
+        const labelProps = connectionLabelPropertiesMap[label]
+        if (!labelProps) {
+            return undefined
+        }
+
+        return {
+            label,
+            description: labelProps.description,
+            magic: labelProps.magic,
+            language: labelProps.language,
+            category: labelProps.category,
+        }
+    }
+
+    /**
+     * Gets filtered connections from DataZone, excluding IAM connections and processing SPARK connections
+     */
+    private async getFilteredConnections(forceRefresh: boolean = false): Promise<SageMakerConnectionSummary[]> {
+        if (this.cachedConnections.length > 0 && !forceRefresh) {
+            return this.cachedConnections
+        }
+
+        try {
+            const resourceMetadata = getResourceMetadata()
+
+            if (!resourceMetadata?.AdditionalMetadata?.DataZoneDomainId) {
+                throw new Error('DataZone domain ID not found in resource metadata')
+            }
+
+            if (!resourceMetadata?.AdditionalMetadata?.DataZoneProjectId) {
+                throw new Error('DataZone project ID not found in resource metadata')
+            }
+
+            const connections = await getDataZoneClient().listConnections(
+                resourceMetadata.AdditionalMetadata.DataZoneDomainId,
+                resourceMetadata.AdditionalMetadata.DataZoneProjectId
+            )
+
+            const processedConnections: SageMakerConnectionSummary[] = []
+
+            for (const connection of connections) {
+                if (
+                    connection.type === Constants.CONNECTION_TYPE_REDSHIFT ||
+                    connection.type === Constants.CONNECTION_TYPE_ATHENA
+                ) {
+                    processedConnections.push({
+                        name: connection.name || '',
+                        type: connection.type || '',
+                    })
+                } else if (connection.type === Constants.CONNECTION_TYPE_SPARK) {
+                    if ('sparkGlueProperties' in (connection.props || {})) {
+                        processedConnections.push({
+                            name: connection.name || '',
+                            type: Constants.CONNECTION_TYPE_GLUE,
+                        })
+                    } else if (
+                        'sparkEmrProperties' in (connection.props || {}) &&
+                        'computeArn' in (connection.props?.sparkEmrProperties || {})
+                    ) {
+                        const computeArn = connection.props?.sparkEmrProperties?.computeArn || ''
+
+                        if (computeArn.includes('cluster')) {
+                            processedConnections.push({
+                                name: connection.name || '',
+                                type: Constants.CONNECTION_TYPE_EMR_EC2,
+                            })
+                        } else if (computeArn.includes('applications')) {
+                            processedConnections.push({
+                                name: connection.name || '',
+                                type: Constants.CONNECTION_TYPE_EMR_SERVERLESS,
+                            })
+                        }
+                    }
+                }
+            }
+
+            this.cachedConnections = processedConnections
+            return processedConnections
+        } catch (error) {
+            getLogger().error('Failed to list DataZone connections: %s', error as Error)
+            return []
+        }
+    }
+
+    /**
+     * Adds custom Local Python option to the options list
+     */
+    private addLocalPythonOption(options: ConnectionOption[], addedLabels: Set<string>): void {
+        const localPythonOption = this.getConnectionOptionForLabel('Local Python')
+        if (localPythonOption) {
+            options.push(localPythonOption)
+            addedLabels.add('Local Python')
+        }
+    }
+
+    /**
+     * Gets the available connection options, either from DataZone connections or defaults
+     * @returns Array of connection options
+     */
+    public async getConnectionOptions(): Promise<ConnectionOption[]> {
+        try {
+            const connections = await this.getFilteredConnections()
+
+            if (connections.length === 0) {
+                return []
+            }
+
+            const options: ConnectionOption[] = []
+            const addedLabels = new Set<string>()
+
+            this.addLocalPythonOption(options, addedLabels)
+
+            for (const connection of connections) {
+                const typeProps = connectionTypePropertiesMap[connection.type]
+                if (typeProps) {
+                    for (const label of typeProps.labels) {
+                        if (!addedLabels.has(label)) {
+                            const connectionOption = this.getConnectionOptionForLabel(label)
+                            if (connectionOption) {
+                                options.push(connectionOption)
+                                addedLabels.add(label)
+                            }
+                        }
+                    }
+                }
+            }
+
+            if (addedLabels.has(Constants.PYSPARK) && !addedLabels.has(Constants.SCALA_SPARK)) {
+                const scalaSparkOption = this.getConnectionOptionForLabel(Constants.SCALA_SPARK)
+                if (scalaSparkOption) {
+                    options.push(scalaSparkOption)
+                }
+            }
+
+            return options
+        } catch (error) {
+            getLogger().error('Failed to get connection options: %s', error as Error)
+            return []
+        }
+    }
+
+    /**
+     * Gets the project options for a specific connection type
+     * @param connectionType The connection type
+     * @returns Project options for the connection type
+     */
+    public async getProjectOptionsForConnectionType(connectionType: string): Promise<ProjectOptionGroup[]> {
+        try {
+            const connections = await this.getFilteredConnections()
+
+            if (connections.length === 0) {
+                return []
+            }
+
+            const effectiveConnectionType = connectionType === 'ScalaSpark' ? 'PySpark' : connectionType
+            const filteredConnections: Record<string, string[]> = {}
+
+            for (const connection of connections) {
+                const typeProps = connectionTypePropertiesMap[connection.type]
+
+                if (typeProps && typeProps.labels.includes(effectiveConnectionType)) {
+                    const compute = connectionTypeToComputeNameMap[connection.type] || 'Unknown'
+
+                    if (!filteredConnections[compute]) {
+                        filteredConnections[compute] = []
+                    }
+                    filteredConnections[compute].push(connection.name)
+                }
+            }
+
+            const projectOptions: ProjectOptionGroup[] = []
+            for (const [compute, projects] of Object.entries(filteredConnections)) {
+                projectOptions.push({ connection: compute, projects })
+            }
+
+            return projectOptions
+        } catch (error) {
+            getLogger().error('Failed to get project options: %s', error as Error)
+            return []
+        }
+    }
+
+    /**
+     * Updates the connection and project options from DataZone
+     */
+    public async updateConnectionAndProjectOptions(): Promise<void> {
+        try {
+            this.connectionOptions = await this.getConnectionOptions()
+
+            if (this.connectionOptions.length === 0) {
+                this.projectOptions = []
+                return
+            }
+
+            const newProjectOptions: ConnectionProjectMapping[] = []
+
+            newProjectOptions.push({
+                connection: 'Local Python',
+                projectOptions: [{ connection: 'Local', projects: ['project.python'] }],
+            })
+
+            for (const option of this.connectionOptions) {
+                if (option.label !== 'Local Python') {
+                    const projectOpts = await this.getProjectOptionsForConnectionType(option.label)
+                    if (projectOpts.length > 0) {
+                        newProjectOptions.push({
+                            connection: option.label,
+                            projectOptions: projectOpts,
+                        })
+                    }
+                }
+            }
+
+            this.projectOptions = newProjectOptions
+        } catch (error) {
+            getLogger().error('Failed to update connection and project options: %s', error as Error)
+            this.connectionOptions = []
+            this.projectOptions = []
+        }
+    }
+
+    /**
+     * Gets the current cached connection options
+     */
+    public getConnectionOptionsSync(): ConnectionOption[] {
+        return this.connectionOptions
+    }
+
+    /**
+     * Gets the current cached project options
+     */
+    public getProjectOptionsSync(): ConnectionProjectMapping[] {
+        return this.projectOptions
+    }
+}
+
+export const connectionOptionsService = new ConnectionOptionsService()
diff --git a/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/services/notebookStateManager.ts b/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/services/notebookStateManager.ts
new file mode 100644
index 00000000000..80654b64ac0
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/connectionMagicsSelector/services/notebookStateManager.ts
@@ -0,0 +1,420 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { CellState, ProjectOption } from '../models/types'
+import { connectionOptionsService } from './connectionOptionsService'
+import { getLogger } from '../../../shared/logger/logger'
+import { magicCommandToConnectionMap, defaultProjectsByConnection, Constants } from '../models/constants'
+
+/**
+ * State manager for tracking notebook cell states and selections
+ */
+class NotebookStateManager {
+    private cellStates: Map<string, CellState> = new Map()
+
+    constructor() {}
+
+    /**
+     * Gets the cell state for a specific cell
+     */
+    private getCellState(cell: vscode.NotebookCell): CellState {
+        const cellId = cell.document.uri.toString()
+        if (!this.cellStates.has(cellId)) {
+            this.cellStates.set(cellId, {})
+        }
+        return this.cellStates.get(cellId)!
+    }
+
+    /**
+     * Sets metadata on a cell
+     */
+    private async setCellMetadata(cell: vscode.NotebookCell, key: string, value: any): Promise<void> {
+        try {
+            const edit = new vscode.WorkspaceEdit()
+            const notebookEdit = vscode.NotebookEdit.updateCellMetadata(cell.index, {
+                ...cell.metadata,
+                [key]: value,
+            })
+            edit.set(cell.notebook.uri, [notebookEdit])
+            await vscode.workspace.applyEdit(edit)
+        } catch (error) {
+            getLogger().warn('setCellMetadata: Failed to set metadata, falling back to in-memory storage')
+        }
+    }
+
+    /**
+     * Gets the selected connection for a cell
+     */
+    public getSelectedConnection(cell: vscode.NotebookCell): string | undefined {
+        const connection = cell.metadata?.[Constants.SAGEMAKER_CONNECTION_METADATA_KEY] as string
+        if (connection) {
+            return connection
+        }
+
+        const state = this.getCellState(cell)
+        const currentCellContent = cell.document.getText()
+
+        if (!state.connection || (!state.isUserSelection && state.lastParsedContent !== currentCellContent)) {
+            this.parseCellMagic(cell)
+            const updatedState = this.getCellState(cell)
+            updatedState.lastParsedContent = currentCellContent
+
+            return updatedState.connection
+        }
+
+        return state.connection
+    }
+
+    /**
+     * Sets the selected connection for a cell
+     */
+    public setSelectedConnection(
+        cell: vscode.NotebookCell,
+        value: string | undefined,
+        isUserSelection: boolean = false
+    ): void {
+        const state = this.getCellState(cell)
+        const previousConnection = state.connection
+        state.connection = value
+
+        if (isUserSelection) {
+            state.isUserSelection = true
+
+            if (value) {
+                void this.setCellMetadata(cell, Constants.SAGEMAKER_CONNECTION_METADATA_KEY, value)
+            }
+        }
+
+        if (value === Constants.LOCAL_PYTHON || value === undefined) {
+            if (value === Constants.LOCAL_PYTHON && previousConnection !== value) {
+                state.project = undefined
+                this.setDefaultProjectForConnection(cell, Constants.LOCAL_PYTHON)
+            } else if (value === Constants.LOCAL_PYTHON && previousConnection === value) {
+                if (!state.project) {
+                    this.setDefaultProjectForConnection(cell, Constants.LOCAL_PYTHON)
+                }
+            } else {
+                state.project = undefined
+            }
+        } else if (previousConnection !== value) {
+            state.project = undefined
+            this.setDefaultProjectForConnection(cell, value)
+        }
+    }
+
+    /**
+     * Gets the selected project for a cell
+     */
+    public getSelectedProject(cell: vscode.NotebookCell): string | undefined {
+        return this.getCellState(cell).project
+    }
+
+    /**
+     * Sets the selected project for a cell
+     */
+    public setSelectedProject(cell: vscode.NotebookCell, value: string | undefined): void {
+        const state = this.getCellState(cell)
+        state.project = value
+    }
+
+    /**
+     * Gets the magic command for a cell using simplified format for UI operations
+     */
+    public getMagicCommand(cell: vscode.NotebookCell): string | undefined {
+        const connection = this.getSelectedConnection(cell)
+        if (!connection) {
+            return
+        }
+
+        if (connection === Constants.LOCAL_PYTHON) {
+            const state = this.getCellState(cell)
+            const hasLocalMagic = state.originalMagicCommand?.startsWith(Constants.LOCAL_MAGIC)
+
+            if (!hasLocalMagic) {
+                return undefined
+            }
+        }
+
+        const connectionOptions = connectionOptionsService.getConnectionOptionsSync()
+
+        const connectionOption = connectionOptions.find((option) => option.label === connection)
+        if (!connectionOption) {
+            return undefined
+        }
+
+        const project = this.getSelectedProject(cell)
+
+        if (!project) {
+            return connectionOption.magic
+        }
+
+        return `${connectionOption.magic} ${project}`
+    }
+
+    /**
+     * Parses a cell's content to detect magic commands and updates the state manager
+     * @param cell The notebook cell to parse
+     */
+    public parseCellMagic(cell: vscode.NotebookCell): void {
+        if (
+            !cell ||
+            cell.kind !== vscode.NotebookCellKind.Code ||
+            cell.document.languageId === Constants.MARKDOWN_LANGUAGE
+        ) {
+            return
+        }
+
+        const state = this.getCellState(cell)
+        if (state.isUserSelection) {
+            return
+        }
+
+        const cellText = cell.document.getText()
+        const lines = cellText.split('\n')
+
+        const firstLine = lines[0].trim()
+        if (!firstLine.startsWith(Constants.MAGIC_PREFIX)) {
+            this.setSelectedConnection(cell, Constants.LOCAL_PYTHON)
+            return
+        }
+
+        const parsed = this.parseMagicCommandLine(firstLine)
+        if (!parsed) {
+            return
+        }
+
+        const connectionType = magicCommandToConnectionMap[parsed.magic]
+        if (!connectionType) {
+            this.setSelectedConnection(cell, Constants.LOCAL_PYTHON)
+            this.setDefaultProjectForConnection(cell, Constants.LOCAL_PYTHON)
+            return
+        }
+
+        const cellState = this.getCellState(cell)
+        cellState.originalMagicCommand = firstLine
+
+        this.setSelectedConnection(cell, connectionType)
+
+        if (parsed.project) {
+            this.setSelectedProject(cell, parsed.project)
+        } else {
+            this.setDefaultProjectForConnection(cell, connectionType)
+        }
+    }
+
+    /**
+     * Parses a magic command line to extract magic and project parameters
+     * Supports formats: %%magic, %%magic project, %%magic --name project, %%magic -n project
+     */
+    private parseMagicCommandLine(line: string): { magic: string; project?: string } | undefined {
+        const tokens = line.split(/\s+/)
+        if (tokens.length === 0 || !tokens[0].startsWith(Constants.MAGIC_PREFIX)) {
+            return undefined
+        }
+
+        const magic = tokens[0]
+        let project: string | undefined
+
+        if (tokens.length === 2) {
+            // Format: %%magic project
+            project = tokens[1]
+        } else if (tokens.length >= 3) {
+            // Format: %%magic --name project or %%magic -n project
+            const flagIndex = tokens.findIndex(
+                (token) => token === Constants.NAME_FLAG_LONG || token === Constants.NAME_FLAG_SHORT
+            )
+            if (flagIndex !== -1 && flagIndex + 1 < tokens.length) {
+                project = tokens[flagIndex + 1]
+            }
+        }
+
+        return { magic, project }
+    }
+
+    /**
+     * Sets default project for a connection when no explicit project is specified
+     */
+    private setDefaultProjectForConnection(cell: vscode.NotebookCell, connectionType: string): void {
+        const projectOptions = connectionOptionsService.getProjectOptionsSync()
+
+        const mapping = projectOptions.find((option) => option.connection === connectionType)
+        if (!mapping || mapping.projectOptions.length === 0) {
+            return
+        }
+
+        const defaultProjects = defaultProjectsByConnection[connectionType] || []
+
+        for (const defaultProject of defaultProjects) {
+            for (const projectOption of mapping.projectOptions) {
+                if (projectOption.projects.includes(defaultProject)) {
+                    this.setSelectedProject(cell, defaultProject)
+                    return
+                }
+            }
+        }
+
+        const firstProjectOption = mapping.projectOptions[0]
+        if (firstProjectOption.projects.length > 0) {
+            this.setSelectedProject(cell, firstProjectOption.projects[0])
+        }
+    }
+
+    /**
+     * Updates the current cell with the magic command and sets the cell language
+     * @param cell The notebook cell to update
+     */
+    public async updateCellWithMagic(cell: vscode.NotebookCell): Promise<void> {
+        const connection = this.getSelectedConnection(cell)
+        if (!connection) {
+            return
+        }
+
+        const connectionOptions = connectionOptionsService.getConnectionOptionsSync()
+        const connectionOption = connectionOptions.find((option) => option.label === connection)
+        if (!connectionOption) {
+            return
+        }
+
+        try {
+            await vscode.languages.setTextDocumentLanguage(cell.document, connectionOption.language)
+
+            const cellText = cell.document.getText()
+            const lines = cellText.split('\n')
+            const firstLine = lines[0] || ''
+            const isMagicCommand = firstLine.trim().startsWith(Constants.MAGIC_PREFIX)
+
+            let newCellContent = cellText
+
+            if (connection === Constants.LOCAL_PYTHON) {
+                const state = this.getCellState(cell)
+                const hasLocalMagic = state.originalMagicCommand?.startsWith(Constants.LOCAL_MAGIC)
+
+                if (hasLocalMagic) {
+                    const magicCommand = this.getMagicCommand(cell)
+                    if (magicCommand) {
+                        if (isMagicCommand) {
+                            newCellContent = magicCommand + '\n' + lines.slice(1).join('\n')
+                        } else {
+                            newCellContent = magicCommand + '\n' + cellText
+                        }
+                    }
+                } else {
+                    if (isMagicCommand) {
+                        newCellContent = lines.slice(1).join('\n')
+                    }
+                }
+            } else {
+                const magicCommand = this.getMagicCommand(cell)
+
+                if (magicCommand) {
+                    if (!magicCommand.startsWith(Constants.MAGIC_PREFIX)) {
+                        return
+                    }
+
+                    if (isMagicCommand) {
+                        newCellContent = magicCommand + '\n' + lines.slice(1).join('\n')
+                    } else {
+                        newCellContent = magicCommand + '\n' + cellText
+                    }
+                }
+            }
+
+            if (newCellContent !== cellText) {
+                await this.updateCellContent(cell, newCellContent)
+            }
+        } catch (error) {
+            getLogger().error(`Error updating cell with magic command: ${error}`)
+        }
+    }
+
+    /**
+     * Updates the content of a notebook cell using the most appropriate API for the environment
+     * @param cell The notebook cell to update
+     * @param newContent The new content for the cell
+     */
+    private async updateCellContent(cell: vscode.NotebookCell, newContent: string): Promise<void> {
+        try {
+            if (vscode.workspace.applyEdit && (vscode as any).NotebookEdit) {
+                const edit = new vscode.WorkspaceEdit()
+                const notebookUri = cell.notebook.uri
+                const cellIndex = cell.index
+
+                const newCellData = new vscode.NotebookCellData(cell.kind, newContent, cell.document.languageId)
+
+                const notebookEdit = (vscode as any).NotebookEdit.replaceCells(
+                    new vscode.NotebookRange(cellIndex, cellIndex + 1),
+                    [newCellData]
+                )
+                edit.set(notebookUri, [notebookEdit])
+
+                const success = await vscode.workspace.applyEdit(edit)
+                if (success) {
+                    return
+                }
+            }
+        } catch (error) {
+            getLogger().error(`NotebookEdit failed, attempting to update cell content with WorkspaceEdit: ${error}`)
+        }
+
+        try {
+            const edit = new vscode.WorkspaceEdit()
+
+            const fullRange = new vscode.Range(
+                new vscode.Position(0, 0),
+                new vscode.Position(cell.document.lineCount, 0)
+            )
+
+            edit.replace(cell.document.uri, fullRange, newContent)
+
+            const success = await vscode.workspace.applyEdit(edit)
+            if (!success) {
+                getLogger().error('WorkspaceEdit failed to apply')
+            }
+        } catch (error) {
+            getLogger().error(`Failed to update cell content with WorkspaceEdit: ${error}`)
+
+            try {
+                const document = cell.document
+                if (document && 'getText' in document && 'uri' in document) {
+                    const edit = new vscode.WorkspaceEdit()
+                    const fullText = document.getText()
+                    const fullRange = new vscode.Range(document.positionAt(0), document.positionAt(fullText.length))
+                    edit.replace(document.uri, fullRange, newContent)
+                    await vscode.workspace.applyEdit(edit)
+                }
+            } catch (finalError) {
+                getLogger().error(`All cell update methods failed: ${finalError}`)
+            }
+        }
+    }
+
+    /**
+     * Gets the project options for the selected connection in a cell
+     */
+    public getProjectOptionsForConnection(cell: vscode.NotebookCell): ProjectOption[] {
+        const connection = this.getSelectedConnection(cell)
+        if (!connection) {
+            return []
+        }
+
+        const projectOptions = connectionOptionsService.getProjectOptionsSync()
+        const mapping = projectOptions.find((option) => option.connection === connection)
+        if (!mapping) {
+            return []
+        }
+
+        const options: ProjectOption[] = []
+        for (const projectOption of mapping.projectOptions) {
+            for (const project of projectOption.projects) {
+                options.push({ connection: projectOption.connection, project: project })
+            }
+        }
+
+        return options
+    }
+}
+
+export const notebookStateManager = new NotebookStateManager()
diff --git a/packages/core/src/sagemakerunifiedstudio/explorer/activation.ts b/packages/core/src/sagemakerunifiedstudio/explorer/activation.ts
new file mode 100644
index 00000000000..8a686b48654
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/explorer/activation.ts
@@ -0,0 +1,142 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { ResourceTreeDataProvider } from '../../shared/treeview/resourceTreeDataProvider'
+import {
+    smusLoginCommand,
+    smusLearnMoreCommand,
+    smusSignOutCommand,
+    SageMakerUnifiedStudioRootNode,
+    selectSMUSProject,
+} from './nodes/sageMakerUnifiedStudioRootNode'
+import { DataZoneClient } from '../shared/client/datazoneClient'
+import { openRemoteConnect, stopSpace } from '../../awsService/sagemaker/commands'
+import { SagemakerUnifiedStudioSpaceNode } from './nodes/sageMakerUnifiedStudioSpaceNode'
+import { SageMakerUnifiedStudioProjectNode } from './nodes/sageMakerUnifiedStudioProjectNode'
+import { getLogger } from '../../shared/logger/logger'
+import { setSmusConnectedContext, SmusAuthenticationProvider } from '../auth/providers/smusAuthenticationProvider'
+import { setupUserActivityMonitoring } from '../../awsService/sagemaker/sagemakerSpace'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { isSageMaker } from '../../shared/extensionUtilities'
+import { recordSpaceTelemetry } from '../shared/telemetry'
+
+export async function activate(extensionContext: vscode.ExtensionContext): Promise<void> {
+    // Initialize the SMUS authentication provider
+    const logger = getLogger()
+    logger.debug('SMUS: Initializing authentication provider')
+    // Create the auth provider instance (this will trigger restore() in the constructor)
+    const smusAuthProvider = SmusAuthenticationProvider.fromContext()
+    await smusAuthProvider.restore()
+    // Set initial auth context after restore
+    void setSmusConnectedContext(smusAuthProvider.isConnected())
+    logger.debug('SMUS: Authentication provider initialized')
+
+    // Create the SMUS projects tree view
+    const smusRootNode = new SageMakerUnifiedStudioRootNode(smusAuthProvider, extensionContext)
+    const treeDataProvider = new ResourceTreeDataProvider({ getChildren: () => smusRootNode.getChildren() })
+
+    // Register the tree view
+    const treeView = vscode.window.createTreeView('aws.smus.rootView', { treeDataProvider })
+    treeDataProvider.refresh()
+
+    // Register the commands
+    extensionContext.subscriptions.push(
+        smusLoginCommand.register(),
+        smusLearnMoreCommand.register(),
+        smusSignOutCommand.register(),
+        treeView,
+        vscode.commands.registerCommand('aws.smus.rootView.refresh', () => {
+            treeDataProvider.refresh()
+        }),
+
+        vscode.commands.registerCommand(
+            'aws.smus.projectView',
+            async (projectNode?: SageMakerUnifiedStudioProjectNode) => {
+                return await selectSMUSProject(projectNode)
+            }
+        ),
+
+        vscode.commands.registerCommand('aws.smus.refreshProject', async () => {
+            const projectNode = smusRootNode.getProjectSelectNode()
+            await projectNode.refreshNode()
+        }),
+
+        vscode.commands.registerCommand('aws.smus.switchProject', async () => {
+            // Get the project node from the root node to ensure we're using the same instance
+            const projectNode = smusRootNode.getProjectSelectNode()
+            return await selectSMUSProject(projectNode)
+        }),
+
+        vscode.commands.registerCommand('aws.smus.stopSpace', async (node: SagemakerUnifiedStudioSpaceNode) => {
+            if (!validateNode(node)) {
+                return
+            }
+            await telemetry.smus_stopSpace.run(async (span) => {
+                await recordSpaceTelemetry(span, node)
+                await stopSpace(node.resource, extensionContext, node.resource.sageMakerClient)
+            })
+        }),
+
+        vscode.commands.registerCommand(
+            'aws.smus.openRemoteConnection',
+            async (node: SagemakerUnifiedStudioSpaceNode) => {
+                if (!validateNode(node)) {
+                    return
+                }
+                await telemetry.smus_openRemoteConnection.run(async (span) => {
+                    await recordSpaceTelemetry(span, node)
+                    await openRemoteConnect(node.resource, extensionContext, node.resource.sageMakerClient)
+                })
+            }
+        ),
+
+        vscode.commands.registerCommand('aws.smus.reauthenticate', async (connection?: any) => {
+            if (connection) {
+                try {
+                    await smusAuthProvider.reauthenticate(connection)
+                    // Refresh the tree view after successful reauthentication
+                    treeDataProvider.refresh()
+                    // Show success message
+                    void vscode.window.showInformationMessage(
+                        'Successfully reauthenticated with SageMaker Unified Studio'
+                    )
+                } catch (error) {
+                    // Show error message if reauthentication fails
+                    void vscode.window.showErrorMessage(`Failed to reauthenticate: ${error}`)
+                    logger.error('SMUS: Reauthentication failed: %O', error)
+                }
+            }
+        }),
+        // Dispose DataZoneClient when extension is deactivated
+        { dispose: () => DataZoneClient.dispose() },
+        // Dispose SMUS auth provider when extension is deactivated
+        { dispose: () => smusAuthProvider.dispose() }
+    )
+
+    // Track user activity for autoshutdown feature when in SageMaker Unified Studio environment
+    if (isSageMaker('SMUS-SPACE-REMOTE-ACCESS')) {
+        logger.info('SageMaker Unified Studio environment detected, setting up user activity monitoring')
+        try {
+            await setupUserActivityMonitoring(extensionContext)
+        } catch (error) {
+            logger.error(`Error in UserActivityMonitoring: ${error}`)
+            throw error
+        }
+    } else {
+        logger.info('Not in SageMaker Unified Studio remote environment, skipping user activity monitoring')
+    }
+}
+
+/**
+ * Checks if a node  is undefined and shows a warning message if so.
+ */
+function validateNode(node: SagemakerUnifiedStudioSpaceNode): boolean {
+    if (!node) {
+        void vscode.window.showWarningMessage('Space information is being refreshed. Please try again shortly.')
+        return false
+    }
+    return true
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/explorer/nodes/lakehouseStrategy.ts b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/lakehouseStrategy.ts
new file mode 100644
index 00000000000..546a73135c6
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/lakehouseStrategy.ts
@@ -0,0 +1,587 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { TreeNode } from '../../../shared/treeview/resourceTreeDataProvider'
+import { getLogger } from '../../../shared/logger/logger'
+import { DataZoneConnection } from '../../shared/client/datazoneClient'
+import { GlueCatalog, GlueCatalogClient } from '../../shared/client/glueCatalogClient'
+import { GlueClient } from '../../shared/client/glueClient'
+import { ConnectionClientStore } from '../../shared/client/connectionClientStore'
+import {
+    NODE_ID_DELIMITER,
+    NodeType,
+    NodeData,
+    DATA_DEFAULT_LAKEHOUSE_CONNECTION_NAME_REGEXP,
+    DATA_DEFAULT_ATHENA_CONNECTION_NAME_REGEXP,
+    DATA_DEFAULT_IAM_CONNECTION_NAME_REGEXP,
+    AWS_DATA_CATALOG,
+    DatabaseObjects,
+    NO_DATA_FOUND_MESSAGE,
+} from './types'
+import {
+    getLabel,
+    isLeafNode,
+    getIconForNodeType,
+    getTooltip,
+    createColumnTreeItem,
+    getColumnType,
+    createErrorItem,
+} from './utils'
+import { createPlaceholderItem } from '../../../shared/treeview/utils'
+import { Column, Database, Table } from '@aws-sdk/client-glue'
+import { ConnectionCredentialsProvider } from '../../auth/providers/connectionCredentialsProvider'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { recordDataConnectionTelemetry } from '../../shared/telemetry'
+
+/**
+ * Lakehouse data node for SageMaker Unified Studio
+ */
+export class LakehouseNode implements TreeNode {
+    private childrenNodes: TreeNode[] | undefined
+    private isLoading = false
+    private readonly logger = getLogger()
+
+    constructor(
+        public readonly data: NodeData,
+        private readonly childrenProvider?: (node: LakehouseNode) => Promise<LakehouseNode[]>
+    ) {}
+
+    public get id(): string {
+        return this.data.id
+    }
+
+    public get resource(): any {
+        return this.data.value || {}
+    }
+
+    public async getChildren(): Promise<TreeNode[]> {
+        // Return cached children if available
+        if (this.childrenNodes && !this.isLoading) {
+            return this.childrenNodes
+        }
+
+        // Return empty array for leaf nodes
+        if (isLeafNode(this.data)) {
+            return []
+        }
+
+        // If we have a children provider, use it
+        if (this.childrenProvider) {
+            try {
+                this.isLoading = true
+                const childrenNodes = await this.childrenProvider(this)
+                this.childrenNodes = childrenNodes
+                this.isLoading = false
+                return this.childrenNodes
+            } catch (err) {
+                this.isLoading = false
+                this.logger.error(`Failed to get children for node ${this.data.id}: ${(err as Error).message}`)
+
+                const errorMessage = (err as Error).message
+                void vscode.window.showErrorMessage(errorMessage)
+                return [createErrorItem(errorMessage, 'getChildren', this.id) as LakehouseNode]
+            }
+        }
+
+        return []
+    }
+
+    public async getTreeItem(): Promise<vscode.TreeItem> {
+        const label = getLabel(this.data)
+        const isLeaf = isLeafNode(this.data)
+
+        // For column nodes, show type as secondary text
+        if (this.data.nodeType === NodeType.REDSHIFT_COLUMN && this.data.value?.type) {
+            return createColumnTreeItem(label, this.data.value.type, this.data.nodeType)
+        }
+
+        const collapsibleState = isLeaf
+            ? vscode.TreeItemCollapsibleState.None
+            : vscode.TreeItemCollapsibleState.Collapsed
+
+        const item = new vscode.TreeItem(label, collapsibleState)
+
+        // Set icon based on node type
+        item.iconPath = getIconForNodeType(this.data.nodeType, this.data.isContainer)
+
+        // Set context value for command enablement
+        item.contextValue = this.data.nodeType
+
+        // Set tooltip
+        item.tooltip = getTooltip(this.data)
+
+        return item
+    }
+
+    public getParent(): TreeNode | undefined {
+        return this.data.parent
+    }
+}
+
+/**
+ * Creates a Lakehouse connection node
+ */
+export function createLakehouseConnectionNode(
+    connection: DataZoneConnection,
+    connectionCredentialsProvider: ConnectionCredentialsProvider,
+    region: string
+): LakehouseNode {
+    const logger = getLogger()
+
+    // Create Glue clients
+    const clientStore = ConnectionClientStore.getInstance()
+    const glueCatalogClient = clientStore.getGlueCatalogClient(
+        connection.connectionId,
+        region,
+        connectionCredentialsProvider
+    )
+    const glueClient = clientStore.getGlueClient(connection.connectionId, region, connectionCredentialsProvider)
+
+    // Create the connection node
+    return new LakehouseNode(
+        {
+            id: connection.connectionId,
+            nodeType: NodeType.CONNECTION,
+            value: { connection },
+            path: {
+                connection: connection.name,
+            },
+        },
+        async (node) => {
+            return telemetry.smus_renderLakehouseNode.run(async (span) => {
+                await recordDataConnectionTelemetry(span, connection, connectionCredentialsProvider)
+                try {
+                    logger.info(`Loading Lakehouse catalogs for connection ${connection.name}`)
+
+                    // Check if this is a default connection
+                    const isDefaultConnection =
+                        DATA_DEFAULT_IAM_CONNECTION_NAME_REGEXP.test(connection.name) ||
+                        DATA_DEFAULT_LAKEHOUSE_CONNECTION_NAME_REGEXP.test(connection.name) ||
+                        DATA_DEFAULT_ATHENA_CONNECTION_NAME_REGEXP.test(connection.name)
+
+                    // Follow the reference pattern with Promise.allSettled
+                    const [awsDataCatalogResult, catalogsResult] = await Promise.allSettled([
+                        // AWS Data Catalog node (only for default connections)
+                        isDefaultConnection
+                            ? Promise.resolve([createAwsDataCatalogNode(node, glueClient)])
+                            : Promise.resolve([]),
+                        // Get catalogs by calling Glue API
+                        getCatalogs(glueCatalogClient, glueClient, node),
+                    ])
+
+                    const awsDataCatalog = awsDataCatalogResult.status === 'fulfilled' ? awsDataCatalogResult.value : []
+                    const apiCatalogs = catalogsResult.status === 'fulfilled' ? catalogsResult.value : []
+                    const errors: LakehouseNode[] = []
+
+                    if (awsDataCatalogResult.status === 'rejected') {
+                        const errorMessage = (awsDataCatalogResult.reason as Error).message
+                        void vscode.window.showErrorMessage(errorMessage)
+                        errors.push(createErrorItem(errorMessage, 'aws-data-catalog', node.id) as LakehouseNode)
+                    }
+
+                    if (catalogsResult.status === 'rejected') {
+                        const errorMessage = (catalogsResult.reason as Error).message
+                        void vscode.window.showErrorMessage(errorMessage)
+                        errors.push(createErrorItem(errorMessage, 'catalogs', node.id) as LakehouseNode)
+                    }
+
+                    const allNodes = [...awsDataCatalog, ...apiCatalogs, ...errors]
+                    return allNodes.length > 0
+                        ? allNodes
+                        : [createPlaceholderItem(NO_DATA_FOUND_MESSAGE) as LakehouseNode]
+                } catch (err) {
+                    logger.error(`Failed to get Lakehouse catalogs: ${(err as Error).message}`)
+                    const errorMessage = (err as Error).message
+                    void vscode.window.showErrorMessage(errorMessage)
+                    return [createErrorItem(errorMessage, 'lakehouse-catalogs', node.id) as LakehouseNode]
+                }
+            })
+        }
+    )
+}
+
+/**
+ * Creates AWS Data Catalog node for default connections
+ */
+function createAwsDataCatalogNode(parent: LakehouseNode, glueClient: GlueClient): LakehouseNode {
+    return new LakehouseNode(
+        {
+            id: `${parent.id}${NODE_ID_DELIMITER}${AWS_DATA_CATALOG}`,
+            nodeType: NodeType.GLUE_CATALOG,
+            value: {
+                catalog: { name: AWS_DATA_CATALOG, type: 'AWS' },
+                catalogName: AWS_DATA_CATALOG,
+            },
+            path: {
+                ...parent.data.path,
+                catalog: AWS_DATA_CATALOG,
+            },
+            parent,
+        },
+        async (node) => {
+            const allDatabases = []
+            let nextToken: string | undefined
+
+            do {
+                const { databases, nextToken: token } = await glueClient.getDatabases(
+                    undefined,
+                    'ALL',
+                    ['NAME'],
+                    nextToken
+                )
+                allDatabases.push(...databases)
+                nextToken = token
+            } while (nextToken)
+
+            return allDatabases.length > 0
+                ? allDatabases.map((database) => createDatabaseNode(database.Name || '', database, glueClient, node))
+                : [createPlaceholderItem(NO_DATA_FOUND_MESSAGE) as LakehouseNode]
+        }
+    )
+}
+
+export interface CatalogTree {
+    parent: GlueCatalog
+    children?: GlueCatalog[]
+}
+
+/**
+ * Builds catalog tree from flat catalog list
+ *
+ * AWS Glue catalogs can have parent-child relationships, but the API returns them as a flat list.
+ * This function reconstructs the hierarchical tree structure needed for proper UI display.
+ *
+ * Two-pass algorithm is required because:
+ * 1. First pass: Create a lookup map of all catalogs by name for O(1) access during relationship building
+ * 2. Second pass: Build parent-child relationships by linking catalogs that reference ParentCatalogNames
+ *
+ * Without the first pass, we'd need O(n²) time to find parent catalogs for each child catalog.
+ */
+function buildCatalogTree(catalogs: GlueCatalog[]): CatalogTree[] {
+    const catalogMap: Record<string, CatalogTree> = {}
+    const rootCatalogs: CatalogTree[] = []
+
+    // First pass: create a map of all catalogs with their metadata
+    // This allows us to quickly look up any catalog by name when building parent-child relationships in the second pass
+    for (const catalog of catalogs) {
+        if (catalog.Name) {
+            catalogMap[catalog.Name] = { parent: catalog, children: [] }
+        }
+    }
+
+    // Second pass: build the hierarchical tree structure by linking children to their parents
+    // Catalogs with ParentCatalogNames become children, others become root-level catalogs
+    for (const catalog of catalogs) {
+        if (catalog.Name) {
+            if (catalog.ParentCatalogNames && catalog.ParentCatalogNames.length > 0) {
+                const parentName = catalog.ParentCatalogNames[0]
+                const parent = catalogMap[parentName]
+                if (parent) {
+                    if (!parent.children) {
+                        parent.children = []
+                    }
+                    parent.children.push(catalog)
+                }
+            } else {
+                rootCatalogs.push(catalogMap[catalog.Name])
+            }
+        }
+    }
+    rootCatalogs.sort((a, b) => {
+        const timeA = new Date(a.parent.CreateTime ?? 0).getTime()
+        const timeB = new Date(b.parent.CreateTime ?? 0).getTime()
+        return timeA - timeB // For oldest first
+    })
+
+    return rootCatalogs
+}
+
+/**
+ * Gets catalogs from the GlueCatalogClient
+ */
+async function getCatalogs(
+    glueCatalogClient: GlueCatalogClient,
+    glueClient: GlueClient,
+    parent: LakehouseNode
+): Promise<LakehouseNode[]> {
+    const allCatalogs = []
+    let nextToken: string | undefined
+
+    do {
+        const { catalogs, nextToken: token } = await glueCatalogClient.getCatalogs(nextToken)
+        allCatalogs.push(...catalogs)
+        nextToken = token
+    } while (nextToken)
+
+    const catalogs = allCatalogs
+    const tree = buildCatalogTree(catalogs)
+
+    return tree.map((catalog) => {
+        const parentCatalog = catalog.parent
+
+        // If parent catalog has children, create node that shows child catalogs
+        if (catalog.children && catalog.children.length > 0) {
+            return new LakehouseNode(
+                {
+                    id: parentCatalog.Name || parentCatalog.CatalogId || '',
+                    nodeType: NodeType.GLUE_CATALOG,
+                    value: {
+                        catalog: parentCatalog,
+                        catalogName: parentCatalog.Name || '',
+                    },
+                    path: {
+                        ...parent.data.path,
+                        catalog: parentCatalog.CatalogId || '',
+                    },
+                    parent,
+                },
+                async (node: LakehouseNode) => {
+                    // Parent catalogs only show child catalogs
+                    const childCatalogs =
+                        catalog.children?.map((childCatalog) =>
+                            createCatalogNode(childCatalog.CatalogId || '', childCatalog, glueClient, node, false)
+                        ) || []
+                    return childCatalogs
+                }
+            )
+        }
+
+        // For catalogs without children, create regular catalog node
+        return createCatalogNode(parentCatalog.CatalogId || '', parentCatalog, glueClient, parent, false)
+    })
+}
+
+/**
+ * Creates a catalog node
+ */
+function createCatalogNode(
+    catalogId: string,
+    catalog: GlueCatalog,
+    glueClient: GlueClient,
+    parent: LakehouseNode,
+    isParent: boolean = false
+): LakehouseNode {
+    const logger = getLogger()
+
+    return new LakehouseNode(
+        {
+            id: catalog.Name || catalogId,
+            nodeType: NodeType.GLUE_CATALOG,
+            value: {
+                catalog,
+                catalogName: catalog.Name || catalogId,
+            },
+            path: {
+                ...parent.data.path,
+                catalog: catalogId,
+            },
+            parent,
+        },
+        // Child catalogs load databases, parent catalogs will have their children provider overridden
+        isParent
+            ? async () => [] // Placeholder, will be overridden for parent catalogs with children
+            : async (node) => {
+                  try {
+                      logger.info(`Loading databases for catalog ${catalogId}`)
+
+                      const allDatabases = []
+                      let nextToken: string | undefined
+
+                      do {
+                          const { databases, nextToken: token } = await glueClient.getDatabases(
+                              catalogId,
+                              undefined,
+                              ['NAME'],
+                              nextToken
+                          )
+                          allDatabases.push(...databases)
+                          nextToken = token
+                      } while (nextToken)
+
+                      return allDatabases.length > 0
+                          ? allDatabases.map((database) =>
+                                createDatabaseNode(database.Name || '', database, glueClient, node)
+                            )
+                          : [createPlaceholderItem(NO_DATA_FOUND_MESSAGE) as LakehouseNode]
+                  } catch (err) {
+                      logger.error(`Failed to get databases for catalog ${catalogId}: ${(err as Error).message}`)
+                      const errorMessage = (err as Error).message
+                      void vscode.window.showErrorMessage(errorMessage)
+                      return [createErrorItem(errorMessage, 'catalog-databases', node.id) as LakehouseNode]
+                  }
+              }
+    )
+}
+
+/**
+ * Creates a database node
+ */
+function createDatabaseNode(
+    databaseName: string,
+    database: Database,
+    glueClient: GlueClient,
+    parent: LakehouseNode
+): LakehouseNode {
+    const logger = getLogger()
+
+    return new LakehouseNode(
+        {
+            id: databaseName,
+            nodeType: NodeType.GLUE_DATABASE,
+            value: {
+                database,
+                databaseName,
+            },
+            path: {
+                ...parent.data.path,
+                database: databaseName,
+            },
+            parent,
+        },
+        async (node) => {
+            try {
+                logger.info(`Loading tables for database ${databaseName}`)
+
+                const allTables = []
+                let nextToken: string | undefined
+                const catalogId = parent.data.path?.catalog === AWS_DATA_CATALOG ? undefined : parent.data.path?.catalog
+
+                do {
+                    const { tables, nextToken: token } = await glueClient.getTables(
+                        databaseName,
+                        catalogId,
+                        ['NAME', 'TABLE_TYPE'],
+                        nextToken
+                    )
+                    allTables.push(...tables)
+                    nextToken = token
+                } while (nextToken)
+
+                // Group tables and views separately
+                const tables = allTables.filter((table) => table.TableType !== DatabaseObjects.VIRTUAL_VIEW)
+                const views = allTables.filter((table) => table.TableType === DatabaseObjects.VIRTUAL_VIEW)
+
+                const containerNodes: LakehouseNode[] = []
+
+                // Create tables container if there are tables
+                if (tables.length > 0) {
+                    containerNodes.push(createContainerNode(NodeType.GLUE_TABLE, tables, glueClient, node))
+                }
+
+                // Create views container if there are views
+                if (views.length > 0) {
+                    containerNodes.push(createContainerNode(NodeType.GLUE_VIEW, views, glueClient, node))
+                }
+
+                return containerNodes.length > 0
+                    ? containerNodes
+                    : [createPlaceholderItem(NO_DATA_FOUND_MESSAGE) as LakehouseNode]
+            } catch (err) {
+                logger.error(`Failed to get tables for database ${databaseName}: ${(err as Error).message}`)
+                const errorMessage = (err as Error).message
+                void vscode.window.showErrorMessage(errorMessage)
+                return [createErrorItem(errorMessage, 'database-tables', node.id) as LakehouseNode]
+            }
+        }
+    )
+}
+
+/**
+ * Creates a table node
+ */
+function createTableNode(
+    tableName: string,
+    table: Table,
+    glueClient: GlueClient,
+    parent: LakehouseNode
+): LakehouseNode {
+    const logger = getLogger()
+
+    return new LakehouseNode(
+        {
+            id: tableName,
+            nodeType: NodeType.GLUE_TABLE,
+            value: {
+                table,
+                tableName,
+            },
+            path: {
+                ...parent.data.path,
+                table: tableName,
+            },
+            parent,
+        },
+        async (node) => {
+            try {
+                logger.info(`Loading columns for table ${tableName}`)
+
+                const databaseName = node.data.path?.database || ''
+                const catalogId = node.data.path?.catalog === AWS_DATA_CATALOG ? undefined : node.data.path?.catalog
+                const tableDetails = await glueClient.getTable(databaseName, tableName, catalogId)
+                const columns = tableDetails?.StorageDescriptor?.Columns || []
+                const partitions = tableDetails?.PartitionKeys || []
+
+                const allColumns = [...columns, ...partitions]
+                return allColumns.length > 0
+                    ? allColumns.map((column) => createColumnNode(column.Name || '', column, node))
+                    : [createPlaceholderItem(NO_DATA_FOUND_MESSAGE) as LakehouseNode]
+            } catch (err) {
+                logger.error(`Failed to get columns for table ${tableName}: ${(err as Error).message}`)
+                return []
+            }
+        }
+    )
+}
+
+/**
+ * Creates a column node
+ */
+function createColumnNode(columnName: string, column: Column, parent: LakehouseNode): LakehouseNode {
+    const columnType = getColumnType(column?.Type)
+
+    return new LakehouseNode({
+        id: `${parent.id}${NODE_ID_DELIMITER}${columnName}`,
+        nodeType: NodeType.REDSHIFT_COLUMN,
+        value: {
+            name: columnName,
+            type: columnType,
+        },
+        path: {
+            ...parent.data.path,
+            column: columnName,
+        },
+        parent,
+    })
+}
+
+/**
+ * Creates a container node for grouping objects by type
+ */
+function createContainerNode(
+    nodeType: NodeType,
+    items: Table[],
+    glueClient: GlueClient,
+    parent: LakehouseNode
+): LakehouseNode {
+    return new LakehouseNode(
+        {
+            id: `${parent.id}${NODE_ID_DELIMITER}${nodeType}-container`,
+            nodeType: nodeType,
+            value: {
+                items,
+            },
+            path: parent.data.path,
+            parent,
+            isContainer: true,
+        },
+        async (node) => {
+            // Map items to nodes
+            return items.length > 0
+                ? items.map((item) => createTableNode(item.Name || '', item, glueClient, node))
+                : [createPlaceholderItem(NO_DATA_FOUND_MESSAGE) as LakehouseNode]
+        }
+    )
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/explorer/nodes/redshiftStrategy.ts b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/redshiftStrategy.ts
new file mode 100644
index 00000000000..af0d7cfbbac
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/redshiftStrategy.ts
@@ -0,0 +1,1038 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { TreeNode } from '../../../shared/treeview/resourceTreeDataProvider'
+import { getLogger } from '../../../shared/logger/logger'
+import { DataZoneConnection } from '../../shared/client/datazoneClient'
+import { ConnectionConfig, createRedshiftConnectionConfig } from '../../shared/client/sqlWorkbenchClient'
+import { ConnectionClientStore } from '../../shared/client/connectionClientStore'
+import { NODE_ID_DELIMITER, NodeType, ResourceType, NodeData, NO_DATA_FOUND_MESSAGE } from './types'
+import {
+    getLabel,
+    isLeafNode,
+    getIconForNodeType,
+    createColumnTreeItem,
+    isRedLakeDatabase,
+    getTooltip,
+    getColumnType,
+    createErrorItem,
+} from './utils'
+import { createPlaceholderItem } from '../../../shared/treeview/utils'
+import { ConnectionCredentialsProvider } from '../../auth/providers/connectionCredentialsProvider'
+import { GlueCatalog } from '../../shared/client/glueCatalogClient'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { recordDataConnectionTelemetry } from '../../shared/telemetry'
+
+/**
+ * Redshift data node for SageMaker Unified Studio
+ */
+export class RedshiftNode implements TreeNode {
+    private childrenNodes: TreeNode[] | undefined
+    private isLoading = false
+    private readonly logger = getLogger()
+
+    constructor(
+        public readonly data: NodeData,
+        private readonly childrenProvider?: (node: RedshiftNode) => Promise<RedshiftNode[]>
+    ) {}
+
+    public get id(): string {
+        return this.data.id
+    }
+
+    public get resource(): any {
+        return this.data.value || {}
+    }
+
+    public async getChildren(): Promise<TreeNode[]> {
+        // Return cached children if available
+        if (this.childrenNodes && !this.isLoading) {
+            return this.childrenNodes
+        }
+
+        // Return empty array for leaf nodes
+        if (isLeafNode(this.data)) {
+            return []
+        }
+
+        // If we have a children provider, use it
+        if (this.childrenProvider) {
+            try {
+                this.isLoading = true
+                const childrenNodes = await this.childrenProvider(this)
+                this.childrenNodes = childrenNodes
+                this.isLoading = false
+                return this.childrenNodes
+            } catch (err) {
+                this.isLoading = false
+                this.logger.error(`Failed to get children for node ${this.data.id}: ${(err as Error).message}`)
+
+                const errorMessage = (err as Error).message
+                void vscode.window.showErrorMessage(errorMessage)
+                return [createErrorItem(errorMessage, 'getChildren', this.id) as RedshiftNode]
+            }
+        }
+
+        return []
+    }
+
+    public async getTreeItem(): Promise<vscode.TreeItem> {
+        const label = getLabel(this.data)
+        const isLeaf = isLeafNode(this.data)
+
+        // For column nodes, create a TreeItem with label and description (column type)
+        if (this.data.nodeType === NodeType.REDSHIFT_COLUMN && this.data.value?.type) {
+            return createColumnTreeItem(label, this.data.value.type, this.data.nodeType)
+        }
+
+        // For other nodes, use standard TreeItem
+        const collapsibleState = isLeaf
+            ? vscode.TreeItemCollapsibleState.None
+            : vscode.TreeItemCollapsibleState.Collapsed
+
+        const item = new vscode.TreeItem(label, collapsibleState)
+
+        // Set icon based on node type
+        item.iconPath = getIconForNodeType(this.data.nodeType, this.data.isContainer)
+
+        // Set context value for command enablement
+        item.contextValue = this.data.nodeType
+
+        // Set tooltip
+        item.tooltip = getTooltip(this.data)
+
+        return item
+    }
+
+    public getParent(): TreeNode | undefined {
+        return this.data.parent
+    }
+}
+
+/**
+ * Creates a Redshift connection node
+ */
+export function createRedshiftConnectionNode(
+    connection: DataZoneConnection,
+    connectionCredentialsProvider: ConnectionCredentialsProvider
+): RedshiftNode {
+    const logger = getLogger()
+    return new RedshiftNode(
+        {
+            id: connection.connectionId,
+            nodeType: NodeType.CONNECTION,
+            value: { connection, connectionCredentialsProvider },
+            path: {
+                connection: connection.name,
+            },
+        },
+        async (node) => {
+            return telemetry.smus_renderRedshiftNode.run(async (span) => {
+                logger.info(`Loading Redshift resources for connection ${connection.name}`)
+                await recordDataConnectionTelemetry(span, connection, connectionCredentialsProvider)
+
+                const connectionParams = extractConnectionParams(connection)
+                if (!connectionParams) {
+                    return [createPlaceholderItem(NO_DATA_FOUND_MESSAGE) as RedshiftNode]
+                }
+
+                const isGlueCatalogDatabase = isRedLakeDatabase(connectionParams.database)
+
+                // Create connection config with all available information
+                const connectionConfig = await createRedshiftConnectionConfig(
+                    connectionParams.host,
+                    connectionParams.database,
+                    connectionParams.accountId,
+                    connectionParams.region,
+                    connectionParams.secretArn,
+                    isGlueCatalogDatabase
+                )
+
+                // Wake up the database with a simple query
+                await wakeUpDatabase(
+                    connectionConfig,
+                    connectionParams.region,
+                    connectionCredentialsProvider,
+                    connection
+                )
+
+                const clientStore = ConnectionClientStore.getInstance()
+                const sqlClient = clientStore.getSQLWorkbenchClient(
+                    connection.connectionId,
+                    connectionParams.region,
+                    connectionCredentialsProvider
+                )
+
+                // Fetch Glue catalogs for filtering purposes only
+                // This will help determine which catalogs are accessible within the project
+                let glueCatalogs: GlueCatalog[] = []
+                try {
+                    glueCatalogs = await listGlueCatalogs(
+                        connection.connectionId,
+                        connectionParams.region,
+                        connectionCredentialsProvider
+                    )
+                } catch (err) {
+                    logger.warn(`Failed to fetch Glue catalogs for filtering: ${(err as Error).message}`)
+                }
+
+                // Fetch databases and catalogs using getResources
+                const [databasesResult, catalogsResult] = await Promise.allSettled([
+                    fetchResources(sqlClient, connectionConfig, ResourceType.DATABASE),
+                    fetchResources(sqlClient, connectionConfig, ResourceType.CATALOG),
+                ])
+
+                const databases = databasesResult.status === 'fulfilled' ? databasesResult.value : []
+                const catalogs = catalogsResult.status === 'fulfilled' ? catalogsResult.value : []
+                const allNodes: RedshiftNode[] = []
+
+                // Filter databases
+                const filteredDatabases = databases.filter(
+                    (r: any) =>
+                        r.type === ResourceType.DATABASE ||
+                        r.type === ResourceType.EXTERNAL_DATABASE ||
+                        r.type === ResourceType.SHARED_DATABASE
+                )
+
+                // Filter catalogs using listGlueCatalogs results
+                const filteredCatalogs = catalogs.filter((catalog: any) => {
+                    if (catalog.displayName?.toLowerCase() === 'awsdatacatalog') {
+                        return true // Always include AWS Data Catalog
+                    }
+                    // Filter using Glue catalogs list
+                    return glueCatalogs.some((glueCatalog) => catalog.displayName?.endsWith(glueCatalog.Name ?? ''))
+                })
+
+                // Add database nodes
+                if (filteredDatabases.length === 0) {
+                    if (databasesResult.status === 'rejected') {
+                        const errorMessage = `Failed to fetch databases - ${databasesResult.reason?.message || databasesResult.reason}.`
+                        void vscode.window.showErrorMessage(errorMessage)
+                        allNodes.push(createErrorItem(errorMessage, 'databases', node.id) as RedshiftNode)
+                    } else {
+                        allNodes.push(createPlaceholderItem(NO_DATA_FOUND_MESSAGE) as RedshiftNode)
+                    }
+                } else {
+                    allNodes.push(
+                        ...filteredDatabases.map((db: any) =>
+                            createDatabaseNode(db.displayName, connectionConfig, node)
+                        )
+                    )
+                }
+
+                // Add catalog nodes
+                if (filteredCatalogs.length === 0) {
+                    if (catalogsResult.status === 'rejected') {
+                        const errorMessage = `Failed to fetch catalogs - ${catalogsResult.reason?.message || catalogsResult.reason}`
+                        void vscode.window.showErrorMessage(errorMessage)
+                        allNodes.push(createErrorItem(errorMessage, 'catalogs', node.id) as RedshiftNode)
+                    } else {
+                        allNodes.push(createPlaceholderItem(NO_DATA_FOUND_MESSAGE) as RedshiftNode)
+                    }
+                } else {
+                    allNodes.push(
+                        ...filteredCatalogs.map((catalog: any) =>
+                            createCatalogNode(
+                                catalog.displayName || catalog.identifier || '',
+                                catalog,
+                                connectionConfig,
+                                node
+                            )
+                        )
+                    )
+                }
+
+                return allNodes
+            })
+        }
+    )
+}
+
+/**
+ * Extracts connection parameters from DataZone connection
+ */
+function extractConnectionParams(connection: DataZoneConnection) {
+    const redshiftProps = connection.props?.redshiftProperties || {}
+    const jdbcConnection = connection.props?.jdbcConnection || {}
+
+    let host = jdbcConnection.host
+    if (!host && jdbcConnection.jdbcUrl) {
+        // Example: jdbc:redshift://test-cluster.123456789012.us-east-1.redshift.amazonaws.com:5439/dev
+        // match[0] = entire URL, match[1] = host, match[2] = port, match[3] = database
+        const match = jdbcConnection.jdbcUrl.match(/jdbc:redshift:\/\/([^:]+):(\d+)\/(.+)/)
+        if (match) {
+            host = match[1]
+        }
+    }
+
+    const database = jdbcConnection.dbname || redshiftProps.databaseName
+    const secretArn = jdbcConnection.secretId || redshiftProps.credentials?.secretArn
+    const accountId = connection.location?.awsAccountId
+    const region = connection.location?.awsRegion
+
+    if (!host || !database || !accountId || !region) {
+        return undefined
+    }
+
+    return { host, database, secretArn, accountId, region }
+}
+
+/**
+ * Wake up the database with a simple query
+ */
+async function wakeUpDatabase(
+    connectionConfig: ConnectionConfig,
+    region: string,
+    connectionCredentialsProvider: ConnectionCredentialsProvider,
+    connection: DataZoneConnection
+) {
+    const logger = getLogger()
+    const clientStore = ConnectionClientStore.getInstance()
+    const sqlClient = clientStore.getSQLWorkbenchClient(connection.connectionId, region, connectionCredentialsProvider)
+    try {
+        await sqlClient.executeQuery(connectionConfig, 'select 1 from sys_query_history limit 1;')
+    } catch (e) {
+        logger.debug(`Wake-up query failed: ${(e as Error).message}`)
+    }
+}
+
+/**
+ * Creates a database node
+ */
+function createDatabaseNode(
+    databaseName: string,
+    connectionConfig: ConnectionConfig,
+    parent: RedshiftNode
+): RedshiftNode {
+    const logger = getLogger()
+
+    return new RedshiftNode(
+        {
+            id: databaseName,
+            nodeType: NodeType.REDSHIFT_DATABASE,
+            value: {
+                database: databaseName,
+                connectionConfig,
+                identifier: databaseName,
+                type: ResourceType.DATABASE,
+                childObjectTypes: [ResourceType.SCHEMA, ResourceType.EXTERNAL_SCHEMA, ResourceType.SHARED_SCHEMA],
+            },
+            path: {
+                ...parent.data.path,
+                database: databaseName,
+            },
+            parent,
+        },
+        async (node) => {
+            try {
+                // Get the original credentials from the root connection node
+                const rootCredentials = getRootCredentials(parent)
+
+                // Create SQL client with the original credentials
+                const clientStore = ConnectionClientStore.getInstance()
+                const sqlClient = clientStore.getSQLWorkbenchClient(
+                    connectionConfig.id,
+                    connectionConfig.id.split(':')[3], // region
+                    rootCredentials
+                )
+
+                // Update connection config with the database
+                const dbConnectionConfig = {
+                    ...connectionConfig,
+                    database: databaseName,
+                }
+
+                // Get schemas
+                const allResources = []
+                let nextToken: string | undefined
+
+                do {
+                    const response = await sqlClient.getResources({
+                        connection: dbConnectionConfig,
+                        resourceType: ResourceType.SCHEMA,
+                        includeChildren: true,
+                        maxItems: 100,
+                        parents: [
+                            {
+                                parentId: databaseName,
+                                parentType: ResourceType.DATABASE,
+                            },
+                        ],
+                        forceRefresh: true,
+                        pageToken: nextToken,
+                    })
+                    allResources.push(...(response.resources || []))
+                    nextToken = response.nextToken
+                } while (nextToken)
+
+                const schemas = allResources.filter(
+                    (r: any) =>
+                        r.type === ResourceType.SCHEMA ||
+                        r.type === ResourceType.EXTERNAL_SCHEMA ||
+                        r.type === ResourceType.SHARED_SCHEMA
+                )
+
+                if (schemas.length === 0) {
+                    return [createPlaceholderItem(NO_DATA_FOUND_MESSAGE) as RedshiftNode]
+                }
+
+                // Map schemas to nodes
+                return schemas.map((schema: any) => createSchemaNode(schema.displayName, dbConnectionConfig, node))
+            } catch (err) {
+                logger.error(`Failed to get schemas: ${(err as Error).message}`)
+                const errorMessage = (err as Error).message
+                void vscode.window.showErrorMessage(errorMessage)
+                return [createErrorItem(errorMessage, 'schemas', node.id) as RedshiftNode]
+            }
+        }
+    )
+}
+
+/**
+ * Creates a schema node
+ */
+function createSchemaNode(schemaName: string, connectionConfig: ConnectionConfig, parent: RedshiftNode): RedshiftNode {
+    const logger = getLogger()
+
+    return new RedshiftNode(
+        {
+            id: schemaName,
+            nodeType: NodeType.REDSHIFT_SCHEMA,
+            value: {
+                schema: schemaName,
+                connectionConfig,
+                identifier: schemaName,
+                type: ResourceType.SCHEMA,
+                childObjectTypes: [
+                    ResourceType.TABLE,
+                    ResourceType.VIEW,
+                    ResourceType.FUNCTION,
+                    ResourceType.STORED_PROCEDURE,
+                    ResourceType.EXTERNAL_TABLE,
+                    ResourceType.CATALOG_TABLE,
+                    ResourceType.DATA_CATALOG_TABLE,
+                ],
+            },
+            path: {
+                ...parent.data.path,
+                schema: schemaName,
+            },
+            parent,
+        },
+        async (node) => {
+            try {
+                // Get the original credentials from the root connection node
+                const rootCredentials = getRootCredentials(parent)
+
+                // Create SQL client with the original credentials
+                const clientStore = ConnectionClientStore.getInstance()
+                const rootConnection = getRootConnection(parent)
+                const sqlClient = clientStore.getSQLWorkbenchClient(
+                    rootConnection.connectionId,
+                    connectionConfig.id.split(':')[3], // region
+                    rootCredentials
+                )
+
+                // Get schema objects
+                // Make sure we're using the correct database in the connection config
+                const schemaConnectionConfig = {
+                    ...connectionConfig,
+                    database: parent.data.path?.database || connectionConfig.database,
+                }
+
+                // Create request params object for logging
+                const requestParams = {
+                    connection: schemaConnectionConfig,
+                    resourceType: ResourceType.TABLE,
+                    includeChildren: true,
+                    maxItems: 100,
+                    parents: [
+                        {
+                            parentId: schemaName,
+                            parentType: ResourceType.SCHEMA,
+                        },
+                        {
+                            parentId: schemaConnectionConfig.database,
+                            parentType: ResourceType.DATABASE,
+                        },
+                    ],
+                    forceRefresh: true,
+                }
+
+                const allResources = []
+                let nextToken: string | undefined
+
+                do {
+                    const response = await sqlClient.getResources({
+                        ...requestParams,
+                        pageToken: nextToken,
+                    })
+                    allResources.push(...(response.resources || []))
+                    nextToken = response.nextToken
+                } while (nextToken)
+
+                // Group resources by type
+                const tables = allResources.filter(
+                    (r: any) =>
+                        r.type === ResourceType.TABLE ||
+                        r.type === ResourceType.EXTERNAL_TABLE ||
+                        r.type === ResourceType.CATALOG_TABLE ||
+                        r.type === ResourceType.DATA_CATALOG_TABLE
+                )
+                const views = allResources.filter((r: any) => r.type === ResourceType.VIEW)
+                const functions = allResources.filter((r: any) => r.type === ResourceType.FUNCTION)
+                const procedures = allResources.filter((r: any) => r.type === ResourceType.STORED_PROCEDURE)
+
+                // Create container nodes for each type
+                const containerNodes: RedshiftNode[] = []
+
+                // Tables container
+                if (tables.length > 0) {
+                    containerNodes.push(createContainerNode(NodeType.REDSHIFT_TABLE, tables, connectionConfig, node))
+                }
+
+                // Views container
+                if (views.length > 0) {
+                    containerNodes.push(createContainerNode(NodeType.REDSHIFT_VIEW, views, connectionConfig, node))
+                }
+
+                // Functions container
+                if (functions.length > 0) {
+                    containerNodes.push(
+                        createContainerNode(NodeType.REDSHIFT_FUNCTION, functions, connectionConfig, node)
+                    )
+                }
+
+                // Stored procedures container
+                if (procedures.length > 0) {
+                    containerNodes.push(
+                        createContainerNode(NodeType.REDSHIFT_STORED_PROCEDURE, procedures, connectionConfig, node)
+                    )
+                }
+
+                if (containerNodes.length === 0) {
+                    return [createPlaceholderItem(NO_DATA_FOUND_MESSAGE) as RedshiftNode]
+                }
+
+                return containerNodes
+            } catch (err) {
+                logger.error(`Failed to get schema contents: ${(err as Error).message}`)
+                const errorMessage = (err as Error).message
+                void vscode.window.showErrorMessage(errorMessage)
+                return [createErrorItem(errorMessage, 'schema-contents', node.id) as RedshiftNode]
+            }
+        }
+    )
+}
+
+/**
+ * Creates a container node for grouping objects by type
+ */
+function createContainerNode(
+    nodeType: NodeType,
+    resources: any[],
+    connectionConfig: ConnectionConfig,
+    parent: RedshiftNode
+): RedshiftNode {
+    return new RedshiftNode(
+        {
+            id: `${parent.id}${NODE_ID_DELIMITER}${nodeType}-container`,
+            nodeType: nodeType,
+            value: {
+                connectionConfig,
+                resources,
+            },
+            path: parent.data.path,
+            parent,
+            isContainer: true,
+        },
+        async (node) => {
+            // Map resources to nodes
+            if (nodeType === NodeType.REDSHIFT_TABLE && parent.data.value?.type === ResourceType.CATALOG_DATABASE) {
+                // For catalog tables, use catalog table node
+                return resources.length > 0
+                    ? resources.map((resource: any) =>
+                          createCatalogTableNode(resource.displayName, resource, connectionConfig, node)
+                      )
+                    : [createPlaceholderItem(NO_DATA_FOUND_MESSAGE) as RedshiftNode]
+            }
+            return resources.length > 0
+                ? resources.map((resource: any) =>
+                      createObjectNode(resource.displayName, nodeType, resource, connectionConfig, node)
+                  )
+                : [createPlaceholderItem(NO_DATA_FOUND_MESSAGE) as RedshiftNode]
+        }
+    )
+}
+
+/**
+ * Creates an object node (table, view, function, etc.)
+ */
+function createObjectNode(
+    name: string,
+    nodeType: NodeType,
+    resource: any,
+    connectionConfig: ConnectionConfig,
+    parent: RedshiftNode
+): RedshiftNode {
+    const logger = getLogger()
+
+    return new RedshiftNode(
+        {
+            id: `${parent.id}${NODE_ID_DELIMITER}${name}`,
+            nodeType: nodeType,
+            value: {
+                ...resource,
+                connectionConfig,
+            },
+            path: {
+                ...parent.data.path,
+                [nodeType]: name,
+            },
+            parent,
+        },
+        async (node) => {
+            // Only tables have columns
+            if (nodeType !== NodeType.REDSHIFT_TABLE) {
+                return []
+            }
+
+            try {
+                // Get the original credentials from the root connection node
+                const rootCredentials = getRootCredentials(parent)
+
+                // Create SQL client with the original credentials
+                const clientStore = ConnectionClientStore.getInstance()
+                const rootConnection = getRootConnection(parent)
+                const sqlClient = clientStore.getSQLWorkbenchClient(
+                    rootConnection.connectionId,
+                    connectionConfig.id.split(':')[3], // region
+                    rootCredentials
+                )
+
+                // Get schema and database from path
+                const schemaName = node.data.path?.schema
+                const databaseName = node.data.path?.database
+                const tableName = node.data.path?.table
+
+                if (!schemaName || !databaseName || !tableName) {
+                    logger.error('Missing schema, database, or table name in path')
+                    return []
+                }
+
+                // Create request params for getResources to get columns
+                const requestParams = {
+                    connection: connectionConfig,
+                    resourceType: ResourceType.COLUMNS,
+                    includeChildren: true,
+                    maxItems: 100,
+                    parents: [
+                        {
+                            parentId: tableName,
+                            parentType: ResourceType.TABLE,
+                        },
+                        {
+                            parentId: schemaName,
+                            parentType: ResourceType.SCHEMA,
+                        },
+                        {
+                            parentId: databaseName,
+                            parentType: ResourceType.DATABASE,
+                        },
+                    ],
+                    forceRefresh: true,
+                }
+
+                // Call getResources to get columns
+                const allColumns = []
+                let nextToken: string | undefined
+
+                do {
+                    const response = await sqlClient.getResources({
+                        ...requestParams,
+                        pageToken: nextToken,
+                    })
+                    allColumns.push(...(response.resources || []))
+                    nextToken = response.nextToken
+                } while (nextToken)
+
+                // Create column nodes from API response
+                return allColumns.length > 0
+                    ? allColumns.map((column: any) => {
+                          // Extract column type from resourceMetadata
+                          let columnType = 'UNKNOWN'
+                          if (column.resourceMetadata && Array.isArray(column.resourceMetadata)) {
+                              const typeMetadata = column.resourceMetadata.find(
+                                  (meta: any) => meta.key === 'COLUMN_TYPE'
+                              )
+                              if (typeMetadata) {
+                                  columnType = typeMetadata.value
+                              }
+                          }
+
+                          columnType = getColumnType(columnType)
+
+                          return createColumnNode(
+                              column.displayName,
+                              {
+                                  name: column.displayName,
+                                  type: columnType,
+                              },
+                              connectionConfig,
+                              node
+                          )
+                      })
+                    : [createPlaceholderItem(NO_DATA_FOUND_MESSAGE) as RedshiftNode]
+            } catch (err) {
+                logger.error(`Failed to get columns: ${(err as Error).message}`)
+                const errorMessage = (err as Error).message
+                void vscode.window.showErrorMessage(errorMessage)
+                return [createErrorItem(errorMessage, 'columns', node.id) as RedshiftNode]
+            }
+        }
+    )
+}
+
+/**
+ * Creates a column node
+ */
+function createColumnNode(
+    name: string,
+    columnInfo: { name: string; type: string },
+    connectionConfig: ConnectionConfig,
+    parent: RedshiftNode
+): RedshiftNode {
+    return new RedshiftNode({
+        id: `${parent.id}${NODE_ID_DELIMITER}${name}`,
+        nodeType: NodeType.REDSHIFT_COLUMN,
+        value: {
+            name,
+            type: columnInfo.type,
+            connectionConfig,
+        },
+        path: {
+            ...parent.data.path,
+            column: name,
+        },
+        parent,
+    })
+}
+
+/**
+ * Gets the root connection from a node
+ */
+function getRootConnection(node: RedshiftNode): DataZoneConnection {
+    // Start with the current node
+    let currentNode = node
+
+    // Traverse up to the root connection node
+    while (currentNode.data.parent) {
+        currentNode = currentNode.data.parent
+    }
+
+    // Get connection from the root node
+    return currentNode.data.value?.connection
+}
+
+/**
+ * Gets the original credentials from the root connection node
+ */
+function getRootCredentials(node: RedshiftNode): ConnectionCredentialsProvider {
+    // Start with the current node
+    let currentNode = node
+
+    // Traverse up to the root connection node
+    while (currentNode.data.parent) {
+        currentNode = currentNode.data.parent
+    }
+
+    // Get credentials from the root node
+    const credentials = currentNode.data.value?.connectionCredentialsProvider
+
+    // Return credentials or fallback to dummy credentials
+    return (
+        credentials || {
+            accessKeyId: 'dummy',
+            secretAccessKey: 'dummy',
+        }
+    )
+}
+
+/**
+ * Fetch glue catalogs, this will help determine which catalogs are accessible within the project
+ */
+async function listGlueCatalogs(
+    connectionId: string,
+    region: string,
+    connectionCredentialsProvider: ConnectionCredentialsProvider
+): Promise<GlueCatalog[]> {
+    const clientStore = ConnectionClientStore.getInstance()
+    const glueCatalogClient = clientStore.getGlueCatalogClient(connectionId, region, connectionCredentialsProvider)
+
+    const allCatalogs = []
+    let nextToken: string | undefined
+
+    do {
+        const { catalogs, nextToken: token } = await glueCatalogClient.getCatalogs(nextToken)
+        allCatalogs.push(...catalogs)
+        nextToken = token
+    } while (nextToken)
+
+    return allCatalogs
+}
+
+/**
+ * Main logic to fetch catalog and database resources using getResources
+ */
+async function fetchResources(
+    sqlClient: any,
+    connectionConfig: ConnectionConfig,
+    resourceType: ResourceType,
+    parents: any[] = []
+): Promise<any[]> {
+    const allResources = []
+    let nextToken: string | undefined
+
+    do {
+        const requestParams = {
+            connection: connectionConfig,
+            resourceType,
+            includeChildren: true,
+            maxItems: 100,
+            parents,
+            forceRefresh: true,
+            pageToken: nextToken,
+        }
+        const response = await sqlClient.getResources(requestParams)
+        allResources.push(...(response.resources || []))
+        nextToken = response.nextToken
+    } while (nextToken)
+
+    return allResources
+}
+
+/**
+ * Creates a catalog database node
+ */
+function createCatalogDatabaseNode(
+    databaseName: string,
+    database: any,
+    connectionConfig: ConnectionConfig,
+    parent: RedshiftNode
+): RedshiftNode {
+    return new RedshiftNode(
+        {
+            id: `${parent.id}${NODE_ID_DELIMITER}${databaseName}`,
+            nodeType: NodeType.REDSHIFT_CATALOG_DATABASE,
+            value: {
+                ...database,
+                connectionConfig,
+                identifier: databaseName,
+                type: ResourceType.CATALOG_DATABASE,
+            },
+            path: {
+                ...parent.data.path,
+                database: databaseName,
+            },
+            parent,
+        },
+        async (node) => {
+            try {
+                const rootCredentials = getRootCredentials(parent)
+                const clientStore = ConnectionClientStore.getInstance()
+                const rootConnection = getRootConnection(parent)
+                const sqlClient = clientStore.getSQLWorkbenchClient(
+                    rootConnection.connectionId,
+                    connectionConfig.id.split(':')[3],
+                    rootCredentials
+                )
+
+                // Use getResources to fetch tables within this catalog database
+                const tables = await fetchResources(sqlClient, connectionConfig, ResourceType.CATALOG_TABLE, [
+                    {
+                        parentId: database.identifier,
+                        parentType: ResourceType.CATALOG_DATABASE,
+                    },
+                    {
+                        parentId: parent.data.value?.catalog?.identifier || parent.data.path?.catalog,
+                        parentType: ResourceType.CATALOG,
+                    },
+                ])
+
+                if (tables.length === 0) {
+                    return [createPlaceholderItem(NO_DATA_FOUND_MESSAGE) as RedshiftNode]
+                }
+
+                // Create container node for tables
+                return [createContainerNode(NodeType.REDSHIFT_TABLE, tables, connectionConfig, node)]
+            } catch (err) {
+                const errorMessage = (err as Error).message
+                void vscode.window.showErrorMessage(errorMessage)
+                return [createErrorItem(errorMessage, 'catalog-tables', node.id) as RedshiftNode]
+            }
+        }
+    )
+}
+
+/**
+ * Creates a catalog table node
+ */
+function createCatalogTableNode(
+    tableName: string,
+    table: any,
+    connectionConfig: ConnectionConfig,
+    parent: RedshiftNode
+): RedshiftNode {
+    return new RedshiftNode(
+        {
+            id: `${parent.id}${NODE_ID_DELIMITER}${tableName}`,
+            nodeType: NodeType.REDSHIFT_TABLE,
+            value: {
+                ...table,
+                connectionConfig,
+            },
+            path: {
+                ...parent.data.path,
+                table: tableName,
+            },
+            parent,
+        },
+        async (node) => {
+            try {
+                const rootCredentials = getRootCredentials(parent)
+                const clientStore = ConnectionClientStore.getInstance()
+                const rootConnection = getRootConnection(parent)
+                const sqlClient = clientStore.getSQLWorkbenchClient(
+                    rootConnection.connectionId,
+                    connectionConfig.id.split(':')[3],
+                    rootCredentials
+                )
+
+                // Use getResources to fetch columns within this catalog table
+                // Need to traverse up to find the actual database and catalog nodes
+                let databaseNode = parent
+                while (databaseNode && databaseNode.data.nodeType !== NodeType.REDSHIFT_CATALOG_DATABASE) {
+                    databaseNode = databaseNode.data.parent
+                }
+
+                let catalogNode = databaseNode?.data.parent
+                while (catalogNode && catalogNode.data.nodeType !== NodeType.REDSHIFT_CATALOG) {
+                    catalogNode = catalogNode.data.parent
+                }
+
+                const parents = [
+                    {
+                        parentId: table.identifier,
+                        parentType: ResourceType.CATALOG_TABLE,
+                    },
+                    {
+                        parentId: databaseNode?.data.value?.identifier,
+                        parentType: ResourceType.CATALOG_DATABASE,
+                    },
+                    {
+                        parentId: catalogNode?.data.value?.catalog?.identifier || catalogNode?.data.value?.identifier,
+                        parentType: ResourceType.CATALOG,
+                    },
+                ]
+
+                const columns = await fetchResources(sqlClient, connectionConfig, ResourceType.CATALOG_COLUMN, parents)
+
+                return columns.length > 0
+                    ? columns.map((column: any) => {
+                          let columnType = 'UNKNOWN'
+                          if (column.resourceMetadata && Array.isArray(column.resourceMetadata)) {
+                              const typeMetadata = column.resourceMetadata.find(
+                                  (meta: any) => meta.key === 'COLUMN_TYPE'
+                              )
+                              if (typeMetadata) {
+                                  columnType = typeMetadata.value
+                              }
+                          }
+
+                          columnType = getColumnType(columnType)
+
+                          return createColumnNode(
+                              column.displayName,
+                              {
+                                  name: column.displayName,
+                                  type: columnType,
+                              },
+                              connectionConfig,
+                              node
+                          )
+                      })
+                    : [createPlaceholderItem(NO_DATA_FOUND_MESSAGE) as RedshiftNode]
+            } catch (err) {
+                const errorMessage = (err as Error).message
+                void vscode.window.showErrorMessage(errorMessage)
+                return [createErrorItem(errorMessage, 'catalog-columns', node.id) as RedshiftNode]
+            }
+        }
+    )
+}
+
+/**
+ * Creates a catalog node
+ */
+function createCatalogNode(
+    catalogName: string,
+    catalog: any,
+    connectionConfig: ConnectionConfig,
+    parent: RedshiftNode
+): RedshiftNode {
+    return new RedshiftNode(
+        {
+            id: `${parent.id}${NODE_ID_DELIMITER}${catalogName}`,
+            nodeType: NodeType.REDSHIFT_CATALOG,
+            value: {
+                catalog,
+                catalogName,
+                connectionConfig,
+                identifier: catalogName,
+                type: ResourceType.CATALOG,
+            },
+            path: {
+                ...parent.data.path,
+                catalog: catalogName,
+            },
+            parent,
+        },
+        async (node) => {
+            try {
+                const rootCredentials = getRootCredentials(parent)
+                const clientStore = ConnectionClientStore.getInstance()
+                const rootConnection = getRootConnection(parent)
+                const sqlClient = clientStore.getSQLWorkbenchClient(
+                    rootConnection.connectionId,
+                    connectionConfig.id.split(':')[3],
+                    rootCredentials
+                )
+
+                // Use getResources to fetch databases within this catalog
+                const databases = await fetchResources(sqlClient, connectionConfig, ResourceType.CATALOG_DATABASE, [
+                    {
+                        parentId: catalog.identifier,
+                        parentType: ResourceType.CATALOG,
+                    },
+                ])
+
+                if (databases.length === 0) {
+                    return [createPlaceholderItem(NO_DATA_FOUND_MESSAGE) as RedshiftNode]
+                }
+
+                return databases.length > 0
+                    ? databases.map((database: any) =>
+                          createCatalogDatabaseNode(database.displayName, database, connectionConfig, node)
+                      )
+                    : [createPlaceholderItem(NO_DATA_FOUND_MESSAGE) as RedshiftNode]
+            } catch (err) {
+                const errorMessage = (err as Error).message
+                void vscode.window.showErrorMessage(errorMessage)
+                return [createErrorItem(errorMessage, 'catalog-databases', node.id) as RedshiftNode]
+            }
+        }
+    )
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/explorer/nodes/s3Strategy.ts b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/s3Strategy.ts
new file mode 100644
index 00000000000..4106a0b4889
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/s3Strategy.ts
@@ -0,0 +1,599 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { TreeNode } from '../../../shared/treeview/resourceTreeDataProvider'
+import { getLogger } from '../../../shared/logger/logger'
+import { DataZoneConnection } from '../../shared/client/datazoneClient'
+import { S3Client } from '../../shared/client/s3Client'
+import { ConnectionClientStore } from '../../shared/client/connectionClientStore'
+import { NODE_ID_DELIMITER, NodeType, ConnectionType, NodeData, NO_DATA_FOUND_MESSAGE } from './types'
+import { getLabel, isLeafNode, getIconForNodeType, getTooltip, createErrorItem } from './utils'
+import { createPlaceholderItem } from '../../../shared/treeview/utils'
+import {
+    ListCallerAccessGrantsCommand,
+    GetDataAccessCommand,
+    ListCallerAccessGrantsEntry,
+} from '@aws-sdk/client-s3-control'
+import { S3, ListObjectsV2Command } from '@aws-sdk/client-s3'
+import { ConnectionCredentialsProvider } from '../../auth/providers/connectionCredentialsProvider'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { recordDataConnectionTelemetry } from '../../shared/telemetry'
+
+// Regex to match default S3 connection names
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export const DATA_DEFAULT_S3_CONNECTION_NAME_REGEXP = /^(project\.s3_default_folder)|(default\.s3)$/
+
+/**
+ * S3 data node for SageMaker Unified Studio
+ */
+export class S3Node implements TreeNode {
+    private readonly logger = getLogger()
+    private childrenNodes: TreeNode[] | undefined
+    private isLoading = false
+
+    constructor(
+        public readonly data: NodeData,
+        private readonly childrenProvider?: (node: S3Node) => Promise<S3Node[]>
+    ) {}
+
+    public get id(): string {
+        return this.data.id
+    }
+
+    public get resource(): any {
+        return this.data.value || {}
+    }
+
+    public async getChildren(): Promise<TreeNode[]> {
+        // Return cached children if available
+        if (this.childrenNodes && !this.isLoading) {
+            return this.childrenNodes
+        }
+
+        // Return empty array for leaf nodes
+        if (isLeafNode(this.data)) {
+            return []
+        }
+
+        // If we have a children provider, use it
+        if (this.childrenProvider) {
+            try {
+                this.isLoading = true
+                const childrenNodes = await this.childrenProvider(this)
+                this.childrenNodes = childrenNodes
+                this.isLoading = false
+                return this.childrenNodes
+            } catch (err) {
+                this.isLoading = false
+                this.logger.error(`Failed to get children for node ${this.data.id}: ${(err as Error).message}`)
+
+                const errorMessage = (err as Error).message
+                void vscode.window.showErrorMessage(errorMessage)
+                return [createErrorItem(errorMessage, 'getChildren', this.id) as S3Node]
+            }
+        }
+
+        return []
+    }
+
+    public async getTreeItem(): Promise<vscode.TreeItem> {
+        const collapsibleState = isLeafNode(this.data)
+            ? vscode.TreeItemCollapsibleState.None
+            : vscode.TreeItemCollapsibleState.Collapsed
+
+        const label = getLabel(this.data)
+        const item = new vscode.TreeItem(label, collapsibleState)
+
+        // Set icon based on node type
+        item.iconPath = getIconForNodeType(this.data.nodeType, this.data.isContainer)
+
+        // Set context value for command enablement
+        item.contextValue = this.data.nodeType
+
+        // Set tooltip
+        item.tooltip = getTooltip(this.data)
+
+        return item
+    }
+
+    public getParent(): TreeNode | undefined {
+        return this.data.parent
+    }
+}
+
+/**
+ * Creates an S3 connection node
+ */
+export function createS3ConnectionNode(
+    connection: DataZoneConnection,
+    connectionCredentialsProvider: ConnectionCredentialsProvider,
+    region: string
+): S3Node {
+    const logger = getLogger()
+
+    // Parse S3 URI from connection
+    const s3Info = parseS3Uri(connection)
+    if (!s3Info) {
+        logger.warn(`No S3 URI found in connection properties for connection ${connection.name}`)
+        const errorMessage = 'No S3 URI configured'
+        void vscode.window.showErrorMessage(errorMessage)
+        return createErrorItem(errorMessage, 'connection', connection.connectionId) as S3Node
+    }
+
+    // Get S3 client from store
+    const clientStore = ConnectionClientStore.getInstance()
+    const s3Client = clientStore.getS3Client(connection.connectionId, region, connectionCredentialsProvider)
+
+    // Check if this is a default S3 connection
+    const isDefaultConnection = DATA_DEFAULT_S3_CONNECTION_NAME_REGEXP.test(connection.name)
+
+    // Create the connection node
+    return new S3Node(
+        {
+            id: connection.connectionId,
+            nodeType: NodeType.CONNECTION,
+            connectionType: ConnectionType.S3,
+            value: { connection },
+            path: {
+                connection: connection.name,
+                bucket: s3Info.bucket,
+            },
+        },
+        async (node) => {
+            return telemetry.smus_renderS3Node.run(async (span) => {
+                await recordDataConnectionTelemetry(span, connection, connectionCredentialsProvider)
+                try {
+                    if (isDefaultConnection && s3Info.prefix) {
+                        // For default connections, show the full path as the first node
+                        const fullPath = `${s3Info.bucket}/${s3Info.prefix}`
+                        return [
+                            new S3Node(
+                                {
+                                    id: fullPath,
+                                    nodeType: NodeType.S3_BUCKET,
+                                    connectionType: ConnectionType.S3,
+                                    value: { bucket: s3Info.bucket, prefix: s3Info.prefix },
+                                    path: {
+                                        connection: connection.name,
+                                        bucket: s3Info.bucket,
+                                        key: s3Info.prefix,
+                                        label: fullPath,
+                                    },
+                                    parent: node,
+                                },
+                                async (bucketNode) => {
+                                    try {
+                                        // List objects starting from the prefix
+                                        const allPaths = []
+                                        let nextToken: string | undefined
+
+                                        do {
+                                            const result = await s3Client.listPaths(
+                                                s3Info.bucket,
+                                                s3Info.prefix,
+                                                nextToken
+                                            )
+                                            allPaths.push(...result.paths)
+                                            nextToken = result.nextToken
+                                        } while (nextToken)
+
+                                        if (allPaths.length === 0) {
+                                            return [createPlaceholderItem(NO_DATA_FOUND_MESSAGE) as S3Node]
+                                        }
+
+                                        // Convert paths to nodes
+                                        return allPaths.map((path) => {
+                                            const nodeId = `${path.bucket}-${path.prefix || 'root'}`
+
+                                            return new S3Node(
+                                                {
+                                                    id: nodeId,
+                                                    nodeType: path.isFolder ? NodeType.S3_FOLDER : NodeType.S3_FILE,
+                                                    connectionType: ConnectionType.S3,
+                                                    value: path,
+                                                    path: {
+                                                        connection: connection.name,
+                                                        bucket: path.bucket,
+                                                        key: path.prefix,
+                                                        label: path.displayName,
+                                                    },
+                                                    parent: bucketNode,
+                                                },
+                                                path.isFolder ? createFolderChildrenProvider(s3Client, path) : undefined
+                                            )
+                                        })
+                                    } catch (err) {
+                                        logger.error(`Failed to list bucket contents: ${(err as Error).message}`)
+                                        const errorMessage = (err as Error).message
+                                        void vscode.window.showErrorMessage(errorMessage)
+                                        return [
+                                            createErrorItem(
+                                                errorMessage,
+                                                'bucket-contents-default',
+                                                bucketNode.id
+                                            ) as S3Node,
+                                        ]
+                                    }
+                                }
+                            ),
+                        ]
+                    } else {
+                        // For non-default connections, show bucket as the first node
+                        return [
+                            new S3Node(
+                                {
+                                    id: s3Info.bucket,
+                                    nodeType: NodeType.S3_BUCKET,
+                                    connectionType: ConnectionType.S3,
+                                    value: { bucket: s3Info.bucket },
+                                    path: {
+                                        connection: connection.name,
+                                        bucket: s3Info.bucket,
+                                    },
+                                    parent: node,
+                                },
+                                async (bucketNode) => {
+                                    try {
+                                        // List objects in the bucket
+                                        const allPaths = []
+                                        let nextToken: string | undefined
+
+                                        do {
+                                            const result = await s3Client.listPaths(
+                                                s3Info.bucket,
+                                                s3Info.prefix,
+                                                nextToken
+                                            )
+                                            allPaths.push(...result.paths)
+                                            nextToken = result.nextToken
+                                        } while (nextToken)
+
+                                        if (allPaths.length === 0) {
+                                            return [createPlaceholderItem(NO_DATA_FOUND_MESSAGE) as S3Node]
+                                        }
+
+                                        // Convert paths to nodes
+                                        return allPaths.map((path) => {
+                                            const nodeId = `${path.bucket}-${path.prefix || 'root'}`
+
+                                            return new S3Node(
+                                                {
+                                                    id: nodeId,
+                                                    nodeType: path.isFolder ? NodeType.S3_FOLDER : NodeType.S3_FILE,
+                                                    connectionType: ConnectionType.S3,
+                                                    value: path,
+                                                    path: {
+                                                        connection: connection.name,
+                                                        bucket: path.bucket,
+                                                        key: path.prefix,
+                                                        label: path.displayName,
+                                                    },
+                                                    parent: bucketNode,
+                                                },
+                                                path.isFolder ? createFolderChildrenProvider(s3Client, path) : undefined
+                                            )
+                                        })
+                                    } catch (err) {
+                                        logger.error(`Failed to list bucket contents: ${(err as Error).message}`)
+                                        const errorMessage = (err as Error).message
+                                        void vscode.window.showErrorMessage(errorMessage)
+                                        return [
+                                            createErrorItem(
+                                                errorMessage,
+                                                'bucket-contents-regular',
+                                                bucketNode.id
+                                            ) as S3Node,
+                                        ]
+                                    }
+                                }
+                            ),
+                        ]
+                    }
+                } catch (err) {
+                    logger.error(`Failed to create bucket node: ${(err as Error).message}`)
+                    const errorMessage = (err as Error).message
+                    void vscode.window.showErrorMessage(errorMessage)
+                    return [createErrorItem(errorMessage, 'bucket-node', node.id) as S3Node]
+                }
+            })
+        }
+    )
+}
+
+/**
+ * Creates S3 access grant nodes for project.s3_default_folder connections
+ */
+export async function createS3AccessGrantNodes(
+    connection: DataZoneConnection,
+    connectionCredentialsProvider: ConnectionCredentialsProvider,
+    region: string,
+    accountId: string | undefined
+): Promise<S3Node[]> {
+    if (connection.name !== 'project.s3_default_folder' || !accountId) {
+        return []
+    }
+
+    return await listCallerAccessGrants(connectionCredentialsProvider, region, accountId, connection.connectionId)
+}
+
+/**
+ * Creates a children provider function for a folder node
+ */
+function createFolderChildrenProvider(s3Client: S3Client, folderPath: any): (node: S3Node) => Promise<S3Node[]> {
+    const logger = getLogger()
+
+    return async (node: S3Node) => {
+        try {
+            // List objects in the folder
+            const allPaths = []
+            let nextToken: string | undefined
+
+            do {
+                const result = await s3Client.listPaths(folderPath.bucket, folderPath.prefix, nextToken)
+                allPaths.push(...result.paths)
+                nextToken = result.nextToken
+            } while (nextToken)
+
+            if (allPaths.length === 0) {
+                return [createPlaceholderItem(NO_DATA_FOUND_MESSAGE) as S3Node]
+            }
+
+            // Convert paths to nodes
+            return allPaths.map((path) => {
+                const nodeId = `${path.bucket}-${path.prefix || 'root'}`
+
+                return new S3Node(
+                    {
+                        id: nodeId,
+                        nodeType: path.isFolder ? NodeType.S3_FOLDER : NodeType.S3_FILE,
+                        connectionType: ConnectionType.S3,
+                        value: path,
+                        path: {
+                            connection: node.data.path?.connection,
+                            bucket: path.bucket,
+                            key: path.prefix,
+                            label: path.displayName,
+                        },
+                        parent: node,
+                    },
+                    path.isFolder ? createFolderChildrenProvider(s3Client, path) : undefined
+                )
+            })
+        } catch (err) {
+            logger.error(`Failed to list folder contents: ${(err as Error).message}`)
+            const errorMessage = (err as Error).message
+            void vscode.window.showErrorMessage(errorMessage)
+            return [createErrorItem(errorMessage, 'folder-contents', node.id) as S3Node]
+        }
+    }
+}
+
+/**
+ * Parse S3 URI from connection
+ */
+function parseS3Uri(connection: DataZoneConnection): { bucket: string; prefix?: string } | undefined {
+    const s3Properties = connection.props?.s3Properties
+    const s3Uri = s3Properties?.s3Uri
+
+    if (!s3Uri) {
+        return undefined
+    }
+
+    // Parse S3 URI: s3://bucket-name/prefix/path/
+    const uriWithoutPrefix = s3Uri.replace('s3://', '')
+    // Since the URI ends with a slash, the last item will be an empty string, so ignore it in the parts.
+    const parts = uriWithoutPrefix.split('/').slice(0, -1)
+    const bucket = parts[0]
+
+    // If parts only contains 1 item, then only a bucket was provided, and the key is empty.
+    const prefix = parts.length > 1 ? parts.slice(1).join('/') + '/' : undefined
+
+    return { bucket, prefix }
+}
+
+async function listCallerAccessGrants(
+    connectionCredentialsProvider: ConnectionCredentialsProvider,
+    region: string,
+    accountId: string,
+    connectionId: string
+): Promise<S3Node[]> {
+    const logger = getLogger()
+    try {
+        const clientStore = ConnectionClientStore.getInstance()
+        const s3ControlClient = clientStore.getS3ControlClient(connectionId, region, connectionCredentialsProvider)
+
+        const allGrants: ListCallerAccessGrantsEntry[] = []
+        let nextToken: string | undefined
+
+        do {
+            const command = new ListCallerAccessGrantsCommand({
+                AccountId: accountId,
+                NextToken: nextToken,
+            })
+
+            const response = await s3ControlClient.send(command)
+            const grants = response.CallerAccessGrantsList?.filter((entry) => !!entry) ?? []
+            allGrants.push(...grants)
+            nextToken = response.NextToken
+        } while (nextToken)
+
+        logger.info(`Listed ${allGrants.length} caller access grants`)
+
+        const accessGrantNodes = allGrants.map((grant) =>
+            getRootNodeFromS3AccessGrant(grant, accountId, region, connectionCredentialsProvider, connectionId)
+        )
+        return accessGrantNodes
+    } catch (error) {
+        logger.error(`Failed to list caller access grants: ${(error as Error).message}`)
+        return []
+    }
+}
+
+function parseS3UriForAccessGrant(s3Uri: string): { bucket: string; key: string } {
+    const uriWithoutPrefix = s3Uri.replace('s3://', '')
+    const parts = uriWithoutPrefix.split('/').slice(0, -1)
+    const bucket = parts[0]
+    const key = parts.length > 1 ? parts.slice(1).join('/') + '/' : ''
+    return { bucket, key }
+}
+
+function getRootNodeFromS3AccessGrant(
+    s3AccessGrant: ListCallerAccessGrantsEntry,
+    accountId: string,
+    region: string,
+    connectionCredentialsProvider: ConnectionCredentialsProvider,
+    connectionId: string
+): S3Node {
+    const s3Uri = s3AccessGrant.GrantScope
+    let bucket: string | undefined
+    let key: string | undefined
+    let nodeId = ''
+    let label: string
+
+    if (s3Uri) {
+        const { bucket: parsedBucket, key: parsedKey } = parseS3UriForAccessGrant(s3Uri)
+        bucket = parsedBucket
+        key = parsedKey
+        label = s3Uri.replace('s3://', '').replace('*', '')
+        nodeId = label
+    } else {
+        label = s3AccessGrant.GrantScope ?? ''
+    }
+
+    return new S3Node(
+        {
+            id: nodeId,
+            nodeType: NodeType.S3_ACCESS_GRANT,
+            connectionType: ConnectionType.S3,
+            value: s3AccessGrant,
+            path: { accountId, bucket, key, label },
+        },
+        async (node) => {
+            return await fetchAccessGrantChildren(node, accountId, region, connectionCredentialsProvider, connectionId)
+        }
+    )
+}
+
+async function fetchAccessGrantChildren(
+    node: S3Node,
+    accountId: string,
+    region: string,
+    connectionCredentialsProvider: ConnectionCredentialsProvider,
+    connectionId: string
+): Promise<S3Node[]> {
+    const logger = getLogger()
+    const path = node.data.path
+
+    try {
+        const clientStore = ConnectionClientStore.getInstance()
+        const s3ControlClient = clientStore.getS3ControlClient(connectionId, region, connectionCredentialsProvider)
+
+        const target = `s3://${path?.bucket ?? ''}/${path?.key ?? ''}*`
+
+        const getDataAccessCommand = new GetDataAccessCommand({
+            AccountId: accountId,
+            Target: target,
+            Permission: 'READ',
+        })
+
+        const grantCredentialsProvider = async () => {
+            const response = await s3ControlClient.send(getDataAccessCommand)
+            if (
+                !response.Credentials?.AccessKeyId ||
+                !response.Credentials?.SecretAccessKey ||
+                !response.Credentials?.SessionToken
+            ) {
+                throw new Error('Missing required credentials from access grant response')
+            }
+            return {
+                accessKeyId: response.Credentials.AccessKeyId,
+                secretAccessKey: response.Credentials.SecretAccessKey,
+                sessionToken: response.Credentials.SessionToken,
+                expiration: response.Credentials.Expiration,
+            }
+        }
+
+        const s3ClientWithGrant = new S3({
+            credentials: grantCredentialsProvider,
+            region,
+        })
+
+        const response = await s3ClientWithGrant.send(
+            new ListObjectsV2Command({
+                Bucket: path?.bucket ?? '',
+                Prefix: path?.key ?? '',
+                Delimiter: '/',
+                MaxKeys: 100,
+            })
+        )
+
+        const children: S3Node[] = []
+
+        // Add folders
+        if (response.CommonPrefixes) {
+            for (const prefix of response.CommonPrefixes) {
+                const folderName =
+                    prefix.Prefix?.split('/')
+                        .filter((name) => !!name)
+                        .at(-1) + '/'
+                children.push(
+                    new S3Node(
+                        {
+                            id: `${node.id}${NODE_ID_DELIMITER}${folderName}`,
+                            nodeType: NodeType.S3_FOLDER,
+                            connectionType: ConnectionType.S3,
+                            value: prefix,
+                            path: {
+                                accountId,
+                                bucket: path?.bucket,
+                                key: prefix.Prefix,
+                                label: folderName,
+                            },
+                            parent: node,
+                        },
+                        async (folderNode) => {
+                            return await fetchAccessGrantChildren(
+                                folderNode,
+                                accountId,
+                                region,
+                                connectionCredentialsProvider,
+                                connectionId
+                            )
+                        }
+                    )
+                )
+            }
+        }
+
+        // Add files
+        if (response.Contents) {
+            for (const content of response.Contents.filter((content) => content.Key !== response.Prefix)) {
+                const fileName = content.Key?.split('/').at(-1) ?? ''
+                children.push(
+                    new S3Node({
+                        id: `${node.id}${NODE_ID_DELIMITER}${fileName}`,
+                        nodeType: NodeType.S3_FILE,
+                        connectionType: ConnectionType.S3,
+                        value: content,
+                        path: {
+                            bucket: path?.bucket,
+                            key: content.Key,
+                            label: fileName,
+                        },
+                        parent: node,
+                    })
+                )
+            }
+        }
+
+        return children
+    } catch (error) {
+        logger.error(`Failed to fetch access grant children: ${(error as Error).message}`)
+        const errorMessage = (error as Error).message
+        void vscode.window.showErrorMessage(errorMessage)
+        return [createErrorItem(errorMessage, 'access-grant-children', node.id) as S3Node]
+    }
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioAuthInfoNode.ts b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioAuthInfoNode.ts
new file mode 100644
index 00000000000..ff25f64cf74
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioAuthInfoNode.ts
@@ -0,0 +1,90 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { TreeNode } from '../../../shared/treeview/resourceTreeDataProvider'
+import { SageMakerUnifiedStudioRootNode } from './sageMakerUnifiedStudioRootNode'
+import { SmusAuthenticationProvider } from '../../auth/providers/smusAuthenticationProvider'
+
+/**
+ * Node representing the SageMaker Unified Studio authentication information
+ */
+export class SageMakerUnifiedStudioAuthInfoNode implements TreeNode {
+    public readonly id = 'smusAuthInfoNode'
+    public readonly resource = this
+    private readonly authProvider: SmusAuthenticationProvider
+
+    private readonly onDidChangeEmitter = new vscode.EventEmitter<void>()
+    public readonly onDidChangeTreeItem = this.onDidChangeEmitter.event
+
+    constructor(private readonly parent?: SageMakerUnifiedStudioRootNode) {
+        this.authProvider = SmusAuthenticationProvider.fromContext()
+
+        // Subscribe to auth provider connection changes to refresh the node
+        this.authProvider.onDidChange(() => {
+            this.onDidChangeEmitter.fire()
+        })
+    }
+
+    public getTreeItem(): vscode.TreeItem {
+        // Use the cached authentication provider to check connection status
+        const isConnected = this.authProvider.isConnected()
+        const isValid = this.authProvider.isConnectionValid()
+
+        // Get the domain ID and region from auth provider
+        let domainId = 'Unknown'
+        let region = 'Unknown'
+
+        if (isConnected && this.authProvider.activeConnection) {
+            const conn = this.authProvider.activeConnection
+            domainId = conn.domainId || 'Unknown'
+            region = conn.ssoRegion || 'Unknown'
+        }
+
+        // Create display based on connection status
+        let label: string
+        let iconPath: vscode.ThemeIcon
+        let tooltip: string
+
+        if (isConnected && isValid) {
+            label = `Domain: ${domainId}`
+            iconPath = new vscode.ThemeIcon('key', new vscode.ThemeColor('charts.green'))
+            tooltip = `Connected to SageMaker Unified Studio\nDomain ID: ${domainId}\nRegion: ${region}\nStatus: Connected`
+        } else if (isConnected && !isValid) {
+            label = `Domain: ${domainId} (Expired) - Click to reauthenticate`
+            iconPath = new vscode.ThemeIcon('warning', new vscode.ThemeColor('charts.yellow'))
+            tooltip = `Connection to SageMaker Unified Studio has expired\nDomain ID: ${domainId}\nRegion: ${region}\nStatus: Expired - Click to reauthenticate`
+        } else {
+            label = 'Not Connected'
+            iconPath = new vscode.ThemeIcon('circle-slash', new vscode.ThemeColor('charts.red'))
+            tooltip = 'Not connected to SageMaker Unified Studio\nPlease sign in to access your projects'
+        }
+
+        const item = new vscode.TreeItem(label, vscode.TreeItemCollapsibleState.None)
+
+        // Add region as description (appears to the right) if connected
+        if (isConnected) {
+            item.description = region
+        }
+
+        // Add command for reauthentication when connection is expired
+        if (isConnected && !isValid) {
+            item.command = {
+                command: 'aws.smus.reauthenticate',
+                title: 'Reauthenticate',
+                arguments: [this.authProvider.activeConnection],
+            }
+        }
+
+        item.tooltip = tooltip
+        item.contextValue = 'smusAuthInfo'
+        item.iconPath = iconPath
+        return item
+    }
+
+    public getParent(): TreeNode | undefined {
+        return this.parent
+    }
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioComputeNode.ts b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioComputeNode.ts
new file mode 100644
index 00000000000..01293e7e523
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioComputeNode.ts
@@ -0,0 +1,66 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { TreeNode } from '../../../shared/treeview/resourceTreeDataProvider'
+import { getIcon } from '../../../shared/icons'
+import { SageMakerUnifiedStudioSpacesParentNode } from './sageMakerUnifiedStudioSpacesParentNode'
+import { SageMakerUnifiedStudioProjectNode } from './sageMakerUnifiedStudioProjectNode'
+import { SagemakerClient } from '../../../shared/clients/sagemaker'
+import { SmusAuthenticationProvider } from '../../auth/providers/smusAuthenticationProvider'
+import { SageMakerUnifiedStudioConnectionParentNode } from './sageMakerUnifiedStudioConnectionParentNode'
+import { ConnectionType } from '@aws-sdk/client-datazone'
+
+export class SageMakerUnifiedStudioComputeNode implements TreeNode {
+    public readonly id = 'smusComputeNode'
+    public readonly resource = this
+    private spacesNode: SageMakerUnifiedStudioSpacesParentNode | undefined
+
+    constructor(
+        public readonly parent: SageMakerUnifiedStudioProjectNode,
+        private readonly extensionContext: vscode.ExtensionContext,
+        public readonly authProvider: SmusAuthenticationProvider,
+        private readonly sagemakerClient: SagemakerClient
+    ) {}
+
+    public async getTreeItem(): Promise<vscode.TreeItem> {
+        const item = new vscode.TreeItem('Compute', vscode.TreeItemCollapsibleState.Expanded)
+        item.iconPath = getIcon('vscode-chip')
+        item.contextValue = this.getContext()
+        return item
+    }
+
+    public async getChildren(): Promise<TreeNode[]> {
+        const childrenNodes: TreeNode[] = []
+        const projectId = this.parent.getProject()?.id
+
+        if (projectId) {
+            childrenNodes.push(
+                new SageMakerUnifiedStudioConnectionParentNode(this, ConnectionType.REDSHIFT, 'Data warehouse')
+            )
+            childrenNodes.push(
+                new SageMakerUnifiedStudioConnectionParentNode(this, ConnectionType.SPARK, 'Data processing')
+            )
+            this.spacesNode = new SageMakerUnifiedStudioSpacesParentNode(
+                this,
+                projectId,
+                this.extensionContext,
+                this.authProvider,
+                this.sagemakerClient
+            )
+            childrenNodes.push(this.spacesNode)
+        }
+
+        return childrenNodes
+    }
+
+    public getParent(): TreeNode | undefined {
+        return this.parent
+    }
+
+    private getContext(): string {
+        return 'smusComputeNode'
+    }
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioConnectionNode.ts b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioConnectionNode.ts
new file mode 100644
index 00000000000..969efa9823d
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioConnectionNode.ts
@@ -0,0 +1,63 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../../../shared/logger/logger'
+import { TreeNode } from '../../../shared/treeview/resourceTreeDataProvider'
+import { SageMakerUnifiedStudioConnectionParentNode } from './sageMakerUnifiedStudioConnectionParentNode'
+import { ConnectionSummary, ConnectionType } from '@aws-sdk/client-datazone'
+
+export class SageMakerUnifiedStudioConnectionNode implements TreeNode {
+    public resource: SageMakerUnifiedStudioConnectionNode
+    contextValue: string
+    private readonly logger = getLogger()
+    id: string
+    public constructor(
+        private readonly parent: SageMakerUnifiedStudioConnectionParentNode,
+        private readonly connection: ConnectionSummary
+    ) {
+        this.id = connection.name ?? ''
+        this.resource = this
+        this.contextValue = this.getContext()
+        this.logger.debug(`SageMaker Space Node created: ${this.id}`)
+    }
+
+    public async getTreeItem(): Promise<vscode.TreeItem> {
+        const item = new vscode.TreeItem(this.id, vscode.TreeItemCollapsibleState.None)
+        item.contextValue = this.getContext()
+        item.tooltip = new vscode.MarkdownString(this.buildTooltip())
+        return item
+    }
+    private buildTooltip(): string {
+        if (this.connection.type === ConnectionType.REDSHIFT) {
+            const tooltip = ''.concat(
+                '### Compute Details\n\n',
+                `**Type**  \n${this.connection.type}\n\n`,
+                `**Environment ID**  \n${this.connection.environmentId}\n\n`,
+                `**JDBC URL**  \n${this.connection.props?.redshiftProperties?.jdbcUrl}`
+            )
+            return tooltip
+        } else if (this.connection.type === ConnectionType.SPARK) {
+            const tooltip = ''.concat(
+                '### Compute Details\n\n',
+                `**Type**  \n${this.connection.type}\n\n`,
+                `**Glue version**  \n${this.connection.props?.sparkGlueProperties?.glueVersion}\n\n`,
+                `**Worker type**  \n${this.connection.props?.sparkGlueProperties?.workerType}\n\n`,
+                `**Number of workers**  \n${this.connection.props?.sparkGlueProperties?.numberOfWorkers}\n\n`,
+                `**Idle timeout (minutes)**  \n${this.connection.props?.sparkGlueProperties?.idleTimeout}\n\n`
+            )
+            return tooltip
+        } else {
+            return ''
+        }
+    }
+    private getContext(): string {
+        return 'SageMakerUnifiedStudioConnectionNode'
+    }
+
+    public getParent(): TreeNode | undefined {
+        return this.parent
+    }
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioConnectionParentNode.ts b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioConnectionParentNode.ts
new file mode 100644
index 00000000000..a04377f0133
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioConnectionParentNode.ts
@@ -0,0 +1,65 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { SageMakerUnifiedStudioComputeNode } from './sageMakerUnifiedStudioComputeNode'
+import { TreeNode } from '../../../shared/treeview/resourceTreeDataProvider'
+import { ListConnectionsCommandOutput, ConnectionType } from '@aws-sdk/client-datazone'
+import { SageMakerUnifiedStudioConnectionNode } from './sageMakerUnifiedStudioConnectionNode'
+import { DataZoneClient } from '../../shared/client/datazoneClient'
+
+// eslint-disable-next-line id-length
+export class SageMakerUnifiedStudioConnectionParentNode implements TreeNode {
+    public resource: SageMakerUnifiedStudioConnectionParentNode
+    contextValue: string
+    public connections: ListConnectionsCommandOutput | undefined
+    public constructor(
+        private readonly parent: SageMakerUnifiedStudioComputeNode,
+        private readonly connectionType: ConnectionType,
+        public id: string
+    ) {
+        this.resource = this
+        this.contextValue = this.getContext()
+    }
+
+    public async getTreeItem(): Promise<vscode.TreeItem> {
+        const item = new vscode.TreeItem(this.id, vscode.TreeItemCollapsibleState.Collapsed)
+        item.contextValue = this.getContext()
+        return item
+    }
+
+    public async getChildren(): Promise<TreeNode[]> {
+        const client = await DataZoneClient.getInstance(this.parent.authProvider)
+        this.connections = await client.fetchConnections(
+            this.parent.parent.project?.domainId,
+            this.parent.parent.project?.id,
+            this.connectionType
+        )
+        const childrenNodes = []
+        if (!this.connections?.items || this.connections.items.length === 0) {
+            return [
+                {
+                    id: 'smusNoConnections',
+                    resource: {},
+                    getTreeItem: () =>
+                        new vscode.TreeItem('[No connections found]', vscode.TreeItemCollapsibleState.None),
+                    getParent: () => this,
+                },
+            ]
+        }
+        for (const connection of this.connections.items) {
+            childrenNodes.push(new SageMakerUnifiedStudioConnectionNode(this, connection))
+        }
+        return childrenNodes
+    }
+
+    private getContext(): string {
+        return 'SageMakerUnifiedStudioConnectionParentNode'
+    }
+
+    public getParent(): TreeNode | undefined {
+        return this.parent
+    }
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioDataNode.ts b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioDataNode.ts
new file mode 100644
index 00000000000..4294a3e42f4
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioDataNode.ts
@@ -0,0 +1,250 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { TreeNode } from '../../../shared/treeview/resourceTreeDataProvider'
+import { getIcon } from '../../../shared/icons'
+
+import { getLogger } from '../../../shared/logger/logger'
+import { DataZoneClient, DataZoneConnection, DataZoneProject } from '../../shared/client/datazoneClient'
+import { createS3ConnectionNode, createS3AccessGrantNodes } from './s3Strategy'
+import { createRedshiftConnectionNode } from './redshiftStrategy'
+import { createLakehouseConnectionNode } from './lakehouseStrategy'
+import { SageMakerUnifiedStudioProjectNode } from './sageMakerUnifiedStudioProjectNode'
+import { isFederatedConnection, createErrorItem } from './utils'
+import { createPlaceholderItem } from '../../../shared/treeview/utils'
+import { ConnectionType, NO_DATA_FOUND_MESSAGE } from './types'
+import { SmusAuthenticationProvider } from '../../auth/providers/smusAuthenticationProvider'
+
+/**
+ * Tree node representing a Data folder that contains S3 and Redshift connections
+ */
+export class SageMakerUnifiedStudioDataNode implements TreeNode {
+    public readonly id = 'smusDataExplorer'
+    public readonly resource = {}
+    private readonly logger = getLogger()
+    private childrenNodes: TreeNode[] | undefined
+    private readonly authProvider: SmusAuthenticationProvider
+
+    constructor(
+        private readonly parent: SageMakerUnifiedStudioProjectNode,
+        initialChildren: TreeNode[] = []
+    ) {
+        this.childrenNodes = initialChildren.length > 0 ? initialChildren : undefined
+        this.authProvider = SmusAuthenticationProvider.fromContext()
+    }
+
+    public getTreeItem(): vscode.TreeItem {
+        const item = new vscode.TreeItem('Data', vscode.TreeItemCollapsibleState.Collapsed)
+        item.iconPath = getIcon('vscode-library')
+        item.contextValue = 'dataFolder'
+        return item
+    }
+
+    public async getChildren(): Promise<TreeNode[]> {
+        if (this.childrenNodes !== undefined) {
+            return this.childrenNodes
+        }
+
+        try {
+            const project = this.parent.getProject()
+            if (!project) {
+                const errorMessage = 'No project information available'
+                this.logger.error(errorMessage)
+                void vscode.window.showErrorMessage(errorMessage)
+                return [createErrorItem(errorMessage, 'project', this.id)]
+            }
+
+            const datazoneClient = await DataZoneClient.getInstance(this.authProvider)
+            const connections = await datazoneClient.listConnections(project.domainId, undefined, project.id)
+            this.logger.info(`Found ${connections.length} connections for project ${project.id}`)
+
+            if (connections.length === 0) {
+                this.childrenNodes = [createPlaceholderItem(NO_DATA_FOUND_MESSAGE)]
+                return this.childrenNodes
+            }
+
+            const dataNodes = await this.createConnectionNodes(project, connections)
+            this.childrenNodes = dataNodes
+            return dataNodes
+        } catch (err) {
+            const project = this.parent.getProject()
+            const projectInfo = project ? `project: ${project.id}, domain: ${project.domainId}` : 'unknown project'
+            const errorMessage = 'Failed to get connections'
+            this.logger.error(`Failed to get connections for ${projectInfo}: ${(err as Error).message}`)
+            void vscode.window.showErrorMessage(errorMessage)
+            return [createErrorItem(errorMessage, 'connections', this.id)]
+        }
+    }
+
+    public getParent(): TreeNode | undefined {
+        return this.parent
+    }
+
+    private async createConnectionNodes(
+        project: DataZoneProject,
+        connections: DataZoneConnection[]
+    ): Promise<TreeNode[]> {
+        const region = this.authProvider.getDomainRegion()
+        const dataNodes: TreeNode[] = []
+
+        const s3Connections = connections.filter((conn) => (conn.type as ConnectionType) === ConnectionType.S3)
+        const redshiftConnections = connections.filter(
+            (conn) => (conn.type as ConnectionType) === ConnectionType.REDSHIFT
+        )
+        const lakehouseConnections = connections.filter(
+            (conn) => (conn.type as ConnectionType) === ConnectionType.LAKEHOUSE
+        )
+
+        // Add Lakehouse nodes first
+        for (const connection of lakehouseConnections) {
+            const node = await this.createLakehouseNode(project, connection, region)
+            dataNodes.push(node)
+        }
+
+        // Add Redshift nodes second
+        for (const connection of redshiftConnections) {
+            if (connection.name.startsWith('project.lakehouse')) {
+                continue
+            }
+            if (isFederatedConnection(connection)) {
+                continue
+            }
+            const node = await this.createRedshiftNode(project, connection, region)
+            dataNodes.push(node)
+        }
+
+        // Add S3 Bucket parent node last
+        if (s3Connections.length > 0) {
+            const bucketNode = this.createBucketParentNode(project, s3Connections, region)
+            dataNodes.push(bucketNode)
+        }
+
+        this.logger.info(`Created ${dataNodes.length} total connection nodes`)
+        return dataNodes
+    }
+
+    private async createS3Node(
+        project: DataZoneProject,
+        connection: DataZoneConnection,
+        region: string
+    ): Promise<TreeNode[]> {
+        try {
+            const datazoneClient = await DataZoneClient.getInstance(this.authProvider)
+            const getConnectionResponse = await datazoneClient.getConnection({
+                domainIdentifier: project.domainId,
+                identifier: connection.connectionId,
+                withSecret: true,
+            })
+
+            const connectionCredentialsProvider = await this.authProvider.getConnectionCredentialsProvider(
+                connection.connectionId,
+                project.id,
+                getConnectionResponse.location?.awsRegion || region
+            )
+
+            const s3ConnectionNode = createS3ConnectionNode(
+                connection,
+                connectionCredentialsProvider,
+                getConnectionResponse.location?.awsRegion || region
+            )
+
+            const accessGrantNodes = await createS3AccessGrantNodes(
+                connection,
+                connectionCredentialsProvider,
+                getConnectionResponse.location?.awsRegion || region,
+                getConnectionResponse.location?.awsAccountId
+            )
+
+            return [s3ConnectionNode, ...accessGrantNodes]
+        } catch (connErr) {
+            const errorMessage = `Failed to get S3 connection - ${(connErr as Error).message}`
+            this.logger.error(`Failed to get S3 connection details: ${(connErr as Error).message}`)
+            void vscode.window.showErrorMessage(errorMessage)
+            return [createErrorItem(errorMessage, `s3-${connection.connectionId}`, this.id)]
+        }
+    }
+
+    private async createRedshiftNode(
+        project: DataZoneProject,
+        connection: DataZoneConnection,
+        region: string
+    ): Promise<TreeNode> {
+        try {
+            const datazoneClient = await DataZoneClient.getInstance(this.authProvider)
+            const getConnectionResponse = await datazoneClient.getConnection({
+                domainIdentifier: project.domainId,
+                identifier: connection.connectionId,
+                withSecret: true,
+            })
+
+            const connectionCredentialsProvider = await this.authProvider.getConnectionCredentialsProvider(
+                connection.connectionId,
+                project.id,
+                getConnectionResponse.location?.awsRegion || region
+            )
+
+            return createRedshiftConnectionNode(connection, connectionCredentialsProvider)
+        } catch (connErr) {
+            const errorMessage = `Failed to get Redshift connection - ${(connErr as Error).message}`
+            this.logger.error(`Failed to get Redshift connection details: ${(connErr as Error).message}`)
+            void vscode.window.showErrorMessage(errorMessage)
+            return createErrorItem(errorMessage, `redshift-${connection.connectionId}`, this.id)
+        }
+    }
+
+    private async createLakehouseNode(
+        project: DataZoneProject,
+        connection: DataZoneConnection,
+        region: string
+    ): Promise<TreeNode> {
+        try {
+            const datazoneClient = await DataZoneClient.getInstance(this.authProvider)
+            const getConnectionResponse = await datazoneClient.getConnection({
+                domainIdentifier: project.domainId,
+                identifier: connection.connectionId,
+                withSecret: true,
+            })
+
+            const connectionCredentialsProvider = await this.authProvider.getConnectionCredentialsProvider(
+                connection.connectionId,
+                project.id,
+                getConnectionResponse.location?.awsRegion || region
+            )
+
+            return createLakehouseConnectionNode(connection, connectionCredentialsProvider, region)
+        } catch (connErr) {
+            const errorMessage = `Failed to get Lakehouse connection - ${(connErr as Error).message}`
+            this.logger.error(`Failed to get Lakehouse connection details: ${(connErr as Error).message}`)
+            void vscode.window.showErrorMessage(errorMessage)
+            return createErrorItem(errorMessage, `lakehouse-${connection.connectionId}`, this.id)
+        }
+    }
+
+    private createBucketParentNode(
+        project: DataZoneProject,
+        s3Connections: DataZoneConnection[],
+        region: string
+    ): TreeNode {
+        return {
+            id: 'bucket-parent',
+            resource: {},
+            getTreeItem: () => {
+                const item = new vscode.TreeItem('Buckets', vscode.TreeItemCollapsibleState.Collapsed)
+                item.contextValue = 'bucketFolder'
+                return item
+            },
+            getChildren: async () => {
+                const s3Nodes: TreeNode[] = []
+                for (const connection of s3Connections) {
+                    const nodes = await this.createS3Node(project, connection, region)
+                    s3Nodes.push(...nodes)
+                }
+                return s3Nodes
+            },
+            getParent: () => this,
+        }
+    }
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioProjectNode.ts b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioProjectNode.ts
new file mode 100644
index 00000000000..8097ceed9e7
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioProjectNode.ts
@@ -0,0 +1,242 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { TreeNode } from '../../../shared/treeview/resourceTreeDataProvider'
+import { getLogger } from '../../../shared/logger/logger'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { AwsCredentialIdentity } from '@aws-sdk/types'
+import { SageMakerUnifiedStudioDataNode } from './sageMakerUnifiedStudioDataNode'
+import { DataZoneClient, DataZoneProject } from '../../shared/client/datazoneClient'
+import { SageMakerUnifiedStudioRootNode } from './sageMakerUnifiedStudioRootNode'
+import { SagemakerClient } from '../../../shared/clients/sagemaker'
+import { SmusAuthenticationProvider } from '../../auth/providers/smusAuthenticationProvider'
+import { SageMakerUnifiedStudioComputeNode } from './sageMakerUnifiedStudioComputeNode'
+import { getIcon } from '../../../shared/icons'
+import { getResourceMetadata } from '../../shared/utils/resourceMetadataUtils'
+import { getContext } from '../../../shared/vscode/setContext'
+
+/**
+ * Tree node representing a SageMaker Unified Studio project
+ */
+export class SageMakerUnifiedStudioProjectNode implements TreeNode {
+    public readonly id = 'smusProjectNode'
+    public readonly resource = this
+    private readonly onDidChangeEmitter = new vscode.EventEmitter<void>()
+    public readonly onDidChangeTreeItem = this.onDidChangeEmitter.event
+    public readonly onDidChangeChildren = this.onDidChangeEmitter.event
+    public project?: DataZoneProject
+    private logger = getLogger()
+    private sagemakerClient?: SagemakerClient
+    private hasShownFirstTimeMessage = false
+    private isFirstTimeSelection = false
+
+    constructor(
+        private readonly parent: SageMakerUnifiedStudioRootNode,
+        private readonly authProvider: SmusAuthenticationProvider,
+        private readonly extensionContext: vscode.ExtensionContext
+    ) {
+        // If we're in SMUS space environment, set project from resource metadata
+        if (getContext('aws.smus.inSmusSpaceEnvironment')) {
+            const resourceMetadata = getResourceMetadata()!
+            if (resourceMetadata.AdditionalMetadata!.DataZoneProjectId) {
+                this.project = {
+                    id: resourceMetadata!.AdditionalMetadata!.DataZoneProjectId!,
+                    name: 'Current Project',
+                    domainId: resourceMetadata!.AdditionalMetadata!.DataZoneDomainId!,
+                }
+                // Fetch the actual project name asynchronously
+                void this.fetchProjectName()
+            }
+        }
+    }
+
+    public async getTreeItem(): Promise<vscode.TreeItem> {
+        if (this.project) {
+            const item = new vscode.TreeItem('Project: ' + this.project.name, vscode.TreeItemCollapsibleState.Expanded)
+            item.contextValue = 'smusSelectedProject'
+            item.tooltip = `Project: ${this.project.name}\nID: ${this.project.id}`
+            item.iconPath = getIcon('vscode-folder-opened')
+            return item
+        }
+
+        const item = new vscode.TreeItem('Select a project', vscode.TreeItemCollapsibleState.Expanded)
+        item.contextValue = 'smusProjectSelectPicker'
+        item.command = {
+            command: 'aws.smus.projectView',
+            title: 'Select Project',
+            arguments: [this],
+        }
+        item.iconPath = getIcon('vscode-folder-opened')
+
+        return item
+    }
+
+    public async getChildren(): Promise<TreeNode[]> {
+        if (!this.project) {
+            return []
+        }
+
+        return telemetry.smus_renderProjectChildrenNode.run(async (span) => {
+            try {
+                const isInSmusSpace = getContext('aws.smus.inSmusSpaceEnvironment')
+                const accountId = await this.authProvider.getDomainAccountId()
+                span.record({
+                    smusToolkitEnv: isInSmusSpace ? 'smus_space' : 'local',
+                    smusDomainId: this.project?.domainId,
+                    smusDomainAccountId: accountId,
+                    smusProjectId: this.project?.id,
+                    smusDomainRegion: this.authProvider.getDomainRegion(),
+                })
+
+                // Skip access check if we're in SMUS space environment (already in project space)
+                if (!getContext('aws.smus.inSmusSpaceEnvironment')) {
+                    const hasAccess = await this.checkProjectCredsAccess(this.project!.id)
+                    if (!hasAccess) {
+                        return [
+                            {
+                                id: 'smusProjectAccessDenied',
+                                resource: {},
+                                getTreeItem: () => {
+                                    const item = new vscode.TreeItem(
+                                        'You do not have access to this project. Contact your administrator.',
+                                        vscode.TreeItemCollapsibleState.None
+                                    )
+                                    return item
+                                },
+                                getParent: () => this,
+                            },
+                        ]
+                    }
+                }
+
+                const dataNode = new SageMakerUnifiedStudioDataNode(this)
+
+                // If we're in SMUS space environment, only show data node
+                if (getContext('aws.smus.inSmusSpaceEnvironment')) {
+                    return [dataNode]
+                }
+
+                const dzClient = await DataZoneClient.getInstance(this.authProvider)
+                if (!this.project?.id) {
+                    throw new Error('Project ID is required')
+                }
+                const toolingEnv = await dzClient.getToolingEnvironment(this.project.id)
+                const spaceAwsAccountRegion = toolingEnv.awsAccountRegion
+
+                if (!spaceAwsAccountRegion) {
+                    throw new Error('No AWS account region found in tooling environment')
+                }
+                if (this.isFirstTimeSelection && !this.hasShownFirstTimeMessage) {
+                    this.hasShownFirstTimeMessage = true
+                    void vscode.window.showInformationMessage(
+                        'Find your space in the Explorer panel under SageMaker Unified Studio. Hover over any space and click the connection icon to connect remotely.'
+                    )
+                }
+                this.sagemakerClient = await this.initializeSagemakerClient(spaceAwsAccountRegion)
+                const computeNode = new SageMakerUnifiedStudioComputeNode(
+                    this,
+                    this.extensionContext,
+                    this.authProvider,
+                    this.sagemakerClient
+                )
+                return [dataNode, computeNode]
+            } catch (err) {
+                this.logger.error('Failed to select project: %s', (err as Error).message)
+                throw err
+            }
+        })
+    }
+
+    public getParent(): TreeNode | undefined {
+        return this.parent
+    }
+
+    public async refreshNode(): Promise<void> {
+        this.onDidChangeEmitter.fire()
+    }
+
+    public async setProject(project: any): Promise<void> {
+        await this.cleanupProjectResources()
+        this.isFirstTimeSelection = !this.project
+        this.project = project
+    }
+
+    public getProject(): DataZoneProject | undefined {
+        return this.project
+    }
+
+    public async clearProject(): Promise<void> {
+        await this.cleanupProjectResources()
+        // Don't clear project if we're in SMUS space environment
+        if (!getContext('aws.smus.inSmusSpaceEnvironment')) {
+            this.project = undefined
+        }
+        await this.refreshNode()
+    }
+
+    private async cleanupProjectResources(): Promise<void> {
+        await this.authProvider.invalidateAllProjectCredentialsInCache()
+        if (this.sagemakerClient) {
+            this.sagemakerClient.dispose()
+            this.sagemakerClient = undefined
+        }
+    }
+
+    private async checkProjectCredsAccess(projectId: string): Promise<boolean> {
+        // TODO: Ideally we should be checking user project access by calling fetchAllProjectMemberships
+        // and checking if user is part of that, or get user groups and check if any of the groupIds
+        // exists in the project memberships for more comprehensive access validation.
+        try {
+            const projectProvider = await this.authProvider.getProjectCredentialProvider(projectId)
+            this.logger.info(`Successfully obtained project credentials provider for project ${projectId}`)
+            await projectProvider.getCredentials()
+            return true
+        } catch (err) {
+            // If err.name is 'AccessDeniedException', it means user doesn't have access to the project
+            // We can safely return false in that case without logging the error
+            if ((err as any).name === 'AccessDeniedException') {
+                this.logger.debug(
+                    'Access denied when obtaining project credentials, user likely lacks project access or role permissions'
+                )
+            }
+            return false
+        }
+    }
+
+    private async fetchProjectName(): Promise<void> {
+        if (!this.project || !getContext('aws.smus.inSmusSpaceEnvironment')) {
+            return
+        }
+
+        try {
+            const dzClient = await DataZoneClient.getInstance(this.authProvider)
+            const projectDetails = await dzClient.getProject(this.project.id)
+
+            if (projectDetails && projectDetails.name) {
+                this.project.name = projectDetails.name
+                // Refresh the tree item to show the updated name
+                this.onDidChangeEmitter.fire()
+            }
+        } catch (err) {
+            // No need to show error, this is just to dynamically show project name
+            // If we fail to fetch project name, we will just show the default name
+            this.logger.debug(`Failed to fetch project name: ${(err as Error).message}`)
+        }
+    }
+
+    private async initializeSagemakerClient(regionCode: string): Promise<SagemakerClient> {
+        if (!this.project) {
+            throw new Error('No project selected for initializing SageMaker client')
+        }
+        const projectProvider = await this.authProvider.getProjectCredentialProvider(this.project.id)
+        this.logger.info(`Successfully obtained project credentials provider for project ${this.project.id}`)
+        const awsCredentialProvider = async (): Promise<AwsCredentialIdentity> => {
+            return await projectProvider.getCredentials()
+        }
+        const sagemakerClient = new SagemakerClient(regionCode, awsCredentialProvider)
+        return sagemakerClient
+    }
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioRootNode.ts b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioRootNode.ts
new file mode 100644
index 00000000000..db3f6959969
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioRootNode.ts
@@ -0,0 +1,463 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { TreeNode } from '../../../shared/treeview/resourceTreeDataProvider'
+import { getIcon } from '../../../shared/icons'
+import { getLogger } from '../../../shared/logger/logger'
+import { DataZoneClient, DataZoneProject } from '../../shared/client/datazoneClient'
+import { Commands } from '../../../shared/vscode/commands2'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { createQuickPick } from '../../../shared/ui/pickerPrompter'
+import { SageMakerUnifiedStudioProjectNode } from './sageMakerUnifiedStudioProjectNode'
+import { SageMakerUnifiedStudioAuthInfoNode } from './sageMakerUnifiedStudioAuthInfoNode'
+import { SmusErrorCodes, SmusUtils } from '../../shared/smusUtils'
+import { SmusAuthenticationProvider } from '../../auth/providers/smusAuthenticationProvider'
+import { ToolkitError } from '../../../../src/shared/errors'
+import { recordAuthTelemetry } from '../../shared/telemetry'
+
+const contextValueSmusRoot = 'sageMakerUnifiedStudioRoot'
+const contextValueSmusLogin = 'sageMakerUnifiedStudioLogin'
+const contextValueSmusLearnMore = 'sageMakerUnifiedStudioLearnMore'
+const projectPickerTitle = 'Select a SageMaker Unified Studio project you want to open'
+const projectPickerPlaceholder = 'Select project'
+
+export class SageMakerUnifiedStudioRootNode implements TreeNode {
+    public readonly id = 'smusRootNode'
+    public readonly resource = this
+    private readonly logger = getLogger()
+    private readonly projectNode: SageMakerUnifiedStudioProjectNode
+    private readonly authInfoNode: SageMakerUnifiedStudioAuthInfoNode
+    private readonly onDidChangeEmitter = new vscode.EventEmitter<void>()
+    public readonly onDidChangeTreeItem = this.onDidChangeEmitter.event
+    public readonly onDidChangeChildren = this.onDidChangeEmitter.event
+
+    public constructor(
+        private readonly authProvider: SmusAuthenticationProvider,
+        private readonly extensionContext: vscode.ExtensionContext
+    ) {
+        this.authInfoNode = new SageMakerUnifiedStudioAuthInfoNode(this)
+        this.projectNode = new SageMakerUnifiedStudioProjectNode(this, this.authProvider, this.extensionContext)
+
+        // Subscribe to auth provider connection changes to refresh the node
+        this.authProvider.onDidChange(async () => {
+            // Clear the project when connection changes
+            await this.projectNode.clearProject()
+            this.onDidChangeEmitter.fire()
+            // Immediately refresh the tree view to show authenticated state
+            try {
+                await vscode.commands.executeCommand('aws.smus.rootView.refresh')
+            } catch (refreshErr) {
+                this.logger.debug(
+                    `Failed to refresh views after connection state change: ${(refreshErr as Error).message}`
+                )
+            }
+        })
+    }
+
+    public getTreeItem(): vscode.TreeItem {
+        const item = new vscode.TreeItem('SageMaker Unified Studio', vscode.TreeItemCollapsibleState.Expanded)
+        item.contextValue = contextValueSmusRoot
+        item.iconPath = getIcon('vscode-database')
+
+        // Set description based on authentication state
+        if (!this.isAuthenticated()) {
+            item.description = 'Not authenticated'
+        } else {
+            item.description = 'Connected'
+        }
+
+        return item
+    }
+
+    public async getChildren(): Promise<TreeNode[]> {
+        const isAuthenticated = this.isAuthenticated()
+        const hasExpiredConnection = this.hasExpiredConnection()
+
+        this.logger.debug(
+            `SMUS Root Node getChildren: isAuthenticated=${isAuthenticated}, hasExpiredConnection=${hasExpiredConnection}`
+        )
+
+        // Check for expired connection first
+        if (hasExpiredConnection) {
+            // Show auth info node with expired indication
+            return [this.authInfoNode] // This will show expired connection info
+        }
+
+        // Check authentication state
+        if (!isAuthenticated) {
+            // Show login option and learn more link when not authenticated
+            return [
+                {
+                    id: 'smusLogin',
+                    resource: {},
+                    getTreeItem: () => {
+                        const item = new vscode.TreeItem('Sign in to get started', vscode.TreeItemCollapsibleState.None)
+                        item.contextValue = contextValueSmusLogin
+                        item.iconPath = getIcon('vscode-account')
+
+                        // Set up the login command
+                        item.command = {
+                            command: 'aws.smus.login',
+                            title: 'Sign in to SageMaker Unified Studio',
+                        }
+
+                        return item
+                    },
+                    getParent: () => this,
+                },
+                {
+                    id: 'smusLearnMore',
+                    resource: {},
+                    getTreeItem: () => {
+                        const item = new vscode.TreeItem(
+                            'Learn more about SageMaker Unified Studio',
+                            vscode.TreeItemCollapsibleState.None
+                        )
+                        item.contextValue = contextValueSmusLearnMore
+                        item.iconPath = getIcon('vscode-question')
+
+                        // Set up the learn more command
+                        item.command = {
+                            command: 'aws.smus.learnMore',
+                            title: 'Learn more about SageMaker Unified Studio',
+                        }
+
+                        return item
+                    },
+                    getParent: () => this,
+                },
+            ]
+        }
+
+        // When authenticated, show auth info and projects
+        return [this.authInfoNode, this.projectNode]
+    }
+
+    public getProjectSelectNode(): SageMakerUnifiedStudioProjectNode {
+        return this.projectNode
+    }
+
+    public getAuthInfoNode(): SageMakerUnifiedStudioAuthInfoNode {
+        return this.authInfoNode
+    }
+
+    public refresh(): void {
+        this.onDidChangeEmitter.fire()
+    }
+
+    /**
+     * Checks if the user has authenticated to SageMaker Unified Studio
+     * This is validated by checking existing Connections for SMUS or resource metadata.
+     */
+    private isAuthenticated(): boolean {
+        try {
+            // Check if the connection is valid using the authentication provider
+            const result = this.authProvider.isConnectionValid()
+            this.logger.debug(`SMUS Root Node: Authentication check result: ${result}`)
+            return result
+        } catch (err) {
+            this.logger.debug('Authentication check failed: %s', (err as Error).message)
+            return false
+        }
+    }
+
+    private hasExpiredConnection(): boolean {
+        try {
+            const activeConnection = this.authProvider.activeConnection
+            const isConnectionValid = this.authProvider.isConnectionValid()
+
+            this.logger.debug(
+                `SMUS Root Node: activeConnection=${!!activeConnection}, isConnectionValid=${isConnectionValid}`
+            )
+
+            // Check if there's an active connection but it's expired/invalid
+            const hasExpiredConnection = activeConnection && !isConnectionValid
+
+            if (hasExpiredConnection) {
+                this.logger.debug('SMUS Root Node: Connection is expired, showing reauthentication prompt')
+                // Show reauthentication prompt to user
+                void this.authProvider.showReauthenticationPrompt(activeConnection as any)
+                return true
+            }
+            return false
+        } catch (err) {
+            this.logger.debug('Failed to check expired connection: %s', (err as Error).message)
+            return false
+        }
+    }
+}
+
+/**
+ * Command to open the SageMaker Unified Studio documentation
+ */
+export const smusLearnMoreCommand = Commands.declare('aws.smus.learnMore', () => async () => {
+    const logger = getLogger()
+    try {
+        // Open the SageMaker Unified Studio documentation
+        await vscode.env.openExternal(vscode.Uri.parse('https://aws.amazon.com/sagemaker/unified-studio/'))
+
+        // Log telemetry
+        telemetry.record({
+            name: 'smus_learnMoreClicked',
+            result: 'Succeeded',
+            passive: false,
+        })
+    } catch (err) {
+        logger.error('Failed to open SageMaker Unified Studio documentation: %s', (err as Error).message)
+
+        // Log failure telemetry
+        telemetry.record({
+            name: 'smus_learnMoreClicked',
+            result: 'Failed',
+            passive: false,
+        })
+    }
+})
+
+/**
+ * Command to login to SageMaker Unified Studio
+ */
+export const smusLoginCommand = Commands.declare('aws.smus.login', () => async () => {
+    const logger = getLogger()
+    return telemetry.smus_login.run(async (span) => {
+        try {
+            // Get DataZoneClient instance for URL validation
+
+            // Show domain URL input dialog
+            const domainUrl = await vscode.window.showInputBox({
+                title: 'SageMaker Unified Studio Authentication',
+                prompt: 'Enter your SageMaker Unified Studio Domain URL',
+                placeHolder: 'https://<dzd_xxxxxxxxx>.sagemaker.<region>.on.aws',
+                validateInput: (value) => SmusUtils.validateDomainUrl(value),
+            })
+
+            if (!domainUrl) {
+                // User cancelled
+                logger.debug('User cancelled domain URL input')
+                throw new ToolkitError('User cancelled domain URL input', {
+                    cancelled: true,
+                    code: SmusErrorCodes.UserCancelled,
+                })
+            }
+
+            // Show a simple status bar message instead of progress dialog
+            vscode.window.setStatusBarMessage('Connecting to SageMaker Unified Studio...', 10000)
+
+            try {
+                // Get the authentication provider instance
+                const authProvider = SmusAuthenticationProvider.fromContext()
+
+                // Connect to SMUS using the authentication provider
+                const connection = await authProvider.connectToSmus(domainUrl)
+
+                if (!connection) {
+                    throw new ToolkitError('Failed to establish connection', {
+                        code: SmusErrorCodes.FailedAuthConnecton,
+                    })
+                }
+
+                // Extract domain account ID, domain ID, and region for logging
+                const domainId = connection.domainId
+                const region = connection.ssoRegion
+
+                logger.info(`Connected to SageMaker Unified Studio domain: ${domainId} in region ${region}`)
+                await recordAuthTelemetry(span, authProvider, domainId, region)
+
+                // Show success message
+                void vscode.window.showInformationMessage(
+                    `Successfully connected to SageMaker Unified Studio domain: ${domainId}`
+                )
+
+                // Clear the status bar message
+                vscode.window.setStatusBarMessage('Connected to SageMaker Unified Studio', 3000)
+
+                // Immediately refresh the tree view to show authenticated state
+                try {
+                    await vscode.commands.executeCommand('aws.smus.rootView.refresh')
+                } catch (refreshErr) {
+                    logger.debug(`Failed to refresh views after login: ${(refreshErr as Error).message}`)
+                }
+            } catch (connectionErr) {
+                // Clear the status bar message
+                vscode.window.setStatusBarMessage('Connection to SageMaker Unified Studio Failed')
+
+                // Log the error and re-throw to be handled by the outer catch block
+                logger.error('Connection failed: %s', (connectionErr as Error).message)
+                throw new ToolkitError('Connection failed.', {
+                    cause: connectionErr as Error,
+                    code: (connectionErr as Error).name,
+                })
+            }
+        } catch (err) {
+            const isUserCancelled = err instanceof ToolkitError && err.code === SmusErrorCodes.UserCancelled
+            if (!isUserCancelled) {
+                void vscode.window.showErrorMessage(
+                    `SageMaker Unified Studio: Failed to initiate login: ${(err as Error).message}`
+                )
+            }
+            logger.error('Failed to initiate login: %s', (err as Error).message)
+            throw new ToolkitError('Failed to initiate login.', {
+                cause: err as Error,
+                code: (err as Error).name,
+            })
+        }
+    })
+})
+
+/**
+ * Command to sign out from SageMaker Unified Studio
+ */
+export const smusSignOutCommand = Commands.declare('aws.smus.signOut', () => async () => {
+    const logger = getLogger()
+    return telemetry.smus_signOut.run(async (span) => {
+        try {
+            // Get the authentication provider instance
+            const authProvider = SmusAuthenticationProvider.fromContext()
+
+            // Check if there's an active connection to sign out from
+            if (!authProvider.isConnected()) {
+                void vscode.window.showInformationMessage(
+                    'No active SageMaker Unified Studio connection to sign out from.'
+                )
+                return
+            }
+
+            // Get connection details for logging
+            const activeConnection = authProvider.activeConnection
+            const domainId = activeConnection?.domainId
+            const region = activeConnection?.ssoRegion
+
+            // Show status message
+            vscode.window.setStatusBarMessage('Signing out from SageMaker Unified Studio...', 5000)
+            await recordAuthTelemetry(span, authProvider, domainId, region)
+
+            // Delete the connection (this will also invalidate tokens and clear cache)
+            if (activeConnection) {
+                await authProvider.secondaryAuth.deleteConnection()
+                logger.info(`Signed out from SageMaker Unified Studio${domainId}`)
+            }
+
+            // Show success message
+            void vscode.window.showInformationMessage('Successfully signed out from SageMaker Unified Studio.')
+
+            // Clear the status bar message
+            vscode.window.setStatusBarMessage('Signed out from SageMaker Unified Studio', 3000)
+
+            // Refresh the tree view to show the sign-in state
+            try {
+                await vscode.commands.executeCommand('aws.smus.rootView.refresh')
+            } catch (refreshErr) {
+                logger.debug(`Failed to refresh views after sign out: ${(refreshErr as Error).message}`)
+                throw new ToolkitError('Failed to refresh views after sign out.', {
+                    cause: refreshErr as Error,
+                    code: (refreshErr as Error).name,
+                })
+            }
+        } catch (err) {
+            void vscode.window.showErrorMessage(
+                `SageMaker Unified Studio: Failed to sign out: ${(err as Error).message}`
+            )
+            logger.error('Failed to sign out: %s', (err as Error).message)
+
+            // Log failure telemetry
+            throw new ToolkitError('Failed to sign out.', {
+                cause: err as Error,
+                code: (err as Error).name,
+            })
+        }
+    })
+})
+
+function isAccessDenied(error: Error): boolean {
+    return error.name.includes('AccessDenied')
+}
+
+function createProjectQuickPickItems(projects: DataZoneProject[]) {
+    return projects
+        .sort(
+            (a, b) =>
+                (b.updatedAt ? new Date(b.updatedAt).getTime() : 0) -
+                (a.updatedAt ? new Date(a.updatedAt).getTime() : 0)
+        )
+        .filter((project) => project.name !== 'GenerativeAIModelGovernanceProject')
+        .map((project) => ({
+            label: project.name,
+            detail: 'ID: ' + project.id,
+            description: project.description,
+            data: project,
+        }))
+}
+
+async function showQuickPick(items: any[]) {
+    const quickPick = createQuickPick(items, {
+        title: projectPickerTitle,
+        placeholder: projectPickerPlaceholder,
+    })
+    return await quickPick.prompt()
+}
+
+export async function selectSMUSProject(projectNode?: SageMakerUnifiedStudioProjectNode) {
+    const logger = getLogger()
+
+    return telemetry.smus_accessProject.run(async (span) => {
+        try {
+            const authProvider = SmusAuthenticationProvider.fromContext()
+            if (!authProvider.activeConnection) {
+                logger.error('No active connection to display project view')
+                return
+            }
+
+            const client = await DataZoneClient.getInstance(authProvider)
+            logger.debug('DataZone client instance obtained successfully')
+
+            const allProjects = await client.fetchAllProjects()
+            const items = createProjectQuickPickItems(allProjects)
+
+            if (items.length === 0) {
+                logger.info('No projects found in the domain')
+                void vscode.window.showInformationMessage('No projects found in the domain')
+                await showQuickPick([{ label: 'No projects found', detail: '', description: '', data: {} }])
+                return
+            }
+
+            const selectedProject = await showQuickPick(items)
+            const accountId = await authProvider.getDomainAccountId()
+            span.record({
+                smusDomainId: authProvider.getDomainId(),
+                smusProjectId: (selectedProject as DataZoneProject).id as string | undefined,
+                smusDomainRegion: authProvider.getDomainRegion(),
+                smusDomainAccountId: accountId,
+            })
+            if (
+                selectedProject &&
+                typeof selectedProject === 'object' &&
+                selectedProject !== null &&
+                !('type' in selectedProject) &&
+                projectNode
+            ) {
+                await projectNode.setProject(selectedProject)
+                await vscode.commands.executeCommand('aws.smus.rootView.refresh')
+            }
+
+            return selectedProject
+        } catch (err) {
+            const error = err as Error
+
+            if (isAccessDenied(error)) {
+                await showQuickPick([
+                    {
+                        label: '$(error)',
+                        description: "You don't have permissions to view projects. Please contact your administrator",
+                    },
+                ])
+                return
+            }
+
+            logger.error('Failed to select project: %s', error.message)
+            void vscode.window.showErrorMessage(`Failed to select project: ${error.message}`)
+        }
+    })
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioSpaceNode.ts b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioSpaceNode.ts
new file mode 100644
index 00000000000..53ae501d967
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioSpaceNode.ts
@@ -0,0 +1,108 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { SagemakerClient, SagemakerSpaceApp } from '../../../shared/clients/sagemaker'
+import { TreeNode } from '../../../shared/treeview/resourceTreeDataProvider'
+import { SageMakerUnifiedStudioSpacesParentNode } from './sageMakerUnifiedStudioSpacesParentNode'
+import { SagemakerSpace } from '../../../awsService/sagemaker/sagemakerSpace'
+
+export class SagemakerUnifiedStudioSpaceNode implements TreeNode {
+    private smSpace: SagemakerSpace
+    private readonly onDidChangeEmitter = new vscode.EventEmitter<void>()
+    public readonly onDidChangeTreeItem = this.onDidChangeEmitter.event
+    public readonly onDidChangeChildren = this.onDidChangeEmitter.event
+
+    public constructor(
+        private readonly parent: SageMakerUnifiedStudioSpacesParentNode,
+        public readonly sageMakerClient: SagemakerClient,
+        public readonly regionCode: string,
+        public readonly spaceApp: SagemakerSpaceApp,
+        isSMUSSpace: boolean
+    ) {
+        this.smSpace = new SagemakerSpace(this.sageMakerClient, this.regionCode, this.spaceApp, isSMUSSpace)
+    }
+
+    public getTreeItem(): vscode.TreeItem {
+        return {
+            label: this.smSpace.label,
+            description: this.smSpace.description,
+            tooltip: this.smSpace.tooltip,
+            iconPath: this.smSpace.iconPath,
+            contextValue: this.smSpace.contextValue,
+            collapsibleState: vscode.TreeItemCollapsibleState.None,
+        }
+    }
+
+    public getChildren(): TreeNode[] {
+        return []
+    }
+
+    public getParent(): TreeNode | undefined {
+        return this.parent
+    }
+
+    public async refreshNode(): Promise<void> {
+        this.onDidChangeEmitter.fire()
+    }
+
+    public get id(): string {
+        return 'smusSpaceNode' + this.name
+    }
+
+    public get resource() {
+        return this
+    }
+
+    // Delegate all core functionality to SageMakerSpace instance
+    public updateSpace(spaceApp: SagemakerSpaceApp) {
+        this.smSpace.updateSpace(spaceApp)
+        if (this.isPending()) {
+            this.parent.trackPendingNode(this.DomainSpaceKey)
+        }
+    }
+
+    public setSpaceStatus(spaceStatus: string, appStatus: string) {
+        this.smSpace.setSpaceStatus(spaceStatus, appStatus)
+    }
+    public isPending(): boolean {
+        return this.smSpace.isPending()
+    }
+    public getStatus(): string {
+        return this.smSpace.getStatus()
+    }
+    public async getAppStatus() {
+        return this.smSpace.getAppStatus()
+    }
+    public get name(): string {
+        return this.smSpace.name
+    }
+    public get arn(): string {
+        return this.smSpace.arn
+    }
+    public async getAppArn() {
+        return this.smSpace.getAppArn()
+    }
+    public async getSpaceArn() {
+        return this.smSpace.getSpaceArn()
+    }
+    public async updateSpaceAppStatus() {
+        await this.smSpace.updateSpaceAppStatus()
+
+        if (this.isPending()) {
+            this.parent.trackPendingNode(this.DomainSpaceKey)
+        }
+        return
+    }
+    public buildTooltip() {
+        return this.smSpace.buildTooltip()
+    }
+    public getAppIcon() {
+        return this.smSpace.getAppIcon()
+    }
+    public get DomainSpaceKey(): string {
+        return this.smSpace.DomainSpaceKey
+    }
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioSpacesParentNode.ts b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioSpacesParentNode.ts
new file mode 100644
index 00000000000..a5421716d8f
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioSpacesParentNode.ts
@@ -0,0 +1,235 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { SageMakerUnifiedStudioComputeNode } from './sageMakerUnifiedStudioComputeNode'
+import { updateInPlace } from '../../../shared/utilities/collectionUtils'
+import { DataZoneClient } from '../../shared/client/datazoneClient'
+import { DescribeDomainResponse } from '@amzn/sagemaker-client'
+import { getDomainUserProfileKey } from '../../../awsService/sagemaker/utils'
+import { getLogger } from '../../../shared/logger/logger'
+import { TreeNode } from '../../../shared/treeview/resourceTreeDataProvider'
+import { SagemakerClient, SagemakerSpaceApp } from '../../../shared/clients/sagemaker'
+import { UserProfileMetadata } from '../../../awsService/sagemaker/explorer/sagemakerParentNode'
+import { SagemakerUnifiedStudioSpaceNode } from './sageMakerUnifiedStudioSpaceNode'
+import { PollingSet } from '../../../shared/utilities/pollingSet'
+import { SmusAuthenticationProvider } from '../../auth/providers/smusAuthenticationProvider'
+import { SmusUtils } from '../../shared/smusUtils'
+import { getIcon } from '../../../shared/icons'
+import { PENDING_NODE_POLLING_INTERVAL_MS } from './utils'
+
+export class SageMakerUnifiedStudioSpacesParentNode implements TreeNode {
+    public readonly id = 'smusSpacesParentNode'
+    public readonly resource = this
+    private readonly sagemakerSpaceNodes: Map<string, SagemakerUnifiedStudioSpaceNode> = new Map()
+    private spaceApps: Map<string, SagemakerSpaceApp> = new Map()
+    private domainUserProfiles: Map<string, UserProfileMetadata> = new Map()
+    private readonly logger = getLogger()
+    private readonly onDidChangeEmitter = new vscode.EventEmitter<void>()
+    public readonly onDidChangeTreeItem = this.onDidChangeEmitter.event
+    public readonly onDidChangeChildren = this.onDidChangeEmitter.event
+    public readonly pollingSet: PollingSet<string> = new PollingSet(
+        PENDING_NODE_POLLING_INTERVAL_MS,
+        this.updatePendingNodes.bind(this)
+    )
+    private spaceAwsAccountRegion: string | undefined
+
+    public constructor(
+        private readonly parent: SageMakerUnifiedStudioComputeNode,
+        private readonly projectId: string,
+        private readonly extensionContext: vscode.ExtensionContext,
+        private readonly authProvider: SmusAuthenticationProvider,
+        private readonly sagemakerClient: SagemakerClient
+    ) {}
+
+    public async getTreeItem(): Promise<vscode.TreeItem> {
+        const item = new vscode.TreeItem('Spaces', vscode.TreeItemCollapsibleState.Expanded)
+        item.iconPath = {
+            light: vscode.Uri.joinPath(
+                this.extensionContext.extensionUri,
+                'resources/icons/aws/sagemakerunifiedstudio/spaces-dark.svg'
+            ),
+            dark: vscode.Uri.joinPath(
+                this.extensionContext.extensionUri,
+                'resources/icons/aws/sagemakerunifiedstudio/spaces.svg'
+            ),
+        }
+        item.contextValue = 'smusSpacesNode'
+        item.description = 'Hover over any space and click the connection icon to connect remotely'
+        item.tooltip = item.description
+        return item
+    }
+
+    public async getChildren(): Promise<TreeNode[]> {
+        try {
+            await this.updateChildren()
+        } catch (err) {
+            const error = err as Error
+            if (error.name === 'AccessDeniedException') {
+                return this.getAccessDeniedChildren()
+            }
+            return this.getNoSpacesFoundChildren()
+        }
+        const nodes = [...this.sagemakerSpaceNodes.values()]
+        if (nodes.length === 0) {
+            return this.getNoSpacesFoundChildren()
+        }
+        return nodes
+    }
+
+    private getNoSpacesFoundChildren(): TreeNode[] {
+        return [
+            {
+                id: 'smusNoSpaces',
+                resource: {},
+                getTreeItem: () => new vscode.TreeItem('[No Spaces found]', vscode.TreeItemCollapsibleState.None),
+                getParent: () => this,
+            },
+        ]
+    }
+
+    private getAccessDeniedChildren(): TreeNode[] {
+        return [
+            {
+                id: 'smusAccessDenied',
+                resource: {},
+                getTreeItem: () => {
+                    const item = new vscode.TreeItem(
+                        "You don't have permission to view spaces. Please contact your administrator.",
+                        vscode.TreeItemCollapsibleState.None
+                    )
+                    item.iconPath = getIcon('vscode-error')
+                    return item
+                },
+                getParent: () => this,
+            },
+        ]
+    }
+
+    public getParent(): TreeNode | undefined {
+        return this.parent
+    }
+
+    public getProjectId(): string {
+        return this.projectId
+    }
+
+    public getAuthProvider(): SmusAuthenticationProvider {
+        return this.authProvider
+    }
+
+    public async refreshNode(): Promise<void> {
+        this.onDidChangeEmitter.fire()
+    }
+
+    public trackPendingNode(domainSpaceKey: string) {
+        this.pollingSet.add(domainSpaceKey)
+    }
+
+    public getSpaceNodes(spaceKey: string): SagemakerUnifiedStudioSpaceNode {
+        const childNode = this.sagemakerSpaceNodes.get(spaceKey)
+        if (childNode) {
+            return childNode
+        } else {
+            throw new Error(`Node with id ${spaceKey} from polling set not found`)
+        }
+    }
+
+    public async getSageMakerDomainId(): Promise<string> {
+        const activeConnection = this.authProvider.activeConnection
+        if (!activeConnection) {
+            this.logger.error('There is no active connection to get SageMaker domain ID')
+            throw new Error('No active connection found to get SageMaker domain ID')
+        }
+
+        this.logger.debug('SMUS: Getting DataZone client instance')
+        const datazoneClient = await DataZoneClient.getInstance(this.authProvider)
+        if (!datazoneClient) {
+            throw new Error('DataZone client is not initialized')
+        }
+
+        const toolingEnv = await datazoneClient.getToolingEnvironment(this.projectId)
+        this.spaceAwsAccountRegion = toolingEnv.awsAccountRegion
+        if (toolingEnv.provisionedResources) {
+            for (const resource of toolingEnv.provisionedResources) {
+                if (resource.name === 'sageMakerDomainId') {
+                    if (!resource.value) {
+                        throw new Error('SageMaker domain ID not found in tooling environment')
+                    }
+                    getLogger().debug(`Found SageMaker domain ID: ${resource.value}`)
+                    return resource.value
+                }
+            }
+        }
+        throw new Error('No SageMaker domain found in the tooling environment')
+    }
+
+    private async updatePendingNodes() {
+        for (const spaceKey of this.pollingSet.values()) {
+            const childNode = this.getSpaceNodes(spaceKey)
+            await this.updatePendingSpaceNode(childNode)
+        }
+    }
+
+    private async updatePendingSpaceNode(node: SagemakerUnifiedStudioSpaceNode) {
+        await node.updateSpaceAppStatus()
+        if (!node.isPending()) {
+            this.pollingSet.delete(node.DomainSpaceKey)
+            await node.refreshNode()
+        }
+    }
+
+    private async updateChildren(): Promise<void> {
+        const datazoneClient = await DataZoneClient.getInstance(this.authProvider)
+        // Will be of format: 'ABCA4NU3S7PEOLDQPLXYZ:user-12345678-d061-70a4-0bf2-eeee67a6ab12'
+        const userId = await datazoneClient.getUserId()
+        const ssoUserProfileId = SmusUtils.extractSSOIdFromUserId(userId || '')
+        const sagemakerDomainId = await this.getSageMakerDomainId()
+        const [spaceApps, domains] = await this.sagemakerClient.fetchSpaceAppsAndDomains(
+            sagemakerDomainId,
+            false /* filterSmusDomains */
+        )
+        // Filter spaceApps to only show spaces owned by current user
+        const filteredSpaceApps = new Map<string, SagemakerSpaceApp>()
+        for (const [key, app] of spaceApps.entries()) {
+            const userProfile = app.OwnershipSettingsSummary?.OwnerUserProfileName
+            if (ssoUserProfileId === userProfile) {
+                filteredSpaceApps.set(key, app)
+            }
+        }
+        this.spaceApps = filteredSpaceApps
+        this.domainUserProfiles.clear()
+
+        for (const app of this.spaceApps.values()) {
+            const domainId = app.DomainId
+            const userProfile = app.OwnershipSettingsSummary?.OwnerUserProfileName
+            if (!domainId || !userProfile) {
+                continue
+            }
+
+            const domainUserProfileKey = getDomainUserProfileKey(domainId, userProfile)
+            this.domainUserProfiles.set(domainUserProfileKey, {
+                domain: domains.get(domainId) as DescribeDomainResponse,
+            })
+        }
+
+        updateInPlace(
+            this.sagemakerSpaceNodes,
+            this.spaceApps.keys(),
+            (key) => this.sagemakerSpaceNodes.get(key)!.updateSpace(this.spaceApps.get(key)!),
+            (key) =>
+                new SagemakerUnifiedStudioSpaceNode(
+                    this as any,
+                    this.sagemakerClient,
+                    this.spaceAwsAccountRegion ||
+                        (() => {
+                            throw new Error('No AWS account region found in tooling environment')
+                        })(),
+                    this.spaceApps.get(key)!,
+                    true /* isSMUSSpace */
+                )
+        )
+    }
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/explorer/nodes/types.ts b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/types.ts
new file mode 100644
index 00000000000..a94d25fccc4
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/types.ts
@@ -0,0 +1,207 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Node delimiter for creating unique IDs
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export const NODE_ID_DELIMITER = '/'
+
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export const AWS_DATA_CATALOG = 'AwsDataCatalog'
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export const DATA_DEFAULT_IAM_CONNECTION_NAME_REGEXP = /^(project\.iam)|(default\.iam)$/
+// eslint-disable-next-line @typescript-eslint/naming-convention, id-length
+export const DATA_DEFAULT_LAKEHOUSE_CONNECTION_NAME_REGEXP = /^(project\.default_lakehouse)|(default\.catalog)$/
+// eslint-disable-next-line @typescript-eslint/naming-convention, id-length
+export const DATA_DEFAULT_ATHENA_CONNECTION_NAME_REGEXP = /^(project\.athena)|(default\.sql)$/
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export const DATA_DEFAULT_S3_CONNECTION_NAME_REGEXP = /^(project\.s3_default_folder)|(default\.s3)$/
+
+// Database object types
+export enum DatabaseObjects {
+    EXTERNAL_TABLE = 'EXTERNAL_TABLE',
+    VIRTUAL_VIEW = 'VIRTUAL_VIEW',
+}
+
+// Ref: https://docs.aws.amazon.com/athena/latest/ug/data-types.html
+export const lakeHouseColumnTypes = {
+    NUMERIC: ['TINYINT', 'SMALLINT', 'INT', 'INTEGER', 'BIGINT', 'FLOAT', 'REAL', 'DOUBLE', 'DECIMAL'],
+    STRING: ['CHAR', 'STRING', 'VARCHAR', 'UUID'],
+    TIME: ['DATE', 'TIMESTAMP', 'INTERVAL'],
+    BOOLEAN: ['BOOLEAN'],
+    BINARY: ['BINARY', 'VARBINARY'],
+    COMPLEX: ['ARRAY', 'MAP', 'STRUCT', 'ROW', 'JSON'],
+}
+
+// Ref: https://docs.aws.amazon.com/redshift/latest/dg/c_Supported_data_types.html
+export const redshiftColumnTypes = {
+    NUMERIC: ['SMALLINT', 'INT2', 'INTEGER', 'INT', 'BIGINT', 'DECIMAL', 'NUMERIC', 'REAL', 'FLOAT', 'DOUBLE'],
+    STRING: ['CHAR', 'CHARACTER', 'NCHAR', 'BPCHAR', 'VARCHAR', 'VARCHAR', 'VARYING', 'NVARCHAR', 'TEXT'],
+    TIME: ['TIME', 'TIMETZ', 'TIMESTAMP', 'TIMESTAMPTZ', 'INTERVAL'],
+    BOOLEAN: ['BOOLEAN', 'BOOL'],
+    BINARY: ['VARBYTE', 'VARBINARY', 'BINARY', 'VARYING'],
+    COMPLEX: ['HLLSKETCH', 'SUPER', 'GEOMETRY', 'GEOGRAPHY'],
+}
+
+/**
+ * Node types for different resources
+ */
+export enum NodeType {
+    // Common types
+    CONNECTION = 'connection',
+    ERROR = 'error',
+    LOADING = 'loading',
+    EMPTY = 'empty',
+
+    // S3 types
+    S3_BUCKET = 's3-bucket',
+    S3_FOLDER = 'folder',
+    S3_FILE = 'file',
+    S3_ACCESS_GRANT = 's3-access-grant',
+
+    // Redshift types
+    REDSHIFT_CLUSTER = 'redshift-cluster',
+    REDSHIFT_DATABASE = 'database',
+    REDSHIFT_SCHEMA = 'schema',
+    REDSHIFT_TABLE = 'table',
+    REDSHIFT_VIEW = 'view',
+    REDSHIFT_FUNCTION = 'function',
+    REDSHIFT_STORED_PROCEDURE = 'storedProcedure',
+    REDSHIFT_COLUMN = 'column',
+    REDSHIFT_CONTAINER = 'container',
+
+    // Glue types
+    GLUE_CATALOG = 'catalog',
+    // eslint-disable-next-line @typescript-eslint/no-duplicate-enum-values
+    GLUE_DATABASE = 'database',
+    // eslint-disable-next-line @typescript-eslint/no-duplicate-enum-values
+    GLUE_TABLE = 'table',
+    // eslint-disable-next-line @typescript-eslint/no-duplicate-enum-values
+    GLUE_VIEW = 'view',
+
+    // Redshift-specific catalog types
+    REDSHIFT_CATALOG = 'redshift-catalog',
+    REDSHIFT_CATALOG_DATABASE = 'redshift-catalog-database',
+}
+
+/**
+ * Connection types
+ */
+export enum ConnectionType {
+    S3 = 'S3',
+    REDSHIFT = 'REDSHIFT',
+    ATHENA = 'ATHENA',
+    GLUE = 'GLUE',
+    LAKEHOUSE = 'LAKEHOUSE',
+}
+
+/**
+ * Resource types for Redshift
+ */
+export enum ResourceType {
+    DATABASE = 'DATABASE',
+    CATALOG_DATABASE = 'CATALOG_DATABASE',
+    SCHEMA = 'SCHEMA',
+    TABLE = 'TABLE',
+    VIEW = 'VIEW',
+    FUNCTION = 'FUNCTION',
+    STORED_PROCEDURE = 'STORED_PROCEDURE',
+    COLUMNS = 'COLUMNS',
+    CATALOG = 'CATALOG',
+    EXTERNAL_DATABASE = 'EXTERNAL_DATABASE',
+    SHARED_DATABASE = 'SHARED_DATABASE',
+    EXTERNAL_SCHEMA = 'EXTERNAL_SCHEMA',
+    SHARED_SCHEMA = 'SHARED_SCHEMA',
+    EXTERNAL_TABLE = 'EXTERNAL_TABLE',
+    CATALOG_TABLE = 'CATALOG_TABLE',
+    DATA_CATALOG_TABLE = 'DATA_CATALOG_TABLE',
+    CATALOG_COLUMN = 'CATALOG_COLUMN',
+}
+
+/**
+ * Node path information
+ */
+export interface NodePath {
+    connection?: string
+    bucket?: string
+    key?: string
+    catalog?: string
+    database?: string
+    schema?: string
+    table?: string
+    column?: string
+    cluster?: string
+    label?: string
+    [key: string]: any
+}
+
+/**
+ * Node data interface for tree nodes
+ */
+export interface NodeData {
+    id: string
+    nodeType: NodeType
+    connectionType?: ConnectionType
+    value?: any
+    path?: NodePath
+    parent?: any
+    isContainer?: boolean
+    children?: any[]
+}
+
+/**
+ * Redshift deployment types
+ */
+export enum RedshiftType {
+    Serverless = 'SERVERLESS',
+    ServerlessDev = 'SERVERLESS_DEV',
+    ServerlessQA = 'SERVERLESS_QA',
+    Cluster = 'CLUSTER',
+    ClusterDev = 'CLUSTER_DEV',
+    ClusterQA = 'CLUSTER_QA',
+}
+
+/**
+ * Authentication types for database integration connections
+ */
+export enum DatabaseIntegrationConnectionAuthenticationTypes {
+    FEDERATED = '4',
+    TEMPORARY_CREDENTIALS_WITH_IAM = '5',
+    SECRET = '6',
+    IDC_ENHANCED_IAM_CREDENTIALS = '8',
+}
+
+/**
+ * Redshift service model URLs
+ */
+export const RedshiftServiceModelUrl = {
+    REDSHIFT_SERVERLESS_URL: 'redshift-serverless.amazonaws.com',
+    REDSHIFT_CLUSTER_URL: 'redshift.amazonaws.com',
+}
+
+/**
+ * Client types for ClientStore
+ */
+export enum ClientType {
+    S3Client = 'S3Client',
+    S3ControlClient = 'S3ControlClient',
+    SQLWorkbenchClient = 'SQLWorkbenchClient',
+    GlueClient = 'GlueClient',
+    GlueCatalogClient = 'GlueCatalogClient',
+}
+
+/**
+ * Node types that are always leaf nodes
+ */
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export const LEAF_NODE_TYPES = [
+    NodeType.S3_FILE,
+    NodeType.REDSHIFT_COLUMN,
+    NodeType.ERROR,
+    NodeType.LOADING,
+    NodeType.EMPTY,
+]
+
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export const NO_DATA_FOUND_MESSAGE = '[No data found]'
diff --git a/packages/core/src/sagemakerunifiedstudio/explorer/nodes/utils.ts b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/utils.ts
new file mode 100644
index 00000000000..32924ad3d9f
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/explorer/nodes/utils.ts
@@ -0,0 +1,391 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getIcon, IconPath, addColor } from '../../../shared/icons'
+import { TreeNode } from '../../../shared/treeview/resourceTreeDataProvider'
+import {
+    NODE_ID_DELIMITER,
+    NodeType,
+    RedshiftServiceModelUrl,
+    RedshiftType,
+    ConnectionType,
+    NodeData,
+    LEAF_NODE_TYPES,
+    DATA_DEFAULT_LAKEHOUSE_CONNECTION_NAME_REGEXP,
+    redshiftColumnTypes,
+    lakeHouseColumnTypes,
+} from './types'
+import { DataZoneConnection } from '../../shared/client/datazoneClient'
+
+/**
+ * Polling interval in milliseconds for checking space status updates
+ */
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export const PENDING_NODE_POLLING_INTERVAL_MS = 5000
+
+/**
+ * Gets the label for a node based on its data
+ */
+export function getLabel(data: {
+    id: string
+    nodeType: NodeType
+    isContainer?: boolean
+    path?: { key?: string; label?: string }
+    value?: any
+}): string {
+    // For S3 access grant nodes, use S3 (label) format
+    if (data.nodeType === NodeType.S3_ACCESS_GRANT && data.path?.label) {
+        return `S3 (${data.path.label})`
+    }
+
+    // For connection nodes, use the connection name
+    if (data.nodeType === NodeType.CONNECTION && data.value?.connection?.name) {
+        if (
+            data.value?.connection?.type === ConnectionType.LAKEHOUSE &&
+            DATA_DEFAULT_LAKEHOUSE_CONNECTION_NAME_REGEXP.test(data.value?.connection?.name)
+        ) {
+            return 'Lakehouse'
+        }
+        const formattedType = data.value?.connection?.type?.replace(/([A-Z]+(?:_[A-Z]+)*)/g, (match: string) => {
+            const words = match.split('_')
+            return words.map((word: string) => word.charAt(0) + word.slice(1).toLowerCase()).join(' ')
+        })
+        return `${formattedType} (${data.value.connection.name})`
+    }
+
+    // For container nodes, use the node type
+    if (data.isContainer) {
+        switch (data.nodeType) {
+            case NodeType.REDSHIFT_TABLE:
+                return 'Tables'
+            case NodeType.REDSHIFT_VIEW:
+                return 'Views'
+            case NodeType.REDSHIFT_FUNCTION:
+                return 'Functions'
+            case NodeType.REDSHIFT_STORED_PROCEDURE:
+                return 'Stored Procedures'
+            default:
+                return data.nodeType
+        }
+    }
+
+    // For path-based nodes, use the last part of the path
+    if (data.path?.label) {
+        return data.path.label
+    }
+
+    // For S3 folders, add a trailing slash
+    if (data.nodeType === NodeType.S3_FOLDER) {
+        const key = data.path?.key || ''
+        const parts = key.split('/')
+        return parts[parts.length - 2] + '/'
+    }
+
+    // For S3 files, use the filename
+    if (data.nodeType === NodeType.S3_FILE) {
+        const key = data.path?.key || ''
+        const parts = key.split('/')
+        return parts[parts.length - 1]
+    }
+
+    // For other nodes, use the last part of the ID
+    const parts = data.id.split(NODE_ID_DELIMITER)
+    return parts[parts.length - 1]
+}
+
+/**
+ * Determines if a node is a leaf node
+ */
+export function isLeafNode(data: { nodeType: NodeType; isContainer?: boolean }): boolean {
+    // Container nodes are never leaf nodes
+    if (data.isContainer) {
+        return false
+    }
+
+    return LEAF_NODE_TYPES.includes(data.nodeType)
+}
+
+/**
+ * Gets the icon for a node type
+ */
+export function getIconForNodeType(nodeType: NodeType, isContainer?: boolean): vscode.ThemeIcon | IconPath | undefined {
+    switch (nodeType) {
+        case NodeType.CONNECTION:
+        case NodeType.S3_ACCESS_GRANT:
+            return undefined
+        case NodeType.S3_BUCKET:
+            return getIcon('aws-s3-bucket')
+        case NodeType.S3_FOLDER:
+            return getIcon('vscode-folder')
+        case NodeType.S3_FILE:
+            return getIcon('vscode-file')
+        case NodeType.REDSHIFT_CLUSTER:
+            return getIcon('aws-redshift-cluster')
+        case NodeType.REDSHIFT_DATABASE:
+        case NodeType.GLUE_DATABASE:
+            return new vscode.ThemeIcon('database')
+        case NodeType.REDSHIFT_SCHEMA:
+            return getIcon('aws-redshift-schema')
+        case NodeType.REDSHIFT_TABLE:
+        case NodeType.GLUE_TABLE:
+            return isContainer ? new vscode.ThemeIcon('table') : getIcon('aws-redshift-table')
+        case NodeType.REDSHIFT_VIEW:
+            return isContainer ? new vscode.ThemeIcon('list-tree') : new vscode.ThemeIcon('eye')
+        case NodeType.REDSHIFT_FUNCTION:
+        case NodeType.REDSHIFT_STORED_PROCEDURE:
+            return isContainer ? new vscode.ThemeIcon('list-tree') : new vscode.ThemeIcon('symbol-method')
+        case NodeType.GLUE_CATALOG:
+            return getIcon('aws-sagemakerunifiedstudio-catalog')
+        case NodeType.REDSHIFT_CATALOG:
+            return new vscode.ThemeIcon('database')
+        case NodeType.REDSHIFT_CATALOG_DATABASE:
+            return getIcon('aws-redshift-schema')
+        case NodeType.ERROR:
+            return new vscode.ThemeIcon('error')
+        case NodeType.LOADING:
+            return new vscode.ThemeIcon('loading~spin')
+        case NodeType.EMPTY:
+            return new vscode.ThemeIcon('info')
+        default:
+            return getIcon('vscode-circle-outline')
+    }
+}
+
+/**
+ * Creates a standard tree item for a node
+ */
+export function createTreeItem(
+    label: string,
+    nodeType: NodeType,
+    isLeaf: boolean,
+    isContainer?: boolean,
+    tooltip?: string
+): vscode.TreeItem {
+    const collapsibleState = isLeaf ? vscode.TreeItemCollapsibleState.None : vscode.TreeItemCollapsibleState.Collapsed
+
+    const item = new vscode.TreeItem(label, collapsibleState)
+
+    // Set icon based on node type
+    item.iconPath = getIconForNodeType(nodeType, isContainer)
+
+    // Set context value for command enablement
+    item.contextValue = nodeType
+
+    // Set tooltip if provided
+    if (tooltip) {
+        item.tooltip = tooltip
+    }
+
+    return item
+}
+
+/**
+ * Gets the column type category from a raw column type string
+ */
+export function getColumnType(columnTypeString?: string): string {
+    if (!columnTypeString) {
+        return 'UNKNOWN'
+    }
+
+    const lowerType = columnTypeString.toLowerCase()
+
+    // Search in both redshift and lakehouse column types
+    const allTypes = [...Object.values(redshiftColumnTypes).flat(), ...Object.values(lakeHouseColumnTypes).flat()].map(
+        (type) => type.toLowerCase()
+    )
+
+    return allTypes.find((key) => lowerType.startsWith(key)) || 'UNKNOWN'
+}
+
+/**
+ * Gets the icon for a column based on its type
+ */
+function getColumnIcon(columnType: string): vscode.ThemeIcon | IconPath {
+    const upperType = columnType.toUpperCase()
+
+    // Check if it's a numeric type
+    if (
+        lakeHouseColumnTypes.NUMERIC.some((type) => upperType.includes(type)) ||
+        redshiftColumnTypes.NUMERIC.some((type) => upperType.includes(type))
+    ) {
+        return getIcon('aws-sagemakerunifiedstudio-symbol-int')
+    }
+
+    // Check if it's a string type
+    if (
+        lakeHouseColumnTypes.STRING.some((type) => upperType.includes(type)) ||
+        redshiftColumnTypes.STRING.some((type) => upperType.includes(type))
+    ) {
+        return getIcon('vscode-symbol-key')
+    }
+
+    // Check if it's a time type
+    if (
+        lakeHouseColumnTypes.TIME.some((type) => upperType.includes(type)) ||
+        redshiftColumnTypes.TIME.some((type) => upperType.includes(type))
+    ) {
+        return getIcon('vscode-calendar')
+    }
+
+    // Default icon for unknown types
+    return new vscode.ThemeIcon('symbol-field')
+}
+
+/**
+ * Creates a tree item for a column node with type information
+ */
+export function createColumnTreeItem(label: string, columnType: string, nodeType: NodeType): vscode.TreeItem {
+    const item = new vscode.TreeItem(label, vscode.TreeItemCollapsibleState.None)
+
+    // Add column type as description (secondary text)
+    item.description = columnType
+
+    // Set icon based on column type
+    item.iconPath = getColumnIcon(columnType)
+
+    // Set context value for command enablement
+    item.contextValue = nodeType
+
+    // Set tooltip
+    item.tooltip = `${label}: ${columnType}`
+
+    return item
+}
+
+/**
+ * Creates an error node
+ */
+export function createErrorTreeItem(message: string): vscode.TreeItem {
+    const item = new vscode.TreeItem(message, vscode.TreeItemCollapsibleState.None)
+    item.iconPath = new vscode.ThemeIcon('error')
+    return item
+}
+
+/**
+ * Creates an error item with unique ID and proper styling
+ */
+export function createErrorItem(message: string, context: string, parentId: string): TreeNode {
+    return {
+        id: `${parentId}-error-${context}-${Date.now()}`,
+        resource: message,
+        getTreeItem: () => {
+            const item = new vscode.TreeItem(message, vscode.TreeItemCollapsibleState.None)
+            item.iconPath = addColor(getIcon('vscode-error'), 'testing.iconErrored')
+            return item
+        },
+    }
+}
+
+export const isRedLakeDatabase = (databaseName?: string) => {
+    if (!databaseName) {
+        return false
+    }
+    const regex = /[\w\d\-_]+@[\w\d\-_]+/gs
+    return regex.test(databaseName)
+}
+
+/**
+ * Gets the tooltip for a node
+ * @param data The node data
+ * @returns The tooltip text
+ */
+export function getTooltip(data: NodeData): string {
+    const label = getLabel(data)
+
+    switch (data.nodeType) {
+        // Common node types
+        case NodeType.CONNECTION:
+            return data.connectionType === ConnectionType.REDSHIFT
+                ? `Redshift Connection: ${label}`
+                : `Connection: ${label}\nType: ${data.connectionType}`
+
+        // S3 node types
+        case NodeType.S3_BUCKET:
+            return `S3 Bucket: ${data.path?.bucket}`
+        case NodeType.S3_FOLDER:
+            return `Folder: ${label}\nBucket: ${data.path?.bucket}`
+        case NodeType.S3_FILE:
+            return `File: ${label}\nBucket: ${data.path?.bucket}`
+
+        // Redshift node types
+        case NodeType.REDSHIFT_CLUSTER:
+            return `Redshift Cluster: ${label}`
+        case NodeType.REDSHIFT_DATABASE:
+            return `Database: ${label}`
+        case NodeType.REDSHIFT_SCHEMA:
+            return `Schema: ${label}`
+        case NodeType.REDSHIFT_TABLE:
+            return data.isContainer ? `Tables in ${data.path?.schema}` : `Table: ${data.path?.schema}.${label}`
+        case NodeType.REDSHIFT_VIEW:
+            return data.isContainer ? `Views in ${data.path?.schema}` : `View: ${data.path?.schema}.${label}`
+        case NodeType.REDSHIFT_FUNCTION:
+            return data.isContainer ? `Functions in ${data.path?.schema}` : `Function: ${data.path?.schema}.${label}`
+        case NodeType.REDSHIFT_STORED_PROCEDURE:
+            return data.isContainer
+                ? `Stored Procedures in ${data.path?.schema}`
+                : `Stored Procedure: ${data.path?.schema}.${label}`
+
+        // Glue node types
+        case NodeType.GLUE_CATALOG:
+            return `Glue Catalog: ${label}`
+        case NodeType.GLUE_DATABASE:
+            return `Glue Database: ${label}`
+        case NodeType.GLUE_TABLE:
+            return `Glue Table: ${label}`
+
+        // Default
+        default:
+            return label
+    }
+}
+
+/**
+ * Gets the Redshift type from a host
+ * @param host Redshift host
+ * @returns Redshift type or null if not recognized
+ */
+export function getRedshiftTypeFromHost(host?: string): RedshiftType | undefined {
+    /*
+      'default-workgroup.{accountID}.us-west-2.redshift-serverless.amazonaws.com' - SERVERLESS
+      'default-rs-cluster.{id}.us-west-2.redshift.amazonaws.com' - CLUSTER
+      'default-rs-cluster.{id}.us-west-2.redshift.amazonaws.com:5439/dev' - CLUSTER
+     */
+    if (!host) {
+        return undefined
+    }
+
+    const cleanHost = host.split(':')[0]
+    const parts = cleanHost.split('.')
+    if (parts.length < 3) {
+        return undefined
+    }
+
+    const domain = parts.slice(parts.length - 3).join('.')
+
+    if (domain === RedshiftServiceModelUrl.REDSHIFT_SERVERLESS_URL) {
+        return RedshiftType.Serverless
+    } else if (domain === RedshiftServiceModelUrl.REDSHIFT_CLUSTER_URL) {
+        return RedshiftType.Cluster
+    } else {
+        return undefined
+    }
+}
+
+/**
+ * Determines if a connection is a federated connection by checking its type.
+ * A connection is considered federated if it's either:
+ * 1. A Redshift connection with Glue properties, or
+ * 2. A connection type that exists in GlueConnectionType
+ *
+ * @param connection
+ * @returns - boolean
+ */
+export function isFederatedConnection(connection?: DataZoneConnection): boolean {
+    if (connection?.type === ConnectionType.REDSHIFT) {
+        return !!connection?.props?.glueProperties
+    }
+    return false
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/shared/client/README.md b/packages/core/src/sagemakerunifiedstudio/shared/client/README.md
new file mode 100644
index 00000000000..17cc4767beb
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/shared/client/README.md
@@ -0,0 +1 @@
+# Common business logic and APIs for SageMaker Unified Studio features
diff --git a/packages/core/src/sagemakerunifiedstudio/shared/client/connectionClientStore.ts b/packages/core/src/sagemakerunifiedstudio/shared/client/connectionClientStore.ts
new file mode 100644
index 00000000000..edf317f6479
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/shared/client/connectionClientStore.ts
@@ -0,0 +1,138 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { S3Client } from './s3Client'
+import { SQLWorkbenchClient } from './sqlWorkbenchClient'
+import { GlueClient } from './glueClient'
+import { GlueCatalogClient } from './glueCatalogClient'
+import { ConnectionCredentialsProvider } from '../../auth/providers/connectionCredentialsProvider'
+import { ClientType } from '../../explorer/nodes/types'
+import { S3ControlClient } from '@aws-sdk/client-s3-control'
+import { getLogger } from '../../../shared/logger/logger'
+
+/**
+ * Client store for managing service clients per connection
+ */
+export class ConnectionClientStore {
+    private static instance: ConnectionClientStore
+    private clientCache: Record<string, Record<string, any>> = {}
+
+    private constructor() {}
+
+    public static getInstance(): ConnectionClientStore {
+        if (!ConnectionClientStore.instance) {
+            ConnectionClientStore.instance = new ConnectionClientStore()
+        }
+        return ConnectionClientStore.instance
+    }
+
+    /**
+     * Gets or creates a client for a specific connection
+     */
+    public getClient<T>(connectionId: string, clientType: string, factory: () => T): T {
+        if (!this.clientCache[connectionId]) {
+            this.clientCache[connectionId] = {}
+        }
+
+        if (!this.clientCache[connectionId][clientType]) {
+            this.clientCache[connectionId][clientType] = factory()
+        }
+
+        return this.clientCache[connectionId][clientType]
+    }
+
+    /**
+     * Gets or creates an S3Client for a connection
+     */
+    public getS3Client(
+        connectionId: string,
+        region: string,
+        connectionCredentialsProvider: ConnectionCredentialsProvider
+    ): S3Client {
+        return this.getClient(
+            connectionId,
+            ClientType.S3Client,
+            () => new S3Client(region, connectionCredentialsProvider)
+        )
+    }
+
+    /**
+     * Gets or creates a SQLWorkbenchClient for a connection
+     */
+    public getSQLWorkbenchClient(
+        connectionId: string,
+        region: string,
+        connectionCredentialsProvider: ConnectionCredentialsProvider
+    ): SQLWorkbenchClient {
+        return this.getClient(connectionId, ClientType.SQLWorkbenchClient, () =>
+            SQLWorkbenchClient.createWithCredentials(region, connectionCredentialsProvider)
+        )
+    }
+
+    /**
+     * Gets or creates a GlueClient for a connection
+     */
+    public getGlueClient(
+        connectionId: string,
+        region: string,
+        connectionCredentialsProvider: ConnectionCredentialsProvider
+    ): GlueClient {
+        return this.getClient(
+            connectionId,
+            ClientType.GlueClient,
+            () => new GlueClient(region, connectionCredentialsProvider)
+        )
+    }
+
+    /**
+     * Gets or creates a GlueCatalogClient for a connection
+     */
+    public getGlueCatalogClient(
+        connectionId: string,
+        region: string,
+        connectionCredentialsProvider: ConnectionCredentialsProvider
+    ): GlueCatalogClient {
+        return this.getClient(connectionId, ClientType.GlueCatalogClient, () =>
+            GlueCatalogClient.createWithCredentials(region, connectionCredentialsProvider)
+        )
+    }
+
+    /**
+     * Gets or creates an S3ControlClient for a connection
+     */
+    public getS3ControlClient(
+        connectionId: string,
+        region: string,
+        connectionCredentialsProvider: ConnectionCredentialsProvider
+    ): S3ControlClient {
+        return this.getClient(connectionId, ClientType.S3ControlClient, () => {
+            const credentialsProvider = async () => {
+                const credentials = await connectionCredentialsProvider.getCredentials()
+                return {
+                    accessKeyId: credentials.accessKeyId,
+                    secretAccessKey: credentials.secretAccessKey,
+                    sessionToken: credentials.sessionToken,
+                    expiration: credentials.expiration,
+                }
+            }
+            return new S3ControlClient({ region, credentials: credentialsProvider })
+        })
+    }
+
+    /**
+     * Clears all cached clients for a connection
+     */
+    public clearConnection(connectionId: string): void {
+        delete this.clientCache[connectionId]
+    }
+
+    /**
+     * Clears all cached clients
+     */
+    public clearAll(): void {
+        getLogger().info('SMUS Connection: Clearing all cached clients')
+        this.clientCache = {}
+    }
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/shared/client/credentialsAdapter.ts b/packages/core/src/sagemakerunifiedstudio/shared/client/credentialsAdapter.ts
new file mode 100644
index 00000000000..88d08c93b86
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/shared/client/credentialsAdapter.ts
@@ -0,0 +1,60 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as AWS from 'aws-sdk'
+import { ConnectionCredentialsProvider } from '../../auth/providers/connectionCredentialsProvider'
+import { getLogger } from '../../../shared/logger/logger'
+
+/**
+ * Adapts a ConnectionCredentialsProvider (SDK v3) to work with SDK v2's CredentialProviderChain
+ */
+export function adaptConnectionCredentialsProvider(
+    connectionCredentialsProvider: ConnectionCredentialsProvider
+): AWS.CredentialProviderChain {
+    const provider = () => {
+        // Create SDK v2 Credentials that will resolve the provider when needed
+        const credentials = new AWS.Credentials({
+            accessKeyId: '',
+            secretAccessKey: '',
+            sessionToken: '',
+        })
+
+        // Override the get method to use the connection credentials provider
+        credentials.get = (callback) => {
+            getLogger().debug('Attempting to get credentials from ConnectionCredentialsProvider')
+
+            connectionCredentialsProvider
+                .getCredentials()
+                .then((creds) => {
+                    getLogger().debug('Successfully got credentials')
+
+                    credentials.accessKeyId = creds.accessKeyId as string
+                    credentials.secretAccessKey = creds.secretAccessKey as string
+                    credentials.sessionToken = creds.sessionToken as string
+                    credentials.expireTime = creds.expiration as Date
+                    callback()
+                })
+                .catch((err) => {
+                    getLogger().debug(`Failed to get credentials: ${err}`)
+
+                    callback(err)
+                })
+        }
+
+        // Override needsRefresh to delegate to the connection credentials provider
+        credentials.needsRefresh = () => {
+            return true // Always call refresh, this is okay because there is caching existing in credential provider
+        }
+
+        // Override refresh to use the connection credentials provider
+        credentials.refresh = (callback) => {
+            credentials.get(callback)
+        }
+
+        return credentials
+    }
+
+    return new AWS.CredentialProviderChain([provider])
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/shared/client/datazoneClient.ts b/packages/core/src/sagemakerunifiedstudio/shared/client/datazoneClient.ts
new file mode 100644
index 00000000000..ffa0e7bfbf3
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/shared/client/datazoneClient.ts
@@ -0,0 +1,792 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    ConnectionCredentials,
+    ConnectionSummary,
+    DataZone,
+    GetConnectionCommandOutput,
+    GetEnvironmentCredentialsCommandOutput,
+    ListConnectionsCommandOutput,
+    PhysicalEndpoint,
+    RedshiftPropertiesOutput,
+    S3PropertiesOutput,
+    ConnectionType,
+    GluePropertiesOutput,
+    GetEnvironmentCommandOutput,
+} from '@aws-sdk/client-datazone'
+import { getLogger } from '../../../shared/logger/logger'
+import type { SmusAuthenticationProvider } from '../../auth/providers/smusAuthenticationProvider'
+import { DefaultStsClient } from '../../../shared/clients/stsClient'
+
+/**
+ * Represents a DataZone project
+ */
+export interface DataZoneProject {
+    id: string
+    name: string
+    description?: string
+    domainId: string
+    createdAt?: Date
+    updatedAt?: Date
+}
+
+/**
+ * Represents JDBC connection properties
+ */
+export interface JdbcConnection {
+    jdbcIamUrl?: string
+    jdbcUrl?: string
+    username?: string
+    password?: string
+    secretId?: string
+    isProvisionedSecret?: boolean
+    redshiftTempDir?: string
+    host?: string
+    engine?: string
+    port?: number
+    dbname?: string
+    [key: string]: any
+}
+
+/**
+ * Represents a DataZone connection
+ */
+export interface DataZoneConnection {
+    connectionId: string
+    name: string
+    description?: string
+    type: string
+    domainId: string
+    environmentId?: string
+    projectId: string
+    props?: {
+        s3Properties?: S3PropertiesOutput
+        redshiftProperties?: RedshiftPropertiesOutput
+        glueProperties?: GluePropertiesOutput
+        jdbcConnection?: JdbcConnection
+        [key: string]: any
+    }
+    /**
+     * Connection credentials when retrieved with withSecret=true
+     */
+    connectionCredentials?: ConnectionCredentials
+    /**
+     * Location information parsed from physical endpoints
+     */
+    location?: {
+        accessRole?: string
+        awsRegion?: string
+        awsAccountId?: string
+        iamConnectionId?: string
+    }
+}
+
+// Constants for DataZone environment configuration
+const toolingBlueprintName = 'Tooling'
+const sageMakerProviderName = 'Amazon SageMaker'
+
+/**
+ * Client for interacting with AWS DataZone API with DER credential support
+ *
+ * This client integrates with SmusAuthenticationProvider to provide authenticated
+ * DataZone operations using Domain Execution Role (DER) credentials.
+ *
+ * One instance per connection/domainId is maintained to avoid duplication.
+ */
+export class DataZoneClient {
+    /**
+     * Parse a Redshift connection info object from JDBC URL
+     * @param jdbcURL Example JDBC URL: jdbc:redshift://redshift-serverless-workgroup-3zzw0fjmccdixz.123456789012.us-east-1.redshift-serverless.amazonaws.com:5439/dev
+     * @returns A object contains info of host, engine, port, dbName
+     */
+    private getRedshiftConnectionInfoFromJdbcURL(jdbcURL: string) {
+        if (!jdbcURL) {
+            return
+        }
+
+        const [, engine, hostWithLeadingSlashes, portAndDBName] = jdbcURL.split(':')
+        const [port, dbName] = portAndDBName.split('/')
+        return {
+            host: hostWithLeadingSlashes.split('/')[2],
+            engine,
+            port,
+            dbName,
+        }
+    }
+
+    /**
+     * Builds a JDBC connection object from Redshift properties
+     * @param redshiftProps The Redshift properties
+     * @returns A JDBC connection object
+     */
+    private buildJdbcConnectionFromRedshiftProps(redshiftProps: RedshiftPropertiesOutput): JdbcConnection {
+        const redshiftConnectionInfo = this.getRedshiftConnectionInfoFromJdbcURL(redshiftProps.jdbcUrl ?? '')
+
+        return {
+            jdbcIamUrl: redshiftProps.jdbcIamUrl,
+            jdbcUrl: redshiftProps.jdbcUrl,
+            username: redshiftProps.credentials?.usernamePassword?.username,
+            password: redshiftProps.credentials?.usernamePassword?.password,
+            secretId: redshiftProps.credentials?.secretArn,
+            isProvisionedSecret: redshiftProps.isProvisionedSecret,
+            redshiftTempDir: redshiftProps.redshiftTempDir,
+            host: redshiftConnectionInfo?.host,
+            engine: redshiftConnectionInfo?.engine,
+            port: Number(redshiftConnectionInfo?.port),
+            dbname: redshiftConnectionInfo?.dbName,
+        }
+    }
+
+    private datazoneClient: DataZone | undefined
+    private static instances = new Map<string, DataZoneClient>()
+    private readonly logger = getLogger()
+
+    private constructor(
+        private readonly authProvider: SmusAuthenticationProvider,
+        private readonly domainId: string,
+        private readonly region: string
+    ) {}
+
+    /**
+     * Gets an authenticated DataZoneClient instance using DER credentials
+     * One instance per connection/domainId is maintained
+     * @param authProvider The SMUS authentication provider
+     * @returns Promise resolving to authenticated DataZoneClient instance
+     */
+    public static async getInstance(authProvider: SmusAuthenticationProvider): Promise<DataZoneClient> {
+        const logger = getLogger()
+
+        if (!authProvider.isConnected()) {
+            throw new Error('SMUS authentication provider is not connected')
+        }
+
+        const activeConnection = authProvider.activeConnection!
+        const instanceKey = `${activeConnection.domainId}:${activeConnection.ssoRegion}`
+
+        logger.debug(`DataZoneClient: Getting instance for domain: ${instanceKey}`)
+
+        // Check if we already have an instance for this domain/region
+        if (DataZoneClient.instances.has(instanceKey)) {
+            const existingInstance = DataZoneClient.instances.get(instanceKey)!
+            logger.debug('DataZoneClient: Using existing instance')
+            return existingInstance
+        }
+
+        // Create new instance
+        logger.debug('DataZoneClient: Creating new instance')
+        const instance = new DataZoneClient(authProvider, activeConnection.domainId, activeConnection.ssoRegion)
+        DataZoneClient.instances.set(instanceKey, instance)
+
+        // Set up cleanup when connection changes
+        const disposable = authProvider.onDidChangeActiveConnection(() => {
+            logger.debug(`DataZoneClient: Connection changed, cleaning up instance for: ${instanceKey}`)
+            DataZoneClient.instances.delete(instanceKey)
+            instance.datazoneClient = undefined
+            disposable.dispose()
+        })
+
+        logger.info(`DataZoneClient: Created instance for domain ${activeConnection.domainId}`)
+        return instance
+    }
+
+    /**
+     * Disposes all instances and cleans up resources
+     */
+    public static dispose(): void {
+        const logger = getLogger()
+        logger.debug('DataZoneClient: Disposing all instances')
+
+        for (const [key, instance] of DataZoneClient.instances.entries()) {
+            instance.datazoneClient = undefined
+            logger.debug(`DataZoneClient: Disposed instance for: ${key}`)
+        }
+
+        DataZoneClient.instances.clear()
+    }
+
+    /**
+     * Gets the DataZone domain ID
+     * @returns DataZone domain ID
+     */
+    public getDomainId(): string {
+        return this.domainId
+    }
+
+    /**
+     * Gets the AWS region
+     * @returns AWS region
+     */
+    public getRegion(): string {
+        return this.region
+    }
+
+    /**
+     * Gets the default tooling environment credentials for a DataZone project
+     * @param projectId The DataZone project identifier
+     * @returns Promise resolving to environment credentials
+     * @throws Error if tooling blueprint or environment is not found
+     */
+    public async getProjectDefaultEnvironmentCreds(projectId: string): Promise<GetEnvironmentCredentialsCommandOutput> {
+        try {
+            this.logger.debug(
+                `Getting project default environment credentials for domain ${this.domainId}, project ${projectId}`
+            )
+            const datazoneClient = await this.getDataZoneClient()
+
+            this.logger.debug('Listing environment blueprints')
+            const domainBlueprints = await datazoneClient.listEnvironmentBlueprints({
+                domainIdentifier: this.domainId,
+                managed: true,
+                name: toolingBlueprintName,
+            })
+
+            const toolingBlueprint = domainBlueprints.items?.[0]
+            if (!toolingBlueprint) {
+                this.logger.error('Failed to get tooling blueprint')
+                throw new Error('Failed to get tooling blueprint')
+            }
+            this.logger.debug(`Found tooling blueprint with ID: ${toolingBlueprint.id}, listing environments`)
+
+            const listEnvs = await datazoneClient.listEnvironments({
+                domainIdentifier: this.domainId,
+                projectIdentifier: projectId,
+                environmentBlueprintIdentifier: toolingBlueprint.id,
+                provider: sageMakerProviderName,
+            })
+
+            const defaultEnv = listEnvs.items?.find((env) => env.name === toolingBlueprintName)
+            if (!defaultEnv) {
+                this.logger.error('Failed to find default Tooling environment')
+                throw new Error('Failed to find default Tooling environment')
+            }
+            this.logger.debug(`Found default environment with ID: ${defaultEnv.id}, getting environment credentials`)
+
+            const defaultEnvCreds = await datazoneClient.getEnvironmentCredentials({
+                domainIdentifier: this.domainId,
+                environmentIdentifier: defaultEnv.id,
+            })
+
+            return defaultEnvCreds
+        } catch (err) {
+            this.logger.error('Failed to get project default environment credentials: %s', err as Error)
+            throw err
+        }
+    }
+
+    /**
+     * Gets the DataZone client, initializing it if necessary
+     */
+    private async getDataZoneClient(): Promise<DataZone> {
+        if (!this.datazoneClient) {
+            try {
+                this.logger.debug('DataZoneClient: Creating authenticated DataZone client with DER credentials')
+
+                const credentialsProvider = async () => {
+                    const credentials = await (await this.authProvider.getDerCredentialsProvider()).getCredentials()
+                    return {
+                        accessKeyId: credentials.accessKeyId,
+                        secretAccessKey: credentials.secretAccessKey,
+                        sessionToken: credentials.sessionToken,
+                        expiration: credentials.expiration,
+                    }
+                }
+
+                this.datazoneClient = new DataZone({
+                    region: this.region,
+                    credentials: credentialsProvider,
+                })
+                this.logger.debug('DataZoneClient: Successfully created authenticated DataZone client')
+            } catch (err) {
+                this.logger.error('DataZoneClient: Failed to create DataZone client: %s', err as Error)
+                throw err
+            }
+        }
+        return this.datazoneClient
+    }
+
+    /**
+     * Lists project memberships in a DataZone project with pagination support
+     * @param options Options for listing project memberships
+     * @returns Paginated list of DataZone project permissions with nextToken
+     */
+    public async listProjectMemberships(options: {
+        projectIdentifier: string
+        maxResults?: number
+        nextToken?: string
+    }): Promise<{ memberships: any[]; nextToken?: string }> {
+        try {
+            this.logger.info(
+                `DataZoneClient: Listing project memberships for project ${options.projectIdentifier} in domain ${this.domainId}`
+            )
+
+            const datazoneClient = await this.getDataZoneClient()
+
+            const response = await datazoneClient.listProjectMemberships({
+                domainIdentifier: this.domainId,
+                projectIdentifier: options.projectIdentifier,
+                maxResults: options.maxResults,
+                nextToken: options.nextToken,
+            })
+
+            if (!response.members || response.members.length === 0) {
+                this.logger.info(
+                    `DataZoneClient: No project memberships found for project ${options.projectIdentifier}`
+                )
+                return { memberships: [] }
+            }
+
+            this.logger.debug(
+                `DataZoneClient: Found ${response.members.length} project memberships for project ${options.projectIdentifier}`
+            )
+            return { memberships: response.members, nextToken: response.nextToken }
+        } catch (err) {
+            this.logger.error('DataZoneClient: Failed to list project memberships: %s', (err as Error).message)
+            throw err
+        }
+    }
+
+    /**
+     * Fetches all project memberships in a DataZone project by handling pagination automatically
+     * @param projectIdentifier The DataZone project identifier
+     * @returns Promise resolving to an array of all project memberships
+     */
+    public async fetchAllProjectMemberships(projectIdentifier: string): Promise<any[]> {
+        try {
+            let allMemberships: any[] = []
+            let nextToken: string | undefined
+            do {
+                const maxResultsPerPage = 50
+                const response = await this.listProjectMemberships({
+                    projectIdentifier,
+                    nextToken,
+                    maxResults: maxResultsPerPage,
+                })
+                allMemberships = [...allMemberships, ...response.memberships]
+                nextToken = response.nextToken
+            } while (nextToken)
+
+            this.logger.debug(`DataZoneClient: Fetched a total of ${allMemberships.length} project memberships`)
+            return allMemberships
+        } catch (err) {
+            this.logger.error('DataZoneClient: Failed to fetch all project memberships: %s', (err as Error).message)
+            throw err
+        }
+    }
+
+    /**
+     * Lists projects in a DataZone domain with pagination support
+     * @param options Options for listing projects
+     * @returns Paginated list of DataZone projects with nextToken
+     */
+    public async listProjects(options?: {
+        maxResults?: number
+        userIdentifier?: string
+        groupIdentifier?: string
+        name?: string
+        nextToken?: string
+    }): Promise<{ projects: DataZoneProject[]; nextToken?: string }> {
+        try {
+            this.logger.info(`DataZoneClient: Listing projects for domain ${this.domainId} in region ${this.region}`)
+
+            const datazoneClient = await this.getDataZoneClient()
+
+            // Call the DataZone API to list projects with pagination
+            const response = await datazoneClient.listProjects({
+                domainIdentifier: this.domainId,
+                maxResults: options?.maxResults,
+                userIdentifier: options?.userIdentifier,
+                groupIdentifier: options?.groupIdentifier,
+                name: options?.name,
+                nextToken: options?.nextToken,
+            })
+
+            if (!response.items || response.items.length === 0) {
+                this.logger.info(`DataZoneClient: No projects found for domain ${this.domainId}`)
+                return { projects: [] }
+            }
+
+            // Map the response to our DataZoneProject interface
+            const projects: DataZoneProject[] = response.items.map((project) => ({
+                id: project.id || '',
+                name: project.name || '',
+                description: project.description,
+                domainId: this.domainId,
+                createdAt: project.createdAt ? new Date(project.createdAt) : undefined,
+                updatedAt: project.updatedAt ? new Date(project.updatedAt) : undefined,
+            }))
+
+            this.logger.debug(`DataZoneClient: Found ${projects.length} projects for domain ${this.domainId}`)
+            return { projects, nextToken: response.nextToken }
+        } catch (err) {
+            this.logger.error('DataZoneClient: Failed to list projects: %s', (err as Error).message)
+            throw err
+        }
+    }
+
+    /**
+     * Fetches all projects in a DataZone domain by handling pagination automatically
+     * @param options Options for listing projects (excluding nextToken which is handled internally)
+     * @returns Promise resolving to an array of all DataZone projects
+     */
+    public async fetchAllProjects(options?: {
+        userIdentifier?: string
+        groupIdentifier?: string
+        name?: string
+    }): Promise<DataZoneProject[]> {
+        try {
+            let allProjects: DataZoneProject[] = []
+            let nextToken: string | undefined
+            do {
+                const maxResultsPerPage = 50
+                const response = await this.listProjects({
+                    ...options,
+                    nextToken,
+                    maxResults: maxResultsPerPage,
+                })
+                allProjects = [...allProjects, ...response.projects]
+                nextToken = response.nextToken
+            } while (nextToken)
+
+            this.logger.debug(`DataZoneClient: Fetched a total of ${allProjects.length} projects`)
+            return allProjects
+        } catch (err) {
+            this.logger.error('DataZoneClient: Failed to fetch all projects: %s', (err as Error).message)
+            throw err
+        }
+    }
+
+    /**
+     * Gets a specific project by ID
+     * @param projectId The project identifier
+     * @returns Promise resolving to the project details
+     */
+    public async getProject(projectId: string): Promise<DataZoneProject> {
+        try {
+            this.logger.info(`DataZoneClient: Getting project ${projectId} in domain ${this.domainId}`)
+
+            const datazoneClient = await this.getDataZoneClient()
+
+            const response = await datazoneClient.getProject({
+                domainIdentifier: this.domainId,
+                identifier: projectId,
+            })
+
+            const project: DataZoneProject = {
+                id: response.id || '',
+                name: response.name || '',
+                description: response.description,
+                domainId: this.domainId,
+                createdAt: response.createdAt ? new Date(response.createdAt) : undefined,
+                updatedAt: response.lastUpdatedAt ? new Date(response.lastUpdatedAt) : undefined,
+            }
+
+            this.logger.debug(`DataZoneClient: Retrieved project ${projectId} with name: ${project.name}`)
+            return project
+        } catch (err) {
+            this.logger.error('DataZoneClient: Failed to get project: %s', err as Error)
+            throw err
+        }
+    }
+
+    /*
+     * Processes a connection response to add jdbcConnection if it's a Redshift connection
+     * @param connection The connection object to process
+     * @param connectionType The connection type
+     */
+    private processRedshiftConnection(connection: ConnectionSummary): void {
+        if (
+            connection &&
+            connection.props &&
+            'redshiftProperties' in connection.props &&
+            connection.props.redshiftProperties &&
+            connection.type?.toLowerCase().includes('redshift')
+        ) {
+            const redshiftProps = connection.props.redshiftProperties as RedshiftPropertiesOutput
+            const props = connection.props as Record<string, any>
+
+            if (!props.jdbcConnection) {
+                props.jdbcConnection = this.buildJdbcConnectionFromRedshiftProps(redshiftProps)
+            }
+        }
+    }
+
+    /**
+     * Parses location from physical endpoints
+     * @param physicalEndpoints Array of physical endpoints
+     * @returns Location object or undefined
+     */
+    private parseLocationFromPhysicalEndpoints(physicalEndpoints?: PhysicalEndpoint[]): DataZoneConnection['location'] {
+        if (physicalEndpoints && physicalEndpoints.length > 0) {
+            const physicalEndpoint = physicalEndpoints[0]
+            return {
+                accessRole: physicalEndpoint.awsLocation?.accessRole,
+                awsRegion: physicalEndpoint.awsLocation?.awsRegion,
+                awsAccountId: physicalEndpoint.awsLocation?.awsAccountId,
+                iamConnectionId: physicalEndpoint.awsLocation?.iamConnectionId,
+            }
+        }
+        return undefined
+    }
+
+    /**
+     * Gets a specific connection by ID
+     * @param params Parameters for getting a connection
+     * @returns The connection details
+     */
+    public async getConnection(params: {
+        domainIdentifier: string
+        identifier: string
+        withSecret?: boolean
+    }): Promise<DataZoneConnection> {
+        try {
+            this.logger.info(
+                `DataZoneClient: Getting connection ${params.identifier} in domain ${params.domainIdentifier}`
+            )
+
+            const datazoneClient = await this.getDataZoneClient()
+
+            // Call the DataZone API to get connection
+            const response: GetConnectionCommandOutput = await datazoneClient.getConnection({
+                domainIdentifier: params.domainIdentifier,
+                identifier: params.identifier,
+                withSecret: params.withSecret !== undefined ? params.withSecret : true,
+            })
+
+            // Process the connection to add jdbcConnection if it's a Redshift connection
+            this.processRedshiftConnection(response)
+
+            // Parse location from physical endpoints
+            const location = this.parseLocationFromPhysicalEndpoints(response.physicalEndpoints)
+
+            // Return as DataZoneConnection, currently only required fields are added
+            // Can always include new fields in DataZoneConnection when needed
+            const connection: DataZoneConnection = {
+                connectionId: response.connectionId || '',
+                name: response.name || '',
+                description: response.description,
+                type: response.type || '',
+                domainId: params.domainIdentifier,
+                projectId: response.projectId || '',
+                props: response.props || {},
+                connectionCredentials: response.connectionCredentials,
+                location,
+            }
+
+            return connection
+        } catch (err) {
+            this.logger.error('DataZoneClient: Failed to get connection: %s', err as Error)
+            throw err
+        }
+    }
+
+    public async fetchConnections(
+        domain: string | undefined,
+        project: string | undefined,
+        ConnectionType: ConnectionType
+    ): Promise<ListConnectionsCommandOutput> {
+        const datazoneClient = await this.getDataZoneClient()
+        return datazoneClient.listConnections({
+            domainIdentifier: domain,
+            projectIdentifier: project,
+            type: ConnectionType,
+        })
+    }
+    /**
+     * Lists connections in a DataZone environment
+     * @param domainId The DataZone domain identifier
+     * @param environmentId The DataZone environment identifier
+     * @param projectId The DataZone project identifier
+     * @returns List of DataZone connections
+     */
+    public async listConnections(
+        domainId: string,
+        environmentId: string | undefined,
+        projectId: string
+    ): Promise<DataZoneConnection[]> {
+        try {
+            this.logger.info(
+                `DataZoneClient: Listing connections for environment ${environmentId} in domain ${domainId}`
+            )
+
+            const datazoneClient = await this.getDataZoneClient()
+            let allConnections: DataZoneConnection[] = []
+            let nextToken: string | undefined
+
+            do {
+                // Call the DataZone API to list connections with pagination
+                const response: ListConnectionsCommandOutput = await datazoneClient.listConnections({
+                    domainIdentifier: domainId,
+                    projectIdentifier: projectId,
+                    environmentIdentifier: environmentId,
+                    nextToken,
+                    maxResults: 50,
+                })
+
+                if (response.items && response.items.length > 0) {
+                    // Map the response to our DataZoneConnection interface
+                    const connections: DataZoneConnection[] = response.items.map((connection) => {
+                        // Process the connection to add jdbcConnection if it's a Redshift connection
+                        this.processRedshiftConnection(connection)
+
+                        // Parse location from physical endpoints
+                        const location = this.parseLocationFromPhysicalEndpoints(connection.physicalEndpoints)
+
+                        return {
+                            connectionId: connection.connectionId || '',
+                            name: connection.name || '',
+                            description: '',
+                            type: connection.type || '',
+                            domainId,
+                            environmentId,
+                            projectId,
+                            props: connection.props || {},
+                            location,
+                        }
+                    })
+                    allConnections = [...allConnections, ...connections]
+                }
+
+                nextToken = response.nextToken
+            } while (nextToken)
+
+            this.logger.info(`DataZoneClient: Fetched a total of ${allConnections.length} connections`)
+            return allConnections
+        } catch (err) {
+            this.logger.error('DataZoneClient: Failed to list connections: %s', err as Error)
+            throw err
+        }
+    }
+
+    /**
+     * Gets the tooling environment ID for a project
+     * @param domainId The DataZone domain identifier
+     * @param projectId The DataZone project identifier
+     * @returns Promise resolving to the tooling environment ID
+     */
+    public async getToolingEnvironmentId(domainId: string, projectId: string): Promise<string> {
+        this.logger.debug(`Getting tooling environment ID for domain ${domainId}, project ${projectId}`)
+        const datazoneClient = await this.getDataZoneClient()
+
+        let domainBlueprints
+        try {
+            // Get the tooling blueprint
+            domainBlueprints = await datazoneClient.listEnvironmentBlueprints({
+                domainIdentifier: domainId,
+                managed: true,
+                name: toolingBlueprintName,
+            })
+        } catch (err) {
+            this.logger.error(
+                'Failed to list environment blueprints for domain %s, %s',
+                domainId,
+                (err as Error).message
+            )
+            throw err
+        }
+
+        const toolingBlueprint = domainBlueprints.items?.[0]
+        if (!toolingBlueprint) {
+            this.logger.error('No tooling blueprint found for domain %s', domainId)
+            throw new Error('No tooling blueprint found')
+        }
+
+        // List environments for the project
+        let listEnvs
+        try {
+            this.logger.debug(`Listing environments for project ${projectId} with blueprint ${toolingBlueprint.id}`)
+            listEnvs = await datazoneClient.listEnvironments({
+                domainIdentifier: domainId,
+                projectIdentifier: projectId,
+                environmentBlueprintIdentifier: toolingBlueprint.id,
+                provider: sageMakerProviderName,
+            })
+        } catch (err) {
+            this.logger.error(
+                'Failed to list environments for domainId: %s, projectId: %s, %s',
+                domainId,
+                projectId,
+                (err as Error).message
+            )
+            throw err
+        }
+
+        const defaultEnv = listEnvs.items?.find((env) => env.name === toolingBlueprintName)
+        if (!defaultEnv || !defaultEnv.id) {
+            this.logger.error(
+                'No default Tooling environment found for domainId: %s, projectId: %s',
+                domainId,
+                projectId
+            )
+            throw new Error('No default Tooling environment found for project')
+        }
+        this.logger.debug(`Found tooling environment with ID: ${defaultEnv.id}`)
+        return defaultEnv.id
+    }
+
+    /**
+     * Gets environment details
+     * @param domainId The DataZone domain identifier
+     * @param environmentId The environment identifier
+     * @returns Promise resolving to environment details
+     */
+    public async getEnvironmentDetails(
+        environmentId: string
+    ): Promise<import('@aws-sdk/client-datazone').GetEnvironmentCommandOutput> {
+        try {
+            this.logger.debug(
+                `Getting environment details for domain ${this.getDomainId()}, environment ${environmentId}`
+            )
+            const datazoneClient = await this.getDataZoneClient()
+
+            const environment = await datazoneClient.getEnvironment({
+                domainIdentifier: this.getDomainId(),
+                identifier: environmentId,
+            })
+
+            this.logger.debug(`Retrieved environment details for ${environmentId}`)
+            return environment
+        } catch (err) {
+            this.logger.error('Failed to get environment details: %s', err as Error)
+            throw err
+        }
+    }
+
+    /**
+     * Gets the tooling environment details for a project
+     * @param projectId The project ID
+     * @returns The tooling environment details
+     */
+    public async getToolingEnvironment(projectId: string): Promise<GetEnvironmentCommandOutput> {
+        const logger = getLogger()
+
+        const datazoneClient = await DataZoneClient.getInstance(this.authProvider)
+        if (!datazoneClient) {
+            throw new Error('DataZone client is not initialized')
+        }
+
+        const toolingEnvId = await datazoneClient
+            .getToolingEnvironmentId(datazoneClient.getDomainId(), projectId)
+            .catch((err) => {
+                logger.error('Failed to get tooling environment ID for project %s', projectId)
+                throw new Error(`Failed to get tooling environment ID: ${err.message}`)
+            })
+
+        if (!toolingEnvId) {
+            throw new Error('No default environment found for project')
+        }
+
+        return await datazoneClient.getEnvironmentDetails(toolingEnvId)
+    }
+
+    public async getUserId(): Promise<string | undefined> {
+        const derCredProvider = await this.authProvider.getDerCredentialsProvider()
+        this.logger.debug(`Calling STS GetCallerIdentity using DER credentials of ${this.getDomainId()}`)
+        const stsClient = new DefaultStsClient(this.getRegion(), await derCredProvider.getCredentials())
+        const callerIdentity = await stsClient.getCallerIdentity()
+        this.logger.debug(`Retrieved caller identity, UserId: ${callerIdentity.UserId}`)
+        return callerIdentity.UserId
+    }
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/shared/client/glueCatalogClient.ts b/packages/core/src/sagemakerunifiedstudio/shared/client/glueCatalogClient.ts
new file mode 100644
index 00000000000..bbd3c440478
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/shared/client/glueCatalogClient.ts
@@ -0,0 +1,136 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Service } from 'aws-sdk'
+import globals from '../../../shared/extensionGlobals'
+import { getLogger } from '../../../shared/logger/logger'
+import * as GlueCatalogApi from './gluecatalogapi'
+import apiConfig = require('./gluecatalogapi.json')
+import { ServiceConfigurationOptions } from 'aws-sdk/lib/service'
+import { ConnectionCredentialsProvider } from '../../auth/providers/connectionCredentialsProvider'
+import { adaptConnectionCredentialsProvider } from './credentialsAdapter'
+
+/**
+ * Represents a Glue catalog
+ */
+export type GlueCatalog = GlueCatalogApi.Types.Catalog
+
+/**
+ * Client for interacting with Glue Catalog API
+ */
+export class GlueCatalogClient {
+    private glueClient: GlueCatalogApi | undefined
+    private static instance: GlueCatalogClient | undefined
+    private readonly logger = getLogger()
+
+    private constructor(
+        private readonly region: string,
+        private readonly connectionCredentialsProvider?: ConnectionCredentialsProvider
+    ) {}
+
+    /**
+     * Gets a singleton instance of the GlueCatalogClient
+     * @returns GlueCatalogClient instance
+     */
+    public static getInstance(region: string): GlueCatalogClient {
+        if (!GlueCatalogClient.instance) {
+            GlueCatalogClient.instance = new GlueCatalogClient(region)
+        }
+        return GlueCatalogClient.instance
+    }
+
+    /**
+     * Creates a new GlueCatalogClient instance with specific credentials
+     * @param region AWS region
+     * @param credentials AWS credentials
+     * @returns GlueCatalogClient instance with credentials
+     */
+    public static createWithCredentials(
+        region: string,
+        connectionCredentialsProvider: ConnectionCredentialsProvider
+    ): GlueCatalogClient {
+        return new GlueCatalogClient(region, connectionCredentialsProvider)
+    }
+
+    /**
+     * Gets the AWS region
+     * @returns AWS region
+     */
+    public getRegion(): string {
+        return this.region
+    }
+
+    /**
+     * Lists Glue catalogs with pagination support
+     * @param nextToken Optional pagination token
+     * @returns Object containing catalogs and nextToken
+     */
+    public async getCatalogs(nextToken?: string): Promise<{ catalogs: GlueCatalog[]; nextToken?: string }> {
+        try {
+            this.logger.info(`GlueCatalogClient: Getting catalogs in region ${this.region}`)
+
+            const glueClient = await this.getGlueCatalogClient()
+
+            // Call the GetCatalogs API with pagination
+            const response = await glueClient
+                .getCatalogs({
+                    Recursive: true,
+                    NextToken: nextToken,
+                })
+                .promise()
+
+            const catalogs: GlueCatalog[] = response.CatalogList || []
+
+            this.logger.info(`GlueCatalogClient: Found ${catalogs.length} catalogs in this page`)
+            return {
+                catalogs,
+                nextToken: response.NextToken,
+            }
+        } catch (err) {
+            this.logger.error('GlueCatalogClient: Failed to get catalogs: %s', err as Error)
+            throw err
+        }
+    }
+
+    /**
+     * Gets the Glue client, initializing it if necessary
+     */
+    private async getGlueCatalogClient(): Promise<GlueCatalogApi> {
+        if (!this.glueClient) {
+            try {
+                if (this.connectionCredentialsProvider) {
+                    // Create client with provided credentials
+                    this.glueClient = (await globals.sdkClientBuilder.createAwsService(
+                        Service,
+                        {
+                            apiConfig: apiConfig,
+                            region: this.region,
+                            credentialProvider: adaptConnectionCredentialsProvider(this.connectionCredentialsProvider),
+                        } as ServiceConfigurationOptions,
+                        undefined,
+                        false
+                    )) as GlueCatalogApi
+                } else {
+                    // Use the SDK client builder for default credentials
+                    this.glueClient = (await globals.sdkClientBuilder.createAwsService(
+                        Service,
+                        {
+                            apiConfig: apiConfig,
+                            region: this.region,
+                        } as ServiceConfigurationOptions,
+                        undefined,
+                        false
+                    )) as GlueCatalogApi
+                }
+
+                this.logger.debug('GlueCatalogClient: Successfully created Glue client')
+            } catch (err) {
+                this.logger.error('GlueCatalogClient: Failed to create Glue client: %s', err as Error)
+                throw err
+            }
+        }
+        return this.glueClient
+    }
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/shared/client/glueClient.ts b/packages/core/src/sagemakerunifiedstudio/shared/client/glueClient.ts
new file mode 100644
index 00000000000..15034a488cf
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/shared/client/glueClient.ts
@@ -0,0 +1,166 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    Glue,
+    GetDatabasesCommand,
+    GetTablesCommand,
+    GetTableCommand,
+    Table,
+    ResourceShareType,
+    DatabaseAttributes,
+    TableAttributes,
+    Database,
+} from '@aws-sdk/client-glue'
+import { getLogger } from '../../../shared/logger/logger'
+import { ConnectionCredentialsProvider } from '../../auth/providers/connectionCredentialsProvider'
+
+/**
+ * Client for interacting with AWS Glue API using public SDK
+ */
+export class GlueClient {
+    private glueClient: Glue | undefined
+    private readonly logger = getLogger()
+
+    constructor(
+        private readonly region: string,
+        private readonly connectionCredentialsProvider: ConnectionCredentialsProvider
+    ) {}
+
+    /**
+     * Gets databases from a catalog
+     * @param catalogId Optional catalog ID (uses default if not provided)
+     * @param nextToken Optional pagination token
+     * @returns List of databases
+     */
+    public async getDatabases(
+        catalogId?: string,
+        resourceShareType?: ResourceShareType,
+        attributesToGet?: DatabaseAttributes[],
+        nextToken?: string
+    ): Promise<{ databases: Database[]; nextToken?: string }> {
+        try {
+            this.logger.info(`GlueClient: Getting databases for catalog ${catalogId || 'default'}`)
+
+            const glueClient = await this.getGlueClient()
+            const response = await glueClient.send(
+                new GetDatabasesCommand({
+                    CatalogId: catalogId,
+                    ResourceShareType: resourceShareType,
+                    AttributesToGet: attributesToGet,
+                    NextToken: nextToken,
+                    MaxResults: 100,
+                })
+            )
+
+            const databases = response.DatabaseList || []
+            this.logger.info(`GlueClient: Found ${databases.length} databases`)
+
+            return {
+                databases,
+                nextToken: response.NextToken,
+            }
+        } catch (err) {
+            this.logger.error('GlueClient: Failed to get databases: %s', err as Error)
+            throw err
+        }
+    }
+
+    /**
+     * Gets tables from a database
+     * @param databaseName Database name
+     * @param catalogId Optional catalog ID
+     * @param nextToken Optional pagination token
+     * @returns List of tables
+     */
+    public async getTables(
+        databaseName: string,
+        catalogId?: string,
+        attributesToGet?: TableAttributes[],
+        nextToken?: string
+    ): Promise<{ tables: Table[]; nextToken?: string }> {
+        try {
+            this.logger.info(`GlueClient: Getting tables for database ${databaseName}`)
+
+            const glueClient = await this.getGlueClient()
+            const response = await glueClient.send(
+                new GetTablesCommand({
+                    DatabaseName: databaseName,
+                    CatalogId: catalogId,
+                    AttributesToGet: attributesToGet,
+                    NextToken: nextToken,
+                    MaxResults: 100,
+                })
+            )
+
+            const tables = response.TableList || []
+            this.logger.info(`GlueClient: Found ${tables.length} tables`)
+
+            return {
+                tables,
+                nextToken: response.NextToken,
+            }
+        } catch (err) {
+            this.logger.error('GlueClient: Failed to get tables: %s', err as Error)
+            throw err
+        }
+    }
+
+    /**
+     * Gets table details including columns
+     * @param databaseName Database name
+     * @param tableName Table name
+     * @param catalogId Optional catalog ID
+     * @returns Table details with columns
+     */
+    public async getTable(databaseName: string, tableName: string, catalogId?: string): Promise<Table | undefined> {
+        try {
+            this.logger.info(`GlueClient: Getting table ${tableName} from database ${databaseName}`)
+
+            const glueClient = await this.getGlueClient()
+            const response = await glueClient.send(
+                new GetTableCommand({
+                    DatabaseName: databaseName,
+                    Name: tableName,
+                    CatalogId: catalogId,
+                })
+            )
+
+            return response.Table
+        } catch (err) {
+            this.logger.error('GlueClient: Failed to get table: %s', err as Error)
+            throw err
+        }
+    }
+
+    /**
+     * Gets the Glue client, initializing it if necessary
+     */
+    private async getGlueClient(): Promise<Glue> {
+        if (!this.glueClient) {
+            try {
+                const credentialsProvider = async () => {
+                    const credentials = await this.connectionCredentialsProvider.getCredentials()
+                    return {
+                        accessKeyId: credentials.accessKeyId,
+                        secretAccessKey: credentials.secretAccessKey,
+                        sessionToken: credentials.sessionToken,
+                        expiration: credentials.expiration,
+                    }
+                }
+
+                this.glueClient = new Glue({
+                    region: this.region,
+                    credentials: credentialsProvider,
+                })
+                this.logger.debug('GlueClient: Successfully created Glue client')
+            } catch (err) {
+                this.logger.error('GlueClient: Failed to create Glue client: %s', err as Error)
+                throw err
+            }
+        }
+        return this.glueClient
+    }
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/shared/client/gluecatalogapi.json b/packages/core/src/sagemakerunifiedstudio/shared/client/gluecatalogapi.json
new file mode 100644
index 00000000000..ecd3705c096
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/shared/client/gluecatalogapi.json
@@ -0,0 +1,2695 @@
+{
+    "version": "2.0",
+    "metadata": {
+        "apiVersion": "2022-07-26",
+        "auth": ["aws.auth#sigv4"],
+        "endpointPrefix": "glue",
+        "jsonVersion": "1.1",
+        "protocol": "json",
+        "protocols": ["json"],
+        "serviceFullName": "Glue Private Service",
+        "serviceId": "GlueCatalogAPI",
+        "signatureVersion": "v4",
+        "signingName": "glue",
+        "targetPrefix": "AWSGlue",
+        "uid": "gluecatalogapi-2022-07-26"
+    },
+    "operations": {
+        "DescribeConnectionType": {
+            "name": "DescribeConnectionType",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": {
+                "shape": "DescribeConnectionTypeRequest"
+            },
+            "output": {
+                "shape": "DescribeConnectionTypeResponse"
+            },
+            "errors": [
+                {
+                    "shape": "InternalServiceException"
+                },
+                {
+                    "shape": "InvalidInputException"
+                },
+                {
+                    "shape": "AccessDeniedException"
+                },
+                {
+                    "shape": "ValidationException"
+                }
+            ]
+        },
+        "GetCatalog": {
+            "name": "GetCatalog",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": {
+                "shape": "GetCatalogRequest"
+            },
+            "output": {
+                "shape": "GetCatalogResponse"
+            },
+            "errors": [
+                {
+                    "shape": "InternalServiceException"
+                },
+                {
+                    "shape": "FederationSourceException"
+                },
+                {
+                    "shape": "InvalidInputException"
+                },
+                {
+                    "shape": "GlueEncryptionException"
+                },
+                {
+                    "shape": "EntityNotFoundException"
+                },
+                {
+                    "shape": "OperationTimeoutException"
+                },
+                {
+                    "shape": "AccessDeniedException"
+                }
+            ]
+        },
+        "GetCatalogs": {
+            "name": "GetCatalogs",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": {
+                "shape": "GetCatalogsRequest"
+            },
+            "output": {
+                "shape": "GetCatalogsResponse"
+            },
+            "errors": [
+                {
+                    "shape": "InternalServiceException"
+                },
+                {
+                    "shape": "InvalidInputException"
+                },
+                {
+                    "shape": "GlueEncryptionException"
+                },
+                {
+                    "shape": "FederationSourceException"
+                },
+                {
+                    "shape": "EntityNotFoundException"
+                },
+                {
+                    "shape": "OperationTimeoutException"
+                },
+                {
+                    "shape": "AccessDeniedException"
+                }
+            ]
+        },
+        "GetCompletion": {
+            "name": "GetCompletion",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": {
+                "shape": "GetCompletionRequest"
+            },
+            "output": {
+                "shape": "GetCompletionResponse"
+            },
+            "errors": [
+                {
+                    "shape": "AlreadyExistsException"
+                },
+                {
+                    "shape": "InternalServiceException"
+                },
+                {
+                    "shape": "InvalidInputException"
+                },
+                {
+                    "shape": "EntityNotFoundException"
+                },
+                {
+                    "shape": "OperationTimeoutException"
+                },
+                {
+                    "shape": "AccessDeniedException"
+                },
+                {
+                    "shape": "ValidationException"
+                }
+            ]
+        },
+        "GetEntityRecords": {
+            "name": "GetEntityRecords",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": {
+                "shape": "GetEntityRecordsRequest"
+            },
+            "output": {
+                "shape": "GetEntityRecordsResponse"
+            },
+            "errors": [
+                {
+                    "shape": "InvalidInputException"
+                },
+                {
+                    "shape": "GlueEncryptionException"
+                },
+                {
+                    "shape": "FederationSourceException"
+                },
+                {
+                    "shape": "EntityNotFoundException"
+                },
+                {
+                    "shape": "OperationTimeoutException"
+                },
+                {
+                    "shape": "AccessDeniedException"
+                },
+                {
+                    "shape": "ValidationException"
+                }
+            ]
+        },
+        "GetJobRun": {
+            "name": "GetJobRun",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": {
+                "shape": "GetJobRunRequest"
+            },
+            "output": {
+                "shape": "GetJobRunResponse"
+            },
+            "errors": [
+                {
+                    "shape": "InternalServiceException"
+                },
+                {
+                    "shape": "InvalidInputException"
+                },
+                {
+                    "shape": "EntityNotFoundException"
+                },
+                {
+                    "shape": "OperationTimeoutException"
+                }
+            ]
+        },
+        "GetJobRuns": {
+            "name": "GetJobRuns",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": {
+                "shape": "GetJobRunsRequest"
+            },
+            "output": {
+                "shape": "GetJobRunsResponse"
+            },
+            "errors": [
+                {
+                    "shape": "InternalServiceException"
+                },
+                {
+                    "shape": "InvalidInputException"
+                },
+                {
+                    "shape": "EntityNotFoundException"
+                },
+                {
+                    "shape": "OperationTimeoutException"
+                }
+            ]
+        },
+        "GetTable": {
+            "name": "GetTable",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": {
+                "shape": "GetTableRequest"
+            },
+            "output": {
+                "shape": "GetTableResponse"
+            },
+            "errors": [
+                {
+                    "shape": "ResourceNotReadyException"
+                },
+                {
+                    "shape": "FederationSourceRetryableException"
+                },
+                {
+                    "shape": "InternalServiceException"
+                },
+                {
+                    "shape": "InvalidInputException"
+                },
+                {
+                    "shape": "GlueEncryptionException"
+                },
+                {
+                    "shape": "FederationSourceException"
+                },
+                {
+                    "shape": "EntityNotFoundException"
+                },
+                {
+                    "shape": "OperationTimeoutException"
+                }
+            ]
+        },
+        "ListConnectionTypes": {
+            "name": "ListConnectionTypes",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": {
+                "shape": "ListConnectionTypesRequest"
+            },
+            "output": {
+                "shape": "ListConnectionTypesResponse"
+            },
+            "errors": [
+                {
+                    "shape": "InternalServiceException"
+                },
+                {
+                    "shape": "AccessDeniedException"
+                }
+            ]
+        },
+        "StartCompletion": {
+            "name": "StartCompletion",
+            "http": {
+                "method": "POST",
+                "requestUri": "/"
+            },
+            "input": {
+                "shape": "StartCompletionRequest"
+            },
+            "output": {
+                "shape": "StartCompletionResponse"
+            },
+            "errors": [
+                {
+                    "shape": "AlreadyExistsException"
+                },
+                {
+                    "shape": "InternalServiceException"
+                },
+                {
+                    "shape": "InvalidInputException"
+                },
+                {
+                    "shape": "EntityNotFoundException"
+                },
+                {
+                    "shape": "OperationTimeoutException"
+                },
+                {
+                    "shape": "AccessDeniedException"
+                },
+                {
+                    "shape": "ValidationException"
+                }
+            ]
+        }
+    },
+    "shapes": {
+        "AccessDeniedException": {
+            "type": "structure",
+            "members": {
+                "message": {
+                    "shape": "String"
+                }
+            },
+            "documentation": "<p>This exception is thrown when the client doesn't have permission for the operation they requested.</p>",
+            "exception": true
+        },
+        "AllowedValue": {
+            "type": "structure",
+            "required": ["DisplayName", "Description", "Value"],
+            "members": {
+                "DisplayName": {
+                    "shape": "AllowedValueDisplayNameString"
+                },
+                "Description": {
+                    "shape": "AllowedValueDescriptionString"
+                },
+                "Value": {
+                    "shape": "AllowedValueValueString"
+                }
+            }
+        },
+        "AllowedValueDescriptionString": {
+            "type": "string",
+            "max": 1024,
+            "min": 0
+        },
+        "AllowedValueDisplayNameString": {
+            "type": "string",
+            "max": 128,
+            "min": 1
+        },
+        "AllowedValueValueString": {
+            "type": "string",
+            "max": 128,
+            "min": 1
+        },
+        "AllowedValues": {
+            "type": "list",
+            "member": {
+                "shape": "AllowedValue"
+            }
+        },
+        "AlreadyExistsException": {
+            "type": "structure",
+            "members": {
+                "message": {
+                    "shape": "String"
+                }
+            },
+            "documentation": "<p>This exception occurs when a user submits for an already existing script</p>",
+            "exception": true
+        },
+        "ApiVersion": {
+            "type": "string",
+            "max": 256,
+            "min": 1,
+            "pattern": "[a-zA-Z0-9.-]*"
+        },
+        "ArnString": {
+            "type": "string",
+            "max": 2048,
+            "min": 20
+        },
+        "AttemptCount": {
+            "type": "integer",
+            "box": true
+        },
+        "AttributeCondition": {
+            "type": "structure",
+            "members": {
+                "Expression": {
+                    "shape": "ExpressionString"
+                },
+                "Scope": {
+                    "shape": "ScopeString"
+                }
+            }
+        },
+        "AuthConfiguration": {
+            "type": "structure",
+            "required": ["AuthenticationType", "SecretArn"],
+            "members": {
+                "AuthenticationType": {
+                    "shape": "Property"
+                },
+                "SecretArn": {
+                    "shape": "Property"
+                },
+                "OAuth2Properties": {
+                    "shape": "PropertiesMap"
+                },
+                "BasicAuthenticationProperties": {
+                    "shape": "PropertiesMap"
+                },
+                "CustomAuthenticationProperties": {
+                    "shape": "PropertiesMap"
+                }
+            }
+        },
+        "AuthenticationType": {
+            "type": "string",
+            "enum": ["BASIC", "OAUTH2", "CUSTOM"]
+        },
+        "AuthenticationTypes": {
+            "type": "list",
+            "member": {
+                "shape": "AuthenticationType"
+            }
+        },
+        "BlobParametersMap": {
+            "type": "map",
+            "key": {
+                "shape": "KeyString"
+            },
+            "value": {
+                "shape": "BlobParametersMapValue"
+            }
+        },
+        "BlobParametersMapValue": {
+            "type": "blob"
+        },
+        "Bool": {
+            "type": "boolean",
+            "box": true
+        },
+        "Boolean": {
+            "type": "boolean",
+            "box": true
+        },
+        "BooleanValue": {
+            "type": "boolean",
+            "box": true
+        },
+        "Capabilities": {
+            "type": "structure",
+            "required": ["SupportedAuthenticationTypes", "SupportedDataOperations", "SupportedComputeEnvironments"],
+            "members": {
+                "SupportedAuthenticationTypes": {
+                    "shape": "AuthenticationTypes"
+                },
+                "SupportedDataOperations": {
+                    "shape": "DataOperations"
+                },
+                "SupportedComputeEnvironments": {
+                    "shape": "ComputeEnvironments"
+                }
+            }
+        },
+        "Catalog": {
+            "type": "structure",
+            "members": {
+                "CatalogId": {
+                    "shape": "CatalogIdString"
+                },
+                "Name": {
+                    "shape": "CatalogNameString"
+                },
+                "Description": {
+                    "shape": "GlueCommonDescriptionString"
+                },
+                "ResourceArn": {
+                    "shape": "ResourceArnString"
+                },
+                "Parameters": {
+                    "shape": "ParametersMap"
+                },
+                "DataParameters": {
+                    "shape": "BlobParametersMap"
+                },
+                "CatalogType": {
+                    "shape": "CatalogType"
+                },
+                "CreateTime": {
+                    "shape": "Timestamp"
+                },
+                "UpdateTime": {
+                    "shape": "Timestamp"
+                },
+                "TargetCatalog": {
+                    "shape": "TargetCatalog"
+                },
+                "FederatedCatalog": {
+                    "shape": "FederatedCatalog"
+                },
+                "CatalogProperties": {
+                    "shape": "CatalogPropertiesOutput"
+                },
+                "CatalogIdentifier": {
+                    "shape": "CatalogIdentifier"
+                },
+                "ParentCatalogIdentifiers": {
+                    "shape": "CatalogIdentifierList"
+                },
+                "ParentCatalogNames": {
+                    "shape": "CatalogNameList"
+                },
+                "CreateTableDefaultPermissions": {
+                    "shape": "PrincipalPermissionsList"
+                },
+                "CreateDatabaseDefaultPermissions": {
+                    "shape": "PrincipalPermissionsList"
+                }
+            }
+        },
+        "CatalogIdString": {
+            "type": "string",
+            "max": 255,
+            "min": 1,
+            "pattern": ".*[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\t]*.*"
+        },
+        "CatalogIdentifier": {
+            "type": "string",
+            "max": 100,
+            "min": 0,
+            "pattern": ".*[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\t]*.*"
+        },
+        "CatalogIdentifierList": {
+            "type": "list",
+            "member": {
+                "shape": "CatalogIdentifier"
+            }
+        },
+        "CatalogList": {
+            "type": "list",
+            "member": {
+                "shape": "Catalog"
+            }
+        },
+        "CatalogNameList": {
+            "type": "list",
+            "member": {
+                "shape": "CatalogNameString"
+            }
+        },
+        "CatalogNameString": {
+            "type": "string",
+            "max": 30,
+            "min": 1,
+            "pattern": "(?!(.*[.\\/\\\\]|aws:)).*"
+        },
+        "CatalogPropertiesOutput": {
+            "type": "structure",
+            "members": {
+                "DataLakeAccessProperties": {
+                    "shape": "DataLakeAccessPropertiesOutput"
+                },
+                "IcebergOptimizationProperties": {
+                    "shape": "IcebergOptimizationPropertiesOutput"
+                }
+            }
+        },
+        "CatalogType": {
+            "type": "string",
+            "enum": [
+                "REDSHIFT_CATALOG",
+                "FEDERATED",
+                "NATIVE",
+                "REDSHIFT",
+                "LINKCONTAINER",
+                "LINK_FEDERATED",
+                "LINK_NATIVE",
+                "LINK_REDSHIFT"
+            ]
+        },
+        "Column": {
+            "type": "structure",
+            "required": ["Name"],
+            "members": {
+                "Name": {
+                    "shape": "NameString"
+                },
+                "Type": {
+                    "shape": "TypeString"
+                },
+                "Comment": {
+                    "shape": "CommentString"
+                },
+                "Parameters": {
+                    "shape": "ParametersMap"
+                }
+            }
+        },
+        "ColumnList": {
+            "type": "list",
+            "member": {
+                "shape": "Column"
+            }
+        },
+        "ColumnValueStringList": {
+            "type": "list",
+            "member": {
+                "shape": "ColumnValuesString"
+            }
+        },
+        "ColumnValuesString": {
+            "type": "string"
+        },
+        "CommentString": {
+            "type": "string",
+            "max": 255,
+            "min": 0,
+            "pattern": ".*[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\t]*.*"
+        },
+        "CompletionIdString": {
+            "type": "string",
+            "max": 36,
+            "min": 36,
+            "pattern": ".*[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}.*"
+        },
+        "CompletionStatus": {
+            "type": "string",
+            "enum": ["SUBMITTED", "SUCCEEDED", "FAILED", "RUNNING", "EXPIRED", "DELETED"]
+        },
+        "CompletionString": {
+            "type": "string",
+            "max": 30720,
+            "min": 1
+        },
+        "ComputeEnvironment": {
+            "type": "string",
+            "enum": ["SPARK", "PYTHON", "ATHENA"]
+        },
+        "ComputeEnvironmentConfiguration": {
+            "type": "structure",
+            "required": [
+                "Name",
+                "Description",
+                "ComputeEnvironment",
+                "SupportedAuthenticationTypes",
+                "AdditionalConnectionProperties",
+                "AdditionalConnectionOptions",
+                "ConnectionPropertyNameOverrides",
+                "ConnectionOptionNameOverrides",
+                "ConnectionPropertyExclusions",
+                "ConnectionOptionExclusions",
+                "ConnectionPropertiesRequiredOverrides"
+            ],
+            "members": {
+                "Name": {
+                    "shape": "ComputeEnvironmentName"
+                },
+                "Description": {
+                    "shape": "String"
+                },
+                "ComputeEnvironment": {
+                    "shape": "ComputeEnvironment"
+                },
+                "SupportedAuthenticationTypes": {
+                    "shape": "AuthenticationTypes"
+                },
+                "AdditionalConnectionProperties": {
+                    "shape": "PropertiesMap"
+                },
+                "AdditionalConnectionOptions": {
+                    "shape": "PropertiesMap"
+                },
+                "ConnectionPropertyNameOverrides": {
+                    "shape": "PropertyNameOverrides"
+                },
+                "ConnectionOptionNameOverrides": {
+                    "shape": "PropertyNameOverrides"
+                },
+                "ConnectionPropertyExclusions": {
+                    "shape": "ListOfString"
+                },
+                "ConnectionOptionExclusions": {
+                    "shape": "ListOfString"
+                },
+                "ConnectionPropertiesRequiredOverrides": {
+                    "shape": "ListOfString"
+                },
+                "PhysicalConnectionPropertiesRequired": {
+                    "shape": "Bool"
+                }
+            }
+        },
+        "ComputeEnvironmentConfigurationMap": {
+            "type": "map",
+            "key": {
+                "shape": "ComputeEnvironmentName"
+            },
+            "value": {
+                "shape": "ComputeEnvironmentConfiguration"
+            }
+        },
+        "ComputeEnvironmentName": {
+            "type": "string",
+            "max": 128,
+            "min": 1
+        },
+        "ComputeEnvironments": {
+            "type": "list",
+            "member": {
+                "shape": "ComputeEnvironment"
+            }
+        },
+        "ConditionStatement": {
+            "type": "map",
+            "key": {
+                "shape": "String"
+            },
+            "value": {
+                "shape": "String"
+            }
+        },
+        "ConditionStatements": {
+            "type": "list",
+            "member": {
+                "shape": "ConditionStatement"
+            }
+        },
+        "ConnectionOptions": {
+            "type": "map",
+            "key": {
+                "shape": "OptionKey"
+            },
+            "value": {
+                "shape": "OptionValue"
+            }
+        },
+        "ConnectionType": {
+            "type": "string",
+            "enum": [
+                "JDBC",
+                "SFTP",
+                "REDSHIFT",
+                "ATHENA",
+                "MONGODB",
+                "KAFKA",
+                "NETWORK",
+                "YARNRESOURCEMANAGER",
+                "MARKETPLACE",
+                "HIVE_METASTORE",
+                "CUSTOM",
+                "SALESFORCE",
+                "VIEW_VALIDATION_REDSHIFT",
+                "VIEW_VALIDATION_ATHENA"
+            ]
+        },
+        "ConnectionTypeBrief": {
+            "type": "structure",
+            "members": {
+                "ConnectionType": {
+                    "shape": "ConnectionType"
+                },
+                "DisplayName": {
+                    "shape": "DisplayName"
+                },
+                "Vendor": {
+                    "shape": "Vendor"
+                },
+                "Description": {
+                    "shape": "Description"
+                },
+                "Categories": {
+                    "shape": "ListOfString"
+                },
+                "Capabilities": {
+                    "shape": "Capabilities"
+                },
+                "LogoUrl": {
+                    "shape": "UrlString"
+                },
+                "DocumentationUrl": {
+                    "shape": "UrlString"
+                },
+                "ConnectionTypeVariants": {
+                    "shape": "ConnectionTypeVariantList"
+                }
+            }
+        },
+        "ConnectionTypeList": {
+            "type": "list",
+            "member": {
+                "shape": "ConnectionTypeBrief"
+            }
+        },
+        "ConnectionTypeVariant": {
+            "type": "structure",
+            "members": {
+                "ConnectionTypeVariantName": {
+                    "shape": "DisplayName"
+                },
+                "DisplayName": {
+                    "shape": "DisplayName"
+                },
+                "Description": {
+                    "shape": "Description"
+                },
+                "LogoUrl": {
+                    "shape": "UrlString"
+                },
+                "DocumentationUrl": {
+                    "shape": "UrlString"
+                }
+            }
+        },
+        "ConnectionTypeVariantList": {
+            "type": "list",
+            "member": {
+                "shape": "ConnectionTypeVariant"
+            }
+        },
+        "DataAccessModeEnum": {
+            "type": "string",
+            "enum": ["LakeFormation", "Hybrid", "Other"]
+        },
+        "DataLakeAccessPropertiesOutput": {
+            "type": "structure",
+            "members": {
+                "DataLakeAccess": {
+                    "shape": "Boolean"
+                },
+                "DataTransferRole": {
+                    "shape": "GlueCommonIAMRoleArn"
+                },
+                "KmsKey": {
+                    "shape": "ResourceArnString"
+                },
+                "ManagedWorkgroupName": {
+                    "shape": "GlueCommonNameString"
+                },
+                "ManagedWorkgroupStatus": {
+                    "shape": "GlueCommonNameString"
+                },
+                "NamespaceArn": {
+                    "shape": "ResourceArnString"
+                },
+                "RedshiftDatabaseName": {
+                    "shape": "GlueCommonNameString"
+                },
+                "StatusMessage": {
+                    "shape": "GlueCommonNameString"
+                },
+                "CatalogType": {
+                    "shape": "GlueCommonNameString"
+                }
+            }
+        },
+        "DataLakePrincipal": {
+            "type": "structure",
+            "members": {
+                "DataLakePrincipalIdentifier": {
+                    "shape": "DataLakePrincipalString"
+                },
+                "AttributeCondition": {
+                    "shape": "AttributeCondition"
+                }
+            }
+        },
+        "DataLakePrincipalString": {
+            "type": "string",
+            "max": 255,
+            "min": 1
+        },
+        "DataOperation": {
+            "type": "string",
+            "enum": ["READ", "WRITE"]
+        },
+        "DataOperations": {
+            "type": "list",
+            "member": {
+                "shape": "DataOperation"
+            }
+        },
+        "DataType": {
+            "type": "string",
+            "enum": ["STRING", "INTEGER", "BOOLEAN", "STRING_LIST"]
+        },
+        "DatabaseIdString": {
+            "type": "string",
+            "max": 100,
+            "min": 0,
+            "pattern": ".*[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\t]*.*"
+        },
+        "DescribeConnectionTypeRequest": {
+            "type": "structure",
+            "members": {
+                "ConnectionType": {
+                    "shape": "NameString"
+                }
+            }
+        },
+        "DescribeConnectionTypeResponse": {
+            "type": "structure",
+            "members": {
+                "ConnectionType": {
+                    "shape": "NameString"
+                },
+                "DisplayName": {
+                    "shape": "DisplayName"
+                },
+                "Vendor": {
+                    "shape": "Vendor"
+                },
+                "Description": {
+                    "shape": "Description"
+                },
+                "LogoUrl": {
+                    "shape": "UrlString"
+                },
+                "DocumentationUrl": {
+                    "shape": "UrlString"
+                },
+                "Categories": {
+                    "shape": "ListOfString"
+                },
+                "Capabilities": {
+                    "shape": "Capabilities"
+                },
+                "ConnectionProperties": {
+                    "shape": "PropertiesMap"
+                },
+                "SparkConnectionProperties": {
+                    "shape": "PropertiesMap"
+                },
+                "AthenaConnectionProperties": {
+                    "shape": "PropertiesMap"
+                },
+                "ConnectionOptions": {
+                    "shape": "PropertiesMap"
+                },
+                "AuthenticationConfiguration": {
+                    "shape": "AuthConfiguration"
+                },
+                "ComputeEnvironmentConfigurations": {
+                    "shape": "ComputeEnvironmentConfigurationMap"
+                },
+                "PhysicalConnectionRequirements": {
+                    "shape": "PropertiesMap"
+                }
+            }
+        },
+        "Description": {
+            "type": "string",
+            "max": 1024,
+            "min": 0
+        },
+        "DescriptionErrorString": {
+            "type": "string",
+            "max": 400000,
+            "min": 0
+        },
+        "DescriptionString": {
+            "type": "string",
+            "max": 2048,
+            "min": 0,
+            "pattern": ".*[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\r\\n\\t]*.*"
+        },
+        "DisplayName": {
+            "type": "string",
+            "max": 128,
+            "min": 1
+        },
+        "EntityFieldName": {
+            "type": "string"
+        },
+        "EntityName": {
+            "type": "string"
+        },
+        "EntityNotFoundException": {
+            "type": "structure",
+            "members": {
+                "message": {
+                    "shape": "String"
+                },
+                "fromFederationSource": {
+                    "shape": "NullableBoolean"
+                }
+            },
+            "documentation": "<p>This exception is thrown when the requested entity is not found in the server side.</p>",
+            "exception": true
+        },
+        "ErrorDetail": {
+            "type": "structure",
+            "members": {
+                "ErrorCode": {
+                    "shape": "NameString"
+                },
+                "ErrorMessage": {
+                    "shape": "DescriptionString"
+                }
+            }
+        },
+        "ExecutionClass": {
+            "type": "string",
+            "enum": ["FLEX", "STANDARD"]
+        },
+        "ExecutionTime": {
+            "type": "integer",
+            "box": true
+        },
+        "ExpressionString": {
+            "type": "string"
+        },
+        "FederatedCatalog": {
+            "type": "structure",
+            "members": {
+                "Identifier": {
+                    "shape": "GlueCommonFederationIdentifier"
+                },
+                "ConnectionName": {
+                    "shape": "GlueCommonNameString"
+                }
+            }
+        },
+        "FederatedTable": {
+            "type": "structure",
+            "members": {
+                "Identifier": {
+                    "shape": "FederationIdentifier"
+                },
+                "DatabaseIdentifier": {
+                    "shape": "FederationIdentifier"
+                },
+                "ProfileName": {
+                    "shape": "NameString"
+                },
+                "ConnectionName": {
+                    "shape": "NameString"
+                },
+                "ConnectionType": {
+                    "shape": "NameString"
+                }
+            }
+        },
+        "FederationIdentifier": {
+            "type": "string",
+            "max": 512,
+            "min": 1,
+            "pattern": ".*[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\t]*.*"
+        },
+        "FederationSourceException": {
+            "type": "structure",
+            "members": {
+                "message": {
+                    "shape": "String"
+                }
+            },
+            "exception": true
+        },
+        "FederationSourceRetryableException": {
+            "type": "structure",
+            "members": {
+                "message": {
+                    "shape": "String"
+                }
+            },
+            "exception": true
+        },
+        "FilterPredicate": {
+            "type": "string",
+            "max": 2048,
+            "min": 1,
+            "pattern": "[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\r\\n\\t]*"
+        },
+        "FormatString": {
+            "type": "string",
+            "max": 128,
+            "min": 0,
+            "pattern": ".*[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\t]*.*"
+        },
+        "GenericMap": {
+            "type": "map",
+            "key": {
+                "shape": "GenericString"
+            },
+            "value": {
+                "shape": "GenericString"
+            }
+        },
+        "GenericString": {
+            "type": "string"
+        },
+        "GetCatalogRequest": {
+            "type": "structure",
+            "required": ["Name"],
+            "members": {
+                "Name": {
+                    "shape": "CatalogNameString"
+                },
+                "ParentCatalogId": {
+                    "shape": "CatalogIdString"
+                },
+                "CatalogId": {
+                    "shape": "CatalogIdString"
+                },
+                "CatalogIdentifier": {
+                    "shape": "CatalogIdentifier"
+                },
+                "ContextMap": {
+                    "shape": "RequestContextMap"
+                },
+                "FederateToSource": {
+                    "shape": "Boolean"
+                }
+            }
+        },
+        "GetCatalogResponse": {
+            "type": "structure",
+            "required": ["Catalog"],
+            "members": {
+                "Catalog": {
+                    "shape": "Catalog"
+                },
+                "DataParameters": {
+                    "shape": "BlobParametersMap"
+                }
+            }
+        },
+        "GetCatalogsRequest": {
+            "type": "structure",
+            "members": {
+                "ParentCatalogId": {
+                    "shape": "CatalogIdString"
+                },
+                "NextToken": {
+                    "shape": "NextToken"
+                },
+                "MaxResults": {
+                    "shape": "PageSize"
+                },
+                "Recursive": {
+                    "shape": "NullableBoolean"
+                },
+                "ContextMap": {
+                    "shape": "RequestContextMap"
+                }
+            }
+        },
+        "GetCatalogsResponse": {
+            "type": "structure",
+            "required": ["CatalogList"],
+            "members": {
+                "CatalogList": {
+                    "shape": "CatalogList"
+                },
+                "NextToken": {
+                    "shape": "NextToken"
+                }
+            }
+        },
+        "GetCompletionRequest": {
+            "type": "structure",
+            "required": ["CompletionId"],
+            "members": {
+                "CompletionId": {
+                    "shape": "CompletionIdString"
+                }
+            }
+        },
+        "GetCompletionResponse": {
+            "type": "structure",
+            "required": ["CompletionId", "LastModifiedOn", "Status"],
+            "members": {
+                "CompletionId": {
+                    "shape": "CompletionIdString"
+                },
+                "StartedOn": {
+                    "shape": "startedOn"
+                },
+                "LastModifiedOn": {
+                    "shape": "lastModifiedOn"
+                },
+                "ErrorMessage": {
+                    "shape": "HashString"
+                },
+                "CompletedOn": {
+                    "shape": "completedOn"
+                },
+                "Status": {
+                    "shape": "CompletionStatus"
+                },
+                "Completion": {
+                    "shape": "CompletionString"
+                },
+                "SourceURLs": {
+                    "shape": "SourceUrlList"
+                },
+                "Tags": {
+                    "shape": "TagsMap"
+                }
+            }
+        },
+        "GetEntityRecordsRequest": {
+            "type": "structure",
+            "required": ["EntityName", "Limit"],
+            "members": {
+                "EntityName": {
+                    "shape": "EntityName"
+                },
+                "Limit": {
+                    "shape": "Limit"
+                },
+                "ConnectionName": {
+                    "shape": "NameString"
+                },
+                "CatalogId": {
+                    "shape": "CatalogIdString"
+                },
+                "NextToken": {
+                    "shape": "NextToken"
+                },
+                "DataStoreApiVersion": {
+                    "shape": "ApiVersion"
+                },
+                "ConnectionOptions": {
+                    "shape": "ConnectionOptions"
+                },
+                "FilterPredicate": {
+                    "shape": "FilterPredicate"
+                },
+                "OrderBy": {
+                    "shape": "String"
+                },
+                "SelectedFields": {
+                    "shape": "SelectedFields"
+                },
+                "StagingConfiguration": {
+                    "shape": "StagingConfiguration"
+                }
+            }
+        },
+        "GetEntityRecordsResponse": {
+            "type": "structure",
+            "members": {
+                "Records": {
+                    "shape": "Records"
+                },
+                "NextToken": {
+                    "shape": "NextToken"
+                }
+            }
+        },
+        "GetJobRunRequest": {
+            "type": "structure",
+            "required": ["JobName", "RunId"],
+            "members": {
+                "JobName": {
+                    "shape": "NameString"
+                },
+                "RunId": {
+                    "shape": "IdString"
+                },
+                "PredecessorsIncluded": {
+                    "shape": "BooleanValue"
+                }
+            }
+        },
+        "GetJobRunResponse": {
+            "type": "structure",
+            "members": {
+                "JobRun": {
+                    "shape": "JobRun"
+                }
+            }
+        },
+        "GetJobRunsRequest": {
+            "type": "structure",
+            "required": ["JobName"],
+            "members": {
+                "JobName": {
+                    "shape": "NameString"
+                },
+                "NextToken": {
+                    "shape": "OrchestrationToken"
+                },
+                "MaxResults": {
+                    "shape": "OrchestrationPageSize200"
+                }
+            }
+        },
+        "GetJobRunsResponse": {
+            "type": "structure",
+            "members": {
+                "JobRuns": {
+                    "shape": "JobRunList"
+                },
+                "NextToken": {
+                    "shape": "OrchestrationToken"
+                }
+            }
+        },
+        "GetTableRequest": {
+            "type": "structure",
+            "required": ["DatabaseName", "Name"],
+            "members": {
+                "DatabaseName": {
+                    "shape": "NameString"
+                },
+                "Name": {
+                    "shape": "NameString"
+                },
+                "CatalogId": {
+                    "shape": "CatalogIdString"
+                },
+                "TransactionId": {
+                    "shape": "TransactionIdString"
+                },
+                "QueryAsOfTime": {
+                    "shape": "Timestamp"
+                },
+                "IncludeAccessMode": {
+                    "shape": "NullableBoolean"
+                },
+                "IncludeStatusDetails": {
+                    "shape": "NullableBoolean"
+                },
+                "AttributesToGet": {
+                    "shape": "TableAttributesList"
+                },
+                "CatalogIdentifier": {
+                    "shape": "CatalogIdentifier"
+                },
+                "DatabaseIdentifier": {
+                    "shape": "DatabaseIdString"
+                },
+                "TableIdentifier": {
+                    "shape": "TableIdString"
+                },
+                "ContextMap": {
+                    "shape": "RequestContextMap"
+                }
+            }
+        },
+        "GetTableResponse": {
+            "type": "structure",
+            "members": {
+                "Table": {
+                    "shape": "Table"
+                },
+                "UseAdvancedFiltering": {
+                    "shape": "NullableBoolean"
+                }
+            }
+        },
+        "GlueCommonDescriptionString": {
+            "type": "string",
+            "max": 2048,
+            "min": 1,
+            "pattern": ".*[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\t]*.*"
+        },
+        "GlueCommonFederationIdentifier": {
+            "type": "string",
+            "max": 512,
+            "min": 1,
+            "pattern": ".*[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\t]*.*"
+        },
+        "GlueCommonIAMRoleArn": {
+            "type": "string",
+            "pattern": "arn:aws(-(cn|us-gov|iso(-[bef])?))?:iam::[0-9]{12}:role/.+.*"
+        },
+        "GlueCommonNameString": {
+            "type": "string",
+            "max": 155,
+            "min": 1,
+            "pattern": ".*[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\t]*.*"
+        },
+        "GlueEncryptionException": {
+            "type": "structure",
+            "members": {
+                "message": {
+                    "shape": "String"
+                }
+            },
+            "exception": true
+        },
+        "GlueResourceArn": {
+            "type": "string",
+            "pattern": ".*arn:aws(-(cn|us-gov|iso(-[bef])?))?:glue:.*"
+        },
+        "GlueVersionString": {
+            "type": "string",
+            "max": 255,
+            "min": 1,
+            "pattern": "(\\w+\\.)+\\w+"
+        },
+        "HashString": {
+            "type": "string",
+            "max": 255,
+            "min": 1
+        },
+        "IcebergOptimizationPropertiesOutput": {
+            "type": "structure",
+            "members": {
+                "RoleArn": {
+                    "shape": "GlueCommonIAMRoleArn"
+                },
+                "Compaction": {
+                    "shape": "ParametersMap"
+                },
+                "Retention": {
+                    "shape": "ParametersMap"
+                },
+                "OrphanFileDeletion": {
+                    "shape": "ParametersMap"
+                },
+                "LastUpdatedTime": {
+                    "shape": "Timestamp"
+                }
+            }
+        },
+        "IdString": {
+            "type": "string",
+            "max": 255,
+            "min": 1,
+            "pattern": ".*[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\t]*.*"
+        },
+        "Integer": {
+            "type": "integer",
+            "box": true
+        },
+        "IntegerFlag": {
+            "type": "integer",
+            "box": true,
+            "max": 1,
+            "min": 0
+        },
+        "IntegerValue": {
+            "type": "integer",
+            "box": true
+        },
+        "InternalServiceException": {
+            "type": "structure",
+            "members": {
+                "message": {
+                    "shape": "String"
+                }
+            },
+            "documentation": "<p>This exception is thrown when a call fails due to internal error.</p>",
+            "exception": true,
+            "fault": true
+        },
+        "InvalidInputException": {
+            "type": "structure",
+            "members": {
+                "message": {
+                    "shape": "String"
+                },
+                "fromFederationSource": {
+                    "shape": "NullableBoolean"
+                }
+            },
+            "documentation": "<p>This exception is thrown when the format of the input is incorrect.</p>",
+            "exception": true
+        },
+        "JobMode": {
+            "type": "string",
+            "enum": ["SCRIPT", "VISUAL", "NOTEBOOK"]
+        },
+        "JobRun": {
+            "type": "structure",
+            "members": {
+                "Id": {
+                    "shape": "IdString"
+                },
+                "Attempt": {
+                    "shape": "AttemptCount"
+                },
+                "PreviousRunId": {
+                    "shape": "IdString"
+                },
+                "TriggerName": {
+                    "shape": "NameString"
+                },
+                "JobName": {
+                    "shape": "NameString"
+                },
+                "JobMode": {
+                    "shape": "JobMode"
+                },
+                "JobRunQueuingEnabled": {
+                    "shape": "NullableBoolean"
+                },
+                "StartedOn": {
+                    "shape": "TimestampValue"
+                },
+                "LastModifiedOn": {
+                    "shape": "TimestampValue"
+                },
+                "CompletedOn": {
+                    "shape": "TimestampValue"
+                },
+                "JobRunState": {
+                    "shape": "JobRunState"
+                },
+                "Arguments": {
+                    "shape": "GenericMap"
+                },
+                "ErrorMessage": {
+                    "shape": "DescriptionErrorString"
+                },
+                "PredecessorRuns": {
+                    "shape": "PredecessorList"
+                },
+                "AllocatedCapacity": {
+                    "shape": "IntegerValue"
+                },
+                "ExecutionTime": {
+                    "shape": "ExecutionTime"
+                },
+                "Timeout": {
+                    "shape": "Timeout"
+                },
+                "MaxCapacity": {
+                    "shape": "NullableDouble"
+                },
+                "WorkerType": {
+                    "shape": "WorkerType"
+                },
+                "NumberOfWorkers": {
+                    "shape": "NullableInteger"
+                },
+                "SecurityConfiguration": {
+                    "shape": "NameString"
+                },
+                "LogGroupName": {
+                    "shape": "LogGroupString"
+                },
+                "NotificationProperty": {
+                    "shape": "NotificationProperty"
+                },
+                "GlueVersion": {
+                    "shape": "GlueVersionString"
+                },
+                "ExecutionClass": {
+                    "shape": "ExecutionClass"
+                },
+                "MinFlexWorkers": {
+                    "shape": "NullableInteger"
+                },
+                "DPUSeconds": {
+                    "shape": "NullableDouble"
+                },
+                "ExecutionArguments": {
+                    "shape": "GenericMap"
+                },
+                "ProfileName": {
+                    "shape": "NameString"
+                },
+                "StateDetail": {
+                    "shape": "OrchestrationMessageString"
+                },
+                "MaintenanceWindow": {
+                    "shape": "MaintenanceWindow"
+                },
+                "UpgradeAnalysisMetadata": {
+                    "shape": "UpgradeAnalysisMetadata"
+                }
+            }
+        },
+        "JobRunList": {
+            "type": "list",
+            "member": {
+                "shape": "JobRun"
+            }
+        },
+        "JobRunState": {
+            "type": "string",
+            "enum": [
+                "STARTING",
+                "RUNNING",
+                "STOPPING",
+                "STOPPED",
+                "SUCCEEDED",
+                "FAILED",
+                "TIMEOUT",
+                "ERROR",
+                "WAITING",
+                "EXPIRED"
+            ]
+        },
+        "KeyString": {
+            "type": "string",
+            "max": 255,
+            "min": 1,
+            "pattern": ".*[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\t]*.*"
+        },
+        "LakeFormationPermissionEnforcedEnum": {
+            "type": "string",
+            "enum": ["AllUsers", "SomeUsers", "NoUser"]
+        },
+        "Limit": {
+            "type": "long",
+            "box": true,
+            "max": 1000,
+            "min": 1
+        },
+        "ListConnectionTypesRequest": {
+            "type": "structure",
+            "members": {
+                "MaxResults": {
+                    "shape": "PageSize"
+                },
+                "NextToken": {
+                    "shape": "NextToken"
+                }
+            }
+        },
+        "ListConnectionTypesResponse": {
+            "type": "structure",
+            "members": {
+                "ConnectionTypes": {
+                    "shape": "ConnectionTypeList"
+                },
+                "NextToken": {
+                    "shape": "NextToken"
+                }
+            }
+        },
+        "ListOfString": {
+            "type": "list",
+            "member": {
+                "shape": "String"
+            }
+        },
+        "LocationMap": {
+            "type": "map",
+            "key": {
+                "shape": "ColumnValuesString"
+            },
+            "value": {
+                "shape": "ColumnValuesString"
+            }
+        },
+        "LocationString": {
+            "type": "string",
+            "max": 2056,
+            "min": 0,
+            "pattern": ".*[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\r\\n\\t]*.*"
+        },
+        "LocationStringList": {
+            "type": "list",
+            "member": {
+                "shape": "LocationString"
+            }
+        },
+        "LogGroupString": {
+            "type": "string",
+            "max": 400000,
+            "min": 0
+        },
+        "MaintenanceWindow": {
+            "type": "string",
+            "pattern": "(Sun|Mon|Tue|Wed|Thu|Fri|Sat):([01]?[0-9]|2[0-3])"
+        },
+        "Maximum": {
+            "type": "integer",
+            "box": true
+        },
+        "Minimum": {
+            "type": "integer",
+            "box": true
+        },
+        "NameString": {
+            "type": "string",
+            "max": 255,
+            "min": 1,
+            "pattern": ".*[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\t]*.*"
+        },
+        "NameStringList": {
+            "type": "list",
+            "member": {
+                "shape": "NameString"
+            }
+        },
+        "NextToken": {
+            "type": "string"
+        },
+        "NonNegativeInteger": {
+            "type": "integer",
+            "box": true,
+            "min": 0
+        },
+        "NotificationProperty": {
+            "type": "structure",
+            "members": {
+                "NotifyDelayAfter": {
+                    "shape": "NotifyDelayAfter"
+                }
+            }
+        },
+        "NotifyDelayAfter": {
+            "type": "integer",
+            "box": true,
+            "min": 1
+        },
+        "NullableBoolean": {
+            "type": "boolean",
+            "box": true
+        },
+        "NullableDouble": {
+            "type": "double",
+            "box": true
+        },
+        "NullableInteger": {
+            "type": "integer",
+            "box": true
+        },
+        "OperationTimeoutException": {
+            "type": "structure",
+            "members": {
+                "message": {
+                    "shape": "String"
+                }
+            },
+            "documentation": "<p>This exception occurs when the server throws a timeout</p>",
+            "exception": true
+        },
+        "OptionKey": {
+            "type": "string",
+            "max": 256,
+            "min": 1,
+            "pattern": "[\\w]*"
+        },
+        "OptionValue": {
+            "type": "string",
+            "max": 256,
+            "min": 1,
+            "pattern": "[\\S]*"
+        },
+        "OrchestrationMessageString": {
+            "type": "string",
+            "max": 400000,
+            "min": 0
+        },
+        "OrchestrationPageSize200": {
+            "type": "integer",
+            "box": true,
+            "max": 200,
+            "min": 1
+        },
+        "OrchestrationToken": {
+            "type": "string",
+            "max": 400000,
+            "min": 0
+        },
+        "Order": {
+            "type": "structure",
+            "required": ["Column", "SortOrder"],
+            "members": {
+                "Column": {
+                    "shape": "NameString"
+                },
+                "SortOrder": {
+                    "shape": "IntegerFlag"
+                }
+            }
+        },
+        "OrderList": {
+            "type": "list",
+            "member": {
+                "shape": "Order"
+            }
+        },
+        "OutputLocation": {
+            "type": "string"
+        },
+        "PageSize": {
+            "type": "integer",
+            "box": true,
+            "max": 1000,
+            "min": 1
+        },
+        "ParametersMap": {
+            "type": "map",
+            "key": {
+                "shape": "KeyString"
+            },
+            "value": {
+                "shape": "ParametersMapValue"
+            },
+            "max": 50,
+            "min": 0
+        },
+        "ParametersMapValue": {
+            "type": "string",
+            "max": 512000,
+            "min": 0
+        },
+        "Permission": {
+            "type": "string",
+            "enum": [
+                "ALL",
+                "SELECT",
+                "ALTER",
+                "DROP",
+                "DELETE",
+                "INSERT",
+                "DESCRIBE",
+                "CREATE_DATABASE",
+                "CREATE_TABLE",
+                "DATA_LOCATION_ACCESS",
+                "READ",
+                "WRITE",
+                "CREATE_LF_TAG",
+                "ASSOCIATE",
+                "UPDATE",
+                "GRANT_WITH_LF_TAG_EXPRESSION",
+                "CREATE_LF_TAG_EXPRESSION"
+            ]
+        },
+        "PermissionList": {
+            "type": "list",
+            "member": {
+                "shape": "Permission"
+            }
+        },
+        "Phase": {
+            "type": "string",
+            "enum": ["AUTHENTICATION", "CONNECTION_CREATION"]
+        },
+        "Predecessor": {
+            "type": "structure",
+            "members": {
+                "JobName": {
+                    "shape": "NameString"
+                },
+                "RunId": {
+                    "shape": "IdString"
+                }
+            }
+        },
+        "PredecessorList": {
+            "type": "list",
+            "member": {
+                "shape": "Predecessor"
+            }
+        },
+        "PrimitiveInteger": {
+            "type": "integer",
+            "box": true
+        },
+        "PrincipalPermissions": {
+            "type": "structure",
+            "members": {
+                "Principal": {
+                    "shape": "DataLakePrincipal"
+                },
+                "Permissions": {
+                    "shape": "PermissionList"
+                }
+            }
+        },
+        "PrincipalPermissionsList": {
+            "type": "list",
+            "member": {
+                "shape": "PrincipalPermissions"
+            }
+        },
+        "PromptString": {
+            "type": "string",
+            "max": 30720,
+            "min": 1
+        },
+        "PropertiesMap": {
+            "type": "map",
+            "key": {
+                "shape": "PropertyName"
+            },
+            "value": {
+                "shape": "Property"
+            }
+        },
+        "Property": {
+            "type": "structure",
+            "members": {
+                "Name": {
+                    "shape": "PropertyName"
+                },
+                "DisplayName": {
+                    "shape": "PropertyName"
+                },
+                "Description": {
+                    "shape": "PropertyDescriptionString"
+                },
+                "DataType": {
+                    "shape": "DataType"
+                },
+                "Required": {
+                    "shape": "Bool"
+                },
+                "ConditionallyRequired": {
+                    "shape": "ConditionStatements"
+                },
+                "DefaultValue": {
+                    "shape": "String"
+                },
+                "Phase": {
+                    "shape": "Phase"
+                },
+                "PropertyTypes": {
+                    "shape": "PropertyTypes"
+                },
+                "AllowedValues": {
+                    "shape": "AllowedValues"
+                },
+                "Validations": {
+                    "shape": "Validations"
+                },
+                "DataOperationScopes": {
+                    "shape": "DataOperations"
+                },
+                "Order": {
+                    "shape": "PrimitiveInteger"
+                },
+                "DocumentationUrl": {
+                    "shape": "String"
+                },
+                "Reference": {
+                    "shape": "String"
+                },
+                "Format": {
+                    "shape": "String"
+                }
+            }
+        },
+        "PropertyDescriptionString": {
+            "type": "string",
+            "max": 1024,
+            "min": 0
+        },
+        "PropertyName": {
+            "type": "string",
+            "max": 128,
+            "min": 1
+        },
+        "PropertyNameOverrides": {
+            "type": "map",
+            "key": {
+                "shape": "PropertyName"
+            },
+            "value": {
+                "shape": "PropertyName"
+            }
+        },
+        "PropertyType": {
+            "type": "string",
+            "enum": ["USER_INPUT", "SECRET", "READ_ONLY", "UNUSED"]
+        },
+        "PropertyTypes": {
+            "type": "list",
+            "member": {
+                "shape": "PropertyType"
+            }
+        },
+        "Record": {
+            "type": "structure",
+            "members": {},
+            "document": true,
+            "sensitive": true
+        },
+        "Records": {
+            "type": "list",
+            "member": {
+                "shape": "Record"
+            }
+        },
+        "RequestContextKey": {
+            "type": "string",
+            "max": 1024,
+            "min": 1
+        },
+        "RequestContextMap": {
+            "type": "map",
+            "key": {
+                "shape": "RequestContextKey"
+            },
+            "value": {
+                "shape": "RequestContextValue"
+            },
+            "max": 50,
+            "min": 0
+        },
+        "RequestContextValue": {
+            "type": "string",
+            "max": 10240,
+            "min": 0
+        },
+        "ResourceAction": {
+            "type": "string",
+            "enum": ["CREATE", "UPDATE"]
+        },
+        "ResourceArnString": {
+            "type": "string"
+        },
+        "ResourceNotReadyException": {
+            "type": "structure",
+            "members": {
+                "message": {
+                    "shape": "String"
+                }
+            },
+            "exception": true
+        },
+        "ResourceState": {
+            "type": "string",
+            "enum": ["QUEUED", "IN_PROGRESS", "SUCCESS", "STOPPED", "FAILED"]
+        },
+        "SchemaId": {
+            "type": "structure",
+            "members": {
+                "SchemaArn": {
+                    "shape": "GlueResourceArn"
+                },
+                "SchemaName": {
+                    "shape": "SchemaRegistryNameString"
+                },
+                "RegistryName": {
+                    "shape": "SchemaRegistryNameString"
+                }
+            }
+        },
+        "SchemaReference": {
+            "type": "structure",
+            "members": {
+                "SchemaId": {
+                    "shape": "SchemaId"
+                },
+                "SchemaVersionId": {
+                    "shape": "SchemaVersionIdString"
+                },
+                "SchemaVersionNumber": {
+                    "shape": "VersionLongNumber"
+                }
+            }
+        },
+        "SchemaRegistryNameString": {
+            "type": "string",
+            "max": 255,
+            "min": 1,
+            "pattern": ".*[a-zA-Z0-9-_$#.]+.*"
+        },
+        "SchemaVersionIdString": {
+            "type": "string",
+            "max": 36,
+            "min": 36,
+            "pattern": ".*[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}.*"
+        },
+        "ScopeString": {
+            "type": "string",
+            "max": 25,
+            "min": 25
+        },
+        "ScriptLocationString": {
+            "type": "string",
+            "max": 400000,
+            "min": 0
+        },
+        "SelectedFields": {
+            "type": "list",
+            "member": {
+                "shape": "EntityFieldName"
+            }
+        },
+        "SerDeInfo": {
+            "type": "structure",
+            "members": {
+                "Name": {
+                    "shape": "NameString"
+                },
+                "SerializationLibrary": {
+                    "shape": "NameString"
+                },
+                "Parameters": {
+                    "shape": "ParametersMap"
+                }
+            }
+        },
+        "SkewedInfo": {
+            "type": "structure",
+            "members": {
+                "SkewedColumnNames": {
+                    "shape": "NameStringList"
+                },
+                "SkewedColumnValues": {
+                    "shape": "ColumnValueStringList"
+                },
+                "SkewedColumnValueLocationMaps": {
+                    "shape": "LocationMap"
+                }
+            }
+        },
+        "SourceUrlList": {
+            "type": "list",
+            "member": {
+                "shape": "HashString"
+            },
+            "max": 3,
+            "min": 1
+        },
+        "StagingConfiguration": {
+            "type": "structure",
+            "members": {
+                "OutputLocation": {
+                    "shape": "OutputLocation"
+                }
+            }
+        },
+        "StartCompletionContext": {
+            "type": "list",
+            "member": {
+                "shape": "StartCompletionContextItem"
+            }
+        },
+        "StartCompletionContextItem": {
+            "type": "map",
+            "key": {
+                "shape": "HashString"
+            },
+            "value": {
+                "shape": "HashString"
+            }
+        },
+        "StartCompletionRequest": {
+            "type": "structure",
+            "required": ["Prompt"],
+            "members": {
+                "Prompt": {
+                    "shape": "PromptString"
+                },
+                "Tags": {
+                    "shape": "TagsMap"
+                },
+                "Context": {
+                    "shape": "StartCompletionContext"
+                }
+            }
+        },
+        "StartCompletionResponse": {
+            "type": "structure",
+            "required": ["CompletionId", "ConversationId"],
+            "members": {
+                "CompletionId": {
+                    "shape": "CompletionIdString"
+                },
+                "ConversationId": {
+                    "shape": "CompletionIdString"
+                }
+            }
+        },
+        "StatusDetails": {
+            "type": "structure",
+            "members": {
+                "RequestedChange": {
+                    "shape": "Table"
+                },
+                "ViewValidations": {
+                    "shape": "ViewValidationList"
+                }
+            }
+        },
+        "StorageDescriptor": {
+            "type": "structure",
+            "members": {
+                "Columns": {
+                    "shape": "ColumnList"
+                },
+                "Location": {
+                    "shape": "LocationString"
+                },
+                "AdditionalLocations": {
+                    "shape": "LocationStringList"
+                },
+                "InputFormat": {
+                    "shape": "FormatString"
+                },
+                "OutputFormat": {
+                    "shape": "FormatString"
+                },
+                "Compressed": {
+                    "shape": "Boolean"
+                },
+                "NumberOfBuckets": {
+                    "shape": "Integer"
+                },
+                "SerDeInfo": {
+                    "shape": "SerDeInfo"
+                },
+                "BucketColumns": {
+                    "shape": "NameStringList"
+                },
+                "SortColumns": {
+                    "shape": "OrderList"
+                },
+                "Parameters": {
+                    "shape": "ParametersMap"
+                },
+                "SkewedInfo": {
+                    "shape": "SkewedInfo"
+                },
+                "StoredAsSubDirectories": {
+                    "shape": "Boolean"
+                },
+                "SchemaReference": {
+                    "shape": "SchemaReference"
+                }
+            }
+        },
+        "String": {
+            "type": "string"
+        },
+        "Table": {
+            "type": "structure",
+            "required": ["Name"],
+            "members": {
+                "Name": {
+                    "shape": "NameString"
+                },
+                "DatabaseName": {
+                    "shape": "NameString"
+                },
+                "Description": {
+                    "shape": "DescriptionString"
+                },
+                "Owner": {
+                    "shape": "NameString"
+                },
+                "CreateTime": {
+                    "shape": "Timestamp"
+                },
+                "UpdateTime": {
+                    "shape": "Timestamp"
+                },
+                "LastAccessTime": {
+                    "shape": "Timestamp"
+                },
+                "LastAnalyzedTime": {
+                    "shape": "Timestamp"
+                },
+                "Retention": {
+                    "shape": "NonNegativeInteger"
+                },
+                "StorageDescriptor": {
+                    "shape": "StorageDescriptor"
+                },
+                "PartitionKeys": {
+                    "shape": "ColumnList"
+                },
+                "ViewOriginalText": {
+                    "shape": "ViewTextString"
+                },
+                "ViewExpandedText": {
+                    "shape": "ViewTextString"
+                },
+                "TableType": {
+                    "shape": "TableTypeString"
+                },
+                "Parameters": {
+                    "shape": "ParametersMap"
+                },
+                "DataParameters": {
+                    "shape": "BlobParametersMap"
+                },
+                "CreatedBy": {
+                    "shape": "NameString"
+                },
+                "IsRegisteredWithLakeFormation": {
+                    "shape": "Boolean"
+                },
+                "LakeFormationPermissionEnforced": {
+                    "shape": "LakeFormationPermissionEnforcedEnum"
+                },
+                "DataAccessMode": {
+                    "shape": "DataAccessModeEnum"
+                },
+                "TargetTable": {
+                    "shape": "TableIdentifier"
+                },
+                "FederatedTable": {
+                    "shape": "FederatedTable"
+                },
+                "CatalogId": {
+                    "shape": "CatalogIdString"
+                },
+                "IsRowFilteringEnabled": {
+                    "shape": "Boolean"
+                },
+                "VersionId": {
+                    "shape": "VersionString"
+                },
+                "CatalogIdentifier": {
+                    "shape": "CatalogIdentifier"
+                },
+                "TableId": {
+                    "shape": "TableIdString"
+                },
+                "DatabaseId": {
+                    "shape": "DatabaseIdString"
+                },
+                "ViewDefinition": {
+                    "shape": "ViewDefinition"
+                },
+                "DataProvider": {
+                    "shape": "NameString"
+                },
+                "IsMultiDialectView": {
+                    "shape": "Boolean"
+                },
+                "Status": {
+                    "shape": "TableStatus"
+                }
+            }
+        },
+        "TableAttributes": {
+            "type": "string",
+            "enum": ["NAME", "VERSION_ID", "DATA_ACCESS_MODE", "DEFAULT", "ALL", "TABLE_TYPE", "DESCRIPTION"]
+        },
+        "TableAttributesList": {
+            "type": "list",
+            "member": {
+                "shape": "TableAttributes"
+            }
+        },
+        "TableIdString": {
+            "type": "string",
+            "max": 100,
+            "min": 0,
+            "pattern": ".*[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\t]*.*"
+        },
+        "TableIdentifier": {
+            "type": "structure",
+            "members": {
+                "CatalogId": {
+                    "shape": "CatalogIdString"
+                },
+                "DatabaseName": {
+                    "shape": "NameString"
+                },
+                "Name": {
+                    "shape": "NameString"
+                },
+                "Region": {
+                    "shape": "NameString"
+                },
+                "DatabaseId": {
+                    "shape": "DatabaseIdString"
+                }
+            }
+        },
+        "TableStatus": {
+            "type": "structure",
+            "members": {
+                "RequestedBy": {
+                    "shape": "NameString"
+                },
+                "UpdatedBy": {
+                    "shape": "NameString"
+                },
+                "RequestTime": {
+                    "shape": "Timestamp"
+                },
+                "UpdateTime": {
+                    "shape": "Timestamp"
+                },
+                "Action": {
+                    "shape": "ResourceAction"
+                },
+                "State": {
+                    "shape": "ResourceState"
+                },
+                "Error": {
+                    "shape": "ErrorDetail"
+                },
+                "Details": {
+                    "shape": "StatusDetails"
+                }
+            }
+        },
+        "TableTypeString": {
+            "type": "string",
+            "max": 255,
+            "min": 0
+        },
+        "TagKey": {
+            "type": "string",
+            "max": 128,
+            "min": 1
+        },
+        "TagValue": {
+            "type": "string",
+            "max": 256,
+            "min": 0
+        },
+        "TagsMap": {
+            "type": "map",
+            "key": {
+                "shape": "TagKey"
+            },
+            "value": {
+                "shape": "TagValue"
+            },
+            "max": 50,
+            "min": 0
+        },
+        "TargetCatalog": {
+            "type": "structure",
+            "members": {
+                "CatalogArn": {
+                    "shape": "ResourceArnString"
+                },
+                "CatalogIdentifier": {
+                    "shape": "CatalogIdentifier"
+                },
+                "AutoDiscovery": {
+                    "shape": "Boolean"
+                }
+            }
+        },
+        "Timeout": {
+            "type": "integer",
+            "box": true
+        },
+        "Timestamp": {
+            "type": "timestamp"
+        },
+        "TimestampValue": {
+            "type": "timestamp"
+        },
+        "TransactionIdString": {
+            "type": "string",
+            "max": 255,
+            "min": 1,
+            "pattern": ".*[\\p{L}\\p{N}\\p{P}]*.*"
+        },
+        "TypeString": {
+            "type": "string",
+            "max": 20000,
+            "min": 0,
+            "pattern": ".*[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\t]*.*"
+        },
+        "UpgradeAnalysisMetadata": {
+            "type": "structure",
+            "members": {
+                "ValidationJobRunId": {
+                    "shape": "NameString"
+                },
+                "GlueVersion": {
+                    "shape": "NameString"
+                },
+                "ScriptLocation": {
+                    "shape": "ScriptLocationString"
+                },
+                "AnalysisId": {
+                    "shape": "IdString"
+                }
+            }
+        },
+        "UrlString": {
+            "type": "string"
+        },
+        "Validation": {
+            "type": "structure",
+            "members": {
+                "ValidationType": {
+                    "shape": "ValidationType"
+                },
+                "Patterns": {
+                    "shape": "ListOfString"
+                },
+                "Description": {
+                    "shape": "ValidationDescriptionString"
+                },
+                "MaxLength": {
+                    "shape": "Maximum"
+                },
+                "Maximum": {
+                    "shape": "Maximum"
+                },
+                "Minimum": {
+                    "shape": "Minimum"
+                }
+            }
+        },
+        "ValidationDescriptionString": {
+            "type": "string",
+            "max": 1024,
+            "min": 0
+        },
+        "ValidationDryRunOpts": {
+            "type": "structure",
+            "members": {
+                "SerializedMockEngineResult": {
+                    "shape": "String"
+                },
+                "ErrorMessage": {
+                    "shape": "String"
+                },
+                "MinimumReceiveCount": {
+                    "shape": "Integer"
+                }
+            }
+        },
+        "ValidationException": {
+            "type": "structure",
+            "members": {
+                "message": {
+                    "shape": "String"
+                }
+            },
+            "documentation": "<p>This exception occurs when the dag cannot be successfully validated</p>",
+            "exception": true
+        },
+        "ValidationType": {
+            "type": "string",
+            "enum": ["REGEX", "RANGE"]
+        },
+        "Validations": {
+            "type": "list",
+            "member": {
+                "shape": "Validation"
+            }
+        },
+        "Vendor": {
+            "type": "string",
+            "max": 128,
+            "min": 1
+        },
+        "VersionLongNumber": {
+            "type": "long",
+            "box": true,
+            "max": 100000,
+            "min": 1
+        },
+        "VersionString": {
+            "type": "string",
+            "max": 255,
+            "min": 1,
+            "pattern": ".*[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\t]*.*"
+        },
+        "ViewDefinition": {
+            "type": "structure",
+            "members": {
+                "IsProtected": {
+                    "shape": "Boolean"
+                },
+                "Definer": {
+                    "shape": "ArnString"
+                },
+                "SubObjects": {
+                    "shape": "ViewSubObjectsList"
+                },
+                "Representations": {
+                    "shape": "ViewRepresentationList"
+                }
+            }
+        },
+        "ViewDialect": {
+            "type": "string",
+            "enum": ["REDSHIFT", "ATHENA", "SPARK"]
+        },
+        "ViewDialectVersionString": {
+            "type": "string",
+            "max": 255,
+            "min": 1,
+            "pattern": ".*[a-zA-Z0-9_.-]+.*"
+        },
+        "ViewRepresentation": {
+            "type": "structure",
+            "members": {
+                "Dialect": {
+                    "shape": "ViewDialect"
+                },
+                "DialectVersion": {
+                    "shape": "ViewDialectVersionString"
+                },
+                "ViewOriginalText": {
+                    "shape": "ViewTextString"
+                },
+                "ViewExpandedText": {
+                    "shape": "ViewTextString"
+                },
+                "ValidationConnection": {
+                    "shape": "NameString"
+                },
+                "IsStale": {
+                    "shape": "Boolean"
+                },
+                "ValidationDryRunOpts": {
+                    "shape": "ValidationDryRunOpts"
+                }
+            }
+        },
+        "ViewRepresentationList": {
+            "type": "list",
+            "member": {
+                "shape": "ViewRepresentation"
+            },
+            "max": 1000,
+            "min": 1
+        },
+        "ViewSubObjectsList": {
+            "type": "list",
+            "member": {
+                "shape": "ArnString"
+            },
+            "max": 10,
+            "min": 0
+        },
+        "ViewTextString": {
+            "type": "string",
+            "max": 409600,
+            "min": 0
+        },
+        "ViewValidation": {
+            "type": "structure",
+            "members": {
+                "Dialect": {
+                    "shape": "ViewDialect"
+                },
+                "DialectVersion": {
+                    "shape": "ViewDialectVersionString"
+                },
+                "ViewValidationText": {
+                    "shape": "ViewTextString"
+                },
+                "UpdateTime": {
+                    "shape": "Timestamp"
+                },
+                "State": {
+                    "shape": "ResourceState"
+                },
+                "Error": {
+                    "shape": "ErrorDetail"
+                }
+            }
+        },
+        "ViewValidationList": {
+            "type": "list",
+            "member": {
+                "shape": "ViewValidation"
+            }
+        },
+        "WorkerType": {
+            "type": "string",
+            "enum": ["Standard", "G_1X", "G_2X", "G_4X", "G_8X", "G_025X", "Z_2X"]
+        },
+        "completedOn": {
+            "type": "long",
+            "box": true
+        },
+        "lastModifiedOn": {
+            "type": "long",
+            "box": true
+        },
+        "startedOn": {
+            "type": "long",
+            "box": true
+        }
+    }
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/shared/client/s3Client.ts b/packages/core/src/sagemakerunifiedstudio/shared/client/s3Client.ts
new file mode 100644
index 00000000000..d86c3904a07
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/shared/client/s3Client.ts
@@ -0,0 +1,147 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { S3 } from '@aws-sdk/client-s3'
+import { getLogger } from '../../../shared/logger/logger'
+import { ConnectionCredentialsProvider } from '../../auth/providers/connectionCredentialsProvider'
+
+/**
+ * Represents an S3 path (bucket or prefix)
+ */
+export interface S3Path {
+    bucket: string
+    prefix?: string
+    displayName: string
+    isFolder: boolean
+    size?: number
+    lastModified?: Date
+}
+
+/**
+ * Client for interacting with AWS S3 API using project credentials
+ */
+export class S3Client {
+    private s3Client: S3 | undefined
+    private readonly logger = getLogger()
+
+    constructor(
+        private readonly region: string,
+        private readonly connectionCredentialsProvider: ConnectionCredentialsProvider
+    ) {}
+
+    /**
+     * Lists S3 paths (folders and objects) using prefix-based navigation
+     * Uses S3's hierarchical folder-like structure by leveraging prefixes and delimiters
+     * @param bucket S3 bucket name to list objects from
+     * @param prefix Optional prefix to filter objects (acts like a folder path)
+     * @param continuationToken Optional continuation token for pagination
+     * @returns Object containing paths and nextToken for pagination
+     */
+    public async listPaths(
+        bucket: string,
+        prefix?: string,
+        continuationToken?: string
+    ): Promise<{ paths: S3Path[]; nextToken?: string }> {
+        try {
+            this.logger.info(`S3Client: Listing paths in bucket ${bucket} with prefix ${prefix || 'root'}`)
+
+            const s3Client = await this.getS3Client()
+
+            // Call S3 ListObjectsV2 API with delimiter to simulate folder structure
+            // Delimiter '/' treats forward slashes as folder separators
+            // This returns both CommonPrefixes (folders) and Contents (files)
+            const response = await s3Client.listObjectsV2({
+                Bucket: bucket,
+                Prefix: prefix, // Filter objects that start with this prefix
+                Delimiter: '/', // Treat '/' as folder separator for hierarchical listing
+                ContinuationToken: continuationToken, // For pagination
+            })
+
+            const paths: S3Path[] = []
+
+            // Process CommonPrefixes - these represent "folders" in S3
+            // CommonPrefixes are object keys that share a common prefix up to the delimiter
+            if (response.CommonPrefixes) {
+                for (const commonPrefix of response.CommonPrefixes) {
+                    if (commonPrefix.Prefix) {
+                        // Extract folder name by removing the parent prefix and trailing slash
+                        // Example: if prefix="folder1/" and commonPrefix="folder1/subfolder/"
+                        // folderName becomes "subfolder"
+                        const folderName = commonPrefix.Prefix.replace(prefix || '', '').replace('/', '')
+                        paths.push({
+                            bucket,
+                            prefix: commonPrefix.Prefix, // Full S3 prefix for this folder
+                            displayName: folderName, // Human-readable folder name
+                            isFolder: true, // Mark as folder for UI rendering
+                        })
+                    }
+                }
+            }
+
+            // Process Contents - these represent actual S3 objects (files)
+            if (response.Contents) {
+                for (const object of response.Contents) {
+                    // Skip if no key or if key matches the prefix exactly (folder itself)
+                    if (object.Key && object.Key !== prefix) {
+                        // Extract file name by removing the parent prefix
+                        // Example: if prefix="folder1/" and object.Key="folder1/file.txt"
+                        // fileName becomes "file.txt"
+                        const fileName = object.Key.replace(prefix || '', '')
+
+                        // Only include actual files (not folder markers ending with '/')
+                        if (fileName && !fileName.endsWith('/')) {
+                            paths.push({
+                                bucket,
+                                prefix: object.Key, // Full S3 object key
+                                displayName: fileName, // Human-readable file name
+                                isFolder: false, // Mark as file for UI rendering
+                                size: object.Size, // File size in bytes
+                                lastModified: object.LastModified, // Last modification timestamp
+                            })
+                        }
+                    }
+                }
+            }
+
+            this.logger.info(`S3Client: Found ${paths.length} paths in bucket ${bucket}`)
+            return {
+                paths,
+                nextToken: response.NextContinuationToken,
+            }
+        } catch (err) {
+            this.logger.error('S3Client: Failed to list paths: %s', err as Error)
+            throw err
+        }
+    }
+
+    /**
+     * Gets the S3 client, initializing it if necessary
+     */
+    private async getS3Client(): Promise<S3> {
+        if (!this.s3Client) {
+            try {
+                const credentialsProvider = async () => {
+                    const credentials = await this.connectionCredentialsProvider.getCredentials()
+                    return {
+                        accessKeyId: credentials.accessKeyId,
+                        secretAccessKey: credentials.secretAccessKey,
+                        sessionToken: credentials.sessionToken,
+                        expiration: credentials.expiration,
+                    }
+                }
+
+                this.s3Client = new S3({
+                    region: this.region,
+                    credentials: credentialsProvider,
+                })
+                this.logger.debug('S3Client: Successfully created S3 client')
+            } catch (err) {
+                this.logger.error('S3Client: Failed to create S3 client: %s', err as Error)
+                throw err
+            }
+        }
+        return this.s3Client
+    }
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/shared/client/sqlWorkbenchClient.ts b/packages/core/src/sagemakerunifiedstudio/shared/client/sqlWorkbenchClient.ts
new file mode 100644
index 00000000000..5513f139d2b
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/shared/client/sqlWorkbenchClient.ts
@@ -0,0 +1,318 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Service } from 'aws-sdk'
+import { ServiceConfigurationOptions } from 'aws-sdk/lib/service'
+import globals from '../../../shared/extensionGlobals'
+import { getLogger } from '../../../shared/logger/logger'
+import * as SQLWorkbench from './sqlworkbench'
+import apiConfig = require('./sqlworkbench.json')
+import { v4 as uuidv4 } from 'uuid'
+import { getRedshiftTypeFromHost } from '../../explorer/nodes/utils'
+import { DatabaseIntegrationConnectionAuthenticationTypes, RedshiftType } from '../../explorer/nodes/types'
+import { ConnectionCredentialsProvider } from '../../auth/providers/connectionCredentialsProvider'
+import { adaptConnectionCredentialsProvider } from './credentialsAdapter'
+
+/**
+ * Connection configuration for SQL Workbench
+ */
+export interface ConnectionConfig {
+    id: string
+    type: string
+    databaseType: string
+    connectableResourceIdentifier: string
+    connectableResourceType: string
+    database: string
+    auth?: {
+        secretArn?: string
+    }
+}
+
+/**
+ * Resource parent information
+ */
+export interface ParentResource {
+    parentId: string
+    parentType: string
+}
+
+/**
+ * Gets a SQL Workbench ARN
+ * @param region AWS region
+ * @param accountId Optional AWS account ID (will be determined if not provided)
+ * @returns SQL Workbench ARN
+ */
+export async function generateSqlWorkbenchArn(region: string, accountId: string): Promise<string> {
+    return `arn:aws:sqlworkbench:${region}:${accountId}:connection/${uuidv4()}`
+}
+
+/**
+ * Creates a connection configuration for Redshift
+ */
+export async function createRedshiftConnectionConfig(
+    host: string,
+    database: string,
+    accountId: string,
+    region: string,
+    secretArn?: string,
+    isGlueCatalogDatabase?: boolean
+): Promise<ConnectionConfig> {
+    // Get Redshift deployment type from host
+    const redshiftDeploymentType = getRedshiftTypeFromHost(host)
+
+    // Extract resource identifier from host
+    const resourceIdentifier = host.split('.')[0]
+
+    if (!resourceIdentifier) {
+        throw new Error('Resource identifier could not be determined from host')
+    }
+
+    // Create connection ID using the proper ARN format
+    const connectionId = await generateSqlWorkbenchArn(region, accountId)
+
+    // Determine if serverless or cluster based on deployment type
+    const isServerless =
+        redshiftDeploymentType === RedshiftType.Serverless ||
+        redshiftDeploymentType === RedshiftType.ServerlessDev ||
+        redshiftDeploymentType === RedshiftType.ServerlessQA
+
+    const isCluster =
+        redshiftDeploymentType === RedshiftType.Cluster ||
+        redshiftDeploymentType === RedshiftType.ClusterDev ||
+        redshiftDeploymentType === RedshiftType.ClusterQA
+
+    // Validate the Redshift type
+    if (!isServerless && !isCluster) {
+        throw new Error(`Unsupported Redshift type for host: ${host}`)
+    }
+
+    // Determine auth type based on the provided parameters
+    let authType: string
+
+    if (secretArn) {
+        authType = DatabaseIntegrationConnectionAuthenticationTypes.SECRET
+    } else if (isCluster) {
+        authType = DatabaseIntegrationConnectionAuthenticationTypes.TEMPORARY_CREDENTIALS_WITH_IAM
+    } else {
+        // For serverless
+        authType = DatabaseIntegrationConnectionAuthenticationTypes.FEDERATED
+    }
+
+    // Enforce specific authentication type for S3Table/RedLake databases
+    if (isGlueCatalogDatabase) {
+        authType = isServerless
+            ? DatabaseIntegrationConnectionAuthenticationTypes.FEDERATED
+            : DatabaseIntegrationConnectionAuthenticationTypes.TEMPORARY_CREDENTIALS_WITH_IAM
+    }
+
+    // Create the connection configuration
+    const connectionConfig: ConnectionConfig = {
+        id: connectionId,
+        type: authType,
+        databaseType: 'REDSHIFT',
+        connectableResourceIdentifier: resourceIdentifier,
+        connectableResourceType: isServerless ? 'WORKGROUP' : 'CLUSTER',
+        database: database,
+    }
+
+    // Add auth object for SECRET authentication type
+    if (
+        (authType as DatabaseIntegrationConnectionAuthenticationTypes) ===
+            DatabaseIntegrationConnectionAuthenticationTypes.SECRET &&
+        secretArn
+    ) {
+        connectionConfig.auth = { secretArn }
+    }
+
+    return connectionConfig
+}
+
+/**
+ * Client for interacting with SQL Workbench API
+ */
+export class SQLWorkbenchClient {
+    private sqlClient: SQLWorkbench | undefined
+    private static instance: SQLWorkbenchClient | undefined
+    private readonly logger = getLogger()
+
+    private constructor(
+        private readonly region: string,
+        private readonly connectionCredentialsProvider?: ConnectionCredentialsProvider
+    ) {}
+
+    /**
+     * Gets a singleton instance of the SQLWorkbenchClient
+     * @returns SQLWorkbenchClient instance
+     */
+    public static getInstance(region: string): SQLWorkbenchClient {
+        if (!SQLWorkbenchClient.instance) {
+            SQLWorkbenchClient.instance = new SQLWorkbenchClient(region)
+        }
+        return SQLWorkbenchClient.instance
+    }
+
+    /**
+     * Creates a new SQLWorkbenchClient instance with specific credentials
+     * @param region AWS region
+     * @param connectionCredentialsProvider ConnectionCredentialsProvider
+     * @returns SQLWorkbenchClient instance with credentials provider
+     */
+    public static createWithCredentials(
+        region: string,
+        connectionCredentialsProvider: ConnectionCredentialsProvider
+    ): SQLWorkbenchClient {
+        return new SQLWorkbenchClient(region, connectionCredentialsProvider)
+    }
+
+    /**
+     * Gets the AWS region
+     * @returns AWS region
+     */
+    public getRegion(): string {
+        return this.region
+    }
+
+    /**
+     * Gets resources from SQL Workbench
+     * @param params Request parameters
+     * @returns Raw response from getResources API
+     */
+    public async getResources(params: {
+        connection: ConnectionConfig
+        resourceType: string
+        includeChildren?: boolean
+        maxItems?: number
+        parents?: ParentResource[]
+        pageToken?: string
+        forceRefresh?: boolean
+    }): Promise<SQLWorkbench.GetResourcesResponse> {
+        try {
+            this.logger.info(`SQLWorkbenchClient: Getting resources in region ${this.region}`)
+
+            const sqlClient = await this.getSQLClient()
+
+            const requestParams = {
+                connection: params.connection,
+                type: params.resourceType,
+                maxItems: params.maxItems || 100,
+                parents: params.parents || [],
+                pageToken: params.pageToken,
+                forceRefresh: params.forceRefresh || true,
+                accountSettings: {},
+            }
+
+            // Call the GetResources API
+            const response = await sqlClient.getResources(requestParams).promise()
+
+            return {
+                resources: response.resources || [],
+                nextToken: response.nextToken,
+            }
+        } catch (err) {
+            this.logger.error('SQLWorkbenchClient: Failed to get resources: %s', err as Error)
+            throw err
+        }
+    }
+
+    /**
+     * Execute a SQL query
+     * @param connectionConfig Connection configuration
+     * @param query SQL query to execute
+     * @returns Query execution ID
+     */
+    public async executeQuery(connectionConfig: ConnectionConfig, query: string): Promise<string | undefined> {
+        try {
+            this.logger.info(`SQLWorkbenchClient: Executing query in region ${this.region}`)
+
+            const sqlClient = await this.getSQLClient()
+
+            // Call the ExecuteQuery API
+            const response = await sqlClient
+                .executeQuery({
+                    connection: connectionConfig as any,
+                    databaseType: 'REDSHIFT',
+                    accountSettings: {},
+                    executionContext: [
+                        {
+                            parentType: 'DATABASE',
+                            parentId: connectionConfig.database || '',
+                        },
+                    ],
+                    query,
+                    queryExecutionType: 'NO_SESSION',
+                    queryResponseDeliveryType: 'ASYNC',
+                    maxItems: 100,
+                    ignoreHistory: true,
+                    tabId: 'data_explorer',
+                })
+                .promise()
+
+            // Log the response
+            this.logger.info(
+                `SQLWorkbenchClient: Query execution started with ID: ${response.queryExecutions?.[0]?.queryExecutionId}`
+            )
+
+            return response.queryExecutions?.[0]?.queryExecutionId
+        } catch (err) {
+            this.logger.error('SQLWorkbenchClient: Failed to execute query: %s', err as Error)
+            throw err
+        }
+    }
+
+    /**
+     * Gets the SQL client, initializing it if necessary
+     */
+    /**
+     * Gets the SQL Workbench endpoint URL for the given region
+     * @param region AWS region
+     * @returns SQL Workbench endpoint URL
+     */
+    private getSQLWorkbenchEndpoint(region: string): string {
+        return `https://api-v2.sqlworkbench.${region}.amazonaws.com`
+    }
+
+    private async getSQLClient(): Promise<SQLWorkbench> {
+        if (!this.sqlClient) {
+            try {
+                // Get the endpoint URL for the region
+                const endpoint = this.getSQLWorkbenchEndpoint(this.region)
+                this.logger.info(`Using SQL Workbench endpoint: ${endpoint}`)
+
+                if (this.connectionCredentialsProvider) {
+                    // Create client with provided credentials
+                    this.sqlClient = (await globals.sdkClientBuilder.createAwsService(
+                        Service,
+                        {
+                            apiConfig: apiConfig,
+                            region: this.region,
+                            endpoint: endpoint,
+                            credentialProvider: adaptConnectionCredentialsProvider(this.connectionCredentialsProvider),
+                        } as ServiceConfigurationOptions,
+                        undefined,
+                        false
+                    )) as SQLWorkbench
+                } else {
+                    // Use the SDK client builder for default credentials
+                    this.sqlClient = (await globals.sdkClientBuilder.createAwsService(
+                        Service,
+                        {
+                            apiConfig: apiConfig,
+                            region: this.region,
+                            endpoint: endpoint,
+                        } as ServiceConfigurationOptions,
+                        undefined,
+                        false
+                    )) as SQLWorkbench
+                }
+
+                this.logger.debug('SQLWorkbenchClient: Successfully created SQL client')
+            } catch (err) {
+                this.logger.error('SQLWorkbenchClient: Failed to create SQL client: %s', err as Error)
+                throw err
+            }
+        }
+        return this.sqlClient
+    }
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/shared/client/sqlworkbench.json b/packages/core/src/sagemakerunifiedstudio/shared/client/sqlworkbench.json
new file mode 100644
index 00000000000..e403ec34a88
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/shared/client/sqlworkbench.json
@@ -0,0 +1,2102 @@
+{
+    "version": "2.0",
+    "metadata": {
+        "apiVersion": "2024-02-12",
+        "auth": ["aws.auth#sigv4"],
+        "endpointPrefix": "sqlworkbench",
+        "protocol": "rest-json",
+        "protocols": ["rest-json"],
+        "serviceFullName": "AmazonSQLWorkbench",
+        "serviceId": "SQLWorkbench",
+        "signatureVersion": "v4",
+        "signingName": "sqlworkbench",
+        "uid": "sqlworkbench-2024-02-12"
+    },
+    "operations": {
+        "CancelQueries": {
+            "name": "CancelQueries",
+            "http": {
+                "method": "POST",
+                "requestUri": "/database/cancelQueries",
+                "responseCode": 200
+            },
+            "input": { "shape": "CancelQueriesRequest" },
+            "output": { "shape": "CancelQueriesResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "BadRequestError" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "ServiceQuotaExceededException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "ConflictException" },
+                { "shape": "InternalServerError" },
+                { "shape": "ValidationException" }
+            ]
+        },
+        "CreateConnection": {
+            "name": "CreateConnection",
+            "http": {
+                "method": "PUT",
+                "requestUri": "/connections",
+                "responseCode": 200
+            },
+            "input": { "shape": "CreateConnectionRequest" },
+            "output": { "shape": "CreateConnectionResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "ServiceQuotaExceededException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "ConflictException" },
+                { "shape": "InternalServerError" },
+                { "shape": "ValidationException" }
+            ]
+        },
+        "DeleteConnection": {
+            "name": "DeleteConnection",
+            "http": {
+                "method": "DELETE",
+                "requestUri": "/connections/{connectionId}",
+                "responseCode": 200
+            },
+            "input": { "shape": "DeleteConnectionRequest" },
+            "output": { "shape": "DeleteConnectionResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "ServiceQuotaExceededException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "ConflictException" },
+                { "shape": "InternalServerError" },
+                { "shape": "ValidationException" }
+            ]
+        },
+        "ExecuteQuery": {
+            "name": "ExecuteQuery",
+            "http": {
+                "method": "POST",
+                "requestUri": "/database/executeQuery",
+                "responseCode": 200
+            },
+            "input": { "shape": "ExecuteQueryRequest" },
+            "output": { "shape": "ExecuteQueryResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "BadRequestError" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "ServiceQuotaExceededException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "ConflictException" },
+                { "shape": "InternalServerError" },
+                { "shape": "ValidationException" }
+            ]
+        },
+        "ExportQueryResults": {
+            "name": "ExportQueryResults",
+            "http": {
+                "method": "POST",
+                "requestUri": "/database/exportResults",
+                "responseCode": 200
+            },
+            "input": { "shape": "ExportQueryResultsRequest" },
+            "output": { "shape": "ExportQueryResultsResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "BadRequestError" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "ServiceQuotaExceededException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "ConflictException" },
+                { "shape": "InternalServerError" },
+                { "shape": "ValidationException" }
+            ]
+        },
+        "GetConnectableResources": {
+            "name": "GetConnectableResources",
+            "http": {
+                "method": "POST",
+                "requestUri": "/database/getConnectableResources",
+                "responseCode": 200
+            },
+            "input": { "shape": "GetConnectableResourcesRequest" },
+            "output": { "shape": "GetConnectableResourcesResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "BadRequestError" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "ServiceQuotaExceededException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "ConflictException" },
+                { "shape": "InternalServerError" },
+                { "shape": "ValidationException" }
+            ]
+        },
+        "GetConnection": {
+            "name": "GetConnection",
+            "http": {
+                "method": "GET",
+                "requestUri": "/connections/{connectionId}",
+                "responseCode": 200
+            },
+            "input": { "shape": "GetConnectionRequest" },
+            "output": { "shape": "GetConnectionResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "ServiceQuotaExceededException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "ConflictException" },
+                { "shape": "InternalServerError" },
+                { "shape": "ValidationException" }
+            ]
+        },
+        "GetDatabaseConfigurations": {
+            "name": "GetDatabaseConfigurations",
+            "http": {
+                "method": "POST",
+                "requestUri": "/database/configurations",
+                "responseCode": 200
+            },
+            "input": { "shape": "GetDatabaseConfigurationsRequest" },
+            "output": { "shape": "GetDatabaseConfigurationsResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "BadRequestError" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "ServiceQuotaExceededException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "ConflictException" },
+                { "shape": "InternalServerError" },
+                { "shape": "ValidationException" }
+            ]
+        },
+        "GetQueryExecutionHistory": {
+            "name": "GetQueryExecutionHistory",
+            "http": {
+                "method": "POST",
+                "requestUri": "/queryExecutionHistory/details",
+                "responseCode": 200
+            },
+            "input": { "shape": "GetQueryExecutionHistoryRequest" },
+            "output": { "shape": "GetQueryExecutionHistoryResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "BadRequestError" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "ServiceQuotaExceededException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "ConflictException" },
+                { "shape": "InternalServerError" },
+                { "shape": "ValidationException" }
+            ]
+        },
+        "GetQueryResult": {
+            "name": "GetQueryResult",
+            "http": {
+                "method": "POST",
+                "requestUri": "/database/getQueryResults",
+                "responseCode": 200
+            },
+            "input": { "shape": "GetQueryResultRequest" },
+            "output": { "shape": "GetQueryResultResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "BadRequestError" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "ServiceQuotaExceededException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "ConflictException" },
+                { "shape": "InternalServerError" },
+                { "shape": "ValidationException" }
+            ]
+        },
+        "GetResources": {
+            "name": "GetResources",
+            "http": {
+                "method": "POST",
+                "requestUri": "/database/getResources",
+                "responseCode": 200
+            },
+            "input": { "shape": "GetResourcesRequest" },
+            "output": { "shape": "GetResourcesResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "BadRequestError" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "ServiceQuotaExceededException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "ConflictException" },
+                { "shape": "InternalServerError" },
+                { "shape": "ValidationException" }
+            ]
+        },
+        "GetTabStates": {
+            "name": "GetTabStates",
+            "http": {
+                "method": "POST",
+                "requestUri": "/tab/state",
+                "responseCode": 200
+            },
+            "input": { "shape": "GetTabStatesRequest" },
+            "output": { "shape": "GetTabStatesResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "BadRequestError" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "ServiceQuotaExceededException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "ConflictException" },
+                { "shape": "InternalServerError" },
+                { "shape": "ValidationException" }
+            ]
+        },
+        "ListQueryExecutionHistory": {
+            "name": "ListQueryExecutionHistory",
+            "http": {
+                "method": "POST",
+                "requestUri": "/queryExecutionHistory/list",
+                "responseCode": 200
+            },
+            "input": { "shape": "ListQueryExecutionHistoryRequest" },
+            "output": { "shape": "ListQueryExecutionHistoryResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "BadRequestError" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "ServiceQuotaExceededException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "ConflictException" },
+                { "shape": "InternalServerError" },
+                { "shape": "ValidationException" }
+            ]
+        },
+        "ListTagsForResource": {
+            "name": "ListTagsForResource",
+            "http": {
+                "method": "GET",
+                "requestUri": "/tags/{resourceArn}",
+                "responseCode": 200
+            },
+            "input": { "shape": "ListTagsForResourceRequest" },
+            "output": { "shape": "ListTagsForResourceResponse" },
+            "errors": [
+                { "shape": "BadRequestError" },
+                { "shape": "ThrottlingException" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "ServiceQuotaExceededException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "ConflictException" },
+                { "shape": "InternalServerError" },
+                { "shape": "ValidationException" }
+            ]
+        },
+        "PollQueryExecutionEvents": {
+            "name": "PollQueryExecutionEvents",
+            "http": {
+                "method": "POST",
+                "requestUri": "/database/pollQueryExecutionEvents",
+                "responseCode": 200
+            },
+            "input": { "shape": "PollQueryExecutionEventsRequest" },
+            "output": { "shape": "PollQueryExecutionEventsResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "BadRequestError" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "ServiceQuotaExceededException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "ConflictException" },
+                { "shape": "InternalServerError" },
+                { "shape": "ValidationException" }
+            ]
+        },
+        "TagResource": {
+            "name": "TagResource",
+            "http": {
+                "method": "POST",
+                "requestUri": "/tags/{resourceArn}",
+                "responseCode": 204
+            },
+            "input": { "shape": "TagResourceRequest" },
+            "output": { "shape": "TagResourceResponse" },
+            "errors": [
+                { "shape": "BadRequestError" },
+                { "shape": "ThrottlingException" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "ServiceQuotaExceededException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "ConflictException" },
+                { "shape": "InternalServerError" },
+                { "shape": "ValidationException" }
+            ]
+        },
+        "UntagResource": {
+            "name": "UntagResource",
+            "http": {
+                "method": "DELETE",
+                "requestUri": "/tags/{resourceArn}",
+                "responseCode": 204
+            },
+            "input": { "shape": "UntagResourceRequest" },
+            "output": { "shape": "UntagResourceResponse" },
+            "errors": [
+                { "shape": "BadRequestError" },
+                { "shape": "ThrottlingException" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "ServiceQuotaExceededException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "ConflictException" },
+                { "shape": "InternalServerError" },
+                { "shape": "ValidationException" }
+            ],
+            "idempotent": true
+        },
+        "UpdateConnection": {
+            "name": "UpdateConnection",
+            "http": {
+                "method": "POST",
+                "requestUri": "/connections",
+                "responseCode": 200
+            },
+            "input": { "shape": "UpdateConnectionRequest" },
+            "output": { "shape": "UpdateConnectionResponse" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "ServiceQuotaExceededException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "ConflictException" },
+                { "shape": "InternalServerError" },
+                { "shape": "ValidationException" }
+            ]
+        },
+        "VerifyResourcesExistForTagris": {
+            "name": "VerifyResourcesExistForTagris",
+            "http": {
+                "method": "POST",
+                "requestUri": "/verifyResourcesExistForTagris",
+                "responseCode": 200
+            },
+            "input": { "shape": "TagrisVerifyResourcesExistInput" },
+            "output": { "shape": "TagrisVerifyResourcesExistOutput" },
+            "errors": [
+                { "shape": "ThrottlingException" },
+                { "shape": "InternalServerError" },
+                { "shape": "TagrisInvalidParameterException" },
+                { "shape": "TagrisAccessDeniedException" },
+                { "shape": "TagrisInvalidArnException" },
+                { "shape": "ResourceNotFoundException" },
+                { "shape": "TagrisInternalServiceException" },
+                { "shape": "ServiceQuotaExceededException" },
+                { "shape": "AccessDeniedException" },
+                { "shape": "TagrisPartialResourcesExistResultsException" },
+                { "shape": "TagrisThrottledException" },
+                { "shape": "ConflictException" },
+                { "shape": "ValidationException" }
+            ]
+        }
+    },
+    "shapes": {
+        "AccessDeniedException": {
+            "type": "structure",
+            "required": ["message"],
+            "members": {
+                "message": { "shape": "String" },
+                "code": { "shape": "ErrorCode" }
+            },
+            "error": {
+                "httpStatusCode": 403,
+                "senderFault": true
+            },
+            "exception": true
+        },
+        "AckIds": {
+            "type": "list",
+            "member": { "shape": "AckIdsMemberString" }
+        },
+        "AckIdsMemberString": {
+            "type": "string",
+            "max": 100,
+            "min": 0
+        },
+        "Arn": {
+            "type": "string",
+            "max": 1011,
+            "min": 20
+        },
+        "AvailableConnectionConfigurationOptions": {
+            "type": "list",
+            "member": { "shape": "AvailableConnectionConfigurationOptionsMemberString" }
+        },
+        "AvailableConnectionConfigurationOptionsMemberString": {
+            "type": "string",
+            "max": 50,
+            "min": 0
+        },
+        "BadRequestError": {
+            "type": "structure",
+            "required": ["message"],
+            "members": {
+                "message": { "shape": "String" },
+                "code": { "shape": "ErrorCode" }
+            },
+            "error": {
+                "httpStatusCode": 400,
+                "senderFault": true
+            },
+            "exception": true
+        },
+        "Boolean": {
+            "type": "boolean",
+            "box": true
+        },
+        "CancelQueriesRequest": {
+            "type": "structure",
+            "required": ["queryExecutionIds", "databaseType"],
+            "members": {
+                "sqlworkbenchSource": {
+                    "shape": "SqlworkbenchSource",
+                    "location": "header",
+                    "locationName": "sqlworkbench-source"
+                },
+                "accountSettings": { "shape": "DatabaseConnectionAccountSettings" },
+                "queryExecutionIds": { "shape": "CancelQueriesRequestQueryExecutionIdsList" },
+                "databaseType": {
+                    "shape": "DatabaseType",
+                    "location": "querystring",
+                    "locationName": "databaseType"
+                }
+            }
+        },
+        "CancelQueriesRequestQueryExecutionIdsList": {
+            "type": "list",
+            "member": { "shape": "CancelQueriesRequestQueryExecutionIdsListMemberString" },
+            "max": 100,
+            "min": 1
+        },
+        "CancelQueriesRequestQueryExecutionIdsListMemberString": {
+            "type": "string",
+            "max": 100,
+            "min": 1
+        },
+        "CancelQueriesResponse": {
+            "type": "structure",
+            "required": ["cancelQueryResponses"],
+            "members": {
+                "cancelQueryResponses": { "shape": "CancelQueryResponses" }
+            }
+        },
+        "CancelQueryResponse": {
+            "type": "structure",
+            "required": ["queryExecutionId"],
+            "members": {
+                "queryExecutionId": { "shape": "CancelQueryResponseQueryExecutionIdString" },
+                "queryCancellationStatus": { "shape": "QueryCancellationStatus" }
+            }
+        },
+        "CancelQueryResponseQueryExecutionIdString": {
+            "type": "string",
+            "max": 1000,
+            "min": 0
+        },
+        "CancelQueryResponses": {
+            "type": "list",
+            "member": { "shape": "CancelQueryResponse" }
+        },
+        "ChildObjectTypes": {
+            "type": "list",
+            "member": { "shape": "ChildObjectTypesMemberString" }
+        },
+        "ChildObjectTypesMemberString": {
+            "type": "string",
+            "max": 50,
+            "min": 0
+        },
+        "Columns": {
+            "type": "list",
+            "member": { "shape": "QueryResultCellValue" }
+        },
+        "ConflictException": {
+            "type": "structure",
+            "required": ["message"],
+            "members": {
+                "message": { "shape": "String" },
+                "code": { "shape": "ErrorCode" }
+            },
+            "error": {
+                "httpStatusCode": 409,
+                "senderFault": true
+            },
+            "exception": true
+        },
+        "ConnectableResource": {
+            "type": "structure",
+            "required": ["displayName", "identifier", "childObjectTypes", "availableConnectionConfigurationOptions"],
+            "members": {
+                "displayName": { "shape": "ResourceDisplayName" },
+                "identifier": { "shape": "ResourceIdentifier" },
+                "type": { "shape": "ConnectableResourceTypeString" },
+                "unavailable": { "shape": "Boolean" },
+                "tooltipTranslationKey": { "shape": "ConnectableResourceTooltipTranslationKeyString" },
+                "childObjectTypes": { "shape": "ChildObjectTypes" },
+                "availableConnectionConfigurationOptions": { "shape": "AvailableConnectionConfigurationOptions" }
+            }
+        },
+        "ConnectableResourceTooltipTranslationKeyString": {
+            "type": "string",
+            "max": 50,
+            "min": 0
+        },
+        "ConnectableResourceTypeString": {
+            "type": "string",
+            "max": 50,
+            "min": 0
+        },
+        "ConnectableResourceTypes": {
+            "type": "list",
+            "member": { "shape": "ConnectableResourceTypesMemberString" }
+        },
+        "ConnectableResourceTypesMemberString": {
+            "type": "string",
+            "max": 50,
+            "min": 0
+        },
+        "ConnectableResources": {
+            "type": "list",
+            "member": { "shape": "ConnectableResource" }
+        },
+        "Connection": {
+            "type": "structure",
+            "members": {
+                "id": {
+                    "shape": "String",
+                    "documentation": "<p>Id of the connection</p>"
+                },
+                "name": {
+                    "shape": "ConnectionName",
+                    "documentation": "<p>Name of the connection</p>"
+                },
+                "authenticationType": {
+                    "shape": "ConnectionAuthenticationTypes",
+                    "documentation": "<p>Number representing the type of authentication to use (2 = IAM, 3 = Username and Password). Today we only support the types 2 and 3</p>"
+                },
+                "secretArn": {
+                    "shape": "String",
+                    "documentation": "<p>Secret that is linked to this connection</p>"
+                },
+                "databaseName": {
+                    "shape": "DatabaseName",
+                    "documentation": "<p>Name of the database where the query is run</p>"
+                },
+                "clusterId": {
+                    "shape": "String",
+                    "documentation": "<p>Id of the cluster of the connection</p>"
+                },
+                "dbUser": {
+                    "shape": "DbUser",
+                    "documentation": "<p>User of the database</p>"
+                },
+                "isServerless": { "shape": "Boolean" },
+                "isProd": { "shape": "String" },
+                "isEnabled": { "shape": "String" },
+                "userSettings": { "shape": "UserSettings" },
+                "recordDate": { "shape": "String" },
+                "updatedDate": { "shape": "String" },
+                "tags": { "shape": "Tags" },
+                "databaseType": { "shape": "DatabaseType" },
+                "connectableResourceType": { "shape": "String" },
+                "connectableResourceIdentifier": { "shape": "ResourceIdentifier" }
+            }
+        },
+        "ConnectionAuthenticationTypes": {
+            "type": "string",
+            "enum": ["2", "3", "4", "5", "6", "7", "8"],
+            "sensitive": true
+        },
+        "ConnectionName": {
+            "type": "string",
+            "sensitive": true
+        },
+        "ConnectionProperties": {
+            "type": "map",
+            "key": { "shape": "ConnectionPropertyKey" },
+            "value": { "shape": "ConnectionPropertyValue" },
+            "max": 50,
+            "min": 1
+        },
+        "ConnectionPropertyKey": {
+            "type": "string",
+            "max": 1000,
+            "min": 1
+        },
+        "ConnectionPropertyValue": {
+            "type": "string",
+            "max": 1000,
+            "min": 0
+        },
+        "CreateConnectionRequest": {
+            "type": "structure",
+            "required": ["name", "databaseName", "authenticationType"],
+            "members": {
+                "sqlworkbenchSource": {
+                    "shape": "SqlworkbenchSource",
+                    "location": "header",
+                    "locationName": "sqlworkbench-source"
+                },
+                "name": {
+                    "shape": "CreateConnectionRequestNameString",
+                    "documentation": "<p>Name of the connection</p>"
+                },
+                "databaseName": {
+                    "shape": "CreateConnectionRequestDatabaseNameString",
+                    "documentation": "<p>Name of the database used for this connection</p>"
+                },
+                "authenticationType": {
+                    "shape": "CreateConnectionRequestAuthenticationTypeEnum",
+                    "documentation": "<p>Number representing the type of authentication to use (2 = IAM, 3 = Username and Password, 4 = Federated connection)</p>"
+                },
+                "isProd": { "shape": "CreateConnectionRequestIsProdString" },
+                "userSettings": { "shape": "UserSettings" },
+                "secretArn": {
+                    "shape": "CreateConnectionRequestSecretArnString",
+                    "documentation": "<p>secretArn for redshift cluster</p>"
+                },
+                "clusterId": {
+                    "shape": "CreateConnectionRequestClusterIdString",
+                    "documentation": "<p>Id of the cluster used for this connection</p>"
+                },
+                "isServerless": {
+                    "shape": "Boolean",
+                    "documentation": "<p>Is serverless connection</p>"
+                },
+                "dbUser": {
+                    "shape": "DbUser",
+                    "documentation": "<p>User of the database used for this connection</p>"
+                },
+                "isStoreNewSecret": { "shape": "CreateConnectionRequestIsStoreNewSecretString" },
+                "username": {
+                    "shape": "DbUser",
+                    "documentation": "<p>Username used in the Username_Password connection type</p>"
+                },
+                "password": {
+                    "shape": "CreateConnectionRequestPasswordString",
+                    "documentation": "<p>Password of the user used for this connection</p>"
+                },
+                "tags": { "shape": "Tags" },
+                "host": {
+                    "shape": "CreateConnectionRequestHostString",
+                    "documentation": "<p>Host address used for creating secret for Username_Password connection type</p>"
+                },
+                "secretName": { "shape": "CreateConnectionRequestSecretNameString" },
+                "description": { "shape": "CreateConnectionRequestDescriptionString" },
+                "databaseType": { "shape": "DatabaseType" },
+                "connectableResourceIdentifier": {
+                    "shape": "CreateConnectionRequestConnectableResourceIdentifierString",
+                    "documentation": "<p>Id of the connectable resource used for this connection</p>"
+                },
+                "connectableResourceType": {
+                    "shape": "CreateConnectionRequestConnectableResourceTypeString",
+                    "documentation": "<p>Type of the connectable resource used for this connection</p>"
+                }
+            }
+        },
+        "CreateConnectionRequestAuthenticationTypeEnum": {
+            "type": "string",
+            "enum": ["2", "3", "4", "5", "6", "7", "8"],
+            "max": 1,
+            "min": 1,
+            "sensitive": true
+        },
+        "CreateConnectionRequestClusterIdString": {
+            "type": "string",
+            "max": 63,
+            "min": 1
+        },
+        "CreateConnectionRequestConnectableResourceIdentifierString": {
+            "type": "string",
+            "max": 63,
+            "min": 1,
+            "sensitive": true
+        },
+        "CreateConnectionRequestConnectableResourceTypeString": {
+            "type": "string",
+            "max": 63,
+            "min": 1
+        },
+        "CreateConnectionRequestDatabaseNameString": {
+            "type": "string",
+            "max": 64,
+            "min": 1,
+            "sensitive": true
+        },
+        "CreateConnectionRequestDescriptionString": {
+            "type": "string",
+            "max": 1000,
+            "min": 0
+        },
+        "CreateConnectionRequestHostString": {
+            "type": "string",
+            "max": 1000,
+            "min": 0
+        },
+        "CreateConnectionRequestIsProdString": {
+            "type": "string",
+            "max": 1000,
+            "min": 0
+        },
+        "CreateConnectionRequestIsStoreNewSecretString": {
+            "type": "string",
+            "max": 1000,
+            "min": 0
+        },
+        "CreateConnectionRequestNameString": {
+            "type": "string",
+            "max": 512,
+            "min": 1,
+            "sensitive": true
+        },
+        "CreateConnectionRequestPasswordString": {
+            "type": "string",
+            "max": 64,
+            "min": 8,
+            "sensitive": true
+        },
+        "CreateConnectionRequestSecretArnString": {
+            "type": "string",
+            "max": 1000,
+            "min": 1
+        },
+        "CreateConnectionRequestSecretNameString": {
+            "type": "string",
+            "max": 1000,
+            "min": 0
+        },
+        "CreateConnectionResponse": {
+            "type": "structure",
+            "members": {
+                "data": { "shape": "Connection" }
+            }
+        },
+        "DatabaseAuthenticationMethod": {
+            "type": "string",
+            "enum": ["USERNAME_PASSWORD", "TEMPORARY_CREDENTIALS_WITH_IAM"]
+        },
+        "DatabaseAuthenticationMethods": {
+            "type": "list",
+            "member": { "shape": "DatabaseAuthenticationMethod" }
+        },
+        "DatabaseAuthenticationOption": {
+            "type": "structure",
+            "required": ["connectableResourceType", "authenticationMethods"],
+            "members": {
+                "connectableResourceType": { "shape": "String" },
+                "authenticationMethods": { "shape": "DatabaseAuthenticationMethods" }
+            }
+        },
+        "DatabaseAuthenticationOptions": {
+            "type": "list",
+            "member": { "shape": "DatabaseAuthenticationOption" }
+        },
+        "DatabaseConfiguration": {
+            "type": "structure",
+            "required": [
+                "databaseType",
+                "authenticationOptions",
+                "connectableResourceTypes",
+                "sessionSupported",
+                "eventAcknowledgementSupported",
+                "appendingLimitToQuerySupported",
+                "queryStatsSupported"
+            ],
+            "members": {
+                "databaseType": { "shape": "DatabaseType" },
+                "authenticationOptions": { "shape": "DatabaseAuthenticationOptions" },
+                "connectableResourceTypes": { "shape": "ConnectableResourceTypes" },
+                "sessionSupported": { "shape": "Boolean" },
+                "eventAcknowledgementSupported": { "shape": "Boolean" },
+                "appendingLimitToQuerySupported": { "shape": "Boolean" },
+                "queryStatsSupported": { "shape": "Boolean" }
+            }
+        },
+        "DatabaseConfigurations": {
+            "type": "list",
+            "member": { "shape": "DatabaseConfiguration" }
+        },
+        "DatabaseConnectionAccountSettings": {
+            "type": "structure",
+            "members": {
+                "masterKeyArn": { "shape": "KmsKeyArn" }
+            }
+        },
+        "DatabaseConnectionConfiguration": {
+            "type": "structure",
+            "required": ["id", "type", "databaseType", "connectableResourceIdentifier", "connectableResourceType"],
+            "members": {
+                "id": { "shape": "DatabaseConnectionConfigurationIdString" },
+                "type": { "shape": "DatabaseIntegrationConnectionAuthenticationTypes" },
+                "auth": { "shape": "DatabaseConnectionConfigurationAuth" },
+                "databaseType": { "shape": "DatabaseType" },
+                "connectableResourceIdentifier": { "shape": "ResourceIdentifier" },
+                "connectableResourceType": { "shape": "DatabaseConnectionConfigurationConnectableResourceTypeString" },
+                "database": { "shape": "DatabaseName" }
+            }
+        },
+        "DatabaseConnectionConfigurationAuth": {
+            "type": "structure",
+            "members": {
+                "secretArn": { "shape": "SecretKeyArn" },
+                "username": { "shape": "DatabaseConnectionConfigurationAuthUsernameString" },
+                "password": { "shape": "DatabaseConnectionConfigurationAuthPasswordString" }
+            }
+        },
+        "DatabaseConnectionConfigurationAuthPasswordString": {
+            "type": "string",
+            "max": 1000,
+            "min": 0,
+            "sensitive": true
+        },
+        "DatabaseConnectionConfigurationAuthUsernameString": {
+            "type": "string",
+            "max": 1000,
+            "min": 0,
+            "sensitive": true
+        },
+        "DatabaseConnectionConfigurationConnectableResourceTypeString": {
+            "type": "string",
+            "max": 50,
+            "min": 0
+        },
+        "DatabaseConnectionConfigurationIdString": {
+            "type": "string",
+            "max": 2048,
+            "min": 32
+        },
+        "DatabaseIntegrationConnectionAuthenticationTypes": {
+            "type": "string",
+            "enum": ["4", "5", "6", "8"],
+            "sensitive": true
+        },
+        "DatabaseName": {
+            "type": "string",
+            "max": 150,
+            "min": 0,
+            "sensitive": true
+        },
+        "DatabaseType": {
+            "type": "string",
+            "enum": ["REDSHIFT", "ATHENA"]
+        },
+        "DbUser": {
+            "type": "string",
+            "max": 127,
+            "min": 1,
+            "pattern": "[a-zA-Z0-9_][a-zA-Z_0-9+.@$-]*",
+            "sensitive": true
+        },
+        "DeleteConnectionRequest": {
+            "type": "structure",
+            "required": ["connectionId"],
+            "members": {
+                "sqlworkbenchSource": {
+                    "shape": "SqlworkbenchSource",
+                    "location": "header",
+                    "locationName": "sqlworkbench-source"
+                },
+                "connectionId": {
+                    "shape": "DeleteConnectionRequestConnectionIdString",
+                    "documentation": "<p>Id of connection to delete</p>",
+                    "location": "uri",
+                    "locationName": "connectionId"
+                }
+            }
+        },
+        "DeleteConnectionRequestConnectionIdString": {
+            "type": "string",
+            "max": 1000,
+            "min": 1
+        },
+        "DeleteConnectionResponse": {
+            "type": "structure",
+            "members": {}
+        },
+        "ErrorCode": {
+            "type": "string",
+            "enum": ["QUERY_EXECUTION_NOT_FOUND", "QUERY_EXECUTION_ACCESS_DENIED"]
+        },
+        "ExecuteQueryRequest": {
+            "type": "structure",
+            "required": ["query", "queryExecutionType", "queryResponseDeliveryType", "maxItems"],
+            "members": {
+                "sqlworkbenchSource": {
+                    "shape": "SqlworkbenchSource",
+                    "location": "header",
+                    "locationName": "sqlworkbench-source"
+                },
+                "connectionId": { "shape": "ExecuteQueryRequestConnectionIdString" },
+                "databaseType": {
+                    "shape": "DatabaseType",
+                    "location": "querystring",
+                    "locationName": "databaseType"
+                },
+                "connection": { "shape": "DatabaseConnectionConfiguration" },
+                "accountSettings": { "shape": "DatabaseConnectionAccountSettings" },
+                "tabId": { "shape": "ExecuteQueryRequestTabIdString" },
+                "executionContext": { "shape": "ExecuteQueryRequestExecutionContextList" },
+                "query": { "shape": "ExecuteQueryRequestQueryString" },
+                "queryExecutionType": { "shape": "QueryExecutionType" },
+                "sessionId": { "shape": "ExecuteQueryRequestSessionIdString" },
+                "queryResponseDeliveryType": { "shape": "QueryResponseDeliveryType" },
+                "maxItems": { "shape": "ExecuteQueryRequestMaxItemsInteger" },
+                "limitQueryResults": { "shape": "ExecuteQueryRequestLimitQueryResultsInteger" },
+                "isExplain": { "shape": "Boolean" },
+                "ignoreHistory": { "shape": "Boolean" },
+                "timeoutMillis": { "shape": "ExecuteQueryRequestTimeoutMillisInteger" }
+            }
+        },
+        "ExecuteQueryRequestConnectionIdString": {
+            "type": "string",
+            "max": 2048,
+            "min": 32
+        },
+        "ExecuteQueryRequestExecutionContextList": {
+            "type": "list",
+            "member": { "shape": "ParentResource" },
+            "max": 100,
+            "min": 0
+        },
+        "ExecuteQueryRequestLimitQueryResultsInteger": {
+            "type": "integer",
+            "box": true,
+            "max": 1000,
+            "min": 0
+        },
+        "ExecuteQueryRequestMaxItemsInteger": {
+            "type": "integer",
+            "box": true,
+            "max": 100,
+            "min": 20
+        },
+        "ExecuteQueryRequestQueryString": {
+            "type": "string",
+            "max": 1000000,
+            "min": 0,
+            "sensitive": true
+        },
+        "ExecuteQueryRequestSessionIdString": {
+            "type": "string",
+            "max": 100,
+            "min": 0
+        },
+        "ExecuteQueryRequestTabIdString": {
+            "type": "string",
+            "max": 100,
+            "min": 1
+        },
+        "ExecuteQueryRequestTimeoutMillisInteger": {
+            "type": "integer",
+            "box": true,
+            "max": 120000,
+            "min": 0
+        },
+        "ExecuteQueryResponse": {
+            "type": "structure",
+            "required": ["queryExecutions"],
+            "members": {
+                "sessionId": { "shape": "ExecuteQueryResponseSessionIdString" },
+                "queryExecutions": { "shape": "QueryExecutions" },
+                "statusCode": {
+                    "shape": "statusCode",
+                    "location": "statusCode"
+                }
+            }
+        },
+        "ExecuteQueryResponseSessionIdString": {
+            "type": "string",
+            "max": 100,
+            "min": 0
+        },
+        "ExportQueryResultsRequest": {
+            "type": "structure",
+            "required": ["queryExecutionId", "databaseType"],
+            "members": {
+                "sqlworkbenchSource": {
+                    "shape": "SqlworkbenchSource",
+                    "location": "header",
+                    "locationName": "sqlworkbench-source"
+                },
+                "accountSettings": { "shape": "DatabaseConnectionAccountSettings" },
+                "queryExecutionId": { "shape": "ExportQueryResultsRequestQueryExecutionIdString" },
+                "databaseType": {
+                    "shape": "DatabaseType",
+                    "location": "querystring",
+                    "locationName": "databaseType"
+                },
+                "fileType": { "shape": "FileType" }
+            }
+        },
+        "ExportQueryResultsRequestQueryExecutionIdString": {
+            "type": "string",
+            "max": 100,
+            "min": 1
+        },
+        "ExportQueryResultsResponse": {
+            "type": "structure",
+            "required": ["queryResult", "contentType", "fileName"],
+            "members": {
+                "queryResult": { "shape": "StreamingBlob" },
+                "contentType": {
+                    "shape": "String",
+                    "location": "header",
+                    "locationName": "Content-Type"
+                },
+                "fileName": {
+                    "shape": "String",
+                    "location": "header",
+                    "locationName": "Content-Disposition"
+                }
+            },
+            "payload": "queryResult"
+        },
+        "FileType": {
+            "type": "string",
+            "enum": ["JSON", "CSV"]
+        },
+        "FullQueryText": {
+            "type": "string",
+            "max": 1000000,
+            "min": 0,
+            "sensitive": true
+        },
+        "GetConnectableResourcesRequest": {
+            "type": "structure",
+            "required": ["type", "maxItems", "databaseType"],
+            "members": {
+                "sqlworkbenchSource": {
+                    "shape": "SqlworkbenchSource",
+                    "location": "header",
+                    "locationName": "sqlworkbench-source"
+                },
+                "accountSettings": { "shape": "DatabaseConnectionAccountSettings" },
+                "type": { "shape": "GetConnectableResourcesRequestTypeString" },
+                "maxItems": { "shape": "GetConnectableResourcesRequestMaxItemsInteger" },
+                "pageToken": { "shape": "PageToken" },
+                "databaseType": {
+                    "shape": "DatabaseType",
+                    "location": "querystring",
+                    "locationName": "databaseType"
+                }
+            }
+        },
+        "GetConnectableResourcesRequestMaxItemsInteger": {
+            "type": "integer",
+            "box": true,
+            "max": 50,
+            "min": 20
+        },
+        "GetConnectableResourcesRequestTypeString": {
+            "type": "string",
+            "max": 150,
+            "min": 0
+        },
+        "GetConnectableResourcesResponse": {
+            "type": "structure",
+            "required": ["connectableResources"],
+            "members": {
+                "connectableResources": { "shape": "ConnectableResources" },
+                "nextToken": { "shape": "String" }
+            }
+        },
+        "GetConnectionRequest": {
+            "type": "structure",
+            "required": ["connectionId"],
+            "members": {
+                "sqlworkbenchSource": {
+                    "shape": "SqlworkbenchSource",
+                    "location": "header",
+                    "locationName": "sqlworkbench-source"
+                },
+                "connectionId": {
+                    "shape": "GetConnectionRequestConnectionIdString",
+                    "documentation": "<p>Id of connection to delete</p>",
+                    "location": "uri",
+                    "locationName": "connectionId"
+                }
+            }
+        },
+        "GetConnectionRequestConnectionIdString": {
+            "type": "string",
+            "max": 1000,
+            "min": 1
+        },
+        "GetConnectionResponse": {
+            "type": "structure",
+            "members": {
+                "data": { "shape": "Connection" }
+            }
+        },
+        "GetDatabaseConfigurationsRequest": {
+            "type": "structure",
+            "members": {
+                "sqlworkbenchSource": {
+                    "shape": "SqlworkbenchSource",
+                    "location": "header",
+                    "locationName": "sqlworkbench-source"
+                },
+                "accountSettings": { "shape": "DatabaseConnectionAccountSettings" }
+            }
+        },
+        "GetDatabaseConfigurationsResponse": {
+            "type": "structure",
+            "members": {
+                "configurations": { "shape": "DatabaseConfigurations" }
+            }
+        },
+        "GetQueryExecutionHistoryRequest": {
+            "type": "structure",
+            "required": ["queryExecutionId"],
+            "members": {
+                "sqlworkbenchSource": {
+                    "shape": "SqlworkbenchSource",
+                    "location": "header",
+                    "locationName": "sqlworkbench-source"
+                },
+                "queryExecutionId": { "shape": "GetQueryExecutionHistoryRequestQueryExecutionIdString" },
+                "accountSettings": { "shape": "DatabaseConnectionAccountSettings" }
+            }
+        },
+        "GetQueryExecutionHistoryRequestQueryExecutionIdString": {
+            "type": "string",
+            "max": 100,
+            "min": 1
+        },
+        "GetQueryExecutionHistoryResponse": {
+            "type": "structure",
+            "members": {
+                "id": { "shape": "String" },
+                "querySourceId": { "shape": "String" },
+                "queryStartTime": { "shape": "Long" },
+                "queryEndTime": { "shape": "Long" },
+                "status": { "shape": "QueryExecutionStatus" },
+                "queryText": { "shape": "FullQueryText" },
+                "serializedMetadata": { "shape": "SerializedMetadata" },
+                "serializedQueryStats": { "shape": "SerializedQueryStats" },
+                "databaseType": { "shape": "DatabaseType" }
+            }
+        },
+        "GetQueryResultRequest": {
+            "type": "structure",
+            "required": ["queryExecutionId", "databaseType"],
+            "members": {
+                "sqlworkbenchSource": {
+                    "shape": "SqlworkbenchSource",
+                    "location": "header",
+                    "locationName": "sqlworkbench-source"
+                },
+                "queryExecutionId": { "shape": "GetQueryResultRequestQueryExecutionIdString" },
+                "accountSettings": { "shape": "DatabaseConnectionAccountSettings" },
+                "pageToken": { "shape": "PageToken" },
+                "databaseType": {
+                    "shape": "DatabaseType",
+                    "location": "querystring",
+                    "locationName": "databaseType"
+                },
+                "pageSize": { "shape": "GetQueryResultRequestPageSizeInteger" }
+            }
+        },
+        "GetQueryResultRequestPageSizeInteger": {
+            "type": "integer",
+            "box": true,
+            "min": 0
+        },
+        "GetQueryResultRequestQueryExecutionIdString": {
+            "type": "string",
+            "max": 100,
+            "min": 1
+        },
+        "GetQueryResultResponse": {
+            "type": "structure",
+            "members": {
+                "queryResult": { "shape": "QueryResult" },
+                "nextToken": { "shape": "String" },
+                "previousToken": { "shape": "String" }
+            }
+        },
+        "GetResourcesRequest": {
+            "type": "structure",
+            "required": ["parents", "type", "maxItems"],
+            "members": {
+                "sqlworkbenchSource": {
+                    "shape": "SqlworkbenchSource",
+                    "location": "header",
+                    "locationName": "sqlworkbench-source"
+                },
+                "connectionId": { "shape": "GetResourcesRequestConnectionIdString" },
+                "databaseType": {
+                    "shape": "DatabaseType",
+                    "location": "querystring",
+                    "locationName": "databaseType"
+                },
+                "connection": { "shape": "DatabaseConnectionConfiguration" },
+                "accountSettings": { "shape": "DatabaseConnectionAccountSettings" },
+                "parents": { "shape": "ParentResources" },
+                "type": { "shape": "GetResourcesRequestTypeString" },
+                "maxItems": { "shape": "GetResourcesRequestMaxItemsInteger" },
+                "pageToken": { "shape": "PageToken" },
+                "forceRefresh": { "shape": "Boolean" },
+                "forceRefreshRecursive": { "shape": "Boolean" }
+            }
+        },
+        "GetResourcesRequestConnectionIdString": {
+            "type": "string",
+            "max": 2048,
+            "min": 32
+        },
+        "GetResourcesRequestMaxItemsInteger": {
+            "type": "integer",
+            "box": true,
+            "max": 100,
+            "min": 20
+        },
+        "GetResourcesRequestTypeString": {
+            "type": "string",
+            "max": 150,
+            "min": 0
+        },
+        "GetResourcesResponse": {
+            "type": "structure",
+            "members": {
+                "resources": { "shape": "Resources" },
+                "nextToken": { "shape": "String" },
+                "statusCode": {
+                    "shape": "statusCode",
+                    "location": "statusCode"
+                },
+                "connectionProperties": { "shape": "ConnectionProperties" }
+            }
+        },
+        "GetTabStatesRequest": {
+            "type": "structure",
+            "required": ["tabId"],
+            "members": {
+                "sqlworkbenchSource": {
+                    "shape": "SqlworkbenchSource",
+                    "location": "header",
+                    "locationName": "sqlworkbench-source"
+                },
+                "accountSettings": { "shape": "DatabaseConnectionAccountSettings" },
+                "tabId": { "shape": "String" }
+            }
+        },
+        "GetTabStatesResponse": {
+            "type": "structure",
+            "required": ["queryExecutionStates"],
+            "members": {
+                "queryExecutionStates": { "shape": "QueryExecutionStates" },
+                "sessionId": { "shape": "String" }
+            }
+        },
+        "Integer": {
+            "type": "integer",
+            "box": true
+        },
+        "InternalServerError": {
+            "type": "structure",
+            "required": ["message"],
+            "members": {
+                "message": { "shape": "String" },
+                "code": { "shape": "ErrorCode" }
+            },
+            "error": { "httpStatusCode": 500 },
+            "exception": true,
+            "fault": true
+        },
+        "KmsKeyArn": {
+            "type": "string",
+            "max": 1000,
+            "min": 0,
+            "pattern": "arn:.*"
+        },
+        "ListQueryExecutionHistoryRequest": {
+            "type": "structure",
+            "required": ["maxItems"],
+            "members": {
+                "sqlworkbenchSource": {
+                    "shape": "SqlworkbenchSource",
+                    "location": "header",
+                    "locationName": "sqlworkbench-source"
+                },
+                "maxItems": { "shape": "ListQueryExecutionHistoryRequestMaxItemsInteger" },
+                "accountSettings": { "shape": "DatabaseConnectionAccountSettings" },
+                "pageToken": { "shape": "ListQueryExecutionHistoryRequestPageTokenString" },
+                "querySourceId": { "shape": "ListQueryExecutionHistoryRequestQuerySourceIdString" },
+                "databaseType": { "shape": "DatabaseType" },
+                "status": { "shape": "QueryExecutionStatus" },
+                "startTime": { "shape": "QueryHistoryTimestamp" },
+                "endTime": { "shape": "QueryHistoryTimestamp" },
+                "containsText": { "shape": "ListQueryExecutionHistoryRequestContainsTextString" }
+            }
+        },
+        "ListQueryExecutionHistoryRequestContainsTextString": {
+            "type": "string",
+            "max": 100,
+            "min": 0
+        },
+        "ListQueryExecutionHistoryRequestMaxItemsInteger": {
+            "type": "integer",
+            "box": true,
+            "max": 100,
+            "min": 1
+        },
+        "ListQueryExecutionHistoryRequestPageTokenString": {
+            "type": "string",
+            "max": 10000,
+            "min": 0
+        },
+        "ListQueryExecutionHistoryRequestQuerySourceIdString": {
+            "type": "string",
+            "max": 100,
+            "min": 0
+        },
+        "ListQueryExecutionHistoryResponse": {
+            "type": "structure",
+            "required": ["items"],
+            "members": {
+                "items": { "shape": "QueryExecutionHistoryPreviews" },
+                "nextToken": { "shape": "ListQueryExecutionHistoryResponseNextTokenString" }
+            }
+        },
+        "ListQueryExecutionHistoryResponseNextTokenString": {
+            "type": "string",
+            "max": 1000,
+            "min": 0
+        },
+        "ListTagsForResourceRequest": {
+            "type": "structure",
+            "required": ["resourceArn"],
+            "members": {
+                "sqlworkbenchSource": {
+                    "shape": "SqlworkbenchSource",
+                    "location": "header",
+                    "locationName": "sqlworkbench-source"
+                },
+                "resourceArn": {
+                    "shape": "Arn",
+                    "location": "uri",
+                    "locationName": "resourceArn"
+                }
+            }
+        },
+        "ListTagsForResourceResponse": {
+            "type": "structure",
+            "required": ["tags"],
+            "members": {
+                "tags": { "shape": "Tags" }
+            }
+        },
+        "Long": {
+            "type": "long",
+            "box": true
+        },
+        "PageToken": {
+            "type": "string",
+            "max": 1000,
+            "min": 0
+        },
+        "ParentResource": {
+            "type": "structure",
+            "required": ["parentId", "parentType"],
+            "members": {
+                "parentId": { "shape": "ParentResourceParentIdString" },
+                "parentType": { "shape": "ParentResourceParentTypeString" }
+            }
+        },
+        "ParentResourceParentIdString": {
+            "type": "string",
+            "max": 1000,
+            "min": 1,
+            "sensitive": true
+        },
+        "ParentResourceParentTypeString": {
+            "type": "string",
+            "max": 100,
+            "min": 1
+        },
+        "ParentResources": {
+            "type": "list",
+            "member": { "shape": "ParentResource" }
+        },
+        "PollQueryExecutionEventsRequest": {
+            "type": "structure",
+            "required": ["queryExecutionIds", "databaseType"],
+            "members": {
+                "sqlworkbenchSource": {
+                    "shape": "SqlworkbenchSource",
+                    "location": "header",
+                    "locationName": "sqlworkbench-source"
+                },
+                "queryExecutionIds": { "shape": "PollQueryExecutionEventsRequestQueryExecutionIdsList" },
+                "accountSettings": { "shape": "DatabaseConnectionAccountSettings" },
+                "databaseType": {
+                    "shape": "DatabaseType",
+                    "location": "querystring",
+                    "locationName": "databaseType"
+                },
+                "ackIds": { "shape": "AckIds" }
+            }
+        },
+        "PollQueryExecutionEventsRequestQueryExecutionIdsList": {
+            "type": "list",
+            "member": { "shape": "PollQueryExecutionEventsRequestQueryExecutionIdsListMemberString" },
+            "max": 100,
+            "min": 1
+        },
+        "PollQueryExecutionEventsRequestQueryExecutionIdsListMemberString": {
+            "type": "string",
+            "max": 100,
+            "min": 1
+        },
+        "PollQueryExecutionEventsResponse": {
+            "type": "structure",
+            "members": {
+                "events": { "shape": "QueryExecutionEvents" }
+            }
+        },
+        "QueryCancellationStatus": {
+            "type": "string",
+            "enum": ["CANCELLED", "DOES_NOT_EXISTS", "ALREADY_FINISHED", "CANCELLATION_FAILED"]
+        },
+        "QueryExecution": {
+            "type": "structure",
+            "required": ["queryExecutionId"],
+            "members": {
+                "queryExecutionStatus": { "shape": "QueryExecutionStatus" },
+                "queryExecutionId": { "shape": "QueryExecutionQueryExecutionIdString" },
+                "queryResult": { "shape": "QueryResult" },
+                "queryText": { "shape": "QueryText" }
+            }
+        },
+        "QueryExecutionEvent": {
+            "type": "structure",
+            "required": ["queryExecutionEventType", "queryExecutionId"],
+            "members": {
+                "queryExecutionEventType": { "shape": "QueryExecutionEventType" },
+                "queryExecutionId": { "shape": "QueryExecutionEventQueryExecutionIdString" },
+                "queryExecutionStatus": { "shape": "QueryExecutionStatus" },
+                "queryResult": { "shape": "QueryResult" },
+                "nextToken": { "shape": "String" },
+                "ackId": { "shape": "String" }
+            }
+        },
+        "QueryExecutionEventQueryExecutionIdString": {
+            "type": "string",
+            "max": 100,
+            "min": 0
+        },
+        "QueryExecutionEventType": {
+            "type": "string",
+            "enum": ["QUERY_EXECUTION_STATUS", "QUERY_EXECUTION_RESULT"]
+        },
+        "QueryExecutionEvents": {
+            "type": "list",
+            "member": { "shape": "QueryExecutionEvent" }
+        },
+        "QueryExecutionHistoryPreview": {
+            "type": "structure",
+            "members": {
+                "id": { "shape": "String" },
+                "querySourceId": { "shape": "String" },
+                "queryStartTime": { "shape": "Long" },
+                "queryEndTime": { "shape": "Long" },
+                "status": { "shape": "QueryExecutionStatus" },
+                "queryTextPreview": { "shape": "QueryTextPreview" },
+                "serializedMetadata": { "shape": "SerializedMetadata" },
+                "databaseType": { "shape": "DatabaseType" }
+            }
+        },
+        "QueryExecutionHistoryPreviews": {
+            "type": "list",
+            "member": { "shape": "QueryExecutionHistoryPreview" }
+        },
+        "QueryExecutionQueryExecutionIdString": {
+            "type": "string",
+            "max": 100,
+            "min": 0
+        },
+        "QueryExecutionState": {
+            "type": "structure",
+            "required": ["queryExecutionId", "status", "databaseType"],
+            "members": {
+                "queryExecutionId": { "shape": "String" },
+                "status": { "shape": "String" },
+                "databaseType": { "shape": "DatabaseType" }
+            }
+        },
+        "QueryExecutionStates": {
+            "type": "list",
+            "member": { "shape": "QueryExecutionState" }
+        },
+        "QueryExecutionStatus": {
+            "type": "string",
+            "enum": ["SCHEDULED", "RUNNING", "FAILED", "CANCELLED", "FINISHED"]
+        },
+        "QueryExecutionType": {
+            "type": "string",
+            "enum": ["PERSIST_SESSION", "NO_SESSION"]
+        },
+        "QueryExecutionWarning": {
+            "type": "structure",
+            "members": {
+                "message": { "shape": "QueryExecutionWarningMessage" },
+                "level": { "shape": "QueryExecutionWarningLevel" }
+            }
+        },
+        "QueryExecutionWarningLevel": {
+            "type": "string",
+            "enum": ["INFO", "WARNING"]
+        },
+        "QueryExecutionWarningMessage": {
+            "type": "string",
+            "max": 1000,
+            "min": 0,
+            "sensitive": true
+        },
+        "QueryExecutionWarnings": {
+            "type": "list",
+            "member": { "shape": "QueryExecutionWarning" }
+        },
+        "QueryExecutions": {
+            "type": "list",
+            "member": { "shape": "QueryExecution" }
+        },
+        "QueryHistoryTimestamp": {
+            "type": "long",
+            "box": true
+        },
+        "QueryResponseDeliveryType": {
+            "type": "string",
+            "enum": ["SYNC", "ASYNC"]
+        },
+        "QueryResult": {
+            "type": "structure",
+            "members": {
+                "queryExecutionStatus": { "shape": "QueryExecutionStatus" },
+                "headers": { "shape": "QueryResultHeaders" },
+                "rows": { "shape": "Rows" },
+                "affectedRows": { "shape": "Integer" },
+                "totalRowCount": { "shape": "Integer" },
+                "elapsedTime": { "shape": "Long" },
+                "errorMessage": { "shape": "QueryResultErrorMessage" },
+                "errorPosition": { "shape": "Integer" },
+                "queryResultWarningCode": { "shape": "QueryResultQueryResultWarningCodeString" },
+                "warnings": { "shape": "QueryExecutionWarnings" },
+                "queryExecutionId": { "shape": "String" },
+                "sessionId": { "shape": "String" },
+                "queryText": { "shape": "QueryText" },
+                "statementType": { "shape": "StatementType" },
+                "serializedMetadata": { "shape": "SerializedMetadata" },
+                "connectionProperties": { "shape": "ConnectionProperties" }
+            }
+        },
+        "QueryResultCellType": {
+            "type": "string",
+            "enum": ["STRING", "BOOLEAN", "INTEGER", "BIG_INTEGER", "FLOAT", "BIG_DECIMAL", "DATE", "TIME", "DATETIME"]
+        },
+        "QueryResultCellValue": {
+            "type": "string",
+            "sensitive": true
+        },
+        "QueryResultErrorMessage": {
+            "type": "string",
+            "max": 1000,
+            "min": 0,
+            "sensitive": true
+        },
+        "QueryResultHeader": {
+            "type": "structure",
+            "required": ["displayName", "type"],
+            "members": {
+                "displayName": { "shape": "QueryResultHeaderDisplayName" },
+                "type": { "shape": "QueryResultCellType" }
+            }
+        },
+        "QueryResultHeaderDisplayName": {
+            "type": "string",
+            "sensitive": true
+        },
+        "QueryResultHeaders": {
+            "type": "list",
+            "member": { "shape": "QueryResultHeader" }
+        },
+        "QueryResultQueryResultWarningCodeString": {
+            "type": "string",
+            "max": 100,
+            "min": 0
+        },
+        "QueryText": {
+            "type": "string",
+            "sensitive": true
+        },
+        "QueryTextPreview": {
+            "type": "string",
+            "max": 150,
+            "min": 0,
+            "sensitive": true
+        },
+        "Resource": {
+            "type": "structure",
+            "required": ["displayName", "identifier", "childObjectTypes"],
+            "members": {
+                "displayName": { "shape": "ResourceDisplayName" },
+                "identifier": { "shape": "ResourceIdentifier" },
+                "type": { "shape": "ResourceTypeString" },
+                "unavailable": { "shape": "Boolean" },
+                "tooltipTranslationKey": { "shape": "ResourceTooltipTranslationKeyString" },
+                "childObjectTypes": { "shape": "ChildObjectTypes" },
+                "allowedActions": { "shape": "ResourceActions" },
+                "resourceMetadata": { "shape": "ResourceMetadataItems" }
+            }
+        },
+        "ResourceAction": {
+            "type": "string",
+            "enum": ["Drop", "Truncate", "GenerateDefinition", "GenerateSelectQuery"]
+        },
+        "ResourceActions": {
+            "type": "list",
+            "member": { "shape": "ResourceAction" }
+        },
+        "ResourceDisplayName": {
+            "type": "string",
+            "max": 150,
+            "min": 0,
+            "sensitive": true
+        },
+        "ResourceIdentifier": {
+            "type": "string",
+            "max": 150,
+            "min": 0,
+            "sensitive": true
+        },
+        "ResourceMetadata": {
+            "type": "structure",
+            "members": {
+                "key": { "shape": "String" },
+                "value": { "shape": "String" }
+            }
+        },
+        "ResourceMetadataItems": {
+            "type": "list",
+            "member": { "shape": "ResourceMetadata" }
+        },
+        "ResourceNotFoundException": {
+            "type": "structure",
+            "required": ["message"],
+            "members": {
+                "message": { "shape": "String" },
+                "code": { "shape": "ErrorCode" }
+            },
+            "error": {
+                "httpStatusCode": 404,
+                "senderFault": true
+            },
+            "exception": true
+        },
+        "ResourceTooltipTranslationKeyString": {
+            "type": "string",
+            "max": 50,
+            "min": 0
+        },
+        "ResourceTypeString": {
+            "type": "string",
+            "max": 50,
+            "min": 0
+        },
+        "Resources": {
+            "type": "list",
+            "member": { "shape": "Resource" }
+        },
+        "Row": {
+            "type": "structure",
+            "members": {
+                "row": { "shape": "Columns" }
+            }
+        },
+        "Rows": {
+            "type": "list",
+            "member": { "shape": "Row" }
+        },
+        "SecretKeyArn": {
+            "type": "string",
+            "max": 1000,
+            "min": 0,
+            "pattern": "arn:.*"
+        },
+        "SerializedMetadata": {
+            "type": "string",
+            "max": 1000000,
+            "min": 0,
+            "sensitive": true
+        },
+        "SerializedQueryStats": {
+            "type": "string",
+            "max": 1000000,
+            "min": 0,
+            "sensitive": true
+        },
+        "ServiceQuotaExceededException": {
+            "type": "structure",
+            "required": ["message"],
+            "members": {
+                "message": { "shape": "String" },
+                "code": { "shape": "ErrorCode" }
+            },
+            "error": {
+                "httpStatusCode": 402,
+                "senderFault": true
+            },
+            "exception": true
+        },
+        "SqlworkbenchSource": {
+            "type": "string",
+            "enum": ["SUS", "RQEV2"]
+        },
+        "StatementType": {
+            "type": "string",
+            "enum": ["DQL", "DML", "DDL", "DCL", "Utility"]
+        },
+        "StreamingBlob": {
+            "type": "blob",
+            "streaming": true
+        },
+        "String": { "type": "string" },
+        "TagKey": {
+            "type": "string",
+            "max": 128,
+            "min": 1,
+            "pattern": "([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)"
+        },
+        "TagKeyList": {
+            "type": "list",
+            "member": { "shape": "TagKey" },
+            "max": 6500,
+            "min": 1
+        },
+        "TagResourceRequest": {
+            "type": "structure",
+            "required": ["resourceArn", "tags"],
+            "members": {
+                "sqlworkbenchSource": {
+                    "shape": "SqlworkbenchSource",
+                    "location": "header",
+                    "locationName": "sqlworkbench-source"
+                },
+                "resourceArn": {
+                    "shape": "Arn",
+                    "location": "uri",
+                    "locationName": "resourceArn"
+                },
+                "tags": { "shape": "Tags" }
+            }
+        },
+        "TagResourceResponse": {
+            "type": "structure",
+            "members": {}
+        },
+        "TagValue": {
+            "type": "string",
+            "max": 256,
+            "min": 0,
+            "pattern": "([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)"
+        },
+        "TagrisAccessDeniedException": {
+            "type": "structure",
+            "members": {
+                "message": { "shape": "TagrisExceptionMessage" }
+            },
+            "exception": true
+        },
+        "TagrisAccountId": {
+            "type": "string",
+            "max": 12,
+            "min": 12
+        },
+        "TagrisAmazonResourceName": {
+            "type": "string",
+            "max": 1011,
+            "min": 1
+        },
+        "TagrisExceptionMessage": {
+            "type": "string",
+            "max": 2048,
+            "min": 0
+        },
+        "TagrisInternalId": {
+            "type": "string",
+            "max": 64,
+            "min": 0
+        },
+        "TagrisInternalServiceException": {
+            "type": "structure",
+            "members": {
+                "message": { "shape": "TagrisExceptionMessage" }
+            },
+            "exception": true,
+            "fault": true
+        },
+        "TagrisInvalidArnException": {
+            "type": "structure",
+            "members": {
+                "message": { "shape": "TagrisExceptionMessage" },
+                "sweepListItem": { "shape": "TagrisSweepListItem" }
+            },
+            "exception": true
+        },
+        "TagrisInvalidParameterException": {
+            "type": "structure",
+            "members": {
+                "message": { "shape": "TagrisExceptionMessage" }
+            },
+            "exception": true
+        },
+        "TagrisPartialResourcesExistResultsException": {
+            "type": "structure",
+            "members": {
+                "message": { "shape": "TagrisExceptionMessage" },
+                "resourceExistenceInformation": { "shape": "TagrisSweepListResult" }
+            },
+            "exception": true
+        },
+        "TagrisStatus": {
+            "type": "string",
+            "enum": ["ACTIVE", "NOT_ACTIVE"]
+        },
+        "TagrisSweepList": {
+            "type": "list",
+            "member": { "shape": "TagrisSweepListItem" }
+        },
+        "TagrisSweepListItem": {
+            "type": "structure",
+            "members": {
+                "TagrisAccountId": { "shape": "TagrisAccountId" },
+                "TagrisAmazonResourceName": { "shape": "TagrisAmazonResourceName" },
+                "TagrisInternalId": { "shape": "TagrisInternalId" },
+                "TagrisVersion": { "shape": "TagrisVersion" }
+            }
+        },
+        "TagrisSweepListResult": {
+            "type": "map",
+            "key": { "shape": "TagrisAmazonResourceName" },
+            "value": { "shape": "TagrisStatus" }
+        },
+        "TagrisThrottledException": {
+            "type": "structure",
+            "members": {
+                "message": { "shape": "TagrisExceptionMessage" }
+            },
+            "exception": true
+        },
+        "TagrisVerifyResourcesExistInput": {
+            "type": "structure",
+            "required": ["TagrisSweepList"],
+            "members": {
+                "TagrisSweepList": { "shape": "TagrisSweepList" }
+            }
+        },
+        "TagrisVerifyResourcesExistOutput": {
+            "type": "structure",
+            "required": ["TagrisSweepListResult"],
+            "members": {
+                "TagrisSweepListResult": { "shape": "TagrisSweepListResult" }
+            }
+        },
+        "TagrisVersion": { "type": "long" },
+        "Tags": {
+            "type": "map",
+            "key": { "shape": "TagKey" },
+            "value": { "shape": "TagValue" },
+            "max": 50,
+            "min": 1
+        },
+        "ThrottlingException": {
+            "type": "structure",
+            "required": ["message"],
+            "members": {
+                "message": { "shape": "String" },
+                "code": { "shape": "ErrorCode" }
+            },
+            "error": {
+                "httpStatusCode": 429,
+                "senderFault": true
+            },
+            "exception": true
+        },
+        "UntagResourceRequest": {
+            "type": "structure",
+            "required": ["resourceArn", "tagKeys"],
+            "members": {
+                "sqlworkbenchSource": {
+                    "shape": "SqlworkbenchSource",
+                    "location": "header",
+                    "locationName": "sqlworkbench-source"
+                },
+                "resourceArn": {
+                    "shape": "Arn",
+                    "location": "uri",
+                    "locationName": "resourceArn"
+                },
+                "tagKeys": {
+                    "shape": "TagKeyList",
+                    "location": "querystring",
+                    "locationName": "tagKeys"
+                }
+            }
+        },
+        "UntagResourceResponse": {
+            "type": "structure",
+            "members": {}
+        },
+        "UpdateConnectionRequest": {
+            "type": "structure",
+            "required": ["id", "authenticationType"],
+            "members": {
+                "sqlworkbenchSource": {
+                    "shape": "SqlworkbenchSource",
+                    "location": "header",
+                    "locationName": "sqlworkbench-source"
+                },
+                "id": {
+                    "shape": "UpdateConnectionRequestIdString",
+                    "documentation": "<p>Id of the connection to update</p>"
+                },
+                "name": {
+                    "shape": "UpdateConnectionRequestNameString",
+                    "documentation": "<p>Name of the connection</p>"
+                },
+                "databaseName": {
+                    "shape": "UpdateConnectionRequestDatabaseNameString",
+                    "documentation": "<p>Name of the database used for this connection</p>"
+                },
+                "authenticationType": {
+                    "shape": "UpdateConnectionRequestAuthenticationTypeEnum",
+                    "documentation": "<p>Number representing the type of authentication to use (2 = IAM, 3 = Username and Password, 4 = Federated connection)</p>"
+                },
+                "secretArn": {
+                    "shape": "UpdateConnectionRequestSecretArnString",
+                    "documentation": "<p>secretArn for redshift cluster</p>"
+                },
+                "clusterId": {
+                    "shape": "UpdateConnectionRequestClusterIdString",
+                    "documentation": "<p>Id of the cluster used for this connection</p>"
+                },
+                "isServerless": {
+                    "shape": "Boolean",
+                    "documentation": "<p>Is serverless connection</p>"
+                },
+                "dbUser": {
+                    "shape": "DbUser",
+                    "documentation": "<p>User of the database used for this connection</p>"
+                },
+                "username": {
+                    "shape": "DbUser",
+                    "documentation": "<p>Username used in the Username_Password connection type</p>"
+                },
+                "password": {
+                    "shape": "UpdateConnectionRequestPasswordString",
+                    "documentation": "<p>Password of the user used for this connection</p>"
+                },
+                "host": {
+                    "shape": "String",
+                    "documentation": "<p>Host address used for creating secret for Username_Password connection type</p>"
+                },
+                "databaseType": { "shape": "DatabaseType" },
+                "connectableResourceIdentifier": {
+                    "shape": "UpdateConnectionRequestConnectableResourceIdentifierString",
+                    "documentation": "<p>Id of the connectable resource used for this connection</p>"
+                },
+                "connectableResourceType": {
+                    "shape": "UpdateConnectionRequestConnectableResourceTypeString",
+                    "documentation": "<p>Type of the connectable resource used for this connection</p>"
+                }
+            }
+        },
+        "UpdateConnectionRequestAuthenticationTypeEnum": {
+            "type": "string",
+            "enum": ["2", "3", "4", "5", "6", "7", "8"],
+            "max": 1,
+            "min": 1,
+            "sensitive": true
+        },
+        "UpdateConnectionRequestClusterIdString": {
+            "type": "string",
+            "max": 63,
+            "min": 1
+        },
+        "UpdateConnectionRequestConnectableResourceIdentifierString": {
+            "type": "string",
+            "max": 63,
+            "min": 1,
+            "sensitive": true
+        },
+        "UpdateConnectionRequestConnectableResourceTypeString": {
+            "type": "string",
+            "max": 63,
+            "min": 1
+        },
+        "UpdateConnectionRequestDatabaseNameString": {
+            "type": "string",
+            "max": 64,
+            "min": 1,
+            "sensitive": true
+        },
+        "UpdateConnectionRequestIdString": {
+            "type": "string",
+            "max": 2048,
+            "min": 32
+        },
+        "UpdateConnectionRequestNameString": {
+            "type": "string",
+            "max": 512,
+            "min": 1,
+            "sensitive": true
+        },
+        "UpdateConnectionRequestPasswordString": {
+            "type": "string",
+            "max": 64,
+            "min": 8,
+            "sensitive": true
+        },
+        "UpdateConnectionRequestSecretArnString": {
+            "type": "string",
+            "max": 1000,
+            "min": 1
+        },
+        "UpdateConnectionResponse": {
+            "type": "structure",
+            "members": {
+                "data": { "shape": "Connection" }
+            }
+        },
+        "UserSettings": {
+            "type": "string",
+            "sensitive": true
+        },
+        "ValidationException": {
+            "type": "structure",
+            "required": ["message"],
+            "members": {
+                "message": { "shape": "String" },
+                "code": { "shape": "ErrorCode" }
+            },
+            "error": {
+                "httpStatusCode": 400,
+                "senderFault": true
+            },
+            "exception": true
+        },
+        "statusCode": {
+            "type": "integer",
+            "box": true,
+            "max": 500,
+            "min": 100
+        }
+    }
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/shared/smusUtils.ts b/packages/core/src/sagemakerunifiedstudio/shared/smusUtils.ts
new file mode 100644
index 00000000000..35858f0dc5a
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/shared/smusUtils.ts
@@ -0,0 +1,416 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { getLogger } from '../../shared/logger/logger'
+import { ToolkitError } from '../../shared/errors'
+import { isSageMaker } from '../../shared/extensionUtilities'
+import { getResourceMetadata } from './utils/resourceMetadataUtils'
+import fetch from 'node-fetch'
+
+/**
+ * Represents SSO instance information retrieved from DataZone
+ */
+export interface SsoInstanceInfo {
+    issuerUrl: string
+    ssoInstanceId: string
+    clientId: string
+    region: string
+}
+
+/**
+ * Response from DataZone /sso/login endpoint
+ */
+interface DataZoneSsoLoginResponse {
+    redirectUrl: string
+}
+
+/**
+ * Credential expiry time constants for SMUS providers (in milliseconds)
+ */
+export const SmusCredentialExpiry = {
+    /** Domain Execution Role (DER) credentials expiry time: 10 minutes */
+    derExpiryMs: 10 * 60 * 1000,
+    /** Project Role credentials expiry time: 10 minutes */
+    projectExpiryMs: 10 * 60 * 1000,
+    /** Connection credentials expiry time: 10 minutes */
+    connectionExpiryMs: 10 * 60 * 1000,
+} as const
+
+/**
+ * Error codes for SMUS-related operations
+ */
+export const SmusErrorCodes = {
+    /** Error code for when no active SMUS connection is available */
+    NoActiveConnection: 'NoActiveConnection',
+    /** Error code for when API calls timeout */
+    ApiTimeout: 'ApiTimeout',
+    /** Error code for when SMUS login fails */
+    SmusLoginFailed: 'SmusLoginFailed',
+    /** Error code for when redeeming access token fails */
+    RedeemAccessTokenFailed: 'RedeemAccessTokenFailed',
+    /** Error code for when connection establish fails */
+    FailedAuthConnecton: 'FailedAuthConnecton',
+    /** Error code for when user cancels an operation */
+    UserCancelled: 'UserCancelled',
+    /** Error code for when domain account Id is missing */
+    AccountIdNotFound: 'AccountIdNotFound',
+    /** Error code for when resource ARN is missing */
+    ResourceArnNotFound: 'ResourceArnNotFound',
+    /** Error code for when fails to get domain account Id */
+    GetDomainAccountIdFailed: 'GetDomainAccountIdFailed',
+    /** Error code for when fails to get project account Id */
+    GetProjectAccountIdFailed: 'GetProjectAccountIdFailed',
+    /** Error code for when region is missing */
+    RegionNotFound: 'RegionNotFound',
+} as const
+
+/**
+ * Timeout constants for SMUS API calls (in milliseconds)
+ */
+export const SmusTimeouts = {
+    /** Default timeout for API calls: 10 seconds */
+    apiCallTimeoutMs: 10 * 1000,
+} as const
+
+/**
+ * Interface for AWS credential objects that need validation
+ */
+interface CredentialObject {
+    accessKeyId?: unknown
+    secretAccessKey?: unknown
+    sessionToken?: unknown
+    expiration?: unknown
+}
+
+/**
+ * Validates AWS credential fields and throws appropriate errors if invalid
+ * @param credentials The credential object to validate
+ * @param errorCode The error code to use in ToolkitError
+ * @param contextMessage The context message for error messages (e.g., "API response", "project credential response")
+ * @throws ToolkitError if any credential field is invalid
+ */
+export function validateCredentialFields(
+    credentials: CredentialObject,
+    errorCode: string,
+    contextMessage: string,
+    validateExpireTime: boolean = false
+): void {
+    if (!credentials.accessKeyId || typeof credentials.accessKeyId !== 'string') {
+        throw new ToolkitError(`Invalid accessKeyId in ${contextMessage}: ${typeof credentials.accessKeyId}`, {
+            code: errorCode,
+        })
+    }
+    if (!credentials.secretAccessKey || typeof credentials.secretAccessKey !== 'string') {
+        throw new ToolkitError(`Invalid secretAccessKey in ${contextMessage}: ${typeof credentials.secretAccessKey}`, {
+            code: errorCode,
+        })
+    }
+    if (!credentials.sessionToken || typeof credentials.sessionToken !== 'string') {
+        throw new ToolkitError(`Invalid sessionToken in ${contextMessage}: ${typeof credentials.sessionToken}`, {
+            code: errorCode,
+        })
+    }
+    if (validateExpireTime) {
+        if (!credentials.expiration || !(credentials.expiration instanceof Date)) {
+            throw new ToolkitError(`Invalid expireTime in ${contextMessage}: ${typeof credentials.expiration}`, {
+                code: errorCode,
+            })
+        }
+    }
+}
+
+/**
+ * Utility class for SageMaker Unified Studio domain URL parsing and validation
+ */
+export class SmusUtils {
+    private static readonly logger = getLogger()
+
+    /**
+     * Extracts the domain ID from a SageMaker Unified Studio domain URL
+     * @param domainUrl The SageMaker Unified Studio domain URL
+     * @returns The extracted domain ID or undefined if not found
+     */
+    public static extractDomainIdFromUrl(domainUrl: string): string | undefined {
+        try {
+            // Domain URL format: https://dzd_d3hr1nfjbtwui1.sagemaker.us-east-2.on.aws
+            const url = new URL(domainUrl)
+            const hostname = url.hostname
+
+            // Extract domain ID from hostname (dzd_d3hr1nfjbtwui1 or dzd-d3hr1nfjbtwui1)
+            const domainIdMatch = hostname.match(/^(dzd[-_][a-zA-Z0-9_-]{1,36})\./)
+            return domainIdMatch?.[1]
+        } catch (error) {
+            this.logger.error('Failed to extract domain ID from URL: %s', error as Error)
+            return undefined
+        }
+    }
+
+    /**
+     * Extracts the AWS region from a SageMaker Unified Studio domain URL
+     * @param domainUrl The SageMaker Unified Studio domain URL
+     * @param fallbackRegion Fallback region if extraction fails (default: 'us-east-1')
+     * @returns The extracted AWS region or the fallback region if not found
+     */
+    public static extractRegionFromUrl(domainUrl: string, fallbackRegion: string = 'us-east-1'): string {
+        try {
+            // Domain URL formats:
+            // - https://dzd_d3hr1nfjbtwui1.sagemaker.us-east-2.on.aws
+            // - https://dzd_4gickdfsxtoxg0.sagemaker-gamma.us-west-2.on.aws
+            const url = new URL(domainUrl)
+            const hostname = url.hostname
+
+            // Extract region from hostname, handling both prod and non-prod stages
+            // Pattern matches: .sagemaker[-stage].{region}.on.aws
+            const regionMatch = hostname.match(/\.sagemaker(?:-[a-z]+)?\.([a-z0-9-]+)\.on\.aws$/)
+            return regionMatch?.[1] || fallbackRegion
+        } catch (error) {
+            this.logger.error('Failed to extract region from URL: %s', error as Error)
+            return fallbackRegion
+        }
+    }
+
+    /**
+     * Extracts both domain ID and region from a SageMaker Unified Studio domain URL
+     * @param domainUrl The SageMaker Unified Studio domain URL
+     * @param fallbackRegion Fallback region if extraction fails (default: 'us-east-1')
+     * @returns Object containing domainId and region
+     */
+    public static extractDomainInfoFromUrl(
+        domainUrl: string,
+        fallbackRegion: string = 'us-east-1'
+    ): { domainId: string | undefined; region: string } {
+        return {
+            domainId: this.extractDomainIdFromUrl(domainUrl),
+            region: this.extractRegionFromUrl(domainUrl, fallbackRegion),
+        }
+    }
+
+    /**
+     * Validates the domain URL format for SageMaker Unified Studio
+     * @param value The URL to validate
+     * @returns Error message if invalid, undefined if valid
+     */
+    public static validateDomainUrl(value: string): string | undefined {
+        if (!value || value.trim() === '') {
+            return 'Domain URL is required'
+        }
+
+        const trimmedValue = value.trim()
+
+        // Check HTTPS requirement
+        if (!trimmedValue.startsWith('https://')) {
+            return 'Domain URL must use HTTPS (https://)'
+        }
+
+        // Check basic URL format
+        try {
+            const url = new URL(trimmedValue)
+
+            // Check if it looks like a SageMaker Unified Studio domain
+            if (!url.hostname.includes('sagemaker') || !url.hostname.includes('on.aws')) {
+                return 'URL must be a valid SageMaker Unified Studio domain (e.g., https://dzd_xxxxxxxxx.sagemaker.us-east-1.on.aws)'
+            }
+
+            // Extract domain ID to validate
+            const domainId = this.extractDomainIdFromUrl(trimmedValue)
+
+            if (!domainId) {
+                return 'URL must contain a valid domain ID (starting with dzd- or dzd_)'
+            }
+
+            return undefined // Valid
+        } catch (err) {
+            return 'Invalid URL format'
+        }
+    }
+
+    /**
+     * Makes HTTP call to DataZone /sso/login endpoint
+     * @param domainUrl The SageMaker Unified Studio domain URL
+     * @param domainId The extracted domain ID
+     * @returns Promise resolving to the login response
+     * @throws ToolkitError if the API call fails
+     */
+    private static async callDataZoneLogin(domainUrl: string, domainId: string): Promise<DataZoneSsoLoginResponse> {
+        const loginUrl = new URL('/sso/login', domainUrl)
+        const requestBody = {
+            domainId: domainId,
+        }
+
+        try {
+            const response = await fetch(loginUrl.toString(), {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    Accept: 'application/json',
+                    'User-Agent': 'aws-toolkit-vscode',
+                },
+                body: JSON.stringify(requestBody),
+                timeout: SmusTimeouts.apiCallTimeoutMs,
+            })
+
+            if (!response.ok) {
+                throw new ToolkitError(`SMUS login failed: ${response.status} ${response.statusText}`, {
+                    code: SmusErrorCodes.SmusLoginFailed,
+                })
+            }
+
+            return (await response.json()) as DataZoneSsoLoginResponse
+        } catch (error) {
+            // Handle timeout errors specifically
+            if (error instanceof Error && (error.name === 'AbortError' || error.message.includes('timeout'))) {
+                throw new ToolkitError(
+                    `DataZone login request timed out after ${SmusTimeouts.apiCallTimeoutMs / 1000} seconds`,
+                    {
+                        code: SmusErrorCodes.ApiTimeout,
+                        cause: error,
+                    }
+                )
+            }
+            // Re-throw other errors as-is
+            throw error
+        }
+    }
+
+    /**
+     * Gets SSO instance information by calling DataZone /sso/login endpoint
+     * This extracts the proper SSO instance ID and issuer URL needed for OAuth client registration
+     *
+     * @param domainUrl The SageMaker Unified Studio domain URL
+     * @returns Promise resolving to SSO instance information
+     * @throws ToolkitError if the API call fails or response is invalid
+     */
+    public static async getSsoInstanceInfo(domainUrl: string): Promise<SsoInstanceInfo> {
+        try {
+            this.logger.info(`SMUS Auth: Getting SSO instance info from DataZone for domainurl: ${domainUrl}`)
+
+            // Extract domain ID from the domain URL
+            const domainId = this.extractDomainIdFromUrl(domainUrl)
+            if (!domainId) {
+                throw new ToolkitError('Invalid domain URL format', { code: 'InvalidDomainUrl' })
+            }
+
+            // Call DataZone /sso/login endpoint to get redirect URL with SSO instance info
+            const loginData = await this.callDataZoneLogin(domainUrl, domainId)
+            if (!loginData.redirectUrl) {
+                throw new ToolkitError('No redirect URL received from DataZone login', { code: 'InvalidLoginResponse' })
+            }
+
+            // Parse the redirect URL to extract SSO instance information
+            const redirectUrl = new URL(loginData.redirectUrl)
+            const clientIdParam = redirectUrl.searchParams.get('client_id')
+            if (!clientIdParam) {
+                throw new ToolkitError('No client_id found in DataZone redirect URL', { code: 'InvalidRedirectUrl' })
+            }
+
+            // Decode the client_id ARN: arn:aws:sso::785498918019:application/ssoins-6684636af7e1a207/apl-5f60548b7f5677a2
+            const decodedClientId = decodeURIComponent(clientIdParam)
+            const arnParts = decodedClientId.split('/')
+            if (arnParts.length < 2) {
+                throw new ToolkitError('Invalid client_id ARN format', { code: 'InvalidArnFormat' })
+            }
+
+            const ssoInstanceId = arnParts[1] // Extract ssoins-6684636af7e1a207
+            const issuerUrl = `https://identitycenter.amazonaws.com/${ssoInstanceId}`
+
+            // Extract region from domain URL
+            const region = this.extractRegionFromUrl(domainUrl)
+
+            this.logger.info('SMUS Auth: Extracted SSO instance info: %s', ssoInstanceId)
+
+            return {
+                issuerUrl,
+                ssoInstanceId,
+                clientId: decodedClientId,
+                region,
+            }
+        } catch (error) {
+            const errorMsg = error instanceof Error ? error.message : 'Unknown error'
+            this.logger.error('SMUS Auth: Failed to get SSO instance info: %s', errorMsg)
+
+            if (error instanceof ToolkitError) {
+                throw error
+            }
+
+            throw new ToolkitError(`Failed to get SSO instance info: ${errorMsg}`, {
+                code: 'SsoInstanceInfoFailed',
+                cause: error instanceof Error ? error : undefined,
+            })
+        }
+    }
+    /**
+     * Extracts SSO ID from a user ID in the format "user-<sso-id>"
+     * @param userId The user ID to extract SSO ID from
+     * @returns The extracted SSO ID
+     * @throws Error if the userId format is invalid
+     */
+    public static extractSSOIdFromUserId(userId: string): string {
+        const match = userId.match(/user-(.+)$/)
+        if (!match) {
+            this.logger.error(`Invalid UserId format: ${userId}`)
+            throw new Error(`Invalid UserId format: ${userId}`)
+        }
+        return match[1]
+    }
+
+    /**
+     * Checks if we're in SMUS space environment (should hide certain UI elements)
+     * @returns True if in SMUS space environment with DataZone domain ID
+     */
+    public static isInSmusSpaceEnvironment(): boolean {
+        const isSMUSspace = isSageMaker('SMUS') || isSageMaker('SMUS-SPACE-REMOTE-ACCESS')
+        const resourceMetadata = getResourceMetadata()
+        return isSMUSspace && !!resourceMetadata?.AdditionalMetadata?.DataZoneDomainId
+    }
+}
+
+/**
+ * Extracts the account ID from a SageMaker ARN.
+ * Supports formats like:
+ *   arn:aws:sagemaker:<region>:<account_id>:app/*
+ *
+ * @param arn - The full SageMaker ARN string
+ * @returns The account ID from the ARN
+ * @throws If the ARN format is invalid
+ */
+export function extractAccountIdFromSageMakerArn(arn: string): string {
+    // Match the ARN components to extract account ID
+    const regex = /^arn:aws:sagemaker:(?<region>[^:]+):(?<accountId>\d+):(app|space)\/.+$/i
+    const match = arn.match(regex)
+
+    if (!match?.groups) {
+        throw new ToolkitError(`Invalid SageMaker ARN format: "${arn}"`)
+    }
+
+    return match.groups.accountId
+}
+
+/**
+ * Extracts account ID from ResourceArn in SMUS space environment
+ * @returns Promise resolving to the account ID
+ * @throws ToolkitError if unable to extract account ID
+ */
+export async function extractAccountIdFromResourceMetadata(): Promise<string> {
+    const logger = getLogger()
+
+    try {
+        logger.debug('SMUS: Extracting account ID from ResourceArn in resource-metadata file')
+
+        const resourceMetadata = getResourceMetadata()!
+        const resourceArn = resourceMetadata.ResourceArn
+
+        if (!resourceArn) {
+            throw new Error('ResourceArn not found in metadata file')
+        }
+
+        const accountId = extractAccountIdFromSageMakerArn(resourceArn)
+        logger.debug(`Successfully extracted account ID from resource-metadata file: ${accountId}`)
+
+        return accountId
+    } catch (err) {
+        logger.error(`Failed to extract account ID from ResourceArn: %s`, err)
+        throw new Error('Failed to extract AWS account ID from ResourceArn in SMUS space environment')
+    }
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/shared/telemetry.ts b/packages/core/src/sagemakerunifiedstudio/shared/telemetry.ts
new file mode 100644
index 00000000000..ceeb4828b83
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/shared/telemetry.ts
@@ -0,0 +1,122 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    SmusLogin,
+    SmusOpenRemoteConnection,
+    SmusRenderLakehouseNode,
+    SmusRenderS3Node,
+    SmusSignOut,
+    SmusStopSpace,
+    Span,
+} from '../../shared/telemetry/telemetry'
+import { SagemakerUnifiedStudioSpaceNode } from '../explorer/nodes/sageMakerUnifiedStudioSpaceNode'
+import { SageMakerUnifiedStudioSpacesParentNode } from '../explorer/nodes/sageMakerUnifiedStudioSpacesParentNode'
+import { SmusAuthenticationProvider } from '../auth/providers/smusAuthenticationProvider'
+import { getLogger } from '../../shared/logger/logger'
+import { getContext } from '../../shared/vscode/setContext'
+import { ConnectionCredentialsProvider } from '../auth/providers/connectionCredentialsProvider'
+import { DataZoneConnection, DataZoneClient } from './client/datazoneClient'
+
+/**
+ * Records space telemetry
+ */
+export async function recordSpaceTelemetry(
+    span: Span<SmusOpenRemoteConnection> | Span<SmusStopSpace>,
+    node: SagemakerUnifiedStudioSpaceNode
+) {
+    const logger = getLogger()
+
+    try {
+        const parent = node.resource.getParent() as SageMakerUnifiedStudioSpacesParentNode
+        const authProvider = SmusAuthenticationProvider.fromContext()
+        const accountId = await authProvider.getDomainAccountId()
+        const projectId = parent?.getProjectId()
+
+        // Get project account ID and region
+        let projectAccountId: string | undefined
+        let projectRegion: string | undefined
+
+        if (projectId) {
+            projectAccountId = await authProvider.getProjectAccountId(projectId)
+
+            // Get project region from tooling environment
+            const dzClient = await DataZoneClient.getInstance(authProvider)
+            const toolingEnv = await dzClient.getToolingEnvironment(projectId)
+            projectRegion = toolingEnv.awsAccountRegion
+        }
+
+        span.record({
+            smusSpaceKey: node.resource.DomainSpaceKey,
+            smusDomainRegion: node.resource.regionCode,
+            smusDomainId: parent?.getAuthProvider()?.activeConnection?.domainId,
+            smusDomainAccountId: accountId,
+            smusProjectId: projectId,
+            smusProjectAccountId: projectAccountId,
+            smusProjectRegion: projectRegion,
+        })
+    } catch (err) {
+        logger.error(`Failed to record space telemetry: ${(err as Error).message}`)
+    }
+}
+
+/**
+ * Records auth telemetry
+ */
+export async function recordAuthTelemetry(
+    span: Span<SmusLogin> | Span<SmusSignOut>,
+    authProvider: SmusAuthenticationProvider,
+    domainId: string | undefined,
+    region: string | undefined
+) {
+    const logger = getLogger()
+
+    span.record({
+        smusDomainId: domainId,
+        awsRegion: region,
+    })
+
+    try {
+        if (!region) {
+            throw new Error(`Region is undefined for domain ${domainId}`)
+        }
+        const accountId = await authProvider.getDomainAccountId()
+        span.record({
+            smusDomainAccountId: accountId,
+        })
+    } catch (err) {
+        logger.error(
+            `Failed to record Domain AccountId in data connection telemetry for domain ${domainId} in region ${region}: ${err}`
+        )
+    }
+}
+
+/**
+ * Records data connection telemetry for SMUS nodes
+ */
+export async function recordDataConnectionTelemetry(
+    span: Span<SmusRenderLakehouseNode> | Span<SmusRenderS3Node>,
+    connection: DataZoneConnection,
+    connectionCredentialsProvider: ConnectionCredentialsProvider
+) {
+    const logger = getLogger()
+
+    try {
+        const isInSmusSpace = getContext('aws.smus.inSmusSpaceEnvironment')
+        const accountId = await connectionCredentialsProvider.getDomainAccountId()
+        span.record({
+            smusToolkitEnv: isInSmusSpace ? 'smus_space' : 'local',
+            smusDomainId: connection.domainId,
+            smusDomainAccountId: accountId,
+            smusProjectId: connection.projectId,
+            smusConnectionId: connection.connectionId,
+            smusConnectionType: connection.type,
+            smusProjectRegion: connection.location?.awsRegion,
+            smusProjectAccountId: connection.location?.awsAccountId,
+        })
+    } catch (err) {
+        logger.error(`Failed to record data connection telemetry: ${(err as Error).message}`)
+    }
+}
diff --git a/packages/core/src/sagemakerunifiedstudio/shared/utils/resourceMetadataUtils.ts b/packages/core/src/sagemakerunifiedstudio/shared/utils/resourceMetadataUtils.ts
new file mode 100644
index 00000000000..61ce0430ecd
--- /dev/null
+++ b/packages/core/src/sagemakerunifiedstudio/shared/utils/resourceMetadataUtils.ts
@@ -0,0 +1,93 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { fs } from '../../../shared/fs/fs'
+import { getLogger } from '../../../shared/logger/logger'
+import { isSageMaker } from '../../../shared/extensionUtilities'
+
+/**
+ * Resource metadata schema used by `resource-metadata.json` in SageMaker Unified Studio spaces
+ */
+export type ResourceMetadata = {
+    AppType?: string
+    DomainId?: string
+    SpaceName?: string
+    UserProfileName?: string
+    ExecutionRoleArn?: string
+    ResourceArn?: string
+    ResourceName?: string
+    AppImageVersion?: string
+    AdditionalMetadata?: {
+        DataZoneDomainId?: string
+        DataZoneDomainRegion?: string
+        DataZoneEndpoint?: string
+        DataZoneEnvironmentId?: string
+        DataZoneProjectId?: string
+        DataZoneScopeName?: string
+        DataZoneStage?: string
+        DataZoneUserId?: string
+        PrivateSubnets?: string
+        ProjectS3Path?: string
+        SecurityGroup?: string
+    }
+    ResourceArnCaseSensitive?: string
+    IpAddressType?: string
+} & Record<string, any>
+
+const resourceMetadataPath = '/opt/ml/metadata/resource-metadata.json'
+let resourceMetadata: ResourceMetadata | undefined = undefined
+
+/**
+ * Gets the cached resource metadata (must be initialized with `initializeResourceMetadata()` first)
+ * @returns ResourceMetadata object or undefined if not yet initialized
+ */
+export function getResourceMetadata(): ResourceMetadata | undefined {
+    return resourceMetadata
+}
+
+/**
+ * Initializes resource metadata by reading and parsing the resource-metadata.json file
+ */
+export async function initializeResourceMetadata(): Promise<void> {
+    const logger = getLogger()
+
+    if (!isSageMaker('SMUS') && !isSageMaker('SMUS-SPACE-REMOTE-ACCESS')) {
+        logger.debug(`Not in SageMaker Unified Studio space, skipping initialization of resource metadata`)
+        return
+    }
+
+    try {
+        if (!(await resourceMetadataFileExists())) {
+            logger.debug(`Resource metadata file not found at: ${resourceMetadataPath}`)
+        }
+
+        const fileContent = await fs.readFileText(resourceMetadataPath)
+        resourceMetadata = JSON.parse(fileContent) as ResourceMetadata
+        logger.debug(`Successfully read resource metadata from: ${resourceMetadataPath}`)
+    } catch (error) {
+        logger.error(`Failed to read or parse resource metadata file: ${error as Error}`)
+    }
+}
+
+/**
+ * Checks if the resource-metadata.json file exists
+ * @returns True if the file exists, false otherwise
+ */
+export async function resourceMetadataFileExists(): Promise<boolean> {
+    try {
+        return await fs.existsFile(resourceMetadataPath)
+    } catch (error) {
+        const logger = getLogger()
+        logger.error(`Failed to check if resource metadata file exists: ${error as Error}`)
+        return false
+    }
+}
+
+/**
+ * Resets the cached resource metadata
+ */
+export function resetResourceMetadata(): void {
+    resourceMetadata = undefined
+}
diff --git a/packages/core/src/shared/activationReloadState.ts b/packages/core/src/shared/activationReloadState.ts
new file mode 100644
index 00000000000..bcdefa925f3
--- /dev/null
+++ b/packages/core/src/shared/activationReloadState.ts
@@ -0,0 +1,46 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Runtime } from '@aws-sdk/client-lambda'
+import globals from './extensionGlobals'
+
+export interface SamInitState {
+    template: string | undefined
+    readme: string | undefined
+    runtime: Runtime | undefined
+    architecture: string | undefined
+    isImage: boolean | undefined
+}
+
+/**
+ * Manages state that needs to be persisted across extension restart to workflows that mutate the workspace.
+ */
+export class ActivationReloadState {
+    public getSamInitState(): SamInitState | undefined {
+        return {
+            template: globals.globalState.get<string>('ACTIVATION_TEMPLATE_PATH_KEY'),
+            readme: globals.globalState.get<string>('ACTIVATION_LAUNCH_PATH_KEY'),
+            runtime: globals.globalState.get<Runtime>('SAM_INIT_RUNTIME_KEY'),
+            architecture: globals.globalState.get<string>('SAM_INIT_ARCH_KEY'),
+            isImage: globals.globalState.get<boolean>('SAM_INIT_IMAGE_BOOLEAN_KEY'),
+        }
+    }
+
+    public setSamInitState(state: SamInitState): void {
+        void globals.globalState.update('ACTIVATION_TEMPLATE_PATH_KEY', state.template)
+        void globals.globalState.update('ACTIVATION_LAUNCH_PATH_KEY', state.readme)
+        void globals.globalState.update('SAM_INIT_RUNTIME_KEY', state.runtime)
+        void globals.globalState.update('SAM_INIT_ARCH_KEY', state.architecture)
+        void globals.globalState.update('SAM_INIT_IMAGE_BOOLEAN_KEY', state.isImage)
+    }
+
+    public clearSamInitState(): void {
+        void globals.globalState.update('ACTIVATION_TEMPLATE_PATH_KEY', undefined)
+        void globals.globalState.update('ACTIVATION_LAUNCH_PATH_KEY', undefined)
+        void globals.globalState.update('SAM_INIT_RUNTIME_KEY', undefined)
+        void globals.globalState.update('SAM_INIT_ARCH_KEY', undefined)
+        void globals.globalState.update('SAM_INIT_IMAGE_BOOLEAN_KEY', undefined)
+    }
+}
diff --git a/packages/core/src/shared/awsClientBuilder.ts b/packages/core/src/shared/awsClientBuilder.ts
new file mode 100644
index 00000000000..849bdeeabd7
--- /dev/null
+++ b/packages/core/src/shared/awsClientBuilder.ts
@@ -0,0 +1,195 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Request, AWSError, Credentials } from 'aws-sdk'
+import { CredentialsOptions } from 'aws-sdk/lib/credentials'
+import { ServiceConfigurationOptions } from 'aws-sdk/lib/service'
+import { AwsContext } from './awsContext'
+import { DevSettings } from './settings'
+import { getUserAgent } from './telemetry/util'
+import { telemetry } from './telemetry/telemetry'
+import { isLocalStackConnection } from '../auth/utils'
+
+/** Suppresses a very noisy warning printed by AWS SDK v2, which clutters local debugging output, CI logs, etc. */
+export function disableAwsSdkWarning() {
+    // See https://github.com/aws/aws-sdk-js/issues/4354
+    require('aws-sdk/lib/maintenance_mode_message').suppress = true
+}
+
+// These are not on the public API but are very useful for logging purposes.
+// Tests guard against the possibility that these values change unexpectedly.
+// Since the field names are not prepended with `_` to signify visibility, the
+// fact that they're not in the API may have been an oversight.
+interface RequestExtras {
+    readonly service: AWS.Service
+    readonly operation: string
+    readonly params?: any
+}
+
+type RequestListener = (request: AWS.Request<any, AWSError> & RequestExtras) => void
+export type ServiceOptions = ServiceConfigurationOptions & {
+    /**
+     * The frequency and (lack of) idempotency of events is highly dependent on the SDK implementation
+     * For example, 'error' may fire more than once for a single request
+     *
+     * Example usage:
+     *
+     * ```ts
+     * const service = await builder.createAwsService(FakeService, {
+     *     onRequestSetup: [
+     *         req => {
+     *             console.log('req: %O [%O]', req.operation, req.params)
+     *             req.on('error', e => (errorCount += !e.originalError ? 1 : 0))
+     *         },
+     *     ],
+     * })
+     * ```
+     */
+    onRequestSetup?: RequestListener | RequestListener[]
+}
+
+export interface AWSClientBuilder {
+    /**
+     * Creates AWS service object of the given type, and sets options defaults.
+     *
+     * @param type  AWS service type
+     * @param options  AWS service configuration options
+     * @param region  AWS region override
+     * @param userAgent  Set the Toolkit user agent
+     * @returns
+     */
+    createAwsService<T extends AWS.Service>(
+        type: new (o: ServiceConfigurationOptions) => T,
+        options?: ServiceOptions,
+        region?: string,
+        userAgent?: boolean,
+        settings?: DevSettings
+    ): Promise<T>
+}
+
+export class DefaultAWSClientBuilder implements AWSClientBuilder {
+    public constructor(private readonly awsContext: AwsContext) {}
+
+    public async createAwsService<T extends AWS.Service>(
+        type: new (o: ServiceConfigurationOptions) => T,
+        options?: ServiceOptions,
+        region?: string,
+        userAgent: boolean = true,
+        settings = DevSettings.instance
+    ): Promise<T> {
+        const onRequest = options?.onRequestSetup ?? []
+        const listeners = Array.isArray(onRequest) ? onRequest : [onRequest]
+        const opt = { ...options }
+        delete opt.onRequestSetup
+        if (opt.credentialProvider) {
+            opt.credentials = await opt.credentialProvider.resolvePromise()
+        }
+
+        if (!opt.credentials && !opt.token && !opt.credentialProvider) {
+            const shim = this.awsContext.credentialsShim
+
+            if (!shim) {
+                throw new Error('Toolkit is not logged-in.')
+            }
+
+            opt.credentials = new (class extends Credentials {
+                public constructor() {
+                    // The class doesn't like being instantiated with empty creds
+                    super({ accessKeyId: '???', secretAccessKey: '???' })
+                }
+
+                public override get(callback: (err?: AWSError) => void): void {
+                    // Always try to fetch the latest creds first, attempting a refresh if needed
+                    // A 'passive' refresh is attempted first, before trying an 'active' one if certain criteria are met
+                    shim.get()
+                        .then((creds) => {
+                            this.loadCreds(creds)
+                            this.needsRefresh() ? this.refresh(callback) : callback()
+                        })
+                        .catch(callback)
+                }
+
+                public override refresh(callback: (err?: AWSError) => void): void {
+                    shim.refresh()
+                        .then((creds) => {
+                            this.loadCreds(creds)
+                            // The SDK V2 sets `expired` on certain errors so we should only
+                            // unset the flag after acquiring new credentials via `refresh`
+                            this.expired = false
+                            callback()
+                        })
+                        .catch(callback)
+                }
+
+                private loadCreds(creds: CredentialsOptions & { expiration?: Date }) {
+                    this.accessKeyId = creds.accessKeyId
+                    this.secretAccessKey = creds.secretAccessKey
+                    this.sessionToken = creds.sessionToken ?? this.sessionToken
+                    this.expireTime = creds.expiration ?? this.expireTime
+                }
+            })()
+        }
+
+        if (!opt.region && region) {
+            opt.region = region
+        }
+
+        if (userAgent && !opt.customUserAgent) {
+            opt.customUserAgent = getUserAgent({ includePlatform: true, includeClientId: true })
+        }
+
+        const apiConfig = (opt as { apiConfig?: { metadata?: Record<string, string> } } | undefined)?.apiConfig
+        const serviceName =
+            apiConfig?.metadata?.serviceId?.toLowerCase() ??
+            (type as unknown as { serviceIdentifier?: string }).serviceIdentifier
+
+        // Get endpoint url from the active profile if there's no endpoint directly passed as a parameter
+        const endpointUrl = this.awsContext.getCredentialEndpointUrl()
+        if (!('endpoint' in opt) && endpointUrl !== undefined) {
+            opt.endpoint = endpointUrl
+        }
+        if (isLocalStackConnection()) {
+            // Disable host prefixes for LocalStack
+            opt.hostPrefixEnabled = false
+        }
+        // Then check if there's an endpoint in the dev settings
+        if (serviceName) {
+            opt.endpoint = settings.get('endpoints', {})[serviceName] ?? opt.endpoint
+        }
+
+        const service = new type(opt)
+        const originalSetup = service.setupRequestListeners.bind(service)
+
+        // Record request IDs to the current context, potentially overriding the field if
+        // multiple API calls are made in the same context. We only do failures as successes
+        // are generally uninteresting and noisy.
+        listeners.push((request) => {
+            request.on('error', (err) => {
+                if (!err.retryable) {
+                    // TODO: update codegen so `record` enumerates all fields as a flat object instead of
+                    // intersecting all of the definitions
+                    interface RequestData {
+                        requestId?: string
+                        requestServiceType?: string
+                    }
+
+                    telemetry.record({
+                        requestId: err.requestId,
+                        requestServiceType: serviceName,
+                    } satisfies RequestData as any)
+                }
+            })
+        })
+
+        service.setupRequestListeners = (request: Request<any, AWSError>) => {
+            originalSetup(request)
+            for (const l of listeners) {
+                l(request as AWS.Request<any, AWSError> & RequestExtras)
+            }
+        }
+
+        return service
+    }
+}
diff --git a/packages/core/src/shared/awsClientBuilderV3.ts b/packages/core/src/shared/awsClientBuilderV3.ts
new file mode 100644
index 00000000000..4bc0f3ccbe6
--- /dev/null
+++ b/packages/core/src/shared/awsClientBuilderV3.ts
@@ -0,0 +1,320 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { CredentialsShim } from '../auth/deprecated/loginManager'
+import { AwsContext } from './awsContext'
+import {
+    AwsCredentialIdentityProvider,
+    Logger,
+    RetryStrategyV2,
+    TokenIdentity,
+    TokenIdentityProvider,
+} from '@smithy/types'
+import { getUserAgent } from './telemetry/util'
+import { DevSettings } from './settings'
+import {
+    BuildHandler,
+    BuildMiddleware,
+    DeserializeHandler,
+    DeserializeMiddleware,
+    Handler,
+    FinalizeHandler,
+    FinalizeRequestMiddleware,
+    HandlerExecutionContext,
+    MetadataBearer,
+    MiddlewareStack,
+    Provider,
+    RequestHandlerMetadata,
+    RequestHandlerOutput,
+    RetryStrategy,
+    UserAgent,
+} from '@aws-sdk/types'
+import { S3Client } from '@aws-sdk/client-s3'
+import { FetchHttpHandler } from '@smithy/fetch-http-handler'
+import { HttpResponse, HttpRequest } from '@aws-sdk/protocol-http'
+import { ConfiguredRetryStrategy } from '@smithy/util-retry'
+import { telemetry } from './telemetry/telemetry'
+import { getRequestId, getTelemetryReason, getTelemetryReasonDesc, getTelemetryResult } from './errors'
+import { extensionVersion } from './vscode/env'
+import { getLogger } from './logger/logger'
+import { partialClone } from './utilities/collectionUtils'
+import { selectFrom } from './utilities/tsUtils'
+import { once } from './utilities/functionUtils'
+import { isWeb } from './extensionGlobals'
+import { isLocalStackConnection } from '../auth/utils'
+
+export type AwsClientConstructor<C> = new (o: AwsClientOptions) => C
+export type AwsCommandConstructor<CommandInput extends object, Command extends AwsCommand<CommandInput, object>> = new (
+    o: CommandInput
+) => Command
+
+// AWS-SDKv3 does not export generic types for clients so we need to build them as needed
+// https://github.com/aws/aws-sdk-js-v3/issues/5856#issuecomment-2096950979
+export interface AwsClient {
+    middlewareStack: {
+        add: MiddlewareStack<any, MetadataBearer>['add']
+    }
+    send<InputType extends object, OutputType extends object>(
+        command: AwsCommand<InputType, OutputType>,
+        options?: any
+    ): Promise<OutputType>
+    destroy: () => void
+}
+
+export interface AwsCommand<InputType extends object, OutputType extends object> {
+    input: InputType
+    middlewareStack: any
+    resolveMiddleware: (stack: any, configuration: any, options: any) => Handler<any, any>
+}
+
+export interface AwsClientOptions {
+    credentials: AwsCredentialIdentityProvider
+    region: string | Provider<string>
+    userAgent: UserAgent
+    requestHandler: {
+        metadata?: RequestHandlerMetadata
+        handle: (req: any, options?: any) => Promise<RequestHandlerOutput<any>>
+        destroy?: () => void
+    }
+    apiVersion: string
+    endpoint: string
+    retryStrategy: RetryStrategy | RetryStrategyV2
+    logger: Logger
+    token: TokenIdentity | TokenIdentityProvider
+    forcePathStyle: boolean
+    hostPrefixEnabled: boolean
+}
+
+interface AwsServiceOptions<C extends AwsClient> {
+    serviceClient: AwsClientConstructor<C>
+    clientOptions?: Partial<AwsClientOptions>
+    region?: string
+    userAgent?: boolean
+    keepAlive?: boolean
+    settings?: DevSettings
+}
+
+export class AWSClientBuilderV3 {
+    private serviceCache: Map<string, AwsClient> = new Map()
+    public constructor(private readonly context: AwsContext) {}
+
+    private getShim(): CredentialsShim {
+        const shim = this.context.credentialsShim
+        if (!shim) {
+            throw new Error('Toolkit is not logged-in.')
+        }
+        return shim
+    }
+
+    private buildHttpHandler() {
+        const requestTimeout = 30000
+        // HACK: avoid importing node-http-handler on web.
+        return isWeb()
+            ? new FetchHttpHandler({ keepAlive: true, requestTimeout })
+            : new (require('@smithy/node-http-handler').NodeHttpHandler)({
+                  httpAgent: { keepAlive: true },
+                  httpsAgent: { keepAlive: true },
+                  requestTimeout,
+              })
+    }
+
+    private getHttpHandler = once(this.buildHttpHandler.bind(this))
+
+    private keyAwsService<C extends AwsClient>(serviceOptions: AwsServiceOptions<C>): string {
+        // Serializing certain objects in the args allows us to detect when nested objects change (ex. new retry strategy, endpoints)
+        return [
+            String(serviceOptions.serviceClient),
+            JSON.stringify(serviceOptions.clientOptions),
+            serviceOptions.region,
+            serviceOptions.userAgent ? '1' : '0',
+            this.context.getCredentialEndpointUrl(), // It gets the valid endpoint at the moment of creation
+            serviceOptions.settings ? JSON.stringify(serviceOptions.settings.get('endpoints', {})) : '',
+        ].join(':')
+    }
+
+    public getAwsService<C extends AwsClient>(serviceOptions: AwsServiceOptions<C>): C {
+        const key = this.keyAwsService(serviceOptions)
+        const cached = this.serviceCache.get(key)
+        if (cached) {
+            return cached as C
+        }
+
+        const service = this.createAwsService(serviceOptions)
+        this.serviceCache.set(key, service)
+        return service as C
+    }
+
+    public createAwsService<C extends AwsClient>(serviceOptions: AwsServiceOptions<C>): C {
+        const opt = (serviceOptions.clientOptions ?? {}) as AwsClientOptions
+        const userAgent = serviceOptions.userAgent ?? true
+        const keepAlive = serviceOptions.keepAlive ?? true
+
+        if (!opt.region && serviceOptions.region) {
+            opt.region = serviceOptions.region
+        }
+
+        if (!opt.userAgent && userAgent) {
+            opt.userAgent = [[getUserAgent({ includePlatform: true, includeClientId: true }), extensionVersion]]
+        }
+
+        if (!opt.retryStrategy) {
+            // Simple exponential backoff strategy as default.
+            opt.retryStrategy = new ConfiguredRetryStrategy(5, (attempt: number) => 1000 * 2 ** attempt)
+        }
+
+        if (!opt.requestHandler) {
+            opt.requestHandler = this.getHttpHandler()
+        }
+
+        if (!opt.credentials && !opt.token) {
+            const shim = this.getShim()
+            opt.credentials = async () => {
+                const creds = await shim.get()
+                if (creds.expiration && creds.expiration.getTime() < Date.now()) {
+                    return shim.refresh()
+                }
+                return creds
+            }
+        }
+        // Get endpoint url from the active profile if there's no endpoint directly passed as a parameter
+        const endpointUrl = this.context.getCredentialEndpointUrl()
+        if (!('endpoint' in opt) && endpointUrl !== undefined) {
+            // Because we check that 'endpoint' doesn't exist in `opt`, TS complains when we actually add it
+            // @ts-expect-error TS2339
+            opt.endpoint = endpointUrl
+        }
+        if (isLocalStackConnection()) {
+            // Disable host prefixes for LocalStack
+            opt.hostPrefixEnabled = false
+            // serviceClient name gets minified, but it's always consistent
+            if (serviceOptions.serviceClient.name === S3Client.name) {
+                // Use path-style S3 URLs for LocalStack
+                opt.forcePathStyle = true
+            }
+        }
+        const service = new serviceOptions.serviceClient(opt)
+        service.middlewareStack.add(telemetryMiddleware, { step: 'deserialize' })
+        service.middlewareStack.add(loggingMiddleware, { step: 'finalizeRequest' })
+        service.middlewareStack.add(getEndpointMiddleware(serviceOptions.settings), { step: 'build' })
+
+        if (keepAlive) {
+            service.middlewareStack.add(keepAliveMiddleware, { step: 'build' })
+        }
+        return service
+    }
+
+    public clearServiceCache() {
+        for (const client of this.serviceCache.values()) {
+            client.destroy()
+        }
+        this.serviceCache.clear()
+    }
+}
+
+export function getServiceId(context: { clientName?: string; commandName?: string }): string {
+    return context.clientName?.toLowerCase().replace(/client$/, '') ?? 'unknown-service'
+}
+
+/**
+ * Record request IDs to the current context, potentially overriding the field if
+ * multiple API calls are made in the same context. We only do failures as successes are generally uninteresting and noisy.
+ */
+export function recordErrorTelemetry(err: Error, serviceName?: string) {
+    telemetry.record({
+        requestId: getRequestId(err),
+        requestServiceType: serviceName,
+        reasonDesc: getTelemetryReasonDesc(err),
+        reason: getTelemetryReason(err),
+        result: getTelemetryResult(err),
+    })
+}
+
+function logAndThrow(e: any, serviceId: string, errorMessageAppend: string): never {
+    if (e instanceof Error) {
+        recordErrorTelemetry(e, serviceId)
+        getLogger().error('API Response %s: %O', errorMessageAppend, e)
+    }
+    throw e
+}
+
+const telemetryMiddleware: DeserializeMiddleware<any, any> =
+    (next: DeserializeHandler<any, any>, context: HandlerExecutionContext) => async (args: any) =>
+        emitOnRequest(next, context, args)
+
+const loggingMiddleware: FinalizeRequestMiddleware<any, any> = (next: FinalizeHandler<any, any>) => async (args: any) =>
+    logOnRequest(next, args)
+
+function getEndpointMiddleware(settings: DevSettings = DevSettings.instance): BuildMiddleware<any, any> {
+    return (next: BuildHandler<any, any>, context: HandlerExecutionContext) => async (args: any) =>
+        overwriteEndpoint(next, context, settings, args)
+}
+
+const keepAliveMiddleware: BuildMiddleware<any, any> = (next: BuildHandler<any, any>) => async (args: any) =>
+    addKeepAliveHeader(next, args)
+
+export async function emitOnRequest(next: DeserializeHandler<any, any>, context: HandlerExecutionContext, args: any) {
+    if (!HttpResponse.isInstance(args.request)) {
+        return next(args)
+    }
+    const serviceId = getServiceId(context as object)
+    const { hostname, path } = args.request
+    const logTail = `(${hostname} ${path})`
+    try {
+        const result = await next(args)
+        if (HttpResponse.isInstance(result.response)) {
+            // TODO: omit credentials / sensitive info from the telemetry.
+            const output = partialClone(result.output, 3)
+            getLogger().debug(`API Response %s: %O`, logTail, output)
+        }
+        return result
+    } catch (e: any) {
+        logAndThrow(e, serviceId, logTail)
+    }
+}
+
+export async function logOnRequest(next: FinalizeHandler<any, any>, args: any) {
+    const request = args.request
+    if (HttpRequest.isInstance(args.request)) {
+        const { hostname, path } = request
+        // TODO: omit credentials / sensitive info from the logs.
+        const input = partialClone(args.input, 3)
+        getLogger().debug(`API Request (%s %s): %O`, hostname, path, input)
+    }
+    return next(args)
+}
+
+export function overwriteEndpoint(
+    next: BuildHandler<any, any>,
+    context: HandlerExecutionContext,
+    settings: DevSettings,
+    args: any
+) {
+    const request = args.request
+    if (HttpRequest.isInstance(request)) {
+        const serviceId = getServiceId(context)
+        const endpoint = serviceId ? settings.get('endpoints', {})[serviceId] : undefined
+        if (endpoint) {
+            const url = new URL(endpoint)
+            Object.assign(request, selectFrom(url, 'hostname', 'port', 'protocol', 'pathname'))
+            request.path = (request as typeof request & { pathname: string }).pathname
+        }
+    }
+    return next(args)
+}
+
+/**
+ * Overwrite agents behavior and add the keepAliveHeader. This is needed due to
+ * https://github.com/microsoft/vscode/issues/173861.
+ * @param next
+ * @param args
+ * @returns
+ */
+export function addKeepAliveHeader(next: BuildHandler<any, any>, args: any) {
+    const request = args.request
+    if (HttpRequest.isInstance(request)) {
+        request.headers['Connection'] = 'keep-alive'
+    }
+    return next(args)
+}
diff --git a/packages/core/src/shared/awsConsole.ts b/packages/core/src/shared/awsConsole.ts
new file mode 100644
index 00000000000..db12e66727b
--- /dev/null
+++ b/packages/core/src/shared/awsConsole.ts
@@ -0,0 +1,50 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { AWSResourceNode } from './treeview/nodes/awsResourceNode'
+import { AWSTreeNodeBase } from './treeview/nodes/awsTreeNodeBase'
+import { StackNameNode } from '../awsService/appBuilder/explorer/nodes/deployedStack'
+import { openUrl } from './utilities/vsCodeUtils'
+
+export function getAwsConsoleUrl(
+    service: 'ecr' | 'cloudformation' | 'ec2-launch' | 'docdb',
+    region: string
+): vscode.Uri {
+    switch (service) {
+        case 'ecr':
+            return vscode.Uri.parse(`https://${region}.console.aws.amazon.com/ecr/repositories?region=${region}`)
+        case 'cloudformation':
+            return vscode.Uri.parse(`https://${region}.console.aws.amazon.com/cloudformation/home?region=${region}`)
+        case 'ec2-launch':
+            return vscode.Uri.parse(
+                `https://${region}.console.aws.amazon.com/ec2/home?region=${region}#LaunchInstances:`
+            )
+        case 'docdb':
+            return vscode.Uri.parse(`https://${region}.console.aws.amazon.com/docdb/home?region=${region}`)
+        default:
+            throw Error()
+    }
+}
+
+export async function openAwsConsoleCommand(node: AWSResourceNode) {
+    // All AWSResourceNodes that this function will receive are also AWSTreeNodeBase,
+    // so we should be able to get the region from them.
+    const regionCode = (node as unknown as AWSTreeNodeBase).regionCode
+    const arn = node.arn
+    await openUrlInConsole(regionCode, arn)
+}
+
+export async function openAwsCFNConsoleCommand(node: StackNameNode) {
+    const regionCode = node.resource.regionCode
+    const arn = node.resource.arn
+    await openUrlInConsole(regionCode, arn)
+}
+
+async function openUrlInConsole(regionCode: string | undefined, arn: string | undefined) {
+    const regionQuery = regionCode ? `region=${regionCode}&` : ''
+    const url = `https://console.aws.amazon.com/go/view?${regionQuery}arn=${arn}&source=aws-toolkit-vscode`
+    await openUrl(vscode.Uri.parse(url), 'AppBuilderOpenConsole')
+}
diff --git a/src/shared/awsContext.ts b/packages/core/src/shared/awsContext.ts
similarity index 88%
rename from src/shared/awsContext.ts
rename to packages/core/src/shared/awsContext.ts
index 8879ef8905e..9acb9e994fe 100644
--- a/src/shared/awsContext.ts
+++ b/packages/core/src/shared/awsContext.ts
@@ -1,18 +1,19 @@
 /*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as vscode from 'vscode'
 import * as AWS from '@aws-sdk/types'
-import { getLogger } from '../shared/logger'
+import { getLogger } from '../shared/logger/logger'
 import { ClassToInterfaceType } from './utilities/tsUtils'
-import { CredentialsShim } from '../credentials/loginManager'
+import { CredentialsShim } from '../auth/deprecated/loginManager'
 export interface AwsContextCredentials {
     readonly credentials: AWS.Credentials
     readonly credentialsId: string
     readonly accountId?: string
     readonly defaultRegion?: string
+    readonly endpointUrl?: string
 }
 
 /** AWS Toolkit context change */
@@ -77,7 +78,7 @@ export class DefaultAwsContext implements AwsContext {
      */
     public async getCredentials(): Promise<AWS.Credentials | undefined> {
         return (
-            this.shim?.get().catch(error => {
+            this.shim?.get().catch((error) => {
                 getLogger().warn(`credentials: failed to retrieve latest credentials: ${error.message}`)
                 return undefined
             }) ?? this.currentCredentials?.credentials
@@ -106,6 +107,13 @@ export class DefaultAwsContext implements AwsContext {
         return this.currentCredentials?.defaultRegion ?? defaultRegion
     }
 
+    /**
+     * Gets the endpoint URL configured for the current credentials profile, if any.
+     */
+    public getCredentialEndpointUrl(): string | undefined {
+        return this.currentCredentials?.endpointUrl
+    }
+
     private emitEvent() {
         // TODO(jmkeyes): skip this if the state did not actually change.
         this._onDidChangeContext.fire({
diff --git a/src/shared/awsContextCommands.ts b/packages/core/src/shared/awsContextCommands.ts
similarity index 79%
rename from src/shared/awsContextCommands.ts
rename to packages/core/src/shared/awsContextCommands.ts
index 373283ef082..aaf439b3f02 100644
--- a/src/shared/awsContextCommands.ts
+++ b/packages/core/src/shared/awsContextCommands.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -7,23 +7,24 @@ import * as vscode from 'vscode'
 import * as nls from 'vscode-nls'
 const localize = nls.loadMessageBundle()
 
-import { asString, CredentialsId } from '../credentials/providers/credentials'
+import { asString, CredentialsId } from '../auth/providers/credentials'
 import * as extensionConstants from './constants'
 import { UserCredentialsUtils } from './credentials/userCredentialsUtils'
 import * as localizedText from './localizedText'
 import { RegionProvider } from './regions/regionProvider'
 import { getIdeProperties } from './extensionUtilities'
 import { credentialHelpUrl } from './constants'
-import { PromptSettings } from './settings'
+import { ToolkitPromptSettings } from './settings'
 import { isNonNullable } from './utilities/tsUtils'
-import { loadSharedCredentialsProfiles } from '../credentials/sharedCredentials'
-import { CreateProfileWizard } from '../credentials/wizards/createProfile'
-import { Profile } from './credentials/credentialsFile'
-import { ProfileKey, staticCredentialsTemplate } from '../credentials/wizards/templates'
-import { SharedCredentialsProvider } from '../credentials/providers/sharedCredentialsProvider'
-import { Auth } from '../credentials/auth'
+import { CreateProfileWizard } from '../auth/wizards/createProfile'
+import { staticCredentialsTemplate } from '../auth/wizards/templates'
+import { SharedCredentialsProvider } from '../auth/providers/sharedCredentialsProvider'
+import { Auth } from '../auth/auth'
 import { CancellationError } from './utilities/timeoutUtils'
 import { ToolkitError } from './errors'
+import { loadSharedCredentialsProfiles } from '../auth/credentials/sharedCredentials'
+import { SharedCredentialsKeys } from '../auth/credentials/types'
+import { openUrl } from './utilities/vsCodeUtils'
 
 /**
  * @deprecated
@@ -31,7 +32,10 @@ import { ToolkitError } from './errors'
 export class AwsContextCommands {
     private readonly _regionProvider: RegionProvider
 
-    public constructor(regionProvider: RegionProvider, private readonly auth: Auth) {
+    public constructor(
+        regionProvider: RegionProvider,
+        private readonly auth: Auth
+    ) {
         this._regionProvider = regionProvider
     }
 
@@ -61,7 +65,7 @@ export class AwsContextCommands {
         await this.editCredentials()
         if (
             credentialsFiles.length === 0 &&
-            (await PromptSettings.instance.isPromptEnabled('createCredentialsProfile')) &&
+            ToolkitPromptSettings.instance.isPromptEnabled('createCredentialsProfile') &&
             (await this.promptCredentialsSetup())
         ) {
             await this.onCommandCreateCredentialsProfile()
@@ -100,8 +104,8 @@ export class AwsContextCommands {
             return false // User canceled.
         }
 
-        const selected = result.map(res => res.detail).filter(isNonNullable)
-        if (selected.length !== currentRegions.size || selected.some(r => !currentRegions.has(r))) {
+        const selected = result.map((res) => res.detail).filter(isNonNullable)
+        if (selected.length !== currentRegions.size || selected.some((r) => !currentRegions.has(r))) {
             await this._regionProvider.updateExplorerRegions(selected)
             await vscode.commands.executeCommand('aws.refreshAwsExplorer', true)
         }
@@ -116,12 +120,8 @@ export class AwsContextCommands {
      * @returns The profile name, or undefined if user cancelled
      */
     public async promptAndCreateNewCredentialsFile(): Promise<string | undefined> {
-        const profiles = {} as Record<string, Profile>
-        for (const [k, v] of (await loadSharedCredentialsProfiles()).entries()) {
-            profiles[k] = v
-        }
-
-        const wizard = new CreateProfileWizard(profiles, staticCredentialsTemplate)
+        const existingProfiles = await loadSharedCredentialsProfiles()
+        const wizard = new CreateProfileWizard(existingProfiles, staticCredentialsTemplate)
         const resp = await wizard.run()
         if (!resp) {
             return
@@ -129,8 +129,8 @@ export class AwsContextCommands {
 
         await UserCredentialsUtils.generateCredentialsFile({
             profileName: resp.name,
-            accessKey: resp.profile[ProfileKey.AccessKeyId]!,
-            secretKey: resp.profile[ProfileKey.SecretKey]!,
+            accessKey: resp.profile[SharedCredentialsKeys.AWS_ACCESS_KEY_ID]!,
+            secretKey: resp.profile[SharedCredentialsKeys.AWS_SECRET_ACCESS_KEY]!,
         })
 
         const sharedProviderId: CredentialsId = {
@@ -138,7 +138,7 @@ export class AwsContextCommands {
             credentialTypeId: resp.name,
         }
 
-        vscode.window.showInformationMessage(
+        void vscode.window.showInformationMessage(
             localize(
                 'AWS.message.prompt.credentials.definition.done',
                 'Created {0} credentials profile: {1}',
@@ -167,9 +167,9 @@ export class AwsContextCommands {
         if (userResponse === localizedText.yes) {
             return true
         } else if (userResponse === localizedText.no) {
-            PromptSettings.instance.disablePrompt('createCredentialsProfile')
+            await ToolkitPromptSettings.instance.disablePrompt('createCredentialsProfile')
         } else if (userResponse === localizedText.help) {
-            vscode.env.openExternal(vscode.Uri.parse(credentialHelpUrl))
+            await openUrl(vscode.Uri.parse(credentialHelpUrl))
             return await this.promptCredentialsSetup()
         }
 
@@ -205,7 +205,7 @@ export class AwsContextCommands {
         )
 
         if (response && response === localizedText.viewDocs) {
-            await vscode.env.openExternal(vscode.Uri.parse(extensionConstants.aboutCredentialsFileUrl))
+            await openUrl(vscode.Uri.parse(extensionConstants.aboutCredentialsFileUrl))
         }
     }
 }
diff --git a/packages/core/src/shared/clients/apiGateway.ts b/packages/core/src/shared/clients/apiGateway.ts
new file mode 100644
index 00000000000..eeae7144712
--- /dev/null
+++ b/packages/core/src/shared/clients/apiGateway.ts
@@ -0,0 +1,83 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { ClientWrapper } from './clientWrapper'
+import {
+    APIGatewayClient as ApiGatewayClientSDK,
+    GetResourcesCommand,
+    GetResourcesRequest,
+    GetRestApisCommand,
+    GetRestApisRequest,
+    GetStagesCommand,
+    Resource,
+    Resources,
+    RestApi,
+    RestApis,
+    Stages,
+    TestInvokeMethodCommand,
+    TestInvokeMethodRequest,
+    TestInvokeMethodResponse,
+} from '@aws-sdk/client-api-gateway'
+
+export class ApiGatewayClient extends ClientWrapper<ApiGatewayClientSDK> {
+    public constructor(regionCode: string) {
+        super(regionCode, ApiGatewayClientSDK)
+    }
+
+    public async *getResourcesForApi(apiId: string): AsyncIterableIterator<Resource> {
+        const request: GetResourcesRequest = {
+            restApiId: apiId,
+        }
+
+        do {
+            const response: Resources = await this.makeRequest(GetResourcesCommand, request)
+
+            if (response.items !== undefined && response.items.length > 0) {
+                yield* response.items
+            }
+
+            request.position = response.position
+        } while (request.position !== undefined)
+    }
+
+    public async getStages(apiId: string): Promise<Stages> {
+        return this.makeRequest(GetStagesCommand, {
+            restApiId: apiId,
+        })
+    }
+
+    public async *listApis(): AsyncIterableIterator<RestApi> {
+        const request: GetRestApisRequest = {}
+
+        do {
+            const response: RestApis = await this.makeRequest(GetRestApisCommand, request)
+
+            if (response.items !== undefined && response.items.length > 0) {
+                yield* response.items
+            }
+
+            request.position = response.position
+        } while (request.position !== undefined)
+    }
+
+    public async testInvokeMethod(
+        apiId: string,
+        resourceId: string,
+        method: string,
+        body: string,
+        pathWithQueryString: string | undefined
+    ): Promise<TestInvokeMethodResponse> {
+        const request: TestInvokeMethodRequest = {
+            restApiId: apiId,
+            resourceId: resourceId,
+            httpMethod: method,
+            body: body,
+        }
+        if (pathWithQueryString) {
+            request.pathWithQueryString = pathWithQueryString
+        }
+
+        return this.makeRequest(TestInvokeMethodCommand, request)
+    }
+}
diff --git a/packages/core/src/shared/clients/apprunner.ts b/packages/core/src/shared/clients/apprunner.ts
new file mode 100644
index 00000000000..a2179167c26
--- /dev/null
+++ b/packages/core/src/shared/clients/apprunner.ts
@@ -0,0 +1,117 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as AppRunner from '@aws-sdk/client-apprunner'
+import { ClientWrapper } from './clientWrapper'
+import { hasProps, RequiredProps } from '../utilities/tsUtils'
+import { AsyncCollection } from '../utilities/asyncCollection'
+
+export type ServiceSummary = RequiredProps<
+    AppRunner.ServiceSummary,
+    'ServiceName' | 'ServiceArn' | 'Status' | 'ServiceId'
+>
+export type ImageRepository = RequiredProps<AppRunner.ImageRepository, 'ImageIdentifier' | 'ImageRepositoryType'>
+
+export type CodeConfigurationValues = RequiredProps<AppRunner.CodeConfigurationValues, 'Runtime'>
+interface CodeConfiguration extends RequiredProps<AppRunner.CodeConfiguration, 'ConfigurationSource'> {
+    CodeConfigurationValues: CodeConfigurationValues
+}
+export interface CodeRepository extends RequiredProps<AppRunner.CodeRepository, 'RepositoryUrl'> {
+    SourceCodeVersion: RequiredProps<AppRunner.SourceCodeVersion, 'Type' | 'Value'>
+    CodeConfiguration: CodeConfiguration
+}
+export interface SourceConfiguration extends AppRunner.SourceConfiguration {
+    CodeRepository?: CodeRepository
+    ImageRepository?: RequiredProps<ImageRepository, 'ImageIdentifier' | 'ImageRepositoryType'>
+}
+export interface CreateServiceRequest extends RequiredProps<AppRunner.CreateServiceRequest, 'ServiceName'> {
+    SourceConfiguration: SourceConfiguration
+}
+
+// Note: Many of the requests return a type of Service, but Service <: ServiceSummary.
+type WithServiceSummary<T> = Omit<T, 'Service'> & { Service: ServiceSummary }
+export class AppRunnerClient extends ClientWrapper<AppRunner.AppRunnerClient> {
+    public constructor(regionCode: string) {
+        super(regionCode, AppRunner.AppRunnerClient)
+    }
+
+    public async createService(
+        request: CreateServiceRequest
+    ): Promise<WithServiceSummary<AppRunner.CreateServiceResponse>> {
+        return await this.makeRequest(AppRunner.CreateServiceCommand, request)
+    }
+
+    public async listServices(request: AppRunner.ListServicesRequest): Promise<AppRunner.ListServicesResponse> {
+        return await this.makeRequest(AppRunner.ListServicesCommand, request)
+    }
+
+    public paginateServices(request: AppRunner.ListServicesRequest): AsyncCollection<ServiceSummary[]> {
+        return this.makePaginatedRequest(
+            AppRunner.paginateListServices,
+            request,
+            (page) => page.ServiceSummaryList
+        ).map((summaries) => summaries.filter(isServiceSummary))
+
+        function isServiceSummary(s: AppRunner.ServiceSummary): s is ServiceSummary {
+            return hasProps(s, 'ServiceName', 'ServiceArn', 'Status', 'ServiceId')
+        }
+    }
+
+    public async pauseService(
+        request: AppRunner.PauseServiceRequest
+    ): Promise<WithServiceSummary<AppRunner.PauseServiceResponse>> {
+        return await this.makeRequest(AppRunner.PauseServiceCommand, request)
+    }
+
+    public async resumeService(
+        request: AppRunner.ResumeServiceRequest
+    ): Promise<WithServiceSummary<AppRunner.ResumeServiceResponse>> {
+        return await this.makeRequest(AppRunner.ResumeServiceCommand, request)
+    }
+
+    public async updateService(
+        request: AppRunner.UpdateServiceRequest
+    ): Promise<WithServiceSummary<AppRunner.UpdateServiceResponse>> {
+        return await this.makeRequest(AppRunner.UpdateServiceCommand, request)
+    }
+
+    public async createConnection(
+        request: AppRunner.CreateConnectionRequest
+    ): Promise<AppRunner.CreateConnectionResponse> {
+        return await this.makeRequest(AppRunner.CreateConnectionCommand, request)
+    }
+
+    public async listConnections(
+        request: AppRunner.ListConnectionsRequest = {}
+    ): Promise<AppRunner.ConnectionSummary[]> {
+        const result: AppRunner.ListConnectionsResponse = await this.makeRequest(
+            AppRunner.ListConnectionsCommand,
+            request
+        )
+        return result.ConnectionSummaryList ?? []
+    }
+
+    public async describeService(
+        request: AppRunner.DescribeServiceRequest
+    ): Promise<WithServiceSummary<AppRunner.DescribeServiceResponse>> {
+        return await this.makeRequest(AppRunner.DescribeServiceCommand, request)
+    }
+
+    public async startDeployment(
+        request: AppRunner.StartDeploymentRequest
+    ): Promise<AppRunner.StartDeploymentResponse> {
+        return await this.makeRequest(AppRunner.StartDeploymentCommand, request)
+    }
+
+    public async listOperations(request: AppRunner.ListOperationsRequest): Promise<AppRunner.ListOperationsResponse> {
+        return await this.makeRequest(AppRunner.ListOperationsCommand, request)
+    }
+
+    public async deleteService(
+        request: AppRunner.DeleteServiceRequest
+    ): Promise<WithServiceSummary<AppRunner.DeleteServiceResponse>> {
+        return this.makeRequest(AppRunner.DeleteServiceCommand, request)
+    }
+}
diff --git a/packages/core/src/shared/clients/clientWrapper.ts b/packages/core/src/shared/clients/clientWrapper.ts
new file mode 100644
index 00000000000..beb117a9bf6
--- /dev/null
+++ b/packages/core/src/shared/clients/clientWrapper.ts
@@ -0,0 +1,70 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import globals from '../extensionGlobals'
+import { AwsClient, AwsClientConstructor, AwsCommand, AwsCommandConstructor } from '../awsClientBuilderV3'
+import { PaginationConfiguration, Paginator } from '@aws-sdk/types'
+import { AsyncCollection, toCollection } from '../utilities/asyncCollection'
+import { isDefined } from '../utilities/tsUtils'
+
+type SDKPaginator<C, CommandInput extends object, CommandOutput extends object> = (
+    config: Omit<PaginationConfiguration, 'client'> & { client: C },
+    input: CommandInput,
+    ...rest: any[]
+) => Paginator<CommandOutput>
+export abstract class ClientWrapper<C extends AwsClient> implements vscode.Disposable {
+    protected client?: C
+
+    public constructor(
+        public readonly regionCode: string,
+        private readonly clientType: AwsClientConstructor<C>
+    ) {}
+
+    protected getClient(ignoreCache: boolean = false) {
+        const args = {
+            serviceClient: this.clientType,
+            region: this.regionCode,
+        }
+        return ignoreCache
+            ? globals.sdkClientBuilderV3.createAwsService(args)
+            : globals.sdkClientBuilderV3.getAwsService(args)
+    }
+
+    protected async makeRequest<
+        CommandInput extends object,
+        CommandOutput extends object,
+        CommandOptions extends CommandInput,
+        Command extends AwsCommand<CommandInput, CommandOutput>,
+    >(command: AwsCommandConstructor<CommandInput, Command>, commandOptions: CommandOptions): Promise<CommandOutput> {
+        return await this.getClient().send(new command(commandOptions))
+    }
+
+    protected makePaginatedRequest<CommandInput extends object, CommandOutput extends object, Output extends object>(
+        paginator: SDKPaginator<C, CommandInput, CommandOutput>,
+        input: CommandInput,
+        extractPage: (page: CommandOutput) => Output[] | undefined
+    ): AsyncCollection<Output[]> {
+        const p = paginator({ client: this.getClient() }, input)
+        const collection = toCollection(() => p)
+            .map(extractPage)
+            .filter(isDefined)
+            .map((o) => o.filter(isDefined))
+
+        return collection
+    }
+
+    protected async getFirst<CommandInput extends object, CommandOutput extends object, Output extends object>(
+        paginator: SDKPaginator<C, CommandInput, CommandOutput>,
+        input: CommandInput,
+        extractPage: (page: CommandOutput) => Output[] | undefined
+    ): Promise<Output> {
+        const results = await this.makePaginatedRequest(paginator, input, extractPage).flatten().promise()
+        return results[0]
+    }
+
+    public dispose() {
+        this.client?.destroy()
+    }
+}
diff --git a/packages/core/src/shared/clients/cloudControl.ts b/packages/core/src/shared/clients/cloudControl.ts
new file mode 100644
index 00000000000..664ae2db70f
--- /dev/null
+++ b/packages/core/src/shared/clients/cloudControl.ts
@@ -0,0 +1,116 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as CloudControl from '@aws-sdk/client-cloudcontrol'
+import globals from '../extensionGlobals'
+import { localize } from '../utilities/vsCodeUtils'
+import { ClientWrapper } from './clientWrapper'
+
+export class CloudControlClient extends ClientWrapper<CloudControl.CloudControlClient> {
+    public constructor(regionCode: string) {
+        super(regionCode, CloudControl.CloudControlClient)
+    }
+
+    public async createResource(request: CloudControl.CreateResourceInput): Promise<CloudControl.CreateResourceOutput> {
+        const createResponse: CloudControl.CreateResourceOutput = await this.makeRequest(
+            CloudControl.CreateResourceCommand,
+            request
+        )
+
+        await this.pollForCompletion(createResponse.ProgressEvent!)
+        return createResponse
+    }
+
+    public async deleteResource(request: CloudControl.DeleteResourceInput): Promise<void> {
+        const deleteResponse: CloudControl.DeleteResourceOutput = await this.makeRequest(
+            CloudControl.DeleteResourceCommand,
+            request
+        )
+
+        await this.pollForCompletion(deleteResponse.ProgressEvent!)
+    }
+
+    public async listResources(request: CloudControl.ListResourcesInput): Promise<CloudControl.ListResourcesOutput> {
+        return await this.makeRequest(CloudControl.ListResourcesCommand, request)
+    }
+
+    public async getResource(request: CloudControl.GetResourceInput): Promise<CloudControl.GetResourceOutput> {
+        return await this.makeRequest(CloudControl.GetResourceCommand, request)
+    }
+
+    public async updateResource(request: CloudControl.UpdateResourceInput): Promise<void> {
+        const updateResponse: CloudControl.UpdateResourceOutput = await this.makeRequest(
+            CloudControl.UpdateResourceCommand,
+            request
+        )
+
+        await this.pollForCompletion(updateResponse.ProgressEvent!)
+    }
+
+    private async getResourceRequestStatus(
+        request: CloudControl.GetResourceRequestStatusInput
+    ): Promise<CloudControl.GetResourceRequestStatusOutput> {
+        return await this.makeRequest(CloudControl.GetResourceRequestStatusCommand, request)
+    }
+
+    private async pollForCompletion(
+        progressEvent: CloudControl.ProgressEvent,
+        baseDelay: number = 500,
+        maxRetries: number = 10
+    ): Promise<void> {
+        for (let i = 0; i < maxRetries; i++) {
+            const operationStatus = progressEvent.OperationStatus
+
+            switch (operationStatus) {
+                case 'SUCCESS':
+                    return
+                case 'FAILED':
+                    throw new Error(
+                        localize(
+                            'AWS.message.error.cloudControl.pollResourceStatus.failed',
+                            'Resource operation failed: {0} ({1})',
+                            progressEvent.StatusMessage,
+                            progressEvent.ErrorCode
+                        )
+                    )
+                case 'CANCEL_COMPLETE':
+                    throw new Error(
+                        localize(
+                            'AWS.message.error.cloudControl.pollResourceStatus.cancelled',
+                            'Resource operation cancelled: {0}',
+                            progressEvent.StatusMessage
+                        )
+                    )
+                case 'IN_PROGRESS':
+                case 'CANCEL_IN_PROGRESS':
+                case 'PENDING':
+                    break
+                default:
+                    throw new Error(
+                        localize(
+                            'AWS.message.error.cloudControl.pollResourceStatus.invalidOperationStatus',
+                            'Invalid resource operation status: {0}',
+                            operationStatus
+                        )
+                    )
+            }
+
+            if (i + 1 < maxRetries) {
+                await new Promise<void>((resolve) => globals.clock.setTimeout(resolve, baseDelay * 2 ** i))
+                const resourceRequestStatus = await this.getResourceRequestStatus({
+                    RequestToken: progressEvent.RequestToken,
+                })
+                progressEvent = resourceRequestStatus.ProgressEvent!
+            }
+        }
+        throw new Error(
+            localize(
+                'AWS.message.error.cloudControl.pollResourceStatus.timeout',
+                'Failed to get terminal resource operation status for {0} before timeout. Please try again later',
+                progressEvent.Identifier
+            )
+        )
+    }
+}
diff --git a/packages/core/src/shared/clients/cloudFormation.ts b/packages/core/src/shared/clients/cloudFormation.ts
new file mode 100644
index 00000000000..f04d2fdeb08
--- /dev/null
+++ b/packages/core/src/shared/clients/cloudFormation.ts
@@ -0,0 +1,94 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as CloudFormation from '@aws-sdk/client-cloudformation'
+import { AsyncCollection } from '../utilities/asyncCollection'
+import { hasProps, isNonNullable, RequiredProps } from '../utilities/tsUtils'
+import { ClientWrapper } from './clientWrapper'
+
+export interface StackSummary
+    extends RequiredProps<CloudFormation.StackSummary, 'StackName' | 'CreationTime' | 'StackStatus'> {
+    DriftInformation: RequiredProps<CloudFormation.StackDriftInformation, 'StackDriftStatus'>
+}
+
+export type StackResource = RequiredProps<CloudFormation.StackResource, 'ResourceType'>
+
+export interface DescribeStackResourcesOutput extends CloudFormation.DescribeStackResourcesOutput {
+    StackResources: StackResource[]
+}
+export class CloudFormationClient extends ClientWrapper<CloudFormation.CloudFormationClient> {
+    public constructor(regionCode: string) {
+        super(regionCode, CloudFormation.CloudFormationClient)
+    }
+
+    public async deleteStack(name: string): Promise<CloudFormation.DeleteStackCommandOutput> {
+        return await this.makeRequest(CloudFormation.DeleteStackCommand, { StackName: name })
+    }
+
+    public async describeType(typeName: string): Promise<CloudFormation.DescribeTypeOutput> {
+        return await this.makeRequest(CloudFormation.DescribeTypeCommand, { TypeName: typeName })
+    }
+
+    public async *listStacks(
+        statusFilter: CloudFormation.StackStatus[] = ['CREATE_COMPLETE', 'UPDATE_COMPLETE']
+    ): AsyncIterableIterator<StackSummary> {
+        const request: CloudFormation.ListStacksInput = {
+            StackStatusFilter: statusFilter,
+        }
+
+        do {
+            const response: CloudFormation.ListStacksOutput = await this.makeRequest(
+                CloudFormation.ListStacksCommand,
+                request
+            )
+
+            const filteredResponse = response.StackSummaries?.filter(isStackSummary)
+            if (filteredResponse && filteredResponse.length > 0) {
+                yield* filteredResponse
+            }
+
+            request.NextToken = response.NextToken
+        } while (request.NextToken)
+    }
+
+    public listAllStacks(request: CloudFormation.ListStacksInput = {}): AsyncCollection<StackSummary[]> {
+        return this.makePaginatedRequest(CloudFormation.paginateListStacks, request, (page) => page.StackSummaries).map(
+            (s) => s.filter(isStackSummary)
+        )
+    }
+
+    public async *listTypes(): AsyncIterableIterator<CloudFormation.TypeSummary> {
+        const request: CloudFormation.ListTypesInput = {
+            DeprecatedStatus: 'LIVE',
+            Type: 'RESOURCE',
+            Visibility: 'PUBLIC',
+        }
+
+        do {
+            const response: CloudFormation.ListTypesOutput = await this.makeRequest(
+                CloudFormation.ListTypesCommand,
+                request
+            )
+
+            if (response.TypeSummaries) {
+                yield* response.TypeSummaries
+            }
+
+            request.NextToken = response.NextToken
+        } while (request.NextToken)
+    }
+
+    public async describeStackResources(name: string): Promise<DescribeStackResourcesOutput> {
+        return await this.makeRequest(CloudFormation.DescribeStackResourcesCommand, { StackName: name })
+    }
+}
+
+function isStackSummary(s: CloudFormation.StackSummary | undefined): s is StackSummary {
+    return (
+        isNonNullable(s) &&
+        hasProps(s, 'StackName', 'CreationTime', 'StackStatus', 'DriftInformation') &&
+        hasProps(s.DriftInformation, 'StackDriftStatus')
+    )
+}
diff --git a/packages/core/src/shared/clients/cloudWatchLogs.ts b/packages/core/src/shared/clients/cloudWatchLogs.ts
new file mode 100644
index 00000000000..5e43470fa3a
--- /dev/null
+++ b/packages/core/src/shared/clients/cloudWatchLogs.ts
@@ -0,0 +1,46 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as CloudWatchLogs from '@aws-sdk/client-cloudwatch-logs'
+import { ClientWrapper } from './clientWrapper'
+
+export class CloudWatchLogsClient extends ClientWrapper<CloudWatchLogs.CloudWatchLogsClient> {
+    public constructor(regionCode: string) {
+        super(regionCode, CloudWatchLogs.CloudWatchLogsClient)
+    }
+
+    public async *describeLogGroups(
+        request: CloudWatchLogs.DescribeLogGroupsRequest = {}
+    ): AsyncIterableIterator<CloudWatchLogs.LogGroup> {
+        do {
+            const response: CloudWatchLogs.DescribeLogGroupsResponse = await this.makeRequest(
+                CloudWatchLogs.DescribeLogGroupsCommand,
+                request
+            )
+            if (response.logGroups) {
+                yield* response.logGroups
+            }
+            request.nextToken = response.nextToken
+        } while (request.nextToken)
+    }
+
+    public async describeLogStreams(
+        request: CloudWatchLogs.DescribeLogStreamsRequest
+    ): Promise<CloudWatchLogs.DescribeLogStreamsResponse> {
+        return await this.makeRequest(CloudWatchLogs.DescribeLogStreamsCommand, request)
+    }
+
+    public async getLogEvents(
+        request: CloudWatchLogs.GetLogEventsRequest
+    ): Promise<CloudWatchLogs.GetLogEventsResponse> {
+        return await this.makeRequest(CloudWatchLogs.GetLogEventsCommand, request)
+    }
+
+    public async filterLogEvents(
+        request: CloudWatchLogs.FilterLogEventsRequest
+    ): Promise<CloudWatchLogs.FilterLogEventsResponse> {
+        return await this.makeRequest(CloudWatchLogs.FilterLogEventsCommand, request)
+    }
+}
diff --git a/packages/core/src/shared/clients/codecatalystClient.ts b/packages/core/src/shared/clients/codecatalystClient.ts
new file mode 100644
index 00000000000..b7618fe01b0
--- /dev/null
+++ b/packages/core/src/shared/clients/codecatalystClient.ts
@@ -0,0 +1,971 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../extensionGlobals'
+
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as logger from '../logger/logger'
+import { CancellationError, Timeout, waitTimeout, waitUntil } from '../utilities/timeoutUtils'
+import { isUserCancelledError } from '../../shared/errors'
+import { showMessageWithCancel } from '../utilities/messages'
+import {
+    assertHasProps,
+    ClassToInterfaceType,
+    hasProps,
+    isDefined,
+    isNonNullable,
+    RequiredProps,
+} from '../utilities/tsUtils'
+import { AsyncCollection, toCollection } from '../utilities/asyncCollection'
+import { joinAll, pageableToCollection } from '../utilities/collectionUtils'
+import { ToolkitError } from '../errors'
+import { Uri } from 'vscode'
+import {
+    CodeCatalystClient as CodeCatalystSDKClient,
+    CreateAccessTokenCommand,
+    CreateAccessTokenRequest,
+    CreateAccessTokenResponse,
+    CreateDevEnvironmentCommand,
+    CreateDevEnvironmentCommandOutput,
+    CreateDevEnvironmentRequest,
+    CreateProjectCommand,
+    CreateProjectRequest,
+    CreateSourceRepositoryBranchCommand,
+    CreateSourceRepositoryBranchRequest,
+    CreateSourceRepositoryBranchResponse,
+    DeleteDevEnvironmentCommand,
+    DeleteDevEnvironmentRequest,
+    DeleteDevEnvironmentResponse,
+    DevEnvironmentRepositorySummary,
+    DevEnvironmentSummary,
+    GetDevEnvironmentCommand,
+    GetDevEnvironmentRequest,
+    GetDevEnvironmentResponse,
+    GetProjectCommand,
+    GetProjectCommandOutput,
+    GetProjectRequest,
+    GetSourceRepositoryCloneUrlsCommand,
+    GetSourceRepositoryCloneUrlsRequest,
+    GetSourceRepositoryCloneUrlsResponse,
+    GetSpaceCommand,
+    GetSpaceCommandOutput,
+    GetSpaceRequest,
+    GetSubscriptionCommand,
+    GetSubscriptionRequest,
+    GetSubscriptionResponse,
+    GetUserDetailsCommand,
+    GetUserDetailsCommandOutput,
+    GetUserDetailsRequest,
+    GetUserDetailsResponse,
+    ListDevEnvironmentsCommand,
+    ListDevEnvironmentsRequest,
+    ListDevEnvironmentsResponse,
+    ListProjectsCommand,
+    ListProjectsRequest,
+    ListProjectsResponse,
+    ListSourceRepositoriesCommand,
+    ListSourceRepositoriesItem,
+    ListSourceRepositoriesRequest,
+    ListSourceRepositoriesResponse,
+    ListSourceRepositoryBranchesCommand,
+    ListSourceRepositoryBranchesItem,
+    ListSourceRepositoryBranchesRequest,
+    ListSpacesCommand,
+    ListSpacesRequest,
+    ListSpacesResponse,
+    PersistentStorage,
+    ProjectSummary,
+    SpaceSummary,
+    StartDevEnvironmentCommand,
+    StartDevEnvironmentRequest,
+    StartDevEnvironmentResponse,
+    StartDevEnvironmentSessionCommand,
+    StartDevEnvironmentSessionRequest,
+    StartDevEnvironmentSessionResponse,
+    StopDevEnvironmentCommand,
+    StopDevEnvironmentRequest,
+    StopDevEnvironmentResponse,
+    UpdateDevEnvironmentCommand,
+    UpdateDevEnvironmentRequest,
+    UpdateDevEnvironmentResponse,
+    VerifySessionCommand,
+    VerifySessionCommandOutput,
+} from '@aws-sdk/client-codecatalyst'
+import { SsoConnection } from '../../auth/connection'
+import { DevSettings } from '../settings'
+import { getServiceEnvVarConfig } from '../vscode/env'
+import { AwsCommand, AwsCommandConstructor } from '../awsClientBuilderV3'
+import { ClientWrapper } from './clientWrapper'
+import { ServiceException } from '@aws-sdk/smithy-client'
+import { AccessDeniedException } from '@aws-sdk/client-sso-oidc'
+import { TokenIdentityProvider } from '@aws-sdk/types'
+
+const requiredDevEnvProps = [
+    'id',
+    'status',
+    'inactivityTimeoutMinutes',
+    'repositories',
+    'instanceType',
+    'lastUpdatedTime',
+] as const
+type RequiredDevEnvProps = (typeof requiredDevEnvProps)[number]
+
+export interface CodeCatalystConfig {
+    readonly region: string
+    readonly endpoint: string
+    readonly hostname: string
+    readonly gitHostname: string
+}
+
+export const defaultServiceConfig: CodeCatalystConfig = {
+    region: 'us-east-1',
+    endpoint: 'https://codecatalyst.global.api.aws',
+    hostname: 'codecatalyst.aws',
+    gitHostname: 'codecatalyst.aws',
+}
+
+export function getCodeCatalystConfig(): CodeCatalystConfig {
+    return {
+        ...DevSettings.instance.getServiceConfig('codecatalystService', defaultServiceConfig),
+
+        // Environment variable overrides
+        ...getServiceEnvVarConfig('codecatalyst', Object.keys(defaultServiceConfig)),
+    }
+}
+
+interface CodeCatalystDevEnvironmentSummary extends RequiredProps<DevEnvironmentSummary, RequiredDevEnvProps> {
+    readonly persistentStorage: RequiredProps<PersistentStorage, 'sizeInGiB'>
+    readonly repositories: RequiredProps<DevEnvironmentRepositorySummary, 'repositoryName'>[]
+}
+
+export interface DevEnvironment extends CodeCatalystDevEnvironmentSummary {
+    readonly type: 'devEnvironment'
+    readonly id: string
+    readonly org: Pick<CodeCatalystOrg, 'name'>
+    readonly project: Pick<CodeCatalystProject, 'name'>
+    readonly repositories: RequiredProps<DevEnvironmentRepositorySummary, 'repositoryName'>[]
+}
+
+/** CodeCatalyst developer environment session. */
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface CodeCatalystDevEnvSession extends StartDevEnvironmentResponse {}
+
+export interface CodeCatalystOrg extends SpaceSummary {
+    readonly type: 'org'
+    readonly name: string
+}
+
+export interface CodeCatalystProject extends ProjectSummary {
+    readonly type: 'project'
+    readonly name: string
+    readonly org: Pick<CodeCatalystOrg, 'name'>
+}
+
+export interface CodeCatalystRepo extends ListSourceRepositoriesItem {
+    readonly type: 'repo'
+    readonly name: string
+    readonly org: Pick<CodeCatalystOrg, 'name'>
+    readonly project: Pick<CodeCatalystProject, 'name'>
+}
+
+export interface CodeCatalystBranch extends ListSourceRepositoryBranchesItem {
+    readonly type: 'branch'
+    readonly name: string
+    readonly repo: Pick<CodeCatalystRepo, 'name'>
+    readonly org: Pick<CodeCatalystOrg, 'name'>
+    readonly project: Pick<CodeCatalystProject, 'name'>
+}
+
+export type CodeCatalystResource =
+    | CodeCatalystOrg
+    | CodeCatalystProject
+    | CodeCatalystRepo
+    | CodeCatalystBranch
+    | DevEnvironment
+
+function toDevEnv(spaceName: string, projectName: string, summary: CodeCatalystDevEnvironmentSummary): DevEnvironment {
+    return {
+        type: 'devEnvironment',
+        org: { name: spaceName },
+        project: { name: projectName },
+        ...summary,
+    }
+}
+
+function toBranch(
+    org: string,
+    project: string,
+    repo: string,
+    branch: ListSourceRepositoryBranchesItem
+): CodeCatalystBranch {
+    assertHasProps(branch, 'name')
+
+    return {
+        type: 'branch',
+        repo: { name: repo },
+        org: { name: org },
+        project: { name: project },
+        ...branch,
+    }
+}
+
+function createCodeCatalystClient(
+    tokenProvider: TokenIdentityProvider,
+    regionCode: string,
+    endpoint: string
+): CodeCatalystSDKClient {
+    // Avoid using cached client so that we can inject fresh bearer token provider.
+    return globals.sdkClientBuilderV3.createAwsService({
+        serviceClient: CodeCatalystSDKClient,
+        clientOptions: {
+            region: regionCode,
+            endpoint: endpoint,
+            token: tokenProvider,
+        },
+    })
+}
+
+export type UserDetails = RequiredProps<GetUserDetailsResponse, 'userId' | 'userName' | 'displayName' | 'primaryEmail'>
+
+// CodeCatalyst client has two variants: 'logged-in' and 'not logged-in'
+// The 'not logged-in' variant is a subtype and has restricted functionality
+// These characteristics appear in the Smithy model, but the SDK codegen is unable to model this
+
+export interface CodeCatalystClient extends ClassToInterfaceType<CodeCatalystClientInternal> {
+    readonly identity: { readonly id: string; readonly name: string }
+}
+
+const onAccessDeniedExceptionEmitter = new vscode.EventEmitter<boolean>()
+export const onAccessDeniedException = onAccessDeniedExceptionEmitter.event
+
+interface AuthOptions {
+    showReauthPrompt?: boolean
+}
+export type CodeCatalystClientFactory = () => Promise<CodeCatalystClient>
+/**
+ * Factory to create a new `CodeCatalystClient`. Call `onCredentialsChanged()` before making requests.
+ */
+export async function createClient(
+    connection: SsoConnection,
+    regionCode = getCodeCatalystConfig().region,
+    endpoint = getCodeCatalystConfig().endpoint,
+    authOptions: AuthOptions = {}
+): Promise<CodeCatalystClient> {
+    const sdkv3Client = createCodeCatalystClient(getTokenProvider(connection), regionCode, endpoint)
+    const c = new CodeCatalystClientInternal(connection, sdkv3Client, regionCode)
+    try {
+        await c.verifySession()
+    } catch (e) {
+        if (!(e instanceof ToolkitError) || e.code !== 'AccessDeniedException') {
+            throw e
+        }
+        onAccessDeniedExceptionEmitter.fire(authOptions.showReauthPrompt ?? true)
+
+        // Throw a "cancel" error to prevent further execution.
+        throw new ToolkitError('CodeCatalyst scope is expired', { code: 'ScopeExpiration', cancelled: true })
+    }
+
+    return c
+}
+
+// TODO: move this to sso auth folder?
+function getTokenProvider(connection: SsoConnection): TokenIdentityProvider {
+    return async (_) => {
+        const token = await connection.getToken()
+        return {
+            token: token.accessToken,
+            expiration: token.expiresAt,
+        }
+    }
+}
+
+// XXX: the backend currently rejects empty strings for `alias` so the field must be removed if falsey
+function fixAliasInRequest<T extends CreateDevEnvironmentRequest | UpdateDevEnvironmentRequest>(request: T): T {
+    if (!request.alias) {
+        delete request.alias
+    }
+
+    return request
+}
+
+class CodeCatalystClientInternal extends ClientWrapper<CodeCatalystSDKClient> {
+    private userDetails?: UserDetails
+    private readonly log: logger.Logger
+
+    /**
+     * Maps bearer tokens to CAWS identities via `verifySession`
+     *
+     * It's assumed that an identity will never change over the lifetime of a token
+     */
+    private static identityCache = new Map<string, string>()
+
+    /**
+     * Maps CAWS identities to user details via  `getUserDetails`
+     *
+     * User details _might_ change at some point, however, this is an uncommon occurence.
+     * Cached user details are cleared when the access token is refreshed.
+     */
+    private static userDetailsCache = new Map<UserDetails['userId'], UserDetails>()
+
+    public constructor(
+        private readonly connection: SsoConnection,
+        private readonly sdkClientV3: CodeCatalystSDKClient,
+        regionCode: string
+    ) {
+        super(regionCode, CodeCatalystSDKClient)
+        this.log = logger.getLogger()
+    }
+
+    protected override getClient(): CodeCatalystSDKClient {
+        return this.sdkClientV3
+    }
+
+    public get identity(): CodeCatalystClient['identity'] {
+        if (!this.userDetails) {
+            throw new Error('CodeCatalyst client is not connected')
+        }
+
+        return { id: this.userDetails.userId, name: this.userDetails.userName }
+    }
+
+    private async call<
+        CommandInput extends object,
+        CommandOutput extends object,
+        CommandOptions extends CommandInput,
+        Command extends AwsCommand<CommandInput, CommandOutput>,
+    >(
+        cmd: AwsCommandConstructor<CommandInput, Command>,
+        commandOptions: CommandOptions,
+        silent: true,
+        defaultVal: CommandOutput
+    ): Promise<CommandOutput>
+    private async call<
+        CommandInput extends object,
+        CommandOutput extends object,
+        CommandOptions extends CommandInput,
+        Command extends AwsCommand<CommandInput, CommandOutput>,
+    >(
+        cmd: AwsCommandConstructor<CommandInput, Command>,
+        commandOptions: CommandOptions,
+        silent: false
+    ): Promise<CommandOutput>
+    private async call<
+        CommandInput extends object,
+        CommandOutput extends object,
+        CommandOptions extends CommandInput,
+        Command extends AwsCommand<CommandInput, CommandOutput>,
+    >(
+        cmd: AwsCommandConstructor<CommandInput, Command>,
+        commandOptions: CommandOptions,
+        silent: boolean,
+        defaultVal?: CommandOutput
+    ): Promise<CommandOutput> {
+        const bearerToken = (await this.connection.getToken()).accessToken
+
+        return new Promise<CommandOutput>(async (resolve, reject) => {
+            try {
+                const data = await this.makeRequest<CommandInput, CommandOutput, CommandOptions, Command>(
+                    cmd,
+                    commandOptions
+                )
+                resolve(data)
+            } catch (e) {
+                const error = e as Error
+                if (error instanceof ServiceException && isAccessDeniedError(error)) {
+                    CodeCatalystClientInternal.identityCache.delete(bearerToken)
+                }
+                if (silent && defaultVal !== undefined) {
+                    resolve(defaultVal)
+                } else {
+                    // SDKv3 does not have error codes so we use the name instead (see: https://github.com/aws/aws-sdk-js-v3/issues/759)
+                    reject(
+                        new ToolkitError(`CodeCatalyst: request failed with error`, { cause: error, code: error.name })
+                    )
+                }
+            }
+        })
+
+        function isAccessDeniedError(e: ServiceException): boolean {
+            return (
+                e.$response?.statusCode === 403 ||
+                e.$response?.statusCode === 401 ||
+                e.name === AccessDeniedException.name
+            )
+        }
+    }
+
+    /**
+     * Creates a PAT.
+     *
+     * @param args.name Name of the token
+     * @param args.expires PAT expires on this date, or undefined.
+     * @returns PAT secret
+     */
+    public async createAccessToken(
+        args: CreateAccessTokenRequest
+    ): Promise<RequiredProps<CreateAccessTokenResponse, 'secret'>> {
+        try {
+            return await this.call(CreateAccessTokenCommand, args, false)
+        } catch (e) {
+            if ((e as Error).name === 'ServiceQuotaExceededException') {
+                throw new ToolkitError('Access token limit exceeded', { cause: e as Error })
+            }
+            throw e
+        }
+    }
+
+    public async getSubscription(request: GetSubscriptionRequest): Promise<GetSubscriptionResponse> {
+        return this.call(GetSubscriptionCommand, request, false)
+    }
+
+    /**
+     * Gets identity properties of the current authenticated principal, and
+     * stores the id for use in later calls.
+     */
+    public async verifySession(): Promise<UserDetails> {
+        const id = await this.getUserId()
+        this.userDetails = CodeCatalystClientInternal.userDetailsCache.get(id) ?? (await this.getUserDetails({ id }))
+        CodeCatalystClientInternal.userDetailsCache.set(id, this.userDetails)
+
+        return { ...this.userDetails }
+    }
+
+    private async getUserId(): Promise<string> {
+        const { accessToken, expiresAt } = await this.connection.getToken()
+        if (CodeCatalystClientInternal.identityCache.has(accessToken)) {
+            return CodeCatalystClientInternal.identityCache.get(accessToken)!
+        }
+
+        const r: VerifySessionCommandOutput = await this.call(VerifySessionCommand, {}, false)
+        assertHasProps(r, 'identity')
+
+        CodeCatalystClientInternal.identityCache.set(accessToken, r.identity)
+        setTimeout(() => {
+            CodeCatalystClientInternal.identityCache.delete(accessToken)
+            CodeCatalystClientInternal.userDetailsCache.delete(r.identity)
+        }, expiresAt.getTime() - Date.now())
+
+        return r.identity
+    }
+
+    public async getBearerToken(): Promise<string> {
+        return (await this.connection.getToken()).accessToken
+    }
+
+    private async getUserDetails(args: GetUserDetailsRequest) {
+        const resp: GetUserDetailsCommandOutput = await this.call(GetUserDetailsCommand, args, false)
+        assertHasProps(resp, 'userId', 'userName', 'displayName', 'primaryEmail')
+
+        return { ...resp, version: resp.version } as const
+    }
+
+    public async getSpace(request: GetSpaceRequest): Promise<CodeCatalystOrg> {
+        const resp: GetSpaceCommandOutput = await this.call(GetSpaceCommand, request, false)
+        assertHasProps(resp, 'name', 'regionName')
+        return { ...resp, type: 'org' }
+    }
+
+    public async getProject(request: RequiredProps<GetProjectRequest, 'spaceName'>): Promise<CodeCatalystProject> {
+        const resp: GetProjectCommandOutput = await this.call(GetProjectCommand, request, false)
+        assertHasProps(resp, 'name')
+        return { ...resp, type: 'project', org: { name: request.spaceName } }
+    }
+
+    /**
+     * Gets a list of all spaces (orgs) for the current CodeCatalyst user.
+     */
+    public listSpaces(request: ListSpacesRequest = {}): AsyncCollection<CodeCatalystOrg[]> {
+        const requester: (request: ListSpacesRequest) => Promise<ListSpacesResponse> = async (request) =>
+            this.call(ListSpacesCommand, request, true, { items: [] })
+        const collection = pageableToCollection(requester, request, 'nextToken', 'items').filter(isDefined)
+        // ts doesn't recognize nested assertion, so we add cast.This is safe because we assert it in the same line.
+        return collection.map((summaries) => summaries.filter(hasName).map(toOrg))
+
+        function toOrg<T extends RequiredProps<SpaceSummary, 'name'>>(s: T): CodeCatalystOrg {
+            return {
+                type: 'org',
+                ...s,
+            }
+        }
+    }
+
+    /**
+     * Gets a list of all projects for the given CodeCatalyst user.
+     */
+    public listProjects(
+        request: RequiredProps<ListProjectsRequest, 'spaceName'>
+    ): AsyncCollection<CodeCatalystProject[]> {
+        // Only get projects the user is a member of.
+        request.filters = [
+            ...(request.filters ?? []),
+            {
+                key: 'hasAccessTo',
+                values: ['true'],
+            },
+        ]
+
+        const requester: (request: ListProjectsRequest) => Promise<ListProjectsResponse> = (request) =>
+            this.call(ListProjectsCommand, request, true, { items: [] })
+
+        const collection = pageableToCollection(requester, request, 'nextToken', 'items')
+        return collection.filter(isDefined).map((summaries) => summaries.filter(hasName).map(toProject))
+
+        function toProject<T extends RequiredProps<ProjectSummary, 'name'>>(s: T): CodeCatalystProject {
+            return {
+                type: 'project',
+                org: { name: request.spaceName },
+                ...s,
+            }
+        }
+    }
+
+    /**
+     * Gets a flat list of all devenvs for the given CodeCatalyst project.
+     */
+    public listDevEnvironments(proj: CodeCatalystProject): AsyncCollection<DevEnvironment[]> {
+        const initRequest = { spaceName: proj.org.name, projectName: proj.name }
+        const requester: (request: ListDevEnvironmentsRequest) => Promise<ListDevEnvironmentsResponse> = (request) =>
+            this.call(ListDevEnvironmentsCommand, request, true, { items: [] })
+        const collection = pageableToCollection(requester, initRequest, 'nextToken' as never, 'items').filter(isDefined)
+        // ts unable to recognize nested assertion here, so we need to cast. This is safe because we assert it in the same line.
+        return collection.map((envs) => {
+            const filteredEnvs = envs.filter(isValidEnvSummary)
+            const mappedEnvs = filteredEnvs.map((s) => toDevEnv(proj.org.name, proj.name, s))
+            return mappedEnvs
+        })
+    }
+
+    /**
+     * Gets a flat list of all repos for the given CodeCatalyst user.
+     * @param thirdParty If you want to include 3P (eg github) results in
+     *                   your output.
+     */
+    public listSourceRepositories(
+        request: RequiredProps<ListSourceRepositoriesRequest, 'spaceName' | 'projectName'>,
+        thirdParty: boolean = true
+    ): AsyncCollection<CodeCatalystRepo[]> {
+        const requester = async (r: typeof request) => {
+            const allRepositories: Promise<ListSourceRepositoriesResponse> = this.call(
+                ListSourceRepositoriesCommand,
+                r,
+                true,
+                { items: [] }
+            )
+            let finalRepositories = allRepositories
+
+            // Filter out 3P repos
+            if (!thirdParty) {
+                finalRepositories = allRepositories.then(async (repos) => {
+                    repos.items = await excludeThirdPartyRepos(
+                        this,
+                        request.spaceName,
+                        request.projectName,
+                        repos.items?.filter(hasName)
+                    )
+                    return repos
+                })
+            }
+
+            return finalRepositories
+        }
+
+        const collection = pageableToCollection(requester, request, 'nextToken', 'items')
+        return collection.filter(isDefined).map((summaries) => summaries.filter(hasName).map(toCodeCatalystRepo))
+
+        function toCodeCatalystRepo(s: RequiredProps<ListSourceRepositoriesItem, 'name'>): CodeCatalystRepo {
+            return {
+                type: 'repo',
+                org: { name: request.spaceName },
+                project: { name: request.projectName },
+                ...s,
+            }
+        }
+    }
+
+    public listBranches(
+        request: RequiredProps<
+            ListSourceRepositoryBranchesRequest,
+            'spaceName' | 'projectName' | 'sourceRepositoryName'
+        >
+    ): AsyncCollection<CodeCatalystBranch[]> {
+        const requester = async (r: typeof request) =>
+            this.call(ListSourceRepositoryBranchesCommand, r, true, { items: [] })
+        const collection = pageableToCollection(requester, request, 'nextToken' as never, 'items')
+
+        return collection
+            .filter(isNonNullable)
+            .map((items) =>
+                items.map((b) => toBranch(request.spaceName, request.projectName, request.sourceRepositoryName, b))
+            )
+    }
+
+    /**
+     * Lists ALL of the given resource in the current account
+     *
+     * @param thirdParty If you want 3P repos in the result.
+     */
+    public listResources(resourceType: 'org'): AsyncCollection<CodeCatalystOrg[]>
+    public listResources(resourceType: 'project'): AsyncCollection<CodeCatalystProject[]>
+    public listResources(resourceType: 'repo', thirdParty?: boolean): AsyncCollection<CodeCatalystRepo[]>
+    public listResources(resourceType: 'devEnvironment'): AsyncCollection<DevEnvironment[]>
+    public listResources(
+        resourceType: CodeCatalystResource['type'],
+        ...args: any[]
+    ): AsyncCollection<CodeCatalystResource[]> {
+        function mapInner<T, U>(
+            collection: AsyncCollection<T[]>,
+            fn: (element: T) => AsyncCollection<U[]>
+        ): AsyncCollection<U[]> {
+            return toCollection(() => joinAll(collection.flatten().map(fn)))
+        }
+
+        switch (resourceType) {
+            case 'org':
+                return this.listSpaces()
+            case 'project':
+                return mapInner(this.listResources('org'), (o) => this.listProjects({ spaceName: o.name }))
+            case 'repo':
+                return mapInner(this.listResources('project'), (p) =>
+                    this.listSourceRepositories({ projectName: p.name, spaceName: p.org.name }, ...args)
+                )
+            case 'branch':
+                throw new Error('Listing branches is not currently supported')
+            case 'devEnvironment':
+                return mapInner(this.listResources('project'), (p) => this.listDevEnvironments(p))
+        }
+    }
+
+    public async createSourceBranch(
+        args: CreateSourceRepositoryBranchRequest
+    ): Promise<CreateSourceRepositoryBranchResponse> {
+        return this.call(CreateSourceRepositoryBranchCommand, args, false)
+    }
+
+    /**
+     * Gets the git source host URL for the given CodeCatalyst or third-party repo.
+     */
+    public async getRepoCloneUrl(args: GetSourceRepositoryCloneUrlsRequest): Promise<string> {
+        const r: GetSourceRepositoryCloneUrlsResponse = await this.call(
+            GetSourceRepositoryCloneUrlsCommand,
+            args,
+            false
+        )
+        assertHasProps(r, 'https')
+        // The git extension skips over credential providers if the username is included in the authority
+        const uri = Uri.parse(r.https)
+        return uri.with({ authority: uri.authority.replace(/.*@/, '') }).toString()
+    }
+
+    public async createDevEnvironment(
+        args: RequiredProps<CreateDevEnvironmentRequest, 'projectName' | 'spaceName'>
+    ): Promise<DevEnvironment> {
+        const request = fixAliasInRequest(args)
+        const response: CreateDevEnvironmentCommandOutput = await this.call(CreateDevEnvironmentCommand, request, false)
+        assertHasProps(response, 'id')
+
+        return this.getDevEnvironment({
+            id: response.id,
+            projectName: args.projectName,
+            spaceName: args.spaceName,
+        })
+    }
+
+    public async startDevEnvironment(args: StartDevEnvironmentRequest): Promise<StartDevEnvironmentResponse> {
+        return this.call(StartDevEnvironmentCommand, args, false)
+    }
+
+    public async createProject(
+        args: RequiredProps<CreateProjectRequest, 'displayName' | 'spaceName'>
+    ): Promise<CodeCatalystProject> {
+        await this.call(CreateProjectCommand, args, false)
+
+        return { ...args, name: args.displayName, type: 'project', org: { name: args.spaceName } }
+    }
+
+    public async startDevEnvironmentSession(
+        args: StartDevEnvironmentSessionRequest
+    ): Promise<StartDevEnvironmentSessionResponse & { sessionId: string }> {
+        const r: StartDevEnvironmentSessionResponse = await this.call(StartDevEnvironmentSessionCommand, args, false)
+        if (!r.sessionId) {
+            throw new TypeError('got falsy dev environment "sessionId"')
+        }
+        return { ...r, sessionId: r.sessionId }
+    }
+
+    public async stopDevEnvironment(args: StopDevEnvironmentRequest): Promise<StopDevEnvironmentResponse> {
+        return this.call(StopDevEnvironmentCommand, args, false)
+    }
+
+    public async getDevEnvironment(
+        args: RequiredProps<GetDevEnvironmentRequest, 'spaceName' | 'projectName'>
+    ): Promise<DevEnvironment> {
+        const a = { ...args }
+        delete (a as any).ides
+        delete (a as any).repositories
+
+        const r: GetDevEnvironmentResponse = await this.call(GetDevEnvironmentCommand, a, false)
+        const summary = { ...args, ...r }
+        if (!isValidEnvSummary(summary)) {
+            throw new ToolkitError(`GetDevEnvironment failed due to response missing required properties`)
+        }
+
+        return toDevEnv(args.spaceName, args.projectName, summary)
+    }
+
+    public async deleteDevEnvironment(args: DeleteDevEnvironmentRequest): Promise<DeleteDevEnvironmentResponse> {
+        return this.call(DeleteDevEnvironmentCommand, args, false)
+    }
+
+    public updateDevEnvironment(args: UpdateDevEnvironmentRequest): Promise<UpdateDevEnvironmentResponse> {
+        const request = fixAliasInRequest(args)
+        return this.call(UpdateDevEnvironmentCommand, request, false)
+    }
+
+    /**
+     * Best-effort attempt to start a devenv given an ID, showing a progress notification with a cancel button
+     * TODO: may combine this progress stuff into some larger construct
+     *
+     * The cancel button does not abort the start, but rather alerts any callers that any operations that rely
+     * on the dev environment starting should not progress.
+     */
+    public async startDevEnvironmentWithProgress(
+        args: RequiredProps<StartDevEnvironmentRequest, 'id' | 'spaceName' | 'projectName'>,
+        timeout: Timeout = new Timeout(1000 * 60 * 60)
+    ): Promise<DevEnvironment> {
+        // Track the status changes chronologically so that we can
+        // 1. reason about hysterisis (weird flip-flops)
+        // 2. have visibility in the logs
+        const statuses = new Array<{ status: string; start: number }>()
+        let alias: string | undefined
+        let startAttempts = 0
+
+        function statusesToString() {
+            let s = ''
+            for (let i = 0; i < statuses.length; i++) {
+                const item = statuses[i]
+                const nextItem = i < statuses.length - 1 ? statuses[i + 1] : undefined
+                const nextTime = nextItem ? nextItem.start : Date.now()
+                const elapsed = nextTime - item.start
+                s += `${s ? ' ' : ''}${item.status}/${elapsed}ms`
+            }
+            return `[${s}]`
+        }
+
+        function getName(): string {
+            const fullname = alias ? alias : args.id
+            const shortname = fullname.substring(0, 19) + (fullname.length > 20 ? '…' : '')
+            return shortname
+        }
+
+        function failedStartMsg(serviceMsg?: string) {
+            const LastSeenStatus = statuses[statuses.length - 1]?.status
+            const serviceMsg_ = serviceMsg ? `${serviceMsg}: ` : ''
+            return `Dev Environment failed to start (${LastSeenStatus}): ${serviceMsg_}${getName()}`
+        }
+
+        const doLog = (kind: 'debug' | 'error' | 'info', msg: string) => {
+            const fmt = `${msg} (time: %ds${
+                startAttempts <= 1 ? '' : ', startAttempts: ' + startAttempts.toString()
+            }): %s %s`
+            if (kind === 'debug') {
+                this.log.debug(fmt, timeout.elapsedTime / 1000, getName(), statusesToString())
+            } else if (kind === 'error') {
+                this.log.error(fmt, timeout.elapsedTime / 1000, getName(), statusesToString())
+            } else {
+                this.log.info(fmt, timeout.elapsedTime / 1000, getName(), statusesToString())
+            }
+        }
+
+        const progress = await showMessageWithCancel(
+            localize('AWS.CodeCatalyst.devenv.message', 'CodeCatalyst'),
+            timeout
+        )
+        progress.report({ message: localize('AWS.CodeCatalyst.devenv.checking', 'Checking status...') })
+
+        try {
+            const devenv = await this.getDevEnvironment(args)
+            alias = devenv.alias
+            statuses.push({ status: devenv.status, start: Date.now() })
+            if (devenv.status === 'RUNNING') {
+                doLog('debug', 'devenv RUNNING')
+                timeout.cancel()
+                // "Debounce" in case caller did not check if the environment was already running.
+                return devenv
+            }
+        } catch {
+            // Continue.
+        }
+
+        doLog('debug', 'devenv not started, waiting')
+
+        const pollDevEnv = waitUntil(
+            async () => {
+                if (timeout.completed) {
+                    // TODO: need a better way to "cancel" a `waitUntil`.
+                    throw new CancellationError('user')
+                }
+
+                const LastSeenStatus = statuses[statuses.length - 1]
+                const elapsed = Date.now() - LastSeenStatus.start
+                const resp = await this.getDevEnvironment(args)
+                const serviceReason = (resp.statusReason ?? '').trim()
+                alias = resp.alias
+
+                if (
+                    startAttempts > 2 &&
+                    elapsed > 10000 &&
+                    ['STOPPED', 'FAILED'].includes(LastSeenStatus.status) &&
+                    ['STOPPED', 'FAILED'].includes(resp.status)
+                ) {
+                    const fails = statuses.filter((o) => o.status === 'FAILED').length
+                    const code = fails === 0 ? 'BadDevEnvState' : 'FailedDevEnv'
+
+                    if (serviceReason !== '') {
+                        // Service gave a status reason like "Compute limit exceeded", show it to the user.
+                        throw new ToolkitError(failedStartMsg(resp.statusReason), { code: code })
+                    }
+
+                    // If still STOPPED/FAILED after 10+ seconds, don't keep retrying for 1 hour...
+                    throw new ToolkitError(failedStartMsg(), { code: code })
+                } else if (['STOPPED', 'FAILED'].includes(resp.status)) {
+                    progress.report({
+                        message: localize('AWS.CodeCatalyst.devenv.resuming', 'Resuming Dev Environment...'),
+                    })
+                    try {
+                        startAttempts++
+                        await this.startDevEnvironment(args)
+                    } catch (e) {
+                        const err = e as ServiceException
+                        // - ServiceQuotaExceededException: account billing limit reached
+                        // - ValidationException: "… creation has failed, cannot start"
+                        // - ConflictException: "Cannot start … because update process is still going on"
+                        //   (can happen after "Update Dev Environment")
+                        if (err.name === 'ServiceQuotaExceededException') {
+                            throw new ToolkitError('Dev Environment failed: quota exceeded', {
+                                code: 'ServiceQuotaExceeded',
+                                cause: err,
+                            })
+                        }
+                        doLog('info', `devenv not started (${err.name}), waiting`)
+                        // Continue retrying...
+                    }
+                } else if (resp.status === 'STOPPING') {
+                    progress.report({
+                        message: localize('AWS.CodeCatalyst.devenv.stopping', 'Waiting for Dev Environment to stop...'),
+                    })
+                } else {
+                    progress.report({
+                        message: localize('AWS.CodeCatalyst.devenv.starting', 'Opening Dev Environment...'),
+                    })
+                }
+
+                if (LastSeenStatus?.status !== resp.status) {
+                    statuses.push({ status: resp.status, start: Date.now() })
+                    if (resp.status !== 'RUNNING') {
+                        doLog('debug', `devenv not started, waiting`)
+                    }
+                }
+                return resp.status === 'RUNNING' ? resp : undefined
+            },
+            // note: the `waitUntil` will resolve prior to the real timeout if it is refreshed
+            { interval: 1000, timeout: timeout.remainingTime, truthy: true }
+        )
+
+        const devenv = await waitTimeout(pollDevEnv, timeout).catch((e) => {
+            if (isUserCancelledError(e)) {
+                doLog('info', 'devenv failed to start (user cancelled)')
+                e.message = failedStartMsg()
+                throw e
+            } else if (e instanceof ToolkitError) {
+                doLog('error', 'devenv failed to start')
+                throw e
+            }
+
+            doLog('error', 'devenv failed to start')
+            throw new ToolkitError(failedStartMsg(), { code: 'Unknown', cause: e })
+        })
+
+        if (!devenv) {
+            doLog('error', 'devenv failed to start (timeout)')
+            throw new ToolkitError(failedStartMsg(), { code: 'Timeout' })
+        }
+        doLog('info', 'devenv started')
+
+        return devenv
+    }
+}
+
+/**
+ * Returns only the first-party repos from the given
+ * list of repository items.
+ */
+export async function excludeThirdPartyRepos(
+    client: CodeCatalystClient,
+    spaceName: CodeCatalystOrg['name'],
+    projectName: CodeCatalystProject['name'],
+    items?: RequiredProps<ListSourceRepositoriesItem, 'name'>[]
+): Promise<ListSourceRepositoriesItem[] | undefined> {
+    if (items === undefined) {
+        return items
+    }
+
+    // Filter out 3P repos.
+    return (
+        await Promise.all(
+            items.map(async (item) => {
+                return (await isThirdPartyRepo(client, {
+                    spaceName,
+                    projectName,
+                    sourceRepositoryName: item.name,
+                }))
+                    ? undefined
+                    : item
+            })
+        )
+    ).filter(isDefined)
+}
+
+/**
+ * Determines if a repo is third party (3P) compared to first party (1P).
+ *
+ * 1P is CodeCatalyst, 3P is something like Github.
+ */
+export async function isThirdPartyRepo(
+    client: CodeCatalystClient,
+    codeCatalystRepo: GetSourceRepositoryCloneUrlsRequest
+): Promise<boolean> {
+    const url = await client.getRepoCloneUrl(codeCatalystRepo)
+    // TODO: Make more robust to work with getCodeCatalystConfig().
+    return (
+        !Uri.parse(url).authority.endsWith('codecatalyst.aws') &&
+        !Uri.parse(url).authority.endsWith('caws.dev-tools.aws.dev')
+    )
+}
+
+// These type guard wrappers are needed because type assertions fail
+// to travel up function scope (see: https://github.com/microsoft/TypeScript/issues/9998)
+
+function hasPersistentStorage<T extends DevEnvironmentSummary>(
+    s: T
+): s is T & { persistentStorage: { sizeInGiB: number } } {
+    return hasProps(s, 'persistentStorage') && hasProps(s.persistentStorage, 'sizeInGiB')
+}
+
+function hasRepositories<T extends DevEnvironmentSummary>(
+    s: T
+): s is T & { repositories: RequiredProps<DevEnvironmentRepositorySummary, 'repositoryName'>[] } {
+    return hasProps(s, 'repositories') && s.repositories.every((r) => hasProps(r, 'repositoryName'))
+}
+
+function hasName<T extends { name: string | undefined }>(s: T): s is RequiredProps<T, 'name'> {
+    return hasProps(s, 'name')
+}
+
+function isValidEnvSummary(s: DevEnvironmentSummary): s is CodeCatalystDevEnvironmentSummary {
+    return hasProps(s, ...requiredDevEnvProps) && hasPersistentStorage(s) && hasRepositories(s)
+}
diff --git a/packages/core/src/shared/clients/codewhispererChatClient.ts b/packages/core/src/shared/clients/codewhispererChatClient.ts
new file mode 100644
index 00000000000..93b7b3bceb4
--- /dev/null
+++ b/packages/core/src/shared/clients/codewhispererChatClient.ts
@@ -0,0 +1,23 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { CodeWhispererStreaming } from '@amzn/codewhisperer-streaming'
+import { ConfiguredRetryStrategy } from '@smithy/util-retry'
+import { getCodewhispererConfig } from '../../codewhisperer/client/codewhisperer'
+import { AuthUtil } from '../../codewhisperer/util/authUtil'
+import { getUserAgent } from '../telemetry/util'
+
+// Create a client for featureDev streaming based off of aws sdk v3
+export async function createCodeWhispererChatStreamingClient(): Promise<CodeWhispererStreaming> {
+    const bearerToken = await AuthUtil.instance.getBearerToken()
+    const cwsprConfig = getCodewhispererConfig()
+    const streamingClient = new CodeWhispererStreaming({
+        region: cwsprConfig.region,
+        endpoint: cwsprConfig.endpoint,
+        token: { token: bearerToken },
+        customUserAgent: getUserAgent(),
+        retryStrategy: new ConfiguredRetryStrategy(1, (attempt: number) => 500 + attempt ** 10),
+    })
+    return streamingClient
+}
diff --git a/packages/core/src/shared/clients/devenvClient.ts b/packages/core/src/shared/clients/devenvClient.ts
new file mode 100644
index 00000000000..c62708b0b09
--- /dev/null
+++ b/packages/core/src/shared/clients/devenvClient.ts
@@ -0,0 +1,276 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import got, { HTTPError } from 'got'
+import globals from '../extensionGlobals'
+import { getLogger } from '../logger/logger'
+import { getCodeCatalystDevEnvId } from '../vscode/env'
+import { UserActivity } from '../extensionUtilities'
+
+const environmentAuthToken = '__MDE_ENV_API_AUTHORIZATION_TOKEN'
+const environmentEndpoint = process.env['__MDE_ENVIRONMENT_API'] ?? 'http://127.0.0.1:1339'
+
+/**
+ * Client to the MDE quasi-IMDS localhost endpoint.
+ */
+export class DevEnvClient implements vscode.Disposable {
+    static #instance: DevEnvClient
+    private readonly timer
+    private LastSeenStatus = ''
+    private onStatusChangeFn: undefined | ((oldStatus: string, newStatus: string) => void)
+
+    /** Singleton instance (to avoid multiple polling workers). */
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+
+    /** @internal */
+    public constructor(private readonly endpoint: string = environmentEndpoint) {
+        if (!this.id) {
+            getLogger().debug('codecatalyst: DevEnvClient skipped (local)')
+            this.timer = undefined
+        } else {
+            getLogger().debug('codecatalyst: DevEnvClient started')
+            this.timer = globals.clock.setInterval(async () => {
+                const r = await this.getStatus()
+                if (this.LastSeenStatus !== r.status) {
+                    const newStatus = r.status ?? 'NULL'
+                    getLogger().info(
+                        'codecatalyst: DevEnvClient: status change (old=%s new=%s)%s%s',
+                        this.LastSeenStatus,
+                        newStatus,
+                        r.actionId ? ` action=${r.actionId}` : '',
+                        r.message ? `: "${r.message}"` : ''
+                    )
+                    if (this.onStatusChangeFn) {
+                        this.onStatusChangeFn(this.LastSeenStatus, newStatus)
+                    }
+                    this.LastSeenStatus = newStatus ?? 'NULL'
+                }
+            }, 1000)
+        }
+    }
+
+    public onStatusChange(fn: (oldStatus: string, newStatus: string) => void) {
+        this.onStatusChangeFn = fn
+    }
+
+    public dispose() {
+        if (this.timer) {
+            globals.clock.clearInterval(this.timer)
+        }
+    }
+
+    public get id(): string | undefined {
+        return getCodeCatalystDevEnvId()
+    }
+
+    public isCodeCatalystDevEnv(): boolean {
+        return !!this.id
+    }
+
+    // Start an action
+    public async startDevfile(request: StartDevfileRequest): Promise<void> {
+        await this.got.post('start', { json: request })
+    }
+
+    // Create a devfile for the project
+    public async createDevfile(request: CreateDevfileRequest): Promise<CreateDevfileResponse> {
+        const response = await this.got.post<CreateDevfileResponse>('devfile/create', { json: request })
+
+        return response.body
+    }
+
+    // Get status and action type
+    //
+    // Example:
+    //      { status: 'IMAGES-UPDATE-AVAILABLE', location: 'devfile.yaml' }
+    public async getStatus(): Promise<GetStatusResponse> {
+        const response = await this.got<GetStatusResponse>('status')
+
+        return response.body
+    }
+
+    private get authToken(): string | undefined {
+        return process.env[environmentAuthToken]
+    }
+
+    private readonly got = got.extend({
+        prefixUrl: this.endpoint,
+        responseType: 'json',
+        // `Authorization` _should_ have two parameters (RFC 7235), MDE should probably fix that
+        headers: { Authorization: this.authToken },
+    })
+
+    /**
+     * Notifies the MDE API of user activity.
+     *
+     * WARNING: Use {@link DevEnvActivity} instead of calling this directly.
+     */
+    async updateActivity(timestamp: number = Date.now()): Promise<number> {
+        await this.got.put('activity', { json: { timestamp: timestamp.toString() } })
+        return timestamp
+    }
+
+    /**
+     * Gets the latest user activity timestamp from MDE API.
+     *
+     * WARNING: Use {@link DevEnvActivity} instead of calling this directly.
+     */
+    async getActivity(): Promise<number | undefined> {
+        const response = await this.got<GetActivityResponse>('activity')
+        return response.body.timestamp ? parseInt(response.body.timestamp) : undefined
+    }
+}
+
+/**
+ * Posts user activity timestamps to the dev env "/activity" API, which are used by MDE to decide
+ * when the user was last active, and thus prevent auto-shutdown of the dev env.
+ */
+export class DevEnvActivity implements vscode.Disposable {
+    private activityUpdatedEmitter = new vscode.EventEmitter<number>()
+    private ideActivityListener: vscode.Disposable | undefined
+    /** The last known activity timestamp, but there could be a newer one on the server. */
+    private lastLocalActivity: number | undefined
+    private extensionUserActivity: UserActivity
+    private static _defaultUserActivity: UserActivity | undefined
+
+    static readonly activityUpdateDelay = 10_000
+
+    /** Gets a new DevEnvActivity, or undefined if service is failed. */
+    static async create(
+        client: DevEnvClient,
+        extensionUserActivity?: UserActivity
+    ): Promise<DevEnvActivity | undefined> {
+        try {
+            await client.getActivity()
+            getLogger().debug('codecatalyst: DevEnvActivity: Activity API is enabled')
+        } catch (e) {
+            const error = e instanceof HTTPError ? e.response.body : e
+            getLogger().error(`codecatalyst: DevEnvActivity: Activity API failed: %s`, error)
+            return undefined
+        }
+
+        return new DevEnvActivity(client, extensionUserActivity)
+    }
+
+    private constructor(
+        private readonly client: DevEnvClient,
+        extensionUserActivity?: UserActivity
+    ) {
+        this.extensionUserActivity = extensionUserActivity ?? this.defaultUserActivity
+    }
+
+    private get defaultUserActivity(): UserActivity {
+        return (DevEnvActivity._defaultUserActivity ??= new UserActivity(DevEnvActivity.activityUpdateDelay))
+    }
+
+    /** Send activity timestamp to the MDE environment endpoint. */
+    async sendActivityUpdate(timestamp: number = Date.now()): Promise<number> {
+        await this.client.updateActivity()
+        getLogger().debug('codecatalyst: DevEnvActivity: heartbeat sent')
+        this.lastLocalActivity = timestamp
+        this.activityUpdatedEmitter.fire(timestamp)
+        return timestamp
+    }
+
+    /** Get the latest activity timestamp from the Dev Env */
+    async getLatestActivity(): Promise<number | undefined> {
+        const lastServerActivity = await this.client.getActivity()
+
+        // A single Dev Env can have multiple clients connected to it.
+        // So if one client updates the timestamp, it will be different from what the
+        // other clients assumed the last activity was.
+        if (lastServerActivity && lastServerActivity !== this.lastLocalActivity) {
+            this.activityUpdatedEmitter.fire(lastServerActivity)
+        }
+
+        this.lastLocalActivity = lastServerActivity
+        return this.lastLocalActivity
+    }
+
+    /** true, if the latest activity on the server is different from what this client has as the latest */
+    async isLocalActivityStale(): Promise<boolean> {
+        return (await this.getLatestActivity()) !== this.lastLocalActivity
+    }
+
+    /**
+     * Subscribes to the "user activity sent" event.
+     *
+     * @param callback Called when event is fired.
+     * @param callback.timestamp Timestamp (milliseconds since 1970), see {@link Date.now}
+     */
+    onActivityUpdate(callback: (timestamp: number) => any) {
+        this.activityUpdatedEmitter.event(callback)
+    }
+
+    /**
+     * Sends an activity timestamp to Dev Env when there is user activity, throttled to once every {@link DevEnvActivity.activityUpdateDelay}.
+     */
+    setUpdateActivityOnIdeActivity(doUpdate: boolean) {
+        this.ideActivityListener?.dispose()
+        this.ideActivityListener = undefined
+
+        if (!doUpdate) {
+            // Stop updating the activity heartbeat
+            return
+        }
+
+        if (this.ideActivityListener) {
+            return
+        }
+
+        this.ideActivityListener = this.extensionUserActivity.onUserActivity(async () => {
+            await this.sendActivityUpdate()
+        })
+    }
+
+    dispose() {
+        this.setUpdateActivityOnIdeActivity(false)
+    }
+}
+
+export interface GetActivityResponse {
+    timestamp?: string
+}
+
+export interface UpdateActivityRequest {
+    timestamp?: string
+}
+
+export interface GetStatusResponse {
+    actionId?: string
+    message?: string
+    status?: Status
+    location?: string // relative to the currently mounted project
+}
+
+export interface CreateDevfileRequest {
+    path?: string
+}
+
+export interface CreateDevfileResponse {
+    // Location of the created devfile.
+    location?: string
+}
+
+export interface StartDevfileRequest {
+    // The devfile.yaml file path relative to /projects/
+    location?: string
+
+    // The home volumes will be deleted and created again with the content of the '/home' folder of each component container.
+    recreateHomeVolumes?: boolean
+}
+
+export type Status =
+    | 'PENDING'
+    | 'STABLE'
+    | 'CHANGED'
+    /**
+     * The image on-disk in the DE is different from the one in the container registry.
+     * Client should call "/devfile/pull" to pull the latest image from the registry.
+     */
+    | 'IMAGES-UPDATE-AVAILABLE'
diff --git a/packages/core/src/shared/clients/docdbClient.ts b/packages/core/src/shared/clients/docdbClient.ts
new file mode 100644
index 00000000000..54050101149
--- /dev/null
+++ b/packages/core/src/shared/clients/docdbClient.ts
@@ -0,0 +1,312 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../extensionGlobals'
+import { getLogger } from '../logger/logger'
+import { getUserAgent } from '../telemetry/util'
+import { ToolkitError } from '../errors'
+import { InterfaceNoSymbol } from '../utilities/tsUtils'
+import * as DocDB from '@aws-sdk/client-docdb'
+import * as DocDBElastic from '@aws-sdk/client-docdb-elastic'
+
+function isElasticCluster(clusterId: string | undefined): boolean | undefined {
+    return clusterId?.includes(':docdb-elastic:')
+}
+
+export const DocDBEngine = 'docdb'
+export const DBStorageType = { Standard: 'standard', IOpt1: 'iopt1' } as const
+export const MaxInstanceCount = 16
+
+/** A list of Amazon DocumentDB clusters. */
+export type DBElasticCluster = DocDBElastic.Cluster & DocDBElastic.ClusterInList
+
+export interface DBInstance extends DocDB.DBInstance {
+    IsClusterWriter?: boolean
+}
+
+export type DocumentDBClient = InterfaceNoSymbol<DefaultDocumentDBClient>
+
+export class DefaultDocumentDBClient {
+    static create(regionCode: string): DocumentDBClient {
+        return new DefaultDocumentDBClient(regionCode)
+    }
+
+    private constructor(public readonly regionCode: string) {}
+
+    private async getSdkConfig() {
+        const credentials = await globals.awsContext.getCredentials()
+        const endpointUrl = globals.awsContext.getCredentialEndpointUrl()
+        const config = {
+            customUserAgent: getUserAgent({ includePlatform: true, includeClientId: true }),
+            credentials: credentials,
+            region: this.regionCode,
+        }
+        if (endpointUrl !== undefined) {
+            return { ...config, endpoint: endpointUrl }
+        }
+        return config
+    }
+
+    public async getClient(): Promise<DocDB.DocDBClient> {
+        const config = await this.getSdkConfig()
+        return new DocDB.DocDBClient(config)
+    }
+
+    public async getElasticClient(): Promise<DocDBElastic.DocDBElasticClient> {
+        const config = await this.getSdkConfig()
+        return new DocDBElastic.DocDBElasticClient(config)
+    }
+
+    private async executeCommand<TOutput extends DocDB.ServiceOutputTypes>(command: any): Promise<TOutput> {
+        getLogger().debug(`docdbClient: ${command.constructor.name} called`)
+        const client = await this.getClient()
+        try {
+            return await client.send(command)
+        } finally {
+            client.destroy()
+        }
+    }
+
+    private async executeElasticCommand<TOutput extends DocDBElastic.ServiceOutputTypes>(
+        command: any
+    ): Promise<TOutput> {
+        getLogger().debug(`docdbClient: ${command.constructor.name} called`)
+        const client = await this.getElasticClient()
+        try {
+            return await client.send(command)
+        } finally {
+            client.destroy()
+        }
+    }
+
+    // Ideally, we would return AsyncCollection or iterator
+    public async listInstanceClassOptions(
+        engineVersion: string | undefined,
+        storageType: string | undefined
+    ): Promise<DocDB.OrderableDBInstanceOption[]> {
+        getLogger().debug('docdbClient: ListInstanceClassOptions called')
+        const client = await this.getClient()
+
+        try {
+            const instanceClasses: DocDB.OrderableDBInstanceOption[] = []
+            const input = {
+                Engine: DocDBEngine,
+                EngineVersion: engineVersion,
+            }
+            const paginator = DocDB.paginateDescribeOrderableDBInstanceOptions({ client }, input)
+            for await (const page of paginator) {
+                instanceClasses.push(...(page.OrderableDBInstanceOptions ?? []))
+            }
+
+            return instanceClasses.filter((ic) => storageType === ic.StorageType || storageType === undefined)
+        } catch (e) {
+            throw ToolkitError.chain(e, 'Failed to get instance classes')
+        } finally {
+            client.destroy()
+        }
+    }
+
+    public async listEngineVersions(): Promise<DocDB.DBEngineVersion[]> {
+        const command = new DocDB.DescribeDBEngineVersionsCommand({ Engine: DocDBEngine })
+        const response = await this.executeCommand<DocDB.DescribeDBEngineVersionsCommandOutput>(command)
+        return response.DBEngineVersions ?? []
+    }
+
+    public async listGlobalClusters(clusterId: string | undefined = undefined): Promise<DocDB.GlobalCluster[]> {
+        const input: DocDB.DescribeGlobalClustersCommandInput = {
+            Filters: [],
+            GlobalClusterIdentifier: clusterId,
+        }
+        const command = new DocDB.DescribeGlobalClustersCommand(input)
+        const response = await this.executeCommand<DocDB.DescribeGlobalClustersCommandOutput>(command)
+        return response.GlobalClusters ?? []
+    }
+
+    public async listElasticClusters(): Promise<DocDBElastic.ClusterInList[]> {
+        const command = new DocDBElastic.ListClustersCommand()
+        const response = await this.executeElasticCommand<DocDBElastic.ListClustersCommandOutput>(command)
+        return response.clusters ?? []
+    }
+
+    public async listClusters(clusterId: string | undefined = undefined): Promise<DocDB.DBCluster[]> {
+        const input: DocDB.DescribeDBClustersCommandInput = {
+            Filters: [{ Name: 'engine', Values: [DocDBEngine] }],
+            DBClusterIdentifier: clusterId,
+        }
+        const command = new DocDB.DescribeDBClustersCommand(input)
+        const response = await this.executeCommand<DocDB.DescribeDBClustersCommandOutput>(command)
+        return response.DBClusters ?? []
+    }
+
+    public async listInstances(clusters: string[] = []): Promise<DBInstance[]> {
+        const input: DocDB.DescribeDBInstancesCommandInput = {}
+        if (clusters?.length > 0) {
+            input.Filters = [{ Name: 'db-cluster-id', Values: clusters }]
+        }
+        const command = new DocDB.DescribeDBInstancesCommand(input)
+        const response = await this.executeCommand<DocDB.DescribeDBInstancesCommandOutput>(command)
+        return response.DBInstances ?? []
+    }
+
+    public async getElasticCluster(clusterArn: string): Promise<DBElasticCluster | undefined> {
+        const command = new DocDBElastic.GetClusterCommand({ clusterArn })
+        const response = await this.executeElasticCommand<DocDBElastic.GetClusterCommandOutput>(command)
+        return response.cluster
+    }
+
+    public async createCluster(input: DocDB.CreateDBClusterMessage): Promise<DocDB.DBCluster | undefined> {
+        const command = new DocDB.CreateDBClusterCommand(input)
+        const response = await this.executeCommand<DocDB.CreateDBClusterCommandOutput>(command)
+        return response.DBCluster
+    }
+
+    public async createElasticCluster(
+        input: DocDBElastic.CreateClusterInput
+    ): Promise<DocDBElastic.Cluster | undefined> {
+        const command = new DocDBElastic.CreateClusterCommand(input)
+        const response = await this.executeElasticCommand<DocDBElastic.CreateClusterCommandOutput>(command)
+        return response.cluster
+    }
+
+    public async createGlobalCluster(
+        input: DocDB.CreateGlobalClusterCommandInput
+    ): Promise<DocDB.GlobalCluster | undefined> {
+        const command = new DocDB.CreateGlobalClusterCommand(input)
+        const response = await this.executeCommand<DocDB.CreateGlobalClusterCommandOutput>(command)
+        return response.GlobalCluster
+    }
+
+    public async modifyGlobalCluster(
+        input: DocDB.ModifyGlobalClusterCommandInput
+    ): Promise<DocDB.GlobalCluster | undefined> {
+        const command = new DocDB.ModifyGlobalClusterCommand(input)
+        const response = await this.executeCommand<DocDB.ModifyGlobalClusterCommandOutput>(command)
+        return response.GlobalCluster
+    }
+
+    public async createClusterSnapshot(
+        input: DocDBElastic.CreateClusterSnapshotInput
+    ): Promise<DocDBElastic.ClusterSnapshot | undefined> {
+        const command = new DocDBElastic.CreateClusterSnapshotCommand(input)
+        const response = await this.executeElasticCommand<DocDBElastic.CreateClusterSnapshotCommandOutput>(command)
+        return response.snapshot
+    }
+
+    public async modifyCluster(input: DocDB.ModifyDBClusterMessage): Promise<DocDB.DBCluster | undefined> {
+        const command = new DocDB.ModifyDBClusterCommand(input)
+        const response = await this.executeCommand<DocDB.ModifyDBClusterCommandOutput>(command)
+        return response.DBCluster
+    }
+
+    public async deleteCluster(input: DocDB.DeleteDBClusterMessage): Promise<DocDB.DBCluster | undefined> {
+        const command = new DocDB.DeleteDBClusterCommand(input)
+        const response = await this.executeCommand<DocDB.DeleteDBClusterCommandOutput>(command)
+        return response.DBCluster
+    }
+
+    public async deleteElasticCluster(clusterArn: string): Promise<DocDBElastic.Cluster | undefined> {
+        const command = new DocDBElastic.DeleteClusterCommand({ clusterArn })
+        const response = await this.executeElasticCommand<DocDBElastic.DeleteClusterCommandOutput>(command)
+        return response.cluster
+    }
+
+    public async getInstance(instanceId: string): Promise<DBInstance | undefined> {
+        const input: DocDB.DescribeDBInstancesCommandInput = {
+            DBInstanceIdentifier: instanceId,
+        }
+        const command = new DocDB.DescribeDBInstancesCommand(input)
+        const response = await this.executeCommand<DocDB.DescribeDBInstancesCommandOutput>(command)
+        return response.DBInstances ? response.DBInstances[0] : undefined
+    }
+
+    public async createInstance(input: DocDB.CreateDBInstanceMessage): Promise<DocDB.DBInstance | undefined> {
+        const command = new DocDB.CreateDBInstanceCommand(input)
+        const response = await this.executeCommand<DocDB.CreateDBInstanceCommandOutput>(command)
+        return response.DBInstance
+    }
+
+    public async modifyInstance(input: DocDB.ModifyDBInstanceMessage): Promise<DocDB.DBInstance | undefined> {
+        const command = new DocDB.ModifyDBInstanceCommand(input)
+        const response = await this.executeCommand<DocDB.ModifyDBInstanceCommandOutput>(command)
+        return response.DBInstance
+    }
+
+    public async deleteInstance(input: DocDB.DeleteDBInstanceMessage): Promise<DocDB.DBInstance | undefined> {
+        const command = new DocDB.DeleteDBInstanceCommand(input)
+        const response = await this.executeCommand<DocDB.DeleteDBInstanceCommandOutput>(command)
+        return response.DBInstance
+    }
+
+    public async rebootInstance(instanceId: string): Promise<boolean> {
+        const command = new DocDB.RebootDBInstanceCommand({ DBInstanceIdentifier: instanceId })
+        const response = await this.executeCommand<DocDB.RebootDBInstanceCommandOutput>(command)
+        return !!response.DBInstance
+    }
+
+    public async listResourceTags(arn: string): Promise<Record<string, string | undefined> | undefined> {
+        if (isElasticCluster(arn)) {
+            const command = new DocDBElastic.ListTagsForResourceCommand({ resourceArn: arn })
+            const response = await this.executeElasticCommand<DocDBElastic.ListTagsForResourceCommandOutput>(command)
+            return response.tags
+        } else {
+            const command = new DocDB.ListTagsForResourceCommand({ ResourceName: arn })
+            const response = await this.executeCommand<DocDB.ListTagsForResourceCommandOutput>(command)
+            const tagMap = response.TagList?.reduce(
+                (map, tag) => {
+                    map[tag.Key!] = tag.Value
+                    return map
+                },
+                {} as Record<string, string | undefined>
+            )
+            return tagMap
+        }
+    }
+
+    public async addResourceTags(input: DocDBElastic.TagResourceCommandInput): Promise<void> {
+        if (isElasticCluster(input.resourceArn)) {
+            const command = new DocDBElastic.TagResourceCommand(input)
+            await this.executeElasticCommand(command)
+        } else {
+            const command = new DocDB.AddTagsToResourceCommand({
+                ResourceName: input.resourceArn,
+                Tags: Object.entries(input.tags ?? {}).map(([Key, Value]) => ({ Key, Value })),
+            })
+            await this.executeCommand(command)
+        }
+    }
+
+    public async removeResourceTags(input: DocDBElastic.UntagResourceCommandInput): Promise<void> {
+        if (isElasticCluster(input.resourceArn)) {
+            const command = new DocDBElastic.UntagResourceCommand(input)
+            await this.executeElasticCommand(command)
+        } else {
+            const command = new DocDB.RemoveTagsFromResourceCommand({
+                ResourceName: input.resourceArn,
+                TagKeys: input.tagKeys,
+            })
+            await this.executeCommand(command)
+        }
+    }
+
+    public async startCluster(clusterId: string) {
+        if (isElasticCluster(clusterId)) {
+            const command = new DocDBElastic.StartClusterCommand({ clusterArn: clusterId })
+            await this.executeElasticCommand(command)
+        } else {
+            const command = new DocDB.StartDBClusterCommand({ DBClusterIdentifier: clusterId })
+            await this.executeCommand(command)
+        }
+    }
+
+    public async stopCluster(clusterId: string) {
+        if (isElasticCluster(clusterId)) {
+            const command = new DocDBElastic.StopClusterCommand({ clusterArn: clusterId })
+            await this.executeElasticCommand(command)
+        } else {
+            const command = new DocDB.StopDBClusterCommand({ DBClusterIdentifier: clusterId })
+            await this.executeCommand(command)
+        }
+    }
+}
diff --git a/packages/core/src/shared/clients/ec2.ts b/packages/core/src/shared/clients/ec2.ts
new file mode 100644
index 00000000000..4abe9714401
--- /dev/null
+++ b/packages/core/src/shared/clients/ec2.ts
@@ -0,0 +1,261 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import {
+    EC2Client,
+    Instance,
+    InstanceStateName,
+    GetConsoleOutputRequest,
+    Filter,
+    paginateDescribeInstances,
+    DescribeInstancesRequest,
+    Reservation,
+    Tag,
+    paginateDescribeInstanceStatus,
+    StartInstancesCommandOutput,
+    StartInstancesCommand,
+    StopInstancesCommand,
+    StopInstancesCommandOutput,
+    RebootInstancesCommand,
+    IamInstanceProfileAssociation,
+    paginateDescribeIamInstanceProfileAssociations,
+    IamInstanceProfile,
+    GetConsoleOutputCommand,
+    RebootInstancesCommandOutput,
+    GetConsoleOutputCommandOutput,
+} from '@aws-sdk/client-ec2'
+import { Timeout } from '../utilities/timeoutUtils'
+import { showMessageWithCancel } from '../utilities/messages'
+import { ToolkitError, isAwsError } from '../errors'
+import { decodeBase64 } from '../utilities/textUtilities'
+import { ClientWrapper } from './clientWrapper'
+import { AsyncCollection } from '../utilities/asyncCollection'
+
+/**
+ * A wrapper around Instance where we can safely assume InstanceId field exists.
+ */
+export interface Ec2Instance extends Instance {
+    InstanceId: string
+    Name?: string
+    LastSeenStatus: InstanceStateName
+}
+/**
+ * A wrapper around Reservation where we can safely it is non empty
+ */
+export interface Ec2Reservation extends Reservation {
+    Instances: Ec2Instance[]
+}
+
+interface InstanceWithId extends Instance {
+    InstanceId: string
+}
+
+interface SafeEc2GetConsoleOutputResult extends GetConsoleOutputRequest {
+    Output: string
+    InstanceId: string
+}
+
+export class Ec2Client extends ClientWrapper<EC2Client> {
+    public constructor(public override readonly regionCode: string) {
+        super(regionCode, EC2Client)
+    }
+
+    public getReservations(filters?: Filter[]): AsyncCollection<Ec2Reservation[]> {
+        const reservations = this.makePaginatedRequest(
+            paginateDescribeInstances,
+            filters ? { Filters: filters } : ({} satisfies DescribeInstancesRequest),
+            (page) => page.Reservations
+        )
+
+        return this.patchReservations(reservations)
+    }
+
+    public getInstances(filters?: Filter[]): AsyncCollection<Ec2Instance[]> {
+        return this.getReservations(filters)
+            .flatten()
+            .map((r) => r.Instances)
+    }
+
+    /** Updates status and name in-place for displaying to humans. */
+    public patchReservations(
+        reservationPages: AsyncCollection<Reservation[]>,
+        getStatus: (i: string) => Promise<InstanceStateName> = this.getInstanceStatus.bind(this)
+    ): AsyncCollection<Ec2Reservation[]> {
+        return reservationPages.map(async (r) => await Promise.all(r.filter(isNotEmpty).map(patchReservation)))
+
+        async function patchReservation(r: Reservation & { Instances: Instance[] }): Promise<Ec2Reservation> {
+            const namedInstances = r.Instances.filter(hasId).map(addName)
+            return { ...r, Instances: await Promise.all(namedInstances.map(addStatus)) } satisfies Reservation
+        }
+
+        function hasId(i: Instance): i is InstanceWithId {
+            return i.InstanceId !== undefined
+        }
+
+        function addName<I extends InstanceWithId>(i: I): I & { Name?: string } {
+            return instanceHasName(i) ? { ...i, Name: lookupTagKey(i.Tags, 'Name') } : i
+        }
+
+        async function addStatus<I extends InstanceWithId>(
+            instance: I
+        ): Promise<I & { LastSeenStatus: InstanceStateName }> {
+            return { ...instance, LastSeenStatus: await getStatus(instance.InstanceId) }
+        }
+
+        function isNotEmpty(r: Reservation): r is Reservation & { Instances: Instance[] } {
+            return r.Instances !== undefined && r.Instances.length > 0
+        }
+    }
+
+    public async getInstanceStatus(instanceId: string): Promise<InstanceStateName> {
+        const instance = await this.getFirst(
+            paginateDescribeInstanceStatus,
+            { InstanceIds: [instanceId], IncludeAllInstances: true },
+            (page) => page.InstanceStatuses
+        )
+
+        return instance.InstanceState!.Name!
+    }
+
+    public async isInstanceRunning(instanceId: string): Promise<boolean> {
+        const status = await this.getInstanceStatus(instanceId)
+        return status === 'running'
+    }
+
+    public getInstancesFilter(instanceIds: string[]): Filter[] {
+        return [
+            {
+                Name: 'instance-id',
+                Values: instanceIds,
+            },
+        ]
+    }
+
+    private handleStatusError(instanceId: string, err: unknown) {
+        if (isAwsError(err)) {
+            throw new ToolkitError(`EC2: failed to change status of instance ${instanceId}`, {
+                cause: err as Error,
+            })
+        } else {
+            throw err
+        }
+    }
+
+    public async assertNotInStatus(
+        instanceId: string,
+        targetStatus: string,
+        getStatus: (i: string) => Promise<InstanceStateName> = this.getInstanceStatus.bind(this)
+    ) {
+        const isAlreadyInStatus = (await getStatus(instanceId)) === targetStatus
+        if (isAlreadyInStatus) {
+            throw new ToolkitError(
+                `EC2: Instance is currently ${targetStatus}. Unable to update status of ${instanceId}.`
+            )
+        }
+    }
+
+    public async startInstance(instanceId: string): Promise<StartInstancesCommandOutput> {
+        return await this.makeRequest(StartInstancesCommand, { InstanceIds: [instanceId] })
+    }
+
+    public async startInstanceWithCancel(instanceId: string): Promise<void> {
+        const timeout = new Timeout(5000)
+
+        await showMessageWithCancel(`EC2: Starting instance ${instanceId}`, timeout)
+
+        try {
+            await this.assertNotInStatus(instanceId, 'running')
+            await this.startInstance(instanceId)
+        } catch (err) {
+            this.handleStatusError(instanceId, err)
+        } finally {
+            timeout.cancel()
+        }
+    }
+
+    public async stopInstance(instanceId: string): Promise<StopInstancesCommandOutput> {
+        return await this.makeRequest(StopInstancesCommand, { InstanceIds: [instanceId] })
+    }
+
+    public async stopInstanceWithCancel(instanceId: string): Promise<void> {
+        const timeout = new Timeout(5000)
+
+        await showMessageWithCancel(`EC2: Stopping instance ${instanceId}`, timeout)
+
+        try {
+            await this.assertNotInStatus(instanceId, 'stopped')
+            await this.stopInstance(instanceId)
+        } catch (err) {
+            this.handleStatusError(instanceId, err)
+        } finally {
+            timeout.cancel()
+        }
+    }
+
+    public async rebootInstance(instanceId: string): Promise<RebootInstancesCommandOutput> {
+        return await this.makeRequest(RebootInstancesCommand, { InstanceIds: [instanceId] })
+    }
+
+    public async rebootInstanceWithCancel(instanceId: string): Promise<void> {
+        const timeout = new Timeout(5000)
+
+        await showMessageWithCancel(`EC2: Rebooting instance ${instanceId}`, timeout)
+
+        try {
+            await this.rebootInstance(instanceId)
+        } catch (err) {
+            this.handleStatusError(instanceId, err)
+        } finally {
+            timeout.cancel()
+        }
+    }
+
+    /**
+     * Retrieve IAM Association for a given EC2 instance.
+     * @param instanceId target EC2 instance ID
+     * @returns IAM Association for instance
+     */
+    private async getIamInstanceProfileAssociation(instanceId: string): Promise<IamInstanceProfileAssociation> {
+        return await this.getFirst(
+            paginateDescribeIamInstanceProfileAssociations,
+            { Filters: this.getInstancesFilter([instanceId]) },
+            (page) => page.IamInstanceProfileAssociations
+        )
+    }
+
+    /**
+     * Gets the IAM Instance Profile (not role) attached to given EC2 instance.
+     * @param instanceId target EC2 instance ID
+     * @returns IAM Instance Profile associated with instance or undefined if none exists.
+     */
+    public async getAttachedIamInstanceProfile(instanceId: string): Promise<IamInstanceProfile | undefined> {
+        const association = await this.getIamInstanceProfileAssociation(instanceId)
+        return association ? association.IamInstanceProfile : undefined
+    }
+
+    public async getConsoleOutput(instanceId: string, latest: boolean): Promise<SafeEc2GetConsoleOutputResult> {
+        const response: GetConsoleOutputCommandOutput = await this.makeRequest(GetConsoleOutputCommand, {
+            InstanceId: instanceId,
+            Latest: latest,
+        })
+
+        return {
+            ...response,
+            InstanceId: instanceId,
+            Output: response.Output ? decodeBase64(response.Output) : '',
+        }
+    }
+}
+
+export function getNameOfInstance(instance: Instance): string | undefined {
+    return instanceHasName(instance) ? lookupTagKey(instance.Tags!, 'Name')! : undefined
+}
+
+export function instanceHasName(instance: Instance): instance is Instance & { Tags: Tag[] } {
+    return instance.Tags !== undefined && instance.Tags.some((tag) => tag.Key === 'Name')
+}
+
+function lookupTagKey(tags: Tag[], targetKey: string) {
+    return tags.filter((tag) => tag.Key === targetKey)[0].Value
+}
diff --git a/packages/core/src/shared/clients/ec2MetadataClient.ts b/packages/core/src/shared/clients/ec2MetadataClient.ts
new file mode 100644
index 00000000000..72249efa6c9
--- /dev/null
+++ b/packages/core/src/shared/clients/ec2MetadataClient.ts
@@ -0,0 +1,97 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { getLogger } from '../logger/logger'
+import { ClassToInterfaceType } from '../utilities/tsUtils'
+import { httpRequest } from '@smithy/credential-provider-imds'
+import { RequestOptions } from 'http'
+
+export interface IamInfo {
+    Code: string
+    LastUpdated: string
+    InstanceProfileArn: string
+    InstanceProfileId: string
+}
+
+export interface InstanceIdentity {
+    region: string
+}
+
+export type Ec2MetadataClient = ClassToInterfaceType<DefaultEc2MetadataClient>
+export class DefaultEc2MetadataClient {
+    private static readonly metadataServiceTimeout: number = 500
+    // AWS EC2 Instance Metadata Service (IMDS) constants
+    // https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-metadata-v2-how-it-works.html
+    private static readonly metadataServiceHost: string = '169.254.169.254'
+    private static readonly tokenPath: string = '/latest/api/token'
+
+    public constructor() {}
+
+    public getInstanceIdentity(): Promise<InstanceIdentity> {
+        return this.invoke<InstanceIdentity>('/latest/dynamic/instance-identity/document')
+    }
+
+    public getIamInfo(): Promise<IamInfo> {
+        return this.invoke<IamInfo>('/latest/meta-data/iam/info')
+    }
+
+    public async invoke<T>(path: string): Promise<T> {
+        try {
+            // Try to get IMDSv2 token first
+            const token = await this.fetchMetadataToken()
+            const headers: Record<string, string> = {}
+            if (token) {
+                headers['x-aws-ec2-metadata-token'] = token
+            }
+
+            const response = await this.makeRequest(path, headers)
+            return JSON.parse(response.toString())
+        } catch (tokenErr) {
+            getLogger().warn(
+                'Ec2MetadataClient failed to fetch token. If this is an EC2 environment, then Toolkit will fall back to IMDSv1: %s',
+                tokenErr
+            )
+
+            // Fall back to IMDSv1 for legacy instances
+            try {
+                const response = await this.makeRequest(path, {})
+                return JSON.parse(response.toString())
+            } catch (err) {
+                throw new Error(`Ec2MetadataClient: failed to fetch "${path}": ${err}`)
+            }
+        }
+    }
+
+    private async fetchMetadataToken(): Promise<string | undefined> {
+        try {
+            const options: RequestOptions = {
+                host: DefaultEc2MetadataClient.metadataServiceHost,
+                path: DefaultEc2MetadataClient.tokenPath,
+                method: 'PUT',
+                headers: {
+                    'x-aws-ec2-metadata-token-ttl-seconds': '21600',
+                },
+                timeout: DefaultEc2MetadataClient.metadataServiceTimeout,
+            }
+
+            const response = await httpRequest(options)
+            return response.toString()
+        } catch (err) {
+            return undefined
+        }
+    }
+
+    private async makeRequest(path: string, headers: Record<string, string>): Promise<Buffer> {
+        const options: RequestOptions = {
+            host: DefaultEc2MetadataClient.metadataServiceHost,
+            path,
+            method: 'GET',
+            headers,
+            timeout: DefaultEc2MetadataClient.metadataServiceTimeout,
+        }
+
+        return httpRequest(options)
+    }
+}
diff --git a/packages/core/src/shared/clients/ecrClient.ts b/packages/core/src/shared/clients/ecrClient.ts
new file mode 100644
index 00000000000..f5e03d4db7a
--- /dev/null
+++ b/packages/core/src/shared/clients/ecrClient.ts
@@ -0,0 +1,103 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    ECRClient,
+    DescribeImagesCommand,
+    DescribeRepositoriesCommand,
+    CreateRepositoryCommand,
+    DeleteRepositoryCommand,
+    BatchDeleteImageCommand,
+} from '@aws-sdk/client-ecr'
+import type { DescribeImagesRequest, DescribeRepositoriesRequest, Repository } from '@aws-sdk/client-ecr'
+import globals from '../extensionGlobals'
+import { AsyncCollection } from '../utilities/asyncCollection'
+import { pageableToCollection } from '../utilities/collectionUtils'
+import { assertHasProps, ClassToInterfaceType, isNonNullable, RequiredProps } from '../utilities/tsUtils'
+
+export type EcrRepository = RequiredProps<Repository, 'repositoryName' | 'repositoryUri' | 'repositoryArn'>
+
+export type EcrClient = ClassToInterfaceType<DefaultEcrClient>
+export class DefaultEcrClient {
+    public constructor(public readonly regionCode: string) {}
+
+    public async *describeTags(repositoryName: string): AsyncIterableIterator<string> {
+        const sdkClient = this.createSdkClient()
+        const request: DescribeImagesRequest = { repositoryName: repositoryName }
+        do {
+            const response = await sdkClient.send(new DescribeImagesCommand(request))
+            if (response.imageDetails) {
+                for (const item of response.imageDetails) {
+                    if (item.imageTags !== undefined) {
+                        for (const tag of item.imageTags) {
+                            yield tag
+                        }
+                    }
+                }
+            }
+            request.nextToken = response.nextToken
+        } while (request.nextToken)
+    }
+
+    public async *describeRepositories(): AsyncIterableIterator<EcrRepository> {
+        const sdkClient = this.createSdkClient()
+        const request: DescribeRepositoriesRequest = {}
+        do {
+            const response = await sdkClient.send(new DescribeRepositoriesCommand(request))
+            if (response.repositories) {
+                yield* response.repositories
+                    .map((repo: Repository) => {
+                        // If any of these are not present, the repo returned is not valid. repositoryUri/Arn
+                        // are both based on name, and it's not possible to not have a name
+                        if (!repo.repositoryArn || !repo.repositoryName || !repo.repositoryUri) {
+                            return undefined
+                        } else {
+                            return {
+                                repositoryName: repo.repositoryName,
+                                repositoryUri: repo.repositoryUri,
+                                repositoryArn: repo.repositoryArn,
+                            }
+                        }
+                    })
+                    .filter((item: EcrRepository | undefined) => item !== undefined) as EcrRepository[]
+            }
+            request.nextToken = response.nextToken
+        } while (request.nextToken)
+    }
+
+    public listAllRepositories(): AsyncCollection<EcrRepository[]> {
+        const requester = async (req: DescribeRepositoriesRequest) =>
+            this.createSdkClient().send(new DescribeRepositoriesCommand(req))
+        const collection = pageableToCollection(requester, {}, 'nextToken', 'repositories')
+
+        return collection
+            .filter(isNonNullable)
+            .map((list: Repository[]) => list.map((repo: Repository) => (assertHasProps(repo), repo)))
+    }
+
+    public async createRepository(repositoryName: string) {
+        const sdkClient = this.createSdkClient()
+        return sdkClient.send(new CreateRepositoryCommand({ repositoryName: repositoryName }))
+    }
+
+    public async deleteRepository(repositoryName: string): Promise<void> {
+        const sdkClient = this.createSdkClient()
+        await sdkClient.send(new DeleteRepositoryCommand({ repositoryName: repositoryName }))
+    }
+
+    public async deleteTag(repositoryName: string, tag: string): Promise<void> {
+        const sdkClient = this.createSdkClient()
+        await sdkClient.send(
+            new BatchDeleteImageCommand({ repositoryName: repositoryName, imageIds: [{ imageTag: tag }] })
+        )
+    }
+
+    protected createSdkClient(): ECRClient {
+        return globals.sdkClientBuilderV3.createAwsService({
+            serviceClient: ECRClient,
+            clientOptions: { region: this.regionCode },
+        })
+    }
+}
diff --git a/packages/core/src/shared/clients/ecsClient.ts b/packages/core/src/shared/clients/ecsClient.ts
new file mode 100644
index 00000000000..818cdc0dec5
--- /dev/null
+++ b/packages/core/src/shared/clients/ecsClient.ts
@@ -0,0 +1,159 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    Cluster,
+    DescribeClustersCommand,
+    DescribeServicesCommand,
+    DescribeTaskDefinitionCommand,
+    DescribeTaskDefinitionResponse,
+    DescribeTasksCommand,
+    DescribeTasksRequest,
+    ECSClient,
+    ExecuteCommandCommand,
+    ExecuteCommandRequest,
+    ExecuteCommandResponse,
+    ListClustersCommand,
+    ListClustersRequest,
+    ListServicesCommand,
+    ListServicesRequest,
+    ListTasksCommand,
+    ListTasksRequest,
+    RegisterTaskDefinitionCommand,
+    RegisterTaskDefinitionRequest,
+    Service,
+    Task,
+    UpdateServiceCommand,
+    UpdateServiceRequest,
+} from '@aws-sdk/client-ecs'
+import globals from '../extensionGlobals'
+import { AsyncCollection } from '../utilities/asyncCollection'
+import { pageableToCollection } from '../utilities/collectionUtils'
+import { ClassToInterfaceType, isNonNullable } from '../utilities/tsUtils'
+
+export type EcsClient = ClassToInterfaceType<DefaultEcsClient>
+
+export type EcsResourceAndToken = {
+    resource: Cluster[] | Service[]
+    nextToken?: string
+}
+
+const maxResultsPerResponse = 10
+export class DefaultEcsClient {
+    public constructor(public readonly regionCode: string) {}
+
+    public async getClusters(nextToken?: string): Promise<EcsResourceAndToken> {
+        const sdkClient = this.createSdkClient()
+        const clusterArnList = await sdkClient.send(
+            new ListClustersCommand({ maxResults: maxResultsPerResponse, nextToken })
+        )
+        if (clusterArnList.clusterArns?.length === 0) {
+            return { resource: [] }
+        }
+        const clusterResponse = await sdkClient.send(
+            new DescribeClustersCommand({ clusters: clusterArnList.clusterArns })
+        )
+        const response: EcsResourceAndToken = {
+            resource: clusterResponse.clusters!,
+            nextToken: clusterArnList.nextToken,
+        }
+        return response
+    }
+
+    public listClusters(request: ListClustersRequest = {}): AsyncCollection<Cluster[]> {
+        const client = this.createSdkClient()
+        const requester = async (req: ListClustersRequest) => client.send(new ListClustersCommand(req))
+        const collection = pageableToCollection(requester, request, 'nextToken', 'clusterArns')
+
+        return collection.filter(isNonNullable).map(async (clusters) => {
+            if (clusters.length === 0) {
+                return []
+            }
+
+            const resp = await client.send(new DescribeClustersCommand({ clusters }))
+            return resp.clusters!
+        })
+    }
+
+    public async getServices(cluster: string, nextToken?: string): Promise<EcsResourceAndToken> {
+        const sdkClient = this.createSdkClient()
+        const serviceArnList = await sdkClient.send(
+            new ListServicesCommand({ cluster: cluster, maxResults: maxResultsPerResponse, nextToken })
+        )
+        if (serviceArnList.serviceArns?.length === 0) {
+            return { resource: [] }
+        }
+        const services = await this.describeServices(cluster, serviceArnList.serviceArns!)
+        const response: EcsResourceAndToken = {
+            resource: services,
+            nextToken: serviceArnList.nextToken,
+        }
+        return response
+    }
+
+    public listServices(request: ListServicesRequest = {}): AsyncCollection<Service[]> {
+        const client = this.createSdkClient()
+        const requester = async (req: ListServicesRequest) => client.send(new ListServicesCommand(req))
+        const collection = pageableToCollection(requester, request, 'nextToken', 'serviceArns')
+
+        return collection.filter(isNonNullable).map(async (services) => {
+            if (services.length === 0) {
+                return []
+            }
+
+            const resp = await client.send(new DescribeServicesCommand({ cluster: request.cluster, services }))
+            return resp.services!
+        })
+    }
+
+    public async describeTaskDefinition(taskDefinition: string): Promise<DescribeTaskDefinitionResponse> {
+        const sdkClient = this.createSdkClient()
+        return await sdkClient.send(new DescribeTaskDefinitionCommand({ taskDefinition }))
+    }
+
+    public async listTasks(args: ListTasksRequest): Promise<string[]> {
+        const sdkClient = this.createSdkClient()
+        const listTasksResponse = await sdkClient.send(new ListTasksCommand(args))
+        return listTasksResponse.taskArns ?? []
+    }
+
+    public async updateService(request: UpdateServiceRequest): Promise<void> {
+        const sdkClient = this.createSdkClient()
+        await sdkClient.send(new UpdateServiceCommand(request))
+    }
+
+    public async describeTasks(cluster: string, tasks: string[]): Promise<Task[]> {
+        const sdkClient = this.createSdkClient()
+
+        const params: DescribeTasksRequest = { cluster, tasks }
+        const describedTasks = await sdkClient.send(new DescribeTasksCommand(params))
+        return describedTasks.tasks ?? []
+    }
+
+    public async describeServices(cluster: string, services: string[]): Promise<Service[]> {
+        const sdkClient = this.createSdkClient()
+        return (await sdkClient.send(new DescribeServicesCommand({ cluster, services }))).services ?? []
+    }
+
+    protected createSdkClient(): ECSClient {
+        return globals.sdkClientBuilderV3.createAwsService({
+            serviceClient: ECSClient,
+            clientOptions: { region: this.regionCode },
+        })
+    }
+
+    public async executeCommand(request: Omit<ExecuteCommandRequest, 'interactive'>): Promise<ExecuteCommandResponse> {
+        const sdkClient = this.createSdkClient()
+
+        // Currently the 'interactive' flag is required and needs to be true for ExecuteCommand: https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_ExecuteCommand.html
+        // This may change 'in the near future' as explained here: https://aws.amazon.com/blogs/containers/new-using-amazon-ecs-exec-access-your-containers-fargate-ec2/
+        return await sdkClient.send(new ExecuteCommandCommand({ ...request, interactive: true }))
+    }
+
+    public async registerTaskDefinition(request: RegisterTaskDefinitionRequest) {
+        const sdkClient = this.createSdkClient()
+        return sdkClient.send(new RegisterTaskDefinitionCommand(request))
+    }
+}
diff --git a/packages/core/src/shared/clients/iam.ts b/packages/core/src/shared/clients/iam.ts
new file mode 100644
index 00000000000..1ccb1f6c03c
--- /dev/null
+++ b/packages/core/src/shared/clients/iam.ts
@@ -0,0 +1,136 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    AttachedPolicy,
+    AttachRolePolicyCommand,
+    AttachRolePolicyRequest,
+    CreateRoleCommand,
+    CreateRoleCommandOutput,
+    CreateRoleRequest,
+    CreateRoleResponse,
+    EvaluationResult,
+    GetInstanceProfileCommand,
+    GetInstanceProfileCommandOutput,
+    IAMClient,
+    ListRolesRequest,
+    paginateListAttachedRolePolicies,
+    paginateListRoles,
+    PutRolePolicyCommand,
+    PutRolePolicyCommandOutput,
+    Role,
+    SimulatePolicyResponse,
+    SimulatePrincipalPolicyCommand,
+    SimulatePrincipalPolicyRequest,
+} from '@aws-sdk/client-iam'
+import { AsyncCollection } from '../utilities/asyncCollection'
+import { ToolkitError } from '../errors'
+import { ClientWrapper } from './clientWrapper'
+
+export interface IamRole extends Role {
+    RoleName: string
+    Arn: string
+}
+
+export interface IamCreateRoleResponse extends CreateRoleResponse {
+    Role: IamRole
+}
+
+export class IamClient extends ClientWrapper<IAMClient> {
+    public constructor(public override readonly regionCode: string) {
+        super(regionCode, IAMClient)
+    }
+
+    public getRoles(request: ListRolesRequest = {}, maxPages: number = 500): AsyncCollection<IamRole[]> {
+        return this.makePaginatedRequest(paginateListRoles, request, (p) => p.Roles)
+            .limit(maxPages)
+            .map((roles) => roles.filter(hasRequiredFields))
+    }
+
+    /** Gets all roles. */
+    public async resolveRoles(request: ListRolesRequest = {}): Promise<IamRole[]> {
+        return this.getRoles(request).flatten().promise()
+    }
+
+    public async createRole(request: CreateRoleRequest): Promise<IamCreateRoleResponse> {
+        const response: CreateRoleCommandOutput = await this.makeRequest(CreateRoleCommand, request)
+        if (!response.Role || !hasRequiredFields(response.Role)) {
+            throw new ToolkitError('Failed to create IAM role')
+        }
+        return response as IamCreateRoleResponse // Safe to assume by check above.
+    }
+
+    public async attachRolePolicy(request: AttachRolePolicyRequest): Promise<AttachRolePolicyCommand> {
+        return await this.makeRequest(AttachRolePolicyCommand, request)
+    }
+
+    public async simulatePrincipalPolicy(request: SimulatePrincipalPolicyRequest): Promise<SimulatePolicyResponse> {
+        return await this.makeRequest(SimulatePrincipalPolicyCommand, request)
+    }
+
+    /**
+     * Attempts to verify if a role has the provided permissions.
+     */
+    public async getDeniedActions(request: SimulatePrincipalPolicyRequest): Promise<EvaluationResult[]> {
+        const permissionResponse = await this.simulatePrincipalPolicy(request)
+        if (!permissionResponse.EvaluationResults) {
+            throw new Error('No evaluation results found')
+        }
+
+        // Ignore deny from Organization SCP.  These can result in false negatives.
+        // See https://github.com/aws/aws-sdk/issues/102
+        return permissionResponse.EvaluationResults.filter(
+            (r) => r.EvalDecision !== 'allowed' && r.OrganizationsDecisionDetail?.AllowedByOrganizations !== false
+        )
+    }
+
+    public getFriendlyName(arn: string): string {
+        const tokens = arn.split('/')
+        if (tokens.length < 2) {
+            throw new Error(`Invalid IAM role ARN (expected format: arn:aws:iam::{id}/{name}): ${arn}`)
+        }
+        return tokens[tokens.length - 1]
+    }
+
+    public listAttachedRolePolicies(arn: string): AsyncCollection<AttachedPolicy[]> {
+        return this.makePaginatedRequest(
+            paginateListAttachedRolePolicies,
+            {
+                RoleName: this.getFriendlyName(arn),
+            },
+            (p) => p.AttachedPolicies
+        )
+    }
+
+    public async getIAMRoleFromInstanceProfile(instanceProfileArn: string): Promise<IamRole> {
+        const response: GetInstanceProfileCommandOutput = await this.makeRequest(GetInstanceProfileCommand, {
+            InstanceProfileName: this.getFriendlyName(instanceProfileArn),
+        })
+        if (
+            !response.InstanceProfile?.Roles ||
+            response.InstanceProfile.Roles.length === 0 ||
+            !hasRequiredFields(response.InstanceProfile.Roles[0])
+        ) {
+            throw new ToolkitError(`Failed to find IAM role associated with Instance profile ${instanceProfileArn}`)
+        }
+        return response.InstanceProfile.Roles[0]
+    }
+
+    public async putRolePolicy(
+        roleArn: string,
+        policyName: string,
+        policyDocument: string
+    ): Promise<PutRolePolicyCommandOutput> {
+        return await this.makeRequest(PutRolePolicyCommand, {
+            RoleName: this.getFriendlyName(roleArn),
+            PolicyName: policyName,
+            PolicyDocument: policyDocument,
+        })
+    }
+}
+
+function hasRequiredFields(role: Role): role is IamRole {
+    return role.RoleName !== undefined && role.Arn !== undefined
+}
diff --git a/packages/core/src/shared/clients/iotClient.ts b/packages/core/src/shared/clients/iotClient.ts
new file mode 100644
index 00000000000..fc5581fffa4
--- /dev/null
+++ b/packages/core/src/shared/clients/iotClient.ts
@@ -0,0 +1,580 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as _ from 'lodash'
+import {
+    AttachPolicyCommand,
+    AttachPolicyRequest,
+    AttachThingPrincipalCommand,
+    AttachThingPrincipalRequest,
+    CertificateDescription,
+    CreateKeysAndCertificateCommand,
+    CreateKeysAndCertificateRequest,
+    CreateKeysAndCertificateResponse,
+    CreatePolicyCommand,
+    CreatePolicyRequest,
+    CreatePolicyResponse,
+    CreatePolicyVersionCommand,
+    CreatePolicyVersionRequest,
+    CreateThingCommand,
+    CreateThingRequest,
+    CreateThingResponse,
+    DeleteCertificateCommand,
+    DeleteCertificateRequest,
+    DeletePolicyCommand,
+    DeletePolicyRequest,
+    DeletePolicyVersionCommand,
+    DeletePolicyVersionRequest,
+    DeleteThingCommand,
+    DeleteThingRequest,
+    DescribeCertificateCommand,
+    DescribeCertificateRequest,
+    DescribeCertificateResponse,
+    DescribeEndpointCommand,
+    DetachPolicyCommand,
+    DetachPolicyRequest,
+    DetachThingPrincipalCommand,
+    DetachThingPrincipalRequest,
+    GetPolicyVersionCommand,
+    GetPolicyVersionRequest,
+    GetPolicyVersionResponse,
+    IoTClient,
+    ListCertificatesCommand,
+    ListCertificatesRequest,
+    ListCertificatesResponse,
+    ListPoliciesCommand,
+    ListPoliciesRequest,
+    ListPoliciesResponse,
+    ListPolicyVersionsCommand,
+    ListPolicyVersionsRequest,
+    ListPrincipalPoliciesCommand,
+    ListPrincipalPoliciesRequest,
+    ListPrincipalPoliciesResponse,
+    ListPrincipalThingsCommand,
+    ListPrincipalThingsRequest,
+    ListTargetsForPolicyCommand,
+    ListTargetsForPolicyRequest,
+    ListThingPrincipalsCommand,
+    ListThingPrincipalsRequest,
+    ListThingPrincipalsResponse,
+    ListThingsCommand,
+    ListThingsRequest,
+    ListThingsResponse,
+    PolicyVersion,
+    SetDefaultPolicyVersionCommand,
+    SetDefaultPolicyVersionRequest,
+    UpdateCertificateCommand,
+    UpdateCertificateRequest,
+} from '@aws-sdk/client-iot'
+import { parse } from '@aws-sdk/util-arn-parser'
+import { getLogger } from '../logger/logger'
+import { InterfaceNoSymbol } from '../utilities/tsUtils'
+import globals from '../extensionGlobals'
+
+const defaultMaxThings = 250 // 250 is the maximum allowed by the API
+
+/* ATS is recommended over the deprecated Verisign certificates */
+const iotEndpointType = 'iot:Data-ATS'
+
+export type IotThing = { readonly name: string; readonly arn: string }
+export type IotCertificate = {
+    readonly id: string
+    readonly arn: string
+    readonly activeStatus: string
+    readonly creationDate: Date
+}
+export type IotPolicy = IotThing
+export type IotClient = InterfaceNoSymbol<DefaultIotClient>
+
+const iotServiceArn = 'iot'
+// Pattern to extract the certificate ID from the parsed ARN resource.
+const certArnResourcePattern = /cert\/(\w+)/
+
+export interface ListThingCertificatesResponse {
+    readonly certificates: CertificateDescription[]
+    readonly nextToken: string | undefined
+}
+
+export class DefaultIotClient {
+    public constructor(
+        private readonly regionCode: string,
+        private readonly iotProvider: (regionCode: string) => IoTClient = createSdkClient
+    ) {}
+
+    /**
+     * Lists Things owned by the client.
+     *
+     * @throws Error if there is an error calling IoT.
+     */
+    public async listThings(request?: ListThingsRequest): Promise<ListThingsResponse> {
+        getLogger().debug('ListThings called with request: %O', request)
+        const iot = this.iotProvider(this.regionCode)
+
+        const output: ListThingsResponse = await iot.send(
+            new ListThingsCommand({
+                maxResults: request?.maxResults ?? defaultMaxThings,
+                nextToken: request?.nextToken,
+            })
+        )
+
+        getLogger().debug('ListThings returned response: %O', output)
+        return output
+    }
+
+    /**
+     * Creates an IoT Thing.
+     *
+     * @throws Error if there is an error calling IoT.
+     */
+    public async createThing(request: CreateThingRequest): Promise<CreateThingResponse> {
+        getLogger().debug('CreateThing called with request: %O', request)
+        const iot = this.iotProvider(this.regionCode)
+
+        const output: CreateThingResponse = await iot.send(new CreateThingCommand({ thingName: request.thingName }))
+
+        getLogger().debug('CreateThing returned response: %O', output)
+        return output
+    }
+
+    /**
+     * Deletes an IoT Thing.
+     *
+     * @throws Error if there is an error calling IoT.
+     */
+    public async deleteThing(request: DeleteThingRequest): Promise<void> {
+        getLogger().debug('DeleteThing called with request: %O', request)
+        const iot = this.iotProvider(this.regionCode)
+
+        await iot.send(new DeleteThingCommand({ thingName: request.thingName }))
+
+        getLogger().debug('DeleteThing successful')
+    }
+
+    /**
+     * Lists all IoT certificates in account.
+     *
+     * @throws Error if there is an error calling IoT.
+     */
+    public async listCertificates(request: ListCertificatesRequest): Promise<ListCertificatesResponse> {
+        getLogger().debug('ListCertificates called with request: %O', request)
+        const iot = this.iotProvider(this.regionCode)
+
+        const output: ListCertificatesResponse = await iot.send(
+            new ListCertificatesCommand({
+                pageSize: request.pageSize ?? defaultMaxThings,
+                marker: request.marker,
+                ascendingOrder: request.ascendingOrder,
+            })
+        )
+
+        getLogger().debug('ListCertificates returned response: %O', output)
+        return output
+    }
+
+    /**
+     * Lists all principals attached to IoT Thing.
+     *
+     * Returns ARNS of principals that may be X.509 certificates, IAM
+     * users/groups/roles, or Amazon Cognito identities.
+     *
+     * @throws Error if there is an error calling IoT.
+     */
+    public async listThingPrincipals(request: ListThingPrincipalsRequest): Promise<ListThingPrincipalsResponse> {
+        const iot = this.iotProvider(this.regionCode)
+
+        const output: ListThingPrincipalsResponse = await iot.send(
+            new ListThingPrincipalsCommand({
+                thingName: request.thingName,
+                maxResults: request.maxResults ?? defaultMaxThings,
+                nextToken: request.nextToken,
+            })
+        )
+        return output
+    }
+
+    /**
+     * Describes a certificate given the certificate ID.
+     *
+     * @throws Error if there is an error calling IoT.
+     */
+    private async describeCertificate(request: DescribeCertificateRequest): Promise<DescribeCertificateResponse> {
+        const iot = this.iotProvider(this.regionCode)
+
+        const output: DescribeCertificateResponse = await iot.send(new DescribeCertificateCommand(request))
+
+        return output
+    }
+
+    /**
+     * Lists all IoT certificates attached to IoT Thing.
+     *
+     * listThingPrincipals() returns ARNS of principals that may be X.509
+     * certificates, IAM users/groups/roles, or Amazon Cognito identities.
+     * The list is filtered for certificates only, and describeCertificate()
+     * is called to get the information for each certificate.
+     *
+     * @throws Error if there is an error calling IoT.
+     */
+    public async listThingCertificates(request: ListThingPrincipalsRequest): Promise<ListThingCertificatesResponse> {
+        getLogger().debug('ListThingCertificates called with request: %O', request)
+
+        const output = await this.listThingPrincipals(request)
+        const iotPrincipals: string[] = output.principals ?? []
+        const nextToken = output.nextToken
+
+        const describedCerts = iotPrincipals.map(async (iotPrincipal) => {
+            const principalArn = parse(iotPrincipal)
+            const certIdFound = principalArn.resource.match(certArnResourcePattern)
+            if (principalArn.service !== iotServiceArn || !certIdFound) {
+                return undefined
+            }
+            const certId = certIdFound[1]
+            return this.describeCertificate({ certificateId: certId })
+        })
+
+        const resolvedCerts = (await Promise.all(describedCerts))
+            .filter((cert) => cert?.certificateDescription !== undefined)
+            .map((cert) => cert?.certificateDescription as CertificateDescription)
+
+        const response: ListThingCertificatesResponse = { certificates: resolvedCerts, nextToken: nextToken }
+        getLogger().debug('ListThingCertificates returned response: %O', response)
+        return { certificates: resolvedCerts, nextToken: nextToken }
+    }
+
+    /**
+     * Lists Things attached to specified certificate.
+     *
+     * The nextToken output is discarded, since this function is only used
+     * to determine if the number of attached Things is nonzero.
+     *
+     * @throws Error if there is an error calling IoT.
+     */
+    public async listThingsForCert(request: ListPrincipalThingsRequest): Promise<string[]> {
+        getLogger().debug('ListThingsForCert called with request: %O', request)
+        const iot = this.iotProvider(this.regionCode)
+
+        const output = await iot.send(
+            new ListPrincipalThingsCommand({
+                maxResults: request.maxResults ?? defaultMaxThings,
+                nextToken: request.nextToken,
+                principal: request.principal,
+            })
+        )
+        const iotThings: string[] = output.things ?? []
+
+        getLogger().debug('ListThingsForCert returned response: %O', iotThings)
+        return iotThings
+    }
+
+    /**
+     * Creates an X.509 certificate with a 2048 bit RSA keypair.
+     *
+     * @throws Error if there is an error calling IoT.
+     */
+    public async createCertificateAndKeys(
+        request: CreateKeysAndCertificateRequest
+    ): Promise<CreateKeysAndCertificateResponse> {
+        getLogger().debug('CreateCertificate called with request: %O', request)
+        const iot = this.iotProvider(this.regionCode)
+
+        const output: CreateKeysAndCertificateResponse = await iot.send(new CreateKeysAndCertificateCommand(request))
+
+        getLogger().debug('CreateCertificate succeeded')
+        return output
+    }
+
+    /**
+     * Activates, deactivates, or revokes an IoT Certificate.
+     *
+     * @throws Error if there is an error calling IoT.
+     */
+    public async updateCertificate(request: UpdateCertificateRequest): Promise<void> {
+        getLogger().debug('UpdateCertificate called with request: %O', request)
+        const iot = this.iotProvider(this.regionCode)
+
+        await iot.send(
+            new UpdateCertificateCommand({ certificateId: request.certificateId, newStatus: request.newStatus })
+        )
+
+        getLogger().debug('UpdateCertificate successful')
+    }
+
+    /**
+     * Deletes the specified IoT Certificate.
+     *
+     * Note that a certificate cannot be deleted if it is ACTIVE, or has attached
+     * Things or policies. A certificate may be force deleted if it is INACTIVE
+     * and has no attached Things.
+     *
+     * @throws Error if there is an error calling IoT.
+     */
+    public async deleteCertificate(request: DeleteCertificateRequest): Promise<void> {
+        getLogger().debug('DeleteCertificate called with request: %O', request)
+        const iot = this.iotProvider(this.regionCode)
+
+        await iot.send(new DeleteCertificateCommand(request))
+
+        getLogger().debug('DeleteCertificate successful')
+    }
+
+    /**
+     * Attaches the certificate specified by the principal to the specified Thing.
+     *
+     * @throws Error if there is an error calling IoT.
+     */
+    public async attachThingPrincipal(request: AttachThingPrincipalRequest): Promise<void> {
+        getLogger().debug('AttachThingPrincipal called with request: %O', request)
+        const iot = this.iotProvider(this.regionCode)
+
+        await iot.send(new AttachThingPrincipalCommand({ thingName: request.thingName, principal: request.principal }))
+
+        getLogger().debug('AttachThingPrincipal successful')
+    }
+
+    /**
+     * Detaches the certificate specified by the principal from the specified Thing.
+     *
+     * @throws Error if there is an error calling IoT.
+     */
+    public async detachThingPrincipal(request: DetachThingPrincipalRequest): Promise<void> {
+        getLogger().debug('DetachThingPrincipal called with request: %O', request)
+        const iot = this.iotProvider(this.regionCode)
+
+        await iot.send(new DetachThingPrincipalCommand({ thingName: request.thingName, principal: request.principal }))
+
+        getLogger().debug('DetachThingPrincipal successful')
+    }
+
+    /**
+     * Lists all IoT Policies.
+     *
+     * @throws Error if there is an error calling IoT.
+     */
+    public async listPolicies(request: ListPoliciesRequest): Promise<ListPoliciesResponse> {
+        getLogger().debug('ListPolicies called with request: %O', request)
+        const iot = this.iotProvider(this.regionCode)
+
+        const output: ListPoliciesResponse = await iot.send(
+            new ListPoliciesCommand({
+                pageSize: request.pageSize ?? defaultMaxThings,
+                marker: request.marker,
+                ascendingOrder: request.ascendingOrder,
+            })
+        )
+
+        getLogger().debug('ListPolicies returned response: %O', output)
+        return output
+    }
+
+    /**
+     * Lists IoT policies for principal.
+     *
+     * @throws Error if there is an error calling IoT.
+     */
+    public async listPrincipalPolicies(request: ListPrincipalPoliciesRequest): Promise<ListPoliciesResponse> {
+        getLogger().debug('ListPrincipalPolicies called with request: %O', request)
+        const iot = this.iotProvider(this.regionCode)
+
+        const output: ListPrincipalPoliciesResponse = await iot.send(
+            new ListPrincipalPoliciesCommand({
+                principal: request.principal,
+                pageSize: request.pageSize ?? defaultMaxThings,
+                marker: request.marker,
+                ascendingOrder: request.ascendingOrder,
+            })
+        )
+
+        getLogger().debug('ListPrincipalPolicies returned response: %O', output)
+        return output
+    }
+
+    /**
+     * Lists certificates attached to specified policy.
+     *
+     * The nextMarker output value is discarded, since this function is only
+     * used to determine if the number of attached targets is nonzero.
+     *
+     * @throws Error if there is an error calling IoT.
+     */
+    public async listPolicyTargets(request: ListTargetsForPolicyRequest): Promise<string[]> {
+        getLogger().debug('ListPolicyTargets called with request: %O', request)
+        const iot = this.iotProvider(this.regionCode)
+
+        const output = await iot.send(
+            new ListTargetsForPolicyCommand({
+                pageSize: request.pageSize ?? defaultMaxThings,
+                marker: request.marker,
+                policyName: request.policyName,
+            })
+        )
+        const arns: string[] = output.targets ?? []
+
+        getLogger().debug('ListPolicyTargets returned response: %O', arns)
+        return arns
+    }
+
+    /**
+     * Attaches the specified policy to the specified target certificate.
+     *
+     * @throws Error if there is an error calling IoT.
+     */
+    public async attachPolicy(request: AttachPolicyRequest): Promise<void> {
+        getLogger().debug('AttachPolicy called with request: %O', request)
+        const iot = this.iotProvider(this.regionCode)
+
+        await iot.send(new AttachPolicyCommand({ policyName: request.policyName, target: request.target }))
+
+        getLogger().debug('AttachPolicy successful')
+    }
+
+    /**
+     * Detaches the specified policy to the specified target certificate.
+     *
+     * @throws Error if there is an error calling IoT.
+     */
+    public async detachPolicy(request: DetachPolicyRequest): Promise<void> {
+        getLogger().debug('DetachPolicy called with request: %O', request)
+        const iot = this.iotProvider(this.regionCode)
+
+        await iot.send(new DetachPolicyCommand({ policyName: request.policyName, target: request.target }))
+
+        getLogger().debug('DetachPolicy successful')
+    }
+
+    /**
+     * Creates an policy from the given policy document.
+     *
+     * @throws Error if there is an error calling IoT.
+     */
+    public async createPolicy(request: CreatePolicyRequest): Promise<void> {
+        getLogger().debug('CreatePolicy called with request: %O', request)
+        const iot = this.iotProvider(this.regionCode)
+
+        const output: CreatePolicyResponse = await iot.send(new CreatePolicyCommand(request))
+        getLogger().info(`Created policy: ${output.policyArn}`)
+
+        getLogger().debug('CreatePolicy successful')
+    }
+
+    /**
+     * Deletes an IoT Policy.
+     *
+     * Note that a policy cannot be deleted if it is attached to a certificate,
+     * or has non-default versions. A policy with non default versions must first
+     * delete versions with deletePolicyVersions()
+     *
+     * @throws Error if there is an error calling IoT.
+     */
+    public async deletePolicy(request: DeletePolicyRequest): Promise<void> {
+        getLogger().debug('DeletePolicy called with request: %O', request)
+        const iot = this.iotProvider(this.regionCode)
+
+        await iot.send(new DeletePolicyCommand({ policyName: request.policyName }))
+
+        getLogger().debug('DeletePolicy successful')
+    }
+
+    /**
+     * Retrieves the account's IoT device data endpoint.
+     *
+     * @throws Error if there is an error calling IoT.
+     */
+    public async getEndpoint(): Promise<string> {
+        getLogger().debug('GetEndpoint called')
+        const iot = this.iotProvider(this.regionCode)
+
+        const output = await iot.send(new DescribeEndpointCommand({ endpointType: iotEndpointType }))
+        if (!output.endpointAddress) {
+            throw new Error('Failed to retrieve endpoint')
+        }
+
+        getLogger().debug('GetEndpoint successful')
+        return output.endpointAddress
+    }
+
+    /**
+     * Lists versions for an IoT Policy
+     *
+     * @throws Error if there is an error calling IoT.
+     */
+    public async *listPolicyVersions(request: ListPolicyVersionsRequest): AsyncIterableIterator<PolicyVersion> {
+        const iot = this.iotProvider(this.regionCode)
+
+        const response = await iot.send(new ListPolicyVersionsCommand(request))
+
+        if (response.policyVersions) {
+            yield* response.policyVersions
+        }
+    }
+
+    /**
+     * Creates a new version for an IoT policy
+     *
+     * @throws Error if there is an error calling IoT.
+     */
+    public async createPolicyVersion(request: CreatePolicyVersionRequest): Promise<void> {
+        getLogger().debug('CreatePolicyVersion called with request: %O', request)
+        const iot = this.iotProvider(this.regionCode)
+
+        const output = await iot.send(new CreatePolicyVersionCommand(request))
+        getLogger().info(`Created new version ${output.policyVersionId} of ${request.policyName}`)
+
+        getLogger().debug('CreatePolicyVersion successful')
+    }
+
+    /**
+     * Deletes an IoT Policy version.
+     *
+     * Note that a policy cannot be deleted if it is attached to a certificate,
+     * or has non-default versions. A policy with non default versions must first
+     * delete versions with deletePolicyVersions()
+     *
+     * @throws Error if there is an error calling IoT.
+     */
+    public async deletePolicyVersion(request: DeletePolicyVersionRequest): Promise<void> {
+        getLogger().debug('DeletePolicyVersion called with request: %O', request)
+        const iot = this.iotProvider(this.regionCode)
+
+        await iot.send(new DeletePolicyVersionCommand(request))
+
+        getLogger().debug('DeletePolicyVersion successful')
+    }
+
+    /**
+     * Sets a default version for an Iot Policy.
+     *
+     * @throws Error if there is an error calling IoT.
+     */
+    public async setDefaultPolicyVersion(request: SetDefaultPolicyVersionRequest): Promise<void> {
+        getLogger().debug('SetDefaultPolicyVersion called with request: %O', request)
+        const iot = this.iotProvider(this.regionCode)
+
+        await iot.send(new SetDefaultPolicyVersionCommand(request))
+
+        getLogger().debug('SetDefaultPolicyVersion successful')
+    }
+
+    /**
+     * Downloads information including document for a specified policy version.
+     *
+     * @throws Error if there is an error calling IoT.
+     */
+    public async getPolicyVersion(request: GetPolicyVersionRequest): Promise<GetPolicyVersionResponse> {
+        getLogger().debug('GetPolicyVersion called with request: %O', request)
+        const iot = this.iotProvider(this.regionCode)
+
+        const output: GetPolicyVersionResponse = await iot.send(new GetPolicyVersionCommand(request))
+
+        getLogger().debug('GetPolicyVersion successful')
+        return output
+    }
+}
+
+function createSdkClient(regionCode: string): IoTClient {
+    return globals.sdkClientBuilderV3.createAwsService({
+        serviceClient: IoTClient,
+        clientOptions: { region: regionCode },
+    })
+}
diff --git a/packages/core/src/shared/clients/lambdaClient.ts b/packages/core/src/shared/clients/lambdaClient.ts
new file mode 100644
index 00000000000..fb73ce9c2d2
--- /dev/null
+++ b/packages/core/src/shared/clients/lambdaClient.ts
@@ -0,0 +1,351 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { BlobPayloadInputTypes } from '@smithy/types'
+import { ToolkitError } from '../errors'
+import globals from '../extensionGlobals'
+import { getLogger } from '../logger/logger'
+import { ClassToInterfaceType } from '../utilities/tsUtils'
+
+import {
+    LambdaClient as LambdaSdkClient,
+    GetFunctionCommand,
+    GetFunctionCommandOutput,
+    FunctionConfiguration,
+    InvocationResponse,
+    ListFunctionsRequest,
+    ListFunctionsResponse,
+    GetFunctionResponse,
+    GetLayerVersionResponse,
+    ListLayerVersionsRequest,
+    LayerVersionsListItem,
+    ListLayerVersionsResponse,
+    UpdateFunctionConfigurationRequest,
+    FunctionUrlConfig,
+    GetFunctionConfigurationCommand,
+    PublishVersionCommand,
+    UpdateFunctionConfigurationCommand,
+    UpdateFunctionCodeCommand,
+    ListFunctionUrlConfigsCommand,
+    ListLayerVersionsCommand,
+    GetLayerVersionCommand,
+    ListFunctionsCommand,
+    DeleteFunctionCommand,
+    InvokeCommand,
+    waitUntilFunctionUpdatedV2,
+    waitUntilFunctionActiveV2,
+} from '@aws-sdk/client-lambda'
+import { CancellationError } from '../utilities/timeoutUtils'
+import { fromSSO } from '@aws-sdk/credential-provider-sso'
+import { getIAMConnection } from '../../auth/utils'
+import { NodeHttpHandler } from '@smithy/node-http-handler'
+
+export type LambdaClient = ClassToInterfaceType<DefaultLambdaClient>
+
+export class DefaultLambdaClient {
+    private readonly defaultTimeoutInMs: number
+
+    public constructor(
+        public readonly regionCode: string,
+        public readonly userAgent: string | undefined = undefined
+    ) {
+        this.defaultTimeoutInMs = 5 * 60 * 1000 // 5 minutes (SDK default is 2 minutes)
+    }
+
+    public async deleteFunction(name: string, qualifier?: string): Promise<void> {
+        const sdkClient = await this.createSdkClient()
+
+        await sdkClient.send(
+            new DeleteFunctionCommand({
+                FunctionName: name,
+                Qualifier: qualifier,
+            })
+        )
+    }
+
+    public async invoke(name: string, payload?: BlobPayloadInputTypes, version?: string): Promise<InvocationResponse> {
+        const sdkClient = await this.createSdkClient()
+
+        const response = await sdkClient.send(
+            new InvokeCommand({
+                FunctionName: name,
+                LogType: 'Tail',
+                Payload: payload,
+                Qualifier: version,
+            })
+        )
+
+        return response
+    }
+
+    public async *listFunctions(): AsyncIterableIterator<FunctionConfiguration> {
+        const client = await this.createSdkClient()
+
+        const request: ListFunctionsRequest = {}
+        do {
+            const response: ListFunctionsResponse = await client.send(new ListFunctionsCommand(request))
+
+            if (response.Functions) {
+                yield* response.Functions
+            }
+
+            request.Marker = response.NextMarker
+        } while (request.Marker)
+    }
+
+    public async getFunction(name: string): Promise<GetFunctionResponse> {
+        getLogger().debug(`GetFunction called for function: ${name}`)
+        const client = await this.createSdkClient()
+
+        try {
+            const response = await client.send(new GetFunctionCommand({ FunctionName: name }))
+            // prune `Code` from logs so we don't reveal a signed link to customer resources.
+            getLogger().debug('GetFunction returned response (code section pruned): %O', {
+                ...response,
+                Code: 'Pruned',
+            })
+            return response
+        } catch (e) {
+            getLogger().error('Failed to get function: %s', e)
+            throw e
+        }
+    }
+
+    public async getLayerVersion(name: string, version: number): Promise<GetLayerVersionResponse> {
+        getLogger().debug(`getLayerVersion called for LayerName: ${name}, VersionNumber ${version}`)
+        const client = await this.createSdkClient()
+
+        try {
+            const response = await client.send(new GetLayerVersionCommand({ LayerName: name, VersionNumber: version }))
+            // prune `Code` from logs so we don't reveal a signed link to customer resources.
+            getLogger().debug('getLayerVersion returned response (code section pruned): %O', {
+                ...response,
+                Code: 'Pruned',
+            })
+            return response
+        } catch (e) {
+            getLogger().error('Failed to get function: %s', e)
+            throw e
+        }
+    }
+
+    public async *listLayerVersions(name: string): AsyncIterableIterator<LayerVersionsListItem> {
+        const client = await this.createSdkClient()
+
+        const request: ListLayerVersionsRequest = { LayerName: name }
+        do {
+            const response: ListLayerVersionsResponse = await client.send(new ListLayerVersionsCommand(request))
+
+            if (response.LayerVersions) {
+                yield* response.LayerVersions
+            }
+
+            request.Marker = response.NextMarker
+        } while (request.Marker)
+    }
+
+    public async getFunctionUrlConfigs(name: string): Promise<FunctionUrlConfig[]> {
+        getLogger().debug(`GetFunctionUrlConfig called for function: ${name}`)
+        const client = await this.createSdkClient()
+
+        try {
+            const response = await client.send(new ListFunctionUrlConfigsCommand({ FunctionName: name }))
+            // prune `Code` from logs so we don't reveal a signed link to customer resources.
+            getLogger().debug('GetFunctionUrlConfig returned response (code section pruned): %O', {
+                ...response,
+                Code: 'Pruned',
+            })
+            return response.FunctionUrlConfigs ?? []
+        } catch (e) {
+            throw ToolkitError.chain(e, 'Failed to get Lambda function URLs')
+        }
+    }
+
+    public async updateFunctionCode(name: string, zipFile: Uint8Array): Promise<FunctionConfiguration> {
+        getLogger().debug(`updateFunctionCode called for function: ${name}`)
+        const client = await this.createSdkClient()
+
+        try {
+            const response = await client.send(
+                new UpdateFunctionCodeCommand({
+                    FunctionName: name,
+                    Publish: true,
+                    ZipFile: zipFile,
+                })
+            )
+            getLogger().debug('updateFunctionCode returned response: %O', response)
+            await waitUntilFunctionUpdatedV2({ client, maxWaitTime: 300 }, { FunctionName: name })
+
+            return response
+        } catch (e) {
+            getLogger().error('Failed to run updateFunctionCode: %s', e)
+            throw e
+        }
+    }
+
+    public async updateFunctionConfiguration(
+        params: UpdateFunctionConfigurationRequest,
+        options: {
+            maxRetries?: number
+            initialDelayMs?: number
+            backoffMultiplier?: number
+            waitForUpdate?: boolean
+        } = {}
+    ): Promise<FunctionConfiguration> {
+        const client = await this.createSdkClient()
+        const maxRetries = options.maxRetries ?? 5
+        const initialDelayMs = options.initialDelayMs ?? 1000
+        const backoffMultiplier = options.backoffMultiplier ?? 2
+        // return until lambda update is completed
+        const waitForUpdate = options.waitForUpdate ?? false
+
+        let retryCount = 0
+        let lastError: any
+
+        // there could be race condition, if function is being updated, wait and retry
+        while (retryCount <= maxRetries) {
+            try {
+                const response = await client.send(new UpdateFunctionConfigurationCommand(params))
+                getLogger().debug('updateFunctionConfiguration returned response: %O', response)
+                if (waitForUpdate) {
+                    // don't return if wait for result
+                    break
+                }
+                return response
+            } catch (e) {
+                lastError = e
+
+                // Check if this is an "update in progress" error
+                if (this.isUpdateInProgressError(e) && retryCount < maxRetries) {
+                    const delayMs = initialDelayMs * Math.pow(backoffMultiplier, retryCount)
+                    getLogger().info(
+                        `Update in progress for Lambda function ${params.FunctionName}. ` +
+                            `Retrying in ${delayMs}ms (attempt ${retryCount + 1}/${maxRetries})`
+                    )
+
+                    await new Promise((resolve) => setTimeout(resolve, delayMs))
+                    retryCount++
+                } else {
+                    getLogger().error('Failed to run updateFunctionConfiguration: %s', e)
+                    throw e
+                }
+            }
+        }
+
+        // check if lambda update is completed, use client.getFunctionConfiguration to poll until
+        // LastUpdateStatus is Successful or Failed
+        if (waitForUpdate) {
+            let lastUpdateStatus = 'InProgress'
+            while (lastUpdateStatus === 'InProgress') {
+                await new Promise((resolve) => setTimeout(resolve, 1000))
+                const response = await client.send(
+                    new GetFunctionConfigurationCommand({ FunctionName: params.FunctionName })
+                )
+                lastUpdateStatus = response.LastUpdateStatus ?? 'Failed'
+                if (lastUpdateStatus === 'Successful') {
+                    return response
+                } else if (lastUpdateStatus === 'Failed') {
+                    getLogger().error('Failed to update function configuration: %O', response)
+                    throw new Error(`Failed to update function configuration: ${response.LastUpdateStatusReason}`)
+                }
+            }
+        }
+
+        getLogger().error(`Failed to update function configuration after ${maxRetries} retries: %s`, lastError)
+        throw lastError
+    }
+
+    public async publishVersion(
+        name: string,
+        options: { waitForUpdate?: boolean } = {}
+    ): Promise<FunctionConfiguration> {
+        const client = await this.createSdkClient()
+        // return until lambda update is completed
+        const waitForUpdate = options.waitForUpdate ?? false
+        const response = await client.send(
+            new PublishVersionCommand({
+                FunctionName: name,
+            })
+        )
+
+        if (waitForUpdate) {
+            let state = 'Pending'
+            while (state === 'Pending') {
+                await new Promise((resolve) => setTimeout(resolve, 1000))
+                const statusResponse = await client.send(
+                    new GetFunctionConfigurationCommand({ FunctionName: name, Qualifier: response.Version })
+                )
+                state = statusResponse.State ?? 'Failed'
+                if (state === 'Active' || state === 'InActive') {
+                    // version creation finished
+                    return statusResponse
+                } else if (state === 'Failed') {
+                    getLogger().error('Failed to create Version: %O', statusResponse)
+                    throw new Error(`Failed to create Version: ${statusResponse.LastUpdateStatusReason}`)
+                }
+            }
+        }
+
+        return response
+    }
+
+    private isUpdateInProgressError(error: any): boolean {
+        return (
+            error?.message &&
+            error.message.includes(
+                'The operation cannot be performed at this time. An update is in progress for resource:'
+            )
+        )
+    }
+
+    public async waitForActive(
+        functionName: string,
+        waiter?: { maxWaitTime?: number; minDelay?: number; maxDelay?: number }
+    ): Promise<void> {
+        const sdkClient = await this.createSdkClient()
+
+        await waitUntilFunctionActiveV2(
+            {
+                client: sdkClient,
+                maxWaitTime: waiter?.maxWaitTime ?? 600,
+                minDelay: waiter?.minDelay ?? 1,
+                maxDelay: waiter?.maxDelay ?? 120,
+            },
+            { FunctionName: functionName }
+        )
+    }
+
+    private async createSdkClient(): Promise<LambdaSdkClient> {
+        return globals.sdkClientBuilderV3.createAwsService({
+            serviceClient: LambdaSdkClient,
+            userAgent: !this.userAgent,
+            clientOptions: {
+                userAgent: this.userAgent ? [[this.userAgent]] : undefined,
+                region: this.regionCode,
+                requestHandler: new NodeHttpHandler({
+                    requestTimeout: this.defaultTimeoutInMs,
+                }),
+            },
+        })
+    }
+}
+
+export async function getFunctionWithCredentials(region: string, name: string): Promise<GetFunctionCommandOutput> {
+    const connection = await getIAMConnection({
+        prompt: true,
+        messageText: 'Opening a Lambda Function requires you to be authenticated.',
+    })
+
+    if (!connection) {
+        throw new CancellationError('user')
+    }
+
+    const credentials =
+        connection.type === 'iam' ? await connection.getCredentials() : fromSSO({ profile: connection.id })
+    const client = new LambdaSdkClient({ region, credentials })
+
+    const command = new GetFunctionCommand({ FunctionName: name })
+    return client.send(command)
+}
diff --git a/packages/core/src/shared/clients/qDeveloperChatClient.ts b/packages/core/src/shared/clients/qDeveloperChatClient.ts
new file mode 100644
index 00000000000..ee98a78e356
--- /dev/null
+++ b/packages/core/src/shared/clients/qDeveloperChatClient.ts
@@ -0,0 +1,25 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { QDeveloperStreaming } from '@amzn/amazon-q-developer-streaming-client'
+import { getCodewhispererConfig } from '../../codewhisperer/client/codewhisperer'
+import { getUserAgent } from '../telemetry/util'
+import { ConfiguredRetryStrategy } from '@smithy/util-retry'
+import { AuthUtil } from '../../codewhisperer/util/authUtil'
+
+// Create a client for featureDev streaming based off of aws sdk v3
+export async function createQDeveloperStreamingClient(): Promise<QDeveloperStreaming> {
+    const cwsprConfig = getCodewhispererConfig()
+    const credentials = await AuthUtil.instance.getCredentials()
+    const streamingClient = new QDeveloperStreaming({
+        region: cwsprConfig.region,
+        endpoint: cwsprConfig.endpoint,
+        credentials: credentials,
+        customUserAgent: getUserAgent(),
+        // SETTING max attempts to 0 FOR BETA. RE-ENABLE FOR RE-INVENT
+        // Implement exponential back off starting with a base of 500ms (500 + attempt^10)
+        retryStrategy: new ConfiguredRetryStrategy(0, (attempt: number) => 500 + attempt ** 10),
+    })
+    return streamingClient
+}
diff --git a/packages/core/src/shared/clients/redshiftClient.ts b/packages/core/src/shared/clients/redshiftClient.ts
new file mode 100644
index 00000000000..5464f58f1d2
--- /dev/null
+++ b/packages/core/src/shared/clients/redshiftClient.ts
@@ -0,0 +1,300 @@
+/* eslint-disable header/header */
+/*!
+ * Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    ClusterCredentials,
+    ClustersMessage,
+    DescribeClustersCommand,
+    DescribeClustersMessage,
+    GetClusterCredentialsCommand,
+    GetClusterCredentialsMessage,
+    RedshiftClient,
+} from '@aws-sdk/client-redshift'
+import {
+    DescribeStatementCommand,
+    DescribeStatementRequest,
+    ExecuteStatementCommand,
+    GetStatementResultCommand,
+    GetStatementResultRequest,
+    GetStatementResultResponse,
+    ListDatabasesCommand,
+    ListDatabasesRequest,
+    ListDatabasesResponse,
+    ListSchemasCommand,
+    ListSchemasRequest,
+    ListSchemasResponse,
+    ListTablesCommand,
+    ListTablesRequest,
+    ListTablesResponse,
+    RedshiftDataClient,
+} from '@aws-sdk/client-redshift-data'
+import {
+    GetCredentialsCommand,
+    GetCredentialsRequest,
+    GetCredentialsResponse,
+    ListWorkgroupsCommand,
+    ListWorkgroupsRequest,
+    ListWorkgroupsResponse,
+    RedshiftServerlessClient,
+} from '@aws-sdk/client-redshift-serverless'
+import globals from '../extensionGlobals'
+import { ConnectionParams, ConnectionType, RedshiftWarehouseType } from '../../awsService/redshift/models/models'
+import { sleep } from '../utilities/timeoutUtils'
+import { SecretsManagerClient } from './secretsManagerClient'
+import { ToolkitError } from '../errors'
+import { getLogger } from '../logger/logger'
+
+export interface ExecuteQueryResponse {
+    statementResultResponse: GetStatementResultResponse
+    executionId: string
+}
+
+// Type definition for Provisioned and Serverless
+export class DefaultRedshiftClient {
+    public constructor(
+        public readonly regionCode: string,
+        private readonly redshiftDataClientProvider: (
+            regionCode: string
+        ) => RedshiftDataClient = createRedshiftDataClient,
+        private readonly redshiftClientProvider: (regionCode: string) => RedshiftClient = createRedshiftSdkClient,
+        private readonly redshiftServerlessClientProvider: (
+            regionCode: string
+        ) => RedshiftServerlessClient = createRedshiftServerlessSdkClient
+    ) {}
+
+    // eslint-disable-next-line require-yield
+    public async describeProvisionedClusters(nextToken?: string): Promise<ClustersMessage> {
+        const redshiftClient = this.redshiftClientProvider(this.regionCode)
+        const request: DescribeClustersMessage = {
+            Marker: nextToken,
+            MaxRecords: 20,
+        }
+        const response = await redshiftClient.send(new DescribeClustersCommand(request))
+        if (response.Clusters) {
+            response.Clusters = response.Clusters.filter(
+                (cluster) => cluster.ClusterAvailabilityStatus?.toLowerCase() === 'available'
+            )
+        }
+        return response
+    }
+
+    public async listServerlessWorkgroups(nextToken?: string): Promise<ListWorkgroupsResponse> {
+        const redshiftServerlessClient = this.redshiftServerlessClientProvider(this.regionCode)
+        const request: ListWorkgroupsRequest = {
+            nextToken: nextToken,
+            maxResults: 20,
+        }
+        const response = await redshiftServerlessClient.send(new ListWorkgroupsCommand(request))
+        if (response.workgroups) {
+            response.workgroups = response.workgroups.filter(
+                (workgroup) => workgroup.status?.toLowerCase() === 'available'
+            )
+        }
+        return response
+    }
+
+    public async listDatabases(connectionParams: ConnectionParams, nextToken?: string): Promise<ListDatabasesResponse> {
+        const redshiftDataClient = this.redshiftDataClientProvider(this.regionCode)
+        const warehouseType = connectionParams.warehouseType
+        const warehouseIdentifier = connectionParams.warehouseIdentifier
+        const input: ListDatabasesRequest = {
+            ClusterIdentifier: warehouseType === RedshiftWarehouseType.PROVISIONED ? warehouseIdentifier : undefined,
+            Database: connectionParams.database,
+            DbUser:
+                warehouseType === RedshiftWarehouseType.PROVISIONED &&
+                connectionParams.connectionType !== ConnectionType.DatabaseUser
+                    ? connectionParams.username
+                    : undefined,
+            WorkgroupName: warehouseType === RedshiftWarehouseType.SERVERLESS ? warehouseIdentifier : undefined,
+            NextToken: nextToken,
+            SecretArn:
+                connectionParams.connectionType === ConnectionType.DatabaseUser || connectionParams.secret
+                    ? connectionParams.secret
+                    : undefined,
+        }
+        return redshiftDataClient.send(new ListDatabasesCommand(input))
+    }
+    public async listSchemas(connectionParams: ConnectionParams, nextToken?: string): Promise<ListSchemasResponse> {
+        const redshiftDataClient = this.redshiftDataClientProvider(this.regionCode)
+        const warehouseType = connectionParams.warehouseType
+        const warehouseIdentifier = connectionParams.warehouseIdentifier
+        const input: ListSchemasRequest = {
+            ClusterIdentifier: warehouseType === RedshiftWarehouseType.PROVISIONED ? warehouseIdentifier : undefined,
+            Database: connectionParams.database,
+            DbUser:
+                connectionParams.username && connectionParams.connectionType !== ConnectionType.DatabaseUser
+                    ? connectionParams.username
+                    : undefined,
+            WorkgroupName: warehouseType === RedshiftWarehouseType.SERVERLESS ? warehouseIdentifier : undefined,
+            NextToken: nextToken,
+            SecretArn:
+                connectionParams.connectionType === ConnectionType.DatabaseUser || connectionParams.secret
+                    ? connectionParams.secret
+                    : undefined,
+        }
+        return redshiftDataClient.send(new ListSchemasCommand(input))
+    }
+
+    public async listTables(
+        connectionParams: ConnectionParams,
+        schemaName: string,
+        nextToken?: string
+    ): Promise<ListTablesResponse> {
+        const redshiftDataClient = this.redshiftDataClientProvider(this.regionCode)
+        const warehouseType = connectionParams.warehouseType
+        const warehouseIdentifier = connectionParams.warehouseIdentifier
+        const input: ListTablesRequest = {
+            ClusterIdentifier: warehouseType === RedshiftWarehouseType.PROVISIONED ? warehouseIdentifier : undefined,
+            DbUser:
+                connectionParams.username && connectionParams.connectionType !== ConnectionType.DatabaseUser
+                    ? connectionParams.username
+                    : undefined,
+            Database: connectionParams.database,
+            WorkgroupName: warehouseType === RedshiftWarehouseType.SERVERLESS ? warehouseIdentifier : undefined,
+            SchemaPattern: schemaName,
+            NextToken: nextToken,
+            SecretArn:
+                connectionParams.connectionType === ConnectionType.DatabaseUser || connectionParams.secret
+                    ? connectionParams.secret
+                    : undefined,
+        }
+        const ListTablesResponse = redshiftDataClient.send(new ListTablesCommand(input))
+        return ListTablesResponse
+    }
+
+    public async executeQuery(
+        connectionParams: ConnectionParams,
+        queryToExecute: string,
+        nextToken?: string,
+        executionId?: string
+    ): Promise<ExecuteQueryResponse | undefined> {
+        const redshiftData = this.redshiftDataClientProvider(this.regionCode)
+        // if executionId is not passed in, that means that we're executing and retrieving the results of the query for the first time.
+        if (!executionId) {
+            const execution = await redshiftData.send(
+                new ExecuteStatementCommand({
+                    ClusterIdentifier:
+                        connectionParams.warehouseType === RedshiftWarehouseType.PROVISIONED
+                            ? connectionParams.warehouseIdentifier
+                            : undefined,
+                    WorkgroupName:
+                        connectionParams.warehouseType === RedshiftWarehouseType.SERVERLESS
+                            ? connectionParams.warehouseIdentifier
+                            : undefined,
+                    Database: connectionParams.database,
+                    Sql: queryToExecute,
+                    DbUser:
+                        connectionParams.username && connectionParams.connectionType !== ConnectionType.DatabaseUser
+                            ? connectionParams.username
+                            : undefined,
+                    SecretArn:
+                        connectionParams.connectionType === ConnectionType.DatabaseUser || connectionParams.secret
+                            ? connectionParams.secret
+                            : undefined,
+                })
+            )
+
+            executionId = execution.Id
+            type Status = 'RUNNING' | 'FAILED' | 'FINISHED'
+            let status: Status = 'RUNNING'
+            while (status === 'RUNNING') {
+                const describeStatementResponse = await redshiftData.send(
+                    new DescribeStatementCommand({ Id: executionId } as DescribeStatementRequest)
+                )
+                if (describeStatementResponse.Status === 'FAILED' || describeStatementResponse.Status === 'FINISHED') {
+                    status = describeStatementResponse.Status
+                    if (status === 'FAILED') {
+                        throw new Error(
+                            `Failed to run query: '${queryToExecute}': '${describeStatementResponse.Error}'`
+                        )
+                    } else if (status === 'FINISHED' && !describeStatementResponse.HasResultSet) {
+                        return undefined
+                    }
+                    break
+                } else {
+                    await sleep(1000)
+                }
+            }
+        }
+        const result = await redshiftData.send(
+            new GetStatementResultCommand({ Id: executionId, NextToken: nextToken } as GetStatementResultRequest)
+        )
+
+        return { statementResultResponse: result, executionId: executionId } as ExecuteQueryResponse
+    }
+
+    public async getTempCredentials(
+        warehouseType: RedshiftWarehouseType,
+        connectionParams: ConnectionParams
+    ): Promise<ClusterCredentials | GetCredentialsResponse> {
+        if (warehouseType === RedshiftWarehouseType.PROVISIONED) {
+            const redshiftClient = this.redshiftClientProvider(this.regionCode)
+            const getClusterCredentialsRequest: GetClusterCredentialsMessage = {
+                DbUser: connectionParams.username!,
+                DbName: connectionParams.database,
+                ClusterIdentifier: connectionParams.warehouseIdentifier,
+            }
+            return redshiftClient.send(new GetClusterCredentialsCommand(getClusterCredentialsRequest))
+        } else {
+            const redshiftServerless = this.redshiftServerlessClientProvider(this.regionCode)
+            const getCredentialsRequest: GetCredentialsRequest = {
+                dbName: connectionParams.database,
+                workgroupName: connectionParams.warehouseIdentifier,
+            }
+            return redshiftServerless.send(new GetCredentialsCommand(getCredentialsRequest))
+        }
+    }
+    public genUniqueId(connectionParams: ConnectionParams): string {
+        const epochDate = Date.now()
+        return `${epochDate}-${connectionParams.warehouseIdentifier}`
+    }
+
+    public async createSecretFromConnectionParams(connectionParams: ConnectionParams): Promise<string> {
+        /*
+            create a secrete arn for the username and password entered through the Database Username and Password authentication
+        */
+        const secretsManagerClient = new SecretsManagerClient(this.regionCode)
+        const username = connectionParams.username
+        const password = connectionParams.password
+        if (username && password) {
+            const secretString = this.genUniqueId(connectionParams)
+            try {
+                const response = await secretsManagerClient?.createSecret(secretString, username, password)
+                if (response && response.ARN) {
+                    return response.ARN
+                }
+                throw new ToolkitError('Secret Arn not created')
+            } catch (error) {
+                getLogger().error(
+                    `Redshift: Error creating secret in AWS Secrets Manager - ${(error as Error).message}`
+                )
+                throw error
+            }
+        } else {
+            throw new ToolkitError('Username or Password not present')
+        }
+    }
+}
+
+function createRedshiftSdkClient(regionCode: string): RedshiftClient {
+    return globals.sdkClientBuilderV3.createAwsService({
+        serviceClient: RedshiftClient,
+        clientOptions: { region: regionCode },
+    })
+}
+
+function createRedshiftServerlessSdkClient(regionCode: string): RedshiftServerlessClient {
+    return globals.sdkClientBuilderV3.createAwsService({
+        serviceClient: RedshiftServerlessClient,
+        clientOptions: { region: regionCode },
+    })
+}
+function createRedshiftDataClient(regionCode: string): RedshiftDataClient {
+    return globals.sdkClientBuilderV3.createAwsService({
+        serviceClient: RedshiftDataClient,
+        clientOptions: { region: regionCode },
+    })
+}
diff --git a/packages/core/src/shared/clients/s3.ts b/packages/core/src/shared/clients/s3.ts
new file mode 100644
index 00000000000..247e85731c6
--- /dev/null
+++ b/packages/core/src/shared/clients/s3.ts
@@ -0,0 +1,784 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as url from 'url'
+import _ from 'lodash'
+import { inspect } from 'util'
+import { getLogger } from '../logger/logger'
+import { bufferToStream, DefaultFileStreams, FileStreams, pipe } from '../utilities/streamUtilities'
+import { assertHasProps, InterfaceNoSymbol, RequiredProps } from '../utilities/tsUtils'
+import { Readable } from 'stream'
+import globals, { isWeb } from '../extensionGlobals'
+import { defaultPartition } from '../regions/regionProvider'
+import { AsyncCollection } from '../utilities/asyncCollection'
+import { StreamingBlobTypes } from '@smithy/types'
+import {
+    _Object,
+    BucketLocationConstraint,
+    CreateBucketCommand,
+    DeleteBucketCommand,
+    GetObjectCommand,
+    HeadObjectCommand,
+    HeadObjectOutput,
+    ListObjectsV2Command,
+    ListObjectsV2Output,
+    PutObjectCommand,
+    S3Client as S3ClientSDK,
+    Bucket,
+    paginateListBuckets,
+    ListObjectVersionsCommand,
+    ListObjectVersionsOutput,
+    DeleteObjectCommand,
+    DeleteObjectsCommand,
+    DeleteObjectsOutput,
+    GetObjectOutput,
+    _Error,
+    GetObjectCommandOutput,
+} from '@aws-sdk/client-s3'
+import { getSignedUrl } from '@aws-sdk/s3-request-presigner'
+import { Progress, Upload } from '@aws-sdk/lib-storage'
+import { ClientWrapper } from './clientWrapper'
+import { ToolkitError } from '../errors'
+
+export const DEFAULT_MAX_KEYS = 300 // eslint-disable-line @typescript-eslint/naming-convention
+export const DEFAULT_DELIMITER = '/' // eslint-disable-line @typescript-eslint/naming-convention
+export const defaultPrefix = ''
+
+export type Folder = InterfaceNoSymbol<DefaultFolder>
+export type S3Bucket = Bucket & { Name: string; BucketRegion: string; Arn: string }
+
+interface S3Object {
+    readonly key: string
+    readonly versionId?: string
+}
+
+export interface ContinuationToken {
+    readonly keyMarker: string
+    readonly versionIdMarker?: string
+}
+
+export interface CreateBucketRequest {
+    readonly bucketName: string
+}
+
+export interface CreateBucketResponse {
+    readonly bucket: S3Bucket
+}
+
+export interface ListBucketsResponse {
+    readonly buckets: S3Bucket[]
+}
+
+export interface ListFilesRequest {
+    readonly bucketName: string
+    readonly folderPath?: string
+    readonly continuationToken?: string
+    readonly maxResults?: number // Defaults to DEFAULT_MAX_KEYS
+}
+
+export interface ListFilesResponse {
+    readonly files: File[]
+    readonly folders: Folder[]
+    readonly continuationToken?: string
+}
+
+export interface CreateFolderRequest {
+    readonly bucketName: string
+    readonly path: string
+}
+
+export interface CreateFolderResponse {
+    readonly folder: Folder
+}
+
+export interface DownloadFileRequest {
+    readonly bucketName: string
+    readonly key: string
+    readonly progressListener?: (loadedBytes: number) => void
+    readonly saveLocation: vscode.Uri
+}
+
+export interface SignedUrlRequest {
+    readonly bucketName: string
+    readonly key: string
+    readonly time: number
+}
+
+export interface UploadFileRequest {
+    readonly bucketName: string
+    readonly key: string
+    readonly content: vscode.Uri | Uint8Array
+    readonly contentType?: string
+    readonly progressListener?: (loadedBytes: number) => void
+}
+
+export interface HeadObjectRequest {
+    readonly bucketName: string
+    readonly key: string
+}
+
+export interface CharsetRequest {
+    readonly key: string
+    readonly bucketName: string
+}
+
+export interface ListObjectVersionsRequest {
+    readonly bucketName: string
+    readonly continuationToken?: ContinuationToken
+    readonly maxResults?: number // Defaults to DEFAULT_MAX_KEYS
+}
+
+export interface ListObjectVersionsResponse {
+    readonly objects: S3Object[]
+    readonly continuationToken?: ContinuationToken
+}
+
+export interface DeleteObjectRequest {
+    readonly bucketName: string
+    readonly key: string
+}
+
+export interface DeleteObjectsRequest {
+    readonly bucketName: string
+    readonly objects: { key: string; versionId?: string }[]
+}
+
+export interface DeleteObjectsResponse {
+    readonly errors: _Error[]
+}
+
+export interface DeleteBucketRequest {
+    readonly bucketName: string
+}
+
+export interface GetObjectRequest {
+    readonly bucketName: string
+    readonly key: string
+}
+
+export interface GetObjectResponse {
+    readonly objectBody: StreamingBlobTypes
+}
+
+export class S3Client extends ClientWrapper<S3ClientSDK> {
+    public constructor(
+        regionCode: string,
+        private readonly partitionId = globals.regionProvider.getPartitionId(regionCode) ?? defaultPartition,
+        private readonly fileStreams: FileStreams = new DefaultFileStreams()
+    ) {
+        super(regionCode, S3ClientSDK)
+    }
+
+    protected getCreateBucketConfiguration() {
+        return this.regionCode === 'us-east-1'
+            ? undefined
+            : { LocationConstraint: this.regionCode as BucketLocationConstraint }
+    }
+
+    /**
+     * Creates a bucket in the region of the client.
+     *
+     * @throws Error if there is an error calling S3.
+     */
+    public async createBucket(request: CreateBucketRequest): Promise<CreateBucketResponse> {
+        getLogger().debug('CreateBucket called with request: %O', request)
+        await this.makeRequest(CreateBucketCommand, {
+            Bucket: request.bucketName,
+            CreateBucketConfiguration: this.getCreateBucketConfiguration(),
+        })
+
+        const response: CreateBucketResponse = {
+            bucket: toBucket(request.bucketName, this.regionCode, this.partitionId),
+        }
+        getLogger().debug('CreateBucket returned response: %O', response)
+        return response
+    }
+
+    /**
+     * Empties and deletes a bucket.
+     *
+     * Note that this just repeatedly calls list and delete to empty the bucket before deletion.
+     * Failures during the emptying or deleting step can leave the bucket in a state where
+     * some (or all) objects are deleted, but the bucket remains.
+     *
+     * @throws Error if there is an error calling S3 to empty or delete the bucket.
+     */
+    public async deleteBucket(request: DeleteBucketRequest): Promise<void> {
+        getLogger().debug('DeleteBucket called with request: %O', request)
+        const { bucketName } = request
+
+        await this.emptyBucket(bucketName)
+        await this.makeRequest(DeleteBucketCommand, { Bucket: bucketName })
+
+        getLogger().debug('DeleteBucket succeeded')
+    }
+
+    /**
+     * Creates a folder.
+     *
+     * The folder's bucket should reside in the same region as the one configured for the client.
+     *
+     * Note that folders don't actually exist in S3.
+     * Everything in S3 is an object with a key residing in a bucket.
+     * However, S3 allows you to emulate folders by providing a key with delimiters (slashes) in its name.
+     *
+     * To creating empty "folders", you upload an empty object with a trailing slash.
+     *
+     * Creation of folders isn't strictly necessary, as you can just upload keys with delimiters.
+     * However, empty folders make it easier to work with S3 as if it were a filesystem like in the UI.
+     *
+     * @throws Error if there is an error calling S3.
+     */
+    public async createFolder(request: CreateFolderRequest): Promise<CreateFolderResponse> {
+        getLogger().debug('CreateFolder called with request: %O', request)
+        await this.makeRequest(PutObjectCommand, { Bucket: request.bucketName, Key: request.path, Body: '' })
+
+        const folder = new DefaultFolder({
+            path: request.path,
+            partitionId: this.partitionId,
+            bucketName: request.bucketName,
+        })
+
+        const response: CreateFolderResponse = { folder }
+        getLogger().debug('CreateFolder returned response: %O', response)
+        return response
+    }
+
+    /**
+     * Downloads a file to disk.
+     *
+     * The file's bucket should reside in the same region as the one configured for the client.
+     *
+     * Pipes the response (read) stream into the file (write) stream.
+     *
+     * @throws Error if there is an error calling S3 or piping between streams.
+     */
+    public async downloadFile(request: DownloadFileRequest): Promise<void> {
+        getLogger().debug(
+            'DownloadFile called for bucketName: %s, key: %s, saveLocation: %s',
+            request.bucketName,
+            request.key,
+            request.saveLocation
+        )
+
+        const readStream = await this.downloadFileStream(request.bucketName, request.key)
+        const writeStream = this.fileStreams.createWriteStream(request.saveLocation)
+
+        await pipe(readStream, writeStream, request.progressListener)
+
+        getLogger().debug('DownloadFile succeeded')
+    }
+
+    /**
+     * Lighter version of {@link downloadFile} that just returns the stream.
+     */
+    public async downloadFileStream(bucketName: string, key: string): Promise<Readable> {
+        // GetObject response body is now a `StreamingBlobPayloadOutputTypes` from @smithy/types.
+        // this is a general type for web/node streams, therefore we must cast to nodes streaming type.
+        const response: GetObjectCommandOutput = await this.makeRequest(GetObjectCommand, {
+            Bucket: bucketName,
+            Key: key,
+        })
+
+        if (isWeb()) {
+            throw new ToolkitError('S3: downloading files is not supported in web.')
+        }
+
+        return (response.Body as Readable) ?? new Readable()
+    }
+
+    public async headObject(request: HeadObjectRequest): Promise<HeadObjectOutput> {
+        getLogger().debug('HeadObject called with request: %O', request)
+        return this.makeRequest(HeadObjectCommand, { Bucket: request.bucketName, Key: request.key })
+    }
+
+    /**
+     * Generates a presigned URL for the given file in S3.
+     * Takes a valid time option, which must be in seconds. This is the time the URL will be valid for
+     *
+     * @returns the string of the link to the presigned URL
+     */
+    public async getSignedUrlForObject(request: SignedUrlRequest): Promise<string> {
+        return await getSignedUrl(
+            this.getClient(),
+            new GetObjectCommand({ Bucket: request.bucketName, Key: request.key }),
+            {
+                expiresIn: request.time,
+            }
+        )
+    }
+
+    public linkProgressListenerToUpload(
+        upload: { on: (event: 'httpUploadProgress', listener: (progress: Progress) => void) => void },
+        progressListener: (loadedBytes: number) => void
+    ) {
+        let lastLoaded = 0
+        upload.on('httpUploadProgress', (progress) => {
+            if (progress.loaded) {
+                progressListener(progress.loaded - lastLoaded)
+                lastLoaded = progress.loaded
+            }
+        })
+    }
+
+    /**
+     * Uploads a file from disk.
+     *
+     * The destination bucket should reside in the same region as the one configured for the client.
+     *
+     * Pipes the file (read) stream into the request (write) stream.
+     * Assigns the target content type based on the mime type of the file.
+     *
+     * @returns The Upload stream
+     * @throws Error if there is an error calling S3 or piping between streams.
+     */
+    public async uploadFile(request: UploadFileRequest): Promise<Upload> {
+        getLogger().debug('UploadFile called for bucketName: %s, key: %s', request.bucketName, request.key)
+        // Upload example from: https://docs.aws.amazon.com/code-library/latest/ug/s3_example_s3_Scenario_UsingLargeFiles_section.html
+        const readStream =
+            request.content instanceof vscode.Uri
+                ? this.fileStreams.createReadStream(request.content)
+                : bufferToStream(request.content)
+
+        const managedUpload = new Upload({
+            client: this.getClient(),
+            params: {
+                Bucket: request.bucketName,
+                Key: request.key,
+                Body: readStream,
+                ContentType: request.contentType,
+            },
+        })
+
+        const progressListener = request.progressListener
+        if (progressListener) {
+            this.linkProgressListenerToUpload(managedUpload, progressListener)
+        }
+
+        return managedUpload
+    }
+
+    /**
+     * Lists all buckets owned by the client.
+     *
+     *
+     * @throws Error if there is an error calling S3.
+     */
+    private paginateBuckets(filterRegion: boolean = true): AsyncCollection<Bucket[]> {
+        return this.makePaginatedRequest(
+            paginateListBuckets,
+            filterRegion ? { BucketRegion: this.regionCode } : {},
+            (page) => page.Buckets
+        )
+    }
+
+    // TODO: replace calls to listBucketsIterable and listBuckets with calls to this function once "Bucket" type is unified.
+    private listValidBuckets(
+        paginateBuckets: () => AsyncCollection<Bucket[]> = this.paginateBuckets.bind(this)
+    ): AsyncCollection<S3Bucket[]> {
+        const partitionId = this.partitionId
+        return paginateBuckets().map(async (page) => page.filter(hasName).filter(hasRegion).map(addArn))
+
+        function hasName<B extends Bucket>(b: B): b is B & { Name: string } {
+            return b.Name !== undefined
+        }
+
+        function hasRegion<B extends Bucket>(b: B): b is B & { BucketRegion: string } {
+            return b.BucketRegion !== undefined
+        }
+
+        function addArn<B extends Bucket & { Name: string; BucketRegion: string }>(b: B): S3Bucket {
+            return toBucket(b.Name, b.BucketRegion, partitionId)
+        }
+    }
+
+    public listBucketsIterable(): AsyncCollection<RequiredProps<Bucket, 'Name'> & { readonly region: string }> {
+        return this.listValidBuckets()
+            .flatten()
+            .map((b) => {
+                return {
+                    region: b.BucketRegion,
+                    ...b,
+                }
+            })
+    }
+
+    public async listBuckets(
+        paginateBuckets: () => AsyncCollection<Bucket[]> = this.paginateBuckets.bind(this)
+    ): Promise<ListBucketsResponse> {
+        getLogger().debug('ListBuckets called')
+
+        const toDefaultBucket = (b: Bucket & { Name: string; BucketRegion: string }) =>
+            toBucket(b.Name, b.BucketRegion, this.partitionId)
+        const buckets = await this.listValidBuckets(paginateBuckets).flatten().map(toDefaultBucket).promise()
+        const response = { buckets }
+        getLogger().debug('ListBuckets returned response: %O', response)
+        return response
+    }
+
+    private async listObjectsV2(request: ListFilesRequest): Promise<ListObjectsV2Output> {
+        return await this.makeRequest(ListObjectsV2Command, {
+            Bucket: request.bucketName,
+            Delimiter: DEFAULT_DELIMITER,
+            MaxKeys: request.maxResults ?? DEFAULT_MAX_KEYS,
+            /**
+             * Set '' as the default prefix to ensure that the bucket's content will be displayed
+             * when the user has at least list access to the root of the bucket
+             * https://github.com/aws/aws-toolkit-vscode/issues/4643
+             * @default ''
+             */
+            Prefix: request.folderPath ?? defaultPrefix,
+            ContinuationToken: request.continuationToken,
+        })
+    }
+
+    private extractFilesFromResponse(
+        listObjectsRsp: ListObjectsV2Output,
+        bucketName: string,
+        folderPath: string | undefined
+    ): File[] {
+        const bucket = toBucket(bucketName, this.regionCode, this.partitionId)
+        return _(listObjectsRsp.Contents)
+            .reject((file) => file.Key === folderPath)
+            .map((file) => {
+                assertHasProps(file, 'Key')
+                return toFile(bucket, file)
+            })
+            .value()
+    }
+
+    private extractFoldersFromResponse(listObjectsRsp: ListObjectsV2Output, bucketName: string): Folder[] {
+        return _(listObjectsRsp.CommonPrefixes)
+            .map((prefix) => prefix.Prefix)
+            .compact()
+            .map((path) => new DefaultFolder({ path, partitionId: this.partitionId, bucketName }))
+            .value()
+    }
+
+    public listFilesFromResponse(
+        listObjectsRsp: ListObjectsV2Output,
+        bucketName: string,
+        folderPath: string | undefined
+    ) {
+        const files = this.extractFilesFromResponse(listObjectsRsp, bucketName, folderPath)
+        const folders = this.extractFoldersFromResponse(listObjectsRsp, bucketName)
+        return {
+            files,
+            folders,
+            continuationToken: listObjectsRsp.NextContinuationToken,
+        }
+    }
+
+    /**
+     * Lists files and folders in a folder or inside the bucket root.
+     *
+     * The bucket should reside in the same region as the one configured for the client.
+     *
+     * Returns the first {@link ListFilesRequest#maxResults} objects (the first "page").
+     * If there are more results, returns a continuation token that can be passed in a subsequent call
+     * to get the next "page" of results.
+     *
+     * Note that folders don't actually exist in S3.
+     * Everything in S3 is an object with a key residing in a bucket.
+     * However, S3 lets you limit results to those residing at a specific "path" specified by delimiters (slashes).
+     * The list of sub-paths is returned in the result set and can be used in subsequent calls.
+     *
+     * A consequence of the fact that folders don't exist is that folders and files are intermingled across all
+     * of the pages.
+     * It's not possible to retrieve an exhaustive list of all folders without traversing all of the pages.
+     *
+     * @throws Error if there is an error calling S3.
+     */
+    public async listFiles(request: ListFilesRequest): Promise<ListFilesResponse> {
+        getLogger().debug('ListFiles called with request: %O', request)
+        const output = await this.listObjectsV2(request)
+        const response = this.listFilesFromResponse(output, request.bucketName, request.folderPath)
+
+        getLogger().debug('ListFiles returned response: %O', response)
+        return response
+    }
+
+    /**
+     * Lists versions of all objects inside a bucket.
+     *
+     * The bucket should reside in the same region as the one configured for the client.
+     *
+     * Returns the first {@link ListObjectVersionsRequest#maxResults} versions (the first "page").
+     * If there are more results, returns a continuation token that can be passed in a subsequent call
+     * to get the next "page" of results.
+     *
+     * @throws Error if there is an error calling S3.
+     */
+    public async listObjectVersions(request: ListObjectVersionsRequest): Promise<ListObjectVersionsResponse> {
+        getLogger().debug('ListObjectVersions called with request: %O', request)
+
+        const output: ListObjectVersionsOutput = await this.makeRequest(ListObjectVersionsCommand, {
+            Bucket: request.bucketName,
+            MaxKeys: request.maxResults ?? DEFAULT_MAX_KEYS,
+            KeyMarker: request.continuationToken?.keyMarker,
+            VersionIdMarker: request.continuationToken?.versionIdMarker,
+        })
+        const response = this.processListObjectVersionsResponse(output)
+        getLogger().debug('ListObjectVersions returned response: %O', response)
+        return response
+    }
+
+    public processListObjectVersionsResponse(output: ListObjectVersionsOutput) {
+        return {
+            objects: (output.Versions ?? []).map((version) => ({
+                key: version.Key!,
+                versionId: version.VersionId,
+            })),
+            continuationToken: output.IsTruncated
+                ? { keyMarker: output.NextKeyMarker!, versionIdMarker: output.NextVersionIdMarker }
+                : undefined,
+        }
+    }
+
+    /**
+     * Returns an async iterable over all pages of {@link listObjectVersions}.
+     *
+     * @throws Error from the iterable if there is an error calling S3.
+     */
+    public async *listObjectVersionsIterable(
+        request: ListObjectVersionsRequest,
+        listObjectVersions: (
+            request: ListObjectVersionsRequest
+        ) => Promise<ListObjectVersionsResponse> = this.listObjectVersions.bind(this)
+    ): AsyncIterableIterator<ListObjectVersionsResponse> {
+        let continuationToken: ContinuationToken | undefined = request.continuationToken
+        do {
+            const listObjectVersionsResponse: ListObjectVersionsResponse = await listObjectVersions({
+                bucketName: request.bucketName,
+                maxResults: request.maxResults,
+                continuationToken,
+            })
+            continuationToken = listObjectVersionsResponse.continuationToken
+
+            yield listObjectVersionsResponse
+        } while (continuationToken)
+    }
+
+    /**
+     * Deletes an object from a bucket.
+     *
+     * The bucket should reside in the same region as the one configured for the client.
+     *
+     * @throws Error if there is an error calling S3.
+     */
+    public async deleteObject(request: DeleteObjectRequest): Promise<void> {
+        getLogger().debug('DeleteObject called with request: %O', request)
+        await this.makeRequest(DeleteObjectCommand, { Bucket: request.bucketName, Key: request.key })
+        getLogger().debug('DeleteObject succeeded')
+    }
+
+    /**
+     * Deletes objects from a bucket.
+     *
+     * The bucket should reside in the same region as the one configured for the client.
+     *
+     * Returns a list of Errors that occurred if the delete was only partially completed.
+     *
+     * @throws Error if there is an error calling S3, beyond the partial errors mentioned above.
+     */
+    public async deleteObjects(request: DeleteObjectsRequest): Promise<DeleteObjectsResponse> {
+        getLogger().debug('DeleteObjects called with request: %O', request)
+
+        const output: DeleteObjectsOutput = await this.makeRequest(DeleteObjectsCommand, {
+            Bucket: request.bucketName,
+            Delete: {
+                Objects: request.objects.map(({ key: Key, versionId: VersionId }) => ({ Key, VersionId })),
+                Quiet: true,
+            },
+        })
+
+        const response: DeleteObjectsResponse = { errors: output.Errors ?? [] }
+        getLogger().debug('DeleteObjects returned response: %O', response)
+        return response
+    }
+
+    /**
+     * Empties a bucket by repeatedly listing and deleting all versions of all objects inside.
+     *
+     * Note that this just repeatedly calls list object versions and delete objects to empty the bucket.
+     * Failures can leave the bucket in a state where only some objects are deleted.
+     *
+     * @throws Error if there is an error listing or deleting.
+     */
+    private async emptyBucket(bucketName: string): Promise<void> {
+        for await (const { objects } of this.listObjectVersionsIterable({ bucketName })) {
+            if (_(objects).isEmpty()) {
+                continue
+            }
+
+            const deleteObjectsResponse = await this.deleteObjects({ bucketName, objects })
+            if (!_(deleteObjectsResponse.errors).isEmpty()) {
+                const e = new Error(inspect(deleteObjectsResponse.errors[0]))
+                getLogger().error('Failed to delete %d objects: %O...', deleteObjectsResponse.errors.length, e)
+                throw e
+            }
+        }
+    }
+
+    /**
+     * Gets an object's body from a bucket.
+     *
+     * @throws Error if there is an error calling S3.
+     */
+    public async getObject(request: GetObjectRequest): Promise<GetObjectResponse> {
+        getLogger().debug('GetObject called with request: %O', request)
+        const output: GetObjectOutput = await this.makeRequest(GetObjectCommand, {
+            Bucket: request.bucketName,
+            Key: request.key,
+        })
+
+        const response: GetObjectResponse = { objectBody: output.Body! }
+        getLogger().debug('GetObject returned response: %O', response)
+        return response
+    }
+}
+
+/**
+ * @deprecated This should be refactored the same way as {@link toFile}
+ */
+export class DefaultFolder {
+    public readonly name: string
+    public readonly path: string
+    public readonly arn: string
+
+    public constructor({ partitionId, bucketName, path }: { partitionId: string; bucketName: string; path: string }) {
+        this.path = path
+        this.arn = buildArn({ partitionId, bucketName, key: path })
+        this.name = _(this.path).split(DEFAULT_DELIMITER).dropRight()!.last()!
+    }
+
+    public [inspect.custom](): string {
+        return `Folder (name=${this.name}, path=${this.path}, arn=${this.arn})`
+    }
+}
+
+export interface File extends _Object, HeadObjectOutput {
+    readonly name: string
+    readonly key: string
+    readonly arn: string
+    readonly lastModified?: Date
+    readonly sizeBytes?: number
+    readonly eTag?: string
+}
+
+export function toFile(bucket: S3Bucket, resp: RequiredProps<_Object, 'Key'>, delimiter = DEFAULT_DELIMITER): File {
+    return {
+        key: resp.Key,
+        arn: `${bucket.Arn}/${resp.Key}`,
+        name: resp.Key.split(delimiter).pop()!,
+        eTag: resp.ETag,
+        lastModified: resp.LastModified,
+        sizeBytes: resp.Size,
+        ...resp,
+    }
+}
+
+export function toBucket(bucketName: string, region: string, partitionId: string): S3Bucket {
+    return {
+        Name: bucketName,
+        BucketRegion: region,
+        Arn: buildArn({ partitionId, bucketName }),
+    }
+}
+
+function buildArn({ partitionId, bucketName, key }: { partitionId: string; bucketName: string; key?: string }) {
+    if (key === undefined) {
+        return `arn:${partitionId}:s3:::${bucketName}`
+    }
+
+    return `arn:${partitionId}:s3:::${bucketName}/${key}`
+}
+
+/**
+ * A URI parser that can parse out information about an S3 URI
+ * Adapted from
+ * @see https://github.com/frantz/amazon-s3-uri/
+ */
+export function parseS3Uri(uri: string): [region: string, bucket: string, key: string] {
+    const endpointPattern = /^(.+\.)?s3[.-]([a-z0-9-]+)\./
+    const defaultRegion = 'us-east-1' // Default region for URI parsing, if region is not found
+    const parsedUri = url.parse(uri)
+    let bucket: string | undefined = undefined
+    let region: string = defaultRegion
+    let key: string | undefined = undefined
+
+    if (parsedUri.protocol === 's3:') {
+        bucket = parsedUri.host ?? undefined
+        if (!bucket) {
+            throw new Error(`Invalid S3 URI: no bucket: ${uri}`)
+        }
+        if (!parsedUri.pathname || parsedUri.pathname.length <= 1) {
+            // s3://bucket or s3://bucket/
+            key = undefined
+        } else {
+            // s3://bucket/key
+            // Remove the leading '/'.
+            key = parsedUri.pathname.substring(1)
+        }
+        if (key !== undefined) {
+            key = decodeURIComponent(key)
+        }
+        return [region, bucket, key!]
+    }
+
+    if (!parsedUri.host) {
+        throw new Error(`Invalid S3 URI: no hostname: ${uri}`)
+    }
+
+    const matches = parsedUri.host.match(endpointPattern)
+    if (!matches) {
+        throw new Error(`Invalid S3 URI: hostname does not appear to be a valid S3 endpoint: ${uri}`)
+    }
+
+    const prefix = matches[1]
+    if (!prefix) {
+        if (parsedUri.pathname === '/') {
+            bucket = undefined
+            key = undefined
+        } else {
+            const index = parsedUri.pathname!.indexOf('/', 1)
+            if (index === -1) {
+                // https://s3.amazonaws.com/bucket
+                bucket = parsedUri.pathname!.substring(1) ?? undefined
+                key = undefined
+            } else if (index === parsedUri.pathname!.length - 1) {
+                // https://s3.amazonaws.com/bucket/
+                bucket = parsedUri.pathname!.substring(1, index)
+                key = undefined
+            } else {
+                // https://s3.amazonaws.com/bucket/key
+                bucket = parsedUri.pathname!.substring(1, index)
+                key = parsedUri.pathname!.substring(index + 1)
+            }
+        }
+    } else {
+        // Remove the trailing '.' from the prefix to get the bucket.
+        bucket = prefix.substring(0, prefix.length - 1)
+
+        if (!parsedUri.pathname || parsedUri.pathname === '/') {
+            key = undefined
+        } else {
+            // Remove the leading '/'.
+            key = parsedUri.pathname.substring(1)
+        }
+    }
+
+    if (matches[2] !== 'amazonaws') {
+        region = matches[2]
+    } else {
+        region = defaultRegion
+    }
+
+    if (key !== undefined) {
+        key = decodeURIComponent(key)
+    }
+    return [region, bucket!, key!]
+}
diff --git a/packages/core/src/shared/clients/sagemaker.ts b/packages/core/src/shared/clients/sagemaker.ts
new file mode 100644
index 00000000000..fda420effef
--- /dev/null
+++ b/packages/core/src/shared/clients/sagemaker.ts
@@ -0,0 +1,380 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import {
+    AppDetails,
+    AppType,
+    CreateAppCommand,
+    CreateAppCommandInput,
+    CreateAppCommandOutput,
+    DeleteAppCommand,
+    DeleteAppCommandInput,
+    DeleteAppCommandOutput,
+    DescribeAppCommand,
+    DescribeAppCommandInput,
+    DescribeAppCommandOutput,
+    DescribeDomainCommand,
+    DescribeDomainCommandInput,
+    DescribeDomainCommandOutput,
+    DescribeDomainResponse,
+    DescribeSpaceCommand,
+    DescribeSpaceCommandInput,
+    DescribeSpaceCommandOutput,
+    ListAppsCommandInput,
+    ListSpacesCommandInput,
+    ResourceSpec,
+    SageMakerClient,
+    SpaceDetails,
+    UpdateSpaceCommand,
+    UpdateSpaceCommandInput,
+    UpdateSpaceCommandOutput,
+    paginateListApps,
+    paginateListSpaces,
+} from '@amzn/sagemaker-client'
+import { isEmpty } from 'lodash'
+import { sleep } from '../utilities/timeoutUtils'
+import { ClientWrapper } from './clientWrapper'
+import { AsyncCollection } from '../utilities/asyncCollection'
+import {
+    InstanceTypeError,
+    InstanceTypeMinimum,
+    InstanceTypeInsufficientMemory,
+    InstanceTypeInsufficientMemoryMessage,
+    InstanceTypeNotSelectedMessage,
+} from '../../awsService/sagemaker/constants'
+import { getDomainSpaceKey } from '../../awsService/sagemaker/utils'
+import { getLogger } from '../logger/logger'
+import { ToolkitError } from '../errors'
+import { yes, no, continueText, cancel } from '../localizedText'
+import { AwsCredentialIdentity } from '@aws-sdk/types'
+import globals from '../extensionGlobals'
+
+const appTypeSettingsMap: Record<string, string> = {
+    [AppType.JupyterLab as string]: 'JupyterLabAppSettings',
+    [AppType.CodeEditor as string]: 'CodeEditorAppSettings',
+} as const
+
+export interface SagemakerSpaceApp extends SpaceDetails {
+    App?: AppDetails
+    DomainSpaceKey: string
+}
+
+export class SagemakerClient extends ClientWrapper<SageMakerClient> {
+    public constructor(
+        public override readonly regionCode: string,
+        private readonly credentialsProvider?: () => Promise<AwsCredentialIdentity>
+    ) {
+        super(regionCode, SageMakerClient)
+    }
+
+    protected override getClient(ignoreCache: boolean = false) {
+        if (!this.client || ignoreCache) {
+            const args = {
+                serviceClient: SageMakerClient,
+                region: this.regionCode,
+                clientOptions: {
+                    endpoint: `https://sagemaker.${this.regionCode}.amazonaws.com`,
+                    region: this.regionCode,
+                    ...(this.credentialsProvider && { credentials: this.credentialsProvider }),
+                },
+            }
+            this.client = globals.sdkClientBuilderV3.createAwsService(args)
+        }
+        return this.client
+    }
+
+    public override dispose() {
+        getLogger().debug('SagemakerClient: Disposing client %O', this.client)
+        this.client?.destroy()
+        this.client = undefined
+    }
+
+    public listSpaces(request: ListSpacesCommandInput = {}): AsyncCollection<SpaceDetails[]> {
+        // @ts-ignore: Suppressing type mismatch on paginator return type
+        return this.makePaginatedRequest(paginateListSpaces, request, (page) => page.Spaces)
+    }
+
+    public listApps(request: ListAppsCommandInput = {}): AsyncCollection<AppDetails[]> {
+        // @ts-ignore: Suppressing type mismatch on paginator return type
+        return this.makePaginatedRequest(paginateListApps, request, (page) => page.Apps)
+    }
+
+    public describeApp(request: DescribeAppCommandInput): Promise<DescribeAppCommandOutput> {
+        return this.makeRequest(DescribeAppCommand, request)
+    }
+
+    public describeDomain(request: DescribeDomainCommandInput): Promise<DescribeDomainCommandOutput> {
+        return this.makeRequest(DescribeDomainCommand, request)
+    }
+
+    public describeSpace(request: DescribeSpaceCommandInput): Promise<DescribeSpaceCommandOutput> {
+        return this.makeRequest(DescribeSpaceCommand, request)
+    }
+
+    public updateSpace(request: UpdateSpaceCommandInput): Promise<UpdateSpaceCommandOutput> {
+        return this.makeRequest(UpdateSpaceCommand, request)
+    }
+
+    public createApp(request: CreateAppCommandInput): Promise<CreateAppCommandOutput> {
+        return this.makeRequest(CreateAppCommand, request)
+    }
+
+    public deleteApp(request: DeleteAppCommandInput): Promise<DeleteAppCommandOutput> {
+        return this.makeRequest(DeleteAppCommand, request)
+    }
+
+    public async startSpace(spaceName: string, domainId: string) {
+        let spaceDetails: DescribeSpaceCommandOutput
+
+        // Get existing space details
+        try {
+            spaceDetails = await this.describeSpace({
+                DomainId: domainId,
+                SpaceName: spaceName,
+            })
+        } catch (err) {
+            throw this.handleStartSpaceError(err)
+        }
+
+        // Get app type
+        const appType = spaceDetails.SpaceSettings?.AppType
+        if (!appType || !(appType in appTypeSettingsMap)) {
+            throw new ToolkitError(`Unsupported AppType "${appType}" for space "${spaceName}"`)
+        }
+
+        // Get app resource spec
+        const requestedResourceSpec =
+            appType === AppType.JupyterLab
+                ? spaceDetails.SpaceSettings?.JupyterLabAppSettings?.DefaultResourceSpec
+                : spaceDetails.SpaceSettings?.CodeEditorAppSettings?.DefaultResourceSpec
+
+        let instanceType = requestedResourceSpec?.InstanceType
+
+        // Is InstanceType defined and has enough memory?
+        if (instanceType && instanceType in InstanceTypeInsufficientMemory) {
+            // Prompt user to select one with sufficient memory (1 level up from their chosen one)
+            const response = await vscode.window.showErrorMessage(
+                InstanceTypeInsufficientMemoryMessage(
+                    spaceDetails.SpaceName || '',
+                    instanceType,
+                    InstanceTypeInsufficientMemory[instanceType]
+                ),
+                yes,
+                no
+            )
+
+            if (response === no) {
+                throw new ToolkitError('InstanceType has insufficient memory.', { code: InstanceTypeError })
+            }
+
+            instanceType = InstanceTypeInsufficientMemory[instanceType]
+        } else if (!instanceType) {
+            // Prompt user to select the minimum supported instance type
+            const response = await vscode.window.showErrorMessage(
+                InstanceTypeNotSelectedMessage(spaceDetails.SpaceName || ''),
+                continueText,
+                cancel
+            )
+
+            if (response === cancel) {
+                throw new ToolkitError('InstanceType not defined.', { code: InstanceTypeError })
+            }
+
+            instanceType = InstanceTypeMinimum
+        }
+
+        // First, update the space if needed
+        const needsRemoteAccess =
+            !spaceDetails.SpaceSettings?.RemoteAccess || spaceDetails.SpaceSettings?.RemoteAccess === 'DISABLED'
+        const instanceTypeChanged = requestedResourceSpec?.InstanceType !== instanceType
+
+        if (needsRemoteAccess || instanceTypeChanged) {
+            const updateSpaceRequest: UpdateSpaceCommandInput = {
+                DomainId: domainId,
+                SpaceName: spaceName,
+                SpaceSettings: {
+                    ...(needsRemoteAccess && { RemoteAccess: 'ENABLED' }),
+                    ...(instanceTypeChanged && {
+                        [appTypeSettingsMap[appType]]: {
+                            DefaultResourceSpec: {
+                                InstanceType: instanceType,
+                            },
+                        },
+                    }),
+                },
+            }
+
+            try {
+                getLogger().debug('SagemakerClient: Updating space: domainId=%s, spaceName=%s', domainId, spaceName)
+                await this.updateSpace(updateSpaceRequest)
+                await this.waitForSpaceInService(spaceName, domainId)
+            } catch (err) {
+                throw this.handleStartSpaceError(err)
+            }
+        }
+
+        const resourceSpec: ResourceSpec = {
+            // Default values
+            SageMakerImageArn: 'arn:aws:sagemaker:us-west-2:542918446943:image/sagemaker-distribution-cpu',
+            SageMakerImageVersionAlias: '3.2.0',
+
+            // The existing resource spec
+            ...requestedResourceSpec,
+
+            // The instance type user has chosen
+            InstanceType: instanceType,
+        }
+
+        const cleanedResourceSpec =
+            resourceSpec && 'EnvironmentArn' in resourceSpec
+                ? { ...resourceSpec, EnvironmentArn: undefined, EnvironmentVersionArn: undefined }
+                : resourceSpec
+
+        // Second, create the App
+        const createAppRequest: CreateAppCommandInput = {
+            DomainId: domainId,
+            SpaceName: spaceName,
+            AppType: appType,
+            AppName: 'default',
+            ResourceSpec: cleanedResourceSpec,
+        }
+
+        try {
+            getLogger().debug('SagemakerClient: Creating app: domainId=%s, spaceName=%s', domainId, spaceName)
+            await this.createApp(createAppRequest)
+        } catch (err) {
+            throw this.handleStartSpaceError(err)
+        }
+    }
+
+    public async listSpaceApps(domainId?: string): Promise<Map<string, SagemakerSpaceApp>> {
+        // Create options object conditionally if domainId is provided
+        const options = domainId ? { DomainIdEquals: domainId } : undefined
+
+        const appMap: Map<string, AppDetails> = await this.listApps(options)
+            .flatten()
+            .filter((app) => !!app.DomainId && !!app.SpaceName)
+            .filter((app) => app.AppType === AppType.JupyterLab || app.AppType === AppType.CodeEditor)
+            .toMap((app) => getDomainSpaceKey(app.DomainId || '', app.SpaceName || ''))
+
+        const spaceApps: Map<string, SagemakerSpaceApp> = await this.listSpaces(options)
+            .flatten()
+            .filter((space) => !!space.DomainId && !!space.SpaceName)
+            .map((space) => {
+                const key = getDomainSpaceKey(space.DomainId || '', space.SpaceName || '')
+                return { ...space, App: appMap.get(key), DomainSpaceKey: key }
+            })
+            .toMap((space) => getDomainSpaceKey(space.DomainId || '', space.SpaceName || ''))
+        return spaceApps
+    }
+
+    public async fetchSpaceAppsAndDomains(
+        domainId?: string,
+        filterSmusDomains: boolean = true
+    ): Promise<[Map<string, SagemakerSpaceApp>, Map<string, DescribeDomainResponse>]> {
+        try {
+            const spaceApps = await this.listSpaceApps(domainId)
+            // Get de-duped list of domain IDs for all of the spaces
+            const domainIds: string[] = domainId
+                ? [domainId]
+                : [...new Set([...spaceApps].map(([_, spaceApp]) => spaceApp.DomainId || ''))]
+
+            // Get details for each domain
+            const domains: [string, DescribeDomainResponse][] = await Promise.all(
+                domainIds.map(async (domainId, index) => {
+                    await sleep(index * 100)
+                    const response = await this.describeDomain({ DomainId: domainId })
+                    return [domainId, response]
+                })
+            )
+
+            const domainsMap = new Map<string, DescribeDomainResponse>(domains)
+
+            const filteredSpaceApps = new Map(
+                [...spaceApps]
+                    // Filter out SageMaker Unified Studio domains only if filterSmusDomains is true
+                    .filter(
+                        ([_, spaceApp]) =>
+                            !filterSmusDomains ||
+                            isEmpty(domainsMap.get(spaceApp.DomainId || '')?.DomainSettings?.UnifiedStudioSettings)
+                    )
+            )
+
+            return [filteredSpaceApps, domainsMap]
+        } catch (err) {
+            const error = err as Error
+            getLogger().error('Failed to fetch space apps: %s', err)
+            if (error.name === 'AccessDeniedException') {
+                void vscode.window.showErrorMessage(
+                    'AccessDeniedException: You do not have permission to view spaces. Please contact your administrator',
+                    { modal: false, detail: 'AWS Toolkit' }
+                )
+            }
+            throw err
+        }
+    }
+
+    private async waitForSpaceInService(
+        spaceName: string,
+        domainId: string,
+        maxRetries = 30,
+        intervalMs = 5000
+    ): Promise<void> {
+        for (let attempt = 0; attempt < maxRetries; attempt++) {
+            const result = await this.describeSpace({ SpaceName: spaceName, DomainId: domainId })
+
+            if (result.Status === 'InService') {
+                return
+            }
+
+            await sleep(intervalMs)
+        }
+
+        throw new ToolkitError(
+            `Timed out waiting for space "${spaceName}" in domain "${domainId}" to reach "InService" status.`
+        )
+    }
+
+    public async waitForAppInService(
+        domainId: string,
+        spaceName: string,
+        appType: string,
+        maxRetries = 30,
+        intervalMs = 5000
+    ): Promise<void> {
+        for (let attempt = 0; attempt < maxRetries; attempt++) {
+            const { Status } = await this.describeApp({
+                DomainId: domainId,
+                SpaceName: spaceName,
+                AppType: appType as any,
+                AppName: 'default',
+            })
+
+            if (Status === 'InService') {
+                return
+            }
+
+            if (['Failed', 'DeleteFailed'].includes(Status ?? '')) {
+                throw new ToolkitError(`App failed to start. Status: ${Status}`)
+            }
+
+            await sleep(intervalMs)
+        }
+
+        throw new ToolkitError(`Timed out waiting for app "${spaceName}" to reach "InService" status.`)
+    }
+
+    private handleStartSpaceError(err: unknown) {
+        const error = err as Error
+        if (error.name === 'AccessDeniedException') {
+            throw new ToolkitError('You do not have permission to start spaces. Please contact your administrator', {
+                cause: error,
+            })
+        } else {
+            throw err
+        }
+    }
+}
diff --git a/packages/core/src/shared/clients/schemaClient.ts b/packages/core/src/shared/clients/schemaClient.ts
new file mode 100644
index 00000000000..238b0d46810
--- /dev/null
+++ b/packages/core/src/shared/clients/schemaClient.ts
@@ -0,0 +1,191 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    DescribeCodeBindingCommand,
+    DescribeCodeBindingResponse,
+    DescribeSchemaCommand,
+    DescribeSchemaResponse,
+    GetCodeBindingSourceCommand,
+    GetCodeBindingSourceResponse,
+    ListRegistriesCommand,
+    ListRegistriesRequest,
+    ListRegistriesResponse,
+    ListSchemasCommand,
+    ListSchemasRequest,
+    ListSchemasResponse,
+    ListSchemaVersionsCommand,
+    ListSchemaVersionsRequest,
+    ListSchemaVersionsResponse,
+    PutCodeBindingCommand,
+    PutCodeBindingResponse,
+    RegistrySummary,
+    SchemasClient,
+    SchemaSummary,
+    SchemaVersionSummary,
+    SearchSchemasCommand,
+    SearchSchemasRequest,
+    SearchSchemasResponse,
+    SearchSchemaSummary,
+} from '@aws-sdk/client-schemas'
+import globals from '../extensionGlobals'
+
+import { ClassToInterfaceType } from '../utilities/tsUtils'
+
+export type SchemaClient = ClassToInterfaceType<DefaultSchemaClient>
+export class DefaultSchemaClient {
+    public constructor(public readonly regionCode: string) {}
+
+    public async *listRegistries(): AsyncIterableIterator<RegistrySummary> {
+        const client = this.createSdkClient()
+
+        const request: ListRegistriesRequest = {}
+
+        do {
+            const response: ListRegistriesResponse = await client.send(new ListRegistriesCommand(request))
+
+            if (response.Registries) {
+                yield* response.Registries
+            }
+
+            request.NextToken = response.NextToken
+        } while (request.NextToken)
+    }
+
+    public async *listSchemas(registryName: string): AsyncIterableIterator<SchemaSummary> {
+        const client = this.createSdkClient()
+
+        const request: ListSchemasRequest = {
+            RegistryName: registryName,
+        }
+
+        do {
+            const response: ListSchemasResponse = await client.send(new ListSchemasCommand(request))
+
+            if (response.Schemas) {
+                yield* response.Schemas
+            }
+
+            request.NextToken = response.NextToken
+        } while (request.NextToken)
+    }
+
+    public async describeSchema(
+        registryName: string,
+        schemaName: string,
+        schemaVersion?: string
+    ): Promise<DescribeSchemaResponse> {
+        const client = this.createSdkClient()
+
+        return await client.send(
+            new DescribeSchemaCommand({
+                RegistryName: registryName,
+                SchemaName: schemaName,
+                SchemaVersion: schemaVersion,
+            })
+        )
+    }
+
+    public async *listSchemaVersions(
+        registryName: string,
+        schemaName: string
+    ): AsyncIterableIterator<SchemaVersionSummary> {
+        const client = this.createSdkClient()
+
+        const request: ListSchemaVersionsRequest = {
+            RegistryName: registryName,
+            SchemaName: schemaName,
+        }
+
+        do {
+            const response: ListSchemaVersionsResponse = await client.send(new ListSchemaVersionsCommand(request))
+
+            if (response.SchemaVersions) {
+                yield* response.SchemaVersions
+            }
+
+            request.NextToken = response.NextToken
+        } while (request.NextToken)
+    }
+
+    public async *searchSchemas(keywords: string, registryName: string): AsyncIterableIterator<SearchSchemaSummary> {
+        const client = this.createSdkClient()
+
+        const request: SearchSchemasRequest = {
+            Keywords: keywords,
+            RegistryName: registryName,
+        }
+
+        do {
+            const response: SearchSchemasResponse = await client.send(new SearchSchemasCommand(request))
+
+            if (response.Schemas) {
+                yield* response.Schemas
+            }
+
+            request.NextToken = response.NextToken
+        } while (request.NextToken)
+    }
+
+    public async getCodeBindingSource(
+        language: string,
+        registryName: string,
+        schemaName: string,
+        schemaVersion: string
+    ): Promise<GetCodeBindingSourceResponse> {
+        const client = this.createSdkClient()
+
+        return await client.send(
+            new GetCodeBindingSourceCommand({
+                Language: language,
+                RegistryName: registryName,
+                SchemaName: schemaName,
+                SchemaVersion: schemaVersion,
+            })
+        )
+    }
+
+    public async putCodeBinding(
+        language: string,
+        registryName: string,
+        schemaName: string,
+        schemaVersion: string
+    ): Promise<PutCodeBindingResponse> {
+        const client = this.createSdkClient()
+
+        return await client.send(
+            new PutCodeBindingCommand({
+                Language: language,
+                RegistryName: registryName,
+                SchemaName: schemaName,
+                SchemaVersion: schemaVersion,
+            })
+        )
+    }
+    public async describeCodeBinding(
+        language: string,
+        registryName: string,
+        schemaName: string,
+        schemaVersion: string
+    ): Promise<DescribeCodeBindingResponse> {
+        const client = this.createSdkClient()
+
+        return await client.send(
+            new DescribeCodeBindingCommand({
+                Language: language,
+                RegistryName: registryName,
+                SchemaName: schemaName,
+                SchemaVersion: schemaVersion,
+            })
+        )
+    }
+
+    private createSdkClient(): SchemasClient {
+        return globals.sdkClientBuilderV3.createAwsService({
+            serviceClient: SchemasClient,
+            clientOptions: { region: this.regionCode },
+        })
+    }
+}
diff --git a/packages/core/src/shared/clients/secretsManagerClient.ts b/packages/core/src/shared/clients/secretsManagerClient.ts
new file mode 100644
index 00000000000..af9af46d55d
--- /dev/null
+++ b/packages/core/src/shared/clients/secretsManagerClient.ts
@@ -0,0 +1,73 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    CreateSecretCommand,
+    CreateSecretRequest,
+    CreateSecretResponse,
+    ListSecretsCommand,
+    ListSecretsRequest,
+    ListSecretsResponse,
+    SecretsManagerClient as SecretsManagerSdkClient,
+} from '@aws-sdk/client-secrets-manager'
+import globals from '../extensionGlobals'
+import { productName } from '../constants'
+
+export class SecretsManagerClient {
+    public constructor(
+        public readonly regionCode: string,
+        private readonly secretsManagerClientProvider: (
+            regionCode: string
+        ) => SecretsManagerSdkClient = createSecretsManagerClient
+    ) {}
+
+    /**
+     * Lists the secrets that are stored by Secrets Manager
+     * @param filter tagged key filter value
+     * @returns a list of the secrets
+     */
+    public async listSecrets(filter: string): Promise<ListSecretsResponse> {
+        const secretsManagerClient = this.secretsManagerClientProvider(this.regionCode)
+        const request: ListSecretsRequest = {
+            IncludePlannedDeletion: false,
+            Filters: [
+                {
+                    Key: 'tag-key',
+                    Values: [filter],
+                },
+            ],
+            SortOrder: 'desc',
+        }
+        return secretsManagerClient.send(new ListSecretsCommand(request))
+    }
+
+    public async createSecret(secretString: string, username: string, password: string): Promise<CreateSecretResponse> {
+        const secretsManagerClient = this.secretsManagerClientProvider(this.regionCode)
+        const request: CreateSecretRequest = {
+            Description: `Database secret created with ${productName}`,
+            Name: secretString ? secretString : '',
+            SecretString: JSON.stringify({ username, password }),
+            Tags: [
+                {
+                    Key: 'Service',
+                    Value: 'Redshift',
+                },
+                {
+                    Key: 'Request-Source',
+                    Value: productName,
+                },
+            ],
+            ForceOverwriteReplicaSecret: true,
+        }
+        return secretsManagerClient.send(new CreateSecretCommand(request))
+    }
+}
+
+function createSecretsManagerClient(regionCode: string): SecretsManagerSdkClient {
+    return globals.sdkClientBuilderV3.createAwsService({
+        serviceClient: SecretsManagerSdkClient,
+        clientOptions: { region: regionCode },
+    })
+}
diff --git a/packages/core/src/shared/clients/ssm.ts b/packages/core/src/shared/clients/ssm.ts
new file mode 100644
index 00000000000..3565e9c7a6d
--- /dev/null
+++ b/packages/core/src/shared/clients/ssm.ts
@@ -0,0 +1,113 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    SSMClient,
+    Session,
+    StartSessionCommand,
+    TerminateSessionCommand,
+    TerminateSessionResponse,
+    StartSessionCommandOutput,
+    DescribeInstanceInformationCommandInput,
+    InstanceInformation,
+    SendCommandCommand,
+    SendCommandCommandOutput,
+    waitUntilCommandExecuted,
+    SessionState,
+    paginateDescribeInstanceInformation,
+    paginateDescribeSessions,
+} from '@aws-sdk/client-ssm'
+import { WaiterState } from '@smithy/util-waiter'
+import { ToolkitError } from '../errors'
+import { ClientWrapper } from './clientWrapper'
+
+export class SsmClient extends ClientWrapper<SSMClient> {
+    public constructor(public override readonly regionCode: string) {
+        super(regionCode, SSMClient)
+    }
+
+    public async terminateSession(session: Session): Promise<TerminateSessionResponse> {
+        const sessionId = session.SessionId!
+        return await this.terminateSessionFromId(sessionId)
+    }
+
+    public async terminateSessionFromId(sessionId: string): Promise<TerminateSessionResponse> {
+        return await this.makeRequest(TerminateSessionCommand, { SessionId: sessionId })
+    }
+
+    public async startSession(
+        target: string,
+        document?: string,
+        reason?: string,
+        parameters?: Record<string, string[]>
+    ): Promise<StartSessionCommandOutput> {
+        return await this.makeRequest(StartSessionCommand, {
+            Target: target,
+            DocumentName: document,
+            Reason: reason,
+            Parameters: parameters,
+        })
+    }
+
+    public async describeInstance(target: string): Promise<InstanceInformation> {
+        return await this.getFirst(
+            paginateDescribeInstanceInformation,
+            {
+                InstanceInformationFilterList: [{ key: 'InstanceIds', valueSet: [target] }],
+            } satisfies DescribeInstanceInformationCommandInput,
+            (page) => page.InstanceInformationList
+        )
+    }
+
+    public async getTargetPlatformName(target: string): Promise<string> {
+        const instanceInformation = await this.describeInstance(target)
+        return instanceInformation.PlatformName!
+    }
+
+    public async sendCommand(
+        target: string,
+        documentName: string,
+        parameters: Record<string, string[]>
+    ): Promise<SendCommandCommandOutput> {
+        return await this.makeRequest(SendCommandCommand, {
+            InstanceIds: [target],
+            DocumentName: documentName,
+            Parameters: parameters,
+        })
+    }
+
+    private async waitForCommand(commandId: string, target: string) {
+        const result = await waitUntilCommandExecuted(
+            { client: this.getClient(), maxWaitTime: 30 },
+            { CommandId: commandId, InstanceId: target }
+        )
+        if (result.state !== WaiterState.SUCCESS) {
+            throw new ToolkitError(`Command ${commandId} failed to execute on target ${target}`)
+        }
+    }
+
+    public async sendCommandAndWait(
+        target: string,
+        documentName: string,
+        parameters: Record<string, string[]>
+    ): Promise<SendCommandCommandOutput> {
+        const response = await this.sendCommand(target, documentName, parameters)
+        try {
+            await this.waitForCommand(response.Command!.CommandId!, target)
+            return response
+        } catch (err) {
+            throw new ToolkitError(`Failed in sending command to target ${target}`, { cause: err as Error })
+        }
+    }
+
+    public async getInstanceAgentPingStatus(target: string): Promise<string> {
+        const instanceInformation = await this.describeInstance(target)
+        return instanceInformation ? instanceInformation.PingStatus! : 'Inactive'
+    }
+
+    public async describeSessions(state: SessionState) {
+        return this.makePaginatedRequest(paginateDescribeSessions, { State: state }, (page) => page.Sessions)
+    }
+}
diff --git a/packages/core/src/shared/clients/ssmDocumentClient.ts b/packages/core/src/shared/clients/ssmDocumentClient.ts
new file mode 100644
index 00000000000..581cb0bc219
--- /dev/null
+++ b/packages/core/src/shared/clients/ssmDocumentClient.ts
@@ -0,0 +1,145 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    CreateDocumentCommand,
+    CreateDocumentRequest,
+    CreateDocumentResult,
+    DeleteDocumentCommand,
+    DeleteDocumentRequest,
+    DeleteDocumentResult,
+    DescribeDocumentCommand,
+    DescribeDocumentRequest,
+    DescribeDocumentResult,
+    DocumentFormat,
+    DocumentIdentifier,
+    DocumentVersionInfo,
+    GetDocumentCommand,
+    GetDocumentRequest,
+    GetDocumentResult,
+    ListDocumentsCommand,
+    ListDocumentsRequest,
+    ListDocumentsResult,
+    ListDocumentVersionsCommand,
+    ListDocumentVersionsRequest,
+    ListDocumentVersionsResult,
+    SSMClient,
+    UpdateDocumentCommand,
+    UpdateDocumentDefaultVersionCommand,
+    UpdateDocumentDefaultVersionRequest,
+    UpdateDocumentDefaultVersionResult,
+    UpdateDocumentRequest,
+    UpdateDocumentResult,
+} from '@aws-sdk/client-ssm'
+import globals from '../extensionGlobals'
+
+import { ClassToInterfaceType } from '../utilities/tsUtils'
+
+export type SsmDocumentClient = ClassToInterfaceType<DefaultSsmDocumentClient>
+export class DefaultSsmDocumentClient {
+    public constructor(public readonly regionCode: string) {}
+
+    public async deleteDocument(documentName: string): Promise<DeleteDocumentResult> {
+        const client = this.createSdkClient()
+
+        const request: DeleteDocumentRequest = {
+            Name: documentName,
+        }
+
+        return await client.send(new DeleteDocumentCommand(request))
+    }
+
+    public async *listDocuments(request: ListDocumentsRequest = {}): AsyncIterableIterator<DocumentIdentifier> {
+        const client = this.createSdkClient()
+
+        do {
+            const response: ListDocumentsResult = await client.send(new ListDocumentsCommand(request))
+
+            if (response.DocumentIdentifiers) {
+                yield* response.DocumentIdentifiers
+            }
+
+            request.NextToken = response.NextToken
+        } while (request.NextToken)
+    }
+
+    public async *listDocumentVersions(documentName: string): AsyncIterableIterator<DocumentVersionInfo> {
+        const client = this.createSdkClient()
+
+        const request: ListDocumentVersionsRequest = {
+            Name: documentName,
+        }
+
+        do {
+            const response: ListDocumentVersionsResult = await client.send(new ListDocumentVersionsCommand(request))
+
+            if (response.DocumentVersions) {
+                yield* response.DocumentVersions
+            }
+
+            request.NextToken = response.NextToken
+        } while (request.NextToken)
+    }
+
+    public async describeDocument(documentName: string, documentVersion?: string): Promise<DescribeDocumentResult> {
+        const client = this.createSdkClient()
+
+        const request: DescribeDocumentRequest = {
+            Name: documentName,
+            DocumentVersion: documentVersion,
+        }
+
+        return await client.send(new DescribeDocumentCommand(request))
+    }
+
+    public async getDocument(
+        documentName: string,
+        documentVersion?: string,
+        documentFormat?: DocumentFormat
+    ): Promise<GetDocumentResult> {
+        const client = this.createSdkClient()
+
+        const request: GetDocumentRequest = {
+            Name: documentName,
+            DocumentVersion: documentVersion,
+            DocumentFormat: documentFormat,
+        }
+
+        return await client.send(new GetDocumentCommand(request))
+    }
+
+    public async createDocument(request: CreateDocumentRequest): Promise<CreateDocumentResult> {
+        const client = this.createSdkClient()
+
+        return await client.send(new CreateDocumentCommand(request))
+    }
+
+    public async updateDocument(request: UpdateDocumentRequest): Promise<UpdateDocumentResult> {
+        const client = this.createSdkClient()
+
+        return await client.send(new UpdateDocumentCommand(request))
+    }
+
+    public async updateDocumentVersion(
+        documentName: string,
+        documentVersion: string
+    ): Promise<UpdateDocumentDefaultVersionResult> {
+        const client = this.createSdkClient()
+
+        const request: UpdateDocumentDefaultVersionRequest = {
+            Name: documentName,
+            DocumentVersion: documentVersion,
+        }
+
+        return await client.send(new UpdateDocumentDefaultVersionCommand(request))
+    }
+
+    private createSdkClient(): SSMClient {
+        return globals.sdkClientBuilderV3.createAwsService({
+            serviceClient: SSMClient,
+            clientOptions: { region: this.regionCode },
+        })
+    }
+}
diff --git a/packages/core/src/shared/clients/stepFunctions.ts b/packages/core/src/shared/clients/stepFunctions.ts
new file mode 100644
index 00000000000..22483307654
--- /dev/null
+++ b/packages/core/src/shared/clients/stepFunctions.ts
@@ -0,0 +1,68 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    CreateStateMachineCommand,
+    CreateStateMachineCommandInput,
+    CreateStateMachineCommandOutput,
+    DescribeStateMachineCommand,
+    DescribeStateMachineCommandInput,
+    DescribeStateMachineCommandOutput,
+    ListStateMachinesCommand,
+    ListStateMachinesCommandInput,
+    ListStateMachinesCommandOutput,
+    SFNClient,
+    StartExecutionCommand,
+    StartExecutionCommandInput,
+    StartExecutionCommandOutput,
+    StateMachineListItem,
+    TestStateCommand,
+    TestStateCommandInput,
+    TestStateCommandOutput,
+    UpdateStateMachineCommand,
+    UpdateStateMachineCommandInput,
+    UpdateStateMachineCommandOutput,
+} from '@aws-sdk/client-sfn'
+import { ClientWrapper } from './clientWrapper'
+
+export class StepFunctionsClient extends ClientWrapper<SFNClient> {
+    public constructor(regionCode: string) {
+        super(regionCode, SFNClient)
+    }
+
+    public async *listStateMachines(
+        request: ListStateMachinesCommandInput = {}
+    ): AsyncIterableIterator<StateMachineListItem> {
+        do {
+            const response: ListStateMachinesCommandOutput = await this.makeRequest(ListStateMachinesCommand, request)
+            if (response.stateMachines) {
+                yield* response.stateMachines
+            }
+            request.nextToken = response.nextToken
+        } while (request.nextToken)
+    }
+
+    public async getStateMachineDetails(
+        request: DescribeStateMachineCommandInput
+    ): Promise<DescribeStateMachineCommandOutput> {
+        return this.makeRequest(DescribeStateMachineCommand, request)
+    }
+
+    public async executeStateMachine(request: StartExecutionCommandInput): Promise<StartExecutionCommandOutput> {
+        return this.makeRequest(StartExecutionCommand, request)
+    }
+
+    public async createStateMachine(request: CreateStateMachineCommandInput): Promise<CreateStateMachineCommandOutput> {
+        return this.makeRequest(CreateStateMachineCommand, request)
+    }
+
+    public async updateStateMachine(request: UpdateStateMachineCommandInput): Promise<UpdateStateMachineCommandOutput> {
+        return this.makeRequest(UpdateStateMachineCommand, request)
+    }
+
+    public async testState(request: TestStateCommandInput): Promise<TestStateCommandOutput> {
+        return this.makeRequest(TestStateCommand, request)
+    }
+}
diff --git a/packages/core/src/shared/clients/stsClient.ts b/packages/core/src/shared/clients/stsClient.ts
new file mode 100644
index 00000000000..f3a225882a5
--- /dev/null
+++ b/packages/core/src/shared/clients/stsClient.ts
@@ -0,0 +1,62 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { STSClient, AssumeRoleCommand, GetCallerIdentityCommand } from '@aws-sdk/client-sts'
+import type { AssumeRoleRequest, AssumeRoleResponse, GetCallerIdentityResponse } from '@aws-sdk/client-sts'
+import { AwsCredentialIdentityProvider } from '@smithy/types'
+import { Credentials } from '@aws-sdk/types'
+import globals from '../extensionGlobals'
+import { ClassToInterfaceType } from '../utilities/tsUtils'
+
+export type { GetCallerIdentityResponse }
+export type StsClient = ClassToInterfaceType<DefaultStsClient>
+
+// Helper function to convert Credentials to AwsCredentialIdentityProvider
+function toCredentialProvider(credentials: Credentials | AwsCredentialIdentityProvider): AwsCredentialIdentityProvider {
+    if (typeof credentials === 'function') {
+        return credentials
+    }
+    // Convert static credentials to provider function
+    return async () => credentials
+}
+
+export class DefaultStsClient {
+    public constructor(
+        public readonly regionCode: string,
+        private readonly credentials?: Credentials | AwsCredentialIdentityProvider,
+        private readonly endpointUrl?: string
+    ) {}
+
+    public async assumeRole(request: AssumeRoleRequest): Promise<AssumeRoleResponse> {
+        const sdkClient = this.createSdkClient()
+        const response = await sdkClient.send(new AssumeRoleCommand(request))
+        return response
+    }
+
+    public async getCallerIdentity(): Promise<GetCallerIdentityResponse> {
+        const sdkClient = this.createSdkClient()
+        const response = await sdkClient.send(new GetCallerIdentityCommand({}))
+        return response
+    }
+
+    private createSdkClient(): STSClient {
+        const clientOptions: { region: string; endpoint?: string; credentials?: AwsCredentialIdentityProvider } = {
+            region: this.regionCode,
+        }
+
+        if (this.endpointUrl) {
+            clientOptions.endpoint = this.endpointUrl
+        }
+
+        if (this.credentials) {
+            clientOptions.credentials = toCredentialProvider(this.credentials)
+        }
+
+        return globals.sdkClientBuilderV3.createAwsService({
+            serviceClient: STSClient,
+            clientOptions,
+        })
+    }
+}
diff --git a/packages/core/src/shared/cloudformation/activation.ts b/packages/core/src/shared/cloudformation/activation.ts
new file mode 100644
index 00000000000..86cbf05698b
--- /dev/null
+++ b/packages/core/src/shared/cloudformation/activation.ts
@@ -0,0 +1,96 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../logger/logger'
+import { isToolkitActive, localize } from '../utilities/vsCodeUtils'
+
+import { AsyncCloudFormationTemplateRegistry, CloudFormationTemplateRegistry } from '../fs/templateRegistry'
+import { getIdeProperties } from '../extensionUtilities'
+import { NoopWatcher } from '../fs/watchedFiles'
+import { createStarterTemplateFile } from './cloudformation'
+import * as CloudFormation from './cloudformation'
+import { Commands } from '../vscode/commands2'
+import globals from '../extensionGlobals'
+import { SamCliSettings } from '../sam/cli/samCliSettings'
+import { Timeout } from '../utilities/timeoutUtils'
+
+/**
+ * Creates a CloudFormationTemplateRegistry which retains the state of CloudFormation templates in a workspace.
+ * This also assigns a FileSystemWatcher which will update the registry on any change to tracked templates.
+ *
+ * @param extensionContext VS Code extension context
+ */
+export async function activate(extensionContext: vscode.ExtensionContext): Promise<void> {
+    try {
+        const registry = new CloudFormationTemplateRegistry()
+        extensionContext.subscriptions.push(registry)
+        setTemplateRegistryInGlobals(registry)
+    } catch (e) {
+        void vscode.window.showErrorMessage(
+            localize(
+                'AWS.codelens.failToInitialize',
+                'Failed to activate template registry. {0}} will not appear on SAM template files.',
+                getIdeProperties().codelenses
+            )
+        )
+        getLogger().error('Failed to activate template registry: %s', e)
+        // This prevents us from breaking for any reason later if it fails to load. Since
+        // Noop watcher is always empty, we will get back empty arrays with no issues.
+        globals.templateRegistry = (async () => new NoopWatcher() as unknown as CloudFormationTemplateRegistry)()
+    }
+    // If setting it up worked, add it to subscriptions so it is cleaned up at exit
+    extensionContext.subscriptions.push(
+        Commands.register('aws.cloudFormation.newTemplate', () => createStarterTemplateFile(false)),
+        Commands.register('aws.sam.newTemplate', () => createStarterTemplateFile(true))
+    )
+}
+
+/**
+ * Sets the `templateRegistry` property in the `globals` variable,
+ * where the value of the property depends on whether the registry
+ * is fully set up.
+ *
+ * This function exists to resolve the registry setup taking a long time
+ * and slowing down the extension starting up.
+ */
+function setTemplateRegistryInGlobals(registry: CloudFormationTemplateRegistry) {
+    const registrySetupFunc = async (
+        registry: CloudFormationTemplateRegistry,
+        cancel: Timeout,
+        onItem?: (total: number, i: number, cancelled: boolean) => void
+    ) => {
+        registry.addExcludedPattern(CloudFormation.devfileExcludePattern)
+        registry.addExcludedPattern(CloudFormation.templateFileExcludePattern)
+        registry.addWatchPatterns([CloudFormation.templateFileGlobPattern])
+        registry.watchUntitledFiles()
+        await registry.rebuild(cancel, onItem)
+        return registry
+    }
+
+    const asyncRegistry = new AsyncCloudFormationTemplateRegistry(registry, registrySetupFunc)
+
+    Object.defineProperty(globals, 'templateRegistry', {
+        set(newInstance: CloudFormationTemplateRegistry) {
+            this.cfnInstance = newInstance
+        },
+        async get() {
+            // This condition handles testing scenarios where we may have
+            // already set a mock object before activation.
+            // Though in prod nothing should be calling this 'set' function.
+            if (this.cfnInstance) {
+                return this.cfnInstance
+            }
+
+            // prevent eager load if codelenses are off
+            const config = SamCliSettings.instance
+            if (config.get('enableCodeLenses', false) || isToolkitActive()) {
+                return await asyncRegistry.getInstance()
+            }
+
+            return new NoopWatcher()
+        },
+    })
+}
diff --git a/packages/core/src/shared/cloudformation/cloudformation.ts b/packages/core/src/shared/cloudformation/cloudformation.ts
new file mode 100644
index 00000000000..690a5aee73c
--- /dev/null
+++ b/packages/core/src/shared/cloudformation/cloudformation.ts
@@ -0,0 +1,914 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { promises as nodefs } from 'fs' // eslint-disable-line no-restricted-imports
+import * as vscode from 'vscode'
+import { schema } from 'yaml-cfn'
+import * as yaml from 'js-yaml'
+import * as filesystemUtilities from '../filesystemUtilities'
+import fs from '../../shared/fs/fs'
+import { getLogger } from '../logger/logger'
+import { lambdaPackageTypeImage } from '../constants'
+import { isUntitledScheme, normalizeVSCodeUri } from '../utilities/vsCodeUtils'
+
+export const SERVERLESS_API_TYPE = 'AWS::Serverless::Api' // eslint-disable-line @typescript-eslint/naming-convention
+export const SERVERLESS_FUNCTION_TYPE = 'AWS::Serverless::Function' // eslint-disable-line @typescript-eslint/naming-convention
+export const LAMBDA_FUNCTION_TYPE = 'AWS::Lambda::Function' // eslint-disable-line @typescript-eslint/naming-convention
+export const LAMBDA_LAYER_TYPE = 'AWS::Lambda::LayerVersion' // eslint-disable-line @typescript-eslint/naming-convention
+export const LAMBDA_URL_TYPE = 'AWS::Lambda::Url' // eslint-disable-line @typescript-eslint/naming-convention
+export const SERVERLESS_LAYER_TYPE = 'AWS::Serverless::LayerVersion' // eslint-disable-line @typescript-eslint/naming-convention
+
+export const serverlessTableType = 'AWS::Serverless::SimpleTable'
+export const s3BucketType = 'AWS::S3::Bucket'
+export const appRunnerType = 'AWS::AppRunner::Service'
+export const ecrRepositoryType = 'AWS::ECR::Repository'
+export const snsTopicType = 'AWS::SNS::Topic'
+export const sqsQueueType = 'AWS::SQS::Queue'
+
+export const templateFileGlobPattern = '**/*.{yaml,yml,json,template}'
+export const templateFileRegexPattern = /.*\.(yaml|yml|json|template)$/i
+export const devfileExcludePattern = /.*devfile\.(yaml|yml)/i
+/**
+ * Match any file path that contains a .aws-sam folder. The way this works is:
+ * match anything that starts  with a '/' or '\', then '.aws-sam', then either
+ * a '/' or '\' followed by any number of characters or end of a string (so it
+ * matches both /.aws-sam or /.aws-sam/<any number of characters>)
+ */
+export const templateFileExcludePattern = /.*[/\\]\.aws-sam([/\\].*|$)/
+
+export function isZipLambdaResource(
+    resource?: ZipResourceProperties | ImageResourceProperties
+): resource is ZipResourceProperties {
+    return resource?.PackageType !== 'Image'
+}
+
+export function isImageLambdaResource(
+    resource?: ZipResourceProperties | ImageResourceProperties
+): resource is ImageResourceProperties {
+    return resource?.PackageType === 'Image'
+}
+
+export function validateZipLambdaProperties({
+    Handler,
+    CodeUri,
+    Runtime,
+    ...rest
+}: Partial<ZipResourceProperties>): ZipResourceProperties {
+    if (!Handler) {
+        throw new Error('Missing value: Handler')
+    }
+
+    if (!CodeUri) {
+        throw new Error('Missing value: CodeUri')
+    }
+
+    if (!Runtime) {
+        throw new Error('Missing value: Runtime')
+    }
+
+    return {
+        Handler,
+        CodeUri,
+        Runtime,
+        ...rest,
+    }
+}
+
+export interface LambdaResourceProperties {
+    MemorySize?: number | Ref
+    Timeout?: number | Ref
+    Environment?: Environment
+    Events?: Events
+    PackageType?: 'Image' | 'Zip'
+    Architectures?: ('x86_64' | 'arm64')[]
+    [key: string]: any
+}
+
+export interface ZipResourceProperties extends LambdaResourceProperties {
+    Handler: string | Ref
+    CodeUri: string | Ref
+    Runtime?: string | Ref
+    PackageType?: 'Zip'
+}
+
+export interface ImageResourceProperties extends LambdaResourceProperties {
+    PackageType: 'Image'
+    ImageConfig?: ImageConfig
+}
+
+export interface ImageConfig {
+    EntryPoint?: string[]
+    Command?: string[]
+    WorkingDirectory?: string
+}
+
+export interface Ref {
+    Ref: string
+}
+
+export interface Environment {
+    Variables?: Variables
+}
+
+export interface ApiEventProperties {
+    Path?: string
+    Method?: 'delete' | 'get' | 'head' | 'options' | 'patch' | 'post' | 'put' | 'any'
+    Payload?: {
+        json?: {
+            [k: string]: string | number | boolean
+        }
+    }
+}
+
+export interface Event {
+    Type?: 'Api' | 'HttpApi'
+    Properties?: ApiEventProperties
+}
+
+export interface Events {
+    [key: string]: Event
+}
+
+export interface Variables {
+    [key: string]: any
+}
+
+export type ResourceType =
+    | typeof LAMBDA_FUNCTION_TYPE
+    | typeof SERVERLESS_FUNCTION_TYPE
+    | typeof SERVERLESS_API_TYPE
+    | string
+
+export interface Resource {
+    Type: ResourceType
+    Properties?: ZipResourceProperties | ImageResourceProperties
+    Metadata?: SamImageMetadata
+    // Any other properties are fine to have, we just copy them transparently
+    [key: string]: any
+}
+
+export interface SamImageMetadata {
+    Dockerfile: string
+    DockerContext: string
+    // we only care about the two above, but really anything can go here
+    [key: string]: any
+}
+
+// TODO: Can we automatically detect changes to the CFN spec and apply them here?
+// https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/parameters-section-structure.html#parameters-section-structure-properties
+export type ParameterType =
+    | 'String'
+    | 'Number'
+    | 'List<Number>'
+    | 'CommaDelimitedList'
+    | AWSSpecificParameterType
+    | SSMParameterType
+
+type ThingType = 'number' | 'string' | 'array'
+const samParamArrayTypes = ['List<Number>', 'CommaDelimitedList']
+
+// https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/parameters-section-structure.html#aws-specific-parameter-types
+type AWSSpecificParameterType =
+    | 'AWS::EC2::AvailabilityZone::Name'
+    | 'AWS::EC2::Image::Id'
+    | 'AWS::EC2::KeyPair::KeyName'
+    | 'AWS::EC2::SecurityGroup::GroupName'
+    | 'AWS::EC2::SecurityGroup::Id'
+    | 'AWS::EC2::Subnet::Id'
+    | 'AWS::EC2::Volume::Id'
+    | 'AWS::EC2::VPC::Id'
+    | 'AWS::Route53::HostedZone::Id'
+    | 'List<AWS::EC2::AvailabilityZone::Name>'
+    | 'List<AWS::EC2::Image::Id>'
+    | 'List<AWS::EC2::Instance::Id>'
+    | 'List<AWS::EC2::SecurityGroup::GroupName>'
+    | 'List<AWS::EC2::SecurityGroup::Id>'
+    | 'List<AWS::EC2::Subnet::Id>'
+    | 'List<AWS::EC2::Volume::Id>'
+    | 'List<AWS::EC2::VPC::Id>'
+    | 'List<AWS::Route53::HostedZone::Id>'
+
+// https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/parameters-section-structure.html#aws-ssm-parameter-types
+type SSMParameterType =
+    | 'AWS::SSM::Parameter::Name'
+    | 'AWS::SSM::Parameter::Value<String>'
+    | 'AWS::SSM::Parameter::Value<List<String>>'
+    | 'AWS::SSM::Parameter::Value<CommaDelimitedList>'
+    | 'AWS::SSM::Parameter::Value<AWS::EC2::AvailabilityZone::Name>'
+    | 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
+    | 'AWS::SSM::Parameter::Value<AWS::EC2::KeyPair::KeyName>'
+    | 'AWS::SSM::Parameter::ValueAWS::EC2::SecurityGroup::GroupName<>'
+    | 'AWS::SSM::Parameter::Value<AWS::EC2::SecurityGroup::Id>'
+    | 'AWS::SSM::Parameter::Value<AWS::EC2::Subnet::Id>'
+    | 'AWS::SSM::Parameter::Value<AWS::EC2::Volume::Id>'
+    | 'AWS::SSM::Parameter::Value<AWS::EC2::VPC::Id>'
+    | 'AWS::SSM::Parameter::Value<AWS::Route53::HostedZone::Id>'
+    | 'AWS::SSM::Parameter::Value<List<AWS::EC2::AvailabilityZone::Name>>'
+    | 'AWS::SSM::Parameter::Value<List<AWS::EC2::Image::Id>>'
+    | 'AWS::SSM::Parameter::Value<List<AWS::EC2::KeyPair::KeyName>>'
+    | 'AWS::SSM::Parameter::Value<List<AWS::EC2::SecurityGroup::GroupName>>'
+    | 'AWS::SSM::Parameter::Value<List<AWS::EC2::SecurityGroup::Id>>'
+    | 'AWS::SSM::Parameter::Value<List<AWS::EC2::Subnet::Id>>'
+    | 'AWS::SSM::Parameter::Value<List<AWS::EC2::Volume::Id>>'
+    | 'AWS::SSM::Parameter::Value<List<AWS::EC2::VPC::Id>>'
+    | 'AWS::SSM::Parameter::Value<List<AWS::Route53::HostedZone::Id>>'
+
+export interface Parameter {
+    Type: ParameterType
+    AllowedPattern?: string
+    AllowValues?: string[]
+    ConstraintDescription?: string
+    Default?: any
+    Description?: string
+    MaxLength?: number
+    MaxValue?: number
+    MinLength?: number
+    MinValue?: number
+    NoEcho?: boolean
+}
+
+export interface Template {
+    AWSTemplateFormatVersion?: string
+
+    Transform?: { properties: any } | string
+
+    Parameters?: {
+        [key: string]: Parameter | undefined
+    }
+
+    Globals?: TemplateGlobals
+
+    Resources?: TemplateResources
+}
+
+// Globals section of the template. Provides default values for functions, APIs, HTTP APIs, and SimpleTables.
+// https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-specification-template-anatomy-globals.html#sam-specification-template-anatomy-globals-supported-resources-and-properties
+export interface TemplateGlobals {
+    Function?: FunctionGlobals
+    Api?: ApiGlobals
+    HttpApi?: HttpApiGlobals
+    SimpleTable?: SimpleTableGlobals
+}
+
+type GlobalType = string | number | Record<string, unknown> | string[] | undefined
+
+type FunctionKeys =
+    | 'Handler'
+    | 'Runtime'
+    | 'CodeUri'
+    | 'DeadLetterQueue'
+    | 'Description'
+    | 'MemorySize'
+    | 'Timeout'
+    | 'VpcConfig'
+    | 'Environment'
+    | 'Tags'
+    | 'Tracing'
+    | 'KmsKeyArn'
+    | 'Layers'
+    | 'AutoPublishAlias'
+    | 'DeploymentPreference'
+    | 'PermissionsBoundary'
+    | 'ReservedConcurrentExecutions'
+    | 'EventInvokeConfig'
+const functionKeysSet: Set<string> = new Set([
+    'Handler',
+    'Runtime',
+    'CodeUri',
+    'DeadLetterQueue',
+    'Description',
+    'MemorySize',
+    'Timeout',
+    'VpcConfig',
+    'Environment',
+    'Tags',
+    'Tracing',
+    'KmsKeyArn',
+    'Layers',
+    'AutoPublishAlias',
+    'DeploymentPreference',
+    'PermissionsBoundary',
+    'ReservedConcurrentExecutions',
+    'EventInvokeConfig',
+])
+type FunctionGlobals = {
+    [key in FunctionKeys]?: GlobalType
+}
+
+type ApiKeys =
+    | 'Auth'
+    | 'Name'
+    | 'DefinitionUri'
+    | 'CacheClusterEnabled'
+    | 'CacheClusterSize'
+    | 'Variables'
+    | 'EndpointConfiguration'
+    | 'MethodSettings'
+    | 'BinaryMediaTypes'
+    | 'MinimumCompressionSize'
+    | 'Cors'
+    | 'GatewayResponses'
+    | 'AccessLogSetting'
+    | 'CanarySetting'
+    | 'TracingEnabled'
+    | 'OpenApiVersion'
+    | 'Domain'
+const apiKeysSet: Set<string> = new Set([
+    'Auth',
+    'Name',
+    'DefinitionUri',
+    'CacheClusterEnabled',
+    'CacheClusterSize',
+    'Variables',
+    'EndpointConfiguration',
+    'MethodSettings',
+    'BinaryMediaTypes',
+    'MinimumCompressionSize',
+    'Cors',
+    'GatewayResponses',
+    'AccessLogSetting',
+    'CanarySetting',
+    'TracingEnabled',
+    'OpenApiVersion',
+    'Domain',
+])
+type ApiGlobals = {
+    [key in ApiKeys]?: GlobalType
+}
+
+type HttpApiKeys =
+    | 'Auth'
+    | 'CorsConfiguration'
+    | 'AccessLogSettings'
+    | 'Tags'
+    | 'DefaultRouteSettings'
+    | 'RouteSettings'
+    | 'Domain'
+const HttpApiKeysSet: Set<string> = new Set([
+    'Auth',
+    'CorsConfiguration',
+    'AccessLogSettings',
+    'Tags',
+    'DefaultRouteSettings',
+    'RouteSettings',
+    'Domain',
+])
+type HttpApiGlobals = {
+    [key in HttpApiKeys]?: GlobalType
+}
+
+type SimpleTableKeys = 'SSESpecification'
+const simpleTableKeysSet: Set<string> = new Set(['SSESpecification'])
+type SimpleTableGlobals = {
+    [key in SimpleTableKeys]?: GlobalType
+}
+
+function globalPropForKey(key: string): keyof TemplateGlobals | undefined {
+    if (functionKeysSet.has(key)) {
+        return 'Function'
+    } else if (apiKeysSet.has(key)) {
+        return 'Api'
+    } else if (HttpApiKeysSet.has(key)) {
+        return 'HttpApi'
+    } else if (simpleTableKeysSet.has(key)) {
+        return 'SimpleTable'
+    } else {
+        return undefined
+    }
+}
+
+export interface TemplateResources {
+    [key: string]: Resource | undefined
+}
+
+/** Returns true if the given name or path is a valid CloudFormation or SAM filename. */
+export function isValidFilename(filename: string | vscode.Uri): boolean {
+    filename = typeof filename === 'string' ? filename : filename.fsPath
+    filename = filename.trim()
+    if (!templateFileRegexPattern.test(filename)) {
+        return false
+    }
+    // Note: intentionally _not_ checking `templateFileExcludePattern` here, because while excluding
+    // template files in .aws-sam/ is relevant for the workspace scan, it's irrelevant if such
+    // a file was opened explicitly by the user.
+    return !devfileExcludePattern.test(filename)
+}
+
+export async function load(filename: string, validate: boolean = true): Promise<Template> {
+    if (!(await fs.exists(filename))) {
+        throw new Error(`Template file not found: ${filename}`)
+    }
+
+    const templateAsYaml: string = await filesystemUtilities.readFileAsString(filename)
+    return loadByContents(templateAsYaml, validate)
+}
+
+export async function loadByContents(contents: string, validate: boolean = true): Promise<Template> {
+    const template = yaml.load(contents, {
+        schema: schema as any,
+    }) as Template | undefined
+
+    // XXX: yaml.load() returns `undefined` if given an empty string (i.e. contents='')!
+    if (!template) {
+        return {}
+    }
+
+    if (validate) {
+        validateTemplate(template)
+    }
+    return template
+}
+
+/**
+ * Returns a `Template` if the given file (on disk) or `contents` is a valid CloudFormation
+ * document, or `{ template: undefined, kind: undefined }` if the file is invalid.
+ */
+export async function tryLoad(
+    uri: vscode.Uri,
+    contents?: string
+): Promise<{ template: Template | undefined; kind: 'sam' | 'cfn' | undefined }> {
+    const rv: {
+        template: Template | undefined
+        kind: 'sam' | 'cfn' | undefined
+    } = { template: undefined, kind: undefined }
+    try {
+        if (isUntitledScheme(uri)) {
+            if (!contents) {
+                // this error technically just throw us into the catch so the error message isn't used
+                throw new Error('Contents must be defined for untitled uris')
+            }
+            rv.template = await loadByContents(contents, false)
+        } else {
+            rv.template = await load(normalizeVSCodeUri(uri), false)
+        }
+    } catch (e) {
+        return {
+            template: undefined,
+            kind: undefined,
+        }
+    }
+
+    // Check if the template is a SAM template, using the same heuristic as the cfn-lint team:
+    // https://github.com/aws-cloudformation/aws-cfn-lint-visual-studio-code/blob/629de0bac4f36cfc6534e409a6f6766a2240992f/client/src/yaml-support/yaml-schema.ts#L39-L51
+    if (rv.template?.AWSTemplateFormatVersion || rv.template?.Resources) {
+        rv.kind =
+            typeof rv.template.Transform === 'string' && rv.template.Transform.startsWith('AWS::Serverless')
+                ? 'sam'
+                : 'cfn'
+
+        return rv
+    }
+
+    return {
+        template: undefined,
+        kind: undefined,
+    }
+}
+
+export async function save(template: Template, filename: string): Promise<void> {
+    const templateAsYaml: string = yaml.dump(template)
+
+    await nodefs.writeFile(filename, templateAsYaml, 'utf8')
+}
+
+export function validateTemplate(template: Template): void {
+    if (!template.Resources) {
+        return
+    }
+
+    const lambdaResources = Object.getOwnPropertyNames(template.Resources)
+        .map((key) => template.Resources![key]!)
+        .filter((resource) => resource.Type === SERVERLESS_FUNCTION_TYPE)
+        .map((resource) => resource as Resource)
+
+    if (lambdaResources.length <= 0) {
+        throw new Error('Template does not contain any Lambda resources')
+    }
+
+    for (const lambdaResource of lambdaResources) {
+        validateResource(lambdaResource, template)
+    }
+}
+
+/**
+ * Validates whether or not a property is an expected type.
+ * This takes refs into account but doesn't account for value; just whether or not the type is correct.
+ * @param resource
+ * @param template
+ */
+export function validateResource(resource: Resource, template: Template): void {
+    if (!resource.Type) {
+        throw new Error('Missing or invalid value in Template for key: Type')
+    }
+    if (resource.Properties) {
+        if (resource.Properties.PackageType === lambdaPackageTypeImage) {
+            if (!validatePropertyType(resource.Metadata, 'Dockerfile', template, 'string')) {
+                throw new Error('Missing or invalid value in Template for key: Metadata.Dockerfile')
+            }
+            if (!validatePropertyType(resource.Metadata, 'DockerContext', template, 'string')) {
+                throw new Error('Missing or invalid value in Template for key: Metadata.DockerContext')
+            }
+        } else {
+            if (!validatePropertyType(resource.Properties, 'Handler', template, 'string')) {
+                throw new Error('Missing or invalid value in Template for key: Handler')
+            }
+            if (!resource.Properties.CodeUri) {
+                // Missing codeUri is allowed, (SAM pulls from the handler instead). Set as empty string.
+                resource.Properties.CodeUri = ''
+            } else if (!validatePropertyType(resource.Properties, 'CodeUri', template, 'string')) {
+                throw new Error('Invalid value in Template for key: CodeUri')
+            }
+            if (
+                !!resource.Properties.Runtime &&
+                !validatePropertyType(resource.Properties, 'Runtime', template, 'string')
+            ) {
+                throw new Error('Invalid value in Template for key: Runtime')
+            }
+        }
+
+        if (
+            !!resource.Properties.Timeout &&
+            !validatePropertyType(resource.Properties, 'Timeout', template, 'number')
+        ) {
+            throw new Error('Invalid value in Template for key: Timeout')
+        }
+    }
+}
+
+export async function getResourceFromTemplate(
+    {
+        templatePath,
+        handlerName,
+    }: {
+        templatePath: string
+        handlerName: string
+    },
+    context: { loadTemplate: typeof load } = { loadTemplate: load }
+): Promise<Resource> {
+    const template = await context.loadTemplate(templatePath)
+
+    return getResourceFromTemplateResources({
+        templateResources: template.Resources,
+        handlerName,
+    })
+}
+
+export async function getResourceFromTemplateResources(params: {
+    templateResources?: TemplateResources
+    handlerName: string
+}): Promise<Resource> {
+    const resources = params.templateResources || {}
+
+    const matches = Object.keys(resources)
+        .filter((key) =>
+            matchesHandler({
+                resource: resources[key],
+                handlerName: params.handlerName,
+            })
+        )
+        .map((key) => resources[key]!)
+
+    if (matches.length < 1) {
+        throw new Error(`Could not find a SAM resource for handler ${params.handlerName}`)
+    }
+
+    if (matches.length > 1) {
+        // TODO: Is this a valid scenario?
+        throw new Error(`Found more than one SAM resource for handler ${params.handlerName}`)
+    }
+
+    return matches[0]
+}
+
+function matchesHandler({ resource, handlerName }: { resource?: Resource; handlerName: string }) {
+    return (
+        resource &&
+        resource.Type === SERVERLESS_FUNCTION_TYPE &&
+        isZipLambdaResource(resource.Properties) &&
+        // TODO: `resource.Properties.Handler` is relative to `CodeUri`, but
+        //       `handlerName` is relative to the directory containing the source
+        //       file. To fix, update lambda handler candidate searches for
+        //       interpreted languages to return a handler name relative to the
+        //       `CodeUri`, rather than to the directory containing the source file.
+        resource.Properties.Handler === handlerName
+    )
+}
+
+/**
+ * Parameter/Ref helper functions
+ */
+
+/**
+ * Validates whether or not a property is a valid ref.
+ * @param property Property to validate
+ */
+function isRef(property: unknown): boolean {
+    return typeof property === 'object' && Object.keys(property!).length === 1 && Object.keys(property!).includes('Ref')
+}
+
+/**
+ * Gets the string value for a property in a template.
+ * If the value is a Ref to a parameter, returns the default value of the ref; this may be undefined.
+ * If the value is not defined in the `targetObj` (`undefined` Ref counts as a definition), will attempt to find a value in Globals.
+ * Returns undefined if the value is not found in `targetObj` or `Globals`.
+ * @param targetObj Object containing a key to check
+ * @param key Key to look up in `targetObj`. If not present in `targetObj`, will fall back to a value in `Globals`.
+ * @param template Full template object. Required for `Ref` and `Globals` lookup.
+ */
+export function getStringForProperty(
+    targetObj: { [key: string]: GlobalType } | undefined,
+    key: string,
+    template: Template
+): string | undefined {
+    return getThingForProperty(targetObj, key, template, 'string') as string | undefined
+}
+
+/**
+ * Gets the numeric value for a property in a template.
+ * If the value is a Ref to a parameter, returns the default value of the ref; this may be undefined.
+ * If the value is not defined in the `targetObj` (`undefined` Ref counts as a definition), will attempt to find a value in Globals.
+ * Returns undefined if the value is not found in `targetObj` or `Globals`.
+ * @param targetObj Object containing a key to check
+ * @param key Key to look up in `targetObj`. If not present in `targetObj`, will fall back to a value in `Globals`.
+ * @param template Full template object. Required for `Ref` and `Globals` lookup.
+ */
+export function getNumberForProperty(
+    targetObj: { [key: string]: string | number | Record<string, unknown> | undefined } | undefined,
+    key: string,
+    template: Template
+): number | undefined {
+    return getThingForProperty(targetObj, key, template, 'number') as number | undefined
+}
+
+/**
+ * Gets the array value for a property in a template.
+ * As per [the SAM documentation](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/parameters-section-structure.html#parameters-section-structure-properties-type) ,
+ *    this will **always** be a string array.
+ *
+ * TODO: [lists in Globals are **additive** with other fields](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-specification-template-anatomy-globals.html#sam-specification-template-anatomy-globals-overrideable-lists)
+ *
+ * If the value is a Ref to a parameter, returns the default value of the ref; this may be undefined.
+ * If the value is not defined in the `targetObj` (`undefined` Ref counts as a definition), will attempt to find a value in Globals.
+ * Returns undefined if the value is not found in `targetObj` or `Globals`.
+ * @param targetObj Object containing a key to check
+ * @param key Key to look up in `targetObj`. If not present in `targetObj`, will fall back to a value in `Globals`.
+ * @param template Full template object. Required for `Ref` and `Globals` lookup.
+ */
+export function getArrayForProperty(
+    targetObj: { [key: string]: string | number | Record<string, unknown> | undefined } | undefined,
+    key: string,
+    template: Template
+): string[] | undefined {
+    return getThingForProperty(targetObj, key, template, 'array') as string[] | undefined
+}
+
+/**
+ * Returns the "thing" that represents the property within `targetObj` or `Globals`:
+ * * string if a string is requested and (the property is a string or if the property is a ref that is not a Number and has a default value)
+ * * number if a number is requested and (the property is a number or if the property is a ref that is Number and has a default value)
+ * * undefined in all other cases
+ *
+ * Ultimately it is up to the caller to ensure the type matches but this should do a more-than-reasonable job.
+ * @param targetObj Object containing a key to check
+ * @param key Key to look up in `targetObj`. If not present in `targetObj`, will fall back to a value in `Globals`.
+ * @param template Full template object. Required for `Ref` and `Globals` lookup.
+ * @param type Type to validate the property's type against
+ * @param globalLookup Whether or not this is currently looking at `Globals` fields. Internal for recursion prevention.
+ */
+function getThingForProperty(
+    targetObj: { [key: string]: GlobalType } | undefined,
+    key: string,
+    template: Template,
+    type: ThingType,
+    globalLookup?: boolean
+): string | number | string[] | undefined {
+    if (!targetObj) {
+        return undefined
+    }
+    const property: unknown = targetObj[key]
+    if (validatePropertyType(targetObj, key, template, type)) {
+        if (typeof property !== 'object' && typeof property === type) {
+            return property as 'string' | 'number'
+        } else if (Array.isArray(property)) {
+            return property as string[]
+        } else if (isRef(property)) {
+            try {
+                const forcedProperty = property as Ref
+                return getReffedThing(forcedProperty, template, type)
+            } catch (err) {
+                getLogger().debug(err as Error)
+            }
+        }
+    }
+
+    // only look if we're not already looking at globals
+    if (!globalLookup) {
+        const globalProp = globalPropForKey(key)
+
+        if (globalProp && template.Globals && template.Globals[globalProp]) {
+            return getThingForProperty(template.Globals![globalProp], key, template, type, true)
+        }
+    }
+
+    return undefined
+}
+
+/**
+ * Returns whether or not a property or its underlying ref matches the specified type
+ * Checks `targetObj` and `Globals` in that priority order. Will fail if `targetObj` is not valid but `Globals` is.
+ * Does not validate a default value for a template parameter; just checks the value's type
+ * @param targetObj Object containing a key to check
+ * @param key Key to look up in `targetObj`. If not present in `targetObj`, will fall back to a value in `Globals`.
+ * @param template Full template object. Required for `Ref` and `Globals` lookup.
+ * @param type Type to validate the property's type against
+ * @param globalLookup Whether or not this is currently looking at `Globals` fields. Internal for recursion prevention.
+ */
+function validatePropertyType(
+    targetObj: { [key: string]: GlobalType } | undefined,
+    key: string,
+    template: Template,
+    type: ThingType,
+    globalLookup?: boolean
+): boolean {
+    if (!targetObj) {
+        return false
+    }
+    const property: unknown = targetObj[key]
+    if (typeof property === type || (type === 'array' && Array.isArray(property))) {
+        return true
+    } else if (isRef(property)) {
+        // property has a Ref, force it to abide by that shape
+        const forcedProperty = property as Ref
+        const param = getReffedParam(forcedProperty, template)
+        switch (type) {
+            case 'number':
+                return param.Type === 'Number'
+            // TODO: gate this on "string" type specifically?
+            case 'string':
+                return param.Type !== 'Number'
+            case 'array':
+                return samParamArrayTypes.includes(param.Type)
+        }
+    }
+
+    // only look if we're not already looking at globals
+    if (!globalLookup) {
+        const globalProp = globalPropForKey(key)
+
+        if (globalProp && template.Globals && template.Globals[globalProp]) {
+            return validatePropertyType(template.Globals![globalProp], key, template, type, true)
+        }
+    }
+
+    return false
+}
+
+/**
+ * Gets a value (string or number) from a Ref.
+ *
+ * If `thingType == number`...
+ * - it is an error if the resolved value is not a number.
+ * - returns undefined if the Ref does not have a default value but is
+ *   a number.
+ *
+ * @param ref Ref to pull a value from
+ * @param template Template to parse through
+ * @param thingType Type to validate against
+ */
+function getReffedThing(ref: Ref, template: Template, thingType: ThingType): number | string | string[] | undefined {
+    const param = getReffedParam(ref, template)
+    // every other type, including List<Number>, is formatted as a string.
+    if (
+        (thingType === 'number' && param.Type === 'Number') ||
+        (thingType === 'string' && param.Type !== 'Number') ||
+        (thingType === 'array' && samParamArrayTypes.includes(param.Type))
+    ) {
+        if (param.Default && (thingType === 'array' ? 'string' : thingType) !== typeof param.Default) {
+            throw new Error(`Default value for Parameter "${ref.Ref}" is not a ${thingType}`)
+        }
+
+        // attempt to convert to str array if array
+        // returns undefined if no default value is present
+        return param.Default && thingType === 'array' ? param.Default.toString().split(',') : param.Default
+    }
+
+    throw new Error(`Parameter ${ref.Ref} is not a ${thingType}`)
+}
+
+/**
+ * Given a Ref, pulls the CFN Parameter that the Ref is reffing.
+ * Throws an error if reffed param isn't found.
+ * @param ref Ref containing a reference to a parameter
+ * @param template Template to parse through
+ */
+function getReffedParam(ref: Ref, template: Template): Parameter {
+    const refParam = ref.Ref
+    const params = template.Parameters
+
+    if (params && Object.keys(params).includes(refParam)) {
+        return params[refParam]!
+    }
+
+    throw new Error(`Parameter not found in template: ${refParam}`)
+}
+
+/**
+ * Resolves a value against a list of overrides. Resolution occurs in this order:
+ * * property is not an object = return raw val (possibly undefined)
+ * * property is a Ref object
+ *   * ...with an override = return overridden val
+ *   * ...without an override = return default val (possibly undefined)
+ * * property is a generic object = return undefined
+ * @param property Property to evaluate
+ * @param template Template to parse through
+ * @param overrides Object containing override values
+ */
+export function resolvePropertyWithOverrides(
+    property: unknown,
+    template: Template,
+    overrides: {
+        [k: string]: string | number
+    } = {}
+): string | number | undefined {
+    if (typeof property !== 'object') {
+        return property as string | number | undefined
+    }
+    if (isRef(property)) {
+        try {
+            // property has a Ref, force it to abide by that shape
+            const forcedProperty = property as Ref
+            const refParam = forcedProperty.Ref
+            const param = getReffedParam(forcedProperty, template)
+            if (param) {
+                // check overrides first--those take precedent
+                if (Object.keys(overrides).includes(refParam)) {
+                    return param.Type === 'Number' ? (overrides[refParam] as number) : (overrides[refParam] as string)
+                }
+
+                // return default val. This can be undefined.
+                return param.Default
+                    ? param.Type === 'Number'
+                        ? (param.Default as number)
+                        : (param.Default as string)
+                    : undefined
+            }
+        } catch (err) {
+            getLogger().debug(err as Error)
+        }
+    }
+
+    return undefined
+}
+
+/**
+ * Removes characters disallowed in CFN/SAM logical resource ids.
+ *
+ * Example: "/a/b/c/foo-Bar!_baz{9)=+" => "abcfooBarbaz9"
+ *
+ * Reference: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/resources-section-structure.html
+ * > The logical ID must be alphanumeric (A-Za-z0-9) and unique within the template
+ *
+ * @param filename Filename
+ * @returns  Resource id derived from the input.
+ */
+export function makeResourceId(s: string) {
+    return s.replace(/[^A-Za-z0-9]/g, '')
+}
+
+/**
+ * Creates a starter YAML template file.
+ * @param isSam: Create a SAM template instead of a CFN template
+ */
+export async function createStarterTemplateFile(isSam?: boolean): Promise<void> {
+    const content = createStarterTemplateYaml(isSam)
+    const wsFolder = vscode.workspace.workspaceFolders
+    const loc = await vscode.window.showSaveDialog({
+        filters: { YAML: ['yaml'] },
+        defaultUri: wsFolder && wsFolder[0] ? wsFolder[0].uri : undefined,
+    })
+    if (loc) {
+        await nodefs.writeFile(loc.fsPath, content)
+        await vscode.commands.executeCommand('vscode.open', loc)
+    }
+}
+
+/**
+ * Creates a boilerplate CFN or SAM template that is complete enough to be picked up for JSON schema assignment
+ * @param isSam Create a SAM or CFN template
+ */
+function createStarterTemplateYaml(isSam?: boolean): string {
+    return `AWSTemplateFormatVersion: '2010-09-09'
+${isSam ? 'Transform: AWS::Serverless-2016-10-31\n' : ''}
+Description: <your stack description here>
+# Available top-level fields are listed in code completion
+# Add Resources Here: uncomment the following lines
+# Resources:
+#   <resource name here>:
+#     Type: # resource type here - available resources are listed in code completion
+#     # <add resource-specific properties underneath this entry - available properties are listed in code completion
+    }>
+#     Properties:
+`
+}
diff --git a/src/shared/cloudformation/templateSymbolResolver.ts b/packages/core/src/shared/cloudformation/templateSymbolResolver.ts
similarity index 88%
rename from src/shared/cloudformation/templateSymbolResolver.ts
rename to packages/core/src/shared/cloudformation/templateSymbolResolver.ts
index 00a8c4dda40..98706f2e02b 100644
--- a/src/shared/cloudformation/templateSymbolResolver.ts
+++ b/packages/core/src/shared/cloudformation/templateSymbolResolver.ts
@@ -1,11 +1,11 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import { load } from 'js-yaml'
 import * as vscode from 'vscode'
-import { CloudFormation } from './cloudformation'
+import * as CloudFormation from './cloudformation'
 import { waitUntil } from '../utilities/timeoutUtils'
 
 /**
@@ -41,10 +41,10 @@ export class TemplateSymbolResolver {
         const allSymbols = await this.symbolProvider.getSymbols(this.document, waitForSymbols)
         // Only want top level (TODO: is this actually true?)
         const funSymbols = (
-            allSymbols.find(o => o.name === 'Resources' && o.kind === vscode.SymbolKind.Module)?.children ?? []
-        ).filter(r => this.isCfnType(CloudFormation.SERVERLESS_FUNCTION_TYPE, r))
+            allSymbols.find((o) => o.name === 'Resources' && o.kind === vscode.SymbolKind.Module)?.children ?? []
+        ).filter((r) => this.isCfnType(CloudFormation.SERVERLESS_FUNCTION_TYPE, r))
         if (kind === 'function') {
-            return funSymbols.map(r => ({ name: r.name, range: r.range, kind: kind }))
+            return funSymbols.map((r) => ({ name: r.name, range: r.range, kind: kind }))
         }
         // Api symbols:
         //
@@ -52,11 +52,11 @@ export class TemplateSymbolResolver {
         // track of the associated resource (Function) name.
         const apiSymbols: TemplateFunctionResource[] = []
         for (const funSymbol of funSymbols) {
-            const found = this.findDescendants([funSymbol], 'Events', vscode.SymbolKind.Module).filter(r =>
+            const found = this.findDescendants([funSymbol], 'Events', vscode.SymbolKind.Module).filter((r) =>
                 this.isCfnType('Api', r)
             )
             apiSymbols.push(
-                ...found.map(o => ({
+                ...found.map((o) => ({
                     // We want the resource name of the Function node (not Api,
                     // that node is always named "Events".)
                     name: funSymbol.name,
@@ -76,7 +76,7 @@ export class TemplateSymbolResolver {
         name: string,
         kind: vscode.SymbolKind
     ): vscode.DocumentSymbol[] {
-        const found = symbols.filter(v => v.name === name && v.kind === kind)
+        const found = symbols.filter((v) => v.name === name && v.kind === kind)
         for (const s of symbols) {
             found.push(...this.findDescendants(s.children, name, kind))
         }
diff --git a/src/shared/codelens/codeLensUtils.ts b/packages/core/src/shared/codelens/codeLensUtils.ts
similarity index 95%
rename from src/shared/codelens/codeLensUtils.ts
rename to packages/core/src/shared/codelens/codeLensUtils.ts
index c6e8e3e760f..f39391dd6de 100644
--- a/src/shared/codelens/codeLensUtils.ts
+++ b/packages/core/src/shared/codelens/codeLensUtils.ts
@@ -1,14 +1,14 @@
 /*!
- * Copyright 2018-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as vscode from 'vscode'
 import { RuntimeFamily } from '../../lambda/models/samLambdaRuntime'
-import { CloudFormation } from '../cloudformation/cloudformation'
+import * as CloudFormation from '../cloudformation/cloudformation'
 import { getResourcesForHandler } from '../fs/templateRegistry'
 import { LambdaHandlerCandidate } from '../lambdaHandlerSearch'
-import { getLogger } from '../logger'
+import { getLogger } from '../logger/logger'
 import { API_TARGET_TYPE, CODE_TARGET_TYPE, TEMPLATE_TARGET_TYPE } from '../sam/debugger/awsSamDebugConfiguration'
 import {
     addSamDebugConfiguration,
@@ -25,6 +25,7 @@ import * as goCodelens from './goCodeLensProvider'
 import { VSCODE_EXTENSION_ID } from '../extensions'
 import { getIdeProperties } from '../extensionUtilities'
 import { SamCliSettings } from '../sam/cli/samCliSettings'
+import globals from '../extensionGlobals'
 
 export type Language = 'python' | 'javascript' | 'csharp' | 'go' | 'java' | 'typescript'
 
@@ -59,7 +60,8 @@ export async function makeCodeLenses({
                   )
 
         try {
-            const associatedResources = getResourcesForHandler(handler.filename, handler.handlerName)
+            const registry = await globals.templateRegistry
+            const associatedResources = getResourcesForHandler(handler.filename, handler.handlerName, registry.items)
             const templateConfigs: AddSamDebugConfigurationInput[] = []
 
             if (associatedResources.length > 0) {
@@ -148,7 +150,7 @@ export async function invokeCodeLensCommandPalette(
 ): Promise<void> {
     const labelRenderRange = 200
     const handlers: (vscode.QuickPickItem & { lens?: vscode.CodeLens })[] = lenses
-        .filter(lens => {
+        .filter((lens) => {
             // remove codelenses that go to the invoker UI
             // maybe move this into the workflow at some point (drop down to one)
             return (
@@ -159,7 +161,7 @@ export async function invokeCodeLensCommandPalette(
                 lens.command.arguments![2] !== true
             )
         })
-        .map(lens => {
+        .map((lens) => {
             return {
                 // lens is currently pulling the entire function, not just the declaration
                 label: document.getText(
@@ -228,10 +230,10 @@ export async function pickAddSamDebugConfiguration(
 
     const templateItemsMap = new Map<string, AddSamDebugConfigurationInput>()
     const templateItems: vscode.QuickPickItem[] = []
-    templateConfigs.forEach(templateConfig => {
-        const label = `${getWorkspaceRelativePath(templateConfig.rootUri.fsPath) ?? templateConfig.rootUri.fsPath}:${
-            templateConfig.resourceName
-        }`
+    for (const templateConfig of templateConfigs) {
+        const label = `${
+            getWorkspaceRelativePath(templateConfig.rootUri.fsPath)?.relativePath ?? templateConfig.rootUri.fsPath
+        }:${templateConfig.resourceName}`
 
         if (templateConfig.apiEvent) {
             const apiLabel = `${label} (API Event: ${templateConfig.apiEvent.name})`
@@ -244,7 +246,7 @@ export async function pickAddSamDebugConfiguration(
             templateItems.push({ label: label })
             templateItemsMap.set(label, templateConfig)
         }
-    })
+    }
 
     const noTemplate = localize('AWS.pickDebugConfig.noTemplate', 'No Template')
     const picker = createQuickPick<vscode.QuickPickItem>({
@@ -315,7 +317,7 @@ export async function makePythonCodeLensProvider(configuration: SamCliSettings):
                 return []
             }
             // Try to activate the Python Extension before requesting symbols from a python file
-            activateExtension(VSCODE_EXTENSION_ID.python)
+            await activateExtension(VSCODE_EXTENSION_ID.python)
             if (token.isCancellationRequested) {
                 return []
             }
@@ -346,7 +348,7 @@ export async function makeCSharpCodeLensProvider(configuration: SamCliSettings):
                 document,
                 handlers,
                 token,
-                runtimeFamily: RuntimeFamily.DotNetCore,
+                runtimeFamily: RuntimeFamily.DotNet,
             })
         },
     }
diff --git a/src/shared/codelens/csharpCodeLensProvider.ts b/packages/core/src/shared/codelens/csharpCodeLensProvider.ts
similarity index 90%
rename from src/shared/codelens/csharpCodeLensProvider.ts
rename to packages/core/src/shared/codelens/csharpCodeLensProvider.ts
index 940c2d81383..a6481165b44 100644
--- a/src/shared/codelens/csharpCodeLensProvider.ts
+++ b/packages/core/src/shared/codelens/csharpCodeLensProvider.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -47,7 +47,7 @@ export async function getLambdaHandlerCandidates(document: vscode.TextDocument):
         )) || []
 
     return getLambdaHandlerComponents(document, symbols, assemblyName).map<LambdaHandlerCandidate>(
-        lambdaHandlerComponents => {
+        (lambdaHandlerComponents) => {
             const handlerName = generateDotNetLambdaHandler(lambdaHandlerComponents)
 
             return {
@@ -67,7 +67,7 @@ export function getLambdaHandlerComponents(
 ): DotNetLambdaHandlerComponents[] {
     return (
         symbols
-            .filter(symbol => symbol.kind === vscode.SymbolKind.Namespace)
+            .filter((symbol) => symbol.kind === vscode.SymbolKind.Namespace)
             // Find relevant classes within the namespace
             .reduce<
                 {
@@ -77,9 +77,9 @@ export function getLambdaHandlerComponents(
             >((accumulator, namespaceSymbol: vscode.DocumentSymbol) => {
                 accumulator.push(
                     ...namespaceSymbol.children
-                        .filter(namespaceChildSymbol => namespaceChildSymbol.kind === vscode.SymbolKind.Class)
-                        .filter(classSymbol => isPublicClassSymbol(document, classSymbol))
-                        .map(classSymbol => {
+                        .filter((namespaceChildSymbol) => namespaceChildSymbol.kind === vscode.SymbolKind.Class)
+                        .filter((classSymbol) => isPublicClassSymbol(document, classSymbol))
+                        .map((classSymbol) => {
                             return {
                                 namespace: namespaceSymbol,
                                 class: classSymbol,
@@ -93,9 +93,9 @@ export function getLambdaHandlerComponents(
             .reduce<DotNetLambdaHandlerComponents[]>((accumulator, lambdaHandlerComponents) => {
                 accumulator.push(
                     ...lambdaHandlerComponents.class.children
-                        .filter(classChildSymbol => classChildSymbol.kind === vscode.SymbolKind.Method)
-                        .filter(methodSymbol => isValidLambdaHandler(document, methodSymbol))
-                        .map(methodSymbol => {
+                        .filter((classChildSymbol) => classChildSymbol.kind === vscode.SymbolKind.Method)
+                        .filter((methodSymbol) => isValidLambdaHandler(document, methodSymbol))
+                        .map((methodSymbol) => {
                             return {
                                 assembly,
                                 namespace: lambdaHandlerComponents.namespace.name,
@@ -169,7 +169,7 @@ export function isValidMethodSignature(symbol: vscode.DocumentSymbol): boolean {
         // remove generics from parameter string so we can do a predictable split on comma
         const strippedStr = stripGenericsFromParams(parametersArr[0])
         const individualParams = strippedStr.split(',')
-        if (individualParams.length === 1 || individualParams[1].valueOf().trimLeft().startsWith(lambdaContextType)) {
+        if (individualParams.length === 1 || individualParams[1].valueOf().trimStart().startsWith(lambdaContextType)) {
             return true
         }
     }
diff --git a/src/shared/codelens/goCodeLensProvider.ts b/packages/core/src/shared/codelens/goCodeLensProvider.ts
similarity index 95%
rename from src/shared/codelens/goCodeLensProvider.ts
rename to packages/core/src/shared/codelens/goCodeLensProvider.ts
index dbca5b6780e..3d3bf1c1942 100644
--- a/src/shared/codelens/goCodeLensProvider.ts
+++ b/packages/core/src/shared/codelens/goCodeLensProvider.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -61,8 +61,8 @@ export async function getLambdaHandlerCandidates(document: vscode.TextDocument):
         )) ?? []
 
     return symbols
-        .filter(symbol => isValidFuncSignature(document, symbol))
-        .map<LambdaHandlerCandidate>(symbol => {
+        .filter((symbol) => isValidFuncSignature(document, symbol))
+        .map<LambdaHandlerCandidate>((symbol) => {
             return {
                 filename,
                 handlerName: basename(dirname(filename)),
@@ -86,7 +86,7 @@ export function isValidFuncSignature(document: vscode.TextDocument, symbol: vsco
     // Documentation for valid lambda handler: https://docs.aws.amazon.com/lambda/latest/dg/golang-handler.html
     // The LSP doesn't expose any low-level type-checking functionality unfortunately. If we want to perform
     // type-checking on our lambdas, we need to write the code for that ourselves using 'executeTypeDefinitionProvider'.
-    if (symbol.kind === vscode.SymbolKind.Function && symbol.range.start.character == 0) {
+    if (symbol.kind === vscode.SymbolKind.Function && symbol.range.start.character === 0) {
         // vscode details does not include the return type in the signature :(
         // otherwise we would just use symbol.details instead of parsing it ourselves
         const funcWithBody: string = document.getText(symbol.range)
@@ -126,6 +126,7 @@ function parseTypes(params: string): string[] {
     const paramParts = params.split(',')
 
     // Names of parameters must either be all present or all absent: https://golang.org/ref/spec#Function_types
+    // eslint-disable-next-line unicorn/no-array-for-each
     paramParts.forEach((element: string, i: number) => {
         const parts: string[] = element.trim().split(/\s+/)
         const type: string = parts.length > 1 ? parts[1].trim() : parts[0].trim()
diff --git a/src/shared/codelens/javaCodeLensProvider.ts b/packages/core/src/shared/codelens/javaCodeLensProvider.ts
similarity index 92%
rename from src/shared/codelens/javaCodeLensProvider.ts
rename to packages/core/src/shared/codelens/javaCodeLensProvider.ts
index 0c9243872a9..58eda7fc4b2 100644
--- a/src/shared/codelens/javaCodeLensProvider.ts
+++ b/packages/core/src/shared/codelens/javaCodeLensProvider.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -40,7 +40,7 @@ export async function getLambdaHandlerCandidates(document: vscode.TextDocument):
     const symbols: vscode.DocumentSymbol[] =
         (await vscode.commands.executeCommand('vscode.executeDocumentSymbolProvider', document.uri)) || []
 
-    return getLambdaHandlerComponents(document, symbols).map<LambdaHandlerCandidate>(lambdaHandlerComponents => {
+    return getLambdaHandlerComponents(document, symbols).map<LambdaHandlerCandidate>((lambdaHandlerComponents) => {
         const handlerName = generateJavaLambdaHandler(lambdaHandlerComponents)
 
         return {
@@ -56,7 +56,7 @@ export function getLambdaHandlerComponents(
     document: vscode.TextDocument,
     symbols: vscode.DocumentSymbol[]
 ): JavaLambdaHandlerComponents[] {
-    const packageSymbols = symbols.filter(symbol => symbol.kind === vscode.SymbolKind.Package)
+    const packageSymbols = symbols.filter((symbol) => symbol.kind === vscode.SymbolKind.Package)
     if (packageSymbols.length !== 1) {
         return []
     }
@@ -64,15 +64,15 @@ export function getLambdaHandlerComponents(
 
     return (
         symbols
-            .filter(symbol => symbol.kind === vscode.SymbolKind.Class)
-            .filter(classSymbol => isValidClassSymbol(document, classSymbol))
+            .filter((symbol) => symbol.kind === vscode.SymbolKind.Class)
+            .filter((classSymbol) => isValidClassSymbol(document, classSymbol))
             // Find relevant methods within each class
             .reduce<JavaLambdaHandlerComponents[]>((accumulator, lambdaHandlerComponent) => {
                 accumulator.push(
                     ...lambdaHandlerComponent.children
-                        .filter(classChildSymbol => classChildSymbol.kind === vscode.SymbolKind.Method)
-                        .filter(methodSymbol => isValidLambdaHandler(document, methodSymbol))
-                        .map(methodSymbol => {
+                        .filter((classChildSymbol) => classChildSymbol.kind === vscode.SymbolKind.Method)
+                        .filter((methodSymbol) => isValidLambdaHandler(document, methodSymbol))
+                        .map((methodSymbol) => {
                             return {
                                 package: packageName,
                                 class: document.getText(lambdaHandlerComponent.selectionRange),
@@ -166,7 +166,7 @@ export function isValidMethodSignature(symbol: vscode.DocumentSymbol): boolean {
 function lastParamIsContext(paramArr: string[]): boolean {
     // TODO: handle different kinds of imported context objects in case user is importing a non-Lambda context
     const lambdaContextType = /[\.\b]{0,1}Context\b/
-    return lambdaContextType.test(paramArr[paramArr.length - 1].valueOf().trimLeft())
+    return lambdaContextType.test(paramArr[paramArr.length - 1].valueOf().trimStart())
 }
 
 function firstTwoParamsAreStreams(paramArr: string[]): boolean {
diff --git a/src/shared/codelens/pythonCodeLensProvider.ts b/packages/core/src/shared/codelens/pythonCodeLensProvider.ts
similarity index 94%
rename from src/shared/codelens/pythonCodeLensProvider.ts
rename to packages/core/src/shared/codelens/pythonCodeLensProvider.ts
index 0cfaec630af..f9466189fc8 100644
--- a/src/shared/codelens/pythonCodeLensProvider.ts
+++ b/packages/core/src/shared/codelens/pythonCodeLensProvider.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -33,7 +33,7 @@ export async function getLambdaHandlerCandidates(uri: vscode.Uri): Promise<Lambd
         (await vscode.commands.executeCommand<vscode.DocumentSymbol[]>('vscode.executeDocumentSymbolProvider', uri)) ??
         []
 
-    return symbols.filter(isTopLevelFunction).map<LambdaHandlerCandidate>(symbol => {
+    return symbols.filter(isTopLevelFunction).map<LambdaHandlerCandidate>((symbol) => {
         return {
             filename,
             handlerName: `${handlerPath}.${symbol.name}`,
diff --git a/src/shared/codelens/resourceCodeLensProvider.ts b/packages/core/src/shared/codelens/resourceCodeLensProvider.ts
similarity index 95%
rename from src/shared/codelens/resourceCodeLensProvider.ts
rename to packages/core/src/shared/codelens/resourceCodeLensProvider.ts
index f305e644040..648a3c9c5f2 100644
--- a/src/shared/codelens/resourceCodeLensProvider.ts
+++ b/packages/core/src/shared/codelens/resourceCodeLensProvider.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/src/shared/codelens/samTemplateCodeLensProvider.ts b/packages/core/src/shared/codelens/samTemplateCodeLensProvider.ts
similarity index 78%
rename from src/shared/codelens/samTemplateCodeLensProvider.ts
rename to packages/core/src/shared/codelens/samTemplateCodeLensProvider.ts
index 7d9d84946e4..d4074ecf489 100644
--- a/src/shared/codelens/samTemplateCodeLensProvider.ts
+++ b/packages/core/src/shared/codelens/samTemplateCodeLensProvider.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as _ from 'lodash'
+import _ from 'lodash'
 import * as vscode from 'vscode'
 import { TemplateFunctionResource, TemplateSymbolResolver } from '../cloudformation/templateSymbolResolver'
 import { getConfigsMappedToTemplates, LaunchConfiguration } from '../debug/launchConfiguration'
@@ -11,6 +11,7 @@ import { getIdeProperties } from '../extensionUtilities'
 import { TEMPLATE_TARGET_TYPE, API_TARGET_TYPE } from '../sam/debugger/awsSamDebugConfiguration'
 import { AddSamDebugConfigurationInput } from '../sam/debugger/commands/addSamDebugConfiguration'
 import { localize } from '../utilities/vsCodeUtils'
+import { SamCliSettings } from '../sam/cli/samCliSettings'
 
 /**
  * Provides "Add Debug Configuration" CodeLenses to SAM template.yaml files,
@@ -24,6 +25,10 @@ export class SamTemplateCodeLensProvider implements vscode.CodeLensProvider {
         launchConfig = new LaunchConfiguration(document.uri),
         waitForSymbols: boolean = false
     ): Promise<vscode.CodeLens[]> {
+        const config = SamCliSettings.instance
+        if (!config.get('enableCodeLenses', false)) {
+            return []
+        }
         const apiResources = await symbolResolver.getResourcesOfKind('api', waitForSymbols)
         const funResources = await symbolResolver.getResourcesOfKind('function', waitForSymbols)
         if (_(funResources).isEmpty() && _(apiResources).isEmpty()) {
@@ -31,24 +36,24 @@ export class SamTemplateCodeLensProvider implements vscode.CodeLensProvider {
         }
 
         // User already has launch configs for:
-        const mappedApiConfigs = Array.from(getConfigsMappedToTemplates(launchConfig, 'api'))
-        const mappedFunConfigs = Array.from(getConfigsMappedToTemplates(launchConfig, 'template'))
+        const mappedApiConfigs = Array.from(await getConfigsMappedToTemplates(launchConfig, 'api'))
+        const mappedFunConfigs = Array.from(await getConfigsMappedToTemplates(launchConfig, 'template'))
 
         const unmappedApis = apiResources.filter(
-            r =>
+            (r) =>
                 undefined ===
                 mappedApiConfigs.find(
-                    o => r.name === (o.invokeTarget as any).logicalId && o.invokeTarget.target === 'api'
+                    (o) => r.name === (o.invokeTarget as any).logicalId && o.invokeTarget.target === 'api'
                 )
         )
         const unmappedFuns = funResources.filter(
-            r =>
+            (r) =>
                 undefined ===
                 mappedFunConfigs.find(
-                    o => r.name === (o.invokeTarget as any).logicalId && o.invokeTarget.target === 'template'
+                    (o) => r.name === (o.invokeTarget as any).logicalId && o.invokeTarget.target === 'template'
                 )
         )
-        const codelensInfo = [...unmappedApis, ...unmappedFuns].map(r => this.createCodeLens(r, document.uri))
+        const codelensInfo = [...unmappedApis, ...unmappedFuns].map((r) => this.createCodeLens(r, document.uri))
         return codelensInfo
     }
 
diff --git a/src/shared/codelens/typescriptCodeLensProvider.ts b/packages/core/src/shared/codelens/typescriptCodeLensProvider.ts
similarity index 95%
rename from src/shared/codelens/typescriptCodeLensProvider.ts
rename to packages/core/src/shared/codelens/typescriptCodeLensProvider.ts
index 9a9489a15ea..9cdfe96318c 100644
--- a/src/shared/codelens/typescriptCodeLensProvider.ts
+++ b/packages/core/src/shared/codelens/typescriptCodeLensProvider.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -57,7 +57,7 @@ async function finalizeTsHandlers(
 ): Promise<LambdaHandlerCandidate[]> {
     const relativePath = path.relative(path.dirname(rootUri.fsPath), path.dirname(fileUri.fsPath))
 
-    return handlers.map(handler => {
+    return handlers.map((handler) => {
         return {
             filename: handler.filename,
             handlerName: normalizeSeparator(path.join(relativePath, handler.handlerName)),
diff --git a/packages/core/src/shared/constants.ts b/packages/core/src/shared/constants.ts
new file mode 100644
index 00000000000..95d2aaac309
--- /dev/null
+++ b/packages/core/src/shared/constants.ts
@@ -0,0 +1,207 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { manageAccessGuideURL } from '../amazonq/webview/ui/texts/constants'
+
+export const profileSettingKey = 'profile'
+export const productName: string = 'aws-toolkit-vscode'
+
+export const hostedFilesBaseUrl: string = 'https://d3rrggjwfhwld2.cloudfront.net/'
+export const endpointsFileUrl: string = 'https://idetoolkits.amazonwebservices.com/endpoints.json'
+export const aboutCredentialsFileUrl: string =
+    'https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html'
+export const samInstallUrl = vscode.Uri.parse(
+    'https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/install-sam-cli.html'
+)
+export const samUpgradeUrl = vscode.Uri.parse(
+    'https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/manage-sam-cli-versions.html#manage-sam-cli-versions-upgrade'
+)
+export const samTroubleshootingUrl = vscode.Uri.parse(
+    'https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-cli-troubleshooting.html'
+)
+export const githubUrl: string = 'https://github.com/aws/aws-toolkit-vscode'
+export const githubCreateIssueUrl = `${githubUrl}/issues/new/choose`
+
+export const documentationUrl = {
+    cloud9: vscode.Uri.parse('https://docs.aws.amazon.com/cloud9/latest/user-guide/toolkit-welcome.html'),
+    toolkit: vscode.Uri.parse('https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/welcome.html'),
+} as const
+
+/**
+ * General help page to help users understand the different ways of connecting to AWS (AWS ID, IAM credentials, SSO).
+ *
+ * - alternative?: codecatalyst/latest/userguide/sign-up-create-resources.html
+ */
+export const authHelpUrl = 'https://docs.aws.amazon.com/general/latest/gr/differences-aws_builder_id.html'
+export const ssoAuthHelpUrl = vscode.Uri.parse(
+    'https://docs.aws.amazon.com/singlesignon/latest/userguide/howtosignin.html'
+)
+export const credentialHelpUrl: string =
+    'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/setup-credentials.html'
+export const ssoCredentialsHelpUrl: string =
+    'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/sso-credentials.html'
+
+export const supportedLambdaRuntimesUrl: string =
+    'https://docs.aws.amazon.com/lambda/latest/dg/runtime-support-policy.html'
+export const createUrlForLambdaFunctionUrl = 'https://docs.aws.amazon.com/lambda/latest/dg/urls-configuration.html'
+// URLs for samInitWizard
+export const samInitDocUrl = {
+    cloud9: vscode.Uri.parse(
+        'https://docs.aws.amazon.com/cloud9/latest/user-guide/serverless-apps-toolkit.html#sam-create'
+    ),
+    toolkit: vscode.Uri.parse(
+        'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/serverless-apps.html#serverless-apps-create'
+    ),
+} as const
+export const launchConfigDocUrl = {
+    cloud9: vscode.Uri.parse('https://docs.aws.amazon.com/cloud9/latest/user-guide/sam-debug-config-ref.html'),
+    toolkit: vscode.Uri.parse(
+        'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/serverless-apps-run-debug-config-ref.html'
+    ),
+} as const
+// URLs for samDeployWizard
+export const samDeployDocUrl = {
+    cloud9: vscode.Uri.parse(
+        'https://docs.aws.amazon.com/cloud9/latest/user-guide/serverless-apps-toolkit.html#deploy-serverless-app'
+    ),
+    toolkit: vscode.Uri.parse(
+        'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/serverless-apps.html#serverless-apps-deploy'
+    ),
+} as const
+export const lambdaFunctionUrlConfigUrl: string = 'https://docs.aws.amazon.com/lambda/latest/dg/urls-configuration.html'
+// URLs for "sam sync" wizard.
+export const samSyncUrl = vscode.Uri.parse(
+    'https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/accelerate-getting-started.html'
+)
+// URLs for "sam build param selection"
+export const samBuildParamUrl = vscode.Uri.parse(
+    'https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-cli-command-reference-sam-build.html'
+)
+// URLs for "sam sync prarm selection"
+export const samSyncParamUrl = vscode.Uri.parse(
+    'https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-cli-command-reference-sam-sync.html'
+)
+
+// URLs for "sam build" wizard.
+export const samBuildUrl = vscode.Uri.parse(
+    'https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-building.html'
+)
+
+// URLs for "sam deploy" wizard.
+export const samDeployUrl = vscode.Uri.parse(
+    'https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/using-sam-cli-deploy.html'
+)
+
+// URLs for CDK
+export const cdkProvideFeedbackUrl: string = `${githubUrl}/issues/new/choose`
+export const cdkDocumentationUrl: string = 'https://docs.aws.amazon.com/console/toolkit-for-vscode/aws-cdk-apps'
+
+// TODO : Add valid URL to be accessed from help button in the downloadCodeBindings wizard
+export const eventBridgeSchemasDocUrl: string =
+    'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/eventbridge-schemas.html'
+
+// URLs for Step Functions
+export const sfnCreateIamRoleUrl: string =
+    'https://docs.aws.amazon.com/step-functions/latest/dg/procedure-create-iam-role.html'
+export const sfnCreateStateMachineUrl: string =
+    'https://docs.aws.amazon.com/step-functions/latest/apireference/API_CreateStateMachine.html'
+export const sfnCreateStateMachineNameParamUrl: string =
+    'https://docs.aws.amazon.com/step-functions/latest/apireference/API_CreateStateMachine.html#StepFunctions-CreateStateMachine-request-name'
+export const sfnDeveloperGuideUrl: string = 'https://docs.aws.amazon.com/step-functions/latest/dg/welcome.html'
+export const sfnUpdateStateMachineUrl: string =
+    'https://docs.aws.amazon.com/step-functions/latest/apireference/API_UpdateStateMachine.html'
+export const sfnSupportedRegionsUrl: string =
+    'https://docs.aws.amazon.com/step-functions/latest/dg/welcome.html#supported-regions'
+
+// URLs for SSM Documents
+export const ssmDocumentPublishGuideUrl: string =
+    'https://docs.aws.amazon.com/systems-manager/latest/userguide/create-ssm-doc.html'
+export const ssmJson: string = 'ssm-json'
+export const ssmYaml: string = 'ssm-yaml'
+
+// URL for post-Create SAM App
+export const debugNewSamAppDocUrl = {
+    cloud9: vscode.Uri.parse(
+        'https://docs.aws.amazon.com/cloud9/latest/user-guide/serverless-apps-toolkit.html#sam-run-debug'
+    ),
+    toolkit: vscode.Uri.parse(
+        'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/serverless-apps.html#serverless-apps-debug'
+    ),
+} as const
+
+// URLs for ECS Exec
+export const ecsDocumentationUrl: string = 'https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-exec.html'
+export const ecsExecToolkitGuideUrl: string =
+    'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/ecs-exec.html'
+export const ecsTaskPermissionsUrl = vscode.Uri.parse(
+    'https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-exec.html#ecs-exec-enabling-and-using'
+)
+export const ecsIamPermissionsUrl = vscode.Uri.parse(
+    'https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-exec.html#ecs-exec-best-practices-limit-access-execute-command'
+)
+
+/**
+ * URI scheme for CloudWatch Logs Virtual Documents
+ */
+export const CLOUDWATCH_LOGS_SCHEME = 'aws-cwl' // eslint-disable-line @typescript-eslint/naming-convention
+export const cloudwatchLogsLiveTailScheme = 'aws-cwl-lt'
+
+export const AWS_SCHEME = 'aws' // eslint-disable-line @typescript-eslint/naming-convention
+export const ec2LogsScheme = 'aws-ec2'
+export const amazonQDiffScheme = 'amazon-q-diff'
+
+export const startLiveTailHelpUrl =
+    'https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_StartLiveTail.html'
+export const startLiveTailLogStreamPrefixHelpUrl = `${startLiveTailHelpUrl}#CWL-StartLiveTail-request-logStreamNamePrefixes`
+export const startLiveTailLogStreamNamesHelpUrl = `${startLiveTailHelpUrl}#CWL-StartLiveTail-request-logStreamNames`
+
+export const cwlFilterPatternHelpUrl =
+    'https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/FilterAndPatternSyntax.html'
+
+export const lambdaPackageTypeImage = 'Image'
+
+// URLs for App Runner
+export const apprunnerConnectionHelpUrl =
+    'https://docs.aws.amazon.com/apprunner/latest/dg/manage-create.html#manage-create.create.github'
+export const apprunnerConfigHelpUrl = 'https://docs.aws.amazon.com/apprunner/latest/dg/manage-configure.html'
+export const apprunnerRuntimeHelpUrl = 'https://docs.aws.amazon.com/apprunner/latest/dg/service-source-code.html'
+export const apprunnerPricingUrl = 'https://aws.amazon.com/apprunner/pricing/'
+export const apprunnerCreateServiceDocUrl = {
+    cloud9: vscode.Uri.parse('https://docs.aws.amazon.com/cloud9/latest/user-guide/creating-service-apprunner.html'),
+    toolkit: vscode.Uri.parse(
+        'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/creating-service-apprunner.html'
+    ),
+} as const
+// URLs for S3
+// TODO: update docs to add the file viewer feature
+export const s3FileViewerHelpUrl = 'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/s3.html'
+
+// URL for Redshift
+export const redshiftHelpUrl = 'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/redshift.html'
+
+// URL for Amazon Q
+export const amazonQHelpUrl = 'https://aws.amazon.com/q/'
+
+// URL for Amazon Q VS Code
+export const amazonQVscodeMarketplace =
+    'https://marketplace.visualstudio.com/items?itemName=AmazonWebServices.amazon-q-vscode'
+
+/**
+ * Names of directories relevant to the crash reporting functionality.
+ *
+ * Moved here to resolve circular dependency issues.
+ */
+export const crashMonitoringDirName = 'crashMonitoring'
+
+export const amazonQTabSuffix = '(Generated by Amazon Q)'
+
+/**
+ * Common strings used throughout the application
+ */
+
+export const uploadCodeError = `I'm sorry, I couldn't upload your workspace artifacts to Amazon S3 to help you with this task. You might need to allow access to the S3 bucket. For more information, see the [Amazon Q documentation](${manageAccessGuideURL}) or contact your network or organization administrator.`
+
+export const featureName = 'Amazon Q Developer Agent for software development'
diff --git a/packages/core/src/shared/crashMonitoring.ts b/packages/core/src/shared/crashMonitoring.ts
new file mode 100644
index 00000000000..8d496f6a10f
--- /dev/null
+++ b/packages/core/src/shared/crashMonitoring.ts
@@ -0,0 +1,713 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import path from 'path'
+import globals, { isWeb } from './extensionGlobals'
+import { getSessionId as _getSessionId, getComputeEnvType } from './telemetry/util'
+import { getErrorId, getTelemetryReason, getTelemetryReasonDesc, isFileNotFoundError, ToolkitError } from './errors'
+import { isAutomation, isDebugInstance } from './vscode/env'
+import { DevSettings } from './settings'
+import vscode from 'vscode'
+import { telemetry } from './telemetry/telemetry'
+import { Logger, getLogger } from './logger/logger'
+import { isNewOsSession } from './utilities/osUtils'
+import nodeFs from 'fs/promises'
+import fs from './fs/fs'
+import { crashMonitoringDirName } from './constants'
+import { throwOnUnstableFileSystem } from './filesystemUtilities'
+import { truncateUuid } from './crypto'
+import { waitUntil } from './utilities/timeoutUtils'
+
+const className = 'CrashMonitoring'
+
+const logger = getLogger('crashMonitoring')
+
+/**
+ * Handles crash reporting for the extension.
+ *
+ * ### Pre-requisite knowledge:
+ *
+ * - If an extension crashes it cannot report that it crashed.
+ * - The ExtensionHost is a separate process from the main VS Code editor process where all extensions run in
+ * - Read about the [`deactivate()` behavior](../../../../docs/vscode_behaviors.md)
+ * - An IDE instance is one instance of VS Code, and Extension Instance is 1 instance of our extension. These are 1:1.
+ *
+ * ### How it works at a high level:
+ *
+ * - Each IDE instance will start its own crash monitoring process on startup
+ * - The crash monitoring process works with each instance sending heartbeats to a centralized state. Separately each instance
+ *   has a "Checker" that checks each heartbeat to see if it is not running anymore, and appropriately handles when needed.
+ *
+ * - On a crash we will emit a `session_end` metrics with `{ result: 'Failed', reason: 'ExtHostCrashed', crashedSessionId: '...' }`
+ * - On successful shutdown  a `session_end` with a successful result is already emitted elsewhere.
+ * - IMPORTANT: There is potential for duplicate metrics to be emitted since all Checkers can emit, so for `session_end` with `'Failed'`,
+ *   deduplicate by on the key `proxiedSessionId`.
+ *
+ * - To get the most verbose debug logs, configure the devmode setting: `crashReportInterval`
+ *
+ * - This entire feature is non critical and should not impede extension usage if something goes wrong. As a result, we
+ *   swallow all errors and only log/telemetry issues. This is the reason for all the try/catch statements
+ *
+ * ### Limitations
+ * - We will never truly know if we are the cause of the crash
+ *   - Since all extensions run in the same Ext Host process, any one of them could cause it to crash and we wouldn't be
+ *     able to differentiate
+ * - If the IDE itself crashes, unrelated to the extensions, it will still be seen as a crash in our telemetry
+ *   - We are not able to explicitly determine if we were the cause of the crash
+ * - If the user shuts down their computer after a crash before the next crash check can run, that info is lost
+ *   - We cannot persist crash information on computer restart
+ * - We use the users filesystem to maintain the state of running extension instances, but the
+ *   filesystem is not reliable and can lead to incorrect crash reports
+ *   - To mitigate this we do not run crash reporting on machines that we detect have a flaky filesystem
+ */
+export class CrashMonitoring {
+    protected heartbeat: Heartbeat
+    protected crashChecker: CrashChecker
+
+    constructor(
+        private readonly state: FileSystemState,
+        private readonly checkInterval: number,
+        private readonly isDevMode: boolean,
+        private readonly isAutomation: boolean,
+        private readonly devLogger: Logger | undefined
+    ) {
+        this.heartbeat = new Heartbeat(this.state, this.checkInterval, this.isDevMode)
+        this.heartbeat.onFailure(() => this.cleanup())
+
+        this.crashChecker = new CrashChecker(this.state, this.checkInterval, this.isDevMode, this.devLogger)
+        this.crashChecker.onFailure(() => this.cleanup())
+    }
+
+    static #didTryCreate = false
+    static #instance: CrashMonitoring | undefined
+    /** Returns an instance of this class or undefined if any initial validation fails. */
+    public static async instance(): Promise<CrashMonitoring | undefined> {
+        // - We do not support web due to some incompatibilities
+        // - We do not support cloud desktop due to false crash reports due to sleep+vpn+ssh timeouts with the IDE
+        if (isWeb() || (await getComputeEnvType()) === 'cloudDesktop-amzn') {
+            return undefined
+        }
+
+        // Since the first attempt to create an instance may have failed, we do not
+        // attempt to create an instance again and return whatever we have
+        if (this.#didTryCreate === true) {
+            return this.#instance
+        }
+
+        try {
+            this.#didTryCreate = true
+            const isDevMode = getIsDevMode()
+            const devModeLogger: Logger | undefined = isDevMode ? logger : undefined
+            const state = await crashMonitoringStateFactory() // can throw
+            return (this.#instance ??= new CrashMonitoring(
+                state,
+                DevSettings.instance.get('crashCheckInterval', 1000 * 60 * 20), // check every 20 minutes
+                isDevMode,
+                isAutomation(),
+                devModeLogger
+            ))
+        } catch (error) {
+            emitFailure({ functionName: 'instance', error })
+            return undefined
+        }
+    }
+
+    /** Start the Crash Monitoring process */
+    public async start() {
+        // During tests, the Prod code also runs this function. It interferes with telemetry assertion since it reports additional heartbeats.
+        if (this.isAutomation) {
+            return
+        }
+
+        try {
+            await this.heartbeat.start()
+            await this.crashChecker.start()
+        } catch (error) {
+            emitFailure({ functionName: 'start', error })
+            try {
+                await this.cleanup()
+            } catch (e) {
+                emitFailure({ functionName: 'startErrorHandler', error: e })
+            }
+
+            // Surface errors during development, otherwise it can be missed.
+            if (this.isDevMode) {
+                throw error
+            }
+        }
+    }
+
+    /** Stop the Crash Monitoring process, signifying a graceful shutdown */
+    public async shutdown() {
+        try {
+            await this.cleanup()
+        } catch (error) {
+            try {
+                // This probably wont emit in time before shutdown, but may be written to the logs
+                emitFailure({ functionName: 'stop', error })
+            } catch {}
+
+            if (this.isDevMode) {
+                throw error
+            }
+        }
+    }
+
+    public async cleanup() {
+        this.crashChecker.cleanup()
+        await this.heartbeat.shutdown()
+    }
+}
+
+/**
+ * Heartbeats that indicate the extension instance is still running.
+ * {@link CrashChecker} listens for these.
+ */
+class Heartbeat {
+    private intervalRef: NodeJS.Timer | undefined
+    private _onFailure = new vscode.EventEmitter<void>()
+    public onFailure: vscode.Event<void> = this._onFailure.event
+    private readonly heartbeatInterval: number
+
+    constructor(
+        private readonly state: FileSystemState,
+        checkInterval: number,
+        private readonly isDevMode: boolean
+    ) {
+        this.heartbeatInterval = checkInterval / 2
+    }
+
+    public async start() {
+        // Send an initial heartbeat immediately
+        await withFailCtx('sendHeartbeatInitial', () => this.state.sendHeartbeat())
+
+        // Send a heartbeat every interval
+        this.intervalRef = globals.clock.setInterval(async () => {
+            try {
+                await this.state.sendHeartbeat()
+            } catch (e) {
+                try {
+                    // Since something went wrong cleanup everything to prevent false crash report
+                    await this.shutdown()
+                    emitFailure({ functionName: 'sendHeartbeatInterval', error: e })
+                } catch (e) {
+                    emitFailure({ functionName: 'sendHeartbeatIntervalErrorHandler', error: e })
+                }
+
+                if (this.isDevMode) {
+                    throw e
+                }
+                this._onFailure.fire()
+            }
+        }, this.heartbeatInterval)
+
+        // We will know the first heartbeat, and can infer the next ones starting from this timestamp.
+        // In case of heartbeat failure we have a separate failure metric.
+        telemetry.ide_heartbeat.emit({ timestamp: globals.clock.Date.now(), id: className, result: 'Succeeded' })
+    }
+
+    /** Stops everything, signifying a graceful shutdown */
+    public async shutdown() {
+        globals.clock.clearInterval(this.intervalRef)
+        await this.state.indicateGracefulShutdown()
+    }
+
+    /** Mimics a crash, only for testing */
+    public testCrash() {
+        globals.clock.clearInterval(this.intervalRef)
+    }
+}
+
+/**
+ * This checks the heartbeats of each known extension to see if it has crashed and handles that result appropriately.
+ */
+class CrashChecker {
+    private intervalRef: NodeJS.Timer | undefined
+    private _onFailure = new vscode.EventEmitter<void>()
+    public onFailure = this._onFailure.event
+    public timeLag: TimeLag
+
+    constructor(
+        private readonly state: FileSystemState,
+        private readonly checkInterval: number,
+        private readonly isDevMode: boolean,
+        private readonly devLogger: Logger | undefined
+    ) {
+        this.timeLag = new TimeLag(this.checkInterval)
+    }
+
+    public async start() {
+        {
+            this.devLogger?.debug(`checkInterval ${this.checkInterval}`)
+
+            // do an initial check
+            await withFailCtx('initialCrashCheck', () =>
+                tryCheckCrash(this.state, this.checkInterval, this.isDevMode, this.devLogger)
+            )
+
+            this.timeLag.init()
+
+            // check on an interval
+            this.intervalRef = globals.clock.setInterval(async () => {
+                try {
+                    // Due to sleep+wake the heartbeat has not been sent consistently. Skip 1 crash check interval
+                    // to allow for a new heartbeat to be sent
+                    if (this.timeLag.didLag()) {
+                        this.devLogger?.warn('LAG detected time lag and skipped a crash check')
+                        telemetry.function_call.emit({
+                            className: className,
+                            functionName: 'timeLag',
+                            result: 'Succeeded',
+                            duration: this.timeLag.getLag(), // How much the lag actually was
+                        })
+                    } else {
+                        await tryCheckCrash(this.state, this.checkInterval, this.isDevMode, this.devLogger)
+                    }
+
+                    this.timeLag.updateLastExecution()
+                } catch (e) {
+                    emitFailure({ functionName: 'checkCrashInterval', error: e })
+
+                    if (this.isDevMode) {
+                        throw e
+                    }
+
+                    this._onFailure.fire()
+                }
+            }, this.checkInterval)
+        }
+
+        // ------------ Inner Functions ------------
+
+        async function tryCheckCrash(
+            state: FileSystemState,
+            checkInterval: number,
+            isDevMode: boolean,
+            devLogger: Logger | undefined
+        ) {
+            // check each extension if it crashed
+            const knownExts = await state.getAllExts()
+            const runningExts: ExtInstanceHeartbeat[] = []
+            for (const ext of knownExts) {
+                // is still running
+                if (!isStoppedHeartbeats(ext, checkInterval)) {
+                    runningExts.push(ext)
+                    continue
+                }
+
+                // did crash
+                await state.handleCrashedExt(ext, () => {
+                    // Debugger instances may incorrectly look like they crashed, so don't emit.
+                    // Example is if I hit the red square in the debug menu, it is a non-graceful shutdown. But the regular
+                    // 'x' button in the Debug IDE instance is a graceful shutdown.
+                    if (ext.isDebug) {
+                        devLogger?.debug(`DEBUG instance crashed: %O`, ext)
+                        return
+                    }
+
+                    // This is the metric to let us know the extension crashed
+                    telemetry.session_end.emit({
+                        result: 'Failed',
+                        proxiedSessionId: ext.sessionId,
+                        reason: 'ExtHostCrashed',
+                        passive: true,
+                        timestamp: ext.lastHeartbeat,
+                    })
+                })
+            }
+
+            if (isDevMode) {
+                const before = knownExts.map((i) => truncateUuid(i.sessionId))
+                const after = runningExts.map((i) => truncateUuid(i.sessionId))
+                // Sanity check: ENSURE THAT AFTER === ACTUAL or this implies that our data is out of sync
+                const afterActual = (await state.getAllExts()).map((i) => truncateUuid(i.sessionId))
+                devLogger?.debug(
+                    `CHECKED: Result of cleaning up crashed instances\nBEFORE: %O \nAFTER:  %O \nACTUAL: %O`,
+                    before,
+                    after,
+                    afterActual
+                )
+            }
+
+            return
+        }
+
+        function isStoppedHeartbeats(ext: ExtInstanceHeartbeat, checkInterval: number) {
+            const millisSinceLastHeartbeat = globals.clock.Date.now() - ext.lastHeartbeat
+            return millisSinceLastHeartbeat >= checkInterval
+        }
+    }
+
+    /** Use this on failures to terminate the crash checker */
+    public cleanup() {
+        globals.clock.clearInterval(this.intervalRef)
+    }
+
+    /** Mimics a crash, only for testing */
+    public testCrash() {
+        this.cleanup()
+    }
+}
+
+/**
+ * Helper class to detect when an interval does not execute at the expected cadence.
+ * It works by calculating the time diff between interval executions, indicating a lag if this diff
+ * is greater than the expected interval.
+ *
+ * When the computer goes to sleep, intervals do not run. So when the computer wakes it will
+ * pick up where it left off. We have cases where we want to detect this.
+ *
+ * TODO: Merge this in with the Interval class so that it comes for free with it.
+ */
+class TimeLag {
+    private lastExecution: number = 0
+
+    constructor(private readonly interval: number) {}
+
+    /** Call this right before the interval is defined */
+    public init() {
+        this.updateLastExecution()
+    }
+
+    /** Call this at the beginning of each interval execution to determine if a lag was detected */
+    public didLag() {
+        const buffer = 10_000 // accounts for the actual work done in an interval
+        return this.getLag() > this.interval + buffer
+    }
+
+    /** Get the time diff between the last interval execution and now */
+    public getLag() {
+        return globals.clock.Date.now() - this.lastExecution
+    }
+
+    /** Call this at the end of your interval callback */
+    public updateLastExecution() {
+        this.lastExecution = globals.clock.Date.now()
+    }
+}
+
+/**
+ * We define this externally so that we have a single source of truth for the contructor args.
+ * Ideally we'd use ConstructorParameters, but it does not work when the constructor is protected.
+ */
+type MementoStateDependencies = {
+    memento: vscode.Memento
+    sessionId: string
+    workDirPath: string
+    isDevMode: boolean
+    isStateStale: () => Promise<boolean>
+    now: () => number
+    devLogger: Logger | undefined
+}
+
+function getDefaultDependencies(): MementoStateDependencies {
+    return {
+        now: () => globals.clock.Date.now(),
+        workDirPath: path.join(globals.context.globalStorageUri.fsPath),
+        memento: globals.globalState as vscode.Memento,
+        isStateStale: () => isNewOsSession(),
+        sessionId: _getSessionId(),
+        isDevMode: getIsDevMode(),
+        devLogger: getIsDevMode() ? logger : undefined,
+    }
+}
+/**
+ * Factory to create an instance of the state.
+ *
+ * @throws if the filesystem state cannot be confirmed to be stable, i.e flaky fs operations
+ */
+export async function crashMonitoringStateFactory(deps = getDefaultDependencies()): Promise<FileSystemState> {
+    const state: FileSystemState = new FileSystemState(deps)
+    await state.init()
+    return state
+}
+
+/**
+ * The state of all running extensions.
+ * - is globally shared with all other extension instances.
+ * - uses the File System
+ *   - is not truly reliable since filesystems are not reliable
+ */
+export class FileSystemState {
+    public readonly stateDirPath: string
+
+    /**
+     * IMORTANT: Use {@link crashMonitoringStateFactory} to make an instance
+     */
+    constructor(protected readonly deps: MementoStateDependencies) {
+        this.stateDirPath = path.join(this.deps.workDirPath, crashMonitoringDirName)
+
+        this.deps.devLogger?.debug(`sessionId: ${this.deps.sessionId.slice(0, 8)}-...`)
+        this.deps.devLogger?.debug(`dir: ${this.stateDirPath}`)
+    }
+
+    /**
+     * Does the required initialization steps, this must always be run after
+     * creation of the instance.
+     *
+     * @throws if the filesystem state cannot be confirmed to be stable, i.e flaky fs operations
+     */
+    public async init() {
+        // IMPORTANT: do not run crash reporting on unstable filesystem to reduce invalid crash data
+        await withFailCtx('validateFileSystemStability', () => throwOnUnstableFileSystem())
+
+        // Clear the state if the user did something like a computer restart
+        if (await this.deps.isStateStale()) {
+            await telemetry.function_call.run(async (span) => {
+                span.record({ functionName: 'handleComputerRestart', className })
+                await this.clearState()
+            })
+        }
+
+        await withFailCtx('init', () => nodeFs.mkdir(this.stateDirPath, { recursive: true }))
+    }
+
+    // ------------------ Heartbeat methods ------------------
+    public async sendHeartbeat() {
+        const extId = this.extId
+        const filePath = this.makeStateFilePath(extId)
+        const now = this.deps.now()
+
+        let fileHandle: nodeFs.FileHandle | undefined
+        try {
+            const func = async () => {
+                fileHandle = await nodeFs.open(filePath, 'w')
+                await fileHandle.writeFile(JSON.stringify({ ...this.ext, lastHeartbeat: now }, undefined, 4))
+                // Noticing that some file reads are not immediately available after write. `fsync` is known to address this.
+                await fileHandle.sync()
+                await fileHandle.close()
+                fileHandle = undefined
+
+                // Sanity check to verify the latest write is accessible immediately
+                const heartbeatData = JSON.parse(await nodeFs.readFile(filePath, 'utf-8')) as ExtInstanceHeartbeat
+                if (heartbeatData.lastHeartbeat !== now) {
+                    throw new CrashMonitoringError('Heartbeat write validation failed', { code: className })
+                }
+
+                this.deps.devLogger?.debug(`HEARTBEAT sent for ${truncateUuid(this.ext.sessionId)}`)
+            }
+            const funcWithCtx = () => withFailCtx('sendHeartbeatState', func)
+            const funcWithRetries = waitUntil(funcWithCtx, {
+                timeout: 15_000,
+                interval: 100,
+                backoff: 2,
+                retryOnFail: true,
+            })
+
+            return funcWithRetries
+        } catch (e) {
+            await fileHandle?.close()
+
+            // delete this ext from the state to avoid an incorrectly reported crash since we could not send a new heartbeat
+            await this.deleteHeartbeatFile(extId, 'sendHeartbeatFailureCleanup')
+            throw e
+        }
+    }
+
+    /**
+     * Indicates that this extension instance has gracefully shutdown.
+     *
+     * IMPORTANT: This code is being run in `deactivate()` where VS Code api is not available. Due to this we cannot
+     * easily update the state to indicate a graceful shutdown. So the next best option is to write to a file on disk,
+     * and its existence indicates a graceful shutdown.
+     *
+     * IMPORTANT: Since the VSC FileSystem api is not available during deactivation we MUST use Node FS in anything this
+     * function touches.
+     */
+    public async indicateGracefulShutdown(): Promise<void> {
+        // By removing the heartbeat entry, the crash checkers will not be able to find this entry anymore, making it
+        // impossible to report on since the file system is the source of truth
+        await this.deleteHeartbeatFile(this.extId, 'indicateGracefulShutdown')
+    }
+
+    // ------------------ Checker Methods ------------------
+
+    public async handleCrashedExt(ext: ExtInstance, fn: () => void) {
+        await this.deleteHeartbeatFile(ext, 'handleCrashedExt')
+        await withFailCtx('handleCrashedExt', async () => fn())
+    }
+
+    private async deleteHeartbeatFile(ext: ExtInstanceId | ExtInstance, ctx: string) {
+        // IMPORTANT: Must use NodeFs here since this is used during shutdown
+        const func = async () => {
+            const filePath = this.makeStateFilePath(ext)
+
+            // Even when deleting a file, if there is an open file handle it may still exist. This empties the
+            // contents, so that any following reads will get no data.
+            let fileHandle: nodeFs.FileHandle | undefined
+            try {
+                fileHandle = await nodeFs.open(filePath, 'w')
+                await fileHandle.sync()
+            } finally {
+                await fileHandle?.close()
+            }
+
+            await nodeFs.rm(filePath, { force: true })
+        }
+        const funcWithCtx = () => withFailCtx(ctx, func)
+        const funcWithRetries = waitUntil(funcWithCtx, {
+            timeout: 15_000,
+            interval: 100,
+            backoff: 2,
+            retryOnFail: true,
+        })
+        await funcWithRetries
+    }
+
+    // ------------------ State data ------------------
+    public get extId(): ExtInstanceId {
+        return this.createExtId(this.ext)
+    }
+    /** This extensions metadata */
+    protected get ext(): ExtInstance {
+        return {
+            sessionId: this.deps.sessionId,
+            isDebug: isDebugInstance() ? true : undefined,
+        }
+    }
+    /**
+     * Returns a value that uniquely identifies an Extension Instance.
+     *
+     * - When an ExtHost crashes the VSCode instance itself does not crash, this means the session ID stays the
+     *   same. This is the current behavior of vscode's sessionId api that we use under the hood (verified manually).
+     * - The Extension Host PID used in addition to the session ID should be good enough to uniquely identiy.
+     */
+    protected createExtId(ext: ExtInstance): ExtInstanceId {
+        return ext.sessionId
+    }
+    private readonly fileSuffix = 'v1'
+    private makeStateFilePath(ext: ExtInstance | ExtInstanceId) {
+        const extId = typeof ext === 'string' ? ext : this.createExtId(ext)
+        return path.join(this.stateDirPath, extId + `.${this.fileSuffix}`)
+    }
+    public async clearState(): Promise<void> {
+        this.deps.devLogger?.debug('CLEAR_STATE: Started')
+        await withFailCtx('clearState', async () => {
+            await nodeFs.rm(this.stateDirPath, { force: true, recursive: true })
+            this.deps.devLogger?.debug('CLEAR_STATE: Succeeded')
+        })
+    }
+    public async getAllExts(): Promise<ExtInstanceHeartbeat[]> {
+        return withFailCtx('getAllExts', async () => {
+            // Read all the exts from the filesystem, deserializing as needed
+            const allExtIds: ExtInstanceId[] = await withFailCtx('readdir', async () => {
+                const filesInDir = await fs.readdir(this.stateDirPath)
+                const relevantFiles = filesInDir.filter((file: [name: string, type: vscode.FileType]) => {
+                    return file[1] === vscode.FileType.File && path.extname(file[0]) === `.${this.fileSuffix}`
+                })
+                const idsFromFileNames = relevantFiles.map((file: [name: string, type: vscode.FileType]) => {
+                    return file[0].split('.')[0]
+                })
+                return idsFromFileNames
+            })
+
+            const allExts = allExtIds.map<Promise<ExtInstanceHeartbeat | undefined>>(async (extId: string) => {
+                // Due to a race condition, a separate extension instance may have removed this file by this point. It is okay since
+                // we will assume that other instance handled its termination appropriately.
+                // NOTE: On Windows we were failing on EBUSY, so we retry on failure.
+                const loadExtFromDisk = async () => {
+                    const text = await nodeFs.readFile(this.makeStateFilePath(extId), 'utf-8')
+
+                    if (!text) {
+                        return undefined
+                    }
+
+                    // This was sometimes throwing SyntaxError
+                    return JSON.parse(text) as ExtInstanceHeartbeat
+                }
+                const funcWithIgnoreBadFile = () => ignoreBadFileError(loadExtFromDisk)
+                const funcWithRetries = () =>
+                    waitUntil(funcWithIgnoreBadFile, { timeout: 15_000, interval: 100, backoff: 2, retryOnFail: true })
+                const funcWithCtx = () => withFailCtx('parseRunningExtFile', funcWithRetries)
+                const ext: ExtInstanceHeartbeat | undefined = await funcWithCtx()
+
+                if (ext === undefined) {
+                    return
+                }
+
+                if (!isExtHeartbeat(ext)) {
+                    throw new CrashMonitoringError(`Unexpected result from state for ext with key, ${extId}: ${ext}`)
+                }
+                return ext
+            })
+            // filter out undefined before returning
+            return (await Promise.all(allExts)).filter<ExtInstanceHeartbeat>(isExtHeartbeat)
+        })
+    }
+}
+
+/**
+ * Runs the given callback, returning undefined in the case a common file operation
+ * error occured
+ */
+async function ignoreBadFileError<T>(fn: () => Promise<T>): Promise<T | undefined> {
+    try {
+        return await fn()
+    } catch (e) {
+        if (isFileNotFoundError(e) || (e instanceof Error && getErrorId(e) === 'SyntaxError')) {
+            return undefined
+        }
+        throw e
+    }
+}
+
+/**
+ * Returns true if the context this is being run in is development.
+ * Enabling dev mode will slightly change behavior:
+ * - Adding more verbose debug logs
+ * - throwing errors, when typically in prod they would be swallowed
+ */
+function getIsDevMode() {
+    return DevSettings.instance.get('crashCheckInterval', -1) !== -1
+}
+
+type ExtInstanceId = string
+
+/** The static metadata of an instance of this extension */
+export type ExtInstance = {
+    sessionId: string
+    lastHeartbeat?: number
+    /**
+     * True if this instance was being run in a `Run & Debug` VS Code instance.
+     */
+    isDebug?: boolean
+}
+
+type ExtInstanceHeartbeat = ExtInstance & {
+    /** Timestamp of the last heartbeat in milliseconds */
+    lastHeartbeat: number
+}
+
+function isExtHeartbeat(ext: unknown): ext is ExtInstanceHeartbeat {
+    return typeof ext === 'object' && ext !== null && 'lastHeartbeat' in ext && ext.lastHeartbeat !== undefined
+}
+
+// Use this error for all crash reporting as it gives context to this feature
+const CrashMonitoringError = ToolkitError.named(className)
+
+/**
+ * Executes the given function, and wraps and throw exceptions with relevant context.
+ * This is helpful in telemetry as it gives more context about the error since we do not
+ * have a stacktrace there.
+ */
+async function withFailCtx<T>(ctx: string, fn: () => Promise<T>): Promise<T> {
+    try {
+        // make sure we await the function so it actually executes within the try/catch
+        return await fn()
+    } catch (err) {
+        throw CrashMonitoringError.chain(err, `Context: "${ctx}"`, { code: className })
+    }
+}
+
+/** Emits a metric for the given failure, but wraps it with relevant context. */
+function emitFailure(args: { functionName: string; error: unknown }) {
+    telemetry.function_call.emit({
+        className,
+        functionName: args.functionName,
+        result: 'Failed',
+        reason: getTelemetryReason(args.error),
+        reasonDesc: getTelemetryReasonDesc(args.error),
+        passive: true,
+    })
+}
diff --git a/src/shared/credentials/credentialSelectionDataProvider.ts b/packages/core/src/shared/credentials/credentialSelectionDataProvider.ts
similarity index 92%
rename from src/shared/credentials/credentialSelectionDataProvider.ts
rename to packages/core/src/shared/credentials/credentialSelectionDataProvider.ts
index 9e7983c2361..f18f760459b 100644
--- a/src/shared/credentials/credentialSelectionDataProvider.ts
+++ b/packages/core/src/shared/credentials/credentialSelectionDataProvider.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/src/shared/credentials/credentialSelectionState.ts b/packages/core/src/shared/credentials/credentialSelectionState.ts
similarity index 80%
rename from src/shared/credentials/credentialSelectionState.ts
rename to packages/core/src/shared/credentials/credentialSelectionState.ts
index 8d2b9d67ded..3b89b3d4154 100644
--- a/src/shared/credentials/credentialSelectionState.ts
+++ b/packages/core/src/shared/credentials/credentialSelectionState.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/packages/core/src/shared/credentials/credentialsProfileMru.ts b/packages/core/src/shared/credentials/credentialsProfileMru.ts
new file mode 100644
index 00000000000..9f4524ea286
--- /dev/null
+++ b/packages/core/src/shared/credentials/credentialsProfileMru.ts
@@ -0,0 +1,41 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../extensionGlobals'
+
+/**
+ * Tracks the credentials selected by the user, ordered by most recent.
+ */
+export class CredentialsProfileMru {
+    public static readonly maxCredentialMruSize = 5
+
+    public constructor() {}
+
+    /**
+     * @description Returns the most recently used credentials names
+     */
+    public getMruList(): string[] {
+        return globals.globalState.tryGet<string[]>('recentCredentials', Object, [])
+    }
+
+    /**
+     * @description Places a credential at the top of the MRU list
+     * @param profileName The credentials most recently used
+     */
+    public async setMostRecentlyUsedProfile(profileName: string): Promise<void> {
+        const mru: string[] = this.getMruList()
+
+        const currentIndex = mru.indexOf(profileName)
+        if (currentIndex !== -1) {
+            mru.splice(currentIndex, 1)
+        }
+
+        mru.splice(0, 0, profileName)
+
+        mru.splice(CredentialsProfileMru.maxCredentialMruSize)
+
+        await globals.globalState.update('recentCredentials', mru)
+    }
+}
diff --git a/src/shared/credentials/defaultCredentialSelectionDataProvider.ts b/packages/core/src/shared/credentials/defaultCredentialSelectionDataProvider.ts
similarity index 83%
rename from src/shared/credentials/defaultCredentialSelectionDataProvider.ts
rename to packages/core/src/shared/credentials/defaultCredentialSelectionDataProvider.ts
index f9b99f11a46..08339136ce8 100644
--- a/src/shared/credentials/defaultCredentialSelectionDataProvider.ts
+++ b/packages/core/src/shared/credentials/defaultCredentialSelectionDataProvider.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -12,12 +12,11 @@
 // Based on the multiStepInput code in the QuickInput VSCode extension sample.
 
 import * as vscode from 'vscode'
-import * as semver from 'semver'
 import * as nls from 'vscode-nls'
 const localize = nls.loadMessageBundle()
 
-import { asString } from '../../credentials/providers/credentials'
-import { SharedCredentialsProvider } from '../../credentials/providers/sharedCredentialsProvider'
+import { asString } from '../../auth/providers/credentials'
+import { SharedCredentialsProvider } from '../../auth/providers/sharedCredentialsProvider'
 import { MultiStepInputFlowController } from '../multiStepInputFlowController'
 import { CredentialSelectionDataProvider } from './credentialSelectionDataProvider'
 import { CredentialSelectionState } from './credentialSelectionState'
@@ -27,6 +26,7 @@ import { credentialHelpUrl } from '../constants'
 import { createHelpButton } from '../ui/buttons'
 import { recentlyUsed } from '../localizedText'
 import { messages } from '../utilities/messages'
+import { Commands } from '../vscode/commands2'
 
 interface ProfileEntry {
     profileName: string
@@ -42,8 +42,11 @@ export class DefaultCredentialSelectionDataProvider implements CredentialSelecti
     private readonly _credentialsMru: CredentialsProfileMru
     private readonly helpButton = createHelpButton(credentialHelpUrl)
 
-    public constructor(public readonly existingProfileNames: string[], protected context: vscode.ExtensionContext) {
-        this._credentialsMru = new CredentialsProfileMru(context)
+    public constructor(
+        public readonly existingProfileNames: string[],
+        protected context: vscode.ExtensionContext
+    ) {
+        this._credentialsMru = new CredentialsProfileMru()
     }
 
     public async pickCredentialProfile(
@@ -51,28 +54,16 @@ export class DefaultCredentialSelectionDataProvider implements CredentialSelecti
         actions: vscode.QuickPickItem[],
         state: Partial<CredentialSelectionState>
     ): Promise<vscode.QuickPickItem> {
-        // Remove this stub after we bump minimum to vscode 1.64
-        const QuickPickItemKind = semver.gte(vscode.version, '1.64.0') ? (vscode as any).QuickPickItemKind : undefined
         const menuTop: vscode.QuickPickItem[] = [
-            // vscode 1.64 supports QuickPickItemKind.Separator.
-            // https://github.com/microsoft/vscode/commit/eb416b4f9ebfda1c798aa7c8b2f4e81c6ce1984f
-            ...(!QuickPickItemKind
-                ? []
-                : [
-                      {
-                          label: localize('AWS.menu.actions', 'Actions'),
-                          kind: QuickPickItemKind.Separator,
-                      } as vscode.QuickPickItem,
-                  ]),
+            {
+                label: localize('AWS.menu.actions', 'Actions'),
+                kind: vscode.QuickPickItemKind.Separator,
+            } as vscode.QuickPickItem,
             ...actions,
-            ...(!QuickPickItemKind
-                ? []
-                : [
-                      {
-                          label: localize('AWS.menu.profiles', 'Profiles'),
-                          kind: QuickPickItemKind.Separator,
-                      } as vscode.QuickPickItem,
-                  ]),
+            {
+                label: localize('AWS.menu.profiles', 'Profiles'),
+                kind: vscode.QuickPickItemKind.Separator,
+            } as vscode.QuickPickItem,
         ]
 
         return await input.showQuickPick({
@@ -161,7 +152,7 @@ export class DefaultCredentialSelectionDataProvider implements CredentialSelecti
             return localize('AWS.credentials.error.emptyProfileName', 'Profile name must not be empty')
         }
 
-        const duplicate = this.existingProfileNames.find(k => k === name)
+        const duplicate = this.existingProfileNames.find((k) => k === name)
 
         return duplicate ? 'Name not unique' : undefined
     }
@@ -194,7 +185,7 @@ export class DefaultCredentialSelectionDataProvider implements CredentialSelecti
         const orderedProfiles: ProfileEntry[] = this.getOrderedProfiles()
 
         const selectionList: vscode.QuickPickItem[] = []
-        orderedProfiles.forEach(profile => {
+        for (const profile of orderedProfiles) {
             const selectionItem: vscode.QuickPickItem = { label: profile.profileName }
 
             if (profile.isRecentlyUsed) {
@@ -202,7 +193,7 @@ export class DefaultCredentialSelectionDataProvider implements CredentialSelecti
             }
 
             selectionList.push(selectionItem)
-        })
+        }
 
         return selectionList
     }
@@ -218,10 +209,10 @@ export class DefaultCredentialSelectionDataProvider implements CredentialSelecti
         const orderedNames = new Set()
 
         // Add MRU entries first
-        mostRecentProfileNames.forEach(profileName => {
+        for (const profileName of mostRecentProfileNames) {
             orderedProfiles.push({ profileName: profileName, isRecentlyUsed: true })
             orderedNames.add(profileName)
-        })
+        }
 
         // Add default if it hasn't been, and is an existing profile name
         const defaultProfileName = DefaultCredentialSelectionDataProvider.defaultCredentialsProfileName
@@ -232,9 +223,9 @@ export class DefaultCredentialSelectionDataProvider implements CredentialSelecti
 
         // Add remaining items, sorted alphanumerically
         const remainingProfiles: ProfileEntry[] = this.existingProfileNames
-            .filter(x => !orderedNames.has(x))
+            .filter((x) => !orderedNames.has(x))
             .sort()
-            .map(profileName => ({ profileName: profileName, isRecentlyUsed: false }))
+            .map((profileName) => ({ profileName: profileName, isRecentlyUsed: false }))
         orderedProfiles.push(...remainingProfiles)
 
         return orderedProfiles
@@ -246,7 +237,7 @@ export class DefaultCredentialSelectionDataProvider implements CredentialSelecti
     private getMostRecentlyUsedProfileNames(): string[] {
         const mru = this._credentialsMru.getMruList()
 
-        return mru.filter(x => this.existingProfileNames.includes(x))
+        return mru.filter((x) => this.existingProfileNames.includes(x))
     }
 }
 
@@ -266,7 +257,7 @@ export async function credentialProfileSelector(
         ]
         const item = await dataProvider.pickCredentialProfile(input, actions, state)
         if (item.label === actions[0].label) {
-            vscode.commands.executeCommand('aws.credentials.edit')
+            await (await Commands.getOrThrow('aws.toolkit.credentials.edit')).execute()
         } else {
             state.credentialProfile = item
         }
@@ -274,7 +265,7 @@ export async function credentialProfileSelector(
 
     async function collectInputs() {
         const state: Partial<CredentialSelectionState> = {}
-        await MultiStepInputFlowController.run(async input => await pickCredentialProfile(input, state))
+        await MultiStepInputFlowController.run(async (input) => await pickCredentialProfile(input, state))
         return state as CredentialSelectionState
     }
 
@@ -307,7 +298,7 @@ export async function promptToDefineCredentialsProfile(
     async function collectInputs(): Promise<CredentialSelectionState> {
         const state: Partial<CredentialSelectionState> = {}
         /* tslint:disable promise-function-async */
-        await MultiStepInputFlowController.run(input => inputProfileName(input, state))
+        await MultiStepInputFlowController.run((input) => inputProfileName(input, state))
         /* tslint:enable promise-function-async */
 
         return state as CredentialSelectionState
diff --git a/packages/core/src/shared/credentials/userCredentialsUtils.ts b/packages/core/src/shared/credentials/userCredentialsUtils.ts
new file mode 100644
index 00000000000..03c1316a3e4
--- /dev/null
+++ b/packages/core/src/shared/credentials/userCredentialsUtils.ts
@@ -0,0 +1,102 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as path from 'path'
+import * as vscode from 'vscode'
+import { fileExists } from '../filesystemUtilities'
+import { isNonNullable } from '../utilities/tsUtils'
+import { getConfigFilename, getCredentialsFilename } from '../../auth/credentials/sharedCredentialsFile'
+import { fs } from '../../shared/fs/fs'
+
+const header = `
+# AWS credentials file used by AWS CLI, SDKs, and tools.
+# Created by AWS Toolkit for VS Code. https://aws.amazon.com/visualstudiocode/
+#
+# Each [section] in this file declares a named "profile", which can be selected
+# in tools like AWS Toolkit to choose which credentials you want to use.
+#
+# See also:
+#   https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_access-keys.html
+#   https://docs.aws.amazon.com/cli/latest/userguide/cli-config-files.html
+
+`.trim()
+
+const createNewCredentialsFile = (ctx: CredentialsTemplateContext) =>
+    `
+[${ctx.profileName}]
+# This key identifies your AWS account.
+aws_access_key_id = ${ctx.accessKey}
+# Treat this secret key like a password. Never share it or store it in source
+# control. If your secret key is ever disclosed, immediately use IAM to delete
+# the key pair and create a new one.
+aws_secret_access_key = ${ctx.secretKey}
+
+`.trim()
+
+export interface CredentialsTemplateContext {
+    profileName: string
+    accessKey: string
+    secretKey: string
+}
+
+export interface CredentialsValidationResult {
+    isValid: boolean
+    account?: string
+    invalidMessage?: string
+}
+
+/**
+ * @deprecated
+ */
+export class UserCredentialsUtils {
+    /**
+     * @description Determines which credentials related files
+     * exist, and returns their filenames.
+     *
+     * @returns array of filenames for files found.
+     */
+    public static async findExistingCredentialsFilenames(): Promise<string[]> {
+        const files = [vscode.Uri.file(getConfigFilename()), vscode.Uri.file(getCredentialsFilename())]
+
+        const filenames = await Promise.all(
+            files.map(async (uri) => {
+                if (await fs.exists(uri)) {
+                    return uri.fsPath
+                }
+            })
+        )
+
+        return filenames.filter(isNonNullable)
+    }
+
+    /**
+     * @description Determines if credentials directory exists
+     * If it doesn't, creates credentials directory
+     * at directory from getCredentialsFilename()
+     */
+    public static async generateCredentialDirectoryIfNonexistent(): Promise<void> {
+        const filepath = path.dirname(getCredentialsFilename())
+        if (!(await fileExists(filepath))) {
+            await fs.mkdir(filepath)
+        }
+    }
+
+    /**
+     * @param credentialsContext the profile to create in the file
+     */
+    public static async generateCredentialsFile(credentialsContext?: CredentialsTemplateContext): Promise<void> {
+        await this.generateCredentialDirectoryIfNonexistent()
+        const dest = getCredentialsFilename()
+        const contents = credentialsContext ? ['', createNewCredentialsFile(credentialsContext)] : []
+
+        if (await fs.exists(dest)) {
+            contents.unshift(await fs.readFileText(dest))
+        } else {
+            contents.unshift(header)
+        }
+
+        await fs.writeFile(dest, contents.join('\n'))
+    }
+}
diff --git a/packages/core/src/shared/crypto.ts b/packages/core/src/shared/crypto.ts
new file mode 100644
index 00000000000..647525098a7
--- /dev/null
+++ b/packages/core/src/shared/crypto.ts
@@ -0,0 +1,67 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Why do we need this?
+ *
+ * Depending on environment (node vs web), `crypto` is different.
+ * Node requires `crypto` to be imported, while in web it is available globally
+ * through just calling `crypto` or `globalThis.crypto`.
+ *
+ * The crypto signatures and functions are not 1:1 between the environments.
+ * So this module provides environment agnostic functions for `crypto`.
+ *
+ * ---
+ *
+ * Node `crypto` has `crypto.webcrypto` except the interface is more cumbersome to use
+ * compared to node `crypto`. So we will want to eventually exclusively use functions
+ * in this class instead of the `crypto` functions.
+ *
+ * Once we do not need `crypto` anymore, we can get rid of the polyfill.
+ */
+import { isWeb } from './extensionGlobals'
+
+export function randomUUID(): `${string}-${string}-${string}-${string}-${string}` {
+    return getCrypto().randomUUID()
+}
+
+function getCrypto() {
+    if (isWeb()) {
+        return globalThis.crypto
+    }
+
+    return require('crypto')
+}
+
+/**
+ * Returns true if the given string is a UUID
+ *
+ * NOTE: There are different UUID versions, this function does not discriminate between them.
+ * See: https://stackoverflow.com/questions/7905929/how-to-test-valid-uuid-guid
+ */
+export function isUuid(uuid: string): boolean {
+    // NOTE: This pattern must match, or at least be a subset of the "Session ID" pattern in `telemetry/service-2.json`
+    const uuidPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i
+    return uuidPattern.test(uuid)
+}
+
+/**
+ * Eg: 'aaaabbbb-cccc-dddd-eeee-ffffhhhhiiii' -> 'aaaa...iiii'
+ */
+export function truncateUuid(uuid: string) {
+    if (uuid.length !== 36) {
+        throw new Error(`Cannot truncate uuid of value: "${uuid}"`)
+    }
+
+    const cleanedUUID = uuid.replace(/-/g, '')
+    return `${cleanedUUID.substring(0, 4)}...${cleanedUUID.substring(cleanedUUID.length - 4)}`
+}
+
+export function createHash(algorithm: string, contents: string | Buffer): string {
+    const crypto = getCrypto()
+    const hash = crypto.createHash(algorithm)
+    hash.update(contents)
+    return `${algorithm}:${hash.digest('hex')}`
+}
diff --git a/packages/core/src/shared/date.ts b/packages/core/src/shared/date.ts
new file mode 100644
index 00000000000..b3cab26f607
--- /dev/null
+++ b/packages/core/src/shared/date.ts
@@ -0,0 +1,23 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Format for rendering readable dates as YYYY-MM-DD
+ */
+export function formatDate(date: Date = new Date()): string {
+    const year = date.getFullYear()
+    const month = (date.getMonth() + 1).toString().padStart(2, '0')
+    const day = date.getDate().toString().padStart(2, '0')
+    return `${year}-${month}-${day}`
+}
+
+/**
+ * Format for rendering the time as HH:mm
+ */
+export function formatTime(date: Date = new Date()): string {
+    const hours = date.getHours().toString().padStart(2, '0')
+    const minutes = date.getMinutes().toString().padStart(2, '0')
+    return `${hours}${minutes}`
+}
diff --git a/packages/core/src/shared/datetime.ts b/packages/core/src/shared/datetime.ts
new file mode 100644
index 00000000000..8043f94d343
--- /dev/null
+++ b/packages/core/src/shared/datetime.ts
@@ -0,0 +1,178 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// constants for working with milliseconds
+export const oneSecond = 1000
+export const oneMinute = oneSecond * 60
+export const oneHour = oneMinute * 60
+export const oneDay = oneHour * 24
+
+// Given number of milliseconds elapsed (ex. 4,500,000) return hr / min / sec it represents (ex. "1 hr 15 min")
+export function convertToTimeString(durationInMs: number) {
+    const time = new Date(durationInMs)
+    const hours = time.getUTCHours()
+    const minutes = time.getUTCMinutes()
+    const seconds = time.getUTCSeconds()
+    let timeString = `${seconds} sec`
+    if (minutes > 0) {
+        timeString = `${minutes} min ${timeString}`
+    }
+    if (hours > 0) {
+        timeString = `${hours} hr ${timeString}`
+    }
+    return timeString
+}
+
+// Given Date object, return timestamp it represents (ex. "01/01/23, 12:00 AM")
+export function convertDateToTimestamp(date: Date) {
+    return date.toLocaleDateString('en-US', {
+        month: '2-digit',
+        day: '2-digit',
+        year: '2-digit',
+        hour: '2-digit',
+        minute: '2-digit',
+    })
+}
+
+/**
+ * Gets a relative date between the from date and now date (default: current time)
+ * e.g. "in 1 minute", '1 minute ago'
+ * works on the scales of seconds, minutes, hours, days, weeks, months, years
+ * @param from start Date
+ * @param now end Date (default: current time)
+ * @returns string representation of relative date
+ */
+export function getRelativeDate(from: Date, now: Date = new Date()): string {
+    const rtf = new Intl.RelativeTimeFormat('en', { numeric: 'auto', style: 'long' })
+
+    const second = 1000
+    const minute = second * 60
+    const hour = minute * 60
+    const day = hour * 24
+    const week = day * 7
+
+    // Prevent clock skew showing future date - adjust 5 seconds
+    const fromAdj = new Date(from.valueOf() - 5 * second)
+
+    const diff = fromAdj.valueOf() - now.valueOf()
+    const absDiff = Math.abs(diff)
+    // seconds
+    if (absDiff < minute) {
+        // magnitude is less than a minute
+        return rtf.format(Math.floor(diff / second), 'second')
+    }
+    // minutes
+    if (absDiff < hour) {
+        // magnitude is less than an hour
+        return rtf.format(Math.floor(diff / minute), 'minute')
+    }
+    // hours
+    if (absDiff < day) {
+        // magnitude is less than a day
+        return rtf.format(Math.floor(diff / hour), 'hour')
+    }
+    // days
+    if (absDiff < week) {
+        // magnitude is less than a week
+        return rtf.format(Math.floor(diff / day), 'day')
+    }
+    // weeks
+    if (
+        (Math.abs(fromAdj.getUTCMonth() - now.getUTCMonth()) === 0 &&
+            Math.abs(fromAdj.getUTCFullYear() - now.getUTCFullYear()) === 0) || // same month of same year
+        (fromAdj.getUTCMonth() - now.getUTCMonth() === 1 && fromAdj.getUTCDate() < now.getUTCDate()) || // different months, but less than a month apart in terms of numeric days
+        (now.getUTCMonth() - fromAdj.getUTCMonth() === 1 && now.getUTCDate() < fromAdj.getUTCDate()) // same as above but in the opposite direction
+    ) {
+        return rtf.format(Math.floor(diff / week), 'week')
+    }
+    // months
+    if (
+        Math.abs(fromAdj.getUTCFullYear() - now.getUTCFullYear()) === 0 || // same year, and all the other conditions above didn't pass
+        (fromAdj.getUTCFullYear() - now.getUTCFullYear() === 1 && fromAdj.getUTCMonth() < now.getUTCMonth()) || // different years, but less than a year apart in terms of months
+        (now.getUTCFullYear() - fromAdj.getUTCFullYear() === 1 && now.getUTCMonth() < fromAdj.getUTCMonth()) // same as the above, but in reverse
+    ) {
+        // add/subtract months to make up for the difference between years
+        let adjMonths = 0
+        if (fromAdj.getUTCFullYear() > now.getUTCFullYear()) {
+            adjMonths = 12
+        } else if (fromAdj.getUTCFullYear() < now.getUTCFullYear()) {
+            adjMonths = -12
+        }
+        return rtf.format(Math.floor(fromAdj.getUTCMonth() - now.getUTCMonth() + adjMonths), 'month')
+    }
+    // years
+    // if all conditionals above have failed, we're looking in terms of a > 1 year gap
+    return rtf.format(Math.floor(fromAdj.getUTCFullYear() - now.getUTCFullYear()), 'year')
+}
+
+/**
+ * Format for rendering readable dates.
+ *
+ * Same format used in the S3 console, but it's also locale-aware.
+ * This specifically combines a separate date and time format
+ * in order to avoid a comma between the date and time.
+ *
+ * US: Jan 5, 2020 5:30:20 PM GMT-0700
+ * GB: 5 Jan 2020 17:30:20 GMT+0100
+ */
+export function formatLocalized(d: Date = new Date()): string {
+    const dateFormat = new Intl.DateTimeFormat('en-US', {
+        year: 'numeric',
+        month: 'short',
+        day: 'numeric',
+    })
+    const timeFormat = new Intl.DateTimeFormat('en-US', {
+        hour: 'numeric',
+        minute: 'numeric',
+        second: 'numeric',
+        timeZoneName: 'shortOffset',
+    })
+
+    return `${dateFormat.format(d)} ${timeFormat.format(d)}`
+}
+/**
+ * Matches Insights console timestamp, e.g.: 2019-03-04T11:40:08.781-08:00
+ * TODO: Do we want this this verbose? Log stream just shows HH:mm:ss
+ */
+export function formatDateTimestamp(forceUTC: boolean, d: Date = new Date()): string {
+    let offsetString: string
+    if (!forceUTC) {
+        // manually adjust offset seconds if looking for a GMT timestamp:
+        // the date is created in local time, but `getISOString` will always output unadjusted GMT
+        d = new Date(d.getTime() - d.getTimezoneOffset() * 1000 * 60)
+        offsetString = '+00:00'
+    } else {
+        // positive offset means GMT-n, negative offset means GMT+n
+        // offset is in minutes
+        offsetString = `${d.getTimezoneOffset() <= 0 ? '+' : '-'}${(d.getTimezoneOffset() / 60)
+            .toString()
+            .padStart(2, '0')}:00`
+    }
+    const iso = d.toISOString()
+    // trim 'Z' (last char of iso string) and add offset string
+    return `${iso.substring(0, iso.length - 1)}${offsetString}`
+}
+
+/**
+ * Checks if a given timestamp is within 30 days of the current day
+ * @param timeStamp
+ * @returns true if timeStamp is within 30 days, false otherwise
+ */
+export function isWithin30Days(timeStamp: string): boolean {
+    if (!timeStamp) {
+        return false // No timestamp given
+    }
+
+    const startDate = new Date(timeStamp)
+    const currentDate = new Date()
+
+    // Calculate the difference in milliseconds
+    const timeDifference = currentDate.getTime() - startDate.getTime()
+
+    // Convert milliseconds to days (1000ms * 60s * 60min * 24hr)
+    const daysDifference = timeDifference / (1000 * 60 * 60 * 24)
+
+    return daysDifference <= 30
+}
diff --git a/packages/core/src/shared/db/chatDb/chatDb.ts b/packages/core/src/shared/db/chatDb/chatDb.ts
new file mode 100644
index 00000000000..df936601799
--- /dev/null
+++ b/packages/core/src/shared/db/chatDb/chatDb.ts
@@ -0,0 +1,260 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import Loki from 'lokijs'
+import * as vscode from 'vscode'
+import { TabType } from '../../../amazonq/webview/ui/storages/tabsStorage'
+import { ChatItemType, DetailedListItemGroup } from '@aws/mynah-ui'
+import {
+    ClientType,
+    Conversation,
+    FileSystemAdapter,
+    groupTabsByDate,
+    Message,
+    Tab,
+    TabCollection,
+    updateOrCreateConversation,
+} from './util'
+import crypto from 'crypto'
+import path from 'path'
+import { fs } from '../../fs/fs'
+
+/**
+ * A singleton database class that manages chat history persistence using LokiJS.
+ * This class handles storage and retrieval of chat conversations, messages, and tab states
+ * for the Amazon Q VS Code extension.
+ *
+ * The database is stored in the user's home directory under .aws/amazonq/history
+ * with a unique filename based on the workspace identifier.
+ *
+ *
+ * @singleton
+ * @class
+ */
+
+export class Database {
+    private static instance: Database | undefined = undefined
+    private db: Loki
+    /**
+     * Keep track of which open tabs have a corresponding history entry. Maps tabIds to historyIds
+     */
+    private historyIdMapping: Map<string, string> = new Map()
+    private dbDirectory: string
+    initialized: boolean = false
+
+    constructor() {
+        this.dbDirectory = path.join(fs.getUserHomeDir(), '.aws/amazonq/history')
+        const workspaceId = this.getWorkspaceIdentifier()
+        const dbName = `chat-history-${workspaceId}.json`
+
+        this.db = new Loki(dbName, {
+            adapter: new FileSystemAdapter(this.dbDirectory),
+            autosave: true,
+            autoload: true,
+            autoloadCallback: () => this.databaseInitialize(),
+            autosaveInterval: 1000,
+            persistenceMethod: 'fs',
+        })
+    }
+
+    public static getInstance(): Database {
+        if (!Database.instance) {
+            Database.instance = new Database()
+        }
+        return Database.instance
+    }
+
+    setHistoryIdMapping(tabId: string, historyId: string) {
+        this.historyIdMapping.set(tabId, historyId)
+    }
+
+    getWorkspaceIdentifier() {
+        // Case 1: .code-workspace file (saved workspace)
+        const workspace = vscode.workspace.workspaceFile
+        if (workspace) {
+            return crypto.createHash('md5').update(workspace.fsPath).digest('hex')
+        }
+
+        // Case 2: Multi-root workspace (unsaved)
+        if (vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders.length > 1) {
+            // Create hash from all folder paths combined
+            const pathsString = vscode.workspace.workspaceFolders
+                .map((folder) => folder.uri.fsPath)
+                .sort() // Sort to ensure consistent hash regardless of folder order
+                .join('|')
+            return crypto.createHash('md5').update(pathsString).digest('hex')
+        }
+
+        // Case 3: Single folder workspace
+        if (vscode.workspace.workspaceFolders?.[0]) {
+            return crypto.createHash('md5').update(vscode.workspace.workspaceFolders[0].uri.fsPath).digest('hex')
+        }
+
+        // Case 4: No workspace
+        return 'no-workspace'
+    }
+
+    async databaseInitialize() {
+        let entries = this.db.getCollection(TabCollection)
+        if (entries === null) {
+            entries = this.db.addCollection(TabCollection, {
+                unique: ['historyId'],
+                indices: ['updatedAt', 'isOpen'],
+            })
+        }
+        this.initialized = true
+    }
+
+    getOpenTabs() {
+        if (this.initialized) {
+            const collection = this.db.getCollection<Tab>(TabCollection)
+            return collection.find({ isOpen: true })
+        }
+    }
+
+    getTab(historyId: string) {
+        if (this.initialized) {
+            const collection = this.db.getCollection<Tab>(TabCollection)
+            return collection.findOne({ historyId })
+        }
+    }
+
+    // If conversation is open, return its tabId, else return undefined
+    getOpenTabId(historyId: string) {
+        const selectedTab = this.getTab(historyId)
+        if (selectedTab?.isOpen) {
+            for (const [tabId, id] of this.historyIdMapping) {
+                if (id === historyId) {
+                    return tabId
+                }
+            }
+        }
+        return undefined
+    }
+
+    clearTab(tabId: string) {
+        if (this.initialized) {
+            const tabCollection = this.db.getCollection<Tab>(TabCollection)
+            const historyId = this.historyIdMapping.get(tabId)
+            if (historyId) {
+                tabCollection.findAndRemove({ historyId })
+            }
+            this.historyIdMapping.delete(tabId)
+        }
+    }
+
+    updateTabOpenState(tabId: string, isOpen: boolean) {
+        if (this.initialized) {
+            const tabCollection = this.db.getCollection<Tab>(TabCollection)
+            const historyId = this.historyIdMapping.get(tabId)
+            if (historyId) {
+                tabCollection.findAndUpdate({ historyId }, (tab: Tab) => {
+                    tab.isOpen = isOpen
+                    return tab
+                })
+                if (!isOpen) {
+                    this.historyIdMapping.delete(tabId)
+                }
+            }
+        }
+    }
+
+    searchMessages(filter: string): DetailedListItemGroup[] {
+        let searchResults: DetailedListItemGroup[] = []
+        if (this.initialized) {
+            if (!filter) {
+                return this.getHistory()
+            }
+
+            const searchTermLower = filter.toLowerCase()
+            const tabCollection = this.db.getCollection<Tab>(TabCollection)
+            const tabs = tabCollection.find()
+            const filteredTabs = tabs.filter((tab: Tab) => {
+                return tab.conversations.some((conversation: Conversation) => {
+                    return conversation.messages.some((message: Message) => {
+                        return message.body?.toLowerCase().includes(searchTermLower)
+                    })
+                })
+            })
+            searchResults = groupTabsByDate(filteredTabs)
+        }
+        if (searchResults.length === 0) {
+            searchResults = [{ children: [{ description: 'No matches found' }] }]
+        }
+        return searchResults
+    }
+
+    /**
+     * Get messages for specified tabId
+     * @param tabId The ID of the tab to get messages from
+     * @param numMessages Optional number of most recent messages to return. If not provided, returns all messages.
+     */
+    getMessages(tabId: string, numMessages?: number) {
+        if (this.initialized) {
+            const tabCollection = this.db.getCollection<Tab>(TabCollection)
+            const historyId = this.historyIdMapping.get(tabId)
+            const tabData = historyId ? tabCollection.findOne({ historyId }) : undefined
+            if (tabData) {
+                const allMessages = tabData.conversations.flatMap((conversation: Conversation) => conversation.messages)
+                if (numMessages !== undefined) {
+                    return allMessages.slice(-numMessages)
+                }
+                return allMessages
+            }
+        }
+        return []
+    }
+
+    getHistory(): DetailedListItemGroup[] {
+        if (this.initialized) {
+            const tabCollection = this.db.getCollection<Tab>(TabCollection)
+            const tabs = tabCollection.find()
+            return groupTabsByDate(tabs)
+        }
+        return []
+    }
+
+    deleteHistory(historyId: string) {
+        if (this.initialized) {
+            const tabCollection = this.db.getCollection<Tab>(TabCollection)
+            tabCollection.findAndRemove({ historyId })
+            const tabId = this.getOpenTabId(historyId)
+            if (tabId) {
+                this.historyIdMapping.delete(tabId)
+            }
+        }
+    }
+
+    addMessage(tabId: string, tabType: TabType, conversationId: string, message: Message) {
+        if (this.initialized) {
+            const tabCollection = this.db.getCollection<Tab>(TabCollection)
+
+            let historyId = this.historyIdMapping.get(tabId)
+
+            if (!historyId) {
+                historyId = crypto.randomUUID()
+                this.setHistoryIdMapping(tabId, historyId)
+            }
+
+            const tabData = historyId ? tabCollection.findOne({ historyId }) : undefined
+            const tabTitle =
+                (message.type === ('prompt' as ChatItemType) ? message.body : tabData?.title) || 'Amazon Q Chat'
+            if (tabData) {
+                tabData.conversations = updateOrCreateConversation(tabData.conversations, conversationId, message)
+                tabData.updatedAt = new Date()
+                tabData.title = tabTitle
+                tabCollection.update(tabData)
+            } else {
+                tabCollection.insert({
+                    historyId,
+                    updatedAt: new Date(),
+                    isOpen: true,
+                    tabType: tabType,
+                    title: tabTitle,
+                    conversations: [{ conversationId, clientType: ClientType.VSCode, messages: [message] }],
+                })
+            }
+        }
+    }
+}
diff --git a/packages/core/src/shared/db/chatDb/util.ts b/packages/core/src/shared/db/chatDb/util.ts
new file mode 100644
index 00000000000..316cbe5660c
--- /dev/null
+++ b/packages/core/src/shared/db/chatDb/util.ts
@@ -0,0 +1,277 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import fs from '../../fs/fs'
+import path from 'path'
+
+import { TabType } from '../../../amazonq/webview/ui/storages/tabsStorage'
+import {
+    ChatItem,
+    ChatItemButton,
+    ChatItemType,
+    DetailedListItem,
+    DetailedListItemGroup,
+    MynahIconsType,
+    ReferenceTrackerInformation,
+    SourceLink,
+} from '@aws/mynah-ui'
+import { ChatMessage, Origin, ToolUse, UserInputMessageContext, UserIntent } from '@amzn/codewhisperer-streaming'
+
+export const TabCollection = 'tabs'
+
+export const historyPath = path.join('.aws', 'amazonq', 'history')
+
+export type Tab = {
+    historyId: string
+    isOpen: boolean
+    updatedAt: Date
+    tabType: TabType
+    title: string
+    conversations: Conversation[]
+}
+
+export type Conversation = {
+    conversationId: string
+    clientType: ClientType
+    messages: Message[]
+}
+
+export enum ClientType {
+    VSCode = 'IDE-VSCode',
+    JetBrains = 'IDE_JetBrains',
+    CLI = 'CLI',
+}
+
+export type Message = {
+    body: string
+    type: ChatItemType
+    codeReference?: ReferenceTrackerInformation[]
+    relatedContent?: {
+        title?: string
+        content: SourceLink[]
+    }
+    messageId?: string
+    userIntent?: UserIntent
+    origin?: Origin
+    userInputMessageContext?: UserInputMessageContext
+    toolUses?: ToolUse[]
+}
+
+/**
+ * Converts Message to CodeWhisperer Streaming ChatMessage
+ */
+export function messageToChatMessage(msg: Message): ChatMessage {
+    return msg.type === ('answer' as ChatItemType)
+        ? {
+              assistantResponseMessage: {
+                  messageId: msg.messageId,
+                  content: msg.body,
+                  references: msg.codeReference || [],
+                  toolUses: msg.toolUses || [],
+              },
+          }
+        : {
+              userInputMessage: {
+                  content: msg.body,
+                  userIntent: msg.userIntent,
+                  origin: msg.origin || 'IDE',
+                  userInputMessageContext: msg.userInputMessageContext || {},
+              },
+          }
+}
+
+/**
+ * Converts Message to MynahUI Chat Item
+ */
+export function messageToChatItem(msg: Message): ChatItem {
+    return {
+        body: msg.body,
+        type: msg.type as ChatItemType,
+        codeReference: msg.codeReference,
+        relatedContent: msg.relatedContent && msg.relatedContent?.content.length > 0 ? msg.relatedContent : undefined,
+    }
+}
+
+/**
+ *
+ * This adapter implements the LokiPersistenceAdapter interface for file system operations using web-compatible shared fs utils.
+ * It provides methods for loading, saving, and deleting databases, as well as ensuring
+ * the existence of the directory.
+ *
+ * Error Handling:
+ * - All methods use try-catch blocks to to prevent breaking the application
+ * - In case of errors, the callback functions are used to communicate the error state
+ *   without throwing exceptions.
+ *
+ */
+export class FileSystemAdapter implements LokiPersistenceAdapter {
+    private directory
+    constructor(directory: string) {
+        this.directory = directory
+    }
+
+    async ensureDirectory() {
+        try {
+            await fs.exists(this.directory)
+        } catch {
+            await fs.mkdir(this.directory)
+        }
+    }
+
+    async loadDatabase(dbname: string, callback: (data: string | undefined | Error) => void) {
+        try {
+            await this.ensureDirectory()
+            const filename = path.join(this.directory, dbname)
+
+            const exists = await fs.exists(filename)
+            if (!exists) {
+                callback(undefined)
+                return
+            }
+
+            const data = await fs.readFileText(filename)
+            callback(data)
+        } catch (err: any) {
+            callback(err)
+        }
+    }
+
+    async saveDatabase(dbname: string, dbstring: string, callback: (err: Error | undefined) => void) {
+        try {
+            await this.ensureDirectory()
+            const filename = path.join(this.directory, dbname)
+
+            await fs.writeFile(filename, dbstring, { mode: 0o600, encoding: 'utf8' })
+            callback(undefined)
+        } catch (err: any) {
+            callback(err)
+        }
+    }
+
+    async deleteDatabase(dbname: string, callback: (err: Error | undefined) => void) {
+        try {
+            const filename = path.join(this.directory, dbname)
+
+            const exists = await fs.exists(filename)
+            if (exists) {
+                await fs.delete(filename)
+            }
+            callback(undefined)
+        } catch (err: any) {
+            callback(err)
+        }
+    }
+}
+
+export function updateOrCreateConversation(
+    conversations: Conversation[],
+    conversationId: string,
+    newMessage: Message
+): Conversation[] {
+    const existingConversation = conversations.find((conv) => conv.conversationId === conversationId)
+
+    if (existingConversation) {
+        return conversations.map((conv) =>
+            conv.conversationId === conversationId ? { ...conv, messages: [...conv.messages, newMessage] } : conv
+        )
+    } else {
+        return [
+            ...conversations,
+            {
+                conversationId,
+                clientType: ClientType.VSCode,
+                messages: [newMessage],
+            },
+        ]
+    }
+}
+
+export function groupTabsByDate(tabs: Tab[]): DetailedListItemGroup[] {
+    const now = new Date()
+    const today = new Date(now.setHours(0, 0, 0, 0))
+    const yesterday = new Date(today)
+    yesterday.setDate(yesterday.getDate() - 1)
+    const lastWeek = new Date(today)
+    lastWeek.setDate(lastWeek.getDate() - 7)
+    const lastMonth = new Date(today)
+    lastMonth.setMonth(lastMonth.getMonth() - 1)
+
+    // Sort tabs by updatedAt in descending order
+    const sortedTabs = [...tabs]
+        .map((tab) => ({ ...tab, updatedAt: new Date(tab.updatedAt) }))
+        .sort((a, b) => b.updatedAt.getTime() - a.updatedAt.getTime())
+
+    // Helper function to convert Tab to DetailedListItem
+    const tabToDetailedListItem = (tab: Tab): DetailedListItem => ({
+        icon: getTabTypeIcon(tab.tabType),
+        // Show open tabs as bold (in markdown)
+        description: tab.isOpen ? `**${tab.title}**` : tab.title,
+        actions: getConversationActions(tab.historyId),
+        id: tab.historyId,
+        // Add other properties needed for DetailedListItem
+    })
+
+    const tabGroups = [
+        {
+            name: 'Today',
+            icon: 'calendar' as MynahIconsType,
+            tabs: sortedTabs.filter((tab) => tab.updatedAt >= today),
+        },
+        {
+            name: 'Yesterday',
+            icon: 'calendar' as MynahIconsType,
+            tabs: sortedTabs.filter((tab) => tab.updatedAt >= yesterday && tab.updatedAt < today),
+        },
+        {
+            name: 'Last Week',
+            icon: 'calendar' as MynahIconsType,
+            tabs: sortedTabs.filter((tab) => tab.updatedAt >= lastWeek && tab.updatedAt < yesterday),
+        },
+        {
+            name: 'Last Month',
+            icon: 'calendar' as MynahIconsType,
+            tabs: sortedTabs.filter((tab) => tab.updatedAt >= lastMonth && tab.updatedAt < lastWeek),
+        },
+        {
+            name: 'Older',
+            icon: 'calendar' as MynahIconsType,
+            tabs: sortedTabs.filter((tab) => tab.updatedAt < lastMonth),
+        },
+    ]
+
+    // Convert to DetailedListItemGroup[] and filter out empty groups
+    return tabGroups
+        .filter((group) => group.tabs.length > 0)
+        .map((group) => ({
+            groupName: group.name,
+            icon: group.icon,
+            children: group.tabs.map(tabToDetailedListItem),
+        }))
+}
+
+const getConversationActions = (historyId: string): ChatItemButton[] => [
+    {
+        text: 'Export',
+        icon: 'external' as MynahIconsType,
+        id: historyId,
+    },
+    {
+        text: 'Delete',
+        icon: 'trash' as MynahIconsType,
+        id: historyId,
+    },
+]
+
+function getTabTypeIcon(tabType: TabType): MynahIconsType {
+    switch (tabType) {
+        case 'cwc':
+            return 'chat'
+        case 'review':
+            return 'bug'
+        case 'gumby':
+            return 'transform'
+        default:
+            return 'chat'
+    }
+}
diff --git a/packages/core/src/shared/debug/launchConfiguration.ts b/packages/core/src/shared/debug/launchConfiguration.ts
new file mode 100644
index 00000000000..69ea55366bb
--- /dev/null
+++ b/packages/core/src/shared/debug/launchConfiguration.ts
@@ -0,0 +1,208 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import _ from 'lodash'
+import * as nls from 'vscode-nls'
+import * as path from 'path'
+import * as vscode from 'vscode'
+import {
+    AwsSamDebuggerConfiguration,
+    CodeTargetProperties,
+    ensureRelativePaths,
+    isAwsSamDebugConfiguration,
+    isCodeTargetProperties,
+    isTemplateTargetProperties,
+    AwsSamTargetType,
+} from '../sam/debugger/awsSamDebugConfiguration'
+import {
+    AwsSamDebugConfigurationValidator,
+    DefaultAwsSamDebugConfigurationValidator,
+} from '../sam/debugger/awsSamDebugConfigurationValidator'
+import * as pathutils from '../utilities/pathUtils'
+import { tryGetAbsolutePath } from '../utilities/workspaceUtils'
+import { getLogger } from '../logger/logger'
+import { makeFailedWriteMessage, showViewLogsMessage } from '../utilities/messages'
+import { openUrl } from '../utilities/vsCodeUtils'
+import globals from '../extensionGlobals'
+import { getLaunchConfigDocUrl } from '../extensionUtilities'
+
+const localize = nls.loadMessageBundle()
+
+/**
+ * Reads and writes DebugConfigurations.
+ */
+export interface DebugConfigurationSource {
+    getDebugConfigurations(): vscode.DebugConfiguration[]
+    setDebugConfigurations(value: vscode.DebugConfiguration[]): Promise<void>
+}
+
+/**
+ * Wraps read and write operations on launch.json.
+ */
+export class LaunchConfiguration {
+    public readonly workspaceFolder: vscode.WorkspaceFolder | undefined
+    /**
+     * Creates a Launch Configuration scoped to the given resource.
+     */
+    public constructor(
+        public readonly scopedResource: vscode.Uri,
+        private readonly configSource: DebugConfigurationSource = new DefaultDebugConfigSource(scopedResource),
+        private readonly samValidator: AwsSamDebugConfigurationValidator = new DefaultAwsSamDebugConfigurationValidator(
+            vscode.workspace.getWorkspaceFolder(scopedResource)
+        )
+    ) {
+        this.workspaceFolder = vscode.workspace.getWorkspaceFolder(scopedResource)
+    }
+
+    public getDebugConfigurations(): vscode.DebugConfiguration[] {
+        const configs = this.configSource.getDebugConfigurations()
+        return configs.map((o) => {
+            if (isAwsSamDebugConfiguration(o)) {
+                ensureRelativePaths(undefined, o)
+            }
+            return o
+        })
+    }
+
+    /**
+     * Returns all valid Sam Debug Configurations.
+     */
+    public async getSamDebugConfigurations(): Promise<AwsSamDebuggerConfiguration[]> {
+        const configs = this.getDebugConfigurations().filter((o) =>
+            isAwsSamDebugConfiguration(o)
+        ) as AwsSamDebuggerConfiguration[]
+        const registry = await globals.templateRegistry
+        // XXX: can't use filter() with async predicate.
+        const validConfigs: AwsSamDebuggerConfiguration[] = []
+        for (const c of configs) {
+            if ((await this.samValidator.validate(c, registry))?.isValid) {
+                validConfigs.push(c)
+            }
+        }
+        return validConfigs
+    }
+
+    /**
+     * Adds a collection of debug configurations to the top of the list
+     */
+    public async addDebugConfigurations(debugConfigs: vscode.DebugConfiguration[]): Promise<void> {
+        await this.configSource.setDebugConfigurations([...debugConfigs, ...this.getDebugConfigurations()])
+    }
+
+    /**
+     * Adds a debug configuration to the top of the list.
+     */
+    public async addDebugConfiguration(debugConfig: vscode.DebugConfiguration): Promise<void> {
+        await this.configSource.setDebugConfigurations([debugConfig, ...this.getDebugConfigurations()])
+    }
+
+    /**
+     * Edits a debug configuration at a specfic index by replacing it with a new one.
+     * @param editedDebugConfig Full edited debug configuration
+     * @param index Index in `launch.json` configurations to replace
+     */
+    public async editDebugConfiguration(editedDebugConfig: vscode.DebugConfiguration, index: number): Promise<void> {
+        const configs = this.getDebugConfigurations()
+        configs[index] = editedDebugConfig
+        await this.configSource.setDebugConfigurations(configs)
+    }
+}
+
+class DefaultDebugConfigSource implements DebugConfigurationSource {
+    private readonly launch: vscode.WorkspaceConfiguration
+
+    public constructor(resource: vscode.Uri) {
+        this.launch = vscode.workspace.getConfiguration('launch', resource)
+    }
+
+    public getDebugConfigurations(): vscode.DebugConfiguration[] {
+        return this.launch.get<vscode.DebugConfiguration[]>('configurations') ?? []
+    }
+
+    public async setDebugConfigurations(value: vscode.DebugConfiguration[]): Promise<void> {
+        try {
+            await this.launch.update('configurations', value)
+        } catch (e) {
+            const helpText = localize('AWS.generic.message.getHelp', 'Get Help...')
+            getLogger().error('setDebugConfigurations failed: %O', e as Error)
+            await showViewLogsMessage(makeFailedWriteMessage('launch.json'), 'error', [helpText]).then(
+                async (buttonText) => {
+                    if (buttonText === helpText) {
+                        await openUrl(getLaunchConfigDocUrl())
+                    }
+                }
+            )
+        }
+    }
+}
+
+async function getSamCodeTargets(launchConfig: LaunchConfiguration): Promise<CodeTargetProperties[]> {
+    const debugConfigs = await launchConfig.getSamDebugConfigurations()
+    return _(debugConfigs)
+        .map((samConfig) => samConfig.invokeTarget)
+        .filter(isCodeTargetProperties)
+        .value()
+}
+
+/**
+ * Gets configs associated with the template.yaml to which `launchConfig` is
+ * scoped.
+ *
+ * @param launchConfig Launch config to check
+ * @param type  target type ('api' or 'template'), or undefined for 'both'
+ */
+export async function getConfigsMappedToTemplates(
+    launchConfig: LaunchConfiguration,
+    type: AwsSamTargetType | undefined
+): Promise<Set<AwsSamDebuggerConfiguration>> {
+    if (type === 'code') {
+        throw Error()
+    }
+    const folder = launchConfig.workspaceFolder
+    // Launch configs with target=template or target=api.
+    const templateConfigs = (await launchConfig.getSamDebugConfigurations()).filter((o) =>
+        isTemplateTargetProperties(o.invokeTarget)
+    )
+    const filtered = templateConfigs.filter(
+        (t) =>
+            (type === undefined || t.invokeTarget.target === type) &&
+            pathutils.areEqual(
+                folder?.uri.fsPath,
+                (t.invokeTarget as any).templatePath,
+                launchConfig.scopedResource.fsPath
+            )
+    )
+    return _(filtered)
+        .thru((array) => new Set(array))
+        .value()
+}
+
+/**
+ * Gets a set of filepaths pointing to the handler source file for each
+ * `target=code` config in launch.json.
+ *
+ * Each path is the absolute path resolved against `projectRoot`.
+ *
+ * @param launchConfig Launch config to check
+ */
+export async function getReferencedHandlerPaths(launchConfig: LaunchConfiguration): Promise<Set<string>> {
+    const existingSamCodeTargets = await getSamCodeTargets(launchConfig)
+
+    return _(existingSamCodeTargets)
+        .map((target) => {
+            if (path.isAbsolute(target.projectRoot)) {
+                return pathutils.normalize(path.join(target.projectRoot, target.lambdaHandler))
+            }
+            return pathutils.normalize(
+                path.join(
+                    tryGetAbsolutePath(launchConfig.workspaceFolder, ''),
+                    target.projectRoot,
+                    target.lambdaHandler
+                )
+            )
+        })
+        .thru((array) => new Set(array))
+        .value()
+}
diff --git a/packages/core/src/shared/env/resolveEnv.ts b/packages/core/src/shared/env/resolveEnv.ts
new file mode 100644
index 00000000000..c15922fe0c9
--- /dev/null
+++ b/packages/core/src/shared/env/resolveEnv.ts
@@ -0,0 +1,313 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* ---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as crypto from 'crypto'
+import { DevSettings } from '../settings'
+import { getLogger } from '../logger/logger'
+import { ToolkitError } from '../errors'
+import { userInfo } from 'os'
+import path from 'path'
+import { Timeout, CancellationError } from '../utilities/timeoutUtils'
+import { IamConnection } from '../../auth/connection'
+import { asEnvironmentVariables } from '../../auth/credentials/utils'
+import { getIAMConnection } from '../../auth/utils'
+import { ChildProcess } from '../utilities/processUtils'
+import globals from '../extensionGlobals'
+
+let unixShellEnvPromise: Promise<typeof process.env | void> | undefined = undefined
+let envCacheExpireTime: number
+
+export interface IProcessEnvironment {
+    [key: string]: string | undefined
+}
+
+function isLaunchedFromCli(env: IProcessEnvironment): boolean {
+    return env['VSCODE_CLI'] === '1'
+}
+let terminalDefaultShellUnixLike: string | undefined = undefined
+function getSystemShellUnixLike(env: IProcessEnvironment): string {
+    if (process.platform === 'win32') {
+        throw new ToolkitError(`Resolve Windows Shell not implemented`)
+    }
+    // check cache
+    if (!terminalDefaultShellUnixLike) {
+        let unixLikeTerminal: string | undefined
+
+        unixLikeTerminal = env['SHELL']
+
+        if (!unixLikeTerminal) {
+            try {
+                // It's possible for $SHELL to be unset, this API reads /etc/passwd. See https://github.com/github/codespaces/issues/1639
+                // Node docs: "Throws a SystemError if a user has no username or homedir."
+                unixLikeTerminal = userInfo().shell ?? undefined
+            } catch (err) {}
+        }
+
+        if (!unixLikeTerminal) {
+            unixLikeTerminal = 'sh'
+        }
+
+        // Some systems have $SHELL set to /bin/false which breaks the terminal
+        if (unixLikeTerminal === '/bin/false') {
+            unixLikeTerminal = '/bin/bash'
+        }
+
+        terminalDefaultShellUnixLike = unixLikeTerminal
+    }
+    return terminalDefaultShellUnixLike
+}
+
+export async function injectCredentials(conn: IamConnection, env = process.env): Promise<NodeJS.ProcessEnv> {
+    const creds = await conn.getCredentials()
+    const endpointUrl = globals.awsContext.getCredentialEndpointUrl()
+    return { ...env, ...asEnvironmentVariables(creds, endpointUrl) }
+}
+
+export interface getEnvOptions {
+    /** Controls whether to inject credential into env. (default: true) */
+    injectCredential?: boolean
+    /** only valid if injectCredential is true, prompt for invalid credential and ask for IAM credential (default: false) */
+    promptForInvalidCredential?: boolean
+    /** Inject resolved shell path into env. (default: true) */
+    injectPath?: boolean
+}
+
+/**
+ * Get the spawn environment, inject credentials and resolved shell path if needed
+ * @param env NodeJS.process
+ * @param injectCredential inject credential into env
+ * @param promptForInvalidCredential: prompt for invalid credential and ask for IAM credential
+ * @param injectPath inject resolved shell path into env
+ * @returns the merged env to use for spawning a child process
+ */
+export async function getSpawnEnv(
+    env: NodeJS.ProcessEnv | undefined = process.env,
+    opts: getEnvOptions = {}
+): Promise<typeof process.env> {
+    const injectCredential = opts.injectCredential ?? true
+    const promptForInvalidCredential = opts.promptForInvalidCredential ?? false
+    const injectPath = opts.injectPath ?? true
+
+    let mergedEnv = injectPath ? await mergeResolvedShellPath(env) : env
+
+    if (injectCredential) {
+        const connection = await getIAMConnection({ prompt: promptForInvalidCredential })
+        if (connection?.type === 'iam' && connection.state === 'valid') {
+            mergedEnv = await injectCredentials(connection, mergedEnv)
+        }
+    }
+
+    return mergedEnv
+}
+
+/**
+ * merge the resolved path into existing process.path
+ * If no need to resolve or resolve failed, return the env arg directly
+ * @param env NodeJS.process
+ * @returns merged PATH
+ */
+export async function mergeResolvedShellPath(env: IProcessEnvironment): Promise<typeof process.env> {
+    const shellEnv = await getResolvedShellEnv(env)
+    // resolve failed or doesn't need to resolve
+    if (!shellEnv) {
+        return env
+    }
+    try {
+        const envPaths: string[] = env.PATH ? env.PATH.split(path.delimiter) : []
+        const resolvedPaths: string[] = shellEnv.PATH ? shellEnv.PATH.split(path.delimiter) : []
+        const envReturn = { ...env }
+        // merge, dedup, join
+        envReturn.PATH = [...new Set(envPaths.concat(resolvedPaths))].join(path.delimiter)
+
+        return envReturn
+    } catch (err) {
+        getLogger().error(`error merging env with resolved env:${err}`)
+        return env
+    }
+}
+
+/**
+ * Resolves the shell environment by spawning a shell. This call will cache
+ * the shell spawning so that subsequent invocations use that cached result.
+ *
+ * Will throw an error if:
+ * - we hit a timeout of `MAX_SHELL_RESOLVE_TIME`
+ * - any other error from spawning a shell to figure out the environment
+ */
+export async function getResolvedShellEnv(env?: IProcessEnvironment): Promise<typeof process.env | void> {
+    if (!env) {
+        env = process.env
+    }
+    // Skip if forceResolveEnv is set to false
+    if (DevSettings.instance._isSet('forceResolveEnv') && !DevSettings.instance.get('forceResolveEnv', false)) {
+        getLogger().debug('resolveShellEnv(): skipped (forceResolveEnv)')
+
+        return undefined
+    }
+
+    // Skip on windows
+    else if (process.platform === 'win32') {
+        getLogger().debug('resolveShellEnv(): skipped (Windows)')
+
+        return undefined
+    }
+
+    // Skip if running from CLI already and forceResolveEnv is not true
+    else if (isLaunchedFromCli(env) && !DevSettings.instance.get('forceResolveEnv', false)) {
+        getLogger().info('resolveShellEnv(): skipped (VSCODE_CLI is set)')
+
+        return undefined
+    }
+    // Otherwise resolve (macOS, Linux)
+    else {
+        if (isLaunchedFromCli(env)) {
+            getLogger().debug('resolveShellEnv(): running (forceResolveEnv)')
+        } else {
+            getLogger().debug('resolveShellEnv(): running (macOS/Linux)')
+        }
+
+        // Call this only once before expire and cache the promise for
+        // subsequent calls since this operation can be expensive (spawns a process).
+        if (!unixShellEnvPromise || Date.now() > envCacheExpireTime) {
+            // cache valid for 5 minutes
+            envCacheExpireTime = Date.now() + 5 * 60 * 1000
+            unixShellEnvPromise = new Promise<NodeJS.ProcessEnv | void>(async (resolve, reject) => {
+                const timeout = new Timeout(10000)
+
+                // Resolve shell env and handle errors
+                try {
+                    const shellEnv = await doResolveUnixShellEnv(timeout)
+                    if (shellEnv && Object.keys(shellEnv).length > 0) {
+                        resolve(shellEnv)
+                    } else {
+                        resolve()
+                    }
+                } catch {
+                    // failed resolve should not affect other feature.
+                    resolve()
+                }
+            })
+        }
+
+        return unixShellEnvPromise
+    }
+}
+
+async function doResolveUnixShellEnv(timeout: Timeout): Promise<typeof process.env> {
+    const runAsNode = process.env['ELECTRON_RUN_AS_NODE']
+    getLogger().debug(`getUnixShellEnvironment#runAsNode:${runAsNode}`)
+
+    const noAttach = process.env['ELECTRON_NO_ATTACH_CONSOLE']
+    getLogger().debug(`getUnixShellEnvironment#noAttach:${noAttach}`)
+
+    const mark = crypto.randomUUID().replace(/-/g, '').substring(0, 12)
+    const regex = new RegExp(mark + '({.*})' + mark)
+
+    const env = {
+        ...process.env,
+        ELECTRON_RUN_AS_NODE: '1',
+        ELECTRON_NO_ATTACH_CONSOLE: '1',
+        VSCODE_RESOLVING_ENVIRONMENT: '1',
+    }
+
+    getLogger().debug(`getUnixShellEnvironment#env}`)
+    const systemShellUnix = getSystemShellUnixLike(env)
+    getLogger().debug(`getUnixShellEnvironment#shell:${systemShellUnix}`)
+
+    return new Promise<typeof process.env>(async (resolve, reject) => {
+        if (timeout.token.isCancellationRequested) {
+            return reject(new CancellationError('timeout'))
+        }
+
+        // handle popular non-POSIX shells
+        const name = path.basename(systemShellUnix)
+        let command: string, shellArgs: Array<string>
+        const extraArgs = ''
+        if (/^pwsh(-preview)?$/.test(name)) {
+            // Older versions of PowerShell removes double quotes sometimes so we use "double single quotes" which is how
+            // you escape single quotes inside of a single quoted string.
+            command = `& '${process.execPath}' ${extraArgs} -p '''${mark}'' + JSON.stringify(process.env) + ''${mark}'''`
+            shellArgs = ['-Login', '-Command']
+        } else if (name === 'nu') {
+            // nushell requires ^ before quoted path to treat it as a command
+            command = `^'${process.execPath}' ${extraArgs} -p '"${mark}" + JSON.stringify(process.env) + "${mark}"'`
+            shellArgs = ['-i', '-l', '-c']
+        } else if (name === 'xonsh') {
+            // #200374: native implementation is shorter
+            command = `import os, json; print("${mark}", json.dumps(dict(os.environ)), "${mark}")`
+            shellArgs = ['-i', '-l', '-c']
+        } else {
+            command = `'${process.execPath}' ${extraArgs} -p '"${mark}" + JSON.stringify(process.env) + "${mark}"'`
+
+            if (name === 'tcsh' || name === 'csh') {
+                shellArgs = ['-ic']
+            } else {
+                shellArgs = ['-i', '-l', '-c']
+            }
+        }
+
+        getLogger().debug(`getUnixShellEnvironment#spawn:%O, command:${command}`, shellArgs)
+
+        const child = new ChildProcess(systemShellUnix, [...shellArgs, command], {
+            spawnOptions: {
+                detached: true,
+                stdio: ['ignore', 'pipe', 'pipe'],
+                env: env,
+            },
+            timeout: timeout,
+            collect: true,
+        })
+
+        await child.run().then((result) => {
+            const stderrStr = result.stderr
+            if (stderrStr.trim()) {
+                getLogger().warn(`getUnixShellEnvironment#stderr:${stderrStr}`)
+            }
+
+            if (result.exitCode || result.signal) {
+                reject(
+                    new ToolkitError(
+                        `Unexpected exit code from spawned shell (code ${result.exitCode}, signal ${result.signal})`
+                    )
+                )
+            }
+
+            const match = regex.exec(result.stdout)
+            const rawStripped = match ? match[1] : '{}'
+
+            try {
+                const env = JSON.parse(rawStripped)
+
+                if (runAsNode) {
+                    env['ELECTRON_RUN_AS_NODE'] = runAsNode
+                } else {
+                    delete env['ELECTRON_RUN_AS_NODE']
+                }
+
+                if (noAttach) {
+                    env['ELECTRON_NO_ATTACH_CONSOLE'] = noAttach
+                } else {
+                    delete env['ELECTRON_NO_ATTACH_CONSOLE']
+                }
+
+                delete env['VSCODE_RESOLVING_ENVIRONMENT']
+
+                // https://github.com/microsoft/vscode/issues/22593#issuecomment-336050758
+                delete env['XDG_RUNTIME_DIR']
+
+                getLogger().debug(`getUnixShellEnvironment#result:${env}`)
+                resolve(env)
+            } catch (err) {
+                getLogger().error('getUnixShellEnvironment#errorCaught %O', err)
+                reject(err)
+            }
+        })
+    })
+}
diff --git a/src/shared/environmentVariables.ts b/packages/core/src/shared/environmentVariables.ts
similarity index 90%
rename from src/shared/environmentVariables.ts
rename to packages/core/src/shared/environmentVariables.ts
index b8c6b1edc3a..34c4a49194f 100644
--- a/src/shared/environmentVariables.ts
+++ b/packages/core/src/shared/environmentVariables.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/packages/core/src/shared/errors.ts b/packages/core/src/shared/errors.ts
new file mode 100644
index 00000000000..24e3f1ba93a
--- /dev/null
+++ b/packages/core/src/shared/errors.ts
@@ -0,0 +1,1114 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { AWSError } from 'aws-sdk'
+import { ServiceException } from '@smithy/smithy-client'
+import { isThrottlingError, isTransientError } from '@smithy/service-error-classification'
+import { Result } from './telemetry/telemetry'
+import { CancellationError } from './utilities/timeoutUtils'
+import { hasKey, isNonNullable } from './utilities/tsUtils'
+import type * as nodefs from 'fs' // eslint-disable-line no-restricted-imports
+import type * as os from 'os'
+import { CodeWhispererStreamingServiceException } from '@amzn/codewhisperer-streaming'
+import { driveLetterRegex } from './utilities/pathUtils'
+import { getLogger } from './logger/logger'
+import { crashMonitoringDirName, uploadCodeError } from './constants'
+import { RequestCancelledError } from './request'
+
+let _username = 'unknown-user'
+let _isAutomation = false
+
+/** Performs one-time initialization, to avoid circular dependencies. */
+export function init(username: string, isAutomation: boolean) {
+    _username = username
+    _isAutomation = isAutomation
+}
+
+export const errorCode = {
+    invalidConnection: 'InvalidConnection',
+}
+
+export interface ErrorInformation {
+    /**
+     * Error names are optional, but if provided they should be generic yet self-explanatory.
+     *
+     * A name does not need to precisely describe why something failed and instead should focus
+     * on the overarching theme or module that caused the problem. For example, VS Code uses
+     * `FileSystemError` for a diverse range of problems relating to their file system API.
+     *
+     * The choice of granularity for an error name largely comes down to what other errors are
+     * possible; names are meant to immediately disambiguate from the potentially thousands of
+     * other causes for a failure. If there is any doubt that a certain name might be confusing,
+     * opt for something more specific and verbose.
+     */
+    readonly name?: string
+
+    /**
+     * An error code is used to describe specific failure modes within entire classes of errors.
+     *
+     * The exact value used here is free-form but should be kept stable whenever possible.
+     * Value stability is especially important if any error handling logic directly relies on
+     * error codes. Prefer using {@link ToolkitError.named} and narrowing this class if any
+     * substantial logic is needed for handling specific error codes.
+     *
+     * As an example, one might choose to describe SSO error codes for extra type-safety:
+     * ```ts
+     * enum CreateTokenErrorCode {
+     *     SlowDown = 'SlowDownException',
+     *     ExpiredToken = 'ExpiredTokenException',
+     *     UnauthorizedClient = 'UnauthorizedClientException',
+     *     AuthorizationPending = 'AuthorizationPendingException',
+     * }
+     *
+     * class CreateTokenError extends ToolkitError.named('CreateTokenError') {
+     *     public constructor(public readonly code: CreateTokenErrorCode) {
+     *         super('Failed to create SSO access token', { code })
+     *     }
+     * }
+     * ```
+     */
+    readonly code?: string
+
+    /**
+     * Used to describe errors with a direct cause-effect relationship.
+     *
+     * See {@link code} for creating descriptive errors without a chainable root cause.
+     */
+    readonly cause?: Error
+
+    /**
+     * Structured information that may be used for logging.
+     *
+     * Consumers should strictly use this field for observability purposes as producers can
+     * put whatever they want here.
+     */
+    readonly details?: Record<string, unknown>
+
+    /**
+     * Flag to determine if the error was from a user-initiated cancellation.
+     */
+    readonly cancelled?: boolean
+
+    /**
+     * A link to documentation relevant to this error.
+     *
+     * TODO: use this throughout the codebase.
+     * TODO: prefer `Error.error_uri` if present (from OIDC/OAuth service)?
+     */
+    readonly documentationUri?: vscode.Uri
+}
+
+export class UnknownError extends Error {
+    public override readonly name = 'UnknownError'
+
+    public constructor(public readonly cause: unknown) {
+        super(String(cause))
+    }
+
+    public static cast(obj: unknown): Error {
+        return obj instanceof Error ? obj : new UnknownError(obj)
+    }
+}
+
+/**
+ * Anonymous class with a pre-defined error name.
+ */
+export interface NamedErrorConstructor {
+    /**
+     * See {@link ToolkitError}
+     */
+    new (message: string, info?: Omit<ErrorInformation, 'name'>): ToolkitError
+
+    /**
+     * See {@link ToolkitError.chain}
+     */
+    chain<T extends this>(
+        this: T,
+        error: unknown,
+        message: string,
+        info?: Omit<ErrorInformation, 'name' | 'cause'>
+    ): InstanceType<T>
+}
+
+/**
+ * Generic error class for handling exceptions within the Toolkit.
+ */
+export class ToolkitError extends Error implements ErrorInformation {
+    /**
+     * A message that could potentially be shown to the user. This should not contain any
+     * sensitive information and should be limited in technical detail.
+     */
+    public override readonly message: string
+    public readonly code: string | undefined
+    public readonly details: Record<string, unknown> | undefined
+
+    /**
+     * We guard against mutation to stop a developer from creating a circular chain of errors.
+     * The alternative is to truncate errors to an arbitrary depth though that doesn't address
+     * why the error chain is deep.
+     */
+    readonly #cause: Error | undefined
+    readonly #name: string
+    readonly #documentationUri: any
+    readonly #cancelled: boolean | undefined
+
+    public constructor(message: string, info: ErrorInformation = {}) {
+        super(message)
+        this.message = message
+        this.code = info.code
+        this.details = info.details
+        this.#cause = info.cause
+        this.#name = info.name ?? super.name
+        this.#cancelled = info.cancelled
+        this.#documentationUri = info.documentationUri
+    }
+
+    /**
+     * The original error that caused this error (if any).
+     */
+    public get cause(): Error | undefined {
+        return this.#cause
+    }
+
+    /**
+     * The name of the error. This is not necessarily the same as the class name.
+     */
+    public override get name(): string {
+        return this.#name
+    }
+
+    /**
+     * See {@link ErrorInformation.cancelled cancelled}.
+     *
+     * Whether or not an error is considered 'cancelled' is determined either by explicit
+     * assignment on construction or by finding a 'cancelled' error within its causal chain.
+     */
+    public get cancelled(): boolean {
+        return this.#cancelled ?? isUserCancelledError(this.cause)
+    }
+
+    /**
+     * The associated documentation, if it exists. Otherwise undefined.
+     */
+    public get documentationUri(): vscode.Uri | undefined {
+        return this.#documentationUri
+    }
+
+    /**
+     * A formatted string that is analogous to a stack trace. While stack traces enumerate every
+     * call site, this trace enumerates every throw site.
+     *
+     * The motivation here is that stack traces are often not very useful to anyone but the original
+     * developers. This is especially true for JavaScript where source maps are needed to parse traces
+     * from bundled applications. We want a trace that is informative but not excessively noisy.
+     */
+    public get trace(): string {
+        const message = formatError(this)
+
+        if (!this.cause) {
+            return message
+        }
+
+        // Stack overflows are only possible if `cause` is changed after instantiation
+        const residual = this.cause instanceof ToolkitError ? this.cause.trace : formatError(this.cause)
+
+        return `${message}\n\t -> ${residual}`
+    }
+
+    /**
+     * Creates a new {@link ToolkitError} instance that was directly caused by another error.
+     *
+     * @param error - The original error that caused this error.
+     * @param message - A descriptive message for the new error.
+     * @param info - Additional information about the error.
+     * @returns {ToolkitError} The new ToolkitError instance.
+     *
+     * @recommendation It is recommended to throw the returned ToolkitError instance instead of just returning it.
+     * This way, the error can be properly propagated and handled in the calling code.
+     *
+     * Example:
+     * ```typescript
+     * try {
+     *   // Some code that might throw an error
+     * } catch (error) {
+     *   throw ToolkitError.chain(error, 'An error occurred during operation', { operation: 'someOperation' });
+     * }
+     * ```
+     */
+    public static chain(error: unknown, message: string, info?: Omit<ErrorInformation, 'cause'>): ToolkitError {
+        return new this(message, {
+            ...info,
+            cause: UnknownError.cast(error),
+        })
+    }
+
+    /**
+     * Creates a new {@link ToolkitError} _class_ with a constant name.
+     *
+     * Constructor (class) names are not preserved when bundling due to name mangling. Extending off
+     * this new anonymous class will ensure that the specified name is always present.
+     */
+    public static named(name: string): NamedErrorConstructor {
+        return class extends ToolkitError {
+            public override get name() {
+                return name
+            }
+
+            // TypeScript does not allow the use of `this` types for generic prototype methods unfortunately
+            // This implementation is equivalent to re-assignment i.e. an unbound method on the prototype
+            public static override chain<
+                T extends new (...args: ConstructorParameters<NamedErrorConstructor>) => ToolkitError,
+            >(this: T, ...args: Parameters<NamedErrorConstructor['chain']>): InstanceType<T> {
+                return ToolkitError.chain.call(this, ...args) as InstanceType<T>
+            }
+        }
+    }
+}
+
+/**
+ * Derives an error message from the given error object.
+ * Depending on the Error, the property used to derive the message can vary.
+ *
+ * @param withCause Append the message(s) from the cause chain, recursively.
+ *                  The message(s) are delimited by ' | '. Eg: msg1 | causeMsg1 | causeMsg2
+ */
+export function getErrorMsg(err: Error | undefined, withCause: boolean = false): string | undefined {
+    if (err === undefined) {
+        return undefined
+    }
+
+    // Non-standard SDK fields added by the OIDC service, to conform to the OAuth spec
+    // (https://datatracker.ietf.org/doc/html/rfc6749#section-4.1.2.1) :
+    // - error: code per the OAuth spec
+    // - error_description: improved error message provided by OIDC service. Prefer this to
+    //   `message` if present.
+    //   https://github.com/aws/aws-toolkit-jetbrains/commit/cc9ed87fa9391dd39ac05cbf99b4437112fa3d10
+    // - error_uri: not provided by OIDC currently?
+    //
+    // Example:
+    //
+    //      [error] API response (oidc.us-east-1.amazonaws.com /token): {
+    //        name: 'InvalidGrantException',
+    //        '$fault': 'client',
+    //        '$metadata': {
+    //          httpStatusCode: 400,
+    //          requestId: '7f5af448-5af7-45f2-8e47-5808deaea4ab',
+    //          extendedRequestId: undefined,
+    //          cfId: undefined
+    //        },
+    //        error: 'invalid_grant',
+    //        error_description: 'Invalid refresh token provided',
+    //        message: 'UnknownError'
+    //      }
+    const anyDesc = (err as any).error_description
+    const errDesc = typeof anyDesc === 'string' ? anyDesc.trim() : ''
+    let msg = errDesc !== '' ? errDesc : err.message?.trim()
+
+    if (typeof msg !== 'string') {
+        return undefined
+    }
+
+    // append the cause's message
+    if (withCause) {
+        const errorId = getErrorId(err)
+        // - prepend id to message
+        // - If a generic error does not have the `name` field explicitly set, it returns a generic 'Error' name. So skip since it is useless.
+        if (errorId && errorId !== 'Error') {
+            msg = `${errorId}: ${msg}`
+        }
+
+        const cause = (err as any).cause
+        return `${msg}${cause ? ' | ' + getErrorMsg(cause, withCause) : ''}`
+    }
+
+    return msg
+}
+
+export function formatError(err: Error): string {
+    const code = hasCode(err) && err.code !== err.name ? `[${err.code}]` : undefined
+    const parts = [`${err.name}:`, getErrorMsg(err), code, formatDetails(err)]
+
+    return parts.filter(isNonNullable).join(' ')
+}
+
+function formatDetails(err: Error): string | undefined {
+    const details: Record<string, string | undefined> = {}
+
+    if (err instanceof ToolkitError && err.details !== undefined) {
+        for (const [k, v] of Object.entries(err.details)) {
+            details[k] = String(v)
+        }
+    } else if (isAwsError(err)) {
+        details['statusCode'] = String(err.statusCode ?? '')
+        details['requestId'] = getRequestId(err)
+        details['extendedRequestId'] = err.extendedRequestId
+    }
+
+    if (Object.keys(details).length === 0) {
+        return
+    }
+
+    const joined = Object.entries(details)
+        .filter(([_, v]) => !!v)
+        .map(([k, v]) => `${k}: ${v}`)
+        .join('; ')
+
+    return `(${joined})`
+}
+
+export function getTelemetryResult(error: unknown | undefined): Result {
+    if (error === undefined) {
+        return 'Succeeded'
+    } else if (isUserCancelledError(error)) {
+        return 'Cancelled'
+    }
+
+    return 'Failed'
+}
+
+/**
+ * Removes potential PII from a string, for logging/telemetry.
+ *
+ * Examples:
+ * - "Failed to save c:/fooß/bar/baz.txt" => "Failed to save c:/xß/x/x.txt"
+ * - "EPERM for dir c:/Users/user1/.aws/sso/cache/abc123.json" => "EPERM for dir c:/Users/x/.aws/sso/cache/x.json"
+ */
+export function scrubNames(s: string, username?: string) {
+    let r = ''
+    const fileExtRe = /\.[^.\/]+$/
+    const slashdot = /^[~.]*[\/\\]*/
+
+    /** Allowlisted filepath segments. */
+    const keep = new Set<string>([
+        '~',
+        '.',
+        '..',
+        '.aws',
+        'aws',
+        'sso',
+        'cache',
+        'credentials',
+        'config',
+        'Users',
+        'users',
+        'home',
+        'tmp',
+        'aws-toolkit-vscode',
+        'globalStorage', // from vscode globalStorageUri
+        crashMonitoringDirName,
+    ])
+
+    if (username && username.length > 2) {
+        s = s.replaceAll(username, 'x')
+    }
+
+    // Replace contiguous whitespace with 1 space.
+    s = s.replace(/\s+/g, ' ')
+
+    // 1. split on whitespace.
+    // 2. scrub words that match username or look like filepaths.
+    const words = s.split(/\s+/)
+    for (const word of words) {
+        const pathSegments = word.split(/[\/\\]/)
+        if (pathSegments.length < 2) {
+            // Not a filepath.
+            r += ' ' + word
+            continue
+        }
+
+        // Replace all (non-allowlisted) ASCII filepath segments with "x".
+        // "/foo/bar/aws/sso/" => "/x/x/aws/sso/"
+        let scrubbed = ''
+        // Get the frontmatter ("/", "../", "~/", or "./").
+        const start = word.trimStart().match(slashdot)?.[0] ?? ''
+        pathSegments[0] = pathSegments[0].trimStart().replace(slashdot, '')
+        for (const seg of pathSegments) {
+            if (driveLetterRegex.test(seg)) {
+                scrubbed += seg
+            } else if (keep.has(seg)) {
+                scrubbed += '/' + seg
+            } else {
+                // Save the first non-ASCII (unicode) char, if any.
+                const nonAscii = seg.match(/[^\p{ASCII}]/u)?.[0] ?? ''
+                // Replace all chars (except [^…]) with "x" .
+                const ascii = seg.replace(/[^$[\](){}:;'" ]+/g, 'x')
+                scrubbed += `/${ascii}${nonAscii}`
+            }
+        }
+
+        // includes leading '.', eg: '.json'
+        const fileExt = pathSegments[pathSegments.length - 1].match(fileExtRe) ?? ''
+        r += ` ${start.replace(/\\/g, '/')}${scrubbed.replace(/^[\/\\]+/, '')}${fileExt}`
+    }
+
+    return r.trim()
+}
+
+/**
+ * Gets the (partial) error message detail for the `reasonDesc` field.
+ *
+ * @param err Error object, or message text
+ */
+export function getTelemetryReasonDesc(err: unknown | undefined): string | undefined {
+    const m = typeof err === 'string' ? err : (getErrorMsg(err as Error, true) ?? '')
+    const msg = scrubNames(m, _username)
+
+    // Truncate message as these strings can be very long.
+    return msg && msg.length > 0 ? msg.substring(0, 350) : undefined
+}
+
+export function getTelemetryReason(error: unknown | undefined): string | undefined {
+    // Currently the `code` field is favored over the error name even though both are useful
+    // for describing the reason. We're only using a single `reason` field and it's just simpler
+    // to not encode more information.
+
+    if (error === undefined) {
+        return undefined
+    } else if (error instanceof CancellationError) {
+        return error.agent
+    } else if (error instanceof ToolkitError) {
+        // TODO: prefer the error.error field if present? (see comment in `getErrorMsg`)
+        return getTelemetryReason(error.cause) ?? error.code ?? error.name
+    } else if (error instanceof Error) {
+        return (error as { code?: string }).code ?? error.name
+    }
+
+    return 'Unknown'
+}
+
+/**
+ * Tries to build the most intuitive/relevant message to show to the user.
+ *
+ * User can see the full error chain in the logs Output channel.
+ */
+export function resolveErrorMessageToDisplay(error: unknown, defaultMessage: string): string {
+    const mainMsg = error instanceof ToolkitError ? error.message : defaultMessage
+    // Try to find the most useful/relevant error in the `cause` chain.
+    const bestErr = error ? findBestErrorInChain(error as Error) : undefined
+    const bestMsg = getErrorMsg(bestErr)
+    return bestMsg && bestMsg !== mainMsg ? `${mainMsg}: ${bestMsg}` : mainMsg
+}
+
+/**
+ * Patterns that match the value of {@link AWSError.code}
+ */
+const _preferredErrors: RegExp[] = [
+    /^ConflictException$/,
+    /^ValidationException$/,
+    /^ResourceNotFoundException$/,
+    /^ServiceQuotaExceededException$/,
+    /^AccessDeniedException$/,
+    /^InvalidPermissions$/,
+    /^EPIPE$/,
+    /^EPERM$/,
+]
+
+/**
+ * Searches the `cause` chain (if any) for the most useful/relevant {@link AWSError} to surface to
+ * the user, preferring "deeper" errors (lower-level, closer to the root cause) when all else is equal.
+ *
+ * These conditions determine precedence (in order):
+ * - is AWSError
+ * - has `error_description` field
+ * - has `code` matching `preferredErrors`
+ * - is filesystem error
+ * - cause chain depth (the deepest error wins)
+ *
+ * @param error Error whose `cause` chain will be searched.
+ * @param preferredErrors Error `code` field must match one of these, else it is discarded. Pass `[/./]` to match any AWSError.
+ *
+ * @returns Best match, or `error` if a better match is not found.
+ */
+export function findBestErrorInChain(error: Error, preferredErrors = _preferredErrors): Error | undefined {
+    // TODO: Base Error has 'cause' in ES2022. So does our own `ToolkitError`.
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    let bestErr: Error & { code?: string; cause?: Error; error_description?: string } = error
+    let err: typeof bestErr | undefined
+
+    for (let i = 0; i < 100; i++) {
+        err = i === 0 ? bestErr.cause : err?.cause
+        if (!err) {
+            break
+        }
+
+        // const bestErrCode = bestErr.code?.trim() ?? ''
+        // const preferBest = ...
+        const errCode = err.code?.trim() ?? ''
+        const prefer =
+            (errCode !== '' && preferredErrors.some((re) => re.test(errCode))) ||
+            // In priority order:
+            isFilesystemError(err) ||
+            isPermissionsError(err)
+
+        if (isAwsError(err) || (prefer && !isAwsError(bestErr))) {
+            if (isAwsError(err) && !isAwsError(bestErr)) {
+                bestErr = err // Prefer AWSError.
+                continue
+            }
+
+            const errDesc = err.error_description
+            if (typeof errDesc === 'string' && errDesc.trim() !== '') {
+                bestErr = err // Prefer (deepest) error with error_description.
+                continue
+            }
+
+            if (!bestErr.error_description && prefer) {
+                bestErr = err
+            }
+        }
+    }
+
+    return bestErr
+}
+
+export function isCodeWhispererStreamingServiceException(
+    error: unknown
+): error is CodeWhispererStreamingServiceException {
+    if (error === undefined) {
+        return false
+    }
+
+    return error instanceof Error && hasFault(error) && hasMetadata(error) && hasName(error)
+}
+
+function hasFault<T>(error: T): error is T & { $fault: 'client' | 'server' } {
+    const fault = (error as { $fault?: unknown }).$fault
+    return typeof fault === 'string' && (fault === 'client' || fault === 'server')
+}
+
+function hasMetadata<T>(error: T): error is T & Pick<CodeWhispererStreamingServiceException, '$metadata'> {
+    return typeof (error as { $metadata?: unknown })?.$metadata === 'object'
+}
+
+function hasResponse<T>(error: T): error is T & Pick<ServiceException, '$response'> {
+    return typeof (error as { $response?: unknown })?.$response === 'object'
+}
+
+function hasName<T>(error: T): error is T & { name: string } {
+    return typeof (error as { name?: unknown })?.name === 'string'
+}
+
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export function isAwsError(error: unknown): error is AWSError & { error_description?: string } {
+    if (error === undefined) {
+        return false
+    }
+
+    return error instanceof Error && hasCode(error) && hasTime(error)
+}
+
+export function isServiceException(error: unknown): error is ServiceException {
+    return error instanceof ServiceException
+}
+
+export function hasCode<T>(error: T): error is T & { code: string } {
+    return typeof (error as { code?: unknown }).code === 'string'
+}
+
+/**
+ * Returns the identifier the given error.
+ * Depending on the implementation, the identifier may exist on a
+ * different property.
+ */
+export function getErrorId(error: Error): string {
+    // prioritize code over the name
+    return hasCode(error) ? error.code : error.name
+}
+
+function hasTime(error: Error): error is typeof error & { time: Date } {
+    return (error as { time?: unknown }).time instanceof Date
+}
+
+export function isUserCancelledError(error: unknown): boolean {
+    return (
+        CancellationError.isUserCancelled(error) ||
+        (error instanceof ToolkitError && error.cancelled) ||
+        error instanceof RequestCancelledError
+    )
+}
+
+/**
+ * Checks if the AWS SDK v3 error was caused by the client and not due to a service issue.
+ */
+export function isClientFault(error: ServiceException): boolean {
+    return error.$fault === 'client' && !(isThrottlingError(error) || isTransientError(error))
+}
+
+export function getRequestId(err: unknown): string | undefined {
+    // XXX: Checking `err instanceof ServiceException` fails for `SSOOIDCServiceException` even
+    // though it subclasses @aws-sdk/smithy-client.ServiceException
+    if (typeof (err as any)?.$metadata?.requestId === 'string') {
+        return (err as any).$metadata.requestId
+    }
+
+    if (isAwsError(err)) {
+        return err.requestId
+    }
+}
+
+export function getHttpStatusCode(err: unknown): number | undefined {
+    if (hasResponse(err) && err?.$response?.statusCode !== undefined) {
+        return err?.$response?.statusCode
+    }
+    if (hasMetadata(err) && err.$metadata?.httpStatusCode !== undefined) {
+        return err.$metadata?.httpStatusCode
+    }
+
+    return undefined
+}
+
+export function isFilesystemError(err: unknown): boolean {
+    if (
+        err instanceof vscode.FileSystemError ||
+        (hasCode(err) &&
+            (err.code === 'EEXIST' ||
+                err.code === 'EISDIR' ||
+                err.code === 'ENOTDIR' ||
+                err.code === 'EMFILE' ||
+                err.code === 'ENOENT' ||
+                err.code === 'ENOTEMPTY'))
+    ) {
+        return true
+    }
+
+    return false
+}
+
+// export function isIsDirError(err: unknown): boolean {
+//     if (err instanceof vscode.FileSystemError) {
+//         return err.code === vscode.FileSystemError.FileIsADirectory().code
+//     } else if (hasCode(err)) {
+//         return err.code === 'EISDIR'
+//     }
+//     return false
+// }
+//
+// export function isFileExistsError(err: unknown): boolean {
+//     if (err instanceof vscode.FileSystemError) {
+//         return err.code === vscode.FileSystemError.FileExists().code
+//     } else if (hasCode(err)) {
+//         return err.code === 'EEXIST'
+//     }
+//     return false
+// }
+
+export function isFileNotFoundError(err: unknown): boolean {
+    if (err instanceof vscode.FileSystemError) {
+        return err.code === vscode.FileSystemError.FileNotFound().code
+    } else if (hasCode(err)) {
+        return err.code === 'ENOENT' || err.code === 'FileNotFound'
+    }
+
+    return false
+}
+
+export function isPermissionsError(err: unknown): boolean {
+    if (err instanceof vscode.FileSystemError) {
+        return (
+            err.code === vscode.FileSystemError.NoPermissions().code ||
+            // The code _should_ be `NoPermissions`, maybe this is a bug?
+            (err.code === 'Unknown' && err.message.includes('EACCES: permission denied'))
+        )
+    } else if (hasCode(err)) {
+        // " Some operating systems report EPERM in situations unrelated to permissions."
+        // || err.code === 'EPERM'
+        return err.code === 'EACCES'
+    }
+
+    return false
+}
+
+function modeToString(mode: number) {
+    return Array.from('rwxrwxrwx')
+        .map((c, i, a) => ((mode >> (a.length - (i + 1))) & 1 ? c : '-'))
+        .join('')
+}
+
+function vscodeModeToString(mode: vscode.FileStat['permissions']) {
+    // XXX: vscode.FileStat.permissions only indicates "readonly" or nothing (aka "writable").
+    if (mode === undefined) {
+        return 'rwx------'
+    } else if (mode === vscode.FilePermission.Readonly) {
+        return 'r-x------'
+    }
+
+    // XXX: future-proof in case vscode.FileStat.permissions gains more granularity.
+    if (_isAutomation) {
+        throw new Error('vscode.FileStat.permissions gained new fields, update this logic')
+    }
+}
+
+function getEffectivePerms(uid: number, gid: number, stats: nodefs.Stats) {
+    const mode = stats.mode
+    const isOwner = uid === stats.uid
+    const isGroup = gid === stats.gid && !isOwner
+
+    // Many unix systems support multiple groups but we only know the primary
+    // The user can still have group permissions despite not having the same `gid`
+    // These situations are ambiguous, so the effective permissions are the
+    // intersection of the two bitfields
+    if (!isOwner && !isGroup) {
+        return {
+            isAmbiguous: true,
+            effective: mode & 0o007 & ((mode & 0o070) >> 3),
+        }
+    }
+
+    const ownerMask = isOwner ? 0o700 : 0
+    const groupMask = isGroup ? 0o070 : 0
+
+    return {
+        isAmbiguous: false,
+        effective: ((mode & groupMask) >> 3) | ((mode & ownerMask) >> 6),
+    }
+}
+
+// The wildcard (`*`) symbol is non-standard. It's used to represent "don't cares" and takes
+// on the actual flag once known.
+export type PermissionsTriplet = `${'r' | '-' | '*'}${'w' | '-' | '*'}${'x' | '-' | '*'}`
+export class PermissionsError extends ToolkitError {
+    public readonly actual: string // This is a resolved triplet, _not_ the full bits
+
+    static fromNodeFileStats(stats: nodefs.Stats, userInfo: os.UserInfo<string>) {
+        const mode = `${stats.isDirectory() ? 'd' : '-'}${modeToString(stats.mode)}`
+        const owner = stats.uid === userInfo.uid ? (stats.uid === -1 ? '' : userInfo.username) : String(stats.uid)
+        const group = String(stats.gid)
+        const { effective, isAmbiguous } = getEffectivePerms(userInfo.uid, userInfo.gid, stats)
+        const actual = modeToString(effective).slice(-3)
+        const isOwner = stats.uid === -1 ? 'unknown' : userInfo.uid === stats.uid
+
+        return { mode, owner, group, actual, isAmbiguous, isOwner }
+    }
+
+    static fromVscodeFileStats(stats: vscode.FileStat, userInfo: os.UserInfo<string>) {
+        const isDir = !!(stats.type & vscode.FileType.Directory)
+        const mode = `${isDir ? 'd' : '-'}${vscodeModeToString(stats.permissions)}`
+        const owner = '' // vscode.FileStat does not currently provide file owner.
+        const group = '' // vscode.FileStat does not currently provide file group.
+        const isAmbiguous = true // vscode.workspace.fs.stat() is currently always ambiguous.
+        const actual = mode
+        const isOwner = 'unknown' // vscode.FileStat does not currently provide file owner.
+
+        return { mode, owner, group, actual, isAmbiguous, isOwner }
+    }
+
+    /**
+     * Creates a PermissionsError from a file stat() result.
+     *
+     * Note: pass `nodefs.Stats` when possible (in a nodejs context), because it gives much better info.
+     */
+    public constructor(
+        public readonly uri: vscode.Uri,
+        public readonly stats: nodefs.Stats | vscode.FileStat,
+        public readonly userInfo: os.UserInfo<string>,
+        public readonly expected: PermissionsTriplet,
+        source?: unknown
+    ) {
+        const o = (stats as any).type
+            ? PermissionsError.fromVscodeFileStats(stats as vscode.FileStat, userInfo)
+            : PermissionsError.fromNodeFileStats(stats as nodefs.Stats, userInfo)
+
+        const resolvedExpected = Array.from(expected)
+            .map((c, i) => (c === '*' ? o.actual[i] : c))
+            .join('')
+        const actualText = !o.isAmbiguous ? o.actual : `${o.mode.slice(-6, -3)} & ${o.mode.slice(-3)} (ambiguous)`
+
+        // Guard against surfacing confusing error messages. If the actual perms equal the resolved
+        // perms then odds are it wasn't really a permissions error. Some operating systems report EPERM
+        // in situations that aren't related to permissions at all.
+        if (o.actual === resolvedExpected && !o.isAmbiguous && source !== undefined) {
+            throw source
+        }
+
+        super(`${uri.fsPath} has incorrect permissions. Expected ${resolvedExpected}, found ${actualText}.`, {
+            code: 'InvalidPermissions',
+            details: {
+                isOwner: o.isOwner,
+                mode: `${o.mode}${o.owner === '' ? '' : ` ${o.owner}`}${o.group === '' ? '' : ` ${o.group}`}`,
+            },
+        })
+
+        this.actual = o.actual
+    }
+}
+
+/**
+ * Errors extending this class are considered "errors" in service metrics.
+ */
+export class ClientError extends ToolkitError {
+    constructor(message: string, info: ErrorInformation = { code: '400' }) {
+        super(message, info)
+    }
+}
+
+/**
+ * Errors extending this class are considered "faults" in service metrics.
+ */
+export class ServiceError extends ToolkitError {
+    constructor(message: string, info: ErrorInformation = { code: '500' }) {
+        super(message, info)
+    }
+}
+
+export class UploadURLExpired extends ClientError {
+    constructor() {
+        super(
+            "I’m sorry, I wasn't able to generate code. A connection timed out or became unavailable. Please try again or check the following:\n\n- Exclude non-essential files in your workspace’s .gitignore.\n\n- Check that your network connection is stable.",
+            { code: 'UploadURLExpired' }
+        )
+    }
+}
+
+export class UploadCodeError extends ServiceError {
+    constructor(statusCode: string) {
+        super(uploadCodeError, { code: `UploadCode-${statusCode}` })
+    }
+}
+
+export class ContentLengthError extends ClientError {
+    constructor(message: string, info: ErrorInformation = { code: 'ContentLengthError' }) {
+        super(message, info)
+    }
+}
+
+export function isNetworkError(err?: unknown): err is Error & { code: string } {
+    if (!(err instanceof Error)) {
+        return false
+    }
+
+    if (
+        isVSCodeProxyError(err) ||
+        isSocketTimeoutError(err) ||
+        isEnoentError(err) ||
+        isEaccesError(err) ||
+        isEbadfError(err) ||
+        isEconnRefusedError(err) ||
+        err instanceof AwsClientResponseError ||
+        isBadResponseCode(err) ||
+        isEbusyError(err)
+    ) {
+        return true
+    }
+
+    if (!hasCode(err)) {
+        return false
+    }
+
+    return [
+        'ENOTFOUND',
+        'EAI_AGAIN',
+        'ECONNRESET',
+        'ECONNREFUSED',
+        'ETIMEDOUT',
+        'ENETUNREACH',
+        'ERR_TLS_CERT_ALTNAME_INVALID', // dns issue?
+        'EPROTO', // due to legacy server "unsafe legacy renegotiation"?
+        'EHOSTUNREACH',
+        'EADDRINUSE',
+        'ENOBUFS', // client side memory issue during http request?
+        'EADDRNOTAVAIL', // port not available/allowed?,
+        'SELF_SIGNED_CERT_IN_CHAIN',
+        'UNABLE_TO_VERIFY_LEAF_SIGNATURE',
+        'UNABLE_TO_GET_ISSUER_CERT_LOCALLY',
+        'HPE_INVALID_VERSION',
+        'DEPTH_ZERO_SELF_SIGNED_CERT',
+        'ENOTCONN',
+        'ENETDOWN',
+        'ECONNABORTED',
+        'CERT_HAS_EXPIRED',
+        'EAI_FAIL',
+        '502', // This may be irrelevant as isBadResponseCode() may be all we need
+        'InternalServerException',
+        'ERR_SSL_WRONG_VERSION_NUMBER',
+    ].includes(err.code)
+}
+
+/**
+ * This error occurs on a network call if the user has set up a proxy in the
+ * VS Code settings but the proxy is not reachable.
+ *
+ * Setting ID: http.proxy
+ */
+function isVSCodeProxyError(err: Error): boolean {
+    return isError(err, 'Error', 'Failed to establish a socket connection to proxies')
+}
+
+/**
+ * When making SSO OIDC calls, we were seeing errors in telemetry and narrowing it down brings us to:
+ * https://github.com/smithy-lang/smithy-typescript/blob/6aac850af4b5b07b3941854d21e3b0158aefcacb/packages/node-http-handler/src/set-socket-timeout.ts#L7
+ * This looks to be thrown during http requests, so we'll consider it a network error.
+ *
+ * The scenario where we are actually getting the error though might actually be a bug:
+ * https://github.com/aws/aws-sdk-js-v3/issues/6271
+ */
+function isSocketTimeoutError(err: Error): boolean {
+    return isError(err, 'TimeoutError', 'Connection timed out after')
+}
+
+/**
+ * We were seeing errors of ENOENT for the oidc FQDN (eg: oidc.us-east-1.amazonaws.com) during the SSO flow.
+ * Our assumption is that this is an intermittent error.
+ */
+function isEnoentError(err: Error): boolean {
+    return isError(err, 'ENOENT', 'getaddrinfo ENOENT')
+}
+
+function isEaccesError(err: Error): boolean {
+    return isError(err, 'EACCES', 'connect EACCES')
+}
+
+function isEbadfError(err: Error): boolean {
+    return isError(err, 'EBADF', 'connect EBADF')
+}
+
+function isEconnRefusedError(err: Error): boolean {
+    return isError(err, 'Error', 'connect ECONNREFUSED')
+}
+
+function isEbusyError(err: Error) {
+    // we were seeing errors with the message 'getaddrinfo EBUSY oidc.us-east-1.amazonaws.com'
+    return isError(err, 'EBUSY', 'getaddrinfo EBUSY')
+}
+
+/** Helper function to assert given error has the expected properties */
+export function isError(err: Error, id: string, messageIncludes: string = '') {
+    // It is not always clear if the error has the expected value in the `name` or `code` field
+    // so this checks both.
+    return (err.name === id || (err as any).code === id) && err.message.includes(messageIncludes)
+}
+
+/**
+ * These are the errors explicitly seen in telemetry. We can instead do any non-200 response code
+ * later, but this will give us better visibility in to the actual error codes we are currently getting.
+ */
+const errorResponseCodes = [302, 403, 404, 502, 503]
+
+/**
+ * Returns true if the given error is a bad response code
+ */
+function isBadResponseCode(error: Error) {
+    if (isNaN(Number(error.name))) {
+        return
+    }
+    const statusCode = parseInt(error.name, 10)
+    return errorResponseCodes.includes(statusCode)
+}
+
+/**
+ * AWS SDK clients make requests with the expected result to be JSON data.
+ * But in some cases the request may fail and result in an error HTML page being returned instead
+ * of the JSON. This will cause the client to throw a `SyntaxError` as a result
+ * of attempt to deserialize the non-JSON data.
+ *
+ * But within the `SyntaxError` instance is the real reason for the failure.
+ * This class attempts to extract the underlying issue from the SyntaxError.
+ *
+ * Example SyntaxError message before extracting the underlying issue:
+ *  - "Unexpected token '<', "<html><bod"... is not valid JSON Deserialization error: to see the raw response, inspect the hidden field {error}.$response on this object."
+ * Once we extract the real error message from the hidden field, `$response.reason`, we get messages similar to:
+ *  - "SDK Client unexpected error response: data response code: 403, data reason: Forbidden | Unexpected ..."
+ */
+export class AwsClientResponseError extends Error {
+    /** Use {@link instanceIf} to create instance. */
+    protected constructor(err: unknown) {
+        const underlyingErrorMsg = AwsClientResponseError.tryExtractReasonFromSyntaxError(err)
+
+        /**
+         * This condition should never be hit since {@link AwsClientResponseError.instanceIf}
+         * is the only way to create an instance of this class, due to the constructor not being public.
+         *
+         * The following only exists to make the type checker happy.
+         */
+        if (!(underlyingErrorMsg && err instanceof Error)) {
+            throw Error(`Cannot create AwsClientResponseError from ${JSON.stringify(err)}}`)
+        }
+
+        super(underlyingErrorMsg)
+    }
+
+    /**
+     * Resolves an instance of {@link AwsClientResponseError} if the given error matches certain criteria.
+     * Otherwise the original error is returned.
+     */
+    static instanceIf<T>(err: T): AwsClientResponseError | T {
+        const reason = AwsClientResponseError.tryExtractReasonFromSyntaxError(err)
+        if (reason) {
+            getLogger().debug(`Creating AwsClientResponseError from SyntaxError: %O`, err)
+            return new AwsClientResponseError(err)
+        }
+        return err
+    }
+
+    /**
+     * Returns the true underlying error message from a `SyntaxError`, if possible.
+     * Otherwise returning undefined.
+     */
+    static tryExtractReasonFromSyntaxError(err: unknown): string | undefined {
+        if (
+            !(
+                err instanceof SyntaxError &&
+                err.message.includes('inspect the hidden field {error}.$response on this object')
+            )
+        ) {
+            return undefined
+        }
+
+        // See the class docstring to explain how we know the existence of the following keys
+        if (hasKey(err, '$response') && err['$response'] !== undefined) {
+            const response = err['$response']
+            if (response) {
+                if (hasKey(response, 'reason') && response['reason'] !== undefined) {
+                    return response['reason'] as string
+                } else {
+                    // We were seeing some cases in telemetry where a syntax error made it all the way to this point
+                    // but then may have not had a 'reason'.
+                    return `No 'reason' field in '$response' | ${JSON.stringify(response)} | ${err.message}`
+                }
+            }
+        } else {
+            // We were seeing some cases in telemetry where a syntax error made it all the way to this point
+            // but then may have not had a '$response'.
+            return `No '$response' field in SyntaxError | ${err.message}`
+        }
+
+        return undefined
+    }
+}
+
+/**
+ * Run a function and swallow any errors that are not specified by `shouldThrow`
+ */
+export function tryRun<T>(fn: () => T, shouldThrow: (err: Error) => boolean, logMsg?: string): T | undefined
+export function tryRun<T>(
+    fn: () => Promise<T>,
+    shouldThrow: (err: Error) => boolean,
+    logMsg?: string
+): Promise<T> | undefined
+export function tryRun<T>(
+    fn: () => T | Promise<T>,
+    shouldThrow: (err: Error) => boolean,
+    logMsg?: string
+): T | Promise<T | void> | undefined {
+    // The function signature pattern will accept both async and non-async types.
+
+    const catchErr = (err: Error) => {
+        if (shouldThrow(err)) {
+            throw err
+        }
+
+        getLogger().error(logMsg ?? 'unknown caller: Error ignored: %s', err)
+    }
+
+    try {
+        const result = fn()
+        if (result instanceof Promise) {
+            return result.catch(catchErr)
+        }
+        return result
+    } catch (error: any) {
+        catchErr(error)
+    }
+}
diff --git a/packages/core/src/shared/extensionGlobals.ts b/packages/core/src/shared/extensionGlobals.ts
new file mode 100644
index 00000000000..6e495339de9
--- /dev/null
+++ b/packages/core/src/shared/extensionGlobals.ts
@@ -0,0 +1,230 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ExtensionContext, LogOutputChannel, OutputChannel } from 'vscode'
+import { LoginManager } from '../auth/deprecated/loginManager'
+import { AwsResourceManager } from '../dynamicResources/awsResourceManager'
+import { AWSClientBuilder } from './awsClientBuilder'
+import { AwsContext } from './awsContext'
+import { AwsContextCommands } from './awsContextCommands'
+import { RegionProvider } from './regions/regionProvider'
+import { CloudFormationTemplateRegistry } from './fs/templateRegistry'
+import { CodelensRootRegistry } from './fs/codelensRootRegistry'
+import { SchemaService } from './schemas'
+import { TelemetryLogger } from './telemetry/telemetryLogger'
+import { TelemetryService } from './telemetry/telemetryService'
+import { UriHandler } from './vscode/uriHandler'
+import { GlobalState } from './globalState'
+import { setContext } from './vscode/setContext'
+import { getLogger } from './logger/logger'
+import { AWSClientBuilderV3 } from './awsClientBuilderV3'
+
+type Clock = Pick<
+    typeof globalThis,
+    | 'setTimeout'
+    | 'setImmediate'
+    | 'setInterval'
+    | 'clearTimeout'
+    | 'clearImmediate'
+    | 'clearInterval'
+    | 'Date'
+    | 'Promise'
+>
+
+/**
+ * Copies all *enumerable* properties from the global object.
+ * Some properties have to be added manually depending on how they exist on the prototype.
+ */
+function copyClock(): Clock {
+    const clock: any = {
+        setTimeout: globalThis.setTimeout.bind(globalThis),
+        setInterval: globalThis.setInterval.bind(globalThis),
+        clearTimeout: globalThis.clearTimeout.bind(globalThis),
+        clearInterval: globalThis.clearInterval.bind(globalThis),
+        Date,
+        Promise,
+    }
+
+    const browserAlternatives = getBrowserAlternatives()
+    if (Object.keys(browserAlternatives).length > 0) {
+        getLogger().info('globals: Using browser alternatives for clock functions')
+        Object.assign(clock, browserAlternatives)
+    } else {
+        // In node.js context
+        clock.setImmediate = globalThis.setImmediate.bind(globalThis)
+        clock.clearImmediate = globalThis.clearImmediate.bind(globalThis)
+    }
+
+    return clock
+}
+
+/**
+ * If we are in browser certain functions are not available, so
+ * we create alternatives for them.
+ */
+function getBrowserAlternatives() {
+    const alternatives = {} as any
+    if (globalThis.setImmediate === undefined) {
+        // "A setTimeout() callback with a 0ms delay is very similar to setImmediate()"
+        // https://nodejs.dev/en/learn/understanding-setimmediate/
+        alternatives['setImmediate'] = (callback: (...args: any[]) => void, ...args: any[]) => {
+            return globalThis.setTimeout(callback, 0, ...args)
+        }
+        alternatives['clearImmediate'] = (handle: any) => {
+            globalThis.clearTimeout(handle)
+        }
+    }
+    return alternatives
+}
+
+/**
+ * XXX: Web-mode tests (as opposed to Node.js tests) don't see changes to exported module variables.
+ *
+ * Workaround: store variables in `globalThis` so that web-mode tests can share them.
+ *
+ * See `web.md` for more info.
+ *
+ * Note: The returned globals is shared across all extensions/the entire VS Code instance.
+ *
+ */
+function resolveGlobalsObject(): ToolkitGlobals {
+    if ((globalThis as any).globals === undefined) {
+        ;(globalThis as any).globals = { clock: copyClock() } as ToolkitGlobals
+    }
+    return (globalThis as any).globals
+}
+
+/**
+ * Throw a more intuitive error if any code tries to use `globals` before `initialize()` was called.
+ */
+function proxyGlobals(globals_: ToolkitGlobals): ToolkitGlobals {
+    return new Proxy(globals_, {
+        get: (target, prop) => {
+            // Test for initialize()
+            if (
+                !initialized &&
+                !target.isWeb // extension instance globals would have set this truly globally prior to the test instance globals being accessed.
+            ) {
+                throw new Error(`ToolkitGlobals accessed before initialize()`)
+            }
+
+            // Test that the property was set before access.
+            // Tradeoff: not being able to do something like `globals.myValue ??= ...` without a try/catch
+            const propName = String(prop)
+            const val = (target as any)[propName]
+            if (
+                val !== undefined ||
+                propName.includes('Symbol') // hack for sinon.stub
+            ) {
+                return val
+            }
+            throw new Error(`ToolkitGlobals.${propName} accessed, but this property is not set.`)
+        },
+    })
+}
+
+/**
+ * Extension globals object.
+ * Unless this is running in web mode, these globals are scoped only to the current extension.
+ *
+ * TODO: If multiple extensions are running in webmode, they will override and access
+ * each other's globals. We should partition globalThis by extension ID.
+ */
+let globals = proxyGlobals(resolveGlobalsObject())
+
+export function checkDidReload(context: ExtensionContext): boolean {
+    // TODO: fix this
+    // eslint-disable-next-line aws-toolkits/no-banned-usages
+    return !!context.globalState.get<string>('ACTIVATION_LAUNCH_PATH_KEY')
+}
+
+let initialized = false
+export function initialize(context: ExtensionContext, isWeb: boolean = false): ToolkitGlobals {
+    if (!isWeb) {
+        // Not running in web mode, let's use globals scoped to the current extension only.
+        globals = proxyGlobals({} as ToolkitGlobals)
+    }
+    Object.assign(globals, {
+        context,
+        clock: copyClock(),
+        didReload: checkDidReload(context),
+        // eslint-disable-next-line aws-toolkits/no-banned-usages
+        globalState: new GlobalState(context.globalState),
+        manifestPaths: {} as ToolkitGlobals['manifestPaths'],
+        isWeb,
+    })
+    void setContext('aws.isWebExtHost', isWeb)
+
+    initialized = true
+
+    return globals
+}
+
+export function isWeb() {
+    return globals.isWeb
+}
+
+export { globals as default }
+
+/**
+ * Namespace for common variables used globally in the extension.
+ * All variables here must be initialized in the activate() method of extension.ts
+ */
+export interface ToolkitGlobals {
+    readonly context: ExtensionContext
+    /** Global, shared (with all vscode instances, including remote!), mutable, persisted state (survives IDE restart), namespaced to the extension (not shared with other vscode extensions). */
+    readonly globalState: GlobalState
+    /** Decides the prefix for package.json extension parameters, e.g. commands, 'setContext' values, etc. */
+    contextPrefix: string
+
+    //
+    // TODO: make the rest of these readonly (or delete them)
+    //
+
+    /**
+     * For "normal" messages, to show output from various application features (the result of
+     * a Lambda invocation, "sam build" output, etc.).
+     */
+    outputChannel: OutputChannel
+    /**
+     * Log messages. Use `outputChannel` for application messages.
+     */
+    logOutputChannel: LogOutputChannel
+    loginManager: LoginManager
+    awsContextCommands: AwsContextCommands
+    awsContext: AwsContext
+    regionProvider: RegionProvider
+    sdkClientBuilder: AWSClientBuilder
+    sdkClientBuilderV3: AWSClientBuilderV3
+    telemetry: TelemetryService & { logger: TelemetryLogger }
+    /** template.yaml registry. _Avoid_ calling this until it is actually needed (for SAM features). */
+    templateRegistry: Promise<CloudFormationTemplateRegistry>
+    schemaService: SchemaService
+    codelensRootRegistry: CodelensRootRegistry
+    resourceManager: AwsResourceManager
+    uriHandler: UriHandler
+    /** An id to differentiate the current machine being run on. Can help distinguish a remote from a local machine.  */
+    machineId: string
+
+    /**
+     * Whether the current session was (likely) a reload forced by VSCode during a workspace folder operation.
+     */
+    readonly didReload: boolean
+
+    /**
+     * This is a shallow copy of the global `this` object.
+     *
+     * Using a separate clock from the global one allows us to scope down behavior for testing.
+     * Keep in mind that this clock's `Date` constructor will be different than the global one when mocked.
+     */
+    readonly clock: Clock
+
+    readonly manifestPaths: {
+        endpoints: string
+        lambdaSampleRequests: string
+    }
+    /** If this extension is running in Web mode (the browser), compared to running on the desktop (node) */
+    isWeb: boolean
+}
diff --git a/packages/core/src/shared/extensionStartup.ts b/packages/core/src/shared/extensionStartup.ts
new file mode 100644
index 00000000000..740534e2177
--- /dev/null
+++ b/packages/core/src/shared/extensionStartup.ts
@@ -0,0 +1,43 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as _ from 'lodash'
+import * as vscode from 'vscode'
+import * as semver from 'semver'
+import { getIdeType, isAmazonQ, productName } from './extensionUtilities'
+import * as localizedText from './localizedText'
+import { AmazonQPromptSettings, ToolkitPromptSettings } from './settings'
+import { showMessage } from './utilities/messages'
+import { getTelemetryReasonDesc } from './errors'
+
+/**
+ * Shows a (suppressible) warning if the current vscode version is older than `minVscode`.
+ */
+export async function maybeShowMinVscodeWarning(minVscode: string) {
+    const settings = isAmazonQ() ? AmazonQPromptSettings.instance : ToolkitPromptSettings.instance
+    if (!settings.isPromptEnabled('minIdeVersion')) {
+        return
+    }
+    const updateButton = `Update ${vscode.env.appName}`
+    const msg = `${productName()} will soon require VS Code ${minVscode} or newer. The currently running version ${vscode.version} will no longer receive updates.`
+    if (getIdeType() === 'vscode' && semver.lt(vscode.version, minVscode)) {
+        void showMessage(
+            'warn',
+            msg,
+            [updateButton, localizedText.dontShow],
+            {},
+            {
+                id: 'maybeShowMinVscodeWarning',
+                reasonDesc: getTelemetryReasonDesc(msg),
+            }
+        ).then(async (resp) => {
+            if (resp === updateButton) {
+                await vscode.commands.executeCommand('update.checkForUpdate')
+            } else if (resp === localizedText.dontShow) {
+                void settings.disablePrompt('minIdeVersion')
+            }
+        })
+    }
+}
diff --git a/packages/core/src/shared/extensionUtilities.ts b/packages/core/src/shared/extensionUtilities.ts
new file mode 100644
index 00000000000..b8b5780c612
--- /dev/null
+++ b/packages/core/src/shared/extensionUtilities.ts
@@ -0,0 +1,544 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as _ from 'lodash'
+import * as os from 'os'
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+import { getLogger } from './logger/logger'
+import { VSCODE_EXTENSION_ID, extensionAlphaVersion } from './extensions'
+import { Ec2MetadataClient } from './clients/ec2MetadataClient'
+import { DefaultEc2MetadataClient } from './clients/ec2MetadataClient'
+import { extensionVersion, getCodeCatalystDevEnvId, hasSageMakerEnvVars } from './vscode/env'
+import globals from './extensionGlobals'
+import { once } from './utilities/functionUtils'
+import {
+    apprunnerCreateServiceDocUrl,
+    debugNewSamAppDocUrl,
+    documentationUrl,
+    launchConfigDocUrl,
+    samDeployDocUrl,
+    samInitDocUrl,
+} from './constants'
+import {
+    cloud9Appname,
+    cloud9CnAppname,
+    sageMakerAppname,
+    sageMakerUnifiedStudio,
+    vscodeAppname,
+} from './vscode/constants'
+
+const localize = nls.loadMessageBundle()
+
+const notInitialized = 'notInitialized'
+
+function _isAmazonQ() {
+    const id = globals.context.extension.id
+    const isToolkit = id === VSCODE_EXTENSION_ID.awstoolkit
+    const isQ = id === VSCODE_EXTENSION_ID.amazonq
+    if (!isToolkit && !isQ) {
+        throw Error(`unexpected extension id: ${id}`) // sanity check
+    }
+    return isQ
+}
+
+/** True if the current extension is "Amazon Q", else the current extension is "AWS Toolkit". */
+export const isAmazonQ = once(_isAmazonQ)
+
+export function productName() {
+    return isAmazonQ() ? 'Amazon Q' : `${getIdeProperties().company} Toolkit`
+}
+
+/** Gets the client name stored in oidc */
+export const oidcClientName = once(_oidcClientName)
+function _oidcClientName() {
+    const companyName = getIdeProperties().company
+    return isCloud9() ? `${companyName} Cloud9` : `${companyName} IDE Extensions for VSCode`
+}
+
+export const getExtensionId = () => {
+    return isAmazonQ() ? VSCODE_EXTENSION_ID.amazonq : VSCODE_EXTENSION_ID.awstoolkit
+}
+
+/** Gets the "AWS" or "Amazon Q" prefix (in package.json: `commands.category`). */
+export function commandsPrefix(): string {
+    return isAmazonQ() ? 'Amazon Q' : getIdeProperties().company
+}
+
+let computeRegion: string | undefined = notInitialized
+let serviceName: string = notInitialized
+let isSMUS: boolean = false
+
+export function getIdeType(): 'vscode' | 'cloud9' | 'sagemaker' | 'unknown' {
+    if (vscode.env.appName === cloud9Appname || vscode.env.appName === cloud9CnAppname) {
+        return 'cloud9'
+    }
+
+    if (vscode.env.appName === sageMakerAppname) {
+        return 'sagemaker'
+    }
+
+    // Theia doesn't necessarily have all env properties
+    // so we should be defensive and assume appName is nullable.
+    if (vscode.env.appName?.startsWith(vscodeAppname)) {
+        return 'vscode'
+    }
+
+    return 'unknown'
+}
+
+interface IdeProperties {
+    shortName: string
+    longName: string
+    commandPalette: string
+    codelens: string
+    codelenses: string
+    company: string
+}
+
+export function getIdeProperties(): IdeProperties {
+    const company = localize('AWS.title', 'AWS')
+    // in a separate const so other IDEs can take from this selectively.
+    const vscodeVals: IdeProperties = {
+        shortName: localize('AWS.vscode.shortName', 'VS Code'),
+        longName: localize('AWS.vscode.longName', 'Visual Studio Code'),
+        commandPalette: localize('AWS.vscode.commandPalette', 'Command Palette'),
+        codelens: localize('AWS.vscode.codelens', 'CodeLens'),
+        codelenses: localize('AWS.vscode.codelenses', 'CodeLenses'),
+        company,
+    }
+
+    switch (getIdeType()) {
+        case 'cloud9':
+            if (isCn()) {
+                return createCloud9Properties(localize('AWS.title.cn', 'Amazon'))
+            }
+            return createCloud9Properties(company)
+        case 'sagemaker':
+            if (isCn()) {
+                // check for cn region
+                return createSageMakerProperties(localize('AWS.title.cn', 'Amazon'))
+            }
+            return createSageMakerProperties(company)
+        // default is IDE.vscode
+        default:
+            return vscodeVals
+    }
+}
+
+function createSageMakerProperties(company: string): IdeProperties {
+    return {
+        shortName: localize('AWS.vscode.shortName', '{0} Code Editor', company),
+        longName: localize('AWS.vscode.longName', '{0} SageMaker Code Editor', company),
+        commandPalette: localize('AWS.vscode.commandPalette', 'Command Palette'),
+        codelens: localize('AWS.vscode.codelens', 'CodeLens'),
+        codelenses: localize('AWS.vscode.codelenses', 'CodeLenses'),
+        company,
+    }
+}
+
+function createCloud9Properties(company: string): IdeProperties {
+    return {
+        shortName: localize('AWS.cloud9.shortName', 'Cloud9'),
+        longName: localize('AWS.cloud9.longName', '{0} Cloud9', company),
+        commandPalette: localize('AWS.cloud9.commandPalette', 'Go to Anything Panel'),
+        codelens: localize('AWS.cloud9.codelens', 'Inline Action'),
+        codelenses: localize('AWS.cloud9.codelenses', 'Inline Actions'),
+        company,
+    }
+}
+
+/**
+ * export method - for testing purposes only
+ * @internal
+ */
+export function isSageMakerUnifiedStudio(): boolean {
+    if (serviceName === notInitialized) {
+        serviceName = process.env.SERVICE_NAME ?? ''
+        isSMUS = serviceName === sageMakerUnifiedStudio
+    }
+    return isSMUS
+}
+
+/**
+ * Reset cached SageMaker state - for testing purposes only
+ * @internal
+ */
+export function resetSageMakerState(): void {
+    serviceName = notInitialized
+    isSMUS = false
+}
+
+/**
+ * Decides if the current system is (the specified flavor of) Cloud9.
+ */
+export function isCloud9(flavor: 'classic' | 'codecatalyst' | 'any' = 'any'): boolean {
+    const cloud9 = getIdeType() === 'cloud9'
+    if (!cloud9 || flavor === 'any') {
+        return cloud9
+    }
+    const codecat = getCodeCatalystDevEnvId() !== undefined
+    return (flavor === 'classic' && !codecat) || (flavor === 'codecatalyst' && codecat)
+}
+
+/**
+ *
+ * @param appName to identify the proper SM instance
+ * @returns true if the current system is SageMaker(SMAI or SMUS)
+ */
+export function isSageMaker(appName: 'SMAI' | 'SMUS' | 'SMUS-SPACE-REMOTE-ACCESS' = 'SMAI'): boolean {
+    // Check for SageMaker-specific environment variables first
+    let hasSMEnvVars: boolean = false
+    if (hasSageMakerEnvVars()) {
+        getLogger().debug('SageMaker environment detected via environment variables')
+        hasSMEnvVars = true
+    }
+
+    switch (appName) {
+        case 'SMAI':
+            return vscode.env.appName === sageMakerAppname && hasSMEnvVars
+        case 'SMUS':
+            return vscode.env.appName === sageMakerAppname && isSageMakerUnifiedStudio() && hasSMEnvVars
+        case 'SMUS-SPACE-REMOTE-ACCESS':
+            // When is true, the AWS toolkit is running in remote SSH conenction to SageMaker Unified Studio space
+            return vscode.env.appName !== sageMakerAppname && isSageMakerUnifiedStudio() && hasSMEnvVars
+        default:
+            return false
+    }
+}
+
+export function isCn(): boolean {
+    try {
+        const region = getComputeRegion()
+        if (!region || region === 'notInitialized') {
+            getLogger().debug('isCn called before compute region initialized, defaulting to false')
+            return false
+        }
+        return region.startsWith('cn')
+    } catch (err) {
+        getLogger().error(`Error in isCn method: ${err}`)
+        return false
+    }
+}
+
+/**
+ * Utility function to determine if the extension version has changed between activations
+ * False (versions are identical) if version key exists in global state and matches the current version
+ * True (versions are different) if any of the above aren't true
+ *
+ * TODO: Change the threshold on which we display the welcome page?
+ * For instance, if we start building nightlies, only show page for significant updates?
+ *
+ * @param context VS Code Extension Context
+ * @param currVersion Current version to compare stored most recent version against (useful for tests)
+ */
+export function isDifferentVersion(currVersion: string = extensionVersion): boolean {
+    const mostRecentVersion = globals.globalState.tryGet('globalsMostRecentVersion', String)
+    if (mostRecentVersion && mostRecentVersion === currVersion) {
+        return false
+    }
+
+    return true
+}
+
+/**
+ * Utility function to update the most recently used extension version
+ * Pulls from package.json
+ *
+ * @param context VS Code Extension Context
+ */
+export function setMostRecentVersion(): void {
+    globals.globalState.update('globalsMostRecentVersion', extensionVersion).then(undefined, (e) => {
+        getLogger().error('globalState.update() failed: %s', (e as Error).message)
+    })
+}
+
+/**
+ * Shows a message with a link to the quickstart page.
+ */
+async function promptQuickstart(): Promise<void> {
+    return // We want to skip this to reduce clutter, but will look back at improving this
+    const view = localize('AWS.command.quickStart', 'View Quick Start')
+    const prompt = await vscode.window.showInformationMessage(
+        localize(
+            'AWS.message.prompt.quickStart.toastMessage',
+            'You are now using {0} Toolkit {1}',
+            getIdeProperties().company,
+            extensionVersion
+        ),
+        view
+    )
+    if (prompt === view) {
+        await vscode.commands.executeCommand('aws.quickStart')
+    }
+}
+
+/**
+ * Shows a "new version" or "alpha version" message.
+ *
+ * - If extension version is "alpha", shows a warning message.
+ * - If extension version was not previously run on this machine, shows a toast
+ *   with a link to the quickstart page.
+ * - Otherwise does nothing.
+ *
+ * @param context VS Code Extension Context
+ */
+export function showWelcomeMessage(context: vscode.ExtensionContext): void {
+    if (getCodeCatalystDevEnvId() !== undefined) {
+        // Do not show clippy in CodeCatalyst dev environments.
+        return
+    }
+    const version = vscode.extensions.getExtension(VSCODE_EXTENSION_ID.awstoolkit)?.packageJSON.version
+    if (version === extensionAlphaVersion) {
+        void vscode.window.showWarningMessage(
+            localize(
+                'AWS.startup.toastIfAlpha',
+                '{0} PREVIEW. (To get the latest STABLE version, uninstall this version.)',
+                productName()
+            )
+        )
+        return
+    }
+    try {
+        if (isDifferentVersion()) {
+            setMostRecentVersion()
+            if (!isCloud9()) {
+                void promptQuickstart()
+            }
+        }
+    } catch (err) {
+        // swallow error and don't block extension load
+        getLogger().error(err as Error)
+    }
+}
+
+function _getDocumentationUrl(urls: { cloud9: vscode.Uri; toolkit: vscode.Uri }): vscode.Uri {
+    return isCloud9() ? urls.cloud9 : urls.toolkit
+}
+export function getDocUrl() {
+    return _getDocumentationUrl(documentationUrl)
+}
+export function getSamInitDocUrl() {
+    return _getDocumentationUrl(samInitDocUrl)
+}
+export function getLaunchConfigDocUrl() {
+    return _getDocumentationUrl(launchConfigDocUrl)
+}
+export function getSamDeployDocUrl() {
+    return _getDocumentationUrl(samDeployDocUrl)
+}
+export function getDebugNewSamAppDocUrl() {
+    return _getDocumentationUrl(debugNewSamAppDocUrl)
+}
+export function getAppRunnerCreateServiceDocUrl() {
+    return _getDocumentationUrl(apprunnerCreateServiceDocUrl)
+}
+
+/**
+ * Shows info about the extension and its environment.
+ */
+export async function aboutExtension(): Promise<void> {
+    const extEnvDetails = getExtEnvironmentDetails()
+    const copyButtonLabel = localize('AWS.message.prompt.copyButtonLabel', 'Copy')
+    const result = await vscode.window.showInformationMessage(extEnvDetails, { modal: true }, copyButtonLabel)
+    if (result === copyButtonLabel) {
+        void vscode.env.clipboard.writeText(extEnvDetails)
+    }
+}
+
+/**
+ * Returns a string that includes the OS, extension, and VS Code versions.
+ */
+export function getExtEnvironmentDetails(): string {
+    const osType = os.type()
+    const osArch = os.arch()
+    const osRelease = os.release()
+    const vsCodeVersion = vscode.version
+    const node = process.versions.node ? `node: ${process.versions.node}\n` : 'node: ?\n'
+    const electron = process.versions.electron ? `electron: ${process.versions.electron}\n` : ''
+
+    const envDetails = localize(
+        'AWS.message.toolkitInfo',
+        'OS: {0} {1} {2}\n{3} extension host:  {4}\n{5}:  {6}\n{7}{8}',
+        osType,
+        osArch,
+        osRelease,
+        getIdeProperties().longName,
+        vsCodeVersion,
+        productName(),
+        extensionVersion,
+        node,
+        electron
+    )
+
+    return envDetails
+}
+
+/**
+ * Returns the Cloud9/SageMaker compute region or 'unknown' if we can't pull a region, or `undefined` if this is not Cloud9 or SageMaker.
+ */
+
+export async function initializeComputeRegion(
+    metadata?: Ec2MetadataClient,
+    isC9?: boolean,
+    isSM?: boolean
+): Promise<void> {
+    isC9 ??= isCloud9()
+    isSM ??= isSageMaker()
+    if (isC9 || isSM) {
+        metadata ??= new DefaultEc2MetadataClient()
+        try {
+            const identity = await metadata.getInstanceIdentity()
+            computeRegion = identity.region || 'unknown'
+        } catch (e) {
+            computeRegion = 'unknown'
+        }
+    } else {
+        // not cloud9, region has no meaning
+        computeRegion = undefined
+    }
+}
+
+export function getComputeRegion(): string | undefined {
+    if (computeRegion === notInitialized) {
+        throw new Error('Attempted to get compute region without initializing.')
+    }
+
+    return computeRegion
+}
+
+/**
+ * Provides a generic {@link vscode.Event} representing "user activity".
+ */
+export class UserActivity implements vscode.Disposable {
+    private disposables: vscode.Disposable[] = []
+    private activityEvent = new vscode.EventEmitter<void>()
+    /** Event fired when user activity is detected. */
+    onUserActivity = this.activityEvent.event
+
+    /**
+     * @param delay Throttle delay (in milliseconds) for each source event kind. For example,
+     * `onDidChangeTextDocument` may fire only once per throttle interval, and any other source
+     * event such as `onDidChangeActiveTextEditor` is subject to its own, separate throttle
+     * interval.
+     * @param customEvents For testing purposes. The events that trigger the user activity.
+     * @returns
+     */
+    constructor(delay: number = 10_000, customEvents?: vscode.Event<any>[]) {
+        // This ensures we don't fire a user activity event more than once per delay.
+        const throttledEmit = _.throttle(
+            (event: vscode.Event<any>) => {
+                this.activityEvent.fire()
+                getLogger().debug(`UserActivity: event fired "${event.name}"`)
+            },
+            delay,
+            { leading: true, trailing: false }
+        )
+
+        if (customEvents) {
+            for (const event of customEvents) {
+                this.register(
+                    event(() => {
+                        throttledEmit(event)
+                    })
+                )
+            }
+        } else {
+            this.registerAllEvents(throttledEmit)
+        }
+
+        this.disposables.push(this.activityEvent)
+    }
+
+    /**
+     * Creates handlers for all known events representing "user activity".
+     */
+    private registerAllEvents(throttledEmit: (e: vscode.Event<any>) => any) {
+        const activityEvents = [
+            vscode.window.onDidChangeActiveColorTheme,
+            vscode.window.onDidChangeActiveTextEditor,
+            vscode.window.onDidChangeActiveTerminal,
+            vscode.window.onDidChangeVisibleTextEditors,
+            vscode.window.onDidChangeTextEditorOptions,
+            vscode.window.onDidOpenTerminal,
+            vscode.window.onDidCloseTerminal,
+            vscode.window.onDidChangeTerminalState,
+            vscode.window.onDidChangeTextEditorViewColumn,
+        ]
+
+        for (const event of activityEvents) {
+            this.register(
+                event(() => {
+                    throttledEmit(event)
+                })
+            )
+        }
+
+        //
+        // Events with special cases:
+        //
+
+        this.register(
+            vscode.window.onDidChangeWindowState((e) => {
+                if ((e as any).active === false || e.focused === false) {
+                    return
+                }
+                throttledEmit(vscode.window.onDidChangeWindowState)
+            })
+        )
+
+        this.register(
+            vscode.workspace.onDidChangeTextDocument((e) => {
+                const activeUri = vscode.window.activeTextEditor?.document?.uri?.toString()
+                if (!activeUri || activeUri !== e.document.uri?.toString() || e.document.uri.scheme === 'output') {
+                    // User is not editing this document, or document is an Output channel.
+                    return
+                }
+                throttledEmit(vscode.workspace.onDidChangeTextDocument)
+            })
+        )
+
+        this.register(
+            vscode.workspace.onDidOpenTextDocument((e) => {
+                const activeUri = vscode.window.activeTextEditor?.document?.uri?.toString()
+                if (!activeUri || activeUri !== e.uri?.toString() || e.uri.scheme === 'output') {
+                    // User is not editing this document, or document is an Output channel.
+                    return
+                }
+                throttledEmit(vscode.workspace.onDidOpenTextDocument)
+            })
+        )
+
+        this.register(
+            vscode.window.onDidChangeTextEditorSelection((e) => {
+                if (e.textEditor.document.uri.scheme === 'output') {
+                    // Document is an Output channel, which may autoscroll.
+                    return
+                }
+                throttledEmit(vscode.window.onDidChangeTextEditorSelection)
+            })
+        )
+
+        this.register(
+            vscode.window.onDidChangeTextEditorVisibleRanges((e) => {
+                if (e.textEditor.document.uri.scheme === 'output') {
+                    // Document is an Output channel, which may autoscroll.
+                    return
+                }
+                throttledEmit(vscode.window.onDidChangeTextEditorVisibleRanges)
+            })
+        )
+    }
+
+    private register(disposable: vscode.Disposable) {
+        this.disposables.push(disposable)
+    }
+
+    dispose() {
+        for (const d of this.disposables) {
+            d.dispose()
+        }
+    }
+}
diff --git a/packages/core/src/shared/extensions.ts b/packages/core/src/shared/extensions.ts
new file mode 100644
index 00000000000..d9b242e96a6
--- /dev/null
+++ b/packages/core/src/shared/extensions.ts
@@ -0,0 +1,49 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { AwsContext } from './awsContext'
+import { RegionProvider } from './regions/regionProvider'
+import { TelemetryService } from './telemetry/telemetryService'
+import { CredentialsStore } from '../auth/credentials/store'
+import { SamCliContext } from './sam/cli/samCliContext'
+import { UriHandler } from './vscode/uriHandler'
+
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export const VSCODE_EXTENSION_ID = {
+    awstoolkit: 'amazonwebservices.aws-toolkit-vscode',
+    amazonq: 'amazonwebservices.amazon-q-vscode',
+    python: 'ms-python.python',
+    // python depends on jupyter plugin
+    jupyter: 'ms-toolsai.jupyter',
+    yaml: 'redhat.vscode-yaml',
+    go: 'golang.go',
+    java: 'redhat.java',
+    javadebug: 'vscjava.vscode-java-debug',
+    dotnet: 'ms-dotnettools.csdevkit',
+    git: 'vscode.git',
+    remotessh: 'ms-vscode-remote.remote-ssh',
+} as const
+
+export const vscodeExtensionMinVersion = {
+    remotessh: '0.74.0',
+}
+
+/** @deprecated Use `extensionGlobals.ts:globals` instead. */
+export interface ExtContext {
+    extensionContext: vscode.ExtensionContext
+    awsContext: AwsContext
+    samCliContext: () => SamCliContext
+    regionProvider: RegionProvider
+    outputChannel: vscode.OutputChannel
+    telemetryService: TelemetryService
+    credentialsStore: CredentialsStore
+    uriHandler: UriHandler
+}
+
+/**
+ * Version of the .vsix produced by package.ts with the --debug option.
+ */
+export const extensionAlphaVersion = '99.0.0-SNAPSHOT'
diff --git a/src/shared/extensions/git.ts b/packages/core/src/shared/extensions/git.ts
similarity index 86%
rename from src/shared/extensions/git.ts
rename to packages/core/src/shared/extensions/git.ts
index 121c41daf58..6a13a749480 100644
--- a/src/shared/extensions/git.ts
+++ b/packages/core/src/shared/extensions/git.ts
@@ -1,12 +1,12 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as vscode from 'vscode'
 import * as GitTypes from '../../../types/git.d'
 import { SemVer, parse as semverParse } from 'semver'
-import { execFile } from 'child_process'
+import { execFile } from 'child_process' // eslint-disable-line no-restricted-imports
 import { promisify } from 'util'
 import { VSCODE_EXTENSION_ID } from '../extensions'
 import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../filesystemUtilities'
@@ -16,7 +16,7 @@ import { pushIf } from '../utilities/collectionUtils'
 interface GitFile {
     name: string
     /**
-     * Reads the file's contents
+     * Reads the file's contents. Affected by {@link maxBufferSizeInMB}.
      * @throws If the Git API becomes disabled or we were unable to read the file
      */
     read: () => Promise<string>
@@ -47,9 +47,13 @@ interface GitConfig {
     [key: string]: string | undefined
 }
 
-const execFileAsync = promisify(execFile)
 const minGitFilterVersion = new SemVer('2.27.0')
 
+// Arbitrary limit for the in-mem buffer when downloading files via `git cat-file`
+// This can be increased though for larger files streaming might be a better choice
+// See https://github.com/nodejs/node/issues/9829 for a discussion on `maxBuffer`
+const maxBufferSizeInMB = 100
+
 function formatBranch(branch?: GitTypes.Branch): string {
     return branch?.name ?? branch?.commit ?? 'unknown'
 }
@@ -70,6 +74,8 @@ export class GitExtension {
     private _activationPromise?: Thenable<void>
     private static _instance?: GitExtension
 
+    private execFileAsync = promisify(execFile)
+
     public readonly onDidOpenRepository = this._onDidOpenRepository.event
 
     public get enabled(): boolean {
@@ -153,7 +159,7 @@ export class GitExtension {
      * We hook into extension enablement to automatically re-add listeners.
      */
     private registerOpenRepositoryListener(api: GitTypes.API): vscode.Disposable {
-        return api.onDidOpenRepository(repo => {
+        return api.onDidOpenRepository((repo) => {
             this._onDidOpenRepository.fire(this.extendRepository(repo))
         })
     }
@@ -203,14 +209,18 @@ export class GitExtension {
     public async getRemotes(): Promise<GitTypes.Remote[]> {
         const api = await this.validateApi('git: api is disabled, returning empty array of remotes')
         const remotes: GitTypes.Remote[] = []
-        api?.repositories.forEach(repo => remotes.push(...repo.state.remotes))
+        if (api) {
+            for (const repo of api.repositories) {
+                remotes.push(...repo.state.remotes)
+            }
+        }
 
         return remotes
     }
 
     public async getRepositories(): Promise<Repository[]> {
         const api = await this.validateApi('git: api is disabled, returning empty array of repositories')
-        return api?.repositories.map(repo => this.extendRepository(repo)) ?? []
+        return api?.repositories.map((repo) => this.extendRepository(repo)) ?? []
     }
 
     /**
@@ -228,19 +238,19 @@ export class GitExtension {
         }
 
         const remotes = api?.repositories
-            .map(repo => repo.state.remotes.filter(other => other.fetchUrl === remote.fetchUrl))
+            .map((repo) => repo.state.remotes.filter((other) => other.fetchUrl === remote.fetchUrl))
             .reduce((a, b) => a.concat(b), [])
 
-        api.repositories.forEach(repo =>
+        for (const repo of api.repositories) {
             branches.push(
                 ...repo.state.refs.filter(
                     (ref: GitTypes.Ref) =>
                         ref.type === GitTypes.RefType.RemoteHead &&
                         !ref.name?.endsWith('HEAD') &&
-                        remotes.some(remote => remote.name === ref.remote)
+                        remotes.some((remote) => remote.name === ref.remote)
                 )
             )
-        )
+        }
 
         getLogger().debug(`git: found ${branches.length} branches from local repositories`)
 
@@ -252,7 +262,7 @@ export class GitExtension {
         // TODO: make a promise 'pipe' function
         if (branches.length === 0) {
             try {
-                const { stdout } = await execFileAsync(api.git.path, [
+                const { stdout } = await this.execFileAsync(api.git.path, [
                     'ls-remote',
                     '--heads',
                     '--',
@@ -261,12 +271,12 @@ export class GitExtension {
                 return stdout
                     .toString()
                     .split(/\r?\n/)
-                    .map(branch => ({
+                    .map((branch) => ({
                         name: branch.replace(/.*refs\/heads\//, 'head/'),
                         remote: remote.name,
                         type: GitTypes.RefType.RemoteHead,
                     }))
-                    .filter(branch => !!branch.name)
+                    .filter((branch) => !!branch.name)
             } catch (err) {
                 getLogger().verbose(`git: failed to get branches for remote "${remote.fetchUrl}": %s`, err)
                 return []
@@ -283,18 +293,21 @@ export class GitExtension {
         if (!api) {
             return config
         } else if (repository) {
-            ;(await repository.getConfigs()).forEach(({ key, value }) => (config[key] = value))
+            for (const { key, value } of await repository.getConfigs()) {
+                config[key] = value
+            }
         } else {
-            const { stdout } = await execFileAsync(api.git.path, ['config', '--list', `--global`]).catch(err => {
+            const { stdout } = await this.execFileAsync(api.git.path, ['config', '--list', `--global`]).catch((err) => {
                 getLogger().verbose(`git: failed to read config: %s`, err)
                 return { stdout: '' }
             })
 
-            stdout
+            for (const [k, v] of stdout
                 .toString()
                 .split(/\r?\n/)
-                .map(l => l.split('='))
-                .forEach(([k, v]) => (config[k] = v))
+                .map((l) => l.split('='))) {
+                config[k] = v
+            }
         }
 
         return config
@@ -307,7 +320,7 @@ export class GitExtension {
         }
 
         try {
-            const { stdout } = await execFileAsync(api.git.path, ['--version'])
+            const { stdout } = await this.execFileAsync(api.git.path, ['--version'])
             const match = stdout.trim().match(/[0-9]+.[0-9]+.[0-9]+/g)
             if (!match) {
                 throw new Error(`Unable to parse git output for version: ${stdout}`)
@@ -335,8 +348,8 @@ export class GitExtension {
 
         if (version === undefined || version.compare(minGitFilterVersion) === -1) {
             throw new Error(
-                `Git version is too low or could not be determined (min=${minGitFilterVersion}): ${
-                    version ?? 'unknown'
+                `Git version is too low or could not be determined (min=${minGitFilterVersion.version}): ${
+                    version?.version ?? 'unknown'
                 }`
             )
         }
@@ -346,12 +359,12 @@ export class GitExtension {
         pushIf(args, remote.branch !== undefined, '--branch', remote.branch).push(remote.fetchUrl, tmpDir)
 
         try {
-            const { stderr } = await execFileAsync(api.git.path, args)
+            const { stderr } = await this.execFileAsync(api.git.path, args)
 
             // try to parse some stats from the clone
             const downloadSize = (stderr.match(/Receiving objects: 100% \([0-9]+\/[0-9]+\), (.*)\|/) ?? [])[1]
 
-            const { stdout } = await execFileAsync(api.git.path, ['ls-tree', '-r', '-z', 'HEAD'], {
+            const { stdout } = await this.execFileAsync(api.git.path, ['ls-tree', '-r', '-z', 'HEAD'], {
                 cwd: tmpDir,
             })
 
@@ -359,7 +372,7 @@ export class GitExtension {
                 .toString()
                 .slice(0, -1) // remove trailing null character
                 .split(/\0/)
-                .map(s => s.split(/\s/))
+                .map((s) => s.split(/\s/))
                 .map(([mode, type, hash, name]) => ({
                     name,
                     read: async () => {
@@ -367,16 +380,16 @@ export class GitExtension {
                             new Error(`git: api was disabled while reading file "${name}" from "${remote.fetchUrl}"`)
                         )
 
-                        return execFileAsync(api.git.path, ['cat-file', type, hash], {
+                        return this.execFileAsync(api.git.path, ['cat-file', type, hash], {
                             cwd: tmpDir,
-                            maxBuffer: 1024 * 1024 * 6,
+                            maxBuffer: 1024 * 1024 * maxBufferSizeInMB,
                         }).then(({ stdout }) => stdout)
                     },
                 }))
 
             return { files, dispose: () => tryRemoveFolder(tmpDir), stats: { downloadSize } }
         } catch (err) {
-            tryRemoveFolder(tmpDir)
+            void tryRemoveFolder(tmpDir)
             throw err
         }
     }
diff --git a/packages/core/src/shared/extensions/ssh.ts b/packages/core/src/shared/extensions/ssh.ts
new file mode 100644
index 00000000000..834b945cec7
--- /dev/null
+++ b/packages/core/src/shared/extensions/ssh.ts
@@ -0,0 +1,192 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as path from 'path'
+import * as nls from 'vscode-nls'
+import fs from '../fs/fs'
+import { getLogger } from '../logger/logger'
+import { ChildProcess, ChildProcessResult } from '../utilities/processUtils'
+import { ArrayConstructor, NonNullObject } from '../utilities/typeConstructors'
+import { Settings } from '../settings'
+import { VSCODE_EXTENSION_ID } from '../extensions'
+import { StartSessionResponse } from '@aws-sdk/client-ssm'
+import { ErrorInformation, ToolkitError } from '../errors'
+
+const localize = nls.loadMessageBundle()
+
+export const sshAgentSocketVariable = 'SSH_AUTH_SOCK'
+
+export class SshError extends ToolkitError {
+    constructor(message: string, options: ErrorInformation) {
+        super(message, {
+            ...options,
+            code: SshError.name,
+        })
+    }
+}
+
+export function getSshConfigPath(): string {
+    const sshConfigDir = path.join(fs.getUserHomeDir(), '.ssh')
+    return path.join(sshConfigDir, 'config')
+}
+
+/**
+ * Only mac has the agent running by default, other OS we need to start manually
+ *
+ * @returns `undefined` if agent is already running or on Windows, otherwise the SSH agent socket
+ */
+export async function startSshAgent(): Promise<string | undefined> {
+    if (process.env[sshAgentSocketVariable] !== undefined) {
+        return process.env[sshAgentSocketVariable]
+    }
+
+    getLogger().info('Starting SSH agent...')
+
+    try {
+        if (process.platform === 'win32') {
+            const runningMessage = 'Already running'
+            // First check if it's running
+            // if not, try to start it
+            // if that fails, try to set the start-up type to automatic
+            // if that fails, then no agent
+            const script = `
+$info = Get-Service ssh-agent
+if ($info.Status -eq "Running") { 
+    echo "${runningMessage}"
+    exit 0 
+}
+Start-Service ssh-agent
+if (!$?) {
+    Get-Service -Name ssh-agent | Set-Service -StartupType Manual
+    if ($?) { Start-Service ssh-agent }
+}
+exit !$?
+`
+            const options = {
+                rejectOnErrorCode: true,
+                logging: 'noparams',
+            } as const
+            const result = await new ChildProcess('powershell.exe', ['-Command', script], options).run({
+                onStdout: (text) => getLogger().verbose(`ssh (ssh-agent): ${text}`),
+                onStderr: (text) => getLogger().verbose(`ssh (ssh-agent): ${text}`),
+            })
+
+            if (!result.stdout.includes(runningMessage) && !result.stderr) {
+                void vscode.window.showInformationMessage(
+                    localize('AWS.ssh.ssh-agent.start', 'The SSH agent has been started.')
+                )
+            }
+
+            return
+        }
+
+        // TODO: this command outputs a shell command that you're supposed to execute, for now
+        // we'll just parse the socket out and inject it into the ssh command
+        const r = await new ChildProcess('ssh-agent', ['-s']).run()
+        return (r.stdout.match(/$SSH_AGENT_VAR=(.*?);/) ?? [])[1]
+    } catch (err) {
+        // The 'silent' failure here is not great, though the SSH agent is not necessarily a critical
+        // feature. It would be better to inform the user that the SSH agent could not be started, then
+        // go from there. Many users probably wouldn't care about the agent at all.
+        getLogger().warn('ssh: failed to start SSH agent, clones may not work as expected: %O', err)
+    }
+}
+
+const remoteSshTypes = {
+    path: String,
+    defaultExtensions: ArrayConstructor(String),
+    remotePlatform: NonNullObject,
+    useLocalServer: Boolean,
+}
+
+export class RemoteSshSettings extends Settings.define('remote.SSH', remoteSshTypes) {
+    public async ensureDefaultExtension(extensionId: string): Promise<boolean> {
+        const current = this.get('defaultExtensions', [])
+
+        if (!current.includes(extensionId)) {
+            this._log(`updating remote SSH "defaultExtensions" setting with "${extensionId}"`)
+
+            return this.update('defaultExtensions', [...current, extensionId])
+        }
+
+        return true
+    }
+
+    public async setRemotePlatform(hostname: string, platform: 'linux' | 'windows' | 'macOS'): Promise<boolean> {
+        try {
+            const current = this._getOrThrow('remotePlatform', {})
+            current[hostname] = platform
+            this._log(`updated remote SSH host "${hostname}" with platform "${platform}"`)
+
+            return this.update('remotePlatform', current)
+        } catch (error) {
+            this._log(`failed to read "remotePlatform", no updates will be made`)
+
+            return false
+        }
+    }
+}
+
+/**
+ * Test a SSH connection over SSM.
+ * @param ProcessClass given process to test the connection within.
+ * @param hostname
+ * @param sshPath
+ * @param user
+ * @param session SSM session credentials. These cannot be reused, so it may be required to create a seperate session for the test connection.
+ * @returns
+ */
+export async function testSshConnection(
+    ProcessClass: typeof ChildProcess,
+    hostname: string,
+    sshPath: string,
+    user: string,
+    session: StartSessionResponse
+): Promise<ChildProcessResult | never> {
+    const env = { SESSION_ID: session.SessionId, STREAM_URL: session.StreamUrl, TOKEN: session.TokenValue }
+    const process = new ProcessClass(sshPath, ['-T', `${user}@${hostname}`, 'echo "test connection succeeded" && exit'])
+    try {
+        return await process.run({
+            spawnOptions: {
+                env,
+            },
+        })
+    } catch (error) {
+        throw new SshError(process.result()?.stderr ?? 'An unknown error occurred when testing the connection', {
+            cause: error as Error,
+        })
+    }
+}
+
+export async function startVscodeRemote(
+    ProcessClass: typeof ChildProcess,
+    hostname: string,
+    targetDirectory: string,
+    vscPath: string,
+    user?: string
+): Promise<void> {
+    const userAt = user ? `${user}@` : ''
+    const workspaceUri = `vscode-remote://ssh-remote+${userAt}${hostname}${targetDirectory}`
+
+    const settings = new RemoteSshSettings()
+    settings.ensureDefaultExtension(VSCODE_EXTENSION_ID.awstoolkit).catch((e) => {
+        // Non-fatal. Some users intentionally have readonly settings.
+        getLogger().warn('startVscodeRemote: failed to set "defaultExtensions": %s', (e as Error).message)
+    })
+
+    if (process.platform === 'win32') {
+        await Promise.all([
+            // TODO(sijaden): we should periodically clean this setting up, maybe
+            // by removing all hostnames that use the `aws-` prefix
+            await settings.setRemotePlatform(hostname, 'linux'),
+
+            // TODO(sijaden): revert this setting back to normal after the user connects
+            await settings.update('useLocalServer', false),
+        ])
+    }
+
+    await new ProcessClass(vscPath, ['--folder-uri', workspaceUri]).run()
+}
diff --git a/src/shared/extensions/yaml.ts b/packages/core/src/shared/extensions/yaml.ts
similarity index 81%
rename from src/shared/extensions/yaml.ts
rename to packages/core/src/shared/extensions/yaml.ts
index 62a95138544..17e1707a0a8 100644
--- a/src/shared/extensions/yaml.ts
+++ b/packages/core/src/shared/extensions/yaml.ts
@@ -1,15 +1,15 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as vscode from 'vscode'
-import { readFileSync } from 'fs-extra'
 import { VSCODE_EXTENSION_ID } from '../extensions'
 import { getLogger } from '../logger/logger'
 import { getIdeProperties } from '../extensionUtilities'
 import { activateExtension } from '../utilities/vsCodeUtils'
 import { AWS_SCHEME } from '../constants'
+import * as nodefs from 'fs' // eslint-disable-line no-restricted-imports
 
 // sourced from https://github.com/redhat-developer/vscode-yaml/blob/3d82d61ea63d3e3a9848fe6b432f8f1f452c1bec/src/schema-extension-api.ts
 // removed everything that is not currently being used
@@ -45,14 +45,15 @@ export async function activateYamlExtension(): Promise<YamlExtension | undefined
     }
     yamlExt.exports.registerContributor(
         AWS_SCHEME,
-        resource => {
+        (resource) => {
             return schemaMap.get(resource)?.toString()
         },
-        uri => {
+        (uri) => {
             try {
                 // SLOW: This request happens on every keystroke! (5MB+ read from filesystem).
                 // This is a design flaw in this registerContributor() API.
-                return readFileSync(vscode.Uri.parse(uri).fsPath).toString()
+                // TODO: this function is non-async preventing us from using our fs module.
+                return nodefs.readFileSync(vscode.Uri.parse(uri).fsPath).toString()
             } catch (e) {
                 getLogger().error(`YAML Extension: failed to read schema URI "${uri}": ${e}`)
                 throw new Error(`${getIdeProperties().company} Toolkit could not parse JSON schema URI: ${uri}`)
@@ -62,7 +63,7 @@ export async function activateYamlExtension(): Promise<YamlExtension | undefined
 
     return {
         assignSchema: (path, schema) => schemaMap.set(path.toString(), applyScheme(AWS_SCHEME, evaluate(schema))),
-        removeSchema: path => schemaMap.delete(path.toString()),
-        getSchema: path => schemaMap.get(path.toString()),
+        removeSchema: (path) => schemaMap.delete(path.toString()),
+        getSchema: (path) => schemaMap.get(path.toString()),
     }
 }
diff --git a/packages/core/src/shared/featureConfig.ts b/packages/core/src/shared/featureConfig.ts
new file mode 100644
index 00000000000..c0ed174045a
--- /dev/null
+++ b/packages/core/src/shared/featureConfig.ts
@@ -0,0 +1,311 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    FeatureValue,
+    ListFeatureEvaluationsRequest,
+    ListFeatureEvaluationsResponse,
+} from '../codewhisperer/client/codewhispereruserclient'
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+import { codeWhispererClient as client } from '../codewhisperer/client/codewhisperer'
+import { AuthUtil } from '../codewhisperer/util/authUtil'
+import { getLogger } from './logger/logger'
+import { isBuilderIdConnection, isIdcSsoConnection } from '../auth/connection'
+import { CodeWhispererSettings } from '../codewhisperer/util/codewhispererSettings'
+import globals from './extensionGlobals'
+import { getClientId, getOperatingSystem } from './telemetry/util'
+import { extensionVersion } from './vscode/env'
+import { telemetry } from './telemetry/telemetry'
+import { Commands } from './vscode/commands2'
+import { getAvailableCustomizationsList, setSelectedCustomization } from '../codewhisperer/util/customizationUtil'
+
+const localize = nls.loadMessageBundle()
+
+export class FeatureContext {
+    constructor(
+        public name: string,
+        public variation: string,
+        public value: FeatureValue
+    ) {}
+}
+
+const featureConfigPollIntervalInMs = 180 * 60 * 1000 // 180 mins
+
+export const Features = {
+    customizationArnOverride: 'customizationArnOverride',
+    dataCollectionFeature: 'IDEProjectContextDataCollection',
+    projectContextFeature: 'ProjectContextV2',
+    workspaceContextFeature: 'WorkspaceContext',
+    preFlareRollbackBIDFeature: 'PreflareRollbackExperiment_BID',
+    preFlareRollbackIDCFeature: 'PreflareRollbackExperiment_IDC',
+    test: 'testFeature',
+    highlightCommand: 'highlightCommand',
+} as const
+
+export type FeatureName = (typeof Features)[keyof typeof Features]
+
+export const featureDefinitions = new Map<FeatureName, FeatureContext>([
+    [Features.test, new FeatureContext(Features.test, 'CONTROL', { stringValue: 'testValue' })],
+    [
+        Features.customizationArnOverride,
+        new FeatureContext(Features.customizationArnOverride, 'customizationARN', { stringValue: '' }),
+    ],
+])
+
+export class FeatureConfigProvider {
+    private featureConfigs = new Map<string, FeatureContext>()
+    private fetchPromise: Promise<void> | undefined = undefined
+    private lastFetchTime = 0
+    private readonly minFetchInterval = 5000 // 5 seconds minimum between fetches
+
+    static #instance: FeatureConfigProvider
+
+    constructor() {
+        this.fetchFeatureConfigs().catch((e) => {
+            getLogger().error('fetchFeatureConfigs failed: %s', (e as Error).message)
+        })
+
+        setInterval(this.fetchFeatureConfigs.bind(this), featureConfigPollIntervalInMs)
+    }
+
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+
+    getProjectContextGroup(): 'control' | 't1' | 't2' {
+        const variation = this.featureConfigs.get(Features.projectContextFeature)?.variation
+
+        switch (variation) {
+            case 'CONTROL':
+                return 'control'
+
+            case 'TREATMENT_1':
+                return 't1'
+
+            case 'TREATMENT_2':
+                return 't2'
+
+            default:
+                return 'control'
+        }
+    }
+
+    getWorkspaceContextGroup(): 'control' | 'treatment' {
+        const variation = this.featureConfigs.get(Features.projectContextFeature)?.variation
+
+        switch (variation) {
+            case 'CONTROL':
+                return 'control'
+
+            case 'TREATMENT':
+                return 'treatment'
+
+            default:
+                return 'control'
+        }
+    }
+
+    getPreFlareRollbackGroup(): 'control' | 'treatment' | 'default' {
+        const variationBid = this.featureConfigs.get(Features.preFlareRollbackBIDFeature)?.variation
+        const variationIdc = this.featureConfigs.get(Features.preFlareRollbackIDCFeature)?.variation
+        if (variationBid === 'TREATMENT' || variationIdc === 'TREATMENT') {
+            return 'treatment'
+        } else {
+            return 'control'
+        }
+    }
+
+    public async listFeatureEvaluations(): Promise<ListFeatureEvaluationsResponse> {
+        const profile = AuthUtil.instance.regionProfileManager.activeRegionProfile
+        const request: ListFeatureEvaluationsRequest = {
+            userContext: {
+                ideCategory: 'VSCODE',
+                operatingSystem: getOperatingSystem(),
+                product: 'CodeWhisperer', // TODO: update this?
+                clientId: getClientId(globals.globalState),
+                ideVersion: extensionVersion,
+            },
+            profileArn: profile?.arn,
+        }
+        return (await client.createUserSdkClient()).listFeatureEvaluations(request).promise()
+    }
+
+    async fetchFeatureConfigs(): Promise<void> {
+        if (AuthUtil.instance.isConnectionExpired()) {
+            return
+        }
+
+        // Debounce multiple concurrent calls
+        const now = performance.now()
+        if (this.fetchPromise && now - this.lastFetchTime < this.minFetchInterval) {
+            getLogger().debug('amazonq: Debouncing feature config fetch')
+            return this.fetchPromise
+        }
+
+        if (this.fetchPromise) {
+            return this.fetchPromise
+        }
+
+        this.lastFetchTime = now
+        this.fetchPromise = this._fetchFeatureConfigsInternal()
+
+        try {
+            await this.fetchPromise
+        } finally {
+            this.fetchPromise = undefined
+        }
+    }
+
+    private async _fetchFeatureConfigsInternal(): Promise<void> {
+        getLogger().debug('amazonq: Fetching feature configs')
+        try {
+            const response = await this.listFeatureEvaluations()
+
+            // Overwrite feature configs from server response
+            for (const evaluation of response.featureEvaluations) {
+                this.featureConfigs.set(
+                    evaluation.feature,
+                    new FeatureContext(evaluation.feature, evaluation.variation, evaluation.value)
+                )
+
+                telemetry.aws_featureConfig.run((span) => {
+                    span.record({
+                        id: evaluation.feature,
+                        featureVariation: evaluation.variation,
+                        featureValue: JSON.stringify(evaluation.value),
+                    })
+                })
+            }
+            getLogger().info('AB Testing Cohort Assignments %O', response.featureEvaluations)
+
+            const customizationArnOverride = this.featureConfigs.get(Features.customizationArnOverride)?.value
+                ?.stringValue
+            const previousOverride = globals.globalState.tryGet<string>('aws.amazonq.customization.overrideV2', String)
+            if (customizationArnOverride !== undefined && customizationArnOverride !== previousOverride) {
+                // Double check if server-side wrongly returns a customizationArn to BID users
+                if (isBuilderIdConnection(AuthUtil.instance.conn)) {
+                    this.featureConfigs.delete(Features.customizationArnOverride)
+                } else if (isIdcSsoConnection(AuthUtil.instance.conn)) {
+                    const availableCustomizations = await getAvailableCustomizationsList()
+
+                    // If customizationArn from A/B is not available in listAvailableCustomizations response, don't use this value
+                    const targetCustomization = availableCustomizations?.find((c) => c.arn === customizationArnOverride)
+                    if (!targetCustomization) {
+                        getLogger().debug(
+                            `Customization arn ${customizationArnOverride} not available in listAvailableCustomizations, not using`
+                        )
+                        this.featureConfigs.delete(Features.customizationArnOverride)
+                    } else {
+                        await setSelectedCustomization(targetCustomization, true)
+                        // note that we should also switch profile if either
+                        // 1. user has not selected a profile yet
+                        // 2. user's selected profile is not the same as the one of customizationOverride
+                        const profile = AuthUtil.instance.regionProfileManager.activeRegionProfile
+                        if (!profile || (profile && profile.arn !== targetCustomization.profile.arn)) {
+                            await AuthUtil.instance.regionProfileManager.switchRegionProfile(
+                                targetCustomization.profile,
+                                'customization'
+                            )
+                        }
+                    }
+
+                    await vscode.commands.executeCommand('aws.amazonq.refreshStatusBar')
+                }
+            }
+            if (this.getWorkspaceContextGroup() === 'treatment') {
+                // Enable local workspace index by default only once, for Amzn users.
+                const isSet = globals.globalState.get<boolean>('aws.amazonq.workspaceIndexToggleOn') || false
+                if (!isSet) {
+                    await CodeWhispererSettings.instance.enableLocalIndex()
+                    globals.globalState.tryUpdate('aws.amazonq.workspaceIndexToggleOn', true)
+
+                    await vscode.window
+                        .showInformationMessage(
+                            localize(
+                                'AWS.amazonq.chat.workspacecontext.enable.message',
+                                'Amazon Q: Workspace index is now enabled. You can disable it from Amazon Q settings.'
+                            ),
+                            localize('AWS.amazonq.opensettings', 'Open settings')
+                        )
+                        .then((r) => {
+                            if (r === 'Open settings') {
+                                void Commands.tryExecute('aws.amazonq.configure').then()
+                            }
+                        })
+                }
+            }
+        } catch (e) {
+            getLogger().error(`CodeWhisperer: Error when fetching feature configs ${e}`, e)
+        }
+        getLogger().debug(`CodeWhisperer: Current feature configs: ${this.getFeatureConfigsTelemetry()}`)
+    }
+
+    // Sample format: "{testFeature: CONTROL}""
+    getFeatureConfigsTelemetry(): string {
+        return `{${Array.from(this.featureConfigs.entries())
+            .map(([name, context]) => `${name}: ${context.variation}`)
+            .join(', ')}}`
+    }
+
+    // TODO: for all feature variations, define a contract that can be enforced upon the implementation of
+    // the business logic.
+    // When we align on a new feature config, client-side will implement specific business logic to utilize
+    // these values by:
+    // 1) Add an entry in featureDefinitions, which is <feature_name> to <feature_context>.
+    // 2) Add a function with name `getXXX`, where XXX refers to the feature name.
+    // 3) Specify the return type: One of the return type string/boolean/Long/Double should be used here.
+    // 4) Specify the key for the `getFeatureValueForKey` helper function which is the feature name.
+    // 5) Specify the corresponding type value getter for the `FeatureValue` class. For example,
+    // if the return type is Long, then the corresponding type value getter is `longValue()`.
+    // 6) Add a test case for this feature.
+    // 7) In case `getXXX()` returns undefined, it should be treated as a default/control group.
+    getTestFeature(): string | undefined {
+        return this.getFeatureValueForKey(Features.test).stringValue
+    }
+
+    getCustomizationArnOverride(): string | undefined {
+        return this.getFeatureValueForKey(Features.customizationArnOverride).stringValue
+    }
+
+    // Get the feature value for the given key.
+    // In case of a misconfiguration, it will return a default feature value of Boolean true.
+    private getFeatureValueForKey(name: FeatureName): FeatureValue {
+        return this.featureConfigs.get(name)?.value ?? featureDefinitions.get(name)?.value ?? { boolValue: true }
+    }
+
+    /**
+     * Map of feature configurations.
+     *
+     * @returns {Map<string, FeatureContext>} A Map containing the feature configurations, where the keys are strings representing the feature names, and the values are FeatureContext objects.
+     */
+    public static getFeatureConfigs(): Map<string, FeatureContext> {
+        return FeatureConfigProvider.instance.featureConfigs
+    }
+
+    /**
+     * Retrieves the FeatureContext object for a given feature name.
+     *
+     * @param {string} featureName - The name of the feature.
+     * @returns {FeatureContext | undefined} The FeatureContext object for the specified feature, or undefined if the feature doesn't exist.
+     */
+    public static getFeature(featureName: FeatureName): FeatureContext | undefined {
+        return FeatureConfigProvider.instance.featureConfigs.get(featureName)
+    }
+
+    /**
+     * Checks if a feature is active or not.
+     *
+     * @param {string} featureName - The name of the feature to check.
+     * @returns {boolean} False if the variation is not CONTROL, otherwise True
+     */
+    public static isEnabled(featureName: FeatureName): boolean {
+        const featureContext = FeatureConfigProvider.getFeature(featureName)
+        if (featureContext && featureContext.variation.toLocaleLowerCase() !== 'control') {
+            return true
+        }
+        return false
+    }
+}
diff --git a/packages/core/src/shared/filesystemUtilities.ts b/packages/core/src/shared/filesystemUtilities.ts
new file mode 100644
index 00000000000..6414fd11b66
--- /dev/null
+++ b/packages/core/src/shared/filesystemUtilities.ts
@@ -0,0 +1,371 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as crypto from 'crypto'
+import * as os from 'os'
+import * as path from 'path'
+import * as vscode from 'vscode'
+import { getLogger } from './logger/logger'
+import * as pathutils from './utilities/pathUtils'
+import globals from '../shared/extensionGlobals'
+import fs from '../shared/fs/fs'
+import { ToolkitError } from './errors'
+import * as nodeFs from 'fs/promises'
+
+export const tempDirPath = path.join(
+    // https://github.com/aws/aws-toolkit-vscode/issues/240
+    os.type() === 'Darwin' ? '/tmp' : os.tmpdir(),
+    'aws-toolkit-vscode'
+)
+
+export async function getDirSize(dirPath: string, startTime: number, duration: number): Promise<number> {
+    if (performance.now() - startTime > duration) {
+        getLogger().warn('getDirSize: exceeds time limit')
+        return 0
+    }
+    const files = await fs.readdir(dirPath)
+    const fileSizes = files.map(async (file) => {
+        const [fileName, type] = file
+        const filePath = path.join(dirPath, fileName)
+
+        if (type === vscode.FileType.SymbolicLink) {
+            return 0
+        }
+        if (type === vscode.FileType.Directory) {
+            return getDirSize(filePath, startTime, duration)
+        }
+        if (type === vscode.FileType.File) {
+            const stat = await fs.stat(filePath)
+            return stat.size
+        }
+
+        return 0
+    })
+    return (await Promise.all(fileSizes)).reduce((accumulator, size) => accumulator + size, 0)
+}
+
+async function downloadsDir(): Promise<string> {
+    const downloadPath = path.join(os.homedir(), 'Downloads')
+    if (await fs.existsDir(downloadPath)) {
+        return downloadPath
+    } else {
+        return os.tmpdir()
+    }
+}
+
+/**
+ * @deprecated use {@link fs} exist methods instead.
+ * Checks if file or directory `p` exists.
+ *
+ * TODO: optionally check read/write permissions and return a granular status.
+ */
+export async function fileExists(p: string): Promise<boolean> {
+    try {
+        return fs.exists(p)
+    } catch (err) {
+        return false
+    }
+
+    return true
+}
+
+/**
+ * @deprecated use {@link fs} exist methods instead.
+ */
+export async function readFileAsString(pathLike: string): Promise<string> {
+    return fs.readFileText(pathLike)
+}
+
+/**
+ * Best-effort delete a folder recursively. Will not throw if it fails.
+ * @param folder The path to the folder to delete
+ */
+export async function tryRemoveFolder(folder?: string): Promise<boolean> {
+    try {
+        // if null or empty, no issues
+        if (!folder) {
+            getLogger().warn('tryRemoveFolder: no folder given')
+            return false
+        }
+        await fs.delete(folder, { recursive: true, force: true })
+    } catch (err) {
+        getLogger().warn('tryRemoveFolder: failed to delete directory "%s": %O', folder, err as Error)
+        return false
+    }
+    return true
+}
+
+/** Note: In tests use `createTestWorkspaceFolder` instead. */
+export const makeTemporaryToolkitFolder = async (...relativePathParts: string[]) => {
+    if (relativePathParts.length === 0) {
+        relativePathParts.push('vsctk')
+    }
+
+    // Add random characters to the leaf folder to ensure it is unique
+    relativePathParts[relativePathParts.length - 1] =
+        relativePathParts[relativePathParts.length - 1] + crypto.randomBytes(4).toString('hex')
+
+    const tmpPath = path.join(tempDirPath, ...relativePathParts)
+    await fs.mkdir(tmpPath)
+    return tmpPath
+}
+
+/**
+ * Returns `true` if path `p` is a descendant of directory `d` (or if they are
+ * identical).
+ *
+ * Only the logical structure is checked; the paths are not checked for
+ * existence on the filesystem.
+ *
+ * @param d  Path to a directory.
+ * @param p  Path to file or directory to test.
+ */
+export function isInDirectory(d: string, p: string): boolean {
+    if (d === '' || p === '') {
+        return true
+    }
+    const parentDirPieces = pathutils.normalizeSeparator(d).split('/')
+    const containedPathPieces = pathutils.normalizeSeparator(p).split('/')
+
+    if (parentDirPieces.length > containedPathPieces.length) {
+        return false
+    }
+
+    // Remove final empty element(s), if `d` ends with slash(es).
+    while (parentDirPieces.length > 0 && parentDirPieces[parentDirPieces.length - 1] === '') {
+        parentDirPieces.pop()
+    }
+    const caseInsensitive = os.platform() === 'win32'
+
+    return parentDirPieces.every((value, index) => {
+        return caseInsensitive
+            ? value.toLowerCase() === containedPathPieces[index].toLowerCase()
+            : value === containedPathPieces[index]
+    })
+}
+
+/**
+ *
+ * @returns file distance between fileA and fileB
+ * For example:
+ * The file distance between A/B/C.java and A/B/D.java is 0
+ * The file distance between A/B/C.java and A/D.java is 1
+ */
+export function getFileDistance(fileA: string, fileB: string): number {
+    let filePathA = pathutils.normalize(fileA).split('/')
+    filePathA = filePathA.slice(0, filePathA.length - 1)
+
+    let filePathB = pathutils.normalize(fileB).split('/')
+    filePathB = filePathB.slice(0, filePathB.length - 1)
+
+    let i = 0
+    while (i < Math.min(filePathA.length, filePathB.length)) {
+        const dir1 = filePathA[i]
+        const dir2 = filePathB[i]
+
+        if (dir1 !== dir2) {
+            break
+        }
+
+        i++
+    }
+
+    return filePathA.slice(i).length + filePathB.slice(i).length
+}
+
+/**
+ * Returns `name.suffix` if it does not already exist in directory `dir`, else appends
+ * a number ("foo-1.txt", "foo-2.txt", etc.).
+ *
+ * To avoid excessive filesystem activity, if all filenames up to `max` exist,
+ * the function instead appends a random string.
+ *
+ * @param dir  Path to a directory
+ * @param name  Filename without extension
+ * @param suffix  Filename suffix, typically an extension (".txt"), may be empty
+ * @param max  Stop searching if all permutations up to this number exist
+ */
+export async function getNonexistentFilename(
+    dir: string,
+    name: string,
+    suffix: string,
+    max: number = 99
+): Promise<string> {
+    if (!name) {
+        throw new Error(`name is empty`)
+    }
+    if (!(await fs.existsDir(dir))) {
+        throw new Error(`directory does not exist: ${dir}`)
+    }
+    for (let i = 0; true; i++) {
+        const filename =
+            i === 0 ? `${name}${suffix}` : `${name}-${i < max ? i : crypto.randomBytes(4).toString('hex')}${suffix}`
+        const fullpath = path.join(dir, filename)
+        if (!(await fs.exists(fullpath)) || i >= max + 99) {
+            return filename
+        }
+    }
+}
+
+/**
+ * Searches for existence of at least one file with the passed suffix
+ * @param dir Directory to search
+ * @param suffix Suffix to look for (ex.".ts")
+ * @param exclude Pattern to ignore
+ * @returns True if at least one file is found with given suffix
+ */
+export async function hasFileWithSuffix(dir: string, suffix: string, exclude?: vscode.GlobPattern): Promise<boolean> {
+    const searchFolder = `${dir}**/*${suffix}`
+    const matchedFiles = await vscode.workspace.findFiles(searchFolder, exclude, 1)
+    return matchedFiles.length > 0
+}
+
+/**
+ * @returns  A string path to the last locally stored download location. If none, returns the users 'Downloads' directory path.
+ */
+export async function getDefaultDownloadPath(): Promise<string> {
+    const lastUsedPath = globals.globalState.get('aws.downloadPath')
+    if (lastUsedPath) {
+        if (typeof lastUsedPath === 'string') {
+            return lastUsedPath
+        }
+        getLogger().error('Expected "aws.downloadPath" to be string, got %O', typeof lastUsedPath)
+    }
+    return downloadsDir()
+}
+
+export async function setDefaultDownloadPath(downloadPath: string) {
+    try {
+        if (await fs.existsDir(downloadPath)) {
+            await globals.globalState.update('aws.downloadPath', downloadPath)
+        } else {
+            await globals.globalState.update('aws.downloadPath', path.dirname(downloadPath))
+        }
+    } catch (err) {
+        getLogger().error('Error while setting "aws.downloadPath": %O', err as Error)
+    }
+}
+
+const FileSystemStabilityExceptionId = 'FileSystemStabilityException'
+const FileSystemStabilityException = ToolkitError.named(FileSystemStabilityExceptionId)
+
+/**
+ * Run this function to validate common file system calls/flows, ensuring they work
+ * as expected.
+ *
+ * The intent of this function is to catch potential fs issues early,
+ * testing common cases of fs usage. We need this since each machine can behave
+ * differently depending on things like OS, permissions, disk speed, ...
+ *
+ * @throws a {@link FileSystemStabilityException} which wraps the underlying failed fs operation error.
+ */
+export async function throwOnUnstableFileSystem(tmpRoot: string = tempDirPath) {
+    const tmpFolder = path.join(tmpRoot, `validateStableFS-${crypto.randomBytes(4).toString('hex')}`)
+    const tmpFile = path.join(tmpFolder, 'file.txt')
+
+    try {
+        // test basic folder operations
+        await withFailCtx('mkdirInitial', () => fs.mkdir(tmpFolder))
+        // Verifies that we do not throw if the dir exists and we try to make it again
+        await withFailCtx('mkdirButAlreadyExists', () => fs.mkdir(tmpFolder))
+        // Test subfolder creation. Based on telemetry it looks like the vsc mkdir may be flaky
+        // when creating subfolders. Hopefully this gives us some useful information.
+        const subfolderRoot = path.join(tmpFolder, 'a')
+        const subfolderPath = path.join(subfolderRoot, 'b/c/d/e')
+        await withFailCtx('mkdirSubfolderNode', () => nodeFs.mkdir(subfolderPath, { recursive: true }))
+        await withFailCtx('rmdirInitialForNode', () => fs.delete(subfolderRoot, { recursive: true }))
+        await withFailCtx('mkdirSubfolderVsc', () => fs.mkdir(subfolderPath))
+        await withFailCtx('rmdirInitialForVsc', () => fs.delete(subfolderRoot, { recursive: true }))
+
+        // test basic file operations
+        await withFailCtx('mkdirForFileOpsTest', () => fs.mkdir(tmpFolder))
+        await withFailCtx('writeFile1', () => fs.writeFile(tmpFile, 'test1'))
+        await withFailCtx('readFile1', async () => {
+            const text = await fs.readFileText(tmpFile)
+            if (text !== 'test1') {
+                throw new Error(`Unexpected file contents: "${text}"`)
+            }
+        })
+        // overwrite the file content multiple times
+        await withFailCtx('writeFile2', () => fs.writeFile(tmpFile, 'test2'))
+        await withFailCtx('writeFile3', () => fs.writeFile(tmpFile, 'test3'))
+        await withFailCtx('writeFile4', () => fs.writeFile(tmpFile, 'test4'))
+        await withFailCtx('writeFile5', () => fs.writeFile(tmpFile, 'test5'))
+        await withFailCtx('readFile5', async () => {
+            const text = await fs.readFileText(tmpFile)
+            if (text !== 'test5') {
+                throw new Error(`Unexpected file contents after multiple writes: "${text}"`)
+            }
+        })
+        // write a large file, ensuring we are not near a space limit
+        await withFailCtx('writeFileLarge', () => fs.writeFile(tmpFile, 'a'.repeat(1000)))
+        // test concurrent reads on a file
+        await withFailCtx('writeFileConcurrencyTest', () => fs.writeFile(tmpFile, 'concurrencyTest'))
+        const result = await Promise.all([
+            withFailCtx('readFileConcurrent1', () => fs.readFileText(tmpFile)),
+            withFailCtx('readFileConcurrent2', () => fs.readFileText(tmpFile)),
+            withFailCtx('readFileConcurrent3', () => fs.readFileText(tmpFile)),
+            withFailCtx('readFileConcurrent4', () => fs.readFileText(tmpFile)),
+            withFailCtx('readFileConcurrent5', () => fs.readFileText(tmpFile)),
+        ])
+        if (result.some((text) => text !== 'concurrencyTest')) {
+            throw new Error(`Unexpected concurrent file reads: ${result}`)
+        }
+        // test deleting a file
+        await withFailCtx('deleteFileInitial', () => fs.delete(tmpFile))
+        await withFailCtx('writeFileAfterDelete', () => fs.writeFile(tmpFile, 'afterDelete'))
+        await withFailCtx('readNewFileAfterDelete', async () => {
+            const text = await fs.readFileText(tmpFile)
+            if (text !== 'afterDelete') {
+                throw new Error(`Unexpected file content after writing to deleted file: "${text}"`)
+            }
+        })
+        await withFailCtx('deleteFileFully', () => fs.delete(tmpFile))
+        await withFailCtx('notExistsFileAfterDelete', async () => {
+            const res = await fs.exists(tmpFile)
+            if (res) {
+                throw new Error(`Expected file to NOT exist: "${tmpFile}"`)
+            }
+        })
+
+        // test rename
+        await withFailCtx('writeFileForRename', () => fs.writeFile(tmpFile, 'TestingRename'))
+        const tmpFileRenamed = tmpFile + '.renamed'
+        await withFailCtx('renameFile', () => fs.rename(tmpFile, tmpFileRenamed))
+        await withFailCtx('existsRenamedFile', async () => {
+            const res = await fs.exists(tmpFileRenamed)
+            if (!res) {
+                throw new Error(`Expected RENAMED file to exist: "${tmpFileRenamed}"`)
+            }
+        })
+        await withFailCtx('writeToRenamedFile', async () => fs.writeFile(tmpFileRenamed, 'hello'))
+        await withFailCtx('readFromRenamedFile', async () => {
+            const res = await fs.readFileText(tmpFileRenamed)
+            if (res !== 'hello') {
+                throw new Error(`Expected RENAMED file to be writable: "${tmpFileRenamed}"`)
+            }
+        })
+        await withFailCtx('renameFileReset', () => fs.rename(tmpFileRenamed, tmpFile))
+        await withFailCtx('renameFileResetExists', async () => {
+            const res = await fs.exists(tmpFile)
+            if (!res) {
+                throw new Error(`Expected reverted renamed file to exist: "${tmpFile}"`)
+            }
+        })
+    } finally {
+        await fs.delete(tmpFolder, { recursive: true, force: true })
+    }
+
+    async function withFailCtx<T>(ctx: string, fn: () => Promise<T>): Promise<T> {
+        try {
+            return await fn()
+        } catch (e) {
+            if (!(e instanceof Error)) {
+                throw e
+            }
+            throw FileSystemStabilityException.chain(e, `context: "${ctx}"`, { code: FileSystemStabilityExceptionId })
+        }
+    }
+}
diff --git a/packages/core/src/shared/filetypes.ts b/packages/core/src/shared/filetypes.ts
new file mode 100644
index 00000000000..9457592c8b2
--- /dev/null
+++ b/packages/core/src/shared/filetypes.ts
@@ -0,0 +1,378 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as path from 'path'
+import * as constants from '../shared/constants'
+import * as aslFormats from '../stepFunctions/constants/aslFormats'
+import * as fsutil from '../shared/filesystemUtilities'
+import fs from '../shared/fs/fs'
+import globals from './extensionGlobals'
+import { telemetry, FileEditAwsFile, IdeEditCodeFile } from './telemetry/telemetry'
+import { AwsFiletype } from './telemetry/telemetry'
+import * as CloudFormation from './cloudformation/cloudformation'
+
+/** AWS filetypes: vscode language ids */
+export const awsFiletypeLangIds = {
+    /** vscode language ids registered by AWS Toolkit or other AWS extensions for handling. */
+    awsOwned: [aslFormats.JSON_ASL, aslFormats.YAML_ASL, constants.ssmJson, constants.ssmYaml],
+    /** generic vscode language ids that possibly are AWS filetypes  */
+    ambiguous: ['ini', 'plaintext', aslFormats.JSON_TYPE, aslFormats.YAML_TYPE],
+}
+
+/**
+ * Maps vscode language ids to AWS filetypes for telemetry.
+ */
+export function langidToAwsFiletype(langId: string): AwsFiletype {
+    switch (langId) {
+        case constants.ssmJson:
+        case constants.ssmYaml:
+            return 'ssmDocument'
+        case aslFormats.JSON_ASL:
+        case aslFormats.YAML_ASL:
+            return 'stepfunctionsAsl'
+        default:
+            return 'other'
+    }
+}
+
+/** Returns true if file `f` is somewhere in `~/.aws`. */
+export function isAwsConfig(f: string): boolean {
+    const awsDir = path.join(fs.getUserHomeDir(), '.aws')
+    if (fsutil.isInDirectory(awsDir, f)) {
+        return true
+    }
+    return false
+}
+
+export function isAwsFiletype(doc: vscode.TextDocument): boolean | undefined {
+    if (awsFiletypeLangIds.awsOwned.includes(doc.languageId)) {
+        return true
+    }
+    if (isAwsConfig(doc.fileName)) {
+        return true
+    }
+    if (awsFiletypeLangIds.ambiguous.includes(doc.languageId)) {
+        return undefined // Maybe
+    }
+    return false
+}
+
+export function activate(): void {
+    globals.context.subscriptions.push(
+        vscode.window.onDidChangeActiveTextEditor(async (editor) => {
+            const doc = editor?.document
+            // Ignore output:// files.
+            // Ignore *.git files (from the builtin git extension).
+            // Ignore ~/.vscode/argv.json (vscode internal file).
+            const isNoise =
+                !doc || doc.uri.scheme === 'git' || doc.uri.scheme === 'output' || doc.fileName.endsWith('argv.json')
+            if (isNoise) {
+                return
+            }
+
+            const basename = path.basename(doc.fileName)
+            let fileExt: string | undefined = path.extname(doc.fileName).trim()
+            fileExt = fileExt !== '' ? fileExt : undefined // Telemetry client will fail on empty string.
+
+            if (isCodeFile(basename)) {
+                const metric: IdeEditCodeFile = {
+                    filenameExt: fileExt,
+                    result: 'Succeeded',
+                    passive: true, // IDE usage != extension usage.
+                }
+                const isSameMetricPending = await globals.telemetry.findPendingMetric('ide_editCodeFile', metric, [
+                    'filenameExt',
+                ])
+                if (!isSameMetricPending) {
+                    // Avoid redundant/duplicate metrics.
+                    telemetry.ide_editCodeFile.emit(metric)
+                }
+            }
+
+            const isAwsFileExt = isAwsFiletype(doc)
+            const isSchemaHandled = globals.schemaService.isMapped(doc.uri)
+            const cfnTemplate = CloudFormation.isValidFilename(doc.uri)
+                ? await CloudFormation.tryLoad(doc.uri)
+                : undefined
+            const isCfnTemplate = cfnTemplate?.template !== undefined
+
+            if (!isAwsFileExt && !isSchemaHandled && !isCfnTemplate) {
+                return
+            }
+
+            // TODO: ask schemaService for the precise filetype.
+            let telemKind = isAwsConfig(doc.fileName) ? 'awsCredentials' : langidToAwsFiletype(doc.languageId)
+            if (isCfnTemplate) {
+                telemKind = cfnTemplate.kind === 'sam' ? 'cloudformationSam' : 'cloudformation'
+            } else if (telemKind === 'other') {
+                telemKind = isSchemaHandled ? 'cloudformation' : 'other'
+            }
+
+            // HACK: for "~/.aws/foo" vscode sometimes _only_ emits "~/.aws/foo.git".
+            if (telemKind === 'awsCredentials' && fileExt === '.git') {
+                fileExt = undefined
+            }
+
+            // Ensure nice syntax highlighting for ~/.aws/ files.
+            if (
+                telemKind === 'awsCredentials' &&
+                doc.languageId !== 'ini' &&
+                (basename === 'credentials' || basename === 'config')
+            ) {
+                await vscode.languages.setTextDocumentLanguage(doc, 'ini')
+            }
+
+            const metric: FileEditAwsFile = {
+                awsFiletype: telemKind,
+                passive: true,
+                result: 'Succeeded',
+                filenameExt: fileExt,
+            }
+            const isSameMetricPending = await globals.telemetry.findPendingMetric('file_editAwsFile', metric, [
+                'awsFiletype',
+                'filenameExt',
+            ])
+            if (isSameMetricPending) {
+                return // Avoid redundant/duplicate metrics.
+            }
+
+            telemetry.file_editAwsFile.emit(metric)
+        }, undefined)
+    )
+}
+
+/**
+ * Most common programming langauges and their file extensions
+ * Includes list from https://survey.stackoverflow.co/2023/#technology plus extra items.
+ */
+export const codefileExtensions = new Set([
+    '.abap',
+    '.ada',
+    '.adb',
+    '.ads',
+    '.apl',
+    '.asm',
+    '.astro',
+    '.awk',
+    '.b',
+    '.bas',
+    '.bash',
+    '.bat',
+    '.boo',
+    '.bms',
+    '.c',
+    '.cbl',
+    '.cc',
+    '.cfc',
+    '.cfg',
+    '.cfm',
+    '.cjs',
+    '.clj',
+    '.cljc',
+    '.cljs',
+    '.cls',
+    '.cmake',
+    '.cmd',
+    '.cob',
+    '.cobra',
+    '.coffee',
+    '.config',
+    '.cpp',
+    '.cpy',
+    '.cr',
+    '.cs',
+    '.css',
+    '.csx',
+    '.cxx',
+    '.d',
+    '.dart',
+    '.dfm',
+    '.dockerfile',
+    '.dpr',
+    '.e',
+    '.el',
+    '.elm',
+    '.env',
+    '.erb',
+    '.erl',
+    '.ex',
+    '.exs',
+    '.f',
+    '.f03',
+    '.f08',
+    '.f77',
+    '.f90',
+    '.f95',
+    '.flow',
+    '.for',
+    '.fs',
+    '.fsi',
+    '.fsx',
+    '.gd',
+    '.gitignore',
+    '.gjs',
+    '.go',
+    '.gql',
+    '.gradle',
+    '.graphql',
+    '.groovy',
+    '.gs',
+    '.gsp',
+    '.gst',
+    '.gsx',
+    '.gts',
+    '.gvy',
+    '.h',
+    '.hack',
+    '.hbs',
+    '.hh',
+    '.hpp',
+    '.hrl',
+    '.hs',
+    '.htm',
+    '.html',
+    '.hy',
+    '.idl',
+    '.ini',
+    '.io',
+    '.java',
+    '.jl',
+    '.js',
+    '.json',
+    '.jsx',
+    '.kt',
+    '.kts',
+    '.lean',
+    '.lgt',
+    '.lhs',
+    '.lisp',
+    '.lock',
+    '.logtalk',
+    '.lsp',
+    '.lua',
+    '.m',
+    '.ma',
+    '.mak',
+    '.makefile',
+    '.md',
+    '.mdx',
+    '.mjs',
+    '.ml',
+    '.mli',
+    '.mpl',
+    '.ms',
+    '.mu',
+    '.mv',
+    '.n',
+    '.nb',
+    '.nim',
+    '.nix',
+    '.oot',
+    '.oz',
+    '.pas',
+    '.pasm',
+    '.perl',
+    '.php',
+    '.phtml',
+    '.pike',
+    '.pir',
+    '.pl',
+    '.pli',
+    '.pm',
+    '.pmod',
+    '.pp',
+    '.pro',
+    '.prolog',
+    '.properties',
+    '.ps1',
+    '.psd1',
+    '.psm1',
+    '.purs',
+    '.py',
+    '.pyw',
+    '.qs',
+    '.r',
+    '.rake',
+    '.raku',
+    '.rakumod',
+    '.rakutest',
+    '.rb',
+    '.rbw',
+    '.rdata',
+    '.re',
+    '.red',
+    '.reds',
+    '.res',
+    '.rex',
+    '.rexx',
+    '.ring',
+    '.rkt',
+    '.rktl',
+    '.rlib',
+    '.rm',
+    '.rmd',
+    '.roff',
+    '.ron',
+    '.rs',
+    '.ruby',
+    '.s',
+    '.sas',
+    '.sb',
+    '.sb2',
+    '.sb3',
+    '.sc',
+    '.scala',
+    '.scd',
+    '.scm',
+    '.scss',
+    '.sass',
+    '.sh',
+    '.shen',
+    '.sig',
+    '.sml',
+    '.sol',
+    '.sql',
+    '.ss',
+    '.st',
+    '.sv',
+    '.svelte',
+    '.svg',
+    '.swift',
+    '.t',
+    '.tcl',
+    '.tf',
+    '.toml',
+    '.trigger',
+    '.ts',
+    '.tsx',
+    '.tu',
+    '.txt',
+    '.v',
+    '.vala',
+    '.vapi',
+    '.vb',
+    '.vba',
+    '.vbx',
+    '.vhd',
+    '.vhdl',
+    '.vue',
+    '.x',
+    '.xc',
+    '.xi',
+    '.xml',
+    '.yaml',
+    '.yml',
+    '.zig',
+])
+
+// Code file names without an extension
+export const codefileNames = new Set(['Dockerfile', 'Dockerfile.build', 'gradlew', 'mvnw', '.gitignore'])
+
+/** Returns true if `filename` is a code file. */
+export function isCodeFile(filename: string): boolean {
+    const ext = path.extname(filename).toLowerCase()
+    return codefileExtensions.has(ext) || codefileNames.has(path.basename(filename))
+}
diff --git a/src/shared/fs/codelensRootRegistry.ts b/packages/core/src/shared/fs/codelensRootRegistry.ts
similarity index 87%
rename from src/shared/fs/codelensRootRegistry.ts
rename to packages/core/src/shared/fs/codelensRootRegistry.ts
index c8dd89699b7..cf766ea25f5 100644
--- a/src/shared/fs/codelensRootRegistry.ts
+++ b/packages/core/src/shared/fs/codelensRootRegistry.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -18,7 +18,7 @@ import * as vscode from 'vscode'
  * is valid for each codelense
  */
 export class CodelensRootRegistry extends WatchedFiles<string> {
-    protected name: string = 'CodelensRootRegistry'
+    public name: string = 'CodelensRootRegistry'
     protected async process(p: vscode.Uri): Promise<string> {
         const normalizedPath = pathutils.normalize(p.fsPath)
         return path.basename(normalizedPath)
diff --git a/src/shared/fs/devfileRegistry.ts b/packages/core/src/shared/fs/devfileRegistry.ts
similarity index 88%
rename from src/shared/fs/devfileRegistry.ts
rename to packages/core/src/shared/fs/devfileRegistry.ts
index e0151007e15..6ae9a45d893 100644
--- a/src/shared/fs/devfileRegistry.ts
+++ b/packages/core/src/shared/fs/devfileRegistry.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -7,17 +7,17 @@ import * as vscode from 'vscode'
 import { WatchedFiles } from './watchedFiles'
 import * as yaml from 'js-yaml'
 import * as filesystemUtilities from '../filesystemUtilities'
-import { SystemUtilities } from '../systemUtilities'
+import fs from '../fs/fs'
 import { getLogger } from '../logger/logger'
 import globals from '../extensionGlobals'
 
 export const devfileGlobPattern = '**/devfile.{yaml,yml}'
 
 export class DevfileRegistry extends WatchedFiles<Devfile> {
-    protected name = 'DevfileRegistry'
+    public name = 'DevfileRegistry'
 
     protected async process(uri: vscode.Uri, contents?: string): Promise<Devfile | undefined> {
-        if (!(await SystemUtilities.fileExists(uri))) {
+        if (!(await fs.exists(uri))) {
             throw new Error(`Devfile not found: ${uri.fsPath}`)
         }
 
diff --git a/packages/core/src/shared/fs/fs.ts b/packages/core/src/shared/fs/fs.ts
new file mode 100644
index 00000000000..ce317a513df
--- /dev/null
+++ b/packages/core/src/shared/fs/fs.ts
@@ -0,0 +1,674 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import vscode from 'vscode'
+import os from 'os'
+import { promises as nodefs, constants as nodeConstants, WriteFileOptions } from 'fs' // eslint-disable-line no-restricted-imports
+import { chmod } from 'fs/promises'
+import _path from 'path'
+import {
+    PermissionsError,
+    PermissionsTriplet,
+    ToolkitError,
+    getTelemetryReasonDesc,
+    isFileNotFoundError,
+    isPermissionsError,
+    scrubNames,
+} from '../errors'
+import globals, { isWeb } from '../extensionGlobals'
+import { isWin } from '../vscode/env'
+import { resolvePath } from '../utilities/pathUtils'
+import crypto from 'crypto'
+import { waitUntil } from '../utilities/timeoutUtils'
+import { telemetry } from '../telemetry/telemetry'
+import { getLogger } from '../logger/logger'
+import { toUri } from '../utilities/uriUtils'
+
+const vfs = vscode.workspace.fs
+type Uri = vscode.Uri
+
+function createPermissionsErrorHandler(
+    isWeb: boolean,
+    uri: vscode.Uri,
+    perms: PermissionsTriplet
+): (err: unknown, depth?: number) => Promise<never> {
+    return async function (err: unknown, depth = 0) {
+        if (uri.scheme !== 'file' || isWin()) {
+            throw err
+        }
+        if (!isPermissionsError(err) && !(isFileNotFoundError(err) && depth > 0)) {
+            throw err
+        }
+
+        const userInfo = fs.getUserInfo()
+
+        if (isWeb) {
+            const stats = await fs.stat(uri)
+            throw new PermissionsError(uri, stats, userInfo, perms, err)
+        }
+
+        const stats = await nodefs.stat(uri.fsPath).catch(async (err2) => {
+            if (!isPermissionsError(err2) && !(isFileNotFoundError(err2) && perms[1] === 'w')) {
+                throw err
+            }
+
+            throw await createPermissionsErrorHandler(isWeb, vscode.Uri.joinPath(uri, '..'), '*wx')(err2, depth + 1)
+        })
+
+        throw new PermissionsError(uri, stats, userInfo, perms, err)
+    }
+}
+
+/**
+ * @warning Do not import this class directly, instead import the {@link fs} instance.
+ *
+ * Filesystem functions compatible with both browser and desktop (node.js).
+ *
+ * Technical Details:
+ * TODO: Verify the point below once I get this hooked up to the browser code.
+ * - vscode.workspace.fs dynamically resolves the correct file system provider
+ *   to use. This means that in the browser it will attempt to use the File System
+ *   Access API.
+ *
+ *
+ * MODIFYING THIS CLASS:
+ * - All methods must work for both browser and desktop
+ * - Do not use 'fs' or 'fs-extra' since they are not browser compatible.
+ */
+export class FileSystem {
+    #homeDir: string | undefined
+    #username: string | undefined
+    #osUserInfo = os.userInfo
+
+    private constructor() {}
+    static #instance: FileSystem
+    static get instance(): FileSystem {
+        return (this.#instance ??= new FileSystem())
+    }
+
+    /** Creates the directory as well as missing parent directories. */
+    async mkdir(path: Uri | string): Promise<void> {
+        const uri = toUri(path)
+        const errHandler = createPermissionsErrorHandler(this.isWeb, vscode.Uri.joinPath(uri, '..'), '*wx')
+
+        return vfs.createDirectory(uri).then(undefined, errHandler)
+    }
+
+    /**
+     * Read file into byte array.
+     * @param path uri or path to file.
+     * @returns byte content of file.
+     */
+    async readFileBytes(path: Uri | string): Promise<Uint8Array> {
+        const uri = toUri(path)
+        const errHandler = createPermissionsErrorHandler(this.isWeb, uri, 'r**')
+
+        return vfs.readFile(uri).then(undefined, errHandler)
+    }
+
+    /**
+     * Read file and convert the resulting bytes to a string.
+     * @param path uri or path to file.
+     * @param decoder decoder to be used, defaults to UTF-8
+     * @returns string of decoded text.
+     */
+    async readFileText(path: Uri | string, decoder: TextDecoder = FileSystem.#decoder): Promise<string> {
+        const uri = toUri(path)
+        const bytes = await this.readFileBytes(uri)
+        return decoder.decode(bytes)
+    }
+
+    /**
+     * The {@link vscode.workspace.fs} implementation does not explicitly provide an append method
+     * so we must do it ourselves (this implementation is inefficient).
+     */
+    async appendFile(path: Uri | string, content: Uint8Array | string): Promise<void> {
+        path = toUri(path)
+
+        const currentContent: Uint8Array = (await this.existsFile(path))
+            ? await this.readFileBytes(path)
+            : new Uint8Array(0)
+        const currentLength = currentContent.length
+
+        const newContent = this.#toBytes(content)
+        const newLength = newContent.length
+
+        const finalContent = new Uint8Array(currentLength + newLength)
+        finalContent.set(currentContent)
+        finalContent.set(newContent, currentLength)
+
+        return this.writeFile(path, finalContent)
+    }
+    /**
+     * Checks if file or folder exists.
+     * @param path path to check.
+     * @param fileType optional assert that path contains certain filetype.
+     * @returns if path exists and matches filetype.
+     */
+    async exists(path: Uri | string, fileType?: vscode.FileType): Promise<boolean> {
+        if (path === undefined || path === '') {
+            return false
+        }
+        const uri = toUri(path)
+        if (uri.fsPath === undefined || uri.fsPath === '') {
+            return false
+        }
+        // Note: comparison is bitwise (&) because `FileType` enum is bitwise.
+        const anyKind = fileType === undefined || fileType & vscode.FileType.Unknown
+
+        const r = await this.stat(uri).then(
+            (r) => r,
+            (err) => !isFileNotFoundError(err)
+        )
+        if (typeof r === 'boolean') {
+            return r
+        }
+        return anyKind ? true : !!(r.type & fileType)
+    }
+
+    async existsFile(path: Uri | string): Promise<boolean> {
+        return this.exists(path, vscode.FileType.File)
+    }
+
+    async existsDir(path: Uri | string): Promise<boolean> {
+        return this.exists(path, vscode.FileType.Directory)
+    }
+
+    /**
+     * Writes `data` to file `path` (creating missing intermediate directories if needed). If `opt`
+     * is not given (or in web-mode), defaults with `utf-8` encoding and `644` (rw-r--r--)
+     * permissions.
+     *
+     * @param path File location
+     * @param data File content
+     * @param opts File permissions/flags. Only works in a non-web (nodejs) context. If provided,
+     * nodejs filesystem interface is used instead of routing through vscode VFS.
+     * @param opts.atomic If true, ensures content is not corrupted from a concurrent write.
+     *                    This is not truly atomic as an async write can override the final result,
+     *                    but if the content is structured like JSON it will still be parseable.
+     *
+     *                    Eg: we were seeing a JSON file with an unexpected extra '}' and when parsing it
+     *                    failed. We suspected a race condition from separate write, and all we wanted was
+     *                    a parseable JSON.
+     *
+     *                    This optional has an uncalcuated performance impact as there is an additional
+     *                    rename() operation.
+     */
+    async writeFile(
+        path: Uri | string,
+        data: string | Uint8Array,
+        opts?: WriteFileOptions & { atomic?: boolean }
+    ): Promise<void> {
+        const uri = toUri(path)
+        const errHandler = createPermissionsErrorHandler(this.isWeb, uri, '*w*')
+        const content = this.#toBytes(data)
+
+        if (this.isWeb) {
+            return vfs.writeFile(uri, content).then(undefined, errHandler)
+        }
+
+        // Node writeFile is the only way to set `writeOpts`, such as the `mode`, on a file .
+        // When not in web we will use Node's writeFile() for all other scenarios.
+        // It also has better error messages than VS Code's writeFile().
+        const write = (u: Uri) => nodefs.writeFile(u.fsPath, content, opts).then(undefined, errHandler)
+
+        // Node writeFile does NOT create parent folders by default, unlike VS Code FS writeFile()
+        await fs.mkdir(_path.dirname(uri.fsPath))
+
+        if (opts?.atomic) {
+            // Background: As part of an "atomic write" we write to a temp file, then rename
+            // to the target file. The problem was that each `rename()` implementation doesn't always
+            // work. The solution is to try each implementation and then fallback to a regular write if none of them work.
+            // 1. Atomic write with VSC rename(), but may throw `FileNotFound` errors
+            //    - Looks to be this error from what we see in telemetry: https://github.com/microsoft/vscode/blob/09d5f4efc5089ce2fc5c8f6aeb51d728d7f4e758/src/vs/platform/files/common/fileService.ts#L1029-L1030
+            // 2. Atomic write with Node rename(), but may throw `EPERM` errors on Windows
+            //    - This is explained in https://github.com/aws/aws-toolkit-vscode/pull/5335
+            //    - Step 1 is supposed to address the EPERM issue
+            // 3. Finally, do a regular file write, but may result in invalid file content
+            //
+            // For telemetry, we will only report failures as to not overload with succeed events.
+            const tempFile = toUri(`${uri.fsPath}.${crypto.randomBytes(8).toString('hex')}.tmp`)
+            try {
+                await write(tempFile)
+                await fs.rename(tempFile, uri)
+                return
+            } catch (e) {
+                telemetry.ide_fileSystem.emit({
+                    action: 'writeFile',
+                    result: 'Failed',
+                    reason: 'writeFileAtomicVscRename',
+                    reasonDesc: getTelemetryReasonDesc(e),
+                })
+                getLogger().warn(`writeFile atomic VSC failed for, ${uri.fsPath}, with %O`, e)
+                // Atomic write with VSC rename() failed, so try with Node rename()
+                try {
+                    await write(tempFile)
+                    await nodefs.rename(tempFile.fsPath, uri.fsPath)
+                    return
+                } catch (e) {
+                    telemetry.ide_fileSystem.emit({
+                        action: 'writeFile',
+                        result: 'Failed',
+                        reason: 'writeFileAtomicNodeRename',
+                        reasonDesc: getTelemetryReasonDesc(e),
+                    })
+                    getLogger().warn(`writeFile atomic Node failed for, ${uri.fsPath}, with %O`, e)
+                    // The atomic rename techniques were not successful, so we will
+                    // just resort to regular a non-atomic write
+                }
+            } finally {
+                // clean up temp file since it possibly remains
+                if (await fs.exists(tempFile)) {
+                    await fs.delete(tempFile)
+                }
+            }
+        }
+
+        await write(uri)
+    }
+
+    /**
+     * Rename (move) a file or folder.
+     * @param oldPath
+     * @param newPath
+     * @returns
+     */
+    async rename(oldPath: vscode.Uri | string, newPath: vscode.Uri | string) {
+        const oldUri = toUri(oldPath)
+        const newUri = toUri(newPath)
+        const errHandler = createPermissionsErrorHandler(this.isWeb, oldUri, 'rw*')
+
+        /**
+         * We were seeing 'FileNotFound' errors during renames, even though we did a `writeFile()` right before the rename.
+         * The error looks to be from here: https://github.com/microsoft/vscode/blob/09d5f4efc5089ce2fc5c8f6aeb51d728d7f4e758/src/vs/platform/files/node/diskFileSystemProvider.ts#L747
+         * So a guess is that the exists()(stat() under the hood) call needs to be retried since there may be a race condition.
+         */
+        let attempts = 0
+        const isExists = await waitUntil(async () => {
+            const result = await fs.exists(oldUri)
+            attempts += 1
+            return result
+        }, FileSystem.renameTimeoutOpts)
+        // TODO: Move the `ide_fileSystem` or some variation of this metric in to common telemetry
+        // TODO: Deduplicate the `ide_fileSystem` call. Maybe have a method that all operations pass through which wraps the call in telemetry.
+        //       Then look to report telemetry failure events.
+        const scrubbedPath = scrubNames(oldUri.fsPath)
+        if (!isExists) {
+            // source path never existed after multiple attempts.
+            // Either the file never existed, or had we waited longer it would have. We won't know.
+            telemetry.ide_fileSystem.emit({
+                result: 'Failed',
+                action: 'rename',
+                reason: 'SourceNotExists',
+                reasonDesc: `After ${FileSystem.renameTimeoutOpts.timeout}ms the source path did not exist: ${scrubbedPath}`,
+            })
+        } else if (attempts > 1) {
+            // Indicates that rename() would have failed if we had not waited for it to exist.
+            telemetry.ide_fileSystem.emit({
+                result: 'Succeeded',
+                action: 'rename',
+                reason: 'RenameRaceCondition',
+                reasonDesc: `After multiple attempts the source path existed: ${scrubbedPath}`,
+                attempts: attempts,
+            })
+        }
+
+        return vfs.rename(oldUri, newUri, { overwrite: true }).then(undefined, errHandler)
+    }
+
+    /**
+     * It looks like scenario of a failed rename is rare,
+     * so we can afford to have a longer timeout and interval.
+     *
+     * These values are an arbitrary guess to how long it takes
+     * for a newly created file to be visible on the filesystem.
+     */
+    static readonly renameTimeoutOpts = {
+        timeout: 10_000,
+        interval: 300,
+    } as const
+
+    /**
+     * The stat of the file,  throws if the file does not exist or on any other error.
+     */
+    async stat(uri: vscode.Uri | string): Promise<vscode.FileStat> {
+        const path = toUri(uri)
+        return await vfs.stat(path)
+    }
+
+    /**
+     * Change permissions on file. Note that this will do nothing on browser.
+     * @param uri file whose permissions should be set.
+     * @param mode new permissions in octal notation.
+     * More info: https://nodejs.org/api/fs.html#fspromiseschmodpath-mode
+     * Examples: https://www.geeksforgeeks.org/node-js-fspromises-chmod-method/
+     */
+    async chmod(uri: vscode.Uri | string, mode: number): Promise<void> {
+        if (!this.isWeb) {
+            const path = toUri(uri)
+            await chmod(path.fsPath, mode)
+        }
+    }
+
+    /**
+     * Deletes a file or directory. It is not an error if the file/directory does not exist, unless
+     * its parent directory is not listable (executable).
+     *
+     * @param fileOrDir Path to file or directory
+     * @param opt Options.
+     * - `recursive`: forcefully delete a directory. Use `recursive:false` (the default) to prevent
+     *   accidentally deleting a directory when a file is expected.
+     * - `force`: ignore "not found" errors. Defaults to true if `recursive:true`, else defaults to
+     *   false.
+     */
+    async delete(fileOrDir: string | vscode.Uri, opt_?: { recursive?: boolean; force?: boolean }): Promise<void> {
+        const opt = { ...opt_, recursive: !!opt_?.recursive }
+        opt.force = opt.force === false ? opt.force : !!(opt.force || opt.recursive)
+        const uri = toUri(fileOrDir)
+        const parent = vscode.Uri.joinPath(uri, '..')
+        const errHandler = createPermissionsErrorHandler(this.isWeb, parent, '*wx')
+
+        if (opt.recursive) {
+            // Error messages may be misleading if using the `recursive` option.
+            // Need to implement our own recursive delete if we want detailed info.
+            return vfs.delete(uri, opt).then(undefined, (err) => {
+                if (!opt.force || !isFileNotFoundError(err)) {
+                    throw err
+                }
+                // Else: ignore "not found" error.
+            })
+        }
+
+        return vfs.delete(uri, opt).then(undefined, async (err) => {
+            const notFound = isFileNotFoundError(err)
+
+            if (notFound && opt.force) {
+                return // Ignore "not found" error.
+            } else if (this.isWeb || isPermissionsError(err)) {
+                throw await errHandler(err)
+            } else if (uri.scheme !== 'file' || (!isWin() && !notFound)) {
+                throw err
+            } else {
+                // Try to build a more detailed "not found" error.
+
+                // if (isMinVscode('1.80.0') && notFound) {
+                //     return // Old Nodejs does not have constants.S_IXUSR.
+                // }
+
+                // Attempting to delete a file in a non-executable directory results in ENOENT.
+                // But this might not be true. The file could exist, we just don't know about it.
+                // Note: Windows has no "x" (executable) flag.
+                const parentStat = await nodefs.stat(parent.fsPath).catch(() => {
+                    throw err
+                })
+                const isParentExecutable = isWin() || !!(parentStat.mode & nodeConstants.S_IXUSR)
+                if (!isParentExecutable) {
+                    const userInfo = this.getUserInfo()
+                    throw new PermissionsError(parent, parentStat, userInfo, '*wx', err)
+                } else if (notFound) {
+                    return
+                }
+            }
+
+            throw err
+        })
+    }
+
+    async readdir(uri: vscode.Uri | string): Promise<[string, vscode.FileType][]> {
+        return await vfs.readDirectory(toUri(uri))
+    }
+
+    /**
+     * Copy target file or directory
+     * @param source
+     * @param target
+     * @returns
+     */
+    async copy(source: vscode.Uri | string, target: vscode.Uri | string): Promise<void> {
+        const sourcePath = toUri(source)
+        const targetPath = toUri(target)
+        return await vfs.copy(sourcePath, targetPath, { overwrite: true })
+    }
+
+    /**
+     * Checks if the current user has _at least_ the specified permissions.
+     *
+     * This throws {@link PermissionsError} when permissions are insufficient.
+     */
+    async checkPerms(file: string | vscode.Uri, perms: PermissionsTriplet): Promise<void> {
+        // TODO: implement checkExactPerms() by checking the file mode.
+        // public static async checkExactPerms(file: string | vscode.Uri, perms: `${PermissionsTriplet}${PermissionsTriplet}${PermissionsTriplet}`)
+        const uri = toUri(file)
+        const errHandler = createPermissionsErrorHandler(this.isWeb, uri, perms)
+        const flags = Array.from(perms) as (keyof typeof this.modeMap)[]
+        const mode = flags.reduce((m, f) => m | this.modeMap[f], nodeConstants.F_OK)
+
+        return nodefs.access(uri.fsPath, mode).catch(errHandler)
+    }
+
+    /**
+     * Returns the file or directory location given by `envVar` if it is non-empty and the location is valid (exists) on the filesystem.
+     *
+     * Special case: if 'HOMEPATH' is given then $HOMEDRIVE is prepended to it.
+     *
+     * Throws an exception if the env var path is non-empty but invalid.
+     *
+     * @param envVar Environment variable name
+     * @param kind Expect a valid file, directory, or either.
+     */
+    async tryGetFilepathEnvVar(envVar: string, kind: vscode.FileType | undefined): Promise<string | undefined> {
+        let envVal = process.env[envVar]
+
+        if (envVal) {
+            // Special case: Windows $HOMEPATH depends on $HOMEDRIVE.
+            if (envVar === 'HOMEPATH') {
+                const homeDrive = process.env.HOMEDRIVE || 'C:'
+                envVal = _path.join(homeDrive, envVal)
+            }
+
+            // Expand "~/" to home dir.
+            const f = resolvePath(envVal, this.#homeDir ?? 'UNKNOWN-HOME')
+            if (await fs.exists(f, kind)) {
+                return f
+            }
+
+            throw new ToolkitError(`\$${envVar} filepath is invalid: "${f}"`)
+        }
+    }
+
+    /**
+     * Initializes the FileSystem object. Resolves the user's home directory and validates related
+     * environment variables. Should be called:
+     *  1. at startup after all env vars are set
+     *  2. whenver env vars change
+     *
+     * @param onFail Invoked if a valid home directory could not be resolved
+     * @returns List of error messages if any invalid env vars were found.
+     */
+    async init(
+        extContext: vscode.ExtensionContext,
+        onFail: (homeDir: string) => void,
+        osUserInfo?: typeof os.userInfo
+    ): Promise<string[]> {
+        this.#username = undefined
+        this.#osUserInfo = osUserInfo ?? os.userInfo
+
+        if (this.isWeb) {
+            // When in browser we cannot access the users desktop file system.
+            // Instead, VS Code provided uris will use the browsers storage.
+            // IMPORTANT: we must preserve the scheme of this URI or else VS Code
+            // will incorrectly interpret the path.
+            this.#homeDir = extContext.globalStorageUri.toString()
+            return []
+        }
+
+        /** Logger may not be available during startup, so messages are stored here. */
+        const logMsgs: string[] = []
+        function logErr(e: unknown): undefined {
+            logMsgs.push((e as Error).message)
+            return undefined
+        }
+        const tryGet = (envName: string) => {
+            return this.tryGetFilepathEnvVar(envName, vscode.FileType.Directory).catch(logErr)
+        }
+        let p: string | undefined
+        if ((p = await tryGet('HOME'))) {
+            this.#homeDir = p
+        } else if ((p = await tryGet('USERPROFILE'))) {
+            this.#homeDir = p
+        } else if ((p = await tryGet('HOMEPATH'))) {
+            this.#homeDir = p
+        } else {
+            this.#homeDir = os.homedir()
+        }
+
+        // If $HOME is bogus, os.homedir() will still return it! All we can do is show an error.
+        if (!(await fs.exists(this.#homeDir, vscode.FileType.Directory))) {
+            onFail(this.#homeDir)
+        }
+
+        return logMsgs
+    }
+
+    /**
+     * Gets the (cached) user home directory path.
+     *
+     * To update the cached value (e.g. after environment variables changed), call {@link init()}.
+     */
+    getUserHomeDir(): string {
+        if (!this.#homeDir) {
+            throw new Error('call fs.init() before using fs.getHomeDirectory()')
+        }
+        return this.#homeDir
+    }
+
+    /**
+     * Gets the application cache folder for the current platform
+     *
+     * Follows the cache_dir convention outlined in https://crates.io/crates/dirs
+     */
+    getCacheDir(): string {
+        if (isWeb()) {
+            const homeDir = this.#homeDir
+            if (!homeDir) {
+                throw new ToolkitError('Web home directory not found', {
+                    code: 'WebHomeDirectoryNotFound',
+                })
+            }
+            return homeDir
+        }
+        switch (process.platform) {
+            case 'darwin': {
+                return _path.join(this.getUserHomeDir(), 'Library/Caches')
+            }
+            case 'win32': {
+                const localAppData = process.env.LOCALAPPDATA
+                if (!localAppData) {
+                    throw new ToolkitError('LOCALAPPDATA environment variable not set', {
+                        code: 'LocalAppDataNotFound',
+                    })
+                }
+                return localAppData
+            }
+            case 'linux': {
+                return _path.join(this.getUserHomeDir(), '.cache')
+            }
+            default: {
+                throw new Error(`Unsupported platform: ${process.platform}. Expected 'darwin', 'win32', 'linux'.`)
+            }
+        }
+    }
+
+    /**
+     * Gets the (cached) username for this session, or "webuser" in web-mode, or "unknown-user" if
+     * a username could not be resolved.
+     *
+     * If `os.userInfo` fails, tries these fallbacks:
+     * - `process.env.USER`
+     * - getUserHomeDir() directory name
+     */
+    getUsername(): string {
+        if (!this.#homeDir) {
+            throw new Error('call fs.init() before using fs.getUsername()')
+        }
+
+        if (this.#username !== undefined) {
+            return this.#username
+        }
+
+        const userInfo = this.getUserInfo()
+        this.#username = userInfo.username
+
+        return userInfo.username
+    }
+
+    /**
+     * Gets platform-dependent user info, or a dummy object on failure or for web-mode.
+     *
+     * See {@link getUsername} for username resolution.
+     */
+    getUserInfo(): os.UserInfo<string> {
+        if (!this.#homeDir) {
+            throw new Error('call fs.init() before using fs.getUserInfo()')
+        }
+
+        const fallback = {
+            gid: 0,
+            uid: 0,
+            homedir: this.getUserHomeDir(),
+            shell: '',
+            username: 'unknown-user',
+        }
+
+        if (this.isWeb) {
+            return {
+                ...fallback,
+                username: 'webuser',
+            }
+        }
+
+        try {
+            return this.#osUserInfo({ encoding: 'utf-8' })
+        } catch {
+            const envUser = process.env.USER ?? ''
+            if (envUser.trim() !== '') {
+                fallback.username = envUser
+            } else if (fallback.homedir.trim() !== '') {
+                fallback.username = _path.basename(fallback.homedir.replace(/[\/\\]$/g, ''))
+            }
+            return fallback
+        }
+    }
+    // Defaults to UTF-8 encoding/decoding.
+    static readonly #decoder = new TextDecoder()
+    static readonly #encoder = new TextEncoder()
+
+    private static stringToArray(string: string): Uint8Array {
+        return FileSystem.#encoder.encode(string)
+    }
+
+    /** Encodes UTF-8 string data as bytes. */
+    #toBytes(data: Uint8Array | string): Uint8Array {
+        if (typeof data === 'string') {
+            return FileSystem.stringToArray(data)
+        }
+        return data
+    }
+
+    private get modeMap() {
+        return {
+            '*': 0,
+            r: nodeConstants.R_OK,
+            w: nodeConstants.W_OK,
+            x: nodeConstants.X_OK,
+        } as const
+    }
+
+    private get isWeb(): boolean {
+        return globals.isWeb
+    }
+}
+
+export const fs = FileSystem.instance
+export default fs
diff --git a/packages/core/src/shared/fs/templateRegistry.ts b/packages/core/src/shared/fs/templateRegistry.ts
new file mode 100644
index 00000000000..a9ec3a66ac8
--- /dev/null
+++ b/packages/core/src/shared/fs/templateRegistry.ts
@@ -0,0 +1,308 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { readFileSync } from 'fs' // eslint-disable-line no-restricted-imports
+import * as CloudFormation from '../cloudformation/cloudformation'
+import * as pathutils from '../utilities/pathUtils'
+import * as path from 'path'
+import { isInDirectory } from '../filesystemUtilities'
+import { dotNetRuntimes, goRuntimes, javaRuntimes } from '../../lambda/models/samLambdaRuntime'
+import { getLambdaDetails } from '../../lambda/utils'
+import { WatchedFiles, WatchedItem } from './watchedFiles'
+import { getLogger } from '../logger/logger'
+import globals from '../extensionGlobals'
+import { Timeout } from '../utilities/timeoutUtils'
+import { localize } from '../utilities/vsCodeUtils'
+import { PerfLog } from '../logger/perfLogger'
+import { showMessageWithCancel } from '../utilities/messages'
+import { Runtime } from '@aws-sdk/client-lambda'
+
+export class CloudFormationTemplateRegistry extends WatchedFiles<CloudFormation.Template> {
+    public name: string = 'CloudFormationTemplateRegistry'
+
+    protected async process(uri: vscode.Uri, contents?: string): Promise<CloudFormation.Template | undefined> {
+        // P0: Assume all template.yaml/yml files are CFN templates and assign correct JSON schema.
+        // P1: Alter registry functionality to search ALL YAML files and apply JSON schemas + add to registry based on validity
+
+        const r = await CloudFormation.tryLoad(uri, contents)
+        if (r.kind === undefined) {
+            globals.schemaService.registerMapping({ uri, type: 'yaml', schema: undefined })
+            return undefined
+        }
+
+        if (r.kind === 'sam') {
+            globals.schemaService.registerMapping({ uri, type: 'yaml', schema: 'sam' })
+        } else if (r.kind === 'cfn') {
+            globals.schemaService.registerMapping({ uri, type: 'yaml', schema: 'cfn' })
+        }
+
+        return r.template
+    }
+
+    // handles delete case
+    public override async remove(uri: vscode.Uri): Promise<void> {
+        globals.schemaService.registerMapping({
+            uri,
+            type: 'yaml',
+            schema: undefined,
+        })
+        await super.remove(uri)
+    }
+}
+
+/**
+ * The purpose of this class is to resolve a {@link CloudFormationTemplateRegistry}
+ * instance once the given setup is complete.
+ *
+ * This solves the issue where setup can take a while and if we
+ * block on it the entire extension startup time is increased.
+ */
+export class AsyncCloudFormationTemplateRegistry {
+    /** Setup of the registry can take a while, this property indicates it is done */
+    private isSetup = false
+    private setupPromise: Thenable<CloudFormationTemplateRegistry> | undefined
+
+    /**
+     * @param asyncSetupFunc registry setup that will be run async
+     */
+    constructor(
+        private readonly instance: CloudFormationTemplateRegistry,
+        private readonly asyncSetupFunc: (
+            instance: CloudFormationTemplateRegistry,
+            cancelSetup: Timeout,
+            onItem?: (total: number, i: number, cancelled: boolean) => void
+        ) => Promise<CloudFormationTemplateRegistry>
+    ) {}
+
+    /**
+     * Returns the initial registry instance if setup has completed, otherwise returns a temporary
+     * instance and shows a progress message ("Scanning...") until setup is done.
+     */
+    async getInstance(): Promise<CloudFormationTemplateRegistry> {
+        if (this.isSetup) {
+            return this.instance
+        }
+        if (this.setupPromise) {
+            getLogger().debug('%s: getInstance() requested, still initializing', this.instance.name)
+            return this.setupPromise
+        }
+
+        // Show a "Scanning..." progress message until setup is done.
+        const cancelSetup = new Timeout(30 * 60 * 1000) // 30 min
+        const msg = localize(
+            'AWS.codelens.waitingForTemplateRegistry',
+            'Scanning CloudFormation templates (except [search.exclude](command:workbench.action.openSettings?"@id:search.exclude"))'
+        )
+        const progress = await showMessageWithCancel(msg, cancelSetup)
+
+        const perf = new PerfLog(`${this.instance.name}: template registry setup`)
+        this.setupPromise = this.asyncSetupFunc(this.instance, cancelSetup, (total: number, i: number) => {
+            if (cancelSetup.completed) {
+                getLogger().debug('%s: getInstance() cancelled', this.instance.name)
+                return
+            }
+            if (total !== 0) {
+                progress.report({ increment: 100 * (1 / total), message: i.toString() })
+            }
+        })
+
+        this.setupPromise.then(
+            () => {
+                if (perf) {
+                    perf.done()
+                }
+                this.isSetup = true
+                cancelSetup.dispose()
+            },
+            (e) => {
+                getLogger().error('AsyncCloudFormationTemplateRegistry: setupPromise failed: %s', (e as Error).message)
+            }
+        )
+
+        return this.setupPromise
+    }
+}
+
+/**
+ * Gets resources and additional metadata for resources tied to a filepath and handler.
+ * Checks all registered templates by default; otherwise can operate on a subset TemplateDatum[]
+ * @param filepath Handler file's path
+ * @param handler Handler function from aforementioned file
+ * @param unfilteredTemplates Array containing TemplateDatum objects to filter
+ */
+export function getResourcesForHandler(
+    filepath: string,
+    handler: string,
+    unfilteredTemplates: WatchedItem<CloudFormation.Template>[]
+): { templateDatum: WatchedItem<CloudFormation.Template>; name: string; resourceData: CloudFormation.Resource }[] {
+    // TODO: Array.flat and Array.flatMap not introduced until >= Node11.x -- migrate when VS Code updates Node ver
+    const o = unfilteredTemplates.map((templateDatum) => {
+        return getResourcesForHandlerFromTemplateDatum(filepath, handler, templateDatum).map((resource) => {
+            return {
+                ...resource,
+                templateDatum,
+            }
+        })
+    })
+    if (o.length === 0) {
+        return []
+    }
+    return o.reduce((acc, cur) => [...acc, ...cur])
+}
+
+/**
+ * Returns an array of Cloudformation Resources in a TemplateDatum that is tied to the filepath and handler given.
+ * @param filepath Handler file's path
+ * @param handler Handler function from aforementioned file
+ * @param templateDatum TemplateDatum object to search through
+ */
+export function getResourcesForHandlerFromTemplateDatum(
+    filepath: string,
+    handler: string,
+    templateDatum: WatchedItem<CloudFormation.Template>
+): { name: string; resourceData: CloudFormation.Resource }[] {
+    const matchingResources: { name: string; resourceData: CloudFormation.Resource }[] = []
+    const templateDirname = path.dirname(templateDatum.path)
+    // template isn't a parent or sibling of file
+    if (!isInDirectory(templateDirname, path.dirname(filepath))) {
+        return []
+    }
+
+    // no resources
+    const resources = templateDatum.item.Resources
+    if (!resources) {
+        return []
+    }
+
+    for (const key of Object.keys(resources)) {
+        const resource = resources[key]
+        // check if some sort of serverless function
+        if (
+            resource &&
+            [CloudFormation.SERVERLESS_FUNCTION_TYPE, CloudFormation.LAMBDA_FUNCTION_TYPE].includes(resource.Type)
+        ) {
+            // parse template values that could potentially be refs
+            const registeredRuntime = CloudFormation.getStringForProperty(
+                resource.Properties,
+                'Runtime',
+                templateDatum.item
+            ) as Runtime
+            const registeredCodeUri = CloudFormation.getStringForProperty(
+                resource.Properties,
+                'CodeUri',
+                templateDatum.item
+            )
+            const registeredHandler = CloudFormation.getStringForProperty(
+                resource.Properties,
+                'Handler',
+                templateDatum.item
+            )
+
+            // properties for image type templates
+            const registeredPackageType = CloudFormation.getStringForProperty(
+                resource.Properties,
+                'PackageType',
+                templateDatum.item
+            )
+            const registeredDockerContext = CloudFormation.getStringForProperty(
+                resource.Metadata,
+                'DockerContext',
+                templateDatum.item
+            )
+            const registeredDockerFile = CloudFormation.getStringForProperty(
+                resource.Metadata,
+                'Dockerfile',
+                templateDatum.item
+            )
+
+            if (registeredRuntime && registeredHandler && registeredCodeUri) {
+                // Java and .NET are currently special cases in that the filepath and handler aren't specific.
+                // For now: check if handler matches and check if the code URI contains the filepath.
+                // TODO: Can we use Omnisharp or some sort of Java tooling to help guide us better?
+                if (dotNetRuntimes.includes(registeredRuntime) || javaRuntimes.includes(registeredRuntime)) {
+                    if (
+                        handler === registeredHandler &&
+                        isInDirectory(
+                            pathutils.normalize(path.join(templateDirname, registeredCodeUri)),
+                            pathutils.normalize(filepath)
+                        )
+                    ) {
+                        matchingResources.push({ name: key, resourceData: resource })
+                    }
+                } else if (goRuntimes.includes(registeredRuntime)) {
+                    // Go is another special case. The handler merely refers to the compiled binary.
+                    // We ignore checking for a handler name match, since it is not relevant
+                    // See here: https://github.com/aws/aws-lambda-go
+                    if (
+                        isInDirectory(
+                            pathutils.normalize(path.join(templateDirname, registeredCodeUri)),
+                            pathutils.normalize(filepath)
+                        )
+                    ) {
+                        matchingResources.push({ name: key, resourceData: resource })
+                    }
+                } else {
+                    // Interpreted languages all follow the same spec:
+                    // ./path/to/handler/without/file/extension.handlerName
+                    // Check to ensure filename and handler both match.
+                    try {
+                        const parsedLambda = getLambdaDetails({
+                            Handler: registeredHandler,
+                            Runtime: registeredRuntime,
+                        })
+                        const functionName = handler.split('.').pop()
+                        if (
+                            pathutils.normalize(filepath) ===
+                                pathutils.normalize(
+                                    path.join(templateDirname, registeredCodeUri, parsedLambda.fileName)
+                                ) &&
+                            functionName === parsedLambda.functionName
+                        ) {
+                            matchingResources.push({ name: key, resourceData: resource })
+                        }
+                    } catch (e) {
+                        getLogger().warn(
+                            `Resource ${key} in template ${templateDirname} has invalid runtime for handler ${handler}: ${registeredRuntime}`
+                        )
+                    }
+                }
+                // not direct-invoke type, attempt image type
+            } else if (registeredPackageType === 'Image' && registeredDockerContext && registeredDockerFile) {
+                // path must be inside dockerDir
+                const dockerDir = path.join(templateDirname, registeredDockerContext)
+                if (isInDirectory(dockerDir, filepath)) {
+                    let adjustedHandler: string = handler
+                    if (!filepath.endsWith('.cs')) {
+                        // reframe path to be relative to dockerDir instead of package.json
+                        // omit filename and append filename + function name from handler
+                        const relPath = path.relative(dockerDir, path.dirname(filepath))
+                        const handlerParts = pathutils.normalizeSeparator(handler).split('/')
+                        adjustedHandler = pathutils.normalizeSeparator(
+                            path.join(relPath, handlerParts[handlerParts.length - 1])
+                        )
+                    }
+                    try {
+                        // open dockerfile and see if it has a handler that matches the handler represented by this file
+                        const fileText = readFileSync(path.join(dockerDir, registeredDockerFile)).toString()
+                        // exact match within quotes to avoid shorter paths being picked up
+                        if (
+                            new RegExp(`['"]${adjustedHandler}['"]`, 'g').test(pathutils.normalizeSeparator(fileText))
+                        ) {
+                            matchingResources.push({ name: key, resourceData: resource })
+                        }
+                    } catch (e) {
+                        // file read error
+                        getLogger().error(e as Error)
+                    }
+                }
+            } else {
+                getLogger().verbose(`Resource ${key} in template ${templateDirname} does not match handler ${handler}`)
+            }
+        }
+    }
+
+    return matchingResources
+}
diff --git a/packages/core/src/shared/fs/watchedFiles.ts b/packages/core/src/shared/fs/watchedFiles.ts
new file mode 100644
index 00000000000..5e10ea8a358
--- /dev/null
+++ b/packages/core/src/shared/fs/watchedFiles.ts
@@ -0,0 +1,410 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../logger/logger'
+import * as pathutils from '../utilities/pathUtils'
+import * as path from 'path'
+import { globDirPatterns, isUntitledScheme, normalizeVSCodeUri } from '../utilities/vsCodeUtils'
+import { Settings } from '../settings'
+import { Timeout } from '../utilities/timeoutUtils'
+
+/**
+ * Prevent `findFiles()` from recursing into these directories.
+ *
+ * `findFiles()` defaults to the vscode `files.exclude` setting, which by default does not exclude "node_modules/".
+ */
+const alwaysExclude = {
+    '.aws-sam': true,
+    '.git': true,
+    '.svn': true,
+    '.hg': true,
+    '.rvm': true,
+    '.gem': true,
+    '.project': true,
+    node_modules: true,
+    venv: true,
+    bower_components: true,
+}
+
+export interface WatchedItem<T> {
+    /**
+     * The absolute path to the file
+     */
+    path: string
+    /**
+     * An item based on the file and type of WatchedFiles
+     */
+    item: T
+}
+
+export function getGlobDirExcludedPatterns(): string[] {
+    const vscodeFilesExclude = Settings.instance.get<object>('files.exclude', Object, {})
+    const vscodeSearchExclude = Settings.instance.get<object>('search.exclude', Object, {})
+    const vscodeWatcherExclude = Settings.instance.get<object>('files.watcherExclude', Object, {})
+    const all = [
+        ...Object.keys(alwaysExclude),
+        ...Object.keys(vscodeFilesExclude),
+        ...Object.keys(vscodeSearchExclude),
+        ...Object.keys(vscodeWatcherExclude),
+    ]
+    return globDirPatterns(all)
+}
+
+/** Builds an exclude pattern based on vscode global settings and the `alwaysExclude` default. */
+export function getExcludePattern() {
+    const excludePatternsStr = getGlobDirExcludedPatterns().join(',')
+    const excludePattern = `**/{${excludePatternsStr}}/`
+    return excludePattern
+}
+
+/**
+ * WatchedFiles lets us watch files on the filesystem. It is used
+ * for CFN templates among other things. WatchedFiles holds a list of pairs of
+ * the absolute path to the file or "untitled:" URI along with a transform of it that is useful for
+ * where it is used. For example, for templates, it parses the template and stores it.
+ *
+ * Initialize the registry by adding patterns, followed by a required call to `rebuild`.
+
+ * Example:
+ * ```
+ *     registry.addExcludedPattern(/.*[/\\]\.aws-sam([/\\].*|$)/)
+ *     registry.addExcludedPattern('**\/*.{yaml,yml}')
+ *     registry.addWatchPatterns([/.*devfile\.(yaml|yml)/i])
+ *     registry.watchUntitledFiles()
+ *     await registry.rebuild(cancellationTimeout)
+ * ```
+ */
+export abstract class WatchedFiles<T> implements vscode.Disposable {
+    private isWatching: boolean = false
+    private readonly disposables: vscode.Disposable[] = []
+    private _isDisposed: boolean = false
+    private readonly globs: vscode.GlobPattern[] = []
+    private readonly excludedFilePatterns: RegExp[] = []
+    private watchingUntitledFiles: boolean = false
+    private readonly registryData: Map<string, T> = new Map<string, T>()
+
+    /**
+     * Process any incoming URI/content, doing any parsing/validation as required.
+     * If the path does not point to a file on the local file system then contents should be defined.
+     * If it fails, throws
+     * @param path A uri with the absolute path to the detected file
+     */
+    protected abstract process(path: vscode.Uri, contents?: string): Promise<T | undefined>
+
+    /**
+     * Name for logs
+     */
+    public abstract readonly name: string
+
+    public constructor() {
+        this.disposables.push(
+            vscode.workspace.onDidChangeWorkspaceFolders(async () => {
+                await this.rebuild()
+            })
+        )
+    }
+
+    /**
+     * Creates watchers for each glob across all opened workspace folders (or see below to
+     * watch _outside_ the workspace).
+     *
+     * Fails if the watcher is disposed, or if the watcher has been initialized through the `rebuild` function;
+     * enforce setting once to reduce rebuilds looping through all existing globs
+     *
+     * (since vscode 1.64):
+     * - Watches RECURSIVELY if `pattern` is complex (e.g. contains `**` or
+     *   path segments), else watches NON-RECURSIVELY (i.e. only changes at the
+     *   first level will be reported).
+     *   https://github.com/microsoft/vscode/blob/7da792ae7cb53ee5a22b24016bca5dee31f43d41/src/vscode-dts/vscode.d.ts#L11428
+     * - `globPattern` as _string_ means "watch all opened workspace folders".
+     *   It cannot be used to add more folders for watching, nor will it report
+     *   events outside of workspace folders.
+     * - To watch _outside_ the workspace, pass `vscode.RelativePattern(vscode.Uri(…))`:
+     *   - non-recursive: `addWatchPatterns(new RelativePattern(Uri.file(…), '*.js'))`
+     *   - recursive: `addWatchPatterns(new RelativePattern(Uri.file(…), '**x/*.js'))`
+     * - **Note** recursive files may be excluded by user configuration
+     *   (`files.watcherExclude`, e.g. "node_modules"). To avoid that, watch
+     *   simple (non-recursive) patterns.
+     *
+     * https://github.com/microsoft/vscode/issues/3025#issuecomment-1007242256
+     *
+     * > we setup recursive watchers for all workspace folders right on startup
+     * > and we don't allow extensions to add additional watchers for the
+     * > workspace, because that would result in multiple watchers on the same
+     * > paths competing against each other.
+     *
+     * @param globs Patterns to match against (across all opened workspace folders)
+     */
+    public addWatchPatterns(globs: vscode.GlobPattern[]) {
+        if (this._isDisposed) {
+            throw new Error(`${this.name}: manager has already been disposed!`)
+        }
+        if (this.isWatching) {
+            throw new Error(`${this.name}: cannot add watch patterns after watcher has begun watching`)
+        }
+        for (const glob of globs) {
+            if (typeof glob === 'string' && !vscode.workspace.workspaceFolders?.[0]) {
+                getLogger().warn(`${this.name}: addWatchPatterns(${glob}): no workspace`)
+            }
+            this.globs.push(glob)
+
+            const watcher = vscode.workspace.createFileSystemWatcher(glob)
+            this.addWatcher(watcher)
+        }
+    }
+
+    /**
+     * Create a special watcher that operates only on untitled files.
+     * To "watch" the in-memory contents of an untitled:/ file we just subscribe to `onDidChangeTextDocument`
+     */
+    public watchUntitledFiles() {
+        this.watchingUntitledFiles = true
+        this.disposables.push(
+            vscode.workspace.onDidChangeTextDocument((event: vscode.TextDocumentChangeEvent) => {
+                if (isUntitledScheme(event.document.uri)) {
+                    return this.addItem(event.document.uri, true, event.document.getText())
+                }
+            }),
+            vscode.workspace.onDidCloseTextDocument((event: vscode.TextDocument) => {
+                if (isUntitledScheme(event.uri)) {
+                    return this.remove(event.uri)
+                }
+            })
+        )
+    }
+
+    /**
+     * Adds a regex pattern to ignore paths containing the pattern
+     *
+     * TODO: this does NOT prevent addWatchPatterns() from creating a massive, expensive, recursive
+     * filewatcher for these patterns 🤦, it merely skips processing at event-time.
+     */
+    public addExcludedPattern(pattern: RegExp) {
+        if (this._isDisposed) {
+            throw new Error(`${this.name}: manager has already been disposed!`)
+        }
+        if (this.isWatching) {
+            throw new Error(`${this.name}: cannot add excluded patterns after watcher has begun watching`)
+        }
+        this.excludedFilePatterns.push(pattern)
+    }
+
+    /**
+     * Adds or updates an item in the registry, and returns the result.
+     *
+     * If the item matches an "exclude" rule, it is not added nor does it update/replace any existing item.
+     *
+     * @param uri vscode.Uri containing the item to register.
+     * @param quiet On failure, log a message instead of throwing an exception.
+     * @param contents Optional data to associate with the item, for logical (non-filesystem) URIs.
+     *
+     * @returns Item, or undefined if (1) processing fails or (2) the name matches an "exclude" rule.
+     */
+    public async addItem(uri: vscode.Uri, quiet?: boolean, contents?: string): Promise<WatchedItem<T> | undefined> {
+        const excluded = this.excludedFilePatterns.find((pattern) => uri.fsPath.match(pattern))
+        if (excluded) {
+            getLogger().verbose(`${this.name}: excluded (matches "${excluded}"): ${uri.fsPath}`)
+            return undefined
+        }
+        this.assertAbsolute(uri)
+        const pathAsString = normalizeVSCodeUri(uri)
+        try {
+            const item = await this.process(uri, contents)
+            if (item) {
+                this.registryData.set(pathAsString, item)
+                return {
+                    path: pathAsString,
+                    item: item,
+                }
+            } else {
+                getLogger().debug(`${this.name}: failed to process: ${uri}`)
+                // if value isn't valid for type, remove from registry
+                this.registryData.delete(pathAsString)
+            }
+        } catch (e) {
+            if (!quiet) {
+                throw e
+            }
+            getLogger().error(`${this.name}: failed to process: ${uri}: ${(e as Error).message}`)
+        }
+        return undefined
+    }
+
+    /**
+     * Gets an item by filepath or URI.
+     *
+     * Untitled files must be referred to by URI.
+     *
+     * @param path Absolute path to item of interest or a vscode.Uri to the item
+     */
+    public getItem(path: string | vscode.Uri): WatchedItem<T> | undefined {
+        const normalizedPath = typeof path === 'string' ? pathutils.normalize(path) : normalizeVSCodeUri(path)
+        this.assertAbsolute(normalizedPath)
+        const item = this.registryData.get(normalizedPath)
+        if (!item) {
+            return undefined
+        }
+        return {
+            path: normalizedPath,
+            item: item,
+        }
+    }
+
+    /**
+     * Gets all registry items as an array of paths to type `T` objects.
+     */
+    public get items(): WatchedItem<T>[] {
+        const arr: WatchedItem<T>[] = []
+
+        for (const itemPath of this.registryData.keys()) {
+            const item = this.getItem(itemPath)
+            if (item) {
+                arr.push(item)
+            }
+        }
+
+        return arr
+    }
+
+    /**
+     * Removes an item from the registry.
+     *
+     * @param path Path to the item
+     */
+    public async remove(path: vscode.Uri): Promise<void> {
+        const pathAsString = normalizeVSCodeUri(path)
+        this.assertAbsolute(pathAsString)
+        this.registryData.delete(pathAsString)
+    }
+
+    /**
+     * Disposes FileRegistry and marks as disposed.
+     */
+    public dispose(): void {
+        if (!this._isDisposed) {
+            while (this.disposables.length > 0) {
+                const disposable = this.disposables.pop()
+                if (disposable) {
+                    disposable.dispose()
+                }
+            }
+            this._isDisposed = true
+        }
+    }
+
+    /**
+     * Builds/rebuilds registry using current glob and exclusion patterns. ***Necessary to init registry***.
+     *
+     * @param cancel Cancels all processing.
+     * @param onItem Called when an item is processed.
+     */
+    public async rebuild(
+        cancel?: Timeout,
+        onItem?: (total: number, i: number, cancelled: boolean) => void
+    ): Promise<void> {
+        this.isWatching = true
+        this.reset()
+        let skips = 0
+        const found: vscode.Uri[] = []
+
+        const exclude = getExcludePattern()
+        getLogger().info(`${this.name}: building with: ${this.outputPatterns()}`)
+
+        for (let i = 0; i < this.globs.length && !cancel?.completed; i++) {
+            const glob = this.globs[i]
+            try {
+                for (const f of await vscode.workspace.findFiles(glob, exclude)) {
+                    found.push(f)
+                }
+                onItem?.(0, 0, !!cancel?.completed) // Pass 0 to indicate "collection" phase.
+            } catch (e) {
+                const err = e as Error
+                if (err.name !== 'Canceled') {
+                    // vscode may throw nonsense "Canceled" errors when stopping the debugger.
+                    getLogger().error(`%s: findFiles("%s", "%s"): %s`, this.name, glob, exclude, err.message)
+                }
+            }
+        }
+
+        let item = 0
+        for (; item < found.length && !cancel?.completed; item++) {
+            if (!(await this.addItem(found[item], true))) {
+                skips++
+            }
+            onItem?.(found.length, item, !!cancel?.completed)
+        }
+
+        getLogger().info(
+            `${this.name}: processed %s items%s%s`,
+            this.registryData.size,
+            cancel?.completed ? ` (cancelled, ${found.length - item} left)` : '',
+            skips > 0 ? `, skipped ${skips}` : ''
+        )
+    }
+
+    /**
+     * Removes all items from the registry.
+     */
+    public reset() {
+        this.registryData.clear()
+    }
+
+    /**
+     * Sets watcher functionality and adds to this.disposables
+     * @param watcher vscode.FileSystemWatcher
+     */
+    private addWatcher(watcher: vscode.FileSystemWatcher): void {
+        this.disposables.push(
+            watcher,
+            watcher.onDidChange(async (uri) => {
+                getLogger().verbose(`${this.name}: detected change: ${uri.fsPath}`)
+                await this.addItem(uri)
+            }),
+            watcher.onDidCreate(async (uri) => {
+                getLogger().verbose(`${this.name}: detected new file: ${uri.fsPath}`)
+                await this.addItem(uri)
+            }),
+            watcher.onDidDelete(async (uri) => {
+                getLogger().verbose(`${this.name}: detected delete: ${uri.fsPath}`)
+                await this.remove(uri)
+            })
+        )
+    }
+
+    /**
+     * Assert if the path is absolute.
+     * Untitled URIs are considered absolute
+     * @param p The path to verify
+     */
+    private assertAbsolute(p: string | vscode.Uri) {
+        const pathAsString = typeof p === 'string' ? p : p.fsPath
+        if (
+            (typeof p === 'string' && !path.isAbsolute(pathAsString) && !pathAsString.startsWith('untitled:')) ||
+            (typeof p !== 'string' && !path.isAbsolute(pathAsString) && !isUntitledScheme(p))
+        ) {
+            throw new Error(`FileRegistry: path is relative when it should be absolute: ${pathAsString}`)
+        }
+    }
+
+    private outputPatterns(): string {
+        const watch = this.globs.map((cur) => (typeof cur === 'string' ? cur.toString() : cur.pattern))
+        if (this.watchingUntitledFiles) {
+            watch.push('Untitled Files')
+        }
+        const exclude = this.excludedFilePatterns.map((cur) => cur.toString())
+
+        return `${watch.length > 0 ? `Watching ${watch.join(', ')}` : ''}${
+            exclude.length > 0 ? `, Excluding ${exclude.join(', ')}` : ''
+        }`
+    }
+}
+
+export class NoopWatcher extends WatchedFiles<any> {
+    public name: string = 'NoOp'
+    protected async process(uri: vscode.Uri): Promise<any> {
+        throw new Error(`Attempted to add a file to the NoopWatcher: ${uri.fsPath}`)
+    }
+}
diff --git a/packages/core/src/shared/globalState.ts b/packages/core/src/shared/globalState.ts
new file mode 100644
index 00000000000..edde0611e0b
--- /dev/null
+++ b/packages/core/src/shared/globalState.ts
@@ -0,0 +1,278 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from './logger/logger'
+import * as redshift from '../awsService/redshift/models/models'
+import { TypeConstructor, cast } from './utilities/typeConstructors'
+
+type ToolId = 'codecatalyst' | 'codewhisperer' | 'testId' | 'smus'
+export type ToolIdStateKey = `${ToolId}.savedConnectionId`
+
+export type JsonSchemasKey = 'devfileSchemaVersion' | 'samAndCfnSchemaVersion'
+
+type samInitStateKey =
+    | 'ACTIVATION_TEMPLATE_PATH_KEY'
+    | 'ACTIVATION_LAUNCH_PATH_KEY'
+    | 'SAM_INIT_RUNTIME_KEY'
+    | 'SAM_INIT_IMAGE_BOOLEAN_KEY'
+    | 'SAM_INIT_ARCH_KEY'
+
+type stepFunctionsKey = 'SCRIPT_LAST_DOWNLOADED_URL' | 'CSS_LAST_DOWNLOADED_URL'
+
+export type globalKey =
+    | samInitStateKey
+    | stepFunctionsKey
+    | ToolIdStateKey
+    | JsonSchemasKey
+    | 'amazonq.telemetry.migrated'
+    | 'aws.amazonq.codewhisperer.newCustomizations'
+    | 'aws.amazonq.hasShownWalkthrough'
+    | 'aws.amazonq.showTryChatCodeLens'
+    | 'aws.amazonq.securityIssueFilters'
+    | 'aws.amazonq.codescan.groupingStrategy'
+    | 'aws.amazonq.notifications'
+    | 'aws.amazonq.welcomeChatShowCount'
+    | 'aws.amazonq.disclaimerAcknowledged' // Legacy, use `AmazonQPromptSettings` instead.
+    | 'aws.notifications'
+    | 'aws.notifications.dev' // keys to store notifications for testing
+    | 'aws.downloadPath'
+    | 'aws.lastTouchedS3Folder'
+    | 'aws.lastUploadedToS3Folder'
+    | 'aws.redshift.connections'
+    | 'aws.toolkit.amazonq.dismissed'
+    | 'aws.toolkit.amazonqInstall.dismissed'
+    | 'aws.amazonq.workspaceIndexToggleOn'
+    | 'aws.toolkit.lsp.versions'
+    | 'aws.toolkit.lsp.manifest'
+    | 'aws.amazonq.customization.overrideV2'
+    | 'aws.amazonq.regionProfiles'
+    | 'aws.amazonq.regionProfiles.cache'
+    // Deprecated/legacy names. New keys should start with "aws.".
+    | '#sessionCreationDates' // Legacy name from `ssoAccessTokenProvider.ts`.
+    | 'CODECATALYST_RECONNECT'
+    | 'CODEWHISPERER_AUTO_SCANS_ENABLED'
+    | 'CODEWHISPERER_AUTO_TRIGGER_ENABLED'
+    | 'CODEWHISPERER_HINT_DISPLAYED'
+    | 'CODEWHISPERER_PERSISTED_CUSTOMIZATIONS'
+    | 'CODEWHISPERER_SELECTED_CUSTOMIZATION'
+    | 'CODEWHISPERER_USER_GROUP'
+    | 'awsTelemetryNoticeVersionAck'
+    | 'codecatalyst.connections'
+    | 'dev.beta'
+    | 'globalsMostRecentVersion'
+    | 'gumby.wasQCodeTransformationUsed'
+    | 'isExtensionFirstUse'
+    | 'lastExtensionVersion'
+    | 'lastSelectedRegion'
+    | 'lastOsStartTime'
+    | 'recentCredentials'
+    | 'recentSso'
+    // List of regions enabled in AWS Explorer.
+    | 'region'
+    // TODO: implement this via `PromptSettings` instead of globalState.
+    | 'sam.sync.updateMessage'
+    | 'telemetryClientId'
+    | 'telemetryId'
+    | 'aws.toolkit.lambda.walkthroughSelected'
+    | 'aws.toolkit.lambda.walkthroughCompleted'
+    | 'aws.toolkit.appComposer.templateToOpenOnStart'
+    | 'aws.lambda.remoteDebugContext'
+    | 'aws.lambda.remoteDebugSnapshot'
+    // List of Domain-Users to show/hide Sagemaker SpaceApps in AWS Explorer.
+    | 'aws.sagemaker.selectedDomainUsers'
+    // Name of the connection if it's not to the AWS cloud. Current supported value only 'localstack'
+    | 'aws.toolkit.externalConnection'
+
+/**
+ * Extension-local (not visible to other vscode extensions) shared state which persists after IDE
+ * restart. Shared with all instances (or tabs, in a web browser) of this extension for a given
+ * user, including "remote" instances!
+ *
+ * Note: Global state should be avoided, except when absolutely necessary.
+ *
+ * This wrapper adds structure and visibility to the vscode `globalState` interface. It also opens
+ * the door for:
+ * - validation
+ * - garbage collection
+ */
+export class GlobalState implements vscode.Memento {
+    constructor(protected readonly memento: vscode.Memento) {}
+
+    keys(): readonly string[] {
+        return this.memento.keys()
+    }
+
+    values() {
+        return this.memento.keys().map((k) => this.memento.get(k))
+    }
+
+    /**
+     * Gets the value for `key` if it satisfies the `type` specification, or fails.
+     *
+     * @param key Key name
+     * @param type Type validator function, or primitive type constructor such as {@link Object},
+     * {@link String}, {@link Boolean}, etc.
+     * @param defaultVal Value returned if `key` has no value.
+     */
+    getStrict<T>(key: globalKey, type: TypeConstructor<T>, defaultVal?: T) {
+        try {
+            const val = this.memento.get<T>(key) ?? defaultVal
+            return !type || val === undefined ? val : cast(val, type)
+        } catch (e) {
+            const msg = `GlobalState: invalid state (or read failed) for key: "${key}"`
+            // XXX: ToolkitError causes circular dependency
+            // throw ToolkitError.chain(e, `Failed to read globalState: "${key}"`)
+            const err = new Error(msg) as Error & {
+                code: string
+                cause: unknown
+            }
+            err.cause = e
+            err.code = 'GlobalState'
+            throw err
+        }
+    }
+
+    /**
+     * Gets the value at `key`, without type-checking. See {@link tryGet} and {@link getStrict} for type-checking variants.
+     *
+     * @param key Key name
+     * @param defaultVal Value returned if `key` has no value.
+     */
+    get<T>(key: globalKey, defaultVal?: T): T | undefined {
+        const skip = (o: any) => o as T // Don't type check.
+        return this.getStrict(key, skip, defaultVal)
+    }
+
+    /**
+     * Gets the value for `key` if it satisfies the `type` specification, else logs an error and returns `defaultVal`.
+     *
+     * @param key Key name
+     * @param type Type validator function, or primitive type constructor such as {@link Object},
+     * {@link String}, {@link Boolean}, etc.
+     * @param defaultVal Value returned if `key` has no value.
+     */
+    tryGet<T>(key: globalKey, type: TypeConstructor<T>): T | undefined
+    tryGet<T>(key: globalKey, type: TypeConstructor<T>, defaultVal: T): T
+    tryGet<T>(key: globalKey, type: TypeConstructor<T>, defaultVal?: T): T | undefined {
+        try {
+            return this.getStrict(key, type, defaultVal)
+        } catch (e) {
+            getLogger().error('%s', (e as Error).message)
+            return defaultVal
+        }
+    }
+
+    /**
+     * Asynchronously updates globalState, or logs an error on failure.
+     *
+     * Only for callers that cannot `await` or don't care about errors and race conditions. Prefer
+     * `await update()` where possible.
+     */
+    tryUpdate(key: globalKey, value: any): void {
+        this.update(key, value).then(undefined, () => {
+            // Errors are logged by update().
+        })
+    }
+
+    async update(key: globalKey, value: any): Promise<void> {
+        try {
+            await this.memento.update(key, value)
+        } catch (e) {
+            getLogger().error('GlobalState: failed to set "%s": %s', key, (e as Error).message)
+            throw e
+        }
+    }
+
+    clear() {
+        return Promise.allSettled(this.memento.keys().map((k) => this.memento.update(k, undefined)))
+    }
+
+    /**
+     * Stores Redshift connection info for the specified warehouse ARN.
+     *
+     * TODO: this never garbage-collects old connections, so the state will grow forever...
+     *
+     * @param warehouseArn redshift warehouse ARN
+     * @param cxnInfo Connection info. Value is 'DELETE_CONNECTION' when the connection is deleted
+     * but the explorer node is not refreshed yet.
+     */
+    async saveRedshiftConnection(
+        warehouseArn: string,
+        cxnInfo: redshift.ConnectionParams | undefined | 'DELETE_CONNECTION'
+    ) {
+        const allCxns = this.tryGet('aws.redshift.connections', Object, {})
+        await this.update('aws.redshift.connections', {
+            ...allCxns,
+            [warehouseArn]: cxnInfo,
+        })
+    }
+
+    /**
+     * Get the Redshift connection info for the specified warehouse ARN.
+     *
+     * @param warehouseArn redshift warehouse ARN
+     * @returns Connection info. Value is 'DELETE_CONNECTION' when the connection is deleted but the
+     * explorer node is not refreshed yet.
+     */
+    getRedshiftConnection(warehouseArn: string): redshift.ConnectionParams | undefined | 'DELETE_CONNECTION' {
+        const all = this.tryGet<Record<string, redshift.ConnectionParams | 'DELETE_CONNECTION'>>(
+            'aws.redshift.connections',
+            (v) => {
+                if (v !== undefined && typeof v !== 'object') {
+                    throw new Error()
+                }
+                const item = (v as any)?.[warehouseArn]
+                // Requested item must be object or 'DELETE_CONNECTION'.
+                if (item !== undefined && typeof item !== 'object' && item !== 'DELETE_CONNECTION') {
+                    throw new Error()
+                }
+                return v
+            }
+        )
+        return all?.[warehouseArn]
+    }
+
+    /**
+     * Sets SSO session creation timestamp for the given session `id`.
+     *
+     * TODO: this never garbage-collects old connections, so the state will grow forever...
+     *
+     * @param id Session id
+     * @param date Session timestamp
+     */
+    async setSsoSessionCreationDate(id: string, date: Date) {
+        try {
+            const all = this.tryGet('#sessionCreationDates', Object, {})
+            // TODO: race condition...
+            await this.update('#sessionCreationDates', {
+                ...all,
+                [id]: date.getTime(),
+            })
+        } catch (err) {
+            getLogger().error('auth: failed to set session creation date: %O', err)
+        }
+    }
+
+    /**
+     * Gets SSO session creation timestamp for the given session `id`.
+     *
+     * @param id Session id
+     */
+    getSsoSessionCreationDate(id: string): number | undefined {
+        const all = this.tryGet<Record<string, number>>('#sessionCreationDates', (v) => {
+            if (v !== undefined && typeof v !== 'object') {
+                throw new Error()
+            }
+            const item = (v as any)?.[id]
+            // Requested item must be a number.
+            if (item !== undefined && typeof item !== 'number') {
+                throw new Error()
+            }
+            return v
+        })
+        return all?.[id]
+    }
+}
diff --git a/packages/core/src/shared/globalStorage.ts b/packages/core/src/shared/globalStorage.ts
new file mode 100644
index 00000000000..bf414a82ea7
--- /dev/null
+++ b/packages/core/src/shared/globalStorage.ts
@@ -0,0 +1,22 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import globals from './extensionGlobals'
+
+/**
+ * Toolkit filesystem-based global storage (wraps vscode globalStorage).
+ *
+ * TODO: use {@link TypedSettings}
+ */
+export class GlobalStorage {
+    public static devfileSchemaUri() {
+        return vscode.Uri.joinPath(globals.context.globalStorageUri, 'devfile.schema.json')
+    }
+
+    public static samAndCfnSchemaDestinationUri() {
+        return vscode.Uri.joinPath(globals.context.globalStorageUri, 'sam.schema.json')
+    }
+}
diff --git a/packages/core/src/shared/handleUninstall.ts b/packages/core/src/shared/handleUninstall.ts
new file mode 100644
index 00000000000..9db90232bdc
--- /dev/null
+++ b/packages/core/src/shared/handleUninstall.ts
@@ -0,0 +1,145 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Implementation inspired by https://github.com/sourcegraph/sourcegraph-public-snapshot/blob/c864f15af264f0f456a6d8a83290b5c940715349/client/vscode/src/settings/uninstall.ts#L2
+
+import * as vscode from 'vscode'
+import { existsSync } from 'fs' // eslint-disable-line no-restricted-imports
+import * as semver from 'semver'
+import { join } from 'path'
+import { getLogger } from './logger/logger'
+import { telemetry } from './telemetry/telemetry'
+import { VSCODE_EXTENSION_ID } from './extensions'
+
+/**
+ * Checks if an extension has been uninstalled and performs a callback if so.
+ * This function differentiates between an uninstall and an auto-update.
+ *
+ * @param extensionId - The ID of the extension to check (e.g., VSCODE_EXTENSION_ID.awstoolkit)
+ * @param extensionsPath - The file system path to the VS Code extensions directory
+ * @param obsoletePath - The file system path to the .obsolete file
+ * @param onUninstallCallback - A callback function to execute if the extension is uninstalled
+ */
+async function checkExtensionUninstall(
+    extensionId: typeof VSCODE_EXTENSION_ID.awstoolkit | typeof VSCODE_EXTENSION_ID.amazonq,
+    extensionVersion: string,
+    extensionsPath: string,
+    obsoletePath: string,
+    onUninstallCallback: () => Promise<void>
+): Promise<void> {
+    const extensionFullName = `${extensionId}-${extensionVersion}`
+
+    try {
+        const [obsoleteFileContent, extensionDirEntries] = await Promise.all([
+            vscode.workspace.fs.readFile(vscode.Uri.file(obsoletePath)),
+            vscode.workspace.fs.readDirectory(vscode.Uri.file(extensionsPath)),
+        ])
+
+        const obsoleteExtensions = JSON.parse(obsoleteFileContent.toString())
+        const currentExtension = vscode.extensions.getExtension(extensionId)
+
+        if (!currentExtension) {
+            // Check if the extension was previously installed and is now in the obsolete list
+            const wasObsolete = Object.keys(obsoleteExtensions).some((id) => id.startsWith(extensionId))
+            if (wasObsolete) {
+                await handleUninstall(extensionFullName, onUninstallCallback)
+            }
+        } else {
+            // Check if there's a newer version in the extensions directory
+            const newerVersionExists = checkForNewerVersion(extensionDirEntries, extensionId, extensionVersion)
+
+            if (!newerVersionExists) {
+                // No newer version exists, so this is likely an uninstall
+                await handleUninstall(extensionFullName, onUninstallCallback)
+            } else {
+                getLogger().info(`UpdateExtension: ${extensionFullName} is being updated - not an uninstall`)
+            }
+        }
+    } catch (error) {
+        getLogger().error(`UninstallExtension: Failed to check .obsolete: ${error}`)
+    }
+}
+
+/**
+ * Checks if a newer version of the extension exists in the extensions directory.
+ * The isExtensionInstalled fn is used to determine if the extension is installed using the vscode API
+ * whereas this function checks for the newer version in the extension directory for scenarios where
+ * the old extension is un-installed and the new extension in downloaded but not installed.
+ *
+ * @param dirEntries - The entries in the extensions directory
+ * @param extensionId - The ID of the extension to check
+ * @param currentVersion - The current version of the extension
+ * @returns True if a newer version exists, false otherwise
+ */
+
+function checkForNewerVersion(
+    dirEntries: [string, vscode.FileType][],
+    extensionId: string,
+    currentVersion: string
+): boolean {
+    const versionRegex = new RegExp(`^${extensionId}-(.+)$`)
+
+    return dirEntries
+        .map(([name]) => name)
+        .filter((name) => name.startsWith(extensionId))
+        .some((name) => {
+            const match = name.match(versionRegex)
+            if (match && match[1]) {
+                const version = semver.valid(semver.coerce(match[1]))
+                return version !== null && semver.gt(version, currentVersion)
+            }
+            return false
+        })
+}
+
+/**
+ * Handles the uninstall process by calling the callback and logging the event.
+ *
+ * @param extensionFullName - The full name of the extension including version
+ * @param callback - The callback function to execute on uninstall
+ */
+async function handleUninstall(extensionFullName: string, callback: () => Promise<void>): Promise<void> {
+    await callback()
+    telemetry.aws_extensionUninstalled.run(() => {})
+    getLogger().info(`UninstallExtension: ${extensionFullName} uninstalled successfully`)
+}
+
+/**
+ * Sets up a file system watcher to monitor the .obsolete file for changes and handle
+ * extension un-installation if the extension is marked as obsolete.
+ *
+ * @param {string} extensionName - The name of the extension.
+ * @param {vscode.ExtensionContext} context - The extension context.
+ * @param {function} callback - Action performed when extension is uninstalled.
+ * @returns {void}
+ */
+export function setupUninstallHandler(
+    extensionName: typeof VSCODE_EXTENSION_ID.awstoolkit | typeof VSCODE_EXTENSION_ID.amazonq,
+    extensionVersion: string,
+    context: vscode.ExtensionContext,
+    callback: () => Promise<void> = async () => {}
+): void {
+    try {
+        const extensionPath = context.extensionPath
+        const pathComponents = extensionPath.split('/').slice(0, -1)
+        const extensionsDirPath = pathComponents.join('/')
+
+        const obsoleteFilePath = join(extensionsDirPath, '.obsolete')
+
+        if (extensionsDirPath && obsoleteFilePath && existsSync(obsoleteFilePath)) {
+            const watchPattern = new vscode.RelativePattern(extensionsDirPath, '.obsolete')
+            const fileWatcher = vscode.workspace.createFileSystemWatcher(watchPattern)
+
+            const checkUninstallHandler = () =>
+                checkExtensionUninstall(extensionName, extensionVersion, extensionsDirPath, obsoleteFilePath, callback)
+            fileWatcher.onDidCreate(checkUninstallHandler)
+            fileWatcher.onDidChange(checkUninstallHandler)
+
+            context.subscriptions.push(fileWatcher)
+        }
+    } catch (error) {
+        getLogger().error(`UninstallExtension: Failed to register un-installation: ${error}`)
+    }
+}
diff --git a/packages/core/src/shared/i18n-helper.ts b/packages/core/src/shared/i18n-helper.ts
new file mode 100644
index 00000000000..6d3f699ce8a
--- /dev/null
+++ b/packages/core/src/shared/i18n-helper.ts
@@ -0,0 +1,17 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import translations from '../../package.nls.json'
+import { localize } from './utilities/vsCodeUtils'
+
+export const i18n = (code: string) => {
+    const translationsTyped = translations as { [key: string]: string }
+
+    if (translationsTyped[code]) {
+        return localize(code, translationsTyped[code])
+    } else {
+        return code
+    }
+}
diff --git a/packages/core/src/shared/icons.ts b/packages/core/src/shared/icons.ts
new file mode 100644
index 00000000000..76d81339fb0
--- /dev/null
+++ b/packages/core/src/shared/icons.ts
@@ -0,0 +1,126 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals, { isWeb } from './extensionGlobals'
+
+import type * as packageJson from '../../package.json'
+import * as fs from 'fs' // eslint-disable-line no-restricted-imports
+import * as path from 'path'
+import { Uri, ThemeIcon, ThemeColor } from 'vscode'
+import { memoize } from './utilities/functionUtils'
+import { getLogger } from './logger/logger'
+
+// Animation:
+// https://code.visualstudio.com/api/references/icons-in-labels#animation
+
+type ContributedIcon = keyof typeof packageJson.contributes.icons
+export type IconPath = { light: Uri; dark: Uri; toString: () => string } | Icon
+type IconId = `vscode-${string}` | ContributedIcon
+
+/**
+ * Gets an icon associated with the specified `id`.
+ *
+ * May return either {@link ThemeIcon} or URIs to icons. Callers should just pass the result directly
+ * to any consuming APIs.
+ *
+ * Icons contributed by the extension are prefixed based off their location in the `icons` directory.
+ *
+ * For example, `aws-s3-bucket` refers to `bucket.svg` in `icons/aws/s3`. Note that while identifiers
+ * may be derived from their source, that doesn't mean all valid identifiers have locations on disk.
+ */
+export const getIcon = memoize(resolveIconId)
+
+/**
+ * Convenient way to add icons provided by {@link getIcon} into a string.
+ *
+ * Invalid icons are simply omitted. This function also removes any leading
+ * or trailing white space from the final result.
+ *
+ * #### Example:
+ * ```ts
+ * vscode.window.setStatusBarMessage(codicon`${getIcon('vscode-clippy')} Copied to clipboard`)
+ * ```
+ */
+export function codicon(parts: TemplateStringsArray, ...components: (string | IconPath)[]): string {
+    const canUse = (sub: string | IconPath) => typeof sub === 'string' || sub instanceof Icon
+    const resolved = components.map((i) => (canUse(i) ? i : '')).map(String)
+
+    return parts
+        .map((v, i) => `${v}${i < resolved.length ? resolved[i] : ''}`)
+        .join('')
+        .trim()
+}
+
+/**
+ * See {@link ThemeIcon}.
+ *
+ * Used to expose the icon identifier which is otherwise hidden.
+ */
+export class Icon extends ThemeIcon {
+    public constructor(
+        id: string,
+        public readonly source?: Uri,
+        color?: ThemeColor
+    ) {
+        super(id, color)
+    }
+
+    public override toString() {
+        return `$(${this.id})`
+    }
+}
+
+/**
+ * Adds a new {@link ThemeColor} to an existing icon.
+ *
+ * You can find theme color identifiers
+ * {@link https://code.visualstudio.com/api/references/contribution-points#contributes.colors here}
+ */
+export function addColor(icon: IconPath, color: string | ThemeColor): IconPath {
+    if (!(icon instanceof Icon)) {
+        return icon
+    }
+
+    return new Icon(icon.id, icon.source, typeof color === 'string' ? new ThemeColor(color) : color)
+}
+
+function resolveIconId(
+    id: IconId,
+    iconsPath = globals.context.asAbsolutePath(path.join('resources', 'icons'))
+): IconPath {
+    const [namespace, ...rest] = id.split('-')
+    const name = rest.join('-')
+
+    const override = resolvePathsSync(path.join(iconsPath, namespace), name)
+    if (override) {
+        getLogger().verbose(`icons: using override for "${id}"`)
+        return override
+    }
+
+    // TODO: potentially embed the icon source in `package.json` to avoid this messy mapping
+    // of course, doing that implies we must always bundle both the original icon files and the font file
+    const source = !['vscode'].includes(namespace)
+        ? Uri.joinPath(Uri.file(iconsPath), namespace, rest[0], `${rest.slice(1).join('-')}.svg`)
+        : undefined
+
+    return new Icon(namespace === 'vscode' ? name : id, source)
+}
+
+function resolvePathsSync(
+    rootDir: string,
+    target: string
+): { light: Uri; dark: Uri; toString: () => string } | undefined {
+    const filename = `${target}.svg`
+    const darkPath = path.join(rootDir, 'dark', filename)
+    const lightPath = path.join(rootDir, 'light', filename)
+
+    try {
+        if (!isWeb() && fs.existsSync(darkPath) && fs.existsSync(lightPath)) {
+            return { dark: Uri.file(darkPath), light: Uri.file(lightPath), toString: () => filename }
+        }
+    } catch (error) {
+        getLogger().warn(`icons: path resolution failed for "${target}": %s`, error)
+    }
+}
diff --git a/packages/core/src/shared/index.ts b/packages/core/src/shared/index.ts
new file mode 100644
index 00000000000..8b62fd3c5dc
--- /dev/null
+++ b/packages/core/src/shared/index.ts
@@ -0,0 +1,83 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Contains exports that work in both node and web.
+ */
+
+export { ExtContext } from './extensions'
+export { initialize, isWeb, ToolkitGlobals, default as globals } from './extensionGlobals'
+export { activate as activateLogger } from './logger/activation'
+export { activate as activateTelemetry } from './telemetry/activation'
+export { DefaultAwsContext } from './awsContext'
+export { DefaultAWSClientBuilder, ServiceOptions } from './awsClientBuilder'
+export { Settings, Experiments, DevSettings, AmazonQPromptSettings } from './settings'
+export * from './extensionUtilities'
+export * from './extensionStartup'
+export { RegionProvider } from './regions/regionProvider'
+export { Commands } from './vscode/commands2'
+export { getMachineId, getServiceEnvVarConfig, isAmazonLinux2 } from './vscode/env'
+export { getLogger } from './logger/logger'
+export { activateExtension, openUrl } from './utilities/vsCodeUtils'
+export { waitUntil, sleep, Timeout } from './utilities/timeoutUtils'
+export * as timeoutUtils from './utilities/timeoutUtils'
+export { Prompter } from './ui/prompter'
+export { VirtualFileSystem } from './virtualFilesystem'
+export { VirtualMemoryFile } from './virtualMemoryFile'
+export { AmazonqCreateUpload, Metric } from './telemetry/telemetry'
+export { getClientId, getClientName, getOperatingSystem, getOptOutPreference } from './telemetry/util'
+export { extensionVersion } from './vscode/env'
+export { cast } from './utilities/typeConstructors'
+export * as workspaceUtils from './utilities/workspaceUtils'
+export {
+    CodewhispererUserTriggerDecision,
+    CodewhispererLanguage,
+    CodewhispererCompletionType,
+    CodewhispererSuggestionState,
+    CodewhispererUserDecision,
+    CodewhispererSecurityScan,
+} from './telemetry/telemetry.gen'
+export { ProxyUtil } from './utilities/proxyUtil'
+export { randomUUID } from './crypto'
+export * from './environmentVariables'
+export * from './vscode/setContext'
+export * from './utilities/textUtilities'
+export * from './filesystemUtilities'
+export * from './localizedText'
+export * as env from './vscode/env'
+export * from './vscode/commands2'
+export * from './utilities/pathUtils'
+export * from './utilities/zipStream'
+export * as editorUtilities from './utilities/editorUtilities'
+export * as functionUtilities from './utilities/functionUtils'
+export * as diffUtilities from './utilities/diffUtils'
+export * as vscodeUtilities from './utilities/vsCodeUtils'
+export * from './errors'
+export { isTextEditor } from './utilities/editorUtilities'
+export * as messages from './utilities/messages'
+export * as errors from './errors'
+export * as funcUtil from './utilities/functionUtils'
+export { fs } from './fs/fs'
+export * from './handleUninstall'
+export { CrashMonitoring } from './crashMonitoring'
+export { amazonQDiffScheme } from './constants'
+export * from './featureConfig'
+export { i18n } from './i18n-helper'
+export * from './icons'
+export * as textDocumentUtil from './utilities/textDocumentUtilities'
+export { TabTypeDataMap } from '../amazonq/webview/ui/tabs/constants'
+export * from './lsp/manifestResolver'
+export * from './lsp/lspResolver'
+export * from './lsp/types'
+export * from './lsp/utils/setupStage'
+export * from './lsp/utils/cleanup'
+export { default as request } from './request'
+export * from './lsp/utils/platform'
+export * as processUtils from './utilities/processUtils'
+export * as BaseLspInstaller from './lsp/baseLspInstaller'
+export * as collectionUtil from './utilities/collectionUtils'
+export * from './datetime'
+export * from './performance/marks'
+export * as mementoUtils from './utilities/mementos'
diff --git a/packages/core/src/shared/indexNode.ts b/packages/core/src/shared/indexNode.ts
new file mode 100644
index 00000000000..ddc30341378
--- /dev/null
+++ b/packages/core/src/shared/indexNode.ts
@@ -0,0 +1,13 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Contains exports that only work for node, NOT web.
+ * Attempting to import from this file in web will throw an error,
+ * likely `TypeError: Cannot read properties of undefined (reading 'native')`
+ */
+
+export * as filetypes from './filetypes'
+export { SchemaService } from './schemas'
diff --git a/src/shared/lambdaHandlerSearch.ts b/packages/core/src/shared/lambdaHandlerSearch.ts
similarity index 91%
rename from src/shared/lambdaHandlerSearch.ts
rename to packages/core/src/shared/lambdaHandlerSearch.ts
index 517a2f61b7f..95444ddc72e 100644
--- a/src/shared/lambdaHandlerSearch.ts
+++ b/packages/core/src/shared/lambdaHandlerSearch.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 import { Range, Uri } from 'vscode'
diff --git a/packages/core/src/shared/localizedText.ts b/packages/core/src/shared/localizedText.ts
new file mode 100644
index 00000000000..9bd727fb1bd
--- /dev/null
+++ b/packages/core/src/shared/localizedText.ts
@@ -0,0 +1,52 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+import { commandsPrefix, getIdeProperties } from './extensionUtilities'
+const localize = nls.loadMessageBundle()
+
+export const yes = localize('AWS.generic.response.yes', 'Yes')
+export const no = localize('AWS.generic.response.no', 'No')
+export const ok = localize('AWS.generic.response.ok', 'OK')
+export const retry = localize('AWS.generic.response.retry', 'Retry')
+export const skip = localize('AWS.generic.response.skip', 'Skip')
+export const confirm = localize('AWS.generic.confirm', 'Confirm')
+export const continueText = localize('AWS.generic.continue', 'Continue')
+export const invalidArn = localize('AWS.error.invalidArn', 'Invalid ARN')
+export const localizedDelete = localize('AWS.generic.delete', 'Delete')
+export const cancel = localize('AWS.generic.cancel', 'Cancel')
+export const help = localize('AWS.generic.help', 'Help')
+export const invalidNumberWarning = localize('AWS.validateTime.error.invalidNumber', 'Input must be a positive number')
+export const viewDocs = localize('AWS.generic.viewDocs', 'View Documentation')
+export const recentlyUsed = localize('AWS.generic.recentlyUsed', 'recently used')
+export const viewSettings = localize('AWS.generic.viewSettings', 'View Settings')
+export const dontShow = localize('aws.generic.doNotShowAgain', "Don't Show Again")
+export const loadMore = localize('AWS.generic.loadMore', 'Load More')
+export const learnMore = localize('AWS.generic.learnMore', 'Learn More')
+export const proceed = localize('AWS.generic.proceed', 'Proceed')
+export const connect = localize('AWS.auth.connect', 'Connect with AWS')
+export const reauthenticate = localize('AWS.auth.reauthenticate', 'Re-authenticate')
+export function connectionExpired(name: string) {
+    return localize('AWS.auth.expired', `Your ${name} connection has expired. Please re-authenticate.`)
+}
+
+export const checklogs = () =>
+    localize(
+        'AWS.error.check.logs',
+        'Check the logs by running the "{0}: View Logs" command from the {1}.',
+        commandsPrefix(),
+        getIdeProperties().commandPalette
+    )
+
+export const builderId = () => localize('AWS.auth.names.builderId', '{0} Builder ID', getIdeProperties().company)
+
+export const iamIdentityCenter = localize('AWS.auth.names.iamIdentityCenter', 'IAM Identity Center')
+export const iamIdentityCenterFull = () =>
+    localize(
+        'AWS.auth.names.iamIdentityCenterFull',
+        '{0} (Successor to {1} Single Sign-on)',
+        iamIdentityCenter,
+        getIdeProperties().company
+    )
diff --git a/packages/core/src/shared/logger/activation.ts b/packages/core/src/shared/logger/activation.ts
new file mode 100644
index 00000000000..644e3ae0adf
--- /dev/null
+++ b/packages/core/src/shared/logger/activation.ts
@@ -0,0 +1,109 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { Logger, LogLevel, getLogger, fromVscodeLogLevel, setLogger } from './logger'
+import { ToolkitLogger } from './toolkitLogger'
+import { Settings } from '../settings'
+import { Logging } from './commands'
+import { resolvePath } from '../utilities/pathUtils'
+import fs from '../../shared/fs/fs'
+import { isWeb } from '../extensionGlobals'
+import { getUserAgent } from '../telemetry/util'
+import { isBeta, isDebugInstance } from '../vscode/env'
+
+/**
+ * Activate Logger functionality for the extension.
+ *
+ * @param outputChannel optional output channel for less granular logs
+ */
+export async function activate(
+    extensionContext: vscode.ExtensionContext,
+    contextPrefix: string,
+    logChannel: vscode.LogOutputChannel,
+    outputChannel?: vscode.LogOutputChannel
+): Promise<void> {
+    const settings = Settings.instance.getSection('aws')
+    const devLogfile = settings.get('dev.logfile', '')
+    const logUri =
+        typeof devLogfile === 'string' && devLogfile.trim() !== ''
+            ? vscode.Uri.file(resolvePath(devLogfile))
+            : undefined
+    const chanLogLevel = fromVscodeLogLevel(logChannel.logLevel)
+
+    await fs.mkdir(extensionContext.logUri)
+
+    const mainLogger = makeLogger({
+        logLevel: chanLogLevel,
+        logFile: logUri,
+        outputChannels: [logChannel],
+        useConsoleLog: isWeb(),
+    })
+    logChannel.onDidChangeLogLevel?.((logLevel) => {
+        const newLogLevel = fromVscodeLogLevel(logLevel)
+        mainLogger.setLogLevel(newLogLevel) // Also logs a message.
+    })
+
+    if (isDebugInstance()) {
+        mainLogger.setLogLevel('debug') // HACK: set to "debug" when debugging the extension.
+    }
+
+    setLogger(mainLogger)
+
+    // Logs to vscode Debug Console.
+    setLogger(
+        makeLogger({
+            logLevel: chanLogLevel,
+            outputChannels: outputChannel ? [outputChannel, logChannel] : [logChannel],
+            useConsoleLog: true,
+        }),
+        'debugConsole'
+    )
+
+    getLogger().info(
+        'Log level: %s, beta=%s%s',
+        chanLogLevel,
+        isBeta(),
+        logUri ? `, file (always "debug" level): ${logUri.fsPath}` : ''
+    )
+    getLogger().debug('User agent: %s', getUserAgent({ includePlatform: true, includeClientId: true }))
+    if (devLogfile && typeof devLogfile !== 'string') {
+        getLogger().error('invalid aws.dev.logfile setting')
+    }
+
+    Logging.init(logUri, mainLogger, contextPrefix)
+    extensionContext.subscriptions.push(Logging.instance.viewLogs, Logging.instance.viewLogsAtMessage)
+}
+
+/**
+ * Creates a logger off of specified params
+ * @param opts.logLevel Log messages at or above this level
+ * @param opts.logFile See {@link Logger.logFile}
+ * @param opts.outputChannels Array of output channels to log entries to
+ * @param opts.useConsoleLog If true, outputs log entries to the nodejs or browser devtools console.
+ */
+export function makeLogger(opts: {
+    logLevel: LogLevel
+    logFile?: vscode.Uri
+    outputChannels?: vscode.OutputChannel[]
+    useConsoleLog?: boolean
+}): Logger {
+    const logger = new ToolkitLogger(opts.logLevel, isBeta())
+    if (opts.logFile) {
+        logger.logToFile(opts.logFile)
+        logger.logFile = opts.logFile
+        // XXX: `vscode.LogOutputChannel` does not support programmatically setting the log-level,
+        // so this has no effect there. But this at least enables sinking to `SharedFileTransport`.
+        logger.setLogLevel('debug')
+    }
+    for (const outputChannel of opts.outputChannels ?? []) {
+        logger.logToOutputChannel(outputChannel)
+    }
+    if (opts.useConsoleLog) {
+        logger.logToConsole()
+    }
+
+    return logger
+}
diff --git a/packages/core/src/shared/logger/commands.ts b/packages/core/src/shared/logger/commands.ts
new file mode 100644
index 00000000000..03f7728a9c3
--- /dev/null
+++ b/packages/core/src/shared/logger/commands.ts
@@ -0,0 +1,104 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { telemetry } from '../telemetry/telemetry'
+import { Commands } from '../vscode/commands2'
+import { getLogger, Logger } from './logger'
+import globals from '../extensionGlobals'
+
+function revealLines(editor: vscode.TextEditor, start: number, end: number): void {
+    const startPos = editor.document.lineAt(start).range.start
+    const endPos = editor.document.lineAt(end - 1).range.end
+
+    editor.selection = new vscode.Selection(startPos, endPos)
+    editor.revealRange(new vscode.Range(startPos, endPos))
+}
+
+function clearSelection(editor: vscode.TextEditor): void {
+    const start = new vscode.Position(0, 0)
+
+    editor.selection = new vscode.Selection(start, start)
+}
+
+export class Logging {
+    public readonly viewLogs
+    public readonly viewLogsAtMessage
+
+    static #instance: Logging
+
+    public static get instance() {
+        if (!this.#instance) {
+            throw new Error('Logging class used without calling Logging.init().')
+        }
+        return this.#instance
+    }
+
+    /**
+     * @param logUri (optional) Log file path, only used for "developer mode" (`aws.dev.logfile` setting).
+     * @param logger
+     * @param contextPrefix Decided the command name based on the extension context.
+     */
+    public static init(logUri: vscode.Uri | undefined, logger: Logger, contextPrefix: string) {
+        this.#instance = new Logging(logUri, logger, contextPrefix)
+    }
+
+    /**
+     * @see {@link init}
+     */
+    constructor(
+        private readonly logUri: vscode.Uri | undefined,
+        private readonly logger: Logger,
+        contextPrefix: string
+    ) {
+        this.viewLogs = Commands.register(`aws.${contextPrefix}.viewLogs`, () => this.openLogUri())
+        this.viewLogsAtMessage = Commands.register(`aws.${contextPrefix}.viewLogsAtMessage`, (id) => this.openLogId(id))
+    }
+
+    public async openLogUri(): Promise<vscode.TextEditor | undefined> {
+        if (!this.logUri) {
+            globals.logOutputChannel.show(true)
+            return undefined
+        }
+        telemetry.toolkit_viewLogs.emit({ result: 'Succeeded' })
+        return vscode.window.showTextDocument(this.logUri)
+    }
+
+    public async openLogId(logId: number) {
+        if (!this.logUri) {
+            globals.logOutputChannel.show(true)
+            return
+        }
+        const msg = this.logger.getLogById(logId, this.logUri)
+        const editor = await this.openLogUri()
+        if (!msg || !editor) {
+            return
+        }
+
+        // HACK: editor.document.getText() may return "stale" content, then
+        // subsequent calls to openLogId() fail to highlight the specific log.
+        // Invoke "revert" on the current file to force vscode to read from disk.
+        await vscode.commands.executeCommand('workbench.action.files.revert').then(undefined, (e: Error) => {
+            getLogger().warn('command failed: "workbench.action.files.revert"')
+        })
+
+        // Retrieve where the message starts by counting number of newlines
+        const text = editor.document.getText()
+        const textStart = text.indexOf(msg)
+        if (textStart === -1) {
+            this.logger.debug(`logging: unable to find message with id "${logId}"`)
+            return
+        }
+
+        const lineStart = text.slice(0, textStart).split(/\r?\n/).filter(Boolean).length
+
+        if (lineStart > 0) {
+            const lineEnd = Math.min(editor.document.lineCount, lineStart + msg.split(/\r?\n/).filter(Boolean).length)
+            revealLines(editor, lineStart, lineEnd)
+        } else {
+            clearSelection(editor)
+        }
+    }
+}
diff --git a/packages/core/src/shared/logger/consoleLogTransport.ts b/packages/core/src/shared/logger/consoleLogTransport.ts
new file mode 100644
index 00000000000..40dab1fc3ca
--- /dev/null
+++ b/packages/core/src/shared/logger/consoleLogTransport.ts
@@ -0,0 +1,68 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import TransportStream from 'winston-transport'
+import globals from '../extensionGlobals'
+
+export const MESSAGE = Symbol.for('message') // eslint-disable-line @typescript-eslint/naming-convention
+
+interface LogEntry {
+    level: string
+    message: string
+    [MESSAGE]: string
+}
+
+/**
+ * Inspired from: https://github.com/MarcoMedrano/winston-transport-browserconsole/blob/master/src/lib/BrowserConsole.ts
+ */
+export class ConsoleLogTransport extends TransportStream {
+    constructor(
+        opts?: TransportStream.TransportStreamOptions,
+        private readonly _console = console
+    ) {
+        super(opts)
+    }
+
+    /**
+     * Does the work of logging the message to the console.
+     *
+     * @returns a promise that resolves when the log entry is written to the console, this is useful
+     *          for testing.
+     */
+    public override log(logEntry: LogEntry, next: () => void): Promise<void> {
+        const promise = new Promise<void>((resolve) => {
+            // We use setImmediate to not block execution since
+            // log order does not matter in this case
+            globals.clock.setImmediate(() => {
+                const level = logEntry.level
+                const message = logEntry[MESSAGE]
+
+                if (ConsoleLogTransport.isSupportedLogLevel(level)) {
+                    this._console[level](message)
+                } else {
+                    this._console.log(message)
+                }
+                resolve()
+            })
+        })
+
+        next()
+        return promise
+    }
+
+    private static isSupportedLogLevel(method: string | undefined): method is Level {
+        return method !== undefined && Object.keys(Levels).includes(method)
+    }
+}
+
+// https://github.com/winstonjs/winston#logging-levels
+export const Levels = {
+    error: 0,
+    warn: 1,
+    info: 2,
+    debug: 5,
+} as const
+
+export type Level = keyof typeof Levels
diff --git a/packages/core/src/shared/logger/index.ts b/packages/core/src/shared/logger/index.ts
new file mode 100644
index 00000000000..71034fc002e
--- /dev/null
+++ b/packages/core/src/shared/logger/index.ts
@@ -0,0 +1,6 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export { Logger, LogLevel, getLogger, getDebugConsoleLogger, getNullLogger } from './logger'
diff --git a/packages/core/src/shared/logger/logger.ts b/packages/core/src/shared/logger/logger.ts
new file mode 100644
index 00000000000..95c4c7af769
--- /dev/null
+++ b/packages/core/src/shared/logger/logger.ts
@@ -0,0 +1,277 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+
+export type LogTopic =
+    | 'crashMonitoring'
+    | 'dev/beta'
+    | 'notifications'
+    | 'test'
+    | 'childProcess'
+    | 'lsp'
+    | 'amazonqWorkspaceLsp'
+    | 'amazonqLsp'
+    | 'amazonqLsp.lspClient'
+    | 'chat'
+    | 'stepfunctions'
+    | 'unknown'
+    | 'nextEditPrediction'
+    | 'resourceCache'
+    | 'telemetry'
+    | 'proxyUtil'
+    | 'sagemaker'
+
+class ErrorLog {
+    constructor(
+        public topic: string,
+        public error: Error
+    ) {}
+}
+
+const toolkitLoggers: {
+    main: Logger | undefined
+    debugConsole: Logger | undefined
+} = { main: undefined, debugConsole: undefined }
+
+export interface Logger {
+    /**
+     * Developer-only: Optional log file, which gets all log messages (regardless of the configured
+     * log-level).
+     */
+    logFile?: vscode.Uri
+    debug(message: string | Error, ...meta: any[]): number
+    verbose(message: string | Error, ...meta: any[]): number
+    info(message: string | Error, ...meta: any[]): number
+    warn(message: string | Error, ...meta: any[]): number
+    error(message: string | Error, ...meta: any[]): number
+    log(logLevel: LogLevel, message: string | Error, ...meta: any[]): number
+    setLogLevel(logLevel: LogLevel): void
+    /** Returns true if the given log level is being logged.  */
+    logLevelEnabled(logLevel: LogLevel): boolean
+    getLogById(logID: number, file: vscode.Uri): string | undefined
+    sendToLog(
+        logLevel: 'debug' | 'verbose' | 'info' | 'warn' | 'error',
+        message: string | Error,
+        ...meta: any[]
+    ): number
+}
+
+export abstract class BaseLogger implements Logger {
+    logFile?: vscode.Uri
+    topic: LogTopic = 'unknown'
+
+    debug(message: string | Error, ...meta: any[]): number {
+        return this.sendToLog('debug', message, ...meta)
+    }
+    verbose(message: string | Error, ...meta: any[]): number {
+        return this.sendToLog('verbose', message, ...meta)
+    }
+    info(message: string | Error, ...meta: any[]): number {
+        return this.sendToLog('info', message, ...meta)
+    }
+    warn(message: string | Error, ...meta: any[]): number {
+        return this.sendToLog('warn', message, ...meta)
+    }
+    error(message: string | Error, ...meta: any[]): number {
+        return this.sendToLog('error', message, ...meta)
+    }
+    log(logLevel: LogLevel, message: string | Error, ...meta: any[]): number {
+        return this.sendToLog(logLevel, message, ...meta)
+    }
+    abstract sendToLog(
+        logLevel: 'debug' | 'verbose' | 'info' | 'warn' | 'error',
+        message: string | Error,
+        ...meta: any[]
+    ): number
+    abstract setLogLevel(logLevel: LogLevel): void
+    abstract logLevelEnabled(logLevel: LogLevel): boolean
+    abstract getLogById(logID: number, file: vscode.Uri): string | undefined
+}
+
+/**
+ * Log levels ordered for comparison.
+ *
+ * See https://github.com/winstonjs/winston#logging-levels :
+ * > RFC5424: severity of levels is numerically ascending from most important
+ * > to least important.
+ */
+const logLevels = new Map<LogLevel, number>([
+    ['error', 1],
+    ['warn', 2],
+    ['info', 3],
+    ['verbose', 4],
+    ['debug', 5],
+])
+
+export type LogLevel = 'error' | 'warn' | 'info' | 'verbose' | 'debug'
+
+export function fromVscodeLogLevel(logLevel: vscode.LogLevel): LogLevel {
+    switch (logLevel) {
+        case vscode.LogLevel.Trace:
+        case vscode.LogLevel.Debug:
+            return 'debug'
+        case vscode.LogLevel.Info:
+            return 'info'
+        case vscode.LogLevel.Warning:
+            return 'warn'
+        case vscode.LogLevel.Error:
+        case vscode.LogLevel.Off:
+        default:
+            return 'error'
+    }
+}
+
+/**
+ * Compares log levels.
+ *
+ * @returns
+ * - Zero if the log levels are equal
+ * - Negative if `l1` is less than `l2`
+ * - Positive if `l1` is greater than `l2`
+ */
+export function compareLogLevel(l1: LogLevel, l2: LogLevel): number {
+    return logLevels.get(l1)! - logLevels.get(l2)!
+}
+
+/* Format the message with topic header */
+function prependTopic(topic: string, message: string | Error): string | ErrorLog {
+    if (typeof message === 'string') {
+        // TODO: remove this after all calls are migrated and topic is a required param.
+        if (topic === 'unknown') {
+            return message
+        }
+        return `${topic}: ` + message
+    } else if (message instanceof Error) {
+        return new ErrorLog(topic, message)
+    }
+    return message
+}
+
+/**
+ * Gets the global default logger.
+ *
+ * @param topic: topic to be appended in front of the message.
+ */
+export function getLogger(topic?: LogTopic): Logger {
+    // `TopicLogger` will lazy-load the "main" logger when it becomes available.
+    return new TopicLogger(topic ?? 'unknown', 'main')
+}
+
+export function getDebugConsoleLogger(topic?: LogTopic): Logger {
+    // `TopicLogger` will lazy-load the "debugConsole" logger when it becomes available.
+    return new TopicLogger(topic ?? 'unknown', 'debugConsole')
+}
+
+// jscpd:ignore-start
+export class NullLogger extends BaseLogger {
+    public setLogLevel(logLevel: LogLevel) {}
+    public logLevelEnabled(logLevel: LogLevel): boolean {
+        return false
+    }
+    public getLogById(logID: number, file: vscode.Uri): string | undefined {
+        return undefined
+    }
+    override sendToLog(
+        logLevel: 'error' | 'warn' | 'info' | 'verbose' | 'debug',
+        message: string | Error,
+        ...meta: any[]
+    ): number {
+        void logLevel
+        void message
+        void meta
+        return 0
+    }
+}
+
+/**
+ * Fallback used if {@link getLogger()} is requested before logging is fully initialized.
+ */
+export class ConsoleLogger extends BaseLogger {
+    public setLogLevel(logLevel: LogLevel) {}
+    public logLevelEnabled(logLevel: LogLevel): boolean {
+        return false
+    }
+    public getLogById(logID: number, file: vscode.Uri): string | undefined {
+        return undefined
+    }
+    override sendToLog(
+        logLevel: 'error' | 'warn' | 'info' | 'verbose' | 'debug',
+        message: string | Error,
+        ...meta: any[]
+    ): number {
+        // TODO: we alias "verbose" to "debug" currently. Will be revisited: IDE-14839
+        if (logLevel === 'verbose') {
+            // eslint-disable-next-line aws-toolkits/no-console-log
+            console.debug(message, ...meta)
+        } else {
+            // eslint-disable-next-line aws-toolkits/no-console-log
+            console[logLevel](message, ...meta)
+        }
+        return 0
+    }
+}
+
+/**
+ * Wraps the specified `ToolkitLogger` and defers to it for everything except `topic`.
+ *
+ * Falls back to `ConsoleLogger` when the logger isn't available yet (during startup).
+ */
+export class TopicLogger extends BaseLogger implements vscode.Disposable {
+    // HACK: crude form of "lazy initialization", to support module-scope assignment of
+    // `getLogger()` without being sensitive to module-load ordering. So even if logging isn't ready
+    // at the time of the `getLogger` call, it will recover later. (This is a bit hacky, because it
+    // arguably doesn't belong in `TopicLogger`.)
+    public get logger() {
+        return toolkitLoggers[this.loggerKey] ?? new ConsoleLogger()
+    }
+
+    /**
+     * Wraps a `ToolkitLogger` and defers to it for everything except `topic`.
+     */
+    public constructor(
+        public override topic: LogTopic,
+        public readonly loggerKey: keyof typeof toolkitLoggers
+    ) {
+        super()
+    }
+
+    override setLogLevel(logLevel: LogLevel): void {
+        this.logger.setLogLevel(logLevel)
+    }
+
+    override logLevelEnabled(logLevel: LogLevel): boolean {
+        return this.logger.logLevelEnabled(logLevel)
+    }
+
+    override getLogById(logID: number, file: vscode.Uri): string | undefined {
+        return this.logger.getLogById(logID, file)
+    }
+
+    override sendToLog(level: LogLevel, message: string | Error, ...meta: any[]): number {
+        if (typeof message === 'string') {
+            message = prependTopic(this.topic, message) as string
+        }
+        return this.logger.sendToLog(level, message, ...meta)
+    }
+
+    public async dispose(): Promise<void> {}
+}
+// jscpd:ignore-end
+
+export function getNullLogger(type?: 'debugConsole' | 'main'): Logger {
+    return new NullLogger()
+}
+
+/**
+ * Sets (or clears) the logger that is accessible to code.
+ * The Extension is expected to call this only once per log type.
+ * Tests should call this to set up a logger prior to executing code that accesses a logger.
+ */
+export function setLogger(logger: Logger | undefined, type?: 'debugConsole' | 'main') {
+    toolkitLoggers[type ?? 'main'] = logger
+}
+
+export type Loggable = Error | string
diff --git a/packages/core/src/shared/logger/outputChannelTransport.ts b/packages/core/src/shared/logger/outputChannelTransport.ts
new file mode 100644
index 00000000000..bffca0d8bf0
--- /dev/null
+++ b/packages/core/src/shared/logger/outputChannelTransport.ts
@@ -0,0 +1,85 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import Transport from 'winston-transport'
+import globals from '../extensionGlobals'
+import { removeAnsi } from '../utilities/textUtilities'
+import { LogLevel } from './logger'
+
+export const MESSAGE = Symbol.for('message') // eslint-disable-line @typescript-eslint/naming-convention
+
+interface LogEntry {
+    level: string
+    message: string
+    [MESSAGE]: string
+    raw: boolean
+}
+
+export class OutputChannelTransport extends Transport {
+    private readonly outputChannel: Pick<vscode.OutputChannel, 'append' | 'appendLine'>
+    // True if `outputChannel` is a `vscode.LogOutputChannel`.
+    private readonly isLogChan: boolean
+    private readonly stripAnsi: boolean
+
+    public constructor(
+        options: Transport.TransportStreamOptions & {
+            outputChannel: Pick<vscode.OutputChannel, 'append' | 'appendLine'>
+            stripAnsi?: boolean
+            name?: string
+        }
+    ) {
+        super(options)
+
+        this.outputChannel = options.outputChannel
+        this.stripAnsi = options.stripAnsi ?? false
+
+        const c = this.outputChannel
+        this.isLogChan = !!((c as any).info && (c as any).debug && (c as any).warn && (c as any).error)
+        // Else: we got `vscode.debug.activeDebugConsole` which does not yet implement `vscode.LogOutputChannel`.
+    }
+
+    public override log(info: LogEntry, next: () => void): void {
+        globals.clock.setImmediate(() => {
+            if (this.isLogChan) {
+                const c = this.outputChannel as vscode.LogOutputChannel
+                // Example input:
+                //      message: 'Preparing to debug locally: Lambda "index.handler"'
+                //      raw: true
+                //      Symbol(level): 'info'
+                //      Symbol(message): '2024-01-16 08:54:30 [INFO]: Preparing to debug locally: Lambda "index.handler"'
+                //      Symbol(splat): (1) [{…}]
+                //      timestamp: '2024-01-16 08:54:30'
+                // We want the "raw" message without the frontmatter, because
+                // `vscode.LogOutputChannel` presents its own timestamp + loglevel.
+                const raw = this.stripAnsi ? removeAnsi(info.message) : info.message
+                // Avoid extra line breaks.
+                const msg = raw.trim()
+
+                const loglevel = info.level as LogLevel
+                if (loglevel === 'error') {
+                    c.error(msg)
+                } else if (loglevel === 'warn') {
+                    c.warn(msg)
+                } else if (loglevel === 'debug' || loglevel === 'verbose') {
+                    c.debug(msg)
+                } else {
+                    c.info(msg)
+                }
+            } else {
+                const msg = this.stripAnsi ? removeAnsi(info[MESSAGE]) : info[MESSAGE]
+                if (info.raw) {
+                    this.outputChannel.append(msg)
+                } else {
+                    this.outputChannel.appendLine(msg)
+                }
+            }
+
+            this.emit('logged', info)
+        })
+
+        next()
+    }
+}
diff --git a/packages/core/src/shared/logger/perfLogger.ts b/packages/core/src/shared/logger/perfLogger.ts
new file mode 100644
index 00000000000..c8b760fc467
--- /dev/null
+++ b/packages/core/src/shared/logger/perfLogger.ts
@@ -0,0 +1,29 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { getLogger } from './logger'
+
+export class PerfLog {
+    private readonly log
+    public readonly start
+
+    public constructor(public readonly topic: string) {
+        const log = getLogger()
+        this.log = log
+        this.start = performance.now()
+    }
+
+    public elapsed(): number {
+        return performance.now() - this.start
+    }
+
+    public done(): void {
+        if (!this.log.logLevelEnabled('verbose')) {
+            return
+        }
+        const elapsed = this.elapsed()
+        this.log.verbose('%s took %dms', this.topic, elapsed.toFixed(1))
+    }
+}
diff --git a/packages/core/src/shared/logger/sharedFileTransport.ts b/packages/core/src/shared/logger/sharedFileTransport.ts
new file mode 100644
index 00000000000..59227812df0
--- /dev/null
+++ b/packages/core/src/shared/logger/sharedFileTransport.ts
@@ -0,0 +1,110 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import TransportStream from 'winston-transport'
+import fs from '../fs/fs'
+import * as vscode from 'vscode'
+import globals from '../extensionGlobals'
+import { MESSAGE } from './consoleLogTransport'
+import { ToolkitLogger } from './toolkitLogger'
+
+interface LogEntry {
+    level: string
+    message: string
+    /** This is the formatted message from {@link ToolkitLogger} in the winston.createLogger() call */
+    [MESSAGE]: string
+}
+
+export const flushIntervalMillis = 1000
+
+/**
+ * TODO: Figure out why the log file is not being properly appended to
+ *
+ * Problem:
+ * - Doing multiple log calls will not properly append to the log file
+ * - Only the last log call is written to the log file
+ * - Looking in to the append() call, when it first reads the current content
+ *   it would not have any of the previous logs in it.
+ * - The `next()` method is intended to signal that the current log is done being
+ *   written to the file but that is not working by the looks of it.
+ * Temporary Solution:
+ * - I created a buffer that buffers incoming logs and batch writes them after
+ *   a certain timeout. This seems to improve things
+ * - Also the current append implementation is inefficient due to the underlying api
+ *   (reads whole file, concatenates, then writes) so buffering is beneficial here.
+ */
+export class SharedFileTransport extends TransportStream {
+    private logFile: vscode.Uri
+    constructor(
+        opts: TransportStream.TransportStreamOptions & { logFile: vscode.Uri },
+        private readonly append = (f: vscode.Uri, s: string) => fs.appendFile(f, s)
+    ) {
+        super(opts)
+        this.logFile = opts.logFile
+    }
+
+    private flushTimeout: NodeJS.Timeout | undefined
+    private bufferedLogEntries: LogEntry[] = []
+    private resolvesAfterLogsWritten: Promise<void> | undefined
+    private doResolve: (() => void) | undefined
+
+    /**
+     * @returns a promise that resolves once a batch of logs are written to
+     *          the log file.
+     */
+    public override log(logEntry: LogEntry, next: () => void): Promise<void> {
+        this.bufferedLogEntries.push(logEntry)
+
+        if (!this.resolvesAfterLogsWritten) {
+            // we create a promise which resolves once logs are written to the file
+            this.resolvesAfterLogsWritten = new Promise((resolve) => {
+                this.doResolve = resolve.bind(this)
+            })
+        }
+
+        if (!this.flushTimeout) {
+            // start timeout to flush buffer after specific time passes
+            this.flushTimeout = globals.clock.setTimeout(async () => {
+                this.flushTimeout = undefined
+
+                // Clear current promise objs so new calls to log() will
+                // create new promise objs. Must happen before we call flushBufferedLogs()
+                this.resolvesAfterLogsWritten = undefined
+                const doResolve = this.doResolve
+                this.doResolve = undefined
+
+                // Write all logs to the file
+                await this.flushBufferedLogs()
+
+                // signals to anyone awaiting this function that logs have been
+                // written to the file.
+                doResolve!()
+            }, flushIntervalMillis)
+        }
+
+        next()
+        return this.resolvesAfterLogsWritten
+    }
+
+    /** Writes all buffered logs to the file */
+    private async flushBufferedLogs(): Promise<void> {
+        const latestLogIndex = this.bufferedLogEntries.length - 1
+
+        if (latestLogIndex < 0) {
+            // no logs to write to file
+            return
+        }
+
+        const logMessages = this.bufferedLogEntries.map((logEntry) => logEntry[MESSAGE])
+
+        // Remove the logs that were written to the file from the buffer.
+        // But we have to keep in mind new logs may have been
+        // asynchronously added to the buffer, so we only remove what we have flushed.
+        this.bufferedLogEntries = this.bufferedLogEntries.slice(latestLogIndex + 1)
+
+        const newText = logMessages.join('\n') + '\n'
+        await this.append(this.logFile, newText)
+    }
+}
diff --git a/packages/core/src/shared/logger/toolkitLogger.ts b/packages/core/src/shared/logger/toolkitLogger.ts
new file mode 100644
index 00000000000..0fdf58dc939
--- /dev/null
+++ b/packages/core/src/shared/logger/toolkitLogger.ts
@@ -0,0 +1,182 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { normalize } from 'path'
+import * as vscode from 'vscode'
+import winston from 'winston'
+import { BaseLogger, LogLevel, compareLogLevel } from './logger'
+import { OutputChannelTransport } from './outputChannelTransport'
+import { isSourceMappingAvailable } from '../vscode/env'
+import { formatError, ToolkitError, UnknownError } from '../errors'
+import { SharedFileTransport } from './sharedFileTransport'
+import { ConsoleLogTransport } from './consoleLogTransport'
+import { isWeb } from '../extensionGlobals'
+
+// Need to limit how many logs are actually tracked
+// LRU cache would work well, currently it just dumps the least recently added log
+const logmapSize: number = 1000
+
+export class ToolkitLogger extends BaseLogger implements vscode.Disposable {
+    private readonly logger: winston.Logger
+    private disposed: boolean = false
+    private idCounter: number = 0
+    private logMap: { [logID: number]: { [filePath: string]: string } } = {}
+
+    public constructor(
+        logLevel: LogLevel,
+        private readonly isBeta: boolean = false
+    ) {
+        super()
+        this.logger = winston.createLogger({
+            format: winston.format.combine(
+                winston.format.splat(),
+                winston.format.timestamp({
+                    format: 'YYYY-MM-DD HH:mm:ss',
+                }),
+                winston.format.errors({ stack: true }),
+                winston.format.printf((info) => {
+                    if (info.raw) {
+                        return info.message
+                    }
+
+                    return `${info.timestamp} [${info.level.toUpperCase()}]: ${info.message}`
+                })
+            ),
+            level: logLevel,
+        })
+    }
+
+    public setLogLevel(logLevel: LogLevel) {
+        if (this.logger.level === logLevel) {
+            return
+        }
+        // Log calls are made with explicit levels to ensure the text is output
+        this.logger.level = logLevel
+        this.logger.log(this.logger.level, `Log level: ${this.logger.level}`)
+    }
+
+    public logLevelEnabled(logLevel: LogLevel): boolean {
+        const currentLevel = this.logger.level as LogLevel
+        return compareLogLevel(currentLevel, logLevel) >= 0
+    }
+
+    public logToFile(logPath: vscode.Uri): void {
+        let fileTransport: winston.transport
+        if (isWeb()) {
+            fileTransport = new SharedFileTransport({ logFile: logPath })
+        } else {
+            fileTransport = new winston.transports.File({ filename: logPath.fsPath })
+        }
+
+        const fileUri: vscode.Uri = vscode.Uri.file(normalize(logPath.fsPath))
+        fileTransport.on('logged', (obj: any) => this.parseLogObject(fileUri, obj))
+        this.logger.add(fileTransport)
+    }
+
+    public logToOutputChannel(outputChannel: vscode.OutputChannel, stripAnsi: boolean = false): void {
+        const outputChannelTransport: winston.transport = new OutputChannelTransport({
+            outputChannel,
+            stripAnsi,
+        })
+        const channelUri: vscode.Uri = vscode.Uri.parse(`channel://${outputChannel.name}`)
+        outputChannelTransport.on('logged', (obj: any) => this.parseLogObject(channelUri, obj))
+        this.logger.add(outputChannelTransport)
+    }
+
+    public logToConsole(): void {
+        const consoleLogTransport: winston.transport = new ConsoleLogTransport({})
+        const logConsoleUri: vscode.Uri = vscode.Uri.parse('console://log')
+        consoleLogTransport.on('logged', (obj: any) => this.parseLogObject(logConsoleUri, obj))
+        this.logger.add(consoleLogTransport)
+    }
+
+    public dispose(): Promise<void> {
+        return this.disposed
+            ? Promise.resolve()
+            : new Promise<void>((resolve) => {
+                  this.disposed = true
+                  // The 'finish' event is emitted after all underlying transports have emitted a 'finish' event: https://github.com/winstonjs/winston/blob/36586d3d30dfe32f9dd4fbabbd585e82d47d460d/lib/winston/logger.js#L316-L332
+                  this.logger.once('finish', resolve)
+                  this.logger.end()
+              })
+    }
+
+    private mapError(level: LogLevel, err: Error): Error | string {
+        // Use ToolkitError.trace even if we have source mapping (see below), because:
+        // 1. it is what users will see, we want visibility into that when debugging
+        // 2. it is often more useful than the stacktrace anyway
+        if (err instanceof ToolkitError) {
+            return err.trace
+        }
+
+        if (isSourceMappingAvailable() && level === 'error') {
+            return err
+        }
+
+        return formatError(UnknownError.cast(err))
+    }
+
+    override sendToLog(level: LogLevel, message: string | Error, ...meta: any[]): number {
+        // XXX: force debug/verbose logs for Beta users.
+        level = this.isBeta && compareLogLevel(level, 'info') > 0 ? 'info' : level
+
+        if (this.disposed) {
+            throw new Error('Cannot write to disposed logger')
+        }
+
+        meta = meta.map((o) => (o instanceof Error ? this.mapError(level, o) : o))
+
+        if (message instanceof Error) {
+            this.logger.log(level, '%O', message, ...meta, { logID: this.idCounter })
+        } else {
+            this.logger.log(level, message, ...meta, { logID: this.idCounter })
+        }
+
+        this.logMap[this.idCounter % logmapSize] = {}
+        return this.idCounter++
+    }
+
+    /**
+     * Attempts to get the mapped message corresponding to the provided file and logID.
+     * Log messages are considered 'stale' after a constant amount of new logs have been added.
+     *
+     * @param logID  Unique ID associated with every log operation
+     * @param file  Desired output file Uri. Debug console uses the uri 'console://debug' and output channel uses 'channel://output'
+     *
+     * @returns  Final log message. Stale or non-existant logs return undefined
+     */
+    public getLogById(logID: number, file: vscode.Uri): string | undefined {
+        // Not possible, yell at the caller :(
+        if (logID >= this.idCounter || logID < 0) {
+            throw new Error(`Invalid log state, logID=${logID} must be in the range [0, ${this.idCounter})!`)
+        }
+
+        // This prevents callers from getting stale logs
+        if (this.idCounter - logID > logmapSize) {
+            return undefined
+        }
+
+        if (this.logMap[logID % logmapSize]) {
+            return this.logMap[logID % logmapSize][file.toString(true)]
+        }
+    }
+
+    /**
+     * Register this function to a Transport's 'logged' event to parse out the resulting meta data and log ID
+     * Immediately records this log into logMap so it can be collected by an external caller
+     *
+     * @param file  File that was written to
+     * @param obj  Object passed from the event
+     */
+    private parseLogObject(file: vscode.Uri, obj: any): void {
+        const logID: number = parseInt(obj.logID) % logmapSize
+        const symbols: symbol[] = Object.getOwnPropertySymbols(obj)
+        const messageSymbol: symbol | undefined = symbols.find((s: symbol) => s.toString() === 'Symbol(message)')
+
+        if (this.logMap[logID] !== undefined && messageSymbol) {
+            this.logMap[logID][file.toString(true)] = obj[messageSymbol]
+        }
+    }
+}
diff --git a/packages/core/src/shared/lsp/baseLspInstaller.ts b/packages/core/src/shared/lsp/baseLspInstaller.ts
new file mode 100644
index 00000000000..7acf58ad788
--- /dev/null
+++ b/packages/core/src/shared/lsp/baseLspInstaller.ts
@@ -0,0 +1,95 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nodePath from 'path'
+import vscode from 'vscode'
+import { LanguageServerResolver } from './lspResolver'
+import { ManifestResolver } from './manifestResolver'
+import { LspResolution, ResourcePaths } from './types'
+import { cleanLspDownloads } from './utils/cleanup'
+import { Range } from 'semver'
+import { getLogger } from '../logger/logger'
+import type { Logger, LogTopic } from '../logger/logger'
+
+export interface LspConfig {
+    manifestUrl: string
+    supportedVersions: string
+    id: string
+    suppressPromptPrefix: string
+    path?: string
+}
+
+export abstract class BaseLspInstaller<T extends ResourcePaths = ResourcePaths, Config extends LspConfig = LspConfig> {
+    private logger: Logger
+
+    constructor(
+        protected config: Config,
+        loggerName: Extract<LogTopic, 'amazonqLsp' | 'amazonqWorkspaceLsp'>
+    ) {
+        this.logger = getLogger(loggerName)
+    }
+
+    async resolve(): Promise<LspResolution<T>> {
+        const { id, manifestUrl, supportedVersions, path, suppressPromptPrefix } = this.config
+        if (path) {
+            const overrideMsg = `Using language server override location: ${path}`
+            this.logger.info(overrideMsg)
+            void vscode.window.showInformationMessage(overrideMsg)
+            return {
+                assetDirectory: path,
+                location: 'override',
+                version: '0.0.0',
+                resourcePaths: this.resourcePaths(),
+            }
+        }
+
+        const manifest = await new ManifestResolver(manifestUrl, id, suppressPromptPrefix).resolve()
+        const installationResult = await new LanguageServerResolver(
+            manifest,
+            id, // TODO: We may want a display name instead of the ID
+            new Range(supportedVersions, {
+                includePrerelease: true,
+            }),
+            manifestUrl,
+            this.downloadMessageOverride
+        ).resolve()
+
+        const assetDirectory = installationResult.assetDirectory
+
+        await this.postInstall(assetDirectory)
+
+        const deletedVersions = await cleanLspDownloads(
+            installationResult.version,
+            manifest.versions,
+            nodePath.dirname(assetDirectory)
+        )
+        if (deletedVersions.length > 0) {
+            this.logger.debug(`cleaning old LSP versions: deleted ${deletedVersions.length} versions`)
+        }
+
+        const r = {
+            ...installationResult,
+            // Example:
+            // ```
+            // resourcePaths = {
+            //     lsp = '<cachedir>/aws/toolkits/language-servers/AmazonQ/3.3.0/servers/aws-lsp-codewhisperer.js'
+            //     node = '<cachedir>/aws/toolkits/language-servers/AmazonQ/3.3.0/servers/node'
+            //     ui = '<cachedir>/aws/toolkits/language-servers/AmazonQ/3.3.0/clients/amazonq-ui.js'
+            // }
+            // ```
+            resourcePaths: this.resourcePaths(assetDirectory),
+        }
+        return r
+    }
+
+    /**
+     * Allows implementations of this class to set a custom message to show users
+     * when the artifacts are being downloaded. If not set, a default message will be shown.
+     */
+    protected downloadMessageOverride: string | undefined = undefined
+
+    protected abstract postInstall(assetDirectory: string): Promise<void>
+    protected abstract resourcePaths(assetDirectory?: string): T
+}
diff --git a/src/shared/languageServer/languageModelCache.ts b/packages/core/src/shared/lsp/languageModelCache.ts
similarity index 84%
rename from src/shared/languageServer/languageModelCache.ts
rename to packages/core/src/shared/lsp/languageModelCache.ts
index bf272d6888d..1e1dd73f045 100644
--- a/src/shared/languageServer/languageModelCache.ts
+++ b/packages/core/src/shared/lsp/languageModelCache.ts
@@ -1,15 +1,14 @@
 /*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*---------------------------------------------------------------------------------------------
+/* ---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
 import { TextDocument } from 'vscode-languageserver-textdocument'
-import globals from '../extensionGlobals'
 
 export interface LanguageModelCache<T> {
     get(document: TextDocument): T
@@ -27,8 +26,8 @@ export function getLanguageModelCache<T>(
 
     let cleanupInterval: NodeJS.Timer | undefined
     if (cleanupIntervalTimeInSec > 0) {
-        cleanupInterval = globals.clock.setInterval(() => {
-            const cutoffTime = globals.clock.Date.now() - cleanupIntervalTimeInSec * 1000
+        cleanupInterval = setInterval(() => {
+            const cutoffTime = Date.now() - cleanupIntervalTimeInSec * 1000
             const uris = Object.keys(languageModels)
             for (const uri of uris) {
                 const languageModelInfo = languageModels[uri]
@@ -50,12 +49,12 @@ export function getLanguageModelCache<T>(
                 languageModelInfo.version === version &&
                 languageModelInfo.languageId === languageId
             ) {
-                languageModelInfo.cTime = globals.clock.Date.now()
+                languageModelInfo.cTime = Date.now()
 
                 return languageModelInfo.languageModel
             }
             const languageModel = parse(document)
-            languageModels[document.uri] = { languageModel, version, languageId, cTime: globals.clock.Date.now() }
+            languageModels[document.uri] = { languageModel, version, languageId, cTime: Date.now() }
             if (!languageModelInfo) {
                 nModels++
             }
@@ -87,7 +86,7 @@ export function getLanguageModelCache<T>(
         },
         dispose() {
             if (typeof cleanupInterval !== 'undefined') {
-                globals.clock.clearInterval(cleanupInterval)
+                clearInterval(cleanupInterval)
                 cleanupInterval = undefined
                 languageModels = {}
                 nModels = 0
diff --git a/packages/core/src/shared/lsp/lspResolver.ts b/packages/core/src/shared/lsp/lspResolver.ts
new file mode 100644
index 00000000000..e12cac74c40
--- /dev/null
+++ b/packages/core/src/shared/lsp/lspResolver.ts
@@ -0,0 +1,499 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import fs from '../fs/fs'
+import { ToolkitError } from '../errors'
+import * as semver from 'semver'
+import * as path from 'path'
+import { FileType } from 'vscode'
+import AdmZip from 'adm-zip'
+import { TargetContent, logger, LspResult, LspVersion, Manifest } from './types'
+import { createHash } from '../crypto'
+import { lspSetupStage, StageResolver, tryStageResolvers } from './utils/setupStage'
+import { HttpResourceFetcher } from '../resourcefetcher/httpResourceFetcher'
+import { showProgressWithTimeout } from '../../shared/utilities/messages'
+import { Timeout } from '../utilities/timeoutUtils'
+import { oneMinute } from '../datetime'
+import vscode from 'vscode'
+
+// max timeout for downloading remote LSP assets. Some asserts are large (100+ MB) so this needs to be large for slow connections.
+// Since the user can cancel this one we can let it run very long.
+const remoteDownloadTimeout = oneMinute * 30
+
+export class LanguageServerResolver {
+    private readonly downloadMessage: string
+
+    constructor(
+        private readonly manifest: Manifest,
+        private readonly lsName: string,
+        private readonly versionRange: semver.Range,
+        private readonly manifestUrl: string,
+        /**
+         * Custom message to show user when downloading, if undefined it will use the default.
+         */
+        downloadMessage?: string,
+        private readonly _defaultDownloadFolder?: string
+    ) {
+        this.downloadMessage = downloadMessage ?? `Updating '${this.lsName}' language server`
+    }
+
+    /**
+     * Downloads and sets up the Language Server, attempting different locations in order:
+     * 1. Local cache
+     * 2. Remote download
+     * 3. Fallback version
+     * @throws ToolkitError if no compatible version can be found
+     */
+    async resolve() {
+        function getServerVersion(result: LspResult) {
+            return {
+                languageServerVersion: result.version,
+            }
+        }
+        const latestVersion = this.latestCompatibleLspVersion()
+        const targetContents = this.getLSPTargetContents(latestVersion)
+        const cacheDirectory = this.getDownloadDirectory(latestVersion.serverVersion)
+
+        const serverResolvers: StageResolver<LspResult>[] = [
+            {
+                // 1: Use the current local ("cached") LSP server bundle, if any.
+                resolve: async () => await this.getLocalServer(cacheDirectory, latestVersion, targetContents),
+                telemetryMetadata: { id: this.lsName, languageServerLocation: 'cache' },
+            },
+            {
+                // 2: Download the latest LSP server bundle.
+                resolve: async () => await this.fetchRemoteServer(cacheDirectory, latestVersion, targetContents),
+                telemetryMetadata: { id: this.lsName, languageServerLocation: 'remote' },
+            },
+            {
+                // 3: If the download fails, try an older, cached version.
+                resolve: async () => await this.getFallbackServer(latestVersion),
+                telemetryMetadata: { id: this.lsName, languageServerLocation: 'fallback' },
+            },
+        ]
+
+        /**
+         * Example:
+         * ```
+         * LspResult {
+         *   assetDirectory = "<cachedir>/aws/toolkits/language-servers/AmazonQ/3.3.0"
+         *   location = 'cache'
+         *   version = '3.3.0'
+         * }
+         * ```
+         */
+        const resolved = await tryStageResolvers('getServer', serverResolvers, getServerVersion)
+        logger.info('Finished preparing "%s" LSP server: %O', this.lsName, resolved.assetDirectory)
+        return resolved
+    }
+
+    /** Finds an older, cached version of the LSP server bundle. */
+    private async getFallbackServer(latestVersion: LspVersion): Promise<LspResult> {
+        const cachedVersions = await this.getCachedVersions()
+        if (cachedVersions.length === 0) {
+            /**
+             * at this point the latest version doesn't exist locally, lsp download (with retries) failed, and there are no cached fallback versions.
+             * This _probably_ only happens when the user hit a firewall/proxy issue, since otherwise they would probably have at least
+             * one other language server locally
+             */
+            throw new ToolkitError(
+                `Unable to download dependencies from ${this.manifestUrl}. Check your network connectivity or firewall configuration and then try again.`,
+                {
+                    code: 'NetworkConnectivityError',
+                }
+            )
+        }
+
+        const fallbackDirectory = await this.getFallbackDir(latestVersion.serverVersion, cachedVersions)
+        if (!fallbackDirectory) {
+            throw new ToolkitError('Unable to find a compatible version of the Language Server', {
+                code: 'IncompatibleVersion',
+            })
+        }
+
+        const version = path.basename(fallbackDirectory)
+        logger.info(
+            `Unable to install ${this.lsName} language server v${latestVersion.serverVersion}. Launching a previous version from ${fallbackDirectory}`
+        )
+
+        return {
+            location: 'fallback',
+            version: version,
+            assetDirectory: fallbackDirectory,
+        }
+    }
+
+    /**
+     * Show a toast notification with progress bar for lsp remote downlaod
+     * Returns a timeout to be passed down into httpFetcher to handle user cancellation
+     */
+    private async showDownloadProgress() {
+        const timeout = new Timeout(remoteDownloadTimeout)
+        void showProgressWithTimeout(
+            {
+                title: this.downloadMessage,
+                location: vscode.ProgressLocation.Notification,
+                cancellable: false,
+            },
+            timeout,
+            0
+        )
+        return timeout
+    }
+
+    /** Downloads the latest LSP server bundle. */
+    private async fetchRemoteServer(
+        cacheDirectory: string,
+        latestVersion: LspVersion,
+        targetContents: TargetContent[]
+    ): Promise<LspResult> {
+        const timeout = await this.showDownloadProgress()
+        try {
+            if (await this.downloadRemoteTargetContent(targetContents, latestVersion, timeout)) {
+                return {
+                    location: 'remote',
+                    version: latestVersion.serverVersion,
+                    assetDirectory: cacheDirectory,
+                }
+            } else {
+                await this.cleanupVersion(latestVersion.serverVersion)
+                throw new ToolkitError('Failed to download server from remote', { code: 'RemoteDownloadFailed' })
+            }
+        } finally {
+            timeout.dispose()
+        }
+    }
+
+    private async cleanupVersion(version: string) {
+        // clean up the X.X.X download directory since the download failed
+        const downloadDirectory = this.getDownloadDirectory(version)
+        if (await fs.existsDir(downloadDirectory)) {
+            await fs.delete(downloadDirectory)
+        }
+    }
+
+    /** Gets the current local ("cached") LSP server bundle. */
+    private async getLocalServer(
+        cacheDirectory: string,
+        latestVersion: LspVersion,
+        targetContents: TargetContent[]
+    ): Promise<LspResult> {
+        if (await this.hasValidLocalCache(cacheDirectory, targetContents)) {
+            return {
+                location: 'cache',
+                version: latestVersion.serverVersion,
+                assetDirectory: cacheDirectory,
+            }
+        } else {
+            // Delete the cached directory since it's invalid
+            await fs.delete(cacheDirectory, { force: true, recursive: true })
+            throw new ToolkitError('Failed to retrieve server from cache', { code: 'InvalidCache' })
+        }
+    }
+
+    /**
+     * Get all of the compatible language server versions from the manifest
+     */
+    private compatibleManifestLspVersion() {
+        return this.manifest.versions.filter((x) => this.isCompatibleVersion(x))
+    }
+
+    /**
+     * Returns the path to the most compatible cached LSP version that can serve as a fallback
+     **/
+    private async getFallbackDir(version: string, cachedVersions: string[]) {
+        const compatibleLspVersions = this.compatibleManifestLspVersion()
+
+        const expectedVersion = semver.parse(version)
+        if (!expectedVersion) {
+            return undefined
+        }
+
+        const sortedCachedLspVersions = compatibleLspVersions
+            .filter((v) => this.isValidCachedVersion(v, cachedVersions, expectedVersion))
+            .sort((a, b) => semver.compare(b.serverVersion, a.serverVersion))
+
+        const fallbackDir = (
+            await Promise.all(sortedCachedLspVersions.map((ver) => this.getValidLocalCacheDirectory(ver)))
+        ).filter((v) => v !== undefined)
+        return fallbackDir.length > 0 ? fallbackDir[0] : undefined
+    }
+
+    private async getCachedVersions() {
+        // determine all folders containing lsp versions in the parent folder
+        return (await fs.readdir(this.defaultDownloadFolder()))
+            .filter(([_, filetype]) => filetype === FileType.Directory)
+            .map(([pathName, _]) => semver.parse(pathName))
+            .filter((ver): ver is semver.SemVer => ver !== null)
+            .map((x) => x.version)
+    }
+
+    /**
+     * Validate the local cache directory of the given lsp version (matches expected hash)
+     * If valid return cache directory, else return undefined
+     */
+    private async getValidLocalCacheDirectory(version: LspVersion) {
+        const targetContents = this.getTargetContents(version)
+        if (targetContents === undefined || targetContents.length === 0) {
+            return undefined
+        }
+
+        const cacheDir = this.getDownloadDirectory(version.serverVersion)
+        const hasValidCache = await this.hasValidLocalCache(cacheDir, targetContents)
+
+        return hasValidCache ? cacheDir : undefined
+    }
+
+    /**
+     * Determines if a cached LSP version is valid for use as a fallback.
+     * A version is considered valid if it exists in the cache and is less than
+     * or equal to the expected version.
+     */
+    private isValidCachedVersion(version: LspVersion, cachedVersions: string[], expectedVersion: semver.SemVer) {
+        const serverVersion = semver.parse(version.serverVersion) as semver.SemVer
+        return cachedVersions.includes(serverVersion.version) && semver.lte(serverVersion, expectedVersion)
+    }
+
+    /**
+     * Download and unzip all of the contents into the download directory
+     *
+     * @returns
+     *  true, if all of the contents were successfully downloaded and unzipped
+     *  false, if any of the contents failed to download or unzip
+     */
+    private async downloadRemoteTargetContent(contents: TargetContent[], lspVersion: LspVersion, timeout: Timeout) {
+        const downloadDirectory = this.getDownloadDirectory(lspVersion.serverVersion)
+
+        if (!(await fs.existsDir(downloadDirectory))) {
+            await fs.mkdir(downloadDirectory)
+        }
+
+        const fetchTasks = contents.map(async (content) => {
+            return {
+                res: await new HttpResourceFetcher(content.url, {
+                    showUrl: true,
+                    timeout: timeout,
+                    throwOnError: true,
+                }).get(),
+                hash: content.hashes[0],
+                filename: content.filename,
+            }
+        })
+        const fetchResults = await Promise.all(fetchTasks)
+        const verifyTasks = fetchResults
+            .filter((fetchResult) => fetchResult.res && fetchResult.res.ok && fetchResult.res.body)
+            .flatMap(async (fetchResult) => {
+                const arrBuffer = await fetchResult.res!.arrayBuffer()
+                const data = Buffer.from(arrBuffer)
+
+                const hash = createHash('sha384', data)
+                if (hash === fetchResult.hash) {
+                    return [{ filename: fetchResult.filename, data }]
+                }
+                return []
+            })
+        if (verifyTasks.length !== contents.length) {
+            return false
+        }
+
+        const filesToDownload = await lspSetupStage('validate', async () => (await Promise.all(verifyTasks)).flat())
+
+        // We were instructed by legal to show this message
+        const thirdPartyLicenses = lspVersion.thirdPartyLicenses
+        logger.info(
+            `Installing '${this.lsName}' Language Server v${lspVersion.serverVersion} to: ${downloadDirectory}${thirdPartyLicenses ? ` (Attribution notice can be found at ${thirdPartyLicenses})` : ''}`
+        )
+
+        for (const file of filesToDownload) {
+            await fs.writeFile(`${downloadDirectory}/${file.filename}`, file.data)
+        }
+
+        return this.extractZipFilesFromRemote(downloadDirectory)
+    }
+
+    private async extractZipFilesFromRemote(downloadDirectory: string) {
+        // Find all the zips
+        const zips = (await fs.readdir(downloadDirectory))
+            .filter(([fileName, _]) => fileName.endsWith('.zip'))
+            .map(([fileName, _]) => `${downloadDirectory}/${fileName}`)
+
+        if (zips.length === 0) {
+            return true
+        }
+
+        return this.copyZipContents(zips)
+    }
+
+    private async hasValidLocalCache(localCacheDirectory: string, targetContents: TargetContent[]) {
+        // check if the zips are still at the present location
+        const results = await Promise.all(
+            targetContents.map((content) => {
+                const path = `${localCacheDirectory}/${content.filename}`
+                return fs.existsFile(path)
+            })
+        )
+
+        const allFilesExist = results.every(Boolean)
+        return allFilesExist && this.ensureUnzippedFoldersMatchZip(localCacheDirectory, targetContents)
+    }
+
+    /**
+     * Ensures zip files in cache have an unzipped folder of the same name
+     * with the same content files (by name)
+     *
+     * @returns
+     *  false, if any of the unzipped folder don't match zip contents (by name)
+     */
+    private ensureUnzippedFoldersMatchZip(localCacheDirectory: string, targetContents: TargetContent[]) {
+        const zipPaths = targetContents
+            .filter((x) => x.filename.endsWith('.zip'))
+            .map((y) => `${localCacheDirectory}/${y.filename}`)
+
+        if (zipPaths.length === 0) {
+            return true
+        }
+
+        return this.copyZipContents(zipPaths)
+    }
+
+    /**
+     * Copies all the contents from zip into the directory
+     *
+     * @returns
+     *  false, if any of the unzips fails
+     */
+    private copyZipContents(zips: string[]) {
+        const unzips = zips.map((zip) => {
+            try {
+                // attempt to unzip
+                const zipFile = new AdmZip(zip)
+                const extractPath = zip.replace('.zip', '')
+
+                /**
+                 * Avoid overwriting existing files during extraction to prevent file corruption.
+                 * On Mac ARM64 when a language server is already running in one VS Code window,
+                 * attempting to extract and overwrite its files from another window can cause
+                 * the newly started language server to crash with 'EXC_CRASH (SIGKILL (Code Signature Invalid))'.
+                 */
+                zipFile.extractAllTo(extractPath, false)
+            } catch (e) {
+                return false
+            }
+            return true
+        })
+
+        // make sure every one completed successfully
+        return unzips.every(Boolean)
+    }
+
+    /**
+     * Parses the toolkit lsp version object retrieved from the version manifest to determine
+     * lsp contents
+     */
+    private getLSPTargetContents(version: LspVersion) {
+        const lspTarget = this.getCompatibleLspTarget(version)
+        if (!lspTarget) {
+            throw new ToolkitError("No language server target found matching the system's architecture and platform")
+        }
+
+        const targetContents = lspTarget.contents
+        if (!targetContents) {
+            throw new ToolkitError('No matching target contents found')
+        }
+        return targetContents
+    }
+
+    /**
+     * Get the latest language server version matching the toolkit compatible version range,
+     * not de-listed and contains the required target contents:
+     * architecture, platform and files
+     */
+    private latestCompatibleLspVersion() {
+        if (this.manifest === null) {
+            throw new ToolkitError('No valid manifest')
+        }
+
+        const latestCompatibleVersion =
+            this.manifest.versions
+                .filter((ver) => this.isCompatibleVersion(ver) && this.hasRequiredTargetContent(ver))
+                .sort((a, b) => semver.compare(b.serverVersion, a.serverVersion))[0] ?? undefined
+
+        if (latestCompatibleVersion === undefined) {
+            // TODO fix these error range names
+            throw new ToolkitError(
+                `Unable to find a language server that satifies one or more of these conditions: version in range [${this.versionRange.range}], matching system's architecture and platform`
+            )
+        }
+
+        return latestCompatibleVersion
+    }
+
+    /**
+     * Determine if the given lsp version is toolkit compatible
+     * i.e. in version range and not de-listed
+     */
+    private isCompatibleVersion(version: LspVersion) {
+        // invalid version
+        if (semver.parse(version.serverVersion) === null) {
+            return false
+        }
+
+        return (
+            semver.satisfies(version.serverVersion, this.versionRange, {
+                includePrerelease: true,
+            }) && !version.isDelisted
+        )
+    }
+
+    /**
+     * Validates the lsp version contains the required toolkit compatible contents:
+     * architecture, platform and file
+     */
+    private hasRequiredTargetContent(version: LspVersion) {
+        const targetContents = this.getTargetContents(version)
+        return targetContents !== undefined && targetContents.length > 0
+    }
+
+    /**
+     * Returns the target contents of the lsp version that contains the required
+     * toolkit compatible contents: architecture, platform and file
+     */
+    private getTargetContents(version: LspVersion) {
+        const target = this.getCompatibleLspTarget(version)
+        return target?.contents
+    }
+
+    /**
+     * Retrives the lsp target matching the user's system architecture and platform
+     * from the language server version object
+     */
+    private getCompatibleLspTarget(version: LspVersion) {
+        // TODO make this web friendly
+        // TODO make this fully support windows
+
+        // Workaround: Manifest platform field is `windows`, whereas node returns win32
+        const platform = process.platform === 'win32' ? 'windows' : process.platform
+        const arch = process.arch
+        return version.targets.find((x) => x.arch === arch && x.platform === platform)
+    }
+
+    /**
+     * Gets platform-specific "cache" dir ("$LOCALAPPDATA/aws/…" or "~/.cache/aws/…").
+     *
+     * Lazy-calls `getCacheDir()` to avoid failure on Windows.
+     */
+    public static defaultDir() {
+        return path.join(fs.getCacheDir(), `aws/toolkits/language-servers`)
+    }
+
+    defaultDownloadFolder() {
+        return path.join(LanguageServerResolver.defaultDir(), `${this.lsName}`)
+    }
+
+    private getDownloadDirectory(version: string) {
+        const directory = this._defaultDownloadFolder ?? this.defaultDownloadFolder()
+        return `${directory}/${version}`
+    }
+}
diff --git a/packages/core/src/shared/lsp/manifestResolver.ts b/packages/core/src/shared/lsp/manifestResolver.ts
new file mode 100644
index 00000000000..6dd0a793178
--- /dev/null
+++ b/packages/core/src/shared/lsp/manifestResolver.ts
@@ -0,0 +1,173 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../logger/logger'
+import { ToolkitError } from '../errors'
+import { Timeout } from '../utilities/timeoutUtils'
+import globals from '../extensionGlobals'
+import { Manifest } from './types'
+import { StageResolver, tryStageResolvers } from './utils/setupStage'
+import { HttpResourceFetcher } from '../resourcefetcher/httpResourceFetcher'
+import * as localizedText from '../localizedText'
+import { AmazonQPromptSettings, amazonQPrompts } from '../settings'
+
+const logger = getLogger('lsp')
+
+interface StorageManifest {
+    etag: string
+    content: string
+}
+
+type ManifestStorage = Record<string, StorageManifest>
+
+export const manifestStorageKey = 'aws.toolkit.lsp.manifest'
+const manifestTimeoutMs = 15000
+
+export class ManifestResolver {
+    constructor(
+        private readonly manifestURL: string,
+        private readonly lsName: string,
+        private readonly supressPrefix: string
+    ) {}
+
+    /**
+     * Fetches the latest manifest, falling back to local cache on failure
+     */
+    async resolve(): Promise<Manifest> {
+        const resolvers: StageResolver<Manifest>[] = [
+            {
+                resolve: async () => await this.fetchRemoteManifest(),
+                telemetryMetadata: { id: this.lsName, manifestLocation: 'remote' },
+            },
+            {
+                resolve: async () => await this.getLocalManifest(),
+                telemetryMetadata: { id: this.lsName, manifestLocation: 'cache' },
+            },
+        ]
+
+        return await tryStageResolvers('getManifest', resolvers, extractMetadata)
+
+        function extractMetadata(r: Manifest) {
+            return {
+                manifestSchemaVersion: r.manifestSchemaVersion,
+            }
+        }
+    }
+
+    private async fetchRemoteManifest(): Promise<Manifest> {
+        const resp = await new HttpResourceFetcher(this.manifestURL, {
+            showUrl: true,
+            timeout: new Timeout(manifestTimeoutMs),
+        }).getNewETagContent(this.getEtag())
+
+        if (!resp.content) {
+            const msg = `"${this.lsName}" manifest unchanged, skipping download: ${this.manifestURL}`
+            logger.debug(msg)
+
+            const localManifest = await this.getLocalManifest(true).catch(() => undefined)
+            if (localManifest) {
+                return localManifest
+            } else {
+                // Will emit a `languageServer_setup` result=failed metric...
+                throw new ToolkitError(msg)
+            }
+        }
+
+        logger.debug(`fetched "${this.lsName}" manifest: ${this.manifestURL}`)
+        const manifest = this.parseManifest(resp.content)
+        await this.saveManifest(resp.eTag, resp.content)
+        await this.checkDeprecation(manifest)
+        manifest.location = 'remote'
+        return manifest
+    }
+
+    private async getLocalManifest(silent: boolean = false): Promise<Manifest> {
+        if (!silent) {
+            logger.info(`trying local "${this.lsName}" manifest...`)
+        }
+        const storage = this.getStorage()
+        const manifestData = storage[this.lsName]
+
+        if (!manifestData?.content) {
+            const msg = `local "${this.lsName}" manifest not found`
+            logger.warn(msg)
+            throw new ToolkitError(msg)
+        }
+
+        const manifest = this.parseManifest(manifestData.content)
+        await this.checkDeprecation(manifest)
+        manifest.location = 'cache'
+        return manifest
+    }
+
+    private parseManifest(content: string): Manifest {
+        try {
+            return JSON.parse(content) as Manifest
+        } catch (error) {
+            throw new ToolkitError(
+                `Failed to parse "${this.lsName}" manifest: ${error instanceof Error ? error.message : 'Unknown error'}`
+            )
+        }
+    }
+
+    /**
+     * Check if the current manifest is deprecated.
+     * If yes and user hasn't muted this notification, shows a toast message with two buttons:
+     * - OK: close and do nothing
+     * - Don't Show Again: Update suppressed prompt setting so the deprecation message is never shown for this manifest.
+     * @param manifest
+     */
+    private async checkDeprecation(manifest: Manifest): Promise<void> {
+        const prompts = AmazonQPromptSettings.instance
+        const lspId = `${this.supressPrefix}LspManifestMessage` as keyof typeof amazonQPrompts
+
+        // Sanity check, if the lsName is changed then we also need to update the prompt keys in core/package.json
+        if (!(lspId in amazonQPrompts)) {
+            logger.error(`LSP ID "${lspId}" not found in amazonQPrompts.`)
+            return
+        }
+
+        if (!manifest.isManifestDeprecated) {
+            // In case we got an new url, make sure the prompt is re-enabled for active manifests
+            await prompts.enablePrompt(lspId)
+            return
+        }
+
+        const deprecationMessage = `"${this.lsName}" manifest is deprecated. No future updates will be available.`
+        logger.info(deprecationMessage)
+
+        if (prompts.isPromptEnabled(lspId)) {
+            void vscode.window
+                .showInformationMessage(deprecationMessage, localizedText.ok, localizedText.dontShow)
+                .then(async (button) => {
+                    if (button === localizedText.dontShow) {
+                        await prompts.disablePrompt(lspId)
+                    }
+                })
+        }
+    }
+
+    private async saveManifest(etag: string, content: string): Promise<void> {
+        const storage = this.getStorage()
+
+        globals.globalState.tryUpdate(manifestStorageKey, {
+            ...storage,
+            [this.lsName]: {
+                etag,
+                // XXX: this stores the entire manifest. vscode warns about our globalStorage size...
+                content,
+            },
+        })
+    }
+
+    private getEtag(): string | undefined {
+        return this.getStorage()[this.lsName]?.etag
+    }
+
+    private getStorage(): ManifestStorage {
+        return globals.globalState.tryGet(manifestStorageKey, Object, {})
+    }
+}
diff --git a/packages/core/src/shared/lsp/types.ts b/packages/core/src/shared/lsp/types.ts
new file mode 100644
index 00000000000..1262d6e8fd1
--- /dev/null
+++ b/packages/core/src/shared/lsp/types.ts
@@ -0,0 +1,93 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { getLogger } from '../logger/logger'
+import { LanguageServerLocation, ManifestLocation } from '../telemetry/telemetry'
+
+export const logger = getLogger('lsp')
+
+export interface LspResult {
+    /** Example: `"cache"` */
+    location: LanguageServerLocation
+    /** Example: `"3.3.0"` */
+    version: string
+    /** Example: `"<cachedir>/aws/toolkits/language-servers/AmazonQ/3.3.0"` */
+    assetDirectory: string
+}
+
+/**
+ * Example:
+ * ```
+ * resourcePaths = {
+ *     lsp = '<cachedir>/aws/toolkits/language-servers/AmazonQ/3.3.0/servers/aws-lsp-codewhisperer.js'
+ *     node = '<cachedir>/aws/toolkits/language-servers/AmazonQ/3.3.0/servers/node'
+ *     ui = '<cachedir>/aws/toolkits/language-servers/AmazonQ/3.3.0/clients/amazonq-ui.js'
+ * }
+ * ```
+ */
+export interface ResourcePaths {
+    /**
+     * Path to `.js` bundle to be executed by `node`.
+     * Example: `"<cachedir>/aws/toolkits/language-servers/AmazonQ/3.3.0/servers/aws-lsp-codewhisperer.js"`
+     */
+    lsp: string
+    /**
+     * Path to `node` (or `node.exe`) executable/binary.
+     * Example: `"<cachedir>/aws/toolkits/language-servers/AmazonQ/3.3.0/servers/node"`
+     */
+    node: string
+}
+
+export interface LspResolution<T extends ResourcePaths> extends LspResult {
+    /**
+     * Example:
+     * ```
+     * resourcePaths = {
+     *     lsp = '<cachedir>/aws/toolkits/language-servers/AmazonQ/3.3.0/servers/aws-lsp-codewhisperer.js'
+     *     node = '<cachedir>/aws/toolkits/language-servers/AmazonQ/3.3.0/servers/node'
+     *     ui = '<cachedir>/aws/toolkits/language-servers/AmazonQ/3.3.0/clients/amazonq-ui.js'
+     * }
+     * ```
+     */
+    resourcePaths: T
+}
+
+export interface TargetContent {
+    filename: string
+    url: string
+    hashes: string[]
+    bytes: number
+    serverVersion?: string
+}
+
+export interface Target {
+    platform: string
+    arch: string
+    contents: TargetContent[]
+}
+
+export interface LspVersion {
+    serverVersion: string
+    isDelisted: boolean
+    targets: Target[]
+    /**
+     * I'm not sure if this **always** exists (couldn't find it in the spec)
+     */
+    thirdPartyLicenses?: string
+}
+
+export interface Manifest {
+    manifestSchemaVersion: string
+    artifactId: string
+    artifactDescription: string
+    isManifestDeprecated: boolean
+    versions: LspVersion[]
+    location?: ManifestLocation
+}
+
+export interface VersionRange {
+    start: number
+    end: number
+}
diff --git a/packages/core/src/shared/lsp/utils/cleanup.ts b/packages/core/src/shared/lsp/utils/cleanup.ts
new file mode 100644
index 00000000000..3f8c27cd81d
--- /dev/null
+++ b/packages/core/src/shared/lsp/utils/cleanup.ts
@@ -0,0 +1,61 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import path from 'path'
+import { LspVersion } from '../types'
+import { fs } from '../../../shared/fs/fs'
+import { partition } from '../../../shared/utilities/tsUtils'
+import { parse, sort } from 'semver'
+
+export async function getDownloadedVersions(installLocation: string) {
+    return (await fs.readdir(installLocation)).filter((x) => parse(x[0]) !== null).map(([f, _], __) => f)
+}
+
+function isDelisted(manifestVersions: LspVersion[], targetVersion: string): boolean {
+    return manifestVersions.find((v) => v.serverVersion === targetVersion)?.isDelisted ?? false
+}
+
+/**
+ * Delete all delisted versions and keep the two newest versions that remain
+ * @param manifestVersions
+ * @param downloadDirectory
+ * @returns array of deleted versions.
+ */
+export async function cleanLspDownloads(
+    latestInstalledVersion: string,
+    manifestVersions: LspVersion[],
+    downloadDirectory: string
+): Promise<string[]> {
+    const downloadedVersions = await getDownloadedVersions(downloadDirectory)
+    const [delistedVersions, remainingVersions] = partition(downloadedVersions, (v: string) =>
+        isDelisted(manifestVersions, v)
+    )
+    const deletedVersions: string[] = []
+
+    for (const v of delistedVersions) {
+        await fs.delete(path.join(downloadDirectory, v), { force: true, recursive: true })
+        deletedVersions.push(v)
+    }
+
+    if (remainingVersions.length <= 2) {
+        return deletedVersions
+    }
+
+    for (const v of sort(remainingVersions).slice(0, -2)) {
+        /**
+         * When switching between different manifests, the following edge case can occur:
+         * A newly downloaded version might chronologically be older than all previously downloaded versions,
+         * even though it's marked as the latest version in its own manifest.
+         * In such cases, we skip the cleanup process to preserve this version. Otherwise we will get an EPIPE error
+         */
+        if (v === latestInstalledVersion) {
+            continue
+        }
+        await fs.delete(path.join(downloadDirectory, v), { force: true, recursive: true })
+        deletedVersions.push(v)
+    }
+
+    return deletedVersions
+}
diff --git a/packages/core/src/shared/lsp/utils/platform.ts b/packages/core/src/shared/lsp/utils/platform.ts
new file mode 100644
index 00000000000..190a29f7ab1
--- /dev/null
+++ b/packages/core/src/shared/lsp/utils/platform.ts
@@ -0,0 +1,167 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { ToolkitError } from '../../errors'
+import { Logger } from '../../logger/logger'
+import { ChildProcess } from '../../utilities/processUtils'
+import { waitUntil } from '../../utilities/timeoutUtils'
+import { isDebugInstance, isRemoteWorkspace } from '../../vscode/env'
+import { isSageMaker } from '../../extensionUtilities'
+import { getLogger } from '../../logger/logger'
+
+interface SagemakerCookie {
+    authMode?: 'Sso' | 'Iam'
+}
+
+export function getNodeExecutableName(): string {
+    return process.platform === 'win32' ? 'node.exe' : 'node'
+}
+
+export function getRgExecutableName(): string {
+    return process.platform === 'win32' ? 'rg.exe' : 'rg'
+}
+
+/**
+ * Get a json payload that will be sent to the language server, who is waiting to know what the encryption key is.
+ * Code reference: https://github.com/aws/language-servers/blob/7da212185a5da75a72ce49a1a7982983f438651a/client/vscode/src/credentialsActivation.ts#L77
+ */
+function getEncryptionInit(key: Buffer): string {
+    const request = {
+        version: '1.0',
+        mode: 'JWT',
+        key: key.toString('base64'),
+    }
+    return JSON.stringify(request) + '\n'
+}
+
+/**
+ * Checks that we can actually run the `node` executable and execute code with it.
+ */
+export async function validateNodeExe(nodePath: string[], lsp: string, args: string[], logger: Logger) {
+    const bin = nodePath[0]
+    // Check that we can start `node` by itself.
+    const proc = new ChildProcess(bin, [...nodePath.slice(1), '-e', 'console.log("ok " + process.version)'], {
+        logging: 'no',
+    })
+    const r = await proc.run()
+    const ok = r.exitCode === 0 && r.stdout.includes('ok')
+    if (!ok) {
+        const msg = `failed to run basic "node -e" test (exitcode=${r.exitCode}): ${proc.toString(false, true)}`
+        logger.error(msg)
+        throw new ToolkitError(`amazonqLsp: ${msg}`, { code: 'FailedToRunNode' })
+    }
+
+    // Check that we can start `node …/lsp.js --stdio …`.
+    const lspProc = new ChildProcess(bin, [...nodePath.slice(1), lsp, ...args], { logging: 'no' })
+    try {
+        // Start asynchronously (it never stops; we need to stop it below).
+        lspProc.run().catch((e) => logger.error('failed to run: %s', lspProc.toString(false, true)))
+
+        const ok2 =
+            !lspProc.stopped &&
+            (await waitUntil(
+                async () => {
+                    return lspProc.pid() !== undefined
+                },
+                {
+                    timeout: 5000,
+                    interval: 100,
+                    truthy: true,
+                }
+            ))
+        const selfExit = await waitUntil(async () => lspProc.stopped, {
+            timeout: 500,
+            interval: 100,
+            truthy: true,
+        })
+        if (!ok2 || selfExit) {
+            throw new ToolkitError(
+                `amazonqLsp: failed to run (exitcode=${lspProc.exitCode()}): ${lspProc.toString(false, true)}`,
+                { code: 'FailedToStartLanguageServer' }
+            )
+        }
+    } finally {
+        lspProc.stop(true)
+    }
+}
+
+export function createServerOptions({
+    encryptionKey,
+    executable,
+    serverModule,
+    execArgv,
+    warnThresholds,
+}: {
+    encryptionKey: Buffer
+    executable: string[]
+    serverModule: string
+    execArgv: string[]
+    warnThresholds?: { cpu?: number; memory?: number }
+}) {
+    return async () => {
+        const bin = executable[0]
+        const args = [...executable.slice(1), '--max-old-space-size=8196', serverModule, ...execArgv]
+        if (isDebugInstance()) {
+            args.unshift('--inspect=6080')
+        }
+
+        // Set USE_IAM_AUTH environment variable for SageMaker environments based on cookie detection
+        // This tells the language server to use IAM authentication mode instead of SSO mode
+        const env = { ...process.env }
+        if (isSageMaker()) {
+            try {
+                // The command `sagemaker.parseCookies` is registered in VS Code SageMaker environment
+                const result = (await vscode.commands.executeCommand('sagemaker.parseCookies')) as SagemakerCookie
+                if (result.authMode !== 'Sso') {
+                    env.USE_IAM_AUTH = 'true'
+                    getLogger().info(
+                        `[SageMaker Debug] Setting USE_IAM_AUTH=true for language server process (authMode: ${result.authMode})`
+                    )
+                } else {
+                    getLogger().info(`[SageMaker Debug] Using SSO auth mode, not setting USE_IAM_AUTH`)
+                }
+            } catch (err) {
+                if (isRemoteWorkspace() && env.SERVICE_NAME !== 'SageMakerUnifiedStudio') {
+                    getLogger().warn(
+                        `[SageMaker Debug] Failed to parse SageMaker cookies in remote space, not SMUS env, not defaulting to IAM auth: ${err}`
+                    )
+                } else {
+                    getLogger().warn(
+                        `[SageMaker Debug] Failed to parse SageMaker cookies, defaulting to IAM auth: ${err}`
+                    )
+                    env.USE_IAM_AUTH = 'true'
+                }
+            }
+
+            // Log important environment variables for debugging
+            getLogger().info(`[SageMaker Debug] Environment variables for language server:`)
+            getLogger().info(`[SageMaker Debug] USE_IAM_AUTH: ${env.USE_IAM_AUTH}`)
+            getLogger().info(
+                `[SageMaker Debug] AWS_CONTAINER_CREDENTIALS_RELATIVE_URI: ${env.AWS_CONTAINER_CREDENTIALS_RELATIVE_URI}`
+            )
+            getLogger().info(`[SageMaker Debug] AWS_DEFAULT_REGION: ${env.AWS_DEFAULT_REGION}`)
+            getLogger().info(`[SageMaker Debug] AWS_REGION: ${env.AWS_REGION}`)
+        }
+
+        const lspProcess = new ChildProcess(bin, args, {
+            warnThresholds,
+            spawnOptions: { env },
+        })
+
+        // this is a long running process, awaiting it will never resolve
+        void lspProcess.run()
+
+        // share an encryption key using stdin
+        // follow same practice of DEXP LSP server
+        await lspProcess.send(getEncryptionInit(encryptionKey))
+
+        const proc = lspProcess.proc()
+        if (!proc) {
+            throw new ToolkitError('Language Server process was not started')
+        }
+        return proc
+    }
+}
diff --git a/src/shared/languageServer/utils/runner.ts b/packages/core/src/shared/lsp/utils/runner.ts
similarity index 78%
rename from src/shared/languageServer/utils/runner.ts
rename to packages/core/src/shared/lsp/utils/runner.ts
index e4a8a620096..690ef879480 100644
--- a/src/shared/languageServer/utils/runner.ts
+++ b/packages/core/src/shared/lsp/utils/runner.ts
@@ -1,14 +1,17 @@
 /*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/*---------------------------------------------------------------------------------------------
+/* ---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken, ErrorCodes, ResponseError } from 'vscode-languageserver'
+// Disable because this is a language server.
+/* eslint-disable aws-toolkits/no-console-log */
+
+import { CancellationToken, LSPErrorCodes, ResponseError } from 'vscode-languageserver'
 
 export function formatError(message: string, err: any): string {
     if (err instanceof Error) {
@@ -30,14 +33,14 @@ export function runSafeAsync<T>(
     errorMessage: string,
     token: CancellationToken
 ): Thenable<any | ResponseError<any>> {
-    return new Promise<T | ResponseError<any>>(resolve => {
+    return new Promise<T | ResponseError<any>>((resolve) => {
         setImmediate(() => {
             if (token.isCancellationRequested) {
                 resolve(cancelValue())
             }
 
             return func().then(
-                result => {
+                (result) => {
                     if (token.isCancellationRequested) {
                         resolve(cancelValue())
 
@@ -46,7 +49,7 @@ export function runSafeAsync<T>(
                         resolve(result)
                     }
                 },
-                e => {
+                (e) => {
                     console.error(formatError(errorMessage, e))
                     resolve(errorVal)
                 }
@@ -61,7 +64,7 @@ export function runSafe<T, E>(
     errorMessage: string,
     token: CancellationToken
 ): Thenable<T | ResponseError<E>> {
-    return new Promise<T | ResponseError<E>>(resolve => {
+    return new Promise<T | ResponseError<E>>((resolve) => {
         setImmediate(() => {
             if (token.isCancellationRequested) {
                 resolve(cancelValue())
@@ -87,5 +90,5 @@ export function runSafe<T, E>(
 function cancelValue<E>() {
     console.log('cancelled')
 
-    return new ResponseError<E>(ErrorCodes.RequestCancelled, 'Request cancelled')
+    return new ResponseError<E>(LSPErrorCodes.RequestCancelled, 'Request cancelled')
 }
diff --git a/packages/core/src/shared/lsp/utils/setupStage.ts b/packages/core/src/shared/lsp/utils/setupStage.ts
new file mode 100644
index 00000000000..8f43ba16f3f
--- /dev/null
+++ b/packages/core/src/shared/lsp/utils/setupStage.ts
@@ -0,0 +1,68 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { LanguageServerSetup, LanguageServerSetupStage, telemetry } from '../../telemetry/telemetry'
+import { tryFunctions } from '../../utilities/tsUtils'
+import { AuthUtil } from '../../../codewhisperer/util/authUtil'
+
+/**
+ * Runs the designated stage within a telemetry span and optionally uses the getMetadata extractor to record metadata from the result of the stage.
+ * @param stageName name of stage for telemetry.
+ * @param runStage stage to be run.
+ * @param getMetadata metadata extractor to be applied to result.
+ * @returns result of stage
+ */
+export async function lspSetupStage<Result>(
+    stageName: LanguageServerSetupStage,
+    runStage: () => Promise<Result>,
+    getMetadata?: MetadataExtractor<Result>
+) {
+    return await telemetry.languageServer_setup.run(async (span) => {
+        span.record({ languageServerSetupStage: stageName })
+        span.record({ credentialStartUrl: AuthUtil.instance.startUrl ?? 'Undefined' })
+        const result = await runStage()
+        if (getMetadata) {
+            span.record(getMetadata(result))
+        }
+        return result
+    })
+}
+/**
+ * Tries to resolve the result of a stage using the resolvers provided in order. The first one to succceed
+ * has its result returned, but all intermediate will emit telemetry.
+ * @param stageName name of stage to resolve.
+ * @param resolvers stage resolvers to try IN ORDER
+ * @param getMetadata function to be applied to result to extract necessary metadata for telemetry.
+ * @returns result of the first succesful resolver.
+ */
+export async function tryStageResolvers<Result>(
+    stageName: LanguageServerSetupStage,
+    resolvers: StageResolver<Result>[],
+    getMetadata: MetadataExtractor<Result>
+) {
+    const fs = resolvers.map((resolver) => async () => {
+        return await lspSetupStage(
+            stageName,
+            async () => {
+                telemetry.record(resolver.telemetryMetadata)
+                const result = await resolver.resolve()
+                return result
+            },
+            getMetadata
+        )
+    })
+
+    return await tryFunctions(fs)
+}
+
+/**
+ * A method that returns the result of a stage along with the default telemetry metadata to attach to the stage metric.
+ */
+export interface StageResolver<Result> {
+    resolve: () => Promise<Result>
+    telemetryMetadata: Partial<LanguageServerSetup>
+}
+
+type MetadataExtractor<R> = (r: R) => Partial<LanguageServerSetup>
diff --git a/packages/core/src/shared/markdown.ts b/packages/core/src/shared/markdown.ts
new file mode 100644
index 00000000000..215e6603906
--- /dev/null
+++ b/packages/core/src/shared/markdown.ts
@@ -0,0 +1,22 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export const extractCodeBlockLanguage = (message: string) => {
+    // This fulfills both the cases of unit test generation(java, python) and general use case(Non java and Non python) languages.
+    const codeBlockStart = message.indexOf('```')
+    if (codeBlockStart === -1) {
+        return 'plaintext'
+    }
+
+    const languageStart = codeBlockStart + 3
+    const languageEnd = message.indexOf('\n', languageStart)
+
+    if (languageEnd === -1) {
+        return 'plaintext'
+    }
+
+    const language = message.substring(languageStart, languageEnd).trim()
+    return language !== '' ? language : 'plaintext'
+}
diff --git a/src/shared/multiStepInputFlowController.ts b/packages/core/src/shared/multiStepInputFlowController.ts
similarity index 92%
rename from src/shared/multiStepInputFlowController.ts
rename to packages/core/src/shared/multiStepInputFlowController.ts
index e1d97ca3c2b..96d66e4a2f2 100644
--- a/src/shared/multiStepInputFlowController.ts
+++ b/packages/core/src/shared/multiStepInputFlowController.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -68,14 +68,14 @@ export class MultiStepInputFlowController {
                 }
                 input.buttons = [...(this.steps.length > 1 ? [QuickInputButtons.Back] : []), ...(buttons || [])]
                 disposables.push(
-                    input.onDidTriggerButton(item => {
+                    input.onDidTriggerButton((item) => {
                         if (item === QuickInputButtons.Back) {
                             reject(InputFlowAction.back)
                         } else {
                             resolve(item as any)
                         }
                     }),
-                    input.onDidChangeSelection(inputItems => resolve(inputItems[0])),
+                    input.onDidChangeSelection((inputItems) => resolve(inputItems[0])),
                     input.onDidHide(() => {
                         ;(async () => {
                             reject(
@@ -91,7 +91,9 @@ export class MultiStepInputFlowController {
                 this.current.show()
             })
         } finally {
-            disposables.forEach(d => d.dispose() as void)
+            for (const d of disposables) {
+                d.dispose() as void
+            }
         }
     }
 
@@ -119,7 +121,7 @@ export class MultiStepInputFlowController {
                 input.ignoreFocusOut = ignoreFocusOut ? ignoreFocusOut : false
                 let validating = validate('')
                 disposables.push(
-                    input.onDidTriggerButton(async item => {
+                    input.onDidTriggerButton(async (item) => {
                         if (item === QuickInputButtons.Back) {
                             reject(InputFlowAction.back)
                         } else if (typeof (item as any).onClick === 'function') {
@@ -141,7 +143,7 @@ export class MultiStepInputFlowController {
                         input.enabled = true
                         input.busy = false
                     }),
-                    input.onDidChangeValue(async text => {
+                    input.onDidChangeValue(async (text) => {
                         const current = validate(text)
                         validating = current
                         const validationMessage = await current
@@ -164,7 +166,9 @@ export class MultiStepInputFlowController {
                 this.current.show()
             })
         } finally {
-            disposables.forEach(d => d.dispose() as void)
+            for (const d of disposables) {
+                d.dispose() as void
+            }
         }
     }
 
diff --git a/packages/core/src/shared/performance/marks.ts b/packages/core/src/shared/performance/marks.ts
new file mode 100644
index 00000000000..5158229c675
--- /dev/null
+++ b/packages/core/src/shared/performance/marks.ts
@@ -0,0 +1,9 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export const amazonqMark = {
+    open: 'amazonq/webview/open',
+    uiReady: 'amazonq/webview/uiReady',
+}
diff --git a/packages/core/src/shared/performance/performance.ts b/packages/core/src/shared/performance/performance.ts
new file mode 100644
index 00000000000..b7049809b7d
--- /dev/null
+++ b/packages/core/src/shared/performance/performance.ts
@@ -0,0 +1,216 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { getLogger } from '../logger/logger'
+
+interface PerformanceMetrics {
+    /**
+     * The percentange of CPU time spent executing the user-space portions
+     * of the application, (javascript and user-space libraries/dependencies)
+     */
+    userCpuUsage: number
+
+    /**
+     * The percentage CPU time spent executing system-level operations
+     * related to the application, (file I/O, network, ipc, other kernel-space tasks)
+     */
+    systemCpuUsage: number
+    heapTotal: number
+    duration: number
+}
+
+interface TestOptions {
+    darwin?: Partial<PerformanceMetrics>
+    win32?: Partial<PerformanceMetrics>
+    linux?: Partial<PerformanceMetrics>
+    testRuns?: number
+}
+
+export interface PerformanceSpan<T> {
+    value: T
+    performance: PerformanceMetrics
+}
+
+export class PerformanceTracker {
+    #startPerformance:
+        | {
+              cpuUsage: NodeJS.CpuUsage
+              memory: number
+              duration: [number, number]
+          }
+        | undefined
+
+    constructor(private readonly name: string) {}
+
+    start() {
+        this.#startPerformance = {
+            cpuUsage: process.cpuUsage(),
+            memory: process.memoryUsage().heapTotal,
+            duration: process.hrtime(),
+        }
+    }
+
+    stop(): PerformanceMetrics | undefined {
+        if (this.#startPerformance) {
+            const endCpuUsage = process.cpuUsage(this.#startPerformance?.cpuUsage)
+            const userCpuUsage = endCpuUsage.user / 1000000
+            const systemCpuUsage = endCpuUsage.system / 1000000
+
+            const elapsedTime = process.hrtime(this.#startPerformance.duration)
+            const duration = elapsedTime[0] + elapsedTime[1] / 1e9 // convert microseconds to seconds
+
+            const totalUserUsage = (userCpuUsage / duration) * 100
+            const totalSystemUsage = (systemCpuUsage / duration) * 100
+
+            const endMemoryUsage = process.memoryUsage().heapTotal - this.#startPerformance?.memory
+            const endMemoryUsageInMB = endMemoryUsage / (1024 * 1024) // converting bytes to MB
+
+            return {
+                userCpuUsage: totalUserUsage,
+                systemCpuUsage: totalSystemUsage,
+                heapTotal: endMemoryUsageInMB,
+                duration,
+            }
+        } else {
+            getLogger().debug(`PerformanceTracker: start performance not defined for ${this.name}`)
+        }
+    }
+}
+
+interface PerformanceTestFunction<TSetup, TExecute> {
+    // anything you want setup (stubs, etc)
+    setup: () => Promise<TSetup>
+
+    // function under performance test
+    execute: (args: TSetup) => Promise<TExecute>
+
+    // anything you want to verify (assertions, etc)
+    verify: (setup: TSetup, execute: TExecute) => Promise<void> | void
+}
+
+/**
+ * Generate a test suite that runs fn options.testRuns times and gets the average performance metrics of all the test runs
+ */
+export function performanceTest<TSetup, TExecute>(
+    options: TestOptions,
+    name: string,
+    fn: () => PerformanceTestFunction<TSetup, TExecute>
+) {
+    const testOption = options[process.platform as 'linux' | 'darwin' | 'win32']
+
+    const totalTestRuns = options.testRuns ?? 10
+    // TODO: unskip this once flakiness is reduced.
+    return describe.skip(`${name} performance tests`, () => {
+        let performanceTracker: PerformanceTracker | undefined
+        const testRunMetrics: PerformanceMetrics[] = []
+
+        beforeEach(async () => {
+            const startCpuUsage = process.cpuUsage()
+            const userCpuUsage = startCpuUsage.user / 1000000
+            const systemCpuUsage = startCpuUsage.system / 1000000
+            getLogger().info(`Starting CPU usage for "${name}" - User: ${userCpuUsage}%, System: ${systemCpuUsage}%`)
+
+            performanceTracker = new PerformanceTracker(name)
+        })
+
+        for (let testRun = 1; testRun <= totalTestRuns; testRun++) {
+            it(`${name} - test run ${testRun}`, async () => {
+                const { setup, execute, verify } = fn()
+
+                const setupResp = await setup()
+
+                performanceTracker?.start()
+                const execResp = await execute(setupResp)
+                const metrics = performanceTracker?.stop()
+                if (!metrics) {
+                    assert.fail('Performance metrics not found')
+                }
+
+                // log these messages for now so we can better understand flakiness
+                getLogger().info(`performanceMetrics: %O`, metrics)
+                testRunMetrics.push(metrics)
+
+                await verify(setupResp, execResp)
+            })
+        }
+
+        after(async () => {
+            // use median since its more resistant to outliers
+            const middle = Math.floor(testRunMetrics.length / 2)
+            const medianUserCPUUsage = [...testRunMetrics].sort((a, b) => a.userCpuUsage - b.userCpuUsage)[middle]
+                .userCpuUsage
+            const medianTotalSystemCPUUsage = [...testRunMetrics].sort((a, b) => a.systemCpuUsage - b.systemCpuUsage)[
+                middle
+            ].systemCpuUsage
+            const medianTotalMemoryUsage = [...testRunMetrics].sort((a, b) => a.heapTotal - b.heapTotal)[middle]
+                .heapTotal
+            const medianTotalDuration = [...testRunMetrics].sort((a, b) => a.duration - b.duration)[middle].duration
+
+            // log these messages for now so we can better understand flakiness
+            getLogger().info('Median performance metrics: %O', {
+                userCpuUsage: medianUserCPUUsage,
+                systemCpuUsage: medianTotalSystemCPUUsage,
+                heapTotal: medianTotalMemoryUsage,
+                duration: medianTotalDuration,
+            })
+
+            assertPerformanceMetrics(
+                {
+                    userCpuUsage: medianUserCPUUsage,
+                    systemCpuUsage: medianTotalSystemCPUUsage,
+                    duration: medianTotalDuration,
+                    heapTotal: medianTotalMemoryUsage,
+                },
+                name,
+                testOption
+            )
+        })
+    })
+}
+
+function assertPerformanceMetrics(
+    performanceMetrics: PerformanceMetrics,
+    name: string,
+    testOption?: Partial<PerformanceMetrics>
+) {
+    const expectedUserCPUUsage = testOption?.userCpuUsage ?? 50
+    const foundUserCPUUsage = performanceMetrics.userCpuUsage
+
+    assert(
+        foundUserCPUUsage < expectedUserCPUUsage,
+        `Expected total user CPU usage for ${name} to be less than ${expectedUserCPUUsage}. Actual user CPU usage was ${foundUserCPUUsage}`
+    )
+
+    const expectedSystemCPUUsage = testOption?.systemCpuUsage ?? 20
+    const foundSystemCPUUsage = performanceMetrics.systemCpuUsage
+
+    assert(
+        foundSystemCPUUsage < expectedUserCPUUsage,
+        `Expected total system CPU usage for ${name} to be less than ${expectedSystemCPUUsage}. Actual system CPU usage was ${foundSystemCPUUsage}`
+    )
+
+    const expectedMemoryUsage = testOption?.heapTotal ?? 400
+    const foundMemoryUsage = performanceMetrics.heapTotal
+    assert(
+        foundMemoryUsage < expectedMemoryUsage,
+        `Expected total memory usage for ${name} to be less than ${expectedMemoryUsage}. Actual memory usage was ${foundMemoryUsage}`
+    )
+
+    const expectedDuration = testOption?.duration ?? 5
+    const foundDuration = performanceMetrics.duration
+    assert(
+        foundDuration < expectedDuration,
+        `Expected total duration for ${name} to be less than ${expectedDuration}. Actual duration was ${foundDuration}`
+    )
+}
+
+export function getEqualOSTestOptions(testOptions: Partial<PerformanceMetrics>): Partial<TestOptions> {
+    return {
+        linux: testOptions,
+        darwin: testOptions,
+        win32: testOptions,
+    }
+}
diff --git a/packages/core/src/shared/regions/endpoints.ts b/packages/core/src/shared/regions/endpoints.ts
new file mode 100644
index 00000000000..64a36143187
--- /dev/null
+++ b/packages/core/src/shared/regions/endpoints.ts
@@ -0,0 +1,132 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { getLogger } from '../logger/logger'
+
+// Parses the endpoints.json file into a usable structure
+
+export interface Endpoints {
+    partitions: Partition[]
+}
+
+export interface Partition {
+    dnsSuffix: string
+    id: string
+    name: string
+    regions: Region[]
+    services: Service[]
+}
+
+export interface Region {
+    /**
+     * Region Code
+     */
+    id: string
+    /**
+     * Friendly Name
+     */
+    name: string
+}
+
+export interface Service {
+    id: string
+    endpoints: ServiceEndpoints[]
+    isRegionalized?: boolean
+    partitionEndpoint?: string
+}
+
+export interface ServiceEndpoints {
+    regionId: string
+    data: any
+}
+
+// --- JSON Serialization Structures ---
+interface ManifestEndpoints {
+    partitions?: ManifestPartition[]
+}
+
+interface JsonStringMap<T> {
+    [key: string]: T
+}
+
+interface ManifestPartition {
+    dnsSuffix: string
+    partition: string
+    partitionName: string
+    regions?: JsonStringMap<ManifestRegion>
+    services?: JsonStringMap<ManifestService>
+}
+
+interface ManifestRegion {
+    description: string
+}
+
+interface ManifestService {
+    endpoints?: JsonStringMap<any>
+    isRegionalized?: boolean
+    partitionEndpoint?: string
+}
+
+// --- END JSON Serialization Structures ---
+
+export function loadEndpoints(json: string): Endpoints | undefined {
+    try {
+        const manifestEndpoints = JSON.parse(json) as ManifestEndpoints
+
+        return {
+            partitions: manifestEndpoints.partitions?.map(convertToPartition) ?? [],
+        }
+    } catch (err) {
+        const logger = getLogger()
+        logger.error('Failed to load endpoints manifest: %O', err as Error)
+        logger.verbose('endpoints payload was: %s', json)
+
+        return undefined
+    }
+}
+
+function convertToPartition(partition: ManifestPartition): Partition {
+    return {
+        dnsSuffix: partition.dnsSuffix,
+        id: partition.partition,
+        name: partition.partitionName,
+        regions: convertJsonMap(partition.regions, convertToRegion),
+        services: convertJsonMap(partition.services, convertToService),
+    }
+}
+
+function convertJsonMap<TIn, TOut>(
+    jsonMap: JsonStringMap<TIn> | undefined,
+    convertObject: (id: string, obj: TIn) => TOut
+): TOut[] {
+    if (!jsonMap) {
+        return []
+    }
+
+    return Object.keys(jsonMap).map((id) => convertObject(id, jsonMap[id]))
+}
+
+function convertToRegion(id: string, region: ManifestRegion): Region {
+    return {
+        id: id,
+        name: region.description,
+    }
+}
+
+function convertToService(id: string, service: ManifestService): Service {
+    return {
+        id: id,
+        isRegionalized: service.isRegionalized,
+        partitionEndpoint: service.partitionEndpoint,
+        endpoints: convertJsonMap(service.endpoints, convertToServiceEndpoint),
+    }
+}
+
+function convertToServiceEndpoint(id: string, data: any): ServiceEndpoints {
+    return {
+        regionId: id,
+        data: data,
+    }
+}
diff --git a/packages/core/src/shared/regions/regionProvider.ts b/packages/core/src/shared/regions/regionProvider.ts
new file mode 100644
index 00000000000..78852923d1d
--- /dev/null
+++ b/packages/core/src/shared/regions/regionProvider.ts
@@ -0,0 +1,217 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../extensionGlobals'
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as vscode from 'vscode'
+import { getLogger } from '../logger/logger'
+import { Endpoints, loadEndpoints, Region } from './endpoints'
+import { AwsContext } from '../awsContext'
+import { getIdeProperties, isAmazonQ } from '../extensionUtilities'
+import { ResourceFetcher } from '../resourcefetcher/resourcefetcher'
+import { isSsoConnection } from '../../auth/connection'
+import { Auth } from '../../auth/auth'
+
+export const defaultRegion = 'us-east-1'
+export const defaultPartition = 'aws'
+export const defaultDnsSuffix = 'amazonaws.com'
+
+interface RegionData {
+    dnsSuffix: string
+    partitionId: string
+    region: Region
+    serviceIds: string[]
+}
+
+export class RegionProvider {
+    private readonly regionData: Map<string, RegionData> = new Map()
+    private readonly onDidChangeEmitter = new vscode.EventEmitter<void>()
+    public readonly onDidChange = this.onDidChangeEmitter.event
+
+    private lastTouchedRegion?: string
+
+    public constructor(
+        endpoints: Endpoints = { partitions: [] },
+        private readonly awsContext: Pick<AwsContext, 'getCredentialDefaultRegion'> = globals.awsContext
+    ) {
+        this.loadFromEndpoints(endpoints)
+    }
+
+    public get defaultRegionId() {
+        return this.awsContext.getCredentialDefaultRegion() ?? defaultRegion
+    }
+
+    public get defaultPartitionId() {
+        return this.getPartitionId(this.defaultRegionId)
+    }
+
+    public isServiceInRegion(serviceId: string, regionId: string): boolean {
+        return !!this.regionData.get(regionId)?.serviceIds.find((x) => x === serviceId) ?? false
+    }
+
+    public getPartitionId(regionId: string): string | undefined {
+        const partitionId = this.regionData.get(regionId)?.partitionId
+
+        if (!partitionId) {
+            getLogger().warn(`Unable to determine the Partition that Region ${regionId} belongs to`)
+        }
+
+        return partitionId ?? undefined
+    }
+
+    public getDnsSuffixForRegion(regionId: string): string | undefined {
+        const dnsSuffix = this.regionData.get(regionId)?.dnsSuffix
+
+        if (!dnsSuffix) {
+            getLogger().warn(`Unable to find region data for: ${regionId}`)
+        }
+
+        return dnsSuffix ?? undefined
+    }
+
+    public getRegions(partitionId = this.defaultPartitionId): Region[] {
+        return [...this.regionData.values()]
+            .filter((region) => region.partitionId === partitionId)
+            .map((region) => region.region)
+    }
+
+    public getExplorerRegions(): string[] {
+        return globals.globalState.tryGet<string[]>('region', Object, [])
+    }
+
+    public async updateExplorerRegions(regions: string[]): Promise<void> {
+        return globals.globalState.update('region', Array.from(new Set(regions)))
+    }
+
+    /**
+     * @returns heuristic for default region based on
+     * last touched region in auth, explorer, wizard response.
+     */
+    public guessDefaultRegion(): string | undefined {
+        const conn = Auth.instance.activeConnection
+        if (isAmazonQ() && isSsoConnection(conn)) {
+            // Only the current auth region makes sense for Amazon Q use cases.
+            return conn.ssoRegion
+        }
+
+        if (conn?.type === 'sso') {
+            return conn.ssoRegion
+        }
+
+        const explorerRegions = this.getExplorerRegions()
+        if (explorerRegions.length === 1) {
+            return explorerRegions[0]
+        }
+
+        if (this.lastTouchedRegion) {
+            return this.lastTouchedRegion
+        }
+
+        const lastWizardResponse = globals.globalState.tryGet<Region>('lastSelectedRegion', Object)
+        if (lastWizardResponse && lastWizardResponse.id) {
+            return lastWizardResponse.id
+        }
+
+        return undefined
+    }
+
+    public setLastTouchedRegion(region: string | undefined) {
+        if (region) {
+            this.lastTouchedRegion = region
+        }
+    }
+
+    private loadFromEndpoints(endpoints: Endpoints) {
+        this.regionData.clear()
+        for (const partition of endpoints.partitions) {
+            for (const region of partition.regions) {
+                this.regionData.set(region.id, {
+                    dnsSuffix: partition.dnsSuffix,
+                    partitionId: partition.id,
+                    region: region,
+                    serviceIds: [],
+                })
+            }
+
+            for (const service of partition.services) {
+                for (const endpoint of service.endpoints) {
+                    const regionData = this.regionData.get(endpoint.regionId)
+
+                    if (regionData) {
+                        regionData.serviceIds.push(service.id)
+                    }
+                }
+            }
+        }
+        this.onDidChangeEmitter.fire()
+    }
+
+    /**
+     * @param endpointsProvider.local Retrieves endpoints manifest from local sources available to the toolkit. Expected
+     *                                to resolve fast, and is both a placeholder until the remote resources are loaded, and
+     *                                is a fallback in case the toolkit is unable to load a remote resource
+     * @param endpointsProvider.remote Retrieves endpoints manifest from remote host
+     */
+    public static fromEndpointsProvider(endpointsProvider: {
+        local: () => Endpoints | Promise<Endpoints>
+        remote: () => Endpoints | Promise<Endpoints>
+    }): RegionProvider {
+        const instance = new this()
+        void instance.init(endpointsProvider)
+        return instance
+    }
+
+    async init(endpointsProvider: {
+        local: () => Endpoints | Promise<Endpoints>
+        remote: () => Endpoints | Promise<Endpoints>
+    }) {
+        getLogger().info('endpoints: retrieving AWS endpoints data')
+
+        try {
+            this.loadFromEndpoints(await endpointsProvider.local())
+        } catch (err) {
+            getLogger().warn(`endpoints: failed to load from local source: %s`, err)
+        }
+
+        try {
+            this.loadFromEndpoints(await endpointsProvider.remote())
+        } catch (err) {
+            getLogger().warn(`endpoints: failed to load from remote source, region data may appear outdated: %s`, err)
+        }
+
+        if (this.getRegions().length === 0) {
+            void vscode.window.showErrorMessage(
+                `${localize(
+                    'AWS.error.endpoint.load.failure',
+                    'The {0} Toolkit was unable to load endpoints data.',
+                    getIdeProperties().company
+                )} ${localize(
+                    'AWS.error.impactedFunctionalityReset.vscode',
+                    'Toolkit functionality may be impacted until VS Code is restarted.'
+                )}`
+            )
+        }
+    }
+}
+
+export async function getEndpointsFromFetcher(
+    fetcher: ResourceFetcher<string> | ResourceFetcher<Response>
+): Promise<Endpoints> {
+    const contents = await fetcher.get()
+    const endpointsJson = typeof contents === 'string' ? contents : await contents?.text()
+    if (!endpointsJson) {
+        throw new Error('Failed to get resource')
+    }
+
+    const endpoints = loadEndpoints(endpointsJson)
+    if (!endpoints) {
+        throw new Error('Failed to load endpoints')
+    }
+
+    return endpoints
+}
diff --git a/packages/core/src/shared/remoteSession.ts b/packages/core/src/shared/remoteSession.ts
new file mode 100644
index 00000000000..b45bdb3ca9c
--- /dev/null
+++ b/packages/core/src/shared/remoteSession.ts
@@ -0,0 +1,278 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import { Settings } from '../shared/settings'
+import { showConfirmationMessage, showMessageWithCancel } from './utilities/messages'
+import { CancellationError, Timeout } from './utilities/timeoutUtils'
+import { isExtensionInstalled, showInstallExtensionMsg } from './utilities/vsCodeUtils'
+import { VSCODE_EXTENSION_ID, vscodeExtensionMinVersion } from './extensions'
+import { Err, Result } from '../shared/utilities/result'
+import { ToolkitError, UnknownError } from './errors'
+import { getLogger } from './logger/logger'
+import { getOrInstallCli } from './utilities/cliUtils'
+import { pushIf } from './utilities/collectionUtils'
+import { ChildProcess } from './utilities/processUtils'
+import { findSshPath, getVscodeCliPath } from './utilities/pathFind'
+import { IamClient } from './clients/iam'
+import { getIdeProperties } from './extensionUtilities'
+import { EvaluationResult } from '@aws-sdk/client-iam'
+
+const policyAttachDelay = 5000
+
+export enum RemoteSessionError {
+    ExtensionVersionTooLow = 'ExtensionVersionTooLow',
+    MissingExtension = 'MissingExtension',
+}
+
+export interface MissingTool {
+    readonly name: 'code' | 'ssm' | 'ssh'
+    readonly reason?: string
+}
+
+export const minimumSsmActions = [
+    'ssmmessages:CreateControlChannel',
+    'ssmmessages:CreateDataChannel',
+    'ssmmessages:OpenControlChannel',
+    'ssmmessages:OpenDataChannel',
+    'ssm:DescribeAssociation',
+    'ssm:ListAssociations',
+    'ssm:UpdateInstanceInformation',
+]
+
+export async function openRemoteTerminal(options: vscode.TerminalOptions, onClose: () => void) {
+    const timeout = new Timeout(60000)
+
+    await showMessageWithCancel('AWS: Starting session...', timeout, 1000)
+    await withoutShellIntegration(async () => {
+        const terminal = vscode.window.createTerminal(options)
+
+        const listener = vscode.window.onDidCloseTerminal((t) => {
+            if (t.processId === terminal.processId) {
+                vscode.Disposable.from(listener, { dispose: onClose }).dispose()
+            }
+        })
+
+        terminal.show()
+    }).finally(() => timeout.cancel())
+}
+
+/**
+ * VSC is logging args to the PTY host log file if shell integration is enabled :(
+ */
+async function withoutShellIntegration<T>(cb: () => T | Promise<T>): Promise<T> {
+    const userValue = Settings.instance.get('terminal.integrated.shellIntegration.enabled', Boolean)
+
+    try {
+        await Settings.instance.update('terminal.integrated.shellIntegration.enabled', false)
+        return await cb()
+    } finally {
+        await Settings.instance.update('terminal.integrated.shellIntegration.enabled', userValue)
+    }
+}
+
+interface DependencyPaths {
+    readonly vsc: string
+    readonly ssm: string
+    readonly ssh: string
+}
+
+export type EnvProvider = () => Promise<NodeJS.ProcessEnv>
+
+export interface VscodeRemoteConnection {
+    readonly sshPath: string
+    readonly vscPath: string
+    readonly hostname: string
+    readonly envProvider: EnvProvider
+    readonly SessionProcess: typeof ChildProcess
+}
+
+export async function ensureDependencies(): Promise<Result<DependencyPaths, CancellationError | Error>> {
+    try {
+        await ensureRemoteSshInstalled()
+    } catch (e) {
+        return Result.err(e as Error)
+    }
+
+    const tools = await ensureTools()
+    if (tools.isErr()) {
+        return await handleMissingTool(tools)
+    }
+
+    return tools
+}
+
+export async function ensureRemoteSshInstalled(): Promise<void> {
+    if (!isExtensionInstalled(VSCODE_EXTENSION_ID.remotessh, vscodeExtensionMinVersion.remotessh)) {
+        showInstallExtensionMsg(
+            VSCODE_EXTENSION_ID.remotessh,
+            'Remote SSH',
+            'Connecting to Dev Environment',
+            vscodeExtensionMinVersion.remotessh
+        )
+
+        if (isExtensionInstalled(VSCODE_EXTENSION_ID.remotessh)) {
+            throw new ToolkitError('Remote SSH extension version is too low', {
+                cancelled: true,
+                code: RemoteSessionError.ExtensionVersionTooLow,
+                details: { expected: vscodeExtensionMinVersion.remotessh },
+            })
+        } else {
+            throw new ToolkitError('Remote SSH extension not installed', {
+                cancelled: true,
+                code: RemoteSessionError.MissingExtension,
+            })
+        }
+    }
+}
+
+/**
+ * Checks if the SSM plugin CLI `session-manager-plugin` is available and
+ * working, else prompts user to install it.
+ *
+ * @returns Result object indicating whether the SSH config is working, or failure reason.
+ */
+async function ensureSsmCli() {
+    const r = await Result.promise(getOrInstallCli('session-manager-plugin', false))
+
+    return r.mapErr((e) => UnknownError.cast(e).message)
+}
+
+export async function ensureTools() {
+    const [vsc, ssh, ssm] = await Promise.all([getVscodeCliPath(), findSshPath(), ensureSsmCli()])
+
+    const missing: MissingTool[] = []
+    pushIf(missing, vsc === undefined, { name: 'code' })
+    pushIf(missing, ssh === undefined, { name: 'ssh' })
+
+    if (ssm.isErr()) {
+        missing.push({ name: 'ssm', reason: ssm.err() })
+    }
+
+    if (vsc === undefined || ssh === undefined || ssm.isErr()) {
+        return Result.err(missing)
+    }
+
+    return Result.ok({ vsc, ssh, ssm: ssm.ok() })
+}
+
+export async function handleMissingTool(tools: Err<MissingTool[]>) {
+    const missing = tools
+        .err()
+        .map((d) => d.name)
+        .join(', ')
+    const msg = localize(
+        'AWS.codecatalyst.missingRequiredTool',
+        'Failed to connect to Dev Environment, missing required tools: {0}',
+        missing
+    )
+
+    for (const d of tools.err()) {
+        if (d.reason) {
+            getLogger().error(`codecatalyst: failed to get tool "${d.name}": ${d.reason}`)
+        }
+    }
+
+    return Result.err(
+        new ToolkitError(msg, {
+            code: 'MissingTools',
+            details: { missing },
+        })
+    )
+}
+
+function getFormattedSsmActions() {
+    const formattedActions = minimumSsmActions.map((action) => `"${action}",\n`).reduce((l, r) => l + r)
+
+    return formattedActions.slice(0, formattedActions.length - 2)
+}
+
+/**
+ * Shows a progress message for adding inline policy to the role, then adds the policy.
+ * Importantly, it keeps the progress bar up for `policyAttachDelay` additional ms to allow permissions to propagate.
+ * If user cancels, it throws a CancellationError and stops the process from subsequently opening a connection.
+ * @param client IamClient to be use to add the permissions.
+ * @param roleArn Arn of the role the inline policy should be added to.
+ */
+async function addInlinePolicyWithDelay(client: IamClient, roleArn: string) {
+    const timeout = new Timeout(policyAttachDelay)
+    const message = `Adding Inline Policy to ${roleArn}`
+    await showMessageWithCancel(message, timeout)
+    await addSsmActionsToInlinePolicy(client, roleArn)
+
+    function delay(ms: number) {
+        return new Promise((resolve) => setTimeout(resolve, ms))
+    }
+
+    await delay(policyAttachDelay)
+    if (timeout.elapsedTime < policyAttachDelay) {
+        throw new CancellationError('user')
+    }
+    timeout.cancel()
+}
+
+export async function promptToAddInlinePolicy(client: IamClient, roleArn: string): Promise<boolean> {
+    const promptText = `${
+        getIdeProperties().company
+    } Toolkit will add required actions to role ${roleArn}:\n${getFormattedSsmActions()}`
+    const confirmation = await showConfirmationMessage({ prompt: promptText, confirm: 'Approve' })
+
+    if (confirmation) {
+        await addInlinePolicyWithDelay(client, roleArn)
+    }
+
+    return confirmation
+}
+
+async function addSsmActionsToInlinePolicy(client: IamClient, roleArn: string) {
+    const policyName = 'AWSVSCodeRemoteConnect'
+    const policyDocument = getSsmPolicyDocument()
+    await client.putRolePolicy(roleArn, policyName, policyDocument)
+}
+
+function getSsmPolicyDocument() {
+    return `{
+            "Version": "2012-10-17",
+            "Statement": {
+                "Effect": "Allow",
+                "Action": [
+                    ${getFormattedSsmActions()}
+                ],
+                "Resource": "*"
+                }
+            }`
+}
+
+export async function getDeniedSsmActions(client: IamClient, roleArn: string): Promise<EvaluationResult[]> {
+    const deniedActions = await client.getDeniedActions({
+        PolicySourceArn: roleArn,
+        ActionNames: minimumSsmActions,
+    })
+
+    return deniedActions
+}
+
+/**
+ * Creates a new {@link ChildProcess} class bound to a specific remote environment. All instances of this
+ * derived class will have SSM session information injected as environment variables as-needed.
+ */
+export function createBoundProcess(envProvider: EnvProvider): typeof ChildProcess {
+    type Run = ChildProcess['run']
+    return class SessionBoundProcess extends ChildProcess {
+        public override async run(...args: Parameters<Run>): ReturnType<Run> {
+            const options = args[0]
+            const envVars = await envProvider()
+            const spawnOptions = {
+                ...options?.spawnOptions,
+                env: { ...envVars, ...options?.spawnOptions?.env },
+            }
+
+            return super.run({ ...options, spawnOptions })
+        }
+    }
+}
diff --git a/packages/core/src/shared/request.ts b/packages/core/src/shared/request.ts
new file mode 100644
index 00000000000..827e3e3e445
--- /dev/null
+++ b/packages/core/src/shared/request.ts
@@ -0,0 +1,138 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import crossFetch from 'cross-fetch'
+
+const request = {
+    /**
+     * Make a fetch request.
+     *
+     * @example
+     * const request = fetch('GET', 'https://example.com')
+     * setTimeout(() => request.cancel(), 10_000)
+     * const response = await request.response
+     * const text = await response.text()
+     *
+     * @param wrappedFetch - The actual fetch implementation
+     */
+    fetch: function (
+        method: RequestMethod,
+        url: string,
+        params?: RequestParamsArg,
+        wrappedFetch = crossFetch
+    ): FetchRequest {
+        return new FetchRequest(url, { ...params, method }, wrappedFetch)
+    },
+}
+export default request
+
+type RequestMethod = 'GET' | 'POST' | 'PUT'
+/** All possible params of a fetch request (eg: headers) */
+type RequestParams = RequestInit
+/** The params of a fetch request that are allowed to be passed in as an argument by a caller. */
+type RequestParamsArg = Omit<RequestParams, 'method' | 'signal'>
+
+/**
+ * This object holds all of the required information to make a fetch request.
+ *
+ * Use {@link FetchRequest.response} to make the actual request and get the response.
+ */
+class FetchRequest {
+    #requestCanceller: AbortController | undefined
+
+    #url: string
+    #params: RequestParams
+    #wrappedFetch: typeof crossFetch
+
+    constructor(url: string, params: RequestParams = {}, wrappedFetch: typeof crossFetch) {
+        this.#url = url
+        this.#params = params
+        this.#wrappedFetch = wrappedFetch
+    }
+
+    /**
+     * The response of the fetch request.
+     *
+     * @throws {RequestError} If the request gets a non-successful response
+     * @throws {RequestCancelledError} If the request was cancelled before completion
+     */
+    get response(): Promise<Response> {
+        return new Promise(async (resolve, reject) => {
+            try {
+                // Setup cancellation ability
+                this.#requestCanceller = new AbortController()
+                const params = this.#makeRequestCancellable(this.#params, this.#requestCanceller)
+
+                // Make the actual request
+                const actualResponse = await this.#wrappedFetch(this.#url, params)
+
+                await this.#throwIfBadResponse(this.#params, actualResponse, this.#url)
+                this.#requestCanceller = undefined
+
+                resolve(actualResponse)
+            } catch (err) {
+                if (err instanceof Error && err.name === 'AbortError') {
+                    reject(new RequestCancelledError())
+                }
+                reject(err)
+            }
+        })
+    }
+
+    /**
+     * Cancels the request if in progress.
+     */
+    cancel() {
+        if (this.#requestCanceller === undefined) {
+            return
+        }
+        this.#requestCanceller.abort()
+        this.#requestCanceller = undefined
+    }
+
+    // ----- Private -----
+
+    #makeRequestCancellable(params: RequestParams, requestCanceller: AbortController): RequestParams {
+        return { ...params, signal: requestCanceller.signal }
+    }
+
+    async #throwIfBadResponse(request: RequestParams, response: Response, url: string) {
+        /**
+         * response.ok only returns true for 200-299.
+         * We need to explicitly allow 304 since it means the cached version is still valid
+         */
+        if (response.ok || response.status === 304) {
+            return
+        }
+
+        const code = response.status
+        const body = await response.text()
+        throw new RequestError({ url, code, body, request, response })
+    }
+}
+
+/** When a request results in a failed response. */
+export class RequestError extends Error {
+    code: number
+    body: string
+
+    request: RequestParams
+    response: Response
+
+    constructor(args: { url: string; code: number; body: string; request: RequestParams; response: Response }) {
+        const message = `"${args.request.method}" request failed with code "${args.code}" to "${args.url}": ${args.body}`
+        super(message)
+        this.code = args.code
+        this.body = args.body
+        this.request = args.request
+        this.response = args.response
+    }
+}
+
+export class RequestCancelledError extends Error {
+    constructor() {
+        super('Request cancelled')
+    }
+}
diff --git a/src/shared/resourcefetcher/fileResourceFetcher.ts b/packages/core/src/shared/resourcefetcher/fileResourceFetcher.ts
similarity index 76%
rename from src/shared/resourcefetcher/fileResourceFetcher.ts
rename to packages/core/src/shared/resourcefetcher/fileResourceFetcher.ts
index 6362a1edbf0..e228fbe3e59 100644
--- a/src/shared/resourcefetcher/fileResourceFetcher.ts
+++ b/packages/core/src/shared/resourcefetcher/fileResourceFetcher.ts
@@ -1,10 +1,10 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'fs-extra'
-import { getLogger, Logger } from '../logger'
+import fs from '../fs/fs'
+import { getLogger, Logger } from '../logger/logger'
 import { ResourceFetcher } from './resourcefetcher'
 
 export class FileResourceFetcher implements ResourceFetcher {
@@ -18,7 +18,7 @@ export class FileResourceFetcher implements ResourceFetcher {
     public async get(): Promise<string | undefined> {
         try {
             this.logger.verbose('loading file resource: "%s"', this.filepath)
-            return (await fs.readFile(this.filepath)).toString()
+            return await fs.readFileText(this.filepath)
         } catch (err) {
             this.logger.verbose('failed to load file resource: "%s": %s', this.filepath, (err as Error).message)
             return undefined
diff --git a/packages/core/src/shared/resourcefetcher/httpResourceFetcher.ts b/packages/core/src/shared/resourcefetcher/httpResourceFetcher.ts
new file mode 100644
index 00000000000..b79b673c74d
--- /dev/null
+++ b/packages/core/src/shared/resourcefetcher/httpResourceFetcher.ts
@@ -0,0 +1,173 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { VSCODE_EXTENSION_ID } from '../extensions'
+import { getLogger, Logger } from '../logger/logger'
+import { ResourceFetcher } from './resourcefetcher'
+import { Timeout, CancelEvent, waitUntil } from '../utilities/timeoutUtils'
+import request, { RequestError } from '../request'
+import { isUserCancelledError } from '../errors'
+
+type RequestHeaders = { eTag?: string; gZip?: boolean }
+
+export class HttpResourceFetcher implements ResourceFetcher<Response> {
+    private readonly logger: Logger = getLogger()
+
+    /**
+     *
+     * @param url URL to fetch a response body from via the `get` call
+     * @param params Additional params for the fetcher
+     * @param {boolean} params.showUrl Whether or not to the URL in log statements.
+     * @param {string} params.friendlyName If URL is not shown, replaces the URL with this text.
+     * @param {Timeout} params.timeout Timeout token to abort/cancel the request. Similar to `AbortSignal`.
+     * @param {number} params.retries The number of retries a get request should make if one fails
+     * @param {boolean} params.throwOnError True if we want to throw if there's request error, defaul to false
+     */
+    public constructor(
+        private readonly url: string,
+        private readonly params: {
+            showUrl: boolean
+            friendlyName?: string
+            timeout?: Timeout
+            throwOnError?: boolean
+        }
+    ) {
+        this.params.throwOnError = this.params.throwOnError ?? false
+    }
+
+    /**
+     * Returns the response of the resource, or undefined if the response failed could not be retrieved.
+     */
+    public get(): Promise<Response | undefined> {
+        this.logger.verbose(`downloading: ${this.logText()}`)
+        return this.downloadRequest()
+    }
+
+    /**
+     * Requests for new content but additionally uses the given E-Tag.
+     * If no E-Tag is given it behaves as a normal request.
+     *
+     * @param eTag
+     * @returns object with optional content. If content is undefined it implies the provided
+     *          E-Tag matched the server's, so no content was in response. E-Tag is the E-Tag
+     *          of the latest content
+     */
+    public async getNewETagContent(eTag?: string): Promise<{ content?: string; eTag: string }> {
+        const response = await this.getResponseFromGetRequest(this.params.timeout, { eTag, gZip: true })
+
+        const eTagResponse = response.headers.get('etag')
+        if (!eTagResponse) {
+            throw new Error(`This URL does not support E-Tags. Cannot use this function for: ${this.url.toString()}`)
+        }
+
+        // NOTE: Even with use of `gzip` encoding header, the response content is uncompressed.
+        // Most likely due to the http request library uncompressing it for us.
+        let contents: string | undefined = await response.text()
+        if (response.status === 304) {
+            // Explanation: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/If-None-Match
+            contents = undefined
+            this.logger.verbose(`E-Tag matched (${eTagResponse}). Download skipped: ${this.url}`)
+        } else {
+            this.logger.verbose(`E-Tag not matched. Downloaded: ${this.logText()}`)
+        }
+
+        return { content: contents, eTag: eTagResponse }
+    }
+
+    private async downloadRequest(): Promise<Response | undefined> {
+        try {
+            const resp = await this.getResponseFromGetRequest(this.params.timeout)
+            this.logger.verbose(`downloaded: ${this.logText()}`)
+            return resp
+        } catch (err) {
+            const error = err as RequestError
+            this.logger.verbose(
+                `Error downloading ${this.logText()}: %s`,
+                error.message ?? error.code ?? error.response.statusText ?? error.response.status
+            )
+            if (this.params.throwOnError) {
+                throw error
+            }
+            return undefined
+        }
+    }
+
+    private logText(): string {
+        return this.params.showUrl ? this.url : (this.params.friendlyName ?? 'resource from URL')
+    }
+
+    private logCancellation(event: CancelEvent) {
+        getLogger().debug(`Download for "${this.logText()}" ${event.agent === 'user' ? 'cancelled' : 'timed out'}`)
+    }
+
+    private async getResponseFromGetRequest(timeout?: Timeout, headers?: RequestHeaders): Promise<Response> {
+        return waitUntil(
+            () => {
+                const req = request.fetch('GET', this.url, {
+                    headers: this.buildRequestHeaders(headers),
+                })
+
+                const cancelListener = timeout?.token.onCancellationRequested((event) => {
+                    this.logCancellation(event)
+                    req.cancel()
+                })
+
+                return req.response.finally(() => cancelListener?.dispose())
+            },
+            {
+                timeout: 3000,
+                interval: 100,
+                backoff: 2,
+                retryOnFail: (error: Error) => {
+                    // Retry unless the user intentionally canceled the operation.
+                    return !isUserCancelledError(error)
+                },
+            }
+        )
+    }
+
+    private buildRequestHeaders(requestHeaders?: RequestHeaders): Headers {
+        const headers = new Headers()
+
+        headers.set('User-Agent', VSCODE_EXTENSION_ID.awstoolkit)
+
+        if (requestHeaders?.eTag !== undefined) {
+            headers.set('If-None-Match', requestHeaders.eTag)
+        }
+
+        if (requestHeaders?.gZip) {
+            headers.set('Accept-Encoding', 'gzip')
+        }
+
+        return headers
+    }
+}
+
+/**
+ * Retrieves JSON property value from a remote resource
+ * @param property property to retrieve
+ * @param url url of JSON resource
+ * @param fetcher optional HTTP resource fetcher to use
+ * @returns property value if available or undefined
+ */
+export async function getPropertyFromJsonUrl(
+    url: string,
+    property: string,
+    fetcher?: HttpResourceFetcher
+): Promise<any | undefined> {
+    const resourceFetcher = fetcher ?? new HttpResourceFetcher(url, { showUrl: true })
+    const resp = await resourceFetcher.get()
+    const result = await resp?.text()
+    if (result) {
+        try {
+            const json = JSON.parse(result)
+            if (json[property]) {
+                return json[property]
+            }
+        } catch (err) {
+            getLogger().error(`JSON parsing failed for "${url}": ${(err as Error).message}`)
+        }
+    }
+}
diff --git a/packages/core/src/shared/resourcefetcher/node/httpResourceFetcher.ts b/packages/core/src/shared/resourcefetcher/node/httpResourceFetcher.ts
new file mode 100644
index 00000000000..eea3f9038c4
--- /dev/null
+++ b/packages/core/src/shared/resourcefetcher/node/httpResourceFetcher.ts
@@ -0,0 +1,129 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as fs from 'fs' // eslint-disable-line no-restricted-imports
+import * as http from 'http'
+import * as https from 'https'
+import * as stream from 'stream'
+import got, { RequestError } from 'got'
+import urlToOptions from 'got/dist/source/core/utils/url-to-options'
+import Request from 'got/dist/source/core'
+import { VSCODE_EXTENSION_ID } from '../../extensions'
+import { getLogger, Logger } from '../../logger/logger'
+import { Timeout, CancellationError, CancelEvent } from '../../utilities/timeoutUtils'
+import { isCloud9 } from '../../extensionUtilities'
+import { Headers } from 'got/dist/source/core'
+
+// XXX: patched Got module for compatability with older VS Code versions (e.g. Cloud9)
+// `got` has also deprecated `urlToOptions`
+const patchedGot = got.extend({
+    request: (url, options, callback) => {
+        if (url.protocol === 'https:') {
+            return https.request({ ...options, ...urlToOptions(url) }, callback)
+        }
+        return http.request({ ...options, ...urlToOptions(url) }, callback)
+    },
+})
+
+/** Promise that resolves/rejects when all streams close. Can also access streams directly. */
+type FetcherResult = Promise<void> & {
+    /** Download stream piped to `fsStream`. */
+    requestStream: Request // `got` doesn't add the correct types to 'on' for some reason
+    /** Stream writing to the file system. */
+    fsStream: fs.WriteStream
+}
+
+type RequestHeaders = { eTag?: string; gZip?: boolean }
+
+/**
+ * Legacy HTTP Resource Fetcher used specifically for streaming information.
+ * Only kept around until web streams are compatible with node streams
+ */
+export class HttpResourceFetcher {
+    private readonly logger: Logger = getLogger()
+
+    /**
+     *
+     * @param url URL to fetch a response body from via the `get` call
+     * @param params Additional params for the fetcher
+     * @param {boolean} params.showUrl Whether or not to the URL in log statements.
+     * @param {string} params.friendlyName If URL is not shown, replaces the URL with this text.
+     * @param {function} params.onSuccess Function to execute on successful request. No effect if piping to a location.
+     * @param {Timeout} params.timeout Timeout token to abort/cancel the request. Similar to `AbortSignal`.
+     */
+    public constructor(
+        private readonly url: string,
+        private readonly params: {
+            showUrl: boolean
+            friendlyName?: string
+            timeout?: Timeout
+        }
+    ) {}
+
+    /**
+     * Returns the contents of the resource, or undefined if the resource could not be retrieved.
+     *
+     * @param pipeLocation Optionally pipe the download to a file system location
+     */
+    public get(pipeLocation: string): FetcherResult {
+        this.logger.verbose(`downloading: ${this.logText()}`)
+
+        const result = this.pipeGetRequest(pipeLocation, this.params.timeout)
+        result.fsStream.on('exit', () => {
+            this.logger.verbose(`downloaded: ${this.logText()}`)
+        })
+
+        return result
+    }
+
+    private logText(): string {
+        return this.params.showUrl ? this.url : (this.params.friendlyName ?? 'resource from URL')
+    }
+
+    private logCancellation(event: CancelEvent) {
+        getLogger().debug(`Download for "${this.logText()}" ${event.agent === 'user' ? 'cancelled' : 'timed out'}`)
+    }
+
+    // TODO: make pipeLocation a vscode.Uri
+    private pipeGetRequest(pipeLocation: string, timeout?: Timeout): FetcherResult {
+        const requester = isCloud9() ? patchedGot : got
+        const requestStream = requester.stream(this.url, { headers: this.buildRequestHeaders() })
+        const fsStream = fs.createWriteStream(pipeLocation)
+
+        const done = new Promise<void>((resolve, reject) => {
+            const pipe = stream.pipeline(requestStream, fsStream, (err) => {
+                if (err instanceof RequestError) {
+                    return reject(Object.assign(new Error('Failed to download file'), { code: err.code }))
+                }
+                err ? reject(err) : resolve()
+            })
+
+            const cancelListener = timeout?.token.onCancellationRequested((event) => {
+                this.logCancellation(event)
+                pipe.destroy(new CancellationError(event.agent))
+            })
+
+            pipe.on('close', () => cancelListener?.dispose())
+        })
+
+        return Object.assign(done, { requestStream, fsStream })
+    }
+
+    private buildRequestHeaders(requestHeaders?: RequestHeaders): Headers {
+        const headers: Headers = {}
+
+        headers['User-Agent'] = VSCODE_EXTENSION_ID.awstoolkit
+
+        if (requestHeaders?.eTag !== undefined) {
+            headers['If-None-Match'] = requestHeaders.eTag
+        }
+
+        if (requestHeaders?.gZip) {
+            headers['Accept-Encoding'] = 'gzip'
+        }
+
+        return headers
+    }
+}
diff --git a/packages/core/src/shared/resourcefetcher/resourcefetcher.ts b/packages/core/src/shared/resourcefetcher/resourcefetcher.ts
new file mode 100644
index 00000000000..8374be22675
--- /dev/null
+++ b/packages/core/src/shared/resourcefetcher/resourcefetcher.ts
@@ -0,0 +1,13 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// TODO: this is just a "thunk". Replace it with something more generic.
+export interface ResourceFetcher<T = string> {
+    /**
+     * Returns the contents of the resource, or undefined if the resource could not be retrieved.
+     * Implementations are expected to handle Errors.
+     */
+    get(): Promise<T | undefined>
+}
diff --git a/packages/core/src/shared/sam/activation.ts b/packages/core/src/shared/sam/activation.ts
new file mode 100644
index 00000000000..855dde39a29
--- /dev/null
+++ b/packages/core/src/shared/sam/activation.ts
@@ -0,0 +1,436 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import globals from '../extensionGlobals'
+
+import * as vscode from 'vscode'
+import { createNewSamApplication, resumeCreateNewSamApp } from '../../lambda/commands/createNewSamApp'
+import { SamParameterCompletionItemProvider } from '../../lambda/config/samParameterCompletionItemProvider'
+import * as codelensUtils from '../codelens/codeLensUtils'
+import * as csLensProvider from '../codelens/csharpCodeLensProvider'
+import * as javaLensProvider from '../codelens/javaCodeLensProvider'
+import * as pyLensProvider from '../codelens/pythonCodeLensProvider'
+import * as goLensProvider from '../codelens/goCodeLensProvider'
+import { SamTemplateCodeLensProvider } from '../codelens/samTemplateCodeLensProvider'
+import * as jsLensProvider from '../codelens/typescriptCodeLensProvider'
+import { ExtContext, VSCODE_EXTENSION_ID } from '../extensions'
+import { getIdeProperties, getIdeType } from '../extensionUtilities'
+import { getLogger } from '../logger/logger'
+import { PerfLog } from '../logger/perfLogger'
+import { NoopWatcher } from '../fs/watchedFiles'
+import { detectSamCli } from './cli/samCliDetection'
+import { CodelensRootRegistry } from '../fs/codelensRootRegistry'
+import { AWS_SAM_DEBUG_TYPE } from './debugger/awsSamDebugConfiguration'
+import { SamDebugConfigProvider } from './debugger/awsSamDebugger'
+import { addSamDebugConfiguration } from './debugger/commands/addSamDebugConfiguration'
+import { ToolkitPromptSettings } from '../settings'
+import { shared } from '../utilities/functionUtils'
+import { SamCliSettings } from './cli/samCliSettings'
+import { Commands } from '../vscode/commands2'
+import { runSync } from './sync'
+import { showExtensionPage } from '../utilities/vsCodeUtils'
+import { runDeploy } from './deploy'
+import { telemetry } from '../telemetry/telemetry'
+
+const sharedDetectSamCli = shared(detectSamCli)
+
+const supportedLanguages: {
+    [language: string]: codelensUtils.OverridableCodeLensProvider
+} = {}
+
+/**
+ * Activate SAM-related functionality.
+ */
+export async function activate(ctx: ExtContext): Promise<void> {
+    let didActivateCodeLensProviders = false
+    await createYamlExtensionPrompt()
+    const config = SamCliSettings.instance
+
+    // Do this "on-demand" because it is slow.
+    async function activateSlowCodeLensesOnce(): Promise<void> {
+        if (!didActivateCodeLensProviders) {
+            didActivateCodeLensProviders = true
+            const disposeable = await activateCodefileOverlays(ctx, config)
+            ctx.extensionContext.subscriptions.push(...disposeable)
+        }
+    }
+
+    if (config.get('enableCodeLenses', false)) {
+        await activateSlowCodeLensesOnce()
+    }
+
+    await registerCommands(ctx, config)
+    Commands.register('aws.addSamDebugConfig', async () => {
+        if (!didActivateCodeLensProviders) {
+            await activateSlowCodeLensesOnce()
+        }
+        await samDebugConfigCmd()
+    })
+
+    ctx.extensionContext.subscriptions.push(
+        activateSamYamlOverlays(),
+        vscode.debug.registerDebugConfigurationProvider(AWS_SAM_DEBUG_TYPE, new SamDebugConfigProvider(ctx))
+    )
+
+    ctx.extensionContext.subscriptions.push(
+        vscode.languages.registerCompletionItemProvider(
+            {
+                language: 'json',
+                scheme: 'file',
+                pattern: '**/.aws/parameters.json',
+            },
+            new SamParameterCompletionItemProvider(),
+            '"'
+        )
+    )
+
+    config.onDidChange(async (event) => {
+        switch (event.key) {
+            case 'location':
+                // This only shows a message (passive=true), does not set anything.
+                await sharedDetectSamCli({ passive: true, showMessage: true })
+                break
+            case 'enableCodeLenses':
+                if (config.get(event.key, false) && !didActivateCodeLensProviders) {
+                    await activateSlowCodeLensesOnce()
+                }
+                break
+            default:
+                break
+        }
+    })
+
+    const settings = SamCliSettings.instance
+    settings.onDidChange(({ key }) => {
+        if (key === 'legacyDeploy') {
+            telemetry.aws_modifySetting.run((span) => {
+                span.record({ settingId: 'sam_legacyDeploy' })
+                const state = settings.get('legacyDeploy')
+                span.record({ settingState: state ? 'Enabled' : 'Disabled' })
+            })
+        }
+    })
+
+    ctx.extensionContext.subscriptions.push(config)
+
+    if (globals.didReload) {
+        await resumeCreateNewSamApp(ctx)
+    }
+}
+
+async function registerCommands(ctx: ExtContext, settings: SamCliSettings): Promise<void> {
+    ctx.extensionContext.subscriptions.push(
+        Commands.register({ id: 'aws.samcli.detect', autoconnect: false }, () =>
+            sharedDetectSamCli({ passive: false, showMessage: true })
+        ),
+        Commands.register({ id: 'aws.lambda.createNewSamApp', autoconnect: false }, async () => {
+            await createNewSamApplication(ctx)
+        }),
+        Commands.register({ id: 'aws.addSamDebugConfiguration', autoconnect: false }, addSamDebugConfiguration),
+        Commands.register(
+            { id: 'aws.pickAddSamDebugConfiguration', autoconnect: false },
+            codelensUtils.pickAddSamDebugConfiguration
+        ),
+        Commands.register(
+            { id: 'aws.deploySamApplication', autoconnect: true },
+            async (arg) =>
+                // `arg` is one of :
+                //  - undefined
+                //  - regionNode (selected from AWS Explorer)
+                //  - Uri to template.yaml (selected from File Explorer)
+                //  - TreeNode (selected from AppBuilder)
+                await runDeploy(arg)
+        ),
+        Commands.register({ id: 'aws.toggleSamCodeLenses', autoconnect: false }, async () => {
+            const toggled = !settings.get('enableCodeLenses', false)
+            await settings.update('enableCodeLenses', toggled)
+        }),
+        Commands.register(
+            {
+                id: 'aws.samcli.sync',
+                autoconnect: true,
+            },
+            async (arg?, validate?: boolean) => await runSync('infra', arg, validate)
+        )
+    )
+}
+
+async function activateCodeLensRegistry(context: ExtContext) {
+    try {
+        const registry = new CodelensRootRegistry()
+        globals.codelensRootRegistry = registry
+
+        //
+        // "**/…" string patterns watch recursively across _all_ workspace
+        // folders (see documentation for addWatchPatterns()).
+        //
+        registry.addWatchPatterns([
+            pyLensProvider.pythonBasePattern,
+            jsLensProvider.javascriptBasePattern,
+            csLensProvider.csharpBasePattern,
+            goLensProvider.goBasePattern,
+            javaLensProvider.gradleBasePattern,
+            javaLensProvider.mavenBasePattern,
+        ])
+        await registry.rebuild()
+    } catch (e) {
+        void vscode.window.showErrorMessage(
+            localize(
+                'AWS.codelens.failToInitializeCode',
+                'Failed to activate Lambda handler {0}',
+                getIdeProperties().codelenses
+            )
+        )
+        getLogger().error('Failed to activate codelens registry %O', e)
+        // This prevents us from breaking for any reason later if it fails to load. Since
+        // Noop watcher is always empty, we will get back empty arrays with no issues.
+        globals.codelensRootRegistry = new NoopWatcher() as unknown as CodelensRootRegistry
+    }
+    context.extensionContext.subscriptions.push(globals.codelensRootRegistry)
+}
+
+async function samDebugConfigCmd() {
+    const activeEditor = vscode.window.activeTextEditor
+    if (!activeEditor) {
+        getLogger().error(`aws.addSamDebugConfig was called without an active text editor`)
+        void vscode.window.showErrorMessage(
+            localize('AWS.pickDebugHandler.noEditor', 'Toolkit could not find an active editor')
+        )
+
+        return
+    }
+    const document = activeEditor.document
+    const provider = supportedLanguages[document.languageId]
+    if (!provider) {
+        getLogger().error(`aws.addSamDebugConfig called on a document with an invalid language: ${document.languageId}`)
+        void vscode.window.showErrorMessage(
+            localize(
+                'AWS.pickDebugHandler.invalidLanguage',
+                'Toolkit cannot detect handlers in language: {0}',
+                document.languageId
+            )
+        )
+
+        return
+    }
+
+    // TODO: No reason for this to depend on the codelense provider (which scans the whole workspace and creates filewatchers).
+    const lenses = (await provider.provideCodeLenses(document, new vscode.CancellationTokenSource().token, true)) ?? []
+    await codelensUtils.invokeCodeLensCommandPalette(document, lenses)
+}
+
+/**
+ * Creates vscode.CodeLensProvider for SAM "template.yaml" files.
+ *
+ * Used for:
+ * 1. showing codelenses in SAM template.yaml files
+ */
+function activateSamYamlOverlays(): vscode.Disposable {
+    return vscode.languages.registerCodeLensProvider(
+        [
+            {
+                language: 'yaml',
+                scheme: 'file',
+                pattern: '**/*template.{yml,yaml}',
+            },
+        ],
+        new SamTemplateCodeLensProvider()
+    )
+}
+
+/**
+ * EXPENSIVE AND SLOW. Creates filewatchers and vscode.CodeLensProvider objects
+ * for codefiles (as opposed to SAM template.yaml files).
+ *
+ * Used for:
+ * 1. showing codelenses
+ * 2. "Add Local Invoke and Debug Configuration" command (TODO: remove dependency on
+ *    codelense provider (which scans the whole workspace and creates
+ *    filewatchers)).
+ */
+async function activateCodefileOverlays(
+    context: ExtContext,
+    configuration: SamCliSettings
+): Promise<vscode.Disposable[]> {
+    const perflog = new PerfLog('activateCodefileOverlays')
+    const disposables: vscode.Disposable[] = []
+    const tsCodeLensProvider = codelensUtils.makeTypescriptCodeLensProvider(configuration)
+    const pyCodeLensProvider = await codelensUtils.makePythonCodeLensProvider(configuration)
+    const javaCodeLensProvider = await codelensUtils.makeJavaCodeLensProvider(configuration)
+    const csCodeLensProvider = await codelensUtils.makeCSharpCodeLensProvider(configuration)
+    const goCodeLensProvider = await codelensUtils.makeGoCodeLensProvider(configuration)
+
+    // Ideally we should not need to `await` this Promise, but CodeLens providers are currently not implementing
+    // the event to notify on when their results change.
+    await activateCodeLensRegistry(context)
+
+    supportedLanguages[jsLensProvider.javascriptLanguage] = tsCodeLensProvider
+    supportedLanguages[pyLensProvider.pythonLanguage] = pyCodeLensProvider
+    supportedLanguages[javaLensProvider.javaLanguage] = javaCodeLensProvider
+    supportedLanguages[csLensProvider.csharpLanguage] = csCodeLensProvider
+    supportedLanguages[goLensProvider.goLanguage] = goCodeLensProvider
+    supportedLanguages[jsLensProvider.typescriptLanguage] = tsCodeLensProvider
+
+    disposables.push(vscode.languages.registerCodeLensProvider(jsLensProvider.typescriptAllFiles, tsCodeLensProvider))
+    disposables.push(vscode.languages.registerCodeLensProvider(pyLensProvider.pythonAllfiles, pyCodeLensProvider))
+    disposables.push(vscode.languages.registerCodeLensProvider(javaLensProvider.javaAllfiles, javaCodeLensProvider))
+    disposables.push(vscode.languages.registerCodeLensProvider(csLensProvider.csharpAllfiles, csCodeLensProvider))
+    disposables.push(vscode.languages.registerCodeLensProvider(goLensProvider.goAllfiles, goCodeLensProvider))
+
+    perflog.done()
+    return disposables
+}
+
+/**
+ * Creates a prompt (via toast) to guide users to installing the Red Hat YAML extension.
+ * This is necessary for displaying codelenses on templaye YAML files.
+ * Will show once per extension activation at most (all prompting triggers are disposed of on first trigger)
+ * Will not show if the YAML extension is installed or if a user has permanently dismissed the message.
+ */
+async function createYamlExtensionPrompt(): Promise<void> {
+    const settings = ToolkitPromptSettings.instance
+
+    /**
+     * Prompt the user to install the YAML plugin when AWSTemplateFormatVersion becomes available as a top level key
+     * in the document
+     * @param event An vscode text document change event
+     * @returns nothing
+     */
+    async function promptOnAWSTemplateFormatVersion(
+        event: vscode.TextDocumentChangeEvent,
+        yamlPromptDisposables: vscode.Disposable[]
+    ): Promise<void> {
+        for (const change of event.contentChanges) {
+            const changedLine = event.document.lineAt(change.range.start.line)
+            if (changedLine.text.includes('AWSTemplateFormatVersion')) {
+                await promptInstallYamlPlugin(yamlPromptDisposables)
+                return
+            }
+        }
+        return
+    }
+
+    // Show this only in VSCode since other VSCode-like IDEs (e.g. Theia) may
+    // not have a marketplace or contain the YAML plugin.
+    if (
+        settings.isPromptEnabled('yamlExtPrompt') &&
+        getIdeType() === 'vscode' &&
+        !vscode.extensions.getExtension(VSCODE_EXTENSION_ID.yaml)
+    ) {
+        // Disposed immediately after showing one, so the user isn't prompted
+        // more than once per session.
+        const yamlPromptDisposables: vscode.Disposable[] = []
+
+        // user opens a template file
+        vscode.workspace.onDidOpenTextDocument(
+            async (doc: vscode.TextDocument) => {
+                void promptInstallYamlPluginFromFilename(doc.fileName, yamlPromptDisposables)
+            },
+            undefined,
+            yamlPromptDisposables
+        )
+
+        // user swaps to an already-open template file that didn't have focus
+        vscode.window.onDidChangeActiveTextEditor(
+            async (editor: vscode.TextEditor | undefined) => {
+                await promptInstallYamlPluginFromEditor(editor, yamlPromptDisposables)
+            },
+            undefined,
+            yamlPromptDisposables
+        )
+
+        const promptNotifications = new Map<string, Promise<unknown>>()
+        vscode.workspace.onDidChangeTextDocument(
+            (event: vscode.TextDocumentChangeEvent) => {
+                const uri = event.document.uri.toString()
+                if (
+                    event.document.languageId === 'yaml' &&
+                    !vscode.extensions.getExtension(VSCODE_EXTENSION_ID.yaml) &&
+                    !promptNotifications.has(uri)
+                ) {
+                    promptNotifications.set(
+                        uri,
+                        promptOnAWSTemplateFormatVersion(event, yamlPromptDisposables).finally(() =>
+                            promptNotifications.delete(uri)
+                        )
+                    )
+                }
+            },
+            undefined,
+            yamlPromptDisposables
+        )
+
+        vscode.workspace.onDidCloseTextDocument((event: vscode.TextDocument) => {
+            promptNotifications.delete(event.uri.toString())
+        })
+
+        // user already has an open template with focus
+        // prescreen if a template.yaml is current open so we only call once
+        const openTemplateYamls = vscode.window.visibleTextEditors.filter((editor) => {
+            const fileName = editor.document.fileName
+            return fileName.endsWith('template.yaml') || fileName.endsWith('template.yml')
+        })
+
+        if (openTemplateYamls.length > 0) {
+            void promptInstallYamlPluginFromEditor(openTemplateYamls[0], yamlPromptDisposables)
+        }
+    }
+}
+
+async function promptInstallYamlPluginFromEditor(
+    editor: vscode.TextEditor | undefined,
+    disposables: vscode.Disposable[]
+): Promise<void> {
+    if (editor) {
+        void promptInstallYamlPluginFromFilename(editor.document.fileName, disposables)
+    }
+}
+
+/**
+ * Prompt user to install YAML plugin for template.yaml and template.yml files
+ * @param fileName File name to check against
+ * @param disposables List of disposables to dispose of when the filename is a template YAML file
+ */
+async function promptInstallYamlPluginFromFilename(fileName: string, disposables: vscode.Disposable[]): Promise<void> {
+    if (fileName.endsWith('template.yaml') || fileName.endsWith('template.yml')) {
+        void promptInstallYamlPlugin(disposables)
+    }
+}
+
+/**
+ * Show the install YAML extension prompt and dispose other listeners
+ * @param disposables
+ */
+async function promptInstallYamlPlugin(disposables: vscode.Disposable[]) {
+    // immediately dispose other triggers so it doesn't flash again
+    for (const prompt of disposables) {
+        prompt.dispose()
+    }
+    const settings = ToolkitPromptSettings.instance
+
+    const installBtn = localize('AWS.missingExtension.install', 'Install...')
+    const permanentlySuppress = localize('AWS.message.info.yaml.suppressPrompt', "Don't show again")
+
+    const response = await vscode.window.showInformationMessage(
+        localize(
+            'AWS.message.info.yaml.prompt',
+            'Install YAML extension for more {0} features in CloudFormation templates',
+            getIdeProperties().company
+        ),
+        installBtn,
+        permanentlySuppress
+    )
+
+    switch (response) {
+        case installBtn:
+            await showExtensionPage(VSCODE_EXTENSION_ID.yaml)
+            break
+        case permanentlySuppress:
+            await settings.disablePrompt('yamlExtPrompt')
+    }
+}
diff --git a/packages/core/src/shared/sam/build.ts b/packages/core/src/shared/sam/build.ts
new file mode 100644
index 00000000000..c8e81dce9f7
--- /dev/null
+++ b/packages/core/src/shared/sam/build.ts
@@ -0,0 +1,346 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { TemplateItem, createTemplatePrompter } from '../ui/sam/templatePrompter'
+import { ChildProcess } from '../utilities/processUtils'
+import { addTelemetryEnvVar } from './cli/samCliInvokerUtils'
+import { Wizard } from '../wizards/wizard'
+import { CloudFormationTemplateRegistry } from '../fs/templateRegistry'
+import { createExitPrompter } from '../ui/common/exitPrompter'
+import { DataQuickPickItem, createMultiPick, createQuickPick } from '../ui/pickerPrompter'
+import { createCommonButtons } from '../ui/buttons'
+import { samBuildParamUrl, samBuildUrl } from '../constants'
+import { CancellationError } from '../utilities/timeoutUtils'
+import { ToolkitError } from '../errors'
+import globals from '../extensionGlobals'
+import { TreeNode } from '../treeview/resourceTreeDataProvider'
+import { telemetry } from '../telemetry/telemetry'
+import { getSpawnEnv } from '../env/resolveEnv'
+import {
+    getErrorCode,
+    getProjectRoot,
+    getRecentResponse,
+    getSamCliPathAndVersion,
+    getTerminalFromError,
+    isDotnetRuntime,
+    updateRecentResponse,
+} from './utils'
+import { getConfigFileUri, validateSamBuildConfig } from './config'
+import { runInTerminal } from './processTerminal'
+import { buildMementoRootKey, buildProcessMementoRootKey, globalIdentifier } from './constants'
+import { SemVer } from 'semver'
+
+export interface BuildParams {
+    readonly template: TemplateItem
+    readonly projectRoot: vscode.Uri
+    readonly paramsSource: ParamsSource.Specify | ParamsSource.SamConfig | ParamsSource.DefaultValues
+    readonly buildFlags?: string
+}
+
+export enum ParamsSource {
+    Specify,
+    SamConfig,
+    DefaultValues,
+}
+
+export function createParamsSourcePrompter(existValidSamconfig: boolean) {
+    const items: DataQuickPickItem<ParamsSource>[] = [
+        {
+            label: 'Specify build flags',
+            data: ParamsSource.Specify,
+        },
+    ]
+
+    items.push(
+        existValidSamconfig
+            ? {
+                  label: 'Use default values from samconfig',
+                  data: ParamsSource.SamConfig,
+              }
+            : {
+                  label: 'Use default values',
+                  data: ParamsSource.DefaultValues,
+                  description: 'cached = true, parallel = true, use_container = true',
+              }
+    )
+
+    return createQuickPick(items, {
+        title: 'Specify parameter source for build',
+        placeholder: 'Select configuration options for sam build',
+        buttons: createCommonButtons(samBuildUrl),
+    })
+}
+
+const buildFlagItems: DataQuickPickItem<string>[] = [
+    {
+        label: 'Beta features',
+        data: '--beta-features',
+        description: 'Enable beta features',
+    },
+    {
+        label: 'Build in source',
+        data: '--build-in-source',
+        description: 'Opts in to build project in the source folder',
+    },
+    {
+        label: 'Cached',
+        data: '--cached',
+        description: 'Reuse build artifacts that have not changed from previous builds',
+    },
+    {
+        label: 'Debug',
+        data: '--debug',
+        description: 'Turn on debug logging to print debug messages and display timestamps',
+    },
+    {
+        label: 'Parallel',
+        data: '--parallel',
+        description: 'Enable parallel builds for AWS SAM template functions and layers',
+    },
+    {
+        label: 'Skip prepare infra',
+        data: '--skip-prepare-infra',
+        description: 'Skip preparation stage when there are no infrastructure changes',
+    },
+    {
+        label: 'Skip pull image',
+        data: '--skip-pull-image',
+        description: 'Skip pulling down the latest Docker image for Lambda runtime',
+    },
+    {
+        label: 'Use container',
+        data: '--use-container',
+        description: 'Build functions with an AWS Lambda-like container',
+    },
+    {
+        label: 'Save parameters',
+        data: '--save-params',
+        description: 'Save to samconfig.toml as default parameters',
+    },
+]
+export type SamBuildResult = {
+    isSuccess: boolean
+}
+
+export class BuildWizard extends Wizard<BuildParams> {
+    arg: TreeNode<unknown> | undefined
+    registry: CloudFormationTemplateRegistry
+    public constructor(
+        state: Partial<BuildParams>,
+        registry: CloudFormationTemplateRegistry,
+        arg?: TreeNode | undefined
+    ) {
+        super({ initState: state, exitPrompterProvider: createExitPrompter })
+        this.registry = registry
+        this.arg = arg
+        if (this.arg === undefined) {
+            // "Build" command was invoked on the command palette.
+            this.form.template.bindPrompter(() =>
+                createTemplatePrompter(this.registry, buildMementoRootKey, samBuildUrl)
+            )
+            this.form.projectRoot.setDefault(({ template }) => getProjectRoot(template))
+            this.form.paramsSource.bindPrompter(async ({ projectRoot }) => {
+                const existValidSamConfig: boolean | undefined = await validateSamBuildConfig(projectRoot)
+                return createParamsSourcePrompter(existValidSamConfig)
+            })
+        } else {
+            // "Build" command was invoked from build icon from sidebar
+            const templateUri = (this.arg.getTreeItem() as vscode.TreeItem).resourceUri
+            const templateItem = { uri: templateUri, data: {} } as TemplateItem
+            this.form.template.setDefault(templateItem)
+            this.form.projectRoot.setDefault(({ template }) => getProjectRoot(template))
+            this.form.paramsSource.bindPrompter(async ({ projectRoot }) => {
+                const existValidSamConfig: boolean | undefined = await validateSamBuildConfig(projectRoot)
+                return createParamsSourcePrompter(existValidSamConfig)
+            })
+            this.form.projectRoot.setDefault(() => getProjectRoot(templateItem))
+        }
+
+        this.form.buildFlags.bindPrompter(
+            () =>
+                createMultiPick(buildFlagItems, {
+                    title: 'Select build flags',
+                    buttons: createCommonButtons(samBuildParamUrl),
+                    ignoreFocusOut: true,
+                }),
+            {
+                showWhen: ({ paramsSource }) => paramsSource === ParamsSource.Specify,
+            }
+        )
+    }
+}
+
+/**
+ * Get build flags based on user selection
+ * @param paramsSource
+ * @param projectRoot
+ * @param defaultFlags
+ * @returns
+ */
+export async function getBuildFlags(
+    paramsSource: ParamsSource,
+    projectRoot: vscode.Uri,
+    defaultFlags: string[]
+): Promise<string[]> {
+    if (paramsSource === ParamsSource.SamConfig) {
+        try {
+            const samConfigFile = await getConfigFileUri(projectRoot)
+            return ['--config-file', samConfigFile.fsPath]
+        } catch (error) {
+            return defaultFlags
+        }
+    }
+    return defaultFlags
+}
+
+export async function runBuild(arg?: TreeNode): Promise<SamBuildResult> {
+    const source = arg ? 'AppBuilderBuild' : 'CommandPalette'
+    telemetry.record({ source: source })
+
+    // Prepare Build params
+    const buildParams: Partial<BuildParams> = {}
+
+    const registry = await globals.templateRegistry
+    const params = await new BuildWizard(buildParams, registry, arg).run()
+    if (params === undefined) {
+        throw new CancellationError('user')
+    }
+
+    throwIfTemplateIsBeingBuilt(params.template.uri.path)
+    await registerTemplateBuild(params.template.uri.path)
+
+    const projectRoot = params.projectRoot
+
+    const defaultFlags: string[] = ['--cached', '--parallel', '--save-params', '--use-container']
+
+    const { path: samCliPath, parsedVersion } = await getSamCliPathAndVersion()
+
+    // refactor
+    const buildFlags: string[] =
+        params.paramsSource === ParamsSource.Specify && params.buildFlags
+            ? await resolveBuildFlags(JSON.parse(params.buildFlags), parsedVersion)
+            : await getBuildFlags(params.paramsSource, projectRoot, defaultFlags)
+
+    // todo remove
+    if (await isDotnetRuntime(params.template.uri)) {
+        if (buildFlags.includes('--use-container')) {
+            buildFlags.push('--mount-with', 'WRITE')
+        }
+    }
+
+    const templatePath = params.template.uri.fsPath
+    buildFlags.push('--template', `${templatePath}`)
+
+    await updateRecentResponse(buildMementoRootKey, 'global', 'templatePath', templatePath)
+
+    try {
+        await vscode.window.withProgress(
+            {
+                cancellable: true,
+                location: vscode.ProgressLocation.Notification,
+            },
+            async (progress, token) => {
+                token.onCancellationRequested(async () => {
+                    throw new CancellationError('user')
+                })
+
+                progress.report({ message: `Building SAM template at ${params.template.uri.path}` })
+
+                // Create a child process to run the SAM build command
+                const buildProcess = new ChildProcess(samCliPath, ['build', ...buildFlags], {
+                    spawnOptions: await addTelemetryEnvVar({
+                        cwd: params.projectRoot.fsPath,
+                        env: await getSpawnEnv(process.env),
+                    }),
+                })
+
+                // Run SAM build in Terminal
+                await runInTerminal(buildProcess, 'build')
+            }
+        )
+
+        return {
+            isSuccess: true,
+        }
+    } catch (error) {
+        throw ToolkitError.chain(error, 'Failed to build SAM template', {
+            details: { terminal: getTerminalFromError(error), ...resolveBuildArgConflict(buildFlags) },
+            code: getErrorCode(error),
+        })
+    } finally {
+        await unregisterTemplateBuild(params.template.uri.path)
+    }
+}
+
+function resolveBuildArgConflict(boundArgs: string[]): string[] {
+    const boundArgsSet = new Set(boundArgs)
+    if (boundArgsSet.has('--watch')) {
+        boundArgsSet.delete('--no-watch')
+    }
+    if (boundArgsSet.has('--dependency-layer')) {
+        boundArgsSet.delete('--no--dependency-layer')
+    }
+    if (boundArgsSet.has('--use-container') || boundArgsSet.has('-u')) {
+        boundArgsSet.delete('--build-in-source')
+    }
+    if (boundArgsSet.has('--build-in-source')) {
+        boundArgsSet.delete('--no-build-in-source')
+    }
+
+    // TODO phase 2: add anti param
+    // apply anti param if param is not set
+    // if (!boundArgsSet.has('--cached')) {
+    //     boundArgsSet.add('--no-cached')
+    // }
+    // if (!boundArgsSet.has('--build-in-source')) {
+    //     boundArgsSet.add('--no-build-in-source')
+    // }
+    // if (!boundArgsSet.has('--beta-features')) {
+    //     boundArgsSet.add('--no-beta-features')
+    // }
+    return Array.from(boundArgsSet)
+}
+export async function resolveBuildFlags(buildFlags: string[], samCliVersion: SemVer | null): Promise<string[]> {
+    // --no-use-container was not added until v1.133.0
+    if (samCliVersion?.compare('1.133.0') ?? -1 < 0) {
+        return buildFlags
+    }
+    if (!buildFlags.includes('--use-container')) {
+        buildFlags.push('--no-use-container')
+    }
+    return buildFlags
+}
+
+/**
+ * Returns true if there's an ongoing build process for the provided template, false otherwise
+ * @Param templatePath The path to the template.yaml file
+ */
+function isBuildInProgress(templatePath: string): boolean {
+    const expirationDate = getRecentResponse(buildProcessMementoRootKey, globalIdentifier, templatePath)
+    if (expirationDate) {
+        return Date.now() < parseInt(expirationDate)
+    }
+    return false
+}
+
+/**
+ * Throws an error if there's a build in progress for the provided template
+ * @Param templatePath The path to the template.yaml file
+ */
+export function throwIfTemplateIsBeingBuilt(templatePath: string) {
+    if (isBuildInProgress(templatePath)) {
+        throw new ToolkitError('This template is already being built', { code: 'BuildInProgress' })
+    }
+}
+
+export async function registerTemplateBuild(templatePath: string) {
+    const expirationDate = Date.now() + 5 * 60 * 1000 // five minutes
+    await updateRecentResponse(buildProcessMementoRootKey, globalIdentifier, templatePath, expirationDate.toString())
+}
+
+export async function unregisterTemplateBuild(templatePath: string) {
+    await updateRecentResponse(buildProcessMementoRootKey, globalIdentifier, templatePath, undefined)
+}
diff --git a/src/shared/sam/cli/samCliBuild.ts b/packages/core/src/shared/sam/cli/samCliBuild.ts
similarity index 94%
rename from src/shared/sam/cli/samCliBuild.ts
rename to packages/core/src/shared/sam/cli/samCliBuild.ts
index 839ab646584..128249c09c1 100644
--- a/src/shared/sam/cli/samCliBuild.ts
+++ b/packages/core/src/shared/sam/cli/samCliBuild.ts
@@ -1,15 +1,15 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import { fileExists } from '../../filesystemUtilities'
-import { getLogger, Logger } from '../../logger'
+import { getLogger, Logger } from '../../logger/logger'
 import { logAndThrowIfUnexpectedExitCode, SamCliProcessInvoker } from './samCliInvokerUtils'
 import { pushIf } from '../../utilities/collectionUtils'
 import { localize } from '../../utilities/vsCodeUtils'
 import { Timeout, waitTimeout } from '../../utilities/timeoutUtils'
-import { ChildProcessResult } from '../../utilities/childProcess'
+import { ChildProcessResult } from '../../utilities/processUtils'
 import { dirname } from 'path'
 
 export interface SamCliBuildInvocationArguments {
@@ -40,6 +40,8 @@ export interface SamCliBuildInvocationArguments {
      * - false: Lambda will be built on local machine instead of in a Docker image.
      */
     useContainer?: boolean
+    /** sam cli "--mount-with" option. */
+    mountWith?: 'read' | 'write'
     /**
      * Specifies the name or id of an existing Docker network to Lambda Docker containers should connect to,
      * along with the default bridge network.
@@ -106,6 +108,7 @@ export class SamCliBuildInvocation {
         pushIf(invokeArgs, !!this.args.baseDir, '--base-dir', this.args.baseDir!)
         pushIf(invokeArgs, !!this.args.dockerNetwork, '--docker-network', this.args.dockerNetwork!)
         pushIf(invokeArgs, !!this.args.useContainer, '--use-container')
+        pushIf(invokeArgs, !!this.args.mountWith, '--mount-with', this.args.mountWith?.toUpperCase())
         pushIf(invokeArgs, !!this.args.skipPullImage, '--skip-pull-image')
         pushIf(invokeArgs, !!this.args.manifestPath, '--manifest', this.args.manifestPath!)
         pushIf(
diff --git a/src/shared/sam/cli/samCliContext.ts b/packages/core/src/shared/sam/cli/samCliContext.ts
similarity index 95%
rename from src/shared/sam/cli/samCliContext.ts
rename to packages/core/src/shared/sam/cli/samCliContext.ts
index 4bd99023c49..1416fe5f715 100644
--- a/src/shared/sam/cli/samCliContext.ts
+++ b/packages/core/src/shared/sam/cli/samCliContext.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/src/shared/sam/cli/samCliDeploy.ts b/packages/core/src/shared/sam/cli/samCliDeploy.ts
similarity index 95%
rename from src/shared/sam/cli/samCliDeploy.ts
rename to packages/core/src/shared/sam/cli/samCliDeploy.ts
index 741e0cda936..2bd805555e0 100644
--- a/src/shared/sam/cli/samCliDeploy.ts
+++ b/packages/core/src/shared/sam/cli/samCliDeploy.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/packages/core/src/shared/sam/cli/samCliDetection.ts b/packages/core/src/shared/sam/cli/samCliDetection.ts
new file mode 100644
index 00000000000..bdd50ea713a
--- /dev/null
+++ b/packages/core/src/shared/sam/cli/samCliDetection.ts
@@ -0,0 +1,94 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+import { samInstallUrl } from '../../constants'
+import { telemetry } from '../../telemetry/telemetry'
+import { SamCliSettings } from './samCliSettings'
+
+const localize = nls.loadMessageBundle()
+
+const learnMore = localize('AWS.samcli.userChoice.visit.install.url', 'Install SAM CLI')
+const browseToSamCli = localize('AWS.samcli.userChoice.browse', 'Locate SAM CLI...')
+const settingsUpdated = localize('AWS.samcli.detect.settings.updated', 'Settings updated.')
+
+/**
+ * Searches for SAM CLI on the system, updates the user setting if
+ * `passive=false`, and shows a message if `showMessage=true`.
+ *
+ * @param args.passive  Controls whether user setting is updated. Also sets the
+ * telemetry "passive" flag.
+ * @param args.showMessage true: always show message, false: never show
+ * message (except if SAM was not found)
+ */
+export async function detectSamCli(args: { passive: boolean; showMessage: boolean | undefined }): Promise<void> {
+    const config = SamCliSettings.instance
+    const isConfigured = '' !== config.get('location', '')
+
+    const sam = await config.getOrDetectSamCli(true)
+    const found = sam.path !== ''
+
+    // Update the user setting.
+    //
+    // NOTE: We must NOT _passively_ auto-update the user setting, that
+    // conflicts with VSCode "remote": each VSCode instance will update the
+    // setting based on its local environment, but the user settings are
+    // shared across VSCode instances...
+    const update = !args.passive && sam.autoDetected && sam.path && (await config.update('location', sam.path))
+
+    if (args.showMessage !== false || !found) {
+        if (!found) {
+            notifyUserSamCliNotDetected(config)
+        } else if (update && args.showMessage === true) {
+            void vscode.window.showInformationMessage(getSettingsUpdatedMessage(sam.path ?? '?'))
+        }
+    }
+
+    if (!args.passive) {
+        telemetry.sam_detect.emit({
+            passive: args.passive,
+            result: found ? 'Succeeded' : 'Failed',
+            ...(found ? {} : { reason: isConfigured ? 'SamCliInvalid' : 'SamCliNotFound' }),
+        })
+    }
+}
+
+function notifyUserSamCliNotDetected(SamCliSettings: SamCliSettings): void {
+    // inform the user, but don't wait for this to complete
+    void vscode.window
+        .showErrorMessage(
+            localize(
+                'AWS.samcli.error.notFound',
+                'Cannot find SAM CLI, which is required to create and debug SAM applications. If you have SAM CLI in a custom location, set the "aws.samcli.location" user setting.'
+            ),
+            learnMore,
+            browseToSamCli
+        )
+        .then(async (userResponse) => {
+            if (userResponse === learnMore) {
+                await vscode.commands.executeCommand('vscode.open', samInstallUrl)
+            } else if (userResponse === browseToSamCli) {
+                const location: vscode.Uri[] | undefined = await vscode.window.showOpenDialog({
+                    canSelectFiles: true,
+                    canSelectFolders: false,
+                    canSelectMany: false,
+                    openLabel: 'Set location in user settings',
+                })
+
+                if (!!location && location.length === 1) {
+                    const path: string = location[0].fsPath
+                    await SamCliSettings.update('location', path)
+                    void vscode.window.showInformationMessage(getSettingsUpdatedMessage(path))
+                }
+            }
+        })
+}
+
+function getSettingsUpdatedMessage(location: string): string {
+    const configuredLocation = localize('AWS.samcli.configured.location', 'SAM CLI Location: {0}', location)
+
+    return `${settingsUpdated} ${configuredLocation}`
+}
diff --git a/packages/core/src/shared/sam/cli/samCliInfo.ts b/packages/core/src/shared/sam/cli/samCliInfo.ts
new file mode 100644
index 00000000000..ededaa33c44
--- /dev/null
+++ b/packages/core/src/shared/sam/cli/samCliInfo.ts
@@ -0,0 +1,54 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { getLogger, Logger } from '../../logger/logger'
+import { mergeResolvedShellPath } from '../../env/resolveEnv'
+import { ChildProcess } from '../../utilities/processUtils'
+
+export interface SamCliInfoResponse {
+    version: string
+}
+
+export class SamCliInfoInvocation {
+    public constructor(private readonly samPath: string) {}
+
+    public async execute(): Promise<SamCliInfoResponse> {
+        const r = await new ChildProcess(this.samPath, ['--info'], { logging: 'no' }).run({
+            spawnOptions: { env: await mergeResolvedShellPath(process.env) },
+        })
+
+        if (r.exitCode !== 0) {
+            // getVersionValidatorResult() will return `SamCliVersionValidation.VersionNotParseable`.
+            return { version: '' }
+        }
+        const response = this.convertOutput(r.stdout)
+
+        if (!response) {
+            return { version: '' }
+        }
+
+        // Special case: fix sam cli "nightly" invalid semver version string.
+        // Example: "1.86.1.dev202306120901"
+        // https://github.com/aws/aws-sam-cli/releases/tag/sam-cli-nightly
+        response.version = response.version.replace(/.dev/, '-dev')
+
+        return response
+    }
+
+    /**
+     * Parses the output into a typed object with expected data
+     * @param text output from a `sam --info` call
+     */
+    protected convertOutput(text: string): SamCliInfoResponse | undefined {
+        const logger: Logger = getLogger()
+        try {
+            return JSON.parse(text) as SamCliInfoResponse
+        } catch (err) {
+            logger.error(err as Error)
+
+            return undefined
+        }
+    }
+}
diff --git a/src/shared/sam/cli/samCliInit.ts b/packages/core/src/shared/sam/cli/samCliInit.ts
similarity index 94%
rename from src/shared/sam/cli/samCliInit.ts
rename to packages/core/src/shared/sam/cli/samCliInit.ts
index 50475b09197..366c7539519 100644
--- a/src/shared/sam/cli/samCliInit.ts
+++ b/packages/core/src/shared/sam/cli/samCliInit.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Runtime } from 'aws-sdk/clients/lambda'
+import { Runtime } from '@aws-sdk/client-lambda'
 import { SchemaTemplateExtraContext } from '../../../eventSchemas/templates/schemasAppTemplateUtils'
 import { Architecture, DependencyManager } from '../../../lambda/models/samLambdaRuntime'
 import { getSamCliTemplateParameter, SamTemplate } from '../../../lambda/models/samTemplates'
diff --git a/src/shared/sam/cli/samCliInvoker.ts b/packages/core/src/shared/sam/cli/samCliInvoker.ts
similarity index 79%
rename from src/shared/sam/cli/samCliInvoker.ts
rename to packages/core/src/shared/sam/cli/samCliInvoker.ts
index 52ec990cde0..03d6fa249d4 100644
--- a/src/shared/sam/cli/samCliInvoker.ts
+++ b/packages/core/src/shared/sam/cli/samCliInvoker.ts
@@ -1,11 +1,12 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as logger from '../../logger'
-import { ChildProcess, ChildProcessResult } from '../../utilities/childProcess'
+import * as logger from '../../logger/logger'
+import { ChildProcess, ChildProcessResult } from '../../utilities/processUtils'
 import {
+    addTelemetryEnvVar,
     makeRequiredSamCliProcessInvokeOptions,
     SamCliProcessInvokeOptions,
     SamCliProcessInvoker,
@@ -35,6 +36,7 @@ export class DefaultSamCliProcessInvoker implements SamCliProcessInvoker {
         const invokeOptions = makeRequiredSamCliProcessInvokeOptions(options)
         const logging = options?.logging !== false
         const getLogger = logging ? logger.getLogger : logger.getNullLogger
+        const getDebugConsoleLogger = logging ? logger.getDebugConsoleLogger : logger.getNullLogger
         const log = getLogger()
 
         const sam = await this.context.getOrDetectSamCli()
@@ -47,19 +49,19 @@ export class DefaultSamCliProcessInvoker implements SamCliProcessInvoker {
         const samCommand = sam.path ? sam.path : 'sam'
         this.childProcess = new ChildProcess(samCommand, invokeOptions.arguments, {
             logging: options?.logging ? 'yes' : 'no',
-            spawnOptions: invokeOptions.spawnOptions,
+            spawnOptions: await addTelemetryEnvVar(options?.spawnOptions),
         })
 
-        getLogger('channel').info(localize('AWS.running.command', 'Command: {0}', `${this.childProcess}`))
+        getLogger().info(localize('AWS.running.command', 'Command: {0}', `${this.childProcess}`))
         log.verbose(`running: ${this.childProcess}`)
         return await this.childProcess.run({
             onStdout: (text, context) => {
-                getLogger('debugConsole').info(text)
+                getDebugConsoleLogger().info(text)
                 log.verbose(`stdout: ${text}`)
                 options?.onStdout?.(text, context)
             },
             onStderr: (text, context) => {
-                getLogger('debugConsole').info(text)
+                getDebugConsoleLogger().info(text)
                 log.verbose(`stderr: ${text}`)
                 options?.onStderr?.(text, context)
             },
diff --git a/packages/core/src/shared/sam/cli/samCliInvokerUtils.ts b/packages/core/src/shared/sam/cli/samCliInvokerUtils.ts
new file mode 100644
index 00000000000..a042d74215d
--- /dev/null
+++ b/packages/core/src/shared/sam/cli/samCliInvokerUtils.ts
@@ -0,0 +1,141 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { SpawnOptions } from 'child_process' // eslint-disable-line no-restricted-imports
+import { getLogger } from '../../logger/logger'
+import { getUserAgent } from '../../telemetry/util'
+import { ChildProcessResult, ChildProcessOptions } from '../../utilities/processUtils'
+import { ErrorInformation, ToolkitError } from '../../errors'
+import globals from '../../extensionGlobals'
+import { isAutomation } from '../../vscode/env'
+
+/** Generic SAM CLI invocation error. */
+export class SamCliError extends ToolkitError.named('SamCliError') {
+    public constructor(message?: string, info?: ErrorInformation) {
+        super(message ?? 'SAM CLI failed', { ...info, code: 'SamCliFailed' })
+    }
+}
+
+export interface SamCliProcessInvokeOptions {
+    spawnOptions?: SpawnOptions
+    arguments?: string[]
+    onStdout?: ChildProcessOptions['onStdout']
+    onStderr?: ChildProcessOptions['onStderr']
+    /** Log command invocations (default: true). */
+    logging?: boolean
+}
+
+export function makeRequiredSamCliProcessInvokeOptions(
+    options?: SamCliProcessInvokeOptions
+): Required<Omit<SamCliProcessInvokeOptions, 'channelLogger' | 'onStdout' | 'onStderr' | 'logging'>> {
+    options = options || {}
+
+    return {
+        spawnOptions: options.spawnOptions || {},
+        arguments: options.arguments || [],
+    }
+}
+
+export interface SamCliProcessInvoker {
+    invoke(options?: SamCliProcessInvokeOptions): Promise<ChildProcessResult>
+    stop(): void
+}
+
+export function makeUnexpectedExitCodeError(message: string): Error {
+    const msg = message ? message : 'SAM CLI failed'
+    return new SamCliError(msg)
+}
+
+export function logAndThrowIfUnexpectedExitCode(r: ChildProcessResult, expectedExitCode: number): void {
+    if (r.exitCode === expectedExitCode) {
+        return
+    }
+
+    const errIndented = r.stderr.replace(/\n/g, '\n    ').trim()
+    const outIndented = r.stdout.replace(/\n/g, '\n    ').trim()
+
+    getLogger().error(`SAM CLI failed (exitcode: ${r.exitCode}, expected ${expectedExitCode}): ${r.error?.message ?? ''}
+    stdout:
+    ${outIndented}
+    stderr:
+    ${errIndented}
+`)
+
+    const message = r.error instanceof Error ? r.error.message : collectSamErrors(r.stderr).join('\n')
+    throw makeUnexpectedExitCodeError(message)
+}
+
+/**
+ * Collect known error messages from sam cli output, so they can be surfaced to the user.
+ *
+ * @param samOutput SAM CLI output containing potential error messages
+ */
+export function collectSamErrors(samOutput: string): string[] {
+    const lines = samOutput.split('\n')
+    const matchedLines: string[] = []
+    const matchers = [matchSamError, matchAfterEscapeSeq]
+    for (const line of lines) {
+        for (const m of matchers) {
+            const match = m(line)
+            if (match && match.trim() !== '') {
+                matchedLines.push(match)
+                break // Skip remaining matchers, go to next line.
+            }
+        }
+    }
+    return matchedLines
+}
+
+/** All accepted escape sequences. */
+const yellowForeground = '[33m'
+const acceptedSequences = [yellowForeground]
+
+/** Returns text after a known escape sequence, or empty string. */
+function matchAfterEscapeSeq(text: string, sequences = acceptedSequences): string {
+    text = text.trim()
+    const escapeInDecimal = 27
+    if (text.codePointAt(0) !== escapeInDecimal) {
+        return ''
+    }
+
+    const remainingText = text.substring(1)
+    for (const seq of sequences) {
+        if (remainingText.startsWith(seq)) {
+            return remainingText.substring(seq.length).trim()
+        }
+    }
+    return ''
+}
+
+function matchSamError(text: string): string {
+    // These should be ordered by "specificity", to make the result more relevant for users.
+    const patterns = [
+        /\s*(Running.*requires Docker\.?)/,
+        /\s*(Docker.*not reachable\.?)/,
+        /\bError:\s*(.*)/, // Goes last because it is the least specific.
+    ]
+    for (const re of patterns) {
+        const match = text.match(re)
+        if (match?.[1]) {
+            // Capture group 1 is the first (…) group in the regex pattern.
+            return match[1].trim() // Return _only_ the matched text. The rest is noise.
+        }
+    }
+    return ''
+}
+
+export async function addTelemetryEnvVar(options: SpawnOptions | undefined): Promise<SpawnOptions> {
+    const telemetryEnabled = globals.telemetry.telemetryEnabled && !isAutomation()
+    // If AWS Toolkit telemetry was disabled, implicit dependencies (such as SAM CLI) should inherit that choice.
+    const samEnv = telemetryEnabled ? {} : { SAM_CLI_TELEMETRY: '0' }
+    return {
+        ...options,
+        env: {
+            AWS_TOOLING_USER_AGENT: getUserAgent({ includeClientId: false }),
+            ...samEnv,
+            ...options?.env,
+        },
+    }
+}
diff --git a/packages/core/src/shared/sam/cli/samCliListResources.ts b/packages/core/src/shared/sam/cli/samCliListResources.ts
new file mode 100644
index 00000000000..341a48c30d6
--- /dev/null
+++ b/packages/core/src/shared/sam/cli/samCliListResources.ts
@@ -0,0 +1,57 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { logAndThrowIfUnexpectedExitCode, SamCliProcessInvoker } from './samCliInvokerUtils'
+import { getSpawnEnv } from '../../env/resolveEnv'
+import { getLogger } from '../../logger/logger'
+
+export interface SamCliListResourcesParameters {
+    templateFile: string
+    stackName: string
+    region?: string
+    projectRoot?: vscode.Uri
+}
+
+export async function runSamCliListResource(
+    listStackResourcesArguments: SamCliListResourcesParameters,
+    invoker: SamCliProcessInvoker
+): Promise<any> {
+    const args = [
+        'list',
+        'resources',
+        '--template-file',
+        listStackResourcesArguments.templateFile,
+        '--stack-name',
+        listStackResourcesArguments.stackName,
+        '--output',
+        'json',
+    ]
+
+    if (listStackResourcesArguments.region) {
+        args.push('--region', listStackResourcesArguments.region)
+    }
+
+    try {
+        const childProcessResult = await invoker.invoke({
+            arguments: args,
+            spawnOptions: {
+                env: await getSpawnEnv(process.env),
+                cwd: listStackResourcesArguments.projectRoot?.fsPath,
+            },
+        })
+
+        logAndThrowIfUnexpectedExitCode(childProcessResult, 0)
+        return childProcessResult.stdout
+    } catch (error: any) {
+        const message = error.message
+        if (message.includes('does not exist on Cloudformation')) {
+            getLogger().info(message)
+        } else {
+            void vscode.window.showWarningMessage(`Failed to run SAM CLI list resources: ${message}`)
+        }
+        return []
+    }
+}
diff --git a/src/shared/sam/cli/samCliLocalInvoke.ts b/packages/core/src/shared/sam/cli/samCliLocalInvoke.ts
similarity index 77%
rename from src/shared/sam/cli/samCliLocalInvoke.ts
rename to packages/core/src/shared/sam/cli/samCliLocalInvoke.ts
index 7b4ca53dd64..c1e60ebcb41 100644
--- a/src/shared/sam/cli/samCliLocalInvoke.ts
+++ b/packages/core/src/shared/sam/cli/samCliLocalInvoke.ts
@@ -1,25 +1,28 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as child_process from 'child_process'
+import { SpawnOptions } from 'child_process' // eslint-disable-line no-restricted-imports
 import { pushIf } from '../../utilities/collectionUtils'
 import * as nls from 'vscode-nls'
-import { fileExists } from '../../filesystemUtilities'
-import { getLogger, Logger } from '../../logger'
-import { ChildProcess } from '../../utilities/childProcess'
+import { getLogger, getDebugConsoleLogger, Logger } from '../../logger/logger'
+import { ChildProcess } from '../../utilities/processUtils'
 import { Timeout } from '../../utilities/timeoutUtils'
 import { removeAnsi } from '../../utilities/textUtilities'
 import * as vscode from 'vscode'
 import globals from '../../extensionGlobals'
 import { SamCliSettings } from './samCliSettings'
+import { addTelemetryEnvVar, collectSamErrors, SamCliError } from './samCliInvokerUtils'
+import { fs } from '../../fs/fs'
+import { Runtime } from '@aws-sdk/client-lambda'
+import { getSamCliPathAndVersion } from '../utils'
+import { deprecatedRuntimes } from '../../../lambda/models/samLambdaRuntime'
 
 const localize = nls.loadMessageBundle()
 
 export const waitForDebuggerMessages = {
     PYTHON: 'Debugger waiting for client...',
-    PYTHON_IKPDB: 'IKP3db listening on',
     NODEJS: 'Debugger listening on',
     DOTNET: 'Waiting for the debugger to attach...',
     GO_DELVE: 'launching process with args', // Comes from https://github.com/go-delve/delve/blob/f5d2e132bca763d222680815ace98601c2396517/service/debugger/debugger.go#L187
@@ -29,7 +32,7 @@ export const waitForDebuggerMessages = {
 export interface SamLocalInvokeCommandArgs {
     command: string
     args: string[]
-    options?: child_process.SpawnOptions
+    options?: SpawnOptions
     /** Wait until strings specified in `debuggerAttachCues` appear in the process output.  */
     waitForCues: boolean
     timeout?: Timeout
@@ -58,8 +61,10 @@ export class DefaultSamLocalInvokeCommand implements SamLocalInvokeCommand {
     ) {}
 
     public async invoke({ options, ...params }: SamLocalInvokeCommandArgs): Promise<ChildProcess> {
-        const childProcess = new ChildProcess(params.command, params.args, { spawnOptions: options })
-        getLogger('channel').info('AWS.running.command', 'Command: {0}', `${childProcess}`)
+        const childProcess = new ChildProcess(params.command, params.args, {
+            spawnOptions: await addTelemetryEnvVar(options),
+        })
+        getLogger().info('AWS.running.command: Command: %O', childProcess)
         // "sam local invoke", "sam local start-api", etc.
         const samCommandName = `sam ${params.args[0]} ${params.args[1]}`
 
@@ -71,19 +76,19 @@ export class DefaultSamLocalInvokeCommand implements SamLocalInvokeCommand {
                     rejectOnError: true,
                     timeout: params.timeout,
                     onStdout: (text: string): void => {
-                        getLogger('debugConsole').info(text, { raw: true })
+                        getDebugConsoleLogger().info(text, { raw: true })
                         // If we have a timeout (as we do on debug) refresh the timeout as we receive text
                         params.timeout?.refresh()
                         this.logger.verbose('SAM: pid %d: stdout: %s', childProcess.pid(), removeAnsi(text))
                     },
                     onStderr: (text: string): void => {
-                        getLogger('debugConsole').error(text, { raw: true })
+                        getDebugConsoleLogger().info(text, { raw: true })
                         // If we have a timeout (as we do on debug) refresh the timeout as we receive text
                         params.timeout?.refresh()
                         this.logger.verbose('SAM: pid %d: stderr: %s', childProcess.pid(), removeAnsi(text))
                         if (checkForCues) {
                             // Look for messages like "Debugger attached" before returning back to caller
-                            if (this.debuggerAttachCues.some(cue => text.includes(cue))) {
+                            if (this.debuggerAttachCues.some((cue) => text.includes(cue))) {
                                 this.logger.verbose(
                                     `SAM: pid ${childProcess.pid()}: local SAM app is ready for debugger to attach`
                                 )
@@ -93,8 +98,8 @@ export class DefaultSamLocalInvokeCommand implements SamLocalInvokeCommand {
                         }
                     },
                 })
-                .catch(error => {
-                    getLogger('channel').error(
+                .catch((error) => {
+                    getLogger().error(
                         localize('AWS.samcli.error', 'Error running command "{0}": {1}', samCommandName, error.message)
                     )
                     reject(error)
@@ -119,16 +124,30 @@ export class DefaultSamLocalInvokeCommand implements SamLocalInvokeCommand {
                 if (code === 0) {
                     resolve()
                 } else if (code !== 0) {
-                    reject(new Error(`"${samCommandName}" command stopped (error code: ${code})`))
+                    const samErrors = collectSamErrors(result.stderr)
+                    if (samErrors.length > 0) {
+                        const e = new SamCliError(samErrors.join('\n'))
+                        reject(e)
+                    } else {
+                        reject(new Error(`"${samCommandName}" command stopped (error code: ${code})`))
+                    }
                 }
 
                 // Forces debugger to disconnect (sometimes it fails to disconnect on its own)
                 // Note that VSCode 1.42 only allows us to get the active debug session, so
                 // the user will have to manually disconnect if using multiple debug sessions
-                const debugSession: vscode.DebugSession | undefined = vscode.debug.activeDebugSession
+                const debugSession = vscode.debug.activeDebugSession
                 if (debugSession && debugSession.name === params.name) {
-                    getLogger().debug(`forcing debugger to disconnect: name=${debugSession.name}`)
-                    debugSession.customRequest('disconnect')
+                    getLogger().debug('forcing disconnect of debugger session "%s"', debugSession.name)
+                    debugSession.customRequest('disconnect').then(
+                        () => undefined,
+                        (e) =>
+                            getLogger().warn(
+                                'failed to disconnect debugger session "%s": %s',
+                                debugSession.name,
+                                (e as Error).message
+                            )
+                    )
                 }
             }
         })
@@ -199,6 +218,10 @@ export interface SamCliLocalInvokeInvocationArguments {
     extraArgs?: string[]
     /** Debug session name */
     name?: string
+    /** AWS region */
+    region?: string
+    /** Overrides the template-specified runtime. */
+    runtime?: Runtime
 }
 
 /**
@@ -213,7 +236,6 @@ export class SamCliLocalInvokeInvocation {
 
     public async execute(timeout?: Timeout): Promise<ChildProcess> {
         await this.validate()
-
         const sam = await this.config.getOrDetectSamCli()
         if (!sam.path) {
             getLogger().warn('SAM CLI not found and not configured')
@@ -239,6 +261,7 @@ export class SamCliLocalInvokeInvocation {
         pushIf(invokeArgs, !!this.args.debuggerPath, '--debugger-path', this.args.debuggerPath!)
         pushIf(invokeArgs, !!this.args.debugArgs, '--debug-args', ...(this.args.debugArgs ?? []))
         pushIf(invokeArgs, !!this.args.containerEnvFile, '--container-env-vars', this.args.containerEnvFile)
+        pushIf(invokeArgs, !!this.args.region, '--region', this.args.region)
 
         pushIf(
             invokeArgs,
@@ -248,6 +271,17 @@ export class SamCliLocalInvokeInvocation {
         )
         invokeArgs.push(...(this.args.extraArgs ?? []))
 
+        // Get samcli version
+        const { parsedVersion } = await getSamCliPathAndVersion()
+
+        // '--runtime' option for sam local invoke is only available in SAM CLI 1.135.0 and later
+        if ((parsedVersion?.compare('1.135.0') ?? -1) >= 0) {
+            // check if the runtime is valid (not deprecated)
+            if (this.args.runtime && !deprecatedRuntimes.has(this.args.runtime)) {
+                pushIf(invokeArgs, true, '--runtime', this.args.runtime)
+            }
+        }
+
         return await this.args.invoker.invoke({
             options: {
                 env: {
@@ -268,11 +302,11 @@ export class SamCliLocalInvokeInvocation {
             throw new Error('template resource name is missing or empty')
         }
 
-        if (!(await fileExists(this.args.templatePath))) {
+        if (!(await fs.exists(this.args.templatePath))) {
             throw new Error(`template path does not exist: ${this.args.templatePath}`)
         }
 
-        if (this.args.eventPath !== undefined && !(await fileExists(this.args.eventPath))) {
+        if (this.args.eventPath !== undefined && !(await fs.exists(this.args.eventPath))) {
             throw new Error(`event path does not exist: ${this.args.eventPath}`)
         }
     }
diff --git a/packages/core/src/shared/sam/cli/samCliLocator.ts b/packages/core/src/shared/sam/cli/samCliLocator.ts
new file mode 100644
index 00000000000..d71110cc45e
--- /dev/null
+++ b/packages/core/src/shared/sam/cli/samCliLocator.ts
@@ -0,0 +1,227 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as path from 'path'
+import { EnvironmentVariables } from '../../environmentVariables'
+import * as filesystemUtilities from '../../filesystemUtilities'
+import { getLogger, Logger } from '../../logger/logger'
+import { SamCliInfoInvocation } from './samCliInfo'
+import { DefaultSamCliValidator, SamCliValidatorContext, SamCliVersionValidation } from './samCliValidator'
+import { PerfLog } from '../../logger/perfLogger'
+import { tryRun } from '../../utilities/pathFind'
+import { mergeResolvedShellPath } from '../../env/resolveEnv'
+
+interface SamLocation {
+    path: string
+    version: string
+}
+export class SamCliLocationProvider {
+    private static samCliLocator: BaseSamCliLocator | undefined
+    protected static cachedSamLocation: SamLocation | undefined
+    private static samLocationValid: boolean = false
+
+    /** Checks that the given `sam` actually works by invoking `sam --version`. */
+    private static async isValidSamLocation(samPath: string) {
+        const isValid = await tryRun(samPath, ['--version'], 'no', 'SAM CLI')
+        this.samLocationValid = isValid
+        return isValid
+    }
+
+    /**
+     * Gets the last-found `sam` location, or searches the system if a working
+     * `sam` wasn't previously found and cached.
+     */
+    public async getLocation(forceSearch?: boolean): Promise<{ path: string; version: string } | undefined> {
+        const perflog = new PerfLog('samCliLocator: getLocation')
+        const cachedLoc = forceSearch ? undefined : SamCliLocationProvider.cachedSamLocation
+
+        // Avoid searching the system for `sam` (especially slow on Windows).
+        if (
+            cachedLoc &&
+            (SamCliLocationProvider.samLocationValid ||
+                (await SamCliLocationProvider.isValidSamLocation(cachedLoc.path)))
+        ) {
+            perflog.done()
+            return cachedLoc
+        }
+        SamCliLocationProvider.cachedSamLocation = await SamCliLocationProvider.getSamCliLocator().getLocation()
+        perflog.done()
+        return SamCliLocationProvider.cachedSamLocation
+    }
+
+    public static getSamCliLocator(): SamCliLocationProvider {
+        if (!SamCliLocationProvider.samCliLocator) {
+            if (process.platform === 'win32') {
+                SamCliLocationProvider.samCliLocator = new WindowsSamCliLocator()
+            } else {
+                SamCliLocationProvider.samCliLocator = new UnixSamCliLocator()
+            }
+        }
+
+        return SamCliLocationProvider.samCliLocator
+    }
+}
+
+abstract class BaseSamCliLocator {
+    /** Indicates that findFileInFolders() returned at least once. */
+    static didSearch = false
+    protected readonly logger: Logger = getLogger()
+
+    public constructor() {
+        this.verifyOs()
+    }
+
+    public async getLocation() {
+        let location = await this.findFileInFolders(this.getExecutableFilenames(), this.getExecutableFolders())
+
+        if (!location?.version) {
+            location = await this.getSystemPathLocation()
+        }
+
+        return location
+    }
+
+    protected abstract verifyOs(): void
+    protected abstract getExecutableFilenames(): string[]
+    protected abstract getExecutableFolders(): string[]
+
+    /**
+     * Searches for `sam` in various places and the $PATH.
+     *
+     * If only a broken `sam` is found it is returned with an empty `version`.
+     */
+    protected async findFileInFolders(files: string[], folders: string[]) {
+        // Keep the first found "sam" even if it is broken.
+        // This allows us to give a better message than "not found".
+        let brokenSam: string | undefined
+
+        const fullPaths: string[] = files
+            .map((file) => folders.filter((folder) => !!folder).map((folder) => path.join(folder, file)))
+            .reduce((accumulator, paths) => {
+                accumulator.push(...paths)
+
+                return accumulator
+            })
+
+        for (const fullPath of fullPaths) {
+            if (!BaseSamCliLocator.didSearch) {
+                this.logger.verbose(`samCliLocator: searching in: ${fullPath}`)
+            }
+            const context: SamCliValidatorContext = {
+                samCliLocation: async () => fullPath,
+                getSamCliInfo: async () => new SamCliInfoInvocation(fullPath).execute(),
+            }
+            const validator = new DefaultSamCliValidator(context)
+            if (await filesystemUtilities.fileExists(fullPath)) {
+                try {
+                    const validationResult = await validator.getVersionValidatorResult()
+                    if (validationResult.validation === SamCliVersionValidation.Valid) {
+                        BaseSamCliLocator.didSearch = true
+                        return { path: fullPath, version: validationResult.version }
+                    }
+                    this.logger.warn(
+                        `samCliLocator: found invalid SAM CLI (${validationResult.validation}): ${fullPath}`
+                    )
+                    brokenSam = brokenSam ?? fullPath
+                } catch (e) {
+                    const err = e as Error
+                    this.logger.error('samCliLocator failed: %s', err.message)
+                }
+            }
+        }
+
+        BaseSamCliLocator.didSearch = true
+        return brokenSam ? { path: brokenSam, version: '' } : undefined
+    }
+
+    /**
+     * Searches for `getExecutableFilenames()` in `$PATH` and returns the first
+     * path found on the filesystem, if any.
+     */
+    private async getSystemPathLocation() {
+        const envVars = (await mergeResolvedShellPath(process.env)) as EnvironmentVariables
+
+        if (envVars.PATH) {
+            const systemPaths: string[] = envVars.PATH.split(path.delimiter).filter((folder) => !!folder)
+
+            return await this.findFileInFolders(this.getExecutableFilenames(), systemPaths)
+        }
+
+        return undefined
+    }
+}
+
+class WindowsSamCliLocator extends BaseSamCliLocator {
+    // Do not access locationPaths directly. Use getExecutableFolders()
+    private static locationPaths: string[] | undefined
+
+    private static readonly executableFilenames: string[] = ['sam.cmd', 'sam.exe']
+
+    public constructor() {
+        super()
+    }
+
+    protected verifyOs(): void {
+        if (process.platform !== 'win32') {
+            throw new Error('Wrong platform')
+        }
+    }
+
+    protected getExecutableFilenames(): string[] {
+        return WindowsSamCliLocator.executableFilenames
+    }
+
+    protected getExecutableFolders(): string[] {
+        if (!WindowsSamCliLocator.locationPaths) {
+            WindowsSamCliLocator.locationPaths = []
+
+            const envVars = process.env as EnvironmentVariables
+
+            const programFiles = envVars.PROGRAMFILES
+            if (programFiles) {
+                WindowsSamCliLocator.locationPaths.push(String.raw`${programFiles}\Amazon\AWSSAMCLI\bin`)
+            }
+
+            const programFilesX86 = envVars['PROGRAMFILES(X86)']
+            if (programFilesX86) {
+                WindowsSamCliLocator.locationPaths.push(String.raw`${programFilesX86}\Amazon\AWSSAMCLI\bin`)
+            }
+        }
+
+        return WindowsSamCliLocator.locationPaths
+    }
+}
+
+class UnixSamCliLocator extends BaseSamCliLocator {
+    private static readonly locationPaths: string[] = [
+        '/opt/homebrew/bin',
+        '/usr/local/bin',
+        '/usr/bin',
+        // WEIRD BUT TRUE: brew installs to /home/linuxbrew/.linuxbrew if
+        // possible, else to ~/.linuxbrew.  https://docs.brew.sh/Homebrew-on-Linux
+        '/home/linuxbrew/.linuxbrew/bin',
+        `${process.env.HOME}/.linuxbrew/bin`,
+    ]
+
+    private static readonly executableFilenames: string[] = ['sam']
+
+    public constructor() {
+        super()
+    }
+
+    protected verifyOs(): void {
+        if (process.platform === 'win32') {
+            throw new Error('Wrong platform')
+        }
+    }
+
+    protected getExecutableFilenames(): string[] {
+        return UnixSamCliLocator.executableFilenames
+    }
+
+    protected getExecutableFolders(): string[] {
+        return UnixSamCliLocator.locationPaths
+    }
+}
diff --git a/src/shared/sam/cli/samCliPackage.ts b/packages/core/src/shared/sam/cli/samCliPackage.ts
similarity index 94%
rename from src/shared/sam/cli/samCliPackage.ts
rename to packages/core/src/shared/sam/cli/samCliPackage.ts
index 9e96bcd762e..2dbc7b90070 100644
--- a/src/shared/sam/cli/samCliPackage.ts
+++ b/packages/core/src/shared/sam/cli/samCliPackage.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/packages/core/src/shared/sam/cli/samCliRemoteTestEvent.ts b/packages/core/src/shared/sam/cli/samCliRemoteTestEvent.ts
new file mode 100644
index 00000000000..e17a5d49c9e
--- /dev/null
+++ b/packages/core/src/shared/sam/cli/samCliRemoteTestEvent.ts
@@ -0,0 +1,79 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { logAndThrowIfUnexpectedExitCode, SamCliProcessInvoker } from './samCliInvokerUtils'
+import path from 'path'
+import * as os from 'os'
+import { getSpawnEnv } from '../../env/resolveEnv'
+import { getLogger } from '../../../shared/logger/logger'
+
+export const TestEventsOperation = {
+    List: 'list',
+    Get: 'get',
+    Put: 'put',
+}
+export interface SamCliRemoteTestEventsParameters {
+    operation: string
+    functionArn?: string
+    name?: string
+    region?: string
+    eventSample?: string
+    projectRoot?: vscode.Uri
+    stackName?: string
+    logicalId?: string
+    force?: boolean
+}
+
+export async function runSamCliRemoteTestEvents(
+    remoteTestEventsParameters: SamCliRemoteTestEventsParameters,
+    invoker: SamCliProcessInvoker
+): Promise<string> {
+    const args = ['remote', 'test-event', remoteTestEventsParameters.operation]
+    if (remoteTestEventsParameters.stackName === '' && remoteTestEventsParameters.functionArn === '') {
+        getLogger().info('No remote test events found. This stack is not deployed.')
+        return 'No remote test events found. This stack is not deployed.'
+    }
+    if (remoteTestEventsParameters.functionArn) {
+        args.push(remoteTestEventsParameters.functionArn)
+    } else if (remoteTestEventsParameters.stackName && remoteTestEventsParameters.logicalId) {
+        args.push('--stack-name', remoteTestEventsParameters.stackName, remoteTestEventsParameters.logicalId)
+    }
+
+    if (remoteTestEventsParameters.region) {
+        args.push('--region', remoteTestEventsParameters.region)
+    }
+
+    if (remoteTestEventsParameters.name) {
+        args.push('--name', remoteTestEventsParameters.name)
+    }
+
+    if (remoteTestEventsParameters.operation === TestEventsOperation.Put && remoteTestEventsParameters.eventSample) {
+        const tempFileUri = vscode.Uri.file(path.join(os.tmpdir(), 'event-sample.json'))
+        const encoder = new TextEncoder()
+        await vscode.workspace.fs.writeFile(tempFileUri, encoder.encode(remoteTestEventsParameters.eventSample))
+        args.push('--file', tempFileUri.fsPath)
+
+        // Add --force flag when updating existing events
+        if (remoteTestEventsParameters.force) {
+            args.push('--force')
+        }
+    }
+
+    const childProcessResult = await invoker.invoke({
+        arguments: args,
+        spawnOptions: {
+            env: await getSpawnEnv(process.env),
+            cwd: remoteTestEventsParameters.projectRoot?.fsPath,
+        },
+    })
+
+    if (childProcessResult.stderr && childProcessResult.stderr.startsWith('Error: No events found for function')) {
+        return ''
+    }
+    logAndThrowIfUnexpectedExitCode(childProcessResult, 0)
+
+    return childProcessResult.stdout
+}
diff --git a/packages/core/src/shared/sam/cli/samCliSettings.ts b/packages/core/src/shared/sam/cli/samCliSettings.ts
new file mode 100644
index 00000000000..693c3edb234
--- /dev/null
+++ b/packages/core/src/shared/sam/cli/samCliSettings.ts
@@ -0,0 +1,124 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { getLogger } from '../../logger/logger'
+import { fromExtensionManifest, Settings } from '../../settings'
+import { stripUndefined, toRecord } from '../../utilities/collectionUtils'
+import { ClassToInterfaceType, keys } from '../../utilities/tsUtils'
+import { SamCliLocationProvider } from './samCliLocator'
+import { onceChanged } from '../../utilities/functionUtils'
+
+const localTimeoutDefaultMillis: number = 90000
+interface SavedBuckets {
+    [profile: string]: { [region: string]: string }
+}
+
+function SavedBuckets(value: unknown): SavedBuckets {
+    // Legacy code used to save data as strings
+    const buckets = typeof value === 'string' ? JSON.parse(value) : value
+
+    if (typeof buckets !== 'object' || !buckets) {
+        throw new TypeError('Value was not a non-null object')
+    }
+
+    const result = toRecord(keys(buckets), (k) => {
+        const v = buckets[k]
+
+        if (typeof v !== 'object' || !v) {
+            getLogger().warn(`Settings: removed invalid key "${k}" from saved buckets`)
+            return undefined
+        }
+
+        return toRecord(keys(v), (p) => {
+            const bucket = v[p]
+
+            if (typeof bucket !== 'string') {
+                getLogger().warn(`Settings: removed invalid key "${k}.${p}" from saved buckets`)
+                return undefined
+            }
+
+            return bucket
+        })
+    })
+
+    stripUndefined(result)
+
+    return result as SavedBuckets
+}
+
+const description = {
+    location: String,
+    lambdaTimeout: Number,
+    enableCodeLenses: Boolean,
+    manuallySelectedBuckets: SavedBuckets,
+    legacyDeploy: Boolean,
+}
+
+export class SamCliSettings extends fromExtensionManifest('aws.samcli', description) {
+    protected static readonly logIfChanged = onceChanged((s: string) => getLogger().info(s))
+
+    public constructor(
+        private readonly locationProvider = new SamCliLocationProvider(),
+        settings: ClassToInterfaceType<Settings> = Settings.instance
+    ) {
+        super(settings)
+    }
+
+    /**
+     * Gets location of `sam` from:
+     * 1. user config (if any)
+     * 2. previous location cached in `getLocation` (if valid)
+     * 3. system search (done by `getLocation`)
+     *
+     * @returns `autoDetected=true` if auto-detection was _attempted_.
+     */
+    public async getOrDetectSamCli(
+        forceSearch?: boolean
+    ): Promise<{ path: string | undefined; autoDetected: boolean }> {
+        const fromConfig = this.get('location', '')
+
+        if (fromConfig) {
+            SamCliSettings.logIfChanged(`SAM CLI location (from settings): ${fromConfig}`)
+            return { path: fromConfig, autoDetected: false }
+        }
+        const fromSearch = await this.locationProvider.getLocation(forceSearch)
+        SamCliSettings.logIfChanged(`SAM CLI location (version: ${fromSearch?.version}): ${fromSearch?.path}`)
+        return { path: fromSearch?.path, autoDetected: true }
+    }
+
+    public getSavedBuckets(): SavedBuckets | undefined {
+        try {
+            return this.get('manuallySelectedBuckets')
+        } catch (error) {
+            void this.delete('manuallySelectedBuckets')
+        }
+    }
+
+    /**
+     * Writes a single new saved bucket to the stored buckets setting, combining previous saved data
+     * if it exists. One saved bucket is limited per region per profile.
+     */
+    public async updateSavedBuckets(profile: string, region: string, bucket: string): Promise<boolean> {
+        const oldBuckets = this.getSavedBuckets()
+
+        return this.update('manuallySelectedBuckets', {
+            ...oldBuckets,
+            [profile]: {
+                ...(oldBuckets?.[profile] ?? {}),
+                [region]: bucket,
+            },
+        })
+    }
+
+    public getLocalInvokeTimeout(): number {
+        return this.get('lambdaTimeout', localTimeoutDefaultMillis)
+    }
+
+    static #instance: SamCliSettings
+
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+}
diff --git a/src/shared/sam/cli/samCliStartApi.ts b/packages/core/src/shared/sam/cli/samCliStartApi.ts
similarity index 92%
rename from src/shared/sam/cli/samCliStartApi.ts
rename to packages/core/src/shared/sam/cli/samCliStartApi.ts
index 402024e2369..3e0339ae258 100644
--- a/src/shared/sam/cli/samCliStartApi.ts
+++ b/packages/core/src/shared/sam/cli/samCliStartApi.ts
@@ -1,10 +1,10 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import { fileExists } from '../../filesystemUtilities'
-import { getLogger } from '../../logger'
+import { getLogger } from '../../logger/logger'
 import { pushIf } from '../../utilities/collectionUtils'
 
 export interface SamCliStartApiArguments {
@@ -55,13 +55,15 @@ export interface SamCliStartApiArguments {
     containerEnvFile?: string
     /** Debug session name */
     name?: string
+    /** AWS region */
+    region?: string
 }
 
 /**
  * Build and validate `sam local start-api` arguments
  */
 export async function buildSamCliStartApiArguments(args: SamCliStartApiArguments): Promise<string[]> {
-    args.skipPullImage = args.skipPullImage == true
+    args.skipPullImage = args.skipPullImage === true
 
     await validate(args.templatePath)
 
@@ -81,6 +83,7 @@ export async function buildSamCliStartApiArguments(args: SamCliStartApiArguments
     pushIf(invokeArgs, !!args.debuggerPath, '--debugger-path', args.debuggerPath!)
     pushIf(invokeArgs, !!args.debugArgs, '--debug-args', ...(args.debugArgs ?? []))
     pushIf(invokeArgs, !!args.containerEnvFile, '--container-env-vars', args.containerEnvFile)
+    pushIf(invokeArgs, !!args.region, '--region', args.region)
     pushIf(
         invokeArgs,
         !!args.parameterOverrides && args.parameterOverrides.length > 0,
diff --git a/packages/core/src/shared/sam/cli/samCliValidationNotification.ts b/packages/core/src/shared/sam/cli/samCliValidationNotification.ts
new file mode 100644
index 00000000000..45862c7ffd5
--- /dev/null
+++ b/packages/core/src/shared/sam/cli/samCliValidationNotification.ts
@@ -0,0 +1,163 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { openUrl, showExtensionPage } from '../../../shared/utilities/vsCodeUtils'
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+
+import { samInstallUrl } from '../../constants'
+import { getIdeProperties } from '../../extensionUtilities'
+import {
+    InvalidSamCliError,
+    InvalidSamCliVersionError,
+    maxSamCliVersionExclusive,
+    minSamCliVersion,
+    SamCliNotFoundError,
+    SamCliVersionValidation,
+    SamCliVersionValidatorResult,
+} from './samCliValidator'
+import { VSCODE_EXTENSION_ID } from '../../extensions'
+
+const localize = nls.loadMessageBundle()
+
+// Notification Actions
+export interface SamCliValidationNotificationAction {
+    label(): string
+    invoke(): Promise<void>
+}
+
+const actionGoToSamCli: SamCliValidationNotificationAction = {
+    label: () => localize('AWS.samcli.userChoice.visit.install.url', 'Install latest SAM CLI'),
+    invoke: async () => {
+        void openUrl(samInstallUrl)
+    },
+}
+
+const actionGoToVsCodeMarketplace: SamCliValidationNotificationAction = {
+    label: () =>
+        localize(
+            'AWS.samcli.userChoice.update.awstoolkit.url',
+            'Install latest {0} Toolkit',
+            getIdeProperties().company
+        ),
+    invoke: async () => {
+        void showExtensionPage(VSCODE_EXTENSION_ID.awstoolkit)
+    },
+}
+
+// Notifications
+export interface SamCliValidationNotification {
+    show(): Promise<void>
+}
+
+class DefaultSamCliValidationNotification implements SamCliValidationNotification {
+    public constructor(
+        private readonly message: string,
+        private readonly actions: SamCliValidationNotificationAction[]
+    ) {}
+
+    public async show(): Promise<void> {
+        const userResponse: string | undefined = await vscode.window.showErrorMessage(
+            this.message,
+            ...this.actions.map((action) => action.label())
+        )
+
+        if (userResponse) {
+            const responseActions: Promise<void>[] = this.actions
+                .filter((action) => action.label() === userResponse)
+                .map(async (action) => action.invoke())
+
+            await Promise.all(responseActions)
+        }
+    }
+}
+
+export async function notifySamCliValidation(samCliValidationError: InvalidSamCliError): Promise<void> {
+    if (!samCliValidationError) {
+        return
+    }
+
+    const notification = getInvalidSamMsg(samCliValidationError)
+    await notification.show()
+}
+
+export function getInvalidSamMsg(
+    samCliValidationError: InvalidSamCliError,
+    onCreateNotification: (
+        message: string,
+        actions: SamCliValidationNotificationAction[]
+    ) => SamCliValidationNotification = (message, actions): SamCliValidationNotification =>
+        new DefaultSamCliValidationNotification(message, actions)
+): SamCliValidationNotification {
+    if (samCliValidationError instanceof SamCliNotFoundError) {
+        return onCreateNotification(
+            localize(
+                'AWS.samcli.notification.not.found',
+                'Cannot find SAM CLI. It is required in order to work with Serverless Applications locally.'
+            ),
+            [actionGoToSamCli]
+        )
+    } else if (samCliValidationError instanceof InvalidSamCliVersionError) {
+        return onCreateNotification(
+            getInvalidVersionMsg(samCliValidationError.versionValidation),
+            getActions(samCliValidationError.versionValidation.validation)
+        )
+    } else {
+        return onCreateNotification(
+            localize(
+                'AWS.samcli.notification.unexpected.validation.issue',
+                'Unexpected error while validating SAM CLI: {0}',
+                samCliValidationError.message
+            ),
+            []
+        )
+    }
+}
+
+function getInvalidVersionMsg(validationResult: SamCliVersionValidatorResult): string {
+    const win185msg = localize(
+        'AWS.sam.updateSamWindows',
+        'SAM CLI 1.85-1.86 has [known issues](https://github.com/aws/aws-sam-cli/issues/5243) on Windows. Update SAM CLI.'
+    )
+    let recommendation: string
+
+    switch (validationResult.validation) {
+        case SamCliVersionValidation.VersionTooHigh:
+            recommendation = localize('AWS.sam.updateToolkit', 'Update {0} Toolkit.', getIdeProperties().company)
+            break
+        case SamCliVersionValidation.Version185Win:
+            return win185msg
+        case SamCliVersionValidation.VersionNotParseable: {
+            if (process.platform === 'win32') {
+                return win185msg
+            }
+            return localize('AWS.sam.installSam', 'SAM CLI failed to run.')
+        }
+        default:
+            recommendation = localize('AWS.sam.updateSam', 'Update SAM CLI.')
+            break
+    }
+
+    return localize(
+        'AWS.sam.invalid',
+        'SAM CLI {0} is not in required range ({1} ≤ version < {2}). {3}',
+        validationResult.version,
+        minSamCliVersion,
+        maxSamCliVersionExclusive,
+        recommendation
+    )
+}
+
+function getActions(validation: SamCliVersionValidation): SamCliValidationNotificationAction[] {
+    const actions: SamCliValidationNotificationAction[] = []
+
+    if (validation === SamCliVersionValidation.VersionTooHigh) {
+        actions.push(actionGoToVsCodeMarketplace)
+    } else {
+        actions.push(actionGoToSamCli)
+    }
+
+    return actions
+}
diff --git a/src/shared/sam/cli/samCliValidationUtils.ts b/packages/core/src/shared/sam/cli/samCliValidationUtils.ts
similarity index 82%
rename from src/shared/sam/cli/samCliValidationUtils.ts
rename to packages/core/src/shared/sam/cli/samCliValidationUtils.ts
index c9509bdfe43..abfbd0f7304 100644
--- a/src/shared/sam/cli/samCliValidationUtils.ts
+++ b/packages/core/src/shared/sam/cli/samCliValidationUtils.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -36,10 +36,13 @@ export function throwAndNotifyIfInvalid(validationResult: SamCliValidatorResult)
         throwIfInvalid(validationResult)
     } catch (err) {
         if (err instanceof InvalidSamCliError) {
+            // SAM not found.
             // Calling code does not wait for the notification to complete
-            notifySamCliValidation(err)
+            void notifySamCliValidation(err)
         }
 
+        // SAM found but version is invalid or failed to parse.
+        // code: 'InvalidSamCliVersion'
         throw err
     }
 }
diff --git a/packages/core/src/shared/sam/cli/samCliValidator.ts b/packages/core/src/shared/sam/cli/samCliValidator.ts
new file mode 100644
index 00000000000..83caaa5494a
--- /dev/null
+++ b/packages/core/src/shared/sam/cli/samCliValidator.ts
@@ -0,0 +1,131 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as semver from 'semver'
+import { ClassToInterfaceType } from '../../utilities/tsUtils'
+import { SamCliSettings } from './samCliSettings'
+import { SamCliInfoInvocation, SamCliInfoResponse } from './samCliInfo'
+import { ToolkitError } from '../../errors'
+
+export const minSamCliVersion = '0.47.0'
+export const minSamCliVersionForImageSupport = '1.13.0'
+export const maxSamCliVersionExclusive = '2.0.0'
+export const minSamCliVersionForGoSupport = '1.18.1'
+export const minSamCliVersionForArmSupport = '1.33.0'
+export const minSamCliVersionForAppBuilderSupport = '1.98.0'
+
+// Errors
+export class InvalidSamCliError extends ToolkitError {}
+
+export class SamCliNotFoundError extends InvalidSamCliError {
+    public constructor() {
+        super('SAM CLI was not found', { code: 'MissingSamCli' })
+    }
+}
+
+export class InvalidSamCliVersionError extends InvalidSamCliError {
+    public constructor(public versionValidation: SamCliVersionValidatorResult) {
+        super('SAM CLI has an invalid version', { code: 'InvalidSamCliVersion' })
+    }
+}
+
+// Validation
+export enum SamCliVersionValidation {
+    Valid = 'Valid',
+    VersionTooLow = 'VersionTooLow',
+    VersionTooHigh = 'VersionTooHigh',
+    VersionNotParseable = 'VersionNotParseable',
+    Version185Win = 'Version185Win',
+}
+
+export type SamCliVersionValidatorResult =
+    | {
+          readonly validation: Exclude<SamCliVersionValidation, SamCliVersionValidation.VersionNotParseable>
+          readonly version: string
+      }
+    | {
+          readonly validation: SamCliVersionValidation.VersionNotParseable
+          readonly version?: string | undefined
+      }
+
+export interface SamCliValidatorResult {
+    samCliFound: boolean
+    versionValidation?: SamCliVersionValidatorResult
+}
+
+export interface SamCliValidator {
+    detectValidSamCli(): Promise<SamCliValidatorResult>
+    getVersionValidatorResult(): Promise<SamCliVersionValidatorResult>
+}
+
+export type SamCliValidatorContext = ClassToInterfaceType<DefaultSamCliValidatorContext>
+
+export class DefaultSamCliValidator implements SamCliValidator {
+    public constructor(private readonly context: SamCliValidatorContext) {}
+
+    public async detectValidSamCli(): Promise<SamCliValidatorResult> {
+        const result: SamCliValidatorResult = {
+            samCliFound: false,
+        }
+
+        const sam = await this.context.samCliLocation()
+        if (sam) {
+            result.samCliFound = true
+            result.versionValidation = await this.getVersionValidatorResult()
+        }
+
+        return result
+    }
+
+    public async getVersionValidatorResult(): Promise<SamCliVersionValidatorResult> {
+        const r = await this.context.getSamCliInfo()
+        return {
+            version: r.version,
+            validation: DefaultSamCliValidator.validateSamCliVersion(r.version),
+        }
+    }
+
+    public static validateSamCliVersion(version?: string): SamCliVersionValidation {
+        if (!version) {
+            return SamCliVersionValidation.VersionNotParseable
+        }
+
+        if (!semver.valid(version)) {
+            return SamCliVersionValidation.VersionNotParseable
+        }
+
+        if (semver.lt(version, minSamCliVersion)) {
+            return SamCliVersionValidation.VersionTooLow
+        }
+
+        if (semver.gte(version, maxSamCliVersionExclusive)) {
+            return SamCliVersionValidation.VersionTooHigh
+        }
+
+        if (process.platform === 'win32' && semver.gte(version, '1.85.0') && semver.lte(version, '1.86.0')) {
+            return SamCliVersionValidation.Version185Win
+        }
+
+        return SamCliVersionValidation.Valid
+    }
+}
+
+export class DefaultSamCliValidatorContext implements SamCliValidatorContext {
+    public constructor(private readonly config: SamCliSettings) {}
+
+    public async samCliLocation(): Promise<string | undefined> {
+        return (await this.config.getOrDetectSamCli()).path
+    }
+
+    public async getSamCliInfo(): Promise<SamCliInfoResponse> {
+        const samPath = await this.samCliLocation()
+        if (!samPath) {
+            throw new Error('Unable to get SAM CLI info without an executable path')
+        }
+        const samCliInfo = new SamCliInfoInvocation(samPath)
+
+        return await samCliInfo.execute()
+    }
+}
diff --git a/packages/core/src/shared/sam/config.ts b/packages/core/src/shared/sam/config.ts
new file mode 100644
index 00000000000..4a961956fde
--- /dev/null
+++ b/packages/core/src/shared/sam/config.ts
@@ -0,0 +1,236 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import fs from '../fs/fs'
+import { JsonMap, parse, stringify } from '@iarna/toml'
+import { cast, Optional } from '../utilities/typeConstructors'
+import { getLogger } from '../logger/logger'
+import { ToolkitError } from '../errors'
+
+export interface Config {
+    readonly environments: Record<string, Omit<Environment, 'name'>>
+}
+
+export interface Environment {
+    readonly name: string
+    readonly commands: Record<string, Omit<Command, 'name'> | undefined>
+}
+
+interface Command {
+    readonly name: string
+    readonly parameters?: Record<string, unknown>
+}
+
+enum DeployType {
+    Deploy,
+    Sync,
+    Build,
+}
+
+// This only handles a subset of possible user configs
+// `@iarna/toml@2.25` supports 0.5.0 of the spec while SAM CLI 1.67.0 supports 1.0.0
+// In practive this is likely good enough for the vast majority of users
+export async function parseConfig(contents: string): Promise<Config> {
+    const data = await parse.async(contents)
+    const objs = Object.entries(data).filter(([_, v]) => typeof v === 'object') as [string, Record<string, unknown>][]
+    const environments = {} as Config['environments']
+    for (const [k, v] of objs) {
+        environments[k] = parseEnvironment(v)
+    }
+
+    return { environments }
+}
+
+function parseEnvironment(section: Record<string, unknown>): Omit<Environment, 'name'> {
+    const objs = Object.entries(section).filter(([_, v]) => typeof v === 'object') as [
+        string,
+        Record<string, unknown>,
+    ][]
+    const commands = {} as Environment['commands']
+    for (const [k, v] of objs) {
+        commands[k] = parseCommand(v)
+    }
+
+    return { commands }
+}
+
+function parseCommand(section: Record<string, unknown>): Omit<Command, 'name'> {
+    return { parameters: cast(section['parameters'], Optional(Object)) }
+}
+
+export enum SamConfigErrorCode {
+    samNoConfigFound = 'samNoConfigFound',
+    samConfigParseError = 'samConfigParseError',
+    samNoProjectRootFound = 'samNoProjectRootFound',
+}
+
+export class SamConfig {
+    public constructor(
+        public readonly location: vscode.Uri,
+        private readonly config: Config = { environments: {} }
+    ) {}
+
+    public getCommand(command: string, targetEnv = 'default') {
+        const env = this.config.environments[targetEnv]
+        return env?.commands[command]
+    }
+
+    public getCommandParam(command: string, key: string, targetEnv = 'default'): unknown {
+        const primarySection = this.getCommand(command, targetEnv)
+        const globalSection = this.getCommand('global', targetEnv)
+        return primarySection?.parameters?.[key] ?? globalSection?.parameters?.[key]
+    }
+
+    /**
+     * @description Finds samconfig.toml file under the provided project folder
+     * @param projectRoot The root folder of the application project
+     * @returns The SamConfig object
+     */
+    public static async fromProjectRoot(projectRoot: vscode.Uri) {
+        if (!projectRoot) {
+            throw new ToolkitError('No project folder found', { code: SamConfigErrorCode.samNoProjectRootFound })
+        }
+        const uri = await getConfigFileUri(projectRoot)
+        return this.fromConfigFileUri(uri)
+    }
+
+    /**
+     * @description Parse Samconfig content in samconfig.toml
+     * @param uri The vscode uri of samconfig.toml
+     * @returns The SamConfig object
+     */
+    public static async fromConfigFileUri(uri: vscode.Uri) {
+        try {
+            const contents = await fs.readFileText(uri)
+            const config = await parseConfig(contents)
+            return new this(uri, config)
+        } catch (error) {
+            throw new ToolkitError(`Error parsing samconfig.toml: ${error}`, {
+                code: SamConfigErrorCode.samConfigParseError,
+            })
+        }
+    }
+
+    public listEnvironments(): Environment[] {
+        const envs = this.config.environments
+
+        return Object.entries(envs).map(([name, data]) => ({ name, ...data }))
+    }
+}
+
+function generateConfigFileName(projectRoot: vscode.Uri) {
+    return vscode.Uri.joinPath(projectRoot, 'samconfig.toml')
+}
+
+/**
+ * @description Finds the samconfig.toml file under the provided project folder
+ * @param projectRoot The root folder of the application project
+ * @returns The URI of the samconfig.toml file
+ */
+export async function getConfigFileUri(projectRoot: vscode.Uri) {
+    const path = generateConfigFileName(projectRoot)
+    if (!(await fs.exists(path.fsPath))) {
+        getLogger().warn('No samconfig.toml found')
+        throw new ToolkitError(`No samconfig.toml file found in ${projectRoot.fsPath}`, {
+            code: SamConfigErrorCode.samNoConfigFound,
+        })
+    }
+    return path
+}
+
+/**
+ * @description Overwrite stack name and region information to samconfig.toml file.
+ *              If samconfig.toml file doesn't exist, create a new one.
+ * @param projectRoot The root folder of the application project
+ * @param stackName The name of the stack
+ * @param region The region of the stack
+ */
+export async function writeSamconfigGlobal(projectRoot: vscode.Uri, stackName: string, region: string) {
+    const path = vscode.Uri.joinPath(projectRoot, 'samconfig.toml')
+    if (!(await fs.exists(path))) {
+        getLogger().warn('No samconfig.toml found, creating...')
+        const data = { default: { global: { parameters: { stack_name: stackName, region: region } } } }
+        return createNewConfigFile(projectRoot, data)
+    }
+    const contents = await fs.readFileText(path)
+    const data = await parse.async(contents)
+    if (data.default) {
+        const defaultEnv = data.default as { global?: { parameters?: Record<string, unknown> } }
+        if (defaultEnv.global) {
+            if (defaultEnv.global.parameters) {
+                defaultEnv.global.parameters.stack_name = stackName
+                defaultEnv.global.parameters.region = region
+            }
+        } else {
+            defaultEnv.global = { parameters: { stack_name: stackName, region: region } }
+        }
+    }
+    const obj = stringify(data)
+    await fs.writeFile(path, obj)
+}
+
+/**
+ * @description Create a new samconfig.toml file under the provided project folder. 
+ *              This will overwrite the existing file.
+
+ * @param projectRoot The root folder of the application project
+ * @param data The data to be written to the new samconfig.toml file
+ */
+export async function createNewConfigFile(projectRoot: vscode.Uri, data: JsonMap) {
+    const path = generateConfigFileName(projectRoot)
+    await fs.writeFile(path, 'version = 0.1\n\n')
+    await fs.appendFile(path, stringify(data))
+}
+
+async function validateAppBuilderSamConfig(
+    projectRoot: vscode.Uri | undefined,
+    configType: DeployType
+): Promise<boolean> {
+    if (!projectRoot) {
+        return false
+    }
+
+    let content
+    try {
+        content = await SamConfig.fromProjectRoot(projectRoot)
+    } catch (error) {
+        return false
+    }
+
+    const globalRegion = content.getCommandParam('global', 'region')
+    const globalStackName = content.getCommandParam('global', 'stack_name')
+    const buildCommandConfig = content.getCommand('build')
+    const deployCommandConfig = content.getCommand('deploy')
+    const syncCommandConfig = content.getCommand('sync')
+
+    const hasRequiredGlobalParams: boolean = !!globalRegion && !!globalStackName
+    const hasRequiredDeployParameters: boolean = !!hasRequiredGlobalParams && !!deployCommandConfig
+    const hasRequiredSyncParameters: boolean = !!hasRequiredGlobalParams && !!syncCommandConfig
+
+    switch (configType) {
+        case DeployType.Deploy:
+            return hasRequiredGlobalParams && hasRequiredDeployParameters
+        case DeployType.Sync:
+            return hasRequiredGlobalParams && hasRequiredSyncParameters
+        case DeployType.Build:
+            return !!buildCommandConfig
+        default:
+            getLogger().error(`Unsupported config type: ${configType}`)
+            return false
+    }
+}
+
+export async function validateSamDeployConfig(uri: vscode.Uri | undefined) {
+    return await validateAppBuilderSamConfig(uri, DeployType.Deploy)
+}
+
+export async function validateSamSyncConfig(uri: vscode.Uri | undefined) {
+    return await validateAppBuilderSamConfig(uri, DeployType.Sync)
+}
+
+export async function validateSamBuildConfig(uri: vscode.Uri | undefined) {
+    return await validateAppBuilderSamConfig(uri, DeployType.Build)
+}
diff --git a/packages/core/src/shared/sam/constants.ts b/packages/core/src/shared/sam/constants.ts
new file mode 100644
index 00000000000..ac0d66f75ba
--- /dev/null
+++ b/packages/core/src/shared/sam/constants.ts
@@ -0,0 +1,10 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export const buildProcessMementoRootKey = 'samcli.build.processes'
+export const globalIdentifier = 'global'
+export const buildMementoRootKey = 'samcli.build.params'
+export const deployMementoRootKey = 'samcli.deploy.params'
+export const syncMementoRootKey = 'samcli.sync.params'
diff --git a/packages/core/src/shared/sam/debugger/awsSamDebugConfiguration.gen.ts b/packages/core/src/shared/sam/debugger/awsSamDebugConfiguration.gen.ts
new file mode 100644
index 00000000000..b211ad48c9d
--- /dev/null
+++ b/packages/core/src/shared/sam/debugger/awsSamDebugConfiguration.gen.ts
@@ -0,0 +1,236 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * This file is not generated from the core library. Please regenerate from
+ * 'packages/toolkit', e.g. `npm run generateConfigurationAttributes -w packages/toolkit`
+ */
+
+/**
+ * This file was automatically generated by json-schema-to-typescript.
+ * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+ * and run json-schema-to-typescript to regenerate this file.
+ */
+
+import * as vscode from "vscode";
+
+export interface AwsSamDebuggerConfiguration extends vscode.DebugConfiguration {
+  aws?: AWSConnection;
+  invokeTarget: TemplateTargetProperties | CodeTargetProperties | APITargetProperties;
+  lambda?: LambdaProperties;
+  sam?: SAMCLIProperties;
+  api?: APIGatewayProperties;
+}
+/**
+ * AWS connection details
+ */
+export interface AWSConnection {
+  /**
+   * The AWS credentials provider and name to use during the invocation. Example: credential profile "default" would be entered as `profile:default`.
+   */
+  credentials?: string;
+  /**
+   * AWS region to use during the invocation.
+   */
+  region?: string;
+}
+/**
+ * Configures the application to launch
+ */
+export interface TemplateTargetProperties {
+  /**
+   * Path to the CFN/SAM template.
+   */
+  templatePath: string;
+  /**
+   * Resource name of an AWS::Lambda::Function or AWS::Serverless::Function to invoke.
+   */
+  logicalId: string;
+  /**
+   * The type of invocation to launch. Possible values:
+* * `template` uses a CFN/SAM Template as an entrypoint
+* * `code` invokes Lambda code directly.
+* * `api` uses the CFN/SAM Template to emulate API Gateway
+   */
+  target: "template";
+}
+/**
+ * Configures the application to launch
+ */
+export interface CodeTargetProperties {
+  /**
+   * Lambda Function handler to invoke.
+   */
+  lambdaHandler: string;
+  /**
+   * The root of the project, used to determine where in the file-system to locate the lambdaHandler.
+   */
+  projectRoot: string;
+  /**
+   * The type of invocation to launch. Possible values:
+* * `template` uses a CFN/SAM Template as an entrypoint
+* * `code` invokes Lambda code directly.
+* * `api` uses the CFN/SAM Template to emulate API Gateway
+   */
+  target: "code";
+  /**
+   * Architecture used for local SAM Lambda emulation
+   */
+  architecture?: "x86_64" | "arm64";
+}
+/**
+ * Configures the application to launch
+ */
+export interface APITargetProperties {
+  /**
+   * Path to the CFN/SAM template.
+   */
+  templatePath: string;
+  /**
+   * Resource name of an AWS::Lambda::Function or AWS::Serverless::Function to invoke.
+   */
+  logicalId: string;
+  /**
+   * The type of invocation to launch. Possible values:
+* * `template` uses a CFN/SAM Template as an entrypoint
+* * `code` invokes Lambda code directly.
+* * `api` uses the CFN/SAM Template to emulate API Gateway
+   */
+  target: "api";
+}
+/**
+ * Lambda specific details of the invocation
+ */
+export interface LambdaProperties {
+  /**
+   * Environment variables to pass to the function invocation (replaces template variables).
+   */
+  environmentVariables?: {
+    [k: string]: string;
+  };
+  /**
+   * Event payload to pass to the Lambda invocation.
+*  Must specify one of 'json' or 'path'.
+   */
+  payload?: {
+    /**
+     * JSON definition to use as the event payload
+     */
+    json?: {
+      [k: string]: unknown;
+    };
+    /**
+     * Path to a file to use as the event payload
+     */
+    path?: string;
+  };
+  /**
+   * The amount of memory (in Mb) the Lambda function has access to.
+   */
+  memoryMb?: number;
+  /**
+   * The Lambda Function's runtime
+   */
+  runtime?: string;
+  /**
+   * The amount of time (in seconds) that Lambda allows a function to run before stopping it.
+   */
+  timeoutSec?: number;
+  pathMappings?: PathMapping[];
+}
+export interface PathMapping {
+  localRoot: string;
+  remoteRoot: string;
+}
+/**
+ * SAM CLI specific configurations
+ */
+export interface SAMCLIProperties {
+  /**
+   * Additional arguments to pass to the `sam build` command.
+   */
+  buildArguments?: string[];
+  /**
+   * Base directory to build and run the application.
+*  A temporary directory will be created if not specified.
+   */
+  buildDir?: string;
+  /**
+   * Whether to build inside a container (default: false).
+   */
+  containerBuild?: boolean;
+  /**
+   * Specifies the name or id of an existing Docker network that Lambda Docker containers should connect to.
+   */
+  dockerNetwork?: string;
+  /**
+   * Additional arguments to pass to the `sam local` command.
+   */
+  localArguments?: string[];
+  /**
+   * Specifies whether the command should skip pulling down the latest Docker image for Lambda runtime (default: false).
+   */
+  skipNewImageCheck?: boolean;
+  /**
+   * Values to override in the template
+   */
+  template?: {
+    /**
+     * Key:value mappings for SAM template parameter overrides. More information can be found here: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stackinstances-override.html#stackinstances-override-cli
+     */
+    parameters?: {
+      [k: string]: string | number;
+    };
+  };
+}
+/**
+ * API Gateway configuration
+ */
+export interface APIGatewayProperties {
+  /**
+   * The path to the api (must start with /)
+   */
+  path: string;
+  /**
+   * The HTTP message method that will be used
+   */
+  httpMethod: "delete" | "get" | "head" | "options" | "patch" | "post" | "put";
+  /**
+   * Event payload to pass to the Lambda invocation.
+*  Must specify one of 'json' or 'path'.
+   */
+  payload?: {
+    /**
+     * JSON definition to use as the event payload
+     */
+    json?: {
+      [k: string]: unknown;
+    };
+    /**
+     * Path to a file to use as the event payload
+     */
+    path?: string;
+  };
+  /**
+   * Additional HTTP headers
+   */
+  headers?: {
+    [k: string]: string;
+  };
+  /**
+   * URL query string (e.g. key=foo&value=bar)
+   */
+  querystring?: string;
+  /**
+   * key-value map of API Gateway stage variables
+   */
+  stageVariables?: {
+    [k: string]: string;
+  };
+  /**
+   * The API Gateway client certificate ID
+   */
+  clientCertificateId?: string;
+}
diff --git a/src/shared/sam/debugger/awsSamDebugConfiguration.ts b/packages/core/src/shared/sam/debugger/awsSamDebugConfiguration.ts
similarity index 94%
rename from src/shared/sam/debugger/awsSamDebugConfiguration.ts
rename to packages/core/src/shared/sam/debugger/awsSamDebugConfiguration.ts
index 4f2ccfbb34d..f11be86d00c 100644
--- a/src/shared/sam/debugger/awsSamDebugConfiguration.ts
+++ b/packages/core/src/shared/sam/debugger/awsSamDebugConfiguration.ts
@@ -1,11 +1,11 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as vscode from 'vscode'
 import * as path from 'path'
-import { Runtime } from 'aws-sdk/clients/lambda'
+import { Runtime } from '@aws-sdk/client-lambda'
 import { getNormalizedRelativePath } from '../../utilities/pathUtils'
 import {
     APIGatewayProperties,
@@ -13,8 +13,7 @@ import {
     CodeTargetProperties,
     TemplateTargetProperties,
 } from './awsSamDebugConfiguration.gen'
-import { getLogger } from '../../logger'
-import { isCloud9 } from '../../extensionUtilities'
+import { getLogger } from '../../logger/logger'
 
 export * from './awsSamDebugConfiguration.gen'
 
@@ -245,11 +244,7 @@ export function createApiAwsSamDebugConfig(
 
 function makeWorkspaceRelativePath(folder: vscode.WorkspaceFolder | undefined, target: string): string {
     if (vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders.length <= 1) {
-        return folder
-            ? isCloud9() // TODO: remove when Cloud9 supports ${workspaceFolder}.
-                ? getNormalizedRelativePath(folder.uri.fsPath, target)
-                : `\${workspaceFolder}/${getNormalizedRelativePath(folder.uri.fsPath, target)}`
-            : target
+        return folder ? `\${workspaceFolder}/${getNormalizedRelativePath(folder.uri.fsPath, target)}` : target
     }
 
     return target
diff --git a/src/shared/sam/debugger/awsSamDebugConfigurationValidator.ts b/packages/core/src/shared/sam/debugger/awsSamDebugConfigurationValidator.ts
similarity index 86%
rename from src/shared/sam/debugger/awsSamDebugConfigurationValidator.ts
rename to packages/core/src/shared/sam/debugger/awsSamDebugConfigurationValidator.ts
index e4133dad4ed..b400746d7e6 100644
--- a/src/shared/sam/debugger/awsSamDebugConfigurationValidator.ts
+++ b/packages/core/src/shared/sam/debugger/awsSamDebugConfigurationValidator.ts
@@ -1,14 +1,14 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as vscode from 'vscode'
-import * as fs from 'fs'
+import * as fs from 'fs' // eslint-disable-line no-restricted-imports
 import * as path from 'path'
 import { samImageLambdaRuntimes, samZipLambdaRuntimes } from '../../../lambda/models/samLambdaRuntime'
-import { CloudFormation } from '../../cloudformation/cloudformation'
-import { localize } from '../../utilities/vsCodeUtils'
+import * as CloudFormation from '../../cloudformation/cloudformation'
+import { localize, replaceVscodeVars } from '../../utilities/vsCodeUtils'
 import {
     awsSamDebugRequestTypes,
     awsSamDebugTargetTypes,
@@ -19,7 +19,8 @@ import {
     API_TARGET_TYPE,
 } from './awsSamDebugConfiguration'
 import { tryGetAbsolutePath } from '../../utilities/workspaceUtils'
-import globals from '../../extensionGlobals'
+import { CloudFormationTemplateRegistry } from '../../fs/templateRegistry'
+import { Runtime } from '@aws-sdk/client-lambda'
 
 export interface ValidationResult {
     isValid: boolean
@@ -27,7 +28,7 @@ export interface ValidationResult {
 }
 
 export interface AwsSamDebugConfigurationValidator {
-    validate(config: AwsSamDebuggerConfiguration): ValidationResult
+    validate(config: AwsSamDebuggerConfiguration, registry: CloudFormationTemplateRegistry): Promise<ValidationResult>
 }
 
 export class DefaultAwsSamDebugConfigurationValidator implements AwsSamDebugConfigurationValidator {
@@ -36,7 +37,11 @@ export class DefaultAwsSamDebugConfigurationValidator implements AwsSamDebugConf
     /**
      * Validates debug configuration properties.
      */
-    public validate(config: AwsSamDebuggerConfiguration, resolveVars?: boolean): ValidationResult {
+    public async validate(
+        config: AwsSamDebuggerConfiguration,
+        registry: CloudFormationTemplateRegistry,
+        resolveVars?: boolean
+    ): Promise<ValidationResult> {
         let rv: ValidationResult = { isValid: false, message: undefined }
         if (resolveVars) {
             config = doTraverseAndReplace(config, this.workspaceFolder?.uri.fsPath ?? '')
@@ -63,12 +68,20 @@ export class DefaultAwsSamDebugConfigurationValidator implements AwsSamDebugConf
             config.invokeTarget.target === TEMPLATE_TARGET_TYPE ||
             config.invokeTarget.target === API_TARGET_TYPE
         ) {
-            let cfnTemplate
+            let cfnTemplate: CloudFormation.Template | undefined
             if (config.invokeTarget.templatePath) {
-                const fullpath = tryGetAbsolutePath(this.workspaceFolder, config.invokeTarget.templatePath)
+                // TODO: why wasn't ${workspaceFolder} resolved before now?
+                const resolvedPath = replaceVscodeVars(
+                    config.invokeTarget.templatePath,
+                    this.workspaceFolder?.uri.fsPath
+                )
                 // Normalize to absolute path for use in the runner.
+                const fullpath = tryGetAbsolutePath(this.workspaceFolder, resolvedPath)
                 config.invokeTarget.templatePath = fullpath
-                cfnTemplate = globals.templateRegistry.getRegisteredItem(fullpath)?.item
+                // Forcefully add to the registry in case the registry scan somehow missed the file. #2614
+                // If the user (launch config) gave an explicit path we should always "find" it.
+                const uri = vscode.Uri.file(fullpath)
+                cfnTemplate = (await registry.addItem(uri, true))?.item
             }
             rv = this.validateTemplateConfig(config, config.invokeTarget.templatePath, cfnTemplate)
         } else if (config.invokeTarget.target === CODE_TARGET_TYPE) {
@@ -133,7 +146,9 @@ export class DefaultAwsSamDebugConfigurationValidator implements AwsSamDebugConf
             }
         }
 
-        if (!resources || !Object.keys(resources).includes(templateTarget.logicalId)) {
+        const resource = resources?.[templateTarget.logicalId]
+
+        if (!resource) {
             return {
                 isValid: false,
                 message: localize(
@@ -145,14 +160,12 @@ export class DefaultAwsSamDebugConfigurationValidator implements AwsSamDebugConf
             }
         }
 
-        const resource = resources[templateTarget.logicalId]
-
-        if (resource?.Type !== CloudFormation.SERVERLESS_FUNCTION_TYPE) {
+        if (![CloudFormation.SERVERLESS_FUNCTION_TYPE, CloudFormation.LAMBDA_FUNCTION_TYPE].includes(resource.Type)) {
             return {
                 isValid: false,
                 message: localize(
                     'AWS.sam.debugger.resourceNotAFunction',
-                    'Template Resource {0} in Template file {1} needs to be of type {2} or {3}',
+                    'Template Resource {0} in Template file {1} must be of type {2} or {3}',
                     templateTarget.logicalId,
                     templateTarget.templatePath,
                     CloudFormation.SERVERLESS_FUNCTION_TYPE,
@@ -175,7 +188,7 @@ export class DefaultAwsSamDebugConfigurationValidator implements AwsSamDebugConf
                 }
             }
             // can't infer the runtime for image-based lambdas
-            if (!config.lambda?.runtime || !samImageLambdaRuntimes().has(config.lambda.runtime)) {
+            if (!config.lambda?.runtime || !samImageLambdaRuntimes().has(config.lambda.runtime as Runtime)) {
                 return {
                     isValid: false,
                     message: localize(
@@ -189,7 +202,7 @@ export class DefaultAwsSamDebugConfigurationValidator implements AwsSamDebugConf
             // TODO: Decide what to do with this re: refs.
             // As of now, this has to be directly declared without a ref, despite the fact that SAM will handle a ref.
             // Should we just pass validation off to SAM and ignore validation at this point, or should we directly process the value (like the handler)?
-            const runtime = CloudFormation.getStringForProperty(resource?.Properties, 'Runtime', cfnTemplate)
+            const runtime = CloudFormation.getStringForProperty(resource?.Properties, 'Runtime', cfnTemplate) as Runtime
             if (!runtime || !samZipLambdaRuntimes.has(runtime)) {
                 return {
                     isValid: false,
@@ -250,7 +263,10 @@ export class DefaultAwsSamDebugConfigurationValidator implements AwsSamDebugConf
     }
 
     private validateCodeConfig(debugConfiguration: AwsSamDebuggerConfiguration): ValidationResult {
-        if (!debugConfiguration.lambda?.runtime || !samZipLambdaRuntimes.has(debugConfiguration.lambda.runtime)) {
+        if (
+            !debugConfiguration.lambda?.runtime ||
+            !samZipLambdaRuntimes.has(debugConfiguration.lambda.runtime as Runtime)
+        ) {
             return {
                 isValid: false,
                 message: localize(
diff --git a/src/shared/sam/debugger/awsSamDebugger.ts b/packages/core/src/shared/sam/debugger/awsSamDebugger.ts
similarity index 89%
rename from src/shared/sam/debugger/awsSamDebugger.ts
rename to packages/core/src/shared/sam/debugger/awsSamDebugger.ts
index 418b5d6157b..217ce451dcd 100644
--- a/src/shared/sam/debugger/awsSamDebugger.ts
+++ b/packages/core/src/shared/sam/debugger/awsSamDebugger.ts
@@ -1,11 +1,10 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as semver from 'semver'
 import * as vscode from 'vscode'
-import * as fs from 'fs-extra'
 import * as nls from 'vscode-nls'
 import {
     getCodeRoot,
@@ -34,7 +33,7 @@ import * as tsDebug from './typescriptSamDebug'
 import * as goDebug from './goSamDebug'
 import { ExtContext } from '../../extensions'
 import { isInDirectory, makeTemporaryToolkitFolder } from '../../filesystemUtilities'
-import { getLogger } from '../../logger'
+import { getLogger } from '../../logger/logger'
 import { getStartPort } from '../../utilities/debuggerUtils'
 import * as pathutil from '../../utilities/pathUtils'
 import { tryGetAbsolutePath } from '../../utilities/workspaceUtils'
@@ -51,21 +50,24 @@ import {
 } from './awsSamDebugConfigurationValidator'
 import { getInputTemplatePath, makeInputTemplate, makeJsonFiles } from '../localLambdaRunner'
 import { SamLocalInvokeCommand } from '../cli/samCliLocalInvoke'
-import { getCredentialsFromStore } from '../../../credentials/credentialsStore'
-import { fromString } from '../../../credentials/providers/credentials'
+import { getCredentialsFromStore } from '../../../auth/credentials/store'
+import { fromString } from '../../../auth/providers/credentials'
 import { Credentials } from '@aws-sdk/types'
-import { CloudFormation } from '../../cloudformation/cloudformation'
+import * as CloudFormation from '../../cloudformation/cloudformation'
 import { getSamCliContext, getSamCliVersion } from '../cli/samCliContext'
 import { minSamCliVersionForImageSupport, minSamCliVersionForGoSupport } from '../cli/samCliValidator'
-import { getIdeProperties, isCloud9 } from '../../extensionUtilities'
+import { getIdeProperties } from '../../extensionUtilities'
 import { resolve } from 'path'
 import globals from '../../extensionGlobals'
-import { Runtime, telemetry } from '../../telemetry/telemetry'
+import { telemetry, Runtime as TelemetryRuntime } from '../../telemetry/telemetry'
+import { Runtime } from '@aws-sdk/client-lambda'
 import { ErrorInformation, isUserCancelledError, ToolkitError } from '../../errors'
 import { openLaunchJsonFile } from './commands/addSamDebugConfiguration'
 import { Logging } from '../../logger/commands'
-import { credentialHelpUrl } from '../../constants'
-import { Auth } from '../../../credentials/auth'
+import { credentialHelpUrl, samTroubleshootingUrl } from '../../constants'
+import { Auth } from '../../../auth/auth'
+import { openUrl } from '../../utilities/vsCodeUtils'
+import fs from '../../fs/fs'
 
 const localize = nls.loadMessageBundle()
 
@@ -80,6 +82,10 @@ class SamLaunchRequestError extends ToolkitError.named('SamLaunchRequestError')
     public constructor(message: string, info?: ErrorInformation & { readonly extraButtons?: NotificationButton[] }) {
         super(message, info)
         this.buttons = info?.extraButtons ?? [
+            {
+                label: localize('AWS.generic.message.troubleshooting', 'Troubleshooting'),
+                onClick: () => openUrl(samTroubleshootingUrl),
+            },
             {
                 label: localize('AWS.generic.message.openConfig', 'Open Launch Config'),
                 onClick: openLaunchJsonFile,
@@ -97,12 +103,12 @@ class SamLaunchRequestError extends ToolkitError.named('SamLaunchRequestError')
 
         const viewLogsButton = {
             label: localize('AWS.generic.message.viewLogs', 'View Logs...'),
-            onClick: () => Logging.declared.viewLogsAtMessage.execute(logId),
+            onClick: () => Logging.instance.viewLogsAtMessage.execute(logId),
         }
 
         const buttonsWithLogs = [viewLogsButton, ...this.buttons]
 
-        await vscode.window.showErrorMessage(this.message, ...buttonsWithLogs.map(b => b.label)).then(resp => {
+        await vscode.window.showErrorMessage(this.message, ...buttonsWithLogs.map((b) => b.label)).then((resp) => {
             return buttonsWithLogs.find(({ label }) => label === resp)?.onClick()
         })
     }
@@ -139,6 +145,9 @@ export interface SamLaunchRequestArgs extends AwsSamDebuggerConfiguration {
     /** Path to (generated) directory used as a working/staging area for SAM. */
     baseBuildDir?: string
 
+    /** sam cli "--mount-with" option. */
+    mountWith?: 'read' | 'write'
+
     /**
      * URI of the current editor document.
      * Used as a last resort for deciding `codeRoot` (when there is no `launch.json` nor `template.yaml`)
@@ -197,11 +206,6 @@ export interface SamLaunchRequestArgs extends AwsSamDebuggerConfiguration {
      */
     parameterOverrides?: string[]
 
-    /**
-     * HACK: Forces use of `ikp3db` python debugger in Cloud9 (and in tests).
-     */
-    useIkpdb?: boolean
-
     //
     //  Invocation properties (for "execute" phase, after "config" phase).
     //  Non-serializable...
@@ -246,7 +250,7 @@ export class SamDebugConfigProvider implements vscode.DebugConfigurationProvider
         const configs: AwsSamDebuggerConfiguration[] = []
         if (folder) {
             const folderPath = folder.uri.fsPath
-            const templates = globals.templateRegistry.registeredItems
+            const templates = (await globals.templateRegistry).items
 
             for (const templateDatum of templates) {
                 if (isInDirectory(folderPath, templateDatum.path)) {
@@ -259,11 +263,11 @@ export class SamDebugConfigProvider implements vscode.DebugConfigurationProvider
                         if (resource) {
                             // we do not know enough to populate the runtime field for Image-based Lambdas
                             const runtimeName = CloudFormation.isZipLambdaResource(resource?.Properties)
-                                ? CloudFormation.getStringForProperty(
+                                ? (CloudFormation.getStringForProperty(
                                       resource?.Properties,
                                       'Runtime',
                                       templateDatum.item
-                                  ) ?? ''
+                                  ) ?? '')
                                 : ''
                             configs.push(
                                 createTemplateAwsSamDebugConfig(
@@ -300,7 +304,7 @@ export class SamDebugConfigProvider implements vscode.DebugConfigurationProvider
                     }
                 }
             }
-            getLogger().verbose(`provideDebugConfigurations: debugconfigs: ${JSON.stringify(configs)}`)
+            getLogger().verbose(`provideDebugConfigurations: debugconfigs: %O`, configs)
         }
 
         return configs
@@ -316,13 +320,9 @@ export class SamDebugConfigProvider implements vscode.DebugConfigurationProvider
     public async resolveDebugConfiguration(
         folder: vscode.WorkspaceFolder | undefined,
         config: AwsSamDebuggerConfiguration,
-        token?: vscode.CancellationToken
+        token?: vscode.CancellationToken,
+        source?: string
     ): Promise<AwsSamDebuggerConfiguration | undefined> {
-        if (isCloud9()) {
-            // TODO: remove when Cloud9 supports ${workspaceFolder}.
-            await this.makeAndInvokeConfig(folder, config, token)
-            return undefined
-        }
         return config
     }
 
@@ -340,9 +340,10 @@ export class SamDebugConfigProvider implements vscode.DebugConfigurationProvider
     public async resolveDebugConfigurationWithSubstitutedVariables(
         folder: vscode.WorkspaceFolder | undefined,
         config: AwsSamDebuggerConfiguration,
-        token?: vscode.CancellationToken
+        token?: vscode.CancellationToken,
+        source?: string
     ): Promise<undefined> {
-        await this.makeAndInvokeConfig(folder, config, token)
+        await this.makeAndInvokeConfig(folder, config, token, source)
         // TODO: return config here, and remove use of `startDebugging()` in `localLambdaRunner.ts`.
         return undefined
     }
@@ -350,11 +351,12 @@ export class SamDebugConfigProvider implements vscode.DebugConfigurationProvider
     private async makeAndInvokeConfig(
         folder: vscode.WorkspaceFolder | undefined,
         config: AwsSamDebuggerConfiguration,
-        token?: vscode.CancellationToken
+        token?: vscode.CancellationToken,
+        source?: string
     ): Promise<void> {
         try {
             if (config.invokeTarget.target === 'api') {
-                await telemetry.apigateway_invokeLocal.run(async span => {
+                await telemetry.apigateway_invokeLocal.run(async (span) => {
                     const resolved = await this.makeConfig(folder, config, token)
                     span.record({ httpMethod: resolved.api?.httpMethod })
 
@@ -362,6 +364,7 @@ export class SamDebugConfigProvider implements vscode.DebugConfigurationProvider
                 })
             } else {
                 await telemetry.lambda_invokeLocal.run(async () => {
+                    telemetry.record({ source: source })
                     const resolved = await this.makeConfig(folder, config, token)
 
                     return this.invokeConfig(resolved)
@@ -369,11 +372,11 @@ export class SamDebugConfigProvider implements vscode.DebugConfigurationProvider
             }
         } catch (err) {
             if (err instanceof SamLaunchRequestError) {
-                err.showNotification()
+                void err.showNotification()
             } else if (err instanceof ToolkitError) {
-                new SamLaunchRequestError(err.message, { ...err }).showNotification()
+                void new SamLaunchRequestError(err.message, { ...err }).showNotification()
             } else {
-                SamLaunchRequestError.chain(err, 'Failed to run launch configuration').showNotification()
+                void SamLaunchRequestError.chain(err, 'Failed to run launch configuration').showNotification()
             }
         }
     }
@@ -430,28 +433,29 @@ export class SamDebugConfigProvider implements vscode.DebugConfigurationProvider
                 ],
             })
         } else {
-            const rv = configValidator.validate(config)
+            const registry = await globals.templateRegistry
+            const rv = await configValidator.validate(config, registry)
             if (!rv.isValid) {
                 throw new ToolkitError(`Invalid launch configuration: ${rv.message}`, { code: 'BadLaunchConfig' })
             } else if (rv.message) {
-                vscode.window.showInformationMessage(rv.message)
+                void vscode.window.showInformationMessage(rv.message)
             }
-            getLogger().verbose(`SAM debug: config: ${JSON.stringify(config.name)}`)
+            getLogger().verbose(`SAM debug: config %s:`, config.name)
         }
 
         const editor = vscode.window.activeTextEditor
         const templateInvoke = config.invokeTarget as TemplateTargetProperties
-        const template = getTemplate(folder, config)
-        const templateResource = getTemplateResource(folder, config)
-        const codeRoot = getCodeRoot(folder, config)
+        const template = await getTemplate(folder, config)
+        const templateResource = await getTemplateResource(folder, config)
+        const codeRoot = await getCodeRoot(folder, config)
         const architecture = getArchitecture(template, templateResource, config.invokeTarget)
         // Handler is the only field that we need to parse refs for.
         // This is necessary for Python debugging since we have to create the temporary entry file
         // Other refs can fail; SAM will handle them.
-        const handlerName = getHandlerName(folder, config)
+        const handlerName = await getHandlerName(folder, config)
 
         config.baseBuildDir = resolve(folder.uri.fsPath, config.sam?.buildDir ?? (await makeTemporaryToolkitFolder()))
-        fs.ensureDir(config.baseBuildDir)
+        await fs.mkdir(config.baseBuildDir)
 
         if (templateInvoke?.templatePath) {
             // Normalize to absolute path.
@@ -468,8 +472,8 @@ export class SamDebugConfigProvider implements vscode.DebugConfigurationProvider
         }
 
         const isZip = CloudFormation.isZipLambdaResource(templateResource?.Properties)
-        const runtime: string | undefined =
-            config.lambda?.runtime ??
+        const runtime: Runtime | undefined =
+            (config.lambda?.runtime as Runtime) ??
             (template && isZip
                 ? CloudFormation.getStringForProperty(templateResource?.Properties, 'Runtime', template)
                 : undefined) ??
@@ -512,7 +516,7 @@ export class SamDebugConfigProvider implements vscode.DebugConfigurationProvider
         if (goRuntimes.includes(runtime) && !config.noDebug) {
             const samCliVersion = await getSamCliVersion(this.ctx.samCliContext())
             if (semver.lt(samCliVersion, minSamCliVersionForGoSupport)) {
-                vscode.window.showWarningMessage(
+                void vscode.window.showWarningMessage(
                     localize(
                         'AWS.output.sam.local.no.go.support',
                         'Debugging go1.x lambdas requires a minimum SAM CLI version of {0}. Function will run locally without debug.',
@@ -524,6 +528,8 @@ export class SamDebugConfigProvider implements vscode.DebugConfigurationProvider
         }
 
         const runtimeFamily = getFamily(runtime)
+        // use region in debug config first, if not found, fall back to toolkit default region.
+        const region = config.aws?.region ?? this.ctx.awsContext.getCredentialDefaultRegion()
         const documentUri =
             vscode.window.activeTextEditor?.document.uri ??
             // XXX: don't know what URI to choose...
@@ -547,19 +553,15 @@ export class SamDebugConfigProvider implements vscode.DebugConfigurationProvider
             } else {
                 const credentialsId = config.aws.credentials
                 const getHelp = localize('AWS.generic.message.getHelp', 'Get Help...')
-                // TODO: getHelp page for Cloud9.
-                const extraButtons = isCloud9()
-                    ? []
-                    : [
-                          {
-                              label: getHelp,
-                              onClick: () => vscode.env.openExternal(vscode.Uri.parse(credentialHelpUrl)),
-                          },
-                      ]
 
                 throw new SamLaunchRequestError(`Invalid credentials found in launch configuration: ${credentialsId}`, {
                     code: 'InvalidCredentials',
-                    extraButtons,
+                    extraButtons: [
+                        {
+                            label: getHelp,
+                            onClick: () => openUrl(vscode.Uri.parse(credentialHelpUrl)),
+                        },
+                    ],
                 })
             }
         }
@@ -607,9 +609,9 @@ export class SamDebugConfigProvider implements vscode.DebugConfigurationProvider
                 timeoutSec: lambdaTimeout,
                 environmentVariables: { ...config.lambda?.environmentVariables },
             },
+            region: region,
             awsCredentials: awsCredentials,
             parameterOverrides: parameterOverrideArr,
-            useIkpdb: isCloud9() || !!(config as any).useIkpdb,
             architecture: architecture,
         }
 
@@ -631,7 +633,7 @@ export class SamDebugConfigProvider implements vscode.DebugConfigurationProvider
                 launchConfig = await pythonDebug.makePythonDebugConfig(launchConfig)
                 break
             }
-            case RuntimeFamily.DotNetCore: {
+            case RuntimeFamily.DotNet: {
                 // Make a DotNet launch-config from the generic config.
                 launchConfig = await csharpDebug.makeCsharpConfig(launchConfig)
                 break
@@ -689,9 +691,9 @@ export class SamDebugConfigProvider implements vscode.DebugConfigurationProvider
     public async invokeConfig(config: SamLaunchRequestArgs): Promise<SamLaunchRequestArgs> {
         telemetry.record({
             debug: !config.noDebug,
-            runtime: config.runtime as Runtime,
+            runtime: config.runtime as TelemetryRuntime,
             lambdaArchitecture: config.architecture,
-            lambdaPackageType: isImageLambdaConfig(config) ? 'Image' : 'Zip',
+            lambdaPackageType: (await isImageLambdaConfig(config)) ? 'Image' : 'Zip',
             version: await getSamCliVersion(getSamCliContext()),
         })
 
@@ -706,7 +708,7 @@ export class SamDebugConfigProvider implements vscode.DebugConfigurationProvider
                 config.type = 'python'
                 return await pythonDebug.invokePythonLambda(this.ctx, config as PythonDebugConfiguration)
             }
-            case RuntimeFamily.DotNetCore: {
+            case RuntimeFamily.DotNet: {
                 config.type = 'coreclr'
                 return await csharpDebug.invokeCsharpLambda(this.ctx, config)
             }
diff --git a/src/shared/sam/debugger/commands/addSamDebugConfiguration.ts b/packages/core/src/shared/sam/debugger/commands/addSamDebugConfiguration.ts
similarity index 94%
rename from src/shared/sam/debugger/commands/addSamDebugConfiguration.ts
rename to packages/core/src/shared/sam/debugger/commands/addSamDebugConfiguration.ts
index a30d0f6a3ca..9cf89a8cb2e 100644
--- a/src/shared/sam/debugger/commands/addSamDebugConfiguration.ts
+++ b/packages/core/src/shared/sam/debugger/commands/addSamDebugConfiguration.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -17,7 +17,7 @@ import {
     createTemplateAwsSamDebugConfig,
     TEMPLATE_TARGET_TYPE,
 } from '../awsSamDebugConfiguration'
-import { CloudFormation } from '../../../cloudformation/cloudformation'
+import * as CloudFormation from '../../../cloudformation/cloudformation'
 import { LaunchConfiguration } from '../../../debug/launchConfiguration'
 import { getIdeProperties } from '../../../extensionUtilities'
 import { isValidResponse } from '../../../wizards/wizard'
@@ -45,7 +45,7 @@ export async function addSamDebugConfiguration(
     step?: { step: number; totalSteps: number }
 ): Promise<void> {
     // emit without waiting
-    emitCommandTelemetry()
+    void emitCommandTelemetry()
 
     let samDebugConfig: AwsSamDebuggerConfiguration
     const workspaceFolder = vscode.workspace.getWorkspaceFolder(rootUri)
@@ -57,7 +57,7 @@ export async function addSamDebugConfiguration(
         let preloadedConfig = undefined
 
         if (workspaceFolder) {
-            const templateDatum = globals.templateRegistry.getRegisteredItem(rootUri)
+            const templateDatum = (await globals.templateRegistry).getItem(rootUri)
             if (templateDatum) {
                 const resource = templateDatum.item.Resources![resourceName]
                 if (!resource) {
@@ -168,7 +168,7 @@ export async function addSamDebugConfiguration(
     }
 
     if (openWebview) {
-        vscode.commands.executeCommand('aws.launchConfigForm', samDebugConfig)
+        await vscode.commands.executeCommand('aws.launchConfigForm', samDebugConfig)
     } else {
         const launchConfig = new LaunchConfiguration(rootUri)
         await launchConfig.addDebugConfiguration(samDebugConfig)
@@ -178,7 +178,7 @@ export async function addSamDebugConfiguration(
 }
 
 export async function openLaunchJsonFile(): Promise<void> {
-    vscode.commands.executeCommand(
+    await vscode.commands.executeCommand(
         vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders.length <= 1
             ? 'workbench.action.debug.configure'
             : 'workbench.action.openWorkspaceSettingsFile'
diff --git a/src/shared/sam/debugger/csharpSamDebug.ts b/packages/core/src/shared/sam/debugger/csharpSamDebug.ts
similarity index 75%
rename from src/shared/sam/debugger/csharpSamDebug.ts
rename to packages/core/src/shared/sam/debugger/csharpSamDebug.ts
index f84c5757b0b..01aef679cd2 100644
--- a/src/shared/sam/debugger/csharpSamDebug.ts
+++ b/packages/core/src/shared/sam/debugger/csharpSamDebug.ts
@@ -1,15 +1,13 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { chmod, ensureDir, writeFile } from 'fs-extra'
 import * as os from 'os'
 import * as path from 'path'
-import * as semver from 'semver'
 import {
-    DotNetCoreDebugConfiguration,
-    dotnetCoreDebuggerPath,
+    DotNetDebugConfiguration,
+    dotnetDebuggerPath,
     getCodeRoot,
     isImageLambdaConfig,
 } from '../../../lambda/local/debugConfiguration'
@@ -19,15 +17,13 @@ import { ExtContext } from '../../extensions'
 import { DefaultSamLocalInvokeCommand, waitForDebuggerMessages } from '../cli/samCliLocalInvoke'
 import { runLambdaFunction, waitForPort } from '../localLambdaRunner'
 import { SamLaunchRequestArgs } from './awsSamDebugger'
-import { ChildProcess } from '../../utilities/childProcess'
+import { ChildProcess } from '../../utilities/processUtils'
 import { HttpResourceFetcher } from '../../resourcefetcher/httpResourceFetcher'
-import { getLogger } from '../../logger'
-import { Window } from '../../vscode/window'
-
+import { getLogger } from '../../logger/logger'
+import * as vscode from 'vscode'
 import * as nls from 'vscode-nls'
-import { getSamCliVersion } from '../cli/samCliContext'
-import { minSamCliVersionForDotnet31Support } from '../cli/samCliValidator'
 import globals from '../../extensionGlobals'
+import fs from '../../fs/fs'
 const localize = nls.loadMessageBundle()
 
 /**
@@ -40,7 +36,7 @@ export async function makeCsharpConfig(config: SamLaunchRequestArgs): Promise<Sa
     if (!config.baseBuildDir) {
         throw Error('invalid state: config.baseBuildDir was not set')
     }
-    config.codeRoot = getCodeRoot(config.workspaceFolder, config)!
+    config.codeRoot = (await getCodeRoot(config.workspaceFolder, config))!
     // TODO: avoid the reassignment
     // TODO: walk the tree to find .sln, .csproj ?
     const originalCodeRoot = config.codeRoot
@@ -48,13 +44,23 @@ export async function makeCsharpConfig(config: SamLaunchRequestArgs): Promise<Sa
 
     config = {
         ...config,
+        // https://github.com/dotnet/vscode-csharp/blob/a270be4f2f1236d9bc1b31b6214f1672096788b7/src/lsptoolshost/debugger.ts#L45C1-L54
+        // The "ms-dotnettools.csharp" extension declares:
+        //  - "coreclr" as the debugger type for ".NET 5+ and .NET Core"
+        //  - "dotnet" as the debugger type for "C#"
+        // but haven't found the actual circumstances when "dotnet" works while "coreclr" doesn't.
+        // type: config.runtime == 'dotnet5.0' ? 'coreclr' : 'dotnet',
         type: 'coreclr',
         request: config.noDebug ? 'launch' : 'attach',
-        runtimeFamily: RuntimeFamily.DotNetCore,
+        runtimeFamily: RuntimeFamily.DotNet,
+    }
+
+    if (config.sam?.containerBuild) {
+        config.mountWith = 'write'
     }
 
     if (!config.noDebug) {
-        config = await makeCoreCLRDebugConfiguration(config, originalCodeRoot)
+        config = await makeDotnetDebugConfiguration(config, originalCodeRoot)
     }
 
     return config
@@ -67,30 +73,17 @@ export async function makeCsharpConfig(config: SamLaunchRequestArgs): Promise<Sa
  * Linux, then mount it with the SAM app on run. User's C# workspace dir will
  * have a `.vsdbg` dir after the first run.
  */
-export async function invokeCsharpLambda(
-    ctx: ExtContext,
-    config: SamLaunchRequestArgs,
-    window: Window = Window.vscode()
-): Promise<SamLaunchRequestArgs> {
+export async function invokeCsharpLambda(ctx: ExtContext, config: SamLaunchRequestArgs): Promise<SamLaunchRequestArgs> {
     config.samLocalInvokeCommand = new DefaultSamLocalInvokeCommand([waitForDebuggerMessages.DOTNET])
     // eslint-disable-next-line @typescript-eslint/unbound-method
     config.onWillAttachDebugger = waitForPort
+    const platformArchitecture = os.arch()
 
     if (!config.noDebug) {
-        const samCliVersion = await getSamCliVersion(ctx.samCliContext())
-        // TODO: Remove this when min sam version is >= 1.4.0
-        if (semver.lt(samCliVersion, minSamCliVersionForDotnet31Support)) {
-            window.showWarningMessage(
+        if ([config.architecture, platformArchitecture].includes('arm64')) {
+            void vscode.window.showWarningMessage(
                 localize(
-                    'AWS.output.sam.local.no.net.3.1.debug',
-                    'Debugging dotnetcore3.1 lambdas requires a minimum SAM CLI version of 1.4.0. Function will run locally without debug.'
-                )
-            )
-            config.noDebug = true
-        } else if (config.architecture === 'arm64') {
-            window.showWarningMessage(
-                localize(
-                    'AWS.output.sam.local.no.arm.net.3.1.debug',
+                    'AWS.sam.noArm.dotnet.debug',
                     'The vsdbg debugger does not currently support the arm64 architecture. Function will run locally without debug.'
                 )
             )
@@ -116,10 +109,10 @@ function getDebuggerPath(parentFolder: string): string {
 }
 
 async function _installDebugger({ debuggerPath }: InstallDebuggerArgs): Promise<void> {
-    await ensureDir(debuggerPath)
+    await fs.mkdir(debuggerPath)
 
     try {
-        getLogger('channel').info(
+        getLogger().info(
             localize(
                 'AWS.samcli.local.invoke.debugger.install',
                 'Installing .NET Core Debugger to {0}...',
@@ -137,7 +130,7 @@ async function _installDebugger({ debuggerPath }: InstallDebuggerArgs): Promise<
 
         let installCommand: string
         let installArgs: string[]
-        if (os.platform() == 'win32') {
+        if (os.platform() === 'win32') {
             const windir = process.env['WINDIR']
             if (!windir) {
                 throw new Error('Environment variable `WINDIR` not defined')
@@ -180,7 +173,7 @@ async function _installDebugger({ debuggerPath }: InstallDebuggerArgs): Promise<
             throw new Error(`command failed (exit code: ${install.exitCode}): ${installCommand}`)
         }
     } catch (err) {
-        getLogger('channel').info(
+        getLogger().info(
             localize(
                 'AWS.samcli.local.invoke.debugger.install.failed',
                 'Error installing .NET Core Debugger: {0}',
@@ -195,7 +188,7 @@ async function _installDebugger({ debuggerPath }: InstallDebuggerArgs): Promise<
 async function downloadInstallScript(debuggerPath: string): Promise<string> {
     let installScriptUrl: string
     let installScriptPath: string
-    if (os.platform() == 'win32') {
+    if (os.platform() === 'win32') {
         installScriptUrl = 'https://aka.ms/getvsdbgps1'
         installScriptPath = path.join(debuggerPath, 'installVsdbgScript.ps1')
     } else {
@@ -203,14 +196,14 @@ async function downloadInstallScript(debuggerPath: string): Promise<string> {
         installScriptPath = path.join(debuggerPath, 'installVsdbgScript.sh')
     }
 
-    const installScriptFetcher = new HttpResourceFetcher(installScriptUrl, { showUrl: true })
-    const installScript = await installScriptFetcher.get()
+    const installScriptFetcher = await new HttpResourceFetcher(installScriptUrl, { showUrl: true }).get()
+    const installScript = await installScriptFetcher?.text()
     if (!installScript) {
         throw Error(`Failed to download ${installScriptUrl}`)
     }
 
-    await writeFile(installScriptPath, installScript, 'utf8')
-    await chmod(installScriptPath, 0o700)
+    await fs.writeFile(installScriptPath, installScript, 'utf8')
+    await fs.chmod(installScriptPath, 0o700)
 
     return installScriptPath
 }
@@ -220,20 +213,20 @@ function getSamProjectDirPathForFile(filepath: string): string {
 }
 
 /**
- * Creates a CLR launch-config composed with the given `config`.
+ * Creates a .NET launch-config composed with the given `config`.
  */
-export async function makeCoreCLRDebugConfiguration(
+export async function makeDotnetDebugConfiguration(
     config: SamLaunchRequestArgs,
     codeUri: string
-): Promise<DotNetCoreDebugConfiguration> {
+): Promise<DotNetDebugConfiguration> {
     if (config.noDebug) {
-        throw Error(`SAM debug: invalid config ${config}`)
+        throw Error(`SAM debug: invalid config: ${config.name}`)
     }
     const pipeArgs = ['-c', `docker exec -i $(docker ps -q -f publish=${config.debugPort}) \${debuggerCommand}`]
     config.debuggerPath = pathutil.normalize(getDebuggerPath(codeUri))
-    await ensureDir(config.debuggerPath)
+    await fs.mkdir(config.debuggerPath)
 
-    const isImageLambda = isImageLambdaConfig(config)
+    const isImageLambda = await isImageLambdaConfig(config)
 
     if (isImageLambda && !config.noDebug) {
         config.containerEnvVars = {
@@ -243,7 +236,7 @@ export async function makeCoreCLRDebugConfiguration(
 
     if (os.platform() === 'win32') {
         // Coerce drive letter to uppercase. While Windows is case-insensitive, sourceFileMap is case-sensitive.
-        codeUri = codeUri.replace(pathutil.driveLetterRegex, match => match.toUpperCase())
+        codeUri = codeUri.replace(pathutil.driveLetterRegex, (match) => match.toUpperCase())
     }
 
     if (isImageLambda) {
@@ -262,15 +255,15 @@ export async function makeCoreCLRDebugConfiguration(
         }
         // we could safely leave this entry in, but might as well give the user full control if they're specifying mappings
         delete config.sourceFileMap['/build']
-        config.lambda.pathMappings.forEach(mapping => {
+        for (const mapping of config.lambda.pathMappings) {
             // this looks weird because we're mapping the PDB path to the local workspace
             config.sourceFileMap[mapping.remoteRoot] = mapping.localRoot
-        })
+        }
     }
 
     return {
         ...config,
-        runtimeFamily: RuntimeFamily.DotNetCore,
+        runtimeFamily: RuntimeFamily.DotNet,
         request: 'attach',
         // Since SAM CLI 1.0 we cannot assume PID=1. So use processName=dotnet
         // instead of processId=1.
@@ -278,14 +271,14 @@ export async function makeCoreCLRDebugConfiguration(
         pipeTransport: {
             pipeProgram: 'sh',
             pipeArgs,
-            debuggerPath: dotnetCoreDebuggerPath,
+            debuggerPath: dotnetDebuggerPath,
             pipeCwd: codeUri,
         },
         windows: {
             pipeTransport: {
                 pipeProgram: 'powershell',
                 pipeArgs,
-                debuggerPath: dotnetCoreDebuggerPath,
+                debuggerPath: dotnetDebuggerPath,
                 pipeCwd: codeUri,
             },
         },
diff --git a/src/shared/sam/debugger/goSamDebug.ts b/packages/core/src/shared/sam/debugger/goSamDebug.ts
similarity index 86%
rename from src/shared/sam/debugger/goSamDebug.ts
rename to packages/core/src/shared/sam/debugger/goSamDebug.ts
index ef0cdd70401..d0d3ee2ed57 100644
--- a/src/shared/sam/debugger/goSamDebug.ts
+++ b/packages/core/src/shared/sam/debugger/goSamDebug.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -14,12 +14,11 @@ import { findParentProjectFile } from '../../utilities/workspaceUtils'
 import { DefaultSamLocalInvokeCommand, waitForDebuggerMessages } from '../cli/samCliLocalInvoke'
 import { runLambdaFunction } from '../localLambdaRunner'
 import { SamLaunchRequestArgs } from './awsSamDebugger'
-import { getLogger } from '../../logger'
-import * as fs from 'fs-extra'
-import { ChildProcess } from '../../utilities/childProcess'
+import { getLogger } from '../../logger/logger'
+import fs from '../../fs/fs'
+import { ChildProcess } from '../../utilities/processUtils'
 import { Timeout } from '../../utilities/timeoutUtils'
-import { SystemUtilities } from '../../../shared/systemUtilities'
-import { execFileSync, SpawnOptions } from 'child_process'
+import { SpawnOptions } from 'child_process' // eslint-disable-line no-restricted-imports
 import * as nls from 'vscode-nls'
 import { sleep } from '../../utilities/timeoutUtils'
 import globals from '../../extensionGlobals'
@@ -115,7 +114,7 @@ export async function makeGoConfig(config: SamLaunchRequestArgs): Promise<GoDebu
     // We want to persist the binary we build since it takes a non-trivial amount of time to build
     config.debuggerPath = path.join(globals.context.globalStorageUri.fsPath, 'debuggers', 'delve')
 
-    const isImageLambda = isImageLambdaConfig(config)
+    const isImageLambda = await isImageLambdaConfig(config)
 
     // Reference: https://github.com/aws/aws-sam-cli/blob/4543732bf3c0da3b57fe1e5aa43ce3f41d2bd0ba/samcli/local/docker/lambda_debug_settings.py#L94-L103
     // These are the default settings. For some reason SAM CLI is not setting them even if the container
@@ -175,24 +174,27 @@ async function makeInstallScript(debuggerPath: string, isWindows: boolean): Prom
     // Go from trying to find the manifest file and uses GOPATH provided below.
     installOptions.env!['GO111MODULE'] = 'off'
 
+    async function getDelveVersion(repo: string, silent: boolean): Promise<string> {
+        try {
+            return (
+                await ChildProcess.run('git', ['-C', repo, 'describe', '--tags', '--abbrev=0'], { collect: true })
+            ).stdout.trim()
+        } catch (e) {
+            if (!silent) {
+                throw e
+            }
+            return ''
+        }
+    }
+
     // It's fine if we can't get the latest Delve version, the Toolkit will use the last built one instead
     try {
-        const goPath: string = JSON.parse(execFileSync('go', ['env', '-json']).toString()).GOPATH
+        const result = await ChildProcess.run('go', ['env', '-json'], { collect: true })
+        const goPath: string = JSON.parse(result.stdout).GOPATH
         let repoPath: string = path.join(goPath, 'src', delveRepo)
 
-        function getDelveVersion(repo: string, silent: boolean): string {
-            try {
-                return execFileSync('git', ['-C', repo, 'describe', '--tags', '--abbrev=0']).toString().trim()
-            } catch (e) {
-                if (!silent) {
-                    throw e
-                }
-                return ''
-            }
-        }
-
         if (!getDelveVersion(repoPath, true)) {
-            getLogger('channel').info(
+            getLogger().info(
                 localize(
                     'AWS.sam.debugger.godelve.download',
                     'The Delve repo was not found in your GOPATH. Downloading in a temporary directory...'
@@ -201,18 +203,18 @@ async function makeInstallScript(debuggerPath: string, isWindows: boolean): Prom
             installOptions.env!['GOPATH'] = debuggerPath
             repoPath = path.join(debuggerPath, 'src', delveRepo)
             const args = ['get', '-d', `${delveRepo}/cmd/dlv`]
-            const out = execFileSync('go', args, installOptions as any)
+            const out = await ChildProcess.run('go', args, { ...(installOptions as any), collect: true })
             getLogger().debug('"go %O": %s', args, out)
         }
 
-        delveVersion = getDelveVersion(repoPath, false)
+        delveVersion = await getDelveVersion(repoPath, false)
     } catch (e) {
         getLogger().debug('Failed to get latest Delve version: %O', e as Error)
     }
 
     delveVersion = delveVersion.replace('v', '-')
     const installScriptPath: string = path.join(debuggerPath, `install${delveVersion}.${scriptExt}`)
-    const alreadyInstalled = await SystemUtilities.fileExists(installScriptPath)
+    const alreadyInstalled = await fs.exists(installScriptPath)
 
     if (alreadyInstalled && delveVersion !== '') {
         return undefined
@@ -236,7 +238,7 @@ async function makeInstallScript(debuggerPath: string, isWindows: boolean): Prom
  * @returns False when installation fails
  */
 async function installDebugger(debuggerPath: string): Promise<boolean> {
-    await fs.ensureDir(debuggerPath)
+    await fs.mkdir(debuggerPath)
     const isWindows: boolean = os.platform() === 'win32'
     let installScript: InstallScript | undefined
 
@@ -249,21 +251,21 @@ async function installDebugger(debuggerPath: string): Promise<boolean> {
 
         const childProcess = new ChildProcess(installScript.path, [], { spawnOptions: installScript.options })
         const install = await childProcess.run({
-            onStdout: (text: string) => getLogger('channel').info(`[Delve install script] -> ${text}`),
-            onStderr: (text: string) => getLogger('channel').error(`[Delve install script] -> ${text}`),
+            onStdout: (text: string) => getLogger().info(`[Delve install script] -> ${text}`),
+            onStderr: (text: string) => getLogger().error(`[Delve install script] -> ${text}`),
         })
 
         const code = install.exitCode
-        if (!fs.existsSync(path.join(debuggerPath, 'dlv'))) {
+        if (!(await fs.exists(path.join(debuggerPath, 'dlv')))) {
             throw new Error(`Install script did not generate the Delve binary: exit code ${code}`)
         } else if (code) {
-            getLogger('channel').warn(`Install script did not sucessfully run, using old Delve binary...`)
+            getLogger().warn(`Install script did not sucessfully run, using old Delve binary...`)
         } else {
             getLogger().info(`Installed Delve debugger in ${debuggerPath}`)
         }
     } catch (e) {
-        if (installScript && (await SystemUtilities.fileExists(installScript.path))) {
-            fs.unlinkSync(installScript.path) // Removes the install script since it failed
+        if (installScript && (await fs.exists(installScript.path))) {
+            await fs.delete(installScript.path) // Removes the install script since it failed
         }
         getLogger().error('Failed to cross-compile Delve debugger: %O', e as Error)
         return false
diff --git a/packages/core/src/shared/sam/debugger/javaSamDebug.ts b/packages/core/src/shared/sam/debugger/javaSamDebug.ts
new file mode 100644
index 00000000000..26ebad889d6
--- /dev/null
+++ b/packages/core/src/shared/sam/debugger/javaSamDebug.ts
@@ -0,0 +1,66 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { getCodeRoot, isImageLambdaConfig } from '../../../lambda/local/debugConfiguration'
+import { RuntimeFamily } from '../../../lambda/models/samLambdaRuntime'
+import { ExtContext } from '../../extensions'
+import { sleep } from '../../utilities/timeoutUtils'
+import { DefaultSamLocalInvokeCommand, waitForDebuggerMessages } from '../cli/samCliLocalInvoke'
+import { runLambdaFunction, waitForPort } from '../localLambdaRunner'
+import { SamLaunchRequestArgs } from './awsSamDebugger'
+
+export async function makeJavaConfig(config: SamLaunchRequestArgs): Promise<SamLaunchRequestArgs> {
+    if (!config.baseBuildDir) {
+        throw Error('invalid state: config.baseBuildDir was not set')
+    }
+
+    config = {
+        ...config,
+        request: config.noDebug ? 'launch' : 'attach',
+    }
+
+    config.codeRoot = (await getCodeRoot(config.workspaceFolder, config))!
+
+    config.type = 'java'
+    config.runtimeFamily = RuntimeFamily.Java
+
+    if (!config.noDebug) {
+        config.hostName = '127.0.0.1'
+        config.port = config.debugPort
+        if (await isImageLambdaConfig(config)) {
+            config.containerEnvVars = {
+                _JAVA_OPTIONS: getJavaOptionsEnvVar(config),
+            }
+        }
+    }
+
+    return config
+}
+
+export async function invokeJavaLambda(ctx: ExtContext, config: SamLaunchRequestArgs): Promise<SamLaunchRequestArgs> {
+    config.samLocalInvokeCommand = new DefaultSamLocalInvokeCommand([waitForDebuggerMessages.JAVA])
+    // eslint-disable-next-line @typescript-eslint/unbound-method
+    config.onWillAttachDebugger = async (port, timeout) => {
+        await waitForPort(port, timeout, true)
+        await sleep(1000)
+    }
+    return await runLambdaFunction(ctx, config, async () => {})
+}
+
+function getJavaOptionsEnvVar(config: SamLaunchRequestArgs): string {
+    switch (config.runtime) {
+        case 'java11':
+            // https://github.com/aws/aws-sam-cli/blob/86f88cbd7df365960f7015c5d086b0db7aedd9d5/samcli/local/docker/lambda_debug_settings.py#L53
+            return `-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,quiet=y,address=*:${config.debugPort} -XX:MaxHeapSize=2834432k -XX:MaxMetaspaceSize=163840k -XX:ReservedCodeCacheSize=81920k -XX:+UseSerialGC -XX:-TieredCompilation -Djava.net.preferIPv4Stack=true`
+        case 'java17':
+            // https://github.com/aws/aws-sam-cli/blob/90aa5cf11e1c5cbfbe66aea2e2de10d478d48231/samcli/local/docker/lambda_debug_settings.py#L86
+            return `-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,quiet=y,address=*:${config.debugPort} -XX:MaxHeapSize=2834432k -XX:+UseSerialGC -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djava.net.preferIPv4Stack=true`
+        case 'java21':
+            // https://github.com/aws/aws-sam-cli/blob/90aa5cf11e1c5cbfbe66aea2e2de10d478d48231/samcli/local/docker/lambda_debug_settings.py#L96
+            return `-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,quiet=y,address=*:${config.debugPort} -XX:MaxHeapSize=2834432k -XX:+UseSerialGC -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djava.net.preferIPv4Stack=true`
+        default:
+            return `-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,quiet=y,address=${config.debugPort} -XX:MaxHeapSize=2834432k -XX:MaxMetaspaceSize=163840k -XX:ReservedCodeCacheSize=81920k -XX:+UseSerialGC -XX:-TieredCompilation -Djava.net.preferIPv4Stack=true -Xshare:off`
+    }
+}
diff --git a/packages/core/src/shared/sam/debugger/pythonSamDebug.ts b/packages/core/src/shared/sam/debugger/pythonSamDebug.ts
new file mode 100644
index 00000000000..902dc85003d
--- /dev/null
+++ b/packages/core/src/shared/sam/debugger/pythonSamDebug.ts
@@ -0,0 +1,174 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Runtime } from '@aws-sdk/client-lambda'
+import * as os from 'os'
+import * as path from 'path'
+import {
+    isImageLambdaConfig,
+    PythonDebugConfiguration,
+    PythonPathMapping,
+} from '../../../lambda/local/debugConfiguration'
+import { RuntimeFamily } from '../../../lambda/models/samLambdaRuntime'
+import globals from '../../extensionGlobals'
+import { ExtContext } from '../../extensions'
+import { fileExists, readFileAsString } from '../../filesystemUtilities'
+import { getLogger } from '../../logger/logger'
+import * as pathutil from '../../utilities/pathUtils'
+import { getLocalRootVariants } from '../../utilities/pathUtils'
+import { DefaultSamLocalInvokeCommand, waitForDebuggerMessages } from '../cli/samCliLocalInvoke'
+import { runLambdaFunction } from '../localLambdaRunner'
+import { SamLaunchRequestArgs } from './awsSamDebugger'
+import fs from '../../fs/fs'
+
+/** SAM will mount the --debugger-path to /tmp/lambci_debug_files */
+const debugpyWrapperPath = '/tmp/lambci_debug_files/py_debug_wrapper.py'
+
+// TODO: Fix this! Implement a more robust/flexible solution. This is just a basic minimal proof of concept.
+export async function getSamProjectDirPathForFile(filepath: string): Promise<string> {
+    return path.dirname(filepath)
+}
+
+// Add create debugging manifest/requirements.txt containing debugpy
+async function makePythonDebugManifest(params: {
+    isImageLambda: boolean
+    samProjectCodeRoot: string
+    outputDir: string
+}): Promise<string | undefined> {
+    let manifestText = ''
+    const manfestPath = path.join(params.samProjectCodeRoot, 'requirements.txt')
+    // TODO: figure out how to get debugpy in the container without hacking the user's requirements
+    const debugManifestPath = params.isImageLambda ? manfestPath : path.join(params.outputDir, 'debug-requirements.txt')
+    if (await fileExists(manfestPath)) {
+        manifestText = await readFileAsString(manfestPath)
+    }
+    getLogger().debug(`pythonCodeLensProvider.makePythonDebugManifest params: %O`, params)
+
+    // TODO: If another module name includes the string "debugpy", this will be skipped...
+    if (!manifestText.includes('debugpy')) {
+        manifestText += `${os.EOL}debugpy>=1.0,<2`
+        await fs.writeFile(debugManifestPath, manifestText)
+
+        return debugManifestPath
+    }
+    // else we don't need to override the manifest. nothing to return
+}
+
+/**
+ * Gathers and sets launch-config info by inspecting the workspace and creating
+ * temp files/directories as needed.
+ *
+ * Does NOT execute/invoke SAM, docker, etc.
+ */
+export async function makePythonDebugConfig(config: SamLaunchRequestArgs): Promise<PythonDebugConfiguration> {
+    if (!config.baseBuildDir) {
+        throw Error('invalid state: config.baseBuildDir was not set')
+    }
+    if (!config.codeRoot) {
+        // Last-resort attempt to discover the project root (when there is no
+        // `launch.json` nor `template.yaml`).
+        config.codeRoot = await getSamProjectDirPathForFile(config?.templatePath ?? config.documentUri!.fsPath)
+        if (!config.codeRoot) {
+            // TODO: return error and show it at the caller.
+            throw Error('missing launch.json, template.yaml, and failed to discover project root')
+        }
+    }
+    config.codeRoot = pathutil.normalize(config.codeRoot)
+
+    let manifestPath: string | undefined
+    if (!config.noDebug) {
+        const isImageLambda = await isImageLambdaConfig(config)
+
+        // Mounted in the Docker container as: /tmp/lambci_debug_files
+        config.debuggerPath = globals.context.asAbsolutePath(path.join('resources', 'debugger'))
+        // NOTE: SAM CLI splits on each *single* space in `--debug-args`!
+        //       Extra spaces will be passed as spurious "empty" arguments :(
+        const debugArgs = `${debugpyWrapperPath} --listen 0.0.0.0:${config.debugPort} --wait-for-client --log-to-stderr`
+        if (isImageLambda) {
+            const params = getPythonExeAndBootstrap(config.runtime)
+            config.debugArgs = [`${params.python} ${debugArgs} ${params.bootstrap}`]
+        } else {
+            config.debugArgs = [debugArgs]
+        }
+
+        manifestPath = await makePythonDebugManifest({
+            isImageLambda: isImageLambda,
+            samProjectCodeRoot: config.codeRoot,
+            outputDir: config.baseBuildDir,
+        })
+    }
+
+    let pathMappings: PythonPathMapping[]
+    if (config.lambda?.pathMappings !== undefined) {
+        pathMappings = config.lambda.pathMappings
+    } else {
+        pathMappings = getLocalRootVariants(config.codeRoot).map<PythonPathMapping>((variant) => {
+            return {
+                localRoot: variant,
+                remoteRoot: '/var/task',
+            }
+        })
+    }
+
+    // Make debugpy output log information if our loglevel is at 'debug'
+    if (!config.noDebug && getLogger().logLevelEnabled('debug')) {
+        config.debugArgs![0] += ' --debug'
+    }
+
+    return {
+        ...config,
+        type: 'python',
+        request: config.noDebug ? 'launch' : 'attach',
+        runtimeFamily: RuntimeFamily.Python,
+
+        //
+        // Python-specific fields.
+        //
+        manifestPath: manifestPath,
+        port: config.debugPort ?? -1,
+        host: 'localhost',
+        pathMappings,
+        // Disable redirectOutput, we collect child process stdout/stderr and
+        // explicitly write to Debug Console.
+        redirectOutput: false,
+    }
+}
+
+/**
+ * Launches and attaches debugger to a SAM Python project.
+ */
+export async function invokePythonLambda(
+    ctx: ExtContext,
+    config: PythonDebugConfiguration
+): Promise<PythonDebugConfiguration> {
+    config.samLocalInvokeCommand = new DefaultSamLocalInvokeCommand([waitForDebuggerMessages.PYTHON])
+
+    config.onWillAttachDebugger = undefined
+    const c = (await runLambdaFunction(ctx, config, async () => {})) as PythonDebugConfiguration
+    return c
+}
+
+function getPythonExeAndBootstrap(runtime: Runtime) {
+    // unfortunately new 'Image'-base images did not standardize the paths
+    // https://github.com/aws/aws-sam-cli/blob/7d5101a8edeb575b6925f9adecf28f47793c403c/samcli/local/docker/lambda_debug_settings.py
+    switch (runtime) {
+        case 'python3.7':
+            return { python: '/var/lang/bin/python3.7', bootstrap: '/var/runtime/bootstrap' }
+        case 'python3.8':
+            return { python: '/var/lang/bin/python3.8', bootstrap: '/var/runtime/bootstrap.py' }
+        case 'python3.9':
+            return { python: '/var/lang/bin/python3.9', bootstrap: '/var/runtime/bootstrap.py' }
+        case 'python3.10':
+            return { python: '/var/lang/bin/python3.10', bootstrap: '/var/runtime/bootstrap.py' }
+        case 'python3.11':
+            return { python: '/var/lang/bin/python3.11', bootstrap: '/var/runtime/bootstrap.py' }
+        case 'python3.12':
+            return { python: '/var/lang/bin/python3.12', bootstrap: '/var/runtime/bootstrap.py' }
+        case 'python3.13' as Runtime:
+            return { python: '/var/lang/bin/python3.13', bootstrap: '/var/runtime/bootstrap.py' }
+        default:
+            throw new Error(`Python SAM debug logic ran for invalid Python runtime: ${runtime}`)
+    }
+}
diff --git a/src/shared/sam/debugger/typescriptSamDebug.ts b/packages/core/src/shared/sam/debugger/typescriptSamDebug.ts
similarity index 81%
rename from src/shared/sam/debugger/typescriptSamDebug.ts
rename to packages/core/src/shared/sam/debugger/typescriptSamDebug.ts
index 24ba2298c82..e7ebece92e0 100644
--- a/src/shared/sam/debugger/typescriptSamDebug.ts
+++ b/packages/core/src/shared/sam/debugger/typescriptSamDebug.ts
@@ -1,23 +1,23 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { existsSync, PathLike, readFileSync } from 'fs'
-import { writeFileSync } from 'fs-extra'
+import { existsSync, PathLike, readFileSync } from 'fs' // eslint-disable-line no-restricted-imports
 import * as path from 'path'
 import * as vscode from 'vscode'
 import { isImageLambdaConfig, NodejsDebugConfiguration } from '../../../lambda/local/debugConfiguration'
 import { RuntimeFamily } from '../../../lambda/models/samLambdaRuntime'
-import * as systemutil from '../../../shared/systemUtilities'
-import { ChildProcess } from '../../../shared/utilities/childProcess'
+import { ChildProcess } from '../../utilities/processUtils'
 import * as pathutil from '../../../shared/utilities/pathUtils'
 import { ExtContext } from '../../extensions'
-import { getLogger } from '../../logger'
+import { getLogger } from '../../logger/logger'
 import { findParentProjectFile } from '../../utilities/workspaceUtils'
 import { DefaultSamLocalInvokeCommand, waitForDebuggerMessages } from '../cli/samCliLocalInvoke'
 import { runLambdaFunction, waitForPort } from '../localLambdaRunner'
 import { SamLaunchRequestArgs } from './awsSamDebugger'
+import { findTypescriptCompiler } from '../../utilities/pathFind'
+import fs from '../../fs/fs'
 
 const tsConfigFile = 'aws-toolkit-tsconfig.json'
 
@@ -76,11 +76,12 @@ export async function makeTypescriptConfig(config: SamLaunchRequestArgs): Promis
     // compile typescript code and convert lambda handler if necessary
     await compileTypeScript(config)
 
-    const isImageLambda = isImageLambdaConfig(config)
+    const isImageLambda = await isImageLambdaConfig(config)
 
     if (isImageLambda && !config.noDebug) {
+        // Need --inspect to enable debugging. SAM CLI doesn't send env vars for "Image" packagetype.
         config.containerEnvVars = {
-            NODE_OPTIONS: `--inspect-brk=0.0.0.0:${config.debugPort} --max-http-header-size 81920`,
+            NODE_OPTIONS: `--inspect=0.0.0.0:${config.debugPort} --max-http-header-size 81920`,
         }
     }
 
@@ -110,7 +111,11 @@ export async function makeTypescriptConfig(config: SamLaunchRequestArgs): Promis
         remoteRoot: remoteRoot ?? '/var/task',
         protocol: 'inspector',
         // Stop at first user breakpoint, not the runtime bootstrap file.
-        stopOnEntry: config.stopOnEntry === undefined ? false : !!config.stopOnEntry,
+        stopOnEntry: config.stopOnEntry ?? false,
+        // See `continueOnAttach` at: https://code.visualstudio.com/docs/nodejs/nodejs-debugging
+        // Workaround SAM CLI's outdated settings: https://github.com/aws/aws-sam-cli/blob/1adc080b82476288804c41c553c5e2ad86f28298/samcli/local/docker/lambda_debug_settings.py#L165
+        // Not needed (but harmless) for "Image" packagetype: we set "NODE_OPTIONS:--inspect=…" above.
+        continueOnAttach: config.continueOnAttach ?? true,
         skipFiles: ['/var/runtime/node_modules/**/*.js', '<node_internals>/**/*.js'],
     }
 
@@ -156,10 +161,10 @@ async function compileTypeScript(config: SamLaunchRequestArgs): Promise<void> {
 
         try {
             const tsConfig = JSON.parse(readFileSync(tsConfigPath).toString())
-            getLogger('channel').info(`Using base TypeScript config: ${tsConfigPath}`)
+            getLogger().info(`Using base TypeScript config: ${tsConfigPath}`)
             return tsConfig
         } catch (err) {
-            getLogger('channel').error(`Unable to use TypeScript base: ${tsConfigPath}`)
+            getLogger().error(`Unable to use TypeScript base: ${tsConfigPath}`)
         }
 
         return undefined
@@ -171,7 +176,7 @@ async function compileTypeScript(config: SamLaunchRequestArgs): Promise<void> {
         loadBaseConfig(tsConfigPath) ?? loadBaseConfig(path.join(config.codeRoot, tsConfigInitialBaseFile)) ?? {}
 
     if (tsConfig.compilerOptions === undefined) {
-        getLogger('channel').info('Creating TypeScript config')
+        getLogger().info('Creating TypeScript config')
         tsConfig.compilerOptions = {
             target: 'es6',
             module: 'commonjs',
@@ -197,23 +202,23 @@ async function compileTypeScript(config: SamLaunchRequestArgs): Promise<void> {
     types.push('node')
     compilerOptions.types = [...new Set(types)]
 
-    writeFileSync(tsConfigPath, JSON.stringify(tsConfig, undefined, 4))
+    await fs.writeFile(tsConfigPath, JSON.stringify(tsConfig, undefined, 4))
 
     // resolve ts lambda handler to point into build directory relative to codeRoot
     const tsLambdaHandler = path.relative(config.codeRoot, path.join(tsBuildDir, config.invokeTarget.lambdaHandler))
     config.invokeTarget.lambdaHandler = pathutil.normalizeSeparator(tsLambdaHandler)
-    getLogger('channel').info(`Resolved compiled lambda handler to ${tsLambdaHandler}`)
+    getLogger().info(`Resolved compiled lambda handler to ${tsLambdaHandler}`)
 
-    const tsc = await systemutil.SystemUtilities.findTypescriptCompiler()
+    const tsc = await findTypescriptCompiler()
     if (!tsc) {
         throw new Error('TypeScript compiler "tsc" not found in node_modules/ or the system.')
     }
 
     try {
-        getLogger('channel').info(`Compiling TypeScript app with: "${tsc}"`)
+        getLogger().info(`Compiling TypeScript app with: "${tsc}"`)
         await new ChildProcess(tsc, ['--project', tsConfigPath]).run()
     } catch (error) {
-        getLogger('channel').error(`TypeScript compile error: ${error}`)
+        getLogger().error(`TypeScript compile error: ${error}`)
         throw Error('Failed to compile TypeScript app')
     }
 }
diff --git a/packages/core/src/shared/sam/deploy.ts b/packages/core/src/shared/sam/deploy.ts
new file mode 100644
index 00000000000..387417e82ea
--- /dev/null
+++ b/packages/core/src/shared/sam/deploy.ts
@@ -0,0 +1,260 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { AWSTreeNodeBase } from '../treeview/nodes/awsTreeNodeBase'
+import { TreeNode, isTreeNode } from '../treeview/resourceTreeDataProvider'
+import globals from '../../shared/extensionGlobals'
+import { ToolkitError } from '../../shared/errors'
+import { CloudFormationClient } from '../clients/cloudFormation'
+import { S3Client } from '../clients/s3'
+import { samDeployUrl } from '../constants'
+import { getSpawnEnv } from '../env/resolveEnv'
+import { CloudFormationTemplateRegistry } from '../fs/templateRegistry'
+import { telemetry } from '../telemetry/telemetry'
+import { createExitPrompter } from '../ui/common/exitPrompter'
+import { createRegionPrompter } from '../ui/common/region'
+import { ChildProcess } from '../utilities/processUtils'
+import { CancellationError } from '../utilities/timeoutUtils'
+import { addTelemetryEnvVar } from './cli/samCliInvokerUtils'
+import { validateSamDeployConfig, SamConfig, writeSamconfigGlobal } from './config'
+import { BucketSource, createBucketSourcePrompter, createBucketNamePrompter } from '../ui/sam/bucketPrompter'
+import { createStackPrompter } from '../ui/sam/stackPrompter'
+import { TemplateItem, createTemplatePrompter } from '../ui/sam/templatePrompter'
+import { createDeployParamsSourcePrompter, ParamsSource } from '../ui/sam/paramsSourcePrompter'
+import { getErrorCode, getProjectRoot, getSamCliPathAndVersion, getSource, updateRecentResponse } from './utils'
+import { runInTerminal } from './processTerminal'
+import { deployMementoRootKey } from './constants'
+import {
+    TemplateParametersForm,
+    TemplateParametersWizard,
+} from '../../awsService/appBuilder/wizards/templateParametersWizard'
+import { getParameters } from '../../lambda/config/parameterUtils'
+import { CompositeWizard } from '../wizards/compositeWizard'
+
+export interface DeployParams {
+    readonly paramsSource: ParamsSource
+    readonly template: TemplateItem
+    readonly templateParameters: any
+    readonly region: string
+    readonly stackName: string
+    readonly bucketSource: BucketSource
+    readonly bucketName: string
+    readonly projectRoot: vscode.Uri
+
+    [key: string]: any
+}
+
+export enum SamDeployEntryPoints {
+    SamTemplateFile,
+    RegionNodeContextMenu,
+    AppBuilderNodeButton,
+    CommandPalette,
+}
+
+function getDeployEntryPoint(arg: vscode.Uri | AWSTreeNodeBase | TreeNode | undefined) {
+    if (arg instanceof vscode.Uri) {
+        return SamDeployEntryPoints.SamTemplateFile
+    } else if (arg instanceof AWSTreeNodeBase) {
+        return SamDeployEntryPoints.RegionNodeContextMenu
+    } else if (isTreeNode(arg)) {
+        return SamDeployEntryPoints.AppBuilderNodeButton
+    } else {
+        return SamDeployEntryPoints.CommandPalette
+    }
+}
+
+type DeployResult = {
+    isSuccess: boolean
+}
+
+export class DeployWizard extends CompositeWizard<DeployParams> {
+    registry: CloudFormationTemplateRegistry
+    state: Partial<DeployParams>
+    arg: any
+    public constructor(
+        state: Partial<DeployParams>,
+        registry: CloudFormationTemplateRegistry,
+        arg?: any,
+        shouldPromptExit: boolean = true
+    ) {
+        super({ initState: state, exitPrompterProvider: shouldPromptExit ? createExitPrompter : undefined })
+        this.registry = registry
+        this.state = state
+        this.arg = arg
+    }
+
+    public override async init(): Promise<this> {
+        this.form.template.bindPrompter(() => createTemplatePrompter(this.registry, deployMementoRootKey, samDeployUrl))
+
+        this.form.templateParameters.bindPrompter(
+            async ({ template }) =>
+                this.createWizardPrompter<TemplateParametersWizard, TemplateParametersForm>(
+                    TemplateParametersWizard,
+                    template!.uri,
+                    samDeployUrl,
+                    deployMementoRootKey
+                ),
+            {
+                showWhen: async ({ template }) => {
+                    const samTemplateParameters = await getParameters(template!.uri)
+                    return !!samTemplateParameters && samTemplateParameters.size > 0
+                },
+            }
+        )
+
+        this.form.projectRoot.setDefault(({ template }) => getProjectRoot(template))
+
+        this.form.paramsSource.bindPrompter(async ({ projectRoot }) =>
+            createDeployParamsSourcePrompter(await validateSamDeployConfig(projectRoot))
+        )
+        this.form.region.bindPrompter(() => createRegionPrompter().transform((r) => r.id), {
+            showWhen: ({ paramsSource }) =>
+                paramsSource === ParamsSource.Specify || paramsSource === ParamsSource.SpecifyAndSave,
+        })
+        this.form.stackName.bindPrompter(
+            ({ region }) => createStackPrompter(new CloudFormationClient(region!), deployMementoRootKey, samDeployUrl),
+            {
+                showWhen: ({ paramsSource }) =>
+                    paramsSource === ParamsSource.Specify || paramsSource === ParamsSource.SpecifyAndSave,
+            }
+        )
+        this.form.bucketSource.bindPrompter(() => createBucketSourcePrompter(samDeployUrl), {
+            showWhen: ({ paramsSource }) =>
+                paramsSource === ParamsSource.Specify || paramsSource === ParamsSource.SpecifyAndSave,
+        })
+        this.form.bucketName.bindPrompter(
+            ({ region }) => createBucketNamePrompter(new S3Client(region!), deployMementoRootKey, samDeployUrl),
+            {
+                showWhen: ({ bucketSource }) => bucketSource === BucketSource.UserProvided,
+            }
+        )
+
+        return this
+    }
+}
+
+export async function getDeployWizard(arg?: any, shouldPromptExit?: boolean): Promise<DeployWizard> {
+    let initState: Partial<DeployParams>
+    let templateUri: vscode.Uri
+    const entryPoint = getDeployEntryPoint(arg)
+
+    switch (entryPoint) {
+        case SamDeployEntryPoints.SamTemplateFile:
+            initState = { template: { uri: arg as vscode.Uri, data: {} } as TemplateItem }
+            break
+        case SamDeployEntryPoints.RegionNodeContextMenu:
+            initState = { region: arg.regionCode }
+            break
+        case SamDeployEntryPoints.AppBuilderNodeButton:
+            templateUri = arg.getTreeItem().resourceUri as vscode.Uri
+            initState = { template: { uri: templateUri, data: {} } as TemplateItem }
+            break
+        case SamDeployEntryPoints.CommandPalette:
+        default:
+            initState = {}
+            break
+    }
+
+    const wizard = new DeployWizard(initState, await globals.templateRegistry, arg, shouldPromptExit)
+    return wizard
+}
+
+export async function runDeploy(arg: any, wizardParams?: DeployParams): Promise<DeployResult> {
+    return await telemetry.sam_deploy.run(async () => {
+        const source = getSource(arg)
+        telemetry.record({ source: source })
+        const deployEnv = await getSpawnEnv(process.env, { promptForInvalidCredential: true })
+        const params = wizardParams ?? (await (await getDeployWizard(arg)).run())
+        if (params === undefined) {
+            throw new CancellationError('user')
+        }
+
+        const deployFlags: string[] = ['--no-confirm-changeset']
+        const buildFlags: string[] = ['--cached']
+
+        if (params.paramsSource === ParamsSource.SamConfig) {
+            const samconfig = await SamConfig.fromProjectRoot(params.projectRoot)
+            const samconfigRegionInfo = `${await samconfig.getCommandParam('global', 'region')}`
+
+            // When entry point is RegionNode, the params.region should take precedence
+            deployFlags.push('--region', `${params.region || samconfigRegionInfo}`)
+            deployFlags.push('--config-file', `${samconfig.location.fsPath}`)
+        } else {
+            deployFlags.push('--region', `${params.region}`)
+            deployFlags.push('--stack-name', `${params.stackName}`)
+            params.bucketName
+                ? deployFlags.push('--s3-bucket', `${params.bucketName}`)
+                : deployFlags.push('--resolve-s3')
+            deployFlags.push('--capabilities', 'CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM')
+        }
+
+        if (params.paramsSource === ParamsSource.SpecifyAndSave) {
+            deployFlags.push('--save-params')
+        }
+
+        if (!!params.templateParameters && Object.entries(params.templateParameters).length > 0) {
+            const templateParameters = new Map<string, string>(Object.entries(params.templateParameters))
+            const paramsToSet: string[] = []
+            for (const [key, value] of templateParameters.entries()) {
+                if (value) {
+                    await updateRecentResponse(deployMementoRootKey, params.template.uri.fsPath, key, value)
+                    paramsToSet.push(`ParameterKey=${key},ParameterValue=${value}`)
+                }
+            }
+            paramsToSet.length > 0 && deployFlags.push('--parameter-overrides', paramsToSet.join(' '))
+        }
+
+        await updateRecentResponse(deployMementoRootKey, 'global', 'templatePath', params.template.uri.fsPath)
+
+        try {
+            const { path: samCliPath } = await getSamCliPathAndVersion()
+
+            // Create a child process to run the SAM build command
+            const buildProcess = new ChildProcess(samCliPath, ['build', ...buildFlags], {
+                spawnOptions: await addTelemetryEnvVar({
+                    cwd: params.projectRoot.fsPath,
+                    env: deployEnv,
+                }),
+            })
+
+            try {
+                // Run SAM build in Terminal
+                await runInTerminal(buildProcess, 'build')
+            } catch (error) {
+                throw ToolkitError.chain(error, 'Failed to build SAM template', { details: { ...buildFlags } })
+            }
+
+            // Create a child process to run the SAM deploy command
+            const deployProcess = new ChildProcess(samCliPath, ['deploy', ...deployFlags], {
+                spawnOptions: await addTelemetryEnvVar({
+                    cwd: params.projectRoot.fsPath,
+                    env: deployEnv,
+                }),
+            })
+
+            // Run SAM deploy in Terminal
+            const { paramsSource, stackName, region, projectRoot } = params
+            const shouldWriteDeploySamconfigGlobal = paramsSource !== ParamsSource.SamConfig && !!stackName && !!region
+            try {
+                await runInTerminal(deployProcess, 'deploy')
+                shouldWriteDeploySamconfigGlobal && (await writeSamconfigGlobal(projectRoot, stackName, region))
+            } catch (error: any) {
+                if (error.code === 'NoUpdateExitCode') {
+                    shouldWriteDeploySamconfigGlobal && (await writeSamconfigGlobal(projectRoot, stackName, region))
+                }
+                throw error
+            }
+        } catch (error) {
+            throw ToolkitError.chain(error, 'Failed to deploy SAM template', {
+                details: { ...deployFlags },
+                code: getErrorCode(error),
+            })
+        }
+        return {
+            isSuccess: true,
+        }
+    })
+}
diff --git a/src/shared/sam/localLambdaRunner.ts b/packages/core/src/shared/sam/localLambdaRunner.ts
similarity index 80%
rename from src/shared/sam/localLambdaRunner.ts
rename to packages/core/src/shared/sam/localLambdaRunner.ts
index 035cced2c9e..447fad81f26 100644
--- a/src/shared/sam/localLambdaRunner.ts
+++ b/packages/core/src/shared/sam/localLambdaRunner.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -9,27 +9,30 @@ import * as vscode from 'vscode'
 import * as nls from 'vscode-nls'
 import * as pathutil from '../utilities/pathUtils'
 import got, { OptionsOfTextResponseBody, RequestError } from 'got'
-import { copyFile, readFile, remove, writeFile } from 'fs-extra'
 import { isImageLambdaConfig } from '../../lambda/local/debugConfiguration'
 import { getFamily, RuntimeFamily } from '../../lambda/models/samLambdaRuntime'
 import { ExtContext } from '../extensions'
-import { getLogger } from '../logger'
+import { getLogger } from '../logger/logger'
 import { SamTemplateGenerator } from '../templates/sam/samTemplateGenerator'
 import { Timeout } from '../utilities/timeoutUtils'
 import { tryGetAbsolutePath } from '../utilities/workspaceUtils'
 import { SamCliBuildInvocation, SamCliBuildInvocationArguments } from './cli/samCliBuild'
 import { SamCliLocalInvokeInvocation, SamCliLocalInvokeInvocationArguments } from './cli/samCliLocalInvoke'
 import { SamLaunchRequestArgs } from './debugger/awsSamDebugger'
-import { asEnvironmentVariables } from '../../credentials/credentialsUtilities'
 import { buildSamCliStartApiArguments } from './cli/samCliStartApi'
 import { DefaultSamCliProcessInvoker } from './cli/samCliInvoker'
 import { APIGatewayProperties } from './debugger/awsSamDebugConfiguration.gen'
-import { ChildProcess } from '../utilities/childProcess'
+import { ChildProcess } from '../utilities/processUtils'
 import { SamCliSettings } from './cli/samCliSettings'
-import { CloudFormation } from '../cloudformation/cloudformation'
+import * as CloudFormation from '../cloudformation/cloudformation'
 import { sleep } from '../utilities/timeoutUtils'
 import { showMessageWithCancel } from '../utilities/messages'
 import { ToolkitError, UnknownError } from '../errors'
+import { SamCliError } from './cli/samCliInvokerUtils'
+import fs from '../fs/fs'
+import { getSpawnEnv } from '../env/resolveEnv'
+import { asEnvironmentVariables } from '../../auth/credentials/utils'
+import { Runtime } from '@aws-sdk/client-lambda'
 
 const localize = nls.loadMessageBundle()
 
@@ -124,7 +127,7 @@ async function buildLambdaHandler(
 ): Promise<string> {
     const processInvoker = new DefaultSamCliProcessInvoker(settings)
 
-    getLogger('channel').info(localize('AWS.output.building.sam.application', 'Building SAM application...'))
+    getLogger().info(localize('AWS.output.building.sam.application', 'Building SAM application...'))
     const samBuildOutputFolder = path.join(config.baseBuildDir!, 'output')
 
     const samCliArgs: SamCliBuildInvocationArguments = {
@@ -155,18 +158,18 @@ async function buildLambdaHandler(
     const err = await samBuild
         .execute(timer)
         .then(() => {})
-        .catch(e => UnknownError.cast(e))
+        .catch((e) => UnknownError.cast(e))
     const failure = err ?? samBuild.failure()
     if (failure) {
         // TODO(sijaden): ask SAM CLI for a way to map exit codes to error codes
-        // We can also scrape the debug output though that won't be as reliable
         if (typeof failure === 'string') {
             throw new ToolkitError(failure, { code: 'BuildFailure' })
         } else {
-            throw ToolkitError.chain(failure, 'Failed to build SAM application', { code: 'BuildFailure' })
+            const msg = `SAM build failed${err instanceof SamCliError ? ': ' + err.message : ''}`
+            throw ToolkitError.chain(err, msg, { code: 'BuildFailure' })
         }
     }
-    getLogger('channel').info(localize('AWS.output.building.sam.application.complete', 'Build complete.'))
+    getLogger().info(localize('AWS.output.building.sam.application.complete', 'Build complete.'))
 
     return path.join(samBuildOutputFolder, 'template.yaml')
 }
@@ -177,7 +180,7 @@ async function invokeLambdaHandler(
     config: SamLaunchRequestArgs,
     settings: SamCliSettings
 ): Promise<ChildProcess> {
-    getLogger('channel').info(localize('AWS.output.starting.sam.app.locally', 'Starting SAM application locally'))
+    getLogger().info(localize('AWS.output.starting.sam.app.locally', 'Starting SAM application locally'))
     getLogger().debug(`localLambdaRunner.invokeLambdaFunction: ${config.name}`)
 
     const debugPort = !config.noDebug ? config.debugPort?.toString() : undefined
@@ -205,15 +208,13 @@ async function invokeLambdaHandler(
             containerEnvFile: config.containerEnvFile,
             extraArgs: config.sam?.localArguments,
             name: config.name,
+            region: config.region,
         })
 
         return config
             .samLocalInvokeCommand!.invoke({
                 options: {
-                    env: {
-                        ...process.env,
-                        ...env,
-                    },
+                    env: env,
                 },
                 command: samCommand,
                 args: samArgs,
@@ -222,10 +223,10 @@ async function invokeLambdaHandler(
                 timeout: timer,
                 name: config.name,
             })
-            .catch(e => {
-                const message = localize('AWS.error.during.apig.local', 'Failed to start local API Gateway')
+            .catch((err) => {
+                const msg = `SAM local start-api failed${err instanceof SamCliError ? ': ' + err.message : ''}`
 
-                throw ToolkitError.chain(e, message)
+                throw ToolkitError.chain(err, msg)
             })
     } else {
         // 'target=code' or 'target=template'
@@ -242,9 +243,12 @@ async function invokeLambdaHandler(
             debugArgs: config.debugArgs,
             containerEnvFile: config.containerEnvFile,
             extraArgs: config.sam?.localArguments,
-            skipPullImage: config.sam?.skipNewImageCheck ?? (isImageLambdaConfig(config) || config.sam?.containerBuild),
+            skipPullImage:
+                config.sam?.skipNewImageCheck ?? ((await isImageLambdaConfig(config)) || config.sam?.containerBuild),
             parameterOverrides: config.parameterOverrides,
             name: config.name,
+            region: config.region,
+            runtime: config.lambda?.runtime as Runtime,
         }
 
         // sam local invoke ...
@@ -253,13 +257,11 @@ async function invokeLambdaHandler(
         try {
             return await command.execute(timer)
         } catch (err) {
-            throw ToolkitError.chain(
-                err,
-                localize('AWS.error.during.sam.local', 'Failed to run SAM application locally')
-            )
+            const msg = `SAM local invoke failed${err instanceof SamCliError ? ': ' + err.message : ''}`
+            throw ToolkitError.chain(err, msg)
         } finally {
             if (config.sam?.buildDir === undefined) {
-                await remove(config.templatePath)
+                await fs.delete(config.templatePath)
             }
         }
     }
@@ -277,30 +279,28 @@ export async function runLambdaFunction(
     config: SamLaunchRequestArgs,
     onAfterBuild: () => Promise<void>
 ): Promise<SamLaunchRequestArgs> {
-    // Verify if Docker is running
-    const dockerResponse = await new ChildProcess('docker', ['ps'], { logging: 'no' }).run()
-    if (dockerResponse.exitCode !== 0 || dockerResponse.stdout.includes('error during connect')) {
-        throw new ToolkitError('Running AWS SAM projects locally requires Docker. Is it installed and running?', {
-            code: 'NoDocker',
-        })
-    }
     // Switch over to the output channel so the user has feedback that we're getting things ready
     ctx.outputChannel.show(true)
     if (!config.noDebug) {
         const msg =
             (config.invokeTarget.target === 'api' ? `API "${config.api?.path}", ` : '') +
             `Lambda "${config.handlerName}"`
-        getLogger('channel').info(localize('AWS.output.sam.local.startDebug', 'Preparing to debug locally: {0}', msg))
+        getLogger().info(localize('AWS.output.sam.local.startDebug', 'Preparing to debug locally: {0}', msg))
     } else {
-        getLogger('channel').info(
-            localize('AWS.output.sam.local.startRun', 'Preparing to run locally: {0}', config.handlerName)
-        )
+        getLogger().info(localize('AWS.output.sam.local.startRun', 'Preparing to run locally: {0}', config.handlerName))
     }
 
-    const envVars = {
-        ...(config.awsCredentials ? asEnvironmentVariables(config.awsCredentials) : {}),
-        ...(config.aws?.region ? { AWS_DEFAULT_REGION: config.aws.region } : {}),
-    }
+    const envVars = await getSpawnEnv(
+        {
+            ...process.env,
+            ...(config.awsCredentials ? asEnvironmentVariables(config.awsCredentials) : {}),
+            ...(config.aws?.region ? { AWS_DEFAULT_REGION: config.aws.region } : {}),
+        },
+        {
+            // only inject toolkit credential if config credential is not set
+            injectCredential: config.awsCredentials ? false : true,
+        }
+    )
 
     const settings = SamCliSettings.instance
     const timer = new Timeout(settings.getLocalInvokeTimeout())
@@ -316,36 +316,35 @@ export async function runLambdaFunction(
         const payload =
             config.eventPayloadFile === undefined
                 ? undefined
-                : JSON.parse(await readFile(config.eventPayloadFile, { encoding: 'utf-8' }))
+                : JSON.parse(await fs.readFileText(config.eventPayloadFile))
 
         apiRequest = requestLocalApi(timer, config.api!, config.apiPort!, payload)
     }
 
     // SAM CLI and any API requests are executed in parallel
     // A failure from either is a failure for the whole invocation
-    const [process] = await Promise.all([invokeLambdaHandler(timer, envVars, config, settings), apiRequest]).catch(
-        err => {
-            timer.cancel()
-            throw err
-        }
-    )
+    const [processInvoker] = await Promise.all([
+        invokeLambdaHandler(timer, envVars, config, settings),
+        apiRequest,
+    ]).catch((err) => {
+        timer.cancel()
+        throw err
+    })
 
     if (config.noDebug) {
         return config
     }
 
-    const terminationListener = vscode.debug.onDidTerminateDebugSession(session => {
+    const terminationListener = vscode.debug.onDidTerminateDebugSession((session) => {
         const config = session.configuration as SamLaunchRequestArgs
         if (config.invokeTarget?.target === 'api') {
-            stopApi(process, config)
+            stopApi(processInvoker, config)
         }
     })
 
     async function attach() {
         if (config.onWillAttachDebugger) {
-            getLogger('channel').info(
-                localize('AWS.output.sam.local.waiting', 'Waiting for SAM application to start...')
-            )
+            getLogger().info(localize('AWS.output.sam.local.waiting', 'Waiting for SAM application to start...'))
             await config.onWillAttachDebugger(config.debugPort!, timer)
         }
         // HACK: remove non-serializable properties before attaching.
@@ -358,12 +357,11 @@ export async function runLambdaFunction(
             debugConfig: config,
             retryDelayMillis: attachDebuggerRetryDelayMillis,
         })
-
-        showDebugConsole()
     }
 
     try {
         await attach()
+        await showOutputChannel(ctx)
     } finally {
         vscode.Disposable.from(timer, terminationListener).dispose()
     }
@@ -411,7 +409,7 @@ async function requestLocalApi(
         retry: {
             // note: `calculateDelay` overrides the default function, so any functionality normally specified in the
             // retry options needs to be implemented yourself
-            calculateDelay: obj => {
+            calculateDelay: (obj) => {
                 if (obj.error.response !== undefined) {
                     getLogger().debug('Local API response: %s : %O', uri, obj.error.response.statusMessage)
                 }
@@ -420,7 +418,7 @@ async function requestLocalApi(
                 } else if (!notificationShown && obj.attemptCount >= retryLimit) {
                     notificationShown = true
                     getLogger().debug('Local API: showing cancel notification')
-                    showMessageWithCancel('Waiting for local API to start...', timeout)
+                    void showMessageWithCancel('Waiting for local API to start...', timeout)
                 }
 
                 getLogger().debug(`Local API: retry (${obj.attemptCount}): ${uri}: ${obj.error.message}`)
@@ -430,7 +428,7 @@ async function requestLocalApi(
         // TODO: api?.stageVariables,
     }
 
-    getLogger('channel').info(localize('AWS.sam.localApi.request', 'Sending request to local API: {0}', uri))
+    getLogger().info(localize('AWS.sam.localApi.request', 'Sending request to local API: {0}', uri))
 
     await got(uri, reqOpts).catch((err: RequestError) => {
         if (err.code === 'ETIMEDOUT') {
@@ -464,18 +462,13 @@ export async function attachDebugger({
     },
     ...params
 }: AttachDebuggerContext): Promise<void> {
-    getLogger().debug(
-        `localLambdaRunner.attachDebugger: startDebugging with config: ${JSON.stringify(
-            {
-                name: params.debugConfig.name,
-                invokeTarget: params.debugConfig.invokeTarget,
-            },
-            undefined,
-            2
-        )}`
-    )
+    const obj = {
+        name: params.debugConfig.name,
+        invokeTarget: params.debugConfig.invokeTarget,
+    }
+    getLogger().debug(`localLambdaRunner.attachDebugger: startDebugging with config: %O`, obj)
 
-    getLogger('channel').info(localize('AWS.output.sam.local.attaching', 'Attaching debugger to SAM application...'))
+    getLogger().info(localize('AWS.output.sam.local.attaching', 'Attaching debugger to SAM application...'))
 
     // The Python extension will silently fail, so it's ok for us to automatically retry
     // Users still will not be able to stop debugging without clicking stop a bunch, but
@@ -502,7 +495,7 @@ export async function attachDebugger({
         }
     }
 
-    getLogger('channel').info(localize('AWS.output.sam.local.attach.success', 'Debugger attached'))
+    getLogger().info(localize('AWS.output.sam.local.attach.success', 'Debugger attached'))
     getLogger().verbose(
         `SAM: debug session: "${vscode.debug.activeDebugSession?.name}" / ${vscode.debug.activeDebugSession?.id}`
     )
@@ -523,24 +516,22 @@ export async function waitForPort(port: number, timeout: Timeout, isDebugPort: b
     } catch (err) {
         getLogger().warn(`Timeout after ${time} ms: port was not used: ${port}`)
         if (isDebugPort) {
-            getLogger('channel').warn(
+            getLogger().warn(
                 localize('AWS.samcli.local.invoke.portUnavailable', 'Failed to use debugger port: {0}', port.toString())
             )
         } else {
-            getLogger('channel').warn(
-                localize('AWS.apig.portUnavailable', 'Failed to use API port: {0}', port.toString())
-            )
+            getLogger().warn(localize('AWS.apig.portUnavailable', 'Failed to use API port: {0}', port.toString()))
         }
     }
 }
 
-export function shouldAppendRelativePathToFuncHandler(runtime: string): boolean {
+export function shouldAppendRelativePathToFuncHandler(runtime: Runtime): boolean {
     // getFamily will throw an error if the runtime doesn't exist
     switch (getFamily(runtime)) {
         case RuntimeFamily.NodeJS:
         case RuntimeFamily.Python:
             return true
-        case RuntimeFamily.DotNetCore:
+        case RuntimeFamily.DotNet:
             return false
         // if the runtime exists but for some reason we forgot to cover it here, throw anyway so we remember to cover it
         default:
@@ -549,16 +540,14 @@ export function shouldAppendRelativePathToFuncHandler(runtime: string): boolean
 }
 
 /**
- * Brings the Debug Console in focus.
- * If the OutputChannel is showing, focus does not consistently switch over to the debug console, so we're
- * helping make this happen.
+ * Brings the Output Channel in focus.
  */
-async function showDebugConsole(): Promise<void> {
+async function showOutputChannel(ctx: ExtContext): Promise<void> {
     try {
-        await vscode.commands.executeCommand('workbench.debug.action.toggleRepl')
+        ctx.outputChannel.show(true)
     } catch (err) {
         // in case the vs code command changes or misbehaves, swallow error
-        getLogger().verbose('Unable to switch to the Debug Console: %O', err as Error)
+        getLogger().verbose('Unable to focus output channel: %O', err as Error)
     }
 }
 
@@ -587,14 +576,14 @@ export async function makeJsonFiles(config: SamLaunchRequestArgs): Promise<void>
     if (Object.keys(configEnv).length !== 0) {
         const env = JSON.stringify(getEnvironmentVariables(makeResourceName(config), configEnv))
         config.envFile = path.join(config.baseBuildDir!, 'env-vars.json')
-        await writeFile(config.envFile, env)
+        await fs.writeFile(config.envFile, env)
     }
 
     // container-env-vars.json
     if (config.containerEnvVars) {
         config.containerEnvFile = path.join(config.baseBuildDir!, 'container-env-vars.json')
         const containerEnv = JSON.stringify(config.containerEnvVars)
-        await writeFile(config.containerEnvFile, containerEnv)
+        await fs.writeFile(config.containerEnvFile, containerEnv)
     }
 
     // event.json
@@ -610,12 +599,12 @@ export async function makeJsonFiles(config: SamLaunchRequestArgs): Promise<void>
     if (payloadPath) {
         const fullpath = tryGetAbsolutePath(config.workspaceFolder, payloadPath)
         try {
-            JSON.parse(await readFile(fullpath, { encoding: 'utf-8' }))
+            JSON.parse(await fs.readFileText(fullpath))
         } catch (e) {
             throw Error(`Invalid JSON in payload file: ${payloadPath}`)
         }
-        await copyFile(fullpath, config.eventPayloadFile)
+        await fs.copy(fullpath, config.eventPayloadFile)
     } else {
-        await writeFile(config.eventPayloadFile, JSON.stringify(payloadObj || {}))
+        await fs.writeFile(config.eventPayloadFile, JSON.stringify(payloadObj || {}))
     }
 }
diff --git a/packages/core/src/shared/sam/processTerminal.ts b/packages/core/src/shared/sam/processTerminal.ts
new file mode 100644
index 00000000000..977fed9b02b
--- /dev/null
+++ b/packages/core/src/shared/sam/processTerminal.ts
@@ -0,0 +1,130 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+
+import { ToolkitError, UnknownError } from '../errors'
+import { ChildProcess, ChildProcessResult } from '../utilities/processUtils'
+import { CancellationError } from '../utilities/timeoutUtils'
+import { getLogger } from '../logger/logger'
+import { isAutomation } from '../vscode/env'
+import { throwIfErrorMatches } from './utils'
+
+let oldTerminal: ProcessTerminal | undefined
+export async function runInTerminal(proc: ChildProcess, cmd: string) {
+    const handleResult = (result?: ChildProcessResult, terminal?: vscode.Terminal) => {
+        if (result && result.exitCode !== 0) {
+            throwIfErrorMatches(result, terminal)
+
+            // If no specific error matched, throw the default non-zero exit code error.
+            const defaultMessage = `sam ${cmd} exited with a non-zero exit code: ${result.exitCode}`
+            throw ToolkitError.chain(result.error, defaultMessage, {
+                code: 'NonZeroExitCode',
+                details: { terminal: terminal },
+            })
+        }
+    }
+
+    // The most recent terminal won't get garbage collected until the next run
+    if (oldTerminal?.stopped === true) {
+        oldTerminal.close()
+    }
+    const pty = (oldTerminal = new ProcessTerminal(proc))
+    const terminal = vscode.window.createTerminal({ pty, name: `SAM ${cmd}` })
+    terminal.sendText('\n')
+    terminal.show()
+
+    const result = await new Promise<ChildProcessResult>((resolve) => pty.onDidExit(resolve))
+    if (pty.cancelled) {
+        throw result.error !== undefined
+            ? ToolkitError.chain(result.error, 'SAM CLI was cancelled before exiting', { cancelled: true })
+            : new CancellationError('user')
+    } else {
+        return handleResult(result, terminal)
+    }
+}
+
+// This is a decent improvement over using the output channel but it isn't a tty/pty
+// SAM CLI uses `click` which has reduced functionality if `os.isatty` returns false
+// Historically, Windows lack of a pty-equivalent is why it's not available in libuv
+// Maybe it's doable now with the ConPTY API? https://github.com/libuv/libuv/issues/2640
+class ProcessTerminal implements vscode.Pseudoterminal {
+    private readonly onDidCloseEmitter = new vscode.EventEmitter<number | void>()
+    private readonly onDidWriteEmitter = new vscode.EventEmitter<string>()
+    private readonly onDidExitEmitter = new vscode.EventEmitter<ChildProcessResult>()
+    public readonly onDidWrite = this.onDidWriteEmitter.event
+    public readonly onDidClose = this.onDidCloseEmitter.event
+    public readonly onDidExit = this.onDidExitEmitter.event
+
+    public constructor(private readonly process: ChildProcess) {
+        // Used in integration tests
+        if (isAutomation()) {
+            // Disable because it is a test.
+            // eslint-disable-next-line aws-toolkits/no-console-log
+            this.onDidWrite((text) => console.log(text.trim()))
+        }
+    }
+
+    #cancelled = false
+    public get cancelled() {
+        return this.#cancelled
+    }
+
+    public get stopped() {
+        return this.process.stopped
+    }
+
+    public open(initialDimensions: vscode.TerminalDimensions | undefined): void {
+        this.process
+            .run({
+                onStdout: (text) => this.mapStdio(text),
+                onStderr: (text) => this.mapStdio(text),
+            })
+            .then((result) => this.onDidExitEmitter.fire(result))
+            .catch((err) =>
+                this.onDidExitEmitter.fire({ error: UnknownError.cast(err), exitCode: -1, stderr: '', stdout: '' })
+            )
+            .finally(() => this.onDidWriteEmitter.fire('\r\nPress any key to close this terminal'))
+    }
+
+    public close(): void {
+        this.process.stop()
+        this.onDidCloseEmitter.fire()
+    }
+
+    public handleInput(data: string) {
+        // ETX
+        if (data === '\u0003' || this.process.stopped) {
+            this.#cancelled ||= data === '\u0003'
+            return this.close()
+        }
+
+        // enter
+        if (data === '\u000D') {
+            this.process.send('\n').then(undefined, (e) => {
+                getLogger().error('ProcessTerminal: process.send() failed: %s', (e as Error).message)
+            })
+            this.onDidWriteEmitter.fire('\r\n')
+        } else {
+            this.process.send(data).then(undefined, (e) => {
+                getLogger().error('ProcessTerminal: process.send() failed: %s', (e as Error).message)
+            })
+            this.onDidWriteEmitter.fire(data)
+        }
+    }
+
+    private mapStdio(text: string): void {
+        const lines = text.split('\n')
+        const first = lines.shift()
+
+        if (first) {
+            this.onDidWriteEmitter.fire(first)
+        }
+
+        for (const line of lines) {
+            this.onDidWriteEmitter.fire('\r\n')
+            this.onDidWriteEmitter.fire(line)
+        }
+    }
+}
diff --git a/packages/core/src/shared/sam/sync.ts b/packages/core/src/shared/sam/sync.ts
new file mode 100644
index 00000000000..4e3187aec08
--- /dev/null
+++ b/packages/core/src/shared/sam/sync.ts
@@ -0,0 +1,636 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../extensionGlobals'
+
+import * as vscode from 'vscode'
+import * as path from 'path'
+import * as localizedText from '../localizedText'
+import { S3Client } from '../clients/s3'
+import { DataQuickPickItem, createMultiPick, createQuickPick } from '../ui/pickerPrompter'
+import { CloudFormationClient } from '../clients/cloudFormation'
+import * as CloudFormation from '../cloudformation/cloudformation'
+import { DefaultEcrClient } from '../clients/ecrClient'
+import { createRegionPrompter } from '../ui/common/region'
+import { CancellationError } from '../utilities/timeoutUtils'
+import { ChildProcess } from '../utilities/processUtils'
+import { keys, selectFrom } from '../utilities/tsUtils'
+import { AWSTreeNodeBase } from '../treeview/nodes/awsTreeNodeBase'
+import { ToolkitError } from '../errors'
+import { telemetry } from '../telemetry/telemetry'
+import { createCommonButtons } from '../ui/buttons'
+import { ToolkitPromptSettings } from '../settings'
+import { getLogger } from '../logger/logger'
+import { createExitPrompter } from '../ui/common/exitPrompter'
+import { getConfigFileUri, SamConfig, validateSamSyncConfig, writeSamconfigGlobal } from './config'
+import { cast, Optional } from '../utilities/typeConstructors'
+import { pushIf, toRecord } from '../utilities/collectionUtils'
+import { getParameters } from '../../lambda/config/parameterUtils'
+import { addTelemetryEnvVar } from './cli/samCliInvokerUtils'
+import { samSyncParamUrl, samSyncUrl, samUpgradeUrl } from '../constants'
+import { openUrl } from '../utilities/vsCodeUtils'
+import { showOnce } from '../utilities/messages'
+import { IamConnection } from '../../auth/connection'
+import { CloudFormationTemplateRegistry } from '../fs/templateRegistry'
+import { isTreeNode, TreeNode } from '../treeview/resourceTreeDataProvider'
+import { getSpawnEnv } from '../env/resolveEnv'
+import {
+    getProjectRoot,
+    getProjectRootUri,
+    getRecentResponse,
+    getSamCliPathAndVersion,
+    getSource,
+    getErrorCode,
+    updateRecentResponse,
+} from './utils'
+import { TemplateItem, createTemplatePrompter } from '../ui/sam/templatePrompter'
+import { createStackPrompter } from '../ui/sam/stackPrompter'
+import { ParamsSource, createSyncParamsSourcePrompter } from '../ui/sam/paramsSourcePrompter'
+import { createEcrPrompter } from '../ui/sam/ecrPrompter'
+import { BucketSource, createBucketNamePrompter, createBucketSourcePrompter } from '../ui/sam/bucketPrompter'
+import { runInTerminal } from './processTerminal'
+import { syncMementoRootKey } from './constants'
+import {
+    TemplateParametersForm,
+    TemplateParametersWizard,
+} from '../../awsService/appBuilder/wizards/templateParametersWizard'
+import { CompositeWizard } from '../wizards/compositeWizard'
+
+export interface SyncParams {
+    readonly paramsSource: ParamsSource
+    readonly region: string
+    readonly deployType: 'infra' | 'code'
+    readonly projectRoot: vscode.Uri
+    readonly template: TemplateItem
+    readonly templateParameters: any
+    readonly stackName: string
+    readonly bucketSource: BucketSource
+    readonly bucketName: string
+    readonly ecrRepoUri?: string
+    readonly connection: IamConnection
+    readonly skipDependencyLayer?: boolean
+    readonly syncFlags?: string
+}
+
+// TODO: hook this up so it prompts the user when more than 1 environment is present in `samconfig.toml`
+export function createEnvironmentPrompter(config: SamConfig, environments = config.listEnvironments()) {
+    const recentEnvironmentName = getRecentResponse(syncMementoRootKey, config.location.fsPath, 'environmentName')
+    const items = environments.map((env) => ({
+        label: env.name,
+        data: env,
+        recentlyUsed: env.name === recentEnvironmentName,
+    }))
+
+    return createQuickPick(items, {
+        title: 'Select an Environment to Use',
+        placeholder: 'Select an environment',
+        buttons: createCommonButtons(samSyncUrl),
+    })
+}
+
+function hasImageBasedResources(template: CloudFormation.Template) {
+    const resources = template.Resources
+
+    return resources === undefined
+        ? false
+        : Object.keys(resources)
+              .filter((key) => resources[key]?.Type === 'AWS::Serverless::Function')
+              .map((key) => resources[key]?.Properties?.PackageType)
+              .includes('Image')
+}
+
+export const syncFlagItems: DataQuickPickItem<string>[] = [
+    {
+        label: 'Build in source',
+        data: '--build-in-source',
+        description: 'Opts in to build project in the source folder. Only for node apps',
+    },
+    {
+        label: 'Code',
+        data: '--code',
+        description: 'Sync only code resources (Lambda Functions, API Gateway, Step Functions)',
+    },
+    {
+        label: 'Dependency layer',
+        data: '--dependency-layer',
+        description: 'Separate dependencies of individual function into Lambda layers',
+    },
+    {
+        label: 'Skip deploy sync',
+        data: '--skip-deploy-sync',
+        description: "This will skip the initial infrastructure deployment if it's not required",
+    },
+    {
+        label: 'Use container',
+        data: '--use-container',
+        description: 'Build functions with an AWS Lambda-like container',
+    },
+    {
+        label: 'Watch',
+        data: '--watch',
+        description: 'Watch local files and automatically sync with cloud',
+        picked: true,
+    },
+    {
+        label: 'Save parameters',
+        data: '--save-params',
+        description: 'Save to samconfig.toml as default parameters',
+        picked: true,
+    },
+    {
+        label: 'Beta features',
+        data: '--beta-features',
+        description: 'Enable beta features',
+    },
+    {
+        label: 'Debug',
+        data: '--debug',
+        description: 'Turn on debug logging to print debug messages and display timestamps',
+    },
+]
+
+export enum SamSyncEntryPoints {
+    SamTemplateFile,
+    SamConfigFile,
+    RegionNodeContextMenu,
+    AppBuilderNodeButton,
+    CommandPalette,
+}
+
+function getSyncEntryPoint(arg: vscode.Uri | AWSTreeNodeBase | TreeNode | undefined) {
+    if (arg instanceof vscode.Uri) {
+        if (arg.path.endsWith('samconfig.toml')) {
+            return SamSyncEntryPoints.SamConfigFile
+        }
+        return SamSyncEntryPoints.SamTemplateFile
+    } else if (arg instanceof AWSTreeNodeBase) {
+        return SamSyncEntryPoints.RegionNodeContextMenu
+    } else if (isTreeNode(arg)) {
+        return SamSyncEntryPoints.AppBuilderNodeButton
+    } else {
+        return SamSyncEntryPoints.CommandPalette
+    }
+}
+
+export class SyncWizard extends CompositeWizard<SyncParams> {
+    registry: CloudFormationTemplateRegistry
+    public constructor(
+        state: Pick<SyncParams, 'deployType'> & Partial<SyncParams>,
+        registry: CloudFormationTemplateRegistry,
+        shouldPromptExit: boolean = true
+    ) {
+        super({ initState: state, exitPrompterProvider: shouldPromptExit ? createExitPrompter : undefined })
+        this.registry = registry
+    }
+
+    public override async init(): Promise<this> {
+        this.form.template.bindPrompter(() => createTemplatePrompter(this.registry, syncMementoRootKey, samSyncUrl))
+        this.form.templateParameters.bindPrompter(
+            async ({ template }) =>
+                this.createWizardPrompter<TemplateParametersWizard, TemplateParametersForm>(
+                    TemplateParametersWizard,
+                    template!.uri,
+                    samSyncUrl,
+                    syncMementoRootKey
+                ),
+            {
+                showWhen: async ({ template }) => {
+                    const samTemplateParameters = await getParameters(template!.uri)
+                    return !!samTemplateParameters && samTemplateParameters.size > 0
+                },
+            }
+        )
+
+        this.form.projectRoot.setDefault(({ template }) => getProjectRoot(template))
+
+        this.form.paramsSource.bindPrompter(async ({ projectRoot }) => {
+            const existValidSamConfig: boolean | undefined = await validateSamSyncConfig(projectRoot)
+            return createSyncParamsSourcePrompter(existValidSamConfig)
+        })
+
+        this.form.region.bindPrompter(() => createRegionPrompter().transform((r) => r.id), {
+            showWhen: ({ paramsSource }) =>
+                paramsSource === ParamsSource.Specify || paramsSource === ParamsSource.SpecifyAndSave,
+        })
+
+        this.form.stackName.bindPrompter(
+            ({ region }) => createStackPrompter(new CloudFormationClient(region!), syncMementoRootKey, samSyncUrl),
+            {
+                showWhen: ({ paramsSource }) =>
+                    paramsSource === ParamsSource.Specify || paramsSource === ParamsSource.SpecifyAndSave,
+            }
+        )
+        this.form.bucketSource.bindPrompter(() => createBucketSourcePrompter(samSyncUrl), {
+            showWhen: ({ paramsSource }) =>
+                paramsSource === ParamsSource.Specify || paramsSource === ParamsSource.SpecifyAndSave,
+        })
+
+        this.form.bucketName.bindPrompter(
+            ({ region }) => createBucketNamePrompter(new S3Client(region!), syncMementoRootKey, samSyncUrl),
+            {
+                showWhen: ({ bucketSource }) => bucketSource === BucketSource.UserProvided,
+            }
+        )
+
+        this.form.ecrRepoUri.bindPrompter(
+            ({ region }) => createEcrPrompter(new DefaultEcrClient(region!), syncMementoRootKey),
+            {
+                showWhen: ({ template, paramsSource }) =>
+                    !!template &&
+                    hasImageBasedResources(template.data) &&
+                    (paramsSource === ParamsSource.Specify || paramsSource === ParamsSource.SpecifyAndSave),
+            }
+        )
+
+        // todo wrap with localize
+        this.form.syncFlags.bindPrompter(
+            () =>
+                createMultiPick(syncFlagItems, {
+                    title: 'Specify parameters for sync',
+                    placeholder: 'Press enter to proceed with highlighted option',
+                    buttons: createCommonButtons(samSyncParamUrl),
+                }),
+            {
+                showWhen: ({ paramsSource }) =>
+                    paramsSource === ParamsSource.Specify || paramsSource === ParamsSource.SpecifyAndSave,
+            }
+        )
+        return this
+    }
+}
+
+type BindableData = Record<string, string | boolean | undefined>
+export function bindDataToParams<T extends BindableData>(data: T, bindings: { [P in keyof T]-?: string }): string[] {
+    const params = [] as string[]
+
+    for (const [k, v] of Object.entries(data)) {
+        if (v === true) {
+            params.push(bindings[k])
+        } else if (typeof v === 'string') {
+            params.push(bindings[k], v)
+        }
+    }
+
+    return params
+}
+
+export async function ensureBucket(resp: Pick<SyncParams, 'region' | 'bucketName'>) {
+    const newBucketName = resp.bucketName.match(/^newbucket:(.*)/)?.[1]
+    if (newBucketName === undefined) {
+        return resp.bucketName
+    }
+
+    try {
+        await new S3Client(resp.region).createBucket({ bucketName: newBucketName })
+
+        return newBucketName
+    } catch (err) {
+        throw ToolkitError.chain(err, `Failed to create new bucket "${newBucketName}"`)
+    }
+}
+
+export async function ensureRepo(resp: Pick<SyncParams, 'region' | 'ecrRepoUri'>) {
+    const newRepoName = resp.ecrRepoUri?.match(/^newrepo:(.*)/)?.[1]
+    if (newRepoName === undefined) {
+        return resp.ecrRepoUri
+    }
+
+    try {
+        const repo = await new DefaultEcrClient(resp.region).createRepository(newRepoName)
+
+        return repo.repository?.repositoryUri
+    } catch (err) {
+        throw ToolkitError.chain(err, `Failed to create new ECR repository "${newRepoName}"`)
+    }
+}
+
+export async function saveAndBindArgs(args: SyncParams): Promise<{ readonly boundArgs: string[] }> {
+    const data = {
+        codeOnly: args.deployType === 'code',
+        templatePath: args.template?.uri?.fsPath,
+        bucketName: args.bucketName && (await ensureBucket(args)),
+        ecrRepoUri: args.ecrRepoUri && (await ensureRepo(args)),
+        ...selectFrom(args, 'stackName', 'region', 'skipDependencyLayer'),
+    }
+
+    await Promise.all([
+        updateSyncRecentResponse(args.region, 'stackName', data.stackName),
+        updateSyncRecentResponse(args.region, 'bucketName', data.bucketName),
+        updateSyncRecentResponse(args.region, 'ecrRepoUri', data.ecrRepoUri),
+        updateSyncRecentResponse('global', 'templatePath', data.templatePath),
+    ])
+
+    const boundArgs = bindDataToParams(data, {
+        region: '--region',
+        codeOnly: '--code',
+        templatePath: '--template',
+        stackName: '--stack-name',
+        bucketName: '--s3-bucket',
+        ecrRepoUri: '--image-repository',
+        skipDependencyLayer: '--no-dependency-layer',
+    })
+
+    if (args.paramsSource === ParamsSource.SamConfig) {
+        const samConfigFile = await getConfigFileUri(args.projectRoot)
+        boundArgs.push('--config-file', `${samConfigFile.fsPath}`)
+    }
+
+    if (args.paramsSource === ParamsSource.SpecifyAndSave) {
+        boundArgs.push('--save-params')
+    }
+
+    return { boundArgs }
+}
+
+export async function runSamSync(args: SyncParams) {
+    telemetry.record({ lambdaPackageType: args.ecrRepoUri !== undefined ? 'Image' : 'Zip' })
+
+    const { path: samCliPath, parsedVersion } = await getSamCliPathAndVersion()
+    const { boundArgs } = await saveAndBindArgs(args)
+
+    if (!!args.templateParameters && Object.entries(args.templateParameters).length > 0) {
+        const templateParameters = new Map<string, string>(Object.entries(args.templateParameters))
+        const paramsToSet: string[] = []
+        for (const [key, value] of templateParameters.entries()) {
+            if (value) {
+                await updateRecentResponse(syncMementoRootKey, args.template.uri.fsPath, key, value)
+                paramsToSet.push(`ParameterKey=${key},ParameterValue=${value}`)
+            }
+        }
+        paramsToSet.length > 0 && boundArgs.push('--parameter-overrides', paramsToSet.join(' '))
+    }
+
+    // '--no-watch' was not added until https://github.com/aws/aws-sam-cli/releases/tag/v1.77.0
+    // Forcing every user to upgrade will be a headache for what is otherwise a minor problem
+    if ((parsedVersion?.compare('1.77.0') ?? -1) >= 0) {
+        boundArgs.push('--no-watch')
+    }
+
+    if ((parsedVersion?.compare('1.98.0') ?? 1) < 0) {
+        await showOnce('sam.sync.updateMessage', async () => {
+            const message = `Your current version of SAM CLI (${parsedVersion?.version}) does not include the latest improvements for "sam sync". Some parameters may not be available. Update to the latest version to get all new parameters/options.`
+            const learnMoreUrl = vscode.Uri.parse(
+                'https://aws.amazon.com/about-aws/whats-new/2023/03/aws-toolkits-jetbrains-vs-code-sam-accelerate/'
+            )
+            const openDocsItem = 'Open Upgrade Documentation'
+            const resp = await vscode.window.showInformationMessage(message, localizedText.learnMore, openDocsItem)
+            if (resp === openDocsItem) {
+                await openUrl(samUpgradeUrl)
+            } else if (resp === localizedText.learnMore) {
+                await openUrl(learnMoreUrl)
+            }
+        })
+    }
+
+    const syncFlags: string[] = args.syncFlags ? JSON.parse(args.syncFlags) : []
+    boundArgs.push(...syncFlags)
+
+    const sam = new ChildProcess(samCliPath, ['sync', ...resolveSyncArgConflict(boundArgs)], {
+        spawnOptions: await addTelemetryEnvVar({
+            cwd: args.projectRoot.fsPath,
+            env: await getSpawnEnv(process.env, { promptForInvalidCredential: true }),
+        }),
+    })
+
+    // with '--watch' selected, the sync process will run in the background until the user manually kills it
+    // we need to save the stack and region to the samconfig file now, otherwise the user would not see latest deployed resoure during this sync process
+    const { paramsSource, stackName, region, projectRoot } = args
+    const shouldWriteSyncSamconfigGlobal = paramsSource !== ParamsSource.SamConfig && !!stackName && !!region
+    if (boundArgs.includes('--watch')) {
+        shouldWriteSyncSamconfigGlobal && (await writeSamconfigGlobal(projectRoot, stackName, region))
+    }
+
+    await runInTerminal(sam, 'sync')
+    shouldWriteSyncSamconfigGlobal && (await writeSamconfigGlobal(projectRoot, stackName, region))
+}
+
+export async function getSyncWizard(
+    deployType: SyncParams['deployType'],
+    arg: any,
+    validate?: boolean,
+    shouldPromptExit?: boolean
+): Promise<SyncWizard> {
+    const registry = await globals.templateRegistry
+    const wizard = new SyncWizard(
+        { deployType, ...(await prepareSyncParams(arg, validate)) },
+        registry,
+        shouldPromptExit
+    )
+    return wizard
+}
+
+const getStringParam = (config: SamConfig, key: string) => {
+    try {
+        return cast(config.getCommandParam('sync', key), Optional(String))
+    } catch (err) {
+        throw ToolkitError.chain(err, `Unable to read "${key}" in config file`, {
+            details: { location: config.location.path },
+        })
+    }
+}
+
+const configKeyMapping: Record<string, string | string[]> = {
+    region: 'region',
+    stackName: 'stack_name',
+    bucketName: 's3_bucket',
+    ecrRepoUri: 'image_repository',
+    templatePath: ['template', 'template_file'],
+}
+
+export function getSyncParamsFromConfig(config: SamConfig) {
+    const samConfigParams: string[] = []
+    const params = toRecord(keys(configKeyMapping), (k) => {
+        const key = configKeyMapping[k]
+        if (typeof key === 'string') {
+            const param = getStringParam(config, key)
+            pushIf(samConfigParams, param !== undefined, key)
+
+            return param
+        } else {
+            for (const alt of key) {
+                const param = getStringParam(config, alt)
+                if (param !== undefined) {
+                    samConfigParams.push(alt)
+
+                    return param
+                }
+            }
+        }
+    })
+
+    telemetry.record({ samConfigParams: samConfigParams.join(',') } as any)
+
+    return params
+}
+
+export async function prepareSyncParams(
+    arg: vscode.Uri | AWSTreeNodeBase | TreeNode | undefined,
+    validate?: boolean
+): Promise<Partial<SyncParams>> {
+    // Skip creating dependency layers by default for backwards compat
+    const baseParams: Partial<SyncParams> = { skipDependencyLayer: true }
+    const entryPoint = getSyncEntryPoint(arg)
+
+    switch (entryPoint) {
+        case SamSyncEntryPoints.SamTemplateFile: {
+            const entryPointArg = arg as vscode.Uri
+            const template = {
+                uri: entryPointArg,
+                data: await CloudFormation.load(entryPointArg.fsPath, validate),
+            }
+
+            return {
+                ...baseParams,
+                template: template,
+                projectRoot: getProjectRootUri(template.uri),
+            }
+        }
+        case SamSyncEntryPoints.SamConfigFile: {
+            const config = await SamConfig.fromConfigFileUri(arg as vscode.Uri)
+            const params = getSyncParamsFromConfig(config)
+            const projectRoot = vscode.Uri.joinPath(config.location, '..')
+            const templateUri = params.templatePath
+                ? vscode.Uri.file(path.resolve(projectRoot.fsPath, params.templatePath))
+                : undefined
+            const samConfigFileTemplate = templateUri
+                ? {
+                      uri: templateUri,
+                      data: await CloudFormation.load(templateUri.fsPath),
+                  }
+                : undefined
+            // Always use the dependency layer if the user specified to do so
+            const skipDependencyLayer = !config.getCommandParam('sync', 'dependency_layer')
+
+            return {
+                ...baseParams,
+                ...params,
+                template: samConfigFileTemplate,
+                projectRoot,
+                skipDependencyLayer,
+            } as SyncParams
+        }
+        case SamSyncEntryPoints.RegionNodeContextMenu: {
+            const entryPointArg = arg as AWSTreeNodeBase
+            return { ...baseParams, region: entryPointArg.regionCode }
+        }
+        case SamSyncEntryPoints.AppBuilderNodeButton: {
+            const entryPointArg = arg as TreeNode
+            const templateUri = (entryPointArg.getTreeItem() as vscode.TreeItem).resourceUri
+            if (templateUri) {
+                const template = {
+                    uri: templateUri,
+                    data: await CloudFormation.load(templateUri.fsPath, validate),
+                }
+                return {
+                    ...baseParams,
+                    template,
+                    projectRoot: getProjectRootUri(templateUri),
+                }
+            }
+            return baseParams
+        }
+        case SamSyncEntryPoints.CommandPalette:
+        default:
+            return baseParams
+    }
+}
+
+export type SamSyncResult = {
+    isSuccess: boolean
+}
+
+export async function runSync(
+    deployType: SyncParams['deployType'],
+    arg: vscode.Uri | AWSTreeNodeBase | TreeNode | undefined,
+    validate?: boolean,
+    syncParam?: SyncParams
+): Promise<SamSyncResult> {
+    return await telemetry.sam_sync.run(async () => {
+        const source = getSource(arg)
+        telemetry.record({ syncedResources: deployType === 'infra' ? 'AllResources' : 'CodeOnly', source: source })
+
+        await confirmDevStack()
+        const params = syncParam ?? (await (await getSyncWizard(deployType, arg, validate)).run())
+        getLogger().info('%O', params)
+
+        if (params === undefined) {
+            throw new CancellationError('user')
+        }
+
+        try {
+            await runSamSync({ ...params })
+            return {
+                isSuccess: true,
+            }
+        } catch (err) {
+            throw ToolkitError.chain(err, 'Failed to sync SAM application', {
+                details: { ...params },
+                code: getErrorCode(err),
+            })
+        }
+    })
+}
+
+async function updateSyncRecentResponse(region: string, key: string, value: string | undefined) {
+    return await updateRecentResponse(syncMementoRootKey, region, key, value)
+}
+
+export async function confirmDevStack() {
+    const canPrompt = ToolkitPromptSettings.instance.isPromptEnabled('samcliConfirmDevStack')
+    if (!canPrompt) {
+        return
+    }
+
+    const message = `
+The SAM CLI will use the AWS Lambda, Amazon API Gateway, and AWS StepFunctions APIs to upload your code without
+performing a CloudFormation deployment. This will cause drift in your CloudFormation stack.
+**The sync command should only be used against a development stack**.
+
+Confirm that you are synchronizing a development stack.
+`.trim()
+
+    const okDontShow = "OK, and don't show this again"
+    const resp = await vscode.window.showInformationMessage(message, { modal: true }, localizedText.ok, okDontShow)
+    if (resp !== localizedText.ok && resp !== okDontShow) {
+        throw new CancellationError('user')
+    }
+
+    if (resp === okDontShow) {
+        await ToolkitPromptSettings.instance.disablePrompt('samcliConfirmDevStack')
+    }
+}
+
+function resolveSyncArgConflict(boundArgs: string[]): string[] {
+    const boundArgsSet = new Set(boundArgs)
+    if (boundArgsSet.has('--watch')) {
+        boundArgsSet.delete('--no-watch')
+    }
+    if (boundArgsSet.has('--dependency-layer')) {
+        boundArgsSet.delete('--no--dependency-layer')
+    }
+    if (boundArgsSet.has('--build-in-source')) {
+        boundArgsSet.delete('--no-build-in-source')
+    }
+    if (boundArgsSet.has('--use-container') || boundArgsSet.has('-u')) {
+        boundArgsSet.delete('--build-in-source')
+    }
+
+    // TODO phase 2: add anti param
+    // // apply anti param if param is not set
+    // if (!boundArgsSet.has('--cached')) {
+    //     boundArgsSet.add('--no-cached')
+    // }
+    // if (!boundArgsSet.has('--build-in-source')) {
+    //     boundArgsSet.add('--no-build-in-source')
+    // }
+    // if (!boundArgsSet.has('--dependency-layer')) {
+    //     boundArgsSet.add('--no-dependency-layer')
+    // }
+    // if (!boundArgsSet.has('--skip-deploy-sync')) {
+    //     boundArgsSet.add('--no-skip-deploy-sync')
+    // }
+
+    return Array.from(boundArgsSet)
+}
diff --git a/packages/core/src/shared/sam/utils.ts b/packages/core/src/shared/sam/utils.ts
new file mode 100644
index 00000000000..51e93e80645
--- /dev/null
+++ b/packages/core/src/shared/sam/utils.ts
@@ -0,0 +1,150 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as path from 'path'
+import { AWSTreeNodeBase } from '../treeview/nodes/awsTreeNodeBase'
+import { TreeNode, isTreeNode } from '../treeview/resourceTreeDataProvider'
+import * as CloudFormation from '../cloudformation/cloudformation'
+import { TemplateItem } from '../ui/sam/templatePrompter'
+import { RuntimeFamily, getFamily } from '../../lambda/models/samLambdaRuntime'
+import { SamCliSettings } from './cli/samCliSettings'
+import { ToolkitError } from '../errors'
+import { SamCliInfoInvocation } from './cli/samCliInfo'
+import { parse } from 'semver'
+import { telemetry } from '../telemetry/telemetry'
+import globals from '../extensionGlobals'
+import { getLogger } from '../logger/logger'
+import { ChildProcessResult } from '../utilities/processUtils'
+import { Runtime } from '@aws-sdk/client-lambda'
+
+/**
+ * @description determines the root directory of the project given Template Item
+ * @param templateItem Template item object.
+ * @returns The URI of the root project folder (may differ from workspace)
+ * */
+export const getProjectRoot = (template: TemplateItem | undefined) =>
+    template ? getProjectRootUri(template.uri) : undefined
+
+/**
+ * @description determines the root directory of the project given uri of the template file
+ * @param template The template.yaml uri
+ * @returns The URI of the root project folder (may differ from workspace)
+ * */
+export const getProjectRootUri = (templateUri: vscode.Uri) => vscode.Uri.file(path.dirname(templateUri.path))
+
+export function getSource(arg: vscode.Uri | AWSTreeNodeBase | TreeNode | undefined): string | undefined {
+    if (arg instanceof vscode.Uri) {
+        return 'template'
+    } else if (arg instanceof AWSTreeNodeBase) {
+        return 'regionNode'
+    } else if (isTreeNode(arg)) {
+        return 'appBuilderDeploy'
+    } else {
+        return undefined
+    }
+}
+/**
+ * Returns if a corresponding SAM template (received as a URI or string content) has
+ * any function using .NET runtime
+ * @param path A uri with the absolute path to the template file
+ * @param contents The contents of the template file, directly as a string
+ */
+export async function isDotnetRuntime(templateUri: vscode.Uri, contents?: string): Promise<boolean> {
+    const samTemplate = await CloudFormation.tryLoad(templateUri, contents)
+
+    if (!samTemplate.template?.Resources) {
+        return false
+    }
+    for (const resource of Object.values(samTemplate.template.Resources)) {
+        if (resource?.Type === 'AWS::Serverless::Function') {
+            if (resource.Properties?.Runtime) {
+                if (getFamily(resource.Properties?.Runtime) === RuntimeFamily.DotNet) {
+                    return true
+                }
+            }
+        }
+    }
+    const globalRuntime = samTemplate.template.Globals?.Function?.Runtime as Runtime
+    return globalRuntime ? getFamily(globalRuntime) === RuntimeFamily.DotNet : false
+}
+
+export async function getSamCliPathAndVersion() {
+    const { path: samCliPath } = await SamCliSettings.instance.getOrDetectSamCli()
+    if (samCliPath === undefined) {
+        throw new ToolkitError('SAM CLI could not be found', { code: 'MissingExecutable' })
+    }
+
+    const info = await new SamCliInfoInvocation(samCliPath).execute()
+    const parsedVersion = parse(info.version)
+    telemetry.record({ version: info.version })
+
+    if (parsedVersion?.compare('1.53.0') === -1) {
+        throw new ToolkitError('SAM CLI version 1.53.0 or higher is required', { code: 'VersionTooLow' })
+    }
+
+    return { path: samCliPath, parsedVersion }
+}
+
+export function getRecentResponse(mementoRootKey: string, identifier: string, key: string): string | undefined {
+    const root = globals.context.workspaceState.get(mementoRootKey, {} as Record<string, Record<string, string>>)
+    return root[identifier]?.[key]
+}
+
+export async function updateRecentResponse(
+    mementoRootKey: string,
+    identifier: string,
+    key: string,
+    value: string | undefined
+) {
+    try {
+        const root = globals.context.workspaceState.get(mementoRootKey, {} as Record<string, Record<string, string>>)
+        await globals.context.workspaceState.update(mementoRootKey, {
+            ...root,
+            [identifier]: { ...root[identifier], [key]: value },
+        })
+    } catch (err) {
+        getLogger().warn(`sam: unable to save response at key "${key}": %s`, err)
+    }
+}
+
+export function getSamCliErrorMessage(stderr: string): string {
+    // Split the stderr string by newline, filter out empty lines, and get the last line
+    const lines = stderr
+        .trim()
+        .split('\n')
+        .filter((line) => line.trim() !== '')
+    return lines[lines.length - 1]
+}
+
+export function getErrorCode(error: unknown): string | undefined {
+    return error instanceof ToolkitError ? error.code : undefined
+}
+
+export function throwIfErrorMatches(result: ChildProcessResult, terminal?: vscode.Terminal) {
+    const errorMessage = getSamCliErrorMessage(result.stderr)
+    for (const errorType in SamCliErrorTypes) {
+        if (errorMessage.includes(SamCliErrorTypes[errorType as keyof typeof SamCliErrorTypes])) {
+            throw ToolkitError.chain(result.error, errorMessage, {
+                code: errorType,
+                details: { terminal: terminal },
+            })
+        }
+    }
+}
+
+export function getTerminalFromError(error: any): vscode.Terminal {
+    return error.details?.['terminal'] as unknown as vscode.Terminal
+    // return vscode.window.activeTerminal as vscode.Terminal
+}
+
+export enum SamCliErrorTypes {
+    DockerUnreachable = 'Docker is unreachable.',
+    ResolveS3AndS3Set = 'Cannot use both --resolve-s3 and --s3-bucket parameters in non-guided deployments.',
+    DeployStackStatusMissing = 'Was not able to find a stack with the name:',
+    DeployStackOutPutFailed = 'Failed to get outputs from stack',
+    DeployBucketRequired = 'Templates with a size greater than 51,200 bytes must be deployed via an S3 Bucket.',
+    ChangeSetEmpty = 'is up to date',
+}
diff --git a/packages/core/src/shared/schemas.ts b/packages/core/src/shared/schemas.ts
new file mode 100644
index 00000000000..1506908a7c8
--- /dev/null
+++ b/packages/core/src/shared/schemas.ts
@@ -0,0 +1,516 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import globals from './extensionGlobals'
+import { activateYamlExtension, YamlExtension } from './extensions/yaml'
+import * as pathutil from '../shared/utilities/pathUtils'
+import { getLogger } from './logger/logger'
+import { FileResourceFetcher } from './resourcefetcher/fileResourceFetcher'
+import { getPropertyFromJsonUrl, HttpResourceFetcher } from './resourcefetcher/httpResourceFetcher'
+import { Settings } from './settings'
+import { GlobalStorage } from './globalStorage'
+import { once } from './utilities/functionUtils'
+import { Any, ArrayConstructor } from './utilities/typeConstructors'
+import { AWS_SCHEME } from './constants'
+import fs from '../shared/fs/fs'
+import { normalizeVSCodeUri } from './utilities/vsCodeUtils'
+import { telemetry } from './telemetry/telemetry'
+import { JsonSchemasKey } from './globalState'
+
+// Note: this file is currently 12+ MB. When requesting it, specify compression/gzip.
+export const samAndCfnSchemaUrl =
+    'https://raw.githubusercontent.com/aws/serverless-application-model/main/samtranslator/schema/schema.json'
+const devfileManifestUrl = 'https://api.github.com/repos/devfile/api/releases/latest'
+const schemaPrefix = `${AWS_SCHEME}://`
+
+export type Schemas = { [key: string]: vscode.Uri }
+export type SchemaType = 'yaml' | 'json'
+
+export interface SchemaMapping {
+    uri: vscode.Uri
+    type: SchemaType
+    schema?: string | vscode.Uri
+}
+
+export interface SchemaHandler {
+    /** Adds or removes a schema mapping to the given `schemas` collection. */
+    handleUpdate(mapping: SchemaMapping, schemas: Schemas): Promise<void>
+    /** Returns true if the given file path is handled by this `SchemaHandler`. */
+    isMapped(f: vscode.Uri | string): boolean
+}
+
+/**
+ * Processes the update of schema mappings for files in the workspace
+ */
+export class SchemaService {
+    private static readonly defaultUpdatePeriodMillis = 1000
+
+    private updatePeriod: number
+    private timer?: NodeJS.Timer
+
+    private updateQueue: SchemaMapping[] = []
+    private schemas?: Schemas
+    private handlers: Map<SchemaType, SchemaHandler>
+
+    public constructor(opts?: {
+        /** Assigned in start(). */
+        schemas?: Schemas
+        updatePeriod?: number
+        handlers?: Map<SchemaType, SchemaHandler>
+    }) {
+        this.updatePeriod = opts?.updatePeriod ?? SchemaService.defaultUpdatePeriodMillis
+        this.schemas = opts?.schemas
+        this.handlers =
+            opts?.handlers ??
+            new Map<SchemaType, SchemaHandler>([
+                ['json', new JsonSchemaHandler()],
+                ['yaml', new YamlSchemaHandler()],
+            ])
+    }
+
+    public isMapped(uri: vscode.Uri): boolean {
+        for (const h of this.handlers.values()) {
+            if (h.isMapped(uri)) {
+                return true
+            }
+        }
+        return false
+    }
+
+    public async start(): Promise<void> {
+        getDefaultSchemas()
+            .then((schemas) => (this.schemas = schemas))
+            .catch((e) => {
+                getLogger().error('getDefaultSchemas failed: %s', (e as Error).message)
+            })
+        await this.startTimer()
+    }
+
+    /**
+     * Registers a schema mapping in the schema service.
+     *
+     * @param mapping
+     * @param flush Flush immediately instead of waiting for timer.
+     */
+    public registerMapping(mapping: SchemaMapping, flush?: boolean): void {
+        this.updateQueue.push(mapping)
+        if (flush === true) {
+            this.processUpdates().catch((e) => {
+                getLogger().error('SchemaService: processUpdates() failed: %s', (e as Error).message)
+            })
+        }
+    }
+
+    public async processUpdates(): Promise<void> {
+        if (this.updateQueue.length === 0 || !this.schemas) {
+            return
+        }
+
+        const batch = this.updateQueue.splice(0, this.updateQueue.length)
+        for (const mapping of batch) {
+            const { type, schema, uri } = mapping
+            const handler = this.handlers.get(type)
+            if (!handler) {
+                throw new Error(`no registered handler for type ${type}`)
+            }
+            getLogger().debug(
+                'schema service: handle %s mapping: %s -> %s',
+                type,
+                schema?.toString() ?? '[removed]',
+                uri
+            )
+            await handler.handleUpdate(mapping, this.schemas)
+        }
+    }
+
+    // TODO: abstract into a common abstraction for background pollers
+    private async startTimer(): Promise<void> {
+        this.timer = globals.clock.setTimeout(
+            // this is async so that we don't have pseudo-concurrent invocations of the callback
+            async () => {
+                await this.processUpdates()
+                this.timer?.refresh()
+            },
+            this.updatePeriod
+        )
+    }
+}
+
+/**
+ * Loads default JSON schemas for CFN and SAM templates.
+ * Checks manifest and downloads new schemas if the manifest version has been bumped.
+ * Uses local, predownloaded version if up-to-date or network call fails
+ * If the user has not previously used the toolkit and cannot pull the manifest, does not provide template autocomplete.
+ */
+export async function getDefaultSchemas(): Promise<Schemas | undefined> {
+    const devfileSchemaUri = GlobalStorage.devfileSchemaUri()
+    const devfileSchemaVersion = await getPropertyFromJsonUrl(devfileManifestUrl, 'tag_name')
+
+    // Sam schema is a superset of Cfn schema, so we can use it for both
+    const samAndCfnSchemaDestinationUri = GlobalStorage.samAndCfnSchemaDestinationUri()
+
+    const schemas: Schemas = {}
+
+    try {
+        await updateSchemaFromRemoteETag({
+            destination: samAndCfnSchemaDestinationUri,
+            eTag: undefined,
+            url: samAndCfnSchemaUrl,
+            cacheKey: 'samAndCfnSchemaVersion',
+            title: schemaPrefix + 'cloudformation.schema.json',
+        })
+        schemas['cfn'] = samAndCfnSchemaDestinationUri
+    } catch (e) {
+        getLogger().verbose('Could not download sam/cfn schema: %s', (e as Error).message)
+    }
+
+    try {
+        await updateSchemaFromRemoteETag({
+            destination: samAndCfnSchemaDestinationUri,
+            eTag: undefined,
+            url: samAndCfnSchemaUrl,
+            cacheKey: 'samAndCfnSchemaVersion',
+            title: schemaPrefix + 'sam.schema.json',
+        })
+        schemas['sam'] = samAndCfnSchemaDestinationUri
+    } catch (e) {
+        getLogger().verbose('Could not download sam/cfn schema: %s', (e as Error).message)
+    }
+
+    try {
+        await updateSchemaFromRemote({
+            destination: devfileSchemaUri,
+            version: devfileSchemaVersion,
+            url: `https://raw.githubusercontent.com/devfile/api/${devfileSchemaVersion}/schemas/latest/devfile.json`,
+            cacheKey: 'devfileSchemaVersion',
+            title: schemaPrefix + 'devfile.schema.json',
+        })
+        schemas['devfile'] = devfileSchemaUri
+    } catch (e) {
+        getLogger().verbose('Could not download devfile schema: %s', (e as Error).message)
+    }
+
+    return schemas
+}
+
+/**
+ * Pulls a remote version of file if the local version doesn't match the manifest version (does not check semver increases) or doesn't exist
+ * Pulls local version of file if it does. Uses remote as baskup in case local doesn't exist
+ * @param params.filepath Path to local file
+ * @param params.version Remote version
+ * @param params.url Url to fetch from
+ * @param params.cacheKey Cache key to check version against
+ */
+export async function updateSchemaFromRemote(params: {
+    destination: vscode.Uri
+    version?: string
+    url: string
+    cacheKey: JsonSchemasKey
+    title: string
+}): Promise<void> {
+    const cachedVersion = globals.globalState.get<string>(params.cacheKey)
+    const outdated = params.version && params.version !== cachedVersion
+
+    // Check that the cached file actually can be fetched. Else we might
+    // never update the cache.
+    const fileFetcher = new FileResourceFetcher(params.destination.fsPath)
+    const cachedContent = await fileFetcher.get()
+
+    if (!outdated && cachedContent) {
+        return
+    }
+
+    try {
+        const httpFetcher = new HttpResourceFetcher(params.url, { showUrl: true })
+        const resp = await httpFetcher.get()
+        const content = await resp?.text()
+
+        if (!content) {
+            throw new Error(`failed to resolve schema: ${params.destination}`)
+        }
+
+        await doCacheContent(content, params)
+    } catch (err) {
+        if (cachedContent) {
+            getLogger().warn(
+                `schemas: failed to fetch the latest version for "${params.title}": ${
+                    (err as Error).message
+                }. Using cached schema instead.`
+            )
+        } else {
+            throw err
+        }
+    }
+}
+
+/**
+ * Fetches url content and caches locally. Uses E-Tag to determine if cached
+ * content can be used.
+ * @param params.destination Path to local file
+ * @param params.eTag E-Tag to send with fetch request. If this matches the url's it means we can use our cache.
+ * @param params.url Url to fetch from
+ * @param params.cacheKey Cache key to check version against
+ */
+export async function updateSchemaFromRemoteETag(params: {
+    destination: vscode.Uri
+    eTag?: string
+    url: string
+    cacheKey: JsonSchemasKey
+    title: string
+}): Promise<void> {
+    const cachedETag = globals.globalState.get<string>(params.cacheKey)
+
+    // Check that the cached file actually can be fetched. Else we might
+    // never update the cache.
+    const fileFetcher = new FileResourceFetcher(params.destination.fsPath)
+    const cachedContent = await fileFetcher.get()
+
+    // Determine if existing cached content is sufficient
+    const needsUpdate = cachedETag === undefined || cachedETag !== params.eTag
+    const hasCachedContent = cachedContent !== undefined
+    if (hasCachedContent && !needsUpdate) {
+        return
+    }
+
+    try {
+        // Only use our cached E-Tag if we have it + cached content
+        const eTagToRequest = !!cachedETag && cachedContent !== undefined ? cachedETag : params.eTag
+
+        const httpFetcher = new HttpResourceFetcher(params.url, { showUrl: true })
+        const response = await httpFetcher.getNewETagContent(eTagToRequest)
+        const { content, eTag: latestETag } = response
+        if (content === undefined) {
+            // Our cached content is the latest
+            telemetry.toolkit_getExternalResource.emit({
+                url: params.url,
+                passive: true,
+                result: 'Cancelled',
+                reason: 'Cache hit',
+            })
+            return
+        }
+        telemetry.toolkit_getExternalResource.emit({ url: params.url, passive: true, result: 'Succeeded' })
+        await doCacheContent(content, { ...params, version: latestETag })
+    } catch (err) {
+        if (cachedContent) {
+            getLogger().warn(`schemas: Using cached schema, failed to fetch latest "${params.title}": %s`, err)
+        } else {
+            throw err
+        }
+    }
+}
+
+/**
+ * Cache content to our extension context
+ * @param content
+ * @param params.version An identifier for a version of the resource. Can include an E-Tag value
+ */
+async function doCacheContent(
+    content: string,
+    params: {
+        destination: vscode.Uri
+        version?: string
+        url: string
+        cacheKey: JsonSchemasKey
+        title: string
+    }
+): Promise<void> {
+    const parsedFile = { ...JSON.parse(content), title: params.title }
+    const dir = vscode.Uri.joinPath(params.destination, '..')
+    await fs.mkdir(dir)
+    await fs.writeFile(params.destination.fsPath, JSON.stringify(parsedFile))
+    await globals.globalState.update(params.cacheKey, params.version)
+}
+
+/**
+ * Adds custom tags to the YAML extension's settings in order to hide error
+ * notifications for SAM/CFN intrinsic functions if a user has the YAML extension.
+ *
+ * Lifted near-verbatim from the cfn-lint VSCode extension.
+ * https://github.com/aws-cloudformation/cfn-lint-visual-studio-code/blob/629de0bac4f36cfc6534e409a6f6766a2240992f/client/src/extension.ts#L56
+ */
+async function addCustomTags(config = Settings.instance): Promise<void> {
+    const settingName = 'yaml.customTags'
+    const cloudFormationTags = [
+        '!And',
+        '!And sequence',
+        '!If',
+        '!If sequence',
+        '!Not',
+        '!Not sequence',
+        '!Equals',
+        '!Equals sequence',
+        '!Or',
+        '!Or sequence',
+        '!FindInMap',
+        '!FindInMap sequence',
+        '!Base64',
+        '!Join',
+        '!Join sequence',
+        '!Cidr',
+        '!Ref',
+        '!Sub',
+        '!Sub sequence',
+        '!GetAtt',
+        '!GetAZs',
+        '!ImportValue',
+        '!ImportValue sequence',
+        '!Select',
+        '!Select sequence',
+        '!Split',
+        '!Split sequence',
+    ]
+
+    try {
+        const currentTags = config.get(settingName, ArrayConstructor(Any), [])
+        const missingTags = cloudFormationTags.filter((item) => !currentTags.includes(item))
+
+        if (missingTags.length > 0) {
+            const updateTags = currentTags.concat(missingTags)
+
+            await config.update(settingName, updateTags)
+        }
+    } catch (error) {
+        getLogger().error('schemas: failed to update setting "%s": %O', settingName, error)
+    }
+}
+
+/**
+ * Registers YAML schema mappings with the Red Hat YAML extension
+ */
+export class YamlSchemaHandler implements SchemaHandler {
+    public constructor(private yamlExtension?: YamlExtension) {}
+
+    isMapped(file: string | vscode.Uri): boolean {
+        if (!this.yamlExtension) {
+            return false
+        }
+        const uri = typeof file === 'string' ? vscode.Uri.file(file) : file
+        const exists = !!this.yamlExtension?.getSchema(uri)
+        return exists
+    }
+
+    async handleUpdate(mapping: SchemaMapping, schemas: Schemas): Promise<void> {
+        if (!this.yamlExtension) {
+            const ext = await activateYamlExtension()
+            if (!ext) {
+                return
+            }
+            await addCustomTags()
+            this.yamlExtension = ext
+        }
+
+        if (mapping.schema) {
+            this.yamlExtension.assignSchema(mapping.uri, resolveSchema(mapping.schema, schemas))
+        } else {
+            this.yamlExtension.removeSchema(mapping.uri)
+        }
+    }
+}
+
+/**
+ * Registers JSON schema mappings with the built-in VSCode JSON schema language server
+ */
+export class JsonSchemaHandler implements SchemaHandler {
+    private readonly clean = once(() => this.cleanResourceMappings())
+
+    public constructor(private readonly config = Settings.instance) {}
+
+    public isMapped(file: string | vscode.Uri): boolean {
+        const setting = this.getSettingBy({ file: file })
+        return !!setting
+    }
+
+    /**
+     * Gets a json schema setting by filtering on schema path and/or file path.
+     * @param args.schemaPath Path to the schema file
+     * @param args.file Path to the file being edited by the user
+     */
+    private getSettingBy(args: {
+        schemaPath?: string | vscode.Uri
+        file?: string | vscode.Uri
+    }): JSONSchemaSettings | undefined {
+        const path = typeof args.file === 'string' ? args.file : args.file?.fsPath
+        const schm = typeof args.schemaPath === 'string' ? args.schemaPath : args.schemaPath?.fsPath
+        const settings = this.getJsonSettings()
+        const setting = settings.find((schema) => {
+            const schmMatch = schm && schema.url && pathutil.normalize(schema.url) === pathutil.normalize(schm)
+            const fileMatch = path && schema.fileMatch && schema.fileMatch.includes(path)
+            return (!path || fileMatch) && (!schm || schmMatch)
+        })
+        return setting
+    }
+
+    async handleUpdate(mapping: SchemaMapping, schemas: Schemas): Promise<void> {
+        await this.clean()
+
+        let settings = this.getJsonSettings()
+
+        const path = normalizeVSCodeUri(mapping.uri)
+        if (mapping.schema) {
+            const uri = resolveSchema(mapping.schema, schemas).toString()
+            const existing = this.getSettingBy({ schemaPath: uri })
+
+            if (existing) {
+                if (!existing.fileMatch) {
+                    getLogger().debug(`JsonSchemaHandler: skipped setting schema '${uri}'`)
+                } else {
+                    existing.fileMatch.push(path)
+                }
+            } else {
+                settings.push({
+                    fileMatch: [path],
+                    url: uri,
+                })
+            }
+        } else {
+            settings = filterJsonSettings(settings, (file) => file !== path)
+        }
+
+        await this.config.update('json.schemas', settings)
+    }
+
+    /**
+     * Attempts to find and remove orphaned resource mappings for AWS Resource documents
+     */
+    private async cleanResourceMappings(): Promise<void> {
+        getLogger().debug(`JsonSchemaHandler: cleaning stale schemas`)
+
+        // In the unlikely scenario of an error, we don't want to bubble it up
+        try {
+            const settings = filterJsonSettings(this.getJsonSettings(), (file) => !file.endsWith('.awsResource.json'))
+            await this.config.update('json.schemas', settings)
+        } catch (error) {
+            getLogger().warn(`JsonSchemaHandler: failed to clean stale schemas: ${error}`)
+        }
+    }
+
+    private getJsonSettings(): JSONSchemaSettings[] {
+        return this.config.get('json.schemas', ArrayConstructor(Object), [])
+    }
+}
+
+function resolveSchema(schema: string | vscode.Uri, schemas: Schemas): vscode.Uri {
+    if (schema instanceof vscode.Uri) {
+        return schema
+    }
+    return schemas[schema]
+}
+
+function filterJsonSettings(settings: JSONSchemaSettings[], predicate: (fileName: string) => boolean) {
+    return settings.filter((schema) => {
+        schema.fileMatch = schema.fileMatch?.filter((file) => predicate(file))
+
+        // Assumption: `fileMatch` was not empty beforehand
+        return schema.fileMatch === undefined || schema.fileMatch.length > 0
+    })
+}
+
+export interface JSONSchemaSettings {
+    fileMatch?: string[]
+    url?: string
+    schema?: any
+}
diff --git a/packages/core/src/shared/settings-amazonq.gen.ts b/packages/core/src/shared/settings-amazonq.gen.ts
new file mode 100644
index 00000000000..2ca8481b55e
--- /dev/null
+++ b/packages/core/src/shared/settings-amazonq.gen.ts
@@ -0,0 +1,44 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * This file was autogenerated by generateSettings.ts. Do NOT modify by hand.
+ * To update this file, update the settings in the extension package.json
+ * and run `npm run generateSettings` for that extension.
+ */
+
+export const amazonqSettings = {
+    "amazonQ.telemetry": {},
+    "amazonQ.suppressPrompts": {
+        "createCredentialsProfile": {},
+        "codeWhispererNewWelcomeMessage": {},
+        "codeWhispererConnectionExpired": {},
+        "amazonQWelcomePage": {},
+        "amazonQSessionConfigurationMessage": {},
+        "minIdeVersion": {},
+        "ssoCacheError": {},
+        "amazonQLspManifestMessage": {},
+        "amazonQWorkspaceLspManifestMessage": {},
+        "amazonQChatDisclaimer": {},
+        "amazonQChatPairProgramming": {},
+        "amazonQSelectDeveloperProfile": {}
+    },
+    "amazonQ.showCodeWithReferences": {},
+    "amazonQ.allowFeatureDevelopmentToRunCodeAndTests": {},
+    "amazonQ.importRecommendationForInlineCodeSuggestions": {},
+    "amazonQ.shareContentWithAWS": {},
+    "amazonQ.workspaceIndex": {},
+    "amazonQ.workspaceIndexWorkerThreads": {},
+    "amazonQ.workspaceIndexUseGPU": {},
+    "amazonQ.workspaceIndexMaxSize": {},
+    "amazonQ.workspaceIndexMaxFileSize": {},
+    "amazonQ.workspaceIndexCacheDirPath": {},
+    "amazonQ.workspaceIndexIgnoreFilePatterns": {},
+    "amazonQ.ignoredSecurityIssues": {},
+    "amazonQ.proxy.certificateAuthority": {},
+    "amazonQ.proxy.enableProxyAndCertificateAutoDiscovery": {}
+}
+
+export default amazonqSettings
diff --git a/packages/core/src/shared/settings-toolkit.gen.ts b/packages/core/src/shared/settings-toolkit.gen.ts
new file mode 100644
index 00000000000..55bc77f9828
--- /dev/null
+++ b/packages/core/src/shared/settings-toolkit.gen.ts
@@ -0,0 +1,59 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * This file was autogenerated by generateSettings.ts. Do NOT modify by hand.
+ * To update this file, update the settings in the extension package.json
+ * and run `npm run generateSettings` for that extension.
+ */
+
+export const toolkitSettings = {
+    "aws.profile": {},
+    "aws.ecs.openTerminalCommand": {},
+    "aws.iot.maxItemsPerPage": {},
+    "aws.s3.maxItemsPerPage": {},
+    "aws.samcli.location": {},
+    "aws.samcli.lambdaTimeout": {},
+    "aws.samcli.legacyDeploy": {},
+    "aws.telemetry": {},
+    "aws.stepfunctions.asl.format.enable": {},
+    "aws.stepfunctions.asl.maxItemsComputed": {},
+    "aws.ssmDocument.ssm.maxItemsComputed": {},
+    "aws.cwl.limit": {},
+    "aws.samcli.manuallySelectedBuckets": {},
+    "aws.samcli.enableCodeLenses": {},
+    "aws.suppressPrompts": {
+        "apprunnerNotifyPricing": {},
+        "apprunnerNotifyPause": {},
+        "ecsRunCommand": {},
+        "ecsRunCommandEnable": {},
+        "ecsRunCommandDisable": {},
+        "regionAddAutomatically": {},
+        "yamlExtPrompt": {},
+        "fileViewerEdit": {},
+        "createCredentialsProfile": {},
+        "samcliConfirmDevStack": {},
+        "remoteConnected": {},
+        "codeCatalystConnectionExpired": {},
+        "minIdeVersion": {},
+        "ssoCacheError": {}
+    },
+    "aws.experiments": {
+        "jsonResourceModification": {},
+        "amazonqLSP": {},
+        "amazonqLSPInline": {},
+        "amazonqChatLSP": {},
+        "amazonqLSPInlineChat": {},
+        "amazonqLSPNEP": {}
+    },
+    "aws.resources.enabledResources": {},
+    "aws.lambda.recentlyUploaded": {},
+    "aws.accessAnalyzer.policyChecks.checkNoNewAccessFilePath": {},
+    "aws.accessAnalyzer.policyChecks.checkAccessNotGrantedFilePath": {},
+    "aws.accessAnalyzer.policyChecks.cloudFormationParameterFilePath": {},
+    "aws.sagemaker.studio.spaces.enableIdentityFiltering": {}
+}
+
+export default toolkitSettings
diff --git a/packages/core/src/shared/settings.ts b/packages/core/src/shared/settings.ts
new file mode 100644
index 00000000000..4e3e99f8207
--- /dev/null
+++ b/packages/core/src/shared/settings.ts
@@ -0,0 +1,973 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as codecatalyst from './clients/codecatalystClient'
+import { getLogger } from './logger/logger'
+import {
+    cast,
+    FromDescriptor,
+    isNameMangled,
+    Record,
+    TypeConstructor,
+    TypeDescriptor,
+} from './utilities/typeConstructors'
+import { assertHasProps, ClassToInterfaceType, keys } from './utilities/tsUtils'
+import { toRecord } from './utilities/collectionUtils'
+import { once, onceChanged } from './utilities/functionUtils'
+import { ToolkitError } from './errors'
+import { telemetry } from './telemetry/telemetry'
+import globals from './extensionGlobals'
+import toolkitSettings from './settings-toolkit.gen'
+import amazonQSettings from './settings-amazonq.gen'
+import { CodeWhispererConfig } from '../codewhisperer/models/model'
+
+type Workspace = Pick<typeof vscode.workspace, 'getConfiguration' | 'onDidChangeConfiguration'>
+
+/** Used by isReadable(). Must be something that's defined in our package.json. */
+export const testSetting = 'aws.samcli.lambdaTimeout'
+
+export async function showSettingsFailedMsg(kind: 'read' | 'update', key?: string) {
+    const keyMsg = key ? ` (key: "${key}")` : ''
+    const msg = `Failed to ${kind} settings${keyMsg}. Check settings.json for syntax errors or insufficient permissions.`
+    const openSettingsItem = 'Open settings.json'
+    const logsItem = 'View Logs...'
+
+    const items = [openSettingsItem, logsItem]
+    const p = vscode.window.showErrorMessage(msg, {}, ...items)
+    return p.then<string | undefined>(async (selection) => {
+        if (selection === logsItem) {
+            globals.logOutputChannel.show(true)
+        } else if (selection === openSettingsItem) {
+            await vscode.commands.executeCommand('workbench.action.openSettingsJson')
+        }
+        return selection
+    })
+}
+
+/**
+ * Shows an error message if we couldn't update settings, unless the last message was for the same `key`.
+ */
+const showSettingsUpdateFailedMsgOnce = onceChanged((key) => {
+    // Edge cases:
+    //  - settings.json may intentionally be readonly. #4043
+    //  - settings.json may be open in multiple vscodes. #4453
+    //  - vscode will show its own error if settings.json cannot be written.
+    void showSettingsFailedMsg('update', key)
+
+    telemetry.aws_modifySetting.emit({ result: 'Failed', reason: 'UserSettingsWrite', settingId: key })
+})
+
+/**
+ * A class for manipulating VS Code user settings (from all extensions).
+ *
+ * This is distinct from {@link TypedSettings} which is backed by validation functions.
+ * Use this class when very simple reading/writing to settings is needed.
+ *
+ * When additional logic is needed, prefer {@link fromExtensionManifest} for better encapsulation.
+ */
+export class Settings {
+    public constructor(
+        private readonly updateTarget = vscode.ConfigurationTarget.Global,
+        private readonly scope: vscode.ConfigurationScope | undefined = undefined,
+        private readonly workspace: Workspace = vscode.workspace
+    ) {}
+
+    /**
+     * Gets a setting value, applying the {@link TypeConstructor} if provided.
+     *
+     * If the read fails or the setting value is invalid (does not conform to `type`):
+     * - `defaultValue` is returned if it was provided
+     * - else an exception is thrown
+     *
+     * @note An unknown setting is indistinguisable from a missing value: both return `undefined`.
+     * Non-existent values are returned as-is without passing through the type cast.
+     *
+     * @param key Setting name
+     * @param type Expected setting type
+     * @param defaultValue Value returned if setting is missing or invalid
+     */
+    public get(key: string): unknown
+    public get<T>(key: string, type: TypeConstructor<T>): T | undefined
+    public get<T>(key: string, type: TypeConstructor<T>, defaultValue: T): T
+    public get<T>(key: string, type?: TypeConstructor<T>, defaultValue?: T) {
+        try {
+            const value = this.getConfig().get(key, defaultValue)
+
+            return !type || value === undefined ? value : cast(value, type)
+        } catch (e) {
+            if (arguments.length <= 2) {
+                throw ToolkitError.chain(e, `Failed to read setting "${key}"`)
+            }
+            getLogger().error('settings: failed to read "%s": %s', key, (e as Error).message)
+
+            return defaultValue
+        }
+    }
+
+    /**
+     * Attempts to write to the settings.
+     *
+     * Settings can only be written if the extension contributes the specified key in its
+     * `package.json`, else the write will fail and this method will return false.
+     *
+     * Writing to settings may fail if the user does not have write permissions, or settings.json is
+     * corrupted, or some other requirement is not met (for example, the
+     * `vscode.ConfigurationTarget.Workspace` target requires a workspace).
+     */
+    public async update(key: string, value: unknown): Promise<boolean> {
+        const config = this.getConfig()
+        try {
+            await config.update(key, value, this.updateTarget)
+
+            return true
+        } catch (e) {
+            const fullKey = config.inspect(key)?.key ?? key
+            getLogger().warn('settings: failed to update "%s": %s', fullKey, (e as Error).message)
+            showSettingsUpdateFailedMsgOnce(fullKey)
+
+            return false
+        }
+    }
+
+    /**
+     * Checks that user `settings.json` is readable. #3910
+     *
+     * Note: Does NOT check that we can "roundtrip" (read-and-write) settings. vscode notifies the
+     * user if settings.json is complete nonsense, but silently fails if there are only
+     * "recoverable" JSON syntax errors. We can't test for "roundtrip" on _startup_ because it causes
+     * race conditions if multiple VSCode instances start simultaneously. #4453
+     * Instead we handle that in {@link Settings#update()}.
+     */
+    public async isReadable(): Promise<boolean> {
+        const key = testSetting
+        const config = this.getConfig()
+
+        try {
+            config.get<number>(key)
+
+            return true
+        } catch (e) {
+            const err = e as Error
+            const logMsg = 'settings: invalid settings.json: %s'
+            getLogger().error(logMsg, err.message)
+
+            return false
+        }
+    }
+
+    /**
+     * Checks if the key has been set in any non-language scope.
+     */
+    public isSet(key: string, section?: string): boolean {
+        const config = this.getConfig(section)
+        const info = config.inspect(key)
+
+        return (
+            info?.globalValue !== undefined ||
+            info?.workspaceValue !== undefined ||
+            info?.workspaceFolderValue !== undefined
+        )
+    }
+
+    /**
+     * Returns a scoped "slice" (or "view") of the settings configuration.
+     *
+     * TODO(jmkeyes): This lacks all the type checking and error handling of {@link Settings}.
+     *
+     * The returned {@link Settings} interface is limited to the provided section.
+     *
+     * Example:
+     * ```ts
+     * const section = settings.getSection('aws.samcli')
+     * const samCliLocation = section.get('location')
+     *
+     * // Reset all settings under `aws.samcli`
+     * await section.reset()
+     * ```
+     */
+    public getSection(section: string): ResetableMemento {
+        const [targetKey, parentSection] = splitKey(section)
+
+        return {
+            keys: () => [], // TODO(jmkeyes): implement this?
+            get: (key, defaultValue?) => this.getConfig(section).get(key, defaultValue),
+            reset: async () => this.getConfig().update(section, undefined, this.updateTarget),
+            update: async (key, value) => {
+                // VS Code's settings API can read nested props but not write to them.
+                // We need to write to the parent if we cannot write to the child.
+                //
+                // TODO(sijaden): potentially provide valid keys upfront to avoid needing to
+                // handle this asymmetry with try/catch
+
+                try {
+                    return await this.getConfig(section).update(key, value, this.updateTarget)
+                } catch (error) {
+                    const parent = this.getConfig(parentSection)
+                    const val = parent.get(targetKey)
+
+                    if (typeof val === 'object') {
+                        return parent.update(targetKey, { ...val, [key]: value }, this.updateTarget)
+                    }
+
+                    throw error
+                }
+            },
+        }
+    }
+
+    /**
+     * Registers an event listener for a particular section of the settings.
+     */
+    public onDidChangeSection(
+        section: string,
+        listener: (event: vscode.ConfigurationChangeEvent) => unknown
+    ): vscode.Disposable {
+        const toRelative = (sub: string) => (section ? [section, sub] : [sub]).join('.')
+
+        return this.workspace.onDidChangeConfiguration((e) => {
+            const affectsConfiguration = (section: string) => e.affectsConfiguration(toRelative(section), this.scope)
+
+            if (!section || e.affectsConfiguration(section, this.scope)) {
+                listener({ affectsConfiguration })
+            }
+        })
+    }
+
+    /**
+     * Gets the workspace configuration, optionally scoped to a section.
+     *
+     * The resulting configuration object should not be cached.
+     */
+    private getConfig(section?: string) {
+        // eslint-disable-next-line unicorn/no-null
+        return this.workspace.getConfiguration(section, this.scope ?? null)
+    }
+
+    /**
+     * Defines a new set of settings from the specified section.
+     *
+     * Only use this for creating 'virtual' settings that don't exist within `package.json`.
+     * Prefer {@link fromExtensionManifest} for most use-cases.
+     */
+    public static define<T extends TypeDescriptor>(section: string, descriptor: T) {
+        return createSettingsClass(section, descriptor)
+    }
+
+    static #instance: Settings
+
+    /**
+     * A singleton scoped to the global configuration target and `null` resource.
+     */
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+}
+
+/**
+ * Splits a key into 'leaf' and 'section' components.
+ *
+ * The leaf is assumed to be the last dot-separated component. Example:
+ *
+ * ```ts
+ * const [leaf, section] = this.split('aws.cloudWatchLogs.limit')
+ * console.log(leaf, section) // aws.cloudWatchLogs limit
+ * ```
+ */
+function splitKey(key: string): [leaf: string, section: string] {
+    const parts = key.split('.')
+    const leaf = parts.pop() ?? key
+    const section = parts.join('.')
+
+    return [leaf, section]
+}
+
+// Keeping a separate function without a return type allows us to infer protected methods
+// TODO(sijaden): we can make this better in TS 4.7
+function createSettingsClass<T extends TypeDescriptor>(section: string, descriptor: T) {
+    type Inner = FromDescriptor<T>
+
+    // Class names are not always stable, especially when bundling
+    function makeLogger(name = 'Settings', loglevel: 'debug' | 'error') {
+        const prefix = `${isNameMangled() ? 'Settings' : name} (${section})`
+        return (message: string, ...meta: any[]) =>
+            loglevel === 'debug'
+                ? getLogger().debug(`${prefix}: ${message}`, ...meta)
+                : getLogger().error(`${prefix}: ${message}`, ...meta)
+    }
+
+    return class AnonymousSettings implements TypedSettings<Inner> {
+        readonly #settings: ClassToInterfaceType<Settings>
+        readonly #config: ResetableMemento
+        readonly #disposables: vscode.Disposable[] = []
+        // TODO(sijaden): add metadata prop to `Logger` so we don't need to make one-off log functions
+        public readonly _log = makeLogger(Object.getPrototypeOf(this)?.constructor?.name, 'debug')
+        public readonly _logErr = makeLogger(Object.getPrototypeOf(this)?.constructor?.name, 'error')
+
+        public constructor(settings: ClassToInterfaceType<Settings> = Settings.instance) {
+            this.#settings = settings
+            this.#config = this.#settings.getSection(section)
+        }
+
+        public get onDidChange() {
+            return this.#getChangedEmitter().event
+        }
+
+        public keys(): readonly string[] {
+            return this.#config.keys()
+        }
+
+        /**
+         * Gets a setting value.
+         *
+         * If the read fails or the setting value is invalid (does not conform to the type defined in package.json):
+         * - `defaultValue` is returned if it was provided
+         * - else an exception is thrown
+         *
+         * @param key Setting name
+         * @param defaultValue Value returned if setting is missing or invalid
+         */
+        public get<K extends keyof Inner>(key: K & string, defaultValue?: Inner[K]) {
+            try {
+                return this._getOrThrow(key, defaultValue)
+            } catch (e) {
+                if (arguments.length === 1) {
+                    throw ToolkitError.chain(e, `Failed to read key "${section}.${key}"`)
+                }
+                this._logErr('failed to read "%s": %s', key, (e as Error).message)
+
+                return defaultValue as Inner[K]
+            }
+        }
+
+        public async update<K extends keyof Inner>(key: K & string, value: Inner[K]) {
+            try {
+                await this.#config.update(key, value)
+
+                return true
+            } catch (e) {
+                const fullKey = `${section}.${key}`
+                showSettingsUpdateFailedMsgOnce(fullKey)
+                this._log('failed to update "%s": %s', key, (e as Error).message)
+
+                return false
+            }
+        }
+
+        public async delete(key: keyof Inner & string) {
+            try {
+                await this.#config.update(key, undefined)
+
+                return true
+            } catch (e) {
+                const fullKey = `${section}.${key}`
+                showSettingsUpdateFailedMsgOnce(fullKey)
+                this._log('failed to delete "%s": %s', key, (e as Error).message)
+
+                return false
+            }
+        }
+
+        public async reset() {
+            try {
+                return await this.#config.reset()
+            } catch (e) {
+                this._log('failed to reset settings: %s', (e as Error).message)
+            }
+        }
+
+        public dispose() {
+            return vscode.Disposable.from(this.#getChangedEmitter(), ...this.#disposables).dispose()
+        }
+
+        public _isSet(key: keyof Inner & string) {
+            return this.#settings.isSet(key, section)
+        }
+
+        public _getOrThrow<K extends keyof Inner>(key: K & string, defaultValue?: Inner[K]) {
+            const value = this.#config.get(key, defaultValue)
+
+            if (defaultValue !== undefined && (value === undefined || value === null)) {
+                return defaultValue
+            }
+
+            return cast<Inner[K]>(value, descriptor[key])
+        }
+
+        public _getOrUndefined<K extends keyof Inner>(key: K & string) {
+            const value = this.#config.get(key)
+            if (value === undefined) {
+                return value
+            }
+
+            return this.get(key, undefined)
+        }
+
+        readonly #getChangedEmitter = once(() => {
+            // For a setting `aws.foo.bar`:
+            //   - the "section" is `aws.foo`
+            //   - the "key" is `bar`
+            //
+            // So if `aws.foo.bar` changed, this would fire with data `{ key: 'bar' }`
+            //
+            // Note that `undefined` is not a valid JSON value. So using it as a default
+            // value is a valid way to express that the key exists but no (valid) value is set.
+
+            const props = keys(descriptor)
+            const store = toRecord(props, (p) => this._getOrUndefined(p))
+            const emitter = new vscode.EventEmitter<{ readonly key: keyof T }>()
+            const listener = this.#settings.onDidChangeSection(section, (event) => {
+                const isDifferent = (p: keyof T & string) => {
+                    const isDifferentLazy = () => {
+                        const previous = store[p]
+                        return previous !== (store[p] = this._getOrUndefined(p))
+                    }
+
+                    return event.affectsConfiguration(p) || isDifferentLazy()
+                }
+
+                for (const key of props.filter(isDifferent)) {
+                    this._log('key "%s" changed', key)
+                    emitter.fire({ key })
+                }
+            })
+
+            this.#disposables.push(emitter, listener)
+            return emitter
+        })
+    }
+}
+
+/**
+ * A stricter form of {@link vscode.Memento} with type-safe semantics.
+ */
+export interface TypedSettings<T extends Record<string, any>> extends Omit<ResetableMemento, 'get' | 'update'> {
+    /**
+     * Gets the value stored at `key`.
+     *
+     * Always returns the expected type, or throws an error.
+     */
+    get<K extends keyof T>(key: K, defaultValue?: T[K]): T[K]
+
+    /**
+     * Updates the value stored at `key`.
+     *
+     * Errors are caught and silently logged, and return `false`.
+     */
+    update<K extends keyof T>(key: K, value: T[K]): Promise<boolean>
+
+    /**
+     * Deletes a key from the settings.
+     *
+     * Equivalent to setting the value to `undefined`, but keeping the two concepts separate helps
+     * with catching unexpected behavior.
+     */
+    delete(key: keyof T): Promise<boolean>
+
+    /**
+     * Fired whenever a specific configuration changes.
+     */
+    readonly onDidChange: vscode.Event<{ readonly key: keyof T }>
+}
+
+/**
+ * Slightly extended form of {@link vscode.Memento}.
+ */
+export interface ResetableMemento extends vscode.Memento {
+    /**
+     * Resets the entire underlying store.
+     *
+     * A reset can be thought of as setting an imaginary 'root' key to `undefined`.
+     */
+    reset(): Promise<void>
+}
+
+// The below types are used to split-out 'sections' from `package.json`
+// Obviously not ideal, but the alternative is to generate the properties
+// from implementations. Using types requires basically no logic but lacks
+// precision. We still need to manually specify what type something should be,
+// at least for anything beyond primitive types.
+const settingsProps = { ...toolkitSettings, ...amazonQSettings }
+
+type SettingsProps = typeof settingsProps
+
+type Split<T, S extends string> = T extends `${infer L}${S}${infer R}` ? [L, ...Split<R, S>] : [T]
+type Pop<T> = T extends [...infer R, infer _] ? R : never
+type Intersection<T> = (T extends any ? (_: T) => any : never) extends (_: infer U) => any ? U : never
+
+type FromParts<T, K> = K extends [infer U, ...infer R]
+    ? [U, R] extends [string, string[]]
+        ? { [P in U & string]: FromParts<T, R> }
+        : T
+    : T
+
+type Format<T> = { [P in keyof T]: FromParts<TypeConstructor, Split<P, '.'>> }[keyof T]
+type Config = Intersection<Format<SettingsProps>>
+
+type Join<T extends string[], S extends string> = T['length'] extends 1
+    ? T[0]
+    : T extends [infer L, ...infer R]
+      ? L extends string
+          ? R extends string[]
+              ? `${L}${S}${Join<R, S>}`
+              : ''
+          : ''
+      : never
+
+type Select<T, K> = K extends [infer L, ...infer R]
+    ? L extends keyof T
+        ? R['length'] extends 0
+            ? T[L]
+            : Select<T[L], R>
+        : never
+    : never
+
+type Sections = { [P in keyof SettingsProps as Join<Pop<Split<P, '.'>>, '.'>]: Select<Config, Pop<Split<P, '.'>>> }
+
+/**
+ * Creates a class for manipulating specific sections of settings specified in `package.json`.
+ *
+ * A 'section' is the combined namespaces of a key, e.g. `aws.foo.bar` is within the section `aws.foo`.
+ * From a section, callers can specify which keys they want to use as well as how it should be parsed.
+ * The returned class will be a valid implementation of {@link TypedSettings}. Declared settings keys
+ * are validated against `package.json` to ensure they exist.
+ *
+ * ### Examples
+ * #### Pass-through:
+ * ```
+ * export class CloudWatchLogsSettings extends fromExtensionManifest('aws.cwl', { limit: Number }) {}
+ *
+ * const settings = new CloudWatchLogsSettings()
+ * const limit = settings.get('limit', 1000)
+ * ```
+ *
+ * #### Extending:
+ * ```
+ * export class TelemetryConfig extends fromExtensionManifest('aws', { telemetry: Boolean }) {
+ *     public isEnabled(): boolean {
+ *         try {
+ *             return this.get('telemetry', TELEMETRY_SETTING_DEFAULT)
+ *         } catch (error) {
+ *              vscode.window.showErrorMessage(
+ *                  localize(
+ *                      'AWS.message.error.settings.telemetry.invalid_type',
+ *                      'The aws.telemetry value must be a boolean'
+ *                  )
+ *              )
+ *
+ *              return TELEMETRY_SETTING_DEFAULT
+ *         }
+ *     }
+ * }
+ * ```
+ *
+ * @param section Section used to create the class
+ * @param descriptor A {@link TypeDescriptor} that maps keys to a concrete type
+ *
+ * @returns A class that can be used as-is or inherited from
+ */
+export function fromExtensionManifest<T extends TypeDescriptor & Partial<Sections[K]>, K extends keyof Sections>(
+    section: K,
+    descriptor: T
+) {
+    // The function signature is intentionally loose to allow for partial implementations.
+    // Runtime validation is required to ensure things are correct.
+    //
+    // Assumptions:
+    // - `fromExtensionManifest` is called exclusively on module load
+    // - The extension loads all modules before activating
+    //
+    // As long as the above holds true, throwing an error here will always be caught by CI
+
+    const resolved = keys(descriptor).map((k) => `${section}.${k}`)
+    const missing = resolved.filter((k) => (settingsProps as Record<string, any>)[k] === undefined)
+
+    if (missing.length > 0) {
+        const message = `The following configuration keys were missing from package.json: ${missing.join(', ')}`
+        getLogger().error(
+            `Settings (fromExtensionManifest): missing fields:\n${missing.map((k) => `\t${k}`).join('\n')}`
+        )
+
+        throw new Error(message)
+    }
+
+    return Settings.define(section, descriptor)
+}
+
+/**
+ * PromptSettings
+ *
+ * Controls flags for prompts that allow the user to hide them. Usually this is presented as
+ * some variation of "Don't show again".
+ *
+ * ### Usage:
+ * ```
+ * if (settings.isPromptEnabled('myPromptName')) {
+ *     // Show some sort of prompt
+ *     const userResponse = await promptUser()
+ *
+ *     // Then check if we should disable it
+ *     if (userResponse === "Don't show again") {
+ *         settings.disablePrompt('myPromptName')
+ *     }
+ * }
+ * ```
+ *
+ * There are individual implementations for the Toolkit extension and Amazon Q extension.
+ * This is a temporary workaround to get compile time checking and runtime fetching
+ * of settings working.
+ *
+ * TODO: Settings should be defined in individual extensions, and passed to the
+ * core lib as necessary.
+ */
+export const toolkitPrompts = settingsProps['aws.suppressPrompts']
+type toolkitPromptName = keyof typeof toolkitPrompts
+export class ToolkitPromptSettings
+    extends Settings.define(
+        'aws.suppressPrompts',
+        toRecord(keys(toolkitPrompts), () => Boolean)
+    )
+    implements PromptSettings
+{
+    public isPromptEnabled(promptName: toolkitPromptName): boolean {
+        try {
+            return !this._getOrThrow(promptName, false)
+        } catch (e) {
+            this._log('prompt check for "%s" failed: %s', promptName, (e as Error).message)
+            this.reset().catch((e) => getLogger().error(`failed to reset prompt settings: %O`, (e as Error).message))
+
+            return true
+        }
+    }
+
+    public async disablePrompt(promptName: toolkitPromptName): Promise<void> {
+        if (this.isPromptEnabled(promptName)) {
+            await this.update(promptName, true)
+        }
+    }
+
+    static #instance: ToolkitPromptSettings
+
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+}
+
+export const amazonQPrompts = settingsProps['amazonQ.suppressPrompts']
+type amazonQPromptName = keyof typeof amazonQPrompts
+export class AmazonQPromptSettings
+    extends Settings.define(
+        'amazonQ.suppressPrompts',
+        toRecord(keys(amazonQPrompts), () => Boolean)
+    )
+    implements PromptSettings
+{
+    public isPromptEnabled(promptName: amazonQPromptName): boolean {
+        try {
+            // Legacy migration for old globalState settings:
+            if (promptName === 'amazonQChatDisclaimer') {
+                const acknowledged = globals.globalState.tryGet('aws.amazonq.disclaimerAcknowledged', Boolean, false)
+                if (acknowledged) {
+                    void this.update(promptName, true)
+                    globals.globalState.tryUpdate('aws.amazonq.disclaimerAcknowledged', undefined)
+                }
+            }
+
+            return !this._getOrThrow(promptName, false)
+        } catch (e) {
+            this._log('prompt check for "%s" failed: %s', promptName, (e as Error).message)
+            this.reset().catch((e) => getLogger().error(`isPromptEnabled: reset() failed: %O`, (e as Error).message))
+
+            return true
+        }
+    }
+
+    public async enablePrompt(promptName: amazonQPromptName): Promise<void> {
+        if (!this.isPromptEnabled(promptName)) {
+            await this.update(promptName, false)
+        }
+    }
+
+    public async disablePrompt(promptName: amazonQPromptName): Promise<void> {
+        if (this.isPromptEnabled(promptName)) {
+            await this.update(promptName, true)
+        }
+    }
+
+    static #instance: AmazonQPromptSettings
+
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+}
+
+/**
+ * Use cautiously as this is misleading. Ideally we create a type
+ * which is the intersection of the types (only the values that occur
+ * in each are selected), but idk how to do that.
+ */
+type AllPromptNames = amazonQPromptName | toolkitPromptName
+
+export interface PromptSettings {
+    isPromptEnabled(promptName: AllPromptNames): boolean
+    disablePrompt(promptName: AllPromptNames): Promise<void>
+}
+
+const experiments = settingsProps['aws.experiments']
+type ExperimentName = keyof typeof experiments
+
+/**
+ * "Experiments" are for features that users must opt-in to use. Experimental implementations
+ * should use this class to gate relevant functionality. Certain features, like adding a new
+ * node to the tree view, may require notifications based on changes. Use the `onDidChange` event
+ * to refresh state as-needed in this scenario.
+ *
+ * ### Usage:
+ * ```
+ * function myExperimentalFeature(): void {
+ *   if (!(await settings.isExperimentEnabled('myExperimentalFeature'))) {
+ *       return
+ *   }
+ *
+ *   // Rest of the feature
+ * }
+ *
+ * settings.onDidChange(({ key }) => {
+ *    if (key === 'myExperimentalFeature') {
+ *        // Refresh trees, webviews, etc.
+ *    }
+ * })
+ * ```
+ */
+export class Experiments extends Settings.define(
+    'aws.experiments',
+    toRecord(keys(experiments), () => Boolean)
+) {
+    public isExperimentEnabled(name: ExperimentName): boolean {
+        try {
+            return this._getOrThrow(name, false)
+        } catch (error) {
+            this._log(`experiment check for ${name} failed: %s`, error)
+            this.reset().catch((e) => getLogger().error(`failed to reset experiment settings: %O`, e))
+
+            return false
+        }
+    }
+
+    static #instance: Experiments
+
+    public static get instance() {
+        return (this.#instance ??= new this())
+    }
+}
+
+const devSettings = {
+    crashCheckInterval: Number,
+    logfile: String,
+    forceDevMode: Boolean,
+    forceInstallTools: Boolean,
+    forceResolveEnv: Boolean,
+    telemetryEndpoint: String,
+    telemetryUserPool: String,
+    renderDebugDetails: Boolean,
+    devenvTimeoutMs: Number,
+    endpoints: Record(String, String),
+    codecatalystService: Record(String, String),
+    codewhispererService: Record(String, String),
+    amazonqLsp: Record(String, String),
+    amazonqWorkspaceLsp: Record(String, String),
+    ssoCacheDirectory: String,
+    autofillStartUrl: String,
+    webAuth: Boolean,
+    notificationsPollInterval: Number,
+}
+type ResolvedDevSettings = FromDescriptor<typeof devSettings>
+type AwsDevSetting = keyof ResolvedDevSettings
+
+type ServiceClients = keyof ServiceTypeMap
+interface ServiceTypeMap {
+    codecatalystService: codecatalyst.CodeCatalystConfig
+    amazonqLsp: object // type is provided inside of amazon q
+    amazonqWorkspaceLsp: object // type is provided inside of amazon q
+    codewhispererService: CodeWhispererConfig
+}
+
+/**
+ * Developer settings are intended to be used by developers of this codebase for anything
+ * that may be potentially useful during active development and/or testing. Examples include
+ * forcing certain behaviors, changing hard-coded endpoints, emitting extra debug info, etc.
+ *
+ * These settings should _not_ be placed in `package.json` as they are not meant to be seen by
+ * the average user. Instead, add a new field to {@link devSettings this object} with the
+ * desired name/type.
+ *
+ * Note that a default value _must_ be supplied when calling {@link get} because developer
+ * settings are intentional deviations from the default. Always using a default helps to
+ * ensure that behavior is well-defined and isolated. Calls to {@link get} will not throw
+ * an error, even for bad types, unless the code is ran from automated tests. The supplied
+ * default will be used in case any errors occur in non-testing environment.
+ *
+ * ### Usage:
+ * ```
+ * // Use the `instance` field to retrieve the object
+ * const devSettings = DevSettings.instance
+ *
+ * // Override some endpoint for an SDK client
+ * const myEndpoint = devSettings.get('myEndpoint', DEFAULT_ENDPOINT)
+ * const myClient = new MyClient({ endpoint: myEndpoint })
+ *
+ * // Potentially register an event (if needed)
+ * devSettings.onDidChange(({ key }) => {
+ *     // Do something based off what changed
+ * })
+ * ```
+ */
+export class DevSettings extends Settings.define('aws.dev', devSettings) {
+    private readonly trappedSettings: Partial<ResolvedDevSettings> = {}
+    private readonly onDidChangeActiveSettingsEmitter = new vscode.EventEmitter<void>()
+
+    public readonly onDidChangeActiveSettings = this.onDidChangeActiveSettingsEmitter.event
+
+    public get activeSettings(): Readonly<typeof this.trappedSettings> {
+        return this.trappedSettings
+    }
+
+    public isDevMode(): boolean {
+        // This setting takes precedence over everything.
+        // It must be removed completely from the settings to not be considered.
+        const forceDevMode: boolean | undefined = this._isSet('forceDevMode')
+            ? this.get('forceDevMode', false)
+            : undefined
+        if (forceDevMode !== undefined) {
+            return forceDevMode
+        }
+
+        // forceDevMode was not defined, so check other dev settings
+        return Object.keys(this.activeSettings).length > 0
+    }
+
+    public getServiceConfig<T extends ServiceClients>(
+        devSetting: T,
+        defaultConfig: ServiceTypeMap[T]
+    ): Readonly<ServiceTypeMap[T]> {
+        const devConfig = this.get<ServiceClients>(devSetting, {})
+
+        if (Object.keys(devConfig).length === 0) {
+            this.logConfigOnce(devSetting, 'default')
+            return defaultConfig
+        }
+
+        try {
+            // The configuration in dev settings should explicitly override the entire default configuration.
+            assertHasProps(devConfig, ...Object.keys(defaultConfig))
+        } catch (err) {
+            throw ToolkitError.chain(err, `Dev setting '${devSetting}' has missing or invalid properties.`)
+        }
+
+        this.logConfigOnce(devSetting, JSON.stringify(devConfig, undefined, 4))
+        return devConfig as unknown as ServiceTypeMap[T]
+    }
+
+    public override get<K extends AwsDevSetting>(key: K, defaultValue: ResolvedDevSettings[K]) {
+        if (!this._isSet(key)) {
+            this.unset(key)
+
+            return defaultValue
+        }
+
+        const result = super.get(key, defaultValue)
+        this.trap(key, result)
+
+        return result
+    }
+
+    private trap<K extends AwsDevSetting>(key: K, value: ResolvedDevSettings[K]) {
+        if (this.trappedSettings[key] !== value) {
+            this.trappedSettings[key] = value
+            this.onDidChangeActiveSettingsEmitter.fire()
+        }
+    }
+
+    private unset(key: AwsDevSetting) {
+        if (key in this.trappedSettings) {
+            delete this.trappedSettings[key]
+            this.onDidChangeActiveSettingsEmitter.fire()
+        }
+    }
+
+    private logConfigOnce = onceChanged((serviceName, val) => {
+        getLogger().info(`using ${serviceName} service configuration: ${val}`)
+    })
+
+    static #instance: DevSettings
+
+    public static get instance() {
+        if (this.#instance === undefined) {
+            this.#instance = new this()
+        }
+
+        return this.#instance
+    }
+}
+
+/**
+ * Simple utility function to 'migrate' a setting from one key to another.
+ *
+ * Currently only used for simple migrations where we are not concerned about maintaining the
+ * legacy definition.
+ */
+export async function migrateSetting<T, U = T>(
+    from: { key: string; type: TypeConstructor<T> },
+    to: { key: keyof SettingsProps; transform?: (value: T) => U }
+) {
+    const config = vscode.workspace.getConfiguration()
+
+    const migrateForScope = async (scope: vscode.ConfigurationTarget) => {
+        const valueProp = scope === vscode.ConfigurationTarget.Global ? 'globalValue' : 'workspaceValue'
+        const hasLatest = config.inspect(to.key)![valueProp] !== undefined
+        const logPrefix = `Settings migration ("${from.key}" -> "${to.key}"), (scope: ${valueProp})`
+
+        const oldSettingProps = config.inspect(from.key)
+        if (hasLatest) {
+            getLogger().debug(`skipping: ${logPrefix}, the latest setting is already defined for this scope.`)
+            return
+        }
+        if (!oldSettingProps) {
+            getLogger().debug(`skipping: ${logPrefix}, the old setting does not exist.`)
+            return
+        }
+        if (oldSettingProps[valueProp] === undefined) {
+            getLogger().debug(`skipping: ${logPrefix}, the old setting is not defined for this scope.`)
+            return
+        }
+
+        try {
+            const oldVal = cast(config.get(from.key), from.type)
+            const newVal = to.transform?.(oldVal) ?? oldVal
+
+            await config.update(to.key, newVal, scope)
+            getLogger().info(`${logPrefix}: succeeded`)
+        } catch (error) {
+            getLogger().verbose(`${logPrefix}: failed: %s`, error)
+        }
+    }
+
+    await migrateForScope(vscode.ConfigurationTarget.Workspace)
+    await migrateForScope(vscode.ConfigurationTarget.Global)
+}
+
+/** Opens the settings UI filtered by the given prefix. */
+export async function openSettings(prefix: string): Promise<void> {
+    await vscode.commands.executeCommand('workbench.action.openSettings', prefix)
+}
+
+/**
+ * Opens the settings UI at the specified key.
+ *
+ * This only works for keys that are considered "top-level", e.g. keys of {@link settingsProps}.
+ */
+export async function openSettingsId<K extends keyof SettingsProps>(key: K): Promise<void> {
+    await vscode.commands.executeCommand('workbench.action.openSettings', `@id:${key}`)
+}
diff --git a/packages/core/src/shared/sshConfig.ts b/packages/core/src/shared/sshConfig.ts
new file mode 100644
index 00000000000..92b32666b06
--- /dev/null
+++ b/packages/core/src/shared/sshConfig.ts
@@ -0,0 +1,256 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as path from 'path'
+import * as nls from 'vscode-nls'
+import { getLogger } from './logger/logger'
+import { ChildProcess, ChildProcessResult } from './utilities/processUtils'
+import { Result } from './utilities/result'
+import { ToolkitError } from './errors'
+import { getIdeProperties } from './extensionUtilities'
+import { showConfirmationMessage } from './utilities/messages'
+import { CancellationError } from './utilities/timeoutUtils'
+import { getSshConfigPath } from './extensions/ssh'
+import globals from './extensionGlobals'
+import { fileExists, readFileAsString } from './filesystemUtilities'
+import { chmodSync } from 'fs' // eslint-disable-line no-restricted-imports
+import fs from './fs/fs'
+
+const localize = nls.loadMessageBundle()
+
+export class SshConfig {
+    protected readonly configHostName: string
+    protected readonly proxyCommandRegExp: RegExp
+
+    public constructor(
+        protected readonly sshPath: string,
+        protected readonly hostNamePrefix: string,
+        protected readonly scriptPrefix: string,
+        protected readonly keyPath?: string
+    ) {
+        this.configHostName = `${hostNamePrefix}*`
+        this.proxyCommandRegExp = new RegExp(`proxycommand.{0,1024}${scriptPrefix}(.ps1)?.{0,99}`)
+    }
+
+    protected isWin(): boolean {
+        return process.platform === 'win32'
+    }
+
+    protected async getProxyCommand(command: string): Promise<Result<string, ToolkitError>> {
+        // Use %n for SageMaker to preserve original hostname case (avoids SSH canonicalization lowercasing and DNS lookup)
+        const hostnameToken = this.scriptPrefix === 'sagemaker_connect' ? '%n' : '%h'
+
+        if (this.isWin()) {
+            // Some older versions of OpenSSH (7.8 and below) have a bug where attempting to use powershell.exe directly will fail without an absolute path
+            const proc = new ChildProcess('powershell.exe', ['-Command', '(get-command powershell.exe).Path'])
+            const r = await proc.run()
+            if (r.exitCode !== 0) {
+                return Result.err(new ToolkitError('Failed to get absolute path for powershell', { cause: r.error }))
+            }
+            return Result.ok(`"${r.stdout}" -ExecutionPolicy RemoteSigned -File "${command}" ${hostnameToken}`)
+        } else {
+            return Result.ok(`'${command}' '${hostnameToken}'`)
+        }
+    }
+
+    public async ensureValid() {
+        const scriptResult = await ensureConnectScript(this.scriptPrefix)
+        if (scriptResult.isErr()) {
+            return scriptResult
+        }
+
+        const connectScript = scriptResult.ok()
+        const proxyCommand = await this.getProxyCommand(connectScript.fsPath)
+        if (proxyCommand.isErr()) {
+            return proxyCommand
+        }
+
+        const verifyHost = await this.verifySSHHost(proxyCommand.unwrap())
+        if (verifyHost.isErr()) {
+            return verifyHost
+        }
+
+        return Result.ok()
+    }
+
+    protected async checkSshOnHost(): Promise<ChildProcessResult> {
+        const proc = new ChildProcess(this.sshPath, ['-G', `${this.hostNamePrefix}test`])
+        const result = await proc.run()
+        return result
+    }
+
+    protected async matchSshSection() {
+        const result = await this.checkSshOnHost()
+        if (result.exitCode !== 0) {
+            return Result.err(result.error ?? new Error(`ssh check against host failed: ${result.exitCode}`))
+        }
+        const matches = result.stdout.match(this.proxyCommandRegExp)
+        return Result.ok(matches?.[0])
+    }
+
+    private async promptUserForOutdatedSection(configSection: string): Promise<void> {
+        getLogger().warn(`SSH config: found old/outdated "${this.configHostName}" section:\n%O`, configSection)
+        const oldConfig = localize(
+            'AWS.sshConfig.error.oldConfig',
+            'Your ~/.ssh/config has a {0} section that might be out of date. Delete it, then try again.',
+            this.configHostName
+        )
+
+        const openConfig = localize('AWS.ssh.openConfig', 'Open config...')
+        await vscode.window.showWarningMessage(oldConfig, openConfig).then((resp) => {
+            if (resp === openConfig) {
+                void vscode.window.showTextDocument(vscode.Uri.file(getSshConfigPath()))
+            }
+        })
+
+        throw new ToolkitError(oldConfig, { code: 'OldConfig' })
+    }
+
+    protected async writeSectionToConfig(proxyCommand: string) {
+        const sshConfigPath = getSshConfigPath()
+        const section = this.createSSHConfigSection(proxyCommand)
+        try {
+            const parentsDir = path.dirname(sshConfigPath)
+            const grandParentsDir = path.dirname(parentsDir)
+            // TODO: replace w/ fs.chmod once stub is merged.
+            await fs.mkdir(grandParentsDir)
+            chmodSync(grandParentsDir, 0o755)
+
+            await fs.mkdir(parentsDir)
+            chmodSync(parentsDir, 0o700)
+
+            await fs.appendFile(sshConfigPath, section)
+            chmodSync(sshConfigPath, 0o600)
+        } catch (e) {
+            const message = localize(
+                'AWS.sshConfig.error.writeFail',
+                'Failed to write SSH config: {0} (permission issue?)',
+                sshConfigPath
+            )
+
+            throw ToolkitError.chain(e, message, { code: 'ConfigWriteFailed' })
+        }
+    }
+
+    public async promptUserToConfigureSshConfig(
+        configSection: string | undefined,
+        proxyCommand: string
+    ): Promise<void> {
+        if (configSection !== undefined) {
+            await this.promptUserForOutdatedSection(configSection)
+        }
+
+        const confirmTitle = localize(
+            'AWS.sshConfig.confirm.installSshConfig.title',
+            '{0} Toolkit will add host {1} to ~/.ssh/config to use SSH with your Dev Environments',
+            getIdeProperties().company,
+            this.configHostName
+        )
+        const confirmText = localize('AWS.sshConfig.confirm.installSshConfig.button', 'Update SSH config')
+        const response = await showConfirmationMessage({ prompt: confirmTitle, confirm: confirmText })
+        if (!response) {
+            throw new CancellationError('user')
+        }
+
+        await this.writeSectionToConfig(proxyCommand)
+    }
+
+    // Check if the hostname pattern is working.
+    protected async verifySSHHost(proxyCommand: string) {
+        const matchResult = await this.matchSshSection()
+        if (matchResult.isErr()) {
+            return matchResult
+        }
+
+        const configSection = matchResult.ok()
+        const hasProxyCommand = configSection?.includes(proxyCommand)
+
+        if (!hasProxyCommand) {
+            try {
+                await this.promptUserToConfigureSshConfig(configSection, proxyCommand)
+            } catch (e) {
+                return Result.err(e as Error)
+            }
+        }
+
+        return Result.ok()
+    }
+
+    private getBaseSSHConfig(proxyCommand: string): string {
+        // "AddKeysToAgent" will automatically add keys used on the server to the local agent. If not set, then `ssh-add`
+        // must be done locally. It's mostly a convenience thing; private keys are _not_ shared with the server.
+        // "IdentitiesOnly yes" forces agent to only use provided identity file.
+        // More details: https://www.ssh.com/academy/ssh/config
+        return `
+# Created by AWS Toolkit for VSCode. https://github.com/aws/aws-toolkit-vscode
+Host ${this.configHostName}
+    ForwardAgent yes
+    AddKeysToAgent yes
+    StrictHostKeyChecking accept-new
+    ProxyCommand ${proxyCommand}
+    IdentitiesOnly yes
+    `
+    }
+
+    private getSageMakerSSHConfig(proxyCommand: string): string {
+        return `
+# Created by AWS Toolkit for VSCode. https://github.com/aws/aws-toolkit-vscode
+Host ${this.configHostName}
+    ForwardAgent yes
+    AddKeysToAgent yes
+    StrictHostKeyChecking accept-new
+    ProxyCommand ${proxyCommand}
+    `
+    }
+
+    protected createSSHConfigSection(proxyCommand: string): string {
+        if (this.scriptPrefix === 'sagemaker_connect') {
+            return `${this.getSageMakerSSHConfig(proxyCommand)}`
+        } else if (this.keyPath) {
+            return `${this.getBaseSSHConfig(proxyCommand)}IdentityFile '${this.keyPath}'\n    User '%r'\n`
+        }
+        return this.getBaseSSHConfig(proxyCommand)
+    }
+}
+
+export function sshLogFileLocation(service: string, id: string): string {
+    return path.join(globals.context.globalStorageUri.fsPath, `${service}.${id}.log`)
+}
+
+export function constructScriptName(scriptPrefix: string) {
+    return `${scriptPrefix}${process.platform === 'win32' ? '.ps1' : ''}`
+}
+
+export async function ensureConnectScript(
+    scriptPrefix: string,
+    context = globals.context
+): Promise<Result<vscode.Uri, ToolkitError>> {
+    const scriptName = constructScriptName(scriptPrefix)
+
+    // Script resource path. Includes the Toolkit version string so it changes with each release.
+    const versionedScript = vscode.Uri.joinPath(context.extensionUri, 'resources', scriptName)
+
+    // Copy to globalStorage to ensure a "stable" path (not influenced by Toolkit version string.)
+    const connectScript = vscode.Uri.joinPath(context.globalStorageUri, scriptName)
+
+    try {
+        const exists = await fileExists(connectScript.fsPath)
+        const contents1 = await readFileAsString(versionedScript.fsPath)
+        const contents2 = exists ? await readFileAsString(connectScript.fsPath) : ''
+        const isOutdated = contents1 !== contents2
+
+        if (isOutdated) {
+            await fs.copy(versionedScript.fsPath, connectScript.fsPath)
+            getLogger().info('ssh: updated connect script')
+        }
+
+        return Result.ok(connectScript)
+    } catch (e) {
+        const message = localize('AWS.sshConfig.error.copyScript', 'Failed to update connect script')
+
+        return Result.err(ToolkitError.chain(e, message, { code: 'ConnectScriptUpdateFailed' }))
+    }
+}
diff --git a/packages/core/src/shared/telemetry/README b/packages/core/src/shared/telemetry/README
new file mode 100644
index 00000000000..b131dfff882
--- /dev/null
+++ b/packages/core/src/shared/telemetry/README
@@ -0,0 +1,11 @@
+This is the core of the telemetry service client for the AWS Toolkit for Visual Studio Code
+
+service-2.json is generated internally.
+
+clienttelemetry.d.ts is autogenerated from service-2.json using the AWS JS SDK. This is incorporated into the
+`postinstall` npm step.
+
+build/generateServiceClient.ts generates clienttelemetry.d.ts
+
+Client ID is generated and stored/retrieved in `createDefaultPublisher()`:
+https://github.com/aws/aws-toolkit-vscode/blob/8ee7242fc443b37d622b59b5f19f7a086f3cf05d/packages/core/src/shared/telemetry/telemetryService.ts#L208-L209
diff --git a/packages/core/src/shared/telemetry/activation.ts b/packages/core/src/shared/telemetry/activation.ts
new file mode 100644
index 00000000000..2b0b2864ba1
--- /dev/null
+++ b/packages/core/src/shared/telemetry/activation.ts
@@ -0,0 +1,143 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../extensionGlobals'
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as vscode from 'vscode'
+import { AwsContext } from '../awsContext'
+import { DefaultTelemetryService } from './telemetryService'
+import { getLogger } from '../logger/logger'
+import { getComputeRegion, isAmazonQ, productName } from '../extensionUtilities'
+import { openSettingsId, Settings } from '../settings'
+import { getSessionId, TelemetryConfig } from './util'
+import { isAutomation, isReleaseVersion } from '../vscode/env'
+import { AWSProduct } from './clienttelemetry'
+import { DefaultTelemetryClient } from './telemetryClient'
+import { telemetry } from './telemetry'
+
+export const noticeResponseViewSettings = localize('AWS.telemetry.notificationViewSettings', 'Settings')
+export const noticeResponseOk = localize('AWS.telemetry.notificationOk', 'OK')
+
+// Telemetry Notice Versions
+// Versioning the users' notice acknowledgement is forward looking, and allows us to better
+// track scenarios when we may need to re-prompt the user about telemetry.
+// Version 1 was the original notice, allowing users to enable/disable/defer telemetry
+// Version 2 states that there is metrics gathering, which can be adjusted in the options
+const CURRENT_TELEMETRY_NOTICE_VERSION = 2 // eslint-disable-line @typescript-eslint/naming-convention
+
+/**
+ * Sets up the Metrics system and initializes globals.telemetry
+ */
+export async function activate(
+    extensionContext: vscode.ExtensionContext,
+    awsContext: AwsContext,
+    settings: Settings,
+    productName: AWSProduct
+) {
+    const config = new TelemetryConfig(settings)
+
+    DefaultTelemetryClient.productName = productName
+    globals.telemetry = await DefaultTelemetryService.create(awsContext, getComputeRegion())
+
+    const isAmazonQExt = isAmazonQ()
+    try {
+        await globals.telemetry.setTelemetryEnabled(config.isEnabled())
+
+        extensionContext.subscriptions.push(
+            (isAmazonQExt ? config.amazonQConfig : config.toolkitConfig).onDidChange(async (event) => {
+                if (event.key === 'telemetry') {
+                    const val = config.isEnabled()
+                    const settingId = isAmazonQExt ? 'amazonQ.telemetry' : 'aws.telemetry'
+
+                    // Record 'disabled' right before its turned off, so we can send this + the batch we have already.
+                    if (!val) {
+                        telemetry.aws_modifySetting.emit({ settingId, settingState: 'false', result: 'Succeeded' })
+                    }
+
+                    await globals.telemetry.setTelemetryEnabled(val)
+
+                    // Record 'enabled' after its turned on, otherwise this is ignored.
+                    if (val) {
+                        telemetry.aws_modifySetting.emit({ settingId, settingState: 'true', result: 'Succeeded' })
+                    }
+                }
+            })
+        )
+
+        // Prompt user about telemetry if they haven't been
+        if (!hasUserSeenTelemetryNotice()) {
+            showTelemetryNotice()
+        }
+
+        await globals.telemetry.start()
+
+        if (globals.telemetry.telemetryEnabled) {
+            // Only log the IDs if telemetry is enabled, so that users who have it disabled do not think we are sending events.
+            getLogger().info(`Telemetry clientId: ${globals.telemetry.clientId}`)
+            getLogger().info(`Telemetry sessionId: ${getSessionId()}`)
+        }
+    } catch (e) {
+        // Only throw in a production build because:
+        //   1. Telemetry must never prevent normal Toolkit operation.
+        //   2. We want to know if something is not working ASAP during development.
+        if (isAutomation() || !isReleaseVersion()) {
+            throw e
+        }
+
+        getLogger().error(`telemetry: failed to activate: %s`, e)
+    }
+}
+
+export function hasUserSeenTelemetryNotice(): boolean {
+    return globals.globalState.tryGet('awsTelemetryNoticeVersionAck', Number, 0) >= CURRENT_TELEMETRY_NOTICE_VERSION
+}
+
+export async function setHasUserSeenTelemetryNotice(): Promise<void> {
+    await globals.globalState.update('awsTelemetryNoticeVersionAck', CURRENT_TELEMETRY_NOTICE_VERSION)
+    getLogger().verbose('Telemetry notice has been shown')
+}
+
+/**
+ * Prompts user to Enable/Disable/Defer on Telemetry, then
+ * handles the response appropriately.
+ */
+function showTelemetryNotice() {
+    getLogger().verbose('Showing telemetry notice')
+
+    const telemetryNoticeText: string = localize(
+        'AWS.telemetry.notificationMessage',
+        '{0} collects anonymous usage metrics to improve the product. You can opt-out in settings.',
+        productName()
+    )
+
+    // Don't wait for a response
+    void vscode.window
+        .showInformationMessage(telemetryNoticeText, noticeResponseViewSettings, noticeResponseOk)
+        .then(async (response) => handleTelemetryNoticeResponse(response))
+}
+
+export async function handleTelemetryNoticeResponse(response: string | undefined) {
+    try {
+        getLogger().verbose(`Telemetry notice response: ${response}`)
+
+        if (!response) {
+            // undefined == user discarded notice
+            return
+        }
+
+        await setHasUserSeenTelemetryNotice()
+
+        // noticeResponseOk is a no-op
+
+        if (response === noticeResponseViewSettings) {
+            await openSettingsId(isAmazonQ() ? 'amazonQ.telemetry' : 'aws.telemetry')
+        }
+    } catch (err) {
+        getLogger().error('Error while handling response from telemetry notice: %O', err as Error)
+    }
+}
diff --git a/packages/core/src/shared/telemetry/exemptMetrics.ts b/packages/core/src/shared/telemetry/exemptMetrics.ts
new file mode 100644
index 00000000000..4e0deacc058
--- /dev/null
+++ b/packages/core/src/shared/telemetry/exemptMetrics.ts
@@ -0,0 +1,61 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * TODO: Fix calls to these metrics and remove this file.
+ * NOTE: Do NOT add additional metrics here, your PR will be rejected. All new metrics should pass validation.
+ *
+ * Checks were added to all emitted telemetry metrics to ensure they contain the correct properties.
+ * This check does not exist outside test/automated runtimes because the error is not useful
+ * for the user and doesn't break telemetry.
+ *
+ * These are metrics that fail validation and are emitted by code that is covered in test cases.
+ * This allowlist exists to fix these incrementally and not have CI fail in the meantime.
+ */
+const validationExemptMetrics: Set<string> = new Set([
+    'amazonq_runCommand',
+    'apigateway_copyUrl',
+    'aws_loadCredentials',
+    'aws_validateCredentials',
+    'cloudwatchlogs_download',
+    'codeTransform_isDoubleClickedToTriggerInvalidProject',
+    'codeTransform_jobIsCancelledByUser',
+    'codeTransform_jobStatusChanged',
+    'codeTransform_logApiError',
+    'codeTransform_logApiLatency',
+    'codewhisperer_codeScanIssueHover',
+    'codewhisperer_codePercentage',
+    'codewhisperer_userModification',
+    'codewhisperer_userTriggerDecision',
+    'codewhisperer_perceivedLatency', // flare doesn't currently set result property
+    'codewhisperer_serviceInvocation', // flare doesn't currently set result property
+    'dynamicresource_selectResources',
+    'dynamicresource_copyIdentifier',
+    'dynamicresource_mutateResource',
+    'dynamicresource_getResource',
+    'dynamicresource_listResource',
+    'ecr_copyRepositoryUri',
+    'ecr_copyTagUri',
+    'ecr_createRepository',
+    'ecr_deleteRepository',
+    'ecr_deleteTags',
+    'feedback_result',
+    'lambda_delete',
+    's3_uploadObject',
+    'sam_deploy',
+    'session_start',
+    'ssm_deleteDocument',
+    'ssm_openDocument',
+    'ssm_publishDocument',
+    'ssm_updateDocumentVersion',
+    'stepfunctions_previewstatemachine',
+    'ui_click',
+    'vscode_activeRegions',
+    'vscode_executeCommand',
+])
+
+export function isValidationExemptMetric(metricName: string) {
+    return validationExemptMetrics.has(metricName)
+}
diff --git a/packages/core/src/shared/telemetry/index.ts b/packages/core/src/shared/telemetry/index.ts
new file mode 100644
index 00000000000..a5cc92b4383
--- /dev/null
+++ b/packages/core/src/shared/telemetry/index.ts
@@ -0,0 +1,9 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export { activate } from './activation'
+export { telemetry, AuthStatus, Span } from './telemetry'
+export { ExtStartUpSources, getComputeEnvType } from './util'
+export * from './telemetry.gen'
diff --git a/packages/core/src/shared/telemetry/service-2.json b/packages/core/src/shared/telemetry/service-2.json
new file mode 100644
index 00000000000..a0ca9f7b14e
--- /dev/null
+++ b/packages/core/src/shared/telemetry/service-2.json
@@ -0,0 +1,262 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2017-07-25",
+    "endpointPrefix":"client-telemetry",
+    "jsonVersion":"1.1",
+    "protocol":"rest-json",
+    "serviceAbbreviation":"ToolkitTelemetry",
+    "serviceFullName":"A beautiful and amazing ToolkitTelemetry",
+    "serviceId":"ToolkitTelemetry",
+    "signatureVersion":"v4",
+    "signingName":"execute-api"
+  },
+  "operations":{
+    "PostErrorReport":{
+      "name":"PostErrorReport",
+      "http":{
+        "method":"POST",
+        "requestUri":"/errorReport"
+      },
+      "input":{"shape":"PostErrorReportRequest"}
+    },
+    "PostFeedback":{
+      "name":"PostFeedback",
+      "http":{
+        "method":"POST",
+        "requestUri":"/feedback"
+      },
+      "input":{"shape":"PostFeedbackRequest"}
+    },
+    "PostMetrics":{
+      "name":"PostMetrics",
+      "http":{
+        "method":"POST",
+        "requestUri":"/metrics"
+      },
+      "input":{"shape":"PostMetricsRequest"}
+    }
+  },
+  "shapes":{
+    "AWSProduct":{
+      "type":"string",
+      "enum":[
+        "canary",
+        "AWS Toolkit For JetBrains",
+        "AWS Toolkit For Eclipse",
+        "AWS Toolkit For VisualStudio",
+        "AWS Toolkit For VS Code",
+        "Amazon Q For JetBrains",
+        "Amazon Q For VS Code"
+      ]
+    },
+    "AWSProductVersion":{
+      "type":"string",
+      "pattern":"^[\\w+-.]{1,512}$"
+    },
+    "ClientID":{
+      "type":"string",
+      "pattern":"^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}$"
+    },
+    "SessionID":{
+      "type":"string",
+      "pattern":"^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}$"
+    },
+    "Command":{
+      "type":"string",
+      "max":2000
+    },
+    "Comment":{
+      "type":"string",
+      "max":2000
+    },
+    "ComputeEnv":{
+      "type":"string",
+      "enum":[
+        "cloud9",
+        "cloud9-codecatalyst",
+        "codecatalyst",
+        "ec2",
+        "local",
+        "sagemaker",
+        "ssh",
+        "test",
+        "web",
+        "wsl",
+        "unknown"
+      ]
+    },
+    "Datapoint":{
+      "type":"double",
+      "min":0
+    },
+    "Email":{
+      "type":"string",
+      "pattern":"^[a-zA-Z0-9.!#$%&amp;'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$"
+    },
+    "EpochTimestamp":{
+      "type":"long",
+      "min":0
+    },
+    "ErrorDetails":{
+      "type":"structure",
+      "required":[
+        "Command",
+        "EpochTimestamp",
+        "Type",
+        "StackTrace"
+      ],
+      "members":{
+        "Command":{"shape":"Command"},
+        "EpochTimestamp":{"shape":"EpochTimestamp"},
+        "Type":{"shape":"Type"},
+        "Message":{"shape":"Message"},
+        "StackTrace":{"shape":"StackTrace"}
+      }
+    },
+    "Key":{
+      "type":"string",
+      "pattern":"^\\w[\\w\\.]{0,149}$"
+    },
+    "Message":{
+      "type":"string",
+      "max":2048
+    },
+    "Metadata":{
+      "type":"list",
+      "member":{"shape":"MetadataEntry"}
+    },
+    "MetadataEntry":{
+      "type":"structure",
+      "members":{
+        "Key":{"shape":"Key"},
+        "Value":{"shape":"Value"}
+      }
+    },
+    "MetricData":{
+      "type":"list",
+      "member":{"shape":"MetricDatum"},
+      "max":20,
+      "min":1
+    },
+    "MetricDatum":{
+      "type":"structure",
+      "required":[
+        "MetricName",
+        "EpochTimestamp",
+        "Unit",
+        "Value"
+      ],
+      "members":{
+        "MetricName":{"shape":"MetricName"},
+        "EpochTimestamp":{"shape":"EpochTimestamp"},
+        "Unit":{"shape":"Unit"},
+        "Value":{"shape":"Datapoint"},
+        "Metadata":{"shape":"Metadata"},
+        "Passive":{"shape":"Passive"}
+      }
+    },
+    "MetricName":{
+      "type":"string",
+      "pattern":"^[\\w+-.:]{1,255}$"
+    },
+    "Passive":{"type":"boolean"},
+    "PostErrorReportRequest":{
+      "type":"structure",
+      "required":[
+        "AWSProduct",
+        "AWSProductVersion",
+        "ErrorDetails"
+      ],
+      "members":{
+        "AWSProduct":{"shape":"AWSProduct"},
+        "AWSProductVersion":{"shape":"AWSProductVersion"},
+        "Metadata":{"shape":"Metadata"},
+        "Userdata":{"shape":"Userdata"},
+        "ErrorDetails":{"shape":"ErrorDetails"}
+      }
+    },
+    "PostFeedbackRequest":{
+      "type":"structure",
+      "required":[
+        "AWSProduct",
+        "AWSProductVersion",
+        "ParentProduct",
+        "ParentProductVersion",
+        "Sentiment",
+        "Comment"
+      ],
+      "members":{
+        "AWSProduct":{"shape":"AWSProduct"},
+        "AWSProductVersion":{"shape":"AWSProductVersion"},
+        "OS":{"shape":"Value"},
+        "OSVersion":{"shape":"Value"},
+        "ComputeEnv": {"shape":"ComputeEnv"},
+        "ParentProduct":{"shape":"Value"},
+        "ParentProductVersion":{"shape":"Value"},
+        "Metadata":{"shape":"Metadata"},
+        "Sentiment":{"shape":"Sentiment"},
+        "Comment":{"shape":"Comment"}
+      }
+    },
+    "PostMetricsRequest":{
+      "type":"structure",
+      "required":[
+        "AWSProduct",
+        "AWSProductVersion",
+        "ClientID",
+        "MetricData",
+        "CredentialStartUrl"
+      ],
+      "members":{
+        "AWSProduct":{"shape":"AWSProduct"},
+        "AWSProductVersion":{"shape":"AWSProductVersion"},
+        "ClientID":{"shape":"ClientID"},
+        "SessionID":{"shape":"SessionID"},
+        "OS":{"shape":"Value"},
+        "OSVersion":{"shape":"Value"},
+        "ComputeEnv": {"shape":"ComputeEnv"},
+        "ParentProduct":{"shape":"Value"},
+        "ParentProductVersion":{"shape":"Value"},
+        "MetricData":{"shape":"MetricData"},
+        "CredentialStartUrl": {"shape":"Value"}
+      }
+    },
+    "Sentiment":{
+      "type":"string",
+      "enum":[
+        "Positive",
+        "Negative"
+      ]
+    },
+    "StackTrace":{
+      "type":"string",
+      "max":16384
+    },
+    "Type":{
+      "type":"string",
+      "max":1024
+    },
+    "Unit":{
+      "type":"string",
+      "enum":[
+        "Milliseconds",
+        "Bytes",
+        "Percent",
+        "Count",
+        "None"
+      ]
+    },
+    "Userdata":{
+      "type":"structure",
+      "members":{
+        "Email":{"shape":"Email"},
+        "Comment":{"shape":"Comment"}
+      }
+    },
+    "Value":{
+      "type":"string",
+      "max":65536
+    }
+  }
+}
diff --git a/packages/core/src/shared/telemetry/spans.ts b/packages/core/src/shared/telemetry/spans.ts
new file mode 100644
index 00000000000..4521a83a12a
--- /dev/null
+++ b/packages/core/src/shared/telemetry/spans.ts
@@ -0,0 +1,529 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../extensionGlobals'
+
+import type { AsyncLocalStorage as AsyncLocalStorageClass } from 'async_hooks'
+import {
+    definitions,
+    Metric,
+    MetricBase,
+    MetricDefinition,
+    MetricName,
+    MetricShapes,
+    Span,
+    TelemetryBase,
+} from './telemetry.gen'
+import {
+    getHttpStatusCode,
+    getRequestId,
+    getTelemetryReason,
+    getTelemetryReasonDesc,
+    getTelemetryResult,
+} from '../errors'
+import { entries, NumericKeys } from '../utilities/tsUtils'
+import { randomUUID } from '../crypto'
+
+const AsyncLocalStorage: typeof AsyncLocalStorageClass =
+    require('async_hooks').AsyncLocalStorage ??
+    class<T> {
+        readonly #store: T[] = []
+        #disabled = false
+
+        public disable() {
+            this.#disabled = true
+        }
+
+        public getStore() {
+            return this.#disabled ? undefined : this.#store[0]
+        }
+
+        public run<R>(store: T, callback: (...args: any[]) => R, ...args: any[]): R {
+            this.#disabled = false
+            this.#store.unshift(store)
+
+            try {
+                const result = callback(...args)
+                if (result instanceof Promise) {
+                    return result.finally(() => this.#store.shift()) as unknown as R
+                }
+                this.#store.shift()
+                return result
+            } catch (err) {
+                this.#store.shift()
+                throw err
+            }
+        }
+
+        public exit<R>(callback: (...args: any[]) => R, ...args: any[]): R {
+            const saved = this.#store.shift()
+
+            try {
+                const result = callback(...args)
+                if (result instanceof Promise) {
+                    return result.finally(() => saved !== undefined && this.#store.unshift(saved)) as unknown as R
+                }
+                saved !== undefined && this.#store.unshift(saved)
+                return result
+            } catch (err) {
+                saved !== undefined && this.#store.unshift(saved)
+                throw err
+            }
+        }
+
+        public enterWith(store: T): void {
+            // XXX: you need hooks into async resource lifecycles to implement this correctly
+            this.#store.shift()
+            this.#store.unshift(store)
+        }
+    }
+
+function getValidatedState(state: Partial<MetricBase>, definition: MetricDefinition) {
+    const missingFields: string[] = []
+
+    for (const key of definition.requiredMetadata) {
+        if (state[key as keyof typeof state] === undefined) {
+            missingFields.push(key)
+        }
+    }
+
+    return missingFields.length !== 0 ? Object.assign({ missingFields }, state) : state
+}
+
+/**
+ * Options used for the creation of a span
+ */
+export type SpanOptions = {
+    /** True if this span should emit its telemetry events. Defaults to true if undefined. */
+    emit?: boolean
+
+    /**
+     * Adds a function entry to the span stack.
+     *
+     * This allows you to eventually retrieve the function entry stack by using {@link TelemetryTracer.getFunctionStack()},
+     * which tells you the chain of function executions to bring you to that point in the code.
+     *
+     * Example:
+     * ```
+     * function a() {
+     *   telemetry.your_Metric.run(() => b(), { functionId: { name: 'a'} })
+     * }
+     *
+     * function b() {
+     *   telemetry.your_Metric.run(() => c(), { functionId: { name: 'b'} })
+     * }
+     *
+     * function c() {
+     *   telemetry.your_Metric.run(() => {
+     *     const stack = telemetry.getFunctionStack()
+     *     console.log(stack) // [ {source: 'a' }, { source: 'b' }, { source: 'c' }]
+     *   }, { functionId: { name: 'c'} })
+     * }
+     * ```
+     */
+    functionId?: FunctionEntry
+}
+
+/**
+ * A span represents a "unit of work" captured for logging/telemetry.
+ * It can contain other spans recursively, then it's called a "trace" or "flow".
+ * https://opentelemetry.io/docs/concepts/signals/traces/
+ *
+ * See also: docs/telemetry.md
+ */
+export class TelemetrySpan<T extends MetricBase = MetricBase> implements Span<T> {
+    #startTime?: Date
+    #options: SpanOptions
+
+    private readonly state: Partial<T> = {}
+    private readonly definition = definitions[this.name] ?? {
+        unit: 'None',
+        passive: true,
+        requiredMetadata: [],
+    }
+    private readonly metricId: string
+
+    /**
+     * These fields appear on the base metric instead of the 'metadata' and
+     * so they should be filtered out from the metadata.
+     */
+    static readonly #excludedFields = ['passive', 'value']
+
+    public constructor(
+        public readonly name: string,
+        options?: SpanOptions
+    ) {
+        // set defaults on undefined options
+        this.#options = {
+            // do emit by default
+            emit: options?.emit === undefined ? true : options.emit,
+            functionId: options?.functionId,
+        }
+
+        this.metricId = randomUUID()
+        // forced to cast to any since apparently even though <T extends MetricBase>, Partial<T> doesn't guarentee that metricId is available
+        this.record({ metricId: this.metricId } as any)
+    }
+
+    public get startTime(): Date | undefined {
+        return this.#startTime
+    }
+
+    public record(data: Partial<T>): this {
+        Object.assign(this.state, data)
+        return this
+    }
+
+    public getFunctionEntry(): Readonly<FunctionEntry> | undefined {
+        return this.#options.functionId
+    }
+
+    public emit(data?: Partial<T>): void {
+        const state = getValidatedState({ ...this.state, ...data }, this.definition)
+        const metadata = Object.entries(state)
+            .filter(([_, v]) => v !== '') // XXX: the telemetry service currently rejects empty strings :/
+            .filter(([k, v]) => v !== undefined && !TelemetrySpan.#excludedFields.includes(k))
+            .map(([k, v]) => ({ Key: k, Value: String(v) }))
+
+        globals.telemetry.record({
+            Metadata: metadata,
+            MetricName: this.name,
+            Value: state.value ?? 1,
+            Unit: this.definition.unit,
+            Passive: state.passive ?? this.definition.passive,
+            EpochTimestamp: (this.startTime ?? new globals.clock.Date()).getTime(),
+        })
+    }
+
+    /**
+     * Puts the span in a 'running' state.
+     */
+    public start(): this {
+        this.#startTime = new globals.clock.Date()
+        return this
+    }
+
+    /**
+     * Immediately emits the span, adding a duration/result/reason to the final output if applicable.
+     *
+     * This places the span in a 'stopped' state but does not mutate the information held by the span.
+     */
+    public stop(err?: unknown): void {
+        const duration = this.startTime !== undefined ? globals.clock.Date.now() - this.startTime.getTime() : undefined
+
+        if (this.#options.emit) {
+            this.emit({
+                duration,
+                result: getTelemetryResult(err),
+                reason: getTelemetryReason(err),
+                reasonDesc: getTelemetryReasonDesc(err),
+                ...(!this.state.requestId ? { requestId: getRequestId(err) } : {}),
+                ...(!this.state.httpStatusCode ? { httpStatusCode: getHttpStatusCode(err) } : {}),
+            } as Partial<T>)
+        }
+
+        this.#startTime = undefined
+    }
+
+    /**
+     * Adds the values provided in {@link data} to the current state.
+     *
+     * Any `undefined` values are ignored. If the current {@link state} is `undefined` then the value
+     * is initialized as 0 prior to adding {@link data}.
+     */
+    public increment(data: { [P in NumericKeys<T>]+?: number }): void {
+        for (const [k, v] of entries(data)) {
+            if (v !== undefined) {
+                ;(this.state as Record<typeof k, number>)[k] = ((this.state[k] as number) ?? 0) + v
+            }
+        }
+    }
+
+    getMetricId() {
+        return this.metricId
+    }
+
+    /**
+     * Creates a copy of the span with an uninitialized start time.
+     */
+    public clone(): TelemetrySpan {
+        return new TelemetrySpan(this.name).record(this.state)
+    }
+}
+
+type Attributes = Partial<MetricShapes[MetricName]>
+
+interface TelemetryContext {
+    readonly spans: TelemetrySpan[]
+    readonly attributes: Attributes
+}
+
+const rootSpanName = 'root'
+
+// This class is called 'Telemetry' but really it can be used for any kind of tracing
+// You would need to make `Span` a template type and reduce the interface to just create/start/stop
+export class TelemetryTracer extends TelemetryBase {
+    readonly #context = new AsyncLocalStorage<TelemetryContext>()
+
+    /**
+     * All spans present in the current execution context.
+     */
+    public get spans(): readonly TelemetrySpan[] {
+        return this.#context.getStore()?.spans ?? []
+    }
+
+    /**
+     * The most recently used span in the current execution context.
+     *
+     * Note that only {@link run} will change the active span. Recording information
+     * on existing spans has no effect on the active span.
+     */
+    public get activeSpan(): TelemetrySpan | undefined {
+        return this.#context.getStore()?.spans[0]
+    }
+
+    /**
+     * State that is applied to all new spans within the current or subsequent executions.
+     */
+    public get attributes(): Readonly<Attributes> | undefined {
+        return this._attributes
+    }
+
+    private get _attributes(): Attributes | undefined {
+        return this.#context.getStore()?.attributes
+    }
+
+    /**
+     * Records information on the current and future spans in the execution context.
+     *
+     * This is merged in with the current state present in each span, **overwriting**
+     * any existing values for a given key. New spans are initialized with {@link attributes}
+     * but that may be overridden on subsequent writes.
+     *
+     * Callers must already be within an execution context for this to have any effect.
+     */
+    public record(data: Attributes): void {
+        this.activeSpan?.record(data)
+
+        if (this._attributes) {
+            Object.assign(this._attributes, data)
+        }
+    }
+
+    /**
+     * Executes the provided callback function with a named span.
+     *
+     * All changes made to {@link attributes} (via {@link record}) during the execution are
+     * reverted after the execution completes.
+     *
+     * Runs can be nested within each other. This allows for creating hierarchical spans,
+     * where child spans inherit the context of their parent spans.
+     *
+     * This method automatically handles traceId generation and propagation:
+     * - If no traceId exists in the current context, a new one is generated.
+     * - The traceId is attached to all telemetry events created within this span.
+     * - Child spans created within this execution will inherit the same traceId.
+     * - Related concepts: https://opentelemetry.io/docs/concepts/signals/traces/
+     *
+     * See docs/telemetry.md
+     */
+    public run<T, U extends MetricName>(name: U, fn: (span: Span<MetricShapes[U]>) => T, options?: SpanOptions): T {
+        return this.withTraceId(() => {
+            const span = this.createSpan(name, options).start()
+            const frame = this.switchContext(span)
+
+            try {
+                const result = this.#context.run(frame, fn, span)
+
+                if (result instanceof Promise) {
+                    return result
+                        .then((v) => (span.stop(), v))
+                        .catch((e) => {
+                            span.stop(e)
+                            throw e
+                        }) as unknown as T
+                }
+
+                span.stop()
+                return result
+            } catch (e) {
+                span.stop(e)
+                throw e
+            }
+        }, this.attributes?.traceId ?? randomUUID())
+    }
+
+    /**
+     * **Use {@link run} for most scenarios. Only use this method when you have a specific, pre-existing trace ID that you need to instrument.**
+     *
+     * Associates a known trace ID with subsequent telemetry events in the provided callback,
+     * enabling correlation of events from multiple disjoint sources (e.g., webview, VSCode, partner team code).
+     *
+     * The difference between this and using telemetry.record({traceId: 'foo'}) directly is that this will create an active
+     * span if one doesn't already exist. If you already know you're operating in a span (like vscode_executeCommand) then use
+     * telemetry.record directly.
+     *
+     * Records traceId iff this metric is not already associated with a trace
+     */
+    withTraceId<T>(callback: () => T, traceId: string): T {
+        /**
+         * Generate a new traceId if one doesn't exist.
+         * This ensures the traceId is created before the span,
+         * allowing it to propagate to all child telemetry metrics.
+         */
+        if (!this.attributes?.traceId) {
+            return this.runRoot(() => {
+                this.record({ traceId })
+                return callback()
+            })
+        }
+        return callback()
+    }
+
+    /**
+     * **You should use {@link run} in the majority of cases. Only use this for instrumenting extension entrypoints.**
+     *
+     * Executes the given function within an anonymous 'root' span which does not emit
+     * any telemetry on its own.
+     *
+     * This can be used as a 'staging area' for adding attributes prior to creating spans.
+     */
+    public runRoot<T>(fn: () => T): T {
+        const span = this.createSpan(rootSpanName)
+        const frame = this.switchContext(span)
+
+        return this.#context.run(frame, fn)
+    }
+
+    /**
+     * Returns the stack of all {@link FunctionEntry}s with the 0th
+     * index being the top level call, and the last index being the final
+     * nested call.
+     *
+     * Ensure that there are uses of {@link TelemetryTracer.run()} with {@link SpanOptions.functionId}
+     * before this method is called, otherwise it will return no useful information.
+     *
+     * Use {@link asStringifiedStack} to create a stringified version of this stack.
+     */
+    public getFunctionStack(): FunctionEntry[] {
+        const stack: FunctionEntry[] = []
+        const endIndex = this.spans.length - 1
+        let i = endIndex
+        while (i >= 0) {
+            const span = this.spans[i]
+            const entry = span.getFunctionEntry()
+            if (entry) {
+                stack.push(entry)
+            }
+            i -= 1
+        }
+        return stack
+    }
+
+    /**
+     * Wraps a function with {@link run}.
+     *
+     * This can be used when immediate execution of the function is not desirable.
+     */
+    public instrument<T extends any[], U, R>(name: string, fn: (this: U, ...args: T) => R): (this: U, ...args: T) => R {
+        const run = this.run.bind(this)
+
+        return function (...args) {
+            // Typescript's `bind` overloading doesn't work well for parameter types
+            return run(name as MetricName, (fn as (this: U, ...args: any[]) => R).bind(this, ...args))
+        }
+    }
+
+    protected getMetric(name: string): Metric {
+        const getSpan = () => this.getSpan(name)
+
+        return {
+            name,
+            emit: (data) => getSpan().emit(data),
+            run: (fn, options?: SpanOptions) => this.run(name as MetricName, fn, options),
+        }
+    }
+
+    private getSpan(name: string): TelemetrySpan {
+        return this.spans.find((s) => s.name === name) ?? this.createSpan(name)
+    }
+
+    private createSpan(name: string, options?: SpanOptions): TelemetrySpan {
+        const span = new TelemetrySpan(name, options).record(this.attributes ?? {})
+        if (this.activeSpan && this.activeSpan.name !== rootSpanName) {
+            return span.record({ parentId: this.activeSpan.getMetricId() })
+        }
+
+        return span
+    }
+
+    private switchContext(span: TelemetrySpan): TelemetryContext {
+        const ctx = {
+            spans: [span, ...this.spans],
+            attributes: { ...this.attributes },
+        }
+
+        return ctx
+    }
+}
+
+/**
+ * A Function Entry is a single entry in to a stack of Function Entries.
+ *
+ * Think of a Function Entry as one entry in the stack trace of an Error.
+ * So a stack of Function Entries will allows you to build a path of functions.
+ * This can allow you to trace the path of executions.
+ *
+ * In MOST cases, a Function Entry will represent a method/function call, but it is not
+ * limited to that.
+ */
+export type FunctionEntry = {
+    /**
+     * An identifier that represents the callback. You'll probably want to use the function name.
+     */
+    readonly name: string
+
+    /**
+     * If the source is a method, you'll want to include the class name for better context.
+     */
+    readonly class?: string
+}
+
+/**
+ * Returns a stringified version of the provided {@link ExecutionContext.stack}.
+ *
+ * Eg: "TestClassA1#methodA,methodB:TestClassA2#methodX,methodY,thisIsAlsoZ:someFunction"
+ *
+ *   - '#' separates a class from its methods
+ *   - ',' separates methods of the same class
+ *   - ':' separates classes/functions
+ *   - The call stack goes in order from left to right
+ *   - The first item in the string is the top level, initial caller in the stack
+ *   - The last item is the final caller in the stack
+ *
+ * See tests for examples.
+ */
+export function asStringifiedStack(stack: FunctionEntry[]): string {
+    let prevEntry: FunctionEntry | undefined
+    let currString: string = ''
+
+    // Iterate over each entry, appending the source and class to the final output string
+    for (const currEntry of stack) {
+        const prevClass = prevEntry?.class
+        const newClass = currEntry.class
+
+        if (prevClass && prevClass === newClass) {
+            // The new class is same as the prev class, so we don't need to add the class since it already exists
+            currString = `${currString},${currEntry.name}`
+        } else {
+            // The new class may be different from the prev class, so start a new subsection, adding the new class if it exists.
+            currString = `${currString ? currString + ':' : ''}${newClass ? newClass + '#' : ''}${currEntry.name}`
+        }
+
+        prevEntry = currEntry
+    }
+
+    return currString
+}
diff --git a/packages/core/src/shared/telemetry/telemetry.ts b/packages/core/src/shared/telemetry/telemetry.ts
new file mode 100644
index 00000000000..47324c16582
--- /dev/null
+++ b/packages/core/src/shared/telemetry/telemetry.ts
@@ -0,0 +1,32 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { SpanOptions, TelemetryTracer } from './spans'
+import { NumericKeys } from '../utilities/tsUtils'
+
+// This file makes it so you can import 'telemetry' and not 'telemetry.gen'
+export * from './telemetry.gen'
+
+export function millisecondsSince(date: Date): number {
+    return Date.now() - date.getTime()
+}
+
+export const telemetry = new TelemetryTracer()
+
+/**
+ * The following are overrides or additions to the actual './telemetry.gen'
+ *
+ * This is not a permanent solution, but a temporary override.
+ * Look to add any permanent solutions to: https://github.com/aws/aws-toolkit-common/tree/main/telemetry/vscode
+ */
+declare module './telemetry.gen' {
+    interface Metric<T extends MetricBase = MetricBase> {
+        run<U>(fn: (span: Span<T>) => U, options?: SpanOptions): U
+    }
+
+    interface Span<T extends MetricBase = MetricBase> {
+        increment(data: { [P in NumericKeys<T>]+?: number }): void
+    }
+}
diff --git a/src/shared/telemetry/telemetryClient.ts b/packages/core/src/shared/telemetry/telemetryClient.ts
similarity index 79%
rename from src/shared/telemetry/telemetryClient.ts
rename to packages/core/src/shared/telemetry/telemetryClient.ts
index 88192e5bfbe..97ec2508cfc 100644
--- a/src/shared/telemetry/telemetryClient.ts
+++ b/packages/core/src/shared/telemetry/telemetryClient.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Toolkit-local logic for telemetry.
@@ -9,14 +9,15 @@ import { Credentials, Service } from 'aws-sdk'
 import * as os from 'os'
 import * as vscode from 'vscode'
 import { extensionVersion, isAutomation } from '../vscode/env'
-import { getLogger } from '../logger'
+import { getLogger } from '../logger/logger'
 import * as ClientTelemetry from './clienttelemetry'
-import { MetricDatum } from './clienttelemetry'
 import apiConfig = require('./service-2.json')
 import { ServiceConfigurationOptions } from 'aws-sdk/lib/service'
 import globals from '../extensionGlobals'
 import { DevSettings } from '../settings'
 import { ClassToInterfaceType } from '../utilities/tsUtils'
+import { getComputeEnvType, getSessionId } from './util'
+import { AuthUtil } from '../../codewhisperer/util/authUtil'
 
 export const accountMetadataKey = 'awsAccount'
 export const regionKey = 'awsRegion'
@@ -55,7 +56,20 @@ export type TelemetryClient = ClassToInterfaceType<DefaultTelemetryClient>
 export class DefaultTelemetryClient implements TelemetryClient {
     private static readonly defaultIdentityPool = 'us-east-1:820fd6d1-95c0-4ca4-bffb-3f01d32da842'
     private static readonly defaultTelemetryEndpoint = 'https://client-telemetry.us-east-1.amazonaws.com'
-    private static readonly productName = 'AWS Toolkit For VS Code'
+
+    static #productName: ClientTelemetry.AWSProduct
+
+    public static set productName(val: ClientTelemetry.AWSProduct) {
+        getLogger().info(`Telemetry product: ${val}`)
+        this.#productName = val
+    }
+
+    public static get productName() {
+        if (!this.#productName) {
+            throw new Error('DefaultTelemetryClient.productName is not initialized.')
+        }
+        return this.#productName
+    }
 
     private static initializeConfig(): TelemetryConfiguration {
         const settings = DevSettings.instance
@@ -70,13 +84,16 @@ export class DefaultTelemetryClient implements TelemetryClient {
 
     private readonly logger = getLogger()
 
-    private constructor(private readonly clientId: string, private readonly client: ClientTelemetry) {}
+    private constructor(
+        private readonly clientId: string,
+        private readonly client: ClientTelemetry
+    ) {}
 
     /**
      * Returns failed events
      * @param batch batch of events
      */
-    public async postMetrics(batch: MetricDatum[]): Promise<MetricDatum[] | undefined> {
+    public async postMetrics(batch: ClientTelemetry.MetricDatum[]): Promise<ClientTelemetry.MetricDatum[] | undefined> {
         try {
             // If our batching logic rejected all of the telemetry, don't try to post
             if (batch.length === 0) {
@@ -89,11 +106,14 @@ export class DefaultTelemetryClient implements TelemetryClient {
                         AWSProduct: DefaultTelemetryClient.productName,
                         AWSProductVersion: extensionVersion,
                         ClientID: this.clientId,
+                        SessionID: getSessionId(),
                         OS: os.platform(),
                         OSVersion: os.release(),
+                        ComputeEnv: await getComputeEnvType(),
                         ParentProduct: vscode.env.appName,
                         ParentProductVersion: vscode.version,
                         MetricData: batch,
+                        CredentialStartUrl: AuthUtil.instance.startUrl ?? 'Undefined',
                     })
                     .promise()
                 this.logger.info(`telemetry: sent batch (size=${batch.length})`)
@@ -117,12 +137,14 @@ export class DefaultTelemetryClient implements TelemetryClient {
                     AWSProductVersion: extensionVersion,
                     OS: os.platform(),
                     OSVersion: os.release(),
+                    ComputeEnv: await getComputeEnvType(),
                     ParentProduct: vscode.env.appName,
                     ParentProductVersion: vscode.version,
                     Comment: feedback.comment,
                     Sentiment: feedback.sentiment,
                 })
                 .promise()
+            this.logger.debug(`ComputeEnv detected for telemetry: ${await getComputeEnvType()}`)
             this.logger.info('Successfully posted feedback')
         } catch (err) {
             this.logger.error(`Failed to post feedback: ${err}`)
diff --git a/packages/core/src/shared/telemetry/telemetryLogger.ts b/packages/core/src/shared/telemetry/telemetryLogger.ts
new file mode 100644
index 00000000000..bab7b3cc371
--- /dev/null
+++ b/packages/core/src/shared/telemetry/telemetryLogger.ts
@@ -0,0 +1,128 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { getLogger } from '../logger/logger'
+import { DevSettings } from '../settings'
+import { isReleaseVersion } from '../vscode/env'
+import { MetricDatum, MetadataEntry } from './clienttelemetry'
+
+export interface MetricQuery {
+    /**
+     * Metric name to look up in the log
+     */
+    readonly metricName: string
+
+    /**
+     * Exclude metadata items matching these keys.
+     */
+    readonly excludeKeys?: string[]
+}
+
+/** Telemetry metadata in the form of a javscript Object. */
+export interface MetadataObj {
+    [key: string]: string | undefined
+}
+
+function isValidEntry(datum: MetadataEntry): datum is Required<MetadataEntry> {
+    return datum.Key !== undefined && datum.Value !== undefined
+}
+
+/**
+ * Takes a Telemetry metadata key-value pairs array:
+ * ```
+ *      [ {Key:'a',Value:…}, {Key:'b',Value:…}, … ]
+ * ```
+ * and produces an object:
+ * ```
+ *      {a:…, b:…}
+ * ```
+ */
+export const mapMetadata = (excludeKeys: string[]) => (metadata: Required<MetricDatum>['Metadata']) => {
+    const result: MetadataObj = {}
+    return metadata
+        .filter(isValidEntry)
+        .filter((a) => !excludeKeys.includes(a.Key))
+        .reduce((a, b) => ((a[b.Key] = b.Value), a), result)
+}
+
+/** Transforms a metric for human readability in logs, etc. */
+function scrubMetric(metric: MetricDatum): any {
+    const metaMap = mapMetadata(['MetricName'])(metric.Metadata ?? [])
+    metaMap.awsAccount = metaMap.awsAccount && metaMap.awsAccount.length > 10 ? '[omitted]' : metaMap.awsAccount
+    const metricCopy = { ...metric, Metadata: metaMap } as any
+    delete metricCopy.MetricName // Redundant.
+    delete metricCopy.EpochTimestamp // Not interesting.
+    return metricCopy
+}
+
+/**
+ * Simple class to log queryable metrics.
+ *
+ * Does not track any other telemetry APIs such as feedback.
+ */
+export class TelemetryLogger {
+    private readonly _metrics: MetricDatum[] = []
+    private readonly isDevMode: boolean
+
+    public constructor() {
+        const devSettings = DevSettings.instance
+        this.isDevMode = devSettings.isDevMode()
+    }
+
+    public get metricCount(): number {
+        return this._metrics.length
+    }
+
+    public clear(): void {
+        this._metrics.length = 0
+    }
+
+    public log(metric: MetricDatum): void {
+        const msg = `telemetry: ${metric.MetricName}`
+
+        if (this.isDevMode || !isReleaseVersion()) {
+            this._metrics.push(metric)
+            if (getLogger().logLevelEnabled('debug')) {
+                const metricCopy = scrubMetric(metric)
+                getLogger().debug(`${msg} %O`, metricCopy)
+            } else {
+                getLogger().verbose(msg)
+            }
+
+            if (this.metricCount > 1000) {
+                this.clear()
+                getLogger().verbose('telemetry: cleared buffered metrics')
+            }
+        } else {
+            getLogger().verbose(msg)
+        }
+    }
+
+    /**
+     * Queries against the log, returning matched entries.
+     * Only returns the metadata. See {@link queryFull} for getting the entire metric.
+     *
+     * **All metadata values are casted to strings by the telemetry client**
+     */
+    public query(query: MetricQuery): MetadataObj[] {
+        return this.queryFull(query)
+            .map((m) => m.Metadata ?? [])
+            .map(mapMetadata(query.excludeKeys ?? []))
+    }
+
+    /**
+     * Queries telemetry for metrics, returning the entire structure.
+     */
+    public queryFull(query: MetricQuery): MetricDatum[] {
+        return this._metrics.filter((m) => m.MetricName === query.metricName)
+    }
+
+    /**
+     * Queries telemetry for metrics with metadata key or value matching the given regex.
+     */
+    public queryRegex(re: RegExp | string): MetricDatum[] {
+        return this._metrics.filter((m) => m.Metadata?.some((md) => md.Value?.match(re) || md.Key?.match(re)))
+    }
+}
diff --git a/src/shared/telemetry/telemetryPublisher.ts b/packages/core/src/shared/telemetry/telemetryPublisher.ts
similarity index 98%
rename from src/shared/telemetry/telemetryPublisher.ts
rename to packages/core/src/shared/telemetry/telemetryPublisher.ts
index 525a3101272..b3107a21e6c 100644
--- a/src/shared/telemetry/telemetryPublisher.ts
+++ b/packages/core/src/shared/telemetry/telemetryPublisher.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/packages/core/src/shared/telemetry/telemetryService.ts b/packages/core/src/shared/telemetry/telemetryService.ts
new file mode 100644
index 00000000000..6c82f23bda2
--- /dev/null
+++ b/packages/core/src/shared/telemetry/telemetryService.ts
@@ -0,0 +1,491 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as path from 'path'
+import { ExtensionContext } from 'vscode'
+import { AwsContext } from '../awsContext'
+import { isReleaseVersion, isAutomation } from '../vscode/env'
+import { getLogger } from '../logger/logger'
+import { MetricDatum } from './clienttelemetry'
+import { DefaultTelemetryClient, regionKey } from './telemetryClient'
+import { DefaultTelemetryPublisher } from './telemetryPublisher'
+import { TelemetryFeedback } from './telemetryClient'
+import { TelemetryPublisher } from './telemetryPublisher'
+import { accountMetadataKey, AccountStatus, computeRegionKey } from './telemetryClient'
+import { MetadataObj, TelemetryLogger, mapMetadata } from './telemetryLogger'
+import globals from '../extensionGlobals'
+import { ClassToInterfaceType } from '../utilities/tsUtils'
+import { getClientId, validateMetricEvent } from './util'
+import { telemetry, MetricBase } from './telemetry'
+import fs from '../fs/fs'
+import fsNode from 'fs/promises'
+import * as collectionUtil from '../utilities/collectionUtils'
+import { ExtensionUse } from '../../auth/utils'
+
+export type TelemetryService = ClassToInterfaceType<DefaultTelemetryService>
+
+// This has obvious overlap with telemetryLogger.ts.
+// But that searches for fields by name rather than value.
+// TODO: unify these interfaces.
+export interface MetricQuery {
+    /** Metric name to match against pending items. */
+    readonly name: string
+
+    /** Metric data (names and values). */
+    readonly metadata: MetadataObj
+
+    /** Exclude metadata items matching these keys. */
+    readonly equalityKey?: string[]
+}
+
+export class DefaultTelemetryService {
+    public static readonly telemetryCognitoIdKey = 'telemetryId'
+    public static readonly defaultFlushPeriodMillis = 1000 * 60 * 5 // 5 minutes in milliseconds
+
+    public startTime: Date
+    public readonly persistFilePath: string
+    private _telemetryEnabled: boolean = false
+
+    private _flushPeriod: number
+    private _timer?: NodeJS.Timer
+    private publisher?: TelemetryPublisher
+    private readonly _eventQueue: MetricDatum[]
+    private readonly _telemetryLogger = new TelemetryLogger()
+    /**
+     * Last metric (if any) loaded from cached telemetry from a previous
+     * session.
+     *
+     * We cannot infer this from "session_start" because there can in theory be
+     * multiple "session_start" metrics cached from multiple sessions.
+     */
+    private _endOfCache: MetricDatum | undefined
+
+    /**
+     * Use {@link create}() to create an instance of this class.
+     */
+    protected constructor(
+        private readonly awsContext: AwsContext,
+        private readonly computeRegion?: string,
+        publisher?: TelemetryPublisher
+    ) {
+        this.persistFilePath = path.join(globals.context.globalStorageUri.fsPath, 'telemetryCache')
+
+        this.startTime = new globals.clock.Date()
+
+        this._eventQueue = []
+        this._flushPeriod = DefaultTelemetryService.defaultFlushPeriodMillis
+
+        if (publisher !== undefined) {
+            this.publisher = publisher
+        }
+    }
+
+    /**
+     * This exists since we need to first ensure the global storage
+     * path exists before creating the instance.
+     */
+    static async create(awsContext: AwsContext, computeRegion?: string, publisher?: TelemetryPublisher) {
+        await DefaultTelemetryService.ensureGlobalStorageExists(globals.context)
+        return new DefaultTelemetryService(awsContext, computeRegion, publisher)
+    }
+
+    public get logger(): TelemetryLogger {
+        return this._telemetryLogger
+    }
+
+    public async start(): Promise<void> {
+        // TODO: `readEventsFromCache` should be async
+        this._eventQueue.push(...(await DefaultTelemetryService.readEventsFromCache(this.persistFilePath)))
+        this._endOfCache = this._eventQueue[this._eventQueue.length - 1]
+        telemetry.session_start.emit({
+            source: ExtensionUse.instance.sourceForTelemetry(),
+        })
+        this.startFlushInterval()
+    }
+
+    public async shutdown(): Promise<void> {
+        this.clearTimer()
+
+        // Only write events to disk at shutdown time if:
+        //   1. telemetry is enabled
+        //   2. we are not in CI or a test suite run
+        if (this.telemetryEnabled && !isAutomation()) {
+            const currTime = new globals.clock.Date()
+            // This is noisy when running tests in vscode.
+            telemetry.session_end.emit({
+                result: 'Succeeded',
+                duration: currTime.getTime() - this.startTime.getTime(),
+            })
+
+            try {
+                /**
+                 * This function runs in deactivate() so we must use node fs. See the vscode behavior doc for more info.
+                 */
+                await fsNode.writeFile(this.persistFilePath, JSON.stringify(this._eventQueue))
+            } catch {}
+        }
+    }
+
+    public get telemetryEnabled(): boolean {
+        return this._telemetryEnabled
+    }
+    public async setTelemetryEnabled(value: boolean) {
+        if (this._telemetryEnabled !== value) {
+            this._telemetryEnabled = value
+
+            // send all the gathered data that the user was opted-in for, prior to disabling
+            if (!value) {
+                await this._flushRecords()
+            }
+        }
+        getLogger().verbose(`Telemetry is ${value ? 'enabled' : 'disabled'}`)
+    }
+
+    private _clientId: string | undefined
+    /** Returns the client ID, creating one if it does not exist. */
+    public get clientId(): string {
+        return (this._clientId ??= getClientId(globals.globalState))
+    }
+
+    public get timer(): NodeJS.Timer | undefined {
+        return this._timer
+    }
+
+    public set flushPeriod(period: number) {
+        this._flushPeriod = period
+    }
+
+    public async postFeedback(feedback: TelemetryFeedback): Promise<void> {
+        if (this.publisher === undefined) {
+            await this.createDefaultPublisherAndClient()
+        }
+
+        if (this.publisher === undefined) {
+            throw new Error('Failed to initialize telemetry publisher')
+        }
+
+        return this.publisher.postFeedback(feedback)
+    }
+
+    public record(event: MetricDatum, awsContext?: AwsContext): void {
+        if (this.telemetryEnabled) {
+            // TODO: While this catches cases in code that is tested, untested code will still release incomplete metrics.
+            // Consider using custom lint rules to address these cases if possible.
+            validateMetricEvent(event, isAutomation())
+
+            const actualAwsContext = awsContext || this.awsContext
+            const eventWithCommonMetadata = this.injectCommonMetadata(event, actualAwsContext)
+            this._eventQueue.push(eventWithCommonMetadata)
+            this._telemetryLogger.log(eventWithCommonMetadata)
+        }
+    }
+
+    public clearRecords(): void {
+        this._eventQueue.length = 0
+    }
+
+    /**
+     * This ensures the folder, where we will store things like telemetry cache, exists.
+     *
+     * VSCode provides the URI of the folder, but it is not guaranteed to exist.
+     */
+    private static async ensureGlobalStorageExists(context: ExtensionContext): Promise<void> {
+        if (!fs.existsFile(context.globalStorageUri)) {
+            await fs.mkdir(context.globalStorageUri)
+        }
+    }
+
+    /**
+     * Publish metrics to the Telemetry Service. Usually it will automatically flush recent events
+     * on a regular interval. This should not be used unless you are interrupting this interval,
+     * e.g. via a forced window reload.
+     */
+    public async flushRecords(): Promise<void> {
+        if (this.telemetryEnabled) {
+            await this._flushRecords()
+        }
+    }
+
+    /**
+     * @warning DO NOT USE DIRECTLY, use `flushRecords()` instead.
+     */
+    private async _flushRecords(): Promise<void> {
+        if (this.publisher === undefined) {
+            await this.createDefaultPublisherAndClient()
+        }
+        if (this.publisher !== undefined) {
+            this.publisher.enqueue(...this._eventQueue)
+            await this.publisher.flush()
+            this.clearRecords()
+        }
+    }
+
+    /** Flushes the telemetry records every `_flushPeriod` milliseconds. */
+    private startFlushInterval(): void {
+        this.clearTimer()
+        this._timer = globals.clock.setTimeout(async () => {
+            await this.flushRecords()
+            // Resets timer after the flush as completed
+            this.startFlushInterval()
+        }, this._flushPeriod)
+    }
+
+    /** Clears the timer used to flush the telemetry records. */
+    private clearTimer(): void {
+        if (this._timer !== undefined) {
+            globals.clock.clearTimeout(this._timer)
+            this._timer = undefined
+        }
+    }
+
+    private async createDefaultPublisher(): Promise<TelemetryPublisher | undefined> {
+        try {
+            // grab our Cognito identityId
+            const poolId = DefaultTelemetryClient.config.identityPool
+            const identityMapJson = globals.globalState.tryGet(
+                DefaultTelemetryService.telemetryCognitoIdKey,
+                String,
+                '[]'
+            )
+            // Maps don't cleanly de/serialize with JSON.parse/stringify so we need to do it ourselves
+            const identityMap = new Map<string, string>(JSON.parse(identityMapJson) as Iterable<[string, string]>)
+            // convert the value to a map
+            const identity = identityMap.get(poolId)
+
+            // if we don't have an identity, get one
+            if (!identity) {
+                const identityPublisherTuple = await DefaultTelemetryPublisher.fromDefaultIdentityPool(this.clientId)
+
+                // save it
+                identityMap.set(poolId, identityPublisherTuple.cognitoIdentityId)
+                await globals.globalState.update(
+                    DefaultTelemetryService.telemetryCognitoIdKey,
+                    JSON.stringify(Array.from(identityMap.entries()))
+                )
+
+                // return the publisher
+                return identityPublisherTuple.publisher
+            } else {
+                return DefaultTelemetryPublisher.fromIdentityId(this.clientId, identity)
+            }
+        } catch (err) {
+            getLogger().error(`Got ${err} while initializing telemetry publisher`)
+        }
+    }
+
+    private async createDefaultPublisherAndClient(): Promise<void> {
+        this.publisher = await this.createDefaultPublisher()
+        if (this.publisher !== undefined) {
+            await this.publisher.init()
+        }
+    }
+
+    private injectCommonMetadata(event: MetricDatum, awsContext: AwsContext): MetricDatum {
+        let accountValue: string | AccountStatus
+        // The AWS account ID is not set on session start. This matches JetBrains' functionality.
+        if (event.MetricName === 'session_end' || event.MetricName === 'session_start') {
+            accountValue = AccountStatus.NotApplicable
+        } else {
+            const account = awsContext.getCredentialAccountId()
+            if (account) {
+                const accountIdRegex = /[0-9]{12}/
+                if (accountIdRegex.test(account)) {
+                    // account is valid
+                    accountValue = account
+                } else {
+                    // account is not valid, we can use any non-12-digit string as our stored value to trigger this.
+                    // JetBrains uses this value if you're running a sam local invoke with an invalid profile.
+                    // no direct calls to production AWS should ever have this value.
+                    accountValue = AccountStatus.Invalid
+                }
+            } else {
+                // user isn't logged in
+                accountValue = AccountStatus.NotSet
+            }
+        }
+
+        const commonMetadata = [{ Key: accountMetadataKey, Value: accountValue }]
+        if (this.computeRegion) {
+            commonMetadata.push({ Key: computeRegionKey, Value: this.computeRegion })
+        }
+        if (!event?.Metadata?.some((m: any) => m?.Key === regionKey)) {
+            const guessedRegion = globals.regionProvider.guessDefaultRegion()
+            commonMetadata.push({ Key: regionKey, Value: guessedRegion ?? AccountStatus.NotSet })
+        }
+
+        if (event.Metadata) {
+            event.Metadata.push(...commonMetadata)
+        } else {
+            event.Metadata = commonMetadata
+        }
+
+        return event
+    }
+
+    private static async readEventsFromCache(cachePath: string): Promise<MetricDatum[]> {
+        try {
+            if ((await fs.existsFile(cachePath)) === false) {
+                getLogger().debug('telemetry cache not found, skipping')
+
+                return []
+            }
+            const input = JSON.parse(await fs.readFileText(cachePath))
+            const events = filterTelemetryCacheEvents(input)
+
+            return events
+        } catch (error) {
+            getLogger().error(error as Error)
+
+            return []
+        }
+    }
+
+    /**
+     * Only passive telemetry is allowed during startup (except for some known
+     * special-cases).
+     */
+    public assertPassiveTelemetry(didReload: boolean) {
+        // Special case: these may be non-passive during a VSCode "reload". #1592
+        const maybeActiveOnReload = ['sam_init']
+        // Metrics from the previous session can be arbitrary: we can't reason
+        // about whether they should be passive/active.
+        let readingCache = true
+
+        // Array for..of is in-order:
+        // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/forEach
+        for (const metric of this._eventQueue) {
+            if (readingCache) {
+                readingCache = metric !== this._endOfCache
+                // Skip cached metrics.
+                continue
+            }
+            if (metric.Passive || (didReload && maybeActiveOnReload.includes(metric.MetricName))) {
+                continue
+            }
+            const msg = `non-passive metric emitted at startup: ${metric.MetricName}`
+            if (isReleaseVersion()) {
+                getLogger().error(msg)
+            } else {
+                throw Error(msg)
+            }
+        }
+    }
+
+    /**
+     * Queries current pending (not flushed) metrics.
+     *
+     * @note The underlying metrics queue may be updated or flushed at any time while this iterates.
+     */
+    public async *findIter(predicate: (m: MetricDatum) => boolean): AsyncIterable<MetricDatum> {
+        for (const m of this._eventQueue) {
+            if (predicate(m)) {
+                yield m
+            }
+        }
+    }
+
+    /**
+     * Decides if two metrics are equal, by comparing:
+     * - `MetricDatum.MetricName`
+     * - `MetricDatum.Metadata` fields specified by `equalityKey`
+     *
+     * Note: these `MetricDatum` fields are NOT compared:
+     * - EpochTimestamp
+     * - Unit
+     * - Value
+     * - Passive
+     *
+     * @param metric1 Metric query (name, data, and equalityKey)
+     * @param metric2 Metric
+     *
+     */
+    public isMetricEqual(metric1: MetricQuery, metric2: MetricDatum): boolean {
+        if (metric1.name !== metric2.MetricName) {
+            return false
+        }
+        const equalityKey = metric1.equalityKey ?? metric2.Metadata?.map((o) => o.Value ?? '').filter((o) => !!o) ?? []
+        for (const k of equalityKey) {
+            // XXX: wrap with String() because findPendingMetric() may cast `MetricBase` to `MetadataObj`.
+            // TODO: fix this (use proper types instead of this hack).
+            const val1 = String(metric1.metadata[k])
+            // const val1 = metric1.Metadata?.find((o) => o.Key === k)?.Value
+            const val2 = metric2.Metadata?.find((o) => o.Key === k)?.Value
+            if (val1 !== val2) {
+                return false
+            }
+        }
+        return true
+    }
+
+    /**
+     * Searches current pending (not flushed) metrics for the first item "equal to" `metric`.
+     *
+     * @note The underlying metrics queue may be updated or flushed at any time while this iterates.
+     *
+     * @param name Metric name (ignored if `metric` is `MetricDatum`; required if `metric` is `MetricBase`)
+     * @param metric Metric or metadata
+     * @param equalityKey Fields that determine "equality".
+     *
+     */
+    public async findPendingMetric(
+        name: string,
+        metric: MetricDatum | MetricBase,
+        equalityKey: string[]
+    ): Promise<MetricDatum | undefined> {
+        const metric_ = metric as MetricDatum
+        const isData = !metric_.MetricName
+        const data = isData ? (metric as MetadataObj) : mapMetadata([])(metric_.Metadata ?? [])
+        name = isData ? name : metric_.MetricName
+        const query: MetricQuery = {
+            name: name,
+            metadata: data,
+            equalityKey: equalityKey,
+        }
+        const found = await collectionUtil.first(this.findIter((m) => this.isMetricEqual(query, m)))
+        return found
+    }
+}
+
+export function filterTelemetryCacheEvents(input: any): MetricDatum[] {
+    if (!Array.isArray(input)) {
+        getLogger().error(`Input into filterTelemetryCacheEvents:\n${input}\nis not an array!`)
+
+        return []
+    }
+    const arr = input as any[]
+
+    return arr
+        .filter((item: any) => {
+            // Make sure the item is an object
+            if (item !== Object(item)) {
+                getLogger().error(`Item in telemetry cache:\n${item}\nis not an object! skipping!`)
+
+                return false
+            }
+
+            return true
+        })
+        .filter((item: any) => {
+            // Only accept objects that have the required telemetry data
+            if (
+                !Object.prototype.hasOwnProperty.call(item, 'Value') ||
+                !Object.prototype.hasOwnProperty.call(item, 'MetricName') ||
+                !Object.prototype.hasOwnProperty.call(item, 'EpochTimestamp') ||
+                !Object.prototype.hasOwnProperty.call(item, 'Unit')
+            ) {
+                getLogger().warn(`skipping invalid item in telemetry cache: %O\n`, item)
+
+                return false
+            }
+
+            if ((item as any)?.Metadata?.some((m: any) => m?.Value === undefined || m.Value === '')) {
+                getLogger().warn(`telemetry: skipping cached item with null/empty metadata field:\n${item}`)
+
+                return false
+            }
+
+            return true
+        })
+}
diff --git a/packages/core/src/shared/telemetry/util.ts b/packages/core/src/shared/telemetry/util.ts
new file mode 100644
index 00000000000..e6c7254e878
--- /dev/null
+++ b/packages/core/src/shared/telemetry/util.ts
@@ -0,0 +1,500 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { env, version } from 'vscode'
+import * as os from 'os'
+import { getLogger } from '../logger/logger'
+import { fromExtensionManifest, Settings } from '../settings'
+import { memoize, once, oncePerUniqueArg } from '../utilities/functionUtils'
+import {
+    isInDevEnv,
+    extensionVersion,
+    isAutomation,
+    isRemoteWorkspace,
+    isCloudDesktop,
+    isAmazonLinux2,
+} from '../vscode/env'
+import { addTypeName } from '../utilities/typeConstructors'
+import globals, { isWeb } from '../extensionGlobals'
+import { mapMetadata, MetadataObj } from './telemetryLogger'
+import { Result } from './telemetry.gen'
+import { MetricDatum } from './clienttelemetry'
+import { isValidationExemptMetric } from './exemptMetrics'
+import { isAmazonQ, isCloud9, isSageMaker } from '../../shared/extensionUtilities'
+import { isUuid, randomUUID } from '../crypto'
+import { ClassToInterfaceType } from '../utilities/tsUtils'
+import { asStringifiedStack, FunctionEntry } from './spans'
+import { telemetry } from './telemetry'
+import { v5 as uuidV5 } from 'uuid'
+import { ToolkitError } from '../errors'
+import { GlobalState } from '../globalState'
+
+const legacySettingsTelemetryValueDisable = 'Disable'
+const legacySettingsTelemetryValueEnable = 'Enable'
+
+const TelemetryFlag = addTypeName('boolean', convertLegacy)
+export const telemetryClientIdEnvKey = '__TELEMETRY_CLIENT_ID'
+
+export class TelemetryConfig {
+    private readonly _toolkitConfig
+    private readonly _amazonQConfig
+
+    public get toolkitConfig() {
+        return this._toolkitConfig
+    }
+
+    public get amazonQConfig() {
+        return this._amazonQConfig
+    }
+
+    constructor(settings?: ClassToInterfaceType<Settings>) {
+        class ToolkitConfig extends fromExtensionManifest('aws', {
+            telemetry: TelemetryFlag,
+        }) {}
+
+        class AmazonQConfig extends fromExtensionManifest('amazonQ', {
+            telemetry: TelemetryFlag,
+        }) {}
+
+        this._toolkitConfig = new ToolkitConfig(settings)
+        this._amazonQConfig = new AmazonQConfig(settings)
+    }
+
+    public isEnabled(): boolean {
+        return (isAmazonQ() ? this.amazonQConfig : this.toolkitConfig).get(`telemetry`, true)
+    }
+}
+
+export function convertLegacy(value: unknown): boolean {
+    if (typeof value === 'boolean') {
+        return value
+    }
+
+    // Set telemetry value to boolean if the current value matches the legacy value
+    if (value === legacySettingsTelemetryValueDisable) {
+        return false
+    } else if (value === legacySettingsTelemetryValueEnable) {
+        return true
+    } else {
+        throw new TypeError(`Unknown telemetry setting: ${value}`)
+    }
+}
+
+/**
+ * Returns an identifier that uniquely identifies a single application
+ * instance/window of a specific IDE. I.e if I have multiple VS Code
+ * windows open each one will have a unique session ID. This session ID
+ * can be used in conjunction with the client ID to differntiate between
+ * different VS Code windows on a users machine.
+ *
+ * See spec: https://quip-amazon.com/9gqrAqwO5FCE
+ */
+export const getSessionId = once(() => SessionId.getSessionId())
+
+/** IMPORTANT: Use {@link getSessionId()} only. This is exported just for testing. */
+export class SessionId {
+    public static getSessionId(): string {
+        // This implementation does not work in web
+        if (!isWeb()) {
+            return this._getSessionId()
+        }
+        // A best effort at a sessionId just for web mode
+        return this._getVscSessionId()
+    }
+
+    /**
+     * This implementation assumes that the `globalThis` is shared between extensions in the same
+     * Extension Host, so we can share a global variable that way.
+     *
+     * This does not seem to work on web mode since the `globalThis` is not shared due to WebWorker design
+     */
+    private static _getSessionId() {
+        const g = globalThis as any
+        if (g.amzn_sessionId === undefined || !isUuid(g.amzn_sessionId)) {
+            g.amzn_sessionId = randomUUID()
+        }
+        return g.amzn_sessionId
+    }
+
+    /**
+     * `vscode.env.sessionId` looks close to a UUID by does not exactly match it (has additional characters).
+     * As a result we process it through uuidV5 which creates a proper UUID from it.
+     * uuidV5 is idempotent, so as long as `vscode.env.sessionId` returns the same value,
+     * we will get the same UUID.
+     *
+     * We were initially using this implementation for all session ids, but it has some caveats:
+     * - If the extension host crashes, sesionId stays the same since the parent VSC process defines it and that does not crash.
+     *   We wanted it to generate a new sessionId on ext host crash.
+     * - This value may not be reliable, see the following sessionId in telemetry, it contains many events
+     *   all from different client ids: `sessionId: cabea8e7-a8a1-5e51-a60e-07218f4a5937`
+     */
+    private static _getVscSessionId() {
+        return uuidV5(vscode.env.sessionId, this.sessionIdNonce)
+    }
+    /**
+     * This is an arbitrary nonce that is used in creating a v5 UUID for Session ID. We only
+     * have this since the spec requires it.
+     * - This should ONLY be used by {@link getSessionId}.
+     * - This value MUST NOT change during runtime, otherwise {@link getSessionId} will lose its
+     *   idempotency. But, if there was a reason to change the value in a PR, it would not be an issue.
+     */
+    private static readonly sessionIdNonce = '44cfdb20-b30b-4585-a66c-9f48f24f99b5'
+}
+
+/**
+ * Calculates the clientId for the current profile. This calculation is performed once
+ * on first call and the result is stored for the remainder of the session.
+ *
+ * Web mode will always compute to whatever is stored in global state or vscode.machineId.
+ * For normal use, the clientId is fetched from the first providing source:
+ * 1. clientId stored in process.env
+ * 2. clientId stored in current extension's global state.
+ * 3. a random UUID
+ *
+ * The clientId in the current extension's global state AND the clientId stored in process.env
+ * is updated to the result of above to allow other extensions to converge to the same clientId.
+ */
+export const getClientId = memoize(
+    /**
+     * @param nonce Dummy parameter to allow tests to defeat memoize().
+     */
+    (
+        globalState: typeof globals.globalState,
+        isTelemetryEnabled = new TelemetryConfig().isEnabled(),
+        isTest?: false,
+        nonce?: string
+    ) => {
+        if (isTest ?? isAutomation()) {
+            return 'ffffffff-ffff-ffff-ffff-ffffffffffff'
+        }
+        if (!isTelemetryEnabled) {
+            return '11111111-1111-1111-1111-111111111111'
+        }
+        try {
+            const globalClientId = process.env[telemetryClientIdEnvKey] // truly global across all extensions
+            const localClientId = globalState.tryGet('telemetryClientId', String) // local to extension, despite accessing "global" state
+            let clientId: string
+
+            _hadClientIdOnStartup = !!globalClientId || !!localClientId
+
+            if (isWeb()) {
+                const machineId = vscode.env.machineId
+                clientId = localClientId ?? machineId
+                getLogger().debug(
+                    'getClientId: web mode determined clientId: %s, stored clientId was: %s, vscode.machineId was: %s',
+                    clientId,
+                    localClientId,
+                    machineId
+                )
+            } else {
+                clientId = globalClientId ?? localClientId ?? randomUUID()
+                getLogger().debug(
+                    'getClientId: determined clientId as: %s, process.env clientId was: %s, stored clientId was: %s',
+                    clientId,
+                    globalClientId,
+                    localClientId
+                )
+                if (!globalClientId) {
+                    getLogger().debug(`getClientId: setting clientId in process.env to: %s`, clientId)
+                    process.env[telemetryClientIdEnvKey] = clientId
+                }
+            }
+
+            globalState.tryUpdate('telemetryClientId', clientId)
+            return clientId
+        } catch (e) {
+            getLogger().error('getClientId: failed to create client id: %O', e)
+            const clientId = '00000000-0000-0000-0000-000000000000'
+            return clientId
+        }
+    }
+)
+
+let _hadClientIdOnStartup = false
+/**
+ * Returns true if the ClientID existed before this session started
+ */
+export const hadClientIdOnStartup = (
+    globalState: GlobalState,
+    update = (globalState: GlobalState) => {
+        getClientId(globalState)
+    }
+) => {
+    // triggers the flow that will update the state, if not done already
+    update(globalState)
+
+    return _hadClientIdOnStartup
+}
+
+export const platformPair = () => `${env.appName.replace(/\s/g, '-')}/${version}`
+
+/**
+ * Returns a string that should be used as the extension's user agent.
+ *
+ * Omits the platform and `ClientId` pairs by default.
+ */
+export function getUserAgent(
+    opt?: { includePlatform?: boolean; includeClientId?: boolean },
+    globalState = globals.globalState
+): string {
+    const pairs = isAmazonQ()
+        ? [`AmazonQ-For-VSCode/${extensionVersion}`]
+        : [`AWS-Toolkit-For-VSCode/${extensionVersion}`]
+
+    if (opt?.includePlatform) {
+        pairs.push(platformPair())
+    }
+
+    if (opt?.includeClientId) {
+        const clientId = getClientId(globalState)
+        pairs.push(`ClientId/${clientId}`)
+    }
+
+    return pairs.join(' ')
+}
+
+/**
+ * Kinds of machines/environments the extension can run in.
+ *
+ * NOTES:
+ * - Append `-amzn` for any environment internal to Amazon.
+ * - Append `-web` for web browser (*without* compute).
+ */
+export type EnvType =
+    | 'cloud9'
+    | 'cloud9-web'
+    | 'cloudDesktop-amzn'
+    | 'codecatalyst'
+    | 'ec2'
+    | 'ec2-amzn' // ec2 but with an internal Amazon OS
+    | 'local'
+    | 'sagemaker'
+    | 'sagemaker-web'
+    | 'test'
+    | 'remote' // Generic (unknown) remote env.
+    | 'web' // Generic (unknown) web env.
+    | 'wsl'
+
+/**
+ * Returns the identifier for the environment that the extension is running in.
+ */
+export async function getComputeEnvType(): Promise<EnvType> {
+    const web = isWeb()
+    if (isCloud9()) {
+        return web ? 'cloud9-web' : 'cloud9'
+    } else if (isInDevEnv()) {
+        return 'codecatalyst'
+    } else if (isSageMaker()) {
+        return web ? 'sagemaker-web' : 'sagemaker'
+    } else if (isRemoteWorkspace()) {
+        if (isAmazonLinux2()) {
+            if (await isCloudDesktop()) {
+                return 'cloudDesktop-amzn'
+            }
+            return 'ec2-amzn'
+        }
+        return 'ec2'
+    } else if (env.remoteName === 'wsl') {
+        return 'wsl'
+    } else if (isAutomation()) {
+        return 'test'
+    } else if (web) {
+        return 'web'
+    } else if (env.remoteName) {
+        return 'remote' // Generic (unknown) remote env.
+    } else {
+        return 'local' // Generic (unknown) local env.
+    }
+}
+
+/**
+ * Validates that emitted telemetry metrics
+ * 1. contain a result property
+ * 2. contain a reason propery if result = 'Failed'.
+ * 3. are not missing fields
+ */
+export function validateMetricEvent(event: MetricDatum, fatal: boolean, isExempt = isValidationExemptMetric) {
+    if (!isExempt(event.MetricName) && event.Metadata) {
+        const metadata = mapMetadata([])(event.Metadata)
+        validateMetadata(event.MetricName, metadata, fatal)
+    }
+}
+
+function validateMetadata(metricName: string, metadata: MetadataObj, fatal: boolean) {
+    const failedStr: Result = 'Failed'
+    const preferRunSuffix =
+        ' Consider using `.run()` instead of `.emit()`, which will set these properties automatically. ' +
+        'See https://github.com/aws/aws-toolkit-vscode/blob/master/docs/telemetry.md#guidelines'
+    const msgPrefix = 'invalid Metric: '
+    const logger = getTelemetryLogger()
+    const logOrThrow = (msg: string, includeSuffix: boolean) => {
+        const fullMsg = msgPrefix + msg + (includeSuffix ? preferRunSuffix : '')
+        logger.warn(fullMsg)
+        if (fatal) {
+            throw new Error('telemetry: ' + fullMsg)
+        }
+    }
+
+    if (metadata.result === undefined) {
+        logOrThrow(`"${metricName}" emitted without the \`result\` property, which is always required.`, true)
+    } else if (metadata.result === failedStr && metadata.reason === undefined) {
+        logOrThrow(`"${metricName}" emitted with result=Failed but without the \`reason\` property.`, true)
+    }
+
+    // TODO: there are many instances in the toolkit where we emit metrics with missing fields. If those can be removed, we can configure this to throw in CI.
+    if (metadata.missingFields) {
+        const logMsg = `${msgPrefix} "${metricName}" emitted with missing fields: ${metadata.missingFields}`
+        logWarningOnce(logMsg)
+    }
+}
+
+function getTelemetryLogger() {
+    return getLogger('telemetry')
+}
+
+const logWarningOnce = oncePerUniqueArg((m: string) => getTelemetryLogger().warn(m))
+
+/**
+ * Potentially helpful values for the 'source' field in telemetry.
+ */
+export const ExtStartUpSources = {
+    firstStartUp: 'firstStartUp',
+    update: 'update',
+    reload: 'reload',
+    none: 'none',
+} as const
+
+export type ExtStartUpSource = (typeof ExtStartUpSources)[keyof typeof ExtStartUpSources]
+
+/**
+ * Useful for populating the sendTelemetryEvent request from codewhisperer's api for publishing custom telemetry events for AB Testing.
+ *
+ * Returns one of the enum values of OptOutPreferences model (see SendTelemetryRequest model in the codebase)
+ */
+export function getOptOutPreference() {
+    return globals.telemetry.telemetryEnabled ? 'OPTIN' : 'OPTOUT'
+}
+
+export type OperatingSystem = 'MAC' | 'WINDOWS' | 'LINUX'
+/**
+ * Useful for populating the sendTelemetryEvent request from codewhisperer's api for publishing custom telemetry events for AB Testing.
+ *
+ * Returns one of the enum values of the OperatingSystem model (see SendTelemetryRequest model in the codebase)
+ */
+export function getOperatingSystem(): OperatingSystem {
+    const osId = os.platform() // 'darwin', 'win32', 'linux', etc.
+    if (osId === 'darwin') {
+        return 'MAC'
+    } else if (osId === 'win32') {
+        return 'WINDOWS'
+    } else {
+        return 'LINUX'
+    }
+}
+
+type TelemetryContextArgs = FunctionEntry & { emit?: boolean; errorCtx?: boolean }
+/**
+ * Decorator that simply wraps the method with a non-emitting telemetry `run()`, automatically
+ * `record()`ing the provided function id for later use by TelemetryTracer.getFunctionStack()
+ *
+ * This saves us from needing to wrap the entire function:
+ *
+ * **Before:**
+ * ```
+ * class A {
+ *     myMethod() {
+ *         telemetry.function_call.run(() => {
+ *                 ...
+ *             },
+ *             { emit: false, functionId: { name: 'myMethod', class: 'A' } }
+ *         )
+ *     }
+ * }
+ * ```
+ *
+ * **After:**
+ * ```
+ * class A {
+ *     @withTelemetryContext({ name: 'myMethod', class: 'A' })
+ *     myMethod() {
+ *         ...
+ *     }
+ * }
+ * ```
+ *
+ * @param opts.name The name of the function
+ * @param opts.class The class name of the function
+ * @param opts.emit Whether or not to emit the telemetry event (default: false)
+ * @param opts.errorCtx Whether or not to add the error context to the error (default: false)
+ */
+export function withTelemetryContext(opts: TelemetryContextArgs) {
+    const shouldErrorCtx = opts.errorCtx !== undefined ? opts.errorCtx : false
+    function decorator<This, Args extends any[], Return>(
+        originalMethod: (this: This, ...args: Args) => Return,
+        _context: ClassMethodDecoratorContext // we dont need this currently but it keeps the compiler happy
+    ) {
+        function decoratedMethod(this: This, ...args: Args): Return {
+            return telemetry.function_call.run(
+                (span) => {
+                    try {
+                        span.record({
+                            functionName: opts.name,
+                            className: opts.class,
+                            source: asStringifiedStack(telemetry.getFunctionStack()),
+                        })
+
+                        // DEVELOPERS: Set a breakpoint here and step in and debug the original function
+                        const result = originalMethod.call(this, ...args)
+
+                        if (result instanceof Promise) {
+                            return result.catch((e) => {
+                                if (shouldErrorCtx) {
+                                    throw addContextToError(e, opts)
+                                }
+                                throw e
+                            }) as Return
+                        }
+                        return result
+                    } catch (e) {
+                        if (shouldErrorCtx) {
+                            throw addContextToError(e, opts)
+                        }
+                        throw e
+                    }
+                },
+                {
+                    emit: opts.emit !== undefined ? opts.emit : false,
+                    functionId: { name: opts.name, class: opts.class },
+                }
+            )
+        }
+        return decoratedMethod
+    }
+    return decorator
+
+    function addContextToError(e: unknown, functionId: FunctionEntry) {
+        return ToolkitError.chain(e, `ctx: ${functionId.name}`, {
+            code: functionId.class,
+        })
+    }
+}
+
+/**
+ * Used to identify the q client info and send the respective origin parameter from LSP to invoke Maestro service at CW API level
+ *
+ * Returns default value of vscode appName or AmazonQ-For-SMUS-CE in case of a sagemaker unified studio environment
+ * Returns default value of vscode appName
+ * OR AmazonQ-For-SMUS-CE in case of SMUS
+ * OR AmazonQ-For-SMAI-CE in case of SMAI
+ */
+export function getClientName(): string {
+    if (isSageMaker('SMUS')) {
+        return 'AmazonQ-For-SMUS-CE'
+    } else if (isSageMaker('SMAI')) {
+        return 'AmazonQ-For-SMAI-CE'
+    }
+    return env.appName
+}
diff --git a/packages/core/src/shared/telemetry/vscodeTelemetry.json b/packages/core/src/shared/telemetry/vscodeTelemetry.json
new file mode 100644
index 00000000000..fcf6140eb13
--- /dev/null
+++ b/packages/core/src/shared/telemetry/vscodeTelemetry.json
@@ -0,0 +1,1639 @@
+{
+    "types": [
+        {
+            "name": "toolId",
+            "type": "string",
+            "description": "The tool being installed",
+            "allowedValues": [
+                "session-manager-plugin",
+                "dotnet-lambda-deploy",
+                "dotnet-deploy-cli",
+                "aws-cli",
+                "sam-cli",
+                "docker",
+                "finch"
+            ]
+        },
+        {
+            "name": "amazonQProfileRegion",
+            "type": "string",
+            "description": "Region of the Q Profile associated with a metric\n- \"n/a\" if metric is not associated with a profile or region.\n- \"not-set\" if metric is associated with a profile, but profile is unknown."
+        },
+        {
+            "name": "ssoRegion",
+            "type": "string",
+            "description": "Region of the current SSO connection. Typically associated with credentialStartUrl\n- \"n/a\" if metric is not associated with a region.\n- \"not-set\" if metric is associated with a region, but region is unknown."
+        },
+        {
+            "name": "profileCount",
+            "type": "int",
+            "description": "The number of profiles that were available to choose from"
+        },
+        {
+            "name": "amazonGenerateApproachLatency",
+            "type": "double",
+            "description": "The time it takes to generate approach response"
+        },
+        {
+            "name": "proxiedSessionId",
+            "type": "string",
+            "description": "The sessionId of the extension instance that this instance is reporting on behalf of."
+        },
+        {
+            "name": "documentFormat",
+            "type": "string",
+            "allowedValues": ["JSON, YAML"],
+            "description": "SSM Create document format selection"
+        },
+        {
+            "name": "ssmOperation",
+            "type": "string",
+            "allowedValues": ["Create", "Update"],
+            "description": "SSM Publish Document operation type"
+        },
+        {
+            "name": "isInvalidJson",
+            "type": "boolean",
+            "description": "Indicates whether the message contains an invalid JSON definition."
+        },
+        {
+            "name": "starterTemplate",
+            "type": "string",
+            "description": "Starter template chosen during create document"
+        },
+        {
+            "name": "command",
+            "type": "string",
+            "description": "The id of a VS Code command"
+        },
+        {
+            "name": "debounceCount",
+            "type": "int",
+            "description": "Number of times the telemetry event was debounced before emission"
+        },
+        {
+            "name": "cli",
+            "type": "string",
+            "description": "Installed CLI"
+        },
+        {
+            "name": "amazonqIndexFileSizeInMB",
+            "type": "int",
+            "description": "The sum of file sizes that were indexed in MB"
+        },
+        {
+            "name": "amazonqVectorIndexEnabled",
+            "type": "boolean",
+            "description": "True if vector index is enabled"
+        },
+        {
+            "name": "amazonqIndexFileCount",
+            "type": "int",
+            "description": "Number of files indexed"
+        },
+        {
+            "name": "amazonqIndexMemoryUsageInMB",
+            "type": "int",
+            "description": "Memory usage of LSP server"
+        },
+        {
+            "name": "amazonqIndexCpuUsagePercentage",
+            "type": "int",
+            "description": "CPU used by LSP server as a percentage of all available CPUs on the system"
+        },
+        {
+            "name": "cwsprChatInteractionTarget",
+            "type": "string",
+            "description": "Identifies the entity within the message that user interacts with."
+        },
+        {
+            "name": "cwsprChatCodeBlockIndex",
+            "type": "int",
+            "description": "Index of the code block inside a message in the conversation."
+        },
+        {
+            "name": "cwsprChatTotalCodeBlocks",
+            "type": "int",
+            "description": "Total number of code blocks inside a message in the conversation."
+        },
+        {
+            "name": "cwsprChatAcceptedCharactersLength",
+            "type": "int",
+            "description": "Count of code characters copied to the editor"
+        },
+        {
+            "name": "cwsprChatAcceptedNumberOfLines",
+            "type": "int",
+            "description": "Count of lines of code copied to the editor"
+        },
+        {
+            "name": "cwsprChatHasReference",
+            "type": "boolean",
+            "description": "True if the code snippet that user interacts with has a reference."
+        },
+        {
+            "name": "cwsprChatModificationPercentage",
+            "type": "double",
+            "description": "% of characters edited by user after copying/inserting code from a message"
+        },
+        {
+            "name": "cwsprChatCommandType",
+            "type": "string",
+            "allowedValues": ["clear", "help", "transform", "auth"],
+            "description": "Type of chat command (/command) executed"
+        },
+        {
+            "name": "cwsprChatCommandName",
+            "type": "string",
+            "description": "Type of chat command name executed"
+        },
+        {
+            "name": "codewhispererUserInputDetails",
+            "type": "string",
+            "description": "A JSON serialized string of user input details."
+        },
+        {
+            "name": "authStatus",
+            "type": "string",
+            "allowedValues": ["connected", "notConnected", "expired", "connectedWithNetworkError"],
+            "description": "Status of the an auth connection."
+        },
+        {
+            "name": "authEnabledFeatures",
+            "type": "string",
+            "description": "Comma-delimited list of features for which auth is enabled."
+        },
+        {
+            "name": "authEnabledConnections",
+            "type": "string",
+            "description": "Comma-delimited list of enabled auths."
+        },
+        {
+            "name": "authScopes",
+            "type": "string",
+            "description": "Comma-delimited list of scopes that user has."
+        },
+        {
+            "name": "awsRegion",
+            "type": "string",
+            "description": "An AWS region."
+        },
+        {
+            "name": "connectionState",
+            "type": "string",
+            "description": "A detailed state of a specific auth connection. Use `authStatus` for a higher level view of an extension's general connection."
+        },
+        {
+            "name": "userCpuUsage",
+            "type": "int",
+            "description": "Percentage of user cpu usage (user space)"
+        },
+        {
+            "name": "systemCpuUsage",
+            "type": "int",
+            "description": "Percentage of system cpu usage (kernal space)"
+        },
+        {
+            "name": "heapTotal",
+            "type": "int",
+            "description": "Memory heap usage in MB"
+        },
+        {
+            "name": "className",
+            "type": "string",
+            "description": "The name of the class"
+        },
+        {
+            "name": "functionName",
+            "type": "string",
+            "description": "The name of the function"
+        },
+        {
+            "name": "webviewName",
+            "type": "string",
+            "description": "The name of the webview"
+        },
+        {
+            "name": "architecture",
+            "type": "string",
+            "description": "The CPU architecture"
+        },
+        {
+            "name": "timestamp",
+            "type": "int",
+            "description": "A timestamp in milliseconds"
+        },
+        {
+            "name": "traceId",
+            "type": "string",
+            "description": "The unique identifier of a trace"
+        },
+        {
+            "name": "amazonqChatMessageSentTime",
+            "type": "int",
+            "description": "Time when a user initial pressed enter in the chat"
+        },
+        {
+            "name": "amazonqEditorReceivedMessageMs",
+            "type": "int",
+            "description": "Duration between user pressing enter and the editor receiving the message in ms"
+        },
+        {
+            "name": "amazonqFeatureReceivedMessageMs",
+            "type": "int",
+            "description": "Duration between the editor receiving the message and the partner teams code receiving it in ms"
+        },
+        {
+            "name": "amazonqMessageDisplayedMs",
+            "type": "int",
+            "description": "Duration between the partner teams code receiving the message and when the message was finally displayed in ms"
+        },
+        {
+            "name": "executedCount",
+            "type": "int",
+            "description": "The number of executed operations"
+        },
+        {
+            "name": "amazonqAutoDebugCommandType",
+            "type": "string",
+            "allowedValues": ["fixWithQ", "fixAllWithQ", "explainProblem"],
+            "description": "The type of auto debug command executed"
+        },
+        {
+            "name": "amazonqAutoDebugAction",
+            "type": "string",
+            "allowedValues": ["invoked", "completed"],
+            "description": "The action performed (invoked or completed)"
+        },
+        {
+            "name": "amazonqAutoDebugProblemCount",
+            "type": "int",
+            "description": "Number of problems being processed"
+        },
+        {
+            "name": "smusDomainId",
+            "type": "string",
+            "description": "SMUS domain identifier"
+        },
+        {
+            "name": "smusProjectId",
+            "type": "string",
+            "description": "SMUS project identifier"
+        },
+        {
+            "name": "smusSpaceKey",
+            "type": "string",
+            "description": "SMUS space composite key consisting of domainId and spaceName"
+        },
+        {
+            "name": "smusToolkitEnv",
+            "type": "string",
+            "description": "The environment user is running SMUS extension against"
+        },
+        {
+            "name": "smusDomainRegion",
+            "type": "string",
+            "description": "The SMUS domain region"
+        },
+        {
+            "name": "smusProjectRegion",
+            "type": "string",
+            "description": "The SMUS project region"
+        },
+        {
+            "name": "smusConnectionId",
+            "type": "string",
+            "description": "SMUS connection identifier"
+        },
+        {
+            "name": "smusConnectionType",
+            "type": "string",
+            "description": "SMUS connection type"
+        },
+        {
+            "name": "smusDomainAccountId",
+            "type": "string",
+            "description": "SMUS domain account id"
+        },
+        {
+            "name": "smusProjectAccountId",
+            "type": "string",
+            "description": "SMUS project account id"
+        }
+    ],
+    "metrics": [
+        {
+            "name": "sagemaker_openRemoteConnection",
+            "description": "Perform a connection to a SageMaker Space",
+            "metadata": [
+                {
+                    "type": "result"
+                }
+            ]
+        },
+        {
+            "name": "sagemaker_stopSpace",
+            "description": "Stop a SageMaker Space",
+            "metadata": [
+                {
+                    "type": "result"
+                }
+            ]
+        },
+        {
+            "name": "sagemaker_filterSpaces",
+            "description": "Filter SageMaker Spaces",
+            "metadata": [
+                {
+                    "type": "result"
+                }
+            ]
+        },
+        {
+            "name": "sagemaker_deeplinkConnect",
+            "description": "Connect to SageMake Space via a deeplink",
+            "metadata": [
+                {
+                    "type": "result"
+                }
+            ]
+        },
+        {
+            "name": "amazonq_didSelectProfile",
+            "description": "Emitted after the user's Q Profile has been set, whether the user was prompted with a dialog, or a profile was automatically assigned after signing in.",
+            "metadata": [
+                { "type": "source" },
+                { "type": "amazonQProfileRegion" },
+                { "type": "result" },
+                { "type": "ssoRegion", "required": false },
+                { "type": "credentialStartUrl", "required": false },
+                { "type": "profileCount", "required": false }
+            ],
+            "passive": true
+        },
+        {
+            "name": "amazonq_profileState",
+            "description": "Indicates a change in the user's Q Profile state",
+            "metadata": [
+                { "type": "source" },
+                { "type": "amazonQProfileRegion" },
+                { "type": "result" },
+                { "type": "ssoRegion", "required": false },
+                { "type": "credentialStartUrl", "required": false }
+            ],
+            "passive": true
+        },
+        {
+            "name": "ide_fileSystem",
+            "description": "File System event on execution",
+            "metadata": [
+                {
+                    "type": "action",
+                    "required": true
+                },
+                {
+                    "type": "attempts",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "vscode_executeCommand",
+            "description": "Emitted whenever a registered Toolkit command is executed",
+            "passive": true,
+            "metadata": [
+                {
+                    "type": "command"
+                },
+                {
+                    "type": "debounceCount",
+                    "required": false
+                },
+                {
+                    "type": "duration"
+                },
+                {
+                    "type": "result"
+                },
+                {
+                    "type": "reason",
+                    "required": false
+                },
+                {
+                    "type": "source",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "aws_autoUpdateBeta",
+            "description": "Emitted whenever the Toolkit checks, and potentially installs, a beta version",
+            "passive": true
+        },
+        {
+            "name": "aws_installCli",
+            "description": "Called after attempting to install a local copy of a missing CLI",
+            "metadata": [
+                {
+                    "type": "result"
+                },
+                {
+                    "type": "cli"
+                }
+            ]
+        },
+        {
+            "name": "ssm_createDocument",
+            "description": "An SSM Document is created locally",
+            "unit": "None",
+            "metadata": [
+                {
+                    "type": "result"
+                },
+                {
+                    "type": "documentFormat",
+                    "required": false
+                },
+                {
+                    "type": "starterTemplate",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "ssm_deleteDocument",
+            "description": "An SSM Document is deleted",
+            "unit": "None",
+            "metadata": [
+                {
+                    "type": "result"
+                }
+            ]
+        },
+        {
+            "name": "ssm_executeDocument",
+            "description": "An SSM Document is deleted",
+            "unit": "None",
+            "metadata": [
+                {
+                    "type": "result"
+                }
+            ]
+        },
+        {
+            "name": "ssm_openDocument",
+            "description": "An SSM Document is opened locally",
+            "unit": "None",
+            "metadata": [
+                {
+                    "type": "result"
+                }
+            ]
+        },
+        {
+            "name": "ssm_publishDocument",
+            "description": "SSM Document related metrics for create and update",
+            "unit": "None",
+            "metadata": [
+                {
+                    "type": "result"
+                },
+                {
+                    "type": "ssmOperation"
+                }
+            ]
+        },
+        {
+            "name": "ssm_updateDocumentVersion",
+            "description": "SSM Document related metrics for updating document default version",
+            "unit": "None",
+            "metadata": [
+                {
+                    "type": "result"
+                }
+            ]
+        },
+        {
+            "name": "stepfunctions_createStateMachineFromTemplate",
+            "description": ""
+        },
+        {
+            "name": "stepfunctions_downloadStateMachineDefinition",
+            "description": "",
+            "unit": "None",
+            "metadata": [
+                {
+                    "type": "result"
+                }
+            ]
+        },
+        {
+            "name": "stepfunctions_executeStateMachine",
+            "description": "",
+            "unit": "None",
+            "metadata": [
+                {
+                    "type": "result"
+                }
+            ]
+        },
+        {
+            "name": "stepfunctions_executeStateMachineView",
+            "description": ""
+        },
+        {
+            "name": "stepfunctions_previewstatemachine",
+            "description": ""
+        },
+        {
+            "name": "stepfunctions_openWorkflowStudio",
+            "description": "Called after opening asl file in Step Functions Workflow Studio",
+            "metadata": [
+                {
+                    "type": "id",
+                    "required": true
+                }
+            ]
+        },
+        {
+            "name": "stepfunctions_closeWorkflowStudio",
+            "description": "Called after closing Step Functions Workflow Studio custom editor",
+            "metadata": [
+                {
+                    "type": "id",
+                    "required": true
+                }
+            ]
+        },
+        {
+            "name": "stepfunctions_saveFile",
+            "description": "Triggered when Workflow Studio auto-syncs to the local file or when unsaved local changes are saved from Workflow Studio or VSCode.",
+            "metadata": [
+                {
+                    "type": "id",
+                    "required": true
+                },
+                {
+                    "type": "saveType",
+                    "required": true
+                },
+                {
+                    "type": "source",
+                    "required": true
+                },
+                {
+                    "type": "isInvalidJson"
+                }
+            ]
+        },
+        {
+            "name": "vscode_activeRegions",
+            "description": "Record the number of active regions at startup and when regions are added/removed",
+            "unit": "Count",
+            "passive": true
+        },
+        {
+            "name": "aws_showExplorerErrorDetails",
+            "description": "Called when getting more details about errors thrown by the explorer",
+            "metadata": [
+                {
+                    "type": "result"
+                }
+            ]
+        },
+        {
+            "name": "aws_showRegion",
+            "description": "Records a call to add a region to the explorer"
+        },
+        {
+            "name": "aws_hideRegion",
+            "description": "Records a call to remove a region from the explorer"
+        },
+        {
+            "name": "sam_detect",
+            "description": "Called when detecting the location of the SAM CLI",
+            "metadata": [
+                {
+                    "type": "result"
+                }
+            ],
+            "passive": true
+        },
+        {
+            "name": "cdk_explorerDisabled",
+            "description": "Called when expanding the CDK explorer is disabled"
+        },
+        {
+            "name": "cdk_explorerEnabled",
+            "description": "Called when the CDK explorer is enabled"
+        },
+        {
+            "name": "cdk_appExpanded",
+            "description": "Called when the CDK explorer is expanded"
+        },
+        {
+            "name": "cdk_provideFeedback",
+            "description": "Called when providing feedback for CDK"
+        },
+        {
+            "name": "cdk_help",
+            "description": "Called when clicking on help for CDK"
+        },
+        {
+            "name": "cdk_refreshExplorer",
+            "description": "Called when refreshing the CDK explorer"
+        },
+        {
+            "name": "redshift_executeQuery",
+            "description": "Called when redshift query is executed"
+        },
+        {
+            "name": "redshift_listDatabases",
+            "description": "Called when redshift listDatabases API is called"
+        },
+        {
+            "name": "redshift_listSchemas",
+            "description": "Called when redshift listSchemas API is called"
+        },
+        {
+            "name": "redshift_listTables",
+            "description": "Called when redshift listTables API is called"
+        },
+        {
+            "name": "sam_attachDebugger",
+            "description": "Called after trying to attach a debugger to a local sam invoke",
+            "metadata": [
+                {
+                    "type": "result"
+                },
+                {
+                    "type": "lambdaPackageType"
+                },
+                {
+                    "type": "runtime"
+                },
+                {
+                    "type": "attempts"
+                },
+                {
+                    "type": "duration"
+                },
+                {
+                    "type": "lambdaArchitecture",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "sam_openConfigUi",
+            "description": "Called after opening the SAM Config UI"
+        },
+        {
+            "name": "amazonq_openChat",
+            "description": "When user opens CWSPR chat panel"
+        },
+        {
+            "name": "amazonq_enterFocusChat",
+            "description": "When chat panel comes into focus"
+        },
+        {
+            "name": "amazonq_exitFocusChat",
+            "description": "When chat panel goes out of focus"
+        },
+        {
+            "name": "amazonq_closeChat",
+            "description": "When chat panel is closed"
+        },
+        {
+            "name": "amazonq_startConversation",
+            "description": "When user starts a new conversation",
+            "metadata": [
+                {
+                    "type": "cwsprChatConversationId"
+                },
+                {
+                    "type": "credentialStartUrl",
+                    "required": false
+                },
+                {
+                    "type": "cwsprChatTriggerInteraction"
+                },
+                {
+                    "type": "cwsprChatUserIntent",
+                    "required": false
+                },
+                {
+                    "type": "cwsprChatHasCodeSnippet",
+                    "required": false
+                },
+                {
+                    "type": "cwsprChatProgrammingLanguage",
+                    "required": false
+                },
+                {
+                    "type": "cwsprChatConversationType"
+                },
+                {
+                    "type": "cwsprChatHasProjectContext",
+                    "required": false
+                },
+                {
+                    "type": "cwsprChatProjectContextQueryMs",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "amazonq_indexWorkspace",
+            "description": "Indexing of local workspace",
+            "metadata": [
+                {
+                    "type": "duration"
+                },
+                {
+                    "type": "result"
+                },
+                {
+                    "type": "amazonqIndexFileSizeInMB"
+                },
+                {
+                    "type": "amazonqIndexFileCount"
+                },
+                {
+                    "type": "amazonqIndexMemoryUsageInMB",
+                    "required": false
+                },
+                {
+                    "type": "amazonqIndexCpuUsagePercentage",
+                    "required": false
+                },
+                {
+                    "type": "credentialStartUrl",
+                    "required": false
+                },
+                {
+                    "type": "amazonqVectorIndexEnabled",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "amazonq_modifyCode",
+            "description": "% of code modified by the user after copying/inserting code from a message",
+            "metadata": [
+                {
+                    "type": "cwsprChatConversationId"
+                },
+                {
+                    "type": "credentialStartUrl",
+                    "required": false
+                },
+                {
+                    "type": "cwsprChatMessageId"
+                },
+                {
+                    "type": "cwsprChatModificationPercentage"
+                }
+            ]
+        },
+        {
+            "name": "amazonq_enterFocusConversation",
+            "description": "When a conversation comes into focus",
+            "metadata": [
+                {
+                    "type": "cwsprChatConversationId"
+                },
+                {
+                    "type": "credentialStartUrl",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "amazonq_exitFocusConversation",
+            "description": "When a conversation goes out of focus",
+            "metadata": [
+                {
+                    "type": "cwsprChatConversationId"
+                },
+                {
+                    "type": "credentialStartUrl",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "amazonq_runCommand",
+            "description": "When a chat command is executed",
+            "metadata": [
+                {
+                    "type": "cwsprChatCommandType"
+                },
+                {
+                    "type": "cwsprChatCommandName",
+                    "required": false
+                },
+                {
+                    "type": "credentialStartUrl",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "amazonq_codeGenerationThumbsUp",
+            "description": "User clicked on the thumbs up button to say that they are unsatisfied",
+            "unit": "Count",
+            "metadata": [
+                {
+                    "type": "amazonqConversationId"
+                },
+                {
+                    "type": "credentialStartUrl",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "amazonq_codeGenerationThumbsDown",
+            "description": "User clicked on the thumbs down button to say that they are unsatisfied",
+            "unit": "Count",
+            "metadata": [
+                {
+                    "type": "amazonqConversationId"
+                },
+                {
+                    "type": "credentialStartUrl",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "amazonq_approachThumbsUp",
+            "description": "User clicked on the thumbs up button, to mention that they are satisfied",
+            "unit": "Count",
+            "metadata": [
+                {
+                    "type": "amazonqConversationId"
+                },
+                {
+                    "type": "credentialStartUrl",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "amazonq_approachThumbsDown",
+            "description": "User clicked on the thumbs down button to say that they are unsatisfied",
+            "unit": "Count",
+            "metadata": [
+                {
+                    "type": "amazonqConversationId"
+                },
+                {
+                    "type": "credentialStartUrl",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "amazonq_isReviewedChanges",
+            "description": "User reviewed changes",
+            "passive": true,
+            "metadata": [
+                {
+                    "type": "enabled"
+                },
+                {
+                    "type": "amazonqConversationId"
+                },
+                {
+                    "type": "credentialStartUrl",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "amazonq_startChat",
+            "description": "Number of times the user have triggered /dev and started the chat",
+            "unit": "Count",
+            "metadata": [
+                {
+                    "type": "amazonqConversationId"
+                },
+                {
+                    "type": "credentialStartUrl",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "amazonq_endChat",
+            "description": "Captures end of the conversation with amazonq /dev",
+            "metadata": [
+                {
+                    "type": "amazonqConversationId"
+                },
+                {
+                    "type": "amazonqEndOfTheConversationLatency",
+                    "required": false
+                },
+                {
+                    "type": "credentialStartUrl",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "amazonq_approachInvoke",
+            "description": "Captures Approach generation process",
+            "metadata": [
+                {
+                    "type": "amazonqConversationId"
+                },
+                {
+                    "type": "amazonqGenerateApproachIteration"
+                },
+                {
+                    "type": "amazonqGenerateApproachLatency"
+                },
+                {
+                    "type": "credentialStartUrl",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "amazonq_startConversationInvoke",
+            "description": "Captures startConversation invocation process",
+            "metadata": [
+                {
+                    "type": "amazonqConversationId",
+                    "required": false
+                },
+                {
+                    "type": "credentialStartUrl",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "ide_editCodeFile",
+            "description": "User opened a code file with the given file extension. Client should DEDUPLICATE this metric (ideally hourly/daily). AWS-specific files should (also) emit `file_editAwsFile`.",
+            "passive": true,
+            "metadata": [
+                {
+                    "type": "filenameExt",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "auth_modifyConnection",
+            "description": "An auth connection was modified in some way, e.g. deleted, updated",
+            "metadata": [
+                {
+                    "type": "action",
+                    "required": true
+                },
+                {
+                    "type": "authScopes",
+                    "required": false
+                },
+                {
+                    "type": "authStatus",
+                    "required": false
+                },
+                {
+                    "type": "connectionState",
+                    "required": false
+                },
+                {
+                    "type": "credentialStartUrl",
+                    "required": false
+                },
+                {
+                    "type": "sessionDuration",
+                    "required": false
+                },
+                {
+                    "type": "source",
+                    "required": true
+                },
+                {
+                    "type": "ssoRegistrationClientId",
+                    "required": false
+                },
+                {
+                    "type": "ssoRegistrationExpiresAt",
+                    "required": false
+                },
+                {
+                    "type": "id",
+                    "required": false
+                }
+            ],
+            "passive": true
+        },
+        {
+            "name": "auth_signInPageOpened",
+            "description": "When the Amazon Q sign in page is opened and focused.",
+            "metadata": [
+                {
+                    "type": "source",
+                    "required": true
+                }
+            ],
+            "passive": true
+        },
+        {
+            "name": "function_call",
+            "description": "Represents a function call. In most cases this should wrap code with a run(), then you can add context.",
+            "metadata": [
+                {
+                    "type": "functionName",
+                    "required": true
+                },
+                {
+                    "type": "className",
+                    "required": false
+                },
+                {
+                    "type": "source",
+                    "required": false
+                }
+            ],
+            "passive": true
+        },
+        {
+            "name": "webview_error",
+            "description": "Represents an error that occurs in a webview",
+            "metadata": [
+                {
+                    "type": "webviewName",
+                    "required": true
+                }
+            ]
+        },
+        {
+            "name": "trace_event",
+            "description": "Represents the root trace spanning multiple operations",
+            "passive": true,
+            "metadata": [
+                {
+                    "type": "traceId",
+                    "required": true
+                },
+                {
+                    "type": "name",
+                    "required": true
+                }
+            ]
+        },
+        {
+            "name": "amazonq_chatRoundTrip",
+            "description": "Measures sequential response times in Q chat, from user input to message display. Tracks time intervals between key events: editor receiving the message, feature processing, and final message rendering",
+            "passive": true,
+            "metadata": [
+                {
+                    "type": "amazonqChatMessageSentTime"
+                },
+                {
+                    "type": "amazonqEditorReceivedMessageMs"
+                },
+                {
+                    "type": "amazonqFeatureReceivedMessageMs"
+                },
+                {
+                    "type": "amazonqMessageDisplayedMs"
+                },
+                {
+                    "type": "source"
+                }
+            ]
+        },
+        {
+            "name": "session_start",
+            "description": "Called when starting the plugin",
+            "metadata": [
+                {
+                    "type": "source",
+                    "required": false
+                }
+            ],
+            "passive": true
+        },
+        {
+            "name": "session_end",
+            "description": "Called when stopping the IDE on a best effort basis",
+            "metadata": [
+                {
+                    "type": "proxiedSessionId",
+                    "required": false
+                },
+                {
+                    "type": "timestamp",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "languageServer_crash",
+            "description": "Called when a language server crash is detected. TODO: Port this to common",
+            "metadata": [
+                {
+                    "type": "id"
+                }
+            ]
+        },
+        {
+            "name": "ide_heartbeat",
+            "description": "A heartbeat sent by the extension",
+            "metadata": [
+                {
+                    "type": "id",
+                    "required": true
+                },
+                {
+                    "type": "name",
+                    "required": false
+                },
+                {
+                    "type": "timestamp",
+                    "required": false
+                }
+            ],
+            "passive": true
+        },
+        {
+            "name": "docdb_listClusters",
+            "description": "Called when DocumentDB node is expanded"
+        },
+        {
+            "name": "docdb_listInstances",
+            "description": "Called when a DocumentDB cluster node is expanded"
+        },
+        {
+            "name": "docdb_createCluster",
+            "description": "Captures the result of adding a new cluster in the 'Add Cluster' workflow"
+        },
+        {
+            "name": "docdb_createInstance",
+            "description": "Captures the result of adding an instance to a cluster"
+        },
+        {
+            "name": "docdb_deleteCluster",
+            "description": "Captures the result of deleting a cluster"
+        },
+        {
+            "name": "docdb_deleteInstance",
+            "description": "Captures the result of deleting an instance"
+        },
+        {
+            "name": "docdb_renameCluster",
+            "description": "Captures the result of renaming a cluster"
+        },
+        {
+            "name": "docdb_renameInstance",
+            "description": "Captures the result of renaming an instance"
+        },
+        {
+            "name": "docdb_resizeInstance",
+            "description": "Captures the result of changing an instance class"
+        },
+        {
+            "name": "docdb_rebootInstance",
+            "description": "Captures the result of rebooting an instance"
+        },
+        {
+            "name": "docdb_stopCluster",
+            "description": "Captures the result of stopping a cluster"
+        },
+        {
+            "name": "docdb_startCluster",
+            "description": "Captures the result of starting a cluster"
+        },
+        {
+            "name": "docdb_listTags",
+            "description": "User clicked on tags command"
+        },
+        {
+            "name": "docdb_addTag",
+            "description": "User clicked on add tag command"
+        },
+        {
+            "name": "docdb_removeTag",
+            "description": "User clicked on remove tag command"
+        },
+        {
+            "name": "docdb_addRegion",
+            "description": "User clicked on add region command"
+        },
+        {
+            "name": "appbuilder_lambda2sam",
+            "description": "User click Convert a lambda function to SAM project"
+        },
+        {
+            "name": "auth_customEndpoint",
+            "description": "User used a custom endpoint"
+        },
+        {
+            "name": "auth_localstackEndpoint",
+            "description": "User used a LocalStack connection"
+        },
+        {
+            "name": "lambda_remoteDebugStop",
+            "description": "user stop remote debugging",
+            "metadata": [
+                {
+                    "type": "sessionDuration",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "lambda_remoteDebugStart",
+            "description": "user start remote debugging",
+            "metadata": [
+                {
+                    "type": "runtimeString",
+                    "required": false
+                },
+                {
+                    "type": "source",
+                    "required": false
+                },
+                {
+                    "type": "action",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "lambda_remoteDebugPrecheck",
+            "description": "user click remote debug checkbox",
+            "metadata": [
+                {
+                    "type": "runtimeString",
+                    "required": false
+                },
+                {
+                    "type": "source",
+                    "required": false
+                },
+                {
+                    "type": "action",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "lambda_invokeRemote",
+            "description": "Called when invoking lambdas remotely",
+            "metadata": [
+                {
+                    "type": "result"
+                },
+                {
+                    "type": "runtime",
+                    "required": false
+                },
+                {
+                    "type": "source",
+                    "required": false
+                },
+                {
+                    "type": "runtimeString",
+                    "required": false
+                },
+                {
+                    "type": "action",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "languageServer_setup",
+            "description": "Sets up a language server",
+            "unit": "Milliseconds",
+            "passive": true,
+            "metadata": [
+                {
+                    "type": "id",
+                    "required": true
+                },
+                {
+                    "type": "languageServerSetupStage",
+                    "required": true
+                },
+                {
+                    "type": "languageServerLocation",
+                    "required": false
+                },
+                {
+                    "type": "languageServerVersion",
+                    "required": false
+                },
+                {
+                    "type": "manifestLocation",
+                    "required": false
+                },
+                {
+                    "type": "manifestSchemaVersion",
+                    "required": false
+                },
+                {
+                    "type": "credentialStartUrl",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "amazonq_autoDebugCommand",
+            "description": "Tracks usage of Amazon Q auto debug commands (fixWithQ, fixAllWithQ, explainProblem)",
+            "metadata": [
+                {
+                    "type": "amazonqAutoDebugCommandType",
+                    "required": true
+                },
+                {
+                    "type": "amazonqAutoDebugAction",
+                    "required": true
+                },
+                {
+                    "type": "amazonqAutoDebugProblemCount",
+                    "required": false
+                },
+                {
+                    "type": "result"
+                },
+                {
+                    "type": "reason",
+                    "required": false
+                },
+                {
+                    "type": "reasonDesc",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "smus_login",
+            "description": "Emitted whenever a user signin to SMUS",
+            "metadata": [
+                {
+                    "type": "smusDomainId",
+                    "required": false
+                },
+                {
+                    "type": "smusDomainAccountId",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "smus_signOut",
+            "description": "Emitted whenever a user signouts SMUS",
+            "metadata": [
+                {
+                    "type": "smusDomainId",
+                    "required": false
+                },
+                {
+                    "type": "smusDomainAccountId",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "smus_accessProject",
+            "description": "Emitted whenever a user accesses a SMUS project",
+            "metadata": [
+                {
+                    "type": "smusDomainId",
+                    "required": false
+                },
+                {
+                    "type": "smusDomainAccountId",
+                    "required": false
+                },
+                {
+                    "type": "smusProjectId",
+                    "required": false
+                },
+                {
+                    "type": "smusDomainRegion",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "smus_renderProjectChildrenNode",
+            "description": "Emitted whenever children node of project is rendered",
+            "metadata": [
+                {
+                    "type": "smusToolkitEnv",
+                    "required": false
+                },
+                {
+                    "type": "smusDomainId",
+                    "required": false
+                },
+                {
+                    "type": "smusDomainAccountId",
+                    "required": false
+                },
+                {
+                    "type": "smusProjectId",
+                    "required": false
+                },
+                {
+                    "type": "smusDomainRegion",
+                    "required": false
+                }
+            ],
+            "passive": true
+        },
+        {
+            "name": "smus_openRemoteConnection",
+            "description": "Emitted whenever a user starts a SMUS space",
+            "metadata": [
+                {
+                    "type": "smusDomainId",
+                    "required": false
+                },
+                {
+                    "type": "smusDomainAccountId",
+                    "required": false
+                },
+                {
+                    "type": "smusProjectId",
+                    "required": false
+                },
+                {
+                    "type": "smusSpaceKey",
+                    "required": false
+                },
+                {
+                    "type": "smusDomainRegion",
+                    "required": false
+                },
+                {
+                    "type": "smusProjectRegion",
+                    "required": false
+                },
+                {
+                    "type": "smusProjectAccountId",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "smus_stopSpace",
+            "description": "Emitted whenever a user stop a SMUS space",
+            "metadata": [
+                {
+                    "type": "smusDomainId",
+                    "required": false
+                },
+                {
+                    "type": "smusDomainAccountId",
+                    "required": false
+                },
+                {
+                    "type": "smusProjectId",
+                    "required": false
+                },
+                {
+                    "type": "smusSpaceKey",
+                    "required": false
+                },
+                {
+                    "type": "smusDomainRegion",
+                    "required": false
+                },
+                {
+                    "type": "smusProjectRegion",
+                    "required": false
+                },
+                {
+                    "type": "smusProjectAccountId",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "smus_renderS3Node",
+            "description": "Emitted whenever rendering a s3 node",
+            "metadata": [
+                {
+                    "type": "smusToolkitEnv",
+                    "required": false
+                },
+                {
+                    "type": "smusDomainId",
+                    "required": false
+                },
+                {
+                    "type": "smusDomainAccountId",
+                    "required": false
+                },
+                {
+                    "type": "smusProjectId",
+                    "required": false
+                },
+                {
+                    "type": "smusProjectRegion",
+                    "required": false
+                },
+                {
+                    "type": "smusProjectAccountId",
+                    "required": false
+                },
+                {
+                    "type": "smusConnectionId",
+                    "required": false
+                },
+                {
+                    "type": "smusConnectionType",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "smus_renderRedshiftNode",
+            "description": "Emitted whenever rendering a Redshift node",
+            "metadata": [
+                {
+                    "type": "smusToolkitEnv",
+                    "required": false
+                },
+                {
+                    "type": "smusDomainId",
+                    "required": false
+                },
+                {
+                    "type": "smusDomainAccountId",
+                    "required": false
+                },
+                {
+                    "type": "smusProjectId",
+                    "required": false
+                },
+                {
+                    "type": "smusProjectRegion",
+                    "required": false
+                },
+                {
+                    "type": "smusProjectAccountId",
+                    "required": false
+                },
+                {
+                    "type": "smusConnectionId",
+                    "required": false
+                },
+                {
+                    "type": "smusConnectionType",
+                    "required": false
+                }
+            ]
+        },
+        {
+            "name": "smus_renderLakehouseNode",
+            "description": "Emitted whenever rendering a Lakehouse node",
+            "metadata": [
+                {
+                    "type": "smusToolkitEnv",
+                    "required": false
+                },
+                {
+                    "type": "smusDomainId",
+                    "required": false
+                },
+                {
+                    "type": "smusDomainAccountId",
+                    "required": false
+                },
+                {
+                    "type": "smusProjectId",
+                    "required": false
+                },
+                {
+                    "type": "smusProjectRegion",
+                    "required": false
+                },
+                {
+                    "type": "smusProjectAccountId",
+                    "required": false
+                },
+                {
+                    "type": "smusConnectionId",
+                    "required": false
+                },
+                {
+                    "type": "smusConnectionType",
+                    "required": false
+                }
+            ]
+        }
+    ]
+}
diff --git a/src/shared/templates/baseTemplates.ts b/packages/core/src/shared/templates/baseTemplates.ts
similarity index 89%
rename from src/shared/templates/baseTemplates.ts
rename to packages/core/src/shared/templates/baseTemplates.ts
index 1fbce5f15cb..ce4aa1c2662 100644
--- a/src/shared/templates/baseTemplates.ts
+++ b/packages/core/src/shared/templates/baseTemplates.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/src/shared/templates/sam/samTemplateGenerator.ts b/packages/core/src/shared/templates/sam/samTemplateGenerator.ts
similarity index 93%
rename from src/shared/templates/sam/samTemplateGenerator.ts
rename to packages/core/src/shared/templates/sam/samTemplateGenerator.ts
index 80bef4eddf6..9c98bd8ceae 100644
--- a/src/shared/templates/sam/samTemplateGenerator.ts
+++ b/packages/core/src/shared/templates/sam/samTemplateGenerator.ts
@@ -1,15 +1,15 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { mkdirp, writeFile } from 'fs-extra'
 import * as yaml from 'js-yaml'
 import * as path from 'path'
 import { Architecture } from '../../../lambda/models/samLambdaRuntime'
 import * as filesystemUtilities from '../../../shared/filesystemUtilities'
-import { CloudFormation } from '../../cloudformation/cloudformation'
+import * as CloudFormation from '../../cloudformation/cloudformation'
 import ZipResourceProperties = CloudFormation.ZipResourceProperties
+import fs from '../../fs/fs'
 
 export class SamTemplateGenerator {
     private resourceName?: string
@@ -128,8 +128,8 @@ export class SamTemplateGenerator {
 
         const parentDirectory: string = path.dirname(filename)
         if (!(await filesystemUtilities.fileExists(parentDirectory))) {
-            await mkdirp(parentDirectory)
+            await fs.mkdir(parentDirectory)
         }
-        await writeFile(filename, templateAsYaml, 'utf8')
+        await fs.writeFile(filename, templateAsYaml, 'utf8')
     }
 }
diff --git a/packages/core/src/shared/treeview/awsTreeProvider.ts b/packages/core/src/shared/treeview/awsTreeProvider.ts
new file mode 100644
index 00000000000..c2f47cdbab2
--- /dev/null
+++ b/packages/core/src/shared/treeview/awsTreeProvider.ts
@@ -0,0 +1,12 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+interface AwsTreeProvider {
+    viewProviderId: string
+}
+
+export interface RefreshableAwsTreeProvider extends AwsTreeProvider {
+    refresh(): void
+}
diff --git a/src/shared/treeview/nodes/awsCommandTreeNode.ts b/packages/core/src/shared/treeview/nodes/awsCommandTreeNode.ts
similarity index 90%
rename from src/shared/treeview/nodes/awsCommandTreeNode.ts
rename to packages/core/src/shared/treeview/nodes/awsCommandTreeNode.ts
index f0276f98310..11cbc3a36e2 100644
--- a/src/shared/treeview/nodes/awsCommandTreeNode.ts
+++ b/packages/core/src/shared/treeview/nodes/awsCommandTreeNode.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/packages/core/src/shared/treeview/nodes/awsResourceNode.ts b/packages/core/src/shared/treeview/nodes/awsResourceNode.ts
new file mode 100644
index 00000000000..7b2f68e4a70
--- /dev/null
+++ b/packages/core/src/shared/treeview/nodes/awsResourceNode.ts
@@ -0,0 +1,19 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export interface AWSResourceNode {
+    /**
+     * Returns the ARN of the AWS resource. All nodes should return an ARN or throw an Error if not found.
+     */
+    readonly arn: string
+
+    /**
+     * Returns the name of the AWS resource.
+     */
+    readonly name: string
+
+    /** Service-defined idenifier, e.g. for EC2 this is the "Instance Id". */
+    readonly id?: string
+}
diff --git a/packages/core/src/shared/treeview/nodes/awsTreeNodeBase.ts b/packages/core/src/shared/treeview/nodes/awsTreeNodeBase.ts
new file mode 100644
index 00000000000..316634389d1
--- /dev/null
+++ b/packages/core/src/shared/treeview/nodes/awsTreeNodeBase.ts
@@ -0,0 +1,28 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { TreeItem, TreeItemCollapsibleState, commands } from 'vscode'
+
+export abstract class AWSTreeNodeBase extends TreeItem {
+    public readonly regionCode?: string
+    /** Service id as defined in the service model. May be undefined for child nodes. */
+    public serviceId: string | undefined
+
+    public override toString(): string {
+        return `TreeItem(serviceId=${this.serviceId}, label=${this.label})`
+    }
+
+    public constructor(label: string, collapsibleState?: TreeItemCollapsibleState) {
+        super(label, collapsibleState)
+    }
+
+    public getChildren(): Thenable<AWSTreeNodeBase[]> {
+        return Promise.resolve([])
+    }
+
+    public refresh(): void {
+        void commands.executeCommand('aws.refreshAwsExplorerNode', this)
+    }
+}
diff --git a/src/shared/treeview/nodes/loadMoreNode.ts b/packages/core/src/shared/treeview/nodes/loadMoreNode.ts
similarity index 96%
rename from src/shared/treeview/nodes/loadMoreNode.ts
rename to packages/core/src/shared/treeview/nodes/loadMoreNode.ts
index 9556f565781..d842445266e 100644
--- a/src/shared/treeview/nodes/loadMoreNode.ts
+++ b/packages/core/src/shared/treeview/nodes/loadMoreNode.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/packages/core/src/shared/treeview/nodes/placeholderNode.ts b/packages/core/src/shared/treeview/nodes/placeholderNode.ts
new file mode 100644
index 00000000000..352130103f9
--- /dev/null
+++ b/packages/core/src/shared/treeview/nodes/placeholderNode.ts
@@ -0,0 +1,19 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { AWSTreeNodeBase } from './awsTreeNodeBase'
+
+// Can be used to add a child node in an explorer when a region has no resources
+// relevant to the explorer type.
+export class PlaceholderNode extends AWSTreeNodeBase {
+    public constructor(
+        public readonly parent: AWSTreeNodeBase,
+        label: string,
+        tooltip?: string
+    ) {
+        super(label)
+        this.tooltip = tooltip
+    }
+}
diff --git a/src/shared/treeview/resource.ts b/packages/core/src/shared/treeview/resource.ts
similarity index 92%
rename from src/shared/treeview/resource.ts
rename to packages/core/src/shared/treeview/resource.ts
index 033eefea50d..58f68cab26a 100644
--- a/src/shared/treeview/resource.ts
+++ b/packages/core/src/shared/treeview/resource.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -12,6 +12,7 @@ import { once } from '../utilities/functionUtils'
 import { Commands } from '../vscode/commands2'
 import { TreeNode } from './resourceTreeDataProvider'
 import { createErrorItem, createPlaceholderItem } from './utils'
+import { getLogger } from '../logger/logger'
 
 interface SimpleResourceProvider<T = unknown> {
     readonly paginated?: false
@@ -60,7 +61,9 @@ export class PageLoader<T> {
     public dispose(): void {
         this.pages.length = 0
         this.isDone = true
-        this.iterator?.return?.()
+        this.iterator?.return?.().catch((e) => {
+            getLogger().error('PageLoader.dispose() failed: %s', (e as Error).message)
+        })
     }
 
     private async next(): Promise<T[] | undefined> {
@@ -91,7 +94,11 @@ interface LoadMoreable<T> {
 }
 
 const loadMore = <T>(controller: LoadMoreable<T>) => controller.loadMore()
-export const loadMoreCommand = Commands.instance.register('_aws.resources.loadMore', loadMore)
+export const loadMoreCommand = Commands.instance.declare(
+    '_aws.resources.loadMore',
+    () => (controller) => loadMore(controller)
+)
+const registerLoadMore = once(() => loadMoreCommand.register())
 
 interface TreeNodeOptions<T> {
     /**
@@ -133,7 +140,12 @@ export class ResourceTreeNode<T extends TreeResource<unknown>, U = never> implem
 
     private loader?: PageLoader<TreeNode<U>>
 
-    public constructor(public readonly resource: T, private readonly options?: TreeNodeOptions<U>) {}
+    public constructor(
+        public readonly resource: T,
+        private readonly options?: TreeNodeOptions<U>
+    ) {
+        registerLoadMore()
+    }
 
     public get onDidChangeChildren() {
         if (this.options?.childrenProvider?.onDidChange || this.options?.childrenProvider?.paginated) {
@@ -150,7 +162,7 @@ export class ResourceTreeNode<T extends TreeResource<unknown>, U = never> implem
         // The two branches are for tree shim optimizations
         const item = this.resource.getTreeItem()
         if (item instanceof Promise) {
-            return item.then(i => {
+            return item.then((i) => {
                 i.collapsibleState = collapsibleState
                 return i
             })
diff --git a/src/shared/treeview/resourceTreeDataProvider.ts b/packages/core/src/shared/treeview/resourceTreeDataProvider.ts
similarity index 80%
rename from src/shared/treeview/resourceTreeDataProvider.ts
rename to packages/core/src/shared/treeview/resourceTreeDataProvider.ts
index bc6d8f02f87..6920d18f7d6 100644
--- a/src/shared/treeview/resourceTreeDataProvider.ts
+++ b/packages/core/src/shared/treeview/resourceTreeDataProvider.ts
@@ -1,9 +1,10 @@
 /*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as vscode from 'vscode'
+import { ToolkitError } from '../errors'
 
 type ExcludedKeys = 'id' | 'label' | 'collapsibleState'
 
@@ -43,6 +44,11 @@ export interface TreeNode<T = unknown> {
      * Optional method to provide child nodes.
      */
     getChildren?(): Promise<TreeNode[]> | TreeNode[]
+
+    /**
+     * Optional method to provide parent node.
+     */
+    getParent?(): TreeNode | undefined
 }
 
 export function isTreeNode(obj: unknown): obj is TreeNode {
@@ -95,18 +101,31 @@ export class ResourceTreeDataProvider implements vscode.TreeDataProvider<TreeNod
             if (previousChildren !== undefined) {
                 return previousChildren
             } else {
-                this.children.get(element.id)?.forEach(n => this.clear(n))
+                if (this.children.has(element.id)) {
+                    for (const n of this.children.get(element.id)!) {
+                        this.clear(n)
+                    }
+                }
             }
         }
 
         const getId = (id: string) => (element ? `${element.id}/${id}` : id)
         const children = (await (element ?? this.root).getChildren?.()) ?? []
-        const tracked = children.map(r => this.insert(getId(r.id), r))
+        const tracked = children.map((r) => this.insert(getId(r.id), r))
         element && this.children.set(element.id, tracked)
 
         return tracked
     }
 
+    public getParent(element: TreeNode<unknown>): vscode.ProviderResult<TreeNode> {
+        if (!element.getParent) {
+            throw new ToolkitError(
+                `Node '${element.id}' has not implemented getParent(). This can cause issues with vscode.TreeView.reveal().`
+            )
+        }
+        return element.getParent()
+    }
+
     public refresh(node?: TreeNode): void {
         if (node === undefined) {
             vscode.Disposable.from(...this.listeners.values()).dispose()
@@ -129,7 +148,11 @@ export class ResourceTreeDataProvider implements vscode.TreeDataProvider<TreeNod
         this.listeners.get(node.id)?.dispose()
         this.listeners.delete(node.id)
 
-        children?.forEach(c => this.clear(c))
+        if (children) {
+            for (const c of children) {
+                this.clear(c)
+            }
+        }
     }
 
     private insert(id: string, resource: TreeNode): TreeNode {
@@ -139,7 +162,11 @@ export class ResourceTreeDataProvider implements vscode.TreeDataProvider<TreeNod
         if (node.onDidChangeChildren) {
             listeners.push(
                 node.onDidChangeChildren?.(() => {
-                    this.children.get(node.id)?.forEach(n => this.clear(n))
+                    if (this.children.has(node.id)) {
+                        for (const n of this.children.get(node.id)!) {
+                            this.clear(n)
+                        }
+                    }
                     this.children.delete(node.id)
                     this.onDidChangeTreeDataEmitter.fire(node)
                 })
diff --git a/packages/core/src/shared/treeview/utils.ts b/packages/core/src/shared/treeview/utils.ts
new file mode 100644
index 00000000000..94946883c05
--- /dev/null
+++ b/packages/core/src/shared/treeview/utils.ts
@@ -0,0 +1,159 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as vscode from 'vscode'
+import { getLogger } from '../logger/logger'
+import { AWSTreeNodeBase } from './nodes/awsTreeNodeBase'
+import { UnknownError } from '../errors'
+import { Logging } from '../logger/commands'
+import { isTreeNode, TreeNode } from './resourceTreeDataProvider'
+import { assign } from '../utilities/collectionUtils'
+import { addColor, getIcon } from '../icons'
+import { cast, TypeConstructor } from '../utilities/typeConstructors'
+
+export function getLabel(node: vscode.TreeItem | undefined): string {
+    if (typeof node?.label === 'undefined' || typeof node.label === 'string') {
+        return node?.label ?? ''
+    }
+    return node.label.label
+}
+
+export function compareTreeItems(nodeA: vscode.TreeItem, nodeB: vscode.TreeItem): number {
+    return getLabel(nodeA).localeCompare(getLabel(nodeB))
+}
+
+/**
+ * Produces a list of child nodes using handlers to consistently populate the
+ * list when errors occur or if the list would otherwise be empty.
+ */
+export async function makeChildrenNodes<T extends AWSTreeNodeBase, P extends AWSTreeNodeBase>(parameters: {
+    getChildNodes(): Promise<T[]>
+    getNoChildrenPlaceholderNode?(): Promise<P>
+    sort?: (a: T, b: T) => number
+    getErrorNode?: (error: Error) => AWSTreeNodeBase
+}): Promise<T[] | [P] | [AWSTreeNodeBase]> {
+    try {
+        const nodes = await parameters.getChildNodes()
+
+        if (nodes.length === 0 && parameters.getNoChildrenPlaceholderNode) {
+            return [await parameters.getNoChildrenPlaceholderNode()]
+        }
+
+        if (parameters.sort) {
+            nodes.sort((a, b) => parameters.sort!(a, b))
+        }
+
+        return nodes
+    } catch (error) {
+        const converted = UnknownError.cast(error)
+
+        return [parameters.getErrorNode?.(converted) ?? new TreeShim(createErrorItem(converted))]
+    }
+}
+
+export function createErrorItem(error: Error, message?: string): TreeNode {
+    const command = Logging.instance.viewLogsAtMessage
+    const logId = message ? getLogger().error(`${message}: %s`, error) : getLogger().error(error)
+
+    return command.build(logId).asTreeNode({
+        label: localize('AWS.explorerNode.error.label', 'Failed to load resources (click for logs)'),
+        tooltip: `${error.name}: ${error.message}`,
+        iconPath: addColor(getIcon('vscode-error'), 'testing.iconErrored'),
+        contextValue: 'awsErrorNode',
+    })
+}
+
+export function createPlaceholderItem(message: string): TreeNode {
+    return {
+        id: 'placeholder',
+        resource: message,
+        getTreeItem: () => new vscode.TreeItem(message, vscode.TreeItemCollapsibleState.None),
+    }
+}
+
+export function unboxTreeNode<T>(node: TreeNode, predicate: (resource: unknown) => resource is T): T {
+    if (!predicate(node.resource)) {
+        throw new TypeError(`Unexpected tree node resource for node: ${node.id}`)
+    }
+
+    return node.resource
+}
+
+/**
+ * Wrapper that allows a {@link TreeNode} to be used in the legacy explorer.
+ *
+ * Any new or existing code needs to account for this additional layer as the shim
+ * would be passed in as-is.
+ */
+export class TreeShim<T = unknown> extends AWSTreeNodeBase {
+    private children?: AWSTreeNodeBase[]
+
+    public constructor(public readonly node: TreeNode<T>) {
+        super('Loading...')
+        this.updateTreeItem().catch((e) => {
+            getLogger().error('TreeShim.updateTreeItem() failed: %s', (e as Error).message)
+        })
+
+        this.node.onDidChangeChildren?.(() => {
+            this.children = undefined
+            this.refresh()
+        })
+
+        this.node.onDidChangeTreeItem?.(async () => {
+            const { didRefresh } = await this.updateTreeItem()
+            !didRefresh && this.refresh()
+        })
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        if (this.children) {
+            return this.children
+        }
+
+        const children = (await this.node.getChildren?.()) ?? []
+
+        return (this.children = children.map((n) => new TreeShim(n)))
+    }
+
+    private update(item: vscode.TreeItem) {
+        // We need to explicitly clear state as `vscode.TreeItem` does not need
+        // to have these keys present
+        this.label = undefined
+        this.command = undefined
+        this.tooltip = undefined
+        this.iconPath = undefined
+        this.description = undefined
+        this.contextValue = undefined
+        assign(item, this)
+    }
+
+    private async updateTreeItem(): Promise<{ readonly didRefresh: boolean }> {
+        const item = this.node.getTreeItem()
+        if (item instanceof Promise) {
+            this.update(await item)
+            this.refresh()
+
+            return { didRefresh: true }
+        }
+
+        this.update(item)
+        return { didRefresh: false }
+    }
+}
+
+export function getResourceFromTreeNode<T = unknown>(input: unknown, type: TypeConstructor<T>): T {
+    if (input instanceof TreeShim) {
+        input = input.node
+    }
+
+    if (!isTreeNode(input)) {
+        throw new TypeError('Input was not a tree node')
+    }
+
+    return cast(input.resource, type)
+}
diff --git a/src/shared/typescriptLambdaHandlerSearch.ts b/packages/core/src/shared/typescriptLambdaHandlerSearch.ts
similarity index 94%
rename from src/shared/typescriptLambdaHandlerSearch.ts
rename to packages/core/src/shared/typescriptLambdaHandlerSearch.ts
index 5dcaa6ea713..88e313ce776 100644
--- a/src/shared/typescriptLambdaHandlerSearch.ts
+++ b/packages/core/src/shared/typescriptLambdaHandlerSearch.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -28,7 +28,10 @@ export class TypescriptLambdaHandlerSearch implements LambdaHandlerSearch {
     // _candidateExportNodes - all "export function Xyz()" / "export const Xyz = () => {}"
     private _candidateExportNodes: ts.Node[] = []
 
-    public constructor(private readonly filename: string, private readonly fileContents: string) {
+    public constructor(
+        private readonly filename: string,
+        private readonly fileContents: string
+    ) {
         this._baseFilename = path.parse(this.filename).name
     }
 
@@ -86,7 +89,7 @@ export class TypescriptLambdaHandlerSearch implements LambdaHandlerSearch {
 
             // Arrow Function declarations "const foo = (arg) => { }"
             if (ts.isVariableStatement(node)) {
-                node.declarationList.forEachChild(declaration => {
+                node.declarationList.forEachChild((declaration) => {
                     if (ts.isVariableDeclaration(declaration)) {
                         const declarationName: string = declaration.name.getText()
 
@@ -132,18 +135,18 @@ export class TypescriptLambdaHandlerSearch implements LambdaHandlerSearch {
      */
     private findCandidateHandlersInModuleExports(): RootlessLambdaHandlerCandidate[] {
         return this._candidateModuleExportsExpressions
-            .filter(expression => {
+            .filter((expression) => {
                 return TypescriptLambdaHandlerSearch.isEligibleLambdaHandlerAssignment(
                     expression,
                     this._candidateDeclaredFunctionNames
                 )
             })
-            .map(candidate => {
+            .map((candidate) => {
                 // 'module.exports.xyz' => ['module', 'exports', 'xyz']
                 const lhsComponents: string[] = (candidate.expression as ts.BinaryExpression).left
                     .getText()
                     .split('.')
-                    .map(x => x.trim())
+                    .map((x) => x.trim())
 
                 const exportsTarget: string = lhsComponents[0] === 'exports' ? lhsComponents[1] : lhsComponents[2]
 
@@ -161,9 +164,9 @@ export class TypescriptLambdaHandlerSearch implements LambdaHandlerSearch {
     private findCandidateHandlersInExportDecls(): RootlessLambdaHandlerCandidate[] {
         const handlers: RootlessLambdaHandlerCandidate[] = []
 
-        this._candidateExportDeclarations.forEach(exportDeclaration => {
+        for (const exportDeclaration of this._candidateExportDeclarations) {
             if (exportDeclaration.exportClause) {
-                exportDeclaration.exportClause.forEachChild(clause => {
+                exportDeclaration.exportClause.forEachChild((clause) => {
                     if (ts.isExportSpecifier(clause)) {
                         const exportedFunction: string = clause.name.getText()
 
@@ -177,7 +180,7 @@ export class TypescriptLambdaHandlerSearch implements LambdaHandlerSearch {
                     }
                 })
             }
-        })
+        }
 
         return handlers
     }
@@ -188,7 +191,7 @@ export class TypescriptLambdaHandlerSearch implements LambdaHandlerSearch {
     private findCandidateHandlersInExportedFunctions(): RootlessLambdaHandlerCandidate[] {
         const handlers: RootlessLambdaHandlerCandidate[] = []
 
-        this._candidateExportNodes.forEach(exportNode => {
+        for (const exportNode of this._candidateExportNodes) {
             if (
                 ts.isFunctionLike(exportNode) &&
                 TypescriptLambdaHandlerSearch.isFunctionLambdaHandlerCandidate(exportNode) &&
@@ -200,7 +203,7 @@ export class TypescriptLambdaHandlerSearch implements LambdaHandlerSearch {
                     range: getRange(exportNode),
                 })
             } else if (ts.isVariableStatement(exportNode)) {
-                exportNode.declarationList.forEachChild(declaration => {
+                exportNode.declarationList.forEachChild((declaration) => {
                     if (
                         ts.isVariableDeclaration(declaration) &&
                         !!declaration.initializer &&
@@ -215,7 +218,7 @@ export class TypescriptLambdaHandlerSearch implements LambdaHandlerSearch {
                     }
                 })
             }
-        })
+        }
 
         return handlers
     }
@@ -229,7 +232,7 @@ export class TypescriptLambdaHandlerSearch implements LambdaHandlerSearch {
             const lhsComponents: string[] = expressionStatement.expression.left
                 .getText()
                 .split('.')
-                .map(x => x.trim())
+                .map((x) => x.trim())
 
             return (
                 (lhsComponents.length === 3 && lhsComponents[0] === 'module' && lhsComponents[1] === 'exports') ||
@@ -303,6 +306,7 @@ export class TypescriptLambdaHandlerSearch implements LambdaHandlerSearch {
     private static isNodeExported(node: ts.Node): boolean {
         const flags: ts.ModifierFlags = ts.getCombinedModifierFlags(node as ts.Declaration)
 
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
         return (flags & ts.ModifierFlags.Export) === ts.ModifierFlags.Export
     }
 
diff --git a/src/shared/ui/buttons.ts b/packages/core/src/shared/ui/buttons.ts
similarity index 80%
rename from src/shared/ui/buttons.ts
rename to packages/core/src/shared/ui/buttons.ts
index 6859c63f343..fdc5efb004a 100644
--- a/src/shared/ui/buttons.ts
+++ b/packages/core/src/shared/ui/buttons.ts
@@ -1,16 +1,18 @@
 /*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as vscode from 'vscode'
 import * as nls from 'vscode-nls'
-import { documentationUrl } from '../constants'
 import { getIcon } from '../icons'
 import { WizardControl, WIZARD_EXIT, WIZARD_RETRY } from '../wizards/wizard'
+import { getDocUrl, getIdeProperties } from '../extensionUtilities'
+import { openUrl } from '../utilities/vsCodeUtils'
 
 const localize = nls.loadMessageBundle()
 const helpTooltip = localize('AWS.command.help', 'View Toolkit Documentation')
+const awsConsoleTooltip = () => localize('AWS.button.awsConsole', 'Open {0} Console', getIdeProperties().company)
 
 type WizardButton<T> = QuickInputButton<T | WizardControl> | QuickInputButton<void>
 export type PrompterButtons<T> = readonly WizardButton<T>[]
@@ -27,10 +29,9 @@ export interface QuickInputButton<T> extends vscode.QuickInputButton {
  *
  * @param uri Opens the URI upon clicking
  * @param tooltip Optional tooltip for button
- * @param url Optional URL to open when button is clicked
  */
 export function createHelpButton(
-    uri: string | vscode.Uri = documentationUrl,
+    uri: string | vscode.Uri = getDocUrl(),
     tooltip: string = helpTooltip
 ): QuickInputLinkButton {
     const iconPath = getIcon('vscode-help')
@@ -50,7 +51,7 @@ export class QuickInputLinkButton implements QuickInputButton<void> {
     }
 
     public onClick(): void {
-        vscode.env.openExternal(this.uri)
+        void openUrl(this.uri)
     }
 }
 
@@ -109,6 +110,14 @@ export function createBackButton(): QuickInputButton<WizardControl> {
     return vscode.QuickInputButtons.Back as QuickInputButton<WizardControl>
 }
 
+export function createAwsConsoleButton(
+    uri: string | vscode.Uri,
+    tooltip: string = awsConsoleTooltip()
+): QuickInputLinkButton {
+    const iconPath = getIcon('vscode-link-external')
+    return new QuickInputLinkButton(uri, iconPath, tooltip)
+}
+
 export function createExitButton(): QuickInputButton<WizardControl> {
     return {
         iconPath: getIcon('vscode-close'),
@@ -137,8 +146,14 @@ export function createPlusButton(tooltip?: string): QuickInputButton<void> {
  * Currently has: 'help', 'exit', and 'back'
  *
  * @param helpUri optional URI to link to for the 'help' button (see {@link createHelpButton} for defaults)
+ * @param awsConsoleUri optional URI to AWS web console
  * @returns An array of buttons
  */
-export function createCommonButtons(helpUri?: string | vscode.Uri): PrompterButtons<WizardControl> {
-    return [createHelpButton(helpUri), createBackButton(), createExitButton()]
+export function createCommonButtons(
+    helpUri?: string | vscode.Uri,
+    awsConsoleUri?: string | vscode.Uri
+): PrompterButtons<WizardControl> {
+    const buttons2 = [createHelpButton(helpUri), createBackButton(), createExitButton()]
+    const buttons1: typeof buttons2 = awsConsoleUri ? [createAwsConsoleButton(awsConsoleUri)] : []
+    return buttons1.concat(buttons2)
 }
diff --git a/src/shared/ui/common/exitPrompter.ts b/packages/core/src/shared/ui/common/exitPrompter.ts
similarity index 94%
rename from src/shared/ui/common/exitPrompter.ts
rename to packages/core/src/shared/ui/common/exitPrompter.ts
index 3e42fdb5517..a171ac91bf4 100644
--- a/src/shared/ui/common/exitPrompter.ts
+++ b/packages/core/src/shared/ui/common/exitPrompter.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/src/shared/ui/common/location.ts b/packages/core/src/shared/ui/common/location.ts
similarity index 97%
rename from src/shared/ui/common/location.ts
rename to packages/core/src/shared/ui/common/location.ts
index f9c058ad2af..549abd7a31c 100644
--- a/src/shared/ui/common/location.ts
+++ b/packages/core/src/shared/ui/common/location.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/src/shared/ui/common/openDialog.ts b/packages/core/src/shared/ui/common/openDialog.ts
similarity index 94%
rename from src/shared/ui/common/openDialog.ts
rename to packages/core/src/shared/ui/common/openDialog.ts
index 5d04ca06a4a..5ec274f764a 100644
--- a/src/shared/ui/common/openDialog.ts
+++ b/packages/core/src/shared/ui/common/openDialog.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -50,5 +50,5 @@ export function createMultiFileDialog(options?: DialogOptions): Prompter<vscode.
 
 export function createSingleFileDialog(options?: DialogOptions): Prompter<vscode.Uri> {
     const defaultUri = vscode.workspace.workspaceFolders?.[0]?.uri
-    return new OpenDialogPrompter({ defaultUri, ...options, canSelectMany: false }).transform(r => r[0])
+    return new OpenDialogPrompter({ defaultUri, ...options, canSelectMany: false }).transform((r) => r[0])
 }
diff --git a/packages/core/src/shared/ui/common/region.ts b/packages/core/src/shared/ui/common/region.ts
new file mode 100644
index 00000000000..41f5fb20c7c
--- /dev/null
+++ b/packages/core/src/shared/ui/common/region.ts
@@ -0,0 +1,65 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../../extensionGlobals'
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as vscode from 'vscode'
+import { getLogger } from '../../logger/logger'
+import { Region } from '../../regions/endpoints'
+import { createCommonButtons, PrompterButtons } from '../buttons'
+import { createQuickPick, QuickPickPrompter } from '../pickerPrompter'
+
+interface RegionPrompterOptions {
+    readonly defaultRegion?: string
+    readonly title?: string
+    readonly buttons?: PrompterButtons<Region>
+    readonly serviceFilter?: string
+    readonly helpUrl?: string | vscode.Uri
+    readonly placeholder?: string
+}
+
+export function createRegionPrompter(
+    regions = globals.regionProvider.getRegions(),
+    options: RegionPrompterOptions = {}
+): QuickPickPrompter<Region> {
+    const defaultRegion = options.defaultRegion ?? globals.regionProvider.defaultRegionId
+    const filteredRegions = regions.filter(
+        (r) => !options.serviceFilter || globals.regionProvider.isServiceInRegion(options.serviceFilter, r.id)
+    )
+
+    const lastRegion = globals.globalState.tryGet<Region>('lastSelectedRegion', Object)
+    const items = filteredRegions.map((region) => ({
+        label: region.name,
+        detail: region.id,
+        data: region,
+        skipEstimate: true,
+        description: '',
+        recentlyUsed: region.id === lastRegion?.id,
+    }))
+
+    const defaultRegionItem = items.find((item) => item.detail === defaultRegion)
+
+    if (defaultRegionItem !== undefined && !defaultRegionItem.recentlyUsed) {
+        defaultRegionItem.description = localize('AWS.generic.defaultRegion', '(default region)')
+    }
+
+    const prompter = createQuickPick(items, {
+        title: options.title ?? localize('AWS.generic.selectRegion', 'Select a region'),
+        buttons: options.buttons ?? createCommonButtons(options.helpUrl),
+        matchOnDetail: true,
+        compare: (a, b) => {
+            return a.detail === defaultRegion ? -1 : b.detail === defaultRegion ? 1 : 0
+        },
+    })
+
+    return prompter.transform((item) => {
+        getLogger().debug('createRegionPrompter: selected %O', item)
+        globals.globalState.tryUpdate('lastSelectedRegion', item)
+        return item
+    })
+}
diff --git a/packages/core/src/shared/ui/common/regionSubmenu.ts b/packages/core/src/shared/ui/common/regionSubmenu.ts
new file mode 100644
index 00000000000..a922ddf7583
--- /dev/null
+++ b/packages/core/src/shared/ui/common/regionSubmenu.ts
@@ -0,0 +1,136 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import globals from '../../extensionGlobals'
+import { isValidResponse, StepEstimator } from '../../wizards/wizard'
+import { createQuickPick, DataQuickPickItem, ExtendedQuickPickOptions, ItemLoadTypes } from '../pickerPrompter'
+import { Prompter, PromptResult } from '../prompter'
+import { createRegionPrompter } from './region'
+import { QuickPickPrompter } from '../pickerPrompter'
+import { Region } from '../../regions/endpoints'
+import { createRefreshButton } from '../buttons'
+import { getLogger } from '../../logger/logger'
+
+const switchRegion = Symbol('switchRegion')
+
+export interface RegionSubmenuResponse<T> {
+    readonly region: string
+    readonly data: T
+}
+
+export class RegionSubmenu<T> extends Prompter<RegionSubmenuResponse<T>> {
+    private currentState: 'data' | 'region' = 'data'
+    private steps?: [current: number, total: number]
+    public activePrompter?: QuickPickPrompter<typeof switchRegion | T> | QuickPickPrompter<Region>
+    private readonly defaultItems: DataQuickPickItem<typeof switchRegion | T>[] = [
+        {
+            label: 'Actions',
+            kind: vscode.QuickPickItemKind.Separator,
+            data: undefined,
+        },
+        {
+            label: 'Switch Region',
+            data: switchRegion,
+            description: `current region: ${this.currentRegion}`,
+        },
+        {
+            label: this.separatorLabel,
+            kind: vscode.QuickPickItemKind.Separator,
+            data: undefined,
+        },
+    ]
+
+    public constructor(
+        private readonly itemsProvider: (region: string) => ItemLoadTypes<T>,
+        private readonly dataOptions?: ExtendedQuickPickOptions<T>,
+        private readonly regionOptions?: ExtendedQuickPickOptions<T>,
+        private readonly separatorLabel: string = 'Items',
+        private currentRegion = globals.regionProvider.guessDefaultRegion() ?? globals.regionProvider.defaultRegionId
+    ) {
+        super()
+    }
+
+    public refresh(prompter: QuickPickPrompter<T | typeof switchRegion>): void {
+        // This method cannot be async due to onClick() specifications. Thus we are forced to use .then, .catch as workaround.
+        const activeBefore = prompter.quickPick.activeItems
+        prompter
+            .clearAndLoadItems(this.itemsProvider(this.currentRegion))
+            .then(() => {
+                prompter.quickPick.items = [...this.defaultItems, ...prompter.quickPick.items]
+                prompter.quickPick.activeItems = activeBefore
+            })
+            .catch((e) => {
+                getLogger().error('clearAndLoadItems failed: %s', (e as Error).message)
+            })
+    }
+
+    private createMenuPrompter() {
+        const refreshButton = createRefreshButton()
+        const items = this.itemsProvider(this.currentRegion)
+        const prompter = createQuickPick<T | typeof switchRegion>(items, {
+            ...this.dataOptions,
+            buttons: [...(this.dataOptions?.buttons ?? []), refreshButton],
+        } as ExtendedQuickPickOptions<T | typeof switchRegion>)
+
+        prompter.quickPick.items = [...this.defaultItems, ...prompter.quickPick.items]
+
+        refreshButton.onClick = () => this.refresh(prompter)
+
+        return prompter
+    }
+
+    private switchState(newState: 'data' | 'region') {
+        this.currentState = newState
+    }
+
+    protected async promptUser(): Promise<PromptResult<RegionSubmenuResponse<T>>> {
+        while (true) {
+            switch (this.currentState) {
+                case 'data': {
+                    const prompter = (this.activePrompter = this.createMenuPrompter())
+                    this.steps && prompter.setSteps(this.steps[0], this.steps[1])
+
+                    const resp = await prompter.prompt()
+                    if (resp === switchRegion) {
+                        this.switchState('region')
+                    } else if (isValidResponse(resp)) {
+                        return { region: this.currentRegion, data: resp }
+                    } else {
+                        return resp
+                    }
+
+                    break
+                }
+                case 'region': {
+                    const prompter = (this.activePrompter = createRegionPrompter(undefined, {
+                        defaultRegion: this.currentRegion,
+                        ...this.regionOptions,
+                    }))
+
+                    const resp = await prompter.prompt()
+                    if (isValidResponse(resp)) {
+                        this.currentRegion = resp.id
+                    }
+
+                    this.switchState('data')
+
+                    break
+                }
+            }
+        }
+    }
+
+    public setSteps(current: number, total: number): void {
+        this.steps = [current, total]
+    }
+
+    // Unused
+    public get recentItem(): any {
+        return
+    }
+
+    public set recentItem(response: any) {}
+    public setStepEstimator(estimator: StepEstimator<RegionSubmenuResponse<T>>): void {}
+}
diff --git a/packages/core/src/shared/ui/common/roles.ts b/packages/core/src/shared/ui/common/roles.ts
new file mode 100644
index 00000000000..47ff63db9c8
--- /dev/null
+++ b/packages/core/src/shared/ui/common/roles.ts
@@ -0,0 +1,94 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { IamClient, IamRole } from '../../clients/iam'
+import { createCommonButtons, createPlusButton, createRefreshButton } from '../buttons'
+import { createQuickPick, DataQuickPickItem, QuickPickPrompter } from '../pickerPrompter'
+import * as nls from 'vscode-nls'
+import * as vscode from 'vscode'
+import { getLogger } from '../../logger/logger'
+import { showViewLogsMessage } from '../../utilities/messages'
+import { WIZARD_BACK } from '../../wizards/wizard'
+
+const localize = nls.loadMessageBundle()
+
+const createRoleTooltip = localize('AWS.generic.createRole', 'Create Role...')
+
+interface RolePrompterOptions {
+    readonly title?: string
+    readonly helpUrl?: string | vscode.Uri
+    readonly noRoleDetail?: string
+    readonly roleFilter?: (role: IamRole) => boolean
+    readonly createRole?: () => Promise<IamRole>
+}
+
+export function createRolePrompter(client: IamClient, options: RolePrompterOptions = {}): QuickPickPrompter<IamRole> {
+    const placeholderItem: DataQuickPickItem<IamRole> = {
+        label: localize('AWS.rolePrompter.noRoles.title', 'No valid roles found'),
+        data: WIZARD_BACK,
+        detail: options.noRoleDetail,
+    }
+
+    const loadItems = () => {
+        const filterRoles = (roles: IamRole[]) => (options.roleFilter ? roles.filter(options.roleFilter) : roles)
+
+        return client
+            .getRoles()
+            .map(filterRoles)
+            .map((roles) =>
+                roles.map((r) => ({
+                    label: r.RoleName,
+                    data: r,
+                }))
+            )
+    }
+
+    const buttons = [
+        { ...createRefreshButton(), onClick: () => void prompter.clearAndLoadItems(loadItems()) },
+        ...createCommonButtons(options.helpUrl),
+    ]
+
+    const prompter = createQuickPick(loadItems(), {
+        buttons,
+        title: options.title,
+        noItemsFoundItem: placeholderItem,
+        placeholder: localize('AWS.rolePrompter.placeholder', 'Select an IAM role'),
+    })
+
+    return addCreateRoleButton(prompter, options.createRole)
+}
+
+function addCreateRoleButton(
+    prompter: QuickPickPrompter<IamRole>,
+    createRole: RolePrompterOptions['createRole']
+): typeof prompter {
+    if (!createRole) {
+        return prompter
+    }
+
+    const makeRole = () => {
+        const items = createRole()
+            .then((role) => [{ label: role.RoleName, data: role }])
+            .catch((err) => {
+                getLogger().error('role prompter: Failed to create new role: %s', err)
+                void showViewLogsMessage(localize('AWS.rolePrompter.createRole.failed', 'Failed to create new role'))
+                return []
+            })
+
+        prompter.loadItems(items).catch((e) => {
+            getLogger().error('addCreateRoleButton: loadItems() failed: %s', (e as Error).message)
+        })
+    }
+
+    prompter.quickPick.buttons = [
+        {
+            ...createPlusButton(createRoleTooltip),
+            onClick: makeRole,
+        },
+        ...prompter.quickPick.buttons,
+    ]
+
+    return prompter
+}
diff --git a/packages/core/src/shared/ui/common/skipPrompter.ts b/packages/core/src/shared/ui/common/skipPrompter.ts
new file mode 100644
index 00000000000..b99b952de0f
--- /dev/null
+++ b/packages/core/src/shared/ui/common/skipPrompter.ts
@@ -0,0 +1,27 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { StepEstimator, WIZARD_SKIP } from '../../wizards/wizard'
+import { Prompter, PromptResult } from '../prompter'
+
+/** Prompter that returns SKIP control signal to parent wizard */
+export class SkipPrompter<T> extends Prompter<T> {
+    constructor() {
+        super()
+    }
+
+    protected async promptUser(): Promise<PromptResult<T>> {
+        return WIZARD_SKIP
+    }
+
+    public get recentItem(): any {
+        return undefined
+    }
+
+    public set recentItem(response: string | undefined) {}
+
+    public setSteps(current: number, total: number): void {}
+    public setStepEstimator(estimator: StepEstimator<T>): void {}
+}
diff --git a/packages/core/src/shared/ui/common/variablesPrompter.ts b/packages/core/src/shared/ui/common/variablesPrompter.ts
new file mode 100644
index 00000000000..c839989a93e
--- /dev/null
+++ b/packages/core/src/shared/ui/common/variablesPrompter.ts
@@ -0,0 +1,96 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { showViewLogsMessage } from '../../utilities/messages'
+import { WIZARD_RETRY } from '../../wizards/wizard'
+import { createQuickPick, DataQuickPickItem, QuickPickPrompter } from '../pickerPrompter'
+import * as nls from 'vscode-nls'
+import { PrompterButtons } from '../buttons'
+import { promisifyThenable } from '../../utilities/vsCodeUtils'
+import fs from '../../fs/fs'
+
+const localize = nls.loadMessageBundle()
+
+function isMatchArray(obj: any): obj is RegExpMatchArray {
+    return obj !== undefined && (obj.groups !== undefined || Array.isArray(obj))
+}
+
+function unquote(str: string): string {
+    const isSingleQuoted = str[0] === "'" && str[str.length - 1] === "'"
+    const isDoubleQuoted = str[0] === '"' && str[str.length - 1] === '"'
+
+    if (isSingleQuoted || isDoubleQuoted) {
+        str = str.slice(1, -1)
+    }
+
+    if (isDoubleQuoted) {
+        str = str.replace(/\\n/g, '\n')
+    }
+
+    return str
+}
+
+function parseEnvFile(contents: string): { [key: string]: string } {
+    return contents
+        .split(/\r?\n/)
+        .map((line) => line.match(/^\s*([\w.-]+)\s*=\s*(.*)?\s*$/))
+        .filter(isMatchArray)
+        .map((match) => ({ [match[1]]: unquote(match[2] ?? '').trim() }))
+        .reduce((a, b) => Object.assign(a, b))
+}
+
+// TODO: create key/value pair prompter
+// Format:
+// [TITLE]       [+][-][?]
+// + button calls new prompter to set key/value pair
+// - button removes currently highlighted pair
+// also add a 'load from file' button (always show)
+// there will be a 'Done' button that returns the resulting list (always show)
+// each input would be label: key description: value
+
+/**
+ * Creates a optional prompt for environment variables.
+ *
+ * Currently, the only accepted file format are `.env` files:
+ * KEY1=VALUE2
+ * KEY2=VALUE2
+ * ...
+ *
+ * @param buttons Optional buttons to add
+ * @returns A {@link QuickPickPrompter} that returns data in the shape of Node's process `env` variable
+ */
+export function createVariablesPrompter(
+    buttons?: PrompterButtons<string>
+): QuickPickPrompter<{ [name: string]: string }> {
+    const openDialog = async () => {
+        try {
+            const resp = await promisifyThenable(vscode.window.showOpenDialog({ canSelectMany: false }))
+            if (resp === undefined) {
+                throw new Error('Closed dialog')
+            }
+            const path = resp[0].fsPath
+            const contents = await fs.readFileBytes(path)
+            return parseEnvFile(contents.toString())
+        } catch (err) {
+            if ((err as Error).message !== 'Closed dialog') {
+                void showViewLogsMessage(
+                    localize('AWS.environmentVariables.prompt.failed', 'Failed to read environment variables')
+                )
+            }
+            return WIZARD_RETRY
+        }
+    }
+
+    const items: DataQuickPickItem<{ [name: string]: string }>[] = [
+        { label: localize('AWS.generic.skip', 'Skip'), data: {} },
+        { label: localize('AWS.generic.useFile', 'Use file...'), data: openDialog, skipEstimate: true },
+    ]
+
+    return createQuickPick<{ [name: string]: string }>(items, {
+        title: localize('AWS.environmentVariables.prompt.title', 'Configure environment variables'),
+        buttons: buttons,
+    })
+}
diff --git a/src/shared/ui/input.ts b/packages/core/src/shared/ui/input.ts
similarity index 95%
rename from src/shared/ui/input.ts
rename to packages/core/src/shared/ui/input.ts
index 7e10feda26e..4f252fdf8e5 100644
--- a/src/shared/ui/input.ts
+++ b/packages/core/src/shared/ui/input.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -106,7 +106,7 @@ export async function promptUser({
 
             if (onValidateInput) {
                 inputBox.onDidChangeValue(
-                    value => {
+                    (value) => {
                         inputBox.validationMessage = onValidateInput(value)
                     },
                     inputBox,
@@ -127,7 +127,9 @@ export async function promptUser({
 
         return response
     } finally {
-        disposables.forEach(d => d.dispose() as void)
+        for (const d of disposables) {
+            d.dispose() as void
+        }
         inputBox.hide()
     }
 }
diff --git a/packages/core/src/shared/ui/inputPrompter.ts b/packages/core/src/shared/ui/inputPrompter.ts
new file mode 100644
index 00000000000..88292f9d43d
--- /dev/null
+++ b/packages/core/src/shared/ui/inputPrompter.ts
@@ -0,0 +1,165 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { assign } from '../utilities/collectionUtils'
+import { isValidResponse, StepEstimator, WIZARD_BACK, WIZARD_EXIT } from '../wizards/wizard'
+import { QuickInputButton, PrompterButtons } from './buttons'
+import { Prompter, PromptResult } from './prompter'
+
+// TODO: allow `validateInput` to return a Thenable so we don't need to omit it from the options
+/** Additional options to configure the `InputBox` beyond the standard API */
+export type ExtendedInputBoxOptions = Omit<vscode.InputBoxOptions, 'validateInput' | 'placeHolder'> & {
+    title?: string
+    step?: number
+    placeholder?: string
+    totalSteps?: number
+    buttons?: PrompterButtons<string>
+    /**
+     * XXX: Thenable/promises won't be awaited by vscode (currently)?
+     * - https://github.com/microsoft/vscode/blob/78947444843f4ebb094e5ab4288360010a293463/extensions/git-base/src/remoteSource.ts#L13
+     * - https://github.com/microsoft/vscode/blob/78947444843f4ebb094e5ab4288360010a293463/src/vs/base/browser/ui/inputbox/inputBox.ts#L511
+     */
+    validateInput?(value: string, isFinalInput?: boolean): string | undefined
+}
+
+export type InputBox = Omit<vscode.InputBox, 'buttons'> & { buttons: PrompterButtons<string> }
+
+export const defaultInputboxOptions: vscode.InputBoxOptions = {
+    ignoreFocusOut: true,
+}
+
+/**
+ * Creates a new input box UI element.
+ *
+ * @param options Customizes the InputBox and InputBoxPrompter.
+ * @returns An {@link InputBoxPrompter}. This can be used directly with the `prompt` method or can be fed into a Wizard.
+ */
+export function createInputBox(options?: ExtendedInputBoxOptions): InputBoxPrompter {
+    const inputBox = vscode.window.createInputBox() as InputBox
+    assign(
+        {
+            ...defaultInputboxOptions,
+            ...options,
+            valueSelection: options?.valueSelection as InputBox['valueSelection'],
+        },
+        inputBox
+    )
+    inputBox.buttons = options?.buttons ?? []
+
+    const prompter = new InputBoxPrompter(inputBox)
+
+    if (options?.validateInput !== undefined) {
+        prompter.setValidation((input, isFinalInput) => options.validateInput!(input, isFinalInput))
+    }
+
+    return prompter
+}
+
+export async function showInputBox(options?: ExtendedInputBoxOptions): Promise<string | undefined> {
+    const prompter = createInputBox(options)
+    const response = await prompter.prompt()
+
+    return isValidResponse(response) ? response : undefined
+}
+
+/**
+ * @param value User input
+ * @param isFinalInput true if the value was the final input (onDidAccept),
+ *        false if this input is being typed by the user. For expensive validation
+ *        (e.g. performs a service/SDK call) the validator can use this to skip
+ *        validation until the input is confirmed (user hit "Enter").
+ */
+type ValidateFn = (value: string, isFinalInput: boolean) => string | undefined
+// XXX: Thenable/promises won't be awaited by vscode (currently)?
+// - https://github.com/microsoft/vscode/blob/78947444843f4ebb094e5ab4288360010a293463/extensions/git-base/src/remoteSource.ts#L13
+// - https://github.com/microsoft/vscode/blob/78947444843f4ebb094e5ab4288360010a293463/src/vs/base/browser/ui/inputbox/inputBox.ts#L511
+// type ValidateFn = (value: string, isFinalInput: boolean) => string | undefined | Thenable<string | undefined>
+
+/**
+ * UI element that accepts user-inputted text. Wraps around {@link vscode.InputBox InputBox}.
+ *
+ * See {@link createInputBox} for easy creation of instances of this class.
+ */
+export class InputBoxPrompter extends Prompter<string> {
+    private _lastResponse?: string
+    private validateEvents: vscode.Disposable[] = []
+
+    public set recentItem(response: string | undefined) {
+        this._lastResponse = typeof response === 'string' ? response : this._lastResponse
+        this.inputBox.value = this._lastResponse ?? ''
+    }
+
+    public get recentItem(): string | undefined {
+        return this._lastResponse
+    }
+
+    constructor(
+        public readonly inputBox: InputBox,
+        protected readonly options: ExtendedInputBoxOptions = {}
+    ) {
+        super()
+    }
+
+    public setSteps(current: number, total: number): void {
+        this.inputBox.step = current
+        this.inputBox.totalSteps = total
+    }
+
+    /**
+     * Sets a validation hook into the InputBox, checking whenever the input changes or when the user
+     * attempts to submit their response.
+     *
+     * @param validate Validator function.
+     */
+    public setValidation(validate: ValidateFn): void {
+        for (const d of this.validateEvents) {
+            d.dispose()
+        }
+        this.validateEvents = []
+
+        this.inputBox.onDidChangeValue(
+            (value) => (this.inputBox.validationMessage = validate(value, false)),
+            undefined,
+            this.validateEvents
+        )
+        this.inputBox.onDidAccept(
+            () => (this.inputBox.validationMessage = validate(this.inputBox.value, true)),
+            undefined,
+            this.validateEvents
+        )
+    }
+
+    protected async promptUser(): Promise<PromptResult<string>> {
+        const promptPromise = new Promise<PromptResult<string>>((resolve) => {
+            this.inputBox.onDidAccept(() => {
+                this.recentItem = this.inputBox.value
+                if (!this.inputBox.validationMessage) {
+                    resolve(this.inputBox.value)
+                }
+            })
+            this.inputBox.onDidHide(() => resolve(WIZARD_EXIT))
+            this.inputBox.onDidTriggerButton((button) => {
+                if (button === vscode.QuickInputButtons.Back) {
+                    resolve(WIZARD_BACK)
+                } else if ((button as QuickInputButton<string>).onClick !== undefined) {
+                    const response = (button as QuickInputButton<string>).onClick!()
+                    if (response !== undefined) {
+                        resolve(response)
+                    }
+                }
+            })
+            this.inputBox.show()
+        }).finally(() => {
+            this.inputBox.dispose()
+        })
+
+        return await promptPromise
+    }
+
+    public setStepEstimator(estimator: StepEstimator<string>): void {
+        // TODO: implement this
+    }
+}
diff --git a/src/shared/ui/picker.ts b/packages/core/src/shared/ui/picker.ts
similarity index 95%
rename from src/shared/ui/picker.ts
rename to packages/core/src/shared/ui/picker.ts
index abc189aad65..32f90421ba1 100644
--- a/src/shared/ui/picker.ts
+++ b/packages/core/src/shared/ui/picker.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -7,7 +7,7 @@ import * as vscode from 'vscode'
 import * as nls from 'vscode-nls'
 const localize = nls.loadMessageBundle()
 
-import { getLogger } from '../logger'
+import { getLogger } from '../logger/logger'
 import { IteratorTransformer } from '../utilities/collectionUtils'
 import { createRefreshButton } from './buttons'
 
@@ -47,6 +47,7 @@ export function createQuickPick<T extends vscode.QuickPickItem>({
     buttons?: vscode.QuickInputButton[]
 }): vscode.QuickPick<T> {
     const picker = vscode.window.createQuickPick<T>()
+    picker.keepScrollPosition = true
 
     if (options) {
         picker.title = options.title
@@ -134,7 +135,9 @@ export async function promptUser<T extends vscode.QuickPickItem>({
 
         return response
     } finally {
-        disposables.forEach(d => d.dispose() as void)
+        for (const d of disposables) {
+            d.dispose() as void
+        }
         picker.hide()
     }
 }
@@ -182,7 +185,7 @@ export class IteratingQuickPickController<TResponse> {
     }
     // eslint-disable-next-line @typescript-eslint/naming-convention
     public static readonly ERROR_ITEM: vscode.QuickPickItem = {
-        label: localize('AWS.picker.dynamic.errorNode.label', 'There was an error retrieving more items.'),
+        label: localize('AWS.picker.dynamic.errorNode.label', 'Failed to load more items.'),
         alwaysShow: true,
     }
 
@@ -236,7 +239,9 @@ export class IteratingQuickPickController<TResponse> {
             getLogger().debug('IteratingQuickPickController is already done iterating. Call reset() and start again')
             return
         }
-        this.loadItems()
+        this.loadItems().catch((e) => {
+            getLogger().error('IteratingQuickPickController: loadItems failed: %s', (e as Error).message)
+        })
     }
 
     /**
@@ -245,7 +250,7 @@ export class IteratingQuickPickController<TResponse> {
     public async reset(): Promise<void> {
         // Promise is necessary to ensure that cancelExecutionFn() is called to completion before reset() completes.
         // Open to suggestions if you know a better way to do this.
-        await new Promise<void>(resolve => {
+        await new Promise<void>((resolve) => {
             getLogger().debug('Resetting IteratingQuickPickController and cancelling any current execution')
 
             if (this.state.cancelExecutionFn) {
@@ -298,16 +303,16 @@ export class IteratingQuickPickController<TResponse> {
                     new Promise<IteratorResult<vscode.QuickPickItem[], any>>((resolve, reject) => {
                         this.state.iterator
                             .next()
-                            .then(newItems => {
+                            .then((newItems) => {
                                 getLogger().debug(`Returning a payload of size: ${newItems.value.length}`)
                                 resolve(newItems)
                             })
-                            .catch(e => {
+                            .catch((e) => {
                                 // append error node
                                 // give quickpick item an error message
                                 // we should not blow away the existing items, they should still be viable
                                 const err = e as Error
-                                getLogger().error('Error while loading items for IteratingQuickPickController:', err)
+                                getLogger().error('Error while loading items for IteratingQuickPickController: %O', err)
                                 resolve({
                                     value: [
                                         {
diff --git a/packages/core/src/shared/ui/pickerPrompter.ts b/packages/core/src/shared/ui/pickerPrompter.ts
new file mode 100644
index 00000000000..eaf4a4e6b4c
--- /dev/null
+++ b/packages/core/src/shared/ui/pickerPrompter.ts
@@ -0,0 +1,769 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+
+import { isValidResponse, isWizardControl, StepEstimator, WIZARD_BACK, WIZARD_EXIT } from '../wizards/wizard'
+import { QuickInputButton, PrompterButtons } from './buttons'
+import { Prompter, PromptResult, Transform } from './prompter'
+import { assign, isAsyncIterable } from '../utilities/collectionUtils'
+import { recentlyUsed } from '../localizedText'
+import { getLogger } from '../logger/logger'
+import { openUrl } from '../utilities/vsCodeUtils'
+import { MetadataManager } from '../../awsService/appBuilder/serverlessLand/metadataManager'
+
+const localize = nls.loadMessageBundle()
+
+/** Settings applied when using a QuickPickPrompter in 'filter-box input' mode. */
+interface FilterBoxInputSettings<T> {
+    /** The label of the new QuickPickItem generated by the user's input. */
+    label: string
+    /** Parses the user's input into a the desired type. */
+    transform: (v: string) => PromptResult<T>
+    /** The inverse must be provided if using implicit state. */
+    inverse?: (output: PromptResult<T>) => string
+    /**
+     * Checks for any errors in the input.
+     * Returned strings are shown in the 'detail' part of the user-input QuickPickItem.
+     */
+    validator?: (input: string) => string | undefined
+}
+
+/**
+ * Options to configure the `QuickPick` beyond `vscode.QuickPickOptions`.
+ *
+ * @note Use transform() instead of onDidSelectItem().
+ *
+ */
+export type ExtendedQuickPickOptions<T> = Omit<
+    vscode.QuickPickOptions,
+    // TODO: remove 'canPickMany' from Omit and implement/test functionality with multiple QuickPick items.
+    'canPickMany' | 'placeHolder' | 'onDidSelectItem'
+> & {
+    title?: string
+    value?: string
+    step?: number
+    placeholder?: string
+    totalSteps?: number
+    buttons?: PrompterButtons<T>
+    /**
+     * Setting this option will enable 'filter-box input' mode, allowing the user to create their own QuickInputItem
+     * using the filter box as input.
+     */
+    filterBoxInputSettings?: FilterBoxInputSettings<T>
+    /** Used to sort QuickPick items after loading new ones */
+    compare?: (a: DataQuickPickItem<T>, b: DataQuickPickItem<T>) => number
+    /** [NOT IMPLEMENTED] Item to show while items are loading */
+    loadingItem?: DataQuickPickItem<T>
+    /** Item to show if no items were loaded */
+    noItemsFoundItem?: DataQuickPickItem<T>
+    // TODO: this could optionally be a callback accepting the error and returning an item
+    /** Item to show if there was an error loading items */
+    errorItem?: DataQuickPickItem<T>
+    /** Description for recently used item */
+    recentlyUsed?: string
+    /** Defined on `vscode.QuickPick` but not `vscode.QuickPickOptions` 🤷 */
+    keepScrollPosition?: boolean
+}
+
+/** See {@link ExtendedQuickPickOptions.noItemsFoundItem noItemsFoundItem} for setting a different item */
+const defaultNoItemsItem = {
+    label: localize('AWS.picker.dynamic.noItemsFound.label', '[No items found]'),
+    detail: localize('AWS.picker.dynamic.noItemsFound.detail', 'Click here to go back'),
+    alwaysShow: true,
+    data: WIZARD_BACK,
+}
+
+/** See {@link ExtendedQuickPickOptions.errorItem errorItem} for setting a different error item */
+const defaultErrorItem = {
+    // TODO: add icon, check for C9
+    label: localize('AWS.picker.dynamic.error.label', '[Error loading items]'),
+    alwaysShow: true,
+    data: WIZARD_BACK,
+}
+
+export const defaultQuickpickOptions: ExtendedQuickPickOptions<any> = {
+    ignoreFocusOut: true,
+    noItemsFoundItem: defaultNoItemsItem,
+    errorItem: defaultErrorItem,
+    keepScrollPosition: true,
+}
+
+type QuickPickData<T> = PromptResult<T> | (() => Promise<PromptResult<T>>)
+type LabelQuickPickItem<T> = vscode.QuickPickItem & { label: T }
+
+/**
+ * Attaches additional information as `data` to a QuickPickItem. Alternatively, `data` can be a function that
+ * returns a Promise, evaluated after the user selects the item.
+ */
+export type DataQuickPickItem<T> = vscode.QuickPickItem & {
+    data: QuickPickData<T>
+    invalidSelection?: boolean
+    onClick?: () => any | Promise<any>
+    /** Stops the QuickPick from estimating how many steps an item would add in a Wizard flow */
+    skipEstimate?: boolean
+    recentlyUsed?: boolean
+}
+
+export type DataQuickPick<T> = Omit<vscode.QuickPick<DataQuickPickItem<T>>, 'buttons'> & { buttons: PrompterButtons<T> }
+
+export const customUserInput = Symbol()
+
+export function isDataQuickPickItem(obj: any): obj is DataQuickPickItem<any> {
+    return typeof obj === 'object' && typeof (obj as vscode.QuickPickItem).label === 'string' && 'data' in obj
+}
+
+/**
+ * QuickPick prompts currently support loading:
+ * * A plain array of items
+ * * A promise for an array of items
+ * * An AsyncIterable that generates an array of items every iteration
+ */
+export type ItemLoadTypes<T> =
+    | Promise<DataQuickPickItem<T>[]>
+    | DataQuickPickItem<T>[]
+    | AsyncIterable<DataQuickPickItem<T>[]>
+
+/**
+ * Creates a UI element that presents a list of items. Information that should be returned when the user selects an
+ * item must be placed in the `data` property of each item. If only the `label` is desired, use
+ * {@link createLabelQuickPick} instead.
+ *
+ * @param items An array or a Promise for items.
+ * @param options Customizes the QuickPick and QuickPickPrompter.
+ * @returns A {@link QuickPickPrompter}. This can be used directly with the `prompt` method or can be fed into a Wizard.
+ */
+export function createQuickPick<T>(
+    items: ItemLoadTypes<T>,
+    options?: ExtendedQuickPickOptions<T>
+): QuickPickPrompter<T> {
+    const picker = vscode.window.createQuickPick<DataQuickPickItem<T>>() as DataQuickPick<T>
+    const mergedOptions = { ...defaultQuickpickOptions, ...options }
+    assign(mergedOptions, picker)
+    picker.buttons = mergedOptions.buttons ?? []
+
+    picker.onDidTriggerItemButton(async (event) => {
+        const metadataManager = MetadataManager.getInstance()
+        if (event.button.tooltip !== 'Open in Serverless Land') {
+            return
+        }
+        const selectedPattern = event.item
+        if (!selectedPattern) {
+            return
+        }
+        const patternUrl = metadataManager.getUrl(selectedPattern.label)
+        if (!patternUrl) {
+            return
+        }
+        await openUrl(vscode.Uri.parse(patternUrl))
+    })
+
+    const prompter =
+        mergedOptions.filterBoxInputSettings !== undefined
+            ? new FilterBoxQuickPickPrompter<T>(picker, mergedOptions)
+            : new QuickPickPrompter<T>(picker, mergedOptions)
+
+    prompter.loadItems(items, false, mergedOptions.recentlyUsed).catch((e) => {
+        getLogger().error('createQuickPick: loadItems failed: %s', (e as Error).message)
+    })
+
+    return prompter
+}
+
+/**
+ * Creates a UI element that presents a list of items which allow selecting many item at same time. List of results
+ * will be JSON.stringify into a string. Use Json.parse() to recover all selected items. Due to limitation of current
+ * implementation, the result of this QuickPick will always be a string regardless of given type. 
+ * 
+ * If you wish to pre-select some item in the Multipick, you can add `picked: true` in the DataQuickPickItem
+ * 
+ * @example
+```typescript
+    const syncFlagItems: DataQuickPickItem<string>[] = [
+        {
+            label: 'Build in source',
+            data: '--build-in-source',
+            description: 'Opts in to build project in the source folder. Only for node apps',
+        },
+        {
+            label: 'Code',
+            data: '--code',
+            description: 'Sync only code resources (Lambda Functions, API Gateway, Step Functions)',
+            picked: true,
+        }
+    ]
+    // in wizard
+    this.form.syncFlags.bindPrompter(() => {
+        return createMultiPick(syncFlagItems, {
+            title: 'Specify parameters for sync',
+            placeholder: 'Press enter to proceed with highlighted option',
+            buttons: createCommonButtons(samSyncUrl),
+        })
+    })
+```
+ * 
+ * @param items An array or a Promise for items.
+ * @param options Customizes the QuickPick and QuickPickPrompter.
+ * @returns A {@link QuickPickPrompter}. This can be used directly with the `prompt` method or can be fed into a Wizard.
+ */
+export function createMultiPick<T>(
+    items: ItemLoadTypes<T>,
+    options?: ExtendedQuickPickOptions<T>
+): QuickPickPrompter<T> {
+    const picker = vscode.window.createQuickPick<DataQuickPickItem<T>>() as DataQuickPick<T>
+    const mergedOptions = { ...defaultQuickpickOptions, ...options }
+    assign(mergedOptions, picker)
+    picker.buttons = mergedOptions.buttons ?? []
+    picker.canSelectMany = true
+
+    const prompter = new QuickPickPrompter<T>(picker, mergedOptions)
+
+    prompter.loadItems(items, false, mergedOptions.recentlyUsed).catch((e) => {
+        getLogger().error('createQuickPick: loadItems failed: %s', (e as Error).message)
+    })
+
+    return prompter
+}
+
+export async function showQuickPick<T>(
+    items: ItemLoadTypes<T>,
+    options?: ExtendedQuickPickOptions<T>
+): Promise<T | undefined> {
+    const prompter = createQuickPick(items, options)
+    const response = await prompter.prompt()
+
+    return isValidResponse(response) ? response : undefined
+}
+
+// Note: the generic type used in `createLabelQuickPick` is needed to infer the correct type when using string
+// literal types. Otherwise the narrowness of the type would be lost.
+/** Creates a QuickPick from normal QuickPickItems, using the `label` as the return value. */
+export function createLabelQuickPick<T extends string>(
+    items: LabelQuickPickItem<T>[] | Promise<LabelQuickPickItem<T>[]>,
+    options?: ExtendedQuickPickOptions<T>
+): QuickPickPrompter<T> {
+    if (items instanceof Promise) {
+        return createQuickPick(
+            items.then((items) => items.map((item) => ({ data: item.label, ...item }))),
+            options
+        )
+    }
+    return createQuickPick(
+        items.map((item) => ({ data: item.label, ...item })),
+        options
+    )
+}
+
+function acceptItems<T>(picker: DataQuickPick<T>, resolve: (items: DataQuickPickItem<T>[]) => void): void {
+    if (picker.selectedItems.length === 0) {
+        if (picker.canSelectMany) {
+            // Allow empty choice in multipick
+            resolve(Array.from(picker.selectedItems))
+        }
+        return
+    }
+
+    for (const item of picker.selectedItems) {
+        item.onClick !== undefined ? item.onClick() : undefined
+    }
+
+    if (picker.selectedItems.some((item) => item.invalidSelection)) {
+        return
+    }
+
+    // TODO: if data is a function => Promise then we need to invoke the function and wait for the Promise
+    // to resolve, then we can return (and we should set the picker to be busy/disabled)
+
+    resolve(Array.from(picker.selectedItems))
+}
+
+function castDatumToItems<T>(...datum: T[]): DataQuickPickItem<T>[] {
+    return datum.map((data) => ({ label: '', data }))
+}
+
+/**
+ * Sets up the QuickPick events. Reject is intentionally not used since errors should be handled through
+ * control signals, not exceptions.
+ */
+function promptUser<T>(
+    picker: DataQuickPick<T>,
+    onDidShowEmitter: vscode.EventEmitter<void>
+): Promise<DataQuickPickItem<T>[] | undefined> {
+    return new Promise<DataQuickPickItem<T>[] | undefined>((resolve) => {
+        picker.onDidAccept(() => acceptItems(picker, resolve))
+        picker.onDidHide(() => resolve(castDatumToItems(WIZARD_EXIT)))
+        picker.onDidTriggerButton((button) => {
+            if (button === vscode.QuickInputButtons.Back) {
+                resolve(castDatumToItems(WIZARD_BACK))
+            } else if ((button as QuickInputButton<T>).onClick !== undefined) {
+                const response = (button as QuickInputButton<T>).onClick!()
+                if (response !== undefined) {
+                    resolve(castDatumToItems(response))
+                }
+            }
+        })
+        picker.show()
+        onDidShowEmitter.fire()
+    }).finally(() => picker.dispose())
+}
+
+/**
+ * Atempts to recover a QuickPick item given an already processed response.
+ *
+ * This is generally required when the prompter is being used in a 'saved' state, such as when updating forms
+ * that were already submitted. Failed recoveries simply return undefined, which means that the recent item
+ * is unknown (generally the default in this case is to select the first item).
+ */
+function recoverItemFromData<T>(data: T, items: readonly DataQuickPickItem<T>[]): DataQuickPickItem<T> | undefined {
+    const stringified = JSON.stringify(data)
+
+    return items.find((item) => {
+        if (typeof item.data === 'object') {
+            return stringified === JSON.stringify(item.data)
+        }
+
+        return typeof item.data === 'function' ? false : data === item.data
+    })
+}
+
+/**
+ * A generic UI element that presents a list of items for the user to select. Wraps around {@link vscode.QuickPick QuickPick}.
+ */
+export class QuickPickPrompter<T> extends Prompter<T> {
+    protected _estimator?: StepEstimator<T>
+    protected _lastPicked?: DataQuickPickItem<T>
+    private onDidShowEmitter = new vscode.EventEmitter<void>()
+    private onDidChangeBusyEmitter = new vscode.EventEmitter<boolean>()
+    private onDidChangeEnablementEmitter = new vscode.EventEmitter<boolean>()
+    // Placeholder can be any 'ephemeral' item such as `noItemsItem` or `errorItem` that should be removed on refresh
+    private isShowingPlaceholder?: boolean
+    /** Event that is fired immediately after the prompter is shown. */
+    public onDidShow = this.onDidShowEmitter.event
+    /** Event that is fired whenever the prompter changes 'busy' state. */
+    public onDidChangeBusy = this.onDidChangeBusyEmitter.event
+    /** Event that is fired whenever the prompter changes 'enabled' state. */
+    public onDidChangeEnablement = this.onDidChangeEnablementEmitter.event
+
+    /**
+     * Sets the "last selected/accepted" item or input, moves it to the start
+     * of the items and makes it the active selection.
+     */
+    public set recentItem(response: T | DataQuickPickItem<T> | undefined) {
+        this.setRecentItem(response)
+    }
+
+    public get recentItem() {
+        return this._lastPicked
+    }
+
+    public set busy(state: boolean) {
+        const prev = this.quickPick.busy
+        this.quickPick.busy = state
+        if (prev !== state) {
+            this.onDidChangeBusyEmitter.fire(state)
+        }
+    }
+
+    public get busy(): boolean {
+        return this.quickPick.busy
+    }
+
+    public set enabled(state: boolean) {
+        const prev = this.quickPick.enabled
+        this.quickPick.enabled = state
+        if (prev !== state) {
+            this.onDidChangeEnablementEmitter.fire(state)
+        }
+    }
+
+    public get enabled(): boolean {
+        return this.quickPick.enabled
+    }
+
+    constructor(
+        public readonly quickPick: DataQuickPick<T>,
+        protected readonly options: ExtendedQuickPickOptions<T> = {}
+    ) {
+        super()
+    }
+
+    public override transform<R>(callback: Transform<T, R>): QuickPickPrompter<R> {
+        return super.transform(callback) as QuickPickPrompter<R>
+    }
+
+    public setSteps(current: number, total: number): void {
+        this.quickPick.step = current
+        this.quickPick.totalSteps = total
+    }
+
+    public clearItems(): void {
+        this.quickPick.items = []
+        this.isShowingPlaceholder = false
+    }
+
+    /**
+     * Attempts to set the currently selected items. If no matching items were found, the first item in
+     * the QuickPick is selected.
+     *
+     * @param items The items to look for
+     */
+    public selectItems(...items: DataQuickPickItem<T>[]): void {
+        const selected = new Set(items.map((item) => item.label))
+
+        // Note: activeItems refer to the 'highlighted' items in a QuickPick, while selectedItems only
+        // changes _after_ the user hits enter or clicks something. For a multi-select QuickPick,
+        // selectedItems will change as options are clicked (and not when accepting).
+        this.quickPick.activeItems = this.quickPick.items.filter((item) => selected.has(item.label))
+
+        if (!items.length || (this.quickPick.activeItems.length === 0 && this.quickPick.items.length > 0)) {
+            this.quickPick.activeItems = [this.quickPick.items[0]]
+        }
+    }
+
+    /**
+     * Appends items to the current array, keeping track of the previous selection
+     */
+    private appendItems(items: DataQuickPickItem<T>[], recentlyUsedDescription: string = recentlyUsed): void {
+        const picker = this.quickPick
+        const recent = picker.activeItems
+        const mergedItems = picker.items.concat(items)
+
+        const recentlyUsedItem = mergedItems.find((item) => item.recentlyUsed)
+        if (recentlyUsedItem !== undefined) {
+            if (picker.canSelectMany) {
+                picker.items = mergedItems.sort(this.options.compare)
+                // if has recent select, apply previous selected items
+                picker.selectedItems = picker.items.filter((item) => item.recentlyUsed)
+            } else {
+                if (items.includes(recentlyUsedItem)) {
+                    const prefix = recentlyUsedItem.description
+                    const recent =
+                        recentlyUsedDescription === recentlyUsed ? `(${recentlyUsed})` : recentlyUsedDescription
+                    recentlyUsedItem.description = prefix ? `${prefix} ${recent}` : recent
+                }
+
+                picker.items = mergedItems.sort((a, b) => {
+                    // Always prioritize specified comparator if there's any
+                    if (this.options.compare) {
+                        return this.options.compare(a, b)
+                    }
+                    if (a === recentlyUsedItem) {
+                        return -1
+                    } else if (b === recentlyUsedItem) {
+                        return 1
+                    }
+                    return 0
+                })
+
+                picker.activeItems = [recentlyUsedItem]
+            }
+        } else {
+            picker.items = mergedItems.sort(this.options.compare)
+
+            if (picker.items.length === 0 && !this.busy) {
+                this.isShowingPlaceholder = true
+                picker.items = this.options.noItemsFoundItem !== undefined ? [this.options.noItemsFoundItem] : []
+            }
+            if (picker.canSelectMany) {
+                // if doesn't have recent select, apply selection from DataQuickPickItems.picked
+                picker.selectedItems = picker.items.filter((item) => item.picked)
+            } else {
+                this.selectItems(...recent.filter((i) => !i.invalidSelection))
+            }
+        }
+    }
+
+    // TODO: add options to this to clear items _before_ loading them
+    /**
+     * Loads items into the QuickPick. Can accept an array or a Promise for items. Promises will cause the
+     * QuickPick to become 'busy', disabling user-input until loading is finished. Items are appended to
+     * the current set of items. Use `clearItems` prior to loading if this behavior is not desired. The
+     * previously selected item will remain selected if it still exists after loading.
+     *
+     * @param items DataQuickPickItems or a promise for said items
+     * @param disableInput Disables the prompter until the items have been loaded, only relevant for async loads (default: true)
+     * @param recentlyUsedDescription Description to display for the recently used item (default: 'Recently Used')
+     * @returns A promise that is resolved when loading has finished
+     */
+    public async loadItems(
+        items: ItemLoadTypes<T>,
+        disableInput: boolean = false,
+        recentlyUsedDescription: string = recentlyUsed
+    ): Promise<void> {
+        // This code block assumes that callers never try to load items in parallel
+        // For now this okay since we don't have any pickers that require that capability
+
+        if (this.isShowingPlaceholder) {
+            this.clearItems()
+        }
+
+        const addErrorItem = (err: Error) => {
+            if (this.options.errorItem === undefined) {
+                return
+            }
+            this.isShowingPlaceholder = true
+            const errorWithMessage = { detail: err.message, ...this.options.errorItem }
+            this.appendItems([errorWithMessage])
+        }
+
+        this.busy = true
+        this.enabled = !disableInput
+
+        if (isAsyncIterable(items)) {
+            // Technically AsyncIterators have three types: one for yield, one for return, and one
+            // for parameters to `next`. We only care about the first two, where the yield type will
+            // always be the same as the AsyncIterable type variable, and the second will potentially
+            // be undefined
+            const iterator = items[Symbol.asyncIterator]() as AsyncIterator<
+                DataQuickPickItem<T>[],
+                DataQuickPickItem<T>[] | undefined
+            >
+            // Any caching of the iterator should be handled externally; we will not keep track of
+            // where we left off when the prompt has been hidden
+            let hidden = false
+            const checkHidden = this.quickPick.onDidHide(() => (hidden = true))
+            while (!hidden) {
+                try {
+                    const { value, done } = await iterator.next()
+                    if (value) {
+                        this.appendItems(value)
+                    }
+                    if (done) {
+                        break
+                    }
+                } catch (err) {
+                    getLogger().error('QuickPickPrompter: loading items from AsyncIterable failed: %s', err)
+                    addErrorItem(err as Error)
+                    break
+                }
+            }
+            checkHidden.dispose()
+        } else if (items instanceof Promise) {
+            try {
+                this.appendItems(await items, recentlyUsedDescription)
+            } catch (err) {
+                getLogger().error('QuickPickPrompter: loading items from Promise failed: %s', err)
+                addErrorItem(err as Error)
+            }
+        } else {
+            this.appendItems(items)
+        }
+
+        this.busy = false
+        this.enabled = true
+
+        // Currently needed for the cases where async loads did not load any items, forcing a `noItemsFoundItem`
+        this.appendItems([], recentlyUsedDescription)
+    }
+
+    /**
+     * Clears the prompter, then loads new items. Will automatically attempt to select the previously
+     * selected items. This is a combination of {@link QuickPickPrompter.loadItems loadItems} and
+     * {@link QuickPickPrompter.clearItems clearItems}.
+     *
+     * @param items Items to load
+     * @returns Promise that is resolved upon completion
+     */
+    public async clearAndLoadItems(items: ItemLoadTypes<T>): Promise<void> {
+        const previousSelected = [...this.quickPick.activeItems]
+        this.clearItems()
+        await this.loadItems(items)
+        this.selectItems(...previousSelected)
+    }
+
+    protected async promptUser(): Promise<PromptResult<T>> {
+        await this.setEstimatorHook()
+        const choices = await promptUser(this.quickPick, this.onDidShowEmitter)
+        this.onDidShowEmitter.dispose()
+
+        if (choices === undefined) {
+            return choices
+        }
+
+        if (this.quickPick.canSelectMany) {
+            // return if control signal
+            if (choices.length !== 0 && isWizardControl(choices[0].data)) {
+                return choices[0].data
+            }
+            // reset before setting recent again
+            this.quickPick.items.map((item) => {
+                ;(item.recentlyUsed = false),
+                    // picked will only work on the first choice. Once choosen, remove the picked flag.
+                    (item.picked = false)
+            })
+            // note this can be empty
+            return JSON.stringify(
+                await Promise.all(
+                    choices.map(async (choice) => {
+                        choice.recentlyUsed = true
+                        return choice.data instanceof Function ? await choice.data() : choice.data
+                    })
+                )
+            ) as T
+        }
+        // else single pick
+        this._lastPicked = choices[0]
+        const result = choices[0].data
+
+        return result instanceof Function ? await result() : result
+    }
+
+    /**
+     * Sets the "last selected/accepted" item or input and makes it the active selection.
+     *
+     * @param picked  Recent item.
+     */
+    protected setRecentItem(picked: T | DataQuickPickItem<T> | undefined): void {
+        // TODO: figure out how to recover from implicit responses
+        if (picked === undefined) {
+            return
+        } else if (!isDataQuickPickItem(picked)) {
+            const recovered = recoverItemFromData(picked, this.quickPick.items)
+            this.quickPick.activeItems = this.quickPick.items.filter((item) => item.label === recovered?.label)
+        } else {
+            this.quickPick.activeItems = this.quickPick.items.filter((item) => item.label === picked.label)
+        }
+
+        if (this.quickPick.activeItems.length === 0) {
+            this.quickPick.activeItems = this.quickPick.items.length > 0 ? [this.quickPick.items[0]] : []
+        }
+    }
+
+    public setStepEstimator(estimator: StepEstimator<T>): void {
+        this._estimator = estimator
+    }
+
+    private async setEstimatorHook(): Promise<void> {
+        if (this._estimator === undefined) {
+            return
+        }
+
+        function hashItem(item: DataQuickPickItem<any>): string {
+            return `${item.label}:${item.description ?? ''}:${item.detail ?? ''}`
+        }
+
+        const estimates = new Map<string, number>()
+
+        const setEstimate = (item: DataQuickPickItem<T>) => {
+            if (item.skipEstimate) {
+                return
+            }
+
+            if (item.data instanceof Function) {
+                return item
+                    .data()
+                    .then((data) => this.applyTransforms(data))
+                    .then((result) => this._estimator!(result))
+                    .then((estimate) => estimates.set(hashItem(item), estimate))
+            } else {
+                const transformed = this.applyTransforms(item.data)
+                const estimate = this._estimator!(transformed)
+                estimates.set(hashItem(item), estimate)
+            }
+        }
+
+        const promises = this.quickPick.items.map(setEstimate)
+
+        const current: number = this.quickPick.step!
+        const total: number = this.quickPick.totalSteps!
+
+        this.quickPick.onDidChangeActive(async (active) => {
+            if (active.length === 0) {
+                return
+            }
+
+            const sets = active.filter((item) => !estimates.has(hashItem(item))).map(setEstimate)
+            await sets[0]
+            const estimate = estimates.get(hashItem(active[0])) ?? 0
+            this.setSteps(current, total + estimate)
+        })
+
+        // We await the first promise before returning to guarantee that there is no 'stutter'
+        // when showing the current/total step numbers
+        if (promises.length > 0) {
+            await promises[0]
+            this.setSteps(current, total + estimates.get(hashItem(this.quickPick.items[0]))!)
+        }
+    }
+}
+
+/**
+ * Allows the prompter to accept the QuickPick filter box as input, shown as a QuickPickItem.
+ *
+ * It is recommended to use `createQuickPick` instead of instantiating this class in isolation.
+ *
+ * @param label The label of the QuickPickItem that shows the user's input
+ * @param transform Required when the expected type is not a string, transforming the input into the expected type or a control signal.
+ */
+export class FilterBoxQuickPickPrompter<T> extends QuickPickPrompter<T> {
+    private onChangeValue?: vscode.Disposable
+
+    public override set recentItem(response: T | DataQuickPickItem<T> | undefined) {
+        if (this.isUserInput(response)) {
+            this.quickPick.value = response.description ?? ''
+        } else {
+            super.recentItem = response
+        }
+    }
+
+    constructor(
+        quickPick: DataQuickPick<T>,
+        protected override options: ExtendedQuickPickOptions<T>
+    ) {
+        super(quickPick)
+
+        this.transform((selection) => {
+            if ((selection as T | typeof customUserInput) === customUserInput) {
+                return options?.filterBoxInputSettings?.transform(quickPick.value) ?? selection
+            }
+            return selection
+        })
+    }
+
+    public override async loadItems(items: ItemLoadTypes<T>): Promise<void> {
+        if (this.onChangeValue) {
+            this.onChangeValue.dispose()
+        }
+
+        await super.loadItems(items)
+        this.addFilterBoxInput()
+    }
+
+    private addFilterBoxInput(): void {
+        const picker = this.quickPick as DataQuickPick<T | symbol>
+        const settings = this.options?.filterBoxInputSettings
+        if (!settings) {
+            throw Error()
+        }
+        const validator = (input: string) => (settings.validator !== undefined ? settings.validator(input) : undefined)
+        const items = picker.items.filter((item) => item.data !== customUserInput)
+        const { label } = settings
+
+        function update(value: string = '') {
+            if (value !== '') {
+                const customUserInputItem = {
+                    label,
+                    description: value,
+                    alwaysShow: true,
+                    data: customUserInput,
+                    invalidSelection: validator(value) !== undefined,
+                    detail: validator(value),
+                } as DataQuickPickItem<T | symbol>
+
+                picker.items = [customUserInputItem, ...items]
+            } else {
+                picker.items = items
+            }
+        }
+
+        this.onChangeValue = picker.onDidChangeValue(update)
+        update(picker.value)
+    }
+
+    private isUserInput(picked: any): picked is DataQuickPickItem<symbol> {
+        return picked !== undefined && picked.data === customUserInput
+    }
+}
diff --git a/packages/core/src/shared/ui/prompter.ts b/packages/core/src/shared/ui/prompter.ts
new file mode 100644
index 00000000000..96984e26047
--- /dev/null
+++ b/packages/core/src/shared/ui/prompter.ts
@@ -0,0 +1,81 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { isValidResponse, StepEstimator, WizardControl } from '../wizards/wizard'
+
+export type QuickPickDataType<T> = T | WizardControl | undefined
+
+export type MultiQuickPickResult<T> = T[] | WizardControl | undefined
+export type PromptResult<T> = T | WizardControl | undefined
+
+export type Transform<T, R = T> = (result: T) => R
+
+/**
+ * A generic abstraction of 'prompt' UIs. Returns the user's input by calling the {@link Prompter.prompt prompt}
+ * method. Can apply a series of deferred transformation callbacks to the input via {@link Prompter.transform transform}.
+ */
+export abstract class Prompter<T> {
+    private disposed = false
+    private pending?: ReturnType<typeof this.prompt>
+    protected transforms: Transform<T, any>[] = []
+
+    constructor() {}
+
+    /** The total number of steps that occured during the prompt */
+    public get totalSteps(): number {
+        return 1
+    }
+
+    // TODO: add this to have a standard title across prompts
+    // public abstract set title(title: string)
+
+    /** Implementing classes should use this to show the user what they previously selected (if applicable). */
+    public abstract get recentItem(): any
+    /** Implementing classes should return the user's response _before_ transforming into into type T. */
+    public abstract set recentItem(response: any)
+
+    // TODO: we need the inverse transform to recover inputs across flows
+    /** Type-helper, allows Prompters to be mapped to different shapes */
+    public transform<R>(callback: Transform<T, R>): Prompter<R> {
+        this.transforms.push(callback)
+        return this as unknown as Prompter<R>
+    }
+
+    /** Applies transformations to the user response in the order in which they were added */
+    protected applyTransforms(result: PromptResult<T>): PromptResult<T> {
+        for (const cb of this.transforms) {
+            if (!isValidResponse(result)) {
+                return result
+            }
+            const transform: T | undefined = cb(result)
+            if (transform !== undefined) {
+                result = transform
+            }
+        }
+
+        return result
+    }
+
+    /**
+     * Opens a dialog for the user to respond to.
+     * @returns The user-response, undefined, or a special control-signal used in Wizards.
+     */
+    public async prompt(): Promise<PromptResult<T>> {
+        if (this.disposed) {
+            throw new Error('Cannot call "prompt" after the prompt is complete')
+        }
+
+        return (this.pending ??= this.promptUser()
+            .then((r) => this.applyTransforms(r))
+            .finally(() => {
+                this.disposed = true
+            }))
+    }
+
+    /** Sets a 'step estimator' function used to predict how many steps are remaining in a given flow */
+    public abstract setStepEstimator(estimator: StepEstimator<T>): void
+    protected abstract promptUser(): Promise<PromptResult<T>>
+    public abstract setSteps(current: number, total: number): void
+}
diff --git a/packages/core/src/shared/ui/sam/bucketPrompter.ts b/packages/core/src/shared/ui/sam/bucketPrompter.ts
new file mode 100644
index 00000000000..047452ab5b9
--- /dev/null
+++ b/packages/core/src/shared/ui/sam/bucketPrompter.ts
@@ -0,0 +1,85 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { S3Client } from '../../clients/s3'
+import { createCommonButtons } from '../buttons'
+import { createQuickPick, DataQuickPickItem } from '../pickerPrompter'
+import type { SyncParams } from '../../sam/sync'
+import * as nls from 'vscode-nls'
+import * as vscode from 'vscode'
+import { getRecentResponse } from '../../sam/utils'
+
+const localize = nls.loadMessageBundle()
+export const prefixNewBucketName = (name: string) => `newbucket:${name}`
+
+export enum BucketSource {
+    SamCliManaged,
+    UserProvided,
+}
+
+/**
+ * Creates a quick pick prompter for configuring S3 bucket used for sync or deploy application artifact
+ * Provides two options:
+ * 1. Create a SAM CLI managed bucket
+ * 2. Specify an existing bucket
+ * @param samCommandUrl URL to the SAM CLI command documentation
+ * @returns A QuickPick prompter configured with bucket source options
+ */
+export function createBucketSourcePrompter(samCommandUrl: vscode.Uri) {
+    const items: DataQuickPickItem<BucketSource>[] = [
+        {
+            label: 'Create a SAM CLI managed S3 bucket',
+            data: BucketSource.SamCliManaged,
+        },
+        {
+            label: 'Specify an S3 bucket',
+            data: BucketSource.UserProvided,
+        },
+    ]
+
+    return createQuickPick(items, {
+        title: 'Specify S3 bucket for deployment artifacts',
+        placeholder: 'Press enter to proceed with highlighted option',
+        buttons: createCommonButtons(samCommandUrl),
+    })
+}
+
+/**
+ * Creates a quick pick prompter for configuring S3 bucket name used for sync or deploy application artifact
+ * The prompter supports choosing from existing s3 bucket name or creating a new one
+ * @param client S3 client
+ * @param mementoRootKey Memento key to store recent bucket name (e.g 'samcli.deploy.params')
+ * @param samCommandUrl URL to the SAM CLI command documentation
+ * @returns A quick pick prompter configured with bucket name options
+ */
+export function createBucketNamePrompter(client: S3Client, mementoRootKey: string, samCommandUrl: vscode.Uri) {
+    const recentBucket = getRecentResponse(mementoRootKey, client.regionCode, 'bucketName')
+    const items = client.listBucketsIterable().map((b) => [
+        {
+            label: b.Name,
+            data: b.Name as SyncParams['bucketName'],
+            recentlyUsed: b.Name === recentBucket,
+        },
+    ])
+
+    return createQuickPick(items, {
+        title: 'Select an S3 Bucket',
+        placeholder: 'Select a bucket (or enter a name to create one)',
+        buttons: createCommonButtons(samCommandUrl),
+        filterBoxInputSettings: {
+            label: 'Create a New Bucket',
+            // This is basically a hack. I need to refactor `createQuickPick` a bit.
+            transform: (v) => prefixNewBucketName(v),
+        },
+        noItemsFoundItem: {
+            label: localize(
+                'aws.cfn.noStacks',
+                'No S3 buckets for region "{0}". Enter a name to create a new one.',
+                client.regionCode
+            ),
+            data: undefined,
+            onClick: undefined,
+        },
+    })
+}
diff --git a/packages/core/src/shared/ui/sam/ecrPrompter.ts b/packages/core/src/shared/ui/sam/ecrPrompter.ts
new file mode 100644
index 00000000000..3c8a642919c
--- /dev/null
+++ b/packages/core/src/shared/ui/sam/ecrPrompter.ts
@@ -0,0 +1,55 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { getAwsConsoleUrl } from '../../awsConsole'
+import { DefaultEcrClient } from '../../clients/ecrClient'
+import { samSyncUrl } from '../../constants'
+import { createCommonButtons } from '../buttons'
+import { createQuickPick } from '../pickerPrompter'
+
+import * as nls from 'vscode-nls'
+import { getRecentResponse } from '../../sam/utils'
+
+export const localize = nls.loadMessageBundle()
+export const prefixNewRepoName = (name: string) => `newrepo:${name}`
+
+/**
+ * Creates a quick pick prompter for ECR repositories
+ * The prompter supports choosing from existing option and new repositories by entering a name
+ *
+ * @param client ECR client used to list repositories
+ * @param mementoRootKey Key used to store/retrieve recently used repository (e.g 'samcli.deploy.params')
+ * @returns A quick pick prompter configured for ECR repository
+ */
+export function createEcrPrompter(client: DefaultEcrClient, mementoRootKey: string) {
+    const recentEcrRepo = getRecentResponse(mementoRootKey, client.regionCode, 'ecrRepoUri')
+    const consoleUrl = getAwsConsoleUrl('ecr', client.regionCode)
+    const items = client.listAllRepositories().map((list) =>
+        list.map((repo) => ({
+            label: repo.repositoryName,
+            data: repo.repositoryUri,
+            detail: repo.repositoryArn,
+            recentlyUsed: repo.repositoryUri === recentEcrRepo,
+        }))
+    )
+
+    return createQuickPick(items, {
+        title: 'Select an ECR Repository',
+        placeholder: 'Select a repository (or enter a name to create one)',
+        buttons: createCommonButtons(samSyncUrl, consoleUrl),
+        filterBoxInputSettings: {
+            label: 'Create a New Repository',
+            transform: (v) => prefixNewRepoName(v),
+        },
+        noItemsFoundItem: {
+            label: localize(
+                'aws.ecr.noRepos',
+                'No ECR repositories in region "{0}". Enter a name to create a new one.',
+                client.regionCode
+            ),
+            data: undefined,
+            onClick: undefined,
+        },
+    })
+}
diff --git a/packages/core/src/shared/ui/sam/paramsSourcePrompter.ts b/packages/core/src/shared/ui/sam/paramsSourcePrompter.ts
new file mode 100644
index 00000000000..332cdc650fd
--- /dev/null
+++ b/packages/core/src/shared/ui/sam/paramsSourcePrompter.ts
@@ -0,0 +1,68 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { samDeployUrl, samSyncUrl } from '../../constants'
+import { createCommonButtons } from '../buttons'
+import { DataQuickPickItem, createQuickPick } from '../pickerPrompter'
+
+export enum ParamsSource {
+    SpecifyAndSave,
+    Specify,
+    SamConfig,
+}
+
+function loadParamsSourcePrompterItems(existValidSamconfig: boolean | undefined) {
+    const items: DataQuickPickItem<ParamsSource>[] = [
+        {
+            label: 'Specify required parameters and save as defaults',
+            data: ParamsSource.SpecifyAndSave,
+        },
+        {
+            label: 'Specify required parameters',
+            data: ParamsSource.Specify,
+        },
+    ]
+
+    if (existValidSamconfig) {
+        items.push({
+            label: 'Use default values from samconfig',
+            data: ParamsSource.SamConfig,
+        })
+    }
+
+    return items
+}
+
+/**
+ * Creates a quick pick prompter for SAM deploy parameter source selection
+ *
+ * @param existValidSamconfig Whether a valid samconfig.toml file exist and contain necessary flag for SAM sync operation
+ * @returns A quick pick prompter
+ */
+export function createDeployParamsSourcePrompter(existValidSamconfig: boolean | undefined) {
+    const items = loadParamsSourcePrompterItems(existValidSamconfig)
+
+    return createQuickPick(items, {
+        title: 'Specify parameter source for deploy',
+        placeholder: 'Press enter to proceed with highlighted option',
+        buttons: createCommonButtons(samDeployUrl),
+    })
+}
+
+/**
+ * Creates a quick pick prompter for SAM sync parameter source selection
+ *
+ * @param existValidSamconfig Whether a valid samconfig.toml file exist and contain necessary flag for SAM sync operation
+ * @returns A quick pick prompter
+ */
+
+export function createSyncParamsSourcePrompter(existValidSamconfig: boolean | undefined) {
+    const items = loadParamsSourcePrompterItems(existValidSamconfig)
+
+    return createQuickPick(items, {
+        title: 'Specify parameter source for sync',
+        placeholder: 'Press enter to proceed with highlighted option',
+        buttons: createCommonButtons(samSyncUrl),
+    })
+}
diff --git a/packages/core/src/shared/ui/sam/stackPrompter.ts b/packages/core/src/shared/ui/sam/stackPrompter.ts
new file mode 100644
index 00000000000..3e86dc08859
--- /dev/null
+++ b/packages/core/src/shared/ui/sam/stackPrompter.ts
@@ -0,0 +1,62 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { StackSummary } from '@aws-sdk/client-cloudformation'
+import { getAwsConsoleUrl } from '../../awsConsole'
+import { CloudFormationClient } from '../../clients/cloudFormation'
+import * as vscode from 'vscode'
+import { createCommonButtons } from '../buttons'
+import { createQuickPick } from '../pickerPrompter'
+import * as nls from 'vscode-nls'
+import { getRecentResponse } from '../../sam/utils'
+
+export const localize = nls.loadMessageBundle()
+
+const canPickStack = (s: StackSummary) => s.StackStatus?.endsWith('_COMPLETE')
+const canShowStack = (s: StackSummary) =>
+    (s.StackStatus?.endsWith('_COMPLETE') || s.StackStatus?.endsWith('_IN_PROGRESS')) &&
+    !s.StackStatus.includes('DELETE')
+
+/**
+ * Creates a quick pick prompter for choosing a CloudFormation stack
+ * The promper supports selecting from existing options or creating a new stack by entering a name
+ *
+ * @param client - CloudFormation client to use for listing stacks
+ * @param mementoRootKey - Key used to store/retrieve recently used stack (e.g 'samcli.deploy.params')
+ * @param samCommandUrl  - URI for sam command wizard webpage
+ * @returns A quick pick prompter configured for stack selection
+ *
+ */
+export function createStackPrompter(client: CloudFormationClient, mementoRootKey: string, samCommandUrl: vscode.Uri) {
+    const recentStack = getRecentResponse(mementoRootKey, client.regionCode, 'stackName')
+    const consoleUrl = getAwsConsoleUrl('cloudformation', client.regionCode)
+    const items = client.listAllStacks().map((stacks) =>
+        stacks.filter(canShowStack).map((s) => ({
+            label: s.StackName,
+            data: s.StackName,
+            invalidSelection: !canPickStack(s),
+            recentlyUsed: s.StackName === recentStack,
+            description: !canPickStack(s) ? 'stack create/update already in progress' : undefined,
+        }))
+    )
+
+    return createQuickPick(items, {
+        title: 'Select a CloudFormation Stack',
+        placeholder: 'Select a stack (or enter a name to create one)',
+        filterBoxInputSettings: {
+            label: 'Create a New Stack',
+            transform: (v) => v,
+        },
+        buttons: createCommonButtons(samCommandUrl, consoleUrl),
+        noItemsFoundItem: {
+            label: localize(
+                'aws.cfn.noStacks',
+                'No stacks in region "{0}". Enter a name to create a new one.',
+                client.regionCode
+            ),
+            data: undefined,
+            onClick: undefined,
+        },
+    })
+}
diff --git a/packages/core/src/shared/ui/sam/templatePrompter.ts b/packages/core/src/shared/ui/sam/templatePrompter.ts
new file mode 100644
index 00000000000..f51d1feaafc
--- /dev/null
+++ b/packages/core/src/shared/ui/sam/templatePrompter.ts
@@ -0,0 +1,74 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as path from 'path'
+import * as vscode from 'vscode'
+import { getSamInitDocUrl } from '../../extensionUtilities'
+import * as CloudFormation from '../../cloudformation/cloudformation'
+import { CloudFormationTemplateRegistry } from '../../fs/templateRegistry'
+import { createCommonButtons } from '../buttons'
+import { createQuickPick } from '../pickerPrompter'
+import { openUrl } from '../../utilities/vsCodeUtils'
+import * as nls from 'vscode-nls'
+import { getRecentResponse } from '../../sam/utils'
+
+export const localize = nls.loadMessageBundle()
+
+export interface TemplateItem {
+    readonly uri: vscode.Uri
+    readonly data: CloudFormation.Template
+}
+
+/**
+ * Creates a quick pick prompter for choosing SAM/CloudFormation templates
+ *
+ * @param registry - Registry containing CloudFormation templates
+ * @param mementoRootKey - Root key for storing recent template selections (e.g 'samcli.deploy.params')
+ * @param samCommandUrl URL to the SAM CLI command documentation
+ * @param projectRoot - Optional URI of the project root to filter templates
+ * @returns A QuickPick prompter configured for template selection
+ *
+ * The prompter displays a list of SAM/CloudFormation templates found in the workspace.
+ * Templates are shown with relative paths when possible, and workspace folder names when multiple folders exist.
+ * Recently used templates are marked. If no templates are found, provides a help link.
+ */
+export function createTemplatePrompter(
+    registry: CloudFormationTemplateRegistry,
+    mementoRootKey: string,
+    samCommandUrl: vscode.Uri,
+    projectRoot?: vscode.Uri
+) {
+    const folders = new Set<string>()
+    const recentTemplatePath = getRecentResponse(mementoRootKey, 'global', 'templatePath')
+    const filterTemplates = projectRoot
+        ? registry.items.filter(({ path: filePath }) => !path.relative(projectRoot.fsPath, filePath).startsWith('..'))
+        : registry.items
+
+    const items = filterTemplates.map(({ item, path: filePath }) => {
+        const uri = vscode.Uri.file(filePath)
+        const workspaceFolder = vscode.workspace.getWorkspaceFolder(uri)
+        const label = workspaceFolder ? path.relative(workspaceFolder.uri.fsPath, uri.fsPath) : uri.fsPath
+        folders.add(workspaceFolder?.name ?? '')
+
+        return {
+            label,
+            data: { uri, data: item },
+            description: workspaceFolder?.name,
+            recentlyUsed: recentTemplatePath === uri.fsPath,
+        }
+    })
+
+    const trimmedItems = folders.size === 1 ? items.map((item) => ({ ...item, description: undefined })) : items
+    return createQuickPick(trimmedItems, {
+        title: 'Select a SAM/CloudFormation Template',
+        placeholder: 'Select a SAM/CloudFormation Template',
+        buttons: createCommonButtons(samCommandUrl),
+        noItemsFoundItem: {
+            label: localize('aws.sam.noWorkspace', 'No SAM template.yaml file(s) found. Select for help'),
+            data: undefined,
+            onClick: () => openUrl(getSamInitDocUrl()),
+        },
+    })
+}
diff --git a/packages/core/src/shared/ui/wizardPrompter.ts b/packages/core/src/shared/ui/wizardPrompter.ts
new file mode 100644
index 00000000000..c9173e738ba
--- /dev/null
+++ b/packages/core/src/shared/ui/wizardPrompter.ts
@@ -0,0 +1,76 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import _ from 'lodash'
+import { StepEstimator, Wizard, WIZARD_BACK, WIZARD_SKIP } from '../wizards/wizard'
+import { Prompter, PromptResult } from './prompter'
+
+/**
+ * Wraps {@link Wizard} object into its own {@link Prompter}, allowing wizards to use other wizards in their flows.
+ * This is meant to be used exclusively in createWizardPrompter() method of {@link CompositeWizard} class.
+ *
+ * @remarks
+ *  - The WizardPrompter class should never be instantiated with directly.
+ *  - Use createWizardPrompter() method of {@link CompositeWizard} when creating a nested wizard prompter for proper state management.
+ *  - See examples:
+ *     - {@link SingleNestedWizard}
+ *     - {@link DoubleNestedWizard}
+ */
+
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export const WIZARD_PROMPTER = 'WIZARD_PROMPTER'
+export class WizardPrompter<T> extends Prompter<T> {
+    public get recentItem(): any {
+        return undefined
+    }
+    public set recentItem(response: any) {}
+    private stepOffset: number = 0
+    private response: T | undefined
+
+    constructor(private readonly wizard: Wizard<T>) {
+        super()
+    }
+
+    public setSteps(current: number, total: number): void {
+        if (this.wizard.currentStep === 1) {
+            this.wizard.stepOffset = [current - 1, total - 1]
+        }
+
+        this.stepOffset = total - 1
+    }
+
+    public override get totalSteps(): number {
+        return this.wizard.totalSteps - this.stepOffset
+    }
+
+    public setStepEstimator(estimator: StepEstimator<T>): void {
+        const estimates = new Map<string, number>()
+
+        this.wizard.parentEstimator = (state) => {
+            const key = JSON.stringify(state)
+            const transformed = this.applyTransforms(state)
+            const estimate = estimator(transformed)
+
+            estimates.set(key, estimate)
+
+            return estimate
+        }
+    }
+
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    protected async promptUser(): Promise<PromptResult<T>> {
+        this.response = await this.wizard.run()
+
+        if (this.response === undefined) {
+            return WIZARD_BACK as PromptResult<T>
+        } else if (_.isEmpty(this.response)) {
+            return WIZARD_SKIP as PromptResult<T>
+        }
+
+        return {
+            ...this.response,
+        } as PromptResult<T>
+    }
+}
diff --git a/packages/core/src/shared/utilities/asyncCollection.ts b/packages/core/src/shared/utilities/asyncCollection.ts
new file mode 100644
index 00000000000..093709beea9
--- /dev/null
+++ b/packages/core/src/shared/utilities/asyncCollection.ts
@@ -0,0 +1,277 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Coalesce } from './tsUtils'
+
+/**
+ * High-level abstraction over async generator functions of the form `async function*` {@link AsyncGenerator}
+ */
+export interface AsyncCollection<T> extends AsyncIterable<T> {
+    /**
+     * Flattens the collection 1-level deep.
+     */
+    flatten(): AsyncCollection<SafeUnboxIterable<T>>
+
+    /**
+     * Applies a mapping transform to the output generator.
+     */
+    map<U>(fn: (obj: T) => Promise<U> | U): AsyncCollection<U>
+
+    /**
+     * Filters out results which will _not_ be passed on to further transformations.
+     */
+    filter<U extends T>(predicate: (item: T) => item is U): AsyncCollection<U>
+    filter<U extends T>(predicate: (item: T) => boolean): AsyncCollection<U>
+
+    /**
+     * Resolves the first element that matches the predicate.
+     */
+    find<U extends T>(predicate: (item: T) => item is U): Promise<U | undefined>
+    find<U extends T>(predicate: (item: T) => boolean): Promise<U | undefined>
+
+    /**
+     * Catches all errors from the underlying iterable(s).
+     *
+     * Note that currently the contiuation behavior is highly dependent on the
+     * underlying implementations. For example, a `for await` loop cannot be
+     * continued if any of the resulting values are rejected.
+     */
+    catch<U>(handler: (error: unknown) => Promise<U> | U): AsyncCollection<T | U>
+
+    /**
+     * Uses only the first 'count' number of values returned by the generator.
+     */
+    limit(count: number): AsyncCollection<T>
+
+    /**
+     * Converts the collection to a Promise, resolving to an array of all values returned by the generator.
+     */
+    promise(): Promise<T[]>
+
+    /**
+     * Converts the collection to a Map, using either a property of the item or a function to select keys
+     */
+    toMap<K extends StringProperty<T>, U extends string = never>(
+        selector: KeySelector<T, U> | K
+    ): Promise<Map<Coalesce<U, T[K]>, T>>
+
+    /**
+     * Returns an iterator directly from the underlying generator, preserving values returned.
+     */
+    iterator(): AsyncIterator<T, T | void>
+}
+
+const asyncCollection = Symbol('asyncCollection')
+
+/**
+ * Converts an async generator function to an {@link AsyncCollection}
+ *
+ * Generation is "lazy", i.e. the generator is not called until a _resolving operation_:
+ *  * Iterating using `for await (...)`
+ *  * Iterating using `.next()`
+ *  * Calling one of the conversion functions `toMap` or `promise`
+ *
+ * Collections are *immutable* in the sense that any transformation will not consume the underlying generator
+ * function. That is, any "final" operation uses its own contextually bound generator function separate from
+ * any predecessor collections.
+ */
+export function toCollection<T>(generator: () => AsyncGenerator<T, T | undefined | void>): AsyncCollection<T> {
+    async function* unboxIter() {
+        const last = yield* generator()
+        if (last !== undefined) {
+            yield last
+        }
+    }
+
+    const iterable: AsyncIterable<T> = {
+        [Symbol.asyncIterator]: unboxIter,
+    }
+
+    return Object.assign(iterable, {
+        [asyncCollection]: true,
+        find: <U extends T>(predicate: Predicate<T, U>) => find(iterable, predicate),
+        flatten: () => toCollection<SafeUnboxIterable<T>>(() => delegateGenerator(generator(), flatten)),
+        filter: <U extends T>(predicate: Predicate<T, U>) =>
+            toCollection<U>(() => filterGenerator<T, U>(generator(), predicate)),
+        catch: <U>(fn: (error: unknown) => Promise<U> | U) =>
+            toCollection<T | U>(() => catchGenerator(generator(), fn)),
+        map: <U>(fn: (item: T) => Promise<U> | U) => toCollection<U>(() => mapGenerator(generator(), fn)),
+        limit: (count: number) => toCollection(() => delegateGenerator(generator(), takeFrom(count))),
+        promise: () => promise(iterable),
+        toMap: <U extends string = never, K extends StringProperty<T> = never>(selector: KeySelector<T, U> | K) =>
+            asyncIterableToMap(iterable, selector),
+        iterator: generator,
+    })
+}
+
+export function isAsyncCollection<T>(iterable: AsyncIterable<T>): iterable is AsyncCollection<T> {
+    return asyncCollection in iterable
+}
+
+function isIterable<T>(obj: any): obj is Iterable<T> {
+    return obj !== undefined && typeof obj[Symbol.iterator] === 'function'
+}
+
+function isAsyncIterable<T>(obj: any): obj is AsyncIterable<T> {
+    return obj && typeof obj === 'object' && typeof obj[Symbol.asyncIterator] === 'function'
+}
+
+async function* mapGenerator<T, U, R = T>(
+    generator: AsyncGenerator<T, R | undefined | void>,
+    fn: (item: T | R) => Promise<U> | U
+): AsyncGenerator<U, U | undefined> {
+    while (true) {
+        const { value, done } = await generator.next()
+        if (done) {
+            return value !== undefined ? (fn(value) as Awaited<U>) : undefined
+        }
+        if (value !== undefined) {
+            yield fn(value)
+        }
+    }
+}
+
+type Predicate<T, U extends T> = (item: T) => item is U
+
+async function* filterGenerator<T, U extends T, R = T>(
+    generator: AsyncGenerator<T, R | undefined | void>,
+    predicate: Predicate<T | R, U> | ((item: T | R) => boolean)
+): AsyncGenerator<U, U | void> {
+    while (true) {
+        const { value, done } = await generator.next()
+
+        if (done) {
+            if (value !== undefined && predicate(value)) {
+                return value as unknown as Awaited<U>
+            }
+            break
+        }
+
+        if (predicate(value)) {
+            yield value as unknown as Awaited<U>
+        }
+    }
+}
+
+async function* delegateGenerator<T, U, R = T>(
+    generator: AsyncGenerator<T, R | undefined | void>,
+    fn: (item: T | R, ret: () => void) => AsyncGenerator<U, void>
+): AsyncGenerator<U, U | undefined> {
+    type LastValue = Readonly<{ isSet: false; value?: undefined } | { isSet: true; value: Awaited<U> }>
+    let last: LastValue = { isSet: false }
+
+    while (true) {
+        const { value, done } = await generator.next()
+        if (value !== undefined) {
+            const delegate = fn(value, generator.return.bind(generator))
+            while (true) {
+                const sub = await delegate.next()
+                if (sub.done) {
+                    break
+                }
+                if (last.isSet) {
+                    yield last.value
+                }
+                last = { isSet: true, value: sub.value as Awaited<U> }
+            }
+        }
+        if (done) {
+            break
+        }
+    }
+
+    // The last value is buffered by one step to ensure it is returned here
+    // rather than yielded in the while loops.
+    return last.value
+}
+
+async function* flatten<T, U extends SafeUnboxIterable<T>>(item: T) {
+    if (isIterable<U>(item) || isAsyncIterable<U>(item)) {
+        yield* item
+    } else {
+        yield item as unknown as U
+    }
+}
+
+function takeFrom<T>(count: number) {
+    return async function* (item: T, ret: () => void) {
+        if (--count < 0) {
+            return ret()
+        }
+        yield item
+    }
+}
+
+/**
+ * Either 'unbox' an Iterable value or leave it as-is if it's not an Iterable
+ */
+type SafeUnboxIterable<T> = T extends Iterable<infer U> ? U : T extends AsyncIterable<infer U> ? U : T
+
+async function promise<T>(iterable: AsyncIterable<T>): Promise<T[]> {
+    const result: T[] = []
+
+    for await (const item of iterable) {
+        result.push(item)
+    }
+
+    return result
+}
+
+function addToMap<T, U extends string>(map: Map<string, T>, selector: KeySelector<T, U> | StringProperty<T>, item: T) {
+    const key = typeof selector === 'function' ? selector(item) : item[selector]
+    if (key) {
+        if (map.has(key as keyof (typeof map)['keys'])) {
+            throw new Error(`Duplicate key found when converting AsyncIterable to map: ${key}`)
+        }
+
+        map.set(key as keyof (typeof map)['keys'], item)
+    }
+}
+
+// Type 'U' is constrained to be either a key of 'T' or a string returned by a function parsing 'T'
+type KeySelector<T, U extends string> = (item: T) => U | undefined
+type StringProperty<T> = { [P in keyof T]: T[P] extends string ? P : never }[keyof T]
+
+// TODO: apply this to different iterables and replace the old 'map' code
+async function asyncIterableToMap<T, K extends StringProperty<T>, U extends string = never>(
+    iterable: AsyncIterable<T>,
+    selector: KeySelector<T, U> | K
+): Promise<Map<Coalesce<U, T[K]>, T>> {
+    const result = new Map<Coalesce<U, T[K] & string>, T>()
+
+    for await (const item of iterable) {
+        addToMap(result, selector, item)
+    }
+
+    return result
+}
+
+async function find<T, U extends T>(iterable: AsyncIterable<T>, predicate: (item: T) => item is U) {
+    for await (const item of iterable) {
+        if (predicate(item)) {
+            return item
+        }
+    }
+}
+
+async function* catchGenerator<T, U, R = T>(
+    generator: AsyncGenerator<T, R | undefined | void>,
+    fn: (error: unknown) => Promise<U> | U
+): AsyncGenerator<T | U, R | U | undefined | void> {
+    while (true) {
+        try {
+            const { value, done } = await generator.next()
+            if (done) {
+                return value
+            }
+            yield value
+        } catch (err) {
+            // Catching an error when the generator would normally
+            // report 'done' means that the 'done' value would be
+            // replaced by `undefined`.
+            yield fn(err)
+        }
+    }
+}
diff --git a/packages/core/src/shared/utilities/cacheUtils.ts b/packages/core/src/shared/utilities/cacheUtils.ts
new file mode 100644
index 00000000000..a3ccb5e55f5
--- /dev/null
+++ b/packages/core/src/shared/utilities/cacheUtils.ts
@@ -0,0 +1,254 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { dirname } from 'path'
+import { ErrorInformation, ToolkitError, isFileNotFoundError } from '../errors'
+import fs from '../../shared/fs/fs'
+import { isWeb } from '../extensionGlobals'
+import type { MapSync } from './map'
+
+// TODO(sijaden): further generalize this concept over async references (maybe create a library?)
+// It's pretty clear that this interface (and VSC's `Memento`) reduce down to what is essentially
+// a "pointer" with RW operations that return futures.
+
+/**
+ * A general, basic interface for a cache with key associativity.
+ *
+ * Look to use {@link MapSync} instead if you need atomicity.
+ */
+export interface KeyedCache<V, K = string> {
+    /**
+     * Attempts to read data stored at {@link key}.
+     *
+     * @param key Target key to read from.
+     * @returns `V` on success, `undefined` if {@link key} doesn't exist.
+     */
+    load(key: K): Promise<V | undefined>
+
+    /**
+     * Writes {@link data} to {@link key}.
+     *
+     * @param key Target key to write to.
+     * @param data Data to write.
+     */
+    save(key: K, data: V): Promise<void>
+
+    /**
+     * Deletes data stored at {@link key}, if any.
+     *
+     * @param key Target key to clear.
+     * @param reason Partial log message explaining why the data is being deleted.
+     */
+    clear(key: K, reason: string): Promise<void>
+}
+
+/**
+ * Loads {@link key} from the cache.
+ *
+ * If the item does not exist, {@link fn} is executed. The result is saved using {@link key}.
+ */
+export async function loadOr<V, K>(cache: KeyedCache<V, K>, key: K, fn: () => Promise<V>): Promise<V> {
+    const data = await cache.load(key)
+
+    if (data === undefined) {
+        const computed = await fn()
+        await cache.save(key, computed)
+
+        return computed
+    }
+
+    return data
+}
+
+/**
+ * Maps a cache by transforming all inputs and outputs.
+ *
+ * Transform functions are not invoked if the specified key does not exist in the cache.
+ *
+ * @param cache Target cache. The original is _not_ affected.
+ * @param loadTransform Function applied to all **read** operations from the cache.
+ * @param saveTransform Function applied to all **write** operations from the cache.
+ */
+export function mapCache<V, Vt, K>(
+    cache: KeyedCache<V, K>,
+    loadTransform: (data: V) => Vt,
+    saveTransform: (data: Vt) => V
+): KeyedCache<Vt, K> {
+    const getIf = (data?: V) => (data !== undefined ? loadTransform(data) : undefined)
+
+    return {
+        clear: (key, reason) => cache.clear(key, reason),
+        load: (key) => cache.load(key).then(getIf),
+        save: (key, data) => cache.save(key, saveTransform(data)),
+    }
+}
+
+/**
+ * Creates a new {@link KeyedCache} backed by the file system.
+ *
+ * No optimization is performed. Every method call results in direct calls to `fs`.
+ * Errors are always caught, meaning a failed `load` operation looks the same as a
+ * cache miss.
+ *
+ * @param mapKey Function that should describe how a key `K` is mapped to the file system.
+ * @param logger Optional logger callback. Omitting this parameter disables logging.
+ */
+export function createDiskCache<V, K>(
+    mapKey: (key: K) => string,
+    logger?: (message: string) => void
+): KeyedCache<V, K> {
+    function log(msg: string, key: K): void {
+        if (logger) {
+            const keyMessage = typeof key === 'object' ? JSON.stringify(key) : key
+            logger(`${msg} key: ${keyMessage}`)
+        }
+    }
+
+    return {
+        load: async (key) => {
+            const target = mapKey(key)
+
+            try {
+                const result = JSON.parse(await fs.readFileText(target))
+                log('loaded', key)
+                return result
+            } catch (error) {
+                // Non-recoverable errors mean there is no usable data.
+                // Recoverable errors mean we can possibly use the data for something like
+                // an SSO token refresh, or to just retry.
+                // Returning undefined implies non-recoverable.
+
+                // -- Non-recoverable Errors --
+                if (isFileNotFoundError(error)) {
+                    log('read failed (file not found)', key)
+                    return
+                }
+                if (error instanceof SyntaxError) {
+                    // file content was malformed or empty
+                    log(`read failed (invalid JSON)`, key)
+                    return
+                }
+
+                // -- Recoverable Errors --
+                log(`read failed ${error}`, key)
+                throw createDiskCacheError(error, 'LOAD', target, key)
+            }
+        },
+        save: async (key, data) => {
+            const target = mapKey(key)
+
+            try {
+                await fs.mkdir(dirname(target))
+                if (isWeb()) {
+                    // There is no web-compatible rename() method. So do a regular write.
+                    await fs.writeFile(target, JSON.stringify(data))
+                } else {
+                    // With SSO cache we noticed malformed JSON on read. A guess is that multiple writes
+                    // are occuring at the same time. The following is a bandaid that ensures an all-or-nothing
+                    // write, though there can still be race conditions with which version remains after overwrites.
+                    await fs.writeFile(target, JSON.stringify(data), { mode: 0o600, atomic: true })
+                }
+            } catch (error) {
+                throw createDiskCacheError(error, 'SAVE', target, key)
+            }
+
+            log('saved', key)
+        },
+        clear: async (key, reason) => {
+            const target = mapKey(key)
+
+            try {
+                await fs.delete(target, { force: false })
+            } catch (error) {
+                if (isFileNotFoundError(error)) {
+                    return log('file not found', key)
+                }
+
+                throw createDiskCacheError(error, 'CLEAR', target, key)
+            }
+
+            log(`deleted (reason: ${reason})`, key)
+        },
+    }
+
+    /** Helper to make a disk cache error */
+    function createDiskCacheError(error: unknown, operation: 'LOAD' | 'SAVE' | 'CLEAR', target: string, key: K) {
+        return DiskCacheError.chain(error, `${operation} failed for '${target}'`, {
+            details: { key },
+        })
+    }
+}
+
+/**
+ * Represents a generalized error that happened during a disk cache operation.
+ *
+ * For example, when SSO refreshes a token a disk cache error can occur when it
+ * attempts to read/write the disk cache. These errors can be recoverable and do not
+ * imply that the SSO session is stale. So by creating a context specific instance it
+ * will help to distinguish them when we need to decide if the SSO session is actually
+ * stale.
+ */
+export class DiskCacheError extends ToolkitError.named('DiskCacheError') {
+    public constructor(message: string, info?: Omit<ErrorInformation, 'code'>) {
+        super(message, { ...info, code: 'DiskCacheError' })
+    }
+}
+
+export function createSecretsCache(
+    secrets: vscode.SecretStorage,
+    logger?: (message: string) => void
+): KeyedCache<string> {
+    function log(msg: string, key: string): void {
+        if (logger) {
+            logger(`${msg} key: ${key}`)
+        }
+    }
+
+    return {
+        load: async (key) => {
+            try {
+                const value = await secrets.get(key)
+
+                if (value === undefined) {
+                    log('read failed (key not found)', key)
+                    return
+                }
+
+                log('loaded', key)
+                return value
+            } catch (error) {
+                throw ToolkitError.chain(error, 'Failed to get value from secrets storage', {
+                    code: 'SecretsGetFailed',
+                    details: { key },
+                })
+            }
+        },
+        save: async (key, data) => {
+            try {
+                await secrets.store(key, data)
+            } catch (error) {
+                throw ToolkitError.chain(error, 'Failed to save to secrets storage ', {
+                    code: 'SecretsSaveFailed',
+                    details: { key },
+                })
+            }
+
+            log('saved', key)
+        },
+        clear: async (key, reason) => {
+            try {
+                await secrets.delete(key)
+            } catch (error) {
+                throw ToolkitError.chain(error, 'Failed to delete key from secrets storage', {
+                    code: 'SecretsDeleteFailed',
+                    details: { key },
+                })
+            }
+
+            log(`deleted (reason: ${reason})`, key)
+        },
+    }
+}
diff --git a/src/shared/utilities/classUtils.ts b/packages/core/src/shared/utilities/classUtils.ts
similarity index 95%
rename from src/shared/utilities/classUtils.ts
rename to packages/core/src/shared/utilities/classUtils.ts
index f4ac125c467..a8b265eda23 100644
--- a/src/shared/utilities/classUtils.ts
+++ b/packages/core/src/shared/utilities/classUtils.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/packages/core/src/shared/utilities/cliUtils.ts b/packages/core/src/shared/utilities/cliUtils.ts
new file mode 100644
index 00000000000..bf19cd19791
--- /dev/null
+++ b/packages/core/src/shared/utilities/cliUtils.ts
@@ -0,0 +1,706 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../extensionGlobals'
+
+import admZip from 'adm-zip'
+import * as path from 'path'
+import * as vscode from 'vscode'
+import { getIdeProperties } from '../extensionUtilities'
+import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../filesystemUtilities'
+import { getLogger } from '../logger/logger'
+import { HttpResourceFetcher } from '../resourcefetcher/node/httpResourceFetcher'
+import { ChildProcess } from './processUtils'
+
+import * as nls from 'vscode-nls'
+import { Timeout, CancellationError } from './timeoutUtils'
+import { showMessageWithCancel } from './messages'
+import { DevSettings } from '../settings'
+import { telemetry } from '../telemetry/telemetry'
+import { Result, ToolId } from '../telemetry/telemetry'
+import { openUrl } from './vsCodeUtils'
+import fs from '../fs/fs'
+import { mergeResolvedShellPath } from '../env/resolveEnv'
+const localize = nls.loadMessageBundle()
+
+const msgDownloading = localize('AWS.installProgress.downloading', 'downloading...')
+const msgInstallingLocal = localize('AWS.installProgress.installingLocal', 'installing local copy...')
+
+export class InstallerError extends Error {}
+export class InvalidPlatformError extends Error {}
+
+interface Cli {
+    command: {
+        unix?: Array<string>
+        windows?: Array<string>
+    }
+    source: {
+        macos?: {
+            x86?: string
+            arm?: string
+        }
+        windows?: {
+            x86?: string
+            arm?: string
+        }
+        linux?: {
+            x86?: string
+            arm?: string
+        }
+    }
+    manualInstallLink: string
+    name: string
+    exec?: string
+}
+
+export type AwsClis = Extract<ToolId, 'session-manager-plugin' | 'aws-cli' | 'sam-cli' | 'docker' | 'finch'>
+
+/**
+ * CLIs and their full filenames and download paths for their respective OSes
+ * TODO: Add SAM? Other CLIs?
+ */
+export const awsClis: { [cli in AwsClis]: Cli } = {
+    'session-manager-plugin': {
+        command: {
+            unix: [path.join('sessionmanagerplugin', 'bin', 'session-manager-plugin')],
+            windows: [path.join('sessionmanagerplugin', 'bin', 'session-manager-plugin.exe')],
+        },
+        source: {
+            // use pkg: zip is unsigned
+            macos: {
+                x86: 'https://s3.amazonaws.com/session-manager-downloads/plugin/latest/mac/session-manager-plugin.pkg',
+                arm: 'https://s3.amazonaws.com/session-manager-downloads/plugin/latest/mac_arm64/session-manager-plugin.pkg',
+            },
+            windows: {
+                x86: 'https://session-manager-downloads.s3.amazonaws.com/plugin/latest/windows/SessionManagerPlugin.zip',
+            },
+            linux: {
+                x86: 'https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_64bit/session-manager-plugin.deb',
+                arm: 'https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_arm64/session-manager-plugin.deb',
+            },
+        },
+        name: 'Session Manager Plugin',
+        manualInstallLink:
+            'https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html',
+        exec: 'session-manager-plugin',
+    },
+    'sam-cli': {
+        command: {
+            windows: [
+                'sam.cmd',
+                'sam.exe',
+                path.join('C:', 'Program Files', 'Amazon', 'AWSSAMCLI', 'bin', 'sam.cmd'),
+                path.join('C:', 'Program Files', 'Amazon', 'AWSSAMCLI', 'bin', 'sam.exe'),
+                path.join('C:', 'Program Files (x86)', 'Amazon', 'AWSSAMCLI', 'bin', 'sam.cmd'),
+                path.join('C:', 'Program Files (x86)', 'Amazon', 'AWSSAMCLI', 'bin', 'sam.exe'),
+            ],
+            unix: [
+                'sam',
+                path.join('/', 'usr', 'bin', 'sam'),
+                path.join('/', 'usr', 'local', 'bin', 'sam'),
+                path.join('/', 'opt', 'homebrew', 'bin', 'sam'),
+                path.join('/', 'home', 'linuxbrew', '.linuxbrew', 'bin', 'sam'),
+                path.join('${process.env.HOME}', '.linuxbrew', 'bin', 'sam'),
+            ],
+        },
+        source: {
+            macos: {
+                x86: 'https://github.com/aws/aws-sam-cli/releases/latest/download/aws-sam-cli-macos-x86_64.pkg',
+                arm: 'https://github.com/aws/aws-sam-cli/releases/latest/download/aws-sam-cli-macos-arm64.pkg',
+            },
+            windows: {
+                x86: 'https://github.com/aws/aws-sam-cli/releases/latest/download/AWS_SAM_CLI_64_PY3.msi',
+            },
+        },
+        name: 'AWS SAM',
+        manualInstallLink:
+            'https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/install-sam-cli.html',
+        exec: 'sam',
+    },
+    'aws-cli': {
+        command: {
+            windows: [
+                'aws.exe',
+                path.join('C:', 'Program Files', 'Amazon', 'AWSCLIV2', 'bin', 'aws.exe'),
+                path.join('C:', 'Program Files (x86)', 'Amazon', 'AWSCLIV2', 'bin', 'aws.exe'),
+            ],
+            unix: ['aws', path.join('/', 'usr', 'bin', 'aws'), path.join('/', 'usr', 'local', 'bin', 'aws')],
+        },
+        source: {
+            macos: {
+                x86: 'https://awscli.amazonaws.com/AWSCLIV2.pkg',
+                arm: 'https://awscli.amazonaws.com/AWSCLIV2.pkg',
+            },
+            windows: {
+                x86: 'https://awscli.amazonaws.com/AWSCLIV2.msi',
+                arm: 'https://awscli.amazonaws.com/AWSCLIV2.msi',
+            },
+        },
+        name: 'AWS',
+        manualInstallLink: 'https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html',
+        exec: 'aws',
+    },
+    docker: {
+        command: {
+            windows: [
+                'docker.exe',
+                path.join('C:', 'Program Files', 'Docker', 'Docker', 'resources', 'bin', 'docker.exe'),
+                path.join('C:', 'Program Files (x86)', 'Docker', 'Docker', 'resources', 'bin', 'docker.exe'),
+            ],
+            unix: [
+                'docker',
+                path.join('/', 'usr', 'bin', 'docker'),
+                path.join('/', 'usr', 'local', 'bin', 'docker'),
+                path.join('/', 'Applications', 'Docker.app', 'Contents', 'Resources', 'bin', 'docker'),
+            ],
+        },
+        source: {
+            macos: {
+                x86: 'https://desktop.docker.com/mac/main/amd64/Docker.dmg',
+                arm: 'https://desktop.docker.com/mac/main/arm64/Docker.dmg',
+            },
+            windows: {
+                x86: 'https://desktop.docker.com/win/main/amd64/Docker%20Desktop%20Installer.exe',
+                arm: 'https://desktop.docker.com/win/main/arm64/Docker%20Desktop%20Installer.exe',
+            },
+        },
+        name: 'Docker',
+        manualInstallLink: 'https://docs.docker.com/desktop',
+        exec: 'docker',
+    },
+    // Currently Finch is available for MacOS and Linux; Windows support will be added if/when available
+    finch: {
+        command: {
+            unix: ['finch', path.join('/', 'usr', 'bin', 'finch'), path.join('/', 'usr', 'local', 'bin', 'finch')],
+        },
+        source: {
+            macos: {
+                x86: 'https://github.com/runfinch/finch/releases/download/v1.11.0/Finch-v1.11.0-x86_64.pkg',
+                arm: 'https://github.com/runfinch/finch/releases/download/v1.11.0/Finch-v1.11.0-aarch64.pkg',
+            },
+        },
+        name: 'Finch',
+        manualInstallLink: 'https://runfinch.com/docs/getting-started/installation/',
+        exec: 'finch',
+    },
+}
+
+/**
+ * Installs a selected CLI: wraps confirmation, cleanup, and telemetry logic.
+ * @param cli CLI to install
+ * @param confirmBefore Prompt before starting install?
+ * @returns CLI Path
+ */
+export async function installCli(
+    cli: AwsClis,
+    confirm: boolean,
+    skipPostInstallValidation: boolean = false
+): Promise<string | never> {
+    const cliToInstall = awsClis[cli]
+    if (!cliToInstall) {
+        throw new InstallerError(`Installer not found for CLI: ${cli}`)
+    }
+    let result: Result = 'Succeeded'
+    let reason: string = ''
+
+    let tempDir: string | undefined
+    const manualInstall = localize('AWS.cli.manualInstall', 'Install manually...')
+
+    try {
+        // get install uri to see if auto-install is enabled.
+        if (!getOsCliSource(awsClis[cli])) {
+            // Installer not supported on this platform, direct custoemr to manual install
+            const selection = await vscode.window.showInformationMessage(
+                localize(
+                    'AWS.cli.autoInstallNotSupported',
+                    'Auto install of {0} CLI is not supported on your platform',
+                    cliToInstall.name
+                ),
+                manualInstall
+            )
+            if (selection === manualInstall) {
+                void openUrl(vscode.Uri.parse(cliToInstall.manualInstallLink))
+            }
+            throw new CancellationError('user')
+        }
+
+        const install = localize('AWS.generic.install', 'Install')
+        const selection = !confirm
+            ? install
+            : await vscode.window.showInformationMessage(
+                  localize(
+                      'AWS.cli.installCliPrompt',
+                      '{0} could not find {1} CLI. Install a local copy?',
+                      localize('AWS.channel.aws.toolkit', '{0} Toolkit', getIdeProperties().company),
+                      cliToInstall.name
+                  ),
+                  install,
+                  manualInstall
+              )
+
+        if (selection !== install) {
+            if (selection === manualInstall) {
+                void openUrl(vscode.Uri.parse(cliToInstall.manualInstallLink))
+            }
+            throw new CancellationError('user')
+        }
+        const timeout = new Timeout(20 * 60 * 1000)
+        const progress = await showMessageWithCancel(
+            localize('AWS.cli.installProgress', 'Installing: {0} CLI', cliToInstall.name),
+            timeout
+        )
+
+        tempDir = await makeTemporaryToolkitFolder()
+        let cliPath: string | undefined
+        try {
+            switch (cli) {
+                case 'session-manager-plugin':
+                    cliPath = await installSsmCli(tempDir, progress, timeout)
+                    break
+                case 'aws-cli':
+                case 'sam-cli':
+                case 'docker':
+                case 'finch':
+                    cliPath = await installGui(cli, tempDir, progress, timeout)
+                    break
+                default:
+                    throw new InstallerError(`Installer not found for CLI: ${cli}`)
+            }
+        } finally {
+            timeout.dispose()
+        }
+
+        if (skipPostInstallValidation) {
+            return cliToInstall.name
+        }
+        // validate
+        if (cli === 'session-manager-plugin') {
+            if (!cliPath || !(await hasCliCommand(cliToInstall, false))) {
+                throw new InstallerError('Could not verify installed CLIs')
+            }
+        } else {
+            if (!cliPath) {
+                // install success but wrong exit code
+                const toolPath = await hasCliCommand(cliToInstall, true)
+                if (!toolPath) {
+                    throw new InstallerError('Could not verify installed CLIs')
+                }
+                return toolPath
+            }
+        }
+
+        return cliPath
+    } catch (err) {
+        const error = err as Error
+        if (CancellationError.isUserCancelled(err)) {
+            result = 'Cancelled'
+            getLogger().info(`Cancelled installation for: ${cli}`)
+            throw err
+        }
+
+        result = 'Failed'
+
+        void vscode.window
+            .showErrorMessage(
+                localize('AWS.cli.failedInstall', 'Installation of the {0} CLI failed.', cliToInstall.name),
+                manualInstall
+            )
+            .then((button) => {
+                if (button === manualInstall) {
+                    void openUrl(vscode.Uri.parse(cliToInstall.manualInstallLink))
+                }
+            })
+        reason = error.message
+        throw err
+    } finally {
+        if (tempDir) {
+            getLogger().info('Cleaning up installer...')
+            // nonblocking: use `then`
+            tryRemoveFolder(tempDir).then(
+                (success) => {
+                    if (success) {
+                        getLogger().info('Removed installer.')
+                    } else {
+                        getLogger().warn(`installCli: failed to clean up temp directory: ${tempDir}`)
+                    }
+                },
+                (e) => {
+                    getLogger().error('installCli: tryRemoveFolder failed: %s', (e as Error).message)
+                }
+            )
+        }
+        getLogger().info(`${cli} installation: ${result}`)
+        telemetry.aws_toolInstallation.emit({ result, reason, toolId: cli })
+    }
+}
+
+/**
+ * Returns a path to a runnable CLI. Returns global path, local path, or undefined in that order.
+ * @param cli CLI to detect
+ * @returns Executable path, or undefined if not available
+ */
+export async function getCliCommand(cli: Cli): Promise<string | undefined> {
+    const globalCommand = await hasCliCommand(cli, true)
+
+    return globalCommand ?? (await hasCliCommand(cli, false))
+}
+
+/**
+ * Returns whether or not a command is accessible on the user's $PATH
+ * @param command CLI Command name
+ */
+async function hasCliCommand(cli: Cli, global: boolean): Promise<string | undefined> {
+    const commands = getOsCommands(cli)
+    for (const command of commands ? commands : []) {
+        const cmd = global ? command : path.join(getToolkitLocalCliPath(), command)
+        const result = await new ChildProcess(cmd, ['--version']).run({
+            spawnOptions: { env: await mergeResolvedShellPath(process.env) },
+        })
+        if (result.exitCode === 0) {
+            return cmd
+        }
+    }
+}
+
+function getOsCommands(cli: Cli): Array<string> | undefined {
+    return process.platform === 'win32' ? cli.command.windows : cli.command.unix
+}
+
+function getOsArch(): string {
+    switch (process.arch) {
+        case 'x32':
+        case 'x64':
+            return 'x86'
+        case 'arm':
+        case 'arm64':
+            return 'arm'
+        default:
+            return process.arch
+    }
+}
+
+// return undefined if customer platform not supported
+function getOsCliSource(cli: Cli): string | undefined {
+    switch (process.platform) {
+        case 'win32':
+            return getOsArch() === 'x86' ? cli.source.windows?.x86 : cli.source.windows?.arm
+        case 'darwin':
+            return getOsArch() === 'x86' ? cli.source.macos?.x86 : cli.source.macos?.arm
+        case 'linux':
+            return getOsArch() === 'x86' ? cli.source.linux?.x86 : cli.source.linux?.arm
+        default:
+            throw new InvalidPlatformError(`Platform ${process.platform} is not supported for CLI autoinstallation.`)
+    }
+}
+
+async function downloadCliSource(cli: Cli, tempDir: string, timeout: Timeout): Promise<string | undefined> {
+    const installerSource = getOsCliSource(cli)
+    if (!installerSource) {
+        return
+    }
+    const destinationFile = path.join(tempDir, path.parse(installerSource).base)
+    const fetcher = new HttpResourceFetcher(installerSource, { showUrl: true, timeout })
+    getLogger().info(`Downloading installer from ${installerSource}...`)
+    await fetcher.get(destinationFile)
+
+    return destinationFile
+}
+
+function getToolkitCliDir(): string {
+    return path.join(globals.context.globalStorageUri.fsPath, 'tools')
+}
+
+/**
+ * Gets the toolkit local CLI path
+ * Instantiated as a function instead of a const to prevent being called before `ext.context` is set
+ */
+function getToolkitLocalCliPath(): string {
+    return path.join(getToolkitCliDir(), 'Amazon')
+}
+
+function handleError<T extends Promise<unknown>>(promise: T): T {
+    return promise.catch<never>((err) => {
+        if (
+            !(err instanceof CancellationError || err instanceof InstallerError || err instanceof InvalidPlatformError)
+        ) {
+            throw new InstallerError((err as Error).message)
+        }
+        throw err
+    }) as T
+}
+
+async function installSsmCli(
+    tempDir: string,
+    progress: vscode.Progress<{ message?: string; increment?: number }>,
+    timeout: Timeout
+): Promise<string> {
+    progress.report({ message: msgDownloading })
+
+    const ssmInstaller = await downloadCliSource(awsClis['session-manager-plugin'], tempDir, timeout)
+    const outDir = path.join(getToolkitLocalCliPath(), 'sessionmanagerplugin')
+    const cmd = getOsCommands(awsClis['session-manager-plugin'])
+    if (!cmd || !ssmInstaller) {
+        throw new InvalidPlatformError(`Platform ${process.platform} is not supported for CLI autoinstallation.`)
+    }
+    const finalPath = path.join(getToolkitLocalCliPath(), cmd[0])
+    const TimedProcess = ChildProcess.extend({ timeout, rejectOnError: true, rejectOnErrorCode: true })
+
+    getLogger().info(`Installing SSM CLI from ${ssmInstaller} to ${outDir}...`)
+    progress.report({ message: msgInstallingLocal })
+
+    return handleError(install())
+
+    async function install() {
+        switch (process.platform) {
+            case 'darwin':
+                return installOnMac()
+            case 'win32':
+                return installOnWindows()
+            case 'linux':
+                return installOnLinux()
+            default:
+                throw new InvalidPlatformError(
+                    `Platform ${process.platform} is not supported for CLI autoinstallation.`
+                )
+        }
+    }
+
+    async function installOnMac() {
+        const tempPath = path.join(tempDir, 'tmp')
+        const pkgArgs = ['--expand', 'session-manager-plugin.pkg', tempPath]
+        const tarArgs = ['-xzf', path.join(tempPath, 'Payload')]
+        await new TimedProcess('pkgutil', pkgArgs).run({ spawnOptions: { cwd: tempDir } })
+        await new TimedProcess('tar', tarArgs).run({ spawnOptions: { cwd: tempPath } })
+
+        await fs.copy(path.join(tempPath, 'usr', 'local', 'sessionmanagerplugin'), outDir)
+
+        return finalPath
+    }
+
+    async function installOnWindows() {
+        new admZip(ssmInstaller).extractAllTo(tempDir, true)
+        const secondZip = path.join(tempDir, 'package.zip')
+        new admZip(secondZip).extractAllTo(outDir, true)
+
+        return finalPath
+    }
+
+    async function installOnLinux() {
+        if (!ssmInstaller) {
+            throw new InvalidPlatformError(`Platform ${process.platform} is not supported for CLI autoinstallation.`)
+        }
+        const ssmDir = path.dirname(ssmInstaller)
+        // extract deb file (using ar) to ssmInstaller dir
+        await new TimedProcess('ar', ['-x', ssmInstaller]).run({ spawnOptions: { cwd: ssmDir } })
+        // extract data.tar.gz to CLI dir
+        const tarArgs = ['-xzf', path.join(ssmDir, 'data.tar.gz')]
+        await new TimedProcess('tar', tarArgs).run({ spawnOptions: { cwd: ssmDir } }), await fs.mkdir(outDir)
+        await fs.copy(path.join(ssmDir, 'usr', 'local', 'sessionmanagerplugin'), outDir)
+
+        return finalPath
+    }
+}
+
+/**
+ *
+ * @param cli The cli to install
+ * @param tempDir Temp dir to store installer
+ * @param progress Progress report
+ * @param timeout Timeout for install
+ * @returns
+ */
+async function installGui(
+    cli: AwsClis,
+    tempDir: string,
+    progress: vscode.Progress<{ message?: string; increment?: number }>,
+    timeout: Timeout
+): Promise<string | undefined> {
+    progress.report({ message: msgDownloading })
+    const TimedProcess = ChildProcess.extend({ timeout, rejectOnError: true, rejectOnErrorCode: true })
+
+    return handleError(install())
+
+    async function install() {
+        const guiInstaller = await downloadCliSource(awsClis[cli], tempDir, timeout)
+        progress.report({ message: msgInstallingLocal })
+        getLogger().info(`Installing ${cli} from ${guiInstaller}...`)
+
+        if (!guiInstaller) {
+            throw new InvalidPlatformError(`Platform ${process.platform} is not supported for CLI autoinstallation.`)
+        }
+        switch (process.platform) {
+            case 'darwin':
+                await new TimedProcess('open', [guiInstaller, '-W']).run()
+                return await getCliCommand(awsClis[cli])
+            case 'win32':
+                await new TimedProcess(guiInstaller, []).run()
+                return await getCliCommand(awsClis[cli])
+            // customer shouldn't reach this point as they will be directed to manual install link in entrypoint.
+            default:
+                throw new InvalidPlatformError(
+                    `Platform ${process.platform} is not supported for CLI autoinstallation.`
+                )
+        }
+    }
+}
+
+/**
+ * @throws {@link CancellationError} if the install times out or the user cancels
+ */
+export async function getOrInstallCli(cli: AwsClis, confirm: boolean, popup: boolean = false): Promise<string> {
+    // docker will work after restart in windows, and docker MacOS dmg installer will exit on window popup. Ignore checking for Docker
+    const skipPostInstallValidation = cli === 'docker'
+    if (DevSettings.instance.get('forceInstallTools', false)) {
+        return installCli(cli, confirm, skipPostInstallValidation)
+    } else {
+        const path = await getCliCommand(awsClis[cli])
+        // if popup, when tool is detected, show a popup message and return path
+        if (path && popup) {
+            await showCliFoundPopup(awsClis[cli].name, path)
+        }
+        return path ?? installCli(cli, confirm, skipPostInstallValidation)
+    }
+}
+
+export async function showCliFoundPopup(cli: string, path: string) {
+    void vscode.window.showInformationMessage(
+        localize('AWS.cli.cliFoundPrompt', '{0} is already installed (location: {1})', cli, path)
+    )
+}
+
+// TODO: uncomment for AWS CLI installation
+
+/**
+ * TODO: AWS CLI install on Linux requires sudo!!!
+ */
+// async function installAwsCli(
+//     tempDir: string,
+//     progress: vscode.Progress<{ message?: string; increment?: number }>
+// ): Promise<string> {
+//     progress.report({ message: msgDownloading })
+//     const awsInstaller = await downloadCliSource(AWS_CLIS.aws, tempDir)
+//     fs.chmodSync(awsInstaller, 0o700)
+
+//     getLogger().info(`Installing AWS CLI from ${awsInstaller} to ${getToolkitCliDir()}...`)
+//     progress.report({ message: msgInstallingLocal })
+//     switch (process.platform) {
+//         case 'win32': {
+//             return await installToolkitLocalMsi(awsInstaller)
+//         }
+//         case 'darwin': {
+//             // edit config file: https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2-mac.html#cliv2-mac-install-cmd-current-user
+//             const xmlPath = path.join(tempDir, 'choices.xml')
+//             fs.writeFileSync(
+//                 xmlPath,
+//                 `<?xml version="1.0" encoding="UTF-8"?>
+//             <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+//             <plist version="1.0">
+//                 <array>
+//                 <dict>
+//                     <key>choiceAttribute</key>
+//                     <string>customLocation</string>
+//                     <key>attributeSetting</key>
+//                     <string>${getToolkitLocalCliPath()}</string>
+//                     <key>choiceIdentifier</key>
+//                     <string>default</string>
+//                 </dict>
+//                 </array>
+//             </plist>`
+//             )
+//             // install
+//             return await installToolkitLocalPkg(
+//                 awsInstaller,
+//                 '--target',
+//                 'CurrentUserHomeDirectory',
+//                 '--applyChoiceChangesXML',
+//                 xmlPath
+//             )
+//         }
+//         case 'linux': {
+//             return await installToolkitLocalLinuxAwsCli(awsInstaller)
+//         }
+//         default: {
+//             throw new InvalidPlatformError(`Unsupported platform for CLI installation: ${process.platform}`)
+//         }
+//     }
+// }
+
+// async function installToolkitLocalMsi(msiPath: string): Promise<string> {
+//     if (process.platform !== 'win32') {
+//         throw new InvalidPlatformError(`Cannot install MSI files on operating system: ${process.platform}`)
+//     }
+//     const result = await new ChildProcess(
+//         true,
+//         'msiexec',
+//         undefined,
+//         '/a',
+//         msiPath,
+//         '/quiet',
+//         // use base dir: installer installs to ./Amazon/AWSCLIV2
+//         `TARGETDIR=${vscode.Uri.file(getToolkitCliDir()).fsPath}`
+//     ).run()
+//     if (result.exitCode !== 0) {
+//         throw new InstallerError(`Installation of MSI file ${msiPath} failed: Error Code ${result.exitCode}`)
+//     }
+
+//     return path.join(getToolkitCliDir(), getOsCommand(AWS_CLIS.aws))
+// }
+
+// async function installToolkitLocalPkg(pkgPath: string, ...args: string[]): Promise<string> {
+//     if (process.platform !== 'darwin') {
+//         throw new InvalidPlatformError(`Cannot install pkg files on operating system: ${process.platform}`)
+//     }
+//     const result = await new ChildProcess(true, 'installer', undefined, '--pkg', pkgPath, ...args).run()
+//     if (result.exitCode !== 0) {
+//         throw new InstallerError(`Installation of PKG file ${pkgPath} failed: Error Code ${result.exitCode}`)
+//     }
+
+//     return path.join(getToolkitCliDir(), getOsCommand(AWS_CLIS.aws))
+// }
+
+/**
+ * TODO: THIS REQUIRES SUDO!!! Potentially drop support or look into adding; unsure how we would handle having to input a password.
+ */
+// async function installToolkitLocalLinuxAwsCli(archivePath: string): Promise<string> {
+//     if (process.platform !== 'linux') {
+//         throw new InvalidPlatformError(`Cannot use Linux installer on operating system: ${process.platform}`)
+//     }
+//     const dirname = path.join(path.parse(archivePath).dir, path.parse(archivePath).name)
+//     const installDir = path.join(getToolkitCliDir(), 'Amazon', 'AWSCLIV2')
+//     new admZip(archivePath).extractAllTo(dirname, true)
+//     const result = await new ChildProcess(
+//         true,
+//         'sh',
+//         undefined,
+//         path.join(dirname, 'aws', 'install'),
+//         '-i',
+//         installDir,
+//         '-b',
+//         installDir
+//     ).run()
+//     if (result.exitCode !== 0) {
+//         throw new InstallerError(
+//             `Installation of Linux CLI archive ${archivePath} failed: Error Code ${result.exitCode}`
+//         )
+//     }
+
+//     return path.join(getToolkitCliDir(), getOsCommand(AWS_CLIS.aws))
+// }
+
+// export async function hardLinkToCliDir(dir: string, command: Cli): Promise<void> {
+//     const existingPath = path.join(dir, getOsCommand(command))
+//     const newPath = getCliPath(command)
+//     return new Promise((resolve, reject) => {
+//         getLogger().debug(`Attempting to hard link ${existingPath} to ${newPath}...`)
+//         fs.link(existingPath, newPath, err => {
+//             if (err) {
+//                 const message = `Toolkit could not create a hard link for ${existingPath} to ${newPath}`
+//                 getLogger().error(`${message}: %s`, err)
+//                 reject(new InstallerError(message))
+//             }
+//             resolve()
+//         })
+//     })
+// }
diff --git a/packages/core/src/shared/utilities/collectionUtils.ts b/packages/core/src/shared/utilities/collectionUtils.ts
new file mode 100644
index 00000000000..a5a5e83e7d6
--- /dev/null
+++ b/packages/core/src/shared/utilities/collectionUtils.ts
@@ -0,0 +1,608 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { isWeb } from '../extensionGlobals'
+import { inspect as nodeInspect } from 'util'
+import { AsyncCollection, toCollection } from './asyncCollection'
+import { SharedProp, AccumulableKeys, Coalesce, isNonNullable } from './tsUtils'
+import { truncate } from './textUtilities'
+
+export function union<T>(a: Iterable<T>, b: Iterable<T>): Set<T> {
+    const result = new Set<T>()
+
+    for (const item of a) {
+        result.add(item)
+    }
+
+    for (const item of b) {
+        result.add(item)
+    }
+
+    return result
+}
+
+export function intersection<T>(sequence1: Iterable<T>, sequence2: Iterable<T>): Set<T> {
+    const set2 = new Set(sequence2)
+
+    return new Set(filter(sequence1, (item) => set2.has(item)))
+}
+
+export function difference<T>(sequence1: Iterable<T>, sequence2: Iterable<T>): Set<T> {
+    const set2 = new Set(sequence2)
+
+    return new Set(filter(sequence1, (item) => !set2.has(item)))
+}
+
+export function complement<T>(sequence1: Iterable<T>, sequence2: Iterable<T>): Set<T> {
+    const set1 = new Set(sequence1)
+
+    return new Set(filter(sequence2, (item) => !set1.has(item)))
+}
+
+export async function toArrayAsync<T>(items: AsyncIterable<T>): Promise<T[]> {
+    const result: T[] = []
+
+    for await (const item of items) {
+        result.push(item)
+    }
+
+    return result
+}
+
+export function toMap<TKey, TValue>(
+    items: Iterable<TValue>,
+    keySelector: (item: TValue) => TKey | undefined
+): Map<TKey, TValue> {
+    const result = new Map<TKey, TValue>()
+
+    for (const item of items) {
+        const key = keySelector(item)
+        if (key) {
+            if (result.has(key)) {
+                throw new Error(`Conflict: Multiple items have the key '${key}'`)
+            }
+
+            result.set(key, item)
+        }
+    }
+
+    return result
+}
+
+export function toRecord<T, K extends PropertyKey>(keys: Iterable<K>, fn: (key: K) => T): { [P in K]: T } {
+    const result = {} as Record<K, T>
+
+    for (const key of keys) {
+        result[key] = fn(key)
+    }
+
+    return result
+}
+
+export async function toMapAsync<TKey, TValue>(
+    items: AsyncIterable<TValue>,
+    keySelector: (item: TValue) => TKey | undefined
+): Promise<Map<TKey, TValue>> {
+    const result = new Map<TKey, TValue>()
+
+    for await (const item of items) {
+        const key = keySelector(item)
+        if (key) {
+            if (result.has(key)) {
+                throw new Error(`Conflict: Multiple items have the key '${key}'`)
+            }
+
+            result.set(key, item)
+        }
+    }
+
+    return result
+}
+
+export function updateInPlace<TKey, TValue>(
+    target: Map<TKey, TValue>,
+    keys: Iterable<TKey>,
+    update: (key: TKey) => void,
+    create: (key: TKey) => TValue
+) {
+    const keySet = new Set(keys)
+
+    for (const key of difference(target.keys(), keySet)) {
+        target.delete(key)
+    }
+
+    for (const key of target.keys()) {
+        update(key)
+    }
+
+    for (const key of complement(target.keys(), keySet)) {
+        target.set(key, create(key))
+    }
+}
+
+export function* map<TIn, TOut>(sequence: Iterable<TIn>, selector: (item: TIn) => TOut): IterableIterator<TOut> {
+    for (const item of sequence) {
+        yield selector(item)
+    }
+}
+
+export function filter<T>(sequence: Iterable<T>, condition: (item: T) => boolean): T[] {
+    const result: T[] = []
+
+    for (const item of sequence) {
+        if (condition(item)) {
+            result.push(item)
+        }
+    }
+
+    return result
+}
+
+/**
+ * Gets the first item matching predicate, or undefined.
+ */
+export async function findAsync<T>(
+    sequence: Iterable<T>,
+    predicate: (item: T) => Promise<boolean>
+): Promise<T | undefined> {
+    for (const item of sequence) {
+        if (await predicate(item)) {
+            return item
+        }
+    }
+    return undefined
+}
+
+export async function* filterAsync<T>(
+    sequence: Iterable<T>,
+    condition: (item: T) => Promise<boolean>
+): AsyncIterable<T> {
+    for (const item of sequence) {
+        if (await condition(item)) {
+            yield item
+        }
+    }
+}
+
+export async function first<T>(sequence: AsyncIterable<T>): Promise<T | undefined> {
+    const head = await take(sequence, 1)
+
+    return head.length > 0 ? head[0] : undefined
+}
+
+export async function take<T>(sequence: AsyncIterable<T>, count: number): Promise<T[]> {
+    if (count <= 0) {
+        return []
+    }
+
+    const result: T[] = []
+
+    for await (const item of sequence) {
+        result.push(item)
+
+        if (result.length >= count) {
+            break
+        }
+    }
+
+    return result
+}
+
+export interface getPaginatedAwsCallIterParams<TRequest, TResponse> {
+    awsCall: (request: TRequest) => Promise<TResponse>
+    nextTokenNames: {
+        request: keyof TRequest
+        response: keyof TResponse
+    }
+    request: TRequest
+}
+
+/**
+ * Generates an iterator representing a paginated AWS call from a request and an AWS SDK call
+ * Each next() call will make a new request with the previous request's nextToken.
+ * @param params Iterator params
+ */
+export async function* getPaginatedAwsCallIter<TRequest, TResponse>(
+    params: getPaginatedAwsCallIterParams<TRequest, TResponse>
+): AsyncIterator<TResponse> {
+    let nextToken: string | undefined = undefined
+
+    while (true) {
+        const response: TResponse = await params.awsCall({
+            ...params.request,
+            [params.nextTokenNames.request]: nextToken,
+        })
+        if (response[params.nextTokenNames.response]) {
+            nextToken = response[params.nextTokenNames.response] as any as string
+        } else {
+            // done; returns last response with { done: true }
+            return response
+        }
+
+        yield response
+    }
+}
+
+/**
+ * Represents an iterator that tranforms another iterator into an array of QuickPickItems.
+ * Additionally, has a reset functionality to reset the iterator to its initial state.
+ * @template TIteratorOutput Iterator output value type
+ * @template TTransformerOutput Transformer output value type
+ */
+export class IteratorTransformer<TIteratorOutput, TTransformerOutput> {
+    /**
+     * @param iteratorFactory Function that returns an iterator, with all default state values set. E.g. `collectionUtils.getPaginatedAwsCallIter`
+     * @param transform Function which transforms a response from the iterator into an array of `vscode.QuickPickItem`s.
+     */
+    public constructor(
+        private readonly iteratorFactory: () => AsyncIterator<TIteratorOutput>,
+        private readonly transform: (response: TIteratorOutput) => TTransformerOutput[]
+    ) {}
+
+    /**
+     * Generates an iterator which returns an array of formatted QuickPickItems on `.next()`
+     */
+    public async *createPickIterator(): AsyncIterator<TTransformerOutput[]> {
+        const iterator = this.iteratorFactory()
+        while (true) {
+            const nextResult = await iterator.next()
+            const transformedResult = this.transform(nextResult.value)
+
+            // return (instead of yield) marks final value as done
+            if (nextResult.done) {
+                return transformedResult
+            }
+
+            yield transformedResult
+        }
+    }
+}
+
+/**
+ * Push if condition is true, useful for adding CLI arguments, and avoiding this kind of situation:
+ * if (x && y) {
+ *     arr.push(item2)
+ *     if(z) {
+ *         arr.push(item)
+ *     }
+ * }
+ * @param arr The array to push to
+ * @param condition conditional that determines if we will push to the array
+ * @param elements The additional items to append to the array
+ */
+export function pushIf<T>(arr: T[], condition: boolean, ...elements: T[]): T[] {
+    if (condition) {
+        arr.push(...elements)
+    }
+    return arr
+}
+
+/**
+ * Nearly equivalent to {@link Object.assign} except that `undefined` values are ignored.
+ *
+ * Directly mutates {@link target}. The function signature should be read as assigning {@link data}
+ * _into_ {@link target}.
+ */
+export function assign<T extends Record<any, any>, U extends Partial<T>>(data: T, target: U): asserts target is T & U {
+    for (const [k, v] of Object.entries(data)) {
+        if (v !== undefined) {
+            target[k as keyof U] = v
+        }
+    }
+}
+
+/**
+ * Clones an object (copies "own properties") until `depth`, where:
+ * - depth=0 returns non-object value, or empty object (`{}` or `[]`).
+ * - depth=1 returns `obj` with its immediate children (but not their children).
+ * - depth=2 returns `obj` with its children and their children.
+ * - and so on...
+ *
+ *
+ * @param obj Object to clone.
+ * @param depth
+ * @param omitKeys Omit properties matching these names (at any depth).
+ * @param replacement Replacement for object whose fields extend beyond `depth`, and properties matching `omitKeys`.
+ * @param maxStringLength truncates string values that exceed this threshold (includes values in nested arrays)
+ */
+export function partialClone(
+    obj: any,
+    depth: number = 3,
+    omitKeys: string[] = [],
+    options?: {
+        replacement?: any
+        maxStringLength?: number
+    }
+): any {
+    // Base case: If input is not an object or has no children, return it.
+    if (typeof obj !== 'object' || obj === null || 0 === Object.getOwnPropertyNames(obj).length) {
+        if (typeof obj === 'string' && options?.maxStringLength) {
+            return truncate(obj, options?.maxStringLength, '...')
+        }
+        return obj
+    }
+
+    // Create a new object of the same type as the input object.
+    const clonedObj = Array.isArray(obj) ? [] : {}
+
+    if (depth === 0) {
+        return options?.replacement ? options.replacement : clonedObj
+    }
+
+    // Recursively clone properties of the input object
+    for (const key in obj) {
+        if (omitKeys.includes(key)) {
+            ;(clonedObj as any)[key] = options?.replacement ? options.replacement : Array.isArray(obj) ? [] : {}
+        } else if (Object.prototype.hasOwnProperty.call(obj, key)) {
+            ;(clonedObj as any)[key] = partialClone(obj[key], depth - 1, omitKeys, options)
+        }
+    }
+
+    return clonedObj
+}
+
+/**
+ * Wrapper around nodes inspect function that works on web. Defaults to JSON.stringify on web.
+ * @param obj object to show
+ * @param opt options for showing (ex. depth, omitting keys)
+ */
+export function inspect(obj: any, opt?: { depth: number }): string {
+    const options = {
+        depth: opt?.depth ?? 3,
+    }
+    return isWeb() ? JSON.stringify(partialClone(obj, options.depth), undefined, 2) : nodeInspect(obj, options)
+}
+
+/** Recursively delete undefined key/value pairs */
+export function stripUndefined<T extends Record<string, any>>(
+    obj: T
+): asserts obj is { [P in keyof T]-?: NonNullable<T[P]> } {
+    for (const key of Object.keys(obj)) {
+        if (obj[key] === undefined) {
+            delete obj[key]
+        } else if (typeof obj[key] === 'object') {
+            stripUndefined(obj[key])
+        }
+    }
+}
+
+export function isAsyncIterable(obj: any): obj is AsyncIterable<unknown> {
+    return obj && typeof obj === 'object' && typeof obj[Symbol.asyncIterator] === 'function'
+}
+
+/**
+ * Converts a 'paged' API request to a collection of sequential API requests
+ * based off a 'mark' (the paginated token field) and a `prop` which is an
+ * Accumulable property on the response interface.
+ *
+ * Note: aws-sdk-js-v3 provides service-specific paginateXX() functions:
+ * https://aws.amazon.com/blogs/developer/pagination-using-async-iterators-in-modular-aws-sdk-for-javascript/
+ *
+ * @param requester Asynchronous function to make the API requests with.
+ * @param request Initial request to apply to the API calls.
+ * @param mark Property name (ex: "nextToken") of the paginated token field shared by the input/output shapes.
+ * @param prop Property name (ex: "items") of an "Accumulable" field in the output shape.
+ * @returns An {@link AsyncCollection} resolving to the type described by the `prop` field
+ */
+export function pageableToCollection<
+    TRequest,
+    TResponse,
+    TTokenProp extends SharedProp<TRequest, TResponse>,
+    TTokenType extends TRequest[TTokenProp] & TResponse[TTokenProp],
+    TResult extends AccumulableKeys<TResponse> = never,
+>(
+    requester: (request: TRequest) => Promise<TResponse>,
+    request: TRequest,
+    mark: TTokenProp,
+    prop?: TResult
+): AsyncCollection<Coalesce<TResponse[TResult], TResponse>> {
+    async function* gen() {
+        do {
+            const response: TResponse = await requester(request)
+            const result = (prop ? response[prop] : response) as Coalesce<TResponse[TResult], TResponse>
+            if (!response[mark]) {
+                return result
+            }
+            yield result
+            request[mark] = response[mark] as TTokenType
+        } while (request[mark])
+    }
+
+    return toCollection(gen)
+}
+
+/**
+ * Converts an iterable of promises into an unordered stream of values.
+ *
+ * The resulting stream will throw if any of the promises are rejected.
+ */
+export async function* toStream<T>(values: Iterable<T | Promise<T>>): AsyncGenerator<T, void> {
+    const unresolved = new Map<number, Promise<{ index: number; data: T }>>()
+    for (const val of values) {
+        if (val instanceof Promise) {
+            const index = unresolved.size
+            unresolved.set(
+                index,
+                val.then((data) => ({ index, data }))
+            )
+        } else {
+            yield val
+        }
+    }
+
+    while (unresolved.size > 0) {
+        const { index, data } = await Promise.race(unresolved.values())
+        unresolved.delete(index)
+        yield data
+    }
+}
+
+export function* partition<T>(iterable: Iterable<T>, size: number): Generator<T[]> {
+    let batch = []
+    for (const element of iterable) {
+        batch.push(element)
+        if (batch.length === size) {
+            yield batch
+            batch = []
+        }
+    }
+    if (batch.length > 0) {
+        yield batch
+    }
+}
+
+interface IndexedResult<T, U> {
+    readonly index: number
+    readonly result: IteratorResult<T, U>
+}
+
+interface IterableState<T, U> {
+    readonly iterator: AsyncIterator<T, U>
+    pending?: Promise<IndexedResult<T, U>>
+    completed?: boolean
+}
+
+class AsyncIterableCollection<T, U = undefined> {
+    readonly #iterables: IterableState<T, U>[] = []
+
+    public get completed(): boolean {
+        return this.#iterables.every((s) => s.completed)
+    }
+
+    /**
+     * Adds an iterable, returning the associated index
+     */
+    public add(iterable: AsyncIterable<T>): number {
+        const iterator = iterable[Symbol.asyncIterator]()
+
+        return this.#iterables.push({ iterator }) - 1
+    }
+
+    /**
+     * Gets the next result from all iterables.
+     *
+     * The index associated with the iterable is returned alongside the result.
+     * Throws if no value is available. Check {@link completed} prior to calling this method.
+     */
+    public async next(): Promise<IndexedResult<T, U>> {
+        const promises = this.#iterables.map((s, i) => this.getPending(s, i)).filter(isNonNullable)
+        if (promises.length === 0) {
+            throw new Error('Cannot get next element when all iterators have been consumed')
+        }
+
+        const val = await Promise.race(promises)
+        this.#iterables[val.index].pending = undefined
+
+        if (val.result.done) {
+            this.#iterables[val.index].completed = true
+        }
+
+        return val
+    }
+
+    private getPending(state: IterableState<T, U>, index: number) {
+        if (state.completed) {
+            return
+        } else if (state.pending) {
+            return state.pending
+        } else {
+            const pending = state.iterator.next().then((result) => ({ index, result }))
+            state.pending = pending
+
+            return pending
+        }
+    }
+}
+
+/**
+ * Joins two async iterables into a single generator.
+ *
+ * Values from each iterable are yielded as soon as they resolve. The order of values is preserved with respect
+ * to the source iterable but not necessarily other iterables. This can be imagined as popping off all elements
+ * of two stacks randomly: elements from the same stack will be in order while elements from different stacks
+ * can be in any order.
+ */
+export async function* join<T, U>(left: AsyncIterable<T>, right: AsyncIterable<U>): AsyncGenerator<T | U, void> {
+    const iterables = new AsyncIterableCollection<T | U>()
+    iterables.add(left)
+    iterables.add(right)
+
+    do {
+        const next = await iterables.next()
+        if (!next.result.done) {
+            yield next.result.value
+        }
+    } while (!iterables.completed)
+}
+
+/**
+ * Similar to {@link join} but can handle an async iterable of async iterables.
+ */
+export async function* joinAll<T>(iterable: AsyncIterable<AsyncIterable<T>>): AsyncGenerator<T, void> {
+    const iterables = new AsyncIterableCollection<T | AsyncIterable<T>>()
+    const mainIndex = iterables.add(iterable)
+
+    do {
+        const next = await iterables.next()
+        if (next.result.done) {
+            continue
+        }
+        if (next.index === mainIndex && isAsyncIterable(next.result.value)) {
+            iterables.add(next.result.value)
+        } else {
+            yield next.result.value as T
+        }
+    } while (!iterables.completed)
+}
+
+export async function* asyncGenerator<T>(items: T[]): AsyncIterableIterator<T> {
+    yield* items
+}
+
+export function intoCollection<T>(arr: T[]): AsyncCollection<T> {
+    return toCollection(async function* () {
+        yield* arr
+    })
+}
+
+export function createCollectionFromPages<T>(...pages: T[]): AsyncCollection<T> {
+    return toCollection(async function* () {
+        for (let i = 0; i < pages.length - 1; i++) {
+            yield pages[i]
+        }
+
+        return pages[pages.length - 1]
+    })
+}
+export function isPresent<T>(value: T | undefined): value is T {
+    return value !== undefined
+}
+
+export class CircularBuffer<T> {
+    private buffer = new Set<T>()
+    private maxSize: number
+
+    constructor(size: number) {
+        this.maxSize = size
+    }
+
+    add(value: T): void {
+        if (this.buffer.size >= this.maxSize) {
+            // Set iterates its keys in insertion-order.
+            // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Set
+            const firstKey = this.buffer.keys().next().value
+            this.buffer.delete(firstKey as T)
+        }
+        this.buffer.add(value)
+    }
+
+    contains(value: T): boolean {
+        return this.buffer.has(value)
+    }
+
+    clear(): void {
+        this.buffer.clear()
+    }
+}
diff --git a/packages/core/src/shared/utilities/commentUtils.ts b/packages/core/src/shared/utilities/commentUtils.ts
new file mode 100644
index 00000000000..755163c1e0e
--- /dev/null
+++ b/packages/core/src/shared/utilities/commentUtils.ts
@@ -0,0 +1,106 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import vscode from 'vscode'
+import { SecurityScanLanguageId } from '../../codewhisperer/models/constants'
+
+interface CommentConfig {
+    lineComment?: string
+    blockComment?: [string, string]
+}
+
+const defaultCommentConfig: CommentConfig = { lineComment: '//', blockComment: ['/*', '*/'] }
+
+const languageCommentConfig: Record<SecurityScanLanguageId, CommentConfig | undefined> = {
+    java: defaultCommentConfig,
+    python: { lineComment: '#', blockComment: ["'''", "'''"] },
+    javascript: defaultCommentConfig,
+    javascriptreact: defaultCommentConfig,
+    typescript: defaultCommentConfig,
+    typescriptreact: defaultCommentConfig,
+    csharp: defaultCommentConfig,
+    c: defaultCommentConfig,
+    cpp: defaultCommentConfig,
+    go: defaultCommentConfig,
+    php: defaultCommentConfig,
+    ruby: { lineComment: '#', blockComment: ['=begin', '=end'] },
+    golang: defaultCommentConfig,
+    json: undefined,
+    yaml: { lineComment: '#' },
+    tf: { lineComment: '#', blockComment: defaultCommentConfig.blockComment },
+    hcl: { lineComment: '#', blockComment: defaultCommentConfig.blockComment },
+    terraform: { lineComment: '#', blockComment: defaultCommentConfig.blockComment },
+    terragrunt: { lineComment: '#', blockComment: defaultCommentConfig.blockComment },
+    packer: { lineComment: '#', blockComment: defaultCommentConfig.blockComment },
+    plaintext: undefined,
+    jsonc: { lineComment: '//' },
+    xml: { blockComment: ['<!--', '-->'] },
+    toml: { lineComment: '#' },
+    'pip-requirements': { lineComment: '#' },
+    'java-properties': { lineComment: '#' },
+    'go.mod': { lineComment: '//' },
+    'go.sum': undefined,
+    kotlin: defaultCommentConfig,
+    scala: defaultCommentConfig,
+    sh: { lineComment: '#', blockComment: [": '", "'"] },
+    shell: { lineComment: '#', blockComment: [": '", "'"] },
+    shellscript: { lineComment: '#', blockComment: [": '", "'"] },
+    brazilPackageConfig: { lineComment: '#' },
+}
+
+export function getLanguageCommentConfig(languageId: string): CommentConfig {
+    return languageCommentConfig[languageId as SecurityScanLanguageId] ?? {}
+}
+
+export function detectCommentAboveLine(document: vscode.TextDocument, line: number, comment: string): boolean {
+    const languageId = document.languageId
+
+    const { lineComment, blockComment } = getLanguageCommentConfig(languageId)
+
+    for (let i = line - 1; i >= 0; i--) {
+        const lineText = document.lineAt(i).text.trim()
+        if (lineText === '') {
+            continue
+        }
+        if (lineComment && lineComment.length && lineText.startsWith(lineComment) && lineText.includes(comment)) {
+            return true
+        }
+        if (blockComment && blockComment.length === 2) {
+            const [blockCommentStart, blockCommentEnd] = blockComment
+            if (
+                lineText.startsWith(blockCommentStart) &&
+                lineText.includes(comment) &&
+                lineText.endsWith(blockCommentEnd)
+            ) {
+                return true
+            }
+        }
+        return false
+    }
+
+    return false
+}
+
+export function insertCommentAboveLine(document: vscode.TextDocument, line: number, comment: string): void {
+    const languageId = document.languageId
+    const { lineComment, blockComment } = getLanguageCommentConfig(languageId)
+    if (!lineComment && !blockComment) {
+        return
+    }
+
+    const edit = new vscode.WorkspaceEdit()
+    const previousLine = Math.max(0, line - 1)
+    const previousLineLength = previousLine > 0 ? document.lineAt(previousLine).text.length : 0
+    const position = new vscode.Position(previousLine, previousLineLength)
+    const indent = ' '.repeat(Math.max(0, document.lineAt(line).firstNonWhitespaceCharacterIndex))
+    const commentPrefix = line === 0 ? '' : '\n'
+    const commentText = lineComment
+        ? `${commentPrefix}${indent}${lineComment} ${comment}`
+        : blockComment?.[0] && blockComment[1]
+          ? `${commentPrefix}${indent}${blockComment[0]} ${comment} ${blockComment[1]}`
+          : `${commentPrefix}${indent}${defaultCommentConfig.lineComment} ${comment}`
+    edit.insert(document.uri, position, commentText)
+    void vscode.workspace.applyEdit(edit)
+}
diff --git a/packages/core/src/shared/utilities/debuggerUtils.ts b/packages/core/src/shared/utilities/debuggerUtils.ts
new file mode 100644
index 00000000000..b08068a8b60
--- /dev/null
+++ b/packages/core/src/shared/utilities/debuggerUtils.ts
@@ -0,0 +1,9 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { getPortPromise } from 'portfinder'
+
+export async function getStartPort(port: number = 5858): Promise<number> {
+    return getPortPromise({ port: port })
+}
diff --git a/packages/core/src/shared/utilities/diffUtils.ts b/packages/core/src/shared/utilities/diffUtils.ts
new file mode 100644
index 00000000000..994f91a5434
--- /dev/null
+++ b/packages/core/src/shared/utilities/diffUtils.ts
@@ -0,0 +1,189 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import vscode from 'vscode'
+import path from 'path'
+import { applyPatch, parsePatch, type LinesOptions, diffLines, Change } from 'diff'
+import { tempDirPath } from '../filesystemUtilities'
+import fs from '../fs/fs'
+import { amazonQDiffScheme } from '../constants'
+import { ContentProvider } from '../../amazonq/commons/controllers/contentController'
+import { disposeOnEditorClose } from './editorUtilities'
+import { getLogger } from '../logger/logger'
+import jaroWinkler from 'jaro-winkler'
+
+/**
+ * Get the patched code from a file and a patch.
+ * If snippetMode is true, it will return the code snippet that was changed.
+ * Otherwise, it will return the entire file with the changes applied.
+ *
+ * @param filePath The file being patched
+ * @param patch The patch to apply
+ * @param snippetMode Whether to return a snippet or the entire code
+ * @returns The patched code
+ */
+export async function getPatchedCode(filePath: string, patch: string, snippetMode = false) {
+    const document = await vscode.workspace.openTextDocument(filePath)
+    const fileContent = document.getText().replaceAll('\r\n', '\n')
+    // Usage with the existing getPatchedCode function:
+
+    let updatedPatch = patch
+    let updatedContent = applyPatch(fileContent, updatedPatch, { fuzzFactor: 4 })
+    if (!updatedContent) {
+        updatedPatch = updatePatchLineNumbers(patch, 1)
+        updatedContent = applyPatch(fileContent, updatedPatch, { fuzzFactor: 4 })
+        if (!updatedContent) {
+            return ''
+        }
+    }
+
+    if (!snippetMode) {
+        return updatedContent
+    }
+
+    const [parsedDiff] = parsePatch(updatedPatch)
+    const { lines, oldStart } = parsedDiff.hunks[0]
+    const deletionLines = lines.filter((line) => line.startsWith('-'))
+    const startLine = oldStart - 1
+    const endLine = startLine + lines.length - deletionLines.length
+    return updatedContent.split('\n').slice(startLine, endLine).join('\n')
+}
+
+function updatePatchLineNumbers(patch: string, offset: number): string {
+    // Regular expression to match the @@ line with capturing groups for the numbers
+    const lineNumberRegex = /@@ -(\d+),(\d+) \+(\d+),(\d+) @@/g
+    return patch.replace(
+        lineNumberRegex,
+        (match: string, oldStart: string, oldCount: string, newStart: string, newCount: string) => {
+            // Convert to numbers and adjust by offset
+            const adjustedOldStart = Math.max(1, parseInt(oldStart) + offset)
+            const adjustedNewStart = Math.max(1, parseInt(newStart) + offset)
+
+            // Create new @@ line with adjusted numbers
+            return `@@ -${adjustedOldStart},${oldCount} +${adjustedNewStart},${newCount} @@`
+        }
+    )
+}
+
+/**
+ * Preview the diff of a file with a patch in vscode native diff view.
+ * Creates a temporary file with the patched code to do the comparison.
+ *
+ * @param filePath The file being patched
+ * @param patch The patch to apply
+ * @returns
+ */
+export async function previewDiff(filePath: string, patch: string) {
+    const patchedCode = await getPatchedCode(filePath, patch)
+    const file = path.parse(filePath)
+    const tmpFilePath = path.join(tempDirPath, `${file.name}_proposed-${Date.now()}${file.ext}`)
+    const tmpFileUri = vscode.Uri.parse(`${amazonQDiffScheme}:${tmpFilePath}`)
+
+    await fs.writeFile(tmpFilePath, patchedCode)
+    const contentProvider = new ContentProvider(tmpFileUri)
+    const disposable = vscode.workspace.registerTextDocumentContentProvider(amazonQDiffScheme, contentProvider)
+
+    await vscode.commands.executeCommand(
+        'vscode.diff',
+        vscode.Uri.file(filePath),
+        tmpFileUri,
+        getDiffTitle(file.base),
+        <vscode.TextDocumentShowOptions>{ preview: true, viewColumn: vscode.ViewColumn.One }
+    )
+
+    disposeOnEditorClose(tmpFileUri, disposable)
+    await fs.delete(tmpFilePath)
+}
+
+export async function closeDiff(filePath: string) {
+    vscode.window.tabGroups.all.flatMap(({ tabs }) =>
+        tabs.map((tab) => {
+            if (tab.label === getDiffTitle(path.basename(filePath))) {
+                const tabClosed = vscode.window.tabGroups.close(tab)
+                if (!tabClosed) {
+                    getLogger().error('Unable to close the diff view tab for %s', tab.label)
+                }
+            }
+        })
+    )
+}
+
+function getDiffTitle(fileName: string) {
+    return `${fileName}: Original ↔ ${fileName}`
+}
+
+/**
+ * Calculates the number of added characters and lines between existing content and LLM response
+ *
+ * @param existingContent The original text content before changes
+ * @param llmResponse The new text content from the LLM
+ * @returns An object containing:
+ *          - addedChars: Total number of new characters added
+ *          - addedLines: Total number of new lines added
+ *
+ */
+export function getDiffCharsAndLines(
+    existingContent: string,
+    llmResponse: string
+): {
+    addedChars: number
+    addedLines: number
+} {
+    let addedChars = 0
+    let addedLines = 0
+    const diffs = diffLines(existingContent, llmResponse, {
+        stripTrailingCr: true,
+        ignoreNewlineAtEof: true,
+    } as LinesOptions)
+
+    // eslint-disable-next-line unicorn/no-array-for-each
+    diffs.forEach((part: Change) => {
+        if (part.added) {
+            addedChars += part.value.length
+            addedLines += part.count ?? part.value.split('\n').length
+        }
+    })
+
+    return {
+        addedChars,
+        addedLines,
+    }
+}
+
+/**
+ * Extracts modified lines by comparing added and removed lines.
+ * @param addedLines The array of added lines.
+ * @param removedLines The array of removed lines.
+ * @returns A Map where keys are removed lines and values are the corresponding modified (added) lines.
+ */
+export function getModifiedLinesFromCode(addedLines: string[], removedLines: string[]): Map<string, string> {
+    const modifiedMap = new Map<string, string>()
+    let addedIndex = 0
+
+    // For each removed line, find the most similar added line
+    for (const removedLine of removedLines) {
+        let bestMatchIndex = -1
+
+        for (let i = addedIndex; i < addedLines.length; i++) {
+            const addedLine = addedLines[i]
+            const score = jaroWinkler(removedLine, addedLine)
+            if (score > 0.5) {
+                bestMatchIndex = i
+                break
+            }
+        }
+
+        if (bestMatchIndex !== -1) {
+            // Map the removed line to the most similar added line
+            modifiedMap.set(removedLine, addedLines[bestMatchIndex])
+            // Move addedIndex to the next line after the match
+            addedIndex = bestMatchIndex + 1
+        } else {
+            // No match found for this removed line, move on
+            continue
+        }
+    }
+
+    return modifiedMap
+}
diff --git a/packages/core/src/shared/utilities/download.ts b/packages/core/src/shared/utilities/download.ts
new file mode 100644
index 00000000000..bcd483cd66b
--- /dev/null
+++ b/packages/core/src/shared/utilities/download.ts
@@ -0,0 +1,46 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { CodeWhispererStreaming, ExportResultArchiveCommandInput } from '@amzn/codewhisperer-streaming'
+import { ToolkitError } from '../errors'
+import fs from '../fs/fs'
+import { RegionProfile } from '../../codewhisperer/models/model'
+
+/**
+ * This class represents the structure of the archive returned by the ExportResultArchive endpoint
+ */
+export class ExportResultArchiveStructure {
+    static readonly PathToSummary = 'summary/summary.md'
+    static readonly PathToDiffPatch = 'patch/diff.patch'
+    static readonly PathToPatch = 'patch'
+    static readonly PathToMetrics = 'metrics/metrics.json'
+    static readonly PathToManifest = 'manifest.json'
+}
+
+export async function downloadExportResultArchive(
+    cwStreamingClient: CodeWhispererStreaming,
+    exportResultArchiveArgs: ExportResultArchiveCommandInput,
+    toPath: string,
+    profile: RegionProfile | undefined
+) {
+    const result = await cwStreamingClient.exportResultArchive({ ...exportResultArchiveArgs, profileArn: profile?.arn })
+
+    const buffer = []
+
+    if (result.body === undefined) {
+        throw new ToolkitError('Empty response from Amazon Q inline suggestions streaming service')
+    }
+
+    for await (const chunk of result.body) {
+        if (chunk.binaryPayloadEvent) {
+            const chunkData = chunk.binaryPayloadEvent
+            if (chunkData.bytes) {
+                buffer.push(chunkData.bytes)
+            }
+        }
+    }
+
+    await fs.writeFile(toPath, Buffer.concat(buffer))
+}
diff --git a/packages/core/src/shared/utilities/downloadPatterns.ts b/packages/core/src/shared/utilities/downloadPatterns.ts
new file mode 100644
index 00000000000..12f4fb04b9c
--- /dev/null
+++ b/packages/core/src/shared/utilities/downloadPatterns.ts
@@ -0,0 +1,80 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import fetch from 'node-fetch'
+import fs from '../fs/fs'
+import AdmZip from 'adm-zip'
+import { getLogger } from '../logger/logger'
+import * as vscode from 'vscode'
+import * as path from 'path'
+import { ToolkitError } from '../errors'
+
+// Get pattern code and save it in temporary folder
+async function fetchUrl(owner: string, repoName: string, assetName: string): Promise<Buffer> {
+    const url = `https://github.com/${owner}/${repoName}/releases/latest/download/${assetName}`
+    getLogger().info(`Fetching URL: ${url}`)
+
+    const response = await fetch(url)
+    if (!response.ok) {
+        getLogger().error(`Failed to fetch the latest release: ${response.statusText}`)
+        throw new ToolkitError(`Failed to fetch the latest release: ${response.statusText}`)
+    }
+    return Buffer.from(await response.arrayBuffer())
+}
+
+/**
+ * Asynchronously extracts a ZIP file from a buffer into a specified directory, with optional removal
+ * of the top-level directory from the extracted paths. Pattern in this case refers to sample application
+ * patterns like those found in Serverlessland or other AWS repositories.
+ *
+ */
+async function unzipPattern(buffer: Buffer, outputDir: vscode.Uri, removeTopDir: boolean): Promise<void> {
+    const zip = new AdmZip(buffer)
+    const zipEntries = zip.getEntries()
+
+    try {
+        await Promise.all(
+            zipEntries.map(async (entry) => {
+                let subPath = entry.entryName
+                // Admzip won't change path sep based on system type
+                const pathArray = entry.entryName.split('/')
+                if (removeTopDir) {
+                    // remove top dir
+                    pathArray.shift()
+                }
+                subPath = pathArray.join(path.sep)
+                const entryPath = vscode.Uri.joinPath(outputDir, subPath)
+
+                if (!(await fs.existsDir(entryPath))) {
+                    if (entry.isDirectory) {
+                        await fs.mkdir(entryPath)
+                    } else {
+                        const fileData = entry.getData()
+                        await fs.writeFile(entryPath, fileData)
+                    }
+                } else {
+                    if (!entry.isDirectory) {
+                        // the file we are creating has the same name of an exising dir
+                        getLogger().warn(`${entryPath.fsPath} skipped: Existing folder has conflicting name`)
+                    }
+                }
+            })
+        )
+    } catch (err) {
+        getLogger().error(`Error decompressing zip file: ${err}`)
+        throw new ToolkitError(`Error decompressing zip file: ${err}`)
+    }
+}
+
+export async function getPattern(
+    owner: string,
+    repoName: string,
+    assetName: string,
+    outputDir: vscode.Uri,
+    removeTopDir: boolean = false
+) {
+    const data = await fetchUrl(owner, repoName, assetName)
+    await unzipPattern(data, outputDir, removeTopDir)
+    getLogger().info(`Decompressed files are saved in ${outputDir.fsPath}`)
+}
diff --git a/packages/core/src/shared/utilities/editorUtilities.ts b/packages/core/src/shared/utilities/editorUtilities.ts
new file mode 100644
index 00000000000..4b70bef00c0
--- /dev/null
+++ b/packages/core/src/shared/utilities/editorUtilities.ts
@@ -0,0 +1,80 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as _path from 'path'
+import { Settings } from '../settings'
+
+const defaultTabSize = 4
+
+export function isTextEditor(editor: vscode.TextEditor): boolean {
+    const scheme = editor.document.uri.scheme
+    return scheme !== 'debug' && scheme !== 'output' && scheme !== 'vscode-terminal'
+}
+
+export function getTabSizeSetting(): number {
+    return Settings.instance.getSection('editor').get('tabSize', defaultTabSize)
+}
+
+export function getInlineSuggestEnabled(): boolean {
+    return Settings.instance.getSection('editor').get('inlineSuggest.enabled', true)
+}
+
+/**
+ * Unlike vscode.window.visibleTextEditors, which will only return the "visible" files in the IDE, this function will return all files opened in the IDE.
+ * Note: vscode.workspace.textDocuments has similar behavior as vscode.window.visibleTextEditors does, thus not apply to this use case
+ * See also: https://github.com/microsoft/vscode/issues/8886#issuecomment-259158438
+ * @param filterPredicate a predicate with file path as the argument used to filter all opened files
+ * @returns if no filterPredicate is provided, it will return all files in the IDE tabs otherwise the result matching the predicate
+ */
+export async function getOpenFilesInWindow(
+    filterPredicate?: (filePath: string) => Promise<boolean>
+): Promise<string[]> {
+    const filesOpenedInEditor: string[] = []
+
+    try {
+        const tabArrays = vscode.window.tabGroups.all
+        for (const tabArray of tabArrays) {
+            for (const tab of tabArray.tabs) {
+                filesOpenedInEditor.push((tab.input as any).uri.fsPath)
+            }
+        }
+    } catch (e) {
+        // Older versions of VSC do not have the tab API
+    }
+
+    if (filterPredicate) {
+        // since we are not able to use async predicate in array.filter
+        // return filesOpenedInEditor.filter(async filePath => await filterPredicate(filePath))
+        const resultsWithNulls = await Promise.all(
+            filesOpenedInEditor.map(async (file) => {
+                const aResult = await filterPredicate(file)
+                return aResult ? file : undefined
+            })
+        )
+
+        return resultsWithNulls.filter((item) => item !== undefined) as string[]
+    } else {
+        return filesOpenedInEditor
+    }
+}
+
+/**
+ * Disposes of resources (content provider) when the temporary diff editor is closed.
+ *
+ * @param {vscode.Uri} tempFileUri - The URI of the temporary file used for diff comparison.
+ * @param {vscode.Disposable} disposable - The disposable resource to be cleaned up (e.g., content provider).
+ */
+export function disposeOnEditorClose(tempFileUri: vscode.Uri, disposable: vscode.Disposable) {
+    vscode.window.onDidChangeVisibleTextEditors(() => {
+        if (
+            !vscode.window.visibleTextEditors.some(
+                (editor) => editor.document.uri.toString() === tempFileUri.toString()
+            )
+        ) {
+            disposable.dispose()
+        }
+    })
+}
diff --git a/packages/core/src/shared/utilities/functionUtils.ts b/packages/core/src/shared/utilities/functionUtils.ts
new file mode 100644
index 00000000000..fa0e61847bb
--- /dev/null
+++ b/packages/core/src/shared/utilities/functionUtils.ts
@@ -0,0 +1,230 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { CircularBuffer } from './collectionUtils'
+import { Timeout } from './timeoutUtils'
+
+/**
+ * Creates a function that always returns a 'shared' Promise.
+ *
+ * This is essentially a 'debounce' or unkeyed 'lock' for async functions.
+ *
+ * #### Example
+ * ```ts
+ * const foo = shared(async () => console.log('bar'))
+ *
+ * const f1 = foo() // 'bar' is printed
+ * const f2 = foo() // nothing happens
+ *
+ * // Same event loop, equal by reference
+ * assert.strictEqual(f1, f2)
+ *
+ * // The promise is not freed until the next event loop
+ * await f1
+ *
+ * const f3 = foo() // 'bar' is printed
+ * assert.notStrictEqual(f1, f3)
+ * ```
+ */
+export function shared<T, U extends any[]>(fn: (...args: U) => Promise<T>): (...args: U) => Promise<T> {
+    let p: Promise<T> | undefined
+
+    return (...args) => (p ??= fn(...args).finally(() => (p = undefined)))
+}
+
+/**
+ * Special-case of `memoize`: creates a function that is executed only once.
+ */
+export function once<T>(fn: () => T): () => T {
+    let val: T
+    let ran = false
+
+    return () => (ran ? val : ((val = fn()), (ran = true), val))
+}
+
+/**
+ * Special-case of `memoize`: creates a function that runs only if the args
+ * changed versus the previous invocation.
+ *
+ * @note See note on {@link memoize}
+ *
+ * TODO: use lib?: https://github.com/anywhichway/nano-memoize
+ */
+export function onceChanged<T, U extends any[]>(fn: (...args: U) => T): (...args: U) => T {
+    let val: T
+    let ran = false
+    let prevArgs = ''
+
+    return (...args) =>
+        ran && prevArgs === args.map(String).join(':')
+            ? val
+            : ((val = fn(...args)), (ran = true), (prevArgs = args.map(String).join(':')), val)
+}
+
+/**
+ * Creates a function that runs only if the args changed versus the previous invocation,
+ * using a custom comparator function for argument comparison.
+ *
+ * @param fn The function to wrap
+ * @param comparator Function that returns true if arguments are equal
+ */
+export function onceChangedWithComparator<T, U extends any[]>(
+    fn: (...args: U) => T,
+    comparator: (prev: U, current: U) => boolean
+): (...args: U) => T {
+    let val: T
+    let ran = false
+    let prevArgs: U
+
+    return (...args) => {
+        if (ran && comparator(prevArgs, args)) {
+            return val
+        }
+        val = fn(...args)
+        ran = true
+        prevArgs = args
+        return val
+    }
+}
+
+/**
+ * Creates a new function that stores the result of a call.
+ *
+ * @note This uses an extremely simple mechanism for creating keys from parameters.
+ * Objects are effectively treated as a single key, while primitive values will behave as
+ * expected with a few very uncommon exceptions.
+ *
+ * TODO: use lib?: https://github.com/anywhichway/nano-memoize
+ */
+export function memoize<T, U extends any[]>(fn: (...args: U) => T): (...args: U) => T {
+    const cache: { [key: string]: T | undefined } = {}
+
+    return (...args) => (cache[args.map(String).join(':')] ??= fn(...args))
+}
+
+/**
+ * Prevents a function from executing until {@link delay} milliseconds have passed
+ * since the last invocation. Omitting {@link delay} will not execute the function for
+ * a single event loop.
+ *
+ * Multiple calls made during the debounce window will receive references to the
+ * same Promise similar to {@link shared}. The window will also be 'rolled', delaying
+ * the execution by another {@link delay} milliseconds.
+ *
+ * This function prevents execution until {@link delay} milliseconds have passed
+ * since the last invocation regardless of arguments. If this should be
+ * argument dependent, look into {@link keyedDebounce}
+ */
+export function debounce<Input extends any[], Output>(
+    cb: (...args: Input) => Output | Promise<Output>,
+    delay: number = 0,
+    useLastCall: boolean = false
+): (...args: Input) => Promise<Output> {
+    return cancellableDebounce(cb, delay, useLastCall).promise
+}
+
+/**
+ *
+ * Similar to {@link debounce}, but allows the function to be cancelled.
+ */
+export function cancellableDebounce<Input extends any[], Output>(
+    cb: (...args: Input) => Output | Promise<Output>,
+    delay: number = 0,
+    useLastCall: boolean = false
+): { promise: (...args: Input) => Promise<Output>; cancel: () => void } {
+    let timeout: Timeout | undefined
+    let promise: Promise<Output> | undefined
+    let lastestArgs: Input | undefined
+
+    const cancel = (): void => {
+        if (timeout) {
+            timeout.cancel()
+            timeout = undefined
+            promise = undefined
+        }
+    }
+
+    return {
+        promise: (...args: Input) => {
+            lastestArgs = args
+            timeout?.refresh()
+
+            return (promise ??= new Promise<Output>((resolve, reject) => {
+                timeout = new Timeout(delay)
+                timeout.onCompletion(async () => {
+                    timeout = promise = undefined
+                    try {
+                        const argsToUse = useLastCall ? lastestArgs! : args
+                        resolve(await cb(...argsToUse))
+                    } catch (err) {
+                        reject(err)
+                    }
+                })
+            }))
+        },
+        cancel: cancel,
+    }
+}
+
+/**
+ *
+ * Similar to {@link debounce}, but uses a key to determine if the function should be called yet rather than a timeout connected to the function itself.
+ */
+export function keyedDebounce<T, U extends any[], K extends string = string>(
+    fn: (key: K, ...args: U) => Promise<T>
+): typeof fn {
+    const pending = new Map<K, Promise<T>>()
+
+    return (key, ...args) => {
+        if (pending.has(key)) {
+            return pending.get(key)!
+        }
+
+        const promise = fn(key, ...args).finally(() => pending.delete(key))
+        pending.set(key, promise)
+
+        return promise
+    }
+}
+/**
+ * Creates a function that runs only for unique arguments that haven't been seen before.
+ *
+ * This utility tracks all unique inputs it has seen and only executes the callback
+ * for new inputs. Unlike `onceChanged` which only compares with the previous invocation,
+ * this function maintains a history of all arguments it has processed.
+ *
+ * @param fn The function to execute for unique arguments
+ * @param key A function that returns a unique string for each argument set, defaults to joining with ":" seperating
+ * @param overflow The maximum number of unique arguments to store.
+ * @returns A wrapped function that only executes for new unique arguments
+ *
+ * @example
+ * ```ts
+ * const logOnce = oncePerUniqueArg((message) => console.log(message))
+ *
+ * logOnce('hello') // prints: hello
+ * logOnce('world') // prints: world
+ * logOnce('hello') // nothing happens (already seen)
+ * logOnce('test')  // prints: test
+ * ```
+ */
+export function oncePerUniqueArg<T, U extends any[]>(
+    fn: (...args: U) => T,
+    options?: { key?: (...args: U) => string; overflow?: number }
+): (...args: U) => T | undefined {
+    const seen = new CircularBuffer(options?.overflow ?? 1000)
+    const keyMap = options?.key ?? ((...args: U) => args.map(String).join(':'))
+
+    return (...args) => {
+        const signature = keyMap(...args)
+
+        if (!seen.contains(signature)) {
+            seen.add(signature)
+            return fn(...args)
+        }
+
+        return undefined
+    }
+}
diff --git a/packages/core/src/shared/utilities/index.ts b/packages/core/src/shared/utilities/index.ts
new file mode 100644
index 00000000000..e86f941456d
--- /dev/null
+++ b/packages/core/src/shared/utilities/index.ts
@@ -0,0 +1,12 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export { isExtensionInstalled, isExtensionActive } from './vsCodeUtils'
+export { VSCODE_EXTENSION_ID } from '../extensions'
+export * from './functionUtils'
+export * as messageUtils from './messages'
+export * as CommentUtils from './commentUtils'
+export * from './editorUtilities'
+export * from './tsUtils'
diff --git a/packages/core/src/shared/utilities/logAndShowUtils.ts b/packages/core/src/shared/utilities/logAndShowUtils.ts
new file mode 100644
index 00000000000..3cccea1045b
--- /dev/null
+++ b/packages/core/src/shared/utilities/logAndShowUtils.ts
@@ -0,0 +1,76 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+import { ToolkitError, isUserCancelledError, resolveErrorMessageToDisplay } from '../errors'
+import { getLogger } from '../logger/logger'
+import { showMessageWithUrl } from './messages'
+import { Logging } from '../logger/commands'
+
+/**
+ * Logs the error. Then determines what kind of error message should be shown, if
+ * at all.
+ *
+ * TODO: Currently only used for errors from commands and webview. Use in more places (explorer,
+ * nodes, ...). Must be guaranteed to initialize prior to every other Toolkit component.
+ *
+ * @param error The error itself
+ * @param topic The prefix of the error message
+ * @param defaultMessage The message to show if once cannot be resolved from the given error
+ */
+export async function logAndShowError(
+    localize: nls.LocalizeFunc,
+    error: unknown,
+    topic: string,
+    defaultMessage: string
+) {
+    if (isUserCancelledError(error)) {
+        getLogger().verbose(`${topic}: user cancelled`)
+        return
+    }
+    const logsItem = localize('AWS.generic.message.viewLogs', 'View Logs...')
+    const viewInTerminalItem = localize('AWS.generic.message.viewInTerminal', 'View Logs In Terminal')
+    const logId = getLogger().error(`${topic}: %s`, error)
+    const message = resolveErrorMessageToDisplay(error, defaultMessage)
+
+    if (error instanceof ToolkitError && error.documentationUri) {
+        await showMessageWithUrl(message, error.documentationUri, 'View Documentation', 'error')
+    } else if (error instanceof ToolkitError && (error.details?.['terminal'] as unknown as vscode.Terminal)) {
+        await vscode.window.showErrorMessage(message, viewInTerminalItem).then(async (resp) => {
+            if (resp === viewInTerminalItem) {
+                ;(error.details?.['terminal'] as unknown as vscode.Terminal).show()
+            }
+        })
+    } else {
+        await vscode.window.showErrorMessage(message, logsItem).then(async (resp) => {
+            if (resp === logsItem) {
+                await Logging.instance.viewLogsAtMessage.execute(logId)
+            }
+        })
+    }
+}
+
+/**
+ * Show a webview related error to the user + button that links to the logged error
+ *
+ * @param err The error that was thrown in the backend
+ * @param webviewId Arbitrary value that identifies which webview had the error
+ * @param command The high level command/function that was run which triggered the error
+ *
+ * @returns user-facing error
+ */
+export function logAndShowWebviewError(localize: nls.LocalizeFunc, err: unknown, webviewId: string, command: string) {
+    // HACK: The following implementation is a hack, influenced by the implementation of handleError().
+    // The userFacingError message will be seen in the UI, and the detailedError message will provide the
+    // detailed information in the logs.
+    const detailedError = ToolkitError.chain(err, `Webview backend command failed: "${command}()"`)
+    const userFacingError = ToolkitError.chain(detailedError, 'Webview error')
+    logAndShowError(localize, userFacingError, `webviewId="${webviewId}"`, 'Webview error').catch((e) => {
+        getLogger().error('logAndShowError failed: %s', (e as Error).message)
+    })
+
+    return userFacingError
+}
diff --git a/packages/core/src/shared/utilities/map.ts b/packages/core/src/shared/utilities/map.ts
new file mode 100644
index 00000000000..57d20c1c590
--- /dev/null
+++ b/packages/core/src/shared/utilities/map.ts
@@ -0,0 +1,126 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import _ from 'lodash'
+import { getLogger } from '../logger/logger'
+import type { KeyedCache } from './cacheUtils'
+
+/**
+ * Simply maps a Key to an Object. Everything is done in memory, allowing for atomic updates.
+ *
+ * There is a common use case for this class, so look to reuse this when possible.
+ * Benefits, instead of making your own:
+ * - A key does not have to be a string, {@link NestedMap.hash} enables this
+ * - Implements most of the boilerplate
+ * - Has a {@link NestedMap.default} property which is returned from {@link NestedMap.get()}
+ *   in the case {@link NestedMap.has()} would return false.
+ */
+export abstract class NestedMap<Key, Value = { [key: string]: any }> implements MapSync<Key, Value> {
+    private readonly data: { [key: string]: Value | undefined } = {}
+
+    has(key: Key): boolean {
+        return this.data[this.hash(key)] !== undefined
+    }
+
+    /**
+     * IMPORTANT: If getting a key without having {@link set()} a value, the {@link default} will be returned.
+     * Use {@link has()} to check for existence before calling {@link get()}, if necessary.
+     */
+    get(key: Key): Value {
+        const actualKey = this.hash(key)
+        const result = this.data[actualKey]
+        return result ?? this.default
+    }
+
+    set(key: Key, data: Partial<Value>): void {
+        const currentData = this.get(key)
+        // deep merge the objects
+        this.data[this.hash(key)] = _.merge(currentData, data)
+    }
+
+    delete(key: Key, reason?: string): void {
+        delete this.data[this.hash(key)]
+        if (reason) {
+            getLogger().debug(`${this.name}: cleared cache, key: %O, reason: ${reason}`, key)
+        }
+    }
+
+    /**
+     * Converts the user-provided key to a string so that it can be used
+     * as an object key.
+     */
+    protected abstract hash(key: Key): string
+
+    /**
+     * The name of the implementation, for logging purposes
+     */
+    protected abstract get name(): string
+
+    /**
+     * The default value returned from {@link get}() when {@link has}() is false
+     */
+    protected abstract get default(): Value
+}
+
+/**
+ * An implementation of NestedMap specifically used for mapping strings to objects.
+ * It's basically a map, except you can partially add values
+ */
+export class RecordMap<Value = { [key: string]: any }> extends NestedMap<string, Value> {
+    protected override hash(key: string): string {
+        return key
+    }
+
+    protected override get name(): string {
+        return 'RecordMap'
+    }
+
+    protected override get default(): Value {
+        return {} as Value
+    }
+}
+
+/**
+ * A synchronous version of a Map of Maps.
+ * - This allows for atomic updates as it is not async.
+ * - They Key does not need to be a string
+ *
+ * There are similarities to {@link KeyedCache}, which is why this class' name
+ * explicitly has 'Sync'.
+ */
+export interface MapSync<Key, ReturnObject = { [key: string]: any }> {
+    /**
+     * Attempts to read data stored at {@link key}.
+     *
+     * @param key Target key to read from.
+     * @returns `ReturnObject` regardless of cache hit or miss. Use {@link has()} to verify existence,
+     *          otherwise a default object may be returned.
+     */
+    get(key: Key): ReturnObject
+
+    /**
+     * Writes {@link data} to {@link key}.
+     *
+     * @param key Target key to write to.
+     * @param data Data to write.
+     */
+    set(key: Key, data: ReturnObject): void
+
+    /**
+     * Returns true if the given key exists in the cache.
+     *
+     * @param key Target key to check.
+     * @returns True if the key exists, false otherwise.
+     */
+    has(key: Key): boolean
+
+    /**
+     * Deletes data stored at {@link key}, if any.
+     *
+     * @param key Target key to clear.
+     * @param reason Partial log message explaining why the data is being deleted.
+     */
+    delete(key: Key, reason: string): void
+}
diff --git a/packages/core/src/shared/utilities/mementos.ts b/packages/core/src/shared/utilities/mementos.ts
new file mode 100644
index 00000000000..0e5e6a27618
--- /dev/null
+++ b/packages/core/src/shared/utilities/mementos.ts
@@ -0,0 +1,55 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { cast, Optional, Record, Unknown } from './typeConstructors'
+import globals from '../extensionGlobals'
+import { getCodeCatalystDevEnvId } from '../vscode/env'
+
+/**
+ * Creates a memento interface to a nested object stored at `key`.
+ *
+ * For example, `partition(m, 'foo')` creates a nested object at "foo":
+ *
+ *     "foo": {
+ *     }
+ *
+ * and returns a memento that gets/sets keys only on "foo" (not its container `m`).
+ */
+export function partition(memento: vscode.Memento, key: string): vscode.Memento {
+    const get = () => cast(memento.get(key), Optional(Record(String, Unknown)))
+    const update = (k: string, v: unknown) => memento.update(key, { ...get(), [k]: v })
+
+    return {
+        keys: () => [], // TODO(jmkeyes): implement this?
+        get: (key, defaultValue?) => (get()?.[key] as any) ?? defaultValue,
+        update,
+    }
+}
+
+/**
+ * Resolves the appropriate memento/state for the current runtime environment.
+ *
+ * Why?
+ * - In remote instances where we ssh in to them, we do not always want to share
+ *   with the local globalState. We want certain functionality to be isolated to
+ *   the remote instance.
+ */
+export function getEnvironmentSpecificMemento(globalState?: vscode.Memento): vscode.Memento {
+    if (!vscode.env.remoteName) {
+        // local compute: no further partitioning
+        return globalState ?? globals.globalState
+    }
+
+    const devEnvId = getCodeCatalystDevEnvId()
+
+    if (devEnvId !== undefined) {
+        // dev env: partition to dev env ID (compute backend might not always be the same)
+        return partition(globalState ?? globals.globalState, devEnvId)
+    }
+
+    // remote env: keeps a shared "global state" for all workspaces that report the same machine ID
+    return partition(globalState ?? globals.globalState, globals.machineId)
+}
diff --git a/packages/core/src/shared/utilities/messages.ts b/packages/core/src/shared/utilities/messages.ts
new file mode 100644
index 00000000000..b3cc178cabb
--- /dev/null
+++ b/packages/core/src/shared/utilities/messages.ts
@@ -0,0 +1,439 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+import * as path from 'path'
+import * as localizedText from '../localizedText'
+import { getLogger } from '../../shared/logger/logger'
+import { ProgressEntry } from '../../shared/vscode/window'
+import { getIdeProperties } from '../extensionUtilities'
+import { sleep } from './timeoutUtils'
+import { Timeout } from './timeoutUtils'
+import { addCodiconToString } from './textUtilities'
+import { getIcon, codicon } from '../icons'
+import globals from '../extensionGlobals'
+import { ToolkitError } from '../../shared/errors'
+import { fs } from '../../shared/fs/fs'
+import { openUrl } from './vsCodeUtils'
+import { AmazonQPromptSettings, ToolkitPromptSettings } from '../../shared/settings'
+import { telemetry, ToolkitShowNotification } from '../telemetry/telemetry'
+import { vscodeComponent } from '../vscode/commands2'
+import { getTelemetryReasonDesc } from '../errors'
+
+export const messages = {
+    editCredentials(icon: boolean) {
+        // codicons are not supported in showInformationMessage. (vscode 1.71)
+        const icon_ = icon ? codicon`${getIcon('vscode-edit')}` + ' ' : ''
+        return localize('AWS.credentials.edit', '{0}Edit Credentials', icon_)
+    },
+}
+
+const localize = nls.loadMessageBundle()
+
+export function makeFailedWriteMessage(filename: string): string {
+    const message = localize('AWS.failedToWrite', '{0}: Failed to write "{1}".', getIdeProperties().company, filename)
+
+    return message
+}
+
+export function showMessage(
+    kind: 'info' | 'warn' | 'error' = 'error',
+    message: string,
+    items: string[] = [],
+    options: vscode.MessageOptions & { telemetry?: boolean } = {},
+    metric: Partial<ToolkitShowNotification> = {}
+): Thenable<string | undefined> {
+    return telemetry.toolkit_showNotification.run(async (span) => {
+        span.record({
+            passive: true,
+            id: 'unknown',
+            component: 'editor',
+            ...metric,
+        })
+
+        switch (kind) {
+            case 'info':
+                return vscode.window.showInformationMessage(message, options, ...items)
+            case 'warn':
+                return vscode.window.showWarningMessage(message, options, ...items)
+            case 'error':
+            default:
+                return vscode.window.showErrorMessage(message, options, ...items)
+        }
+    })
+}
+
+/**
+ * Shows a non-modal message with a linkbutton.
+ *
+ * @param message  Message text
+ * @param url URL to visit when `urlItem` is clicked
+ * @param urlItem URL button text (default: "View Documentation")
+ * @param kind  Kind of message to show
+ * @param extraItems  Extra buttons shown _before_ the "View Documentation" button
+ * @param useModal Flag to use a modal instead of a toast notification
+ * @returns Promise that resolves when a button is clicked or the message is
+ * dismissed, and returns the selected button text.
+ */
+export async function showMessageWithUrl(
+    message: string,
+    url: string | vscode.Uri,
+    urlItem: string = localizedText.viewDocs,
+    kind: 'info' | 'warn' | 'error' = 'error',
+    extraItems: string[] = [],
+    useModal: boolean = false
+): Promise<string | undefined> {
+    const uri = typeof url === 'string' ? vscode.Uri.parse(url) : url
+    const items = [...extraItems, urlItem]
+
+    const p = showMessage(
+        kind,
+        message,
+        items,
+        { modal: useModal },
+        {
+            id: 'showMessageWithUrl',
+            reasonDesc: getTelemetryReasonDesc(message),
+        }
+    )
+    return p.then<string | undefined>((selection) => {
+        if (selection === urlItem) {
+            void openUrl(uri)
+        }
+        return selection
+    })
+}
+
+/**
+ * Shows a non-modal message with a "View Logs" button.
+ *
+ * @param message  Message text
+ * @param window  Window
+ * @param kind  Kind of message to show
+ * @param extraItems  Extra buttons shown _before_ the "View Logs" button
+ * @returns	Promise that resolves when a button is clicked or the message is
+ * dismissed, and returns the selected button text.
+ */
+export async function showViewLogsMessage(
+    message: string,
+    kind: 'info' | 'warn' | 'error' = 'error',
+    extraItems: string[] = []
+): Promise<string | undefined> {
+    const logsItem = localize('AWS.generic.message.viewLogs', 'View Logs...')
+    const items = [...extraItems, logsItem]
+
+    const p = showMessage(
+        kind,
+        message,
+        items,
+        {},
+        {
+            id: 'showViewLogsMessage',
+            reasonDesc: getTelemetryReasonDesc(message),
+        }
+    )
+    return p.then<string | undefined>((selection) => {
+        if (selection === logsItem) {
+            globals.logOutputChannel.show(true)
+        }
+        return selection
+    })
+}
+
+/**
+ * Checks if a path exists and prompts user for overwrite confirmation if it does.
+ * @param path The file or directory path to check
+ * @param itemName The name of the item for display in the message
+ * @returns Promise<boolean> - true if should proceed (path doesn't exist or user confirmed overwrite)
+ */
+export async function handleOverwriteConflict(location: vscode.Uri): Promise<boolean> {
+    if (!(await fs.exists(location))) {
+        return true
+    }
+
+    const choice = showConfirmationMessage({
+        prompt: localize(
+            'AWS.toolkit.confirmOverwrite',
+            '{0} already exists in the selected directory, overwrite?',
+            location.fsPath
+        ),
+        confirm: localize('AWS.generic.overwrite', 'Yes'),
+        cancel: localize('AWS.generic.cancel', 'No'),
+        type: 'warning',
+    })
+
+    if (!choice) {
+        throw new ToolkitError(`Folder already exists: ${path.basename(location.fsPath)}`)
+    }
+
+    try {
+        await fs.delete(location, { recursive: true, force: true })
+    } catch (error) {
+        throw ToolkitError.chain(error, `Failed to delete existing folder: ${path.basename(location.fsPath)}`)
+    }
+
+    return true
+}
+
+/**
+ * Shows a modal confirmation (warning) message with buttons to confirm or cancel.
+ *
+ * @param prompt the message to show.
+ * @param confirm the confirmation button text.
+ * @param cancel the cancel button text.
+ * @param window the window.
+ */
+export async function showConfirmationMessage({
+    prompt,
+    confirm,
+    cancel,
+    type,
+}: {
+    prompt: string
+    confirm?: string
+    cancel?: string
+    type?: 'info' | 'warning'
+}): Promise<boolean> {
+    const confirmItem: vscode.MessageItem = { title: confirm ?? localizedText.confirm }
+    const cancelItem: vscode.MessageItem = { title: cancel ?? localizedText.cancel, isCloseAffordance: true }
+
+    if (type === 'info') {
+        const selection = await vscode.window.showInformationMessage(prompt, { modal: true }, confirmItem, cancelItem)
+        return selection?.title === confirmItem.title
+    } else {
+        const selection = await vscode.window.showWarningMessage(prompt, { modal: true }, confirmItem, cancelItem)
+        return selection?.title === confirmItem.title
+    }
+}
+
+/**
+ * Shows a prompt for the user to reauthenticate
+ *
+ * @param message the line informing the user that they need to reauthenticate
+ * @param connect the text to display on the "connect" button
+ * @param suppressId the ID of the prompt in
+ * @param reauthFunc the function called if the "connect" button is clicked
+ */
+export async function showReauthenticateMessage({
+    message,
+    connect,
+    suppressId,
+    settings,
+    reauthFunc,
+    source = vscodeComponent,
+}: {
+    message: string
+    connect: string
+    suppressId: string // Parameters<PromptSettings['isPromptEnabled']>[0]
+    settings: AmazonQPromptSettings | ToolkitPromptSettings
+    reauthFunc: () => Promise<void>
+    source?: string
+}) {
+    const shouldShow = settings.isPromptEnabled(suppressId as any)
+    if (!shouldShow) {
+        return
+    }
+
+    await telemetry.toolkit_showNotification.run(async () => {
+        telemetry.record({ id: suppressId, source })
+        await vscode.window.showInformationMessage(message, connect, localizedText.dontShow).then(async (resp) => {
+            await telemetry.toolkit_invokeAction.run(async () => {
+                telemetry.record({ id: suppressId, source })
+
+                if (resp === connect) {
+                    telemetry.record({ action: 'connect' })
+                    await reauthFunc()
+                } else if (resp === localizedText.dontShow) {
+                    telemetry.record({ action: 'suppress' })
+                    await settings.disablePrompt(suppressId as any)
+                } else {
+                    telemetry.record({ action: 'dismiss' })
+                }
+            })
+        })
+    })
+}
+
+/**
+ * Shows an output channel and writes a line to it and also to the logs (as info).
+ *
+ * @param message the line to write.
+ * @param outputChannel the output channel to write to.
+ */
+export function showOutputMessage(message: string, outputChannel: vscode.OutputChannel) {
+    outputChannel.show(true)
+    outputChannel.appendLine(message)
+    getLogger().info(message)
+}
+
+/**
+ * Attaches a Timeout object to VS Code's Progress notification system.
+ *
+ * @see showMessageWithCancel for an example usage
+ */
+export async function showProgressWithTimeout(
+    options: vscode.ProgressOptions,
+    timeout: Timeout,
+    showAfterMs: number
+): Promise<vscode.Progress<{ message?: string; increment?: number }>> {
+    if (showAfterMs < 0) {
+        throw Error('invalid "showAfterMs" value')
+    }
+    if (showAfterMs === 0) {
+        showAfterMs = 1 // Show immediately.
+    }
+    // See also: codecatalyst.ts:LazyProgress
+    const progressPromise: Promise<vscode.Progress<{ message?: string; increment?: number }>> = new Promise(
+        (resolve, reject) => {
+            setTimeout(async () => {
+                try {
+                    if (timeout.completed) {
+                        getLogger().debug('showProgressWithTimeout: completed before "showAfterMs"')
+                        resolve({
+                            report: () => undefined, // no-op.
+                        })
+                        return
+                    }
+                    void vscode.window.withProgress(options, function (progress, token) {
+                        token.onCancellationRequested(() => timeout.cancel())
+                        resolve(progress)
+                        return new Promise(timeout.onCompletion)
+                    })
+                } catch (e) {
+                    const err = e as Error
+                    getLogger().error('report(): progressPromise failed: %s: %s', err.name, err.message)
+                    reject(e)
+                }
+            }, showAfterMs)
+        }
+    )
+
+    return progressPromise
+}
+
+/**
+ * Shows a Progress message which allows the user to cancel a pending `timeout` task.
+ *
+ * Logs on failure; call with `void` if you don't need the result.
+ *
+ * @param message Message to display
+ * @param timeout Timeout object that will be killed if the user clicks 'Cancel'
+ * @param showAfterMs Do not show the progress message until `showAfterMs` milliseconds.
+ *
+ * @returns Progress object allowing the caller to update progress status
+ */
+export async function showMessageWithCancel(
+    message: string,
+    timeout: Timeout,
+    showAfterMs: number = 0
+): Promise<vscode.Progress<{ message?: string; increment?: number }>> {
+    const progressOptions = { location: vscode.ProgressLocation.Notification, title: message, cancellable: true }
+    return showProgressWithTimeout(progressOptions, timeout, showAfterMs)
+}
+
+type MessageItems = { timeout: Timeout; progress: vscode.Progress<ProgressEntry> }
+
+/**
+ * Start or Update VSCode message windows with a 'Cancel' button.
+ *
+ * ---
+ *
+ * This class helps in the scenario of ensuring that a previous
+ * identical message is completed before it attempts to create
+ * a new one.
+ */
+export class Messages {
+    static readonly timeoutMillis = 60000
+    private static messageMap: {
+        [msgId: string]: MessageItems
+    } = {}
+
+    /**
+     * Starts a message if it does not exist, then applies the update with the given
+     * progress data.
+     * @param msgId A unique identifier for a message
+     * @returns The timeout associated with the message, returns an existing timeout
+     *          if the message already exists.
+     */
+    static async putMessage(
+        msgId: string,
+        messageText: string,
+        progressEntry?: ProgressEntry,
+        timeoutMillis?: number
+    ): Promise<Timeout> {
+        let message: MessageItems | undefined = this.messageMap[msgId]
+
+        //  If message already exists but is completed, we want to start a new message
+        if (message?.timeout !== undefined && message.timeout.completed) {
+            message = undefined
+        }
+
+        // Start a new message
+        if (message === undefined) {
+            await this.startMessage(msgId, messageText, timeoutMillis)
+            message = this.messageMap[msgId]
+        }
+
+        // Add an update to the message if it was provided
+        if (progressEntry !== undefined) {
+            message.progress.report(progressEntry)
+        }
+
+        return message.timeout
+    }
+
+    /**
+     * @param timeoutMillis The amount of milliseconds till the message cancels itself.
+     */
+    private static async startMessage(
+        msgId: string,
+        messageText: string,
+        timeoutMillis: number = this.timeoutMillis
+    ): Promise<void> {
+        const timeout = new Timeout(timeoutMillis)
+        this.messageMap[msgId] = { timeout, progress: await showMessageWithCancel(messageText, timeout) }
+    }
+}
+
+/**
+ * Shows a "spinner" / progress message for `duration` milliseconds.
+ *
+ * @param message Message to display
+ * @param duration Timeout duration (milliseconds)
+ *
+ * @returns prompts message to user on with progress
+ */
+export async function showTimedMessage(message: string, duration: number) {
+    void vscode.window.withProgress(
+        {
+            location: vscode.ProgressLocation.Notification,
+            title: message,
+            cancellable: false,
+        },
+        async () => {
+            await sleep(duration)
+        }
+    )
+}
+
+export async function copyToClipboard(data: string, label?: string): Promise<void> {
+    await vscode.env.clipboard.writeText(data)
+    const message = localize('AWS.explorerNode.copiedToClipboard', 'Copied {0} to clipboard', label)
+    vscode.window.setStatusBarMessage(addCodiconToString('clippy', message), 5000)
+    getLogger().verbose('copied %s to clipboard: %O', label ?? '', data)
+}
+
+/** TODO: eliminate this, callers should use `PromptSettings` instead. */
+export async function showOnce<T>(key: 'sam.sync.updateMessage', fn: () => Promise<T>): Promise<T | undefined> {
+    if (globals.globalState.tryGet(key, Boolean, false)) {
+        return
+    }
+
+    const result = fn()
+    await globals.globalState.update(key, true)
+
+    return result
+}
diff --git a/packages/core/src/shared/utilities/osUtils.ts b/packages/core/src/shared/utilities/osUtils.ts
new file mode 100644
index 00000000000..2ed7b976998
--- /dev/null
+++ b/packages/core/src/shared/utilities/osUtils.ts
@@ -0,0 +1,39 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../extensionGlobals'
+import * as os from 'os'
+
+/**
+ * Checks if the current OS session is new.
+ *
+ * @returns `true` if this is the First call to this function across all extension instances
+ * since the OS was last restarted, subsequent calls return `false`.
+ *
+ * Use this function to perform one-time initialization tasks that should only happen
+ * once per OS session, regardless of how many extension instances are running.
+ */
+export async function isNewOsSession(now = () => globals.clock.Date.now(), uptimeMillis = () => os.uptime() * 1000) {
+    // Windows does not have an ephemeral /tmp/ folder that deletes on shutdown, while unix-like os's do.
+    // So in Windows we calculate the start time and see if it changed from the previous known start time.
+    const lastStartTime = globals.globalState.tryGet('lastOsStartTime', Number)
+
+    const uptime = uptimeMillis()
+    const currentOsStartTime = now() - uptime
+
+    if (lastStartTime === undefined) {
+        await globals.globalState.update('lastOsStartTime', currentOsStartTime)
+        return true
+    }
+
+    // If the current start time is later than the last, it means we are in a new session since they should be the same value.
+    // But to account for minor millisecond differnces, we add in a 5 second buffer.
+    if (currentOsStartTime - 1000 * 5 > lastStartTime) {
+        await globals.globalState.update('lastOsStartTime', currentOsStartTime)
+        return true
+    }
+
+    return false
+}
diff --git a/packages/core/src/shared/utilities/pathFind.ts b/packages/core/src/shared/utilities/pathFind.ts
new file mode 100644
index 00000000000..a0eea9e38ae
--- /dev/null
+++ b/packages/core/src/shared/utilities/pathFind.ts
@@ -0,0 +1,261 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as path from 'path'
+import fs from '../../shared/fs/fs'
+import { ChildProcess, ChildProcessOptions } from './processUtils'
+import { GitExtension } from '../extensions/git'
+import { Settings } from '../settings'
+import { getLogger } from '../logger/logger'
+import { mergeResolvedShellPath } from '../env/resolveEnv'
+import { matchesPattern } from './textUtilities'
+
+/** Full path to VSCode CLI. */
+let vscPath: string
+let sshPath: string
+let gitPath: string
+let bashPath: string
+let javaPath: string
+const pathMap = new Map<string, string>()
+
+/**
+ * Tries to execute a program at path `p` with the given args and
+ * optionally checks the output for `expected`.
+ *
+ * @param p path to a program to execute
+ * @param args program args
+ * @param doLog log failures
+ * @param expected output must contain this string
+ */
+export async function tryRun(
+    p: string,
+    args: string[],
+    logging: 'yes' | 'no' | 'noresult' = 'yes',
+    expected?: string | RegExp,
+    opt?: ChildProcessOptions
+): Promise<boolean> {
+    const proc = new ChildProcess(p, args, { logging: 'no' })
+    const r = await proc.run({
+        ...opt,
+        spawnOptions: { env: await mergeResolvedShellPath(opt?.spawnOptions?.env ?? process.env) },
+    })
+    const ok = r.exitCode === 0 && (expected === undefined || matchesPattern(r.stdout, expected))
+    if (logging === 'noresult') {
+        getLogger().info('tryRun: %s: %s', ok ? 'ok' : 'failed', proc)
+    } else if (logging !== 'no') {
+        getLogger().info('tryRun: %s: %s %O', ok ? 'ok' : 'failed', proc, proc.result())
+    }
+    return ok
+}
+
+/**
+ * Gets the fullpath to `code` (VSCode CLI), or falls back to "code" (not
+ * absolute) if it works.
+ *
+ * @see https://github.com/microsoft/vscode-test/blob/4bdccd4c386813a8158b0f9b96f31cbbecbb3374/lib/util.ts#L133
+ */
+export async function getVscodeCliPath(): Promise<string | undefined> {
+    if (vscPath) {
+        return vscPath
+    }
+
+    const vscExe = process.argv0
+    // https://github.com/microsoft/vscode-test/blob/4bdccd4c386813a8158b0f9b96f31cbbecbb3374/lib/util.ts#L133
+    const vscs = [
+        // Special case for flatpak (steamdeck). #V896741845
+        // https://github.com/flathub/com.visualstudio.code/blob/master/code.sh
+        '/app/bin/code',
+        // Note: macOS does not have a separate "code-insiders" binary.
+        path.resolve(`${vscode.env.appRoot}/bin/code`), // macOS
+        path.resolve(`${vscode.env.appRoot}/../../bin/code`), // Windows
+        path.resolve(`${vscode.env.appRoot}/../../bin/code-insiders`), // Windows
+        // Linux example "appRoot": vscode-linux-x64-1.42.0/VSCode-linux-x64/resources/app
+        path.resolve(`${vscode.env.appRoot}/code`),
+        path.resolve(vscExe, '../bin/code-insiders'),
+        path.resolve(vscExe, '../bin/code'),
+        path.resolve(vscExe, '../../bin/code-insiders'),
+        path.resolve(vscExe, '../../bin/code'),
+        '/usr/bin/code',
+        'code', // $PATH
+    ]
+    for (const vsc of vscs) {
+        if (!vsc || (vsc !== 'code' && !(await fs.exists(vsc)))) {
+            continue
+        }
+        if (await tryRun(vsc, ['--version'])) {
+            vscPath = vsc
+            return vsc
+        }
+    }
+
+    return undefined
+}
+
+/**
+ * Searches for `tsc` in the current workspace, or the system (tries `tsc`
+ * using current $PATH).
+ *
+ * @returns fullpath if found in the workspace, "tsc" if found in current $PATH, else undefined.
+ */
+export async function findTypescriptCompiler(): Promise<string | undefined> {
+    const foundUris = await vscode.workspace.findFiles('**/node_modules/.bin/{tsc,tsc.cmd}', undefined, 1)
+    const tscPaths = []
+    if (foundUris.length > 0) {
+        tscPaths.push(foundUris[0].fsPath)
+    }
+    tscPaths.push('tsc') // Try this last.
+
+    for (const tsc of tscPaths) {
+        // Try to run "tsc -v".
+        if (await tryRun(tsc, ['-v'], 'yes', 'Version')) {
+            return tsc
+        }
+    }
+
+    return undefined
+}
+
+/**
+ * Gets the configured `ssh` path, or falls back to "ssh" (not absolute),
+ * or tries common locations, or returns undefined.
+ */
+export async function findSshPath(useCache: boolean = true): Promise<string | undefined> {
+    if (useCache && sshPath !== undefined) {
+        return sshPath
+    }
+
+    const sshSettingPath = Settings.instance.get('remote.SSH.path', String, '')
+    const paths = [
+        sshSettingPath,
+        'ssh', // Try $PATH _before_ falling back to common paths.
+        '/usr/bin/ssh',
+        'C:/Windows/System32/OpenSSH/ssh.exe',
+        'C:/Program Files/Git/usr/bin/ssh.exe',
+    ]
+    for (const p of paths) {
+        if (!p || ('ssh' !== p && !(await fs.exists(p)))) {
+            continue
+        }
+        if (await tryRun(p, ['-G', 'x'], 'noresult' /* "ssh -G" prints quasi-sensitive info. */)) {
+            sshPath = useCache ? p : sshPath
+            return p
+        }
+    }
+}
+
+/**
+ * Gets a working `java`, or undefined.
+ */
+export async function findJavaPath(): Promise<string | undefined> {
+    if (javaPath !== undefined) {
+        return javaPath
+    }
+
+    const paths = [
+        'java', // Try $PATH first
+        '/usr/bin/java',
+        '/usr/local/bin/java',
+        '/opt/java/bin/java',
+        // Common Oracle JDK locations
+        '/usr/lib/jvm/default-java/bin/java',
+        '/usr/lib/jvm/java-11-openjdk/bin/java',
+        '/usr/lib/jvm/java-8-openjdk/bin/java',
+        // Windows locations
+        'C:/Program Files/Java/jre1.8.0_301/bin/java.exe',
+        'C:/Program Files/Java/jdk1.8.0_301/bin/java.exe',
+        'C:/Program Files/OpenJDK/openjdk-11.0.2/bin/java.exe',
+        'C:/Program Files (x86)/Java/jre1.8.0_301/bin/java.exe',
+        'C:/Program Files (x86)/Java/jdk1.8.0_301/bin/java.exe',
+        // macOS locations
+        '/System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java',
+        '/usr/libexec/java_home',
+    ]
+    for (const p of paths) {
+        if (!p || ('java' !== p && !(await fs.exists(p)))) {
+            continue
+        }
+        if (await tryRun(p, ['-version'])) {
+            javaPath = p
+            return p
+        }
+    }
+}
+
+/**
+ * Gets the configured `git` path, or falls back to "ssh" (not absolute),
+ * or tries common locations, or returns undefined.
+ */
+export async function findGitPath(): Promise<string | undefined> {
+    if (gitPath !== undefined) {
+        return gitPath
+    }
+    const git = GitExtension.instance
+
+    const paths = [git.gitPath, 'git']
+    for (const p of paths) {
+        if (!p || ('git' !== p && !(await fs.exists(p)))) {
+            continue
+        }
+        if (await tryRun(p, ['--version'])) {
+            gitPath = p
+            return p
+        }
+    }
+}
+
+/**
+ * Gets a working `bash`, or undefined.
+ */
+export async function findBashPath(): Promise<string | undefined> {
+    if (bashPath !== undefined) {
+        return bashPath
+    }
+
+    const paths = ['bash', 'C:/Program Files/Git/usr/bin/bash.exe', 'C:/Program Files (x86)/Git/usr/bin/bash.exe']
+    for (const p of paths) {
+        if (!p || ('bash' !== p && !(await fs.exists(p)))) {
+            continue
+        }
+        if (await tryRun(p, ['--version'])) {
+            bashPath = p
+            return p
+        }
+    }
+}
+
+/**
+ * Gets a working `name` in $PATH or `paths`. If found, try to run the command with `verifyArgs`.
+ *
+ * @param name the name of executable, E.g. aws|sam|docker
+ * @param paths An array of path to search
+ * @param verifyArgs the array of verify args to run the found executable. typically ['--version']
+ * @returns If found and valid, return a executable path of `name`, else undefined
+ */
+export async function findPath(
+    name: string,
+    paths: Array<string>,
+    verifyArgs: Array<string>
+): Promise<string | undefined> {
+    // get from cache
+    if (pathMap && pathMap.get(name)) {
+        return pathMap.get(name)
+    }
+    // name found in path
+    if (await tryRun(name, verifyArgs)) {
+        pathMap.set(name, name)
+        return name
+    }
+    // find working paths
+    for (const p of paths) {
+        if (!p || !(await fs.exists(p))) {
+            continue
+        }
+        if (await tryRun(p, verifyArgs)) {
+            pathMap.set(name, p)
+            return p
+        }
+    }
+}
diff --git a/src/shared/utilities/pathUtils.ts b/packages/core/src/shared/utilities/pathUtils.ts
similarity index 84%
rename from src/shared/utilities/pathUtils.ts
rename to packages/core/src/shared/utilities/pathUtils.ts
index 3840fdf55f4..776a29cd145 100644
--- a/src/shared/utilities/pathUtils.ts
+++ b/packages/core/src/shared/utilities/pathUtils.ts
@@ -1,13 +1,27 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as os from 'os'
 import * as _path from 'path'
 
+/** Matches Windows drive letter ("C:"). */
 export const driveLetterRegex = /^[a-zA-Z]\:/
 
+/**
+ * Expands "~" at the start of `fname` to user home dir.
+ * TODO: expand env vars too.
+ */
+export function resolvePath(fname: string, homedir?: string) {
+    homedir = homedir ?? os.homedir()
+    if (fname.startsWith('~/') || fname.startsWith('~\\')) {
+        return _path.join(homedir, fname.substring(2))
+    }
+
+    return fname
+}
+
 function isUncPath(path: string) {
     return /^\s*[\/\\]{2}[^\/\\]+/.test(path)
 }
@@ -92,8 +106,8 @@ export function normalize(p: string): string {
 export function getLocalRootVariants(filePath: string): string[] {
     if (process.platform === 'win32' && driveLetterRegex.test(filePath)) {
         return [
-            filePath.replace(driveLetterRegex, match => match.toLowerCase()),
-            filePath.replace(driveLetterRegex, match => match.toUpperCase()),
+            filePath.replace(driveLetterRegex, (match) => match.toLowerCase()),
+            filePath.replace(driveLetterRegex, (match) => match.toUpperCase()),
         ]
     }
 
diff --git a/packages/core/src/shared/utilities/pollingSet.ts b/packages/core/src/shared/utilities/pollingSet.ts
new file mode 100644
index 00000000000..ea9873aa71e
--- /dev/null
+++ b/packages/core/src/shared/utilities/pollingSet.ts
@@ -0,0 +1,58 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../../shared/extensionGlobals'
+
+/**
+ * A useful abstraction that does the following:
+ * - keep a set of items.
+ * - if the set is non-empty, run some action every interval seconds.
+ * - once the set empties, clear the timer
+ * @param interval the interval in seconds
+ * @param action the action to perform
+ */
+export class PollingSet<T> extends Set<T> {
+    public pollTimer?: NodeJS.Timeout
+
+    public constructor(
+        private readonly interval: number,
+        private readonly action: () => void
+    ) {
+        super()
+    }
+
+    public isActive(): boolean {
+        return this.size !== 0
+    }
+
+    public hasTimer(): boolean {
+        return this.pollTimer !== undefined
+    }
+
+    public clearTimer(): void {
+        if (!this.isActive() && this.hasTimer()) {
+            globals.clock.clearInterval(this.pollTimer)
+            this.pollTimer = undefined
+        }
+    }
+
+    private poll() {
+        this.action()
+        if (!this.isActive()) {
+            this.clearTimer()
+        }
+    }
+
+    public override add(id: T) {
+        super.add(id)
+        this.pollTimer = this.pollTimer ?? globals.clock.setInterval(() => this.poll(), this.interval)
+        return this
+    }
+
+    public override clear(): void {
+        this.clearTimer()
+        super.clear()
+    }
+}
diff --git a/packages/core/src/shared/utilities/processUtils.ts b/packages/core/src/shared/utilities/processUtils.ts
new file mode 100644
index 00000000000..c24b445cab4
--- /dev/null
+++ b/packages/core/src/shared/utilities/processUtils.ts
@@ -0,0 +1,545 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as proc from 'child_process' // eslint-disable-line no-restricted-imports
+import * as crossSpawn from 'cross-spawn'
+import * as logger from '../logger/logger'
+import { Timeout, CancellationError, waitUntil } from './timeoutUtils'
+import { PollingSet } from './pollingSet'
+import { oncePerUniqueArg } from './functionUtils'
+
+export interface RunParameterContext {
+    /** Reports an error parsed from the stdin/stdout streams. */
+    reportError(err: string | Error): void
+    /** Attempts to stop the running process. See {@link ChildProcess.stop}. */
+    stop(force?: boolean, signal?: string): void
+    /** Send string to stdin */
+    send(text: string): Promise<void>
+    /** The active `Timeout` object (if applicable). */
+    readonly timeout?: Timeout
+    /** The logger being used by the process. */
+    readonly logger: logger.Logger
+}
+
+export interface ChildProcessOptions {
+    /** Sets the logging behavior. (default: 'yes') */
+    logging?: 'yes' | 'no' | 'noparams'
+    /** Controls whether stdout/stderr is collected and returned in the `ChildProcessResult`. (default: true) */
+    collect?: boolean
+    /** Wait until streams close to resolve the process result. (default: true) */
+    waitForStreams?: boolean
+    /** Forcefully kill the process on an error. (default: false) */
+    useForceStop?: boolean
+    /** Rejects the Promise on any error. Can also use a callback for custom errors. (default: false) */
+    rejectOnError?: boolean | ((error: Error) => Error)
+    /** Rejects the Promise on non-zero exit codes. Can also use a callback for custom errors. (default: false) */
+    rejectOnErrorCode?: boolean | ((code: number) => Error)
+    /** A `Timeout` token. The running process will be terminated on expiration or cancellation. */
+    timeout?: Timeout
+    /** Options sent to the `spawn` command. This is merged in with the base options if they exist. */
+    spawnOptions?: proc.SpawnOptions
+    /** Callback for intercepting text from the stdout stream. */
+    onStdout?: (text: string, context: RunParameterContext) => void
+    /** Callback for intercepting text from the stderr stream. */
+    onStderr?: (text: string, context: RunParameterContext) => void
+    /** Thresholds to configure warning logs */
+    warnThresholds?: {
+        /** Threshold for memory usage in bytes */
+        memory?: number
+        /** Threshold for CPU usage by percentage */
+        cpu?: number
+    }
+}
+
+export interface ChildProcessRunOptions extends Omit<ChildProcessOptions, 'logging'> {
+    /** Arguments applied in addition to the ones used in construction. */
+    extraArgs?: string[]
+}
+
+export interface ChildProcessResult {
+    exitCode: number
+    error: Error | undefined
+    /** All output emitted by the process, if it was started with `collect=true`, else empty. */
+    stdout: string
+    /** All stderr data emitted by the process, if it was started with `collect=true`, else empty. */
+    stderr: string
+    signal?: string
+}
+export const oneMB = 1024 * 1024
+export const eof = Symbol('EOF')
+export const defaultProcessWarnThresholds = {
+    memory: 100 * oneMB,
+    cpu: 50,
+}
+
+export interface ProcessStats {
+    memory: number
+    cpu: number
+}
+export class ChildProcessTracker {
+    static readonly pollingInterval: number = 10000 // Check usage every 10 seconds
+    static readonly logger = logger.getLogger('childProcess')
+    #processByPid: Map<number, ChildProcess> = new Map<number, ChildProcess>()
+    #pids: PollingSet<number>
+
+    public constructor() {
+        this.#pids = new PollingSet(ChildProcessTracker.pollingInterval, () => this.monitor())
+    }
+
+    private getThreshold(pid: number): ProcessStats {
+        if (!this.#processByPid.has(pid)) {
+            ChildProcessTracker.logOnce(pid, `Missing process with id ${pid}, returning default threshold`)
+            return defaultProcessWarnThresholds
+        }
+        // Safe to assert since it exists from check above.
+        return this.#processByPid.get(pid)!.getWarnThresholds()
+    }
+
+    private cleanUp() {
+        const terminatedProcesses = Array.from(this.#pids.values()).filter(
+            (pid: number) => this.#processByPid.get(pid)?.stopped
+        )
+        for (const pid of terminatedProcesses) {
+            this.delete(pid)
+        }
+    }
+
+    private async monitor() {
+        this.cleanUp()
+        ChildProcessTracker.logger.debug(`Active running processes size: ${this.#pids.size}`)
+
+        for (const pid of this.#pids.values()) {
+            await this.checkProcessUsage(pid)
+        }
+    }
+
+    private async checkProcessUsage(pid: number): Promise<void> {
+        if (!this.#pids.has(pid)) {
+            ChildProcessTracker.logOnce(pid, `Missing process with id ${pid}`)
+            return
+        }
+        const stats = this.getUsage(pid)
+        const threshold = this.getThreshold(pid)
+        if (stats) {
+            ChildProcessTracker.logger.debug(`Process ${pid} usage: %O`, stats)
+            if (stats.memory > threshold.memory) {
+                ChildProcessTracker.logOnce(
+                    pid,
+                    `Process ${pid} exceeded memory threshold: ${(stats.memory / oneMB).toFixed(2)} MB`
+                )
+            }
+            if (stats.cpu > threshold.cpu) {
+                ChildProcessTracker.logOnce(pid, `Process ${pid} exceeded cpu threshold: ${stats.cpu}%`)
+            }
+        }
+    }
+
+    public static logOnce = oncePerUniqueArg(
+        (_pid: number, msg: string) => {
+            ChildProcessTracker.logger.warn(msg)
+        },
+        { key: (pid, _) => `${pid}` }
+    )
+
+    public add(childProcess: ChildProcess) {
+        const pid = childProcess.pid()
+        this.#processByPid.set(pid, childProcess)
+        this.#pids.add(pid)
+    }
+
+    public delete(childProcessId: number) {
+        this.#processByPid.delete(childProcessId)
+        this.#pids.delete(childProcessId)
+    }
+
+    public get size() {
+        return this.#pids.size
+    }
+
+    public has(childProcess: ChildProcess) {
+        return this.#pids.has(childProcess.pid())
+    }
+
+    public clear() {
+        for (const childProcess of this.#processByPid.values()) {
+            childProcess.stop(true)
+        }
+        this.#pids.clear()
+        this.#processByPid.clear()
+    }
+
+    public getUsage(pid: number): ProcessStats {
+        try {
+            // isWin() leads to circular dependency.
+            return process.platform === 'win32' ? getWindowsUsage() : getUnixUsage()
+        } catch (e) {
+            ChildProcessTracker.logOnce(pid, `Failed to get process stats for ${pid}: ${e}`)
+            return { cpu: 0, memory: 0 }
+        }
+
+        function getWindowsUsage() {
+            const cpuOutput = proc
+                .execFileSync('wmic', [
+                    'path',
+                    'Win32_PerfFormattedData_PerfProc_Process',
+                    'where',
+                    `IDProcess=${pid}`,
+                    'get',
+                    'PercentProcessorTime',
+                ])
+                .toString()
+            const memOutput = proc
+                .execFileSync('wmic', ['process', 'where', `ProcessId=${pid}`, 'get', 'WorkingSetSize'])
+                .toString()
+
+            const cpuPercentage = parseFloat(cpuOutput.split('\n')[1])
+            const memoryBytes = parseInt(memOutput.split('\n')[1]) * 1024
+
+            return {
+                cpu: isNaN(cpuPercentage) ? 0 : cpuPercentage,
+                memory: memoryBytes,
+            }
+        }
+
+        function getUnixUsage() {
+            const cpuMemOutput = proc.execFileSync('ps', ['-p', pid.toString(), '-o', '%cpu,%mem']).toString()
+            const rssOutput = proc.execFileSync('ps', ['-p', pid.toString(), '-o', 'rss']).toString()
+
+            const cpuMemLines = cpuMemOutput.split('\n')[1].trim().split(/\s+/)
+            const cpuPercentage = parseFloat(cpuMemLines[0])
+            const memoryBytes = parseInt(rssOutput.split('\n')[1]) * 1024
+
+            return {
+                cpu: isNaN(cpuPercentage) ? 0 : cpuPercentage,
+                memory: memoryBytes,
+            }
+        }
+    }
+}
+
+/**
+ * Convenience class to manage a child process
+ * To use:
+ * - instantiate
+ * - call and await run to get the results (pass or fail)
+ */
+export class ChildProcess {
+    static #runningProcesses = new ChildProcessTracker()
+    static stopTimeout = 3000
+    #childProcess: proc.ChildProcess | undefined
+    #processErrors: Error[] = []
+    #processResult: ChildProcessResult | undefined
+    #log: logger.Logger
+
+    /** Collects stdout data if the process was started with `collect=true`. */
+    #stdoutChunks: string[] = []
+    /** Collects stderr data if the process was started with `collect=true`. */
+    #stderrChunks: string[] = []
+
+    #command: string
+    #args: string[]
+    #baseOptions: ChildProcessOptions
+
+    #makeResult(code: number, signal?: NodeJS.Signals): ChildProcessResult {
+        return {
+            exitCode: code,
+            stdout: this.#stdoutChunks.join('').trim(),
+            stderr: this.#stderrChunks.join('').trim(),
+            error: this.#processErrors[0], // Only use the first since that one usually cascades.
+            signal,
+        }
+    }
+
+    public constructor(command: string, args: string[] = [], baseOptions: ChildProcessOptions = {}) {
+        this.#command = command
+        this.#args = args
+        this.#baseOptions = baseOptions
+        // TODO: allow caller to use the various loggers instead of just the single one
+        this.#log = baseOptions.logging !== 'no' ? logger.getLogger() : logger.getNullLogger()
+    }
+    public static async run(
+        command: string,
+        args: string[] = [],
+        options?: ChildProcessOptions
+    ): Promise<ChildProcessResult> {
+        return await new ChildProcess(command, args, options).run()
+    }
+
+    public getWarnThresholds(): ProcessStats {
+        return { ...defaultProcessWarnThresholds, ...this.#baseOptions.warnThresholds }
+    }
+
+    // Inspired by 'got'
+    /**
+     * Creates a one-off {@link ChildProcess} class that always uses the specified options.
+     */
+    public static extend(options: ChildProcessOptions) {
+        return class extends this {
+            public constructor(command: string, args: string[] = []) {
+                super(command, args, options)
+            }
+        }
+    }
+
+    /**
+     * Runs the child process. Options passed here are merged with the options passed in during construction.
+     * Priority is given to `run` options, overriding the previous value.
+     */
+    public async run(params: ChildProcessRunOptions = {}): Promise<ChildProcessResult> {
+        if (this.#childProcess) {
+            throw new Error('process already started')
+        }
+
+        const options = {
+            collect: true,
+            waitForStreams: true,
+            ...this.#baseOptions,
+            ...params,
+            spawnOptions: { ...this.#baseOptions.spawnOptions, ...params.spawnOptions },
+        }
+
+        const { rejectOnError, rejectOnErrorCode, timeout } = options
+        const args = this.#args.concat(options.extraArgs ?? [])
+
+        const debugDetail = this.#log.logLevelEnabled('debug')
+            ? ` (running processes: ${ChildProcess.#runningProcesses.size})`
+            : ''
+        this.#log.info(`Command: ${this.toString(options.logging === 'noparams')}${debugDetail}`)
+
+        const cleanup = () => {
+            this.#childProcess?.stdout?.removeAllListeners()
+            this.#childProcess?.stderr?.removeAllListeners()
+        }
+
+        return new Promise<ChildProcessResult>((resolve, reject) => {
+            const errorHandler = (error: Error, force = options.useForceStop) => {
+                this.#processErrors.push(error)
+                if (!this.stopped) {
+                    this.stop(force)
+                }
+                if (rejectOnError) {
+                    if (typeof rejectOnError === 'function') {
+                        reject(rejectOnError(error))
+                    } else {
+                        reject(error)
+                    }
+                }
+            }
+
+            const paramsContext: RunParameterContext = {
+                timeout,
+                logger: this.#log,
+                stop: this.stop.bind(this),
+                send: this.send.bind(this),
+                reportError: (err) => errorHandler(err instanceof Error ? err : new Error(err)),
+            }
+
+            if (timeout && timeout?.completed) {
+                throw new Error('Timeout token was already completed.')
+            }
+
+            // Async.
+            // See also crossSpawn.spawnSync().
+            // Arguments are forwarded[1] to node `child_process` module, see its documentation[2].
+            // [1] https://github.com/moxystudio/node-cross-spawn/blob/master/index.js
+            // [2] https://nodejs.org/api/child_process.html
+            try {
+                this.#childProcess = crossSpawn.spawn(this.#command, args, options.spawnOptions)
+                this.#registerLifecycleListeners(this.#childProcess, errorHandler, options)
+            } catch (err) {
+                return reject(err)
+            }
+
+            // Emitted whenever:
+            //  1. Process could not be spawned, or
+            //  2. Process could not be killed, or
+            //  3. Sending a message to the child process failed.
+            // https://nodejs.org/api/child_process.html#child_process_class_childprocess
+            // We also register error event handlers on the output/error streams in case a lower level library fails
+            this.#childProcess.on('error', errorHandler)
+            this.#childProcess.stdout?.on('error', errorHandler)
+            this.#childProcess.stderr?.on('error', errorHandler)
+
+            this.#childProcess.stdout?.on('data', (data: { toString(): string }) => {
+                if (options.collect) {
+                    this.#stdoutChunks.push(data.toString())
+                }
+
+                options.onStdout?.(data.toString(), paramsContext)
+            })
+
+            this.#childProcess.stderr?.on('data', (data: { toString(): string }) => {
+                if (options.collect) {
+                    this.#stderrChunks.push(data.toString())
+                }
+
+                options.onStderr?.(data.toString(), paramsContext)
+            })
+
+            // Emitted when streams are closed.
+            // This will not be fired if `waitForStreams` is false
+            this.#childProcess.once('close', (code, signal) => {
+                this.#processResult = this.#makeResult(code ?? -1, signal ?? undefined)
+                resolve(this.#processResult)
+            })
+
+            // Emitted when process exits or terminates.
+            // https://nodejs.org/api/child_process.html#child_process_class_childprocess
+            // - If the process exited, `code` is the final exit code of the process, else null.
+            // - If the process terminated because of a signal, `signal` is the name of the signal, else null.
+            // - One of `code` or `signal` will always be non-null.
+            this.#childProcess.once('exit', (code, signal) => {
+                this.#processResult = this.#makeResult(
+                    typeof code === 'number' ? code : -1,
+                    typeof signal === 'string' ? signal : undefined
+                )
+                if (code && rejectOnErrorCode) {
+                    if (typeof rejectOnErrorCode === 'function') {
+                        reject(rejectOnErrorCode(code))
+                    } else {
+                        reject(new Error(`Command exited with non-zero code (${code}): ${this.toString()}`))
+                    }
+                }
+                if (options.waitForStreams === false) {
+                    resolve(this.#processResult)
+                }
+            })
+        }).finally(() => cleanup())
+    }
+
+    /**
+     * Gets the `run()` result after the child process has finished.
+     *
+     * stdout/stderr will be empty unless the process was started with `collect=true`.
+     *
+     * @returns `run()` result, or undefined if the process has not yet started or is still running.
+     */
+    public result(): ChildProcessResult | undefined {
+        return this.#processResult
+    }
+
+    public proc(): proc.ChildProcess | undefined {
+        return this.#childProcess
+    }
+
+    public pid(): number {
+        return this.#childProcess?.pid ?? -1
+    }
+
+    public exitCode(): number {
+        return this.#childProcess?.exitCode ?? -1
+    }
+
+    /**
+     * Stops the process.
+     *
+     * SIGTERM won't kill a terminal process, use SIGHUP instead.
+     *
+     * @param force  Tries SIGKILL if the process is not stopped after a few seconds.
+     * @param signal  Signal to send, defaults to SIGTERM (node default).
+     *
+     */
+    public stop(force: boolean = false, signal?: NodeJS.Signals): void {
+        const child = this.#childProcess
+        if (!child || child.stdin?.destroyed) {
+            return
+        }
+        const command = this.#command
+        const pid = this.pid()
+        if (!this.stopped) {
+            child.kill(signal)
+
+            if (force === true) {
+                waitUntil(async () => this.stopped, { timeout: ChildProcess.stopTimeout, interval: 200, truthy: true })
+                    .then((stopped) => {
+                        if (!stopped) {
+                            child.kill('SIGKILL')
+                        }
+                    })
+                    .catch((e) => {
+                        this.#log.warn(`stop(): SIGKILL failed: pid=${pid} command=${command}`)
+                    })
+            }
+        } else {
+            throw new Error('Attempting to kill a process that has already been killed')
+        }
+    }
+
+    #registerLifecycleListeners(
+        process: proc.ChildProcess,
+        errorHandler: (error: Error, forceStop?: boolean) => void,
+        options?: ChildProcessOptions
+    ): void {
+        const pid = process.pid
+        if (pid === undefined) {
+            return
+        }
+        ChildProcess.#runningProcesses.add(this)
+
+        const timeoutListener = options?.timeout?.token.onCancellationRequested(({ agent }) => {
+            const message = agent === 'user' ? 'Cancelled: ' : 'Timed out: '
+            this.#log.verbose(`${message}${this.toString(options?.logging === 'noparams')}`)
+            errorHandler(new CancellationError(agent), true)
+        })
+
+        const dispose = () => {
+            timeoutListener?.dispose()
+            ChildProcess.#runningProcesses.delete(this.pid())
+        }
+
+        process.on('exit', dispose)
+        process.on('error', dispose)
+    }
+
+    /**
+     * Sends data to the process
+     *
+     * This throws if the process hasn't started or if the write fails.
+     */
+    public async send(input: string | Buffer | typeof eof) {
+        if (this.#childProcess === undefined) {
+            throw new Error('Cannot write to non-existent process')
+        }
+
+        const stdin = this.#childProcess.stdin
+        if (!stdin) {
+            throw new Error('Cannot write to non-existent stdin')
+        }
+
+        if (input === eof) {
+            return new Promise<void>((resolve) => stdin.end('', resolve))
+        }
+
+        return new Promise<void>((resolve, reject) => stdin.write(input, (e) => (e ? reject(e) : resolve())))
+    }
+
+    /**
+     * Returns true if the process has ended, or false if the process was not
+     * started or is still running.
+     *
+     * "Ended" means any of:
+     * - error prevented start, or
+     * - streams closed, or
+     * - process exited, or
+     * - exit-code was set.
+     */
+    public get stopped(): boolean {
+        if (!this.#childProcess) {
+            return false // Not started yet.
+        }
+        return !!this.#processResult
+    }
+
+    /**
+     * Gets a string representation of the process invocation.
+     *
+     * @param noparams Omit parameters in the result (to protect sensitive info).
+     * @param nostatus Omit "(not started)" note.
+     */
+    public toString(noparams = false, nostatus = false): string {
+        const pid = this.pid() > 0 ? `PID ${this.pid()}:` : nostatus ? '' : '(not started)'
+        return `${pid} [${this.#command} ${noparams ? '...' : this.#args.join(' ')}]`
+    }
+}
diff --git a/packages/core/src/shared/utilities/proxyUtil.ts b/packages/core/src/shared/utilities/proxyUtil.ts
new file mode 100644
index 00000000000..e617bcd85c3
--- /dev/null
+++ b/packages/core/src/shared/utilities/proxyUtil.ts
@@ -0,0 +1,106 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import vscode from 'vscode'
+import { getLogger } from '../logger/logger'
+
+interface ProxyConfig {
+    proxyUrl: string | undefined
+    noProxy: string | undefined
+    proxyStrictSSL: boolean | true
+    certificateAuthority: string | undefined
+    isProxyAndCertAutoDiscoveryEnabled: boolean
+}
+
+/**
+ * Utility class for handling proxy configuration
+ */
+export class ProxyUtil {
+    private static readonly logger = getLogger('proxyUtil')
+
+    /**
+     * Sets proxy environment variables based on VS Code settings for use with the Flare Language Server
+     *
+     * See documentation here for setting the environement variables which are inherited by Flare LS process:
+     * https://github.com/aws/language-server-runtimes/blob/main/runtimes/docs/proxy.md
+     */
+    public static async configureProxyForLanguageServer(): Promise<void> {
+        try {
+            const proxyConfig = this.getProxyConfiguration()
+
+            await this.setProxyEnvironmentVariables(proxyConfig)
+        } catch (err) {
+            this.logger.error(`Failed to configure proxy: ${err}`)
+        }
+    }
+
+    /**
+     * Gets proxy configuration from VS Code settings
+     */
+    private static getProxyConfiguration(): ProxyConfig {
+        const httpConfig = vscode.workspace.getConfiguration('http')
+        const proxyUrl = httpConfig.get<string>('proxy')
+        this.logger.debug(`Proxy URL Setting in VSCode Settings: ${proxyUrl}`)
+
+        const noProxy = httpConfig.get<string>('noProxy')
+        if (noProxy) {
+            this.logger.info(`Using noProxy from VS Code settings: ${noProxy}`)
+        }
+
+        const proxyStrictSSL = httpConfig.get<boolean>('proxyStrictSSL', true)
+
+        const amazonQConfig = vscode.workspace.getConfiguration('amazonQ')
+        const proxySettings = amazonQConfig.get<{
+            certificateAuthority?: string
+            enableProxyAndCertificateAutoDiscovery: boolean
+        }>('proxy', { enableProxyAndCertificateAutoDiscovery: true })
+
+        return {
+            proxyUrl,
+            noProxy,
+            proxyStrictSSL,
+            certificateAuthority: proxySettings.certificateAuthority,
+            isProxyAndCertAutoDiscoveryEnabled: proxySettings.enableProxyAndCertificateAutoDiscovery,
+        }
+    }
+
+    /**
+     * Sets environment variables based on proxy configuration
+     */
+    private static async setProxyEnvironmentVariables(config: ProxyConfig): Promise<void> {
+        // Set experimental proxy support based on user setting
+        process.env.EXPERIMENTAL_HTTP_PROXY_SUPPORT = config.isProxyAndCertAutoDiscoveryEnabled.toString()
+
+        const proxyUrl = config.proxyUrl
+        // Set proxy environment variables
+        if (proxyUrl) {
+            process.env.HTTPS_PROXY = proxyUrl
+            process.env.HTTP_PROXY = proxyUrl
+            this.logger.debug(`Set proxy environment variables: ${proxyUrl}`)
+        }
+
+        // set NO_PROXY vals
+        const noProxy = config.noProxy
+        if (noProxy) {
+            process.env.NO_PROXY = noProxy
+            this.logger.debug(`Set NO_PROXY environment variable: ${noProxy}`)
+        }
+
+        const strictSSL = config.proxyStrictSSL
+        // Handle SSL certificate verification
+        if (!strictSSL) {
+            process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'
+            this.logger.info('SSL verification disabled via VS Code settings')
+            return // No need to set CA certs when SSL verification is disabled
+        }
+
+        // Set certificate bundle environment variables if user configured
+        if (config.certificateAuthority) {
+            process.env.NODE_EXTRA_CA_CERTS = config.certificateAuthority
+            process.env.AWS_CA_BUNDLE = config.certificateAuthority
+            this.logger.debug(`Set certificate bundle path: ${config.certificateAuthority}`)
+        }
+    }
+}
diff --git a/packages/core/src/shared/utilities/resourceCache.ts b/packages/core/src/shared/utilities/resourceCache.ts
new file mode 100644
index 00000000000..a399dea66ca
--- /dev/null
+++ b/packages/core/src/shared/utilities/resourceCache.ts
@@ -0,0 +1,205 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../extensionGlobals'
+import { globalKey } from '../globalState'
+import { getLogger } from '../logger/logger'
+import { waitUntil } from '../utilities/timeoutUtils'
+
+/**
+ * args:
+ *  @member result: the actual resource type callers want to use
+ *  @member locked: readWriteLock, while the lock is acquired by one process, the other can't access to it until it's released by the previous
+ *  @member timestamp: used for determining the resource is stale or not
+ */
+interface Resource<V> {
+    result: V | undefined
+    locked: boolean
+    timestamp: number
+}
+
+/**
+ * GlobalStates schema, which is used for vscode global states deserialization, [globals.globalState#tryGet<T>] etc.
+ * The purpose of it is to allow devs to overload the resource into existing global key and no need to create a specific key for only this purpose.
+ */
+export interface GlobalStateSchema<V> {
+    resource: Resource<V>
+}
+
+const logger = getLogger('resourceCache')
+
+function now() {
+    return globals.clock.Date.now()
+}
+
+/**
+ * CacheResource utilizes VSCode global states API to cache resources which are expensive to get so that the result can be shared across multiple VSCode instances.
+ *  The first VSCode instance invoking #getResource will hold a lock and make the actual network call/FS read to pull the real response.
+ *  When the pull is done, the lock will be released and it then caches the result in the global states. Then the rest of instances can now acquire the lock 1 by 1 and read the resource from the cache.
+ *
+ * constructor:
+ *  @param key: global state key, which is used for globals.globalState#update, #tryGet etc.
+ *  @param expirationInMilli: cache expiration time in milli seconds
+ *  @param defaultValue: default value for the cache if the cache doesn't pre-exist in users' FS
+ *  @param waitUntilOption: waitUntil option for acquire lock
+ *
+ * methods:
+ *  @method resourceProvider: implementation needs to implement this method to obtain the latest resource either via network calls or FS read
+ *  @method getResource: obtain the resource from cache or pull the latest from the service if the cache either expires or doesn't exist
+ */
+export abstract class CachedResource<V> {
+    constructor(
+        private readonly key: globalKey,
+        private readonly expirationInMilli: number,
+        private readonly defaultValue: GlobalStateSchema<V>,
+        private readonly waitUntilOption: { timeout: number; interval: number; truthy: boolean }
+    ) {}
+
+    abstract resourceProvider(): Promise<V>
+
+    async getResource(): Promise<V> {
+        // Check cache without locking first
+        const quickCheck = this.readCacheOrDefault()
+        if (quickCheck.resource.result && !quickCheck.resource.locked) {
+            const duration = now() - quickCheck.resource.timestamp
+            if (duration < this.expirationInMilli) {
+                logger.debug(
+                    `cache hit (fast path), duration(%sms) is less than expiration(%sms), returning cached value: %s`,
+                    duration,
+                    this.expirationInMilli,
+                    this.key
+                )
+                return quickCheck.resource.result
+            }
+        }
+
+        const cachedValue = await this.tryLoadResourceAndLock()
+        const resource = cachedValue?.resource
+
+        // If cache is still fresh, return cached result, otherwise pull latest from the service
+        if (cachedValue && resource && resource.result) {
+            const duration = now() - resource.timestamp
+            if (duration < this.expirationInMilli) {
+                logger.debug(
+                    `cache hit, duration(%sms) is less than expiration(%sms), returning cached value: %s`,
+                    duration,
+                    this.expirationInMilli,
+                    this.key
+                )
+                // release the lock
+                await this.releaseLock(resource, cachedValue)
+                return resource.result
+            }
+
+            logger.debug(
+                `cache is stale, duration(%sms) is older than expiration(%sms), pulling latest resource: %s`,
+                duration,
+                this.expirationInMilli,
+                this.key
+            )
+        } else {
+            logger.info(`cache miss, pulling latest resource: %s`, this.key)
+        }
+
+        /**
+         * Possible paths here
+         *  1. cache doesn't exist.
+         *  2. cache exists but expired.
+         *  3. lock is held by other process and the waiting time is greater than the specified waiting time
+         */
+        try {
+            // Make the real network call / FS read to pull the resource
+            const latest = await this.resourceProvider()
+
+            // Update resource cache and release the lock
+            const r: Resource<V> = {
+                locked: false,
+                timestamp: now(),
+                result: latest,
+            }
+            await this.releaseLock(r)
+            logger.info(`loaded latest resource and updated cache: %s`, this.key)
+            return latest
+        } catch (e) {
+            logger.error(`failed to load latest resource, releasing lock: %s`, this.key)
+            await this.releaseLock()
+            throw e
+        }
+    }
+
+    // This method will lock the resource so other callers have to wait until the lock is released, otherwise will return undefined if it times out
+    private async tryLoadResourceAndLock(): Promise<GlobalStateSchema<V> | undefined> {
+        const _acquireLock = async () => {
+            const cachedValue = this.readCacheOrDefault()
+
+            if (!cachedValue.resource.locked) {
+                await this.lockResource(cachedValue)
+                return cachedValue
+            }
+
+            return undefined
+        }
+
+        const lock = await waitUntil(async () => {
+            const lock = await _acquireLock()
+            logger.debug(`trying to acquire resource cache lock: %s`, this.key)
+            if (lock) {
+                return lock
+            }
+        }, this.waitUntilOption)
+
+        return lock
+    }
+
+    async lockResource(baseCache: GlobalStateSchema<V>): Promise<void> {
+        await this.updateResourceCache({ locked: true }, baseCache)
+    }
+
+    async releaseLock(): Promise<void>
+    async releaseLock(resource: Partial<Resource<V>>): Promise<void>
+    async releaseLock(resource: Partial<Resource<V>>, baseCache: GlobalStateSchema<V>): Promise<void>
+    async releaseLock(resource?: Partial<Resource<V>>, baseCache?: GlobalStateSchema<V>): Promise<void> {
+        if (!resource) {
+            await this.updateResourceCache({ locked: false }, undefined)
+        } else if (baseCache) {
+            await this.updateResourceCache(resource, baseCache)
+        } else {
+            await this.updateResourceCache(resource, undefined)
+        }
+    }
+
+    async clearCache() {
+        const baseCache = this.readCacheOrDefault()
+        await this.updateResourceCache({ result: undefined, timestamp: 0, locked: false }, baseCache)
+    }
+
+    private async updateResourceCache(resource: Partial<Resource<any>>, cache: GlobalStateSchema<any> | undefined) {
+        const baseCache = cache ?? this.readCacheOrDefault()
+
+        const toUpdate: GlobalStateSchema<V> = {
+            ...baseCache,
+            resource: {
+                ...baseCache.resource,
+                ...resource,
+            },
+        }
+
+        await globals.globalState.update(this.key, toUpdate)
+    }
+
+    private readCacheOrDefault(): GlobalStateSchema<V> {
+        const cachedValue = globals.globalState.tryGet<GlobalStateSchema<V>>(this.key, Object, {
+            ...this.defaultValue,
+            resource: {
+                ...this.defaultValue.resource,
+                locked: false,
+                result: undefined,
+                timestamp: 0,
+            },
+        })
+
+        return cachedValue
+    }
+}
diff --git a/src/shared/utilities/result.ts b/packages/core/src/shared/utilities/result.ts
similarity index 91%
rename from src/shared/utilities/result.ts
rename to packages/core/src/shared/utilities/result.ts
index 76aca9e44ea..fbc250eb806 100644
--- a/src/shared/utilities/result.ts
+++ b/packages/core/src/shared/utilities/result.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -44,7 +44,7 @@ abstract class Base<T, E> {
     }
 
     public expect(message: string): T {
-        return this.mapErr(err => new ResultError(message, err)).unwrap()
+        return this.mapErr((err) => new ResultError(message, err)).unwrap()
     }
 
     public maybeOk(): T | undefined {
@@ -102,6 +102,7 @@ export class Err<E> extends Base<never, E> {
 
 export type Result<T, E = unknown> = Ok<T> | Err<E>
 
+// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace Result {
     export function ok(): Ok<void>
     export function ok<T>(val: T): Ok<T>
@@ -119,7 +120,10 @@ export namespace Result {
 }
 
 export class ResultError<E> extends Error {
-    public constructor(message: string, public readonly cause: E) {
+    public constructor(
+        message: string,
+        public readonly cause: E
+    ) {
         super(message)
     }
 
diff --git a/src/shared/utilities/streamUtilities.ts b/packages/core/src/shared/utilities/streamUtilities.ts
similarity index 82%
rename from src/shared/utilities/streamUtilities.ts
rename to packages/core/src/shared/utilities/streamUtilities.ts
index 1dccb4a5cbb..0b7d74fca5f 100644
--- a/src/shared/utilities/streamUtilities.ts
+++ b/packages/core/src/shared/utilities/streamUtilities.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'fs'
+import * as fs from 'fs' // eslint-disable-line no-restricted-imports
 import { Readable, Writable, pipeline } from 'stream'
 import * as vscode from 'vscode'
 
@@ -36,12 +36,17 @@ export function streamToFile(stream: Readable, target: vscode.Uri): Promise<void
 class BufferWriter {
     private offset = 0
 
-    public constructor(private readonly buffer: Buffer | number[], private readonly finalSize?: number) {}
+    public constructor(
+        private readonly buffer: Buffer | number[],
+        private readonly finalSize?: number
+    ) {}
 
     public write(chunk: Buffer) {
         const buffer = this.buffer
         if (Buffer.isBuffer(buffer)) {
-            chunk.forEach(byte => (this.offset = buffer.writeUInt8(byte, this.offset)))
+            for (const byte of chunk) {
+                this.offset = buffer.writeUInt8(byte, this.offset)
+            }
         } else {
             buffer.push(...chunk)
             this.offset += chunk.length
@@ -71,7 +76,7 @@ export function streamToBuffer(stream: Readable, size?: number): Promise<Buffer>
 
     return new Promise<Buffer>((resolve, reject) => {
         stream.on('error', reject)
-        stream.on('data', chunk => writer.write(chunk))
+        stream.on('data', (chunk) => writer.write(chunk))
         stream.on('end', () => resolve(writer.finish()))
     })
 }
@@ -80,7 +85,7 @@ export function bufferToStream(buffer: Uint8Array): Readable {
     return new Readable({
         read() {
             this.push(buffer)
-            // eslint-disable-next-line no-null/no-null
+            // eslint-disable-next-line unicorn/no-null
             this.push(null)
         },
     })
@@ -96,6 +101,6 @@ export async function pipe(
     }
 
     return new Promise<void>((resolve, reject) => {
-        pipeline(readStream, writeStream, err => (err ? reject(err) : resolve()))
+        pipeline(readStream, writeStream, (err) => (err ? reject(err) : resolve()))
     })
 }
diff --git a/src/shared/utilities/symbolUtilities.ts b/packages/core/src/shared/utilities/symbolUtilities.ts
similarity index 92%
rename from src/shared/utilities/symbolUtilities.ts
rename to packages/core/src/shared/utilities/symbolUtilities.ts
index e98393d1ad2..1e09ec13b1a 100644
--- a/src/shared/utilities/symbolUtilities.ts
+++ b/packages/core/src/shared/utilities/symbolUtilities.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -47,7 +47,7 @@ export async function getChildrenRange(symbol: vscode.DocumentSymbol): Promise<v
     let start: vscode.Position | undefined
     let end: vscode.Position | undefined
 
-    for (const range of symbol.children.map(c => c.range)) {
+    for (const range of symbol.children.map((c) => c.range)) {
         if (!start || range.start.isBefore(start)) {
             start = range.start
         }
diff --git a/packages/core/src/shared/utilities/textDocumentUtilities.ts b/packages/core/src/shared/utilities/textDocumentUtilities.ts
new file mode 100644
index 00000000000..93b22c2e560
--- /dev/null
+++ b/packages/core/src/shared/utilities/textDocumentUtilities.ts
@@ -0,0 +1,338 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as _path from 'path'
+import * as vscode from 'vscode'
+import { disposeOnEditorClose, getTabSizeSetting } from './editorUtilities'
+import { tempDirPath } from '../filesystemUtilities'
+import { getLogger } from '../logger/logger'
+import fs from '../fs/fs'
+import { ToolkitError } from '../errors'
+import { indent } from './textUtilities'
+import { ViewDiffMessage } from '../../amazonq/commons/controllers/contentController'
+import { DiffContentProvider } from '../../amazonq/commons/controllers/diffContentProvider'
+
+/**
+ * Finds occurences of text in a document. Currently only used for highlighting cloudwatchlogs data.
+ * @param document Document to search.
+ * @param keyword Keyword to search for.
+ * @returns the ranges of each and every occurence of the keyword.
+ */
+export function findOccurencesOf(document: vscode.TextDocument, keyword: string): vscode.Range[] {
+    const ranges: vscode.Range[] = []
+    let lineNum = 0
+
+    keyword = keyword.toLowerCase()
+
+    while (lineNum < document.lineCount) {
+        const currentLine = document.lineAt(lineNum)
+        const currentLineText = currentLine.text.toLowerCase()
+        let indexOccurrence = currentLineText.indexOf(keyword, 0)
+
+        while (indexOccurrence >= 0) {
+            ranges.push(
+                new vscode.Range(
+                    new vscode.Position(lineNum, indexOccurrence),
+                    new vscode.Position(lineNum, indexOccurrence + keyword.length)
+                )
+            )
+            indexOccurrence = currentLineText.indexOf(keyword, indexOccurrence + 1)
+        }
+        lineNum += 1
+    }
+    return ranges
+}
+/**
+ * If the specified document is currently open, and marked as dirty, it is saved.
+ */
+export async function saveDocumentIfDirty(documentPath: string): Promise<void> {
+    const path = _path.normalize(vscode.Uri.file(documentPath).fsPath)
+    const document = vscode.workspace.textDocuments.find((doc) => {
+        if (!doc.isDirty) {
+            return false
+        }
+
+        if (_path.normalize(doc.uri.fsPath) !== path) {
+            return false
+        }
+
+        return true
+    })
+
+    if (document) {
+        await document.save()
+    }
+}
+
+/**
+ * Determine the tab width used by the editor.
+ *
+ * @param editor The editor for which to determine the tab width.
+ */
+export function getTabSize(editor?: vscode.TextEditor): number {
+    const tabSize = !editor ? undefined : editor.options.tabSize
+
+    switch (typeof tabSize) {
+        case 'number':
+            return tabSize
+        case 'string':
+            return Number.parseInt(tabSize, 10)
+        default:
+            return getTabSizeSetting()
+    }
+}
+
+/**
+ * Creates a selection range from the given document and selection.
+ * If a user selects a partial code, this function generates the range from start line to end line.
+ *
+ * @param {vscode.TextDocument} doc - The VSCode document where the selection is applied.
+ * @param {vscode.Selection} selection - The selection range in the document.
+ * @returns {vscode.Range} - The VSCode range object representing the start and end of the selection.
+ */
+export function getSelectionFromRange(doc: vscode.TextDocument, selection: vscode.Selection) {
+    return new vscode.Range(
+        new vscode.Position(selection.start.line, 0),
+        new vscode.Position(selection.end.line, doc.lineAt(selection.end.line).range.end.character)
+    )
+}
+
+/**
+ * Applies the given code to the specified range in the document.
+ * Saves the document after the edit is successfully applied.
+ *
+ * @param {vscode.TextDocument} doc - The VSCode document to which the changes are applied.
+ * @param {vscode.Range} range - The range in the document where the code is replaced.
+ * @param {string} code - The code to be applied to the document.
+ * @returns {Promise<void>} - Resolves when the changes are successfully applied and the document is saved.
+ */
+export async function applyChanges(doc: vscode.TextDocument, range: vscode.Range, code: string) {
+    const edit = new vscode.WorkspaceEdit()
+    edit.replace(doc.uri, range, code)
+    const successfulEdit = await vscode.workspace.applyEdit(edit)
+    if (successfulEdit) {
+        getLogger().debug('Diff: Edits successfully applied to: %s', doc.uri.fsPath)
+        await doc.save()
+    } else {
+        getLogger().error('Diff: Unable to apply changes to: %s', doc.uri.fsPath)
+    }
+}
+
+/**
+ * Creates a temporary file for diff comparison by cloning the original file
+ * and applying the proposed changes within the selected range.
+ *
+ * @param {vscode.Uri} originalFileUri - The URI of the original file.
+ * @param {ViewDiffMessage} message - The message object containing the proposed code changes.
+ * @param {vscode.Selection} selection - The selection range in the document where the changes are applied.
+ * @returns {Promise<vscode.Uri>} - A promise that resolves to the URI of the temporary file.
+ */
+export async function createTempFileForDiff(
+    originalFileUri: vscode.Uri,
+    message: ViewDiffMessage,
+    selection: vscode.Selection,
+    scheme: string
+): Promise<vscode.Uri> {
+    const errorCode = 'createTempFile'
+    const id = Date.now()
+    const languageId = (await vscode.workspace.openTextDocument(originalFileUri)).languageId
+    const tempFile = _path.parse(originalFileUri.path)
+    const tempFilePath = _path.join(tempDirPath, `${tempFile.name}_proposed-${id}${tempFile.ext}`)
+    await fs.mkdir(tempDirPath)
+    const tempFileUri = vscode.Uri.parse(`${scheme}:${tempFilePath}`)
+    getLogger().debug('Diff: Creating temp file: %s', tempFileUri.fsPath)
+
+    try {
+        // Write original content to temp file
+        await fs.writeFile(tempFilePath, await fs.readFileText(originalFileUri.fsPath))
+    } catch (error) {
+        if (!(error instanceof Error)) {
+            throw error
+        }
+        throw ToolkitError.chain(error, 'Failed to write to temp file', { code: errorCode })
+    }
+
+    // Apply the proposed changes to the temp file
+    const doc = await vscode.workspace.openTextDocument(tempFileUri.path)
+    const languageIdStatus = await vscode.languages.setTextDocumentLanguage(doc, languageId)
+    if (languageIdStatus) {
+        getLogger().debug('Diff: languageId for %s is set to: %s', tempFileUri.fsPath, languageId)
+    } else {
+        getLogger().error('Diff: Unable to set languageId for %s to: %s', tempFileUri.fsPath, languageId)
+    }
+
+    const code = getIndentedCode(message, doc, selection)
+    const range = getSelectionFromRange(doc, selection)
+
+    await applyChanges(doc, range, code)
+    return tempFileUri
+}
+
+/**
+ * Creates temporary URIs for diff comparison and registers their content with a DiffContentProvider.
+ * This approach avoids writing to the file system by keeping content in memory.
+ *
+ * @param filePath The path of the original file (used for naming)
+ * @param fileText Optional content of the original file (if not provided, will be read from filePath)
+ * @param message The message object containing the proposed code changes
+ * @param selection The selection range where changes should be applied
+ * @param scheme The URI scheme to use
+ * @param diffProvider The content provider to register URIs with
+ * @returns A promise that resolves to a tuple of [originalUri, modifiedUri]
+ */
+export async function createTempUrisForDiff(
+    filePath: string,
+    fileText: string | undefined,
+    message: ViewDiffMessage,
+    selection: vscode.Selection,
+    scheme: string,
+    diffProvider: DiffContentProvider
+): Promise<[vscode.Uri, vscode.Uri]> {
+    const originalFile = _path.parse(filePath)
+    const id = Date.now()
+
+    // Create URIs with the custom scheme
+    const originalFileUri = vscode.Uri.parse(`${scheme}:/${originalFile.name}_original-${id}${originalFile.ext}`)
+    const modifiedFileUri = vscode.Uri.parse(`${scheme}:/${originalFile.name}_proposed-${id}${originalFile.ext}`)
+
+    // Get the original content
+    const contentToUse = fileText ?? (await fs.readFileText(filePath))
+
+    // Register the original content
+    diffProvider.registerContent(originalFileUri, contentToUse)
+
+    const indentedCode = getIndentedCodeFromOriginalContent(message, contentToUse, selection)
+    const lines = contentToUse.split('\n')
+
+    // Create the modified content
+    const beforeLines = lines.slice(0, selection.start.line)
+    const afterLines = lines.slice(selection.end.line + 1)
+    const modifiedContent = [...beforeLines, indentedCode, ...afterLines].join('\n')
+
+    // Register the modified content
+    diffProvider.registerContent(modifiedFileUri, modifiedContent)
+
+    return [originalFileUri, modifiedFileUri]
+}
+
+/**
+ * Indents the given code based on the current document's indentation at the selection start.
+ *
+ * @param message The message object containing the code.
+ * @param doc The VSCode document where the code is applied.
+ * @param selection The selection range in the document.
+ * @returns The processed code to be applied to the document.
+ */
+export function getIndentedCode(message: ViewDiffMessage, doc: vscode.TextDocument, selection: vscode.Selection) {
+    const indentRange = new vscode.Range(new vscode.Position(selection.start.line, 0), selection.active)
+    let indentation = doc.getText(indentRange)
+
+    if (indentation.trim().length !== 0) {
+        indentation = ' '.repeat(indentation.length - indentation.trimStart().length)
+    }
+
+    return indent(message.code, indentation.length)
+}
+
+/**
+ * Indents the given code based on the indentation of the original content at the selection start.
+ *
+ * @param message The message object containing the code.
+ * @param originalContent The original content of the document.
+ * @param selection The selection range in the document.
+ * @returns The processed code to be applied to the document.
+ */
+export function getIndentedCodeFromOriginalContent(
+    message: ViewDiffMessage,
+    originalContent: string,
+    selection: vscode.Selection
+) {
+    const lines = originalContent.split('\n')
+    const selectionStartLine = lines[selection.start.line] || ''
+    const indentMatch = selectionStartLine.match(/^(\s*)/)
+    const indentation = indentMatch ? indentMatch[1] : ''
+    return indent(message.code, indentation.length)
+}
+
+export async function showFile(uri: vscode.Uri) {
+    const doc = await vscode.workspace.openTextDocument(uri)
+    await vscode.window.showTextDocument(doc, { preview: false })
+    await vscode.languages.setTextDocumentLanguage(doc, 'log')
+}
+
+/**
+ * Expands the given selection to full line(s) in the document.
+ * If the selection is partial, it will be extended to include the entire line(s).
+ * @param document The current text document
+ * @param selection The current selection
+ * @returns A new Range that covers full line(s) of the selection
+ */
+export function expandSelectionToFullLines(document: vscode.TextDocument, selection: vscode.Selection): vscode.Range {
+    const startLine = document.lineAt(selection.start.line)
+    const endLine = document.lineAt(selection.end.line)
+    return new vscode.Range(startLine.range.start, endLine.range.end)
+}
+
+/**
+ * Ensures the document ends with a newline character.
+ * If the selection is at the end of the last line and the document doesn't end with a newline,
+ * this function inserts one.
+ * @param editor The VS Code text editor to modify
+ */
+export async function addEofNewline(editor: vscode.TextEditor) {
+    if (
+        editor.selection.end.line === editor.document.lineCount - 1 &&
+        editor.selection.end.character === editor.document.lineAt(editor.selection.end.line).text.length &&
+        !editor.document.getText().endsWith('\n')
+    ) {
+        await editor.edit((editBuilder) => {
+            editBuilder.insert(editor.selection.end, '\n')
+        })
+    }
+}
+
+class ReadonlyTextDocumentProvider implements vscode.TextDocumentContentProvider {
+    private content = ''
+
+    setContent(content: string) {
+        this.content = content
+    }
+
+    provideTextDocumentContent(uri: vscode.Uri): string {
+        return this.content
+    }
+}
+
+/**
+ * Shows a read only virtual txt file on a side column
+ * It's read-only so that the "save" option doesn't appear when user closes the pop up window
+ * Usage: ReadonlyDocument.show(content, filename)
+ * @param content The content to be displayed in the virtual document
+ * @param filename The title on top of the pop up window
+ */
+class ReadonlyDocument {
+    private readonly scheme = 'AWStoolkit-readonly'
+    private readonly provider = new ReadonlyTextDocumentProvider()
+
+    public async show(content: string, filename: string) {
+        const disposableProvider = vscode.workspace.registerTextDocumentContentProvider(this.scheme, this.provider)
+        this.provider.setContent(content)
+        const uri = vscode.Uri.parse(`${this.scheme}:/${filename}.txt`)
+        // txt document on side column, in focus and preview
+        const options: vscode.TextDocumentShowOptions = {
+            viewColumn: vscode.ViewColumn.Beside,
+            preserveFocus: false,
+            preview: true,
+        }
+
+        // Open the document with the updated content
+        const document = await vscode.workspace.openTextDocument(uri)
+        await vscode.window.showTextDocument(document, options)
+
+        disposeOnEditorClose(uri, disposableProvider)
+    }
+}
+
+export const readonlyDocument = new ReadonlyDocument()
diff --git a/packages/core/src/shared/utilities/textUtilities.ts b/packages/core/src/shared/utilities/textUtilities.ts
new file mode 100644
index 00000000000..6bc1a4eff21
--- /dev/null
+++ b/packages/core/src/shared/utilities/textUtilities.ts
@@ -0,0 +1,284 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as crypto from 'crypto'
+import * as fs from 'fs' // eslint-disable-line no-restricted-imports
+import { default as stripAnsi } from 'strip-ansi'
+import { getLogger } from '../logger/logger'
+import { ViewDiffMessage } from '../../amazonq/commons/controllers/contentController'
+
+/**
+ * Truncates string `s` if it has or exceeds `n` chars.
+ *
+ * If `n` is negative, truncates at start instead of end.
+ *
+ * @param s String to truncate
+ * @param n Truncate after this length
+ * @param suffix String appended to truncated value (default: "…")
+ */
+export function truncate(s: string, n: number, suffix?: string): string {
+    suffix = suffix ?? '…'
+    if (s.length <= Math.abs(n)) {
+        return s
+    }
+    const start = n < 0 ? s.length - Math.abs(n) : 0
+    const end = n < 0 ? s.length : n
+    const truncated = s.substring(start, end)
+    return n < 0 ? suffix + truncated : truncated + suffix
+}
+
+/**
+ * Indents a given string with spaces.
+ *
+ * @param {string} s - The input string to be indented.
+ * @param {number} [size=4] - The number of spaces to use for indentation. Defaults to 4.
+ * @param {boolean} [clear=false] - If true, the function will clear any existing indentation and apply the new indentation.
+ * @returns {string} The indented string.
+ *
+ * @example
+ * const indentedString = indent('Hello\nWorld', 2);
+ * console.log(indentedString); // Output: "  Hello\n  World"
+ *
+ * @example
+ * const indentedString = indent('  Hello\n    World', 4, true);
+ * console.log(indentedString); // Output: "    Hello\n    World"
+ */
+export function indent(s: string, size: number = 4, clear: boolean = false): string {
+    const n = Math.abs(size)
+    const spaces = ''.padEnd(n, ' ')
+    if (size < 0) {
+        throw Error() // TODO: implement "dedent" for negative size.
+    }
+    if (clear) {
+        return s.replace(/^[ \t]*([^\n])/, `${spaces}$1`).replace(/(\n+)[ \t]*([^ \t\n])/g, `$1${spaces}$2`)
+    }
+    return spaces + s.replace(/(\n+)(.)/g, `$1${spaces}$2`)
+}
+
+/**
+ * Creates a (shallow) clone of `obj` and truncates its top-level string properties.
+ *
+ * @param obj Object to copy and truncate
+ * @param len Truncate top-level string properties exceeding this length
+ * @param propNames Only truncate properties in this list
+ * @param suffix String appended to truncated values (default: "…")
+ */
+export function truncateProps(obj: object, len: number, propNames?: string[], suffix?: string): object {
+    if (len <= 0) {
+        throw Error(`invalid len: ${len}`)
+    }
+    // Shallow-copy to avoid modifying the original object.
+    const r = { ...obj }
+
+    if (propNames) {
+        for (const propName of propNames) {
+            try {
+                const val = (r as any)[propName]
+                if (val !== undefined && typeof val === 'string') {
+                    ;(r as any)[propName] = truncate(val, len, suffix)
+                }
+            } catch {
+                // Do nothing ("best effort").
+            }
+        }
+    } else {
+        for (const propName of Object.getOwnPropertyNames(r)) {
+            try {
+                ;(r as any)[propName] = truncate((r as any)[propName], len, suffix)
+            } catch {
+                // Do nothing ("best effort").
+            }
+        }
+    }
+
+    return r
+}
+
+export function removeAnsi(text: string): string {
+    try {
+        return stripAnsi(text)
+    } catch (err) {
+        getLogger().error('Unexpected error while removing Ansi from text: %O', err as Error)
+
+        // Fall back to original text so callers aren't impacted
+        return text
+    }
+}
+
+/**
+ * Hashes are not guaranteed to be stable across toolkit versions. We may change the implementation.
+ */
+export function getStringHash(text: string | Buffer): string {
+    const hash = crypto.createHash('sha256')
+
+    hash.update(text)
+
+    return hash.digest('hex')
+}
+
+/**
+ * Previously used to add Cloud9 support (no icons). Might be useful in the future, so let's leave it here.
+ */
+export function addCodiconToString(codiconName: string, text: string): string {
+    return `$(${codiconName}) ${text}`
+}
+
+/**
+ * Go allows function signatures to be multi-line, so we should parse these into something more usable.
+ *
+ * @param text String to parse
+ *
+ * @returns Final output without any new lines or comments
+ */
+export function stripNewLinesAndComments(text: string): string {
+    const blockCommentRegExp = /\/\*.*\*\//
+    let result: string = ''
+
+    text.split(/\r|\n/).map((s) => {
+        const commentStart: number = s.search(/\/\//)
+        s = s.replace(blockCommentRegExp, '')
+        result += commentStart === -1 ? s : s.substring(0, commentStart)
+    })
+
+    return result
+}
+
+/**
+ * Inserts some text into a file.
+ * Very slow for large files so don't use it for that purpose.
+ *
+ * @param filePath Path to the file to write to
+ * @param text String that will be inserted
+ * @param line Optional line number to use (0 indexed)
+ */
+export async function insertTextIntoFile(text: string, filePath: string, line: number = 0) {
+    const oldData: Buffer = fs.readFileSync(filePath)
+    const lines: string[] = oldData.toString().split(/\r?\n/)
+    lines.splice(line, 0, text)
+
+    const newData: Buffer = Buffer.from(lines.join('\n'))
+    const fd: number = fs.openSync(filePath, 'w+')
+
+    fs.writeSync(fd, newData, 0, newData.length, 0)
+
+    fs.close(fd, (err) => {
+        if (err) {
+            throw err
+        }
+    })
+}
+
+export function toTitleCase(str: string): string {
+    return str.charAt(0).toUpperCase().concat(str.slice(1))
+}
+
+/**
+ * converts keys in an object from camelCase to snake_case
+ * e.g.
+ * {
+ *   fooBar: "fi"
+ * }
+ *
+ * to
+ * {
+ *   foo_bar: "fi"
+ * }
+ */
+export function toSnakeCase(obj: Record<string, any>) {
+    const snakeObj: Record<string, string> = {}
+
+    for (const key in obj) {
+        if (Object.prototype.hasOwnProperty.call(obj, key)) {
+            const snakeKey = key.replace(/([a-z])([A-Z]+)/g, '$1_$2').toLowerCase()
+            snakeObj[snakeKey] = obj[key]
+        }
+    }
+
+    return snakeObj
+}
+
+/**
+ * To satisfy a pentesting concern, encodes HTML to mitigate risk of HTML injection
+ */
+export function encodeHTML(str: string) {
+    return str.replace(/</g, '&lt;').replace(/>/g, '&gt;')
+}
+
+/**
+ * cleans up a filename of invalid characters, whitespaces and emojis
+ * "foo🤷bar/zu b.txt" => "foo_bar_zu_b.txt"
+ * @param input filename
+ * @param replaceString optionally override default substitution
+ * @returns a cleaned name you can safely use as a file or directory name
+ */
+export function sanitizeFilename(input: string, replaceString = '_'): string {
+    return (
+        input
+            // replace invalid chars
+            .replace(/[\/|\\:*?"<>\s]/g, replaceString)
+            // replace emojis https://edvins.io/how-to-strip-emojis-from-string-in-java-script
+            .replace(
+                /([\u2700-\u27BF]|[\uE000-\uF8FF]|\uD83C[\uDC00-\uDFFF]|\uD83D[\uDC00-\uDFFF]|[\u2011-\u26FF]|\uD83E[\uDD10-\uDDFF])/g,
+                replaceString
+            )
+    )
+}
+
+/**
+ * A helper function to generate a random string for a specified length
+ *
+ * @param length - The length of the generated string. Defaults to 32 if length not provided.
+ */
+export function getRandomString(length = 32) {
+    let text = ''
+    const possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
+    for (let i = 0; i < length; i++) {
+        text += possible.charAt(Math.floor(Math.random() * possible.length))
+    }
+    return text
+}
+
+/**
+ * Convert a base 64 string to a base 64 url string
+ *
+ * See: https://datatracker.ietf.org/doc/html/rfc4648#section-5
+ * @param base64 a base 64 string
+ * @returns a base 64 url string
+ */
+export function toBase64URL(base64: string) {
+    return base64.replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '')
+}
+
+export function undefinedIfEmpty(str: string | undefined): string | undefined {
+    if (str && str.trim().length > 0) {
+        return str
+    }
+
+    return undefined
+}
+
+export function decodeBase64(base64Str: string): string {
+    return Buffer.from(base64Str, 'base64').toString()
+}
+/**
+ * Extracts the file path and selection context from the message.
+ *
+ * @param {any} message - The message object containing the file and selection context.
+ * @returns {Object} - An object with `filePath` and `selection` properties.
+ */
+export function extractFileAndCodeSelectionFromMessage(message: ViewDiffMessage) {
+    const filePath = message?.context?.activeFileContext?.filePath
+    const fileText = message?.context?.activeFileContext?.fileText
+    const selection = message?.context?.focusAreaContext?.selectionInsideExtendedCodeBlock as vscode.Selection
+    return { filePath, fileText, selection }
+}
+
+export function matchesPattern(source: string, target: string | RegExp) {
+    if (typeof target === 'string') {
+        return source.includes(target)
+    }
+    return target.test(source)
+}
diff --git a/packages/core/src/shared/utilities/timeoutUtils.ts b/packages/core/src/shared/utilities/timeoutUtils.ts
new file mode 100644
index 00000000000..8a8e0226879
--- /dev/null
+++ b/packages/core/src/shared/utilities/timeoutUtils.ts
@@ -0,0 +1,399 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../extensionGlobals'
+import { CancellationToken, EventEmitter, Event } from 'vscode'
+
+export const timeoutExpiredMessage = 'Timeout token expired'
+export const timeoutCancelledMessage = 'Timeout token cancelled'
+export const timeoutUnexpectedResolve = 'Promise resolved with an unexpected object'
+
+type CancellationAgent = 'user' | 'timeout'
+export class CancellationError extends Error {
+    public constructor(public readonly agent: CancellationAgent) {
+        super(agent === 'user' ? timeoutCancelledMessage : timeoutExpiredMessage)
+    }
+
+    public static isUserCancelled(err: any): err is CancellationError & { agent: 'user' } {
+        return err instanceof CancellationError && err.agent === 'user'
+    }
+
+    public static isExpired(err: any): err is CancellationError & { agent: 'timeout' } {
+        return err instanceof CancellationError && err.agent === 'timeout'
+    }
+}
+
+export interface CancelEvent {
+    readonly agent: CancellationAgent
+}
+
+/** A {@link CancellationToken} that provides a reason for the cancellation event. */
+interface TypedCancellationToken extends CancellationToken {
+    readonly onCancellationRequested: Event<CancelEvent>
+}
+
+/**
+ * Timeout that can handle both cancellation token-style and time limit-style timeout situations. Timeouts
+ * cannot be used after 'complete' has been called or if the Timeout expired.
+ */
+export class Timeout {
+    private _startTime: number
+    private _endTime: number
+    private readonly _timeoutLength: number
+    /** In the browser the timeout is a number */
+    private _timerTimeout: NodeJS.Timeout | number
+    private _completionReason?: CancellationAgent | 'completed'
+    private readonly _token: TypedCancellationToken
+    private readonly _onCancellationRequestedEmitter = new EventEmitter<CancelEvent>()
+    private readonly _onCompletionEmitter = new EventEmitter<void>()
+    public readonly onCompletion = this._onCompletionEmitter.event
+
+    /**
+     * @param timeoutLength Timeout duration (in ms)
+     */
+    public constructor(timeoutLength: number) {
+        this._startTime = globals.clock.Date.now()
+        this._endTime = this._startTime + timeoutLength
+        this._timeoutLength = timeoutLength
+
+        this._token = {
+            isCancellationRequested: false,
+            onCancellationRequested: this._onCancellationRequestedEmitter.event,
+        }
+
+        Object.defineProperty(this._token, 'isCancellationRequested', {
+            get: () => this._completionReason === 'user' || this._completionReason === 'timeout',
+        })
+
+        this._timerTimeout = this.createTimeout()
+    }
+
+    /**
+     * Time (in milliseconds) remaining since this Timeout object was initialized.
+     *
+     * Minimum is 0.
+     */
+    public get remainingTime(): number {
+        const remainingTime = this._endTime - globals.clock.Date.now()
+
+        return remainingTime > 0 ? remainingTime : 0
+    }
+
+    /**
+     * True when the Timeout has completed
+     */
+    public get completed(): boolean {
+        return !!this._completionReason
+    }
+
+    /**
+     * Updates the timer to timeout in timeout length from now
+     */
+    public refresh() {
+        if (this.completed) {
+            return
+        }
+
+        // Web mode timeout is a number and does not have a refresh method
+        if (typeof this._timerTimeout === 'number') {
+            globals.clock.clearTimeout(this._timerTimeout)
+            this._timerTimeout = this.createTimeout()
+        } else {
+            // This is a node timeout instance, which has refresh built in
+            this._timerTimeout = this._timerTimeout.refresh()
+        }
+
+        // These will not align, but we don't have visibility into a NodeJS.Timeout
+        // so remainingtime will be approximate. Timers are approximate anyway and are
+        // not highly accurate in when they fire.
+        this._endTime = globals.clock.Date.now() + this._timeoutLength
+    }
+
+    /**
+     * Returns a token suitable for use in-place of VS Code's {@link CancellationToken}
+     */
+    public get token(): TypedCancellationToken {
+        return this._token
+    }
+
+    /**
+     * Returns the elapsed time (ms) from the initial Timeout object creation
+     */
+    public get elapsedTime(): number {
+        return (this.completed ? this._endTime : globals.clock.Date.now()) - this._startTime
+    }
+
+    private createTimeout() {
+        return globals.clock.setTimeout(() => this.stop('timeout'), this._timeoutLength)
+    }
+
+    private stop(type: CancellationAgent | 'completed'): void {
+        if (this.completed) {
+            return
+        }
+
+        this._completionReason = type
+        this._endTime = globals.clock.Date.now()
+        globals.clock.clearTimeout(this._timerTimeout)
+
+        if (type !== 'completed') {
+            this._onCancellationRequestedEmitter.fire({ agent: type })
+        }
+
+        this._onCancellationRequestedEmitter.dispose()
+        this._onCompletionEmitter.fire()
+        this._onCompletionEmitter.dispose()
+    }
+
+    /**
+     * Cancels the timer, notifying any subscribing of the cancellation and locking in the time.
+     *
+     * This always assumes cancellation was caused by the user. Use {@link dispose} when the Timeout is no longer needed.
+     */
+    public cancel(): void {
+        this.stop('user')
+    }
+
+    /**
+     * Marks the Timeout token as being completed, preventing further use and locking in the elapsed time.
+     *
+     * Any listeners still using this token will receive a 'cancelled' event.
+     */
+    public dispose(): void {
+        this.stop('completed')
+    }
+
+    /**
+     * Turns the `Timeout` object into a Promise that resolves on completion or rejects on cancellation/expiration.
+     *
+     * Prefer using {@link token} when possible as using Promises is not as robust.
+     */
+    public promisify(): Promise<void | never> {
+        if (this._completionReason === 'completed') {
+            return Promise.resolve()
+        } else if (this._completionReason) {
+            return Promise.reject(new CancellationError(this._completionReason))
+        }
+
+        return new Promise((resolve, reject) => {
+            this._onCompletionEmitter.event(resolve)
+            this._onCancellationRequestedEmitter.event(({ agent }) => reject(new CancellationError(agent)))
+        })
+    }
+}
+
+export class Interval {
+    private _setCompleted: (() => void) | undefined
+    private _nextCompletion: Promise<void>
+    private ref: NodeJS.Timer | number | undefined
+
+    constructor(intervalMillis: number, onCompletion: () => Promise<void>) {
+        this._nextCompletion = new Promise<void>((resolve) => {
+            this._setCompleted = () => resolve()
+        })
+        this.ref = globals.clock.setInterval(async () => {
+            await onCompletion()
+            this._setCompleted!()
+            this._nextCompletion = new Promise<void>((resolve) => {
+                this._setCompleted = () => resolve()
+            })
+        }, intervalMillis)
+    }
+
+    /** Allows to wait for the next interval to finish running */
+    public async nextCompletion() {
+        await this._nextCompletion
+    }
+
+    public dispose() {
+        globals.clock.clearInterval(this.ref)
+    }
+}
+
+interface WaitUntilOptions {
+    /** Timeout in ms (default: 5000) */
+    readonly timeout?: number
+    /** Interval in ms between fn() checks (default: 500) */
+    readonly interval?: number
+    /** Wait for "truthy" result, else wait for any defined result including `false` (default: true) */
+    readonly truthy?: boolean
+    /** A backoff multiplier for how long the next interval will be (default: None, i.e 1) */
+    readonly backoff?: number
+    /**
+     * Only retries when an error is thrown, otherwise returning the immediate result.
+     * Can also be a callback for conditional retry based on errors
+     * - 'truthy' arg is ignored
+     * - If the timeout is reached it throws the last error
+     * - default: false
+     */
+    readonly retryOnFail?: boolean | ((error: Error) => boolean)
+}
+
+export const waitUntilDefaultTimeout = 2000
+export const waitUntilDefaultInterval = 500
+
+/**
+ * Invokes `fn()` on an interval based on the given arguments. This can be used for retries, or until
+ * an expected result is given. Read {@link WaitUntilOptions} carefully.
+ *
+ * @param fn  Function whose result is checked
+ * @param options  See {@link WaitUntilOptions}
+ *
+ * @returns Result of `fn()`, or possibly `undefined` depending on the arguments.
+ */
+export async function waitUntil<T>(fn: () => Promise<T>, options: WaitUntilOptions & { retryOnFail: true }): Promise<T>
+export async function waitUntil<T>(
+    fn: () => Promise<T>,
+    options: WaitUntilOptions & { retryOnFail: false }
+): Promise<T | undefined>
+export async function waitUntil<T>(
+    fn: () => Promise<T>,
+    options: WaitUntilOptions & { retryOnFail: (error: Error) => boolean }
+): Promise<T>
+
+export async function waitUntil<T>(
+    fn: () => Promise<T>,
+    options: Omit<WaitUntilOptions, 'retryOnFail'>
+): Promise<T | undefined>
+export async function waitUntil<T>(fn: () => Promise<T>, options: WaitUntilOptions): Promise<T | undefined> {
+    // set default opts
+    const opt = {
+        timeout: waitUntilDefaultTimeout,
+        interval: waitUntilDefaultInterval,
+        truthy: true,
+        backoff: 1,
+        retryOnFail: false,
+        ...options,
+    }
+
+    let interval = opt.interval
+    let lastError: Error | undefined
+    let elapsed: number = 0
+    let remaining = opt.timeout
+
+    // Internal helper to determine if we should retry
+    function shouldRetry(error: Error | undefined): boolean {
+        if (error === undefined) {
+            return typeof opt.retryOnFail === 'boolean' ? opt.retryOnFail : true
+        }
+        if (typeof opt.retryOnFail === 'function') {
+            return opt.retryOnFail(error)
+        }
+        return opt.retryOnFail
+    }
+
+    for (let i = 0; true; i++) {
+        const start: number = globals.clock.Date.now()
+        let result: T
+
+        try {
+            // Needed in case a caller uses a 0 timeout (function is only called once)
+            if (remaining > 0) {
+                result = await Promise.race([fn(), new Promise<T>((r) => globals.clock.setTimeout(r, remaining))])
+            } else {
+                result = await fn()
+            }
+
+            if (shouldRetry(lastError) || (opt.truthy && result) || (!opt.truthy && result !== undefined)) {
+                return result
+            }
+        } catch (e) {
+            // Unlikely to hit this, but exists for typing
+            if (!(e instanceof Error)) {
+                throw e
+            }
+
+            if (!shouldRetry(e)) {
+                throw e
+            }
+
+            lastError = e
+        }
+
+        // Ensures that we never overrun the timeout
+        remaining -= globals.clock.Date.now() - start
+
+        // If the sleep will exceed the timeout, abort early
+        if (elapsed + interval >= remaining) {
+            if (!shouldRetry(lastError)) {
+                return undefined
+            }
+            throw lastError
+        }
+
+        // when testing, this avoids the need to progress the stubbed clock
+        if (interval > 0) {
+            await sleep(interval)
+        }
+
+        elapsed += interval
+        interval = interval * opt.backoff
+    }
+}
+
+/**
+ * @deprecated Prefer using event-driven timeout mechanisms over racing promises.
+ *
+ * Race a Timeout object against a Promise. Handles Timeout expiration and cancellation, exposing access through
+ * the use of callbacks. Timeout tokens are cleaned up automatically after completion. Set `opt.completeTimeout`
+ * to false if this is not desired.
+ *
+ * @param promise Promise or a function that evaluates to a promise
+ * @param timeout Timeout token that will race against the promise
+ * @param opt.allowUndefined Output promise can resolve undefined (default: true)
+ * @param opt.onExpire Callback for when the promise expired. The callback can return a value
+ * @param opt.onCancel Callback for when the promise was cancelled. The callback can return a value
+ * @param opt.completeTimeout Automatically completes the Timeout upon resolution (default: true)
+ *
+ * @returns A Promise that returns if successful, or rejects when the Timeout was cancelled or expired.
+ */
+export async function waitTimeout<T, R = void, B extends boolean = true>(
+    promise: Promise<T> | (() => Promise<T>),
+    timeout: Timeout,
+    opt: {
+        allowUndefined?: B
+        onExpire?: () => R
+        onCancel?: () => R
+        completeTimeout?: boolean
+    } = {}
+): Promise<T | R | (true extends typeof opt.allowUndefined ? undefined : never)> {
+    if (typeof promise === 'function') {
+        promise = promise()
+    }
+
+    const result = await Promise.race([promise, timeout.promisify()])
+        .catch((e) => (e instanceof Error ? e : new Error(`unknown error: ${e}`)))
+        .finally(() => {
+            if ((opt.completeTimeout ?? true) === true) {
+                timeout.dispose()
+            }
+        })
+
+    if (result instanceof Error) {
+        if (opt.onExpire && CancellationError.isExpired(result)) {
+            return opt.onExpire()
+        }
+        if (opt.onCancel && CancellationError.isUserCancelled(result)) {
+            return opt.onCancel()
+        }
+        throw result
+    }
+
+    if (result === undefined && (opt.allowUndefined ?? true) !== true) {
+        throw new Error(timeoutUnexpectedResolve)
+    }
+
+    return result as T
+}
+
+/**
+ * Sleeps for the specified duration in milliseconds. Note that a duration of 0 will always wait 1 event loop.
+ *
+ * Attempts to use the extension-scoped `setTimeout` if it exists, otherwise will fallback to the global scheduler.
+ */
+export function sleep(duration: number = 0): Promise<void> {
+    const schedule = globals?.clock?.setTimeout ?? setTimeout
+    return new Promise((r) => schedule(r, Math.max(duration, 0)))
+}
diff --git a/packages/core/src/shared/utilities/treeNodeUtils.ts b/packages/core/src/shared/utilities/treeNodeUtils.ts
new file mode 100644
index 00000000000..0e9525e5eb3
--- /dev/null
+++ b/packages/core/src/shared/utilities/treeNodeUtils.ts
@@ -0,0 +1,17 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { DeployedResource } from '../../awsService/appBuilder/explorer/nodes/deployedNode'
+import { AWSResourceNode } from '../treeview/nodes/awsResourceNode'
+import { isTreeNode, TreeNode } from '../treeview/resourceTreeDataProvider'
+
+export function getSourceNode<T>(sourceNode: TreeNode | AWSResourceNode): T {
+    if (isTreeNode(sourceNode)) {
+        const resource = sourceNode.resource as DeployedResource
+        return resource.explorerNode as T
+    } else {
+        return sourceNode as T
+    }
+}
diff --git a/packages/core/src/shared/utilities/tsUtils.ts b/packages/core/src/shared/utilities/tsUtils.ts
new file mode 100644
index 00000000000..9c89c406a6d
--- /dev/null
+++ b/packages/core/src/shared/utilities/tsUtils.ts
@@ -0,0 +1,199 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export function stringOrProp(obj: any, prop: string): string {
+    if (obj === undefined || typeof obj === 'string') {
+        return obj ?? ''
+    }
+    return obj[prop] ?? ''
+}
+
+export function getMissingProps<T>(obj: T, ...props: (keyof T)[]): typeof props {
+    return props.filter((prop) => obj[prop] === undefined)
+}
+
+export function hasProps<T, K extends keyof T>(obj: T, ...props: K[]): obj is Readonly<RequiredProps<T, K>> {
+    return getMissingProps(obj, ...props).length === 0
+}
+
+export function hasStringProps<T, K extends PropertyKey>(obj: T, ...props: K[]): obj is T & { [P in K]: string } {
+    return props.filter((prop) => typeof (obj as unknown as Record<K, unknown>)[prop] !== 'string').length === 0
+}
+
+export function assertHasProps<T, K extends keyof T>(
+    obj: T | undefined,
+    ...props: K[]
+): asserts obj is Readonly<RequiredProps<T, K>> {
+    if (!isNonNullable(obj)) {
+        throw new TypeError(`Object was null or undefined, expected properties: ${props.join(', ')}`)
+    }
+
+    const missing = getMissingProps(obj, ...props)
+    if (missing.length > 0) {
+        throw new TypeError(`Object was missing properties: ${missing.join(', ')}`)
+    }
+
+    // May be easier/cleaner to just copy the object rather than freezing it
+    // Should also check the properties and make sure they're all data descriptors
+    Object.freeze(obj)
+}
+
+export function selectFrom<T, K extends keyof T>(obj: T, ...props: K[]): { [P in K]: T[P] } {
+    return props.map((p) => [p, obj[p]] as const).reduce((a, [k, v]) => ((a[k] = v), a), {} as { [P in K]: T[P] })
+}
+
+export function isNonNullable<T>(obj: T | void): obj is NonNullable<T> {
+    return obj !== undefined && obj !== null
+}
+
+export function isKeyOf<T extends object>(key: PropertyKey, obj: T): key is keyof T {
+    return key in obj
+}
+
+export function hasKey<T extends object, K extends PropertyKey>(obj: T, key: K): obj is T & { [P in K]: unknown } {
+    return isKeyOf(key, obj)
+}
+
+/**
+ * Stricter form of {@link Object.keys} that gives slightly better types for object literals.
+ */
+export function keys<T extends Record<string, any>>(obj: T): [keyof T & string] {
+    return Object.keys(obj) as [keyof T & string]
+}
+
+export function keysAsInt<T extends Record<number, any>>(obj: T): number[] {
+    return Object.keys(obj).map((k) => parseInt(k))
+}
+
+/**
+ * Stricter form of {@link Object.entries} that gives slightly better types for object literals.
+ */
+export function entries<T extends Record<string, U>, U>(obj: T): { [P in keyof T]: [P, T[P]] }[keyof T][] {
+    return Object.entries(obj) as { [P in keyof T]: [P, T[P]] }[keyof T][]
+}
+
+export function isThenable<T>(obj: unknown): obj is Thenable<T> {
+    return isNonNullable(obj) && typeof (obj as Thenable<T>).then === 'function'
+}
+
+export type ConstantMap<K, V> = Omit<ReadonlyMap<K, V>, 'get' | 'has'> & {
+    get(key: K): V
+    get(key: any): V | undefined
+    has(key: any): key is K
+}
+
+export function createConstantMap<T extends PropertyKey, U extends PropertyKey>(obj: {
+    readonly [P in T]: U
+}): ConstantMap<T, U> {
+    return new Map<T, U>(Object.entries(obj) as [T, U][]) as unknown as ConstantMap<T, U>
+}
+
+export function createFactoryFunction<T extends new (...args: any[]) => any>(ctor: T): FactoryFunction<T> {
+    return (...args) => new ctor(...args)
+}
+
+/**
+ * Try functions in the order presented and return the first returned result. If none return, throw the final error.
+ * @param functions non-empty list of functions to try.
+ * @returns
+ */
+export async function tryFunctions<Result>(functions: (() => Promise<Result>)[]): Promise<Result> {
+    let currentError: Error = new Error('No functions provided')
+    for (const func of functions) {
+        try {
+            return await func()
+        } catch (e) {
+            currentError = e as Error
+        }
+    }
+    throw currentError
+}
+
+/**
+ * Split a list into two sublists based on the result of a predicate.
+ * @param lst list to split
+ * @param pred predicate to apply to each element
+ * @returns two nested lists, where for all items x in the left sublist, pred(x) returns true. The remaining elements are in the right sublist.
+ */
+export function partition<T>(lst: T[], pred: (arg: T) => boolean): [T[], T[]] {
+    return lst.reduce(
+        ([leftAcc, rightAcc], item) => {
+            return pred(item) ? [[...leftAcc, item], rightAcc] : [leftAcc, [...rightAcc, item]]
+        },
+        [[], []] as [T[], T[]]
+    )
+}
+
+type NoSymbols<T> = { [Property in keyof T]: Property extends symbol ? never : Property }[keyof T]
+export type InterfaceNoSymbol<T> = Pick<T, NoSymbols<T>>
+/**
+ * Narrows a type from the public keys of class T, which is _semantically_ an interface (and behaviorly, in almost all cases).
+ *
+ * Note: TypeScript types are purely structural so externally the result looks the same as
+ * one declared with the `interface` keyword. The only difference from a literal `interface`
+ * is that it cannot be re-declared for extension.
+ */
+export type ClassToInterfaceType<T> = Pick<T, keyof T>
+
+type Expand<T> = T extends infer O ? { [K in keyof O]+?: O[K] } : never
+/**
+ * Forces a type to be resolved into its literal types.
+ *
+ * Normally imported types are left 'as-is' and are unable to be mapped. This alias uses
+ * type inference to effectively generate a type literal of the target type.
+ *
+ */
+export type ExpandWithObject<T> = Expand<T> extends Record<string, unknown> ? Expand<T> : never
+
+/**
+ * Given two types, this yields a type that includes only the fields where both types were the exact same
+ * This is _almost_ equivalent to (T1 | T2) & T2 & T2, except that this type is distributive
+ */
+export type SharedTypes<T1, T2> = {
+    [P in keyof T1 & keyof T2]: (T1[P] | T2[P]) & T1[P] & T2[P]
+}
+
+/* All of the string keys of the shared type */
+export type SharedProp<T1, T2> = string & keyof SharedTypes<T1, T2>
+
+/* Any key that can be accumulated (i.e. an array) */
+export type AccumulableKeys<T> = NonNullable<
+    {
+        [P in keyof T]: NonNullable<T[P]> extends any[] ? P : never
+    }[keyof T]
+>
+
+/** Similar to the nullish coalescing operator, but for types that can never occur */
+export type Coalesce<T, U> = [T] extends [never] ? U : T
+
+/** Makes all keys `K` of `T` non-nullable */
+export type RequiredProps<T, K extends keyof T> = T & { [P in K]-?: NonNullable<T[P]> }
+
+/** Analagous to shifting an array but for tuples */
+export type Shift<T extends any[]> = T extends [infer _, ...infer U] ? U : []
+
+/** Transforms a type into a mutable version */
+export type Mutable<T> = { -readonly [P in keyof T]: T[P] }
+
+export type FactoryFunction<T extends abstract new (...args: any[]) => any> = (
+    ...args: ConstructorParameters<T>
+) => InstanceType<T>
+
+/** Can be used to isolate all number fields of a record `T` */
+export type NumericKeys<T> = { [P in keyof T]-?: T[P] extends number | undefined ? P : never }[keyof T]
+
+export function omitIfPresent<T extends Record<string, unknown>>(obj: T, keys: string[]): T {
+    const objCopy = { ...obj }
+    for (const key of keys) {
+        if (key in objCopy) {
+            ;(objCopy as any)[key] = '[omitted]'
+        }
+    }
+    return objCopy
+}
+
+export function isDefined<T>(i: T | undefined): i is T {
+    return i !== undefined
+}
diff --git a/src/shared/utilities/typeConstructors.ts b/packages/core/src/shared/utilities/typeConstructors.ts
similarity index 87%
rename from src/shared/utilities/typeConstructors.ts
rename to packages/core/src/shared/utilities/typeConstructors.ts
index c37f4ae3a52..e757a5a020e 100644
--- a/src/shared/utilities/typeConstructors.ts
+++ b/packages/core/src/shared/utilities/typeConstructors.ts
@@ -1,11 +1,14 @@
 /*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { isNameMangled } from '../vscode/env'
 import { isNonNullable } from './tsUtils'
 
+export function isNameMangled(): boolean {
+    return isNameMangled.name !== 'isNameMangled'
+}
+
 /**
  * A 'type constructor' is any function that resolves to the given type.
  *
@@ -51,8 +54,9 @@ export type FromDescriptor<T extends TypeDescriptor> = {
 
 // `Symbol` and `BigInt` are included here, though in-practice
 const primitives = [Number, String, Boolean, Object, Symbol, BigInt]
-function isPrimitiveConstructor(type: unknown): type is typeof primitives[number] {
-    return !!primitives.find(p => p === type)
+function isPrimitiveConstructor(type: unknown): type is (typeof primitives)[number] {
+    // eslint-disable-next-line unicorn/prefer-includes
+    return !!primitives.some((p) => p === type)
 }
 
 function isNamedTypeConstructor(obj: unknown): obj is NamedTypeConstructor {
@@ -72,7 +76,7 @@ export function addTypeName<F extends (input: unknown) => unknown>(name: string,
 }
 
 /**
- * A utility function to validate or transform an unknown input into a known shape.
+ * Validates or transforms an unknown input into a known shape.
  *
  * This **will throw** in the following scenarios:
  *   - `type` is a {@link primitives "primitive" constructor} and `input` is a different primitive type
@@ -101,12 +105,12 @@ export function cast<T>(input: any, type: TypeConstructor<T>): T {
 // Don't really want to overload the standard `Array` constructor here even though every other
 // type function exported from this module omits the "Constructor" suffix
 export function ArrayConstructor<T>(type: TypeConstructor<T>): TypeConstructor<Array<T>> {
-    return addTypeName(`Array<${getTypeName(type)}>`, value => {
+    return addTypeName(`Array<${getTypeName(type)}>`, (value) => {
         if (!Array.isArray(value)) {
             throw new TypeError('Value is not an array')
         }
 
-        return value.map(element => cast(element, type))
+        return value.map((element) => cast(element, type))
     })
 }
 
@@ -114,7 +118,7 @@ export function RecordConstructor<K extends string, U>(
     keyType: TypeConstructor<K>,
     valueType: TypeConstructor<U>
 ): TypeConstructor<Record<K, U>> {
-    return addTypeName(`Record<${(getTypeName(keyType), getTypeName(valueType))}>`, value => {
+    return addTypeName(`Record<${(getTypeName(keyType), getTypeName(valueType))}>`, (value) => {
         if (typeof value !== 'object' || !isNonNullable(value)) {
             throw new TypeError('Value is not a non-null object')
         }
@@ -141,13 +145,13 @@ function checkForObject(value: unknown): NonNullObject {
 }
 
 function OptionalConstructor<T>(type: TypeConstructor<T>): TypeConstructor<T | undefined> {
-    return addTypeName(`Optional<${getTypeName(type)}>`, value =>
+    return addTypeName(`Optional<${getTypeName(type)}>`, (value) =>
         isNonNullable(value) ? cast(value, type) : undefined
     )
 }
 
 function InstanceConstructor<T>(type: abstract new (...args: any[]) => T): TypeConstructor<T> {
-    return value => {
+    return (value) => {
         if (!(value instanceof type)) {
             throw new TypeError('Value is not an instance of the expected type')
         }
@@ -160,7 +164,7 @@ export function Record<T extends PropertyKey, U>(
     key: TypeConstructor<T>,
     value: TypeConstructor<U>
 ): TypeConstructor<Record<T, U>> {
-    return input => {
+    return (input) => {
         if (!(typeof input === 'object') || !input) {
             throw new TypeError('Value is not a non-nullable object')
         }
@@ -179,7 +183,10 @@ export const Optional = OptionalConstructor
 
 // Aliasing to distinguish from the concrete implementation the "primitive" object
 export type Any = any
-export const Any: TypeConstructor<any> = addTypeName('Any', value => value)
+export const Any: TypeConstructor<any> = addTypeName('Any', (value) => value)
+
+export type Unknown = unknown
+export const Unknown: TypeConstructor<unknown> = addTypeName('Unknown', (value) => value)
 
 export type Instance<T extends abstract new (...args: any[]) => unknown> = InstanceType<T>
 export const Instance = InstanceConstructor
@@ -189,7 +196,7 @@ export const NonNullObject = addTypeName('Object', checkForObject)
 
 export type Union<T, U> = TypeConstructor<T | U>
 export function Union<T, U>(left: TypeConstructor<T>, right: TypeConstructor<U>): Union<T, U> {
-    return input => {
+    return (input) => {
         try {
             return cast(input, left)
         } catch {
diff --git a/packages/core/src/shared/utilities/uriUtils.ts b/packages/core/src/shared/utilities/uriUtils.ts
new file mode 100644
index 00000000000..41d43f9a0ec
--- /dev/null
+++ b/packages/core/src/shared/utilities/uriUtils.ts
@@ -0,0 +1,72 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+
+/**
+ * Convert query parameters into a mapping of the parameter names to their values.
+ * Caveat: If the same parameter is present in the query twice then the latest one is used
+ *
+ * @param query Query is the `query` part of `http://www.example.com/some/path?query#fragment`.
+ */
+export function fromQueryToParameters(query: vscode.Uri['query']): Map<string, string> {
+    const params = query.split('&')
+    const queryMap = new Map()
+
+    if (query === '') {
+        return queryMap
+    }
+
+    for (const param of params) {
+        const [name, value] = param.split('=')
+        queryMap.set(name, value)
+    }
+    return queryMap
+}
+
+/**
+ * Provide a schema for translating between an object and a vscode.Uri
+ * @param parse function to convert a vscode.Uri into an object, throw error if uri is invalid
+ * @param form function to convert an object into a vscode.Uri
+ */
+export class UriSchema<T> {
+    public constructor(
+        public parse: (uri: vscode.Uri) => T,
+        public form: (obj: T) => vscode.Uri
+    ) {}
+
+    public isValid(uri: vscode.Uri): boolean {
+        try {
+            this.parse(uri)
+            return true
+        } catch (e) {
+            return false
+        }
+    }
+}
+
+/**
+ * Converts a string path to a Uri, or returns the given Uri if it is already a Uri.
+ *
+ * A convenience function so you do not need to care about the type of path received.
+ */
+export function toUri(path: string | vscode.Uri): vscode.Uri {
+    if (path instanceof vscode.Uri) {
+        return path
+    }
+    return vscode.Uri.file(path)
+}
+
+export function isValidUrl(string: string): boolean {
+    try {
+        const url = new URL(string)
+        // handle case where, eg: 'https://test', would be considered valid. At a minimum
+        // we'll require a top-level domain, eg: 'https://test.com'.
+        const hostParts = url.hostname.split('.').filter((part) => !!part)
+        return hostParts.length > 1
+    } catch (err) {
+        return false
+    }
+}
diff --git a/packages/core/src/shared/utilities/vsCodeUtils.ts b/packages/core/src/shared/utilities/vsCodeUtils.ts
new file mode 100644
index 00000000000..57f9e380974
--- /dev/null
+++ b/packages/core/src/shared/utilities/vsCodeUtils.ts
@@ -0,0 +1,259 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+import { getIdeProperties } from '../extensionUtilities'
+import * as pathutils from './pathUtils'
+import { getLogger } from '../logger/logger'
+import { CancellationError, Timeout, waitTimeout } from './timeoutUtils'
+import { telemetry } from '../telemetry/telemetry'
+import * as semver from 'semver'
+import { isNonNullable } from './tsUtils'
+import { VSCODE_EXTENSION_ID } from '../extensions'
+
+// TODO: Consider NLS initialization/configuration here & have packages to import localize from here
+export const localize = nls.loadMessageBundle()
+
+/**
+ * Checks if an extension is installed and active.
+ */
+export function isExtensionActive(extId: string): boolean {
+    const extension = vscode.extensions.getExtension(extId)
+    return !!extension && extension.isActive
+}
+
+/**
+ * Checks if an extension is installed and meets the version requirement
+ * @param minVersion The minimum semver required for the extension
+ */
+export function isExtensionInstalled(
+    extId: string,
+    minVersion?: string,
+    getExtension = vscode.extensions.getExtension
+): boolean {
+    const ext = getExtension(extId)
+    if (ext === undefined) {
+        return false
+    }
+
+    if (minVersion === undefined) {
+        return true
+    }
+
+    // check ext has valid version
+    const extSemver = semver.coerce(ext.packageJSON.version)
+    const minSemver = semver.coerce(minVersion)
+    if (!isNonNullable(extSemver) || !isNonNullable(minSemver)) {
+        return false
+    }
+    return semver.gte(extSemver, minSemver)
+}
+
+export async function showExtensionPage(extId: string) {
+    try {
+        // Available commands:
+        //  - extension.open: opens extension page in VS Code extension marketplace view
+        //  - workbench.extensions.installExtension: autoinstalls plugin with no additional feedback
+        //  - workspace.extension.search: preloads and executes a search in the extension sidebar with the given term
+        await vscode.commands.executeCommand('extension.open', extId)
+    } catch (e) {
+        const err = e as Error
+        getLogger().error('extension.open command failed: %s', err.message)
+        const uri = vscode.Uri.parse(`https://marketplace.visualstudio.com/items?itemName=${extId}`)
+        void openUrl(uri)
+    }
+}
+
+/**
+ * Checks if an extension is installed, and shows a message if not.
+ */
+export function showInstallExtensionMsg(
+    extId: string,
+    extName: string,
+    feat = `${getIdeProperties().company} Toolkit`,
+    minVersion?: string
+): boolean {
+    if (isExtensionInstalled(extId, minVersion)) {
+        return true
+    }
+
+    const msg = buildMissingExtensionMessage(extId, extName, minVersion, feat)
+
+    const installBtn = localize('AWS.missingExtension.install', 'Install...')
+    const items = [installBtn]
+
+    const p = vscode.window.showErrorMessage(msg, ...items)
+    void p.then<string | undefined>((selection) => {
+        if (selection === installBtn) {
+            void showExtensionPage(extId)
+        }
+        return selection
+    })
+    return false
+}
+
+export function buildMissingExtensionMessage(
+    extId: string,
+    extName: string,
+    minVersion?: string,
+    feat = `${getIdeProperties().company} Toolkit`
+): string {
+    const minV = semver.coerce(minVersion)
+    const expectedVersionMsg = isNonNullable(minV) ? ` of version >=${minV.version}` : ''
+
+    return localize(
+        'AWS.missingExtension',
+        "{0} requires the {1} extension ('{2}'{3}) to be installed and enabled.",
+        feat,
+        extName,
+        extId,
+        expectedVersionMsg
+    )
+}
+
+/**
+ * Activates an extension and returns it, or does nothing if the extension is
+ * not installed.
+ *
+ * @param extId Extension id
+ * @param silent Return undefined on failure, instead of throwing
+ * @returns Extension, or undefined on failure if `silent`
+ */
+export async function activateExtension<T>(
+    extId: string,
+    silent: boolean = true,
+    log = (s: string, ...rest: any[]) => {
+        getLogger().debug(s, ...rest)
+    }
+): Promise<vscode.Extension<T> | undefined> {
+    const extension = vscode.extensions.getExtension<T>(extId)
+    if (!extension) {
+        if (silent) {
+            return undefined
+        }
+        throw new Error(`Extension not found: ${extId}`)
+    }
+
+    if (!extension.isActive) {
+        log('Activating extension: %s', extId)
+        try {
+            const activate = (async () => {
+                await extension.activate()
+                log('Extension activated: %s', extId)
+                return vscode.extensions.getExtension<T>(extId)
+            })()
+
+            return await waitTimeout(activate, new Timeout(60000))
+        } catch (err) {
+            log('Extension failed to activate: %s: %O', extId, err as Error)
+            if (!silent) {
+                throw err
+            }
+            return undefined
+        }
+    }
+
+    return extension
+}
+
+/**
+ * Convenience function to make a Thenable into a Promise.
+ */
+export function promisifyThenable<T>(thenable: Thenable<T>): Promise<T> {
+    return new Promise((resolve, reject) => thenable.then(resolve, reject))
+}
+
+export function isUntitledScheme(uri: vscode.Uri): boolean {
+    return uri.scheme === 'untitled'
+}
+
+/**
+ * Creates a glob pattern that matches all directories specified in `dirs`.
+ *
+ * "/" and "*" chars are trimmed from `dirs` items, and the final glob is defined such that the
+ * directories and their contents are matched any _any_ depth.
+ *
+ * Example: `['foo', '**\/bar/'] => "["foo", "bar"]"`
+ */
+export function globDirPatterns(dirs: string[]): string[] {
+    // The patterns themselves are not useful, but with postformating like "**/${pattern}/" they become glob dir patterns
+    return dirs.map((current) => {
+        // Trim all "*" and "/" chars.
+        // Note that the replace() patterns and order is intentionaly so that "**/*foo*/**" yields "*foo*".
+        const scrubbed = current
+            .replace(/^\**/, '')
+            .replace(/^[/\\]*/, '')
+            .replace(/\**$/, '')
+            .replace(/[/\\]*$/, '')
+        return scrubbed
+    })
+}
+
+// If the VSCode URI is not a file then return the string representation, otherwise normalize the filesystem path
+export function normalizeVSCodeUri(uri: vscode.Uri): string {
+    if (uri.scheme !== 'file') {
+        return uri.toString()
+    }
+    return pathutils.normalize(uri.fsPath)
+}
+
+export function reloadWindowPrompt(message: string): void {
+    const reload = 'Reload'
+
+    void vscode.window.showInformationMessage(message, reload).then((selected) => {
+        if (selected === reload) {
+            void vscode.commands.executeCommand('workbench.action.reloadWindow')
+        }
+    })
+}
+
+/**
+ * Opens a URL in the system web browser. Throws `CancellationError`
+ * if user dismisses the vscode confirmation prompt.
+ */
+export async function openUrl(url: vscode.Uri, source?: string): Promise<boolean> {
+    // Avoid PII in URL.
+    const truncatedUrl = `${url.scheme}${url.authority}${url.path}${url.fragment.substring(20)}`
+
+    return telemetry.aws_openUrl.run(async (span) => {
+        span.record({ url: truncatedUrl, source })
+        const didOpen = await vscode.env.openExternal(url)
+        if (!didOpen) {
+            throw new CancellationError('user')
+            // getLogger().verbose('failed to open URL: %s', e)
+        }
+        return didOpen
+    })
+}
+
+export function isToolkitActive(): boolean {
+    return isExtensionActive(VSCODE_EXTENSION_ID.awstoolkit)
+}
+
+/**
+ * Replaces magic vscode variables in a (launch config) user value.
+ */
+export function replaceVscodeVars(val: string, workspaceFolder?: string): string {
+    if (!workspaceFolder) {
+        return val
+    }
+    return val.replace('${workspaceFolder}', workspaceFolder)
+}
+
+/**
+ *
+ * Subscribe an given event and will dispose it once subscribe receives one event
+ */
+export function subscribeOnce<T>(event: vscode.Event<T>): vscode.Event<T> {
+    return (listener: (e: T) => unknown, thisArgs?: unknown) => {
+        const result = event((e) => {
+            result.dispose()
+            return listener.call(thisArgs, e)
+        })
+
+        return result
+    }
+}
diff --git a/packages/core/src/shared/utilities/workspaceUtils.ts b/packages/core/src/shared/utilities/workspaceUtils.ts
new file mode 100644
index 00000000000..122f2a185f4
--- /dev/null
+++ b/packages/core/src/shared/utilities/workspaceUtils.ts
@@ -0,0 +1,674 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as path from 'path'
+import * as os from 'os'
+import * as pathutils from '../../shared/utilities/pathUtils'
+import { getLogger } from '../logger/logger'
+import { isInDirectory } from '../filesystemUtilities'
+import { normalizedDirnameWithTrailingSlash, normalize } from './pathUtils'
+import globals from '../extensionGlobals'
+import { ToolkitError } from '../errors'
+import { getGlobDirExcludedPatterns } from '../fs/watchedFiles'
+import { sanitizeFilename } from './textUtilities'
+import { GitIgnoreAcceptor } from '@gerhobbelt/gitignore-parser'
+import * as parser from '@gerhobbelt/gitignore-parser'
+import fs from '../fs/fs'
+import { ChildProcess } from './processUtils'
+import { isWin } from '../vscode/env'
+
+type GitIgnoreRelativeAcceptor = {
+    folderPath: string
+    acceptor: GitIgnoreAcceptor
+}
+
+export class GitIgnoreFilter {
+    private acceptors: GitIgnoreRelativeAcceptor[]
+
+    private constructor(acceptors: GitIgnoreRelativeAcceptor[]) {
+        this.acceptors = acceptors
+    }
+
+    public static async build(gitIgnoreFiles: vscode.Uri[]): Promise<GitIgnoreFilter> {
+        const acceptors: GitIgnoreRelativeAcceptor[] = []
+        for (const file of gitIgnoreFiles) {
+            const fileContent = await fs.readFileText(file)
+
+            const folderPath = getWorkspaceParentDirectory(file.fsPath)
+            if (folderPath === undefined) {
+                continue
+            }
+            const gitIgnoreAcceptor = parser.compile(fileContent)
+            acceptors.push({
+                folderPath: folderPath,
+                acceptor: gitIgnoreAcceptor,
+            })
+        }
+        return new GitIgnoreFilter(acceptors)
+    }
+
+    public filterFiles(files: vscode.Uri[]) {
+        return files.filter((file) =>
+            this.acceptors.every((acceptor) => {
+                if (!isInDirectory(acceptor.folderPath, file.fsPath)) {
+                    // .gitignore file is responsible only for it's subfolders
+                    return true
+                }
+                // careful with Windows, if ignore pattern is `build`
+                // the library accepts `build\file.js`, but does not accept `build/file.js`
+                const systemDependantRelativePath = path.relative(acceptor.folderPath, file.fsPath)
+                const posixPath = systemDependantRelativePath.split(path.sep).join(path.posix.sep)
+                return acceptor.acceptor.accepts(posixPath)
+            })
+        )
+    }
+}
+
+export type CurrentWsFolders = [vscode.WorkspaceFolder, ...vscode.WorkspaceFolder[]]
+
+export function hasWorkspace() {
+    const wsFolders = vscode.workspace.workspaceFolders
+    return wsFolders !== undefined && wsFolders.length > 0
+}
+
+export function isMultiRootWorkspace() {
+    const wsFolders = vscode.workspace.workspaceFolders
+    return wsFolders !== undefined && wsFolders.length > 1
+}
+
+/**
+ * Resolves `relPath` against parent `workspaceFolder`, or returns `relPath` if
+ * already absolute or the operation fails.
+ */
+export function tryGetAbsolutePath(folder: vscode.WorkspaceFolder | undefined, relPath: string): string {
+    return path.resolve(folder?.uri ? folder.uri.fsPath + '/' : '', relPath)
+}
+
+/**
+ * Encapsulates adding a folder to the VS Code Workspace.
+ *
+ * After the folder is added, this method waits until VS Code signals that the workspace has been updated.
+ *
+ * CALLER BEWARE: As of VS Code 1.36.00, any behavior that changes the first workspace folder causes VS Code to restart
+ * in order to reopen the "workspace", which halts code and re-activates the extension. In this case, this function
+ * will not return.
+ *
+ * Caller is responsible for validating whether or not the folder should be added to the workspace.
+ *
+ * @param folder - Folder to add to the VS Code Workspace
+ *
+ * @returns true if folder was added, false otherwise
+ */
+export async function addFolderToWorkspace(
+    folder: { uri: vscode.Uri; name?: string },
+    skipExisting?: boolean
+): Promise<boolean> {
+    const disposables: vscode.Disposable[] = []
+    const logger = getLogger()
+
+    if (skipExisting && vscode.workspace.getWorkspaceFolder(folder.uri)) {
+        return true
+    }
+
+    try {
+        // Wait for the WorkspaceFolders changed notification for the folder of interest before returning to caller
+        return await new Promise<boolean>((resolve) => {
+            vscode.workspace.onDidChangeWorkspaceFolders(
+                (workspaceFoldersChanged) => {
+                    if (
+                        workspaceFoldersChanged.added.some(
+                            (addedFolder) => addedFolder.uri.fsPath === folder.uri.fsPath
+                        )
+                    ) {
+                        resolve(true)
+                    }
+                },
+                undefined,
+                disposables
+            )
+
+            if (
+                !vscode.workspace.updateWorkspaceFolders(
+                    // Add new folder to the end of the list rather than the beginning, to avoid VS Code
+                    // terminating and reinitializing our extension.
+                    (vscode.workspace.workspaceFolders || []).length,
+                    0,
+                    folder
+                )
+            ) {
+                resolve(false)
+            }
+        })
+    } catch (err) {
+        logger.error(`Unexpected error adding folder ${folder.uri.fsPath} to workspace: %O`, err as Error)
+
+        return false
+    } finally {
+        for (const disposable of disposables) {
+            disposable.dispose()
+        }
+    }
+}
+
+/**
+ * Finds the closest file (specified by the search pattern) to the specified source file.
+ * Checks parent directories up until the top level workspace folder for the source file.
+ * Returns undefined if the file isn't found in any directories between the sourceCodeUri directory and the workspace folder
+ * @param sourceCodeUri Source file to look upwards from
+ * @param projectFile File to find in same folder or parent, up until the source file's top level workspace folder. Accepts wildcards.
+ */
+export async function findParentProjectFile(
+    sourceCodeUri: vscode.Uri,
+    projectFile: RegExp
+): Promise<vscode.Uri | undefined> {
+    const workspaceFolder = vscode.workspace.getWorkspaceFolder(sourceCodeUri)
+    if (!workspaceFolder) {
+        return undefined
+    }
+
+    const workspaceProjectFiles = globals.codelensRootRegistry.items
+        .filter((item) => item.item.match(projectFile))
+        .map((item) => item.path)
+
+    // Use the project file "closest" in the parent chain to sourceCodeUri
+    const parentProjectFiles = workspaceProjectFiles
+        .filter((uri) => {
+            const dirname = normalizedDirnameWithTrailingSlash(uri)
+
+            return normalize(sourceCodeUri.fsPath).startsWith(dirname)
+        })
+        .sort((a, b) => {
+            if (isInDirectory(path.parse(a).dir, path.parse(b).dir)) {
+                return 1
+            }
+
+            return -1
+        })
+
+    if (parentProjectFiles.length === 0) {
+        return undefined
+    }
+
+    return vscode.Uri.file(parentProjectFiles[0])
+}
+
+/**
+ * Finds the file specified by `filenameGlob` in the VSCode workspace, opens
+ * it in an editor tab, returns it as a `TextDocument`.
+ *
+ * @returns `TextDocument`, or undefined if the file could not be found.
+ */
+export async function openTextDocument(filenameGlob: vscode.GlobPattern): Promise<vscode.TextDocument | undefined> {
+    const found = await vscode.workspace.findFiles(filenameGlob)
+    if (found.length === 0) {
+        return undefined
+    }
+    await vscode.commands.executeCommand('vscode.open', found[0])
+    const textDocument = vscode.workspace.textDocuments.find((o) => o.uri.fsPath.includes(found[0].fsPath))
+    return textDocument
+}
+
+/**
+ * Returns a path relative to the first workspace folder found that is a parent of the defined path, along with the workspaceFolder itself
+ * Returns undefined if there are no applicable workspace folders.
+ * @param childPath Path to derive relative path from
+ */
+export function getWorkspaceRelativePath(
+    childPath: string,
+    override: {
+        workspaceFolders?: readonly vscode.WorkspaceFolder[]
+    } = {
+        workspaceFolders: vscode.workspace.workspaceFolders,
+    }
+): { relativePath: string; workspaceFolder: vscode.WorkspaceFolder } | undefined {
+    if (!override.workspaceFolders) {
+        return
+    }
+    const folders = override.workspaceFolders
+
+    for (const folder of folders) {
+        if (isInDirectory(folder.uri.fsPath, childPath)) {
+            return { relativePath: path.relative(folder.uri.fsPath, childPath), workspaceFolder: folder }
+        }
+    }
+}
+
+/**
+ * Returns a path to the folder containing the file, if the file is in any of the workspaces
+ * Returns undefined if there are no applicable workspace folders.
+ * @param childPath Path to derive path from
+ */
+export function getWorkspaceParentDirectory(
+    childPath: string,
+    args: {
+        workspaceFolders?: readonly vscode.WorkspaceFolder[]
+    } = {
+        workspaceFolders: vscode.workspace.workspaceFolders,
+    }
+): string | undefined {
+    if (!args.workspaceFolders) {
+        return
+    }
+    const parentFolder = path.dirname(childPath)
+    for (const folder of args.workspaceFolders) {
+        if (
+            pathutils.areEqual(folder.uri.fsPath, folder.uri.fsPath, parentFolder) ||
+            isInDirectory(folder.uri.fsPath, parentFolder)
+        ) {
+            return parentFolder
+        }
+    }
+}
+
+/**
+ * This only checks text documents; the API does not expose webviews.
+ */
+export function checkUnsavedChanges(): boolean {
+    return vscode.workspace.textDocuments.some((doc) => doc.isDirty)
+}
+
+export const defaultExcludePatterns = [
+    '**/package-lock.json',
+    '**/yarn.lock',
+    '**/*.zip',
+    '**/*.tar.gz',
+    '**/*.bin',
+    '**/*.png',
+    '**/*.jpg',
+    '**/*.svg',
+    '**/*.pyc',
+    '**/*.pdf',
+    '**/*.ttf',
+    '**/*.ico',
+    '**/license.txt',
+    '**/License.txt',
+    '**/LICENSE.txt',
+    '**/license.md',
+    '**/License.md',
+    '**/LICENSE.md',
+]
+
+export function getExcludePattern(useDefaults: boolean = true) {
+    const patterns = [...getGlobalExcludePatterns()]
+
+    if (useDefaults) {
+        patterns.push(...defaultExcludePatterns)
+    }
+
+    return excludePatternsAsString(patterns)
+}
+
+function getGlobalExcludePatterns() {
+    return getGlobDirExcludedPatterns().map((pattern) => `**/${pattern}/*`)
+}
+
+function excludePatternsAsString(patterns: string[]): string {
+    return `{${patterns.join(',')}}`
+}
+
+/**
+ * @param rootPath root folder to look for .gitignore files
+ * @param files list of files to filter
+ * @param useDefaultExcludePatterns whether to add default exclude patterns even if not in gitignore
+ * @returns list of files filtered by .gitignore files
+ */
+async function filterOutGitignoredFiles(
+    rootPath: string,
+    files: vscode.Uri[],
+    useDefaultExcludePatterns: boolean = true
+): Promise<vscode.Uri[]> {
+    const gitIgnoreFiles = await vscode.workspace.findFiles(
+        new vscode.RelativePattern(rootPath, '**/.gitignore'),
+        getExcludePattern(useDefaultExcludePatterns)
+    )
+    const gitIgnoreFilter = await GitIgnoreFilter.build(gitIgnoreFiles)
+    return gitIgnoreFilter.filterFiles(files)
+}
+
+export type CollectFilesResultItem = {
+    workspaceFolder: vscode.WorkspaceFolder
+    relativeFilePath: string
+    fileUri: vscode.Uri
+    fileContent: string
+    fileSizeBytes: number
+    zipFilePath: string
+}
+export type CollectFilesFilter = (relativePath: string) => boolean // returns true if file should be filtered out
+interface CollectFilesOptions {
+    maxTotalSizeBytes?: number // 200 MB default
+    maxFileSizeBytes?: number // 10 MB default
+    includeContent?: boolean // default true
+    failOnLimit?: boolean // default true
+    excludeByGitIgnore?: boolean // default true
+    excludePatterns?: string[] // default defaultExcludePatterns
+    filterFn?: CollectFilesFilter
+}
+/**
+ * search files in sourcePaths and collect them using filtering options
+ * @param sourcePaths the paths where collection starts
+ * @param workspaceFolders the current workspace folders opened
+ * @param options - filtering options
+ * @returns all matched files
+ */
+export async function collectFiles(
+    sourcePaths: string[],
+    workspaceFolders: CurrentWsFolders,
+    options?: (CollectFilesOptions & { includeContent: true }) | Omit<CollectFilesOptions, 'includeContent'>
+): Promise<CollectFilesResultItem[]>
+export async function collectFiles(
+    sourcePaths: string[],
+    workspaceFolders: CurrentWsFolders,
+    options?: CollectFilesOptions & { includeContent: false }
+): Promise<Omit<CollectFilesResultItem, 'fileContent'>[]>
+export async function collectFiles(
+    sourcePaths: string[],
+    workspaceFolders: CurrentWsFolders,
+    options?: CollectFilesOptions
+) {
+    const workspaceFoldersMapping = getWorkspaceFoldersByPrefixes(workspaceFolders)
+    const workspaceToPrefix = new Map<vscode.WorkspaceFolder, string>(
+        workspaceFoldersMapping === undefined
+            ? [[workspaceFolders[0], '']]
+            : Object.entries(workspaceFoldersMapping).map((value) => [value[1], value[0]])
+    )
+
+    const includeContent = options?.includeContent ?? true
+    const maxFileSizeBytes = options?.maxFileSizeBytes ?? 1024 * 1024 * 10
+    // Max allowed size for file collection
+    const maxRepoSizeBytes = 200 * 1024 * 1024
+    const excludeByGitIgnore = options?.excludeByGitIgnore ?? true
+    const failOnLimit = options?.failOnLimit ?? true
+    const inputExcludePatterns = options?.excludePatterns ?? defaultExcludePatterns
+    const maxSizeBytes = options?.maxTotalSizeBytes ?? maxRepoSizeBytes
+
+    const excludePatterns = [...getGlobalExcludePatterns()]
+    if (inputExcludePatterns.length) {
+        excludePatterns.push(...inputExcludePatterns)
+    }
+
+    let totalSizeBytes = 0
+    const storage = []
+    const excludePatternFilter = excludePatternsAsString(excludePatterns)
+    for (const rootPath of sourcePaths) {
+        const allFiles = await vscode.workspace.findFiles(
+            new vscode.RelativePattern(rootPath, '**'),
+            excludePatternFilter
+        )
+
+        const files = excludeByGitIgnore ? await filterOutGitignoredFiles(rootPath, allFiles, false) : allFiles
+
+        for (const file of files) {
+            const relativePath = getWorkspaceRelativePath(file.fsPath, { workspaceFolders })
+            if (!relativePath) {
+                continue
+            }
+
+            if (options?.filterFn && options.filterFn(relativePath.relativePath)) {
+                continue
+            }
+
+            const fileStat = await fs.stat(file)
+            if (failOnLimit && totalSizeBytes + fileStat.size > maxSizeBytes) {
+                throw new ToolkitError(
+                    'The project you have selected for source code is too large to use as context. Please select a different folder to use',
+                    { code: 'ContentLengthError' }
+                )
+            }
+
+            if (fileStat.size > maxFileSizeBytes) {
+                continue
+            }
+
+            const result = {
+                workspaceFolder: relativePath.workspaceFolder,
+                relativeFilePath: relativePath.relativePath,
+                fileUri: file,
+                fileSizeBytes: fileStat.size,
+                zipFilePath: prefixWithFolderPrefix(relativePath.workspaceFolder, relativePath.relativePath),
+            }
+            if (includeContent) {
+                const content = await readFile(file)
+                if (content === undefined) {
+                    continue
+                }
+                totalSizeBytes += fileStat.size
+                storage.push({
+                    ...result,
+                    fileContent: content,
+                })
+            } else {
+                totalSizeBytes += fileStat.size
+                storage.push(result)
+            }
+        }
+    }
+    return storage
+
+    function prefixWithFolderPrefix(folder: vscode.WorkspaceFolder, path: string) {
+        const prefix = workspaceToPrefix.get(folder)
+        /**
+         * collects all files that are marked as source
+         * @param sourcePaths the paths where collection starts
+         * @param workspaceFolders the current workspace folders opened
+         * @param respectGitIgnore whether to respect gitignore file
+         * @returns all matched files
+         */
+        if (prefix === undefined) {
+            throw new ToolkitError(`Failed to find prefix for workspace folder ${folder.name}`)
+        }
+        return prefix === '' ? path : `${prefix}/${path}`
+    }
+}
+
+const readFile = async (file: vscode.Uri) => {
+    try {
+        const fileContent = await fs.readFileText(file, new TextDecoder('utf8', { fatal: false }))
+        return fileContent
+    } catch (error) {
+        getLogger().debug(
+            `featureDev: Failed to read file ${file.fsPath} when collecting repository. Skipping the file`
+        )
+    }
+
+    return undefined
+}
+
+const workspaceFolderPrefixGuards = {
+    /**
+     * the maximum number of subfolders the method below takes into account when calculating a prefix
+     */
+    maximumFolderDepthConsidered: 500,
+    /**
+     * the maximum suffix that can be added to a folder prefix in case of full subfolder path matches
+     */
+    maximumFoldersWithMatchingSubfolders: 10_000,
+}
+
+/**
+ * tries to determine the possible prefixes we will use for a given workspace folder in the zip file
+ * We want to keep the folder names in the prefix, since they might convey useful information, for example
+ * If both folders are just called cdk (no name specified for the ws folder), adding a prefix of cdk1 and cdk2 is much less context, than having app_cdk and canaries_cdk
+ *
+ * Input:
+ * - packages/app/cdk
+ * - packages/canaries/cdk
+ * Output:
+ * - {'app_cdk': packages/app/cdk, 'canaries_cdk': packages/canaries/cdk}
+ *
+ * @returns an object where workspace folders have a prefix, or undefined for single root workspace, as there is no mapping needed there
+ */
+export function getWorkspaceFoldersByPrefixes(
+    folders: CurrentWsFolders
+): { [prefix: string]: vscode.WorkspaceFolder } | undefined {
+    if (folders.length <= 1) {
+        return undefined
+    }
+    let remainingWorkspaceFoldersToMap = folders.map((f) => ({
+        folder: f,
+        preferredPrefixQueue: f.uri.fsPath
+            .split(path.sep)
+            .reverse()
+            .slice(0, workspaceFolderPrefixGuards.maximumFolderDepthConsidered)
+            .reduce(
+                (candidates, subDir) => {
+                    candidates.push(sanitizeFilename(path.join(subDir, candidates[candidates.length - 1])))
+                    return candidates
+                },
+                [f.name]
+            )
+            .reverse(),
+    }))
+    const results: ReturnType<typeof getWorkspaceFoldersByPrefixes> = {}
+
+    for (
+        let addParentFolderCount = 0;
+        remainingWorkspaceFoldersToMap.length > 0 &&
+        addParentFolderCount < workspaceFolderPrefixGuards.maximumFolderDepthConsidered;
+        addParentFolderCount++
+    ) {
+        const workspacesByPrefixes = remainingWorkspaceFoldersToMap.reduce(
+            (acc, wsFolder) => {
+                const prefix = wsFolder.preferredPrefixQueue.pop()
+                // this should never happen, as last candidates should be handled below, and the array starts non empty
+                if (prefix === undefined) {
+                    throw new ToolkitError(
+                        `Encountered a folder with invalid prefix candidates (workspace folder ${wsFolder.folder.name})`
+                    )
+                }
+                acc[prefix] = acc[prefix] ?? []
+                acc[prefix].push(wsFolder)
+                return acc
+            },
+            {} as { [key: string]: (typeof remainingWorkspaceFoldersToMap)[0][] }
+        )
+        remainingWorkspaceFoldersToMap = []
+        for (const [prefix, folders] of Object.entries(workspacesByPrefixes)) {
+            // if a folder has a unique prefix
+            if (folders.length === 1 && results[prefix] === undefined) {
+                results[prefix] = folders[0].folder
+                continue
+            }
+
+            // find the folders that do not have more parents
+            const foldersToSuffix: typeof folders = []
+            for (const folder of folders) {
+                if (folder.preferredPrefixQueue.length > 0) {
+                    remainingWorkspaceFoldersToMap.push(folder)
+                } else {
+                    foldersToSuffix.push(folder)
+                }
+            }
+            // for these last resort folders, suffix them with an increasing number until unique
+            if (foldersToSuffix.length === 1 && results[prefix] === undefined) {
+                results[prefix] = foldersToSuffix[0].folder
+            } else {
+                let suffix = 1
+                for (const folder of foldersToSuffix) {
+                    let newPrefix: string
+                    let safetyCounter = 0
+                    do {
+                        newPrefix = `${prefix}_${suffix}`
+                        suffix++
+                        safetyCounter++
+                    } while (
+                        results[newPrefix] !== undefined &&
+                        safetyCounter < workspaceFolderPrefixGuards.maximumFoldersWithMatchingSubfolders
+                    )
+                    if (safetyCounter >= workspaceFolderPrefixGuards.maximumFoldersWithMatchingSubfolders) {
+                        throw new ToolkitError(
+                            `Could not find a unique prefix for workspace folder ${folder.folder.name} in zip file.`
+                        )
+                    }
+                    results[newPrefix] = folder.folder
+                }
+            }
+        }
+    }
+    if (remainingWorkspaceFoldersToMap.length > 0) {
+        throw new ToolkitError(
+            `Could not find a unique prefix for workspace folder ${remainingWorkspaceFoldersToMap[0].folder.name} in zip file.`
+        )
+    }
+
+    return results
+}
+
+/**
+ * Collects all files that are suitable for local indexing.
+ * 1. Must be a supported programming language
+ * 2. Must not be auto generated code
+ * 3. Must not be within gitignore
+ * 4. Ranked by priority.
+ * 5. Select files within maxFileSize limit.
+ * This function do not read the actual file content or compress them into a zip.
+ * TODO: Move this to LSP
+ * @param sourcePaths the paths where collection starts
+ * @param workspaceFolders the current workspace folders opened
+ * @param respectGitIgnore whether to respect gitignore file
+ * @returns all matched files
+ */
+export async function collectFilesForIndex(
+    sourcePaths: string[],
+    workspaceFolders: CurrentWsFolders,
+    respectGitIgnore: boolean = true,
+    maxSize = 250 * 1024 * 1024 // 250 MB,
+    // make this configurable, so we can test it
+) {
+    const storage = await collectFiles(sourcePaths, workspaceFolders, {
+        maxFileSizeBytes: 10 * 1024 * 1024,
+        includeContent: false,
+        failOnLimit: false,
+        excludeByGitIgnore: respectGitIgnore,
+        filterFn: (rp) => !isLanguageSupported(rp) || isBuildOrBin(rp),
+    })
+    // prioritize upper level files
+    storage.sort((a, b) => a.fileUri.fsPath.length - b.fileUri.fsPath.length)
+
+    const maxSizeBytes = Math.min(maxSize, os.freemem() / 2)
+
+    let totalSizeBytes = 0
+    let i = 0
+    for (i = 0; i < storage.length; i += 1) {
+        totalSizeBytes += storage[i].fileSizeBytes
+        if (totalSizeBytes >= maxSizeBytes) {
+            break
+        }
+    }
+    // pick top 100k files below size limit
+    return storage.slice(0, Math.min(100000, i))
+
+    function isLanguageSupported(filename: string) {
+        const k =
+            /\.(js|ts|java|py|rb|cpp|tsx|jsx|cc|c|cs|vb|pl|r|m|hs|mts|mjs|h|clj|dart|groovy|lua|rb|jl|ipynb|html|json|css|md|php|swift|rs|scala|yaml|tf|sql|sh|go|yml|kt|smithy|config|kts|gradle|cfg|xml|vue)$/i
+        return k.test(filename) || filename.endsWith('Config')
+    }
+
+    function isBuildOrBin(filePath: string) {
+        const k = /[/\\](bin|build|node_modules|env|\.idea|\.venv|venv)[/\\]/i
+        return k.test(filePath)
+    }
+}
+
+/**
+ * Performs a case-insensitive, recursive search for a string in a directory.
+ * note:
+ * 'error' is set when command fails to spawn; 'stderr' is set when command itself fails.
+ * 'exitCode' will be 0 when searchStr is detected (each line where it's found will be printed to 'stdout').
+ * 'exitCode' will be non-zero and 'stdout' / 'stderr' / 'error' will all be empty/undefined when searchStr is not detected.
+ * @param searchStr the string to search for
+ * @param dirPath the path of the directory to search in
+ * @returns the result of the search
+ */
+export async function findStringInDirectory(searchStr: string, dirPath: string) {
+    const isWindows = isWin()
+    const command = isWindows ? 'findstr' : 'grep'
+    // case-insensitive, recursive search
+    const args = isWindows ? ['/i', '/s', searchStr, '*.*'] : ['-i', '-r', searchStr]
+    const spawnResult = await new ChildProcess(command, args).run({
+        spawnOptions: { cwd: dirPath },
+    })
+    return spawnResult
+}
diff --git a/packages/core/src/shared/utilities/zipStream.ts b/packages/core/src/shared/utilities/zipStream.ts
new file mode 100644
index 00000000000..8f32dd2e633
--- /dev/null
+++ b/packages/core/src/shared/utilities/zipStream.ts
@@ -0,0 +1,194 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { WritableStreamBuffer } from 'stream-buffers'
+import crypto from 'crypto'
+import { readFileAsString } from '../filesystemUtilities'
+
+// Does not offer CommonJS support officially: https://github.com/gildas-lormeau/zip.js/issues/362.
+// Webpack appears to handle this for us expirementally.
+// @ts-ignore
+import { ZipWriter, TextReader, ZipReader, Uint8ArrayReader, EntryMetaData, Entry } from '@zip.js/zip.js'
+import { getLogger } from '../logger/logger'
+import fs from '../fs/fs'
+
+export interface ZipStreamResult {
+    sizeInBytes: number
+    hash: string
+    streamBuffer: WritableStreamBuffer
+}
+
+export type ZipStreamProps = {
+    hashAlgorithm: 'md5' | 'sha256'
+    maxNumberOfFileStreams: number
+    compressionLevel: number
+}
+
+const defaultProps: ZipStreamProps = {
+    hashAlgorithm: 'sha256',
+    maxNumberOfFileStreams: 100,
+    compressionLevel: 1,
+}
+
+/**
+ * Creates in-memory zip archives that output to a stream buffer.
+ *
+ * Example usage:
+ * ```ts
+ * const zipStream = new ZipStream({
+            hashAlgorithm: 'sha256',
+            maxNumberOfFileStreams: 150,
+            compressionLevel: 1,
+            memLevel: 9,
+        })
+ * zipStream.writeString('Hello World', 'file1.txt')
+ * zipStream.writeFile('/path/to/some/file.txt', 'file2.txt')
+ * const result = await zipStream.finalize([optional onProgress handler, called 1x per sec])
+ * console.log(result) // { sizeInBytes: ..., hash: ..., streamBuffer: ... }
+ * ```
+ */
+export class ZipStream {
+    private _zipWriter: ZipWriter<WritableStream>
+    private _streamBuffer: WritableStreamBuffer
+    private _hasher: crypto.Hash
+    private _numberOfFilesToStream: number = 0
+    private _numberOfFilesSucceeded: number = 0
+    private _filesToZip: [string, string][] = []
+    private _filesBeingZipped: number = 0
+    private _maxNumberOfFileStreams: number
+    private _targetFilesAdded: Set<string> = new Set()
+
+    boundFileCompletionCallback: (computedSize: number) => Promise<void>
+    boundFileStartCallback: (computedSize: number) => Promise<void>
+
+    constructor(props: Partial<ZipStreamProps> = {}) {
+        getLogger().debug('Initializing ZipStream with props: %O', props)
+        // Allow any user-provided values to override default values
+        const mergedProps = { ...defaultProps, ...props }
+        const { hashAlgorithm, compressionLevel, maxNumberOfFileStreams } = mergedProps
+
+        this.boundFileCompletionCallback = this.onFinishedCompressingFile.bind(this)
+        this.boundFileStartCallback = this.onStartCompressingFile.bind(this)
+
+        this._zipWriter = new ZipWriter(
+            new WritableStream({
+                write: (chunk) => {
+                    this._streamBuffer.write(chunk)
+                    this._hasher.update(chunk)
+                },
+            }),
+            { level: compressionLevel }
+        )
+        this._maxNumberOfFileStreams = maxNumberOfFileStreams
+
+        this._streamBuffer = new WritableStreamBuffer()
+
+        this._hasher = crypto.createHash(hashAlgorithm)
+    }
+
+    public async onStartCompressingFile(_totalBytes: number): Promise<void> {
+        this._filesBeingZipped++
+    }
+
+    public async onFinishedCompressingFile(_computedsize: number) {
+        this._numberOfFilesSucceeded++
+        this._filesBeingZipped--
+
+        if (this._filesToZip.length > 0 && this._filesBeingZipped < this._maxNumberOfFileStreams) {
+            const [fileToZip, path] = this._filesToZip.shift()!
+            void readFileAsString(fileToZip).then((content) => {
+                return this._zipWriter.add(path, new TextReader(content), {
+                    onend: this.boundFileCompletionCallback,
+                    onstart: this.boundFileStartCallback,
+                })
+            })
+        }
+    }
+    /**
+     * Writes data to the specified path.
+     * @param data
+     * @param path
+     * @param returnPromise optional parameter specifying if caller wants a promise.
+     * @returns promise to that resolves when data is written.
+     */
+    public writeString(data: string, path: string, returnPromise: true): Promise<EntryMetaData>
+    public writeString(data: string, path: string, returnPromise?: false): void
+    public writeString(data: string, path: string, returnPromise?: boolean): void | Promise<EntryMetaData> {
+        const promise = this._zipWriter.add(path, new TextReader(data))
+        return returnPromise ? promise : undefined
+    }
+
+    /**
+     * Add the content for file to zip at path.
+     * @param sourceFilePath file to read
+     * @param targetFilePath path to write data to in zip.
+     */
+    public writeFile(sourceFilePath: string, targetFilePath: string) {
+        if (this._targetFilesAdded.has(targetFilePath)) {
+            getLogger().debug(`Skipping duplicate file added to zip: ${targetFilePath}`)
+            return
+        }
+        this._targetFilesAdded.add(targetFilePath)
+        // We use _numberOfFilesToStream to make sure we don't finalize too soon
+        // (before the progress event has been fired for the last file)
+        // The problem is that we can't rely on progress.entries.total,
+        // because files can be added to the queue faster
+        // than the progress event is fired
+        this._numberOfFilesToStream++
+        // We only start zipping another file if we're under our limit
+        // of concurrent file streams
+        if (this._filesBeingZipped < this._maxNumberOfFileStreams) {
+            void readFileAsString(sourceFilePath).then((content) => {
+                return this._zipWriter.add(targetFilePath, new TextReader(content), {
+                    onend: this.boundFileCompletionCallback,
+                    onstart: this.boundFileStartCallback,
+                })
+            })
+        } else {
+            // Queue it for later (see "write" event)
+            this._filesToZip.push([sourceFilePath, targetFilePath])
+        }
+    }
+
+    public async finalize(onProgress?: (percentComplete: number) => void): Promise<ZipStreamResult> {
+        let finished = false
+        // We need to poll to check for all the file streams to be completely processed
+        // -- we are keeping track of this via the "progress" event handler
+        while (!finished) {
+            finished = await new Promise((resolve) => {
+                setTimeout(() => {
+                    getLogger().verbose(`success is ${this._numberOfFilesSucceeded}/${this._numberOfFilesToStream}`)
+                    onProgress?.(Math.floor((100 * this._numberOfFilesSucceeded) / this._numberOfFilesToStream))
+                    resolve(this._numberOfFilesToStream <= this._numberOfFilesSucceeded)
+                }, 1000)
+            })
+        }
+        // We're done streaming all files, so we can close the zip stream
+
+        await this._zipWriter.close()
+        const sizeInBytes = this._streamBuffer.size()
+        getLogger().debug('Finished finalizing zipStream with %d bytes of data', sizeInBytes)
+        return {
+            sizeInBytes,
+            hash: this._hasher.digest('base64'),
+            streamBuffer: this._streamBuffer,
+        }
+    }
+
+    public async finalizeToFile(targetPath: string, onProgress?: (percentComplete: number) => void) {
+        const result = await this.finalize(onProgress)
+        const contents = result.streamBuffer.getContents() || Buffer.from('')
+        await fs.writeFile(targetPath, contents)
+        return result
+    }
+
+    public static async unzip(zipBuffer: Buffer): Promise<Entry[]> {
+        const reader = new ZipReader(new Uint8ArrayReader(new Uint8Array(zipBuffer)))
+        try {
+            return await reader.getEntries()
+        } finally {
+            await reader.close()
+        }
+    }
+}
diff --git a/src/shared/virtualFilesystem.ts b/packages/core/src/shared/virtualFilesystem.ts
similarity index 96%
rename from src/shared/virtualFilesystem.ts
rename to packages/core/src/shared/virtualFilesystem.ts
index 92c36a6db9c..5e8880524b5 100644
--- a/src/shared/virtualFilesystem.ts
+++ b/packages/core/src/shared/virtualFilesystem.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -24,7 +24,7 @@ export interface FileProvider {
  * Bare-bones file system to support in-memory operations on single documents.
  * Does not support directories.
  */
-export class VirualFileSystem implements vscode.FileSystemProvider {
+export class VirtualFileSystem implements vscode.FileSystemProvider {
     private readonly _onDidChangeFile = new vscode.EventEmitter<vscode.FileChangeEvent[]>()
     public readonly onDidChangeFile = this._onDidChangeFile.event
     private readonly fileProviders: Record<string, FileProvider | undefined> = {}
diff --git a/packages/core/src/shared/virtualMemoryFile.ts b/packages/core/src/shared/virtualMemoryFile.ts
new file mode 100644
index 00000000000..f13bcf38113
--- /dev/null
+++ b/packages/core/src/shared/virtualMemoryFile.ts
@@ -0,0 +1,29 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { FileProvider } from './virtualFilesystem'
+
+export class VirtualMemoryFile implements FileProvider {
+    private readonly onDidChangeEmitter = new vscode.EventEmitter<void>()
+    public readonly onDidChange = this.onDidChangeEmitter.event
+    private fileContents: Uint8Array
+
+    public constructor(fileContents: Uint8Array) {
+        this.fileContents = fileContents
+    }
+
+    public stat(): { ctime: number; mtime: number; size: number } {
+        // This would need to be filled out to track conflicts
+        return { ctime: 0, mtime: 0, size: 0 }
+    }
+
+    public async read(): Promise<Uint8Array> {
+        return this.fileContents
+    }
+
+    public async write(content: Uint8Array): Promise<void> {
+        this.fileContents = content
+    }
+}
diff --git a/packages/core/src/shared/vscode/commands2.ts b/packages/core/src/shared/vscode/commands2.ts
new file mode 100644
index 00000000000..b40134c2afa
--- /dev/null
+++ b/packages/core/src/shared/vscode/commands2.ts
@@ -0,0 +1,686 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { toTitleCase } from '../utilities/textUtilities'
+import { getLogger, NullLogger } from '../logger/logger'
+import { FunctionKeys, Functions, getFunctions } from '../utilities/classUtils'
+import { TreeItemContent, TreeNode } from '../treeview/resourceTreeDataProvider'
+import { telemetry, MetricName, VscodeExecuteCommand, Metric, Span } from '../telemetry/telemetry'
+import globals from '../extensionGlobals'
+import { ToolkitError } from '../errors'
+import crypto from 'crypto'
+import { keysAsInt } from '../utilities/tsUtils'
+import { partialClone } from '../utilities/collectionUtils'
+import { isAmazonQ } from '../extensionUtilities'
+import { isNameMangled } from '../utilities/typeConstructors'
+
+type Callback = (...args: any[]) => any
+type CommandFactory<T extends Callback, U extends any[]> = (...parameters: U) => T
+
+/**
+ * HACK
+ *
+ * If a command matches the following conditions:
+ * - Is registered with VS Code
+ * - Has args for the execution of the command
+ * - Can be executed through a package.json contribution (eg: ellipsis menu in View)
+ *
+ * Then unexpected args will be passed to the command.
+ * - Currently it sets arg[0] to an object or undefined, depending on the context.
+ * - And the rest of the args will be undefined do not exist.
+ * ---
+ * **So as a workaround**, commands who meet the above criteria should
+ * - have this type as their first arg as a placeholder
+ * - When executing the command from within the code, pass in {@link placeholder} as the first arg.
+ * - In the command check if the first arg !== {@link placeholder}, and if so you will need to
+ *   set values for the other args since they will not exist.
+ */
+export type VsCodeCommandArg = typeof placeholder
+/** A placeholder value for Commands that use {@link VsCodeCommandArg} */
+export const placeholder = 'placeholder**' as const
+
+/**
+ * The command was executed by a VSCode UI component which we
+ * cannot accurately determine a source.
+ */
+export const vscodeComponent = 'vscodeComponent'
+
+/**
+ * A handle for a generic "command" that is registered (or will be registered) through
+ * VS Code's `commands` API.
+ *
+ * Not to be confused with the {@link vscode.Command UI representation} of a command.
+ */
+export interface Command<T extends Callback = Callback> {
+    /**
+     * Unique identifier associated with the command, e.g. `aws.viewLogs`.
+     */
+    readonly id: string
+
+    /**
+     * Entry-point to derive objects that directly or indirectly use the command.
+     *
+     * This includes many UI-related components such as tree nodes or code lenses.
+     */
+    build(...args: Parameters<T>): Builder
+
+    /**
+     * Executes the command.
+     *
+     * Only commands registered via {@link Commands} have certain guarantees such as
+     * logging and error-handling.
+     */
+    execute(...parameters: Parameters<T>): Promise<ReturnType<T> | undefined>
+}
+
+/**
+ * Represents a command that has been registered with VS Code, meaning
+ * it can be executed with the `executeCommand` API.
+ */
+export interface RegisteredCommand<T extends Callback = Callback> extends Command<T> {
+    dispose(): void
+}
+
+/**
+ * Represents a command that has been declared but not yet registered with
+ * VS Code
+ *
+ * This is a "lazy" command that is only registered when it is actually used.
+ */
+export interface DeclaredCommand<T extends Callback = Callback, U extends any[] = any[]> extends Command<T> {
+    register(...dependencies: U): RegisteredCommand<T>
+}
+
+/**
+ * Classes that have "declared" commands which wrap the underlying
+ * logic provided by 'T'.
+ *
+ * These declared commands can then be used to do things like register
+ * it as a VS Code command, or to build a tree node that uses the command.
+ *
+ * @param T The class that declares the commands
+ */
+export interface CommandDeclarations<T> {
+    readonly declared: { [K in FunctionKeys<T>]: DeclaredCommand<Functions<T>[K], [T]> }
+}
+
+/**
+ * Using the given inputs will register the given commands with VS Code.
+ *
+ * @param declarations Has the mapping of command names to the backend logic
+ * @param backend The backend logic of the commands
+ */
+export function registerDeclaredCommands<T>(
+    disposables: { dispose(): any }[],
+    declarations: CommandDeclarations<T>,
+    backend: T
+): void {
+    disposables.push(...Object.values<DeclaredCommand>(declarations.declared).map((c) => c.register(backend)))
+}
+
+/**
+ * Minimal wrapper around VS Code's `commands` API to give structure around commands registered
+ * and consumed by the extension.
+ */
+export class Commands {
+    private readonly resources: Map<string, CommandResource<() => unknown, any>> = new Map()
+
+    public constructor(private readonly commands = vscode.commands) {}
+
+    /** See {@link Commands.get}. */
+    public async get(id: string): Promise<Command | undefined> {
+        const registeredCommands = await this.commands.getCommands()
+
+        if (registeredCommands.includes(id)) {
+            const throwOnRegister = () => {
+                throw new Error(`Command "${id}" cannot be re-registered`)
+            }
+
+            const info = { id }
+            return new CommandResource<Callback>({ info, factory: throwOnRegister }, this.commands)
+        }
+    }
+
+    /** See {@link Commands.getOrThrow}. */
+    public async getOrThrow(id: string): Promise<Command> {
+        const cmd = await this.get(id)
+        if (cmd === undefined) {
+            throw new ToolkitError(`Tried to get Command '${id}', but it hasn't been registered.`)
+        }
+
+        return cmd
+    }
+
+    /** See {@link Commands.tryExecute}. */
+    public async tryExecute<T extends Callback = Callback>(
+        id: string,
+        ...args: Parameters<T>
+    ): Promise<ReturnType<T> | undefined> {
+        return this.commands.executeCommand<ReturnType<T>>(id, ...args)?.then(undefined, (e: Error) => {
+            getLogger().warn('command failed (not registered?): "%s"', id)
+            return undefined
+        })
+    }
+
+    /** See {@link Commands.register}. */
+    public register<T extends Callback>(
+        info: string | Omit<CommandInfo<T>, 'args' | 'label'>,
+        callback: T
+    ): RegisteredCommand<T> {
+        const resource = new CommandResource(
+            {
+                info: typeof info === 'string' ? { id: info } : info,
+                factory: () => callback,
+            },
+            this.commands
+        )
+
+        return this.addResource(resource).register()
+    }
+
+    /** See {@link Commands.declare}. */
+    public declare<T extends Callback, D extends any[]>(
+        id: string | Omit<CommandInfo<T>, 'args' | 'label'>,
+        factory: CommandFactory<T, D>
+    ): DeclaredCommand<T, D> {
+        const resource = typeof id === 'string' ? { info: { id }, factory } : { info: { ...id }, factory }
+
+        return this.addResource(new CommandResource(resource, this.commands))
+    }
+
+    /** See {@link Commands.from}. */
+    public from<T>(target: new (...args: any[]) => T): Declarables<T> {
+        type Id = Parameters<Declare<T, Callback>>[0]
+        const result = {} as Record<string, Declare<T, Callback>>
+
+        for (const [k, v] of Object.entries<Callback>(getFunctions(target))) {
+            const mappedKey = `declare${toTitleCase(k)}`
+            const name = !isNameMangled() ? `${target.name}.${k}` : undefined
+            const mapInfo = (id: Id) => (typeof id === 'string' ? { id, name } : { name, ...id })
+
+            result[mappedKey] = (id) => this.declare(mapInfo(id), (instance: T) => v.bind(instance))
+        }
+
+        return result as unknown as Declarables<T>
+    }
+
+    public dispose(): void {
+        vscode.Disposable.from(...this.resources.values()).dispose()
+    }
+
+    private addResource<T extends Callback, U extends any[]>(resource: CommandResource<T, U>): CommandResource<T, U> {
+        const previous = this.resources.get(resource.id)
+
+        if (previous !== undefined) {
+            throw new Error(`Command "${resource.id}" has already been declared by the Toolkit`)
+        }
+
+        this.resources.set(resource.id, resource)
+        return resource
+    }
+
+    /** Default instance of {@link Commands}. */
+    public static readonly instance = new Commands()
+
+    /**
+     * Returns a {@link Command} if the ID is currently registered within VS Code,
+     * or undefined otherwise.
+     */
+    public static readonly get = this.instance.get.bind(this.instance)
+
+    /**
+     * Returns a {@link Command} if the ID is currently registered within VS Code,
+     * or throws a {@link ToolkitError} otherwise.
+     */
+    public static readonly getOrThrow = this.instance.getOrThrow.bind(this.instance)
+
+    /**
+     * Executes a command if it exists, else does nothing.
+     */
+    public static readonly tryExecute = this.instance.tryExecute.bind(this.instance)
+
+    /**
+     * Registers a new command with the VS Code API.
+     *
+     * @param info command id (string) or {@link CommandInfo} object
+     * @param callback command implementation
+     */
+    public static readonly register = this.instance.register.bind(this.instance)
+
+    /**
+     * Declares the _intent_ to register a command.
+     *
+     * Forward declaration adds one level of indirection. This allows for explicit annotation of
+     * not just the command signature but also its immediate dependencies.
+     */
+    public static readonly declare = this.instance.declare.bind(this.instance)
+
+    /**
+     * Convenience method to declare commands directly from a class.
+     *
+     * Mostly used when many commands are associated with the same long-lived context.
+     * Functions are currently bound at declaration time for simplicity, though this
+     * may change in the future.
+     *
+     * #### Example
+     * ```ts
+     * class Foo {
+     *     public square(n: number): number {
+     *         return n * n
+     *     }
+     * }
+     *
+     * const square = Commands.instance.from(Foo).declareSquare('aws.square')
+     * await square.register(new Foo()).execute(5)
+     * ```
+     */
+    public static readonly from = this.instance.from.bind(this.instance)
+}
+
+interface Declare<T, F extends Callback> {
+    (id: string | Omit<CommandInfo<F>, 'args' | 'label'>): DeclaredCommand<F, [target: T]>
+}
+
+type Declarables<T> = {
+    [P in FunctionKeys<T> as `declare${Capitalize<P & string>}`]: Declare<T, Functions<T>[P]>
+}
+
+type PartialCommand = Omit<vscode.Command, 'arguments' | 'command'>
+type PartialTreeItem = Omit<TreeItemContent, 'command'>
+
+interface Builder {
+    asUri(): vscode.Uri
+    asCommand(content: PartialCommand): vscode.Command
+    asTreeNode(content: PartialTreeItem): TreeNode<Command>
+    asCodeLens(range: vscode.Range, content: PartialCommand): vscode.CodeLens
+}
+
+interface Deferred<T extends Callback, U extends any[]> {
+    readonly info: Omit<CommandInfo<T>, 'args' | 'label'>
+    readonly factory: CommandFactory<T, U>
+}
+
+/**
+ * Contains the command implementation and properties.
+ *
+ * `CommandResources` are registered on the {@link Commands} singleton. This class does not
+ * differentiate between 'registered' and 'declared' commands; that abstraction is handled
+ * by the singleton.
+ */
+class CommandResource<T extends Callback = Callback, U extends any[] = any[]> {
+    private subscription: vscode.Disposable | undefined
+    private idCounter = 0
+    public readonly id = this.resource.info.id
+
+    public constructor(
+        private readonly resource: Deferred<T, U>,
+        private readonly commands = vscode.commands
+    ) {}
+
+    public get registered() {
+        return !!this.subscription
+    }
+
+    public build(...args: Parameters<T>): Builder {
+        const id = this.resource.info.id
+
+        return {
+            asUri: this.buildUri(id, args),
+            asCommand: this.buildCommand(id, args),
+            asCodeLens: this.buildCodeLens(id, args),
+            asTreeNode: this.buildTreeNode(id, args),
+        }
+    }
+
+    public register(...args: U): RegisteredCommand<T> {
+        const { id, name } = this.resource.info
+        const label = name ? `"${name}" (id: ${id})` : `"${id}"`
+        const target = this.resource.factory(...args)
+        const instrumented = (...args: Parameters<T>) => {
+            const info: CommandInfo<T> = {
+                ...this.resource.info,
+                id: id,
+                label: label,
+                args: args,
+            }
+            return runCommand(target, info)
+        }
+        this.subscription = this.commands.registerCommand(this.resource.info.id, instrumented)
+
+        return this
+    }
+
+    public async execute(...args: Parameters<T>): Promise<ReturnType<T> | undefined> {
+        return this.commands.executeCommand<ReturnType<T>>(this.resource.info.id, ...args)
+    }
+
+    public dispose(): void {
+        this.subscription?.dispose()
+        this.subscription = undefined
+    }
+
+    private buildUri(id: string, args: unknown[]) {
+        return () => vscode.Uri.parse(`command:${id}?${encodeURIComponent(JSON.stringify(args))}`)
+    }
+
+    private buildCommand(id: string, args: unknown[]) {
+        return (content: PartialCommand) => ({ ...content, command: id, arguments: args })
+    }
+
+    private buildCodeLens(id: string, args: unknown[]) {
+        return (range: vscode.Range, content: PartialCommand) => {
+            return new vscode.CodeLens(range, this.buildCommand(id, args)(content))
+        }
+    }
+
+    private buildTreeNode(id: string, args: unknown[]) {
+        return (content: PartialTreeItem) => {
+            const treeItem = new vscode.TreeItem(content.label, vscode.TreeItemCollapsibleState.None)
+            Object.assign(treeItem, {
+                ...content,
+                command: { command: id, arguments: args, title: content.label },
+            })
+
+            return {
+                id: `${id}-${(this.idCounter += 1)}`,
+                resource: this,
+                getTreeItem: () => treeItem,
+            }
+        }
+    }
+}
+
+interface CommandInfo<T extends Callback> {
+    readonly id: string
+    readonly name?: string
+    /** Display label, generated from id + name. */
+    readonly label?: string
+    readonly args: Parameters<T>
+    readonly logging?: boolean
+    /** Does the command require credentials? (default: false) */
+    readonly autoconnect?: boolean
+
+    /**
+     * The telemetry event associated with this command.
+     *
+     * Attributes can be added during execution like so:
+     * ```ts
+     * telemetry.record({ exampleMetadata: 'bar' })
+     * ```
+     *
+     * Attributes are sent with the event on completion.
+     */
+    readonly telemetryName?: MetricName
+
+    /**
+     * Prevents telemetry from being emitted more than once
+     * within N milliseconds. Setting this to false disables
+     * throttling, emitting an event for every call.
+     *
+     * (default: 5 minutes)
+     */
+    readonly telemetryThrottleMs?: number | false
+
+    /**
+     * The indexes of args in `execute()` that will be used to determine
+     * the uniqueness of the metric `vscode_executeCommand`.
+     *
+     * - By default, {@link VscodeExecuteCommand} is throttled for metrics of the
+     *   same {@link VscodeExecuteCommand.command}.
+     * - By defining this property, the values of the args will be combined
+     *   with the {@link VscodeExecuteCommand.command}.
+     *   This ensures throttling only happens for the same {@link VscodeExecuteCommand.command} + args
+     *   instead.
+     * - Indexes starts at 0.
+     *
+     * @example
+     * const compositeKey: CompositeKey = {
+     *     1: 'source' // the value is the "source" field of `vscode_executeCommand`
+     * }
+     * ...
+     * myCommand.execute(undefined, 'SourceValue')
+     * ...
+     * // vscode_executeCommand -> { command: 'myCommand' source: 'SourceValue' }
+     */
+    readonly compositeKey?: CompositeKey
+}
+
+/**
+ * Indicates that the arg should be used as a telemetry field
+ * for the metric {@link VscodeExecuteCommand}.
+ */
+export type CompositeKey = { [index: number]: MetricField }
+
+/** Supported {@link VscodeExecuteCommand} fields */
+const MetricFields = {
+    /**
+     * TODO: Figure out how to derive "source" as a type from {@link VscodeExecuteCommand.source}
+     * instead of explicitly writing it.
+     */
+    source: 'source',
+} as const
+type MetricField = (typeof MetricFields)[keyof typeof MetricFields]
+
+function getInstrumenter(
+    id: { id: string; args: any[]; compositeKey: CompositeKey },
+    threshold: number,
+    telemetryName?: MetricName
+) {
+    handleBadCompositeKey(id)
+    const currentTime = globals.clock.Date.now()
+    const info = TelemetryDebounceInfo.instance.get(id)
+
+    // to reduce # of events actually emitted, we throttle the same* event for brief period of time
+    // and instead increment a counter for executions while throttled.
+    if (!telemetryName && info?.startTime !== undefined && currentTime - info.startTime < threshold) {
+        info.debounceCount += 1
+        TelemetryDebounceInfo.instance.set(id, info)
+        getLogger().debug('telemetry: collapsing %d "%s" metrics. key=%O', info.debounceCount, id.id, id.compositeKey)
+
+        return undefined
+    }
+
+    // Throttling occurs regardless of whether or not the instrumenter is invoked
+    const span: Metric = telemetryName ? telemetry[telemetryName] : telemetry.vscode_executeCommand
+    const debounceCount = info?.debounceCount !== 0 ? info?.debounceCount : undefined
+    TelemetryDebounceInfo.instance.set(id, { startTime: currentTime, debounceCount: 0 })
+
+    const fields = findFieldsToAddToMetric(id.args, id.compositeKey)
+
+    return <T extends Callback>(fn: T, ...args: Parameters<T>) =>
+        span.run(
+            (span) => {
+                ;(span as Span<VscodeExecuteCommand>).record({
+                    command: id.id,
+                    debounceCount,
+                    ...fields,
+                })
+
+                return fn(...args)
+            },
+            // wrap all command executions with their ID as context for telemetry.
+            // this will give us a better idea on the entrypoints of executions
+            { functionId: { name: id.id, class: 'Commands' } }
+        )
+}
+
+export const unsetSource = 'sourceImproperlySet'
+
+function handleBadCompositeKey(data: { id: string; args: any[]; compositeKey: CompositeKey }) {
+    const id = data.id
+    const args = data.args
+    const compositeKey = data.compositeKey
+
+    if (Object.keys(compositeKey).length === 0) {
+        return // nothing to do since no key
+    }
+
+    for (const [index, field] of Object.entries(compositeKey)) {
+        const indexAsInt = parseInt(index)
+        const arg = args[indexAsInt]
+        if (field === 'source' && arg === undefined) {
+            args[indexAsInt] = 'vscodeUI'
+        } else if (field === 'source' && typeof arg !== 'string') {
+            /**
+             * This case happens when either the caller sets the wrong args themselves through
+             * vscode.commands.executeCommand OR if through a VS Code UI component like the ellipsis menu
+             *
+             * TODO: To fix this we insert a value in the `source` arg so that there is something there
+             * for the metric to emit. We need to figure out a better way to handle either incorrectly called
+             * or the VS Code UI component.
+             */
+            getLogger().error('Commands/Telemetry: "%s" executed with invalid "source" type: "%O"', id, args)
+            args[indexAsInt] = unsetSource
+        }
+    }
+}
+
+/**
+ * Returns a map that contains values for the fields of {@link VscodeExecuteCommand}.
+ *
+ * These fields are resolved by extracting the {@link args} that were specified
+ * in {@link compositeKey}.
+ */
+function findFieldsToAddToMetric(args: any[], compositeKey: CompositeKey): { [field in MetricField]?: any } {
+    const indexes = keysAsInt(compositeKey)
+    const indexesWithValue = indexes.filter((i) => compositeKey[i] !== undefined)
+    const sortedIndexesWithValue = indexesWithValue.sort((a, b) => a - b)
+
+    const result: { [field in MetricField]?: any } = {}
+    for (const i of sortedIndexesWithValue) {
+        const fieldName: MetricField = compositeKey[i]
+        const fieldValue = args[i]
+        result[fieldName] = fieldValue
+    }
+    return result
+}
+
+/**
+ * Storage of telemetry events that is used for the purposes
+ * of maintaining the count of throttled event executions.
+ *
+ * - This ensures a {@link RegisteredCommand} that contains a {@link BaseCommandSource} in their
+ *   execution `args` is differentiated in telemetry.
+ */
+export class TelemetryDebounceInfo {
+    private telemetryInfo = new Map<string, { startTime: number; debounceCount: number }>()
+
+    static #instance: TelemetryDebounceInfo
+    static get instance() {
+        return (this.#instance ??= new TelemetryDebounceInfo())
+    }
+
+    /** @warning For testing purposes only */
+    protected constructor() {}
+
+    set(
+        key: { id: string; args: any[]; compositeKey: CompositeKey },
+        value: { startTime: number; debounceCount: number }
+    ) {
+        const actualKey = this.createKey(key)
+        this.telemetryInfo.set(actualKey, value)
+    }
+
+    get(key: { id: string; args: any[]; compositeKey: CompositeKey }) {
+        const actualKey = this.createKey(key)
+        return this.telemetryInfo.get(actualKey)
+    }
+
+    clear() {
+        this.telemetryInfo = new Map<string, { startTime: number; debounceCount: number }>()
+    }
+
+    /**
+     * The map key impacts if an event will be throttled since
+     * it is used to lookup a value in {@link telemetryInfo} which determines if throttling
+     * is necessary for the given event.
+     *
+     * Implementation details:
+     * The current implementation extracts the indexes from `args` using
+     * the indexes specificed by the {@link IndexedArg} objects.
+     */
+    private createKey(key: { id: string; args: any[]; compositeKey: CompositeKey }) {
+        const id = key.id
+        const args = key.args
+        const uniqueIndexes: number[] = keysAsInt(key.compositeKey).sort((a, b) => a - b)
+
+        if (uniqueIndexes[uniqueIndexes.length - 1] > args.length - 1) {
+            throw new ToolkitError(`Unique arg indexes exceed the # of args for: "${id}"`)
+        }
+
+        // All the args that will be used to build the unique key
+        const uniqueArgs = uniqueIndexes.map((i) => args[i])
+
+        return uniqueArgs.length > 0 ? `${id}-${this.hashObjects(uniqueArgs)}` : id
+    }
+
+    /**
+     * This creates a hash from the args which is used
+     * in the key for {@link telemetryInfo}.
+     */
+    private hashObjects(objects: any[]): string {
+        const hashableObjects = objects.map((obj) => {
+            if (typeof obj === 'string') {
+                return obj
+            }
+            if (typeof obj === 'boolean') {
+                return obj.toString()
+            }
+            // Add more implementations here as needed
+            throw new ToolkitError(`Cannot create unique key for type: "${typeof obj}"`)
+        })
+
+        const hasher = crypto.createHash('sha256')
+        for (const o of hashableObjects) {
+            hasher.update(o)
+        }
+        return hasher.digest('hex')
+    }
+}
+
+export const defaultTelemetryThrottleMs = 300_000 // 5 minutes
+
+async function runCommand<T extends Callback>(fn: T, info: CommandInfo<T>): Promise<ReturnType<T> | void> {
+    const { id, args, label, logging, compositeKey } = { logging: true, ...info }
+    const logger = logging ? getLogger() : new NullLogger()
+    const threshold = info.telemetryThrottleMs ?? defaultTelemetryThrottleMs
+    const instrumenter = logging
+        ? getInstrumenter({ id, args, compositeKey: compositeKey ?? {} }, threshold || 0, info.telemetryName)
+        : undefined
+
+    logger.debug(
+        `command: running ${label} with arguments: %O`,
+        partialClone(args, 3, ['clientSecret', 'accessToken', 'refreshToken', 'tooltip'], { replacement: '[omitted]' })
+    )
+
+    try {
+        if (info.autoconnect === true) {
+            const prefix = isAmazonQ() ? 'amazonq' : 'toolkit'
+            await vscode.commands.executeCommand(`_aws.${prefix}.auth.autoConnect`)
+        }
+
+        return await (instrumenter ? instrumenter(fn, ...args) : fn(...args))
+    } catch (error) {
+        if (errorHandler !== undefined) {
+            errorHandler(info, error)
+        } else {
+            logger.error(`command: ${label} failed without error handler: %s`, error)
+            throw error
+        }
+    }
+}
+
+// Error handling may involve other Toolkit modules and so it must be defined and registered at
+// the extension entry-point. `Commands` form the backbone of everything else in the Toolkit.
+// This file should contain as little application-specific logic as possible.
+let errorHandler: (info: Omit<CommandInfo<any>, 'args'>, error: unknown) => void
+export function registerCommandErrorHandler(handler: typeof errorHandler): void {
+    if (errorHandler !== undefined) {
+        throw new TypeError('Error handler has already been registered')
+    }
+
+    errorHandler = handler
+}
diff --git a/packages/core/src/shared/vscode/constants.ts b/packages/core/src/shared/vscode/constants.ts
new file mode 100644
index 00000000000..fbe266e0e0b
--- /dev/null
+++ b/packages/core/src/shared/vscode/constants.ts
@@ -0,0 +1,9 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export const vscodeAppname = 'Visual Studio Code'
+export const cloud9Appname = 'AWS Cloud9'
+export const cloud9CnAppname = 'Amazon Cloud9'
+export const sageMakerAppname = 'SageMaker Code Editor'
+export const sageMakerUnifiedStudio = 'SageMakerUnifiedStudio'
diff --git a/packages/core/src/shared/vscode/env.ts b/packages/core/src/shared/vscode/env.ts
new file mode 100644
index 00000000000..1ddb042e415
--- /dev/null
+++ b/packages/core/src/shared/vscode/env.ts
@@ -0,0 +1,398 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as semver from 'semver'
+import * as vscode from 'vscode'
+import * as packageJson from '../../../package.json'
+import { getLogger } from '../logger/logger'
+import { onceChanged } from '../utilities/functionUtils'
+import { ChildProcess } from '../utilities/processUtils'
+import globals, { isWeb } from '../extensionGlobals'
+import * as devConfig from '../../dev/config'
+import * as os from 'os'
+
+/**
+ * Returns true if the current build is running on CI (build server).
+ */
+export function isCI(): boolean {
+    return undefined !== process.env['GITHUB_ACTION'] || undefined !== process.env['CODEBUILD_BUILD_ID']
+}
+
+/** Variable added via webpack */
+declare let EXTENSION_VERSION: string // eslint-disable-line @typescript-eslint/naming-convention
+const testVersion = 'testPluginVersion'
+
+/** The current extension version. If not built via Webpack, this defaults to {@link testVersion}. */
+let extensionVersion = testVersion
+try {
+    extensionVersion = EXTENSION_VERSION
+} catch (e) {} // Just a reference error
+
+/**
+ * Returns true if the current build is a production build (as opposed to a
+ * prerelease/test/nightly build).
+ *
+ * Note: `isBeta()` is treated separately.
+ */
+export function isReleaseVersion(prereleaseOk: boolean = false): boolean {
+    return (prereleaseOk || !semver.prerelease(extensionVersion)) && extensionVersion !== testVersion
+}
+
+/**
+ * Returns true if the current build is a "beta" build.
+ */
+export function isBeta(): boolean {
+    const testing = extensionVersion === testVersion
+    for (const url of Object.values(devConfig.betaUrl)) {
+        if (url && url.length > 0) {
+            if (!testing && semver.lt(extensionVersion, '99.0.0-dev')) {
+                throw Error('beta build must set version=99.0.0 in package.json')
+            }
+
+            return true
+        }
+    }
+    return false
+}
+
+/**
+ * Returns true when source mapping is available
+ */
+export function isSourceMappingAvailable(): boolean {
+    return extensionVersion === testVersion
+}
+
+/**
+ * Returns true if the extension is being ran from automation.
+ */
+export function isAutomation(): boolean {
+    return isCI() || !!process.env['AWS_TOOLKIT_AUTOMATION']
+}
+
+/** Returns true if this extension is in a `Run & Debug` instance of VS Code. */
+export function isDebugInstance(): boolean {
+    /**
+     * This is a loose heuristic since the env var was not intentionally made to indicate a debug instance.
+     * If we ever get rid of this env var, just make a new env var in the same place.
+     */
+    return !!process.env['WEBPACK_DEVELOPER_SERVER']
+}
+
+export { extensionVersion }
+
+/**
+ * True if the current running vscode is the minimum defined by `engines.vscode` in `package.json`.
+ *
+ * @param throwWhen Throw if minimum vscode is equal or later than this version.
+ */
+export function isMinVscode(options?: { throwWhen: string }): boolean {
+    const minVscode = getMinVscodeVersion()
+    if (options?.throwWhen && semver.gte(minVscode, options.throwWhen)) {
+        throw Error(`Min vscode ${minVscode} >= ${options.throwWhen}. Delete or update the code that called this.`)
+    }
+    return vscode.version.startsWith(getMinVscodeVersion())
+}
+
+/**
+ * Returns the minimum vscode "engine" version declared in `package.json`.
+ */
+export function getMinVscodeVersion(): string {
+    return packageJson.engines.vscode.replace(/[^~]/, '')
+}
+
+/**
+ * Returns the minimum nodejs version declared in `package.json`.
+ */
+export function getMinNodejsVersion(): string {
+    return packageJson.devDependencies['@types/node'].replace(/[^~]/, '')
+}
+
+export function getCodeCatalystDevEnvId(): string | undefined {
+    return process.env['__DEV_ENVIRONMENT_ID']
+}
+
+/**
+ * Returns true if we are in a dev env
+ */
+export function isInDevEnv(): boolean {
+    return !!getCodeCatalystDevEnvId()
+}
+
+export function isRemoteWorkspace(): boolean {
+    return vscode.env.remoteName === 'ssh-remote'
+}
+
+/**
+ * Parses an os-release file according to the freedesktop.org standard.
+ *
+ * @param content The content of the os-release file
+ * @returns A record of key-value pairs from the os-release file
+ *
+ * @see https://www.freedesktop.org/software/systemd/man/latest/os-release.html
+ */
+function parseOsRelease(content: string): Record<string, string> {
+    const result: Record<string, string> = {}
+
+    for (let line of content.split('\n')) {
+        line = line.trim()
+        // Skip empty lines and comments
+        if (!line || line.startsWith('#')) {
+            continue
+        }
+
+        const eqIndex = line.indexOf('=')
+        if (eqIndex > 0) {
+            const key = line.slice(0, eqIndex)
+            const value = line.slice(eqIndex + 1).replace(/^["']|["']$/g, '')
+            result[key] = value
+        }
+    }
+
+    return result
+}
+
+/**
+ * Checks if the current environment has SageMaker-specific environment variables
+ * @returns true if SageMaker environment variables are detected
+ */
+export function hasSageMakerEnvVars(): boolean {
+    // Check both old and new environment variable names
+    // SageMaker is renaming their environment variables in their Docker images
+    return (
+        // Original environment variables
+        process.env.SAGEMAKER_APP_TYPE !== undefined ||
+        process.env.SAGEMAKER_INTERNAL_IMAGE_URI !== undefined ||
+        process.env.STUDIO_LOGGING_DIR?.includes('/var/log/studio') === true ||
+        // New environment variables (update these with the actual new names)
+        process.env.SM_APP_TYPE !== undefined ||
+        process.env.SM_INTERNAL_IMAGE_URI !== undefined ||
+        process.env.SERVICE_NAME === 'SageMakerUnifiedStudio'
+    )
+}
+
+/**
+ * Checks if the current environment is running on Amazon Linux 2.
+ *
+ * This function detects the container/runtime OS, not the host OS.
+ * In containerized environments, we check the container's OS identity.
+ *
+ * Detection Process (in order):
+ * 1. Returns false for web environments (browser-based)
+ * 2. Returns false for SageMaker environments (even if container is AL2)
+ * 3. Checks `/etc/os-release` with fallback to `/usr/lib/os-release`
+ *    - Standard Linux OS identification files per freedesktop.org spec
+ *    - Looks for `ID="amzn"` and `VERSION_ID="2"` for AL2
+ *    - This correctly identifies AL2 containers regardless of host OS
+ *
+ * This approach ensures correct detection in:
+ * - Containerized environments (detects container OS, not host)
+ * - AL2 containers on any host OS (Ubuntu, AL2023, etc.)
+ * - Web/browser environments (returns false)
+ * - SageMaker environments (returns false)
+ *
+ * Note: We intentionally do NOT check kernel version as it reflects the host OS,
+ * not the container OS. AL2 containers should be treated as AL2 environments
+ * regardless of whether they run on AL2, Ubuntu, or other host kernels.
+ *
+ * References:
+ * - https://docs.aws.amazon.com/linux/al2/ug/ident-amazon-linux-specific.html
+ * - https://docs.aws.amazon.com/linux/al2/ug/ident-os-release.html
+ * - https://www.freedesktop.org/software/systemd/man/latest/os-release.html
+ */
+export function isAmazonLinux2() {
+    // Skip AL2 detection for web environments
+    // In web mode, we're running in a browser, not on AL2
+    if (isWeb()) {
+        return false
+    }
+
+    // First check if we're in a SageMaker environment, which should not be treated as AL2
+    // even if the underlying container is AL2
+    if (hasSageMakerEnvVars()) {
+        return false
+    }
+
+    // Only proceed with file checks on Linux platforms
+    if (process.platform !== 'linux') {
+        return false
+    }
+
+    // Check the container/runtime OS identity via os-release files
+    // This correctly identifies AL2 containers regardless of host OS
+    try {
+        const fs = require('fs')
+        // Check /etc/os-release with fallback to /usr/lib/os-release as per freedesktop.org spec
+        const osReleasePaths = ['/etc/os-release', '/usr/lib/os-release']
+
+        for (const osReleasePath of osReleasePaths) {
+            if (fs.existsSync(osReleasePath)) {
+                try {
+                    const osReleaseContent = fs.readFileSync(osReleasePath, 'utf8')
+                    const osRelease = parseOsRelease(osReleaseContent)
+
+                    // Check if this is Amazon Linux 2
+                    // We trust os-release as the authoritative source for container OS identity
+                    return osRelease.VERSION_ID === '2' && osRelease.ID === 'amzn'
+                } catch (e) {
+                    // Continue to next path if parsing fails
+                    getLogger().error(`Parsing os-release file ${osReleasePath} failed: ${e}`)
+                }
+            }
+        }
+    } catch (e) {
+        // If we can't read the files, we cannot determine AL2 status
+        getLogger().error(`Checking os-release files failed: ${e}`)
+    }
+
+    // Fall back to kernel version check if os-release files are unavailable or failed
+    // This is needed for environments where os-release might not be accessible
+    const kernelRelease = os.release()
+    const hasAL2Kernel = kernelRelease.includes('.amzn2int.') || kernelRelease.includes('.amzn2.')
+
+    return hasAL2Kernel
+}
+
+/**
+ * Returns true if we are in an internal Amazon Cloud Desktop
+ */
+export async function isCloudDesktop() {
+    if (!isAmazonLinux2()) {
+        return false
+    }
+
+    // This heuristic is explained in IDE-14524
+    return (await new ChildProcess('/apollo/bin/getmyfabric').run().then((r) => r.exitCode)) === 0
+}
+
+export function isMac(): boolean {
+    return process.platform === 'darwin'
+}
+/** Returns true if OS is Windows. */
+export function isWin(): boolean {
+    // if (isWeb()) {
+    //     return false
+    // }
+
+    return process.platform === 'win32'
+}
+
+const UIKind = {
+    [vscode.UIKind.Desktop]: 'desktop',
+    [vscode.UIKind.Web]: 'web',
+} as const
+export type ExtensionHostUI = (typeof UIKind)[keyof typeof UIKind]
+export type ExtensionHostLocation = 'local' | 'remote' | 'webworker'
+
+/**
+ * Detects where the ui and the extension host are running
+ */
+export function getExtRuntimeContext(): {
+    ui: ExtensionHostUI
+    extensionHost: ExtensionHostLocation
+} {
+    const extensionHost =
+        // Check if we're in a Node.js environment (desktop/remote) vs web worker
+        // Updated to be compatible with Node.js v22 which includes navigator global
+        typeof process === 'object' && process.versions?.node
+            ? globals.context.extension.extensionKind === vscode.ExtensionKind.UI
+                ? 'local'
+                : 'remote'
+            : 'webworker'
+
+    return {
+        ui: UIKind[vscode.env.uiKind],
+        extensionHost,
+    }
+}
+
+export function getCodeCatalystProjectName(): string | undefined {
+    return process.env['__DEV_ENVIRONMENT_PROJECT_NAME']
+}
+
+export function getCodeCatalystSpaceName(): string | undefined {
+    // TODO: remove legacy __DEV_ENVIRONMENT_ORGANIZATION_NAME
+    return process.env['__DEV_ENVIRONMENT_SPACE_NAME'] || process.env['__DEV_ENVIRONMENT_ORGANIZATION_NAME']
+}
+
+type ServiceConfig<T extends string[]> = Partial<{
+    [K in T[number]]: string
+}>
+const logConfigsOnce: { [key: string]: ReturnType<typeof onceChanged> } = {}
+
+/**
+ * Generate a map of environment variable names to environment variables.
+ *
+ * It does this by converting camel case entries in envVarNames to uppercase joined by underscores
+ * If there is no camel case in an entry in envVarNames then it just converts the envVar to uppercase
+ *
+ * E.g. if service is codecatalyst:
+ *  gitHostname -> __CODECATALYST_GIT_HOSTNAME
+ *  region -> __CODECATALYST_REGION
+ */
+export function getEnvVars<T extends string[]>(service: string, envVarNames: T): ServiceConfig<T> {
+    const envVars: ServiceConfig<T> = {}
+    for (const name of envVarNames) {
+        // convert camel case to uppercase joined by underscores
+        // e.g. gitHostname -> GIT_HOSTNAME
+        const envVarName = name
+            .split(/(?=[A-Z])/)
+            .map((s) => s.toUpperCase())
+            .join('_')
+        envVars[name as T[number]] = `__${service.toUpperCase()}_${envVarName}`
+    }
+    return envVars
+}
+
+/**
+ * Accepts a service name and an array of configs.
+ * For each config key, check if the associated env var exists and return
+ * a config map with the found values. Changes are logged once for each
+ * service/found env var combos.
+ */
+export function getServiceEnvVarConfig<T extends string[]>(service: string, configs: T): ServiceConfig<T> {
+    const config: ServiceConfig<T> = {}
+    const overriden: string[] = []
+
+    // Find env vars for each field in the config
+    const envVars = getEnvVars<T>(service, configs)
+    for (const [field, envKey] of Object.entries(envVars) as [string, string][]) {
+        if (envKey in process.env) {
+            config[field as T[number]] = process.env[envKey]
+            overriden.push(envKey)
+        }
+    }
+
+    // Log env var overrides, keeping track of which service we are logging for.
+    // This allows us to log only once when env vars for a service change.
+    if (overriden.length > 0) {
+        if (!(service in logConfigsOnce)) {
+            logConfigsOnce[service] = onceChanged((vars) => {
+                getLogger().info(`using env vars for ${service} config: ${vars}`)
+            })
+        }
+        logConfigsOnce[service](overriden)
+    }
+
+    return config
+}
+
+export async function getMachineId(): Promise<string> {
+    if (isWeb()) {
+        // TODO: use `vscode.env.machineId` instead?
+        return 'browser'
+    }
+    // Eclipse Che-based envs (backing compute rotates, not classified as a web instance)
+    // TODO: use `vscode.env.machineId` instead?
+    if (process.env.CHE_WORKSPACE_ID) {
+        return process.env.CHE_WORKSPACE_ID
+    }
+    // RedHat Dev Workspaces (run some VSC web variant)
+    if (process.env.DEVWORKSPACE_ID) {
+        return process.env.DEVWORKSPACE_ID
+    }
+    const proc = new ChildProcess('hostname', [], { collect: true, logging: 'no' })
+    // TODO: check exit code.
+    return (await proc.run()).stdout.trim() ?? 'unknown-host'
+}
diff --git a/packages/core/src/shared/vscode/setContext.ts b/packages/core/src/shared/vscode/setContext.ts
new file mode 100644
index 00000000000..3d45d93e14a
--- /dev/null
+++ b/packages/core/src/shared/vscode/setContext.ts
@@ -0,0 +1,77 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+
+/**
+ * Context keys used by the extension.
+ *
+ * New keys must start with "aws." or "amazonq.".
+ */
+export type contextKey =
+    | 'aws.isDevMode'
+    | 'aws.isSageMaker'
+    | 'aws.isSageMakerUnifiedStudio'
+    | 'aws.isWebExtHost'
+    | 'aws.isInternalUser'
+    | 'aws.amazonq.showLoginView'
+    | 'aws.amazonq.security.noMatches'
+    | 'aws.amazonq.notifications.show'
+    | 'aws.amazonq.connectedSsoIdc'
+    | 'aws.codecatalyst.connected'
+    | 'aws.codewhisperer.connected'
+    | 'aws.codewhisperer.connectionExpired'
+    | 'aws.codewhisperer.tutorial.workInProgress'
+    | 'aws.explorer.showAuthView'
+    | 'aws.toolkit.amazonq.dismissed'
+    | 'aws.toolkit.amazonqInstall.dismissed'
+    | 'aws.stepFunctions.isWorkflowStudioFocused'
+    | 'aws.toolkit.notifications.show'
+    | 'aws.amazonq.editSuggestionActive'
+    | 'aws.smus.connected'
+    | 'aws.smus.inSmusSpaceEnvironment'
+    // Deprecated/legacy names. New keys should start with "aws.".
+    | 'codewhisperer.activeLine'
+    | 'gumby.isPlanAvailable'
+    | 'gumby.isStopButtonAvailable'
+    | 'gumby.isSummaryAvailable'
+    | 'gumby.reviewState'
+    | 'gumby.transformationProposalReviewInProgress'
+    | 'gumby.wasQCodeTransformationUsed'
+    | 'amazonq.inline.codelensShortcutEnabled'
+    | 'aws.toolkit.lambda.walkthroughSelected'
+    | 'aws.amazonq.amazonqChatLSP.isFocus'
+
+const contextMap: Partial<Record<contextKey, any>> = {}
+
+/**
+ * Calls the vscode "setContext" command.
+ *
+ * This wrapper adds structure and traceability to the vscode "setContext". It also opens the door
+ * for validation.
+ *
+ * Use "setContext" only as a last resort, to set flags that are detectable in package.json
+ * declarations. Do not use it as a general way to store global state (which should be avoided
+ * anyway).
+ *
+ * Warning: vscode context keys/values are NOT isolated to individual extensions. Other extensions
+ * can read and modify them. See also https://github.com/microsoft/vscode/issues/10471
+ */
+export async function setContext(key: contextKey, val: any): Promise<void> {
+    // eslint-disable-next-line aws-toolkits/no-banned-usages
+    await vscode.commands.executeCommand('setContext', key, val)
+    contextMap[key] = val
+}
+
+/**
+ * Returns the value of a context key set via {@link setContext} wrapper for this session.
+ *
+ * Warning: this does not guarantee the state of the context key in vscode because it may have
+ * been set via `vscode.commands.executeCommand('setContext')`. It has no connection the
+ * context keys stored in vscode itself because an API for this is not exposed.
+ */
+export function getContext(key: contextKey): any {
+    return contextMap[key]
+}
diff --git a/packages/core/src/shared/vscode/uriHandler.ts b/packages/core/src/shared/vscode/uriHandler.ts
new file mode 100644
index 00000000000..c8beda72fc4
--- /dev/null
+++ b/packages/core/src/shared/vscode/uriHandler.ts
@@ -0,0 +1,147 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../logger/logger'
+
+import * as nls from 'vscode-nls'
+import { showViewLogsMessage } from '../utilities/messages'
+import { URL, URLSearchParams } from 'whatwg-url'
+import { VSCODE_EXTENSION_ID } from '../extensions'
+import { isAmazonQ } from '../extensionUtilities'
+
+const localize = nls.loadMessageBundle()
+
+/** Handles an external URI targeting the extension */
+export type PathHandler<T> = (query: T) => Promise<void> | void
+/** Parses the 'query' or arguments from a URI */
+export type QueryParser<T> = (params: SearchParams) => Promise<T> | T | never
+
+interface HandlerWithParser<T> {
+    handler: PathHandler<T>
+    parser?: QueryParser<T>
+}
+
+/**
+ * Note: https://code.visualstudio.com/api/references/vscode-api#window.registerUriHandler
+ * > An extension can only register a single uri handler in its entire activation lifetime.
+ */
+export class UriHandler implements vscode.UriHandler {
+    public constructor() {}
+
+    private handlers: Map<string, HandlerWithParser<any>> = new Map()
+
+    public async handleUri(uri: vscode.Uri): Promise<void> {
+        const uriNoQuery = uri.with({ query: '' }).toString()
+
+        if (!this.handlers.has(uri.path)) {
+            void showViewLogsMessage(localize('AWS.uriHandler.nohandler', 'No handler for URI: {0}', uriNoQuery))
+            getLogger().warn('UriHandler: no handler for path "%s" in handlers: %O', uri.path, this.handlers)
+            return
+        }
+        getLogger().verbose('UriHandler: found handler for path "%s"', uri.path)
+
+        const { handler, parser } = this.handlers.get(uri.path)!
+        let parsedQuery: Parameters<typeof handler>[0]
+
+        // Ensure '+' is treated as a literal plus sign, not a space, by encoding it as '%2B'
+        const url = new URL(uri.toString(true).replace(/\+/g, '%2B'))
+        const params = new SearchParams(url.searchParams)
+
+        try {
+            parsedQuery = parser ? await parser(params) : params
+        } catch (err) {
+            const failedParsedMessage = localize(
+                'AWS.uriHandler.parser.failed',
+                'Failed to parse URI query: {0}',
+                uriNoQuery
+            )
+            void showViewLogsMessage(failedParsedMessage)
+            getLogger().error(`UriHandler: query parsing failed for path "${uri.path}": %O`, err)
+            return
+        }
+
+        try {
+            // This await is needed to catch unhandled rejected Promises
+            return await handler(parsedQuery)
+        } catch (err) {
+            const failedResolvedMessage = localize(
+                'AWS.uriHandler.handler.failed',
+                'Failed to handle URI: {0}',
+                uriNoQuery
+            )
+            void showViewLogsMessage(failedResolvedMessage)
+            getLogger().error(`UriHandler: unexpected exception when handling "${uri.path}": %O`, err)
+        }
+    }
+
+    /**
+     * Adds a "path handler" for `vscode://amazonwebservices.aws-toolkit-vscode/<path>` URIs.
+     *
+     *
+     * @param path Target path, e.g. "/foo/bar" handles URI: `vscode://amazonwebservices.aws-toolkit-vscode/foo/bar`.
+     * @param handler Callback fired when the extension receives a URI that matches `path`.
+     * @param parser Optional callback to parse the URI parameters prior to calling the handler
+     *
+     * @returns A disposable to remove the handler
+     * @throws When a handler has already been registered
+     */
+    public onPath<U extends T, T = URLSearchParams>(
+        path: string,
+        handler: PathHandler<U>,
+        parser?: QueryParser<T>
+    ): vscode.Disposable {
+        if (this.handlers.has(path)) {
+            throw new Error(`UriHandler: "${path}" has already been registered`)
+        }
+
+        this.handlers.set(path, { handler, parser })
+        return { dispose: () => this.handlers.delete(path) }
+    }
+
+    static buildUri(path: string) {
+        const extensionId = isAmazonQ() ? VSCODE_EXTENSION_ID.amazonq : VSCODE_EXTENSION_ID.awstoolkit
+        return vscode.Uri.parse(`vscode://${extensionId}/${path}`)
+    }
+}
+
+/**
+ * Minimal wrapper around {@link URLSearchParams} for better ergonomics.
+ */
+export class SearchParams extends URLSearchParams {
+    public getAs<T>(name: string, mapper: (v: string) => T): T | undefined {
+        return super.has(name) ? mapper(super.get(name)!) : undefined
+    }
+
+    public getOrThrow(name: string, message: string | Error): string {
+        this.assertHas(name, message)
+        return super.get(name)!
+    }
+
+    public getAsOrThrow<T>(name: string, message: string | Error, mapper: (v: string) => T): T {
+        this.assertHas(name, message)
+        return this.getAs(name, mapper)!
+    }
+
+    public getFromKeys<T extends readonly string[]>(...keys: T): { [P in T[number]]: string | undefined } {
+        return keys.reduce(
+            (a, b: T[number]) => ((a[b] = super.get(b) ?? undefined), a),
+            {} as { [P in T[number]]: string | undefined }
+        )
+    }
+
+    public getFromKeysOrThrow<T extends readonly string[]>(...keys: T): { [P in T[number]]: string } {
+        return keys.reduce(
+            (a, b: T[number]) => ((a[b] = this.getOrThrow(b, `"${b}" must be provided`)), a),
+            {} as { [P in T[number]]: string }
+        )
+    }
+
+    private assertHas(name: string, message: string | Error): void | never {
+        if (!super.has(name)) {
+            throw message instanceof Error ? message : new Error(message)
+        }
+    }
+}
diff --git a/packages/core/src/shared/vscode/window.ts b/packages/core/src/shared/vscode/window.ts
new file mode 100644
index 00000000000..a451de130c9
--- /dev/null
+++ b/packages/core/src/shared/vscode/window.ts
@@ -0,0 +1,92 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+
+/**
+ * Type for arguments needed to update a progress window
+ * {@link vscode.window.withProgress}
+ */
+export interface ProgressEntry {
+    message?: string
+    increment?: number
+}
+
+/**
+ * Components associated with {@link module:vscode.window}.
+ */
+export interface Window {
+    /**
+     * See {@link module:vscode.window.setStatusBarMessage}.
+     */
+    setStatusBarMessage(message: string, hideAfterTimeout: number): vscode.Disposable
+
+    /**
+     * See {@link module:vscode.window.showInputBox}.
+     */
+    showInputBox(options?: vscode.InputBoxOptions, token?: vscode.CancellationToken): Thenable<string | undefined>
+
+    /**
+     * See {@link module:vscode.window.showInformationMessage}.
+     */
+    showInformationMessage(message: string, ...items: string[]): Thenable<string | undefined>
+    showInformationMessage(
+        message: string,
+        options: vscode.MessageOptions,
+        ...items: string[]
+    ): Thenable<string | undefined>
+    showInformationMessage<T extends vscode.MessageItem>(message: string, ...items: T[]): Thenable<T | undefined>
+    showInformationMessage<T extends vscode.MessageItem>(
+        message: string,
+        options: vscode.MessageOptions,
+        ...items: T[]
+    ): Thenable<T | undefined>
+
+    /**
+     * See {@link module:vscode.window.showWarningMessage}.
+     */
+    showWarningMessage(message: string, ...items: string[]): Thenable<string | undefined>
+    showWarningMessage(
+        message: string,
+        options: vscode.MessageOptions,
+        ...items: string[]
+    ): Thenable<string | undefined>
+    showWarningMessage<T extends vscode.MessageItem>(message: string, ...items: T[]): Thenable<T | undefined>
+    showWarningMessage<T extends vscode.MessageItem>(
+        message: string,
+        options: vscode.MessageOptions,
+        ...items: T[]
+    ): Thenable<T | undefined>
+
+    /**
+     * See {@link module:vscode.window.showErrorMessage}.
+     */
+    showErrorMessage(message: string, ...items: string[]): Thenable<string | undefined>
+    showErrorMessage(message: string, options: vscode.MessageOptions, ...items: string[]): Thenable<string | undefined>
+    showErrorMessage<T extends vscode.MessageItem>(message: string, ...items: T[]): Thenable<T | undefined>
+    showErrorMessage<T extends vscode.MessageItem>(
+        message: string,
+        options: vscode.MessageOptions,
+        ...items: T[]
+    ): Thenable<T | undefined>
+
+    /**
+     * See {@link module:vscode.window.withProgress}.
+     */
+    withProgress<R>(
+        options: vscode.ProgressOptions,
+        task: (progress: vscode.Progress<ProgressEntry>, token: vscode.CancellationToken) => Thenable<R>
+    ): Thenable<R>
+
+    /**
+     * See {@link module:vscode.window.showOpenDialog}.
+     */
+    showOpenDialog(options: vscode.OpenDialogOptions): Thenable<vscode.Uri[] | undefined>
+
+    /**
+     * See {@link module:vscode.window.showSaveDialog}.
+     */
+    showSaveDialog(options: vscode.SaveDialogOptions): Thenable<vscode.Uri | undefined>
+}
diff --git a/packages/core/src/shared/wizards/compositeWizard.ts b/packages/core/src/shared/wizards/compositeWizard.ts
new file mode 100644
index 00000000000..57bf2b90f6d
--- /dev/null
+++ b/packages/core/src/shared/wizards/compositeWizard.ts
@@ -0,0 +1,63 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Wizard, WizardOptions } from './wizard'
+import { Prompter } from '../ui/prompter'
+import { WizardPrompter } from '../ui/wizardPrompter'
+import { createHash } from 'crypto'
+
+/**
+ * An abstract class that extends the base Wizard class plus the ability to
+ * use other wizard classes as prompters
+ */
+export abstract class CompositeWizard<T> extends Wizard<T> {
+    /**
+     * Map to store memoized wizard instances using SHA-256 hashed keys
+     */
+    private wizardInstances: Map<string, any> = new Map()
+
+    public constructor(options?: WizardOptions<T>) {
+        super(options)
+    }
+
+    /**
+     * Creates a prompter for a wizard instance with memoization.
+     *
+     * @template TWizard - The type of wizard, must extend Wizard<TState>
+     * @template TState - The type of state managed by the wizard
+     *
+     * @param wizardClass - The wizard class constructor
+     * @param args - Constructor arguments for the wizard instance
+     *
+     * @returns A wizard prompter to be used as prompter
+     *
+     * @example
+     * // Create a prompter for SyncWizard
+     * const prompter = this.createWizardPrompter<SyncWizard, SyncParams>(
+     *     SyncWizard,
+     *     template.uri,
+     *     syncUrl
+     * )
+     *
+     * @remarks
+     * - Instances are memoized using a SHA-256 hash of the wizard class name and arguments
+     * - The same wizard instance is reused for identical constructor parameters for restoring wizard prompter
+     *   states during back button click event
+     */
+    protected createWizardPrompter<TWizard extends Wizard<TState>, TState>(
+        wizardClass: new (...args: any[]) => TWizard,
+        ...args: ConstructorParameters<new (...args: any[]) => TWizard>
+    ): Prompter<TState> {
+        const memoizeKey = createHash('sha256')
+            .update(wizardClass.name + JSON.stringify(args))
+            .digest('hex')
+
+        if (!this.wizardInstances.get(memoizeKey)) {
+            this.wizardInstances.set(memoizeKey, new wizardClass(...args))
+        }
+
+        return new WizardPrompter(this.wizardInstances.get(memoizeKey)) as Prompter<TState>
+    }
+}
diff --git a/src/shared/wizards/multiStepWizard.ts b/packages/core/src/shared/wizards/multiStepWizard.ts
similarity index 95%
rename from src/shared/wizards/multiStepWizard.ts
rename to packages/core/src/shared/wizards/multiStepWizard.ts
index 4b9c38084e5..95072d52e76 100644
--- a/src/shared/wizards/multiStepWizard.ts
+++ b/packages/core/src/shared/wizards/multiStepWizard.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -12,6 +12,7 @@ import * as vscode from 'vscode'
 import * as picker from '../../shared/ui/picker'
 import { addCodiconToString } from '../utilities/textUtilities'
 import { getLogger } from '../logger/logger'
+import { openUrl } from '../utilities/vsCodeUtils'
 
 export interface WizardStep {
     (stepNumber: number): Thenable<Transition>
@@ -129,7 +130,10 @@ export class WizardContext {
 export class BrowseFolderQuickPickItem implements FolderQuickPickItem {
     public alwaysShow: boolean = true
 
-    public constructor(private readonly context: WizardContext, public readonly detail: string) {}
+    public constructor(
+        private readonly context: WizardContext,
+        public readonly detail: string
+    ) {}
 
     public get label(): string {
         if (this.context.workspaceFolders && this.context.workspaceFolders.length > 0) {
@@ -176,7 +180,7 @@ export async function promptUserForLocation(
     }
 ): Promise<vscode.Uri | undefined> {
     const items: FolderQuickPickItem[] = (context.workspaceFolders || [])
-        .map<FolderQuickPickItem>(f => new WorkspaceFolderQuickPickItem(f))
+        .map<FolderQuickPickItem>((f) => new WorkspaceFolderQuickPickItem(f))
         .concat([
             new BrowseFolderQuickPickItem(
                 context,
@@ -211,7 +215,7 @@ export async function promptUserForLocation(
             if (button === vscode.QuickInputButtons.Back) {
                 resolve(undefined)
             } else if (button === additionalParams?.helpButton?.button) {
-                vscode.env.openExternal(vscode.Uri.parse(additionalParams.helpButton.url))
+                void openUrl(vscode.Uri.parse(additionalParams.helpButton.url))
             }
         },
     })
diff --git a/src/shared/wizards/stateController.ts b/packages/core/src/shared/wizards/stateController.ts
similarity index 85%
rename from src/shared/wizards/stateController.ts
rename to packages/core/src/shared/wizards/stateController.ts
index 3275a0a6d08..bac52f7478c 100644
--- a/src/shared/wizards/stateController.ts
+++ b/packages/core/src/shared/wizards/stateController.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -9,7 +9,16 @@ export enum ControlSignal {
     Retry,
     Exit,
     Back,
-    Continue,
+    Skip,
+}
+
+/**
+ * Value for indicating current direction of the wizard
+ * Created mainly to support skipping prompters
+ */
+export enum Direction {
+    Forward,
+    Backward,
 }
 
 export interface StepResult<TState> {
@@ -39,9 +48,11 @@ export class StateMachineController<TState> {
     private extraSteps = new Map<number, Branch<TState>>()
     private steps: Branch<TState> = []
     private internalStep: number = 0
+    private direction: Direction
 
     public constructor(private state: TState = {} as TState) {
         this.previousStates = [_.cloneDeep(state)]
+        this.direction = Direction.Forward
     }
 
     public addStep(step: StepFunction<TState>): void {
@@ -49,7 +60,7 @@ export class StateMachineController<TState> {
     }
 
     public containsStep(step: StepFunction<TState> | undefined): boolean {
-        return step !== undefined && this.steps.indexOf(step) > -1
+        return step !== undefined && this.steps.includes(step)
     }
 
     public get currentStep(): number {
@@ -71,12 +82,14 @@ export class StateMachineController<TState> {
 
         this.state = this.previousStates.pop()!
         this.internalStep -= 1
+        this.direction = Direction.Backward
     }
 
     protected advanceState(nextState: TState): void {
         this.previousStates.push(this.state)
         this.state = nextState
         this.internalStep += 1
+        this.direction = Direction.Forward
     }
 
     protected detectCycle(step: StepFunction<TState>): TState | undefined {
@@ -105,6 +118,12 @@ export class StateMachineController<TState> {
         }
 
         if (isMachineResult(result)) {
+            if (result.controlSignal === ControlSignal.Skip) {
+                /**
+                 * Depending on current wizard direction, skip signal get converted to forward or backward control signal
+                 */
+                result.controlSignal = this.direction === Direction.Forward ? undefined : ControlSignal.Back
+            }
             return result
         } else {
             return { nextState: result }
diff --git a/packages/core/src/shared/wizards/wizard.ts b/packages/core/src/shared/wizards/wizard.ts
new file mode 100644
index 00000000000..26e32b623ec
--- /dev/null
+++ b/packages/core/src/shared/wizards/wizard.ts
@@ -0,0 +1,294 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Branch, ControlSignal, StateMachineController, StepFunction } from './stateController'
+import * as _ from 'lodash'
+import { Prompter, PromptResult } from '../../shared/ui/prompter'
+import { PrompterProvider, WizardForm } from './wizardForm'
+
+/** Checks if the user response is valid (i.e. not undefined and not a control signal) */
+export function isValidResponse<T>(response: PromptResult<T>): response is T {
+    return response !== undefined && !isWizardControl(response)
+}
+
+type ObjectKeys<T> = {
+    [Property in keyof T]: T[Property] extends Record<string, unknown> ? Property : never
+}[keyof T]
+
+type NonObjectKeys<T> = {
+    [Property in keyof T]: T[Property] extends Record<string, unknown> ? never : Property
+}[keyof T]
+
+/**
+ * Reserved type. Currently makes all object-like fields required and everything else
+ * optional.
+ */
+export type WizardState<T> = {
+    [Property in ObjectKeys<T>]-?: T[Property] extends Record<string, unknown>
+        ? WizardState<Required<T[Property]>>
+        : never
+} & {
+    [Property in NonObjectKeys<T>]+?: T[Property] extends Record<string, unknown> ? never : T[Property]
+}
+
+// We use a symbol to safe-guard against collisions (alternatively this can be a class and use 'instanceof')
+const WIZARD_CONTROL = Symbol() // eslint-disable-line @typescript-eslint/naming-convention
+const makeControlString = (type: string) => `[WIZARD_CONTROL] ${type}`
+
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export const WIZARD_RETRY = {
+    id: WIZARD_CONTROL,
+    type: ControlSignal.Retry,
+    toString: () => makeControlString('Retry'),
+}
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export const WIZARD_BACK = { id: WIZARD_CONTROL, type: ControlSignal.Back, toString: () => makeControlString('Back') }
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export const WIZARD_SKIP = { id: WIZARD_CONTROL, type: ControlSignal.Skip, toString: () => makeControlString('Skip') }
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export const WIZARD_EXIT = { id: WIZARD_CONTROL, type: ControlSignal.Exit, toString: () => makeControlString('Exit') }
+
+/** Control signals allow for alterations of the normal wizard flow */
+export type WizardControl = typeof WIZARD_RETRY | typeof WIZARD_BACK | typeof WIZARD_EXIT | typeof WIZARD_SKIP
+
+export function isWizardControl(obj: any): obj is WizardControl {
+    return obj !== undefined && obj.id === WIZARD_CONTROL
+}
+
+export interface StepEstimator<T> {
+    (response: PromptResult<T>): number
+}
+
+// Persistent storage that exists on a per-property basis, side effects may occur here
+type StepCache = { picked?: any; stepOffset?: [number, number] } & { [key: string]: any }
+export type StateWithCache<TState, TProp> = TState & { stepCache: StepCache; estimator: StepEstimator<TProp> }
+
+export interface WizardOptions<TState> {
+    /** Optional {@link WizardForm} provided by the caller instead of the default. */
+    readonly initForm?: WizardForm<TState>
+    readonly initState?: Partial<TState>
+    /** Provides a way to apply inputs to Prompters as if the user has already responded */
+    readonly implicitState?: Partial<TState>
+    readonly exitPrompterProvider?: (state: TState) => Prompter<boolean>
+}
+
+/**
+ * A generic wizard that consumes data from a series of {@link Prompter prompters}. The 'form' public property
+ * exposes functionality to add prompters to the wizard with optional context, utilizing the {@link WizardForm}
+ * class. Wizards will modify a single property of their internal state with each prompt.
+ *
+ * Subclasses can override {@link init} if an "async constructor" is needed.
+ */
+export class Wizard<TState extends Partial<Record<keyof TState, unknown>>> {
+    protected readonly __form: WizardForm<TState>
+    protected readonly boundSteps: Map<string, StepFunction<TState>> = new Map()
+    protected stateController: StateMachineController<TState>
+    private _stepOffset: [number, number] = [0, 0]
+    private _exitStep?: StepFunction<TState>
+    /** Guards against accidental use of the Wizard before `init()`. */
+    private _ready: boolean
+
+    /** Checks that `init()` was performed (if it was defined). */
+    private assertReady() {
+        // Check for `false` explicity so that the base-class constructor can access `this._form`.
+        // We want to guard against confusion when implementing a subclass, not this base-class.
+        if (this._ready === false) {
+            throw Error('run() (or init()) must be called immediately after creating the Wizard')
+        }
+    }
+
+    /**
+     * The offset is applied to both the current step and total number of steps. Useful if the wizard is
+     * apart of some overarching flow.
+     */
+    public set stepOffset(offset: [number, number]) {
+        this._stepOffset = offset
+    }
+    public get currentStep(): number {
+        return this._stepOffset[0] + this.stateController.currentStep
+    }
+    public get totalSteps(): number {
+        return this._stepOffset[1] + this.stateController.totalSteps
+    }
+
+    protected get _form() {
+        this.assertReady()
+        return this.__form
+    }
+
+    public get form() {
+        return this._form.body
+    }
+
+    /** The internal wizard form with bound prompters. This can be applied to other wizards. */
+    public get boundForm() {
+        return this._form
+    }
+
+    public get initialState(): Readonly<Partial<TState>> | undefined {
+        return this.options.initState
+    }
+
+    private _estimator: ((state: TState) => number) | undefined
+    public set parentEstimator(estimator: (state: TState) => number) {
+        this._estimator = estimator
+    }
+
+    public constructor(protected readonly options: WizardOptions<TState> = {}) {
+        this.stateController = new StateMachineController(options.initState as TState)
+        this.__form = options.initForm ?? new WizardForm()
+        this._exitStep =
+            options.exitPrompterProvider !== undefined ? this.createExitStep(options.exitPrompterProvider) : undefined
+
+        // Subclass constructor logic should live in `init()`, if it exists.
+        this._ready = !this.init
+
+        if (typeof this.init === 'function') {
+            const _init = this.init.bind(this)
+            this.init = () => {
+                this._ready = true
+                return _init()
+            }
+        }
+    }
+
+    /**
+     * Optional, one-time, asynchronous setup for subclasses that need an "async constructor".
+     * Subclass setup logic must live in either init() _or_ a normal constructor, not both.
+     * Called by `run()` exactly once.
+     */
+    public async init?(): Promise<this>
+
+    private assignSteps(): void {
+        for (const prop of this._form.properties) {
+            const provider = this._form.getPrompterProvider(prop)
+            if (!this.boundSteps.has(prop) && provider !== undefined) {
+                this.boundSteps.set(prop, this.createBoundStep(prop, provider))
+            }
+        }
+    }
+
+    public async run(): Promise<TState | undefined> {
+        if (!this._ready && this.init) {
+            this._ready = true // Let init() use `this._form`.
+            await this.init()
+        }
+
+        this.assignSteps()
+        for (const step of this.resolveNextSteps((this.options.initState ?? {}) as TState)) {
+            this.stateController.addStep(step)
+        }
+
+        const outputState = await this.stateController.run()
+
+        return outputState !== undefined ? this._form.applyDefaults(outputState) : undefined
+    }
+
+    private createStepEstimator<TProp>(state: TState, prop: string): StepEstimator<TProp> {
+        state = _.cloneDeep(state)
+
+        return (response) => {
+            if (response !== undefined && !isValidResponse(response)) {
+                return 0
+            }
+
+            _.set(state, prop, response)
+            const estimate = this.resolveNextSteps(state).length
+            const parentEstimate = this._estimator !== undefined ? this._estimator(state) : 0
+            _.set(state, prop, undefined)
+
+            return estimate + parentEstimate
+        }
+    }
+
+    private createExitStep(provider: NonNullable<WizardOptions<TState>['exitPrompterProvider']>): StepFunction<TState> {
+        return async (state) => {
+            const prompter = provider(state)
+            prompter.setSteps(this.currentStep, this.totalSteps)
+            const didExit = await prompter.prompt()
+
+            return {
+                nextState: state,
+                controlSignal: didExit ? ControlSignal.Exit : ControlSignal.Back,
+            }
+        }
+    }
+
+    private createBoundStep<TProp>(prop: string, provider: PrompterProvider<TState, TProp>): StepFunction<TState> {
+        const stepCache: StepCache = {}
+
+        return async (state) => {
+            const stateWithCache = Object.assign(
+                { stepCache: stepCache, estimator: this.createStepEstimator(state, prop) },
+                this._form.applyDefaults(state)
+            )
+            const impliedResponse = _.get(this.options.implicitState ?? {}, prop)
+            const response = await this.promptUser(stateWithCache, provider, impliedResponse)
+
+            if (response === WIZARD_EXIT && this._exitStep !== undefined) {
+                return {
+                    nextState: state,
+                    nextSteps: [this._exitStep],
+                }
+            }
+
+            return {
+                nextState: isValidResponse(response) ? _.set(state, prop, response) : state,
+                nextSteps: this.resolveNextSteps(state),
+                controlSignal: isWizardControl(response) ? response.type : undefined,
+            }
+        }
+    }
+
+    protected resolveNextSteps(state: TState): Branch<TState> {
+        const nextSteps: Branch<TState> = []
+        const defaultState = this._form.applyDefaults(state)
+        for (const [targetProp, step] of this.boundSteps.entries()) {
+            if (
+                this._form.canShowProperty(targetProp, state, defaultState) &&
+                !this.stateController.containsStep(step)
+            ) {
+                nextSteps.push(step)
+            }
+        }
+        return nextSteps
+    }
+
+    private async promptUser<TProp>(
+        state: StateWithCache<TState, TProp>,
+        provider: PrompterProvider<TState, TProp>,
+        impliedResponse?: TProp
+    ): Promise<PromptResult<TProp>> {
+        const prompter = await provider(state as StateWithCache<WizardState<TState>, TProp>)
+
+        this._stepOffset = state.stepCache.stepOffset ?? this._stepOffset
+        state.stepCache.stepOffset = this._stepOffset
+        prompter.setSteps(this.currentStep, this.totalSteps)
+        prompter.setStepEstimator(state.estimator)
+
+        if (state.stepCache.picked !== undefined) {
+            prompter.recentItem = state.stepCache.picked
+        } else if (impliedResponse !== undefined) {
+            prompter.recentItem = impliedResponse
+        }
+
+        const answer = await prompter.prompt()
+
+        if (isValidResponse(answer)) {
+            state.stepCache.picked = prompter.recentItem
+        } else {
+            delete state.stepCache.stepOffset
+        }
+
+        this._stepOffset = [
+            this._stepOffset[0] + prompter.totalSteps - 1,
+            this._stepOffset[1] + prompter.totalSteps - 1,
+        ]
+
+        // Legacy code used 'undefined' to represent back, we will support the use-case
+        // but moving forward wizard implementations will explicity use 'WIZARD_BACK'
+        return answer ?? WIZARD_BACK
+    }
+}
diff --git a/src/shared/wizards/wizardForm.ts b/packages/core/src/shared/wizards/wizardForm.ts
similarity index 85%
rename from src/shared/wizards/wizardForm.ts
rename to packages/core/src/shared/wizards/wizardForm.ts
index d2df659d9fc..e4933bb1acf 100644
--- a/src/shared/wizards/wizardForm.ts
+++ b/packages/core/src/shared/wizards/wizardForm.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -8,7 +8,9 @@ import * as _ from 'lodash'
 import { StateWithCache, WizardState } from './wizard'
 import { ExpandWithObject } from '../utilities/tsUtils'
 
-export type PrompterProvider<TState, TProp> = (state: StateWithCache<WizardState<TState>, TProp>) => Prompter<TProp>
+export type PrompterProvider<TState, TProp> = (
+    state: StateWithCache<WizardState<TState>, TProp>
+) => Prompter<TProp> | Promise<Prompter<TProp>>
 
 type DefaultFunction<TState, TProp> = (state: WizardState<TState>) => TProp | undefined
 
@@ -23,7 +25,7 @@ interface ContextOptions<TState, TProp> {
      * in a single resolution step then they will be added in the order in which they were
      * bound.
      */
-    showWhen?: (state: WizardState<TState>) => boolean
+    showWhen?: (state: WizardState<TState>) => boolean | Promise<boolean>
     /**
      * Sets a default value to the target property. This default is applied to the current state
      * as long as the property has not been set.
@@ -39,10 +41,10 @@ interface ContextOptions<TState, TProp> {
      */
     relativeOrder?: number
 }
-interface FormElement<TProp, TState> {
+export interface FormElement<TProp, TState> {
     /**
-     * Binds a Prompter-provider to the specified property. The provider is called with the current Wizard
-     * state whenever the property is ready for input, and should return a Prompter object.
+     * Binds a property to a function (may be async), which is invoked with the current Wizard state
+     * when the property is presented for input. Must return a {@link Prompter} object.
      */
     bindPrompter(provider: PrompterProvider<TState, TProp>, options?: ContextOptions<TState, TProp>): void
     // TODO: potentially add options to this, or rethink how defaults should work
@@ -50,7 +52,7 @@ interface FormElement<TProp, TState> {
 }
 
 // These methods are only applicable to object-like elements
-interface ParentFormElement<TProp extends Record<string, any>, TState> {
+export interface ParentFormElement<TProp extends Record<string, any>, TState> {
     applyBoundForm(
         form: WizardForm<TProp>,
         options?: Pick<ContextOptions<TState, TProp>, 'showWhen' | 'requireParent'>
@@ -108,7 +110,7 @@ export class WizardForm<TState extends Partial<Record<keyof TState, unknown>>> {
     public applyDefaults(state: TState): TState {
         const defaultState = _.cloneDeep(state)
 
-        this.formData.forEach((opt, targetProp) => {
+        for (const [targetProp, opt] of this.formData.entries()) {
             const current = _.get(state, targetProp)
 
             if (!isAssigned(current) && opt.setDefault !== undefined && !checkParent(targetProp, state, opt)) {
@@ -117,7 +119,7 @@ export class WizardForm<TState extends Partial<Record<keyof TState, unknown>>> {
                     _.set(defaultState, targetProp, defaultValue)
                 }
             }
-        })
+        }
 
         return defaultState
     }
@@ -133,7 +135,11 @@ export class WizardForm<TState extends Partial<Record<keyof TState, unknown>>> {
         this.formData.set(key, { ...this.formData.get(key), ...element })
     }
 
-    public canShowProperty(prop: string, state: TState, defaultState: TState = this.applyDefaults(state)): boolean {
+    public canShowProperty(
+        prop: string,
+        state: TState,
+        defaultState: TState = this.applyDefaults(state)
+    ): boolean | Promise<boolean> {
         const current = _.get(state, prop)
         const options = this.formData.get(prop) ?? {}
 
@@ -141,8 +147,18 @@ export class WizardForm<TState extends Partial<Record<keyof TState, unknown>>> {
             return false
         }
 
-        if (options.showWhen !== undefined && !options.showWhen(defaultState as WizardState<TState>)) {
-            return false
+        if (options.showWhen !== undefined) {
+            const showStatus = options.showWhen(defaultState as WizardState<TState>)
+            if (showStatus instanceof Promise) {
+                return showStatus
+                    .then((result) => {
+                        return result
+                    })
+                    .catch(() => {
+                        return false // Default to not showing if there's an error
+                    })
+            }
+            return showStatus
         }
 
         return options.provider !== undefined
@@ -156,7 +172,7 @@ export class WizardForm<TState extends Partial<Record<keyof TState, unknown>>> {
         const wrappedElement: FormDataElement<TState, any> = {}
 
         if (element.provider !== undefined) {
-            wrappedElement.provider = state => {
+            wrappedElement.provider = (state) => {
                 const stateWithCache = Object.assign(_.get(state, prop, {}), {
                     stepCache: state.stepCache,
                     estimator: state.estimator,
@@ -167,7 +183,7 @@ export class WizardForm<TState extends Partial<Record<keyof TState, unknown>>> {
         }
 
         if (element.showWhen !== undefined || options?.showWhen !== undefined || options?.requireParent === true) {
-            wrappedElement.showWhen = state =>
+            wrappedElement.showWhen = (state) =>
                 (options?.requireParent !== true || _.get(state, prop) !== undefined) &&
                 (element.showWhen !== undefined ? element.showWhen!(_.get(state, prop, {})) : true) &&
                 (options?.showWhen !== undefined ? options.showWhen!(state) : true)
@@ -175,7 +191,7 @@ export class WizardForm<TState extends Partial<Record<keyof TState, unknown>>> {
 
         wrappedElement.setDefault =
             element.setDefault !== undefined
-                ? state =>
+                ? (state) =>
                       options?.requireParent !== true || _.get(state, prop) !== undefined
                           ? options?.showWhen === undefined || options.showWhen(state)
                               ? element.setDefault!(_.get(state, prop, {}))
@@ -196,10 +212,10 @@ export class WizardForm<TState extends Partial<Record<keyof TState, unknown>>> {
 
     private createApplyFormMethod<TProp extends Record<string, any>>(prop: string): ApplyBoundForm<TProp, TState> {
         return (form: WizardForm<TProp>, options?: ContextOptions<TState, TProp>) => {
-            form.formData.forEach((element, key) => {
+            for (const [key, element] of form.formData.entries()) {
                 // TODO: use an assert here to ensure that no elements are rewritten
                 this.applyElement(`${prop}.${key}`, this.convertElement(prop, element, options))
-            })
+            }
         }
     }
 
diff --git a/packages/core/src/ssmDocument/activation.ts b/packages/core/src/ssmDocument/activation.ts
new file mode 100644
index 00000000000..185051c2c4d
--- /dev/null
+++ b/packages/core/src/ssmDocument/activation.ts
@@ -0,0 +1,74 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { activate as activateSSMLanguageServer } from './ssm/ssmClient'
+import { AwsContext } from '../shared/awsContext'
+
+import { createSsmDocumentFromTemplate } from './commands/createDocumentFromTemplate'
+import { publishSSMDocument } from './commands/publishDocument'
+import { RegionProvider } from '../shared/regions/regionProvider'
+import { openDocumentItem, openDocumentItemJson, openDocumentItemYaml } from './commands/openDocumentItem'
+import { DocumentItemNode } from './explorer/documentItemNode'
+import { deleteDocument } from './commands/deleteDocument'
+import { DocumentItemNodeWriteable } from './explorer/documentItemNodeWriteable'
+import { updateDocumentVersion } from './commands/updateDocumentVersion'
+import { Commands } from '../shared/vscode/commands2'
+import * as constants from '../shared/constants'
+import { PerfLog } from '../shared/logger/perfLogger'
+
+// Activate SSM Document related functionality for the extension.
+export async function activate(
+    extensionContext: vscode.ExtensionContext,
+    awsContext: AwsContext,
+    regionProvider: RegionProvider,
+    outputChannel: vscode.OutputChannel
+): Promise<void> {
+    await registerSsmDocumentCommands(extensionContext, awsContext, regionProvider, outputChannel)
+
+    let onDidOpenSsmDoc: vscode.Disposable
+    // PERFORMANCE: Start the LSP client/server _only_ when the first SSM document is opened.
+    // eslint-disable-next-line prefer-const
+    onDidOpenSsmDoc = vscode.window.onDidChangeActiveTextEditor(async (e) => {
+        if (e?.document.languageId === constants.ssmJson || e?.document.languageId === constants.ssmYaml) {
+            const perflog = new PerfLog('ssmDocument: start LSP client/server')
+            await activateSSMLanguageServer(extensionContext)
+            perflog.done()
+            onDidOpenSsmDoc?.dispose() // Handler should only run once.
+        }
+    })
+    extensionContext.subscriptions.push(onDidOpenSsmDoc)
+}
+
+async function registerSsmDocumentCommands(
+    extensionContext: vscode.ExtensionContext,
+    awsContext: AwsContext,
+    regionProvider: RegionProvider,
+    outputChannel: vscode.OutputChannel
+): Promise<void> {
+    extensionContext.subscriptions.push(
+        Commands.register('aws.ssmDocument.createLocalDocument', async () => {
+            await createSsmDocumentFromTemplate(extensionContext)
+        }),
+        Commands.register('aws.ssmDocument.deleteDocument', async (node: DocumentItemNodeWriteable) => {
+            await deleteDocument(node)
+        }),
+        Commands.register('aws.ssmDocument.openLocalDocument', async (node: DocumentItemNode) => {
+            await openDocumentItem(node, awsContext)
+        }),
+        Commands.register('aws.ssmDocument.openLocalDocumentJson', async (node: DocumentItemNode) => {
+            await openDocumentItemJson(node, awsContext)
+        }),
+        Commands.register('aws.ssmDocument.openLocalDocumentYaml', async (node: DocumentItemNode) => {
+            await openDocumentItemYaml(node, awsContext)
+        }),
+        Commands.register('aws.ssmDocument.publishDocument', async () => {
+            await publishSSMDocument()
+        }),
+        Commands.register('aws.ssmDocument.updateDocumentVersion', async (node: DocumentItemNodeWriteable) => {
+            await updateDocumentVersion(node, awsContext)
+        })
+    )
+}
diff --git a/src/ssmDocument/commands/createDocumentFromTemplate.ts b/packages/core/src/ssmDocument/commands/createDocumentFromTemplate.ts
similarity index 91%
rename from src/ssmDocument/commands/createDocumentFromTemplate.ts
rename to packages/core/src/ssmDocument/commands/createDocumentFromTemplate.ts
index 417e938b1d0..418e5069c1e 100644
--- a/src/ssmDocument/commands/createDocumentFromTemplate.ts
+++ b/packages/core/src/ssmDocument/commands/createDocumentFromTemplate.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -8,8 +8,8 @@ const localize = nls.loadMessageBundle()
 
 import * as path from 'path'
 import * as vscode from 'vscode'
-import * as YAML from 'yaml'
-import { getLogger, Logger } from '../../shared/logger'
+import * as yaml from 'js-yaml'
+import { getLogger, Logger } from '../../shared/logger/logger'
 import * as picker from '../../shared/ui/picker'
 import { promptUserForDocumentFormat } from '../util/util'
 import { readFileAsString } from '../../shared/filesystemUtilities'
@@ -91,7 +91,7 @@ export async function createSsmDocumentFromTemplate(extensionContext: vscode.Ext
                 selectedDocumentFormat
             )
             if (textDocument !== undefined) {
-                vscode.window.showTextDocument(textDocument)
+                await vscode.window.showTextDocument(textDocument)
             } else {
                 result = 'Cancelled'
             }
@@ -99,7 +99,7 @@ export async function createSsmDocumentFromTemplate(extensionContext: vscode.Ext
     } catch (err) {
         result = 'Failed'
         logger.error(err as Error)
-        vscode.window.showErrorMessage(
+        void vscode.window.showErrorMessage(
             localize(
                 'AWS.message.error.ssmDocument.openTextDocumentFromSelection',
                 'There was an error creating the SSM Document from the template, check log for details.'
@@ -114,9 +114,9 @@ export async function createSsmDocumentFromTemplate(extensionContext: vscode.Ext
     }
 }
 
-function yamlToJson(yaml: string): string {
-    const jsonObject = YAML.parse(yaml)
-    return JSON.stringify(jsonObject, undefined, '\t')
+function yamlToJson(yamlStr: string): string {
+    const jsonObject = yaml.load(yamlStr, { schema: yaml.JSON_SCHEMA })
+    return JSON.stringify(jsonObject, undefined, 4)
 }
 
 async function openTextDocumentFromSelection(
diff --git a/packages/core/src/ssmDocument/commands/deleteDocument.ts b/packages/core/src/ssmDocument/commands/deleteDocument.ts
new file mode 100644
index 00000000000..9ff836c4853
--- /dev/null
+++ b/packages/core/src/ssmDocument/commands/deleteDocument.ts
@@ -0,0 +1,78 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as vscode from 'vscode'
+import { getLogger, Logger } from '../../shared/logger/logger'
+import { DocumentItemNodeWriteable } from '../explorer/documentItemNodeWriteable'
+import { RegistryItemNode } from '../explorer/registryItemNode'
+import { showConfirmationMessage } from '../util/util'
+import * as localizedText from '../../shared/localizedText'
+import { showViewLogsMessage } from '../../shared/utilities/messages'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { Result } from '../../shared/telemetry/telemetry'
+
+export async function deleteDocument(node: DocumentItemNodeWriteable) {
+    const logger: Logger = getLogger()
+
+    let result: Result = 'Succeeded'
+    const isConfirmed = await showConfirmationMessage({
+        prompt: localize(
+            'AWS.ssmDocument.deleteDocument.prompt',
+            'Are you sure you want to delete document {0}?',
+            node.documentName
+        ),
+        confirm: localizedText.localizedDelete,
+        cancel: localizedText.cancel,
+    })
+    if (!isConfirmed) {
+        logger.info('DeleteDocument cancelled')
+        telemetry.ssm_deleteDocument.emit({ result: 'Cancelled' })
+        return
+    }
+
+    try {
+        const deleteDocumentResult = await node.deleteDocument()
+        if (!deleteDocumentResult) {
+            result = 'Failed'
+            logger.error(`Delete document failed: Empty document name`)
+            void vscode.window.showErrorMessage(
+                localize(
+                    'AWS.message.info.ssmDocument.deleteDocument.failed.empty_document_name',
+                    'Delete document failed: Empty document name'
+                )
+            )
+        } else {
+            logger.info(`Deleted Systems Manager Document: ${node.documentName}`)
+            void vscode.window.showInformationMessage(
+                localize(
+                    'AWS.message.info.ssmDocument.deleteDocument.delete_success',
+                    'Deleted document: {0}',
+                    node.documentName
+                )
+            )
+            await refreshNode(node.parent)
+        }
+    } catch (err) {
+        result = 'Failed'
+        const error = err as Error
+        logger.error('Error on deleting document: %O', error)
+        void showViewLogsMessage(
+            localize(
+                'AWS.message.error.ssmDocument.deleteDocument.could_not_delete',
+                'Could not delete document {0}.',
+                error.message
+            )
+        )
+    } finally {
+        telemetry.ssm_deleteDocument.emit({ result: result })
+    }
+}
+
+async function refreshNode(node: RegistryItemNode): Promise<void> {
+    return vscode.commands.executeCommand('aws.refreshAwsExplorerNode', node)
+}
diff --git a/src/ssmDocument/commands/openDocumentItem.ts b/packages/core/src/ssmDocument/commands/openDocumentItem.ts
similarity index 81%
rename from src/ssmDocument/commands/openDocumentItem.ts
rename to packages/core/src/ssmDocument/commands/openDocumentItem.ts
index eaa3d37259d..07832d0b560 100644
--- a/src/ssmDocument/commands/openDocumentItem.ts
+++ b/packages/core/src/ssmDocument/commands/openDocumentItem.ts
@@ -1,22 +1,22 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as nls from 'vscode-nls'
 const localize = nls.loadMessageBundle()
 
-import { SSM } from 'aws-sdk'
+import { DocumentFormat, DocumentVersionInfo } from '@aws-sdk/client-ssm'
 import * as vscode from 'vscode'
 import { DocumentItemNode } from '../explorer/documentItemNode'
 import { AwsContext } from '../../shared/awsContext'
-import { getLogger, Logger } from '../../shared/logger'
+import { getLogger, Logger } from '../../shared/logger/logger'
 import * as picker from '../../shared/ui/picker'
 import { showViewLogsMessage } from '../../shared/utilities/messages'
 import { telemetry } from '../../shared/telemetry/telemetry'
 import { Result } from '../../shared/telemetry/telemetry'
 
-export async function openDocumentItem(node: DocumentItemNode, awsContext: AwsContext, format?: string) {
+export async function openDocumentItem(node: DocumentItemNode, awsContext: AwsContext, format?: DocumentFormat) {
     const logger: Logger = getLogger()
 
     let result: Result = 'Succeeded'
@@ -27,7 +27,7 @@ export async function openDocumentItem(node: DocumentItemNode, awsContext: AwsCo
         const versions = await node.listSchemaVersion()
         if (versions.length > 1) {
             documentVersion = await promptUserforDocumentVersion(versions)
-            if (documentVersion == undefined) {
+            if (documentVersion === undefined) {
                 // user pressed escape and didn't select a version
                 return
             }
@@ -44,14 +44,13 @@ export async function openDocumentItem(node: DocumentItemNode, awsContext: AwsCo
     } catch (err) {
         result = 'Failed'
         const error = err as Error
-        logger.error('Error on opening document: %0', error)
-        showViewLogsMessage(
+        logger.error('Error on opening document: %O', error)
+        void showViewLogsMessage(
             localize(
                 'AWS.message.error.ssmDocument.openDocument.could_not_open',
                 'Could not fetch document: {0}',
                 node.documentName
-            ),
-            vscode.window
+            )
         )
     } finally {
         telemetry.ssm_openDocument.emit({ result: result })
@@ -59,24 +58,24 @@ export async function openDocumentItem(node: DocumentItemNode, awsContext: AwsCo
 }
 
 export async function openDocumentItemJson(node: DocumentItemNode, awsContext: AwsContext) {
-    openDocumentItem(node, awsContext, 'JSON')
+    await openDocumentItem(node, awsContext, 'JSON')
 }
 
 export async function openDocumentItemYaml(node: DocumentItemNode, awsContext: AwsContext) {
-    openDocumentItem(node, awsContext, 'YAML')
+    await openDocumentItem(node, awsContext, 'YAML')
 }
 
-async function promptUserforDocumentVersion(versions: SSM.Types.DocumentVersionInfo[]): Promise<string | undefined> {
+async function promptUserforDocumentVersion(versions: DocumentVersionInfo[]): Promise<string | undefined> {
     // Prompt user to pick document version
     const quickPickItems: vscode.QuickPickItem[] = []
-    versions.forEach(version => {
+    for (const version of versions) {
         if (version.DocumentVersion) {
             quickPickItems.push({
                 label: version.DocumentVersion,
                 description: `${version.IsDefaultVersion ? 'Default' : ''}`,
             })
         }
-    })
+    }
 
     if (quickPickItems.length > 1) {
         const versionPick = picker.createQuickPick({
diff --git a/packages/core/src/ssmDocument/commands/publishDocument.ts b/packages/core/src/ssmDocument/commands/publishDocument.ts
new file mode 100644
index 00000000000..36a3145b952
--- /dev/null
+++ b/packages/core/src/ssmDocument/commands/publishDocument.ts
@@ -0,0 +1,164 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { CreateDocumentRequest, UpdateDocumentRequest } from '@aws-sdk/client-ssm'
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+import { DefaultSsmDocumentClient, SsmDocumentClient } from '../../shared/clients/ssmDocumentClient'
+import { ssmJson, ssmYaml } from '../../shared/constants'
+
+import * as localizedText from '../../shared/localizedText'
+import { getLogger, Logger } from '../../shared/logger/logger'
+import {
+    PublishSSMDocumentAction,
+    PublishSSMDocumentWizard,
+    PublishSSMDocumentWizardResponse,
+} from '../wizards/publishDocumentWizard'
+import { showConfirmationMessage } from '../util/util'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { Result, SsmOperation } from '../../shared/telemetry/telemetry'
+
+export async function publishSSMDocument(): Promise<void> {
+    const logger: Logger = getLogger()
+
+    const textDocument = vscode.window.activeTextEditor?.document
+    if (!textDocument) {
+        const errorMsg = 'Could not get active text editor for local Systems Manager Document definition'
+        logger.error(errorMsg)
+        void vscode.window.showErrorMessage(
+            localize(
+                'AWS.message.error.ssmDocument.publishDocument.could_not_open',
+                'Could not get active text editor for local Systems Manager Document definition'
+            )
+        )
+        return
+    }
+
+    if (textDocument.languageId !== ssmJson && textDocument.languageId !== ssmYaml) {
+        const supportedFormats = [ssmJson, ssmYaml]
+        const errorMsg = 'Current editor language does not match the supported formats: ' + supportedFormats.join(', ')
+        logger.error(errorMsg)
+        void vscode.window.showErrorMessage(
+            localize(
+                'AWS.message.error.ssmDocument.publishDocument.invalid_format',
+                'Current editor language does not match the supported formats: {0}',
+                supportedFormats.join(', ')
+            )
+        )
+        return
+    }
+
+    try {
+        const response = await new PublishSSMDocumentWizard().run()
+        if (response?.action === PublishSSMDocumentAction.QuickCreate) {
+            await createDocument(response, textDocument)
+        } else if (response?.action === PublishSSMDocumentAction.QuickUpdate) {
+            await updateDocument(response, textDocument)
+        }
+    } catch (err) {
+        logger.error(err as Error)
+    }
+}
+
+export async function createDocument(
+    wizardResponse: PublishSSMDocumentWizardResponse,
+    textDocument: vscode.TextDocument,
+    client: SsmDocumentClient = new DefaultSsmDocumentClient(wizardResponse.region)
+) {
+    let result: Result = 'Succeeded'
+    const ssmOperation = wizardResponse.action as SsmOperation
+
+    const logger: Logger = getLogger()
+    logger.info(`Creating Systems Manager Document '${wizardResponse.name}'`)
+
+    try {
+        const request: CreateDocumentRequest = {
+            Content: textDocument.getText(),
+            Name: wizardResponse.name,
+            DocumentType: wizardResponse.documentType,
+            DocumentFormat: textDocument.languageId === ssmYaml ? 'YAML' : 'JSON',
+        }
+
+        const createResult = await client.createDocument(request)
+        logger.info(`Created Systems Manager Document: %O`, createResult.DocumentDescription)
+        void vscode.window.showInformationMessage(`Created Systems Manager Document: ${wizardResponse.name}`)
+    } catch (err) {
+        const error = err as Error
+        logger.error(`Failed to create Systems Manager Document "${wizardResponse.name}": %s`, error.message)
+        result = 'Failed'
+        void vscode.window.showErrorMessage(
+            `Failed to create Systems Manager Document '${wizardResponse.name}'. \n${error.message}`
+        )
+    } finally {
+        telemetry.ssm_publishDocument.emit({ result, ssmOperation })
+    }
+}
+
+export async function updateDocument(
+    wizardResponse: PublishSSMDocumentWizardResponse,
+    textDocument: vscode.TextDocument,
+    client: SsmDocumentClient = new DefaultSsmDocumentClient(wizardResponse.region)
+) {
+    let result: Result = 'Succeeded'
+    const ssmOperation = wizardResponse.action as SsmOperation
+
+    const logger: Logger = getLogger()
+    logger.info(`Updating Systems Manager Document '${wizardResponse.name}'`)
+
+    try {
+        const request: UpdateDocumentRequest = {
+            Content: textDocument.getText(),
+            Name: wizardResponse.name,
+            DocumentVersion: '$LATEST',
+            DocumentFormat: textDocument.languageId === ssmYaml ? 'YAML' : 'JSON',
+        }
+
+        const updateResult = await client.updateDocument(request)
+
+        logger.info(`Updated Systems Manager Document: %O`, updateResult.DocumentDescription)
+        void vscode.window.showInformationMessage(`Updated Systems Manager Document: ${wizardResponse.name}`)
+
+        const isConfirmed = await showConfirmationMessage({
+            prompt: localize(
+                'AWS.ssmDocument.publishDocument.updateVersion.prompt',
+                'Would you like to make this the default version for {0}?',
+                wizardResponse.name
+            ),
+            confirm: localizedText.yes,
+            cancel: localizedText.no,
+        })
+
+        if (!isConfirmed) {
+            logger.info('Declined update default version on update document success.')
+        } else {
+            try {
+                const documentVersion: string | undefined = updateResult.DocumentDescription?.DocumentVersion
+                if (documentVersion !== undefined) {
+                    await client.updateDocumentVersion(wizardResponse.name, documentVersion)
+                    logger.info('Updated Systems Manager Document default version')
+                    void vscode.window.showInformationMessage('Updated Systems Manager Document default version')
+                }
+            } catch (err) {
+                logger.error(
+                    `Failed to update Systems Manager Document default version for "${wizardResponse.name}": %s`,
+                    (err as Error).message
+                )
+                void vscode.window.showErrorMessage(
+                    `Failed to update Systems Manager Document default version for: ${wizardResponse.name}`
+                )
+            }
+        }
+    } catch (err) {
+        const error = err as Error
+        logger.error(`Failed to update Systems Manager Document '${wizardResponse.name}'. %0`, error)
+        result = 'Failed'
+        void vscode.window.showErrorMessage(
+            `Failed to update Systems Manager Document '${wizardResponse.name}'. \n${error.message}`
+        )
+    } finally {
+        telemetry.ssm_publishDocument.emit({ result, ssmOperation })
+    }
+}
diff --git a/src/ssmDocument/commands/updateDocumentVersion.ts b/packages/core/src/ssmDocument/commands/updateDocumentVersion.ts
similarity index 85%
rename from src/ssmDocument/commands/updateDocumentVersion.ts
rename to packages/core/src/ssmDocument/commands/updateDocumentVersion.ts
index fdb9f36d429..2574ed2f70d 100644
--- a/src/ssmDocument/commands/updateDocumentVersion.ts
+++ b/packages/core/src/ssmDocument/commands/updateDocumentVersion.ts
@@ -1,15 +1,15 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as nls from 'vscode-nls'
 const localize = nls.loadMessageBundle()
 
-import { SSM } from 'aws-sdk'
+import { DocumentVersionInfo } from '@aws-sdk/client-ssm'
 import * as vscode from 'vscode'
 import { AwsContext } from '../../shared/awsContext'
-import { getLogger, Logger } from '../../shared/logger'
+import { getLogger, Logger } from '../../shared/logger/logger'
 import * as picker from '../../shared/ui/picker'
 import { DocumentItemNodeWriteable } from '../explorer/documentItemNodeWriteable'
 import { showViewLogsMessage } from '../../shared/utilities/messages'
@@ -32,7 +32,7 @@ export async function updateDocumentVersion(node: DocumentItemNodeWriteable, aws
                 if (!updateDocumentResult) {
                     result = 'Failed'
                     logger.error(`Update document version failed: empty document version`)
-                    vscode.window.showErrorMessage(
+                    void vscode.window.showErrorMessage(
                         localize(
                             'AWS.message.info.ssmDocument.updateDocumentVersion.failed.emptyversion',
                             'ould not update document {0} default version. An empty version was provided.',
@@ -40,7 +40,7 @@ export async function updateDocumentVersion(node: DocumentItemNodeWriteable, aws
                         )
                     )
                 } else {
-                    vscode.window.showInformationMessage(
+                    void vscode.window.showInformationMessage(
                         localize(
                             'AWS.message.info.ssmDocument.updateDocumentVersion.success',
                             'Updated document {0} default version to {1}',
@@ -52,7 +52,7 @@ export async function updateDocumentVersion(node: DocumentItemNodeWriteable, aws
             }
         } else {
             result = 'Failed'
-            vscode.window.showErrorMessage(
+            void vscode.window.showErrorMessage(
                 localize(
                     'AWS.message.error.ssmDocument.updateDocumentVersion.does_not_own',
                     'Could not update document {0} default version. The current account does not have ownership of this document.',
@@ -63,31 +63,30 @@ export async function updateDocumentVersion(node: DocumentItemNodeWriteable, aws
     } catch (err) {
         result = 'Failed'
         const error = err as Error
-        showViewLogsMessage(
+        void showViewLogsMessage(
             localize(
                 'AWS.message.error.ssmDocument.updateDocumentVersion.could_not_update_version',
                 'Could not update default version for: {0}',
                 node.documentName
-            ),
-            vscode.window
+            )
         )
-        logger.error('Error on updating document version: %0', error)
+        logger.error('Error on updating document version: %O', error)
     } finally {
         telemetry.ssm_updateDocumentVersion.emit({ result: result })
     }
 }
 
-async function promptUserforDocumentVersion(versions: SSM.Types.DocumentVersionInfo[]): Promise<string | undefined> {
+async function promptUserforDocumentVersion(versions: DocumentVersionInfo[]): Promise<string | undefined> {
     // Prompt user to pick document version
     const quickPickItems: vscode.QuickPickItem[] = []
-    versions.forEach(version => {
+    for (const version of versions) {
         if (version.DocumentVersion) {
             quickPickItems.push({
                 label: version.DocumentVersion,
                 description: `${version.IsDefaultVersion ? 'Default' : ''}`,
             })
         }
-    })
+    }
 
     if (quickPickItems.length > 1) {
         const versionPick = picker.createQuickPick({
@@ -110,7 +109,7 @@ async function promptUserforDocumentVersion(versions: SSM.Types.DocumentVersionI
         // User pressed escape and didn't select a template
         return versionSelection?.label
     } else {
-        vscode.window.showInformationMessage(
+        void vscode.window.showInformationMessage(
             localize(
                 'AWS.message.info.ssmDocument.updateDocumentVersion.no_other_versions',
                 'Selected document has only one version. Unable to change default version.'
diff --git a/src/ssmDocument/explorer/documentItemNode.ts b/packages/core/src/ssmDocument/explorer/documentItemNode.ts
similarity index 78%
rename from src/ssmDocument/explorer/documentItemNode.ts
rename to packages/core/src/ssmDocument/explorer/documentItemNode.ts
index f8f7d97893d..ee17e53d41f 100644
--- a/src/ssmDocument/explorer/documentItemNode.ts
+++ b/packages/core/src/ssmDocument/explorer/documentItemNode.ts
@@ -1,10 +1,9 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { SSM } from 'aws-sdk'
-
+import { DocumentFormat, DocumentIdentifier, DocumentVersionInfo, GetDocumentResult } from '@aws-sdk/client-ssm'
 import { SsmDocumentClient } from '../../shared/clients/ssmDocumentClient'
 import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
 
@@ -13,7 +12,7 @@ import { getIcon } from '../../shared/icons'
 
 export class DocumentItemNode extends AWSTreeNodeBase {
     public constructor(
-        private documentItem: SSM.Types.DocumentIdentifier,
+        private documentItem: DocumentIdentifier,
         public readonly client: SsmDocumentClient,
         public override readonly regionCode: string
     ) {
@@ -23,7 +22,7 @@ export class DocumentItemNode extends AWSTreeNodeBase {
         this.iconPath = getIcon('vscode-file')
     }
 
-    public update(documentItem: SSM.Types.DocumentIdentifier): void {
+    public update(documentItem: DocumentIdentifier): void {
         this.documentItem = documentItem
         this.label = this.documentName
     }
@@ -38,13 +37,13 @@ export class DocumentItemNode extends AWSTreeNodeBase {
 
     public async getDocumentContent(
         documentVersion?: string,
-        documentFormat?: string
-    ): Promise<SSM.Types.GetDocumentResult> {
+        documentFormat?: DocumentFormat
+    ): Promise<GetDocumentResult> {
         if (!this.documentName || !this.documentName.length) {
             return Promise.resolve({})
         }
 
-        let resolvedDocumentFormat: string | undefined
+        let resolvedDocumentFormat: DocumentFormat | undefined
 
         if (documentFormat === undefined) {
             // retrieves the document format from the service
@@ -61,7 +60,7 @@ export class DocumentItemNode extends AWSTreeNodeBase {
         )
     }
 
-    public async listSchemaVersion(): Promise<SSM.Types.DocumentVersionInfo[]> {
+    public async listSchemaVersion(): Promise<DocumentVersionInfo[]> {
         return await toArrayAsync(this.client.listDocumentVersions(this.documentName))
     }
 }
diff --git a/packages/core/src/ssmDocument/explorer/documentItemNodeWriteable.ts b/packages/core/src/ssmDocument/explorer/documentItemNodeWriteable.ts
new file mode 100644
index 00000000000..4c2ffd6e813
--- /dev/null
+++ b/packages/core/src/ssmDocument/explorer/documentItemNodeWriteable.ts
@@ -0,0 +1,37 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { DeleteDocumentResult, DocumentIdentifier, UpdateDocumentDefaultVersionResult } from '@aws-sdk/client-ssm'
+import { RegistryItemNode } from './registryItemNode'
+import { SsmDocumentClient } from '../../shared/clients/ssmDocumentClient'
+import { DocumentItemNode } from './documentItemNode'
+
+export class DocumentItemNodeWriteable extends DocumentItemNode {
+    public constructor(
+        documentItem: DocumentIdentifier,
+        public override readonly client: SsmDocumentClient,
+        public override readonly regionCode: string,
+        public readonly parent: RegistryItemNode
+    ) {
+        super(documentItem, client, regionCode)
+        this.contextValue = 'awsDocumentItemNodeWriteable'
+        this.parent = parent
+    }
+
+    public async deleteDocument(): Promise<DeleteDocumentResult> {
+        if (!this.documentName || !this.documentName.length) {
+            return Promise.resolve({})
+        }
+
+        return await this.client.deleteDocument(this.documentName)
+    }
+
+    public async updateDocumentVersion(documentVersion?: string): Promise<UpdateDocumentDefaultVersionResult> {
+        if (!documentVersion || !documentVersion.length) {
+            return Promise.resolve({})
+        }
+        return await this.client.updateDocumentVersion(this.documentName, documentVersion)
+    }
+}
diff --git a/src/ssmDocument/explorer/documentTypeNode.ts b/packages/core/src/ssmDocument/explorer/documentTypeNode.ts
similarity index 90%
rename from src/ssmDocument/explorer/documentTypeNode.ts
rename to packages/core/src/ssmDocument/explorer/documentTypeNode.ts
index feebfd66a0c..811af28756d 100644
--- a/src/ssmDocument/explorer/documentTypeNode.ts
+++ b/packages/core/src/ssmDocument/explorer/documentTypeNode.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -60,8 +60,8 @@ export class DocumentTypeNode extends AWSTreeNodeBase {
         updateInPlace(
             this.registryNodes,
             this.childRegistryNames,
-            key => this.registryNodes.get(key)!.update(key),
-            key => new RegistryItemNode(this.regionCode, key, this.documentType, this.client)
+            (key) => this.registryNodes.get(key)!.update(key),
+            (key) => new RegistryItemNode(this.regionCode, key, this.documentType, this.client)
         )
     }
 }
diff --git a/packages/core/src/ssmDocument/explorer/registryItemNode.ts b/packages/core/src/ssmDocument/explorer/registryItemNode.ts
new file mode 100644
index 00000000000..dae0771f67d
--- /dev/null
+++ b/packages/core/src/ssmDocument/explorer/registryItemNode.ts
@@ -0,0 +1,121 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import { DocumentIdentifier, ListDocumentsRequest } from '@aws-sdk/client-ssm'
+import * as vscode from 'vscode'
+
+import { DefaultSsmDocumentClient, SsmDocumentClient } from '../../shared/clients/ssmDocumentClient'
+
+import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
+import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
+import { makeChildrenNodes } from '../../shared/treeview/utils'
+import { toArrayAsync, updateInPlace } from '../../shared/utilities/collectionUtils'
+import { DocumentItemNode } from './documentItemNode'
+import { DocumentItemNodeWriteable } from './documentItemNodeWriteable'
+
+export const amazonRegistryName = localize('AWS.explorerNode.registry.name.amazon', 'Owned by Amazon')
+export const userRegistryName = localize('AWS.explorerNode.registry.name.self', 'Owned by me')
+export const sharedRegistryName = localize('AWS.explorerNode.registry.name.shared', 'Shared with me')
+
+export class RegistryItemNode extends AWSTreeNodeBase {
+    private readonly documentNodes: Map<string, DocumentItemNode>
+
+    public constructor(
+        public override readonly regionCode: string,
+        public registryName: string,
+        readonly documentType: string,
+        private readonly client = new DefaultSsmDocumentClient(regionCode)
+    ) {
+        super('', vscode.TreeItemCollapsibleState.Collapsed)
+
+        this.setLabel()
+
+        this.documentNodes = new Map<string, DocumentItemNode>()
+    }
+
+    private setLabel() {
+        this.label = this.registryName
+        this.iconPath = ''
+    }
+
+    public update(registryName: string): void {
+        this.registryName = registryName
+        this.setLabel()
+    }
+
+    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
+        return await makeChildrenNodes({
+            getChildNodes: async () => {
+                await this.updateChildren()
+
+                return [...this.documentNodes.values()]
+            },
+            getNoChildrenPlaceholderNode: async () =>
+                new PlaceholderNode(
+                    this,
+                    localize('AWS.explorerNode.documentType.noSsmDocument', `[No documents found]`)
+                ),
+            sort: (nodeA, nodeB) => nodeA.documentName.localeCompare(nodeB.documentName),
+        })
+    }
+
+    private async getDocumentByOwner(client: SsmDocumentClient): Promise<DocumentIdentifier[]> {
+        const request: ListDocumentsRequest = {
+            Filters: [
+                {
+                    Key: 'DocumentType',
+                    Values: [this.documentType],
+                },
+            ],
+        }
+
+        if (this.registryName === userRegistryName) {
+            request.Filters?.push({
+                Key: 'Owner',
+                Values: ['Self'],
+            })
+        } else if (this.registryName === sharedRegistryName) {
+            request.Filters?.push({
+                Key: 'Owner',
+                Values: ['Private'],
+            })
+        } else if (this.registryName === amazonRegistryName) {
+            request.Filters?.push({
+                Key: 'Owner',
+                Values: ['Amazon'],
+            })
+        }
+
+        return toArrayAsync(client.listDocuments(request))
+    }
+
+    public async updateChildren(): Promise<void> {
+        const documents = new Map<string, DocumentIdentifier>()
+
+        const docs = await this.getDocumentByOwner(this.client)
+        for (const doc of docs) {
+            documents.set(doc.Name!, doc)
+        }
+
+        if (this.registryName === userRegistryName) {
+            updateInPlace(
+                this.documentNodes,
+                documents.keys(),
+                (key) => this.documentNodes.get(key)!.update(documents.get(key)!),
+                (key) => new DocumentItemNodeWriteable(documents.get(key)!, this.client, this.regionCode, this)
+            )
+        } else {
+            updateInPlace(
+                this.documentNodes,
+                documents.keys(),
+                (key) => this.documentNodes.get(key)!.update(documents.get(key)!),
+                (key) => new DocumentItemNode(documents.get(key)!, this.client, this.regionCode)
+            )
+        }
+    }
+}
diff --git a/src/ssmDocument/explorer/ssmDocumentNode.ts b/packages/core/src/ssmDocument/explorer/ssmDocumentNode.ts
similarity index 89%
rename from src/ssmDocument/explorer/ssmDocumentNode.ts
rename to packages/core/src/ssmDocument/explorer/ssmDocumentNode.ts
index 1e4cb95ead8..d0560630e5b 100644
--- a/src/ssmDocument/explorer/ssmDocumentNode.ts
+++ b/packages/core/src/ssmDocument/explorer/ssmDocumentNode.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -49,8 +49,8 @@ export class SsmDocumentNode extends AWSTreeNodeBase {
         updateInPlace(
             this.documentTypeNodes,
             documentTypes,
-            key => this.documentTypeNodes.get(key)!.update(key),
-            key => new DocumentTypeNode(this.regionCode, key, this.client)
+            (key) => this.documentTypeNodes.get(key)!.update(key),
+            (key) => new DocumentTypeNode(this.regionCode, key, this.client)
         )
     }
 }
diff --git a/src/ssmDocument/ssm/ssmClient.ts b/packages/core/src/ssmDocument/ssm/ssmClient.ts
similarity index 84%
rename from src/ssmDocument/ssm/ssmClient.ts
rename to packages/core/src/ssmDocument/ssm/ssmClient.ts
index ddb88038373..1fce41b2cea 100644
--- a/src/ssmDocument/ssm/ssmClient.ts
+++ b/packages/core/src/ssmDocument/ssm/ssmClient.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -13,18 +13,10 @@ const localize = nls.loadMessageBundle()
 
 import { ExtensionContext, LanguageConfiguration, languages, window, workspace } from 'vscode'
 
-import {
-    DidChangeConfigurationNotification,
-    LanguageClient,
-    LanguageClientOptions,
-    NotificationType,
-    ServerOptions,
-    TransportKind,
-} from 'vscode-languageclient'
-
-namespace ResultLimitReachedNotification {
-    export const type: NotificationType<string, any> = new NotificationType('ssm/resultLimitReached')
-}
+import { DidChangeConfigurationNotification, LanguageClientOptions, NotificationType } from 'vscode-languageclient'
+import { ServerOptions, TransportKind, LanguageClient } from 'vscode-languageclient/node'
+
+export const ResultLimitReached: NotificationType<string> = new NotificationType('ssm/resultLimitReached')
 
 const jsonLanguageConfiguration: LanguageConfiguration = {
     wordPattern: /("(?:[^\\\"]*(?:\\.)?)*"?)|[^\s{}\[\],:]+/,
@@ -53,6 +45,9 @@ async function getLanguageServerDebuggerPort(extensionContext: ExtensionContext)
     return getPortPromise({ port: port })
 }
 
+/**
+ * Starts the SSM Documents LSP client/server and creates related resources (vscode `OutputChannel`).
+ */
 export async function activate(extensionContext: ExtensionContext) {
     const toDispose = extensionContext.subscriptions
 
@@ -101,21 +96,21 @@ export async function activate(extensionContext: ExtensionContext) {
     // Create the language client and start the client.
     const client = new LanguageClient(
         'ssm',
-        localize('ssm.server.name', 'SSM Document Language Server'),
+        localize('ssm.server.name', 'AWS: SSM Document Language Server'),
         serverOptions,
         clientOptions
     )
     client.registerProposedFeatures()
 
-    const disposable = client.start()
-    toDispose.push(disposable)
+    void client.start()
+    toDispose.push(client)
 
     languages.setLanguageConfiguration('ssm-json', jsonLanguageConfiguration)
     languages.setLanguageConfiguration('ssm-yaml', yamlLanguageConfiguration)
 
-    return client.onReady().then(() => {
-        client.onNotification(ResultLimitReachedNotification.type, message => {
-            window.showInformationMessage(
+    return client.start().then(() => {
+        client.onNotification(ResultLimitReached, (message: any) => {
+            void window.showInformationMessage(
                 `${message}\nUse setting 'aws.ssmDocument.ssm.maxItemsComputed' to configure the limit.`
             )
         })
diff --git a/packages/core/src/ssmDocument/util/util.ts b/packages/core/src/ssmDocument/util/util.ts
new file mode 100644
index 00000000000..967cc902e28
--- /dev/null
+++ b/packages/core/src/ssmDocument/util/util.ts
@@ -0,0 +1,62 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as vscode from 'vscode'
+import * as picker from '../../shared/ui/picker'
+
+export async function promptUserForDocumentFormat(
+    formats: string[],
+    params?: { step?: number; totalSteps?: number }
+): Promise<string | undefined> {
+    // Prompt user to pick document format
+    const quickPickItems: vscode.QuickPickItem[] = formats.map((format) => {
+        return {
+            label: format,
+            description: `Download document as ${format}`,
+        }
+    })
+
+    const formatPick = picker.createQuickPick({
+        options: {
+            ignoreFocusOut: true,
+            title: localize('AWS.message.prompt.selectSsmDocumentFormat.placeholder', 'Select a document format'),
+            step: params?.step,
+            totalSteps: params?.totalSteps,
+        },
+        items: quickPickItems,
+    })
+
+    const formatChoices = await picker.promptUser({
+        picker: formatPick,
+    })
+
+    const formatSelection = picker.verifySinglePickerOutput(formatChoices)
+
+    // User pressed escape and didn't select a template
+    if (formatSelection === undefined) {
+        return undefined
+    }
+
+    return formatSelection.label
+}
+
+export async function showConfirmationMessage({
+    prompt,
+    confirm,
+    cancel,
+}: {
+    prompt: string
+    confirm: string
+    cancel: string
+}): Promise<boolean> {
+    const confirmItem: vscode.MessageItem = { title: confirm }
+    const cancelItem: vscode.MessageItem = { title: cancel, isCloseAffordance: true }
+
+    const selection = await vscode.window.showWarningMessage(prompt, { modal: true }, confirmItem, cancelItem)
+    return selection === confirmItem
+}
diff --git a/src/ssmDocument/util/validateDocumentName.ts b/packages/core/src/ssmDocument/util/validateDocumentName.ts
similarity index 94%
rename from src/ssmDocument/util/validateDocumentName.ts
rename to packages/core/src/ssmDocument/util/validateDocumentName.ts
index 51bfe128c30..8c2d39748a9 100644
--- a/src/ssmDocument/util/validateDocumentName.ts
+++ b/packages/core/src/ssmDocument/util/validateDocumentName.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/src/ssmDocument/wizards/publishDocumentWizard.ts b/packages/core/src/ssmDocument/wizards/publishDocumentWizard.ts
similarity index 91%
rename from src/ssmDocument/wizards/publishDocumentWizard.ts
rename to packages/core/src/ssmDocument/wizards/publishDocumentWizard.ts
index c0bf250a5e7..763c9995933 100644
--- a/src/ssmDocument/wizards/publishDocumentWizard.ts
+++ b/packages/core/src/ssmDocument/wizards/publishDocumentWizard.ts
@@ -1,12 +1,12 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as nls from 'vscode-nls'
 const localize = nls.loadMessageBundle()
 
-import { SSM } from 'aws-sdk'
+import { DocumentKeyValuesFilter } from '@aws-sdk/client-ssm'
 import { createCommonButtons } from '../../shared/ui/buttons'
 import { createRegionPrompter } from '../../shared/ui/common/region'
 import { createInputBox } from '../../shared/ui/inputPrompter'
@@ -27,8 +27,8 @@ export enum PublishSSMDocumentAction {
     QuickUpdate = 'Update',
 }
 
-async function* loadDocuments(region: string, documentType?: SSM.Types.DocumentType) {
-    const filters: SSM.Types.DocumentKeyValuesFilterList = [
+async function* loadDocuments(region: string, documentType?: string) {
+    const filters: DocumentKeyValuesFilter[] = [
         {
             Key: 'Owner',
             Values: ['Self'],
@@ -124,12 +124,12 @@ export class PublishSSMDocumentWizard extends Wizard<PublishSSMDocumentWizardRes
                     'Which AWS Region would you like to publish to?'
                 ),
                 serviceFilter: 'ssm',
-            }).transform(r => r.id)
+            }).transform((r) => r.id)
         )
 
-        form.action.bindPrompter(state => createPublishPrompter(state.region!))
+        form.action.bindPrompter((state) => createPublishPrompter(state.region!))
 
-        form.name.bindPrompter(state => {
+        form.name.bindPrompter((state) => {
             switch (state.action!) {
                 case PublishSSMDocumentAction.QuickCreate:
                     return createNamePrompter()
diff --git a/packages/core/src/stepFunctions/activation.ts b/packages/core/src/stepFunctions/activation.ts
new file mode 100644
index 00000000000..ab37cb7a09a
--- /dev/null
+++ b/packages/core/src/stepFunctions/activation.ts
@@ -0,0 +1,147 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../shared/extensionGlobals'
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as vscode from 'vscode'
+import { AwsContext } from '../shared/awsContext'
+import { createStateMachineFromTemplate } from './commands/createStateMachineFromTemplate'
+import { publishStateMachine } from './commands/publishStateMachine'
+import { Commands } from '../shared/vscode/commands2'
+
+import { ASL_FORMATS, YAML_ASL, JSON_ASL } from './constants/aslFormats'
+import { renderCdkStateMachineGraph } from './commands/visualizeStateMachine/renderStateMachineGraphCDK'
+import { ToolkitError } from '../shared/errors'
+import { telemetry } from '../shared/telemetry/telemetry'
+import { PerfLog } from '../shared/logger/perfLogger'
+import { ASLLanguageClient } from './asl/client'
+import { WorkflowStudioEditorProvider } from './workflowStudio/workflowStudioEditorProvider'
+import { StateMachineNode } from './explorer/stepFunctionsNodes'
+import { downloadStateMachineDefinition } from './commands/downloadStateMachineDefinition'
+
+/**
+ * Activate Step Functions related functionality for the extension.
+ */
+export async function activate(
+    extensionContext: vscode.ExtensionContext,
+    awsContext: AwsContext,
+    outputChannel: vscode.OutputChannel
+): Promise<void> {
+    await registerStepFunctionCommands(extensionContext, awsContext, outputChannel)
+    initializeCodeLens(extensionContext)
+
+    let onDidOpenAslDoc: vscode.Disposable // eslint-disable-line prefer-const
+    // PERFORMANCE: Start the LSP client/server _only_ when the first ASL document is opened.
+    // eslint-disable-next-line prefer-const
+    onDidOpenAslDoc = vscode.window.onDidChangeActiveTextEditor(async (e) => {
+        if (e?.document && ASL_FORMATS.includes(e.document.languageId)) {
+            onDidOpenAslDoc?.dispose() // Handler should only run once.
+            await startLspServer(extensionContext)
+        }
+    }, undefined)
+    extensionContext.subscriptions.push(onDidOpenAslDoc)
+
+    if (isASLFileOpen()) {
+        onDidOpenAslDoc?.dispose()
+        await startLspServer(extensionContext)
+    }
+}
+
+export const previewStateMachineCommand = Commands.declare(
+    'aws.previewStateMachine',
+    () => async (arg?: vscode.TextEditor | vscode.Uri | StateMachineNode) => {
+        await telemetry.run('stepfunctions_previewstatemachine', async () => {
+            if (arg instanceof StateMachineNode) {
+                return downloadStateMachineDefinition({
+                    stateMachineNode: arg,
+                    outputChannel: globals.outputChannel,
+                    isPreviewAndRender: true,
+                })
+            }
+
+            arg ??= vscode.window.activeTextEditor
+            const input = arg instanceof vscode.Uri ? arg : arg?.document.uri
+
+            if (!input) {
+                throw new ToolkitError('No active text editor or document found')
+            }
+
+            await WorkflowStudioEditorProvider.openWithWorkflowStudio(input, {
+                preserveFocus: true,
+                viewColumn: vscode.ViewColumn.Beside,
+            })
+        })
+    }
+)
+
+async function registerStepFunctionCommands(
+    extensionContext: vscode.ExtensionContext,
+    awsContext: AwsContext,
+    outputChannel: vscode.OutputChannel
+): Promise<void> {
+    extensionContext.subscriptions.push(
+        previewStateMachineCommand.register(),
+        renderCdkStateMachineGraph.register(),
+        Commands.register('aws.stepfunctions.createStateMachineFromTemplate', async () => {
+            try {
+                await createStateMachineFromTemplate(extensionContext)
+            } finally {
+                telemetry.stepfunctions_createStateMachineFromTemplate.emit()
+            }
+        }),
+        Commands.register('aws.stepfunctions.publishStateMachine', async (node?: any) => {
+            const region: string | undefined = node?.regionCode
+            await publishStateMachine({ awsContext: awsContext, outputChannel: outputChannel, region: region })
+        })
+    )
+}
+
+async function startLspServer(extensionContext: vscode.ExtensionContext) {
+    const perflog = new PerfLog('stepFunctions: start LSP client/server')
+    await ASLLanguageClient.create(extensionContext)
+    perflog.done()
+}
+
+function isASLFileOpen() {
+    return vscode.window.visibleTextEditors.some(
+        (textEditor) => textEditor?.document && ASL_FORMATS.includes(textEditor.document.languageId)
+    )
+}
+
+function initializeCodeLens(context: vscode.ExtensionContext) {
+    class StepFunctionsCodeLensProvider implements vscode.CodeLensProvider {
+        public async provideCodeLenses(document: vscode.TextDocument): Promise<vscode.CodeLens[]> {
+            const topOfDocument = new vscode.Range(0, 0, 0, 0)
+
+            const openCustomEditor = previewStateMachineCommand.build(document.uri).asCodeLens(topOfDocument, {
+                title: localize('AWS.command.stepFunctions.openWithWorkflowStudio', 'Open with Workflow Studio'),
+            })
+
+            if (ASL_FORMATS.includes(document.languageId)) {
+                const publishCommand: vscode.Command = {
+                    command: 'aws.stepfunctions.publishStateMachine',
+                    title: localize('AWS.stepFunctions.publish', 'Publish to Step Functions'),
+                }
+                const publishCodeLens = new vscode.CodeLens(topOfDocument, publishCommand)
+
+                return [publishCodeLens, openCustomEditor]
+            } else {
+                return [openCustomEditor]
+            }
+        }
+    }
+
+    const docSelector = [{ language: JSON_ASL }, { language: YAML_ASL }]
+
+    const codeLensProviderDisposable = vscode.languages.registerCodeLensProvider(
+        docSelector,
+        new StepFunctionsCodeLensProvider()
+    )
+
+    context.subscriptions.push(codeLensProviderDisposable)
+}
diff --git a/src/stepFunctions/asl/aslServer.ts b/packages/core/src/stepFunctions/asl/aslServer.ts
similarity index 86%
rename from src/stepFunctions/asl/aslServer.ts
rename to packages/core/src/stepFunctions/asl/aslServer.ts
index 4fed7e1e056..7a55cfa5ed5 100644
--- a/src/stepFunctions/asl/aslServer.ts
+++ b/packages/core/src/stepFunctions/asl/aslServer.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -8,6 +8,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  */
 
+// Disable because this is a language server.
+/* eslint-disable aws-toolkits/no-console-log */
+
 import {
     ClientCapabilities as aslClientCapabilities,
     DocumentLanguageSettings,
@@ -22,7 +25,7 @@ import {
     Diagnostic,
     Disposable,
     DocumentRangeFormattingRequest,
-    IConnection,
+    Connection,
     InitializeParams,
     InitializeResult,
     NotificationType,
@@ -30,25 +33,21 @@ import {
     ServerCapabilities,
     TextDocuments,
     TextDocumentSyncKind,
+    DidChangeWatchedFilesParams,
 } from 'vscode-languageserver'
 
 import { posix } from 'path'
 import * as URL from 'url'
-import { getLanguageModelCache } from '../../shared/languageServer/languageModelCache'
-import { formatError, runSafe, runSafeAsync } from '../../shared/languageServer/utils/runner'
+import { getLanguageModelCache } from '../../shared/lsp/languageModelCache'
+import { formatError, runSafe, runSafeAsync } from '../../shared/lsp/utils/runner'
 import { YAML_ASL, JSON_ASL } from '../constants/aslFormats'
-import globals from '../../shared/extensionGlobals'
 
-namespace ResultLimitReachedNotification {
-    export const type: NotificationType<string, any> = new NotificationType('asl/resultLimitReached')
-}
+export const ResultLimitReached: NotificationType<string> = new NotificationType('asl/resultLimitReached')
 
-namespace ForceValidateRequest {
-    export const type: RequestType<string, Diagnostic[], any, any> = new RequestType('asl/validate')
-}
+export const ForceValidateRequest: RequestType<string, Diagnostic[], any> = new RequestType('asl/validate')
 
 // Create a connection for the server
-const connection: IConnection = createConnection()
+const connection: Connection = (createConnection as any)()
 
 process.on('unhandledRejection', (e: any) => {
     console.error(formatError('Unhandled exception', e))
@@ -157,20 +156,20 @@ interface Settings {
     }
 }
 
-namespace LimitExceededWarnings {
-    const pendingWarnings: { [uri: string]: { features: { [name: string]: string }; timeout?: NodeJS.Timeout } } = {}
+class LimitExceededWarnings {
+    static pendingWarnings: { [uri: string]: { features: { [name: string]: string }; timeout?: NodeJS.Timeout } } = {}
 
-    export function cancel(uri: string) {
-        const warning = pendingWarnings[uri]
+    public static cancel(uri: string) {
+        const warning = LimitExceededWarnings.pendingWarnings[uri]
         if (warning && warning.timeout) {
-            globals.clock.clearTimeout(warning.timeout)
-            delete pendingWarnings[uri]
+            clearTimeout(warning.timeout)
+            delete LimitExceededWarnings.pendingWarnings[uri]
         }
     }
 
-    export function onResultLimitExceeded(uri: string, maxResults: number, name: string) {
+    public static onResultLimitExceeded(uri: string, maxResults: number, name: string) {
         return () => {
-            let warning = pendingWarnings[uri]
+            let warning = LimitExceededWarnings.pendingWarnings[uri]
             if (warning) {
                 if (!warning.timeout) {
                     // already shown
@@ -180,16 +179,16 @@ namespace LimitExceededWarnings {
                 warning.timeout.refresh()
             } else {
                 warning = { features: { [name]: name } }
-                warning.timeout = globals.clock.setTimeout(() => {
-                    connection.sendNotification(
-                        ResultLimitReachedNotification.type,
+                warning.timeout = setTimeout(() => {
+                    void connection.sendNotification(
+                        ResultLimitReached,
                         `${posix.basename(uri)}: For performance reasons, ${Object.keys(warning.features).join(
                             ' and '
                         )} have been limited to ${maxResults} items.`
                     )
                     warning.timeout = undefined
                 }, 2000)
-                pendingWarnings[uri] = warning
+                LimitExceededWarnings.pendingWarnings[uri] = warning
             }
         }
     }
@@ -197,7 +196,7 @@ namespace LimitExceededWarnings {
 
 let formatterRegistration: Thenable<Disposable> | undefined
 
-connection.onDidChangeConfiguration(change => {
+connection.onDidChangeConfiguration((change: any) => {
     const settings = <Settings>change.settings
 
     foldingRangeLimit = Math.trunc(
@@ -215,19 +214,24 @@ connection.onDidChangeConfiguration(change => {
                 })
             }
         } else if (formatterRegistration) {
-            formatterRegistration.then(r => r.dispose())
+            formatterRegistration.then(
+                (r) => r.dispose(),
+                (e) => {
+                    console.error('formatterRegistration failed: %s', (e as Error).message)
+                }
+            )
             formatterRegistration = undefined
         }
     }
 })
 
 // Retry schema validation on all open documents
-connection.onRequest(ForceValidateRequest.type, async uri => {
-    return new Promise<Diagnostic[]>(resolve => {
+connection.onRequest(ForceValidateRequest, async (uri: any) => {
+    return new Promise<Diagnostic[]>((resolve) => {
         const document = documents.get(uri)
         if (document) {
             // updateConfiguration()
-            validateTextDocument(document, diagnostics => {
+            validateTextDocument(document, (diagnostics) => {
                 resolve(diagnostics)
             })
         } else {
@@ -238,16 +242,16 @@ connection.onRequest(ForceValidateRequest.type, async uri => {
 
 // The content of a text document has changed. This event is emitted
 // when the text document first opened or when its content has changed.
-documents.onDidChangeContent(change => {
+documents.onDidChangeContent((change: any) => {
     LimitExceededWarnings.cancel(change.document.uri)
     triggerValidation(change.document)
 })
 
 // a document has closed: clear all diagnostics
-documents.onDidClose(event => {
+documents.onDidClose((event) => {
     LimitExceededWarnings.cancel(event.document.uri)
     cleanPendingValidation(event.document)
-    connection.sendDiagnostics({ uri: event.document.uri, diagnostics: [] })
+    void connection.sendDiagnostics({ uri: event.document.uri, diagnostics: [] })
 })
 
 const pendingValidationRequests: { [uri: string]: NodeJS.Timer } = {}
@@ -256,14 +260,14 @@ const validationDelayMs = 500
 function cleanPendingValidation(textDocument: TextDocument): void {
     const request = pendingValidationRequests[textDocument.uri]
     if (request) {
-        globals.clock.clearTimeout(request)
+        clearTimeout(request)
         delete pendingValidationRequests[textDocument.uri]
     }
 }
 
 function triggerValidation(textDocument: TextDocument): void {
     cleanPendingValidation(textDocument)
-    pendingValidationRequests[textDocument.uri] = globals.clock.setTimeout(() => {
+    pendingValidationRequests[textDocument.uri] = setTimeout(() => {
         delete pendingValidationRequests[textDocument.uri]
         validateTextDocument(textDocument)
     }, validationDelayMs)
@@ -280,7 +284,7 @@ function getLanguageService(langId: string): LanguageService {
 
 function validateTextDocument(textDocument: TextDocument, callback?: (diagnostics: Diagnostic[]) => void): void {
     const respond = (diagnostics: Diagnostic[]) => {
-        connection.sendDiagnostics({ uri: textDocument.uri, diagnostics })
+        void connection.sendDiagnostics({ uri: textDocument.uri, diagnostics })
         if (callback) {
             callback(diagnostics)
         }
@@ -297,37 +301,38 @@ function validateTextDocument(textDocument: TextDocument, callback?: (diagnostic
     getLanguageService(textDocument.languageId)
         .doValidation(textDocument, jsonDocument, documentSettings)
         .then(
-            diagnostics => {
-                globals.clock.setTimeout(() => {
+            (diagnostics) => {
+                setTimeout(() => {
                     const currDocument = documents.get(textDocument.uri)
                     if (currDocument && currDocument.version === version) {
                         respond(diagnostics) // Send the computed diagnostics to VSCode.
                     }
                 }, 100)
             },
-            error => {
+            (error) => {
                 connection.console.error(formatError(`Error while validating ${textDocument.uri}`, error))
             }
         )
 }
 
-connection.onDidChangeWatchedFiles(change => {
+connection.onDidChangeWatchedFiles((change: DidChangeWatchedFilesParams) => {
     // Monitored files have changed in VSCode
     let hasChanges = false
-    change.changes.forEach(c => {
+    for (const c of change.changes) {
         if (getLanguageService('asl').resetSchema(c.uri)) {
             hasChanges = true
         }
-    })
+    }
     if (hasChanges) {
+        // eslint-disable-next-line unicorn/no-array-for-each
         documents.all().forEach(triggerValidation)
     }
 })
 
-const jsonDocuments = getLanguageModelCache<JSONDocument>(10, 60, document =>
+const jsonDocuments = getLanguageModelCache<JSONDocument>(10, 60, (document) =>
     getLanguageService('asl').parseJSONDocument(document)
 )
-documents.onDidClose(e => {
+documents.onDidClose((e) => {
     jsonDocuments.onDocumentRemoved(e.document)
 })
 connection.onShutdown(() => {
diff --git a/packages/core/src/stepFunctions/asl/client.ts b/packages/core/src/stepFunctions/asl/client.ts
new file mode 100644
index 00000000000..fff743252ad
--- /dev/null
+++ b/packages/core/src/stepFunctions/asl/client.ts
@@ -0,0 +1,195 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*!
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ */
+
+import * as path from 'path'
+import * as nls from 'vscode-nls'
+
+const localize = nls.loadMessageBundle()
+
+import {
+    CancellationToken,
+    Disposable,
+    ExtensionContext,
+    FormattingOptions,
+    LanguageConfiguration,
+    languages,
+    ProviderResult,
+    Range,
+    TextDocument,
+    TextEdit,
+    window,
+    workspace,
+} from 'vscode'
+
+import {
+    DidChangeConfigurationNotification,
+    DocumentRangeFormattingParams,
+    DocumentRangeFormattingRequest,
+    LanguageClientOptions,
+    NotificationType,
+} from 'vscode-languageclient'
+import { ServerOptions, TransportKind, LanguageClient } from 'vscode-languageclient/node'
+
+import { YAML_ASL, JSON_ASL, ASL_FORMATS } from '../constants/aslFormats'
+import { StepFunctionsSettings } from '../utils'
+
+export const ResultLimitReached: NotificationType<string> = new NotificationType('asl/resultLimitReached')
+
+interface Settings {
+    asl?: {
+        format?: { enable: boolean }
+        resultLimit?: number
+    }
+}
+
+export class ASLLanguageClient {
+    static isReady = false
+
+    /**
+     * Starts the ASL LSP client/server and creates related resources (vscode `OutputChannel`,
+     * `registerDocumentRangeFormattingEditProvider`, …).
+     */
+    static async create(extensionContext: ExtensionContext) {
+        const config = new StepFunctionsSettings()
+        const toDispose = extensionContext.subscriptions
+
+        let rangeFormatting: Disposable | undefined
+
+        // The server is implemented in node
+        const serverModule = extensionContext.asAbsolutePath(path.join('dist/src/stepFunctions/asl/', 'aslServer.js'))
+        // The debug options for the server
+        // --inspect=6009: runs the server in Node's Inspector mode so VS Code can attach to the server for debugging
+        const debugOptions = { execArgv: ['--nolazy', '--inspect=6009', '--preserve-symlinks'] }
+
+        // If the extension is launch in debug mode the debug server options are use
+        // Otherwise the run options are used
+        const serverOptions: ServerOptions = {
+            run: { module: serverModule, transport: TransportKind.ipc },
+            debug: { module: serverModule, transport: TransportKind.ipc, options: debugOptions },
+        }
+
+        const documentSelector = [
+            { schema: 'file', language: JSON_ASL },
+            { schema: 'untitled', language: JSON_ASL },
+            { schema: 'file', language: YAML_ASL },
+            { schema: 'untitled', language: YAML_ASL },
+        ]
+
+        // Options to control the language client
+        const clientOptions: LanguageClientOptions = {
+            // Register the server for json documents
+            documentSelector,
+            initializationOptions: {
+                handledSchemaProtocols: ['file', 'untitled'], // language server only loads file-URI. Fetching schemas with other protocols ('http'...) are made on the client.
+                provideFormatter: false, // tell the server to not provide formatting capability and ignore the `aws.stepfunctions.asl.format.enable` setting.
+            },
+            synchronize: {
+                // Synchronize the setting section 'json' to the server
+                configurationSection: ASL_FORMATS,
+                fileEvents: workspace.createFileSystemWatcher('**/*.{asl,asl.json,asl.yml,asl.yaml}'),
+            },
+            middleware: {
+                workspace: {
+                    didChangeConfiguration: () =>
+                        client.sendNotification(DidChangeConfigurationNotification.type, {
+                            settings: getSettings(config),
+                        }),
+                },
+            },
+        }
+
+        // Create the language client and start the client.
+        const client = new LanguageClient(
+            'asl',
+            localize('asl.server.name', 'AWS: Amazon States Language Server'),
+            serverOptions,
+            clientOptions
+        )
+        client.registerProposedFeatures()
+
+        void client.start()
+        toDispose.push(client)
+
+        const languageConfiguration: LanguageConfiguration = {
+            wordPattern: /("(?:[^\\\"]*(?:\\.)?)*"?)|[^\s{}\[\],:]+/,
+            indentationRules: {
+                increaseIndentPattern: /({+(?=([^"]*"[^"]*")*[^"}]*$))|(\[+(?=([^"]*"[^"]*")*[^"\]]*$))/,
+                decreaseIndentPattern: /^\s*[}\]],?\s*$/,
+            },
+        }
+        languages.setLanguageConfiguration('asl', languageConfiguration)
+
+        function updateFormatterRegistration() {
+            const formatEnabled = config.get('format.enable', false)
+            if (!formatEnabled && rangeFormatting) {
+                rangeFormatting.dispose()
+                rangeFormatting = undefined
+            } else if (formatEnabled && !rangeFormatting) {
+                rangeFormatting = languages.registerDocumentRangeFormattingEditProvider(documentSelector, {
+                    provideDocumentRangeFormattingEdits(
+                        document: TextDocument,
+                        range: Range,
+                        options: FormattingOptions,
+                        token: CancellationToken
+                    ): ProviderResult<TextEdit[]> {
+                        const params: DocumentRangeFormattingParams = {
+                            textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document),
+                            range: client.code2ProtocolConverter.asRange(range),
+                            options: (client.code2ProtocolConverter as any).asFormattingOptions(options, {}),
+                        }
+
+                        return (client as any)
+                            .sendRequest(DocumentRangeFormattingRequest.method, params, undefined)
+                            .then(
+                                (response: any) => client.protocol2CodeConverter.asTextEdits(response),
+                                async () => {
+                                    return Promise.resolve([])
+                                }
+                            )
+                    },
+                })
+            }
+        }
+
+        return client.start().then(() => {
+            updateFormatterRegistration()
+            const disposableFunc = { dispose: () => rangeFormatting?.dispose() as void }
+            toDispose.push(disposableFunc)
+            toDispose.push(
+                config.onDidChange(({ key }) => {
+                    if (key === 'format.enable') {
+                        updateFormatterRegistration()
+                    }
+                })
+            )
+
+            client.onNotification(ResultLimitReached, (message: any) => {
+                void window.showInformationMessage(
+                    `${message}\nUse setting 'aws.stepfunctions.asl.maxItemsComputed' to configure the limit.`
+                )
+            })
+            this.isReady = true
+        })
+    }
+}
+
+export async function deactivate(): Promise<any> {
+    return Promise.resolve(undefined)
+}
+
+function getSettings(config: StepFunctionsSettings): Settings {
+    const resultLimit = config.get('maxItemsComputed', 5000)
+
+    return {
+        asl: {
+            resultLimit,
+        },
+    }
+}
diff --git a/src/stepFunctions/commands/createStateMachineFromTemplate.ts b/packages/core/src/stepFunctions/commands/createStateMachineFromTemplate.ts
similarity index 86%
rename from src/stepFunctions/commands/createStateMachineFromTemplate.ts
rename to packages/core/src/stepFunctions/commands/createStateMachineFromTemplate.ts
index 781943766c2..a5e8187e47f 100644
--- a/src/stepFunctions/commands/createStateMachineFromTemplate.ts
+++ b/packages/core/src/stepFunctions/commands/createStateMachineFromTemplate.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -10,7 +10,7 @@ import { dump, load } from 'js-yaml'
 import * as path from 'path'
 import * as vscode from 'vscode'
 import { readFileAsString } from '../../shared/filesystemUtilities'
-import { getLogger } from '../../shared/logger'
+import { getLogger } from '../../shared/logger/logger'
 import { CreateStateMachineWizard, TemplateFormats } from '../wizards/createStateMachineWizard'
 
 import { YAML_ASL, JSON_ASL } from '../constants/aslFormats'
@@ -28,10 +28,10 @@ export async function createStateMachineFromTemplate(context: vscode.ExtensionCo
             response.templateFormat
         )
 
-        vscode.window.showTextDocument(textDocumentFromSelection)
+        await vscode.window.showTextDocument(textDocumentFromSelection)
     } catch (err) {
         getLogger().error(err as Error)
-        vscode.window.showErrorMessage(
+        void vscode.window.showErrorMessage(
             localize(
                 'AWS.message.error.stepfunctions.getTextDocumentForSelectedItem',
                 'There was an error creating the State Machine Template, check log for details.'
@@ -43,7 +43,7 @@ export async function createStateMachineFromTemplate(context: vscode.ExtensionCo
 async function getTextDocumentForSelectedItem(
     fileName: string,
     extensionPath: string,
-    format: string
+    format: TemplateFormats
 ): Promise<vscode.TextDocument> {
     let content = await readFileAsString(path.join(extensionPath, 'templates', fileName))
 
diff --git a/packages/core/src/stepFunctions/commands/downloadStateMachineDefinition.ts b/packages/core/src/stepFunctions/commands/downloadStateMachineDefinition.ts
new file mode 100644
index 00000000000..e89dad1ffcd
--- /dev/null
+++ b/packages/core/src/stepFunctions/commands/downloadStateMachineDefinition.ts
@@ -0,0 +1,80 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+import * as os from 'os'
+const localize = nls.loadMessageBundle()
+
+import * as StepFunctions from '@aws-sdk/client-sfn'
+import * as path from 'path'
+import * as vscode from 'vscode'
+import { StepFunctionsClient } from '../../shared/clients/stepFunctions'
+
+import { getLogger, Logger } from '../../shared/logger/logger'
+import { Result } from '../../shared/telemetry/telemetry'
+import { StateMachineNode } from '../explorer/stepFunctionsNodes'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { fs } from '../../shared/fs/fs'
+import { WorkflowStudioEditorProvider } from '../workflowStudio/workflowStudioEditorProvider'
+
+export async function downloadStateMachineDefinition(params: {
+    outputChannel: vscode.OutputChannel
+    stateMachineNode: StateMachineNode
+    isPreviewAndRender?: boolean
+}) {
+    const logger: Logger = getLogger()
+    let downloadResult: Result = 'Succeeded'
+    const stateMachineName = params.stateMachineNode.details.name
+    try {
+        const client: StepFunctionsClient = new StepFunctionsClient(params.stateMachineNode.regionCode)
+        const stateMachineDetails: StepFunctions.DescribeStateMachineCommandOutput =
+            await client.getStateMachineDetails({
+                stateMachineArn: params.stateMachineNode.details.stateMachineArn,
+            })
+
+        if (params.isPreviewAndRender) {
+            const doc = await vscode.workspace.openTextDocument({
+                language: 'asl',
+                content: stateMachineDetails.definition,
+            })
+
+            const textEditor = await vscode.window.showTextDocument(doc)
+            await WorkflowStudioEditorProvider.openWithWorkflowStudio(textEditor.document.uri, {
+                preserveFocus: true,
+                viewColumn: vscode.ViewColumn.Beside,
+            })
+        } else {
+            const wsPath = vscode.workspace.workspaceFolders
+                ? vscode.workspace.workspaceFolders[0].uri.fsPath
+                : os.homedir()
+            const defaultFilePath = path.join(wsPath, params.stateMachineNode.details.name + '.asl.json')
+            const fileInfo = await vscode.window.showSaveDialog({ defaultUri: vscode.Uri.file(defaultFilePath) })
+
+            if (fileInfo) {
+                const filePath = fileInfo.fsPath
+                await fs.writeFile(filePath, stateMachineDetails.definition || '', 'utf8')
+                const openPath = vscode.Uri.file(filePath)
+                const doc = await vscode.workspace.openTextDocument(openPath)
+                await vscode.window.showTextDocument(doc)
+            }
+        }
+    } catch (err) {
+        const error = err as Error
+        logger.error(error)
+        downloadResult = 'Failed'
+        params.outputChannel.show(true)
+        params.outputChannel.appendLine(
+            localize(
+                'AWS.message.error.stepfunctions.downloadStateMachineDefinition',
+                "Unable to download state machine '{0}', check logs for details.",
+                stateMachineName
+            )
+        )
+        params.outputChannel.appendLine(error.message)
+        params.outputChannel.appendLine('')
+    } finally {
+        telemetry.stepfunctions_downloadStateMachineDefinition.emit({ result: downloadResult })
+    }
+}
diff --git a/packages/core/src/stepFunctions/commands/publishStateMachine.ts b/packages/core/src/stepFunctions/commands/publishStateMachine.ts
new file mode 100644
index 00000000000..799d5b2a724
--- /dev/null
+++ b/packages/core/src/stepFunctions/commands/publishStateMachine.ts
@@ -0,0 +1,168 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { load } from 'js-yaml'
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+import { AwsContext } from '../../shared/awsContext'
+import { StepFunctionsClient } from '../../shared/clients/stepFunctions'
+import { getLogger, Logger } from '../../shared/logger/logger'
+import { showViewLogsMessage } from '../../shared/utilities/messages'
+import { VALID_SFN_PUBLISH_FORMATS, YAML_FORMATS } from '../constants/aslFormats'
+import { refreshStepFunctionsTree } from '../explorer/stepFunctionsNodes'
+import { PublishStateMachineWizard, PublishStateMachineWizardState } from '../wizards/publishStateMachineWizard'
+const localize = nls.loadMessageBundle()
+
+interface publishStateMachineParams {
+    awsContext: AwsContext
+    outputChannel: vscode.OutputChannel
+    region?: string
+    text?: vscode.TextDocument
+}
+export async function publishStateMachine(params: publishStateMachineParams) {
+    const logger: Logger = getLogger()
+    let textDocument: vscode.TextDocument | undefined
+
+    if (params.text) {
+        textDocument = params.text
+    } else {
+        textDocument = vscode.window.activeTextEditor?.document
+    }
+
+    if (!textDocument) {
+        logger.error('Could not get active text editor for state machine definition')
+        throw new Error('Could not get active text editor for state machine definition')
+    }
+
+    let text = textDocument.getText()
+
+    if (!VALID_SFN_PUBLISH_FORMATS.includes(textDocument.languageId)) {
+        const errorMessage = `Cannot publish state machine from "${textDocument.languageId}" file`
+        logger.error(errorMessage)
+        throw new Error(errorMessage)
+    }
+
+    if (YAML_FORMATS.includes(textDocument.languageId)) {
+        try {
+            text = JSON.stringify(load(text), undefined, '  ')
+        } catch (error) {
+            const localizedMsg = localize(
+                'AWS.stepFunctions.publishStateMachine.error.invalidYAML',
+                'Cannot publish invalid YAML file'
+            )
+
+            logger.error(error as Error)
+            void showViewLogsMessage(localizedMsg)
+            return
+        }
+    }
+
+    try {
+        const response = await new PublishStateMachineWizard(params.region).run()
+        if (!response) {
+            return
+        }
+        const client = new StepFunctionsClient(response.region)
+
+        if (response?.createResponse) {
+            await createStateMachine(response.createResponse, text, params.outputChannel, response.region, client)
+            refreshStepFunctionsTree(response.region)
+        } else if (response?.updateResponse) {
+            await updateStateMachine(response.updateResponse, text, params.outputChannel, response.region, client)
+        }
+    } catch (err) {
+        logger.error(err as Error)
+    }
+}
+
+async function createStateMachine(
+    wizardResponse: NonNullable<PublishStateMachineWizardState['createResponse']>,
+    definition: string,
+    outputChannel: vscode.OutputChannel,
+    region: string,
+    client: StepFunctionsClient
+) {
+    const logger: Logger = getLogger()
+    logger.info(`Creating state machine '${wizardResponse.name}'`)
+    outputChannel.show()
+    outputChannel.appendLine('')
+    outputChannel.appendLine(
+        localize(
+            'AWS.stepFunctions.publishStateMachine.info.creating',
+            "Creating state machine '{0}' in {1}...",
+            wizardResponse.name,
+            region
+        )
+    )
+    try {
+        const result = await client.createStateMachine({
+            definition,
+            name: wizardResponse.name,
+            roleArn: wizardResponse.roleArn,
+        })
+        outputChannel.appendLine(
+            localize(
+                'AWS.stepFunctions.publishStateMachine.info.createSuccess',
+                "Created state machine '{0}'",
+                wizardResponse.name
+            )
+        )
+        outputChannel.appendLine(result.stateMachineArn || '')
+        logger.info(`Created "${result.stateMachineArn}"`)
+    } catch (err) {
+        const msg = localize(
+            'AWS.stepFunctions.publishStateMachine.error.createFailure',
+            'Failed to create state machine: {0}',
+            wizardResponse.name
+        )
+        void showViewLogsMessage(msg)
+        outputChannel.appendLine(msg)
+        logger.error(`Failed to create state machine '${wizardResponse.name}': %O`, err as Error)
+    }
+}
+
+async function updateStateMachine(
+    wizardResponse: NonNullable<PublishStateMachineWizardState['updateResponse']>,
+    definition: string,
+    outputChannel: vscode.OutputChannel,
+    region: string,
+    client: StepFunctionsClient
+) {
+    const logger: Logger = getLogger()
+    logger.info(`Updating state machine ${wizardResponse.stateMachineArn}`)
+    outputChannel.show()
+    outputChannel.appendLine('')
+    outputChannel.appendLine(
+        localize(
+            'AWS.stepFunctions.publishStateMachine.info.updating',
+            "Updating state machine '{0}' in {1}...",
+            wizardResponse.stateMachineArn,
+            region
+        )
+    )
+    try {
+        await client.updateStateMachine({
+            definition,
+            stateMachineArn: wizardResponse.stateMachineArn,
+        })
+        outputChannel.appendLine(
+            localize(
+                'AWS.stepFunctions.publishStateMachine.info.updateSuccess',
+                'Updated state machine: {0}',
+                wizardResponse.stateMachineArn
+            )
+        )
+        logger.info(`Updated ${wizardResponse.stateMachineArn}`)
+    } catch (err) {
+        const msg = localize(
+            'AWS.stepFunctions.publishStateMachine.error.updateFailure',
+            'Failed to update state machine: {0}',
+            wizardResponse.stateMachineArn
+        )
+        void showViewLogsMessage(msg)
+        outputChannel.appendLine(msg)
+        logger.error(`Failed to update state machine '${wizardResponse.stateMachineArn}': %O`, err as Error)
+    }
+}
diff --git a/src/stepFunctions/commands/visualizeStateMachine/getStateMachineDefinitionFromCfnTemplate.ts b/packages/core/src/stepFunctions/commands/visualizeStateMachine/getStateMachineDefinitionFromCfnTemplate.ts
similarity index 85%
rename from src/stepFunctions/commands/visualizeStateMachine/getStateMachineDefinitionFromCfnTemplate.ts
rename to packages/core/src/stepFunctions/commands/visualizeStateMachine/getStateMachineDefinitionFromCfnTemplate.ts
index 1c3f7a96b1d..d21a8cee52d 100644
--- a/src/stepFunctions/commands/visualizeStateMachine/getStateMachineDefinitionFromCfnTemplate.ts
+++ b/packages/core/src/stepFunctions/commands/visualizeStateMachine/getStateMachineDefinitionFromCfnTemplate.ts
@@ -1,10 +1,10 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'fs'
-import { getLogger, Logger } from '../../../shared/logger'
+import * as fs from 'fs' // eslint-disable-line no-restricted-imports
+import { getLogger, Logger } from '../../../shared/logger/logger'
 
 /**
  * @param {string} uniqueIdentifier - unique identifier of state machine
@@ -25,7 +25,7 @@ export function getStateMachineDefinitionFromCfnTemplate(uniqueIdentifier: strin
 
         const matchingKeyList: string[] = []
         for (const key of Object.keys(resources)) {
-            //the resources list always contains 'CDKMetadata'
+            // the resources list always contains 'CDKMetadata'
             if (key === 'CDKMetadata') {
                 continue
             }
@@ -37,7 +37,7 @@ export function getStateMachineDefinitionFromCfnTemplate(uniqueIdentifier: strin
         if (matchingKeyList.length === 0) {
             return ''
         } else {
-            //return minimum length key in matchingKeyList
+            // return minimum length key in matchingKeyList
             matchingKey = matchingKeyList.reduce((a, b) => (a.length <= b.length ? a : b))
         }
 
@@ -68,7 +68,7 @@ export function toUnescapedAslJsonString(
 
     const definitionStringWithPlaceholders: any[] = escapedAslJsonStr['Fn::Join'][1]
     const definitionStringSegments: string[] = definitionStringWithPlaceholders.filter(
-        segment => typeof segment === 'string'
+        (segment) => typeof segment === 'string'
     )
     return definitionStringSegments.join('')
 }
diff --git a/packages/core/src/stepFunctions/commands/visualizeStateMachine/renderStateMachineGraphCDK.ts b/packages/core/src/stepFunctions/commands/visualizeStateMachine/renderStateMachineGraphCDK.ts
new file mode 100644
index 00000000000..0a473e80201
--- /dev/null
+++ b/packages/core/src/stepFunctions/commands/visualizeStateMachine/renderStateMachineGraphCDK.ts
@@ -0,0 +1,76 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+
+import { getLogger } from '../../../shared/logger/logger'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+import { isTreeNode } from '../../../shared/treeview/resourceTreeDataProvider'
+import { unboxTreeNode } from '../../../shared/treeview/utils'
+import { Commands } from '../../../shared/vscode/commands2'
+import { PreviewStateMachineCDKWizard } from '../../wizards/previewStateMachineCDKWizard'
+import { WorkflowMode } from '../../workflowStudio/types'
+import { WorkflowStudioEditorProvider } from '../../workflowStudio/workflowStudioEditorProvider'
+import { getStateMachineDefinitionFromCfnTemplate } from './getStateMachineDefinitionFromCfnTemplate'
+
+const localize = nls.loadMessageBundle()
+
+function isLocationResource(obj: unknown): obj is { location: vscode.Uri } {
+    return !!obj && typeof obj === 'object' && (obj as any).location instanceof vscode.Uri
+}
+
+/**
+ * Renders a state graph of the state machine.
+ *
+ * If given a {@link TreeNode}, it should contain a resource with a URI pointing to the `tree.json`.
+ * URIs should have a fragment with the resource path in order to locate it within the CFN template.
+ */
+export const renderCdkStateMachineGraph = Commands.declare(
+    'aws.cdk.renderStateMachineGraph',
+    () => async (input?: unknown) => {
+        const resource = isTreeNode(input) ? unboxTreeNode(input, isLocationResource) : undefined
+        const resourceUri = resource?.location ?? (await new PreviewStateMachineCDKWizard().run())?.resource.location
+
+        if (!resourceUri) {
+            return
+        }
+        const logger = getLogger('stepfunctions')
+        try {
+            telemetry.ui_click.emit({
+                elementId: 'stepfunctions_renderCDKStateMachineGraph',
+            })
+            const [appName, resourceName] = resourceUri.fragment.split('/')
+            const cdkOutPath = vscode.Uri.joinPath(resourceUri, '..')
+            const templateUri = vscode.Uri.joinPath(cdkOutPath, `${appName}.template.json`)
+            const definitionString = getStateMachineDefinitionFromCfnTemplate(resourceName, templateUri.fsPath)
+
+            if (definitionString) {
+                // Append stateMachineName and Readonly WorkflowMode to templateUri
+                // to instruct WorkflowStudioEditorProvider to open in Readonly mode and get ASL definition from CloudFormation template
+                const query = `statemachineName=${encodeURIComponent(resourceName)}&workflowMode=${encodeURIComponent(WorkflowMode.Readonly)}`
+                const wfsUriWithTemplateInfo = templateUri.with({ query })
+                await WorkflowStudioEditorProvider.openWithWorkflowStudio(wfsUriWithTemplateInfo)
+            } else {
+                void vscode.window.showErrorMessage(
+                    localize(
+                        'AWS.stepfunctions.visualisation.errors.rendering',
+                        'There was an error rendering State Machine Graph, check logs for details.'
+                    )
+                )
+                logger.error('Unable to extract state machine definition string from template.json file.')
+            }
+        } catch (err) {
+            void vscode.window.showErrorMessage(
+                localize(
+                    'AWS.stepfunctions.visualisation.errors.rendering',
+                    'There was an error rendering State Machine Graph, check logs for details.'
+                )
+            )
+
+            logger.error(`Unexpected exception: %s`, err)
+        }
+    }
+)
diff --git a/src/stepFunctions/constants/aslFormats.ts b/packages/core/src/stepFunctions/constants/aslFormats.ts
similarity index 92%
rename from src/stepFunctions/constants/aslFormats.ts
rename to packages/core/src/stepFunctions/constants/aslFormats.ts
index 7cd086d3e8c..37c1d67e815 100644
--- a/src/stepFunctions/constants/aslFormats.ts
+++ b/packages/core/src/stepFunctions/constants/aslFormats.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/src/stepFunctions/explorer/stepFunctionsNodes.ts b/packages/core/src/stepFunctions/explorer/stepFunctionsNodes.ts
similarity index 85%
rename from src/stepFunctions/explorer/stepFunctionsNodes.ts
rename to packages/core/src/stepFunctions/explorer/stepFunctionsNodes.ts
index 2eed59d8d01..8b693d3bb9e 100644
--- a/src/stepFunctions/explorer/stepFunctionsNodes.ts
+++ b/packages/core/src/stepFunctions/explorer/stepFunctionsNodes.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -7,9 +7,9 @@ import * as os from 'os'
 import * as nls from 'vscode-nls'
 const localize = nls.loadMessageBundle()
 
-import { StepFunctions } from 'aws-sdk'
+import * as StepFunctions from '@aws-sdk/client-sfn'
 import * as vscode from 'vscode'
-import { DefaultStepFunctionsClient } from '../../shared/clients/stepFunctionsClient'
+import { StepFunctionsClient } from '../../shared/clients/stepFunctions'
 
 import { AWSResourceNode } from '../../shared/treeview/nodes/awsResourceNode'
 import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
@@ -17,7 +17,6 @@ import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
 import { makeChildrenNodes } from '../../shared/treeview/utils'
 import { toArrayAsync, toMap, updateInPlace } from '../../shared/utilities/collectionUtils'
 import { listStateMachines } from '../../stepFunctions/utils'
-import { Commands } from '../../shared/vscode/commands'
 import { getIcon } from '../../shared/icons'
 
 export const contextValueStateMachine = 'awsStateMachineNode'
@@ -28,7 +27,7 @@ export function refreshStepFunctionsTree(regionCode: string) {
     const node = sfnNodeMap.get(regionCode)
 
     if (node) {
-        Commands.vscode().execute('aws.refreshAwsExplorerNode', node)
+        void vscode.commands.executeCommand('aws.refreshAwsExplorerNode', node)
     }
 }
 
@@ -41,7 +40,7 @@ export class StepFunctionsNode extends AWSTreeNodeBase {
 
     public constructor(
         public override readonly regionCode: string,
-        private readonly client = new DefaultStepFunctionsClient(regionCode)
+        private readonly client = new StepFunctionsClient(regionCode)
     ) {
         super('Step Functions', vscode.TreeItemCollapsibleState.Collapsed)
         this.stateMachineNodes = new Map<string, StateMachineNode>()
@@ -68,14 +67,14 @@ export class StepFunctionsNode extends AWSTreeNodeBase {
     public async updateChildren(): Promise<void> {
         const functions: Map<string, StepFunctions.StateMachineListItem> = toMap(
             await toArrayAsync(listStateMachines(this.client)),
-            details => details.name
+            (details) => details.name
         )
 
         updateInPlace(
             this.stateMachineNodes,
             functions.keys(),
-            key => this.stateMachineNodes.get(key)!.update(functions.get(key)!),
-            key => makeStateMachineNode(this, this.regionCode, functions.get(key)!)
+            (key) => this.stateMachineNodes.get(key)!.update(functions.get(key)!),
+            (key) => makeStateMachineNode(this, this.regionCode, functions.get(key)!)
         )
     }
 }
@@ -102,7 +101,7 @@ export class StateMachineNode extends AWSTreeNodeBase implements AWSResourceNode
     }
 
     public get arn(): string {
-        return this.details.stateMachineArn
+        return this.details.stateMachineArn || ''
     }
 
     public get name(): string {
diff --git a/packages/core/src/stepFunctions/utils.ts b/packages/core/src/stepFunctions/utils.ts
new file mode 100644
index 00000000000..f578d6cda86
--- /dev/null
+++ b/packages/core/src/stepFunctions/utils.ts
@@ -0,0 +1,109 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import * as StepFunctions from '@aws-sdk/client-sfn'
+import * as yaml from 'js-yaml'
+import * as vscode from 'vscode'
+import { StepFunctionsClient } from '../shared/clients/stepFunctions'
+import {
+    DiagnosticSeverity,
+    DocumentLanguageSettings,
+    getLanguageService,
+    TextDocument as ASLTextDocument,
+} from 'amazon-states-language-service'
+import { fromExtensionManifest } from '../shared/settings'
+import { IamRole } from '../shared/clients/iam'
+
+const documentSettings: DocumentLanguageSettings = { comments: 'error', trailingCommas: 'error' }
+const languageService = getLanguageService({})
+
+export async function* listStateMachines(
+    client: StepFunctionsClient
+): AsyncIterableIterator<StepFunctions.StateMachineListItem> {
+    const status = vscode.window.setStatusBarMessage(
+        localize('AWS.message.statusBar.loading.statemachines', 'Loading State Machines...')
+    )
+
+    try {
+        yield* client.listStateMachines()
+    } finally {
+        if (status) {
+            status.dispose()
+        }
+    }
+}
+
+/**
+ * Checks if the given IAM Role is assumable by AWS Step Functions.
+ * @param role The IAM role to check
+ */
+export function isStepFunctionsRole(role: IamRole): boolean {
+    const stepFunctionsSevicePrincipal: string = 'states.amazonaws.com'
+    const assumeRolePolicyDocument: string | undefined = role.AssumeRolePolicyDocument
+
+    return !!assumeRolePolicyDocument?.includes(stepFunctionsSevicePrincipal)
+}
+
+export async function isDocumentValid(text: string, textDocument?: vscode.TextDocument): Promise<boolean> {
+    if (!textDocument || !text) {
+        return false
+    }
+
+    const doc = ASLTextDocument.create(textDocument.uri.path, textDocument.languageId, textDocument.version, text)
+    const jsonDocument = languageService.parseJSONDocument(doc)
+    const diagnostics = await languageService.doValidation(doc, jsonDocument, documentSettings)
+    const isValid = !diagnostics.some((diagnostic) => diagnostic.severity === DiagnosticSeverity.Error)
+
+    return isValid
+}
+
+/**
+ * Checks if the JSON content in an ASL text document is invalid.
+ * Returns `true` for invalid JSON; `false` for valid JSON, empty content, or non-JSON files.
+ *
+ * @param textDocument - The text document to check.
+ * @returns `true` if invalid; `false` otherwise.
+ */
+export const isInvalidJsonFile = (textDocument: vscode.TextDocument): boolean => {
+    const documentContent = textDocument.getText().trim()
+    // An empty file or whitespace-only text is considered valid JSON for our use case
+    return textDocument.languageId === 'asl' && documentContent ? isInvalidJson(documentContent) : false
+}
+
+/**
+ * Checks if the YAML content in an ASL text document is invalid.
+ * Returns `true` for invalid YAML; `false` for valid YAML, empty content, or non-YAML files.
+ *
+ * @param textDocument - The text document to check.
+ * @returns `true` if invalid; `false` otherwise.
+ */
+export const isInvalidYamlFile = (textDocument: vscode.TextDocument): boolean => {
+    try {
+        if (textDocument.languageId === 'asl-yaml') {
+            yaml.load(textDocument.getText())
+        }
+        return false
+    } catch {
+        return true
+    }
+}
+
+const isInvalidJson = (content: string): boolean => {
+    try {
+        JSON.parse(content)
+        return false
+    } catch {
+        return true
+    }
+}
+
+const descriptor = {
+    maxItemsComputed: (v: unknown) => Math.trunc(Math.max(0, Number(v))),
+    ['format.enable']: Boolean,
+}
+
+export class StepFunctionsSettings extends fromExtensionManifest('aws.stepfunctions.asl', descriptor) {}
diff --git a/packages/core/src/stepFunctions/vue/executeStateMachine/executeStateMachine.ts b/packages/core/src/stepFunctions/vue/executeStateMachine/executeStateMachine.ts
new file mode 100644
index 00000000000..b4e47bc65f6
--- /dev/null
+++ b/packages/core/src/stepFunctions/vue/executeStateMachine/executeStateMachine.ts
@@ -0,0 +1,98 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import { StepFunctionsClient } from '../../../shared/clients/stepFunctions'
+
+import { getLogger } from '../../../shared/logger/logger'
+import { Result } from '../../../shared/telemetry/telemetry'
+import { StateMachineNode } from '../../explorer/stepFunctionsNodes'
+import { ExtContext } from '../../../shared/extensions'
+import { VueWebview } from '../../../webviews/main'
+import * as vscode from 'vscode'
+import { telemetry } from '../../../shared/telemetry/telemetry'
+
+interface StateMachine {
+    arn: string
+    name: string
+    region: string
+}
+
+export class ExecuteStateMachineWebview extends VueWebview {
+    public static readonly sourcePath: string = 'src/stepFunctions/vue/executeStateMachine/index.js'
+    public readonly id = 'remoteInvoke'
+
+    private readonly logger = getLogger()
+
+    public constructor(
+        private readonly channel: vscode.OutputChannel,
+        private readonly stateMachine: StateMachine
+    ) {
+        super(ExecuteStateMachineWebview.sourcePath)
+    }
+
+    public init() {
+        return this.stateMachine
+    }
+
+    public async executeStateMachine(input: string) {
+        let executeResult: Result = 'Succeeded'
+        this.logger.info('Starting Step Functions State Machine execution')
+
+        this.channel.show()
+        this.channel.appendLine('')
+        this.channel.appendLine(
+            localize(
+                'AWS.stepFunctions.executeStateMachine.info.executing',
+                'Starting execution of {0} in {1}...',
+                this.stateMachine.name,
+                this.stateMachine.region
+            )
+        )
+        this.channel.appendLine('')
+
+        try {
+            const client = new StepFunctionsClient(this.stateMachine.region)
+            const startExecResponse = await client.executeStateMachine({
+                stateMachineArn: this.stateMachine.arn,
+                input,
+            })
+            this.logger.info('started execution for Step Functions State Machine')
+            this.channel.appendLine(localize('AWS.stepFunctions.executeStateMachine.info.started', 'Execution started'))
+            this.channel.appendLine(startExecResponse.executionArn || '')
+        } catch (e) {
+            executeResult = 'Failed'
+            const error = e as Error
+            this.logger.error('Error starting execution for Step Functions State Machine: %s', error)
+            this.channel.appendLine(
+                localize(
+                    'AWS.stepFunctions.executeStateMachine.error.failedToStart',
+                    'There was an error starting execution for {0}, check AWS Toolkit logs for more information.',
+                    this.stateMachine.arn
+                )
+            )
+        } finally {
+            telemetry.stepfunctions_executeStateMachine.emit({ result: executeResult })
+        }
+    }
+}
+
+const Panel = VueWebview.compilePanel(ExecuteStateMachineWebview)
+
+export async function executeStateMachine(context: ExtContext, node: StateMachineNode): Promise<void> {
+    const wv = new Panel(context.extensionContext, context.outputChannel, {
+        arn: node.details.stateMachineArn || '',
+        name: node.details.name || '',
+        region: node.regionCode,
+    })
+
+    await wv.show({
+        title: localize('AWS.executeStateMachine.title', 'Start Execution'),
+        cssFiles: ['executeStateMachine.css'],
+    })
+    telemetry.stepfunctions_executeStateMachineView.emit()
+}
diff --git a/src/stepFunctions/vue/executeStateMachine/executeStateMachine.vue b/packages/core/src/stepFunctions/vue/executeStateMachine/executeStateMachine.vue
similarity index 93%
rename from src/stepFunctions/vue/executeStateMachine/executeStateMachine.vue
rename to packages/core/src/stepFunctions/vue/executeStateMachine/executeStateMachine.vue
index 85e90e50056..ce55ab7276c 100644
--- a/src/stepFunctions/vue/executeStateMachine/executeStateMachine.vue
+++ b/packages/core/src/stepFunctions/vue/executeStateMachine/executeStateMachine.vue
@@ -1,4 +1,4 @@
-/*! * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */
+/*! * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */
 
 <template>
     <div id="app">
@@ -101,13 +101,13 @@ export default defineComponent({
             // const self = this
             if (inputFile.files && inputFile.files.length > 0) {
                 const reader = new FileReader()
-                reader.onload = event => {
+                reader.onload = (event) => {
                     if (event.target) {
                         const result = event.target.result
                         this.executionInput = result as string
                     }
                 } // desired file content
-                reader.onerror = error => {
+                reader.onerror = (error) => {
                     throw error
                 }
                 reader.readAsText(inputFile.files[0])
@@ -116,7 +116,7 @@ export default defineComponent({
             }
         },
         sendInput: function () {
-            client.executeStateMachine(this.executionInput)
+            client.executeStateMachine(this.executionInput || '{}')
         },
     },
     mixins: [saveData],
diff --git a/packages/core/src/stepFunctions/vue/executeStateMachine/index.ts b/packages/core/src/stepFunctions/vue/executeStateMachine/index.ts
new file mode 100644
index 00000000000..a28f50c17fe
--- /dev/null
+++ b/packages/core/src/stepFunctions/vue/executeStateMachine/index.ts
@@ -0,0 +1,16 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { createApp } from 'vue'
+import component from './executeStateMachine.vue'
+
+const create = () => createApp(component)
+const app = create()
+app.mount('#vue-app')
+
+window.addEventListener('remount', () => {
+    app.unmount()
+    create().mount('#vue-app')
+})
diff --git a/src/stepFunctions/wizards/createStateMachineWizard.ts b/packages/core/src/stepFunctions/wizards/createStateMachineWizard.ts
similarity index 97%
rename from src/stepFunctions/wizards/createStateMachineWizard.ts
rename to packages/core/src/stepFunctions/wizards/createStateMachineWizard.ts
index e9842e3e9eb..62f0f3ac875 100644
--- a/src/stepFunctions/wizards/createStateMachineWizard.ts
+++ b/packages/core/src/stepFunctions/wizards/createStateMachineWizard.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -94,7 +94,7 @@ export class CreateStateMachineWizard extends Wizard<CreateStateMachineWizardRes
             })
         )
 
-        const templateItems = Object.values(TemplateFormats).map(v => ({ label: v, data: v }))
+        const templateItems = Object.values(TemplateFormats).map((v) => ({ label: v, data: v }))
         this.form.templateFormat.bindPrompter(() =>
             createQuickPick(templateItems, {
                 title: localize(
diff --git a/src/stepFunctions/wizards/previewStateMachineCDKWizard.ts b/packages/core/src/stepFunctions/wizards/previewStateMachineCDKWizard.ts
similarity index 78%
rename from src/stepFunctions/wizards/previewStateMachineCDKWizard.ts
rename to packages/core/src/stepFunctions/wizards/previewStateMachineCDKWizard.ts
index e3236720473..a8688072388 100644
--- a/src/stepFunctions/wizards/previewStateMachineCDKWizard.ts
+++ b/packages/core/src/stepFunctions/wizards/previewStateMachineCDKWizard.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -8,18 +8,18 @@ const localize = nls.loadMessageBundle()
 
 import * as vscode from 'vscode'
 import * as path from 'path'
-import { CdkAppLocation, getApp } from '../../cdk/explorer/cdkProject'
-import { ConstructNode, isStateMachine } from '../../cdk/explorer/nodes/constructNode'
-import { detectCdkProjects } from '../../cdk/explorer/detectCdkProjects'
+import { CdkAppLocation, getApp } from '../../awsService/cdk/explorer/cdkProject'
+import { ConstructNode, isStateMachine } from '../../awsService/cdk/explorer/nodes/constructNode'
+import { detectCdkProjects } from '../../awsService/cdk/explorer/detectCdkProjects'
 import { Wizard, WIZARD_BACK } from '../../shared/wizards/wizard'
 import { createQuickPick } from '../../shared/ui/pickerPrompter'
 import { createCommonButtons } from '../../shared/ui/buttons'
-import { ConstructTreeEntity } from '../../cdk/explorer/tree/types'
-import { getDisplayLabel } from '../../cdk/explorer/tree/treeInspector'
+import { ConstructTreeEntity } from '../../awsService/cdk/explorer/tree/types'
+import { getDisplayLabel } from '../../awsService/cdk/explorer/tree/treeInspector'
 
 function createLocationPrompter() {
-    const items = detectCdkProjects(vscode.workspace.workspaceFolders).then(locations => {
-        return locations.map(l => ({
+    const items = detectCdkProjects(vscode.workspace.workspaceFolders).then((locations) => {
+        return locations.map((l) => ({
             label: vscode.workspace.asRelativePath(l.cdkJsonUri),
             data: l,
         }))
@@ -51,9 +51,9 @@ export function getStateMachines(construct: ConstructTreeEntity) {
 
 function createResourcePrompter(location: CdkAppLocation) {
     const items = getApp(location)
-        .then(app => getStateMachines(app.constructTree.tree))
-        .then(constructs =>
-            constructs.map(c => ({
+        .then((app) => getStateMachines(app.constructTree.tree))
+        .then((constructs) =>
+            constructs.map((c) => ({
                 label: getDisplayLabel(c),
                 description: path.dirname(c.path),
                 data: { construct: c, location: location.treeUri.with({ fragment: c.path }) },
diff --git a/src/stepFunctions/wizards/publishStateMachineWizard.ts b/packages/core/src/stepFunctions/wizards/publishStateMachineWizard.ts
similarity index 87%
rename from src/stepFunctions/wizards/publishStateMachineWizard.ts
rename to packages/core/src/stepFunctions/wizards/publishStateMachineWizard.ts
index 10f5671a995..ed141ac1894 100644
--- a/src/stepFunctions/wizards/publishStateMachineWizard.ts
+++ b/packages/core/src/stepFunctions/wizards/publishStateMachineWizard.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -21,8 +21,8 @@ import { createQuickPick, DataQuickPickItem, QuickPickPrompter } from '../../sha
 import { Wizard, WIZARD_BACK } from '../../shared/wizards/wizard'
 import { isStepFunctionsRole } from '../utils'
 import { createRolePrompter } from '../../shared/ui/common/roles'
-import { DefaultIamClient } from '../../shared/clients/iamClient'
-import { DefaultStepFunctionsClient } from '../../shared/clients/stepFunctionsClient'
+import { IamClient } from '../../shared/clients/iam'
+import { StepFunctionsClient } from '../../shared/clients/stepFunctions'
 
 export enum PublishStateMachineAction {
     QuickCreate,
@@ -95,7 +95,7 @@ export interface PublishStateMachineWizardState {
 }
 
 function createStepFunctionsRolePrompter(region: string) {
-    const client = new DefaultIamClient(region)
+    const client = new IamClient(region)
 
     return createRolePrompter(client, {
         helpUrl: vscode.Uri.parse(sfnCreateIamRoleUrl),
@@ -109,14 +109,14 @@ function createStepFunctionsRolePrompter(region: string) {
 }
 
 async function* listStateMachines(region: string) {
-    const client = new DefaultStepFunctionsClient(region)
+    const client = new StepFunctionsClient(region)
 
     for await (const machine of client.listStateMachines()) {
         yield [
             {
-                label: machine.name,
-                data: machine.stateMachineArn,
-                description: machine.stateMachineArn,
+                label: machine.name || '',
+                data: machine.stateMachineArn || '',
+                description: machine.stateMachineArn || '',
             },
         ]
     }
@@ -156,24 +156,24 @@ export class PublishStateMachineWizard extends Wizard<PublishStateMachineWizardS
             createRegionPrompter(undefined, {
                 serviceFilter: 'states',
                 helpUrl: sfnSupportedRegionsUrl,
-            }).transform(r => r.id)
+            }).transform((r) => r.id)
         )
 
         form.publishAction.bindPrompter(({ region }) => createPublishActionPrompter(region!))
 
         form.createResponse.roleArn.bindPrompter(
-            ({ region }) => createStepFunctionsRolePrompter(region!).transform(r => r.Arn),
+            ({ region }) => createStepFunctionsRolePrompter(region!).transform((r) => r.Arn),
             {
-                showWhen: form => form.publishAction === PublishStateMachineAction.QuickCreate,
+                showWhen: (form) => form.publishAction === PublishStateMachineAction.QuickCreate,
             }
         )
 
         form.createResponse.name.bindPrompter(() => createNamePrompter(), {
-            showWhen: form => form.publishAction === PublishStateMachineAction.QuickCreate,
+            showWhen: (form) => form.publishAction === PublishStateMachineAction.QuickCreate,
         })
 
         form.updateResponse.stateMachineArn.bindPrompter(({ region }) => createUpdateStateMachinePrompter(region!), {
-            showWhen: form => form.publishAction === PublishStateMachineAction.QuickUpdate,
+            showWhen: (form) => form.publishAction === PublishStateMachineAction.QuickUpdate,
         })
     }
 }
diff --git a/packages/core/src/stepFunctions/workflowStudio/activation.ts b/packages/core/src/stepFunctions/workflowStudio/activation.ts
new file mode 100644
index 00000000000..74bcc24e65c
--- /dev/null
+++ b/packages/core/src/stepFunctions/workflowStudio/activation.ts
@@ -0,0 +1,32 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { WorkflowStudioEditorProvider } from './workflowStudioEditorProvider'
+import { Commands } from '../../shared/vscode/commands2'
+import globals from '../../shared/extensionGlobals'
+
+/**
+ * Activates the extension and registers all necessary components.
+ */
+export async function activate(): Promise<void> {
+    globals.context.subscriptions.push(WorkflowStudioEditorProvider.register())
+
+    // Open the file with Workflow Studio editor in a new tab, or focus on the tab with WFS if it is already open
+    globals.context.subscriptions.push(
+        Commands.register('aws.stepfunctions.openWithWorkflowStudio', async (uri: vscode.Uri) => {
+            await WorkflowStudioEditorProvider.openWithWorkflowStudio(uri)
+        })
+    )
+
+    // Close the active editor and open the file with Workflow Studio (or close and switch to the existing relevant tab).
+    // This command is expected to always be called from the active tab in the default editor mode
+    globals.context.subscriptions.push(
+        Commands.register('aws.stepfunctions.switchToWorkflowStudio', async (uri: vscode.Uri) => {
+            await vscode.commands.executeCommand('workbench.action.closeActiveEditor')
+            await WorkflowStudioEditorProvider.openWithWorkflowStudio(uri)
+        })
+    )
+}
diff --git a/packages/core/src/stepFunctions/workflowStudio/handleMessage.ts b/packages/core/src/stepFunctions/workflowStudio/handleMessage.ts
new file mode 100644
index 00000000000..2b548ab957f
--- /dev/null
+++ b/packages/core/src/stepFunctions/workflowStudio/handleMessage.ts
@@ -0,0 +1,278 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    Command,
+    Message,
+    MessageType,
+    SaveFileRequestMessage,
+    WebviewContext,
+    InitResponseMessage,
+    FileChangedMessage,
+    FileChangeEventTrigger,
+    SyncFileRequestMessage,
+    ApiCallRequestMessage,
+    UnsupportedMessage,
+    WorkflowMode,
+} from './types'
+import { submitFeedback } from '../../feedback/vue/submitFeedback'
+import { placeholder } from '../../shared/vscode/commands2'
+import * as nls from 'vscode-nls'
+import vscode from 'vscode'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { ToolkitError } from '../../shared/errors'
+import { WorkflowStudioApiHandler } from './workflowStudioApiHandler'
+import globals from '../../shared/extensionGlobals'
+import { getLogger } from '../../shared/logger/logger'
+import { publishStateMachine } from '../commands/publishStateMachine'
+import {
+    getStateMachineDefinitionFromCfnTemplate,
+    toUnescapedAslJsonString,
+} from '../commands/visualizeStateMachine/getStateMachineDefinitionFromCfnTemplate'
+
+const localize = nls.loadMessageBundle()
+
+/**
+ * Handles messages received from the webview. Depending on the message type and command,
+ * calls the appropriate handler function
+ * @param message The message received from the webview
+ * @param context The context object containing information about the webview environment
+ */
+export async function handleMessage(message: Message, context: WebviewContext) {
+    const { command, messageType } = message
+    const isReadonlyMode = context.mode === WorkflowMode.Readonly
+    if (messageType === MessageType.REQUEST) {
+        switch (command) {
+            case Command.INIT:
+                void initMessageHandler(context)
+                break
+            case Command.SAVE_FILE:
+                !isReadonlyMode && void saveFileMessageHandler(message as SaveFileRequestMessage, context)
+                break
+            case Command.SAVE_FILE_AND_DEPLOY:
+                !isReadonlyMode && void saveFileAndDeployMessageHandler(message as SaveFileRequestMessage, context)
+                break
+            case Command.AUTO_SYNC_FILE:
+                !isReadonlyMode && void autoSyncFileMessageHandler(message as SyncFileRequestMessage, context)
+                break
+            case Command.CLOSE_WFS:
+                void closeCustomEditorMessageHandler(context)
+                break
+            case Command.OPEN_FEEDBACK:
+                !isReadonlyMode && void submitFeedback(placeholder, 'Workflow Studio')
+                break
+            case Command.API_CALL:
+                !isReadonlyMode && apiCallMessageHandler(message as ApiCallRequestMessage, context)
+                break
+            default:
+                void handleUnsupportedMessage(context, message)
+                break
+        }
+    } else if (messageType === MessageType.BROADCAST) {
+        switch (command) {
+            case Command.LOAD_STAGE:
+                void loadStageMessageHandler(context)
+                break
+            default:
+                void handleUnsupportedMessage(context, message)
+                break
+        }
+    } else {
+        void handleUnsupportedMessage(context, message)
+    }
+}
+
+/**
+ * Method for extracting fileContents from the context object based on different WorkflowStudio modes.
+ * @param context The context object containing the necessary information for the webview.
+ */
+function getFileContents(context: WebviewContext): string {
+    const filePath = context.defaultTemplatePath
+    if (context.mode === WorkflowMode.Readonly) {
+        const definitionString = getStateMachineDefinitionFromCfnTemplate(context.stateMachineName, filePath)
+        return toUnescapedAslJsonString(definitionString || '')
+    } else {
+        return context.textDocument.getText().toString()
+    }
+}
+
+/**
+ * Handler for when the webview is ready.
+ * This handler is used to initialize the webview with the contents of the asl file selected.
+ * @param context The context object containing the necessary information for the webview.
+ */
+async function initMessageHandler(context: WebviewContext) {
+    const filePath = context.defaultTemplatePath
+
+    try {
+        const fileContents = getFileContents(context)
+        context.fileStates[filePath] = { fileContents }
+
+        await broadcastFileChange(context, 'INITIAL_RENDER')
+        context.loaderNotification?.progress.report({ increment: 25 })
+    } catch (e) {
+        await context.panel.webview.postMessage({
+            messageType: MessageType.RESPONSE,
+            command: Command.INIT,
+            filePath,
+            isSuccess: false,
+            failureReason: (e as Error).message,
+        } as InitResponseMessage)
+    }
+}
+
+/**
+ * Helper Function to broadcast the local file change to the Workflow Studio view
+ * @param context: The context of the webview
+ * @param trigger: The action that triggered the change (either initial render or user saving the file)
+ */
+export async function broadcastFileChange(context: WebviewContext, trigger: FileChangeEventTrigger) {
+    const fileContents = getFileContents(context)
+    await context.panel.webview.postMessage({
+        messageType: MessageType.BROADCAST,
+        command: Command.FILE_CHANGED,
+        fileName:
+            context.mode === WorkflowMode.Readonly && context.stateMachineName
+                ? context.stateMachineName
+                : context.defaultTemplateName,
+        fileContents,
+        filePath: context.defaultTemplatePath,
+        trigger,
+    } as FileChangedMessage)
+}
+
+/**
+ * Handler for managing webview stage load, which updates load notifications.
+ * @param message The message containing the load stage.
+ * @param context The context object containing the necessary information for the webview.
+ */
+async function loadStageMessageHandler(context: WebviewContext) {
+    context.loaderNotification?.progress.report({ increment: 25 })
+    setTimeout(() => {
+        context.loaderNotification?.resolve()
+    }, 100)
+}
+
+/**
+ * Handler for closing WFS custom editor. When called, disposes webview panel and opens default VSCode editor
+ * @param context The context object containing the necessary information for the webview.
+ */
+export async function closeCustomEditorMessageHandler(context: WebviewContext) {
+    await telemetry.stepfunctions_closeWorkflowStudio.run(async (span) => {
+        span.record({
+            id: context.fileId,
+        })
+        context.panel.dispose()
+        await vscode.commands.executeCommand('vscode.openWith', context.textDocument.uri, 'default')
+    })
+}
+
+/**
+ * Handler for saving a file from the webview which updates the workspace and saves the file.
+ * Triggered when the user explicitly applies save action in WFS
+ * @param request The request message containing the file contents.
+ * @param context The webview context containing the necessary information for saving the file.
+ */
+async function saveFileMessageHandler(request: SaveFileRequestMessage, context: WebviewContext) {
+    await telemetry.stepfunctions_saveFile.run(async (span) => {
+        span.record({
+            id: context.fileId,
+            saveType: 'MANUAL_SAVE',
+            source: 'WORKFLOW_STUDIO',
+            isInvalidJson: request.isInvalidJson,
+        })
+
+        try {
+            await context.textDocument.save()
+            void vscode.window.showInformationMessage(
+                localize(
+                    'AWS.stepFunctions.workflowStudio.actions.saveSuccessMessage',
+                    '{0} has been saved',
+                    context.defaultTemplateName
+                )
+            )
+        } catch (err) {
+            throw ToolkitError.chain(err, 'Could not save asl file.', {
+                code: 'SaveFailed',
+            })
+        }
+    })
+}
+
+/**
+ * Handler for saving a file and starting the state machine deployment flow while staying in WFS view.
+ * Triggered when the user triggers 'Save and Deploy' action in WFS
+ * @param request The request message containing the file contents.
+ * @param context The webview context containing the necessary information for saving the file.
+ */
+async function saveFileAndDeployMessageHandler(request: SaveFileRequestMessage, context: WebviewContext) {
+    await saveFileMessageHandler(request, context)
+    await publishStateMachine({
+        awsContext: globals.awsContext,
+        outputChannel: globals.outputChannel,
+        text: context.textDocument,
+    })
+
+    telemetry.ui_click.emit({
+        elementId: 'stepfunctions_saveAndDeploy',
+    })
+}
+
+/**
+ * Handler for auto syncing a file from the webview which updates the workspace but does not save the file.
+ * Triggered on every code change from WFS, including invalid JSON.
+ * @param request The request message containing the file contents.
+ * @param context The webview context containing the necessary information for saving the file.
+ */
+async function autoSyncFileMessageHandler(request: SyncFileRequestMessage, context: WebviewContext) {
+    await telemetry.stepfunctions_saveFile.run(async (span) => {
+        span.record({
+            id: context.fileId,
+            saveType: 'AUTO_SYNC',
+            source: 'WORKFLOW_STUDIO',
+            isInvalidJson: request.isInvalidJson,
+        })
+
+        try {
+            const edit = new vscode.WorkspaceEdit()
+            edit.replace(
+                context.textDocument.uri,
+                new vscode.Range(0, 0, context.textDocument.lineCount, 0),
+                request.fileContents
+            )
+            await vscode.workspace.applyEdit(edit)
+        } catch (err) {
+            throw ToolkitError.chain(err, 'Could not autosave asl file.', {
+                code: 'AutoSaveFailed',
+            })
+        }
+    })
+}
+
+/**
+ * Handler for making API calls from the webview and returning the response.
+ * @param request The request message containing the API to call and the parameters
+ * @param context The webview context used for returning the API response to the webview
+ */
+function apiCallMessageHandler(request: ApiCallRequestMessage, context: WebviewContext) {
+    const logger = getLogger('stepfunctions')
+    const apiHandler = new WorkflowStudioApiHandler(globals.awsContext.getCredentialDefaultRegion(), context)
+    apiHandler.performApiCall(request).catch((error) => logger.error('%s API call failed: %O', request.apiName, error))
+}
+
+/**
+ * Handles unsupported or unrecognized messages by sending a response to the webview. Ensures compatibility with future
+ * commands and message types, preventing issues if the user has an outdated extension version.
+ * @param context The context object containing information about the webview environment
+ * @param command The command received from the webview
+ * @param messageType The type of the message received
+ */
+async function handleUnsupportedMessage(context: WebviewContext, originalMessage: Message) {
+    await context.panel.webview.postMessage({
+        messageType: MessageType.RESPONSE,
+        command: Command.UNSUPPORTED_COMMAND,
+        originalMessage,
+    } as UnsupportedMessage)
+}
diff --git a/packages/core/src/stepFunctions/workflowStudio/types.ts b/packages/core/src/stepFunctions/workflowStudio/types.ts
new file mode 100644
index 00000000000..22a93a8404d
--- /dev/null
+++ b/packages/core/src/stepFunctions/workflowStudio/types.ts
@@ -0,0 +1,112 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { ListRolesCommandInput } from '@aws-sdk/client-iam'
+import { TestStateInput } from '@aws-sdk/client-sfn'
+import * as vscode from 'vscode'
+
+export enum WorkflowMode {
+    Editable = 'toolkit',
+    Readonly = 'readonly',
+}
+
+export type WebviewContext = {
+    stateMachineName: string
+    mode: WorkflowMode
+    panel: vscode.WebviewPanel
+    textDocument: vscode.TextDocument
+    disposables: vscode.Disposable[]
+    workSpacePath: string
+    defaultTemplatePath: string
+    defaultTemplateName: string
+    fileStates: Record<string, FileWatchInfo>
+    loaderNotification: undefined | LoaderNotification
+    fileId: string
+}
+
+export type LoaderNotification = {
+    progress: vscode.Progress<{
+        message?: string | undefined
+        increment?: number | undefined
+    }>
+    cancellationToken: vscode.CancellationToken
+    resolve: () => void
+}
+
+export enum MessageType {
+    REQUEST = 'REQUEST',
+    RESPONSE = 'RESPONSE',
+    BROADCAST = 'BROADCAST',
+}
+
+export enum Command {
+    INIT = 'INIT',
+    SAVE_FILE = 'SAVE_FILE',
+    SAVE_FILE_AND_DEPLOY = 'SAVE_FILE_AND_DEPLOY',
+    AUTO_SYNC_FILE = 'AUTO_SYNC_FILE',
+    FILE_CHANGED = 'FILE_CHANGED',
+    LOAD_STAGE = 'LOAD_STAGE',
+    OPEN_FEEDBACK = 'OPEN_FEEDBACK',
+    CLOSE_WFS = 'CLOSE_WFS',
+    API_CALL = 'API_CALL',
+    UNSUPPORTED_COMMAND = 'UNSUPPORTED_COMMAND',
+}
+
+export type FileWatchInfo = {
+    fileContents: string
+}
+
+export interface Message {
+    command: Command
+    messageType: MessageType
+}
+
+export type FileChangeEventTrigger = 'INITIAL_RENDER' | 'MANUAL_SAVE'
+
+export interface FileChangedMessage extends Message {
+    fileName: string
+    fileContents: string
+    filePath: string
+    trigger: FileChangeEventTrigger
+}
+
+export interface UnsupportedMessage extends Message {
+    originalMessage: Message
+}
+
+export interface InitResponseMessage extends Omit<FileChangedMessage, 'trigger'> {
+    isSuccess: boolean
+    failureReason?: string
+}
+
+export interface SaveFileRequestMessage extends Message {
+    isInvalidJson: boolean
+}
+
+export interface SyncFileRequestMessage extends SaveFileRequestMessage {
+    fileContents: string
+}
+
+export enum ApiAction {
+    IAMListRoles = 'iam:ListRoles',
+    SFNTestState = 'sfn:TestState',
+}
+
+type ApiCallRequestMapping = {
+    [ApiAction.IAMListRoles]: ListRolesCommandInput
+    [ApiAction.SFNTestState]: TestStateInput
+}
+
+interface ApiCallRequestMessageBase<ApiName extends ApiAction> extends Message {
+    requestId: string
+    apiName: ApiName
+    params: ApiCallRequestMapping[ApiName]
+}
+
+/**
+ * The message from the webview describing what API and parameters to call.
+ */
+export type ApiCallRequestMessage =
+    | ApiCallRequestMessageBase<ApiAction.IAMListRoles>
+    | ApiCallRequestMessageBase<ApiAction.SFNTestState>
diff --git a/packages/core/src/stepFunctions/workflowStudio/workflowStudioApiHandler.ts b/packages/core/src/stepFunctions/workflowStudio/workflowStudioApiHandler.ts
new file mode 100644
index 00000000000..6c0fb850b9d
--- /dev/null
+++ b/packages/core/src/stepFunctions/workflowStudio/workflowStudioApiHandler.ts
@@ -0,0 +1,79 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as StepFunctions from '@aws-sdk/client-sfn'
+import { IamClient, IamRole } from '../../shared/clients/iam'
+import { StepFunctionsClient } from '../../shared/clients/stepFunctions'
+import { ApiAction, ApiCallRequestMessage, Command, MessageType, WebviewContext } from './types'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { ListRolesRequest } from '@aws-sdk/client-iam'
+
+export class WorkflowStudioApiHandler {
+    public constructor(
+        region: string,
+        private readonly context: WebviewContext,
+        private readonly clients = {
+            sfn: new StepFunctionsClient(region),
+            iam: new IamClient(region),
+        }
+    ) {}
+
+    /**
+     * Performs the API call on behalf of the webview, and sends the sucesss or error response to the webview.
+     */
+    public async performApiCall({ apiName, params, requestId }: ApiCallRequestMessage): Promise<void> {
+        try {
+            let response
+            switch (apiName) {
+                case ApiAction.IAMListRoles:
+                    response = await this.listRoles(params)
+                    break
+                case ApiAction.SFNTestState:
+                    response = await this.testState(params)
+                    break
+                default:
+                    throw new Error(`Unknown API: ${apiName}`)
+            }
+
+            await this.context.panel.webview.postMessage({
+                messageType: MessageType.RESPONSE,
+                command: Command.API_CALL,
+                apiName,
+                response,
+                requestId,
+                isSuccess: true,
+            })
+        } catch (err) {
+            await this.context.panel.webview.postMessage({
+                messageType: MessageType.RESPONSE,
+                command: Command.API_CALL,
+                apiName,
+                error:
+                    err instanceof Error
+                        ? {
+                              message: err.message,
+                              name: err.name,
+                              stack: err.stack,
+                          }
+                        : {
+                              message: String(err),
+                          },
+                requestId,
+                isSuccess: false,
+            })
+        }
+    }
+
+    public async testState(params: StepFunctions.TestStateInput): Promise<StepFunctions.TestStateOutput> {
+        telemetry.ui_click.emit({
+            elementId: 'stepfunctions_testState',
+        })
+        return this.clients.sfn.testState(params)
+    }
+
+    public async listRoles(params: ListRolesRequest): Promise<IamRole[]> {
+        return this.clients.iam.resolveRoles(params)
+    }
+}
diff --git a/packages/core/src/stepFunctions/workflowStudio/workflowStudioEditor.ts b/packages/core/src/stepFunctions/workflowStudio/workflowStudioEditor.ts
new file mode 100644
index 00000000000..ba719856516
--- /dev/null
+++ b/packages/core/src/stepFunctions/workflowStudio/workflowStudioEditor.ts
@@ -0,0 +1,225 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as path from 'path'
+import * as vscode from 'vscode'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { i18n } from '../../shared/i18n-helper'
+import { broadcastFileChange } from './handleMessage'
+import { FileWatchInfo, WebviewContext, WorkflowMode } from './types'
+import { CancellationError } from '../../shared/utilities/timeoutUtils'
+import { handleMessage } from './handleMessage'
+import { isInvalidJsonFile } from '../utils'
+import { setContext } from '../../shared/vscode/setContext'
+import globals from '../../shared/extensionGlobals'
+
+/**
+ * The main class for Workflow Studio Editor. This class handles the creation and management
+ * of the webview panel for integration. It also handles the communication
+ * between the webview and the extension context. This class stores the state of the
+ * local file that is being edited in the webview panel, in the property 'fileStates'.
+ */
+export class WorkflowStudioEditor {
+    public readonly documentUri: vscode.Uri
+    public webviewPanel: vscode.WebviewPanel
+    protected readonly disposables: vscode.Disposable[] = []
+    protected isPanelDisposed = false
+    private readonly onVisualizationDisposeEmitter = new vscode.EventEmitter<void>()
+    private fileId: string
+    private readonly mode: WorkflowMode
+    private readonly stateMachineName: string
+    public workSpacePath: string
+    public defaultTemplatePath: string
+    public defaultTemplateName: string
+    // fileStates is used to store the state of the file being edited and achieve bi-direction sync
+    public fileStates: Record<string, FileWatchInfo>
+    private getWebviewContent: () => Promise<string>
+
+    public constructor(
+        textDocument: vscode.TextDocument,
+        webviewPanel: vscode.WebviewPanel,
+        fileId: string,
+        getWebviewContent: () => Promise<string>,
+        mode: WorkflowMode,
+        stateMachineName: string
+    ) {
+        this.mode = mode
+        this.stateMachineName = stateMachineName
+        this.getWebviewContent = getWebviewContent
+        this.documentUri = textDocument.uri
+        this.webviewPanel = webviewPanel
+        this.fileStates = {}
+        this.workSpacePath = path.dirname(textDocument.uri.fsPath)
+        this.defaultTemplatePath = textDocument.uri.fsPath
+        this.defaultTemplateName = path.basename(this.defaultTemplatePath)
+        this.fileId = fileId
+
+        telemetry.stepfunctions_openWorkflowStudio.emit({
+            id: this.fileId,
+        })
+
+        this.setupWebviewPanel(textDocument)
+    }
+
+    public get onVisualizationDisposeEvent(): vscode.Event<void> {
+        return this.onVisualizationDisposeEmitter.event
+    }
+    public getPanel(): vscode.WebviewPanel | undefined {
+        if (!this.isPanelDisposed) {
+            return this.webviewPanel
+        }
+    }
+
+    public showPanel(): void {
+        this.getPanel()?.reveal()
+    }
+
+    public async refreshPanel() {
+        if (!this.isPanelDisposed) {
+            this.webviewPanel.dispose()
+            const document = await vscode.workspace.openTextDocument(this.documentUri)
+            this.setupWebviewPanel(document)
+        }
+    }
+
+    protected getText(textDocument: vscode.TextDocument): string {
+        return textDocument.getText()
+    }
+
+    /**
+     * Sets up the webview panel for Workflow Studio Editor. This includes creating the
+     * panel, setting up the webview content, and handling the communication between the webview
+     * and the extension context.
+     * @param textDocument The text document to be displayed in the webview panel.
+     * @private
+     */
+    private setupWebviewPanel(textDocument: vscode.TextDocument) {
+        const documentUri = textDocument.uri
+
+        const contextObject: WebviewContext = {
+            panel: this.webviewPanel,
+            textDocument: textDocument,
+            disposables: this.disposables,
+            workSpacePath: this.workSpacePath,
+            defaultTemplatePath: this.defaultTemplatePath,
+            defaultTemplateName: this.defaultTemplateName,
+            fileStates: this.fileStates,
+            loaderNotification: undefined,
+            fileId: this.fileId,
+            mode: this.mode,
+            stateMachineName: this.stateMachineName,
+        }
+
+        void vscode.window.withProgress(
+            {
+                location: vscode.ProgressLocation.Notification,
+                title: i18n('AWS.stepFunctions.workflowStudio.actions.progressMessage'),
+                cancellable: true,
+            },
+            async (progress, token) => {
+                token.onCancellationRequested(async () => {
+                    // Cancel opening in Worflow Studio and open regular code editor instead
+                    contextObject.panel.dispose()
+                    await vscode.commands.executeCommand('vscode.openWith', documentUri, 'default')
+                    throw new CancellationError('user')
+                })
+
+                progress.report({ increment: 0 })
+
+                return new Promise<void>(async (resolve) => {
+                    contextObject.loaderNotification = {
+                        progress: progress,
+                        cancellationToken: token,
+                        resolve,
+                    }
+
+                    // Initialise webview panel for Workflow Studio and set up initial content
+                    this.webviewPanel.webview.options = {
+                        enableScripts: true,
+                        localResourceRoots: [globals.context.extensionUri],
+                    }
+
+                    // Set the initial html for the webpage
+                    this.webviewPanel.webview.html = await this.getWebviewContent()
+                    progress.report({ increment: 15 })
+
+                    // The text document acts as our model, thus we send and event to the webview on file save to trigger update
+                    contextObject.disposables.push(
+                        vscode.workspace.onDidSaveTextDocument(async (savedDocument) => {
+                            if (savedDocument.uri.toString() === this.documentUri.toString()) {
+                                await telemetry.stepfunctions_saveFile.run(async (span) => {
+                                    span.record({
+                                        id: contextObject.fileId,
+                                        saveType: 'MANUAL_SAVE',
+                                        source: 'VSCODE',
+                                        isInvalidJson: isInvalidJsonFile(contextObject.textDocument),
+                                    })
+                                    await broadcastFileChange(contextObject, 'MANUAL_SAVE')
+                                })
+                            }
+                        })
+                    )
+
+                    // When rendering StateMachine Graph from CDK applications, we are getting StateMachine ASL definition from the CloudFormation template produced by `cdk synth`
+                    // Track file content update in the CloudFormation template and update the webview to render the updated StateMachine Graph
+                    if (contextObject.mode === WorkflowMode.Readonly) {
+                        const watcher = vscode.workspace.createFileSystemWatcher(contextObject.textDocument.uri.fsPath)
+                        watcher.onDidChange(async () => {
+                            await telemetry.stepfunctions_saveFile.run(async (span) => {
+                                span.record({
+                                    id: contextObject.fileId,
+                                    saveType: 'AUTO_SAVE',
+                                    source: 'CFN_TEMPLATE',
+                                    isInvalidJson: isInvalidJsonFile(contextObject.textDocument),
+                                })
+                                await broadcastFileChange(contextObject, 'MANUAL_SAVE')
+                            })
+                        })
+
+                        contextObject.disposables.push(watcher)
+                    }
+
+                    // Handle messages from the webview
+                    this.disposables.push(
+                        this.webviewPanel.webview.onDidReceiveMessage(async (message) => {
+                            await handleMessage(message, contextObject)
+                        })
+                    )
+
+                    // Track webview focus to suppress VSCode's default undo, as WFS has its own
+                    await setContext('aws.stepFunctions.isWorkflowStudioFocused', true)
+                    this.disposables.push(
+                        this.webviewPanel.onDidChangeViewState(async (event) => {
+                            if (event.webviewPanel.active) {
+                                await setContext('aws.stepFunctions.isWorkflowStudioFocused', true)
+                            } else {
+                                await setContext('aws.stepFunctions.isWorkflowStudioFocused', false)
+                            }
+                        })
+                    )
+
+                    // When the panel is closed, dispose of any disposables/remove subscriptions
+                    this.disposables.push(
+                        this.webviewPanel.onDidDispose(async () => {
+                            if (this.isPanelDisposed) {
+                                return
+                            }
+
+                            await setContext('aws.stepFunctions.isWorkflowStudioFocused', false)
+                            this.isPanelDisposed = true
+                            resolve()
+                            this.onVisualizationDisposeEmitter.fire()
+                            for (const disposable of this.disposables) {
+                                disposable.dispose()
+                            }
+                            this.onVisualizationDisposeEmitter.dispose()
+                        })
+                    )
+                    progress.report({ increment: 15 })
+                })
+            }
+        )
+    }
+}
diff --git a/packages/core/src/stepFunctions/workflowStudio/workflowStudioEditorProvider.ts b/packages/core/src/stepFunctions/workflowStudio/workflowStudioEditorProvider.ts
new file mode 100644
index 00000000000..797ac80fbe7
--- /dev/null
+++ b/packages/core/src/stepFunctions/workflowStudio/workflowStudioEditorProvider.ts
@@ -0,0 +1,225 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../../shared/logger/logger'
+import request from '../../shared/request'
+import { getClientId } from '../../shared/telemetry/util'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import globals from '../../shared/extensionGlobals'
+import { getStringHash } from '../../shared/utilities/textUtilities'
+import { ToolkitError } from '../../shared/errors'
+import { getTabSizeSetting } from '../../shared/utilities/editorUtilities'
+import { WorkflowStudioEditor } from './workflowStudioEditor'
+import { i18n } from '../../shared/i18n-helper'
+import { isInvalidJsonFile, isInvalidYamlFile } from '../utils'
+import { WorkflowMode } from './types'
+
+const isLocalDev = false
+const localhost = 'http://127.0.0.1:3002'
+const cdn = 'https://d5t62uwepi9lu.cloudfront.net'
+let clientId = ''
+
+/**
+ * Provider for Workflow Studio editors.
+ *
+ * Workflow Studio editor is used for `.asl.json`, `.asl.yaml` and `.asl.yml` files.
+ * To get started, run this extension and open any file with one of these extensions in VS Code.
+ */
+export class WorkflowStudioEditorProvider implements vscode.CustomTextEditorProvider {
+    public static readonly viewType = 'workflowStudio.asl'
+
+    /**
+     * Opens a file in the Workflow Studio editor, after validating the document.
+     * @param uri The URI of the document to open in the Workflow Studio editor.
+     * @param params Optional parameters to customize the WebView panel.
+     */
+    public static async openWithWorkflowStudio(
+        uri: vscode.Uri,
+        params?: Parameters<typeof vscode.window.createWebviewPanel>[2]
+    ) {
+        const document = await vscode.workspace.openTextDocument(uri)
+        await telemetry.stepfunctions_openWorkflowStudio.run(async () => {
+            await this.validateAndThrowIfInvalid(document)
+            await vscode.commands.executeCommand('vscode.openWith', uri, WorkflowStudioEditorProvider.viewType, params)
+        })
+    }
+
+    /**
+     * Validates the document to ensure it is either valid JSON or YAML.
+     * If the document is invalid, a warning is shown (if specified) and an error is thrown to stop further execution.
+     * @param document The document to validate.
+     * @param alertOnError If true, shows a warning message when the document is invalid. Defaults to `false`.
+     */
+    private static async validateAndThrowIfInvalid(
+        document: vscode.TextDocument,
+        alertOnError?: boolean
+    ): Promise<void> {
+        const isInvalidJson = isInvalidJsonFile(document)
+        const isInvalidYaml = isInvalidYamlFile(document)
+
+        if (isInvalidJson || isInvalidYaml) {
+            const language = isInvalidJson ? 'JSON' : 'YAML'
+            const errorKey = isInvalidJson ? 'InvalidJSONContent' : 'InvalidYAMLContent'
+
+            if (alertOnError) {
+                void vscode.window.showErrorMessage(i18n(`AWS.stepFunctions.workflowStudio.actions.${errorKey}`))
+            }
+
+            throw ToolkitError.chain(
+                `Invalid ${language} file`,
+                `The Workflow Studio editor was not opened because the ${language} in the file is invalid`,
+                { code: errorKey }
+            )
+        }
+    }
+
+    /**
+     * Registers a new custom editor provider for asl files.
+     * @remarks This should only be called once per extension.
+     * @param context The extension context
+     */
+    public static register(): vscode.Disposable {
+        const provider = new WorkflowStudioEditorProvider()
+        return vscode.window.registerCustomEditorProvider(WorkflowStudioEditorProvider.viewType, provider, {
+            webviewOptions: {
+                enableFindWidget: true,
+                retainContextWhenHidden: true, // Retain content when switching tabs
+            },
+        })
+    }
+
+    protected webviewHtml: string
+    protected readonly managedVisualizations = new Map<string, WorkflowStudioEditor>()
+    protected readonly logger = getLogger()
+
+    constructor() {
+        this.webviewHtml = ''
+    }
+
+    /**
+     * Fetches the webview HTML from the CDN or local server.
+     * @private
+     */
+    private async fetchWebviewHtml() {
+        const source = isLocalDev ? localhost : cdn
+        const response = await request.fetch('GET', `${source}/index.html`).response
+        this.webviewHtml = await response.text()
+
+        for (const visualization of this.managedVisualizations.values()) {
+            await visualization.refreshPanel()
+        }
+    }
+
+    /**
+     * Gets the webview content for Workflow Studio.
+     * @private
+     */
+    private getWebviewContent = async (mode: WorkflowMode) => {
+        const htmlFileSplit = this.webviewHtml.split('<head>')
+
+        // Set asset source to CDN
+        const source = isLocalDev ? localhost : cdn
+        const baseTag = `<base href='${source}'/>`
+
+        // Set locale, dark mode
+        const locale = vscode.env.language
+        const localeTag = `<meta name='locale' content='${locale}'>`
+        const theme = vscode.window.activeColorTheme.kind
+        const isDarkMode = theme === vscode.ColorThemeKind.Dark || theme === vscode.ColorThemeKind.HighContrast
+        const tabSizeTag = `<meta name='tab-size' content='${getTabSizeSetting()}'>`
+        const darkModeTag = `<meta name='dark-mode' content='${isDarkMode}'>`
+
+        const modeTag = `<meta name="workflow-mode" content="${mode}" />`
+        return `${htmlFileSplit[0]} <head> ${baseTag} ${localeTag} ${darkModeTag} ${tabSizeTag} ${modeTag} ${htmlFileSplit[1]}`
+    }
+
+    /**
+     * Called when the custom editor is opened.
+     * @param document:  The document to be displayed in the editor.
+     * @param webviewPanel: The webview panel that the editor should be displayed in.
+     * @param _token: A cancellation token that can be used to cancel the editor.
+     * @returns A promise that resolves when the editor is resolved.
+     */
+    public async resolveCustomTextEditor(
+        document: vscode.TextDocument,
+        webviewPanel: vscode.WebviewPanel,
+        _token: vscode.CancellationToken
+    ): Promise<void> {
+        const uriSearchParams = new URLSearchParams(document.uri.query)
+        const stateMachineName = uriSearchParams.get('statemachineName') || ''
+        const workflowMode = (uriSearchParams.get('workflowMode') as WorkflowMode) || WorkflowMode.Editable
+        await telemetry.stepfunctions_openWorkflowStudio.run(async () => {
+            const reopenWithDefaultEditor = async () => {
+                await vscode.commands.executeCommand('vscode.openWith', document.uri, 'default')
+                webviewPanel.dispose()
+            }
+
+            try {
+                await WorkflowStudioEditorProvider.validateAndThrowIfInvalid(document, true)
+            } catch (e) {
+                // If the document is invalid, reopen it with the default editor and re-throw the error
+                await reopenWithDefaultEditor()
+                throw e
+            }
+
+            if (!this.webviewHtml) {
+                try {
+                    await this.fetchWebviewHtml()
+                } catch (e) {
+                    await reopenWithDefaultEditor()
+
+                    void vscode.window.showWarningMessage(
+                        i18n('AWS.stepFunctions.workflowStudio.actions.webviewFetchFailed')
+                    )
+                    throw ToolkitError.chain(
+                        'Failed to fetch editor content',
+                        'Could not retrieve content for the Workflow Studio editor',
+                        {
+                            code: 'webviewFetchFailed',
+                        }
+                    )
+                }
+            }
+
+            if (clientId === '') {
+                clientId = getClientId(globals.globalState)
+            }
+
+            const existingVisualization = this.managedVisualizations.get(document.uri.fsPath)
+            if (existingVisualization) {
+                // Prevent opening multiple custom editors for a single file
+                await reopenWithDefaultEditor()
+            } else {
+                // Construct new visualization
+                try {
+                    const fileId = getStringHash(`${document.uri.fsPath}${clientId}`)
+                    const newVisualization = new WorkflowStudioEditor(
+                        document,
+                        webviewPanel,
+                        fileId,
+                        () => this.getWebviewContent(workflowMode),
+                        workflowMode,
+                        stateMachineName
+                    )
+                    this.handleNewVisualization(document.uri.fsPath, newVisualization)
+                } catch (err) {
+                    throw ToolkitError.chain(err, 'Could not open Workflow Studio editor', {
+                        code: 'OpenWorkflowStudioFailed',
+                    })
+                }
+            }
+        })
+    }
+
+    protected handleNewVisualization(key: string, visualization: WorkflowStudioEditor): void {
+        this.managedVisualizations.set(key, visualization)
+
+        const visualizationDisposable = visualization.onVisualizationDisposeEvent(() => {
+            this.managedVisualizations.delete(key)
+        })
+        globals.context.subscriptions.push(visualizationDisposable)
+    }
+}
diff --git a/src/templates/templates.json b/packages/core/src/templates/templates.json
similarity index 100%
rename from src/templates/templates.json
rename to packages/core/src/templates/templates.json
diff --git a/packages/core/src/test/amazonq/common/contentController.test.ts b/packages/core/src/test/amazonq/common/contentController.test.ts
new file mode 100644
index 00000000000..aac3b852e96
--- /dev/null
+++ b/packages/core/src/test/amazonq/common/contentController.test.ts
@@ -0,0 +1,54 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import assert from 'assert'
+import { EditorContentController } from '../../../amazonq/commons/controllers/contentController'
+import { toTextEditor } from '../../testUtil'
+import { CWCTelemetryHelper } from '../../../codewhispererChat/controllers/chat/telemetryHelper'
+import { ChatSessionStorage } from '../../../codewhispererChat/storages/chatSession'
+import { TriggerEventsStorage } from '../../../codewhispererChat'
+
+describe('contentController', () => {
+    let controller: EditorContentController
+
+    beforeEach(async () => {
+        controller = new EditorContentController()
+        CWCTelemetryHelper.instance = new CWCTelemetryHelper(new ChatSessionStorage(), new TriggerEventsStorage())
+    })
+
+    describe('insertTextAtCursorPosition', () => {
+        it('insert code when left hand size has no non empty character', async () => {
+            const editor = await toTextEditor('def hello_world():\n    ', 'test.py')
+            if (editor) {
+                const pos = new vscode.Position(1, 4)
+                editor.selection = new vscode.Selection(pos, pos)
+                controller.insertTextAtCursorPosition(
+                    'abc\n   def',
+                    (editor: vscode.TextEditor, cursorStart: vscode.Position) => {
+                        assert.equal(editor.document.getText(), 'def hello_world():\n    abc\n       def')
+                    }
+                )
+            } else {
+                assert.fail('Failed to open a text editor')
+            }
+        })
+
+        it('insert code when left hand size has non empty character 2', async () => {
+            const editor = await toTextEditor('def hello_world():\n    ', 'test.py')
+            if (editor) {
+                const pos = new vscode.Position(0, 4)
+                editor.selection = new vscode.Selection(pos, pos)
+                controller.insertTextAtCursorPosition(
+                    'abc\n   def',
+                    (editor: vscode.TextEditor, cursorStart: vscode.Position) => {
+                        assert.equal(editor.document.getText(), 'def abc\n   defhello_world():\n    ')
+                    }
+                )
+            } else {
+                assert.fail('Failed to open a text editor')
+            }
+        })
+    })
+})
diff --git a/packages/core/src/test/amazonq/common/diff.test.ts b/packages/core/src/test/amazonq/common/diff.test.ts
new file mode 100644
index 00000000000..a8f3bea8747
--- /dev/null
+++ b/packages/core/src/test/amazonq/common/diff.test.ts
@@ -0,0 +1,480 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * TODO: Move this file to amazonq/test/unit when we can figure out how to spy on vscode imports from amazonq.
+ *
+ * See TESTPLAN.md#Stubbing VSCode outside of core
+ */
+import assert from 'assert'
+import * as path from 'path'
+import * as vscode from 'vscode'
+import sinon from 'sinon'
+import { FileSystem } from '../../../shared/fs/fs'
+import {
+    createAmazonQUri,
+    getFileDiffUris,
+    getOriginalFileUri,
+    openDeletedDiff,
+    openDiff,
+    computeDiff,
+} from '../../../amazonq'
+import { TextDocument } from 'vscode'
+
+describe('diff', () => {
+    const filePath = path.join('/', 'foo', 'fi')
+    const rightPath = path.join('foo', 'fee')
+    const tabId = '0'
+    const featureDevScheme = 'aws-featureDev'
+
+    let sandbox: sinon.SinonSandbox
+    let executeCommandSpy: sinon.SinonSpy
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+        executeCommandSpy = sandbox.spy(vscode.commands, 'executeCommand')
+    })
+
+    afterEach(() => {
+        executeCommandSpy.restore()
+        sandbox.restore()
+    })
+
+    describe('openDiff', () => {
+        it('file exists locally', async () => {
+            sandbox.stub(FileSystem.prototype, 'exists').resolves(true)
+            await openDiff(filePath, rightPath, tabId, featureDevScheme)
+
+            const leftExpected = vscode.Uri.file(filePath)
+            const rightExpected = createAmazonQUri(rightPath, tabId, featureDevScheme)
+            assert.ok(executeCommandSpy.calledWith('vscode.diff', leftExpected, rightExpected))
+        })
+
+        it('file does not exists locally', async () => {
+            sandbox.stub(FileSystem.prototype, 'exists').resolves(false)
+            await openDiff(filePath, rightPath, tabId, featureDevScheme)
+
+            const leftExpected = await getOriginalFileUri(filePath, tabId, featureDevScheme)
+            const rightExpected = createAmazonQUri(rightPath, tabId, featureDevScheme)
+            assert.ok(executeCommandSpy.calledWith('vscode.diff', leftExpected, rightExpected))
+        })
+    })
+
+    describe('openDeletedDiff', () => {
+        const name = 'foo'
+
+        it('file exists locally', async () => {
+            sandbox.stub(FileSystem.prototype, 'exists').resolves(true)
+            await openDeletedDiff(filePath, name, tabId, featureDevScheme)
+
+            const leftExpected = vscode.Uri.file(filePath)
+            const rightExpected = createAmazonQUri('empty', tabId, featureDevScheme)
+            assert.ok(executeCommandSpy.calledWith('vscode.diff', leftExpected, rightExpected, `${name} (Deleted)`))
+        })
+
+        it('file does not exists locally', async () => {
+            sandbox.stub(FileSystem.prototype, 'exists').resolves(false)
+            await openDeletedDiff(filePath, name, tabId, featureDevScheme)
+
+            const leftExpected = createAmazonQUri('empty', tabId, featureDevScheme)
+            const rightExpected = createAmazonQUri('empty', tabId, featureDevScheme)
+            assert.ok(executeCommandSpy.calledWith('vscode.diff', leftExpected, rightExpected, `${name} (Deleted)`))
+        })
+    })
+
+    describe('getOriginalFileUri', () => {
+        it('file exists locally', async () => {
+            sandbox.stub(FileSystem.prototype, 'exists').resolves(true)
+            assert.deepStrictEqual((await getOriginalFileUri(filePath, tabId, featureDevScheme)).fsPath, filePath)
+        })
+
+        it('file does not exists locally', async () => {
+            sandbox.stub(FileSystem.prototype, 'exists').resolves(false)
+            const expected = createAmazonQUri('empty', tabId, featureDevScheme)
+            assert.deepStrictEqual(await getOriginalFileUri(filePath, tabId, featureDevScheme), expected)
+        })
+    })
+
+    describe('getFileDiffUris', () => {
+        it('file exists locally', async () => {
+            sandbox.stub(FileSystem.prototype, 'exists').resolves(true)
+
+            const { left, right } = await getFileDiffUris(filePath, rightPath, tabId, featureDevScheme)
+
+            const leftExpected = vscode.Uri.file(filePath)
+            assert.deepStrictEqual(left, leftExpected)
+
+            const rightExpected = createAmazonQUri(rightPath, tabId, featureDevScheme)
+            assert.deepStrictEqual(right, rightExpected)
+        })
+
+        it('file does not exists locally', async () => {
+            sandbox.stub(FileSystem.prototype, 'exists').resolves(false)
+            const { left, right } = await getFileDiffUris(filePath, rightPath, tabId, featureDevScheme)
+
+            const leftExpected = await getOriginalFileUri(filePath, tabId, featureDevScheme)
+            assert.deepStrictEqual(left, leftExpected)
+
+            const rightExpected = createAmazonQUri(rightPath, tabId, featureDevScheme)
+            assert.deepStrictEqual(right, rightExpected)
+        })
+    })
+
+    describe('computeDiff', () => {
+        const mockOriginalDocument = {
+            getText: () => 'line1\nline2\nline3\n',
+            uri: vscode.Uri.file('test.txt'),
+            fileName: 'test.txt',
+        }
+
+        it('returns no addition or removal for the same file', async () => {
+            sandbox.stub(FileSystem.prototype, 'exists').resolves(true)
+            sandbox.stub(vscode.workspace, 'openTextDocument').resolves(mockOriginalDocument as unknown as TextDocument)
+
+            const { changes, charsAdded, linesAdded, charsRemoved, linesRemoved } = await computeDiff(
+                filePath,
+                filePath,
+                tabId,
+                featureDevScheme
+            )
+
+            const expectedChanges = [
+                {
+                    count: 3,
+                    value: 'line1\nline2\nline3\n',
+                },
+            ]
+
+            assert.deepEqual(changes, expectedChanges)
+            assert.equal(charsAdded, 0)
+            assert.equal(linesAdded, 0)
+            assert.equal(charsRemoved, 0)
+            assert.equal(linesRemoved, 0)
+        })
+
+        it('counts insertion of new line', async () => {
+            const mockInsertionDocument = {
+                getText: () => 'line1\ninserted\nline2\nline3\n',
+                uri: vscode.Uri.file('test.txt'),
+                fileName: 'test.txt',
+            }
+            sandbox.stub(FileSystem.prototype, 'exists').resolves(true)
+            sandbox
+                .stub(vscode.workspace, 'openTextDocument')
+                .onFirstCall()
+                .resolves(mockOriginalDocument as unknown as TextDocument)
+                .onSecondCall()
+                .resolves(mockInsertionDocument as unknown as TextDocument)
+
+            const { changes, charsAdded, linesAdded, charsRemoved, linesRemoved } = await computeDiff(
+                filePath,
+                rightPath,
+                tabId,
+                featureDevScheme
+            )
+
+            const expectedChanges = [
+                {
+                    count: 1,
+                    value: 'line1\n',
+                },
+                {
+                    added: true,
+                    count: 1,
+                    removed: undefined,
+                    value: 'inserted\n',
+                },
+                {
+                    count: 2,
+                    value: 'line2\nline3\n',
+                },
+            ]
+
+            assert.deepEqual(changes, expectedChanges)
+            assert.equal(charsAdded, 8)
+            assert.equal(linesAdded, 1)
+            assert.equal(charsRemoved, 0)
+            assert.equal(linesRemoved, 0)
+        })
+
+        it('counts insertion of multiple lines', async () => {
+            const mockMultipleInsertionDocument = {
+                getText: () => 'line1\ninserted1\ninserted2\nline2\nline3\ninserted3\n',
+                uri: vscode.Uri.file('test.txt'),
+                fileName: 'test.txt',
+            }
+            sandbox.stub(FileSystem.prototype, 'exists').resolves(true)
+            sandbox
+                .stub(vscode.workspace, 'openTextDocument')
+                .onFirstCall()
+                .resolves(mockOriginalDocument as unknown as TextDocument)
+                .onSecondCall()
+                .resolves(mockMultipleInsertionDocument as unknown as TextDocument)
+
+            const { changes, charsAdded, linesAdded, charsRemoved, linesRemoved } = await computeDiff(
+                filePath,
+                rightPath,
+                tabId,
+                featureDevScheme
+            )
+
+            const expectedChanges = [
+                {
+                    count: 1,
+                    value: 'line1\n',
+                },
+                {
+                    added: true,
+                    count: 2,
+                    removed: undefined,
+                    value: 'inserted1\ninserted2\n',
+                },
+                {
+                    count: 2,
+                    value: 'line2\nline3\n',
+                },
+                {
+                    added: true,
+                    count: 1,
+                    removed: undefined,
+                    value: 'inserted3\n',
+                },
+            ]
+
+            assert.deepEqual(changes, expectedChanges)
+            assert.equal(charsAdded, 27)
+            assert.equal(linesAdded, 3)
+            assert.equal(charsRemoved, 0)
+            assert.equal(linesRemoved, 0)
+        })
+
+        it('counts modification of existing line', async () => {
+            const mockModificationDocument = {
+                getText: () => 'line1\nmodified\nline3\n',
+                uri: vscode.Uri.file('test.txt'),
+                fileName: 'test.txt',
+            }
+            sandbox.stub(FileSystem.prototype, 'exists').resolves(true)
+            sandbox
+                .stub(vscode.workspace, 'openTextDocument')
+                .onFirstCall()
+                .resolves(mockOriginalDocument as unknown as TextDocument)
+                .onSecondCall()
+                .resolves(mockModificationDocument as unknown as TextDocument)
+
+            const { changes, charsAdded, linesAdded, charsRemoved, linesRemoved } = await computeDiff(
+                filePath,
+                rightPath,
+                tabId,
+                featureDevScheme
+            )
+
+            const expectedChanges = [
+                {
+                    count: 1,
+                    value: 'line1\n',
+                },
+                {
+                    added: undefined,
+                    count: 1,
+                    removed: true,
+                    value: 'line2\n',
+                },
+                {
+                    added: true,
+                    count: 1,
+                    removed: undefined,
+                    value: 'modified\n',
+                },
+                {
+                    count: 1,
+                    value: 'line3\n',
+                },
+            ]
+
+            assert.deepEqual(changes, expectedChanges)
+            assert.equal(charsAdded, 8)
+            assert.equal(linesAdded, 1)
+            assert.equal(charsRemoved, 5)
+            assert.equal(linesRemoved, 1)
+        })
+
+        it('counts deletion of existing line', async () => {
+            const mockDeletionDocument = {
+                getText: () => 'line1\nline3\n',
+                uri: vscode.Uri.file('test.txt'),
+                fileName: 'test.txt',
+            }
+            sandbox.stub(FileSystem.prototype, 'exists').resolves(true)
+            sandbox
+                .stub(vscode.workspace, 'openTextDocument')
+                .onFirstCall()
+                .resolves(mockOriginalDocument as unknown as TextDocument)
+                .onSecondCall()
+                .resolves(mockDeletionDocument as unknown as TextDocument)
+
+            const { changes, charsAdded, linesAdded, charsRemoved, linesRemoved } = await computeDiff(
+                filePath,
+                rightPath,
+                tabId,
+                featureDevScheme
+            )
+
+            const expectedChanges = [
+                {
+                    count: 1,
+                    value: 'line1\n',
+                },
+                {
+                    added: undefined,
+                    count: 1,
+                    removed: true,
+                    value: 'line2\n',
+                },
+                {
+                    count: 1,
+                    value: 'line3\n',
+                },
+            ]
+
+            assert.deepEqual(changes, expectedChanges)
+            assert.equal(charsAdded, 0)
+            assert.equal(linesAdded, 0)
+            assert.equal(charsRemoved, 5)
+            assert.equal(linesRemoved, 1)
+        })
+
+        it('counts deletion of existing line and then adding a new line', async () => {
+            const mockDeletionAndAdditionDocument = {
+                getText: () => 'line1\nline3\nline4\n',
+                uri: vscode.Uri.file('test.txt'),
+                fileName: 'test.txt',
+            }
+            sandbox.stub(FileSystem.prototype, 'exists').resolves(true)
+            sandbox
+                .stub(vscode.workspace, 'openTextDocument')
+                .onFirstCall()
+                .resolves(mockOriginalDocument as unknown as TextDocument)
+                .onSecondCall()
+                .resolves(mockDeletionAndAdditionDocument as unknown as TextDocument)
+
+            const { changes, charsAdded, linesAdded, charsRemoved, linesRemoved } = await computeDiff(
+                filePath,
+                rightPath,
+                tabId,
+                featureDevScheme
+            )
+
+            const expectedChanges = [
+                {
+                    count: 1,
+                    value: 'line1\n',
+                },
+                {
+                    added: undefined,
+                    count: 1,
+                    removed: true,
+                    value: 'line2\n',
+                },
+                {
+                    count: 1,
+                    value: 'line3\n',
+                },
+                {
+                    added: true,
+                    count: 1,
+                    removed: undefined,
+                    value: 'line4\n',
+                },
+            ]
+
+            assert.deepEqual(changes, expectedChanges)
+            assert.equal(charsAdded, 5)
+            assert.equal(linesAdded, 1)
+            assert.equal(charsRemoved, 5)
+            assert.equal(linesRemoved, 1)
+        })
+
+        it('counts a new empty line', async () => {
+            const mockEmptyLineDocument = {
+                getText: () => 'line1\nline2\n\nline3\n',
+                uri: vscode.Uri.file('test.txt'),
+                fileName: 'test.txt',
+            }
+            sandbox.stub(FileSystem.prototype, 'exists').resolves(true)
+            sandbox
+                .stub(vscode.workspace, 'openTextDocument')
+                .onFirstCall()
+                .resolves(mockOriginalDocument as unknown as TextDocument)
+                .onSecondCall()
+                .resolves(mockEmptyLineDocument as unknown as TextDocument)
+
+            const { changes, charsAdded, linesAdded, charsRemoved, linesRemoved } = await computeDiff(
+                filePath,
+                rightPath,
+                tabId,
+                featureDevScheme
+            )
+
+            const expectedChanges = [
+                {
+                    count: 2,
+                    value: 'line1\nline2\n',
+                },
+                {
+                    added: true,
+                    count: 1,
+                    removed: undefined,
+                    value: '\n',
+                },
+                {
+                    count: 1,
+                    value: 'line3\n',
+                },
+            ]
+
+            assert.deepEqual(changes, expectedChanges)
+            assert.equal(charsAdded, 0)
+            assert.equal(linesAdded, 1)
+            assert.equal(charsRemoved, 0)
+            assert.equal(linesRemoved, 0)
+        })
+
+        it('ignores leading and trailing whitespaces', async () => {
+            const mockWhitespaceDocument = {
+                getText: () => '   line1   \n   line2   \n   line3   \n',
+                uri: vscode.Uri.file('test.txt'),
+                fileName: 'test.txt',
+            }
+            sandbox.stub(FileSystem.prototype, 'exists').resolves(true)
+            sandbox
+                .stub(vscode.workspace, 'openTextDocument')
+                .onFirstCall()
+                .resolves(mockOriginalDocument as unknown as TextDocument)
+                .onSecondCall()
+                .resolves(mockWhitespaceDocument as unknown as TextDocument)
+
+            const { changes, charsAdded, linesAdded, charsRemoved, linesRemoved } = await computeDiff(
+                filePath,
+                rightPath,
+                tabId,
+                featureDevScheme
+            )
+
+            const expectedChanges = [
+                {
+                    count: 3,
+                    value: 'line1\nline2\nline3\n',
+                },
+            ]
+
+            assert.deepEqual(changes, expectedChanges)
+            assert.equal(charsAdded, 0)
+            assert.equal(linesAdded, 0)
+            assert.equal(charsRemoved, 0)
+            assert.equal(linesRemoved, 0)
+        })
+    })
+})
diff --git a/packages/core/src/test/amazonq/commons/controllers/contentController.test.ts b/packages/core/src/test/amazonq/commons/controllers/contentController.test.ts
new file mode 100644
index 00000000000..003e14e4783
--- /dev/null
+++ b/packages/core/src/test/amazonq/commons/controllers/contentController.test.ts
@@ -0,0 +1,143 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import assert from 'assert'
+import { EditorContentController, ViewDiffMessage } from '../../../../amazonq/commons/controllers/contentController'
+import * as textDocumentUtilities from '../../../../shared/utilities/textDocumentUtilities'
+import * as textUtilities from '../../../../shared/utilities/textUtilities'
+import { amazonQDiffScheme, amazonQTabSuffix } from '../../../../shared/constants'
+import * as editorUtilities from '../../../../shared/utilities/editorUtilities'
+
+describe('EditorContentController', () => {
+    let sandbox: sinon.SinonSandbox
+    let controller: EditorContentController
+    let executeCommandStub: sinon.SinonStub
+    let registerTextDocumentContentProviderStub: sinon.SinonStub
+    let createTempUrisForDiffStub: sinon.SinonStub
+    let disposeOnEditorCloseStub: sinon.SinonStub
+    let extractParamsFromMessageStub: sinon.SinonStub
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+        controller = new EditorContentController()
+
+        // Stub VS Code API calls
+        executeCommandStub = sandbox.stub(vscode.commands, 'executeCommand').resolves()
+        registerTextDocumentContentProviderStub = sandbox
+            .stub(vscode.workspace, 'registerTextDocumentContentProvider')
+            .returns({ dispose: () => {} })
+
+        // Stub utility functions
+        createTempUrisForDiffStub = sandbox.stub(textDocumentUtilities, 'createTempUrisForDiff')
+        disposeOnEditorCloseStub = sandbox.stub(editorUtilities, 'disposeOnEditorClose')
+        extractParamsFromMessageStub = sandbox.stub(textUtilities, 'extractFileAndCodeSelectionFromMessage')
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+
+    describe('viewDiff', () => {
+        const testFilePath = '/path/to/testFile.js'
+        const testCode = 'new code'
+        const testSelection = new vscode.Selection(new vscode.Position(1, 0), new vscode.Position(2, 0))
+        const testMessage: ViewDiffMessage = {
+            code: testCode,
+        }
+        const originalUri = vscode.Uri.parse('test-scheme:/original/testFile.js')
+        const modifiedUri = vscode.Uri.parse('test-scheme:/modified/testFile.js')
+
+        beforeEach(() => {
+            extractParamsFromMessageStub.returns({
+                filePath: testFilePath,
+                selection: testSelection,
+            })
+            createTempUrisForDiffStub.resolves([originalUri, modifiedUri])
+        })
+
+        it('should show diff view with correct URIs and title', async () => {
+            await controller.viewDiff(testMessage)
+
+            // Verify content provider was registered
+            assert.strictEqual(registerTextDocumentContentProviderStub.calledOnce, true)
+            assert.strictEqual(registerTextDocumentContentProviderStub.firstCall.args[0], amazonQDiffScheme)
+
+            // Verify createTempUrisForDiff was called with correct parameters
+            assert.strictEqual(createTempUrisForDiffStub.calledOnce, true)
+            assert.strictEqual(createTempUrisForDiffStub.firstCall.args[0], testFilePath)
+            assert.strictEqual(createTempUrisForDiffStub.firstCall.args[2], testMessage)
+            assert.strictEqual(createTempUrisForDiffStub.firstCall.args[3], testSelection)
+            assert.strictEqual(createTempUrisForDiffStub.firstCall.args[4], amazonQDiffScheme)
+
+            // Verify vscode.diff command was executed with correct parameters
+            assert.strictEqual(executeCommandStub.calledOnce, true)
+            assert.strictEqual(executeCommandStub.firstCall.args[0], 'vscode.diff')
+            assert.strictEqual(executeCommandStub.firstCall.args[1], originalUri)
+            assert.strictEqual(executeCommandStub.firstCall.args[2], modifiedUri)
+            assert.strictEqual(executeCommandStub.firstCall.args[3], `testFile.js ${amazonQTabSuffix}`)
+
+            // Verify disposeOnEditorClose was called
+            assert.strictEqual(disposeOnEditorCloseStub.calledOnce, true)
+            assert.strictEqual(disposeOnEditorCloseStub.firstCall.args[0], originalUri)
+        })
+
+        it('should use custom scheme when provided', async () => {
+            const customScheme = 'custom-scheme'
+            await controller.viewDiff(testMessage, customScheme)
+
+            assert.strictEqual(registerTextDocumentContentProviderStub.firstCall.args[0], customScheme)
+            assert.strictEqual(createTempUrisForDiffStub.firstCall.args[4], customScheme)
+        })
+
+        it('should pass fileText to createTempUrisForDiff when available', async () => {
+            const testFileText = 'original file content'
+            extractParamsFromMessageStub.returns({
+                filePath: testFilePath,
+                fileText: testFileText,
+                selection: testSelection,
+            })
+
+            await controller.viewDiff(testMessage)
+
+            assert.strictEqual(createTempUrisForDiffStub.firstCall.args[1], testFileText)
+        })
+
+        it('should not attempt to show diff when filePath is missing', async () => {
+            extractParamsFromMessageStub.returns({
+                filePath: undefined,
+                selection: testSelection,
+            })
+
+            await controller.viewDiff(testMessage)
+
+            assert.strictEqual(registerTextDocumentContentProviderStub.called, false)
+            assert.strictEqual(createTempUrisForDiffStub.called, false)
+            assert.strictEqual(executeCommandStub.called, false)
+        })
+
+        it('should not attempt to show diff when code is missing', async () => {
+            await controller.viewDiff({ code: undefined as unknown as string })
+
+            assert.strictEqual(registerTextDocumentContentProviderStub.called, false)
+            assert.strictEqual(createTempUrisForDiffStub.called, false)
+            assert.strictEqual(executeCommandStub.called, false)
+        })
+
+        it('should not attempt to show diff when selection is missing', async () => {
+            extractParamsFromMessageStub.returns({
+                filePath: testFilePath,
+                selection: undefined,
+            })
+
+            await controller.viewDiff(testMessage)
+
+            assert.strictEqual(registerTextDocumentContentProviderStub.called, false)
+            assert.strictEqual(createTempUrisForDiffStub.called, false)
+            assert.strictEqual(executeCommandStub.called, false)
+        })
+    })
+})
diff --git a/packages/core/src/test/amazonq/customizationUtil.test.ts b/packages/core/src/test/amazonq/customizationUtil.test.ts
new file mode 100644
index 00000000000..a3a49e907d9
--- /dev/null
+++ b/packages/core/src/test/amazonq/customizationUtil.test.ts
@@ -0,0 +1,161 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+import assert from 'assert'
+import { tryRegister } from '../testUtil'
+import {
+    amazonQScopes,
+    AuthUtil,
+    baseCustomization,
+    Customization,
+    CustomizationProvider,
+    FeatureConfigProvider,
+    getSelectedCustomization,
+    refreshStatusBar,
+    RegionProfileManager,
+    setSelectedCustomization,
+} from '../../codewhisperer'
+import { FeatureContext, globals } from '../../shared'
+import { resetCodeWhispererGlobalVariables } from '../codewhisperer/testUtil'
+import { createSsoProfile, createTestAuth } from '../credentials/testUtil'
+import { SsoConnection } from '../../auth'
+
+const enterpriseSsoStartUrl = 'https://enterprise.awsapps.com/start'
+
+describe('customizationProvider', function () {
+    let auth: ReturnType<typeof createTestAuth>
+    let ssoConn: SsoConnection
+    let regionProfileManager: RegionProfileManager
+
+    beforeEach(async () => {
+        auth = createTestAuth(globals.globalState)
+        ssoConn = await auth.createInvalidSsoConnection(
+            createSsoProfile({ startUrl: enterpriseSsoStartUrl, scopes: amazonQScopes })
+        )
+
+        regionProfileManager = new RegionProfileManager(() => ssoConn)
+    })
+
+    afterEach(() => {
+        sinon.restore()
+    })
+
+    it('init should create new instance with client', async function () {
+        const mockAuthUtil = {
+            regionProfileManager: regionProfileManager,
+        }
+        sinon.stub(AuthUtil, 'instance').get(() => mockAuthUtil)
+        const createClientStub = sinon.stub(regionProfileManager, 'createQClient')
+        const mockProfile = {
+            name: 'foo',
+            region: 'us-east-1',
+            arn: 'arn',
+            description: '',
+        }
+
+        const provider = await CustomizationProvider.init(mockProfile)
+        assert(provider instanceof CustomizationProvider)
+        assert(createClientStub.calledOnce)
+        assert(createClientStub.calledWith(mockProfile))
+        assert.strictEqual(provider.region, 'us-east-1')
+    })
+})
+
+describe('CodeWhisperer-customizationUtils', function () {
+    let auth: ReturnType<typeof createTestAuth>
+    let ssoConn: SsoConnection
+    let featureCustomization: FeatureContext
+
+    before(async function () {
+        createTestAuth(globals.globalState)
+        tryRegister(refreshStatusBar)
+    })
+
+    beforeEach(async function () {
+        auth = createTestAuth(globals.globalState)
+        ssoConn = await auth.createInvalidSsoConnection(
+            createSsoProfile({ startUrl: enterpriseSsoStartUrl, scopes: amazonQScopes })
+        )
+        featureCustomization = {
+            name: 'featureCustomizationName',
+            value: {
+                stringValue: 'featureCustomizationArn',
+            },
+            variation: 'featureCustomizationName',
+        }
+        sinon.stub(FeatureConfigProvider, 'getFeature').returns(featureCustomization)
+
+        sinon.stub(AuthUtil.instance, 'isConnectionExpired').returns(false)
+        sinon.stub(AuthUtil.instance, 'isConnected').returns(true)
+        sinon.stub(AuthUtil.instance, 'isCustomizationFeatureEnabled').value(true)
+        sinon.stub(AuthUtil.instance, 'conn').value(ssoConn)
+
+        await resetCodeWhispererGlobalVariables()
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    it('Returns baseCustomization when not SSO', async function () {
+        sinon.stub(AuthUtil.instance, 'isValidEnterpriseSsoInUse').returns(false)
+        const customization = getSelectedCustomization()
+
+        assert.strictEqual(customization.name, baseCustomization.name)
+    })
+
+    it('Returns selectedCustomization when customization manually selected', async function () {
+        sinon.stub(AuthUtil.instance, 'isValidEnterpriseSsoInUse').returns(true)
+
+        const selectedCustomization: Customization = {
+            arn: 'selectedCustomizationArn',
+            name: 'selectedCustomizationName',
+            description: 'selectedCustomizationDescription',
+        }
+
+        await setSelectedCustomization(selectedCustomization)
+
+        const actualCustomization = getSelectedCustomization()
+
+        assert.strictEqual(actualCustomization.name, selectedCustomization.name)
+    })
+
+    it(`setSelectedCustomization should set to the customization provided if override option is false or not specified`, async function () {
+        await setSelectedCustomization({ arn: 'FOO' }, false)
+        assert.strictEqual(getSelectedCustomization().arn, 'FOO')
+
+        await setSelectedCustomization({ arn: 'BAR' })
+        assert.strictEqual(getSelectedCustomization().arn, 'BAR')
+
+        await setSelectedCustomization({ arn: 'BAZ' })
+        assert.strictEqual(getSelectedCustomization().arn, 'BAZ')
+
+        await setSelectedCustomization({ arn: 'QOO' }, false)
+        assert.strictEqual(getSelectedCustomization().arn, 'QOO')
+    })
+
+    it(`setSelectedCustomization should only set to the customization provided once for override per customization arn if override is true`, async function () {
+        await setSelectedCustomization({ arn: 'OVERRIDE' }, true)
+        assert.strictEqual(getSelectedCustomization().arn, 'OVERRIDE')
+
+        await setSelectedCustomization({ arn: 'FOO' }, false)
+        assert.strictEqual(getSelectedCustomization().arn, 'FOO')
+
+        // Should NOT override only happen per customization arn
+        await setSelectedCustomization({ arn: 'OVERRIDE' }, true)
+        assert.strictEqual(getSelectedCustomization().arn, 'FOO')
+
+        await setSelectedCustomization({ arn: 'FOO' }, false)
+        assert.strictEqual(getSelectedCustomization().arn, 'FOO')
+
+        await setSelectedCustomization({ arn: 'BAR' }, false)
+        assert.strictEqual(getSelectedCustomization().arn, 'BAR')
+
+        // Sould override as it's a different arn
+        await setSelectedCustomization({ arn: 'OVERRIDE_V2' }, true)
+        assert.strictEqual(getSelectedCustomization().arn, 'OVERRIDE_V2')
+    })
+})
diff --git a/packages/core/src/test/amazonqGumby/telemetry/codeTransformMetadata.test.ts b/packages/core/src/test/amazonqGumby/telemetry/codeTransformMetadata.test.ts
new file mode 100644
index 00000000000..b72bb33c149
--- /dev/null
+++ b/packages/core/src/test/amazonqGumby/telemetry/codeTransformMetadata.test.ts
@@ -0,0 +1,46 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import {
+    codeTransformMaxMetaDataLength,
+    codeTransformMetaDataToJsonString,
+} from '../../../amazonqGumby/telemetry/codeTransformMetadata'
+
+describe('codeTransformMetaData', () => {
+    it('toJsonString() should return a JSON string for small metadata', () => {
+        const metaData = {
+            dependencyVersionSelected: '1.2.3',
+            canceledFromChat: false,
+            retryCount: 2,
+            errorMessage: 'Something went wrong',
+        }
+        const jsonString = codeTransformMetaDataToJsonString(metaData)
+        assert.strictEqual(jsonString, JSON.stringify(metaData))
+    })
+
+    it('toJsonString() should truncate large metadata to fit within the maximum length', () => {
+        const longString = 'x'.repeat(codeTransformMaxMetaDataLength)
+        const metaData = {
+            dependencyVersionSelected: '1.2.3',
+            canceledFromChat: false,
+            errorMessage: longString,
+            retryCount: 2,
+        }
+        const jsonString = codeTransformMetaDataToJsonString(metaData)
+        assert.ok(jsonString.length <= codeTransformMaxMetaDataLength)
+        assert.deepStrictEqual(JSON.parse(jsonString), {
+            dependencyVersionSelected: '1.2.3',
+            canceledFromChat: false,
+            retryCount: 2,
+        })
+    })
+
+    it('toJsonString() should handle empty metadata', () => {
+        const metaData = {}
+        const jsonString = codeTransformMetaDataToJsonString(metaData)
+        assert.strictEqual(jsonString, '{}')
+    })
+})
diff --git a/packages/core/src/test/amazonqGumby/telemetry/codeTransformTelemetryState.test.ts b/packages/core/src/test/amazonqGumby/telemetry/codeTransformTelemetryState.test.ts
new file mode 100644
index 00000000000..05e92ad33b4
--- /dev/null
+++ b/packages/core/src/test/amazonqGumby/telemetry/codeTransformTelemetryState.test.ts
@@ -0,0 +1,81 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { ICodeTransformMetaData } from '../../../amazonqGumby/telemetry/codeTransformMetadata'
+import { CodeTransformTelemetryState } from '../../../amazonqGumby/telemetry/codeTransformTelemetryState'
+import { randomUUID } from '../../../shared/crypto'
+
+describe('CodeTransformTelemetryState', () => {
+    it('Does get singleton instance', () => {
+        const instance = CodeTransformTelemetryState.instance
+        const anotherInstance = CodeTransformTelemetryState.instance
+        assert.strictEqual(instance, anotherInstance, 'Instances should be the same')
+    })
+
+    it('Initial defaults are set', () => {
+        const instance = CodeTransformTelemetryState.instance
+        assert.strictEqual(instance.getSessionId().length, 36, 'Session ID should be a valid UUID')
+        assert.strictEqual(typeof instance.getStartTime(), 'number', 'Start time should be a number')
+        assert.strictEqual(instance.getResultStatus(), '', 'Result status should be an empty string')
+        assert.deepStrictEqual(
+            instance.getCodeTransformMetaData(),
+            {},
+            'Code transform metadata should be an empty object'
+        )
+    })
+
+    it('Does et and get values for internal properties', () => {
+        const instance = CodeTransformTelemetryState.instance
+
+        const newSessionId = randomUUID()
+        const newStartTime = instance.getStartTime()
+        const newResultStatus = 'SUCCESS'
+        const newMetaData: ICodeTransformMetaData = {
+            dependencyVersionSelected: '1.2.3',
+            canceledFromChat: true,
+            retryCount: 2,
+            errorMessage: 'Something went wrong',
+        }
+
+        instance.setSessionId()
+        instance.setStartTime()
+        instance.setResultStatus(newResultStatus)
+        instance.setCodeTransformMetaDataField(newMetaData)
+        assert.notStrictEqual(instance.getSessionId(), newSessionId, 'Session ID should be updated')
+        assert.notStrictEqual(instance.getStartTime(), newStartTime, 'Start time should be updated')
+        assert.strictEqual(instance.getResultStatus(), newResultStatus, 'Result status should be updated')
+        assert.deepStrictEqual(
+            instance.getCodeTransformMetaData(),
+            newMetaData,
+            'Code transform metadata should be updated'
+        )
+    })
+
+    it('Does resetCodeTransformMetaDataField() state', () => {
+        const instance = CodeTransformTelemetryState.instance
+        instance.resetCodeTransformMetaDataField()
+        assert.deepStrictEqual(
+            instance.getCodeTransformMetaData(),
+            {},
+            'Code transform metadata should be reset to an empty object'
+        )
+    })
+
+    it('Does get code transform metadata string', () => {
+        const instance = CodeTransformTelemetryState.instance
+        const metaData: ICodeTransformMetaData = {
+            dependencyVersionSelected: '1.2.3',
+            canceledFromChat: true,
+            retryCount: 2,
+            errorMessage: 'Something went wrong',
+        }
+
+        instance.setCodeTransformMetaDataField(metaData)
+        const metaDataString = instance.getCodeTransformMetaDataString()
+        assert.strictEqual(typeof metaDataString, 'string', 'Metadata string should be a string')
+        assert.deepStrictEqual(JSON.parse(metaDataString), metaData, 'Metadata string should match the metadata object')
+    })
+})
diff --git a/packages/core/src/test/amazonqGumby/transformationJobHistory.test.ts b/packages/core/src/test/amazonqGumby/transformationJobHistory.test.ts
new file mode 100644
index 00000000000..f5a92299255
--- /dev/null
+++ b/packages/core/src/test/amazonqGumby/transformationJobHistory.test.ts
@@ -0,0 +1,375 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import * as os from 'os'
+import * as path from 'path'
+import fs from '../../shared/fs/fs'
+import * as datetime from '../../shared/datetime'
+import { codeWhispererClient } from '../../codewhisperer/client/codewhisperer'
+import {
+    readHistoryFile,
+    writeToHistoryFile,
+    createMetadataFile,
+    cleanupTempJobFiles,
+    refreshJob,
+    JobMetadata,
+} from '../../codewhisperer/service/transformByQ/transformationHistoryHandler'
+import { copyArtifacts } from '../../codewhisperer/service/transformByQ/transformFileHandler'
+import * as transformApiHandler from '../../codewhisperer/service/transformByQ/transformApiHandler'
+import { ExportResultArchiveStructure } from '../../shared/utilities/download'
+import { JDKVersion, TransformationType } from '../../codewhisperer'
+
+describe('Transformation History Handler', function () {
+    function setupFileSystemMocks() {
+        const createdFiles = new Map<string, string>()
+        const createdDirs = new Set<string>()
+
+        // Mock file operations to track what gets created
+        sinon.stub(fs, 'mkdir').callsFake(async (dirPath: any) => {
+            createdDirs.add(dirPath.toString())
+        })
+        sinon.stub(fs, 'copy').callsFake(async (src: any, dest: any) => {
+            createdFiles.set(dest.toString(), `copied from ${src.toString()}`)
+        })
+        sinon.stub(fs, 'writeFile').callsFake(async (filePath: any, content: any) => {
+            createdFiles.set(filePath.toString(), content.toString())
+        })
+        sinon.stub(fs, 'delete').callsFake(async (filePath: any) => {
+            createdFiles.delete(filePath.toString())
+        })
+
+        return { createdFiles, createdDirs }
+    }
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    describe('Reading history file', function () {
+        it('Returns empty array when history file does not exist', async function () {
+            sinon.stub(fs, 'existsFile').resolves(false)
+
+            const result = await readHistoryFile()
+
+            assert.strictEqual(result.length, 0)
+        })
+
+        it('Limits results to 10 most recent jobs', async function () {
+            sinon.stub(fs, 'existsFile').resolves(true)
+            sinon.stub(datetime, 'isWithin30Days').returns(true)
+
+            let historyContent = 'date\tproject_name\tstatus\tduration\tdiff_patch\tsummary\tjob_id\n'
+            for (let i = 1; i <= 15; i++) {
+                historyContent += `01/${i}/25, 10:00 AM\tproject-${i}\tCOMPLETED\t5 min\t\t\tjob-${i}\n`
+            }
+
+            sinon.stub(fs, 'readFileText').resolves(historyContent)
+
+            const result = await readHistoryFile()
+
+            assert.strictEqual(result.length, 10)
+            assert.strictEqual(result[0].jobId, 'job-15') // most recent first
+            assert.strictEqual(result[9].jobId, 'job-6')
+        })
+    })
+
+    describe('Writing to history file', function () {
+        let writtenFiles: Map<string, string>
+
+        beforeEach(function () {
+            writtenFiles = new Map()
+
+            // Mock file operations to capture what gets written
+            sinon.stub(fs, 'mkdir').resolves()
+            sinon.stub(fs, 'writeFile').callsFake(async (filePath: any, content: any) => {
+                writtenFiles.set(filePath.toString(), content.toString())
+            })
+            sinon.stub(fs, 'appendFile').callsFake(async (filePath: any, content: any) => {
+                const existing = writtenFiles.get(filePath.toString()) || ''
+                writtenFiles.set(filePath.toString(), existing + content.toString())
+            })
+            sinon.stub(vscode.commands, 'executeCommand').resolves()
+        })
+
+        it('Creates history file with headers when it does not exist', async function () {
+            sinon.stub(fs, 'existsFile').resolves(false)
+            await writeToHistoryFile(
+                '01/01/25, 10:00 AM',
+                'test-project',
+                'COMPLETED',
+                '5 min',
+                'job-123',
+                '/job/path',
+                'LANGUAGE_UPGRADE',
+                'JDK8',
+                'JDK17',
+                '/path/here',
+                'clean test-compile'
+            )
+
+            const expectedPath = path.join(os.homedir(), '.aws', 'transform', 'transformation_history.tsv')
+            const fileContent = writtenFiles.get(expectedPath)
+
+            assert(fileContent)
+            assert(
+                fileContent.includes(
+                    'date\tproject_name\tstatus\tduration\tdiff_patch\tsummary\tjob_id\ttransformation_type\tsource_jdk_version\ttarget_jdk_version\tcustom_dependency_version_file_path\tcustom_build_command\n'
+                )
+            )
+            assert(
+                fileContent.includes(
+                    `01/01/25, 10:00 AM\ttest-project\tCOMPLETED\t5 min\t${path.join('/job/path', 'diff.patch')}\t${path.join('/job/path', 'summary', 'summary.md')}\tjob-123\tLANGUAGE_UPGRADE\tJDK8\tJDK17\t/path/here\tclean test-compile\n`
+                )
+            )
+        })
+
+        it('Excludes artifact paths for failed jobs', async function () {
+            sinon.stub(fs, 'existsFile').resolves(false)
+            await writeToHistoryFile(
+                '01/01/25, 10:00 AM',
+                'test-project',
+                'FAILED',
+                '5 min',
+                'job-123',
+                '/job/path',
+                'LANGUAGE_UPGRADE',
+                'JDK8',
+                'JDK17',
+                '/path/here',
+                'clean test-compile'
+            )
+
+            const expectedPath = path.join(os.homedir(), '.aws', 'transform', 'transformation_history.tsv')
+            const fileContent = writtenFiles.get(expectedPath)
+
+            const lines = fileContent?.split('\n') || []
+            const jobLine = lines.find((line) => line.includes('job-123'))
+            const fields = jobLine?.split('\t') || []
+
+            assert.strictEqual(fields[4], '') // diff path should be empty
+            assert.strictEqual(fields[5], '') // summary path should be empty
+        })
+
+        it('Appends new job to existing history file', async function () {
+            const existingContent =
+                'date\tproject_name\tstatus\tduration\tdiff_patch\tsummary\tjob_id\n' +
+                '12/31/24, 09:00 AM\told-project\tCOMPLETED\t3 min\t/old/diff.patch\t/old/summary.md\told-job-456\t/old/path\tLANGUAGE_UPGRADE\tJDK8\tJDK17\t/old/path2\tclean test-compile\n'
+
+            writtenFiles.set(
+                path.join(os.homedir(), '.aws', 'transform', 'transformation_history.tsv'),
+                existingContent
+            )
+
+            sinon.stub(fs, 'existsFile').resolves(true)
+
+            await writeToHistoryFile(
+                '01/01/25, 10:00 AM',
+                'new-project',
+                'FAILED',
+                '2 min',
+                'new-job-789',
+                '/new/path',
+                'LANGUAGE_UPGRADE',
+                'JDK8',
+                'JDK17',
+                '/path/here',
+                'clean test-compile'
+            )
+
+            const expectedPath = path.join(os.homedir(), '.aws', 'transform', 'transformation_history.tsv')
+            const fileContent = writtenFiles.get(expectedPath)
+
+            // Verify old data is preserved
+            assert(
+                fileContent?.includes(
+                    'old-project\tCOMPLETED\t3 min\t/old/diff.patch\t/old/summary.md\told-job-456\t/old/path\tLANGUAGE_UPGRADE\tJDK8\tJDK17\t/old/path2\tclean test-compile\n'
+                )
+            )
+
+            // Verify new data is added
+            assert(fileContent?.includes('new-project\tFAILED\t2 min\t\t\tnew-job-789'))
+
+            // Verify both jobs are present and that new job is at bottom of file
+            const lines = fileContent?.split('\n').filter((line) => line.trim()) || []
+            assert.strictEqual(lines.length, 3) // header + 2 job lines
+            assert(lines[1].includes('old-job-456'))
+            assert(lines[2].includes('new-job-789'))
+        })
+    })
+
+    describe('Metadata file operations', function () {
+        let createdFiles: Map<string, string>
+        let createdDirs: Set<string>
+
+        const mockMetadata: JobMetadata = {
+            jobId: 'test-job-123',
+            projectName: 'test-project',
+            transformationType: TransformationType.LANGUAGE_UPGRADE,
+            sourceJDKVersion: JDKVersion.JDK8,
+            targetJDKVersion: JDKVersion.JDK17,
+            customDependencyVersionFilePath: '',
+            customBuildCommand: '',
+            targetJavaHome: '',
+            projectPath: '/path/to/project',
+            startTime: '01/01/24, 10:00 AM',
+        }
+
+        beforeEach(function () {
+            const mocks = setupFileSystemMocks()
+            createdFiles = mocks.createdFiles
+            createdDirs = mocks.createdDirs
+        })
+
+        it('Creates job history directory and metadata files', async function () {
+            const result = await createMetadataFile('/path/to/payload.zip', mockMetadata)
+
+            const expectedPath = path.join(os.homedir(), '.aws', 'transform', 'test-project', 'test-job-123')
+            assert.strictEqual(result, expectedPath)
+
+            // Verify directory was created
+            assert(createdDirs.has(expectedPath))
+
+            // Verify zipped-code.zip was copied
+            const zipPath = path.join(expectedPath, 'zipped-code.zip')
+            assert(createdFiles.has(zipPath))
+            assert.strictEqual(createdFiles.get(zipPath), 'copied from /path/to/payload.zip')
+
+            // Verify metadata.json was created with correct content
+            const metadataPath = path.join(expectedPath, 'metadata.json')
+            assert(createdFiles.has(metadataPath))
+            assert.strictEqual(createdFiles.get(metadataPath), JSON.stringify(mockMetadata))
+        })
+
+        it('Deletes payload, build logs, and metadata files', async function () {
+            // Pre-populate files that would exist
+            createdFiles.set('/payload.zip', 'payload content')
+            createdFiles.set(path.join(os.tmpdir(), 'build-logs.txt'), 'build logs')
+            createdFiles.set(path.join('/job/path', 'metadata.json'), 'metadata')
+            createdFiles.set(path.join('/job/path', 'zipped-code.zip'), 'zip content')
+
+            await cleanupTempJobFiles('/job/path', 'COMPLETED', '/payload.zip')
+
+            // Verify files were deleted (no longer exist in createdFiles)
+            assert(!createdFiles.has('/payload.zip'))
+            assert(!createdFiles.has(path.join(os.tmpdir(), 'build-logs.txt')))
+            assert(!createdFiles.has(path.join('/job/path', 'metadata.json')))
+            assert(!createdFiles.has(path.join('/job/path', 'zipped-code.zip')))
+        })
+
+        it('Preserves metadata for failed jobs', async function () {
+            // Pre-populate files that would exist
+            createdFiles.set(path.join('/job/path', 'metadata.json'), 'metadata')
+            createdFiles.set(path.join('/job/path', 'zipped-code.zip'), 'zip content')
+
+            await cleanupTempJobFiles('/job/path', 'FAILED')
+
+            // Verify metadata files still exist (were NOT deleted)
+            assert(createdFiles.has(path.join('/job/path', 'metadata.json')))
+            assert(createdFiles.has(path.join('/job/path', 'zipped-code.zip')))
+        })
+    })
+
+    describe('Copying artifacts', function () {
+        let createdFiles: Map<string, string>
+        let createdDirs: Set<string>
+
+        beforeEach(function () {
+            const mocks = setupFileSystemMocks()
+            createdFiles = mocks.createdFiles
+            createdDirs = mocks.createdDirs
+        })
+
+        it('Copies diff patch and summary files to destination', async function () {
+            await copyArtifacts(path.join('archive', 'path'), path.join('destination', 'path'))
+
+            // Verify directories were created
+            assert(createdDirs.has(path.join('destination', 'path')))
+            assert(createdDirs.has(path.join('destination', 'path', 'summary')))
+
+            // Verify files were copied to correct locations
+            assert(createdFiles.has(path.join('destination', 'path', 'diff.patch')))
+            assert(createdFiles.has(path.join('destination', 'path', 'summary', 'summary.md')))
+
+            // Verify source paths are correct
+            const diffSource = createdFiles.get(path.join('destination', 'path', 'diff.patch'))
+            const summarySource = createdFiles.get(path.join('destination', 'path', 'summary', 'summary.md'))
+            assert(diffSource?.includes(path.normalize(ExportResultArchiveStructure.PathToDiffPatch)))
+            assert(summarySource?.includes(path.normalize(ExportResultArchiveStructure.PathToSummary)))
+        })
+    })
+
+    describe('Refreshing jobs', function () {
+        let createdFiles: Map<string, string>
+        let createdDirs: Set<string>
+        let writtenFiles: Map<string, string>
+
+        beforeEach(function () {
+            createdFiles = new Map()
+            createdDirs = new Set()
+            writtenFiles = new Map()
+
+            // Mock file operations to track what gets created/written
+            sinon.stub(vscode.commands, 'executeCommand').resolves()
+            sinon.stub(fs, 'mkdir').callsFake(async (dirPath: any) => {
+                createdDirs.add(dirPath.toString())
+            })
+            sinon.stub(fs, 'copy').callsFake(async (src: any, dest: any) => {
+                createdFiles.set(dest.toString(), `copied from ${src.toString()}`)
+            })
+            sinon.stub(fs, 'delete').resolves()
+            sinon.stub(fs, 'writeFile').callsFake(async (filePath: any, content: any) => {
+                writtenFiles.set(filePath.toString(), content.toString())
+            })
+            sinon.stub(fs, 'appendFile').callsFake(async (filePath: any, content: any) => {
+                const existing = writtenFiles.get(filePath.toString()) || ''
+                writtenFiles.set(filePath.toString(), existing + content.toString())
+            })
+            sinon.stub(transformApiHandler, 'downloadAndExtractResultArchive').resolves()
+        })
+
+        it('Updates job status and downloads artifacts', async function () {
+            const mockResponse = {
+                transformationJob: {
+                    status: 'COMPLETED',
+                    endExecutionTime: new Date(),
+                    creationTime: new Date(Date.now() - 300000),
+                },
+            } as any
+            sinon.stub(codeWhispererClient, 'codeModernizerGetCodeTransformation').resolves(mockResponse)
+
+            // Mock existsFile to return false for diff.patch but true for history file
+            sinon.stub(fs, 'existsFile').callsFake(async (filePath: any) => {
+                const pathStr = filePath.toString()
+                if (pathStr.includes('diff.patch')) {
+                    return false // Artifacts don't exist yet, need to download
+                }
+                return true // History file exists
+            })
+
+            // Mock history file content for update
+            const historyContent =
+                'date\tproject_name\tstatus\tduration\tdiff_patch\tsummary\tjob_id\n' +
+                '01/01/24, 10:00 AM\ttest-project\tFAILED\t\t\t\tjob-123\n'
+            sinon.stub(fs, 'readFileText').resolves(historyContent)
+
+            await refreshJob('job-123', 'FAILED', 'test-project')
+
+            // Verify artifacts were copied to job history path
+            const jobHistoryPath = path.join(os.homedir(), '.aws', 'transform', 'test-project', 'job-123')
+            assert(createdFiles.has(path.join(jobHistoryPath, 'diff.patch')))
+            assert(createdFiles.has(path.join(jobHistoryPath, 'summary', 'summary.md')))
+
+            // Verify history file was updated with new status and artifact paths
+            const historyFilePath = path.join(os.homedir(), '.aws', 'transform', 'transformation_history.tsv')
+            const updatedContent = writtenFiles.get(historyFilePath)
+            assert(updatedContent?.includes('COMPLETED'))
+            assert(updatedContent?.includes('diff.patch'))
+            assert(updatedContent?.includes('summary.md'))
+        })
+    })
+})
diff --git a/packages/core/src/test/applicationcomposer/messageHandlers/generateResourceHandler.test.ts b/packages/core/src/test/applicationcomposer/messageHandlers/generateResourceHandler.test.ts
new file mode 100644
index 00000000000..72a3a03e15d
--- /dev/null
+++ b/packages/core/src/test/applicationcomposer/messageHandlers/generateResourceHandler.test.ts
@@ -0,0 +1,37 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import { createTemplate, createWebviewContext } from '../utils'
+import { generateResourceHandler } from '../../../applicationcomposer/messageHandlers/generateResourceHandler'
+import { Command, MessageType } from '../../../applicationcomposer/types'
+import { isMinVscode } from '../../../shared/vscode/env'
+
+describe('generateResourceHandler', function () {
+    it('amazon q is not installed', async function () {
+        if (isMinVscode({ throwWhen: '1.89.0' })) {
+            this.skip()
+        }
+        const panel = await createTemplate()
+        const postMessageSpy = sinon.spy(panel.webview, 'postMessage')
+        const context = await createWebviewContext({
+            panel,
+        })
+        await generateResourceHandler(
+            {
+                command: Command.GENERATE_RESOURCE,
+                messageType: MessageType.REQUEST,
+                cfnType: '',
+                prompt: '',
+                traceId: '0',
+            },
+            context
+        )
+        assert.ok(postMessageSpy.calledOnce)
+        assert.deepStrictEqual(postMessageSpy.getCall(0).args[0].isSuccess, false)
+        postMessageSpy.restore()
+    })
+})
diff --git a/packages/core/src/test/applicationcomposer/messageHandlers/initMessageHandler.test.ts b/packages/core/src/test/applicationcomposer/messageHandlers/initMessageHandler.test.ts
new file mode 100644
index 00000000000..8c2013a2da6
--- /dev/null
+++ b/packages/core/src/test/applicationcomposer/messageHandlers/initMessageHandler.test.ts
@@ -0,0 +1,30 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import { initMessageHandler } from '../../../applicationcomposer/messageHandlers/initMessageHandler'
+import { createTemplate, createWebviewContext } from '../utils'
+import { isMinVscode } from '../../../shared/vscode/env'
+
+describe('initMessageHandler', function () {
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    it('not connected to codewhisperer', async function () {
+        if (isMinVscode({ throwWhen: '1.89.0' })) {
+            this.skip()
+        }
+        const panel = await createTemplate()
+        const postMessageSpy = sinon.spy(panel.webview, 'postMessage')
+        const context = await createWebviewContext({
+            panel,
+        })
+        await initMessageHandler(context)
+        assert.ok(postMessageSpy.calledOnce)
+        assert.deepStrictEqual(postMessageSpy.getCall(0).args[0].isConnectedToCodeWhisperer, false)
+    })
+})
diff --git a/packages/core/src/test/applicationcomposer/utils.ts b/packages/core/src/test/applicationcomposer/utils.ts
new file mode 100644
index 00000000000..fdde28cd3de
--- /dev/null
+++ b/packages/core/src/test/applicationcomposer/utils.ts
@@ -0,0 +1,37 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { ApplicationComposerManager } from '../../applicationcomposer/webviewManager'
+import { globals } from '../../shared'
+import { WebviewContext } from '../../applicationcomposer/types'
+import { MockDocument } from '../fake/fakeDocument'
+
+export async function createTemplate() {
+    const manager = await ApplicationComposerManager.create(globals.context)
+    const panel = await manager.createTemplate()
+    assert.ok(panel)
+    return panel
+}
+
+export async function createWebviewContext({
+    defaultTemplateName,
+    defaultTemplatePath,
+    disposables,
+    panel,
+    fileWatches,
+    textDocument,
+    workSpacePath,
+}: Partial<WebviewContext>): Promise<WebviewContext> {
+    return {
+        defaultTemplateName: defaultTemplateName ?? '',
+        defaultTemplatePath: defaultTemplatePath ?? '',
+        disposables: disposables ?? [],
+        panel: panel ?? (await createTemplate()),
+        fileWatches: fileWatches ?? {},
+        textDocument: textDocument ?? new MockDocument('', 'foo', async () => true),
+        workSpacePath: workSpacePath ?? '',
+    }
+}
diff --git a/packages/core/src/test/auth/activation.test.ts b/packages/core/src/test/auth/activation.test.ts
new file mode 100644
index 00000000000..f203033acba
--- /dev/null
+++ b/packages/core/src/test/auth/activation.test.ts
@@ -0,0 +1,146 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import assert from 'assert'
+import { initialize, SagemakerCookie } from '../../auth/activation'
+import { LoginManager } from '../../auth/deprecated/loginManager'
+import * as extensionUtilities from '../../shared/extensionUtilities'
+import * as authUtils from '../../auth/utils'
+import * as errors from '../../shared/errors'
+
+describe('auth/activation', function () {
+    let sandbox: sinon.SinonSandbox
+    let mockLoginManager: LoginManager
+    let executeCommandStub: sinon.SinonStub
+    let isAmazonQStub: sinon.SinonStub
+    let isSageMakerStub: sinon.SinonStub
+    let initializeCredentialsProviderManagerStub: sinon.SinonStub
+    let getErrorMsgStub: sinon.SinonStub
+    let mockLogger: any
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+
+        // Create mocks
+        mockLoginManager = {
+            login: sandbox.stub(),
+            logout: sandbox.stub(),
+        } as any
+
+        mockLogger = {
+            warn: sandbox.stub(),
+            info: sandbox.stub(),
+            error: sandbox.stub(),
+            debug: sandbox.stub(),
+        }
+
+        // Stub external dependencies
+        executeCommandStub = sandbox.stub(vscode.commands, 'executeCommand')
+        isAmazonQStub = sandbox.stub(extensionUtilities, 'isAmazonQ')
+        isSageMakerStub = sandbox.stub(extensionUtilities, 'isSageMaker')
+        initializeCredentialsProviderManagerStub = sandbox.stub(authUtils, 'initializeCredentialsProviderManager')
+        getErrorMsgStub = sandbox.stub(errors, 'getErrorMsg')
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    describe('initialize', function () {
+        it('should not execute sagemaker.parseCookies when not in AmazonQ and SageMaker environment', async function () {
+            isAmazonQStub.returns(false)
+            isSageMakerStub.returns(false)
+
+            await initialize(mockLoginManager)
+
+            assert.ok(!executeCommandStub.called)
+            assert.ok(!initializeCredentialsProviderManagerStub.called)
+        })
+
+        it('should not execute sagemaker.parseCookies when only in AmazonQ environment', async function () {
+            isAmazonQStub.returns(true)
+            isSageMakerStub.returns(false)
+
+            await initialize(mockLoginManager)
+
+            assert.ok(!executeCommandStub.called)
+            assert.ok(!initializeCredentialsProviderManagerStub.called)
+        })
+
+        it('should not execute sagemaker.parseCookies when only in SageMaker environment', async function () {
+            isAmazonQStub.returns(false)
+            isSageMakerStub.returns(true)
+
+            await initialize(mockLoginManager)
+
+            assert.ok(!executeCommandStub.called)
+            assert.ok(!initializeCredentialsProviderManagerStub.called)
+        })
+
+        it('should execute sagemaker.parseCookies when in both AmazonQ and SageMaker environment', async function () {
+            isAmazonQStub.returns(true)
+            isSageMakerStub.returns(true)
+            executeCommandStub.withArgs('sagemaker.parseCookies').resolves({ authMode: 'Sso' } as SagemakerCookie)
+
+            await initialize(mockLoginManager)
+
+            assert.ok(executeCommandStub.calledOnceWith('sagemaker.parseCookies'))
+            assert.ok(!initializeCredentialsProviderManagerStub.called)
+        })
+
+        it('should initialize credentials provider manager when authMode is not Sso', async function () {
+            isAmazonQStub.returns(true)
+            isSageMakerStub.returns(true)
+            executeCommandStub.withArgs('sagemaker.parseCookies').resolves({ authMode: 'Iam' } as SagemakerCookie)
+
+            await initialize(mockLoginManager)
+
+            assert.ok(executeCommandStub.calledOnceWith('sagemaker.parseCookies'))
+            assert.ok(initializeCredentialsProviderManagerStub.calledOnce)
+        })
+
+        it('should initialize credentials provider manager when authMode is undefined', async function () {
+            isAmazonQStub.returns(true)
+            isSageMakerStub.returns(true)
+            executeCommandStub.withArgs('sagemaker.parseCookies').resolves({} as SagemakerCookie)
+
+            await initialize(mockLoginManager)
+
+            assert.ok(executeCommandStub.calledOnceWith('sagemaker.parseCookies'))
+            assert.ok(initializeCredentialsProviderManagerStub.calledOnce)
+        })
+
+        it('should warn and not throw when sagemaker.parseCookies command is not found', async function () {
+            isAmazonQStub.returns(true)
+            isSageMakerStub.returns(true)
+            const error = new Error("command 'sagemaker.parseCookies' not found")
+            executeCommandStub.withArgs('sagemaker.parseCookies').rejects(error)
+            getErrorMsgStub.returns("command 'sagemaker.parseCookies' not found")
+
+            await initialize(mockLoginManager)
+
+            assert.ok(executeCommandStub.calledOnceWith('sagemaker.parseCookies'))
+            assert.ok(getErrorMsgStub.calledOnceWith(error))
+            assert.ok(!initializeCredentialsProviderManagerStub.called)
+        })
+
+        it('should throw when sagemaker.parseCookies fails with non-command-not-found error', async function () {
+            isAmazonQStub.returns(true)
+            isSageMakerStub.returns(true)
+            const error = new Error('Some other error')
+            executeCommandStub.withArgs('sagemaker.parseCookies').rejects(error)
+            getErrorMsgStub.returns('Some other error')
+
+            await assert.rejects(initialize(mockLoginManager), /Some other error/)
+
+            assert.ok(executeCommandStub.calledOnceWith('sagemaker.parseCookies'))
+            assert.ok(getErrorMsgStub.calledOnceWith(error))
+            assert.ok(!mockLogger.warn.called)
+            assert.ok(!initializeCredentialsProviderManagerStub.called)
+        })
+    })
+})
diff --git a/packages/core/src/test/auth/credentials/utils.test.ts b/packages/core/src/test/auth/credentials/utils.test.ts
new file mode 100644
index 00000000000..dac7095dd37
--- /dev/null
+++ b/packages/core/src/test/auth/credentials/utils.test.ts
@@ -0,0 +1,65 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { Credentials } from '@aws-sdk/types'
+import { asEnvironmentVariables } from '../../../auth/credentials/utils'
+
+describe('asEnvironmentVariables', function () {
+    const testCredentials: Credentials = {
+        accessKeyId: 'test-access-key',
+        secretAccessKey: 'test-secret-key',
+        sessionToken: 'test-session-token',
+    }
+
+    it('converts credentials to environment variables', function () {
+        const envVars = asEnvironmentVariables(testCredentials)
+
+        assert.strictEqual(envVars.AWS_ACCESS_KEY, testCredentials.accessKeyId)
+        assert.strictEqual(envVars.AWS_ACCESS_KEY_ID, testCredentials.accessKeyId)
+        assert.strictEqual(envVars.AWS_SECRET_ACCESS_KEY, testCredentials.secretAccessKey)
+        assert.strictEqual(envVars.AWS_SESSION_TOKEN, testCredentials.sessionToken)
+        assert.strictEqual(envVars.AWS_SECURITY_TOKEN, testCredentials.sessionToken)
+    })
+
+    it('includes endpoint URL when provided', function () {
+        const testEndpointUrl = 'https://custom-endpoint.example.com'
+        const envVars = asEnvironmentVariables(testCredentials, testEndpointUrl)
+
+        assert.strictEqual(envVars.AWS_ACCESS_KEY, testCredentials.accessKeyId)
+        assert.strictEqual(envVars.AWS_ACCESS_KEY_ID, testCredentials.accessKeyId)
+        assert.strictEqual(envVars.AWS_SECRET_ACCESS_KEY, testCredentials.secretAccessKey)
+        assert.strictEqual(envVars.AWS_SESSION_TOKEN, testCredentials.sessionToken)
+        assert.strictEqual(envVars.AWS_SECURITY_TOKEN, testCredentials.sessionToken)
+        assert.strictEqual(envVars.AWS_ENDPOINT_URL, testEndpointUrl)
+    })
+
+    it('does not include endpoint URL when not provided', function () {
+        const envVars = asEnvironmentVariables(testCredentials)
+
+        assert.strictEqual(envVars.AWS_ACCESS_KEY, testCredentials.accessKeyId)
+        assert.strictEqual(envVars.AWS_ACCESS_KEY_ID, testCredentials.accessKeyId)
+        assert.strictEqual(envVars.AWS_SECRET_ACCESS_KEY, testCredentials.secretAccessKey)
+        assert.strictEqual(envVars.AWS_SESSION_TOKEN, testCredentials.sessionToken)
+        assert.strictEqual(envVars.AWS_SECURITY_TOKEN, testCredentials.sessionToken)
+        assert.strictEqual(envVars.AWS_ENDPOINT_URL, undefined)
+    })
+
+    it('handles credentials without session token', function () {
+        const credsWithoutToken: Credentials = {
+            accessKeyId: 'test-access-key',
+            secretAccessKey: 'test-secret-key',
+        }
+        const testEndpointUrl = 'https://custom-endpoint.example.com'
+        const envVars = asEnvironmentVariables(credsWithoutToken, testEndpointUrl)
+
+        assert.strictEqual(envVars.AWS_ACCESS_KEY, credsWithoutToken.accessKeyId)
+        assert.strictEqual(envVars.AWS_ACCESS_KEY_ID, credsWithoutToken.accessKeyId)
+        assert.strictEqual(envVars.AWS_SECRET_ACCESS_KEY, credsWithoutToken.secretAccessKey)
+        assert.strictEqual(envVars.AWS_SESSION_TOKEN, undefined)
+        assert.strictEqual(envVars.AWS_SECURITY_TOKEN, undefined)
+        assert.strictEqual(envVars.AWS_ENDPOINT_URL, testEndpointUrl)
+    })
+})
diff --git a/packages/core/src/test/auth/providers/sharedCredentialsProvider.test.ts b/packages/core/src/test/auth/providers/sharedCredentialsProvider.test.ts
new file mode 100644
index 00000000000..cb8ce40821b
--- /dev/null
+++ b/packages/core/src/test/auth/providers/sharedCredentialsProvider.test.ts
@@ -0,0 +1,186 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { SharedCredentialsProvider } from '../../../auth/providers/sharedCredentialsProvider'
+import { createTestSections } from '../../credentials/testUtil'
+import { DefaultStsClient } from '../../../shared/clients/stsClient'
+import { oneDay } from '../../../shared/datetime'
+import sinon from 'sinon'
+import { SsoAccessTokenProvider } from '../../../auth/sso/ssoAccessTokenProvider'
+import { SsoClient } from '../../../auth/sso/clients'
+
+describe('SharedCredentialsProvider - Role Chaining with SSO', function () {
+    let sandbox: sinon.SinonSandbox
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('should handle role chaining from SSO profile', async function () {
+        // Mock the SSO authentication
+        sandbox.stub(SsoAccessTokenProvider.prototype, 'getToken').resolves({
+            accessToken: 'test-token',
+            expiresAt: new Date(Date.now() + oneDay),
+        })
+
+        // Mock SSO getRoleCredentials
+        sandbox.stub(SsoClient.prototype, 'getRoleCredentials').resolves({
+            accessKeyId: 'sso-access-key',
+            secretAccessKey: 'sso-secret-key',
+            sessionToken: 'sso-session-token',
+            expiration: new Date(Date.now() + oneDay),
+        })
+
+        // Mock STS assumeRole
+        sandbox.stub(DefaultStsClient.prototype, 'assumeRole').callsFake(async (request) => {
+            assert.strictEqual(request.RoleArn, 'arn:aws:iam::123456789012:role/dev')
+            return {
+                Credentials: {
+                    AccessKeyId: 'assumed-access-key',
+                    SecretAccessKey: 'assumed-secret-key',
+                    SessionToken: 'assumed-session-token',
+                    Expiration: new Date(Date.now() + oneDay),
+                },
+            }
+        })
+
+        const sections = await createTestSections(`
+            [sso-session aws1_session]
+            sso_start_url = https://example.awsapps.com/start
+            sso_region = us-east-1
+            sso_registration_scopes = sso:account:access
+
+            [profile Landing]
+            sso_session = aws1_session
+            sso_account_id = 111111111111
+            sso_role_name = Landing
+            region = us-east-1
+
+            [profile dev]
+            region = us-east-1
+            role_arn = arn:aws:iam::123456789012:role/dev
+            source_profile = Landing
+        `)
+
+        const provider = new SharedCredentialsProvider('dev', sections)
+        const credentials = await provider.getCredentials()
+
+        assert.strictEqual(credentials.accessKeyId, 'assumed-access-key')
+        assert.strictEqual(credentials.secretAccessKey, 'assumed-secret-key')
+        assert.strictEqual(credentials.sessionToken, 'assumed-session-token')
+    })
+})
+
+describe('SharedCredentialsProvider - Endpoint URL', function () {
+    it('returns endpoint URL when present in profile', async function () {
+        const ini = `
+            [profile test-profile]
+            aws_access_key_id = test-key
+            aws_secret_access_key = test-secret
+            endpoint_url = https://custom-endpoint.example.com
+            region = us-west-2
+            `
+        const sections = await createTestSections(ini)
+        const provider = new SharedCredentialsProvider('test-profile', sections)
+
+        assert.strictEqual(provider.getEndpointUrl(), 'https://custom-endpoint.example.com')
+    })
+
+    it('returns undefined when endpoint URL is not present in profile', async function () {
+        const ini = `
+            [profile test-profile]
+            aws_access_key_id = test-key
+            aws_secret_access_key = test-secret
+            region = us-west-2
+            `
+        const sections = await createTestSections(ini)
+        const provider = new SharedCredentialsProvider('test-profile', sections)
+
+        assert.strictEqual(provider.getEndpointUrl(), undefined)
+    })
+
+    it('returns endpoint URL for SSO profile', async function () {
+        const ini = `
+            [sso-session sso-valerena]
+            sso_start_url = https://example.awsapps.com/start
+            sso_region = us-east-1
+            sso_registration_scopes = sso:account:access
+            [profile sso-profile]
+            sso_account_id = 123456789012
+            sso_role_name = TestRole
+            region = us-west-2
+            endpoint_url = https://sso-endpoint.example.com
+            `
+        const sections = await createTestSections(ini)
+        const provider = new SharedCredentialsProvider('sso-profile', sections)
+
+        assert.strictEqual(provider.getEndpointUrl(), 'https://sso-endpoint.example.com')
+    })
+
+    it('returns endpoint URL for role assumption profile', async function () {
+        const ini = `
+            [profile source-profile]
+            aws_access_key_id = source-key
+            aws_secret_access_key = source-secret
+
+            [profile role-profile]
+            role_arn = arn:aws:iam::123456789012:role/TestRole
+            source_profile = source-profile
+            region = us-west-2
+            endpoint_url = https://role-endpoint.example.com
+            `
+        const sections = await createTestSections(ini)
+        const provider = new SharedCredentialsProvider('role-profile', sections)
+
+        assert.strictEqual(provider.getEndpointUrl(), 'https://role-endpoint.example.com')
+    })
+
+    it('returns endpoint URL for credential process profile', async function () {
+        const ini = `
+            [profile process-profile]
+            credential_process = /usr/local/bin/credential-process
+            region = us-west-2
+            endpoint_url = https://process-endpoint.example.com
+            `
+        const sections = await createTestSections(ini)
+        const provider = new SharedCredentialsProvider('process-profile', sections)
+
+        assert.strictEqual(provider.getEndpointUrl(), 'https://process-endpoint.example.com')
+    })
+
+    it('handles empty endpoint URL string', async function () {
+        const ini = `
+            [profile test-profile]
+            aws_access_key_id = test-key
+            aws_secret_access_key = test-secret
+            region = us-west-2
+            endpoint_url =
+            `
+        const sections = await createTestSections(ini)
+        const provider = new SharedCredentialsProvider('test-profile', sections)
+
+        assert.strictEqual(provider.getEndpointUrl(), undefined)
+    })
+
+    it('endpoint URL does not affect profile validation', async function () {
+        const ini = `
+            [profile valid-profile]
+            aws_access_key_id = test-key
+            aws_secret_access_key = test-secret
+            region = us-west-2
+            endpoint_url = https://custom-endpoint.example.com
+            `
+        const sections = await createTestSections(ini)
+        const provider = new SharedCredentialsProvider('valid-profile', sections)
+
+        assert.strictEqual(provider.validate(), undefined)
+        assert.strictEqual(await provider.isAvailable(), true)
+    })
+})
diff --git a/src/test/awsExplorer/awsExplorer.test.ts b/packages/core/src/test/awsExplorer/awsExplorer.test.ts
similarity index 80%
rename from src/test/awsExplorer/awsExplorer.test.ts
rename to packages/core/src/test/awsExplorer/awsExplorer.test.ts
index c6f7bf90af0..64e30470f41 100644
--- a/src/test/awsExplorer/awsExplorer.test.ts
+++ b/packages/core/src/test/awsExplorer/awsExplorer.test.ts
@@ -1,22 +1,20 @@
 /*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as sinon from 'sinon'
 import { AwsExplorer } from '../../awsexplorer/awsExplorer'
 import { RegionNode } from '../../awsexplorer/regionNode'
-import { EndpointsProvider } from '../../shared/regions/endpointsProvider'
 import { RegionProvider } from '../../shared/regions/regionProvider'
-import { FakeExtensionContext, FakeMemento } from '../fakeExtensionContext'
+import { FakeExtensionContext } from '../fakeExtensionContext'
 import {
     createTestRegionProvider,
     DEFAULT_TEST_REGION_CODE,
     DEFAULT_TEST_REGION_NAME,
 } from '../shared/regions/testUtil'
 import { makeFakeAwsContextWithPlaceholderIds } from '../utilities/fakeAwsContext'
-import { stub } from '../utilities/stubber'
 
 describe('AwsExplorer', function () {
     let sandbox: sinon.SinonSandbox
@@ -34,7 +32,7 @@ describe('AwsExplorer', function () {
         this.skip()
 
         const awsContext = makeFakeAwsContextWithPlaceholderIds({} as any as AWS.Credentials)
-        const regionProvider = createTestRegionProvider({ awsContext, globalState: new FakeMemento() })
+        const regionProvider = createTestRegionProvider({ awsContext })
         await regionProvider.updateExplorerRegions([DEFAULT_TEST_REGION_CODE])
 
         const fakeContext = await FakeExtensionContext.create()
@@ -52,15 +50,14 @@ describe('AwsExplorer', function () {
 
     it('refreshes when the Region Provider is updated', async function () {
         const fakeContext = await FakeExtensionContext.create()
-        const endpointsProvider = stub(EndpointsProvider)
-        endpointsProvider.load.resolves({ partitions: [] })
-
-        const regionProvider = RegionProvider.fromEndpointsProvider(endpointsProvider)
+        const endpoints = Promise.resolve({ partitions: [] })
+        const regionProvider = RegionProvider.fromEndpointsProvider({
+            local: () => endpoints,
+            remote: () => endpoints,
+        })
         const awsExplorer = new AwsExplorer(fakeContext, regionProvider)
-
         const refreshStub = sandbox.stub(awsExplorer, 'refresh')
-        await endpointsProvider.load()
-
+        await endpoints
         assert.ok(refreshStub.calledOnce, 'expected AWS Explorer to refresh itself')
     })
 })
diff --git a/src/test/awsExplorer/childNodeCache.test.ts b/packages/core/src/test/awsExplorer/childNodeCache.test.ts
similarity index 95%
rename from src/test/awsExplorer/childNodeCache.test.ts
rename to packages/core/src/test/awsExplorer/childNodeCache.test.ts
index 7b62f7b4372..ecd38494648 100644
--- a/src/test/awsExplorer/childNodeCache.test.ts
+++ b/packages/core/src/test/awsExplorer/childNodeCache.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import { ChildNodeCache } from '../../awsexplorer/childNodeCache'
 import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
 import { LoadMoreNode } from '../../shared/treeview/nodes/loadMoreNode'
diff --git a/src/test/awsExplorer/childNodeLoader.test.ts b/packages/core/src/test/awsExplorer/childNodeLoader.test.ts
similarity index 94%
rename from src/test/awsExplorer/childNodeLoader.test.ts
rename to packages/core/src/test/awsExplorer/childNodeLoader.test.ts
index f668e538c3b..b2c4a81dd88 100644
--- a/src/test/awsExplorer/childNodeLoader.test.ts
+++ b/packages/core/src/test/awsExplorer/childNodeLoader.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import { ChildNodeLoader } from '../../awsexplorer/childNodeLoader'
 import { MoreResultsNode } from '../../awsexplorer/moreResultsNode'
 import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
@@ -36,7 +36,7 @@ describe('ChildNodeLoader', function () {
     }
 
     function continuedChildLoader(continuationToken?: string): ChildNodeLoader {
-        return new ChildNodeLoader(fakeLoadMore, _token =>
+        return new ChildNodeLoader(fakeLoadMore, (_token) =>
             Promise.resolve({
                 newChildren: [fakeNode],
                 newContinuationToken: continuationToken,
@@ -45,8 +45,8 @@ describe('ChildNodeLoader', function () {
     }
 
     function delayedChildLoader(continuationToken: string): ChildNodeLoader {
-        return new ChildNodeLoader(fakeLoadMore, _token => {
-            return new Promise(resolve =>
+        return new ChildNodeLoader(fakeLoadMore, (_token) => {
+            return new Promise((resolve) =>
                 setTimeout(() =>
                     resolve({
                         newChildren: [fakeNode],
diff --git a/packages/core/src/test/awsExplorer/commands/copyText.test.ts b/packages/core/src/test/awsExplorer/commands/copyText.test.ts
new file mode 100644
index 00000000000..801462d6ea6
--- /dev/null
+++ b/packages/core/src/test/awsExplorer/commands/copyText.test.ts
@@ -0,0 +1,64 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { copyTextCommand } from '../../../awsexplorer/commands/copyText'
+import { AWSResourceNode } from '../../../shared/treeview/nodes/awsResourceNode'
+import { TreeShim } from '../../../shared/treeview/utils'
+import { FakeClipboard } from '../../shared/vscode/fakeEnv'
+
+describe('copyTextCommand', function () {
+    beforeEach(function () {
+        const fakeClipboard = new FakeClipboard()
+        sinon.stub(vscode.env, 'clipboard').value(fakeClipboard)
+    })
+
+    it('copies name to clipboard and shows status bar confirmation', async function () {
+        const node: AWSResourceNode = {
+            arn: 'arn',
+            name: 'name',
+        }
+
+        await copyTextCommand(node, 'name')
+
+        assert.strictEqual(await vscode.env.clipboard.readText(), 'name')
+    })
+
+    it('handles `TreeShim`', async function () {
+        const node = new TreeShim({
+            id: 'shim',
+            resource: { name: 'resource', arn: 'arn' },
+            getTreeItem: () => new vscode.TreeItem(''),
+        })
+
+        await copyTextCommand(node, 'name')
+        assert.strictEqual(await vscode.env.clipboard.readText(), 'resource')
+    })
+
+    it('copies arn to clipboard and shows status bar confirmation', async function () {
+        const node: AWSResourceNode = {
+            arn: 'arn',
+            name: 'name',
+        }
+
+        await copyTextCommand(node, 'ARN')
+
+        assert.strictEqual(await vscode.env.clipboard.readText(), 'arn')
+    })
+
+    it('copies id to clipboard and shows status bar confirmation', async function () {
+        const node: AWSResourceNode = {
+            arn: 'arn',
+            name: 'name',
+            id: 'id',
+        }
+
+        await copyTextCommand(node, 'id')
+
+        assert.strictEqual(await vscode.env.clipboard.readText(), 'id')
+    })
+})
diff --git a/packages/core/src/test/awsExplorer/commands/loadMoreChildren.test.ts b/packages/core/src/test/awsExplorer/commands/loadMoreChildren.test.ts
new file mode 100644
index 00000000000..18448a9cf1b
--- /dev/null
+++ b/packages/core/src/test/awsExplorer/commands/loadMoreChildren.test.ts
@@ -0,0 +1,64 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { AwsExplorer } from '../../../awsexplorer/awsExplorer'
+import { loadMoreChildren } from '../../../awsexplorer/commands/loadMoreChildren'
+import { ToolkitError } from '../../../shared/errors'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { LoadMoreNode } from '../../../shared/treeview/nodes/loadMoreNode'
+import { Stub, stub } from '../../utilities/stubber'
+import sinon from 'sinon'
+
+describe('loadMoreChildren', function () {
+    let mockNode: AWSTreeNodeBase & LoadMoreNode
+    let mockAwsExplorer: Stub<AwsExplorer>
+
+    beforeEach(function () {
+        mockNode = {} as AWSTreeNodeBase & LoadMoreNode
+        mockAwsExplorer = stub(AwsExplorer, {
+            viewProviderId: '',
+        })
+        mockAwsExplorer.refresh = sinon.stub()
+    })
+
+    it('loads more children and refreshes the node', async function () {
+        const isLoadingStub = sinon.stub().returns(false)
+        mockNode.isLoadingMoreChildren = isLoadingStub
+        const loadMoreStub = sinon.stub()
+        mockNode.loadMoreChildren = loadMoreStub
+
+        await loadMoreChildren(mockAwsExplorer, mockNode)
+
+        assert(isLoadingStub.calledOnce)
+        assert(loadMoreStub.calledOnce)
+        assert(mockAwsExplorer.refresh.calledOnceWith(mockNode))
+    })
+
+    it('ignores invocation when load more is already in progress', async function () {
+        const isLoadingStub = sinon.stub().returns(true)
+        mockNode.isLoadingMoreChildren = isLoadingStub
+        const loadMoreStub = sinon.stub()
+        mockNode.loadMoreChildren = loadMoreStub
+
+        await loadMoreChildren(mockAwsExplorer, mockNode)
+
+        assert(isLoadingStub.calledOnce)
+        assert(loadMoreStub.notCalled)
+        assert(mockAwsExplorer.refresh.notCalled)
+    })
+
+    it('shows an error message and refreshes the node on failure', async function () {
+        const isLoadingStub = sinon.stub().returns(false)
+        mockNode.isLoadingMoreChildren = isLoadingStub
+        const loadMoreStub = sinon.stub().throws(new Error('Expected failure'))
+        mockNode.loadMoreChildren = loadMoreStub
+
+        await assert.rejects(() => loadMoreChildren(mockAwsExplorer, mockNode), ToolkitError)
+
+        assert(isLoadingStub.calledOnce)
+        assert(mockAwsExplorer.refresh.calledOnceWith(mockNode))
+    })
+})
diff --git a/src/test/awsExplorer/regionNode.test.ts b/packages/core/src/test/awsExplorer/regionNode.test.ts
similarity index 88%
rename from src/test/awsExplorer/regionNode.test.ts
rename to packages/core/src/test/awsExplorer/regionNode.test.ts
index 87ee7ec518f..fc3108aae00 100644
--- a/src/test/awsExplorer/regionNode.test.ts
+++ b/packages/core/src/test/awsExplorer/regionNode.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import { RegionNode } from '../../awsexplorer/regionNode'
 import { SchemasNode } from '../../eventSchemas/explorer/schemasNode'
 import {
@@ -39,7 +39,7 @@ describe('RegionNode', function () {
 
         const childNodes = await regionNode.getChildren()
         assert.ok(
-            childNodes.filter(node => node instanceof SchemasNode).length === 0,
+            childNodes.filter((node) => node instanceof SchemasNode).length === 0,
             'Expected Schemas node to be absent from child nodes'
         )
     })
diff --git a/packages/core/src/test/awsService/accessanalyzer/iamPolicyChecks.test.ts b/packages/core/src/test/awsService/accessanalyzer/iamPolicyChecks.test.ts
new file mode 100644
index 00000000000..15f1c398506
--- /dev/null
+++ b/packages/core/src/test/awsService/accessanalyzer/iamPolicyChecks.test.ts
@@ -0,0 +1,770 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import {
+    _readCustomChecksFile,
+    getResultCssColor,
+    IamPolicyChecksWebview,
+    PolicyChecksError,
+} from '../../../awsService/accessanalyzer/vue/iamPolicyChecks'
+import { globals } from '../../../shared'
+import { AccessAnalyzerClient } from '@aws-sdk/client-accessanalyzer'
+import * as s3Client from '../../../shared/clients/s3'
+import { S3Client } from '../../../shared/clients/s3'
+import * as iamPolicyChecks from '../../../awsService/accessanalyzer/vue/iamPolicyChecks'
+import * as vscode from 'vscode'
+import { IamPolicyChecksConstants } from '../../../awsService/accessanalyzer/vue/constants'
+import { FileSystem } from '../../../shared/fs/fs'
+import path from 'path'
+
+const defaultTerraformConfigPath = 'resources/policychecks-tf-default.yaml'
+let sandbox: sinon.SinonSandbox
+let fakePolicyChecksWebview: IamPolicyChecksWebview
+const vscodeFs = FileSystem.instance
+
+describe('iamPolicyChecks', function () {
+    it('IamPolicyChecksWebview built .vue source file path exists', async function () {
+        assert.ok(
+            await vscodeFs.existsFile(
+                path.join(
+                    path.dirname(globals.context.extensionPath),
+                    `core/src/awsService/accessanalyzer/vue/iamPolicyChecks.vue`
+                )
+            )
+        )
+    })
+
+    it('default Terraform config exists', async function () {
+        assert.ok(await vscodeFs.existsFile(globals.context.asAbsolutePath(defaultTerraformConfigPath)))
+    })
+})
+
+describe('_readCustomChecksFile', () => {
+    let parseS3UriStub: sinon.SinonStub
+    let s3ClientStub: sinon.SinonStubbedInstance<S3Client>
+    sandbox = sinon.createSandbox()
+
+    beforeEach(() => {
+        parseS3UriStub = sandbox.stub(s3Client, 'parseS3Uri')
+        s3ClientStub = sandbox.createStubInstance(S3Client)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('should read file content if file exists', async () => {
+        const filePath = globals.context.asAbsolutePath(defaultTerraformConfigPath)
+        const fileContent = await vscodeFs.readFileText(filePath)
+
+        const result = await _readCustomChecksFile(filePath)
+
+        assert.strictEqual(result, fileContent)
+    })
+
+    it('should throw PolicyChecksError for invalid S3 URI', async () => {
+        const invalidS3Uri = 's3://invalid-uri'
+
+        try {
+            await _readCustomChecksFile(invalidS3Uri)
+            assert.fail('Expected method to throw.')
+        } catch (error) {
+            assert(error instanceof PolicyChecksError)
+        }
+    })
+
+    it('should throw PolicyChecksError for other errors', async () => {
+        const s3Uri = 's3://bucket/key'
+
+        parseS3UriStub.withArgs(s3Uri).returns(['region', 'bucket', 'key'])
+        s3ClientStub.getObject.rejects(new Error('Toolkit is not logged-in.'))
+
+        try {
+            await _readCustomChecksFile(s3Uri)
+            assert.fail('Expected method to throw.')
+        } catch (error) {
+            assert(error instanceof PolicyChecksError)
+        }
+    })
+})
+
+describe('validatePolicy', function () {
+    let onValidatePolicyResponseSpy: sinon.SinonSpy
+    let executeCommandStub: sinon.SinonStub
+    let pushValidatePolicyDiagnosticStub: sinon.SinonStub
+    let validateDiagnosticSetStub: sinon.SinonStub
+    const client = new AccessAnalyzerClient()
+    const validatePolicyMock = sinon.mock(client)
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        const initialData = {
+            cfnParameterPath: '',
+            checkAccessNotGrantedActionsTextArea: '',
+            checkAccessNotGrantedFilePath: '',
+            checkAccessNotGrantedResourcesTextArea: '',
+            checkNoNewAccessFilePath: '',
+            checkNoNewAccessTextArea: '',
+            customChecksFileErrorMessage: '',
+            pythonToolsInstalled: false,
+        }
+        fakePolicyChecksWebview = new IamPolicyChecksWebview(initialData, client, 'us-east-1')
+
+        pushValidatePolicyDiagnosticStub = sandbox.stub(fakePolicyChecksWebview, 'pushValidatePolicyDiagnostic')
+        executeCommandStub = sandbox.stub(vscode.commands, 'executeCommand')
+        onValidatePolicyResponseSpy = sandbox.spy(fakePolicyChecksWebview.onValidatePolicyResponse, 'fire')
+        validateDiagnosticSetStub = sandbox.stub(iamPolicyChecks.validatePolicyDiagnosticCollection, 'set')
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('should handle JSON Policy Language correctly', async function () {
+        const policyType = 'Identity'
+        const documentType = 'JSON Policy Language'
+
+        sandbox.stub(fakePolicyChecksWebview, 'executeValidatePolicyCommand')
+        sandbox.stub(iamPolicyChecks, 'isJsonPolicyLanguage').returns(true)
+        IamPolicyChecksWebview.editedDocumentFileName = 'test.json'
+        await fakePolicyChecksWebview.validatePolicy(documentType, policyType)
+        validatePolicyMock.verify()
+    })
+
+    it('should handle Terraform Plan correctly', async function () {
+        const documentType = 'Terraform Plan'
+
+        IamPolicyChecksWebview.editedDocumentFileName = 'test.json'
+        sandbox.stub(iamPolicyChecks, 'isTerraformPlan').returns(true)
+        const executeValidatePolicySpy = sandbox.spy(fakePolicyChecksWebview, 'executeValidatePolicyCommand')
+        await fakePolicyChecksWebview.validatePolicy(documentType, 'Identity')
+
+        assert(executeValidatePolicySpy.called)
+        assert.deepStrictEqual(executeValidatePolicySpy.getCalls()[0].args[0], {
+            command: 'tf-policy-validator',
+            args: [
+                'validate',
+                '--template-path',
+                IamPolicyChecksWebview.editedDocumentFileName,
+                '--region',
+                'us-east-1',
+                '--config',
+                `${globals.context.asAbsolutePath(defaultTerraformConfigPath)}`,
+                '--profile',
+                'undefined',
+            ],
+            cfnParameterPathExists: false,
+            documentType,
+            policyType: 'Identity',
+        })
+    })
+
+    it('should handle CloudFormation correctly', async function () {
+        const documentType = 'CloudFormation'
+        const cfnParameterPath = 'path/to/parameters'
+
+        IamPolicyChecksWebview.editedDocumentFileName = 'test.yaml'
+        sandbox.stub(iamPolicyChecks, 'isCloudFormationTemplate').returns(true)
+        const executeValidatePolicySpy = sandbox.spy(fakePolicyChecksWebview, 'executeValidatePolicyCommand')
+        await fakePolicyChecksWebview.validatePolicy(documentType, 'Identity', cfnParameterPath)
+
+        assert(executeValidatePolicySpy.called)
+        assert.deepStrictEqual(executeValidatePolicySpy.getCalls()[0].args[0], {
+            command: 'cfn-policy-validator',
+            args: [
+                'validate',
+                '--template-path',
+                IamPolicyChecksWebview.editedDocumentFileName,
+                '--region',
+                'us-east-1',
+                '--profile',
+                'undefined',
+                '--template-configuration-file',
+                cfnParameterPath,
+            ],
+            cfnParameterPathExists: true,
+            documentType,
+            policyType: 'Identity',
+        })
+    })
+
+    it('handleValidatePolicyCliResponse no findings', function () {
+        const response = JSON.stringify({
+            BlockingFindings: [],
+            NonBlockingFindings: [],
+        })
+
+        const findingsCount = fakePolicyChecksWebview.handleValidatePolicyCliResponse(response)
+
+        assert.strictEqual(findingsCount, 0)
+        assert(
+            onValidatePolicyResponseSpy.calledOnceWith([
+                IamPolicyChecksConstants.ValidatePolicySuccessNoFindings,
+                getResultCssColor('Success'),
+            ])
+        )
+        assert(executeCommandStub.notCalled)
+    })
+
+    it('handleValidatePolicyCliResponse should handle blocking and non-blocking findings correctly', function () {
+        const response = JSON.stringify({
+            BlockingFindings: [
+                { id: 1, message: 'Blocking finding 1' },
+                { id: 2, message: 'Blocking finding 2' },
+            ],
+            NonBlockingFindings: [{ id: 3, message: 'Non-blocking finding 1' }],
+        })
+
+        const findingsCount = fakePolicyChecksWebview.handleValidatePolicyCliResponse(response)
+
+        assert.strictEqual(findingsCount, 3)
+
+        assert(pushValidatePolicyDiagnosticStub.calledThrice)
+        assert(pushValidatePolicyDiagnosticStub.calledWith(sinon.match.any, sinon.match.object, true))
+        assert(pushValidatePolicyDiagnosticStub.calledWith(sinon.match.any, sinon.match.object, false))
+
+        assert(
+            onValidatePolicyResponseSpy.calledOnceWith([
+                IamPolicyChecksConstants.ValidatePolicySuccessWithFindings,
+                getResultCssColor('Warning'),
+            ])
+        )
+        assert(executeCommandStub.calledOnceWith('workbench.actions.view.problems'))
+    })
+
+    it('handleValidatePolicyCliResponse should handle JSON parse errors', function () {
+        const response = 'invalid json'
+
+        assert.throws(
+            () => {
+                fakePolicyChecksWebview.handleValidatePolicyCliResponse(response)
+            },
+            {
+                name: 'SyntaxError',
+            }
+        )
+
+        assert(onValidatePolicyResponseSpy.notCalled)
+        assert(executeCommandStub.notCalled)
+    })
+
+    it('pushValidatePolicyDiagnostic should push a blocking diagnostic correctly', function () {
+        const diagnostics: vscode.Diagnostic[] = []
+        const finding = {
+            findingType: 'ERROR',
+            code: 'E001',
+            details: {
+                findingDetails: 'Details about the finding',
+                learnMoreLink: 'http://example.com',
+            },
+            resourceName: 'testResource',
+            policyName: 'testPolicy',
+        }
+        const isBlocking = true
+        pushValidatePolicyDiagnosticStub.restore()
+        fakePolicyChecksWebview.pushValidatePolicyDiagnostic(diagnostics, finding, isBlocking)
+
+        assert.strictEqual(diagnostics.length, 1)
+        const diagnostic = diagnostics[0]
+        assert.deepStrictEqual(diagnostic.range, new vscode.Range(0, 0, 0, 0))
+        assert.strictEqual(
+            diagnostic.message,
+            'ERROR: E001 - Details about the finding Resource name: testResource, Policy name: testPolicy. Learn more: http://example.com'
+        )
+        assert.strictEqual(diagnostic.severity, vscode.DiagnosticSeverity.Error)
+        assert(validateDiagnosticSetStub.calledOnce)
+    })
+
+    it('pushValidatePolicyDiagnostic should push a non-blocking diagnostic correctly', function () {
+        const diagnostics: vscode.Diagnostic[] = []
+        const finding = {
+            findingType: 'WARNING',
+            code: 'W001',
+            details: {
+                findingDetails: 'Details about the warning',
+                learnMoreLink: 'http://example.com',
+            },
+            resourceName: 'testResource',
+            policyName: 'testPolicy',
+        }
+        const isBlocking = false
+        pushValidatePolicyDiagnosticStub.restore()
+        fakePolicyChecksWebview.pushValidatePolicyDiagnostic(diagnostics, finding, isBlocking)
+
+        assert.strictEqual(diagnostics.length, 1)
+        const diagnostic = diagnostics[0]
+        assert.deepStrictEqual(diagnostic.range, new vscode.Range(0, 0, 0, 0))
+        assert.strictEqual(
+            diagnostic.message,
+            'WARNING: W001 - Details about the warning Resource name: testResource, Policy name: testPolicy. Learn more: http://example.com'
+        )
+        assert.strictEqual(diagnostic.severity, vscode.DiagnosticSeverity.Warning)
+        assert(validateDiagnosticSetStub.calledOnce)
+    })
+})
+
+describe('customChecks', function () {
+    let executeCommandStub: sinon.SinonStub
+    let pushCustomPolicyCheckDiagnosticStub: sinon.SinonStub
+    let executeCustomPolicyChecksCommandStub: sinon.SinonStub
+    let customPolicyDiagnosticSetStub: sinon.SinonStub
+    let onCustomPolicyCheckResponseFireSpy: sinon.SinonSpy
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        const client = AccessAnalyzerClient.prototype
+        const initialData = {
+            cfnParameterPath: '',
+            checkAccessNotGrantedActionsTextArea: '',
+            checkAccessNotGrantedFilePath: '',
+            checkAccessNotGrantedResourcesTextArea: '',
+            checkNoNewAccessFilePath: '',
+            checkNoNewAccessTextArea: '',
+            customChecksFileErrorMessage: '',
+            pythonToolsInstalled: false,
+        }
+        fakePolicyChecksWebview = new IamPolicyChecksWebview(initialData, client, 'us-east-1')
+
+        pushCustomPolicyCheckDiagnosticStub = sandbox.stub(fakePolicyChecksWebview, 'pushCustomCheckDiagnostic')
+        executeCommandStub = sandbox.stub(vscode.commands, 'executeCommand')
+        onCustomPolicyCheckResponseFireSpy = sandbox.spy(fakePolicyChecksWebview.onCustomPolicyCheckResponse, 'fire')
+        customPolicyDiagnosticSetStub = sandbox.stub(iamPolicyChecks.customPolicyCheckDiagnosticCollection, 'set')
+    })
+
+    afterEach(function () {
+        onCustomPolicyCheckResponseFireSpy.restore()
+        executeCommandStub.restore()
+        customPolicyDiagnosticSetStub.restore()
+        sandbox.restore()
+    })
+
+    it('checkNoNewAccess should handle Terraform Plan correctly', async function () {
+        const documentType = 'Terraform Plan'
+        const policyType = 'Identity'
+        const referenceDocument = '{"some": "reference"}'
+        const document = 'path/to/terraform.json'
+        const cfnParameterPath = 'path/to/cfn-params'
+
+        sandbox.stub(IamPolicyChecksWebview, 'editedDocumentFileName').value(document)
+        sandbox.stub(iamPolicyChecks, 'isTerraformPlan').returns(true)
+        sandbox.stub(iamPolicyChecks, 'isCloudFormationTemplate').returns(false)
+
+        executeCustomPolicyChecksCommandStub = sandbox.stub(fakePolicyChecksWebview, 'executeCustomPolicyChecksCommand')
+
+        await fakePolicyChecksWebview.checkNoNewAccess(documentType, policyType, referenceDocument, cfnParameterPath)
+
+        // We do not want to validate the path of the temporary folder, so we check every other field instead of the entire args
+        assert(executeCustomPolicyChecksCommandStub.called)
+        const actualCommand = executeCustomPolicyChecksCommandStub.getCalls()[0].args[0]
+        assert.deepStrictEqual(actualCommand.command, 'tf-policy-validator')
+        assert.deepStrictEqual(actualCommand.args[0], 'check-no-new-access')
+        assert.deepStrictEqual(actualCommand.args[2], document)
+        assert.deepStrictEqual(actualCommand.args[4], 'us-east-1')
+        assert.deepStrictEqual(actualCommand.args[6], `${globals.context.asAbsolutePath(defaultTerraformConfigPath)}`)
+        assert.deepStrictEqual(actualCommand.args[10], policyType)
+        assert.deepStrictEqual(actualCommand.cfnParameterPathExists, true)
+        assert.deepStrictEqual(actualCommand.documentType, documentType)
+        assert.deepStrictEqual(actualCommand.checkType, 'CheckNoNewAccess')
+        assert.deepStrictEqual(actualCommand.referencePolicyType, policyType)
+
+        assert(onCustomPolicyCheckResponseFireSpy.notCalled)
+    })
+
+    it('checkNoNewAccess should handle CloudFormation document type correctly', async function () {
+        const documentType = 'CloudFormation'
+        const policyType = 'Resource'
+        const referenceDocument = '{"some": "reference"}'
+        const document = 'path/to/cloudformation.yaml'
+        const cfnParameterPath = 'path/to/cfn-params'
+
+        sandbox.stub(IamPolicyChecksWebview, 'editedDocumentFileName').value(document)
+        sandbox.stub(iamPolicyChecks, 'isCloudFormationTemplate').returns(true)
+        sandbox.stub(iamPolicyChecks, 'isTerraformPlan').returns(false)
+
+        executeCustomPolicyChecksCommandStub = sandbox.stub(fakePolicyChecksWebview, 'executeCustomPolicyChecksCommand')
+
+        await fakePolicyChecksWebview.checkNoNewAccess(documentType, policyType, referenceDocument, cfnParameterPath)
+
+        assert(executeCustomPolicyChecksCommandStub.called)
+        const actualCommand = executeCustomPolicyChecksCommandStub.getCalls()[0].args[0]
+        assert.deepStrictEqual(actualCommand.command, 'cfn-policy-validator')
+        assert.deepStrictEqual(actualCommand.args[0], 'check-no-new-access')
+        assert.deepStrictEqual(actualCommand.args[2], document)
+        assert.deepStrictEqual(actualCommand.args[4], 'us-east-1')
+        assert.deepStrictEqual(actualCommand.args[8], policyType)
+        assert.deepStrictEqual(actualCommand.cfnParameterPathExists, true)
+        assert.deepStrictEqual(actualCommand.documentType, documentType)
+        assert.deepStrictEqual(actualCommand.checkType, 'CheckNoNewAccess')
+        assert.deepStrictEqual(actualCommand.referencePolicyType, policyType)
+
+        assert(onCustomPolicyCheckResponseFireSpy.notCalled)
+    })
+
+    it('checkNoNewAccess should handle missing reference document', async function () {
+        const documentType = 'Terraform Plan'
+        const policyType = 'Identity'
+        const referenceDocument = '' // Empty document
+        const document = 'path/to/terraform.json'
+
+        sandbox.stub(IamPolicyChecksWebview, 'editedDocumentFileName').value(document)
+        sandbox.stub(iamPolicyChecks, 'isTerraformPlan').returns(true)
+        sandbox.stub(iamPolicyChecks, 'isCloudFormationTemplate').returns(false)
+        executeCustomPolicyChecksCommandStub = sandbox.stub(fakePolicyChecksWebview, 'executeCustomPolicyChecksCommand')
+
+        await fakePolicyChecksWebview.checkNoNewAccess(documentType, policyType, referenceDocument)
+
+        assert(
+            onCustomPolicyCheckResponseFireSpy.calledOnceWith([
+                IamPolicyChecksConstants.MissingReferenceDocError,
+                getResultCssColor('Error'),
+            ])
+        )
+        assert(executeCommandStub.notCalled)
+        assert(executeCustomPolicyChecksCommandStub.notCalled)
+    })
+
+    it('checkAccessNotGranted should handle Terraform Plan document type correctly', async function () {
+        const documentType = 'Terraform Plan'
+        const actions = 'action1 action2'
+        const resources = 'resource1 resource2'
+        const document = 'path/to/terraform.json'
+        const cfnParameterPath = 'path/to/cfn-params'
+
+        sandbox.stub(IamPolicyChecksWebview, 'editedDocumentFileName').value(document)
+        sandbox.stub(iamPolicyChecks, 'isTerraformPlan').returns(true)
+        sandbox.stub(iamPolicyChecks, 'isCloudFormationTemplate').returns(false)
+        executeCustomPolicyChecksCommandStub = sandbox.stub(fakePolicyChecksWebview, 'executeCustomPolicyChecksCommand')
+
+        await fakePolicyChecksWebview.checkAccessNotGranted(documentType, actions, resources, cfnParameterPath)
+
+        assert(
+            executeCustomPolicyChecksCommandStub.calledOnceWith({
+                command: 'tf-policy-validator',
+                args: [
+                    'check-access-not-granted',
+                    '--template-path',
+                    document,
+                    '--region',
+                    'us-east-1',
+                    '--config',
+                    `${globals.context.asAbsolutePath(defaultTerraformConfigPath)}`,
+                    '--profile',
+                    'undefined',
+                    '--actions',
+                    'action1action2',
+                    '--resources',
+                    'resource1resource2',
+                ],
+                cfnParameterPathExists: !!cfnParameterPath,
+                documentType,
+                checkType: 'CheckAccessNotGranted',
+            })
+        )
+        assert(onCustomPolicyCheckResponseFireSpy.notCalled)
+        assert(executeCommandStub.notCalled)
+    })
+
+    it('checkAccessNotGranted should handle CloudFormation document type correctly', async function () {
+        const documentType = 'CloudFormation'
+        const actions = 'action1 action2'
+        const resources = 'resource1 resource2'
+        const document = 'path/to/cloudformation.yaml'
+        const cfnParameterPath = 'path/to/cfn-params'
+
+        sandbox.stub(IamPolicyChecksWebview, 'editedDocumentFileName').value(document)
+        sandbox.stub(iamPolicyChecks, 'isTerraformPlan').returns(false)
+        sandbox.stub(iamPolicyChecks, 'isCloudFormationTemplate').returns(true)
+        executeCustomPolicyChecksCommandStub = sandbox.stub(fakePolicyChecksWebview, 'executeCustomPolicyChecksCommand')
+
+        await fakePolicyChecksWebview.checkAccessNotGranted(documentType, actions, resources, cfnParameterPath)
+
+        assert(
+            executeCustomPolicyChecksCommandStub.calledOnceWith({
+                command: 'cfn-policy-validator',
+                args: [
+                    'check-access-not-granted',
+                    '--template-path',
+                    document,
+                    '--region',
+                    'us-east-1',
+                    '--profile',
+                    'undefined',
+                    '--actions',
+                    'action1action2',
+                    '--resources',
+                    'resource1resource2',
+                    '--template-configuration-file',
+                    cfnParameterPath,
+                ],
+                cfnParameterPathExists: !!cfnParameterPath,
+                documentType,
+                checkType: 'CheckAccessNotGranted',
+            })
+        )
+        assert(onCustomPolicyCheckResponseFireSpy.notCalled)
+        assert(executeCommandStub.notCalled)
+    })
+
+    it('checkAccessNotGranted should handle missing actions and resources', async function () {
+        const documentType = 'Terraform Plan'
+        const actions = ''
+        const resources = ''
+        const document = 'path/to/terraform.json'
+
+        sandbox.stub(IamPolicyChecksWebview, 'editedDocumentFileName').value(document)
+        sandbox.stub(iamPolicyChecks, 'isTerraformPlan').returns(true)
+        sandbox.stub(iamPolicyChecks, 'isCloudFormationTemplate').returns(false)
+        executeCustomPolicyChecksCommandStub = sandbox.stub(fakePolicyChecksWebview, 'executeCustomPolicyChecksCommand')
+
+        await fakePolicyChecksWebview.checkAccessNotGranted(documentType, actions, resources)
+
+        assert(
+            onCustomPolicyCheckResponseFireSpy.calledOnceWith([
+                IamPolicyChecksConstants.MissingActionsOrResourcesError,
+                getResultCssColor('Error'),
+            ])
+        )
+        assert(executeCustomPolicyChecksCommandStub.notCalled)
+        assert(executeCommandStub.notCalled)
+    })
+
+    it('checkNoPublicAccess should handle Terraform Plan document type correctly', async function () {
+        const documentType = 'Terraform Plan'
+        const document = 'path/to/terraform.json'
+        const cfnParameterPath = 'path/to/cfn-params'
+
+        sandbox.stub(IamPolicyChecksWebview, 'editedDocumentFileName').value(document)
+        sandbox.stub(iamPolicyChecks, 'isTerraformPlan').returns(true)
+        sandbox.stub(iamPolicyChecks, 'isCloudFormationTemplate').returns(false)
+        executeCustomPolicyChecksCommandStub = sandbox.stub(fakePolicyChecksWebview, 'executeCustomPolicyChecksCommand')
+
+        await fakePolicyChecksWebview.checkNoPublicAccess(documentType, cfnParameterPath)
+
+        assert(
+            executeCustomPolicyChecksCommandStub.calledOnceWith({
+                command: 'tf-policy-validator',
+                args: [
+                    'check-no-public-access',
+                    '--template-path',
+                    document,
+                    '--region',
+                    'us-east-1',
+                    '--config',
+                    `${globals.context.asAbsolutePath(defaultTerraformConfigPath)}`,
+                    '--profile',
+                    'undefined',
+                ],
+                cfnParameterPathExists: !!cfnParameterPath,
+                documentType,
+                checkType: 'CheckNoPublicAccess',
+            })
+        )
+        assert(onCustomPolicyCheckResponseFireSpy.notCalled)
+        assert(executeCommandStub.notCalled)
+    })
+
+    it('checkNoPublicAccess should handle CloudFormation document type correctly', async function () {
+        const documentType = 'CloudFormation'
+        const document = 'path/to/cloudformation.yaml'
+        const cfnParameterPath = 'path/to/cfn-params'
+
+        sandbox.stub(IamPolicyChecksWebview, 'editedDocumentFileName').value(document)
+        sandbox.stub(iamPolicyChecks, 'isTerraformPlan').returns(false)
+        sandbox.stub(iamPolicyChecks, 'isCloudFormationTemplate').returns(true)
+        executeCustomPolicyChecksCommandStub = sandbox.stub(fakePolicyChecksWebview, 'executeCustomPolicyChecksCommand')
+
+        await fakePolicyChecksWebview.checkNoPublicAccess(documentType, cfnParameterPath)
+
+        assert(
+            executeCustomPolicyChecksCommandStub.calledOnceWith({
+                command: 'cfn-policy-validator',
+                args: [
+                    'check-no-public-access',
+                    '--template-path',
+                    document,
+                    '--region',
+                    'us-east-1',
+                    '--profile',
+                    'undefined',
+                    '--template-configuration-file',
+                    cfnParameterPath,
+                ],
+                cfnParameterPathExists: !!cfnParameterPath,
+                documentType,
+                checkType: 'CheckNoPublicAccess',
+            })
+        )
+        assert(onCustomPolicyCheckResponseFireSpy.notCalled)
+        assert(executeCommandStub.notCalled)
+    })
+
+    it('checkNoPublicAccess should handle incorrect Terraform Plan document', async function () {
+        const documentType = 'Terraform Plan'
+        const document = 'path/to/invalid.terraform'
+
+        sandbox.stub(IamPolicyChecksWebview, 'editedDocumentFileName').value(document)
+        sandbox.stub(iamPolicyChecks, 'isTerraformPlan').returns(false)
+        sandbox.stub(iamPolicyChecks, 'isCloudFormationTemplate').returns(false)
+        executeCustomPolicyChecksCommandStub = sandbox.stub(fakePolicyChecksWebview, 'executeCustomPolicyChecksCommand')
+
+        await fakePolicyChecksWebview.checkNoPublicAccess(documentType)
+
+        assert(
+            onCustomPolicyCheckResponseFireSpy.calledOnceWith([
+                IamPolicyChecksConstants.IncorrectFileExtension,
+                getResultCssColor('Error'),
+            ])
+        )
+        assert(executeCustomPolicyChecksCommandStub.notCalled)
+        assert(executeCommandStub.notCalled)
+    })
+
+    it('handleCustomPolicyChecksCliResponse should handle response with no findings correctly', function () {
+        const response = JSON.stringify({
+            BlockingFindings: [],
+            NonBlockingFindings: [],
+        })
+
+        const findingsCount = fakePolicyChecksWebview.handleCustomPolicyChecksCliResponse(response)
+
+        assert.strictEqual(findingsCount, 0)
+        assert(
+            onCustomPolicyCheckResponseFireSpy.calledOnceWith([
+                IamPolicyChecksConstants.CustomCheckSuccessNoFindings,
+                getResultCssColor('Success'),
+            ])
+        )
+        assert(pushCustomPolicyCheckDiagnosticStub.notCalled)
+        assert(executeCommandStub.notCalled)
+    })
+
+    it('handleCustomPolicyChecksCliResponse should handle response with blocking and non-blocking findings correctly', function () {
+        const response = JSON.stringify({
+            BlockingFindings: [
+                {
+                    id: 1,
+                    findingType: 'ERROR',
+                    message:
+                        'The policy in existingPolicyDocument is invalid. Principal is a prohibited policy element.',
+                },
+            ],
+            NonBlockingFindings: [{ id: 2 }],
+        })
+        const errorMessage =
+            "ERROR: The policy in reference document is invalid. Principal is a prohibited policy element. Review the reference document's policy type and try again."
+        sandbox.stub(iamPolicyChecks, 'getCheckNoNewAccessErrorMessage').returns(errorMessage)
+        const findingsCount = fakePolicyChecksWebview.handleCustomPolicyChecksCliResponse(response)
+
+        assert.strictEqual(findingsCount, 2)
+        assert(pushCustomPolicyCheckDiagnosticStub.calledTwice)
+        assert(pushCustomPolicyCheckDiagnosticStub.firstCall.calledWith(sinon.match.array, sinon.match.any, true))
+        assert(pushCustomPolicyCheckDiagnosticStub.secondCall.calledWith(sinon.match.array, sinon.match.any, false))
+        assert.deepStrictEqual(onCustomPolicyCheckResponseFireSpy.getCalls()[0].args[0], [
+            errorMessage,
+            getResultCssColor('Error'),
+        ])
+        assert(executeCommandStub.calledOnceWith('workbench.actions.view.problems'))
+    })
+
+    it('handleCustomPolicyChecksCliResponse should handle response with blocking findings and no error message correctly', function () {
+        const response = JSON.stringify({
+            BlockingFindings: [{ id: 1 }],
+            NonBlockingFindings: [],
+        })
+        sandbox.stub(iamPolicyChecks, 'getCheckNoNewAccessErrorMessage').returns(undefined)
+
+        const findingsCount = fakePolicyChecksWebview.handleCustomPolicyChecksCliResponse(response)
+
+        assert.strictEqual(findingsCount, 1)
+        assert(pushCustomPolicyCheckDiagnosticStub.calledOnce)
+        assert(
+            onCustomPolicyCheckResponseFireSpy.calledOnceWith([
+                IamPolicyChecksConstants.CustomCheckSuccessWithFindings,
+                getResultCssColor('Warning'),
+            ])
+        )
+        assert(executeCommandStub.calledOnceWith('workbench.actions.view.problems'))
+    })
+
+    it('pushCustomCheckDiagnostic should push diagnostics with reasons correctly for blocking findings', function () {
+        const diagnostics: vscode.Diagnostic[] = []
+        const finding = {
+            findingType: 'ERROR',
+            message: 'Test message with existingPolicyDocument',
+            resourceName: 'testResource',
+            policyName: 'testPolicy',
+            details: {
+                reasons: [{ description: 'Reason 1' }, { description: 'Reason 2' }],
+            },
+        }
+        const isBlocking = true
+        pushCustomPolicyCheckDiagnosticStub.restore()
+        fakePolicyChecksWebview.pushCustomCheckDiagnostic(diagnostics, finding, isBlocking)
+
+        assert.strictEqual(diagnostics.length, 2) // One diagnostic per reason
+        for (const [index, diagnostic] of diagnostics.entries()) {
+            assert.deepStrictEqual(diagnostic.range, new vscode.Range(0, 0, 0, 0))
+            assert.strictEqual(diagnostic.severity, vscode.DiagnosticSeverity.Error)
+            assert.strictEqual(
+                diagnostic.message,
+                `${finding.findingType}: Test message with reference document - Resource name: ${finding.resourceName}, Policy name: ${finding.policyName} - Reason ${index + 1}`
+            )
+        }
+        assert(customPolicyDiagnosticSetStub.calledOnce)
+    })
+
+    it('pushCustomCheckDiagnostic should push diagnostics with reasons correctly for non-blocking findings', function () {
+        const diagnostics: vscode.Diagnostic[] = []
+        const finding = {
+            findingType: 'WARNING',
+            message: 'Another test message',
+            resourceName: 'testResource',
+            policyName: 'testPolicy',
+            details: {
+                reasons: [{ description: 'Reason A' }, { description: 'Reason B' }],
+            },
+        }
+        const isBlocking = false
+        pushCustomPolicyCheckDiagnosticStub.restore()
+        fakePolicyChecksWebview.pushCustomCheckDiagnostic(diagnostics, finding, isBlocking)
+
+        assert.strictEqual(diagnostics.length, 2) // One diagnostic per reason
+        for (const [index, diagnostic] of diagnostics.entries()) {
+            assert.deepStrictEqual(diagnostic.range, new vscode.Range(0, 0, 0, 0))
+            assert.strictEqual(diagnostic.severity, vscode.DiagnosticSeverity.Warning)
+            assert.strictEqual(
+                diagnostic.message,
+                `WARNING: Another test message - Resource name: ${finding.resourceName}, Policy name: ${finding.policyName} - Reason ${index === 0 ? 'A' : 'B'}`
+            )
+        }
+        assert(customPolicyDiagnosticSetStub.calledOnce)
+    })
+
+    it('should push a single diagnostic without reasons', function () {
+        const diagnostics: vscode.Diagnostic[] = []
+        const finding = {
+            findingType: 'ERROR',
+            message: 'Message without reasons',
+            resourceName: 'testResource',
+            policyName: 'testPolicy',
+            details: {},
+        }
+        const isBlocking = true
+        pushCustomPolicyCheckDiagnosticStub.restore()
+        fakePolicyChecksWebview.pushCustomCheckDiagnostic(diagnostics, finding, isBlocking)
+
+        assert.strictEqual(diagnostics.length, 1)
+        const diagnostic = diagnostics[0]
+        assert.deepStrictEqual(diagnostic.range, new vscode.Range(0, 0, 0, 0))
+        assert.strictEqual(diagnostic.severity, vscode.DiagnosticSeverity.Error)
+        assert.strictEqual(
+            diagnostic.message,
+            'ERROR: Message without reasons - Resource name: testResource, Policy name: testPolicy'
+        )
+        assert(customPolicyDiagnosticSetStub.calledOnce)
+    })
+})
diff --git a/packages/core/src/test/awsService/apigateway/commands/copyUrl.test.ts b/packages/core/src/test/awsService/apigateway/commands/copyUrl.test.ts
new file mode 100644
index 00000000000..b6cf75d9032
--- /dev/null
+++ b/packages/core/src/test/awsService/apigateway/commands/copyUrl.test.ts
@@ -0,0 +1,18 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { buildDefaultApiInvokeUrl } from '../../../../awsService/apigateway/commands/copyUrl'
+
+describe('buildDefaultApiInvokeUrl', function () {
+    it('builds a url', async function () {
+        const expected = 'https://1234567ab.execute-api.us-east-1.amazonaws.com/stagename'
+
+        assert.deepStrictEqual(
+            buildDefaultApiInvokeUrl('1234567ab', 'us-east-1', 'amazonaws.com', 'stagename'),
+            expected
+        )
+    })
+})
diff --git a/src/test/apigateway/commands/invokeRemoteRestApi.test.ts b/packages/core/src/test/awsService/apigateway/commands/invokeRemoteRestApi.test.ts
similarity index 84%
rename from src/test/apigateway/commands/invokeRemoteRestApi.test.ts
rename to packages/core/src/test/awsService/apigateway/commands/invokeRemoteRestApi.test.ts
index 2ccc57f06ab..26c145dbb8f 100644
--- a/src/test/apigateway/commands/invokeRemoteRestApi.test.ts
+++ b/packages/core/src/test/awsService/apigateway/commands/invokeRemoteRestApi.test.ts
@@ -1,11 +1,11 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
-import { listValidMethods } from '../../../apigateway/vue/invokeRemoteRestApi'
-import { Resource } from 'aws-sdk/clients/apigateway'
+import assert from 'assert'
+import { listValidMethods } from '../../../../awsService/apigateway/vue/invokeRemoteRestApi'
+import { Resource } from '@aws-sdk/client-api-gateway'
 
 describe('listValidMethods', function () {
     const allMethods = ['DELETE', 'GET', 'HEAD', 'OPTIONS', 'PATCH', 'POST', 'PUT']
diff --git a/packages/core/src/test/awsService/apigateway/explorer/apiGatewayNodes.test.ts b/packages/core/src/test/awsService/apigateway/explorer/apiGatewayNodes.test.ts
new file mode 100644
index 00000000000..d8363db7547
--- /dev/null
+++ b/packages/core/src/test/awsService/apigateway/explorer/apiGatewayNodes.test.ts
@@ -0,0 +1,89 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import {
+    assertNodeListOnlyHasErrorNode,
+    assertNodeListOnlyHasPlaceholderNode,
+} from '../../../utilities/explorerNodeAssertions'
+import { asyncGenerator } from '../../../../shared/utilities/collectionUtils'
+import { ApiGatewayNode } from '../../../../awsService/apigateway/explorer/apiGatewayNodes'
+import { RestApiNode } from '../../../../awsService/apigateway/explorer/apiNodes'
+import { ApiGatewayClient } from '../../../../shared/clients/apiGateway'
+import { stub } from '../../../utilities/stubber'
+
+const fakePartitionId = 'aws'
+const fakeRegionCode = 'someregioncode'
+const unsortedText = [
+    { name: 'zebra', id: "it's zee not zed" },
+    { name: 'zebra', id: "it's actually zed" },
+    { name: 'Antelope', id: 'anti-antelope' },
+    { name: 'aardvark', id: 'a-a-r-d-vark' },
+    { name: 'elephant', id: 'trunk capacity' },
+]
+const sortedText = [
+    'aardvark (a-a-r-d-vark)',
+    'Antelope (anti-antelope)',
+    'elephant (trunk capacity)',
+    "zebra (it's actually zed)",
+    "zebra (it's zee not zed)",
+]
+
+describe('ApiGatewayNode', function () {
+    let testNode: ApiGatewayNode
+
+    let apiNames: { name: string; id: string }[]
+
+    function createClient() {
+        const client = stub(ApiGatewayClient, { regionCode: fakeRegionCode })
+        client.listApis.callsFake(() => asyncGenerator(apiNames))
+
+        return client
+    }
+
+    beforeEach(function () {
+        apiNames = [
+            { name: 'api1', id: '11111' },
+            { name: 'api2', id: '22222' },
+        ]
+
+        testNode = new ApiGatewayNode(fakePartitionId, fakeRegionCode, createClient())
+    })
+
+    it('returns placeholder node if no children are present', async function () {
+        apiNames = []
+
+        const childNodes = await testNode.getChildren()
+
+        assertNodeListOnlyHasPlaceholderNode(childNodes)
+    })
+
+    it('has RestApi child nodes', async function () {
+        const childNodes = await testNode.getChildren()
+
+        assert.strictEqual(childNodes.length, apiNames.length, 'Unexpected child count')
+
+        for (const node of childNodes) {
+            assert.ok(node instanceof RestApiNode, 'Expected child node to be RestApiNode')
+        }
+    })
+
+    it('sorts child nodes', async function () {
+        apiNames = unsortedText
+
+        const childNodes = await testNode.getChildren()
+
+        const actualChildOrder = childNodes.map((node) => node.label)
+        assert.deepStrictEqual(actualChildOrder, sortedText, 'Unexpected child sort order')
+    })
+
+    it('has an error node for a child if an error happens during loading', async function () {
+        const client = createClient()
+        client.listApis.throws(new Error())
+
+        const node = new ApiGatewayNode(fakePartitionId, fakeRegionCode, client)
+        assertNodeListOnlyHasErrorNode(await node.getChildren())
+    })
+})
diff --git a/packages/core/src/test/awsService/appBuilder/explorer/detectSamProjects.test.ts b/packages/core/src/test/awsService/appBuilder/explorer/detectSamProjects.test.ts
new file mode 100644
index 00000000000..74fafc20843
--- /dev/null
+++ b/packages/core/src/test/awsService/appBuilder/explorer/detectSamProjects.test.ts
@@ -0,0 +1,89 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { TestFolder } from '../../../testUtil'
+import { detectSamProjects, getFiles } from '../../../../awsService/appBuilder/explorer/detectSamProjects'
+import assert from 'assert'
+import * as sinon from 'sinon'
+
+import path from 'path'
+import { ToolkitError } from '../../../../shared'
+import { assertLogsContain } from '../../../globalSetup.test'
+
+describe('detectSamProjects', () => {
+    let sandbox: sinon.SinonSandbox
+
+    beforeEach(async () => {
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(async () => {
+        sandbox.restore()
+    })
+
+    it('should return an empty array when no project found', async () => {
+        const testFolder = await TestFolder.create()
+        sandbox.stub(vscode.workspace, 'workspaceFolders').value([
+            {
+                index: 0,
+                name: 'test-workspace-folder',
+                uri: testFolder,
+            },
+        ])
+        const projects = await detectSamProjects()
+        assert.strictEqual(projects.length, 0)
+    })
+
+    it('should return an empty array when (unlikely) workspace folders is undefined', async () => {
+        sandbox.stub(vscode.workspace, 'workspaceFolders').value(undefined)
+        const projects = await detectSamProjects()
+        assert.strictEqual(projects.length, 0)
+    })
+
+    it('should return an non empty array and test projects in testFixture', async () => {
+        const projects = await detectSamProjects()
+        assert(projects.length >= 20)
+        assert(
+            projects.some((p) => {
+                const projectRootName = path.relative(p.workspaceFolder.uri.fsPath, p.projectRoot.fsPath)
+                return projectRootName === 'appbuilder-test-app'
+            })
+        )
+    })
+})
+
+describe('getFiles', () => {
+    let workspaceFolder: vscode.WorkspaceFolder
+
+    beforeEach(() => {
+        const workspaceFolders = vscode.workspace.workspaceFolders
+        assert(workspaceFolders)
+        workspaceFolder = workspaceFolders[0]
+    })
+
+    it('should return an array of one project folder matching pattern without excluded pattern', async () => {
+        const templateFiles = await getFiles(workspaceFolder, '**/appbuilder-test-app/template.{yml,yaml}')
+        assert.strictEqual(templateFiles.length, 1)
+        assert(templateFiles[0].fsPath.endsWith(path.join('appbuilder-test-app', 'template.yaml')))
+    })
+
+    it('should return a non empty array contains all project except the excluded pattern', async () => {
+        const allTemplateFiles = await getFiles(workspaceFolder, '**/template.{yml,yaml}')
+        const templateFiles = await getFiles(workspaceFolder, '**/template.{yml,yaml}', '**/appbuilder-test-app/**')
+
+        assert.strictEqual(allTemplateFiles.length - templateFiles.length, 1)
+        assert(!templateFiles.some((f) => f.fsPath.endsWith(path.join('appbuilder-test-app', 'template.yaml'))))
+    })
+
+    it('should return empty array given any error', async () => {
+        const sandbox = sinon.createSandbox()
+        sandbox.stub(vscode.workspace, 'findFiles').rejects(new ToolkitError('mock an unlikely error'))
+
+        const templateFiles = await getFiles(workspaceFolder, '**/template.{yml,yaml}', '**/.aws-sam/**')
+        assert.strictEqual(templateFiles.length, 0)
+        assertLogsContain('Failed to find files with pattern', false, 'error')
+        sandbox.restore()
+    })
+})
diff --git a/packages/core/src/test/awsService/appBuilder/explorer/samProject.test.ts b/packages/core/src/test/awsService/appBuilder/explorer/samProject.test.ts
new file mode 100644
index 00000000000..f959ef0e572
--- /dev/null
+++ b/packages/core/src/test/awsService/appBuilder/explorer/samProject.test.ts
@@ -0,0 +1,158 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { getApp, getStackName, SamAppLocation } from '../../../../awsService/appBuilder/explorer/samProject'
+import * as sinon from 'sinon'
+import assert from 'assert'
+import { ToolkitError } from '../../../../shared'
+import * as CloudformationModule from '../../../../shared/cloudformation/cloudformation'
+import path from 'path'
+import { TestFolder } from '../../../testUtil'
+
+import {
+    generateSamconfigData,
+    samconfigCompleteData,
+    samconfigInvalidData,
+    validTemplateData,
+} from '../../../shared/sam/samTestUtils'
+import { assertLogsContain } from '../../../globalSetup.test'
+import { getTestWindow } from '../../../shared/vscode/window'
+
+describe('samProject', () => {
+    let sandbox: sinon.SinonSandbox
+    let testFolder: TestFolder
+    let projectRoot: vscode.Uri
+
+    beforeEach(async () => {
+        testFolder = await TestFolder.create()
+        projectRoot = vscode.Uri.file(testFolder.path)
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+
+    describe('getStackName', () => {
+        it('returns stack name and region happy path', async () => {
+            // generate samconfig.toml in temporary test folder
+            await testFolder.write('samconfig.toml', samconfigCompleteData)
+
+            const expectedStackName = 'project-1'
+            const expectedRegion = 'us-west-2'
+
+            const { stackName, region } = await getStackName(projectRoot)
+            assert.strictEqual(stackName, expectedStackName)
+            assert.strictEqual(region, expectedRegion)
+        })
+
+        it('returns undefined given no stack name or region in samconfig file', async () => {
+            await testFolder.write(
+                'samconfig.toml',
+                generateSamconfigData({
+                    deploy: [{ key: 'confirm_changeset', value: 'false' }],
+                    build: [
+                        { key: 'cached', value: 'true' },
+                        { key: 'parallel', value: 'true' },
+                    ],
+                })
+            )
+            const { stackName, region } = await getStackName(projectRoot)
+            assert.equal(stackName, undefined)
+            assert.equal(region, undefined)
+        })
+
+        it('returns {} when (unlikely) given an undefined project root uri', async () => {
+            const wrapperCall = async (projectRootUri: any) => {
+                return await getStackName(projectRootUri)
+            }
+
+            const result = await wrapperCall(undefined)
+            assert.deepStrictEqual(result, {})
+            assertLogsContain(
+                'Error parsing stack name and/or region information: No project folder found',
+                false,
+                'warn'
+            )
+        })
+
+        it('returns empty object given no samconfig file found', async () => {
+            // simulate error when no samconfig.toml file in directory
+            const result = await getStackName(projectRoot)
+            assert.deepStrictEqual(result, {})
+            assertLogsContain('Stack name and/or region information not found in samconfig.toml', false, 'info')
+        })
+
+        it('returns empty object given error parsing samconfig file', async () => {
+            // simulate error when parsinf samconfig.toml: missing quote or empty value
+            await testFolder.write('samconfig.toml', samconfigInvalidData)
+
+            const result = await getStackName(projectRoot)
+            assert.deepStrictEqual(result, {})
+
+            assertLogsContain('Error parsing stack name and/or region information from samconfig.toml:', false, 'error')
+            getTestWindow().getFirstMessage().assertError('Encountered an issue reading samconfig.toml')
+        })
+    })
+
+    describe('getApp', () => {
+        let cloudformationTryLoadSpy: sinon.SinonSpy
+        let mockSamAppLocation: SamAppLocation
+
+        beforeEach(async () => {
+            // create mock SamConfig instance
+            cloudformationTryLoadSpy = sandbox.spy(CloudformationModule, 'tryLoad')
+            mockSamAppLocation = {
+                samTemplateUri: vscode.Uri.file(path.join(projectRoot.fsPath, 'template.yaml')),
+                workspaceFolder: {
+                    uri: vscode.Uri.file(projectRoot.fsPath),
+                    name: 'test-workspace-folder',
+                    index: 0,
+                },
+                projectRoot: projectRoot,
+            }
+        })
+
+        it('returns correct location and resource in happy path', async () => {
+            // Set up a valid template in test folder
+            await testFolder.write('template.yaml', validTemplateData)
+            // simulate successful loading template
+            const { location, resourceTree } = await getApp(mockSamAppLocation)
+            assert.deepStrictEqual(location, mockSamAppLocation)
+            assert.strictEqual(resourceTree.length, 2)
+            assert(cloudformationTryLoadSpy.calledOnce)
+            // Expect one lambda node and one s3 bucket node
+            const lambdaResourceNode = resourceTree.find((node) => node.Type === 'AWS::Serverless::Function')
+            const s3BucketResourceNode = resourceTree.find((node) => node.Type === 'AWS::S3::Bucket')
+            assert(lambdaResourceNode)
+            assert(s3BucketResourceNode)
+            // validate Lambda node
+            assert.strictEqual(lambdaResourceNode.Handler, 'app.lambda_handler')
+            assert.strictEqual(lambdaResourceNode.Id, 'ResizerFunction')
+            assert.strictEqual(lambdaResourceNode.Runtime, 'python3.12')
+            assert(lambdaResourceNode.Events && lambdaResourceNode.Events.length === 1)
+            assert.deepStrictEqual(lambdaResourceNode.Events[0], {
+                Id: 'FileUpload',
+                Type: 'S3',
+                Path: undefined,
+                Method: undefined,
+            })
+            // validate S3 Bucket
+            assert.strictEqual(s3BucketResourceNode.Id, 'SourceBucket')
+            assert(!s3BucketResourceNode.Events)
+            assert(!s3BucketResourceNode.Handler)
+            assert(!s3BucketResourceNode.Method)
+            assert(!s3BucketResourceNode.Runtime)
+        })
+
+        it('throws ToolkitError when fails to load Cloudformation template values', async () => {
+            // simulate unsuccessful CFN loading template when there is no template.
+            await assert.rejects(
+                () => getApp(mockSamAppLocation),
+                new ToolkitError(`Template at ${mockSamAppLocation.samTemplateUri.fsPath} is not valid`)
+            )
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/appBuilder/lambda2sam/lambda2sam.test.ts b/packages/core/src/test/awsService/appBuilder/lambda2sam/lambda2sam.test.ts
new file mode 100644
index 00000000000..f07343b33a9
--- /dev/null
+++ b/packages/core/src/test/awsService/appBuilder/lambda2sam/lambda2sam.test.ts
@@ -0,0 +1,273 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+import assert from 'assert'
+import { LambdaFunctionNode } from '../../../../lambda/explorer/lambdaFunctionNode'
+import { DefaultLambdaClient } from '../../../../shared/clients/lambdaClient'
+import { Template } from '../../../../shared/cloudformation/cloudformation'
+import * as lambda2sam from '../../../../awsService/appBuilder/lambda2sam/lambda2sam'
+import * as authUtils from '../../../../auth/utils'
+import * as utils from '../../../../awsService/appBuilder/utils'
+
+describe('lambda2sam', function () {
+    let sandbox: sinon.SinonSandbox
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    describe('ifSamTemplate', function () {
+        it('returns true when transform is a string and starts with AWS::Serverless', function () {
+            const template: Template = {
+                Transform: 'AWS::Serverless-2016-10-31',
+            }
+            assert.strictEqual(lambda2sam.ifSamTemplate(template), true)
+        })
+
+        it('returns false when transform is a string and does not start with AWS::Serverless', function () {
+            const template: Template = {
+                Transform: 'AWS::Other-Transform',
+            }
+            assert.strictEqual(lambda2sam.ifSamTemplate(template), false)
+        })
+
+        it('returns true when transform is an array and at least one starts with AWS::Serverless', function () {
+            const template: Template = {
+                Transform: ['AWS::Serverless-2016-10-31', 'AWS::Other-Transform'] as any,
+            }
+            assert.strictEqual(lambda2sam.ifSamTemplate(template), true)
+        })
+
+        it('returns false when transform is an array and none start with AWS::Serverless', function () {
+            const template: Template = {
+                Transform: ['AWS::Other-Transform-1', 'AWS::Other-Transform-2'] as any,
+            }
+            assert.strictEqual(lambda2sam.ifSamTemplate(template), false)
+        })
+
+        it('returns false when transform is not present', function () {
+            const template: Template = {}
+            assert.strictEqual(lambda2sam.ifSamTemplate(template), false)
+        })
+
+        it('returns false when transform is an unsupported type', function () {
+            const template: Template = {
+                Transform: { some: 'object' } as any,
+            }
+            assert.strictEqual(lambda2sam.ifSamTemplate(template), false)
+        })
+    })
+
+    describe('extractLogicalIdFromIntrinsic', function () {
+        it('extracts logical ID from Ref intrinsic', function () {
+            const value = { Ref: 'MyResource' }
+            assert.strictEqual(lambda2sam.extractLogicalIdFromIntrinsic(value), 'MyResource')
+        })
+
+        it('extracts logical ID from GetAtt intrinsic with Arn attribute', function () {
+            const value = { 'Fn::GetAtt': ['MyResource', 'Arn'] }
+            assert.strictEqual(lambda2sam.extractLogicalIdFromIntrinsic(value), 'MyResource')
+        })
+
+        it('returns undefined for GetAtt intrinsic with non-Arn attribute', function () {
+            const value = { 'Fn::GetAtt': ['MyResource', 'Name'] }
+            assert.strictEqual(lambda2sam.extractLogicalIdFromIntrinsic(value), undefined)
+        })
+
+        it('returns undefined for non-intrinsic values', function () {
+            assert.strictEqual(lambda2sam.extractLogicalIdFromIntrinsic('not-an-intrinsic'), undefined)
+            assert.strictEqual(lambda2sam.extractLogicalIdFromIntrinsic({ NotIntrinsic: 'value' }), undefined)
+            assert.strictEqual(lambda2sam.extractLogicalIdFromIntrinsic(undefined), undefined)
+        })
+    })
+
+    describe('callExternalApiForCfnTemplate', function () {
+        let lambdaClientStub: sinon.SinonStubbedInstance<DefaultLambdaClient>
+        let cfnClientStub: any
+
+        beforeEach(function () {
+            lambdaClientStub = sandbox.createStubInstance(DefaultLambdaClient)
+            // Stub at prototype level to avoid TypeScript errors
+            sandbox
+                .stub(DefaultLambdaClient.prototype, 'getFunction')
+                .callsFake((name) => lambdaClientStub.getFunction(name))
+
+            // Mock CloudFormation client for the new external API calls - now returns Promises directly
+            cfnClientStub = {
+                getGeneratedTemplate: sandbox.stub().resolves({
+                    Status: 'COMPLETE',
+                    TemplateBody: JSON.stringify({
+                        AWSTemplateFormatVersion: '2010-09-09',
+                        Resources: {
+                            testFunc: {
+                                DeletionPolicy: 'Retain',
+                                Properties: {
+                                    Code: {
+                                        S3Bucket: 'aws-sam-cli-managed-default-samclisourcebucket-1n8tvb0jdhsd',
+                                        S3Key: '1d1c93ec17af7e2666ee20ea1a215c77',
+                                    },
+                                    Environment: {
+                                        Variables: {
+                                            KEY: 'value',
+                                        },
+                                    },
+                                    FunctionName: 'myFunction',
+                                    Handler: 'index.handler',
+                                    MemorySize: 128,
+                                    PackageType: 'Zip',
+                                    Role: 'arn:aws:iam::123456789012:role/lambda-role',
+                                    Runtime: 'nodejs18.x',
+                                    Timeout: 3,
+                                },
+                                Type: 'AWS::Lambda::Function',
+                            },
+                        },
+                    }),
+                }),
+                describeGeneratedTemplate: sandbox.stub().resolves({
+                    Status: 'COMPLETE',
+                    Resources: [
+                        {
+                            LogicalResourceId: 'testFunc',
+                            ResourceType: 'AWS::Lambda::Function',
+                            ResourceIdentifier: {
+                                FunctionName: 'myFunction',
+                            },
+                        },
+                    ],
+                }),
+            }
+            sandbox.stub(utils, 'getCFNClient').resolves(cfnClientStub)
+
+            // Mock IAM connection
+            const mockConnection = {
+                type: 'iam' as const,
+                id: 'test-connection',
+                label: 'Test Connection',
+                state: 'valid' as const,
+                getCredentials: sandbox.stub().resolves({
+                    accessKeyId: 'test-key',
+                    secretAccessKey: 'test-secret',
+                }),
+                endpointUrl: undefined,
+            }
+            sandbox.stub(authUtils, 'getIAMConnection').resolves(mockConnection)
+
+            // Mock fetch response
+            sandbox.stub(global, 'fetch').resolves({
+                ok: true,
+                json: sandbox.stub().resolves({
+                    cloudFormationTemplateId: 'test-template-id',
+                }),
+            } as any)
+        })
+
+        it('creates a basic CloudFormation template for the Lambda function', async function () {
+            const lambdaNode = {
+                name: 'myFunction',
+                regionCode: 'us-east-2',
+                arn: 'arn:aws:lambda:us-east-2:123456789012:function:myFunction',
+            } as LambdaFunctionNode
+
+            lambdaClientStub.getFunction.resolves({
+                Configuration: {
+                    FunctionName: 'myFunction',
+                    Handler: 'index.handler',
+                    Role: 'arn:aws:iam::123456789012:role/lambda-role',
+                    Runtime: 'nodejs18.x',
+                    Timeout: 3,
+                    MemorySize: 128,
+                    Environment: { Variables: { KEY: 'value' } },
+                },
+            })
+
+            // Create a simple mock template that matches the Template type
+            const mockTemplate = {
+                AWSTemplateFormatVersion: '2010-09-09',
+                Resources: {
+                    testFunc: {
+                        DeletionPolicy: 'Retain',
+                        Properties: {
+                            Code: {
+                                S3Bucket: 'aws-sam-cli-managed-default-samclisourcebucket-1n8tvb0jdhsd',
+                                S3Key: '1d1c93ec17af7e2666ee20ea1a215c77',
+                            },
+                            Environment: {
+                                Variables: {
+                                    KEY: 'value',
+                                },
+                            },
+                            FunctionName: 'myFunction',
+                            Handler: 'index.handler',
+                            MemorySize: 128,
+                            PackageType: 'Zip',
+                            Role: 'arn:aws:iam::123456789012:role/lambda-role',
+                            Runtime: 'nodejs18.x',
+                            Timeout: 3,
+                        },
+                        Type: 'AWS::Lambda::Function',
+                    },
+                },
+            }
+            const mockList = [
+                {
+                    LogicalResourceId: 'testFunc',
+                    ResourceIdentifier: {
+                        FunctionName: 'myFunction',
+                    },
+                    ResourceType: 'AWS::Lambda::Function',
+                },
+            ]
+
+            const result = await lambda2sam.callExternalApiForCfnTemplate(lambdaNode)
+            // Verify the result structure matches expected format
+            assert.strictEqual(Array.isArray(result), true)
+            assert.strictEqual(result.length, 2)
+            const [template, resourcesToImport] = result
+            assert.strictEqual(typeof template, 'object')
+            assert.strictEqual(Array.isArray(resourcesToImport), true)
+            assert.strictEqual(resourcesToImport.length, 1)
+            assert.strictEqual(resourcesToImport[0].ResourceType, 'AWS::Lambda::Function')
+            assert.strictEqual(resourcesToImport[0].LogicalResourceId, 'testFunc')
+            assert.deepStrictEqual(result, [mockTemplate, mockList])
+        })
+    })
+
+    describe('determineStackAssociation', function () {
+        let lambdaClientStub: sinon.SinonStubbedInstance<DefaultLambdaClient>
+
+        beforeEach(function () {
+            lambdaClientStub = sandbox.createStubInstance(DefaultLambdaClient)
+            sandbox
+                .stub(DefaultLambdaClient.prototype, 'getFunction')
+                .callsFake((name) => lambdaClientStub.getFunction(name))
+        })
+
+        it('returns undefined when Lambda has no tags', async function () {
+            const lambdaNode = {
+                name: 'myFunction',
+                regionCode: 'us-west-2',
+            } as LambdaFunctionNode
+
+            lambdaClientStub.getFunction.resolves({})
+
+            // Skip CloudFormation mocking for now
+            // This is difficult to mock correctly without errors and would be better tested with integration tests
+
+            const result = await lambda2sam.determineStackAssociation(lambdaNode)
+
+            assert.strictEqual(result, undefined)
+            assert.strictEqual(lambdaClientStub.getFunction.calledOnceWith(lambdaNode.name), true)
+        })
+
+        // For this function, additional testing would require complex mocking of the AWS SDK
+        // Consider adding more specific test cases in an integration test
+    })
+})
diff --git a/packages/core/src/test/awsService/appBuilder/lambda2sam/lambda2samCoreLogic.test.ts b/packages/core/src/test/awsService/appBuilder/lambda2sam/lambda2samCoreLogic.test.ts
new file mode 100644
index 00000000000..c618dac2197
--- /dev/null
+++ b/packages/core/src/test/awsService/appBuilder/lambda2sam/lambda2samCoreLogic.test.ts
@@ -0,0 +1,754 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+import assert from 'assert'
+import * as vscode from 'vscode'
+import * as lambda2sam from '../../../../awsService/appBuilder/lambda2sam/lambda2sam'
+import * as cloudFormation from '../../../../shared/cloudformation/cloudformation'
+import * as utils from '../../../../awsService/appBuilder/utils'
+import * as walkthrough from '../../../../awsService/appBuilder/walkthrough'
+import * as authUtils from '../../../../auth/utils'
+import { getTestWindow } from '../../../shared/vscode/window'
+import { fs } from '../../../../shared'
+import { DefaultLambdaClient } from '../../../../shared/clients/lambdaClient'
+import { LambdaFunctionNode } from '../../../../lambda/explorer/lambdaFunctionNode'
+import { ToolkitError } from '../../../../shared/errors'
+import os from 'os'
+import path from 'path'
+import { LAMBDA_FUNCTION_TYPE } from '../../../../shared/cloudformation/cloudformation'
+import { ResourceToImport } from '@aws-sdk/client-cloudformation'
+
+describe('lambda2samCoreLogic', function () {
+    let sandbox: sinon.SinonSandbox
+    let tempDir: string
+    let lambdaClientStub: sinon.SinonStubbedInstance<DefaultLambdaClient>
+    let cfnClientStub: any
+    let downloadUnzipStub: sinon.SinonStub
+
+    beforeEach(async function () {
+        sandbox = sinon.createSandbox()
+        tempDir = path.join(os.tmpdir(), `aws-toolkit-test-${Date.now()}`)
+
+        // Create temp directory for tests - actually create it, don't stub
+        if (!(await fs.exists(vscode.Uri.file(tempDir)))) {
+            await fs.mkdir(vscode.Uri.file(tempDir))
+        }
+
+        // Create Lambda client stub with necessary properties
+        lambdaClientStub = sandbox.createStubInstance(DefaultLambdaClient)
+        Object.defineProperty(lambdaClientStub, 'defaultTimeoutInMs', {
+            value: 5 * 60 * 1000, // 5 minutes
+            configurable: true,
+        })
+        Object.defineProperty(lambdaClientStub, 'createSdkClient', {
+            value: () => Promise.resolve({}),
+            configurable: true,
+        })
+
+        sandbox.stub(utils, 'getLambdaClient').returns(lambdaClientStub as any)
+
+        // Mock CloudFormation client - now returns Promises directly (no .promise() method)
+        cfnClientStub = {
+            describeStackResource: sandbox.stub().resolves({
+                StackResourceDetail: {
+                    PhysicalResourceId: 'test-physical-id',
+                },
+            }),
+            describeStackResources: sandbox.stub().resolves({
+                StackResources: [
+                    { LogicalResourceId: 'testResource', PhysicalResourceId: 'test-physical-id' },
+                    { LogicalResourceId: 'prefixTestResource', PhysicalResourceId: 'prefix-test-physical-id' },
+                ],
+            }),
+            describeStacks: sandbox.stub().resolves({
+                Stacks: [
+                    {
+                        StackId: 'stack-id',
+                        StackName: 'test-stack',
+                        StackStatus: 'CREATE_COMPLETE',
+                    },
+                ],
+            }),
+            getTemplate: sandbox.stub().resolves({
+                TemplateBody: '{"Resources": {"TestFunc": {"Type": "AWS::Lambda::Function"}}}',
+            }),
+            getGeneratedTemplate: sandbox.stub().resolves({
+                Status: 'COMPLETE',
+                TemplateBody:
+                    '{"Resources": {"TestFunc": {"Type": "AWS::Lambda::Function", "Properties": {"FunctionName": "test-function"}}}}',
+            }),
+            describeGeneratedTemplate: sandbox.stub().resolves({
+                Status: 'COMPLETE',
+                Resources: [
+                    {
+                        LogicalResourceId: 'TestFunc',
+                        ResourceType: 'AWS::Lambda::Function',
+                        ResourceIdentifier: {
+                            FunctionName: 'arn:aws:lambda:us-east-2:123456789012:function:test-function',
+                        },
+                    },
+                ],
+            }),
+            createChangeSet: sandbox.stub().resolves({ Id: 'change-set-id' }),
+            waitFor: sandbox.stub().resolves(),
+            executeChangeSet: sandbox.stub().resolves(),
+            describeChangeSet: sandbox.stub().resolves({
+                StatusReason: 'Test reason',
+            }),
+        }
+        sandbox.stub(utils, 'getCFNClient').resolves(cfnClientStub)
+
+        // Setup test window to return appropriate values
+        getTestWindow().onDidShowMessage((msg) => {
+            if (msg.message.includes('Enter Stack Name')) {
+                msg.selectItem('test-stack')
+            }
+        })
+
+        getTestWindow().onDidShowDialog((dialog) => {
+            dialog.selectItem(vscode.Uri.file(tempDir))
+        })
+
+        // Stub downloadUnzip function
+        downloadUnzipStub = sandbox.stub(utils, 'downloadUnzip').callsFake(async (url, outputPath) => {
+            // Create a mock file structure for testing purposes
+            if (!(await fs.exists(outputPath))) {
+                await fs.mkdir(outputPath)
+            }
+
+            await fs.writeFile(
+                vscode.Uri.joinPath(outputPath, 'index.js'),
+                'exports.handler = async (event) => { return "Hello World" };'
+            )
+            await fs.writeFile(
+                vscode.Uri.joinPath(outputPath, 'package.json'),
+                JSON.stringify(
+                    {
+                        name: 'test-lambda',
+                        version: '1.0.0',
+                        description: 'Test Lambda function',
+                    },
+                    undefined,
+                    2
+                )
+            )
+        })
+
+        // Stub workspace functions
+        sandbox.stub(vscode.workspace, 'openTextDocument').resolves({} as any)
+        sandbox.stub(vscode.window, 'showTextDocument').resolves()
+    })
+
+    afterEach(async function () {
+        sandbox.restore()
+
+        // Clean up the temp directory
+        if (await fs.exists(vscode.Uri.file(tempDir))) {
+            await fs.delete(vscode.Uri.file(tempDir), { recursive: true, force: true })
+        }
+    })
+
+    describe('processLambdaUrlResources', function () {
+        it('converts Lambda URL resources to FunctionUrlConfig', async function () {
+            // Setup resources with Lambda URL - using 'as any' to bypass strict typing for tests
+            const resources: cloudFormation.TemplateResources = {
+                TestFunc: {
+                    Type: cloudFormation.SERVERLESS_FUNCTION_TYPE,
+                    Properties: {
+                        FunctionName: 'test-function',
+                        PackageType: 'Zip',
+                    },
+                },
+                TestFuncUrl: {
+                    Type: cloudFormation.LAMBDA_URL_TYPE,
+                    Properties: {
+                        TargetFunctionArn: { Ref: 'TestFunc' },
+                        AuthType: 'NONE',
+                    },
+                },
+            } as any
+
+            // Call the function
+            await lambda2sam.processLambdaUrlResources(resources)
+
+            // Verify URL resource is removed
+            assert.strictEqual(resources['TestFuncUrl'], undefined)
+
+            // Verify FunctionUrlConfig added to function resource using non-null assertion
+            assert.deepStrictEqual(resources['TestFunc']!.Properties!.FunctionUrlConfig, {
+                AuthType: 'NONE',
+                Cors: undefined,
+                InvokeMode: undefined,
+            })
+        })
+
+        it('skips URL resources with Qualifier property', async function () {
+            // Setup resources with Lambda URL including Qualifier - using 'as any' to bypass strict typing for tests
+            const resources: cloudFormation.TemplateResources = {
+                TestFunc: {
+                    Type: cloudFormation.SERVERLESS_FUNCTION_TYPE,
+                    Properties: {
+                        FunctionName: 'test-function',
+                        PackageType: 'Zip',
+                    },
+                },
+                TestFuncUrl: {
+                    Type: cloudFormation.LAMBDA_URL_TYPE,
+                    Properties: {
+                        TargetFunctionArn: { Ref: 'TestFunc' },
+                        AuthType: 'NONE',
+                        Qualifier: 'prod',
+                    },
+                },
+            } as any
+
+            // Call the function
+            await lambda2sam.processLambdaUrlResources(resources)
+
+            // Verify URL resource is still there (not transformed)
+            assert.notStrictEqual(resources['TestFuncUrl'], undefined)
+
+            // Verify function resource doesn't have FunctionUrlConfig using non-null assertion
+            assert.strictEqual(resources['TestFunc']!.Properties!.FunctionUrlConfig, undefined)
+        })
+    })
+
+    describe('processLambdaResources', function () {
+        it('transforms AWS::Lambda::Function to AWS::Serverless::Function', async function () {
+            // Setup resources with Lambda function - using 'as any' to bypass strict typing for tests
+            const resources: cloudFormation.TemplateResources = {
+                TestFunc: {
+                    Type: cloudFormation.LAMBDA_FUNCTION_TYPE,
+                    Properties: {
+                        FunctionName: 'test-function',
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs18.x',
+                        Code: {
+                            S3Bucket: 'test-bucket',
+                            S3Key: 'test-key',
+                        },
+                        Tags: [
+                            { Key: 'test-key', Value: 'test-value' },
+                            { Key: 'lambda:createdBy', Value: 'test' },
+                        ],
+                        TracingConfig: {
+                            Mode: 'Active',
+                        },
+                        PackageType: 'Zip',
+                    },
+                },
+            } as any
+
+            const stackInfo = {
+                stackId: 'stack-id',
+                stackName: 'test-stack',
+                isSamTemplate: false,
+                template: {},
+            }
+
+            const projectDir = vscode.Uri.file(tempDir)
+
+            // Add necessary stub for getFunction
+            lambdaClientStub.getFunction.resolves({
+                Code: { Location: 'https://lambda-function-code.zip' },
+            })
+
+            // Call the function
+            await lambda2sam.processLambdaResources(resources, projectDir, stackInfo, 'us-west-2')
+
+            // Verify function type was transformed using non-null assertions
+            assert.strictEqual(resources['TestFunc']!.Type, cloudFormation.SERVERLESS_FUNCTION_TYPE)
+
+            // Verify properties were transformed correctly using non-null assertions
+            assert.strictEqual(resources['TestFunc']!.Properties!.Code, undefined)
+            assert.strictEqual(resources['TestFunc']!.Properties!.CodeUri, 'TestFunc')
+            assert.strictEqual(resources['TestFunc']!.Properties!.Tracing, 'Active')
+            assert.strictEqual(resources['TestFunc']!.Properties!.TracingConfig, undefined)
+            assert.deepStrictEqual(resources['TestFunc']!.Properties!.Tags, {
+                'test-key': 'test-value',
+            })
+
+            // Verify downloadLambdaFunctionCode was called
+            assert.strictEqual(downloadUnzipStub.calledOnce, true)
+        })
+
+        it('updates CodeUri for AWS::Serverless::Function', async function () {
+            // Setup resources with Serverless function - using 'as any' to bypass strict typing for tests
+            const resources: cloudFormation.TemplateResources = {
+                TestFunc: {
+                    Type: cloudFormation.SERVERLESS_FUNCTION_TYPE,
+                    Properties: {
+                        FunctionName: 'test-function',
+                        Handler: 'index.handler',
+                        Runtime: 'nodejs18.x',
+                        CodeUri: 's3://test-bucket/test-key',
+                        PackageType: 'Zip',
+                    },
+                },
+            } as any
+
+            const stackInfo = {
+                stackId: 'stack-id',
+                stackName: 'test-stack',
+                isSamTemplate: false,
+                template: {},
+            }
+
+            const projectDir = vscode.Uri.file(tempDir)
+
+            // Add necessary stub for getFunction
+            lambdaClientStub.getFunction.resolves({
+                Code: { Location: 'https://lambda-function-code.zip' },
+            })
+
+            // Call the function
+            await lambda2sam.processLambdaResources(resources, projectDir, stackInfo, 'us-west-2')
+
+            // Verify CodeUri was updated using non-null assertions
+            assert.strictEqual(resources['TestFunc']!.Properties!.CodeUri, 'TestFunc')
+
+            // Verify downloadLambdaFunctionCode was called
+            assert.strictEqual(downloadUnzipStub.calledOnce, true)
+        })
+    })
+
+    describe('processLambdaLayerResources', function () {
+        it('transforms AWS::Lambda::LayerVersion to AWS::Serverless::LayerVersion', async function () {
+            // Setup resources with Lambda layer - using 'as any' to bypass strict typing for tests
+            const resources: cloudFormation.TemplateResources = {
+                TestLayer: {
+                    Type: cloudFormation.LAMBDA_LAYER_TYPE,
+                    Properties: {
+                        LayerName: 'test-layer',
+                        Content: {
+                            S3Bucket: 'test-bucket',
+                            S3Key: 'test-key',
+                        },
+                        CompatibleRuntimes: ['nodejs18.x'],
+                    },
+                },
+            } as any
+
+            const stackInfo = {
+                stackId: 'stack-id',
+                stackName: 'test-stack',
+                isSamTemplate: false,
+                template: {},
+            }
+
+            const projectDir = vscode.Uri.file(tempDir)
+
+            // Setup layer version stub
+            cfnClientStub.describeStackResource.resolves({
+                StackResourceDetail: {
+                    PhysicalResourceId: 'arn:aws:lambda:us-west-2:123456789012:layer:my-layer:1',
+                },
+            })
+
+            lambdaClientStub.getLayerVersion.resolves({
+                Content: { Location: 'https://lambda-layer-code.zip' },
+            })
+
+            // Call the function
+            await lambda2sam.processLambdaLayerResources(resources, projectDir, stackInfo, 'us-west-2')
+
+            // Verify layer type was transformed using non-null assertions
+            assert.strictEqual(resources['TestLayer']!.Type, cloudFormation.SERVERLESS_LAYER_TYPE)
+
+            // Verify properties were transformed correctly using non-null assertions
+            assert.strictEqual(resources['TestLayer']!.Properties!.Content, undefined)
+            assert.strictEqual(resources['TestLayer']!.Properties!.ContentUri, 'TestLayer')
+            assert.deepStrictEqual(resources['TestLayer']!.Properties!.CompatibleRuntimes, ['nodejs18.x'])
+
+            // Verify downloadLayerVersionResrouceByName was called (through downloadUnzip)
+            assert.strictEqual(downloadUnzipStub.calledOnce, true)
+        })
+
+        it('preserves AWS::Serverless::LayerVersion properties', async function () {
+            // Setup resources with Serverless layer - using 'as any' to bypass strict typing for tests
+            const resources: cloudFormation.TemplateResources = {
+                TestLayer: {
+                    Type: cloudFormation.SERVERLESS_LAYER_TYPE,
+                    Properties: {
+                        LayerName: 'test-layer',
+                        ContentUri: 's3://test-bucket/test-key',
+                        CompatibleRuntimes: ['nodejs18.x'],
+                    },
+                },
+            } as any
+
+            const stackInfo = {
+                stackId: 'stack-id',
+                stackName: 'test-stack',
+                isSamTemplate: false,
+                template: {},
+            }
+
+            const projectDir = vscode.Uri.file(tempDir)
+
+            // Setup layer version stub
+            cfnClientStub.describeStackResource.resolves({
+                StackResourceDetail: {
+                    PhysicalResourceId: 'arn:aws:lambda:us-west-2:123456789012:layer:my-layer:1',
+                },
+            })
+
+            lambdaClientStub.getLayerVersion.resolves({
+                Content: { Location: 'https://lambda-layer-code.zip' },
+            })
+
+            // Call the function
+            await lambda2sam.processLambdaLayerResources(resources, projectDir, stackInfo, 'us-west-2')
+
+            // Verify layer type is still serverless using non-null assertions
+            assert.strictEqual(resources['TestLayer']!.Type, cloudFormation.SERVERLESS_LAYER_TYPE)
+
+            // Verify ContentUri was updated using non-null assertions
+            assert.strictEqual(resources['TestLayer']!.Properties!.ContentUri, 'TestLayer')
+
+            // Verify downloadLayerVersionResrouceByName was called (through downloadUnzip)
+            assert.strictEqual(downloadUnzipStub.calledOnce, true)
+        })
+    })
+
+    describe('deployCfnTemplate', function () {
+        it('deploys a CloudFormation template and returns stack info', async function () {
+            // Setup CloudFormation template
+            const template: cloudFormation.Template = mockCloudFormationTemplate()
+
+            // Setup Lambda node
+            const lambdaNode = mockLambdaNode()
+
+            const resourceToImport: ResourceToImport[] = [
+                {
+                    ResourceType: LAMBDA_FUNCTION_TYPE,
+                    LogicalResourceId: 'TestFunc',
+                    ResourceIdentifier: {
+                        FunctionName: lambdaNode.name,
+                    },
+                },
+            ]
+
+            // Call the function
+            const result = await lambda2sam.deployCfnTemplate(
+                template,
+                resourceToImport,
+                'test-stack',
+                lambdaNode.regionCode
+            )
+
+            // Verify createChangeSet was called with correct parameters
+            assert.strictEqual(cfnClientStub.createChangeSet.called, true)
+            const createChangeSetArgs = cfnClientStub.createChangeSet.firstCall.args[0]
+            assert.strictEqual(createChangeSetArgs.StackName, 'test-stack')
+            assert.strictEqual(createChangeSetArgs.ChangeSetType, 'IMPORT')
+
+            // Verify waitFor and executeChangeSet were called
+            assert.strictEqual(cfnClientStub.waitFor.calledWith('changeSetCreateComplete'), true)
+            assert.strictEqual(cfnClientStub.executeChangeSet.called, true)
+
+            // Verify describeStacks was called to get stack ID
+            assert.strictEqual(cfnClientStub.describeStacks.called, true)
+
+            // Verify result structure
+            assert.strictEqual(result.stackId, 'stack-id')
+            assert.strictEqual(result.stackName, 'test-stack')
+            assert.strictEqual(result.isSamTemplate, false)
+            assert.deepStrictEqual(result.template, template)
+        })
+
+        it('throws an error when change set creation fails', async function () {
+            // Setup CloudFormation template
+            const template: cloudFormation.Template = mockCloudFormationTemplate()
+
+            // Setup Lambda node
+            const lambdaNode = mockLambdaNode()
+
+            // Make createChangeSet fail
+            cfnClientStub.createChangeSet.resolves({}) // No Id
+
+            const resourceToImport: ResourceToImport[] = [
+                {
+                    ResourceType: LAMBDA_FUNCTION_TYPE,
+                    LogicalResourceId: 'TestFunc',
+                    ResourceIdentifier: {
+                        FunctionName: lambdaNode.name,
+                    },
+                },
+            ]
+
+            // Call the function and expect error
+            await assert.rejects(
+                lambda2sam.deployCfnTemplate(template, resourceToImport, 'test-stack', lambdaNode.regionCode),
+                (err: ToolkitError) => {
+                    assert.strictEqual(err.message.includes('Failed to create change set'), true)
+                    return true
+                }
+            )
+        })
+    })
+
+    describe('callExternalApiForCfnTemplate', function () {
+        it('extracts function name from ARN in ResourceIdentifier', async function () {
+            // Setup Lambda node
+            const lambdaNode = mockLambdaNode(true)
+
+            // Mock IAM connection
+            const mockConnection = mockIamConnection()
+            sandbox.stub(authUtils, 'getIAMConnection').resolves(mockConnection)
+
+            // Mock fetch response
+            const mockFetch = mockFetchResponse(sandbox)
+
+            // Setup CloudFormation client to return ARN in ResourceIdentifier
+            cfnClientStub.describeGeneratedTemplate.resolves({
+                Status: 'COMPLETE',
+                Resources: [
+                    {
+                        LogicalResourceId: 'TestFunc',
+                        ResourceType: 'AWS::Lambda::Function',
+                        ResourceIdentifier: {
+                            FunctionName: 'arn:aws:lambda:us-east-2:123456789012:function:test-function',
+                        },
+                    },
+                ],
+            })
+
+            // Call the function
+            const [_, resourcesToImport] = await lambda2sam.callExternalApiForCfnTemplate(lambdaNode)
+
+            // Verify that the ARN was converted to just the function name
+            assert.strictEqual(resourcesToImport.length, 1)
+            assert.strictEqual(resourcesToImport[0].ResourceType, 'AWS::Lambda::Function')
+            assert.strictEqual(resourcesToImport[0].LogicalResourceId, 'TestFunc')
+            assert.strictEqual(resourcesToImport[0].ResourceIdentifier!.FunctionName, 'test-function')
+
+            // Verify API calls were made
+            assert.strictEqual(mockFetch.calledOnce, true)
+            assert.strictEqual(cfnClientStub.getGeneratedTemplate.calledOnce, true)
+            assert.strictEqual(cfnClientStub.describeGeneratedTemplate.calledOnce, true)
+        })
+
+        it('preserves function name when not an ARN', async function () {
+            // Setup Lambda node
+            const lambdaNode = mockLambdaNode(true)
+
+            // Mock IAM connection
+            const mockConnection = mockIamConnection()
+            sandbox.stub(authUtils, 'getIAMConnection').resolves(mockConnection)
+
+            // Mock fetch response
+            mockFetchResponse(sandbox)
+
+            // Setup CloudFormation client to return plain function name
+            cfnClientStub.describeGeneratedTemplate.resolves({
+                Status: 'COMPLETE',
+                Resources: [
+                    {
+                        LogicalResourceId: 'TestFunc',
+                        ResourceType: 'AWS::Lambda::Function',
+                        ResourceIdentifier: {
+                            FunctionName: 'test-function',
+                        },
+                    },
+                ],
+            })
+
+            // Call the function
+            const [_, resourcesToImport] = await lambda2sam.callExternalApiForCfnTemplate(lambdaNode)
+
+            // Verify that the function name was preserved
+            assert.strictEqual(resourcesToImport.length, 1)
+            assert.strictEqual(resourcesToImport[0].ResourceIdentifier!.FunctionName, 'test-function')
+        })
+
+        it('handles non-Lambda resources without modification', async function () {
+            // Setup Lambda node
+            const lambdaNode = mockLambdaNode(true)
+
+            // Mock IAM connection
+            const mockConnection = mockIamConnection()
+            sandbox.stub(authUtils, 'getIAMConnection').resolves(mockConnection)
+
+            // Mock fetch response
+            mockFetchResponse(sandbox)
+
+            // Setup CloudFormation client to return mixed resource types
+            cfnClientStub.describeGeneratedTemplate.resolves({
+                Status: 'COMPLETE',
+                Resources: [
+                    {
+                        LogicalResourceId: 'TestFunc',
+                        ResourceType: 'AWS::Lambda::Function',
+                        ResourceIdentifier: {
+                            FunctionName: 'arn:aws:lambda:us-east-2:123456789012:function:test-function',
+                        },
+                    },
+                    {
+                        LogicalResourceId: 'TestRole',
+                        ResourceType: 'AWS::IAM::Role',
+                        ResourceIdentifier: {
+                            RoleName: 'test-role',
+                        },
+                    },
+                ],
+            })
+
+            // Call the function
+            const [_, resourcesToImport] = await lambda2sam.callExternalApiForCfnTemplate(lambdaNode)
+
+            // Verify that Lambda function ARN was converted but IAM role was not
+            assert.strictEqual(resourcesToImport.length, 2)
+
+            const lambdaResource = resourcesToImport.find((r) => r.ResourceType === 'AWS::Lambda::Function')
+            const iamResource = resourcesToImport.find((r) => r.ResourceType === 'AWS::IAM::Role')
+
+            assert.strictEqual(lambdaResource!.ResourceIdentifier!.FunctionName, 'test-function')
+            assert.strictEqual(iamResource!.ResourceIdentifier!.RoleName, 'test-role')
+        })
+    })
+
+    describe('lambdaToSam', function () {
+        it('converts a Lambda function to a SAM project', async function () {
+            // Setup Lambda node
+            const lambdaNode = mockLambdaNode()
+
+            // Setup AWS Lambda client responses
+            lambdaClientStub.getFunction.resolves({
+                Tags: {
+                    'aws:cloudformation:stack-id': 'stack-id',
+                    'aws:cloudformation:stack-name': 'test-stack',
+                },
+                Configuration: {
+                    FunctionName: 'test-function',
+                    Handler: 'index.handler',
+                    Runtime: 'nodejs18.x',
+                },
+                Code: {
+                    Location: 'https://lambda-function-code.zip',
+                },
+            })
+
+            // Setup CloudFormation client responses
+            cfnClientStub.describeStacks.resolves({
+                Stacks: [
+                    {
+                        StackId: 'stack-id',
+                        StackName: 'test-stack',
+                        StackStatus: 'CREATE_COMPLETE',
+                    },
+                ],
+            })
+
+            cfnClientStub.getTemplate.resolves({
+                TemplateBody: JSON.stringify({
+                    AWSTemplateFormatVersion: '2010-09-09',
+                    Transform: 'AWS::Serverless-2016-10-31',
+                    Resources: {
+                        TestFunc: {
+                            Type: 'AWS::Serverless::Function',
+                            Properties: {
+                                FunctionName: 'test-function',
+                                Handler: 'index.handler',
+                                Runtime: 'nodejs18.x',
+                                CodeUri: 's3://test-bucket/test-key',
+                                PackageType: 'Zip',
+                            },
+                        },
+                    },
+                }),
+            })
+
+            // Setup test window to return a project directory
+            getTestWindow().onDidShowDialog((dialog) => {
+                dialog.selectItem(vscode.Uri.file(tempDir))
+            })
+            // Spy on walkthrough.openProjectInWorkspace
+            const openProjectStub = sandbox.stub(walkthrough, 'openProjectInWorkspace')
+
+            // Call the function
+            await lambda2sam.lambdaToSam(lambdaNode)
+
+            assert.strictEqual(
+                await fs.exists(vscode.Uri.joinPath(vscode.Uri.file(tempDir), 'test-stack', 'template.yaml').fsPath),
+                true,
+                'template.yaml was not written'
+            )
+            assert.strictEqual(
+                await fs.exists(vscode.Uri.joinPath(vscode.Uri.file(tempDir), 'test-stack', 'README.md').fsPath),
+                true,
+                'README.md was not written'
+            )
+            assert.strictEqual(
+                await fs.exists(vscode.Uri.joinPath(vscode.Uri.file(tempDir), 'test-stack', 'samconfig.toml').fsPath),
+                true,
+                'samconfig.toml was not written'
+            )
+
+            // Verify that project was opened in workspace
+            assert.strictEqual(openProjectStub.calledOnce, true)
+            assert.strictEqual(
+                openProjectStub.firstCall.args[0].fsPath,
+                vscode.Uri.joinPath(vscode.Uri.file(tempDir), 'test-stack').fsPath
+            )
+        })
+    })
+
+    function mockLambdaNode(withArn: boolean = false) {
+        if (withArn) {
+            return {
+                name: 'test-function',
+                regionCode: 'us-east-2',
+                arn: 'arn:aws:lambda:us-east-2:123456789012:function:test-function',
+            } as LambdaFunctionNode
+        } else {
+            return {
+                name: 'test-function',
+                regionCode: 'us-east-2',
+            } as LambdaFunctionNode
+        }
+    }
+
+    function mockIamConnection() {
+        return {
+            type: 'iam' as const,
+            id: 'test-connection',
+            label: 'Test Connection',
+            state: 'valid' as const,
+            getCredentials: sandbox.stub().resolves({
+                accessKeyId: 'test-key',
+                secretAccessKey: 'test-secret',
+            }),
+            endpointUrl: undefined,
+        }
+    }
+
+    function mockCloudFormationTemplate(): cloudFormation.Template {
+        return {
+            AWSTemplateFormatVersion: '2010-09-09',
+            Resources: {
+                TestFunc: {
+                    Type: cloudFormation.LAMBDA_FUNCTION_TYPE,
+                    Properties: {
+                        FunctionName: 'test-function',
+                        PackageType: 'Zip',
+                        Handler: 'index.handler',
+                        CodeUri: 's3://test-bucket/test-key',
+                    },
+                },
+            },
+        }
+    }
+
+    function mockFetchResponse(sandbox: sinon.SinonSandbox) {
+        return sandbox.stub(global, 'fetch').resolves({
+            ok: true,
+            json: sandbox.stub().resolves({
+                cloudFormationTemplateId: 'test-template-id',
+            }),
+        } as any)
+    }
+})
diff --git a/packages/core/src/test/awsService/appBuilder/lambda2sam/lambda2samDownload.test.ts b/packages/core/src/test/awsService/appBuilder/lambda2sam/lambda2samDownload.test.ts
new file mode 100644
index 00000000000..9c4d3122918
--- /dev/null
+++ b/packages/core/src/test/awsService/appBuilder/lambda2sam/lambda2samDownload.test.ts
@@ -0,0 +1,312 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+import assert from 'assert'
+import * as vscode from 'vscode'
+import * as lambda2sam from '../../../../awsService/appBuilder/lambda2sam/lambda2sam'
+import * as utils from '../../../../awsService/appBuilder/utils'
+import { fs } from '../../../../shared'
+import { DefaultLambdaClient } from '../../../../shared/clients/lambdaClient'
+import os from 'os'
+import path from 'path'
+import { LAMBDA_FUNCTION_TYPE, LAMBDA_LAYER_TYPE } from '../../../../shared/cloudformation/cloudformation'
+
+describe('lambda2samDownload', function () {
+    let sandbox: sinon.SinonSandbox
+    let tempDir: string
+    let lambdaClientStub: sinon.SinonStubbedInstance<DefaultLambdaClient>
+    let cfnClientStub: any
+    let downloadUnzipStub: sinon.SinonStub
+
+    beforeEach(async function () {
+        sandbox = sinon.createSandbox()
+        tempDir = path.join(os.tmpdir(), `aws-toolkit-test-${Date.now()}`)
+
+        // Create temp directory for tests - actually create it, don't stub
+        if (!(await fs.exists(vscode.Uri.file(tempDir)))) {
+            await fs.mkdir(vscode.Uri.file(tempDir))
+        }
+
+        // Create Lambda client stub with necessary properties
+        lambdaClientStub = sandbox.createStubInstance(DefaultLambdaClient)
+        // Add required properties that aren't stubbed automatically
+        Object.defineProperty(lambdaClientStub, 'defaultTimeoutInMs', {
+            value: 5 * 60 * 1000, // 5 minutes
+            configurable: true,
+        })
+        Object.defineProperty(lambdaClientStub, 'createSdkClient', {
+            value: () => Promise.resolve({}),
+            configurable: true,
+        })
+
+        sandbox.stub(utils, 'getLambdaClient').returns(lambdaClientStub as any)
+
+        // Stub CloudFormation client - now returns Promises directly (no .promise() method)
+        cfnClientStub = {
+            describeStackResource: sandbox.stub().resolves({
+                StackResourceDetail: {
+                    PhysicalResourceId: 'test-physical-id',
+                },
+            }),
+            describeStackResources: sandbox.stub().resolves({
+                StackResources: [
+                    { LogicalResourceId: 'testResource', PhysicalResourceId: 'test-physical-id' },
+                    { LogicalResourceId: 'prefixTestResource', PhysicalResourceId: 'prefix-test-physical-id' },
+                ],
+            }),
+        }
+        sandbox.stub(utils, 'getCFNClient').resolves(cfnClientStub)
+
+        // Stub downloadUnzip function to create actual files in the temp directory
+        downloadUnzipStub = sandbox.stub(utils, 'downloadUnzip').callsFake(async (url, outputPath) => {
+            // Create a mock file structure for testing purposes
+
+            // Create the output directory if it doesn't exist
+            if (!(await fs.exists(outputPath))) {
+                await fs.mkdir(outputPath)
+            }
+
+            // Create a simple file to simulate extracted content
+            await fs.writeFile(
+                vscode.Uri.joinPath(outputPath, 'index.js'),
+                'exports.handler = async (event) => { return "Hello World" };'
+            )
+
+            // Create a package.json file
+            await fs.writeFile(
+                vscode.Uri.joinPath(outputPath, 'package.json'),
+                JSON.stringify(
+                    {
+                        name: 'test-lambda',
+                        version: '1.0.0',
+                        description: 'Test Lambda function',
+                    },
+                    undefined,
+                    2
+                )
+            )
+        })
+    })
+
+    afterEach(async function () {
+        sandbox.restore()
+
+        // Clean up the temp directory after each test
+        if (await fs.exists(vscode.Uri.file(tempDir))) {
+            await fs.delete(vscode.Uri.file(tempDir), { recursive: true, force: true })
+        }
+    })
+
+    describe('getPhysicalIdfromCFNResourceName', function () {
+        it('returns the physical ID when an exact match is found', async function () {
+            const result = await lambda2sam.getPhysicalIdfromCFNResourceName(
+                'testResource',
+                'us-west-2',
+                'stack-id',
+                LAMBDA_FUNCTION_TYPE
+            )
+
+            assert.strictEqual(cfnClientStub.describeStackResource.calledOnce, true)
+            assert.strictEqual(cfnClientStub.describeStackResource.firstCall.args[0].StackName, 'stack-id')
+            assert.strictEqual(cfnClientStub.describeStackResource.firstCall.args[0].LogicalResourceId, 'testResource')
+            assert.strictEqual(result, 'test-physical-id')
+        })
+
+        it('returns a prefix match when exact match fails', async function () {
+            // Make exact match fail
+            cfnClientStub.describeStackResource.rejects(new Error('Resource not found'))
+
+            const result = await lambda2sam.getPhysicalIdfromCFNResourceName(
+                'prefix',
+                'us-west-2',
+                'stack-id',
+                LAMBDA_LAYER_TYPE
+            )
+
+            assert.strictEqual(cfnClientStub.describeStackResources.calledOnce, true)
+            assert.strictEqual(cfnClientStub.describeStackResources.firstCall.args[0].StackName, 'stack-id')
+            assert.strictEqual(result, 'prefix-test-physical-id')
+        })
+
+        it('returns undefined when no match is found', async function () {
+            // Make exact match fail
+            cfnClientStub.describeStackResource.rejects(new Error('Resource not found'))
+
+            // Return empty resources
+            cfnClientStub.describeStackResources.resolves({ StackResources: [] })
+
+            const result = await lambda2sam.getPhysicalIdfromCFNResourceName(
+                'nonexistent',
+                'us-west-2',
+                'stack-id',
+                LAMBDA_LAYER_TYPE
+            )
+            assert.strictEqual(result, undefined)
+        })
+    })
+
+    describe('downloadLambdaFunctionCode', function () {
+        it('uses physical ID from CloudFormation when not provided', async function () {
+            const targetDir = vscode.Uri.file(tempDir)
+            const resourceName = 'testResource'
+            const stackInfo = { stackId: 'stack-id', stackName: 'test-stack', isSamTemplate: false, template: {} }
+
+            lambdaClientStub.getFunction.resolves({
+                Code: { Location: 'https://lambda-function-code.zip' },
+            })
+
+            await lambda2sam.downloadLambdaFunctionCode(resourceName, stackInfo, targetDir, 'us-west-2')
+
+            // Verify CloudFormation was called to get physical ID
+            assert.strictEqual(cfnClientStub.describeStackResource.calledOnce, true)
+
+            // Verify Lambda client was called with correct physical ID
+            assert.strictEqual(lambdaClientStub.getFunction.calledOnce, true)
+            assert.strictEqual(lambdaClientStub.getFunction.firstCall.args[0], 'test-physical-id')
+
+            // Verify downloadUnzip was called with correct parameters
+            assert.strictEqual(downloadUnzipStub.calledOnce, true)
+            assert.strictEqual(downloadUnzipStub.firstCall.args[0], 'https://lambda-function-code.zip')
+            assert.strictEqual(
+                downloadUnzipStub.firstCall.args[1].fsPath,
+                vscode.Uri.joinPath(targetDir, resourceName).fsPath
+            )
+
+            // Verify files were actually created in the temp directory
+            const outputDir = vscode.Uri.joinPath(targetDir, resourceName)
+            assert.strictEqual(await fs.exists(outputDir), true)
+            assert.strictEqual(await fs.exists(vscode.Uri.joinPath(outputDir, 'index.js')), true)
+            assert.strictEqual(await fs.exists(vscode.Uri.joinPath(outputDir, 'package.json')), true)
+        })
+
+        it('uses provided physical ID when available', async function () {
+            const targetDir = vscode.Uri.file(tempDir)
+            const resourceName = 'testResource'
+            const physicalResourceId = 'provided-physical-id'
+            const stackInfo = { stackId: 'stack-id', stackName: 'test-stack', isSamTemplate: false, template: {} }
+
+            lambdaClientStub.getFunction.resolves({
+                Code: { Location: 'https://lambda-function-code.zip' },
+            })
+
+            await lambda2sam.downloadLambdaFunctionCode(
+                resourceName,
+                stackInfo,
+                targetDir,
+                'us-west-2',
+                physicalResourceId
+            )
+
+            // Verify CloudFormation was NOT called to get physical ID
+            assert.strictEqual(cfnClientStub.describeStackResource.called, false)
+
+            // Verify Lambda client was called with provided physical ID
+            assert.strictEqual(lambdaClientStub.getFunction.calledOnce, true)
+            assert.strictEqual(lambdaClientStub.getFunction.firstCall.args[0], physicalResourceId)
+
+            // Verify files were actually created in the temp directory
+            const outputDir = vscode.Uri.joinPath(targetDir, resourceName)
+            assert.strictEqual(await fs.exists(outputDir), true)
+            assert.strictEqual(await fs.exists(vscode.Uri.joinPath(outputDir, 'index.js')), true)
+            assert.strictEqual(await fs.exists(vscode.Uri.joinPath(outputDir, 'package.json')), true)
+        })
+
+        it('throws an error when code location is missing', async function () {
+            const targetDir = vscode.Uri.file(tempDir)
+            const resourceName = 'testResource'
+            const stackInfo = { stackId: 'stack-id', stackName: 'test-stack', isSamTemplate: false, template: {} }
+
+            lambdaClientStub.getFunction.resolves({
+                Code: {}, // No Location
+            })
+
+            await assert.rejects(
+                lambda2sam.downloadLambdaFunctionCode(resourceName, stackInfo, targetDir, 'us-west-2'),
+                /Could not determine code location/
+            )
+        })
+    })
+
+    describe('downloadLayerVersionResourceByName', function () {
+        it('extracts layer name and version from ARN and downloads content', async function () {
+            const targetDir = vscode.Uri.file(tempDir)
+            const resourceName = 'testLayer'
+            const stackInfo = { stackId: 'stack-id', stackName: 'test-stack', isSamTemplate: false, template: {} }
+
+            // Return an ARN for a layer version
+            cfnClientStub.describeStackResource.resolves({
+                StackResourceDetail: {
+                    PhysicalResourceId: 'arn:aws:lambda:us-west-2:123456789012:layer:my-layer:1',
+                },
+            })
+
+            lambdaClientStub.getLayerVersion.resolves({
+                Content: { Location: 'https://lambda-layer-code.zip' },
+            })
+
+            await lambda2sam.downloadLayerVersionResourceByName(resourceName, stackInfo, targetDir, 'us-west-2')
+
+            // Verify Lambda client was called with correct layer name and version
+            assert.strictEqual(lambdaClientStub.getLayerVersion.calledOnce, true)
+            assert.strictEqual(lambdaClientStub.getLayerVersion.firstCall.args[0], 'my-layer')
+            assert.strictEqual(lambdaClientStub.getLayerVersion.firstCall.args[1], 1)
+
+            // Verify downloadUnzip was called with correct parameters
+            assert.strictEqual(downloadUnzipStub.calledOnce, true)
+            assert.strictEqual(downloadUnzipStub.firstCall.args[0], 'https://lambda-layer-code.zip')
+            assert.strictEqual(
+                downloadUnzipStub.firstCall.args[1].fsPath,
+                vscode.Uri.joinPath(targetDir, resourceName).fsPath
+            )
+
+            // Verify files were actually created in the temp directory
+            const outputDir = vscode.Uri.joinPath(targetDir, resourceName)
+            assert.strictEqual(await fs.exists(outputDir), true)
+            assert.strictEqual(await fs.exists(vscode.Uri.joinPath(outputDir, 'index.js')), true)
+            assert.strictEqual(await fs.exists(vscode.Uri.joinPath(outputDir, 'package.json')), true)
+        })
+
+        it('throws an error when ARN format is invalid', async function () {
+            const targetDir = vscode.Uri.file(tempDir)
+            const resourceName = 'testLayer'
+            const stackInfo = { stackId: 'stack-id', stackName: 'test-stack', isSamTemplate: false, template: {} }
+
+            // Return an invalid ARN
+            cfnClientStub.describeStackResource.resolves({
+                StackResourceDetail: {
+                    PhysicalResourceId: 'arn:aws:lambda:us-west-2:123456789012:layer:my-layer', // Missing version
+                },
+            })
+
+            await assert.rejects(
+                lambda2sam.downloadLayerVersionResourceByName(resourceName, stackInfo, targetDir, 'us-west-2'),
+                /Invalid layer ARN format/
+            )
+        })
+
+        it('throws an error when layer content location is missing', async function () {
+            const targetDir = vscode.Uri.file(tempDir)
+            const resourceName = 'testLayer'
+            const stackInfo = { stackId: 'stack-id', stackName: 'test-stack', isSamTemplate: false, template: {} }
+
+            // Return an ARN for a layer version
+            cfnClientStub.describeStackResource.resolves({
+                StackResourceDetail: {
+                    PhysicalResourceId: 'arn:aws:lambda:us-west-2:123456789012:layer:my-layer:1',
+                },
+            })
+
+            lambdaClientStub.getLayerVersion.resolves({
+                Content: {}, // No Location
+            })
+
+            await assert.rejects(
+                lambda2sam.downloadLayerVersionResourceByName(resourceName, stackInfo, targetDir, 'us-west-2'),
+                /Could not determine code location for layer/
+            )
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/appBuilder/serverlessLand/main.test.ts b/packages/core/src/test/awsService/appBuilder/serverlessLand/main.test.ts
new file mode 100644
index 00000000000..5ed49638dc8
--- /dev/null
+++ b/packages/core/src/test/awsService/appBuilder/serverlessLand/main.test.ts
@@ -0,0 +1,237 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as path from 'path'
+import { MetadataManager } from '../../../../awsService/appBuilder/serverlessLand/metadataManager'
+import * as main from '../../../../awsService/appBuilder/serverlessLand/main'
+import {
+    createNewServerlessLandProject,
+    openReadmeFile,
+    getProjectUri,
+    downloadPatternCode,
+} from '../../../../awsService/appBuilder/serverlessLand/main'
+import { fs } from '../../../../shared/fs/fs'
+import * as downloadPatterns from '../../../../shared/utilities/downloadPatterns'
+import { ExtContext } from '../../../../shared/extensions'
+import { workspaceUtils } from '../../../../shared'
+import * as messages from '../../../../shared/utilities/messages'
+import * as downloadPattern from '../../../../shared/utilities/downloadPatterns'
+import * as wizardModule from '../../../../awsService/appBuilder/serverlessLand/wizard'
+
+describe('createNewServerlessLandProject', () => {
+    let sandbox: sinon.SinonSandbox
+    let mockExtContext: ExtContext
+    let mockMetadataManager: sinon.SinonStubbedInstance<MetadataManager>
+    let mockWizard: { run: sinon.SinonStub }
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+        mockExtContext = {
+            awsContext: {
+                getCredentials: sandbox.stub().resolves({}),
+                getCredentialDefaultRegion: () => 'us-west-2',
+            },
+        } as unknown as ExtContext
+
+        mockMetadataManager = sandbox.createStubInstance(MetadataManager)
+        mockMetadataManager.getAssetName.returns('test-asset-name')
+        sandbox.stub(MetadataManager, 'getInstance').returns(mockMetadataManager as unknown as MetadataManager)
+
+        mockWizard = { run: sandbox.stub() }
+        sandbox.stub(wizardModule, 'CreateServerlessLandWizard').returns(mockWizard)
+
+        sandbox.stub(vscode.Uri, 'joinPath').returns(vscode.Uri.file('/test'))
+        sandbox.stub(vscode.commands, 'executeCommand').resolves()
+
+        sandbox.stub(workspaceUtils, 'addFolderToWorkspace').resolves()
+        sandbox.stub(downloadPattern, 'getPattern').resolves()
+    })
+    afterEach(() => {
+        sandbox.restore()
+    })
+    it('should complete project creation successfully', async () => {
+        const mockConfig = {
+            pattern: 'testPattern',
+            runtime: 'nodejs',
+            iac: 'sam',
+            location: vscode.Uri.file('/test'),
+            name: 'testProject',
+        }
+        mockWizard.run.resolves(mockConfig)
+        await createNewServerlessLandProject(mockExtContext)
+        assert.strictEqual(mockWizard.run.calledOnce, true)
+        assert.strictEqual(mockMetadataManager.getAssetName.calledOnce, true)
+        assert.strictEqual((downloadPattern.getPattern as sinon.SinonStub).calledOnce, true)
+    })
+    it('should handle wizard cancellation', async () => {
+        mockWizard.run.resolves(undefined)
+        await createNewServerlessLandProject(mockExtContext)
+        assert.strictEqual(mockWizard.run.calledOnce, true)
+        assert.strictEqual(mockMetadataManager.getAssetName.called, false)
+        assert.strictEqual((downloadPattern.getPattern as sinon.SinonStub).called, false)
+    })
+})
+
+function assertDownloadPatternCall(getPatternStub: sinon.SinonStub, mockConfig: any) {
+    const mockAssetName = 'test-project-sam-python.zip'
+    const serverlessLandOwner = 'aws-samples'
+    const serverlessLandRepo = 'serverless-patterns'
+    const mockLocation = vscode.Uri.joinPath(mockConfig.location, mockConfig.name)
+
+    assert(getPatternStub.calledOnce)
+    assert(getPatternStub.firstCall.args[0] === serverlessLandOwner)
+    assert(getPatternStub.firstCall.args[1] === serverlessLandRepo)
+    assert(getPatternStub.firstCall.args[2] === mockAssetName)
+    assert(getPatternStub.firstCall.args[3].toString() === mockLocation.toString())
+    assert(getPatternStub.firstCall.args[4] === true)
+}
+
+describe('downloadPatternCode', () => {
+    let sandbox: sinon.SinonSandbox
+    let getPatternStub: sinon.SinonStub
+    let mockConfig: any
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        getPatternStub = sandbox.stub(downloadPatterns, 'getPattern')
+        mockConfig = {
+            name: 'test-project',
+            location: vscode.Uri.file('/test'),
+            pattern: 'test-project-sam-python',
+            runtime: 'python',
+            iac: 'sam',
+            assetName: 'test-project-sam-python',
+        }
+    })
+    afterEach(function () {
+        sandbox.restore()
+        getPatternStub.restore()
+    })
+    it('successfully downloads pattern code', async () => {
+        sandbox.stub(messages, 'handleOverwriteConflict').resolves(true)
+
+        await downloadPatternCode(mockConfig, mockConfig.assetName)
+        assertDownloadPatternCall(getPatternStub, mockConfig)
+    })
+    it('downloads pattern when directory exists and user confirms overwrite', async function () {
+        sandbox.stub(messages, 'handleOverwriteConflict').resolves(true)
+
+        await downloadPatternCode(mockConfig, mockConfig.assetName)
+        assertDownloadPatternCall(getPatternStub, mockConfig)
+    })
+    it('throws error when directory exists and user cancels overwrite', async function () {
+        const handleOverwriteStub = sandbox.stub(messages, 'handleOverwriteConflict')
+        handleOverwriteStub.rejects(new Error('Folder already exists: test-project'))
+
+        await assert.rejects(
+            () => downloadPatternCode(mockConfig, mockConfig.assetName),
+            /Folder already exists: test-project/
+        )
+    })
+})
+
+describe('openReadmeFile', () => {
+    let testsandbox: sinon.SinonSandbox
+    let spyExecuteCommand: sinon.SinonSpy
+
+    beforeEach(function () {
+        testsandbox = sinon.createSandbox()
+        spyExecuteCommand = testsandbox.spy(vscode.commands, 'executeCommand')
+    })
+
+    afterEach(function () {
+        testsandbox.restore()
+    })
+    const mockConfig = {
+        name: 'test-project',
+        location: vscode.Uri.file('/test'),
+        pattern: 'test-project-sam-python',
+        runtime: 'python',
+        iac: 'sam',
+        assetName: 'test-project-sam-python',
+    }
+    it('successfully opens README file', async () => {
+        const mockReadmeUri = vscode.Uri.file('/test/README.md')
+        testsandbox.stub(main, 'getProjectUri').resolves(mockReadmeUri)
+
+        testsandbox.stub(fs, 'exists').resolves(true)
+
+        // When
+        await openReadmeFile(mockConfig)
+        // Then
+        testsandbox.assert.calledWith(spyExecuteCommand, 'workbench.action.focusFirstEditorGroup')
+        testsandbox.assert.calledWith(spyExecuteCommand, 'markdown.showPreview')
+    })
+
+    it('handles missing README file', async () => {
+        const mockReadmeUri = vscode.Uri.file('/test/file.md')
+        testsandbox.stub(main, 'getProjectUri').resolves(mockReadmeUri)
+
+        testsandbox.stub(fs, 'exists').resolves(false)
+
+        // When
+        await openReadmeFile(mockConfig)
+        // Then
+        testsandbox.assert.neverCalledWith(spyExecuteCommand, 'markdown.showPreview')
+        assert.ok(true, 'Function should return without throwing error when README is not found')
+    })
+
+    it('handles error with opening README file', async () => {
+        const mockReadmeUri = vscode.Uri.file('/test/README.md')
+        testsandbox.stub(main, 'getProjectUri').resolves(mockReadmeUri)
+
+        testsandbox.stub(fs, 'exists').rejects(new Error('File system error'))
+
+        // When
+        await assert.rejects(() => openReadmeFile(mockConfig), {
+            name: 'Error',
+            message: 'Error processing README file',
+        })
+        // Then
+        testsandbox.assert.neverCalledWith(spyExecuteCommand, 'markdown.showPreview')
+    })
+})
+
+describe('getProjectUri', () => {
+    const sandbox = sinon.createSandbox()
+    beforeEach(() => {
+        sandbox.restore()
+    })
+    afterEach(() => {
+        sandbox.restore()
+    })
+    const mockConfig = {
+        name: 'test-project',
+        location: vscode.Uri.file('/test'),
+        pattern: 'test-project-sam-python',
+        runtime: 'python',
+        iac: 'sam',
+        assetName: 'test-project-sam-python',
+    }
+    it('returns Uri when file exists', async () => {
+        const testFile = 'README.md'
+        const expectedPath = path.resolve('/test', 'test-project', testFile)
+        const uriFileStub = sandbox.stub(vscode.Uri, 'file').returns({
+            fsPath: expectedPath,
+        } as vscode.Uri)
+
+        const result = await getProjectUri(mockConfig, testFile)
+        sandbox.assert.calledWith(uriFileStub, expectedPath)
+        assert.strictEqual(result?.fsPath, expectedPath)
+    })
+    it('handles missing project directory', async () => {
+        await assert.rejects(
+            async () => await getProjectUri(mockConfig, ''),
+            /expected "file" parameter to have at least one item/
+        )
+    })
+})
diff --git a/packages/core/src/test/awsService/appBuilder/serverlessLand/metadataManager.test.ts b/packages/core/src/test/awsService/appBuilder/serverlessLand/metadataManager.test.ts
new file mode 100644
index 00000000000..27a48a96e3d
--- /dev/null
+++ b/packages/core/src/test/awsService/appBuilder/serverlessLand/metadataManager.test.ts
@@ -0,0 +1,141 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { MetadataManager } from '../../../../awsService/appBuilder/serverlessLand/metadataManager'
+import globals from '../../../../shared/extensionGlobals'
+import path from 'path'
+import assert from 'assert'
+import * as sinon from 'sinon'
+
+describe('MetadataManager', () => {
+    let sandbox: sinon.SinonSandbox
+    let manager: MetadataManager
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+        manager = MetadataManager.getInstance()
+        ;(manager as any).metadata = {
+            patterns: {
+                testPattern: {
+                    implementation: [
+                        { iac: 'SAM', runtime: 'nodejs', assetName: 'asset1' },
+                        { iac: 'CDK', runtime: 'nodejs', assetName: 'asset2' },
+                        { iac: 'SAM', runtime: 'python', assetName: 'asset3' },
+                    ],
+                },
+            },
+        }
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+
+    describe('getInstance', () => {
+        it('should create a new instance when none exists', () => {
+            const instance1 = MetadataManager.getInstance()
+            assert(instance1 instanceof MetadataManager)
+        })
+
+        it('should return the same instance when called multiple times', () => {
+            const instance1 = MetadataManager.getInstance()
+            const instance2 = MetadataManager.getInstance()
+            assert.strictEqual(instance1, instance2)
+        })
+    })
+    describe('initialize', () => {
+        it('should initialize metadata manager and return instance', async () => {
+            const mockPath = '/mock/path/metadata.json'
+            const loadMetadataStub = sandbox.stub().resolves(undefined)
+
+            const getMetadataPathStub = sandbox.stub(MetadataManager.prototype, 'getMetadataPath').returns(mockPath)
+
+            sandbox.stub(MetadataManager.prototype as any, 'loadMetadata').callsFake(loadMetadataStub)
+
+            const instance = MetadataManager.initialize()
+
+            assert(instance instanceof MetadataManager)
+            sandbox.assert.calledOnce(getMetadataPathStub)
+            sandbox.assert.calledWith(loadMetadataStub, mockPath)
+        })
+    })
+
+    describe('getMetadataPath', () => {
+        it('should return correct metadata path', () => {
+            const mockAbsolutePath = '/absolute/path'
+            const asAbsolutePathStub = sandbox.stub().returns(mockAbsolutePath)
+
+            sandbox.stub(globals, 'context').value({
+                asAbsolutePath: asAbsolutePathStub,
+            })
+
+            const instance = MetadataManager.getInstance()
+            const result = instance.getMetadataPath()
+            const expectedPath = path.join('dist', 'src', 'serverlessLand', 'metadata.json')
+
+            sandbox.assert.calledWith(asAbsolutePathStub, expectedPath)
+            assert.strictEqual(result, mockAbsolutePath)
+        })
+    })
+
+    describe('getPatterns', () => {
+        let manager: MetadataManager
+        beforeEach(() => {
+            manager = MetadataManager.getInstance()
+        })
+        it('handles different pattern data types', () => {
+            ;(manager as any).metadata = {
+                patterns: {
+                    pattern1: { name: 'test', description: 'object description' },
+                },
+            }
+            assert.deepStrictEqual(manager.getPatterns(), [{ label: 'pattern1', description: 'object description' }])
+        })
+    })
+
+    describe('getRuntimes', () => {
+        it('returns empty array when pattern not found', () => {
+            assert.deepStrictEqual(manager.getRuntimes('nonexistent'), [])
+        })
+
+        it('returns unique runtimes for valid pattern', () => {
+            assert.deepStrictEqual(manager.getRuntimes('testPattern'), [{ label: 'nodejs' }, { label: 'python' }])
+        })
+    })
+
+    describe('getUrl', () => {
+        it('returns empty string when pattern not found', () => {
+            assert.strictEqual(manager.getUrl('nonexistent'), '')
+        })
+
+        it('returns correct URL for valid pattern', () => {
+            assert.strictEqual(manager.getUrl('testPattern'), 'https://serverlessland.com/patterns/asset1')
+        })
+    })
+
+    describe('getIacOptions', () => {
+        it('returns empty array when pattern not found', () => {
+            assert.deepStrictEqual(manager.getIacOptions('nonexistent'), [])
+        })
+
+        it('returns unique IAC options for valid pattern', () => {
+            assert.deepStrictEqual(manager.getIacOptions('testPattern'), [{ label: 'SAM' }, { label: 'CDK' }])
+        })
+    })
+
+    describe('getAssetName', () => {
+        it('returns empty string when pattern not found', () => {
+            assert.strictEqual(manager.getAssetName('nonexistent', 'nodejs', 'SAM'), '')
+        })
+
+        it('returns correct asset name for matching implementation', () => {
+            assert.strictEqual(manager.getAssetName('testPattern', 'nodejs', 'SAM'), 'asset1')
+        })
+
+        it('returns empty string when no matching implementation found', () => {
+            assert.strictEqual(manager.getAssetName('testPattern', 'java', 'SAM'), '')
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/appBuilder/serverlessLand/wizard.test.ts b/packages/core/src/test/awsService/appBuilder/serverlessLand/wizard.test.ts
new file mode 100644
index 00000000000..e8a51238d6f
--- /dev/null
+++ b/packages/core/src/test/awsService/appBuilder/serverlessLand/wizard.test.ts
@@ -0,0 +1,132 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import path from 'path'
+import { PrompterTester } from '../../../../test/shared/wizards/prompterTester'
+import { describe } from 'mocha'
+import { ProjectMetadata } from '../../../../awsService/appBuilder/serverlessLand/metadataManager'
+import * as nodefs from 'fs' // eslint-disable-line no-restricted-imports
+import fs from '../../../../shared/fs/fs'
+import globals from '../../../../shared/extensionGlobals'
+import { AppBuilderRootNode } from '../../../../awsService/appBuilder/explorer/nodes/rootNode'
+import * as sinon from 'sinon'
+import { AppNode } from '../../../../awsService/appBuilder/explorer/nodes/appNode'
+import { ResourceNode } from '../../../../awsService/appBuilder/explorer/nodes/resourceNode'
+import { getTestWindow } from '../../../../test/shared/vscode/window'
+
+describe('CreateWizard', async () => {
+    const metadataPath = globals.context.asAbsolutePath(path.join('dist', 'src', 'serverlessLand', 'metadata.json'))
+    const metadataContent = nodefs.readFileSync(metadataPath, { encoding: 'utf-8' })
+    const parseMetadata = JSON.parse(metadataContent) as ProjectMetadata
+    const workspaceFolder = vscode.workspace.workspaceFolders![0]
+    const projectFolder = 'my-project-from-Serverless-Land'
+    let rootNode: sinon.SinonSpiedInstance<AppBuilderRootNode>
+    let sandbox: sinon.SinonSandbox
+
+    beforeEach(async () => {
+        sandbox = sinon.createSandbox()
+        await fs.delete(path.join(workspaceFolder.uri.fsPath, projectFolder), { recursive: true })
+    })
+
+    afterEach(async () => {
+        await fs.delete(path.join(workspaceFolder.uri.fsPath, projectFolder), { recursive: true })
+        sandbox.restore()
+    })
+
+    describe(':) ServerlessLand Path', async () => {
+        it('creates project with Python runtime and CDK', async () => {
+            rootNode = sandbox.spy(AppBuilderRootNode.instance)
+            const testWindow = getTestWindow()
+            const prompterTester = PrompterTester.init({ testWindow })
+                .handleQuickPick('Select a Pattern for your application', async (quickPick) => {
+                    await quickPick.untilReady()
+                    const options = quickPick.items
+                    Object.entries(parseMetadata.patterns).map(([key, pattern]) => {
+                        options.find((option) => option.label === key && option.detail === pattern.description)
+                    })
+                    assert.strictEqual(options[0].label, 'Image Resizing')
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .handleQuickPick('Select Runtime', async (quickPick) => {
+                    await quickPick.untilReady()
+                    quickPick.acceptItem(quickPick.items[0]) // python
+                })
+                .handleQuickPick('Select IaC', async (quickPick) => {
+                    await quickPick.untilReady()
+                    const options = quickPick.items
+                    quickPick.acceptItem(options[0]) // sam
+                })
+                .handleQuickPick('Select Project Location', async (quickPick) => {
+                    await quickPick.untilReady()
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .handleInputBox('Enter Project Name', (inputBox) => {
+                    inputBox.acceptValue('python-sam-project')
+                })
+                .build()
+
+            await vscode.commands.executeCommand('aws.toolkit.lambda.createServerlessLandProject')
+
+            const projectNode = await rootNode
+                .getChildren()
+                .then(
+                    (children) =>
+                        children.find(
+                            (node) =>
+                                node instanceof AppNode &&
+                                node.label === path.normalize('workspaceFolder/python-sam-project')
+                        ) as AppNode | undefined
+                )
+
+            assert.ok(projectNode)
+            const resourceNodes = await projectNode.getChildren()
+            assert.strictEqual(resourceNodes.length, 3)
+            assert.ok(resourceNodes[0] instanceof ResourceNode)
+
+            const lambdaResource = resourceNodes[2] as ResourceNode
+            assert.strictEqual(lambdaResource.resource.resource.Runtime, 'python3.12')
+
+            prompterTester.assertCallAll()
+        })
+    })
+    describe('Error Handling', async () => {
+        it('handles empty project name', async () => {
+            const testWindow = getTestWindow()
+            const prompterTester = PrompterTester.init({ testWindow })
+                .handleQuickPick('Select a Pattern for your application', async (quickPick) => {
+                    await quickPick.untilReady()
+                    quickPick.acceptItem(quickPick.items[1])
+                })
+                .handleQuickPick('Select Runtime', async (quickPick) => {
+                    await quickPick.untilReady()
+                    quickPick.acceptItem(quickPick.items[3])
+                })
+                .handleQuickPick('Select IaC', async (quickPick) => {
+                    await quickPick.untilReady()
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .handleQuickPick('Select Project Location', async (quickPick) => {
+                    await quickPick.untilReady()
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .handleInputBox('Enter Project Name', (inputBox) => {
+                    inputBox.acceptValue(' ')
+                })
+                .build()
+
+            try {
+                await vscode.commands.executeCommand('aws.toolkit.lambda.createServerlessLandProject')
+                assert.fail('Project name cannot be empty')
+            } catch (err) {
+                assert.ok(err instanceof Error)
+                assert.strictEqual(err.message, 'Project name cannot be empty')
+            }
+
+            prompterTester.assertCallAll()
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/appBuilder/utils.test.ts b/packages/core/src/test/awsService/appBuilder/utils.test.ts
new file mode 100644
index 00000000000..08edd14f47c
--- /dev/null
+++ b/packages/core/src/test/awsService/appBuilder/utils.test.ts
@@ -0,0 +1,848 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import assert from 'assert'
+import { getTestWindow } from '../../shared/vscode/window'
+
+import fs from '../../../shared/fs/fs'
+import { ResourceNode } from '../../../awsService/appBuilder/explorer/nodes/resourceNode'
+import path from 'path'
+import { SERVERLESS_FUNCTION_TYPE } from '../../../shared/cloudformation/cloudformation'
+import {
+    runOpenHandler,
+    runOpenTemplate,
+    isPermissionError,
+    EnhancedLambdaClient,
+    EnhancedCloudFormationClient,
+    getLambdaClient,
+    getCFNClient,
+} from '../../../awsService/appBuilder/utils'
+import { TreeNode } from '../../../shared/treeview/resourceTreeDataProvider'
+import { assertTextEditorContains } from '../../testUtil'
+import { DefaultLambdaClient } from '../../../shared/clients/lambdaClient'
+import { ToolkitError } from '../../../shared/errors'
+import globals from '../../../shared/extensionGlobals'
+import { Runtime } from '@aws-sdk/client-lambda'
+import { CloudFormationClient } from '@aws-sdk/client-cloudformation'
+
+interface TestScenario {
+    runtime: Runtime
+    handler: string
+    codeUri: string
+    fileLocation: string
+    fileInfo: string
+    regex: RegExp
+}
+
+const scenarios: TestScenario[] = [
+    {
+        runtime: 'java21',
+        handler: 'resizer.App::handleRequest',
+        codeUri: 'ResizerFunction',
+        fileLocation: 'ResizerFunction/src/main/java/resizer/App.java',
+        fileInfo: 'testjava',
+        regex: /App.java/g,
+    },
+    {
+        runtime: 'dotnet6',
+        handler: 'ImageResize::ImageResize.Function::FunctionHandler',
+        codeUri: 'ImageResize/',
+        fileLocation: 'ImageResize/Function.cs',
+        fileInfo: 'testdotnet',
+        regex: /Function.cs/g,
+    },
+    {
+        runtime: 'python3.9',
+        handler: 'app.lambda_handler',
+        codeUri: 'hello_world/',
+        fileLocation: 'hello_world/app.py',
+        fileInfo: 'testpython',
+        regex: /app.py/g,
+    },
+    {
+        runtime: 'nodejs18.x',
+        handler: 'app.handler',
+        codeUri: 'src/',
+        fileLocation: 'src/app.js',
+        fileInfo: 'testnode',
+        regex: /app.js/g,
+    },
+    {
+        runtime: 'ruby3.2',
+        handler: 'app.lambda_handler',
+        codeUri: 'hello_world/',
+        fileLocation: 'hello_world/app.rb',
+        fileInfo: 'testruby',
+        regex: /app.rb/g,
+    },
+    {
+        runtime: 'java21',
+        handler: 'resizer.App::handleRequest',
+        codeUri: 'ResizerFunction',
+        fileLocation: 'ResizerFunction/src/foo/bar/main/java/resizer/App.java',
+        fileInfo: 'testjava2',
+        regex: /App.java/g,
+    },
+    {
+        runtime: 'dotnet8',
+        handler: 'ImageResize::ImageResize.Function::FunctionHandler',
+        codeUri: 'ImageResize/src/test',
+        fileLocation: 'ImageResize/src/test/Function.cs',
+        fileInfo: 'testdotnet2',
+        regex: /Function.cs/g,
+    },
+    {
+        runtime: 'python3.12',
+        handler: 'app.foo.bar.lambda_handler',
+        codeUri: 'hello_world/test123',
+        fileLocation: 'hello_world/test123/app/foo/bar.py',
+        fileInfo: 'testpython2',
+        regex: /bar.py/g,
+    },
+    {
+        runtime: 'nodejs20.x',
+        handler: 'app.foo.bar.handler',
+        codeUri: 'src/test123',
+        fileLocation: 'src/test123/app/foo/bar.js',
+        fileInfo: 'testnode2',
+        regex: /bar.js/g,
+    },
+    {
+        runtime: 'ruby3.3',
+        handler: 'app/foo/bar.lambda_handler',
+        codeUri: 'hello_world/test456',
+        fileLocation: 'hello_world/test456/app/foo/bar.rb',
+        fileInfo: 'testruby2',
+        regex: /bar.rb/g,
+    },
+]
+
+describe('AppBuilder Utils', function () {
+    describe('openHandler', function () {
+        let sandbox: sinon.SinonSandbox
+        const workspace = vscode.workspace.workspaceFolders?.[0]
+        assert.ok(workspace)
+        const tempFolder = path.join(workspace.uri.fsPath, 'temp')
+
+        beforeEach(async function () {
+            sandbox = sinon.createSandbox()
+            await fs.mkdir(tempFolder)
+        })
+
+        afterEach(async function () {
+            await fs.delete(tempFolder, { recursive: true })
+            sandbox.restore()
+        })
+
+        for (const scenario of scenarios) {
+            it(`should open ${scenario.runtime}`, async function () {
+                // Given
+                const rNode = new ResourceNode(
+                    {
+                        samTemplateUri: vscode.Uri.file(path.join(tempFolder, 'template.yaml')),
+                        workspaceFolder: workspace,
+                        projectRoot: vscode.Uri.file(tempFolder),
+                    },
+                    {
+                        Id: 'MyFunction',
+                        Type: SERVERLESS_FUNCTION_TYPE,
+                        Runtime: scenario.runtime,
+                        Handler: scenario.handler,
+                        CodeUri: scenario.codeUri,
+                    }
+                )
+                await fs.mkdir(path.join(tempFolder, ...path.dirname(scenario.fileLocation).split('/')))
+                await fs.writeFile(path.join(tempFolder, ...scenario.fileLocation.split('/')), scenario.fileInfo)
+                await runOpenHandler(rNode)
+                // Then
+                assert.strictEqual(
+                    vscode.window.activeTextEditor?.document.fileName,
+                    path.join(tempFolder, ...scenario.fileLocation.split('/'))
+                )
+                await assertTextEditorContains(scenario.fileInfo)
+            })
+        }
+    })
+
+    describe('openHandler', function () {
+        let sandbox: sinon.SinonSandbox
+        const workspace = vscode.workspace.workspaceFolders?.[0]
+        assert.ok(workspace)
+        const tempFolder = path.join(workspace.uri.fsPath, 'temp')
+
+        beforeEach(async function () {
+            sandbox = sinon.createSandbox()
+            await fs.mkdir(tempFolder)
+        })
+
+        afterEach(async function () {
+            await fs.delete(tempFolder, { recursive: true })
+            sandbox.restore()
+        })
+
+        for (const scenario of scenarios) {
+            it(`should open ${scenario.runtime}`, async function () {
+                // Given
+                const rNode = new ResourceNode(
+                    {
+                        samTemplateUri: vscode.Uri.file(path.join(tempFolder, 'template.yaml')),
+                        workspaceFolder: workspace,
+                        projectRoot: vscode.Uri.file(tempFolder),
+                    },
+                    {
+                        Id: 'MyFunction',
+                        Type: SERVERLESS_FUNCTION_TYPE,
+                        Runtime: scenario.runtime,
+                        Handler: scenario.handler,
+                        CodeUri: scenario.codeUri,
+                    }
+                )
+                await fs.mkdir(path.join(tempFolder, ...path.dirname(scenario.fileLocation).split('/')))
+                await fs.writeFile(path.join(tempFolder, ...scenario.fileLocation.split('/')), scenario.fileInfo)
+                await runOpenHandler(rNode)
+                // Then
+                assert.strictEqual(
+                    vscode.window.activeTextEditor?.document.fileName,
+                    path.join(tempFolder, ...scenario.fileLocation.split('/'))
+                )
+                await assertTextEditorContains(scenario.fileInfo)
+            })
+        }
+
+        it(`should warn for multiple java handler found`, async function () {
+            const rNode = new ResourceNode(
+                {
+                    samTemplateUri: vscode.Uri.file(path.join(tempFolder, 'template.yaml')),
+                    workspaceFolder: workspace,
+                    projectRoot: vscode.Uri.file(tempFolder),
+                },
+                {
+                    Id: 'MyFunction',
+                    Type: SERVERLESS_FUNCTION_TYPE,
+                    Runtime: 'java21',
+                    Handler: 'resizer.App::handleRequest',
+                    CodeUri: 'ResizerFunction',
+                }
+            )
+            // When 2 java handler with right name under code URI
+            await fs.mkdir(
+                path.join(tempFolder, ...path.dirname('ResizerFunction/src/main/java/resizer/App.java').split('/'))
+            )
+            await fs.writeFile(
+                path.join(tempFolder, ...'ResizerFunction/src/main/java/resizer/App.java'.split('/')),
+                'testjava'
+            )
+            await fs.mkdir(
+                path.join(tempFolder, ...path.dirname('ResizerFunction/src/main/java/resizer2/App.java').split('/'))
+            )
+            await fs.writeFile(
+                path.join(tempFolder, ...'ResizerFunction/src/main/java/resizer2/App.java'.split('/')),
+                'testjava'
+            )
+            // Then should warn
+            getTestWindow().onDidShowMessage((msg) =>
+                assert(msg.assertWarn('Multiple handler files found with name App.java"'))
+            )
+            await runOpenHandler(rNode)
+        })
+    })
+
+    describe('open template', function () {
+        let sandbox: sinon.SinonSandbox
+        const workspace = vscode.workspace.workspaceFolders?.[0]
+        assert.ok(workspace)
+        const tempFolder = path.join(workspace.uri.fsPath, 'temp')
+
+        beforeEach(async function () {
+            sandbox = sinon.createSandbox()
+            await fs.mkdir(tempFolder)
+        })
+
+        afterEach(async function () {
+            await fs.delete(tempFolder, { recursive: true })
+            sandbox.restore()
+        })
+
+        it('select template should succeed', async function () {
+            const tNode = {
+                id: 'MyFunction',
+                resource: {
+                    // this doesn't exist
+                    samTemplateUri: vscode.Uri.file(path.join(tempFolder, 'abc', 'template.yaml')),
+                    workspaceFolder: workspace,
+                    projectRoot: vscode.Uri.file(tempFolder),
+                },
+            }
+            getTestWindow().onDidShowQuickPick((picker) => {
+                picker.acceptItem(picker.items[0])
+            })
+            await fs.mkdir(path.join(tempFolder, 'abc'))
+            await fs.writeFile(path.join(tempFolder, 'abc', 'template.yaml'), 'testyaml')
+
+            await vscode.commands.executeCommand('aws.appBuilder.openTemplate', tNode)
+            // Then
+            assert.strictEqual(
+                vscode.window.activeTextEditor?.document.fileName,
+                path.join(tempFolder, 'abc', 'template.yaml')
+            )
+            await assertTextEditorContains('testyaml')
+        })
+
+        it('should raise if no template', async function () {
+            // Given
+            const openCommand = sandbox.spy(vscode.workspace, 'openTextDocument')
+            const showCommand = sandbox.spy(vscode.window, 'showTextDocument')
+            const tNode = {
+                id: 'MyFunction',
+                resource: {
+                    // this doesn't exist
+                    samTemplateUri: vscode.Uri.file(path.join(tempFolder, 'template.yaml')),
+                    workspaceFolder: workspace,
+                    projectRoot: vscode.Uri.file(tempFolder),
+                },
+            }
+            try {
+                await runOpenTemplate(tNode as TreeNode)
+                assert.fail('SAM Template not found, cannot open template')
+            } catch (err) {
+                assert.strictEqual((err as Error).message, 'SAM Template not found, cannot open template')
+            }
+            // Then
+            assert(openCommand.neverCalledWith(sinon.match.has('fspath', sinon.match(/template.yaml/g))))
+            assert(showCommand.notCalled)
+        })
+    })
+
+    describe('Permission Error Handling', function () {
+        let sandbox: sinon.SinonSandbox
+
+        beforeEach(function () {
+            sandbox = sinon.createSandbox()
+        })
+
+        afterEach(function () {
+            sandbox.restore()
+        })
+
+        describe('isPermissionError', function () {
+            it('should return true for AccessDeniedException', function () {
+                const error = Object.assign(new Error('Access denied'), {
+                    code: 'AccessDeniedException',
+                    time: new Date(),
+                    statusCode: 403,
+                })
+                assert.strictEqual(isPermissionError(error), true)
+            })
+
+            it('should return true for UnauthorizedOperation', function () {
+                const error = Object.assign(new Error('Unauthorized'), {
+                    code: 'UnauthorizedOperation',
+                    time: new Date(),
+                    statusCode: 403,
+                })
+                assert.strictEqual(isPermissionError(error), true)
+            })
+
+            it('should return true for Forbidden', function () {
+                const error = Object.assign(new Error('Forbidden'), {
+                    code: 'Forbidden',
+                    time: new Date(),
+                    statusCode: 403,
+                })
+                assert.strictEqual(isPermissionError(error), true)
+            })
+
+            it('should return true for AccessDenied', function () {
+                const error = Object.assign(new Error('Access denied'), {
+                    code: 'AccessDenied',
+                    time: new Date(),
+                    statusCode: 403,
+                })
+                assert.strictEqual(isPermissionError(error), true)
+            })
+
+            it('should return true for 403 status code', function () {
+                const error = Object.assign(new Error('Forbidden'), {
+                    code: 'SomeError',
+                    statusCode: 403,
+                    time: new Date(),
+                })
+                assert.strictEqual(isPermissionError(error), true)
+            })
+
+            it('should return false for non-permission errors', function () {
+                const error = Object.assign(new Error('Resource not found'), {
+                    code: 'ResourceNotFoundException',
+                    time: new Date(),
+                    statusCode: 404,
+                })
+                assert.strictEqual(isPermissionError(error), false)
+            })
+
+            it('should return false for non-AWS errors', function () {
+                const error = new Error('Regular error')
+                assert.strictEqual(isPermissionError(error), false)
+            })
+
+            it('should return false for undefined', function () {
+                assert.strictEqual(isPermissionError(undefined), false)
+            })
+        })
+
+        describe('EnhancedLambdaClient', function () {
+            let mockLambdaClient: sinon.SinonStubbedInstance<DefaultLambdaClient>
+            let enhancedClient: EnhancedLambdaClient
+
+            beforeEach(function () {
+                mockLambdaClient = sandbox.createStubInstance(DefaultLambdaClient)
+                // Add missing properties that EnhancedLambdaClient expects
+                Object.defineProperty(mockLambdaClient, 'defaultTimeoutInMs', {
+                    value: 5 * 60 * 1000,
+                    configurable: true,
+                })
+                Object.defineProperty(mockLambdaClient, 'createSdkClient', {
+                    value: sandbox.stub().resolves({}),
+                    configurable: true,
+                })
+                enhancedClient = new EnhancedLambdaClient(mockLambdaClient as any, 'us-east-1')
+            })
+
+            it('should enhance permission errors for getFunction', async function () {
+                const permissionError = Object.assign(new Error('Access denied'), {
+                    code: 'AccessDeniedException',
+                    time: new Date(),
+                    statusCode: 403,
+                })
+                mockLambdaClient.getFunction.rejects(permissionError)
+
+                try {
+                    await enhancedClient.getFunction('test-function')
+                    assert.fail('Expected error to be thrown')
+                } catch (error) {
+                    assert(error instanceof ToolkitError)
+                    assert(
+                        error.message.includes('Permission denied: Missing required permissions for lambda:getFunction')
+                    )
+                    assert(error.message.includes('lambda:GetFunction'))
+                    assert(error.message.includes('arn:aws:lambda:us-east-1:*:function:test-function'))
+                    assert(error.message.includes('To fix this issue:'))
+                    assert(error.message.includes('Documentation:'))
+                }
+            })
+
+            it('should pass through non-permission errors for getFunction', async function () {
+                const nonPermissionError = new Error('Function not found')
+                mockLambdaClient.getFunction.rejects(nonPermissionError)
+
+                try {
+                    await enhancedClient.getFunction('test-function')
+                    assert.fail('Expected error to be thrown')
+                } catch (error) {
+                    assert.strictEqual(error, nonPermissionError)
+                }
+            })
+
+            it('should enhance permission errors for listFunctions', async function () {
+                const permissionError = Object.assign(new Error('Access denied'), {
+                    code: 'AccessDeniedException',
+                    time: new Date(),
+                    statusCode: 403,
+                })
+
+                // Create a mock async generator that throws the error
+                const mockAsyncGenerator = async function* (): AsyncIterableIterator<any> {
+                    throw permissionError
+                    yield // This line will never be reached but satisfies ESLint require-yield rule
+                }
+                mockLambdaClient.listFunctions.returns(mockAsyncGenerator())
+
+                try {
+                    const iterator = enhancedClient.listFunctions()
+                    await iterator.next()
+                    assert.fail('Expected error to be thrown')
+                } catch (error) {
+                    assert(error instanceof ToolkitError)
+                    assert(
+                        error.message.includes(
+                            'Permission denied: Missing required permissions for lambda:listFunctions'
+                        )
+                    )
+                    assert(error.message.includes('lambda:ListFunctions'))
+                }
+            })
+
+            it('should enhance permission errors for deleteFunction', async function () {
+                const permissionError = Object.assign(new Error('Access denied'), {
+                    code: 'AccessDeniedException',
+                    time: new Date(),
+                    statusCode: 403,
+                })
+                mockLambdaClient.deleteFunction.rejects(permissionError)
+
+                try {
+                    await enhancedClient.deleteFunction('test-function')
+                    assert.fail('Expected error to be thrown')
+                } catch (error) {
+                    assert(error instanceof ToolkitError)
+                    assert(
+                        error.message.includes(
+                            'Permission denied: Missing required permissions for lambda:deleteFunction'
+                        )
+                    )
+                    assert(error.message.includes('lambda:DeleteFunction'))
+                    assert(error.message.includes('arn:aws:lambda:us-east-1:*:function:test-function'))
+                }
+            })
+
+            it('should enhance permission errors for invoke', async function () {
+                const permissionError = Object.assign(new Error('Access denied'), {
+                    code: 'AccessDeniedException',
+                    time: new Date(),
+                    statusCode: 403,
+                })
+                mockLambdaClient.invoke.rejects(permissionError)
+
+                try {
+                    await enhancedClient.invoke('test-function', new TextEncoder().encode('{}'))
+                    assert.fail('Expected error to be thrown')
+                } catch (error) {
+                    assert(error instanceof ToolkitError)
+                    assert(error.message.includes('Permission denied: Missing required permissions for lambda:invoke'))
+                    assert(error.message.includes('lambda:InvokeFunction'))
+                    assert(error.message.includes('arn:aws:lambda:us-east-1:*:function:test-function'))
+                }
+            })
+
+            it('should enhance permission errors for getLayerVersion', async function () {
+                const permissionError = Object.assign(new Error('Access denied'), {
+                    code: 'AccessDeniedException',
+                    time: new Date(),
+                    statusCode: 403,
+                })
+                mockLambdaClient.getLayerVersion.rejects(permissionError)
+
+                try {
+                    await enhancedClient.getLayerVersion('test-layer', 1)
+                    assert.fail('Expected error to be thrown')
+                } catch (error) {
+                    assert(error instanceof ToolkitError)
+                    assert(
+                        error.message.includes(
+                            'Permission denied: Missing required permissions for lambda:getLayerVersion'
+                        )
+                    )
+                    assert(error.message.includes('lambda:GetLayerVersion'))
+                    assert(error.message.includes('arn:aws:lambda:us-east-1:*:layer:test-layer:1'))
+                }
+            })
+
+            it('should enhance permission errors for updateFunctionCode', async function () {
+                const permissionError = Object.assign(new Error('Access denied'), {
+                    code: 'AccessDeniedException',
+                    time: new Date(),
+                    statusCode: 403,
+                })
+                mockLambdaClient.updateFunctionCode.rejects(permissionError)
+
+                try {
+                    await enhancedClient.updateFunctionCode('test-function', new Uint8Array())
+                    assert.fail('Expected error to be thrown')
+                } catch (error) {
+                    assert(error instanceof ToolkitError)
+                    assert(
+                        error.message.includes(
+                            'Permission denied: Missing required permissions for lambda:updateFunctionCode'
+                        )
+                    )
+                    assert(error.message.includes('lambda:UpdateFunctionCode'))
+                    assert(error.message.includes('arn:aws:lambda:us-east-1:*:function:test-function'))
+                }
+            })
+
+            it('should return successful results when no errors occur', async function () {
+                const mockResponse = { Configuration: { FunctionName: 'test-function' } }
+                mockLambdaClient.getFunction.resolves(mockResponse)
+
+                const result = await enhancedClient.getFunction('test-function')
+                assert.strictEqual(result, mockResponse)
+            })
+        })
+
+        describe('EnhancedCloudFormationClient', function () {
+            let mockCfnClient: sinon.SinonStubbedInstance<CloudFormationClient>
+            let enhancedClient: EnhancedCloudFormationClient
+
+            beforeEach(function () {
+                // Create a mock CloudFormation client with all required methods
+                mockCfnClient = sandbox.createStubInstance(CloudFormationClient)
+                enhancedClient = new EnhancedCloudFormationClient(mockCfnClient as any, 'us-east-1')
+            })
+
+            it('should enhance permission errors for describeStacks', async function () {
+                const permissionError = Object.assign(new Error('Access denied'), {
+                    code: 'AccessDeniedException',
+                    time: new Date(),
+                    statusCode: 403,
+                })
+                mockCfnClient.send.rejects(permissionError)
+
+                try {
+                    await enhancedClient.describeStacks({ StackName: 'test-stack' })
+                    assert.fail('Expected error to be thrown')
+                } catch (error) {
+                    assert(error instanceof ToolkitError)
+                    assert(
+                        error.message.includes(
+                            'Permission denied: Missing required permissions for cloudformation:describeStacks'
+                        )
+                    )
+                    assert(error.message.includes('cloudformation:DescribeStacks'))
+                    assert(error.message.includes('arn:aws:cloudformation:us-east-1:*:stack/test-stack/*'))
+                    assert(error.message.includes('To fix this issue:'))
+                    assert(error.message.includes('Documentation:'))
+                }
+            })
+
+            it('should enhance permission errors for getTemplate', async function () {
+                const permissionError = Object.assign(new Error('Access denied'), {
+                    code: 'AccessDeniedException',
+                    time: new Date(),
+                    statusCode: 403,
+                })
+                mockCfnClient.send.rejects(permissionError)
+
+                try {
+                    await enhancedClient.getTemplate({ StackName: 'test-stack' })
+                    assert.fail('Expected error to be thrown')
+                } catch (error) {
+                    assert(error instanceof ToolkitError)
+                    assert(
+                        error.message.includes(
+                            'Permission denied: Missing required permissions for cloudformation:getTemplate'
+                        )
+                    )
+                    assert(error.message.includes('cloudformation:GetTemplate'))
+                    assert(error.message.includes('arn:aws:cloudformation:us-east-1:*:stack/test-stack/*'))
+                }
+            })
+
+            it('should enhance permission errors for createChangeSet', async function () {
+                const permissionError = Object.assign(new Error('Access denied'), {
+                    code: 'AccessDeniedException',
+                    time: new Date(),
+                    statusCode: 403,
+                })
+                mockCfnClient.send.rejects(permissionError)
+
+                try {
+                    await enhancedClient.createChangeSet({
+                        StackName: 'test-stack',
+                        ChangeSetName: 'test-changeset',
+                        TemplateBody: '{}',
+                    })
+                    assert.fail('Expected error to be thrown')
+                } catch (error) {
+                    assert(error instanceof ToolkitError)
+                    assert(
+                        error.message.includes(
+                            'Permission denied: Missing required permissions for cloudformation:createChangeSet'
+                        )
+                    )
+                    assert(error.message.includes('cloudformation:CreateChangeSet'))
+                    assert(error.message.includes('arn:aws:cloudformation:us-east-1:*:stack/test-stack/*'))
+                }
+            })
+
+            it('should enhance permission errors for describeStackResource', async function () {
+                const permissionError = Object.assign(new Error('Access denied'), {
+                    code: 'AccessDeniedException',
+                    time: new Date(),
+                    statusCode: 403,
+                })
+                mockCfnClient.send.rejects(permissionError)
+
+                try {
+                    await enhancedClient.describeStackResource({
+                        StackName: 'test-stack',
+                        LogicalResourceId: 'TestResource',
+                    })
+                    assert.fail('Expected error to be thrown')
+                } catch (error) {
+                    assert(error instanceof ToolkitError)
+                    assert(
+                        error.message.includes(
+                            'Permission denied: Missing required permissions for cloudformation:describeStackResource'
+                        )
+                    )
+                    assert(error.message.includes('cloudformation:DescribeStackResource'))
+                    assert(error.message.includes('arn:aws:cloudformation:us-east-1:*:stack/test-stack/*'))
+                }
+            })
+
+            it('should enhance permission errors for describeStackResources', async function () {
+                const permissionError = Object.assign(new Error('Access denied'), {
+                    code: 'AccessDeniedException',
+                    time: new Date(),
+                    statusCode: 403,
+                })
+                mockCfnClient.send.rejects(permissionError)
+
+                try {
+                    await enhancedClient.describeStackResources({ StackName: 'test-stack' })
+                    assert.fail('Expected error to be thrown')
+                } catch (error) {
+                    assert(error instanceof ToolkitError)
+                    assert(
+                        error.message.includes(
+                            'Permission denied: Missing required permissions for cloudformation:describeStackResources'
+                        )
+                    )
+                    assert(error.message.includes('cloudformation:DescribeStackResources'))
+                    assert(error.message.includes('arn:aws:cloudformation:us-east-1:*:stack/test-stack/*'))
+                }
+            })
+
+            it('should pass through non-permission errors', async function () {
+                const nonPermissionError = new Error('Stack not found')
+                mockCfnClient.send.rejects(nonPermissionError)
+
+                try {
+                    await enhancedClient.describeStacks({ StackName: 'test-stack' })
+                    assert.fail('Expected error to be thrown')
+                } catch (error) {
+                    assert.strictEqual(error, nonPermissionError)
+                }
+            })
+
+            it('should return successful results when no errors occur', async function () {
+                const mockResponse = { Stacks: [{ StackName: 'test-stack' }] }
+                mockCfnClient.send.resolves(mockResponse)
+
+                const result = await enhancedClient.describeStacks({ StackName: 'test-stack' })
+                assert.strictEqual(result, mockResponse)
+            })
+        })
+
+        describe('Client Factory Functions', function () {
+            beforeEach(function () {
+                // Stub the global SDK client builder
+                sandbox.stub(globals.sdkClientBuilderV3, 'createAwsService').resolves({} as any)
+            })
+
+            it('should return EnhancedLambdaClient from getLambdaClient', function () {
+                const client = getLambdaClient('us-east-1')
+                assert(client instanceof EnhancedLambdaClient)
+            })
+
+            it('should return EnhancedCloudFormationClient from getCFNClient', async function () {
+                const client = await getCFNClient('us-east-1')
+                assert(client instanceof EnhancedCloudFormationClient)
+            })
+        })
+
+        describe('Error Message Content', function () {
+            let mockLambdaClient: sinon.SinonStubbedInstance<DefaultLambdaClient>
+            let enhancedClient: EnhancedLambdaClient
+
+            beforeEach(function () {
+                mockLambdaClient = sandbox.createStubInstance(DefaultLambdaClient)
+                // Add missing properties that EnhancedLambdaClient expects
+                Object.defineProperty(mockLambdaClient, 'defaultTimeoutInMs', {
+                    value: 5 * 60 * 1000,
+                    configurable: true,
+                })
+                Object.defineProperty(mockLambdaClient, 'createSdkClient', {
+                    value: sandbox.stub().resolves({}),
+                    configurable: true,
+                })
+                enhancedClient = new EnhancedLambdaClient(mockLambdaClient as any, 'us-west-2')
+            })
+
+            it('should include all required elements in enhanced error message', async function () {
+                const permissionError = Object.assign(new Error('Access denied'), {
+                    code: 'AccessDeniedException',
+                    time: new Date(),
+                    statusCode: 403,
+                })
+                mockLambdaClient.getFunction.rejects(permissionError)
+
+                try {
+                    await enhancedClient.getFunction('my-test-function')
+                    assert.fail('Expected error to be thrown')
+                } catch (error) {
+                    assert(error instanceof ToolkitError)
+
+                    // Check that the error message contains all expected elements
+                    const message = error.message
+
+                    // Main error description
+                    assert(message.includes('Permission denied: Missing required permissions for lambda:getFunction'))
+
+                    // Required permissions section
+                    assert(message.includes('Required permissions:'))
+                    assert(message.includes('- lambda:GetFunction'))
+
+                    // Resource ARN
+                    assert(message.includes('Resource: arn:aws:lambda:us-west-2:*:function:my-test-function'))
+
+                    // Instructions
+                    assert(message.includes('To fix this issue:'))
+                    assert(message.includes('1. Contact your AWS administrator'))
+                    assert(message.includes('2. Add these permissions to your IAM user/role policy'))
+                    assert(message.includes('3. If using IAM roles, ensure the role has these permissions attached'))
+
+                    // Documentation link
+                    assert(
+                        message.includes(
+                            'Documentation: https://docs.aws.amazon.com/lambda/latest/api/API_GetFunction.html'
+                        )
+                    )
+
+                    // Check error details
+                    assert.strictEqual(error.code, 'InsufficientPermissions')
+                    assert(error.details)
+                    assert.strictEqual(error.details.service, 'lambda')
+                    assert.strictEqual(error.details.action, 'getFunction')
+                    assert.deepStrictEqual(error.details.requiredPermissions, ['lambda:GetFunction'])
+                    assert.strictEqual(
+                        error.details.resourceArn,
+                        'arn:aws:lambda:us-west-2:*:function:my-test-function'
+                    )
+                }
+            })
+
+            it('should handle errors without resource ARN', async function () {
+                const permissionError = Object.assign(new Error('Access denied'), {
+                    code: 'AccessDeniedException',
+                    time: new Date(),
+                    statusCode: 403,
+                })
+
+                // Create a mock async generator that throws the error
+                const mockAsyncGenerator = async function* (): AsyncIterableIterator<any> {
+                    throw permissionError
+                    yield // This line will never be reached but satisfies ESLint require-yield rule
+                }
+                mockLambdaClient.listFunctions.returns(mockAsyncGenerator())
+
+                try {
+                    const iterator = enhancedClient.listFunctions()
+                    await iterator.next()
+                    assert.fail('Expected error to be thrown')
+                } catch (error) {
+                    assert(error instanceof ToolkitError)
+
+                    const message = error.message
+                    assert(message.includes('Permission denied: Missing required permissions for lambda:listFunctions'))
+                    assert(message.includes('- lambda:ListFunctions'))
+                    // Should not include Resource line for operations without specific resources
+                    assert(!message.includes('Resource: arn:'))
+                }
+            })
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts b/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts
new file mode 100644
index 00000000000..add3ee6e546
--- /dev/null
+++ b/packages/core/src/test/awsService/appBuilder/walkthrough.test.ts
@@ -0,0 +1,576 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import assert from 'assert'
+import {
+    openApplicationComposerAfterReload,
+    templateToOpenAppComposer,
+} from '../../../awsService/appBuilder/activation'
+import globals from '../../../shared/extensionGlobals'
+import {
+    RuntimeLocationWizard,
+    genWalkthroughProject,
+    openProjectInWorkspace,
+    installLocalStackExtension,
+} from '../../../awsService/appBuilder/walkthrough'
+import { createWizardTester } from '../../shared/wizards/wizardTestUtils'
+import { fs } from '../../../shared'
+import { getTestWindow } from '../../shared/vscode/window'
+
+import { AwsClis, installCli } from '../../../shared/utilities/cliUtils'
+import { ChildProcess } from '../../../shared/utilities/processUtils'
+import { assertTelemetryCurried } from '../../testUtil'
+import { HttpResourceFetcher } from '../../../shared/resourcefetcher/node/httpResourceFetcher'
+import { SamCliInfoInvocation } from '../../../shared/sam/cli/samCliInfo'
+import type { ToolId } from '../../../shared/telemetry/telemetry'
+import { CodeScansState } from '../../../codewhisperer'
+
+interface TestScenario {
+    toolID: AwsClis
+    platform: string
+    shouldSucceed: boolean
+}
+
+const scenarios: TestScenario[] = [
+    {
+        toolID: 'aws-cli',
+        platform: 'win32',
+        shouldSucceed: true,
+    },
+    {
+        toolID: 'sam-cli',
+        platform: 'win32',
+        shouldSucceed: true,
+    },
+    {
+        toolID: 'docker',
+        platform: 'win32',
+        shouldSucceed: true,
+    },
+    {
+        toolID: 'finch',
+        platform: 'win32',
+        shouldSucceed: false,
+    },
+    {
+        toolID: 'aws-cli',
+        platform: 'darwin',
+        shouldSucceed: true,
+    },
+    {
+        toolID: 'sam-cli',
+        platform: 'darwin',
+        shouldSucceed: true,
+    },
+    {
+        toolID: 'docker',
+        platform: 'darwin',
+        shouldSucceed: true,
+    },
+    {
+        toolID: 'finch',
+        platform: 'darwin',
+        shouldSucceed: true,
+    },
+    {
+        toolID: 'aws-cli',
+        platform: 'linux',
+        shouldSucceed: false,
+    },
+    {
+        toolID: 'sam-cli',
+        platform: 'linux',
+        shouldSucceed: false,
+    },
+    {
+        toolID: 'docker',
+        platform: 'linux',
+        shouldSucceed: false,
+    },
+    {
+        toolID: 'finch',
+        platform: 'linux',
+        shouldSucceed: false,
+    },
+]
+
+describe('AppBuilder Walkthrough', function () {
+    before(async function () {
+        // ensure auto scan is disabled before testrun
+        await CodeScansState.instance.setScansEnabled(false)
+        assert.strictEqual(CodeScansState.instance.isScansEnabled(), false)
+    })
+
+    describe('Reopen template after reload', function () {
+        let sandbox: sinon.SinonSandbox
+        let spyExecuteCommand: sinon.SinonSpy
+
+        beforeEach(function () {
+            sandbox = sinon.createSandbox()
+            spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+        })
+
+        afterEach(function () {
+            sandbox.restore()
+        })
+
+        // test openApplicationComposerAfterReload
+        it('open template in appComposer', async function () {
+            // Given
+            const workspaceUri = vscode.workspace.workspaceFolders?.[0]?.uri
+            assert.ok(workspaceUri)
+            const templateUri = vscode.Uri.joinPath(workspaceUri, '/path/to/template.yaml')
+            await globals.globalState.update(templateToOpenAppComposer, [templateUri.fsPath])
+            // When
+            await openApplicationComposerAfterReload()
+            // Then
+            sandbox.assert.calledWith(spyExecuteCommand, 'aws.openInApplicationComposer')
+        })
+
+        it('not open non-template in appComposer', async function () {
+            // Given
+            const workspaceUri = vscode.workspace.workspaceFolders?.[0]?.uri
+            assert.ok(workspaceUri)
+            const templateUri = vscode.Uri.joinPath(workspaceUri, '/path/to/non-template.json')
+
+            await globals.globalState.update(templateToOpenAppComposer, [templateUri.fsPath])
+            // When
+            await openApplicationComposerAfterReload()
+            // Then
+            sandbox.assert.notCalled(spyExecuteCommand)
+        })
+
+        it('should not open non-workspace template', async function () {
+            const templateUri = vscode.Uri.file('/path/to/non-worksace/template.yaml')
+
+            await globals.globalState.update(templateToOpenAppComposer, [templateUri.fsPath])
+
+            await openApplicationComposerAfterReload()
+
+            sandbox.assert.notCalled(spyExecuteCommand)
+        })
+    })
+
+    describe('Wizard', function () {
+        it('should not show runtime, should show file-selecotr', async function () {
+            // When
+            const tester = await createWizardTester(new RuntimeLocationWizard(true, 'open project'))
+            // Then
+            tester.runtime.assertDoesNotShow()
+            tester.dir.applyInput('file-selector')
+            tester.realDir.assertShowFirst()
+        })
+
+        it('should show runtime, should not show file-selector', async function () {
+            // When
+            const tester = await createWizardTester(new RuntimeLocationWizard(false, 'open project'))
+            // Then
+            tester.runtime.assertShowFirst()
+            tester.dir.assertShowSecond()
+            tester.runtime.applyInput('python')
+            tester.dir.applyInput('workspace')
+            tester.runtime.assertValue('python')
+            tester.realDir.assertDoesNotShow()
+        })
+    })
+
+    describe('Create project', function () {
+        const workspaceUri = vscode.workspace.workspaceFolders?.[0]?.uri
+        const prevInfo = 'random text'
+        assert.ok(workspaceUri)
+
+        describe('start without existing template', async () => {
+            beforeEach(async () => {
+                await fs.delete(vscode.Uri.joinPath(workspaceUri, 'template.yaml'), { force: true })
+            })
+
+            it('open existing template', async function () {
+                // When
+                await genWalkthroughProject('CustomTemplate', workspaceUri, undefined)
+                // Then nothing should be created
+                assert.ok(!(await fs.exists(vscode.Uri.joinPath(workspaceUri, 'template.yaml'))))
+            })
+        })
+
+        describe('start with an existing template', async () => {
+            beforeEach(async () => {
+                await fs.writeFile(vscode.Uri.joinPath(workspaceUri, 'template.yaml'), prevInfo)
+            })
+
+            afterEach(async function () {
+                await fs.delete(vscode.Uri.joinPath(workspaceUri, 'template.yaml'), { force: true })
+            })
+
+            describe('override existing template', async () => {
+                beforeEach(() => {
+                    getTestWindow().onDidShowMessage((message) => {
+                        assert.strictEqual(
+                            message.message,
+                            'template.yaml already exist in the selected directory, overwrite?'
+                        )
+                        message.selectItem('Yes')
+                    })
+                })
+
+                it('build an app with appcomposer', async function () {
+                    // When
+                    await genWalkthroughProject('Visual', workspaceUri, undefined)
+                    // Then
+                    assert.notEqual(await fs.readFileText(vscode.Uri.joinPath(workspaceUri, 'template.yaml')), prevInfo)
+                })
+
+                it('download serverlessland proj', async function () {
+                    const config = vscode.workspace.getConfiguration('aws.samcli')
+                    await config.update('enableCodeLenses', false, vscode.ConfigurationTarget.Global)
+                    // When
+                    await genWalkthroughProject('API', workspaceUri, 'python')
+                    // Then template should be overwritten
+                    assert.equal(await fs.exists(vscode.Uri.joinPath(workspaceUri, 'template.yaml')), true)
+                    assert.notEqual(await fs.readFileText(vscode.Uri.joinPath(workspaceUri, 'template.yaml')), prevInfo)
+                    await config.update('enableCodeLenses', true, vscode.ConfigurationTarget.Global)
+                })
+            })
+
+            describe('without override existing template', async () => {
+                beforeEach(() => {
+                    // Given existing template.yaml
+                    // select do not overwrite
+                    getTestWindow().onDidShowMessage((message) => {
+                        assert.strictEqual(
+                            message.message,
+                            'template.yaml already exist in the selected directory, overwrite?'
+                        )
+                        message.selectItem('No')
+                    })
+                })
+
+                it('build an app with appcomposer', async function () {
+                    // When
+                    try {
+                        // When
+                        await genWalkthroughProject('Visual', workspaceUri, undefined)
+                        assert.fail('Expect failure due to template.yaml already exists in this path, but see success.')
+                    } catch (e) {
+                        assert.equal((e as Error).message, 'A file named template.yaml already exists in this path.')
+                    }
+                    // Then
+                    assert.equal(await fs.readFileText(vscode.Uri.joinPath(workspaceUri, 'template.yaml')), prevInfo)
+                })
+
+                it('download serverlessland proj', async function () {
+                    try {
+                        // When
+                        await genWalkthroughProject('S3', workspaceUri, 'python')
+                        assert.fail('Expect failure due to template.yaml already exists in this path, but see success.')
+                    } catch (e) {
+                        assert.equal((e as Error).message, 'A file named template.yaml already exists in this path.')
+                    }
+                    // Then no overwrite happens
+                    assert.equal(await fs.readFileText(vscode.Uri.joinPath(workspaceUri, 'template.yaml')), prevInfo)
+                })
+            })
+        })
+    })
+
+    describe('Open project', function () {
+        let sandbox: sinon.SinonSandbox
+        let spyExecuteCommand: sinon.SinonSpy
+
+        beforeEach(function () {
+            sandbox = sinon.createSandbox()
+            spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+        })
+
+        afterEach(function () {
+            sandbox.restore()
+        })
+
+        it('open template.yaml', async function () {
+            // Given
+            const workspaceUri = vscode.workspace.workspaceFolders?.[0]?.uri
+            assert.ok(workspaceUri)
+            // make sure yaml exist
+            await fs.delete(vscode.Uri.joinPath(workspaceUri, 'template.yml'), { force: true })
+            await fs.writeFile(vscode.Uri.joinPath(workspaceUri, 'template.yaml'), '')
+            // When
+            await openProjectInWorkspace(workspaceUri)
+            // Then
+            sandbox.assert.calledWith(spyExecuteCommand, 'aws.openInApplicationComposer')
+        })
+
+        it('open template.yml', async function () {
+            // Given
+            const workspaceUri = vscode.workspace.workspaceFolders?.[0]?.uri
+            assert.ok(workspaceUri)
+            // make sure yml exist
+            await fs.delete(vscode.Uri.joinPath(workspaceUri, 'template.yaml'), { force: true })
+            await fs.writeFile(vscode.Uri.joinPath(workspaceUri, 'template.yml'), '')
+            // When
+            await openProjectInWorkspace(workspaceUri)
+            // Then
+            sandbox.assert.calledWith(spyExecuteCommand, 'aws.openInApplicationComposer')
+        })
+
+        it('both template.yml and template.yaml exist', async function () {
+            // Given
+            const workspaceUri = vscode.workspace.workspaceFolders?.[0]?.uri
+            assert.ok(workspaceUri)
+            // make sure yml/yaml exist
+            await fs.writeFile(vscode.Uri.joinPath(workspaceUri, 'template.yaml'), '')
+            await fs.writeFile(vscode.Uri.joinPath(workspaceUri, 'template.yml'), '')
+            // When
+            await openProjectInWorkspace(workspaceUri)
+            // Then only template.yaml is opened
+            sandbox.assert.calledWith(
+                spyExecuteCommand,
+                'aws.openInApplicationComposer',
+                sinon.match.has('path', sinon.match(/template.yaml/g))
+            )
+            sandbox.assert.neverCalledWith(
+                spyExecuteCommand,
+                'aws.openInApplicationComposer',
+                sinon.match.has('path', sinon.match(/template.yml/g))
+            )
+        })
+
+        it('no template.yml or template.yaml exist', async function () {
+            // Given
+            const workspaceUri = vscode.workspace.workspaceFolders?.[0]?.uri
+            assert.ok(workspaceUri)
+            // make sure yml/yaml doesn't exist
+            await fs.delete(vscode.Uri.joinPath(workspaceUri, 'template.yaml'), { force: true })
+            await fs.delete(vscode.Uri.joinPath(workspaceUri, 'template.yml'), { force: true })
+            // When
+            await openProjectInWorkspace(workspaceUri)
+            // Then only template.yaml is opened
+            sandbox.assert.neverCalledWith(spyExecuteCommand, 'aws.openInApplicationComposer')
+        })
+    })
+
+    describe('Tool install', function () {
+        let sandbox: sinon.SinonSandbox
+        const originalPlatform = process.platform
+        const originalArch = process.arch
+        const assertTelemetry = assertTelemetryCurried('aws_toolInstallation')
+
+        before(function () {
+            Object.defineProperty(process, 'arch', {
+                value: 'x64',
+            })
+        })
+
+        beforeEach(function () {
+            sandbox = sinon.createSandbox()
+        })
+
+        afterEach(function () {
+            sandbox.restore()
+        })
+
+        after(function () {
+            Object.defineProperty(process, 'platform', {
+                value: originalPlatform,
+            })
+            Object.defineProperty(process, 'arch', {
+                value: originalArch,
+            })
+        })
+
+        for (let scenarioIndex = 0; scenarioIndex < scenarios.length; scenarioIndex++) {
+            const scenario = scenarios[scenarioIndex]
+
+            it(`Install ${scenario.toolID} on ${scenario.platform}`, async function () {
+                // Given
+                Object.defineProperty(process, 'platform', {
+                    value: scenario.platform,
+                })
+                const downloader = sandbox.stub(HttpResourceFetcher.prototype, 'get').resolves()
+                const installer = sandbox
+                    .stub(ChildProcess.prototype, 'run')
+                    .resolves({ exitCode: 0, stderr: '', stdout: '' } as any)
+                // When
+                const result = installCli(scenario.toolID, false)
+                if (scenario.shouldSucceed) {
+                    // If should success then
+                    await result
+                    assert(downloader.called)
+                    assert(installer.called)
+                    assertTelemetry({
+                        result: 'Succeeded',
+                        toolId: scenario.toolID,
+                    })
+                } else {
+                    // If should fail then
+                    await getTestWindow()
+                        .waitForMessage(/install/)
+                        .then((message) => {
+                            message.close()
+                        })
+                    await assert.rejects(result, /cancelled/)
+                    assertTelemetry({
+                        result: 'Cancelled',
+                        toolId: scenario.toolID,
+                    })
+                }
+            })
+        }
+    })
+
+    describe('Tool install Buttons', function () {
+        let sandbox: sinon.SinonSandbox
+        const originalPlatform = process.platform
+        const assertTelemetry = assertTelemetryCurried('appBuilder_installTool')
+        beforeEach(function () {
+            sandbox = sinon.createSandbox()
+            // Install method doesn't work for Linux, setting to mac for functional unit tests
+            Object.defineProperty(process, 'platform', {
+                value: 'darwin',
+            })
+        })
+
+        afterEach(function () {
+            sandbox.restore()
+            Object.defineProperty(process, 'platform', {
+                value: originalPlatform,
+            })
+        })
+
+        it('click install while exist should not download', async function () {
+            // Given
+            const downloader = sandbox.stub(HttpResourceFetcher.prototype, 'get').resolves()
+            sandbox.stub(ChildProcess.prototype, 'run').resolves({ exitCode: 0, stderr: '', stdout: '' } as any)
+            await vscode.commands.executeCommand('aws.toolkit.installAWSCLI')
+            // Then
+            assert(downloader.notCalled)
+            assertTelemetry({
+                result: 'Succeeded',
+                toolId: 'aws-cli',
+            })
+        })
+
+        it('install SAM with low version should popup', async function () {
+            // Given
+            sandbox.stub(SamCliInfoInvocation.prototype, 'execute').resolves({ version: '1.87.0' })
+            sandbox.stub(ChildProcess.prototype, 'run').resolves({ exitCode: 0, stderr: '', stdout: '' } as any)
+            const result = vscode.commands.executeCommand('aws.toolkit.installSAMCLI')
+
+            const message = await getTestWindow().waitForMessage(/version/)
+            message.close()
+            await result
+            assertTelemetry({
+                result: 'Succeeded',
+                toolId: 'sam-cli',
+            })
+        })
+
+        it('install SAM with normal version should not download', async function () {
+            // Given
+            const downloader = sandbox.stub(HttpResourceFetcher.prototype, 'get').resolves()
+            sandbox.stub(SamCliInfoInvocation.prototype, 'execute').resolves({ version: '1.100.0' })
+            sandbox.stub(ChildProcess.prototype, 'run').resolves({ exitCode: 0, stderr: '', stdout: '' } as any)
+            await vscode.commands.executeCommand('aws.toolkit.installSAMCLI')
+
+            assert(downloader.notCalled)
+            assertTelemetry({
+                result: 'Succeeded',
+                toolId: 'sam-cli',
+            })
+        })
+
+        describe('Install LocalStack Extension', function () {
+            // @ts-ignore until TODO from src/awsService/appBuilder/walkthrough.ts:installLocalStackExtension
+            const expectedLocalStackToolId: ToolId = 'localstack'
+
+            it('should show already installed message when extension exists', async function () {
+                const mockExtension = { id: 'localstack.localstack' }
+                sandbox
+                    .stub(vscode.extensions, 'getExtension')
+                    .withArgs('localstack.localstack')
+                    .returns(mockExtension as any)
+                const spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+
+                await installLocalStackExtension('test-source')
+
+                const message = await getTestWindow().waitForMessage(/LocalStack extension is already installed/)
+                message.close()
+
+                // Verify installation command was not called
+                sandbox.assert.neverCalledWith(spyExecuteCommand, 'workbench.extensions.installExtension')
+
+                // Verify telemetry
+                assertTelemetry({
+                    result: 'Succeeded',
+                    source: 'test-source',
+                    toolId: expectedLocalStackToolId,
+                })
+            })
+
+            it('should successfully install extension when not present', async function () {
+                sandbox.stub(vscode.extensions, 'getExtension').withArgs('localstack.localstack').returns(undefined)
+                const spyExecuteCommand = sandbox.stub(vscode.commands, 'executeCommand').resolves()
+
+                await installLocalStackExtension('test-source')
+
+                const message = await getTestWindow().waitForMessage(/LocalStack extension has been installed/)
+                message.close()
+
+                // Verify installation command was called with correct extension ID
+                sandbox.assert.calledWith(
+                    spyExecuteCommand,
+                    'workbench.extensions.installExtension',
+                    'localstack.localstack'
+                )
+
+                // Verify telemetry
+                assertTelemetry({
+                    result: 'Succeeded',
+                    source: 'test-source',
+                    toolId: expectedLocalStackToolId,
+                })
+            })
+
+            it('should handle installation failure and throw ToolkitError', async function () {
+                sandbox.stub(vscode.extensions, 'getExtension').withArgs('localstack.localstack').returns(undefined)
+                const installError = new Error('Installation failed')
+                sandbox.stub(vscode.commands, 'executeCommand').rejects(installError)
+
+                await assert.rejects(installLocalStackExtension('test-source'), (error: any) => {
+                    assert.strictEqual(error.message, 'Failed to install LocalStack extension')
+                    assert.strictEqual(error.cause, installError)
+                    return true
+                })
+
+                // Verify telemetry is still recorded even on failure
+                assertTelemetry({
+                    result: 'Failed',
+                    source: 'test-source',
+                    toolId: expectedLocalStackToolId,
+                })
+            })
+
+            it('should record telemetry with correct source parameter', async function () {
+                const mockExtension = { id: 'localstack.localstack' }
+                sandbox
+                    .stub(vscode.extensions, 'getExtension')
+                    .withArgs('localstack.localstack')
+                    .returns(mockExtension as any)
+
+                await installLocalStackExtension('walkthrough-button')
+
+                const message = await getTestWindow().waitForMessage(/LocalStack extension is already installed/)
+                message.close()
+
+                // Verify telemetry includes the correct source
+                assertTelemetry({
+                    result: 'Succeeded',
+                    source: 'walkthrough-button',
+                    toolId: expectedLocalStackToolId,
+                })
+            })
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/appBuilder/wizards/deployTypeWizard.test.ts b/packages/core/src/test/awsService/appBuilder/wizards/deployTypeWizard.test.ts
new file mode 100644
index 00000000000..8b26cedb1ef
--- /dev/null
+++ b/packages/core/src/test/awsService/appBuilder/wizards/deployTypeWizard.test.ts
@@ -0,0 +1,120 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+
+import { PrompterTester } from '../../../shared/wizards/prompterTester'
+import assert from 'assert'
+import { DeployTypeWizard } from '../../../../awsService/appBuilder/wizards/deployTypeWizard'
+import { getSyncWizard } from '../../../../shared/sam/sync'
+import { TestFolder } from '../../../testUtil'
+import { samconfigCompleteData, validTemplateData } from '../../../shared/sam/samTestUtils'
+import { getDeployWizard } from '../../../../shared/sam/deploy'
+
+describe('DeployTypeWizard', function () {
+    let testFolder: TestFolder
+    let templateFile: vscode.Uri
+    let syncWizard: any
+    let deployWizard: any
+
+    let deployTypeWizard: DeployTypeWizard
+
+    before(async () => {
+        testFolder = await TestFolder.create()
+        templateFile = vscode.Uri.file(await testFolder.write('template.yaml', validTemplateData))
+        await testFolder.write('samconfig.toml', samconfigCompleteData)
+
+        deployWizard = await getDeployWizard(templateFile)
+        syncWizard = await getSyncWizard('infra', templateFile, undefined, false)
+    })
+
+    it('customer abort wizard should not call any command function', async function () {
+        // Given
+        const prompterTester = PrompterTester.init()
+            .handleQuickPick('Select deployment command', async (picker) => {
+                await picker.untilReady()
+                assert.strictEqual(picker.items[0].label, 'Sync')
+                assert.strictEqual(picker.items[1].label, 'Deploy')
+                assert.strictEqual(picker.items.length, 2)
+                picker.dispose()
+            })
+            .build()
+        deployTypeWizard = new DeployTypeWizard(syncWizard, deployWizard)
+        const choices = await deployTypeWizard.run()
+        // Then
+        assert(!choices)
+        prompterTester.assertCall('Select deployment command', 1)
+    })
+
+    it('deploy is selected', async function () {
+        /**
+         * This test focus on that deploy wizard get triggered when customer choose to use sam deploy
+         * Selection for deploy wizard speficy here focus on only one case
+         * More cases are test in Deploy.test.ts
+         *
+         */
+        const prompterTester = PrompterTester.init()
+            .handleQuickPick('Select deployment command', async (picker) => {
+                await picker.untilReady()
+                assert.strictEqual(picker.items[0].label, 'Sync')
+                assert.strictEqual(picker.items[1].label, 'Deploy')
+                assert.strictEqual(picker.items.length, 2)
+                picker.acceptItem(picker.items[1])
+            })
+            .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => {
+                inputBox.acceptValue('my-source-bucket-name')
+            })
+            .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => {
+                inputBox.acceptValue('my-destination-bucket-name')
+            })
+            .handleQuickPick('Specify parameter source for deploy', async (quickPick) => {
+                // Need time to check samconfig.toml file and generate options
+                await quickPick.untilReady()
+                assert.strictEqual(quickPick.items[2].label, 'Use default values from samconfig')
+                quickPick.acceptItem(quickPick.items[2])
+            })
+            .build()
+        deployTypeWizard = new DeployTypeWizard(syncWizard, deployWizard)
+        const choices = await deployTypeWizard.run()
+        // Then
+        assert.strictEqual(choices?.choice, 'deploy')
+        prompterTester.assertCallAll()
+    })
+
+    it('sync is selected', async function () {
+        /**
+         * This test focus on that sync wizard get triggered when customer choose to use sam sync
+         * Selection for deploy wizard speficy here focus on only one case
+         * More cases are test in Sync.test.ts
+         *
+         */
+        const prompterTester = PrompterTester.init()
+            .handleQuickPick('Select deployment command', async (picker) => {
+                await picker.untilReady()
+                assert.strictEqual(picker.items[0].label, 'Sync')
+                assert.strictEqual(picker.items[1].label, 'Deploy')
+                assert.strictEqual(picker.items.length, 2)
+                picker.acceptItem(picker.items[0])
+            })
+            .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => {
+                inputBox.acceptValue('my-source-bucket-name')
+            })
+            .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => {
+                inputBox.acceptValue('my-destination-bucket-name')
+            })
+            .handleQuickPick('Specify parameter source for sync', async (quickPick) => {
+                // Need time to check samconfig.toml file and generate options
+                await quickPick.untilReady()
+                assert.strictEqual(quickPick.items[2].label, 'Use default values from samconfig')
+                quickPick.acceptItem(quickPick.items[2])
+            })
+            .build()
+        deployTypeWizard = new DeployTypeWizard(syncWizard, deployWizard)
+        const choices = await deployTypeWizard.run()
+        // Then
+        assert.strictEqual(choices?.choice, 'sync')
+        prompterTester.assertCallAll()
+    })
+})
diff --git a/packages/core/src/test/awsService/apprunner/explorer/apprunnerNode.test.ts b/packages/core/src/test/awsService/apprunner/explorer/apprunnerNode.test.ts
new file mode 100644
index 00000000000..96f405b1243
--- /dev/null
+++ b/packages/core/src/test/awsService/apprunner/explorer/apprunnerNode.test.ts
@@ -0,0 +1,99 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as FakeTimers from '@sinonjs/fake-timers'
+import * as sinon from 'sinon'
+import { AppRunnerNode } from '../../../../awsService/apprunner/explorer/apprunnerNode'
+import { AppRunnerServiceNode } from '../../../../awsService/apprunner/explorer/apprunnerServiceNode'
+import { AppRunnerClient, ServiceSummary } from '../../../../shared/clients/apprunner'
+import { PlaceholderNode } from '../../../../shared/treeview/nodes/placeholderNode'
+import { AWSTreeNodeBase } from '../../../../shared/treeview/nodes/awsTreeNodeBase'
+import { installFakeClock } from '../../../testUtil'
+import { intoCollection } from '../../../../shared/utilities/collectionUtils'
+
+describe('AppRunnerNode', function () {
+    let mockApprunnerClient: AppRunnerClient
+    let node: AppRunnerNode
+    let clock: FakeTimers.InstalledClock
+    let refreshStub: sinon.SinonStub<[], void>
+
+    const exampleSummaries: ServiceSummary[] = [
+        {
+            ServiceName: 'test1',
+            Status: 'RUNNING',
+            ServiceArn: 'test-arn1',
+            ServiceId: 'Amazon',
+        },
+    ]
+
+    before(function () {
+        clock = installFakeClock()
+        refreshStub = sinon.stub(AWSTreeNodeBase.prototype, 'refresh')
+    })
+
+    beforeEach(function () {
+        mockApprunnerClient = {
+            paginateServices: sinon.stub().returns(intoCollection([exampleSummaries])),
+            listOperations: sinon.stub().resolves({ OperationSummaryList: [] }),
+        } as any as AppRunnerClient
+        node = new AppRunnerNode('', mockApprunnerClient)
+        clock.reset()
+    })
+
+    after(function () {
+        clock.uninstall()
+        sinon.restore()
+    })
+
+    it('creates AppRunnerServiceNodes', async function () {
+        const children = await node.getChildren()
+        assert.ok(children[0] instanceof AppRunnerServiceNode)
+    })
+
+    it('updates AppRunnerServiceNodes', async function () {
+        const childNode = (await node.getChildren())[0] as AppRunnerServiceNode
+
+        const updatedSummary = { ...exampleSummaries[0], Status: 'PAUSED' }
+        const serviceStub = sinon.stub().returns(intoCollection([[updatedSummary]]))
+        mockApprunnerClient.paginateServices = serviceStub
+
+        await node.getChildren()
+        assert.strictEqual(childNode.info.Status, 'PAUSED')
+    })
+
+    it('deletes AppRunnerServiceNodes', async function () {
+        await node.getChildren()
+        const serviceStub = sinon.stub().returns(intoCollection([[]]))
+        mockApprunnerClient.paginateServices = serviceStub
+
+        assert.ok((await node.getChildren())[0] instanceof PlaceholderNode)
+    })
+
+    it('polls children nodes', async function () {
+        const transientService = { ...exampleSummaries[0], Status: 'OPERATION_IN_PROGRESS' }
+        const pausedService = { ...transientService, Status: 'PAUSED' }
+        const serviceStub = sinon
+            .stub()
+            .onFirstCall()
+            .returns(intoCollection([[transientService]]))
+            .onSecondCall()
+            .returns(intoCollection([[pausedService]]))
+        mockApprunnerClient.paginateServices = serviceStub
+        const opStub = sinon.stub().resolves({
+            OperationSummaryList: [{ Id: 'test-id', Type: 'PAUSE_SERVICE' }],
+        })
+        mockApprunnerClient.listOperations = opStub
+
+        const childNode = (await node.getChildren())[0] as AppRunnerServiceNode
+        await clock.tickAsync(100000)
+        sinon.assert.calledOn(refreshStub, node)
+        await node.getChildren()
+        await clock.tickAsync(100000)
+        assert(serviceStub.calledTwice)
+
+        assert.strictEqual(childNode.info.Status, 'PAUSED')
+    })
+})
diff --git a/packages/core/src/test/awsService/apprunner/explorer/apprunnerServiceNode.test.ts b/packages/core/src/test/awsService/apprunner/explorer/apprunnerServiceNode.test.ts
new file mode 100644
index 00000000000..6137797a54b
--- /dev/null
+++ b/packages/core/src/test/awsService/apprunner/explorer/apprunnerServiceNode.test.ts
@@ -0,0 +1,115 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import { AppRunnerNode } from '../../../../awsService/apprunner/explorer/apprunnerNode'
+import { AppRunnerServiceNode } from '../../../../awsService/apprunner/explorer/apprunnerServiceNode'
+import { AppRunnerClient, ServiceSummary } from '../../../../shared/clients/apprunner'
+import { CloudWatchLogsClient } from '../../../../shared/clients/cloudWatchLogs'
+import { asyncGenerator } from '../../../../shared/utilities/collectionUtils'
+import { AWSTreeNodeBase } from '../../../../shared/treeview/nodes/awsTreeNodeBase'
+import { stub } from '../../../utilities/stubber'
+import { getLabel } from '../../../../shared/treeview/utils'
+
+describe('AppRunnerServiceNode', function () {
+    let mockApprunnerClient: ReturnType<typeof stub<AppRunnerClient>>
+    let mockParentNode: AppRunnerNode
+    let node: AppRunnerServiceNode
+
+    const exampleInfo: ServiceSummary = {
+        ServiceName: 'test1',
+        Status: 'RUNNING',
+        ServiceArn: 'test-arn1',
+        ServiceUrl: '',
+        ServiceId: 'id',
+    } as any
+
+    before(function () {
+        sinon.stub(AWSTreeNodeBase.prototype, 'refresh')
+    })
+
+    beforeEach(function () {
+        const cloudwatchClient = stub(CloudWatchLogsClient, { regionCode: 'us-east-1' })
+        cloudwatchClient.describeLogGroups.returns(asyncGenerator([{ logGroupName: 'logs' }]))
+
+        mockApprunnerClient = stub(AppRunnerClient, { regionCode: 'us-east-1' })
+        mockApprunnerClient.listOperations.resolves({ OperationSummaryList: [] })
+        // jscpd:ignore-start
+        mockParentNode = stub(AppRunnerNode, {
+            regionCode: '',
+            client: mockApprunnerClient,
+            serviceId: undefined,
+            label: undefined,
+            id: undefined,
+            iconPath: undefined,
+            description: undefined,
+            resourceUri: undefined,
+            tooltip: undefined,
+            command: undefined,
+            collapsibleState: undefined,
+            contextValue: undefined,
+            accessibilityInformation: undefined,
+            checkboxState: undefined,
+        })
+        // jscpd:ignore-end
+        node = new AppRunnerServiceNode(mockParentNode, mockApprunnerClient, exampleInfo, {}, cloudwatchClient)
+    })
+
+    after(function () {
+        sinon.restore()
+    })
+
+    it('can pause', async function () {
+        mockApprunnerClient.pauseService.resolves({ Service: { ...exampleInfo, Status: 'PAUSED' } })
+        await node.pause()
+        assert.ok(getLabel(node).includes('Paused'))
+    })
+
+    it('can resume', async function () {
+        node.update({ ...exampleInfo, Status: 'PAUSED' })
+        mockApprunnerClient.resumeService.resolves({ Service: { ...exampleInfo, Status: 'RUNNING' } })
+        await node.resume()
+        assert.ok(getLabel(node).includes('Running'))
+    })
+
+    it('can deploy', async function () {
+        mockApprunnerClient.startDeployment.resolves({ OperationId: '123' })
+        node.update({ ...exampleInfo, Status: 'OPERATION_IN_PROGRESS' })
+        await node.deploy()
+        assert.ok(getLabel(node).includes('Deploying'))
+    })
+
+    it('can describe', async function () {
+        mockApprunnerClient.describeService.resolves({ Service: { ...exampleInfo, Status: 'CREATE_FAILED' } })
+        assert.strictEqual((await node.describe()).Status, 'CREATE_FAILED')
+        assert.ok(getLabel(node).includes('Create failed'))
+    })
+
+    it('can update', async function () {
+        mockApprunnerClient.updateService.resolves({
+            Service: { ...exampleInfo, Status: 'OPERATION_IN_PROGRESS' },
+            OperationId: '123',
+        })
+        await node.updateService({} as any)
+        assert.ok(getLabel(node).includes('Updating'))
+    })
+
+    it('can delete', async function () {
+        mockApprunnerClient.deleteService.resolves({
+            Service: { ...exampleInfo, Status: 'DELETED' },
+            OperationId: '123',
+        })
+        const deleteStub = sinon.stub()
+        mockParentNode.deleteNode = deleteStub
+        await node.delete()
+        assert(deleteStub.calledOnceWith(exampleInfo.ServiceArn))
+    })
+
+    it('can log', async function () {
+        const logs = await node.getChildren()
+        assert.strictEqual(logs[0]?.label, 'logs')
+    })
+})
diff --git a/packages/core/src/test/awsService/apprunner/wizards/codeRepositoryWizard.test.ts b/packages/core/src/test/awsService/apprunner/wizards/codeRepositoryWizard.test.ts
new file mode 100644
index 00000000000..1021201fc1d
--- /dev/null
+++ b/packages/core/src/test/awsService/apprunner/wizards/codeRepositoryWizard.test.ts
@@ -0,0 +1,126 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { createWizardTester, WizardTester } from '../../../shared/wizards/wizardTestUtils'
+import {
+    AppRunnerCodeRepositoryWizard,
+    createConnectionPrompter,
+} from '../../../../awsService/apprunner/wizards/codeRepositoryWizard'
+import { AppRunnerClient, CodeRepository, SourceConfiguration } from '../../../../shared/clients/apprunner'
+import { WIZARD_EXIT } from '../../../../shared/wizards/wizard'
+import { apprunnerConnectionHelpUrl } from '../../../../shared/constants'
+import { createQuickPickPrompterTester } from '../../../shared/ui/testUtils'
+import { stub } from '../../../utilities/stubber'
+import { getOpenExternalStub } from '../../../globalSetup.test'
+
+describe('AppRunnerCodeRepositoryWizard', function () {
+    let tester: WizardTester<SourceConfiguration>
+    let repoTester: WizardTester<CodeRepository>
+
+    beforeEach(async function () {
+        // apprunner client and git api will never be called
+        const wizard = new AppRunnerCodeRepositoryWizard({} as any, {} as any)
+        tester = await createWizardTester(wizard)
+        repoTester = tester.CodeRepository
+    })
+
+    it('prompts for GitHub connection first', function () {
+        tester.AuthenticationConfiguration.ConnectionArn.assertShowFirst()
+    })
+
+    it('prompts for repository URL and branch', function () {
+        repoTester.RepositoryUrl.assertShow()
+        repoTester.SourceCodeVersion.Value.assertShow()
+        repoTester.SourceCodeVersion.Type.assertValue('BRANCH')
+    })
+
+    it('does not prompt for code configuration if "API" is not set', function () {
+        repoTester.CodeConfiguration.ConfigurationSource.applyInput('REPOSITORY')
+        repoTester.CodeConfiguration.CodeConfigurationValues.assertDoesNotShowAny()
+    })
+
+    it('adds all steps under CodeConfigurationValues if "API" is set', function () {
+        const codeconfig = repoTester.CodeConfiguration
+        const codevalues = codeconfig.CodeConfigurationValues
+
+        codevalues.assertDoesNotShowAny()
+        codeconfig.ConfigurationSource.applyInput('API')
+        codevalues.BuildCommand.assertShow()
+        codevalues.Runtime.assertShow()
+        codevalues.RuntimeEnvironmentVariables.assertShow()
+        codevalues.StartCommand.assertShow()
+        codevalues.Port.assertShow()
+    })
+
+    it('sets "AutoDeploymentsEnabled" to false by default', function () {
+        tester.AutoDeploymentsEnabled.assertValue(false)
+    })
+})
+
+type ConnectionStatus = 'AVAILABLE' | 'PENDING_HANDSHAKE' | 'ERROR' | 'DELETED'
+
+describe('createConnectionPrompter', function () {
+    const defaultConnections = [
+        makeConnection('connection-name-1', 'connection-arn-1'),
+        makeConnection('connection-name-2', 'connection-arn-2'),
+    ]
+
+    function makeTester(connections = defaultConnections) {
+        const client = stub(AppRunnerClient, { regionCode: '' })
+        client.listConnections.resolves(connections)
+
+        return createQuickPickPrompterTester(createConnectionPrompter(client))
+    }
+
+    function makeConnection(name: string, arn: string, status: ConnectionStatus = 'AVAILABLE') {
+        return {
+            ConnectionName: name,
+            ConnectionArn: arn,
+            Status: status,
+        }
+    }
+
+    it('lists connections', async function () {
+        const tester = makeTester()
+        tester.assertItems(['connection-name-1', 'connection-name-2'])
+        tester.acceptItem('connection-name-2')
+        await tester.result(defaultConnections[1])
+    })
+
+    it('lists only available connections', async function () {
+        const connections = [...defaultConnections]
+        connections.push(makeConnection('pending', 'pending', 'PENDING_HANDSHAKE'))
+        connections.push(makeConnection('error', 'error', 'ERROR'))
+        connections.unshift(makeConnection('deleted', 'deleted', 'DELETED'))
+
+        const tester = makeTester(connections)
+        tester.assertItems(['connection-name-1', 'connection-name-2'])
+        tester.hide()
+        await tester.result()
+    })
+
+    it('can refresh connections', async function () {
+        const connections = [...defaultConnections]
+        const newConnection = makeConnection('new-connection', 'new-arn')
+        const tester = makeTester(connections)
+
+        tester.addCallback(() => connections.push(newConnection))
+        tester.pressButton('Refresh')
+        tester.assertItems(['connection-name-1', 'connection-name-2', 'new-connection'])
+        tester.acceptItem('new-connection')
+        await tester.result(newConnection)
+    })
+
+    it('shows an option to go to documentation when no connections are available', async function () {
+        getOpenExternalStub().resolves(true)
+        const tester = makeTester([])
+        tester.assertItems(['No connections found'])
+        tester.acceptItem('No connections found')
+        tester.hide()
+        await tester.result(WIZARD_EXIT)
+        assert.strictEqual(getOpenExternalStub().firstCall.args[0].toString(), apprunnerConnectionHelpUrl)
+    })
+})
diff --git a/packages/core/src/test/awsService/apprunner/wizards/createServiceWizard.test.ts b/packages/core/src/test/awsService/apprunner/wizards/createServiceWizard.test.ts
new file mode 100644
index 00000000000..28a38df79fc
--- /dev/null
+++ b/packages/core/src/test/awsService/apprunner/wizards/createServiceWizard.test.ts
@@ -0,0 +1,68 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { createWizardTester, WizardTester } from '../../../shared/wizards/wizardTestUtils'
+import { CreateAppRunnerServiceWizard } from '../../../../awsService/apprunner/wizards/apprunnerCreateServiceWizard'
+import { stub } from '../../../utilities/stubber'
+import { IamClient } from '../../../../shared/clients/iam'
+import { DefaultEcrClient } from '../../../../shared/clients/ecrClient'
+import { AppRunnerClient, CreateServiceRequest } from '../../../../shared/clients/apprunner'
+
+describe('CreateServiceWizard', function () {
+    let tester: WizardTester<CreateServiceRequest>
+
+    beforeEach(async function () {
+        const regionCode = 'us-east-1'
+        const wizard = new CreateAppRunnerServiceWizard(
+            regionCode,
+            {},
+            {},
+            {
+                iam: stub(IamClient, { regionCode }),
+                ecr: stub(DefaultEcrClient, { regionCode }),
+                apprunner: stub(AppRunnerClient, { regionCode }),
+            }
+        )
+
+        tester = await createWizardTester(wizard)
+    })
+
+    describe('CreateAppRunnerServiceWizard', function () {
+        it('prompts for source first', function () {
+            tester.SourceConfiguration.assertShowFirst()
+        })
+
+        it('prompts for role ARN if choosing private ECR', function () {
+            tester.SourceConfiguration.applyInput({ ImageRepository: { ImageRepositoryType: 'ECR' } as any })
+            tester.SourceConfiguration.AuthenticationConfiguration.AccessRoleArn.assertShow()
+        })
+
+        it('prompts for connection ARN if choosing Repository', function () {
+            tester.SourceConfiguration.applyInput({ CodeRepository: {} as any })
+            tester.SourceConfiguration.AuthenticationConfiguration.ConnectionArn.assertShow()
+        })
+
+        it('prompts for name before instance', function () {
+            tester.ServiceName.assertShowSecond() // TODO: write a 'assertShowBefore' that accepts another form element as input
+            tester.InstanceConfiguration.assertShowThird()
+        })
+
+        it('sets auto-deployment to "off" by default', function () {
+            tester.SourceConfiguration.AutoDeploymentsEnabled.assertValue(false)
+        })
+
+        it('prompts for ECR or GitHub repository', function () {
+            tester.SourceConfiguration.assertShow()
+            tester.SourceConfiguration.CodeRepository.assertDoesNotShowAny()
+            tester.SourceConfiguration.ImageRepository.assertDoesNotShowAny()
+
+            tester.SourceConfiguration.applyInput({ CodeRepository: {} as any })
+            tester.SourceConfiguration.CodeRepository.assertShowAny()
+
+            tester.SourceConfiguration.applyInput({ ImageRepository: {} as any })
+            tester.SourceConfiguration.ImageRepository.assertShowAny()
+        })
+    })
+})
diff --git a/src/test/apprunner/wizards/imageRepositoryWizard.test.ts b/packages/core/src/test/awsService/apprunner/wizards/imageRepositoryWizard.test.ts
similarity index 79%
rename from src/test/apprunner/wizards/imageRepositoryWizard.test.ts
rename to packages/core/src/test/awsService/apprunner/wizards/imageRepositoryWizard.test.ts
index f785545eab0..28c54d03d73 100644
--- a/src/test/apprunner/wizards/imageRepositoryWizard.test.ts
+++ b/packages/core/src/test/awsService/apprunner/wizards/imageRepositoryWizard.test.ts
@@ -1,23 +1,23 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { AppRunner } from 'aws-sdk'
-import { createWizardTester, WizardTester } from '../../shared/wizards/wizardTestUtils'
+import { createWizardTester, WizardTester } from '../../../shared/wizards/wizardTestUtils'
 import {
     AppRunnerImageRepositoryWizard,
     ImageIdentifierForm,
     TaggedEcrRepository,
-} from '../../../apprunner/wizards/imageRepositoryWizard'
+} from '../../../../awsService/apprunner/wizards/imageRepositoryWizard'
+import { ImageRepository, SourceConfiguration } from '../../../../shared/clients/apprunner'
 
 describe('AppRunnerImageRepositoryWizard', function () {
-    let tester: WizardTester<AppRunner.SourceConfiguration>
-    let repoTester: WizardTester<AppRunner.ImageRepository>
+    let tester: WizardTester<SourceConfiguration>
+    let repoTester: WizardTester<ImageRepository>
 
-    beforeEach(function () {
+    beforeEach(async function () {
         const wizard = new AppRunnerImageRepositoryWizard({} as any, {} as any) // the clients will never be called
-        tester = createWizardTester(wizard)
+        tester = await createWizardTester(wizard)
         repoTester = tester.ImageRepository
     })
 
@@ -52,9 +52,9 @@ describe('AppRunnerImageRepositoryWizard', function () {
 describe('ImageIdentifierForm', function () {
     let tester: WizardTester<{ repo: TaggedEcrRepository }>
 
-    beforeEach(function () {
+    beforeEach(async function () {
         const form = new ImageIdentifierForm({} as any) // ecr will never be called
-        tester = createWizardTester(form)
+        tester = await createWizardTester(form)
     })
 
     it('asks for tag if not provided', function () {
diff --git a/src/test/cdk/detectCdkProjects.test.ts b/packages/core/src/test/awsService/cdk/detectCdkProjects.test.ts
similarity index 87%
rename from src/test/cdk/detectCdkProjects.test.ts
rename to packages/core/src/test/awsService/cdk/detectCdkProjects.test.ts
index ae1e97995da..f642436e98a 100644
--- a/src/test/cdk/detectCdkProjects.test.ts
+++ b/packages/core/src/test/awsService/cdk/detectCdkProjects.test.ts
@@ -1,19 +1,18 @@
 /*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as path from 'path'
 import * as vscode from 'vscode'
-import * as fs from 'fs-extra'
-import { detectCdkProjects } from '../../cdk/explorer/detectCdkProjects'
-import { makeTemporaryToolkitFolder } from '../../shared/filesystemUtilities'
+import { detectCdkProjects } from '../../../awsService/cdk/explorer/detectCdkProjects'
+import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
 import { saveCdkJson } from './treeTestUtils'
-import { createTestWorkspaceFolder } from '../testUtil'
-import { FakeExtensionContext } from '../fakeExtensionContext'
-import { mkdirp, writeJSON } from 'fs-extra'
-import { waitUntil } from '../../shared/utilities/timeoutUtils'
+import { createTestWorkspaceFolder } from '../../testUtil'
+import { FakeExtensionContext } from '../../fakeExtensionContext'
+import { waitUntil } from '../../../shared/utilities/timeoutUtils'
+import { fs } from '../../../shared'
 
 describe('detectCdkProjects', function () {
     const workspacePaths: string[] = []
@@ -45,7 +44,7 @@ describe('detectCdkProjects', function () {
 
     afterEach(async function () {
         for (const path of workspacePaths) {
-            await fs.remove(path)
+            await fs.delete(path, { recursive: true })
         }
 
         workspacePaths.length = 0
@@ -88,7 +87,7 @@ describe('detectCdkProjects', function () {
 
     it('detects deep projects', async function () {
         const cdkJsonUri = vscode.Uri.joinPath(workspaceFolders[0].uri, 'directory1', 'directory2', 'cdk.json')
-        await mkdirp(path.dirname(cdkJsonUri.fsPath))
+        await fs.mkdir(path.dirname(cdkJsonUri.fsPath))
         await saveCdkJson(cdkJsonUri.fsPath)
         const actual = await detectCdkProjects_wait(workspaceFolders)
         assert.strictEqual(actual[0]?.cdkJsonUri.fsPath, cdkJsonUri.fsPath)
@@ -96,7 +95,7 @@ describe('detectCdkProjects', function () {
 
     it('ignores projects in `node_modules`', async function () {
         const cdkJsonPath = path.join(workspaceFolders[0].uri.fsPath, 'node_modules', 'lib', 'cdk.json')
-        await mkdirp(path.dirname(cdkJsonPath))
+        await fs.mkdir(path.dirname(cdkJsonPath))
         await saveCdkJson(cdkJsonPath)
         const actual = await detectCdkProjects_wait(workspaceFolders)
         assert.strictEqual(actual.length, 0)
@@ -118,7 +117,8 @@ describe('detectCdkProjects', function () {
 
     it('takes into account `output` from cdk.json to build tree.json path', async function () {
         const cdkJsonUri = vscode.Uri.joinPath(workspaceFolders[0].uri, 'cdk.json')
-        await writeJSON(cdkJsonUri.fsPath, { app: 'npx ts-node bin/demo-nov7.ts', output: 'build/cdk.out' })
+        const cdkJsonStr = JSON.stringify({ app: 'npx ts-node bin/demo-nov7.ts', output: 'build/cdk.out' })
+        await fs.writeFile(cdkJsonUri.fsPath, cdkJsonStr)
         const actual = await detectCdkProjects_wait(workspaceFolders)
 
         assert.ok(actual)
diff --git a/packages/core/src/test/awsService/cdk/explorer/appNode.test.ts b/packages/core/src/test/awsService/cdk/explorer/appNode.test.ts
new file mode 100644
index 00000000000..6f9d804d638
--- /dev/null
+++ b/packages/core/src/test/awsService/cdk/explorer/appNode.test.ts
@@ -0,0 +1,86 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as path from 'path'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import * as app from '../../../../awsService/cdk/explorer/cdkProject'
+import * as appNode from '../../../../awsService/cdk/explorer/nodes/appNode'
+import { ConstructNode } from '../../../../awsService/cdk/explorer/nodes/constructNode'
+import { getTestWorkspaceFolder } from '../../../../testInteg/integrationTestsUtilities'
+import { getIcon } from '../../../../shared/icons'
+import * as treeUtils from '../treeTestUtils'
+import { getLabel } from '../../../../shared/treeview/utils'
+
+describe('AppNode', function () {
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    const workspaceFolderPath = getTestWorkspaceFolder()
+    const workspaceFolderName = 'cdk-test-folder'
+    const cdkJsonPath = path.join(getTestWorkspaceFolder(), workspaceFolderName, 'cdk.json')
+    const treePath = path.join(cdkJsonPath, '..', 'cdk.out', 'tree.json')
+
+    it('uses the `cdk.json` uri as its id', async function () {
+        const testNode = getTestNode()
+
+        assert.strictEqual(testNode.id, vscode.Uri.file(cdkJsonPath).toString())
+    })
+
+    it('initializes label, tooltip, and icon', async function () {
+        const testNode = getTestNode().getTreeItem()
+
+        assert.strictEqual(testNode.label, path.relative(workspaceFolderPath, path.dirname(cdkJsonPath)))
+        assert.strictEqual(testNode.tooltip, vscode.Uri.file(cdkJsonPath).path)
+        assert.strictEqual(testNode.iconPath, getIcon('aws-cdk-logo'))
+    })
+
+    it('returns placeholder node when app contains no stacks', async function () {
+        const testNode = getTestNode()
+        sinon.stub(app, 'getApp').resolves({
+            constructTree: treeUtils.getTreeWithNoStack(),
+            location: testNode.resource,
+        })
+
+        const childNodes = await testNode.getChildren()
+
+        assert.strictEqual(childNodes.length, 1)
+        assert.ok(getLabel(await childNodes[0].getTreeItem()).includes('No stacks'))
+    })
+
+    it('returns construct node when app has stacks', async function () {
+        const testNode = getTestNode()
+        sinon.stub(app, 'getApp').resolves({
+            constructTree: treeUtils.getTree(),
+            location: testNode.resource,
+        })
+
+        const childNodes = await testNode.getChildren()
+
+        assert.strictEqual(childNodes.length, 1)
+        assert.strictEqual(childNodes[0] instanceof ConstructNode, true)
+    })
+
+    it('returns placeholder node when tree.json cannot be loaded', async function () {
+        const testNode = getTestNode()
+        sinon.stub(app, 'getApp').throws()
+
+        const childNodes = await testNode.getChildren()
+
+        assert.strictEqual(childNodes.length, 1)
+        assert.ok(getLabel(await childNodes[0].getTreeItem()).includes('Unable to load construct tree'))
+    })
+
+    function getTestNode(): appNode.AppNode {
+        const appLocation: app.CdkAppLocation = {
+            cdkJsonUri: vscode.Uri.file(cdkJsonPath),
+            treeUri: vscode.Uri.file(treePath),
+        }
+
+        return new appNode.AppNode(appLocation)
+    }
+})
diff --git a/packages/core/src/test/awsService/cdk/explorer/awsCdkExplorer.test.ts b/packages/core/src/test/awsService/cdk/explorer/awsCdkExplorer.test.ts
new file mode 100644
index 00000000000..4678ba50d0f
--- /dev/null
+++ b/packages/core/src/test/awsService/cdk/explorer/awsCdkExplorer.test.ts
@@ -0,0 +1,26 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import * as detectCdkProjects from '../../../../awsService/cdk/explorer/detectCdkProjects'
+import { CdkAppLocation } from '../../../../awsService/cdk/explorer/cdkProject'
+import { CdkRootNode } from '../../../../awsService/cdk/explorer/rootNode'
+
+describe('CdkRootNode', function () {
+    it('shows CDK projects', async function () {
+        const appLocation: CdkAppLocation = {
+            cdkJsonUri: vscode.Uri.file('/cdk.json'),
+            treeUri: vscode.Uri.file('/cdk.out/tree.json'),
+        }
+
+        sinon.stub(detectCdkProjects, 'detectCdkProjects').resolves([appLocation])
+
+        const treeNodes = await CdkRootNode.instance.getChildren()
+        assert.strictEqual(treeNodes.length, 1)
+        assert.deepStrictEqual(treeNodes[0].resource, appLocation)
+    })
+})
diff --git a/src/test/cdk/explorer/constructNode.test.ts b/packages/core/src/test/awsService/cdk/explorer/constructNode.test.ts
similarity index 93%
rename from src/test/cdk/explorer/constructNode.test.ts
rename to packages/core/src/test/awsService/cdk/explorer/constructNode.test.ts
index 4b5d3d59e9b..39d0a6d2f3a 100644
--- a/src/test/cdk/explorer/constructNode.test.ts
+++ b/packages/core/src/test/awsService/cdk/explorer/constructNode.test.ts
@@ -1,18 +1,18 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as path from 'path'
 import * as vscode from 'vscode'
 import * as treeUtils from '../treeTestUtils'
-import { ConstructNode } from '../../../cdk/explorer/nodes/constructNode'
-import { PropertyNode } from '../../../cdk/explorer/nodes/propertyNode'
-import { ConstructTreeEntity } from '../../../cdk/explorer/tree/types'
-import { isStateMachine } from '../../../cdk/explorer/nodes/constructNode'
-import { CdkAppLocation } from '../../../cdk/explorer/cdkProject'
-import { getIcon } from '../../../shared/icons'
+import { ConstructNode } from '../../../../awsService/cdk/explorer/nodes/constructNode'
+import { PropertyNode } from '../../../../awsService/cdk/explorer/nodes/propertyNode'
+import { ConstructTreeEntity } from '../../../../awsService/cdk/explorer/tree/types'
+import { isStateMachine } from '../../../../awsService/cdk/explorer/nodes/constructNode'
+import { CdkAppLocation } from '../../../../awsService/cdk/explorer/cdkProject'
+import { getIcon } from '../../../../shared/icons'
 
 describe('ConstructNode', function () {
     const label = 'MyConstruct'
diff --git a/packages/core/src/test/awsService/cdk/explorer/propertyNode.test.ts b/packages/core/src/test/awsService/cdk/explorer/propertyNode.test.ts
new file mode 100644
index 00000000000..36baf9a6e3b
--- /dev/null
+++ b/packages/core/src/test/awsService/cdk/explorer/propertyNode.test.ts
@@ -0,0 +1,95 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { PropertyNode } from '../../../../awsService/cdk/explorer/nodes/propertyNode'
+
+describe('PropertyNode', function () {
+    const label = 'myProperty'
+
+    it('initializes label', async function () {
+        const testNode = new PropertyNode(label, 'blue').getTreeItem()
+        assert.strictEqual(testNode.label, `${label}: blue`)
+    })
+
+    it('returns no children when property does not have nested values', async function () {
+        const testNode = new PropertyNode(label, 'purple')
+
+        const childNodes = await testNode.getChildren()
+
+        assert.strictEqual(childNodes.length, 0, 'Expected no child nodes for a property with non-nested properties')
+    })
+
+    it('returns single child when property has a string value', async function () {
+        const value = 'string value'
+        const children: { [key: string]: any } = { key: value }
+        const testNode = new PropertyNode(label, children)
+
+        const childNodes = await testNode.getChildren()
+
+        assert.strictEqual(childNodes.length, 1, 'Expected a single property node for a string property')
+        assert.strictEqual((await childNodes[0].getTreeItem()).label, `key: ${value}`)
+    })
+
+    it('returns single child when property has a boolean value', async function () {
+        const children: { [key: string]: any } = { key: true }
+        const testNode = new PropertyNode(label, children)
+
+        const childNodes = await testNode.getChildren()
+
+        assert.strictEqual(childNodes.length, 1, 'Expected a single property node for a boolean property')
+        assert.strictEqual((await childNodes[0].getTreeItem()).label, 'key: true')
+    })
+
+    it('returns single child when property has an int value', async function () {
+        const value = 100
+        const children: { [key: string]: any } = { key: value }
+        const testNode = new PropertyNode(label, children)
+
+        const childNodes = await testNode.getChildren()
+
+        assert.strictEqual(childNodes.length, 1, 'Expected a single property node for an int property')
+        assert.strictEqual(
+            (await childNodes[0].getTreeItem()).label,
+            `key: ${value}`,
+            'Unexpected label on PropertyNode'
+        )
+    })
+
+    it('returns a nested property node with a property node for each value in the array', async function () {
+        const values = ['one', 'two', 'three']
+        const children: { [key: string]: any } = { key: values }
+
+        const testNode = new PropertyNode(label, children)
+
+        const childNodes = await testNode.getChildren()
+        assert.strictEqual(childNodes.length, 1, 'expected nested property to have a child node for array')
+        assert.strictEqual((await childNodes[0].getTreeItem()).label, 'key', 'Unexpected label on node')
+
+        const childPropertyNodes = await childNodes[0].getChildren?.()
+        assert.strictEqual(childPropertyNodes?.length, 3, 'Expected each value in nested array to have a child node')
+    })
+
+    it('returns a nested property node with nested object as child property nodes', async function () {
+        const nestedObject = {
+            evenMoreNested: 'nestedValue',
+        }
+        const value = {
+            nestedKey: nestedObject,
+        }
+
+        const children: { [key: string]: any } = { key: value }
+        const testNode = new PropertyNode(label, children)
+
+        const childNodes = await testNode.getChildren()
+
+        assert.strictEqual(childNodes.length, 1, 'Expected nested property of object type to have child nodes')
+        assert.strictEqual((await childNodes[0].getTreeItem()).label, 'key')
+
+        const grandChildren = await childNodes[0]?.getChildren?.()
+        assert.strictEqual(grandChildren?.length, 1, 'Expected nested property of object type to have grandchild nodes')
+        assert.strictEqual((await grandChildren[0].getTreeItem()).label, 'nestedKey')
+    })
+})
diff --git a/src/test/cdk/tree/resources/templateJsonTester.template.json b/packages/core/src/test/awsService/cdk/tree/resources/templateJsonTester.template.json
similarity index 100%
rename from src/test/cdk/tree/resources/templateJsonTester.template.json
rename to packages/core/src/test/awsService/cdk/tree/resources/templateJsonTester.template.json
diff --git a/src/test/cdk/tree/treeInspector.test.ts b/packages/core/src/test/awsService/cdk/tree/treeInspector.test.ts
similarity index 94%
rename from src/test/cdk/tree/treeInspector.test.ts
rename to packages/core/src/test/awsService/cdk/tree/treeInspector.test.ts
index 798d7bce155..4a22280f591 100644
--- a/src/test/cdk/tree/treeInspector.test.ts
+++ b/packages/core/src/test/awsService/cdk/tree/treeInspector.test.ts
@@ -1,11 +1,11 @@
 /*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
-import * as treeInspector from '../../../cdk/explorer/tree/treeInspector'
-import { CfnResourceKeys, ConstructProps, ConstructTreeEntity } from '../../../cdk/explorer/tree/types'
+import assert from 'assert'
+import * as treeInspector from '../../../../awsService/cdk/explorer/tree/treeInspector'
+import { CfnResourceKeys, ConstructProps, ConstructTreeEntity } from '../../../../awsService/cdk/explorer/tree/types'
 import * as treeUtils from '../treeTestUtils'
 
 describe('TreeInspector', function () {
diff --git a/src/test/cdk/treeTestUtils.ts b/packages/core/src/test/awsService/cdk/treeTestUtils.ts
similarity index 90%
rename from src/test/cdk/treeTestUtils.ts
rename to packages/core/src/test/awsService/cdk/treeTestUtils.ts
index 421ee202e99..5d1c5117fe4 100644
--- a/src/test/cdk/treeTestUtils.ts
+++ b/packages/core/src/test/awsService/cdk/treeTestUtils.ts
@@ -1,15 +1,15 @@
 /*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { writeFile } from 'fs-extra'
-import { ConstructTree, ConstructTreeEntity } from '../../cdk/explorer/tree/types'
+import { ConstructTree, ConstructTreeEntity } from '../../../awsService/cdk/explorer/tree/types'
+import { fs } from '../../../shared'
 
 export async function saveCdkJson(cdkJsonPath: string) {
     const cdkJsonContent = '{ "app": "npx ts-node bin/demo-nov7.ts"}'
 
-    await writeFile(cdkJsonPath, cdkJsonContent, 'utf8')
+    await fs.writeFile(cdkJsonPath, cdkJsonContent, 'utf8')
 }
 
 export function generateConstructTreeEntity(label: string, treePath: string, children?: boolean): ConstructTreeEntity {
diff --git a/packages/core/src/test/awsService/cloudWatchLogs/commands/addLogEvents.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/commands/addLogEvents.test.ts
new file mode 100644
index 00000000000..82c21a4c43b
--- /dev/null
+++ b/packages/core/src/test/awsService/cloudWatchLogs/commands/addLogEvents.test.ts
@@ -0,0 +1,147 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as FakeTimers from '@sinonjs/fake-timers'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { addLogEvents } from '../../../../awsService/cloudWatchLogs/commands/addLogEvents'
+import { CloudWatchLogsEvent, LogDataRegistry } from '../../../../awsService/cloudWatchLogs/registry/logDataRegistry'
+import { CLOUDWATCH_LOGS_SCHEME } from '../../../../shared/constants'
+import { installFakeClock } from '../../../testUtil'
+
+describe('addLogEvents', async function () {
+    let sandbox: sinon.SinonSandbox
+    let clock: FakeTimers.InstalledClock
+
+    before(function () {
+        clock = installFakeClock()
+    })
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(function () {
+        clock.reset()
+        sandbox.restore()
+    })
+
+    after(function () {
+        clock.uninstall()
+    })
+
+    it('runs updateLog and sets busy status correctly', async function () {
+        const uri = vscode.Uri.parse(`${CLOUDWATCH_LOGS_SCHEME}:group:region:stream`)
+        const setBusyStatus = sandbox.stub<[vscode.Uri, boolean], void>()
+        const fetchNextLogEvents = sandbox.stub<
+            [
+                vscode.Uri,
+                ('head' | 'tail' | undefined)?,
+                (
+                    | ((
+                          logGroupInfo: {
+                              groupName: string
+                              streamName: string
+                              regionName: string
+                          },
+                          nextToken?: string | undefined
+                      ) => Promise<CloudWatchLogsEvent[]>)
+                    | undefined
+                )?,
+            ]
+        >()
+
+        const document: vscode.TextDocument = {
+            uri: uri,
+        } as any as vscode.TextDocument
+
+        const fakeRegistry: LogDataRegistry = {
+            setBusyStatus: setBusyStatus,
+            fetchNextLogEvents: fetchNextLogEvents,
+        } as any as LogDataRegistry
+
+        const fakeEvent = sandbox.createStubInstance(vscode.EventEmitter)
+
+        await addLogEvents(document, fakeRegistry, 'head', fakeEvent)
+
+        sandbox.assert.calledTwice(setBusyStatus)
+        sandbox.assert.calledWith(setBusyStatus.firstCall, uri, true)
+        sandbox.assert.calledWith(setBusyStatus.secondCall, uri, false)
+        // eslint-disable-next-line @typescript-eslint/unbound-method
+        sandbox.assert.calledTwice(fakeEvent.fire)
+        sandbox.assert.calledWith(setBusyStatus.secondCall, uri, false)
+        sandbox.assert.calledOnce(fetchNextLogEvents)
+        sandbox.assert.calledWith(fetchNextLogEvents.firstCall, uri, 'head')
+    })
+
+    it('async-locks to prevent more than one execution at a time', async function () {
+        const uri = vscode.Uri.parse(`${CLOUDWATCH_LOGS_SCHEME}:group:stream:region`)
+        const setBusyStatus = sandbox.stub<[vscode.Uri, boolean], void>()
+        const fetchNextLogEvents = sandbox.stub<
+            [
+                vscode.Uri,
+                ('head' | 'tail' | undefined)?,
+                (
+                    | ((
+                          logGroupInfo: {
+                              groupName: string
+                              streamName: string
+                              regionName: string
+                          },
+                          nextToken?: string | undefined
+                      ) => Promise<CloudWatchLogsEvent[]>)
+                    | undefined
+                )?,
+            ]
+        >()
+
+        // simulates a long network call. Doesn't need to do anything otherwise
+        fetchNextLogEvents.onFirstCall().callsFake(async () => {
+            clock.setTimeout(() => {}, 5000)
+        })
+        // simulates another network call. Shorter so that way this one triggers before the initial lock is over
+        fetchNextLogEvents.onThirdCall().callsFake(async () => {
+            clock.setTimeout(() => {}, 500)
+        })
+        // simulates another network call. Shorter so that way this one triggers  before the initial lock is over
+        fetchNextLogEvents.onSecondCall().callsFake(async () => {
+            clock.setTimeout(() => {}, 100)
+        })
+
+        const document: vscode.TextDocument = {
+            uri: uri,
+        } as any as vscode.TextDocument
+
+        const fakeRegistry: LogDataRegistry = {
+            setBusyStatus: setBusyStatus,
+            fetchNextLogEvents: fetchNextLogEvents,
+        } as any as LogDataRegistry
+
+        const fakeEvent = sandbox.createStubInstance(vscode.EventEmitter)
+
+        void addLogEvents(document, fakeRegistry, 'head', fakeEvent)
+        void addLogEvents(document, fakeRegistry, 'head', fakeEvent)
+        void addLogEvents(document, fakeRegistry, 'head', fakeEvent)
+
+        void new Promise<void>((resolve) => {
+            clock.setTimeout(() => {
+                sandbox.assert.calledTwice(setBusyStatus)
+                sandbox.assert.calledWith(setBusyStatus.firstCall, uri, true)
+                sandbox.assert.calledWith(setBusyStatus.secondCall, uri, false)
+                // eslint-disable-next-line @typescript-eslint/unbound-method
+                sandbox.assert.calledTwice(fakeEvent.fire)
+                sandbox.assert.calledWith(setBusyStatus.secondCall, uri, false)
+                sandbox.assert.calledOnce(fetchNextLogEvents)
+                sandbox.assert.calledWith(fetchNextLogEvents.firstCall, uri, 'head')
+                resolve()
+            }, 10000)
+        })
+        await clock.nextAsync()
+        await clock.nextAsync()
+        await clock.nextAsync()
+        await clock.nextAsync()
+        await clock.nextAsync()
+    })
+})
diff --git a/packages/core/src/test/awsService/cloudWatchLogs/commands/copyLogResource.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/commands/copyLogResource.test.ts
new file mode 100644
index 00000000000..3dc329c8c34
--- /dev/null
+++ b/packages/core/src/test/awsService/cloudWatchLogs/commands/copyLogResource.test.ts
@@ -0,0 +1,51 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import { copyLogResource } from '../../../../awsService/cloudWatchLogs/commands/copyLogResource'
+import { cwlUriSchema } from '../../../../awsService/cloudWatchLogs/cloudWatchLogsUtils'
+
+describe('copyLogResource', async function () {
+    beforeEach(async function () {
+        await vscode.env.clipboard.writeText('')
+    })
+
+    afterEach(async function () {
+        await vscode.env.clipboard.writeText('')
+    })
+
+    it('copies stream names from valid URIs with stream open', async function () {
+        const logGroupWithStream = {
+            groupName: 'group',
+            regionName: 'region',
+            streamName: 'stream',
+        }
+        const uri = cwlUriSchema.form({ logGroupInfo: logGroupWithStream, parameters: {} })
+
+        await copyLogResource(uri)
+
+        assert.strictEqual(await vscode.env.clipboard.readText(), logGroupWithStream.streamName)
+    })
+
+    it('copies group names from valid URIs with group open', async function () {
+        const logGroup = {
+            groupName: 'group2',
+            regionName: 'region2',
+        }
+        const uri = cwlUriSchema.form({ logGroupInfo: logGroup, parameters: {} })
+
+        await copyLogResource(uri)
+
+        assert.strictEqual(await vscode.env.clipboard.readText(), logGroup.groupName)
+    })
+
+    it('does not copy anything new if the URI is invalid', async function () {
+        await vscode.env.clipboard.writeText('default text')
+        await copyLogResource(vscode.Uri.parse(`notCloudWatch:hahahaha`))
+
+        assert.strictEqual(await vscode.env.clipboard.readText(), 'default text')
+    })
+})
diff --git a/packages/core/src/test/awsService/cloudWatchLogs/commands/saveCurrentLogDataContent.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/commands/saveCurrentLogDataContent.test.ts
new file mode 100644
index 00000000000..cd43c91150c
--- /dev/null
+++ b/packages/core/src/test/awsService/cloudWatchLogs/commands/saveCurrentLogDataContent.test.ts
@@ -0,0 +1,79 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as path from 'path'
+import * as vscode from 'vscode'
+
+import { saveCurrentLogDataContent } from '../../../../awsService/cloudWatchLogs/commands/saveCurrentLogDataContent'
+import { fileExists, makeTemporaryToolkitFolder, readFileAsString } from '../../../../shared/filesystemUtilities'
+import { getTestWindow } from '../../../shared/vscode/window'
+import {
+    CloudWatchLogsGroupInfo,
+    CloudWatchLogsParameters,
+    CloudWatchLogsResponse,
+    LogDataRegistry,
+} from '../../../../awsService/cloudWatchLogs/registry/logDataRegistry'
+import { assertTextEditorContains } from '../../../testUtil'
+import { cwlUriSchema } from '../../../../awsService/cloudWatchLogs/cloudWatchLogsUtils'
+import { fs } from '../../../../shared'
+
+async function testFilterLogEvents(
+    logGroupInfo: CloudWatchLogsGroupInfo,
+    apiParameters: CloudWatchLogsParameters,
+    nextToken?: string
+): Promise<CloudWatchLogsResponse> {
+    return {
+        events: [
+            { message: 'The first log event', logStreamName: 'stream1', timestamp: 1675451113 },
+            { message: 'The second log event', logStreamName: 'stream2', timestamp: 1675451114 },
+        ],
+    }
+}
+
+describe('saveCurrentLogDataContent', async function () {
+    let filename: string
+    let tempDir: string
+    const expectedText = `1970-01-20T09:24:11.113-08:00\tThe first log event
+1970-01-20T09:24:11.114-08:00\tThe second log event
+`
+
+    beforeEach(async function () {
+        tempDir = await makeTemporaryToolkitFolder()
+        filename = path.join(tempDir, 'bobLoblawsLawB.log')
+    })
+
+    afterEach(async function () {
+        await fs.delete(tempDir, { recursive: true })
+    })
+
+    it('saves log content to a file', async function () {
+        const logGroupInfo = {
+            groupName: 'g',
+            regionName: 'r',
+            streamName: 's',
+        }
+        const uri = cwlUriSchema.form({ logGroupInfo: logGroupInfo, parameters: {} })
+        LogDataRegistry.instance.registerInitialLog(uri, testFilterLogEvents)
+        await LogDataRegistry.instance.fetchNextLogEvents(uri)
+        await vscode.window.showTextDocument(uri)
+        await assertTextEditorContains(expectedText, false) // Wait for document provider.
+
+        getTestWindow().onDidShowDialog((d) => d.selectItem(vscode.Uri.file(filename)))
+        await saveCurrentLogDataContent()
+
+        assert.ok(await fileExists(filename))
+        assert.strictEqual(await readFileAsString(filename), expectedText)
+    })
+
+    it('does not do anything if the URI is invalid', async function () {
+        getTestWindow().onDidShowDialog((d) => d.selectItem(vscode.Uri.file(filename)))
+        await assert.rejects(
+            async () => await vscode.window.showTextDocument(vscode.Uri.parse(`notCloudWatch:hahahaha`))
+        )
+        await saveCurrentLogDataContent()
+        assert.strictEqual(await fileExists(filename), false)
+    })
+})
diff --git a/packages/core/src/test/awsService/cloudWatchLogs/commands/searchLogGroup.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/commands/searchLogGroup.test.ts
new file mode 100644
index 00000000000..9e63a3f59ed
--- /dev/null
+++ b/packages/core/src/test/awsService/cloudWatchLogs/commands/searchLogGroup.test.ts
@@ -0,0 +1,187 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import {
+    createSearchPatternPrompter,
+    SearchLogGroupWizard,
+} from '../../../../awsService/cloudWatchLogs/commands/searchLogGroup'
+import {
+    CloudWatchLogsGroupInfo,
+    CloudWatchLogsParameters,
+} from '../../../../awsService/cloudWatchLogs/registry/logDataRegistry'
+import { TimeFilterResponse, TimeFilterSubmenu } from '../../../../awsService/cloudWatchLogs/timeFilterSubmenu'
+import { createQuickPickPrompterTester, QuickPickPrompterTester } from '../../../shared/ui/testUtils'
+import { getTestWindow } from '../../../shared/vscode/window'
+import { createWizardTester } from '../../../shared/wizards/wizardTestUtils'
+import { DeployedResourceNode, DeployedResource } from '../../../../awsService/appBuilder/explorer/nodes/deployedNode'
+
+describe('searchLogGroup', async function () {
+    describe('Wizard', async function () {
+        it('shows steps in correct order', async function () {
+            const testWizard = await createWizardTester(new SearchLogGroupWizard())
+            testWizard.submenuResponse.assertShowFirst()
+            testWizard.timeRange.assertShowSecond()
+            testWizard.filterPattern.assertShowThird()
+        })
+
+        it('skips steps if parameters are given', async function () {
+            const nodeTestWizard = await createWizardTester(
+                new SearchLogGroupWizard({
+                    groupName: 'group-test',
+                    regionName: 'region-test',
+                })
+            )
+            nodeTestWizard.timeRange.assertShowFirst()
+            nodeTestWizard.filterPattern.assertShowSecond()
+            nodeTestWizard.submenuResponse.assertDoesNotShow()
+        })
+
+        it('prompts for filterPattern and accepts input', async function () {
+            const testInput = 'this is my filterPattern'
+            getTestWindow().onDidShowInputBox((input) => {
+                // assert.strictEqual(input.prompt, '...')
+                // assert.strictEqual(input.placeholder, '...')
+                input.acceptValue(testInput)
+            })
+            const logGroup: CloudWatchLogsGroupInfo = {
+                groupName: 'est-loggroup',
+                regionName: 'us-east-1',
+            }
+            const logParams: CloudWatchLogsParameters = {}
+
+            const filterPatternPrompter = createSearchPatternPrompter(logGroup, logParams, {}, false, true)
+            const result = await filterPatternPrompter.prompt()
+            assert.strictEqual(result, testInput)
+        })
+
+        it('should get correct input from a deployed Lambda function with LoggingConfig', async function () {
+            const mockResource: DeployedResource = {
+                stackName: 'test-stack',
+                regionCode: 'us-east-1',
+                explorerNode: {
+                    FunctionName: 'my-lambda-function',
+                    LoggingConfig: {
+                        LogGroup: 'my-lambda-loggroup',
+                    },
+                },
+                arn: 'arn:aws:lambda:us-east-1:111111111:function:my-lambda-function',
+                contextValue: 'awsRegionFunctionNode',
+            }
+            const mockLambdaNode = new DeployedResourceNode(mockResource)
+            const nodeTestWizard = await createWizardTester(
+                new SearchLogGroupWizard({
+                    groupName: mockLambdaNode.resource.explorerNode.LoggingConfig!.LogGroup || '',
+                    regionName: mockLambdaNode.resource.regionCode,
+                })
+            )
+            nodeTestWizard.timeRange.assertShowFirst()
+            nodeTestWizard.filterPattern.assertShowSecond()
+            nodeTestWizard.submenuResponse.assertDoesNotShow()
+        })
+
+        it('should get correct input from a deployed Lambda function without LoggingConfig', async function () {
+            const mockResource: DeployedResource = {
+                stackName: 'test-stack',
+                regionCode: 'us-east-1',
+                explorerNode: {
+                    FunctionName: 'my-lambda-function',
+                },
+                arn: 'arn:aws:lambda:us-east-1:111111111:function:my-lambda-function',
+                contextValue: 'awsRegionFunctionNode',
+            }
+            const mockLambdaNode = new DeployedResourceNode(mockResource)
+            const nodeTestWizard = await createWizardTester(
+                new SearchLogGroupWizard({
+                    groupName: '/aws/lambda/' + mockLambdaNode.resource.explorerNode.FunctionName,
+                    regionName: mockLambdaNode.resource.regionCode,
+                })
+            )
+            nodeTestWizard.timeRange.assertShowFirst()
+            nodeTestWizard.filterPattern.assertShowSecond()
+            nodeTestWizard.submenuResponse.assertDoesNotShow()
+        })
+    })
+
+    describe('TimeFilterSubmenu', async function () {
+        let testTimeRangeMenu: TimeFilterSubmenu
+        let defaultTimeRangePrompter: QuickPickPrompterTester<any>
+
+        beforeEach(async () => {
+            testTimeRangeMenu = new TimeFilterSubmenu()
+            defaultTimeRangePrompter = createQuickPickPrompterTester(testTimeRangeMenu.defaultPrompter)
+        })
+
+        it('gives option for custom input', async function () {
+            defaultTimeRangePrompter.assertContainsItems('Custom time range')
+            defaultTimeRangePrompter.acceptItem('Custom time range')
+            await defaultTimeRangePrompter.result()
+        })
+
+        describe('custom date input', async function () {
+            it('accepts valid date (YYYY/MM/DD-YYYY/MM/DD)', async function () {
+                const validInput = '2000/10/06-2001/11/08'
+                getTestWindow().onDidShowInputBox((input) => {
+                    input.acceptValue(validInput)
+                })
+                const customTimeRangePrompter = testTimeRangeMenu.createDateBox()
+                const result = customTimeRangePrompter.prompt()
+                assert.strictEqual(await result, validInput)
+            })
+
+            it('validates date format', function () {
+                // Invalid.
+                assert(testTimeRangeMenu.validateDate('2000/11/07,2000/12/08')) // No separator
+                assert(testTimeRangeMenu.validateDate('2002/13/06-2001/11/05')) // Invalid start date
+                assert(testTimeRangeMenu.validateDate('2002/09/06-2001/00/05')) // Invalid end date
+                assert(testTimeRangeMenu.validateDate('10/02/2001-08/05/2001')) // Invalid format of dates
+                assert(testTimeRangeMenu.validateDate('2000/10/01-2000/10/01')) // Same date
+                assert(testTimeRangeMenu.validateDate('2000/10/02-2000/10/01')) // End before start
+
+                // Valid.
+                assert(!testTimeRangeMenu.validateDate('2000/10/01-2000/10/03'))
+                assert(!testTimeRangeMenu.validateDate('2000/12/01-2001/10/03'))
+                assert(!testTimeRangeMenu.validateDate('2022/01/01-2022/05/03'))
+                assert(!testTimeRangeMenu.validateDate('2000/12/01-2099/10/03')) // Future date.
+            })
+        })
+
+        it('uses previously selected range', async function () {
+            const january1st = 1672531200000
+            const january10th = 1673308800000
+            // Has previous selection range from Jan 1st to Jan 10th
+            const prompter = new TimeFilterSubmenu({ startTime: january1st, endTime: january10th })
+
+            getTestWindow().onDidShowQuickPick((input) => {
+                input.acceptItem('Custom time range')
+            })
+
+            getTestWindow().onDidShowInputBox((input) => {
+                // Should be our previously selected range
+                input.acceptValue(input.value)
+            })
+
+            const res = (await prompter.prompt()) as TimeFilterResponse
+
+            assert.strictEqual(res.start, january1st)
+            assert.strictEqual(res.end, january10th)
+        })
+
+        describe('formatTimesToDateRange()', async function () {
+            it('converts valid start and end milliseconds', async function () {
+                assert.strictEqual(
+                    testTimeRangeMenu.formatTimesToDateRange(1672578000000, 1673355600000),
+                    '2023/01/01-2023/01/10'
+                )
+            })
+
+            it('returns undefined on missing input', function () {
+                assert.strictEqual(testTimeRangeMenu.formatTimesToDateRange(undefined, Date.now()), undefined)
+                assert.strictEqual(testTimeRangeMenu.formatTimesToDateRange(Date.now(), undefined), undefined)
+                assert.strictEqual(testTimeRangeMenu.formatTimesToDateRange(undefined, undefined), undefined)
+            })
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts
new file mode 100644
index 00000000000..fbaa9ea0695
--- /dev/null
+++ b/packages/core/src/test/awsService/cloudWatchLogs/commands/tailLogGroup.test.ts
@@ -0,0 +1,277 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+
+import assert from 'assert'
+import { clearDocument, closeSession, tailLogGroup } from '../../../../awsService/cloudWatchLogs/commands/tailLogGroup'
+import { StartLiveTailResponseStream } from '@aws-sdk/client-cloudwatch-logs'
+import { LiveTailSessionRegistry } from '../../../../awsService/cloudWatchLogs/registry/liveTailSessionRegistry'
+import { LiveTailSession } from '../../../../awsService/cloudWatchLogs/registry/liveTailSession'
+import {
+    TailLogGroupWizard,
+    TailLogGroupWizardResponse,
+} from '../../../../awsService/cloudWatchLogs/wizard/tailLogGroupWizard'
+import { getTestWindow } from '../../../shared/vscode/window'
+import { CloudWatchLogsSettings, uriToKey } from '../../../../awsService/cloudWatchLogs/cloudWatchLogsUtils'
+import { DefaultAwsContext, ToolkitError, waitUntil } from '../../../../shared'
+import { LiveTailCodeLensProvider } from '../../../../awsService/cloudWatchLogs/document/liveTailCodeLensProvider'
+import { PrompterTester } from '../../../shared/wizards/prompterTester'
+
+describe('TailLogGroup', function () {
+    const testLogGroup = 'test-log-group'
+    const testRegion = 'test-region'
+    const testMessage = 'test-message'
+    const testAwsAccountId = '1234'
+    const testSource = 'test-source'
+    const testAwsCredentials = {} as any as AWS.Credentials
+
+    let sandbox: sinon.SinonSandbox
+    let registry: LiveTailSessionRegistry
+    let codeLensProvider: LiveTailCodeLensProvider
+    let startLiveTailSessionSpy: sinon.SinonSpy
+    let stopLiveTailSessionSpy: sinon.SinonSpy
+    let cloudwatchSettingsSpy: sinon.SinonSpy
+    let wizardSpy: sinon.SinonSpy
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        registry = new LiveTailSessionRegistry()
+        codeLensProvider = new LiveTailCodeLensProvider(registry)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('starts LiveTailSession and writes to document. Closes tab and asserts session gets closed.', async function () {
+        sandbox.stub(DefaultAwsContext.prototype, 'getCredentialAccountId').returns(testAwsAccountId)
+        sandbox.stub(DefaultAwsContext.prototype, 'getCredentials').returns(Promise.resolve(testAwsCredentials))
+
+        const startTimestamp = 1732276800000 // 11-22-2024 12:00:00PM GMT
+        const updateFrames: StartLiveTailResponseStream[] = [
+            getSessionUpdateFrame(false, `${testMessage}-1`, startTimestamp + 1000),
+            getSessionUpdateFrame(false, `${testMessage}-2`, startTimestamp + 2000),
+            getSessionUpdateFrame(false, `${testMessage}-3`, startTimestamp + 3000),
+        ]
+        // Returns the configured update frames and then blocks until an AbortController is signaled.
+        // This keeps the stream 'open', simulating an open network stream waiting for new events.
+        // If the stream were to close, the event listeners in the TailLogGroup command would dispose,
+        // breaking the 'closes tab closes session' assertions this test makes.
+        const controller = new AbortController()
+        const p = new Promise((resolve, reject) => {
+            controller.signal.addEventListener('abort', () => {
+                reject()
+            })
+        })
+        async function* generator() {
+            for (const frame of updateFrames) {
+                yield frame
+            }
+            await p
+        }
+
+        startLiveTailSessionSpy = sandbox
+            .stub(LiveTailSession.prototype, 'startLiveTailSession')
+            .returns(Promise.resolve(generator()))
+        stopLiveTailSessionSpy = sandbox
+            .stub(LiveTailSession.prototype, 'stopLiveTailSession')
+            .callsFake(async function () {
+                return
+            })
+        wizardSpy = sandbox.stub(TailLogGroupWizard.prototype, 'run').callsFake(async function () {
+            return getTestWizardResponse()
+        })
+        // Set maxLines to 1.
+        cloudwatchSettingsSpy = sandbox.stub(CloudWatchLogsSettings.prototype, 'get').callsFake(() => {
+            return 1
+        })
+
+        // The mock stream doesn't 'close', causing tailLogGroup to not return. If we `await`, it will never resolve.
+        // Run it in the background and use waitUntil to poll its state. Due to the test setup, we expect this to throw
+        // after the abortController is fired at the end of the test.
+        void tailLogGroup(registry, testSource, codeLensProvider, {
+            groupName: testLogGroup,
+            regionName: testRegion,
+        }).catch((e) => {
+            const err = e as Error
+            assert.strictEqual(err.message.startsWith('Unexpected on-stream exception while tailing session:'), true)
+        })
+        await waitUntil(async () => registry.size !== 0, { interval: 100, timeout: 1000 })
+
+        // registry is asserted to have only one entry, so this is assumed to be the session that was
+        // started in this test.
+        let sessionUri: vscode.Uri | undefined
+        for (const [_, session] of registry) {
+            sessionUri = session.uri
+        }
+        if (sessionUri === undefined) {
+            throw Error
+        }
+
+        assert.strictEqual(wizardSpy.calledOnce, true)
+        assert.strictEqual(cloudwatchSettingsSpy.calledOnce, true)
+        assert.strictEqual(startLiveTailSessionSpy.calledOnce, true)
+        assert.strictEqual(registry.size, 1)
+
+        // Validate writing to the document.
+        // MaxLines is set to 1, and "testMessage3" is the last event in the stream, its contents should be the only thing in the doc.
+        const window = getTestWindow()
+        const document = window.activeTextEditor?.document
+        assert.strictEqual(sessionUri.toString(), document?.uri.toString())
+        const doesDocumentContainExpectedContent = await waitUntil(
+            async () => document?.getText().trim() === `12:00:03\t${testMessage}-3`,
+            { interval: 100, timeout: 1000 }
+        )
+        assert.strictEqual(doesDocumentContainExpectedContent, true)
+
+        // Test that closing all tabs the session's document is open in will cause the session to close
+        let tabs: vscode.Tab[] = []
+        for (const tabGroup of window.tabGroups.all) {
+            tabs = tabs.concat(getLiveTailSessionTabsFromTabGroup(tabGroup, sessionUri!))
+        }
+        await Promise.all(tabs.map((tab) => window.tabGroups.close(tab)))
+
+        // Before the test ends, signal the abort controller, interrupting the mock response stream. This
+        // causes `handleSessionStream` in TailLogGroup to throw, triggering the disposables to dispose.
+        controller.abort()
+
+        assert.strictEqual(registry.size, 0)
+        assert.strictEqual(stopLiveTailSessionSpy.calledOnce, true)
+    })
+
+    it(`doesn't ask for stream filter if passed as parameter`, async function () {
+        sandbox.stub(DefaultAwsContext.prototype, 'getCredentialAccountId').returns(testAwsAccountId)
+        sandbox.stub(DefaultAwsContext.prototype, 'getCredentials').returns(Promise.resolve(testAwsCredentials))
+
+        // Returns one frame
+        async function* generator(): AsyncIterable<StartLiveTailResponseStream> {
+            yield getSessionUpdateFrame(false, `${testMessage}-1`, 1732276800000)
+        }
+
+        startLiveTailSessionSpy = sandbox
+            .stub(LiveTailSession.prototype, 'startLiveTailSession')
+            .returns(Promise.resolve(generator()))
+
+        const prompterTester = PrompterTester.init()
+            .handleInputBox('Provide log event filter pattern', (inputBox) => {
+                inputBox.acceptValue('filter')
+            })
+            .build()
+
+        // Set maxLines to 1.
+        cloudwatchSettingsSpy = sandbox.stub(CloudWatchLogsSettings.prototype, 'get').returns(1)
+
+        // The mock stream doesn't 'close', causing tailLogGroup to not return. If we `await`, it will never resolve.
+        // Run it in the background and use waitUntil to poll its state.
+        void tailLogGroup(
+            registry,
+            testSource,
+            codeLensProvider,
+            {
+                groupName: testLogGroup,
+                regionName: testRegion,
+            },
+            { type: 'all' }
+        )
+        await waitUntil(async () => registry.size !== 0, { interval: 100, timeout: 1000 })
+
+        prompterTester.assertCall('Provide log event filter pattern', 1)
+
+        assert.strictEqual(startLiveTailSessionSpy.calledOnce, true)
+        assert.strictEqual(registry.size, 1)
+    })
+
+    it('throws if crendentials are undefined', async function () {
+        sandbox.stub(DefaultAwsContext.prototype, 'getCredentials').returns(Promise.resolve(undefined))
+        wizardSpy = sandbox.stub(TailLogGroupWizard.prototype, 'run').callsFake(async function () {
+            return getTestWizardResponse()
+        })
+        await assert.rejects(async () => {
+            await tailLogGroup(registry, testSource, codeLensProvider, {
+                groupName: testLogGroup,
+                regionName: testRegion,
+            })
+        }, ToolkitError)
+    })
+
+    it('closeSession removes session from registry and calls underlying stopLiveTailSession function.', function () {
+        stopLiveTailSessionSpy = sandbox
+            .stub(LiveTailSession.prototype, 'stopLiveTailSession')
+            .callsFake(async function () {
+                return
+            })
+
+        const session = new LiveTailSession({
+            logGroupArn: testLogGroup,
+            region: testRegion,
+            awsCredentials: testAwsCredentials,
+        })
+        registry.set(uriToKey(session.uri), session)
+
+        closeSession(session.uri, registry, testSource, codeLensProvider)
+        assert.strictEqual(0, registry.size)
+        assert.strictEqual(true, stopLiveTailSessionSpy.calledOnce)
+    })
+
+    it('clearDocument clears all text from document', async function () {
+        const session = new LiveTailSession({
+            logGroupArn: testLogGroup,
+            region: testRegion,
+            awsCredentials: testAwsCredentials,
+        })
+        const testData = 'blah blah blah'
+        const document = await vscode.workspace.openTextDocument(session.uri)
+        const edit = new vscode.WorkspaceEdit()
+        edit.insert(document.uri, new vscode.Position(0, 0), testData)
+        await vscode.workspace.applyEdit(edit)
+        assert.strictEqual(document.getText(), testData)
+
+        await clearDocument(document)
+        assert.strictEqual(document.getText(), '')
+    })
+
+    function getLiveTailSessionTabsFromTabGroup(tabGroup: vscode.TabGroup, sessionUri: vscode.Uri): vscode.Tab[] {
+        return tabGroup.tabs.filter((tab) => {
+            if (tab.input instanceof vscode.TabInputText) {
+                return sessionUri!.toString() === tab.input.uri.toString()
+            }
+        })
+    }
+
+    function getTestWizardResponse(): TailLogGroupWizardResponse {
+        return {
+            regionLogGroupSubmenuResponse: {
+                region: testRegion,
+                data: testLogGroup,
+            },
+            filterPattern: '',
+            logStreamFilter: {
+                type: 'all',
+            },
+        }
+    }
+
+    function getSessionUpdateFrame(
+        isSampled: boolean,
+        message: string,
+        timestamp: number
+    ): StartLiveTailResponseStream {
+        return {
+            sessionUpdate: {
+                sessionMetadata: {
+                    sampled: isSampled,
+                },
+                sessionResults: [
+                    {
+                        message: message,
+                        timestamp: timestamp,
+                    },
+                ],
+            },
+        }
+    }
+})
diff --git a/packages/core/src/test/awsService/cloudWatchLogs/commands/viewLogStream.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/commands/viewLogStream.test.ts
new file mode 100644
index 00000000000..fa2da7204e9
--- /dev/null
+++ b/packages/core/src/test/awsService/cloudWatchLogs/commands/viewLogStream.test.ts
@@ -0,0 +1,100 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+const localize = nls.loadMessageBundle()
+
+import assert from 'assert'
+import {
+    SelectLogStreamWizardContext,
+    SelectLogStreamWizard,
+    convertDescribeLogToQuickPickItems,
+    LogSearchChoice,
+} from '../../../../awsService/cloudWatchLogs/commands/viewLogStream'
+import { LogGroupNode } from '../../../../awsService/cloudWatchLogs/explorer/logGroupNode'
+import globals from '../../../../shared/extensionGlobals'
+import { formatLocalized } from '../../../../shared/datetime'
+
+class MockSelectLogStreamWizardContext implements SelectLogStreamWizardContext {
+    public constructor(private readonly pickLogStreamResponses: LogSearchChoice[] = []) {
+        this.pickLogStreamResponses = pickLogStreamResponses.reverse()
+    }
+
+    public async pickLogStream(): Promise<LogSearchChoice> {
+        if (this.pickLogStreamResponses.length <= 0) {
+            throw new Error('pickLogStream was called more times than expected')
+        }
+
+        const response = this.pickLogStreamResponses.pop()
+        if (!response) {
+            return { kind: 'cancelled' }
+        }
+
+        return response
+    }
+}
+
+describe('viewLogStreamWizard', async function () {
+    it('exits when cancelled', async function () {
+        const wizard = new SelectLogStreamWizard(
+            new LogGroupNode('region', {}),
+            new MockSelectLogStreamWizardContext([{ kind: 'cancelled' }])
+        )
+        const result = await wizard.run()
+
+        assert.strictEqual(result?.kind, 'cancelled')
+    })
+
+    it('returns the selected log stream name', async function () {
+        const streamName = 'stream/name'
+        const region = 'us-weast-99'
+        const groupName = 'grouper'
+        const wizard = new SelectLogStreamWizard(
+            new LogGroupNode(region, { logGroupName: groupName }),
+            new MockSelectLogStreamWizardContext([
+                { kind: 'selectedLogStream', region: region, logGroupName: groupName, logStreamName: streamName },
+            ])
+        )
+        const result = await wizard.run()
+
+        assert.ok(result)
+        // HACK: using '===' since following this assertion the exact
+        // type of 'result' is narrowed down to 'selectedLogStream'.
+        // Otherwise we get TS2339 error.
+        assert.ok(result.kind === 'selectedLogStream')
+        assert.strictEqual(result.logGroupName, groupName)
+        assert.strictEqual(result.logStreamName, streamName)
+        assert.strictEqual(result.region, region)
+    })
+})
+
+describe('convertDescribeLogToQuickPickItems', function () {
+    it('converts things correctly', function () {
+        const time = new globals.clock.Date().getTime()
+        const results = convertDescribeLogToQuickPickItems({
+            logStreams: [
+                {
+                    logStreamName: 'streamWithoutTimestamp',
+                },
+                {
+                    logStreamName: 'streamWithTimestamp',
+                    lastEventTimestamp: time,
+                },
+            ],
+        })
+
+        assert.strictEqual(results.length, 2)
+        assert.deepStrictEqual(results[0], {
+            label: 'streamWithoutTimestamp',
+            detail: localize('AWS.cwl.viewLogStream.workflow.noStreams', '[No Log Events found]'),
+        })
+        assert.deepStrictEqual(results[1], {
+            label: 'streamWithTimestamp',
+            detail: formatLocalized(new Date(time)),
+        })
+        const noResults = convertDescribeLogToQuickPickItems({})
+        assert.strictEqual(noResults.length, 0)
+    })
+})
diff --git a/packages/core/src/test/awsService/cloudWatchLogs/document/logDataDocumentProvider.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/document/logDataDocumentProvider.test.ts
new file mode 100644
index 00000000000..3457623cb79
--- /dev/null
+++ b/packages/core/src/test/awsService/cloudWatchLogs/document/logDataDocumentProvider.test.ts
@@ -0,0 +1,179 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import {
+    CloudWatchLogsSettings,
+    cwlUriSchema,
+    isLogStreamUri,
+} from '../../../../awsService/cloudWatchLogs/cloudWatchLogsUtils'
+import { LogDataDocumentProvider } from '../../../../awsService/cloudWatchLogs/document/logDataDocumentProvider'
+import {
+    LogDataRegistry,
+    CloudWatchLogsData,
+    CloudWatchLogsGroupInfo,
+    CloudWatchLogsParameters,
+    CloudWatchLogsResponse,
+} from '../../../../awsService/cloudWatchLogs/registry/logDataRegistry'
+import { Settings } from '../../../../shared/settings'
+import { LogDataCodeLensProvider } from '../../../../awsService/cloudWatchLogs/document/logDataCodeLensProvider'
+import { CLOUDWATCH_LOGS_SCHEME } from '../../../../shared/constants'
+import { FilteredLogEvent } from '@aws-sdk/client-cloudwatch-logs'
+
+const getLogEventsMessage = 'This is from getLogEvents'
+
+export async function testGetLogEvents(
+    logGroupInfo: CloudWatchLogsGroupInfo,
+    apiParameters: CloudWatchLogsParameters,
+    nextToken?: string
+): Promise<CloudWatchLogsResponse> {
+    return {
+        events: [
+            {
+                message: getLogEventsMessage,
+            },
+        ],
+    }
+}
+
+async function testFilterLogEvents(
+    logGroupInfo: CloudWatchLogsGroupInfo,
+    apiParameters: CloudWatchLogsParameters,
+    nextToken?: string
+): Promise<CloudWatchLogsResponse> {
+    return Promise.resolve({
+        events: [
+            {
+                message: 'This is from filterLogEvents',
+            },
+        ],
+    })
+}
+
+describe('LogDataDocumentProvider', async function () {
+    let provider: LogDataDocumentProvider
+    let registry: LogDataRegistry
+    let codeLensProvider: LogDataCodeLensProvider
+    let config: Settings
+
+    const getLogsLogGroupInfo: CloudWatchLogsGroupInfo = {
+        groupName: 'group',
+        regionName: 'region',
+        streamName: 'stream',
+    }
+    const getLogsUri = cwlUriSchema.form({ logGroupInfo: getLogsLogGroupInfo, parameters: {} })
+
+    const filterLogsStream: CloudWatchLogsData = {
+        events: [],
+        parameters: { filterPattern: 'lookForThis' },
+        logGroupInfo: {
+            groupName: 'group',
+            regionName: 'region',
+        },
+        retrieveLogsFunction: testFilterLogEvents,
+        busy: false,
+    }
+
+    const filterLogsUri = cwlUriSchema.form({
+        logGroupInfo: filterLogsStream.logGroupInfo,
+        parameters: filterLogsStream.parameters,
+    })
+
+    before(function () {
+        config = new Settings(vscode.ConfigurationTarget.Workspace)
+
+        registry = new LogDataRegistry(new CloudWatchLogsSettings(config))
+        registry.registerInitialLog(getLogsUri, testGetLogEvents)
+        registry.registerInitialLog(filterLogsUri, testFilterLogEvents)
+
+        provider = new LogDataDocumentProvider(registry)
+
+        codeLensProvider = new LogDataCodeLensProvider(registry)
+    })
+
+    it('provides content if it exists', async function () {
+        await registry.fetchNextLogEvents(getLogsUri)
+
+        const result = provider.provideTextDocumentContent(getLogsUri)
+        const expected = `                             \t${getLogEventsMessage}\n`
+        assert.strictEqual(result, expected)
+    })
+
+    it('throws error on attempt to get content from non-cwl uri', async function () {
+        await registry.fetchNextLogEvents(getLogsUri)
+
+        const emptyUri = vscode.Uri.parse(`${CLOUDWATCH_LOGS_SCHEME}:has:Not`)
+        assert.throws(() => provider.provideTextDocumentContent(emptyUri), {
+            message: `Uri is not a CWL Uri, so no text can be provided: ${emptyUri.toString()}`,
+        })
+    })
+
+    it("Give backward codelense if viewing log stream and doesn't if not", async function () {
+        const fakeGetLogsDocument = await vscode.workspace.openTextDocument(getLogsUri)
+        const fakeFilterLogsDocument = await vscode.workspace.openTextDocument(filterLogsUri)
+        const fakeVscodeToken = {} as vscode.CancellationToken
+
+        const fakeGetLogsCodeLens = codeLensProvider.provideCodeLenses(fakeGetLogsDocument, fakeVscodeToken)
+        const fakeFilterLogsCodeLens = codeLensProvider.provideCodeLenses(fakeFilterLogsDocument, fakeVscodeToken)
+
+        assert(fakeGetLogsCodeLens)
+        assert(fakeFilterLogsCodeLens)
+
+        assert.strictEqual(isLogStreamUri(filterLogsUri), false)
+        assert.strictEqual(isLogStreamUri(getLogsUri), true)
+        assert.notStrictEqual(fakeGetLogsCodeLens, fakeFilterLogsCodeLens)
+    })
+
+    describe('getLogStreamNameAtLine', () => {
+        const logGroupInfo: CloudWatchLogsGroupInfo = {
+            groupName: 'groupA',
+            regionName: 'regionA',
+            streamName: 'streamA',
+        }
+        const logStreamNameUri = cwlUriSchema.form({ logGroupInfo: logGroupInfo, parameters: {} })
+
+        const events: FilteredLogEvent[] = [
+            {
+                message: 'This is the first message',
+                logStreamName: 'logStream0',
+            },
+            {
+                message: 'This is the second message',
+                logStreamName: 'logStream0',
+            },
+            {
+                message: 'This is the third message',
+                logStreamName: 'logStream1',
+            },
+            {
+                message: 'This is the fourth message',
+                logStreamName: 'logStream2',
+            },
+        ]
+
+        async function getLogEventsFromMultipleStreams(
+            logGroupInfo: CloudWatchLogsGroupInfo,
+            apiParameters: CloudWatchLogsParameters,
+            nextToken?: string
+        ): Promise<CloudWatchLogsResponse> {
+            return {
+                events,
+            }
+        }
+
+        before(async () => {
+            registry.registerInitialLog(logStreamNameUri, getLogEventsFromMultipleStreams)
+            await registry.fetchNextLogEvents(logStreamNameUri)
+            provider.provideTextDocumentContent(logStreamNameUri)
+        })
+
+        it('gives the correct stream id for each line', () => {
+            for (let i = 0; i < events.length; i++) {
+                assert.strictEqual(provider.getLogStreamNameAtLine(logStreamNameUri, i), events[i].logStreamName)
+            }
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/cloudWatchLogs/document/logStreamsCodeLensProvider.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/document/logStreamsCodeLensProvider.test.ts
new file mode 100644
index 00000000000..ae222fd25df
--- /dev/null
+++ b/packages/core/src/test/awsService/cloudWatchLogs/document/logStreamsCodeLensProvider.test.ts
@@ -0,0 +1,62 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe } from 'mocha'
+import { LogStreamCodeLensProvider } from '../../../../awsService/cloudWatchLogs/document/logStreamsCodeLensProvider'
+import { LogDataRegistry } from '../../../../awsService/cloudWatchLogs/registry/logDataRegistry'
+import { LogDataDocumentProvider } from '../../../../awsService/cloudWatchLogs/document/logDataDocumentProvider'
+import { CancellationToken, CodeLens, TextDocument } from 'vscode'
+import assert = require('assert')
+import { createStubInstance, SinonStubbedInstance } from 'sinon'
+import { cwlUriSchema } from '../../../../awsService/cloudWatchLogs/cloudWatchLogsUtils'
+
+describe('LogStreamCodeLensProvider', async () => {
+    describe('provideCodeLenses()', async () => {
+        let codeLensProvider: LogStreamCodeLensProvider
+        let documentProvider: SinonStubbedInstance<LogDataDocumentProvider>
+
+        const logGroupInfo = { groupName: 'MyGroupName', regionName: 'MyRegionName' }
+        const logUri = cwlUriSchema.form({ logGroupInfo: logGroupInfo, parameters: {} })
+
+        before(async () => {
+            const registry: LogDataRegistry = {} as LogDataRegistry
+            documentProvider = createStubInstance(LogDataDocumentProvider)
+
+            codeLensProvider = new LogStreamCodeLensProvider(registry, documentProvider as any)
+        })
+        it('gets codelenses from a typical file', async () => {
+            const logStreamIdAtLine = ['streamId0', 'streamId0', 'streamId0', 'streamId1', 'streamId1', 'streamId2']
+            // Stub method which provides the log stream ID at a given line
+            for (let i = 0; i < logStreamIdAtLine.length; i++) {
+                documentProvider.getLogStreamNameAtLine.onCall(i).returns(logStreamIdAtLine[i])
+            }
+
+            const result = await codeLensProvider.provideCodeLenses(
+                { uri: logUri, lineCount: logStreamIdAtLine.length + 1 } as TextDocument,
+                {} as CancellationToken
+            )
+
+            // Create code lenses at the first occurence of each Log Stream
+            const expected = [
+                createCodeLensAtFirstOccurence('streamId0', logStreamIdAtLine),
+                createCodeLensAtFirstOccurence('streamId1', logStreamIdAtLine),
+                createCodeLensAtFirstOccurence('streamId2', logStreamIdAtLine),
+            ]
+            assert.deepStrictEqual(result, expected)
+        })
+
+        /**
+         * Creates a code lens at the first occurence of a stream id in the
+         * given string array.
+         */
+        function createCodeLensAtFirstOccurence(streamId: string, logStreamIdAtLine: string[]): CodeLens {
+            const firstOccurenceIndex = logStreamIdAtLine.findIndex((value) => value === streamId)
+            return codeLensProvider.createLogStreamCodeLens(logGroupInfo, {
+                streamId: logStreamIdAtLine[firstOccurenceIndex],
+                lineNum: firstOccurenceIndex,
+            })
+        }
+    })
+})
diff --git a/packages/core/src/test/awsService/cloudWatchLogs/document/textContent.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/document/textContent.test.ts
new file mode 100644
index 00000000000..abf89cee0c4
--- /dev/null
+++ b/packages/core/src/test/awsService/cloudWatchLogs/document/textContent.test.ts
@@ -0,0 +1,79 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import {
+    generateTextFromLogEvents,
+    timestampSpaceEquivalent,
+} from '../../../../awsService/cloudWatchLogs/document/textContent'
+import { CloudWatchLogsEvent } from '../../../../awsService/cloudWatchLogs/registry/logDataRegistry'
+
+describe('generateTextFromLogEvents', function () {
+    it('no formatting', () => {
+        const events: CloudWatchLogsEvent[] = [
+            { message: 'The first log event', logStreamName: 'stream1' },
+            { message: 'The second log event', logStreamName: 'stream2' },
+        ]
+
+        const { text, streamIdMap } = generateTextFromLogEvents(events)
+
+        const expectedText = `The first log event
+The second log event
+`
+        const expectedStreamIdMap = new Map([
+            [0, 'stream1'],
+            [1, 'stream2'],
+        ])
+        assert.strictEqual(text, expectedText)
+        assert.deepStrictEqual(streamIdMap, expectedStreamIdMap)
+    })
+
+    it('has timestamps', () => {
+        const events: CloudWatchLogsEvent[] = [
+            { message: 'The first log event', logStreamName: 'stream1', timestamp: 1675451113 },
+            { message: 'The second log event', logStreamName: 'stream2', timestamp: 1675451114 },
+        ]
+
+        const { text, streamIdMap } = generateTextFromLogEvents(events, { timestamps: true })
+
+        const expectedText = `1970-01-20T09:24:11.113-08:00\tThe first log event
+1970-01-20T09:24:11.114-08:00\tThe second log event
+`
+        const expectedStreamIdMap = new Map([
+            [0, 'stream1'],
+            [1, 'stream2'],
+        ])
+        assert.strictEqual(text, expectedText)
+        assert.deepStrictEqual(streamIdMap, expectedStreamIdMap)
+    })
+
+    it('has a multiline message + timestamps', () => {
+        const events: CloudWatchLogsEvent[] = [
+            { message: 'The first log event', logStreamName: 'stream1', timestamp: 1675451113 },
+            {
+                message: 'The second log event\nwith another line\nand another',
+                logStreamName: 'stream2',
+                timestamp: 1675451114,
+            },
+        ]
+
+        const { text, streamIdMap } = generateTextFromLogEvents(events, { timestamps: true })
+
+        const expectedText = `1970-01-20T09:24:11.113-08:00\tThe first log event
+1970-01-20T09:24:11.114-08:00\tThe second log event
+${timestampSpaceEquivalent}\twith another line
+${timestampSpaceEquivalent}\tand another
+`
+
+        const expectedStreamIdMap = new Map([
+            [0, 'stream1'],
+            [1, 'stream2'],
+            [2, 'stream2'],
+            [3, 'stream2'],
+        ])
+        assert.strictEqual(text, expectedText)
+        assert.deepStrictEqual(streamIdMap, expectedStreamIdMap)
+    })
+})
diff --git a/packages/core/src/test/awsService/cloudWatchLogs/explorer/cloudWatchLogsNode.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/explorer/cloudWatchLogsNode.test.ts
new file mode 100644
index 00000000000..34eb3b1cd26
--- /dev/null
+++ b/packages/core/src/test/awsService/cloudWatchLogs/explorer/cloudWatchLogsNode.test.ts
@@ -0,0 +1,85 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { contextValueCloudwatchLog, LogGroupNode } from '../../../../awsService/cloudWatchLogs/explorer/logGroupNode'
+import { CloudWatchLogsNode } from '../../../../awsService/cloudWatchLogs/explorer/cloudWatchLogsNode'
+import { asyncGenerator } from '../../../../shared/utilities/collectionUtils'
+import {
+    assertNodeListOnlyHasErrorNode,
+    assertNodeListOnlyHasPlaceholderNode,
+} from '../../../utilities/explorerNodeAssertions'
+import { CloudWatchLogsClient } from '../../../../shared/clients/cloudWatchLogs'
+import { stub } from '../../../utilities/stubber'
+
+const fakeRegionCode = 'someregioncode'
+const unsortedText = ['zebra', 'Antelope', 'aardvark', 'elephant']
+const sortedText = ['aardvark', 'Antelope', 'elephant', 'zebra']
+
+describe('CloudWatchLogsNode', function () {
+    let testNode: CloudWatchLogsNode
+
+    // Mocked Lambda Client returns Log Groups for anything listed in logGroupNames
+    let logGroupNames: string[]
+
+    function createClient() {
+        const client = stub(CloudWatchLogsClient, { regionCode: fakeRegionCode })
+        client.describeLogGroups.callsFake(() => asyncGenerator(logGroupNames.map((name) => ({ logGroupName: name }))))
+
+        return client
+    }
+
+    beforeEach(function () {
+        logGroupNames = ['group1', 'group2']
+        testNode = new CloudWatchLogsNode(fakeRegionCode, createClient())
+    })
+
+    it('returns placeholder node if no children are present', async function () {
+        logGroupNames = []
+
+        const childNodes = await testNode.getChildren()
+
+        assertNodeListOnlyHasPlaceholderNode(childNodes)
+    })
+
+    it('has LogGroupNode child nodes', async function () {
+        const childNodes = await testNode.getChildren()
+
+        assert.strictEqual(childNodes.length, logGroupNames.length, 'Unexpected child count')
+
+        for (const node of childNodes) {
+            assert.ok(node instanceof LogGroupNode, 'Expected child node to be LogGroupNode')
+        }
+    })
+
+    it('has child nodes with CloudWatch Log contextValue', async function () {
+        const childNodes = await testNode.getChildren()
+
+        for (const node of childNodes) {
+            assert.strictEqual(
+                node.contextValue,
+                contextValueCloudwatchLog,
+                'expected the node to have a CloudWatch Log contextValue'
+            )
+        }
+    })
+
+    it('sorts child nodes', async function () {
+        logGroupNames = unsortedText
+
+        const childNodes = await testNode.getChildren()
+
+        const actualChildOrder = childNodes.map((node) => node.label)
+        assert.deepStrictEqual(actualChildOrder, sortedText, 'Unexpected child sort order')
+    })
+
+    it('has an error node for a child if an error happens during loading', async function () {
+        const client = createClient()
+        client.describeLogGroups.throws(new Error())
+
+        const node = new CloudWatchLogsNode(fakeRegionCode, client)
+        assertNodeListOnlyHasErrorNode(await node.getChildren())
+    })
+})
diff --git a/src/test/cloudWatchLogs/explorer/logGroupNode.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/explorer/logGroupNode.test.ts
similarity index 81%
rename from src/test/cloudWatchLogs/explorer/logGroupNode.test.ts
rename to packages/core/src/test/awsService/cloudWatchLogs/explorer/logGroupNode.test.ts
index b75195eb991..88930b6c5cf 100644
--- a/src/test/cloudWatchLogs/explorer/logGroupNode.test.ts
+++ b/packages/core/src/test/awsService/cloudWatchLogs/explorer/logGroupNode.test.ts
@@ -1,16 +1,16 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
-import { CloudWatchLogs } from 'aws-sdk'
+import assert from 'assert'
 import * as os from 'os'
-import { LogGroupNode } from '../../../cloudWatchLogs/explorer/logGroupNode'
+import { LogGroupNode } from '../../../../awsService/cloudWatchLogs/explorer/logGroupNode'
+import { LogGroup } from '@aws-sdk/client-cloudwatch-logs'
 
 describe('LogGroupNode', function () {
     let testNode: LogGroupNode
-    let fakeLogGroup: CloudWatchLogs.LogGroup
+    let fakeLogGroup: LogGroup
 
     before(function () {
         fakeLogGroup = {
diff --git a/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailRegistry.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailRegistry.test.ts
new file mode 100644
index 00000000000..1aeeec9e6ae
--- /dev/null
+++ b/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailRegistry.test.ts
@@ -0,0 +1,99 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import assert from 'assert'
+import { LiveTailSessionConfiguration } from '../../../../awsService/cloudWatchLogs/registry/liveTailSession'
+import { createLiveTailURIFromArgs } from '../../../../awsService/cloudWatchLogs/registry/liveTailSessionRegistry'
+import { cloudwatchLogsLiveTailScheme } from '../../../../shared/constants'
+
+describe('LiveTailSession URI', async function () {
+    const testLogGroupName = 'test-log-group'
+    const testRegion = 'test-region'
+    const testAwsCredentials = {} as any as AWS.Credentials
+    const expectedUriBase = `${cloudwatchLogsLiveTailScheme}:${testRegion}:${testLogGroupName}`
+
+    it('is correct with no logStream filter, no filter pattern', function () {
+        const config: LiveTailSessionConfiguration = {
+            logGroupArn: testLogGroupName,
+            region: testRegion,
+            awsCredentials: testAwsCredentials,
+        }
+        const expectedUri = vscode.Uri.parse(expectedUriBase)
+        const uri = createLiveTailURIFromArgs(config)
+        assert.deepEqual(uri, expectedUri)
+    })
+
+    it('is correct with no logStream filter, with filter pattern', function () {
+        const config: LiveTailSessionConfiguration = {
+            logGroupArn: testLogGroupName,
+            region: testRegion,
+            logEventFilterPattern: 'test-filter',
+            awsCredentials: testAwsCredentials,
+        }
+        const expectedUri = vscode.Uri.parse(`${expectedUriBase}:test-filter`)
+        const uri = createLiveTailURIFromArgs(config)
+        assert.deepEqual(uri, expectedUri)
+    })
+
+    it('is correct with ALL logStream filter', function () {
+        const config: LiveTailSessionConfiguration = {
+            logGroupArn: testLogGroupName,
+            region: testRegion,
+            logStreamFilter: {
+                type: 'all',
+            },
+            awsCredentials: testAwsCredentials,
+        }
+        const expectedUri = vscode.Uri.parse(`${expectedUriBase}:all`)
+        const uri = createLiveTailURIFromArgs(config)
+        assert.deepEqual(uri, expectedUri)
+    })
+
+    it('is correct with prefix logStream filter', function () {
+        const config: LiveTailSessionConfiguration = {
+            logGroupArn: testLogGroupName,
+            region: testRegion,
+            logStreamFilter: {
+                type: 'prefix',
+                filter: 'test-prefix',
+            },
+            awsCredentials: testAwsCredentials,
+        }
+        const expectedUri = vscode.Uri.parse(`${expectedUriBase}:prefix:test-prefix`)
+        const uri = createLiveTailURIFromArgs(config)
+        assert.deepEqual(uri, expectedUri)
+    })
+
+    it('is correct with specific logStream filter', function () {
+        const config: LiveTailSessionConfiguration = {
+            logGroupArn: testLogGroupName,
+            region: testRegion,
+            logStreamFilter: {
+                type: 'specific',
+                filter: 'test-stream',
+            },
+            awsCredentials: testAwsCredentials,
+        }
+        const expectedUri = vscode.Uri.parse(`${expectedUriBase}:specific:test-stream`)
+        const uri = createLiveTailURIFromArgs(config)
+        assert.deepEqual(uri, expectedUri)
+    })
+
+    it('is correct with specific logStream filter and filter pattern', function () {
+        const config: LiveTailSessionConfiguration = {
+            logGroupArn: testLogGroupName,
+            region: testRegion,
+            logStreamFilter: {
+                type: 'specific',
+                filter: 'test-stream',
+            },
+            logEventFilterPattern: 'test-filter',
+            awsCredentials: testAwsCredentials,
+        }
+        const expectedUri = vscode.Uri.parse(`${expectedUriBase}:specific:test-stream:test-filter`)
+        const uri = createLiveTailURIFromArgs(config)
+        assert.deepEqual(uri, expectedUri)
+    })
+})
diff --git a/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailSession.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailSession.test.ts
new file mode 100644
index 00000000000..514114750b4
--- /dev/null
+++ b/packages/core/src/test/awsService/cloudWatchLogs/registry/liveTailSession.test.ts
@@ -0,0 +1,149 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as sinon from 'sinon'
+import * as FakeTimers from '@sinonjs/fake-timers'
+import assert from 'assert'
+import { LiveTailSession } from '../../../../awsService/cloudWatchLogs/registry/liveTailSession'
+import {
+    CloudWatchLogsClient,
+    StartLiveTailCommand,
+    StartLiveTailResponseStream,
+} from '@aws-sdk/client-cloudwatch-logs'
+import { LogStreamFilterResponse } from '../../../../awsService/cloudWatchLogs/wizard/liveTailLogStreamSubmenu'
+import { installFakeClock } from '../../../testUtil'
+
+describe('LiveTailSession', async function () {
+    const testLogGroupArn = 'arn:aws:test-log-group'
+    const testRegion = 'test-region'
+    const testFilter = 'test-filter'
+    const testAwsCredentials = {} as any as AWS.Credentials
+
+    let sandbox: sinon.SinonSandbox
+    let clock: FakeTimers.InstalledClock
+
+    before(function () {
+        clock = installFakeClock()
+    })
+
+    beforeEach(function () {
+        clock.reset()
+        sandbox = sinon.createSandbox()
+    })
+
+    after(function () {
+        clock.uninstall()
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('builds StartLiveTailCommand: no stream Filter, no event filter.', function () {
+        const session = buildLiveTailSession({ type: 'all' }, undefined)
+        assert.deepStrictEqual(
+            session.buildStartLiveTailCommand().input,
+            new StartLiveTailCommand({
+                logGroupIdentifiers: [testLogGroupArn],
+                logEventFilterPattern: undefined,
+                logStreamNamePrefixes: undefined,
+                logStreamNames: undefined,
+            }).input
+        )
+    })
+
+    it('builds StartLiveTailCommand: with prefix stream Filter', function () {
+        const session = buildLiveTailSession({ type: 'prefix', filter: testFilter }, undefined)
+        assert.deepStrictEqual(
+            session.buildStartLiveTailCommand().input,
+            new StartLiveTailCommand({
+                logGroupIdentifiers: [testLogGroupArn],
+                logEventFilterPattern: undefined,
+                logStreamNamePrefixes: [testFilter],
+                logStreamNames: undefined,
+            }).input
+        )
+    })
+
+    it('builds StartLiveTailCommand: with specific stream Filter', function () {
+        const session = buildLiveTailSession({ type: 'specific', filter: testFilter }, undefined)
+        assert.deepStrictEqual(
+            session.buildStartLiveTailCommand().input,
+            new StartLiveTailCommand({
+                logGroupIdentifiers: [testLogGroupArn],
+                logEventFilterPattern: undefined,
+                logStreamNamePrefixes: undefined,
+                logStreamNames: [testFilter],
+            }).input
+        )
+    })
+
+    it('builds StartLiveTailCommand: with log event Filter', function () {
+        const session = buildLiveTailSession({ type: 'all' }, testFilter)
+        assert.deepStrictEqual(
+            session.buildStartLiveTailCommand().input,
+            new StartLiveTailCommand({
+                logGroupIdentifiers: [testLogGroupArn],
+                logEventFilterPattern: testFilter,
+                logStreamNamePrefixes: undefined,
+                logStreamNames: undefined,
+            }).input
+        )
+    })
+
+    it('closes a started session', async function () {
+        const startLiveTailStub = sinon.stub(CloudWatchLogsClient.prototype, 'send').callsFake(function () {
+            return {
+                responseStream: mockResponseStream(),
+            }
+        })
+        const session = buildLiveTailSession({ type: 'all' }, testFilter)
+        assert.strictEqual(session.getLiveTailSessionDuration(), 0)
+
+        const returnedResponseStream = await session.startLiveTailSession()
+        assert.strictEqual(startLiveTailStub.calledOnce, true)
+        const requestArgs = startLiveTailStub.getCall(0).args
+        assert.deepEqual(requestArgs[0].input, session.buildStartLiveTailCommand().input)
+        assert.strictEqual(requestArgs[1].abortSignal !== undefined && !requestArgs[1].abortSignal.aborted, true)
+        assert.strictEqual(session.isAborted, false)
+        assert.strictEqual(clock.countTimers(), 1)
+        assert.deepStrictEqual(returnedResponseStream, mockResponseStream())
+
+        clock.tick(1000)
+        assert.strictEqual(session.getLiveTailSessionDuration(), 1000)
+
+        session.stopLiveTailSession()
+        assert.strictEqual(session.isAborted, true)
+        assert.strictEqual(clock.countTimers(), 0)
+
+        // Session is stopped; ticking the clock forward should not change the session duration
+        clock.tick(1000)
+        assert.strictEqual(session.getLiveTailSessionDuration(), 1000)
+    })
+
+    function buildLiveTailSession(
+        logStreamFilter: LogStreamFilterResponse,
+        logEventFilterPattern: string | undefined
+    ): LiveTailSession {
+        return new LiveTailSession({
+            logGroupArn: testLogGroupArn,
+            logStreamFilter: logStreamFilter,
+            logEventFilterPattern: logEventFilterPattern,
+            region: testRegion,
+            awsCredentials: testAwsCredentials,
+        })
+    }
+
+    async function* mockResponseStream(): AsyncIterable<StartLiveTailResponseStream> {
+        const frame: StartLiveTailResponseStream = {
+            sessionUpdate: {
+                sessionMetadata: {
+                    sampled: false,
+                },
+                sessionResults: [],
+            },
+        }
+        yield frame
+    }
+})
diff --git a/packages/core/src/test/awsService/cloudWatchLogs/registry/logDataRegistry.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/registry/logDataRegistry.test.ts
new file mode 100644
index 00000000000..1a00bb49c69
--- /dev/null
+++ b/packages/core/src/test/awsService/cloudWatchLogs/registry/logDataRegistry.test.ts
@@ -0,0 +1,231 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import {
+    LogDataRegistry,
+    CloudWatchLogsAction,
+    CloudWatchLogsGroupInfo,
+    CloudWatchLogsParameters,
+    CloudWatchLogsResponse,
+    CloudWatchLogsData,
+} from '../../../../awsService/cloudWatchLogs/registry/logDataRegistry'
+import { Settings } from '../../../../shared/settings'
+import { CloudWatchLogsSettings, cwlUriSchema } from '../../../../awsService/cloudWatchLogs/cloudWatchLogsUtils'
+import {
+    backwardToken,
+    fakeGetLogEvents,
+    fakeSearchLogGroup,
+    logGroupsData,
+    newLineData,
+    paginatedData,
+    testLogData,
+    unregisteredData,
+} from '../utils.test'
+import { FilteredLogEvent } from '@aws-sdk/client-cloudwatch-logs'
+import { formatDateTimestamp } from '../../../../shared/datetime'
+
+describe('LogDataRegistry', async function () {
+    let registry: GetSetLogDataRegistry
+
+    const config = new Settings(vscode.ConfigurationTarget.Workspace)
+
+    const registeredUri = cwlUriSchema.form({
+        logGroupInfo: testLogData.logGroupInfo,
+        parameters: testLogData.parameters,
+    })
+    const unregisteredUri = cwlUriSchema.form({
+        logGroupInfo: unregisteredData.logGroupInfo,
+        parameters: unregisteredData.parameters,
+    })
+    const newLineUri = cwlUriSchema.form({ logGroupInfo: newLineData.logGroupInfo, parameters: newLineData.parameters })
+    const searchLogGroupUri = cwlUriSchema.form({
+        logGroupInfo: logGroupsData.logGroupInfo,
+        parameters: logGroupsData.parameters,
+    })
+    const paginatedUri = cwlUriSchema.form({
+        logGroupInfo: paginatedData.logGroupInfo,
+        parameters: paginatedData.parameters,
+    })
+
+    /**
+     * Only intended to expose the {get|set}LogData methods for testing purposes.
+     */
+    class GetSetLogDataRegistry extends LogDataRegistry {
+        override getLogData(uri: vscode.Uri): CloudWatchLogsData | undefined {
+            return super.getLogData(uri)
+        }
+
+        override setLogData(uri: vscode.Uri, newData: CloudWatchLogsData): void {
+            super.setLogData(uri, newData)
+        }
+    }
+
+    beforeEach(function () {
+        registry = new GetSetLogDataRegistry(new CloudWatchLogsSettings(config))
+        registry.setLogData(registeredUri, testLogData)
+        registry.setLogData(newLineUri, newLineData)
+        registry.setLogData(searchLogGroupUri, logGroupsData)
+        registry.setLogData(paginatedUri, paginatedData)
+    })
+
+    describe('hasLog', function () {
+        it('correctly returns whether or not the log is registered', function () {
+            assert.strictEqual(registry.isRegistered(registeredUri), true)
+            assert.strictEqual(registry.isRegistered(unregisteredUri), false)
+        })
+    })
+
+    describe('registerInitialLog', function () {
+        it('throws when attempting to register a pre-existing uri', () => {
+            assert.throws(
+                () => {
+                    registry.registerInitialLog(registeredUri)
+                },
+                new Error(`Already registered: ${registeredUri.toString()}`)
+            )
+        })
+    })
+
+    describe('fetchNextLogEvents head/tail management', async function () {
+        beforeEach(() => {
+            // Verify existing data
+            const oldEvents = registry.fetchCachedLogEvents(paginatedUri)
+            assert.deepStrictEqual(oldEvents, paginatedData.events)
+        })
+
+        it("properly paginates the results with 'head'", async () => {
+            // Manually set a backwards token to exist
+            registry.setLogData(paginatedUri, { ...paginatedData, previous: { token: backwardToken } })
+
+            const newEvents = await registry.fetchNextLogEvents(paginatedUri, 'head')
+
+            // // check that newData is changed to what it should be.
+            const expected = (await fakeSearchLogGroup()).events
+            assert.deepStrictEqual(newEvents, expected)
+        })
+
+        it("properly paginates the results with 'tail'", async () => {
+            const newEvents = await registry.fetchNextLogEvents(paginatedUri, 'tail')
+
+            // // check that newData is changed to what it should be.
+            const expected = (await fakeGetLogEvents()).events
+            assert.deepStrictEqual(newEvents, expected)
+        })
+
+        it("returns empty list if no 'head' token", async () => {
+            const newEvents = await registry.fetchNextLogEvents(paginatedUri, 'head')
+            // // check that newData is changed to what it should be.
+            assert.deepStrictEqual(newEvents, [])
+        })
+    })
+
+    describe('fetchNextLogEvents pagination handling', async function () {
+        const pageToken0 = undefined // Absence of token implies inital page
+        const pageToken1 = 'page1Token'
+        const pageToken2 = 'page2Token'
+
+        function createCwlEvents(id: string, count: number): FilteredLogEvent[] {
+            let events: FilteredLogEvent[] = []
+            for (let i = 0; i < count; i++) {
+                events = events.concat({ message: `message-${id}`, logStreamName: `stream-${id}` })
+            }
+            return events
+        }
+
+        async function buildCwlAction(isPage1Empty: boolean): Promise<CloudWatchLogsAction> {
+            return async function (
+                logGroupInfo: CloudWatchLogsGroupInfo,
+                parameters: CloudWatchLogsParameters,
+                nextToken?: string
+            ) {
+                return getSimulatedCwlResponse(nextToken, isPage1Empty)
+            }
+        }
+
+        /**
+         * This function returns a simulated cloud watch logs reponse for a given token.
+         * @param token The page token
+         * @param isPage1Empty A flag to indicate if Page 1 should have data/isn't the tail.
+         * @returns
+         */
+        function getSimulatedCwlResponse(token: string | undefined, isPage1Empty: boolean): CloudWatchLogsResponse {
+            switch (token) {
+                case pageToken1:
+                    if (isPage1Empty) {
+                        return { events: [], nextForwardToken: undefined, nextBackwardToken: pageToken0 }
+                    }
+                    return {
+                        events: createCwlEvents('P1', 1),
+                        nextForwardToken: pageToken2,
+                        nextBackwardToken: pageToken0,
+                    }
+                case pageToken2:
+                    return { events: [], nextForwardToken: undefined, nextBackwardToken: pageToken1 }
+                default: // pageToken0
+                    return {
+                        events: createCwlEvents('P0', 1),
+                        nextForwardToken: pageToken1,
+                        nextBackwardToken: undefined,
+                    }
+            }
+        }
+
+        it('can retrieve new events when they become available', async () => {
+            // Swap to use other paginate testing function
+            const noEventsOnPage1 = true
+            paginatedData.retrieveLogsFunction = await buildCwlAction(noEventsOnPage1)
+
+            // -- Make first call.
+            const firstUpdatedEvents = await registry.fetchNextLogEvents(paginatedUri)
+            const firstExpectedEvents = getSimulatedCwlResponse(pageToken0, noEventsOnPage1).events
+            assert.deepStrictEqual(firstUpdatedEvents, firstExpectedEvents)
+
+            // -- Make second call.
+            const secondUpdatedData = await registry.fetchNextLogEvents(paginatedUri)
+            // Expect the output to equal the first call since page 1 'does not exist yet'
+            assert.deepStrictEqual(secondUpdatedData, firstExpectedEvents)
+
+            // Simulate page 1 now getting data
+            const logData = registry.getLogData(paginatedUri)
+            assert(logData)
+            logData.retrieveLogsFunction = await buildCwlAction(!noEventsOnPage1)
+
+            // -- Make third call.
+            const thirdActual = await registry.fetchNextLogEvents(paginatedUri)
+            const thirdExpected = firstExpectedEvents.concat(
+                getSimulatedCwlResponse(pageToken1, !noEventsOnPage1).events
+            )
+            assert.deepStrictEqual(thirdActual, thirdExpected)
+        })
+    })
+
+    describe('disposeRegistryData', function () {
+        it('deletes a log', function () {
+            assert.strictEqual(registry.isRegistered(registeredUri), true)
+            registry.disposeRegistryData(registeredUri)
+            assert.strictEqual(registry.isRegistered(registeredUri), false)
+        })
+
+        it('does not error if the log does not exist in the registry', function () {
+            assert.strictEqual(registry.isRegistered(unregisteredUri), false)
+            registry.disposeRegistryData(unregisteredUri)
+            assert.strictEqual(registry.isRegistered(unregisteredUri), false)
+        })
+    })
+
+    describe('Timestamp', function () {
+        it('matches CloudWatch insights timestamps', function () {
+            const time = 1624201162222 // 2021-06-20 14:59:22.222 GMT+0
+            const timestamp = formatDateTimestamp(true, new Date(time))
+            assert.strictEqual(
+                timestamp,
+                '2021-06-20T14:59:22.222-07:00',
+                '`process.env.TZ` assignment may have been modified'
+            )
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/cloudWatchLogs/utils.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/utils.test.ts
new file mode 100644
index 00000000000..e51f249c1f8
--- /dev/null
+++ b/packages/core/src/test/awsService/cloudWatchLogs/utils.test.ts
@@ -0,0 +1,289 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import { cwlUriSchema, uriToKey } from '../../../awsService/cloudWatchLogs/cloudWatchLogsUtils'
+import {
+    CloudWatchLogsParameters,
+    CloudWatchLogsData,
+    CloudWatchLogsResponse,
+    CloudWatchLogsGroupInfo,
+} from '../../../awsService/cloudWatchLogs/registry/logDataRegistry'
+import { CLOUDWATCH_LOGS_SCHEME } from '../../../shared/constants'
+import { findOccurencesOf } from '../../../shared/utilities/textDocumentUtilities'
+
+export const newText = 'a little longer now\n'
+export const addedEvent = {
+    message: 'this is an additional event',
+}
+export const forwardToken = 'forward'
+export const backwardToken = 'backward'
+
+export async function returnPaginatedEvents(
+    logGroupInfo: CloudWatchLogsGroupInfo,
+    parameters: CloudWatchLogsParameters,
+    nextToken?: string
+) {
+    switch (nextToken) {
+        case forwardToken:
+            return fakeGetLogEvents()
+        case backwardToken:
+            return fakeSearchLogGroup()
+        default:
+            return {
+                events: [],
+                nextForwardToken: forwardToken,
+                nextBackwardToken: backwardToken,
+            }
+    }
+}
+
+export async function returnNonEmptyPaginatedEvents(
+    logGroupInfo: CloudWatchLogsGroupInfo,
+    parameters: CloudWatchLogsParameters,
+    nextToken?: string
+) {
+    const result = await returnPaginatedEvents(logGroupInfo, parameters, nextToken)
+    if (result.events.length === 0) {
+        result.events = [addedEvent]
+    }
+    return result
+}
+
+export async function fakeGetLogEvents(): Promise<CloudWatchLogsResponse> {
+    return {
+        events: [
+            {
+                message: newText,
+            },
+        ],
+    }
+}
+export const testStreamNames = ['stream0', 'stream1']
+export async function fakeSearchLogGroup(): Promise<CloudWatchLogsResponse> {
+    return {
+        events: [
+            {
+                message: newText,
+                logStreamName: testStreamNames[0],
+            },
+            {
+                message: newText,
+                logStreamName: testStreamNames[1],
+            },
+        ],
+    }
+}
+
+export const testComponents = {
+    logGroupInfo: {
+        groupName: 'this-is-a-group',
+        regionName: 'this-is-a-region',
+        streamName: 'this-is-a-stream',
+    },
+    parameters: { filterPattern: 'this is a bad filter!' },
+}
+
+export const testLogData: CloudWatchLogsData = {
+    events: [
+        {
+            timestamp: 1,
+            message: 'is the loneliest number\n',
+        },
+        {
+            timestamp: 2,
+            message: 'can be as sad as one\n',
+        },
+        {
+            timestamp: 3,
+            message: '...dog night covered this song\n',
+        },
+        {
+            message: 'does anybody really know what time it is? does anybody really care?\n',
+        },
+    ],
+    parameters: {},
+    logGroupInfo: {
+        groupName: 'This',
+        regionName: 'Is',
+        streamName: 'Registered',
+    },
+    retrieveLogsFunction: fakeGetLogEvents,
+    busy: false,
+}
+
+export const newLineData: CloudWatchLogsData = {
+    events: [
+        {
+            timestamp: 12745641600000,
+            message: 'the\nline\rmust\r\nbe\ndrawn\rHERE\nright\nhere\r\nno\nfurther\n',
+        },
+    ],
+    parameters: {},
+    logGroupInfo: {
+        groupName: 'Not',
+        regionName: 'Here',
+        streamName: 'Dude',
+    },
+    retrieveLogsFunction: fakeGetLogEvents,
+    busy: false,
+}
+
+export const unregisteredData: CloudWatchLogsData = {
+    events: [],
+    parameters: {},
+    logGroupInfo: {
+        groupName: 'ANOTHER',
+        regionName: 'LINE',
+        streamName: 'PIEEEECCCEEEEEE',
+    },
+    retrieveLogsFunction: fakeGetLogEvents,
+    busy: false,
+}
+
+export const logGroupsData: CloudWatchLogsData = {
+    events: [],
+    parameters: {},
+    logGroupInfo: {
+        groupName: 'thisIsAGroupName',
+        regionName: 'thisIsARegionCode',
+    },
+    retrieveLogsFunction: fakeSearchLogGroup,
+    busy: false,
+}
+
+export const paginatedData: CloudWatchLogsData = {
+    events: [],
+    parameters: {},
+    logGroupInfo: {
+        groupName: 'g',
+        regionName: 'r',
+    },
+    retrieveLogsFunction: returnPaginatedEvents,
+    busy: false,
+}
+export const goodUri = cwlUriSchema.form({
+    logGroupInfo: testComponents.logGroupInfo,
+    parameters: testComponents.parameters,
+})
+
+describe('parseCloudWatchLogsUri', async function () {
+    it('converts a valid URI to components', function () {
+        const result = cwlUriSchema.parse(goodUri)
+        assert.deepStrictEqual(result.logGroupInfo, testComponents.logGroupInfo)
+        assert.deepStrictEqual(result.parameters, testComponents.parameters)
+    })
+
+    it('does not convert URIs with an invalid scheme', async function () {
+        assert.throws(() => {
+            cwlUriSchema.parse(vscode.Uri.parse('wrong:scheme'))
+        })
+    })
+
+    it('does not convert URIs with more or less than three elements', async function () {
+        assert.throws(() => {
+            cwlUriSchema.parse(vscode.Uri.parse(`${CLOUDWATCH_LOGS_SCHEME}:elementOne:elementTwo`))
+        })
+
+        assert.throws(() => {
+            cwlUriSchema.parse(
+                vscode.Uri.parse(`${CLOUDWATCH_LOGS_SCHEME}:elementOne:elementTwo:elementThree:whoopsAllElements`)
+            )
+        })
+    })
+})
+
+describe('createURIFromArgs', function () {
+    it('converts components to a valid URI that can be parsed.', function () {
+        const testUri = vscode.Uri.parse(
+            `${CLOUDWATCH_LOGS_SCHEME}:${testComponents.logGroupInfo.regionName}:${
+                testComponents.logGroupInfo.groupName
+            }:${testComponents.logGroupInfo.streamName}?${encodeURIComponent(
+                JSON.stringify(testComponents.parameters)
+            )}`
+        )
+        assert.deepStrictEqual(testUri, goodUri)
+        const newTestComponents = cwlUriSchema.parse(testUri)
+        assert.deepStrictEqual(testComponents, newTestComponents)
+    })
+})
+
+describe('uriToKey', function () {
+    let testUri: vscode.Uri
+    before(function () {
+        testUri = vscode.Uri.parse(
+            `${CLOUDWATCH_LOGS_SCHEME}:g:r
+            ?${encodeURIComponent(JSON.stringify(testComponents.parameters))}`
+        )
+    })
+
+    it('throws error if query not parsable', function () {
+        const badUri = vscode.Uri.parse(`${CLOUDWATCH_LOGS_SCHEME}:g:r?ThisIsNotAJson`)
+        assert.throws(() => uriToKey(badUri))
+    })
+
+    it('creates the same key for different order query', function () {
+        const param1: CloudWatchLogsParameters = { filterPattern: 'same', startTime: 0 }
+        const param2: CloudWatchLogsParameters = { startTime: 0, filterPattern: 'same' }
+        const firstOrder = cwlUriSchema.form({ logGroupInfo: testComponents.logGroupInfo, parameters: param1 })
+        const secondOrder = cwlUriSchema.form({ logGroupInfo: testComponents.logGroupInfo, parameters: param2 })
+
+        assert.notDeepStrictEqual(firstOrder, secondOrder)
+        assert.strictEqual(uriToKey(firstOrder), uriToKey(secondOrder))
+    })
+
+    it('creates unique strings for Uri with different parameters', function () {
+        const diffParameters = { streamName: 'NotIslandsInTheStream' }
+
+        const uriDiffParameters = vscode.Uri.parse(
+            `${CLOUDWATCH_LOGS_SCHEME}:g:r
+            ?${encodeURIComponent(JSON.stringify(diffParameters))}`
+        )
+
+        assert.notStrictEqual(uriToKey(testUri), uriToKey(uriDiffParameters))
+    })
+
+    it('creates unique strings for Uri with different log group info', function () {
+        const uriDiffGroup = vscode.Uri.parse(
+            `${CLOUDWATCH_LOGS_SCHEME}:g2:r2
+            ?${encodeURIComponent(JSON.stringify(testComponents.parameters))}`
+        )
+
+        assert.notStrictEqual(uriToKey(testUri), uriToKey(uriDiffGroup))
+    })
+})
+
+describe('findOccurrencesOf', function () {
+    it('finds correct number', async function () {
+        const testDoc1 = await vscode.workspace.openTextDocument({ content: 'Arr' })
+        const result1 = findOccurencesOf(testDoc1, 'rr')
+        const expected1 = [new vscode.Range(new vscode.Position(0, 1), new vscode.Position(0, 3))]
+
+        const testDoc2 = await vscode.workspace.openTextDocument({
+            content:
+                'Here is a bunch of text (here) \n and it even spans multiple lines (here) \n to make it more interesting (here) \n (here) because why not \n',
+        })
+        const result2 = findOccurencesOf(testDoc2, 'here')
+        const expected2 = [
+            new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 4)),
+            new vscode.Range(new vscode.Position(0, 25), new vscode.Position(0, 29)),
+            new vscode.Range(new vscode.Position(1, 35), new vscode.Position(1, 39)),
+            new vscode.Range(new vscode.Position(2, 30), new vscode.Position(2, 34)),
+            new vscode.Range(new vscode.Position(3, 2), new vscode.Position(3, 6)),
+        ]
+
+        const testDoc3 = await vscode.workspace.openTextDocument({ content: 'Here is a \n weird \n one\n zzz' })
+        const result3 = findOccurencesOf(testDoc3, 'zz')
+        const expected3 = [
+            new vscode.Range(new vscode.Position(3, 1), new vscode.Position(3, 3)),
+            new vscode.Range(new vscode.Position(3, 2), new vscode.Position(3, 4)),
+        ]
+
+        assert.deepStrictEqual(result1, expected1)
+        assert.deepStrictEqual(result2, expected2)
+        assert.deepStrictEqual(result3, expected3)
+    })
+})
diff --git a/packages/core/src/test/awsService/cloudWatchLogs/wizard/liveTailLogStreamSubmenu.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/wizard/liveTailLogStreamSubmenu.test.ts
new file mode 100644
index 00000000000..32946c38056
--- /dev/null
+++ b/packages/core/src/test/awsService/cloudWatchLogs/wizard/liveTailLogStreamSubmenu.test.ts
@@ -0,0 +1,78 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { LogStreamFilterSubmenu } from '../../../../awsService/cloudWatchLogs/wizard/liveTailLogStreamSubmenu'
+import { createQuickPickPrompterTester, QuickPickPrompterTester } from '../../../shared/ui/testUtils'
+import { getTestWindow } from '../../../shared/vscode/window'
+
+describe('liveTailLogStreamSubmenu', async function () {
+    let logStreamFilterSubmenu: LogStreamFilterSubmenu
+    let logStreamMenuPrompter: QuickPickPrompterTester<any>
+    const testRegion = 'us-east-1'
+    const testLogGroupArn = 'my-log-group-arn'
+
+    beforeEach(async function () {
+        logStreamFilterSubmenu = new LogStreamFilterSubmenu(testRegion, testLogGroupArn)
+        logStreamMenuPrompter = createQuickPickPrompterTester(logStreamFilterSubmenu.defaultPrompter)
+    })
+
+    describe('Menu prompter', async function () {
+        it('gives option for each filter type', async function () {
+            logStreamMenuPrompter.assertContainsItems(
+                'All Log Streams',
+                'Specific Log Stream',
+                'Log Streams matching prefix'
+            )
+            logStreamMenuPrompter.acceptItem('All Log Streams')
+            await logStreamMenuPrompter.result()
+        })
+    })
+
+    describe('LogStream Prefix Submenu', function () {
+        it('accepts valid input', async function () {
+            const validInput = 'my-log-stream'
+            getTestWindow().onDidShowInputBox((input) => {
+                input.acceptValue(validInput)
+            })
+            const inputBox = logStreamFilterSubmenu.createLogStreamPrefixBox()
+            const result = inputBox.prompt()
+            assert.strictEqual(await result, validInput)
+        })
+
+        it('rejects invalid input (:)', async function () {
+            const invalidInput = 'my-log-stream:'
+            getTestWindow().onDidShowInputBox((input) => {
+                input.acceptValue(invalidInput)
+                assert.deepEqual(input.validationMessage, 'Log Stream prefix must match pattern: [^:*]*')
+                input.hide()
+            })
+            const inputBox = logStreamFilterSubmenu.createLogStreamPrefixBox()
+            await inputBox.prompt()
+        })
+
+        it('rejects invalid input (*)', async function () {
+            const invalidInput = 'my-log-stream*'
+            getTestWindow().onDidShowInputBox((input) => {
+                input.acceptValue(invalidInput)
+                assert.deepEqual(input.validationMessage, 'Log Stream prefix must match pattern: [^:*]*')
+                input.hide()
+            })
+            const inputBox = logStreamFilterSubmenu.createLogStreamPrefixBox()
+            await inputBox.prompt()
+        })
+
+        it('rejects invalid input (length)', async function () {
+            const invalidInput = 'a'.repeat(520)
+            getTestWindow().onDidShowInputBox((input) => {
+                input.acceptValue(invalidInput)
+                assert.deepEqual(input.validationMessage, 'Log Stream prefix cannot be longer than 512 characters')
+                input.hide()
+            })
+            const inputBox = logStreamFilterSubmenu.createLogStreamPrefixBox()
+            await inputBox.prompt()
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/cloudWatchLogs/wizard/tailLogGroupWizard.test.ts b/packages/core/src/test/awsService/cloudWatchLogs/wizard/tailLogGroupWizard.test.ts
new file mode 100644
index 00000000000..2cae8b964b4
--- /dev/null
+++ b/packages/core/src/test/awsService/cloudWatchLogs/wizard/tailLogGroupWizard.test.ts
@@ -0,0 +1,67 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as sinon from 'sinon'
+
+import assert from 'assert'
+import { buildLogGroupArn, TailLogGroupWizard } from '../../../../awsService/cloudWatchLogs/wizard/tailLogGroupWizard'
+import { createWizardTester } from '../../../shared/wizards/wizardTestUtils'
+import { DefaultAwsContext } from '../../../../shared'
+
+describe('TailLogGroupWizard', async function () {
+    let sandbox: sinon.SinonSandbox
+
+    const testLogGroupName = 'testLogGroup'
+    const testRegion = 'testRegion'
+    const testAwsAccountId = '1234'
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('prompts regionLogGroup submenu first if context not provided', async function () {
+        const wizard = new TailLogGroupWizard()
+        const tester = await createWizardTester(wizard)
+        tester.regionLogGroupSubmenuResponse.assertShowFirst()
+        tester.logStreamFilter.assertShowSecond()
+        tester.filterPattern.assertShowThird()
+    })
+
+    it('skips regionLogGroup submenu if context provided', async function () {
+        sandbox.stub(DefaultAwsContext.prototype, 'getCredentialAccountId').returns(testAwsAccountId)
+        const wizard = new TailLogGroupWizard({
+            groupName: testLogGroupName,
+            regionName: testRegion,
+        })
+        const tester = await createWizardTester(wizard)
+        tester.regionLogGroupSubmenuResponse.assertDoesNotShow()
+        tester.logStreamFilter.assertShowFirst()
+        tester.filterPattern.assertShowSecond()
+    })
+
+    it('skips logStream filter when logStream info is provided', async function () {
+        sandbox.stub(DefaultAwsContext.prototype, 'getCredentialAccountId').returns(testAwsAccountId)
+        const wizard = new TailLogGroupWizard(
+            {
+                groupName: testLogGroupName,
+                regionName: testRegion,
+            },
+            { type: 'specific', filter: 'log-group-name' }
+        )
+        const tester = await createWizardTester(wizard)
+        tester.regionLogGroupSubmenuResponse.assertDoesNotShow()
+        tester.logStreamFilter.assertDoesNotShow()
+        tester.filterPattern.assertShowFirst()
+    })
+
+    it('builds LogGroup Arn properly', async function () {
+        sandbox.stub(DefaultAwsContext.prototype, 'getCredentialAccountId').returns(testAwsAccountId)
+        const arn = buildLogGroupArn(testLogGroupName, testRegion)
+        assert.strictEqual(arn, `arn:aws:logs:${testRegion}:${testAwsAccountId}:log-group:${testLogGroupName}`)
+    })
+})
diff --git a/packages/core/src/test/awsService/ec2/activation.test.ts b/packages/core/src/test/awsService/ec2/activation.test.ts
new file mode 100644
index 00000000000..a34d7cfc0cb
--- /dev/null
+++ b/packages/core/src/test/awsService/ec2/activation.test.ts
@@ -0,0 +1,48 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import { assertTelemetry } from '../../testUtil'
+import { Ec2InstanceNode } from '../../../awsService/ec2/explorer/ec2InstanceNode'
+import { Ec2ParentNode } from '../../../awsService/ec2/explorer/ec2ParentNode'
+import { Ec2Client } from '../../../shared/clients/ec2'
+import { Ec2Connecter } from '../../../awsService/ec2/model'
+import { PollingSet } from '../../../shared/utilities/pollingSet'
+
+describe('ec2 activation', function () {
+    let testNode: Ec2InstanceNode
+
+    before(function () {
+        const testRegion = 'test-region'
+        const testPartition = 'test-partition'
+        // Don't want to be polling here, that is tested in ../ec2ParentNode.test.ts
+        // disabled here for convenience (avoiding race conditions with timeout)
+        sinon.stub(PollingSet.prototype, 'add')
+        const testClient = new Ec2Client(testRegion)
+        const parentNode = new Ec2ParentNode(testRegion, testPartition, new Ec2Client(testRegion))
+        testNode = new Ec2InstanceNode(parentNode, testClient, testRegion, testPartition, {
+            InstanceId: 'testId',
+            LastSeenStatus: 'running',
+        })
+    })
+
+    after(function () {
+        sinon.restore()
+    })
+
+    it('telemetry', async function () {
+        const terminalStub = sinon.stub(Ec2Connecter.prototype, 'attemptToOpenEc2Terminal')
+        await vscode.commands.executeCommand('aws.ec2.openTerminal', testNode)
+
+        assertTelemetry('ec2_connectToInstance', { ec2ConnectionType: 'ssm' })
+        terminalStub.restore()
+
+        const stopInstanceStub = sinon.stub(Ec2Client.prototype, 'stopInstanceWithCancel')
+        await vscode.commands.executeCommand('aws.ec2.stopInstance', testNode)
+
+        assertTelemetry('ec2_changeState', { ec2InstanceState: 'stop' })
+        stopInstanceStub.restore()
+    })
+})
diff --git a/packages/core/src/test/awsService/ec2/commands.test.ts b/packages/core/src/test/awsService/ec2/commands.test.ts
new file mode 100644
index 00000000000..67974692bd2
--- /dev/null
+++ b/packages/core/src/test/awsService/ec2/commands.test.ts
@@ -0,0 +1,32 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { Ec2Selection } from '../../../awsService/ec2/prompter'
+import { Ec2ConnecterMap } from '../../../awsService/ec2/connectionManagerMap'
+
+describe('getConnectionManager', async function () {
+    let connectionManagers: Ec2ConnecterMap
+
+    beforeEach(function () {
+        connectionManagers = new Ec2ConnecterMap()
+    })
+
+    it('only creates new connection managers once for each region ', async function () {
+        const fakeSelection: Ec2Selection = {
+            region: 'region-1',
+            instanceId: 'fake-id',
+        }
+
+        const cm = connectionManagers.getOrInit(fakeSelection.region)
+        assert.strictEqual(connectionManagers.size, 1)
+
+        await cm.addActiveSession('sessionId', 'instanceId')
+
+        const cm2 = connectionManagers.getOrInit(fakeSelection.region)
+
+        assert.strictEqual(cm2.isConnectedTo('instanceId'), true)
+    })
+})
diff --git a/packages/core/src/test/awsService/ec2/ec2LogDocumentProvider.test.ts b/packages/core/src/test/awsService/ec2/ec2LogDocumentProvider.test.ts
new file mode 100644
index 00000000000..179008c7539
--- /dev/null
+++ b/packages/core/src/test/awsService/ec2/ec2LogDocumentProvider.test.ts
@@ -0,0 +1,39 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import { Ec2LogDocumentProvider } from '../../../awsService/ec2/ec2LogDocumentProvider'
+import { ec2LogsScheme } from '../../../shared/constants'
+import { Ec2Client } from '../../../shared/clients/ec2'
+
+describe('LogDataDocumentProvider', async function () {
+    let provider: Ec2LogDocumentProvider
+
+    before(function () {
+        provider = new Ec2LogDocumentProvider()
+    })
+
+    it('throws error on attempt to get content from other schemes', async function () {
+        const wrongSchemeUri = vscode.Uri.parse(`ec2-not:us-west1:id`)
+
+        await assert.rejects(async () => await provider.provideTextDocumentContent(wrongSchemeUri), {
+            message: `Invalid EC2 Logs URI: ${wrongSchemeUri.toString()}`,
+        })
+    })
+
+    it('fetches content for valid ec2 log URI', async function () {
+        const validUri = vscode.Uri.parse(`${ec2LogsScheme}:us-west1:instance1`)
+        const expectedContent = 'log content'
+        sinon.stub(Ec2Client.prototype, 'getConsoleOutput').resolves({
+            InstanceId: 'instance1',
+            Output: expectedContent,
+        })
+        const content = await provider.provideTextDocumentContent(validUri)
+        assert.strictEqual(content, expectedContent)
+        sinon.restore()
+    })
+})
diff --git a/packages/core/src/test/awsService/ec2/explorer/ec2InstanceNode.test.ts b/packages/core/src/test/awsService/ec2/explorer/ec2InstanceNode.test.ts
new file mode 100644
index 00000000000..3f97c2d3cd4
--- /dev/null
+++ b/packages/core/src/test/awsService/ec2/explorer/ec2InstanceNode.test.ts
@@ -0,0 +1,102 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import {
+    Ec2InstanceNode,
+    Ec2InstancePendingContext,
+    Ec2InstanceRunningContext,
+    Ec2InstanceStoppedContext,
+} from '../../../../awsService/ec2/explorer/ec2InstanceNode'
+import { Ec2Client, Ec2Instance, getNameOfInstance } from '../../../../shared/clients/ec2'
+import { Ec2ParentNode } from '../../../../awsService/ec2/explorer/ec2ParentNode'
+import * as sinon from 'sinon'
+import { PollingSet } from '../../../../shared/utilities/pollingSet'
+import { InstanceStateName } from '@aws-sdk/client-ec2'
+
+describe('ec2InstanceNode', function () {
+    let testNode: Ec2InstanceNode
+    let testInstance: Ec2Instance
+    const testRegion = 'testRegion'
+    const testPartition = 'testPartition'
+
+    before(function () {
+        testInstance = {
+            InstanceId: 'testId',
+            Tags: [
+                {
+                    Key: 'Name',
+                    Value: 'testName',
+                },
+            ],
+            LastSeenStatus: 'running',
+        }
+        sinon.stub(Ec2InstanceNode.prototype, 'updateStatus')
+        // Don't want to be polling here, that is tested in ../ec2ParentNode.test.ts
+        // disabled here for convenience (avoiding race conditions with timeout)
+        sinon.stub(PollingSet.prototype, 'add')
+        const testClient = new Ec2Client('')
+        const testParentNode = new Ec2ParentNode(testRegion, testPartition, testClient)
+        testNode = new Ec2InstanceNode(testParentNode, testClient, 'testRegion', 'testPartition', testInstance)
+    })
+
+    beforeEach(function () {
+        testNode.updateInstance(testInstance)
+    })
+
+    it('instantiates without issue', async function () {
+        assert.ok(testNode)
+    })
+
+    it('initializes the region code', async function () {
+        assert.strictEqual(testNode.regionCode, 'testRegion')
+    })
+
+    it('initializes the label', async function () {
+        assert.strictEqual(
+            testNode.label,
+            `${getNameOfInstance(testInstance)} (${testInstance.InstanceId}) ${testInstance.LastSeenStatus.toUpperCase()}`
+        )
+    })
+
+    it('initializes the functionName', async function () {
+        assert.strictEqual(testNode.name, getNameOfInstance(testInstance))
+    })
+
+    it('has no children', async function () {
+        const childNodes = await testNode.getChildren()
+        assert.ok(childNodes)
+        assert.strictEqual(childNodes.length, 0, 'Expected node to have no children')
+    })
+
+    it('has an EC2ParentNode as parent', async function () {
+        assert.ok(testNode.parent instanceof Ec2ParentNode)
+    })
+
+    it('intializes the client', async function () {
+        assert.ok(testNode.client instanceof Ec2Client)
+    })
+
+    it('sets context value based on status', async function () {
+        const stoppedInstance = { ...testInstance, LastSeenStatus: 'stopped' as InstanceStateName }
+        testNode.updateInstance(stoppedInstance)
+        assert.strictEqual(testNode.contextValue, Ec2InstanceStoppedContext)
+
+        const runningInstance = { ...testInstance, LastSeenStatus: 'running' as InstanceStateName }
+        testNode.updateInstance(runningInstance)
+        assert.strictEqual(testNode.contextValue, Ec2InstanceRunningContext)
+
+        const pendingInstance = { ...testInstance, LastSeenStatus: 'pending' as InstanceStateName }
+        testNode.updateInstance(pendingInstance)
+        assert.strictEqual(testNode.contextValue, Ec2InstancePendingContext)
+    })
+
+    it('updates status with new instance', async function () {
+        const newStatus = 'pending'
+        const newIdInstance = { ...testInstance, InstanceId: 'testId2', LastSeenStatus: newStatus as InstanceStateName }
+        testNode.updateInstance(newIdInstance)
+        assert.strictEqual(testNode.getStatus(), newStatus)
+    })
+})
diff --git a/packages/core/src/test/awsService/ec2/explorer/ec2ParentNode.test.ts b/packages/core/src/test/awsService/ec2/explorer/ec2ParentNode.test.ts
new file mode 100644
index 00000000000..72756722a1b
--- /dev/null
+++ b/packages/core/src/test/awsService/ec2/explorer/ec2ParentNode.test.ts
@@ -0,0 +1,212 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import { Ec2ParentNode } from '../../../../awsService/ec2/explorer/ec2ParentNode'
+import { Ec2Client, Ec2Instance } from '../../../../shared/clients/ec2'
+import {
+    assertNodeListOnlyHasErrorNode,
+    assertNodeListOnlyHasPlaceholderNode,
+} from '../../../utilities/explorerNodeAssertions'
+import { Ec2InstanceNode } from '../../../../awsService/ec2/explorer/ec2InstanceNode'
+import * as FakeTimers from '@sinonjs/fake-timers'
+import { installFakeClock } from '../../../testUtil'
+import { Filter } from '@aws-sdk/client-ec2'
+import { AsyncCollection } from '../../../../shared/utilities/asyncCollection'
+import { intoCollection } from '../../../../shared/utilities/collectionUtils'
+
+export const testInstance = {
+    InstanceId: 'testId',
+    Tags: [
+        {
+            Key: 'Name',
+            Value: 'testName',
+        },
+    ],
+    LastSeenStatus: 'running',
+} satisfies Ec2Instance
+export const testClient = new Ec2Client('')
+export const testParentNode = new Ec2ParentNode('fake-region', 'testPartition', testClient)
+
+describe('ec2ParentNode', function () {
+    let testNode: Ec2ParentNode
+    let client: Ec2Client
+    let getInstancesStub: sinon.SinonStub<[filters?: Filter[] | undefined], AsyncCollection<Ec2Instance[]>>
+    let clock: FakeTimers.InstalledClock
+    let refreshStub: sinon.SinonStub<[], Promise<void>>
+    let statusUpdateStub: sinon.SinonStub<[status: string], Promise<string>>
+    const testRegion = 'testRegion'
+    const testPartition = 'testPartition'
+
+    before(function () {
+        client = new Ec2Client(testRegion)
+        clock = installFakeClock()
+        refreshStub = sinon.stub(Ec2InstanceNode.prototype, 'refreshNode')
+        statusUpdateStub = sinon.stub(Ec2Client.prototype, 'getInstanceStatus')
+    })
+
+    beforeEach(function () {
+        getInstancesStub = sinon.stub(Ec2Client.prototype, 'getInstances')
+        testNode = new Ec2ParentNode(testRegion, testPartition, client)
+        refreshStub.resetHistory()
+    })
+
+    afterEach(function () {
+        getInstancesStub.restore()
+        testNode.pollingSet.clear()
+        testNode.pollingSet.clearTimer()
+    })
+
+    after(function () {
+        clock.uninstall()
+        sinon.restore()
+    })
+
+    it('returns placeholder node if no children are present', async function () {
+        getInstancesStub.returns(intoCollection([]))
+
+        const childNodes = await testNode.getChildren()
+        assertNodeListOnlyHasPlaceholderNode(childNodes)
+        getInstancesStub.restore()
+    })
+
+    it('has instance child nodes', async function () {
+        const instances = [
+            { Name: 'firstOne', InstanceId: '0', LastSeenStatus: 'running' },
+            { Name: 'secondOne', InstanceId: '1', LastSeenStatus: 'stopped' },
+        ] satisfies Ec2Instance[]
+        getInstancesStub.returns(intoCollection([instances]))
+        const childNodes = await testNode.getChildren()
+
+        assert.strictEqual(childNodes.length, instances.length, 'Unexpected child count')
+
+        for (const node of childNodes) {
+            assert.ok(node instanceof Ec2InstanceNode, 'Expected child node to be Ec2InstanceNode')
+        }
+
+        getInstancesStub.restore()
+    })
+
+    it('sorts child nodes', async function () {
+        const sortedText = ['aa', 'ab', 'bb', 'bc', 'cc', 'cd']
+        const instances = [
+            { Name: 'ab', InstanceId: '0', LastSeenStatus: 'running' },
+            { Name: 'bb', InstanceId: '1', LastSeenStatus: 'running' },
+            { Name: 'bc', InstanceId: '2', LastSeenStatus: 'running' },
+            { Name: 'aa', InstanceId: '3', LastSeenStatus: 'running' },
+            { Name: 'cc', InstanceId: '4', LastSeenStatus: 'running' },
+            { Name: 'cd', InstanceId: '5', LastSeenStatus: 'running' },
+        ] satisfies Ec2Instance[]
+
+        getInstancesStub.returns(intoCollection([instances]))
+
+        const childNodes = await testNode.getChildren()
+
+        const actualChildOrder = childNodes.map((node) => (node instanceof Ec2InstanceNode ? node.name : undefined))
+        assert.deepStrictEqual(actualChildOrder, sortedText, 'Unexpected child sort order')
+        getInstancesStub.restore()
+    })
+
+    it('has an error node for a child if an error happens during loading', async function () {
+        getInstancesStub.throws(new Error())
+        const node = new Ec2ParentNode(testRegion, testPartition, client)
+        assertNodeListOnlyHasErrorNode(await node.getChildren())
+        getInstancesStub.restore()
+    })
+
+    it('is able to handle children with duplicate names', async function () {
+        const instances = [
+            { Name: 'firstOne', InstanceId: '0', LastSeenStatus: 'running' },
+            { Name: 'secondOne', InstanceId: '1', LastSeenStatus: 'running' },
+            { Name: 'firstOne', InstanceId: '2', LastSeenStatus: 'running' },
+        ] satisfies Ec2Instance[]
+
+        getInstancesStub.returns(intoCollection([instances]))
+
+        const childNodes = await testNode.getChildren()
+        assert.strictEqual(childNodes.length, instances.length, 'Unexpected child count')
+        getInstancesStub.restore()
+    })
+
+    it('adds pending nodes to the polling nodes set', async function () {
+        const instances = [
+            { Name: 'firstOne', InstanceId: '0', LastSeenStatus: 'pending' },
+            { Name: 'secondOne', InstanceId: '1', LastSeenStatus: 'stopped' },
+            { Name: 'thirdOne', InstanceId: '2', LastSeenStatus: 'running' },
+        ] satisfies Ec2Instance[]
+
+        getInstancesStub.returns(intoCollection([instances]))
+        await testNode.updateChildren()
+        assert.strictEqual(testNode.pollingSet.size, 1)
+        getInstancesStub.restore()
+    })
+
+    it('does not refresh explorer when timer goes off if status unchanged', async function () {
+        statusUpdateStub = statusUpdateStub.resolves('pending')
+        const instances = [
+            { Name: 'firstOne', InstanceId: '0', LastSeenStatus: 'pending' },
+            { Name: 'secondOne', InstanceId: '1', LastSeenStatus: 'stopped' },
+            { Name: 'thirdOne', InstanceId: '2', LastSeenStatus: 'running' },
+        ] satisfies Ec2Instance[]
+
+        getInstancesStub.returns(intoCollection([instances]))
+
+        await testNode.updateChildren()
+        await clock.tickAsync(6000)
+        sinon.assert.notCalled(refreshStub)
+        getInstancesStub.restore()
+    })
+
+    it('does refresh explorer when timer goes and status changed', async function () {
+        statusUpdateStub = statusUpdateStub.resolves('running')
+        const instances = [{ Name: 'firstOne', InstanceId: '0', LastSeenStatus: 'pending' }] satisfies Ec2Instance[]
+
+        getInstancesStub.returns(intoCollection([instances]))
+        await testNode.updateChildren()
+
+        sinon.assert.notCalled(refreshStub)
+        await clock.tickAsync(6000)
+        sinon.assert.called(refreshStub)
+    })
+
+    it('returns the node when in the map', async function () {
+        const instances = [{ Name: 'firstOne', InstanceId: 'node1', LastSeenStatus: 'pending' }] satisfies Ec2Instance[]
+
+        getInstancesStub.returns(intoCollection([instances]))
+        await testNode.updateChildren()
+        const node = testNode.getInstanceNode('node1')
+        assert.strictEqual(node.InstanceId, instances[0].InstanceId)
+        getInstancesStub.restore()
+    })
+
+    it('throws error when node not in map', async function () {
+        const instances = [{ Name: 'firstOne', InstanceId: 'node1', LastSeenStatus: 'pending' }] satisfies Ec2Instance[]
+
+        getInstancesStub.returns(intoCollection([instances]))
+        await testNode.updateChildren()
+        assert.throws(() => testNode.getInstanceNode('node2'))
+        getInstancesStub.restore()
+    })
+
+    it('adds node to polling set when asked to track it', async function () {
+        const instances = [{ Name: 'firstOne', InstanceId: 'node1', LastSeenStatus: 'pending' }] satisfies Ec2Instance[]
+
+        getInstancesStub.returns(intoCollection([instances]))
+        await testNode.updateChildren()
+        testNode.trackPendingNode('node1')
+        assert.strictEqual(testNode.pollingSet.size, 1)
+        getInstancesStub.restore()
+    })
+
+    it('throws error when asked to track non-child node', async function () {
+        const instances = [{ Name: 'firstOne', InstanceId: 'node1', LastSeenStatus: 'pending' }] satisfies Ec2Instance[]
+
+        getInstancesStub.returns(intoCollection([instances]))
+        await testNode.updateChildren()
+        assert.throws(() => testNode.trackPendingNode('node2'))
+        getInstancesStub.restore()
+    })
+})
diff --git a/packages/core/src/test/awsService/ec2/model.test.ts b/packages/core/src/test/awsService/ec2/model.test.ts
new file mode 100644
index 00000000000..5497236bbd7
--- /dev/null
+++ b/packages/core/src/test/awsService/ec2/model.test.ts
@@ -0,0 +1,318 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import { Ec2Connecter, getRemoveLinesCommand } from '../../../awsService/ec2/model'
+import { SsmClient } from '../../../shared/clients/ssm'
+import { Ec2Client } from '../../../shared/clients/ec2'
+import { Ec2Selection } from '../../../awsService/ec2/prompter'
+import { ToolkitError } from '../../../shared/errors'
+import { SshKeyPair } from '../../../awsService/ec2/sshKeyPair'
+import { IamClient, IamRole } from '../../../shared/clients/iam'
+import { assertNoTelemetryMatch, createTestWorkspaceFolder } from '../../testUtil'
+import { fs } from '../../../shared'
+import path from 'path'
+import { ChildProcess } from '../../../shared/utilities/processUtils'
+import { isMac, isWin } from '../../../shared/vscode/env'
+import { inspect } from '../../../shared/utilities/collectionUtils'
+import { assertLogsContain } from '../../globalSetup.test'
+import { InstanceStateName } from '@aws-sdk/client-ec2'
+
+describe('Ec2ConnectClient', function () {
+    let client: Ec2Connecter
+
+    before(function () {
+        client = new Ec2Connecter('test-region')
+    })
+
+    describe('getAttachedIamRole', async function () {
+        it('only returns role if receives ARN from instance profile', async function () {
+            let role: IamRole | undefined
+            const getInstanceProfileStub = sinon.stub(Ec2Client.prototype, 'getAttachedIamInstanceProfile')
+
+            getInstanceProfileStub.resolves({ Arn: 'thisIsAnArn' })
+            sinon
+                .stub(IamClient.prototype, 'getIAMRoleFromInstanceProfile')
+                .resolves(createRoleWithArn('ThisIsARoleArn'))
+
+            role = await client.getAttachedIamRole('test-instance')
+            assert.ok(role)
+            assert.ok(role.Arn)
+
+            getInstanceProfileStub.resolves({})
+            role = await client.getAttachedIamRole('test-instance')
+            assert.strictEqual(role, undefined)
+            sinon.restore()
+        })
+    })
+
+    describe('hasProperPermissions', async function () {
+        it('throws error when sdk throws error', async function () {
+            sinon.stub(IamClient.prototype, 'simulatePrincipalPolicy').throws(new ToolkitError('error'))
+
+            try {
+                await client.hasProperPermissions('')
+                assert.ok(false)
+            } catch {
+                assert.ok(true)
+            }
+
+            sinon.restore()
+        })
+    })
+
+    describe('isInstanceRunning', async function () {
+        it('only returns true with the instance is running', async function () {
+            sinon
+                .stub(Ec2Client.prototype, 'getInstanceStatus')
+                .callsFake(async (input: string) => input.split(':')[0] as InstanceStateName)
+
+            const actualFirstResult = await client.isInstanceRunning('running:instance')
+            const actualSecondResult = await client.isInstanceRunning('stopped:instance')
+
+            assert.strictEqual(true, actualFirstResult)
+            assert.strictEqual(false, actualSecondResult)
+            sinon.restore()
+        })
+    })
+
+    describe('handleStartSessionError', async function () {
+        let instanceSelection: Ec2Selection
+
+        before(function () {
+            instanceSelection = { instanceId: 'testInstance', region: 'testRegion' }
+        })
+
+        afterEach(function () {
+            sinon.restore()
+        })
+
+        it('throws EC2SSMStatus error if instance is not running', async function () {
+            sinon.stub(Ec2Connecter.prototype, 'isInstanceRunning').resolves(false)
+
+            try {
+                await client.checkForStartSessionError(instanceSelection)
+                assert.ok(false)
+            } catch (err) {
+                assert.strictEqual((err as ToolkitError).code, 'EC2SSMStatus')
+            }
+        })
+
+        it('throws EC2SSMPermission error if instance is running but has no role', async function () {
+            sinon.stub(Ec2Connecter.prototype, 'isInstanceRunning').resolves(true)
+            sinon.stub(Ec2Connecter.prototype, 'getAttachedIamRole').resolves(undefined)
+
+            try {
+                await client.checkForStartSessionError(instanceSelection)
+                assert.ok(false)
+            } catch (err) {
+                assert.strictEqual((err as ToolkitError).code, 'EC2SSMPermission')
+            }
+        })
+
+        it('throws EC2SSMAgent error if instance is running and has IAM Role, but agent is not running', async function () {
+            sinon.stub(Ec2Connecter.prototype, 'isInstanceRunning').resolves(true)
+            sinon.stub(Ec2Connecter.prototype, 'getAttachedIamRole').resolves(createRoleWithArn('testRole'))
+            sinon.stub(Ec2Connecter.prototype, 'hasProperPermissions').resolves(true)
+            sinon.stub(SsmClient.prototype, 'getInstanceAgentPingStatus').resolves('offline')
+
+            try {
+                await client.checkForStartSessionError(instanceSelection)
+                assert.ok(false)
+            } catch (err) {
+                assert.strictEqual((err as ToolkitError).code, 'EC2SSMAgentStatus')
+            }
+        })
+
+        it('retries if agent status is not online', async function () {
+            const instanceAgentStatus = sinon.stub(SsmClient.prototype, 'getInstanceAgentPingStatus')
+            instanceAgentStatus.onFirstCall().resolves('Offline')
+            instanceAgentStatus.onSecondCall().resolves('Online')
+            try {
+                await client.checkForInstanceSsmError(instanceSelection, { interval: 10, timeout: 100 })
+            } catch (err) {
+                assert.ok(false, `checkForInstanceSsmError failed with error '${err}'`)
+            }
+        })
+
+        it('does not throw an error if all checks pass', async function () {
+            sinon.stub(Ec2Connecter.prototype, 'isInstanceRunning').resolves(true)
+            sinon.stub(Ec2Connecter.prototype, 'getAttachedIamRole').resolves(createRoleWithArn('testRole'))
+            sinon.stub(Ec2Connecter.prototype, 'hasProperPermissions').resolves(true)
+            sinon.stub(SsmClient.prototype, 'getInstanceAgentPingStatus').resolves('Online')
+
+            assert.doesNotThrow(async () => await client.checkForStartSessionError(instanceSelection))
+        })
+    })
+
+    describe('sendSshKeysToInstance', async function () {
+        it('calls the sdk with the proper parameters', async function () {
+            const sendCommandStub = sinon.stub(SsmClient.prototype, 'sendCommandAndWait')
+
+            const testSelection = {
+                instanceId: 'test-id',
+                region: 'test-region',
+            }
+
+            const keys = await SshKeyPair.getSshKeyPair('key', 30000)
+            await client.sendSshKeyToInstance(testSelection, keys, { name: 'test-user', os: 'Amazon Linux' })
+            sinon.assert.calledWith(sendCommandStub, testSelection.instanceId, 'AWS-RunShellScript')
+            sinon.restore()
+        })
+
+        it('avoids writing the keys to any telemetry metrics', async function () {
+            sinon.stub(SsmClient.prototype, 'sendCommandAndWait')
+
+            const testSelection = {
+                instanceId: 'test-id',
+                region: 'test-region',
+            }
+            const testWorkspaceFolder = await createTestWorkspaceFolder()
+            const keys = await SshKeyPair.getSshKeyPair('key', 60000)
+            await client.sendSshKeyToInstance(testSelection, keys, { name: 'test-user', os: 'Amazon Linux' })
+            const privKey = await fs.readFileText(keys.getPrivateKeyPath())
+            assertNoTelemetryMatch(privKey)
+            sinon.restore()
+
+            await keys.delete()
+            await fs.delete(testWorkspaceFolder.uri, { force: true })
+        })
+    })
+
+    describe('getRemoteUser', async function () {
+        let getTargetPlatformNameStub: sinon.SinonStub<[target: string], Promise<string>>
+
+        before(async function () {
+            getTargetPlatformNameStub = sinon.stub(SsmClient.prototype, 'getTargetPlatformName')
+        })
+
+        after(async function () {
+            sinon.restore()
+        })
+
+        it('identifies the user for ubuntu as ubuntu', async function () {
+            getTargetPlatformNameStub.resolves('Ubuntu')
+            const remoteUser = await client.getRemoteUser('testInstance')
+            assert.strictEqual(remoteUser.name, 'ubuntu')
+        })
+
+        it('identifies the user for amazon linux as ec2-user', async function () {
+            getTargetPlatformNameStub.resolves('Amazon Linux')
+            const remoteUser = await client.getRemoteUser('testInstance')
+            assert.strictEqual(remoteUser.name, 'ec2-user')
+        })
+
+        it('throws error when not given known OS', async function () {
+            getTargetPlatformNameStub.resolves('ThisIsNotARealOs!')
+            try {
+                await client.getRemoteUser('testInstance')
+                assert.ok(false)
+            } catch (exception) {
+                assert.ok(true)
+            }
+        })
+    })
+
+    describe('tryCleanKeys', async function () {
+        it('calls the sdk with the proper parameters', async function () {
+            const sendCommandStub = sinon.stub(SsmClient.prototype, 'sendCommandAndWait')
+
+            const testSelection = {
+                instanceId: 'test-id',
+                region: 'test-region',
+            }
+
+            await client.tryCleanKeys(testSelection.instanceId, 'hint', 'macOS', 'path/to/keys')
+            sendCommandStub.calledWith(testSelection.instanceId, 'AWS-RunShellScript', {
+                commands: [getRemoveLinesCommand('hint', 'macOS', 'path/to/keys')],
+            })
+            sinon.assert.calledWith(sendCommandStub, testSelection.instanceId, 'AWS-RunShellScript')
+            sinon.restore()
+        })
+
+        it('logs warning when sdk call fails', async function () {
+            const sendCommandStub = sinon
+                .stub(SsmClient.prototype, 'sendCommandAndWait')
+                .throws(new ToolkitError('error'))
+
+            const testSelection = {
+                instanceId: 'test-id',
+                region: 'test-region',
+            }
+
+            await client.tryCleanKeys(testSelection.instanceId, 'hint', 'macOS', 'path/to/keys')
+            sinon.assert.calledWith(sendCommandStub, testSelection.instanceId, 'AWS-RunShellScript', {
+                commands: [getRemoveLinesCommand('hint', 'macOS', 'path/to/keys')],
+            })
+            sinon.restore()
+            assertLogsContain('failed to clean keys', false, 'warn')
+        })
+    })
+})
+
+describe('getRemoveLinesCommand', async function () {
+    let tempPath: { uri: { fsPath: string } }
+
+    before(async function () {
+        tempPath = await createTestWorkspaceFolder()
+    })
+
+    after(async function () {
+        await fs.delete(tempPath.uri.fsPath, { recursive: true, force: true })
+    })
+
+    it('removes lines containing pattern', async function () {
+        if (isWin()) {
+            this.skip()
+        }
+        // For the test, we only need to distinguish mac and linux
+        const hostOS = isMac() ? 'macOS' : 'Amazon Linux'
+        const lines = ['line1', 'line2 pattern', 'line3', 'line4 pattern', 'line5', 'line6 pattern', 'line7']
+        const expected = ['line1', 'line3', 'line5', 'line7']
+
+        const lineToStr = (ls: string[]) => ls.join('\n') + '\n'
+
+        const textFile = path.join(tempPath.uri.fsPath, 'test.txt')
+        const originalContent = lineToStr(lines)
+        await fs.writeFile(textFile, originalContent)
+        const [command, ...args] = getRemoveLinesCommand('pattern', hostOS, textFile).split(' ')
+        const process = new ChildProcess(command, args, { collect: true })
+        const result = await process.run()
+        assert.strictEqual(
+            result.exitCode,
+            0,
+            `Ran command '${command} ${args.join(' ')}' and failed with result ${inspect(result)}`
+        )
+
+        const newContent = await fs.readFileText(textFile)
+        assert.notStrictEqual(newContent, originalContent)
+        assert.strictEqual(newContent, lineToStr(expected))
+    })
+
+    it('includes empty extension on macOS only', async function () {
+        const macCommand = getRemoveLinesCommand('pattern', 'macOS', 'test.txt')
+        const alCommand = getRemoveLinesCommand('pattern', 'Amazon Linux', 'test.txt')
+        const ubuntuCommand = getRemoveLinesCommand('pattern', 'Ubuntu', 'test.txt')
+
+        assert.ok(macCommand.includes("''"))
+        assert.ok(!alCommand.includes("''"))
+        assert.strictEqual(ubuntuCommand, alCommand)
+    })
+
+    it('throws when given invalid pattern', function () {
+        assert.throws(() => getRemoveLinesCommand('pat/tern', 'macOS', 'test.txt'))
+    })
+})
+
+function createRoleWithArn(Arn: string) {
+    return {
+        RoleName: 'hasArn',
+        Arn,
+        Path: 'thisIsAPath',
+        RoleId: '1',
+        CreateDate: new Date(),
+    }
+}
diff --git a/packages/core/src/test/awsService/ec2/prompter.test.ts b/packages/core/src/test/awsService/ec2/prompter.test.ts
new file mode 100644
index 00000000000..df73f1f3583
--- /dev/null
+++ b/packages/core/src/test/awsService/ec2/prompter.test.ts
@@ -0,0 +1,168 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import * as sinon from 'sinon'
+import { Ec2Prompter, getSelection } from '../../../awsService/ec2/prompter'
+import { Ec2Instance } from '../../../shared/clients/ec2'
+import { RegionSubmenuResponse } from '../../../shared/ui/common/regionSubmenu'
+import { Ec2Selection } from '../../../awsService/ec2/prompter'
+import { Ec2InstanceNode } from '../../../awsService/ec2/explorer/ec2InstanceNode'
+import { testClient, testInstance, testParentNode } from './explorer/ec2ParentNode.test'
+import { intoCollection } from '../../../shared/utilities/collectionUtils'
+import { AsyncCollection } from '../../../shared/utilities/asyncCollection'
+import { DataQuickPickItem } from '../../../shared/ui/pickerPrompter'
+import { getTestWindow } from '../../shared/vscode/window'
+import { CancellationError } from '../../../shared/utilities/timeoutUtils'
+
+describe('Ec2Prompter', async function () {
+    const defaultInstances: Ec2Instance[][] = [
+        [
+            {
+                InstanceId: '1',
+                Name: 'first',
+                LastSeenStatus: 'running',
+            },
+            {
+                InstanceId: '2',
+                Name: 'second',
+                LastSeenStatus: 'running',
+            },
+        ],
+        [
+            {
+                InstanceId: '3',
+                Name: 'third',
+                LastSeenStatus: 'running',
+            },
+        ],
+    ]
+
+    const defaultQuickPickItems: DataQuickPickItem<string>[] = [
+        {
+            label: Ec2Prompter.getLabel(defaultInstances[0][0]),
+            detail: defaultInstances[0][0].InstanceId,
+            data: defaultInstances[0][0].InstanceId,
+        },
+        {
+            label: Ec2Prompter.getLabel(defaultInstances[0][1]),
+            detail: defaultInstances[0][1].InstanceId,
+            data: defaultInstances[0][1].InstanceId,
+        },
+        {
+            label: Ec2Prompter.getLabel(defaultInstances[1][0]),
+            detail: defaultInstances[1][0].InstanceId,
+            data: defaultInstances[1][0].InstanceId,
+        },
+    ]
+    const defaultGetInstances: (regionCode: string) => AsyncCollection<Ec2Instance[]> = (_) =>
+        intoCollection(defaultInstances)
+
+    it('initializes properly', function () {
+        const prompter = new Ec2Prompter()
+        assert.ok(prompter)
+    })
+
+    it('does not show items, when no instances returned', async function () {
+        const prompter = new Ec2Prompter({ getInstancesFromRegion: (_) => intoCollection([]) })
+        getTestWindow().onDidShowQuickPick(async (qp) => {
+            await qp.untilReady()
+            assert.deepStrictEqual(qp.items.slice(3), [])
+            qp.hide()
+        })
+        await assert.rejects(async () => await prompter.promptUser(), CancellationError)
+    })
+
+    it('shows all items when no filter', async function () {
+        const prompter = new Ec2Prompter({ getInstancesFromRegion: defaultGetInstances })
+        getTestWindow().onDidShowQuickPick(async (qp) => {
+            await qp.untilReady()
+            qp.assertContainsItems(...defaultQuickPickItems)
+            qp.acceptItem(defaultQuickPickItems[0].label)
+        })
+        await prompter.promptUser()
+    })
+
+    it('shows filtered items when filter present', async function () {
+        const prompter = new Ec2Prompter({
+            getInstancesFromRegion: defaultGetInstances,
+            instanceFilter: (i) => parseInt(i.InstanceId) % 2 === 1,
+        })
+
+        getTestWindow().onDidShowQuickPick(async (qp) => {
+            await qp.untilReady()
+            qp.assertContainsItems(defaultQuickPickItems[0], defaultQuickPickItems[2])
+            qp.acceptItem(defaultQuickPickItems[0].label)
+        })
+        await prompter.promptUser()
+    })
+
+    describe('asQuickPickItem', async function () {
+        const testQuickPick = (instance: Ec2Instance) => {
+            assert.deepStrictEqual(Ec2Prompter.asQuickPickItem(instance), {
+                label: Ec2Prompter.getLabel(instance),
+                detail: instance.InstanceId,
+                data: instance.InstanceId,
+            })
+        }
+
+        it('returns QuickPickItem for named instances', function () {
+            testQuickPick({
+                Name: 'testName',
+                InstanceId: 'testInstanceId',
+                LastSeenStatus: 'running',
+            })
+        })
+
+        it('returns QuickPickItem for non-named instances', function () {
+            testQuickPick({
+                InstanceId: 'testInstanceId',
+                LastSeenStatus: 'running',
+            })
+        })
+    })
+
+    describe('handleEc2ConnectPrompterResponse', function () {
+        it('returns correctly formatted Ec2Selection', function () {
+            const testResponse: RegionSubmenuResponse<string> = {
+                region: 'test-region',
+                data: 'testInstance',
+            }
+
+            const result = Ec2Prompter.getSelectionFromResponse(testResponse)
+            const expected: Ec2Selection = {
+                instanceId: testResponse.data,
+                region: testResponse.region,
+            }
+
+            assert.deepStrictEqual(result, expected)
+        })
+    })
+
+    describe('getSelection', async function () {
+        it('uses node when passed', async function () {
+            const prompterStub = sinon.stub(Ec2Prompter.prototype, 'promptUser')
+            const testNode = new Ec2InstanceNode(
+                testParentNode,
+                testClient,
+                'testRegion',
+                'testPartition',
+                testInstance
+            )
+            const result = await getSelection(testNode)
+
+            assert.strictEqual(result.instanceId, testNode.toSelection().instanceId)
+            assert.strictEqual(result.region, testNode.toSelection().region)
+            sinon.assert.notCalled(prompterStub)
+            prompterStub.restore()
+        })
+
+        it('prompts user when no node is passed', async function () {
+            const prompterStub = sinon.stub(Ec2Prompter.prototype, 'promptUser')
+            await getSelection()
+            sinon.assert.calledOnce(prompterStub)
+            prompterStub.restore()
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/ec2/remoteSessionManager.test.ts b/packages/core/src/test/awsService/ec2/remoteSessionManager.test.ts
new file mode 100644
index 00000000000..48d273e416c
--- /dev/null
+++ b/packages/core/src/test/awsService/ec2/remoteSessionManager.test.ts
@@ -0,0 +1,56 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import { Ec2SessionTracker } from '../../../awsService/ec2/remoteSessionManager'
+import { SsmClient } from '../../../shared/clients/ssm'
+
+describe('Ec2RemoteSessionManager', async function () {
+    it('maintains connections to instances', async function () {
+        const envManager = new Ec2SessionTracker('test-region', new SsmClient('test-region'))
+        await envManager.addSession('test-instance', 'test-env')
+        await envManager.addSession('test-instance2', 'test-env2')
+        await envManager.addSession('test-instance3', 'test-env3')
+
+        assert(envManager.isConnectedTo('test-instance'))
+        assert(envManager.isConnectedTo('test-instance2'))
+        assert(envManager.isConnectedTo('test-instance3'))
+        assert(!envManager.isConnectedTo('test-instance4'))
+    })
+
+    it('only allows for single connection with any given instance', async function () {
+        const envManager = new Ec2SessionTracker('test-region', new SsmClient('test-region'))
+        const terminateStub = sinon.stub(SsmClient.prototype, 'terminateSessionFromId')
+
+        await envManager.addSession('test-instance', 'test-env')
+        sinon.assert.notCalled(terminateStub)
+        await envManager.addSession('test-instance', 'test-env2')
+
+        sinon.assert.calledWith(terminateStub, 'test-env')
+
+        assert(envManager.isConnectedTo('test-instance'))
+
+        terminateStub.restore()
+    })
+
+    it('closes all active connections', async function () {
+        const envManager = new Ec2SessionTracker('test-region', new SsmClient('test-region'))
+        const terminateStub = sinon.stub(SsmClient.prototype, 'terminateSessionFromId')
+
+        await envManager.addSession('test-instance', 'test-env')
+        await envManager.addSession('test-instance2', 'test-env2')
+        await envManager.addSession('test-instance3', 'test-env3')
+
+        await envManager.dispose()
+
+        sinon.assert.calledThrice(terminateStub)
+        assert(!envManager.isConnectedTo('test-instance'))
+        assert(!envManager.isConnectedTo('test-instance2'))
+        assert(!envManager.isConnectedTo('test-instance3'))
+
+        terminateStub.restore()
+    })
+})
diff --git a/packages/core/src/test/awsService/ec2/sshKeyPair.test.ts b/packages/core/src/test/awsService/ec2/sshKeyPair.test.ts
new file mode 100644
index 00000000000..144f436e319
--- /dev/null
+++ b/packages/core/src/test/awsService/ec2/sshKeyPair.test.ts
@@ -0,0 +1,149 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import nodefs from 'fs' // eslint-disable-line no-restricted-imports
+import * as sinon from 'sinon'
+import * as os from 'os'
+import { SshKeyPair } from '../../../awsService/ec2/sshKeyPair'
+import { installFakeClock } from '../../testUtil'
+import { InstalledClock } from '@sinonjs/fake-timers'
+import { ChildProcess } from '../../../shared/utilities/processUtils'
+import { fs, globals } from '../../../shared'
+
+describe('SshKeyPair', async function () {
+    let clock: InstalledClock
+    let keyPair: SshKeyPair
+    let keyName: string
+
+    before(async function () {
+        clock = installFakeClock()
+    })
+
+    beforeEach(async function () {
+        keyName = 'testKeyPair'
+        keyPair = await SshKeyPair.getSshKeyPair(keyName, 30000)
+    })
+
+    afterEach(async function () {
+        await keyPair.delete()
+    })
+
+    after(async function () {
+        clock.uninstall()
+        sinon.restore()
+    })
+
+    it('generates key in target file', async function () {
+        const contents = await fs.readFileBytes(keyPair.getPrivateKeyPath())
+        assert.notStrictEqual(contents.length, 0)
+    })
+
+    it('generates unique key each time', async function () {
+        const keyPair2 = await SshKeyPair.getSshKeyPair(`${keyName}2`, 30000)
+        const content1 = await fs.readFileBytes(keyPair2.getPrivateKeyPath())
+        const content2 = await fs.readFileBytes(keyPair.getPrivateKeyPath())
+        assert.notStrictEqual(content1, content2)
+        await keyPair2.delete()
+    })
+
+    it('sets permission of the file to read/write owner', async function () {
+        if (!globals.isWeb && os.platform() !== 'win32') {
+            const result = nodefs.statSync(keyPair.getPrivateKeyPath())
+            assert.strictEqual(result.mode & 0o777, 0o600)
+        }
+    })
+
+    it('defaults to ed25519 key type', async function () {
+        const process = new ChildProcess(`ssh-keygen`, ['-vvv', '-l', '-f', keyPair.getPrivateKeyPath()])
+        const result = await process.run()
+        // Check private key header for algorithm name
+        assert.strictEqual(result.stdout.includes('[ED25519 256]'), true)
+    })
+
+    it('falls back on rsa if ed25519 not available', async function () {
+        await keyPair.delete()
+        const stub = sinon.stub(SshKeyPair, 'tryKeyGen')
+        stub.onFirstCall().resolves(false)
+        stub.callThrough()
+        const rsaKey = await SshKeyPair.getSshKeyPair('rsa', 30000)
+        const process = new ChildProcess(`ssh-keygen`, ['-vvv', '-l', '-f', rsaKey.getPrivateKeyPath()])
+        const result = await process.run()
+        // Check private key header for algorithm name
+        assert.strictEqual(result.stdout.includes('[RSA'), true)
+        stub.restore()
+    })
+
+    it('reads in public ssh key that is non-empty', async function () {
+        const key = await keyPair.getPublicKey()
+        assert.notStrictEqual(key.length, 0)
+    })
+
+    it('does overwrite existing keys on get call', async function () {
+        const generateStub = sinon.spy(SshKeyPair, 'generateSshKeyPair')
+        const keyBefore = await fs.readFileBytes(keyPair.getPrivateKeyPath())
+        keyPair = await SshKeyPair.getSshKeyPair(keyName, 30000)
+
+        const keyAfter = await fs.readFileBytes(keyPair.getPrivateKeyPath())
+        sinon.assert.calledOnce(generateStub)
+
+        assert.notStrictEqual(keyBefore, keyAfter)
+        sinon.restore()
+    })
+
+    it('deletes key on delete', async function () {
+        const pubKeyExistsBefore = await fs.existsFile(keyPair.getPublicKeyPath())
+        const privateKeyExistsBefore = await fs.existsFile(keyPair.getPrivateKeyPath())
+
+        await keyPair.delete()
+
+        const pubKeyExistsAfter = await fs.existsFile(keyPair.getPublicKeyPath())
+        const privateKeyExistsAfter = await fs.existsFile(keyPair.getPrivateKeyPath())
+
+        assert.strictEqual(pubKeyExistsBefore && privateKeyExistsBefore, true)
+        assert.strictEqual(pubKeyExistsAfter && privateKeyExistsAfter, false)
+        assert(keyPair.isDeleted())
+    })
+
+    it('deletes keys after timeout', async function () {
+        // Stub methods interacting with file system to avoid flaky test.
+        sinon.stub(SshKeyPair, 'generateSshKeyPair')
+        const deleteStub = sinon.stub(SshKeyPair.prototype, 'delete')
+
+        keyPair = await SshKeyPair.getSshKeyPair(keyName, 50)
+        await clock.tickAsync(10)
+        sinon.assert.notCalled(deleteStub)
+        await clock.tickAsync(100)
+        sinon.assert.calledOnce(deleteStub)
+        sinon.restore()
+    })
+
+    it('determines deleted status based on file system', async function () {
+        await fs.delete(keyPair.getPrivateKeyPath())
+        await fs.delete(keyPair.getPublicKeyPath())
+
+        assert(keyPair.isDeleted())
+    })
+
+    describe('isDeleted', async function () {
+        it('returns false if key files exist', async function () {
+            assert.strictEqual(await keyPair.isDeleted(), false)
+        })
+
+        it('returns true if key files do not exist', async function () {
+            await keyPair.delete()
+            assert.strictEqual(await keyPair.isDeleted(), true)
+        })
+
+        it('returns true if private key remains', async function () {
+            await fs.delete(keyPair.getPublicKeyPath())
+            assert.strictEqual(await keyPair.isDeleted(), true)
+        })
+
+        it('returns true if public key remains', async function () {
+            await fs.delete(keyPair.getPrivateKeyPath())
+            assert.strictEqual(await keyPair.isDeleted(), true)
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/ec2/utils.test.ts b/packages/core/src/test/awsService/ec2/utils.test.ts
new file mode 100644
index 00000000000..15e2fb26357
--- /dev/null
+++ b/packages/core/src/test/awsService/ec2/utils.test.ts
@@ -0,0 +1,55 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import { Ec2Instance } from '../../../shared/clients/ec2'
+import { getIconCode } from '../../../awsService/ec2/utils'
+import { DefaultAwsContext } from '../../../shared'
+
+describe('utils', async function () {
+    before(function () {
+        sinon.stub(DefaultAwsContext.prototype, 'getCredentialAccountId')
+    })
+
+    after(function () {
+        sinon.restore()
+    })
+
+    describe('getIconCode', function () {
+        it('gives code based on status', function () {
+            const runningInstance: Ec2Instance = {
+                InstanceId: 'X',
+                LastSeenStatus: 'running',
+            }
+            const stoppedInstance: Ec2Instance = {
+                InstanceId: 'XX',
+                LastSeenStatus: 'stopped',
+            }
+            const terminatedInstance: Ec2Instance = {
+                InstanceId: 'XXX',
+                LastSeenStatus: 'terminated',
+            }
+
+            assert.strictEqual(getIconCode(runningInstance), 'pass')
+            assert.strictEqual(getIconCode(stoppedInstance), 'circle-slash')
+            assert.strictEqual(getIconCode(terminatedInstance), 'stop')
+        })
+
+        it('defaults to loading~spin', function () {
+            const pendingInstance: Ec2Instance = {
+                InstanceId: 'X',
+                LastSeenStatus: 'pending',
+            }
+            const stoppingInstance: Ec2Instance = {
+                InstanceId: 'XX',
+                LastSeenStatus: 'shutting-down',
+            }
+
+            assert.strictEqual(getIconCode(pendingInstance), 'loading~spin')
+            assert.strictEqual(getIconCode(stoppingInstance), 'loading~spin')
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/ecr/commands/copyRepositoryUri.test.ts b/packages/core/src/test/awsService/ecr/commands/copyRepositoryUri.test.ts
new file mode 100644
index 00000000000..36dd78843ba
--- /dev/null
+++ b/packages/core/src/test/awsService/ecr/commands/copyRepositoryUri.test.ts
@@ -0,0 +1,34 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { EcrRepositoryNode } from '../../../../awsService/ecr/explorer/ecrRepositoryNode'
+import { EcrNode } from '../../../../awsService/ecr/explorer/ecrNode'
+import { EcrClient, EcrRepository } from '../../../../shared/clients/ecrClient'
+import { copyRepositoryUri } from '../../../../awsService/ecr/commands/copyRepositoryUri'
+import { getTestWindow } from '../../../shared/vscode/window'
+import { FakeClipboard } from '../../../shared/vscode/fakeEnv'
+
+describe('copyUriCommand', function () {
+    beforeEach(function () {
+        const fakeClipboard = new FakeClipboard()
+        sinon.stub(vscode.env, 'clipboard').value(fakeClipboard)
+    })
+
+    it('Copies URI to clipboard and shows in the status bar', async function () {
+        const node = new EcrRepositoryNode(
+            {} as EcrNode,
+            {} as EcrClient,
+            { repositoryUri: 'www.amazon.com' } as EcrRepository
+        )
+
+        await copyRepositoryUri(node)
+
+        assert.strictEqual(await vscode.env.clipboard.readText(), 'www.amazon.com')
+        assert.deepStrictEqual(getTestWindow().statusBar.messages, ['$(clippy) Copied URI to clipboard'])
+    })
+})
diff --git a/packages/core/src/test/awsService/ecr/commands/copyTagUri.test.ts b/packages/core/src/test/awsService/ecr/commands/copyTagUri.test.ts
new file mode 100644
index 00000000000..5f9326e4a93
--- /dev/null
+++ b/packages/core/src/test/awsService/ecr/commands/copyTagUri.test.ts
@@ -0,0 +1,36 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { EcrRepositoryNode } from '../../../../awsService/ecr/explorer/ecrRepositoryNode'
+import { EcrClient, EcrRepository } from '../../../../shared/clients/ecrClient'
+import { EcrTagNode } from '../../../../awsService/ecr/explorer/ecrTagNode'
+import { copyTagUri } from '../../../../awsService/ecr/commands/copyTagUri'
+import { getTestWindow } from '../../../shared/vscode/window'
+import { FakeClipboard } from '../../../shared/vscode/fakeEnv'
+
+describe('copyTagUriCommand', function () {
+    beforeEach(function () {
+        const fakeClipboard = new FakeClipboard()
+        sinon.stub(vscode.env, 'clipboard').value(fakeClipboard)
+    })
+
+    it('Copies URI to clipboard and shows in the status bar', async function () {
+        const parentNode = {} as EcrRepositoryNode
+        const node = new EcrTagNode(
+            parentNode,
+            {} as EcrClient,
+            { repositoryUri: 'www.amazon.com' } as EcrRepository,
+            'tag'
+        )
+
+        await copyTagUri(node)
+
+        assert.strictEqual(await vscode.env.clipboard.readText(), 'www.amazon.com:tag')
+        assert.deepStrictEqual(getTestWindow().statusBar.messages, ['$(clippy) Copied URI to clipboard'])
+    })
+})
diff --git a/packages/core/src/test/awsService/ecr/commands/createRepository.test.ts b/packages/core/src/test/awsService/ecr/commands/createRepository.test.ts
new file mode 100644
index 00000000000..f0e5b549b3d
--- /dev/null
+++ b/packages/core/src/test/awsService/ecr/commands/createRepository.test.ts
@@ -0,0 +1,83 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import assert from 'assert'
+import { EcrNode } from '../../../../awsService/ecr/explorer/ecrNode'
+import { DefaultEcrClient } from '../../../../shared/clients/ecrClient'
+import { createRepository } from '../../../../awsService/ecr/commands/createRepository'
+import { getTestWindow } from '../../../shared/vscode/window'
+
+describe('createRepositoryCommand', function () {
+    const ecr = new DefaultEcrClient('')
+    let node: EcrNode
+    let sandbox: sinon.SinonSandbox
+    let spyExecuteCommand: sinon.SinonSpy
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+        node = new EcrNode(ecr)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('prompts for repo name, creates repo, shows success, and refreshes node', async function () {
+        const repoName = 'amazingecrrepo'
+
+        const stub = sandbox.stub(ecr, 'createRepository').callsFake(async (name) => {
+            assert.strictEqual(name, repoName)
+            return {} as any
+        })
+
+        getTestWindow().onDidShowInputBox((input) => {
+            assert.strictEqual(input.prompt, 'Enter a new repository name')
+            assert.strictEqual(input.placeholder, 'Repository Name')
+            input.acceptValue(repoName)
+        })
+        await createRepository(node)
+
+        assert.ok(stub.calledOnce)
+        getTestWindow().getFirstMessage().assertInfo(`Created repository: ${repoName}`)
+        assert(spyExecuteCommand.calledWith('aws.refreshAwsExplorerNode', node))
+    })
+
+    it('does nothing when prompt is cancelled', async function () {
+        getTestWindow().onDidShowInputBox((input) => input.hide())
+        const spy = sandbox.spy(ecr, 'createRepository')
+
+        await createRepository(node)
+
+        assert.ok(spy.notCalled)
+    })
+
+    it('Shows an error message and refreshes node when repository creation fails', async function () {
+        sandbox.stub(ecr, 'createRepository').callsFake(async () => {
+            throw Error('Network busted')
+        })
+
+        getTestWindow().onDidShowInputBox((input) => input.acceptValue('input'))
+        await createRepository(node)
+
+        getTestWindow()
+            .getFirstMessage()
+            .assertError(/Failed to create repository/)
+
+        assert(spyExecuteCommand.calledWith('aws.refreshAwsExplorerNode', node))
+    })
+
+    it('Warns when repository name is invalid', async function () {
+        getTestWindow().onDidShowInputBox((input) => {
+            input.acceptValue('404')
+            assert.strictEqual(input.validationMessage, 'Repository name must start with a lowercase letter')
+            input.hide()
+        })
+
+        await createRepository(node)
+    })
+})
diff --git a/packages/core/src/test/awsService/ecr/commands/deleteRepository.test.ts b/packages/core/src/test/awsService/ecr/commands/deleteRepository.test.ts
new file mode 100644
index 00000000000..51846cec313
--- /dev/null
+++ b/packages/core/src/test/awsService/ecr/commands/deleteRepository.test.ts
@@ -0,0 +1,80 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import assert from 'assert'
+import { EcrNode } from '../../../../awsService/ecr/explorer/ecrNode'
+import { DefaultEcrClient, EcrRepository } from '../../../../shared/clients/ecrClient'
+import { EcrRepositoryNode } from '../../../../awsService/ecr/explorer/ecrRepositoryNode'
+import { deleteRepository } from '../../../../awsService/ecr/commands/deleteRepository'
+import { getTestWindow } from '../../../shared/vscode/window'
+
+describe('deleteRepositoryCommand', function () {
+    const repositoryName = 'reponame'
+    const parentNode: EcrNode = {} as EcrNode
+    const ecr = new DefaultEcrClient('')
+    let node: EcrRepositoryNode
+    let sandbox: sinon.SinonSandbox
+    let spyExecuteCommand: sinon.SinonSpy
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+        node = new EcrRepositoryNode(parentNode, ecr, { repositoryName: repositoryName } as EcrRepository)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('Confirms deletion, deletes repository, shows progress bar, and refreshes parent node', async function () {
+        getTestWindow().onDidShowInputBox((input) => {
+            assert.strictEqual(input.prompt, `Enter ${repositoryName} to confirm deletion`)
+            assert.strictEqual(input.placeholder, repositoryName)
+            input.acceptValue(repositoryName)
+        })
+        const stub = sandbox.stub(ecr, 'deleteRepository').callsFake(async (name) => {
+            assert.strictEqual(name, repositoryName)
+        })
+
+        await deleteRepository(node)
+
+        getTestWindow().getFirstMessage().assertInfo(`Deleted repository: ${repositoryName}`)
+        assert.strictEqual(stub.calledOnce, true)
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', parentNode)
+    })
+
+    it('Does nothing when deletion is cancelled', async function () {
+        getTestWindow().onDidShowInputBox((input) => input.hide())
+        const spy = sandbox.spy(ecr, 'deleteRepository')
+
+        await deleteRepository(node)
+
+        assert.ok(spy.notCalled)
+    })
+
+    it('shows an error message and refreshes node when repository deletion fails', async function () {
+        sandbox.stub(ecr, 'deleteRepository').callsFake(async () => {
+            throw Error('Network busted')
+        })
+
+        getTestWindow().onDidShowInputBox((input) => input.acceptValue(repositoryName))
+        await deleteRepository(node)
+
+        getTestWindow().getFirstMessage().assertError(`Failed to delete repository: ${repositoryName}`)
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', parentNode)
+    })
+
+    it('Warns when confirmation is invalid', async function () {
+        getTestWindow().onDidShowInputBox((input) => {
+            input.acceptValue('something other than the repo name')
+            assert.strictEqual(input.validationMessage, `Enter ${repositoryName} to confirm deletion`)
+            input.hide()
+        })
+
+        await deleteRepository(node)
+    })
+})
diff --git a/packages/core/src/test/awsService/ecr/commands/deleteTag.test.ts b/packages/core/src/test/awsService/ecr/commands/deleteTag.test.ts
new file mode 100644
index 00000000000..1b6aed0993c
--- /dev/null
+++ b/packages/core/src/test/awsService/ecr/commands/deleteTag.test.ts
@@ -0,0 +1,80 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import assert from 'assert'
+import { EcrTagNode } from '../../../../awsService/ecr/explorer/ecrTagNode'
+import { EcrRepositoryNode } from '../../../../awsService/ecr/explorer/ecrRepositoryNode'
+import { DefaultEcrClient, EcrRepository } from '../../../../shared/clients/ecrClient'
+import { deleteTag } from '../../../../awsService/ecr/commands/deleteTag'
+import { assertNoErrorMessages, getTestWindow } from '../../../shared/vscode/window'
+
+describe('deleteTag', function () {
+    const repositoryName = 'reponame'
+    const tagName = 'tag'
+    const parentNode = {} as EcrRepositoryNode
+    const ecr = new DefaultEcrClient('')
+    let node: EcrTagNode
+    let sandbox: sinon.SinonSandbox
+    let spyExecuteCommand: sinon.SinonSpy
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+        node = new EcrTagNode(parentNode, ecr, { repositoryName: repositoryName } as EcrRepository, tagName)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('confirms deletion, deletes file, shows status bar confirmation, and refreshes parent node', async function () {
+        getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Delete')?.select())
+        const stub = sandbox.stub(ecr, 'deleteTag').callsFake(async (name, tag) => {
+            assert.strictEqual(name, repositoryName)
+            assert.strictEqual(tag, tagName)
+        })
+
+        await deleteTag(node)
+
+        getTestWindow().getFirstMessage().assertWarn('Are you sure you want to delete tag tag from repository reponame')
+
+        assert.strictEqual(stub.calledOnce, true)
+
+        getTestWindow().getSecondMessage().assertInfo(`Deleted tag ${tagName} from repository ${repositoryName}`)
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', parentNode)
+    })
+
+    it('does nothing when deletion is cancelled', async function () {
+        getTestWindow().onDidShowMessage((m) => m.selectItem('Cancel'))
+        const spy = sandbox.spy(ecr, 'deleteTag')
+
+        await deleteTag(node)
+
+        assert.strictEqual(spy.notCalled, true)
+
+        assert.deepStrictEqual(getTestWindow().statusBar.messages, [])
+        assertNoErrorMessages()
+        sandbox.assert.notCalled(spyExecuteCommand)
+    })
+
+    it('shows an error message and refreshes node when file deletion fails', async function () {
+        sandbox.stub(ecr, 'deleteTag').callsFake(async () => {
+            throw new Error('network broke')
+        })
+
+        getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Delete')?.select())
+
+        await deleteTag(node)
+
+        getTestWindow()
+            .getSecondMessage()
+            .assertError(new RegExp(`^Failed to delete tag ${tagName}`))
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', parentNode)
+    })
+})
diff --git a/src/test/ecr/explorer/EcrNode.test.ts b/packages/core/src/test/awsService/ecr/explorer/EcrNode.test.ts
similarity index 89%
rename from src/test/ecr/explorer/EcrNode.test.ts
rename to packages/core/src/test/awsService/ecr/explorer/EcrNode.test.ts
index 90c4d5e68a2..9d9dd1c1032 100644
--- a/src/test/ecr/explorer/EcrNode.test.ts
+++ b/packages/core/src/test/awsService/ecr/explorer/EcrNode.test.ts
@@ -1,16 +1,16 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as sinon from 'sinon'
-import * as assert from 'assert'
-import { DefaultEcrClient, EcrClient, EcrRepository } from '../../../shared/clients/ecrClient'
-import { EcrNode } from '../../../ecr/explorer/ecrNode'
-import { EcrRepositoryNode } from '../../../ecr/explorer/ecrRepositoryNode'
-import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
-import { EcrTagNode } from '../../../ecr/explorer/ecrTagNode'
-import { assertNodeListOnlyHasErrorNode } from '../../utilities/explorerNodeAssertions'
+import assert from 'assert'
+import { DefaultEcrClient, EcrClient, EcrRepository } from '../../../../shared/clients/ecrClient'
+import { EcrNode } from '../../../../awsService/ecr/explorer/ecrNode'
+import { EcrRepositoryNode } from '../../../../awsService/ecr/explorer/ecrRepositoryNode'
+import { PlaceholderNode } from '../../../../shared/treeview/nodes/placeholderNode'
+import { EcrTagNode } from '../../../../awsService/ecr/explorer/ecrTagNode'
+import { assertNodeListOnlyHasErrorNode } from '../../../utilities/explorerNodeAssertions'
 
 describe('EcrNode', function () {
     let ecr: EcrClient
diff --git a/packages/core/src/test/awsService/ecr/utils.test.ts b/packages/core/src/test/awsService/ecr/utils.test.ts
new file mode 100644
index 00000000000..6d0feee0db9
--- /dev/null
+++ b/packages/core/src/test/awsService/ecr/utils.test.ts
@@ -0,0 +1,33 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { validateRepositoryName } from '../../../awsService/ecr/utils'
+
+describe('createRepositoryCommand', function () {
+    it('Validates repository name starts with a lowercase letter', function () {
+        const message = validateRepositoryName('404')
+        assert.strictEqual(message, 'Repository name must start with a lowercase letter')
+    })
+
+    it('Validates repository name does not contain uppercase characters', function () {
+        const message = validateRepositoryName('abcDEF')
+        assert.strictEqual(
+            message,
+            'Repository name must only contain lowercase letters, numbers, hyphens, underscores, and forward slashes'
+        )
+    })
+
+    it('Validates repository name against large regex the service uses', function () {
+        for (const item of ['abc--a', 'abc//a', 'abc__a', 'abc-', 'abc/', 'abc_']) {
+            assert.strictEqual(validateRepositoryName(item), 'Invalid repository name')
+        }
+    })
+
+    it('Allows lowercase names with slashes, underscores, and dashes', function () {
+        const message = validateRepositoryName('abc1/def2/hij3_klmno-p5')
+        assert.strictEqual(message, undefined)
+    })
+})
diff --git a/packages/core/src/test/awsService/ecs/commands.test.ts b/packages/core/src/test/awsService/ecs/commands.test.ts
new file mode 100644
index 00000000000..cd08f3306ce
--- /dev/null
+++ b/packages/core/src/test/awsService/ecs/commands.test.ts
@@ -0,0 +1,87 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import { DefaultEcsClient } from '../../../shared/clients/ecsClient'
+import { TestSettings } from '../../utilities/testSettingsConfiguration'
+import { ToolkitPromptSettings } from '../../../shared/settings'
+import { Service } from '../../../awsService/ecs/model'
+import { stub } from '../../utilities/stubber'
+import { EcsRunCommandPrompt, toggleExecuteCommandFlag } from '../../../awsService/ecs/commands'
+
+describe('toggleExecuteCommandFlag', async function () {
+    const settings = new ToolkitPromptSettings(new TestSettings())
+
+    before(async function () {
+        await settings.disablePrompt(EcsRunCommandPrompt.Enable)
+        await settings.disablePrompt(EcsRunCommandPrompt.Disable)
+    })
+
+    it('attempts to enable service', async function () {
+        const client = stub(DefaultEcsClient, { regionCode: '' })
+        client.updateService.callsFake(async (request) => assert.strictEqual(request.enableExecuteCommand, true))
+        const service = new Service(client, {})
+        const didChange = new Promise<boolean>((resolve) => {
+            service.onDidChangeTreeItem(() => resolve(true))
+            setTimeout(() => resolve(false), 1000)
+        })
+
+        await toggleExecuteCommandFlag(service, vscode.window, settings)
+        assert.ok(client.updateService.calledOnce)
+        assert.ok(await didChange)
+    })
+
+    it('attempts to disable service', async function () {
+        const client = stub(DefaultEcsClient, { regionCode: '' })
+        client.updateService.callsFake(async (request) => assert.strictEqual(request.enableExecuteCommand, false))
+        const service = new Service(client, { enableExecuteCommand: true })
+        const didChange = new Promise<boolean>((resolve) => {
+            service.onDidChangeTreeItem(() => resolve(true))
+            setTimeout(() => resolve(false), 1000)
+        })
+
+        await toggleExecuteCommandFlag(service, vscode.window, settings)
+        assert.ok(client.updateService.calledOnce)
+        assert.ok(await didChange)
+    })
+})
+
+describe('openTaskInTerminal', async function () {
+    const settings = new ToolkitPromptSettings(new TestSettings())
+
+    before(async function () {
+        await settings.disablePrompt(EcsRunCommandPrompt.Enable)
+        await settings.disablePrompt(EcsRunCommandPrompt.Disable)
+    })
+
+    it('attempts to enable service', async function () {
+        const client = stub(DefaultEcsClient, { regionCode: '' })
+        client.updateService.callsFake(async (request) => assert.strictEqual(request.enableExecuteCommand, true))
+        const service = new Service(client, {})
+        const didChange = new Promise<boolean>((resolve) => {
+            service.onDidChangeTreeItem(() => resolve(true))
+            setTimeout(() => resolve(false), 1000)
+        })
+
+        await toggleExecuteCommandFlag(service, vscode.window, settings)
+        assert.ok(client.updateService.calledOnce)
+        assert.ok(await didChange)
+    })
+
+    it('attempts to disable service', async function () {
+        const client = stub(DefaultEcsClient, { regionCode: '' })
+        client.updateService.callsFake(async (request) => assert.strictEqual(request.enableExecuteCommand, false))
+        const service = new Service(client, { enableExecuteCommand: true })
+        const didChange = new Promise<boolean>((resolve) => {
+            service.onDidChangeTreeItem(() => resolve(true))
+            setTimeout(() => resolve(false), 1000)
+        })
+
+        await toggleExecuteCommandFlag(service, vscode.window, settings)
+        assert.ok(client.updateService.calledOnce)
+        assert.ok(await didChange)
+    })
+})
diff --git a/packages/core/src/test/awsService/ecs/model.test.ts b/packages/core/src/test/awsService/ecs/model.test.ts
new file mode 100644
index 00000000000..5589d3bce9a
--- /dev/null
+++ b/packages/core/src/test/awsService/ecs/model.test.ts
@@ -0,0 +1,90 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Cluster, Container, Service } from '../../../awsService/ecs/model'
+import { DefaultEcsClient } from '../../../shared/clients/ecsClient'
+import { assertChildren, assertTreeItem } from '../../shared/treeview/testUtil'
+import { createCollectionFromPages } from '../../../shared/utilities/collectionUtils'
+import { stub } from '../../utilities/stubber'
+
+const clusterData = {
+    clusterArn: 'arn:aws:ecs:us-east-1:012345678910:cluster/my-cluster',
+    clusterName: 'my-cluster',
+}
+
+const serviceData = {
+    serviceArn: 'arn:aws:ecs:us-east-1:012345678910:service/my-cluster/my-service',
+    serviceName: 'my-service',
+    taskDefinition: 'arn:aws:ecs:us-east-1:012345678910:task-definition/my-task:1',
+}
+
+const containerData = {
+    name: 'my-container',
+    clusterArn: clusterData.clusterArn,
+    taskRoleArn: 'arn:aws:iam::012345678910:role/my-role',
+}
+
+const getClient = () => stub(DefaultEcsClient, { regionCode: 'us-east-1' })
+
+describe('Container', function () {
+    const serviceName = 'my-service'
+
+    it('has a tree item', async function () {
+        const container = new Container(getClient(), serviceName, containerData)
+
+        await assertTreeItem(container, {
+            label: containerData.name,
+            contextValue: 'awsEcsContainerNodeExecDisabled',
+        })
+    })
+
+    it('has a tree item when "enableExecuteCommand" is set', async function () {
+        const container = new Container(getClient(), serviceName, { ...containerData, enableExecuteCommand: true })
+
+        await assertTreeItem(container, {
+            label: containerData.name,
+            contextValue: 'awsEcsContainerNodeExecEnabled',
+        })
+    })
+})
+
+describe('Service', function () {
+    it('has a tree item', async function () {
+        const service = new Service(getClient(), serviceData)
+
+        await assertTreeItem(service, {
+            label: serviceData.serviceName,
+            contextValue: 'awsEcsServiceNode.DISABLED',
+        })
+    })
+
+    it('lists containers', async function () {
+        const client = getClient()
+        client.describeTaskDefinition.resolves({ taskDefinition: { containerDefinitions: [containerData] } })
+
+        const cluster = new Service(client, serviceData)
+        await assertChildren(cluster, containerData.name)
+    })
+})
+
+describe('Cluster', function () {
+    it('has a tree item', async function () {
+        const cluster = new Cluster(getClient(), clusterData)
+
+        await assertTreeItem(cluster, {
+            label: clusterData.clusterName,
+            tooltip: clusterData.clusterArn,
+            contextValue: 'awsEcsClusterNode',
+        })
+    })
+
+    it('lists services', async function () {
+        const client = getClient()
+        client.listServices.returns(createCollectionFromPages([serviceData]))
+
+        const cluster = new Cluster(client, clusterData)
+        await assertChildren(cluster, serviceData.serviceName)
+    })
+})
diff --git a/packages/core/src/test/awsService/ecs/util.test.ts b/packages/core/src/test/awsService/ecs/util.test.ts
new file mode 100644
index 00000000000..379d5732afa
--- /dev/null
+++ b/packages/core/src/test/awsService/ecs/util.test.ts
@@ -0,0 +1,29 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { stub } from '../../utilities/stubber'
+import { checkPermissionsForSsm } from '../../../awsService/ecs/util'
+import { IamClient } from '../../../shared/clients/iam'
+
+describe('checkPermissionsForSsm', function () {
+    const getClient = () => stub(IamClient, { regionCode: '' })
+
+    it('rejects task definitions without a role', async function () {
+        await assert.rejects(() => checkPermissionsForSsm(getClient(), {}), /must have a task role/i)
+    })
+
+    it('rejects roles if any permissions are rejected', async function () {
+        const client = getClient()
+        client.getDeniedActions.resolves([{ EvalActionName: 'foo', EvalDecision: 'explicitDeny' }])
+        await assert.rejects(() => checkPermissionsForSsm(client, { taskRoleArn: 'bar' }), /insufficient permissions/i)
+    })
+
+    it('returns successfully if no permissions are rejected', async function () {
+        const client = getClient()
+        client.getDeniedActions.resolves([])
+        await checkPermissionsForSsm(client, { taskRoleArn: 'bar' })
+    })
+})
diff --git a/packages/core/src/test/awsService/ecs/wizards/executeCommand.test.ts b/packages/core/src/test/awsService/ecs/wizards/executeCommand.test.ts
new file mode 100644
index 00000000000..d18464ad034
--- /dev/null
+++ b/packages/core/src/test/awsService/ecs/wizards/executeCommand.test.ts
@@ -0,0 +1,37 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { createWizardTester, WizardTester } from '../../../shared/wizards/wizardTestUtils'
+import { CommandWizard, CommandWizardState } from '../../../../awsService/ecs/wizards/executeCommand'
+import { Container } from '../../../../awsService/ecs/model'
+import { stub } from '../../../utilities/stubber'
+import { DefaultEcsClient } from '../../../../shared/clients/ecsClient'
+
+describe('CreateServiceWizard', function () {
+    let tester: WizardTester<CommandWizardState>
+
+    const createContainer = () =>
+        new Container(stub(DefaultEcsClient, { regionCode: '' }), '', { clusterArn: '', taskRoleArn: '' })
+
+    beforeEach(async function () {
+        tester = await createWizardTester(new CommandWizard(createContainer(), false))
+    })
+
+    it('should prompt for tasks and then command', function () {
+        tester.task.assertShowFirst()
+        tester.command.assertShowSecond()
+    })
+
+    it('should ask for confirmation last', async function () {
+        tester = await createWizardTester(new CommandWizard(createContainer(), true))
+        tester.task.assertShowFirst()
+        tester.command.assertShowSecond()
+        tester.confirmation.assertShowThird()
+    })
+
+    it('should not ask for confirmation if suppressed', function () {
+        tester.confirmation.assertDoesNotShow()
+    })
+})
diff --git a/packages/core/src/test/awsService/iot/commands/attachCertificate.test.ts b/packages/core/src/test/awsService/iot/commands/attachCertificate.test.ts
new file mode 100644
index 00000000000..840c375a80c
--- /dev/null
+++ b/packages/core/src/test/awsService/iot/commands/attachCertificate.test.ts
@@ -0,0 +1,128 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import { Certificate } from '@aws-sdk/client-iot'
+import { attachCertificateCommand, CertGen } from '../../../../awsService/iot/commands/attachCertificate'
+import { IotThingFolderNode } from '../../../../awsService/iot/explorer/iotThingFolderNode'
+import { IotThingNode } from '../../../../awsService/iot/explorer/iotThingNode'
+import { IotClient } from '../../../../shared/clients/iotClient'
+import { DataQuickPickItem } from '../../../../shared/ui/pickerPrompter'
+import { PromptResult } from '../../../../shared/ui/prompter'
+import globals from '../../../../shared/extensionGlobals'
+import { getTestWindow } from '../../../shared/vscode/window'
+import assert from 'assert'
+
+describe('attachCertCommand', function () {
+    const thingName = 'iot-thing'
+    let iot: IotClient
+    let certs: Certificate[]
+    let thingNode: IotThingNode
+    let selection: number = 0
+    let sandbox: sinon.SinonSandbox
+    let spyExecuteCommand: sinon.SinonSpy
+
+    const prompt: (iot: IotClient, certFetch: CertGen) => Promise<PromptResult<Certificate>> = async (
+        iot,
+        certFetch
+    ) => {
+        const iterable = certFetch(iot)
+        const responses: DataQuickPickItem<Certificate>[] = []
+        for await (const response of iterable) {
+            responses.push(...response)
+        }
+        return selection > -1 ? (responses[selection].data as Certificate) : undefined
+    }
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+
+        iot = {} as any as IotClient
+        thingNode = new IotThingNode({ name: thingName, arn: 'arn' }, {} as IotThingFolderNode, iot)
+        certs = [
+            {
+                certificateId: 'cert1',
+                certificateArn: 'arn1',
+                status: 'ACTIVE',
+                creationDate: new globals.clock.Date(),
+            },
+            {
+                certificateId: 'cert2',
+                certificateArn: 'arn2',
+                status: 'INACTIVE',
+                creationDate: new globals.clock.Date(),
+            },
+            { certificateId: 'cert3', certificateArn: 'arn3', status: 'ACTIVE' },
+        ]
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('attaches selected certificate', async function () {
+        // const executeCommand = stubVscodeExecuteCommand()
+        selection = 0
+        const listStub = sinon.stub().resolves({ certificates: certs })
+        iot.listCertificates = listStub
+        const attachStub = sinon.stub()
+        iot.attachThingPrincipal = attachStub
+        await attachCertificateCommand(thingNode, prompt)
+
+        assert(attachStub.calledOnceWithExactly({ thingName, principal: 'arn1' }))
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', thingNode)
+    })
+
+    it('shows an error message if certificates are not fetched', async function () {
+        const listStub = sinon.stub().rejects(new Error('Expected failure'))
+        iot.listCertificates = listStub
+        const attachStub = sinon.stub()
+        iot.attachThingPrincipal = attachStub
+
+        selection = -1
+        await attachCertificateCommand(thingNode, prompt)
+
+        assert(attachStub.notCalled)
+
+        getTestWindow()
+            .getFirstMessage()
+            .assertError(/Failed to retrieve certificate/)
+
+        sandbox.assert.notCalled(spyExecuteCommand)
+    })
+
+    it('shows an error message if attaching certificate fails', async function () {
+        selection = 1
+        const listStub = sinon.stub().resolves({ certificates: certs })
+        iot.listCertificates = listStub
+        const attachStub = sinon.stub().rejects(new Error('Expected failure'))
+        iot.attachThingPrincipal = attachStub
+
+        await attachCertificateCommand(thingNode, prompt)
+
+        getTestWindow()
+            .getFirstMessage()
+            .assertError(/Failed to attach certificate cert2/)
+
+        sandbox.assert.notCalled(spyExecuteCommand)
+    })
+
+    it('Does nothing if no certificate is chosen', async function () {
+        selection = -1
+        const listStub = sinon.stub().resolves({ certificates: certs })
+        iot.listCertificates = listStub
+        const attachStub = sinon.stub().rejects(new Error('Expected failure'))
+        iot.attachThingPrincipal = attachStub
+
+        await attachCertificateCommand(thingNode, prompt)
+
+        assert(attachStub.notCalled)
+
+        sandbox.assert.notCalled(spyExecuteCommand)
+    })
+})
diff --git a/packages/core/src/test/awsService/iot/commands/copyEndpoint.test.ts b/packages/core/src/test/awsService/iot/commands/copyEndpoint.test.ts
new file mode 100644
index 00000000000..3d25b4843db
--- /dev/null
+++ b/packages/core/src/test/awsService/iot/commands/copyEndpoint.test.ts
@@ -0,0 +1,46 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { copyEndpointCommand } from '../../../../awsService/iot/commands/copyEndpoint'
+import { IotNode } from '../../../../awsService/iot/explorer/iotNodes'
+import { IotClient } from '../../../../shared/clients/iotClient'
+import { getTestWindow } from '../../../shared/vscode/window'
+import { FakeClipboard } from '../../../shared/vscode/fakeEnv'
+
+describe('copyEndpointCommand', function () {
+    beforeEach(function () {
+        const fakeClipboard = new FakeClipboard()
+        sinon.stub(vscode.env, 'clipboard').value(fakeClipboard)
+    })
+
+    let iot: IotClient
+    let node: IotNode
+
+    beforeEach(function () {
+        iot = {} as any as IotClient
+        node = new IotNode(iot)
+    })
+
+    it('copies endpoint to clipboard', async function () {
+        const endpointStub = sinon.stub().resolves('endpoint')
+        iot.getEndpoint = endpointStub
+
+        await copyEndpointCommand(node)
+
+        assert.strictEqual(await vscode.env.clipboard.readText(), 'endpoint')
+    })
+
+    it('shows an error message when retrieval fails', async function () {
+        const endpointStub = sinon.stub().rejects(new Error('Expected failure'))
+        iot.getEndpoint = endpointStub
+
+        await copyEndpointCommand(node)
+
+        getTestWindow().getFirstMessage().assertError('Failed to retrieve endpoint')
+    })
+})
diff --git a/packages/core/src/test/awsService/iot/commands/createCert.test.ts b/packages/core/src/test/awsService/iot/commands/createCert.test.ts
new file mode 100644
index 00000000000..1f280629410
--- /dev/null
+++ b/packages/core/src/test/awsService/iot/commands/createCert.test.ts
@@ -0,0 +1,144 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { createCertificateCommand } from '../../../../awsService/iot/commands/createCert'
+import { IotNode } from '../../../../awsService/iot/explorer/iotNodes'
+import { IotClient } from '../../../../shared/clients/iotClient'
+import { IotCertsFolderNode } from '../../../../awsService/iot/explorer/iotCertFolderNode'
+import { CreateKeysAndCertificateResponse } from '@aws-sdk/client-iot'
+import { getTestWindow } from '../../../shared/vscode/window'
+import assert from 'assert'
+
+describe('createCertificateCommand', function () {
+    let sandbox: sinon.SinonSandbox
+    let spyExecuteCommand: sinon.SinonSpy
+
+    const certificateId = 'new-certificate'
+    const certificateArn = 'arn'
+    const certificatePem = 'certPem'
+    const keyPair = { PrivateKey: 'private', PublicKey: 'public' }
+    const certificate: CreateKeysAndCertificateResponse = { certificateId, certificateArn, certificatePem, keyPair }
+    let iot: IotClient
+    let node: IotCertsFolderNode
+    let saveLocation: vscode.Uri | undefined = vscode.Uri.file('/certificate.txt')
+    let saveSuccess: boolean
+    const promptFolder: () => Promise<vscode.Uri | undefined> = async () => {
+        return saveLocation
+    }
+    const saveFiles: (
+        basePath: vscode.Uri,
+        certId: string,
+        certPem: string,
+        privateKey: string,
+        publicKey: string
+    ) => Promise<boolean> = async (basePath, certId, certPem, privateKey, publicKey) => {
+        return saveSuccess
+    }
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+
+        iot = {} as any as IotClient
+        node = new IotCertsFolderNode(iot, new IotNode(iot))
+        saveLocation = vscode.Uri.file('/certificate')
+        saveSuccess = true
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('prompts for save location, creates certificate, and saves to filesystem', async function () {
+        const createStub = sinon.stub().resolves(certificate)
+        iot.createCertificateAndKeys = createStub
+        const deleteStub = sinon.stub()
+        iot.deleteCertificate = deleteStub
+
+        await createCertificateCommand(node, promptFolder, saveFiles)
+
+        getTestWindow()
+            .getFirstMessage()
+            .assertInfo(/Created certificate new-certificate/)
+
+        assert(createStub.calledOnceWithExactly({ setAsActive: false }))
+        assert(deleteStub.notCalled)
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', node)
+    })
+
+    it('does nothing when no save folder is selected', async function () {
+        saveLocation = undefined
+        const createStub = sinon.stub().resolves(certificate)
+        iot.createCertificateAndKeys = createStub
+        await createCertificateCommand(node, promptFolder, saveFiles)
+
+        assert(createStub.notCalled)
+        sandbox.assert.notCalled(spyExecuteCommand)
+    })
+
+    it('shows an error message if creating certificate fails', async function () {
+        const createStub = sinon.stub().rejects()
+        iot.createCertificateAndKeys = createStub
+
+        await createCertificateCommand(node, promptFolder, saveFiles)
+
+        getTestWindow()
+            .getFirstMessage()
+            .assertError(/Failed to create certificate/)
+
+        sandbox.assert.notCalled(spyExecuteCommand)
+    })
+
+    it('shows an error message if created certificate is invalid', async function () {
+        const createStub = sinon.stub().resolves({})
+        iot.createCertificateAndKeys = createStub
+
+        await createCertificateCommand(node, promptFolder, saveFiles)
+
+        getTestWindow()
+            .getFirstMessage()
+            .assertError(/Failed to create certificate/)
+
+        assert(createStub.calledOnceWithExactly({ setAsActive: false }))
+        sandbox.assert.notCalled(spyExecuteCommand)
+    })
+
+    it('deletes certificate if it cannot be saved', async function () {
+        const createStub = sinon.stub().resolves(certificate)
+        iot.createCertificateAndKeys = createStub
+        const deleteStub = sinon.stub()
+        iot.deleteCertificate = deleteStub
+        saveSuccess = false
+
+        await createCertificateCommand(node, promptFolder, saveFiles)
+
+        getTestWindow()
+            .getFirstMessage()
+            .assertInfo(/Created certificate new-certificate/)
+
+        assert(createStub.calledOnceWithExactly({ setAsActive: false }))
+        assert(deleteStub.calledOnceWithExactly({ certificateId }))
+    })
+
+    it('shows an error message if certificate cannot be deleted', async function () {
+        const createStub = sinon.stub().resolves(certificate)
+        iot.createCertificateAndKeys = createStub
+        const deleteStub = sinon.stub().rejects()
+        iot.deleteCertificate = deleteStub
+        saveSuccess = false
+
+        await createCertificateCommand(node, promptFolder, saveFiles)
+
+        getTestWindow()
+            .getFirstMessage()
+            .assertInfo(/Created certificate new-certificate/)
+        getTestWindow()
+            .getSecondMessage()
+            .assertError(/Failed to delete Certificate new-certificate/)
+    })
+})
diff --git a/packages/core/src/test/awsService/iot/commands/createPolicy.test.ts b/packages/core/src/test/awsService/iot/commands/createPolicy.test.ts
new file mode 100644
index 00000000000..c3bb7159837
--- /dev/null
+++ b/packages/core/src/test/awsService/iot/commands/createPolicy.test.ts
@@ -0,0 +1,137 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { createPolicyCommand } from '../../../../awsService/iot/commands/createPolicy'
+import { IotNode } from '../../../../awsService/iot/explorer/iotNodes'
+import { IotClient } from '../../../../shared/clients/iotClient'
+import { IotPolicyFolderNode } from '../../../../awsService/iot/explorer/iotPolicyFolderNode'
+import { getTestWindow } from '../../../shared/vscode/window'
+
+describe('createPolicyCommand', function () {
+    const policyName = 'test-policy'
+    let iot: IotClient
+    let policyObject: any
+    let policyDocument: string
+    let node: IotPolicyFolderNode
+    let returnUndefined: boolean = false
+    let sandbox: sinon.SinonSandbox
+    let spyExecuteCommand: sinon.SinonSpy
+
+    const getPolicy: () => Promise<Buffer | undefined> = async () => {
+        if (returnUndefined) {
+            return undefined
+        }
+        return Buffer.from(policyDocument, 'utf-8')
+    }
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+
+        iot = {} as any as IotClient
+        node = new IotPolicyFolderNode(iot, new IotNode(iot))
+        policyObject = { Version: '2012-10-17', Statement: '' }
+        policyDocument = JSON.stringify(policyObject)
+        returnUndefined = false
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('prompts for policy name, creates policy, and shows success', async function () {
+        const policyStub = sinon.stub()
+        iot.createPolicy = policyStub
+        getTestWindow().onDidShowInputBox((input) => {
+            assert.strictEqual(input.prompt, 'Enter a new policy name')
+            assert.strictEqual(input.placeholder, 'Policy Name')
+            input.acceptValue(policyName)
+        })
+        returnUndefined = false
+        await createPolicyCommand(node, getPolicy)
+        getTestWindow()
+            .getFirstMessage()
+            .assertInfo(/Created Policy test-policy/)
+
+        assert(policyStub.calledOnceWithExactly({ policyName, policyDocument }))
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', node)
+    })
+
+    it('does nothing when prompt is canceled', async function () {
+        const policyStub = sinon.stub()
+        iot.createPolicy = policyStub
+        getTestWindow().onDidShowInputBox((input) => input.hide())
+
+        assert(policyStub.notCalled)
+    })
+
+    it('warns when policy name has invalid length', async function () {
+        getTestWindow().onDidShowInputBox((input) => {
+            input.acceptValue('')
+            assert.strictEqual(input.validationMessage, 'Policy name must be between 1 and 128 characters long')
+            input.hide()
+        })
+        await createPolicyCommand(node, getPolicy)
+    })
+
+    it('warns when policy name has invalid characters', async function () {
+        getTestWindow().onDidShowInputBox((input) => {
+            input.acceptValue('illegal/characters')
+            assert.strictEqual(
+                input.validationMessage,
+                'Policy name must contain only alphanumeric characters and/or the following: +=.,@-'
+            )
+            input.hide()
+        })
+        await createPolicyCommand(node, getPolicy)
+    })
+
+    it('does nothing when policy document is not read', async function () {
+        const policyStub = sinon.stub()
+        iot.createPolicy = policyStub
+        returnUndefined = true
+        getTestWindow().onDidShowInputBox((input) => input.acceptValue(policyName))
+        await createPolicyCommand(node, getPolicy)
+
+        assert(policyStub.notCalled)
+        sandbox.assert.notCalled(spyExecuteCommand)
+    })
+
+    it('shows an error message when JSON is invalid', async function () {
+        const policyStub = sinon.stub()
+        iot.createPolicy = policyStub
+        getTestWindow().onDidShowInputBox((input) => input.acceptValue(policyName))
+        returnUndefined = false
+        policyDocument = 'not a JSON'
+        await createPolicyCommand(node, getPolicy)
+
+        getTestWindow()
+            .getFirstMessage()
+            .assertError(/Failed to create policy test-policy/)
+
+        assert(policyStub.notCalled)
+
+        sandbox.assert.notCalled(spyExecuteCommand)
+    })
+
+    it('shows an error message if creating policy fails', async function () {
+        const policyStub = sinon.stub().rejects()
+        iot.createPolicy = policyStub
+        returnUndefined = false
+
+        getTestWindow().onDidShowInputBox((input) => input.acceptValue(policyName))
+        await createPolicyCommand(node, getPolicy)
+
+        getTestWindow()
+            .getFirstMessage()
+            .assertError(/Failed to create policy test-policy/)
+
+        sandbox.assert.notCalled(spyExecuteCommand)
+    })
+})
diff --git a/packages/core/src/test/awsService/iot/commands/createPolicyVersion.test.ts b/packages/core/src/test/awsService/iot/commands/createPolicyVersion.test.ts
new file mode 100644
index 00000000000..12e38293c53
--- /dev/null
+++ b/packages/core/src/test/awsService/iot/commands/createPolicyVersion.test.ts
@@ -0,0 +1,87 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { createPolicyVersionCommand } from '../../../../awsService/iot/commands/createPolicyVersion'
+import { IotNode } from '../../../../awsService/iot/explorer/iotNodes'
+import { IotClient } from '../../../../shared/clients/iotClient'
+import { IotPolicyFolderNode } from '../../../../awsService/iot/explorer/iotPolicyFolderNode'
+import { IotPolicyWithVersionsNode } from '../../../../awsService/iot/explorer/iotPolicyNode'
+import { getTestWindow } from '../../../shared/vscode/window'
+import sinon from 'sinon'
+import { assert } from 'console'
+
+describe('createPolicyVersionCommand', function () {
+    const policyName = 'test-policy'
+
+    let iot: IotClient
+    let policyObject: any
+    let policyDocument: string
+    let node: IotPolicyWithVersionsNode
+    let parentNode: IotPolicyFolderNode
+    let returnUndefined: boolean = false
+    const getPolicy: () => Promise<Buffer | undefined> = async () => {
+        if (returnUndefined) {
+            return undefined
+        }
+        return Buffer.from(policyDocument, 'utf-8')
+    }
+
+    beforeEach(function () {
+        iot = {} as any as IotClient
+        parentNode = new IotPolicyFolderNode(iot, new IotNode(iot))
+        node = new IotPolicyWithVersionsNode({ name: policyName, arn: 'arn' }, parentNode, iot)
+        policyObject = { Version: '2012-10-17', Statement: '' }
+        policyDocument = JSON.stringify(policyObject)
+        returnUndefined = false
+    })
+
+    it('creates new policy version and shows success', async function () {
+        const createStub = sinon.stub()
+        iot.createPolicyVersion = createStub
+        returnUndefined = false
+        await createPolicyVersionCommand(node, getPolicy)
+
+        getTestWindow()
+            .getFirstMessage()
+            .assertInfo(/Created new version of test-policy/)
+
+        assert(createStub.calledOnceWithExactly({ policyName, policyDocument, setAsDefault: true }))
+    })
+
+    it('does nothing when policy document is not read', async function () {
+        const createStub = sinon.stub()
+        iot.createPolicyVersion = createStub
+        returnUndefined = true
+        await createPolicyVersionCommand(node, getPolicy)
+
+        assert(createStub.notCalled)
+    })
+
+    it('shows an error message when JSON is invalid', async function () {
+        const createStub = sinon.stub()
+        iot.createPolicyVersion = createStub
+        returnUndefined = false
+        policyDocument = 'not a JSON'
+        await createPolicyVersionCommand(node, getPolicy)
+
+        getTestWindow()
+            .getFirstMessage()
+            .assertError(/Failed to create new version of test-policy/)
+
+        assert(createStub.notCalled)
+    })
+
+    it('shows an error message if creating version fails', async function () {
+        const createStub = sinon.stub().rejects()
+        iot.createPolicyVersion = createStub
+        returnUndefined = false
+
+        await createPolicyVersionCommand(node, getPolicy)
+
+        getTestWindow()
+            .getFirstMessage()
+            .assertError(/Failed to create new version of test-policy/)
+    })
+})
diff --git a/packages/core/src/test/awsService/iot/commands/createThing.test.ts b/packages/core/src/test/awsService/iot/commands/createThing.test.ts
new file mode 100644
index 00000000000..98e125cad8b
--- /dev/null
+++ b/packages/core/src/test/awsService/iot/commands/createThing.test.ts
@@ -0,0 +1,98 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { createThingCommand } from '../../../../awsService/iot/commands/createThing'
+import { IotThingFolderNode } from '../../../../awsService/iot/explorer/iotThingFolderNode'
+import { IotNode } from '../../../../awsService/iot/explorer/iotNodes'
+import { IotClient } from '../../../../shared/clients/iotClient'
+import { getTestWindow } from '../../../shared/vscode/window'
+
+describe('createThingCommand', function () {
+    const thingName = 'newIotThing'
+    let iot: IotClient
+    let node: IotThingFolderNode
+    let sandbox: sinon.SinonSandbox
+    let spyExecuteCommand: sinon.SinonSpy
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+
+        iot = {} as any as IotClient
+        node = new IotThingFolderNode(iot, new IotNode(iot))
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('prompts for thing name, creates thing, shows success, and refreshes node', async function () {
+        const createStub = sinon.stub().resolves({
+            thingName: thingName,
+        })
+        iot.createThing = createStub
+
+        getTestWindow().onDidShowInputBox((input) => {
+            assert.strictEqual(input.prompt, 'Enter a new Thing name')
+            assert.strictEqual(input.placeholder, 'Thing Name')
+            input.acceptValue(thingName)
+        })
+        await createThingCommand(node)
+
+        getTestWindow()
+            .getFirstMessage()
+            .assertInfo(/Created Thing newIotThing/)
+
+        assert(createStub.calledOnceWithExactly({ thingName }))
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', node)
+    })
+
+    it('does nothing when prompt is cancelled', async function () {
+        const createStub = sinon.stub()
+        iot.createThing = createStub
+        getTestWindow().onDidShowInputBox((input) => input.hide())
+        await createThingCommand(node)
+
+        assert(createStub.notCalled)
+    })
+
+    it('warns when thing name has invalid length', async function () {
+        getTestWindow().onDidShowInputBox((input) => {
+            input.acceptValue('')
+            assert.strictEqual(input.validationMessage, 'Thing name must be between 1 and 128 characters long')
+            input.hide()
+        })
+        await createThingCommand(node)
+    })
+
+    it('warns when thing name has invalid characters', async function () {
+        getTestWindow().onDidShowInputBox((input) => {
+            input.acceptValue('illegal/characters')
+            assert.strictEqual(
+                input.validationMessage,
+                'Thing name must only contain alphanumeric characters, hyphens, underscores, or colons'
+            )
+            input.hide()
+        })
+        await createThingCommand(node)
+    })
+
+    it('shows an error message and refreshes node when thing creation fails', async function () {
+        const createStub = sinon.stub().rejects()
+        iot.createThing = createStub
+
+        getTestWindow().onDidShowInputBox((input) => input.acceptValue(thingName))
+        await createThingCommand(node)
+
+        getTestWindow()
+            .getFirstMessage()
+            .assertError(/Failed to create Thing/)
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', node)
+    })
+})
diff --git a/packages/core/src/test/awsService/iot/commands/deleteCert.test.ts b/packages/core/src/test/awsService/iot/commands/deleteCert.test.ts
new file mode 100644
index 00000000000..5a1b78ea850
--- /dev/null
+++ b/packages/core/src/test/awsService/iot/commands/deleteCert.test.ts
@@ -0,0 +1,175 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { deleteCertCommand } from '../../../../awsService/iot/commands/deleteCert'
+import { IotCertWithPoliciesNode } from '../../../../awsService/iot/explorer/iotCertificateNode'
+import { IotCertsFolderNode } from '../../../../awsService/iot/explorer/iotCertFolderNode'
+import { IotNode } from '../../../../awsService/iot/explorer/iotNodes'
+import { IotClient } from '../../../../shared/clients/iotClient'
+import globals from '../../../../shared/extensionGlobals'
+import { getTestWindow } from '../../../shared/vscode/window'
+import assert from 'assert'
+
+describe('deleteCertCommand', function () {
+    let sandbox: sinon.SinonSandbox
+    let spyExecuteCommand: sinon.SinonSpy
+
+    const certificateId = 'test-cert'
+    const status = 'INACTIVE'
+    let iot: IotClient
+    let node: IotCertWithPoliciesNode
+    let parentNode: IotCertsFolderNode
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+        iot = {} as any as IotClient
+        parentNode = new IotCertsFolderNode(iot, new IotNode(iot))
+        node = new IotCertWithPoliciesNode(
+            { id: certificateId, arn: 'arn', activeStatus: status, creationDate: new globals.clock.Date() },
+            parentNode,
+            iot
+        )
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('confirms deletion, deletes cert, and refreshes node', async function () {
+        const thingsStub = sinon.stub().resolves([])
+        iot.listThingsForCert = thingsStub
+        const principalStub = sinon.stub().resolves({ policies: [] })
+        iot.listPrincipalPolicies = principalStub
+        const deleteStub = sinon.stub()
+        iot.deleteCertificate = deleteStub
+
+        getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Delete')?.select())
+        await deleteCertCommand(node)
+
+        getTestWindow().getFirstMessage().assertWarn('Are you sure you want to delete Certificate test-cert?')
+
+        assert(deleteStub.calledOnceWithExactly({ certificateId, forceDelete: false }))
+        assert(thingsStub.calledOnceWithExactly({ principal: 'arn' }))
+        assert(principalStub.calledOnceWithExactly({ principal: 'arn' }))
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', parentNode)
+    })
+
+    it('does nothing if things are attached', async function () {
+        const thingsStub = sinon.stub().resolves(['iot-thing'])
+        iot.listThingsForCert = thingsStub
+
+        getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Delete')?.select())
+        await deleteCertCommand(node)
+
+        getTestWindow()
+            .getFirstMessage()
+            .assertError(/Certificate has attached resources: iot-thing/)
+
+        assert(thingsStub.calledOnceWithExactly({ principal: 'arn' }))
+        sandbox.assert.notCalled(spyExecuteCommand)
+    })
+
+    it('does nothing when deletion is cancelled', async function () {
+        const thingsStub = sinon.stub().resolves([])
+        iot.listThingsForCert = thingsStub
+        const deleteStub = sinon.stub()
+        iot.deleteCertificate = deleteStub
+        getTestWindow().onDidShowMessage((m) => m.selectItem('Cancel'))
+        await deleteCertCommand(node)
+
+        assert(thingsStub.calledOnceWithExactly({ principal: 'arn' }))
+        assert(deleteStub.notCalled)
+    })
+
+    it('does nothing if certificate is active', async function () {
+        const thingsStub = sinon.stub().resolves([])
+        iot.listThingsForCert = thingsStub
+        const deleteStub = sinon.stub()
+        iot.deleteCertificate = deleteStub
+        node = new IotCertWithPoliciesNode(
+            { id: certificateId, arn: 'arn', activeStatus: 'ACTIVE', creationDate: new globals.clock.Date() },
+            parentNode,
+            iot
+        )
+        getTestWindow().onDidShowMessage((m) => m.selectItem('Delete'))
+        await deleteCertCommand(node)
+
+        assert(deleteStub.notCalled)
+    })
+
+    it('shows an error message and refreshes node when certificate deletion fails', async function () {
+        const thingsStub = sinon.stub().resolves([])
+        iot.listThingsForCert = thingsStub
+        const principalStub = sinon.stub().resolves({ policies: [] })
+        iot.listPrincipalPolicies = principalStub
+        const deleteStub = sinon.stub().rejects()
+        iot.deleteCertificate = deleteStub
+
+        getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Delete')?.select())
+        await deleteCertCommand(node)
+
+        getTestWindow()
+            .getSecondMessage()
+            .assertError(/Failed to delete certificate: test-cert/)
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', parentNode)
+    })
+
+    it('shows an error message if Things are not fetched', async function () {
+        const thingsStub = sinon.stub().rejects()
+        iot.listThingsForCert = thingsStub
+        const deleteStub = sinon.stub().rejects()
+        iot.deleteCertificate = deleteStub
+
+        await deleteCertCommand(node)
+
+        assert(deleteStub.notCalled)
+
+        getTestWindow()
+            .getFirstMessage()
+            .assertError(/Failed to retrieve Things attached to certificate/)
+
+        sandbox.assert.notCalled(spyExecuteCommand)
+    })
+
+    it('confirms force deletion if policies are attached', async function () {
+        const thingsStub = sinon.stub().resolves([])
+        iot.listThingsForCert = thingsStub
+        const principalStub = sinon.stub().resolves({ policies: [{ policyName: 'policy' }] })
+        iot.listPrincipalPolicies = principalStub
+        const deleteStub = sinon.stub()
+        iot.deleteCertificate = deleteStub
+
+        getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Delete')?.select())
+        await deleteCertCommand(node)
+
+        getTestWindow().getSecondMessage().assertWarn('Certificate has attached policies. Delete anyway?')
+
+        assert(deleteStub.calledOnceWithExactly({ certificateId, forceDelete: true }))
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', parentNode)
+    })
+
+    it('shows an error message but refreshes node if policies are not fetched', async function () {
+        const thingsStub = sinon.stub().resolves([])
+        iot.listThingsForCert = thingsStub
+        const principalStub = sinon.stub().rejects()
+        iot.listPrincipalPolicies = principalStub
+        const deleteStub = sinon.stub()
+        iot.deleteCertificate = deleteStub
+
+        getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Delete')?.select())
+        await deleteCertCommand(node)
+
+        getTestWindow().getSecondMessage().assertError('Failed to retrieve policies attached to certificate')
+        assert(deleteStub.calledOnceWithExactly({ certificateId, forceDelete: false }))
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', parentNode)
+    })
+})
diff --git a/packages/core/src/test/awsService/iot/commands/deletePolicy.test.ts b/packages/core/src/test/awsService/iot/commands/deletePolicy.test.ts
new file mode 100644
index 00000000000..9812b915f36
--- /dev/null
+++ b/packages/core/src/test/awsService/iot/commands/deletePolicy.test.ts
@@ -0,0 +1,129 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { PolicyVersion } from '@aws-sdk/client-iot'
+import { deletePolicyCommand } from '../../../../awsService/iot/commands/deletePolicy'
+import { IotPolicyFolderNode } from '../../../../awsService/iot/explorer/iotPolicyFolderNode'
+import { IotPolicyWithVersionsNode } from '../../../../awsService/iot/explorer/iotPolicyNode'
+import { IotNode } from '../../../../awsService/iot/explorer/iotNodes'
+import { IotClient } from '../../../../shared/clients/iotClient'
+import { asyncGenerator } from '../../../../shared/utilities/collectionUtils'
+import { getTestWindow } from '../../../shared/vscode/window'
+import assert from 'assert'
+
+describe('deletePolicyCommand', function () {
+    const policyName = 'test-policy'
+    let iot: IotClient
+    let node: IotPolicyWithVersionsNode
+    let parentNode: IotPolicyFolderNode
+
+    let sandbox: sinon.SinonSandbox
+    let spyExecuteCommand: sinon.SinonSpy
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+
+        iot = {} as any as IotClient
+        parentNode = new IotPolicyFolderNode(iot, new IotNode(iot))
+        node = new IotPolicyWithVersionsNode({ name: policyName, arn: 'arn' }, parentNode, iot)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('confirms deletion, deletes policy, and refreshes node', async function () {
+        const listPolicyStub = sinon.stub().resolves([])
+        iot.listPolicyTargets = listPolicyStub
+        const policyVersions = ['1']
+        const listPolicyVersionsStub = sinon.stub().returns(
+            asyncGenerator<PolicyVersion>(
+                policyVersions.map<PolicyVersion>((versionId) => {
+                    return {
+                        versionId: versionId,
+                    }
+                })
+            )
+        )
+        iot.listPolicyVersions = listPolicyVersionsStub
+        const deleteStub = sinon.stub()
+        iot.deletePolicy = deleteStub
+
+        getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Delete')?.select())
+        await deletePolicyCommand(node)
+
+        getTestWindow().getFirstMessage().assertWarn('Are you sure you want to delete Policy test-policy?')
+
+        assert(listPolicyStub.calledOnceWithExactly({ policyName }))
+        assert(deleteStub.calledOnceWithExactly({ policyName }))
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', parentNode)
+    })
+
+    it('does nothing when certificates are attached', async function () {
+        const listPolicyStub = sinon.stub().resolves(['cert'])
+        iot.listPolicyTargets = listPolicyStub
+        const deleteStub = sinon.stub()
+        iot.deletePolicy = deleteStub
+        getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Delete')?.select())
+        await deletePolicyCommand(node)
+
+        getTestWindow()
+            .getSecondMessage()
+            .assertError(/Policy has attached certificates: cert/)
+
+        assert(listPolicyStub.calledOnceWithExactly({ policyName }))
+        assert(deleteStub.notCalled)
+    })
+
+    it('does nothing when multiple versions are present', async function () {
+        const listPolicyStub = sinon.stub().resolves([])
+        iot.listPolicyTargets = listPolicyStub
+        const policyVersions = ['1', '2']
+        const listPolicyVersionsStub = sinon.stub().returns(
+            asyncGenerator<PolicyVersion>(
+                policyVersions.map<PolicyVersion>((versionId) => {
+                    return {
+                        versionId: versionId,
+                    }
+                })
+            )
+        )
+        const deleteStub = sinon.stub()
+        iot.deletePolicy = deleteStub
+        iot.listPolicyVersions = listPolicyVersionsStub
+        getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Delete')?.select())
+        await deletePolicyCommand(node)
+
+        assert(listPolicyStub.calledOnceWithExactly({ policyName }))
+        assert(deleteStub.notCalled)
+    })
+
+    it('does nothing when deletion is cancelled', async function () {
+        const deleteStub = sinon.stub()
+        iot.deletePolicy = deleteStub
+        getTestWindow().onDidShowMessage((m) => m.selectItem('Cancel'))
+        await deletePolicyCommand(node)
+
+        assert(deleteStub.notCalled)
+    })
+
+    it('shows an error message and refreshes node when policy deletion fails', async function () {
+        const deleteStub = sinon.stub().rejects()
+        iot.deletePolicy = deleteStub
+
+        getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Delete')?.select())
+        await deletePolicyCommand(node)
+
+        getTestWindow()
+            .getSecondMessage()
+            .assertError(/Failed to delete Policy: test-policy/)
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', parentNode)
+    })
+})
diff --git a/packages/core/src/test/awsService/iot/commands/deletePolicyVersion.test.ts b/packages/core/src/test/awsService/iot/commands/deletePolicyVersion.test.ts
new file mode 100644
index 00000000000..dff62c306c5
--- /dev/null
+++ b/packages/core/src/test/awsService/iot/commands/deletePolicyVersion.test.ts
@@ -0,0 +1,81 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { deletePolicyVersionCommand } from '../../../../awsService/iot/commands/deletePolicyVersion'
+import { IotPolicyFolderNode } from '../../../../awsService/iot/explorer/iotPolicyFolderNode'
+import { IotPolicyWithVersionsNode } from '../../../../awsService/iot/explorer/iotPolicyNode'
+import { IotPolicyVersionNode } from '../../../../awsService/iot/explorer/iotPolicyVersionNode'
+import { IotClient } from '../../../../shared/clients/iotClient'
+import { getTestWindow } from '../../../shared/vscode/window'
+import assert from 'assert'
+
+describe('deletePolicyVersionCommand', function () {
+    const policyName = 'test-policy'
+    let iot: IotClient
+    let node: IotPolicyVersionNode
+    let parentNode: IotPolicyWithVersionsNode
+
+    let sandbox: sinon.SinonSandbox
+    let spyExecuteCommand: sinon.SinonSpy
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+
+        iot = {} as any as IotClient
+        parentNode = new IotPolicyWithVersionsNode({ name: policyName, arn: 'arn' }, {} as IotPolicyFolderNode, iot)
+        node = new IotPolicyVersionNode(
+            { name: policyName, arn: 'arn' },
+            { versionId: 'V1', isDefaultVersion: false },
+            false,
+            parentNode,
+            iot
+        )
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('confirms deletion, deletes policy, and refreshes node', async function () {
+        const deleteStub = sinon.stub()
+        iot.deletePolicyVersion = deleteStub
+        getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Delete')?.select())
+        await deletePolicyVersionCommand(node)
+
+        getTestWindow()
+            .getFirstMessage()
+            .assertWarn('Are you sure you want to delete Version V1 of Policy test-policy?')
+
+        assert(deleteStub.calledOnceWithExactly({ policyName, policyVersionId: 'V1' }))
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode')
+    })
+
+    it('does nothing when deletion is cancelled', async function () {
+        const deleteStub = sinon.stub()
+        iot.deletePolicyVersion = deleteStub
+        getTestWindow().onDidShowMessage((m) => m.selectItem('Cancel'))
+        await deletePolicyVersionCommand(node)
+
+        assert(deleteStub.notCalled)
+    })
+
+    it('shows an error message and refreshes node when deletion fails', async function () {
+        const deleteStub = sinon.stub().rejects()
+        iot.deletePolicyVersion = deleteStub
+
+        getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Delete')?.select())
+        await deletePolicyVersionCommand(node)
+
+        getTestWindow()
+            .getSecondMessage()
+            .assertError(/Failed to delete Version V1 of Policy test-policy/)
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode')
+    })
+})
diff --git a/packages/core/src/test/awsService/iot/commands/deleteThing.test.ts b/packages/core/src/test/awsService/iot/commands/deleteThing.test.ts
new file mode 100644
index 00000000000..6f7d71cb906
--- /dev/null
+++ b/packages/core/src/test/awsService/iot/commands/deleteThing.test.ts
@@ -0,0 +1,105 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { deleteThingCommand } from '../../../../awsService/iot/commands/deleteThing'
+import { IotThingFolderNode } from '../../../../awsService/iot/explorer/iotThingFolderNode'
+import { IotThingNode } from '../../../../awsService/iot/explorer/iotThingNode'
+import { IotNode } from '../../../../awsService/iot/explorer/iotNodes'
+import { IotClient } from '../../../../shared/clients/iotClient'
+import { getTestWindow } from '../../../shared/vscode/window'
+import assert from 'assert'
+
+describe('deleteThingCommand', function () {
+    const thingName = 'iot-thing'
+    let iot: IotClient
+    let node: IotThingNode
+    let parentNode: IotThingFolderNode
+    let sandbox: sinon.SinonSandbox
+    let spyExecuteCommand: sinon.SinonSpy
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+
+        iot = {} as any as IotClient
+        parentNode = new IotThingFolderNode(iot, new IotNode(iot))
+        node = new IotThingNode({ name: thingName, arn: 'arn' }, parentNode, iot)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('confirms deletion, deletes thing, and refreshes node', async function () {
+        const listStub = sinon.stub().resolves({ principals: [] })
+        iot.listThingPrincipals = listStub
+        const deleteStub = sinon.stub()
+        iot.deleteThing = deleteStub
+
+        getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Delete')?.select())
+        await deleteThingCommand(node)
+
+        getTestWindow().getFirstMessage().assertWarn('Are you sure you want to delete Thing iot-thing?')
+
+        assert(listStub.calledOnceWithExactly({ thingName }))
+        assert(deleteStub.calledOnceWithExactly({ thingName }))
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', parentNode)
+    })
+
+    it('does nothing if thing principals are attached', async function () {
+        const listStub = sinon.stub().resolves({ principals: ['string'] })
+        iot.listThingPrincipals = listStub
+
+        getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Delete')?.select())
+        await deleteThingCommand(node)
+
+        getTestWindow()
+            .getSecondMessage()
+            .assertError(/Cannot delete Thing iot-thing/)
+
+        assert(listStub.calledOnceWithExactly({ thingName }))
+        sandbox.assert.notCalled(spyExecuteCommand)
+    })
+
+    it('does nothing when deletion is cancelled', async function () {
+        const deleteStub = sinon.stub()
+        iot.deleteThing = deleteStub
+        getTestWindow().onDidShowMessage((m) => m.selectItem('Cancel'))
+        await deleteThingCommand(node)
+
+        assert(deleteStub.notCalled)
+    })
+
+    it('shows an error message and refreshes node when thing deletion fails', async function () {
+        const deleteStub = sinon.stub().rejects()
+        iot.deleteThing = deleteStub
+
+        getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Delete')?.select())
+        await deleteThingCommand(node)
+
+        getTestWindow()
+            .getSecondMessage()
+            .assertError(/Failed to delete Thing: iot-thing/)
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', parentNode)
+    })
+
+    it('shows an error message and refreshes node if principals are not fetched', async function () {
+        const listStub = sinon.stub().rejects()
+        iot.listThingPrincipals = listStub
+
+        getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Delete')?.select())
+        await deleteThingCommand(node)
+
+        getTestWindow()
+            .getSecondMessage()
+            .assertError(/Failed to delete Thing: iot-thing/)
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', parentNode)
+    })
+})
diff --git a/packages/core/src/test/awsService/iot/commands/detachCert.test.ts b/packages/core/src/test/awsService/iot/commands/detachCert.test.ts
new file mode 100644
index 00000000000..06790d26e4c
--- /dev/null
+++ b/packages/core/src/test/awsService/iot/commands/detachCert.test.ts
@@ -0,0 +1,82 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { detachThingCertCommand } from '../../../../awsService/iot/commands/detachCert'
+import { IotThingFolderNode } from '../../../../awsService/iot/explorer/iotThingFolderNode'
+import { IotThingNode } from '../../../../awsService/iot/explorer/iotThingNode'
+import { IotThingCertNode } from '../../../../awsService/iot/explorer/iotCertificateNode'
+import { IotClient } from '../../../../shared/clients/iotClient'
+import globals from '../../../../shared/extensionGlobals'
+import { getTestWindow } from '../../../shared/vscode/window'
+import assert from 'assert'
+
+describe('detachThingCertCommand', function () {
+    const certificateId = 'test-certificate'
+    const principal = 'cert:arn'
+    const thingName = 'iot-thing'
+    let iot: IotClient
+    let node: IotThingCertNode
+    let parentNode: IotThingNode
+
+    let sandbox: sinon.SinonSandbox
+    let spyExecuteCommand: sinon.SinonSpy
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+
+        iot = {} as any as IotClient
+        parentNode = new IotThingNode({ name: thingName, arn: 'arn' }, {} as IotThingFolderNode, iot)
+        node = new IotThingCertNode(
+            { id: certificateId, arn: principal, activeStatus: 'ACTIVE', creationDate: new globals.clock.Date() },
+            parentNode,
+            iot
+        )
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('confirms detach, detaches certificate, and refreshes node', async function () {
+        const stub = sinon.stub()
+        iot.detachThingPrincipal = stub
+        getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Detach')?.select())
+        await detachThingCertCommand(node)
+
+        getTestWindow()
+            .getFirstMessage()
+            .assertWarn('Are you sure you want to detach certificate from Thing iot-thing?')
+
+        assert(stub.calledOnceWithExactly({ thingName, principal }))
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', parentNode)
+    })
+
+    it('does nothing when cancelled', async function () {
+        const stub = sinon.stub()
+        iot.detachThingPrincipal = stub
+        getTestWindow().onDidShowMessage((m) => m.selectItem('Cancel'))
+        await detachThingCertCommand(node)
+
+        assert(stub.notCalled)
+    })
+
+    it('shows an error message and refreshes node when thing detachment fails', async function () {
+        const stub = sinon.stub().rejects()
+        iot.detachThingPrincipal = stub
+
+        getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Detach')?.select())
+        await detachThingCertCommand(node)
+
+        getTestWindow()
+            .getSecondMessage()
+            .assertError(/Failed to detach: test-certificate/)
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', parentNode)
+    })
+})
diff --git a/packages/core/src/test/awsService/iot/commands/detachPolicy.test.ts b/packages/core/src/test/awsService/iot/commands/detachPolicy.test.ts
new file mode 100644
index 00000000000..2e4574cbb53
--- /dev/null
+++ b/packages/core/src/test/awsService/iot/commands/detachPolicy.test.ts
@@ -0,0 +1,65 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { detachPolicyCommand } from '../../../../awsService/iot/commands/detachPolicy'
+import { IotCertWithPoliciesNode } from '../../../../awsService/iot/explorer/iotCertificateNode'
+import { IotCertsFolderNode } from '../../../../awsService/iot/explorer/iotCertFolderNode'
+import { IotPolicyCertNode } from '../../../../awsService/iot/explorer/iotPolicyNode'
+import { IotClient } from '../../../../shared/clients/iotClient'
+import { IotNode } from '../../../../awsService/iot/explorer/iotNodes'
+import globals from '../../../../shared/extensionGlobals'
+import { getTestWindow } from '../../../shared/vscode/window'
+import sinon from 'sinon'
+import assert from 'assert'
+
+describe('detachPolicyCommand', function () {
+    const policyName = 'test-policy'
+    const target = 'cert:arn'
+    let iot: IotClient
+    let node: IotPolicyCertNode
+    let parentNode: IotCertWithPoliciesNode
+
+    beforeEach(function () {
+        iot = {} as any as IotClient
+        parentNode = new IotCertWithPoliciesNode(
+            { id: 'id', arn: target, activeStatus: 'ACTIVE', creationDate: new globals.clock.Date() },
+            new IotCertsFolderNode(iot, new IotNode(iot)),
+            iot
+        )
+        node = new IotPolicyCertNode({ name: policyName, arn: 'arn' }, parentNode, iot)
+    })
+
+    it('confirms detach, detaches policy, and refreshes node', async function () {
+        const stub = sinon.stub()
+        iot.detachPolicy = stub
+        getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Detach')?.select())
+        await detachPolicyCommand(node)
+
+        getTestWindow().getFirstMessage().assertWarn('Are you sure you want to detach policy test-policy?')
+
+        assert(stub.calledOnceWithExactly({ policyName, target }))
+    })
+
+    it('does nothing when cancelled', async function () {
+        const stub = sinon.stub()
+        iot.detachPolicy = stub
+        getTestWindow().onDidShowMessage((m) => m.selectItem('Cancel'))
+        await detachPolicyCommand(node)
+
+        assert(stub.notCalled)
+    })
+
+    it('shows an error message and refreshes node when thing detachment fails', async function () {
+        const stub = sinon.stub().rejects()
+        iot.detachPolicy = stub
+
+        getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Detach')?.select())
+        await detachPolicyCommand(node)
+
+        getTestWindow()
+            .getSecondMessage()
+            .assertError(/Failed to detach: test-policy/)
+    })
+})
diff --git a/packages/core/src/test/awsService/iot/commands/setDefaultPolicy.test.ts b/packages/core/src/test/awsService/iot/commands/setDefaultPolicy.test.ts
new file mode 100644
index 00000000000..ee2f0eedea4
--- /dev/null
+++ b/packages/core/src/test/awsService/iot/commands/setDefaultPolicy.test.ts
@@ -0,0 +1,70 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { setDefaultPolicy } from '../../../../awsService/iot/commands/setDefaultPolicy'
+import { IotNode } from '../../../../awsService/iot/explorer/iotNodes'
+import { IotPolicyFolderNode } from '../../../../awsService/iot/explorer/iotPolicyFolderNode'
+import { IotPolicyWithVersionsNode } from '../../../../awsService/iot/explorer/iotPolicyNode'
+import { IotPolicyVersionNode } from '../../../../awsService/iot/explorer/iotPolicyVersionNode'
+import { IotClient } from '../../../../shared/clients/iotClient'
+import { getTestWindow } from '../../../shared/vscode/window'
+import assert from 'assert'
+
+describe('setDefaultPolicy', function () {
+    const policyName = 'test-policy'
+    let iot: IotClient
+    let node: IotPolicyVersionNode
+    let parentNode: IotPolicyWithVersionsNode
+    let parentParentNode: IotPolicyFolderNode
+    let sandbox: sinon.SinonSandbox
+    let spyExecuteCommand: sinon.SinonSpy
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+
+        iot = {} as any as IotClient
+        parentParentNode = new IotPolicyFolderNode(iot, new IotNode(iot))
+        parentNode = new IotPolicyWithVersionsNode({ name: policyName, arn: 'arn' }, parentParentNode, iot)
+        node = new IotPolicyVersionNode(
+            { name: policyName, arn: 'arn' },
+            { versionId: 'V1', isDefaultVersion: false },
+            false,
+            parentNode,
+            iot
+        )
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('sets default version and refreshes node', async function () {
+        const stub = sinon.stub()
+        iot.setDefaultPolicyVersion = stub
+        await setDefaultPolicy(node)
+
+        getTestWindow()
+            .getFirstMessage()
+            .assertInfo(/Set V1 as default version of test-policy/)
+        assert(stub.calledOnceWithExactly({ policyName, policyVersionId: 'V1' }))
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode')
+    })
+
+    it('shows an error message and refreshes node when deletion fails', async function () {
+        const stub = sinon.stub().rejects()
+        iot.setDefaultPolicyVersion = stub
+        await setDefaultPolicy(node)
+
+        getTestWindow()
+            .getFirstMessage()
+            .assertError(/Failed to set default policy version/)
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode')
+    })
+})
diff --git a/packages/core/src/test/awsService/iot/commands/updateCert.test.ts b/packages/core/src/test/awsService/iot/commands/updateCert.test.ts
new file mode 100644
index 00000000000..27c94f562e7
--- /dev/null
+++ b/packages/core/src/test/awsService/iot/commands/updateCert.test.ts
@@ -0,0 +1,170 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    deactivateCertificateCommand,
+    activateCertificateCommand,
+    revokeCertificateCommand,
+} from '../../../../awsService/iot/commands/updateCert'
+import { IotCertWithPoliciesNode } from '../../../../awsService/iot/explorer/iotCertificateNode'
+import { IotCertsFolderNode } from '../../../../awsService/iot/explorer/iotCertFolderNode'
+import { IotThingCertNode } from '../../../../awsService/iot/explorer/iotCertificateNode'
+import { IotThingNode } from '../../../../awsService/iot/explorer/iotThingNode'
+import { IotThingFolderNode } from '../../../../awsService/iot/explorer/iotThingFolderNode'
+import { IotNode } from '../../../../awsService/iot/explorer/iotNodes'
+import { IotClient } from '../../../../shared/clients/iotClient'
+import globals from '../../../../shared/extensionGlobals'
+import { getTestWindow } from '../../../shared/vscode/window'
+import sinon from 'sinon'
+import assert from 'assert'
+
+describe('updateCertificate', function () {
+    const certificateId = 'test-cert'
+    let iot: IotClient
+    let node: IotCertWithPoliciesNode | IotThingCertNode
+    let parentNode: IotCertsFolderNode
+    let thingParentNode: IotThingNode
+
+    beforeEach(function () {
+        iot = {} as any as IotClient
+    })
+
+    describe('deactivateCommand', function () {
+        this.beforeEach(function () {
+            parentNode = new IotCertsFolderNode(iot, new IotNode(iot))
+            node = new IotCertWithPoliciesNode(
+                { id: certificateId, arn: 'arn', activeStatus: 'ACTIVE', creationDate: new globals.clock.Date() },
+                parentNode,
+                iot
+            )
+        })
+
+        it('confirms deactivation, deactivates cert, and refreshes tree', async function () {
+            const stub = sinon.stub()
+            iot.updateCertificate = stub
+            getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Deactivate')?.select())
+            await deactivateCertificateCommand(node)
+
+            getTestWindow().getFirstMessage().assertWarn('Are you sure you want to deactivate certificate test-cert?')
+            getTestWindow().getSecondMessage().assertInfo('Deactivated: test-cert')
+
+            assert(stub.calledOnceWithExactly({ certificateId, newStatus: 'INACTIVE' }))
+        })
+
+        it('does nothing when deactivation is cancelled', async function () {
+            const stub = sinon.stub()
+            iot.updateCertificate = stub
+            getTestWindow().onDidShowMessage((m) => m.selectItem('Cancel'))
+            await deactivateCertificateCommand(node)
+
+            assert(stub.notCalled)
+        })
+
+        it('shows an error message if deactivating the certificate fails', async function () {
+            const stub = sinon.stub().rejects()
+            iot.updateCertificate = stub
+            getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Deactivate')?.select())
+            await deactivateCertificateCommand(node)
+
+            getTestWindow()
+                .getSecondMessage()
+                .assertError(/Failed to deactivate: test-cert/)
+        })
+    })
+
+    describe('activateCommand', function () {
+        this.beforeEach(function () {
+            thingParentNode = new IotThingNode(
+                { name: 'iot-thing', arn: 'thingArn' },
+                new IotThingFolderNode(iot, new IotNode(iot)),
+                iot
+            )
+            node = new IotThingCertNode(
+                { id: certificateId, arn: 'arn', activeStatus: 'INACTIVE', creationDate: new globals.clock.Date() },
+                thingParentNode,
+                iot
+            )
+        })
+
+        it('confirms activation, activates cert, and refreshes tree', async function () {
+            const stub = sinon.stub()
+            iot.updateCertificate = stub
+            getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Activate')?.select())
+            await activateCertificateCommand(node)
+
+            getTestWindow().getFirstMessage().assertWarn('Are you sure you want to activate certificate test-cert?')
+            getTestWindow()
+                .getSecondMessage()
+                .assertInfo(/Activated: test-cert/)
+
+            assert(stub.calledOnceWithExactly({ certificateId, newStatus: 'ACTIVE' }))
+        })
+
+        it('does nothing when activation is cancelled', async function () {
+            const stub = sinon.stub()
+            iot.updateCertificate = stub
+            getTestWindow().onDidShowMessage((m) => m.selectItem('Cancel'))
+            await activateCertificateCommand(node)
+
+            assert(stub.notCalled)
+        })
+
+        it('shows an error message if deactivating the certificate fails', async function () {
+            const stub = sinon.stub().rejects()
+            iot.updateCertificate = stub
+            getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Activate')?.select())
+            await activateCertificateCommand(node)
+
+            getTestWindow()
+                .getSecondMessage()
+                .assertError(/Failed to activate: test-cert/)
+        })
+    })
+
+    describe('revoke', function () {
+        this.beforeEach(function () {
+            parentNode = new IotCertsFolderNode(iot, new IotNode(iot))
+            node = new IotCertWithPoliciesNode(
+                { id: certificateId, arn: 'arn', activeStatus: 'ACTIVE', creationDate: new globals.clock.Date() },
+                parentNode,
+                iot
+            )
+        })
+
+        it('confirms revocation, revokes cert, and refreshes tree', async function () {
+            const stub = sinon.stub()
+            iot.updateCertificate = stub
+            getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Revoke')?.select())
+            await revokeCertificateCommand(node)
+
+            getTestWindow().getFirstMessage().assertWarn('Are you sure you want to revoke certificate test-cert?')
+            getTestWindow()
+                .getSecondMessage()
+                .assertInfo(/Revoked: test-cert/)
+
+            assert(stub.calledOnceWithExactly({ certificateId, newStatus: 'REVOKED' }))
+        })
+
+        it('does nothing when revocation is cancelled', async function () {
+            const stub = sinon.stub()
+            iot.updateCertificate = stub
+            getTestWindow().onDidShowMessage((m) => m.selectItem('Cancel'))
+            await revokeCertificateCommand(node)
+
+            assert(stub.notCalled)
+        })
+
+        it('shows an error message if revoking the certificate fails', async function () {
+            const stub = sinon.stub().rejects()
+            iot.updateCertificate = stub
+            getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Revoke')?.select())
+            await revokeCertificateCommand(node)
+
+            getTestWindow()
+                .getSecondMessage()
+                .assertError(/Failed to revoke: test-cert/)
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/iot/commands/viewPolicyVersion.test.ts b/packages/core/src/test/awsService/iot/commands/viewPolicyVersion.test.ts
new file mode 100644
index 00000000000..5a5b675d7fb
--- /dev/null
+++ b/packages/core/src/test/awsService/iot/commands/viewPolicyVersion.test.ts
@@ -0,0 +1,83 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { viewPolicyVersionCommand } from '../../../../awsService/iot/commands/viewPolicyVersion'
+import { IotPolicyFolderNode } from '../../../../awsService/iot/explorer/iotPolicyFolderNode'
+import { IotPolicyWithVersionsNode } from '../../../../awsService/iot/explorer/iotPolicyNode'
+import { IotPolicyVersionNode } from '../../../../awsService/iot/explorer/iotPolicyVersionNode'
+import { IotClient } from '../../../../shared/clients/iotClient'
+import { getTabSizeSetting } from '../../../../shared/utilities/editorUtilities'
+
+const awsIotExamplePolicy =
+    '{ "Version": "2012-10-17", "Statement": [ {"Effect": "Allow", "Action": "*", "Resource": "*" } ] }'
+
+const expectedPolicy = JSON.stringify(JSON.parse(awsIotExamplePolicy), undefined, getTabSizeSetting())
+
+describe('viewPolicyVersionCommand', function () {
+    const policyName = 'test-policy'
+    let iot: IotClient
+    let node: IotPolicyVersionNode
+    let parentNode: IotPolicyWithVersionsNode
+    let sandbox: sinon.SinonSandbox
+
+    beforeEach(function () {
+        iot = {} as any as IotClient
+        parentNode = new IotPolicyWithVersionsNode({ name: policyName, arn: 'arn' }, {} as IotPolicyFolderNode, iot)
+        node = new IotPolicyVersionNode(
+            { name: policyName, arn: 'arn' },
+            { versionId: 'V1', isDefaultVersion: false },
+            false,
+            parentNode,
+            iot
+        )
+        sandbox = sinon.createSandbox()
+    })
+
+    this.afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('inserts policy document into editor', async function () {
+        const textEditor = {} as vscode.TextDocument
+        const openTextDocumentStub = sandbox
+            .stub(vscode.workspace, 'openTextDocument')
+            .returns(Promise.resolve(textEditor))
+        const showTextDocumentStub = sandbox.stub(vscode.window, 'showTextDocument').resolves({} as vscode.TextEditor)
+        const stub = sinon.stub().resolves({
+            policyDocument: awsIotExamplePolicy,
+        })
+        iot.getPolicyVersion = stub
+
+        await viewPolicyVersionCommand(node)
+
+        assert.strictEqual(openTextDocumentStub.calledOnce, true, 'should be called once')
+        assert.deepStrictEqual(
+            openTextDocumentStub.getCalls()[0].args[0],
+            {
+                language: 'json',
+                content: expectedPolicy,
+            },
+            'should open with correct content and language'
+        )
+
+        assert.strictEqual(showTextDocumentStub.calledOnce, true, 'should be called once')
+        assert.strictEqual(showTextDocumentStub.getCall(0).args[0], textEditor)
+    })
+
+    it('does nothing when policy retrieval fails', async function () {
+        const openTextDocumentStub = sandbox
+            .stub(vscode.workspace, 'openTextDocument')
+            .returns(Promise.resolve({} as vscode.TextDocument))
+        const stub = sinon.stub().rejects()
+        iot.getPolicyVersion = stub
+
+        await viewPolicyVersionCommand(node)
+
+        assert.strictEqual(openTextDocumentStub.notCalled, true, 'should not be called')
+    })
+})
diff --git a/packages/core/src/test/awsService/iot/explorer/iotCertFolderNode.test.ts b/packages/core/src/test/awsService/iot/explorer/iotCertFolderNode.test.ts
new file mode 100644
index 00000000000..7247b1df632
--- /dev/null
+++ b/packages/core/src/test/awsService/iot/explorer/iotCertFolderNode.test.ts
@@ -0,0 +1,93 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { MoreResultsNode } from '../../../../awsexplorer/moreResultsNode'
+import { IotNode } from '../../../../awsService/iot/explorer/iotNodes'
+import { IotCertificate, IotClient } from '../../../../shared/clients/iotClient'
+import { Certificate } from '@aws-sdk/client-iot'
+import { AWSTreeNodeBase } from '../../../../shared/treeview/nodes/awsTreeNodeBase'
+import { IotCertWithPoliciesNode } from '../../../../awsService/iot/explorer/iotCertificateNode'
+import { IotCertsFolderNode } from '../../../../awsService/iot/explorer/iotCertFolderNode'
+import { TestSettings } from '../../../utilities/testSettingsConfiguration'
+import sinon from 'sinon'
+
+describe('IotCertFolderNode', function () {
+    const nextMarker = 'nextToken'
+    const pageSize = 250
+
+    let iot: IotClient
+    let config: TestSettings
+
+    const cert: Certificate = {
+        certificateId: 'cert',
+        certificateArn: 'arn',
+        status: 'ACTIVE',
+        creationDate: new Date(0),
+    }
+    const expectedCert: IotCertificate = {
+        id: 'cert',
+        arn: 'arn',
+        activeStatus: 'ACTIVE',
+        creationDate: new Date(0),
+    }
+
+    function assertCertNode(node: AWSTreeNodeBase, expectedCert: IotCertificate): void {
+        assert.ok(node instanceof IotCertWithPoliciesNode, `Node ${node} should be a Certificate Node`)
+        assert.deepStrictEqual((node as IotCertWithPoliciesNode).certificate, expectedCert)
+    }
+
+    function assertMoreResultsNode(node: AWSTreeNodeBase): void {
+        assert.ok(node instanceof MoreResultsNode, `Node ${node} should be a More Results Node`)
+    }
+
+    beforeEach(function () {
+        iot = {} as any as IotClient
+        config = new TestSettings()
+    })
+
+    describe('getChildren', function () {
+        it('gets children', async function () {
+            const listStub = sinon.stub().resolves({
+                certificates: [cert],
+                nextMarker: undefined,
+            })
+            iot.listCertificates = listStub
+            const thingsStub = sinon.stub().resolves([])
+            iot.listThingsForCert = thingsStub
+
+            await config.getSection('aws').update('iot.maxItemsPerPage', pageSize)
+
+            const node = new IotCertsFolderNode(iot, new IotNode(iot), config)
+            const [certNode, ...otherNodes] = await node.getChildren()
+
+            assert(listStub.calledOnceWithExactly({ marker: undefined, pageSize }))
+            assert(thingsStub.calledOnceWithExactly({ principal: 'arn' }))
+            assertCertNode(certNode, expectedCert)
+            assert.strictEqual(otherNodes.length, 0)
+        })
+
+        it('gets children with node for loading more results', async function () {
+            const listStub = sinon.stub().resolves({
+                certificates: [cert],
+                nextMarker,
+            })
+            iot.listCertificates = listStub
+            const thingsStub = sinon.stub().resolves([])
+            iot.listThingsForCert = thingsStub
+            const targetsStub = sinon.stub().resolves([])
+            iot.listPolicyTargets = targetsStub
+
+            await config.getSection('aws').update('iot.maxItemsPerPage', pageSize)
+            const node = new IotCertsFolderNode(iot, new IotNode(iot), config)
+            const [certNode, moreResultsNode, ...otherNodes] = await node.getChildren()
+
+            assert(listStub.calledOnceWithExactly({ marker: undefined, pageSize }))
+            assertCertNode(certNode, expectedCert)
+            assertMoreResultsNode(moreResultsNode)
+            assert.strictEqual(otherNodes.length, 0)
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/iot/explorer/iotCertificateNode.test.ts b/packages/core/src/test/awsService/iot/explorer/iotCertificateNode.test.ts
new file mode 100644
index 00000000000..3afdcb6181d
--- /dev/null
+++ b/packages/core/src/test/awsService/iot/explorer/iotCertificateNode.test.ts
@@ -0,0 +1,76 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { MoreResultsNode } from '../../../../awsexplorer/moreResultsNode'
+import { IotClient, IotPolicy } from '../../../../shared/clients/iotClient'
+import { Policy } from '@aws-sdk/client-iot'
+import { AWSTreeNodeBase } from '../../../../shared/treeview/nodes/awsTreeNodeBase'
+import { IotPolicyCertNode } from '../../../../awsService/iot/explorer/iotPolicyNode'
+import { IotCertWithPoliciesNode } from '../../../../awsService/iot/explorer/iotCertificateNode'
+import { IotCertsFolderNode } from '../../../../awsService/iot/explorer/iotCertFolderNode'
+import { TestSettings } from '../../../utilities/testSettingsConfiguration'
+import sinon from 'sinon'
+
+describe('IotCertificateNode', function () {
+    const nextMarker = 'nextMarker'
+    const pageSize = 250
+
+    let iot: IotClient
+    let config: TestSettings
+    const certArn = 'certArn'
+    const cert = { id: 'cert', arn: certArn, activeStatus: 'ACTIVE', creationDate: new Date(0) }
+    const policy: Policy = { policyName: 'policy', policyArn: 'arn' }
+    const expectedPolicy: IotPolicy = { name: 'policy', arn: 'arn' }
+
+    function assertPolicyNode(node: AWSTreeNodeBase, expectedPolicy: IotPolicy): void {
+        assert.ok(node instanceof IotPolicyCertNode, `Node ${node} should be a Policy Node`)
+        assert.deepStrictEqual((node as IotPolicyCertNode).policy, expectedPolicy)
+    }
+
+    function assertMoreResultsNode(node: AWSTreeNodeBase): void {
+        assert.ok(node instanceof MoreResultsNode, `Node ${node} should be a More Results Node`)
+    }
+
+    beforeEach(function () {
+        iot = {} as any as IotClient
+        config = new TestSettings()
+    })
+
+    describe('getChildren', function () {
+        it('gets children', async function () {
+            const stub = sinon.stub().resolves({
+                policies: [policy],
+                nextMarker: undefined,
+            })
+            iot.listPrincipalPolicies = stub
+
+            await config.getSection('aws').update('iot.maxItemsPerPage', pageSize)
+            const node = new IotCertWithPoliciesNode(cert, {} as IotCertsFolderNode, iot, undefined, config)
+            const [policyNode, ...otherNodes] = await node.getChildren()
+
+            assertPolicyNode(policyNode, expectedPolicy)
+            assert(stub.calledOnceWithExactly({ principal: certArn, marker: undefined, pageSize }))
+            assert.strictEqual(otherNodes.length, 0)
+        })
+
+        it('gets children with node for loading more results', async function () {
+            const stub = sinon.stub().resolves({
+                policies: [policy],
+                nextMarker,
+            })
+            iot.listPrincipalPolicies = stub
+
+            await config.getSection('aws').update('iot.maxItemsPerPage', pageSize)
+            const node = new IotCertWithPoliciesNode(cert, {} as IotCertsFolderNode, iot, undefined, config)
+            const [policyNode, moreResultsNode, ...otherNodes] = await node.getChildren()
+
+            assert(stub.calledOnceWithExactly({ principal: certArn, marker: undefined, pageSize }))
+            assertPolicyNode(policyNode, expectedPolicy)
+            assertMoreResultsNode(moreResultsNode)
+            assert.strictEqual(otherNodes.length, 0)
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/iot/explorer/iotNodes.test.ts b/packages/core/src/test/awsService/iot/explorer/iotNodes.test.ts
new file mode 100644
index 00000000000..ce7dda7321f
--- /dev/null
+++ b/packages/core/src/test/awsService/iot/explorer/iotNodes.test.ts
@@ -0,0 +1,25 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { IotNode } from '../../../../awsService/iot/explorer/iotNodes'
+import { IotClient } from '../../../../shared/clients/iotClient'
+
+describe('IotNode', function () {
+    let iot: IotClient
+
+    beforeEach(function () {
+        iot = {} as any as IotClient
+    })
+
+    it('gets children', async function () {
+        const node = new IotNode(iot)
+        const [thingFolder, certFolder, policyFolder] = await node.getChildren()
+
+        assert.strictEqual(thingFolder, node.thingFolderNode)
+        assert.strictEqual(certFolder, node.certFolderNode)
+        assert.strictEqual(policyFolder, node.policyFolderNode)
+    })
+})
diff --git a/packages/core/src/test/awsService/iot/explorer/iotPolicyFolderNode.test.ts b/packages/core/src/test/awsService/iot/explorer/iotPolicyFolderNode.test.ts
new file mode 100644
index 00000000000..18e91a02531
--- /dev/null
+++ b/packages/core/src/test/awsService/iot/explorer/iotPolicyFolderNode.test.ts
@@ -0,0 +1,80 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { MoreResultsNode } from '../../../../awsexplorer/moreResultsNode'
+import { IotNode } from '../../../../awsService/iot/explorer/iotNodes'
+import { IotClient, IotPolicy } from '../../../../shared/clients/iotClient'
+import { Policy } from '@aws-sdk/client-iot'
+import { AWSTreeNodeBase } from '../../../../shared/treeview/nodes/awsTreeNodeBase'
+import { IotPolicyWithVersionsNode } from '../../../../awsService/iot/explorer/iotPolicyNode'
+import { IotPolicyFolderNode } from '../../../../awsService/iot/explorer/iotPolicyFolderNode'
+import { TestSettings } from '../../../utilities/testSettingsConfiguration'
+import sinon from 'sinon'
+
+describe('IotPolicyFolderNode', function () {
+    const nextMarker = 'nextMarker'
+    const pageSize = 250
+
+    let iot: IotClient
+    let config: TestSettings
+    const policy: Policy = { policyName: 'policy', policyArn: 'arn' }
+    const expectedPolicy: IotPolicy = { name: 'policy', arn: 'arn' }
+
+    function assertPolicyNode(node: AWSTreeNodeBase, expectedPolicy: IotPolicy): void {
+        assert.ok(node instanceof IotPolicyWithVersionsNode, `Node ${node} should be a Policy Node`)
+        assert.deepStrictEqual((node as IotPolicyWithVersionsNode).policy, expectedPolicy)
+    }
+
+    function assertMoreResultsNode(node: AWSTreeNodeBase): void {
+        assert.ok(node instanceof MoreResultsNode, `Node ${node} should be a More Results Node`)
+    }
+
+    beforeEach(function () {
+        iot = {} as any as IotClient
+        config = new TestSettings()
+    })
+
+    describe('getChildren', function () {
+        it('gets children', async function () {
+            const policiesStub = sinon.stub().resolves({
+                policies: [policy],
+                nextMarker: undefined,
+            })
+            iot.listPolicies = policiesStub
+            const targetsStub = sinon.stub().resolves([])
+            iot.listPolicyTargets = targetsStub
+
+            await config.getSection('aws').update('iot.maxItemsPerPage', pageSize)
+            const node = new IotPolicyFolderNode(iot, new IotNode(iot), config)
+            const [policyNode, ...otherNodes] = await node.getChildren()
+
+            assert(policiesStub.calledOnceWithExactly({ marker: undefined, pageSize }))
+            assert(targetsStub.calledOnceWithExactly({ policyName: 'policy' }))
+            assertPolicyNode(policyNode, expectedPolicy)
+            assert.strictEqual(otherNodes.length, 0)
+        })
+
+        it('gets children with node for loading more results', async function () {
+            const policiesStub = sinon.stub().resolves({
+                policies: [policy],
+                nextMarker,
+            })
+            iot.listPolicies = policiesStub
+            const targetsStub = sinon.stub().resolves([])
+            iot.listPolicyTargets = targetsStub
+
+            await config.getSection('aws').update('iot.maxItemsPerPage', pageSize)
+            const node = new IotPolicyFolderNode(iot, new IotNode(iot), config)
+            const [policyNode, moreResultsNode, ...otherNodes] = await node.getChildren()
+
+            assert(policiesStub.calledOnceWithExactly({ marker: undefined, pageSize }))
+            assert(targetsStub.calledOnceWithExactly({ policyName: 'policy' }))
+            assertPolicyNode(policyNode, expectedPolicy)
+            assertMoreResultsNode(moreResultsNode)
+            assert.strictEqual(otherNodes.length, 0)
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/iot/explorer/iotPolicyNode.test.ts b/packages/core/src/test/awsService/iot/explorer/iotPolicyNode.test.ts
new file mode 100644
index 00000000000..88e55b929df
--- /dev/null
+++ b/packages/core/src/test/awsService/iot/explorer/iotPolicyNode.test.ts
@@ -0,0 +1,58 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { IotClient, IotPolicy } from '../../../../shared/clients/iotClient'
+import { PolicyVersion } from '@aws-sdk/client-iot'
+import { AWSTreeNodeBase } from '../../../../shared/treeview/nodes/awsTreeNodeBase'
+import { asyncGenerator } from '../../../../shared/utilities/collectionUtils'
+import { IotPolicyWithVersionsNode } from '../../../../awsService/iot/explorer/iotPolicyNode'
+import { IotPolicyVersionNode } from '../../../../awsService/iot/explorer/iotPolicyVersionNode'
+import { IotPolicyFolderNode } from '../../../../awsService/iot/explorer/iotPolicyFolderNode'
+import { TestSettings } from '../../../utilities/testSettingsConfiguration'
+import sinon from 'sinon'
+
+describe('IotPolicyNode', function () {
+    let iot: IotClient
+    let config: TestSettings
+    const policyName = 'policy'
+    const expectedPolicy: IotPolicy = { name: policyName, arn: 'arn' }
+    const policyVersion: PolicyVersion = { versionId: 'V1', isDefaultVersion: true }
+
+    function assertPolicyVersionNode(
+        node: AWSTreeNodeBase,
+        expectedPolicy: IotPolicy,
+        expectedVersion: PolicyVersion
+    ): void {
+        assert.ok(node instanceof IotPolicyVersionNode, `Node ${node} should be a Policy Version Node`)
+        assert.deepStrictEqual((node as IotPolicyVersionNode).version, expectedVersion)
+        assert.deepStrictEqual((node as IotPolicyVersionNode).policy, expectedPolicy)
+    }
+
+    beforeEach(function () {
+        iot = {} as any as IotClient
+        config = new TestSettings()
+    })
+
+    describe('getChildren', function () {
+        it('gets children', async function () {
+            const versions = [{ versionId: 'V1', isDefaultVersion: true }]
+            const stub = sinon.stub().returns(asyncGenerator<PolicyVersion>(versions))
+            iot.listPolicyVersions = stub
+            const node = new IotPolicyWithVersionsNode(
+                expectedPolicy,
+                {} as IotPolicyFolderNode,
+                iot,
+                undefined,
+                config
+            )
+            const [policyVersionNode, ...otherNodes] = await node.getChildren()
+
+            assert(stub.calledOnceWithExactly({ policyName }))
+            assertPolicyVersionNode(policyVersionNode, expectedPolicy, policyVersion)
+            assert.strictEqual(otherNodes.length, 0)
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/iot/explorer/iotPolicyVersionNode.test.ts b/packages/core/src/test/awsService/iot/explorer/iotPolicyVersionNode.test.ts
new file mode 100644
index 00000000000..4faf56e743d
--- /dev/null
+++ b/packages/core/src/test/awsService/iot/explorer/iotPolicyVersionNode.test.ts
@@ -0,0 +1,55 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { IotClient, IotPolicy } from '../../../../shared/clients/iotClient'
+import { PolicyVersion } from '@aws-sdk/client-iot'
+import { IotPolicyWithVersionsNode } from '../../../../awsService/iot/explorer/iotPolicyNode'
+import { IotPolicyVersionNode } from '../../../../awsService/iot/explorer/iotPolicyVersionNode'
+import { stringOrProp } from '../../../../shared/utilities/tsUtils'
+import { formatLocalized } from '../../../../shared/datetime'
+
+describe('IotPolicyVersionNode', function () {
+    const policyName = 'policy'
+    const expectedPolicy: IotPolicy = { name: policyName, arn: 'arn' }
+    const createDate = new Date(Date.UTC(2021, 1, 1)) // Feb 1 UTC = Jan 31 PDT
+    const createDateFormatted = formatLocalized(createDate)
+    const policyVersion: PolicyVersion = { versionId: 'V1', isDefaultVersion: true, createDate }
+    const nonDefaultVersion: PolicyVersion = { versionId: 'V2', isDefaultVersion: false, createDate }
+
+    it('creates an IoT Policy Version Node for default version', async function () {
+        const node = new IotPolicyVersionNode(
+            expectedPolicy,
+            policyVersion,
+            policyVersion.isDefaultVersion!,
+            {} as IotPolicyWithVersionsNode,
+            {} as IotClient
+        )
+
+        assert.ok(
+            stringOrProp(node.tooltip, 'tooltip').startsWith(
+                `Policy: ${policyName}\nVersion: V1\nDEFAULT\nCreated: ${createDateFormatted}`
+            )
+        )
+        assert.strictEqual(node.label, 'Version V1*')
+    })
+
+    it('creates an IoT Policy Version Node for non-default version', async function () {
+        const node = new IotPolicyVersionNode(
+            expectedPolicy,
+            nonDefaultVersion,
+            nonDefaultVersion.isDefaultVersion!,
+            {} as IotPolicyWithVersionsNode,
+            {} as IotClient
+        )
+
+        assert.ok(
+            stringOrProp(node.tooltip, 'tooltip').startsWith(
+                `Policy: ${policyName}\nVersion: V2\nCreated: ${createDateFormatted}`
+            )
+        )
+        assert.strictEqual(node.label, 'Version V2')
+    })
+})
diff --git a/packages/core/src/test/awsService/iot/explorer/iotThingFolderNode.test.ts b/packages/core/src/test/awsService/iot/explorer/iotThingFolderNode.test.ts
new file mode 100644
index 00000000000..667b39974b7
--- /dev/null
+++ b/packages/core/src/test/awsService/iot/explorer/iotThingFolderNode.test.ts
@@ -0,0 +1,74 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { MoreResultsNode } from '../../../../awsexplorer/moreResultsNode'
+import { IotNode } from '../../../../awsService/iot/explorer/iotNodes'
+import { IotThingFolderNode } from '../../../../awsService/iot/explorer/iotThingFolderNode'
+import { IotThingNode } from '../../../../awsService/iot/explorer/iotThingNode'
+import { IotClient, IotThing } from '../../../../shared/clients/iotClient'
+import { ThingAttribute } from '@aws-sdk/client-iot'
+import { AWSTreeNodeBase } from '../../../../shared/treeview/nodes/awsTreeNodeBase'
+import { TestSettings } from '../../../utilities/testSettingsConfiguration'
+import sinon from 'sinon'
+
+describe('IotThingFolderNode', function () {
+    const nextToken = 'nextToken'
+    const maxResults = 150
+
+    let iot: IotClient
+    let config: TestSettings
+    const thing: ThingAttribute = { thingName: 'thing', thingArn: 'arn' }
+    const expectedThing: IotThing = { name: 'thing', arn: 'arn' }
+
+    function assertThingNode(node: AWSTreeNodeBase, expectedThing: IotThing): void {
+        assert.ok(node instanceof IotThingNode, `Node ${node} should be a Thing Node`)
+        assert.deepStrictEqual((node as IotThingNode).thing, expectedThing)
+    }
+
+    function assertMoreResultsNode(node: AWSTreeNodeBase): void {
+        assert.ok(node instanceof MoreResultsNode, `Node ${node} should be a More Results Node`)
+    }
+
+    beforeEach(function () {
+        iot = {} as any as IotClient
+        config = new TestSettings()
+    })
+
+    describe('getChildren', function () {
+        it('gets children', async function () {
+            const stub = sinon.stub().resolves({
+                things: [thing],
+                nextToken: undefined,
+            })
+            iot.listThings = stub
+
+            await config.getSection('aws').update('iot.maxItemsPerPage', maxResults)
+            const node = new IotThingFolderNode(iot, new IotNode(iot), config)
+            const [thingNode, ...otherNodes] = await node.getChildren()
+
+            assert(stub.calledOnceWithExactly({ nextToken: undefined, maxResults }))
+            assertThingNode(thingNode, expectedThing)
+            assert.strictEqual(otherNodes.length, 0)
+        })
+
+        it('gets children with node for loading more results', async function () {
+            const stub = sinon.stub().resolves({
+                things: [thing],
+                nextToken,
+            })
+            iot.listThings = stub
+
+            await config.getSection('aws').update('iot.maxItemsPerPage', maxResults)
+            const node = new IotThingFolderNode(iot, new IotNode(iot), config)
+            const [thingNode, moreResultsNode, ...otherNodes] = await node.getChildren()
+
+            assert(stub.calledOnceWithExactly({ nextToken: undefined, maxResults }))
+            assertThingNode(thingNode, expectedThing)
+            assertMoreResultsNode(moreResultsNode)
+            assert.strictEqual(otherNodes.length, 0)
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/iot/explorer/iotThingNode.test.ts b/packages/core/src/test/awsService/iot/explorer/iotThingNode.test.ts
new file mode 100644
index 00000000000..663860ef968
--- /dev/null
+++ b/packages/core/src/test/awsService/iot/explorer/iotThingNode.test.ts
@@ -0,0 +1,86 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { MoreResultsNode } from '../../../../awsexplorer/moreResultsNode'
+import { IotCertificate, IotClient } from '../../../../shared/clients/iotClient'
+import { Certificate } from '@aws-sdk/client-iot'
+import { AWSTreeNodeBase } from '../../../../shared/treeview/nodes/awsTreeNodeBase'
+import { IotThingCertNode } from '../../../../awsService/iot/explorer/iotCertificateNode'
+import { IotThingNode } from '../../../../awsService/iot/explorer/iotThingNode'
+import { IotThingFolderNode } from '../../../../awsService/iot/explorer/iotThingFolderNode'
+import { TestSettings } from '../../../utilities/testSettingsConfiguration'
+import sinon from 'sinon'
+
+describe('IotThingNode', function () {
+    const nextToken = 'nextToken'
+    const maxResults = 250
+
+    let iot: IotClient
+    let config: TestSettings
+    const thingName = 'thing'
+    const thing = { name: thingName, arn: 'thingArn' }
+    const cert: Certificate = {
+        certificateId: 'cert',
+        certificateArn: 'arn',
+        status: 'ACTIVE',
+        creationDate: new Date(0),
+    }
+    const expectedCert: IotCertificate = {
+        id: 'cert',
+        arn: 'arn',
+        activeStatus: 'ACTIVE',
+        creationDate: new Date(0),
+    }
+
+    function assertCertNode(node: AWSTreeNodeBase, expectedCert: IotCertificate): void {
+        assert.ok(node instanceof IotThingCertNode, `Node ${node} should be a Certificate Node`)
+        assert.deepStrictEqual((node as IotThingCertNode).certificate, expectedCert)
+    }
+
+    function assertMoreResultsNode(node: AWSTreeNodeBase): void {
+        assert.ok(node instanceof MoreResultsNode, `Node ${node} should be a More Results Node`)
+    }
+
+    beforeEach(function () {
+        iot = {} as any as IotClient
+        config = new TestSettings()
+    })
+
+    describe('getChildren', function () {
+        it('gets children', async function () {
+            const stub = sinon.stub().resolves({
+                certificates: [cert],
+                nextToken: undefined,
+            })
+            iot.listThingCertificates = stub
+
+            await config.getSection('aws').update('iot.maxItemsPerPage', maxResults)
+            const node = new IotThingNode(thing, {} as IotThingFolderNode, iot, config)
+            const [certNode, ...otherNodes] = await node.getChildren()
+
+            assert(stub.calledOnceWithExactly({ thingName, nextToken: undefined, maxResults }))
+            assertCertNode(certNode, expectedCert)
+            assert.strictEqual(otherNodes.length, 0)
+        })
+
+        it('gets children with node for loading more results', async function () {
+            const stub = sinon.stub().resolves({
+                certificates: [cert],
+                nextToken,
+            })
+            iot.listThingCertificates = stub
+
+            await config.getSection('aws').update('iot.maxItemsPerPage', maxResults)
+            const node = new IotThingNode(thing, {} as IotThingFolderNode, iot, config)
+            const [certNode, moreResultsNode, ...otherNodes] = await node.getChildren()
+
+            assert(stub.calledOnceWithExactly({ thingName, nextToken: undefined, maxResults }))
+            assertCertNode(certNode, expectedCert)
+            assertMoreResultsNode(moreResultsNode)
+            assert.strictEqual(otherNodes.length, 0)
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/redshift/explorer/redshiftDatabaseNode.test.ts b/packages/core/src/test/awsService/redshift/explorer/redshiftDatabaseNode.test.ts
new file mode 100644
index 00000000000..f291b926c0c
--- /dev/null
+++ b/packages/core/src/test/awsService/redshift/explorer/redshiftDatabaseNode.test.ts
@@ -0,0 +1,62 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { mockClient } from 'aws-sdk-client-mock'
+import { RedshiftDatabaseNode } from '../../../../awsService/redshift/explorer/redshiftDatabaseNode'
+import { RedshiftDataClient, ListSchemasCommand } from '@aws-sdk/client-redshift-data'
+import { DefaultRedshiftClient } from '../../../../shared/clients/redshiftClient'
+import { ConnectionParams, ConnectionType, RedshiftWarehouseType } from '../../../../awsService/redshift/models/models'
+import assert = require('assert')
+import { RedshiftSchemaNode } from '../../../../awsService/redshift/explorer/redshiftSchemaNode'
+import { AWSTreeNodeBase } from '../../../../shared/treeview/nodes/awsTreeNodeBase'
+import { MoreResultsNode } from '../../../../awsexplorer/moreResultsNode'
+
+describe('RedshiftDatabaseNode', function () {
+    const mockRedshiftData = mockClient(RedshiftDataClient)
+    const redshiftClient = new DefaultRedshiftClient('us-east-1', () => mockRedshiftData as any, undefined, undefined)
+    const connectionParams = new ConnectionParams(
+        ConnectionType.TempCreds,
+        'testDb1',
+        'warehouseId',
+        RedshiftWarehouseType.PROVISIONED
+    )
+
+    describe('getChildren', function () {
+        afterEach(function () {
+            mockRedshiftData.reset()
+        })
+
+        it('loads schemas successfully', async () => {
+            const node = new RedshiftDatabaseNode('testDB1', redshiftClient, connectionParams)
+            mockRedshiftData.on(ListSchemasCommand).resolves({ Schemas: ['schema1'] })
+            const childNodes = await node.getChildren()
+            verifyChildNodes(childNodes, false)
+        })
+
+        it('loads schemas and shows load more node when there are more schemas', async () => {
+            const node = new RedshiftDatabaseNode('testDB1', redshiftClient, connectionParams)
+            mockRedshiftData.on(ListSchemasCommand).resolves({ Schemas: ['schema1'], NextToken: 'next' })
+            const childNodes = await node.getChildren()
+            verifyChildNodes(childNodes, true)
+        })
+
+        it('shows error node when listSchema fails', async () => {
+            const node = new RedshiftDatabaseNode('testDB1', redshiftClient, connectionParams)
+            mockRedshiftData.on(ListSchemasCommand).rejects('Failed')
+            const childNodes = await node.getChildren()
+            assert.strictEqual(childNodes.length, 1)
+            assert.strictEqual(childNodes[0].contextValue, 'awsErrorNode')
+        })
+    })
+})
+
+function verifyChildNodes(childNodes: AWSTreeNodeBase[], withLoadMore: boolean) {
+    assert.strictEqual(childNodes.length, withLoadMore ? 2 : 1)
+    assert.ok(childNodes[0] instanceof RedshiftSchemaNode)
+    assert.strictEqual((childNodes[0] as RedshiftSchemaNode).schemaName, 'schema1')
+    if (withLoadMore) {
+        assert.ok(childNodes[1] instanceof MoreResultsNode)
+    }
+}
diff --git a/packages/core/src/test/awsService/redshift/explorer/redshiftNode.test.ts b/packages/core/src/test/awsService/redshift/explorer/redshiftNode.test.ts
new file mode 100644
index 00000000000..26df4f5abf7
--- /dev/null
+++ b/packages/core/src/test/awsService/redshift/explorer/redshiftNode.test.ts
@@ -0,0 +1,126 @@
+/*!
+ * Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+// eslint-disable-next-line header/header
+import { mockClient, AwsClientStub } from 'aws-sdk-client-mock'
+import { RedshiftNode } from '../../../../awsService/redshift/explorer/redshiftNode'
+import { DefaultRedshiftClient } from '../../../../shared/clients/redshiftClient'
+import assert = require('assert')
+import { RedshiftWarehouseNode } from '../../../../awsService/redshift/explorer/redshiftWarehouseNode'
+import { Cluster, ClustersMessage, RedshiftClient, DescribeClustersCommand } from '@aws-sdk/client-redshift'
+import {
+    ListWorkgroupsResponse,
+    Workgroup,
+    RedshiftServerlessClient,
+    ListWorkgroupsCommand,
+} from '@aws-sdk/client-redshift-serverless'
+import { RedshiftWarehouseType } from '../../../../awsService/redshift/models/models'
+import { MoreResultsNode } from '../../../../awsexplorer/moreResultsNode'
+import { AWSTreeNodeBase } from '../../../../shared/treeview/nodes/awsTreeNodeBase'
+
+function getExpectedProvisionedResponse(withNextToken: boolean): ClustersMessage {
+    const response = {
+        Clusters: [
+            { ClusterNamespaceArn: 'testArn', ClusterIdentifier: 'testId', ClusterAvailabilityStatus: 'available' },
+        ] as Cluster[],
+    } as ClustersMessage
+    if (withNextToken) {
+        response.Marker = 'next'
+    }
+    return response
+}
+
+function getExpectedServerlessResponse(withNextToken: boolean): ListWorkgroupsResponse {
+    const response = {
+        workgroups: [{ workgroupArn: 'testArn', workgroupName: 'testWorkgroup', status: 'AVAILABLE' }] as Workgroup[],
+    } as ListWorkgroupsResponse
+    if (withNextToken) {
+        response.nextToken = 'next'
+    }
+    return response
+}
+
+function verifyChildNodeCounts(
+    childNodes: AWSTreeNodeBase[],
+    expectedProvisionedNodeCount: number,
+    expectedServerlessNodeCount: number,
+    expectedLoadMoreNodeCount: number
+) {
+    const provisionedNodes = childNodes.filter(
+        (childNode) => (childNode as RedshiftWarehouseNode).warehouseType === RedshiftWarehouseType.PROVISIONED
+    )
+    const serverlessNodes = childNodes.filter(
+        (childNode) => (childNode as RedshiftWarehouseNode).warehouseType === RedshiftWarehouseType.SERVERLESS
+    )
+    const loadMoreNodes = childNodes.filter((childNode) => childNode instanceof MoreResultsNode)
+    assert.strictEqual(
+        childNodes.length,
+        expectedProvisionedNodeCount + expectedServerlessNodeCount + expectedLoadMoreNodeCount,
+        'Total node count mismatch'
+    )
+    assert.strictEqual(provisionedNodes.length, expectedProvisionedNodeCount, 'ProvisionedNode count mismatch')
+    assert.strictEqual(serverlessNodes.length, expectedServerlessNodeCount, 'ServerlessNode count mismatch')
+    assert.strictEqual(loadMoreNodes.length, expectedLoadMoreNodeCount, 'LoadMoreNode count mismatch')
+}
+
+describe('redshiftNode', function () {
+    describe('getChildren', function () {
+        let node: RedshiftNode
+        let redshiftClient: DefaultRedshiftClient
+        let mockRedshift: AwsClientStub<RedshiftClient>
+        let mockRedshiftServerless: AwsClientStub<RedshiftServerlessClient>
+
+        beforeEach(function () {
+            mockRedshift = mockClient(RedshiftClient)
+            mockRedshiftServerless = mockClient(RedshiftServerlessClient)
+            redshiftClient = new DefaultRedshiftClient(
+                'us-east-1',
+                undefined,
+                // @ts-expect-error
+                () => mockRedshift,
+                () => mockRedshiftServerless
+            )
+            node = new RedshiftNode(redshiftClient)
+        })
+
+        afterEach(function () {
+            mockRedshift.reset()
+            mockRedshiftServerless.reset()
+        })
+
+        it('gets both provisioned and serverless warehouses when no results have been loaded', async () => {
+            mockRedshift.on(DescribeClustersCommand).resolves(getExpectedProvisionedResponse(false))
+            mockRedshiftServerless.on(ListWorkgroupsCommand).resolves(getExpectedServerlessResponse(false))
+            const childNodes = await node.getChildren()
+            verifyChildNodeCounts(childNodes, 1, 1, 0)
+        })
+
+        it('gets both provisioned and serverless warehouses if results have been loaded but there are more results', async () => {
+            mockRedshift.on(DescribeClustersCommand).resolves(getExpectedProvisionedResponse(true))
+            mockRedshiftServerless.on(ListWorkgroupsCommand).resolves(getExpectedServerlessResponse(true))
+            const childNodes = await node.getChildren()
+            verifyChildNodeCounts(childNodes, 1, 1, 1)
+        })
+
+        it('gets only provisioned warehouses if results have been loaded and there are only more provisioned warehouses', async () => {
+            mockRedshift.on(DescribeClustersCommand).resolves(getExpectedProvisionedResponse(true))
+            mockRedshiftServerless.on(ListWorkgroupsCommand).resolves(getExpectedServerlessResponse(false))
+            const childNodes = await node.getChildren()
+            verifyChildNodeCounts(childNodes, 1, 1, 1)
+            await node.loadMoreChildren()
+            const newChildNodes = await node.getChildren()
+            verifyChildNodeCounts(newChildNodes, 2, 1, 1)
+        })
+
+        it('gets only serverless warehouses if results have been loaded and there are only more serverless warehouses', async () => {
+            mockRedshift.on(DescribeClustersCommand).resolves(getExpectedProvisionedResponse(false))
+            mockRedshiftServerless.on(ListWorkgroupsCommand).resolves(getExpectedServerlessResponse(true))
+            const childNodes = await node.getChildren()
+            verifyChildNodeCounts(childNodes, 1, 1, 1)
+            await node.loadMoreChildren()
+            const newChildNodes = await node.getChildren()
+            verifyChildNodeCounts(newChildNodes, 1, 2, 1)
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/redshift/explorer/redshiftSchemaNode.test.ts b/packages/core/src/test/awsService/redshift/explorer/redshiftSchemaNode.test.ts
new file mode 100644
index 00000000000..68c2d792cfa
--- /dev/null
+++ b/packages/core/src/test/awsService/redshift/explorer/redshiftSchemaNode.test.ts
@@ -0,0 +1,66 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { mockClient, AwsClientStub } from 'aws-sdk-client-mock'
+import * as assert from 'assert'
+import { DefaultRedshiftClient } from '../../../../shared/clients/redshiftClient'
+import { RedshiftDataClient, ListTablesCommand, ListTablesResponse } from '@aws-sdk/client-redshift-data'
+import { RedshiftSchemaNode } from '../../../../awsService/redshift/explorer/redshiftSchemaNode'
+import { ConnectionParams, ConnectionType, RedshiftWarehouseType } from '../../../../awsService/redshift/models/models'
+import { RedshiftTableNode } from '../../../../awsService/redshift/explorer/redshiftTableNode'
+import { MoreResultsNode } from '../../../../awsexplorer/moreResultsNode'
+
+describe('RedshiftSchemaNode', function () {
+    const mockRedshiftData: AwsClientStub<RedshiftDataClient> = mockClient(RedshiftDataClient)
+    const redshiftClient: DefaultRedshiftClient = new DefaultRedshiftClient(
+        'us-east-1',
+        // @ts-expect-error
+        () => mockRedshiftData,
+        undefined,
+        undefined
+    )
+    const connectionParams = new ConnectionParams(
+        ConnectionType.TempCreds,
+        'testDb1',
+        'warehouseId',
+        RedshiftWarehouseType.PROVISIONED
+    )
+
+    describe('getChildren', function () {
+        afterEach(function () {
+            mockRedshiftData.reset()
+        })
+
+        it('gets table nodes and filters out tables with pkey', async () => {
+            mockRedshiftData
+                .on(ListTablesCommand)
+                .resolves({ Tables: [{ name: 'test' }, { name: 'test_pkey' }] } as ListTablesResponse)
+            const node = new RedshiftSchemaNode('testSchema', redshiftClient, connectionParams)
+            const childNodes = await node.getChildren()
+            assert.strictEqual(childNodes.length, 1)
+            assert.strictEqual((childNodes[0] as RedshiftTableNode).tableName, 'test')
+        })
+
+        it('gets table nodes & adds load more node if there are more nodes to be loaded', async () => {
+            mockRedshiftData.on(ListTablesCommand).resolves({
+                Tables: [{ name: 'test' }, { name: 'test_pkey' }],
+                NextToken: 'next',
+            } as ListTablesResponse)
+            const node = new RedshiftSchemaNode('testSchema', redshiftClient, connectionParams)
+            const childNodes = await node.getChildren()
+            assert.strictEqual(childNodes.length, 2)
+            assert.strictEqual((childNodes[0] as RedshiftTableNode).tableName, 'test')
+            assert.ok(childNodes[1] instanceof MoreResultsNode)
+        })
+
+        it('shows error node when list table API errors out', async () => {
+            mockRedshiftData.on(ListTablesCommand).rejects('failed')
+            const node = new RedshiftSchemaNode('testSchema', redshiftClient, connectionParams)
+            const childNodes = await node.getChildren()
+            assert.strictEqual(childNodes.length, 1)
+            assert.strictEqual(childNodes[0].contextValue, 'awsErrorNode')
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/redshift/explorer/redshiftWarehouseNode.test.ts b/packages/core/src/test/awsService/redshift/explorer/redshiftWarehouseNode.test.ts
new file mode 100644
index 00000000000..b82e9c972f9
--- /dev/null
+++ b/packages/core/src/test/awsService/redshift/explorer/redshiftWarehouseNode.test.ts
@@ -0,0 +1,110 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import sinon = require('sinon')
+import { DefaultRedshiftClient } from '../../../../shared/clients/redshiftClient'
+import { ListDatabasesResponse, RedshiftDataClient, ListDatabasesCommand } from '@aws-sdk/client-redshift-data'
+import { ConnectionParams, ConnectionType, RedshiftWarehouseType } from '../../../../awsService/redshift/models/models'
+import {
+    RedshiftWarehouseNode,
+    CreateNotebookNode,
+} from '../../../../awsService/redshift/explorer/redshiftWarehouseNode'
+import { RedshiftNode } from '../../../../awsService/redshift/explorer/redshiftNode'
+import { AWSResourceNode } from '../../../../shared/treeview/nodes/awsResourceNode'
+import * as assert from 'assert'
+import { RedshiftDatabaseNode } from '../../../../awsService/redshift/explorer/redshiftDatabaseNode'
+import { AWSCommandTreeNode } from '../../../../shared/treeview/nodes/awsCommandTreeNode'
+import { RedshiftNodeConnectionWizard } from '../../../../awsService/redshift/wizards/connectionWizard'
+import { MoreResultsNode } from '../../../../awsexplorer/moreResultsNode'
+import { AWSTreeNodeBase } from '../../../../shared/treeview/nodes/awsTreeNodeBase'
+import { mockClient, AwsClientStub } from 'aws-sdk-client-mock'
+
+function verifyChildNodes(childNodes: AWSTreeNodeBase[], databaseNodeCount: number, shouldHaveLoadMore: boolean) {
+    assert.strictEqual(childNodes.length, databaseNodeCount + (shouldHaveLoadMore ? 1 : 0) + 1)
+    const startButtonNodes = childNodes.filter((node) => node instanceof CreateNotebookNode)
+    assert.strictEqual(startButtonNodes.length, 1)
+    assert.ok(childNodes[0] instanceof CreateNotebookNode)
+    const databaseNodes = childNodes.filter((node) => node instanceof RedshiftDatabaseNode)
+    assert.strictEqual(databaseNodes.length, databaseNodeCount)
+    const loadMoreNodes = childNodes.filter((node) => node instanceof MoreResultsNode)
+    assert.strictEqual(loadMoreNodes.length, shouldHaveLoadMore ? 1 : 0)
+}
+
+function verifyRetryNode(childNodes: AWSTreeNodeBase[]) {
+    assert.strictEqual(childNodes.length, 1)
+    assert.ok(childNodes[0] instanceof AWSCommandTreeNode)
+    const cmdTreeNode = childNodes[0] as AWSCommandTreeNode
+    assert.strictEqual(cmdTreeNode.command?.command, 'aws.refreshAwsExplorerNode')
+}
+
+describe('redshiftWarehouseNode', function () {
+    describe('getChildren', function () {
+        const expectedResponse = { Databases: ['testDb1'] } as ListDatabasesResponse
+        const expectedResponseWithNextToken = { Databases: ['testDb1'], NextToken: 'next' } as ListDatabasesResponse
+        const connectionParams = new ConnectionParams(
+            ConnectionType.TempCreds,
+            'testDb1',
+            'warehouseId',
+            RedshiftWarehouseType.PROVISIONED
+        )
+        const resourceNode = { arn: 'testARN', name: 'warehouseId' } as AWSResourceNode
+        let mockRedshiftData: AwsClientStub<RedshiftDataClient>
+        let redshiftClient: DefaultRedshiftClient
+        let redshiftNode: RedshiftNode
+        let warehouseNode: RedshiftWarehouseNode
+        let connectionWizardStub: sinon.SinonStub
+
+        beforeEach(function () {
+            mockRedshiftData = mockClient(RedshiftDataClient)
+            redshiftClient = new DefaultRedshiftClient(
+                'us-east-1',
+                // @ts-expect-error
+                () => mockRedshiftData,
+                undefined,
+                undefined
+            )
+            redshiftNode = new RedshiftNode(redshiftClient)
+        })
+
+        afterEach(function () {
+            mockRedshiftData.reset()
+            connectionWizardStub.restore()
+        })
+        it('gets databases for a warehouse and adds a start button', async () => {
+            connectionWizardStub = sinon.stub(RedshiftNodeConnectionWizard.prototype, 'run').resolves(connectionParams)
+            warehouseNode = new RedshiftWarehouseNode(redshiftNode, resourceNode, RedshiftWarehouseType.PROVISIONED)
+            mockRedshiftData.on(ListDatabasesCommand).resolves(expectedResponse)
+
+            const childNodes = await warehouseNode.getChildren()
+
+            verifyChildNodes(childNodes, 1, false)
+        })
+
+        it('gets databases for a warehouse, adds a start button and a load more button if there are more results', async () => {
+            connectionWizardStub = sinon.stub(RedshiftNodeConnectionWizard.prototype, 'run').resolves(connectionParams)
+            warehouseNode = new RedshiftWarehouseNode(redshiftNode, resourceNode, RedshiftWarehouseType.PROVISIONED)
+            mockRedshiftData.on(ListDatabasesCommand).resolves(expectedResponseWithNextToken)
+
+            const childNodes = await warehouseNode.getChildren()
+
+            verifyChildNodes(childNodes, 1, true)
+        })
+
+        it('shows a node with retry if user exits wizard', async () => {
+            connectionWizardStub = sinon.stub(RedshiftNodeConnectionWizard.prototype, 'run').resolves(undefined)
+            warehouseNode = new RedshiftWarehouseNode(redshiftNode, resourceNode, RedshiftWarehouseType.PROVISIONED)
+            const childNodes = await warehouseNode.getChildren()
+            verifyRetryNode(childNodes)
+        })
+
+        it('shows a node with retry if there is error fetching databases', async () => {
+            connectionWizardStub = sinon.stub(RedshiftNodeConnectionWizard.prototype, 'run').resolves(connectionParams)
+            warehouseNode = new RedshiftWarehouseNode(redshiftNode, resourceNode, RedshiftWarehouseType.PROVISIONED)
+            mockRedshiftData.on(ListDatabasesCommand).rejects('Failed')
+            const childNodes = await warehouseNode.getChildren()
+            verifyRetryNode(childNodes)
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/redshift/notebook/cellStatusBarItemProvider.test.ts b/packages/core/src/test/awsService/redshift/notebook/cellStatusBarItemProvider.test.ts
new file mode 100644
index 00000000000..eb224596590
--- /dev/null
+++ b/packages/core/src/test/awsService/redshift/notebook/cellStatusBarItemProvider.test.ts
@@ -0,0 +1,63 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import sinon = require('sinon')
+import assert = require('assert')
+import { CellStatusBarItemProvider } from '../../../../awsService/redshift/notebook/cellStatusBarItemProvider'
+import * as vscode from 'vscode'
+
+describe('CellStatusBarItemProvider', function () {
+    let cell: any
+    let token: any
+    let cellStatusBarItemProvider: any
+
+    beforeEach(() => {
+        cell = {
+            notebook: {
+                metadata: {
+                    connectionParams: {
+                        warehouseIdentifier: 'TestWarehouse',
+                    },
+                },
+            },
+        }
+        token = new vscode.CancellationTokenSource().token
+        cellStatusBarItemProvider = new CellStatusBarItemProvider()
+    })
+
+    this.afterEach(() => {
+        sinon.restore()
+    })
+
+    it('provides "Connect" status bar item when cell has no connectionParams', () => {
+        const cell = { notebook: { metadata: { connectionParams: undefined } } }
+        const expectedText = '$(notebook-state-error) Connect'
+        const result = cellStatusBarItemProvider.provideCellStatusBarItems(cell, undefined)
+        assert(Array.isArray(result))
+        assert.strictEqual(result.length, 1)
+        assert.strictEqual(result[0].text, expectedText)
+    })
+
+    it('provides status bar with success-icon and connection information', () => {
+        const result = cellStatusBarItemProvider.provideCellStatusBarItems(cell, token)
+        const expectedText = '$(notebook-state-success) Connected to TestWarehouse'
+        const expectedCommand = {
+            command: 'aws.redshift.notebookConnectClicked',
+            arguments: [cell, cellStatusBarItemProvider.refreshCellStatusBar.bind(cellStatusBarItemProvider)],
+        }
+        assert.strictEqual(result.length, 1)
+        assert.strictEqual(result[0].text, expectedText)
+        assert.deepStrictEqual(result[0].command.command, expectedCommand.command)
+    })
+
+    it('fires onDidChangeCellStatusBarItems when refreshCellStatusBar is called', () => {
+        const onDidChangeCellStatusBarItemsSpy = sinon.spy(
+            cellStatusBarItemProvider._onDidChangeCellStatusBarItems,
+            'fire'
+        )
+        cellStatusBarItemProvider.refreshCellStatusBar()
+        assert.strictEqual(onDidChangeCellStatusBarItemsSpy.name, 'fire')
+    })
+})
diff --git a/packages/core/src/test/awsService/redshift/notebook/redshiftNotebookController.test.ts b/packages/core/src/test/awsService/redshift/notebook/redshiftNotebookController.test.ts
new file mode 100644
index 00000000000..8b9bfd5b546
--- /dev/null
+++ b/packages/core/src/test/awsService/redshift/notebook/redshiftNotebookController.test.ts
@@ -0,0 +1,69 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { RedshiftNotebookController } from '../../../../awsService/redshift/notebook/redshiftNotebookController'
+import { mockClient, AwsClientStub } from 'aws-sdk-client-mock'
+import assert = require('assert')
+import { DefaultRedshiftClient } from '../../../../shared/clients/redshiftClient'
+import { RedshiftDataClient } from '@aws-sdk/client-redshift-data'
+import sinon = require('sinon')
+
+describe('RedshiftNotebookController', () => {
+    const mockRedshiftData: AwsClientStub<RedshiftDataClient> = mockClient(RedshiftDataClient)
+    // @ts-expect-error
+    const redshiftClient = new DefaultRedshiftClient('us-east-1', () => mockRedshiftData, undefined, undefined)
+    let notebookController: any
+    let createNotebookControllerStub: any
+    beforeEach(() => {
+        createNotebookControllerStub = sinon.stub(vscode.notebooks, 'createNotebookController')
+        const controllerInstanceValue = {
+            supportedLanguages: ['sql'],
+            supportsExecutionOrder: false,
+            executeHandler: undefined,
+            dispose: sinon.stub,
+        }
+        createNotebookControllerStub.returns(controllerInstanceValue)
+        notebookController = new RedshiftNotebookController(redshiftClient)
+    })
+    afterEach(() => {
+        mockRedshiftData.reset()
+        sinon.restore()
+    })
+    it('validating parameters of  a notebook controller instance', () => {
+        assert.strictEqual(notebookController.id, 'aws-redshift-sql-notebook')
+        assert.strictEqual(notebookController.label, 'Redshift SQL notebook')
+        assert.deepStrictEqual(notebookController.supportedLanguages, ['sql'])
+        assert.strictEqual(notebookController._executionOrder, 0)
+    })
+
+    it('should execute all cells', () => {
+        const executeAllStub = sinon.stub(notebookController, '_doExecution')
+        const mockcell = {
+            document: {
+                getText: () => 'select * from table;',
+            },
+        }
+        const cells = [mockcell]
+        notebookController._executeAll(cells, undefined, undefined)
+        assert.strictEqual(executeAllStub.callCount, cells.length)
+    })
+    it('should execute a cell successfully', async () => {
+        const executeCellStub = sinon.stub(notebookController, 'executeCell')
+        executeCellStub.resolves(vscode.NotebookCellOutput)
+        const cellMock: any = {
+            metadata: {
+                connectionParams: {
+                    warehouseIdentifier: 'TestWarehouse',
+                },
+            },
+            document: {
+                getText: sinon.stub().returns('SELECT * FROM my_table'),
+            },
+        }
+        const cellOutput = await executeCellStub(cellMock)
+        assert.strictEqual(cellOutput.isNotebookCellOutput.length, 1)
+    })
+})
diff --git a/packages/core/src/test/awsService/redshift/notebook/redshiftNotebookSerializer.test.ts b/packages/core/src/test/awsService/redshift/notebook/redshiftNotebookSerializer.test.ts
new file mode 100644
index 00000000000..91607675b18
--- /dev/null
+++ b/packages/core/src/test/awsService/redshift/notebook/redshiftNotebookSerializer.test.ts
@@ -0,0 +1,71 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { RedshiftNotebookSerializer } from '../../../../awsService/redshift/notebook/redshiftNotebookSerializer'
+import * as vscode from 'vscode'
+import assert = require('assert')
+
+describe('RedshiftNotebookSerializer', () => {
+    let serializer: RedshiftNotebookSerializer
+
+    beforeEach(() => {
+        serializer = new RedshiftNotebookSerializer()
+    })
+
+    it('should correctly deserialize an empty notebook cell', async () => {
+        const contents = new TextEncoder().encode(JSON.stringify({ cells: [] }))
+        const token = new vscode.CancellationTokenSource().token
+        const notebookData = await serializer.deserializeNotebook(contents, token)
+        assert.deepStrictEqual(notebookData.cells, [])
+    })
+
+    it('should deserialize NotebookData correctly', async () => {
+        const serializer = new RedshiftNotebookSerializer()
+        const expectedMetadata = { Test: 'Meta' }
+        const rawNotebookData = {
+            cells: [
+                {
+                    kind: vscode.NotebookCellKind.Code,
+                    language: 'sql',
+                    value: 'select * from table',
+                    metadata: expectedMetadata,
+                },
+            ],
+        }
+        const rawData = new TextEncoder().encode(JSON.stringify(rawNotebookData))
+        const token = new vscode.CancellationTokenSource().token
+        const result = await serializer.deserializeNotebook(rawData, token)
+        assert.strictEqual(result.cells.length, 1)
+        const actualResultCopy = JSON.parse(JSON.stringify(result.cells[0]))
+        assert.deepStrictEqual(actualResultCopy, {
+            kind: vscode.NotebookCellKind.Code,
+            value: 'select * from table',
+            languageId: 'sql',
+            outputs: [],
+        })
+        assert.deepStrictEqual(result.metadata, expectedMetadata)
+    })
+
+    it('should serialize NotebookData correctly', async () => {
+        const serializer = new RedshiftNotebookSerializer()
+        const notebookData = new vscode.NotebookData([
+            new vscode.NotebookCellData(vscode.NotebookCellKind.Code, 'select * from table;', 'SQL'),
+        ])
+        notebookData.metadata = { Test: 'Meta' }
+        const token = new vscode.CancellationTokenSource().token
+        const result = await serializer.serializeNotebook(notebookData, token)
+        const decodedResult = new TextDecoder().decode(result)
+        const expectedSerializedData =
+            '{"cells":[{"kind":2,"language":"SQL","value":"select * from table;","metadata":{"Test":"Meta"}}]}'
+        assert.strictEqual(decodedResult, expectedSerializedData)
+    })
+
+    it('should correctly handle invalid JSOn during deserialization', async () => {
+        const invalidContents = new TextEncoder().encode('data:{xyz:onk}')
+        const token = new vscode.CancellationTokenSource().token
+        const notebookData = await serializer.deserializeNotebook(invalidContents, token)
+        assert.deepStrictEqual(Array.from(notebookData.cells), [])
+    })
+})
diff --git a/packages/core/src/test/awsService/redshift/wizards/connectionWizard.test.ts b/packages/core/src/test/awsService/redshift/wizards/connectionWizard.test.ts
new file mode 100644
index 00000000000..f8df01a738f
--- /dev/null
+++ b/packages/core/src/test/awsService/redshift/wizards/connectionWizard.test.ts
@@ -0,0 +1,111 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { RedshiftNode } from '../../../../awsService/redshift/explorer/redshiftNode'
+import { DefaultRedshiftClient } from '../../../../shared/clients/redshiftClient'
+import { createWizardTester } from '../../../shared/wizards/wizardTestUtils'
+import { RedshiftWarehouseType, ConnectionType } from '../../../../awsService/redshift/models/models'
+import { RedshiftWarehouseNode } from '../../../../awsService/redshift/explorer/redshiftWarehouseNode'
+import { AWSResourceNode } from '../../../../shared/treeview/nodes/awsResourceNode'
+import {
+    NotebookConnectionWizard,
+    RedshiftNodeConnectionWizard,
+} from '../../../../awsService/redshift/wizards/connectionWizard'
+import { RegionProvider } from '../../../../shared/regions/regionProvider'
+
+describe('redshiftNodeConnectionWizard', async function () {
+    let mockRedshiftClient: DefaultRedshiftClient
+    let provisionedNode: RedshiftWarehouseNode
+    let serverlessNode: RedshiftWarehouseNode
+    const clusterName = 'testCluster'
+    const workgroupName = 'testWorkgroup'
+    const clusterArn = 'testClusterARN'
+    const workgroupArn = 'testWorkgroupARN'
+
+    beforeEach(function () {
+        mockRedshiftClient = <DefaultRedshiftClient>{}
+        const redshiftNode = new RedshiftNode(mockRedshiftClient)
+        provisionedNode = new RedshiftWarehouseNode(
+            redshiftNode,
+            { arn: clusterArn, name: clusterName } as AWSResourceNode,
+            RedshiftWarehouseType.PROVISIONED
+        )
+        serverlessNode = new RedshiftWarehouseNode(
+            redshiftNode,
+            { arn: workgroupArn, name: workgroupName } as AWSResourceNode,
+            RedshiftWarehouseType.SERVERLESS
+        )
+    })
+
+    it('shows all steps for provisionedNode and database username connection type', async function () {
+        const testWizard = await createWizardTester(new RedshiftNodeConnectionWizard(provisionedNode))
+        testWizard.connectionType.assertShowFirst()
+        testWizard.connectionType.applyInput(ConnectionType.TempCreds)
+        testWizard.database.assertShowFirst()
+        testWizard.database.applyInput('testDB')
+        testWizard.username.assertShowFirst()
+    })
+
+    it('shows only database as input for serverlessNode and database username connection type', async function () {
+        const testWizard = await createWizardTester(new RedshiftNodeConnectionWizard(serverlessNode))
+        testWizard.connectionType.assertShowFirst()
+        testWizard.connectionType.applyInput(ConnectionType.TempCreds)
+        testWizard.database.assertShowFirst()
+        testWizard.username.assertDoesNotShow()
+    })
+
+    it('shows all steps for provisionedNode and secrets manager connection type', async function () {
+        const testWizard = await createWizardTester(new RedshiftNodeConnectionWizard(provisionedNode))
+        testWizard.connectionType.assertShowFirst()
+        testWizard.connectionType.applyInput(ConnectionType.SecretsManager)
+        testWizard.database.assertShowFirst()
+        testWizard.database.applyInput('testDB')
+        testWizard.secret.assertShowFirst()
+        testWizard.secret.applyInput('SecretTest')
+    })
+
+    it('shows all steps for serverlessNode and secrets manager connection type', async function () {
+        const testWizard = await createWizardTester(new RedshiftNodeConnectionWizard(serverlessNode))
+        testWizard.connectionType.assertShowFirst()
+        testWizard.connectionType.applyInput(ConnectionType.SecretsManager)
+        testWizard.database.assertShowFirst()
+        testWizard.database.applyInput('testDB')
+        testWizard.secret.assertShowFirst()
+        testWizard.secret.applyInput('SecretTest')
+    })
+})
+
+describe('NotebookConnectionWizard', async () => {
+    const mockRegionProvider: RegionProvider = <RegionProvider>{}
+
+    it('shows all steps for database username connection type', async function () {
+        const testWizard = await createWizardTester(new NotebookConnectionWizard(mockRegionProvider))
+        testWizard.region.assertShowFirst()
+        testWizard.region.applyInput({ id: 'US East - 1', name: 'us-east-1' })
+        testWizard.warehouseIdentifier.assertShowFirst()
+        testWizard.warehouseIdentifier.applyInput('testCluster')
+        testWizard.connectionType.assertShowFirst()
+        testWizard.connectionType.applyInput(ConnectionType.TempCreds)
+        testWizard.database.assertShowFirst()
+        testWizard.database.applyInput('testDB')
+        testWizard.username.assertShowFirst()
+        testWizard.username.applyInput('testUser')
+        testWizard.warehouseType.assertDoesNotShow()
+    })
+
+    it('shows all steps for secrets manager connection type', async function () {
+        const testWizard = await createWizardTester(new NotebookConnectionWizard(mockRegionProvider))
+        testWizard.region.assertShowFirst()
+        testWizard.region.applyInput({ id: 'US East - 1', name: 'us-east-1' })
+        testWizard.warehouseIdentifier.assertShowFirst()
+        testWizard.warehouseIdentifier.applyInput('testCluster')
+        testWizard.connectionType.assertShowFirst()
+        testWizard.connectionType.applyInput(ConnectionType.SecretsManager)
+        testWizard.database.assertShowFirst()
+        testWizard.database.applyInput('testDB')
+        testWizard.secret.applyInput('SecretTest')
+        testWizard.warehouseType.assertDoesNotShow()
+    })
+})
diff --git a/packages/core/src/test/awsService/s3/commands/copyPath.test.ts b/packages/core/src/test/awsService/s3/commands/copyPath.test.ts
new file mode 100644
index 00000000000..1e67299c7ab
--- /dev/null
+++ b/packages/core/src/test/awsService/s3/commands/copyPath.test.ts
@@ -0,0 +1,35 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { copyPathCommand } from '../../../../awsService/s3/commands/copyPath'
+import { S3FolderNode } from '../../../../awsService/s3/explorer/s3FolderNode'
+import { S3Client } from '../../../../shared/clients/s3'
+import { FakeClipboard } from '../../../shared/vscode/fakeEnv'
+
+describe('copyPathCommand', function () {
+    beforeEach(function () {
+        const fakeClipboard = new FakeClipboard()
+        sinon.stub(vscode.env, 'clipboard').value(fakeClipboard)
+    })
+
+    it('copies path to clipboard and shows status bar confirmation', async function () {
+        const node = createS3FolderNode()
+
+        await copyPathCommand(node)
+
+        assert.strictEqual(await vscode.env.clipboard.readText(), 'path')
+    })
+})
+
+function createS3FolderNode(): S3FolderNode {
+    return new S3FolderNode(
+        { Name: 'name', BucketRegion: 'region', Arn: 'arn' },
+        { name: 'name', path: 'path', arn: 'arn ' },
+        {} as S3Client
+    )
+}
diff --git a/packages/core/src/test/awsService/s3/commands/createBucket.test.ts b/packages/core/src/test/awsService/s3/commands/createBucket.test.ts
new file mode 100644
index 00000000000..62c33905a12
--- /dev/null
+++ b/packages/core/src/test/awsService/s3/commands/createBucket.test.ts
@@ -0,0 +1,73 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { createBucketCommand } from '../../../../awsService/s3/commands/createBucket'
+import { S3Node } from '../../../../awsService/s3/explorer/s3Nodes'
+import { S3Client } from '../../../../shared/clients/s3'
+import { CancellationError } from '../../../../shared/utilities/timeoutUtils'
+import { getTestWindow } from '../../../shared/vscode/window'
+
+describe('createBucketCommand', function () {
+    const bucketName = 'buc.ket-n4.m3'
+    let s3: S3Client
+    let node: S3Node
+    let sandbox: sinon.SinonSandbox
+    let spyExecuteCommand: sinon.SinonSpy
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+
+        s3 = {} as any as S3Client
+        node = new S3Node(s3)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('prompts for bucket name, creates bucket, shows success, and refreshes node', async function () {
+        const stub = sinon.stub().resolves({
+            bucket: { name: bucketName, region: 'region', arn: 'arn' },
+        })
+        s3.createBucket = stub
+
+        getTestWindow().onDidShowInputBox((input) => {
+            assert.strictEqual(input.prompt, 'Enter a new bucket name')
+            assert.strictEqual(input.placeholder, 'Bucket Name')
+            input.acceptValue(bucketName)
+        })
+        await createBucketCommand(node)
+
+        getTestWindow()
+            .getFirstMessage()
+            .assertInfo(/Created bucket: buc.ket-n4.m3/)
+
+        assert(stub.calledOnceWithExactly({ bucketName }))
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', node)
+    })
+
+    it('does nothing when prompt is cancelled', async function () {
+        const stub = sinon.stub()
+        s3.createBucket = stub
+        getTestWindow().onDidShowInputBox((input) => input.hide())
+        await assert.rejects(() => createBucketCommand(node), CancellationError)
+
+        assert(stub.notCalled)
+    })
+
+    it('throws an error and refreshes node when bucket creation fails', async function () {
+        const stub = sinon.stub().rejects()
+        s3.createBucket = stub
+
+        getTestWindow().onDidShowInputBox((input) => input.acceptValue(bucketName))
+        await assert.rejects(() => createBucketCommand(node), /Failed to create bucket/)
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', node)
+    })
+})
diff --git a/packages/core/src/test/awsService/s3/commands/createFolder.test.ts b/packages/core/src/test/awsService/s3/commands/createFolder.test.ts
new file mode 100644
index 00000000000..9ad31412fe8
--- /dev/null
+++ b/packages/core/src/test/awsService/s3/commands/createFolder.test.ts
@@ -0,0 +1,88 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { createFolderCommand } from '../../../../awsService/s3/commands/createFolder'
+import { S3BucketNode } from '../../../../awsService/s3/explorer/s3BucketNode'
+import { S3Node } from '../../../../awsService/s3/explorer/s3Nodes'
+import { S3Client } from '../../../../shared/clients/s3'
+import { getTestWindow } from '../../../shared/vscode/window'
+
+describe('createFolderCommand', function () {
+    const invalidFolderNames: { folderName: string; error: string }[] = [
+        { folderName: 'contains/delimiter', error: `Folder name must not contain '/'` },
+        { folderName: '', error: 'Folder name must not be empty' },
+    ]
+
+    const folderName = 'foo'
+    const folderPath = 'foo/'
+    const bucketName = 'bucket-name'
+
+    let s3: S3Client
+    let node: S3BucketNode
+    let sandbox: sinon.SinonSandbox
+    let spyExecuteCommand: sinon.SinonSpy
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+
+        s3 = {} as any as S3Client
+        node = new S3BucketNode({ Name: bucketName, BucketRegion: 'region', Arn: 'arn' }, new S3Node(s3), s3)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('prompts for folder name, creates folder, shows success, and refreshes node', async function () {
+        const stub = sinon.stub().resolves({
+            folder: { name: folderName, path: folderPath, arn: 'arn' },
+        })
+        s3.createFolder = stub
+
+        getTestWindow().onDidShowInputBox((input) => {
+            assert.strictEqual(input.prompt, 'Enter a folder to create in s3://bucket-name')
+            assert.strictEqual(input.placeholder, 'Folder Name')
+            input.acceptValue(folderName)
+        })
+        await createFolderCommand(node)
+
+        getTestWindow()
+            .getFirstMessage()
+            .assertInfo(/Created folder: foo/)
+
+        assert(stub.calledOnceWithExactly({ path: folderPath, bucketName }))
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', node)
+    })
+
+    it('does nothing when prompt is cancelled', async function () {
+        getTestWindow().onDidShowInputBox((input) => input.hide())
+        await assert.rejects(() => createFolderCommand(node), /cancelled/i)
+    })
+
+    it('shows an error message and refreshes node when folder creation fails', async function () {
+        const stub = sinon.stub().rejects(new Error('Expected failure'))
+        s3.createFolder = stub
+
+        getTestWindow().onDidShowInputBox((input) => input.acceptValue(folderName))
+        await assert.rejects(() => createFolderCommand(node), /failed to create folder/i)
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', node)
+    })
+
+    for (const invalid of invalidFolderNames) {
+        it(`warns '${invalid.error}' when folder name is '${invalid.folderName}'`, async () => {
+            getTestWindow().onDidShowInputBox((input) => {
+                input.acceptValue(invalid.folderName)
+                assert.strictEqual(input.validationMessage, invalid.error)
+                input.hide()
+            })
+            await assert.rejects(() => createFolderCommand(node))
+        })
+    }
+})
diff --git a/packages/core/src/test/awsService/s3/commands/deleteBucket.test.ts b/packages/core/src/test/awsService/s3/commands/deleteBucket.test.ts
new file mode 100644
index 00000000000..5bca81235a2
--- /dev/null
+++ b/packages/core/src/test/awsService/s3/commands/deleteBucket.test.ts
@@ -0,0 +1,86 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { deleteBucketCommand } from '../../../../awsService/s3/commands/deleteBucket'
+import { S3BucketNode } from '../../../../awsService/s3/explorer/s3BucketNode'
+import { S3Node } from '../../../../awsService/s3/explorer/s3Nodes'
+import { S3Client } from '../../../../shared/clients/s3'
+import { assertNoErrorMessages, getTestWindow } from '../../../shared/vscode/window'
+
+describe('deleteBucketCommand', function () {
+    const bucketName = 'bucket-name'
+
+    let s3: S3Client
+    let parentNode: S3Node
+    let node: S3BucketNode
+    let sandbox: sinon.SinonSandbox
+    let spyExecuteCommand: sinon.SinonSpy
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+
+        s3 = {} as any as S3Client
+        parentNode = new S3Node(s3)
+        node = new S3BucketNode({ Name: bucketName, BucketRegion: 'region', Arn: 'arn' }, parentNode, s3)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('confirms deletion, deletes bucket, shows progress bar, and refreshes parent node', async function () {
+        const stub = sinon.stub()
+        s3.deleteBucket = stub
+
+        getTestWindow().onDidShowInputBox((input) => {
+            assert.strictEqual(input.prompt, 'Enter bucket-name to confirm deletion')
+            assert.strictEqual(input.placeholder, bucketName)
+            input.acceptValue(bucketName)
+        })
+        await deleteBucketCommand(node)
+
+        assert(stub.calledOnceWithExactly({ bucketName }))
+
+        getTestWindow().getFirstMessage().assertProgress('Deleting bucket-name...')
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', parentNode)
+    })
+
+    it('does nothing when deletion is cancelled', async function () {
+        const stub = sinon.stub()
+        s3.deleteBucket = stub
+
+        getTestWindow().onDidShowInputBox((input) => input.hide())
+        await assert.rejects(() => deleteBucketCommand(node), /cancelled/i)
+
+        assert(stub.notCalled)
+
+        assertNoErrorMessages()
+        sandbox.assert.notCalled(spyExecuteCommand)
+    })
+
+    it('shows an error message and refreshes node when bucket deletion fails', async function () {
+        const stub = sinon.stub().rejects(new Error('Expected failure'))
+        s3.deleteBucket = stub
+
+        getTestWindow().onDidShowInputBox((input) => input.acceptValue(bucketName))
+        await assert.rejects(() => deleteBucketCommand(node), /failed to delete bucket bucket-name/i)
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', parentNode)
+    })
+
+    it('warns when confirmation is invalid', async function () {
+        getTestWindow().onDidShowInputBox((input) => {
+            input.acceptValue('something other than the bucket name')
+            assert.strictEqual(input.validationMessage, 'Enter bucket-name to confirm deletion')
+            input.hide()
+        })
+        await assert.rejects(() => deleteBucketCommand(node))
+    })
+})
diff --git a/packages/core/src/test/awsService/s3/commands/deleteFile.test.ts b/packages/core/src/test/awsService/s3/commands/deleteFile.test.ts
new file mode 100644
index 00000000000..ce6a5996c64
--- /dev/null
+++ b/packages/core/src/test/awsService/s3/commands/deleteFile.test.ts
@@ -0,0 +1,77 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { deleteFileCommand } from '../../../../awsService/s3/commands/deleteFile'
+import { S3BucketNode } from '../../../../awsService/s3/explorer/s3BucketNode'
+import { S3FileNode } from '../../../../awsService/s3/explorer/s3FileNode'
+import { S3Node } from '../../../../awsService/s3/explorer/s3Nodes'
+import { S3Bucket, S3Client } from '../../../../shared/clients/s3'
+import { assertNoErrorMessages, getTestWindow } from '../../../shared/vscode/window'
+
+describe('deleteFileCommand', function () {
+    const key = 'foo/bar.jpg'
+    const name = 'bar.jpg'
+    const bucketName = 'bucket-name'
+    const bucket: S3Bucket = { Name: bucketName, BucketRegion: 'region', Arn: 'arn' }
+
+    let s3: S3Client
+    let parentNode: S3BucketNode
+    let node: S3FileNode
+    let sandbox: sinon.SinonSandbox
+    let spyExecuteCommand: sinon.SinonSpy
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+
+        s3 = {} as any as S3Client
+        parentNode = new S3BucketNode(bucket, {} as S3Node, s3)
+        node = new S3FileNode(bucket, { name, key, arn: 'arn' }, parentNode, s3)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('confirms deletion, deletes file, shows status bar confirmation, and refreshes parent node', async function () {
+        getTestWindow().onDidShowMessage((m) => m.selectItem('Delete'))
+        const stub = sinon.stub()
+        s3.deleteObject = stub
+        await deleteFileCommand(node)
+
+        getTestWindow()
+            .getFirstMessage()
+            .assertWarn('Are you sure you want to delete file s3://bucket-name/foo/bar.jpg?')
+
+        assert(stub.calledOnceWithExactly({ bucketName, key }))
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', parentNode)
+    })
+
+    it('does nothing when deletion is cancelled', async function () {
+        getTestWindow().onDidShowMessage((m) => m.selectItem('Cancel'))
+        const stub = sinon.stub()
+        s3.deleteObject = stub
+        await assert.rejects(() => deleteFileCommand(node), /cancelled/i)
+
+        assert(stub.notCalled)
+        assert.deepStrictEqual(getTestWindow().statusBar.messages, [])
+        assertNoErrorMessages()
+        sandbox.assert.notCalled(spyExecuteCommand)
+    })
+
+    it('shows an error message and refreshes node when file deletion fails', async function () {
+        const stub = sinon.stub().rejects(new Error('Expected failure'))
+        s3.deleteObject = stub
+
+        getTestWindow().onDidShowMessage((m) => m.selectItem('Delete'))
+        await assert.rejects(() => deleteFileCommand(node), /failed to delete file bar.jpg/i)
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', parentNode)
+    })
+})
diff --git a/packages/core/src/test/awsService/s3/commands/downloadFileAs.test.ts b/packages/core/src/test/awsService/s3/commands/downloadFileAs.test.ts
new file mode 100644
index 00000000000..24db19a4116
--- /dev/null
+++ b/packages/core/src/test/awsService/s3/commands/downloadFileAs.test.ts
@@ -0,0 +1,84 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import * as path from 'path'
+import { downloadFileAsCommand } from '../../../../awsService/s3/commands/downloadFileAs'
+import { S3BucketNode } from '../../../../awsService/s3/explorer/s3BucketNode'
+import { S3FileNode } from '../../../../awsService/s3/explorer/s3FileNode'
+import { S3Node } from '../../../../awsService/s3/explorer/s3Nodes'
+import { S3Bucket, S3Client } from '../../../../shared/clients/s3'
+import { bufferToStream } from '../../../../shared/utilities/streamUtilities'
+import { MockOutputChannel } from '../../../mockOutputChannel'
+import { makeTemporaryToolkitFolder } from '../../../../shared/filesystemUtilities'
+import globals from '../../../../shared/extensionGlobals'
+import { getTestWindow } from '../../../shared/vscode/window'
+import sinon from 'sinon'
+
+describe('downloadFileAsCommand', function () {
+    const bucketName = 'bucket-name'
+    const key = 'path/to/file.jpg'
+    const fileName = 'file.jpg'
+    const lastModified = new Date(2020, 5, 4)
+    const sizeBytes = 16
+
+    let s3: S3Client
+    let temp: string
+    let saveLocation: vscode.Uri
+    let bucketNode: S3BucketNode
+    let node: S3FileNode
+
+    before(async function () {
+        // TODO: write separate test code for the progress report behavior
+        temp = await makeTemporaryToolkitFolder()
+        saveLocation = vscode.Uri.file(path.join(temp, 'file.jpg'))
+    })
+
+    beforeEach(function () {
+        s3 = {} as any as S3Client
+
+        const bucket: S3Bucket = { Name: bucketName, BucketRegion: 'region', Arn: 'arn' }
+        bucketNode = new S3BucketNode(bucket, {} as S3Node, s3)
+        node = new S3FileNode(bucket, { name: fileName, key: key, arn: 'arn', lastModified, sizeBytes }, bucketNode, s3)
+    })
+
+    it('prompts for save location, downloads file with progress, and shows output channel', async function () {
+        getTestWindow().onDidShowDialog((dialog) => {
+            assert.deepStrictEqual(dialog.filters, { 'All Files': ['*'], '*.jpg': ['jpg'] })
+            assert.strictEqual(dialog.acceptButtonLabel, 'Download')
+            dialog.accept()
+        })
+        const outputChannel = new MockOutputChannel()
+        await globals.globalState.update('aws.downloadPath', temp)
+
+        s3.downloadFileStream = sinon.stub().resolves(bufferToStream(Buffer.alloc(16)))
+
+        await downloadFileAsCommand(node, outputChannel)
+
+        assert.deepStrictEqual(outputChannel.lines, [
+            `Downloading "s3://bucket-name/path/to/file.jpg" to: ${saveLocation}`,
+            `Downloaded: ${saveLocation}`,
+        ])
+        assert.strictEqual(outputChannel.isShown, true)
+        assert.strictEqual(outputChannel.isFocused, false)
+    })
+
+    it('does nothing when prompt is cancelled', async function () {
+        const stub = sinon.stub()
+        s3.downloadFileStream = stub
+        getTestWindow().onDidShowDialog((d) => d.close())
+        await assert.rejects(() => downloadFileAsCommand(node), /cancelled/i)
+
+        assert(stub.notCalled)
+    })
+
+    it('throws when download fails', async function () {
+        getTestWindow().onDidShowDialog((d) => d.selectItem(saveLocation))
+        s3.downloadFileStream = sinon.stub().rejects(new Error('Expected failure'))
+
+        await assert.rejects(() => downloadFileAsCommand(node, new MockOutputChannel()), /Failed to download/)
+    })
+})
diff --git a/packages/core/src/test/awsService/s3/commands/presignedURL.test.ts b/packages/core/src/test/awsService/s3/commands/presignedURL.test.ts
new file mode 100644
index 00000000000..96e9f4ebe8b
--- /dev/null
+++ b/packages/core/src/test/awsService/s3/commands/presignedURL.test.ts
@@ -0,0 +1,50 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import {} from '../../../../shared/vscode/env'
+import { copyToClipboard } from '../../../../shared/utilities/messages'
+import { presignedURLCommand } from '../../../../awsService/s3/commands/presignedURL'
+import { S3BucketNode } from '../../../../awsService/s3/explorer/s3BucketNode'
+import { S3FileNode } from '../../../../awsService/s3/explorer/s3FileNode'
+import { S3Node } from '../../../../awsService/s3/explorer/s3Nodes'
+import { S3Bucket, S3Client } from '../../../../shared/clients/s3'
+import { getTestWindow } from '../../../shared/vscode/window'
+import { FakeClipboard } from '../../../shared/vscode/fakeEnv'
+
+describe('presignedURLCommand', function () {
+    const bucketName = 'bucket-name'
+    const key = 'file.jpg'
+    const testUrl = 'https://presigned-url.com'
+
+    let node: S3FileNode
+    let s3: S3Client
+    let bucketNode: S3BucketNode
+
+    beforeEach(function () {
+        const fakeClipboard = new FakeClipboard()
+        sinon.stub(vscode.env, 'clipboard').value(fakeClipboard)
+        s3 = {} as any as S3Client
+        const bucket: S3Bucket = { Name: bucketName, BucketRegion: 'region', Arn: 'arn' }
+        bucketNode = new S3BucketNode(bucket, {} as S3Node, s3)
+        node = new S3FileNode(bucket, { name: key, key: key, arn: 'arn' }, bucketNode, s3)
+    })
+
+    it('calls S3 to get the URL', async function () {
+        getTestWindow().onDidShowInputBox((input) => input.acceptValue('20'))
+        s3.getSignedUrlForObject = sinon.stub().resolves(testUrl)
+
+        await presignedURLCommand(node)
+
+        assert.deepStrictEqual(await vscode.env.clipboard.readText(), testUrl)
+    })
+
+    it('copies a given URL to the clipboard', async function () {
+        await copyToClipboard(testUrl, 'URL')
+        assert.deepStrictEqual(await vscode.env.clipboard.readText(), testUrl)
+    })
+})
diff --git a/packages/core/src/test/awsService/s3/commands/uploadFile.test.ts b/packages/core/src/test/awsService/s3/commands/uploadFile.test.ts
new file mode 100644
index 00000000000..9dba5e32341
--- /dev/null
+++ b/packages/core/src/test/awsService/s3/commands/uploadFile.test.ts
@@ -0,0 +1,341 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import {
+    FileSizeBytes,
+    getFilesToUpload,
+    promptUserForBucket,
+    uploadFileCommand,
+    BucketQuickPickItem,
+} from '../../../../awsService/s3/commands/uploadFile'
+import { S3Node } from '../../../../awsService/s3/explorer/s3Nodes'
+import { S3BucketNode } from '../../../../awsService/s3/explorer/s3BucketNode'
+import { S3Client } from '../../../../shared/clients/s3'
+import { MockOutputChannel } from '../../../mockOutputChannel'
+import { getTestWindow } from '../../../shared/vscode/window'
+import sinon from 'sinon'
+import { Upload } from '@aws-sdk/lib-storage'
+import { Bucket } from '@aws-sdk/client-s3'
+
+describe('uploadFileCommand', function () {
+    const bucketName = 'bucket-name'
+    const key = 'file.jpg'
+    const sizeBytes = 16
+    const fileLocation = vscode.Uri.file('/file.jpg')
+    const statFile: FileSizeBytes = (_file) => sizeBytes
+    const bucketResponse = { label: 'label', bucket: { Name: bucketName } }
+    const folderResponse = {
+        label: 'label',
+        bucket: { Name: bucketName },
+        folder: { name: 'folderA', path: 'folderA/', arn: 'arn' },
+    }
+    const getFolder: (s3client: S3Client) => Promise<BucketQuickPickItem | 'cancel' | 'back'> = (s3Client) => {
+        return new Promise((resolve, reject) => {
+            resolve(folderResponse)
+        })
+    }
+    let outputChannel: MockOutputChannel
+    let s3: S3Client
+    let bucketNode: S3BucketNode
+    let getBucket: (s3client: S3Client) => Promise<BucketQuickPickItem | 'cancel' | 'back'>
+    let getFile: (document?: vscode.Uri) => Promise<vscode.Uri[] | undefined>
+    let mockedUpload: Upload
+
+    const setDefaultsForFileAndBucket = () => {
+        getFile = (document) => {
+            return new Promise((resolve, reject) => {
+                resolve([fileLocation])
+            })
+        }
+
+        getBucket = (s3Client) => {
+            return new Promise((resolve, reject) => {
+                resolve(bucketResponse)
+            })
+        }
+    }
+
+    beforeEach(function () {
+        mockedUpload = {} as any as Upload
+        s3 = {} as any as S3Client
+        bucketNode = new S3BucketNode({ Name: bucketName, BucketRegion: 'region', Arn: 'arn' }, new S3Node(s3), s3)
+        outputChannel = new MockOutputChannel()
+    })
+
+    describe('with node parameter', async function () {
+        this.beforeEach(function () {
+            s3 = {} as any as S3Client
+            bucketNode = new S3BucketNode({ Name: bucketName, BucketRegion: 'region', Arn: 'arn' }, new S3Node(s3), s3)
+            outputChannel = new MockOutputChannel()
+        })
+
+        it('uploads successfully', async function () {
+            const uploadStub = sinon.stub().resolves(mockedUpload)
+            s3.uploadFile = uploadStub
+            mockedUpload.done = sinon.stub().resolves()
+
+            getFile = (document) => {
+                return new Promise((resolve, reject) => {
+                    resolve([fileLocation])
+                })
+            }
+
+            await uploadFileCommand(s3, bucketNode, statFile, undefined, getFile, outputChannel)
+
+            const [uploadFileRequest] = uploadStub.lastCall.args
+
+            assert.strictEqual(uploadFileRequest.bucketName, bucketName)
+            assert.strictEqual(uploadFileRequest.key, key)
+            assert.strictEqual(uploadFileRequest.content, fileLocation)
+
+            assert.deepStrictEqual(outputChannel.lines, [
+                'Uploading file file.jpg to s3://bucket-name/file.jpg',
+                'Uploaded 1/1 files',
+            ])
+        })
+
+        it('cancels and displays a message if a user does not select a file', async function () {
+            getFile = (document) => {
+                return new Promise((resolve, reject) => {
+                    resolve(undefined)
+                })
+            }
+
+            await uploadFileCommand(s3, bucketNode, statFile, undefined, getFile, outputChannel)
+            assert.deepStrictEqual(outputChannel.lines, ['No file selected, cancelling upload'])
+        })
+    })
+
+    describe('without node parameter', async function () {
+        beforeEach(function () {
+            s3 = {} as any as S3Client
+            outputChannel = new MockOutputChannel()
+            setDefaultsForFileAndBucket()
+        })
+
+        it('uploads if user provides file and bucket', async function () {
+            const uploadStub = sinon.stub().resolves(mockedUpload)
+            s3.uploadFile = uploadStub
+            mockedUpload.done = sinon.stub().resolves()
+
+            await uploadFileCommand(s3, undefined, statFile, getBucket, getFile, outputChannel)
+
+            assert.deepStrictEqual(outputChannel.lines, [
+                'Uploading file file.jpg to s3://bucket-name/file.jpg',
+                'Uploaded 1/1 files',
+            ])
+        })
+
+        it('cancels if user does not provide bucket', async function () {
+            getBucket = (s3Client) => {
+                return new Promise((resolve, reject) => {
+                    resolve('cancel')
+                })
+            }
+
+            await uploadFileCommand(s3, undefined, statFile, getBucket, getFile, outputChannel)
+            assert.deepStrictEqual(outputChannel.lines, ['No bucket selected, cancelling upload'])
+        })
+
+        it('cancels if user does not select file', async function () {
+            getFile = (document) => {
+                return new Promise((resolve, reject) => {
+                    resolve(undefined)
+                })
+            }
+
+            await uploadFileCommand(s3, undefined, statFile, getBucket, getFile, outputChannel)
+            assert.deepStrictEqual(outputChannel.lines, ['No file selected, cancelling upload'])
+        })
+    })
+
+    setDefaultsForFileAndBucket()
+
+    it('successfully upload file or folder', async function () {
+        const uploadStub = sinon.stub().resolves(mockedUpload)
+        s3.uploadFile = uploadStub
+
+        mockedUpload.done = sinon.stub().resolves()
+        getTestWindow().onDidShowDialog((d) => d.selectItem(fileLocation))
+
+        // Upload to bucket.
+        await uploadFileCommand(s3, fileLocation, statFile, getBucket, getFile, outputChannel)
+        // Upload to folder.
+        await uploadFileCommand(s3, fileLocation, statFile, getFolder, getFile, outputChannel)
+
+        assert.deepStrictEqual(outputChannel.lines, [
+            'Uploading file file.jpg to s3://bucket-name/file.jpg',
+            `Uploaded 1/1 files`,
+            'Uploading file file.jpg to s3://bucket-name/folderA/file.jpg',
+            `Uploaded 1/1 files`,
+        ])
+    })
+
+    it('errors when s3 call fails', async function () {
+        const uploadStub = sinon.stub().rejects(new Error('Expected failure'))
+        s3.uploadFile = uploadStub
+        getTestWindow().onDidShowDialog((d) => d.selectItem(fileLocation))
+        getTestWindow().onDidShowMessage((m) => m.close())
+
+        outputChannel = new MockOutputChannel()
+        await uploadFileCommand(s3, fileLocation, statFile, getBucket, getFile, outputChannel)
+
+        assert.deepStrictEqual(outputChannel.lines, [
+            'Uploading file file.jpg to s3://bucket-name/file.jpg',
+            `Failed to upload file file.jpg: Expected failure`,
+            'Uploaded 0/1 files',
+            'Failed uploads:',
+            `${key}`,
+        ])
+    })
+})
+
+describe('getFileToUpload', function () {
+    const fileLocation = vscode.Uri.file('/file.jpg')
+
+    const selection: any = { label: 'Browse for more files...' }
+    const prompt: <T extends vscode.QuickPickItem>(opts: {
+        picker: vscode.QuickPick<T>
+        onDidTriggerButton?(
+            button: vscode.QuickInputButton,
+            resolve: (value: T[] | PromiseLike<T[] | undefined> | undefined) => void,
+            reject: (reason?: any) => void
+        ): void
+    }) => Promise<T[] | undefined> = () => {
+        return new Promise((resolve, reject) => {
+            resolve([selection])
+        })
+    }
+
+    it('directly asks user for file if no active editor', async function () {
+        getTestWindow().onDidShowDialog((d) => d.selectItem(fileLocation))
+        const response = await getFilesToUpload(undefined, prompt)
+        assert.deepStrictEqual(response, [fileLocation])
+    })
+
+    it('Returns undefined if no file is selected on first prompt', async function () {
+        getTestWindow().onDidShowDialog((d) => d.close())
+        const response = await getFilesToUpload(undefined, prompt)
+        assert.strictEqual(response, undefined)
+    })
+
+    it('opens the current file if a user selects it from the prompt', async function () {
+        const alreadyOpenedUri = vscode.Uri.file('/alreadyOpened.txt')
+        selection.label = alreadyOpenedUri.fsPath
+
+        const response = await getFilesToUpload(alreadyOpenedUri, prompt)
+        assert.deepStrictEqual(response, [alreadyOpenedUri])
+    })
+
+    it('opens the file prompt if a user selects to browse for more files', async function () {
+        selection.label = 'Browse for more files...'
+        getTestWindow().onDidShowDialog((d) => d.selectItem(fileLocation))
+
+        const response = await getFilesToUpload(fileLocation, prompt)
+        assert.deepStrictEqual(response, [fileLocation])
+    })
+
+    it('returns undefined if the user does not select a file through the file browser', async function () {
+        selection.label = 'Browse for more files...'
+        getTestWindow().onDidShowDialog((d) => d.close())
+
+        const response = await getFilesToUpload(fileLocation, prompt)
+
+        assert.strictEqual(response, undefined)
+    })
+})
+
+describe('promptUserForBucket', async function () {
+    const fileLocation = vscode.Uri.file('/file.jpg')
+
+    let s3: S3Client
+    let buckets: Bucket[]
+
+    const promptUndef: <T extends vscode.QuickPickItem>(opts: {
+        picker: vscode.QuickPick<T>
+        onDidTriggerButton?(
+            button: vscode.QuickInputButton,
+            resolve: (value: T[] | PromiseLike<T[] | undefined> | undefined) => void,
+            reject: (reason?: any) => void
+        ): void
+    }) => Promise<T[] | undefined> = () => {
+        return new Promise((resolve, reject) => {
+            resolve(undefined)
+        })
+    }
+    const selection: any = {
+        label: 'bucket selected',
+        bucket: { Name: 'bucket 1' },
+    }
+    const promptSelect: <T extends vscode.QuickPickItem>(opts: {
+        picker: vscode.QuickPick<T>
+        onDidTriggerButton?(
+            button: vscode.QuickInputButton,
+            resolve: (value: T[] | PromiseLike<T[] | undefined> | undefined) => void,
+            reject: (reason?: any) => void
+        ): void
+    }) => Promise<T[] | undefined> = () => {
+        return new Promise((resolve, reject) => {
+            resolve([selection])
+        })
+    }
+
+    beforeEach(function () {
+        s3 = {} as any as S3Client
+        buckets = [{ Name: 'bucket 1' }, { Name: 'bucket 2' }, { Name: 'bucket 3' }]
+        getTestWindow().onDidShowDialog((d) => d.selectItem(fileLocation))
+    })
+
+    it('Returns selected bucket', async function () {
+        const stub = sinon.stub().resolves({ buckets })
+        s3.listBuckets = stub
+
+        const response = await promptUserForBucket(s3, promptSelect)
+        assert.deepStrictEqual(response, selection)
+    })
+
+    it('Returns "back" when selected', async function () {
+        const stub = sinon.stub().resolves({ buckets })
+        s3.listBuckets = stub
+
+        selection.label = 'back'
+        selection.bucket = undefined
+
+        const response = await promptUserForBucket(s3, promptSelect)
+        assert.strictEqual(response, 'back')
+    })
+
+    it('Lets the user create a new bucket', async function () {
+        const stub = sinon.stub().resolves({ buckets })
+        s3.listBuckets = stub
+
+        selection.label = 'Create new bucket'
+        selection.bucket = undefined
+
+        const createBucket: (node?: S3Node) => Promise<void> = () => {
+            throw new Error('Error expected')
+        }
+        await assert.rejects(() => promptUserForBucket(s3, promptSelect, createBucket))
+    })
+
+    it('Returns "cancel" when user doesn\'t select a bucket', async function () {
+        const stub = sinon.stub().resolves({ buckets })
+        s3.listBuckets = stub
+
+        const response = await promptUserForBucket(s3, promptUndef)
+        assert.strictEqual(response, 'cancel')
+    })
+
+    it('Throws error when it is not possible to list buckets from client', async function () {
+        const stub = sinon.stub().rejects(new Error('Expected failure'))
+        s3.listBuckets = stub
+        await assert.rejects(() => promptUserForBucket(s3))
+        getTestWindow()
+            .getFirstMessage()
+            .assertError(/Failed to list buckets from client/)
+    })
+})
diff --git a/packages/core/src/test/awsService/s3/explorer/s3BucketNode.test.ts b/packages/core/src/test/awsService/s3/explorer/s3BucketNode.test.ts
new file mode 100644
index 00000000000..7a7a19dfae5
--- /dev/null
+++ b/packages/core/src/test/awsService/s3/explorer/s3BucketNode.test.ts
@@ -0,0 +1,93 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { MoreResultsNode } from '../../../../awsexplorer/moreResultsNode'
+import { S3BucketNode } from '../../../../awsService/s3/explorer/s3BucketNode'
+import { S3FileNode } from '../../../../awsService/s3/explorer/s3FileNode'
+import { S3FolderNode } from '../../../../awsService/s3/explorer/s3FolderNode'
+import { S3Node } from '../../../../awsService/s3/explorer/s3Nodes'
+import { S3Client, File, Folder, S3Bucket } from '../../../../shared/clients/s3'
+import { AWSTreeNodeBase } from '../../../../shared/treeview/nodes/awsTreeNodeBase'
+import { LoadMoreNode } from '../../../../shared/treeview/nodes/loadMoreNode'
+import { TestSettings } from '../../../utilities/testSettingsConfiguration'
+import sinon from 'sinon'
+
+describe('S3BucketNode', function () {
+    const name = 'bucket-name'
+    const continuationToken = 'continuationToken'
+    const bucket: S3Bucket = { Name: name, BucketRegion: 'region', Arn: 'arn' }
+    const file: File = { name: 'name', key: 'key', arn: 'arn' }
+    const folder: Folder = { name: 'folder', path: 'path', arn: 'arn' }
+    const maxResults = 200
+    let s3: S3Client
+    let config: TestSettings
+
+    function assertBucketNode(node: LoadMoreNode): void {
+        assert.ok(node instanceof S3BucketNode, `Node ${String(node)} should be a Bucket Node`)
+        assert.deepStrictEqual((node as S3BucketNode).bucket, bucket)
+    }
+
+    function assertFolderNode(node: AWSTreeNodeBase, expectedFolder: Folder): void {
+        assert.ok(node instanceof S3FolderNode, `Node ${node} should be a Folder Node`)
+        assert.deepStrictEqual((node as S3FolderNode).bucket, bucket)
+        assert.deepStrictEqual((node as S3FolderNode).folder, expectedFolder)
+    }
+
+    function assertFileNode(node: AWSTreeNodeBase, expectedFile: File): void {
+        assert.ok(node instanceof S3FileNode, `Node ${node} should be a File Node`)
+        assert.deepStrictEqual((node as S3FileNode).bucket, bucket)
+        assert.deepStrictEqual((node as S3FileNode).file, expectedFile)
+    }
+
+    function assertMoreResultsNode(node: AWSTreeNodeBase): void {
+        assert.ok(node instanceof MoreResultsNode, `Node ${node} should be a More Results Node`)
+        assertBucketNode((node as MoreResultsNode).parent)
+    }
+
+    beforeEach(function () {
+        s3 = {} as any as S3Client
+        config = new TestSettings()
+    })
+
+    describe('getChildren', function () {
+        it('gets children', async function () {
+            const stub = sinon.stub().resolves({
+                folders: [folder],
+                files: [file],
+                continuationToken: undefined,
+            })
+            s3.listFiles = stub
+
+            await config.getSection('aws').update('s3.maxItemsPerPage', maxResults)
+            const node = new S3BucketNode(bucket, new S3Node(s3), s3, config)
+            const [folderNode, fileNode, ...otherNodes] = await node.getChildren()
+
+            assert(stub.calledOnceWithExactly({ bucketName: name, continuationToken: undefined, maxResults }))
+            assertFolderNode(folderNode, folder)
+            assertFileNode(fileNode, file)
+            assert.strictEqual(otherNodes.length, 0)
+        })
+
+        it('gets children with node for loading more results', async function () {
+            const stub = sinon.stub().resolves({
+                folders: [folder],
+                files: [file],
+                continuationToken,
+            })
+            s3.listFiles = stub
+
+            await config.getSection('aws').update('s3.maxItemsPerPage', maxResults)
+            const node = new S3BucketNode(bucket, new S3Node(s3), s3, config)
+            const [folderNode, fileNode, moreResultsNode, ...otherNodes] = await node.getChildren()
+
+            assert(stub.calledOnceWithExactly({ bucketName: name, continuationToken: undefined, maxResults }))
+            assertFolderNode(folderNode, folder)
+            assertFileNode(fileNode, file)
+            assertMoreResultsNode(moreResultsNode)
+            assert.strictEqual(otherNodes.length, 0)
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/s3/explorer/s3FileNode.test.ts b/packages/core/src/test/awsService/s3/explorer/s3FileNode.test.ts
new file mode 100644
index 00000000000..c54a022c3cd
--- /dev/null
+++ b/packages/core/src/test/awsService/s3/explorer/s3FileNode.test.ts
@@ -0,0 +1,38 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { stringOrProp } from '../../../../shared/utilities/tsUtils'
+import { S3BucketNode } from '../../../../awsService/s3/explorer/s3BucketNode'
+import { S3FileNode } from '../../../../awsService/s3/explorer/s3FileNode'
+import { S3Client } from '../../../../shared/clients/s3'
+import { formatLocalized } from '../../../../shared/datetime'
+
+describe('S3FileNode', function () {
+    const arn = 'arn'
+    const name = 'file.jpg'
+    const key = 'path/to/file.jpg'
+    const sizeBytes = 1024
+    const lastModified = new Date(Date.UTC(2020, 5, 4, 3, 2, 1))
+    const now = new Date(Date.UTC(2020, 6, 4))
+    const lastModifiedReadable = formatLocalized(lastModified)
+
+    it('creates an S3 File Node', async function () {
+        const node = new S3FileNode(
+            { Name: 'bucket-name', BucketRegion: 'region', Arn: 'arn' },
+            { name, key, arn, sizeBytes, lastModified },
+            {} as S3BucketNode,
+            {} as S3Client,
+            now
+        )
+
+        assert.ok(
+            stringOrProp(node.tooltip, 'tooltip').startsWith(
+                `path/to/file.jpg\nSize: 1 KB\nLast Modified: ${lastModifiedReadable}`
+            )
+        )
+        assert.ok((node.description as string).startsWith('1 KB, last month'))
+    })
+})
diff --git a/packages/core/src/test/awsService/s3/explorer/s3FolderNode.test.ts b/packages/core/src/test/awsService/s3/explorer/s3FolderNode.test.ts
new file mode 100644
index 00000000000..b7823a087ea
--- /dev/null
+++ b/packages/core/src/test/awsService/s3/explorer/s3FolderNode.test.ts
@@ -0,0 +1,92 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { MoreResultsNode } from '../../../../awsexplorer/moreResultsNode'
+import { S3FileNode } from '../../../../awsService/s3/explorer/s3FileNode'
+import { S3FolderNode } from '../../../../awsService/s3/explorer/s3FolderNode'
+import { S3Client, File, Folder, S3Bucket } from '../../../../shared/clients/s3'
+import { AWSTreeNodeBase } from '../../../../shared/treeview/nodes/awsTreeNodeBase'
+import { LoadMoreNode } from '../../../../shared/treeview/nodes/loadMoreNode'
+import { TestSettings } from '../../../utilities/testSettingsConfiguration'
+import sinon from 'sinon'
+
+describe('S3FolderNode', function () {
+    const bucketName = 'bucket-name'
+    const path = 'folder/path'
+    const continuationToken = 'continuationToken'
+    const bucket: S3Bucket = { Name: bucketName, BucketRegion: 'region', Arn: 'arn' }
+    const file: File = { name: 'name', key: 'key', arn: 'arn' }
+    const folder: Folder = { name: 'folder', path, arn: 'arn' }
+    const subFolder: Folder = { name: 'subFolder', path: 'subPath', arn: 'subArn' }
+    const maxResults = 200
+
+    let s3: S3Client
+    let config: TestSettings
+
+    function assertFolderNode(node: AWSTreeNodeBase | LoadMoreNode, expectedFolder: Folder): void {
+        assert.ok(node instanceof S3FolderNode, `Node ${String(node)} should be a Folder Node`)
+        assert.deepStrictEqual((node as S3FolderNode).bucket, bucket)
+        assert.deepStrictEqual((node as S3FolderNode).folder, expectedFolder)
+    }
+
+    function assertFileNode(node: AWSTreeNodeBase, expectedFile: File): void {
+        assert.ok(node instanceof S3FileNode, `Node ${node} should be a File Node`)
+        assert.deepStrictEqual((node as S3FileNode).bucket, bucket)
+        assert.deepStrictEqual((node as S3FileNode).file, expectedFile)
+    }
+
+    function assertMoreResultsNode(node: AWSTreeNodeBase): void {
+        assert.ok(node instanceof MoreResultsNode, `Node ${node} should be a More Results Node`)
+        assertFolderNode((node as MoreResultsNode).parent, folder)
+    }
+
+    beforeEach(async () => {
+        s3 = {} as any as S3Client
+        config = new TestSettings()
+        await config.getSection('aws').update('s3.maxItemsPerPage', maxResults)
+    })
+
+    describe('getChildren', function () {
+        it('gets children', async function () {
+            const stub = sinon.stub().resolves({
+                folders: [subFolder],
+                files: [file],
+                continuationToken: undefined,
+            })
+            s3.listFiles = stub
+
+            const node = new S3FolderNode(bucket, folder, s3, config)
+            const [subFolderNode, fileNode, ...otherNodes] = await node.getChildren()
+
+            assert(
+                stub.calledOnceWithExactly({ bucketName, folderPath: path, continuationToken: undefined, maxResults })
+            )
+            assertFolderNode(subFolderNode, subFolder)
+            assertFileNode(fileNode, file)
+            assert.strictEqual(otherNodes.length, 0)
+        })
+
+        it('gets children with node for loading more results', async function () {
+            const stub = sinon.stub().resolves({
+                folders: [subFolder],
+                files: [file],
+                continuationToken,
+            })
+            s3.listFiles = stub
+
+            const node = new S3FolderNode(bucket, folder, s3, config)
+            const [subFolderNode, fileNode, moreResultsNode, ...otherNodes] = await node.getChildren()
+
+            assert(
+                stub.calledOnceWithExactly({ bucketName, folderPath: path, continuationToken: undefined, maxResults })
+            )
+            assertFolderNode(subFolderNode, subFolder)
+            assertFileNode(fileNode, file)
+            assertMoreResultsNode(moreResultsNode)
+            assert.strictEqual(otherNodes.length, 0)
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/s3/explorer/s3Nodes.test.ts b/packages/core/src/test/awsService/s3/explorer/s3Nodes.test.ts
new file mode 100644
index 00000000000..ee25061d610
--- /dev/null
+++ b/packages/core/src/test/awsService/s3/explorer/s3Nodes.test.ts
@@ -0,0 +1,41 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { S3BucketNode } from '../../../../awsService/s3/explorer/s3BucketNode'
+import { S3Node } from '../../../../awsService/s3/explorer/s3Nodes'
+import { S3Client, S3Bucket } from '../../../../shared/clients/s3'
+import { AWSTreeNodeBase } from '../../../../shared/treeview/nodes/awsTreeNodeBase'
+import sinon from 'sinon'
+
+describe('S3Node', function () {
+    const firstBucket: S3Bucket = { Name: 'first-bucket-name', BucketRegion: 'firstRegion', Arn: 'firstArn' }
+    const secondBucket: S3Bucket = { Name: 'second-bucket-name', BucketRegion: 'secondRegion', Arn: 'secondArn' }
+
+    let s3: S3Client
+
+    function assertBucketNode(node: AWSTreeNodeBase, expectedBucket: S3Bucket): void {
+        assert.ok(node instanceof S3BucketNode, `Node ${node} should be a Bucket Node`)
+        assert.deepStrictEqual((node as S3BucketNode).bucket, expectedBucket)
+    }
+
+    beforeEach(function () {
+        s3 = {} as any as S3Client
+    })
+
+    it('gets children', async function () {
+        const stub = sinon.stub().resolves({
+            buckets: [firstBucket, secondBucket],
+        })
+        s3.listBuckets = stub
+
+        const node = new S3Node(s3)
+        const [firstBucketNode, secondBucketNode, ...otherNodes] = await node.getChildren()
+
+        assertBucketNode(firstBucketNode, firstBucket)
+        assertBucketNode(secondBucketNode, secondBucket)
+        assert.strictEqual(otherNodes.length, 0)
+    })
+})
diff --git a/packages/core/src/test/awsService/s3/util/fileViewerManager.test.ts b/packages/core/src/test/awsService/s3/util/fileViewerManager.test.ts
new file mode 100644
index 00000000000..1168ae9dbdf
--- /dev/null
+++ b/packages/core/src/test/awsService/s3/util/fileViewerManager.test.ts
@@ -0,0 +1,334 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import { S3FileProvider, S3FileViewerManager } from '../../../../awsService/s3/fileViewerManager'
+import { S3Client, File, toFile, toBucket } from '../../../../shared/clients/s3'
+import globals from '../../../../shared/extensionGlobals'
+import { VirtualFileSystem } from '../../../../shared/virtualFilesystem'
+import { bufferToStream } from '../../../../shared/utilities/streamUtilities'
+import { MockOutputChannel } from '../../../mockOutputChannel'
+import { SeverityLevel } from '../../../shared/vscode/message'
+import { assertTelemetry, assertTextEditorContains } from '../../../testUtil'
+import { ToolkitPromptSettings } from '../../../../shared/settings'
+import { stub } from '../../../utilities/stubber'
+import { assertHasProps } from '../../../../shared/utilities/tsUtils'
+import { ToolkitError } from '../../../../shared/errors'
+import { getTestWindow } from '../../../shared/vscode/window'
+import { Upload } from '@aws-sdk/lib-storage'
+
+const bucket = toBucket('bucket-name', 'us-west-2', 'aws')
+
+const bigImage = toFile(bucket, {
+    ETag: '12345',
+    Key: 'big-image.jpg',
+    Size: 5 * Math.pow(10, 6),
+})
+
+const computeTag = (content: Buffer) => content.toString()
+const makeFile = (key: string, content: Buffer) => {
+    return Object.assign(
+        toFile(bucket, {
+            Key: key,
+            ETag: computeTag(content),
+            Size: content.byteLength,
+            LastModified: new Date(),
+        }),
+        { content }
+    )
+}
+
+type DataFile = File & { readonly content: Buffer }
+function createS3() {
+    const files = new Map<string, DataFile>()
+    const client = stub(S3Client, { regionCode: bucket.BucketRegion })
+    client.downloadFileStream.callsFake(async (_, key) => bufferToStream(getFile(key).content))
+    client.headObject.callsFake(async (req) => getFile(req.key))
+    client.uploadFile.callsFake(async (req) => {
+        if (req.content instanceof vscode.Uri) {
+            throw new TypeError('Did not expect a URI, expected a Buffer')
+        }
+        const newFile = {
+            ...makeFile(req.key, Buffer.from(req.content)),
+            ContentType: req.contentType,
+        }
+        assertHasProps(newFile, 'Key', 'ETag')
+        files.set(newFile.key, newFile)
+
+        const upload = stub(Upload)
+        upload.done.resolves({
+            ...newFile,
+            Bucket: bucket.Name,
+            Location: newFile.key,
+            $metadata: {},
+        })
+
+        return upload as any as Upload
+    })
+
+    function getFile(key: string) {
+        const file = files.get(key)
+        assert.ok(file, `No file found for key "${key}"`)
+
+        return file
+    }
+
+    function addFile(file: DataFile) {
+        assert.strictEqual(files.get(file.key), undefined, `File "${file.key}" already exists`)
+        files.set(file.key, file)
+    }
+
+    return { client, addFile, getFile }
+}
+
+describe('S3FileProvider', function () {
+    const textFile = makeFile('file.txt', Buffer.from('content', 'utf-8'))
+    let provider: S3FileProvider
+    let s3: ReturnType<typeof createS3>
+
+    function createProvider(file: DataFile) {
+        return new S3FileProvider(s3.client, { ...file, bucket })
+    }
+
+    before(function () {
+        // TODO: fix this dependency
+        globals.outputChannel ??= new MockOutputChannel()
+    })
+
+    beforeEach(function () {
+        s3 = createS3()
+        s3.addFile(textFile)
+        provider = createProvider(textFile)
+    })
+
+    it('can read contents from s3', async function () {
+        const content = await provider.read()
+        assert.deepStrictEqual(content, s3.getFile(textFile.key).content)
+    })
+
+    it('can upload to s3', async function () {
+        const newContent = Buffer.from('new content', 'utf-8')
+        await provider.write(newContent)
+        assert.deepStrictEqual(await provider.read(), newContent)
+    })
+
+    it('can use `stat`', async function () {
+        const stats = await provider.stat()
+        assert.deepStrictEqual(stats, {
+            ctime: 0,
+            size: textFile.sizeBytes,
+            mtime: textFile.lastModified?.getTime(),
+        })
+    })
+
+    it('fires an event when the eTag changes', async function () {
+        const changed = new Promise<void>((resolve, reject) => {
+            provider.onDidChange(resolve)
+            setTimeout(() => reject(new Error('Event did not fire')), 1000)
+        })
+        await provider.write(Buffer.from('some text'))
+        await changed
+    })
+
+    it('uses mime type if no content type exists', async function () {
+        await provider.refresh()
+        await provider.write(Buffer.from('some text'))
+        assert.strictEqual(s3.getFile(textFile.key).ContentType, 'text/plain; charset=utf-8')
+    })
+
+    it('preserves content types if present', async function () {
+        const jsonFile = {
+            ...makeFile('json-blob', Buffer.from('{}')),
+            ContentType: 'application/json',
+        }
+        s3.addFile(jsonFile)
+        const newData = Buffer.from(JSON.stringify({ foo: 'bar' }))
+        const provider = createProvider(jsonFile)
+        await provider.refresh()
+        await provider.write(newData)
+
+        const result = s3.getFile(jsonFile.key)
+        assert.deepStrictEqual(result.content, newData)
+        assert.deepStrictEqual(result.ContentType, jsonFile.ContentType)
+    })
+
+    it('emits telemetry when downloading', async function () {
+        await provider.read()
+        assertTelemetry('s3_downloadObject', {
+            component: 'viewer',
+            result: 'Succeeded',
+        })
+    })
+
+    it('emits telemetry when uploading', async function () {
+        await provider.write(Buffer.from('111', 'utf-8'))
+        assertTelemetry('s3_uploadObject', {
+            component: 'viewer',
+            result: 'Succeeded',
+        })
+    })
+})
+
+describe('FileViewerManager', function () {
+    const readScheme = 's3-read-test'
+    const editScheme = 's3-edit-test'
+    let s3: ReturnType<typeof createS3>
+    let fs: VirtualFileSystem
+    let fileViewerManager: S3FileViewerManager
+    let disposables: vscode.Disposable[]
+
+    function findEditors(documentName: string, window = vscode.window) {
+        return window.visibleTextEditors.filter((e) => e.document.fileName.endsWith(documentName))
+    }
+
+    function registerFileSystemProviders(): vscode.Disposable[] {
+        return [
+            vscode.workspace.registerFileSystemProvider(editScheme, fs, { isCaseSensitive: true }),
+            vscode.workspace.registerFileSystemProvider(readScheme, fs, { isReadonly: true, isCaseSensitive: true }),
+        ]
+    }
+
+    before(function () {
+        s3 = createS3()
+        fs = new VirtualFileSystem()
+
+        fileViewerManager = new S3FileViewerManager(() => s3.client, fs, new ToolkitPromptSettings(), {
+            read: readScheme,
+            edit: editScheme,
+        })
+
+        disposables = registerFileSystemProviders()
+
+        const bigImageFile = makeFile('big-image.jpg', Buffer.from('fake image', 'utf-8'))
+        s3.addFile(bigImageFile)
+    })
+
+    afterEach(async function () {
+        await fileViewerManager.closeEditors()
+    })
+
+    after(async function () {
+        await vscode.Disposable.from(...disposables).dispose()
+        await fileViewerManager.dispose()
+    })
+
+    it('prompts if file size is greater than 4MB', async function () {
+        // User can "Continue".
+        const didOpen = fileViewerManager.openInReadMode({ ...bigImage, bucket })
+        await getTestWindow()
+            .waitForMessage(/File size is more than 4MB/)
+            .then((message) => message.selectItem(/Continue/))
+        await (await didOpen)?.dispose()
+    })
+
+    it('throws if the user cancels a download', async function () {
+        // User can "Cancel".
+        const didOpen = fileViewerManager.openInReadMode({ ...bigImage, bucket })
+        await getTestWindow()
+            .waitForMessage(/File size is more than 4MB/)
+            .then((message) => message.selectItem(/Cancel/))
+        await assert.rejects(didOpen)
+    })
+
+    describe('opens text files', function () {
+        const textFile1Contents = Buffer.from('test1 contents', 'utf-8')
+        const textFile1 = makeFile('test1.txt', textFile1Contents)
+        const textFile2Contents = Buffer.from('test2 contents', 'utf-8')
+        const textFile2 = makeFile('test2.txt', textFile2Contents)
+
+        before(function () {
+            s3.addFile(textFile1)
+            s3.addFile(textFile2)
+        })
+
+        it('opens a new editor if no document exists', async function () {
+            await fileViewerManager.openInReadMode({ ...textFile1, bucket })
+            await assertTextEditorContains(textFile1.content.toString())
+        })
+
+        it('closes the read-only tab when opening in edit mode', async function () {
+            await fileViewerManager.openInReadMode({ ...textFile1, bucket })
+            await fileViewerManager.openInEditMode({ ...textFile1, bucket })
+            const editors = findEditors(textFile1.name)
+            assert.strictEqual(editors.length, 1)
+            assert.strictEqual(findEditors(textFile1.name)[0]?.document.uri.scheme, editScheme)
+        })
+
+        it('re-uses tabs in edit mode when opening as read-only', async function () {
+            await fileViewerManager.openInEditMode({ ...textFile1, bucket })
+            await fileViewerManager.openInReadMode({ ...textFile1, bucket })
+            const editors = findEditors(textFile1.name)
+            assert.strictEqual(editors.length, 1)
+            assert.strictEqual(findEditors(textFile1.name)[0]?.document.uri.scheme, editScheme)
+        })
+
+        it('can open in edit mode, showing a warning with two options', async function () {
+            const shownMessage = getTestWindow()
+                .waitForMessage(/You are now editing an S3 file./)
+                .then((message) => {
+                    message.assertSeverity(SeverityLevel.Warning)
+                    assert.strictEqual(message.items.length, 2)
+                    return message
+                })
+
+            await fileViewerManager.openInEditMode({ ...textFile1, bucket })
+
+            await assertTextEditorContains(textFile1.content.toString())
+            await shownMessage
+        })
+
+        it('re-uses an editor if already opened, focusing it', async function () {
+            await fileViewerManager.openInReadMode({ ...textFile1, bucket })
+            await fileViewerManager.openInReadMode({ ...textFile2, bucket })
+
+            await assertTextEditorContains(textFile2.content.toString())
+
+            await fileViewerManager.openInReadMode({ ...textFile1, bucket })
+            await assertTextEditorContains(textFile1.content.toString())
+            assert.strictEqual(findEditors(textFile1.name).length, 1)
+        })
+
+        it('can open an S3 file with reserved URI characters', async function () {
+            const contents = Buffer.from('text', 'utf-8')
+            const file = makeFile('us-west-2:3cff280c/file.txt', contents)
+            s3.addFile(file)
+
+            await fileViewerManager.openInReadMode({ ...file, bucket })
+            await assertTextEditorContains(contents.toString())
+        })
+
+        it('can open files with no file extension', async function () {
+            const contents = Buffer.from('text', 'utf-8')
+            const file = makeFile('us-west-2:3cff280c/file', contents)
+            s3.addFile(file)
+
+            await fileViewerManager.openInReadMode({ ...file, bucket })
+            await assertTextEditorContains(contents.toString())
+        })
+
+        it('rejects if the file does not exist', async function () {
+            const file = makeFile('foo.txt', Buffer.from('0', 'utf-8'))
+            const err = await fileViewerManager.openInReadMode({ ...file, bucket }).catch((e) => e)
+            assert.ok(err instanceof ToolkitError)
+        })
+
+        it('is case-sensitive for file names', async function () {
+            // Create and assert content of file with lowercase name
+            const lowerCaseFileContent = 'lowercaseContent'
+            const lowerCaseFile = makeFile('myFile.txt', Buffer.from(lowerCaseFileContent, 'utf-8'))
+            s3.addFile(lowerCaseFile)
+            await fileViewerManager.openInReadMode({ ...lowerCaseFile, bucket })
+            await assertTextEditorContains(lowerCaseFileContent)
+
+            // Create similarily named file, but with different uppercase in name
+            const upperCaseFileContent = 'uppercaseContent'
+            const upperCaseFile = makeFile('MyFile.txt', Buffer.from(upperCaseFileContent, 'utf-8'))
+            s3.addFile(upperCaseFile)
+            await fileViewerManager.openInReadMode({ ...upperCaseFile, bucket })
+            await assertTextEditorContains(upperCaseFileContent)
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/s3/util/progressReporter.test.ts b/packages/core/src/test/awsService/s3/util/progressReporter.test.ts
new file mode 100644
index 00000000000..67670dba301
--- /dev/null
+++ b/packages/core/src/test/awsService/s3/util/progressReporter.test.ts
@@ -0,0 +1,123 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import { progressReporter } from '../../../../awsService/s3/progressReporter'
+import sinon from 'sinon'
+
+describe('progressReporter', function () {
+    let progress: vscode.Progress<{ message?: string; increment?: number }>
+
+    beforeEach(function () {
+        progress = {} as any as vscode.Progress<{ message?: string; increment?: number }>
+    })
+
+    it('does not round', function () {
+        const stub = sinon.stub()
+        progress.report = stub
+        const reporter = progressReporter(progress, { totalBytes: 3, minIntervalMillis: 0 })
+
+        reporter(1)
+        assert(stub.firstCall.calledWithExactly({ message: undefined, increment: (1 / 3) * 100 }))
+
+        reporter(2)
+        assert(stub.secondCall.calledWithExactly({ message: undefined, increment: (2 / 3) * 100 }))
+    })
+
+    it('reports incremental percentage when total is provided', function () {
+        const stub = sinon.stub()
+        progress.report = stub
+        const reporter = progressReporter(progress, { totalBytes: 16, minIntervalMillis: 0 })
+
+        reporter(4)
+        assert(stub.firstCall.calledWithExactly({ message: undefined, increment: 25 }))
+
+        reporter(8)
+        assert(stub.secondCall.calledWithExactly({ message: undefined, increment: 50 }))
+    })
+
+    it('reports a formatted message if `reportMessage` is set', function () {
+        const stub = sinon.stub()
+        progress.report = stub
+        const reporter = progressReporter(progress, {
+            totalBytes: 16,
+            minIntervalMillis: 0,
+            reportMessage: true,
+        })
+
+        reporter(4)
+        assert(stub.firstCall.calledWithExactly({ message: `4 B / 16 B`, increment: 25 }))
+
+        reporter(8)
+        assert(stub.secondCall.calledWithExactly({ message: `12 B / 16 B`, increment: 50 }))
+    })
+
+    it('throttles progress updates when update frequency exceeds throttle interval', function () {
+        const stub = sinon.stub()
+        progress.report = stub
+        const reporter = progressReporter(progress, {
+            totalBytes: 16,
+            minIntervalMillis: 99999,
+        })
+
+        reporter(4) // should fire as leading edge of interval (4/16 - 0/16 = 4/16 = +25%)
+        assert(
+            stub.firstCall.calledWithExactly({
+                message: undefined,
+                increment: 25,
+            })
+        )
+
+        reporter(4) // shouldn't fire
+        reporter(8) // should fire, since this puts progress at 100%
+
+        assert(
+            stub.secondCall.calledWithExactly({
+                message: undefined,
+                increment: 75,
+            })
+        )
+    })
+
+    it('reports no incremental percentage when total is not provided', function () {
+        const stub = sinon.stub()
+        progress.report = stub
+        const reporter = progressReporter(progress, { minIntervalMillis: 0 })
+
+        reporter(4)
+        reporter(8)
+
+        assert(stub.calledTwice)
+        assert(stub.firstCall.notCalledWith(sinon.match.number))
+        assert(stub.secondCall.notCalledWith(sinon.match.number))
+    })
+
+    it('throws an error if total bytes is not an integer', function () {
+        assert.throws(() => progressReporter(progress, { totalBytes: 1.5, minIntervalMillis: 0 }), /must be an integer/)
+    })
+
+    it('throws an error if total bytes is negative', function () {
+        assert.throws(() => progressReporter(progress, { totalBytes: -5, minIntervalMillis: 0 }), /cannot be negative/)
+    })
+
+    it('throws an error if updated with non integer bytes', function () {
+        const reporter = progressReporter(progress, { totalBytes: 5, minIntervalMillis: 0 })
+
+        assert.throws(() => reporter(1.5), /must be an integer/)
+    })
+
+    it('throws an error if updated with negative bytes', function () {
+        const reporter = progressReporter(progress, { totalBytes: 5, minIntervalMillis: 0 })
+
+        assert.throws(() => reporter(-5), /cannot be negative/)
+    })
+
+    it('throws an error if updated with bytes greater than total bytes', function () {
+        const reporter = progressReporter(progress, { totalBytes: 2, minIntervalMillis: 0 })
+
+        assert.throws(() => reporter(5), /cannot be greater than totalBytes/)
+    })
+})
diff --git a/packages/core/src/test/awsService/s3/util/util.test.ts b/packages/core/src/test/awsService/s3/util/util.test.ts
new file mode 100644
index 00000000000..3c4d1d92e98
--- /dev/null
+++ b/packages/core/src/test/awsService/s3/util/util.test.ts
@@ -0,0 +1,27 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { readablePath } from '../../../../awsService/s3/util'
+
+describe('messages', function () {
+    describe('readablePath', function () {
+        const bucketName = 'bucket-name'
+        const bucketPath = ''
+        const objectPath = 'path/to/object'
+
+        it('creates a readable path for an S3 bucket', function () {
+            const path = readablePath({ bucket: { Name: bucketName }, path: bucketPath })
+
+            assert.strictEqual(path, 's3://bucket-name')
+        })
+
+        it('creates a readable path for an object in an S3 bucket', function () {
+            const path = readablePath({ bucket: { Name: bucketName }, path: objectPath })
+
+            assert.strictEqual(path, 's3://bucket-name/path/to/object')
+        })
+    })
+})
diff --git a/src/test/s3/util/validateBucketName.test.ts b/packages/core/src/test/awsService/s3/util/validateBucketName.test.ts
similarity index 82%
rename from src/test/s3/util/validateBucketName.test.ts
rename to packages/core/src/test/awsService/s3/util/validateBucketName.test.ts
index be73c605680..f1331f06633 100644
--- a/src/test/s3/util/validateBucketName.test.ts
+++ b/packages/core/src/test/awsService/s3/util/validateBucketName.test.ts
@@ -1,10 +1,10 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
-import { validateBucketName } from '../../../s3/util'
+import assert from 'assert'
+import { validateBucketName } from '../../../../awsService/s3/util'
 
 describe('validateBucketName', function () {
     const invalidErrors: { bucketNames: string[]; error: string }[] = [
@@ -26,13 +26,13 @@ describe('validateBucketName', function () {
         assert.strictEqual(validateBucketName('v.4.l1d.buc.ket-n4.m3'), undefined)
     })
 
-    invalidErrors.forEach(invalid => {
+    for (const invalid of invalidErrors) {
         describe(invalid.error, () => {
-            invalid.bucketNames.forEach(bucketName => {
+            for (const bucketName of invalid.bucketNames) {
                 it(bucketName, () => {
                     assert.strictEqual(validateBucketName(bucketName), invalid.error)
                 })
-            })
+            }
         })
-    })
+    }
 })
diff --git a/packages/core/src/test/awsService/sagemaker/credentialMapping.test.ts b/packages/core/src/test/awsService/sagemaker/credentialMapping.test.ts
new file mode 100644
index 00000000000..3134f11e5e0
--- /dev/null
+++ b/packages/core/src/test/awsService/sagemaker/credentialMapping.test.ts
@@ -0,0 +1,448 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+import * as assert from 'assert'
+import {
+    persistLocalCredentials,
+    persistSSMConnection,
+    persistSmusProjectCreds,
+    loadMappings,
+    saveMappings,
+    setSpaceIamProfile,
+    setSpaceSsoProfile,
+    setSmusSpaceSsoProfile,
+    setSpaceCredentials,
+} from '../../../awsService/sagemaker/credentialMapping'
+import { Auth } from '../../../auth'
+import { DevSettings, fs } from '../../../shared'
+import globals from '../../../shared/extensionGlobals'
+import { SagemakerUnifiedStudioSpaceNode } from '../../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioSpaceNode'
+import { SageMakerUnifiedStudioSpacesParentNode } from '../../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioSpacesParentNode'
+
+describe('credentialMapping', () => {
+    describe('persistLocalCredentials', () => {
+        const appArn = 'arn:aws:sagemaker:us-west-2:123456789012:space/d-f0lwireyzpjp/test-space'
+
+        let sandbox: sinon.SinonSandbox
+
+        beforeEach(() => {
+            sandbox = sinon.createSandbox()
+        })
+
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        it('writes IAM profile to mappings', async () => {
+            sandbox.stub(Auth.instance, 'getCurrentProfileId').returns('profile:my-iam-profile')
+            sandbox.stub(fs, 'existsFile').resolves(false) // simulate no existing mapping file
+            const writeStub = sandbox.stub(fs, 'writeFile').resolves()
+
+            await persistLocalCredentials(appArn)
+
+            assert.ok(writeStub.calledOnce)
+            const raw = writeStub.firstCall.args[1]
+            const data = JSON.parse(typeof raw === 'string' ? raw : raw.toString())
+
+            assert.deepStrictEqual(data.localCredential?.[appArn], {
+                type: 'iam',
+                profileName: 'profile:my-iam-profile',
+            })
+        })
+
+        it('writes SSO credentials to mappings', async () => {
+            sandbox.stub(Auth.instance, 'getCurrentProfileId').returns('sso:my-sso-profile')
+            sandbox.stub(globals.loginManager.store, 'credentialsCache').value({
+                'sso:my-sso-profile': {
+                    credentials: {
+                        accessKeyId: 'AKIA123',
+                        secretAccessKey: 'SECRET',
+                        sessionToken: 'TOKEN',
+                    },
+                },
+            })
+            sandbox.stub(fs, 'existsFile').resolves(false)
+            const writeStub = sandbox.stub(fs, 'writeFile').resolves()
+
+            await persistLocalCredentials(appArn)
+
+            assert.ok(writeStub.calledOnce)
+            const raw = writeStub.firstCall.args[1]
+            const data = JSON.parse(typeof raw === 'string' ? raw : raw.toString())
+            assert.deepStrictEqual(data.localCredential?.[appArn], {
+                type: 'sso',
+                accessKey: 'AKIA123',
+                secret: 'SECRET',
+                token: 'TOKEN',
+            })
+        })
+
+        it('throws if no current profile ID is available', async () => {
+            sandbox.stub(Auth.instance, 'getCurrentProfileId').returns(undefined)
+
+            await assert.rejects(() => persistLocalCredentials(appArn), {
+                message: 'No current profile ID available for saving space credentials.',
+            })
+        })
+    })
+
+    describe('persistSSMConnection', () => {
+        const appArn = 'arn:aws:sagemaker:us-west-2:123456789012:space/d-f0lwireyzpjp/test-space'
+        const domain = 'd-f0lwireyzpjp'
+        let sandbox: sinon.SinonSandbox
+
+        beforeEach(() => {
+            sandbox = sinon.createSandbox()
+        })
+
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        function assertRefreshUrlMatches(writtenUrl: string, expectedSubdomain: string) {
+            assert.ok(
+                writtenUrl.startsWith(`https://studio-${domain}.${expectedSubdomain}`),
+                `Expected refresh URL to start with https://studio-${domain}.${expectedSubdomain}, got ${writtenUrl}`
+            )
+        }
+
+        it('uses default (studio) endpoint if no custom endpoint is set', async () => {
+            sandbox.stub(DevSettings.instance, 'get').returns({})
+            sandbox.stub(fs, 'existsFile').resolves(false)
+            const writeStub = sandbox.stub(fs, 'writeFile').resolves()
+
+            // Stub the AWS API call
+            const mockDescribeSpace = sandbox.stub().resolves({
+                SpaceSettings: {
+                    AppType: 'JupyterLab',
+                },
+            })
+            sandbox.stub(require('../../../shared/clients/sagemaker'), 'SagemakerClient').returns({
+                describeSpace: mockDescribeSpace,
+            })
+
+            await persistSSMConnection(appArn, domain)
+
+            const raw = writeStub.firstCall.args[1]
+            const data = JSON.parse(typeof raw === 'string' ? raw : raw.toString())
+
+            assertRefreshUrlMatches(data.deepLink?.[appArn]?.refreshUrl, 'studio.us-west-2.sagemaker.aws')
+            assert.deepStrictEqual(data.deepLink?.[appArn]?.requests['initial-connection'], {
+                sessionId: '-',
+                url: '-',
+                token: '-',
+                status: 'fresh',
+            })
+        })
+
+        it('uses devo subdomain for beta endpoint', async () => {
+            sandbox.stub(DevSettings.instance, 'get').returns({ sagemaker: 'https://beta.whatever' })
+            sandbox.stub(fs, 'existsFile').resolves(false)
+            const writeStub = sandbox.stub(fs, 'writeFile').resolves()
+
+            // Stub the AWS API call
+            const mockDescribeSpace = sandbox.stub().resolves({
+                SpaceSettings: {
+                    AppType: 'JupyterLab',
+                },
+            })
+            sandbox.stub(require('../../../shared/clients/sagemaker'), 'SagemakerClient').returns({
+                describeSpace: mockDescribeSpace,
+            })
+
+            await persistSSMConnection(appArn, domain, 'sess', 'wss://ws', 'token')
+
+            const raw = writeStub.firstCall.args[1]
+            const data = JSON.parse(typeof raw === 'string' ? raw : raw.toString())
+
+            assertRefreshUrlMatches(data.deepLink?.[appArn]?.refreshUrl, 'devo.studio.us-west-2.asfiovnxocqpcry.com')
+            assert.deepStrictEqual(data.deepLink?.[appArn]?.requests['initial-connection'], {
+                sessionId: 'sess',
+                url: 'wss://ws',
+                token: 'token',
+                status: 'fresh',
+            })
+        })
+
+        it('uses loadtest subdomain for gamma endpoint', async () => {
+            sandbox.stub(DevSettings.instance, 'get').returns({ sagemaker: 'https://gamma.example' })
+            sandbox.stub(fs, 'existsFile').resolves(false)
+            const writeStub = sandbox.stub(fs, 'writeFile').resolves()
+
+            // Stub the AWS API call
+            const mockDescribeSpace = sandbox.stub().resolves({
+                SpaceSettings: {
+                    AppType: 'JupyterLab',
+                },
+            })
+            sandbox.stub(require('../../../shared/clients/sagemaker'), 'SagemakerClient').returns({
+                describeSpace: mockDescribeSpace,
+            })
+
+            await persistSSMConnection(appArn, domain)
+
+            const raw = writeStub.firstCall.args[1]
+            const data = JSON.parse(typeof raw === 'string' ? raw : raw.toString())
+
+            assertRefreshUrlMatches(
+                data.deepLink?.[appArn]?.refreshUrl,
+                'loadtest.studio.us-west-2.asfiovnxocqpcry.com'
+            )
+        })
+
+        // TODO: Skipped due to hardcoded appSubDomain. Currently hardcoded to 'jupyterlab' due to
+        // a bug in Studio that only supports refreshing the token for both CodeEditor and JupyterLab
+        // Apps in the jupyterlab subdomain. This will be fixed shortly after NYSummit launch to
+        // support refresh URL in CodeEditor subdomain. Additionally, appType will be determined by
+        // the deeplink URI rather than the describeSpace call from the toolkit.
+        it.skip('throws error when app type is unsupported', async () => {
+            sandbox.stub(DevSettings.instance, 'get').returns({})
+            sandbox.stub(fs, 'existsFile').resolves(false)
+
+            // Stub the AWS API call to return an unsupported app type
+            const mockDescribeSpace = sandbox.stub().resolves({
+                SpaceSettings: {
+                    AppType: 'UnsupportedApp',
+                },
+            })
+            sandbox.stub(require('../../../shared/clients/sagemaker'), 'SagemakerClient').returns({
+                describeSpace: mockDescribeSpace,
+            })
+
+            await assert.rejects(() => persistSSMConnection(appArn, domain), {
+                name: 'Error',
+                message:
+                    'Unsupported or missing app type for space. Expected JupyterLab or CodeEditor, got: UnsupportedApp',
+            })
+        })
+    })
+
+    describe('persistSmusProjectCreds', () => {
+        const appArn = 'arn:aws:sagemaker:us-west-2:123456789012:space/d-f0lwireyzpjp/test-space'
+        const projectId = 'test-project-id'
+        let sandbox: sinon.SinonSandbox
+        let mockNode: sinon.SinonStubbedInstance<SagemakerUnifiedStudioSpaceNode>
+        let mockParent: sinon.SinonStubbedInstance<SageMakerUnifiedStudioSpacesParentNode>
+
+        beforeEach(() => {
+            sandbox = sinon.createSandbox()
+            mockNode = sandbox.createStubInstance(SagemakerUnifiedStudioSpaceNode)
+            mockParent = sandbox.createStubInstance(SageMakerUnifiedStudioSpacesParentNode)
+        })
+
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        it('persists SMUS project credentials', async () => {
+            const mockCredentialProvider = {
+                getCredentials: sandbox.stub().resolves(),
+                startProactiveCredentialRefresh: sandbox.stub(),
+            }
+
+            const mockAuthProvider = {
+                getProjectCredentialProvider: sandbox.stub().resolves(mockCredentialProvider),
+            }
+
+            mockNode.getParent.returns(mockParent as any)
+            mockParent.getAuthProvider.returns(mockAuthProvider as any)
+            mockParent.getProjectId.returns(projectId)
+
+            sandbox.stub(fs, 'existsFile').resolves(false)
+            const writeStub = sandbox.stub(fs, 'writeFile').resolves()
+
+            await persistSmusProjectCreds(appArn, mockNode as any)
+
+            assert.ok(writeStub.calledOnce)
+            const raw = writeStub.firstCall.args[1]
+            const data = JSON.parse(typeof raw === 'string' ? raw : raw.toString())
+            assert.deepStrictEqual(data.localCredential?.[appArn], {
+                type: 'sso',
+                smusProjectId: projectId,
+            })
+
+            // Verify the correct methods were called
+            assert.ok(mockAuthProvider.getProjectCredentialProvider.calledWith(projectId))
+            assert.ok(mockCredentialProvider.getCredentials.calledOnce)
+            assert.ok(mockCredentialProvider.startProactiveCredentialRefresh.calledOnce)
+        })
+    })
+
+    describe('loadMappings', () => {
+        let sandbox: sinon.SinonSandbox
+
+        beforeEach(() => {
+            sandbox = sinon.createSandbox()
+        })
+
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        it('returns empty object when file does not exist', async () => {
+            sandbox.stub(fs, 'existsFile').resolves(false)
+
+            const result = await loadMappings()
+
+            assert.deepStrictEqual(result, {})
+        })
+
+        it('loads and parses existing mappings', async () => {
+            const mockData = { localCredential: { 'test-arn': { type: 'iam' as const, profileName: 'test' } } }
+            sandbox.stub(fs, 'existsFile').resolves(true)
+            sandbox.stub(fs, 'readFileText').resolves(JSON.stringify(mockData))
+
+            const result = await loadMappings()
+
+            assert.deepStrictEqual(result, mockData)
+        })
+
+        it('returns empty object on parse error', async () => {
+            sandbox.stub(fs, 'existsFile').resolves(true)
+            sandbox.stub(fs, 'readFileText').resolves('invalid json')
+
+            const result = await loadMappings()
+
+            assert.deepStrictEqual(result, {})
+        })
+    })
+
+    describe('saveMappings', () => {
+        let sandbox: sinon.SinonSandbox
+
+        beforeEach(() => {
+            sandbox = sinon.createSandbox()
+        })
+
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        it('saves mappings to file', async () => {
+            const writeStub = sandbox.stub(fs, 'writeFile').resolves()
+            const testData = { localCredential: { 'test-arn': { type: 'iam' as const, profileName: 'test' } } }
+
+            await saveMappings(testData)
+
+            assert.ok(writeStub.calledOnce)
+            const [, content, options] = writeStub.firstCall.args
+            assert.strictEqual(content, JSON.stringify(testData, undefined, 2))
+            assert.deepStrictEqual(options, { mode: 0o600, atomic: true })
+        })
+    })
+
+    describe('setSpaceIamProfile', () => {
+        let sandbox: sinon.SinonSandbox
+
+        beforeEach(() => {
+            sandbox = sinon.createSandbox()
+        })
+
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        it('sets IAM profile for space', async () => {
+            sandbox.stub(fs, 'existsFile').resolves(false)
+            const writeStub = sandbox.stub(fs, 'writeFile').resolves()
+
+            await setSpaceIamProfile('test-space', 'test-profile')
+
+            const raw = writeStub.firstCall.args[1]
+            const data = JSON.parse(typeof raw === 'string' ? raw : raw.toString())
+            assert.deepStrictEqual(data.localCredential?.['test-space'], {
+                type: 'iam',
+                profileName: 'test-profile',
+            })
+        })
+    })
+
+    describe('setSpaceSsoProfile', () => {
+        let sandbox: sinon.SinonSandbox
+
+        beforeEach(() => {
+            sandbox = sinon.createSandbox()
+        })
+
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        it('sets SSO profile for space', async () => {
+            sandbox.stub(fs, 'existsFile').resolves(false)
+            const writeStub = sandbox.stub(fs, 'writeFile').resolves()
+
+            await setSpaceSsoProfile('test-space', 'access-key', 'secret', 'token')
+
+            const raw = writeStub.firstCall.args[1]
+            const data = JSON.parse(typeof raw === 'string' ? raw : raw.toString())
+            assert.deepStrictEqual(data.localCredential?.['test-space'], {
+                type: 'sso',
+                accessKey: 'access-key',
+                secret: 'secret',
+                token: 'token',
+            })
+        })
+    })
+
+    describe('setSmusSpaceSsoProfile', () => {
+        let sandbox: sinon.SinonSandbox
+
+        beforeEach(() => {
+            sandbox = sinon.createSandbox()
+        })
+
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        it('sets SMUS SSO profile for space', async () => {
+            sandbox.stub(fs, 'existsFile').resolves(false)
+            const writeStub = sandbox.stub(fs, 'writeFile').resolves()
+
+            await setSmusSpaceSsoProfile('test-space', 'project-id')
+
+            const raw = writeStub.firstCall.args[1]
+            const data = JSON.parse(typeof raw === 'string' ? raw : raw.toString())
+            assert.deepStrictEqual(data.localCredential?.['test-space'], {
+                type: 'sso',
+                smusProjectId: 'project-id',
+            })
+        })
+    })
+
+    describe('setSpaceCredentials', () => {
+        let sandbox: sinon.SinonSandbox
+
+        beforeEach(() => {
+            sandbox = sinon.createSandbox()
+        })
+
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        it('sets space credentials with refresh URL', async () => {
+            sandbox.stub(fs, 'existsFile').resolves(false)
+            const writeStub = sandbox.stub(fs, 'writeFile').resolves()
+            const credentials = { sessionId: 'sess', url: 'ws://test', token: 'token' }
+
+            await setSpaceCredentials('test-space', 'https://refresh.url', credentials)
+
+            const raw = writeStub.firstCall.args[1]
+            const data = JSON.parse(typeof raw === 'string' ? raw : raw.toString())
+            assert.deepStrictEqual(data.deepLink?.['test-space'], {
+                refreshUrl: 'https://refresh.url',
+                requests: {
+                    'initial-connection': {
+                        ...credentials,
+                        status: 'fresh',
+                    },
+                },
+            })
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/sagemaker/detached-server/credentials.test.ts b/packages/core/src/test/awsService/sagemaker/detached-server/credentials.test.ts
new file mode 100644
index 00000000000..3db189f8390
--- /dev/null
+++ b/packages/core/src/test/awsService/sagemaker/detached-server/credentials.test.ts
@@ -0,0 +1,152 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as utils from '../../../../awsService/sagemaker/detached-server/utils'
+import { resolveCredentialsFor } from '../../../../awsService/sagemaker/detached-server/credentials'
+
+const connectionId = 'arn:aws:sagemaker:region:acct:space/name'
+
+describe('resolveCredentialsFor', () => {
+    afterEach(() => sinon.restore())
+
+    it('throws if no profile is found', async () => {
+        sinon.stub(utils, 'readMapping').resolves({ localCredential: {} })
+
+        await assert.rejects(() => resolveCredentialsFor(connectionId), {
+            message: `No profile found for "${connectionId}"`,
+        })
+    })
+
+    it('throws if IAM profile name is malformed', async () => {
+        sinon.stub(utils, 'readMapping').resolves({
+            localCredential: {
+                [connectionId]: {
+                    type: 'iam',
+                    profileName: 'dev-profile', // no colon
+                },
+            },
+        })
+
+        await assert.rejects(() => resolveCredentialsFor(connectionId), {
+            message: `Invalid IAM profile name for "${connectionId}"`,
+        })
+    })
+
+    it('resolves SSO credentials correctly', async () => {
+        sinon.stub(utils, 'readMapping').resolves({
+            localCredential: {
+                [connectionId]: {
+                    type: 'sso',
+                    accessKey: 'key',
+                    secret: 'sec',
+                    token: 'tok',
+                },
+            },
+        })
+
+        const creds = await resolveCredentialsFor(connectionId)
+        assert.deepStrictEqual(creds, {
+            accessKeyId: 'key',
+            secretAccessKey: 'sec',
+            sessionToken: 'tok',
+        })
+    })
+
+    it('throws if SSO credentials are incomplete', async () => {
+        sinon.stub(utils, 'readMapping').resolves({
+            localCredential: {
+                [connectionId]: {
+                    type: 'sso',
+                    accessKey: 'key',
+                    secret: 'sec',
+                    token: '', // token is required but intentionally left empty for this test
+                },
+            },
+        })
+
+        await assert.rejects(() => resolveCredentialsFor(connectionId), {
+            message: `Missing SSO credentials for "${connectionId}"`,
+        })
+    })
+
+    it('resolves SSO credentials with SMUS project ID', async () => {
+        sinon.stub(utils, 'readMapping').resolves({
+            localCredential: {
+                [connectionId]: {
+                    type: 'sso',
+                    smusProjectId: 'project123',
+                },
+            },
+            smusProjects: {
+                project123: {
+                    accessKey: 'smus-key',
+                    secret: 'smus-secret',
+                    token: 'smus-token',
+                },
+            },
+        })
+
+        const creds = await resolveCredentialsFor(connectionId)
+        assert.deepStrictEqual(creds, {
+            accessKeyId: 'smus-key',
+            secretAccessKey: 'smus-secret',
+            sessionToken: 'smus-token',
+        })
+    })
+
+    it('throws if SMUS project credentials are missing', async () => {
+        sinon.stub(utils, 'readMapping').resolves({
+            localCredential: {
+                [connectionId]: {
+                    type: 'sso',
+                    smusProjectId: 'project123',
+                },
+            },
+            smusProjects: {
+                project123: {
+                    accessKey: '',
+                    secret: 'smus-secret',
+                    token: 'smus-token',
+                },
+            },
+        })
+
+        await assert.rejects(() => resolveCredentialsFor(connectionId), {
+            message: `Missing ProjectRole credentials for SMUS Space "${connectionId}"`,
+        })
+    })
+
+    it('throws if SMUS project is not found', async () => {
+        sinon.stub(utils, 'readMapping').resolves({
+            localCredential: {
+                [connectionId]: {
+                    type: 'sso',
+                    smusProjectId: 'nonexistent',
+                },
+            },
+            smusProjects: {},
+        })
+
+        await assert.rejects(() => resolveCredentialsFor(connectionId), {
+            message: `Missing ProjectRole credentials for SMUS Space "${connectionId}"`,
+        })
+    })
+
+    it('throws for unsupported profile types', async () => {
+        sinon.stub(utils, 'readMapping').resolves({
+            localCredential: {
+                [connectionId]: {
+                    type: 'unknown',
+                } as any,
+            },
+        })
+
+        await assert.rejects(() => resolveCredentialsFor(connectionId), {
+            message: /Unsupported profile type/, // don't hard-code full value since object might be serialized
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/sagemaker/detached-server/routes/getSession.test.ts b/packages/core/src/test/awsService/sagemaker/detached-server/routes/getSession.test.ts
new file mode 100644
index 00000000000..5b3f176a29f
--- /dev/null
+++ b/packages/core/src/test/awsService/sagemaker/detached-server/routes/getSession.test.ts
@@ -0,0 +1,102 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as http from 'http'
+import * as sinon from 'sinon'
+import assert from 'assert'
+import { handleGetSession } from '../../../../../awsService/sagemaker/detached-server/routes/getSession'
+import * as credentials from '../../../../../awsService/sagemaker/detached-server/credentials'
+import * as utils from '../../../../../awsService/sagemaker/detached-server/utils'
+import * as errorPage from '../../../../../awsService/sagemaker/detached-server/errorPage'
+
+describe('handleGetSession', () => {
+    let req: Partial<http.IncomingMessage>
+    let res: Partial<http.ServerResponse>
+    let resWriteHead: sinon.SinonSpy
+    let resEnd: sinon.SinonSpy
+
+    beforeEach(() => {
+        resWriteHead = sinon.spy()
+        resEnd = sinon.spy()
+
+        res = {
+            writeHead: resWriteHead,
+            end: resEnd,
+        }
+        sinon.stub(errorPage, 'openErrorPage')
+    })
+
+    it('responds with 400 if connection_identifier is missing', async () => {
+        req = { url: '/session' }
+        await handleGetSession(req as http.IncomingMessage, res as http.ServerResponse)
+
+        assert(resWriteHead.calledWith(400))
+        assert(resEnd.calledWithMatch(/Missing required query parameter/))
+    })
+
+    it('responds with 500 if resolveCredentialsFor throws', async () => {
+        req = { url: '/session?connection_identifier=arn:aws:sagemaker:region:acc:space/domain/name' }
+        sinon.stub(credentials, 'resolveCredentialsFor').rejects(new Error('creds error'))
+        sinon.stub(utils, 'parseArn').returns({
+            region: 'us-west-2',
+            accountId: '123456789012',
+            spaceName: 'space-name',
+        })
+
+        await handleGetSession(req as http.IncomingMessage, res as http.ServerResponse)
+
+        assert(resWriteHead.calledWith(500))
+        assert(resEnd.calledWith('creds error'))
+    })
+
+    it('responds with 500 if startSagemakerSession throws', async () => {
+        req = { url: '/session?connection_identifier=arn:aws:sagemaker:region:acc:space/domain/name' }
+        sinon.stub(credentials, 'resolveCredentialsFor').resolves({})
+        sinon.stub(utils, 'parseArn').returns({
+            region: 'us-west-2',
+            accountId: '123456789012',
+            spaceName: 'space-name',
+        })
+        sinon.stub(utils, 'startSagemakerSession').rejects(new Error('session error'))
+
+        await handleGetSession(req as http.IncomingMessage, res as http.ServerResponse)
+
+        assert(resWriteHead.calledWith(500))
+        assert(resEnd.calledWith('Failed to start SageMaker session'))
+    })
+
+    it('responds with 200 and session data on success', async () => {
+        req = { url: '/session?connection_identifier=arn:aws:sagemaker:region:acc:space/domain/name' }
+        sinon.stub(credentials, 'resolveCredentialsFor').resolves({})
+        sinon.stub(utils, 'parseArn').returns({
+            region: 'us-west-2',
+            accountId: '123456789012',
+            spaceName: 'space-name',
+        })
+        sinon.stub(utils, 'startSagemakerSession').resolves({
+            SessionId: 'abc123',
+            StreamUrl: 'https://stream',
+            TokenValue: 'token123',
+            $metadata: { httpStatusCode: 200 },
+        })
+
+        await handleGetSession(req as http.IncomingMessage, res as http.ServerResponse)
+
+        assert(resWriteHead.calledWith(200))
+        assert(
+            resEnd.calledWithMatch(
+                JSON.stringify({
+                    SessionId: 'abc123',
+                    StreamUrl: 'https://stream',
+                    TokenValue: 'token123',
+                })
+            )
+        )
+    })
+
+    afterEach(() => {
+        sinon.restore()
+    })
+})
diff --git a/packages/core/src/test/awsService/sagemaker/detached-server/routes/getSessionAsync.test.ts b/packages/core/src/test/awsService/sagemaker/detached-server/routes/getSessionAsync.test.ts
new file mode 100644
index 00000000000..8d3ab8563ee
--- /dev/null
+++ b/packages/core/src/test/awsService/sagemaker/detached-server/routes/getSessionAsync.test.ts
@@ -0,0 +1,99 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as http from 'http'
+import * as sinon from 'sinon'
+import assert from 'assert'
+import { SessionStore } from '../../../../../awsService/sagemaker/detached-server/sessionStore'
+import { handleGetSessionAsync } from '../../../../../awsService/sagemaker/detached-server/routes/getSessionAsync'
+import * as utils from '../../../../../awsService/sagemaker/detached-server/utils'
+
+describe('handleGetSessionAsync', () => {
+    let req: Partial<http.IncomingMessage>
+    let res: Partial<http.ServerResponse>
+    let resWriteHead: sinon.SinonSpy
+    let resEnd: sinon.SinonSpy
+    let storeStub: sinon.SinonStubbedInstance<SessionStore>
+
+    beforeEach(() => {
+        resWriteHead = sinon.spy()
+        resEnd = sinon.spy()
+        res = { writeHead: resWriteHead, end: resEnd }
+
+        storeStub = sinon.createStubInstance(SessionStore)
+        sinon.stub(SessionStore.prototype, 'getFreshEntry').callsFake(storeStub.getFreshEntry)
+        sinon.stub(SessionStore.prototype, 'getStatus').callsFake(storeStub.getStatus)
+        sinon.stub(SessionStore.prototype, 'getRefreshUrl').callsFake(storeStub.getRefreshUrl)
+        sinon.stub(SessionStore.prototype, 'markPending').callsFake(storeStub.markPending)
+    })
+
+    it('responds with 400 if required query parameters are missing', async () => {
+        req = { url: '/session_async?connection_identifier=abc' } // missing request_id
+        await handleGetSessionAsync(req as http.IncomingMessage, res as http.ServerResponse)
+
+        assert(resWriteHead.calledWith(400))
+        assert(resEnd.calledWithMatch(/Missing required query parameters/))
+    })
+
+    it('responds with 200 and session data if freshEntry exists', async () => {
+        req = { url: '/session_async?connection_identifier=abc&request_id=req123' }
+        storeStub.getFreshEntry.returns(Promise.resolve({ sessionId: 'sid', token: 'tok', url: 'wss://test' }))
+
+        await handleGetSessionAsync(req as http.IncomingMessage, res as http.ServerResponse)
+
+        assert(resWriteHead.calledWith(200))
+        const actualJson = JSON.parse(resEnd.firstCall.args[0])
+        assert.deepStrictEqual(actualJson, {
+            SessionId: 'sid',
+            TokenValue: 'tok',
+            StreamUrl: 'wss://test',
+        })
+    })
+
+    it('responds with 204 if session is pending', async () => {
+        req = { url: '/session_async?connection_identifier=abc&request_id=req123' }
+        storeStub.getFreshEntry.returns(Promise.resolve(undefined))
+        storeStub.getStatus.returns(Promise.resolve('pending'))
+
+        await handleGetSessionAsync(req as http.IncomingMessage, res as http.ServerResponse)
+
+        assert(resWriteHead.calledWith(204))
+        assert(resEnd.calledOnce)
+    })
+
+    it('responds with 202 if status is not-started and opens browser', async () => {
+        req = { url: '/session_async?connection_identifier=abc&request_id=req123' }
+
+        storeStub.getFreshEntry.returns(Promise.resolve(undefined))
+        storeStub.getStatus.returns(Promise.resolve('not-started'))
+        storeStub.getRefreshUrl.returns(Promise.resolve('https://example.com/refresh'))
+        storeStub.markPending.returns(Promise.resolve())
+
+        sinon.stub(utils, 'readServerInfo').resolves({ pid: 1234, port: 4567 })
+        sinon
+            .stub(utils, 'parseArn')
+            .returns({ region: 'us-east-1', accountId: '123456789012', spaceName: 'test-space' })
+        sinon.stub(utils, 'open').resolves()
+        await handleGetSessionAsync(req as http.IncomingMessage, res as http.ServerResponse)
+
+        assert(resWriteHead.calledWith(202))
+        assert(resEnd.calledWithMatch(/Session is not ready yet/))
+        assert(storeStub.markPending.calledWith('abc', 'req123'))
+    })
+
+    it('responds with 500 if unexpected error occurs', async () => {
+        req = { url: '/session_async?connection_identifier=abc&request_id=req123' }
+        storeStub.getFreshEntry.throws(new Error('fail'))
+
+        await handleGetSessionAsync(req as http.IncomingMessage, res as http.ServerResponse)
+
+        assert(resWriteHead.calledWith(500))
+        assert(resEnd.calledWith('Unexpected error'))
+    })
+
+    afterEach(() => {
+        sinon.restore()
+    })
+})
diff --git a/packages/core/src/test/awsService/sagemaker/detached-server/routes/refreshToken.test.ts b/packages/core/src/test/awsService/sagemaker/detached-server/routes/refreshToken.test.ts
new file mode 100644
index 00000000000..2fe6b3c648d
--- /dev/null
+++ b/packages/core/src/test/awsService/sagemaker/detached-server/routes/refreshToken.test.ts
@@ -0,0 +1,74 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as http from 'http'
+import * as sinon from 'sinon'
+import assert from 'assert'
+import { SessionStore } from '../../../../../awsService/sagemaker/detached-server/sessionStore'
+import { handleRefreshToken } from '../../../../../awsService/sagemaker/detached-server/routes/refreshToken'
+
+describe('handleRefreshToken', () => {
+    let req: Partial<http.IncomingMessage>
+    let res: Partial<http.ServerResponse>
+    let resWriteHead: sinon.SinonSpy
+    let resEnd: sinon.SinonSpy
+    let storeStub: sinon.SinonStubbedInstance<SessionStore>
+
+    beforeEach(() => {
+        resWriteHead = sinon.spy()
+        resEnd = sinon.spy()
+
+        res = {
+            writeHead: resWriteHead,
+            end: resEnd,
+        }
+
+        storeStub = sinon.createStubInstance(SessionStore)
+        sinon.stub(SessionStore.prototype, 'setSession').callsFake(storeStub.setSession)
+    })
+
+    it('responds with 400 if any required query parameter is missing', async () => {
+        req = { url: '/refresh?connection_identifier=abc&request_id=req123' } // missing others
+
+        await handleRefreshToken(req as http.IncomingMessage, res as http.ServerResponse)
+
+        assert(resWriteHead.calledWith(400))
+        assert(resEnd.calledWithMatch(/Missing required parameters/))
+    })
+
+    it('responds with 500 if setSession throws', async () => {
+        req = {
+            url: '/refresh?connection_identifier=abc&request_id=req123&ws_url=wss://abc&token=tok123&session=sess123',
+        }
+        storeStub.setSession.throws(new Error('store error'))
+
+        await handleRefreshToken(req as http.IncomingMessage, res as http.ServerResponse)
+
+        assert(resWriteHead.calledWith(500))
+        assert(resEnd.calledWith('Failed to save session token'))
+    })
+
+    it('responds with 200 if session is saved successfully', async () => {
+        req = {
+            url: '/refresh?connection_identifier=abc&request_id=req123&ws_url=wss://abc&token=tok123&session=sess123',
+        }
+
+        await handleRefreshToken(req as http.IncomingMessage, res as http.ServerResponse)
+
+        assert(resWriteHead.calledWith(200))
+        assert(resEnd.calledWith('Session token refreshed successfully'))
+        assert(
+            storeStub.setSession.calledWith('abc', 'req123', {
+                sessionId: 'sess123',
+                token: 'tok123',
+                url: 'wss://abc',
+            })
+        )
+    })
+
+    afterEach(() => {
+        sinon.restore()
+    })
+})
diff --git a/packages/core/src/test/awsService/sagemaker/detached-server/sessionStore.test.ts b/packages/core/src/test/awsService/sagemaker/detached-server/sessionStore.test.ts
new file mode 100644
index 00000000000..2a7828a4951
--- /dev/null
+++ b/packages/core/src/test/awsService/sagemaker/detached-server/sessionStore.test.ts
@@ -0,0 +1,145 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+import assert from 'assert'
+import * as utils from '../../../../awsService/sagemaker/detached-server/utils'
+import { SessionStore } from '../../../../awsService/sagemaker/detached-server/sessionStore'
+import { SsmConnectionInfo } from '../../../../awsService/sagemaker/types'
+
+describe('SessionStore', () => {
+    let readMappingStub: sinon.SinonStub
+    let writeMappingStub: sinon.SinonStub
+    const connectionId = 'abc'
+    const requestId = 'req123'
+
+    const baseMapping = {
+        deepLink: {
+            [connectionId]: {
+                refreshUrl: 'https://refresh.url',
+                requests: {
+                    [requestId]: { sessionId: 's1', token: 't1', url: 'u1', status: 'fresh' },
+                    'initial-connection': { sessionId: 's0', token: 't0', url: 'u0', status: 'fresh' },
+                },
+            },
+        },
+    }
+
+    beforeEach(() => {
+        readMappingStub = sinon.stub(utils, 'readMapping').returns(JSON.parse(JSON.stringify(baseMapping)))
+        writeMappingStub = sinon.stub(utils, 'writeMapping')
+    })
+
+    afterEach(() => sinon.restore())
+
+    it('gets refreshUrl', async () => {
+        const store = new SessionStore()
+        const result = await store.getRefreshUrl(connectionId)
+        assert.strictEqual(result, 'https://refresh.url')
+    })
+
+    it('throws if no mapping exists for connectionId', async () => {
+        const store = new SessionStore()
+        readMappingStub.returns({ deepLink: {} })
+
+        await assert.rejects(() => store.getRefreshUrl('missing'), /No mapping found/)
+    })
+
+    it('returns fresh entry and marks consumed', async () => {
+        const store = new SessionStore()
+        const result = await store.getFreshEntry(connectionId, requestId)
+        assert.deepStrictEqual(result, {
+            sessionId: 's0',
+            token: 't0',
+            url: 'u0',
+            status: 'consumed',
+        })
+        assert(writeMappingStub.calledOnce)
+    })
+
+    it('returns async fresh entry and deletes it', async () => {
+        const store = new SessionStore()
+        // Disable initial-connection freshness
+        readMappingStub.returns({
+            deepLink: {
+                [connectionId]: {
+                    refreshUrl: 'url',
+                    requests: {
+                        'initial-connection': { status: 'consumed' },
+                        [requestId]: { sessionId: 'a', token: 'b', url: 'c', status: 'fresh' },
+                    },
+                },
+            },
+        })
+        const result = await store.getFreshEntry(connectionId, requestId)
+        assert.ok(result, 'Expected result to be defined')
+        assert.strictEqual(result.sessionId, 'a')
+        assert(writeMappingStub.calledOnce)
+
+        // Verify the entry was deleted from the mapping
+        const updated = writeMappingStub.firstCall.args[0]
+        assert.strictEqual(updated.deepLink[connectionId].requests[requestId], undefined)
+    })
+
+    it('returns undefined if no fresh entries exist', async () => {
+        const store = new SessionStore()
+        readMappingStub.returns({
+            deepLink: {
+                [connectionId]: {
+                    refreshUrl: 'url',
+                    requests: {
+                        'initial-connection': { status: 'consumed' },
+                        [requestId]: { status: 'pending' },
+                    },
+                },
+            },
+        })
+        const result = await store.getFreshEntry(connectionId, requestId)
+        assert.strictEqual(result, undefined)
+    })
+
+    it('gets status of known entry', async () => {
+        const store = new SessionStore()
+        const result = await store.getStatus(connectionId, requestId)
+        assert.strictEqual(result, 'fresh')
+    })
+
+    it('returns not-started if request not found', async () => {
+        const store = new SessionStore()
+        const result = await store.getStatus(connectionId, 'unknown')
+        assert.strictEqual(result, 'not-started')
+    })
+
+    it('marks entry as consumed', async () => {
+        const store = new SessionStore()
+        await store.markConsumed(connectionId, requestId)
+        const updated = writeMappingStub.firstCall.args[0]
+        assert.strictEqual(updated.deepLink[connectionId].requests[requestId].status, 'consumed')
+    })
+
+    it('marks request as pending', async () => {
+        const store = new SessionStore()
+        await store.markPending(connectionId, 'newReq')
+        const updated = writeMappingStub.firstCall.args[0]
+        assert.strictEqual(updated.deepLink[connectionId].requests['newReq'].status, 'pending')
+    })
+
+    it('sets session entry with default fresh status', async () => {
+        const store = new SessionStore()
+        const info: SsmConnectionInfo = {
+            sessionId: 's99',
+            token: 't99',
+            url: 'u99',
+        }
+        await store.setSession(connectionId, 'r99', info)
+        const written = writeMappingStub.firstCall.args[0]
+        assert.deepStrictEqual(written.deepLink[connectionId].requests['r99'], {
+            sessionId: 's99',
+            token: 't99',
+            url: 'u99',
+            status: 'fresh',
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/sagemaker/detached-server/utils.test.ts b/packages/core/src/test/awsService/sagemaker/detached-server/utils.test.ts
new file mode 100644
index 00000000000..bc8d0a8867b
--- /dev/null
+++ b/packages/core/src/test/awsService/sagemaker/detached-server/utils.test.ts
@@ -0,0 +1,112 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* eslint-disable no-restricted-imports */
+import * as assert from 'assert'
+import { parseArn, writeMapping, readMapping } from '../../../../awsService/sagemaker/detached-server/utils'
+import { promises as fs } from 'fs'
+import * as path from 'path'
+import * as os from 'os'
+import { SpaceMappings } from '../../../../awsService/sagemaker/types'
+
+describe('parseArn', () => {
+    it('parses a standard SageMaker ARN with forward slash', () => {
+        const arn = 'arn:aws:sagemaker:us-west-2:123456789012:space/domain-name/my-space-name'
+        const result = parseArn(arn)
+        assert.deepStrictEqual(result, {
+            region: 'us-west-2',
+            accountId: '123456789012',
+            spaceName: 'my-space-name',
+        })
+    })
+
+    it('parses an ARN prefixed with sagemaker-user@', () => {
+        const arn = 'sagemaker-user@arn:aws:sagemaker:ap-southeast-1:123456789012:space/foo/my-space-name'
+        const result = parseArn(arn)
+        assert.deepStrictEqual(result, {
+            region: 'ap-southeast-1',
+            accountId: '123456789012',
+            spaceName: 'my-space-name',
+        })
+    })
+
+    it('throws on malformed ARN', () => {
+        const invalidArn = 'arn:aws:invalid:format'
+        assert.throws(() => parseArn(invalidArn), /Invalid SageMaker ARN format/)
+    })
+
+    it('throws when missing region/account', () => {
+        const invalidArn = 'arn:aws:sagemaker:::space/xyz'
+        assert.throws(() => parseArn(invalidArn), /Invalid SageMaker ARN format/)
+    })
+})
+
+describe('writeMapping', () => {
+    let testDir: string
+
+    beforeEach(async () => {
+        testDir = await fs.mkdtemp(path.join(os.tmpdir(), 'sagemaker-test-'))
+    })
+
+    afterEach(async () => {
+        await fs.rmdir(testDir, { recursive: true })
+    })
+
+    it('handles concurrent writes without race conditions', async () => {
+        const mapping1: SpaceMappings = {
+            localCredential: {
+                'space-1': { type: 'iam', profileName: 'profile1' },
+            },
+        }
+        const mapping2: SpaceMappings = {
+            localCredential: {
+                'space-2': { type: 'iam', profileName: 'profile2' },
+            },
+        }
+        const mapping3: SpaceMappings = {
+            deepLink: {
+                'space-3': {
+                    requests: {
+                        req1: {
+                            sessionId: 'session-456',
+                            url: 'wss://example3.com',
+                            token: 'token-456',
+                        },
+                    },
+                    refreshUrl: 'https://example3.com/refresh',
+                },
+            },
+        }
+
+        const writePromises = [writeMapping(mapping1), writeMapping(mapping2), writeMapping(mapping3)]
+
+        await Promise.all(writePromises)
+
+        const finalContent = await readMapping()
+        const possibleResults = [mapping1, mapping2, mapping3]
+        const isValidResult = possibleResults.some(
+            (expected) => JSON.stringify(finalContent) === JSON.stringify(expected)
+        )
+        assert.strictEqual(isValidResult, true, 'Final content should match one of the written mappings')
+    })
+
+    it('queues multiple writes and processes them sequentially', async () => {
+        const mappings = Array.from({ length: 5 }, (_, i) => ({
+            localCredential: {
+                [`space-${i}`]: { type: 'iam' as const, profileName: `profile-${i}` },
+            },
+        }))
+
+        const writePromises = mappings.map((mapping) => writeMapping(mapping))
+
+        await Promise.all(writePromises)
+
+        const finalContent = await readMapping()
+        assert.strictEqual(typeof finalContent, 'object', 'Final content should be a valid object')
+
+        const isValidResult = mappings.some((mapping) => JSON.stringify(finalContent) === JSON.stringify(mapping))
+        assert.strictEqual(isValidResult, true, 'Final content should match one of the written mappings')
+    })
+})
diff --git a/packages/core/src/test/awsService/sagemaker/explorer/sagemakerParentNode.test.ts b/packages/core/src/test/awsService/sagemaker/explorer/sagemakerParentNode.test.ts
new file mode 100644
index 00000000000..b7cf98496fc
--- /dev/null
+++ b/packages/core/src/test/awsService/sagemaker/explorer/sagemakerParentNode.test.ts
@@ -0,0 +1,344 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { DescribeDomainResponse } from '@amzn/sagemaker-client'
+import { GetCallerIdentityResponse } from 'aws-sdk/clients/sts'
+import { SagemakerClient, SagemakerSpaceApp } from '../../../../shared/clients/sagemaker'
+import { SagemakerConstants } from '../../../../awsService/sagemaker/explorer/constants'
+import {
+    SagemakerParentNode,
+    SelectedDomainUsers,
+    SelectedDomainUsersByRegion,
+} from '../../../../awsService/sagemaker/explorer/sagemakerParentNode'
+import { globals } from '../../../../shared'
+import { DefaultStsClient } from '../../../../shared/clients/stsClient'
+import { assertNodeListOnlyHasPlaceholderNode } from '../../../utilities/explorerNodeAssertions'
+import assert from 'assert'
+
+describe('sagemakerParentNode', function () {
+    let testNode: SagemakerParentNode
+    let client: SagemakerClient
+    let fetchSpaceAppsAndDomainsStub: sinon.SinonStub<
+        [domainId?: string | undefined, filterSmusDomains?: boolean | undefined],
+        Promise<[Map<string, SagemakerSpaceApp>, Map<string, DescribeDomainResponse>]>
+    >
+    let getCallerIdentityStub: sinon.SinonStub<[], Promise<GetCallerIdentityResponse>>
+    const testRegion = 'testRegion'
+    const domainsMap: Map<string, DescribeDomainResponse> = new Map([
+        ['domain1', { DomainId: 'domain1', DomainName: 'domainName1' }],
+        ['domain2', { DomainId: 'domain2', DomainName: 'domainName2' }],
+    ])
+    const spaceAppsMap: Map<string, SagemakerSpaceApp> = new Map([
+        [
+            'domain1__name1',
+            {
+                SpaceName: 'name1',
+                DomainId: 'domain1',
+                OwnershipSettingsSummary: { OwnerUserProfileName: 'user1-abcd' },
+                Status: 'InService',
+                DomainSpaceKey: 'domain1__name1',
+            },
+        ],
+        [
+            'domain2__name2',
+            {
+                SpaceName: 'name2',
+                DomainId: 'domain2',
+                OwnershipSettingsSummary: { OwnerUserProfileName: 'user2-efgh' },
+                Status: 'InService',
+                DomainSpaceKey: 'domain2__name2',
+            },
+        ],
+    ])
+    const spaceAppsMapPending: Map<string, SagemakerSpaceApp> = new Map([
+        [
+            'domain1__name3',
+            {
+                SpaceName: 'name3',
+                DomainId: 'domain1',
+                OwnershipSettingsSummary: { OwnerUserProfileName: 'user1-abcd' },
+                Status: 'InService',
+                DomainSpaceKey: 'domain1__name3',
+                App: {
+                    Status: 'InService',
+                },
+            },
+        ],
+        [
+            'domain2__name4',
+            {
+                SpaceName: 'name4',
+                DomainId: 'domain2',
+                OwnershipSettingsSummary: { OwnerUserProfileName: 'user2-efgh' },
+                Status: 'InService',
+                DomainSpaceKey: 'domain2__name4',
+                App: {
+                    Status: 'Pending',
+                },
+            },
+        ],
+    ])
+    const iamUser = {
+        UserId: 'test-userId',
+        Account: '123456789012',
+        Arn: 'arn:aws:iam::123456789012:user/user2',
+    }
+    const assumedRoleUser = {
+        UserId: 'test-userId',
+        Account: '123456789012',
+        Arn: 'arn:aws:sts::123456789012:assumed-role/UserRole/user2',
+    }
+    const ssoUser = {
+        UserId: 'test-userId',
+        Account: '123456789012',
+        Arn: 'arn:aws:sts::123456789012:assumed-role/AWSReservedSSO_MyPermissionSet_abcd1234/user2',
+    }
+    const getConfigTrue = {
+        get: () => true,
+    }
+    const getConfigFalse = {
+        get: () => false,
+    }
+
+    before(function () {
+        client = new SagemakerClient(testRegion)
+    })
+
+    beforeEach(function () {
+        fetchSpaceAppsAndDomainsStub = sinon.stub(SagemakerClient.prototype, 'fetchSpaceAppsAndDomains')
+        getCallerIdentityStub = sinon.stub(DefaultStsClient.prototype, 'getCallerIdentity')
+        testNode = new SagemakerParentNode(testRegion, client)
+    })
+
+    afterEach(function () {
+        fetchSpaceAppsAndDomainsStub.restore()
+        getCallerIdentityStub.restore()
+        testNode.pollingSet.clear()
+        testNode.pollingSet.clearTimer()
+        sinon.restore()
+    })
+
+    it('returns placeholder node if no children are present', async function () {
+        fetchSpaceAppsAndDomainsStub.returns(
+            Promise.resolve([new Map<string, SagemakerSpaceApp>(), new Map<string, DescribeDomainResponse>()])
+        )
+        getCallerIdentityStub.returns(Promise.resolve(iamUser))
+
+        const childNodes = await testNode.getChildren()
+        assertNodeListOnlyHasPlaceholderNode(childNodes)
+    })
+
+    it('has child nodes', async function () {
+        fetchSpaceAppsAndDomainsStub.returns(Promise.resolve([spaceAppsMap, domainsMap]))
+        getCallerIdentityStub.returns(Promise.resolve(iamUser))
+        sinon
+            .stub(vscode.workspace, 'getConfiguration')
+            .returns(getConfigFalse as unknown as vscode.WorkspaceConfiguration)
+
+        const childNodes = await testNode.getChildren()
+        assert.strictEqual(childNodes.length, spaceAppsMap.size, 'Unexpected child count')
+        assert.strictEqual(childNodes[0].label, 'name1 (Stopped)', 'Unexpected node label')
+        assert.strictEqual(childNodes[1].label, 'name2 (Stopped)', 'Unexpected node label')
+    })
+
+    it('adds pending nodes to polling nodes set', async function () {
+        fetchSpaceAppsAndDomainsStub.returns(Promise.resolve([spaceAppsMapPending, domainsMap]))
+        getCallerIdentityStub.returns(Promise.resolve(iamUser))
+
+        await testNode.updateChildren()
+        assert.strictEqual(testNode.pollingSet.size, 1)
+        fetchSpaceAppsAndDomainsStub.restore()
+    })
+
+    it('filters spaces owned by user profiles that match the IAM user', async function () {
+        fetchSpaceAppsAndDomainsStub.returns(Promise.resolve([spaceAppsMap, domainsMap]))
+        getCallerIdentityStub.returns(Promise.resolve(iamUser))
+        sinon
+            .stub(vscode.workspace, 'getConfiguration')
+            .returns(getConfigTrue as unknown as vscode.WorkspaceConfiguration)
+
+        const childNodes = await testNode.getChildren()
+        assert.strictEqual(childNodes.length, 1, 'Unexpected child count')
+        assert.strictEqual(childNodes[0].label, 'name2 (Stopped)', 'Unexpected node label')
+    })
+
+    it('filters spaces owned by user profiles that match the IAM assumed-role session name', async function () {
+        fetchSpaceAppsAndDomainsStub.returns(Promise.resolve([spaceAppsMap, domainsMap]))
+        getCallerIdentityStub.returns(Promise.resolve(assumedRoleUser))
+        sinon
+            .stub(vscode.workspace, 'getConfiguration')
+            .returns(getConfigTrue as unknown as vscode.WorkspaceConfiguration)
+
+        const childNodes = await testNode.getChildren()
+        assert.strictEqual(childNodes.length, 1, 'Unexpected child count')
+        assert.strictEqual(childNodes[0].label, 'name2 (Stopped)', 'Unexpected node label')
+    })
+
+    it('filters spaces owned by user profiles that match the Identity Center user', async function () {
+        fetchSpaceAppsAndDomainsStub.returns(Promise.resolve([spaceAppsMap, domainsMap]))
+        getCallerIdentityStub.returns(Promise.resolve(ssoUser))
+        sinon
+            .stub(vscode.workspace, 'getConfiguration')
+            .returns(getConfigFalse as unknown as vscode.WorkspaceConfiguration)
+
+        const childNodes = await testNode.getChildren()
+        assert.strictEqual(childNodes.length, 1, 'Unexpected child count')
+        assert.strictEqual(childNodes[0].label, 'name2 (Stopped)', 'Unexpected node label')
+    })
+
+    describe('getSelectedDomainUsers', function () {
+        let originalState: Map<string, SelectedDomainUsers>
+
+        beforeEach(async function () {
+            testNode = new SagemakerParentNode(testRegion, client)
+            originalState = new Map(
+                globals.globalState.get<SelectedDomainUsersByRegion>(SagemakerConstants.SelectedDomainUsersState, [])
+            )
+        })
+
+        afterEach(async function () {
+            await globals.globalState.update(SagemakerConstants.SelectedDomainUsersState, [...originalState])
+        })
+
+        it('gets cached selectedDomainUsers for a given region', async function () {
+            await globals.globalState.update(SagemakerConstants.SelectedDomainUsersState, [
+                [testRegion, [['arn:aws:iam::123456789012:user/user2', ['domain2__user-cached']]]],
+            ])
+            testNode.callerIdentity = iamUser
+            sinon
+                .stub(vscode.workspace, 'getConfiguration')
+                .returns(getConfigTrue as unknown as vscode.WorkspaceConfiguration)
+
+            const result = await testNode.getSelectedDomainUsers()
+            assert.deepStrictEqual(
+                [...result],
+                ['domain2__user-cached'],
+                'Should match only cached selected domain user'
+            )
+        })
+
+        it('gets default selectedDomainUsers', async function () {
+            await globals.globalState.update(SagemakerConstants.SelectedDomainUsersState, [])
+            testNode.spaceApps = spaceAppsMap
+            testNode.callerIdentity = iamUser
+            sinon
+                .stub(vscode.workspace, 'getConfiguration')
+                .returns(getConfigTrue as unknown as vscode.WorkspaceConfiguration)
+
+            const result = await testNode.getSelectedDomainUsers()
+            assert.deepStrictEqual(
+                [...result],
+                ['domain2__user2-efgh'],
+                'Should match only default selected domain user'
+            )
+        })
+    })
+
+    describe('saveSelectedDomainUsers', function () {
+        let originalState: Map<string, SelectedDomainUsers>
+
+        beforeEach(async function () {
+            testNode = new SagemakerParentNode(testRegion, client)
+            originalState = new Map(
+                globals.globalState.get<SelectedDomainUsersByRegion>(SagemakerConstants.SelectedDomainUsersState, [])
+            )
+        })
+
+        afterEach(async function () {
+            await globals.globalState.update(SagemakerConstants.SelectedDomainUsersState, [...originalState])
+        })
+
+        it('saves selectedDomainUsers for a given region', async function () {
+            testNode.callerIdentity = iamUser
+            testNode.saveSelectedDomainUsers(['domain1__user-1', 'domain2__user-2'])
+
+            const selectedDomainUsersByRegionMap = new Map(
+                globals.globalState.get<SelectedDomainUsersByRegion>(SagemakerConstants.SelectedDomainUsersState, [])
+            )
+            const selectedDomainUsers = new Map(selectedDomainUsersByRegionMap.get(testRegion))
+
+            assert.deepStrictEqual(selectedDomainUsers.get(iamUser.Arn), ['domain1__user-1', 'domain2__user-2'])
+        })
+    })
+
+    describe('getLocalSelectedDomainUsers', function () {
+        const createSpaceApp = (ownerName: string): SagemakerSpaceApp => ({
+            SpaceName: 'space1',
+            DomainId: 'domain1',
+            Status: 'InService',
+            OwnershipSettingsSummary: {
+                OwnerUserProfileName: ownerName,
+            },
+            DomainSpaceKey: 'domain1__name1',
+        })
+
+        beforeEach(function () {
+            testNode = new SagemakerParentNode(testRegion, client)
+        })
+
+        it('matches IAM user ARN when filtering is enabled', async function () {
+            testNode.callerIdentity = {
+                Arn: 'arn:aws:iam::123456789012:user/user1',
+            }
+
+            testNode.spaceApps = new Map([
+                ['domain1__space1', createSpaceApp('user1-abc')],
+                ['domain1__space2', createSpaceApp('user2-xyz')],
+            ])
+
+            sinon.stub(vscode.workspace, 'getConfiguration').returns(getConfigTrue as any)
+
+            const result = await testNode.getLocalSelectedDomainUsers()
+            assert.deepStrictEqual(result, ['domain1__user1-abc'], 'Should match only user1-prefixed space')
+        })
+
+        it('matches IAM assumed-role ARN when filtering is enabled', async function () {
+            testNode.callerIdentity = {
+                Arn: 'arn:aws:sts::123456789012:assumed-role/SomeRole/user2',
+            }
+
+            testNode.spaceApps = new Map([
+                ['domain1__space1', createSpaceApp('user2-xyz')],
+                ['domain1__space2', createSpaceApp('user3-def')],
+            ])
+
+            sinon.stub(vscode.workspace, 'getConfiguration').returns(getConfigTrue as any)
+
+            const result = await testNode.getLocalSelectedDomainUsers()
+            assert.deepStrictEqual(result, ['domain1__user2-xyz'], 'Should match only user2-prefixed space')
+        })
+
+        it('matches Identity Center ARN when IAM filtering is disabled', async function () {
+            testNode.callerIdentity = {
+                Arn: 'arn:aws:sts::123456789012:assumed-role/AWSReservedSSO_PermissionSet_abcd/user3',
+            }
+
+            testNode.spaceApps = new Map([
+                ['domain1__space1', createSpaceApp('user3-aaa')],
+                ['domain1__space2', createSpaceApp('other-user')],
+            ])
+
+            sinon.stub(vscode.workspace, 'getConfiguration').returns(getConfigFalse as any)
+
+            const result = await testNode.getLocalSelectedDomainUsers()
+            assert.deepStrictEqual(result, ['domain1__user3-aaa'], 'Should match only user3-prefixed space')
+        })
+
+        it('returns empty array if no match is found', async function () {
+            testNode.callerIdentity = {
+                Arn: 'arn:aws:iam::123456789012:user/no-match',
+            }
+
+            testNode.spaceApps = new Map([['domain1__space1', createSpaceApp('someone-else')]])
+
+            sinon.stub(vscode.workspace, 'getConfiguration').returns(getConfigTrue as any)
+
+            const result = await testNode.getLocalSelectedDomainUsers()
+            assert.deepStrictEqual(result, [], 'Should return empty list when no prefix matches')
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/sagemaker/explorer/sagemakerSpaceNode.test.ts b/packages/core/src/test/awsService/sagemaker/explorer/sagemakerSpaceNode.test.ts
new file mode 100644
index 00000000000..b0fc6d78c0f
--- /dev/null
+++ b/packages/core/src/test/awsService/sagemaker/explorer/sagemakerSpaceNode.test.ts
@@ -0,0 +1,122 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import assert from 'assert'
+import { AppType } from '@aws-sdk/client-sagemaker'
+import { SagemakerClient, SagemakerSpaceApp } from '../../../../shared/clients/sagemaker'
+import { SagemakerSpaceNode } from '../../../../awsService/sagemaker/explorer/sagemakerSpaceNode'
+import { SagemakerParentNode } from '../../../../awsService/sagemaker/explorer/sagemakerParentNode'
+import { PollingSet } from '../../../../shared/utilities/pollingSet'
+
+describe('SagemakerSpaceNode', function () {
+    const testRegion = 'testRegion'
+    let client: SagemakerClient
+    let testParent: SagemakerParentNode
+    let testSpaceApp: SagemakerSpaceApp
+    let describeAppStub: sinon.SinonStub
+    let testSpaceAppNode: SagemakerSpaceNode
+
+    beforeEach(function () {
+        testSpaceApp = {
+            SpaceName: 'TestSpace',
+            DomainId: 'd-12345',
+            App: { AppName: 'TestApp', Status: 'InService' },
+            SpaceSettingsSummary: { AppType: AppType.JupyterLab },
+            OwnershipSettingsSummary: { OwnerUserProfileName: 'test-user' },
+            SpaceSharingSettingsSummary: { SharingType: 'Private' },
+            Status: 'InService',
+            DomainSpaceKey: '123',
+        }
+
+        sinon.stub(PollingSet.prototype, 'add')
+        client = new SagemakerClient(testRegion)
+        testParent = new SagemakerParentNode(testRegion, client)
+
+        describeAppStub = sinon.stub(SagemakerClient.prototype, 'describeApp')
+        testSpaceAppNode = new SagemakerSpaceNode(testParent, client, testRegion, testSpaceApp)
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    it('initializes with correct label, description, and tooltip', function () {
+        const node = new SagemakerSpaceNode(testParent, client, testRegion, testSpaceApp)
+
+        assert.strictEqual(node.label, 'TestSpace (Running)')
+        assert.strictEqual(node.description, 'Private space')
+        assert.ok(node.tooltip instanceof vscode.MarkdownString)
+        assert.ok((node.tooltip as vscode.MarkdownString).value.includes('**Space:** TestSpace'))
+    })
+
+    it('falls back to defaults if optional fields are missing', function () {
+        const partialApp: SagemakerSpaceApp = {
+            SpaceName: undefined,
+            DomainId: 'domainId',
+            Status: 'Failed',
+            DomainSpaceKey: '123',
+        }
+
+        const node = new SagemakerSpaceNode(testParent, client, testRegion, partialApp)
+
+        assert.strictEqual(node.label, '(no name) (Failed)')
+        assert.strictEqual(node.description, 'Unknown space')
+        assert.ok((node.tooltip as vscode.MarkdownString).value.includes('**Space:** -'))
+    })
+
+    it('returns ARN from describeApp', async function () {
+        describeAppStub.resolves({ AppArn: 'arn:aws:sagemaker:1234:app/TestApp', $metadata: {} })
+
+        const arn = await testSpaceAppNode.getAppArn()
+
+        assert.strictEqual(arn, 'arn:aws:sagemaker:1234:app/TestApp')
+        sinon.assert.calledOnce(describeAppStub)
+        sinon.assert.calledWithExactly(describeAppStub, {
+            DomainId: 'd-12345',
+            AppName: 'TestApp',
+            AppType: AppType.JupyterLab,
+            SpaceName: 'TestSpace',
+        })
+    })
+
+    it('returns space ARN from describeSpace', async function () {
+        const describeSpaceStub = sinon.stub(SagemakerClient.prototype, 'describeSpace')
+        describeSpaceStub.resolves({ SpaceArn: 'arn:aws:sagemaker:1234:space/TestSpace', $metadata: {} })
+
+        const arn = await testSpaceAppNode.getSpaceArn()
+
+        assert.strictEqual(arn, 'arn:aws:sagemaker:1234:space/TestSpace')
+        sinon.assert.calledOnce(describeSpaceStub)
+    })
+
+    it('updates status with new spaceApp', function () {
+        const newSpaceApp = { ...testSpaceApp, App: { AppName: 'TestApp', Status: 'Pending' } } as SagemakerSpaceApp
+        testSpaceAppNode.updateSpace(newSpaceApp)
+        assert.strictEqual(testSpaceAppNode.getStatus(), 'Starting')
+    })
+
+    it('delegates to SagemakerSpace for properties', function () {
+        const node = new SagemakerSpaceNode(testParent, client, testRegion, testSpaceApp)
+
+        // Verify that properties are managed by SagemakerSpace
+        assert.strictEqual(node.name, 'TestSpace')
+        assert.strictEqual(node.label, 'TestSpace (Running)')
+        assert.strictEqual(node.description, 'Private space')
+        assert.ok(node.tooltip instanceof vscode.MarkdownString)
+    })
+
+    it('updates space app status', async function () {
+        const describeSpaceStub = sinon.stub(SagemakerClient.prototype, 'describeSpace')
+        describeSpaceStub.resolves({ SpaceName: 'TestSpace', Status: 'InService', $metadata: {} })
+        describeAppStub.resolves({ AppName: 'TestApp', Status: 'InService', $metadata: {} })
+
+        await testSpaceAppNode.updateSpaceAppStatus()
+
+        sinon.assert.calledOnce(describeSpaceStub)
+        sinon.assert.calledOnce(describeAppStub)
+    })
+})
diff --git a/packages/core/src/test/awsService/sagemaker/model.test.ts b/packages/core/src/test/awsService/sagemaker/model.test.ts
new file mode 100644
index 00000000000..7570e1bfe31
--- /dev/null
+++ b/packages/core/src/test/awsService/sagemaker/model.test.ts
@@ -0,0 +1,304 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import * as os from 'os'
+import * as path from 'path'
+import { DevSettings, fs, ToolkitError } from '../../../shared'
+import { removeKnownHost, startLocalServer, stopLocalServer } from '../../../awsService/sagemaker/model'
+import { assertLogsContain } from '../../globalSetup.test'
+import assert from 'assert'
+
+describe('SageMaker Model', () => {
+    describe('startLocalServer', function () {
+        const ctx = {
+            globalStorageUri: vscode.Uri.file(path.join(os.tmpdir(), 'test-storage')),
+            extensionPath: path.join(os.tmpdir(), 'extension'),
+            asAbsolutePath: (relPath: string) => path.join(path.join(os.tmpdir(), 'extension'), relPath),
+        } as vscode.ExtensionContext
+
+        let sandbox: sinon.SinonSandbox
+
+        beforeEach(() => {
+            sandbox = sinon.createSandbox()
+        })
+
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        it('waits for info file and starts server', async function () {
+            // Simulate the file doesn't exist initially, then appears on 3rd check
+            const existsStub = sandbox.stub(fs, 'existsFile')
+            existsStub.onCall(0).resolves(false)
+            existsStub.onCall(1).resolves(false)
+            existsStub.onCall(2).resolves(true)
+
+            sandbox.stub(require('fs'), 'openSync').returns(42)
+
+            const stopStub = sandbox.stub().resolves()
+            sandbox.replace(require('../../../awsService/sagemaker/model'), 'stopLocalServer', stopStub)
+
+            const spawnStub = sandbox.stub().returns({ unref: sandbox.stub() })
+            sandbox.replace(require('../../../awsService/sagemaker/utils'), 'spawnDetachedServer', spawnStub)
+
+            sandbox.stub(DevSettings.instance, 'get').returns({ sagemaker: 'https://fake-endpoint' })
+
+            await startLocalServer(ctx)
+
+            sinon.assert.called(spawnStub)
+            sinon.assert.calledWith(
+                spawnStub,
+                process.execPath,
+                [ctx.asAbsolutePath('dist/src/awsService/sagemaker/detached-server/server.js')],
+                sinon.match.any
+            )
+
+            assert.ok(existsStub.callCount >= 3, 'should have retried for file existence')
+        })
+
+        it('throws ToolkitError when info file never appears', async function () {
+            sandbox.stub(fs, 'existsFile').resolves(false)
+            sandbox.stub(require('fs'), 'openSync').returns(42)
+            sandbox.replace(
+                require('../../../awsService/sagemaker/model'),
+                'stopLocalServer',
+                sandbox.stub().resolves()
+            )
+            sandbox.replace(
+                require('../../../awsService/sagemaker/utils'),
+                'spawnDetachedServer',
+                sandbox.stub().returns({ unref: sandbox.stub() })
+            )
+            sandbox.stub(DevSettings.instance, 'get').returns({})
+
+            try {
+                await startLocalServer(ctx)
+                assert.ok(false, 'Expected error not thrown')
+            } catch (err) {
+                assert.ok(err instanceof ToolkitError)
+                assert.ok(err.message.includes('Timed out waiting for local server info file'))
+            }
+        })
+    })
+
+    describe('stopLocalServer', function () {
+        const ctx = {
+            globalStorageUri: vscode.Uri.file(path.join(os.tmpdir(), 'test-storage')),
+        } as vscode.ExtensionContext
+
+        const infoFilePath = path.join(ctx.globalStorageUri.fsPath, 'sagemaker-local-server-info.json')
+        const validPid = 12345
+        const validJson = JSON.stringify({ pid: validPid })
+        let sandbox: sinon.SinonSandbox
+
+        beforeEach(() => {
+            sandbox = sinon.createSandbox()
+        })
+
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        it('logs debug when successfully stops server and deletes file', async function () {
+            sandbox.stub(fs, 'existsFile').resolves(true)
+            sandbox.stub(fs, 'readFileText').resolves(validJson)
+            const killStub = sandbox.stub(process, 'kill').returns(true)
+            const deleteStub = sandbox.stub(fs, 'delete').resolves()
+
+            await stopLocalServer(ctx)
+
+            sinon.assert.calledWith(killStub, validPid)
+            sinon.assert.calledWith(deleteStub, infoFilePath)
+            assertLogsContain(`stopped local server with PID ${validPid}`, false, 'debug')
+            assertLogsContain('removed server info file.', false, 'debug')
+        })
+
+        it('throws ToolkitError when info file is invalid JSON', async function () {
+            sandbox.stub(fs, 'existsFile').resolves(true)
+            sandbox.stub(fs, 'readFileText').resolves('invalid json')
+
+            try {
+                await stopLocalServer(ctx)
+                assert.ok(false, 'Expected error not thrown')
+            } catch (err) {
+                assert.ok(err instanceof ToolkitError)
+                assert.strictEqual(err.message, 'failed to parse server info file')
+            }
+        })
+
+        it('logs warning when process not found (ESRCH)', async function () {
+            sandbox.stub(fs, 'existsFile').resolves(true)
+            sandbox.stub(fs, 'readFileText').resolves(validJson)
+            sandbox.stub(fs, 'delete').resolves()
+            sandbox.stub(process, 'kill').throws({ code: 'ESRCH', message: 'no such process' })
+
+            await stopLocalServer(ctx)
+
+            assertLogsContain(`no process found with PID ${validPid}. It may have already exited.`, false, 'warn')
+        })
+
+        it('throws ToolkitError when killing process fails for another reason', async function () {
+            sandbox.stub(fs, 'existsFile').resolves(true)
+            sandbox.stub(fs, 'readFileText').resolves(validJson)
+            sandbox.stub(fs, 'delete').resolves()
+            sandbox.stub(process, 'kill').throws({ code: 'EPERM', message: 'permission denied' })
+
+            try {
+                await stopLocalServer(ctx)
+                assert.ok(false)
+            } catch (err) {
+                assert.ok(err instanceof ToolkitError)
+                assert.strictEqual(err.message, 'failed to stop local server')
+            }
+        })
+
+        it('logs warning when PID is invalid', async function () {
+            sandbox.stub(fs, 'existsFile').resolves(true)
+            sandbox.stub(fs, 'readFileText').resolves(JSON.stringify({ pid: 'invalid' }))
+            sandbox.stub(fs, 'delete').resolves()
+
+            await stopLocalServer(ctx)
+
+            assertLogsContain('no valid PID found in info file.', false, 'warn')
+        })
+
+        it('logs warning when file deletion fails', async function () {
+            sandbox.stub(fs, 'existsFile').resolves(true)
+            sandbox.stub(fs, 'readFileText').resolves(validJson)
+            sandbox.stub(process, 'kill').returns(true)
+            sandbox.stub(fs, 'delete').rejects(new Error('delete failed'))
+
+            await stopLocalServer(ctx)
+
+            assertLogsContain('could not delete info file: delete failed', false, 'warn')
+        })
+    })
+
+    describe('removeKnownHost', function () {
+        const knownHostsPath = path.join(os.homedir(), '.ssh', 'known_hosts')
+        const hostname = 'test.host.com'
+        let sandbox: sinon.SinonSandbox
+
+        beforeEach(function () {
+            sandbox = sinon.createSandbox()
+        })
+
+        afterEach(function () {
+            sandbox.restore()
+        })
+
+        it('removes line with hostname and writes updated file', async function () {
+            sandbox.stub(fs, 'existsFile').resolves(true)
+
+            const inputContent = `${hostname} ssh-rsa AAAA\nsome.other.com ssh-rsa BBBB`
+            const expectedOutput = `some.other.com ssh-rsa BBBB`
+
+            sandbox.stub(fs, 'readFileText').resolves(inputContent)
+
+            const writeStub = sandbox.stub(fs, 'writeFile').resolves()
+            await removeKnownHost(hostname)
+
+            sinon.assert.calledWith(
+                writeStub,
+                knownHostsPath,
+                sinon.match((value: string) => value.trim() === expectedOutput),
+                { atomic: true }
+            )
+            assertLogsContain(`Removed '${hostname}' from known_hosts`, false, 'debug')
+        })
+
+        it('removes case-sensitive hostname when entry in known_hosts is lowercase', async function () {
+            const mixedCaseHostname = 'Test.Host.Com'
+
+            sandbox.stub(fs, 'existsFile').resolves(true)
+
+            const inputContent = `test.host.com ssh-rsa AAAA\nsome.other.com ssh-rsa BBBB`
+            const expectedOutput = `some.other.com ssh-rsa BBBB`
+
+            sandbox.stub(fs, 'readFileText').resolves(inputContent)
+            const writeStub = sandbox.stub(fs, 'writeFile').resolves()
+
+            await removeKnownHost(mixedCaseHostname)
+
+            sinon.assert.calledWith(
+                writeStub,
+                path.join(os.homedir(), '.ssh', 'known_hosts'),
+                sinon.match((value: string) => value.trim() === expectedOutput),
+                { atomic: true }
+            )
+            assertLogsContain(`Removed '${mixedCaseHostname}' from known_hosts`, false, 'debug')
+        })
+
+        it('handles hostname in comma-separated list', async function () {
+            sandbox.stub(fs, 'existsFile').resolves(true)
+
+            const inputContent = `host1,${hostname},host2 ssh-rsa AAAA\nother.host ssh-rsa BBBB`
+            const expectedOutput = `other.host ssh-rsa BBBB`
+
+            sandbox.stub(fs, 'readFileText').resolves(inputContent)
+            const writeStub = sandbox.stub(fs, 'writeFile').resolves()
+
+            await removeKnownHost(hostname)
+
+            sinon.assert.calledWith(
+                writeStub,
+                knownHostsPath,
+                sinon.match((value: string) => value.trim() === expectedOutput),
+                { atomic: true }
+            )
+        })
+
+        it('does not write file when hostname not found', async function () {
+            sandbox.stub(fs, 'existsFile').resolves(true)
+
+            const inputContent = `other.host ssh-rsa AAAA\nsome.other.com ssh-rsa BBBB`
+            sandbox.stub(fs, 'readFileText').resolves(inputContent)
+            const writeStub = sandbox.stub(fs, 'writeFile').resolves()
+
+            await removeKnownHost(hostname)
+
+            sinon.assert.notCalled(writeStub)
+        })
+
+        it('logs warning when known_hosts does not exist', async function () {
+            sandbox.stub(fs, 'existsFile').resolves(false)
+
+            await removeKnownHost('test.host.com')
+
+            assertLogsContain(`known_hosts not found at`, false, 'warn')
+        })
+
+        it('throws ToolkitError when reading known_hosts fails', async function () {
+            sandbox.stub(fs, 'existsFile').resolves(true)
+            sandbox.stub(fs, 'readFileText').rejects(new Error('read failed'))
+
+            try {
+                await removeKnownHost(hostname)
+                assert.ok(false, 'Expected error was not thrown')
+            } catch (err) {
+                assert.ok(err instanceof ToolkitError)
+                assert.strictEqual(err.message, 'Failed to read known_hosts file')
+                assert.strictEqual((err as ToolkitError).cause?.message, 'read failed')
+            }
+        })
+
+        it('throws ToolkitError when writing known_hosts fails', async function () {
+            sandbox.stub(fs, 'existsFile').resolves(true)
+            sandbox.stub(fs, 'readFileText').resolves(`${hostname} ssh-rsa key\nsomehost ssh-rsa key`)
+            sandbox.stub(fs, 'writeFile').rejects(new Error('write failed'))
+
+            try {
+                await removeKnownHost(hostname)
+                assert.ok(false, 'Expected error was not thrown')
+            } catch (err) {
+                assert.ok(err instanceof ToolkitError)
+                assert.strictEqual(err.message, 'Failed to write updated known_hosts file')
+                assert.strictEqual((err as ToolkitError).cause?.message, 'write failed')
+            }
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/sagemaker/remoteUtils.test.ts b/packages/core/src/test/awsService/sagemaker/remoteUtils.test.ts
new file mode 100644
index 00000000000..4168dfdeee4
--- /dev/null
+++ b/packages/core/src/test/awsService/sagemaker/remoteUtils.test.ts
@@ -0,0 +1,76 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+import * as assert from 'assert'
+import { getRemoteAppMetadata } from '../../../awsService/sagemaker/remoteUtils'
+import { fs } from '../../../shared/fs/fs'
+import { SagemakerClient } from '../../../shared/clients/sagemaker'
+
+describe('getRemoteAppMetadata', function () {
+    let sandbox: sinon.SinonSandbox
+    let fsStub: sinon.SinonStub
+    let parseRegionStub: sinon.SinonStub
+    let describeSpaceStub: sinon.SinonStub
+    let loggerStub: sinon.SinonStub
+
+    const mockMetadata = {
+        AppType: 'JupyterLab',
+        DomainId: 'd-f0lwireyzpjp',
+        SpaceName: 'test-ae-3',
+        ExecutionRoleArn: 'arn:aws:iam::177118115371:role/service-role/AmazonSageMaker-ExecutionRole-20250415T091941',
+        ResourceArn: 'arn:aws:sagemaker:us-west-2:177118115371:app/d-f0lwireyzpjp/test-ae-3/JupyterLab/default',
+        ResourceName: 'default',
+        AppImageVersion: '',
+        ResourceArnCaseSensitive:
+            'arn:aws:sagemaker:us-west-2:177118115371:app/d-f0lwireyzpjp/test-ae-3/JupyterLab/default',
+        IpAddressType: 'ipv4',
+    }
+
+    const mockSpaceDetails = {
+        OwnershipSettings: {
+            OwnerUserProfileName: 'test-user-profile',
+        },
+    }
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+        fsStub = sandbox.stub(fs, 'readFileText')
+        parseRegionStub = sandbox
+            .stub()
+            .returns({ region: 'us-west-2', accountId: '123456789012', spaceName: 'test-space' })
+        sandbox.replace(require('../../../awsService/sagemaker/detached-server/utils'), 'parseArn', parseRegionStub)
+
+        describeSpaceStub = sandbox.stub().resolves(mockSpaceDetails)
+        sandbox.stub(SagemakerClient.prototype, 'describeSpace').callsFake(describeSpaceStub)
+
+        loggerStub = sandbox.stub().returns({
+            error: sandbox.stub(),
+        })
+        sandbox.replace(require('../../../shared/logger/logger'), 'getLogger', loggerStub)
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+
+    it('successfully reads metadata file and returns remote app metadata', async function () {
+        fsStub.resolves(JSON.stringify(mockMetadata))
+
+        const result = await getRemoteAppMetadata()
+
+        assert.deepStrictEqual(result, {
+            DomainId: 'd-f0lwireyzpjp',
+            UserProfileName: 'test-user-profile',
+        })
+
+        sinon.assert.calledWith(fsStub, '/opt/ml/metadata/resource-metadata.json')
+        sinon.assert.calledWith(parseRegionStub, mockMetadata.ResourceArn)
+        sinon.assert.calledWith(describeSpaceStub, {
+            DomainId: 'd-f0lwireyzpjp',
+            SpaceName: 'test-ae-3',
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/sagemaker/sagemakerSpace.test.ts b/packages/core/src/test/awsService/sagemaker/sagemakerSpace.test.ts
new file mode 100644
index 00000000000..2a52b08a3a6
--- /dev/null
+++ b/packages/core/src/test/awsService/sagemaker/sagemakerSpace.test.ts
@@ -0,0 +1,129 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { SagemakerSpace } from '../../../awsService/sagemaker/sagemakerSpace'
+import { SagemakerClient, SagemakerSpaceApp } from '../../../shared/clients/sagemaker'
+import sinon from 'sinon'
+
+describe('SagemakerSpace', function () {
+    let mockClient: sinon.SinonStubbedInstance<SagemakerClient>
+    let mockSpaceApp: SagemakerSpaceApp
+
+    beforeEach(function () {
+        mockClient = sinon.createStubInstance(SagemakerClient)
+        mockSpaceApp = {
+            SpaceName: 'test-space',
+            Status: 'InService',
+            DomainId: 'test-domain',
+            DomainSpaceKey: 'test-key',
+            SpaceSettingsSummary: {
+                AppType: 'JupyterLab',
+                RemoteAccess: 'ENABLED',
+            },
+        }
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    describe('updateSpaceAppStatus', function () {
+        it('should correctly map DescribeSpace API response to SagemakerSpaceApp type', async function () {
+            // Mock DescribeSpace response (uses full property names)
+            const mockDescribeSpaceResponse = {
+                SpaceName: 'updated-space',
+                Status: 'InService',
+                DomainId: 'test-domain',
+                SpaceSettings: {
+                    // Note: 'SpaceSettings' not 'SpaceSettingsSummary'
+                    AppType: 'CodeEditor',
+                    RemoteAccess: 'DISABLED',
+                },
+                OwnershipSettings: {
+                    OwnerUserProfileName: 'test-user',
+                },
+                SpaceSharingSettings: {
+                    SharingType: 'Private',
+                },
+                $metadata: { requestId: 'test-request-id' },
+            }
+
+            // Mock DescribeApp response
+            const mockDescribeAppResponse = {
+                AppName: 'test-app',
+                Status: 'InService',
+                ResourceSpec: {
+                    InstanceType: 'ml.t3.medium',
+                },
+                $metadata: { requestId: 'test-request-id' },
+            }
+
+            mockClient.describeSpace.resolves(mockDescribeSpaceResponse)
+            mockClient.describeApp.resolves(mockDescribeAppResponse)
+
+            const space = new SagemakerSpace(mockClient as any, 'us-east-1', mockSpaceApp)
+            const updateSpaceSpy = sinon.spy(space, 'updateSpace')
+
+            await space.updateSpaceAppStatus()
+
+            // Verify updateSpace was called with correctly mapped properties
+            assert.ok(updateSpaceSpy.calledOnce)
+            const updateSpaceArgs = updateSpaceSpy.getCall(0).args[0]
+
+            // Verify property name mapping from DescribeSpace to SagemakerSpaceApp
+            assert.strictEqual(updateSpaceArgs.SpaceSettingsSummary?.AppType, 'CodeEditor')
+            assert.strictEqual(updateSpaceArgs.SpaceSettingsSummary?.RemoteAccess, 'DISABLED')
+            assert.strictEqual(updateSpaceArgs.OwnershipSettingsSummary?.OwnerUserProfileName, 'test-user')
+            assert.strictEqual(updateSpaceArgs.SpaceSharingSettingsSummary?.SharingType, 'Private')
+
+            // Verify other properties are preserved
+            assert.strictEqual(updateSpaceArgs.SpaceName, 'updated-space')
+            assert.strictEqual(updateSpaceArgs.Status, 'InService')
+            assert.strictEqual(updateSpaceArgs.DomainId, 'test-domain')
+            assert.strictEqual(updateSpaceArgs.App, mockDescribeAppResponse)
+            assert.strictEqual(updateSpaceArgs.DomainSpaceKey, 'test-key')
+
+            // Verify original API property names are not present
+            assert.ok(!('SpaceSettings' in updateSpaceArgs))
+            assert.ok(!('OwnershipSettings' in updateSpaceArgs))
+            assert.ok(!('SpaceSharingSettings' in updateSpaceArgs))
+        })
+
+        it('should handle missing optional properties gracefully', async function () {
+            // Mock minimal DescribeSpace response
+            const mockDescribeSpaceResponse = {
+                SpaceName: 'minimal-space',
+                Status: 'InService',
+                DomainId: 'test-domain',
+                $metadata: { requestId: 'test-request-id' },
+                // No SpaceSettings, OwnershipSettings, or SpaceSharingSettings
+            }
+
+            const mockDescribeAppResponse = {
+                AppName: 'test-app',
+                Status: 'InService',
+                $metadata: { requestId: 'test-request-id' },
+            }
+
+            mockClient.describeSpace.resolves(mockDescribeSpaceResponse)
+            mockClient.describeApp.resolves(mockDescribeAppResponse)
+
+            const space = new SagemakerSpace(mockClient as any, 'us-east-1', mockSpaceApp)
+            const updateSpaceSpy = sinon.spy(space, 'updateSpace')
+
+            await space.updateSpaceAppStatus()
+
+            // Should not throw and should handle undefined properties
+            assert.ok(updateSpaceSpy.calledOnce)
+            const updateSpaceArgs = updateSpaceSpy.getCall(0).args[0]
+
+            assert.strictEqual(updateSpaceArgs.SpaceName, 'minimal-space')
+            assert.strictEqual(updateSpaceArgs.SpaceSettingsSummary, undefined)
+            assert.strictEqual(updateSpaceArgs.OwnershipSettingsSummary, undefined)
+            assert.strictEqual(updateSpaceArgs.SpaceSharingSettingsSummary, undefined)
+        })
+    })
+})
diff --git a/packages/core/src/test/awsService/sagemaker/uriHandlers.test.ts b/packages/core/src/test/awsService/sagemaker/uriHandlers.test.ts
new file mode 100644
index 00000000000..f27df1fcb11
--- /dev/null
+++ b/packages/core/src/test/awsService/sagemaker/uriHandlers.test.ts
@@ -0,0 +1,79 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import assert from 'assert'
+import { UriHandler } from '../../../shared/vscode/uriHandler'
+import { VSCODE_EXTENSION_ID } from '../../../shared/extensions'
+import { register } from '../../../awsService/sagemaker/uriHandlers'
+
+function createConnectUri(params: { [key: string]: string }): vscode.Uri {
+    const query = Object.entries(params)
+        .map(([k, v]) => `${encodeURIComponent(k)}=${encodeURIComponent(v)}`)
+        .join('&')
+    return vscode.Uri.parse(`vscode://${VSCODE_EXTENSION_ID.awstoolkit}/connect/sagemaker?${query}`)
+}
+
+describe('SageMaker URI handler', function () {
+    let handler: UriHandler
+    let deeplinkConnectStub: sinon.SinonStub
+
+    beforeEach(function () {
+        handler = new UriHandler()
+        deeplinkConnectStub = sinon.stub().resolves()
+        sinon.replace(require('../../../awsService/sagemaker/commands'), 'deeplinkConnect', deeplinkConnectStub)
+
+        register({
+            uriHandler: handler,
+        } as any)
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    it('calls deeplinkConnect with all expected params', async function () {
+        const params = {
+            connection_identifier: 'abc123',
+            domain: 'my-domain',
+            user_profile: 'me',
+            session: 'sess-xyz',
+            ws_url: 'wss://example.com',
+            'cell-number': '4',
+            token: 'my-token',
+            app_type: 'jupyterlab',
+        }
+
+        const uri = createConnectUri(params)
+        await handler.handleUri(uri)
+
+        assert.ok(deeplinkConnectStub.calledOnce)
+        assert.deepStrictEqual(deeplinkConnectStub.firstCall.args[1], 'abc123')
+        assert.deepStrictEqual(deeplinkConnectStub.firstCall.args[2], 'sess-xyz')
+        assert.deepStrictEqual(deeplinkConnectStub.firstCall.args[3], 'wss://example.com&cell-number=4')
+        assert.deepStrictEqual(deeplinkConnectStub.firstCall.args[4], 'my-token')
+        assert.deepStrictEqual(deeplinkConnectStub.firstCall.args[5], 'my-domain')
+        assert.deepStrictEqual(deeplinkConnectStub.firstCall.args[6], 'jupyterlab')
+    })
+
+    it('calls deeplinkConnect with undefined app_type when not provided', async function () {
+        const params = {
+            connection_identifier: 'abc123',
+            domain: 'my-domain',
+            user_profile: 'me',
+            session: 'sess-xyz',
+            ws_url: 'wss://example.com',
+            'cell-number': '4',
+            token: 'my-token',
+        }
+
+        const uri = createConnectUri(params)
+        await handler.handleUri(uri)
+
+        assert.ok(deeplinkConnectStub.calledOnce)
+        assert.deepStrictEqual(deeplinkConnectStub.firstCall.args[6], undefined)
+    })
+})
diff --git a/packages/core/src/test/awsService/sagemaker/utils.test.ts b/packages/core/src/test/awsService/sagemaker/utils.test.ts
new file mode 100644
index 00000000000..c73fd6968fc
--- /dev/null
+++ b/packages/core/src/test/awsService/sagemaker/utils.test.ts
@@ -0,0 +1,150 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { AppStatus, SpaceStatus } from '@aws-sdk/client-sagemaker'
+import { generateSpaceStatus, ActivityCheckInterval } from '../../../awsService/sagemaker/utils'
+import * as assert from 'assert'
+import * as sinon from 'sinon'
+import { fs } from '../../../shared/fs/fs'
+import * as utils from '../../../awsService/sagemaker/utils'
+
+describe('generateSpaceStatus', function () {
+    it('returns Failed if space status is Failed', function () {
+        assert.strictEqual(generateSpaceStatus(SpaceStatus.Failed, AppStatus.InService), 'Failed')
+    })
+
+    it('returns Failed if space status is Delete_Failed', function () {
+        assert.strictEqual(generateSpaceStatus(SpaceStatus.Delete_Failed, AppStatus.InService), 'Failed')
+    })
+
+    it('returns Failed if space status is Update_Failed', function () {
+        assert.strictEqual(generateSpaceStatus(SpaceStatus.Update_Failed, AppStatus.InService), 'Failed')
+    })
+
+    it('returns Failed if app status is Failed and space status is not Updating', function () {
+        assert.strictEqual(generateSpaceStatus(SpaceStatus.Deleting, AppStatus.Failed), 'Failed')
+    })
+
+    it('does not return Failed if app status is Failed but space status is Updating', function () {
+        assert.strictEqual(generateSpaceStatus(SpaceStatus.Updating, AppStatus.Failed), 'Updating')
+    })
+
+    it('returns Running if both statuses are InService', function () {
+        assert.strictEqual(generateSpaceStatus(SpaceStatus.InService, AppStatus.InService), 'Running')
+    })
+
+    it('returns Starting if app is Pending and space is InService', function () {
+        assert.strictEqual(generateSpaceStatus(SpaceStatus.InService, AppStatus.Pending), 'Starting')
+    })
+
+    it('returns Updating if space status is Updating', function () {
+        assert.strictEqual(generateSpaceStatus(SpaceStatus.Updating, AppStatus.Deleting), 'Updating')
+    })
+
+    it('returns Stopping if app is Deleting and space is InService', function () {
+        assert.strictEqual(generateSpaceStatus(SpaceStatus.InService, AppStatus.Deleting), 'Stopping')
+    })
+
+    it('returns Stopped if app is Deleted and space is InService', function () {
+        assert.strictEqual(generateSpaceStatus(SpaceStatus.InService, AppStatus.Deleted), 'Stopped')
+    })
+
+    it('returns Stopped if app status is undefined and space is InService', function () {
+        assert.strictEqual(generateSpaceStatus(SpaceStatus.InService, undefined), 'Stopped')
+    })
+
+    it('returns Deleting if space is Deleting', function () {
+        assert.strictEqual(generateSpaceStatus(SpaceStatus.Deleting, AppStatus.InService), 'Deleting')
+    })
+
+    it('returns Unknown if none of the above match', function () {
+        assert.strictEqual(generateSpaceStatus(undefined, undefined), 'Unknown')
+        assert.strictEqual(
+            generateSpaceStatus('SomeOtherStatus' as SpaceStatus, 'RandomAppStatus' as AppStatus),
+            'Unknown'
+        )
+    })
+})
+
+describe('checkTerminalActivity', function () {
+    let sandbox: sinon.SinonSandbox
+    let fsReaddirStub: sinon.SinonStub
+    let fsStatStub: sinon.SinonStub
+    let fsWriteFileStub: sinon.SinonStub
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        fsReaddirStub = sandbox.stub(fs, 'readdir')
+        fsStatStub = sandbox.stub(fs, 'stat')
+        fsWriteFileStub = sandbox.stub(fs, 'writeFile')
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('should write to idle file when recent terminal activity is detected', async function () {
+        const idleFilePath = '/tmp/test-idle-file'
+        const recentTime = Date.now() - ActivityCheckInterval / 2 // Recent activity
+
+        fsReaddirStub.resolves([
+            ['pts1', 1],
+            ['pts2', 1],
+        ]) // Mock file entries
+        fsStatStub.onFirstCall().resolves({ mtime: new Date(recentTime) })
+        fsWriteFileStub.resolves()
+
+        await utils.checkTerminalActivity(idleFilePath)
+
+        // Verify that fs.writeFile was called (which means updateIdleFile was called)
+        assert.strictEqual(fsWriteFileStub.callCount, 1)
+        assert.strictEqual(fsWriteFileStub.firstCall.args[0], idleFilePath)
+
+        // Verify the timestamp is a valid ISO string
+        const timestamp = fsWriteFileStub.firstCall.args[1]
+        assert.strictEqual(typeof timestamp, 'string')
+        assert.ok(!isNaN(Date.parse(timestamp)))
+    })
+
+    it('should stop checking once activity is detected', async function () {
+        const idleFilePath = '/tmp/test-idle-file'
+        const recentTime = Date.now() - ActivityCheckInterval / 2
+
+        fsReaddirStub.resolves([
+            ['pts1', 1],
+            ['pts2', 1],
+            ['pts3', 1],
+        ])
+        fsStatStub.onFirstCall().resolves({ mtime: new Date(recentTime) }) // First file has activity
+        fsWriteFileStub.resolves()
+
+        await utils.checkTerminalActivity(idleFilePath)
+
+        // Should only call stat once since activity was detected on first file
+        assert.strictEqual(fsStatStub.callCount, 1)
+        // Should write to file once
+        assert.strictEqual(fsWriteFileStub.callCount, 1)
+    })
+
+    it('should handle stat error gracefully and continue checking other files', async function () {
+        const idleFilePath = '/tmp/test-idle-file'
+        const recentTime = Date.now() - ActivityCheckInterval / 2
+        const statError = new Error('File not found')
+
+        fsReaddirStub.resolves([
+            ['pts1', 1],
+            ['pts2', 1],
+        ])
+        fsStatStub.onFirstCall().rejects(statError) // First file fails
+        fsStatStub.onSecondCall().resolves({ mtime: new Date(recentTime) }) // Second file succeeds
+        fsWriteFileStub.resolves()
+
+        await utils.checkTerminalActivity(idleFilePath)
+
+        // Should continue and find activity on second file
+        assert.strictEqual(fsStatStub.callCount, 2)
+        assert.strictEqual(fsWriteFileStub.callCount, 1)
+    })
+})
diff --git a/packages/core/src/test/codecatalyst/auth.test.ts b/packages/core/src/test/codecatalyst/auth.test.ts
new file mode 100644
index 00000000000..fc915e6e23a
--- /dev/null
+++ b/packages/core/src/test/codecatalyst/auth.test.ts
@@ -0,0 +1,216 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { CodeCatalystAuthStorage, CodeCatalystAuthenticationProvider, defaultScopes } from '../../codecatalyst/auth'
+import { getTestWindow } from '../shared/vscode/window'
+import { FakeSecretStorage } from '../fakeExtensionContext'
+import { createBuilderIdProfile, createSsoProfile, createTestAuth } from '../credentials/testUtil'
+import Sinon from 'sinon'
+import { isAnySsoConnection } from '../../auth/connection'
+import globals from '../../shared/extensionGlobals'
+
+const enterpriseSsoStartUrl = 'https://enterprise.awsapps.com/start'
+
+describe('CodeCatalystAuthenticationProvider', async function () {
+    let auth: ReturnType<typeof createTestAuth>
+    let codecatalystAuth: CodeCatalystAuthenticationProvider
+
+    beforeEach(async function () {
+        auth = createTestAuth(globals.globalState)
+        codecatalystAuth = new CodeCatalystAuthenticationProvider(
+            new CodeCatalystAuthStorage(new FakeSecretStorage()),
+            auth
+        )
+    })
+
+    afterEach(async function () {
+        await auth.logout()
+    })
+
+    describe('connectToAwsBuilderId()', () => {
+        it('should create a new connection', async function () {
+            Sinon.stub(codecatalystAuth, 'isConnectionOnboarded').resolves(true)
+
+            getTestWindow().onDidShowQuickPick(async (picker) => {
+                await picker.untilReady()
+                picker.acceptItem(picker.items[1])
+            })
+
+            await codecatalystAuth.connectToAwsBuilderId()
+            const conn = codecatalystAuth.activeConnection
+            assert.strictEqual(conn?.type, 'sso')
+            assert.strictEqual(conn.label, 'AWS Builder ID')
+        })
+
+        it('should add scopes to existing Builder ID connection', async function () {
+            Sinon.stub(codecatalystAuth, 'isConnectionOnboarded').resolves(true)
+
+            getTestWindow().onDidShowMessage(async (message) => {
+                assert.ok(message.modal)
+                message.selectItem('Proceed')
+            })
+            const otherScope = 'my:other:scope'
+            const ssoConn = await auth.createInvalidSsoConnection(createBuilderIdProfile({ scopes: [otherScope] }))
+
+            // Method under test
+            await codecatalystAuth.connectToEnterpriseSso(ssoConn.startUrl, 'us-east-1')
+
+            const conn = codecatalystAuth.activeConnection
+            assert.strictEqual(conn?.type, 'sso')
+            assert.strictEqual(conn.label, 'AWS Builder ID')
+            assert.deepStrictEqual(conn.scopes, [otherScope, ...defaultScopes])
+        })
+
+        it('does not prompt to sign out of duplicate builder ID connections', async function () {
+            Sinon.stub(codecatalystAuth, 'isConnectionOnboarded').resolves(true)
+
+            await codecatalystAuth.connectToAwsBuilderId()
+            await codecatalystAuth.connectToAwsBuilderId()
+            assert.ok(codecatalystAuth.isConnected())
+
+            const ssoConnectionIds = new Set(
+                auth.activeConnectionEvents.emits.filter(isAnySsoConnection).map((c) => c.id)
+            )
+            assert.strictEqual(ssoConnectionIds.size, 1, 'Expected exactly 1 unique SSO connection id')
+            assert.strictEqual((await auth.listConnections()).filter(isAnySsoConnection).length, 1)
+        })
+    })
+
+    describe('connectToEnterpriseSso()', () => {
+        it('should create a new connection', async function () {
+            Sinon.stub(codecatalystAuth, 'isConnectionOnboarded').resolves(true)
+
+            getTestWindow().onDidShowQuickPick(async (picker) => {
+                await picker.untilReady()
+                picker.acceptItem(picker.items[1])
+            })
+
+            await codecatalystAuth.connectToEnterpriseSso(enterpriseSsoStartUrl, 'us-east-1')
+            const conn = codecatalystAuth.activeConnection
+            assert.strictEqual(conn?.type, 'sso')
+            assert.strictEqual(conn.label, 'IAM Identity Center (enterprise)')
+        })
+
+        it('should add scopes to existing IAM Identity Center connection', async function () {
+            Sinon.stub(codecatalystAuth, 'isConnectionOnboarded').resolves(true)
+
+            getTestWindow().onDidShowMessage(async (message) => {
+                assert.ok(message.modal)
+                message.selectItem('Proceed')
+            })
+            const otherScope = 'my:other:scope'
+            const ssoConn = await auth.createInvalidSsoConnection(
+                createSsoProfile({ startUrl: enterpriseSsoStartUrl, scopes: [otherScope] })
+            )
+
+            // Method under test
+            await codecatalystAuth.connectToEnterpriseSso(ssoConn.startUrl, 'us-east-1')
+
+            const conn = codecatalystAuth.activeConnection
+            assert.strictEqual(conn?.type, 'sso')
+            assert.strictEqual(conn.label, 'IAM Identity Center (enterprise)')
+            assert.deepStrictEqual(conn.scopes, [otherScope, ...defaultScopes])
+        })
+    })
+
+    describe('tryConnectTo', async () => {
+        it('should do nothing if connection is already active', async function () {
+            Sinon.stub(codecatalystAuth, 'isConnectionOnboarded').resolves(true)
+            const connectToEnterpriseSso = Sinon.spy(codecatalystAuth, 'connectToEnterpriseSso')
+
+            getTestWindow().onDidShowQuickPick(async (picker) => {
+                await picker.untilReady()
+                picker.acceptItem(picker.items[1])
+            })
+
+            await codecatalystAuth.connectToEnterpriseSso(enterpriseSsoStartUrl, 'us-east-1')
+            let conn = codecatalystAuth.activeConnection
+            assert.strictEqual(conn?.type, 'sso')
+            assert.strictEqual(conn.label, 'IAM Identity Center (enterprise)')
+
+            await codecatalystAuth.tryConnectTo({ startUrl: enterpriseSsoStartUrl, region: 'us-east-1' })
+            conn = codecatalystAuth.activeConnection
+            assert.strictEqual(conn?.type, 'sso')
+            assert.strictEqual(conn.label, 'IAM Identity Center (enterprise)')
+
+            assert.strictEqual(connectToEnterpriseSso.callCount, 1, 'Expected no extra calls on active connection')
+        })
+
+        it('should switch to IAM Identity Center', async function () {
+            Sinon.stub(codecatalystAuth, 'isConnectionOnboarded').resolves(true)
+            const connectToEnterpriseSso = Sinon.spy(codecatalystAuth, 'connectToEnterpriseSso')
+
+            getTestWindow().onDidShowQuickPick(async (picker) => {
+                await picker.untilReady()
+                picker.acceptItem(picker.items[1])
+            })
+
+            await codecatalystAuth.connectToEnterpriseSso(enterpriseSsoStartUrl, 'us-east-1')
+            let conn = codecatalystAuth.activeConnection
+            assert.strictEqual(conn?.type, 'sso')
+            assert.strictEqual(conn.label, 'IAM Identity Center (enterprise)')
+            assert.strictEqual(connectToEnterpriseSso.callCount, 1, 'Expected one call to connectToEnterpriseSso')
+
+            getTestWindow().onDidShowQuickPick(async (picker) => {
+                await picker.untilReady()
+                picker.acceptItem(picker.items[1])
+            })
+
+            await codecatalystAuth.tryConnectTo({
+                startUrl: 'https://other-enterprise.awsapps.com/start',
+                region: 'us-east-1',
+            })
+            conn = codecatalystAuth.activeConnection
+            assert.strictEqual(conn?.type, 'sso')
+            assert.strictEqual(conn.label, 'IAM Identity Center (other-enterprise)')
+            assert.strictEqual(conn.startUrl, 'https://other-enterprise.awsapps.com/start')
+
+            assert.strictEqual(
+                connectToEnterpriseSso.callCount,
+                2,
+                'Expected two calls to complete switch for connectToEnterpriseSso'
+            )
+        })
+
+        it('should switch to Builder ID', async function () {
+            Sinon.stub(codecatalystAuth, 'isConnectionOnboarded').resolves(true)
+            const connectToAwsBuilderId = Sinon.spy(codecatalystAuth, 'connectToAwsBuilderId')
+            const connectToEnterpriseSso = Sinon.spy(codecatalystAuth, 'connectToEnterpriseSso')
+
+            getTestWindow().onDidShowQuickPick(async (picker) => {
+                await picker.untilReady()
+                picker.acceptItem(picker.items[1])
+            })
+
+            await codecatalystAuth.tryConnectTo({
+                startUrl: 'https://other-enterprise.awsapps.com/start',
+                region: 'us-east-1',
+            })
+            let conn = codecatalystAuth.activeConnection
+            assert.strictEqual(conn?.type, 'sso')
+            assert.strictEqual(conn.label, 'IAM Identity Center (other-enterprise)')
+            assert.strictEqual(conn.startUrl, 'https://other-enterprise.awsapps.com/start')
+
+            assert.strictEqual(connectToEnterpriseSso.callCount, 1, 'Expected one call to connectToEnterpriseSso')
+
+            getTestWindow().onDidShowQuickPick(async (picker) => {
+                await picker.untilReady()
+                picker.acceptItem(picker.items[1])
+            })
+
+            await codecatalystAuth.connectToAwsBuilderId()
+            conn = codecatalystAuth.activeConnection
+            assert.strictEqual(conn?.type, 'sso')
+            assert.strictEqual(conn.label, 'AWS Builder ID')
+            assert.strictEqual(connectToAwsBuilderId.callCount, 1, 'Expected one call to connectToAwsBuilderId')
+            assert.strictEqual(
+                connectToEnterpriseSso.callCount,
+                1,
+                'Expected no additional calls to connectToEnterpriseSso'
+            )
+        })
+    })
+})
diff --git a/packages/core/src/test/codecatalyst/codecatalystClient.test.ts b/packages/core/src/test/codecatalyst/codecatalystClient.test.ts
new file mode 100644
index 00000000000..d885d6bec1c
--- /dev/null
+++ b/packages/core/src/test/codecatalyst/codecatalystClient.test.ts
@@ -0,0 +1,87 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon = require('sinon')
+import { toCodeCatalystUrl } from '../../codecatalyst/utils'
+import * as codecatalyst from '../../shared/clients/codecatalystClient'
+import { ListSourceRepositoriesItem } from '@aws-sdk/client-codecatalyst'
+import { RequiredProps } from '../../shared/utilities/tsUtils'
+
+describe('codeCatalystClient', function () {
+    it('toCodeCatalystUrl()', async function () {
+        const org: codecatalyst.CodeCatalystOrg = {
+            type: 'org',
+            name: 'org1',
+            regionName: 'region',
+        }
+        const project: codecatalyst.CodeCatalystProject = {
+            type: 'project',
+            org: org,
+            name: 'project1',
+        }
+        const repo: codecatalyst.CodeCatalystRepo = {
+            type: 'repo',
+            org: org,
+            project: project,
+            id: 'repoid1',
+            name: 'repo1',
+            lastUpdatedTime: new Date(),
+            createdTime: new Date(),
+        }
+        const prefix = `https://${codecatalyst.getCodeCatalystConfig().hostname}/spaces`
+        assert.deepStrictEqual(toCodeCatalystUrl(org), `${prefix}/org1/view`)
+        assert.deepStrictEqual(toCodeCatalystUrl(project), `${prefix}/org1/projects/project1/view`)
+        assert.deepStrictEqual(
+            toCodeCatalystUrl(repo),
+            `${prefix}/org1/projects/project1/source-repositories/repo1/view`
+        )
+    })
+})
+
+describe('getFirstPartyRepos()', function () {
+    let sandbox: sinon.SinonSandbox
+    let codeCatalystClient: codecatalyst.CodeCatalystClient
+    let getRepoCloneUrlStub: sinon.SinonStub
+
+    before(function () {
+        sandbox = sinon.createSandbox()
+    })
+
+    beforeEach(function () {
+        codeCatalystClient = <codecatalyst.CodeCatalystClient>{}
+
+        getRepoCloneUrlStub = sandbox.stub()
+        codeCatalystClient.getRepoCloneUrl = getRepoCloneUrlStub
+    })
+
+    it('removes third party repos', async function () {
+        getRepoCloneUrlStub.onCall(0).resolves('https://github.com/aws/not-code-catalyst-1.git')
+        getRepoCloneUrlStub.onCall(1).resolves('https://codecatalyst.aws/code-catalyst-1')
+        getRepoCloneUrlStub.onCall(2).resolves('https://github.com/aws/not-code-catalyst-2.git')
+        getRepoCloneUrlStub.onCall(3).resolves('https://codecatalyst.aws/code-catalyst-1')
+
+        const allRepos = await codecatalyst.excludeThirdPartyRepos(codeCatalystClient, '', '', [
+            { name: 'not-code-catalyst-1' },
+            { name: 'code-catalyst-1' },
+            { name: 'not-code-catalyst-2' },
+            { name: 'code-catalyst-2' },
+        ] as RequiredProps<ListSourceRepositoriesItem, 'name'>[])
+
+        assert.deepStrictEqual(allRepos, [{ name: 'code-catalyst-1' }, { name: 'code-catalyst-2' }])
+    })
+
+    it('returns empty array if no first party repos', async function () {
+        getRepoCloneUrlStub.onCall(0).resolves('https://github.com/aws/aws-cdk.git')
+        getRepoCloneUrlStub.onCall(1).resolves('https://github.com/aws/vscode-toolkit.git')
+
+        const allRepos = await codecatalyst.excludeThirdPartyRepos(codeCatalystClient, '', '', [
+            { name: 'aws-cdk' },
+            { name: 'vscode-toolkit' },
+        ] as RequiredProps<ListSourceRepositoriesItem, 'name'>[])
+
+        assert.deepStrictEqual(allRepos, [])
+    })
+})
diff --git a/src/test/caws/devfileLocation.test.ts b/packages/core/src/test/codecatalyst/devfileLocation.test.ts
similarity index 85%
rename from src/test/caws/devfileLocation.test.ts
rename to packages/core/src/test/codecatalyst/devfileLocation.test.ts
index f722987c897..e4751d47d74 100644
--- a/src/test/caws/devfileLocation.test.ts
+++ b/packages/core/src/test/codecatalyst/devfileLocation.test.ts
@@ -1,14 +1,14 @@
 /*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as vscode from 'vscode'
 import { getDevfileLocation } from '../../codecatalyst/model'
 import { DevEnvClient } from '../../shared/clients/devenvClient'
 import * as sinon from 'sinon'
-const fileSystemUtils = require('../../shared/filesystemUtilities')
+import * as fileSystemUtils from '../../shared/filesystemUtilities'
 
 describe('getDevfileLocation', function () {
     let sandbox: sinon.SinonSandbox
@@ -47,7 +47,7 @@ describe('getDevfileLocation', function () {
 
     it('devfile without repo found in workspace root', async function () {
         const devfilePath = vscode.Uri.parse('/projects/WebApplication/devfile.yaml').fsPath
-        sandbox.stub(fileSystemUtils, 'fileExists').callsFake(function (p: string) {
+        sandbox.stub(fileSystemUtils, 'fileExists').callsFake(async function (p: string) {
             return p === devfilePath
         })
         const client = mockClient('devfile.yaml')
@@ -57,7 +57,7 @@ describe('getDevfileLocation', function () {
 
     it('devfile found in subfolder with repo', async function () {
         const devfilePath = vscode.Uri.parse('/projects/WebApplication/devfile.yaml').fsPath
-        sandbox.stub(fileSystemUtils, 'fileExists').callsFake(function (p: string) {
+        sandbox.stub(fileSystemUtils, 'fileExists').callsFake(async function (p: string) {
             return p === devfilePath
         })
         const client = mockClient('WebApplication/devfile.yaml')
@@ -69,12 +69,12 @@ describe('getDevfileLocation', function () {
         sandbox.stub(fileSystemUtils, 'fileExists').resolves(false)
         const client = mockClient('test/devfile.yaml')
         const location = getDevfileLocation(client, vscode.Uri.parse('/projects/WebApplication'))
-        assert.rejects(location, new Error('Devfile location was not found'))
+        await assert.rejects(location, new Error('Devfile location was not found'))
     })
 
     it('falls back to default projects location when devfile cannot be located', async function () {
         const devfilePath = vscode.Uri.parse('/projects/devfile.yaml').fsPath
-        sandbox.stub(fileSystemUtils, 'fileExists').callsFake(function (p: string) {
+        sandbox.stub(fileSystemUtils, 'fileExists').callsFake(async function (p: string) {
             return p === devfilePath
         })
         const client = mockClient('WebApplication/devfile.yaml')
@@ -84,7 +84,7 @@ describe('getDevfileLocation', function () {
 
     it('falls back to default workspace location when devfile cannot be located', async function () {
         const devfilePath = vscode.Uri.parse('/projects/WebApplication/devfile.yaml').fsPath
-        sandbox.stub(fileSystemUtils, 'fileExists').callsFake(function (p: string) {
+        sandbox.stub(fileSystemUtils, 'fileExists').callsFake(async function (p: string) {
             return p === devfilePath
         })
         const client = mockClient('devfile.yaml')
@@ -94,7 +94,7 @@ describe('getDevfileLocation', function () {
 
     it('checks project root for devfile when location isnt specified', async function () {
         const devfilePath = vscode.Uri.parse('/projects/devfile.yaml').fsPath
-        sandbox.stub(fileSystemUtils, 'fileExists').callsFake(function (p: string) {
+        sandbox.stub(fileSystemUtils, 'fileExists').callsFake(async function (p: string) {
             return p === devfilePath
         })
         const client = mockClient(undefined)
@@ -104,7 +104,7 @@ describe('getDevfileLocation', function () {
 
     it('checks workspace root for devfile when location isnt specified', async function () {
         const devfilePath = vscode.Uri.parse('/projects/WebApplication/devfile.yaml').fsPath
-        sandbox.stub(fileSystemUtils, 'fileExists').callsFake(function (p: string) {
+        sandbox.stub(fileSystemUtils, 'fileExists').callsFake(async function (p: string) {
             return p === devfilePath
         })
         const client = mockClient(undefined)
diff --git a/packages/core/src/test/codecatalyst/uriHandlers.test.ts b/packages/core/src/test/codecatalyst/uriHandlers.test.ts
new file mode 100644
index 00000000000..8e5ed9adf3a
--- /dev/null
+++ b/packages/core/src/test/codecatalyst/uriHandlers.test.ts
@@ -0,0 +1,139 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import assert from 'assert'
+import { register } from '../../codecatalyst/uriHandlers'
+import { UriHandler } from '../../shared/vscode/uriHandler'
+import { VSCODE_EXTENSION_ID } from '../../shared/extensions'
+import { CodeCatalystClient } from '../../shared/clients/codecatalystClient'
+import { SeverityLevel } from '../shared/vscode/message'
+import { getTestWindow } from '../shared/vscode/window'
+import { defaultSsoRegion } from '../../auth/connection'
+import { builderIdStartUrl } from '../../auth/sso/constants'
+
+type Stub<T extends (...args: any[]) => any> = sinon.SinonStub<Parameters<T>, ReturnType<T>>
+
+function createCloneUri(target: string): vscode.Uri {
+    return vscode.Uri.parse(`vscode://${VSCODE_EXTENSION_ID.awstoolkit}/clone?url=${encodeURIComponent(target)}`)
+}
+
+function createConnectUri(params: { [key: string]: any }): vscode.Uri {
+    const encoded = Object.entries(params)
+        .map(([k, v]) => `${encodeURIComponent(k)}=${encodeURIComponent(v)}`)
+        .join('&')
+    return vscode.Uri.parse(`vscode://${VSCODE_EXTENSION_ID.awstoolkit}/connect/codecatalyst?${encoded}`)
+}
+
+// Tests involving `UriHandler` should _not_ couple the URI paths to the implementation.
+// The path is apart of our public API! They should not be easy to change.
+
+describe('CodeCatalyst handlers', function () {
+    let commandStub: Stub<typeof vscode.commands.executeCommand>
+    const client = {} as any as CodeCatalystClient
+
+    beforeEach(function () {
+        commandStub = sinon.stub(vscode.commands, 'executeCommand')
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    describe('clone', function () {
+        let handler: UriHandler
+
+        beforeEach(function () {
+            handler = new UriHandler()
+            register(handler, {
+                cloneRepo: {
+                    execute: async () => undefined,
+                } as any,
+            } as any)
+        })
+
+        it('registers for "/clone"', function () {
+            assert.throws(() => handler.onPath('/clone', () => {}))
+        })
+
+        it('ignores requests without a url', async function () {
+            await handler.handleUri(createCloneUri('').with({ query: '' }))
+            assert.strictEqual(commandStub.called, false)
+        })
+
+        it('does a normal git clone if not a CodeCatalyst URL', async function () {
+            const target = 'https://github.com/antlr/grammars-v4.git'
+            await handler.handleUri(createCloneUri(target))
+            assert.ok(commandStub.calledWith('git.clone', target))
+        })
+    })
+
+    describe('connect', function () {
+        const devenvId = {
+            id: 'somefoo',
+            org: { name: 'org' },
+            project: { name: 'project' },
+        }
+
+        const params = {
+            devEnvironmentId: devenvId.id,
+            spaceName: devenvId.org.name,
+            projectName: devenvId.project.name,
+        }
+
+        let openDevEnvMock: sinon.SinonExpectation
+        let handler: UriHandler
+
+        beforeEach(function () {
+            handler = new UriHandler()
+            openDevEnvMock = sinon.mock()
+            register(handler, {
+                openDevEnv: {
+                    execute: openDevEnvMock,
+                } as any,
+            } as any)
+        })
+
+        it('returns builder ID SSO if IdC params are not present', async function () {
+            await handler.handleUri(createConnectUri(params))
+            assert.ok(
+                openDevEnvMock.calledWith(sinon.match.any, devenvId, undefined, {
+                    startUrl: builderIdStartUrl,
+                    region: defaultSsoRegion,
+                })
+            )
+        })
+
+        it('returns provided IdC params', async function () {
+            const ssoStartUrl = 'https://my-url'
+            const ssoRegion = 'us-west-2'
+            await handler.handleUri(createConnectUri({ ...params, sso_start_url: ssoStartUrl, sso_region: ssoRegion }))
+            assert.ok(
+                openDevEnvMock.calledWith(sinon.match.any, devenvId, undefined, {
+                    startUrl: ssoStartUrl,
+                    region: ssoRegion,
+                })
+            )
+        })
+
+        it('checks that the environment exists', async function () {
+            // This test is not accurate anymore because dependencies are checked prior to API calls
+            // Unit tests are ran without other extensions activated, so this fails on the SSH extension check
+            this.skip()
+
+            const getDevEnvStub = sinon.stub().rejects(new Error('No dev environment found'))
+            client.getDevEnvironment = getDevEnvStub
+            const errorMessage = getTestWindow()
+                .waitForMessage(/Failed to handle/)
+                .then((message) => {
+                    message.assertSeverity(SeverityLevel.Error)
+                })
+
+            await handler.handleUri(createConnectUri(devenvId))
+            await errorMessage
+        })
+    })
+})
diff --git a/packages/core/src/test/codecatalyst/wizards/selectResource.test.ts b/packages/core/src/test/codecatalyst/wizards/selectResource.test.ts
new file mode 100644
index 00000000000..273dcacce7c
--- /dev/null
+++ b/packages/core/src/test/codecatalyst/wizards/selectResource.test.ts
@@ -0,0 +1,75 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import sinon from 'sinon'
+import { createOrgPrompter, createProjectPrompter } from '../../../codecatalyst/wizards/selectResource'
+import { CodeCatalystOrg, CodeCatalystClient, CodeCatalystProject } from '../../../shared/clients/codecatalystClient'
+import { intoCollection } from '../../../shared/utilities/collectionUtils'
+import { createQuickPickPrompterTester } from '../../shared/ui/testUtils'
+
+describe('Prompts', function () {
+    let orgs: CodeCatalystOrg[]
+    let projects: CodeCatalystProject[]
+
+    beforeEach(function () {
+        orgs = [{ type: 'org', name: 'MyOrg', description: 'My Description', regionName: 'region' }]
+        projects = orgs.map((org) => ({
+            name: 'MyProject',
+            type: 'project',
+            org,
+        }))
+    })
+
+    function mockClient(): CodeCatalystClient {
+        const client = {
+            listSpaces: sinon.stub().returns(intoCollection([orgs])),
+            listResources: sinon.stub().callsFake((arg: string) => {
+                if (arg === 'project') {
+                    return intoCollection([projects])
+                }
+            }),
+        } as any as CodeCatalystClient
+
+        return client
+    }
+
+    it('can list spaces (organizations)', async function () {
+        const prompt = createOrgPrompter(mockClient())
+        const tester = createQuickPickPrompterTester(prompt)
+
+        tester.assertItems([{ label: 'MyOrg', detail: 'My Description', data: orgs[0] }])
+        tester.acceptItem('MyOrg')
+
+        await tester.result()
+    })
+
+    it('can refresh spaces (organizations)', async function () {
+        const prompt = createOrgPrompter(mockClient())
+        const tester = createQuickPickPrompterTester(prompt)
+        const newOrg = { type: 'org', name: 'AnotherOrg', description: 'More Text', regionName: 'region' } as const
+
+        tester.assertItems([{ label: 'MyOrg', detail: 'My Description', data: orgs[0] }])
+        tester.addCallback(() => orgs.push(newOrg))
+        tester.pressButton('Refresh')
+        tester.assertItems(['MyOrg', 'AnotherOrg'])
+        tester.acceptItem('AnotherOrg')
+
+        await tester.result(newOrg)
+    })
+
+    it('can refresh projects', async function () {
+        const prompt = createProjectPrompter(mockClient())
+        const tester = createQuickPickPrompterTester(prompt)
+        const newProj = { type: 'project', name: 'AnotherProject', org: orgs[0] } as const
+
+        tester.assertItems(['MyOrg / MyProject'])
+        tester.addCallback(() => projects.push(newProj))
+        tester.pressButton('Refresh')
+        tester.assertItems(['MyOrg / MyProject', 'MyOrg / AnotherProject'])
+        tester.acceptItem('MyOrg / AnotherProject')
+
+        await tester.result(newProj)
+    })
+})
diff --git a/packages/core/src/test/codewhisperer/commands/basicCommands.test.ts b/packages/core/src/test/codewhisperer/commands/basicCommands.test.ts
new file mode 100644
index 00000000000..a57ff6fcea3
--- /dev/null
+++ b/packages/core/src/test/codewhisperer/commands/basicCommands.test.ts
@@ -0,0 +1,982 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as CodeWhispererConstants from '../../../codewhisperer/models/constants'
+import { createCodeScanIssue, createMockDocument, resetCodeWhispererGlobalVariables } from '../testUtil'
+import { assertTelemetry, assertTelemetryCurried, tryRegister } from '../../testUtil'
+import {
+    toggleCodeSuggestions,
+    showSecurityScan,
+    showFileScan,
+    applySecurityFix,
+    showReferenceLog,
+    selectCustomizationPrompt,
+    reconnect,
+    signoutCodeWhisperer,
+    toggleCodeScans,
+    rejectFix,
+    ignoreIssue,
+    ignoreAllIssues,
+} from '../../../codewhisperer/commands/basicCommands'
+import { FakeExtensionContext } from '../../fakeExtensionContext'
+import { testCommand } from '../../shared/vscode/testUtils'
+import { Command, placeholder } from '../../../shared/vscode/commands2'
+import { SecurityPanelViewProvider } from '../../../codewhisperer/views/securityPanelViewProvider'
+import { DefaultCodeWhispererClient } from '../../../codewhisperer/client/codewhisperer'
+import { stub } from '../../utilities/stubber'
+import { AuthUtil } from '../../../codewhisperer/util/authUtil'
+import { getTestWindow } from '../../shared/vscode/window'
+import { ExtContext } from '../../../shared/extensions'
+import {
+    createAutoScans,
+    createAutoSuggestions,
+    createDocumentationNode,
+    createFeedbackNode,
+    createGettingStarted,
+    createGitHubNode,
+    createLearnMore,
+    createManageSubscription,
+    createOpenReferenceLog,
+    createReconnect,
+    createSelectCustomization,
+    createSeparator,
+    createSettingsNode,
+    createSignIn,
+    createSignout,
+    switchToAmazonQNode,
+} from '../../../codewhisperer/ui/codeWhispererNodes'
+import { waitUntil } from '../../../shared/utilities/timeoutUtils'
+import { listCodeWhispererCommands } from '../../../codewhisperer/ui/statusBarMenu'
+import { CodeScanIssue, CodeScansState, CodeSuggestionsState, codeScanState } from '../../../codewhisperer/models/model'
+import { cwQuickPickSource } from '../../../codewhisperer/commands/types'
+import { refreshStatusBar } from '../../../codewhisperer/service/statusBar'
+import { focusAmazonQPanel } from '../../../codewhispererChat/commands/registerCommands'
+import * as diagnosticsProvider from '../../../codewhisperer/service/diagnosticsProvider'
+import { randomUUID } from '../../../shared/crypto'
+import { assertLogsContain } from '../../globalSetup.test'
+import * as securityIssueWebview from '../../../codewhisperer/views/securityIssue/securityIssueWebview'
+import { IssueItem, SecurityIssueTreeViewProvider } from '../../../codewhisperer/service/securityIssueTreeViewProvider'
+import { SecurityIssueProvider } from '../../../codewhisperer/service/securityIssueProvider'
+import { CodeWhispererSettings } from '../../../codewhisperer/util/codewhispererSettings'
+import { confirm } from '../../../shared'
+import * as commentUtils from '../../../shared/utilities/commentUtils'
+import * as extUtils from '../../../shared/extensionUtilities'
+
+describe('CodeWhisperer-basicCommands', function () {
+    let targetCommand: Command<any> & vscode.Disposable
+
+    before(async function () {
+        tryRegister(refreshStatusBar)
+    })
+
+    beforeEach(async function () {
+        await resetCodeWhispererGlobalVariables()
+    })
+
+    afterEach(function () {
+        targetCommand?.dispose()
+        sinon.restore()
+    })
+
+    after(async function () {
+        // disable auto scan after testrun
+        await CodeScansState.instance.setScansEnabled(false)
+        assert.strictEqual(CodeScansState.instance.isScansEnabled(), false)
+    })
+
+    describe('toggleCodeSuggestion', function () {
+        class TestCodeSuggestionsState extends CodeSuggestionsState {
+            public constructor(initialState?: boolean) {
+                super(initialState)
+            }
+        }
+
+        let codeSuggestionsState: CodeSuggestionsState
+
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+            codeSuggestionsState = new TestCodeSuggestionsState()
+        })
+
+        it('has suggestions enabled by default', async function () {
+            targetCommand = testCommand(toggleCodeSuggestions, codeSuggestionsState)
+            assert.strictEqual(codeSuggestionsState.isSuggestionsEnabled(), true)
+        })
+
+        it('toggles states as expected', async function () {
+            targetCommand = testCommand(toggleCodeSuggestions, codeSuggestionsState)
+            assert.strictEqual(codeSuggestionsState.isSuggestionsEnabled(), true)
+            await targetCommand.execute(placeholder, cwQuickPickSource)
+            assert.strictEqual(codeSuggestionsState.isSuggestionsEnabled(), false)
+            await targetCommand.execute(placeholder, cwQuickPickSource)
+            assert.strictEqual(codeSuggestionsState.isSuggestionsEnabled(), true)
+        })
+
+        it('setSuggestionsEnabled() works as expected', async function () {
+            // initially true
+            assert.strictEqual(codeSuggestionsState.isSuggestionsEnabled(), true)
+
+            // set new state to current state
+            await codeSuggestionsState.setSuggestionsEnabled(true)
+            assert.strictEqual(codeSuggestionsState.isSuggestionsEnabled(), true)
+
+            // set to opposite state
+            await codeSuggestionsState.setSuggestionsEnabled(false)
+            assert.strictEqual(codeSuggestionsState.isSuggestionsEnabled(), false)
+        })
+
+        it('triggers event listener when toggled', async function () {
+            const eventListener = sinon.stub()
+            codeSuggestionsState.onDidChangeState(() => {
+                eventListener()
+            })
+            assert.strictEqual(eventListener.callCount, 0)
+
+            targetCommand = testCommand(toggleCodeSuggestions, codeSuggestionsState)
+            await targetCommand.execute(placeholder, cwQuickPickSource)
+
+            await waitUntil(async () => eventListener.callCount === 1, { timeout: 1000, interval: 1 })
+            assert.strictEqual(eventListener.callCount, 1)
+        })
+
+        it('emits aws_modifySetting event on user toggling autoSuggestion - activate', async function () {
+            codeSuggestionsState = new TestCodeSuggestionsState(false)
+            assert.strictEqual(codeSuggestionsState.isSuggestionsEnabled(), false)
+
+            targetCommand = testCommand(toggleCodeSuggestions, codeSuggestionsState)
+            await targetCommand.execute(placeholder, cwQuickPickSource)
+
+            assert.strictEqual(codeSuggestionsState.isSuggestionsEnabled(), true)
+            assertTelemetryCurried('aws_modifySetting')({
+                settingId: CodeWhispererConstants.autoSuggestionConfig.settingId,
+                settingState: CodeWhispererConstants.autoSuggestionConfig.activated,
+            })
+        })
+
+        it('emits aws_modifySetting event on user toggling autoSuggestion -- deactivate', async function () {
+            targetCommand = testCommand(toggleCodeSuggestions, codeSuggestionsState)
+            await targetCommand.execute(placeholder, cwQuickPickSource)
+
+            assert.strictEqual(codeSuggestionsState.isSuggestionsEnabled(), false)
+            assertTelemetryCurried('aws_modifySetting')({
+                settingId: CodeWhispererConstants.autoSuggestionConfig.settingId,
+                settingState: CodeWhispererConstants.autoSuggestionConfig.deactivated,
+            })
+        })
+
+        it('includes the "source" in the command execution metric', async function () {
+            targetCommand = testCommand(toggleCodeSuggestions, codeSuggestionsState)
+            await targetCommand.execute(placeholder, cwQuickPickSource)
+            assertTelemetry('vscode_executeCommand', { source: cwQuickPickSource, command: targetCommand.id })
+        })
+    })
+
+    describe('toggleCodeScans', function () {
+        class TestCodeScansState extends CodeScansState {
+            public constructor(initialState?: boolean) {
+                super(initialState)
+            }
+        }
+
+        let codeScansState: CodeScansState
+
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+            codeScansState = new TestCodeScansState()
+        })
+
+        it('has auto scans disabled by default', async function () {
+            targetCommand = testCommand(toggleCodeScans, codeScansState)
+            assert.strictEqual(codeScansState.isScansEnabled(), false)
+        })
+
+        it('toggles states as expected', async function () {
+            targetCommand = testCommand(toggleCodeScans, codeScansState)
+            assert.strictEqual(codeScansState.isScansEnabled(), false)
+            await targetCommand.execute(placeholder, cwQuickPickSource)
+            assert.strictEqual(codeScansState.isScansEnabled(), true)
+            await targetCommand.execute(placeholder, cwQuickPickSource)
+            assert.strictEqual(codeScansState.isScansEnabled(), false)
+            await targetCommand.execute(placeholder, cwQuickPickSource)
+            assert.strictEqual(codeScansState.isScansEnabled(), true)
+        })
+
+        it('setScansEnabled() works as expected', async function () {
+            // initially false
+            assert.strictEqual(codeScansState.isScansEnabled(), false)
+
+            await codeScansState.setScansEnabled(true)
+            assert.strictEqual(codeScansState.isScansEnabled(), true)
+
+            // set new state to current state
+            await codeScansState.setScansEnabled(true)
+            assert.strictEqual(codeScansState.isScansEnabled(), true)
+
+            // set to opposite state
+            await codeScansState.setScansEnabled(false)
+            assert.strictEqual(codeScansState.isScansEnabled(), false)
+        })
+
+        it('triggers event listener when toggled', async function () {
+            const eventListener = sinon.stub()
+            codeScansState.onDidChangeState(() => {
+                eventListener()
+            })
+            assert.strictEqual(eventListener.callCount, 0)
+
+            targetCommand = testCommand(toggleCodeScans, codeScansState)
+            await targetCommand.execute(placeholder, cwQuickPickSource)
+
+            await waitUntil(async () => eventListener.callCount === 1, { timeout: 1000, interval: 1 })
+            assert.strictEqual(eventListener.callCount, 1)
+        })
+
+        it('emits aws_modifySetting event on user toggling autoScans - activate', async function () {
+            targetCommand = testCommand(toggleCodeScans, codeScansState)
+            await targetCommand.execute(placeholder, cwQuickPickSource)
+
+            assert.strictEqual(codeScansState.isScansEnabled(), true)
+            assertTelemetryCurried('aws_modifySetting')({
+                settingId: CodeWhispererConstants.autoScansConfig.settingId,
+                settingState: CodeWhispererConstants.autoScansConfig.activated,
+            })
+        })
+
+        it('emits aws_modifySetting event on user toggling autoScans -- deactivate', async function () {
+            codeScansState = new TestCodeScansState(true)
+            assert.strictEqual(codeScansState.isScansEnabled(), true)
+
+            targetCommand = testCommand(toggleCodeScans, codeScansState)
+            await targetCommand.execute(placeholder, cwQuickPickSource)
+
+            assert.strictEqual(codeScansState.isScansEnabled(), false)
+            assertTelemetryCurried('aws_modifySetting')({
+                settingId: CodeWhispererConstants.autoScansConfig.settingId,
+                settingState: CodeWhispererConstants.autoScansConfig.deactivated,
+            })
+        })
+
+        it('includes the "source" in the command execution metric', async function () {
+            targetCommand = testCommand(toggleCodeScans, codeScansState)
+            await targetCommand.execute(placeholder, cwQuickPickSource)
+            assertTelemetry('vscode_executeCommand', { source: cwQuickPickSource, command: targetCommand.id })
+        })
+    })
+
+    describe('showSecurityScan', function () {
+        let mockExtensionContext: vscode.ExtensionContext
+        let mockSecurityPanelViewProvider: SecurityPanelViewProvider
+        let mockClient: DefaultCodeWhispererClient
+        let mockExtContext: ExtContext
+
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+            mockExtensionContext = await FakeExtensionContext.create()
+            mockSecurityPanelViewProvider = new SecurityPanelViewProvider(mockExtensionContext)
+            mockClient = stub(DefaultCodeWhispererClient)
+            mockExtContext = await FakeExtensionContext.getFakeExtContext()
+        })
+
+        afterEach(function () {
+            targetCommand?.dispose()
+            sinon.restore()
+            codeScanState.setToNotStarted()
+        })
+
+        it('prompts user to reauthenticate if connection is expired', async function () {
+            targetCommand = testCommand(showSecurityScan, mockExtContext, mockSecurityPanelViewProvider, mockClient)
+
+            sinon.stub(AuthUtil.instance, 'isConnectionExpired').returns(true)
+            const spy = sinon.stub(AuthUtil.instance, 'showReauthenticatePrompt')
+
+            await targetCommand.execute(placeholder, cwQuickPickSource)
+            assert.ok(spy.called)
+        })
+
+        it('includes the "source" in the command execution metric', async function () {
+            targetCommand = testCommand(showSecurityScan, mockExtContext, mockSecurityPanelViewProvider, mockClient)
+            await targetCommand.execute(placeholder, cwQuickPickSource)
+            assertTelemetry('vscode_executeCommand', { source: cwQuickPickSource, command: targetCommand.id })
+        })
+    })
+
+    describe('showFileScan', function () {
+        let mockExtensionContext: vscode.ExtensionContext
+        let mockSecurityPanelViewProvider: SecurityPanelViewProvider
+        let mockClient: DefaultCodeWhispererClient
+        let mockExtContext: ExtContext
+
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+            mockExtensionContext = await FakeExtensionContext.create()
+            mockSecurityPanelViewProvider = new SecurityPanelViewProvider(mockExtensionContext)
+            mockClient = stub(DefaultCodeWhispererClient)
+            mockExtContext = await FakeExtensionContext.getFakeExtContext()
+        })
+
+        afterEach(function () {
+            targetCommand?.dispose()
+            sinon.restore()
+            codeScanState.setToNotStarted()
+        })
+
+        it('prompts user to reauthenticate if connection is expired', async function () {
+            targetCommand = testCommand(showFileScan, mockExtContext, mockSecurityPanelViewProvider, mockClient)
+
+            sinon.stub(AuthUtil.instance, 'isConnectionExpired').returns(true)
+            const spy = sinon.stub(AuthUtil.instance, 'showReauthenticatePrompt')
+
+            await targetCommand.execute(placeholder, cwQuickPickSource)
+            assert.ok(spy.called)
+        })
+
+        it('includes the "source" in the command execution metric', async function () {
+            targetCommand = testCommand(showFileScan, mockExtContext, mockSecurityPanelViewProvider, mockClient)
+            await targetCommand.execute(placeholder, cwQuickPickSource)
+            assertTelemetry('vscode_executeCommand', { source: cwQuickPickSource, command: targetCommand.id })
+        })
+    })
+
+    describe('showReferenceLog', function () {
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+        })
+
+        afterEach(function () {
+            targetCommand?.dispose()
+            sinon.restore()
+        })
+
+        it('includes the "source" in the command execution metric', async function () {
+            targetCommand = testCommand(showReferenceLog)
+            await targetCommand.execute(placeholder, cwQuickPickSource)
+            assertTelemetry('vscode_executeCommand', { source: cwQuickPickSource, command: targetCommand.id })
+        })
+    })
+
+    describe('selectCustomizationPrompt', function () {
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+        })
+
+        afterEach(function () {
+            targetCommand?.dispose()
+            sinon.restore()
+        })
+
+        it('includes the "source" in the command execution metric', async function () {
+            targetCommand = testCommand(selectCustomizationPrompt)
+            await targetCommand.execute(placeholder, cwQuickPickSource)
+            assertTelemetry('vscode_executeCommand', { source: cwQuickPickSource, command: targetCommand.id })
+        })
+    })
+
+    describe('reconnect', function () {
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+        })
+
+        afterEach(function () {
+            targetCommand?.dispose()
+            sinon.restore()
+        })
+
+        it('includes the "source" in the command execution metric', async function () {
+            sinon.stub(AuthUtil.instance, 'reauthenticate')
+            targetCommand = testCommand(reconnect)
+            await targetCommand.execute(placeholder, cwQuickPickSource)
+            assertTelemetry('vscode_executeCommand', { source: cwQuickPickSource, command: targetCommand.id })
+        })
+    })
+
+    describe('signoutCodeWhisperer', function () {
+        beforeEach(async function () {
+            await resetCodeWhispererGlobalVariables()
+        })
+
+        afterEach(function () {
+            targetCommand?.dispose()
+            sinon.restore()
+        })
+
+        it('includes the "source" in the command execution metric', async function () {
+            tryRegister(focusAmazonQPanel)
+            sinon.stub(AuthUtil.instance.secondaryAuth, 'deleteConnection')
+            targetCommand = testCommand(signoutCodeWhisperer, AuthUtil.instance)
+            await targetCommand.execute(placeholder, cwQuickPickSource)
+            assertTelemetry('vscode_executeCommand', [
+                { source: cwQuickPickSource, command: focusAmazonQPanel.id },
+                { source: cwQuickPickSource, command: targetCommand.id },
+            ])
+        })
+    })
+
+    describe('listCodeWhispererCommands()', function () {
+        function genericItems() {
+            return [createFeedbackNode(), createGitHubNode(), createDocumentationNode()]
+        }
+
+        before(async function () {
+            tryRegister(listCodeWhispererCommands)
+        })
+
+        it('shows expected items when not connected', async function () {
+            sinon.stub(AuthUtil.instance, 'isConnectionExpired').returns(false)
+            sinon.stub(AuthUtil.instance, 'isConnected').returns(false)
+
+            getTestWindow().onDidShowQuickPick((e) => {
+                e.assertContainsItems(createSignIn(), createLearnMore(), ...genericItems())
+                e.dispose() // skip needing to select an item to continue
+            })
+
+            await listCodeWhispererCommands.execute()
+        })
+
+        it('shows expected items when connection is expired', async function () {
+            sinon.stub(AuthUtil.instance, 'isConnectionExpired').returns(true)
+            sinon.stub(AuthUtil.instance, 'isConnected').returns(true)
+
+            getTestWindow().onDidShowQuickPick((e) => {
+                e.assertContainsItems(createReconnect(), createLearnMore(), ...genericItems(), createSignout())
+                e.dispose() // skip needing to select an item to continue
+            })
+
+            await listCodeWhispererCommands.execute()
+        })
+
+        it('shows expected quick pick items when connected', async function () {
+            sinon.stub(AuthUtil.instance, 'isConnectionExpired').returns(false)
+            sinon.stub(AuthUtil.instance, 'isConnected').returns(true)
+            await CodeScansState.instance.setScansEnabled(false)
+            getTestWindow().onDidShowQuickPick((e) => {
+                e.assertContainsItems(
+                    createAutoSuggestions(true),
+                    createOpenReferenceLog(),
+                    createGettingStarted(),
+                    createAutoScans(false),
+                    switchToAmazonQNode(),
+                    ...genericItems(),
+                    createSettingsNode(),
+                    createSignout()
+                )
+                e.dispose() // skip needing to select an item to continue
+            })
+            await listCodeWhispererCommands.execute()
+        })
+
+        it('also shows customizations when connected to valid sso', async function () {
+            sinon.stub(AuthUtil.instance, 'isConnectionExpired').returns(false)
+            sinon.stub(AuthUtil.instance, 'isConnected').returns(true)
+            sinon.stub(AuthUtil.instance, 'isValidEnterpriseSsoInUse').returns(true)
+            sinon.stub(AuthUtil.instance, 'isCustomizationFeatureEnabled').value(true)
+            await CodeScansState.instance.setScansEnabled(false)
+
+            getTestWindow().onDidShowQuickPick(async (e) => {
+                e.assertContainsItems(
+                    createAutoSuggestions(true),
+                    createOpenReferenceLog(),
+                    createGettingStarted(),
+                    createAutoScans(false),
+                    createSelectCustomization(),
+                    switchToAmazonQNode(),
+                    ...genericItems(),
+                    createSettingsNode(),
+                    createSignout()
+                )
+                e.dispose() // skip needing to select an item to continue
+            })
+
+            await listCodeWhispererCommands.execute()
+        })
+
+        it('should not show auto-scans if using builder id', async function () {
+            sinon.stub(AuthUtil.instance, 'isConnected').returns(true)
+            sinon.stub(AuthUtil.instance, 'isBuilderIdInUse').returns(true)
+
+            getTestWindow().onDidShowQuickPick(async (e) => {
+                e.assertItems([
+                    createSeparator('Inline Suggestions'),
+                    createAutoSuggestions(true),
+                    createOpenReferenceLog(),
+                    createGettingStarted(),
+                    createSeparator('Code Reviews'),
+                    createSeparator('Other Features'),
+                    switchToAmazonQNode(),
+                    createSeparator('Connect / Help'),
+                    ...genericItems(),
+                    createSeparator(),
+                    createSettingsNode(),
+                    createManageSubscription(),
+                    createSignout(),
+                ])
+                e.dispose() // skip needing to select an item to continue
+            })
+            await listCodeWhispererCommands.execute()
+        })
+
+        it('includes sign out when connected and not in SageMaker', async function () {
+            sinon.stub(AuthUtil.instance, 'isConnected').returns(true)
+            sinon.stub(AuthUtil.instance, 'isConnectionExpired').returns(false)
+            sinon.stub(extUtils, 'isSageMaker').value(false)
+            await CodeScansState.instance.setScansEnabled(false)
+
+            getTestWindow().onDidShowQuickPick((e) => {
+                e.assertContainsItems(
+                    createAutoSuggestions(true),
+                    createOpenReferenceLog(),
+                    createGettingStarted(),
+                    createAutoScans(false),
+                    switchToAmazonQNode(),
+                    ...genericItems(),
+                    createSettingsNode(),
+                    createManageSubscription(),
+                    createSignout()
+                )
+                e.dispose()
+            })
+
+            await listCodeWhispererCommands.execute()
+        })
+
+        it('shows expected items when connection is expired and in SageMaker', async function () {
+            sinon.stub(AuthUtil.instance, 'isConnected').returns(true)
+            sinon.stub(AuthUtil.instance, 'isConnectionExpired').returns(true)
+            sinon.stub(extUtils, 'isSageMaker').value(true)
+
+            getTestWindow().onDidShowQuickPick((e) => {
+                e.assertContainsItems(createReconnect(), createLearnMore(), ...genericItems())
+                e.dispose()
+            })
+
+            await listCodeWhispererCommands.execute()
+        })
+    })
+
+    describe('applySecurityFix', function () {
+        let sandbox: sinon.SinonSandbox
+        let openTextDocumentMock: sinon.SinonStub
+        let replaceMock: sinon.SinonStub
+        let applyEditMock: sinon.SinonStub
+        let removeDiagnosticMock: sinon.SinonStub
+        let removeIssueMock: sinon.SinonStub
+        let codeScanIssue: CodeScanIssue
+        let showTextDocumentMock: sinon.SinonStub
+
+        beforeEach(function () {
+            sandbox = sinon.createSandbox()
+            openTextDocumentMock = sinon.stub()
+            replaceMock = sinon.stub()
+            applyEditMock = sinon.stub()
+            removeDiagnosticMock = sinon.stub()
+            removeIssueMock = sinon.stub()
+            codeScanIssue = createCodeScanIssue({
+                findingId: randomUUID(),
+            })
+            showTextDocumentMock = sinon.stub()
+        })
+
+        afterEach(function () {
+            sandbox.restore()
+        })
+
+        it('should call applySecurityFix command successfully', async function () {
+            const fileName = 'sample.py'
+            const textDocumentMock = createMockDocument('first line\n second line\n fourth line', fileName)
+
+            openTextDocumentMock.resolves(textDocumentMock)
+            sandbox.stub(vscode.workspace, 'openTextDocument').value(openTextDocumentMock)
+
+            sandbox.stub(vscode.WorkspaceEdit.prototype, 'replace').value(replaceMock)
+            applyEditMock.resolves(true)
+            sandbox.stub(vscode.workspace, 'applyEdit').value(applyEditMock)
+            sandbox.stub(diagnosticsProvider, 'removeDiagnostic').value(removeDiagnosticMock)
+            sandbox.stub(SecurityIssueProvider.instance, 'removeIssue').value(removeIssueMock)
+            sandbox.stub(vscode.window, 'showTextDocument').value(showTextDocumentMock)
+
+            targetCommand = testCommand(applySecurityFix)
+            codeScanIssue.suggestedFixes = [
+                {
+                    description: 'fix',
+                    code: '@@ -1,3 +1,3 @@\n first line\n- second line\n+ third line\n  fourth line',
+                },
+            ]
+            await targetCommand.execute(codeScanIssue, fileName, 'hover')
+            assert.ok(
+                replaceMock.calledOnceWith(
+                    textDocumentMock.uri,
+                    new vscode.Range(0, 0, 2, 12),
+                    'first line\n third line\n fourth line'
+                )
+            )
+            assert.ok(applyEditMock.calledOnce)
+            assert.ok(removeDiagnosticMock.calledOnceWith(textDocumentMock.uri, codeScanIssue))
+            assert.ok(removeIssueMock.calledOnce)
+
+            assertTelemetry('codewhisperer_codeScanIssueApplyFix', {
+                detectorId: codeScanIssue.detectorId,
+                findingId: codeScanIssue.findingId,
+                component: 'hover',
+                result: 'Succeeded',
+            })
+        })
+
+        it('handles patch failure', async function () {
+            const textDocumentMock = createMockDocument('first line\nsecond line\nthird line\nfourth line\nfifth line')
+
+            openTextDocumentMock.resolves(textDocumentMock)
+
+            sandbox.stub(vscode.workspace, 'openTextDocument').value(openTextDocumentMock)
+
+            targetCommand = testCommand(applySecurityFix)
+            codeScanIssue.suggestedFixes = [
+                {
+                    code: "@@ -3,1 +3,1 @@\n fix\n that\n-doesn't\n+match\n the\n document",
+                    description: 'dummy',
+                },
+            ]
+            await targetCommand.execute(codeScanIssue, 'test.py', 'webview')
+
+            assert.strictEqual(getTestWindow().shownMessages[0].message, 'Failed to apply suggested code fix.')
+            assertTelemetry('codewhisperer_codeScanIssueApplyFix', {
+                detectorId: codeScanIssue.detectorId,
+                findingId: codeScanIssue.findingId,
+                component: 'webview',
+                result: 'Failed',
+                reason: 'Error',
+                reasonDesc: 'Failed to get updated content from applying diff patch',
+            })
+        })
+
+        it('should allow up to 4 differing lines', async function () {
+            const textDocumentMock = createMockDocument('first line\nsecond line\nthird line\nfourth line\nfifth line')
+            openTextDocumentMock.resolves(textDocumentMock)
+            sandbox.stub(vscode.workspace, 'openTextDocument').value(openTextDocumentMock)
+            sandbox.stub(vscode.WorkspaceEdit.prototype, 'replace').value(replaceMock)
+            applyEditMock.resolves(true)
+            sandbox.stub(vscode.workspace, 'applyEdit').value(applyEditMock)
+            sandbox.stub(diagnosticsProvider, 'removeDiagnostic').value(removeDiagnosticMock)
+            sandbox.stub(SecurityIssueProvider.instance, 'removeIssue').value(removeIssueMock)
+            sandbox.stub(vscode.window, 'showTextDocument').value(showTextDocumentMock)
+
+            targetCommand = testCommand(applySecurityFix)
+            codeScanIssue.suggestedFixes = [
+                {
+                    code: '@@ -1,1 +1,1 @@\n first line\n changed\n-third line\n+changed\n foobar\n fifth line',
+                    description: 'dummy',
+                },
+            ]
+            await targetCommand.execute(codeScanIssue, 'test.py', 'webview')
+            assertTelemetry('codewhisperer_codeScanIssueApplyFix', {
+                result: 'Succeeded',
+            })
+        })
+
+        it('handles apply edit failure', async function () {
+            const fileName = 'sample.py'
+            const textDocumentMock = createMockDocument('first line\n second line\n fourth line', fileName)
+
+            openTextDocumentMock.resolves(textDocumentMock)
+
+            sandbox.stub(vscode.workspace, 'openTextDocument').value(openTextDocumentMock)
+
+            sinon.stub(vscode.WorkspaceEdit.prototype, 'replace').value(replaceMock)
+            applyEditMock.resolves(false)
+            sinon.stub(vscode.workspace, 'applyEdit').value(applyEditMock)
+
+            targetCommand = testCommand(applySecurityFix)
+            codeScanIssue.suggestedFixes = [
+                {
+                    description: 'fix',
+                    code: '@@ -1,3 +1,3 @@\n first line\n- second line\n+ third line\n  fourth line',
+                },
+            ]
+            await targetCommand.execute(codeScanIssue, fileName, 'quickfix')
+
+            assert.ok(replaceMock.calledOnce)
+            assertLogsContain('Apply fix command failed. Error: Failed to apply edit to the workspace.', true, 'error')
+            assertTelemetry('codewhisperer_codeScanIssueApplyFix', {
+                detectorId: codeScanIssue.detectorId,
+                findingId: codeScanIssue.findingId,
+                component: 'quickfix',
+                result: 'Failed',
+                reason: 'Error',
+                reasonDesc: 'Failed to apply edit to the workspace.',
+            })
+        })
+
+        it('should apply the edit at the correct range', async function () {
+            const fileName = 'sample.py'
+            const textDocumentMock = createMockDocument(
+                `from flask import app
+
+
+@app.route('/')
+def execute_input_noncompliant():
+    from flask import request
+    module_version = request.args.get("module_version")
+    # Noncompliant: executes unsanitized inputs.
+    exec("import urllib%s as urllib" % module_version)
+# {/fact}
+
+
+# {fact rule=code-injection@v1.0 defects=0}
+from flask import app
+
+
+@app.route('/')
+def execute_input_compliant():
+    from flask import request
+    module_version = request.args.get("module_version")
+    # Compliant: executes sanitized inputs.
+    exec("import urllib%d as urllib" % int(module_version))
+# {/fact}`,
+                fileName
+            )
+            openTextDocumentMock.resolves(textDocumentMock)
+            sandbox.stub(vscode.workspace, 'openTextDocument').value(openTextDocumentMock)
+
+            sandbox.stub(vscode.WorkspaceEdit.prototype, 'replace').value(replaceMock)
+            applyEditMock.resolves(true)
+            sandbox.stub(vscode.workspace, 'applyEdit').value(applyEditMock)
+            sandbox.stub(diagnosticsProvider, 'removeDiagnostic').value(removeDiagnosticMock)
+            sandbox.stub(SecurityIssueProvider.instance, 'removeIssue').value(removeIssueMock)
+            sandbox.stub(vscode.window, 'showTextDocument').value(showTextDocumentMock)
+
+            targetCommand = testCommand(applySecurityFix)
+            codeScanIssue.suggestedFixes = [
+                {
+                    code: `@@ -6,4 +6,5 @@
+     from flask import request
+     module_version = request.args.get("module_version")
+     # Noncompliant: executes unsanitized inputs.
+-    exec("import urllib%d as urllib" % int(module_version))
++    __import__("urllib" + module_version)
++#import importlib`,
+                    description: 'dummy',
+                },
+            ]
+            await targetCommand.execute(codeScanIssue, fileName, 'webview')
+            assert.ok(
+                replaceMock.calledOnceWith(
+                    textDocumentMock.uri,
+                    new vscode.Range(5, 0, 8, 54),
+                    `    from flask import request
+    module_version = request.args.get("module_version")
+    # Noncompliant: executes unsanitized inputs.
+    __import__("urllib" + module_version)
+#import importlib`
+                )
+            )
+            assert.ok(applyEditMock.calledOnce)
+            assert.ok(removeDiagnosticMock.calledOnceWith(textDocumentMock.uri, codeScanIssue))
+            assert.ok(removeIssueMock.calledOnce)
+
+            assertTelemetry('codewhisperer_codeScanIssueApplyFix', {
+                detectorId: codeScanIssue.detectorId,
+                findingId: codeScanIssue.findingId,
+                component: 'webview',
+                result: 'Succeeded',
+            })
+        })
+    })
+
+    // TODO: Add integ test for generateTest
+
+    describe('rejectFix', function () {
+        let mockExtensionContext: vscode.ExtensionContext
+        let sandbox: sinon.SinonSandbox
+        let filePath: string
+        let codeScanIssue: CodeScanIssue
+        let issueItem: IssueItem
+        let updateSecurityIssueWebviewMock: sinon.SinonStub
+        let updateIssueMock: sinon.SinonStub
+        let refreshTreeViewMock: sinon.SinonStub
+
+        beforeEach(async function () {
+            sandbox = sinon.createSandbox()
+            filePath = 'dummy/file.py'
+            codeScanIssue = createCodeScanIssue({
+                findingId: randomUUID(),
+                suggestedFixes: [{ code: 'diff', description: 'description' }],
+            })
+            issueItem = new IssueItem(filePath, codeScanIssue)
+            updateSecurityIssueWebviewMock = sinon.stub()
+            updateIssueMock = sinon.stub()
+            refreshTreeViewMock = sinon.stub()
+            mockExtensionContext = await FakeExtensionContext.create()
+        })
+
+        afterEach(function () {
+            sandbox.restore()
+        })
+
+        it('should call rejectFix command successfully', async function () {
+            sinon.stub(securityIssueWebview, 'updateSecurityIssueWebview').value(updateSecurityIssueWebviewMock)
+            sinon.stub(SecurityIssueProvider.instance, 'updateIssue').value(updateIssueMock)
+            sinon.stub(SecurityIssueTreeViewProvider.instance, 'refresh').value(refreshTreeViewMock)
+            targetCommand = testCommand(rejectFix, mockExtensionContext)
+            await targetCommand.execute(codeScanIssue, filePath)
+
+            const expectedUpdatedIssue = { ...codeScanIssue, suggestedFixes: [] }
+            assert.ok(updateIssueMock.calledWith(expectedUpdatedIssue, filePath))
+            assert.ok(refreshTreeViewMock.calledOnce)
+        })
+
+        it('should call rejectFix from tree view item', async function () {
+            sinon.stub(securityIssueWebview, 'updateSecurityIssueWebview').value(updateSecurityIssueWebviewMock)
+            sinon.stub(SecurityIssueProvider.instance, 'updateIssue').value(updateIssueMock)
+            sinon.stub(SecurityIssueTreeViewProvider.instance, 'refresh').value(refreshTreeViewMock)
+            targetCommand = testCommand(rejectFix, mockExtensionContext)
+            await targetCommand.execute(issueItem, filePath)
+
+            const expectedUpdatedIssue = { ...codeScanIssue, suggestedFixes: [] }
+            assert.ok(updateIssueMock.calledWith(expectedUpdatedIssue, filePath))
+            assert.ok(refreshTreeViewMock.calledOnce)
+        })
+    })
+
+    describe('ignoreAllIssues', function () {
+        let sandbox: sinon.SinonSandbox
+        let codeScanIssue: CodeScanIssue
+        let issueItem: IssueItem
+        let addToIgnoredSecurityIssuesListMock: sinon.SinonStub
+        let closeSecurityIssueWebviewMock: sinon.SinonStub
+
+        beforeEach(function () {
+            sandbox = sinon.createSandbox()
+            codeScanIssue = createCodeScanIssue()
+            issueItem = new IssueItem('dummy/file.py', codeScanIssue)
+            addToIgnoredSecurityIssuesListMock = sinon.stub()
+            closeSecurityIssueWebviewMock = sinon.stub()
+        })
+
+        afterEach(function () {
+            sandbox.restore()
+        })
+
+        it('should call ignoreAllIssues command successfully', async function () {
+            sinon
+                .stub(CodeWhispererSettings.instance, 'addToIgnoredSecurityIssuesList')
+                .value(addToIgnoredSecurityIssuesListMock)
+            sinon.stub(securityIssueWebview, 'closeSecurityIssueWebview').value(closeSecurityIssueWebviewMock)
+            targetCommand = testCommand(ignoreAllIssues)
+            getTestWindow().onDidShowMessage((m) => {
+                if (m.message === CodeWhispererConstants.ignoreAllIssuesMessage(codeScanIssue.title)) {
+                    m.selectItem(confirm)
+                }
+            })
+            await targetCommand.execute(codeScanIssue, 'webview')
+
+            assert.ok(addToIgnoredSecurityIssuesListMock.calledWith(codeScanIssue.title))
+            assert.ok(closeSecurityIssueWebviewMock.calledOnce)
+
+            assertTelemetry('codewhisperer_codeScanIssueIgnore', {
+                component: 'webview',
+                detectorId: codeScanIssue.detectorId,
+                findingId: codeScanIssue.findingId,
+                ruleId: codeScanIssue.ruleId,
+                variant: 'all',
+                result: 'Succeeded',
+            })
+        })
+
+        it('should call ignoreAllIssues from tree view item', async function () {
+            sinon
+                .stub(CodeWhispererSettings.instance, 'addToIgnoredSecurityIssuesList')
+                .value(addToIgnoredSecurityIssuesListMock)
+            targetCommand = testCommand(ignoreAllIssues)
+            getTestWindow().onDidShowMessage((m) => {
+                if (m.message === CodeWhispererConstants.ignoreAllIssuesMessage(codeScanIssue.title)) {
+                    m.selectItem(confirm)
+                }
+            })
+            await targetCommand.execute(issueItem)
+
+            assert.ok(addToIgnoredSecurityIssuesListMock.calledWith(codeScanIssue.title))
+
+            assertTelemetry('codewhisperer_codeScanIssueIgnore', {
+                component: 'tree',
+                detectorId: codeScanIssue.detectorId,
+                findingId: codeScanIssue.findingId,
+                ruleId: codeScanIssue.ruleId,
+                variant: 'all',
+                result: 'Succeeded',
+            })
+        })
+    })
+
+    describe('ignoreIssue', function () {
+        let sandbox: sinon.SinonSandbox
+        let codeScanIssue: CodeScanIssue
+        let issueItem: IssueItem
+        let mockDocument: vscode.TextDocument
+        let insertCommentMock: sinon.SinonStub
+        let showTextDocumentMock: sinon.SinonStub
+
+        beforeEach(function () {
+            sandbox = sinon.createSandbox()
+            codeScanIssue = createCodeScanIssue()
+            issueItem = new IssueItem('dummy/file.py', codeScanIssue)
+            mockDocument = createMockDocument()
+            insertCommentMock = sinon.stub()
+            showTextDocumentMock = sinon.stub()
+        })
+
+        afterEach(function () {
+            sandbox.restore()
+        })
+
+        it('should call ignoreIssue command successfully', async function () {
+            sinon.stub(vscode.workspace, 'openTextDocument').resolves(mockDocument)
+            sinon.stub(commentUtils, 'insertCommentAboveLine').value(insertCommentMock)
+            sinon.stub(vscode.window, 'showTextDocument').value(showTextDocumentMock)
+            targetCommand = testCommand(ignoreIssue)
+            await targetCommand.execute(codeScanIssue, 'filepath', 'webview')
+
+            assert.ok(
+                insertCommentMock.calledOnceWith(
+                    mockDocument,
+                    codeScanIssue.startLine,
+                    CodeWhispererConstants.amazonqIgnoreNextLine
+                )
+            )
+
+            assertTelemetry('codewhisperer_codeScanIssueIgnore', {
+                component: 'webview',
+                detectorId: codeScanIssue.detectorId,
+                findingId: codeScanIssue.findingId,
+                ruleId: codeScanIssue.ruleId,
+                result: 'Succeeded',
+            })
+        })
+
+        it('should call ignoreIssue from tree view item', async function () {
+            sinon.stub(vscode.workspace, 'openTextDocument').resolves(mockDocument)
+            sinon.stub(commentUtils, 'insertCommentAboveLine').value(insertCommentMock)
+            sinon.stub(vscode.window, 'showTextDocument').value(showTextDocumentMock)
+            targetCommand = testCommand(ignoreIssue)
+            await targetCommand.execute(issueItem)
+
+            assert.ok(
+                insertCommentMock.calledOnceWith(
+                    mockDocument,
+                    codeScanIssue.startLine,
+                    CodeWhispererConstants.amazonqIgnoreNextLine
+                )
+            )
+
+            assertTelemetry('codewhisperer_codeScanIssueIgnore', {
+                component: 'tree',
+                detectorId: codeScanIssue.detectorId,
+                findingId: codeScanIssue.findingId,
+                ruleId: codeScanIssue.ruleId,
+                result: 'Succeeded',
+            })
+        })
+    })
+})
diff --git a/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts b/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts
new file mode 100644
index 00000000000..f3ae2fbceff
--- /dev/null
+++ b/packages/core/src/test/codewhisperer/commands/transformByQ.test.ts
@@ -0,0 +1,729 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert, { fail } from 'assert'
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import { DB, JDKVersion, transformByQState, TransformByQStoppedError } from '../../../codewhisperer/models/model'
+import { stopTransformByQ, finalizeTransformationJob } from '../../../codewhisperer/commands/startTransformByQ'
+import { HttpResponse } from 'aws-sdk'
+import * as codeWhisperer from '../../../codewhisperer/client/codewhisperer'
+import * as CodeWhispererConstants from '../../../codewhisperer/models/constants'
+import path from 'path'
+import AdmZip from 'adm-zip'
+import { createTestWorkspaceFolder, TestFolder, toFile } from '../../testUtil'
+import {
+    NoJavaProjectsFoundError,
+    NoMavenJavaProjectsFoundError,
+    NoOpenProjectsError,
+} from '../../../amazonqGumby/errors'
+import {
+    stopJob,
+    pollTransformationJob,
+    getHeadersObj,
+    throwIfCancelled,
+    updateJobHistory,
+    zipCode,
+    getTableMapping,
+    getFilesRecursively,
+    getJobStatisticsHtml,
+} from '../../../codewhisperer/service/transformByQ/transformApiHandler'
+import {
+    validateOpenProjects,
+    getOpenProjects,
+} from '../../../codewhisperer/service/transformByQ/transformProjectValidationHandler'
+import { TransformationCandidateProject, ZipManifest } from '../../../codewhisperer/models/model'
+import globals from '../../../shared/extensionGlobals'
+import { env, fs } from '../../../shared'
+import { convertDateToTimestamp, convertToTimeString } from '../../../shared/datetime'
+import {
+    setMaven,
+    parseBuildFile,
+    validateSQLMetadataFile,
+    createLocalBuildUploadZip,
+    validateCustomVersionsFile,
+    extractOriginalProjectSources,
+} from '../../../codewhisperer/service/transformByQ/transformFileHandler'
+import { uploadArtifactToS3 } from '../../../codewhisperer/indexNode'
+import request from '../../../shared/request'
+import * as nodefs from 'fs' // eslint-disable-line no-restricted-imports
+
+describe('transformByQ', function () {
+    let fetchStub: sinon.SinonStub
+    let tempDir: string
+    const validCustomVersionsFile = `name: "dependency-upgrade"
+description: "Custom dependency version management for Java migration from JDK 8/11/17 to JDK 17/21"
+dependencyManagement:
+  dependencies:
+    - identifier: "com.example:library1"
+      targetVersion: "2.1.0"
+      versionProperty: "library1.version"  # Optional
+      originType: "FIRST_PARTY" # or "THIRD_PARTY"
+    - identifier: "com.example:library2"
+      targetVersion: "3.0.0"
+      originType: "THIRD_PARTY"
+  plugins:
+    - identifier: "plugin.id"
+      targetVersion: "1.2.0"
+      versionProperty: "plugin.version"  # Optional
+      originType: "FIRST_PARTY" # or "THIRD_PARTY"`
+
+    const validSctFile = `<?xml version="1.0" encoding="UTF-8"?>
+    <tree>
+    <instances>
+        <ProjectModel>
+        <entities>
+            <sources>
+            <DbServer vendor="oracle" name="sample.rds.amazonaws.com">
+            </DbServer>
+            </sources>
+            <targets>
+            <DbServer vendor="aurora_postgresql" />
+            </targets>
+        </entities>
+        <relations>
+            <server-node-location>
+            <FullNameNodeInfoList>
+                <nameParts>
+                <FullNameNodeInfo typeNode="schema" nameNode="schema1"/>
+                <FullNameNodeInfo typeNode="table" nameNode="table1"/>
+                </nameParts>
+            </FullNameNodeInfoList>
+            </server-node-location>
+            <server-node-location>
+            <FullNameNodeInfoList>
+                <nameParts>
+                <FullNameNodeInfo typeNode="schema" nameNode="schema2"/>
+                <FullNameNodeInfo typeNode="table" nameNode="table2"/>
+                </nameParts>
+            </FullNameNodeInfoList>
+            </server-node-location>
+            <server-node-location>
+            <FullNameNodeInfoList>
+                <nameParts>
+                <FullNameNodeInfo typeNode="schema" nameNode="schema3"/>
+                <FullNameNodeInfo typeNode="table" nameNode="table3"/>
+                </nameParts>
+            </FullNameNodeInfoList>
+            </server-node-location>
+        </relations>
+        </ProjectModel>
+    </instances>
+    </tree>`
+
+    beforeEach(async function () {
+        tempDir = (await TestFolder.create()).path
+        transformByQState.setToNotStarted()
+        fetchStub = sinon.stub(request, 'fetch')
+        // use Partial to avoid having to mock all 25 fields in the response; only care about 'size'
+        const mockStats: Partial<nodefs.Stats> = { size: 1000 }
+        sinon.stub(nodefs.promises, 'stat').resolves(mockStats as nodefs.Stats)
+    })
+
+    afterEach(async function () {
+        fetchStub.restore()
+        sinon.restore()
+        await fs.delete(tempDir, { recursive: true })
+    })
+
+    it('WHEN converting short duration in milliseconds THEN converts correctly', async function () {
+        const durationTimeString = convertToTimeString(10 * 1000)
+        assert.strictEqual(durationTimeString, '10 sec')
+    })
+
+    it('WHEN converting medium duration in milliseconds THEN converts correctly', async function () {
+        const durationTimeString = convertToTimeString(65 * 1000)
+        assert.strictEqual(durationTimeString, '1 min 5 sec')
+    })
+
+    it('WHEN converting long duration in milliseconds THEN converts correctly', async function () {
+        const durationTimeString = convertToTimeString(3700 * 1000)
+        assert.strictEqual(durationTimeString, '1 hr 1 min 40 sec')
+    })
+
+    it('WHEN converting date object to timestamp THEN converts correctly', async function () {
+        const date = new Date(2023, 0, 1, 0, 0, 0, 0)
+        const timestamp = convertDateToTimestamp(date)
+        assert.strictEqual(timestamp, '01/01/23, 12:00 AM')
+    })
+
+    it('WHEN job status is cancelled THEN error is thrown', async function () {
+        transformByQState.setToCancelled()
+        assert.throws(() => {
+            throwIfCancelled()
+        }, new TransformByQStoppedError())
+    })
+
+    it('WHEN job is stopped THEN status is updated to cancelled', async function () {
+        transformByQState.setToRunning()
+        await stopTransformByQ('abc-123')
+        assert.strictEqual(transformByQState.getStatus(), 'Cancelled')
+    })
+
+    it('WHEN validateProjectSelection called on non-Java project THEN throws error', async function () {
+        const dummyCandidateProjects: TransformationCandidateProject[] = [
+            {
+                name: 'SampleProject',
+                path: '/dummy/path/here',
+            },
+        ]
+        await assert.rejects(async () => {
+            await validateOpenProjects(dummyCandidateProjects)
+        }, NoJavaProjectsFoundError)
+    })
+
+    it('WHEN validateProjectSelection called on Java project with no pom.xml THEN throws error', async function () {
+        const folder = await createTestWorkspaceFolder()
+        const dummyPath = path.join(folder.uri.fsPath, 'DummyFile.java')
+        await toFile('', dummyPath)
+        const findFilesStub = sinon.stub(vscode.workspace, 'findFiles')
+        findFilesStub.onFirstCall().resolves([folder.uri])
+        const dummyCandidateProjects: TransformationCandidateProject[] = [
+            {
+                name: 'SampleProject',
+                path: folder.uri.fsPath,
+            },
+        ]
+
+        await assert.rejects(async () => {
+            await validateOpenProjects(dummyCandidateProjects)
+        }, NoMavenJavaProjectsFoundError)
+    })
+
+    it('WHEN getOpenProjects called on non-empty workspace THEN returns open projects', async function () {
+        sinon
+            .stub(vscode.workspace, 'workspaceFolders')
+            .get(() => [{ uri: vscode.Uri.file('/user/test/project/'), name: 'TestProject', index: 0 }])
+
+        const openProjects = await getOpenProjects()
+        assert.strictEqual(openProjects[0].name, 'TestProject')
+    })
+
+    it('WHEN getOpenProjects called on empty workspace THEN throws error', async function () {
+        sinon.stub(vscode.workspace, 'workspaceFolders').get(() => undefined)
+
+        await assert.rejects(async () => {
+            await getOpenProjects()
+        }, NoOpenProjectsError)
+    })
+
+    it('WHEN stop job called with invalid jobId THEN stop API not called', async function () {
+        const stopJobStub = sinon.stub(codeWhisperer.codeWhispererClient, 'codeModernizerStopCodeTransformation')
+        await stopJob('')
+        sinon.assert.notCalled(stopJobStub)
+    })
+
+    it('WHEN stop job called with valid jobId THEN stop API called', async function () {
+        const stopJobStub = sinon.stub(codeWhisperer.codeWhispererClient, 'codeModernizerStopCodeTransformation')
+        await stopJob('dummyId')
+        sinon.assert.calledWithExactly(stopJobStub, { transformationJobId: 'dummyId' })
+    })
+
+    it('WHEN stopTransformByQ called with job that has already terminated THEN stop API not called', async function () {
+        const stopJobStub = sinon.stub(codeWhisperer.codeWhispererClient, 'codeModernizerStopCodeTransformation')
+        transformByQState.setToSucceeded()
+        await stopTransformByQ('abc-123')
+        sinon.assert.notCalled(stopJobStub)
+    })
+
+    it('WHEN finalizeTransformationJob on failed job THEN error thrown and error message fields are set', async function () {
+        await assert.rejects(async () => {
+            await finalizeTransformationJob('FAILED')
+        })
+        assert.notStrictEqual(transformByQState.getJobFailureErrorChatMessage(), undefined)
+        assert.notStrictEqual(transformByQState.getJobFailureErrorNotification(), undefined)
+        transformByQState.setJobDefaults() // reset error messages to undefined
+    })
+
+    it('WHEN polling completed job THEN returns status as completed', async function () {
+        const mockJobResponse = {
+            $response: {
+                data: {
+                    transformationJob: { status: 'COMPLETED' },
+                },
+                requestId: 'requestId',
+                hasNextPage: () => false,
+                error: undefined,
+                nextPage: () => null, // eslint-disable-line unicorn/no-null
+                redirectCount: 0,
+                retryCount: 0,
+                httpResponse: new HttpResponse(),
+            },
+            transformationJob: { status: 'COMPLETED' },
+        }
+        const mockPlanResponse = {
+            $response: {
+                data: {
+                    transformationPlan: { transformationSteps: [] },
+                },
+                requestId: 'requestId',
+                hasNextPage: () => false,
+                error: undefined,
+                nextPage: () => null, // eslint-disable-line unicorn/no-null
+                redirectCount: 0,
+                retryCount: 0,
+                httpResponse: new HttpResponse(),
+            },
+            transformationPlan: { transformationSteps: [] },
+        }
+        sinon.stub(codeWhisperer.codeWhispererClient, 'codeModernizerGetCodeTransformation').resolves(mockJobResponse)
+        sinon
+            .stub(codeWhisperer.codeWhispererClient, 'codeModernizerGetCodeTransformationPlan')
+            .resolves(mockPlanResponse)
+        transformByQState.setToSucceeded()
+        const status = await pollTransformationJob(
+            'dummyId',
+            CodeWhispererConstants.validStatesForCheckingDownloadUrl,
+            undefined
+        )
+        assert.strictEqual(status, 'COMPLETED')
+    })
+
+    it(`WHEN update job history called THEN returns details of last run job`, async function () {
+        transformByQState.setJobId('abc-123')
+        transformByQState.setSourceJDKVersion(JDKVersion.JDK8)
+        transformByQState.setTargetJDKVersion(JDKVersion.JDK17)
+        transformByQState.setProjectName('test-project')
+        transformByQState.setPolledJobStatus('COMPLETED')
+        transformByQState.setStartTime('05/03/24, 11:35 AM')
+        const actual = updateJobHistory()
+        const expected = {
+            'abc-123': {
+                duration: '0 sec',
+                projectName: 'test-project',
+                startTime: '05/03/24, 11:35 AM',
+                status: 'COMPLETED',
+            },
+        }
+        assert.equal(actual['abc-123'].projectName, expected['abc-123'].projectName)
+    })
+
+    it(`WHEN get headers for upload artifact to S3 THEN returns correct header with kms key arn`, function () {
+        const actual = getHeadersObj('dummy-sha-256', 'dummy-kms-key-arn')
+        const expected = {
+            'x-amz-checksum-sha256': 'dummy-sha-256',
+            'Content-Type': 'application/zip',
+            'x-amz-server-side-encryption': 'aws:kms',
+            'x-amz-server-side-encryption-aws-kms-key-id': 'dummy-kms-key-arn',
+        }
+        assert.deepStrictEqual(actual, expected)
+    })
+
+    it(`WHEN get headers for upload artifact to S3 THEN returns correct headers without kms key arn`, function () {
+        const actual = getHeadersObj('dummy-sha-256', '')
+        const expected = {
+            'x-amz-checksum-sha256': 'dummy-sha-256',
+            'Content-Type': 'application/zip',
+        }
+        assert.deepStrictEqual(actual, expected)
+    })
+
+    it('WHEN showing plan statistics THEN correct labels appear', () => {
+        const mockJobStatistics = [
+            {
+                name: 'linesOfCode',
+                value: '1234',
+            },
+            {
+                name: 'plannedDependencyChanges',
+                value: '0',
+            },
+            {
+                name: 'plannedDeprecatedApiChanges',
+                value: '0',
+            },
+            {
+                name: 'plannedFileChanges',
+                value: '0',
+            },
+        ]
+        const result = getJobStatisticsHtml(mockJobStatistics)
+        assert.strictEqual(result.includes('Lines of code in your application'), true)
+        assert.strictEqual(result.includes('to be replaced'), false)
+        assert.strictEqual(result.includes('to be changed'), false)
+    })
+
+    it(`WHEN transforming a project with a Windows Maven executable THEN mavenName set correctly`, async function () {
+        sinon.stub(env, 'isWin').returns(true)
+        const tempFileName = 'mvnw.cmd'
+        const tempFilePath = path.join(tempDir, tempFileName)
+        await toFile('', tempFilePath)
+        transformByQState.setProjectPath(tempDir)
+        setMaven()
+        // mavenName should always be 'mvn'
+        assert.strictEqual(transformByQState.getMavenName(), 'mvn')
+    })
+
+    it(`WHEN local build zip created THEN zip contains all expected files and no unexpected files`, async function () {
+        const zipPath = await createLocalBuildUploadZip(tempDir, 0, 'sample stdout after running local build')
+        const zip = new AdmZip(zipPath)
+        const manifestEntry = zip.getEntry('manifest.json')
+        if (!manifestEntry) {
+            fail('manifest.json not found in the zip')
+        }
+        const manifestBuffer = manifestEntry.getData()
+        const manifestText = manifestBuffer.toString('utf8')
+        const manifest = JSON.parse(manifestText)
+        assert.strictEqual(manifest.capability, 'CLIENT_SIDE_BUILD')
+        assert.strictEqual(manifest.exitCode, 0)
+        assert.strictEqual(manifest.commandLogFileName, 'build-output.log')
+        assert.strictEqual(zip.getEntries().length, 2) // expecting only manifest.json and build-output.log
+    })
+
+    it('WHEN extractOriginalProjectSources THEN only source files are extracted to destination', async function () {
+        const tempDir = (await TestFolder.create()).path
+        const destinationPath = path.join(tempDir, 'originalCopy_jobId_artifactId')
+        await fs.mkdir(destinationPath)
+
+        const zip = new AdmZip()
+        const testFiles = [
+            { path: 'sources/file1.java', content: 'test content 1' },
+            { path: 'sources/dir/file2.java', content: 'test content 2' },
+            { path: 'dependencies/file3.jar', content: 'should not extract' },
+            { path: 'manifest.json', content: '{"version": "1.0"}' },
+        ]
+
+        for (const file of testFiles) {
+            zip.addFile(file.path, Buffer.from(file.content))
+        }
+
+        const zipPath = path.join(tempDir, 'test.zip')
+        zip.writeZip(zipPath)
+
+        transformByQState.setPayloadFilePath(zipPath)
+
+        await extractOriginalProjectSources(destinationPath)
+
+        const extractedFiles = getFilesRecursively(destinationPath, false)
+        assert.strictEqual(extractedFiles.length, 2)
+        assert(extractedFiles.includes(path.join(destinationPath, 'sources', 'file1.java')))
+        assert(extractedFiles.includes(path.join(destinationPath, 'sources', 'dir', 'file2.java')))
+    })
+
+    it(`WHEN zip created THEN manifest.json contains test-compile custom build command`, async function () {
+        const tempFileName = `testfile-${globals.clock.Date.now()}.zip`
+        transformByQState.setProjectPath(tempDir)
+        const transformManifest = new ZipManifest()
+        transformManifest.customBuildCommand = CodeWhispererConstants.skipUnitTestsBuildCommand
+        return zipCode({
+            dependenciesFolder: {
+                path: tempDir,
+                name: tempFileName,
+            },
+            projectPath: tempDir,
+            zipManifest: transformManifest,
+        }).then((zipCodeResult) => {
+            const zip = new AdmZip(zipCodeResult.tempFilePath)
+            const manifestEntry = zip.getEntry('manifest.json')
+            if (!manifestEntry) {
+                fail('manifest.json not found in the zip')
+            }
+            const manifestBuffer = manifestEntry.getData()
+            const manifestText = manifestBuffer.toString('utf8')
+            const manifest = JSON.parse(manifestText)
+            assert.strictEqual(manifest.customBuildCommand, CodeWhispererConstants.skipUnitTestsBuildCommand)
+            assert.strictEqual(manifest.noInteractiveMode, true)
+            assert.strictEqual(manifest.transformCapabilities.includes('SELECTIVE_TRANSFORMATION_V2'), true)
+        })
+    })
+
+    it('WHEN zipCode THEN ZIP contains all expected files and no unexpected files', async function () {
+        const zipFilePath = path.join(tempDir, 'test.zip')
+        const zip = new AdmZip()
+        await fs.writeFile(path.join(tempDir, 'pom.xml'), 'dummy pom.xml')
+        zip.addLocalFile(path.join(tempDir, 'pom.xml'))
+        zip.addFile('manifest.json', Buffer.from(JSON.stringify({ version: '1.0' })))
+        zip.writeZip(zipFilePath)
+        const zipFiles = new AdmZip(zipFilePath).getEntries()
+        const zipFileNames = zipFiles.map((file) => file.name)
+        assert.strictEqual(zipFileNames.length, 2) // expecting only pom.xml and manifest.json
+        assert.strictEqual(zipFileNames.includes('pom.xml') && zipFileNames.includes('manifest.json'), true)
+    })
+
+    it(`WHEN zip created THEN dependencies contains no .sha1 or .repositories files`, async function () {
+        const m2Folders = [
+            'com/groupid1/artifactid1/version1',
+            'com/groupid1/artifactid1/version2',
+            'com/groupid1/artifactid2/version1',
+            'com/groupid2/artifactid1/version1',
+            'com/groupid2/artifactid1/version2',
+        ]
+        // List of files that exist in m2 artifact directory
+        const filesToAdd = [
+            '_remote.repositories',
+            'test-0.0.1-20240315.145420-18.pom',
+            'test-0.0.1-20240315.145420-18.pom.sha1',
+            'test-0.0.1-SNAPSHOT.pom',
+            'maven-metadata-test-repo.xml',
+            'maven-metadata-test-repo.xml.sha1',
+            'resolver-status.properties',
+        ]
+        const expectedFilesAfterClean = [
+            'test-0.0.1-20240315.145420-18.pom',
+            'test-0.0.1-SNAPSHOT.pom',
+            'maven-metadata-test-repo.xml',
+            'resolver-status.properties',
+        ]
+
+        for (const folder of m2Folders) {
+            const folderPath = path.join(tempDir, 'dependencies', folder)
+            await fs.mkdir(folderPath)
+            for (const file of filesToAdd) {
+                await fs.writeFile(path.join(folderPath, file), 'sample content for the test file')
+            }
+        }
+
+        const tempFileName = `testfile-${globals.clock.Date.now()}.zip`
+        transformByQState.setProjectPath(tempDir)
+        return zipCode({
+            dependenciesFolder: {
+                path: tempDir,
+                name: tempFileName,
+            },
+            projectPath: tempDir,
+            zipManifest: new ZipManifest(),
+        }).then((zipCodeResult) => {
+            const zip = new AdmZip(zipCodeResult.tempFilePath)
+            const dependenciesToUpload = zip.getEntries().filter((entry) => entry.entryName.startsWith('dependencies'))
+            // Each dependency version folder contains each expected file, thus we multiply
+            const expectedNumberOfDependencyFiles = m2Folders.length * expectedFilesAfterClean.length
+            assert.strictEqual(expectedNumberOfDependencyFiles, dependenciesToUpload.length)
+            for (const dependency of dependenciesToUpload) {
+                assert(expectedFilesAfterClean.includes(dependency.name))
+            }
+        })
+    })
+
+    it(`WHEN getFilesRecursively on source code THEN ignores excluded directories`, async function () {
+        const sourceFolder = path.join(tempDir, 'src')
+        await fs.mkdir(sourceFolder)
+        await fs.writeFile(path.join(sourceFolder, 'HelloWorld.java'), 'sample content for the test file')
+
+        const gitFolder = path.join(tempDir, '.git')
+        await fs.mkdir(gitFolder)
+        await fs.writeFile(path.join(gitFolder, 'config'), 'sample content for the test file')
+
+        const githubFolder = path.join(tempDir, '.github')
+        await fs.mkdir(githubFolder)
+        await fs.writeFile(path.join(githubFolder, 'config'), 'more sample content for the test file')
+
+        const zippedFiles = getFilesRecursively(tempDir, false)
+        assert.strictEqual(zippedFiles.length, 1)
+    })
+
+    it(`WHEN getTableMapping on complete step 0 progressUpdates THEN map IDs to tables`, async function () {
+        const stepZeroProgressUpdates = [
+            {
+                name: '0',
+                status: 'COMPLETED',
+                description:
+                    '{"columnNames":["name","value"],"rows":[{"name":"Lines of code in your application","value":"3000"},{"name":"Dependencies to be replaced","value":"5"},{"name":"Deprecated code instances to be replaced","value":"10"},{"name":"Files to be updated","value":"7"}]}',
+            },
+            {
+                name: '1-dependency-change-abc',
+                status: 'COMPLETED',
+                description:
+                    '{"columnNames":["dependencyName","action","currentVersion","targetVersion"],"rows":[{"dependencyName":"org.springboot.com","action":"Update","currentVersion":"2.1","targetVersion":"2.4"}, {"dependencyName":"com.lombok.java","action":"Remove","currentVersion":"1.7","targetVersion":"-"}]}',
+            },
+            {
+                name: '2-deprecated-code-xyz',
+                status: 'COMPLETED',
+                description:
+                    '{"columnNames":["apiFullyQualifiedName","numChangedFiles"],“rows”:[{"apiFullyQualifiedName":"java.lang.Thread.stop()","numChangedFiles":"6"}, {"apiFullyQualifiedName":"java.math.bad()","numChangedFiles":"3"}]}',
+            },
+            {
+                name: '-1',
+                status: 'COMPLETED',
+                description:
+                    '{"columnNames":["relativePath","action"],"rows":[{"relativePath":"pom.xml","action":"Update"}, {"relativePath":"src/main/java/com/bhoruka/bloodbank/BloodbankApplication.java","action":"Update"}]}',
+            },
+        ]
+
+        const actual = getTableMapping(stepZeroProgressUpdates)
+        const expected = {
+            '0': [
+                '{"columnNames":["name","value"],"rows":[{"name":"Lines of code in your application","value":"3000"},{"name":"Dependencies to be replaced","value":"5"},{"name":"Deprecated code instances to be replaced","value":"10"},{"name":"Files to be updated","value":"7"}]}',
+            ],
+            '1-dependency-change-abc': [
+                '{"columnNames":["dependencyName","action","currentVersion","targetVersion"],"rows":[{"dependencyName":"org.springboot.com","action":"Update","currentVersion":"2.1","targetVersion":"2.4"}, {"dependencyName":"com.lombok.java","action":"Remove","currentVersion":"1.7","targetVersion":"-"}]}',
+            ],
+            '2-deprecated-code-xyz': [
+                '{"columnNames":["apiFullyQualifiedName","numChangedFiles"],“rows”:[{"apiFullyQualifiedName":"java.lang.Thread.stop()","numChangedFiles":"6"}, {"apiFullyQualifiedName":"java.math.bad()","numChangedFiles":"3"}]}',
+            ],
+            '-1': [
+                '{"columnNames":["relativePath","action"],"rows":[{"relativePath":"pom.xml","action":"Update"}, {"relativePath":"src/main/java/com/bhoruka/bloodbank/BloodbankApplication.java","action":"Update"}]}',
+            ],
+        }
+        assert.deepStrictEqual(actual, expected)
+    })
+
+    it(`WHEN codeTransformBillingText on small project THEN correct string returned`, async function () {
+        const expected =
+            '<p>376 lines of code were submitted for transformation. If you reach the quota for lines of code included in your subscription, you will be charged $0.003 for each additional line of code. You might be charged up to $1.13 for this transformation. To avoid being charged, stop the transformation job before it completes. For more information on pricing and quotas, see [Amazon Q Developer pricing](https://aws.amazon.com/q/developer/pricing/).</p>'
+        const actual = CodeWhispererConstants.codeTransformBillingText(376)
+        assert.strictEqual(actual, expected)
+    })
+
+    it(`WHEN parseBuildFile on pom.xml with absolute path THEN absolute path detected`, async function () {
+        const dirPath = await TestFolder.create()
+        transformByQState.setProjectPath(dirPath.path)
+        const pomPath = path.join(dirPath.path, 'pom.xml')
+        await toFile('<project><properties><path>system/name/here</path></properties></project>', pomPath)
+        const expectedWarning =
+            'I detected 1 potential absolute file path(s) in your pom.xml file: **system/**. Absolute file paths might cause issues when I build your code. Any errors will show up in the build log.'
+        const warningMessage = await parseBuildFile()
+        assert.strictEqual(expectedWarning, warningMessage)
+    })
+
+    it(`WHEN validateCustomVersionsFile on fully valid .yaml file THEN passes validation`, function () {
+        const errorMessage = validateCustomVersionsFile(validCustomVersionsFile)
+        assert.strictEqual(errorMessage, undefined)
+    })
+
+    it(`WHEN validateCustomVersionsFile on .yaml file with missing key THEN fails validation`, function () {
+        const invalidFile = validCustomVersionsFile.replace('dependencyManagement', 'invalidKey')
+        const errorMessage = validateCustomVersionsFile(invalidFile)
+        assert.strictEqual(errorMessage, `Missing required key: \`dependencyManagement\``)
+    })
+
+    it(`WHEN validateCustomVersionsFile on .yaml file with invalid dependency identifier format THEN fails validation`, function () {
+        const invalidFile = validCustomVersionsFile.replace('com.example:library1', 'com.example-library1')
+        const errorMessage = validateCustomVersionsFile(invalidFile)
+        assert.strictEqual(
+            errorMessage,
+            `Invalid dependency identifier format: \`com.example-library1\`. Must be in format \`groupId:artifactId\` without spaces`
+        )
+    })
+
+    it(`WHEN validateCustomVersionsFile on .yaml file with missing plugin identifier format THEN fails validation`, function () {
+        const invalidFile = validCustomVersionsFile.replace('plugin.id', '')
+        const errorMessage = validateCustomVersionsFile(invalidFile)
+        assert.strictEqual(errorMessage, 'Missing `identifier` in plugin')
+    })
+
+    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 () {
+        const isValidMetadata = await validateSQLMetadataFile(validSctFile, { tabID: 'abc123' })
+        assert.strictEqual(isValidMetadata, true)
+        assert.strictEqual(transformByQState.getSourceDB(), DB.ORACLE)
+        assert.strictEqual(transformByQState.getTargetDB(), DB.AURORA_POSTGRESQL)
+        assert.strictEqual(transformByQState.getSourceServerName(), 'sample.rds.amazonaws.com')
+        const expectedSchemaOptions = ['SCHEMA1', 'SCHEMA2', 'SCHEMA3']
+        for (const schema of expectedSchemaOptions) {
+            assert(transformByQState.getSchemaOptions().has(schema))
+        }
+    })
+
+    it(`WHEN validateMetadataFile on .sct file with unsupported source DB THEN fails validation`, async function () {
+        const sctFileWithInvalidSource = validSctFile.replace('oracle', 'not-oracle')
+        const isValidMetadata = await validateSQLMetadataFile(sctFileWithInvalidSource, { tabID: 'abc123' })
+        assert.strictEqual(isValidMetadata, false)
+    })
+
+    it(`WHEN validateMetadataFile on .sct file with unsupported target DB THEN fails validation`, async function () {
+        const sctFileWithInvalidTarget = validSctFile.replace('aurora_postgresql', 'not-postgresql')
+        const isValidMetadata = await validateSQLMetadataFile(sctFileWithInvalidTarget, { tabID: 'abc123' })
+        assert.strictEqual(isValidMetadata, false)
+    })
+
+    it('should successfully upload on first attempt', async () => {
+        const successResponse = {
+            ok: true,
+            status: 200,
+            text: () => Promise.resolve('Success'),
+        }
+        fetchStub.returns({ response: Promise.resolve(successResponse) })
+        await uploadArtifactToS3(
+            'test.zip',
+            { uploadId: '123', uploadUrl: 'http://test.com', kmsKeyArn: 'arn' },
+            'sha256',
+            Buffer.from('test')
+        )
+        sinon.assert.calledOnce(fetchStub)
+    })
+
+    it('should retry upload on retriable error and succeed', async () => {
+        const failedResponse = {
+            ok: false,
+            status: 503,
+            text: () => Promise.resolve('Service Unavailable'),
+        }
+        const successResponse = {
+            ok: true,
+            status: 200,
+            text: () => Promise.resolve('Success'),
+        }
+        fetchStub.onFirstCall().returns({ response: Promise.resolve(failedResponse) })
+        fetchStub.onSecondCall().returns({ response: Promise.resolve(successResponse) })
+        await uploadArtifactToS3(
+            'test.zip',
+            { uploadId: '123', uploadUrl: 'http://test.com', kmsKeyArn: 'arn' },
+            'sha256',
+            Buffer.from('test')
+        )
+        sinon.assert.calledTwice(fetchStub)
+    })
+
+    it('should throw error after 4 failed upload attempts', async () => {
+        const failedResponse = {
+            ok: false,
+            status: 500,
+            text: () => Promise.resolve('Internal Server Error'),
+        }
+        fetchStub.returns({ response: Promise.resolve(failedResponse) })
+        const expectedMessage =
+            'The upload failed due to: Upload failed after up to 4 attempts with status code = 500. For more information, see the [Amazon Q documentation](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/troubleshooting-code-transformation.html#project-upload-fail)'
+        await assert.rejects(
+            uploadArtifactToS3(
+                'test.zip',
+                { uploadId: '123', uploadUrl: 'http://test.com', kmsKeyArn: 'arn' },
+                'sha256',
+                Buffer.from('test')
+            ),
+            {
+                name: 'Error',
+                message: expectedMessage,
+            }
+        )
+    })
+
+    it('should not retry upload on non-retriable error', async () => {
+        const failedResponse = {
+            ok: false,
+            status: 400,
+            text: () => Promise.resolve('Bad Request'),
+        }
+        fetchStub.onFirstCall().returns({ response: Promise.resolve(failedResponse) })
+        const expectedMessage =
+            'The upload failed due to: Upload failed with status code = 400; did not automatically retry. For more information, see the [Amazon Q documentation](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/troubleshooting-code-transformation.html#project-upload-fail)'
+        await assert.rejects(
+            uploadArtifactToS3(
+                'test.zip',
+                { uploadId: '123', uploadUrl: 'http://test.com', kmsKeyArn: 'arn' },
+                'sha256',
+                Buffer.from('test')
+            ),
+            {
+                name: 'Error',
+                message: expectedMessage,
+            }
+        )
+        sinon.assert.calledOnce(fetchStub)
+    })
+})
diff --git a/packages/core/src/test/codewhisperer/mergeIssuesDisplayFindings.test.ts b/packages/core/src/test/codewhisperer/mergeIssuesDisplayFindings.test.ts
new file mode 100644
index 00000000000..3a8c06a3c7d
--- /dev/null
+++ b/packages/core/src/test/codewhisperer/mergeIssuesDisplayFindings.test.ts
@@ -0,0 +1,88 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { SecurityIssueProvider } from '../../codewhisperer/service/securityIssueProvider'
+import { createCodeScanIssue } from './testUtil'
+import { displayFindingsDetectorName } from '../../codewhisperer/models/constants'
+import { AggregatedCodeScanIssue } from '../../codewhisperer/models/model'
+
+describe('mergeIssuesDisplayFindings', () => {
+    let provider: SecurityIssueProvider
+    const testFilePath = '/test/file.py'
+
+    beforeEach(() => {
+        provider = Object.create(SecurityIssueProvider.prototype)
+        provider.issues = []
+    })
+
+    it('should add new issues when no existing group', () => {
+        const newIssues: AggregatedCodeScanIssue = {
+            filePath: testFilePath,
+            issues: [createCodeScanIssue({ findingId: 'new-1' })],
+        }
+
+        provider.mergeIssuesDisplayFindings(newIssues, true)
+
+        assert.strictEqual(provider.issues.length, 1)
+        assert.strictEqual(provider.issues[0].filePath, testFilePath)
+        assert.strictEqual(provider.issues[0].issues.length, 1)
+        assert.strictEqual(provider.issues[0].issues[0].findingId, 'new-1')
+    })
+
+    it('should keep displayFindings when fromQCA is true', () => {
+        provider.issues = [
+            {
+                filePath: testFilePath,
+                issues: [
+                    createCodeScanIssue({ findingId: 'qca-1', detectorName: 'QCA-detector' }),
+                    createCodeScanIssue({ findingId: 'display-1', detectorName: displayFindingsDetectorName }),
+                ],
+            },
+        ]
+
+        const newIssues: AggregatedCodeScanIssue = {
+            filePath: testFilePath,
+            issues: [createCodeScanIssue({ findingId: 'new-qca-1', detectorName: 'QCA-detector' })],
+        }
+
+        provider.mergeIssuesDisplayFindings(newIssues, true)
+
+        assert.strictEqual(provider.issues.length, 1)
+        assert.strictEqual(provider.issues[0].issues.length, 2)
+
+        const findingIds = provider.issues[0].issues.map((issue) => issue.findingId)
+        assert.ok(findingIds.includes('display-1'))
+        assert.ok(findingIds.includes('new-qca-1'))
+        assert.ok(!findingIds.includes('qca-1'))
+    })
+
+    it('should keep QCA findings when fromQCA is false', () => {
+        provider.issues = [
+            {
+                filePath: testFilePath,
+                issues: [
+                    createCodeScanIssue({ findingId: 'qca-1', detectorName: 'QCA-detector' }),
+                    createCodeScanIssue({ findingId: 'display-1', detectorName: displayFindingsDetectorName }),
+                ],
+            },
+        ]
+
+        const newIssues: AggregatedCodeScanIssue = {
+            filePath: testFilePath,
+            issues: [createCodeScanIssue({ findingId: 'new-display-1', detectorName: displayFindingsDetectorName })],
+        }
+
+        provider.mergeIssuesDisplayFindings(newIssues, false)
+
+        assert.strictEqual(provider.issues.length, 1)
+        assert.strictEqual(provider.issues[0].issues.length, 2)
+
+        const findingIds = provider.issues[0].issues.map((issue) => issue.findingId)
+        assert.ok(findingIds.includes('qca-1'))
+        assert.ok(findingIds.includes('new-display-1'))
+        assert.ok(!findingIds.includes('display-1'))
+    })
+})
diff --git a/packages/core/src/test/codewhisperer/nextEditPrediction/predictionTracker.test.ts b/packages/core/src/test/codewhisperer/nextEditPrediction/predictionTracker.test.ts
new file mode 100644
index 00000000000..715044fdf73
--- /dev/null
+++ b/packages/core/src/test/codewhisperer/nextEditPrediction/predictionTracker.test.ts
@@ -0,0 +1,344 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import assert from 'assert'
+import * as path from 'path'
+
+import {
+    FileSnapshot,
+    FileTrackerConfig,
+    PredictionTracker,
+} from '../../../codewhisperer/nextEditPrediction/predictionTracker'
+import { FakeExtensionContext } from '../../fakeExtensionContext'
+import { createMockDocument } from '../testUtil'
+import * as diffGenerator from '../../../codewhisperer/nextEditPrediction/diffContextGenerator'
+import globals from '../../../shared/extensionGlobals'
+import { charactersLimit, supplementalContextMaxTotalLength } from '../../../codewhisperer/models/constants'
+
+describe('PredictionTracker', function () {
+    let sandbox: sinon.SinonSandbox
+    let mockExtensionContext: vscode.ExtensionContext
+    let tracker: PredictionTracker
+    let clock: sinon.SinonFakeTimers
+    let dateNowStub: sinon.SinonStub
+
+    beforeEach(async function () {
+        sandbox = sinon.createSandbox()
+        // Set a base time for tests
+        const startTime = new Date('2025-04-21T12:00:00Z').getTime()
+
+        clock = sandbox.useFakeTimers({
+            now: startTime,
+            shouldAdvanceTime: true,
+        })
+
+        // Set up a stub for globals.clock.Date.now() that we can control manually
+        dateNowStub = sandbox.stub(globals.clock.Date, 'now')
+        dateNowStub.returns(startTime)
+
+        mockExtensionContext = await FakeExtensionContext.create()
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+        clock.restore()
+    })
+
+    describe('processEdit', function () {
+        let filePath: string
+        let previousContent: string
+        let mockDocument: vscode.TextDocument
+
+        beforeEach(function () {
+            filePath = testPath('path', 'to', 'file.js')
+            previousContent = 'previous content'
+            tracker = new PredictionTracker(mockExtensionContext)
+
+            // Create a mock document
+            mockDocument = createMockDocument(previousContent, filePath)
+        })
+
+        it('should store snapshot in memory', async function () {
+            await tracker.processEdit(mockDocument, previousContent)
+            const snapshots = tracker.getFileSnapshots(filePath)
+
+            assert.strictEqual(snapshots.length, 1)
+            assert.strictEqual(snapshots[0].content, previousContent)
+            assert.strictEqual(snapshots[0].size, Buffer.byteLength(previousContent, 'utf8'))
+        })
+
+        it('should not add new snapshot within debounce interval', async function () {
+            await tracker.processEdit(mockDocument, 'first edit')
+            assert.strictEqual(tracker.getFileSnapshots(filePath).length, 1)
+
+            // Another edit within debounce interval, should not add another snapshot
+            await tracker.processEdit(mockDocument, 'second edit')
+            assert.strictEqual(tracker.getFileSnapshots(filePath).length, 1)
+        })
+
+        it('should add new snapshot after debounce interval', async function () {
+            const initialTime = globals.clock.Date.now()
+            await tracker.processEdit(mockDocument, 'first edit')
+            assert.strictEqual(tracker.getFileSnapshots(filePath).length, 1)
+
+            // Another edit after debounce interval, should add another snapshot
+            const laterTime = initialTime + tracker.config.debounceIntervalMs + 1000
+            dateNowStub.returns(laterTime)
+            await tracker.processEdit(mockDocument, 'second edit')
+            assert.strictEqual(tracker.getFileSnapshots(filePath).length, 2)
+
+            // Verify the content of the second snapshot
+            const snapshots = tracker.getFileSnapshots(filePath)
+            assert.strictEqual(snapshots[1].content, 'second edit')
+        })
+
+        it('should delete snapshot after maxAgeMs', async function () {
+            const customConfig: Partial<FileTrackerConfig> = {
+                maxAgeMs: 10000,
+            }
+            tracker = new PredictionTracker(mockExtensionContext, customConfig)
+            const initialTime = globals.clock.Date.now()
+            await tracker.processEdit(mockDocument, previousContent)
+            assert.strictEqual(tracker.getFileSnapshots(filePath).length, 1)
+
+            // Advance time just under the maxAgeMs, snapshot should still exist
+            dateNowStub.returns(initialTime + tracker.config.maxAgeMs - 1000)
+            await clock.tickAsync(tracker.config.maxAgeMs - 1000)
+            assert.strictEqual(tracker.getFileSnapshots(filePath).length, 1)
+
+            // Advance time past the maxAgeMs, snapshot should be removed
+            dateNowStub.returns(initialTime + tracker.config.maxAgeMs + 2000)
+            await clock.tickAsync(3000)
+            assert.strictEqual(tracker.getFileSnapshots(filePath).length, 0)
+        })
+    })
+
+    describe('enforceMemoryLimits', function () {
+        beforeEach(function () {
+            tracker = new PredictionTracker(mockExtensionContext)
+        })
+
+        it('should remove oldest snapshots when storage size exceeds limit', async function () {
+            // Very small storage limit
+            const customConfig: Partial<FileTrackerConfig> = {
+                maxStorageSizeKb: 0.1,
+            }
+            tracker = new PredictionTracker(mockExtensionContext, customConfig)
+
+            const file1 = testPath('path', 'to', 'file1.js')
+            const file2 = testPath('path', 'to', 'file2.js')
+
+            const initialTime = globals.clock.Date.now()
+
+            // First snapshot for file1 (oldest)
+            const mockDocument1 = createMockDocument('content 1', file1)
+            await tracker.processEdit(mockDocument1, 'content 1')
+            dateNowStub.returns(initialTime + 1000)
+            await clock.tickAsync(1000)
+
+            // Second snapshot for file1
+            await tracker.processEdit(mockDocument1, 'content 2')
+            dateNowStub.returns(initialTime + 2000)
+            await clock.tickAsync(1000)
+
+            // First snapshot for file2
+            const mockDocument2 = createMockDocument('content 3', file2)
+            await tracker.processEdit(mockDocument2, 'content 3')
+
+            await (tracker as any).enforceMemoryLimits()
+
+            // Oldest snapshot should be removed
+            const file1Snapshots = tracker.getFileSnapshots(file1)
+            assert.strictEqual(file1Snapshots.length, 1)
+        })
+    })
+
+    describe('getFileSnapshots', function () {
+        beforeEach(function () {
+            tracker = new PredictionTracker(mockExtensionContext)
+        })
+
+        it('should return empty array for non-existent file', function () {
+            const result = tracker.getFileSnapshots(testPath('non-existent', 'file.js'))
+            assert.deepStrictEqual(result, [])
+        })
+
+        it('should return snapshots for existing file', async function () {
+            const file = testPath('path', 'to', 'file.js')
+            const content = 'file content'
+            const mockDocument = createMockDocument(content, file)
+            await tracker.processEdit(mockDocument, content)
+
+            const result = tracker.getFileSnapshots(file)
+            assert.strictEqual(result.length, 1)
+            assert.strictEqual(result[0].filePath, file)
+            assert.strictEqual(result[0].content, content)
+        })
+    })
+
+    describe('getSnapshotContent', function () {
+        let file: string
+        let snapshotContent: string
+        let snapshot: FileSnapshot
+
+        beforeEach(async function () {
+            tracker = new PredictionTracker(mockExtensionContext)
+            file = testPath('path', 'to', 'file.js')
+            snapshotContent = 'snapshot content'
+            const mockDocument = createMockDocument(snapshotContent, file)
+            await tracker.processEdit(mockDocument, snapshotContent)
+
+            snapshot = tracker.getFileSnapshots(file)[0]
+        })
+
+        it('should retrieve snapshot content from memory', async function () {
+            const content = await tracker.getSnapshotContent(snapshot)
+            assert.strictEqual(content, snapshotContent)
+        })
+    })
+
+    describe('generatePredictionSupplementalContext', function () {
+        let mockEditor: vscode.TextEditor
+        let diffGenerateStub: sinon.SinonStub
+
+        beforeEach(function () {
+            tracker = new PredictionTracker(mockExtensionContext)
+
+            // Mock active editor, we only care about document
+            mockEditor = {
+                document: createMockDocument('current content', testPath('path', 'to', 'active.js')),
+                selection: new vscode.Selection(0, 0, 0, 0),
+                selections: [new vscode.Selection(0, 0, 0, 0)],
+                options: {},
+                visibleRanges: [],
+                edit: () => Promise.resolve(true),
+                insertSnippet: () => Promise.resolve(true),
+                setDecorations: () => {},
+                revealRange: () => {},
+                show: () => {},
+                hide: () => {},
+                viewColumn: vscode.ViewColumn.One,
+            } as vscode.TextEditor
+
+            sandbox.stub(vscode.window, 'activeTextEditor').value(mockEditor)
+
+            // Mock diffGenerator.generateDiffContexts
+            diffGenerateStub = sandbox.stub(diffGenerator, 'generateDiffContexts').resolves([])
+        })
+
+        it('should return empty array if no snapshots', async function () {
+            const result = await tracker.generatePredictionSupplementalContext()
+            assert.deepStrictEqual(result, [])
+        })
+
+        it('should generate and return supplemental contexts', async function () {
+            const filePath = testPath('path', 'to', 'active.js')
+            const initialTime = globals.clock.Date.now()
+
+            const mockDoc = createMockDocument('old content 1', filePath)
+            await tracker.processEdit(mockDoc, 'old content 1')
+            dateNowStub.returns(initialTime + tracker.config.debounceIntervalMs + 1000)
+            await clock.tickAsync(tracker.config.debounceIntervalMs + 1000)
+            await tracker.processEdit(mockDoc, 'old content 2')
+
+            const mockContexts = [
+                { filePath, content: 'diff1', type: 'PreviousEditorState' },
+                { filePath, content: 'diff2', type: 'PreviousEditorState' },
+            ]
+            diffGenerateStub.resolves(mockContexts)
+
+            const result = await tracker.generatePredictionSupplementalContext()
+
+            // Should have called generateDiffContexts with the right params
+            assert.ok(diffGenerateStub.called)
+            assert.strictEqual(diffGenerateStub.args[0][0], filePath)
+            assert.strictEqual(diffGenerateStub.args[0][1], 'current content')
+            assert.strictEqual(diffGenerateStub.args[0][2].length, 2)
+            assert.strictEqual(diffGenerateStub.args[0][3], tracker.config.maxSupplementalContext)
+
+            // Should return the contexts from generateDiffContexts
+            assert.deepStrictEqual(result, mockContexts)
+
+            // Check that the snapshot content is correctly passed to the diffContextGenerator
+            const snapshotContents = diffGenerateStub.args[0][2]
+            assert.strictEqual(snapshotContents[0].content, 'old content 1')
+            assert.strictEqual(snapshotContents[1].content, 'old content 2')
+        })
+    })
+
+    function testPath(...segments: string[]): string {
+        // Mock the path from vscode uri
+        return path.sep + path.join(...segments)
+    }
+
+    describe('trimSupplementalContexts', function () {
+        it('should filter out contexts that exceed individual character limit', function () {
+            const smallContext = {
+                filePath: 'file.js',
+                content: 'small content',
+                type: 'PreviousEditorState',
+            }
+
+            // Create a context that exceeds the characters limit
+            const largeContent = 'a'.repeat(charactersLimit + 100)
+            const largeContext = {
+                filePath: 'file.js',
+                content: largeContent,
+                type: 'PreviousEditorState',
+            }
+
+            const contexts = [smallContext, largeContext]
+            const result = diffGenerator.trimSupplementalContexts(contexts, 10)
+
+            assert.strictEqual(result.length, 1)
+            assert.deepStrictEqual(result[0], smallContext)
+        })
+
+        it('should limit the number of contexts to maxContexts', function () {
+            const contexts = [
+                { filePath: 'file1.js', content: 'content 1', type: 'PreviousEditorState' },
+                { filePath: 'file2.js', content: 'content 2', type: 'PreviousEditorState' },
+                { filePath: 'file3.js', content: 'content 3', type: 'PreviousEditorState' },
+                { filePath: 'file4.js', content: 'content 4', type: 'PreviousEditorState' },
+                { filePath: 'file5.js', content: 'content 5', type: 'PreviousEditorState' },
+            ]
+
+            const maxContexts = 3
+            const result = diffGenerator.trimSupplementalContexts(contexts, maxContexts)
+
+            assert.strictEqual(result.length, maxContexts)
+        })
+
+        it('should enforce total character length limit across all contexts', function () {
+            // Create contexts where total size exceeds the limit
+            const contentSize = Math.floor(supplementalContextMaxTotalLength / 2.5)
+            const contexts = [
+                {
+                    filePath: 'file1.js',
+                    content: 'a'.repeat(contentSize),
+                    type: 'PreviousEditorState',
+                },
+                {
+                    filePath: 'file2.js',
+                    content: 'b'.repeat(contentSize),
+                    type: 'PreviousEditorState',
+                },
+                {
+                    filePath: 'file3.js',
+                    content: 'c'.repeat(contentSize),
+                    type: 'PreviousEditorState',
+                },
+            ]
+
+            const result = diffGenerator.trimSupplementalContexts(contexts, 10)
+
+            // Only the first two contexts should be included since the third would exceed the total limit
+            assert.strictEqual(result.length, 2)
+            assert.deepStrictEqual(result, contexts.slice(0, 2))
+        })
+    })
+})
diff --git a/packages/core/src/test/codewhisperer/startSecurityScan.test.ts b/packages/core/src/test/codewhisperer/startSecurityScan.test.ts
new file mode 100644
index 00000000000..e45bee1b7fa
--- /dev/null
+++ b/packages/core/src/test/codewhisperer/startSecurityScan.test.ts
@@ -0,0 +1,260 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import * as semver from 'semver'
+import * as startSecurityScan from '../../codewhisperer/commands/startSecurityScan'
+import { SecurityPanelViewProvider } from '../../codewhisperer/views/securityPanelViewProvider'
+import { FakeExtensionContext } from '../fakeExtensionContext'
+import * as diagnosticsProvider from '../../codewhisperer/service/diagnosticsProvider'
+import { getTestWorkspaceFolder } from '../../testInteg/integrationTestsUtilities'
+import { join } from 'path'
+import { assertTelemetry, closeAllEditors, getFetchStubWithResponse } from '../testUtil'
+import { AWSError } from 'aws-sdk'
+import { getTestWindow } from '../shared/vscode/window'
+import { SeverityLevel } from '../shared/vscode/message'
+import { showScannedFilesMessage, CodeAnalysisScope } from '../../codewhisperer/models/constants'
+import * as model from '../../codewhisperer/models/model'
+import * as errors from '../../shared/errors'
+import * as timeoutUtils from '../../shared/utilities/timeoutUtils'
+import { SecurityIssueTreeViewProvider } from '../../codewhisperer'
+import { createClient, mockGetCodeScanResponse } from './testUtil'
+
+let extensionContext: FakeExtensionContext
+let mockSecurityPanelViewProvider: SecurityPanelViewProvider
+let appRoot: string
+let appCodePath: string
+let editor: vscode.TextEditor
+let focusStub: sinon.SinonStub
+
+describe('startSecurityScan', function () {
+    const workspaceFolder = getTestWorkspaceFolder()
+    beforeEach(async function () {
+        extensionContext = await FakeExtensionContext.create()
+        mockSecurityPanelViewProvider = new SecurityPanelViewProvider(extensionContext)
+        appRoot = join(workspaceFolder, 'python3.7-plain-sam-app')
+        appCodePath = join(appRoot, 'hello_world', 'app.py')
+        editor = await openTestFile(appCodePath)
+        await model.CodeScansState.instance.setScansEnabled(false)
+        sinon.stub(timeoutUtils, 'sleep')
+        focusStub = sinon.stub(SecurityIssueTreeViewProvider, 'focus')
+    })
+    afterEach(function () {
+        sinon.restore()
+    })
+    after(async function () {
+        await closeAllEditors()
+    })
+
+    const openTestFile = async (filePath: string) => {
+        const doc = await vscode.workspace.openTextDocument(filePath)
+        return await vscode.window.showTextDocument(doc, {
+            selection: new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 1)),
+        })
+    }
+
+    it('Should render security scan result', async function () {
+        getFetchStubWithResponse({ status: 200, statusText: 'testing stub' })
+        const securityScanRenderSpy = sinon.spy(diagnosticsProvider, 'initSecurityScanRender')
+
+        await startSecurityScan.startSecurityScan(
+            mockSecurityPanelViewProvider,
+            editor,
+            createClient(),
+            extensionContext,
+            CodeAnalysisScope.PROJECT,
+            true
+        )
+        assert.ok(focusStub.calledOnce)
+        assert.ok(securityScanRenderSpy.calledOnce)
+        const warnings = getTestWindow().shownMessages.filter((m) => m.severity === SeverityLevel.Warning)
+        assert.strictEqual(warnings.length, 0)
+    })
+
+    it('Should render security scan result for on-demand file scan', async function () {
+        getFetchStubWithResponse({ status: 200, statusText: 'testing stub' })
+        const commandSpy = sinon.spy(vscode.commands, 'executeCommand')
+        const securityScanRenderSpy = sinon.spy(diagnosticsProvider, 'initSecurityScanRender')
+
+        await startSecurityScan.startSecurityScan(
+            mockSecurityPanelViewProvider,
+            editor,
+            createClient(),
+            extensionContext,
+            CodeAnalysisScope.FILE_ON_DEMAND,
+            true
+        )
+        assert.ok(commandSpy.neverCalledWith('workbench.action.problems.focus'))
+        assert.ok(securityScanRenderSpy.calledOnce)
+        const warnings = getTestWindow().shownMessages.filter((m) => m.severity === SeverityLevel.Warning)
+        assert.strictEqual(warnings.length, 0)
+    })
+
+    it('Should not focus problems panel for file scans', async function () {
+        getFetchStubWithResponse({ status: 200, statusText: 'testing stub' })
+        const securityScanRenderSpy = sinon.spy(diagnosticsProvider, 'initSecurityScanRender')
+
+        await model.CodeScansState.instance.setScansEnabled(true)
+        await startSecurityScan.startSecurityScan(
+            mockSecurityPanelViewProvider,
+            editor,
+            createClient(),
+            extensionContext,
+            CodeAnalysisScope.FILE_AUTO,
+            false
+        )
+        assert.ok(focusStub.notCalled)
+        assert.ok(securityScanRenderSpy.calledOnce)
+        const warnings = getTestWindow().shownMessages.filter((m) => m.severity === SeverityLevel.Warning)
+        assert.strictEqual(warnings.length, 0)
+        assertTelemetry('codewhisperer_securityScan', {
+            codewhispererCodeScanScope: 'FILE_AUTO',
+            passive: true,
+        })
+    })
+
+    it('Should stop security scan for auto file scans if setting is disabled', async function () {
+        getFetchStubWithResponse({ status: 200, statusText: 'testing stub' })
+        const securityScanRenderSpy = sinon.spy(diagnosticsProvider, 'initSecurityScanRender')
+        const securityScanStoppedErrorSpy = sinon.spy(model, 'CodeScanStoppedError')
+        await model.CodeScansState.instance.setScansEnabled(true)
+        const scanPromise = startSecurityScan.startSecurityScan(
+            mockSecurityPanelViewProvider,
+            editor,
+            createClient(),
+            extensionContext,
+            CodeAnalysisScope.FILE_AUTO,
+            false
+        )
+        await model.CodeScansState.instance.setScansEnabled(false)
+        await scanPromise
+        assert.ok(securityScanRenderSpy.notCalled)
+        assert.ok(securityScanStoppedErrorSpy.calledOnce)
+    })
+
+    it('Should highlight files after scan is completed', async function () {
+        if (semver.lt(vscode.version, '1.78.0')) {
+            this.skip()
+        }
+        getFetchStubWithResponse({ status: 200, statusText: 'testing stub' })
+        const testWindow = getTestWindow()
+        testWindow.onDidShowMessage((message) => {
+            if (message.message.includes('Security scan completed')) {
+                message.selectItem(showScannedFilesMessage)
+            }
+        })
+        await startSecurityScan.startSecurityScan(
+            mockSecurityPanelViewProvider,
+            editor,
+            createClient(),
+            extensionContext,
+            CodeAnalysisScope.PROJECT,
+            false
+        )
+        assertTelemetry('codewhisperer_securityScan', {
+            codewhispererCodeScanTotalIssues: 1,
+            codewhispererCodeScanIssuesWithFixes: 0,
+            codewhispererCodeScanScope: 'PROJECT',
+            passive: false,
+        })
+        assertTelemetry('codewhisperer_codeScanIssueDetected', {
+            autoDetected: false,
+            detectorId: 'detectorId',
+            findingId: 'findingId',
+        })
+    })
+
+    it('Should cancel a scan if a newer one has started', async function () {
+        getFetchStubWithResponse({ status: 200, statusText: 'testing stub' })
+        await model.CodeScansState.instance.setScansEnabled(true)
+
+        const scanPromise = startSecurityScan.startSecurityScan(
+            mockSecurityPanelViewProvider,
+            editor,
+            createClient(),
+            extensionContext,
+            CodeAnalysisScope.FILE_AUTO,
+            false
+        )
+        await startSecurityScan.startSecurityScan(
+            mockSecurityPanelViewProvider,
+            editor,
+            createClient(),
+            extensionContext,
+            CodeAnalysisScope.FILE_AUTO,
+            false
+        )
+        await scanPromise
+        assertTelemetry('codewhisperer_securityScan', [
+            {
+                result: 'Cancelled',
+                reasonDesc: 'Security scan stopped by user.',
+                reason: 'DefaultError',
+            },
+            {
+                result: 'Succeeded',
+            },
+        ])
+    })
+
+    it('Should handle failed scan job status', async function () {
+        getFetchStubWithResponse({ status: 200, statusText: 'testing stub' })
+
+        const mockClient = createClient()
+        mockClient.getCodeScan.resolves({
+            ...mockGetCodeScanResponse,
+            status: 'Failed',
+        })
+        await startSecurityScan.startSecurityScan(
+            mockSecurityPanelViewProvider,
+            editor,
+            mockClient,
+            extensionContext,
+            CodeAnalysisScope.PROJECT,
+            false
+        )
+        assertTelemetry('codewhisperer_securityScan', {
+            codewhispererCodeScanScope: 'PROJECT',
+            result: 'Failed',
+            reason: 'CodeScanJobFailedError',
+            reasonDesc: 'CodeScanJobFailedError: Security scan failed.',
+            passive: false,
+        })
+    })
+
+    it('Should set monthly quota exceeded when throttled for auto file scans', async function () {
+        getFetchStubWithResponse({ status: 200, statusText: 'testing stub' })
+        await model.CodeScansState.instance.setScansEnabled(true)
+        const mockClient = createClient()
+        mockClient.createCodeScan.throws({
+            code: 'ThrottlingException',
+            time: new Date(),
+            name: 'error name',
+            message: 'Maximum file scans count reached for this month',
+        } satisfies AWSError)
+        sinon.stub(errors, 'isAwsError').returns(true)
+        assert.equal(model.CodeScansState.instance.isMonthlyQuotaExceeded(), false)
+        await startSecurityScan.startSecurityScan(
+            mockSecurityPanelViewProvider,
+            editor,
+            mockClient,
+            extensionContext,
+            CodeAnalysisScope.FILE_AUTO,
+            false
+        )
+        assert.equal(model.CodeScansState.instance.isMonthlyQuotaExceeded(), true)
+        const warnings = getTestWindow().shownMessages.filter((m) => m.severity === SeverityLevel.Warning)
+        assert.strictEqual(warnings.length, 0)
+        assertTelemetry('codewhisperer_securityScan', {
+            codewhispererCodeScanScope: 'FILE_AUTO',
+            result: 'Failed',
+            reason: 'ThrottlingException',
+            reasonDesc: 'ThrottlingException: Maximum file scans count reached for this month',
+            passive: true,
+        })
+    })
+})
diff --git a/packages/core/src/test/codewhisperer/testUtil.ts b/packages/core/src/test/codewhisperer/testUtil.ts
new file mode 100644
index 00000000000..dd8188b1006
--- /dev/null
+++ b/packages/core/src/test/codewhisperer/testUtil.ts
@@ -0,0 +1,336 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import * as codewhispererClient from '../../codewhisperer/client/codewhisperer'
+import {
+    vsCodeState,
+    AcceptedSuggestionEntry,
+    CodeScanIssue,
+    CodeSuggestionsState,
+} from '../../codewhisperer/models/model'
+import { MockDocument } from '../fake/fakeDocument'
+import { getLogger } from '../../shared/logger'
+import globals from '../../shared/extensionGlobals'
+import { session } from '../../codewhisperer/util/codeWhispererSession'
+import { DefaultAWSClientBuilder, ServiceOptions } from '../../shared/awsClientBuilder'
+import { FakeAwsContext } from '../utilities/fakeAwsContext'
+import { HttpResponse, Service } from 'aws-sdk'
+import userApiConfig = require('./../../codewhisperer/client/user-service-2.json')
+import CodeWhispererUserClient = require('../../codewhisperer/client/codewhispereruserclient')
+import { codeWhispererClient } from '../../codewhisperer/client/codewhisperer'
+import * as model from '../../codewhisperer/models/model'
+import { stub } from '../utilities/stubber'
+import { Dirent } from 'fs' // eslint-disable-line no-restricted-imports
+
+export async function resetCodeWhispererGlobalVariables() {
+    vsCodeState.isIntelliSenseActive = false
+    vsCodeState.isCodeWhispererEditing = false
+    globals.telemetry.logger.clear()
+    session.reset()
+    await globals.globalState.clear()
+    await CodeSuggestionsState.instance.setSuggestionsEnabled(true)
+}
+
+export function createMockDocument(
+    doc = 'import math\ndef two_sum(nums, target):\n',
+    filename = 'test.py',
+    language = 'python'
+): MockDocument {
+    return new MockDocument(
+        doc,
+        filename,
+        sinon.spy(async (_doc) => true),
+        language
+    )
+}
+
+export function createMockTextEditor(
+    doc = 'import math\ndef two_sum(nums, target):\n',
+    filename = 'test.py',
+    language = 'python',
+    line = 1,
+    character = 26
+): vscode.TextEditor {
+    const mockTextEditor: vscode.TextEditor = {
+        document: createMockDocument(doc, filename, language),
+        selection: createMockSelection(line, character),
+        selections: [],
+        visibleRanges: [],
+        viewColumn: undefined,
+        options: {},
+        insertSnippet: sinon.spy(),
+        setDecorations: sinon.spy(),
+        revealRange: sinon.spy(),
+        show: sinon.spy(),
+        hide: sinon.spy(),
+        edit: function (
+            resolve: (editBuilder: vscode.TextEditorEdit) => void,
+            options?: { undoStopBefore: boolean; undoStopAfter: boolean } | undefined
+        ) {
+            return new Promise((r) => {
+                const editor: vscode.TextEditorEdit = {
+                    replace: sinon.spy(),
+                    insert: sinon.spy(),
+                    setEndOfLine: sinon.spy(),
+                    delete: function (_location: vscode.Selection | vscode.Range): void {
+                        getLogger().info(`delete %O`, _location)
+                    },
+                }
+                resolve(editor)
+                r(true)
+            })
+        },
+    }
+    return mockTextEditor
+}
+
+export function createMockSelection(line: number, character: number): vscode.Selection {
+    const selection: vscode.Selection = {
+        anchor: new vscode.Position(line, character),
+        active: new vscode.Position(line, character),
+        end: new vscode.Position(line, character),
+        isEmpty: false,
+        isReversed: false,
+        isSingleLine: false,
+        start: new vscode.Position(line, character),
+        contains: sinon.spy(),
+        intersection: sinon.spy(),
+        isEqual: sinon.spy(),
+        union: sinon.spy(),
+        with: sinon.spy(),
+    }
+    return selection
+}
+
+export function createMockClientRequest(): codewhispererClient.ListRecommendationsRequest {
+    const req: codewhispererClient.ListRecommendationsRequest = {
+        fileContext: {
+            filename: 'test.py',
+            programmingLanguage: {
+                languageName: 'python',
+            },
+            leftFileContent: 'def add',
+            rightFileContent: '',
+        },
+    }
+    return req
+}
+
+export function createAcceptedSuggestionEntry(time = new Date()): AcceptedSuggestionEntry {
+    return {
+        time: time,
+        fileUrl: {
+            scheme: '',
+            authority: 'Amazon',
+            path: '',
+            query: '',
+            fragment: '',
+            fsPath: '',
+            with: sinon.spy(),
+            toJSON: sinon.spy(),
+        },
+        originalString: 'x',
+        startPosition: new vscode.Position(1, 1),
+        endPosition: new vscode.Position(1, 1),
+        requestId: 'test',
+        sessionId: 'test',
+        index: 1,
+        triggerType: 'OnDemand',
+        completionType: 'Line',
+        language: 'java',
+    }
+}
+
+export function createTextDocumentChangeEvent(document: vscode.TextDocument, range: vscode.Range, text: string) {
+    return {
+        reason: undefined,
+        document: document,
+        contentChanges: [
+            {
+                range: range,
+                rangeOffset: 1,
+                rangeLength: 1,
+                text: text,
+            },
+        ],
+    }
+}
+
+// bryceitoc9: I'm not sure what this function does? spy functionality from Mockito wasn't used, and removing doesn't break anything
+export async function createSpyClient() {
+    const builder = new DefaultAWSClientBuilder(new FakeAwsContext())
+    const clientSpy = (await builder.createAwsService(Service, {
+        apiConfig: userApiConfig,
+    } as ServiceOptions)) as CodeWhispererUserClient
+    sinon.stub(codeWhispererClient, 'createUserSdkClient').returns(Promise.resolve(clientSpy))
+    return clientSpy
+}
+
+export function createCodeScanIssue(overrides?: Partial<CodeScanIssue>): CodeScanIssue {
+    return {
+        startLine: 0,
+        endLine: 1,
+        comment: 'comment',
+        title: 'title',
+        description: {
+            text: 'description',
+            markdown: 'description',
+        },
+        detectorId: 'language/cool-detector@v1.0',
+        detectorName: 'detectorName',
+        findingId: 'findingId',
+        relatedVulnerabilities: ['CWE-1'],
+        severity: 'High',
+        recommendation: {
+            text: 'recommendationText',
+            url: 'recommendationUrl',
+        },
+        suggestedFixes: [
+            { description: 'fix', code: '@@ -1,1 +1,1 @@\nfirst line\n-second line\n+third line\nfourth line' },
+        ],
+        visible: true,
+        language: 'python',
+        scanJobId: 'scanJob',
+        ...overrides,
+    }
+}
+
+export function createCodeActionContext(): vscode.CodeActionContext {
+    return {
+        diagnostics: [],
+        only: vscode.CodeActionKind.Empty,
+        triggerKind: vscode.CodeActionTriggerKind.Automatic,
+    }
+}
+
+export function createMockDirentFile(fileName: string): Dirent {
+    const dirent = new Dirent()
+    dirent.isFile = () => true
+    dirent.name = fileName
+    return dirent
+}
+
+export const mockGetCodeScanResponse = {
+    $response: {
+        data: {
+            status: 'Completed',
+        },
+        requestId: 'requestId',
+        hasNextPage: () => false,
+        error: undefined,
+        nextPage: () => null, // eslint-disable-line unicorn/no-null
+        redirectCount: 0,
+        retryCount: 0,
+        httpResponse: new HttpResponse(),
+    },
+    status: 'Completed',
+}
+
+export function createClient() {
+    const mockClient = stub(codewhispererClient.DefaultCodeWhispererClient)
+
+    const mockCreateCodeScanResponse = {
+        $response: {
+            data: {
+                jobId: 'jobId',
+                status: 'Pending',
+            },
+            requestId: 'requestId',
+            hasNextPage: () => false,
+            error: undefined,
+            nextPage: () => null, // eslint-disable-line unicorn/no-null
+            redirectCount: 0,
+            retryCount: 0,
+            httpResponse: new HttpResponse(),
+        },
+        jobId: 'jobId',
+        status: 'Pending',
+    }
+    const mockCreateUploadUrlResponse = {
+        $response: {
+            data: {
+                uploadId: 'uploadId',
+                uploadUrl: 'uploadUrl',
+            },
+            requestId: 'requestId',
+            hasNextPage: () => false,
+            error: undefined,
+            nextPage: () => null, // eslint-disable-line unicorn/no-null
+            redirectCount: 0,
+            retryCount: 0,
+            httpResponse: new HttpResponse(),
+        },
+        uploadId: 'uploadId',
+        uploadUrl: 'https://test.com',
+    }
+
+    const mockCodeScanFindings = JSON.stringify([
+        {
+            filePath: 'workspaceFolder/python3.7-plain-sam-app/hello_world/app.py',
+            startLine: 1,
+            endLine: 1,
+            title: 'title',
+            description: {
+                text: 'text',
+                markdown: 'markdown',
+            },
+            detectorId: 'detectorId',
+            detectorName: 'detectorName',
+            findingId: 'findingId',
+            relatedVulnerabilities: [],
+            severity: 'High',
+            remediation: {
+                recommendation: {
+                    text: 'text',
+                    url: 'url',
+                },
+                suggestedFixes: [],
+            },
+            codeSnippet: [],
+        } satisfies model.RawCodeScanIssue,
+    ])
+
+    const mockListCodeScanFindingsResponse = {
+        $response: {
+            data: {
+                codeScanFindings: mockCodeScanFindings,
+            },
+            requestId: 'requestId',
+            hasNextPage: () => false,
+            error: undefined,
+            nextPage: () => null, // eslint-disable-line unicorn/no-null
+            redirectCount: 0,
+            retryCount: 0,
+            httpResponse: new HttpResponse(),
+        },
+        codeScanFindings: mockCodeScanFindings,
+    }
+
+    mockClient.createCodeScan.resolves(mockCreateCodeScanResponse)
+    mockClient.createUploadUrl.resolves(mockCreateUploadUrlResponse)
+    mockClient.getCodeScan.resolves(mockGetCodeScanResponse)
+    mockClient.listCodeScanFindings.resolves(mockListCodeScanFindingsResponse)
+    return mockClient
+}
+
+export function aStringWithLineCount(lineCount: number, start: number = 0): string {
+    let s = ''
+    for (let i = start; i < start + lineCount; i++) {
+        s += `line${i}\n`
+    }
+
+    return s.trimEnd()
+}
+
+export function aLongStringWithLineCount(lineCount: number, start: number = 0): string {
+    let s = ''
+    for (let i = start; i < start + lineCount; i++) {
+        s += `a`.repeat(100) + `line${i}\n`
+    }
+
+    return s.trimEnd()
+}
diff --git a/packages/core/src/test/codewhisperer/zipUtil.test.ts b/packages/core/src/test/codewhisperer/zipUtil.test.ts
new file mode 100644
index 00000000000..102bf2fc441
--- /dev/null
+++ b/packages/core/src/test/codewhisperer/zipUtil.test.ts
@@ -0,0 +1,140 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import vscode from 'vscode'
+import sinon from 'sinon'
+import { join } from 'path'
+import JSZip from 'jszip'
+import { getTestWorkspaceFolder } from '../../testInteg/integrationTestsUtilities'
+import { ZipUtil } from '../../codewhisperer/util/zipUtil'
+import { CodeAnalysisScope, codeScanTruncDirPrefix } from '../../codewhisperer/models/constants'
+import { ToolkitError } from '../../shared/errors'
+import { fs } from '../../shared/fs/fs'
+
+describe('zipUtil', function () {
+    const workspaceFolder = getTestWorkspaceFolder()
+    const appRoot = join(workspaceFolder, 'java11-plain-maven-sam-app')
+    const appCodePath = join(appRoot, 'HelloWorldFunction', 'src', 'main', 'java', 'helloworld', 'App.java')
+    const appCodePathWithRepeatedProjectName = join(workspaceFolder, 'workspaceFolder', 'App.java')
+
+    describe('getProjectPaths', function () {
+        it('Should return the correct project paths', function () {
+            const zipUtil = new ZipUtil()
+            assert.deepStrictEqual(zipUtil.getProjectPaths(), [workspaceFolder])
+        })
+
+        it('Should return the correct project path for unit test generation', function () {
+            const zipUtil = new ZipUtil()
+            assert.deepStrictEqual(zipUtil.getProjectPath(appCodePath), workspaceFolder)
+        })
+    })
+
+    describe('generateZip', function () {
+        let zipUtil: ZipUtil
+        beforeEach(function () {
+            zipUtil = new ZipUtil()
+        })
+        afterEach(function () {
+            sinon.restore()
+        })
+
+        it('Should generate zip for file scan and return expected metadata', async function () {
+            const zipMetadata = await zipUtil.generateZip(vscode.Uri.file(appCodePath), CodeAnalysisScope.FILE_AUTO)
+            assert.strictEqual(zipMetadata.lines, 49)
+            assert.ok(zipMetadata.rootDir.includes(codeScanTruncDirPrefix))
+            assert.ok(zipMetadata.srcPayloadSizeInBytes > 0)
+            assert.strictEqual(zipMetadata.scannedFiles.size, 1)
+            assert.strictEqual(zipMetadata.buildPayloadSizeInBytes, 0)
+            assert.ok(zipMetadata.zipFileSizeInBytes > 0)
+            assert.ok(zipMetadata.zipFilePath.includes(codeScanTruncDirPrefix))
+        })
+
+        it('Should throw error if payload size limit is reached for file scan', async function () {
+            sinon.stub(zipUtil, 'reachSizeLimit').returns(true)
+
+            await assert.rejects(
+                () => zipUtil.generateZip(vscode.Uri.file(appCodePath), CodeAnalysisScope.FILE_AUTO),
+                new ToolkitError(`Payload size limit reached`, { code: 'FileSizeExceeded' })
+            )
+        })
+
+        it('Should generate zip for project scan and return expected metadata', async function () {
+            const zipMetadata = await zipUtil.generateZip(vscode.Uri.file(appCodePath), CodeAnalysisScope.PROJECT)
+            assert.ok(zipMetadata.lines > 0)
+            assert.ok(zipMetadata.rootDir.includes(codeScanTruncDirPrefix))
+            assert.ok(zipMetadata.srcPayloadSizeInBytes > 0)
+            assert.ok(zipMetadata.scannedFiles.size > 0)
+            assert.strictEqual(zipMetadata.buildPayloadSizeInBytes, 0)
+            assert.ok(zipMetadata.zipFileSizeInBytes > 0)
+            assert.ok(zipMetadata.zipFilePath.includes(codeScanTruncDirPrefix))
+        })
+
+        it('Should throw error if payload size limit is reached for project scan', async function () {
+            sinon.stub(zipUtil, 'reachSizeLimit').returns(true)
+
+            await assert.rejects(
+                () => zipUtil.generateZip(vscode.Uri.file(appCodePath), CodeAnalysisScope.PROJECT),
+                new ToolkitError('Payload size limit reached', { code: 'ProjectSizeExceeded' })
+            )
+        })
+
+        it('Should throw error if payload size limit will be reached for project scan', async function () {
+            sinon.stub(zipUtil, 'willReachSizeLimit').returns(true)
+
+            await assert.rejects(
+                () => zipUtil.generateZip(vscode.Uri.file(appCodePath), CodeAnalysisScope.PROJECT),
+                new ToolkitError('Payload size limit reached', { code: 'ProjectSizeExceeded' })
+            )
+        })
+
+        it('Should throw error if scan type is invalid', async function () {
+            await assert.rejects(
+                () => zipUtil.generateZip(vscode.Uri.file(appCodePath), 'unknown' as CodeAnalysisScope),
+                new ToolkitError('Unknown code analysis scope: unknown')
+            )
+        })
+
+        it('Should read file content instead of from disk if file is dirty', async function () {
+            const zipMetadata = await zipUtil.generateZip(vscode.Uri.file(appCodePath), CodeAnalysisScope.PROJECT)
+
+            const document = await vscode.workspace.openTextDocument(appCodePath)
+            await vscode.window.showTextDocument(document)
+            void vscode.window.activeTextEditor?.edit((editBuilder) => {
+                editBuilder.insert(new vscode.Position(0, 0), '// a comment\n')
+            })
+
+            const zipMetadata2 = await new ZipUtil().generateZip(
+                vscode.Uri.file(appCodePath),
+                CodeAnalysisScope.PROJECT
+            )
+            assert.equal(zipMetadata2.lines, zipMetadata.lines + 1)
+        })
+
+        it('should handle path with repeated project name for file scan', async function () {
+            const zipMetadata = await zipUtil.generateZip(
+                vscode.Uri.file(appCodePathWithRepeatedProjectName),
+                CodeAnalysisScope.FILE_ON_DEMAND
+            )
+
+            const zipFileData = await fs.readFileBytes(zipMetadata.zipFilePath)
+            const zip = await JSZip.loadAsync(zipFileData)
+            const files = Object.keys(zip.files)
+            assert.ok(files.includes(join('workspaceFolder', 'workspaceFolder', 'App.java')))
+        })
+
+        it('should handle path with repeated project name for project scan', async function () {
+            const zipMetadata = await zipUtil.generateZip(
+                vscode.Uri.file(appCodePathWithRepeatedProjectName),
+                CodeAnalysisScope.PROJECT
+            )
+
+            const zipFileData = await fs.readFileBytes(zipMetadata.zipFilePath)
+            const zip = await JSZip.loadAsync(zipFileData)
+            const files = Object.keys(zip.files)
+            assert.ok(files.includes(join('workspaceFolder', 'workspaceFolder', 'App.java')))
+        })
+    })
+})
diff --git a/packages/core/src/test/codewhispererChat/editor/codelens.test.ts b/packages/core/src/test/codewhispererChat/editor/codelens.test.ts
new file mode 100644
index 00000000000..52243027ebf
--- /dev/null
+++ b/packages/core/src/test/codewhispererChat/editor/codelens.test.ts
@@ -0,0 +1,192 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import vscode from 'vscode'
+import {
+    TryChatCodeLensProvider,
+    resolveModifierKey,
+    tryChatCodeLensCommand,
+} from '../../../codewhispererChat/editor/codelens'
+import { assertTelemetry, installFakeClock, tryRegister } from '../../testUtil'
+import { InstalledClock } from '@sinonjs/fake-timers'
+import globals from '../../../shared/extensionGlobals'
+import { focusAmazonQPanel } from '../../../codewhispererChat/commands/registerCommands'
+import sinon from 'sinon'
+import { AuthState, AuthStates, AuthUtil, FeatureAuthState } from '../../../codewhisperer/util/authUtil'
+import { inlinehintKey } from '../../../codewhisperer/models/constants'
+import {
+    AutotriggerState,
+    EndState,
+    ManualtriggerState,
+    PressTabState,
+    TryMoreExState,
+} from '../../../codewhisperer/views/lineAnnotationController'
+
+describe('TryChatCodeLensProvider', () => {
+    let instance: TryChatCodeLensProvider
+    let cancellationTokenSource: vscode.CancellationTokenSource
+    let clock: InstalledClock
+    const codeLensPosition = new vscode.Position(1, 2)
+
+    let isAmazonQVisibleEventEmitter: vscode.EventEmitter<boolean>
+    let isAmazonQVisibleEvent: vscode.Event<boolean>
+
+    before(async function () {
+        // HACK: We need to register these commands since the `core` `activate()` function
+        // does not run Amazon Q `activate()` functions anymore. Due to this we need to register the Commands
+        // that originally would have been registered by the `core` `activate()` at some point
+        tryRegister(tryChatCodeLensCommand)
+        tryRegister(focusAmazonQPanel)
+    })
+
+    beforeEach(async function () {
+        isAmazonQVisibleEventEmitter = new vscode.EventEmitter<boolean>()
+        isAmazonQVisibleEvent = isAmazonQVisibleEventEmitter.event
+        instance = new TryChatCodeLensProvider(isAmazonQVisibleEvent, () => codeLensPosition)
+        clock = installFakeClock()
+    })
+
+    afterEach(function () {
+        isAmazonQVisibleEventEmitter.dispose()
+        instance.dispose()
+        cancellationTokenSource?.dispose()
+        clock.uninstall()
+        sinon.restore()
+    })
+
+    function stubConnection(state: AuthState) {
+        return sinon.stub(AuthUtil.instance, 'getChatAuthStateSync').returns({ amazonQ: state } as FeatureAuthState)
+    }
+
+    it('keeps returning a code lense until it hits the max times it should show', async function () {
+        stubConnection('connected')
+        isAmazonQVisibleEventEmitter.fire(false)
+        let codeLensCount = 0
+        const modifierKey = resolveModifierKey()
+        while (codeLensCount < 10) {
+            cancellationTokenSource = new vscode.CancellationTokenSource()
+            const resultPromise = instance.provideCodeLenses({} as any, cancellationTokenSource.token)
+            clock.tick(TryChatCodeLensProvider.debounceMillis) // skip debounce
+
+            assert.deepStrictEqual(await resultPromise, [
+                {
+                    range: new vscode.Range(codeLensPosition, codeLensPosition),
+                    command: {
+                        title: `Amazon Q: open chat with (${modifierKey} + i) - showing ${
+                            TryChatCodeLensProvider.maxCount - codeLensCount
+                        } more times`,
+                        command: tryChatCodeLensCommand.id,
+                    },
+                    isResolved: true,
+                },
+            ])
+
+            codeLensCount++
+        }
+        const emptyResult = await instance.provideCodeLenses({} as any, new vscode.CancellationTokenSource().token)
+        assert.deepStrictEqual(emptyResult, [])
+    })
+
+    it('does not register the provider if we do not want to show the code lens', async function () {
+        await TryChatCodeLensProvider.register(isAmazonQVisibleEvent)
+        // indicate we do not want to show it
+        await globals.globalState.update('aws.amazonq.showTryChatCodeLens', false)
+        // ensure we do not show it
+        assert.deepStrictEqual(await TryChatCodeLensProvider.register(isAmazonQVisibleEvent), false)
+
+        // indicate we want to show it
+        await globals.globalState.update('aws.amazonq.showTryChatCodeLens', true)
+        // The general toolkit activation will have already registered this provider, so it throws when we try again
+        // But if it throws it implies it tried to register it.
+        await assert.rejects(TryChatCodeLensProvider.register(isAmazonQVisibleEvent), {
+            message: `${TryChatCodeLensProvider.name} can only be registered once.`,
+        })
+    })
+
+    it('does NOT show codelens if amazon Q is not connected', async function () {
+        const testConnection = async (state: AuthState) => {
+            const stub = stubConnection(state)
+
+            const emptyResult = await instance.provideCodeLenses({} as any, new vscode.CancellationTokenSource().token)
+            assert.deepStrictEqual(emptyResult, [], `codelens shown with state: ${state}`)
+            stub.restore()
+        }
+
+        const testStates = Object.values(AuthStates).filter((s) => s !== AuthStates.connected)
+        for (const state of testStates) {
+            await testConnection(state)
+        }
+    })
+
+    it('does show codelens if lineAnnotationController (tips) is in end state', async function () {
+        stubConnection('connected')
+        isAmazonQVisibleEventEmitter.fire(false)
+        // indicate lineAnnotationController is not visible and in end state
+        await globals.globalState.update(inlinehintKey, EndState.id)
+
+        let codeLensCount = 0
+        const modifierKey = resolveModifierKey()
+        while (codeLensCount < 10) {
+            cancellationTokenSource = new vscode.CancellationTokenSource()
+            const resultPromise = instance.provideCodeLenses({} as any, cancellationTokenSource.token)
+            clock.tick(TryChatCodeLensProvider.debounceMillis) // skip debounce
+
+            assert.deepStrictEqual(await resultPromise, [
+                {
+                    range: new vscode.Range(codeLensPosition, codeLensPosition),
+                    command: {
+                        title: `Amazon Q: open chat with (${modifierKey} + i) - showing ${
+                            TryChatCodeLensProvider.maxCount - codeLensCount
+                        } more times`,
+                        command: tryChatCodeLensCommand.id,
+                    },
+                    isResolved: true,
+                },
+            ])
+
+            codeLensCount++
+        }
+        const emptyResult = await instance.provideCodeLenses({} as any, new vscode.CancellationTokenSource().token)
+        assert.deepStrictEqual(emptyResult, [])
+    })
+
+    it('does NOT show codelens if lineAnnotationController (tips) is visible', async function () {
+        stubConnection('connected')
+        // indicate lineAnnotationController is visible and not in end state
+        const lineAnnotationControllerStates: string[] = [
+            AutotriggerState.id,
+            PressTabState.id,
+            ManualtriggerState.id,
+            TryMoreExState.id,
+        ]
+
+        // eslint-disable-next-line unicorn/no-array-for-each
+        lineAnnotationControllerStates.forEach((id: string) => {
+            it(`id - ${id}`, async () => {
+                await globals.globalState.update(inlinehintKey, id)
+
+                const emptyResult = await instance.provideCodeLenses(
+                    {} as any,
+                    new vscode.CancellationTokenSource().token
+                )
+
+                assert.deepStrictEqual(emptyResult, [])
+            })
+        })
+    })
+
+    it('does NOT show codelens if amazon Q chat is open', async function () {
+        stubConnection('connected')
+        isAmazonQVisibleEventEmitter.fire(true)
+        const emptyResult = await instance.provideCodeLenses({} as any, new vscode.CancellationTokenSource().token)
+        assert.deepStrictEqual(emptyResult, [])
+    })
+
+    it('outputs expected telemetry', async function () {
+        await tryChatCodeLensCommand.execute()
+        assertTelemetry('vscode_executeCommand', { command: focusAmazonQPanel.id, source: 'codeLens' })
+    })
+})
diff --git a/packages/core/src/test/credentials/auth.test.ts b/packages/core/src/test/credentials/auth.test.ts
new file mode 100644
index 00000000000..a409f2ba2e2
--- /dev/null
+++ b/packages/core/src/test/credentials/auth.test.ts
@@ -0,0 +1,674 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import fs from '../../shared/fs/fs'
+import { ToolkitError, isUserCancelledError } from '../../shared/errors'
+import { assertTreeItem } from '../shared/treeview/testUtil'
+import { getTestWindow } from '../shared/vscode/window'
+import { assertTelemetry, captureEventOnce } from '../testUtil'
+import { createBuilderIdProfile, createSsoProfile, createTestAuth } from './testUtil'
+import { toCollection } from '../../shared/utilities/asyncCollection'
+import globals from '../../shared/extensionGlobals'
+import { makeTemporaryToolkitFolder } from '../../shared/filesystemUtilities'
+import { SharedCredentialsProviderFactory } from '../../auth/providers/sharedCredentialsProviderFactory'
+import { UserCredentialsUtils } from '../../shared/credentials/userCredentialsUtils'
+import { getCredentialsFilename } from '../../auth/credentials/sharedCredentialsFile'
+import { Connection, isIamConnection, isSsoConnection, scopesSsoAccountAccess } from '../../auth/connection'
+import { AuthNode, createDeleteConnectionButton, promptForConnection } from '../../auth/utils'
+
+const ssoProfile = createSsoProfile()
+const scopedSsoProfile = createSsoProfile({ scopes: ['foo'] })
+
+describe('Auth', function () {
+    let auth: ReturnType<typeof createTestAuth>
+
+    beforeEach(function () {
+        auth = createTestAuth(globals.globalState)
+    })
+
+    it('can create a new sso connection', async function () {
+        const conn = await auth.createConnection(ssoProfile)
+        assert.strictEqual(conn.type, 'sso')
+    })
+
+    it('can list connections', async function () {
+        const conn1 = await auth.createConnection(ssoProfile)
+        const conn2 = await auth.createConnection(scopedSsoProfile)
+        assert.deepStrictEqual(
+            (await auth.listConnections()).map((c) => c.id),
+            [conn1.id, conn2.id]
+        )
+    })
+
+    it('can get a connection', async function () {
+        const conn = await auth.createConnection(ssoProfile)
+        assert.ok(await auth.getConnection({ id: conn.id }))
+    })
+
+    it('can delete a connection', async function () {
+        const conn = await auth.createConnection(ssoProfile)
+        await auth.deleteConnection({ id: conn.id })
+        assert.strictEqual((await auth.listConnections()).length, 0)
+        assertTelemetry('auth_modifyConnection', [
+            {
+                action: 'addProfile',
+                connectionState: 'unauthenticated',
+                source: 'Auth#createConnection:ProfileStore#addProfile',
+            },
+            {
+                action: 'getProfile',
+                connectionState: 'unauthenticated',
+                source: 'Auth#createConnection,updateConnectionState:ProfileStore#getProfileOrThrow',
+            },
+            {
+                action: 'updateConnectionState',
+                connectionState: 'valid',
+                source: 'Auth#createConnection,updateConnectionState',
+                sessionDuration: undefined,
+            },
+            {
+                action: 'getProfile',
+                connectionState: 'valid',
+                source: 'Auth#deleteConnection,invalidateConnection:ProfileStore#getProfileOrThrow',
+            },
+            {
+                action: 'updateConnectionState',
+                connectionState: 'invalid',
+                source: 'Auth#deleteConnection,invalidateConnection,updateConnectionState',
+                sessionDuration: 11223355,
+            },
+        ])
+    })
+
+    it('can delete an active connection', async function () {
+        const conn = await auth.createConnection(ssoProfile)
+        await auth.useConnection(conn)
+        assert.ok(auth.activeConnection)
+        await auth.deleteConnection(auth.activeConnection)
+        assert.strictEqual((await auth.listConnections()).length, 0)
+        assert.strictEqual(auth.activeConnection, undefined)
+        assertTelemetry('auth_modifyConnection', [
+            {
+                action: 'addProfile',
+                connectionState: 'unauthenticated',
+                source: 'Auth#createConnection:ProfileStore#addProfile',
+            },
+            {
+                action: 'getProfile',
+                connectionState: 'unauthenticated',
+                source: 'Auth#createConnection,updateConnectionState:ProfileStore#getProfileOrThrow',
+            },
+            {
+                action: 'updateConnectionState',
+                connectionState: 'valid',
+                source: 'Auth#createConnection,updateConnectionState',
+                sessionDuration: undefined,
+            },
+            {
+                action: 'getProfile',
+                connectionState: 'valid',
+                source: 'Auth#useConnection,refreshConnectionState,validateConnection,updateConnectionState:ProfileStore#getProfileOrThrow',
+            },
+            {
+                action: 'updateConnectionState',
+                connectionState: 'invalid',
+                source: 'Auth#deleteConnection,logout,invalidateConnection,updateConnectionState',
+                sessionDuration: 11223355,
+            },
+        ])
+    })
+
+    it('does not throw when creating a duplicate connection', async function () {
+        const initialConn = await auth.createConnection(ssoProfile)
+        const duplicateConn = await auth.createConnection(ssoProfile)
+        assert.notStrictEqual(initialConn.id, duplicateConn.id)
+    })
+
+    it('throws when using an invalid connection that was deleted', async function () {
+        const conn = await auth.createInvalidSsoConnection(ssoProfile)
+        await auth.deleteConnection(conn)
+        await assert.rejects(() => conn.getToken())
+    })
+
+    it('can logout and fires an event', async function () {
+        const conn = await auth.createConnection(ssoProfile)
+        await auth.useConnection(conn)
+        assert.strictEqual(auth.activeConnection?.id, conn.id)
+        await auth.logout()
+        assert.strictEqual(auth.activeConnection, undefined)
+        assert.strictEqual(auth.activeConnectionEvents.last, undefined)
+        assertTelemetry('auth_modifyConnection', [
+            {
+                action: 'addProfile',
+                connectionState: 'unauthenticated',
+                source: 'Auth#createConnection:ProfileStore#addProfile',
+            },
+            {
+                action: 'getProfile',
+                connectionState: 'unauthenticated',
+                source: 'Auth#createConnection,updateConnectionState:ProfileStore#getProfileOrThrow',
+            },
+            {
+                action: 'updateConnectionState',
+                connectionState: 'valid',
+                source: 'Auth#createConnection,updateConnectionState',
+                sessionDuration: undefined,
+            },
+            {
+                action: 'getProfile',
+                connectionState: 'valid',
+                source: 'Auth#useConnection,refreshConnectionState,validateConnection,updateConnectionState:ProfileStore#getProfileOrThrow',
+            },
+            {
+                action: 'updateConnectionState',
+                connectionState: 'invalid',
+                source: 'Auth#logout,invalidateConnection,updateConnectionState',
+                sessionDuration: 11223355,
+            },
+        ])
+    })
+
+    describe('useConnection', function () {
+        it('does not reauthenticate if the connection is invalid', async function () {
+            const conn = await auth.createInvalidSsoConnection(ssoProfile)
+            await auth.useConnection(conn)
+            assert.strictEqual(auth.activeConnection?.state, 'invalid')
+        })
+
+        it('fires an event', async function () {
+            const conn = await auth.createConnection(ssoProfile)
+            await auth.useConnection(conn)
+            assert.strictEqual(auth.activeConnectionEvents.emits[0]?.id, conn.id)
+        })
+
+        it('sets the active connection even when the underlying provider throws', async function () {
+            const err = new Error('test')
+            const conn = await auth.createConnection(ssoProfile)
+            auth.getTestTokenProvider(conn)?.getToken.rejects(err)
+            await auth.useConnection(conn)
+            assert.strictEqual(auth.activeConnection?.id, conn.id)
+            assert.strictEqual(auth.getInvalidationReason(conn), err)
+        })
+    })
+
+    it('can login and fires an event', async function () {
+        const conn = await auth.createConnection(ssoProfile)
+        await auth.useConnection(conn)
+        assert.strictEqual(auth.activeConnection?.id, conn.id)
+        assert.strictEqual(auth.activeConnection.state, 'valid')
+        assert.strictEqual(auth.activeConnectionEvents.emits[0]?.id, conn.id)
+    })
+
+    it('uses the persisted connection if available (valid)', async function () {
+        const conn = await auth.createConnection(ssoProfile)
+        await auth.profileStore.setCurrentProfileId(conn.id)
+        await auth.restorePreviousSession()
+        assert.strictEqual(auth.activeConnection?.state, 'valid')
+    })
+
+    it('uses the persisted connection if available (invalid)', async function () {
+        const conn = await auth.createInvalidSsoConnection(ssoProfile)
+        auth.getTestTokenProvider(conn).getToken.resolves(undefined)
+        await auth.profileStore.setCurrentProfileId(conn.id)
+        await auth.restorePreviousSession()
+        assert.strictEqual(auth.activeConnection?.state, 'invalid')
+    })
+
+    it('prevents concurrent `reauthenticate` operations on the same connection', async function () {
+        const conn = await auth.createInvalidSsoConnection(ssoProfile)
+        await Promise.all([auth.reauthenticate(conn), auth.reauthenticate(conn)])
+        const t1 = await conn.getToken()
+        assert.strictEqual(t1.accessToken, '2', 'Only two tokens should have been created')
+        const t3 = await auth.reauthenticate(conn).then((c) => c.getToken())
+        assert.notStrictEqual(t1.accessToken, t3.accessToken, 'Access tokens should change after `reauthenticate`')
+    })
+
+    describe('updateConnection', function () {
+        const updatedProfile = createSsoProfile({
+            ...ssoProfile,
+            scopes: [...(ssoProfile.scopes ?? []), 'my:scope'],
+        })
+
+        it('keeps the same connection id after updating', async function () {
+            const conn = await auth.createConnection(ssoProfile)
+            const updated = await auth.updateConnection(conn, updatedProfile)
+
+            assert.strictEqual(conn.id, updated.id)
+            assert.deepStrictEqual(updated.scopes, updatedProfile.scopes)
+        })
+
+        it('does not change the connection state', async function () {
+            const conn = await auth.createConnection(ssoProfile)
+            const originalState = auth.getConnectionState(conn)
+            const updated = await auth.updateConnection(conn, updatedProfile)
+
+            assert.strictEqual(auth.getConnectionState(updated), originalState)
+        })
+
+        it('fires an event when updating', async function () {
+            const conn = await auth.createConnection(ssoProfile)
+            await auth.updateConnection(conn, updatedProfile)
+
+            assert.strictEqual(auth.updateConnectionEvents.emits.length, 1)
+            assert.ok(isSsoConnection(auth.updateConnectionEvents.last))
+            assert.deepStrictEqual(auth.updateConnectionEvents.last.scopes, updatedProfile.scopes)
+        })
+
+        it('fires an event when updating the active connection', async function () {
+            const conn = await auth.createConnection(ssoProfile)
+            await auth.useConnection(conn)
+            await auth.updateConnection(conn, updatedProfile)
+
+            assert.ok(isSsoConnection(auth.activeConnectionEvents.last))
+            assert.deepStrictEqual(auth.activeConnectionEvents.last.scopes, updatedProfile.scopes)
+        })
+    })
+
+    const expiredConnPattern = /connection ".*?" is invalid or expired/i
+    it('releases all notification locks after reauthenticating', async function () {
+        const conn = await auth.createInvalidSsoConnection(ssoProfile)
+        const pendingToken = conn.getToken()
+        await getTestWindow().waitForMessage(expiredConnPattern)
+        await auth.reauthenticate(conn)
+        await assert.rejects(pendingToken)
+        assert.ok(await conn.getToken())
+    })
+
+    async function runExpiredConnectionFlow(conn: Connection, selection: string | RegExp) {
+        const creds = conn.type === 'sso' ? conn.getToken() : conn.getCredentials()
+        const message = await getTestWindow().waitForMessage(expiredConnPattern)
+        message.selectItem(selection)
+
+        return creds
+    }
+
+    describe('SSO Connections', function () {
+        it('creates a new token if one does not exist', async function () {
+            const conn = await auth.createConnection(ssoProfile)
+            const provider = auth.getTestTokenProvider(conn)
+            assert.deepStrictEqual(await provider.getToken(), await conn.getToken())
+        })
+
+        it('prompts the user if the token is invalid or expired', async function () {
+            const conn = await auth.createInvalidSsoConnection(ssoProfile)
+            const token = await runExpiredConnectionFlow(conn, /login/i)
+            assert.notStrictEqual(token, undefined)
+        })
+
+        it('using the connection lazily updates the state', async function () {
+            const conn = await auth.createConnection(ssoProfile)
+            await auth.useConnection(conn)
+            await auth.invalidateCachedCredentials(conn)
+
+            const token = runExpiredConnectionFlow(conn, /no/i)
+            await assert.rejects(token, ToolkitError)
+
+            assert.strictEqual(auth.activeConnection?.state, 'invalid')
+        })
+
+        it('chains errors when handling invalid connections', async function () {
+            const err1 = new ToolkitError('test', { code: 'test' })
+            const conn = await auth.createConnection(ssoProfile)
+            auth.getTestTokenProvider(conn)?.getToken.rejects(err1)
+            const err2 = await runExpiredConnectionFlow(conn, /no/i).catch((e) => e)
+            assert.ok(err2 instanceof ToolkitError)
+            assert.strictEqual(err2.cause, err1)
+        })
+
+        it('bubbles up networking issues instead of invalidating the connection', async function () {
+            const expected = new ToolkitError('test', { code: 'ETIMEDOUT' })
+            const conn = await auth.createConnection(ssoProfile)
+            auth.getTestTokenProvider(conn)?.getToken.rejects(expected)
+            const actual = await conn.getToken().catch((e) => e)
+            assert.ok(actual instanceof ToolkitError)
+            assert.strictEqual(actual.cause, expected)
+            assert.strictEqual(auth.getConnectionState(conn), 'valid')
+        })
+
+        it('connection is not invalidated when networking issue during connection refresh', async function () {
+            const networkError = new ToolkitError('test', { code: 'ETIMEDOUT' })
+            const expectedError = new ToolkitError('Failed to update connection due to networking issues', {
+                cause: networkError,
+                code: 'ETIMEDOUT',
+            })
+            const conn = await auth.createConnection(ssoProfile)
+            auth.getTestTokenProvider(conn)?.getToken.rejects(networkError)
+            const actual = await auth.refreshConnectionState(conn).catch((e) => e)
+            assert.ok(actual instanceof ToolkitError)
+            assert.deepStrictEqual(actual, expectedError)
+            assert.strictEqual(auth.getConnectionState(conn), 'valid')
+        })
+
+        it('reauthentication flag is set at start of reauth process', async function () {
+            const conn = await auth.createInvalidSsoConnection(ssoProfile)
+            await auth.reauthenticate(conn)
+            auth.getTestTokenProvider(conn).createToken.calledWith({ isReAuth: true })
+        })
+    })
+
+    describe('Linked Connections', function () {
+        const linkedSsoProfile = createSsoProfile({ scopes: scopesSsoAccountAccess })
+        const accountRoles = [
+            { accountId: '1245678910', roleName: 'foo' },
+            { accountId: '9876543210', roleName: 'foo' },
+            { accountId: '9876543210', roleName: 'bar' },
+        ]
+
+        beforeEach(function () {
+            auth.ssoClient.listAccounts.returns(
+                toCollection(async function* () {
+                    yield [{ accountId: '1245678910' }, { accountId: '9876543210' }]
+                })
+            )
+
+            auth.ssoClient.listAccountRoles.callsFake((req) =>
+                toCollection(async function* () {
+                    yield accountRoles.filter((i) => i.accountId === req.accountId)
+                })
+            )
+
+            auth.ssoClient.getRoleCredentials.resolves({
+                accessKeyId: 'xxx',
+                secretAccessKey: 'xxx',
+                expiration: new Date(Date.now() + 1000000),
+            })
+
+            sinon.stub(globals.loginManager, 'validateCredentials').resolves('')
+        })
+
+        afterEach(function () {
+            sinon.restore()
+        })
+
+        it('lists linked conections for SSO connections', async function () {
+            await auth.createConnection(linkedSsoProfile)
+            const connections = await auth.listAndTraverseConnections().promise()
+            assert.deepStrictEqual(
+                connections.map((c) => c.type),
+                ['sso', 'iam', 'iam', 'iam']
+            )
+        })
+
+        it('shows a user message if SSO connection returned no accounts/roles', async function () {
+            auth.ssoClient.listAccounts.returns(
+                toCollection(async function* () {
+                    yield []
+                })
+            )
+            await auth.createConnection(linkedSsoProfile)
+            await auth.listAndTraverseConnections().promise()
+            assert.strictEqual(
+                getTestWindow().shownMessages[0].message,
+                'IAM Identity Center (d-0123456789) returned no roles. Ensure the user is assigned to an account with a Permission Set.'
+            )
+        })
+
+        it('does not gather linked accounts when calling `listConnections`', async function () {
+            await auth.createConnection(linkedSsoProfile)
+            const connections = await auth.listConnections()
+            assert.deepStrictEqual(
+                connections.map((c) => c.type),
+                ['sso']
+            )
+        })
+
+        it('caches linked conections when the source connection becomes invalid', async function () {
+            const conn = await auth.createConnection(linkedSsoProfile)
+            await auth.listAndTraverseConnections().promise()
+            await auth.invalidateCachedCredentials(conn)
+
+            const connections = await auth.listConnections()
+            assert.deepStrictEqual(
+                connections.map((c) => c.type),
+                ['sso', 'iam', 'iam', 'iam']
+            )
+        })
+
+        it('gracefully handles source connections becoming invalid when discovering linked accounts', async function () {
+            await auth.createConnection(linkedSsoProfile)
+            auth.ssoClient.listAccounts.rejects(new Error('No access'))
+            const connections = await auth.listAndTraverseConnections().promise()
+            assert.deepStrictEqual(
+                connections.map((c) => c.type),
+                ['sso']
+            )
+        })
+
+        it('removes linked connections when the source connection is deleted', async function () {
+            const conn = await auth.createConnection(linkedSsoProfile)
+            await auth.listAndTraverseConnections().promise()
+            await auth.deleteConnection(conn)
+
+            assert.deepStrictEqual(await auth.listAndTraverseConnections().promise(), [])
+        })
+
+        it('prompts the user to reauthenticate if the source connection becomes invalid', async function () {
+            const source = await auth.createConnection(linkedSsoProfile)
+            const conn = await auth.listAndTraverseConnections().find((c) => isIamConnection(c) && c.id.includes('sso'))
+            assert.ok(conn)
+            await auth.useConnection(conn)
+            await auth.reauthenticate(conn)
+            await auth.invalidateCachedCredentials(conn)
+            await auth.invalidateCachedCredentials(source)
+
+            await runExpiredConnectionFlow(conn, /login/i)
+            assert.strictEqual(auth.getConnectionState(source), 'valid')
+            assert.strictEqual(auth.getConnectionState(conn), 'valid')
+        })
+
+        describe('Multiple Connections', function () {
+            const otherProfile = createBuilderIdProfile({ scopes: scopesSsoAccountAccess })
+
+            // Equivalent profiles from multiple sources is a fairly rare situation right now
+            // Ideally they would be de-duped although the implementation can be tricky
+            it('can handle multiple SSO connection and does not de-dupe', async function () {
+                await auth.createConnection(linkedSsoProfile)
+                await auth.createConnection(otherProfile)
+
+                const connections = await auth.listAndTraverseConnections().promise()
+                assert.deepStrictEqual(
+                    connections.map((c) => c.type),
+                    ['sso', 'sso', 'iam', 'iam', 'iam', 'iam', 'iam', 'iam'],
+                    'Expected two SSO connections and 3 IAM connections for each SSO connection'
+                )
+            })
+
+            it('does not stop discovery if one connection fails', async function () {
+                const otherProfile = createBuilderIdProfile({ scopes: scopesSsoAccountAccess })
+                await auth.createConnection(linkedSsoProfile)
+                await auth.createConnection(otherProfile)
+                auth.ssoClient.listAccounts.onFirstCall().rejects(new Error('No access'))
+                const connections = await auth.listAndTraverseConnections().promise()
+                assert.deepStrictEqual(
+                    connections.map((c) => c.type),
+                    ['sso', 'sso', 'iam', 'iam', 'iam']
+                )
+            })
+        })
+    })
+
+    describe('Shared ini files', function () {
+        let tmpDir: string
+
+        beforeEach(async function () {
+            tmpDir = await makeTemporaryToolkitFolder()
+            sinon.stub(fs, 'getUserHomeDir').returns(tmpDir)
+            sinon.stub(globals.loginManager, 'validateCredentials').resolves('123')
+            auth.credentialsManager.addProviderFactory(new SharedCredentialsProviderFactory())
+        })
+
+        afterEach(async function () {
+            sinon.restore()
+            await fs.delete(tmpDir, { recursive: true })
+        })
+
+        it('does not cache if the credentials file changes', async function () {
+            const initialCreds = {
+                profileName: 'default',
+                accessKey: 'x',
+                secretKey: 'x',
+            }
+
+            await UserCredentialsUtils.generateCredentialsFile(initialCreds)
+
+            const conn = await auth.getConnection({ id: 'profile:default' })
+            assert.ok(conn?.type === 'iam', 'Expected an IAM connection')
+            assert.deepStrictEqual(await conn.getCredentials(), {
+                accessKeyId: initialCreds.accessKey,
+                secretAccessKey: initialCreds.secretKey,
+                sessionToken: undefined,
+            })
+
+            await fs.delete(getCredentialsFilename())
+
+            const newCreds = { ...initialCreds, accessKey: 'y', secretKey: 'y' }
+            await UserCredentialsUtils.generateCredentialsFile(newCreds)
+            assert.deepStrictEqual(await conn.getCredentials(), {
+                accessKeyId: newCreds.accessKey,
+                secretAccessKey: newCreds.secretKey,
+                sessionToken: undefined,
+            })
+        })
+    })
+
+    describe('AuthNode', function () {
+        it('shows a login message if not connected', async function () {
+            await auth.createConnection(ssoProfile)
+            const node = new AuthNode(auth)
+            await assertTreeItem(node, { label: 'Select a connection...' })
+        })
+
+        it('shows the connection if valid', async function () {
+            const node = new AuthNode(auth)
+            const conn = await auth.createConnection(ssoProfile)
+            await auth.useConnection(conn)
+            await assertTreeItem(node, { label: `Connected with ${conn.label}` })
+        })
+
+        it('shows an error if the connection is invalid', async function () {
+            const node = new AuthNode(auth)
+            const conn = await auth.createInvalidSsoConnection(ssoProfile)
+            auth.getTestTokenProvider(conn).getToken.resolves(undefined)
+            await auth.useConnection(conn)
+            await assertTreeItem(node, { description: 'expired or invalid, click to authenticate' })
+        })
+    })
+
+    describe('promptForConnection', function () {
+        it('shows a list of connections', async function () {
+            getTestWindow().onDidShowQuickPick(async (picker) => {
+                await picker.untilReady()
+                const connItem = picker.findItemOrThrow(/IAM Identity Center/)
+                picker.acceptItem(connItem)
+            })
+
+            const conn = await auth.createConnection(ssoProfile)
+            assert.strictEqual((await promptForConnection(auth))?.id, conn.id)
+        })
+
+        it('shows a second quickPick for linked IAM profiles when selecting an SSO connection', async function () {
+            let quickPickCount = 0
+            getTestWindow().onDidShowQuickPick(async (picker) => {
+                await picker.untilReady()
+                quickPickCount++
+
+                if (quickPickCount === 1) {
+                    // First picker: select the SSO connection
+                    const connItem = picker.findItemOrThrow(/IAM Identity Center/)
+                    picker.acceptItem(connItem)
+                } else if (quickPickCount === 2) {
+                    // Second picker: select the linked IAM profile
+                    const linkedItem = picker.findItemOrThrow(/TestRole/)
+                    picker.acceptItem(linkedItem)
+                }
+            })
+
+            const linkedSsoProfile = createSsoProfile({ scopes: scopesSsoAccountAccess })
+            const conn = await auth.createConnection(linkedSsoProfile)
+
+            // Mock the SSOClient to return account roles
+            auth.ssoClient.listAccounts.returns(
+                toCollection(async function* () {
+                    yield [{ accountId: '123456789012' }]
+                })
+            )
+            auth.ssoClient.listAccountRoles.callsFake(() =>
+                toCollection(async function* () {
+                    yield [{ accountId: '123456789012', roleName: 'TestRole' }]
+                })
+            )
+
+            // Should get a linked IAM profile back, not the SSO connection
+            const result = await promptForConnection(auth)
+            assert.ok(isIamConnection(result || undefined), 'Expected an IAM connection to be returned')
+            assert.ok(
+                result?.id.startsWith(`sso:${conn.id}#`),
+                'Expected the IAM connection to be linked to the SSO connection'
+            )
+        })
+
+        it('refreshes when clicking the refresh button', async function () {
+            getTestWindow().onDidShowQuickPick(async (picker) => {
+                await picker.untilReady()
+                await auth.reauthenticate(conn)
+                picker.pressButton('Refresh')
+                await picker.untilReady()
+                picker.acceptItem(/IAM Identity Center/)
+            })
+
+            const conn = await auth.createInvalidSsoConnection(ssoProfile)
+            await auth.useConnection(conn)
+            assert.strictEqual((await promptForConnection(auth))?.id, conn.id)
+        })
+
+        it('reauthenticates a connection if the user selects an expired one', async function () {
+            getTestWindow().onDidShowQuickPick(async (picker) => {
+                await picker.untilReady()
+                const connItem = picker.findItemOrThrow(/IAM Identity Center/)
+                assert.ok(connItem.description?.match(/expired/i))
+                picker.acceptItem(connItem)
+                await captureEventOnce(picker.onDidChangeSelection)
+                const refreshedConnItem = picker.findItemOrThrow(/IAM Identity Center/)
+                assert.ok(!refreshedConnItem.description?.match(/expired/i))
+                picker.acceptItem(refreshedConnItem)
+            })
+
+            const conn = await auth.createInvalidSsoConnection(ssoProfile)
+            await auth.useConnection(conn)
+            assert.strictEqual((await promptForConnection(auth))?.id, conn.id)
+            assert.strictEqual(getTestWindow().shownQuickPicks.length, 1, 'Two pickers should not be shown')
+        })
+
+        it('deletes a connection', async function () {
+            const deleteButton = createDeleteConnectionButton()
+            getTestWindow().onDidShowQuickPick(async (picker) => {
+                await picker.untilReady()
+                assert.strictEqual(picker.items.length, 3)
+
+                // Delete first connection
+                picker.pressItemButton(/IAM Identity Center/, deleteButton)
+                await picker.untilReady()
+                assert.strictEqual(picker.items.length, 2)
+
+                // Delete second connection
+                picker.pressItemButton(/IAM Identity Center/, deleteButton)
+                await picker.untilReady()
+                assert.strictEqual(picker.items.length, 1)
+
+                picker.pressButton('Exit')
+            })
+
+            // Add 2 connections
+            await auth.createConnection(ssoProfile)
+            await auth.createConnection(scopedSsoProfile)
+            assert.strictEqual((await auth.listConnections()).length, 2)
+
+            await assert.rejects(() => promptForConnection(auth), isUserCancelledError)
+            assert.strictEqual((await auth.listConnections()).length, 0)
+        })
+    })
+})
diff --git a/src/test/credentials/provider/credentialsProviderFactory.test.ts b/packages/core/src/test/credentials/provider/credentialsProviderFactory.test.ts
similarity index 92%
rename from src/test/credentials/provider/credentialsProviderFactory.test.ts
rename to packages/core/src/test/credentials/provider/credentialsProviderFactory.test.ts
index 701e3105f13..860eeca52d2 100644
--- a/src/test/credentials/provider/credentialsProviderFactory.test.ts
+++ b/packages/core/src/test/credentials/provider/credentialsProviderFactory.test.ts
@@ -1,11 +1,11 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
-import { BaseCredentialsProviderFactory } from '../../../credentials/providers/credentialsProviderFactory'
-import { CredentialsProvider, CredentialsProviderType, CredentialsId } from '../../../credentials/providers/credentials'
+import assert from 'assert'
+import { BaseCredentialsProviderFactory } from '../../../auth/providers/credentialsProviderFactory'
+import { CredentialsProvider, CredentialsProviderType, CredentialsId } from '../../../auth/providers/credentials'
 
 describe('BaseCredentialsProviderFactory', async function () {
     /**
diff --git a/src/test/credentials/provider/credentialsProviderId.test.ts b/packages/core/src/test/credentials/provider/credentialsProviderId.test.ts
similarity index 93%
rename from src/test/credentials/provider/credentialsProviderId.test.ts
rename to packages/core/src/test/credentials/provider/credentialsProviderId.test.ts
index 63a052624be..27630185763 100644
--- a/src/test/credentials/provider/credentialsProviderId.test.ts
+++ b/packages/core/src/test/credentials/provider/credentialsProviderId.test.ts
@@ -1,10 +1,10 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
-import { asString, fromString, isEqual } from '../../../credentials/providers/credentials'
+import assert from 'assert'
+import { asString, fromString, isEqual } from '../../../auth/providers/credentials'
 
 describe('CredentialsProviderId', async function () {
     describe('fromString', async function () {
diff --git a/src/test/credentials/provider/credentialsProviderManager.test.ts b/packages/core/src/test/credentials/provider/credentialsProviderManager.test.ts
similarity index 91%
rename from src/test/credentials/provider/credentialsProviderManager.test.ts
rename to packages/core/src/test/credentials/provider/credentialsProviderManager.test.ts
index 89140361672..e3938291e1b 100644
--- a/src/test/credentials/provider/credentialsProviderManager.test.ts
+++ b/packages/core/src/test/credentials/provider/credentialsProviderManager.test.ts
@@ -1,17 +1,17 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
-import { CredentialsProviderFactory } from '../../../credentials/providers/credentialsProviderFactory'
+import assert from 'assert'
+import { CredentialsProviderFactory } from '../../../auth/providers/credentialsProviderFactory'
 import {
     CredentialsProvider,
     CredentialsProviderType,
     CredentialsId,
     isEqual,
-} from '../../../credentials/providers/credentials'
-import { CredentialsProviderManager } from '../../../credentials/providers/credentialsProviderManager'
+} from '../../../auth/providers/credentials'
+import { CredentialsProviderManager } from '../../../auth/providers/credentialsProviderManager'
 
 /**
  * This class helps testing by producing placeholder CredentialsProviders
@@ -19,9 +19,12 @@ import { CredentialsProviderManager } from '../../../credentials/providers/crede
 class TestCredentialsProviderFactory implements CredentialsProviderFactory {
     private readonly providers: CredentialsProvider[] = []
 
-    public constructor(public readonly credentialSource: CredentialsProviderType, providerSubIds: string[]) {
+    public constructor(
+        public readonly credentialSource: CredentialsProviderType,
+        providerSubIds: string[]
+    ) {
         this.providers.push(
-            ...providerSubIds.map<CredentialsProvider>(subId => {
+            ...providerSubIds.map<CredentialsProvider>((subId) => {
                 return makeSampleCredentialsProvider(this.credentialSource, subId, true)
             })
         )
@@ -36,7 +39,7 @@ class TestCredentialsProviderFactory implements CredentialsProviderFactory {
     }
 
     public getProvider(credentialsProviderId: CredentialsId): CredentialsProvider | undefined {
-        const providers = this.providers.filter(p => isEqual(p.getCredentialsId(), credentialsProviderId))
+        const providers = this.providers.filter((p) => isEqual(p.getCredentialsId(), credentialsProviderId))
 
         if (providers.length === 0) {
             return undefined
@@ -103,7 +106,7 @@ describe('CredentialsProviderManager', async function () {
 
             assert.strictEqual(providers.length, 4, 'Manager did not return the expected number of providers')
             assert.ok(
-                providers.some(x =>
+                providers.some((x) =>
                     isEqual(x.getCredentialsId(), {
                         credentialSource: 'profile',
                         credentialTypeId: 'one',
@@ -112,7 +115,7 @@ describe('CredentialsProviderManager', async function () {
                 'Manager did not return the first provider'
             )
             assert.ok(
-                providers.some(x =>
+                providers.some((x) =>
                     isEqual(x.getCredentialsId(), {
                         credentialSource: 'env',
                         credentialTypeId: 'two',
@@ -121,7 +124,7 @@ describe('CredentialsProviderManager', async function () {
                 'Manager did not return the second provider'
             )
             assert.ok(
-                providers.some(x =>
+                providers.some((x) =>
                     isEqual(x.getCredentialsId(), {
                         credentialSource: 'env',
                         credentialTypeId: 'three',
@@ -130,7 +133,7 @@ describe('CredentialsProviderManager', async function () {
                 'Manager did not return the third provider'
             )
             assert.ok(
-                providers.some(x =>
+                providers.some((x) =>
                     isEqual(x.getCredentialsId(), {
                         credentialSource: 'profile',
                         credentialTypeId: 'two',
diff --git a/packages/core/src/test/credentials/provider/ec2CredentialsProvider.test.ts b/packages/core/src/test/credentials/provider/ec2CredentialsProvider.test.ts
new file mode 100644
index 00000000000..6a47769c562
--- /dev/null
+++ b/packages/core/src/test/credentials/provider/ec2CredentialsProvider.test.ts
@@ -0,0 +1,97 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { Ec2MetadataClient, IamInfo, InstanceIdentity } from '../../../shared/clients/ec2MetadataClient'
+import { Ec2CredentialsProvider } from '../../../auth/providers/ec2CredentialsProvider'
+import sinon from 'sinon'
+
+describe('Ec2CredentialsProvider', function () {
+    const dummyRegion = 'dummmyRegion'
+
+    const mockIdentity = {
+        region: dummyRegion,
+    } as InstanceIdentity
+
+    let mockMetadata: Ec2MetadataClient
+    let credentialsProvider: Ec2CredentialsProvider
+    let getIamInfoStub: sinon.SinonStub<any[], any>
+
+    beforeEach(function () {
+        mockMetadata = {} as any as Ec2MetadataClient
+        credentialsProvider = new Ec2CredentialsProvider(mockMetadata)
+        if (getIamInfoStub) {
+            getIamInfoStub.reset()
+        }
+    })
+
+    it('is valid if EC2 metadata service resolves valid IAM status', async function () {
+        mockClient({
+            identity: {} as InstanceIdentity,
+            validIam: true,
+        })
+        assert.strictEqual(await credentialsProvider.isAvailable(), true)
+    })
+
+    it('is invalid if EC2 metadata resolves invalid IAM status', async function () {
+        mockClient({
+            validIam: false,
+        })
+        assert.strictEqual(await credentialsProvider.isAvailable(), false)
+    })
+
+    it('is invalid if EC2 metadata service fails to resolve', async function () {
+        mockClient({
+            fail: true,
+        })
+        assert.strictEqual(await credentialsProvider.isAvailable(), false)
+    })
+
+    it('only validates once per instance', async function () {
+        mockClient({
+            identity: mockIdentity,
+            validIam: true,
+        })
+        await credentialsProvider.isAvailable()
+        await credentialsProvider.isAvailable()
+        assert(getIamInfoStub.calledOnce)
+    })
+
+    it('returns EC2 retrieved region if available', async function () {
+        mockClient({
+            identity: mockIdentity,
+            validIam: true,
+        })
+
+        await credentialsProvider.isAvailable()
+        assert.strictEqual(credentialsProvider.getDefaultRegion(), dummyRegion)
+    })
+
+    it('returns undefined region when not available', async function () {
+        mockClient({
+            identity: {} as InstanceIdentity,
+            validIam: true,
+        })
+
+        await credentialsProvider.isAvailable()
+        assert.strictEqual(credentialsProvider.getDefaultRegion(), undefined)
+    })
+
+    function mockClient(opts: { fail?: boolean; identity?: InstanceIdentity; validIam?: boolean }) {
+        mockMetadata.getInstanceIdentity = sinon.stub().callsFake(() => {
+            if (opts.fail) {
+                throw new Error('foo')
+            } else if (opts.identity) {
+                return opts.identity
+            }
+        })
+
+        const mockIamInfo = {
+            Code: opts.validIam ? 'Success' : 'Failure',
+        } as IamInfo
+        getIamInfoStub = sinon.stub().resolves(mockIamInfo)
+        mockMetadata.getIamInfo = getIamInfoStub
+    }
+})
diff --git a/src/test/credentials/provider/ecsCredentialsProvider.test.ts b/packages/core/src/test/credentials/provider/ecsCredentialsProvider.test.ts
similarity index 87%
rename from src/test/credentials/provider/ecsCredentialsProvider.test.ts
rename to packages/core/src/test/credentials/provider/ecsCredentialsProvider.test.ts
index 92b1e8e1ce2..0008e044902 100644
--- a/src/test/credentials/provider/ecsCredentialsProvider.test.ts
+++ b/packages/core/src/test/credentials/provider/ecsCredentialsProvider.test.ts
@@ -1,17 +1,17 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
-import { Credentials } from 'aws-sdk'
-import { EcsCredentialsProvider } from '../../../credentials/providers/ecsCredentialsProvider'
+import assert from 'assert'
+import { AwsCredentialIdentity } from '@aws-sdk/types'
+import { EcsCredentialsProvider } from '../../../auth/providers/ecsCredentialsProvider'
 import { EnvironmentVariables } from '../../../shared/environmentVariables'
 
 describe('EcsCredentialsProvider', function () {
     const dummyUri = 'dummyUri'
     const dummyRegion = 'dummmyRegion'
-    const dummyCredentials = { accessKeyId: 'dummyKey' } as Credentials
+    const dummyCredentials = { accessKeyId: 'dummyKey' } as AwsCredentialIdentity
     const dummyProvider = () => {
         return Promise.resolve(dummyCredentials)
     }
diff --git a/src/test/credentials/provider/envVarsCredentialsProvider.test.ts b/packages/core/src/test/credentials/provider/envVarsCredentialsProvider.test.ts
similarity index 90%
rename from src/test/credentials/provider/envVarsCredentialsProvider.test.ts
rename to packages/core/src/test/credentials/provider/envVarsCredentialsProvider.test.ts
index 1800d312959..e309d45eb9f 100644
--- a/src/test/credentials/provider/envVarsCredentialsProvider.test.ts
+++ b/packages/core/src/test/credentials/provider/envVarsCredentialsProvider.test.ts
@@ -1,10 +1,10 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
-import { EnvVarsCredentialsProvider } from '../../../credentials/providers/envVarsCredentialsProvider'
+import assert from 'assert'
+import { EnvVarsCredentialsProvider } from '../../../auth/providers/envVarsCredentialsProvider'
 import { EnvironmentVariables } from '../../../shared/environmentVariables'
 
 describe('EnvVarsCredentialsProvider', function () {
diff --git a/packages/core/src/test/credentials/provider/sharedCredentialsProvider.test.ts b/packages/core/src/test/credentials/provider/sharedCredentialsProvider.test.ts
new file mode 100644
index 00000000000..b98ee128cbd
--- /dev/null
+++ b/packages/core/src/test/credentials/provider/sharedCredentialsProvider.test.ts
@@ -0,0 +1,533 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import { SharedCredentialsProvider } from '../../../auth/providers/sharedCredentialsProvider'
+import { stripUndefined } from '../../../shared/utilities/collectionUtils'
+import * as process from '@aws-sdk/credential-provider-process'
+import { ParsedIniData } from '@smithy/shared-ini-file-loader'
+import { SsoClient } from '../../../auth/sso/clients'
+import { stub } from '../../utilities/stubber'
+import { SsoAccessTokenProvider } from '../../../auth/sso/ssoAccessTokenProvider'
+import { createTestSections } from '../testUtil'
+import { DefaultStsClient } from '../../../shared/clients/stsClient'
+import { oneDay } from '../../../shared/datetime'
+import { getTestWindow } from '../../shared/vscode/window'
+
+const missingPropertiesFragment = 'missing properties'
+
+describe('SharedCredentialsProvider', async function () {
+    let sandbox: sinon.SinonSandbox
+
+    before(function () {
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('constructor fails if profile does not exist', async function () {
+        const sections = await createTestSections(`
+        [profile default]
+        aws_access_key_id = x
+        aws_secret_access_key = y
+        `)
+        assert.throws(() => new SharedCredentialsProvider('some-other-profile', sections))
+    })
+
+    it('produces a CredentialsProviderId', async function () {
+        const sections = await createTestSections(`
+        [profile default]
+        aws_access_key_id = x
+        aws_secret_access_key = y
+        `)
+        const sut = new SharedCredentialsProvider('default', sections)
+
+        assert.deepStrictEqual(sut.getCredentialsId(), {
+            credentialSource: 'profile',
+            credentialTypeId: 'default',
+        })
+    })
+
+    it('gets profile properties', async function () {
+        const sections = await createTestSections(`
+        [profile default]
+        aws_access_key_id = x
+        aws_secret_access_key = y
+        region = foo
+        `)
+        const sut = new SharedCredentialsProvider('default', sections)
+
+        assert.strictEqual(sut.getDefaultRegion(), 'foo')
+        assert.strictEqual(await sut.canAutoConnect(), true)
+    })
+
+    it('profile properties may be undefined', async function () {
+        const sections = await createTestSections(`
+        [profile default]
+        aws_access_key_id = x
+        aws_secret_access_key = y
+        `)
+        const sut = new SharedCredentialsProvider('default', sections)
+
+        assert.strictEqual(sut.getDefaultRegion(), undefined)
+    })
+
+    it('validation identifies a source_profile reference that does not exist', async function () {
+        const sections = await createTestSections(`
+        [profile default]
+        role_arn = x
+        source_profile = fakeprofile
+        `)
+        const sut = new SharedCredentialsProvider('default', sections)
+
+        assert.notStrictEqual(sut.validate(), undefined)
+        assertSubstringsInText(sut.validate(), 'not found')
+    })
+
+    it('validation identifies a source_profile reference cycle', async function () {
+        const sections = await createTestSections(`
+        [profile profileA]
+        role_arn = x
+        source_profile = profileB
+
+        [profile profileB]
+        role_arn = x
+        source_profile = profileC
+
+        [profile profileC]
+        role_arn = x
+        source_profile = profileA
+        `)
+        const sut = new SharedCredentialsProvider('profileA', sections)
+
+        assert.notStrictEqual(sut.validate(), undefined)
+        assertSubstringsInText(sut.validate(), 'Cycle detected', 'profileA', 'profileB', 'profileC')
+    })
+
+    it('validation identifies when access key id is missing a corresponding secret key', async function () {
+        const sections = await createTestSections(`
+        [profile default]
+        aws_access_key_id = x
+        `)
+        const sut = new SharedCredentialsProvider('default', sections)
+
+        assert.notStrictEqual(sut.validate(), undefined)
+        assertSubstringsInText(sut.validate(), missingPropertiesFragment, 'aws_secret_access_key')
+    })
+
+    it('validation identifies when session_token is missing a corresponding access key id', async function () {
+        const sections = await createTestSections(`
+        [profile default]
+        aws_secret_access_key = y
+        aws_session_token = z
+        `)
+        const sut = new SharedCredentialsProvider('default', sections)
+
+        assert.notStrictEqual(sut.validate(), undefined)
+        assertSubstringsInText(sut.validate(), missingPropertiesFragment, 'aws_access_key_id')
+    })
+
+    it('validation identifies when session_token is missing a corresponding secret key', async function () {
+        const sections = await createTestSections(`
+        [profile default]
+        aws_access_key_id = x
+        aws_session_token = z
+        `)
+        const sut = new SharedCredentialsProvider('default', sections)
+
+        assert.notStrictEqual(sut.validate(), undefined)
+        assertSubstringsInText(sut.validate(), missingPropertiesFragment, 'aws_secret_access_key')
+    })
+
+    it('validation identifies when the profile contains no supported properties', async function () {
+        const sections = await createTestSections(`
+        [profile default]
+        hello = x
+        `)
+        const sut = new SharedCredentialsProvider('default', sections)
+
+        assert.notStrictEqual(sut.validate(), undefined)
+        assertSubstringsInText(sut.validate(), 'not supported')
+    })
+
+    it('validation identifies an invalid credential_source', async function () {
+        const sections = await createTestSections(`
+        [profile default]
+        credential_source = invalidSource
+        `)
+        const sut = new SharedCredentialsProvider('default', sections)
+
+        assert.notStrictEqual(sut.validate(), undefined)
+        assertSubstringsInText(sut.validate(), 'is not supported', 'invalidSource')
+    })
+
+    it('validation identifies credential_source and source_profile both set', async function () {
+        const sections = await createTestSections(`
+        [profile default]
+        credential_source = EcsContainer
+        source_profile = profile
+        `)
+        const sut = new SharedCredentialsProvider('default', sections)
+
+        assert.notStrictEqual(sut.validate(), undefined)
+        assertSubstringsInText(sut.validate(), 'cannot both be set')
+    })
+
+    it('validates a valid profile with an access key', async function () {
+        const sections = await createTestSections(`
+        [profile default]
+        aws_access_key_id = x
+        aws_secret_access_key = y
+        `)
+        const sut = new SharedCredentialsProvider('default', sections)
+
+        assert.strictEqual(sut.validate(), undefined)
+    })
+
+    it('validates a valid profile with a session token', async function () {
+        const sections = await createTestSections(`
+        [profile default]
+        aws_access_key_id = x
+        aws_secret_access_key = y
+        aws_session_token = z
+        `)
+        const sut = new SharedCredentialsProvider('default', sections)
+
+        assert.strictEqual(sut.validate(), undefined)
+    })
+
+    it('validates a valid profile with credential_process', async function () {
+        const sections = await createTestSections(`
+        [profile default]
+        credential_process = x
+        `)
+        const sut = new SharedCredentialsProvider('default', sections)
+
+        assert.strictEqual(sut.validate(), undefined)
+    })
+
+    it('validates a valid profile with role_arn', async function () {
+        const sections = await createTestSections(`
+        [profile default]
+        role_arn = x
+        `)
+        const sut = new SharedCredentialsProvider('default', sections)
+
+        assert.strictEqual(sut.validate(), undefined)
+    })
+
+    it('validates a valid profile with role_arn and source_profile', async function () {
+        const sections = await createTestSections(`
+        [profile default]
+        role_arn = x
+        source_profile = B
+
+        [profile B]
+        aws_access_key_id = x
+        aws_secret_access_key = y
+        `)
+        const sut = new SharedCredentialsProvider('default', sections)
+
+        assert.strictEqual(sut.validate(), undefined)
+    })
+
+    it('validates a valid profile with credential_source', async function () {
+        const sections = await createTestSections(`
+        [profile default]
+        credential_source = EcsContainer
+        `)
+        const sut = new SharedCredentialsProvider('default', sections)
+        assert.strictEqual(sut.validate(), undefined)
+    })
+
+    it('isAvailable false when the profile is not valid', async function () {
+        const sections = await createTestSections(`
+        [profile default]
+        aws_access_key_id = x
+        `)
+        const sut = new SharedCredentialsProvider('default', sections)
+
+        assert.strictEqual(await sut.isAvailable(), false)
+    })
+
+    it('getCredentials throws when unsupported credential source', async function () {
+        const sections = await createTestSections(`
+        [profile default]
+        credential_source = invalid
+        `)
+        const sut = new SharedCredentialsProvider('default', sections)
+
+        try {
+            await sut.getCredentials()
+            assert.fail('expected exception')
+        } catch (err) {}
+    })
+
+    describe('sso-session', function () {
+        const creds = {
+            accessKeyId: 'x',
+            secretAccessKey: 'y',
+            expiration: undefined,
+        }
+
+        const defaultProfile = `
+        [profile default]
+        sso_session = default
+        sso_account_id = 012345678910
+        sso_role_name = MyRole
+        `
+
+        const defaultSession = `
+        [sso-session default]
+        sso_region = us-east-1
+        sso_start_url = https://d-xxxxxxxxx.awsapps.com/start
+        sso_registration_scopes = sso:account:access
+        `
+
+        beforeEach(function () {
+            const client = stub(SsoClient, { region: 'foo' })
+            client.getRoleCredentials.callsFake(async (request) => {
+                assert.strictEqual(request.accountId, '012345678910')
+                assert.strictEqual(request.roleName, 'MyRole')
+
+                return creds
+            })
+            sandbox.stub(SsoClient, 'create').returns(client)
+            sandbox.stub(SsoAccessTokenProvider.prototype, 'getToken').resolves()
+            sandbox.stub(SsoAccessTokenProvider.prototype, 'createToken').resolves()
+        })
+
+        it('supports "sso-session" with "profile"', async function () {
+            const sections = await createTestSections(`${defaultProfile}\n${defaultSession}`)
+            const sut = new SharedCredentialsProvider('default', sections)
+            assert.deepStrictEqual(await sut.getCredentials(), creds)
+        })
+
+        it('rejects if the session is missing', async function () {
+            const sections = await createTestSections(`${defaultProfile}`)
+            const sut = new SharedCredentialsProvider('default', sections)
+            await assert.rejects(() => sut.getCredentials())
+        })
+
+        it('rejects if the account is missing', async function () {
+            const badProfile = `
+            [profile default]
+            sso_session = default
+            sso_role_name = MyRole
+            `
+
+            const sections = await createTestSections(`${badProfile}\n${defaultSession}`)
+            const sut = new SharedCredentialsProvider('default', sections)
+            await assert.rejects(() => sut.getCredentials())
+        })
+
+        it('rejects if the role is missing', async function () {
+            const badProfile = `
+            [profile default]
+            sso_session = default
+            sso_account_id = 012345678910
+            `
+
+            const sections = await createTestSections(`${badProfile}\n${defaultSession}`)
+            const sut = new SharedCredentialsProvider('default', sections)
+            await assert.rejects(() => sut.getCredentials())
+        })
+
+        it('rejects if the scopes do not contain "sso:account:access"', async function () {
+            const badSession = `
+            [sso-session default]
+            sso_region = us-east-1
+            sso_start_url = https://d-xxxxxxxxx.awsapps.com/start
+            sso_registration_scopes = foo
+            `
+
+            const sections = await createTestSections(`${defaultProfile}\n${badSession}`)
+            const sut = new SharedCredentialsProvider('default', sections)
+            await assert.rejects(() => sut.getCredentials())
+        })
+
+        it('does not reject extra scopes if present', async function () {
+            const goodSession = `
+            [sso-session default]
+            sso_region = us-east-1
+            sso_start_url = https://d-xxxxxxxxx.awsapps.com/start
+            sso_registration_scopes = sso:account:access, foo
+            `
+
+            const sections = await createTestSections(`${defaultProfile}\n${goodSession}`)
+            const sut = new SharedCredentialsProvider('default', sections)
+            assert.deepStrictEqual(await sut.getCredentials(), creds)
+        })
+    })
+
+    describe('patchSourceCredentials', async function () {
+        let childProfile: { [key: string]: string } = {}
+        let resolvedBaseProfile: { [key: string]: string } = {}
+
+        const iniFile = (base: string) => `
+        [profile base]
+        ${base}
+
+        [profile child]
+        source_profile = base
+        role_arn = testarn
+        `
+
+        beforeEach(function () {
+            childProfile = {
+                source_profile: 'base',
+                role_arn: 'testarn',
+            }
+            resolvedBaseProfile = {
+                aws_access_key_id: 'id',
+                aws_secret_access_key: 'secret',
+            }
+        })
+
+        async function assertIniProviderResolves(
+            sut: SharedCredentialsProvider,
+            resolvedProfile: ParsedIniData
+        ): Promise<void> {
+            const makeIni = sandbox.stub(sut as any, 'makeSharedIniFileCredentialsProvider').callsFake((profile) => {
+                // The SDK does not care if fields are undefined, but we need to remove them to test
+                stripUndefined(profile as any)
+                assert.deepStrictEqual(profile, resolvedProfile)
+                return () => Promise.resolve({})
+            })
+
+            await sut.getCredentials()
+            assert.ok(makeIni.calledOnce)
+        }
+
+        it('resolves profile with source_profile as credential_process', async function () {
+            this.skip()
+
+            const sections = await createTestSections(iniFile('credential_process = test_process'))
+            const sut = new SharedCredentialsProvider('child', sections)
+
+            sandbox.stub(process, 'fromProcess').returns(() =>
+                Promise.resolve({
+                    accessKeyId: resolvedBaseProfile['aws_access_key_id'],
+                    secretAccessKey: resolvedBaseProfile['aws_secret_access_key'],
+                })
+            )
+
+            await assertIniProviderResolves(sut, {
+                base: resolvedBaseProfile,
+                child: childProfile,
+            })
+        })
+
+        it('resolves profile with source_profile and MFA', async function () {
+            this.skip()
+
+            const mfaSerial = 'serial'
+            const sections = await createTestSections(
+                iniFile(`
+            credential_process = test_process
+            mfa_serial = ${mfaSerial}
+            `)
+            )
+            const sut = new SharedCredentialsProvider('child', sections)
+
+            // We use 'credential_process' here to simulate static credentials since we can't
+            // stub out 'makeSharedIniFileCredentialsProvider' as it is already stubbed
+            sandbox.stub(process, 'fromProcess').returns(() =>
+                Promise.resolve({
+                    accessKeyId: resolvedBaseProfile['aws_access_key_id'],
+                    secretAccessKey: resolvedBaseProfile['aws_secret_access_key'],
+                })
+            )
+
+            await assertIniProviderResolves(sut, {
+                base: resolvedBaseProfile,
+                child: {
+                    ...childProfile,
+                    mfa_serial: mfaSerial,
+                },
+            })
+        })
+    })
+
+    describe('makeSharedIniFileCredentialsProvider', function () {
+        let defaultSection: string
+
+        before(function () {
+            defaultSection = `[profile default]
+                aws_access_key_id = x
+                aws_secret_access_key = y`
+        })
+
+        beforeEach(function () {
+            sandbox.stub(DefaultStsClient.prototype, 'assumeRole').callsFake(async (request) => {
+                assert.strictEqual(request.RoleArn, 'testarn')
+                if (request.SerialNumber) {
+                    assert.strictEqual(request.SerialNumber, 'mfaSerialToken')
+                    assert.strictEqual(request.TokenCode, 'mfaToken')
+                }
+                return {
+                    Credentials: {
+                        AccessKeyId: 'id',
+                        SecretAccessKey: 'secret',
+                        SessionToken: 'token',
+                        Expiration: new Date(Date.now() + oneDay),
+                    },
+                }
+            })
+        })
+
+        it('assumes role given in ini data', async function () {
+            const sections = await createTestSections(`
+                ${defaultSection}
+                [profile assume]
+                source_profile = default
+                role_arn = testarn
+                `)
+
+            const sut = new SharedCredentialsProvider('assume', sections)
+            const creds = await sut.getCredentials()
+            assert.strictEqual(creds.accessKeyId, 'id')
+            assert.strictEqual(creds.secretAccessKey, 'secret')
+            assert.strictEqual(creds.sessionToken, 'token')
+        })
+
+        it('assumes role with mfa token', async function () {
+            const sections = await createTestSections(`
+                ${defaultSection}
+                [profile assume]
+                source_profile = default
+                role_arn = testarn
+                mfa_serial= mfaSerialToken
+                `)
+            const sut = new SharedCredentialsProvider('assume', sections)
+
+            getTestWindow().onDidShowInputBox((inputBox) => {
+                inputBox.acceptValue('mfaToken')
+            })
+
+            const creds = await sut.getCredentials()
+            assert.strictEqual(creds.accessKeyId, 'id')
+            assert.strictEqual(creds.secretAccessKey, 'secret')
+            assert.strictEqual(creds.sessionToken, 'token')
+        })
+
+        it('does not assume role when no roleArn is present', async function () {
+            const sut = new SharedCredentialsProvider('default', await createTestSections(defaultSection))
+            const creds = await sut.getCredentials()
+            assert.strictEqual(creds.accessKeyId, 'x')
+            assert.strictEqual(creds.secretAccessKey, 'y')
+        })
+    })
+})
+
+function assertSubstringsInText(text: string | undefined, ...substrings: string[]) {
+    assert.ok(text)
+    for (const substring of substrings) {
+        assert.notStrictEqual(text!.indexOf(substring), -1)
+    }
+}
diff --git a/packages/core/src/test/credentials/provider/sharedCredentialsProviderFactory.test.ts b/packages/core/src/test/credentials/provider/sharedCredentialsProviderFactory.test.ts
new file mode 100644
index 00000000000..84f2d378e46
--- /dev/null
+++ b/packages/core/src/test/credentials/provider/sharedCredentialsProviderFactory.test.ts
@@ -0,0 +1,149 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import { Uri, Range } from 'vscode'
+import { isEqual } from '../../../auth/providers/credentials'
+import { SharedCredentialsProviderFactory } from '../../../auth/providers/sharedCredentialsProviderFactory'
+import * as sharedCredentials from '../../../auth/credentials/sharedCredentials'
+import fs from '../../../shared/fs/fs'
+import vscode from 'vscode'
+
+describe('SharedCredentialsProviderFactory', async function () {
+    let sandbox: sinon.SinonSandbox
+    let loadSharedCredentialsSectionsStub: sinon.SinonStub<
+        [],
+        ReturnType<typeof sharedCredentials.loadSharedCredentialsSections>
+    >
+
+    let sharedCredentialsLastModifiedMillis: number
+
+    let sharedCredentialProfiles: Map<string, sharedCredentials.Profile>
+
+    const validProfile: sharedCredentials.Profile = {
+        aws_access_key_id: 'x',
+        aws_secret_access_key: 'y',
+    }
+
+    const inValidProfile: sharedCredentials.Profile = {
+        aws_access_key_id: 'x',
+    }
+
+    const validProfileName1 = 'default'
+    const validProfileName2 = 'alt'
+    const invalidProfileName = 'gary'
+
+    beforeEach(async function () {
+        sandbox = sinon.createSandbox()
+
+        sharedCredentialsLastModifiedMillis = 1
+        sandbox.stub(fs, 'stat').callsFake(async () => {
+            return {
+                mtime: sharedCredentialsLastModifiedMillis,
+            } as any as vscode.FileStat
+        })
+
+        sharedCredentialProfiles = new Map<string, sharedCredentials.Profile>()
+        sharedCredentialProfiles.set(validProfileName1, validProfile)
+        sharedCredentialProfiles.set(validProfileName2, validProfile)
+
+        loadSharedCredentialsSectionsStub = sandbox
+            .stub(sharedCredentials, 'loadSharedCredentialsSections')
+            .callsFake(async () => ({
+                sections: Array.from(sharedCredentialProfiles.entries()).map(([k, v]) => ({
+                    name: k,
+                    type: 'profile',
+                    assignments: Object.entries(v).map(([key, value]) => ({
+                        key,
+                        value: value!,
+                        range: new Range(0, 0, 0, 0),
+                    })),
+                    source: Uri.file(''),
+                    startLines: [],
+                })),
+                errors: [],
+            }))
+    })
+
+    afterEach(async function () {
+        sandbox.restore()
+    })
+
+    it('produces credential providers from shared credentials profiles', async function () {
+        const sut = new SharedCredentialsProviderFactory()
+
+        await sut.refresh()
+
+        const providers = sut.listProviders()
+
+        assert.strictEqual(providers.length, 2, 'Expected two providers to be created')
+        assert.ok(
+            providers.find((p) =>
+                isEqual(p.getCredentialsId(), {
+                    credentialSource: 'profile',
+                    credentialTypeId: validProfileName1,
+                })
+            ),
+            'Expected to find the first profile'
+        )
+        assert.ok(
+            providers.find((p) =>
+                isEqual(p.getCredentialsId(), {
+                    credentialSource: 'profile',
+                    credentialTypeId: validProfileName2,
+                })
+            ),
+
+            'Expected to find the second profile'
+        )
+    })
+
+    it('does not load providers for invalid profiles', async function () {
+        sharedCredentialProfiles.set(invalidProfileName, inValidProfile)
+
+        const sut = new SharedCredentialsProviderFactory()
+
+        await sut.refresh()
+
+        const providers = sut.listProviders()
+
+        assert.strictEqual(providers.length, 2, 'Expected two providers to be created') // the valid ones
+        assert.strictEqual(
+            sut.getProvider({
+                credentialSource: 'profile',
+                credentialTypeId: invalidProfileName,
+            }),
+            undefined
+        )
+    })
+
+    it('refresh always reloads from file', async function () {
+        const sut = new SharedCredentialsProviderFactory()
+
+        // First load
+        await sut.refresh()
+
+        // Expect: No reload
+        await sut.refresh()
+
+        assert.ok(loadSharedCredentialsSectionsStub.calledTwice, 'Credentials should have loaded from disk twice')
+    })
+
+    it('refresh reloads from file if the file has changed', async function () {
+        const sut = new SharedCredentialsProviderFactory()
+
+        // First load
+        await sut.refresh()
+
+        // Simulate modifying files
+        sharedCredentialsLastModifiedMillis++
+
+        // Expect: Reload
+        await sut.refresh()
+
+        assert.ok(loadSharedCredentialsSectionsStub.calledTwice, 'Credentials should have been loaded from disk twice')
+    })
+})
diff --git a/packages/core/src/test/credentials/secondaryAuth.test.ts b/packages/core/src/test/credentials/secondaryAuth.test.ts
new file mode 100644
index 00000000000..fec4b503ee9
--- /dev/null
+++ b/packages/core/src/test/credentials/secondaryAuth.test.ts
@@ -0,0 +1,141 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { SinonSandbox, SinonStub, createSandbox } from 'sinon'
+import { SecondaryAuth, getSecondaryAuth } from '../../auth/secondaryAuth'
+import { createBuilderIdProfile, createTestAuth } from './testUtil'
+import { Connection, createSsoProfile, hasScopes, isSsoConnection } from '../../auth/connection'
+import assert from 'assert'
+import globals from '../../shared/extensionGlobals'
+import { waitUntil } from '../../shared/utilities/timeoutUtils'
+
+describe('SecondaryAuth', function () {
+    let auth: ReturnType<typeof createTestAuth>
+    let secondaryAuth: SecondaryAuth
+    let isValid: (conn: Connection) => conn is Connection
+    let sandbox: SinonSandbox
+    let conn: Connection
+    const scopes = ['test:scope']
+
+    let onDidChangeActiveConnection: SinonStub
+
+    beforeEach(async function () {
+        auth = createTestAuth(globals.globalState)
+        sandbox = createSandbox()
+        conn = await auth.createConnection(createBuilderIdProfile({ scopes: scopes }))
+        isValid = (conn: Connection): conn is Connection => {
+            return isSsoConnection(conn) && hasScopes(conn, scopes)
+        }
+        // await globals.globalState.clear()
+        secondaryAuth = getSecondaryAuth(auth, 'codecatalyst', 'testLabel', isValid)
+        onDidChangeActiveConnection = sandbox.stub()
+        secondaryAuth.onDidChangeActiveConnection(onDidChangeActiveConnection)
+    })
+
+    afterEach(async function () {
+        sandbox.restore()
+    })
+
+    it('no SecondaryAuth set or valid PrimaryAuth exist', async function () {
+        assert.strictEqual(secondaryAuth.activeConnection?.id, undefined)
+    })
+
+    it('no SecondaryAuth set but valid PrimaryAuth is used', async function () {
+        await auth.useConnection(conn)
+        assert.strictEqual(onDidChangeActiveConnection.calledOnce, true)
+        assert.strictEqual(secondaryAuth.activeConnection?.id, conn.id)
+    })
+
+    it('valid PrimaryAuth is set BUT SecondaryAuth is already using the same connection', async function () {
+        await secondaryAuth.useNewConnection(conn)
+        // we save this connection so we expect it to trigger an event
+        assert.strictEqual(onDidChangeActiveConnection.called, true)
+        onDidChangeActiveConnection.resetHistory()
+
+        await auth.useConnection(conn)
+        // the PrimaryAuth uses the same connection as the secondary
+        // so there is no change for the user. No need to emit event.
+        assert.strictEqual(onDidChangeActiveConnection.called, false)
+        assert.strictEqual(secondaryAuth.activeConnection?.id, conn.id)
+    })
+
+    it('valid PrimaryAuth changes BUT SecondaryAuth not set + valid PrimaryAuth exists', async function () {
+        // Make primary auth already exist
+        await auth.useConnection(conn)
+        assert.strictEqual(onDidChangeActiveConnection.called, true)
+        onDidChangeActiveConnection.resetHistory()
+
+        const otherValidConn = await auth.createConnection(
+            createSsoProfile('https://my.start.url', 'us-east-1', scopes)
+        )
+        await auth.useConnection(otherValidConn)
+        assert.strictEqual(onDidChangeActiveConnection.called, true)
+        assert.strictEqual(secondaryAuth.activeConnection?.id, otherValidConn.id)
+    })
+
+    it('valid PrimaryAuth deleted BUT SecondaryAuth is set', async function () {
+        await secondaryAuth.useNewConnection(conn)
+
+        // add valid connection to the PrimaryAuth
+        const otherConn = await auth.createConnection(createSsoProfile('https://my.start.url', 'us-east-1', scopes))
+        await auth.useConnection(otherConn)
+
+        onDidChangeActiveConnection.resetHistory()
+        await auth.deleteConnection(otherConn)
+
+        // no event trigger when deleting PrimaryAuth since we have a secondary
+        assert.strictEqual(onDidChangeActiveConnection.called, false)
+        assert.strictEqual(secondaryAuth.activeConnection?.id, conn.id)
+    })
+
+    it('valid SecondaryAuth deleted BUT valid PrimaryAuth exists', async function () {
+        await secondaryAuth.useNewConnection(conn)
+
+        // add valid connection to the PrimaryAuth
+        const otherConn = await auth.createConnection(createSsoProfile('https://my.start.url', 'us-east-1', scopes))
+        await auth.useConnection(otherConn)
+        onDidChangeActiveConnection.resetHistory()
+
+        // delete SecondaryAuth
+        await auth.deleteConnection(conn)
+
+        // currently both Auth onDidChangeConnectionState and onDidDeleteConnection trigger
+        // and we need to wait for both of the callbacks defined through them in SecondaryAuth to complete.
+        // We know they all completed when SecondaryAuth.onDidChangeActiveConnection has been called twice
+        await waitUntil(async () => onDidChangeActiveConnection.callCount === 2, { interval: 10, timeout: 10000 })
+
+        // we fallback to the PrimaryAuth connection
+        assert.strictEqual(onDidChangeActiveConnection.callCount, 2)
+        assert.deepStrictEqual(
+            {
+                id: secondaryAuth.activeConnection?.id,
+                label: secondaryAuth.activeConnection?.label,
+            },
+            {
+                id: otherConn.id,
+                label: otherConn.label,
+            }
+        )
+        assert.strictEqual(secondaryAuth.activeConnection?.id, otherConn.id)
+    })
+
+    it('SecondaryAuth is invalid, but is reauthenticated elsewhere', async function () {
+        // PrimaryAuth has its own conn, we don't care about this
+        await auth.useConnection(conn)
+
+        // SecondaryAuth is using an invalid conn
+        const invalidConn = await auth.createInvalidSsoConnection(createBuilderIdProfile({ scopes: scopes }))
+        await secondaryAuth.useNewConnection(invalidConn)
+
+        // Run a reauthentication of the invalid conn outside of the knowledge of the SecondaryAuth
+        onDidChangeActiveConnection.resetHistory()
+        await auth.reauthenticate(invalidConn)
+
+        // SecondaryAuth is aware of the change in state and emits an event to notify
+        assert.strictEqual(secondaryAuth.activeConnection?.id, invalidConn.id)
+        assert.strictEqual(onDidChangeActiveConnection.called, true)
+        assert.strictEqual(auth.getConnectionState(invalidConn), 'valid')
+    })
+})
diff --git a/src/test/credentials/sharedCredentials.test.ts b/packages/core/src/test/credentials/sharedCredentials.test.ts
similarity index 88%
rename from src/test/credentials/sharedCredentials.test.ts
rename to packages/core/src/test/credentials/sharedCredentials.test.ts
index 783842a5727..f3c5460e1b8 100644
--- a/src/test/credentials/sharedCredentials.test.ts
+++ b/packages/core/src/test/credentials/sharedCredentials.test.ts
@@ -1,14 +1,14 @@
 /*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as path from 'path'
-import * as fs from 'fs-extra'
-import { getConfigFilename, getCredentialsFilename } from '../../credentials/sharedCredentials'
 import { EnvironmentVariables } from '../../shared/environmentVariables'
 import { makeTemporaryToolkitFolder } from '../../shared/filesystemUtilities'
+import { getCredentialsFilename, getConfigFilename } from '../../auth/credentials/sharedCredentialsFile'
+import { fs } from '../../shared'
 
 describe('sharedCredentials', function () {
     let tempFolder: string
@@ -26,7 +26,7 @@ describe('sharedCredentials', function () {
     })
 
     after(async function () {
-        await fs.remove(tempFolder)
+        await fs.delete(tempFolder, { recursive: true })
     })
 
     describe('getCredentialsFilename', function () {
diff --git a/src/test/credentials/sso/cache.test.ts b/packages/core/src/test/credentials/sso/cache.test.ts
similarity index 79%
rename from src/test/credentials/sso/cache.test.ts
rename to packages/core/src/test/credentials/sso/cache.test.ts
index b2d6dca5e31..5222fe9e0fb 100644
--- a/src/test/credentials/sso/cache.test.ts
+++ b/packages/core/src/test/credentials/sso/cache.test.ts
@@ -1,13 +1,14 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as path from 'path'
-import * as fs from 'fs-extra'
 import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../../../shared/filesystemUtilities'
-import { getRegistrationCache, getTokenCache } from '../../../credentials/sso/cache'
+import { getRegistrationCache, getTokenCache } from '../../../auth/sso/cache'
+import { fs } from '../../../shared'
+import { SsoToken } from '../../../auth/sso/model'
 
 describe('SSO Cache', function () {
     const region = 'dummyRegion'
@@ -20,12 +21,13 @@ describe('SSO Cache', function () {
         clientId: 'dummyId',
         clientSecret: 'dummySecret',
         expiresAt: new Date(Date.now() + hourInMs),
+        startUrl,
     }
 
     const validToken = {
         accessToken: 'longstringofrandomcharacters',
         expiresAt: new Date(Date.now() + hourInMs),
-    }
+    } as SsoToken
 
     beforeEach(async function () {
         testDir = await makeTemporaryToolkitFolder()
@@ -43,17 +45,17 @@ describe('SSO Cache', function () {
         })
 
         it('caches based off region', async function () {
-            await cache.save({ region }, validRegistration)
+            await cache.save({ startUrl, region }, validRegistration)
 
             const cachedPath = path.join(testDir, `aws-toolkit-vscode-client-id-${region}.json`)
-            const contents = await fs.readFile(cachedPath, 'utf-8')
+            const contents = await fs.readFileText(cachedPath)
 
             assert.deepStrictEqual(JSON.parse(contents), {
                 ...validRegistration,
                 expiresAt: validRegistration.expiresAt.toISOString(),
             })
 
-            assert.deepStrictEqual(await cache.load({ region }), validRegistration)
+            assert.deepStrictEqual(await cache.load({ startUrl, region }), validRegistration)
         })
     })
 
@@ -69,7 +71,7 @@ describe('SSO Cache', function () {
 
             // SHA-1 hash of the encoded start URL `https://123456.awsapps.com/start`
             const cachedPath = path.join(testDir, 'c1ac99f782ad92755c6de8647b510ec247330ad1.json')
-            const contents = await fs.readFile(cachedPath, 'utf-8')
+            const contents = await fs.readFileText(cachedPath)
 
             assert.deepStrictEqual(JSON.parse(contents), {
                 region,
diff --git a/packages/core/src/test/credentials/sso/model.test.ts b/packages/core/src/test/credentials/sso/model.test.ts
new file mode 100644
index 00000000000..46f944d271a
--- /dev/null
+++ b/packages/core/src/test/credentials/sso/model.test.ts
@@ -0,0 +1,70 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import assert from 'assert'
+import { openSsoPortalLink, openSsoUrl, proceedToBrowser } from '../../../auth/sso/model'
+import { getOpenExternalStub } from '../../globalSetup.test'
+import { getTestWindow } from '../../shared/vscode/window'
+
+describe('openSsoPortalLink', function () {
+    beforeEach(function () {
+        getOpenExternalStub().resolves(true)
+    })
+
+    const userCode = 'user-code'
+    const verificationUri = 'https://example.com/'
+    async function runFlow(...actions: ('open' | 'help' | 'cancel')[]) {
+        const confirmCode = /Confirm Code for/
+        const waitForMessage = async (): Promise<void> =>
+            getTestWindow()
+                .waitForMessage(confirmCode)
+                .then((m) => {
+                    assert.ok(m.detail?.includes(userCode), 'Expected message to show the user verification code')
+
+                    const action = actions.shift()
+                    if (action === 'open') {
+                        m.selectItem(proceedToBrowser)
+                    } else if (action === 'help') {
+                        m.selectItem(/help/i)
+                        return waitForMessage()
+                    } else {
+                        m.close()
+                    }
+                })
+
+        await Promise.all([waitForMessage(), openSsoPortalLink('', { verificationUri, userCode })])
+    }
+
+    it('opens a "confirm code" link when selecting the open URL option', async function () {
+        await runFlow('open')
+        assert.ok(getOpenExternalStub().calledOnce)
+        assert.strictEqual(getOpenExternalStub().args[0].toString(), `${verificationUri}?user_code%3D${userCode}`)
+    })
+
+    it('continues to show the notification if the user selects help', async function () {
+        this.skip()
+    })
+})
+
+describe('openSsoUrl', function () {
+    const verificationUri = vscode.Uri.parse('https://example.com/')
+
+    it('opens a link', async function () {
+        getOpenExternalStub().resolves(true)
+        await openSsoUrl(verificationUri)
+        assert.ok(getOpenExternalStub().calledOnce)
+        assert.strictEqual(getOpenExternalStub().args[0].toString(), `${verificationUri}`)
+    })
+
+    it('canceled opening a link', async function () {
+        getOpenExternalStub().resolves(false)
+        await assert.rejects(async () => {
+            await openSsoUrl(verificationUri)
+        })
+        assert.ok(getOpenExternalStub().calledOnce)
+        assert.strictEqual(getOpenExternalStub().args[0].toString(), `${verificationUri}`)
+    })
+})
diff --git a/packages/core/src/test/credentials/sso/server.test.ts b/packages/core/src/test/credentials/sso/server.test.ts
new file mode 100644
index 00000000000..078aaf6b86b
--- /dev/null
+++ b/packages/core/src/test/credentials/sso/server.test.ts
@@ -0,0 +1,143 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import {
+    AuthError,
+    AuthSSOServer,
+    InvalidStateError,
+    MissingCodeError,
+    MissingStateError,
+} from '../../../auth/sso/server'
+import request from '../../../shared/request'
+import { URLSearchParams } from 'url'
+import { isUserCancelledError, ToolkitError } from '../../../shared/errors'
+import { sleep } from '../../../shared/utilities/timeoutUtils'
+
+describe('AuthSSOServer', function () {
+    const code = 'zfhgaiufgsbdfigsdfg'
+    const state = 'state'
+    const error = 'foo'
+    const errorDescription = 'foo'
+
+    let server: AuthSSOServer
+
+    beforeEach(async function () {
+        server = AuthSSOServer.init(state)
+        await server.start()
+    })
+
+    afterEach(async function () {
+        await server.close()
+    })
+
+    function createURL(baseUrl: string, params: Record<string, string>) {
+        const url = new URL(baseUrl)
+        url.search = new URLSearchParams(params).toString()
+        return url.toString()
+    }
+
+    async function assertRequestError(params: Record<string, string>, expectedErrorMsg: string) {
+        const url = createURL(server.redirectUri, params)
+        const authorizationPromise = server.waitForAuthorization()
+        try {
+            await request.fetch('GET', url, {
+                redirect: 'follow',
+            }).response
+        } catch (err: unknown) {
+            assert.fail('Unknown error')
+        }
+
+        try {
+            await authorizationPromise
+        } catch (err: unknown) {
+            if (err instanceof ToolkitError) {
+                assert.deepStrictEqual(err.message, expectedErrorMsg)
+                return
+            }
+            assert.fail('Unknown error')
+        }
+    }
+
+    it('rejects origin', async function () {
+        // TODO
+    })
+
+    it('handles authentication error', async function () {
+        await assertRequestError(
+            {
+                error,
+                error_description: errorDescription,
+            },
+            new AuthError(error, errorDescription).message
+        )
+    })
+
+    it('handles missing code param', async function () {
+        await assertRequestError(
+            {
+                state,
+            },
+            new MissingCodeError().message
+        )
+    })
+
+    it('handles missing state param', async function () {
+        await assertRequestError(
+            {
+                code,
+            },
+            new MissingStateError().message
+        )
+    })
+
+    it('handles invalid state param', async function () {
+        await assertRequestError(
+            {
+                code,
+                state: 'someInvalidState',
+            },
+            new InvalidStateError().message
+        )
+    })
+
+    it('handles valid redirect', async function () {
+        const url = createURL(server.redirectUri, {
+            code,
+            state,
+        })
+        const response = await request.fetch('GET', url).response
+        assert.deepStrictEqual(response.status, 200)
+
+        const token = await server.waitForAuthorization()
+        assert.deepStrictEqual(code, token.unwrap())
+    })
+
+    it('address is bound to localhost', function () {
+        const address = server.getAddress()
+        if (address instanceof Object) {
+            assert.deepStrictEqual(address.address, '127.0.0.1')
+            return
+        }
+        assert.fail('Expected address 127.0.0.1')
+    })
+
+    it('can be cancelled while waiting for auth', async function () {
+        const promise = server.waitForAuthorization().catch((e) => {
+            return e
+        })
+        server.cancelCurrentFlow()
+
+        const err = await promise
+        assert.ok(isUserCancelledError(err.inner), 'CancellationError not thrown.')
+    })
+
+    it('initializes and closes instances', async function () {
+        const newServer = AuthSSOServer.init('1234')
+        assert.equal(AuthSSOServer.lastInstance, newServer)
+        await sleep(100)
+        assert.ok(server.closed)
+    })
+})
diff --git a/packages/core/src/test/credentials/sso/ssoAccessTokenProvider.test.ts b/packages/core/src/test/credentials/sso/ssoAccessTokenProvider.test.ts
new file mode 100644
index 00000000000..2cb98193224
--- /dev/null
+++ b/packages/core/src/test/credentials/sso/ssoAccessTokenProvider.test.ts
@@ -0,0 +1,511 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as FakeTimers from '@sinonjs/fake-timers'
+import * as sinon from 'sinon'
+import { CreateTokenArgs, ReAuthState, SsoAccessTokenProvider } from '../../../auth/sso/ssoAccessTokenProvider'
+import { assertTelemetry, installFakeClock } from '../../testUtil'
+import { getCache } from '../../../auth/sso/cache'
+
+import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../../../shared/filesystemUtilities'
+import { ClientRegistration, SsoProfile, SsoToken, proceedToBrowser } from '../../../auth/sso/model'
+import { OidcClient } from '../../../auth/sso/clients'
+import { CancellationError } from '../../../shared/utilities/timeoutUtils'
+import {
+    AuthorizationPendingException,
+    InternalServerException,
+    InvalidClientException,
+    UnauthorizedClientException,
+} from '@aws-sdk/client-sso-oidc'
+import { getOpenExternalStub } from '../../globalSetup.test'
+import { getTestWindow } from '../../shared/vscode/window'
+import { SeverityLevel } from '../../shared/vscode/message'
+import { ToolkitError } from '../../../shared/errors'
+import * as fs from 'fs' // eslint-disable-line no-restricted-imports
+import * as path from 'path'
+import { Stub, stub } from '../../utilities/stubber'
+import { globals } from '../../../shared'
+
+const hourInMs = 3600000
+
+describe('SsoAccessTokenProvider', function () {
+    const region = 'fakeRegion'
+    const startUrl = 'fakeUrl'
+
+    let oidcClient: Stub<OidcClient>
+    let sut: SsoAccessTokenProvider
+    let cache: ReturnType<typeof getCache>
+    let clock: FakeTimers.InstalledClock | undefined
+    let tempDir: string
+    let reAuthState: TestReAuthState
+
+    function createToken(timeDelta: number, extras: Partial<SsoToken> = {}) {
+        return {
+            accessToken: 'dummyAccessToken',
+            expiresAt: new globals.clock.Date(globals.clock.Date.now() + timeDelta),
+            ...extras,
+        }
+    }
+
+    function createRegistration(timeDelta: number, extras: Partial<ClientRegistration> = {}) {
+        return {
+            scopes: [],
+            clientId: 'dummyClientId',
+            clientSecret: 'dummyClientSecret',
+            expiresAt: new globals.clock.Date(globals.clock.Date.now() + timeDelta),
+            startUrl,
+            ...extras,
+        }
+    }
+
+    function createAuthorization(timeDelta: number) {
+        return {
+            interval: 1,
+            deviceCode: 'dummyCode',
+            userCode: 'dummyUserCode',
+            verificationUri: 'dummyLink',
+            expiresAt: new globals.clock.Date(globals.clock.Date.now() + timeDelta),
+        }
+    }
+
+    async function makeTemporaryTokenCacheFolder() {
+        const root = await makeTemporaryToolkitFolder()
+        const cacheDir = path.join(root, '.aws', 'sso', 'cache')
+        fs.mkdirSync(cacheDir, { recursive: true })
+        return cacheDir
+    }
+
+    beforeEach(async function () {
+        oidcClient = stub(OidcClient)
+        tempDir = await makeTemporaryTokenCacheFolder()
+        cache = getCache(tempDir)
+        reAuthState = new TestReAuthState()
+        sut = SsoAccessTokenProvider.create({ region, startUrl }, cache, oidcClient, reAuthState, () => true)
+    })
+
+    afterEach(async function () {
+        sinon.restore()
+        clock?.uninstall()
+        await tryRemoveFolder(tempDir)
+    })
+
+    describe('invalidate', function () {
+        it('removes cached tokens and registrations', async function () {
+            const validToken = createToken(hourInMs)
+            await cache.token.save(startUrl, { region, startUrl, token: validToken })
+            await cache.registration.save({ startUrl, region }, createRegistration(hourInMs))
+            await sut.invalidate('test')
+
+            assert.strictEqual(await cache.token.load(startUrl), undefined)
+            assert.strictEqual(await cache.registration.load({ startUrl, region }), undefined)
+            assertTelemetry(`auth_modifyConnection`, [
+                { action: 'deleteSsoCache', source: 'SsoAccessTokenProvider#invalidate' },
+            ])
+        })
+    })
+
+    describe('getToken', function () {
+        it('returns a cached token', async function () {
+            const validToken = createToken(hourInMs)
+            await cache.token.save(startUrl, { region, startUrl, token: validToken })
+
+            assert.deepStrictEqual(await sut.getToken(), validToken)
+        })
+
+        it('invalidates expired tokens', async function () {
+            const expiredToken = createToken(-hourInMs)
+            await cache.token.save(startUrl, { region, startUrl, token: expiredToken })
+            await sut.getToken()
+
+            assert.strictEqual(await cache.token.load(startUrl), undefined)
+        })
+
+        it('returns `undefined` for expired tokens that cannot be refreshed', async function () {
+            const expiredToken = createToken(-hourInMs)
+            await cache.token.save(startUrl, { region, startUrl, token: expiredToken })
+
+            assert.strictEqual(await sut.getToken(), undefined)
+        })
+
+        it('refreshes expired tokens', async function () {
+            const refreshedToken = createToken(hourInMs, { accessToken: 'newToken' })
+            oidcClient.createToken.resolves({
+                ...refreshedToken,
+            } as any)
+
+            const refreshableToken = createToken(-hourInMs, { refreshToken: 'refreshToken' })
+            const validRegistation = createRegistration(hourInMs)
+            const access = { region, startUrl, token: refreshableToken, registration: validRegistation }
+            await cache.token.save(startUrl, access)
+            assert.deepStrictEqual(await sut.getToken(), refreshedToken)
+
+            const cachedToken = await cache.token.load(startUrl).then((a) => a?.token)
+            assert.deepStrictEqual(cachedToken, refreshedToken)
+        })
+
+        it('does not refresh if missing a client registration', async function () {
+            const refreshableToken = createToken(-hourInMs, { refreshToken: 'refreshToken' })
+            await cache.token.save(startUrl, { region, startUrl, token: refreshableToken })
+
+            assert.strictEqual(await sut.getToken(), undefined)
+
+            const cachedToken = await cache.token.load(startUrl).then((a) => a?.token)
+            assert.strictEqual(cachedToken, undefined)
+        })
+
+        describe('Exceptions', function () {
+            it('drops expired tokens if failure was a client-fault', async function () {
+                const exception = new UnauthorizedClientException({ message: '', $metadata: {} })
+                oidcClient.createToken.rejects(exception)
+
+                const refreshableToken = createToken(-hourInMs, { refreshToken: 'refreshToken' })
+                const validRegistation = createRegistration(hourInMs)
+                const access = { region, startUrl, token: refreshableToken, registration: validRegistation }
+                await cache.token.save(startUrl, access)
+                await assert.rejects(sut.getToken())
+
+                const cachedToken = await cache.token.load(startUrl)
+                assert.strictEqual(cachedToken, undefined)
+            })
+
+            it('preserves expired tokens if failure was not a client-fault', async function () {
+                const exception = new InternalServerException({ message: '', $metadata: {} })
+                oidcClient.createToken.rejects(exception)
+
+                const refreshableToken = createToken(-hourInMs, { refreshToken: 'refreshToken' })
+                const validRegistation = createRegistration(hourInMs)
+                const access = { region, startUrl, token: refreshableToken, registration: validRegistation }
+                await cache.token.save(startUrl, access)
+                await assert.rejects(sut.getToken())
+
+                const cachedToken = await cache.token.load(startUrl).then((a) => a?.token)
+                assert.deepStrictEqual(cachedToken, refreshableToken)
+            })
+        })
+    })
+
+    describe('createToken', function () {
+        beforeEach(function () {
+            getTestWindow().onDidShowMessage((m) => {
+                if (m.items[0]?.title.match(proceedToBrowser)) {
+                    m.items[0].select()
+                }
+            })
+        })
+
+        function stubOpen(userClicked = true) {
+            getOpenExternalStub().resolves(userClicked)
+        }
+
+        function setupFlow(opts?: { skipAuthorization: boolean }) {
+            const token = createToken(hourInMs)
+            const registration = createRegistration(hourInMs)
+            const authorization = createAuthorization(hourInMs)
+            oidcClient.registerClient.resolves(registration)
+
+            if (!opts?.skipAuthorization) {
+                oidcClient.startDeviceAuthorization.resolves(authorization)
+            }
+            oidcClient.createToken.resolves({
+                ...token,
+            } as any)
+
+            return { token, registration, authorization }
+        }
+
+        // combinations of args for createToken()
+        const args: CreateTokenArgs[] = [{ isReAuth: true }, { isReAuth: false }]
+
+        // eslint-disable-next-line unicorn/no-array-for-each
+        args.forEach((args) => {
+            it(`runs the full SSO flow with args: ${JSON.stringify(args)}`, async function () {
+                const { token, registration } = setupFlow()
+                stubOpen()
+                reAuthState.set({ startUrl }, { reAuthReason: 'myReAuthReason' })
+                assert.deepStrictEqual(reAuthState.has({ startUrl }), true)
+
+                assert.deepStrictEqual(await sut.createToken(args), { ...token, identity: startUrl })
+
+                const cachedToken = await cache.token.load(startUrl).then((a) => a?.token)
+                assert.deepStrictEqual(cachedToken, token)
+                assert.deepStrictEqual(await cache.registration.load({ startUrl, region }), registration)
+                assertTelemetry('aws_loginWithBrowser', {
+                    result: 'Succeeded',
+                    isReAuth: args.isReAuth,
+                    credentialStartUrl: startUrl,
+                    reAuthReason: args.isReAuth ? 'myReAuthReason' : undefined,
+                    awsRegion: region,
+                    ssoRegistrationExpiresAt: registration.expiresAt.toISOString(),
+                    ssoRegistrationClientId: registration.clientId,
+                })
+                // re auth state is cleared on successful login
+                assert.deepStrictEqual(reAuthState.has({ startUrl }), false)
+            })
+        })
+
+        it('always creates a new token, even if already cached', async function () {
+            const { token } = setupFlow()
+            stubOpen()
+
+            const cachedToken = createToken(hourInMs, { accessToken: 'someOtherToken' })
+            await cache.token.save(startUrl, { region, startUrl, token: cachedToken })
+
+            assert.deepStrictEqual(await sut.getToken(), cachedToken)
+            assert.deepStrictEqual(await sut.createToken(), { ...token, identity: startUrl })
+            assert.deepStrictEqual(await sut.getToken(), token)
+            assert.notDeepStrictEqual(await sut.getToken(), cachedToken)
+        })
+
+        it(`emits session duration between logins of the same startUrl`, async function () {
+            clock = installFakeClock()
+            setupFlow()
+            stubOpen()
+
+            await sut.createToken()
+            clock.tick(5000)
+            await sut.createToken()
+            clock.tick(10_000)
+            await sut.createToken()
+
+            // Mimic when we sign out then in again with the same region+startUrl. The ID is the only thing different.
+            sut = SsoAccessTokenProvider.create(
+                { region, startUrl, identifier: 'bbb' },
+                cache,
+                oidcClient,
+                reAuthState,
+                () => true
+            )
+            await sut.createToken()
+
+            assertTelemetry('aws_loginWithBrowser', [
+                {
+                    credentialStartUrl: startUrl,
+                    awsRegion: region,
+                    sessionDuration: undefined, // A new login.
+                },
+                {
+                    credentialStartUrl: startUrl,
+                    awsRegion: region,
+                    sessionDuration: 5000, // A reauth. 5000 - 0, is the diff between this and previous login
+                },
+                {
+                    credentialStartUrl: startUrl,
+                    awsRegion: region,
+                    sessionDuration: 10000, // A reauth. 15_000 - 5000 is the diff between this and previous login
+                },
+                {
+                    credentialStartUrl: startUrl,
+                    awsRegion: region,
+                    sessionDuration: undefined, // A new login, since we signed out of the last.
+                },
+            ])
+        })
+
+        it('respects the device authorization expiration time', async function () {
+            clock = installFakeClock()
+            setupFlow()
+            stubOpen()
+            const exception = new AuthorizationPendingException({ message: '', $metadata: {} })
+            const authorization = createAuthorization(1000)
+            oidcClient.createToken.rejects(exception)
+            oidcClient.startDeviceAuthorization.resolves(authorization)
+
+            const resp = sut
+                .createToken()
+                .then(() => assert.fail('Should not resolve'))
+                .catch((e) => {
+                    assert.ok(
+                        e instanceof ToolkitError &&
+                            e.message === 'Timed-out waiting for browser login flow to complete'
+                    )
+                })
+
+            const progress = await getTestWindow().waitForMessage(/login page opened/i)
+            await clock.tickAsync(750)
+            assert.ok(progress.visible)
+            await clock.tickAsync(750)
+            assert.ok(!progress.visible)
+            await resp
+            assertTelemetry('aws_loginWithBrowser', {
+                result: 'Failed',
+                isReAuth: undefined,
+                credentialStartUrl: startUrl,
+            })
+        })
+
+        /**
+         * Saves an expired client registration to the cache.
+         */
+        async function saveExpiredRegistrationToCache(): Promise<{
+            key: { startUrl: string; region: string; scopes: string[] }
+            registration: ClientRegistration
+        }> {
+            const key = { startUrl, region, scopes: [] }
+            const registration = {
+                clientId: 'myExpiredClientId',
+                clientSecret: 'myExpiredClientSecret',
+                expiresAt: new globals.clock.Date(globals.clock.Date.now() - 1), // expired date
+                startUrl: key.startUrl,
+            }
+            await cache.registration.save(key, registration)
+            return { key, registration }
+        }
+
+        it('registers a new client registration if the existing client registration is expired', async function () {
+            const { token, registration: validRegistration, authorization } = setupFlow({ skipAuthorization: true })
+            stubOpen()
+
+            const { key: registrationKey, registration: expiredRegistration } = await saveExpiredRegistrationToCache()
+            // If we do not invalidate the expired registration, startDeviceAuthorization()
+            // will be given expired registration values. The following ensures we only
+            // return a value when startDeviceAuthorization() is given valid registration values.
+            oidcClient.startDeviceAuthorization.resolves(authorization)
+
+            // sanity check we have expired registration in cache
+            assert.deepStrictEqual(await cache.registration.load(registrationKey), expiredRegistration)
+            const result = await sut.createToken()
+            // a valid registration should be cached since the previous was expired
+            assert.deepStrictEqual(await cache.registration.load(registrationKey), validRegistration)
+            assert.deepStrictEqual(result, { ...token, identity: startUrl }) // verify final result
+            assert(
+                oidcClient.startDeviceAuthorization.calledWithExactly({
+                    startUrl: startUrl,
+                    clientId: validRegistration.clientId,
+                    clientSecret: validRegistration.clientSecret,
+                })
+            )
+        })
+
+        describe('Exceptions', function () {
+            it('removes the client registration cache on client faults', async function () {
+                const exception = new UnauthorizedClientException({ message: '', $metadata: {} })
+                const registration = createRegistration(hourInMs)
+
+                oidcClient.registerClient.resolves(registration)
+                oidcClient.startDeviceAuthorization.rejects(exception)
+
+                await assert.rejects(sut.createToken(), exception)
+                assert.strictEqual(await cache.registration.load({ startUrl, region }), undefined)
+            })
+
+            it('removes the client registration cache on client faults (token step)', async function () {
+                const exception = new InvalidClientException({ message: '', $metadata: {} })
+                const registration = createRegistration(hourInMs)
+
+                oidcClient.registerClient.resolves(registration)
+                oidcClient.startDeviceAuthorization.resolves(createAuthorization(hourInMs))
+                oidcClient.createToken.rejects(exception)
+
+                stubOpen()
+
+                await assert.rejects(sut.createToken(), exception)
+                assert.strictEqual(await cache.registration.load({ startUrl, region }), undefined)
+                assertTelemetry('aws_loginWithBrowser', {
+                    result: 'Failed',
+                    isReAuth: undefined,
+                    credentialStartUrl: startUrl,
+                })
+            })
+
+            it('preserves the client registration cache on server faults', async function () {
+                const exception = new InternalServerException({ message: '', $metadata: {} })
+                const registration = createRegistration(hourInMs)
+
+                oidcClient.registerClient.resolves(registration)
+                oidcClient.startDeviceAuthorization.rejects(exception)
+
+                await assert.rejects(sut.createToken(), exception)
+                assert.deepStrictEqual(await cache.registration.load({ startUrl, region }), registration)
+            })
+
+            it('does not clear the reAuthReason state on failed login', async () => {
+                oidcClient.createToken.rejects(new Error('random error')) // Forces failure during SSO flow
+                reAuthState.set({ startUrl }, { reAuthReason: 'thisReasonWillNotBeCleared' })
+
+                await assert.rejects(sut.createToken({ isReAuth: true })) // function under test
+
+                assert.deepStrictEqual(reAuthState.get({ startUrl }), {
+                    ...reAuthState.default,
+                    reAuthReason: 'thisReasonWillNotBeCleared',
+                })
+            })
+        })
+
+        describe('Cancellation', function () {
+            beforeEach(function () {
+                setupFlow()
+                const exception = new AuthorizationPendingException({ message: '', $metadata: {} })
+                oidcClient.createToken.rejects(exception)
+            })
+
+            it('stops the flow if user does not click the link', async function () {
+                stubOpen(false)
+                await assert.rejects(sut.createToken(), ToolkitError)
+                assertTelemetry('aws_loginWithBrowser', {
+                    result: 'Cancelled',
+                    isReAuth: undefined,
+                    credentialStartUrl: startUrl,
+                })
+            })
+
+            it('saves the client registration even when cancelled', async function () {
+                stubOpen(false)
+                const registration = createRegistration(hourInMs)
+                await cache.registration.save({ startUrl, region }, registration)
+                await assert.rejects(sut.createToken(), ToolkitError)
+                const cached = await cache.registration.load({ startUrl, region })
+                assert.deepStrictEqual(cached, registration)
+            })
+
+            it('stops the flow if cancelled from the progress notification', async function () {
+                stubOpen()
+                getTestWindow().onDidShowMessage((m) => {
+                    if (m.severity === SeverityLevel.Progress) {
+                        m.selectItem('Cancel')
+                    }
+                })
+                await assert.rejects(sut.createToken(), CancellationError)
+                assert.strictEqual(getTestWindow().shownMessages.length, 2)
+            })
+        })
+    })
+
+    /**
+     * Exposes protected methods so we can test them
+     */
+    class TestReAuthState extends ReAuthState {
+        constructor() {
+            super()
+        }
+
+        override hash(profile: { readonly identifier?: string; readonly startUrl: string }): string {
+            return super.hash(profile)
+        }
+
+        override get default(): { reAuthReason?: string } {
+            return super.default
+        }
+    }
+
+    describe(ReAuthState.name, function () {
+        it(`hash()`, async () => {
+            const profile1: Pick<SsoProfile, 'identifier' | 'startUrl'> = {
+                identifier: 'abc-123',
+                startUrl: 'https://sameUrl.com',
+            }
+            const profile2: Pick<SsoProfile, 'identifier' | 'startUrl'> = {
+                startUrl: 'https://sameUrl.com',
+            }
+
+            assert.deepStrictEqual(reAuthState.hash(profile1), profile1.identifier)
+            assert.deepStrictEqual(reAuthState.hash(profile2), profile2.startUrl)
+        })
+
+        it('default', () => {
+            assert.deepStrictEqual(reAuthState.default, { reAuthReason: undefined })
+        })
+    })
+})
diff --git a/packages/core/src/test/credentials/testUtil.ts b/packages/core/src/test/credentials/testUtil.ts
new file mode 100644
index 00000000000..4acbf302a37
--- /dev/null
+++ b/packages/core/src/test/credentials/testUtil.ts
@@ -0,0 +1,159 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import { Auth } from '../../auth/auth'
+import { CredentialsProviderManager } from '../../auth/providers/credentialsProviderManager'
+import { SsoClient } from '../../auth/sso/clients'
+import { ClientRegistration, SsoToken } from '../../auth/sso/model'
+import { DeviceFlowAuthorization, SsoAccessTokenProvider } from '../../auth/sso/ssoAccessTokenProvider'
+import { captureEvent, EventCapturer } from '../testUtil'
+import { stub } from '../utilities/stubber'
+import globals from '../../shared/extensionGlobals'
+import { fromString } from '../../auth/providers/credentials'
+import { mergeAndValidateSections, parseIni } from '../../auth/credentials/sharedCredentials'
+import { SharedCredentialsProvider } from '../../auth/providers/sharedCredentialsProvider'
+import { Connection, IamConnection, ProfileStore, SsoConnection, SsoProfile } from '../../auth/connection'
+import * as sinon from 'sinon'
+import { builderIdStartUrl } from '../../auth/sso/constants'
+
+export const mockRegistration = {
+    clientId: 'test-client-id',
+    clientSecret: 'test-client-secret',
+    expiresAt: new Date(Date.now()),
+}
+
+/** Mock Connection objects for test usage */
+export const ssoConnection: SsoConnection = {
+    type: 'sso',
+    id: '0',
+    label: 'sso',
+    ssoRegion: 'us-east-1',
+    startUrl: 'https://nkomonen.awsapps.com/start',
+    getToken: sinon.stub(),
+    getRegistration: async () => mockRegistration as ClientRegistration,
+    endpointUrl: undefined,
+}
+export const builderIdConnection: SsoConnection = {
+    ...ssoConnection,
+    startUrl: builderIdStartUrl,
+    label: 'builderId',
+}
+export const iamConnection: IamConnection = {
+    type: 'iam',
+    id: '0',
+    label: 'iam',
+    getCredentials: sinon.stub(),
+    endpointUrl: undefined,
+}
+
+export function createSsoProfile(props?: Partial<Omit<SsoProfile, 'type'>>): SsoProfile {
+    return {
+        type: 'sso',
+        ssoRegion: 'us-east-1',
+        startUrl: 'https://d-0123456789.awsapps.com/start',
+        ...props,
+    }
+}
+
+export function createBuilderIdProfile(props?: Partial<Omit<SsoProfile, 'type' | 'startUrl'>>): SsoProfile {
+    return createSsoProfile({ startUrl: builderIdStartUrl, ...props })
+}
+
+export async function createTestSections(ini: string) {
+    const doc = await vscode.workspace.openTextDocument({ content: ini })
+    const sections = parseIni(doc.getText(), doc.uri)
+
+    return mergeAndValidateSections(sections).sections
+}
+
+export async function createSharedCredentialsProvider(name: string, ini: string) {
+    return new SharedCredentialsProvider(name, await createTestSections(ini))
+}
+
+function createTestTokenProvider() {
+    let token: SsoToken | undefined
+    let counter = 0
+    const provider = stub(DeviceFlowAuthorization)
+    provider.getToken.callsFake(async () => token)
+    provider.getClientRegistration.callsFake(async () => mockRegistration as ClientRegistration)
+    provider.createToken.callsFake(
+        async () => (token = { accessToken: String(++counter), expiresAt: new Date(Date.now() + 1000000) })
+    )
+    provider.invalidate.callsFake(async () => (token = undefined))
+    provider.getSessionDuration.callsFake(() => 11223355)
+
+    return provider
+}
+
+type TestAuth = Auth & {
+    readonly ssoClient: ReturnType<typeof stub<SsoClient>>
+    readonly profileStore: ProfileStore
+    readonly credentialsManager: CredentialsProviderManager
+    readonly updateConnectionEvents: EventCapturer<Connection>
+    readonly activeConnectionEvents: EventCapturer<Connection | undefined>
+    createInvalidSsoConnection(profile: SsoProfile): Promise<SsoConnection>
+    invalidateCachedCredentials(connection: Pick<Connection, 'id'>): Promise<void>
+    getTestTokenProvider(connection: Pick<Connection, 'id'>): ReturnType<typeof createTestTokenProvider>
+}
+
+export function createTestAuth(globalState: vscode.Memento): TestAuth {
+    const tokenProviders = new Map<string, ReturnType<typeof createTestTokenProvider>>()
+
+    function getTokenProvider(...[profile]: ConstructorParameters<typeof SsoAccessTokenProvider>) {
+        const key = profile.identifier ?? profile.startUrl
+        const cachedProvider = tokenProviders.get(key)
+        if (cachedProvider !== undefined) {
+            return cachedProvider
+        }
+
+        const provider = createTestTokenProvider()
+        tokenProviders.set(key, provider)
+
+        return provider
+    }
+
+    async function invalidateCachedCredentials(conn: Connection) {
+        if (conn.type === 'sso') {
+            const provider = tokenProviders.get(conn.id)
+            await provider?.invalidate('test')
+        } else {
+            globals.loginManager.store.invalidateCredentials(fromString(conn.id))
+        }
+    }
+
+    const ssoClient = stub(SsoClient, { region: 'not set' })
+    ssoClient.logout.resolves()
+
+    const store = new ProfileStore(globalState)
+    const credentialsManager = new CredentialsProviderManager()
+    const auth = new Auth(store, credentialsManager, () => ssoClient, getTokenProvider)
+
+    function getTestTokenProvider(conn: Pick<Connection, 'id'>) {
+        const provider = tokenProviders.get(conn.id)
+        assert.ok(provider, `No token provider was created for connection: ${conn.id}`)
+
+        return provider
+    }
+
+    async function createInvalidSsoConnection(profile: SsoProfile) {
+        const conn = await auth.createConnection(profile)
+        await invalidateCachedCredentials(conn)
+
+        return conn
+    }
+
+    return Object.assign(auth, {
+        ssoClient,
+        credentialsManager,
+        profileStore: store,
+        getTestTokenProvider,
+        createInvalidSsoConnection,
+        invalidateCachedCredentials,
+        updateConnectionEvents: captureEvent(auth.onDidUpdateConnection),
+        activeConnectionEvents: captureEvent(auth.onDidChangeActiveConnection),
+    })
+}
diff --git a/packages/core/src/test/credentials/utils.test.ts b/packages/core/src/test/credentials/utils.test.ts
new file mode 100644
index 00000000000..ff4dc1046bc
--- /dev/null
+++ b/packages/core/src/test/credentials/utils.test.ts
@@ -0,0 +1,167 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import { BuilderIdKind, ExtensionUse, SsoKind, hasBuilderId, hasIamCredentials, hasSso } from '../../auth/utils'
+import { Connection, SsoConnection, scopesCodeCatalyst } from '../../auth/connection'
+import { builderIdConnection, iamConnection, ssoConnection } from './testUtil'
+import { amazonQScopes } from '../../codewhisperer/util/authUtil'
+import globals from '../../shared/extensionGlobals'
+
+describe('ExtensionUse.isFirstUse()', function () {
+    let instance: ExtensionUse
+    const notHasExistingConnections = () => false
+
+    beforeEach(async function () {
+        instance = new ExtensionUse()
+        await makeStateValueNotExist()
+    })
+
+    it('is true only on first startup', function () {
+        assert.strictEqual(instance.isFirstUse(notHasExistingConnections), true, 'Failed on first call.')
+        assert.strictEqual(instance.isFirstUse(notHasExistingConnections), true, 'Failed on second call.')
+
+        const nextStartup = nextExtensionStartup()
+        assert.strictEqual(nextStartup.isFirstUse(notHasExistingConnections), false, 'Failed on new startup.')
+    })
+
+    it('true when: (state value not exists + NOT has existing connections)', async function () {
+        await makeStateValueNotExist()
+        assert.strictEqual(
+            instance.isFirstUse(notHasExistingConnections),
+            true,
+            'No existing connections, should be first use'
+        )
+        assert.strictEqual(nextExtensionStartup().isFirstUse(), false)
+    })
+
+    it('false when: (state value not exists + has existing connections)', async function () {
+        await makeStateValueNotExist()
+        const hasExistingConnections = () => true
+        assert.strictEqual(
+            instance.isFirstUse(hasExistingConnections),
+            false,
+            'Found existing connections, should not be first use'
+        )
+        assert.strictEqual(nextExtensionStartup().isFirstUse(), false)
+    })
+
+    /**
+     * This makes the backend state value: undefined, mimicking a brand new user.
+     * We use this state value to track if user is a first time user.
+     */
+    async function makeStateValueNotExist() {
+        await globals.globalState.update(ExtensionUse.instance.isExtensionFirstUseKey, undefined)
+    }
+
+    /**
+     * Mimics when the extension startsup a subsequent time (i.e user closes vscode and opens again).
+     */
+    function nextExtensionStartup() {
+        return new ExtensionUse()
+    }
+})
+
+type SsoTestCase = { kind: SsoKind; connections: Connection[]; expected: boolean }
+type BuilderIdTestCase = { kind: BuilderIdKind; connections: Connection[]; expected: boolean }
+
+describe('connection exists funcs', function () {
+    const cwIdcConnection: SsoConnection = { ...ssoConnection, scopes: amazonQScopes, label: 'codeWhispererSso' }
+    const cwBuilderIdConnection: SsoConnection = {
+        ...builderIdConnection,
+        scopes: amazonQScopes,
+        label: 'codeWhispererBuilderId',
+    }
+    const ccBuilderIdConnection: SsoConnection = {
+        ...builderIdConnection,
+        scopes: scopesCodeCatalyst,
+        label: 'codeCatalystBuilderId',
+    }
+    const ssoConnections: Connection[] = [
+        ssoConnection,
+        builderIdConnection,
+        cwIdcConnection,
+        cwBuilderIdConnection,
+        ccBuilderIdConnection,
+    ]
+    const allConnections = [iamConnection, ...ssoConnections]
+
+    describe('ssoExists()', function () {
+        const anyCases: SsoTestCase[] = [
+            { connections: [ssoConnection], expected: true },
+            { connections: allConnections, expected: true },
+            { connections: [], expected: false },
+            { connections: [iamConnection], expected: false },
+        ].map((c) => {
+            return { ...c, kind: 'any' }
+        })
+        const cwIdcCases: SsoTestCase[] = [
+            { connections: [cwIdcConnection], expected: true },
+            { connections: allConnections, expected: true },
+            { connections: [], expected: false },
+            { connections: allConnections.filter((c) => c !== cwIdcConnection), expected: false },
+        ].map((c) => {
+            return { ...c, kind: 'codewhisperer' }
+        })
+        const allCases = [...anyCases, ...cwIdcCases]
+
+        for (const args of allCases) {
+            it(`ssoExists() returns '${args.expected}' when kind '${args.kind}' given [${args.connections
+                .map((c) => c.label)
+                .join(', ')}]`, async function () {
+                assert.strictEqual(await hasSso(args.kind, async () => args.connections), args.expected)
+            })
+        }
+    })
+
+    describe('builderIdExists()', function () {
+        const cwBuilderIdCases: BuilderIdTestCase[] = [
+            { connections: [cwBuilderIdConnection], expected: true },
+            { connections: allConnections, expected: true },
+            { connections: [], expected: false },
+            { connections: allConnections.filter((c) => c !== cwBuilderIdConnection), expected: false },
+        ].map((c) => {
+            return { ...c, kind: 'codewhisperer' }
+        })
+
+        const ccBuilderIdCases: BuilderIdTestCase[] = [
+            { connections: [ccBuilderIdConnection], expected: true },
+            { connections: allConnections, expected: true },
+            { connections: [], expected: false },
+            { connections: allConnections.filter((c) => c !== ccBuilderIdConnection), expected: false },
+        ].map((c) => {
+            return { ...c, kind: 'codecatalyst' }
+        })
+
+        const allCases = [...cwBuilderIdCases, ...ccBuilderIdCases]
+
+        for (const args of allCases) {
+            it(`builderIdExists() returns '${args.expected}' when kind '${args.kind}' given [${args.connections
+                .map((c) => c.label)
+                .join(', ')}]`, async function () {
+                assert.strictEqual(await hasBuilderId(args.kind, async () => args.connections), args.expected)
+            })
+        }
+    })
+
+    describe('credentialExists()', function () {
+        const cases: [Connection[], boolean][] = [
+            [[iamConnection], true],
+            [allConnections, true],
+            [[], false],
+            [allConnections.filter((c) => c !== iamConnection), false],
+        ]
+
+        for (const args of cases) {
+            it(`credentialExists() returns '${args[1]}' given [${args[0]
+                .map((c) => c.label)
+                .join(', ')}]`, async function () {
+                const connections = args[0]
+                const expected = args[1]
+
+                assert.strictEqual(await hasIamCredentials(async () => connections), expected)
+            })
+        }
+    })
+})
diff --git a/packages/core/src/test/credentials/wizards/createProfile.test.ts b/packages/core/src/test/credentials/wizards/createProfile.test.ts
new file mode 100644
index 00000000000..0711b26488f
--- /dev/null
+++ b/packages/core/src/test/credentials/wizards/createProfile.test.ts
@@ -0,0 +1,82 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { createWizardTester } from '../../shared/wizards/wizardTestUtils'
+import { CreateProfileWizard, ProfileTemplateProvider } from '../../../auth/wizards/createProfile'
+import { processCredentialsTemplate, staticCredentialsTemplate } from '../../../auth/wizards/templates'
+import { Prompter, PromptResult } from '../../../shared/ui/prompter'
+import { StepEstimator } from '../../../shared/wizards/wizard'
+import { Profile } from '../../../auth/credentials/sharedCredentials'
+import { SharedCredentialsKeys } from '../../../auth/credentials/types'
+
+class TestPrompter extends Prompter<string | undefined> {
+    public constructor(
+        private readonly name: string,
+        private readonly profile: Profile
+    ) {
+        super()
+    }
+
+    protected async promptUser(): Promise<PromptResult<string>> {
+        return JSON.stringify({ [this.name]: this.profile })
+    }
+
+    public setStepEstimator(estimator: StepEstimator<string>): void {}
+    public setSteps(current: number, total: number): void {}
+    public set recentItem(response: any) {}
+    public get recentItem(): any {
+        return
+    }
+}
+
+describe('CreateProfileWizard', function () {
+    it('prompts for profile name, access key, secret, and then validates (static)', async function () {
+        const tester = await createWizardTester(new CreateProfileWizard({ foo: {} }, staticCredentialsTemplate))
+        tester.name.assertShowFirst()
+        tester.profile[SharedCredentialsKeys.AWS_ACCESS_KEY_ID].assertShowSecond()
+        tester.profile[SharedCredentialsKeys.AWS_SECRET_ACCESS_KEY].assertShowThird()
+        tester.accountId.assertShow(4)
+    })
+
+    it('prompts for profile name, command, and then validates (credential_process)', async function () {
+        const tester = await createWizardTester(new CreateProfileWizard({ foo: {} }, processCredentialsTemplate))
+        tester.name.assertShowFirst()
+        tester.profile[SharedCredentialsKeys.CREDENTIAL_PROCESS].assertShowSecond()
+        tester.accountId.assertShowThird()
+    })
+
+    it('skips profile name step (and uses "default") if starting with no profiles', async function () {
+        const tester = await createWizardTester(new CreateProfileWizard({}, processCredentialsTemplate))
+        tester.name.assertDoesNotShow()
+        tester.name.assertValue('default')
+        tester.assertShowCount(2)
+    })
+
+    it('passes in the profile name + state to template prompts', async function () {
+        const template: ProfileTemplateProvider<Profile> = {
+            label: '',
+            description: '',
+            prompts: {
+                step1: (name, profile) => new TestPrompter(name, profile),
+                step2: (name, profile) => new TestPrompter(name, profile),
+            },
+        }
+
+        const wizard = new CreateProfileWizard({}, template)
+        wizard.form.name.bindPrompter(() =>
+            new TestPrompter('test', {}).transform((r) => Object.keys(JSON.parse(r!))[0])
+        )
+        wizard.form.accountId.bindPrompter(() => new TestPrompter('', {}).transform((r) => r!))
+
+        const result = await wizard.run()
+        const step1 = result?.profile?.['step1']
+        const step2 = result?.profile?.['step2']
+        assert.ok(step1)
+        assert.ok(step2)
+        assert.deepStrictEqual(JSON.parse(step1), { test: {} })
+        assert.deepStrictEqual(JSON.parse(step2), { test: { step1 } })
+    })
+})
diff --git a/packages/core/src/test/credentials/wizards/sso.test.ts b/packages/core/src/test/credentials/wizards/sso.test.ts
new file mode 100644
index 00000000000..a3229cd2977
--- /dev/null
+++ b/packages/core/src/test/credentials/wizards/sso.test.ts
@@ -0,0 +1,26 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { createWizardTester, WizardTester } from '../../../test/shared/wizards/wizardTestUtils'
+import { SsoWizard, SsoWizardState } from '../../../auth/wizards/sso'
+
+describe('SSO Wizard', function () {
+    let tester: WizardTester<SsoWizardState>
+
+    beforeEach(async function () {
+        tester = await createWizardTester(new SsoWizard())
+    })
+
+    it('prompts for region, start URL, account ID, and role name', function () {
+        tester.region.assertShow(1)
+        tester.startUrl.assertShow(2)
+
+        // "hidden" step in the flow that validates the token
+        tester.tokenProvider.assertShow(3)
+
+        tester.accountId.assertShow(4)
+        tester.roleName.assertShow(5)
+    })
+})
diff --git a/packages/core/src/test/docdb/commands/addRegion.test.ts b/packages/core/src/test/docdb/commands/addRegion.test.ts
new file mode 100644
index 00000000000..5a5e503080d
--- /dev/null
+++ b/packages/core/src/test/docdb/commands/addRegion.test.ts
@@ -0,0 +1,250 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { assertTelemetry } from '../../testUtil'
+import { getTestWindow } from '../../shared/vscode/window'
+import { globals } from '../../../shared'
+import { DBStorageType, DefaultDocumentDBClient, DocumentDBClient } from '../../../shared/clients/docdbClient'
+import { addRegion } from '../../../docdb/commands/addRegion'
+import { DBClusterNode } from '../../../docdb/explorer/dbClusterNode'
+import { DBGlobalClusterNode } from '../../../docdb/explorer/dbGlobalClusterNode'
+import { DocumentDBNode } from '../../../docdb/explorer/docdbNode'
+import { GlobalCluster } from '@aws-sdk/client-docdb'
+
+describe('addRegionCommand', function () {
+    const globalClusterName = 'docdb-global'
+    const clusterName = 'docdb-1234'
+    const cluster = {
+        DBClusterArn: 'arn:docdb-1234',
+        Status: 'available',
+        DBClusterMembers: [{ IsClusterWriter: true }],
+    }
+    let docdb: DocumentDBClient
+    let testNode: DBClusterNode | DBGlobalClusterNode
+    let sinonSandbox: sinon.SinonSandbox
+    let spyExecuteCommand: sinon.SinonSpy
+
+    beforeEach(function () {
+        sinonSandbox = sinon.createSandbox()
+        spyExecuteCommand = sinonSandbox.spy(vscode.commands, 'executeCommand')
+        sinonSandbox.stub(globals.regionProvider, 'isServiceInRegion').returns(true)
+        sinonSandbox.stub(globals.regionProvider, 'getRegions').returns([
+            { id: 'us-test-1', name: 'Test Region 1' },
+            { id: 'us-test-2', name: 'Test Region 2' },
+        ])
+
+        docdb = { regionCode: 'us-test-1' } as DocumentDBClient
+        docdb.listEngineVersions = sinon.stub().resolves([{ EngineVersion: 'test-version' }])
+        docdb.listInstanceClassOptions = sinon
+            .stub()
+            .resolves([{ DBInstanceClass: 'db.r5.large', StorageType: DBStorageType.Standard }])
+
+        sinonSandbox.stub(DefaultDocumentDBClient, 'create').returns(docdb)
+
+        cluster.DBClusterMembers = [{ IsClusterWriter: true }]
+        const parentNode = new DocumentDBNode(docdb)
+
+        testNode = new DBClusterNode(parentNode, cluster, docdb)
+    })
+    afterEach(function () {
+        sinonSandbox.restore()
+        getTestWindow().dispose()
+    })
+    function setupWizard() {
+        getTestWindow().onDidShowInputBox((input) => {
+            let val: string
+
+            if (input.prompt?.includes('global')) {
+                val = globalClusterName
+            } else if (input.prompt?.includes('cluster name')) {
+                val = clusterName
+            } else {
+                val = ''
+            }
+            input.acceptValue(val)
+        })
+
+        getTestWindow().onDidShowQuickPick(async (testQuickPicker) => {
+            await testQuickPicker.untilReady()
+            testQuickPicker.acceptItem(testQuickPicker.items[0])
+        })
+    }
+
+    it('prompts for new region and cluster params, creates global cluster, creates secondary cluster, and refreshes node', async function () {
+        // arrange
+        const createGlobalClusterStub = sinon.stub().resolves({
+            GlobalClusterIdentifier: globalClusterName,
+        })
+        const createClusterStub = sinon.stub().resolves({
+            DBClusterIdentifier: clusterName,
+        })
+        const createInstanceSinonStub = sinon.stub().resolves()
+        docdb.createGlobalCluster = createGlobalClusterStub
+        docdb.createCluster = createClusterStub
+        docdb.createInstance = createInstanceSinonStub
+
+        setupWizard()
+
+        // act
+        await addRegion(testNode)
+
+        // assert
+        getTestWindow().getFirstMessage().assertInfo('Region added')
+
+        assert(
+            createGlobalClusterStub.calledOnceWithExactly({
+                GlobalClusterIdentifier: globalClusterName,
+                SourceDBClusterIdentifier: cluster.DBClusterArn,
+            })
+        )
+
+        assert(
+            createClusterStub.calledOnceWith(
+                sinon.match({
+                    DBClusterIdentifier: clusterName,
+                    GlobalClusterIdentifier: globalClusterName,
+                })
+            )
+        )
+        assert(
+            createInstanceSinonStub.calledOnceWith(
+                sinon.match({
+                    Engine: 'docdb',
+                    DBClusterIdentifier: clusterName,
+                    DBInstanceIdentifier: clusterName,
+                    DBInstanceClass: 'db.r5.large',
+                })
+            )
+        )
+
+        sinonSandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', testNode.parent)
+
+        assertTelemetry('docdb_addRegion', { result: 'Succeeded' })
+    })
+
+    it('creates a secondary cluster, and refreshes node when adding to a global cluster', async function () {
+        // arrange
+        const createGlobalClusterStub = sinon.stub().resolves({
+            GlobalClusterIdentifier: globalClusterName,
+        })
+        const createClusterSinonStub = sinon.stub().resolves({
+            DBClusterIdentifier: clusterName,
+        })
+        const createInstanceStub = sinon.stub().resolves()
+        docdb.createGlobalCluster = createGlobalClusterStub
+        docdb.createCluster = createClusterSinonStub
+        docdb.createInstance = createInstanceStub
+        setupWizard()
+
+        const globalCluster: GlobalCluster = {
+            GlobalClusterIdentifier: globalClusterName,
+            GlobalClusterMembers: [],
+            Status: 'available',
+        }
+        testNode = new DBGlobalClusterNode(new DocumentDBNode(docdb), globalCluster, new Map(), docdb)
+
+        // act
+        await addRegion(testNode)
+
+        // assert
+        getTestWindow().getFirstMessage().assertInfo('Region added')
+
+        assert(createGlobalClusterStub.notCalled)
+
+        assert(
+            createClusterSinonStub.calledOnceWith(
+                sinon.match({
+                    DBClusterIdentifier: clusterName,
+                    GlobalClusterIdentifier: globalClusterName,
+                })
+            )
+        )
+
+        assert(
+            createInstanceStub.calledOnceWith(
+                sinon.match({
+                    Engine: 'docdb',
+                    DBClusterIdentifier: clusterName,
+                    DBInstanceIdentifier: clusterName,
+                    DBInstanceClass: 'db.r5.large',
+                })
+            )
+        )
+        sinonSandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', testNode)
+
+        assertTelemetry('docdb_addRegion', { result: 'Succeeded' })
+    })
+
+    it('does nothing when prompt is cancelled', async function () {
+        // arrange
+        const stub = sinon.stub()
+        docdb.createGlobalCluster = stub
+        getTestWindow().onDidShowQuickPick((input) => input.hide())
+
+        // act
+        await assert.rejects(addRegion(testNode))
+
+        // assert
+        assert(stub.notCalled)
+
+        assertTelemetry('docdb_addRegion', { result: 'Cancelled' })
+    })
+
+    it('shows an error when cluster creation fails', async function () {
+        // arrange
+        docdb.createGlobalCluster = sinon.stub().resolves({
+            GlobalClusterIdentifier: globalClusterName,
+        })
+        docdb.createCluster = sinon.stub().rejects()
+        setupWizard()
+
+        // act
+        await assert.rejects(addRegion(testNode))
+
+        // assert
+        getTestWindow()
+            .getFirstMessage()
+            .assertError(/Failed to create cluster: docdb-1234/)
+
+        assertTelemetry('docdb_addRegion', { result: 'Failed' })
+    })
+
+    it('shows a warning when the cluster has no instances', async function () {
+        // arrange
+        const clusterNode = testNode as DBClusterNode
+        clusterNode.cluster.DBClusterMembers = []
+        setupWizard()
+
+        // act
+        await assert.rejects(addRegion(testNode))
+
+        // assert
+        getTestWindow()
+            .getFirstMessage()
+            .assertError(/Cluster must have at least one instance to add a region/)
+
+        assertTelemetry('docdb_addRegion', { result: 'Cancelled' })
+    })
+
+    it('shows a warning when the cluster has an unsupported instance class', async function () {
+        // arrange
+        const clusterNode = testNode as DBClusterNode
+        clusterNode.instances = [{ DBInstanceClass: 'db.t3.medium' }]
+        setupWizard()
+
+        // act
+        await assert.rejects(addRegion(testNode))
+
+        // assert
+        getTestWindow()
+            .getFirstMessage()
+            .assertError(/Instance class db.t3.medium not supported/)
+
+        assertTelemetry('docdb_addRegion', { result: 'Cancelled' })
+    })
+})
diff --git a/packages/core/src/test/docdb/commands/createCluster.test.ts b/packages/core/src/test/docdb/commands/createCluster.test.ts
new file mode 100644
index 00000000000..90d31ad1487
--- /dev/null
+++ b/packages/core/src/test/docdb/commands/createCluster.test.ts
@@ -0,0 +1,167 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { assertTelemetry } from '../../testUtil'
+import { getTestWindow } from '../../shared/vscode/window'
+import { DocumentDBNode } from '../../../docdb/explorer/docdbNode'
+import { DBStorageType, DocumentDBClient } from '../../../shared/clients/docdbClient'
+import { createCluster } from '../../../docdb/commands/createCluster'
+
+describe('createClusterCommand', function () {
+    const clusterName = 'docdb-1234'
+    const testUser = 'testuser'
+    const testPassword = 'test-password'
+    let docdb: DocumentDBClient
+    let node: DocumentDBNode
+    let sandbox: sinon.SinonSandbox
+    let spyExecuteCommand: sinon.SinonSpy
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+
+        docdb = { regionCode: 'us-east-1' } as DocumentDBClient
+        docdb.listEngineVersions = sinon.stub().resolves([{ EngineVersion: 'test-version' }])
+        docdb.listInstanceClassOptions = sinon
+            .stub()
+            .resolves([{ DBInstanceClass: 'db.t3.medium', StorageType: DBStorageType.Standard }])
+
+        node = new DocumentDBNode(docdb)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+        getTestWindow().dispose()
+    })
+
+    function setupWizard() {
+        getTestWindow().onDidShowInputBox((input) => {
+            let value: string
+            if (input.prompt?.includes('username')) {
+                value = testUser
+            } else if (input.prompt?.includes('password')) {
+                value = testPassword
+            } else if (input.prompt?.includes('cluster name')) {
+                value = clusterName
+            } else {
+                value = ''
+            }
+            input.acceptValue(value)
+        })
+        getTestWindow().onDidShowQuickPick(async (picker) => {
+            await picker.untilReady()
+            picker.acceptItem(picker.items[0])
+        })
+    }
+
+    it('prompts for cluster params, creates cluster, shows success, and refreshes node', async function () {
+        // arrange
+        const createClusterStub = sinon.stub().resolves({
+            DBClusterIdentifier: clusterName,
+        })
+        const createInstanceStub = sinon.stub().resolves({
+            DBInstanceIdentifier: clusterName,
+        })
+        docdb.createCluster = createClusterStub
+        docdb.createInstance = createInstanceStub
+        setupWizard()
+
+        // act
+        await createCluster(node)
+
+        // assert
+        getTestWindow()
+            .getFirstMessage()
+            .assertInfo(/Created cluster: docdb-1234/)
+
+        assert(
+            createClusterStub.calledOnceWithExactly({
+                Engine: 'docdb',
+                EngineVersion: 'test-version',
+                DBClusterIdentifier: clusterName,
+                MasterUsername: testUser,
+                MasterUserPassword: testPassword,
+                StorageEncrypted: true,
+                DBInstanceCount: 1,
+                DBInstanceClass: 'db.t3.medium',
+            })
+        )
+
+        assert(
+            createInstanceStub.calledOnceWithExactly({
+                Engine: 'docdb',
+                DBClusterIdentifier: clusterName,
+                DBInstanceIdentifier: clusterName,
+                DBInstanceClass: 'db.t3.medium',
+            })
+        )
+
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', node)
+
+        assertTelemetry('docdb_createCluster', {
+            awsRegion: docdb.regionCode,
+            result: 'Succeeded',
+        })
+    })
+
+    it('does nothing when prompt is cancelled', async function () {
+        // arrange
+        const stub = sinon.stub()
+        docdb.createCluster = stub
+        getTestWindow().onDidShowInputBox((input) => input.hide())
+        getTestWindow().onDidShowQuickPick((input) => input.hide())
+
+        // act
+        await assert.rejects(createCluster(node))
+
+        // assert
+        assert(stub.notCalled)
+
+        assertTelemetry('docdb_createCluster', {
+            result: 'Cancelled',
+        })
+    })
+
+    it('shows an error when cluster creation fails', async function () {
+        // arrange
+        const stub = sinon.stub().rejects()
+        docdb.createCluster = stub
+        setupWizard()
+
+        // act
+        await assert.rejects(createCluster(node))
+
+        // assert
+        getTestWindow()
+            .getFirstMessage()
+            .assertError(/Failed to create cluster: docdb-1234/)
+
+        assertTelemetry('docdb_createCluster', {
+            result: 'Failed',
+        })
+    })
+
+    it('shows an error when instance creation fails', async function () {
+        // arrange
+        docdb.createCluster = sinon.stub().resolves({ DBClusterIdentifier: clusterName })
+        docdb.createInstance = sinon.stub().rejects()
+        setupWizard()
+
+        // act
+        await assert.rejects(createCluster(node))
+
+        // assert
+        getTestWindow()
+            .getFirstMessage()
+            .assertError(/Failed to create cluster: docdb-1234/)
+
+        assertTelemetry('docdb_createCluster', {
+            result: 'Failed',
+        })
+    })
+})
diff --git a/packages/core/src/test/docdb/commands/createInstance.test.ts b/packages/core/src/test/docdb/commands/createInstance.test.ts
new file mode 100644
index 00000000000..ca58671ba6c
--- /dev/null
+++ b/packages/core/src/test/docdb/commands/createInstance.test.ts
@@ -0,0 +1,145 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { getTestWindow } from '../../shared/vscode/window'
+import { DocumentDBClient, DBStorageType } from '../../../shared/clients/docdbClient'
+import { DBClusterNode } from '../../../docdb/explorer/dbClusterNode'
+import { createInstance } from '../../../docdb/commands/createInstance'
+import { CreateDBInstanceMessage, DBCluster } from '@aws-sdk/client-docdb'
+import { DocumentDBNode } from '../../../docdb/explorer/docdbNode'
+import { assertTelemetry } from '../../testUtil'
+
+describe('createInstanceCommand', function () {
+    const clusterName = 'docdb-1234'
+    const instanceName = 'test-instance'
+    let docdb: DocumentDBClient
+    let cluster: DBCluster
+    let node: DBClusterNode
+    let spyExecuteCommand: sinon.SinonSpy
+    let sandbox: sinon.SinonSandbox
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+
+        docdb = { regionCode: 'us-east-1' } as DocumentDBClient
+
+        docdb.listInstances = sinon.stub().resolves([])
+
+        docdb.listInstanceClassOptions = sinon
+            .stub()
+            .resolves([{ DBInstanceClass: 'db.t3.medium', StorageType: DBStorageType.Standard }])
+
+        cluster = { DBClusterIdentifier: clusterName, Status: 'available' }
+        const parentNode = new DocumentDBNode(docdb)
+        node = new DBClusterNode(parentNode, cluster, docdb)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+        getTestWindow().dispose()
+    })
+    function setupWizard() {
+        getTestWindow().onDidShowInputBox((input) => {
+            input.acceptValue(instanceName)
+        })
+
+        getTestWindow().onDidShowQuickPick(async (picker) => {
+            await picker.untilReady()
+            picker.acceptItem(picker.items[0])
+        })
+    }
+
+    it('prompts for instance name and instance class, creates instance, shows success, and refreshes node', async function () {
+        // arrange
+        const stub = sinon.stub().resolves({
+            DBInstanceIdentifier: instanceName,
+        })
+        docdb.createInstance = stub
+        setupWizard()
+
+        // act
+        await createInstance(node)
+
+        // assert
+        getTestWindow()
+            .getFirstMessage()
+            .assertInfo(/Creating instance: test-instance/)
+
+        const expectedArgs: CreateDBInstanceMessage = {
+            Engine: 'docdb',
+            DBClusterIdentifier: clusterName,
+            DBInstanceIdentifier: instanceName,
+            DBInstanceClass: 'db.t3.medium',
+        }
+
+        assert(stub.calledOnceWithExactly(expectedArgs))
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', node)
+        assert((docdb.listInstances as sinon.SinonSpy).calledOnce)
+
+        assertTelemetry('docdb_createInstance', {
+            result: 'Succeeded',
+        })
+    })
+
+    it('does nothing when prompt is cancelled', async function () {
+        // arrange
+        const stub = sinon.stub()
+        docdb.createInstance = stub
+        getTestWindow().onDidShowInputBox((input) => input.hide())
+
+        // act
+        await assert.rejects(createInstance(node))
+
+        // assert
+        assert(stub.notCalled)
+
+        assertTelemetry('docdb_createInstance', {
+            result: 'Cancelled',
+        })
+    })
+
+    it('shows a warning when the cluster has the max number of instances', async function () {
+        // arrange
+        docdb.listInstances = sinon.stub().resolves(new Array(16))
+        const stub = sinon.stub()
+        docdb.createInstance = stub
+        setupWizard()
+
+        // act
+        await assert.rejects(createInstance(node))
+
+        // assert
+        getTestWindow()
+            .getFirstMessage()
+            .assertMessage(/Max instances in use/)
+
+        assertTelemetry('docdb_createInstance', {
+            result: 'Failed',
+        })
+    })
+
+    it('shows an error when instance creation fails', async function () {
+        // arrange
+        const stub = sinon.stub().rejects()
+        docdb.createInstance = stub
+        setupWizard()
+
+        // act
+        await assert.rejects(createInstance(node))
+
+        // assert
+        getTestWindow()
+            .getFirstMessage()
+            .assertError(/Failed to create instance: test-instance/)
+
+        assertTelemetry('docdb_createInstance', {
+            result: 'Failed',
+        })
+    })
+})
diff --git a/packages/core/src/test/docdb/commands/deleteCluster.test.ts b/packages/core/src/test/docdb/commands/deleteCluster.test.ts
new file mode 100644
index 00000000000..5c86a7b6aea
--- /dev/null
+++ b/packages/core/src/test/docdb/commands/deleteCluster.test.ts
@@ -0,0 +1,239 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { assertTelemetry } from '../../testUtil'
+import { getTestWindow } from '../../shared/vscode/window'
+import { DBCluster, DBInstance } from '@aws-sdk/client-docdb'
+import { DocumentDBClient } from '../../../shared/clients/docdbClient'
+import { DocumentDBNode } from '../../../docdb/explorer/docdbNode'
+import { DBElasticClusterNode } from '../../../docdb/explorer/dbElasticClusterNode'
+import { DBClusterNode } from '../../../docdb/explorer/dbClusterNode'
+import { deleteCluster } from '../../../docdb/commands/deleteCluster'
+
+describe('deleteClusterCommand', function () {
+    const clusterName = 'test-cluster'
+    let docdb: DocumentDBClient
+    let sinonSandbox: sinon.SinonSandbox
+    let spyExecuteCommand: sinon.SinonSpy
+
+    beforeEach(function () {
+        sinonSandbox = sinon.createSandbox()
+        spyExecuteCommand = sinonSandbox.spy(vscode.commands, 'executeCommand')
+    })
+    afterEach(function () {
+        sinonSandbox.restore()
+        getTestWindow().dispose()
+    })
+    function setupWizard() {
+        getTestWindow().onDidShowInputBox((input) => {
+            input.acceptValue(input.placeholder!)
+        })
+
+        getTestWindow().onDidShowQuickPick(async (picker) => {
+            await picker.untilReady()
+            picker.acceptItem(picker.items[0])
+        })
+    }
+
+    describe('regional cluster', function () {
+        let cluster: DBCluster
+        let instances: DBInstance[]
+        let node: DBClusterNode
+        let deleteInstanceStub: sinon.SinonStub
+
+        beforeEach(function () {
+            cluster = { DBClusterIdentifier: clusterName, Status: 'available' }
+            instances = [
+                { DBClusterIdentifier: clusterName, DBInstanceIdentifier: 'instance-1' },
+                { DBClusterIdentifier: clusterName, DBInstanceIdentifier: 'instance-2' },
+            ]
+
+            docdb = { regionCode: 'us-east-1' } as DocumentDBClient
+            docdb.listClusters = sinon.stub().resolves([cluster])
+            docdb.listInstances = sinon.stub().resolves(instances)
+            deleteInstanceStub = sinon.stub().onFirstCall().resolves(instances[0]).onSecondCall().resolves(instances[1])
+            docdb.deleteInstance = deleteInstanceStub
+
+            const parentNode = new DocumentDBNode(docdb)
+            node = new DBClusterNode(parentNode, cluster, docdb)
+            node.waitUntilStatusChanged = sinon.stub().resolves(true)
+        })
+
+        it('prompts for snapshot and confirmation, deletes all instances, deletes cluster, and refreshes node', async function () {
+            // arrange
+            const deleteClusterStub = sinon.stub().resolves({
+                DBClusterIdentifier: clusterName,
+                Status: 'backing up',
+            })
+            docdb.deleteCluster = deleteClusterStub
+            setupWizard()
+
+            // act
+            await deleteCluster(node)
+
+            // assert
+            getTestWindow()
+                .getFirstMessage()
+                .assertInfo(/Deleting cluster: test-cluster/)
+
+            assert(deleteClusterStub.calledOnceWithExactly(sinon.match({ DBClusterIdentifier: clusterName })))
+            assert(deleteInstanceStub.calledTwice)
+            sinonSandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', node.parent)
+
+            assertTelemetry('docdb_deleteCluster', {
+                result: 'Succeeded',
+            })
+        })
+
+        it('does nothing when prompt is cancelled', async function () {
+            const deleteClusterStub = sinon.stub()
+            docdb.deleteCluster = deleteClusterStub
+            getTestWindow().onDidShowQuickPick((picker) => picker.hide())
+            getTestWindow().onDidShowInputBox((input) => input.hide())
+
+            await assert.rejects(deleteCluster(node))
+            assert(deleteClusterStub.notCalled)
+            assertTelemetry('docdb_deleteCluster', {
+                result: 'Cancelled',
+            })
+        })
+
+        it('shows a warning when the cluster is stopped', async function () {
+            cluster.Status = 'stopped'
+            const deleteClusterStub = sinon.stub()
+            docdb.deleteCluster = deleteClusterStub
+            setupWizard()
+
+            await assert.rejects(deleteCluster(node))
+            getTestWindow()
+                .getFirstMessage()
+                .assertMessage(/Cluster must be running/)
+
+            assertTelemetry('docdb_deleteCluster', {
+                result: 'Cancelled',
+            })
+        })
+
+        it('shows an error when cluster deletion fails', async function () {
+            const deleteClusterStub = sinon.stub().rejects()
+            docdb.deleteCluster = deleteClusterStub
+            setupWizard()
+
+            await assert.rejects(deleteCluster(node))
+
+            getTestWindow()
+                .getFirstMessage()
+                .assertError(/Failed to delete cluster: test-cluster/)
+
+            assertTelemetry('docdb_deleteCluster', {
+                result: 'Failed',
+            })
+        })
+    })
+
+    describe('elastic cluster', function () {
+        let cluster: any
+        let node: DBElasticClusterNode
+
+        beforeEach(function () {
+            cluster = { clusterName, clusterArn: 'arn:test-cluster', status: 'ACTIVE' }
+            docdb = { regionCode: 'us-east-1' } as DocumentDBClient
+            docdb.listElasticClusters = sinon.stub().resolves([cluster])
+
+            const parentNode = new DocumentDBNode(docdb)
+            node = new DBElasticClusterNode(parentNode, cluster, docdb)
+            node.waitUntilStatusChanged = sinon.stub().resolves(true)
+        })
+
+        it('prompts for snapshot and confirmation, creates snapshot, deletes cluster, and refreshes node', async function () {
+            // arrange
+            const createSnapshotStub = sinon.stub().resolves()
+            const deleteClusterStub = sinon.stub().resolves()
+            docdb.createClusterSnapshot = createSnapshotStub
+            docdb.deleteElasticCluster = deleteClusterStub
+            setupWizard()
+
+            // act
+            await deleteCluster(node)
+
+            // assert
+            getTestWindow()
+                .getFirstMessage()
+                .assertInfo(/Taking snapshot of cluster: test-cluster/)
+
+            getTestWindow()
+                .getSecondMessage()
+                .assertInfo(/Deleting cluster: test-cluster/)
+
+            assert(createSnapshotStub.calledOnceWithExactly(sinon.match({ clusterArn: cluster.clusterArn })))
+            assert(deleteClusterStub.calledOnceWithExactly(cluster.clusterArn))
+            sinonSandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', node.parent)
+
+            assertTelemetry('docdb_deleteCluster', {
+                result: 'Succeeded',
+            })
+        })
+
+        it('does nothing when prompt is cancelled', async function () {
+            // arrange
+            const deleteClusterStub = sinon.stub()
+            docdb.deleteElasticCluster = deleteClusterStub
+            getTestWindow().onDidShowQuickPick((picker) => picker.hide())
+            getTestWindow().onDidShowInputBox((input) => input.hide())
+
+            // act
+            await assert.rejects(deleteCluster(node))
+
+            // assert
+            assert(deleteClusterStub.notCalled)
+
+            assertTelemetry('docdb_deleteCluster', {
+                result: 'Cancelled',
+            })
+        })
+
+        it('shows a warning when the cluster is stopped', async function () {
+            // arrange
+            cluster.status = 'STOPPED'
+            const deleteClusterStub = sinon.stub()
+            docdb.deleteElasticCluster = deleteClusterStub
+            setupWizard()
+
+            // act
+            await assert.rejects(deleteCluster(node))
+
+            // assert
+            getTestWindow()
+                .getFirstMessage()
+                .assertMessage(/Cluster must be running/)
+
+            assertTelemetry('docdb_deleteCluster', {
+                result: 'Cancelled',
+            })
+        })
+
+        it('shows an error when cluster deletion fails', async function () {
+            // arrange
+            docdb.createClusterSnapshot = sinon.stub().resolves()
+            docdb.deleteElasticCluster = sinon.stub().rejects()
+            setupWizard()
+
+            // act
+            await assert.rejects(deleteCluster(node))
+
+            // assert
+            getTestWindow()
+                .getSecondMessage()
+                .assertError(/Failed to delete cluster: test-cluster/)
+
+            assertTelemetry('docdb_deleteCluster', {
+                result: 'Failed',
+            })
+        })
+    })
+})
diff --git a/packages/core/src/test/docdb/commands/deleteInstance.test.ts b/packages/core/src/test/docdb/commands/deleteInstance.test.ts
new file mode 100644
index 00000000000..8ba1601cb95
--- /dev/null
+++ b/packages/core/src/test/docdb/commands/deleteInstance.test.ts
@@ -0,0 +1,129 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { getTestWindow } from '../../shared/vscode/window'
+import { DocumentDBClient } from '../../../shared/clients/docdbClient'
+import { DBClusterNode } from '../../../docdb/explorer/dbClusterNode'
+import { DBInstanceNode } from '../../../docdb/explorer/dbInstanceNode'
+import { deleteInstance } from '../../../docdb/commands/deleteInstance'
+import { DBCluster, DBInstance } from '@aws-sdk/client-docdb'
+import { assertTelemetry } from '../../testUtil'
+
+describe('deleteInstanceCommand', function () {
+    const instanceName = 'test-instance'
+    let docdb: DocumentDBClient
+    let cluster: DBCluster
+    let instance: DBInstance
+    let parentNode: DBClusterNode
+    let node: DBInstanceNode
+    let spyExecuteCommand: sinon.SinonSpy
+    let sandbox: sinon.SinonSandbox
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+        docdb = { regionCode: 'us-east-1' } as DocumentDBClient
+        cluster = { Status: 'available' }
+        instance = {
+            DBInstanceIdentifier: instanceName,
+            DBClusterIdentifier: 'test-cluster',
+            DBInstanceStatus: 'available',
+        }
+        parentNode = new DBClusterNode(undefined!, cluster, docdb)
+        node = new DBInstanceNode(parentNode, instance)
+    })
+    afterEach(function () {
+        sandbox.restore()
+        getTestWindow().dispose()
+    })
+    function setupWizard() {
+        getTestWindow().onDidShowInputBox((input) => {
+            input.acceptValue(instanceName)
+        })
+    }
+
+    it('prompts for instance name, deletes instance, shows success, and refreshes node', async function () {
+        // arrange
+        const stub = sinon.stub().resolves({
+            DBInstanceIdentifier: instanceName,
+        })
+        docdb.deleteInstance = stub
+        setupWizard()
+
+        // act
+        await deleteInstance(node)
+
+        // assert
+        getTestWindow()
+            .getFirstMessage()
+            .assertInfo(/Deleting instance: test-instance/)
+
+        assert(stub.calledOnceWithExactly({ DBInstanceIdentifier: instanceName }))
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', parentNode)
+
+        assertTelemetry('docdb_deleteInstance', {
+            result: 'Succeeded',
+        })
+    })
+
+    it('does nothing when prompt is cancelled', async function () {
+        // arrange
+        const stub = sinon.stub()
+        docdb.deleteInstance = stub
+        getTestWindow().onDidShowInputBox((input) => input.hide())
+
+        // act
+        await assert.rejects(deleteInstance(node))
+
+        // assert
+        assert(stub.notCalled)
+
+        assertTelemetry('docdb_deleteInstance', {
+            result: 'Cancelled',
+        })
+    })
+
+    it('shows a warning when the cluster is stopped', async function () {
+        // arrange
+        cluster.Status = 'stopped'
+        const stub = sinon.stub()
+        docdb.deleteInstance = stub
+        setupWizard()
+
+        // act
+        await assert.rejects(deleteInstance(node))
+
+        // assert
+        getTestWindow()
+            .getFirstMessage()
+            .assertMessage(/Cluster must be started to delete instances/)
+
+        assertTelemetry('docdb_deleteInstance', {
+            result: 'Cancelled',
+        })
+    })
+
+    it('shows an error when instance deletion fails', async function () {
+        // arrange
+        const stub = sinon.stub().rejects()
+        docdb.deleteInstance = stub
+        setupWizard()
+
+        // act
+        await assert.rejects(deleteInstance(node))
+
+        // assert
+        getTestWindow()
+            .getFirstMessage()
+            .assertError(/Failed to delete instance: test-instance/)
+
+        assertTelemetry('docdb_deleteInstance', {
+            result: 'Failed',
+        })
+    })
+})
diff --git a/packages/core/src/test/docdb/commands/modifyInstance.test.ts b/packages/core/src/test/docdb/commands/modifyInstance.test.ts
new file mode 100644
index 00000000000..77872b411bb
--- /dev/null
+++ b/packages/core/src/test/docdb/commands/modifyInstance.test.ts
@@ -0,0 +1,143 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { getTestWindow } from '../../shared/vscode/window'
+import { DocumentDBClient, DBInstance, DBStorageType } from '../../../shared/clients/docdbClient'
+import { DBClusterNode } from '../../../docdb/explorer/dbClusterNode'
+import { modifyInstance } from '../../../docdb/commands/modifyInstance'
+import { ModifyDBInstanceMessage, DBCluster } from '@aws-sdk/client-docdb'
+import { DocumentDBNode } from '../../../docdb/explorer/docdbNode'
+import { DBInstanceNode } from '../../../docdb/explorer/dbInstanceNode'
+import { assertTelemetry } from '../../testUtil'
+
+describe('modifyInstanceCommand', function () {
+    const clusterName = 'docdb-1234'
+    const instanceName = 'test-instance'
+    let docdb: DocumentDBClient
+    let cluster: DBCluster
+    let instance: DBInstance
+    let node: DBInstanceNode
+    let spyExecuteCommand: sinon.SinonSpy
+    let sandbox: sinon.SinonSandbox
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+        docdb = { regionCode: 'us-east-1' } as DocumentDBClient
+        docdb.listInstanceClassOptions = sinon
+            .stub()
+            .resolves([{ DBInstanceClass: 'db.t3.large', StorageType: DBStorageType.Standard }])
+
+        cluster = { DBClusterIdentifier: clusterName, Status: 'available' }
+        instance = {
+            DBInstanceIdentifier: instanceName,
+            DBClusterIdentifier: clusterName,
+            DBInstanceStatus: 'available',
+        }
+        const parentNode = new DBClusterNode(new DocumentDBNode(docdb), cluster, docdb)
+        node = new DBInstanceNode(parentNode, instance)
+        node.waitUntilStatusChanged = sinon.stub().resolves(true)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+        getTestWindow().dispose()
+    })
+
+    function setupWizard() {
+        getTestWindow().onDidShowQuickPick(async (picker) => {
+            await picker.untilReady()
+            picker.acceptItem(picker.items[0])
+        })
+    }
+
+    it('prompts for instance class, modifies instance, shows success, and refreshes node', async function () {
+        // arrange
+        const stub = sinon.stub().resolves({
+            DBInstanceIdentifier: instanceName,
+        })
+        docdb.modifyInstance = stub
+        setupWizard()
+
+        // act
+        await modifyInstance(node)
+
+        // assert
+        getTestWindow()
+            .getFirstMessage()
+            .assertInfo(/Modified instance: test-instance/)
+
+        const expectedArgs: ModifyDBInstanceMessage = {
+            DBInstanceIdentifier: instanceName,
+            DBInstanceClass: 'db.t3.large',
+            ApplyImmediately: true,
+        }
+
+        assert(stub.calledOnceWithExactly(expectedArgs))
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', node.parent)
+
+        assertTelemetry('docdb_resizeInstance', {
+            result: 'Succeeded',
+        })
+    })
+
+    it('does nothing when prompt is cancelled', async function () {
+        // arrange
+        const stub = sinon.stub()
+        docdb.modifyInstance = stub
+        getTestWindow().onDidShowQuickPick((picker) => picker.hide())
+
+        // act
+        await assert.rejects(modifyInstance(node))
+
+        // assert
+        assert(stub.notCalled)
+
+        assertTelemetry('docdb_resizeInstance', {
+            result: 'Cancelled',
+        })
+    })
+
+    it('shows a warning when the instance is not available', async function () {
+        // arrange
+        instance.DBInstanceStatus = 'stopped'
+        const stub = sinon.stub()
+        docdb.modifyInstance = stub
+        setupWizard()
+
+        // act
+        await assert.rejects(modifyInstance(node))
+
+        // assert
+        getTestWindow()
+            .getFirstMessage()
+            .assertMessage(/Instance must be running/)
+
+        assertTelemetry('docdb_resizeInstance', {
+            result: 'Cancelled',
+        })
+    })
+
+    it('shows an error when instance creation fails', async function () {
+        // arrange
+        const stub = sinon.stub().rejects()
+        docdb.modifyInstance = stub
+        setupWizard()
+
+        // act
+        await assert.rejects(modifyInstance(node))
+
+        // assert
+        getTestWindow()
+            .getFirstMessage()
+            .assertError(/Failed to modify instance: test-instance/)
+
+        assertTelemetry('docdb_resizeInstance', {
+            result: 'Failed',
+        })
+    })
+})
diff --git a/packages/core/src/test/docdb/commands/rebootInstance.test.ts b/packages/core/src/test/docdb/commands/rebootInstance.test.ts
new file mode 100644
index 00000000000..4006ba52fc5
--- /dev/null
+++ b/packages/core/src/test/docdb/commands/rebootInstance.test.ts
@@ -0,0 +1,107 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { getTestWindow } from '../../shared/vscode/window'
+import { DocumentDBClient, DBInstance } from '../../../shared/clients/docdbClient'
+import { DBClusterNode } from '../../../docdb/explorer/dbClusterNode'
+import { DBInstanceNode } from '../../../docdb/explorer/dbInstanceNode'
+import { DocumentDBNode } from '../../../docdb/explorer/docdbNode'
+import { rebootInstance } from '../../../docdb/commands/rebootInstance'
+import { assertTelemetry } from '../../testUtil'
+
+describe('rebootInstanceCommand', function () {
+    const instanceName = 'test-instance'
+    let docdb: DocumentDBClient
+    let instance: DBInstance
+    let node: DBInstanceNode
+    let sandbox: sinon.SinonSandbox
+    let spyExecuteCommand: sinon.SinonSpy
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+
+        getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Yes')?.select())
+
+        docdb = { regionCode: 'us-east-1' } as DocumentDBClient
+        const clusterName = 'docdb-1234'
+        const cluster = { DBClusterIdentifier: clusterName, Status: 'available' }
+        const parentNode = new DBClusterNode(new DocumentDBNode(docdb), cluster, docdb)
+        instance = {
+            DBInstanceIdentifier: instanceName,
+            DBClusterIdentifier: clusterName,
+            DBInstanceStatus: 'available',
+        }
+        node = new DBInstanceNode(parentNode, instance)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+        getTestWindow().dispose()
+    })
+
+    it('reboots instance, and refreshes parent node', async function () {
+        // arrange
+        const stub = sinon.stub().resolves(true)
+        docdb.rebootInstance = stub
+
+        // act
+        await rebootInstance(node)
+
+        // assert
+        getTestWindow().getFirstMessage().assertWarn('Are you sure you want to reboot instance test-instance?')
+
+        getTestWindow()
+            .getSecondMessage()
+            .assertInfo(/Rebooting instance: test-instance/)
+
+        assert(stub.calledOnceWithExactly(instanceName))
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', node.parent)
+
+        assertTelemetry('docdb_rebootInstance', {
+            result: 'Succeeded',
+        })
+    })
+
+    it('shows an error when api returns failure', async function () {
+        // arrange
+        const stub = sinon.stub().rejects()
+        docdb.rebootInstance = stub
+
+        // act
+        await assert.rejects(rebootInstance(node))
+
+        // assert
+        getTestWindow()
+            .getSecondMessage()
+            .assertError(/Failed to reboot instance: test-instance/)
+
+        assertTelemetry('docdb_rebootInstance', {
+            result: 'Failed',
+        })
+    })
+
+    it('shows a warning when the instance is not available', async function () {
+        // arrange
+        instance.DBInstanceStatus = 'stopped'
+        const stub = sinon.stub()
+        docdb.rebootInstance = stub
+
+        // act
+        await assert.rejects(rebootInstance(node))
+
+        // assert
+        getTestWindow()
+            .getFirstMessage()
+            .assertMessage(/Instance must be running/)
+
+        assertTelemetry('docdb_rebootInstance', {
+            result: 'Cancelled',
+        })
+    })
+})
diff --git a/packages/core/src/test/docdb/commands/renameCluster.test.ts b/packages/core/src/test/docdb/commands/renameCluster.test.ts
new file mode 100644
index 00000000000..9f316598787
--- /dev/null
+++ b/packages/core/src/test/docdb/commands/renameCluster.test.ts
@@ -0,0 +1,131 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { getTestWindow } from '../../shared/vscode/window'
+import { DocumentDBClient } from '../../../shared/clients/docdbClient'
+import { DBClusterNode } from '../../../docdb/explorer/dbClusterNode'
+import { DocumentDBNode } from '../../../docdb/explorer/docdbNode'
+import { renameCluster } from '../../../docdb/commands/renameCluster'
+import { DBCluster } from '@aws-sdk/client-docdb'
+import { assertTelemetry } from '../../testUtil'
+
+describe('renameClusterCommand', function () {
+    const clusterName = 'test-cluster'
+    const newClusterName = 'new-cluster-name'
+    let docdb: DocumentDBClient
+    let spyExecuteCommand: sinon.SinonSpy
+    let cluster: DBCluster
+    let node: DBClusterNode
+    let sandbox: sinon.SinonSandbox
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+
+        docdb = { regionCode: 'us-east-1' } as DocumentDBClient
+        cluster = { DBClusterIdentifier: clusterName, Status: 'available' }
+        node = new DBClusterNode(new DocumentDBNode(docdb), cluster, docdb)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+        getTestWindow().dispose()
+    })
+
+    function setupWizard() {
+        getTestWindow().onDidShowInputBox((input) => {
+            input.acceptValue(newClusterName)
+        })
+    }
+
+    it('prompts for new cluster name, modifies cluster, shows success, and refreshes parent node', async function () {
+        // arrange
+        const stub = sinon.stub().resolves({
+            DBClusterIdentifier: clusterName,
+        })
+        docdb.modifyCluster = stub
+        setupWizard()
+
+        // act
+        await renameCluster(node)
+
+        // assert
+        getTestWindow()
+            .getFirstMessage()
+            .assertInfo(/Updated cluster: test-cluster/)
+
+        const expectedArgs = {
+            DBClusterIdentifier: clusterName,
+            NewDBClusterIdentifier: newClusterName,
+            ApplyImmediately: true,
+        }
+
+        assert(stub.calledOnceWithExactly(expectedArgs))
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', node.parent)
+
+        assertTelemetry('docdb_renameCluster', {
+            result: 'Succeeded',
+        })
+    })
+
+    it('does nothing when prompt is cancelled', async function () {
+        // arrange
+        const stub = sinon.stub()
+        docdb.modifyCluster = stub
+        getTestWindow().onDidShowInputBox((input) => input.hide())
+
+        // act
+        await assert.rejects(renameCluster(node))
+
+        // assert
+        assert(stub.notCalled)
+
+        assertTelemetry('docdb_renameCluster', {
+            result: 'Cancelled',
+        })
+    })
+
+    it('shows a warning when the cluster is not available', async function () {
+        // arrange
+        cluster.Status = 'stopped'
+        const stub = sinon.stub()
+        docdb.modifyCluster = stub
+        setupWizard()
+
+        // act
+        await assert.rejects(renameCluster(node))
+
+        // assert
+        getTestWindow()
+            .getFirstMessage()
+            .assertMessage(/Cluster must be running/)
+
+        assertTelemetry('docdb_renameCluster', {
+            result: 'Cancelled',
+        })
+    })
+
+    it('shows an error when cluster creation fails', async function () {
+        // arrange
+        const stub = sinon.stub().rejects()
+        docdb.modifyCluster = stub
+        setupWizard()
+
+        // act
+        await assert.rejects(renameCluster(node))
+
+        // assert
+        getTestWindow()
+            .getFirstMessage()
+            .assertError(/Failed to rename cluster: test-cluster/)
+
+        assertTelemetry('docdb_renameCluster', {
+            result: 'Failed',
+        })
+    })
+})
diff --git a/packages/core/src/test/docdb/commands/renameInstance.test.ts b/packages/core/src/test/docdb/commands/renameInstance.test.ts
new file mode 100644
index 00000000000..097e01d7ba1
--- /dev/null
+++ b/packages/core/src/test/docdb/commands/renameInstance.test.ts
@@ -0,0 +1,140 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { getTestWindow } from '../../shared/vscode/window'
+import { DBCluster } from '@aws-sdk/client-docdb'
+import { DocumentDBClient, DBInstance } from '../../../shared/clients/docdbClient'
+import { DBClusterNode } from '../../../docdb/explorer/dbClusterNode'
+import { DBInstanceNode } from '../../../docdb/explorer/dbInstanceNode'
+import { DocumentDBNode } from '../../../docdb/explorer/docdbNode'
+import { renameInstance } from '../../../docdb/commands/renameInstance'
+import { assertTelemetry } from '../../testUtil'
+
+describe('renameInstanceCommand', function () {
+    const clusterName = 'docdb-1234'
+    const instanceName = 'test-instance'
+    const newInstanceName = 'new-instance-name'
+    let docdb: DocumentDBClient
+    let cluster: DBCluster
+    let instance: DBInstance
+    let node: DBInstanceNode
+    let sandbox: sinon.SinonSandbox
+    let spyExecuteCommand: sinon.SinonSpy
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+
+        docdb = { regionCode: 'us-east-1' } as DocumentDBClient
+        cluster = { DBClusterIdentifier: clusterName, Status: 'available' }
+        instance = {
+            DBInstanceIdentifier: instanceName,
+            DBClusterIdentifier: clusterName,
+            DBInstanceStatus: 'available',
+        }
+        const parentNode = new DBClusterNode(new DocumentDBNode(docdb), cluster, docdb)
+        node = new DBInstanceNode(parentNode, instance)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+        getTestWindow().dispose()
+    })
+
+    function setupWizard() {
+        getTestWindow().onDidShowInputBox((input) => {
+            input.acceptValue(newInstanceName)
+        })
+    }
+
+    it('prompts for new instance name, modifies instance, shows success, and refreshes node', async function () {
+        // arrange
+        const stub = sinon.stub().resolves({
+            DBInstanceIdentifier: instanceName,
+        })
+        docdb.modifyInstance = stub
+        setupWizard()
+
+        // act
+        await renameInstance(node)
+
+        // assert
+        getTestWindow()
+            .getFirstMessage()
+            .assertInfo(/Updated instance: test-instance/)
+
+        const expectedArgs = {
+            DBInstanceIdentifier: instanceName,
+            NewDBInstanceIdentifier: newInstanceName,
+            ApplyImmediately: true,
+        }
+
+        assert(stub.calledOnceWithExactly(expectedArgs))
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', node)
+
+        assertTelemetry('docdb_renameInstance', {
+            result: 'Succeeded',
+        })
+    })
+
+    it('does nothing when prompt is cancelled', async function () {
+        // arrange
+        const stub = sinon.stub()
+        docdb.modifyInstance = stub
+        getTestWindow().onDidShowInputBox((input) => input.hide())
+
+        // act
+        await assert.rejects(renameInstance(node))
+
+        // assert
+        assert(stub.notCalled)
+
+        assertTelemetry('docdb_renameInstance', {
+            result: 'Cancelled',
+        })
+    })
+
+    it('shows a warning when the instance is not available', async function () {
+        // arrange
+        instance.DBInstanceStatus = 'stopped'
+        const stub = sinon.stub()
+        docdb.modifyInstance = stub
+        setupWizard()
+
+        // act
+        await assert.rejects(renameInstance(node))
+
+        // assert
+        getTestWindow()
+            .getFirstMessage()
+            .assertMessage(/Instance must be running/)
+
+        assertTelemetry('docdb_renameInstance', {
+            result: 'Cancelled',
+        })
+    })
+
+    it('shows an error when instance creation fails', async function () {
+        // arrange
+        const stub = sinon.stub().rejects()
+        docdb.modifyInstance = stub
+        setupWizard()
+
+        // act
+        await assert.rejects(renameInstance(node))
+
+        // assert
+        getTestWindow()
+            .getFirstMessage()
+            .assertError(/Failed to rename instance: test-instance/)
+
+        assertTelemetry('docdb_renameInstance', {
+            result: 'Failed',
+        })
+    })
+})
diff --git a/packages/core/src/test/docdb/commands/tagCommands.test.ts b/packages/core/src/test/docdb/commands/tagCommands.test.ts
new file mode 100644
index 00000000000..de3c12bb77d
--- /dev/null
+++ b/packages/core/src/test/docdb/commands/tagCommands.test.ts
@@ -0,0 +1,166 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import { assertTelemetry } from '../../testUtil'
+import { getTestWindow } from '../../shared/vscode/window'
+import { DocumentDBClient, DBInstance } from '../../../shared/clients/docdbClient'
+import { DBClusterNode } from '../../../docdb/explorer/dbClusterNode'
+import { DBInstanceNode } from '../../../docdb/explorer/dbInstanceNode'
+import { DocumentDBNode } from '../../../docdb/explorer/docdbNode'
+import { addTag, listTags, removeTag } from '../../../docdb/commands/tagCommands'
+
+describe('Tags', function () {
+    const instanceName = 'test-instance'
+    let docdb: DocumentDBClient
+    let instance: DBInstance
+    let node: DBInstanceNode
+    let sandbox: sinon.SinonSandbox
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+
+        docdb = { regionCode: 'us-east-1' } as DocumentDBClient
+        const clusterName = 'docdb-1234'
+        const cluster = { DBClusterIdentifier: clusterName, Status: 'available' }
+        const parentNode = new DBClusterNode(new DocumentDBNode(docdb), cluster, docdb)
+        instance = {
+            DBInstanceIdentifier: instanceName,
+            DBInstanceArn: 'arn:' + instanceName,
+            DBClusterIdentifier: clusterName,
+        }
+        node = new DBInstanceNode(parentNode, instance)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+        getTestWindow().dispose()
+    })
+
+    describe('listTagsCommand', function () {
+        it('displays a list of resource tags', async function () {
+            // arrange
+            const stub = sinon.stub().resolves({})
+            docdb.listResourceTags = stub
+            getTestWindow().onDidShowMessage((message) => {
+                assert.equal(message.message, 'Tags for test-instance:')
+                message.close()
+            })
+
+            // act
+            await listTags(node)
+
+            // assert
+            assert(stub.calledOnceWithExactly(node.arn))
+            assertTelemetry('docdb_listTags', { result: 'Succeeded' })
+        })
+
+        it('shows an error when api returns failure', async function () {
+            // arrange
+            const stub = sinon.stub().rejects()
+            docdb.listResourceTags = stub
+
+            // act
+            await assert.rejects(listTags(node))
+
+            // assert
+            assertTelemetry('docdb_listTags', { result: 'Failed' })
+        })
+    })
+
+    describe('addTagCommand', function () {
+        it('prompts for a new tag key/value and adds the tag', async function () {
+            // arrange
+            const stub = sinon.stub().resolves()
+            docdb.addResourceTags = stub
+            getTestWindow().onDidShowInputBox((input) => input.acceptValue('test-value'))
+
+            // act
+            await addTag(node)
+
+            // assert
+            assert(stub.calledOnce)
+            getTestWindow().getFirstMessage().assertInfo('Tag added')
+            assertTelemetry('docdb_addTag', { result: 'Succeeded' })
+        })
+
+        it('does nothing when prompt is cancelled', async function () {
+            // arrange
+            const stub = sinon.stub().resolves()
+            docdb.addResourceTags = stub
+            getTestWindow().onDidShowInputBox((input) => input.hide())
+
+            // act
+            await assert.rejects(addTag(node))
+
+            // assert
+            assert(stub.notCalled)
+            assertTelemetry('docdb_addTag', { result: 'Cancelled' })
+        })
+
+        it('shows an error when api returns failure', async function () {
+            // arrange
+            const stub = sinon.stub().rejects()
+            docdb.addResourceTags = stub
+            getTestWindow().onDidShowInputBox((input) => input.acceptValue('test-value'))
+
+            // act
+            await assert.rejects(addTag(node))
+
+            // assert
+            assertTelemetry('docdb_addTag', { result: 'Failed' })
+        })
+    })
+
+    describe('removeTagCommand', function () {
+        it('prompts with a list of tags and removes the selected tag', async function () {
+            // arrange
+            const tag = { ['test-key']: 'test-value ' }
+            docdb.listResourceTags = sinon.stub().resolves(tag)
+            const stub = sinon.stub().resolves()
+            docdb.removeResourceTags = stub
+            getTestWindow().onDidShowQuickPick((picker) => picker.acceptItem(picker.items[0]))
+
+            // act
+            await removeTag(node)
+
+            // assert
+            assert(stub.calledOnce)
+            getTestWindow().getFirstMessage().assertInfo('Tag removed')
+            assertTelemetry('docdb_removeTag', { result: 'Succeeded' })
+        })
+
+        it('does nothing when prompt is cancelled', async function () {
+            // arrange
+            const tag = { ['test-key']: 'test-value ' }
+            docdb.listResourceTags = sinon.stub().resolves(tag)
+            const stub = sinon.stub().resolves()
+            docdb.removeResourceTags = stub
+            getTestWindow().onDidShowQuickPick((picker) => picker.hide())
+
+            // act
+            await assert.rejects(removeTag(node))
+
+            // assert
+            assert(stub.notCalled)
+            assertTelemetry('docdb_removeTag', { result: 'Cancelled' })
+        })
+
+        it('shows an error when api returns failure', async function () {
+            // arrange
+            const stub = sinon.stub().rejects()
+            docdb.listResourceTags = stub
+            docdb.removeResourceTags = stub
+            getTestWindow().onDidShowQuickPick((picker) => picker.acceptItem(picker.items[0]))
+
+            // act
+            await assert.rejects(removeTag(node))
+
+            // assert
+            assertTelemetry('docdb_removeTag', { result: 'Failed' })
+        })
+    })
+})
diff --git a/packages/core/src/test/docdb/explorer/dbClusterNode.test.ts b/packages/core/src/test/docdb/explorer/dbClusterNode.test.ts
new file mode 100644
index 00000000000..0fdd5be3f19
--- /dev/null
+++ b/packages/core/src/test/docdb/explorer/dbClusterNode.test.ts
@@ -0,0 +1,129 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { DBCluster } from '@aws-sdk/client-docdb'
+import { DBClusterNode } from '../../../docdb/explorer/dbClusterNode'
+import { DBInstanceNode } from '../../../docdb/explorer/dbInstanceNode'
+import { DBInstance, DocumentDBClient } from '../../../shared/clients/docdbClient'
+
+describe('DBClusterNode', function () {
+    let mockClient: DocumentDBClient
+    let parentNode: AWSTreeNodeBase
+
+    beforeEach(() => {
+        parentNode = {
+            refresh: sinon.stub(),
+        } as unknown as AWSTreeNodeBase
+
+        mockClient = {
+            listClusters: sinon.stub().resolves([{ DBClusterIdentifier: 'Cluster-1', Status: 'available' }]),
+            listInstances: sinon.stub().resolves([]),
+        } as Partial<DocumentDBClient> as DocumentDBClient
+
+        DBClusterNode['globalPollingArns'].clear()
+    })
+
+    afterEach(() => {
+        DBClusterNode['globalPollingArns'].clear()
+    })
+
+    const cluster: DBCluster = { DBClusterIdentifier: 'Cluster-1' }
+    const instanceA: DBInstance = { DBInstanceIdentifier: 'Instance-A' }
+    const instanceB: DBInstance = { DBInstanceIdentifier: 'Instance-B' }
+
+    function assertInstanceNode(node: AWSTreeNodeBase, expectedInstance: DBInstance): void {
+        assert.ok(node instanceof DBInstanceNode, `Node ${node} should be an Instance Node`)
+        assert.deepStrictEqual((node as DBInstanceNode).instance, expectedInstance)
+    }
+
+    it('gets children', async function () {
+        ;(mockClient.listInstances as sinon.SinonStub).resolves([instanceA, instanceB])
+        const node = new DBClusterNode(parentNode, cluster, mockClient)
+        const [firstInstanceNode, secondInstanceNode, ...otherNodes] = await node.getChildren()
+
+        assertInstanceNode(firstInstanceNode, instanceA)
+        assertInstanceNode(secondInstanceNode, instanceB)
+        assert.strictEqual(otherNodes.length, 0)
+    })
+
+    it('returns false for available status', function () {
+        const clusterStatus = { ...cluster, Status: 'available' }
+        const node = new DBClusterNode(parentNode, clusterStatus, mockClient)
+        const requiresPolling = node.isStatusRequiringPolling()
+
+        assert.strictEqual(requiresPolling, false, 'isStatusRequiringPolling should return false for available status')
+    })
+
+    it('returns true for creating status', function () {
+        const clusterStatus = { ...cluster, Status: 'creating' }
+        const node = new DBClusterNode(parentNode, clusterStatus, mockClient)
+        const requiresPolling = node.isStatusRequiringPolling()
+
+        assert.strictEqual(requiresPolling, true, 'isStatusRequiringPolling should return true for creating status')
+    })
+
+    it('starts tracking changes when status requires polling', function () {
+        const clusterStatus = { ...cluster, Status: 'creating' }
+        const trackChangesSpy = sinon.spy(DBClusterNode.prototype, 'trackChanges')
+        const node = new DBClusterNode(parentNode, clusterStatus, mockClient)
+        const requiresPolling = node.isStatusRequiringPolling()
+
+        assert.strictEqual(requiresPolling, true, 'isStatusRequiringPolling should return true for creating status')
+        assert.ok(trackChangesSpy.calledOnce, 'trackChanges should be called when polling is required')
+        assert.strictEqual(node.isPolling, true, 'Node should be in polling state')
+
+        trackChangesSpy.restore()
+    })
+
+    function assertNodeDoesNotPoll(clusterStatus: any, message: string) {
+        const trackChangesSpy = sinon.spy(DBClusterNode.prototype, 'trackChanges')
+        const node = new DBClusterNode(parentNode, clusterStatus, mockClient)
+        const requiresPolling = node.isStatusRequiringPolling()
+
+        assert.strictEqual(
+            requiresPolling,
+            false,
+            `${message}: isStatusRequiringPolling should return false for available status`
+        )
+        assert.ok(
+            trackChangesSpy.notCalled,
+            `${message}: trackChanges should not be called when polling is not required`
+        )
+        assert.strictEqual(node.isPolling, false, `${message}: Node should not be in polling state`)
+
+        trackChangesSpy.restore()
+    }
+
+    it('does not start tracking changes when status does not require polling', function () {
+        const clusterStatus = { ...cluster, Status: 'available' }
+        assertNodeDoesNotPoll(clusterStatus, 'does not start tracking changes')
+    })
+
+    it('does not poll when status is available', function () {
+        const clusterStatus = { ...cluster, Status: 'available' }
+        assertNodeDoesNotPoll(clusterStatus, 'does not poll')
+    })
+
+    it('has isPolling set to false and getStatus returns available when status is available', async function () {
+        const clusterStatus = { DBClusterIdentifier: 'Cluster-1', Status: 'available' }
+        ;(mockClient.listClusters as sinon.SinonStub).resolves([clusterStatus])
+
+        const node = new DBClusterNode(parentNode, clusterStatus, mockClient)
+
+        assert.strictEqual(node.isPolling, false, 'Node should not be in polling state')
+        assert.strictEqual(node.status, 'available', 'getStatus should return available for the node')
+    })
+
+    it('handles missing clusters gracefully in getStatus', async function () {
+        ;(mockClient.listClusters as sinon.SinonStub).resolves([])
+        const node = new DBClusterNode(parentNode, cluster, mockClient)
+
+        const status = await node.getStatus()
+        assert.strictEqual(status, undefined, 'getStatus should return undefined when no cluster is found')
+    })
+})
diff --git a/packages/core/src/test/docdb/explorer/docdbNode.test.ts b/packages/core/src/test/docdb/explorer/docdbNode.test.ts
new file mode 100644
index 00000000000..0ff929f51fc
--- /dev/null
+++ b/packages/core/src/test/docdb/explorer/docdbNode.test.ts
@@ -0,0 +1,48 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import sinon from 'sinon'
+import assert from 'assert'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { DocumentDBClient } from '../../../shared/clients/docdbClient'
+import { DBCluster } from '@aws-sdk/client-docdb'
+import { DBClusterNode } from '../../../docdb/explorer/dbClusterNode'
+import { DocumentDBNode } from '../../../docdb/explorer/docdbNode'
+import { DBElasticClusterNode } from '../../../docdb/explorer/dbElasticClusterNode'
+
+describe('DocumentDBNode', function () {
+    const firstCluster: DBCluster = { DBClusterIdentifier: 'Cluster-1' }
+    const secondCluster: DBCluster = { DBClusterIdentifier: 'Cluster-2' }
+    const thirdCluster = { clusterName: 'Cluster-3', clusterArn: '', status: 'ACTIVE' }
+
+    let client: DocumentDBClient
+
+    function assertClusterNode(node: AWSTreeNodeBase, expectedCluster: DBCluster): void {
+        assert.ok(node instanceof DBClusterNode, `Node ${node} should be a Cluster Node`)
+        assert.deepStrictEqual((node as DBClusterNode).cluster, expectedCluster)
+    }
+
+    beforeEach(function () {
+        client = {} as any as DocumentDBClient
+    })
+
+    it('gets children', async function () {
+        client.listClusters = sinon.stub().resolves([firstCluster, secondCluster])
+        client.listElasticClusters = sinon.stub().resolves([thirdCluster])
+        client.listGlobalClusters = sinon.stub().resolves([])
+
+        const node = new DocumentDBNode(client)
+        const [firstClusterNode, secondClusterNode, thirdClusterNode, ...otherNodes] = await node.getChildren()
+
+        assertClusterNode(firstClusterNode, firstCluster)
+        assertClusterNode(secondClusterNode, secondCluster)
+        assert.ok(
+            thirdClusterNode instanceof DBElasticClusterNode,
+            `Node ${thirdClusterNode} should be an Elastic Cluster Node`
+        )
+        assert.deepStrictEqual((thirdClusterNode as DBElasticClusterNode).cluster, thirdCluster)
+        assert.strictEqual(otherNodes.length, 0)
+    })
+})
diff --git a/packages/core/src/test/docdb/utils.test.ts b/packages/core/src/test/docdb/utils.test.ts
new file mode 100644
index 00000000000..3a81d3a401c
--- /dev/null
+++ b/packages/core/src/test/docdb/utils.test.ts
@@ -0,0 +1,83 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { validateClusterName, validateInstanceName, validatePassword, validateUsername } from '../../docdb/utils'
+
+describe('validateClusterName', function () {
+    it('validates', function () {
+        assert.strictEqual(validateClusterName(''), 'Cluster name must be between 1 and 63 characters long')
+        assert.strictEqual(validateClusterName('c'.repeat(64)), 'Cluster name must be between 1 and 63 characters long')
+        assert.strictEqual(validateClusterName('404'), 'Cluster name must start with a lowercase letter')
+        assert.strictEqual(
+            validateClusterName('abcDEF'),
+            'Cluster name must only contain lowercase letters, numbers, and hyphens'
+        )
+        assert.strictEqual(
+            validateClusterName('abc-'),
+            'Cluster name cannot end with a hyphen or contain 2 consecutive hyphens'
+        )
+        assert.strictEqual(
+            validateClusterName('a--b'),
+            'Cluster name cannot end with a hyphen or contain 2 consecutive hyphens'
+        )
+        assert.strictEqual(validateClusterName('a-2'), undefined)
+    })
+})
+
+describe('validateUsername', function () {
+    it('validates', function () {
+        assert.strictEqual(validateUsername(''), 'Username name must be between 1 and 63 characters long')
+        assert.strictEqual(validateUsername('x'.repeat(64)), 'Username name must be between 1 and 63 characters long')
+        assert.strictEqual(validateUsername('123'), 'Username must start with a letter')
+        assert.strictEqual(validateUsername('a2Z'), undefined)
+    })
+})
+
+describe('validatePassword', function () {
+    it('validates', function () {
+        assert.strictEqual(validatePassword('passw0rd |~'), undefined)
+        assert.strictEqual(validatePassword('1234567'), 'Password must be between 8 and 100 characters long')
+        assert.strictEqual(validatePassword('x'.repeat(101)), 'Password must be between 8 and 100 characters long')
+
+        for (const item of ['pass/word', 'p@ssword', '"password"']) {
+            assert.strictEqual(
+                validatePassword(item),
+                'Password must only contain printable ASCII characters (except for slash, double quotes and @ symbol)'
+            )
+        }
+
+        for (const item of ['password\x19', 'password\u{fe0f}']) {
+            assert.strictEqual(
+                validatePassword(item),
+                'Password must only contain printable ASCII characters (except for slash, double quotes and @ symbol)'
+            )
+        }
+    })
+})
+
+describe('validateInstanceName', function () {
+    it('validates', function () {
+        assert.strictEqual(validateInstanceName(''), 'Instance name must be between 1 and 63 characters long')
+        assert.strictEqual(
+            validateInstanceName('c'.repeat(64)),
+            'Instance name must be between 1 and 63 characters long'
+        )
+        assert.strictEqual(validateInstanceName('404'), 'Instance name must start with a lowercase letter')
+        assert.strictEqual(
+            validateInstanceName('abcDEF'),
+            'Instance name must only contain lowercase letters, numbers, and hyphens'
+        )
+        assert.strictEqual(
+            validateInstanceName('abc-'),
+            'Instance name cannot end with a hyphen or contain 2 consecutive hyphens'
+        )
+        assert.strictEqual(
+            validateInstanceName('a--b'),
+            'Instance name cannot end with a hyphen or contain 2 consecutive hyphens'
+        )
+        assert.strictEqual(validateInstanceName('a-2'), undefined)
+    })
+})
diff --git a/packages/core/src/test/docdb/wizards/createClusterWizard.test.ts b/packages/core/src/test/docdb/wizards/createClusterWizard.test.ts
new file mode 100644
index 00000000000..9824ed1c524
--- /dev/null
+++ b/packages/core/src/test/docdb/wizards/createClusterWizard.test.ts
@@ -0,0 +1,32 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { createWizardTester, WizardTester } from '../../shared/wizards/wizardTestUtils'
+import { CreateClusterState, CreateClusterWizard } from '../../../docdb/wizards/createClusterWizard'
+
+describe('CreateClusterWizard', function () {
+    let tester: WizardTester<CreateClusterState>
+
+    beforeEach(async function () {
+        const wizard = new CreateClusterWizard({} as any)
+        tester = await createWizardTester(wizard)
+    })
+
+    it('prompts for cluster type first', function () {
+        tester.ClusterType.assertShowFirst()
+    })
+
+    it('prompts for regional cluster when selected', function () {
+        tester.ClusterType.applyInput('regional')
+        tester.RegionalCluster.assertShowAny()
+        tester.ElasticCluster.assertDoesNotShowAny()
+    })
+
+    it('prompts for elastic cluster when selected', function () {
+        tester.ClusterType.applyInput('elastic')
+        tester.RegionalCluster.assertDoesNotShowAny()
+        tester.ElasticCluster.assertShowAny()
+    })
+})
diff --git a/packages/core/src/test/docdb/wizards/createGlobalClusterWizard.test.ts b/packages/core/src/test/docdb/wizards/createGlobalClusterWizard.test.ts
new file mode 100644
index 00000000000..5ca5358fcb8
--- /dev/null
+++ b/packages/core/src/test/docdb/wizards/createGlobalClusterWizard.test.ts
@@ -0,0 +1,23 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { createWizardTester, WizardTester } from '../../shared/wizards/wizardTestUtils'
+import { CreateGlobalClusterState, CreateGlobalClusterWizard } from '../../../docdb/wizards/createGlobalClusterWizard'
+
+describe('CreateGlobalClusterWizard', function () {
+    let tester: WizardTester<CreateGlobalClusterState>
+
+    beforeEach(async function () {
+        const engineVersion = '5.0.0'
+        const wizard = new CreateGlobalClusterWizard('region', engineVersion, {} as any)
+        tester = await createWizardTester(wizard)
+    })
+
+    it('prompts for secondary region and global cluster name', function () {
+        tester.RegionCode.assertShowFirst()
+        tester.GlobalClusterName.assertShowSecond()
+        tester.Cluster.assertShowAny()
+    })
+})
diff --git a/packages/core/src/test/docdb/wizards/elasticClusterWizard.test.ts b/packages/core/src/test/docdb/wizards/elasticClusterWizard.test.ts
new file mode 100644
index 00000000000..9bb54bf833c
--- /dev/null
+++ b/packages/core/src/test/docdb/wizards/elasticClusterWizard.test.ts
@@ -0,0 +1,26 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { createWizardTester, WizardTester } from '../../shared/wizards/wizardTestUtils'
+import { ElasticClusterConfiguration, ElasticClusterWizard } from '../../../docdb/wizards/elasticClusterWizard'
+
+describe('ElasticClusterWizard', function () {
+    let tester: WizardTester<ElasticClusterConfiguration>
+
+    beforeEach(async function () {
+        const wizard = new ElasticClusterWizard({} as any, 'title')
+        tester = await createWizardTester(wizard)
+    })
+
+    it('prompts for properties in the correct order', function () {
+        tester.clusterName.assertShow(1)
+        tester.adminUserName.assertShow(2)
+        tester.adminUserPassword.assertShow(3)
+        tester.shardCount.assertShow(4)
+        tester.shardInstanceCount.assertShow(5)
+        tester.shardCapacity.assertShow(6)
+        tester.authType.assertDoesNotShow()
+    })
+})
diff --git a/packages/core/src/test/docdb/wizards/regionalClusterWizard.test.ts b/packages/core/src/test/docdb/wizards/regionalClusterWizard.test.ts
new file mode 100644
index 00000000000..576eeeaa02d
--- /dev/null
+++ b/packages/core/src/test/docdb/wizards/regionalClusterWizard.test.ts
@@ -0,0 +1,27 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { createWizardTester, WizardTester } from '../../shared/wizards/wizardTestUtils'
+import { RegionalClusterConfiguration, RegionalClusterWizard } from '../../../docdb/wizards/regionalClusterWizard'
+
+describe('RegionalClusterWizard', function () {
+    let tester: WizardTester<RegionalClusterConfiguration>
+
+    beforeEach(async function () {
+        const wizard = new RegionalClusterWizard({} as any, 'title')
+        tester = await createWizardTester(wizard)
+    })
+
+    it('prompts for properties in the correct order', function () {
+        tester.DBClusterIdentifier.assertShow(1)
+        tester.Engine.assertDoesNotShow()
+        tester.EngineVersion.assertShow(2)
+        tester.MasterUsername.assertShow(3)
+        tester.MasterUserPassword.assertShow(4)
+        tester.StorageEncrypted.assertShow(5)
+        tester.DBInstanceCount.assertShow(6)
+        tester.DBInstanceClass.assertShow(7)
+    })
+})
diff --git a/src/test/dynamicResources/awsResourceManager.test.ts b/packages/core/src/test/dynamicResources/awsResourceManager.test.ts
similarity index 79%
rename from src/test/dynamicResources/awsResourceManager.test.ts
rename to packages/core/src/test/dynamicResources/awsResourceManager.test.ts
index 2c3c97ed32d..b2e52d7dd43 100644
--- a/src/test/dynamicResources/awsResourceManager.test.ts
+++ b/packages/core/src/test/dynamicResources/awsResourceManager.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as testutil from '../testUtil'
 import * as sinon from 'sinon'
 import * as path from 'path'
@@ -12,26 +12,27 @@ import { ResourcesNode } from '../../dynamicResources/explorer/nodes/resourcesNo
 import { ResourceNode } from '../../dynamicResources/explorer/nodes/resourceNode'
 import { ResourceTypeNode } from '../../dynamicResources/explorer/nodes/resourceTypeNode'
 import { formatResourceModel, AwsResourceManager } from '../../dynamicResources/awsResourceManager'
-import { CloudControlClient } from '../../shared/clients/cloudControlClient'
-import { CloudFormationClient } from '../../shared/clients/cloudFormationClient'
+import { CloudControlClient } from '../../shared/clients/cloudControl'
+import { CloudFormationClient } from '../../shared/clients/cloudFormation'
 import { makeTemporaryToolkitFolder, readFileAsString } from '../../shared/filesystemUtilities'
-import { anything, capture, deepEqual, instance, mock, verify, when } from '../utilities/mockito'
 import { FakeExtensionContext } from '../fakeExtensionContext'
-import { SchemaService } from '../../shared/schemas'
-import { remove } from 'fs-extra'
-import { existsSync } from 'fs'
+import { existsSync } from 'fs' // eslint-disable-line no-restricted-imports
 import { ResourceTypeMetadata } from '../../dynamicResources/model/resources'
 import globals from '../../shared/extensionGlobals'
+import { Stub, stub } from '../utilities/stubber'
+import * as CloudControl from '@aws-sdk/client-cloudcontrol'
+import { fs } from '../../shared'
+import { DescribeTypeOutput } from '@aws-sdk/client-cloudformation'
 
 describe('ResourceManager', function () {
     let sandbox: sinon.SinonSandbox
-    let cloudFormation: CloudFormationClient
-    let cloudControl: CloudControlClient
+    let cloudFormation: Stub<CloudFormationClient>
+    let cloudControl: Stub<CloudControlClient>
     let resourceNode: ResourceNode
     let resourceTypeNode: ResourceTypeNode
     let resourceManager: AwsResourceManager
-    let schemaService: SchemaService
     let tempFolder: string
+    let registerMappingSpy: sinon.SinonSpy
 
     const fakeTypeName = 'sometype'
     const fakeIdentifier = 'someidentifier'
@@ -48,31 +49,30 @@ describe('ResourceManager', function () {
     }
 
     beforeEach(async function () {
-        cloudControl = mock()
-        cloudFormation = mock()
-        schemaService = mock()
+        cloudControl = stub(CloudControlClient, {
+            regionCode: '',
+        })
+        cloudFormation = stub(CloudFormationClient, {
+            regionCode: '',
+        })
         sandbox = sinon.createSandbox()
         mockClients()
         tempFolder = await makeTemporaryToolkitFolder()
 
-        const rootNode = new ResourcesNode(fakeRegion, instance(cloudFormation), cloudControl)
-        resourceTypeNode = new ResourceTypeNode(
-            rootNode,
-            fakeTypeName,
-            instance(cloudControl),
-            {} as ResourceTypeMetadata
-        )
+        const rootNode = new ResourcesNode(fakeRegion, cloudFormation, cloudControl)
+        resourceTypeNode = new ResourceTypeNode(rootNode, fakeTypeName, cloudControl, {} as ResourceTypeMetadata)
         resourceNode = new ResourceNode(resourceTypeNode, fakeIdentifier)
         const fakeContext = await FakeExtensionContext.create()
         fakeContext.globalStorageUri = vscode.Uri.file(tempFolder)
         resourceManager = new AwsResourceManager(fakeContext)
-        globals.schemaService = instance(schemaService)
+        registerMappingSpy = sinon.spy(globals.schemaService, 'registerMapping')
     })
 
     afterEach(async function () {
+        registerMappingSpy.restore()
         sandbox.restore()
         await resourceManager.dispose()
-        await remove(tempFolder)
+        await fs.delete(tempFolder, { recursive: true })
     })
 
     it('opens resources in preview mode', async function () {
@@ -185,10 +185,9 @@ describe('ResourceManager', function () {
 
     it('registers schema mappings when opening in edit', async function () {
         const editor = await resourceManager.open(resourceNode, false)
-        verify(schemaService.registerMapping(anything(), anything())).once()
+        assert(registerMappingSpy.calledOnce)
 
-        // eslint-disable-next-line @typescript-eslint/unbound-method
-        const [mapping] = capture(schemaService.registerMapping).last()
+        const [mapping] = registerMappingSpy.args[registerMappingSpy.args.length - 1]
 
         const expectedSchemaLocation = path.join(tempFolder, 'sometype.schema.json')
         assert.ok(existsSync(expectedSchemaLocation))
@@ -205,40 +204,43 @@ describe('ResourceManager', function () {
         sandbox.stub(vscode.window, 'showTextDocument').resolves(mockTextEditor)
 
         await resourceManager.open(resourceNode, true)
-        verify(schemaService.registerMapping(anything())).never()
-        verify(cloudFormation.describeType(anything())).never()
+        assert(registerMappingSpy.notCalled)
+        assert(cloudFormation.describeType.notCalled)
     })
 
     it('deletes resource mapping on file close', async function () {
         const editor = await resourceManager.open(resourceNode, false)
         await resourceManager.close(editor.document.uri)
-        verify(schemaService.registerMapping(anything())).once()
-        verify(schemaService.registerMapping(anything(), anything())).once()
+        assert(registerMappingSpy.firstCall.calledWith(sinon.match.any, true))
+        assert(registerMappingSpy.secondCall.calledWith(sinon.match.any))
+
+        const [mapping] = registerMappingSpy.args[registerMappingSpy.args.length - 1]
 
-        // eslint-disable-next-line @typescript-eslint/unbound-method
-        const [mapping] = capture(schemaService.registerMapping).last()
         assert.strictEqual(mapping.type, 'json')
         testutil.assertEqualPaths(mapping.uri.fsPath, editor.document.uri.fsPath)
         assert.strictEqual(mapping.schema, undefined)
     })
 
     function mockClients(): void {
-        when(
-            cloudControl.getResource(
-                deepEqual({
-                    TypeName: fakeTypeName,
-                    Identifier: fakeIdentifier,
-                })
-            )
-        ).thenResolve({
-            TypeName: 'foo',
-            ResourceDescription: {
-                Identifier: 'bar',
-                Properties: JSON.stringify(fakeResourceDescription),
-            },
+        cloudControl.getResource.callsFake(async (request: CloudControl.GetResourceInput) => {
+            assert.deepStrictEqual(request, {
+                TypeName: fakeTypeName,
+                Identifier: fakeIdentifier,
+            })
+
+            return {
+                TypeName: 'foo',
+                ResourceDescription: {
+                    Identifier: 'bar',
+                    Properties: JSON.stringify(fakeResourceDescription),
+                },
+            }
         })
-        when(cloudFormation.describeType(fakeTypeName)).thenResolve({
-            Schema: '{}',
+        cloudFormation.describeType.callsFake(async (name: string) => {
+            if (name === fakeTypeName) {
+                return { Schema: '{}' } as any as DescribeTypeOutput
+            }
+            throw new Error()
         })
     }
 })
diff --git a/packages/core/src/test/dynamicResources/commands/configure.test.ts b/packages/core/src/test/dynamicResources/commands/configure.test.ts
new file mode 100644
index 00000000000..aa5c8f2fd5c
--- /dev/null
+++ b/packages/core/src/test/dynamicResources/commands/configure.test.ts
@@ -0,0 +1,29 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import { configureResources, ResourcesSettings } from '../../../dynamicResources/commands/configure'
+import { memoizedGetResourceTypes } from '../../../dynamicResources/model/resources'
+import { Settings } from '../../../shared/settings'
+import { getTestWindow } from '../../shared/vscode/window'
+
+describe('configureCommand', function () {
+    let settings: ResourcesSettings
+
+    beforeEach(async function () {
+        const workspaceSettings = new Settings(vscode.ConfigurationTarget.Workspace)
+        settings = new ResourcesSettings(workspaceSettings)
+        await settings.reset()
+    })
+
+    it('maps selected services to configuration', async function () {
+        const testItems = Array.from(memoizedGetResourceTypes().keys())
+        getTestWindow().onDidShowQuickPick((picker) => picker.acceptItems(...testItems))
+        await configureResources(settings)
+
+        assert.deepStrictEqual(settings.get('enabledResources'), testItems)
+    })
+})
diff --git a/packages/core/src/test/dynamicResources/commands/copyIdentifier.test.ts b/packages/core/src/test/dynamicResources/commands/copyIdentifier.test.ts
new file mode 100644
index 00000000000..6105adbc5cc
--- /dev/null
+++ b/packages/core/src/test/dynamicResources/commands/copyIdentifier.test.ts
@@ -0,0 +1,27 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { copyIdentifier } from '../../../dynamicResources/commands/copyIdentifier'
+import { assertNoErrorMessages } from '../../shared/vscode/window'
+import { FakeClipboard } from '../../shared/vscode/fakeEnv'
+
+describe('copyIdentifierCommand', function () {
+    beforeEach(function () {
+        const fakeClipboard = new FakeClipboard()
+        sinon.stub(vscode.env, 'clipboard').value(fakeClipboard)
+    })
+
+    it('copies identifier to clipboard and shows status bar confirmation', async function () {
+        const fakeIdentifier = 'resource1'
+
+        await copyIdentifier('fakeResourceType', fakeIdentifier)
+
+        assert.strictEqual(await vscode.env.clipboard.readText(), fakeIdentifier)
+        assertNoErrorMessages()
+    })
+})
diff --git a/packages/core/src/test/dynamicResources/commands/deleteResource.test.ts b/packages/core/src/test/dynamicResources/commands/deleteResource.test.ts
new file mode 100644
index 00000000000..099bf4acda9
--- /dev/null
+++ b/packages/core/src/test/dynamicResources/commands/deleteResource.test.ts
@@ -0,0 +1,85 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+import assert from 'assert'
+import { deleteResource } from '../../../dynamicResources/commands/deleteResource'
+import { CloudControlClient } from '../../../shared/clients/cloudControl'
+import { assertNoErrorMessages, getTestWindow } from '../../shared/vscode/window'
+
+describe('deleteResource', function () {
+    const fakeType = 'fakeType'
+    const fakeIdentifier = 'fakeIdentifier'
+    const cloudControl = new CloudControlClient('')
+    let sandbox: sinon.SinonSandbox
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('confirms deletion, deletes resources, shows progress and confirmation', async function () {
+        getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Delete')?.select())
+        const stub = sandbox
+            .stub(cloudControl, 'deleteResource')
+            .callsFake(async ({ TypeName: typeName, Identifier: identifier }) => {
+                assert.strictEqual(typeName, fakeType)
+                assert.strictEqual(identifier, fakeIdentifier)
+            })
+
+        await deleteResource(cloudControl, fakeType, fakeIdentifier)
+
+        getTestWindow().getFirstMessage().assertWarn(`Delete resource ${fakeIdentifier} (${fakeType})?`)
+
+        assert.strictEqual(stub.calledOnce, true)
+
+        const progressNotification = getTestWindow().getSecondMessage()
+        assert.strictEqual(progressNotification.items.length, 0)
+        assert.deepStrictEqual(progressNotification.progressReports, [
+            { message: `Deleting resource ${fakeIdentifier} (${fakeType})...` },
+        ])
+
+        getTestWindow().getThirdMessage().assertInfo(`Deleted resource ${fakeIdentifier} (${fakeType})`)
+    })
+
+    it('does nothing when deletion is cancelled', async function () {
+        getTestWindow().onDidShowMessage((m) => m.selectItem('Cancel'))
+        const spy = sandbox.spy(cloudControl, 'deleteResource')
+
+        await deleteResource(cloudControl, fakeType, fakeIdentifier)
+
+        assertNoErrorMessages()
+        assert.strictEqual(spy.notCalled, true)
+        assert.deepStrictEqual(getTestWindow().statusBar.messages, [])
+    })
+
+    it('shows an error message when resource deletion fails', async function () {
+        sandbox.stub(cloudControl, 'deleteResource').callsFake(async () => {
+            throw new Error('fake exception')
+        })
+
+        getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Delete')?.select())
+
+        await deleteResource(cloudControl, fakeType, fakeIdentifier)
+        getTestWindow().getThirdMessage().assertError(`Failed to delete resource ${fakeIdentifier} (${fakeType})`)
+    })
+
+    it('shows a warning if unsupported action', async function () {
+        sandbox.stub(cloudControl, 'deleteResource').callsFake(async () => {
+            const error = new Error('fake exception')
+            error.name = 'UnsupportedActionException'
+            throw error
+        })
+        getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Delete')?.select())
+
+        await deleteResource(cloudControl, fakeType, fakeIdentifier)
+        getTestWindow()
+            .getThirdMessage()
+            .assertWarn(new RegExp(`Resource type ${fakeType} does not currently support delete`))
+    })
+})
diff --git a/packages/core/src/test/dynamicResources/commands/openResource.test.ts b/packages/core/src/test/dynamicResources/commands/openResource.test.ts
new file mode 100644
index 00000000000..e3ff3663d02
--- /dev/null
+++ b/packages/core/src/test/dynamicResources/commands/openResource.test.ts
@@ -0,0 +1,159 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import assert from 'assert'
+import { AwsResourceManager, TypeSchema } from '../../../dynamicResources/awsResourceManager'
+import { ResourceNode } from '../../../dynamicResources/explorer/nodes/resourceNode'
+import { ResourceTypeNode } from '../../../dynamicResources/explorer/nodes/resourceTypeNode'
+import { getDiagnostics, openResource } from '../../../dynamicResources/commands/openResource'
+import { getTestWindow } from '../../shared/vscode/window'
+import { Stub, stub } from '../../utilities/stubber'
+import sinon from 'sinon'
+
+describe('openResource', function () {
+    const fakeType = 'fakeType'
+    const fakeIdentifier = 'fakeIdentifier'
+    let mockResourceManager: Stub<AwsResourceManager>
+    let mockDiagnosticCollection: vscode.DiagnosticCollection
+    const fakeResourceNode = new ResourceNode({ typeName: fakeType } as ResourceTypeNode, fakeIdentifier)
+
+    beforeEach(function () {
+        mockResourceManager = stub(AwsResourceManager)
+        mockDiagnosticCollection = {} as any as vscode.DiagnosticCollection
+    })
+
+    it('shows progress', async function () {
+        mockResourceManager.open = sinon.stub()
+        await openResource({
+            source: fakeResourceNode,
+            preview: false,
+            resourceManager: mockResourceManager,
+            diagnostics: mockDiagnosticCollection,
+        })
+        const progress = getTestWindow().getFirstMessage()
+        assert.ok(!progress.cancellable)
+        assert(mockResourceManager.open.calledOnceWithExactly(fakeResourceNode, false))
+        assert.deepStrictEqual(progress.progressReports, [
+            { message: `Opening resource ${fakeIdentifier} (${fakeType})...` },
+        ])
+    })
+
+    it('shows an error message when opening resource fails', async function () {
+        mockResourceManager.open = sinon.stub()
+        mockResourceManager.open.rejects()
+        await openResource({
+            source: fakeResourceNode,
+            preview: false,
+            resourceManager: mockResourceManager,
+            diagnostics: mockDiagnosticCollection,
+        })
+        getTestWindow().getSecondMessage().assertError(`Failed to open resource ${fakeIdentifier} (${fakeType})`)
+    })
+
+    it('handles opening ResourceNodes', async function () {
+        mockResourceManager.open = sinon.stub()
+        await openResource({
+            source: fakeResourceNode,
+            preview: false,
+            resourceManager: mockResourceManager,
+            diagnostics: mockDiagnosticCollection,
+        })
+        assert(mockResourceManager.open.calledOnceWithExactly(fakeResourceNode, false))
+    })
+
+    it('handles opening uris', async function () {
+        const fakeUri = vscode.Uri.parse('foo')
+        mockResourceManager.open = sinon.stub()
+        mockResourceManager.fromUri = sinon.stub()
+        mockResourceManager.fromUri.returns(fakeResourceNode)
+        await openResource({
+            source: fakeUri,
+            preview: false,
+            resourceManager: mockResourceManager,
+            diagnostics: mockDiagnosticCollection,
+        })
+        assert(mockResourceManager.fromUri.calledOnceWithExactly(fakeUri))
+        assert(mockResourceManager.open.calledOnceWithExactly(fakeResourceNode, false))
+    })
+
+    it('can open in preview mode', async function () {
+        mockResourceManager.open = sinon.stub()
+        await openResource({
+            source: fakeResourceNode,
+            preview: true,
+            resourceManager: mockResourceManager,
+            diagnostics: mockDiagnosticCollection,
+        })
+        assert(mockResourceManager.open.calledOnceWithExactly(fakeResourceNode, true))
+    })
+
+    it('generates diagnostics for read-only properties', async function () {
+        const schema = getFakeTypeSchema({ readOnlyProperties: ['fooProperty'] })
+        const fakeDefinition = JSON.stringify({
+            fooProperty: 'foo',
+            barProperty: 'bar',
+        })
+        const document = await vscode.workspace.openTextDocument({
+            content: fakeDefinition,
+        })
+
+        const diagnostics = getDiagnostics(schema, document)
+        assert.strictEqual(diagnostics.length, 1)
+
+        const diagnostic = diagnostics[0]
+        assert.strictEqual(diagnostic.severity, vscode.DiagnosticSeverity.Information)
+        assert.strictEqual(diagnostic.message, '"fooProperty" is a read-only property and cannot be modified')
+    })
+
+    it('generates diagnostics for create-only properties', async function () {
+        const schema = getFakeTypeSchema({ createOnlyProperties: ['barProperty'] })
+        const fakeDefinition = JSON.stringify({
+            fooProperty: 'foo',
+            barProperty: 'bar',
+        })
+        const document = await vscode.workspace.openTextDocument({
+            content: fakeDefinition,
+        })
+
+        const diagnostics = getDiagnostics(schema, document)
+        assert.strictEqual(diagnostics.length, 1)
+
+        const diagnostic = diagnostics[0]
+        assert.strictEqual(diagnostic.severity, vscode.DiagnosticSeverity.Information)
+        assert.strictEqual(
+            diagnostic.message,
+            '"barProperty" is a create-only property and cannot be modified on an existing resource'
+        )
+    })
+
+    it('returns no diagnostics for no matching properties', async function () {
+        const schema = getFakeTypeSchema({ createOnlyProperties: ['bazProperty'] })
+        const fakeDefinition = JSON.stringify({
+            fooProperty: 'foo',
+            barProperty: 'bar',
+        })
+        const document = await vscode.workspace.openTextDocument({
+            content: fakeDefinition,
+        })
+
+        const diagnostics = getDiagnostics(schema, document)
+        assert.strictEqual(diagnostics.length, 0)
+    })
+})
+
+function getFakeTypeSchema(opts: { readOnlyProperties?: string[]; createOnlyProperties?: string[] }): TypeSchema {
+    return {
+        typeName: '',
+        description: '',
+        properties: undefined,
+        definitions: undefined,
+        readOnlyProperties: opts.readOnlyProperties ?? [],
+        createOnlyProperties: opts.createOnlyProperties ?? [],
+        writeOnlyProperties: [],
+        required: [],
+        primaryIdentifier: [],
+    }
+}
diff --git a/packages/core/src/test/dynamicResources/commands/saveResource.test.ts b/packages/core/src/test/dynamicResources/commands/saveResource.test.ts
new file mode 100644
index 00000000000..c57317ac89a
--- /dev/null
+++ b/packages/core/src/test/dynamicResources/commands/saveResource.test.ts
@@ -0,0 +1,160 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { createResource, updateResource } from '../../../dynamicResources/commands/saveResource'
+import { AddOperation } from 'fast-json-patch'
+import { CloudControlClient } from '../../../shared/clients/cloudControl'
+import { getTestWindow } from '../../shared/vscode/window'
+import sinon from 'sinon'
+
+describe('createResource', function () {
+    const fakeType = 'fakeType'
+    const fakeDefinition = '{}'
+
+    let mockCloudControl: CloudControlClient
+
+    beforeEach(function () {
+        mockCloudControl = {} as any as CloudControlClient
+    })
+
+    it('creates resources, shows progress and confirmation', async function () {
+        const newIdentifier = 'newIdentifier'
+        const createStub = sinon.stub().resolves({
+            ProgressEvent: {
+                Identifier: newIdentifier,
+            },
+        })
+        mockCloudControl.createResource = createStub
+
+        await createResource(fakeType, fakeDefinition, mockCloudControl)
+
+        assert(
+            createStub.calledOnceWithExactly({
+                TypeName: fakeType,
+                DesiredState: fakeDefinition,
+            })
+        )
+        const progress = getTestWindow().getFirstMessage()
+        assert.ok(!progress.cancellable)
+        assert.deepStrictEqual(progress.progressReports, [{ message: `Creating resource (${fakeType})...` }])
+        getTestWindow().getSecondMessage().assertInfo(`Created resource ${newIdentifier} (${fakeType})`)
+    })
+
+    it('shows an error message when resource creation fails', async function () {
+        const createStub = sinon.stub().rejects()
+        mockCloudControl.createResource = createStub
+
+        try {
+            await createResource(fakeType, fakeDefinition, mockCloudControl)
+        } catch (err) {
+            getTestWindow().getSecondMessage().assertError(`Failed to create resource (${fakeType})`)
+            return
+        }
+        assert.fail('Expected exception, but none was thrown.')
+    })
+
+    it('shows an error message when definition is not valid json', async function () {
+        const createStub = sinon.stub()
+        mockCloudControl.createResource = createStub
+        try {
+            await createResource(fakeType, 'foo', mockCloudControl)
+        } catch (err) {
+            assert(createStub.notCalled)
+            getTestWindow().getSecondMessage().assertError(`Failed to create resource (${fakeType})`)
+            return
+        }
+        assert.fail('Expected exception, but none was thrown.')
+    })
+
+    it('shows a warning if unsupported action', async function () {
+        const error = new Error('fake exception')
+        error.name = 'UnsupportedActionException'
+        const createStub = sinon.stub().rejects(error)
+        mockCloudControl.createResource = createStub
+
+        await createResource(fakeType, fakeDefinition, mockCloudControl)
+        getTestWindow()
+            .getSecondMessage()
+            .assertWarn(new RegExp(`^${fakeType} does not currently support resource creation`))
+    })
+})
+
+describe('updateResource', function () {
+    const fakeType = 'fakeType'
+    const fakeIdentifier = 'fakeIdentifier'
+    const fakeDefinition = '{}'
+    const fakeOperation = { op: 'add', value: 'Foo' } as AddOperation<string>
+    const fakeDiff = [fakeOperation]
+
+    let mockCloudControl: CloudControlClient
+
+    beforeEach(function () {
+        mockCloudControl = {} as any as CloudControlClient
+    })
+
+    it('updates resources, shows progress and confirmation', async function () {
+        const patchJson = JSON.stringify(fakeDiff)
+        const updateStub = sinon.stub()
+        mockCloudControl.updateResource = updateStub
+        const getStub = sinon.stub()
+        mockCloudControl.getResource = getStub
+
+        await updateResource(fakeType, fakeIdentifier, fakeDefinition, mockCloudControl, fakeDiff)
+
+        assert(
+            updateStub.calledOnceWithExactly({
+                TypeName: fakeType,
+                Identifier: fakeIdentifier,
+                PatchDocument: patchJson,
+            })
+        )
+        const progress = getTestWindow().getFirstMessage()
+        assert.ok(!progress.cancellable)
+        assert.deepStrictEqual(progress.progressReports, [
+            { message: `Updating resource ${fakeIdentifier} (${fakeType})...` },
+        ])
+        getTestWindow().getSecondMessage().assertInfo(`Updated resource ${fakeIdentifier} (${fakeType})`)
+    })
+
+    it('shows an error message when resource update fails', async function () {
+        const updateStub = sinon.stub().rejects()
+        mockCloudControl.updateResource = updateStub
+
+        try {
+            await updateResource(fakeType, fakeIdentifier, fakeDefinition, mockCloudControl, fakeDiff)
+        } catch (err) {
+            getTestWindow().getSecondMessage().assertError(`Failed to update resource ${fakeIdentifier} (${fakeType})`)
+            return
+        }
+        assert.fail('Expected exception, but none was thrown.')
+    })
+
+    it('shows a warning message when there is no diff', async function () {
+        const updateStub = sinon.stub()
+        mockCloudControl.updateResource = updateStub
+        const getStub = sinon.stub()
+        mockCloudControl.getResource = getStub
+        await updateResource(fakeType, fakeIdentifier, fakeDefinition, mockCloudControl, [])
+
+        assert(updateStub.notCalled)
+        getTestWindow()
+            .getSecondMessage()
+            .assertWarn(/^Update cancelled/)
+    })
+
+    it('shows a warning if unsupported action', async function () {
+        const error = new Error('fake exception')
+        error.name = 'UnsupportedActionException'
+        const updateStub = sinon.stub().rejects(error)
+        mockCloudControl.updateResource = updateStub
+        const getStub = sinon.stub()
+        mockCloudControl.getResource = getStub
+        await updateResource(fakeType, fakeIdentifier, fakeDefinition, mockCloudControl, fakeDiff)
+        getTestWindow()
+            .getSecondMessage()
+            .assertWarn(new RegExp(`^${fakeType} does not currently support resource updating`))
+    })
+})
diff --git a/src/test/dynamicResources/explorer/moreResourcesNode.test.ts b/packages/core/src/test/dynamicResources/explorer/moreResourcesNode.test.ts
similarity index 78%
rename from src/test/dynamicResources/explorer/moreResourcesNode.test.ts
rename to packages/core/src/test/dynamicResources/explorer/moreResourcesNode.test.ts
index d8cd48fc4be..46850b9577f 100644
--- a/src/test/dynamicResources/explorer/moreResourcesNode.test.ts
+++ b/packages/core/src/test/dynamicResources/explorer/moreResourcesNode.test.ts
@@ -1,20 +1,20 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as vscode from 'vscode'
 import { ResourcesNode } from '../../../dynamicResources/explorer/nodes/resourcesNode'
 import { ResourceTypeNode } from '../../../dynamicResources/explorer/nodes/resourceTypeNode'
-import { CloudFormationClient } from '../../../shared/clients/cloudFormationClient'
+import { CloudFormationClient } from '../../../shared/clients/cloudFormation'
 import { assertNodeListOnlyHasPlaceholderNode } from '../../utilities/explorerNodeAssertions'
-import { asyncGenerator } from '../../utilities/collectionUtils'
-import { mock, instance, when } from 'ts-mockito'
-import { CloudFormation } from 'aws-sdk'
-import { CloudControlClient } from '../../../shared/clients/cloudControlClient'
+import { asyncGenerator } from '../../../shared/utilities/collectionUtils'
+import { CloudControlClient } from '../../../shared/clients/cloudControl'
 import { Settings } from '../../../shared/settings'
 import { ResourcesSettings } from '../../../dynamicResources/commands/configure'
+import sinon from 'sinon'
+import { TypeSummary } from '@aws-sdk/client-cloudformation'
 
 const unsortedText = ['zebra', 'Antelope', 'aardvark', 'elephant']
 const sortedText = ['aardvark', 'Antelope', 'elephant', 'zebra']
@@ -28,8 +28,8 @@ describe('ResourcesNode', function () {
     let resourceTypes: string[]
 
     before(async function () {
-        mockCloudFormation = mock()
-        mockCloudControl = mock()
+        mockCloudFormation = {} as any as CloudFormationClient
+        mockCloudControl = {} as any as CloudControlClient
     })
 
     beforeEach(async function () {
@@ -41,7 +41,7 @@ describe('ResourcesNode', function () {
     beforeEach(async function () {
         resourceTypes = ['type1', 'type2']
         prepareMock(resourceTypes)
-        testNode = new ResourcesNode('FAKE_REGION', instance(mockCloudFormation), instance(mockCloudControl), settings)
+        testNode = new ResourcesNode('FAKE_REGION', mockCloudFormation, mockCloudControl, settings)
 
         await setConfiguration(resourceTypes)
     })
@@ -61,21 +61,21 @@ describe('ResourcesNode', function () {
 
         assert.strictEqual(childNodes.length, resourceTypes.length, 'Unexpected child count')
 
-        childNodes.forEach(node =>
+        for (const node of childNodes) {
             assert.ok(node instanceof ResourceTypeNode, 'Expected child node to be ResourceTypeNode')
-        )
+        }
     })
 
     it('has child nodes with ResourceTypeNode contextValue', async function () {
         const childNodes = await testNode.getChildren()
 
-        childNodes.forEach(node =>
+        for (const node of childNodes) {
             assert.strictEqual(
                 node.contextValue?.endsWith('ResourceTypeNode'),
                 true,
                 'expected the node to have a resourceTypeNode contextValue'
             )
-        )
+        }
     })
 
     it('sorts child nodes', async function () {
@@ -85,7 +85,7 @@ describe('ResourcesNode', function () {
 
         const childNodes = await testNode.getChildren()
 
-        const actualChildOrder = childNodes.map(node => node.label)
+        const actualChildOrder = childNodes.map((node) => node.label)
         assert.deepStrictEqual(actualChildOrder, sortedText, 'Unexpected child sort order')
     })
 
@@ -100,14 +100,15 @@ describe('ResourcesNode', function () {
     }
 
     function prepareMock(resourceTypes: string[]) {
-        when(mockCloudFormation.listTypes()).thenReturn(
-            asyncGenerator<CloudFormation.TypeSummary>(
-                resourceTypes.map<CloudFormation.TypeSummary>(resourceType => {
+        const listStub = sinon.stub().returns(
+            asyncGenerator<TypeSummary>(
+                resourceTypes.map<TypeSummary>((resourceType) => {
                     return {
                         TypeName: resourceType,
                     }
                 })
             )
         )
+        mockCloudFormation.listTypes = listStub
     }
 })
diff --git a/packages/core/src/test/dynamicResources/explorer/resourceNode.test.ts b/packages/core/src/test/dynamicResources/explorer/resourceNode.test.ts
new file mode 100644
index 00000000000..28df557ff20
--- /dev/null
+++ b/packages/core/src/test/dynamicResources/explorer/resourceNode.test.ts
@@ -0,0 +1,41 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { ResourceTypeNode } from '../../../dynamicResources/explorer/nodes/resourceTypeNode'
+import { ResourceNode } from '../../../dynamicResources/explorer/nodes/resourceNode'
+
+const fakeIdentifier = 'someidentifier'
+const fakeArn = 'arn:fooPartion:fooService:fooRegion:1234:fooType/someidentifier'
+const fakeContextValue = 'FooContext'
+
+describe('ResourceNode', function () {
+    it('initializes name and tooltip', async function () {
+        const testNode = new ResourceNode({} as ResourceTypeNode, fakeIdentifier)
+        assert.strictEqual(testNode.label, fakeIdentifier)
+        assert.strictEqual(testNode.tooltip, fakeIdentifier)
+        assert.strictEqual(testNode.identifier, fakeIdentifier)
+    })
+
+    it('parses resource ARN to get friendly name for label', async function () {
+        const testNode = new ResourceNode({} as ResourceTypeNode, fakeArn)
+        assert.strictEqual(testNode.label, 'fooType/someidentifier')
+    })
+
+    it('uses full ARN for tooltip', async function () {
+        const testNode = new ResourceNode({} as ResourceTypeNode, fakeArn)
+        assert.strictEqual(testNode.tooltip, fakeArn)
+    })
+
+    it('uses provided contextValue', async function () {
+        const testNode = new ResourceNode({} as ResourceTypeNode, fakeArn, fakeContextValue)
+        assert.strictEqual(testNode.contextValue, fakeContextValue)
+    })
+
+    it('uses default contextValue if none is provided', async function () {
+        const testNode = new ResourceNode({} as ResourceTypeNode, fakeArn)
+        assert.strictEqual(testNode.contextValue, 'ResourceNode')
+    })
+})
diff --git a/packages/core/src/test/dynamicResources/explorer/resourceTypeNode.test.ts b/packages/core/src/test/dynamicResources/explorer/resourceTypeNode.test.ts
new file mode 100644
index 00000000000..86296885df2
--- /dev/null
+++ b/packages/core/src/test/dynamicResources/explorer/resourceTypeNode.test.ts
@@ -0,0 +1,194 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import assert from 'assert'
+import { ResourcesNode } from '../../../dynamicResources/explorer/nodes/resourcesNode'
+import { ResourceNode } from '../../../dynamicResources/explorer/nodes/resourceNode'
+import { ResourceTypeNode } from '../../../dynamicResources/explorer/nodes/resourceTypeNode'
+import {
+    assertNodeListOnlyHasErrorNode,
+    assertNodeListOnlyHasPlaceholderNode,
+} from '../../utilities/explorerNodeAssertions'
+import { CloudControlClient } from '../../../shared/clients/cloudControl'
+import { ResourceDescription } from '@aws-sdk/client-cloudcontrol'
+import { ResourceTypeMetadata } from '../../../dynamicResources/model/resources'
+import sinon from 'sinon'
+
+const fakeTypeName = 'sometype'
+const unsortedText = ['zebra', 'Antelope', 'aardvark', 'elephant']
+const sortedText = ['aardvark', 'Antelope', 'elephant', 'zebra']
+
+describe('ResourceTypeNode', function () {
+    let testNode: ResourceTypeNode
+
+    let resourceIdentifiers: string[]
+    let cloudControl: CloudControlClient
+
+    beforeEach(function () {
+        cloudControl = {} as any as CloudControlClient
+
+        resourceIdentifiers = ['resource1', 'resource2', 'resource3']
+        mockCloudControlClient(resourceIdentifiers)
+
+        testNode = generateTestNode(cloudControl)
+    })
+
+    it('initializes name and tooltip', async function () {
+        assert.strictEqual(testNode.label, fakeTypeName)
+        assert.strictEqual(testNode.tooltip, fakeTypeName)
+    })
+
+    it('returns placeholder node if no resources are found', async function () {
+        const resourceIdentifiers: string[] = []
+        mockCloudControlClient(resourceIdentifiers)
+
+        testNode = generateTestNode(cloudControl)
+
+        const childNodes = await testNode.getChildren()
+
+        assertNodeListOnlyHasPlaceholderNode(childNodes)
+    })
+
+    it('has ResourceNode child nodes', async function () {
+        const childNodes = await testNode.getChildren()
+
+        assert.strictEqual(childNodes.length, resourceIdentifiers.length, 'Unexpected child count')
+
+        for (const node of childNodes) {
+            assert.ok(node instanceof ResourceNode, 'Expected child node to be ResourceNode')
+        }
+    })
+
+    it('has child nodes with all operations contextValue when unknown operations', async function () {
+        const childNodes = await testNode.getChildren()
+
+        for (const node of childNodes) {
+            assert.strictEqual(
+                node.contextValue,
+                'CreatableDeletableUpdatableResourceNode',
+                'expected the node to have a ResourceNode contextValue'
+            )
+        }
+    })
+
+    it('has child nodes with ResourceNode contextValue including single supported operation', async function () {
+        testNode = generateTestNode(cloudControl, ['CREATE'])
+        const childNodes = await testNode.getChildren()
+
+        for (const node of childNodes) {
+            assert.strictEqual(
+                node.contextValue,
+                'CreatableResourceNode',
+                'expected the node to have a CreatableResourceNode contextValue'
+            )
+        }
+    })
+
+    it('has child nodes with ResourceNode contextValue including multiple supported operations', async function () {
+        testNode = generateTestNode(cloudControl, ['CREATE', 'DELETE'])
+        const childNodes = await testNode.getChildren()
+
+        for (const node of childNodes) {
+            assert.strictEqual(
+                node.contextValue,
+                'CreatableDeletableResourceNode',
+                'expected the node to have a CreatableDeletableResourceNode contextValue'
+            )
+        }
+    })
+
+    it('sorts child nodes', async function () {
+        resourceIdentifiers = unsortedText
+        mockCloudControlClient(resourceIdentifiers)
+
+        testNode = generateTestNode(cloudControl)
+
+        const childNodes = await testNode.getChildren()
+
+        const actualChildOrder = childNodes.map((node) => node.label)
+        assert.deepStrictEqual(actualChildOrder, sortedText, 'Unexpected child sort order')
+    })
+
+    it('has an error node for a child if an error happens during loading', async function () {
+        cloudControl.listResources = sinon.stub().rejects(new Error('foo'))
+        testNode = generateTestNode(cloudControl)
+
+        const childNodes = await testNode.getChildren()
+        assertNodeListOnlyHasErrorNode(childNodes)
+    })
+
+    it('has a placeholder node for a child if unsupported action', async function () {
+        const error = new Error('foo')
+        error.name = 'UnsupportedActionException'
+        cloudControl.listResources = sinon.stub().rejects(error)
+        testNode = generateTestNode(cloudControl)
+
+        const childNodes = await testNode.getChildren()
+        assertNodeListOnlyHasPlaceholderNode(childNodes)
+    })
+
+    it('has Documented contextValue if documentation available', function () {
+        mockCloudControlClient(resourceIdentifiers)
+
+        testNode = generateTestNode(cloudControl, [], 'fooDocs')
+        assert.strictEqual(testNode.contextValue, 'DocumentedResourceTypeNode')
+    })
+
+    it('has Creatable contextValue if create operation present', function () {
+        mockCloudControlClient(resourceIdentifiers)
+
+        testNode = generateTestNode(cloudControl, ['CREATE'])
+        assert.strictEqual(testNode.contextValue, 'CreatableResourceTypeNode')
+    })
+
+    it('is non expandable if not available', function () {
+        mockCloudControlClient(resourceIdentifiers)
+
+        testNode = generateTestNode(cloudControl, undefined, undefined, false)
+        assert.strictEqual(testNode.collapsibleState, vscode.TreeItemCollapsibleState.None)
+    })
+
+    it('has a suitable description if not available', function () {
+        mockCloudControlClient(resourceIdentifiers)
+
+        testNode = generateTestNode(cloudControl, undefined, undefined, false)
+        assert.strictEqual(testNode.description, 'Unavailable in region')
+    })
+
+    it('has UnavailableResourceTypeNode contextValue if not available', function () {
+        mockCloudControlClient(resourceIdentifiers)
+
+        testNode = generateTestNode(cloudControl, undefined, undefined, false)
+        assert.strictEqual(testNode.contextValue, 'UnavailableResourceTypeNode')
+    })
+
+    function generateTestNode(
+        client: CloudControlClient,
+        supportedOperations?: string[],
+        documentation?: string,
+        available?: boolean
+    ): ResourceTypeNode {
+        const metadata = {
+            operations: supportedOperations,
+            documentation,
+            available: available ?? true,
+        } as ResourceTypeMetadata
+        return new ResourceTypeNode({} as ResourcesNode, fakeTypeName, client, metadata)
+    }
+
+    function mockCloudControlClient(resourceIdentifiers: string[]): void {
+        cloudControl.listResources = sinon.stub().resolves({
+            TypeName: fakeTypeName,
+            NextToken: undefined,
+            ResourceDescriptions: resourceIdentifiers.map<ResourceDescription>((identifier) => {
+                return {
+                    Identifier: identifier,
+                    ResourceModel: '',
+                }
+            }),
+        })
+    }
+})
diff --git a/src/test/dynamicResources/model/resources.test.ts b/packages/core/src/test/dynamicResources/model/resources.test.ts
similarity index 90%
rename from src/test/dynamicResources/model/resources.test.ts
rename to packages/core/src/test/dynamicResources/model/resources.test.ts
index 10ea3b77fbb..640466afb06 100644
--- a/src/test/dynamicResources/model/resources.test.ts
+++ b/packages/core/src/test/dynamicResources/model/resources.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import { getResourceTypes } from '../../../dynamicResources/model/resources'
 
 const fakeResourceModel = {
diff --git a/src/test/eventSchemas/commands/downloadSchemaItemCode.test.ts b/packages/core/src/test/eventSchemas/commands/downloadSchemaItemCode.test.ts
similarity index 90%
rename from src/test/eventSchemas/commands/downloadSchemaItemCode.test.ts
rename to packages/core/src/test/eventSchemas/commands/downloadSchemaItemCode.test.ts
index 7bf476f3d43..140248eaefc 100644
--- a/src/test/eventSchemas/commands/downloadSchemaItemCode.test.ts
+++ b/packages/core/src/test/eventSchemas/commands/downloadSchemaItemCode.test.ts
@@ -1,14 +1,17 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
-import * as fs from 'fs-extra'
+import assert from 'assert'
 import * as path from 'path'
 import * as vscode from 'vscode'
 
-import { Schemas } from 'aws-sdk'
+import {
+    DescribeCodeBindingResponse,
+    GetCodeBindingSourceResponse,
+    PutCodeBindingResponse,
+} from '@aws-sdk/client-schemas'
 import * as sinon from 'sinon'
 
 import {
@@ -22,9 +25,11 @@ import {
 
 import { MockOutputChannel } from '../../../test/mockOutputChannel'
 
-import admZip = require('adm-zip')
+import admZip from 'adm-zip'
 import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
 import { DefaultSchemaClient } from '../../../shared/clients/schemaClient'
+import { fs } from '../../../shared'
+import * as nodefs from 'fs' // eslint-disable-line no-restricted-imports
 
 describe('CodeDownloader', function () {
     let tempFolder: string
@@ -48,7 +53,7 @@ describe('CodeDownloader', function () {
 
     afterEach(async function () {
         sandbox.restore()
-        await fs.remove(tempFolder)
+        await fs.delete(tempFolder, { recursive: true })
     })
     const testSchemaName = 'testSchema'
     const testRegistryName = 'testRegistry'
@@ -60,22 +65,22 @@ describe('CodeDownloader', function () {
 
     describe('codeDownloader', async function () {
         it('should return an error if the response body is not Buffer', async function () {
-            const response: Schemas.GetCodeBindingSourceResponse = {
-                Body: 'Invalied body',
+            const response: GetCodeBindingSourceResponse = {
+                Body: 'Invalied body' as any,
             }
             sandbox.stub(schemaClient, 'getCodeBindingSource').returns(Promise.resolve(response))
 
             await assert.rejects(
                 codeDownloader.download(request),
-                new Error('Response body should be Buffer type'),
+                new TypeError('Response body should be Buffer type'),
                 'Should fail for same error'
             )
         })
 
         it('should return arrayBuffer for valid Body type', async function () {
             const myBuffer = Buffer.from('TEST STRING')
-            const response: Schemas.GetCodeBindingSourceResponse = {
-                Body: myBuffer,
+            const response: GetCodeBindingSourceResponse = {
+                Body: myBuffer as any,
             }
 
             sandbox.stub(schemaClient, 'getCodeBindingSource').returns(Promise.resolve(response))
@@ -83,7 +88,9 @@ describe('CodeDownloader', function () {
             const comparisonResult = arrayBuffersEqual(returnedBuffer, myBuffer.buffer)
             assert.ok(
                 comparisonResult,
-                `Buffers do not match, string representation of expected buffer : TEST STRING, returned : ${returnedBuffer.toString()}`
+                `Buffers do not match, string representation of expected buffer : TEST STRING, returned : ${String(
+                    returnedBuffer
+                )}`
             )
         })
 
@@ -126,7 +133,7 @@ describe('CodeGenerator', function () {
 
     afterEach(async function () {
         sandbox.restore()
-        await fs.remove(tempFolder)
+        await fs.delete(tempFolder, { recursive: true })
     })
     const testSchemaName = 'testSchema'
     const testRegistryName = 'testRegistry'
@@ -145,7 +152,7 @@ describe('CodeGenerator', function () {
 
     describe('codeGenerator', async function () {
         it('should return the current status of code generation', async function () {
-            const response: Schemas.PutCodeBindingResponse = {
+            const response: PutCodeBindingResponse = {
                 Status: CodeGenerationStatus.CREATE_IN_PROGRESS,
             }
             sandbox.stub(schemaClient, 'putCodeBinding').returns(Promise.resolve(response))
@@ -161,7 +168,7 @@ describe('CodeGenerator', function () {
         // If code bindings were not generated, but putCodeBinding was already called, ConflictException occurs
         // Return CREATE_IN_PROGRESS and keep polling in this case
         it('should return valid code generation status if it gets ConflictException', async function () {
-            const response: Schemas.PutCodeBindingResponse = {
+            const response: PutCodeBindingResponse = {
                 Status: CodeGenerationStatus.CREATE_IN_PROGRESS,
             }
 
@@ -199,7 +206,7 @@ describe('CodeGeneratorStatusPoller', function () {
 
     afterEach(async function () {
         sandbox.restore()
-        await fs.remove(tempFolder)
+        await fs.delete(tempFolder, { recursive: true })
     })
     const testSchemaName = 'testSchema'
     const testRegistryName = 'testRegistry'
@@ -221,10 +228,10 @@ describe('CodeGeneratorStatusPoller', function () {
 
     describe('getCurrentStatus', async function () {
         it('should return the current status of code generation', async function () {
-            const firstStatus: Schemas.DescribeCodeBindingResponse = {
+            const firstStatus: DescribeCodeBindingResponse = {
                 Status: CodeGenerationStatus.CREATE_IN_PROGRESS,
             }
-            const secondStatus: Schemas.DescribeCodeBindingResponse = {
+            const secondStatus: DescribeCodeBindingResponse = {
                 Status: CodeGenerationStatus.CREATE_COMPLETE,
             }
 
@@ -242,7 +249,7 @@ describe('CodeGeneratorStatusPoller', function () {
 
     describe('codeGeneratorStatusPoller', async function () {
         it('fails if code generation status is invalid without retry', async function () {
-            const schemaResponse: Schemas.DescribeCodeBindingResponse = {
+            const schemaResponse: DescribeCodeBindingResponse = {
                 Status: CodeGenerationStatus.CREATE_FAILED,
             }
 
@@ -263,7 +270,7 @@ describe('CodeGeneratorStatusPoller', function () {
         })
 
         it('times out after max attempts if status is still in progress', async function () {
-            const schemaResponse: Schemas.DescribeCodeBindingResponse = {
+            const schemaResponse: DescribeCodeBindingResponse = {
                 Status: CodeGenerationStatus.CREATE_IN_PROGRESS,
             }
 
@@ -287,7 +294,7 @@ describe('CodeGeneratorStatusPoller', function () {
         })
 
         it('succeeds when code is previously generated without retry', async function () {
-            const schemaResponse: Schemas.DescribeCodeBindingResponse = {
+            const schemaResponse: DescribeCodeBindingResponse = {
                 Status: CodeGenerationStatus.CREATE_COMPLETE,
             }
 
@@ -350,7 +357,7 @@ describe('SchemaCodeDownload', function () {
 
     afterEach(async function () {
         sandbox.restore()
-        await fs.remove(tempFolder)
+        await fs.delete(tempFolder, { recursive: true })
     })
     const testSchemaName = 'testSchema'
     const testRegistryName = 'testRegistry'
@@ -381,7 +388,7 @@ describe('SchemaCodeDownload', function () {
 
             // should extract the zip file with provided fileContent
             const expectedFilePath = path.join(request.destinationDirectory.fsPath, fileName)
-            const response = fs.readFileSync(expectedFilePath, 'utf8')
+            const response = await fs.readFileText(expectedFilePath)
             assert.strictEqual(response, fileContent, `${expectedFilePath} :file content do not match`)
         })
 
@@ -399,7 +406,7 @@ describe('SchemaCodeDownload', function () {
         it('should generate code if download fails with ResourceNotFound and place it into requested directory', async function () {
             sandbox.stub(poller, 'pollForCompletion').returns(Promise.resolve('CREATE_COMPLETE'))
             const codeDownloaderStub = sandbox.stub(downloader, 'download')
-            const codeGeneratorResponse: Schemas.PutCodeBindingResponse = {
+            const codeGeneratorResponse: PutCodeBindingResponse = {
                 Status: 'CREATE_IN_PROGRESS',
             }
             sandbox.stub(generator, 'generate').returns(Promise.resolve(codeGeneratorResponse))
@@ -418,7 +425,7 @@ describe('SchemaCodeDownload', function () {
             )
 
             const expectedFilePath = path.join(request.destinationDirectory.fsPath, fileName)
-            const response = fs.readFileSync(expectedFilePath, 'utf8')
+            const response = await fs.readFileText(expectedFilePath)
             assert.strictEqual(response, fileContent, 'Extracted file content do not match with expected')
         })
 
@@ -447,7 +454,7 @@ describe('CodeExtractor', function () {
     })
 
     afterEach(async function () {
-        await fs.remove(destinationDirectory)
+        await fs.delete(destinationDirectory, { recursive: true })
         sandbox.restore()
     })
 
@@ -467,7 +474,7 @@ describe('CodeExtractor', function () {
             let zipHandler = createZipFileInTempDirectory(fileName, 'First file content', zipName)
             zipHandler.extractAllTo(destinationDirectory)
 
-            //Create a zip file that clashes with destination content
+            // Create a zip file that clashes with destination content
             zipHandler = createZipFileInTempDirectory(fileName, 'Second file content', zipName)
 
             const collisionOccured = codeExtractor.checkFileCollisions(zipName, destinationDirectory)
@@ -484,7 +491,7 @@ describe('CodeExtractor', function () {
             let zipHandler = createZipFileInTempDirectory(fileName1, 'First file content', zipName)
             zipHandler.extractAllTo(destinationDirectory)
 
-            //Create a zip file with same directory path but diff fileName
+            // Create a zip file with same directory path but diff fileName
             const fileName2 = 'test2.txt'
             zipHandler = createZipFileInTempDirectory(fileName2, 'Second file content', zipName)
 
@@ -522,7 +529,7 @@ describe('CodeExtractor', function () {
 
         afterEach(async function () {
             sandbox.restore()
-            await fs.remove(destinationDirectory)
+            await fs.delete(destinationDirectory, { recursive: true })
         })
 
         it('should extract files if no collision present', async function () {
@@ -544,12 +551,12 @@ describe('CodeExtractor', function () {
             const file2Path = path.join(destinationDirectory, fileName2)
 
             // confirm both file exist
-            assert.ok(fs.existsSync(file1Path), `${file1Path} should exist`)
-            assert.ok(fs.existsSync(file2Path), `${file2Path} should exist`)
+            assert.ok(await fs.exists(file1Path), `${file1Path} should exist`)
+            assert.ok(await fs.exists(file2Path), `${file2Path} should exist`)
 
-            //confirm file contents
-            const file1Content = fs.readFileSync(file1Path, { encoding: 'utf8' })
-            const file2Content = fs.readFileSync(file2Path, { encoding: 'utf8' })
+            // confirm file contents
+            const file1Content = await fs.readFileText(file1Path)
+            const file2Content = await fs.readFileText(file2Path)
 
             assert.strictEqual(file1Content, 'First file content', `${file1Path} : file content do not match`)
             assert.strictEqual(file2Content, 'Second file content', `${file2Path} : file content do not match`)
@@ -566,7 +573,7 @@ describe('CodeExtractor', function () {
             const zipHandler = createZipFileInTempDirectory(fileName1, expectedFileContent, zipFileName)
             zipHandler.extractAllTo(destinationDirectory)
 
-            //same file name -  collision occurs
+            // same file name -  collision occurs
             const fileName2 = fileName1
             const zip = new admZip()
             zip.addFile(fileName2, Buffer.from('Second file content'))
@@ -575,7 +582,7 @@ describe('CodeExtractor', function () {
             await codeExtractor.extractAndPlace(buffer, request)
 
             const file1Path = path.join(destinationDirectory, fileName1)
-            const file1Content = fs.readFileSync(file1Path, { encoding: 'utf8' })
+            const file1Content = await fs.readFileText(file1Path)
 
             assert.strictEqual(file1Content, expectedFileContent, `${file1Path} :File content should not be overriden`)
         })
@@ -591,7 +598,7 @@ describe('CodeExtractor', function () {
             const zipHandler = createZipFileInTempDirectory(fileName1, initialFileContent, zipFileName)
             zipHandler.extractAllTo(destinationDirectory)
 
-            //same file name, different file content -  collision occurs
+            // same file name, different file content -  collision occurs
             const fileName2 = fileName1
             const zip = new admZip()
             const overridenFileContent = 'Replaced file content'
@@ -601,14 +608,14 @@ describe('CodeExtractor', function () {
             await codeExtractor.extractAndPlace(buffer, request)
 
             const file1Path = path.join(destinationDirectory, fileName1)
-            const file1Content = fs.readFileSync(file1Path, { encoding: 'utf8' })
+            const file1Content = await fs.readFileText(file1Path)
 
             assert.strictEqual(file1Content, overridenFileContent, `${file1Path} :File content should be overriden`)
         })
 
         it('should throw error if user picks Cancel when collision occurs', async function () {
             const error = new Error('Download code bindings cancelled')
-            sandbox.stub(codeExtractor, 'confirmOverwriteCollisions').returns(Promise.reject(error))
+            sandbox.stub(codeExtractor, 'confirmOverwriteCollisions').rejects(error)
 
             const fileName1 = 'test.txt'
             const zipFileName = path.join(destinationDirectory, 'test.zip')
@@ -618,7 +625,7 @@ describe('CodeExtractor', function () {
             const zipHandler = createZipFileInTempDirectory(fileName1, expectedFileContent, zipFileName)
             zipHandler.extractAllTo(destinationDirectory)
 
-            //same file name -  collision occurs
+            // same file name -  collision occurs
             const fileName2 = fileName1
             const zip = new admZip()
             zip.addFile(fileName2, Buffer.from('Second file content'))
@@ -631,13 +638,13 @@ describe('CodeExtractor', function () {
             )
 
             const file1Path = path.join(destinationDirectory, fileName1)
-            const file1Content = fs.readFileSync(file1Path, { encoding: 'utf8' })
+            const file1Content = await fs.readFileText(file1Path)
 
             assert.strictEqual(file1Content, expectedFileContent, `${file1Path} :File content should not be overriden`)
         })
 
         it('should return coreCodeFilePath if it exists inside zip content', async function () {
-            //grab the title from schemaName
+            // grab the title from schemaName
             const title = testSchemaName.split('.').pop()
             const fileName = title!.concat('.java')
 
@@ -679,9 +686,9 @@ describe('CodeExtractor', function () {
         const zip = new admZip()
         zip.addFile(fileName, Buffer.from(fileContent))
         const buffer = zip.toBuffer()
-        const fd = fs.openSync(zipFileName, 'w')
-        fs.writeSync(fd, buffer, 0, buffer.byteLength, 0)
-        fs.closeSync(fd)
+        const fd = nodefs.openSync(zipFileName, 'w')
+        nodefs.writeSync(fd, buffer, 0, buffer.byteLength, 0)
+        nodefs.closeSync(fd)
 
         return zip
     }
diff --git a/src/test/eventSchemas/commands/searchSchemas.test.ts b/packages/core/src/test/eventSchemas/commands/searchSchemas.test.ts
similarity index 86%
rename from src/test/eventSchemas/commands/searchSchemas.test.ts
rename to packages/core/src/test/eventSchemas/commands/searchSchemas.test.ts
index 62274689474..dd7c2175ccd 100644
--- a/src/test/eventSchemas/commands/searchSchemas.test.ts
+++ b/packages/core/src/test/eventSchemas/commands/searchSchemas.test.ts
@@ -1,17 +1,16 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 
-import { Schemas } from 'aws-sdk'
+import { DescribeSchemaResponse, SearchSchemaSummary, SearchSchemaVersionSummary } from '@aws-sdk/client-schemas'
 import * as sinon from 'sinon'
 import { SchemasNode } from '../../../eventSchemas/explorer/schemasNode'
 import { getTabSizeSetting } from '../../../shared/utilities/editorUtilities'
-import { asyncGenerator } from '../../utilities/collectionUtils'
+import { asyncGenerator } from '../../../shared/utilities/collectionUtils'
 
-import * as vscode from 'vscode'
 import { MockOutputChannel } from '../../mockOutputChannel'
 import {
     getPageHeader,
@@ -23,6 +22,8 @@ import {
 import { RegistryItemNode } from '../../../eventSchemas/explorer/registryItemNode'
 import { DefaultSchemaClient } from '../../../shared/clients/schemaClient'
 import { stub } from '../../utilities/stubber'
+import { getTestWindow } from '../../shared/vscode/window'
+import { SeverityLevel } from '../../shared/vscode/message'
 
 describe('Search Schemas', function () {
     let sandbox: sinon.SinonSandbox
@@ -41,25 +42,25 @@ describe('Search Schemas', function () {
     const failRegistry = 'failRegistry'
     const failRegistry2 = 'failRegistry2'
 
-    const versionSummary1: Schemas.SearchSchemaVersionSummary = {
+    const versionSummary1: SearchSchemaVersionSummary = {
         SchemaVersion: '1',
     }
-    const versionSummary2: Schemas.SearchSchemaVersionSummary = {
+    const versionSummary2: SearchSchemaVersionSummary = {
         SchemaVersion: '2',
     }
-    const searchSummary1: Schemas.SearchSchemaSummary = {
+    const searchSummary1: SearchSchemaSummary = {
         RegistryName: testRegistry,
         SchemaName: 'testSchema1',
         SchemaVersions: [versionSummary1, versionSummary2],
     }
 
-    const searchSummary2: Schemas.SearchSchemaSummary = {
+    const searchSummary2: SearchSchemaSummary = {
         RegistryName: testRegistry,
         SchemaName: 'testSchema2',
         SchemaVersions: [versionSummary1],
     }
 
-    const searchSummary3: Schemas.SearchSchemaSummary = {
+    const searchSummary3: SearchSchemaSummary = {
         RegistryName: testRegistry2,
         SchemaName: 'testSchema3',
         SchemaVersions: [versionSummary1],
@@ -113,21 +114,20 @@ describe('Search Schemas', function () {
 
         it('should display an error message when search api call fails', async function () {
             const client = stub(DefaultSchemaClient, { regionCode: 'region-1' })
-            const vscodeSpy = sandbox.spy(vscode.window, 'showErrorMessage')
             const displayMessage = `Unable to search registry ${failRegistry}`
 
-            //make an api call with non existent registryName - should return empty results
+            // make an api call with non existent registryName - should return empty results
             const results = await getSearchListForSingleRegistry(client, failRegistry, 'randomText')
 
             assert.strictEqual(results.length, 0, 'should return 0 summaries')
-            assert.strictEqual(vscodeSpy.callCount, 1, ' error message should be shown exactly once')
-            assert.strictEqual(vscodeSpy.firstCall.lastArg, displayMessage, 'should display correct error message')
+            const errorMessages = getTestWindow().shownMessages.filter((m) => m.severity === SeverityLevel.Error)
+            assert.strictEqual(errorMessages.length, 1, 'error message should be shown exactly once')
+            assert.strictEqual(errorMessages[0].message, displayMessage, 'should display correct error message')
         })
     })
 
     describe('getSearchResults', function () {
         it('should display error message for failed registries and return summaries for successful ones', async function () {
-            const vscodeSpy = sandbox.spy(vscode.window, 'showErrorMessage')
             const displayMessage = `Unable to search registry ${failRegistry}`
             const displayMessage2 = `Unable to search registry ${failRegistry2}`
 
@@ -145,7 +145,7 @@ describe('Search Schemas', function () {
 
             assert.strictEqual(results.length, 3, 'should return 3 summaries')
 
-            //results are unordered, sort for testing purposes
+            // results are unordered, sort for testing purposes
             results.sort(function (a, b) {
                 return a.RegistryName > b.RegistryName ? 1 : b.RegistryName > a.RegistryName ? -1 : 0
             })
@@ -165,10 +165,11 @@ describe('Search Schemas', function () {
             assert.strictEqual(results[1].VersionList.length, 1, 'second summary has 1 version')
             assert.strictEqual(results[2].VersionList.length, 1, 'third summary has 1 version')
 
-            //failed registries
-            assert.strictEqual(vscodeSpy.callCount, 2, 'should display 2 error message, 1 per each failed registry')
-            assert.strictEqual(vscodeSpy.firstCall.lastArg, displayMessage, 'should display correct error message')
-            assert.strictEqual(vscodeSpy.secondCall.lastArg, displayMessage2, 'should display correct error message')
+            // failed registries
+            const errorMessages = getTestWindow().shownMessages.filter((m) => m.severity === SeverityLevel.Error)
+            assert.strictEqual(errorMessages.length, 2, 'should display 2 error message, 1 per each failed registry')
+            errorMessages[0].assertMessage(displayMessage)
+            errorMessages[1].assertMessage(displayMessage2)
         })
     })
 
@@ -177,7 +178,7 @@ describe('Search Schemas', function () {
         const multipleRegistryNames = [testRegistry, testRegistry2]
         const awsEventSchemaRaw =
             '{"openapi":"3.0.0","info":{"version":"1.0.0","title":"Event"},"paths":{},"components":{"schemas":{"Event":{"type":"object"}}}}'
-        const schemaResponse: Schemas.DescribeSchemaResponse = {
+        const schemaResponse: DescribeSchemaResponse = {
             Content: awsEventSchemaRaw,
         }
 
@@ -271,17 +272,15 @@ describe('Search Schemas', function () {
         })
 
         it('should return an empty list and display error message if schemas service not available in the region', async function () {
-            const vscodeSpy = sandbox.spy(vscode.window, 'showErrorMessage')
-            const displayMessage = 'Error loading Schemas resources'
-
             const schemasNode = new SchemasNode(schemaClient)
             sandbox.stub(schemaClient, 'listRegistries')
 
             const results = await getRegistryNames(schemasNode, schemaClient)
 
             assert.ok(results.length === 0, 'Should return an empty array')
-            assert.strictEqual(vscodeSpy.callCount, 1, ' error message should be shown exactly once')
-            assert.strictEqual(vscodeSpy.firstCall.lastArg, displayMessage, 'should display correct error message')
+            const errorMessages = getTestWindow().shownMessages.filter((m) => m.severity === SeverityLevel.Error)
+            assert.strictEqual(errorMessages.length, 1, 'should display 1 error message')
+            errorMessages[0].assertMessage('Error loading Schemas resources')
         })
     })
 })
diff --git a/src/test/eventSchemas/commands/viewSchemaItem.test.ts b/packages/core/src/test/eventSchemas/commands/viewSchemaItem.test.ts
similarity index 93%
rename from src/test/eventSchemas/commands/viewSchemaItem.test.ts
rename to packages/core/src/test/eventSchemas/commands/viewSchemaItem.test.ts
index da589c8f5e2..9127bfe96a5 100644
--- a/src/test/eventSchemas/commands/viewSchemaItem.test.ts
+++ b/packages/core/src/test/eventSchemas/commands/viewSchemaItem.test.ts
@@ -1,11 +1,10 @@
 /*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Schemas } from 'aws-sdk'
-
-import * as assert from 'assert'
+import { DescribeSchemaResponse } from '@aws-sdk/client-schemas'
+import assert from 'assert'
 import * as sinon from 'sinon'
 import * as vscode from 'vscode'
 import { schemaFormatter, showSchemaContent, viewSchemaItem } from '../../../eventSchemas/commands/viewSchemaItem'
@@ -104,7 +103,7 @@ describe('viewSchemaItem', async function () {
             edit: () => {},
         } as any as vscode.TextEditor
 
-        sinon.stub(textEditor, 'edit').callsFake(async editBuilder => {
+        sinon.stub(textEditor, 'edit').callsFake(async (editBuilder) => {
             editBuilder(textEdit)
 
             return true
@@ -117,7 +116,7 @@ describe('viewSchemaItem', async function () {
     }
 
     function generateSchemaItemNode(): SchemaItemNode {
-        const schemaResponse: Schemas.DescribeSchemaResponse = {
+        const schemaResponse: DescribeSchemaResponse = {
             Content: awsEventSchemaRaw,
         }
         const schemaClient = new DefaultSchemaClient('')
diff --git a/packages/core/src/test/eventSchemas/explorer/registryItemNode.test.ts b/packages/core/src/test/eventSchemas/explorer/registryItemNode.test.ts
new file mode 100644
index 00000000000..719520cde64
--- /dev/null
+++ b/packages/core/src/test/eventSchemas/explorer/registryItemNode.test.ts
@@ -0,0 +1,160 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as os from 'os'
+import * as sinon from 'sinon'
+import { RegistrySummary, SchemaSummary } from '@aws-sdk/client-schemas'
+import { RegistryItemNode } from '../../../eventSchemas/explorer/registryItemNode'
+import { SchemaItemNode } from '../../../eventSchemas/explorer/schemaItemNode'
+import { SchemasNode } from '../../../eventSchemas/explorer/schemasNode'
+import { DefaultSchemaClient } from '../../../shared/clients/schemaClient'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
+import {
+    assertNodeListOnlyHasErrorNode,
+    assertNodeListOnlyHasPlaceholderNode,
+} from '../../utilities/explorerNodeAssertions'
+import { asyncGenerator } from '../../../shared/utilities/collectionUtils'
+import { getIcon } from '../../../shared/icons'
+import { stub } from '../../utilities/stubber'
+
+function createSchemaClient(data?: { schemas?: SchemaSummary[]; registries?: RegistrySummary[] }) {
+    const client = stub(DefaultSchemaClient, { regionCode: 'code' })
+    client.listSchemas.callsFake(() => asyncGenerator(data?.schemas ?? []))
+    client.listRegistries.callsFake(() => asyncGenerator(data?.registries ?? []))
+
+    return client
+}
+
+describe('RegistryItemNode', function () {
+    let fakeRegistry: RegistrySummary
+
+    before(function () {
+        fakeRegistry = {
+            RegistryName: 'myRegistry',
+            RegistryArn: 'arn:aws:schemas:us-west-2:434418839121:registry/myRegistry',
+        }
+    })
+
+    // Validates we tagged the node correctly.
+    it('initializes name, tooltip, and icon', async function () {
+        const testNode: RegistryItemNode = generateTestNode()
+
+        assert.strictEqual(testNode.label, `${fakeRegistry.RegistryName}`)
+        assert.strictEqual(testNode.tooltip, `${fakeRegistry.RegistryName}${os.EOL}${fakeRegistry.RegistryArn}`)
+        assert.strictEqual(testNode.iconPath, getIcon('aws-schemas-registry'))
+    })
+
+    it('returns placeholder node if no children are present', async function () {
+        const testNode = generateTestNode()
+        const childNodes = await testNode.getChildren()
+
+        assert(childNodes !== undefined)
+        assert.strictEqual(childNodes.length, 1)
+        assert.strictEqual(childNodes[0] instanceof PlaceholderNode, true)
+    })
+
+    it('returns schemas that belong to Registry', async function () {
+        const schema1Item: SchemaSummary = {
+            SchemaArn: 'arn:schema1',
+            SchemaName: 'schema1Name',
+        }
+
+        const schema2Item: SchemaSummary = {
+            SchemaArn: 'arn:schema1',
+            SchemaName: 'schema2Name',
+        }
+
+        const schema3Item: SchemaSummary = {
+            SchemaArn: 'arn:schema1',
+            SchemaName: 'schema3Name',
+        }
+
+        const schemaClient = createSchemaClient({ schemas: [schema1Item, schema2Item, schema3Item] })
+        const testNode: RegistryItemNode = generateTestNode(schemaClient)
+
+        const childNodes = await testNode.getChildren()
+        assert(childNodes !== undefined)
+        assert.strictEqual(childNodes.length, 3)
+
+        assert(childNodes[0] instanceof SchemaItemNode)
+        assert.strictEqual((childNodes[0] as SchemaItemNode).label, schema1Item.SchemaName)
+
+        assert(childNodes[1] instanceof SchemaItemNode)
+        assert.strictEqual((childNodes[1] as SchemaItemNode).label, schema2Item.SchemaName)
+
+        assert(childNodes[1] instanceof SchemaItemNode)
+        assert.strictEqual((childNodes[2] as SchemaItemNode).label, schema3Item.SchemaName)
+    })
+
+    function generateTestNode(client = createSchemaClient()): RegistryItemNode {
+        return new RegistryItemNode(fakeRegistry, client)
+    }
+})
+
+describe('DefaultRegistryNode', function () {
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    it('Sorts Registries', async function () {
+        const inputRegistryNames: string[] = ['zebra', 'Antelope', 'aardvark', 'elephant']
+        const client = createSchemaClient({
+            registries: inputRegistryNames.map((name) => ({ RegistryName: name })),
+        })
+
+        const schemasNode = new SchemasNode(client)
+        const children = await schemasNode.getChildren()
+
+        assert.ok(children, 'Expected to get Registry node children')
+        assert.strictEqual(
+            inputRegistryNames.length,
+            children.length,
+            `Expected ${inputRegistryNames.length} Registry children, got ${children.length}`
+        )
+
+        function assertChildNodeRegistryName(actualChildNode: AWSTreeNodeBase, expectedNodeText: string) {
+            assert.strictEqual(actualChildNode instanceof RegistryItemNode, true, 'Child node was not a Registry Node')
+
+            const node: RegistryItemNode = actualChildNode as RegistryItemNode
+            assert.strictEqual(
+                node.registryName,
+                expectedNodeText,
+                `Expected child node to have registry ${expectedNodeText} but got ${node.registryName}`
+            )
+        }
+
+        assertChildNodeRegistryName(children[0], 'aardvark')
+        assertChildNodeRegistryName(children[1], 'Antelope')
+        assertChildNodeRegistryName(children[2], 'elephant')
+        assertChildNodeRegistryName(children[3], 'zebra')
+    })
+
+    it('returns placeholder node if no children are present', async function () {
+        const schemasNode = new SchemasNode(createSchemaClient())
+        const childNodes = await schemasNode.getChildren()
+
+        assertNodeListOnlyHasPlaceholderNode(childNodes)
+    })
+
+    it('handles error', async function () {
+        // typo in the name of the method
+        class ThrowErrorDefaultSchemaRegistrynNode extends SchemasNode {
+            public constructor() {
+                super(createSchemaClient())
+            }
+
+            public override async updateChildren(): Promise<void> {
+                throw new Error('Hello there!')
+            }
+        }
+
+        const testNode: ThrowErrorDefaultSchemaRegistrynNode = new ThrowErrorDefaultSchemaRegistrynNode()
+
+        const childNodes = await testNode.getChildren()
+        assertNodeListOnlyHasErrorNode(childNodes)
+    })
+})
diff --git a/src/test/eventSchemas/model/schemaCodeGenUtils.test.ts b/packages/core/src/test/eventSchemas/model/schemaCodeGenUtils.test.ts
similarity index 78%
rename from src/test/eventSchemas/model/schemaCodeGenUtils.test.ts
rename to packages/core/src/test/eventSchemas/model/schemaCodeGenUtils.test.ts
index 74b8db7292b..619bb24b717 100644
--- a/src/test/eventSchemas/model/schemaCodeGenUtils.test.ts
+++ b/packages/core/src/test/eventSchemas/model/schemaCodeGenUtils.test.ts
@@ -1,10 +1,10 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
-import { IdentifierFormatter, SchemaCodeGenUtils } from '../../../eventSchemas/models/schemaCodeGenUtils'
+import assert from 'assert'
+import { SchemaCodeGenUtils, toValidIdentifier } from '../../../eventSchemas/models/schemaCodeGenUtils'
 
 describe('SchemaCodeGenUtils', async function () {
     const testScenarios = [
@@ -56,24 +56,22 @@ describe('SchemaCodeGenUtils', async function () {
     ]
 
     describe('buildSchemaPackageName', async function () {
-        testScenarios.forEach(test => {
+        for (const test of testScenarios) {
             it(test.scenario, async () => {
                 const codeGen = new SchemaCodeGenUtils()
                 const result = codeGen.buildSchemaPackageName(test.input)
                 assert.strictEqual(result, test.expectedResult, 'Invalid package name returned')
             })
-        })
+        }
     })
 })
 
-describe('IdentifierFormatter', async function () {
-    describe('toValidIdentifier', async function () {
-        it('replaces invalid identifier characters with underscore', async function () {
-            assert.strictEqual(IdentifierFormatter.toValidIdentifier('Review.created?today'), 'Review_created_today')
-        })
+describe('toValidIdentifier', async function () {
+    it('replaces invalid identifier characters with underscore', async function () {
+        assert.strictEqual(toValidIdentifier('Review.created?today'), 'Review_created_today')
+    })
 
-        it('replaces package seperator @ with dot', async function () {
-            assert.strictEqual(IdentifierFormatter.toValidIdentifier('Review@created'), 'Review.created')
-        })
+    it('replaces package seperator @ with dot', async function () {
+        assert.strictEqual(toValidIdentifier('Review@created'), 'Review.created')
     })
 })
diff --git a/src/test/eventSchemas/model/schemaCodeLangs.test.ts b/packages/core/src/test/eventSchemas/model/schemaCodeLangs.test.ts
similarity index 85%
rename from src/test/eventSchemas/model/schemaCodeLangs.test.ts
rename to packages/core/src/test/eventSchemas/model/schemaCodeLangs.test.ts
index 6791a89d0f0..6c023a52676 100644
--- a/src/test/eventSchemas/model/schemaCodeLangs.test.ts
+++ b/packages/core/src/test/eventSchemas/model/schemaCodeLangs.test.ts
@@ -1,15 +1,16 @@
 /*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import {
     getApiValueForSchemasDownload,
     getLanguageDetails,
     schemaCodeLangs,
 } from '../../../eventSchemas/models/schemaCodeLangs'
 import { samZipLambdaRuntimes } from '../../../lambda/models/samLambdaRuntime'
+import { Runtime } from '@aws-sdk/client-lambda'
 
 describe('getLanguageDetails', function () {
     it('should successfully return details for supported languages', function () {
@@ -29,7 +30,11 @@ describe('getApiValueForSchemasDownload', function () {
             switch (runtime) {
                 case 'python3.7':
                 case 'python3.8':
-                case 'python3.9': {
+                case 'python3.9':
+                case 'python3.11':
+                case 'python3.12':
+                case 'python3.13' as Runtime:
+                case 'python3.10': {
                     const result = getApiValueForSchemasDownload(runtime)
                     assert.strictEqual(result, 'Python36', 'Api value used by schemas api')
                     break
diff --git a/src/test/eventSchemas/providers/schemasDataProvider.test.ts b/packages/core/src/test/eventSchemas/providers/schemasDataProvider.test.ts
similarity index 98%
rename from src/test/eventSchemas/providers/schemasDataProvider.test.ts
rename to packages/core/src/test/eventSchemas/providers/schemasDataProvider.test.ts
index 41331bc9850..d8b7211cbf4 100644
--- a/src/test/eventSchemas/providers/schemasDataProvider.test.ts
+++ b/packages/core/src/test/eventSchemas/providers/schemasDataProvider.test.ts
@@ -1,16 +1,16 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import {
     Cache,
     credentialsRegionDataListMap,
     SchemasDataProvider,
 } from '../../../eventSchemas/providers/schemasDataProvider'
 import { DefaultSchemaClient } from '../../../shared/clients/schemaClient'
-import { asyncGenerator } from '../../utilities/collectionUtils'
+import { asyncGenerator } from '../../../shared/utilities/collectionUtils'
 import { stub } from '../../utilities/stubber'
 
 describe('schemasDataProvider', function () {
diff --git a/src/test/eventSchemas/templates/schemasAppTemplateUtils.test.ts b/packages/core/src/test/eventSchemas/templates/schemasAppTemplateUtils.test.ts
similarity index 98%
rename from src/test/eventSchemas/templates/schemasAppTemplateUtils.test.ts
rename to packages/core/src/test/eventSchemas/templates/schemasAppTemplateUtils.test.ts
index e373b2b12ee..1a1b1056a08 100644
--- a/src/test/eventSchemas/templates/schemasAppTemplateUtils.test.ts
+++ b/packages/core/src/test/eventSchemas/templates/schemasAppTemplateUtils.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import { buildSchemaTemplateParameters } from '../../../eventSchemas/templates/schemasAppTemplateUtils'
 import { DefaultSchemaClient } from '../../../shared/clients/schemaClient'
 import { stub } from '../../utilities/stubber'
diff --git a/src/test/eventSchemas/templates/schemasExamples.ts b/packages/core/src/test/eventSchemas/templates/schemasExamples.ts
similarity index 98%
rename from src/test/eventSchemas/templates/schemasExamples.ts
rename to packages/core/src/test/eventSchemas/templates/schemasExamples.ts
index a2a9d15f50b..a526017b80a 100644
--- a/src/test/eventSchemas/templates/schemasExamples.ts
+++ b/packages/core/src/test/eventSchemas/templates/schemasExamples.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/src/test/eventSchemas/wizards/schemaCodeDownloadWizard.test.ts b/packages/core/src/test/eventSchemas/wizards/schemaCodeDownloadWizard.test.ts
similarity index 98%
rename from src/test/eventSchemas/wizards/schemaCodeDownloadWizard.test.ts
rename to packages/core/src/test/eventSchemas/wizards/schemaCodeDownloadWizard.test.ts
index 35369b947fb..dcc6ea799bc 100644
--- a/src/test/eventSchemas/wizards/schemaCodeDownloadWizard.test.ts
+++ b/packages/core/src/test/eventSchemas/wizards/schemaCodeDownloadWizard.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import { Set } from 'immutable'
 import * as path from 'path'
 import * as vscode from 'vscode'
@@ -246,7 +246,7 @@ describe('SchemaCodeDownloadWizard', async function () {
 
             let index = 0
             const context: SchemaCodeDownloadWizardContext = new MockSchemaCodeDownloadWizardContext(
-                workspaceFolderPaths.map(p => ({
+                workspaceFolderPaths.map((p) => ({
                     uri: vscode.Uri.file(p),
                     name: path.basename(p),
                     index: index++,
diff --git a/src/test/fake/fakeDocument.ts b/packages/core/src/test/fake/fakeDocument.ts
similarity index 95%
rename from src/test/fake/fakeDocument.ts
rename to packages/core/src/test/fake/fakeDocument.ts
index b43f7cec7df..de93e86707c 100644
--- a/src/test/fake/fakeDocument.ts
+++ b/packages/core/src/test/fake/fakeDocument.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  * MIT licensed source: https://github.com/microsoft/vscode-python/blob/main/src/test/mocks/mockDocument.ts
  */
@@ -15,7 +15,11 @@ class MockLine implements TextLine {
 
     private _isEmpty: boolean | undefined
 
-    constructor(private _contents: string, private _line: number, private _offset: number) {
+    constructor(
+        private _contents: string,
+        private _line: number,
+        private _offset: number
+    ) {
         this._range = new Range(new Position(_line, 0), new Position(_line, _contents.length))
         this._rangeWithLineBreak = new Range(this.range.start, new Position(_line, _contents.length + 1))
     }
@@ -42,7 +46,7 @@ class MockLine implements TextLine {
 
     public get firstNonWhitespaceCharacterIndex(): number {
         if (this._firstNonWhitespaceIndex === undefined) {
-            this._firstNonWhitespaceIndex = this._contents.trimLeft().length - this._contents.length
+            this._firstNonWhitespaceIndex = this._contents.length - this._contents.trimStart().length
         }
         return this._firstNonWhitespaceIndex
     }
diff --git a/src/test/fake/fakeTelemetryService.ts b/packages/core/src/test/fake/fakeTelemetryService.ts
similarity index 92%
rename from src/test/fake/fakeTelemetryService.ts
rename to packages/core/src/test/fake/fakeTelemetryService.ts
index 5372c73d950..bb38db70b35 100644
--- a/src/test/fake/fakeTelemetryService.ts
+++ b/packages/core/src/test/fake/fakeTelemetryService.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/packages/core/src/test/fake/mockFeatureConfigData.ts b/packages/core/src/test/fake/mockFeatureConfigData.ts
new file mode 100644
index 00000000000..caff5f6dcea
--- /dev/null
+++ b/packages/core/src/test/fake/mockFeatureConfigData.ts
@@ -0,0 +1,29 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { FeatureEvaluation } from '../../codewhisperer'
+
+export const mockFeatureConfigsData: FeatureEvaluation[] = [
+    {
+        feature: 'testFeature',
+        variation: 'TREATMENT',
+        value: { stringValue: 'testValue' },
+    },
+    {
+        feature: 'featureA',
+        variation: 'CONTROL',
+        value: { stringValue: 'testValue' },
+    },
+    {
+        feature: 'featureB',
+        variation: 'TREATMENT',
+        value: { stringValue: 'testValue' },
+    },
+    {
+        feature: 'customizationArnOverride',
+        variation: 'customizationName',
+        value: { stringValue: 'customizationARN' },
+    },
+]
diff --git a/src/test/fakeExtensionContext.ts b/packages/core/src/test/fakeExtensionContext.ts
similarity index 76%
rename from src/test/fakeExtensionContext.ts
rename to packages/core/src/test/fakeExtensionContext.ts
index c993a103029..8c89302900e 100644
--- a/src/test/fakeExtensionContext.ts
+++ b/packages/core/src/test/fakeExtensionContext.ts
@@ -1,12 +1,11 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { mkdirp } from 'fs-extra'
 import * as vscode from 'vscode'
 import * as path from 'path'
-import { CredentialsStore } from '../credentials/credentialsStore'
+import { CredentialsStore } from '../auth/credentials/store'
 import { ExtContext } from '../shared/extensions'
 import { SamCliContext } from '../shared/sam/cli/samCliContext'
 import {
@@ -18,15 +17,15 @@ import {
     SamCliVersionValidatorResult,
 } from '../shared/sam/cli/samCliValidator'
 import { DefaultTelemetryService } from '../shared/telemetry/telemetryService'
-import { ChildProcessResult } from '../shared/utilities/childProcess'
+import { ChildProcessResult } from '../shared/utilities/processUtils'
 import { UriHandler } from '../shared/vscode/uriHandler'
-import { FakeEnvironmentVariableCollection } from './fake/fakeEnvironmentVariableCollection'
 import { FakeTelemetryPublisher } from './fake/fakeTelemetryService'
 import { MockOutputChannel } from './mockOutputChannel'
 import { FakeChildProcessResult, TestSamCliProcessInvoker } from './shared/sam/cli/testSamCliProcessInvoker'
 import { createTestWorkspaceFolder } from './testUtil'
 import { FakeAwsContext } from './utilities/fakeAwsContext'
 import { createTestRegionProvider } from './shared/regions/testUtil'
+import fs from '../shared/fs/fs'
 
 export interface FakeMementoStorage {
     [key: string]: any
@@ -48,22 +47,34 @@ export class FakeExtensionContext implements vscode.ExtensionContext {
         dispose(): any
     }[] = []
     public workspaceState: vscode.Memento = new FakeMemento()
-    public globalState: vscode.Memento = new FakeMemento()
+    public globalState: vscode.Memento & { setKeysForSync(keys: readonly string[]): void } = new FakeMemento()
     public globalStorageUri: vscode.Uri = vscode.Uri.file('file://fake/storage/uri')
     public storagePath: string | undefined
     public logPath: string = ''
     public extensionUri: vscode.Uri = vscode.Uri.file(this._extensionPath)
-    public environmentVariableCollection: vscode.EnvironmentVariableCollection = new FakeEnvironmentVariableCollection()
+    public environmentVariableCollection: any // vscode.EnvironmentVariableCollection = {} as vscode.EnvironmentVariableCollection
     public storageUri: vscode.Uri | undefined
     public logUri: vscode.Uri = vscode.Uri.file('file://fake/log/uri')
     public extensionMode: vscode.ExtensionMode = vscode.ExtensionMode.Test
-    public secrets = new SecretStorage()
+    public secrets = new FakeSecretStorage()
+
+    public extension: vscode.Extension<any> = {
+        activate: async () => undefined,
+        exports: undefined,
+        extensionKind: vscode.ExtensionKind.Workspace,
+        extensionPath: '/fake/extension',
+        extensionUri: vscode.Uri.file('/fake/extension/dir/'),
+        id: 'aws.toolkit.fake.extension',
+        isActive: true,
+        packageJSON: {},
+    }
 
     /**
      * Use {@link create()} to create a FakeExtensionContext.
      */
     private constructor(preload?: FakeExtensionState) {
         if (preload) {
+            // eslint-disable-next-line aws-toolkits/no-banned-usages
             this.globalState = new FakeMemento(preload.globalState)
             this.workspaceState = new FakeMemento(preload.workspaceState)
         }
@@ -97,8 +108,8 @@ export class FakeExtensionContext implements vscode.ExtensionContext {
         const folder = await createTestWorkspaceFolder('test')
         ctx.globalStorageUri = vscode.Uri.joinPath(folder.uri, 'globalStorage')
         ctx.logUri = vscode.Uri.joinPath(folder.uri, 'logs')
-        await mkdirp(ctx.globalStorageUri.fsPath)
-        await mkdirp(ctx.logUri.fsPath)
+        await fs.mkdir(ctx.globalStorageUri.fsPath)
+        await fs.mkdir(ctx.logUri.fsPath)
         return ctx
     }
 
@@ -110,17 +121,16 @@ export class FakeExtensionContext implements vscode.ExtensionContext {
         const awsContext = new FakeAwsContext()
         const samCliContext = () => {
             return {
-                invoker: new TestSamCliProcessInvoker((spawnOptions, args: any[]): ChildProcessResult => {
+                invoker: new TestSamCliProcessInvoker((_spawnOptions, _args: any[]): ChildProcessResult => {
                     return new FakeChildProcessResult({})
                 }),
                 validator: new FakeSamCliValidator(minSamCliVersionForGoSupport),
             } as SamCliContext
         }
-        const regionProvider = createTestRegionProvider({ globalState: ctx.globalState, awsContext })
+        const regionProvider = createTestRegionProvider({ awsContext })
         const outputChannel = new MockOutputChannel()
-        const invokeOutputChannel = new MockOutputChannel()
         const fakeTelemetryPublisher = new FakeTelemetryPublisher()
-        const telemetryService = new DefaultTelemetryService(ctx, awsContext, undefined, fakeTelemetryPublisher)
+        const telemetryService = await DefaultTelemetryService.create(awsContext, undefined, fakeTelemetryPublisher)
 
         return {
             extensionContext: ctx,
@@ -128,7 +138,6 @@ export class FakeExtensionContext implements vscode.ExtensionContext {
             samCliContext,
             regionProvider,
             outputChannel,
-            invokeOutputChannel,
             telemetryService,
             credentialsStore: new CredentialsStore(),
             uriHandler: new UriHandler(),
@@ -138,19 +147,31 @@ export class FakeExtensionContext implements vscode.ExtensionContext {
 
 export class FakeMemento implements vscode.Memento {
     public constructor(private readonly _storage: FakeMementoStorage = {}) {}
+    public setKeysForSync(_keys: readonly string[]): void {
+        // TODO(jmkeyes): implement this?
+    }
+    public keys(): readonly string[] {
+        return Object.keys(this._storage)
+    }
     public get<T>(key: string): T | undefined
     public get<T>(key: string, defaultValue: T): T
     public get(key: string, defaultValue?: unknown) {
         return this._storage[key] ?? defaultValue
     }
     public update(key: string, value: any): Thenable<void> {
+        /** From the docs of {@link vscode.Memento.update*()} if a value is updated to undefined, it should be deleted */
+        if (value === undefined) {
+            delete this._storage[key]
+            return Promise.resolve()
+        }
+
         this._storage[key] = value
 
         return Promise.resolve()
     }
 }
 
-class SecretStorage implements vscode.SecretStorage {
+export class FakeSecretStorage implements vscode.SecretStorage {
     private _onDidChange = new vscode.EventEmitter<vscode.SecretStorageChangeEvent>()
     public readonly onDidChange = this._onDidChange.event
 
diff --git a/packages/core/src/test/feedback/commands/submitFeedbackListener.test.ts b/packages/core/src/test/feedback/commands/submitFeedbackListener.test.ts
new file mode 100644
index 00000000000..3fbf666a6ea
--- /dev/null
+++ b/packages/core/src/test/feedback/commands/submitFeedbackListener.test.ts
@@ -0,0 +1,65 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { TelemetryService } from '../../../shared/telemetry/telemetryService'
+
+import * as assert from 'assert'
+import { FeedbackWebview } from '../../../feedback/vue/submitFeedback'
+import sinon from 'sinon'
+import { waitUntil } from '../../../shared'
+
+const comment =
+    'This is a detailed feedback comment that meets the minimum length requirement. ' +
+    'It includes specific information about the issue, steps to reproduce, expected behavior, and actual behavior. ' +
+    'This comment is long enough to pass the 188 character validation rule.'
+const sentiment = 'Positive'
+const message = { command: 'submitFeedback', comment: comment, sentiment: sentiment }
+const shortComment = 'This is a short comment'
+const shortMessage = { command: 'submitFeedback', comment: shortComment, sentiment: sentiment }
+
+describe('submitFeedbackListener', function () {
+    let mockTelemetry: TelemetryService
+
+    beforeEach(function () {
+        mockTelemetry = {} as any as TelemetryService
+    })
+
+    const testCases = [
+        { productName: 'Amazon Q', expectedError: 'Expected failure' },
+        { productName: 'AWS Toolkit', expectedError: 'Expected failure' },
+    ]
+    for (const { productName, expectedError } of testCases) {
+        it(`submits ${productName} feedback, disposes, and shows message on success`, async function () {
+            const postStub = sinon.stub()
+            mockTelemetry.postFeedback = postStub
+            const webview = new FeedbackWebview(mockTelemetry, productName)
+            await webview.submit(message)
+            const gotArgs = await waitUntil(
+                async () => {
+                    return postStub.lastCall.args?.[0]
+                },
+                { interval: 100 }
+            )
+            assert.deepStrictEqual(gotArgs, { comment: comment, sentiment: sentiment })
+            assert.ok(webview.isDisposed)
+        })
+        it(`submits ${productName} feedback and posts failure message on failure`, async function () {
+            const postStub = sinon.stub().rejects(new Error(expectedError))
+            mockTelemetry.postFeedback = postStub
+            const webview = new FeedbackWebview(mockTelemetry, productName)
+            const result = await webview.submit(message)
+            assert.strictEqual(result, expectedError)
+        })
+
+        it(`validates ${productName} feedback comment length is at least 188 characters`, async function () {
+            const postStub = sinon.stub()
+            mockTelemetry.postFeedback = postStub
+            const webview = new FeedbackWebview(mockTelemetry, productName)
+            const result = await webview.submit(shortMessage)
+            assert.strictEqual(result, 'Please add atleast 100 characters in the template describing your issue.')
+            assert.strictEqual(postStub.called, false, 'postFeedback should not be called for short comments')
+        })
+    }
+})
diff --git a/packages/core/src/test/globalSetup.test.ts b/packages/core/src/test/globalSetup.test.ts
new file mode 100644
index 00000000000..c4f6e6f0839
--- /dev/null
+++ b/packages/core/src/test/globalSetup.test.ts
@@ -0,0 +1,204 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Before/After hooks for all "unit" tests
+ */
+import assert from 'assert'
+import * as sinon from 'sinon'
+import vscode from 'vscode'
+import { join } from 'path'
+import globals from '../shared/extensionGlobals'
+import { CodelensRootRegistry } from '../shared/fs/codelensRootRegistry'
+import { CloudFormationTemplateRegistry } from '../shared/fs/templateRegistry'
+import { getLogger, LogLevel } from '../shared/logger'
+import { setLogger, TopicLogger } from '../shared/logger/logger'
+import { FakeExtensionContext } from './fakeExtensionContext'
+import { TestLogger } from './testLogger'
+import * as testUtil from './testUtil'
+import { getTestWindow, resetTestWindow } from './shared/vscode/window'
+import { mapTestErrors, normalizeError, setRunnableTimeout } from './setupUtil'
+import { TelemetryDebounceInfo } from '../shared/vscode/commands2'
+import { disableAwsSdkWarning } from '../shared/awsClientBuilder'
+import { GlobalState } from '../shared/globalState'
+import { FeatureConfigProvider } from '../shared/featureConfig'
+import { mockFeatureConfigsData } from './fake/mockFeatureConfigData'
+import { fs } from '../shared'
+import { promises as nodefs } from 'fs' // eslint-disable-line no-restricted-imports
+
+disableAwsSdkWarning()
+const testReportDir = join(__dirname, '../../../../../.test-reports') // Root project, not subproject
+const testLogOutput = join(testReportDir, 'testLog.log')
+const globalSandbox = sinon.createSandbox()
+const maxTestDuration = 30_000
+
+// Expectation: Tests are not run concurrently
+let testLogger: TestLogger | undefined
+let openExternalStub: sinon.SinonStub<Parameters<(typeof vscode)['env']['openExternal']>, Thenable<boolean>>
+// let executeCommandSpy: sinon.SinonSpy | undefined
+
+export async function mochaGlobalSetup(extensionId: string) {
+    return async function (this: Mocha.Runner) {
+        // Clean up and set up test logs
+        // Use nodefs instead of our fs module (which uses globals.isWeb, which is not initialized yet).
+        await nodefs.rm(testLogOutput, { force: true })
+        await nodefs.mkdir(testReportDir, { recursive: true })
+
+        sinon.stub(FeatureConfigProvider.prototype, 'listFeatureEvaluations').resolves({
+            featureEvaluations: mockFeatureConfigsData,
+        })
+
+        // Shows the full error chain when tests fail
+        mapTestErrors(this, normalizeError)
+        const ext = vscode.extensions.getExtension(extensionId)
+        if (!ext) {
+            setTimeout(() => process.exit(1), 4000) // Test process will hang otherwise, but give time to report thrown error.
+            throw new Error(
+                `Could not activate extension for tests: ${extensionId} not found. Is 'extensionDevelopmentPath' configured correctly?` +
+                    ' Does the path have a proper vscode extension package.json?'
+            )
+        }
+        await ext.activate()
+
+        const fakeContext = await FakeExtensionContext.create()
+        fakeContext.globalStorageUri = (await testUtil.createTestWorkspaceFolder('globalStoragePath')).uri
+        fakeContext.extensionPath = globals.context.extensionPath
+        Object.assign(globals, {
+            context: fakeContext,
+            // eslint-disable-next-line aws-toolkits/no-banned-usages
+            globalState: new GlobalState(fakeContext.globalState),
+        })
+    }
+}
+
+export async function mochaGlobalTeardown(this: Mocha.Context) {
+    await testUtil.deleteTestTempDirs()
+}
+
+export const mochaHooks = {
+    async beforeEach(this: Mocha.Context) {
+        // Set every test up so that TestLogger is the logger used by toolkit code
+        testLogger = setupTestLogger()
+        globals.templateRegistry = (async () => new CloudFormationTemplateRegistry())()
+        globals.codelensRootRegistry = new CodelensRootRegistry()
+
+        // In general, we do not want to "fake" the `vscode` API. The only exception is for things
+        // that _require_ user input apart of a workflow. Even then, these replacements are intended
+        // to be minimally intrusive and as close to the real thing as possible.
+        globalSandbox.replace(vscode, 'window', getTestWindow())
+        openExternalStub = globalSandbox.stub(vscode.env, 'openExternal')
+        openExternalStub.returns(undefined as any) // Detected in afterEach() below.
+
+        // Wraps the test function to bubble up errors that occurred in events from `TestWindow`
+        if (this.currentTest?.fn) {
+            setRunnableTimeout(this.currentTest, maxTestDuration)
+        }
+
+        // Enable telemetry features for tests. The metrics won't actually be posted.
+        await globals.telemetry.setTelemetryEnabled(true)
+        globals.telemetry.clearRecords()
+        globals.telemetry.logger.clear()
+        TelemetryDebounceInfo.instance.clear()
+
+        // mochaGlobalSetup() set this to a fake, so it's safe to clear it here.
+        await globals.globalState.clear()
+
+        await testUtil.closeAllEditors()
+        await fs.delete(globals.context.globalStorageUri.fsPath, { recursive: true, force: true })
+        await fs.mkdir(globals.context.globalStorageUri.fsPath)
+    },
+    async afterEach(this: Mocha.Context) {
+        if (openExternalStub.called && openExternalStub.returned(sinon.match.typeOf('undefined'))) {
+            throw new Error(
+                `Test called openExternal(${
+                    getOpenExternalStub().args[0]
+                }) without first configuring getOpenExternalStub().resolves().`
+            )
+        }
+
+        // Prevent other tests from using the same TestLogger instance
+        await teardownTestLogger(this.currentTest?.fullTitle() as string)
+        testLogger = undefined
+        resetTestWindow()
+        const r = await globals.templateRegistry
+        r.dispose()
+        globals.codelensRootRegistry.dispose()
+        globalSandbox.restore()
+
+        // executeCommandSpy = undefined
+    },
+}
+
+/**
+ * Provides the TestLogger to tests that want to access it.
+ * Verifies that the TestLogger instance is still the one set as the toolkit's logger.
+ */
+export function getTestLogger(): TestLogger {
+    const logger = getLogger() instanceof TopicLogger ? (getLogger() as TopicLogger).logger : getLogger()
+    assert.strictEqual(logger, testLogger, 'The expected test logger is not the current logger')
+    assert.ok(testLogger, 'TestLogger was expected to exist')
+
+    return logger!
+}
+
+function setupTestLogger(): TestLogger {
+    // write the same logger to each channel.
+    // That way, we don't have to worry about which channel is being logged to for inspection.
+    const logger = new TestLogger()
+    setLogger(logger, 'main')
+    setLogger(logger, 'debugConsole')
+
+    return logger
+}
+
+async function teardownTestLogger(testName: string) {
+    await writeLogsToFile(testName)
+
+    setLogger(undefined, 'main')
+    setLogger(undefined, 'debugConsole')
+}
+
+async function writeLogsToFile(testName: string) {
+    const entries = testLogger?.getLoggedEntries()
+    entries?.unshift(`=== Starting test "${testName}" ===`)
+    entries?.push(`=== Ending test "${testName}" ===\n\n`)
+    await fs.appendFile(testLogOutput, entries?.join('\n') ?? '')
+}
+
+export function assertLogsContainAllOf(keywords: string[], exactMatch: boolean, severity: LogLevel) {
+    return keywords.map((k) => assertLogsContain(k, exactMatch, severity))
+}
+
+// TODO: merge this with `toolkitLogger.test.ts:checkFile`
+export function assertLogsContain(text: string, exactMatch: boolean, severity: LogLevel) {
+    const logs = getTestLogger().getLoggedEntries(severity)
+    assert.ok(
+        logs.some((e) =>
+            e instanceof Error
+                ? exactMatch
+                    ? e.message === text
+                    : e.message.includes(text)
+                : exactMatch
+                  ? e === text
+                  : e.includes(text)
+        ),
+        `Expected to find "${text}" in the logs as type "${severity}"`
+    )
+}
+
+export function getOpenExternalStub(): typeof openExternalStub {
+    return openExternalStub
+}
+
+// /**
+//  * Returns a spy for `vscode.commands.executeCommand()`.
+//  *
+//  * Opt-in per test, because most tests should test application state instead of spies.
+//  * Global `afterEach` automatically calls `globalSandbox.restore()` after the test run.
+//  */
+// export function stubVscodeExecuteCommand() {
+//     executeCommandSpy = executeCommandSpy ?? globalSandbox.spy(vscode.commands, 'executeCommand')
+//     return executeCommandSpy
+// }
diff --git a/packages/core/src/test/index.ts b/packages/core/src/test/index.ts
new file mode 100644
index 00000000000..c682b1f367e
--- /dev/null
+++ b/packages/core/src/test/index.ts
@@ -0,0 +1,26 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Some imports in this file are node compatible only.
+ * For web-based test imports, see {@link file://./../testWeb/index.ts}
+ */
+
+export { registerAuthHook, using } from './setupUtil'
+export { runTests } from './testRunner'
+export { MockDocument } from './fake/fakeDocument'
+export { FakeMemento, FakeExtensionContext } from './fakeExtensionContext'
+export { Stub, stub } from './utilities/stubber'
+export { getTestWindow } from './shared/vscode/window'
+export { SeverityLevel } from './shared/vscode/message'
+export { getTestLogger } from './globalSetup.test'
+export { testCommand } from './shared/vscode/testUtils'
+export { FakeAwsContext } from './utilities/fakeAwsContext'
+export { getTestWorkspaceFolder } from '../testInteg/integrationTestsUtilities'
+export * from './codewhisperer/testUtil'
+export * from './credentials/testUtil'
+export * from './testUtil'
+export * from './fake/mockFeatureConfigData'
+export * from './shared/ui/testUtils'
diff --git a/packages/core/src/test/lambda/activation.test.ts b/packages/core/src/test/lambda/activation.test.ts
new file mode 100644
index 00000000000..89c647e5f0c
--- /dev/null
+++ b/packages/core/src/test/lambda/activation.test.ts
@@ -0,0 +1,237 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { LambdaFunctionNode } from '../../lambda/explorer/lambdaFunctionNode'
+import * as treeNodeUtils from '../../shared/utilities/treeNodeUtils'
+import * as resourceNode from '../../awsService/appBuilder/explorer/nodes/resourceNode'
+import * as invokeLambdaModule from '../../lambda/vue/remoteInvoke/invokeLambda'
+import * as tailLogGroupModule from '../../awsService/cloudWatchLogs/commands/tailLogGroup'
+import { LogDataRegistry } from '../../awsService/cloudWatchLogs/registry/logDataRegistry'
+import * as searchLogGroupModule from '../../awsService/cloudWatchLogs/commands/searchLogGroup'
+
+const mockGeneratedLambdaNode: LambdaFunctionNode = {
+    functionName: 'generatedFunction',
+    regionCode: 'us-east-1',
+    configuration: {
+        FunctionName: 'generatedFunction',
+        FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:generatedFunction',
+    },
+} as LambdaFunctionNode
+
+const mockTreeNode = {
+    resource: {
+        deployedResource: { LogicalResourceId: 'TestFunction' },
+        region: 'us-east-1',
+        stackName: 'TestStack',
+        resource: { Id: 'TestFunction', Type: 'AWS::Serverless::Function' },
+    },
+}
+
+const mockLambdaNode: LambdaFunctionNode = {
+    functionName: 'testFunction',
+    regionCode: 'us-west-2',
+    configuration: {
+        FunctionName: 'testFunction',
+        FunctionArn: 'arn:aws:lambda:us-west-2:123456789012:function:testFunction',
+        LoggingConfig: {
+            LogGroup: '/aws/lambda/custom-log-group',
+        },
+    },
+} as LambdaFunctionNode
+
+describe('Lambda activation', () => {
+    let sandbox: sinon.SinonSandbox
+    let getSourceNodeStub: sinon.SinonStub
+    let generateLambdaNodeFromResourceStub: sinon.SinonStub
+    let invokeRemoteLambdaStub: sinon.SinonStub
+    let tailLogGroupStub: sinon.SinonStub
+    let isTreeNodeStub: sinon.SinonStub
+    let searchLogGroupStub: sinon.SinonStub
+    let registry: LogDataRegistry
+
+    beforeEach(async () => {
+        sandbox = sinon.createSandbox()
+        searchLogGroupStub = sandbox.stub(searchLogGroupModule, 'searchLogGroup')
+        registry = LogDataRegistry.instance
+        getSourceNodeStub = sandbox.stub(treeNodeUtils, 'getSourceNode')
+        generateLambdaNodeFromResourceStub = sandbox.stub(resourceNode, 'generateLambdaNodeFromResource')
+        invokeRemoteLambdaStub = sandbox.stub(invokeLambdaModule, 'invokeRemoteLambda')
+        tailLogGroupStub = sandbox.stub(tailLogGroupModule, 'tailLogGroup')
+        isTreeNodeStub = sandbox.stub(require('../../shared/treeview/resourceTreeDataProvider'), 'isTreeNode')
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+    describe('aws.appBuilder.searchLogs command', () => {
+        it('should handle LambdaFunctionNode directly', async () => {
+            getSourceNodeStub.returns(mockLambdaNode)
+            isTreeNodeStub.returns(false)
+            searchLogGroupStub.resolves()
+
+            const node = {}
+            await vscode.commands.executeCommand('aws.appBuilder.searchLogs', node)
+
+            assert(searchLogGroupStub.calledOnce)
+            assert(
+                searchLogGroupStub.calledWith(registry, 'AppBuilderSearchLogs', {
+                    regionName: 'us-west-2',
+                    groupName: '/aws/lambda/custom-log-group',
+                })
+            )
+        })
+
+        it('should generate LambdaFunctionNode from TreeNode when getSourceNode returns undefined', async () => {
+            getSourceNodeStub.returns(undefined)
+            isTreeNodeStub.returns(true)
+            generateLambdaNodeFromResourceStub.resolves(mockGeneratedLambdaNode)
+            searchLogGroupStub.resolves()
+
+            await vscode.commands.executeCommand('aws.appBuilder.searchLogs', mockTreeNode)
+
+            assert(generateLambdaNodeFromResourceStub.calledOnce)
+            assert(generateLambdaNodeFromResourceStub.calledWith(mockTreeNode.resource))
+            assert(searchLogGroupStub.calledOnce)
+            assert(
+                searchLogGroupStub.calledWith(registry, 'AppBuilderSearchLogs', {
+                    regionName: 'us-east-1',
+                    groupName: '/aws/lambda/generatedFunction',
+                })
+            )
+        })
+
+        it('should log error and throw ToolkitError when generateLambdaNodeFromResource fails', async () => {
+            getSourceNodeStub.returns(undefined)
+            isTreeNodeStub.returns(true)
+            generateLambdaNodeFromResourceStub.rejects(new Error('Failed to generate node'))
+            searchLogGroupStub.resolves()
+
+            await vscode.commands.executeCommand('aws.appBuilder.searchLogs', mockTreeNode)
+            assert(searchLogGroupStub.notCalled)
+        })
+    })
+
+    describe('aws.invokeLambda command', () => {
+        it('should handle LambdaFunctionNode directly from AWS Explorer', async () => {
+            isTreeNodeStub.returns(false)
+            invokeRemoteLambdaStub.resolves()
+
+            await vscode.commands.executeCommand('aws.invokeLambda', mockLambdaNode)
+
+            assert(invokeRemoteLambdaStub.calledOnce)
+            const callArgs = invokeRemoteLambdaStub.getCall(0).args
+            assert.strictEqual(callArgs[1].source, 'AwsExplorerRemoteInvoke')
+            assert.strictEqual(callArgs[1].functionNode, mockLambdaNode)
+        })
+
+        it('should generate LambdaFunctionNode from TreeNode when coming from AppBuilder', async () => {
+            isTreeNodeStub.returns(true)
+            getSourceNodeStub.returns(undefined)
+            generateLambdaNodeFromResourceStub.resolves(mockGeneratedLambdaNode)
+            invokeRemoteLambdaStub.resolves()
+
+            await vscode.commands.executeCommand('aws.invokeLambda', mockTreeNode)
+
+            assert(generateLambdaNodeFromResourceStub.calledOnce)
+            assert(generateLambdaNodeFromResourceStub.calledWith(mockTreeNode.resource))
+            assert(invokeRemoteLambdaStub.calledOnce)
+            const callArgs = invokeRemoteLambdaStub.getCall(0).args
+            assert.strictEqual(callArgs[1].source, 'AppBuilderRemoteInvoke')
+            assert.strictEqual(callArgs[1].functionNode, mockGeneratedLambdaNode)
+        })
+
+        it('should handle existing LambdaFunctionNode from TreeNode', async () => {
+            const mockTreeNode = {
+                resource: {},
+            }
+
+            isTreeNodeStub.returns(true)
+            getSourceNodeStub.returns(mockLambdaNode)
+            invokeRemoteLambdaStub.resolves()
+
+            await vscode.commands.executeCommand('aws.invokeLambda', mockTreeNode)
+
+            assert(generateLambdaNodeFromResourceStub.notCalled)
+            assert(invokeRemoteLambdaStub.calledOnce)
+            const callArgs = invokeRemoteLambdaStub.getCall(0).args
+            assert.strictEqual(callArgs[1].source, 'AppBuilderRemoteInvoke')
+            assert.strictEqual(callArgs[1].functionNode, mockLambdaNode)
+        })
+    })
+
+    describe('aws.appBuilder.tailLogs command', () => {
+        it('should handle LambdaFunctionNode directly', async () => {
+            isTreeNodeStub.returns(false)
+            getSourceNodeStub.returns(mockLambdaNode)
+            tailLogGroupStub.resolves()
+
+            await vscode.commands.executeCommand('aws.appBuilder.tailLogs', mockLambdaNode)
+
+            assert(tailLogGroupStub.calledOnce)
+            const callArgs = tailLogGroupStub.getCall(0).args
+            assert.strictEqual(callArgs[1], 'AwsExplorerLambdaNode')
+            assert.deepStrictEqual(callArgs[3], {
+                regionName: 'us-west-2',
+                groupName: '/aws/lambda/custom-log-group',
+            })
+            assert.deepStrictEqual(callArgs[4], { type: 'all' })
+        })
+
+        it('should generate LambdaFunctionNode from TreeNode when getSourceNode returns undefined', async () => {
+            const mockGeneratedLambdaNode: LambdaFunctionNode = {
+                functionName: 'generatedFunction',
+                regionCode: 'us-east-1',
+                configuration: {
+                    FunctionName: 'generatedFunction',
+                },
+            } as LambdaFunctionNode
+
+            isTreeNodeStub.returns(true)
+            getSourceNodeStub.returns(undefined)
+            generateLambdaNodeFromResourceStub.resolves(mockGeneratedLambdaNode)
+            tailLogGroupStub.resolves()
+
+            await vscode.commands.executeCommand('aws.appBuilder.tailLogs', mockTreeNode)
+
+            assert(generateLambdaNodeFromResourceStub.calledOnce)
+            assert(generateLambdaNodeFromResourceStub.calledWith(mockTreeNode.resource))
+            assert(tailLogGroupStub.calledOnce)
+            const callArgs = tailLogGroupStub.getCall(0).args
+            assert.strictEqual(callArgs[1], 'AppBuilder')
+            assert.deepStrictEqual(callArgs[3], {
+                regionName: 'us-east-1',
+                groupName: '/aws/lambda/generatedFunction',
+            })
+            assert.deepStrictEqual(callArgs[4], { type: 'all' })
+        })
+
+        it('should use correct source for TreeNode', async () => {
+            const mockLambdaNode: LambdaFunctionNode = {
+                functionName: 'testFunction',
+                regionCode: 'us-west-2',
+                configuration: {
+                    FunctionName: 'testFunction',
+                },
+            } as LambdaFunctionNode
+
+            const mockTreeNode = {
+                resource: {},
+            }
+
+            isTreeNodeStub.returns(true)
+            getSourceNodeStub.returns(mockLambdaNode)
+            tailLogGroupStub.resolves()
+
+            await vscode.commands.executeCommand('aws.appBuilder.tailLogs', mockTreeNode)
+
+            assert(tailLogGroupStub.calledOnce)
+            const callArgs = tailLogGroupStub.getCall(0).args
+            assert.strictEqual(callArgs[1], 'AppBuilder')
+        })
+    })
+})
diff --git a/packages/core/src/test/lambda/commands/copyLambdaUrl.test.ts b/packages/core/src/test/lambda/commands/copyLambdaUrl.test.ts
new file mode 100644
index 00000000000..acd3b98f052
--- /dev/null
+++ b/packages/core/src/test/lambda/commands/copyLambdaUrl.test.ts
@@ -0,0 +1,103 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { createStubInstance, SinonStubbedInstance, stub, SinonStub } from 'sinon'
+import { copyLambdaUrl, createLambdaFuncUrlPrompter, noLambdaFuncMessage } from '../../../lambda/commands/copyLambdaUrl'
+import { LambdaFunctionNode } from '../../../lambda/explorer/lambdaFunctionNode'
+import { DefaultLambdaClient, LambdaClient } from '../../../shared/clients/lambdaClient'
+import { addCodiconToString } from '../../../shared/utilities/textUtilities'
+import { env } from 'vscode'
+import { FunctionUrlConfig } from '@aws-sdk/client-lambda'
+import { createQuickPickPrompterTester } from '../../shared/ui/testUtils'
+import { getTestWindow } from '../../shared/vscode/window'
+
+/**
+ * Builds an instance of {@link FunctionUrlConfig} without the
+ * need to define all values.
+ *
+ * @param options key + value of {@link FunctionUrlConfig}
+ */
+export function buildFunctionUrlConfig(options: Partial<FunctionUrlConfig>): FunctionUrlConfig {
+    return {
+        AuthType: options.AuthType,
+        CreationTime: options.CreationTime,
+        FunctionArn: options.FunctionArn,
+        FunctionUrl: options.FunctionUrl,
+        LastModifiedTime: options.LastModifiedTime,
+    }
+}
+
+describe('copy lambda function URL to clipboard', async () => {
+    let client: SinonStubbedInstance<LambdaClient>
+    let node: Pick<LambdaFunctionNode, 'name' | 'regionCode'>
+    let quickPickUrlFunc: SinonStub
+
+    const nodeName = 'my-node-name'
+
+    beforeEach(async () => {
+        client = createStubInstance(DefaultLambdaClient)
+        quickPickUrlFunc = stub()
+
+        node = { name: nodeName, regionCode: 'myRegion' }
+    })
+
+    it('Single URL exists', async () => {
+        const urlConfig = buildFunctionUrlConfig({ FunctionUrl: 'url1', FunctionArn: 'arn1' })
+        client.getFunctionUrlConfigs.resolves([urlConfig])
+
+        await copyLambdaUrl(node, client)
+
+        assert.strictEqual(await env.clipboard.readText(), urlConfig.FunctionUrl)
+    })
+
+    it('Multiple URLs exists', async () => {
+        const expectedConfig = buildFunctionUrlConfig({ FunctionUrl: 'url1', FunctionArn: 'arn1' })
+        const urlConfigs = [expectedConfig, buildFunctionUrlConfig({ FunctionUrl: 'url2', FunctionArn: 'arn2' })]
+        client.getFunctionUrlConfigs.resolves(urlConfigs)
+        quickPickUrlFunc.resolves(expectedConfig.FunctionUrl)
+
+        await copyLambdaUrl(node, client, quickPickUrlFunc)
+
+        assert.deepStrictEqual(quickPickUrlFunc.args, [[urlConfigs]])
+        assert.strictEqual(await env.clipboard.readText(), expectedConfig.FunctionUrl)
+    })
+
+    describe("URL doesn't exist", async () => {
+        before(async () => {
+            await env.clipboard.writeText('') // clear clipboard
+        })
+
+        it(`URL doesn't exist`, async () => {
+            client.getFunctionUrlConfigs.resolves([])
+
+            await copyLambdaUrl(node, client)
+
+            assert.strictEqual(await env.clipboard.readText(), '')
+            getTestWindow().getFirstMessage().assertWarn(noLambdaFuncMessage)
+            assert.deepStrictEqual(getTestWindow().statusBar.messages, [
+                addCodiconToString('circle-slash', 'No URL for Lambda function.'),
+            ])
+        })
+    })
+})
+
+describe('lambda func url prompter', async () => {
+    it('prompts for lambda function ARN', async () => {
+        const configList: FunctionUrlConfig[] = [
+            <FunctionUrlConfig>{ FunctionUrl: 'url1', FunctionArn: 'arn1' },
+            <FunctionUrlConfig>{ FunctionUrl: 'url2', FunctionArn: 'arn2' },
+        ]
+        const prompter = createLambdaFuncUrlPrompter(configList)
+        const tester = createQuickPickPrompterTester(prompter)
+        tester.assertItems(
+            configList.map((c) => {
+                return { label: c.FunctionArn!, data: c.FunctionUrl } // order matters
+            })
+        )
+        tester.acceptItem(configList[1].FunctionArn!)
+        await tester.result(configList[1].FunctionUrl)
+    })
+})
diff --git a/src/test/lambda/commands/createNewSamApp.test.ts b/packages/core/src/test/lambda/commands/createNewSamApp.test.ts
similarity index 79%
rename from src/test/lambda/commands/createNewSamApp.test.ts
rename to packages/core/src/test/lambda/commands/createNewSamApp.test.ts
index 78f59acc483..c31f922483c 100644
--- a/src/test/lambda/commands/createNewSamApp.test.ts
+++ b/packages/core/src/test/lambda/commands/createNewSamApp.test.ts
@@ -1,14 +1,13 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as path from 'path'
 import * as pathutils from '../../../shared/utilities/pathUtils'
 import * as testutil from '../../testUtil'
 import * as vscode from 'vscode'
-import * as fs from 'fs-extra'
 import { FakeExtensionContext } from '../../fakeExtensionContext'
 import {
     addInitialLaunchConfiguration,
@@ -17,7 +16,6 @@ import {
     writeToolkitReadme,
 } from '../../../lambda/commands/createNewSamApp'
 import { LaunchConfiguration } from '../../../shared/debug/launchConfiguration'
-import { anything, capture, instance, mock, when } from 'ts-mockito'
 import { makeSampleSamTemplateYaml } from '../../shared/cloudformation/cloudformationTestUtils'
 import { makeTemporaryToolkitFolder, readFileAsString } from '../../../shared/filesystemUtilities'
 import { ExtContext } from '../../../shared/extensions'
@@ -28,7 +26,10 @@ import {
 import { normalize } from '../../../shared/utilities/pathUtils'
 import { getIdeProperties, isCloud9 } from '../../../shared/extensionUtilities'
 import globals from '../../../shared/extensionGlobals'
-import { Runtime } from '../../../shared/telemetry/telemetry'
+import { Runtime } from '@aws-sdk/client-lambda'
+import { stub } from '../../utilities/stubber'
+import sinon from 'sinon'
+import { fs } from '../../../shared'
 
 const templateYaml = 'template.yaml'
 
@@ -41,14 +42,18 @@ describe('createNewSamApp', function () {
     let fakeResponse: { location: vscode.Uri; name: string }
     let fakeTarget: string
     let fakeConfig: vscode.DebugConfiguration
+    let addDebugStub: sinon.SinonStub<any[], any>
 
     beforeEach(async function () {
-        mockLaunchConfiguration = mock()
+        mockLaunchConfiguration = stub(LaunchConfiguration, {
+            workspaceFolder: undefined,
+            scopedResource: vscode.Uri.parse(''),
+        })
         fakeContext = await FakeExtensionContext.getFakeExtContext()
         tempFolder = await makeTemporaryToolkitFolder()
         tempTemplate = vscode.Uri.file(path.join(tempFolder, 'test.yaml'))
         fakeTarget = path.join(tempFolder, templateYaml)
-        testutil.toFile('target file', fakeTarget)
+        await testutil.toFile('target file', fakeTarget)
 
         fakeWorkspaceFolder = {
             uri: vscode.Uri.file(path.dirname(tempFolder)),
@@ -69,13 +74,15 @@ describe('createNewSamApp', function () {
 
         fakeResponse = { location: fakeWorkspaceFolder.uri, name: path.basename(tempFolder) }
 
-        when(mockLaunchConfiguration.getDebugConfigurations()).thenReturn([fakeConfig])
-        when(mockLaunchConfiguration.addDebugConfigurations(anything())).thenResolve()
+        mockLaunchConfiguration.getDebugConfigurations = sinon.stub().returns([fakeConfig])
+        addDebugStub = sinon.stub().resolves()
+        mockLaunchConfiguration.addDebugConfigurations = addDebugStub
     })
 
     afterEach(async function () {
-        await fs.remove(tempFolder)
-        globals.templateRegistry.reset()
+        await fs.delete(tempFolder, { recursive: true })
+        const r = await globals.templateRegistry
+        r.reset()
     })
 
     describe('getProjectUri', function () {
@@ -86,10 +93,10 @@ describe('createNewSamApp', function () {
             )
         })
         it('returns the target ".yml" file when it exists', async function () {
-            fs.unlinkSync(fakeTarget)
+            await fs.delete(fakeTarget, { recursive: true })
             tempTemplate = vscode.Uri.file(path.join(tempFolder, 'test.yml'))
             fakeTarget = path.join(tempFolder, 'template.yml')
-            testutil.toFile('target file', fakeTarget)
+            await testutil.toFile('target file', fakeTarget)
             assert.strictEqual(
                 normalize((await getProjectUri(fakeResponse, samInitTemplateFiles))?.fsPath ?? ''),
                 normalize(fakeTarget)
@@ -105,20 +112,19 @@ describe('createNewSamApp', function () {
 
     describe('addInitialLaunchConfiguration', function () {
         it('produces and returns initial launch configurations', async function () {
-            testutil.toFile(makeSampleSamTemplateYaml(true), tempTemplate.fsPath)
+            await testutil.toFile(makeSampleSamTemplateYaml(true), tempTemplate.fsPath)
 
             // without runtime
-            await globals.templateRegistry.addItemToRegistry(tempTemplate)
+            await (await globals.templateRegistry).addItem(tempTemplate)
             const launchConfigs = await addInitialLaunchConfiguration(
                 fakeContext,
                 fakeWorkspaceFolder,
                 (await getProjectUri(fakeResponse, samInitTemplateFiles))!,
                 undefined,
-                instance(mockLaunchConfiguration)
+                mockLaunchConfiguration
             )
 
-            // eslint-disable-next-line @typescript-eslint/unbound-method
-            const [arg] = capture(mockLaunchConfiguration.addDebugConfigurations).last()
+            const [arg] = addDebugStub.lastCall.args
             assert.ok(
                 pathutils.areEqual(
                     fakeWorkspaceFolder.uri.fsPath,
@@ -128,7 +134,7 @@ describe('createNewSamApp', function () {
                 )
             )
             assert.ok(launchConfigs)
-            const matchingConfigs = launchConfigs?.filter(config => {
+            const matchingConfigs = launchConfigs?.filter((config) => {
                 return pathutils.areEqual(
                     fakeWorkspaceFolder.uri.fsPath,
                     (config.invokeTarget as TemplateTargetProperties).templatePath,
@@ -141,20 +147,19 @@ describe('createNewSamApp', function () {
         })
 
         it('produces and returns initial launch configurations with runtime', async function () {
-            testutil.toFile(makeSampleSamTemplateYaml(true), tempTemplate.fsPath)
+            await testutil.toFile(makeSampleSamTemplateYaml(true), tempTemplate.fsPath)
 
             // without runtime
-            await globals.templateRegistry.addItemToRegistry(tempTemplate)
+            await (await globals.templateRegistry).addItem(tempTemplate)
             const launchConfigs = (await addInitialLaunchConfiguration(
                 fakeContext,
                 fakeWorkspaceFolder,
                 tempTemplate,
                 'someruntime' as Runtime,
-                instance(mockLaunchConfiguration)
+                mockLaunchConfiguration
             )) as AwsSamDebuggerConfiguration[]
 
-            // eslint-disable-next-line @typescript-eslint/unbound-method
-            const [arg] = capture(mockLaunchConfiguration.addDebugConfigurations).last()
+            const [arg] = addDebugStub.lastCall.args
             assert.ok(
                 pathutils.areEqual(
                     fakeWorkspaceFolder.uri.fsPath,
@@ -164,7 +169,7 @@ describe('createNewSamApp', function () {
                 )
             )
             assert.ok(launchConfigs)
-            const matchingConfigs = launchConfigs?.filter(config => {
+            const matchingConfigs = launchConfigs?.filter((config) => {
                 return (
                     pathutils.areEqual(
                         fakeWorkspaceFolder.uri.fsPath,
@@ -179,15 +184,15 @@ describe('createNewSamApp', function () {
         })
 
         it('returns a blank array if it does not match any launch configs', async function () {
-            testutil.toFile(makeSampleSamTemplateYaml(true), tempTemplate.fsPath)
+            await testutil.toFile(makeSampleSamTemplateYaml(true), tempTemplate.fsPath)
 
-            await globals.templateRegistry.addItemToRegistry(tempTemplate)
+            await (await globals.templateRegistry).addItem(tempTemplate)
             const launchConfigs = await addInitialLaunchConfiguration(
                 fakeContext,
                 fakeWorkspaceFolder,
                 vscode.Uri.file(path.join(tempFolder, 'otherFolder', 'thisAintIt.yaml')),
                 undefined,
-                instance(mockLaunchConfiguration)
+                mockLaunchConfiguration
             )
             assert.deepStrictEqual(launchConfigs, [])
         })
@@ -195,15 +200,15 @@ describe('createNewSamApp', function () {
         it('produces a launch config when config has a relative path', async function () {
             ;(fakeConfig as any).invokeTarget.templatePath = 'test.yaml'
 
-            testutil.toFile(makeSampleSamTemplateYaml(true), tempTemplate.fsPath)
+            await testutil.toFile(makeSampleSamTemplateYaml(true), tempTemplate.fsPath)
 
-            await globals.templateRegistry.addItemToRegistry(tempTemplate)
+            await (await globals.templateRegistry).addItem(tempTemplate)
             const launchConfigs = await addInitialLaunchConfiguration(
                 fakeContext,
                 fakeWorkspaceFolder,
                 (await getProjectUri(fakeResponse, samInitTemplateFiles))!,
                 undefined,
-                instance(mockLaunchConfiguration)
+                mockLaunchConfiguration
             )
             assert.ok(launchConfigs?.length !== 0)
         })
@@ -226,21 +231,21 @@ describe('createNewSamApp', function () {
             const otherTemplate1: vscode.Uri = vscode.Uri.file(path.join(otherFolder1, 'test.yaml'))
             const otherTemplate2: vscode.Uri = vscode.Uri.file(path.join(otherFolder2, 'test.yaml'))
 
-            testutil.toFile(makeSampleSamTemplateYaml(true), tempTemplate.fsPath)
-            testutil.toFile(makeSampleSamTemplateYaml(true), otherTemplate1.fsPath)
-            testutil.toFile(makeSampleSamTemplateYaml(true), otherTemplate2.fsPath)
-            testutil.toFile('target file', path.join(otherFolder1, templateYaml))
+            await testutil.toFile(makeSampleSamTemplateYaml(true), tempTemplate.fsPath)
+            await testutil.toFile(makeSampleSamTemplateYaml(true), otherTemplate1.fsPath)
+            await testutil.toFile(makeSampleSamTemplateYaml(true), otherTemplate2.fsPath)
+            await testutil.toFile('target file', path.join(otherFolder1, templateYaml))
 
-            await globals.templateRegistry.addItemToRegistry(tempTemplate)
-            await globals.templateRegistry.addItemToRegistry(otherTemplate1)
-            await globals.templateRegistry.addItemToRegistry(otherTemplate2)
+            await (await globals.templateRegistry).addItem(tempTemplate)
+            await (await globals.templateRegistry).addItem(otherTemplate1)
+            await (await globals.templateRegistry).addItem(otherTemplate2)
 
             const launchConfigs1 = await addInitialLaunchConfiguration(
                 fakeContext,
                 fakeWorkspaceFolder,
                 (await getProjectUri(fakeResponse, samInitTemplateFiles))!,
                 undefined,
-                instance(mockLaunchConfiguration)
+                mockLaunchConfiguration
             )
 
             const launchConfigs2 = await addInitialLaunchConfiguration(
@@ -251,7 +256,7 @@ describe('createNewSamApp', function () {
                     samInitTemplateFiles
                 ))!,
                 undefined,
-                instance(mockLaunchConfiguration)
+                mockLaunchConfiguration
             )
 
             assert.notDeepStrictEqual(launchConfigs1, launchConfigs2)
diff --git a/packages/core/src/test/lambda/commands/deleteLambda.test.ts b/packages/core/src/test/lambda/commands/deleteLambda.test.ts
new file mode 100644
index 00000000000..8da82c2c21e
--- /dev/null
+++ b/packages/core/src/test/lambda/commands/deleteLambda.test.ts
@@ -0,0 +1,69 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { deleteLambda } from '../../../lambda/commands/deleteLambda'
+import { DefaultLambdaClient } from '../../../shared/clients/lambdaClient'
+import { getTestWindow } from '../../shared/vscode/window'
+import { stub } from '../../utilities/stubber'
+
+describe('deleteLambda', async function () {
+    function createLambdaClient() {
+        const client = stub(DefaultLambdaClient, { regionCode: 'region-1', userAgent: undefined })
+        client.deleteFunction.resolves()
+
+        return client
+    }
+
+    const buildDeleteRegExp = (name: string) => new RegExp(`delete.*${name}`)
+
+    it('throws if there is no function name', async function () {
+        await assert.rejects(deleteLambda({}, createLambdaClient()))
+    })
+
+    it('should delete lambda when confirmed', async function () {
+        const client = createLambdaClient()
+        const confirmDialog = getTestWindow().waitForMessage(buildDeleteRegExp('my-function'))
+
+        await Promise.all([
+            confirmDialog.then((dialog) => dialog.selectItem('Delete')),
+            deleteLambda({ FunctionName: 'my-function' }, client),
+        ])
+
+        assert.strictEqual(client.deleteFunction.callCount, 1)
+
+        // TODO(sijaden): remove `duration` from metric metadata (it's not metadata?)
+        // assertTelemetry('lambda_delete', { result: 'Succeeded' })
+    })
+
+    it('should not delete lambda when cancelled', async function () {
+        const client = createLambdaClient()
+        const confirmDialog = getTestWindow().waitForMessage(buildDeleteRegExp('another-function'))
+
+        await Promise.all([
+            confirmDialog.then((dialog) => dialog.close()),
+            deleteLambda({ FunctionName: 'another-function' }, client),
+        ])
+
+        assert.strictEqual(client.deleteFunction.callCount, 0)
+        // assertTelemetry('lambda_delete', { result: 'Cancelled' })
+    })
+
+    it('should handles errors gracefully', async function () {
+        const client = createLambdaClient()
+        const confirmDialog = getTestWindow().waitForMessage(buildDeleteRegExp('bad-name'))
+        const viewLogs = getTestWindow().waitForMessage(/There was an error/)
+
+        client.deleteFunction.rejects(new Error('Lambda function does not exist'))
+
+        await Promise.all([
+            viewLogs.then((dialog) => dialog.close()),
+            confirmDialog.then((dialog) => dialog.selectItem('Delete')),
+            deleteLambda({ FunctionName: 'bad-name' }, client),
+        ])
+
+        // assertTelemetry('lambda_delete', { result: 'Failed' })
+    })
+})
diff --git a/src/test/lambda/commands/downloadLambda.test.ts b/packages/core/src/test/lambda/commands/downloadLambda.test.ts
similarity index 78%
rename from src/test/lambda/commands/downloadLambda.test.ts
rename to packages/core/src/test/lambda/commands/downloadLambda.test.ts
index e6150204747..12b99b66eda 100644
--- a/src/test/lambda/commands/downloadLambda.test.ts
+++ b/packages/core/src/test/lambda/commands/downloadLambda.test.ts
@@ -1,10 +1,10 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import { openLambdaFile } from '../../../lambda/commands/downloadLambda'
-import * as assert from 'assert'
+import assert from 'assert'
 
 describe('downloadLambda', async function () {
     describe('openLambdaFile', async function () {
diff --git a/packages/core/src/test/lambda/commands/editLambda.test.ts b/packages/core/src/test/lambda/commands/editLambda.test.ts
new file mode 100644
index 00000000000..44d874c14fe
--- /dev/null
+++ b/packages/core/src/test/lambda/commands/editLambda.test.ts
@@ -0,0 +1,307 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import assert from 'assert'
+import * as sinon from 'sinon'
+import {
+    editLambda,
+    watchForUpdates,
+    promptForSync,
+    deployFromTemp,
+    getReadme,
+    deleteFilesInFolder,
+    overwriteChangesForEdit,
+} from '../../../lambda/commands/editLambda'
+import { LambdaFunction } from '../../../lambda/commands/uploadLambda'
+import * as downloadLambda from '../../../lambda/commands/downloadLambda'
+import * as uploadLambda from '../../../lambda/commands/uploadLambda'
+import * as utils from '../../../lambda/utils'
+import * as messages from '../../../shared/utilities/messages'
+import fs from '../../../shared/fs/fs'
+import { LambdaFunctionNodeDecorationProvider } from '../../../lambda/explorer/lambdaFunctionNodeDecorationProvider'
+import path from 'path'
+import globals from '../../../shared/extensionGlobals'
+import { lambdaTempPath } from '../../../lambda/utils'
+
+describe('editLambda', function () {
+    let mockLambda: LambdaFunction
+    let mockTemp: string
+    let mockUri: vscode.Uri
+
+    // Stub variables
+    let getFunctionInfoStub: sinon.SinonStub
+    let setFunctionInfoStub: sinon.SinonStub
+    let compareCodeShaStub: sinon.SinonStub
+    let downloadLambdaStub: sinon.SinonStub
+    let openLambdaFileStub: sinon.SinonStub
+    let runUploadDirectoryStub: sinon.SinonStub
+    let showConfirmationMessageStub: sinon.SinonStub
+    let createFileSystemWatcherStub: sinon.SinonStub
+    let existsDirStub: sinon.SinonStub
+    let mkdirStub: sinon.SinonStub
+    let promptDeployStub: sinon.SinonStub
+    let readdirStub: sinon.SinonStub
+    let readFileTextStub: sinon.SinonStub
+    let writeFileStub: sinon.SinonStub
+    let copyStub: sinon.SinonStub
+    let asAbsolutePathStub: sinon.SinonStub
+    let deleteStub: sinon.SinonStub
+
+    beforeEach(function () {
+        mockLambda = {
+            name: 'test-function',
+            region: 'us-east-1',
+            configuration: {
+                FunctionName: 'test-function',
+                CodeSha256: 'test-sha',
+                Runtime: 'nodejs18.x',
+            },
+        }
+        mockTemp = utils.getTempLocation(mockLambda.name, mockLambda.region)
+        mockUri = vscode.Uri.file(mockTemp)
+
+        // Create stubs
+        getFunctionInfoStub = sinon.stub(utils, 'getFunctionInfo').resolves(undefined)
+        setFunctionInfoStub = sinon.stub(utils, 'setFunctionInfo').resolves()
+        compareCodeShaStub = sinon.stub(utils, 'compareCodeSha').resolves(true)
+        downloadLambdaStub = sinon.stub(downloadLambda, 'downloadLambdaInLocation').resolves()
+        openLambdaFileStub = sinon.stub(downloadLambda, 'openLambdaFile').resolves()
+        runUploadDirectoryStub = sinon.stub(uploadLambda, 'runUploadDirectory').resolves()
+        showConfirmationMessageStub = sinon.stub(messages, 'showConfirmationMessage').resolves(true)
+        createFileSystemWatcherStub = sinon.stub(vscode.workspace, 'createFileSystemWatcher').returns({
+            onDidChange: sinon.stub(),
+            onDidCreate: sinon.stub(),
+            onDidDelete: sinon.stub(),
+            dispose: sinon.stub(),
+        } as any)
+        existsDirStub = sinon.stub(fs, 'existsDir').resolves(true)
+        mkdirStub = sinon.stub(fs, 'mkdir').resolves()
+        readdirStub = sinon.stub(fs, 'readdir').resolves([['file', vscode.FileType.File]])
+        promptDeployStub = sinon.stub().resolves(true)
+        sinon.replace(require('../../../lambda/commands/editLambda'), 'promptDeploy', promptDeployStub)
+        readFileTextStub = sinon.stub(fs, 'readFileText').resolves('# Lambda Edit README')
+        writeFileStub = sinon.stub(fs, 'writeFile').resolves()
+        copyStub = sinon.stub(fs, 'copy').resolves()
+        asAbsolutePathStub = sinon.stub(globals.context, 'asAbsolutePath').callsFake((p) => `/absolute/${p}`)
+        deleteStub = sinon.stub(fs, 'delete').resolves()
+
+        // Other stubs
+        sinon.stub(utils, 'getLambdaDetails').returns({ fileName: 'index.js', functionName: 'test-function' })
+        sinon.stub(fs, 'stat').resolves({ ctime: Date.now() } as any)
+        sinon.stub(vscode.workspace, 'saveAll').resolves(true)
+        sinon.stub(LambdaFunctionNodeDecorationProvider.prototype, 'addBadge').resolves()
+        sinon.stub(LambdaFunctionNodeDecorationProvider.prototype, 'removeBadge').resolves()
+        sinon.stub(LambdaFunctionNodeDecorationProvider, 'getInstance').returns({
+            addBadge: sinon.stub().resolves(),
+            removeBadge: sinon.stub().resolves(),
+        } as any)
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    describe('editLambda', function () {
+        it('returns early if folder already exists in workspace', async function () {
+            sinon.stub(vscode.workspace, 'workspaceFolders').value([{ uri: vscode.Uri.file(mockTemp) }])
+
+            const result = await editLambda(mockLambda)
+
+            assert.strictEqual(result, mockTemp)
+        })
+
+        it('downloads lambda when no local code exists', async function () {
+            await editLambda(mockLambda)
+
+            assert(downloadLambdaStub.calledOnce)
+        })
+
+        it('prompts for overwrite when local code differs from remote', async function () {
+            getFunctionInfoStub.resolves('old-sha')
+            compareCodeShaStub.resolves(false)
+
+            await editLambda(mockLambda)
+
+            assert(showConfirmationMessageStub.calledOnce)
+        })
+
+        it('opens existing file when user declines overwrite', async function () {
+            getFunctionInfoStub.resolves('old-sha')
+            compareCodeShaStub.resolves(false)
+            showConfirmationMessageStub.resolves(false)
+
+            // Specify that it's from the explorer because otherwise there's no need to open
+            await editLambda(mockLambda, 'explorer')
+
+            assert(openLambdaFileStub.calledOnce)
+        })
+
+        it('downloads lambda when directory exists but is empty', async function () {
+            getFunctionInfoStub.resolves('old-sha')
+            readdirStub.resolves([])
+
+            await editLambda(mockLambda)
+
+            assert(downloadLambdaStub.calledOnce)
+            assert(showConfirmationMessageStub.notCalled)
+        })
+
+        it('downloads lambda when directory does not exist', async function () {
+            getFunctionInfoStub.resolves('old-sha')
+            existsDirStub.resolves(false)
+
+            await editLambda(mockLambda)
+
+            assert(downloadLambdaStub.calledOnce)
+            assert(showConfirmationMessageStub.notCalled)
+        })
+
+        it('sets up file watcher after download', async function () {
+            const watcherStub = {
+                onDidChange: sinon.stub(),
+                onDidCreate: sinon.stub(),
+                onDidDelete: sinon.stub(),
+            }
+            createFileSystemWatcherStub.returns(watcherStub)
+
+            await editLambda(mockLambda)
+
+            assert(watcherStub.onDidChange.calledOnce)
+            assert(watcherStub.onDidCreate.calledOnce)
+            assert(watcherStub.onDidDelete.calledOnce)
+        })
+    })
+
+    describe('watchForUpdates', function () {
+        it('creates file system watcher with correct pattern', function () {
+            const watcher = {
+                onDidChange: sinon.stub(),
+                onDidCreate: sinon.stub(),
+                onDidDelete: sinon.stub(),
+            }
+            createFileSystemWatcherStub.returns(watcher)
+
+            watchForUpdates(mockLambda, mockUri)
+
+            assert(createFileSystemWatcherStub.calledOnce)
+            const pattern = createFileSystemWatcherStub.firstCall.args[0]
+            assert(pattern instanceof vscode.RelativePattern)
+        })
+
+        it('sets up change, create, and delete handlers', function () {
+            const watcher = {
+                onDidChange: sinon.stub(),
+                onDidCreate: sinon.stub(),
+                onDidDelete: sinon.stub(),
+            }
+            createFileSystemWatcherStub.returns(watcher)
+
+            watchForUpdates(mockLambda, mockUri)
+
+            assert(watcher.onDidChange.calledOnce)
+            assert(watcher.onDidCreate.calledOnce)
+            assert(watcher.onDidDelete.calledOnce)
+        })
+    })
+
+    describe('promptForSync', function () {
+        it('returns early if directory does not exist', async function () {
+            existsDirStub.resolves(false)
+
+            await promptForSync(mockLambda, mockUri, vscode.Uri.file('/test/file.js'))
+
+            assert(setFunctionInfoStub.notCalled)
+        })
+    })
+
+    describe('deployFromTemp', function () {
+        it('uploads without confirmation when code is up to date', async function () {
+            await deployFromTemp(mockLambda, mockUri)
+
+            assert(showConfirmationMessageStub.notCalled)
+            assert(runUploadDirectoryStub.calledOnce)
+        })
+
+        it('prompts for confirmation when code is outdated', async function () {
+            compareCodeShaStub.resolves(false)
+
+            await deployFromTemp(mockLambda, mockUri)
+
+            assert(showConfirmationMessageStub.calledOnce)
+        })
+
+        it('does not upload when user declines overwrite', async function () {
+            compareCodeShaStub.resolves(false)
+            showConfirmationMessageStub.resolves(false)
+
+            await deployFromTemp(mockLambda, mockUri)
+
+            assert(runUploadDirectoryStub.notCalled)
+        })
+
+        it('updates function info after successful upload', async function () {
+            await deployFromTemp(mockLambda, mockUri)
+
+            assert(runUploadDirectoryStub.calledOnce)
+            assert(
+                setFunctionInfoStub.calledWith(mockLambda, {
+                    lastDeployed: sinon.match.number,
+                    undeployed: false,
+                })
+            )
+        })
+    })
+
+    describe('deleteFilesInFolder', function () {
+        it('deletes all files in the specified folder', async function () {
+            readdirStub.resolves([
+                ['file1.js', vscode.FileType.File],
+                ['file2.js', vscode.FileType.File],
+            ])
+
+            await deleteFilesInFolder(path.join('test', 'folder'))
+
+            assert(deleteStub.calledTwice)
+            assert(deleteStub.calledWith(path.join('test', 'folder', 'file1.js'), { recursive: true, force: true }))
+            assert(deleteStub.calledWith(path.join('test', 'folder', 'file2.js'), { recursive: true, force: true }))
+        })
+    })
+
+    describe('overwriteChangesForEdit', function () {
+        it('clears directory and downloads lambda code', async function () {
+            await overwriteChangesForEdit(mockLambda, mockTemp)
+
+            assert(readdirStub.calledWith(mockTemp))
+            assert(downloadLambdaStub.calledWith(mockLambda, 'local', mockTemp))
+            assert(setFunctionInfoStub.calledWith(mockLambda, sinon.match.object))
+        })
+
+        it('creates directory if it does not exist', async function () {
+            existsDirStub.resolves(false)
+
+            await overwriteChangesForEdit(mockLambda, mockTemp)
+
+            assert(mkdirStub.calledWith(mockTemp))
+        })
+    })
+
+    describe('getReadme', function () {
+        it('reads markdown file and writes README.md to temp path', async function () {
+            const result = await getReadme()
+
+            assert(readFileTextStub.calledOnce)
+            assert(asAbsolutePathStub.calledWith(path.join('resources', 'markdown', 'lambdaEdit.md')))
+            assert(writeFileStub.calledWith(path.join(lambdaTempPath, 'README.md'), '# Lambda Edit README'))
+            assert.strictEqual(result, path.join(lambdaTempPath, 'README.md'))
+        })
+
+        it('copies all required icon files', async function () {
+            await getReadme()
+
+            assert.strictEqual(copyStub.callCount, 3)
+        })
+    })
+})
diff --git a/packages/core/src/test/lambda/commands/listSamResources.test.ts b/packages/core/src/test/lambda/commands/listSamResources.test.ts
new file mode 100644
index 00000000000..428a04316eb
--- /dev/null
+++ b/packages/core/src/test/lambda/commands/listSamResources.test.ts
@@ -0,0 +1,113 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import sinon from 'sinon'
+import { getDeployedResources, StackResource } from '../../../lambda/commands/listSamResources'
+import * as SamCliListResourcesModule from '../../../shared/sam/cli/samCliListResources'
+import assert from 'assert'
+import { getTestWindow } from '../../shared/vscode/window'
+import { assertLogsContain } from '../../globalSetup.test'
+
+describe('listSamResources', () => {
+    const mockParams = { invoker: {}, listResourcesParams: {} }
+    describe('getDeployedResources', () => {
+        let sandbox: sinon.SinonSandbox
+        let runSamCliListResourceStub: sinon.SinonStub
+
+        beforeEach(() => {
+            sandbox = sinon.createSandbox()
+            runSamCliListResourceStub = sandbox.stub(SamCliListResourcesModule, 'runSamCliListResource')
+        })
+
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        it('returns only deployed resources given mixed resource returned from SAM api', async () => {
+            runSamCliListResourceStub.resolves(JSON.stringify([...localUndeployedResources, ...deployedResources]))
+            const result = await getDeployedResources(mockParams)
+
+            assert.deepStrictEqual(result, deployedResources)
+            assert(runSamCliListResourceStub.calledOnceWith(mockParams.invoker, mockParams.listResourcesParams))
+        })
+
+        it('returns empty array went given no deployed resources', async () => {
+            runSamCliListResourceStub.resolves(JSON.stringify(localUndeployedResources))
+            const result = await getDeployedResources(mockParams)
+
+            assert.strictEqual(result?.length, 0)
+            assert(runSamCliListResourceStub.calledOnce)
+        })
+
+        it('returns all resources went given all deployed resources', async () => {
+            runSamCliListResourceStub.resolves(JSON.stringify(deployedResources))
+            const result = await getDeployedResources(mockParams)
+
+            assert.deepStrictEqual(result, deployedResources)
+            assert(runSamCliListResourceStub.calledOnce)
+        })
+
+        it('return undefined given an unlikely error when calling SAM api', async () => {
+            runSamCliListResourceStub.rejects(new Error('Unlikely error'))
+            const result = await getDeployedResources(mockParams)
+
+            assert(!result)
+            assert(runSamCliListResourceStub.calledOnce)
+            assertLogsContain('Unlikely error', true, 'error')
+        })
+
+        const testcases = [
+            { name: 'stringify array', value: '[]' },
+            { name: 'array object', value: [] },
+        ]
+        // eslint-disable-next-line unicorn/no-array-for-each
+        testcases.forEach(async ({ name, value }) => {
+            it(`returns empty array given SAM CLI return ${name} given any issue`, async () => {
+                runSamCliListResourceStub.resolves(value)
+
+                const result = await getDeployedResources(mockParams)
+
+                assert.strictEqual(result?.length, 0)
+                assert(runSamCliListResourceStub.calledOnce)
+            })
+        })
+
+        it('returns empty array given issue parsing SAM CLI result', async () => {
+            runSamCliListResourceStub.resolves("[{'key':, 'wihtout':, 'value' }]")
+
+            const result = await getDeployedResources(mockParams)
+
+            assert.strictEqual(result?.length, 0)
+            getTestWindow().getFirstMessage().assertMessage(new RegExp(`Failed to parse SAM CLI output.*`))
+            assert(runSamCliListResourceStub.calledOnce)
+        })
+    })
+})
+
+const localUndeployedResources: StackResource[] = [
+    {
+        LogicalResourceId: 'myUndeployedLamdaFunction',
+        PhysicalResourceId: '-',
+    },
+    {
+        LogicalResourceId: 'myOtherLocalUndeployedLamdaFunction',
+        PhysicalResourceId: '-',
+    },
+]
+
+const deployedResources: StackResource[] = [
+    {
+        LogicalResourceId: 'myLamdaFunction',
+        PhysicalResourceId: 'myLamdaFunction-logical-id',
+    },
+    {
+        LogicalResourceId: 'myLamdaOtherFunction',
+        PhysicalResourceId: 'myLamdaOtherFunction-logical-id',
+    },
+    {
+        LogicalResourceId: 'myLamdaOtherResource',
+        PhysicalResourceId: 'myLamdaOtherResource-logical-id',
+    },
+]
diff --git a/packages/core/src/test/lambda/commands/uploadLambda.test.ts b/packages/core/src/test/lambda/commands/uploadLambda.test.ts
new file mode 100644
index 00000000000..e31fb9088fa
--- /dev/null
+++ b/packages/core/src/test/lambda/commands/uploadLambda.test.ts
@@ -0,0 +1,81 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import assert from 'assert'
+import * as path from 'path'
+import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
+import { findApplicationJsonFile, getFunctionNames } from '../../../lambda/commands/uploadLambda'
+import { assertEqualPaths, toFile } from '../../testUtil'
+import { fs } from '../../../shared'
+
+describe('uploadLambda', async function () {
+    let tempFolder: string
+    let folderUri: vscode.Uri
+    const dotApplicationJsonData = `{
+        "DeploymentMethod": "lambda",
+        "Functions": {
+            "sampleFunction": {
+                "PhysicalId": {
+                    "us-west-2": "sampleFunction-w2",
+                    "us-east-1": "sampleFunction-e1"
+                }
+            },
+            "differentFunction": {
+                "PhysicalId": {
+                    "us-east-1": "differentFunction-e1"
+                }
+            }
+        }
+    }`
+    beforeEach(async function () {
+        tempFolder = await makeTemporaryToolkitFolder()
+        folderUri = vscode.Uri.file(tempFolder)
+    })
+    afterEach(async function () {
+        await fs.delete(tempFolder, { recursive: true })
+    })
+
+    it('finds application.json file from dir path - flat', async function () {
+        await toFile('top secret data', path.join(tempFolder, '.application.json'))
+        assertEqualPaths(
+            (await findApplicationJsonFile(folderUri))?.fsPath ?? '',
+            path.join(tempFolder, '.application.json')
+        )
+    })
+
+    it('finds application.json file from dir path - nested', async function () {
+        const subfolder = path.join(tempFolder, 'one', 'two')
+        const appjsonPath = path.join(subfolder, '.application.json')
+        await toFile('top secret data', appjsonPath)
+
+        assertEqualPaths((await findApplicationJsonFile(folderUri))?.fsPath ?? '', appjsonPath)
+    })
+
+    it('finds application.json file from template file path', async function () {
+        const templateUri = vscode.Uri.file(path.join(tempFolder, 'template.yaml'))
+        const appjsonPath = path.join(tempFolder, '.application.json')
+        await toFile('SAM stuff...', templateUri.fsPath)
+        await toFile('top secret data', appjsonPath)
+
+        assertEqualPaths((await findApplicationJsonFile(templateUri))?.fsPath ?? '', appjsonPath)
+    })
+
+    it('lists functions from .application.json', async function () {
+        const filePath = path.join(tempFolder, '.application.json')
+        await toFile(dotApplicationJsonData, filePath)
+        const foundFunctions1 = await getFunctionNames(vscode.Uri.file(filePath), 'us-west-2')
+        const foundFunctions2 = await getFunctionNames(vscode.Uri.file(filePath), 'us-east-1')
+        assert.deepStrictEqual(foundFunctions1, ['sampleFunction-w2'])
+        assert.deepStrictEqual(foundFunctions2, ['sampleFunction-e1', 'differentFunction-e1'])
+    })
+
+    it('invalid .application.json', async function () {
+        const filePath = path.join(tempFolder, '.application.json')
+        const invalidJson = '{ "DeploymentMethod": "lambda", "Functions": { ?? } }'
+        await toFile(invalidJson, filePath)
+        assert.deepStrictEqual(await getFunctionNames(vscode.Uri.file(filePath), 'us-west-2'), undefined)
+        assert.deepStrictEqual(await getFunctionNames(vscode.Uri.file(filePath), 'us-east-1'), undefined)
+    })
+})
diff --git a/packages/core/src/test/lambda/config/samParameterCompletionItemProvider.test.ts b/packages/core/src/test/lambda/config/samParameterCompletionItemProvider.test.ts
new file mode 100644
index 00000000000..cdd01be8e41
--- /dev/null
+++ b/packages/core/src/test/lambda/config/samParameterCompletionItemProvider.test.ts
@@ -0,0 +1,399 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as path from 'path'
+import * as vscode from 'vscode'
+import {
+    SamParameterCompletionItemProvider,
+    SamParameterCompletionItemProviderContext,
+} from '../../../lambda/config/samParameterCompletionItemProvider'
+import * as CloudFormation from '../../../shared/cloudformation/cloudformation'
+import { Logger } from '../../../shared/logger'
+
+function getTestProviderWithTemplate(
+    template: CloudFormation.Template,
+    templatesSymbol: vscode.DocumentSymbol
+): SamParameterCompletionItemProvider {
+    return new SamParameterCompletionItemProvider(
+        new MockSamParamComplItemProviderContext({
+            executeCommand: async <T>() => [templatesSymbol] as any as T,
+            getWorkspaceFolder: () => ({ uri: vscode.Uri.file('') }) as any as vscode.WorkspaceFolder,
+            loadTemplate: async () => template,
+        })
+    )
+}
+
+async function getProvidedItems(
+    document: vscode.TextDocument,
+    provider: SamParameterCompletionItemProvider,
+    position: vscode.Position
+) {
+    return await provider.provideCompletionItems(
+        document,
+        position,
+        {} as any as vscode.CancellationToken,
+        {} as any as vscode.CompletionContext
+    )
+}
+
+function createTemplatesSymbol({
+    uri = vscode.Uri.file(path.join('my', 'template', 'uri')),
+    includeOverrides = false,
+    parameterName,
+}: {
+    uri?: vscode.Uri
+    includeOverrides?: boolean
+    parameterName?: string
+}) {
+    const templatesSymbol = new vscode.DocumentSymbol(
+        'templates',
+        'myDetail',
+        vscode.SymbolKind.Object,
+        new vscode.Range(0, 0, 10, 0),
+        new vscode.Range(0, 0, 0, 10)
+    )
+
+    if (!uri) {
+        return templatesSymbol
+    }
+
+    const templateSymbol = new vscode.DocumentSymbol(
+        uri.fsPath,
+        'myDetail',
+        vscode.SymbolKind.Object,
+        new vscode.Range(1, 0, 9, 0),
+        new vscode.Range(1, 0, 1, 10)
+    )
+    templatesSymbol.children.push(templateSymbol)
+
+    if (!includeOverrides) {
+        return templatesSymbol
+    }
+
+    const parameterOverridesSymbol = new vscode.DocumentSymbol(
+        'parameterOverrides',
+        'myDetail',
+        vscode.SymbolKind.Object,
+        new vscode.Range(2, 0, 8, 0),
+        new vscode.Range(2, 0, 2, 10)
+    )
+    templateSymbol.children.push(parameterOverridesSymbol)
+
+    if (!parameterName) {
+        return templatesSymbol
+    }
+
+    const parameterOverrideSymbol = new vscode.DocumentSymbol(
+        parameterName,
+        'myDetail',
+        vscode.SymbolKind.Property,
+        new vscode.Range(3, 0, 7, 0),
+        new vscode.Range(3, 0, 3, 10)
+    )
+    parameterOverridesSymbol.children.push(parameterOverrideSymbol)
+
+    return templatesSymbol
+}
+
+class MockSamParamComplItemProviderContext implements SamParameterCompletionItemProviderContext {
+    public readonly logger: Pick<Logger, 'warn'>
+    public readonly getWorkspaceFolder: typeof vscode.workspace.getWorkspaceFolder
+    public readonly executeCommand: typeof vscode.commands.executeCommand
+    public readonly loadTemplate: typeof CloudFormation.load
+
+    public constructor({
+        logger = {
+            warn(...message: (Error | string)[]): number {
+                return 0
+            },
+        },
+        getWorkspaceFolder = (uri) => undefined,
+        executeCommand = async (command, ...rest) => undefined as any,
+        loadTemplate = async () => ({}),
+    }: Partial<SamParameterCompletionItemProviderContext>) {
+        this.logger = logger
+        this.getWorkspaceFolder = getWorkspaceFolder
+        this.executeCommand = executeCommand
+        this.loadTemplate = loadTemplate
+    }
+}
+
+describe('SamParameterCompletionItemProvider', async function () {
+    it('recovers gracefully if document is not in a workspace', async function () {
+        const warnArgs: (Error | string)[][] = []
+        const provider = new SamParameterCompletionItemProvider(
+            new MockSamParamComplItemProviderContext({
+                logger: {
+                    warn(...message: (Error | string)[]) {
+                        warnArgs.push(message)
+                        return 0
+                    },
+                },
+            })
+        )
+
+        const document: vscode.TextDocument = {
+            uri: vscode.Uri.file(path.join('my', 'path')),
+        } as any as vscode.TextDocument
+        const actualItems = await getProvidedItems(document, provider, new vscode.Position(0, 0))
+
+        assert.ok(actualItems)
+        assert.strictEqual(actualItems.length, 0)
+        assert.strictEqual(warnArgs.length, 1)
+        assert.strictEqual(warnArgs[0].length, 1)
+        assert.strictEqual(
+            warnArgs[0][0],
+            `Cannot provide completion items for '${document.uri.fsPath}' beacuse it is not in the workspace.`
+        )
+    })
+
+    it('does not provide suggestions if document symbols could not be loaded', async function () {
+        const provider = new SamParameterCompletionItemProvider(
+            new MockSamParamComplItemProviderContext({
+                executeCommand: async () => undefined as any,
+                getWorkspaceFolder: () => ({ uri: vscode.Uri.file('') }) as any as vscode.WorkspaceFolder,
+            })
+        )
+
+        const document: vscode.TextDocument = {
+            uri: vscode.Uri.file(path.join('my', 'path')),
+        } as any as vscode.TextDocument
+        const actualItems = await getProvidedItems(document, provider, new vscode.Position(0, 0))
+
+        assert.ok(actualItems)
+        assert.strictEqual(actualItems.length, 0)
+    })
+
+    it('does not provide suggestions if no matching template is found', async function () {
+        const provider = new SamParameterCompletionItemProvider(
+            new MockSamParamComplItemProviderContext({
+                executeCommand: async <T>() => [] as any as T,
+                getWorkspaceFolder: () => ({ uri: vscode.Uri.file('') }) as any as vscode.WorkspaceFolder,
+            })
+        )
+
+        const document: vscode.TextDocument = {
+            uri: vscode.Uri.file(path.join('my', 'path')),
+        } as any as vscode.TextDocument
+        const actualItems = await getProvidedItems(document, provider, new vscode.Position(0, 0))
+
+        assert.ok(actualItems)
+        assert.strictEqual(actualItems.length, 0)
+    })
+
+    it('suggests all parameter names if user has not started typing the parameter name', async function () {
+        const templatesSymbol = createTemplatesSymbol({
+            includeOverrides: true,
+            parameterName: 'myParamName',
+        })
+
+        const template: CloudFormation.Template = {
+            Parameters: {
+                MyParamName1: {
+                    Type: 'String',
+                },
+                MyParamName2: {
+                    Type: 'String',
+                },
+            },
+        }
+        const provider = getTestProviderWithTemplate(template, templatesSymbol)
+
+        const document: vscode.TextDocument = {
+            uri: vscode.Uri.file(path.join('.aws', 'templates.json')),
+            getWordRangeAtPosition: () => new vscode.Range(3, 0, 3, 10),
+            getText: () => '',
+        } as any as vscode.TextDocument
+
+        const actualItems = await getProvidedItems(document, provider, new vscode.Position(3, 0))
+
+        assert.ok(actualItems)
+        assert.strictEqual(actualItems.length, 2)
+        assert.strictEqual(actualItems[0].insertText, 'MyParamName1')
+        assert.strictEqual(actualItems[1].insertText, 'MyParamName2')
+    })
+
+    it('suggests only matching parameter names if user has started typing the parameter name', async function () {
+        const templatesSymbol = createTemplatesSymbol({
+            includeOverrides: true,
+            parameterName: 'myParamName',
+        })
+
+        const template: CloudFormation.Template = {
+            Parameters: {
+                MyParamName1: {
+                    Type: 'String',
+                },
+                MyParamName2: {
+                    Type: 'String',
+                },
+                MyOtherParamName: {
+                    Type: 'String',
+                },
+            },
+        }
+        const provider = getTestProviderWithTemplate(template, templatesSymbol)
+
+        const document: vscode.TextDocument = {
+            uri: vscode.Uri.file(path.join('.aws', 'templates.json')),
+            getWordRangeAtPosition: () => new vscode.Range(3, 0, 3, 10),
+            getText: () => 'MyParamName',
+        } as any as vscode.TextDocument
+
+        const actualItems = await getProvidedItems(document, provider, new vscode.Position(3, 0))
+
+        assert.ok(actualItems)
+        assert.strictEqual(actualItems.length, 2)
+        assert.strictEqual(actualItems[0].insertText, 'MyParamName1')
+        assert.strictEqual(actualItems[1].insertText, 'MyParamName2')
+    })
+
+    it('recovers gracefully if templates.json is empty or invalid', async function () {
+        const provider = new SamParameterCompletionItemProvider(
+            new MockSamParamComplItemProviderContext({
+                executeCommand: async <T>() => undefined as any,
+                getWorkspaceFolder: () => ({ uri: vscode.Uri.file('') }) as any as vscode.WorkspaceFolder,
+            })
+        )
+
+        const actualItems = await getProvidedItems(
+            { uri: vscode.Uri.file(path.join('.aws', 'templates.json')) } as any as vscode.TextDocument,
+            provider,
+            new vscode.Position(0, 0)
+        )
+
+        assert.ok(actualItems)
+        assert.strictEqual(actualItems.length, 0)
+    })
+
+    it('recovers gracefully if cursor is not within the `templates` property', async function () {
+        const templatesSymbol = createTemplatesSymbol({
+            includeOverrides: true,
+            parameterName: 'myParamName',
+        })
+
+        const template: CloudFormation.Template = {
+            Parameters: {
+                MyParamName1: {
+                    Type: 'String',
+                },
+                MyParamName2: {
+                    Type: 'String',
+                },
+                MyOtherParamName: {
+                    Type: 'String',
+                },
+            },
+        }
+        const provider = getTestProviderWithTemplate(template, templatesSymbol)
+
+        const document: vscode.TextDocument = {
+            uri: vscode.Uri.file(path.join('.aws', 'templates.json')),
+            getWordRangeAtPosition: () => new vscode.Range(3, 0, 3, 10),
+            getText: () => 'MyParamName',
+        } as any as vscode.TextDocument
+
+        const actualItems = await getProvidedItems(document, provider, new vscode.Position(11, 0))
+
+        assert.ok(actualItems)
+        assert.strictEqual(actualItems.length, 0)
+    })
+
+    it('recovers gracefully if `parameterOverrides` is not defined for this template', async function () {
+        const templatesSymbol = createTemplatesSymbol({})
+        const template: CloudFormation.Template = {
+            Parameters: {
+                MyParamName1: {
+                    Type: 'String',
+                },
+                MyParamName2: {
+                    Type: 'String',
+                },
+                MyOtherParamName: {
+                    Type: 'String',
+                },
+            },
+        }
+        const provider = getTestProviderWithTemplate(template, templatesSymbol)
+
+        const document: vscode.TextDocument = {
+            uri: vscode.Uri.file(path.join('.aws', 'templates.json')),
+            getWordRangeAtPosition: () => new vscode.Range(3, 0, 3, 10),
+            getText: () => 'MyParamName',
+        } as any as vscode.TextDocument
+
+        const actualItems = await getProvidedItems(document, provider, new vscode.Position(11, 0))
+
+        assert.ok(actualItems)
+        assert.strictEqual(actualItems.length, 0)
+    })
+
+    it('recovers gracefully if cursor is not within the `parameterOverrides` property', async function () {
+        const templatesSymbol = createTemplatesSymbol({
+            includeOverrides: true,
+            parameterName: 'myParamName',
+        })
+
+        const template: CloudFormation.Template = {
+            Parameters: {
+                MyParamName1: {
+                    Type: 'String',
+                },
+                MyParamName2: {
+                    Type: 'String',
+                },
+                MyOtherParamName: {
+                    Type: 'String',
+                },
+            },
+        }
+        const provider = getTestProviderWithTemplate(template, templatesSymbol)
+
+        const document: vscode.TextDocument = {
+            uri: vscode.Uri.file(path.join('.aws', 'templates.json')),
+            getWordRangeAtPosition: () => new vscode.Range(3, 0, 3, 10),
+            getText: () => 'MyParamName',
+        } as any as vscode.TextDocument
+
+        const actualItems = await getProvidedItems(document, provider, new vscode.Position(9, 0))
+
+        assert.ok(actualItems)
+        assert.strictEqual(actualItems.length, 0)
+    })
+
+    it('recovers gracefully if cursor is not within a property name within `parameterOverrides`', async function () {
+        const templatesSymbol = createTemplatesSymbol({
+            includeOverrides: true,
+            parameterName: 'myParamName',
+        })
+
+        const template: CloudFormation.Template = {
+            Parameters: {
+                MyParamName1: {
+                    Type: 'String',
+                },
+                MyParamName2: {
+                    Type: 'String',
+                },
+                MyOtherParamName: {
+                    Type: 'String',
+                },
+            },
+        }
+        const provider = getTestProviderWithTemplate(template, templatesSymbol)
+
+        const document: vscode.TextDocument = {
+            uri: vscode.Uri.file(path.join('.aws', 'templates.json')),
+            getWordRangeAtPosition: () => new vscode.Range(3, 0, 3, 10),
+            getText: () => 'MyParamName',
+        } as any as vscode.TextDocument
+
+        const actualItems = await getProvidedItems(document, provider, new vscode.Position(4, 0))
+
+        assert.ok(actualItems)
+        assert.strictEqual(actualItems.length, 0)
+    })
+})
diff --git a/src/test/lambda/config/templates.test.ts b/packages/core/src/test/lambda/config/templates.test.ts
similarity index 94%
rename from src/test/lambda/config/templates.test.ts
rename to packages/core/src/test/lambda/config/templates.test.ts
index cc52b5ce152..59c2ada308d 100644
--- a/src/test/lambda/config/templates.test.ts
+++ b/packages/core/src/test/lambda/config/templates.test.ts
@@ -1,10 +1,9 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
-import { mkdir, remove, writeFile } from 'fs-extra'
+import assert from 'assert'
 import * as path from 'path'
 import globals from '../../../shared/extensionGlobals'
 import * as vscode from 'vscode'
@@ -17,6 +16,7 @@ import {
 } from '../../../lambda/config/templates'
 import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
 import { makeSampleSamTemplateYaml } from '../../shared/cloudformation/cloudformationTestUtils'
+import { fs } from '../../../shared'
 
 class MockLoadTemplatesConfigContext {
     public readonly fileExists: (path: string) => Thenable<boolean>
@@ -24,9 +24,9 @@ class MockLoadTemplatesConfigContext {
     public readonly saveDocumentIfDirty: (editorPath: string) => Thenable<void>
 
     public constructor({
-        fileExists = async _path => true,
-        readFile = async _path => '',
-        saveDocumentIfDirty = async _path => {},
+        fileExists = async (_path) => true,
+        readFile = async (_path) => '',
+        saveDocumentIfDirty = async (_path) => {},
     }: Partial<LoadTemplatesConfigContext>) {
         this.fileExists = fileExists
         this.readFile = readFile
@@ -45,7 +45,7 @@ describe('templates', async function () {
             }`
 
             const context = new MockLoadTemplatesConfigContext({
-                readFile: async pathLike => rawJson,
+                readFile: async (pathLike) => rawJson,
             })
 
             const config = await load('', context)
@@ -72,7 +72,7 @@ describe('templates', async function () {
             }`
 
             const context = new MockLoadTemplatesConfigContext({
-                readFile: async pathLike => rawJson,
+                readFile: async (pathLike) => rawJson,
             })
 
             const config = await load('', context)
@@ -99,7 +99,7 @@ describe('templates', async function () {
 
         it('returns minimal config on missing file', async function () {
             const context = new MockLoadTemplatesConfigContext({
-                fileExists: async pathLike => false,
+                fileExists: async (pathLike) => false,
             })
 
             const config = await load('', context)
@@ -111,7 +111,7 @@ describe('templates', async function () {
 
         it('throws on error loading file', async function () {
             const context = new MockLoadTemplatesConfigContext({
-                readFile: async pathLike => {
+                readFile: async (pathLike) => {
                     throw new Error('oh no')
                 },
             })
@@ -130,7 +130,7 @@ describe('templates', async function () {
 
         it('gracefully handles invalid JSON', async function () {
             const context = new MockLoadTemplatesConfigContext({
-                readFile: async pathLike => '{',
+                readFile: async (pathLike) => '{',
             })
 
             try {
@@ -161,7 +161,7 @@ describe('templates', async function () {
             }`
 
             const context = new MockLoadTemplatesConfigContext({
-                readFile: async pathLike => rawJson,
+                readFile: async (pathLike) => rawJson,
             })
 
             const config = await load('', context)
@@ -178,7 +178,7 @@ describe('templates', async function () {
         it('reads the correct path', async function () {
             const readArgs: string[] = []
             const context = new MockLoadTemplatesConfigContext({
-                readFile: async pathLike => {
+                readFile: async (pathLike) => {
                     readArgs.push(pathLike)
 
                     return '{}'
@@ -196,12 +196,12 @@ describe('templates', async function () {
             let read: boolean = false
             let readBeforeSave: boolean = false
             const context = new MockLoadTemplatesConfigContext({
-                readFile: async pathLike => {
+                readFile: async (pathLike) => {
                     read = true
 
                     return '{}'
                 },
-                saveDocumentIfDirty: async pathLike => {
+                saveDocumentIfDirty: async (pathLike) => {
                     saveArgs.push(pathLike)
 
                     if (read) {
@@ -779,13 +779,14 @@ describe('getExistingConfiguration', async function () {
             index: 0,
         }
         tempConfigFolder = path.join(tempFolder, '.aws')
-        await mkdir(tempConfigFolder)
+        await fs.mkdir(tempConfigFolder)
         tempConfigFile = path.join(tempConfigFolder, 'templates.json')
     })
 
     afterEach(async function () {
-        await remove(tempFolder)
-        globals.templateRegistry.reset()
+        await fs.delete(tempFolder, { recursive: true })
+        const r = await globals.templateRegistry
+        r.reset()
     })
 
     it("returns undefined if the legacy config file doesn't exist", async () => {
@@ -794,15 +795,23 @@ describe('getExistingConfiguration', async function () {
     })
 
     it('returns undefined if the legacy config file is not valid JSON', async function () {
-        await writeFile(tempTemplateFile.fsPath, makeSampleSamTemplateYaml(true, { handler: matchedHandler }), 'utf8')
-        await writeFile(tempConfigFile, makeSampleSamTemplateYaml(true, { handler: matchedHandler }), 'utf8')
-        await globals.templateRegistry.addItemToRegistry(tempTemplateFile)
+        await fs.writeFile(
+            tempTemplateFile.fsPath,
+            makeSampleSamTemplateYaml(true, { handler: matchedHandler }),
+            'utf8'
+        )
+        await fs.writeFile(tempConfigFile, makeSampleSamTemplateYaml(true, { handler: matchedHandler }), 'utf8')
+        await (await globals.templateRegistry).addItem(tempTemplateFile)
         const val = await getExistingConfiguration(fakeWorkspaceFolder, matchedHandler, tempTemplateFile)
         assert.strictEqual(val, undefined)
     })
 
     it('returns data from the legacy config file', async function () {
-        await writeFile(tempTemplateFile.fsPath, makeSampleSamTemplateYaml(true, { handler: matchedHandler }), 'utf8')
+        await fs.writeFile(
+            tempTemplateFile.fsPath,
+            makeSampleSamTemplateYaml(true, { handler: matchedHandler }),
+            'utf8'
+        )
         const configData = {
             templates: {
                 'test.yaml': {
@@ -816,8 +825,8 @@ describe('getExistingConfiguration', async function () {
                 },
             },
         }
-        await writeFile(tempConfigFile, JSON.stringify(configData), 'utf8')
-        await globals.templateRegistry.addItemToRegistry(tempTemplateFile)
+        await fs.writeFile(tempConfigFile, JSON.stringify(configData), 'utf8')
+        await (await globals.templateRegistry).addItem(tempTemplateFile)
         const val = await getExistingConfiguration(fakeWorkspaceFolder, matchedHandler, tempTemplateFile)
         assert.ok(val)
         if (val) {
diff --git a/src/test/lambda/explorer/cloudFormationNodes.test.ts b/packages/core/src/test/lambda/explorer/cloudFormationNodes.test.ts
similarity index 84%
rename from src/test/lambda/explorer/cloudFormationNodes.test.ts
rename to packages/core/src/test/lambda/explorer/cloudFormationNodes.test.ts
index 92e762fc287..ba8d7ccd516 100644
--- a/src/test/lambda/explorer/cloudFormationNodes.test.ts
+++ b/packages/core/src/test/lambda/explorer/cloudFormationNodes.test.ts
@@ -1,10 +1,9 @@
 /*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
-import { CloudFormation } from 'aws-sdk'
+import assert from 'assert'
 import * as os from 'os'
 import {
     CloudFormationNode,
@@ -12,37 +11,41 @@ import {
     contextValueCloudformationLambdaFunction,
 } from '../../../lambda/explorer/cloudFormationNodes'
 import { LambdaFunctionNode } from '../../../lambda/explorer/lambdaFunctionNode'
-import { DefaultCloudFormationClient } from '../../../shared/clients/cloudFormationClient'
+import { CloudFormationClient, StackResource, StackSummary } from '../../../shared/clients/cloudFormation'
 import { DefaultLambdaClient } from '../../../shared/clients/lambdaClient'
 import globals from '../../../shared/extensionGlobals'
 import { TestAWSTreeNode } from '../../shared/treeview/nodes/testAWSTreeNode'
-import { asyncGenerator } from '../../utilities/collectionUtils'
+import { asyncGenerator } from '../../../shared/utilities/collectionUtils'
 import {
     assertNodeListOnlyHasErrorNode,
     assertNodeListOnlyHasPlaceholderNode,
 } from '../../utilities/explorerNodeAssertions'
 import { stub } from '../../utilities/stubber'
+import { getLabel } from '../../../shared/treeview/utils'
 
 const regionCode = 'someregioncode'
 
 function createLambdaClient(...functionNames: string[]) {
-    const client = stub(DefaultLambdaClient, { regionCode })
-    client.listFunctions.returns(asyncGenerator(functionNames.map(name => ({ FunctionName: name }))))
+    const client = stub(DefaultLambdaClient, { regionCode, userAgent: undefined })
+    client.listFunctions.returns(asyncGenerator(functionNames.map((name) => ({ FunctionName: name }))))
 
     return client
 }
 
 function createCloudFormationClient(...stackNames: string[]) {
-    const client = stub(DefaultCloudFormationClient, { regionCode })
+    const client = stub(CloudFormationClient, { regionCode })
     client.describeStackResources.resolves({ StackResources: [] })
     client.listStacks.returns(
         asyncGenerator(
-            stackNames.map(name => {
+            stackNames.map((name) => {
                 return {
                     StackId: name,
                     StackName: name,
                     CreationTime: new globals.clock.Date(),
                     StackStatus: 'CREATE_COMPLETE',
+                    DriftInformation: {
+                        StackDriftStatus: 'UNKNOWN',
+                    },
                 }
             })
         )
@@ -52,12 +55,15 @@ function createCloudFormationClient(...stackNames: string[]) {
 }
 
 describe('CloudFormationStackNode', function () {
-    function createStackSummary() {
+    function createStackSummary(): StackSummary {
         return {
             CreationTime: new globals.clock.Date(),
             StackId: '1',
             StackName: 'myStack',
             StackStatus: 'UPDATE_COMPLETE',
+            DriftInformation: {
+                StackDriftStatus: 'UNKNOWN',
+            },
         }
     }
 
@@ -71,11 +77,11 @@ describe('CloudFormationStackNode', function () {
         return new CloudFormationStackNode(parentNode, regionCode, summary, lambdaClient, cloudFormationClient)
     }
 
-    function generateStackResources(...functionNames: string[]): CloudFormation.StackResource[] {
-        return functionNames.map(name => ({
+    function generateStackResources(...functionNames: string[]): StackResource[] {
+        return functionNames.map((name) => ({
             PhysicalResourceId: name,
             LogicalResourceId: name,
-            ResourceStatus: 'CREATED',
+            ResourceStatus: 'CREATE_COMPLETE',
             ResourceType: 'Lambda::Function',
             Timestamp: new globals.clock.Date(),
         }))
@@ -106,9 +112,9 @@ describe('CloudFormationStackNode', function () {
 
         assert.strictEqual(childNodes.length, 2, 'Unexpected child count')
 
-        childNodes.forEach(node =>
+        for (const node of childNodes) {
             assert.ok(node instanceof LambdaFunctionNode, 'Expected child node to be LambdaFunctionNode')
-        )
+        }
     })
 
     it('has child nodes with CloudFormation contextValue', async function () {
@@ -120,13 +126,13 @@ describe('CloudFormationStackNode', function () {
         const node = generateTestNode({ lambdaClient, cloudFormationClient })
         const childNodes = await node.getChildren()
 
-        childNodes.forEach(node =>
+        for (const node of childNodes) {
             assert.strictEqual(
                 node.contextValue,
                 contextValueCloudformationLambdaFunction,
                 'expected the node to have a CloudFormation contextValue'
             )
-        )
+        }
     })
 
     it('only includes functions which are in a CloudFormation stack', async function () {
@@ -141,7 +147,7 @@ describe('CloudFormationStackNode', function () {
         assert.strictEqual(childNodes.length, 2, 'Unexpected child node count')
 
         assert.deepStrictEqual(
-            new Set<string>(childNodes.map(node => node.label!)),
+            new Set<string>(childNodes.map((node) => getLabel(node))),
             new Set<string>(['lambda1', 'lambda3']),
             'Unexpected child sort order'
         )
@@ -162,9 +168,9 @@ describe('CloudFormationNode', function () {
         const cloudFormationNode = new CloudFormationNode(regionCode, client)
         const children = await cloudFormationNode.getChildren()
 
-        children.forEach(node =>
+        for (const node of children) {
             assert.ok(node instanceof CloudFormationStackNode, 'Expected child node to be CloudFormationStackNode')
-        )
+        }
     })
 
     it('has sorted child nodes', async function () {
@@ -172,7 +178,7 @@ describe('CloudFormationNode', function () {
         const cloudFormationNode = new CloudFormationNode(regionCode, client)
         const children = await cloudFormationNode.getChildren()
 
-        const actualChildOrder = children.map(node => (node as CloudFormationStackNode).stackName)
+        const actualChildOrder = children.map((node) => (node as CloudFormationStackNode).stackName)
         assert.deepStrictEqual(actualChildOrder, ['a', 'b'], 'Unexpected child sort order')
     })
 
diff --git a/packages/core/src/test/lambda/explorer/lambdaFunctionFileNode.test.ts b/packages/core/src/test/lambda/explorer/lambdaFunctionFileNode.test.ts
new file mode 100644
index 00000000000..59235bf7558
--- /dev/null
+++ b/packages/core/src/test/lambda/explorer/lambdaFunctionFileNode.test.ts
@@ -0,0 +1,58 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { LambdaFunctionNode } from '../../../lambda/explorer/lambdaFunctionNode'
+import { TestAWSTreeNode } from '../../shared/treeview/nodes/testAWSTreeNode'
+import { LambdaFunctionFileNode } from '../../../lambda/explorer/lambdaFunctionFileNode'
+import path from 'path'
+
+describe('LambdaFunctionFileNode', function () {
+    const fakeFunctionConfig = {
+        FunctionName: 'testFunctionName',
+        FunctionArn: 'testFunctionARN',
+    }
+    const fakeFilename = 'fakeFile'
+    const fakeRegion = 'fakeRegion'
+    const functionNode = new LambdaFunctionNode(new TestAWSTreeNode('test node'), fakeRegion, fakeFunctionConfig)
+    const filePath = path.join(
+        '/tmp/aws-toolkit-vscode/lambda',
+        fakeRegion,
+        fakeFunctionConfig.FunctionName,
+        fakeFilename
+    )
+
+    let testNode: LambdaFunctionFileNode
+
+    before(async function () {
+        testNode = new LambdaFunctionFileNode(functionNode, fakeFilename, filePath)
+    })
+
+    it('instantiates without issue', function () {
+        assert.ok(testNode)
+    })
+
+    it('initializes the parent node', function () {
+        assert.equal(testNode.parent, functionNode, 'unexpected parent node')
+    })
+
+    it('initializes the label', function () {
+        assert.equal(testNode.label, fakeFilename)
+    })
+
+    it('has no children', async function () {
+        const childNodes = await testNode.getChildren()
+        assert.ok(childNodes)
+        assert.strictEqual(childNodes.length, 0, 'Expected zero children')
+    })
+
+    it('has correct command', function () {
+        assert.deepStrictEqual(testNode.command, {
+            command: 'aws.openLambdaFile',
+            title: 'Open file',
+            arguments: [filePath],
+        })
+    })
+})
diff --git a/packages/core/src/test/lambda/explorer/lambdaFunctionFolderNode.test.ts b/packages/core/src/test/lambda/explorer/lambdaFunctionFolderNode.test.ts
new file mode 100644
index 00000000000..67471bc4e24
--- /dev/null
+++ b/packages/core/src/test/lambda/explorer/lambdaFunctionFolderNode.test.ts
@@ -0,0 +1,57 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { LambdaFunctionNode } from '../../../lambda/explorer/lambdaFunctionNode'
+import { TestAWSTreeNode } from '../../shared/treeview/nodes/testAWSTreeNode'
+import path from 'path'
+import { LambdaFunctionFolderNode } from '../../../lambda/explorer/lambdaFunctionFolderNode'
+import { fs } from '../../../shared/fs/fs'
+
+describe('LambdaFunctionFileNode', function () {
+    const fakeFunctionConfig = {
+        FunctionName: 'testFunctionName',
+        FunctionArn: 'testFunctionARN',
+    }
+    const fakeRegion = 'fakeRegion'
+    const fakeSubFolder = 'fakeSubFolder'
+    const fakeFile = 'fakeFilename'
+    const functionNode = new LambdaFunctionNode(new TestAWSTreeNode('test node'), fakeRegion, fakeFunctionConfig)
+
+    const regionPath = path.join('/tmp/aws-toolkit-vscode/lambda', fakeRegion)
+    const functionPath = path.join(regionPath, fakeFunctionConfig.FunctionName)
+    const subFolderPath = path.join(functionPath, fakeSubFolder)
+
+    let testNode: LambdaFunctionFolderNode
+
+    before(async function () {
+        await fs.mkdir(subFolderPath)
+        await fs.writeFile(path.join(subFolderPath, fakeFile), 'fakefilecontent')
+
+        testNode = new LambdaFunctionFolderNode(functionNode, fakeSubFolder, subFolderPath)
+    })
+
+    after(async function () {
+        await fs.delete(regionPath, { recursive: true })
+    })
+
+    it('instantiates without issue', function () {
+        assert.ok(testNode)
+    })
+
+    it('initializes the parent node', function () {
+        assert.equal(testNode.parent, functionNode, 'unexpected parent node')
+    })
+
+    it('initializes the label', function () {
+        assert.equal(testNode.label, fakeSubFolder)
+    })
+
+    it('loads function files', async function () {
+        const functionFiles = await testNode.loadFunctionFiles()
+        assert.equal(functionFiles.length, 1)
+        assert.equal(functionFiles[0].label, fakeFile)
+    })
+})
diff --git a/packages/core/src/test/lambda/explorer/lambdaFunctionNode.test.ts b/packages/core/src/test/lambda/explorer/lambdaFunctionNode.test.ts
new file mode 100644
index 00000000000..184bdd915b8
--- /dev/null
+++ b/packages/core/src/test/lambda/explorer/lambdaFunctionNode.test.ts
@@ -0,0 +1,112 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as os from 'os'
+import { LambdaFunctionNode } from '../../../lambda/explorer/lambdaFunctionNode'
+import { TestAWSTreeNode } from '../../shared/treeview/nodes/testAWSTreeNode'
+import path from 'path'
+import { fs } from '../../../shared/fs/fs'
+import {
+    contextValueLambdaFunction,
+    contextValueLambdaFunctionImportable,
+} from '../../../lambda/explorer/lambdaFunctionNode'
+import sinon from 'sinon'
+import * as editLambdaModule from '../../../lambda/commands/editLambda'
+
+describe('LambdaFunctionNode', function () {
+    const parentNode = new TestAWSTreeNode('test node')
+    const fakeRegion = 'fakeRegion'
+    const fakeFilename = 'fakeFilename'
+
+    const fakeFunctionConfig = {
+        FunctionName: 'testFunctionName',
+        FunctionArn: 'testFunctionARN',
+    }
+
+    const regionPath = path.join('/tmp/aws-toolkit-vscode/lambda', fakeRegion)
+    const functionPath = path.join(regionPath, fakeFunctionConfig.FunctionName)
+    const filePath = path.join(functionPath, fakeFilename)
+
+    let testNode: LambdaFunctionNode
+
+    let editLambdaStub: sinon.SinonStub
+
+    before(async function () {
+        await fs.mkdir(functionPath)
+        await fs.writeFile(filePath, 'fakefilecontent')
+
+        // Stub the editLambdaCommand to return the function path
+        editLambdaStub = sinon.stub(editLambdaModule, 'editLambdaCommand').resolves(functionPath)
+
+        testNode = new LambdaFunctionNode(
+            parentNode,
+            'someregioncode',
+            fakeFunctionConfig,
+            contextValueLambdaFunctionImportable
+        )
+    })
+
+    after(async function () {
+        await fs.delete(regionPath, { recursive: true })
+        editLambdaStub.restore()
+    })
+
+    it('instantiates without issue', async function () {
+        assert.ok(testNode)
+    })
+
+    it('initializes the parent node', async function () {
+        assert.strictEqual(testNode.parent, parentNode, 'unexpected parent node')
+    })
+
+    it('initializes the region code', async function () {
+        assert.strictEqual(testNode.regionCode, 'someregioncode')
+    })
+
+    it('initializes the label', async function () {
+        assert.strictEqual(testNode.label, fakeFunctionConfig.FunctionName)
+    })
+
+    it('initializes the functionName', async function () {
+        assert.strictEqual(testNode.functionName, fakeFunctionConfig.FunctionName)
+    })
+
+    it('initializes resourceUri', async function () {
+        assert.strictEqual(testNode.resourceUri?.scheme, 'lambda')
+        assert.strictEqual(testNode.resourceUri?.path, `someregioncode/${fakeFunctionConfig.FunctionName}`)
+    })
+
+    it('initializes the tooltip', async function () {
+        assert.strictEqual(
+            testNode.tooltip,
+            `${fakeFunctionConfig.FunctionName}${os.EOL}${fakeFunctionConfig.FunctionArn}`
+        )
+    })
+
+    it('loads function files', async function () {
+        const functionFiles = await testNode.loadFunctionFiles(functionPath)
+        assert.equal(functionFiles.length, 1)
+        assert.equal(functionFiles[0].label, fakeFilename)
+    })
+
+    it('has child if importable', async function () {
+        const childNodes = await testNode.getChildren()
+        assert.ok(childNodes)
+        assert.equal(childNodes.length, 1, 'Expected node to have one child, should be "failed to load resources"')
+    })
+
+    it('is not collapsible if not importable', async function () {
+        const nonImportableNode = new LambdaFunctionNode(
+            parentNode,
+            fakeRegion,
+            fakeFunctionConfig,
+            contextValueLambdaFunction
+        )
+        const childNodes = await nonImportableNode.getChildren()
+        assert.ok(childNodes)
+        assert.equal(childNodes.length, 0, 'Expected node to have no children')
+    })
+})
diff --git a/packages/core/src/test/lambda/explorer/lambdaFunctionNodeDecorationProvider.test.ts b/packages/core/src/test/lambda/explorer/lambdaFunctionNodeDecorationProvider.test.ts
new file mode 100644
index 00000000000..19a2662815f
--- /dev/null
+++ b/packages/core/src/test/lambda/explorer/lambdaFunctionNodeDecorationProvider.test.ts
@@ -0,0 +1,147 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import * as path from 'path'
+import { LambdaFunctionNodeDecorationProvider } from '../../../lambda/explorer/lambdaFunctionNodeDecorationProvider'
+import * as utils from '../../../lambda/utils'
+import { fs } from '../../../shared/fs/fs'
+
+describe('LambdaFunctionNodeDecorationProvider', function () {
+    let provider: LambdaFunctionNodeDecorationProvider
+    let getFunctionInfoStub: sinon.SinonStub
+    let fsStatStub: sinon.SinonStub
+    let fsReaddirStub: sinon.SinonStub
+
+    const filepath = path.join(utils.getTempLocation('test-function', 'us-east-1'), 'index.js')
+    const functionUri = vscode.Uri.parse('lambda:us-east-1/test-function')
+    const fileUri = vscode.Uri.file(filepath)
+
+    beforeEach(function () {
+        provider = LambdaFunctionNodeDecorationProvider.getInstance()
+        getFunctionInfoStub = sinon.stub(utils, 'getFunctionInfo')
+        fsStatStub = sinon.stub(fs, 'stat')
+        fsReaddirStub = sinon.stub(fs, 'readdir')
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    describe('provideFileDecoration', function () {
+        it('returns decoration for lambda URI with undeployed changes', async function () {
+            getFunctionInfoStub.resolves(true)
+
+            const decoration = await provider.provideFileDecoration(functionUri)
+
+            assert.ok(decoration)
+            assert.strictEqual(decoration.badge, 'M')
+            assert.strictEqual(decoration.tooltip, 'This function has undeployed changes')
+            assert.strictEqual(decoration.propagate, false)
+        })
+
+        it('returns undefined for lambda URI without undeployed changes', async function () {
+            getFunctionInfoStub.resolves(false)
+
+            const decoration = await provider.provideFileDecoration(functionUri)
+
+            assert.strictEqual(decoration, undefined)
+        })
+
+        it('returns decoration for file URI with modifications after deployment', async function () {
+            const lastDeployed = 1
+            const fileModified = 2
+
+            getFunctionInfoStub.resolves({ lastDeployed, undeployed: true })
+            fsStatStub.resolves({ mtime: fileModified })
+
+            const decoration = await provider.provideFileDecoration(fileUri)
+
+            assert.ok(decoration)
+            assert.strictEqual(decoration.badge, 'M')
+            assert.strictEqual(decoration.tooltip, 'This function has undeployed changes')
+            assert.strictEqual(decoration.propagate, true)
+        })
+
+        it('returns undefined for file URI without modifications after deployment', async function () {
+            const lastDeployed = 2
+            const fileModified = 1
+
+            getFunctionInfoStub.resolves({ lastDeployed, undeployed: true })
+            fsStatStub.resolves({ mtime: fileModified })
+
+            const decoration = await provider.provideFileDecoration(fileUri)
+
+            assert.strictEqual(decoration, undefined)
+        })
+
+        it('returns undefined for file URI when no deployment info exists', async function () {
+            getFunctionInfoStub.resolves(undefined)
+
+            const decoration = await provider.provideFileDecoration(fileUri)
+
+            assert.strictEqual(decoration, undefined)
+        })
+
+        it('returns undefined for file URI that does not match lambda pattern', async function () {
+            const uri = vscode.Uri.file(path.join('not', 'in', 'tmp'))
+
+            const decoration = await provider.provideFileDecoration(uri)
+
+            assert.strictEqual(decoration, undefined)
+        })
+
+        it('handles errors gracefully when checking file modification', async function () {
+            getFunctionInfoStub.resolves(0)
+            fsStatStub.rejects(new Error('File not found'))
+
+            const decoration = await provider.provideFileDecoration(fileUri)
+
+            assert.strictEqual(decoration, undefined)
+        })
+    })
+
+    describe('addBadge', function () {
+        it('fires decoration change events for both URIs', async function () {
+            const fileUri = vscode.Uri.file(path.join('test', 'file.js'))
+            const functionUri = vscode.Uri.parse('lambda:us-east-1/test-function')
+
+            let eventCount = 0
+            const disposable = provider.onDidChangeFileDecorations(() => {
+                eventCount++
+            })
+
+            await provider.addBadge(fileUri, functionUri)
+
+            assert.strictEqual(eventCount, 2)
+            disposable.dispose()
+        })
+    })
+
+    describe('getFilePaths', function () {
+        it('returns all file paths recursively', async function () {
+            const basePath = path.join('test', 'dir')
+
+            // Mock first readdir call
+            fsReaddirStub.onFirstCall().resolves([
+                ['file1.js', vscode.FileType.File],
+                ['subdir', vscode.FileType.Directory],
+            ])
+
+            // Mock second readdir call for subdirectory
+            fsReaddirStub.onSecondCall().resolves([['file2.js', vscode.FileType.File]])
+
+            // Access private method through any cast for testing
+            const paths = await (provider as any).getFilePaths(basePath)
+
+            assert.ok(paths.includes(basePath))
+            assert.ok(paths.includes(path.join('test', 'dir', 'file1.js')))
+            assert.ok(paths.includes(path.join('test', 'dir', 'subdir')))
+            assert.ok(paths.includes(path.join('test', 'dir', 'subdir', 'file2.js')))
+        })
+    })
+})
diff --git a/src/test/lambda/explorer/lambdaNodes.test.ts b/packages/core/src/test/lambda/explorer/lambdaNodes.test.ts
similarity index 76%
rename from src/test/lambda/explorer/lambdaNodes.test.ts
rename to packages/core/src/test/lambda/explorer/lambdaNodes.test.ts
index 8bbea60d282..86ed7bbe44c 100644
--- a/src/test/lambda/explorer/lambdaNodes.test.ts
+++ b/packages/core/src/test/lambda/explorer/lambdaNodes.test.ts
@@ -1,12 +1,12 @@
 /*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
-import { LambdaFunctionNode } from '../../../lambda/explorer/lambdaFunctionNode'
-import { contextValueLambdaFunction, LambdaNode } from '../../../lambda/explorer/lambdaNodes'
-import { asyncGenerator } from '../../utilities/collectionUtils'
+import assert from 'assert'
+import { contextValueLambdaFunction, LambdaFunctionNode } from '../../../lambda/explorer/lambdaFunctionNode'
+import { LambdaNode } from '../../../lambda/explorer/lambdaNodes'
+import { asyncGenerator } from '../../../shared/utilities/collectionUtils'
 import {
     assertNodeListOnlyHasErrorNode,
     assertNodeListOnlyHasPlaceholderNode,
@@ -17,8 +17,8 @@ import { DefaultLambdaClient } from '../../../shared/clients/lambdaClient'
 const regionCode = 'someregioncode'
 
 function createLambdaClient(...functionNames: string[]) {
-    const client = stub(DefaultLambdaClient, { regionCode })
-    client.listFunctions.returns(asyncGenerator(functionNames.map(name => ({ FunctionName: name }))))
+    const client = stub(DefaultLambdaClient, { regionCode, userAgent: undefined })
+    client.listFunctions.returns(asyncGenerator(functionNames.map((name) => ({ FunctionName: name }))))
 
     return client
 }
@@ -39,27 +39,27 @@ describe('LambdaNode', function () {
 
         assert.strictEqual(childNodes.length, 2, 'Unexpected child count')
 
-        childNodes.forEach(node =>
+        for (const node of childNodes) {
             assert.ok(node instanceof LambdaFunctionNode, 'Expected child node to be LambdaFunctionNode')
-        )
+        }
     })
 
     it('has child nodes with Lambda Function contextValue', async function () {
         const childNodes = await createNode('f1', 'f2').getChildren()
 
-        childNodes.forEach(node =>
+        for (const node of childNodes) {
             assert.strictEqual(
                 node.contextValue,
                 contextValueLambdaFunction,
                 'expected the node to have a CloudFormation contextValue'
             )
-        )
+        }
     })
 
     it('sorts child nodes', async function () {
         const childNodes = await createNode('b', 'c', 'a').getChildren()
 
-        const actualChildOrder = childNodes.map(node => node.label)
+        const actualChildOrder = childNodes.map((node) => node.label)
         assert.deepStrictEqual(actualChildOrder, ['a', 'b', 'c'], 'Unexpected child sort order')
     })
 
diff --git a/src/test/lambda/local/debugConfiguration.test.ts b/packages/core/src/test/lambda/local/debugConfiguration.test.ts
similarity index 89%
rename from src/test/lambda/local/debugConfiguration.test.ts
rename to packages/core/src/test/lambda/local/debugConfiguration.test.ts
index 2afd721bf13..0a0aab0dc99 100644
--- a/src/test/lambda/local/debugConfiguration.test.ts
+++ b/packages/core/src/test/lambda/local/debugConfiguration.test.ts
@@ -1,25 +1,25 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as os from 'os'
 import * as vscode from 'vscode'
-import * as fs from 'fs-extra'
 import { RuntimeFamily } from '../../../lambda/models/samLambdaRuntime'
 import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
 import { DefaultSamLocalInvokeCommand } from '../../../shared/sam/cli/samCliLocalInvoke'
-import { makeCoreCLRDebugConfiguration } from '../../../shared/sam/debugger/csharpSamDebug'
+import { makeDotnetDebugConfiguration } from '../../../shared/sam/debugger/csharpSamDebug'
 import * as testutil from '../../testUtil'
 import { SamLaunchRequestArgs } from '../../../shared/sam/debugger/awsSamDebugger'
 import * as pathutil from '../../../shared/utilities/pathUtils'
 import * as path from 'path'
 import { CloudFormationTemplateRegistry } from '../../../shared/fs/templateRegistry'
 import { getArchitecture, isImageLambdaConfig } from '../../../lambda/local/debugConfiguration'
-import { CloudFormation } from '../../../shared/cloudformation/cloudformation'
+import * as CloudFormation from '../../../shared/cloudformation/cloudformation'
 import globals from '../../../shared/extensionGlobals'
-import { Runtime } from '../../../shared/telemetry/telemetry'
+import { Runtime } from '@aws-sdk/client-lambda'
+import { fs } from '../../../shared'
 
 describe('makeCoreCLRDebugConfiguration', function () {
     let tempFolder: string
@@ -35,7 +35,7 @@ describe('makeCoreCLRDebugConfiguration', function () {
     })
 
     afterEach(async function () {
-        await fs.remove(tempFolder)
+        await fs.delete(tempFolder, { recursive: true })
     })
 
     async function makeFakeSamLaunchConfig() {
@@ -43,7 +43,7 @@ describe('makeCoreCLRDebugConfiguration', function () {
             name: 'fake-launch-config',
             workspaceFolder: fakeWorkspaceFolder,
             codeRoot: fakeWorkspaceFolder.uri.fsPath,
-            runtimeFamily: RuntimeFamily.DotNetCore,
+            runtimeFamily: RuntimeFamily.DotNet,
             type: 'coreclr',
             request: 'attach',
             // cfnTemplate?: CloudFormation.Template
@@ -60,7 +60,7 @@ describe('makeCoreCLRDebugConfiguration', function () {
             templatePath: '/fake/sam/path',
             samLocalInvokeCommand: new DefaultSamLocalInvokeCommand(),
 
-            //debuggerPath?:
+            // debuggerPath?:
 
             invokeTarget: {
                 target: 'code',
@@ -73,7 +73,7 @@ describe('makeCoreCLRDebugConfiguration', function () {
 
     async function makeConfig({ codeUri = tempFolder }: { codeUri?: string; port?: number }) {
         const fakeLaunchConfig = await makeFakeSamLaunchConfig()
-        return makeCoreCLRDebugConfiguration(fakeLaunchConfig, codeUri)
+        return makeDotnetDebugConfiguration(fakeLaunchConfig, codeUri)
     }
 
     describe('windows', function () {
@@ -95,7 +95,7 @@ describe('makeCoreCLRDebugConfiguration', function () {
         it('uses the specified port', async function () {
             const config = await makeConfig({})
             assert.strictEqual(
-                config.windows.pipeTransport.pipeArgs.some(arg => arg.includes(config.debugPort!.toString())),
+                config.windows.pipeTransport.pipeArgs.some((arg) => arg.includes(config.debugPort!.toString())),
                 true
             )
         })
@@ -111,7 +111,7 @@ describe('makeCoreCLRDebugConfiguration', function () {
             const config = await makeConfig({})
 
             assert.strictEqual(
-                config.pipeTransport.pipeArgs.some(arg => arg.includes(config.debugPort!.toString())),
+                config.pipeTransport.pipeArgs.some((arg) => arg.includes(config.debugPort!.toString())),
                 true
             )
         })
@@ -132,19 +132,19 @@ describe('isImageLambdaConfig', function () {
             name: 'It was me, fakeWorkspaceFolder!',
             index: 0,
         }
-        registry = globals.templateRegistry
+        registry = await globals.templateRegistry
         appDir = pathutil.normalize(path.join(testutil.getProjectDir(), 'testFixtures/workspaceFolder/'))
     })
 
     it('true for Image-backed template', async function () {
         const templatePath = vscode.Uri.file(path.join(appDir, 'python3.7-image-sam-app/template.yaml'))
-        await registry.addItemToRegistry(templatePath)
+        await registry.addItem(templatePath)
 
         const input = {
             name: 'fake-launch-config',
             workspaceFolder: fakeWorkspaceFolder,
             codeRoot: fakeWorkspaceFolder.uri.fsPath,
-            runtimeFamily: RuntimeFamily.DotNetCore,
+            runtimeFamily: RuntimeFamily.DotNet,
             request: 'launch',
             type: 'launch',
             runtime: 'fakedotnet' as Runtime,
@@ -162,18 +162,18 @@ describe('isImageLambdaConfig', function () {
             },
         } as SamLaunchRequestArgs
 
-        assert.strictEqual(isImageLambdaConfig(input), true)
+        assert.strictEqual(await isImageLambdaConfig(input), true)
     })
 
     it('false for ZIP-backed template', async function () {
         const templatePath = vscode.Uri.file(path.join(appDir, 'python3.7-plain-sam-app/template.yaml'))
-        await registry.addItemToRegistry(templatePath)
+        await registry.addItem(templatePath)
 
         const input = {
             name: 'fake-launch-config',
             workspaceFolder: fakeWorkspaceFolder,
             codeRoot: fakeWorkspaceFolder.uri.fsPath,
-            runtimeFamily: RuntimeFamily.DotNetCore,
+            runtimeFamily: RuntimeFamily.DotNet,
             request: 'launch',
             type: 'launch',
             runtime: 'fakedotnet' as Runtime,
@@ -191,7 +191,7 @@ describe('isImageLambdaConfig', function () {
             },
         } as SamLaunchRequestArgs
 
-        assert.strictEqual(isImageLambdaConfig(input), false)
+        assert.strictEqual(await isImageLambdaConfig(input), false)
     })
 
     it('false for code-type', async function () {
@@ -199,7 +199,7 @@ describe('isImageLambdaConfig', function () {
             name: 'fake-launch-config',
             workspaceFolder: fakeWorkspaceFolder,
             codeRoot: fakeWorkspaceFolder.uri.fsPath,
-            runtimeFamily: RuntimeFamily.DotNetCore,
+            runtimeFamily: RuntimeFamily.DotNet,
             request: 'launch',
             type: 'launch',
             runtime: 'fakedotnet' as Runtime,
@@ -214,7 +214,7 @@ describe('isImageLambdaConfig', function () {
             },
         } as SamLaunchRequestArgs
 
-        assert.strictEqual(isImageLambdaConfig(input), false)
+        assert.strictEqual(await isImageLambdaConfig(input), false)
     })
 })
 
diff --git a/packages/core/src/test/lambda/local/util.ts b/packages/core/src/test/lambda/local/util.ts
new file mode 100644
index 00000000000..5b14939004d
--- /dev/null
+++ b/packages/core/src/test/lambda/local/util.ts
@@ -0,0 +1,61 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { EOL } from 'os'
+import * as CloudFormation from '../../../shared/cloudformation/cloudformation'
+import { fs } from '../../../shared'
+
+export async function saveTemplate(templatePath: string, runtime: string, ...functionNames: string[]) {
+    const functionResources = functionNames
+        .map(
+            (functionName) => `    ${functionName}:
+        Type: ${CloudFormation.SERVERLESS_FUNCTION_TYPE}
+        Properties:
+            CodeUri: hello_world/
+            Handler: app.lambdaHandler
+            Runtime: ${runtime}
+            Environment:
+                Variables:
+                    PARAM1: VALUE
+            Events:
+                HelloWorld:
+                    Type: Api
+                    Properties:
+                        Path: /hello
+                        Method: get`
+        )
+        .join(EOL)
+
+    const templateContent = `AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: >
+    my-sam-app
+
+    Sample SAM Template for my-sam-app
+
+Globals:
+  Function:
+    Timeout: 3
+
+Resources:
+${functionResources}
+
+Outputs:
+
+    HelloWorldApi:
+        Description: "API Gateway endpoint URL for Prod stage for Hello World function"
+        Value: !Sub "https://\${ServerlessRestApi}.execute-api.\${AWS::Region}.amazonaws.com/Prod/hello/"
+
+    HelloWorldFunction:
+        Description: "Hello World Lambda Function ARN"
+        Value: !GetAtt HelloWorldFunction.Arn
+
+    HelloWorldFunctionIamRole:
+        Description: "Implicit IAM Role created for Hello World function"
+        Value: !GetAtt HelloWorldFunctionRole.Arn
+`
+
+    await fs.writeFile(templatePath, templateContent)
+}
diff --git a/packages/core/src/test/lambda/models/samLambdaRuntime.test.ts b/packages/core/src/test/lambda/models/samLambdaRuntime.test.ts
new file mode 100644
index 00000000000..566c465a0dd
--- /dev/null
+++ b/packages/core/src/test/lambda/models/samLambdaRuntime.test.ts
@@ -0,0 +1,169 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import {
+    compareSamLambdaRuntime,
+    getDependencyManager,
+    getFamily,
+    samZipLambdaRuntimes,
+    RuntimeFamily,
+    samImageLambdaRuntimes,
+    samLambdaCreatableRuntimes,
+    getNodeMajorVersion,
+    nodeJsRuntimes,
+} from '../../../lambda/models/samLambdaRuntime'
+import { Runtime } from '@aws-sdk/client-lambda'
+
+describe('compareSamLambdaRuntime', async function () {
+    const scenarios: {
+        lowerRuntime: string
+        higherRuntime: string
+    }[] = [
+        { lowerRuntime: 'nodejs14.x', higherRuntime: 'nodejs16.x' },
+        { lowerRuntime: 'nodejs16.x', higherRuntime: 'nodejs16.x (Image)' },
+        { lowerRuntime: 'nodejs14.x (Image)', higherRuntime: 'nodejs16.x' },
+    ]
+
+    for (const scenario of scenarios) {
+        it(`${scenario.lowerRuntime} < ${scenario.higherRuntime}`, () => {
+            assert.ok(compareSamLambdaRuntime(scenario.lowerRuntime, scenario.higherRuntime) < 0)
+        })
+
+        it(`${scenario.higherRuntime} > ${scenario.lowerRuntime}`, () => {
+            assert.ok(compareSamLambdaRuntime(scenario.higherRuntime, scenario.lowerRuntime) > 0)
+        })
+    }
+})
+
+describe('getDependencyManager', function () {
+    it('all runtimes are handled', function () {
+        for (const runtime of samZipLambdaRuntimes) {
+            assert.ok(getDependencyManager(runtime))
+        }
+    })
+    it('throws on deprecated runtimes', function () {
+        assert.throws(() => getDependencyManager('nodejs'))
+    })
+    it('throws on unknown runtimes', function () {
+        assert.throws(() => getDependencyManager('BASIC' as Runtime))
+    })
+})
+
+describe('getFamily', function () {
+    it('unknown runtime name', function () {
+        assert.strictEqual(getFamily('foo' as Runtime), RuntimeFamily.Unknown)
+    })
+    it('handles all known runtimes', function () {
+        for (const runtime of samZipLambdaRuntimes) {
+            assert.notStrictEqual(getFamily(runtime), RuntimeFamily.Unknown)
+        }
+    })
+    it('throws on deprecated runtimes', function () {
+        assert.throws(() => getFamily('nodejs'))
+    })
+})
+
+describe('runtimes', function () {
+    it('cloud9', function () {
+        assert.deepStrictEqual(samLambdaCreatableRuntimes(true).toArray().sort(), [
+            'nodejs14.x',
+            'nodejs16.x',
+            'nodejs18.x',
+            'nodejs20.x',
+            'nodejs22.x',
+            'python3.10',
+            'python3.11',
+            'python3.12',
+            'python3.13',
+            'python3.7',
+            'python3.8',
+            'python3.9',
+        ])
+        assert.deepStrictEqual(samImageLambdaRuntimes(true).toArray().sort(), [
+            'nodejs14.x',
+            'nodejs16.x',
+            'nodejs18.x',
+            'nodejs20.x',
+            'nodejs22.x',
+            'python3.10',
+            'python3.11',
+            'python3.12',
+            'python3.13',
+            'python3.7',
+            'python3.8',
+            'python3.9',
+        ])
+    })
+    it('vscode', function () {
+        assert.deepStrictEqual(samLambdaCreatableRuntimes(false).toArray().sort(), [
+            'dotnet6',
+            'dotnet8',
+            'go1.x',
+            'java11',
+            'java17',
+            'java21',
+            'java8',
+            'java8.al2',
+            'nodejs14.x',
+            'nodejs16.x',
+            'nodejs18.x',
+            'nodejs20.x',
+            'nodejs22.x',
+            'python3.10',
+            'python3.11',
+            'python3.12',
+            'python3.13',
+            'python3.7',
+            'python3.8',
+            'python3.9',
+        ])
+        assert.deepStrictEqual(samImageLambdaRuntimes(false).toArray().sort(), [
+            'dotnet5.0',
+            'dotnet6',
+            'dotnet8',
+            'go1.x',
+            'java11',
+            'java17',
+            'java21',
+            'java8',
+            'java8.al2',
+            'nodejs14.x',
+            'nodejs16.x',
+            'nodejs18.x',
+            'nodejs20.x',
+            'nodejs22.x',
+            'python3.10',
+            'python3.11',
+            'python3.12',
+            'python3.13',
+            'python3.7',
+            'python3.8',
+            'python3.9',
+        ])
+    })
+})
+
+describe('getNodeMajorVersion()', () => {
+    it('returns node version', () => {
+        assert.strictEqual(getNodeMajorVersion('nodejs12.x'), 12)
+        assert.strictEqual(getNodeMajorVersion('nodejs18.x'), 18)
+    })
+
+    it('returns undefined on invalid input', () => {
+        const version = getNodeMajorVersion('python12.x')
+        assert.strictEqual(version, undefined)
+    })
+
+    describe('extracts a version from existing runtimes', function () {
+        for (const versionString of nodeJsRuntimes) {
+            it(`extracts from runtime: "${versionString}"`, () => {
+                const version = getNodeMajorVersion(versionString)
+                assert(version !== undefined)
+                assert(0 < version && version < 999)
+            })
+        }
+    })
+})
diff --git a/src/test/lambda/models/samTemplates.test.ts b/packages/core/src/test/lambda/models/samTemplates.test.ts
similarity index 85%
rename from src/test/lambda/models/samTemplates.test.ts
rename to packages/core/src/test/lambda/models/samTemplates.test.ts
index 703a81cfd82..7fe78e630c8 100644
--- a/src/test/lambda/models/samTemplates.test.ts
+++ b/packages/core/src/test/lambda/models/samTemplates.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import {
     cliVersionStepFunctionsTemplate,
     getSamCliTemplateParameter,
@@ -16,21 +16,19 @@ import {
     eventBridgeStarterAppTemplate,
     stepFunctionsSampleApp,
     typeScriptBackendTemplate,
-    lazyLoadSamTemplateStrings,
 } from '../../../lambda/models/samTemplates'
 import { Set } from 'immutable'
 
 import { samZipLambdaRuntimes } from '../../../lambda/models/samLambdaRuntime'
+import { Runtime } from '@aws-sdk/client-lambda'
 
 let validTemplateOptions: Set<SamTemplate>
 let validPythonTemplateOptions: Set<SamTemplate>
-let validNode12TemplateOptions: Set<SamTemplate>
+let validNodeTemplateOptions: Set<SamTemplate>
 let validGoTemplateOptions: Set<SamTemplate>
 let defaultTemplateOptions: Set<SamTemplate>
 
 before(function () {
-    lazyLoadSamTemplateStrings()
-
     validTemplateOptions = Set([
         helloWorldTemplate,
         eventBridgeHelloWorldTemplate,
@@ -46,7 +44,7 @@ before(function () {
         stepFunctionsSampleApp,
     ])
 
-    validNode12TemplateOptions = Set([helloWorldTemplate, stepFunctionsSampleApp, typeScriptBackendTemplate])
+    validNodeTemplateOptions = Set([helloWorldTemplate, stepFunctionsSampleApp, typeScriptBackendTemplate])
 
     validGoTemplateOptions = Set([
         helloWorldTemplate,
@@ -66,17 +64,21 @@ describe('getSamTemplateWizardOption', function () {
                 case 'python3.7':
                 case 'python3.8':
                 case 'python3.9':
+                case 'python3.10':
+                case 'python3.11':
+                case 'python3.12':
+                case 'python3.13' as Runtime:
                     assert.deepStrictEqual(
                         result,
                         validPythonTemplateOptions,
                         'Python 3.x supports additional template options'
                     )
                     break
-                case 'nodejs12.x':
+                case 'nodejs16.x':
                     assert.deepStrictEqual(
                         result,
-                        validNode12TemplateOptions,
-                        'Node12.x supports default and TS template options'
+                        validNodeTemplateOptions,
+                        'Node supports default and TS template options'
                     )
                     break
                 case 'go1.x':
@@ -124,9 +126,9 @@ describe('getSamCliTemplateParameter', function () {
 
 describe('getTemplateDescription', async function () {
     it('all templates are handled', async function () {
-        validTemplateOptions.forEach(template => {
+        for (const template of validTemplateOptions) {
             // Checking that call does not throw
             getTemplateDescription(template)
-        })
+        }
     })
 })
diff --git a/packages/core/src/test/lambda/remoteDebugging/ldkClient.test.ts b/packages/core/src/test/lambda/remoteDebugging/ldkClient.test.ts
new file mode 100644
index 00000000000..98734e51833
--- /dev/null
+++ b/packages/core/src/test/lambda/remoteDebugging/ldkClient.test.ts
@@ -0,0 +1,565 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import { FunctionConfiguration } from '@aws-sdk/client-lambda'
+import { LdkClient, getRegionFromArn, isTunnelInfo } from '../../../lambda/remoteDebugging/ldkClient'
+import { LocalProxy } from '../../../lambda/remoteDebugging/localProxy'
+import * as utils from '../../../lambda/remoteDebugging/utils'
+import * as telemetryUtil from '../../../shared/telemetry/util'
+import globals from '../../../shared/extensionGlobals'
+import { createMockFunctionConfig, createMockProgress } from './testUtils'
+import {
+    IoTSecureTunnelingClient,
+    IoTSecureTunnelingClientResolvedConfig,
+    ListTunnelsCommand,
+    OpenTunnelCommand,
+    RotateTunnelAccessTokenCommand,
+    ServiceInputTypes,
+    ServiceOutputTypes,
+    TunnelStatus,
+} from '@aws-sdk/client-iotsecuretunneling'
+import { AwsStub, mockClient } from 'aws-sdk-client-mock'
+
+describe('LdkClient', () => {
+    let sandbox: sinon.SinonSandbox
+    let ldkClient: LdkClient
+    let mockLambdaClient: any
+    let mockIoTSTClient: AwsStub<ServiceInputTypes, ServiceOutputTypes, IoTSecureTunnelingClientResolvedConfig>
+    let mockLocalProxy: any
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+
+        // Mock Lambda client
+        mockLambdaClient = {
+            getFunction: sandbox.stub(),
+            updateFunctionConfiguration: sandbox.stub(),
+            publishVersion: sandbox.stub(),
+            deleteFunction: sandbox.stub(),
+        }
+        sandbox.stub(utils, 'getLambdaClientWithAgent').returns(mockLambdaClient)
+
+        mockIoTSTClient = mockClient(IoTSecureTunnelingClient)
+        sandbox.stub(utils, 'getIoTSTClientWithAgent').returns(mockIoTSTClient as any)
+
+        // Mock LocalProxy
+        mockLocalProxy = {
+            start: sandbox.stub(),
+            stop: sandbox.stub(),
+        }
+        sandbox.stub(LocalProxy.prototype, 'start').callsFake(mockLocalProxy.start)
+        sandbox.stub(LocalProxy.prototype, 'stop').callsFake(mockLocalProxy.stop)
+
+        // Mock global state
+        const stateStorage = new Map<string, any>()
+        const mockGlobalState = {
+            get: (key: string) => stateStorage.get(key),
+            update: async (key: string, value: any) => {
+                stateStorage.set(key, value)
+                return Promise.resolve()
+            },
+        }
+        sandbox.stub(globals, 'globalState').value(mockGlobalState)
+
+        // Mock telemetry util
+        sandbox.stub(telemetryUtil, 'getClientId').returns('test-client-id')
+        ldkClient = LdkClient.instance
+        ldkClient.dispose()
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+
+    describe('Singleton Pattern', () => {
+        it('should return the same instance', () => {
+            const instance1 = LdkClient.instance
+            const instance2 = LdkClient.instance
+            assert.strictEqual(instance1, instance2, 'Should return the same singleton instance')
+        })
+    })
+
+    describe('dispose()', () => {
+        it('should dispose resources properly', () => {
+            // Set up a mock local proxy
+            ;(ldkClient as any).localProxy = mockLocalProxy
+
+            ldkClient.dispose()
+
+            assert(mockLocalProxy.stop.calledOnce, 'Should stop local proxy')
+            assert.strictEqual((ldkClient as any).localProxy, undefined, 'Should clear local proxy reference')
+        })
+
+        it('should clear client caches', () => {
+            // Add some clients to cache
+            ;(ldkClient as any).lambdaClientCache.set('us-east-1', mockLambdaClient)
+            ;(ldkClient as any).lambdaClientCache.set('us-west-2', mockLambdaClient)
+
+            assert.strictEqual((ldkClient as any).lambdaClientCache.size, 2, 'Should have cached clients')
+
+            ldkClient.dispose()
+
+            assert.strictEqual((ldkClient as any).lambdaClientCache.size, 0, 'Should clear Lambda client cache')
+        })
+    })
+
+    describe('createOrReuseTunnel()', () => {
+        it('should create new tunnel when none exists', async () => {
+            mockIoTSTClient.on(ListTunnelsCommand).resolves({ tunnelSummaries: [] })
+            mockIoTSTClient.on(OpenTunnelCommand).resolves({
+                tunnelId: 'tunnel-123',
+                sourceAccessToken: 'source-token',
+                destinationAccessToken: 'dest-token',
+            })
+
+            const result = await ldkClient.createOrReuseTunnel('us-east-1')
+
+            assert(result, 'Should return tunnel info')
+            assert.strictEqual(result?.tunnelID, 'tunnel-123')
+            assert.strictEqual(result?.sourceToken, 'source-token')
+            assert.strictEqual(result?.destinationToken, 'dest-token')
+            assert.strictEqual(
+                mockIoTSTClient.commandCalls(ListTunnelsCommand).length,
+                1,
+                'Should list existing tunnels'
+            )
+            assert.strictEqual(mockIoTSTClient.commandCalls(OpenTunnelCommand).length, 1, 'Should create new tunnel')
+        })
+
+        it('should reuse existing tunnel with sufficient time remaining', async () => {
+            const existingTunnel = {
+                tunnelId: 'existing-tunnel',
+                description: 'RemoteDebugging+test-client-id',
+                status: TunnelStatus.OPEN,
+                createdAt: new Date(Date.now() - 60 * 60 * 1000), // 1 hour ago
+            }
+
+            mockIoTSTClient.on(ListTunnelsCommand).resolves({ tunnelSummaries: [existingTunnel] })
+            mockIoTSTClient.on(RotateTunnelAccessTokenCommand).resolves({
+                sourceAccessToken: 'rotated-source-token',
+                destinationAccessToken: 'rotated-dest-token',
+            })
+
+            const result = await ldkClient.createOrReuseTunnel('us-east-1')
+
+            assert(result, 'Should return tunnel info')
+            assert.strictEqual(result?.tunnelID, 'existing-tunnel')
+            assert.strictEqual(result?.sourceToken, 'rotated-source-token')
+            assert.strictEqual(result?.destinationToken, 'rotated-dest-token')
+        })
+
+        it('should handle tunnel creation errors', async () => {
+            mockIoTSTClient.on(ListTunnelsCommand).resolves({ tunnelSummaries: [] })
+            mockIoTSTClient.on(OpenTunnelCommand).rejects(new Error('Tunnel creation failed'))
+
+            await assert.rejects(
+                async () => await ldkClient.createOrReuseTunnel('us-east-1'),
+                /Error creating\/reusing tunnel/,
+                'Should throw error on tunnel creation failure'
+            )
+        })
+    })
+
+    describe('refreshTunnelTokens()', () => {
+        it('should refresh tunnel tokens successfully', async () => {
+            mockIoTSTClient.on(RotateTunnelAccessTokenCommand).resolves({
+                sourceAccessToken: 'new-source-token',
+                destinationAccessToken: 'new-dest-token',
+            })
+
+            const result = await ldkClient.refreshTunnelTokens('tunnel-123', 'us-east-1')
+
+            assert(result, 'Should return tunnel info')
+            assert.strictEqual(result?.tunnelID, 'tunnel-123')
+            assert.strictEqual(result?.sourceToken, 'new-source-token')
+            assert.strictEqual(result?.destinationToken, 'new-dest-token')
+        })
+
+        it('should handle token refresh errors', async () => {
+            mockIoTSTClient.on(RotateTunnelAccessTokenCommand).rejects(new Error('Token refresh failed'))
+
+            await assert.rejects(
+                async () => await ldkClient.refreshTunnelTokens('tunnel-123', 'us-east-1'),
+                /Error refreshing tunnel tokens/,
+                'Should throw error on token refresh failure'
+            )
+        })
+    })
+
+    describe('getFunctionDetail()', () => {
+        const mockFunctionConfig: FunctionConfiguration = createMockFunctionConfig({
+            FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:testFunction',
+        })
+
+        it('should get function details successfully', async () => {
+            mockLambdaClient.getFunction.resolves({ Configuration: mockFunctionConfig })
+
+            const result = await ldkClient.getFunctionDetail(mockFunctionConfig.FunctionArn!)
+
+            assert.deepStrictEqual(result, mockFunctionConfig, 'Should return function configuration')
+        })
+
+        it('should handle function details retrieval errors', async () => {
+            mockLambdaClient.getFunction.reset()
+            mockLambdaClient.getFunction.rejects(new Error('Function not found'))
+
+            const result = await ldkClient.getFunctionDetail(mockFunctionConfig.FunctionArn!)
+
+            assert.strictEqual(result, undefined, 'Should return undefined on error')
+        })
+
+        it('should handle invalid ARN', async () => {
+            const result = await ldkClient.getFunctionDetail('invalid-arn')
+
+            assert.strictEqual(result, undefined, 'Should return undefined for invalid ARN')
+        })
+    })
+
+    describe('createDebugDeployment()', () => {
+        const mockFunctionConfig: FunctionConfiguration = createMockFunctionConfig({
+            FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:testFunction',
+        })
+
+        const mockProgress = createMockProgress()
+
+        beforeEach(() => {
+            mockLambdaClient.updateFunctionConfiguration.resolves({})
+            mockLambdaClient.publishVersion.resolves({ Version: 'v1' })
+        })
+
+        it('should create debug deployment successfully without version publishing', async () => {
+            const result = await ldkClient.createDebugDeployment(
+                mockFunctionConfig,
+                'dest-token',
+                900,
+                false,
+                'layer-arn',
+                mockProgress as any
+            )
+
+            assert.strictEqual(result, '$Latest', 'Should return $Latest for non-version deployment')
+            assert(mockLambdaClient.updateFunctionConfiguration.calledOnce, 'Should update function configuration')
+            assert(mockLambdaClient.publishVersion.notCalled, 'Should not publish version')
+        })
+
+        it('should create debug deployment with version publishing', async () => {
+            const result = await ldkClient.createDebugDeployment(
+                mockFunctionConfig,
+                'dest-token',
+                900,
+                true,
+                'layer-arn',
+                mockProgress as any
+            )
+
+            assert.strictEqual(result, 'v1', 'Should return version number')
+            assert(mockLambdaClient.publishVersion.calledOnce, 'Should publish version')
+        })
+
+        it('should handle deployment errors', async () => {
+            mockLambdaClient.updateFunctionConfiguration.reset()
+            mockLambdaClient.updateFunctionConfiguration.rejects(new Error('Update failed'))
+
+            await assert.rejects(
+                async () =>
+                    await ldkClient.createDebugDeployment(
+                        mockFunctionConfig,
+                        'dest-token',
+                        900,
+                        false,
+                        'layer-arn',
+                        mockProgress as any
+                    ),
+                /Failed to create debug deployment/,
+                'Should throw error on deployment failure'
+            )
+        })
+
+        it('should handle missing function ARN', async () => {
+            const configWithoutArn = { ...mockFunctionConfig, FunctionArn: undefined }
+
+            await assert.rejects(
+                async () =>
+                    await ldkClient.createDebugDeployment(
+                        configWithoutArn,
+                        'dest-token',
+                        900,
+                        false,
+                        'layer-arn',
+                        mockProgress as any
+                    ),
+                /Function ARN is missing/,
+                'Should throw error for missing ARN'
+            )
+        })
+    })
+
+    describe('removeDebugDeployment()', () => {
+        const mockFunctionConfig: FunctionConfiguration = createMockFunctionConfig({
+            FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:testFunction',
+        })
+
+        beforeEach(() => {
+            mockLambdaClient.updateFunctionConfiguration.resolves({})
+        })
+
+        it('should remove debug deployment successfully', async () => {
+            const result = await ldkClient.removeDebugDeployment(mockFunctionConfig, false)
+
+            assert.strictEqual(result, true, 'Should return true on successful removal')
+            assert(mockLambdaClient.updateFunctionConfiguration.calledOnce, 'Should update function configuration')
+        })
+
+        it('should handle removal errors', async () => {
+            mockLambdaClient.updateFunctionConfiguration.rejects(new Error('Update failed'))
+
+            await assert.rejects(
+                async () => await ldkClient.removeDebugDeployment(mockFunctionConfig, false),
+                /Error removing debug deployment/,
+                'Should throw error on removal failure'
+            )
+        })
+
+        it('should handle missing function ARN', async () => {
+            const configWithoutArn = { ...mockFunctionConfig, FunctionArn: undefined, FunctionName: undefined }
+
+            await assert.rejects(
+                async () => await ldkClient.removeDebugDeployment(configWithoutArn, false),
+                /Error removing debug deployment/,
+                'Should throw error for missing ARN'
+            )
+        })
+    })
+
+    describe('deleteDebugVersion()', () => {
+        it('should delete debug version successfully', async () => {
+            mockLambdaClient.deleteFunction.resolves({})
+
+            const result = await ldkClient.deleteDebugVersion(
+                'arn:aws:lambda:us-east-1:123456789012:function:testFunction',
+                'v1'
+            )
+
+            assert.strictEqual(result, true, 'Should return true on successful deletion')
+            assert(mockLambdaClient.deleteFunction.calledOnce, 'Should call deleteFunction')
+        })
+
+        it('should handle version deletion errors', async () => {
+            mockLambdaClient.deleteFunction.rejects(new Error('Delete failed'))
+
+            const result = await ldkClient.deleteDebugVersion(
+                'arn:aws:lambda:us-east-1:123456789012:function:testFunction',
+                'v1'
+            )
+
+            assert.strictEqual(result, false, 'Should return false on deletion error')
+        })
+
+        it('should handle invalid ARN for version deletion', async () => {
+            const result = await ldkClient.deleteDebugVersion('invalid-arn', 'v1')
+
+            assert.strictEqual(result, false, 'Should return false for invalid ARN')
+        })
+    })
+
+    describe('startProxy()', () => {
+        beforeEach(() => {
+            mockLocalProxy.start.resolves(9229)
+            mockLocalProxy.stop.returns()
+        })
+
+        it('should start proxy successfully', async () => {
+            const result = await ldkClient.startProxy('us-east-1', 'source-token', 9229)
+
+            assert.strictEqual(result, true, 'Should return true on successful start')
+            assert(
+                mockLocalProxy.start.calledWith('us-east-1', 'source-token', 9229),
+                'Should start proxy with correct parameters'
+            )
+        })
+
+        it('should stop existing proxy before starting new one', async () => {
+            // Create a spy for the stop method
+            const stopSpy = sandbox.spy()
+
+            // Set up existing proxy with the spy
+            ;(ldkClient as any).localProxy = { stop: stopSpy }
+
+            await ldkClient.startProxy('us-east-1', 'source-token', 9229)
+
+            assert(stopSpy.called, 'Should stop existing proxy')
+        })
+
+        it('should handle proxy start errors', async () => {
+            mockLocalProxy.start.rejects(new Error('Proxy start failed'))
+
+            await assert.rejects(
+                async () => await ldkClient.startProxy('us-east-1', 'source-token', 9229),
+                /Failed to start proxy/,
+                'Should throw error on proxy start failure'
+            )
+        })
+    })
+
+    describe('stopProxy()', () => {
+        it('should stop proxy successfully', async () => {
+            // Set up existing proxy
+            ;(ldkClient as any).localProxy = { stop: mockLocalProxy.stop }
+
+            const result = await ldkClient.stopProxy()
+
+            assert.strictEqual(result, true, 'Should return true on successful stop')
+            assert(mockLocalProxy.stop.calledOnce, 'Should stop proxy')
+            assert.strictEqual((ldkClient as any).localProxy, undefined, 'Should clear proxy reference')
+        })
+
+        it('should handle stopping when no proxy exists', async () => {
+            const result = await ldkClient.stopProxy()
+
+            assert.strictEqual(result, true, 'Should return true when no proxy to stop')
+        })
+    })
+
+    describe('Client User-Agent', () => {
+        it('should create Lambda client with correct user-agent', async () => {
+            // Restore the existing stub and create a new one to track calls
+            const existingStub = (utils.getLambdaClientWithAgent as any).restore
+                ? (utils.getLambdaClientWithAgent as sinon.SinonStub)
+                : undefined
+            if (existingStub) {
+                existingStub.restore()
+            }
+
+            // Stub getUserAgent at the telemetryUtil level to return a known value
+            const getUserAgentStub = sandbox.stub(telemetryUtil, 'getUserAgent')
+            getUserAgentStub.returns('test-user-agent')
+
+            // Stub the sdkClientBuilderV3 to capture the client options
+            let capturedClientOptions: any
+            const createAwsServiceStub = sandbox.stub(globals.sdkClientBuilderV3, 'createAwsService')
+            createAwsServiceStub.callsFake((options: any) => {
+                capturedClientOptions = options
+                // Return a mock Lambda client that has the required methods
+                return {
+                    send: async () => ({
+                        Configuration: createMockFunctionConfig({
+                            FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:testFunction',
+                        }),
+                    }),
+                    middlewareStack: {} as any,
+                    destroy: () => {},
+                } as any
+            })
+
+            const mockFunctionConfig: FunctionConfiguration = createMockFunctionConfig({
+                FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:testFunction',
+            })
+
+            await ldkClient.getFunctionDetail(mockFunctionConfig.FunctionArn!)
+
+            assert(createAwsServiceStub.called, 'Should call createAwsService')
+            assert.strictEqual(capturedClientOptions.clientOptions.region, 'us-east-1', 'Should use correct region')
+            assert.deepStrictEqual(
+                capturedClientOptions.clientOptions.userAgent,
+                [['LAMBDA-DEBUG/1.0.0 test-user-agent']],
+                'Should include correct user-agent with LAMBDA-DEBUG prefix in Lambda API calls'
+            )
+        })
+
+        it('should create IoT client with correct user-agent', async () => {
+            // Restore the existing stub and create a new one to track calls
+            const existingStub = (utils.getIoTSTClientWithAgent as any).restore
+                ? (utils.getIoTSTClientWithAgent as sinon.SinonStub)
+                : undefined
+            if (existingStub) {
+                existingStub.restore()
+            }
+
+            // Stub getUserAgent to return a known value
+            const getUserAgentStub = sandbox.stub(telemetryUtil, 'getUserAgent')
+            getUserAgentStub.returns('test-user-agent')
+
+            // Stub the sdkClientBuilderV3 to capture the client options
+            let capturedClientOptions: any
+            const createAwsServiceStub = sandbox.stub(globals.sdkClientBuilderV3, 'createAwsService')
+            createAwsServiceStub.callsFake((options: any) => {
+                capturedClientOptions = options
+                return mockIoTSTClient as any
+            })
+
+            mockIoTSTClient.on(ListTunnelsCommand).resolves({ tunnelSummaries: [] })
+            mockIoTSTClient.on(OpenTunnelCommand).resolves({
+                tunnelId: 'tunnel-123',
+                sourceAccessToken: 'source-token',
+                destinationAccessToken: 'dest-token',
+            })
+
+            await ldkClient.createOrReuseTunnel('us-east-1')
+
+            assert(createAwsServiceStub.calledOnce, 'Should call createAwsService once')
+            assert.strictEqual(capturedClientOptions.clientOptions.region, 'us-east-1', 'Should use correct region')
+            assert.deepStrictEqual(
+                capturedClientOptions.clientOptions.userAgent,
+                [['LAMBDA-DEBUG/1.0.0 test-user-agent']],
+                'Should include correct user-agent with LAMBDA-DEBUG prefix'
+            )
+        })
+    })
+})
+
+describe('Helper Functions', () => {
+    describe('getRegionFromArn', () => {
+        it('should extract region from valid ARN', () => {
+            const arn = 'arn:aws:lambda:us-east-1:123456789012:function:testFunction'
+            const result = getRegionFromArn(arn)
+            assert.strictEqual(result, 'us-east-1', 'Should extract region correctly')
+        })
+
+        it('should handle undefined ARN', () => {
+            const result = getRegionFromArn(undefined)
+            assert.strictEqual(result, undefined, 'Should return undefined for undefined ARN')
+        })
+
+        it('should handle invalid ARN format', () => {
+            const result = getRegionFromArn('invalid-arn')
+            assert.strictEqual(result, undefined, 'Should return undefined for invalid ARN')
+        })
+
+        it('should handle ARN with insufficient parts', () => {
+            const result = getRegionFromArn('arn:aws:lambda')
+            assert.strictEqual(result, undefined, 'Should return undefined for ARN with insufficient parts')
+        })
+    })
+
+    describe('isTunnelInfo', () => {
+        it('should validate correct tunnel info', () => {
+            const tunnelInfo = {
+                tunnelID: 'tunnel-123',
+                sourceToken: 'source-token',
+                destinationToken: 'dest-token',
+            }
+            const result = isTunnelInfo(tunnelInfo)
+            assert.strictEqual(result, true, 'Should validate correct tunnel info')
+        })
+
+        it('should reject invalid tunnel info', () => {
+            const invalidTunnelInfo = {
+                tunnelID: 'tunnel-123',
+                sourceToken: 'source-token',
+                // missing destinationToken
+            }
+            const result = isTunnelInfo(invalidTunnelInfo as any)
+            assert.strictEqual(result, false, 'Should reject invalid tunnel info')
+        })
+
+        it('should reject non-object types', () => {
+            assert.strictEqual(isTunnelInfo('string' as any), false, 'Should reject string')
+            assert.strictEqual(isTunnelInfo(123 as any), false, 'Should reject number')
+            assert.strictEqual(isTunnelInfo(undefined as any), false, 'Should reject undefined')
+        })
+    })
+})
diff --git a/packages/core/src/test/lambda/remoteDebugging/ldkController.test.ts b/packages/core/src/test/lambda/remoteDebugging/ldkController.test.ts
new file mode 100644
index 00000000000..040264a9ff8
--- /dev/null
+++ b/packages/core/src/test/lambda/remoteDebugging/ldkController.test.ts
@@ -0,0 +1,805 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import sinon, { SinonStubbedInstance, createStubInstance } from 'sinon'
+import { FunctionConfiguration } from '@aws-sdk/client-lambda'
+import {
+    RemoteDebugController,
+    activateRemoteDebugging,
+    revertExistingConfig,
+    tryAutoDetectOutFile,
+} from '../../../lambda/remoteDebugging/ldkController'
+import { getLambdaSnapshot, type DebugConfig } from '../../../lambda/remoteDebugging/lambdaDebugger'
+import { LdkClient } from '../../../lambda/remoteDebugging/ldkClient'
+import globals from '../../../shared/extensionGlobals'
+import * as messages from '../../../shared/utilities/messages'
+import { getOpenExternalStub } from '../../globalSetup.test'
+import { assertTelemetry } from '../../testUtil'
+import {
+    createMockFunctionConfig,
+    createMockDebugConfig,
+    createMockGlobalState,
+    setupMockLdkClientOperations,
+    setupMockVSCodeDebugAPIs,
+    setupMockRevertExistingConfig,
+    setupDebuggingState,
+    setupMockCleanupOperations,
+} from './testUtils'
+import { getRemoteDebugLayer } from '../../../lambda/remoteDebugging/remoteLambdaDebugger'
+import { fs } from '../../../shared/fs/fs'
+import * as detectCdkProjects from '../../../awsService/cdk/explorer/detectCdkProjects'
+
+describe('RemoteDebugController', () => {
+    let sandbox: sinon.SinonSandbox
+    let mockLdkClient: SinonStubbedInstance<LdkClient>
+    let controller: RemoteDebugController
+    let mockGlobalState: any
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+
+        // Mock LdkClient
+        mockLdkClient = createStubInstance(LdkClient)
+        sandbox.stub(LdkClient, 'instance').get(() => mockLdkClient)
+
+        // Mock global state with actual storage
+        mockGlobalState = createMockGlobalState()
+        sandbox.stub(globals, 'globalState').value(mockGlobalState)
+
+        // Get controller instance
+        controller = RemoteDebugController.instance
+
+        // Ensure clean state
+        controller.ensureCleanState()
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+
+    describe('Singleton Pattern', () => {
+        it('should return the same instance', () => {
+            const instance1 = RemoteDebugController.instance
+            const instance2 = RemoteDebugController.instance
+            assert.strictEqual(instance1, instance2, 'Should return the same singleton instance')
+        })
+    })
+
+    describe('State Management', () => {
+        it('should initialize with clean state', () => {
+            controller.ensureCleanState()
+
+            assert.strictEqual(controller.isDebugging, false, 'Should not be debugging initially')
+            assert.strictEqual(controller.qualifier, undefined, 'Qualifier should be undefined initially')
+        })
+
+        it('should clean up disposables on ensureCleanState', () => {
+            // Set up some mock disposables
+            const mockDisposable = { dispose: sandbox.stub() }
+            ;(controller as any).debugSessionDisposables.set('test-arn', mockDisposable)
+
+            controller.ensureCleanState()
+
+            assert(mockDisposable.dispose.calledOnce, 'Should dispose existing disposables')
+            assert.strictEqual((controller as any).debugSessionDisposables.size, 0, 'Should clear disposables map')
+        })
+    })
+
+    describe('Runtime Support Checks', () => {
+        it('should support code download for node and python runtimes', () => {
+            assert.strictEqual(controller.supportCodeDownload('nodejs18.x'), true, 'Should support Node.js')
+            assert.strictEqual(controller.supportCodeDownload('python3.9'), true, 'Should support Python')
+            assert.strictEqual(
+                controller.supportCodeDownload('java11'),
+                false,
+                'Should not support Java for code download'
+            )
+            assert.strictEqual(controller.supportCodeDownload(undefined), false, 'Should not support undefined runtime')
+        })
+
+        it('should not support code download for hot-reloading LocalStack functions', () => {
+            assert.strictEqual(controller.supportCodeDownload('nodejs18.x', 'hot-reloading-hash-not-available'), false)
+        })
+
+        it('should support remote debug for node, python, and java runtimes', () => {
+            assert.strictEqual(controller.supportRuntimeRemoteDebug('nodejs18.x'), true, 'Should support Node.js')
+            assert.strictEqual(controller.supportRuntimeRemoteDebug('python3.9'), true, 'Should support Python')
+            assert.strictEqual(controller.supportRuntimeRemoteDebug('java11'), true, 'Should support Java')
+            assert.strictEqual(controller.supportRuntimeRemoteDebug('dotnet6'), false, 'Should not support .NET')
+            assert.strictEqual(
+                controller.supportRuntimeRemoteDebug(undefined),
+                false,
+                'Should not support undefined runtime'
+            )
+        })
+
+        it('should get remote debug layer for supported regions and architectures', () => {
+            const result = getRemoteDebugLayer('us-east-1', ['x86_64'])
+
+            assert.strictEqual(typeof result, 'string', 'Should return layer ARN for supported region and architecture')
+            assert(result?.includes('us-east-1'), 'Should contain the region in the ARN')
+            assert(result?.includes('LDKLayerX86'), 'Should contain the x86 layer name')
+        })
+
+        it('should return undefined for unsupported regions', () => {
+            const result = getRemoteDebugLayer('unsupported-region', ['x86_64'])
+
+            assert.strictEqual(result, undefined, 'Should return undefined for unsupported region')
+        })
+
+        it('should return undefined when region or architectures are undefined', () => {
+            assert.strictEqual(getRemoteDebugLayer(undefined, ['x86_64']), undefined)
+            assert.strictEqual(getRemoteDebugLayer('us-west-2', undefined), undefined)
+        })
+    })
+
+    describe('Extension Installation', () => {
+        it('should return true when extension is already installed', async () => {
+            // Mock VSCode extensions API - return extension as already installed
+            const mockExtension = { id: 'ms-vscode.js-debug', isActive: true }
+            sandbox.stub(vscode.extensions, 'getExtension').returns(mockExtension as any)
+
+            const result = await controller.installDebugExtension('nodejs18.x')
+
+            assert.strictEqual(result, true, 'Should return true when extension is already installed')
+        })
+
+        it('should return true when extension installation succeeds', async () => {
+            // Mock extension as not installed initially, then installed after command
+            const getExtensionStub = sandbox.stub(vscode.extensions, 'getExtension')
+            getExtensionStub.onFirstCall().returns(undefined) // Not installed initially
+            getExtensionStub.onSecondCall().returns({ isActive: true } as any) // Installed after command
+
+            sandbox.stub(vscode.commands, 'executeCommand').resolves()
+            sandbox.stub(messages, 'showConfirmationMessage').resolves(true)
+
+            const result = await controller.installDebugExtension('python3.9')
+
+            assert.strictEqual(result, true, 'Should return true when installation succeeds')
+        })
+
+        it('should return false when user cancels extension installation', async () => {
+            // Mock extension as not installed
+            sandbox.stub(vscode.extensions, 'getExtension').returns(undefined)
+            sandbox.stub(messages, 'showConfirmationMessage').resolves(false)
+
+            const result = await controller.installDebugExtension('python3.9')
+
+            assert.strictEqual(result, false, 'Should return false when user cancels')
+        })
+
+        it('should handle Java runtime workflow', async () => {
+            // Mock extension as already installed to skip extension installation
+            const mockExtension = { id: 'redhat.java', isActive: true }
+            sandbox.stub(vscode.extensions, 'getExtension').returns(mockExtension as any)
+
+            // Mock no Java path found
+            sandbox.stub(require('../../../shared/utilities/pathFind'), 'findJavaPath').resolves(undefined)
+
+            // Mock user choosing to install JVM
+            const showConfirmationStub = sandbox.stub(messages, 'showConfirmationMessage').resolves(true)
+
+            // Mock openExternal to prevent actual URL opening
+            // sandbox.stub(vscode.env, 'openExternal').resolves(true)
+            getOpenExternalStub().resolves(true)
+            const result = await controller.installDebugExtension('java11')
+
+            assert.strictEqual(result, false, 'Should return false to allow user to install JVM')
+            assert(showConfirmationStub.calledOnce, 'Should show JVM installation dialog')
+        })
+
+        it('should throw error for undefined runtime', async () => {
+            await assert.rejects(
+                async () => await controller.installDebugExtension(undefined),
+                /Runtime is undefined/,
+                'Should throw error for undefined runtime'
+            )
+        })
+    })
+
+    describe('Debug Session Management', () => {
+        let mockConfig: DebugConfig
+        let mockFunctionConfig: FunctionConfiguration
+
+        beforeEach(() => {
+            mockConfig = createMockDebugConfig({
+                layerArn: 'arn:aws:lambda:us-west-2:123456789012:layer:LDKLayerX86:6',
+            })
+
+            mockFunctionConfig = createMockFunctionConfig()
+        })
+
+        it('should start debugging successfully', async () => {
+            // Mock VSCode APIs
+            setupMockVSCodeDebugAPIs(sandbox)
+
+            // Mock runtime support
+            sandbox.stub(controller, 'supportRuntimeRemoteDebug').returns(true)
+
+            // Mock successful LdkClient operations
+            setupMockLdkClientOperations(mockLdkClient, mockFunctionConfig)
+
+            // Mock revertExistingConfig
+            setupMockRevertExistingConfig(sandbox)
+
+            await controller.startDebugging(mockConfig.functionArn, 'nodejs18.x', mockConfig)
+
+            // Assert state changes
+            assert.strictEqual(controller.isDebugging, true, 'Should be in debugging state')
+            // Qualifier is only set for version publishing, not for $LATEST
+            assert.strictEqual(controller.qualifier, undefined, 'Should not set qualifier for $LATEST')
+
+            // Verify LdkClient calls
+            assert(mockLdkClient.getFunctionDetail.calledWith(mockConfig.functionArn), 'Should get function details')
+            assert(mockLdkClient.createOrReuseTunnel.calledOnce, 'Should create tunnel')
+            assert(mockLdkClient.createDebugDeployment.calledOnce, 'Should create debug deployment')
+            assert(mockLdkClient.startProxy.calledOnce, 'Should start proxy')
+
+            assertTelemetry('lambda_remoteDebugStart', {
+                result: 'Succeeded',
+                source: 'remoteDebug',
+                action: '{"port":9229,"remoteRoot":"/var/task","skipFiles":[],"shouldPublishVersion":false,"lambdaTimeout":900,"layerArn":"arn:aws:lambda:us-west-2:123456789012:layer:LDKLayerX86:6","isLambdaRemote":true}',
+                runtimeString: 'nodejs18.x',
+            })
+        })
+
+        it('should handle debugging start failure and cleanup', async () => {
+            // Mock VSCode APIs
+            setupMockVSCodeDebugAPIs(sandbox)
+
+            // Mock runtime support
+            sandbox.stub(controller, 'supportRuntimeRemoteDebug').returns(true)
+
+            // Mock function config retrieval success but tunnel creation failure
+            setupMockLdkClientOperations(mockLdkClient, mockFunctionConfig)
+            mockLdkClient.createOrReuseTunnel.rejects(new Error('Tunnel creation failed'))
+
+            // Mock revertExistingConfig
+            setupMockRevertExistingConfig(sandbox)
+
+            let errorThrown = false
+            try {
+                await controller.startDebugging(mockConfig.functionArn, 'nodejs18.x', mockConfig)
+            } catch (error) {
+                errorThrown = true
+                assert(error instanceof Error, 'Should throw an error')
+                assert(
+                    error.message.includes('Error StartDebugging') || error.message.includes('Tunnel creation failed'),
+                    'Should throw relevant error'
+                )
+            }
+
+            assert(errorThrown, 'Should have thrown an error')
+
+            // Assert state is cleaned up
+            assert.strictEqual(controller.isDebugging, false, 'Should not be in debugging state after failure')
+            assert(mockLdkClient.stopProxy.calledOnce, 'Should attempt cleanup')
+        })
+
+        it('should handle version publishing workflow', async () => {
+            // Mock VSCode APIs
+            setupMockVSCodeDebugAPIs(sandbox)
+
+            // Mock runtime support
+            sandbox.stub(controller, 'supportRuntimeRemoteDebug').returns(true)
+
+            const versionConfig = { ...mockConfig, shouldPublishVersion: true }
+
+            // Mock successful LdkClient operations with version publishing
+            setupMockLdkClientOperations(mockLdkClient, mockFunctionConfig)
+            mockLdkClient.createDebugDeployment.resolves('v1')
+
+            // Mock revertExistingConfig
+            setupMockRevertExistingConfig(sandbox)
+
+            await controller.startDebugging(versionConfig.functionArn, 'nodejs18.x', versionConfig)
+
+            assert.strictEqual(controller.isDebugging, true, 'Should be in debugging state')
+            assert.strictEqual(controller.qualifier, 'v1', 'Should set version qualifier')
+            // Verify telemetry was emitted with version action
+            assertTelemetry('lambda_remoteDebugStart', {
+                result: 'Succeeded',
+                source: 'remoteDebug',
+                action: '{"port":9229,"remoteRoot":"/var/task","skipFiles":[],"shouldPublishVersion":true,"lambdaTimeout":900,"layerArn":"arn:aws:lambda:us-west-2:123456789012:layer:LDKLayerX86:6","isLambdaRemote":true}',
+                runtimeString: 'nodejs18.x',
+            })
+        })
+
+        it('should prevent multiple debugging sessions', async () => {
+            // Set controller to already debugging
+            controller.isDebugging = true
+
+            await controller.startDebugging(mockConfig.functionArn, 'nodejs18.x', mockConfig)
+
+            // Should not call LdkClient methods
+            assert(mockLdkClient.getFunctionDetail.notCalled, 'Should not start new session')
+        })
+    })
+
+    describe('Stop Debugging', () => {
+        it('should stop debugging successfully', async () => {
+            // Mock VSCode APIs
+            sandbox.stub(vscode.commands, 'executeCommand').resolves()
+
+            // Set up debugging state
+            await setupDebuggingState(controller, mockGlobalState)
+
+            // Mock successful cleanup operations
+            setupMockCleanupOperations(mockLdkClient)
+
+            await controller.stopDebugging()
+
+            // Assert state is cleaned up
+            assert.strictEqual(controller.isDebugging, false, 'Should not be in debugging state')
+
+            // Verify cleanup operations
+            assert(mockLdkClient.stopProxy.calledOnce, 'Should stop proxy')
+            assert(mockLdkClient.removeDebugDeployment.calledOnce, 'Should remove debug deployment')
+            assert(mockLdkClient.deleteDebugVersion.calledOnce, 'Should delete debug version')
+            assertTelemetry('lambda_remoteDebugStop', {
+                result: 'Succeeded',
+            })
+        })
+
+        it('should handle stop debugging when not debugging', async () => {
+            controller.isDebugging = false
+
+            await controller.stopDebugging()
+
+            // Should complete without error when not debugging
+            assert.strictEqual(controller.isDebugging, false, 'Should remain not debugging')
+        })
+
+        it('should handle cleanup errors gracefully', async () => {
+            // Mock VSCode APIs
+            sandbox.stub(vscode.commands, 'executeCommand').resolves()
+
+            controller.isDebugging = true
+
+            const mockFunctionConfig = {
+                FunctionName: 'testFunction',
+                FunctionArn: 'arn:aws:lambda:us-west-2:123456789012:function:testFunction',
+            }
+            // Set up the snapshot in mock state
+            await mockGlobalState.update('aws.lambda.remoteDebugSnapshot', mockFunctionConfig)
+
+            // Mock cleanup failure
+            mockLdkClient.stopProxy.rejects(new Error('Cleanup failed'))
+            mockLdkClient.removeDebugDeployment.resolves(true)
+
+            await assert.rejects(
+                async () => await controller.stopDebugging(),
+                /error when stopping remote debug/,
+                'Should throw error on cleanup failure'
+            )
+
+            // State should still be cleaned up
+            assert.strictEqual(controller.isDebugging, false, 'Should clean up state even on error')
+            // Verify telemetry was emitted for failure
+            assertTelemetry('lambda_remoteDebugStop', {
+                result: 'Failed',
+            })
+        })
+    })
+
+    describe('Snapshot Management', () => {
+        it('should get lambda snapshot from global state', async () => {
+            const mockSnapshot = {
+                FunctionName: 'testFunction',
+                FunctionArn: 'arn:aws:lambda:us-west-2:123456789012:function:testFunction',
+            }
+            // Set up the snapshot in mock state
+            await mockGlobalState.update('aws.lambda.remoteDebugSnapshot', mockSnapshot)
+
+            const result = getLambdaSnapshot()
+
+            assert.deepStrictEqual(result, mockSnapshot, 'Should return snapshot from global state')
+        })
+
+        it('should return undefined when no snapshot exists', () => {
+            const result = getLambdaSnapshot()
+
+            assert.strictEqual(result, undefined, 'Should return undefined when no snapshot')
+        })
+    })
+
+    describe('Telemetry Verification', () => {
+        let mockConfig: DebugConfig
+        let mockFunctionConfig: FunctionConfiguration
+
+        beforeEach(() => {
+            mockConfig = createMockDebugConfig({
+                layerArn: 'arn:aws:lambda:us-west-2:123456789012:layer:LDKLayerX86:6',
+            })
+
+            mockFunctionConfig = createMockFunctionConfig()
+        })
+
+        it('should emit lambda_remoteDebugStart telemetry for failed debugging start', async () => {
+            // Mock VSCode APIs
+            setupMockVSCodeDebugAPIs(sandbox)
+
+            // Mock runtime support
+            sandbox.stub(controller, 'supportRuntimeRemoteDebug').returns(true)
+
+            // Mock function config retrieval success but tunnel creation failure
+            setupMockLdkClientOperations(mockLdkClient, mockFunctionConfig)
+            mockLdkClient.createOrReuseTunnel.rejects(new Error('Tunnel creation failed'))
+
+            // Mock revertExistingConfig
+            setupMockRevertExistingConfig(sandbox)
+
+            try {
+                await controller.startDebugging(mockConfig.functionArn, 'nodejs18.x', mockConfig)
+            } catch (error) {
+                // Expected to throw
+            }
+
+            // Verify telemetry was emitted for failure
+            assertTelemetry('lambda_remoteDebugStart', {
+                result: 'Failed',
+                source: 'remoteDebug',
+                action: '{"port":9229,"remoteRoot":"/var/task","skipFiles":[],"shouldPublishVersion":false,"lambdaTimeout":900,"layerArn":"arn:aws:lambda:us-west-2:123456789012:layer:LDKLayerX86:6","isLambdaRemote":true}',
+                runtimeString: 'nodejs18.x',
+            })
+        })
+    })
+})
+
+describe('tryAutoDetectOutFile', () => {
+    let sandbox: sinon.SinonSandbox
+
+    // Common test constants
+    const testFunctionName = 'TestFunction'
+    const testSamProjectRoot = vscode.Uri.file('/path/to/sam-project')
+    const testSamLogicalId = 'MyFunction'
+    const testCdkProjectRoot = vscode.Uri.file('/path/to/cdk-project')
+    const testCdkAssetPath = 'asset.728566f9cc2388f3c89a024fd2e887b4d82715454a0fc478f57d7d034364fdd5'
+    const testCdkOutDir = vscode.Uri.joinPath(testCdkProjectRoot, 'cdk.out')
+    const testMockWorkspaceFolder: vscode.WorkspaceFolder = {
+        uri: testCdkProjectRoot,
+        name: 'cdk-project',
+        index: 0,
+    }
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+
+    it('should return undefined for non-TypeScript files', async () => {
+        const debugConfig: DebugConfig = createMockDebugConfig({
+            handlerFile: '/path/to/handler.js', // JavaScript file, not TypeScript
+        })
+        const functionConfig: FunctionConfiguration = createMockFunctionConfig()
+
+        const result = await tryAutoDetectOutFile(debugConfig, functionConfig)
+
+        assert.strictEqual(result, undefined, 'Should return undefined for non-TypeScript files')
+    })
+
+    it('should return undefined when handlerFile is not provided', async () => {
+        const debugConfig: DebugConfig = createMockDebugConfig({
+            handlerFile: undefined,
+        })
+        const functionConfig: FunctionConfiguration = createMockFunctionConfig()
+
+        const result = await tryAutoDetectOutFile(debugConfig, functionConfig)
+
+        assert.strictEqual(result, undefined, 'Should return undefined when handlerFile is not provided')
+    })
+
+    it('should detect SAM build path when SAM parameters are provided', async () => {
+        const expectedPath = vscode.Uri.joinPath(testSamProjectRoot, '.aws-sam', 'build', testSamLogicalId)
+
+        const debugConfig: DebugConfig = createMockDebugConfig({
+            handlerFile: '/path/to/handler.ts',
+            samProjectRoot: testSamProjectRoot,
+            samFunctionLogicalId: testSamLogicalId,
+        })
+        const functionConfig: FunctionConfiguration = createMockFunctionConfig()
+
+        // Mock fs.exists to return true for SAM build path
+        sandbox.stub(fs, 'exists').resolves(true)
+
+        const result = await tryAutoDetectOutFile(debugConfig, functionConfig)
+
+        assert.strictEqual(result, expectedPath.fsPath, 'Should return SAM build path')
+    })
+
+    it('should return undefined when SAM build path does not exist', async () => {
+        const debugConfig: DebugConfig = createMockDebugConfig({
+            handlerFile: '/path/to/handler.ts',
+            samProjectRoot: testSamProjectRoot,
+            samFunctionLogicalId: testSamLogicalId,
+        })
+        const functionConfig: FunctionConfiguration = createMockFunctionConfig()
+
+        // Mock fs.exists to return false
+        sandbox.stub(fs, 'exists').resolves(false)
+
+        const result = await tryAutoDetectOutFile(debugConfig, functionConfig)
+
+        assert.strictEqual(result, undefined, 'Should return undefined when SAM build path does not exist')
+    })
+
+    it('should detect CDK asset path from template.json', async () => {
+        const expectedAssetDir = vscode.Uri.joinPath(testCdkOutDir, testCdkAssetPath)
+
+        const debugConfig: DebugConfig = createMockDebugConfig({
+            handlerFile: '/path/to/cdk-project/src/handler.ts',
+        })
+        const functionConfig: FunctionConfiguration = createMockFunctionConfig({
+            FunctionName: testFunctionName,
+        })
+
+        // Mock workspace folder
+        sandbox.stub(vscode.workspace, 'getWorkspaceFolder').returns(testMockWorkspaceFolder)
+
+        // Mock CDK project detection
+        const detectCdkProjectsStub = sandbox.stub(detectCdkProjects, 'detectCdkProjects')
+        detectCdkProjectsStub.resolves([
+            {
+                cdkJsonUri: vscode.Uri.joinPath(testMockWorkspaceFolder.uri, 'cdk.json'),
+                treeUri: vscode.Uri.joinPath(testCdkOutDir, 'tree.json'),
+            },
+        ])
+
+        // Mock finding template files
+        sandbox
+            .stub(vscode.workspace, 'findFiles')
+            .resolves([vscode.Uri.joinPath(testCdkOutDir, 'stack.template.json')])
+
+        // Mock reading template file
+        const mockTemplate = {
+            Resources: {
+                MyFunctionB75F74F2: {
+                    Type: 'AWS::Lambda::Function',
+                    Properties: {
+                        FunctionName: testFunctionName,
+                    },
+                    Metadata: {
+                        'aws:asset:path': testCdkAssetPath,
+                    },
+                },
+            },
+        }
+        const readTextStub = sandbox.stub(fs, 'readFileText')
+        readTextStub.resolves(JSON.stringify(mockTemplate))
+        sandbox.stub(fs, 'exists').resolves(true)
+
+        const result = await tryAutoDetectOutFile(debugConfig, functionConfig)
+
+        assert.strictEqual(result, expectedAssetDir.fsPath, 'Should return CDK asset directory path')
+
+        const functionNonExistConfig: FunctionConfiguration = createMockFunctionConfig({
+            FunctionName: 'NonExistentFunction',
+        })
+        const result2 = await tryAutoDetectOutFile(debugConfig, functionNonExistConfig)
+
+        assert.strictEqual(result2, undefined, 'Should return undefined when function not found in template')
+
+        readTextStub.resolves('{ invalid json }')
+
+        const result3 = await tryAutoDetectOutFile(debugConfig, functionConfig)
+
+        assert.strictEqual(result3, undefined, 'Should return undefined on template parsing error')
+    })
+
+    it('should return undefined when no workspace folder is found', async () => {
+        const debugConfig: DebugConfig = createMockDebugConfig({
+            handlerFile: '/path/to/handler.ts',
+        })
+        const functionConfig: FunctionConfiguration = createMockFunctionConfig()
+
+        // Mock no workspace folder
+        sandbox.stub(vscode.workspace, 'getWorkspaceFolder').returns(undefined)
+
+        const result = await tryAutoDetectOutFile(debugConfig, functionConfig)
+
+        assert.strictEqual(result, undefined, 'Should return undefined when no workspace folder')
+    })
+
+    it('should prioritize SAM detection over CDK detection', async () => {
+        const samPath = vscode.Uri.joinPath(testSamProjectRoot, '.aws-sam', 'build', testSamLogicalId)
+
+        const debugConfig: DebugConfig = createMockDebugConfig({
+            handlerFile: '/path/to/handler.ts',
+            samProjectRoot: testSamProjectRoot,
+            samFunctionLogicalId: testSamLogicalId,
+        })
+        const functionConfig: FunctionConfiguration = createMockFunctionConfig({
+            FunctionName: testFunctionName,
+        })
+
+        // Mock fs.exists to return true for SAM path
+        const existsStub = sandbox.stub(fs, 'exists')
+        existsStub.withArgs(samPath).resolves(true)
+
+        // Even though we could detect CDK, SAM should be prioritized
+        const result = await tryAutoDetectOutFile(debugConfig, functionConfig)
+
+        assert.strictEqual(result, samPath.fsPath, 'Should prioritize SAM detection over CDK')
+    })
+
+    it('should handle .tsx TypeScript files', async () => {
+        const expectedPath = vscode.Uri.joinPath(testSamProjectRoot, '.aws-sam', 'build', testSamLogicalId)
+
+        const debugConfig: DebugConfig = createMockDebugConfig({
+            handlerFile: '/path/to/handler.tsx', // TSX file
+            samProjectRoot: testSamProjectRoot,
+            samFunctionLogicalId: testSamLogicalId,
+        })
+        const functionConfig: FunctionConfiguration = createMockFunctionConfig()
+
+        // Mock fs.exists to return true
+        sandbox.stub(fs, 'exists').resolves(true)
+
+        const result = await tryAutoDetectOutFile(debugConfig, functionConfig)
+
+        assert.strictEqual(result, expectedPath.fsPath, 'Should handle .tsx files')
+    })
+})
+
+describe('Module Functions', () => {
+    let sandbox: sinon.SinonSandbox
+    let mockGlobalState: any
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+
+        // Mock global state with actual storage
+        mockGlobalState = createMockGlobalState()
+        sandbox.stub(globals, 'globalState').value(mockGlobalState)
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+
+    describe('activateRemoteDebugging', () => {
+        it('should activate remote debugging and ensure clean state', async () => {
+            // Mock revertExistingConfig
+            sandbox
+                .stub(require('../../../lambda/remoteDebugging/ldkController'), 'revertExistingConfig')
+                .resolves(true)
+
+            // Mock controller
+            const mockController = {
+                ensureCleanState: sandbox.stub(),
+            }
+            sandbox.stub(RemoteDebugController, 'instance').get(() => mockController)
+
+            await activateRemoteDebugging()
+
+            assert(mockController.ensureCleanState.calledOnce, 'Should ensure clean state')
+        })
+
+        it('should handle activation errors gracefully', async () => {
+            // Mock revertExistingConfig to throw error
+            sandbox
+                .stub(require('../../../lambda/remoteDebugging/ldkController'), 'revertExistingConfig')
+                .rejects(new Error('Revert failed'))
+
+            // Should not throw error, just handle gracefully
+            await activateRemoteDebugging()
+
+            // Test passes if no error is thrown
+            assert(true, 'Should handle activation errors gracefully')
+        })
+    })
+
+    describe('revertExistingConfig', () => {
+        let mockLdkClient: SinonStubbedInstance<LdkClient>
+
+        beforeEach(() => {
+            mockLdkClient = createStubInstance(LdkClient)
+            sandbox.stub(LdkClient, 'instance').get(() => mockLdkClient)
+        })
+
+        it('should return true when no existing config', async () => {
+            // mockGlobalState.get.returns(undefined)
+
+            const result = await revertExistingConfig()
+
+            assert.strictEqual(result, true, 'Should return true when no config to revert')
+        })
+
+        it('should revert existing config successfully', async () => {
+            const mockSnapshot = {
+                FunctionName: 'testFunction',
+                FunctionArn: 'arn:aws:lambda:us-west-2:123456789012:function:testFunction',
+                Timeout: 30,
+            }
+            const mockCurrentConfig = {
+                FunctionName: 'testFunction',
+                FunctionArn: 'arn:aws:lambda:us-west-2:123456789012:function:testFunction',
+                Timeout: 900, // Different from snapshot
+            }
+
+            // Set up the snapshot in mock state
+            await mockGlobalState.update('aws.lambda.remoteDebugSnapshot', mockSnapshot)
+            mockLdkClient.getFunctionDetail.resolves(mockCurrentConfig)
+            mockLdkClient.removeDebugDeployment.resolves(true)
+
+            const showConfirmationStub = sandbox.stub(messages, 'showConfirmationMessage').resolves(true)
+            const result = await revertExistingConfig()
+
+            assert.strictEqual(result, true, 'Should return true on successful revert')
+            assert(showConfirmationStub.calledOnce, 'Should show confirmation dialog')
+            assert(mockLdkClient.removeDebugDeployment.calledWith(mockSnapshot, false), 'Should revert config')
+        })
+
+        it('should handle user cancellation of revert', async () => {
+            const mockSnapshot = {
+                FunctionName: 'testFunction',
+                FunctionArn: 'arn:aws:lambda:us-west-2:123456789012:function:testFunction',
+            }
+            const mockCurrentConfig = {
+                FunctionName: 'testFunction',
+                FunctionArn: 'arn:aws:lambda:us-west-2:123456789012:function:testFunction',
+                Timeout: 900,
+            }
+
+            // Set up the snapshot in mock state
+            await mockGlobalState.update('aws.lambda.remoteDebugSnapshot', mockSnapshot)
+            mockLdkClient.getFunctionDetail.resolves(mockCurrentConfig)
+
+            sandbox.stub(messages, 'showConfirmationMessage').resolves(false)
+
+            const result = await revertExistingConfig()
+
+            assert.strictEqual(result, true, 'Should return true when user cancels')
+            // Verify snapshot was cleared
+            assert.strictEqual(
+                mockGlobalState.get('aws.lambda.remoteDebugSnapshot'),
+                undefined,
+                'Should clear snapshot'
+            )
+        })
+
+        it('should handle corrupted snapshot gracefully', async () => {
+            const corruptedSnapshot = {
+                // Missing FunctionArn and FunctionName
+                Timeout: 30,
+            }
+
+            // Set up corrupted snapshot in mock state
+            await mockGlobalState.update('aws.lambda.remoteDebugSnapshot', corruptedSnapshot)
+
+            const result = await revertExistingConfig()
+
+            assert.strictEqual(result, true, 'Should return true for corrupted snapshot')
+            // Verify snapshot was cleared
+            assert.strictEqual(
+                mockGlobalState.get('aws.lambda.remoteDebugSnapshot'),
+                undefined,
+                'Should clear corrupted snapshot'
+            )
+        })
+
+        it('should handle revert errors', async () => {
+            const mockSnapshot = {
+                FunctionName: 'testFunction',
+                FunctionArn: 'arn:aws:lambda:us-west-2:123456789012:function:testFunction',
+            }
+
+            // Set up the snapshot in mock state
+            await mockGlobalState.update('aws.lambda.remoteDebugSnapshot', mockSnapshot)
+            mockLdkClient.getFunctionDetail.rejects(new Error('Failed to get function'))
+
+            await assert.rejects(
+                async () => await revertExistingConfig(),
+                /Error in revertExistingConfig/,
+                'Should throw error on revert failure'
+            )
+        })
+    })
+})
diff --git a/packages/core/src/test/lambda/remoteDebugging/localProxy.test.ts b/packages/core/src/test/lambda/remoteDebugging/localProxy.test.ts
new file mode 100644
index 00000000000..7c1bd0479b4
--- /dev/null
+++ b/packages/core/src/test/lambda/remoteDebugging/localProxy.test.ts
@@ -0,0 +1,421 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import WebSocket from 'ws'
+import { LocalProxy } from '../../../lambda/remoteDebugging/localProxy'
+
+describe('LocalProxy', () => {
+    let sandbox: sinon.SinonSandbox
+    let localProxy: LocalProxy
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+        localProxy = new LocalProxy()
+    })
+
+    afterEach(() => {
+        localProxy.stop()
+        sandbox.restore()
+    })
+
+    describe('Constructor', () => {
+        it('should initialize with default values', () => {
+            const proxy = new LocalProxy()
+            assert.strictEqual((proxy as any).isConnected, false, 'Should not be connected initially')
+            assert.strictEqual((proxy as any).reconnectAttempts, 0, 'Should have zero reconnect attempts')
+            assert.strictEqual((proxy as any).currentStreamId, 1, 'Should start with stream ID 1')
+            assert.strictEqual((proxy as any).nextConnectionId, 1, 'Should start with connection ID 1')
+        })
+    })
+
+    describe('Protobuf Loading', () => {
+        it('should load protobuf definition successfully', async () => {
+            const proxy = new LocalProxy()
+            await (proxy as any).loadProtobufDefinition()
+
+            assert((proxy as any).Message, 'Should load Message type')
+            assert.strictEqual(typeof (proxy as any).Message, 'object', 'Message should be a protobuf Type object')
+            assert.strictEqual((proxy as any).Message.constructor.name, 'Type', 'Message should be a protobuf Type')
+        })
+
+        it('should not reload protobuf definition if already loaded', async () => {
+            const proxy = new LocalProxy()
+            await (proxy as any).loadProtobufDefinition()
+            const firstMessage = (proxy as any).Message
+
+            await (proxy as any).loadProtobufDefinition()
+            const secondMessage = (proxy as any).Message
+
+            assert.strictEqual(firstMessage, secondMessage, 'Should not reload protobuf definition')
+        })
+    })
+
+    describe('TCP Server Management', () => {
+        it('should close TCP server and connections properly', () => {
+            const mockSocket = {
+                removeAllListeners: sandbox.stub(),
+                destroy: sandbox.stub(),
+            }
+
+            const mockServer = {
+                removeAllListeners: sandbox.stub(),
+                close: sandbox.stub().callsArg(0),
+            }
+
+            // Set up mock state
+            ;(localProxy as any).tcpServer = mockServer
+            ;(localProxy as any).tcpConnections = new Map([[1, { socket: mockSocket }]])
+            ;(localProxy as any).closeTcpServer()
+
+            assert(mockSocket.removeAllListeners.called, 'Should remove socket listeners')
+            assert(mockSocket.destroy.calledOnce, 'Should destroy socket')
+            assert(mockServer.removeAllListeners.called, 'Should remove server listeners')
+            assert(mockServer.close.calledOnce, 'Should close server')
+        })
+    })
+
+    describe('WebSocket Connection Management', () => {
+        it('should create WebSocket with correct URL and headers', async () => {
+            const mockWs = {
+                on: sandbox.stub(),
+                once: sandbox.stub(),
+                readyState: WebSocket.OPEN,
+                removeAllListeners: sandbox.stub(),
+                close: sandbox.stub(),
+                terminate: sandbox.stub(),
+            }
+
+            // Set up LocalProxy with required properties
+            ;(localProxy as any).region = 'us-east-1'
+            ;(localProxy as any).accessToken = 'test-access-token'
+
+            // Mock the WebSocket constructor
+            const WebSocketStub = sandbox.stub().returns(mockWs)
+            sandbox.stub(WebSocket, 'WebSocket').callsFake(WebSocketStub)
+
+            // Mock the open event to resolve the promise
+            mockWs.on.withArgs('open').callsArg(1)
+
+            await (localProxy as any).connectWebSocket()
+
+            assert(WebSocketStub.calledOnce, 'Should create WebSocket')
+            const [url, protocols, options] = WebSocketStub.getCall(0).args
+
+            assert(url.includes('wss://data.tunneling.iot.'), 'Should use correct WebSocket URL')
+            assert(url.includes('.amazonaws.com:443/tunnel'), 'Should use correct WebSocket URL')
+            assert(url.includes('local-proxy-mode=source'), 'Should set local proxy mode')
+            assert.deepStrictEqual(protocols, ['aws.iot.securetunneling-3.0'], 'Should use correct protocol')
+            assert(options && options.headers && options.headers['access-token'], 'Should include access token header')
+            assert(options && options.headers && options.headers['client-token'], 'Should include client token header')
+        })
+
+        it('should handle WebSocket connection errors', async () => {
+            const mockWs = {
+                on: sandbox.stub(),
+                once: sandbox.stub(),
+                readyState: WebSocket.CONNECTING,
+                removeAllListeners: sandbox.stub(),
+                close: sandbox.stub(),
+                terminate: sandbox.stub(),
+            }
+
+            sandbox.stub(WebSocket, 'WebSocket').returns(mockWs)
+
+            // Mock the error event
+            mockWs.on.withArgs('error').callsArgWith(1, new Error('Connection failed'))
+
+            await assert.rejects(
+                async () => await (localProxy as any).connectWebSocket(),
+                /Connection failed/,
+                'Should throw error on WebSocket connection failure'
+            )
+        })
+
+        it('should close WebSocket connection properly', () => {
+            const mockWs = {
+                readyState: WebSocket.OPEN,
+                removeAllListeners: sandbox.stub(),
+                close: sandbox.stub(),
+                terminate: sandbox.stub(),
+                once: sandbox.stub(),
+            }
+
+            ;(localProxy as any).ws = mockWs
+            ;(localProxy as any).closeWebSocket()
+
+            assert(mockWs.removeAllListeners.called, 'Should remove all listeners')
+            assert(mockWs.close.calledWith(1000, 'Normal Closure'), 'Should close with normal closure code')
+        })
+
+        it('should terminate WebSocket if not open', () => {
+            const mockWs = {
+                readyState: WebSocket.CONNECTING,
+                removeAllListeners: sandbox.stub(),
+                close: sandbox.stub(),
+                terminate: sandbox.stub(),
+            }
+
+            ;(localProxy as any).ws = mockWs
+            ;(localProxy as any).closeWebSocket()
+
+            assert(mockWs.terminate.calledOnce, 'Should terminate WebSocket if not open')
+        })
+    })
+
+    describe('Ping/Pong Management', () => {
+        it('should start ping interval', () => {
+            const setIntervalStub = sandbox.stub(global, 'setInterval').returns({} as any)
+
+            ;(localProxy as any).startPingInterval()
+
+            assert(setIntervalStub.calledOnce, 'Should start ping interval')
+            assert.strictEqual(setIntervalStub.getCall(0).args[1], 30000, 'Should ping every 30 seconds')
+        })
+
+        it('should stop ping interval', () => {
+            const clearIntervalStub = sandbox.stub(global, 'clearInterval')
+            const mockInterval = {} as any
+            ;(localProxy as any).pingInterval = mockInterval
+            ;(localProxy as any).stopPingInterval()
+
+            assert(clearIntervalStub.calledWith(mockInterval), 'Should clear ping interval')
+            assert.strictEqual((localProxy as any).pingInterval, undefined, 'Should clear interval reference')
+        })
+
+        it('should send ping when WebSocket is open', () => {
+            const mockWs = {
+                readyState: WebSocket.OPEN,
+                ping: sandbox.stub(),
+            }
+
+            ;(localProxy as any).ws = mockWs
+
+            // Simulate ping interval callback
+            const setIntervalStub = sandbox.stub(global, 'setInterval')
+            ;(localProxy as any).startPingInterval()
+
+            const pingCallback = setIntervalStub.getCall(0).args[0]
+            pingCallback()
+
+            assert(mockWs.ping.calledOnce, 'Should send ping')
+        })
+    })
+
+    describe('Message Processing', () => {
+        beforeEach(async () => {
+            // Load protobuf definition
+            await (localProxy as any).loadProtobufDefinition()
+        })
+
+        it('should process binary WebSocket messages', () => {
+            const processMessageStub = sandbox.stub(localProxy as any, 'processMessage')
+
+            // Create a mock message buffer with length prefix
+            const messageData = Buffer.from('test message')
+            const buffer = Buffer.alloc(2 + messageData.length)
+            buffer.writeUInt16BE(messageData.length, 0)
+            messageData.copy(buffer, 2)
+            ;(localProxy as any).handleWebSocketMessage(buffer)
+
+            assert(processMessageStub.calledOnce, 'Should process message')
+            assert(processMessageStub.calledWith(messageData), 'Should pass correct message data')
+        })
+
+        it('should handle incomplete message data', () => {
+            const processMessageStub = sandbox.stub(localProxy as any, 'processMessage')
+
+            // Create incomplete buffer (only length prefix)
+            const buffer = Buffer.alloc(2)
+            buffer.writeUInt16BE(100, 0) // Claims 100 bytes but buffer is only 2
+            ;(localProxy as any).handleWebSocketMessage(buffer)
+
+            assert(processMessageStub.notCalled, 'Should not process incomplete message')
+        })
+
+        it('should handle non-buffer WebSocket messages', () => {
+            const processMessageStub = sandbox.stub(localProxy as any, 'processMessage')
+
+            ;(localProxy as any).handleWebSocketMessage('string message')
+
+            assert(processMessageStub.notCalled, 'Should not process non-buffer messages')
+        })
+    })
+
+    describe('TCP Connection Handling', () => {
+        beforeEach(() => {
+            ;(localProxy as any).isConnected = true
+            ;(localProxy as any).isDisposed = false
+        })
+
+        it('should handle new TCP connections when connected', () => {
+            const mockSocket = {
+                on: sandbox.stub(),
+                destroy: sandbox.stub(),
+                once: sandbox.stub(),
+            }
+
+            const sendStreamStartStub = sandbox.stub(localProxy as any, 'sendStreamStart')
+
+            ;(localProxy as any).handleNewTcpConnection(mockSocket)
+
+            assert(mockSocket.on.calledWith('data'), 'Should listen for data events')
+            assert(mockSocket.on.calledWith('error'), 'Should listen for error events')
+            assert(mockSocket.on.calledWith('close'), 'Should listen for close events')
+            assert(sendStreamStartStub.calledOnce, 'Should send stream start for first connection')
+        })
+
+        it('should reject TCP connections when not connected', () => {
+            ;(localProxy as any).isConnected = false
+
+            const mockSocket = {
+                destroy: sandbox.stub(),
+            }
+
+            ;(localProxy as any).handleNewTcpConnection(mockSocket)
+
+            assert(mockSocket.destroy.calledOnce, 'Should destroy socket when not connected')
+        })
+
+        it('should reject TCP connections when disposed', () => {
+            ;(localProxy as any).isDisposed = true
+
+            const mockSocket = {
+                destroy: sandbox.stub(),
+            }
+
+            ;(localProxy as any).handleNewTcpConnection(mockSocket)
+
+            assert(mockSocket.destroy.calledOnce, 'Should destroy socket when disposed')
+        })
+
+        it('should send connection start for subsequent connections', () => {
+            ;(localProxy as any).nextConnectionId = 2 // Second connection
+
+            const mockSocket = {
+                on: sandbox.stub(),
+                destroy: sandbox.stub(),
+                once: sandbox.stub(),
+            }
+
+            const sendConnectionStartStub = sandbox.stub(localProxy as any, 'sendConnectionStart')
+
+            ;(localProxy as any).handleNewTcpConnection(mockSocket)
+
+            assert(sendConnectionStartStub.calledOnce, 'Should send connection start for subsequent connections')
+        })
+    })
+
+    describe('Lifecycle Management', () => {
+        it('should start proxy successfully', async () => {
+            const startTcpServerStub = sandbox.stub(localProxy as any, 'startTcpServer').resolves(9229)
+            const connectWebSocketStub = sandbox.stub(localProxy as any, 'connectWebSocket').resolves()
+
+            const port = await localProxy.start('us-east-1', 'source-token', 9229)
+
+            assert.strictEqual(port, 9229, 'Should return assigned port')
+            assert(startTcpServerStub.calledWith(9229), 'Should start TCP server')
+            assert(connectWebSocketStub.calledOnce, 'Should connect WebSocket')
+            assert.strictEqual((localProxy as any).region, 'us-east-1', 'Should store region')
+            assert.strictEqual((localProxy as any).accessToken, 'source-token', 'Should store access token')
+        })
+
+        it('should handle start errors and cleanup', async () => {
+            sandbox.stub(localProxy as any, 'startTcpServer').resolves(9229)
+            sandbox.stub(localProxy as any, 'connectWebSocket').rejects(new Error('WebSocket failed'))
+            const stopStub = sandbox.stub(localProxy, 'stop')
+
+            await assert.rejects(
+                async () => await localProxy.start('us-east-1', 'source-token', 9229),
+                /WebSocket failed/,
+                'Should throw error on start failure'
+            )
+
+            assert(stopStub.calledOnce, 'Should cleanup on start failure')
+        })
+
+        it('should stop proxy and cleanup resources', () => {
+            const stopPingIntervalStub = sandbox.stub(localProxy as any, 'stopPingInterval')
+            const closeWebSocketStub = sandbox.stub(localProxy as any, 'closeWebSocket')
+            const closeTcpServerStub = sandbox.stub(localProxy as any, 'closeTcpServer')
+
+            // Set up some state
+            ;(localProxy as any).isConnected = true
+            ;(localProxy as any).reconnectAttempts = 5
+            ;(localProxy as any).clientToken = 'test-token'
+
+            localProxy.stop()
+
+            assert(stopPingIntervalStub.calledOnce, 'Should stop ping interval')
+            assert(closeWebSocketStub.calledOnce, 'Should close WebSocket')
+            assert(closeTcpServerStub.calledOnce, 'Should close TCP server')
+            assert.strictEqual((localProxy as any).isConnected, false, 'Should reset connection state')
+            assert.strictEqual((localProxy as any).reconnectAttempts, 0, 'Should reset reconnect attempts')
+            assert.strictEqual((localProxy as any).clientToken, '', 'Should clear client token')
+            assert.strictEqual((localProxy as any).isDisposed, true, 'Should mark as disposed')
+        })
+
+        it('should handle duplicate stop calls gracefully', () => {
+            const stopPingIntervalStub = sandbox.stub(localProxy as any, 'stopPingInterval')
+
+            localProxy.stop()
+            localProxy.stop() // Second call
+
+            // Should not throw error and should handle gracefully
+            assert(stopPingIntervalStub.calledOnce, 'Should only stop once')
+        })
+    })
+
+    describe('Message Sending', () => {
+        beforeEach(async () => {
+            await (localProxy as any).loadProtobufDefinition()
+        })
+
+        it('should send messages when WebSocket is open', () => {
+            const mockWs = {
+                readyState: WebSocket.OPEN,
+                send: sandbox.stub(),
+            }
+
+            ;(localProxy as any).ws = mockWs
+            ;(localProxy as any).serviceId = 'WSS'
+            ;(localProxy as any).sendMessage(1, 1, 1, Buffer.from('test'))
+
+            assert(mockWs.send.calledOnce, 'Should send message')
+            const sentData = mockWs.send.getCall(0).args[0]
+            assert(Buffer.isBuffer(sentData), 'Should send buffer data')
+            assert(sentData.length > 2, 'Should include length prefix')
+        })
+
+        it('should not send messages when WebSocket is not open', () => {
+            const mockWs = {
+                readyState: WebSocket.CONNECTING,
+                send: sandbox.stub(),
+            }
+
+            ;(localProxy as any).ws = mockWs
+            ;(localProxy as any).sendMessage(1, 1, 1, Buffer.from('test'))
+
+            assert(mockWs.send.notCalled, 'Should not send when WebSocket is not open')
+        })
+
+        it('should split large data into chunks', () => {
+            const mockWs = {
+                readyState: WebSocket.OPEN,
+                send: sandbox.stub(),
+            }
+
+            ;(localProxy as any).ws = mockWs
+
+            // Create data larger than max chunk size (63KB)
+            const largeData = Buffer.alloc(70 * 1024, 'a')
+
+            ;(localProxy as any).sendData(1, 1, largeData)
+
+            assert(mockWs.send.calledTwice, 'Should split large data into chunks')
+        })
+    })
+})
diff --git a/packages/core/src/test/lambda/remoteDebugging/localStackLambdaDebugger.test.ts b/packages/core/src/test/lambda/remoteDebugging/localStackLambdaDebugger.test.ts
new file mode 100644
index 00000000000..d91fc150f71
--- /dev/null
+++ b/packages/core/src/test/lambda/remoteDebugging/localStackLambdaDebugger.test.ts
@@ -0,0 +1,240 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import assert from 'assert'
+import sinon, { SinonStubbedInstance, createStubInstance } from 'sinon'
+import { LdkClient } from '../../../lambda/remoteDebugging/ldkClient'
+import { RemoteDebugController } from '../../../lambda/remoteDebugging/ldkController'
+import globals from '../../../shared/extensionGlobals'
+
+import {
+    createMockDebugConfig,
+    createMockFunctionConfig,
+    createMockGlobalState,
+    setupMockRevertExistingConfig,
+    setupMockVSCodeDebugAPIs,
+} from './testUtils'
+import { DebugConfig } from '../../../lambda/remoteDebugging/lambdaDebugger'
+import { FunctionConfiguration, Runtime } from '@aws-sdk/client-lambda'
+import { assertTelemetry } from '../../testUtil'
+import * as remoteDebuggingUtils from '../../../lambda/remoteDebugging/utils'
+import { DefaultLambdaClient } from '../../../shared/clients/lambdaClient'
+
+const LocalStackEndpoint = 'https://localhost.localstack.cloud:4566'
+
+describe('RemoteDebugController with LocalStackLambdaDebugger', () => {
+    let sandbox: sinon.SinonSandbox
+    let mockLdkClient: SinonStubbedInstance<LdkClient>
+    let controller: RemoteDebugController
+    let mockGlobalState: any
+    let mockConfig: DebugConfig
+    let mockFunctionConfig: FunctionConfiguration
+    let fetchStub: sinon.SinonStub
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+
+        fetchStub = sandbox.stub(global, 'fetch')
+
+        // Mock LdkClient
+        mockLdkClient = createStubInstance(LdkClient)
+        sandbox.stub(LdkClient, 'instance').get(() => mockLdkClient)
+
+        // Mock global state with actual storage
+        mockGlobalState = createMockGlobalState()
+        sandbox.stub(globals, 'globalState').value(mockGlobalState)
+        sandbox.stub(globals.awsContext, 'getCredentialEndpointUrl').returns(LocalStackEndpoint)
+
+        // Get controller instance
+        controller = RemoteDebugController.instance
+
+        // Ensure clean state
+        controller.ensureCleanState()
+
+        mockConfig = createMockDebugConfig({
+            isLambdaRemote: false,
+            port: undefined,
+            layerArn: undefined,
+            lambdaTimeout: undefined,
+        })
+        mockFunctionConfig = createMockFunctionConfig({ Runtime: 'nodejs22.x' as Runtime })
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+
+    describe('Debug Session Management', () => {
+        it('should start debugging successfully', async () => {
+            // Mock VSCode APIs
+            setupMockVSCodeDebugAPIs(sandbox)
+
+            // Mock runtime support
+            sandbox.stub(controller, 'supportRuntimeRemoteDebug').returns(true)
+
+            // Mock successful LdkClient operations
+            mockLdkClient.getFunctionDetail.resolves(mockFunctionConfig)
+
+            // Mock waiting for Lambda function to be active
+            sandbox.stub(remoteDebuggingUtils, 'getLambdaClientWithAgent').returns(
+                sandbox.createStubInstance(DefaultLambdaClient, {
+                    waitForActive: sandbox.stub().resolves() as any,
+                }) as any
+            )
+
+            // Mock revertExistingConfig
+            setupMockRevertExistingConfig(sandbox)
+
+            // Mock LocalStack health check
+            const fetchStubHealth = fetchStub.withArgs(`${LocalStackEndpoint}/_localstack/health`)
+            fetchStubHealth.resolves(new Response(undefined, { status: 200 }))
+
+            // Mock LocalStack debug config setup
+            const assignedPort = 8228
+            const userAgent =
+                'LAMBDA-DEBUG/1.0.0 AWS-Toolkit-For-VSCode/testPluginVersion Visual-Studio-Code/1.102.2 ClientId/11111111-1111-1111-1111-111111111111'
+            const fetchStubSetup = fetchStub.withArgs(
+                `${LocalStackEndpoint}/_aws/lambda/debug_configs/${mockFunctionConfig.FunctionArn}:$LATEST`,
+                {
+                    method: 'PUT',
+                    body: sinon.match.string,
+                }
+            )
+            fetchStubSetup.resolves(
+                new Response(
+                    JSON.stringify({
+                        port: assignedPort,
+                        user_agent: userAgent,
+                    }),
+                    { status: 200 }
+                )
+            )
+
+            // Mock LocalStack debug config polling
+            const fetchStubStatus = fetchStub.withArgs(
+                `${LocalStackEndpoint}/_aws/lambda/debug_configs/${mockFunctionConfig.FunctionArn}:$LATEST?debug_server_ready_timeout=300`
+            )
+            fetchStubStatus.resolves(
+                new Response(
+                    JSON.stringify({
+                        port: assignedPort,
+                        user_agent: userAgent,
+                        is_debug_server_running: true,
+                    }),
+                    { status: 200 }
+                )
+            )
+
+            await controller.startDebugging(mockConfig.functionArn, 'nodejs22.x', mockConfig)
+
+            // Assert state changes
+            assert.strictEqual(controller.isDebugging, true, 'Should be in debugging state')
+            // Qualifier is not set for LocalStack
+            assert.strictEqual(controller.qualifier, undefined, 'Should not set qualifier for $LATEST')
+
+            assert(mockLdkClient.getFunctionDetail.calledWith(mockConfig.functionArn), 'Should get function details')
+
+            assert(fetchStubHealth.calledOnce, 'Should call LocalStack health check once')
+            assert(fetchStubSetup.calledOnce, 'Should call LocalStack LDM setup once')
+            assert(fetchStubStatus.calledOnce, 'Should call LocalStack LDM status once')
+
+            assertTelemetry('lambda_remoteDebugStart', {
+                result: 'Succeeded',
+                source: 'LocalStackDebug',
+                action: '{"remoteRoot":"/var/task","skipFiles":[],"shouldPublishVersion":false,"isLambdaRemote":false}',
+                runtimeString: 'nodejs22.x',
+            })
+        })
+
+        it('should handle debugging start failure and cleanup', async () => {
+            // Mock VSCode APIs
+            setupMockVSCodeDebugAPIs(sandbox)
+
+            // Mock runtime support
+            sandbox.stub(controller, 'supportRuntimeRemoteDebug').returns(true)
+
+            // Mock function config retrieval
+            mockLdkClient.getFunctionDetail.resolves(mockFunctionConfig)
+
+            // Mock LocalStack health check
+            const fetchStubHealth = fetchStub.withArgs(`${LocalStackEndpoint}/_localstack/health`)
+            fetchStubHealth.resolves(new Response(undefined, { status: 200 }))
+
+            // Mock LocalStack debug config setup error
+            const fetchStubSetup = fetchStub.withArgs(
+                `${LocalStackEndpoint}/_aws/lambda/debug_configs/${mockFunctionConfig.FunctionArn}:$LATEST`,
+                {
+                    method: 'PUT',
+                    body: sinon.match.string,
+                }
+            )
+            fetchStubSetup.resolves(new Response('Unknown error occurred during setup', { status: 500 }))
+
+            // Mock LocalStack debug config cleanup
+            const fetchStubCleanup = fetchStub.withArgs(
+                `${LocalStackEndpoint}/_aws/lambda/debug_configs/${mockFunctionConfig.FunctionArn}:$LATEST`,
+                {
+                    method: 'DELETE',
+                }
+            )
+            fetchStubCleanup.resolves(new Response(undefined, { status: 200 }))
+
+            // Mock revertExistingConfig
+            setupMockRevertExistingConfig(sandbox)
+
+            try {
+                await controller.startDebugging(mockConfig.functionArn, 'nodejs22.x', mockConfig)
+                assert.fail('Should have thrown an error')
+            } catch (error) {
+                assert(error instanceof Error, 'Should throw an error')
+                assert(
+                    error.message.includes('Error StartDebugging') ||
+                        error.message.includes(
+                            'Failed to startup execution environment or debugger for Lambda function'
+                        ),
+                    'Should throw relevant error'
+                )
+            }
+
+            // Assert state is cleaned up
+            assert.strictEqual(controller.isDebugging, false, 'Should not be in debugging state after failure')
+            assert(fetchStubCleanup.calledOnce, 'Should attempt cleanup')
+        })
+    })
+
+    describe('Stop Debugging', () => {
+        it('should stop debugging successfully', async () => {
+            // Mock VSCode APIs
+            sandbox.stub(vscode.commands, 'executeCommand').resolves()
+
+            // Set up debugging state
+            controller.isDebugging = true
+            controller.qualifier = '$LATEST'
+            ;(controller as any).lastDebugStartTime = Date.now() - 5000 // 5 seconds ago
+            mockGlobalState.update('aws.lambda.remoteDebugSnapshot', mockFunctionConfig)
+
+            // Mock successful cleanup
+            const fetchStubCleanup = fetchStub.withArgs(
+                `${LocalStackEndpoint}/_aws/lambda/debug_configs/${mockFunctionConfig.FunctionArn}:$LATEST`,
+                {
+                    method: 'DELETE',
+                }
+            )
+            fetchStubCleanup.resolves(new Response(undefined, { status: 200 }))
+
+            await controller.stopDebugging()
+
+            // Assert state is cleaned up
+            assert.strictEqual(controller.isDebugging, false, 'Should not be in debugging state')
+
+            // Verify cleanup operations
+            assert(fetchStubCleanup.calledOnce, 'Should cleanup the LocalStack debug config')
+            assertTelemetry('lambda_remoteDebugStop', {
+                result: 'Succeeded',
+            })
+        })
+    })
+})
diff --git a/packages/core/src/test/lambda/remoteDebugging/testUtils.ts b/packages/core/src/test/lambda/remoteDebugging/testUtils.ts
new file mode 100644
index 00000000000..42deaa4ec96
--- /dev/null
+++ b/packages/core/src/test/lambda/remoteDebugging/testUtils.ts
@@ -0,0 +1,176 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import sinon from 'sinon'
+import { Architecture, FunctionConfiguration, Runtime, SnapStartApplyOn } from '@aws-sdk/client-lambda'
+import { LambdaFunctionNode } from '../../../lambda/explorer/lambdaFunctionNode'
+import { InitialData } from '../../../lambda/vue/remoteInvoke/invokeLambda'
+import type { DebugConfig } from '../../../lambda/remoteDebugging/lambdaDebugger'
+
+/**
+ * Creates a mock Lambda function configuration for testing
+ */
+export function createMockFunctionConfig(overrides: Partial<FunctionConfiguration> = {}): FunctionConfiguration {
+    return {
+        FunctionName: 'testFunction',
+        FunctionArn: 'arn:aws:lambda:us-west-2:123456789012:function:testFunction',
+        Runtime: Runtime.nodejs18x,
+        Handler: 'index.handler',
+        Timeout: 30,
+        Layers: [],
+        Environment: { Variables: {} },
+        Architectures: [Architecture.x86_64],
+        SnapStart: { ApplyOn: SnapStartApplyOn.None },
+        ...overrides,
+    }
+}
+
+/**
+ * Creates a mock Lambda function node for testing
+ */
+export function createMockFunctionNode(overrides: Partial<LambdaFunctionNode> = {}): LambdaFunctionNode {
+    const config = createMockFunctionConfig()
+    return {
+        configuration: config,
+        regionCode: 'us-west-2',
+        localDir: '/local/path',
+        ...overrides,
+    } as LambdaFunctionNode
+}
+
+/**
+ * Creates mock initial data for RemoteInvokeWebview testing
+ */
+export function createMockInitialData(overrides: Partial<InitialData> = {}): InitialData {
+    const mockFunctionNode = createMockFunctionNode()
+    return {
+        FunctionName: 'testFunction',
+        FunctionArn: 'arn:aws:lambda:us-west-2:123456789012:function:testFunction',
+        FunctionRegion: 'us-west-2',
+        InputSamples: [],
+        Runtime: 'nodejs18.x',
+        LocalRootPath: '/local/path',
+        LambdaFunctionNode: mockFunctionNode,
+        supportCodeDownload: true,
+        runtimeSupportsRemoteDebug: true,
+        regionSupportsRemoteDebug: true,
+        ...overrides,
+    } as InitialData
+}
+
+/**
+ * Creates a mock debug configuration for testing
+ */
+export function createMockDebugConfig(overrides: Partial<DebugConfig> = {}): DebugConfig {
+    return {
+        functionArn: 'arn:aws:lambda:us-west-2:123456789012:function:testFunction',
+        functionName: 'testFunction',
+        port: 9229,
+        localRoot: '/local/path',
+        remoteRoot: '/var/task',
+        skipFiles: [],
+        shouldPublishVersion: false,
+        lambdaTimeout: 900,
+        layerArn: 'arn:aws:lambda:us-west-2:123456789012:layer:LDKLayerX86:6',
+        isLambdaRemote: true,
+        ...overrides,
+    }
+}
+
+/**
+ * Creates a mock global state for testing
+ */
+export function createMockGlobalState(): any {
+    const stateStorage = new Map<string, any>()
+    return {
+        get: (key: string) => stateStorage.get(key),
+        tryGet: (key: string, type?: any, defaultValue?: any) => {
+            const value = stateStorage.get(key)
+            return value !== undefined ? value : defaultValue
+        },
+        update: async (key: string, value: any) => {
+            stateStorage.set(key, value)
+            return Promise.resolve()
+        },
+    }
+}
+
+/**
+ * Sets up common mocks for VSCode APIs
+ */
+export function setupVSCodeMocks(sandbox: sinon.SinonSandbox) {
+    return {
+        startDebugging: sandbox.stub(),
+        executeCommand: sandbox.stub(),
+        onDidTerminateDebugSession: sandbox.stub().returns({ dispose: sandbox.stub() }),
+    }
+}
+
+/**
+ * Creates a mock progress reporter for testing
+ */
+export function createMockProgress(): any {
+    return {
+        report: sinon.stub(),
+    }
+}
+
+/**
+ * Sets up common debugging state for stop debugging tests
+ */
+export function setupDebuggingState(controller: any, mockGlobalState: any, qualifier: string = 'v1') {
+    controller.isDebugging = true
+    controller.qualifier = qualifier
+    ;(controller as any).lastDebugStartTime = Date.now() - 5000 // 5 seconds ago
+
+    const mockFunctionConfig = {
+        FunctionName: 'testFunction',
+        FunctionArn: 'arn:aws:lambda:us-west-2:123456789012:function:testFunction',
+    }
+
+    return mockGlobalState.update('aws.lambda.remoteDebugSnapshot', mockFunctionConfig)
+}
+
+/**
+ * Sets up common mock operations for successful cleanup
+ */
+export function setupMockCleanupOperations(mockLdkClient: any) {
+    mockLdkClient.stopProxy.resolves(true)
+    mockLdkClient.removeDebugDeployment.resolves(true)
+    mockLdkClient.deleteDebugVersion.resolves(true)
+}
+
+/**
+ * Sets up common mock operations for LdkClient testing
+ */
+export function setupMockLdkClientOperations(mockLdkClient: any, mockFunctionConfig: any) {
+    mockLdkClient.getFunctionDetail.resolves(mockFunctionConfig)
+    mockLdkClient.createOrReuseTunnel.resolves({
+        tunnelID: 'tunnel-123',
+        sourceToken: 'source-token',
+        destinationToken: 'dest-token',
+    })
+    mockLdkClient.createDebugDeployment.resolves('$LATEST')
+    mockLdkClient.startProxy.resolves(true)
+    mockLdkClient.stopProxy.resolves(true)
+    mockLdkClient.removeDebugDeployment.resolves(true)
+    mockLdkClient.deleteDebugVersion.resolves(true)
+}
+
+/**
+ * Sets up common VSCode debug API mocks
+ */
+export function setupMockVSCodeDebugAPIs(sandbox: sinon.SinonSandbox) {
+    sandbox.stub(require('vscode').debug, 'startDebugging').resolves(true)
+    sandbox.stub(require('vscode').commands, 'executeCommand').resolves()
+    sandbox.stub(require('vscode').debug, 'onDidTerminateDebugSession').returns({ dispose: sandbox.stub() })
+}
+
+/**
+ * Sets up mock for revertExistingConfig function
+ */
+export function setupMockRevertExistingConfig(sandbox: sinon.SinonSandbox) {
+    return sandbox.stub(require('../../../lambda/remoteDebugging/ldkController'), 'revertExistingConfig').resolves(true)
+}
diff --git a/packages/core/src/test/lambda/uriHandlers.test.ts b/packages/core/src/test/lambda/uriHandlers.test.ts
new file mode 100644
index 00000000000..f3e8ae7c368
--- /dev/null
+++ b/packages/core/src/test/lambda/uriHandlers.test.ts
@@ -0,0 +1,36 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { SearchParams } from '../../shared/vscode/uriHandler'
+import { parseOpenParams } from '../../lambda/uriHandlers'
+import { globals } from '../../shared'
+
+describe('Lambda URI Handler', function () {
+    describe('load-function', function () {
+        it('registers for "/lambda/load-function"', function () {
+            assert.throws(() => globals.uriHandler.onPath('/lambda/load-function', () => {}))
+        })
+
+        it('parses parameters', function () {
+            let query = new SearchParams({
+                functionName: 'example',
+            })
+            assert.throws(() => parseOpenParams(query), /A region must be provided/)
+            query = new SearchParams({
+                region: 'example',
+            })
+            assert.throws(() => parseOpenParams(query), /A function name must be provided/)
+
+            const valid = {
+                functionName: 'example',
+                region: 'example',
+                isCfn: 'false',
+            }
+            query = new SearchParams(valid)
+            assert.deepEqual(parseOpenParams(query), valid)
+        })
+    })
+})
diff --git a/src/test/lambda/utilities/parameterUtils.test.ts b/packages/core/src/test/lambda/utilities/parameterUtils.test.ts
similarity index 98%
rename from src/test/lambda/utilities/parameterUtils.test.ts
rename to packages/core/src/test/lambda/utilities/parameterUtils.test.ts
index 392c5766204..84e9d338f3b 100644
--- a/src/test/lambda/utilities/parameterUtils.test.ts
+++ b/packages/core/src/test/lambda/utilities/parameterUtils.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as path from 'path'
 import * as vscode from 'vscode'
 import {
@@ -135,7 +135,7 @@ describe('parameterUtils', async function () {
 
         it('throws if template is not in the workspace', async function () {
             const context: GetOverriddenParametersContext = {
-                getWorkspaceFolder: uri => undefined,
+                getWorkspaceFolder: (uri) => undefined,
                 loadTemplatesConfig: async () => ({
                     templates: {},
                 }),
diff --git a/packages/core/src/test/lambda/utils.test.ts b/packages/core/src/test/lambda/utils.test.ts
new file mode 100644
index 00000000000..7a8e82043cf
--- /dev/null
+++ b/packages/core/src/test/lambda/utils.test.ts
@@ -0,0 +1,193 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import {
+    getLambdaDetails,
+    getTempLocation,
+    getTempRegionLocation,
+    getFunctionInfo,
+    setFunctionInfo,
+    compareCodeSha,
+} from '../../lambda/utils'
+import { LambdaFunction } from '../../lambda/commands/uploadLambda'
+import { DefaultLambdaClient } from '../../shared/clients/lambdaClient'
+import { fs } from '../../shared/fs/fs'
+import { tempDirPath } from '../../shared/filesystemUtilities'
+import path from 'path'
+import { Runtime } from '@aws-sdk/client-lambda'
+
+describe('lambda utils', function () {
+    const mockLambda = {
+        name: 'test-function',
+        region: 'us-east-1',
+        configuration: { FunctionName: 'test-function' },
+    }
+    describe('getLambdaDetails', function () {
+        it('returns valid filenames and function names', function () {
+            const jsNonNestedParsedName = getLambdaDetails({
+                Runtime: 'nodejs16.x',
+                Handler: 'app.lambda_handler',
+            })
+            const pyNonNestedParsedName = getLambdaDetails({
+                Runtime: 'python3.8',
+                Handler: 'app.lambda_handler',
+            })
+            const jsNestedParsedName = getLambdaDetails({
+                Runtime: 'nodejs16.x',
+                Handler: 'asdf/jkl/app.lambda_handler',
+            })
+            const node18ModuleParsedName = getLambdaDetails({
+                Runtime: 'nodejs18.x',
+                Handler: 'asdf/jkl/app.lambda_handler',
+            })
+            const PyNestedParsedName = getLambdaDetails({
+                Runtime: 'python3.8',
+                Handler: 'asdf/jkl/app.lambda_handler',
+            })
+            assert.strictEqual(jsNonNestedParsedName.fileName, 'app.js')
+            assert.strictEqual(pyNonNestedParsedName.fileName, 'app.py')
+            assert.strictEqual(jsNestedParsedName.fileName, 'asdf/jkl/app.js')
+            assert.strictEqual(node18ModuleParsedName.fileName, 'asdf/jkl/app.mjs')
+            assert.strictEqual(PyNestedParsedName.fileName, 'asdf/jkl/app.py')
+            assert.strictEqual(jsNonNestedParsedName.functionName, 'lambda_handler')
+            assert.strictEqual(pyNonNestedParsedName.functionName, 'lambda_handler')
+            assert.strictEqual(jsNestedParsedName.functionName, 'lambda_handler')
+            assert.strictEqual(PyNestedParsedName.functionName, 'lambda_handler')
+        })
+
+        it('throws if the handler is not a supported runtime', async function () {
+            // unsupported runtime for import
+            assert.throws(() =>
+                getLambdaDetails({
+                    Runtime: 'dotnetcore3.1',
+                    Handler: 'HelloWorld::HelloWorld.Function::FunctionHandler',
+                })
+            )
+            // runtime that isn't present, period
+            assert.throws(() => getLambdaDetails({ Runtime: 'COBOL-60' as Runtime, Handler: 'asdf.asdf' }))
+        })
+    })
+
+    describe('getTempLocation', function () {
+        it('returns correct temp location path', function () {
+            const result = getTempLocation('test-function', 'us-east-1')
+            const expected = path.join(tempDirPath, 'lambda', 'us-east-1', 'test-function')
+            assert.strictEqual(result, expected)
+        })
+    })
+
+    describe('getTempRegionLocation', function () {
+        it('returns correct temp region path', function () {
+            const result = getTempRegionLocation('us-west-2')
+            const expected = path.join(tempDirPath, 'lambda', 'us-west-2')
+            assert.strictEqual(result, expected)
+        })
+    })
+
+    describe('getFunctionInfo', function () {
+        afterEach(function () {
+            sinon.restore()
+        })
+
+        it('returns parsed data when file exists', async function () {
+            const mockData = { lastDeployed: 123456, undeployed: false, sha: 'test-sha' }
+            sinon.stub(fs, 'readFileText').resolves(JSON.stringify(mockData))
+
+            const result = await getFunctionInfo(mockLambda)
+            assert.deepStrictEqual(result, mockData)
+        })
+
+        it('returns specific field when requested', async function () {
+            const mockData = { lastDeployed: 123456, undeployed: false, sha: 'test-sha' }
+            sinon.stub(fs, 'readFileText').resolves(JSON.stringify(mockData))
+
+            const result = await getFunctionInfo(mockLambda, 'sha')
+            assert.strictEqual(result, 'test-sha')
+        })
+
+        it('returns empty object when file does not exist', async function () {
+            sinon.stub(fs, 'readFileText').rejects(new Error('File not found'))
+
+            const result = await getFunctionInfo(mockLambda)
+            assert.deepStrictEqual(result, {})
+        })
+    })
+
+    describe('setFunctionInfo', function () {
+        let mockLambda: LambdaFunction
+
+        // jscpd:ignore-start
+        beforeEach(function () {
+            mockLambda = {
+                name: 'test-function',
+                region: 'us-east-1',
+                configuration: { FunctionName: 'test-function' },
+            }
+        })
+
+        afterEach(function () {
+            sinon.restore()
+        })
+        // jscpd:ignore-end
+
+        it('merges with existing data', async function () {
+            const existingData = { lastDeployed: 123456, undeployed: true, sha: 'old-sha', handlerFile: 'index.js' }
+            sinon.stub(fs, 'readFileText').resolves(JSON.stringify(existingData))
+            const writeStub = sinon.stub(fs, 'writeFile').resolves()
+            sinon.stub(DefaultLambdaClient.prototype, 'getFunction').resolves({
+                Configuration: { CodeSha256: 'new-sha' },
+            } as any)
+
+            await setFunctionInfo(mockLambda, { undeployed: false })
+
+            assert(writeStub.calledOnce)
+            const writtenData = JSON.parse(writeStub.firstCall.args[1] as string)
+            assert.strictEqual(writtenData.lastDeployed, 123456)
+            assert.strictEqual(writtenData.undeployed, false)
+            assert.strictEqual(writtenData.sha, 'new-sha')
+            assert.strictEqual(writtenData.handlerFile, 'index.js')
+        })
+    })
+
+    describe('compareCodeSha', function () {
+        let mockLambda: LambdaFunction
+
+        // jscpd:ignore-start
+        beforeEach(function () {
+            mockLambda = {
+                name: 'test-function',
+                region: 'us-east-1',
+                configuration: { FunctionName: 'test-function' },
+            }
+        })
+
+        afterEach(function () {
+            sinon.restore()
+        })
+        // jscpd:ignore-end
+
+        it('returns true when local and remote SHA match', async function () {
+            sinon.stub(fs, 'readFileText').resolves(JSON.stringify({ sha: 'same-sha' }))
+            sinon.stub(DefaultLambdaClient.prototype, 'getFunction').resolves({
+                Configuration: { CodeSha256: 'same-sha' },
+            } as any)
+
+            const result = await compareCodeSha(mockLambda)
+            assert.strictEqual(result, true)
+        })
+
+        it('returns false when local and remote SHA differ', async function () {
+            sinon.stub(fs, 'readFileText').resolves(JSON.stringify({ sha: 'local-sha' }))
+            sinon.stub(DefaultLambdaClient.prototype, 'getFunction').resolves({
+                Configuration: { CodeSha256: 'remote-sha' },
+            } as any)
+
+            const result = await compareCodeSha(mockLambda)
+            assert.strictEqual(result, false)
+        })
+    })
+})
diff --git a/packages/core/src/test/lambda/vue/remoteInvoke/invokeLambda.test.ts b/packages/core/src/test/lambda/vue/remoteInvoke/invokeLambda.test.ts
new file mode 100644
index 00000000000..4d2aaa6c507
--- /dev/null
+++ b/packages/core/src/test/lambda/vue/remoteInvoke/invokeLambda.test.ts
@@ -0,0 +1,922 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { RemoteInvokeWebview, invokeRemoteLambda, InitialData } from '../../../../lambda/vue/remoteInvoke/invokeLambda'
+import { LambdaClient, DefaultLambdaClient } from '../../../../shared/clients/lambdaClient'
+import * as vscode from 'vscode'
+import * as path from 'path'
+import { makeTemporaryToolkitFolder } from '../../../../shared/filesystemUtilities'
+import sinon, { SinonStubbedInstance, createStubInstance } from 'sinon'
+import { fs } from '../../../../shared'
+import * as picker from '../../../../shared/ui/picker'
+import { getTestWindow } from '../../../shared/vscode/window'
+import { LambdaFunctionNode } from '../../../../lambda/explorer/lambdaFunctionNode'
+import * as utils from '../../../../lambda/utils'
+import { HttpResourceFetcher } from '../../../../shared/resourcefetcher/httpResourceFetcher'
+import { ExtContext } from '../../../../shared/extensions'
+import { FakeExtensionContext } from '../../../fakeExtensionContext'
+import * as samCliRemoteTestEvent from '../../../../shared/sam/cli/samCliRemoteTestEvent'
+import { TestEventsOperation, SamCliRemoteTestEventsParameters } from '../../../../shared/sam/cli/samCliRemoteTestEvent'
+import { assertLogsContain } from '../../../globalSetup.test'
+import { createResponse } from '../../../testUtil'
+import { InvocationResponse } from '@aws-sdk/client-lambda'
+
+describe('RemoteInvokeWebview', () => {
+    let outputChannel: vscode.OutputChannel
+    let client: SinonStubbedInstance<LambdaClient>
+    let remoteInvokeWebview: RemoteInvokeWebview
+    let data: InitialData
+    let sandbox: sinon.SinonSandbox
+
+    beforeEach(() => {
+        client = createStubInstance(DefaultLambdaClient)
+        outputChannel = {
+            appendLine: (line: string) => {},
+            show: () => {},
+        } as vscode.OutputChannel
+        data = {
+            FunctionName: 'testFunction',
+            FunctionArn: 'arn:aws:lambda:us-west-2:123456789012:function:testFunction',
+            FunctionRegion: 'us-west-2',
+            InputSamples: [],
+        } as InitialData
+
+        remoteInvokeWebview = new RemoteInvokeWebview(outputChannel, client, client, data)
+    })
+    describe('init', () => {
+        it('should return the data property', () => {
+            const mockData: InitialData = {
+                FunctionName: 'testFunction',
+                FunctionArn: 'arn:aws:lambda:us-west-2:123456789012:function:testFunction',
+                FunctionRegion: 'us-west-2',
+                InputSamples: [],
+            }
+            const result = remoteInvokeWebview.init()
+            assert.deepEqual(result, mockData)
+        })
+    })
+    describe('invokeLambda', () => {
+        it('invokes Lambda function successfully', async () => {
+            const input = '{"key": "value"}'
+            const mockResponse = {
+                LogResult: Buffer.from('Test log').toString('base64'),
+                Payload: new TextEncoder().encode('{"result": "success"}'),
+            } satisfies InvocationResponse
+            client.invoke.resolves(mockResponse)
+
+            const appendedLines: string[] = []
+            outputChannel.appendLine = (line: string) => {
+                appendedLines.push(line)
+            }
+
+            await remoteInvokeWebview.invokeLambda(input)
+            assert(client.invoke.calledOnce)
+            assert(client.invoke.calledWith(data.FunctionArn, input))
+            assert.deepStrictEqual(appendedLines, [
+                'Loading response...',
+                'Invocation result for arn:aws:lambda:us-west-2:123456789012:function:testFunction',
+                'Logs:',
+                'Test log',
+                '',
+                'Payload:',
+                '{"result": "success"}',
+                '',
+            ])
+        })
+        it('handles Lambda invocation with no payload', async () => {
+            const mockResponse = {
+                LogResult: Buffer.from('Test log').toString('base64'),
+                Payload: new TextEncoder().encode(''),
+            } satisfies InvocationResponse
+
+            client.invoke.resolves(mockResponse)
+            const appendedLines: string[] = []
+            outputChannel.appendLine = (line: string) => {
+                appendedLines.push(line)
+            }
+
+            await remoteInvokeWebview.invokeLambda('')
+
+            assert.deepStrictEqual(appendedLines, [
+                'Loading response...',
+                'Invocation result for arn:aws:lambda:us-west-2:123456789012:function:testFunction',
+                'Logs:',
+                'Test log',
+                '',
+                'Payload:',
+                '{}',
+                '',
+            ])
+        })
+        it('handles Lambda invocation with undefined LogResult', async () => {
+            const mockResponse = {
+                Payload: new TextEncoder().encode('{"result": "success"}'),
+            } satisfies InvocationResponse
+
+            client.invoke.resolves(mockResponse)
+
+            const appendedLines: string[] = []
+            outputChannel.appendLine = (line: string) => {
+                appendedLines.push(line)
+            }
+
+            await remoteInvokeWebview.invokeLambda('{}')
+
+            assert.deepStrictEqual(appendedLines, [
+                'Loading response...',
+                'Invocation result for arn:aws:lambda:us-west-2:123456789012:function:testFunction',
+                'Logs:',
+                '',
+                '',
+                'Payload:',
+                '{"result": "success"}',
+                '',
+            ])
+        })
+        it('handles Lambda invocation error', async () => {
+            const input = '{"key": "value"}'
+            const mockError = new Error('Lambda invocation failed')
+
+            client.invoke.rejects(mockError)
+
+            const appendedLines: string[] = []
+            outputChannel.appendLine = (line: string) => {
+                appendedLines.push(line)
+            }
+
+            try {
+                await remoteInvokeWebview.invokeLambda(input)
+                assert.fail('Expected an error to be thrown')
+            } catch (err) {
+                assert.ok(err instanceof Error)
+                assert.strictEqual(err.message, 'Expected an error to be thrown')
+            }
+
+            assert.deepStrictEqual(appendedLines, [
+                'Loading response...',
+                'There was an error invoking arn:aws:lambda:us-west-2:123456789012:function:testFunction',
+                mockError.toString(),
+                '',
+            ])
+        })
+    })
+
+    describe('promptFile', () => {
+        it('prompts the user for a file and returns the selected file', async () => {
+            const tempFolder = await makeTemporaryToolkitFolder()
+            const placeholderEventFile = path.join(tempFolder, 'file.json')
+            await fs.writeFile(placeholderEventFile, '{"sample": ""}')
+            const fileUri = vscode.Uri.file(placeholderEventFile)
+
+            getTestWindow().onDidShowDialog((d) => d.selectItem(fileUri))
+
+            const response = await remoteInvokeWebview.promptFile()
+            assert.deepStrictEqual(response?.sample, '{"sample": ""}')
+            assert.deepStrictEqual(response.selectedFile, 'file.json')
+            assert.deepStrictEqual(response.selectedFilePath, fileUri.fsPath)
+        })
+        it('Returns undefined if no file is selected', async () => {
+            getTestWindow().onDidShowDialog((d) => d.close())
+            const response = await remoteInvokeWebview.promptFile()
+            assert.strictEqual(response, undefined)
+        })
+        it('logs an error and throws ToolkitError when reading the file fails', async () => {
+            const tempFolder = await makeTemporaryToolkitFolder()
+            const placeholderEventFile = path.join(tempFolder, 'file.json')
+            const fileUri = vscode.Uri.file(placeholderEventFile)
+
+            getTestWindow().onDidShowDialog((d) => d.selectItem(fileUri))
+
+            await assert.rejects(
+                async () => await remoteInvokeWebview.promptFile(),
+                new Error('Failed to read selected file')
+            )
+            assertLogsContain('readFileSync: Failed to read file at path', false, 'error')
+        })
+    })
+
+    describe('loadFile', () => {
+        it('loads a file successfully', async () => {
+            const tempFolder = await makeTemporaryToolkitFolder()
+            const placeholderEventFile = path.join(tempFolder, 'file.json')
+            await fs.writeFile(placeholderEventFile, '{"sample": ""}')
+            const result = await remoteInvokeWebview.loadFile(placeholderEventFile)
+
+            assert.strictEqual(result?.sample, '{"sample": ""}')
+            assert.strictEqual(
+                path.normalize(result.selectedFilePath).toLowerCase(),
+                path.normalize(placeholderEventFile).toLowerCase()
+            )
+            assert.strictEqual(result?.selectedFile, 'file.json')
+            await fs.delete(tempFolder, { recursive: true })
+        })
+        it('handles invalid JSON file', async () => {
+            const tempFolder = await makeTemporaryToolkitFolder()
+            const invalidJsonFile = path.join(tempFolder, 'invalid.json')
+            await fs.writeFile(invalidJsonFile, '{"invalid": "json",}')
+            try {
+                await remoteInvokeWebview.loadFile(invalidJsonFile)
+                assert.fail('Failed to parse selected file')
+            } catch (err) {
+                assert.ok(err instanceof Error)
+                assert.strictEqual(err.message, 'Failed to parse selected file')
+            }
+            await fs.delete(tempFolder, { recursive: true })
+        })
+        it('handles file load error', async () => {
+            const nonExistentFile = '/path/to/non-existent-file.json'
+            try {
+                await remoteInvokeWebview.loadFile(nonExistentFile)
+                assert.fail('Expected an error to be thrown')
+            } catch (err) {
+                assert.ok(err instanceof Error)
+                assert.strictEqual(err.message, `Failed to read selected file`)
+            }
+        })
+        it('should return undefined if filePath is empty in loadFile', async () => {
+            const result = await remoteInvokeWebview.loadFile('')
+            assert.strictEqual(result, undefined, 'Expected result to be undefined for empty file path')
+        })
+    })
+
+    describe('Remote Test Events', () => {
+        let runSamCliStub: sinon.SinonStub
+        sandbox = sinon.createSandbox()
+        beforeEach(() => {
+            runSamCliStub = sandbox.stub(samCliRemoteTestEvent, 'runSamCliRemoteTestEvents')
+            // Mock getSamCliContext module
+            const samCliContext = require('../../../../shared/sam/cli/samCliContext')
+            sandbox.stub(samCliContext, 'getSamCliContext').returns({
+                invoker: {} as any,
+            })
+        })
+
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        describe('listRemoteTestEvents', () => {
+            it('should list remote test events successfully', async () => {
+                runSamCliStub.resolves('event1\nevent2\nevent3\n')
+
+                const events = await remoteInvokeWebview.listRemoteTestEvents(data.FunctionArn, data.FunctionRegion)
+
+                assert.deepStrictEqual(events, ['event1', 'event2', 'event3'])
+                assert(runSamCliStub.calledOnce)
+                assert(
+                    runSamCliStub.calledWith(
+                        sinon.match({
+                            functionArn: data.FunctionArn,
+                            operation: 'list',
+                            region: data.FunctionRegion,
+                        })
+                    )
+                )
+            })
+
+            it('should return empty array when no events exist (registry not found)', async () => {
+                runSamCliStub.rejects(new Error('lambda-testevent-schemas registry not found'))
+
+                const events = await remoteInvokeWebview.listRemoteTestEvents(data.FunctionArn, data.FunctionRegion)
+
+                assert.deepStrictEqual(events, [])
+            })
+
+            it('should return empty array when there are no saved events', async () => {
+                runSamCliStub.rejects(new Error('There are no saved events'))
+
+                const events = await remoteInvokeWebview.listRemoteTestEvents(data.FunctionArn, data.FunctionRegion)
+
+                assert.deepStrictEqual(events, [])
+            })
+
+            it('should re-throw other errors', async () => {
+                runSamCliStub.rejects(new Error('Network error'))
+
+                await assert.rejects(
+                    async () => await remoteInvokeWebview.listRemoteTestEvents(data.FunctionArn, data.FunctionRegion),
+                    /Network error/
+                )
+            })
+        })
+
+        describe('selectRemoteTestEvent', () => {
+            it('should show quickpick and return selected event content', async () => {
+                // Mock list events
+                runSamCliStub.onFirstCall().resolves('event1\nevent2\n')
+                // Mock get event content
+                runSamCliStub.onSecondCall().resolves('{"test": "content"}')
+
+                // Mock quickpick selection using test window
+                getTestWindow().onDidShowQuickPick((picker) => {
+                    picker.acceptItem('event1')
+                })
+
+                const result = await remoteInvokeWebview.selectRemoteTestEvent(data.FunctionArn, data.FunctionRegion)
+
+                assert.strictEqual(result, '{"test": "content"}')
+            })
+
+            it('should show info message when no events exist', async () => {
+                runSamCliStub.onFirstCall().resolves('')
+
+                let infoMessageShown = false
+                getTestWindow().onDidShowMessage((message) => {
+                    if (message.message.includes('No remote test events found')) {
+                        infoMessageShown = true
+                    }
+                })
+
+                const result = await remoteInvokeWebview.selectRemoteTestEvent(data.FunctionArn, data.FunctionRegion)
+
+                assert.strictEqual(result, undefined)
+                assert(infoMessageShown, 'Info message should be shown')
+            })
+
+            it('should return undefined when user cancels quickpick', async () => {
+                runSamCliStub.onFirstCall().resolves('event1\nevent2\n')
+
+                // Mock user canceling quickpick
+                getTestWindow().onDidShowQuickPick((picker) => {
+                    picker.hide()
+                })
+
+                const result = await remoteInvokeWebview.selectRemoteTestEvent(data.FunctionArn, data.FunctionRegion)
+
+                assert.strictEqual(result, undefined)
+            })
+
+            it('should handle list events error gracefully', async () => {
+                runSamCliStub.rejects(new Error('API error'))
+
+                let errorMessageShown = false
+                getTestWindow().onDidShowMessage((message) => {
+                    // Check if it's an error message
+                    errorMessageShown = true
+                })
+
+                const result = await remoteInvokeWebview.selectRemoteTestEvent(data.FunctionArn, data.FunctionRegion)
+
+                assert.strictEqual(result, undefined)
+                assert(errorMessageShown, 'Error message should be shown')
+            })
+        })
+
+        describe('saveRemoteTestEvent', () => {
+            it('should create new test event', async () => {
+                // Mock empty list (no existing events)
+                runSamCliStub.onFirstCall().resolves('')
+                // Mock create event success
+                runSamCliStub.onSecondCall().resolves('Event created')
+
+                // Mock quickpick to select "Create new"
+                getTestWindow().onDidShowQuickPick((picker) => {
+                    picker.acceptItem('$(add) Create new test event')
+                })
+
+                // Mock input box for event name
+                getTestWindow().onDidShowInputBox((input) => {
+                    input.acceptValue('MyNewEvent')
+                })
+
+                const result = await remoteInvokeWebview.saveRemoteTestEvent(
+                    data.FunctionArn,
+                    data.FunctionRegion,
+                    '{"test": "data"}'
+                )
+
+                assert.strictEqual(result, 'MyNewEvent')
+                assert(runSamCliStub.calledTwice)
+                assert(
+                    runSamCliStub.secondCall.calledWith(
+                        sinon.match({
+                            functionArn: data.FunctionArn,
+                            operation: 'put',
+                            name: 'MyNewEvent',
+                            eventSample: '{"test": "data"}',
+                            region: data.FunctionRegion,
+                            force: false,
+                        })
+                    )
+                )
+            })
+
+            it('should overwrite existing test event with force flag', async () => {
+                // Mock list with existing events
+                runSamCliStub.onFirstCall().resolves('existingEvent1\nexistingEvent2\n')
+                // Mock update event success
+                runSamCliStub.onSecondCall().resolves('Event updated')
+
+                // Mock quickpick to select existing event
+                getTestWindow().onDidShowQuickPick((picker) => {
+                    picker.acceptItem('existingEvent1')
+                })
+
+                // Mock confirmation dialog
+                getTestWindow().onDidShowMessage((message) => {
+                    // Select the overwrite option
+                    message.selectItem('Overwrite')
+                })
+
+                const result = await remoteInvokeWebview.saveRemoteTestEvent(
+                    data.FunctionArn,
+                    data.FunctionRegion,
+                    '{"updated": "data"}'
+                )
+
+                assert.strictEqual(result, 'existingEvent1')
+                assert(runSamCliStub.calledTwice)
+                assert(
+                    runSamCliStub.secondCall.calledWith(
+                        sinon.match({
+                            functionArn: data.FunctionArn,
+                            operation: 'put',
+                            name: 'existingEvent1',
+                            eventSample: '{"updated": "data"}',
+                            region: data.FunctionRegion,
+                            force: true, // Should use force flag for overwrite
+                        })
+                    )
+                )
+            })
+
+            it('should handle user cancellation of overwrite', async () => {
+                runSamCliStub.onFirstCall().resolves('existingEvent1\n')
+
+                // Mock quickpick to select existing event
+                getTestWindow().onDidShowQuickPick((picker) => {
+                    picker.acceptItem('existingEvent1')
+                })
+
+                // User cancels overwrite warning
+                getTestWindow().onDidShowMessage((message) => {
+                    // Cancel the dialog
+                    message.close()
+                })
+
+                const result = await remoteInvokeWebview.saveRemoteTestEvent(
+                    data.FunctionArn,
+                    data.FunctionRegion,
+                    '{"test": "data"}'
+                )
+
+                assert.strictEqual(result, undefined)
+                assert(runSamCliStub.calledOnce) // Only list was called
+            })
+
+            it('should validate event name for new events', async () => {
+                runSamCliStub.onFirstCall().resolves('existingEvent\n')
+                runSamCliStub.onSecondCall().resolves('Event created')
+
+                // Mock quickpick to select "Create new"
+                getTestWindow().onDidShowQuickPick((picker) => {
+                    picker.acceptItem('$(add) Create new test event')
+                })
+
+                // Mock input box with validation
+                let validationTested = false
+                getTestWindow().onDidShowInputBox((input) => {
+                    // We can't directly test validation in this test framework
+                    // Just accept a valid value
+                    input.acceptValue('NewEvent')
+                    validationTested = true
+                })
+
+                const result = await remoteInvokeWebview.saveRemoteTestEvent(
+                    data.FunctionArn,
+                    data.FunctionRegion,
+                    '{"test": "data"}'
+                )
+
+                assert.strictEqual(result, 'NewEvent')
+                assert(validationTested, 'Input box should have been shown')
+            })
+
+            it('should handle list events error gracefully', async () => {
+                // List events fails but should continue
+                runSamCliStub.onFirstCall().rejects(new Error('List failed'))
+                runSamCliStub.onSecondCall().resolves('Event created')
+
+                // Mock quickpick to select "Create new"
+                getTestWindow().onDidShowQuickPick((picker) => {
+                    picker.acceptItem('$(add) Create new test event')
+                })
+
+                // Mock input box for event name
+                getTestWindow().onDidShowInputBox((input) => {
+                    input.acceptValue('NewEvent')
+                })
+
+                const result = await remoteInvokeWebview.saveRemoteTestEvent(
+                    data.FunctionArn,
+                    data.FunctionRegion,
+                    '{"test": "data"}'
+                )
+
+                assert.strictEqual(result, 'NewEvent')
+                // Should still create the event even if list failed
+                assert(runSamCliStub.calledTwice)
+            })
+
+            it('should return undefined when user cancels quickpick', async () => {
+                runSamCliStub.onFirstCall().resolves('event1\n')
+
+                // Mock user canceling quickpick
+                getTestWindow().onDidShowQuickPick((picker) => {
+                    picker.hide()
+                })
+
+                const result = await remoteInvokeWebview.saveRemoteTestEvent(
+                    data.FunctionArn,
+                    data.FunctionRegion,
+                    '{"test": "data"}'
+                )
+
+                assert.strictEqual(result, undefined)
+            })
+        })
+
+        describe('createRemoteTestEvents', () => {
+            it('should create event without force flag', async () => {
+                runSamCliStub.resolves('Event created')
+
+                const result = await remoteInvokeWebview.createRemoteTestEvents({
+                    name: 'TestEvent',
+                    event: '{"test": "data"}',
+                    region: 'us-west-2',
+                    arn: data.FunctionArn,
+                })
+
+                assert.strictEqual(result, 'Event created')
+                assert(
+                    runSamCliStub.calledWith(
+                        sinon.match({
+                            functionArn: data.FunctionArn,
+                            operation: 'put',
+                            name: 'TestEvent',
+                            eventSample: '{"test": "data"}',
+                            region: 'us-west-2',
+                            force: false,
+                        })
+                    )
+                )
+            })
+
+            it('should create event with force flag for overwrite', async () => {
+                runSamCliStub.resolves('Event updated')
+
+                const result = await remoteInvokeWebview.createRemoteTestEvents(
+                    {
+                        name: 'ExistingEvent',
+                        event: '{"updated": "data"}',
+                        region: 'us-west-2',
+                        arn: data.FunctionArn,
+                    },
+                    true // force flag
+                )
+
+                assert.strictEqual(result, 'Event updated')
+                assert(
+                    runSamCliStub.calledWith(
+                        sinon.match({
+                            force: true,
+                        })
+                    )
+                )
+            })
+        })
+
+        describe('getRemoteTestEvents', () => {
+            it('should get remote test event content', async () => {
+                runSamCliStub.resolves('{"event": "content"}')
+
+                const result = await remoteInvokeWebview.getRemoteTestEvents({
+                    name: 'TestEvent',
+                    region: 'us-west-2',
+                    arn: data.FunctionArn,
+                })
+
+                assert.strictEqual(result, '{"event": "content"}')
+                assert(
+                    runSamCliStub.calledWith(
+                        sinon.match({
+                            name: 'TestEvent',
+                            operation: 'get',
+                            functionArn: data.FunctionArn,
+                            region: 'us-west-2',
+                        })
+                    )
+                )
+            })
+        })
+    })
+    describe('listRemoteTestEvents', () => {
+        let runSamCliRemoteTestEventsStub: sinon.SinonStub
+        beforeEach(() => {
+            runSamCliRemoteTestEventsStub = sinon.stub(samCliRemoteTestEvent, 'runSamCliRemoteTestEvents')
+        })
+        afterEach(() => {
+            sinon.restore()
+        })
+
+        it('should call remoteTestEvents with correct parameters and return a split result', async () => {
+            const functionArn = 'arn:aws:lambda:us-west-2:123456789012:function:TestLambda'
+            const region = 'us-west-2'
+            const mockResponse = 'event1\nevent2\nevent3'
+            const expectedParams = {
+                functionArn: functionArn,
+                operation: TestEventsOperation.List,
+                region: region,
+            }
+            runSamCliRemoteTestEventsStub.resolves(mockResponse)
+            const result = await remoteInvokeWebview.listRemoteTestEvents(functionArn, region)
+            assert(runSamCliRemoteTestEventsStub.calledOnce)
+            assert(runSamCliRemoteTestEventsStub.calledWith(expectedParams))
+            const expectedResult = ['event1', 'event2', 'event3']
+            assert.deepEqual(result, expectedResult)
+        })
+
+        it('should handle errors thrown by remoteTestEvents', async () => {
+            const functionArn = 'arn:aws:lambda:us-west-2:123456789012:function:TestLambda'
+            const region = 'us-west-2'
+            const errorMessage = 'Error listing remote test events'
+            runSamCliRemoteTestEventsStub.rejects(new Error(errorMessage))
+            await assert.rejects(async () => {
+                await remoteInvokeWebview.listRemoteTestEvents(functionArn, region)
+            }, new RegExp(errorMessage))
+            assert(runSamCliRemoteTestEventsStub.calledOnce)
+        })
+    })
+
+    describe('createRemoteTestEvents', () => {
+        let runSamCliRemoteTestEventsStub: sinon.SinonStub
+        beforeEach(() => {
+            runSamCliRemoteTestEventsStub = sinon.stub(samCliRemoteTestEvent, 'runSamCliRemoteTestEvents')
+        })
+        afterEach(() => {
+            sinon.restore()
+        })
+        it('should call remoteTestEvents with correct parameters', async () => {
+            const mockPutEvent = {
+                arn: 'arn:aws:lambda:us-west-2:123456789012:function:TestLambda',
+                name: 'TestEvent',
+                event: '{"key": "value"}',
+                region: 'us-west-2',
+            }
+            await remoteInvokeWebview.createRemoteTestEvents(mockPutEvent)
+            const expectedParams: SamCliRemoteTestEventsParameters = {
+                functionArn: mockPutEvent.arn,
+                operation: TestEventsOperation.Put,
+                name: mockPutEvent.name,
+                eventSample: mockPutEvent.event,
+                region: mockPutEvent.region,
+                force: false, // Default value when not overwriting
+            }
+            assert(runSamCliRemoteTestEventsStub.calledOnce, 'remoteTestEvents should be called once')
+            assert(
+                runSamCliRemoteTestEventsStub.calledWith(expectedParams),
+                'remoteTestEvents should be called with correct parameters'
+            )
+        })
+
+        it('should return the result from remoteTestEvents', async () => {
+            const mockPutEvent = {
+                arn: 'arn:aws:lambda:us-west-2:123456789012:function:TestLambda',
+                name: 'TestEvent',
+                event: '{"key": "value"}',
+                region: 'us-west-2',
+            }
+            const mockResponse = 'Success'
+            runSamCliRemoteTestEventsStub.resolves(mockResponse)
+            const result = await remoteInvokeWebview.createRemoteTestEvents(mockPutEvent)
+            assert.strictEqual(result, mockResponse, 'The result should match the mock response')
+        })
+
+        it('should call remoteTestEvents with force flag when overwriting', async () => {
+            const mockPutEvent = {
+                arn: 'arn:aws:lambda:us-west-2:123456789012:function:TestLambda',
+                name: 'ExistingEvent',
+                event: '{"key": "updated value"}',
+                region: 'us-west-2',
+            }
+            await remoteInvokeWebview.createRemoteTestEvents(mockPutEvent, true) // force = true
+            const expectedParams: SamCliRemoteTestEventsParameters = {
+                functionArn: mockPutEvent.arn,
+                operation: TestEventsOperation.Put,
+                name: mockPutEvent.name,
+                eventSample: mockPutEvent.event,
+                region: mockPutEvent.region,
+                force: true, // Should include force flag when overwriting
+            }
+            assert(runSamCliRemoteTestEventsStub.calledOnce, 'remoteTestEvents should be called once')
+            assert(
+                runSamCliRemoteTestEventsStub.calledWith(expectedParams),
+                'remoteTestEvents should be called with force flag'
+            )
+        })
+    })
+
+    describe('getRemoteTestEvents', () => {
+        let runSamCliRemoteTestEventsStub: sinon.SinonStub
+        beforeEach(() => {
+            runSamCliRemoteTestEventsStub = sinon.stub(samCliRemoteTestEvent, 'runSamCliRemoteTestEvents')
+        })
+        afterEach(() => {
+            sinon.restore()
+        })
+        it('should call remoteTestEvents with correct parameters', async () => {
+            const mockEvent = {
+                name: 'TestLambda',
+                arn: 'arn:aws:lambda:us-west-2:123456789012:function:TestLambda',
+                region: 'us-west-2',
+            }
+            const expectedParams = {
+                name: mockEvent.name,
+                operation: TestEventsOperation.Get,
+                functionArn: mockEvent.arn,
+                region: mockEvent.region,
+            }
+            const mockResponse = 'mockResponse'
+            runSamCliRemoteTestEventsStub.resolves(mockResponse)
+            const result = await remoteInvokeWebview.getRemoteTestEvents(mockEvent)
+            assert(runSamCliRemoteTestEventsStub.calledOnce)
+            assert(runSamCliRemoteTestEventsStub.calledWith(expectedParams))
+            assert.strictEqual(result, mockResponse)
+        })
+
+        it('should handle errors thrown by remoteTestEvents', async () => {
+            const mockEvent = {
+                name: 'TestLambda',
+                arn: 'arn:aws:lambda:us-west-2:123456789012:function:TestLambda',
+                region: 'us-west-2',
+            }
+            const errorMessage = 'Error invoking remote test events'
+            runSamCliRemoteTestEventsStub.rejects(new Error(errorMessage))
+            await assert.rejects(async () => {
+                await remoteInvokeWebview.getRemoteTestEvents(mockEvent)
+            }, new RegExp(errorMessage))
+            assert(runSamCliRemoteTestEventsStub.calledOnce)
+        })
+    })
+
+    describe('getSamplePayload', () => {
+        let getSampleLambdaPayloadsStub: sinon.SinonStub
+        let createQuickPickStub: sinon.SinonStub
+        let promptUserStub: sinon.SinonStub
+        let verifySinglePickerOutputStub: sinon.SinonStub
+        let httpFetcherStub: sinon.SinonStub
+
+        beforeEach(() => {
+            getSampleLambdaPayloadsStub = sinon.stub(utils, 'getSampleLambdaPayloads')
+            createQuickPickStub = sinon.stub(picker, 'createQuickPick')
+            promptUserStub = sinon.stub(picker, 'promptUser')
+            verifySinglePickerOutputStub = sinon.stub(picker, 'verifySinglePickerOutput')
+            httpFetcherStub = sinon.stub(HttpResourceFetcher.prototype, 'get')
+        })
+
+        afterEach(() => {
+            sinon.restore()
+        })
+
+        it('should return sample payload when user selects a sample', async () => {
+            const mockPayloads = [{ name: 'testEvent', filename: 'testEvent.json' }]
+            const mockSampleContent = '{ "test": "data" }'
+
+            getSampleLambdaPayloadsStub.resolves(mockPayloads)
+            createQuickPickStub.returns({})
+            promptUserStub.resolves([{ label: 'testEvent', filename: 'testEvent.json' }])
+            verifySinglePickerOutputStub.returns({ label: 'testEvent', filename: 'testEvent.json' })
+            httpFetcherStub.resolves(createResponse(mockSampleContent))
+
+            const result = await remoteInvokeWebview.getSamplePayload()
+
+            assert.strictEqual(result, mockSampleContent)
+        })
+
+        it('should throw an error if fetching sample data fails', async () => {
+            getSampleLambdaPayloadsStub.resolves([{ name: 'testEvent', filename: 'testEvent.json' }])
+            createQuickPickStub.returns({})
+            promptUserStub.resolves([{ label: 'testEvent', filename: 'testEvent.json' }])
+            verifySinglePickerOutputStub.returns({ label: 'testEvent', filename: 'testEvent.json' })
+            httpFetcherStub.rejects(new Error('Fetch failed'))
+
+            await assert.rejects(async () => {
+                await remoteInvokeWebview.getSamplePayload()
+            }, /getting manifest data/)
+        })
+        it('returns undefined when no file is selected', async () => {
+            const mockPayloads = [{ name: 'testEvent', filename: 'testEvent.json' }]
+            getSampleLambdaPayloadsStub.resolves(mockPayloads)
+            createQuickPickStub.returns({})
+            promptUserStub.resolves([{ label: 'testEvent', filename: 'testEvent.json' }])
+            verifySinglePickerOutputStub.returns(undefined)
+            const result = await remoteInvokeWebview.getSamplePayload()
+            assert.strictEqual(result, undefined)
+        })
+    })
+    describe('tryOpenHandlerFile', () => {
+        let sandbox: sinon.SinonSandbox
+        let fsExistsStub: sinon.SinonStub
+        let getLambdaHandlerFileStub: sinon.SinonStub
+
+        beforeEach(() => {
+            sandbox = sinon.createSandbox()
+            fsExistsStub = sandbox.stub(fs, 'exists')
+            getLambdaHandlerFileStub = sandbox.stub(
+                require('../../../../awsService/appBuilder/utils'),
+                'getLambdaHandlerFile'
+            )
+        })
+
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        it('should return false when LocalRootPath is not set', async () => {
+            const result = await remoteInvokeWebview.tryOpenHandlerFile()
+            assert.strictEqual(result, false)
+        })
+
+        it('should not watch for updates when LocalRootPath is already set (appbuilder case)', async () => {
+            const tempFolder = await makeTemporaryToolkitFolder()
+            const handlerPath = path.join(tempFolder, 'handler.js')
+            await fs.writeFile(handlerPath, 'exports.handler = () => {}')
+
+            // Set LocalRootPath first to simulate appbuilder case
+            data.LocalRootPath = tempFolder
+            data.LambdaFunctionNode = {
+                configuration: {
+                    Handler: 'handler.handler',
+                    CodeSha256: 'abc123',
+                },
+            } as any
+            data.Runtime = 'nodejs20.x'
+
+            getLambdaHandlerFileStub.resolves(vscode.Uri.file(handlerPath))
+            fsExistsStub.resolves(true)
+
+            const result = await remoteInvokeWebview.tryOpenHandlerFile(tempFolder)
+
+            assert.strictEqual(result, true)
+            // In appbuilder case, watchForUpdates should be false
+
+            await fs.delete(tempFolder, { recursive: true })
+        })
+    })
+
+    describe('invokeRemoteLambda', () => {
+        let sandbox: sinon.SinonSandbox
+        let outputChannel: vscode.OutputChannel
+        let mockExtContext: ExtContext
+        let mockFunctionNode: LambdaFunctionNode
+        let createWebviewPanelStub: sinon.SinonStub
+        let getSampleLambdaPayloadsStub: sinon.SinonStub
+
+        beforeEach(async function () {
+            sandbox = sinon.createSandbox()
+            outputChannel = { append: sandbox.stub(), appendLine: sandbox.stub() } as unknown as vscode.OutputChannel
+            mockExtContext = await FakeExtensionContext.getFakeExtContext()
+            mockFunctionNode = {
+                configuration: {
+                    FunctionName: 'testFunction',
+                    FunctionArn: 'arn:aws:lambda:us-west-2:123456789012:function:testFunction',
+                },
+                regionCode: 'us-west-2',
+            } as LambdaFunctionNode
+            createWebviewPanelStub = sandbox.stub(vscode.window, 'createWebviewPanel').returns({
+                webview: {
+                    html: '',
+                    asWebviewUri: sandbox.stub().returns(vscode.Uri.parse('https://mock-webview-uri.com')),
+                    onDidReceiveMessage: sandbox.stub(),
+                },
+                onDidDispose: sandbox.stub(),
+                reveal: sandbox.stub(),
+            } as unknown as vscode.WebviewPanel)
+            getSampleLambdaPayloadsStub = sandbox.stub(utils, 'getSampleLambdaPayloads').resolves([
+                { name: 'Sample1', filename: 'sample1.json' },
+                { name: 'Sample2', filename: 'sample2.json' },
+            ])
+        })
+
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        it('should invoke lambda with a LambdaFunctionNode', async () => {
+            await invokeRemoteLambda(mockExtContext, { outputChannel: outputChannel, functionNode: mockFunctionNode })
+            assert(getSampleLambdaPayloadsStub.calledOnce)
+            assert(createWebviewPanelStub.calledOnce)
+            const createWebviewPanelArgs = createWebviewPanelStub.getCall(0).args
+            assert.strictEqual(createWebviewPanelArgs[0], 'remoteInvoke')
+            assert.strictEqual(
+                createWebviewPanelArgs[1],
+                `Invoke Lambda ${mockFunctionNode.configuration.FunctionName}`
+            )
+            // opens in side panel
+            assert.deepStrictEqual(createWebviewPanelArgs[2], { viewColumn: vscode.ViewColumn.Beside })
+        })
+    })
+})
diff --git a/packages/core/src/test/lambda/vue/remoteInvoke/invokeLambdaDebugging.test.ts b/packages/core/src/test/lambda/vue/remoteInvoke/invokeLambdaDebugging.test.ts
new file mode 100644
index 00000000000..79f7863cd09
--- /dev/null
+++ b/packages/core/src/test/lambda/vue/remoteInvoke/invokeLambdaDebugging.test.ts
@@ -0,0 +1,581 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { RemoteInvokeWebview, InitialData } from '../../../../lambda/vue/remoteInvoke/invokeLambda'
+import { LambdaClient, DefaultLambdaClient } from '../../../../shared/clients/lambdaClient'
+import * as vscode from 'vscode'
+import sinon, { SinonStubbedInstance, createStubInstance } from 'sinon'
+import { RemoteDebugController } from '../../../../lambda/remoteDebugging/ldkController'
+import type { DebugConfig } from '../../../../lambda/remoteDebugging/lambdaDebugger'
+import { getTestWindow } from '../../../shared/vscode/window'
+import { LambdaFunctionNode } from '../../../../lambda/explorer/lambdaFunctionNode'
+import * as downloadLambda from '../../../../lambda/commands/downloadLambda'
+import * as uploadLambda from '../../../../lambda/commands/uploadLambda'
+import * as appBuilderUtils from '../../../../awsService/appBuilder/utils'
+import * as messages from '../../../../shared/utilities/messages'
+import globals from '../../../../shared/extensionGlobals'
+import fs from '../../../../shared/fs/fs'
+import { ToolkitError } from '../../../../shared'
+import { createMockDebugConfig } from '../../remoteDebugging/testUtils'
+import { InvocationResponse } from '@aws-sdk/client-lambda'
+
+describe('RemoteInvokeWebview - Debugging Functionality', () => {
+    let outputChannel: vscode.OutputChannel
+    let client: SinonStubbedInstance<LambdaClient>
+    let remoteInvokeWebview: RemoteInvokeWebview
+    let data: InitialData
+    let sandbox: sinon.SinonSandbox
+    let mockDebugController: SinonStubbedInstance<RemoteDebugController>
+    let mockFunctionNode: LambdaFunctionNode
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+        client = createStubInstance(DefaultLambdaClient)
+        outputChannel = {
+            appendLine: sandbox.stub(),
+            show: sandbox.stub(),
+        } as unknown as vscode.OutputChannel
+
+        mockFunctionNode = {
+            configuration: {
+                FunctionName: 'testFunction',
+                FunctionArn: 'arn:aws:lambda:us-west-2:123456789012:function:testFunction',
+                Handler: 'index.handler',
+                Runtime: 'nodejs18.x',
+                SnapStart: { ApplyOn: 'None' },
+            },
+            regionCode: 'us-west-2',
+            localDir: '/local/path',
+        } as LambdaFunctionNode
+
+        data = {
+            FunctionName: 'testFunction',
+            FunctionArn: 'arn:aws:lambda:us-west-2:123456789012:function:testFunction',
+            FunctionRegion: 'us-west-2',
+            InputSamples: [],
+            Runtime: 'nodejs18.x',
+            LocalRootPath: '/local/path',
+            LambdaFunctionNode: mockFunctionNode,
+            supportCodeDownload: true,
+            runtimeSupportsRemoteDebug: true,
+            regionSupportsRemoteDebug: true,
+        } as InitialData
+
+        remoteInvokeWebview = new RemoteInvokeWebview(outputChannel, client, client, data)
+
+        // Mock RemoteDebugController
+        mockDebugController = createStubInstance(RemoteDebugController)
+        sandbox.stub(RemoteDebugController, 'instance').get(() => mockDebugController)
+
+        // Set handler file as available by default to avoid timeout issues
+        ;(remoteInvokeWebview as any).handlerFileAvailable = true
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+
+    describe('Debug Timer Management', () => {
+        it('should start debug timer and count down', async () => {
+            remoteInvokeWebview.startDebugTimer()
+
+            // Check initial state
+            assert.strictEqual(remoteInvokeWebview.getDebugTimeRemaining(), 60)
+
+            // Wait a bit and check if timer is counting down
+            await new Promise<void>((resolve) => {
+                setTimeout(() => {
+                    const timeRemaining = remoteInvokeWebview.getDebugTimeRemaining()
+                    assert(timeRemaining < 60 && timeRemaining > 0, 'Timer should be counting down')
+                    remoteInvokeWebview.stopDebugTimer()
+                    resolve()
+                }, 1100) // Wait slightly more than 1 second
+            })
+        })
+
+        it('should stop debug timer', () => {
+            remoteInvokeWebview.startDebugTimer()
+            assert(remoteInvokeWebview.getDebugTimeRemaining() > 0)
+
+            remoteInvokeWebview.stopDebugTimer()
+            assert.strictEqual(remoteInvokeWebview.getDebugTimeRemaining(), 0)
+        })
+    })
+
+    describe('Debug State Management', () => {
+        it('should reset server state correctly', () => {
+            // Set up some state
+            remoteInvokeWebview.startDebugTimer()
+
+            // Mock the debugging state
+            mockDebugController.isDebugging = true
+
+            remoteInvokeWebview.resetServerState()
+
+            assert.strictEqual(remoteInvokeWebview.getDebugTimeRemaining(), 0)
+            assert.strictEqual(remoteInvokeWebview.isWebViewDebugging(), false)
+        })
+
+        it('should check if ready to invoke when not invoking', () => {
+            const result = remoteInvokeWebview.checkReadyToInvoke()
+            assert.strictEqual(result, true)
+        })
+
+        it('should show warning when invoke is in progress', () => {
+            // Mock the window.showWarningMessage through getTestWindow
+            getTestWindow().onDidShowMessage(() => {
+                // Message handler for warning
+            })
+
+            // Set invoking state
+            ;(remoteInvokeWebview as any).isInvoking = true
+
+            const result = remoteInvokeWebview.checkReadyToInvoke()
+
+            assert.strictEqual(result, false)
+            // The warning should be shown but we can't easily verify it in this test setup
+        })
+
+        it('should return correct debugging states', () => {
+            mockDebugController.isDebugging = true
+            assert.strictEqual(remoteInvokeWebview.isLDKDebugging(), true)
+
+            mockDebugController.isDebugging = false
+            assert.strictEqual(remoteInvokeWebview.isLDKDebugging(), false)
+        })
+    })
+
+    describe('Debug Configuration and Validation', () => {
+        let mockConfig: DebugConfig
+
+        beforeEach(() => {
+            mockConfig = createMockDebugConfig({
+                functionArn: data.FunctionArn,
+                functionName: data.FunctionName,
+            })
+        })
+
+        it('should check ready to debug with valid config', async () => {
+            // Ensure handler file is available to avoid confirmation dialog
+            ;(remoteInvokeWebview as any).handlerFileAvailable = true
+
+            const result = await remoteInvokeWebview.checkReadyToDebug(mockConfig)
+            assert.strictEqual(result, true)
+        })
+
+        it('should return false when LambdaFunctionNode is undefined', async () => {
+            remoteInvokeWebview = new RemoteInvokeWebview(outputChannel, client, client, {
+                ...data,
+                LambdaFunctionNode: undefined,
+            })
+
+            const result = await remoteInvokeWebview.checkReadyToDebug(mockConfig)
+            assert.strictEqual(result, false)
+        })
+
+        it('should show warning when handler file is not available', async () => {
+            const showConfirmationStub = sandbox.stub(messages, 'showConfirmationMessage').resolves(false)
+
+            // Set handler file as not available
+            ;(remoteInvokeWebview as any).handlerFileAvailable = false
+
+            const result = await remoteInvokeWebview.checkReadyToDebug(mockConfig)
+
+            assert.strictEqual(result, false)
+            assert(showConfirmationStub.calledOnce)
+        })
+
+        it('should show snapstart warning when publishing version with snapstart enabled', async () => {
+            const showConfirmationStub = sandbox.stub(messages, 'showConfirmationMessage').resolves(false)
+
+            mockConfig.shouldPublishVersion = true
+            data.LambdaFunctionNode!.configuration.SnapStart = { ApplyOn: 'PublishedVersions' }
+
+            const result = await remoteInvokeWebview.checkReadyToDebug(mockConfig)
+
+            assert.strictEqual(result, false)
+            assert(showConfirmationStub.calledOnce)
+        })
+    })
+
+    describe('Debug Session Management', () => {
+        let mockConfig: DebugConfig
+
+        beforeEach(() => {
+            mockConfig = createMockDebugConfig({
+                functionArn: data.FunctionArn,
+                functionName: data.FunctionName,
+            })
+        })
+
+        it('should start debugging successfully', async () => {
+            // Ensure handler file is available to avoid confirmation dialog
+            ;(remoteInvokeWebview as any).handlerFileAvailable = true
+
+            mockDebugController.startDebugging.resolves()
+            mockDebugController.isDebugging = true
+
+            const result = await remoteInvokeWebview.startDebugging(mockConfig)
+
+            assert.strictEqual(result, true)
+            assert(mockDebugController.startDebugging.calledOnce)
+        })
+
+        it('should call stop debugging', async () => {
+            mockDebugController.isDebugging = true
+            mockDebugController.stopDebugging.resolves()
+
+            await remoteInvokeWebview.stopDebugging()
+
+            // The method doesn't return a boolean, it returns void
+            assert(mockDebugController.stopDebugging.calledOnce)
+        })
+
+        it('should handle debug pre-check with existing session', async () => {
+            const showConfirmationStub = sandbox.stub(messages, 'showConfirmationMessage').resolves(true)
+            const stopDebuggingStub = sandbox.stub(remoteInvokeWebview, 'stopDebugging').resolves(false)
+            mockDebugController.isDebugging = true
+            mockDebugController.installDebugExtension.resolves(true)
+
+            // Mock revertExistingConfig - need to import it properly
+            const ldkController = require('../../../../lambda/remoteDebugging/ldkController')
+            const revertStub = sandbox.stub(ldkController, 'revertExistingConfig').resolves(true)
+
+            await remoteInvokeWebview.debugPreCheck()
+
+            assert(showConfirmationStub.calledOnce)
+            assert(stopDebuggingStub.calledOnce)
+            assert(mockDebugController.installDebugExtension.calledOnce)
+            assert(revertStub.calledOnce)
+        })
+    })
+
+    describe('File Operations and Code Management', () => {
+        it('should prompt for folder selection', async () => {
+            const mockUri = vscode.Uri.file('/selected/folder')
+            getTestWindow().onDidShowDialog((d) => d.selectItem(mockUri))
+
+            const result = await remoteInvokeWebview.promptFolder()
+
+            assert.strictEqual(result, mockUri.fsPath)
+            assert.strictEqual(remoteInvokeWebview.getLocalPath(), mockUri.fsPath)
+        })
+
+        it('should return undefined when no folder is selected', async () => {
+            getTestWindow().onDidShowDialog((d) => d.close())
+
+            const result = await remoteInvokeWebview.promptFolder()
+
+            assert.strictEqual(result, undefined)
+        })
+
+        it('should try to open handler file successfully', async () => {
+            const mockHandlerUri = vscode.Uri.file('/local/path/index.js')
+            sandbox.stub(appBuilderUtils, 'getLambdaHandlerFile').resolves(mockHandlerUri)
+            sandbox.stub(fs, 'exists').resolves(true)
+            sandbox.stub(downloadLambda, 'openLambdaFile').resolves()
+
+            const result = await remoteInvokeWebview.tryOpenHandlerFile('/local/path')
+
+            assert.strictEqual(result, true)
+            assert.strictEqual(remoteInvokeWebview.getHandlerAvailable(), true)
+        })
+
+        it('should handle handler file not found', async () => {
+            sandbox.stub(appBuilderUtils, 'getLambdaHandlerFile').resolves(undefined)
+
+            // Mock the warning message through getTestWindow
+            getTestWindow().onDidShowMessage(() => {
+                // Message handler for warning
+            })
+
+            const result = await remoteInvokeWebview.tryOpenHandlerFile('/local/path')
+
+            assert.strictEqual(result, false)
+            assert.strictEqual(remoteInvokeWebview.getHandlerAvailable(), false)
+        })
+
+        it('should download remote code successfully', async () => {
+            const mockUri = vscode.Uri.file('/downloaded/path')
+            sandbox.stub(downloadLambda, 'runDownloadLambda').resolves(mockUri)
+
+            // Mock workspace state operations
+            const mockWorkspaceState = {
+                get: sandbox.stub().returns({}),
+                update: sandbox.stub().resolves(),
+            }
+            sandbox.stub(globals, 'context').value({
+                workspaceState: mockWorkspaceState,
+            })
+
+            const result = await remoteInvokeWebview.downloadRemoteCode()
+
+            assert.strictEqual(result, mockUri.fsPath)
+            assert.strictEqual(data.LocalRootPath, mockUri.fsPath)
+        })
+
+        it('should handle download failure', async () => {
+            sandbox.stub(downloadLambda, 'runDownloadLambda').rejects(new Error('Download failed'))
+
+            await assert.rejects(
+                async () => await remoteInvokeWebview.downloadRemoteCode(),
+                /Failed to download remote code/
+            )
+        })
+    })
+
+    describe('File Watching and Code Synchronization', () => {
+        it('should setup file watcher when local root path exists', () => {
+            const createFileSystemWatcherStub = sandbox.stub(vscode.workspace, 'createFileSystemWatcher')
+            const mockWatcher = {
+                onDidChange: sandbox.stub(),
+                onDidCreate: sandbox.stub(),
+                onDidDelete: sandbox.stub(),
+            }
+            createFileSystemWatcherStub.returns(mockWatcher as any)
+
+            // Call the private method through reflection
+            ;(remoteInvokeWebview as any).setupFileWatcher()
+
+            assert(createFileSystemWatcherStub.calledOnce)
+            assert(mockWatcher.onDidChange.calledOnce)
+            assert(mockWatcher.onDidCreate.calledOnce)
+            assert(mockWatcher.onDidDelete.calledOnce)
+        })
+
+        it('should handle file changes and prompt for upload', async () => {
+            const showConfirmationStub = sandbox.stub(messages, 'showMessage').resolves('Yes')
+            const runUploadDirectoryStub = sandbox.stub(uploadLambda, 'runUploadDirectory').resolves()
+
+            // Mock file watcher setup
+            let changeHandler: () => Promise<void>
+            const mockWatcher = {
+                onDidChange: (handler: () => Promise<void>) => {
+                    changeHandler = handler
+                },
+                onDidCreate: sandbox.stub(),
+                onDidDelete: sandbox.stub(),
+            }
+            sandbox.stub(vscode.workspace, 'createFileSystemWatcher').returns(mockWatcher as any)
+
+            // Setup file watcher
+            ;(remoteInvokeWebview as any).setupFileWatcher()
+
+            // Trigger file change
+            await changeHandler!()
+
+            assert(showConfirmationStub.calledOnce)
+            assert(runUploadDirectoryStub.calledOnce)
+        })
+    })
+
+    describe('Lambda Invocation with Debugging', () => {
+        it('should invoke lambda with remote debugging enabled', async () => {
+            const mockResponse = {
+                LogResult: Buffer.from('Debug log').toString('base64'),
+                Payload: new TextEncoder().encode('{"result": "debug success"}'),
+            } satisfies InvocationResponse
+            client.invoke.resolves(mockResponse)
+            mockDebugController.isDebugging = true
+            mockDebugController.qualifier = 'v1'
+
+            const focusStub = sandbox.stub(vscode.commands, 'executeCommand').resolves()
+
+            await remoteInvokeWebview.invokeLambda('{"test": "input"}', 'test', true)
+
+            assert(client.invoke.calledWith(data.FunctionArn, '{"test": "input"}', 'v1'))
+            assert(focusStub.calledWith('workbench.action.focusFirstEditorGroup'))
+        })
+
+        it('should handle timer management during debugging invocation', async () => {
+            const mockResponse = {
+                LogResult: Buffer.from('Debug log').toString('base64'),
+                Payload: new TextEncoder().encode('{"result": "debug success"}'),
+            } satisfies InvocationResponse
+            client.invoke.resolves(mockResponse)
+            mockDebugController.isDebugging = true
+
+            const stopTimerStub = sandbox.stub(remoteInvokeWebview, 'stopDebugTimer')
+            const startTimerStub = sandbox.stub(remoteInvokeWebview, 'startDebugTimer')
+
+            await remoteInvokeWebview.invokeLambda('{"test": "input"}', 'test', true)
+
+            // Timer should be stopped at least once during invoke
+            assert(stopTimerStub.calledOnce)
+            assert(startTimerStub.calledOnce) // Called after invoke
+        })
+    })
+
+    describe('Dispose and Cleanup', () => {
+        it('should dispose server and clean up resources', async () => {
+            // Set up debugging state and disposables
+            ;(remoteInvokeWebview as any).debugging = true
+            mockDebugController.isDebugging = true
+
+            // Mock disposables
+            const mockDisposable = { dispose: sandbox.stub() }
+            ;(remoteInvokeWebview as any).watcherDisposable = mockDisposable
+            ;(remoteInvokeWebview as any).fileWatcherDisposable = mockDisposable
+
+            await remoteInvokeWebview.disposeServer()
+
+            assert(mockDisposable.dispose.calledTwice)
+            assert(mockDebugController.stopDebugging.calledOnce)
+        })
+
+        it('should handle dispose when not debugging', async () => {
+            mockDebugController.isDebugging = false
+
+            const mockDisposable = { dispose: sandbox.stub() }
+            ;(remoteInvokeWebview as any).watcherDisposable = mockDisposable
+
+            await remoteInvokeWebview.disposeServer()
+
+            assert(mockDisposable.dispose.calledOnce)
+        })
+    })
+
+    describe('Debug Session Event Handling', () => {
+        it('should handle debug session termination', async () => {
+            const resetStateStub = sandbox.stub(remoteInvokeWebview, 'resetServerState')
+
+            // Mock debug session termination event
+            let terminationHandler: (session: vscode.DebugSession) => Promise<void>
+            sandbox.stub(vscode.debug, 'onDidTerminateDebugSession').callsFake((handler) => {
+                terminationHandler = handler
+                return { dispose: sandbox.stub() }
+            })
+
+            // Initialize the webview to set up event handlers
+            remoteInvokeWebview.init()
+
+            // Simulate debug session termination
+            const mockSession = { name: 'test-session' } as vscode.DebugSession
+            await terminationHandler!(mockSession)
+
+            assert(resetStateStub.calledOnce)
+        })
+    })
+
+    describe('Debugging Flow', () => {
+        let mockConfig: DebugConfig
+
+        beforeEach(() => {
+            mockConfig = createMockDebugConfig({
+                functionArn: data.FunctionArn,
+                functionName: data.FunctionName,
+            })
+            async function mockRun<T>(fn: (span: any) => T): Promise<T> {
+                const span = { record: sandbox.stub() }
+                return fn(span)
+            }
+            // Mock telemetry to avoid issues
+            sandbox.stub(require('../../../../shared/telemetry/telemetry'), 'telemetry').value({
+                lambda_invokeRemote: {
+                    run: mockRun,
+                },
+            })
+        })
+
+        it('should handle complete debugging workflow', async () => {
+            // Setup mocks for successful debugging
+            mockDebugController.startDebugging.resolves()
+            mockDebugController.stopDebugging.resolves()
+            mockDebugController.isDebugging = false
+
+            // Mock the debugging state change after startDebugging is called
+            mockDebugController.startDebugging.callsFake(async () => {
+                mockDebugController.isDebugging = true
+                return Promise.resolve()
+            })
+
+            // 1. Start debugging
+            const startResult = await remoteInvokeWebview.startDebugging(mockConfig)
+            assert.strictEqual(startResult, true, 'Debug session should start successfully')
+
+            // Set qualifier for invocation
+            mockDebugController.qualifier = '$LATEST'
+
+            // 2. Test lambda invocation during debugging
+            const mockResponse = {
+                LogResult: Buffer.from('Debug invocation log').toString('base64'),
+                Payload: new TextEncoder().encode('{"debugResult": "success"}'),
+            } satisfies InvocationResponse
+            client.invoke.resolves(mockResponse)
+
+            await remoteInvokeWebview.invokeLambda('{"debugInput": "test"}', 'integration-test', true)
+
+            // Verify invocation was called with correct parameters
+            assert(client.invoke.calledWith(data.FunctionArn, '{"debugInput": "test"}', '$LATEST'))
+
+            // 3. Stop debugging
+            await remoteInvokeWebview.stopDebugging()
+
+            // Verify cleanup operations were called
+            assert(mockDebugController.stopDebugging.calledOnce, 'Should stop debugging')
+        })
+
+        it('should handle debugging failure gracefully', async () => {
+            // Setup mock for debugging failure
+            mockDebugController.startDebugging.rejects(new Error('Debug start failed'))
+            mockDebugController.isDebugging = false
+
+            // Attempt to start debugging - should throw error
+            try {
+                await remoteInvokeWebview.startDebugging(mockConfig)
+                assert.fail('Expected error to be thrown')
+            } catch (error) {
+                assert(error instanceof ToolkitError)
+                assert(error.message.includes('Failed to start debugging'))
+                assert(error.cause?.message.includes('Debug start failed'))
+            }
+
+            assert.strictEqual(
+                remoteInvokeWebview.isWebViewDebugging(),
+                false,
+                'Webview should not be in debugging state'
+            )
+        })
+
+        it('should handle version publishing workflow', async () => {
+            // Setup config for version publishing
+            const versionConfig = { ...mockConfig, shouldPublishVersion: true }
+
+            // Setup mocks for version publishing
+            mockDebugController.startDebugging.resolves()
+            mockDebugController.stopDebugging.resolves()
+            mockDebugController.isDebugging = false
+
+            // Mock the debugging state change after startDebugging is called
+            mockDebugController.startDebugging.callsFake(async () => {
+                mockDebugController.isDebugging = true
+                mockDebugController.qualifier = 'v1'
+                return Promise.resolve()
+            })
+
+            // Start debugging with version publishing
+            const startResult = await remoteInvokeWebview.startDebugging(versionConfig)
+            assert.strictEqual(startResult, true, 'Debug session should start successfully')
+
+            // Test invocation with version qualifier
+            const mockResponse = {
+                LogResult: Buffer.from('Version debug log').toString('base64'),
+                Payload: new TextEncoder().encode('{"versionResult": "success"}'),
+            } satisfies InvocationResponse
+            client.invoke.resolves(mockResponse)
+
+            await remoteInvokeWebview.invokeLambda('{"versionInput": "test"}', 'version-test', true)
+
+            // Should invoke with version qualifier
+            assert(client.invoke.calledWith(data.FunctionArn, '{"versionInput": "test"}', 'v1'))
+
+            // Stop debugging
+            await remoteInvokeWebview.stopDebugging()
+
+            assert(mockDebugController.stopDebugging.calledOnce, 'Should stop debugging')
+        })
+    })
+})
diff --git a/packages/core/src/test/lambda/vue/remoteInvoke/remoteInvoke.test.ts b/packages/core/src/test/lambda/vue/remoteInvoke/remoteInvoke.test.ts
new file mode 100644
index 00000000000..852ba43d5bd
--- /dev/null
+++ b/packages/core/src/test/lambda/vue/remoteInvoke/remoteInvoke.test.ts
@@ -0,0 +1,72 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { DefaultLambdaClient, LambdaClient } from '../../../../shared/clients/lambdaClient'
+import { RemoteInvokeWebview } from '../../../../lambda/vue/remoteInvoke/invokeLambda'
+import * as vscode from 'vscode'
+import * as samCliRemoteTestEvent from '../../../../shared/sam/cli/samCliRemoteTestEvent'
+import { TestEventsOperation } from '../../../../shared/sam/cli/samCliRemoteTestEvent'
+import sinon, { SinonStubbedInstance, createStubInstance } from 'sinon'
+import { InvocationResponse } from '@aws-sdk/client-lambda'
+
+// Tests to check that the internal integration between the functions operates correctly
+
+describe('RemoteInvokeWebview', function () {
+    let client: SinonStubbedInstance<LambdaClient>
+    let remoteInvokeWebview: RemoteInvokeWebview
+    let outputChannel: vscode.OutputChannel
+    let mockData: any
+    before(async () => {
+        client = createStubInstance(DefaultLambdaClient)
+        outputChannel = {
+            appendLine: (line: string) => {},
+            show: () => {},
+        } as vscode.OutputChannel
+        mockData = {
+            FunctionArn: 'arn:aws:lambda:us-west-2:123456789012:function:my-function',
+        }
+        remoteInvokeWebview = new RemoteInvokeWebview(outputChannel, client, client, mockData)
+    })
+    describe('Invoke Remote Lambda Function with Payload', () => {
+        it('should invoke with a simple payload', async function () {
+            const input = '{"key": "value"}'
+            const mockResponse = {
+                LogResult: Buffer.from('Test log').toString('base64'),
+                Payload: new TextEncoder().encode('{"result": "success"}'),
+            } satisfies InvocationResponse
+            client.invoke.resolves(mockResponse)
+            await remoteInvokeWebview.invokeLambda(input)
+            sinon.assert.calledOnce(client.invoke)
+            sinon.assert.calledWith(client.invoke, mockData.FunctionArn, input)
+        })
+    })
+    describe('Invoke Remote Lambda Function with Saved Events Payload', () => {
+        const mockEvent = {
+            name: 'TestEvent',
+            arn: 'arn:aws:lambda:us-west-2:123456789012:function:myFunction',
+            region: 'us-west-2',
+        }
+        const expectedParams = {
+            name: mockEvent.name,
+            operation: TestEventsOperation.Get,
+            functionArn: mockEvent.arn,
+            region: mockEvent.region,
+        }
+        const mockResponse = 'true'
+        let runSamCliRemoteTestEventsStub: sinon.SinonStub
+        beforeEach(() => {
+            runSamCliRemoteTestEventsStub = sinon.stub(samCliRemoteTestEvent, 'runSamCliRemoteTestEvents')
+        })
+        afterEach(() => {
+            sinon.restore()
+        })
+        it('should get saved event and invoke with it', async function () {
+            runSamCliRemoteTestEventsStub.resolves(mockResponse)
+            await remoteInvokeWebview.getRemoteTestEvents(mockEvent)
+
+            sinon.assert.calledOnce(runSamCliRemoteTestEventsStub)
+            sinon.assert.calledWith(runSamCliRemoteTestEventsStub, expectedParams)
+        })
+    })
+})
diff --git a/src/test/lambda/vue/samInvoke.test.ts b/packages/core/src/test/lambda/vue/samInvoke.test.ts
similarity index 97%
rename from src/test/lambda/vue/samInvoke.test.ts
rename to packages/core/src/test/lambda/vue/samInvoke.test.ts
index 908e2357139..ad8c0a2eafe 100644
--- a/src/test/lambda/vue/samInvoke.test.ts
+++ b/packages/core/src/test/lambda/vue/samInvoke.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import { finalizeConfig } from '../../../lambda/vue/configEditor/samInvokeBackend'
 import { AwsSamDebuggerConfiguration } from '../../../shared/sam/debugger/awsSamDebugConfiguration'
 
diff --git a/packages/core/src/test/lambda/vue/samInvokeBackend.test.ts b/packages/core/src/test/lambda/vue/samInvokeBackend.test.ts
new file mode 100644
index 00000000000..cbad9bfff55
--- /dev/null
+++ b/packages/core/src/test/lambda/vue/samInvokeBackend.test.ts
@@ -0,0 +1,804 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    AwsSamDebuggerConfigurationLoose,
+    LaunchConfigPickItem,
+    ResourceData,
+    SamInvokeWebview,
+    finalizeConfig,
+} from '../../../lambda/vue/configEditor/samInvokeBackend'
+import { AwsSamDebuggerConfiguration } from '../../../shared/sam/debugger/awsSamDebugConfiguration'
+import assert from 'assert'
+import * as picker from '../../../shared/ui/picker'
+import * as input from '../../../shared/ui/input'
+import * as utils from '../../../lambda/utils'
+import { HttpResourceFetcher } from '../../../shared/resourcefetcher/httpResourceFetcher'
+import * as vscode from 'vscode'
+import path from 'path'
+import { addCodiconToString, fs, makeTemporaryToolkitFolder } from '../../../shared'
+import { LaunchConfiguration } from '../../../shared/debug/launchConfiguration'
+import { getTestWindow } from '../..'
+import * as samInvokeBackend from '../../../lambda/vue/configEditor/samInvokeBackend'
+import sinon from 'sinon'
+import * as nls from 'vscode-nls'
+import { assertLogsContain } from '../../../test/globalSetup.test'
+import { createResponse } from '../../testUtil'
+
+const localize = nls.loadMessageBundle()
+
+function createMockWorkspaceFolder(uriPath: string): vscode.WorkspaceFolder {
+    return {
+        uri: vscode.Uri.file(uriPath),
+        name: 'mock-folder',
+        index: 0,
+    }
+}
+
+const mockResourceData: ResourceData = {
+    logicalId: 'MockFunction',
+    region: 'us-west-2',
+    arn: 'arn:aws:lambda:us-west-2:123456789012:function:MockFunction',
+    location: '/path/to/function',
+    handler: 'index.handler',
+    runtime: 'nodejs14.x',
+    stackName: 'MockStack',
+    source: 'path/to/source',
+}
+const mockConfig: AwsSamDebuggerConfigurationLoose = {
+    invokeTarget: {
+        target: 'template',
+        logicalId: 'foobar',
+        templatePath: 'template.yaml',
+        lambdaHandler: 'index.handler',
+        projectRoot: '/path/to/project',
+    },
+    name: 'noprune',
+    type: 'aws-sam',
+    request: 'direct-invoke',
+    sam: {
+        containerBuild: false,
+        skipNewImageCheck: false,
+    },
+}
+
+describe('SamInvokeWebview', () => {
+    let samInvokeWebview: SamInvokeWebview
+    let sandbox: sinon.SinonSandbox
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+        samInvokeWebview = new SamInvokeWebview(mockConfig, mockResourceData)
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+
+    it('should return undefined when no resource data is provided', () => {
+        const noResourceWebview = new SamInvokeWebview(mockConfig, undefined)
+        const data = noResourceWebview.getResourceData()
+
+        // Using assert to check if the data is undefined
+        assert.strictEqual(data, undefined, 'Expected resource data to be undefined when no resource is provided')
+    })
+
+    describe('getFileName', () => {
+        it('should return the base name of a file path', async () => {
+            const tempFolder = await makeTemporaryToolkitFolder()
+            const testCases = [{ input: vscode.Uri.file(path.join(tempFolder, 'file.txt')), expected: 'file.txt' }]
+
+            for (const { input, expected } of testCases) {
+                const result = samInvokeWebview.getFileName(input.fsPath)
+                assert.strictEqual(result, expected, `getFileName("${input}") should return "${expected}"`)
+
+                // Double-check using Node's path.basename
+                const nodeResult = path.basename(input.fsPath)
+                assert.strictEqual(
+                    result,
+                    nodeResult,
+                    `getFileName result should match Node's path.basename for "${input}"`
+                )
+            }
+            await fs.delete(tempFolder, { recursive: true })
+        })
+    })
+
+    describe('getResourceData', () => {
+        it('should return the provided resource data', () => {
+            const result = samInvokeWebview.getResourceData()
+            assert.deepStrictEqual(result, mockResourceData)
+        })
+    })
+
+    describe('init', () => {
+        it('should return the provided config', () => {
+            // Call the init method and store the result
+            const result = samInvokeWebview.init()
+            // Use strictEqual to assert that the result matches the provided config
+            assert.strictEqual(result, mockConfig, 'The init method should return the provided config object')
+        })
+    })
+    describe('getRuntimes', () => {
+        it('should return sorted runtimes', () => {
+            const runtimes = samInvokeWebview.getRuntimes()
+            // Assert that the runtimes are defined
+            assert(runtimes !== undefined, 'Runtimes should be defined')
+            // Assert that runtimes is an array
+            assert(Array.isArray(runtimes), 'Runtimes should be an array')
+            // Assert that the runtimes array contains specific values
+            assert(runtimes.includes('nodejs18.x'), "Runtimes should include 'nodejs18.x'")
+            assert(runtimes.includes('python3.12'), "Runtimes should include 'python3.12'")
+            // Assert that the runtimes array is sorted
+            assert.deepStrictEqual(runtimes, [...runtimes].sort(), 'Runtimes should be sorted')
+        })
+    })
+    describe('getSamplePayload', () => {
+        let getSampleLambdaPayloadsStub: sinon.SinonStub
+        let createQuickPickStub: sinon.SinonStub
+        let promptUserStub: sinon.SinonStub
+        let verifySinglePickerOutputStub: sinon.SinonStub
+        let httpFetcherStub: sinon.SinonStub
+
+        beforeEach(() => {
+            getSampleLambdaPayloadsStub = sinon.stub(utils, 'getSampleLambdaPayloads')
+            createQuickPickStub = sinon.stub(picker, 'createQuickPick')
+            promptUserStub = sinon.stub(picker, 'promptUser')
+            verifySinglePickerOutputStub = sinon.stub(picker, 'verifySinglePickerOutput')
+            httpFetcherStub = sinon.stub(HttpResourceFetcher.prototype, 'get')
+        })
+
+        afterEach(() => {
+            sinon.restore()
+        })
+
+        it('should return sample payload when user selects a sample', async () => {
+            const mockPayloads = [{ name: 'testEvent', filename: 'testEvent.json' }]
+            const mockSampleContent = '{ "test": "data" }'
+
+            getSampleLambdaPayloadsStub.resolves(mockPayloads)
+            createQuickPickStub.returns({})
+            promptUserStub.resolves([{ label: 'testEvent', filename: 'testEvent.json' }])
+            verifySinglePickerOutputStub.returns({ label: 'testEvent', filename: 'testEvent.json' })
+            httpFetcherStub.resolves(createResponse(mockSampleContent))
+
+            const result = await samInvokeWebview.getSamplePayload()
+
+            assert.strictEqual(result, mockSampleContent)
+        })
+
+        it('should throw an error if fetching sample data fails', async () => {
+            getSampleLambdaPayloadsStub.resolves([{ name: 'testEvent', filename: 'testEvent.json' }])
+            createQuickPickStub.returns({})
+            promptUserStub.resolves([{ label: 'testEvent', filename: 'testEvent.json' }])
+            verifySinglePickerOutputStub.returns({ label: 'testEvent', filename: 'testEvent.json' })
+            httpFetcherStub.rejects(new Error('Fetch failed'))
+
+            await assert.rejects(async () => {
+                await samInvokeWebview.getSamplePayload()
+            }, /Error: getting manifest data/)
+        })
+        it('returns undefined if no sample is selected', async () => {
+            const mockPayloads = [{ name: 'testEvent', filename: 'testEvent.json' }]
+            getSampleLambdaPayloadsStub.resolves(mockPayloads)
+            createQuickPickStub.returns({})
+            promptUserStub.resolves([{ label: 'testEvent', filename: 'testEvent.json' }])
+            verifySinglePickerOutputStub.returns(undefined)
+            const result = await samInvokeWebview.getSamplePayload()
+
+            assert.strictEqual(result, undefined)
+        })
+    })
+    describe('loadSamLaunchConfig', () => {
+        beforeEach(() => {
+            sandbox = sinon.createSandbox()
+        })
+
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        it('loadSamLaunchConfig should return selected config when available', async () => {
+            const mockPickerItem: LaunchConfigPickItem = {
+                index: 1,
+                label: 'Tester Config',
+                config: mockConfig,
+            }
+
+            sandbox.stub(samInvokeWebview, 'getSamLaunchConfigs').resolves([mockPickerItem])
+            const pickerStub = sandbox.stub(picker, 'createQuickPick')
+            const promptUserStub = sandbox.stub(picker, 'promptUser').resolves([mockPickerItem])
+
+            const result = await samInvokeWebview.loadSamLaunchConfig()
+
+            assert.strictEqual(result, mockConfig) // No config should be returned
+            assert.ok(pickerStub.calledOnce)
+            assert.ok(promptUserStub.calledOnce)
+        })
+
+        it('loadSamLaunchConfig should show no config message when none available', async () => {
+            sandbox.stub(samInvokeWebview, 'getSamLaunchConfigs').resolves([])
+            sandbox.stub(picker, 'createQuickPick')
+            sandbox.stub(picker, 'promptUser').resolves([])
+
+            const result = await samInvokeWebview.loadSamLaunchConfig()
+
+            assert.strictEqual(result, undefined)
+        })
+    })
+    describe('Sam Invoke Vue Backend', () => {
+        describe('finalizeConfig', () => {
+            it('prunes configs correctly', () => {
+                const configs: { input: AwsSamDebuggerConfiguration; output: AwsSamDebuggerConfiguration }[] = [
+                    {
+                        input: {
+                            invokeTarget: {
+                                target: 'template',
+                                logicalId: 'foobar',
+                                templatePath: 'template.yaml',
+                            },
+                            name: 'noprune',
+                            type: 'aws-sam',
+                            request: 'direct-invoke',
+                        },
+                        output: {
+                            invokeTarget: {
+                                target: 'template',
+                                logicalId: 'foobar',
+                                templatePath: 'template.yaml',
+                            },
+                            name: 'noprune',
+                            type: 'aws-sam',
+                            request: 'direct-invoke',
+                        },
+                    },
+                    {
+                        input: {
+                            invokeTarget: {
+                                target: 'template',
+                                logicalId: 'foobar',
+                                templatePath: 'template.yaml',
+                            },
+                            lambda: {
+                                payload: {
+                                    json: {},
+                                },
+                            },
+                            name: 'prunejson',
+                            type: 'aws-sam',
+                            request: 'direct-invoke',
+                        },
+                        output: {
+                            invokeTarget: {
+                                target: 'template',
+                                logicalId: 'foobar',
+                                templatePath: 'template.yaml',
+                            },
+                            name: 'prunejson',
+                            type: 'aws-sam',
+                            request: 'direct-invoke',
+                        },
+                    },
+                    {
+                        input: {
+                            invokeTarget: {
+                                target: 'template',
+                                logicalId: 'foobar',
+                                templatePath: 'template.yaml',
+                            },
+                            name: 'prunestr',
+                            type: 'aws-sam',
+                            request: 'direct-invoke',
+                            lambda: {
+                                runtime: '',
+                            },
+                        },
+                        output: {
+                            invokeTarget: {
+                                target: 'template',
+                                logicalId: 'foobar',
+                                templatePath: 'template.yaml',
+                            },
+                            name: 'prunestr',
+                            type: 'aws-sam',
+                            request: 'direct-invoke',
+                        },
+                    },
+                    {
+                        input: {
+                            invokeTarget: {
+                                target: 'template',
+                                logicalId: 'foobar',
+                                templatePath: 'template.yaml',
+                            },
+                            name: 'prunearr',
+                            type: 'aws-sam',
+                            request: 'direct-invoke',
+                            lambda: {
+                                pathMappings: [],
+                            },
+                        },
+                        output: {
+                            invokeTarget: {
+                                target: 'template',
+                                logicalId: 'foobar',
+                                templatePath: 'template.yaml',
+                            },
+                            name: 'prunearr',
+                            type: 'aws-sam',
+                            request: 'direct-invoke',
+                        },
+                    },
+                ]
+
+                for (const config of configs) {
+                    assert.deepStrictEqual(
+                        finalizeConfig(config.input, config.input.name),
+                        config.output,
+                        `Test failed for input: ${config.input.name}`
+                    )
+                }
+            })
+        })
+    })
+
+    describe('SamInvokeWebview - getSamLaunchConfigs', function () {
+        let workspaceFoldersStub: sinon.SinonStub
+        let launchConfigStub: sinon.SinonStub
+        let getLaunchConfigQuickPickItemsStub: sinon.SinonStub
+
+        beforeEach(() => {
+            // Initialize a new webview instance before each test
+            workspaceFoldersStub = sandbox.stub(vscode.workspace, 'workspaceFolders')
+            launchConfigStub = sandbox.stub(LaunchConfiguration.prototype, 'getDebugConfigurations')
+            getLaunchConfigQuickPickItemsStub = sandbox.stub()
+        })
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        it('should return undefined and show error when no workspace folder is found', async function () {
+            // Mock workspace without folders
+            workspaceFoldersStub.value([])
+            const result = await samInvokeWebview.getSamLaunchConfigs()
+            assert.strictEqual(result, undefined)
+        })
+
+        it('should return picker items if valid configurations exist', async () => {
+            const mockFolder = createMockWorkspaceFolder('/mock-path')
+            const mockUri = mockFolder.uri
+            workspaceFoldersStub.value([mockFolder])
+
+            // Mock a launch configuration
+            launchConfigStub.returns([mockConfig])
+
+            // Mock picker items
+            const mockPickerItems = [{ index: 0, config: mockConfig, label: 'Test Config' }]
+            getLaunchConfigQuickPickItemsStub.resolves(mockPickerItems)
+
+            // Override the internal `getLaunchConfigQuickPickItems` function
+            sandbox.replace(samInvokeWebview as any, 'getLaunchConfigQuickPickItems', getLaunchConfigQuickPickItemsStub)
+
+            const result = await samInvokeWebview.getSamLaunchConfigs()
+
+            assert.deepStrictEqual(result, mockPickerItems)
+            assert(getLaunchConfigQuickPickItemsStub.calledOnceWithExactly(sinon.match.any, mockUri))
+        })
+    })
+    describe('promptFile', () => {
+        it('should return the base name of a file path', async () => {
+            const tempFolder = await makeTemporaryToolkitFolder()
+            const testCases = [{ input: vscode.Uri.file(path.join(tempFolder, 'file.txt')), expected: 'file.txt' }]
+
+            for (const { input, expected } of testCases) {
+                const result = samInvokeWebview.getFileName(input.fsPath)
+                assert.strictEqual(result, expected, `getFileName("${input}") should return "${expected}"`)
+
+                // Double-check using Node's path.basename
+                const nodeResult = path.basename(input.fsPath)
+                assert.strictEqual(
+                    result,
+                    nodeResult,
+                    `getFileName result should match Node's path.basename for "${input}"`
+                )
+            }
+            await fs.delete(tempFolder, { recursive: true })
+        })
+        it('prompts the user for a file and returns the selected file', async () => {
+            const tempFolder = await makeTemporaryToolkitFolder()
+            const placeholderEventFile = path.join(tempFolder, 'file.json')
+            await fs.writeFile(placeholderEventFile, '{"sample": "{test: event}"}')
+            const fileUri = vscode.Uri.file(placeholderEventFile)
+
+            getTestWindow().onDidShowDialog((window) => window.selectItem(fileUri))
+
+            const response = await samInvokeWebview.promptFile()
+            if (response === undefined) {
+                assert.fail('Response should not be undefined')
+            }
+            assert.deepStrictEqual(response.selectedFile, 'file.json')
+            assert.deepStrictEqual(response.selectedFilePath, fileUri.fsPath)
+            await fs.delete(tempFolder, { recursive: true })
+        })
+        it('Returns undefined if no file is selected', async () => {
+            getTestWindow().onDidShowDialog((window) => window.close())
+            const response = await samInvokeWebview.promptFile()
+            assert.strictEqual(response, undefined)
+        })
+        it('logs an error and throws ToolkitError when reading the file fails', async () => {
+            const tempFolder = await makeTemporaryToolkitFolder()
+            const placeholderEventFile = path.join(tempFolder, 'file.json')
+            const fileUri = vscode.Uri.file(placeholderEventFile)
+
+            getTestWindow().onDidShowDialog((window) => window.selectItem(fileUri))
+
+            try {
+                await assert.rejects(
+                    async () => await samInvokeWebview.promptFile(),
+                    new Error('Failed to read selected file')
+                )
+                assertLogsContain('readFileSync: Failed to read file at path', false, 'error')
+            } finally {
+                await fs.delete(tempFolder, { recursive: true })
+            }
+        })
+    })
+    describe('getTemplate', () => {
+        let templateRegistryStub: sinon.SinonStub
+        let createQuickPickStub: sinon.SinonStub
+        let promptUserStub: sinon.SinonStub
+        let verifySinglePickerOutputStub: sinon.SinonStub
+
+        beforeEach(() => {
+            templateRegistryStub = sandbox.stub()
+            createQuickPickStub = sinon.stub(picker, 'createQuickPick')
+            promptUserStub = sinon.stub(picker, 'promptUser')
+            verifySinglePickerOutputStub = sinon.stub(picker, 'verifySinglePickerOutput')
+        })
+
+        afterEach(() => {
+            sinon.restore()
+        })
+
+        it('should return undefined if no valid templates are found', async () => {
+            templateRegistryStub.resolves({ items: [] })
+            sandbox.replace(samInvokeWebview as any, 'getTemplateRegistry', templateRegistryStub)
+            const result = await samInvokeWebview.getTemplate()
+
+            assert.strictEqual(result, undefined)
+        })
+
+        it('should return a template if a valid SAM function is found', async () => {
+            const mockTemplate = {
+                path: '/path/to/template.yaml',
+                item: {
+                    Resources: {
+                        MyLambda: { Type: 'AWS::Serverless::Function' },
+                    },
+                },
+            }
+            templateRegistryStub.resolves({ items: [mockTemplate] })
+            createQuickPickStub.returns({})
+            promptUserStub.resolves([{ label: 'MyLambda', templatePath: '/path/to/template.yaml' }])
+            verifySinglePickerOutputStub.returns({ label: 'MyLambda', templatePath: '/path/to/template.yaml' })
+
+            const result = await samInvokeWebview.getTemplate()
+
+            assert.deepEqual(result, {
+                logicalId: 'MyLambda',
+                template: '/path/to/template.yaml',
+            })
+        })
+
+        it('should return undefined if user selects no valid template', async () => {
+            templateRegistryStub.resolves({ items: [] })
+            createQuickPickStub.returns({})
+            promptUserStub.resolves([{ templatePath: 'NOTEMPLATEFOUND' }])
+            verifySinglePickerOutputStub.returns({ templatePath: 'NOTEMPLATEFOUND' })
+
+            const result = await samInvokeWebview.getTemplate()
+
+            assert.strictEqual(result, undefined)
+        })
+
+        it('should handle multiple templates and filter by resource type', async () => {
+            const mockTemplates = [
+                {
+                    path: '/path/to/first.yaml',
+                    item: {
+                        Resources: {
+                            Lambda1: { Type: 'AWS::Serverless::Function' },
+                        },
+                    },
+                },
+                {
+                    path: '/path/to/second.yaml',
+                    item: {
+                        Resources: {
+                            API: { Type: 'AWS::Serverless::Api' },
+                        },
+                    },
+                },
+            ]
+            templateRegistryStub.resolves({ items: mockTemplates })
+            createQuickPickStub.returns({})
+            promptUserStub.resolves([{ label: 'Lambda1', templatePath: '/path/to/first.yaml' }])
+            verifySinglePickerOutputStub.returns({ label: 'Lambda1', templatePath: '/path/to/first.yaml' })
+
+            const result = await samInvokeWebview.getTemplate()
+
+            assert.deepEqual(result, {
+                logicalId: 'Lambda1',
+                template: '/path/to/first.yaml',
+            })
+        })
+
+        it('should return undefined if picker returns no selection', async () => {
+            const mockTemplate = {
+                path: '/path/to/template.yaml',
+                item: {
+                    Resources: {
+                        Lambda1: { Type: 'AWS::Serverless::Function' },
+                    },
+                },
+            }
+            templateRegistryStub.resolves({ items: [mockTemplate] })
+            createQuickPickStub.returns({})
+            promptUserStub.resolves(undefined)
+            verifySinglePickerOutputStub.returns(undefined)
+
+            const result = await samInvokeWebview.getTemplate()
+
+            assert.strictEqual(result, undefined)
+        })
+    })
+    describe('InvokeLocalWebview', function () {
+        let sandbox: sinon.SinonSandbox
+        let mockFolder: vscode.WorkspaceFolder
+        let mockUri: vscode.Uri
+        let getUriFromLaunchConfigStub: sinon.SinonStub
+        let workspaceFoldersStub: sinon.SinonStub
+
+        this.beforeEach(async function () {
+            sandbox = sinon.createSandbox()
+            mockFolder = createMockWorkspaceFolder('/mock-path')
+            mockUri = mockFolder.uri
+
+            sandbox.stub(samInvokeBackend, 'finalizeConfig').returns(mockConfig)
+            getUriFromLaunchConfigStub = sinon.stub()
+            sandbox.stub(vscode.workspace, 'getWorkspaceFolder').returns(mockFolder)
+            workspaceFoldersStub = sandbox.stub(vscode.workspace, 'workspaceFolders')
+        })
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        it('should invoke launch config', async () => {
+            workspaceFoldersStub.value([mockFolder])
+            sandbox.replace(samInvokeWebview as any, 'getUriFromLaunchConfig', getUriFromLaunchConfigStub)
+            getUriFromLaunchConfigStub.resolves(mockUri)
+
+            const startDebuggingStub = sandbox.stub(vscode.debug, 'startDebugging').resolves(true)
+
+            await samInvokeWebview.invokeLaunchConfig(mockConfig)
+
+            assert(startDebuggingStub.called)
+        })
+    })
+    describe('saveLaunchConfig', function () {
+        let sandbox: sinon.SinonSandbox
+        let mockFolder: vscode.WorkspaceFolder
+        let mockUri: vscode.Uri
+        let getUriFromLaunchConfigStub: sinon.SinonStub
+        let workspaceFoldersStub: sinon.SinonStub
+        let getUriStub: sinon.SinonStub
+        let launchConfigurationsStub: sinon.SinonStub
+        let getLaunchConfigQuickPickItemsStub: sinon.SinonStub
+        let editDebugConfigurationStub: sinon.SinonStub
+        let verifySinglePickerOutputStub: sinon.SinonStub
+        let createQuickPickStub: sinon.SinonStub
+
+        this.beforeEach(async function () {
+            sandbox = sinon.createSandbox()
+            mockFolder = createMockWorkspaceFolder('/mock-path')
+            mockUri = mockFolder.uri
+
+            getUriStub = sandbox.stub(samInvokeWebview as any, 'getUriFromLaunchConfig')
+            getUriFromLaunchConfigStub = sinon.stub()
+            sandbox.stub(vscode.workspace, 'getWorkspaceFolder').returns(mockFolder)
+            workspaceFoldersStub = sandbox.stub(vscode.workspace, 'workspaceFolders')
+            launchConfigurationsStub = sandbox.stub(LaunchConfiguration.prototype, 'getDebugConfigurations')
+            editDebugConfigurationStub = sandbox.stub(LaunchConfiguration.prototype, 'editDebugConfiguration')
+            getLaunchConfigQuickPickItemsStub = sandbox.stub()
+
+            verifySinglePickerOutputStub = sandbox.stub(picker, 'verifySinglePickerOutput')
+            createQuickPickStub = sandbox.stub(picker, 'createQuickPick')
+        })
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        it('should create quick pick with correct items', async () => {
+            getUriFromLaunchConfigStub.resolves(mockUri)
+            getLaunchConfigQuickPickItemsStub.resolves([{ label: 'Existing Config', index: 0 }])
+            verifySinglePickerOutputStub.returns(undefined)
+            createQuickPickStub.returns({})
+            sandbox.stub(picker, 'promptUser').resolves([])
+
+            sandbox.replace(samInvokeWebview as any, 'getLaunchConfigQuickPickItems', getLaunchConfigQuickPickItemsStub)
+            sandbox.replace(samInvokeWebview as any, 'getUriFromLaunchConfig', getUriFromLaunchConfigStub)
+
+            await samInvokeWebview.saveLaunchConfig(mockConfig)
+            assert(getLaunchConfigQuickPickItemsStub.called)
+
+            sinon.assert.calledWith(
+                createQuickPickStub,
+                sinon.match({
+                    items: sinon.match.array.deepEquals([
+                        {
+                            label: addCodiconToString(
+                                'add',
+                                localize(
+                                    'AWS.command.addSamDebugConfiguration',
+                                    'Add Local Invoke and Debug Configuration'
+                                )
+                            ),
+                            index: -1,
+                            alwaysShow: true,
+                        },
+                        { label: 'Existing Config', index: 0 },
+                    ]),
+                })
+            )
+        })
+        describe('Save Launch Config with no URI', () => {
+            let promptUserStub: sinon.SinonStub
+            let testConfig: any
+            beforeEach(() => {
+                const testConfig = {
+                    label: '$(add) Add Local Invoke and Debug Configuration',
+                    index: -1,
+                    alwaysShow: true,
+                }
+                // Create a stub for the promptUser function
+                promptUserStub = sinon.stub(picker, 'promptUser')
+
+                // Configure the stub to return the desired array
+                promptUserStub.resolves([testConfig])
+            })
+            afterEach(() => {
+                // Restore the original function after each test
+                promptUserStub.restore()
+            })
+            it('should not save launch config', async () => {
+                workspaceFoldersStub.value([mockFolder])
+                sandbox.replace(samInvokeWebview as any, 'getUriFromLaunchConfig', getUriFromLaunchConfigStub)
+                const launchConfigItems = launchConfigurationsStub.resolves([])
+                getUriFromLaunchConfigStub.resolves(mockUri)
+
+                const mockPickerItems = [
+                    {
+                        label: addCodiconToString(
+                            'add',
+                            localize('AWS.command.addSamDebugConfiguration', 'Add Local Invoke and Debug Configuration')
+                        ),
+                        index: -1,
+                        alwaysShow: true,
+                    },
+                    launchConfigItems,
+                ]
+                verifySinglePickerOutputStub.resolves([testConfig])
+                getLaunchConfigQuickPickItemsStub.resolves(mockPickerItems)
+                sandbox.replace(
+                    samInvokeWebview as any,
+                    'getLaunchConfigQuickPickItems',
+                    getLaunchConfigQuickPickItemsStub
+                )
+                sinon.stub(input, 'createInputBox').resolves('testConfig')
+                const updateStub = sandbox.stub(vscode.workspace, 'updateWorkspaceFolders')
+
+                await samInvokeWebview.saveLaunchConfig(mockConfig)
+                assert(getLaunchConfigQuickPickItemsStub.called)
+                assert(verifySinglePickerOutputStub.called)
+                assert(updateStub.notCalled)
+            })
+        })
+
+        describe('Save Launch Config with no URI', () => {
+            it('should not save if no URI is found', async () => {
+                getUriStub.resolves(undefined)
+                await samInvokeWebview.saveLaunchConfig(mockConfig)
+                assert(launchConfigurationsStub.notCalled)
+            })
+        })
+        describe('Save Launch Config', () => {
+            let promptUserStub: sinon.SinonStub
+            let mockSavedConfig: AwsSamDebuggerConfiguration
+
+            beforeEach(() => {
+                mockSavedConfig = {
+                    type: 'aws-sam',
+                    request: 'direct-invoke',
+                    invokeTarget: {
+                        target: 'template',
+                        logicalId: 'HelloWorldFunction',
+                        templatePath: 'template.yaml',
+                    },
+                    lambda: {
+                        runtime: 'python3.9',
+                        environmentVariables: {
+                            PARAM1: 'VALUE',
+                        },
+                    },
+                    sam: {
+                        containerBuild: false,
+                        localArguments: ['-e', '/tester/events.json'],
+                        skipNewImageCheck: false,
+                    },
+                    api: {
+                        path: 'asdad',
+                        httpMethod: 'get',
+                    },
+                    name: 'tester',
+                }
+                // Create a stub for the promptUser function
+                promptUserStub = sinon.stub(picker, 'promptUser')
+
+                // Configure the stub to return the desired array
+                promptUserStub.resolves([mockSavedConfig])
+            })
+
+            afterEach(() => {
+                // Restore the original function after each test
+                promptUserStub.restore()
+            })
+
+            it('should save launch config', async () => {
+                workspaceFoldersStub.value([mockFolder])
+                getUriFromLaunchConfigStub.resolves(mockUri)
+                sandbox.replace(samInvokeWebview as any, 'getUriFromLaunchConfig', getUriFromLaunchConfigStub)
+                const launchConfigItems = launchConfigurationsStub.resolves([
+                    {
+                        config: mockSavedConfig,
+                        index: 0,
+                        label: 'tester',
+                    },
+                ])
+                const mockPickerItems = [
+                    {
+                        label: addCodiconToString(
+                            'add',
+                            localize('AWS.command.addSamDebugConfiguration', 'Add Local Invoke and Debug Configuration')
+                        ),
+                        index: -1,
+                        alwaysShow: true,
+                    },
+                    launchConfigItems,
+                ]
+                verifySinglePickerOutputStub.resolves([
+                    {
+                        label: 'tester',
+                        index: 0,
+                        alwaysShow: true,
+                    },
+                ])
+                getLaunchConfigQuickPickItemsStub.resolves(mockPickerItems)
+                sandbox.replace(
+                    samInvokeWebview as any,
+                    'getLaunchConfigQuickPickItems',
+                    getLaunchConfigQuickPickItemsStub
+                )
+                const updateStub = sandbox.stub(vscode.workspace, 'updateWorkspaceFolders')
+
+                await samInvokeWebview.saveLaunchConfig(mockSavedConfig)
+
+                assert(getLaunchConfigQuickPickItemsStub.called)
+                assert(editDebugConfigurationStub.called)
+                assert(verifySinglePickerOutputStub.called)
+                assert(updateStub.notCalled)
+            })
+        })
+    })
+})
diff --git a/src/test/lambda/wizards/samDeployWizard.test.ts b/packages/core/src/test/lambda/wizards/samDeployWizard.test.ts
similarity index 99%
rename from src/test/lambda/wizards/samDeployWizard.test.ts
rename to packages/core/src/test/lambda/wizards/samDeployWizard.test.ts
index 1da7ce23de4..67d1dc6c73c 100644
--- a/src/test/lambda/wizards/samDeployWizard.test.ts
+++ b/packages/core/src/test/lambda/wizards/samDeployWizard.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as path from 'path'
 import * as sinon from 'sinon'
 import * as vscode from 'vscode'
diff --git a/src/test/lambda/wizards/samInitWizard.test.ts b/packages/core/src/test/lambda/wizards/samInitWizard.test.ts
similarity index 81%
rename from src/test/lambda/wizards/samInitWizard.test.ts
rename to packages/core/src/test/lambda/wizards/samInitWizard.test.ts
index 96ba674cdab..7102b95cf32 100644
--- a/src/test/lambda/wizards/samInitWizard.test.ts
+++ b/packages/core/src/test/lambda/wizards/samInitWizard.test.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -10,8 +10,8 @@ import { createWizardTester, WizardTester } from '../../shared/wizards/wizardTes
 describe('CreateNewSamAppWizard', async function () {
     let tester: WizardTester<CreateNewSamAppWizardForm>
 
-    beforeEach(function () {
-        tester = createWizardTester(new CreateNewSamAppWizard({ samCliVersion: '1.0.0', schemaRegions: [] }))
+    beforeEach(async function () {
+        tester = await createWizardTester(new CreateNewSamAppWizard({ samCliVersion: '1.0.0', schemaRegions: [] }))
     })
 
     it('prompts for runtime first', function () {
@@ -39,14 +39,14 @@ describe('CreateNewSamAppWizard', async function () {
     })
 
     it('prompts for location before name', function () {
-        tester.runtimeAndPackage.applyInput({ runtime: 'nodejs14.x', packageType: 'Zip' })
+        tester.runtimeAndPackage.applyInput({ runtime: 'nodejs20.x', packageType: 'Zip' })
         tester.template.applyInput('template')
         tester.location.assertShowFirst()
         tester.name.assertShowSecond()
     })
 
     it('prompts for schema configuration if a schema template is selected', function () {
-        tester.runtimeAndPackage.applyInput({ runtime: 'nodejs14.x', packageType: 'Zip' })
+        tester.runtimeAndPackage.applyInput({ runtime: 'nodejs20.x', packageType: 'Zip' })
         tester.template.applyInput(eventBridgeStarterAppTemplate)
         tester.region.assertShowFirst()
         tester.registryName.assertShowSecond()
@@ -54,8 +54,8 @@ describe('CreateNewSamAppWizard', async function () {
     })
 
     describe('architecture', function () {
-        beforeEach(function () {
-            tester = createWizardTester(new CreateNewSamAppWizard({ samCliVersion: '1.33.0', schemaRegions: [] }))
+        beforeEach(async function () {
+            tester = await createWizardTester(new CreateNewSamAppWizard({ samCliVersion: '1.33.0', schemaRegions: [] }))
         })
 
         it('prompts for architecture after runtime (no dependency manager) if SAM CLI >= 1.33', function () {
@@ -69,8 +69,8 @@ describe('CreateNewSamAppWizard', async function () {
             tester.architecture.assertShowSecond()
         })
 
-        it('skips prompt for earlier versions of SAM CLI', function () {
-            tester = createWizardTester(new CreateNewSamAppWizard({ samCliVersion: '1.32.0', schemaRegions: [] }))
+        it('skips prompt for earlier versions of SAM CLI', async function () {
+            tester = await createWizardTester(new CreateNewSamAppWizard({ samCliVersion: '1.32.0', schemaRegions: [] }))
             tester.runtimeAndPackage.applyInput({ runtime: 'java11', packageType: 'Zip' })
             tester.architecture.assertDoesNotShow()
         })
diff --git a/src/test/lambda/wizards/stateController.test.ts b/packages/core/src/test/lambda/wizards/stateController.test.ts
similarity index 92%
rename from src/test/lambda/wizards/stateController.test.ts
rename to packages/core/src/test/lambda/wizards/stateController.test.ts
index ed26c29835c..a9c22977886 100644
--- a/src/test/lambda/wizards/stateController.test.ts
+++ b/packages/core/src/test/lambda/wizards/stateController.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as sinon from 'sinon'
 import { StateMachineController, ControlSignal, StepResult } from '../../../shared/wizards/stateController'
 
@@ -76,18 +76,18 @@ describe('StateMachineController', function () {
         const step1 = sinon.stub()
         const step2 = sinon.stub()
         const step3 = sinon.stub()
-        step1.callsFake(state => {
+        step1.callsFake((state) => {
             assert.strictEqual(state.mystring, '')
             state.mystring = 'a string'
             return state
         })
-        step2.callsFake(state => {
+        step2.callsFake((state) => {
             const last = state.isGood
             state.isGood = false
             return { ...state, isGood: last }
         })
         step3.onFirstCall().returns(undefined)
-        step3.onSecondCall().callsFake(state => state)
+        step3.onSecondCall().callsFake((state) => state)
         controller.addStep(step1)
         controller.addStep(step2)
         controller.addStep(step3)
@@ -116,7 +116,7 @@ describe('StateMachineController', function () {
             const stub2 = sinon.stub()
             stub1.returns({ nextState: { answer: true } })
             stub2.onFirstCall().returns({ controlSignal: ControlSignal.Retry })
-            stub2.onSecondCall().callsFake(state => ({ nextState: state }))
+            stub2.onSecondCall().callsFake((state) => ({ nextState: state }))
             controller.addStep(stub1)
             controller.addStep(stub2)
 
@@ -142,7 +142,7 @@ describe('StateMachineController', function () {
             const branchStep1 = sinon.stub()
             const branchStep2 = sinon.stub()
             step1.returns({ nextState: {}, nextSteps: [branchStep1, branchStep2] })
-            branchStep1.callsFake(state => assertStepsPassthrough(controller, 2, 3, { nextState: state }))
+            branchStep1.callsFake((state) => assertStepsPassthrough(controller, 2, 3, { nextState: state }))
             branchStep2.returns({})
             controller.addStep(step1)
 
@@ -157,9 +157,9 @@ describe('StateMachineController', function () {
             const branch2 = sinon.stub()
             const step5 = sinon.stub()
             step1.returns({ nextState: {}, nextSteps: [branch1Step1, branch1Step2] })
-            branch1Step1.callsFake(state => assertStepsPassthrough(controller, 2, 4, state))
+            branch1Step1.callsFake((state) => assertStepsPassthrough(controller, 2, 4, state))
             branch1Step2.returns({ nextState: {}, nextSteps: [branch2] })
-            branch2.callsFake(state => assertStepsPassthrough(controller, 4, 5, state))
+            branch2.callsFake((state) => assertStepsPassthrough(controller, 4, 5, state))
             step5.returns({})
             controller.addStep(step1)
             controller.addStep(step5)
@@ -215,11 +215,11 @@ describe('StateMachineController', function () {
                 })
             )
             branch1.returns(undefined)
-            branch2.callsFake(state =>
+            branch2.callsFake((state) =>
                 assertStepsPassthrough(controller, 2, 3, { nextState: { branch2: 'yes', branch1: state.branch1 } })
             )
             step3.onFirstCall().returns(undefined)
-            step3.onSecondCall().callsFake(state => state)
+            step3.onSecondCall().callsFake((state) => state)
             controller.addStep(step1)
             controller.addStep(step3)
 
diff --git a/src/test/lambda/wizards/uploadLambdaWizard.test.ts b/packages/core/src/test/lambda/wizards/uploadLambdaWizard.test.ts
similarity index 82%
rename from src/test/lambda/wizards/uploadLambdaWizard.test.ts
rename to packages/core/src/test/lambda/wizards/uploadLambdaWizard.test.ts
index 1b853e05174..a42cf5b3ce0 100644
--- a/src/test/lambda/wizards/uploadLambdaWizard.test.ts
+++ b/packages/core/src/test/lambda/wizards/uploadLambdaWizard.test.ts
@@ -1,23 +1,22 @@
 /*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as vscode from 'vscode'
 import * as path from 'path'
-import * as assert from 'assert'
-import * as fs from 'fs-extra'
-import { writeFileSync } from 'fs-extra'
+import assert from 'assert'
 import { createWizardTester, WizardTester } from '../../shared/wizards/wizardTestUtils'
 import { UploadLambdaWizard, UploadLambdaWizardState, LambdaFunction } from '../../../lambda/commands/uploadLambda'
 import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
+import { fs } from '../../../shared'
 
 describe('UploadLambdaWizard', function () {
     let tester: WizardTester<UploadLambdaWizardState>
 
     describe('invoked from command palette', function () {
-        beforeEach(function () {
-            tester = createWizardTester(new UploadLambdaWizard())
+        beforeEach(async () => {
+            tester = await createWizardTester(new UploadLambdaWizard())
         })
 
         it('shows all but build prompts', function () {
@@ -30,8 +29,8 @@ describe('UploadLambdaWizard', function () {
     })
 
     describe('invoked from lambda node', function () {
-        beforeEach(function () {
-            tester = createWizardTester(
+        beforeEach(async function () {
+            tester = await createWizardTester(
                 new UploadLambdaWizard({ name: 'lambdaName', region: 'us-east-1', configuration: {} } as LambdaFunction)
             )
         })
@@ -56,10 +55,10 @@ describe('UploadLambdaWizard', function () {
         beforeEach(async function () {
             tempDir = await makeTemporaryToolkitFolder()
             invokePath = vscode.Uri.file(tempDir)
-            tester = createWizardTester(new UploadLambdaWizard(undefined, invokePath))
+            tester = await createWizardTester(new UploadLambdaWizard(undefined, invokePath))
         })
         afterEach(async function () {
-            await fs.remove(tempDir)
+            await fs.delete(tempDir, { recursive: true })
         })
 
         it('skip select directory, auto selected', function () {
@@ -80,12 +79,12 @@ describe('UploadLambdaWizard', function () {
         beforeEach(async function () {
             tempDir = await makeTemporaryToolkitFolder()
             tempDirUri = vscode.Uri.file(tempDir)
-            writeFileSync(path.join(tempDir, 'template.yaml'), '')
+            await fs.writeFile(path.join(tempDir, 'template.yaml'), '')
             invokePath = vscode.Uri.file(path.join(tempDir, 'template.yaml'))
-            tester = createWizardTester(new UploadLambdaWizard(undefined, invokePath))
+            tester = await createWizardTester(new UploadLambdaWizard(undefined, invokePath))
         })
         afterEach(async function () {
-            await fs.remove(tempDir)
+            await fs.delete(tempDir, { recursive: true })
         })
 
         it('skip select directory, auto selected', function () {
diff --git a/packages/core/src/test/login/webview/vue/backend.test.ts b/packages/core/src/test/login/webview/vue/backend.test.ts
new file mode 100644
index 00000000000..7b684ab8794
--- /dev/null
+++ b/packages/core/src/test/login/webview/vue/backend.test.ts
@@ -0,0 +1,88 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { assertTelemetry } from '../../../testUtil'
+import { AmazonQLoginWebview } from '../../../../login/webview/vue/amazonq/backend_amazonq'
+import { CancellationError } from '../../../../shared/utilities/timeoutUtils'
+import { TelemetryMetadata } from '../../../../auth/connection'
+
+// TODO: remove auth page and tests
+describe('Amazon Q Login', function () {
+    const region = 'fakeRegion'
+    const startUrl = 'fakeUrl'
+
+    let backend: AmazonQLoginWebview
+
+    beforeEach(function () {
+        backend = new AmazonQLoginWebview()
+    })
+
+    it('emits ui_click telemetry', function () {
+        backend.emitUiClick('auth_backButton')
+
+        assertTelemetry('ui_click', {
+            elementId: 'auth_backButton',
+        })
+    })
+
+    it('runs setup and emits success and recorded metrics', async function () {
+        const metadata: TelemetryMetadata = {
+            credentialSourceId: 'iamIdentityCenter',
+            credentialStartUrl: startUrl,
+            awsRegion: region,
+        }
+        const setupFunc = async () => {
+            backend.storeMetricMetadata(metadata)
+        }
+
+        // method under test
+        await backend.ssoSetup('test', setupFunc, true)
+
+        assertTelemetry('auth_addConnection', {
+            result: 'Succeeded',
+            ...metadata,
+        })
+    })
+
+    it('runs setup and emits failed and recorded metrics', async function () {
+        const metadata: TelemetryMetadata = {
+            credentialSourceId: 'iamIdentityCenter',
+            credentialStartUrl: startUrl,
+            awsRegion: region,
+        }
+        const setupFunc = async () => {
+            backend.storeMetricMetadata(metadata)
+            throw new Error('error')
+        }
+
+        // method under test
+        await backend.ssoSetup('test', setupFunc, true)
+
+        assertTelemetry('auth_addConnection', {
+            result: 'Failed',
+            ...metadata,
+        })
+    })
+
+    it('runs setup and emits cancelled and recorded metrics', async function () {
+        const metadata: TelemetryMetadata = {
+            credentialSourceId: 'iamIdentityCenter',
+            credentialStartUrl: startUrl,
+            awsRegion: region,
+        }
+        const setupFunc = async () => {
+            backend.storeMetricMetadata(metadata)
+            throw new CancellationError('user')
+        }
+
+        // method under test
+        await backend.ssoSetup('test', setupFunc, true)
+
+        assertTelemetry('auth_addConnection', {
+            result: 'Cancelled',
+            ...metadata,
+        })
+    })
+})
diff --git a/packages/core/src/test/login/webview/vue/backend_amazonq.test.ts b/packages/core/src/test/login/webview/vue/backend_amazonq.test.ts
new file mode 100644
index 00000000000..c22b1a77fe1
--- /dev/null
+++ b/packages/core/src/test/login/webview/vue/backend_amazonq.test.ts
@@ -0,0 +1,149 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { SinonSandbox, createSandbox } from 'sinon'
+import { assertTelemetry } from '../../../testUtil'
+import assert from 'assert'
+import {
+    createBuilderIdProfile,
+    createSsoProfile,
+    createTestAuth,
+    mockRegistration,
+} from '../../../credentials/testUtil'
+import { Auth } from '../../../../auth'
+import { AmazonQLoginWebview } from '../../../../login/webview/vue/amazonq/backend_amazonq'
+import { isBuilderIdConnection, isIdcSsoConnection } from '../../../../auth/connection'
+import { amazonQScopes, AuthUtil } from '../../../../codewhisperer/util/authUtil'
+import { getOpenExternalStub } from '../../../globalSetup.test'
+import globals from '../../../../shared/extensionGlobals'
+
+// TODO: remove auth page and tests
+describe('Amazon Q Login', function () {
+    const region = 'fakeRegion'
+    const startUrl = 'fakeUrl'
+
+    let sandbox: SinonSandbox
+    let auth: ReturnType<typeof createTestAuth>
+    let authUtil: AuthUtil
+    let backend: AmazonQLoginWebview
+
+    beforeEach(function () {
+        sandbox = createSandbox()
+        auth = createTestAuth(globals.globalState)
+        authUtil = new AuthUtil(auth)
+        sandbox.stub(Auth, 'instance').value(auth)
+        sandbox.stub(AuthUtil, 'instance').value(authUtil)
+        getOpenExternalStub().resolves(true)
+
+        backend = new AmazonQLoginWebview()
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('signs into builder ID and emits telemetry', async function () {
+        await backend.startBuilderIdSetup()
+
+        assert.ok(isBuilderIdConnection(auth.activeConnection))
+        assert.deepStrictEqual(auth.activeConnection.scopes, amazonQScopes)
+        assert.deepStrictEqual(auth.activeConnection.state, 'valid')
+
+        assertTelemetry('auth_addConnection', {
+            result: 'Succeeded',
+            credentialSourceId: 'awsId',
+            authEnabledFeatures: 'codewhisperer',
+            isReAuth: false,
+            ssoRegistrationExpiresAt: mockRegistration.expiresAt.toISOString(),
+            ssoRegistrationClientId: mockRegistration.clientId,
+        })
+    })
+
+    it('signs into IdC and emits telemetry', async function () {
+        await backend.startEnterpriseSetup(startUrl, region)
+
+        assert.ok(isIdcSsoConnection(auth.activeConnection))
+        assert.deepStrictEqual(auth.activeConnection.scopes, amazonQScopes)
+        assert.deepStrictEqual(auth.activeConnection.state, 'valid')
+        assert.deepStrictEqual(auth.activeConnection.startUrl, startUrl)
+        assert.deepStrictEqual(auth.activeConnection.ssoRegion, region)
+
+        assertTelemetry('auth_addConnection', {
+            result: 'Succeeded',
+            credentialSourceId: 'iamIdentityCenter',
+            authEnabledFeatures: 'codewhisperer',
+            credentialStartUrl: startUrl,
+            awsRegion: region,
+            isReAuth: false,
+            ssoRegistrationExpiresAt: mockRegistration.expiresAt.toISOString(),
+            ssoRegistrationClientId: mockRegistration.clientId,
+        })
+    })
+
+    it('reauths builder ID and emits telemetry', async function () {
+        const conn = await auth.createInvalidSsoConnection(createBuilderIdProfile({ scopes: amazonQScopes }))
+        await auth.useConnection(conn)
+
+        // method under test
+        await backend.reauthenticateConnection()
+
+        assert.deepStrictEqual(auth.activeConnection?.state, 'valid')
+
+        assertTelemetry('auth_addConnection', {
+            result: 'Succeeded',
+            credentialSourceId: 'awsId',
+            authEnabledFeatures: 'codewhisperer',
+            isReAuth: true,
+            ssoRegistrationExpiresAt: mockRegistration.expiresAt.toISOString(),
+            ssoRegistrationClientId: mockRegistration.clientId,
+        })
+    })
+
+    it('reauths IdC and emits telemetry', async function () {
+        const conn = await auth.createInvalidSsoConnection(
+            createSsoProfile({ scopes: amazonQScopes, startUrl, ssoRegion: region })
+        )
+        await auth.useConnection(conn)
+
+        // method under test
+        await backend.reauthenticateConnection()
+
+        assert.deepStrictEqual(auth.activeConnection?.state, 'valid')
+
+        assertTelemetry('auth_addConnection', {
+            result: 'Succeeded',
+            credentialSourceId: 'iamIdentityCenter',
+            authEnabledFeatures: 'codewhisperer',
+            credentialStartUrl: startUrl,
+            awsRegion: region,
+            isReAuth: true,
+            ssoRegistrationExpiresAt: mockRegistration.expiresAt.toISOString(),
+            ssoRegistrationClientId: mockRegistration.clientId,
+        })
+    })
+
+    it('signs out of reauth and emits telemetry', async function () {
+        const conn = await auth.createInvalidSsoConnection(
+            createSsoProfile({ scopes: amazonQScopes, startUrl, ssoRegion: region })
+        )
+        await auth.useConnection(conn)
+
+        // method under test
+        await backend.signout()
+
+        assert.equal(auth.activeConnection, undefined)
+
+        assertTelemetry('auth_addConnection', {
+            result: 'Cancelled',
+            credentialSourceId: 'iamIdentityCenter',
+            authEnabledFeatures: 'codewhisperer',
+            credentialStartUrl: startUrl,
+            awsRegion: region,
+            isReAuth: true,
+            ssoRegistrationExpiresAt: mockRegistration.expiresAt.toISOString(),
+            ssoRegistrationClientId: mockRegistration.clientId,
+        })
+    })
+})
diff --git a/packages/core/src/test/login/webview/vue/backend_toolkit.test.ts b/packages/core/src/test/login/webview/vue/backend_toolkit.test.ts
new file mode 100644
index 00000000000..1294a2d0574
--- /dev/null
+++ b/packages/core/src/test/login/webview/vue/backend_toolkit.test.ts
@@ -0,0 +1,123 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { SinonSandbox, createSandbox } from 'sinon'
+import { assertTelemetry } from '../../../testUtil'
+import assert from 'assert'
+import { createTestAuth } from '../../../credentials/testUtil'
+import { Auth } from '../../../../auth'
+import { isBuilderIdConnection, isIdcSsoConnection, scopesSsoAccountAccess } from '../../../../auth/connection'
+import { getOpenExternalStub } from '../../../globalSetup.test'
+import { ToolkitLoginWebview } from '../../../../login/webview/vue/toolkit/backend_toolkit'
+import {
+    CodeCatalystAuthenticationProvider,
+    CodeCatalystAuthStorage,
+    defaultScopes,
+} from '../../../../codecatalyst/auth'
+import { FakeSecretStorage } from '../../../fakeExtensionContext'
+import * as authUtils from '../../../../auth/utils'
+import globals from '../../../../shared/extensionGlobals'
+
+// TODO: remove auth page and tests
+describe('Toolkit Login', function () {
+    const region = 'fakeRegion'
+    const startUrl = 'fakeUrl'
+    const profileName = 'profile'
+    const accessKey = 'fakeKey'
+    const secretKey = 'fakeSecret'
+
+    let sandbox: SinonSandbox
+    let auth: ReturnType<typeof createTestAuth>
+    let codecatalystAuth: CodeCatalystAuthenticationProvider
+    let backend: ToolkitLoginWebview
+
+    beforeEach(function () {
+        sandbox = createSandbox()
+        auth = createTestAuth(globals.globalState)
+        codecatalystAuth = new CodeCatalystAuthenticationProvider(
+            new CodeCatalystAuthStorage(new FakeSecretStorage()),
+            auth
+        )
+        sandbox.stub(Auth, 'instance').value(auth)
+        getOpenExternalStub().resolves(true)
+
+        backend = new ToolkitLoginWebview(codecatalystAuth)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('signs into builder ID and emits telemetry', async function () {
+        sandbox.stub(codecatalystAuth, 'isConnectionOnboarded').resolves(true)
+
+        await backend.startBuilderIdSetup()
+
+        assert.ok(isBuilderIdConnection(auth.activeConnection))
+        assert.deepStrictEqual(auth.activeConnection.scopes, defaultScopes)
+        assert.deepStrictEqual(auth.activeConnection.state, 'valid')
+
+        assertTelemetry('auth_addConnection', {
+            result: 'Succeeded',
+            credentialSourceId: 'awsId',
+            authEnabledFeatures: 'codecatalyst',
+            isReAuth: false,
+        })
+    })
+
+    it('signs into account IdC and emits telemetry', async function () {
+        await backend.startEnterpriseSetup(startUrl, region)
+
+        assert.ok(isIdcSsoConnection(auth.activeConnection))
+        assert.deepStrictEqual(auth.activeConnection.scopes, scopesSsoAccountAccess)
+        assert.deepStrictEqual(auth.activeConnection.state, 'valid')
+        assert.deepStrictEqual(auth.activeConnection.startUrl, startUrl)
+        assert.deepStrictEqual(auth.activeConnection.ssoRegion, region)
+
+        assertTelemetry('auth_addConnection', {
+            result: 'Succeeded',
+            credentialSourceId: 'iamIdentityCenter',
+            authEnabledFeatures: 'awsExplorer',
+            credentialStartUrl: startUrl,
+            awsRegion: region,
+            isReAuth: false,
+        })
+    })
+
+    it('signs into codecatalyst IdC and emits telemetry', async function () {
+        sandbox.stub(codecatalystAuth, 'isConnectionOnboarded').resolves(true)
+        backend.setLoginService('codecatalyst')
+
+        await backend.startEnterpriseSetup(startUrl, region)
+
+        assert.ok(isIdcSsoConnection(auth.activeConnection))
+        assert.deepStrictEqual(auth.activeConnection.scopes, defaultScopes)
+        assert.deepStrictEqual(auth.activeConnection.state, 'valid')
+        assert.deepStrictEqual(auth.activeConnection.startUrl, startUrl)
+        assert.deepStrictEqual(auth.activeConnection.ssoRegion, region)
+
+        assertTelemetry('auth_addConnection', {
+            result: 'Succeeded',
+            credentialSourceId: 'iamIdentityCenter',
+            authEnabledFeatures: 'codecatalyst,awsExplorer',
+            credentialStartUrl: startUrl,
+            awsRegion: region,
+            isReAuth: false,
+        })
+    })
+
+    it('signs in with Iam credentials and emits telemetry', async function () {
+        sandbox.stub(auth, 'authenticateData').resolves()
+        const stub = sandbox.stub(authUtils, 'tryAddCredentials').resolves()
+        await backend.startIamCredentialSetup(profileName, accessKey, secretKey)
+
+        assert.ok(stub.calledOnceWith(profileName, { aws_access_key_id: accessKey, aws_secret_access_key: secretKey }))
+        assertTelemetry('auth_addConnection', {
+            result: 'Succeeded',
+            credentialSourceId: 'sharedCredentials',
+            authEnabledFeatures: 'awsExplorer',
+        })
+    })
+})
diff --git a/src/test/mockOutputChannel.ts b/packages/core/src/test/mockOutputChannel.ts
similarity index 88%
rename from src/test/mockOutputChannel.ts
rename to packages/core/src/test/mockOutputChannel.ts
index c91a6355e1b..dfd7556ffa0 100644
--- a/src/test/mockOutputChannel.ts
+++ b/packages/core/src/test/mockOutputChannel.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -18,6 +18,11 @@ export class MockOutputChannel implements vscode.OutputChannel {
         return this.onDidAppendTextEmitter.event
     }
 
+    public replace(value: string): void {
+        this._value = value
+        this.onDidAppendTextEmitter.fire(value)
+    }
+
     public append(value: string): void {
         this._value += value
         this.onDidAppendTextEmitter.fire(value)
@@ -44,7 +49,7 @@ export class MockOutputChannel implements vscode.OutputChannel {
     }
 
     public get lines(): string[] {
-        return this.value.trimRight().split('\n')
+        return this.value.trimEnd().split('\n')
     }
 
     public get isShown(): boolean {
diff --git a/packages/core/src/test/notifications/controller.test.ts b/packages/core/src/test/notifications/controller.test.ts
new file mode 100644
index 00000000000..761c6ce4bf2
--- /dev/null
+++ b/packages/core/src/test/notifications/controller.test.ts
@@ -0,0 +1,599 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as FakeTimers from '@sinonjs/fake-timers'
+import assert from 'assert'
+import sinon, { createSandbox } from 'sinon'
+import globals from '../../shared/extensionGlobals'
+import { randomUUID } from '../../shared/crypto'
+import { getContext } from '../../shared/vscode/setContext'
+import { assertTelemetry, installFakeClock } from '../testUtil'
+import {
+    NotificationFetcher,
+    NotificationsController,
+    RemoteFetcher,
+    ResourceResponse,
+} from '../../notifications/controller'
+import {
+    NotificationData,
+    NotificationType,
+    RuleContext,
+    ToolkitNotification,
+    getNotificationTelemetryId,
+} from '../../notifications/types'
+import { HttpResourceFetcher } from '../../shared/resourcefetcher/httpResourceFetcher'
+import { NotificationsNode } from '../../notifications/panelNode'
+import { RuleEngine } from '../../notifications/rules'
+import Sinon from 'sinon'
+
+// one test node to use across different tests
+export const panelNode: NotificationsNode = NotificationsNode.instance
+
+describe('Notifications Controller', function () {
+    const ruleContex: RuleContext = {
+        ideVersion: '1.83.0',
+        extensionVersion: '1.20.0',
+        os: 'LINUX',
+        computeEnv: 'local',
+        authTypes: ['builderId'],
+        authRegions: ['us-east-1'],
+        authStates: ['connected'],
+        authScopes: ['codewhisperer:completions', 'codewhisperer:analysis'],
+        activeExtensions: ['ext1', 'ext2'],
+    }
+
+    let controller: NotificationsController
+    let fetcher: TestFetcher
+
+    let ruleEngineSpy: sinon.SinonSpy
+    let focusPanelSpy: sinon.SinonSpy
+
+    function dismissNotification(notification: ToolkitNotification) {
+        // We could call `controller.dismissNotification()`, but this emulates a call
+        // from actually clicking it in the view panel.
+        return vscode.commands.executeCommand('_aws.toolkit.notifications.dismiss', {
+            getTreeItem: () => {
+                const item = new vscode.TreeItem('test')
+                Object.assign(item, {
+                    command: { arguments: [notification] },
+                })
+
+                return item
+            },
+        })
+    }
+
+    class TestFetcher implements NotificationFetcher {
+        private startUpContent: ResourceResponse = {
+            eTag: 'unset',
+            content: undefined,
+        }
+        private emergencyContent: ResourceResponse = {
+            eTag: 'unset',
+            content: undefined,
+        }
+
+        setStartUpContent(content: ResourceResponse) {
+            this.startUpContent = content
+        }
+
+        setEmergencyContent(content: ResourceResponse) {
+            this.emergencyContent = content
+        }
+
+        async fetch(category: NotificationType): Promise<ResourceResponse> {
+            return category === 'startUp' ? this.startUpContent : this.emergencyContent
+        }
+    }
+
+    beforeEach(async function () {
+        await panelNode.setNotifications([], [])
+        fetcher = new TestFetcher()
+        controller = new NotificationsController(
+            panelNode,
+            async () => ruleContex,
+            fetcher,
+            '_aws.test.notification' as any
+        )
+
+        ruleEngineSpy = sinon.spy(RuleEngine.prototype, 'shouldDisplayNotification')
+        focusPanelSpy = sinon.spy(panelNode, 'focusPanel')
+
+        await globals.globalState.update(controller.storageKey, {
+            startUp: {} as NotificationData,
+            emergency: {} as NotificationData,
+            dismissed: [],
+        })
+    })
+
+    afterEach(function () {
+        ruleEngineSpy.restore()
+        focusPanelSpy.restore()
+    })
+
+    it('can fetch and store startup notifications', async function () {
+        const eTag = randomUUID()
+        const content = {
+            schemaVersion: '1.x',
+            notifications: [getValidTestNotification('id:startup1'), getInvalidTestNotification('id:startup2')],
+        }
+        fetcher.setStartUpContent({
+            eTag,
+            content: JSON.stringify(content),
+        })
+
+        await controller.pollForStartUp()
+
+        assert.equal(ruleEngineSpy.callCount, 2)
+        assert.deepStrictEqual(ruleEngineSpy.args, [[content.notifications[0]], [content.notifications[1]]])
+        assert.deepStrictEqual(await globals.globalState.get(controller.storageKey), {
+            startUp: {
+                payload: content,
+                eTag,
+            },
+            emergency: {},
+            dismissed: [],
+            newlyReceived: ['id:startup2'],
+        })
+        assert.equal(panelNode.startUpNotifications.length, 1)
+        assert.equal(panelNode.emergencyNotifications.length, 0)
+        assert.deepStrictEqual(panelNode.startUpNotifications, [content.notifications[0]])
+        assert.equal(panelNode.getChildren().length, 1)
+        assert.equal(focusPanelSpy.callCount, 0)
+        assert.equal(getContext('aws.toolkit.notifications.show'), true)
+    })
+
+    it('can fetch and store emergency notifications', async function () {
+        const eTag = randomUUID()
+        const content = {
+            schemaVersion: '1.x',
+            notifications: [getValidTestNotification('id:emergency1'), getInvalidTestNotification('id:emergency2')],
+        }
+        fetcher.setEmergencyContent({
+            eTag,
+            content: JSON.stringify(content),
+        })
+
+        await controller.pollForEmergencies()
+
+        assert.equal(ruleEngineSpy.callCount, 2)
+        assert.deepStrictEqual(ruleEngineSpy.args, [[content.notifications[0]], [content.notifications[1]]])
+        assert.deepStrictEqual(await globals.globalState.get(controller.storageKey), {
+            startUp: {},
+            emergency: {
+                payload: content,
+                eTag,
+            },
+            dismissed: [],
+            newlyReceived: ['id:emergency2'],
+        })
+        assert.equal(panelNode.startUpNotifications.length, 0)
+        assert.equal(panelNode.emergencyNotifications.length, 1)
+        assert.deepStrictEqual(panelNode.emergencyNotifications, [content.notifications[0]])
+        assert.equal(panelNode.getChildren().length, 1)
+        assert.equal(focusPanelSpy.callCount, 1)
+        assert.equal(getContext('aws.toolkit.notifications.show'), true)
+    })
+
+    it('can fetch and store both startup and emergency notifications', async function () {
+        const eTag1 = randomUUID()
+        const eTag2 = randomUUID()
+        const startUpContent = {
+            schemaVersion: '1.x',
+            notifications: [getValidTestNotification('id:startup1'), getInvalidTestNotification('id:startup2')],
+        }
+        const emergencyContent = {
+            schemaVersion: '1.x',
+            notifications: [getValidTestNotification('id:emergency1'), getInvalidTestNotification('id:emergency2')],
+        }
+        fetcher.setStartUpContent({
+            eTag: eTag1,
+            content: JSON.stringify(startUpContent),
+        })
+        fetcher.setEmergencyContent({
+            eTag: eTag2,
+            content: JSON.stringify(emergencyContent),
+        })
+
+        await controller.pollForStartUp()
+        await controller.pollForEmergencies()
+
+        // There are only 4 notifications in this test.
+        // However, each time there is a poll, ALL notifications are evaluated for display.
+        // First poll = 2 startup notifications
+        // Second poll = 2 emergency notifications + 2 startup notifications from the first poll
+        // = 6
+        assert.equal(ruleEngineSpy.callCount, 6)
+
+        assert.deepStrictEqual(ruleEngineSpy.args, [
+            [startUpContent.notifications[0]],
+            [startUpContent.notifications[1]],
+            [startUpContent.notifications[0]],
+            [startUpContent.notifications[1]],
+            [emergencyContent.notifications[0]],
+            [emergencyContent.notifications[1]],
+        ])
+        assert.deepStrictEqual(await globals.globalState.get(controller.storageKey), {
+            startUp: {
+                payload: startUpContent,
+                eTag: eTag1,
+            },
+            emergency: {
+                payload: emergencyContent,
+                eTag: eTag2,
+            },
+            dismissed: [],
+            newlyReceived: ['id:startup2', 'id:emergency2'],
+        })
+        assert.equal(panelNode.startUpNotifications.length, 1)
+        assert.equal(panelNode.emergencyNotifications.length, 1)
+        assert.deepStrictEqual(panelNode.startUpNotifications, [startUpContent.notifications[0]])
+        assert.deepStrictEqual(panelNode.emergencyNotifications, [emergencyContent.notifications[0]])
+        assert.equal(panelNode.getChildren().length, 2)
+        assert.equal(focusPanelSpy.callCount, 1)
+        assert.equal(getContext('aws.toolkit.notifications.show'), true)
+    })
+
+    it('dismisses a startup notification', async function () {
+        const eTag = randomUUID()
+        const content = {
+            schemaVersion: '1.x',
+            notifications: [getValidTestNotification('id:startup1'), getValidTestNotification('id:startup2')],
+        }
+        fetcher.setStartUpContent({
+            eTag,
+            content: JSON.stringify(content),
+        })
+
+        await controller.pollForStartUp()
+
+        assert.equal(panelNode.getChildren().length, 2)
+        assert.equal(panelNode.startUpNotifications.length, 2)
+        assert.equal(getContext('aws.toolkit.notifications.show'), true)
+
+        assert.deepStrictEqual(await globals.globalState.get(controller.storageKey), {
+            startUp: {
+                payload: content,
+                eTag,
+            },
+            emergency: {},
+            dismissed: [],
+            newlyReceived: [],
+        })
+
+        await dismissNotification(content.notifications[1])
+
+        const actualState = await globals.globalState.get(controller.storageKey)
+        assert.deepStrictEqual(actualState, {
+            startUp: {
+                payload: content,
+                eTag,
+            },
+            emergency: {},
+            dismissed: [content.notifications[1].id],
+            newlyReceived: [],
+        })
+
+        assert.equal(panelNode.getChildren().length, 1)
+        assert.equal(panelNode.startUpNotifications.length, 1)
+    })
+
+    it('does not redisplay dismissed notifications', async function () {
+        const content = {
+            schemaVersion: '1.x',
+            notifications: [getValidTestNotification('id:startup1')],
+        }
+        fetcher.setStartUpContent({
+            eTag: '1',
+            content: JSON.stringify(content),
+        })
+
+        await controller.pollForStartUp()
+        assert.equal(panelNode.getChildren().length, 1)
+        assert.equal(getContext('aws.toolkit.notifications.show'), true)
+
+        await dismissNotification(content.notifications[0])
+        assert.equal(panelNode.getChildren().length, 0)
+        assert.equal(getContext('aws.toolkit.notifications.show'), false)
+
+        content.notifications.push(getValidTestNotification('id:startup2'))
+        fetcher.setStartUpContent({
+            eTag: '1',
+            content: JSON.stringify(content),
+        })
+
+        await controller.pollForStartUp()
+
+        const actualState = await globals.globalState.get(controller.storageKey)
+        assert.deepStrictEqual(actualState, {
+            startUp: {
+                payload: content,
+                eTag: '1',
+            },
+            emergency: {},
+            dismissed: [content.notifications[0].id],
+            newlyReceived: [],
+        })
+
+        assert.equal(panelNode.getChildren().length, 1)
+        assert.equal(getContext('aws.toolkit.notifications.show'), true)
+    })
+
+    it('does not refocus emergency notifications', async function () {
+        const startUpContent = {
+            schemaVersion: '1.x',
+            notifications: [getValidTestNotification('id:startup1')],
+        }
+        const emergencyContent = {
+            schemaVersion: '1.x',
+            notifications: [getValidTestNotification('id:emergency1')],
+        }
+        fetcher.setStartUpContent({
+            eTag: '1',
+            content: JSON.stringify(startUpContent),
+        })
+        fetcher.setEmergencyContent({
+            eTag: '1',
+            content: JSON.stringify(emergencyContent),
+        })
+
+        await controller.pollForEmergencies()
+        await controller.pollForEmergencies()
+        await controller.pollForStartUp()
+
+        assert.equal(focusPanelSpy.callCount, 1)
+        assert.equal(panelNode.getChildren().length, 2)
+    })
+
+    it('does not update state if eTag is not changed', async function () {
+        const eTag = randomUUID()
+        const content = {
+            schemaVersion: '1.x',
+            notifications: [getValidTestNotification('id:startup1'), getInvalidTestNotification('id:startup2')],
+        }
+        fetcher.setStartUpContent({
+            eTag,
+            content: JSON.stringify(content),
+        })
+
+        await controller.pollForStartUp()
+
+        assert.deepStrictEqual(await globals.globalState.get(controller.storageKey), {
+            startUp: {
+                payload: content,
+                eTag,
+            },
+            emergency: {},
+            dismissed: [],
+            newlyReceived: ['id:startup2'],
+        })
+        assert.equal(panelNode.getChildren().length, 1)
+
+        fetcher.setStartUpContent({
+            eTag,
+            content: undefined,
+        })
+        await controller.pollForStartUp()
+
+        assert.deepStrictEqual(await globals.globalState.get(controller.storageKey), {
+            startUp: {
+                payload: content,
+                eTag,
+            },
+            emergency: {},
+            dismissed: [],
+            newlyReceived: ['id:startup2'],
+        })
+        assert.equal(panelNode.getChildren().length, 1)
+    })
+
+    it('cleans out dismissed state', async function () {
+        const startUpContent = {
+            schemaVersion: '1.x',
+            notifications: [getValidTestNotification('id:startup1')],
+        }
+        const emergencyContent = {
+            schemaVersion: '1.x',
+            notifications: [getValidTestNotification('id:emergency1')],
+        }
+        fetcher.setStartUpContent({
+            eTag: '1',
+            content: JSON.stringify(startUpContent),
+        })
+        fetcher.setEmergencyContent({
+            eTag: '1',
+            content: JSON.stringify(emergencyContent),
+        })
+
+        await controller.pollForStartUp()
+        await controller.pollForEmergencies()
+
+        await dismissNotification(startUpContent.notifications[0])
+
+        assert.deepStrictEqual(await globals.globalState.get(controller.storageKey), {
+            startUp: {
+                payload: startUpContent,
+                eTag: '1',
+            },
+            emergency: {
+                payload: emergencyContent,
+                eTag: '1',
+            },
+            dismissed: [startUpContent.notifications[0].id],
+            newlyReceived: [],
+        })
+
+        const emptyContent = {
+            schemaVersion: '1.x',
+            notifications: [],
+        }
+        fetcher.setStartUpContent({
+            eTag: '1',
+            content: JSON.stringify(emptyContent),
+        })
+
+        await controller.pollForStartUp()
+        assert.deepStrictEqual(await globals.globalState.get(controller.storageKey), {
+            startUp: {
+                payload: emptyContent,
+                eTag: '1',
+            },
+            emergency: {
+                payload: emergencyContent,
+                eTag: '1',
+            },
+            dismissed: [],
+            newlyReceived: [],
+        })
+        assert.equal(panelNode.getChildren().length, 1)
+        assert.equal(getContext('aws.toolkit.notifications.show'), true)
+
+        fetcher.setEmergencyContent({
+            eTag: '1',
+            content: JSON.stringify(emptyContent),
+        })
+
+        await controller.pollForEmergencies()
+        assert.deepStrictEqual(await globals.globalState.get(controller.storageKey), {
+            startUp: {
+                payload: emptyContent,
+                eTag: '1',
+            },
+            emergency: {
+                payload: emptyContent,
+                eTag: '1',
+            },
+            dismissed: [],
+            newlyReceived: [],
+        })
+
+        assert.equal(panelNode.getChildren().length, 0)
+        assert.equal(getContext('aws.toolkit.notifications.show'), false)
+    })
+
+    it('does not rethrow errors when fetching', async function () {
+        let wasCalled = false
+        const fetcher = new (class _ extends TestFetcher {
+            override async fetch(): Promise<ResourceResponse> {
+                wasCalled = true
+                throw new Error('test error')
+            }
+        })()
+        assert.doesNotThrow(() =>
+            new NotificationsController(panelNode, async () => ruleContex, fetcher).pollForStartUp()
+        )
+        assert.ok(wasCalled)
+    })
+
+    it('calls onReceiveNotifications when a new valid notification is added', async function () {
+        const eTag = randomUUID()
+        const content = {
+            schemaVersion: '1.x',
+            notifications: [getValidTestNotification('id:newValidNotification')],
+        }
+        fetcher.setStartUpContent({
+            eTag,
+            content: JSON.stringify(content),
+        })
+
+        const onReceiveSpy = sinon.spy(panelNode, 'onReceiveNotifications')
+
+        await controller.pollForStartUp()
+
+        assert.equal(onReceiveSpy.callCount, 1)
+        assert.deepStrictEqual(onReceiveSpy.args[0][0], [content.notifications[0]])
+        assertTelemetry('toolkit_showNotification', { id: getNotificationTelemetryId(content.notifications[0]) })
+
+        onReceiveSpy.restore()
+    })
+})
+
+describe('RemoteFetcher', function () {
+    let clock: FakeTimers.InstalledClock
+    let sandbox: Sinon.SinonSandbox
+
+    before(function () {
+        clock = installFakeClock()
+        sandbox = createSandbox()
+    })
+
+    afterEach(function () {
+        clock.reset()
+        sandbox.restore()
+    })
+
+    after(function () {
+        clock.uninstall()
+    })
+
+    it('retries and throws error', async function () {
+        // Setup
+        const httpStub = sandbox.stub(HttpResourceFetcher.prototype, 'getNewETagContent')
+        httpStub.throws(new Error('network error'))
+
+        // Start function under test
+        const fetcher = assert.rejects(new RemoteFetcher().fetch('startUp', 'any'), (e) => {
+            return e instanceof Error && e.message === 'last error'
+        })
+
+        // Progresses the clock, allowing the fetcher logic to break out of sleep for each iteration of withRetries()
+        assert.strictEqual(httpStub.callCount, 1) // 0
+        await clock.tickAsync(RemoteFetcher.retryIntervalMs)
+        assert.strictEqual(httpStub.callCount, 2) // 30_000
+        await clock.tickAsync(RemoteFetcher.retryIntervalMs)
+        assert.strictEqual(httpStub.callCount, 3) // 60_000
+        await clock.tickAsync(RemoteFetcher.retryIntervalMs)
+        assert.strictEqual(httpStub.callCount, 4) // 120_000
+        httpStub.throws(new Error('last error'))
+        await clock.tickAsync(RemoteFetcher.retryIntervalMs)
+        assert.strictEqual(httpStub.callCount, 5) // 150_000
+
+        // We hit timeout so the last error will be thrown
+        await fetcher
+    })
+})
+
+function getValidTestNotification(id: string): ToolkitNotification {
+    return {
+        id,
+        displayIf: {
+            extensionId: 'aws.toolkit.fake.extension',
+        },
+        uiRenderInstructions: {
+            content: {
+                [`en-US`]: {
+                    title: 'test',
+                    description: 'test',
+                },
+            },
+            onReceive: 'toast',
+            onClick: {
+                type: 'openUrl',
+                url: 'https://aws.amazon.com/visualstudiocode/',
+            },
+        },
+    }
+}
+
+function getInvalidTestNotification(id: string): ToolkitNotification {
+    return {
+        id,
+        displayIf: {
+            extensionId: 'aws.toolkit.fake.extension',
+            additionalCriteria: [{ type: 'OS', values: ['MAC'] }],
+        },
+        uiRenderInstructions: {
+            content: {
+                [`en-US`]: {
+                    title: 'test',
+                    description: 'test',
+                },
+            },
+            onReceive: 'toast',
+            onClick: { type: 'modal' },
+        },
+    }
+}
diff --git a/packages/core/src/test/notifications/rendering.test.ts b/packages/core/src/test/notifications/rendering.test.ts
new file mode 100644
index 00000000000..684ef97b4d2
--- /dev/null
+++ b/packages/core/src/test/notifications/rendering.test.ts
@@ -0,0 +1,221 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import * as FakeTimers from '@sinonjs/fake-timers'
+import assert from 'assert'
+import { ToolkitNotification } from '../../notifications/types'
+import { panelNode } from './controller.test'
+import { getTestWindow } from '../shared/vscode/window'
+import * as VsCodeUtils from '../../shared/utilities/vsCodeUtils'
+import { assertTextEditorContains, installFakeClock } from '../testUtil'
+import { waitUntil } from '../../shared/utilities/timeoutUtils'
+import globals from '../../shared/extensionGlobals'
+
+describe('Notifications Rendering', function () {
+    let sandbox: sinon.SinonSandbox
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    // util to test txt pop-up under different senarios
+    async function verifyTxtNotification(notification: ToolkitNotification) {
+        const expectedContent = notification.uiRenderInstructions.content['en-US'].description
+        void panelNode.openNotification(notification)
+
+        await assertTextEditorContains(expectedContent)
+    }
+
+    // util to test open url under different senarios
+    async function verifyOpenExternalUrl(notification: ToolkitNotification) {
+        const openUrlStub = sandbox.stub(VsCodeUtils, 'openUrl')
+        await panelNode.openNotification(notification)
+
+        assert.ok(openUrlStub.calledWith(vscode.Uri.parse('https://aws.amazon.com/visualstudiocode/')))
+    }
+
+    // test on-receive behaviors
+    it('displays a toast with correct message on receive', async function () {
+        const testWindow = getTestWindow()
+        testWindow.onDidShowMessage((message) => {})
+
+        const notification = getToastURLTestNotification()
+        await panelNode.onReceiveNotifications([notification])
+
+        const expectedMessage =
+            notification.uiRenderInstructions.content['en-US'].toastPreview ??
+            notification.uiRenderInstructions.content['en-US'].title
+
+        const shownMessages = testWindow.shownMessages
+        assert.ok(shownMessages.some((msg) => msg.message === expectedMessage))
+    })
+
+    it('displays a modal with correct buttons on receive', async function () {
+        const testWindow = getTestWindow()
+        const notification = getModalNotification()
+
+        testWindow.onDidShowMessage((message) => {
+            const expectedButtons =
+                notification.uiRenderInstructions.actions?.map((actions) => actions.displayText['en-US']) ?? []
+            for (const buttonText of expectedButtons) {
+                assert.ok(
+                    message.items.some((item) => item.title === buttonText),
+                    `Button "${buttonText}" is missing`
+                )
+            }
+        })
+
+        await panelNode.onReceiveNotifications([notification])
+    })
+
+    // test on-lick behaviors
+    it('open a txt with correct content on-click', async function () {
+        const notification = getTxtNotification()
+        await verifyTxtNotification(notification)
+    })
+
+    it('opens a URL with correct link on-click', async function () {
+        const notification = getToastURLTestNotification()
+        await verifyOpenExternalUrl(notification)
+    })
+
+    // test modal buttons behavior
+    it('executes updateAndReload type button', async function () {
+        const testWindow = getTestWindow()
+        testWindow.onDidShowMessage((message) => {
+            // Simulate user clicking update and reload type
+            message.selectItem('Update and Reload')
+        })
+        const excuteCommandStub = sandbox.stub(vscode.commands, 'executeCommand').resolves()
+        const telemetrySpy = sandbox.spy(globals.telemetry, 'flushRecords')
+        const notification = getModalNotification()
+
+        // Update and Reload is put on a timer so that other methods (e.g. telemetry) can finish.
+        const clock: FakeTimers.InstalledClock = installFakeClock()
+        await panelNode.openNotification(notification)
+
+        await clock.tickAsync(1000)
+        clock.uninstall()
+
+        await waitUntil(async () => excuteCommandStub.called, { interval: 5, timeout: 5000 })
+
+        assert.ok(excuteCommandStub.calledWith('workbench.extensions.installExtension', 'aws.toolkit.fake.extension'))
+        assert.ok(excuteCommandStub.calledWith('workbench.action.reloadWindow'))
+        assert.ok(telemetrySpy.calledOnce)
+    })
+
+    it('executes openUrl type button', async function () {
+        const testWindow = getTestWindow()
+        testWindow.onDidShowMessage((message) => {
+            // Simulate user clicking open URL type
+            message.selectItem('Proceed to Wiki')
+        })
+        const notification = getModalNotification()
+        await verifyOpenExternalUrl(notification)
+    })
+
+    it('executes openTextDocument type button', async function () {
+        const testWindow = getTestWindow()
+        testWindow.onDidShowMessage((message) => {
+            // Simulate user clicking open txt type
+            message.selectItem('Read More')
+        })
+        const notification = getModalNotification()
+        await verifyTxtNotification(notification)
+    })
+})
+
+// generate test notifications
+function getToastURLTestNotification(): ToolkitNotification {
+    return {
+        id: 'test notification 1',
+        displayIf: {
+            extensionId: 'aws.toolkit.fake.extension',
+        },
+        uiRenderInstructions: {
+            content: {
+                [`en-US`]: {
+                    title: 'test',
+                    description: 'This is a url notification.',
+                    toastPreview: 'test toast preview',
+                },
+            },
+            onReceive: 'toast',
+            onClick: {
+                type: 'openUrl',
+                url: 'https://aws.amazon.com/visualstudiocode/',
+            },
+        },
+    }
+}
+
+function getTxtNotification(): ToolkitNotification {
+    return {
+        id: 'test notification 2',
+        displayIf: {
+            extensionId: 'aws.toolkit.fake.extension',
+        },
+        uiRenderInstructions: {
+            content: {
+                [`en-US`]: {
+                    title: 'test',
+                    description: 'This is a text document notification.',
+                },
+            },
+            onReceive: 'toast',
+            onClick: {
+                type: 'openTextDocument',
+            },
+        },
+    }
+}
+
+function getModalNotification(): ToolkitNotification {
+    return {
+        id: 'test notification 3',
+        displayIf: {
+            extensionId: 'aws.toolkit.fake.extension',
+        },
+        uiRenderInstructions: {
+            content: {
+                [`en-US`]: {
+                    title: 'test',
+                    description: 'This is a modal notification.',
+                },
+            },
+            onReceive: 'modal',
+            onClick: {
+                type: 'modal',
+            },
+            actions: [
+                {
+                    type: 'updateAndReload',
+                    displayText: {
+                        'en-US': 'Update and Reload',
+                    },
+                },
+                {
+                    type: 'openUrl',
+                    url: 'https://aws.amazon.com/visualstudiocode/',
+                    displayText: {
+                        'en-US': 'Proceed to Wiki',
+                    },
+                },
+                {
+                    type: 'openTextDocument',
+                    displayText: {
+                        'en-US': 'Read More',
+                    },
+                },
+            ],
+        },
+    }
+}
diff --git a/packages/core/src/test/notifications/resources/emergency/1.x.json b/packages/core/src/test/notifications/resources/emergency/1.x.json
new file mode 100644
index 00000000000..b0a83f40d3b
--- /dev/null
+++ b/packages/core/src/test/notifications/resources/emergency/1.x.json
@@ -0,0 +1,52 @@
+{
+    "schemaVersion": "1.x",
+    "notifications": [
+        {
+            "id": "emergency1",
+            "displayIf": {
+                "extensionId": "amazonwebservices.amazon-q-vscode"
+            },
+            "uiRenderInstructions": {
+                "content": {
+                    "en-US": {
+                        "title": "Can't sign in to Amazon Q",
+                        "description": "There is currently a bug that is preventing users from signing into Amazon Q. If this impacts you, please try this workaround:\n\n 1. Reload your IDE\n 2. Run the command in the command palette:: `Amazon Q: Reset State`.\n 3. Set your default region to `us-east-3`.\n 4. Try to sign into Amazon Q with your desired region in the dropdown.\n\nWe are currently working on releasing a fix so that this workaround is not required.\nPlease reach out on our github issues with any questions.",
+                        "toastPreview": "Signing into Amazon Q is broken, please try this workaround while we work on releasing a fix."
+                    }
+                },
+                "onReceive": "toast",
+                "onClick": {
+                    "type": "openTextDocument"
+                },
+                "actions": []
+            }
+        },
+        {
+            "id": "emergency2",
+            "displayIf": {
+                "extensionId": "amazonwebservices.amazon-q-vscode"
+            },
+            "uiRenderInstructions": {
+                "content": {
+                    "en-US": {
+                        "title": "Update Amazon Q to avoid breaking bugs",
+                        "description": "There is currently a bug that prevents Amazon Q from responding to chat requests. It is fixed in the latest version. Please update your Amazon Q now.",
+                        "toastPreview": "This version of Amazon Q is currently broken, please update to avoid issues."
+                    }
+                },
+                "onReceive": "toast",
+                "onClick": {
+                    "type": "modal"
+                },
+                "actions": [
+                    {
+                        "type": "updateAndReload",
+                        "displayText": {
+                            "en-US": "Update and Reload"
+                        }
+                    }
+                ]
+            }
+        }
+    ]
+}
diff --git a/packages/core/src/test/notifications/resources/startup/1.x.json b/packages/core/src/test/notifications/resources/startup/1.x.json
new file mode 100644
index 00000000000..aae5b1d70f2
--- /dev/null
+++ b/packages/core/src/test/notifications/resources/startup/1.x.json
@@ -0,0 +1,53 @@
+{
+    "schemaVersion": "1.x",
+    "notifications": [
+        {
+            "id": "startup1",
+            "displayIf": {
+                "extensionId": "amazonwebservices.amazon-q-vscode"
+            },
+            "uiRenderInstructions": {
+                "content": {
+                    "en-US": {
+                        "title": "New Amazon Q Chat features",
+                        "description": "You can now use Amazon Q inline in your IDE, without ever touching the mouse or using copy and paste. \nPress ⌘+I (Ctrl+I on Windows) to trigger inline chat. \nDescribe a function or feature you'd like to develop and Amazon Q will generate and display a code diff that inserts new code at the cursor position. \nPress Enter to accept and apply the diff, or Escape to reject it. \nAlternatively you select a block of code (maybe even the entire file) then press ⌘+I (Ctrl+I on Windows) to provide instructions on how to refactor the selected code. \nYou will see a diff against the selected code and can press Enter to accept and apply the diff.",
+                        "toastPreview": "New Amazon Q features available: inline chat"
+                    }
+                },
+                "onReceive": "toast",
+                "onClick": {
+                    "type": "openTextDocument"
+                },
+                "actions": [
+                    {
+                        "type": "openUrl",
+                        "url": "https://aws.amazon.com/developer/generative-ai/amazon-q/change-log/",
+                        "displayText": {
+                            "en-US": "Learn more"
+                        }
+                    }
+                ]
+            }
+        },
+        {
+            "id": "startup2",
+            "displayIf": {
+                "extensionId": "amazonwebservices.amazon-q-vscode"
+            },
+            "uiRenderInstructions": {
+                "content": {
+                    "en-US": {
+                        "title": "What's New",
+                        "toastPreview": "New Amazon Q features are available!"
+                    }
+                },
+                "onReceive": "toast",
+                "onClick": {
+                    "type": "openUrl",
+                    "url": "https://aws.amazon.com/developer/generative-ai/amazon-q/change-log/"
+                },
+                "actions": []
+            }
+        }
+    ]
+}
diff --git a/packages/core/src/test/notifications/rules.test.ts b/packages/core/src/test/notifications/rules.test.ts
new file mode 100644
index 00000000000..0df695c1be6
--- /dev/null
+++ b/packages/core/src/test/notifications/rules.test.ts
@@ -0,0 +1,557 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import assert from 'assert'
+import { RuleEngine, getRuleContext } from '../../notifications/rules'
+import { DisplayIf, ToolkitNotification, RuleContext } from '../../notifications/types'
+import globals from '../../shared/extensionGlobals'
+import { Connection, scopesCodeCatalyst } from '../../auth/connection'
+import { getOperatingSystem } from '../../shared/telemetry/util'
+import { getAuthFormIdsFromConnection } from '../../auth/utils'
+import { amazonQScopes } from '../../codewhisperer'
+import { builderIdStartUrl } from '../../auth/sso/constants'
+
+describe('Notifications Rule Engine', function () {
+    const context: RuleContext = {
+        ideVersion: '1.83.0',
+        extensionVersion: '1.20.0',
+        os: 'LINUX',
+        computeEnv: 'local',
+        authTypes: ['builderId'],
+        authRegions: ['us-east-1'],
+        authStates: ['connected'],
+        authScopes: ['codewhisperer:completions', 'codewhisperer:analysis'],
+        activeExtensions: ['ext1', 'ext2'],
+    }
+
+    const ruleEngine = new RuleEngine(context)
+
+    function buildNotification(criteria: Omit<DisplayIf, 'extensionId'>): ToolkitNotification {
+        return {
+            id: 'bd22f116-edd4-4e80-8f1f-ec7340159016',
+            displayIf: { extensionId: globals.context.extension.id, ...criteria },
+            uiRenderInstructions: {
+                content: {
+                    [`en-US`]: {
+                        title: 'Something crazy is happening!',
+                        description: 'Something crazy is happening! Please update your extension.',
+                    },
+                },
+                onReceive: 'toast',
+                onClick: {
+                    type: 'openUrl',
+                    url: 'https://aws.amazon.com/visualstudiocode/',
+                },
+            },
+        }
+    }
+
+    it('should display notification with no criteria', function () {
+        const notification = buildNotification({})
+        assert.equal(ruleEngine.shouldDisplayNotification(notification), true)
+    })
+
+    it('should display notification with version exact criteria', function () {
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    ideVersion: {
+                        type: 'exactMatch',
+                        values: ['1.82.0', '1.83.0'],
+                    },
+                })
+            ),
+            true
+        )
+
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    extensionVersion: {
+                        type: 'exactMatch',
+                        values: ['1.19.0', '1.20.0'],
+                    },
+                })
+            ),
+            true
+        )
+    })
+
+    it('should NOT display notification with invalid version exact criteria', function () {
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    ideVersion: {
+                        type: 'exactMatch',
+                        values: ['1.82.0', '1.84.0'],
+                    },
+                })
+            ),
+            false
+        )
+
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    extensionVersion: {
+                        type: 'exactMatch',
+                        values: ['1.19.0', '1.21.0'],
+                    },
+                })
+            ),
+            false
+        )
+    })
+
+    it('should display notification with version range criteria', function () {
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    extensionVersion: {
+                        type: 'range',
+                        lowerInclusive: '1.20.0',
+                        upperExclusive: '1.21.0',
+                    },
+                })
+            ),
+            true
+        )
+
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    extensionVersion: {
+                        type: 'range',
+                        upperExclusive: '1.23.0',
+                    },
+                })
+            ),
+            true
+        )
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    extensionVersion: {
+                        type: 'range',
+                        lowerInclusive: '-inf',
+                        upperExclusive: '1.23.0',
+                    },
+                })
+            ),
+            true
+        )
+
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    extensionVersion: {
+                        type: 'range',
+                        lowerInclusive: '1.0.0',
+                    },
+                })
+            ),
+            true
+        )
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    extensionVersion: {
+                        type: 'range',
+                        lowerInclusive: '1.0.0',
+                        upperExclusive: '+inf',
+                    },
+                })
+            ),
+            true
+        )
+
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    extensionVersion: {
+                        type: 'range',
+                        lowerInclusive: '-inf',
+                        upperExclusive: '+inf',
+                    },
+                })
+            ),
+            true
+        )
+    })
+
+    it('should NOT display notification with invalid version range criteria', function () {
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    extensionVersion: {
+                        type: 'range',
+                        lowerInclusive: '1.18.0',
+                        upperExclusive: '1.20.0',
+                    },
+                })
+            ),
+            false
+        )
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    extensionVersion: {
+                        type: 'range',
+                        lowerInclusive: '-inf',
+                        upperExclusive: '1.20.0',
+                    },
+                })
+            ),
+            false
+        )
+    })
+
+    it('should display notification with version OR criteria', function () {
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    extensionVersion: {
+                        type: 'or',
+                        clauses: [
+                            {
+                                type: 'exactMatch',
+                                values: ['1.18.0', '1.19.0'],
+                            },
+                            {
+                                type: 'range',
+                                lowerInclusive: '1.18.0',
+                                upperExclusive: '1.21.0',
+                            },
+                        ],
+                    },
+                })
+            ),
+            true
+        )
+    })
+
+    it('should NOT display notification with invalid version OR criteria', function () {
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    extensionVersion: {
+                        type: 'or',
+                        clauses: [
+                            {
+                                type: 'exactMatch',
+                                values: ['1.18.0', '1.19.0'],
+                            },
+                            {
+                                type: 'range',
+                                lowerInclusive: '1.18.0',
+                                upperExclusive: '1.20.0',
+                            },
+                        ],
+                    },
+                })
+            ),
+            false
+        )
+    })
+
+    it('should display notification for OS criteria', function () {
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    additionalCriteria: [{ type: 'OS', values: ['LINUX', 'MAC'] }],
+                })
+            ),
+            true
+        )
+    })
+
+    it('should NOT display notification for invalid OS criteria', function () {
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    additionalCriteria: [{ type: 'OS', values: ['MAC'] }],
+                })
+            ),
+            false
+        )
+    })
+
+    it('should display notification for ComputeEnv criteria', function () {
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    additionalCriteria: [{ type: 'ComputeEnv', values: ['local', 'ec2'] }],
+                })
+            ),
+            true
+        )
+    })
+
+    it('should NOT display notification for invalid ComputeEnv criteria', function () {
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    additionalCriteria: [{ type: 'ComputeEnv', values: ['ec2'] }],
+                })
+            ),
+            false
+        )
+    })
+
+    it('should display notification for AuthType criteria', function () {
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    additionalCriteria: [{ type: 'AuthType', values: ['builderId', 'identityCenter'] }],
+                })
+            ),
+            true
+        )
+    })
+
+    it('should NOT display notification for invalid AuthType criteria', function () {
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    additionalCriteria: [{ type: 'AuthType', values: ['identityCenter'] }],
+                })
+            ),
+            false
+        )
+    })
+
+    it('should display notification for AuthRegion criteria', function () {
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    additionalCriteria: [{ type: 'AuthRegion', values: ['us-east-1', 'us-west-2'] }],
+                })
+            ),
+            true
+        )
+    })
+
+    it('should NOT display notification for invalid AuthRegion criteria', function () {
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    additionalCriteria: [{ type: 'AuthRegion', values: ['us-west-2'] }],
+                })
+            ),
+            false
+        )
+    })
+
+    it('should display notification for AuthState criteria', function () {
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    additionalCriteria: [{ type: 'AuthState', values: ['connected'] }],
+                })
+            ),
+            true
+        )
+    })
+
+    it('should NOT display notification for invalid AuthState criteria', function () {
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    additionalCriteria: [{ type: 'AuthState', values: ['notConnected'] }],
+                })
+            ),
+            false
+        )
+    })
+
+    it('should display notification for AuthScopes criteria', function () {
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    additionalCriteria: [
+                        { type: 'AuthScopes', values: ['codewhisperer:completions', 'codewhisperer:analysis'] },
+                    ],
+                })
+            ),
+            true
+        )
+    })
+
+    it('should NOT display notification for invalid AuthScopes criteria', function () {
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    additionalCriteria: [{ type: 'AuthScopes', values: ['codewhisperer:completions'] }],
+                })
+            ),
+            false
+        )
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    additionalCriteria: [
+                        {
+                            type: 'AuthScopes',
+                            values: ['codewhisperer:completions', 'codewhisperer:analysis', 'sso:account:access'],
+                        },
+                    ],
+                })
+            ),
+            false
+        )
+    })
+
+    it('should display notification for ActiveExtensions criteria', function () {
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    additionalCriteria: [{ type: 'ActiveExtensions', values: ['ext1', 'ext2'] }],
+                })
+            ),
+            true
+        )
+    })
+
+    it('should NOT display notification for invalid ActiveExtensions criteria', function () {
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    additionalCriteria: [{ type: 'ActiveExtensions', values: ['ext1', 'ext2', 'unknownExtension'] }],
+                })
+            ),
+            false
+        )
+    })
+
+    it('should display notification for combined criteria', function () {
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    ideVersion: {
+                        type: 'or',
+                        clauses: [
+                            {
+                                type: 'range',
+                                lowerInclusive: '1.70.0',
+                                upperExclusive: '1.81.0',
+                            },
+                            {
+                                type: 'range',
+                                lowerInclusive: '1.81.0',
+                                upperExclusive: '1.83.3',
+                            },
+                        ],
+                    },
+                    extensionVersion: {
+                        type: 'exactMatch',
+                        values: ['1.19.0', '1.20.0'],
+                    },
+                    additionalCriteria: [
+                        { type: 'OS', values: ['LINUX', 'MAC'] },
+                        { type: 'ComputeEnv', values: ['local', 'ec2'] },
+                        { type: 'AuthType', values: ['builderId', 'identityCenter'] },
+                        { type: 'AuthRegion', values: ['us-east-1', 'us-west-2'] },
+                        { type: 'AuthState', values: ['connected'] },
+                        { type: 'AuthScopes', values: ['codewhisperer:completions', 'codewhisperer:analysis'] },
+                        { type: 'ActiveExtensions', values: ['ext1', 'ext2'] },
+                    ],
+                })
+            ),
+            true
+        )
+    })
+
+    it('should NOT display notification for invalid combined criteria', function () {
+        assert.equal(
+            ruleEngine.shouldDisplayNotification(
+                buildNotification({
+                    ideVersion: {
+                        type: 'or',
+                        clauses: [
+                            {
+                                type: 'range',
+                                lowerInclusive: '1.70.0',
+                                upperExclusive: '1.81.0',
+                            },
+                            {
+                                type: 'range',
+                                lowerInclusive: '1.80.0',
+                                upperExclusive: '1.83.3',
+                            },
+                        ],
+                    },
+                    extensionVersion: {
+                        type: 'exactMatch',
+                        values: ['1.19.0', '1.20.0'],
+                    },
+                    additionalCriteria: [
+                        { type: 'OS', values: ['LINUX', 'MAC'] },
+                        { type: 'AuthType', values: ['builderId', 'identityCenter'] },
+                        { type: 'AuthRegion', values: ['us-east-1', 'us-west-2'] },
+                        { type: 'AuthState', values: ['connected'] },
+                        { type: 'AuthScopes', values: ['codewhisperer:completions', 'codewhisperer:analysis'] },
+                        { type: 'ActiveExtensions', values: ['ext1', 'ext2'] },
+
+                        { type: 'ComputeEnv', values: ['ec2'] }, // no 'local'
+                    ],
+                })
+            ),
+            false
+        )
+    })
+})
+
+describe('Notifications getRuleContext()', function () {
+    it('should return the correct rule context', async function () {
+        const context = globals.context
+        context.extension.packageJSON.version = '0.0.1'
+        const authEnabledConnections = (
+            [
+                {
+                    type: 'iam',
+                },
+                {
+                    type: 'sso',
+                    scopes: amazonQScopes,
+                    startUrl: builderIdStartUrl,
+                },
+                {
+                    type: 'sso',
+                    scopes: scopesCodeCatalyst,
+                    startUrl: builderIdStartUrl,
+                },
+                {
+                    type: 'sso',
+                    scopes: amazonQScopes,
+                    startUrl: 'something',
+                },
+                {
+                    type: 'unknown',
+                },
+            ] as Connection[]
+        )
+            .map((c) => getAuthFormIdsFromConnection(c))
+            .join(',')
+
+        const ruleContext = await getRuleContext(context, {
+            authEnabledConnections,
+            authScopes: amazonQScopes.join(','),
+            authStatus: 'connected',
+            awsRegion: 'us-east-1',
+        })
+        assert.deepStrictEqual(ruleContext, {
+            ideVersion: vscode.version,
+            extensionVersion: '0.0.1',
+            os: getOperatingSystem(),
+            computeEnv: 'test',
+            authTypes: ['credentials', 'builderId', 'identityCenter', 'unknown'],
+            authRegions: ['us-east-1'],
+            authStates: ['connected'],
+            authScopes: amazonQScopes,
+            activeExtensions: vscode.extensions.all.filter((e) => e.isActive).map((e) => e.id),
+        })
+    })
+})
diff --git a/packages/core/src/test/notifications/types.test.ts b/packages/core/src/test/notifications/types.test.ts
new file mode 100644
index 00000000000..3e9abbb4132
--- /dev/null
+++ b/packages/core/src/test/notifications/types.test.ts
@@ -0,0 +1,55 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { NotificationsState, NotificationsStateConstructor } from '../../notifications/types'
+
+describe('NotificationsState type validation', function () {
+    it('passes on valid input', async function () {
+        const state: NotificationsState = {
+            startUp: {},
+            emergency: {},
+            dismissed: [],
+            newlyReceived: [],
+        }
+        let ret
+        assert.doesNotThrow(() => {
+            ret = NotificationsStateConstructor(state)
+        })
+        assert.deepStrictEqual(ret, state)
+    })
+
+    it('fails on invalid input', async function () {
+        assert.throws(() => {
+            NotificationsStateConstructor('' as unknown as NotificationsState)
+        })
+        assert.throws(() => {
+            NotificationsStateConstructor({} as NotificationsState)
+        })
+        assert.throws(() => {
+            NotificationsStateConstructor({
+                startUp: {},
+                emergency: {},
+                dismissed: {}, // x
+            } as NotificationsState)
+        })
+        assert.throws(() => {
+            NotificationsStateConstructor({
+                startUp: {},
+                emergency: '', // x
+                dismissed: [],
+                newlyReceived: [],
+            } as NotificationsState)
+        })
+        assert.throws(() => {
+            NotificationsStateConstructor({
+                startUp: '', // x
+                emergency: {},
+                dismissed: [],
+                newlyReceived: [],
+            } as NotificationsState)
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/activation.test.ts b/packages/core/src/test/sagemakerunifiedstudio/activation.test.ts
new file mode 100644
index 00000000000..0756cdcbe88
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/activation.test.ts
@@ -0,0 +1,273 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import * as vscode from 'vscode'
+import { activate } from '../../sagemakerunifiedstudio/activation'
+import * as extensionUtilities from '../../shared/extensionUtilities'
+import * as connectionMagicsSelectorActivation from '../../sagemakerunifiedstudio/connectionMagicsSelector/activation'
+import * as explorerActivation from '../../sagemakerunifiedstudio/explorer/activation'
+import * as resourceMetadataUtils from '../../sagemakerunifiedstudio/shared/utils/resourceMetadataUtils'
+import * as setContext from '../../shared/vscode/setContext'
+import { SmusUtils } from '../../sagemakerunifiedstudio/shared/smusUtils'
+
+describe('SageMaker Unified Studio Main Activation', function () {
+    let mockExtensionContext: vscode.ExtensionContext
+    let isSageMakerStub: sinon.SinonStub
+    let initializeResourceMetadataStub: sinon.SinonStub
+    let setContextStub: sinon.SinonStub
+    let isInSmusSpaceEnvironmentStub: sinon.SinonStub
+    let activateConnectionMagicsSelectorStub: sinon.SinonStub
+    let activateExplorerStub: sinon.SinonStub
+
+    beforeEach(function () {
+        mockExtensionContext = {
+            subscriptions: [],
+            extensionPath: '/test/path',
+            globalState: {
+                get: sinon.stub(),
+                update: sinon.stub(),
+            },
+            workspaceState: {
+                get: sinon.stub(),
+                update: sinon.stub(),
+            },
+        } as any
+
+        // Stub all dependencies
+        isSageMakerStub = sinon.stub(extensionUtilities, 'isSageMaker')
+        initializeResourceMetadataStub = sinon.stub(resourceMetadataUtils, 'initializeResourceMetadata')
+        setContextStub = sinon.stub(setContext, 'setContext')
+        isInSmusSpaceEnvironmentStub = sinon.stub(SmusUtils, 'isInSmusSpaceEnvironment')
+        activateConnectionMagicsSelectorStub = sinon.stub(connectionMagicsSelectorActivation, 'activate')
+        activateExplorerStub = sinon.stub(explorerActivation, 'activate')
+
+        // Set default return values
+        isSageMakerStub.returns(false)
+        initializeResourceMetadataStub.resolves()
+        setContextStub.resolves()
+        isInSmusSpaceEnvironmentStub.returns(false)
+        activateConnectionMagicsSelectorStub.resolves()
+        activateExplorerStub.resolves()
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    describe('activate function', function () {
+        it('should always activate explorer regardless of environment', async function () {
+            isSageMakerStub.returns(false)
+
+            await activate(mockExtensionContext)
+
+            assert.ok(activateExplorerStub.calledOnceWith(mockExtensionContext))
+        })
+
+        it('should not initialize SMUS components when not in SageMaker environment', async function () {
+            isSageMakerStub.returns(false)
+
+            await activate(mockExtensionContext)
+
+            assert.ok(initializeResourceMetadataStub.notCalled)
+            assert.ok(setContextStub.notCalled)
+            assert.ok(activateConnectionMagicsSelectorStub.notCalled)
+            assert.ok(activateExplorerStub.calledOnceWith(mockExtensionContext))
+        })
+
+        it('should initialize SMUS components when in SMUS environment', async function () {
+            isSageMakerStub.withArgs('SMUS').returns(true)
+            isSageMakerStub.withArgs('SMUS-SPACE-REMOTE-ACCESS').returns(false)
+            isInSmusSpaceEnvironmentStub.returns(true)
+
+            await activate(mockExtensionContext)
+
+            assert.ok(initializeResourceMetadataStub.calledOnce)
+            assert.ok(setContextStub.calledOnceWith('aws.smus.inSmusSpaceEnvironment', true))
+            assert.ok(activateConnectionMagicsSelectorStub.calledOnceWith(mockExtensionContext))
+            assert.ok(activateExplorerStub.calledOnceWith(mockExtensionContext))
+        })
+
+        it('should initialize SMUS components when in SMUS-SPACE-REMOTE-ACCESS environment', async function () {
+            isSageMakerStub.withArgs('SMUS').returns(false)
+            isSageMakerStub.withArgs('SMUS-SPACE-REMOTE-ACCESS').returns(true)
+            isInSmusSpaceEnvironmentStub.returns(false)
+
+            await activate(mockExtensionContext)
+
+            assert.ok(initializeResourceMetadataStub.calledOnce)
+            assert.ok(setContextStub.calledOnceWith('aws.smus.inSmusSpaceEnvironment', false))
+            assert.ok(activateConnectionMagicsSelectorStub.calledOnceWith(mockExtensionContext))
+            assert.ok(activateExplorerStub.calledOnceWith(mockExtensionContext))
+        })
+
+        it('should call functions in correct order for SMUS environment', async function () {
+            isSageMakerStub.withArgs('SMUS').returns(true)
+            isSageMakerStub.withArgs('SMUS-SPACE-REMOTE-ACCESS').returns(false)
+            isInSmusSpaceEnvironmentStub.returns(true)
+
+            await activate(mockExtensionContext)
+
+            // Verify the order of calls
+            assert.ok(initializeResourceMetadataStub.calledBefore(setContextStub))
+            assert.ok(setContextStub.calledBefore(activateConnectionMagicsSelectorStub))
+            assert.ok(activateConnectionMagicsSelectorStub.calledBefore(activateExplorerStub))
+        })
+
+        it('should handle initializeResourceMetadata errors', async function () {
+            isSageMakerStub.withArgs('SMUS').returns(true)
+            const error = new Error('Resource metadata initialization failed')
+            initializeResourceMetadataStub.rejects(error)
+
+            await assert.rejects(() => activate(mockExtensionContext), /Resource metadata initialization failed/)
+
+            assert.ok(initializeResourceMetadataStub.calledOnce)
+            assert.ok(setContextStub.notCalled)
+            assert.ok(activateConnectionMagicsSelectorStub.notCalled)
+        })
+
+        it('should handle setContext errors', async function () {
+            isSageMakerStub.withArgs('SMUS').returns(true)
+            isInSmusSpaceEnvironmentStub.returns(true)
+            const error = new Error('Set context failed')
+            setContextStub.rejects(error)
+
+            await assert.rejects(() => activate(mockExtensionContext), /Set context failed/)
+
+            assert.ok(initializeResourceMetadataStub.calledOnce)
+            assert.ok(setContextStub.calledOnce)
+            assert.ok(activateConnectionMagicsSelectorStub.notCalled)
+        })
+
+        it('should handle connectionMagicsSelector activation errors', async function () {
+            isSageMakerStub.withArgs('SMUS').returns(true)
+            isInSmusSpaceEnvironmentStub.returns(true)
+            const error = new Error('Connection magics selector activation failed')
+            activateConnectionMagicsSelectorStub.rejects(error)
+
+            await assert.rejects(() => activate(mockExtensionContext), /Connection magics selector activation failed/)
+
+            assert.ok(initializeResourceMetadataStub.calledOnce)
+            assert.ok(setContextStub.calledOnce)
+            assert.ok(activateConnectionMagicsSelectorStub.calledOnce)
+        })
+
+        it('should handle explorer activation errors', async function () {
+            const error = new Error('Explorer activation failed')
+            activateExplorerStub.rejects(error)
+
+            await assert.rejects(() => activate(mockExtensionContext), /Explorer activation failed/)
+
+            assert.ok(activateExplorerStub.calledOnce)
+        })
+
+        it('should pass correct extension context to all activation functions', async function () {
+            isSageMakerStub.withArgs('SMUS').returns(true)
+            isInSmusSpaceEnvironmentStub.returns(true)
+
+            await activate(mockExtensionContext)
+
+            assert.ok(activateConnectionMagicsSelectorStub.calledWith(mockExtensionContext))
+            assert.ok(activateExplorerStub.calledWith(mockExtensionContext))
+        })
+    })
+
+    describe('environment detection logic', function () {
+        it('should check both SMUS and SMUS-SPACE-REMOTE-ACCESS environments', async function () {
+            isSageMakerStub.withArgs('SMUS').returns(false)
+            isSageMakerStub.withArgs('SMUS-SPACE-REMOTE-ACCESS').returns(false)
+
+            await activate(mockExtensionContext)
+
+            assert.ok(isSageMakerStub.calledWith('SMUS'))
+            assert.ok(isSageMakerStub.calledWith('SMUS-SPACE-REMOTE-ACCESS'))
+        })
+
+        it('should activate SMUS components if either environment check returns true', async function () {
+            // Test case 1: Only SMUS returns true
+            isSageMakerStub.withArgs('SMUS').returns(true)
+            isSageMakerStub.withArgs('SMUS-SPACE-REMOTE-ACCESS').returns(false)
+            isInSmusSpaceEnvironmentStub.returns(true)
+
+            await activate(mockExtensionContext)
+
+            assert.ok(initializeResourceMetadataStub.calledOnce)
+            assert.ok(activateConnectionMagicsSelectorStub.calledOnce)
+
+            // Reset stubs for second test
+            initializeResourceMetadataStub.resetHistory()
+            activateConnectionMagicsSelectorStub.resetHistory()
+
+            // Test case 2: Only SMUS-SPACE-REMOTE-ACCESS returns true
+            isSageMakerStub.withArgs('SMUS').returns(false)
+            isSageMakerStub.withArgs('SMUS-SPACE-REMOTE-ACCESS').returns(true)
+            isInSmusSpaceEnvironmentStub.returns(false)
+
+            await activate(mockExtensionContext)
+
+            assert.ok(initializeResourceMetadataStub.calledOnce)
+            assert.ok(activateConnectionMagicsSelectorStub.calledOnce)
+        })
+
+        it('should use SmusUtils.isInSmusSpaceEnvironment() result for context setting', async function () {
+            isSageMakerStub.withArgs('SMUS').returns(true)
+
+            // Test with true
+            isInSmusSpaceEnvironmentStub.returns(true)
+            await activate(mockExtensionContext)
+            assert.ok(setContextStub.calledWith('aws.smus.inSmusSpaceEnvironment', true))
+
+            // Reset and test with false
+            setContextStub.resetHistory()
+            isInSmusSpaceEnvironmentStub.returns(false)
+            await activate(mockExtensionContext)
+            assert.ok(setContextStub.calledWith('aws.smus.inSmusSpaceEnvironment', false))
+        })
+    })
+
+    describe('integration scenarios', function () {
+        it('should handle mixed success and failure scenarios gracefully', async function () {
+            isSageMakerStub.withArgs('SMUS').returns(true)
+            isInSmusSpaceEnvironmentStub.returns(true)
+
+            // initializeResourceMetadata succeeds, setContext fails
+            const setContextError = new Error('Context setting failed')
+            setContextStub.rejects(setContextError)
+
+            await assert.rejects(() => activate(mockExtensionContext), /Context setting failed/)
+
+            // Verify that initializeResourceMetadata was called but subsequent functions were not
+            assert.ok(initializeResourceMetadataStub.calledOnce)
+            assert.ok(setContextStub.calledOnce)
+            assert.ok(activateConnectionMagicsSelectorStub.notCalled)
+            assert.ok(activateExplorerStub.notCalled)
+        })
+
+        it('should complete successfully when all components initialize properly', async function () {
+            isSageMakerStub.withArgs('SMUS').returns(true)
+            isSageMakerStub.withArgs('SMUS-SPACE-REMOTE-ACCESS').returns(false)
+            isInSmusSpaceEnvironmentStub.returns(true)
+
+            // All functions should succeed
+            await activate(mockExtensionContext)
+
+            // Verify all expected functions were called
+            assert.ok(initializeResourceMetadataStub.calledOnce)
+            assert.ok(setContextStub.calledOnce)
+            assert.ok(activateConnectionMagicsSelectorStub.calledOnce)
+            assert.ok(activateExplorerStub.calledOnce)
+        })
+
+        it('should handle undefined extension context gracefully', async function () {
+            const undefinedContext = undefined as any
+
+            // Should not throw for undefined context, but let the individual activation functions handle it
+            await activate(undefinedContext)
+
+            assert.ok(activateExplorerStub.calledWith(undefinedContext))
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/auth/connectionCredentialsProvider.test.ts b/packages/core/src/test/sagemakerunifiedstudio/auth/connectionCredentialsProvider.test.ts
new file mode 100644
index 00000000000..951e391d181
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/auth/connectionCredentialsProvider.test.ts
@@ -0,0 +1,215 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import { ConnectionCredentialsProvider } from '../../../sagemakerunifiedstudio/auth/providers/connectionCredentialsProvider'
+import { SmusAuthenticationProvider } from '../../../sagemakerunifiedstudio/auth/providers/smusAuthenticationProvider'
+import { DataZoneClient } from '../../../sagemakerunifiedstudio/shared/client/datazoneClient'
+import { ToolkitError } from '../../../shared/errors'
+
+describe('ConnectionCredentialsProvider', function () {
+    let mockAuthProvider: sinon.SinonStubbedInstance<SmusAuthenticationProvider>
+    let mockDataZoneClient: sinon.SinonStubbedInstance<DataZoneClient>
+    let connectionProvider: ConnectionCredentialsProvider
+    let dataZoneClientStub: sinon.SinonStub
+
+    const testConnectionId = 'conn-123456'
+    const testDomainId = 'dzd_testdomain'
+    const testRegion = 'us-east-2'
+
+    const mockConnectionCredentials = {
+        accessKeyId: 'AKIA-CONNECTION-KEY',
+        secretAccessKey: 'connection-secret-key',
+        sessionToken: 'connection-session-token',
+        expiration: new Date(Date.now() + 3600000), // 1 hour from now
+    }
+
+    const mockGetConnectionResponse = {
+        connectionId: testConnectionId,
+        name: 'Test Connection',
+        type: 'S3',
+        domainId: testDomainId,
+        projectId: 'project-123',
+        connectionCredentials: mockConnectionCredentials,
+    }
+
+    beforeEach(function () {
+        // Mock auth provider
+        mockAuthProvider = {
+            isConnected: sinon.stub().returns(true),
+            getDomainId: sinon.stub().returns(testDomainId),
+            getDomainRegion: sinon.stub().returns(testRegion),
+            activeConnection: {
+                ssoRegion: testRegion,
+            },
+        } as any
+
+        // Mock DataZone client
+        mockDataZoneClient = {
+            getConnection: sinon.stub().resolves(mockGetConnectionResponse),
+        } as any
+
+        // Stub DataZoneClient.getInstance
+        dataZoneClientStub = sinon.stub(DataZoneClient, 'getInstance').resolves(mockDataZoneClient as any)
+
+        connectionProvider = new ConnectionCredentialsProvider(mockAuthProvider as any, testConnectionId)
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    describe('constructor', function () {
+        it('should create provider with correct properties', function () {
+            assert.strictEqual(connectionProvider.getConnectionId(), testConnectionId)
+            assert.strictEqual(connectionProvider.getDefaultRegion(), testRegion)
+        })
+    })
+
+    describe('getCredentialsId', function () {
+        it('should return correct credentials ID', function () {
+            const credentialsId = connectionProvider.getCredentialsId()
+            assert.strictEqual(credentialsId.credentialSource, 'temp')
+            assert.strictEqual(credentialsId.credentialTypeId, `${testDomainId}:${testConnectionId}`)
+        })
+    })
+
+    describe('getHashCode', function () {
+        it('should return correct hash code', function () {
+            const hashCode = connectionProvider.getHashCode()
+            assert.strictEqual(hashCode, `smus-connection:${testDomainId}:${testConnectionId}`)
+        })
+    })
+
+    describe('isAvailable', function () {
+        it('should return true when auth provider is connected', async function () {
+            mockAuthProvider.isConnected.returns(true)
+            const isAvailable = await connectionProvider.isAvailable()
+            assert.strictEqual(isAvailable, true)
+        })
+
+        it('should return false when auth provider is not connected', async function () {
+            mockAuthProvider.isConnected.returns(false)
+            const isAvailable = await connectionProvider.isAvailable()
+            assert.strictEqual(isAvailable, false)
+        })
+
+        it('should return false when auth provider throws error', async function () {
+            mockAuthProvider.isConnected.throws(new Error('Connection error'))
+            const isAvailable = await connectionProvider.isAvailable()
+            assert.strictEqual(isAvailable, false)
+        })
+    })
+
+    describe('canAutoConnect', function () {
+        it('should return false', async function () {
+            const canAutoConnect = await connectionProvider.canAutoConnect()
+            assert.strictEqual(canAutoConnect, false)
+        })
+    })
+
+    describe('getCredentials', function () {
+        it('should fetch and return connection credentials', async function () {
+            const credentials = await connectionProvider.getCredentials()
+
+            assert.strictEqual(credentials.accessKeyId, mockConnectionCredentials.accessKeyId)
+            assert.strictEqual(credentials.secretAccessKey, mockConnectionCredentials.secretAccessKey)
+            assert.strictEqual(credentials.sessionToken, mockConnectionCredentials.sessionToken)
+            assert(credentials.expiration instanceof Date)
+
+            // Verify DataZone client was called correctly
+            sinon.assert.calledOnce(dataZoneClientStub)
+            sinon.assert.calledWith(mockDataZoneClient.getConnection, {
+                domainIdentifier: testDomainId,
+                identifier: testConnectionId,
+                withSecret: true,
+            })
+        })
+
+        it('should use cached credentials on subsequent calls', async function () {
+            // First call
+            const credentials1 = await connectionProvider.getCredentials()
+            // Second call
+            const credentials2 = await connectionProvider.getCredentials()
+
+            assert.strictEqual(credentials1, credentials2)
+            // DataZone client should only be called once due to caching
+            sinon.assert.calledOnce(mockDataZoneClient.getConnection)
+        })
+
+        it('should throw error when no connection credentials available', async function () {
+            mockDataZoneClient.getConnection.resolves({
+                ...mockGetConnectionResponse,
+                connectionCredentials: undefined,
+            })
+
+            await assert.rejects(
+                () => connectionProvider.getCredentials(),
+                (err: ToolkitError) => {
+                    assert.strictEqual(err.code, 'NoConnectionCredentials')
+                    return true
+                }
+            )
+        })
+
+        it('should throw error when connection credentials are invalid', async function () {
+            mockDataZoneClient.getConnection.resolves({
+                ...mockGetConnectionResponse,
+                connectionCredentials: {
+                    accessKeyId: '', // Invalid empty string
+                    secretAccessKey: 'valid-secret',
+                    sessionToken: 'valid-token',
+                },
+            })
+
+            await assert.rejects(
+                () => connectionProvider.getCredentials(),
+                (err: ToolkitError) => {
+                    assert.strictEqual(err.code, 'InvalidConnectionCredentials')
+                    return true
+                }
+            )
+        })
+
+        it('should throw error when DataZone client fails', async function () {
+            const dataZoneError = new Error('DataZone API error')
+            mockDataZoneClient.getConnection.rejects(dataZoneError)
+
+            await assert.rejects(
+                () => connectionProvider.getCredentials(),
+                (err: ToolkitError) => {
+                    assert.strictEqual(err.code, 'ConnectionCredentialsFetchFailed')
+                    return true
+                }
+            )
+        })
+    })
+
+    describe('invalidate', function () {
+        it('should clear cached credentials', async function () {
+            // Get credentials to populate cache
+            await connectionProvider.getCredentials()
+            sinon.assert.calledOnce(mockDataZoneClient.getConnection)
+
+            // Invalidate cache
+            connectionProvider.invalidate()
+
+            // Get credentials again - should make new API call
+            await connectionProvider.getCredentials()
+            sinon.assert.calledTwice(mockDataZoneClient.getConnection)
+        })
+    })
+
+    describe('provider metadata', function () {
+        it('should return correct provider type', function () {
+            assert.strictEqual(connectionProvider.getProviderType(), 'temp')
+        })
+
+        it('should return correct telemetry type', function () {
+            assert.strictEqual(connectionProvider.getTelemetryType(), 'other')
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/auth/domainExecRoleCredentialsProvider.test.ts b/packages/core/src/test/sagemakerunifiedstudio/auth/domainExecRoleCredentialsProvider.test.ts
new file mode 100644
index 00000000000..7e8cdd8632d
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/auth/domainExecRoleCredentialsProvider.test.ts
@@ -0,0 +1,583 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import { DomainExecRoleCredentialsProvider } from '../../../sagemakerunifiedstudio/auth/providers/domainExecRoleCredentialsProvider'
+import { ToolkitError } from '../../../shared/errors'
+import fetch from 'node-fetch'
+import { SmusTimeouts } from '../../../sagemakerunifiedstudio/shared/smusUtils'
+
+describe('DomainExecRoleCredentialsProvider', function () {
+    let derProvider: DomainExecRoleCredentialsProvider
+    let mockGetAccessToken: sinon.SinonStub
+    let fetchStub: sinon.SinonStub
+
+    const testDomainId = 'dzd_testdomain'
+    const testDomainUrl = 'https://test-domain.sagemaker.us-east-2.on.aws'
+    const testSsoRegion = 'us-east-2'
+    const testAccessToken = 'test-access-token-12345'
+
+    const mockCredentialsResponse = {
+        credentials: {
+            accessKeyId: 'AKIA-DER-KEY',
+            secretAccessKey: 'der-secret-key',
+            sessionToken: 'der-session-token',
+        },
+    }
+
+    beforeEach(function () {
+        // Mock access token function
+        mockGetAccessToken = sinon.stub().resolves(testAccessToken)
+
+        // Mock fetch
+        fetchStub = sinon.stub(fetch, 'default' as any).resolves({
+            ok: true,
+            status: 200,
+            statusText: 'OK',
+            text: sinon.stub().resolves(JSON.stringify(mockCredentialsResponse)),
+            json: sinon.stub().resolves(mockCredentialsResponse),
+        } as any)
+
+        derProvider = new DomainExecRoleCredentialsProvider(
+            testDomainUrl,
+            testDomainId,
+            testSsoRegion,
+            mockGetAccessToken
+        )
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    describe('constructor', function () {
+        it('should initialize with correct properties', function () {
+            assert.strictEqual(derProvider.getDomainId(), testDomainId)
+            assert.strictEqual(derProvider.getDomainUrl(), testDomainUrl)
+            assert.strictEqual(derProvider.getDefaultRegion(), testSsoRegion)
+        })
+    })
+
+    describe('getCredentialsId', function () {
+        it('should return correct credentials ID', function () {
+            const credentialsId = derProvider.getCredentialsId()
+            assert.strictEqual(credentialsId.credentialSource, 'sso')
+            assert.strictEqual(credentialsId.credentialTypeId, testDomainId)
+        })
+    })
+
+    describe('getProviderType', function () {
+        it('should return sso provider type', function () {
+            assert.strictEqual(derProvider.getProviderType(), 'sso')
+        })
+    })
+
+    describe('getTelemetryType', function () {
+        it('should return ssoProfile telemetry type', function () {
+            assert.strictEqual(derProvider.getTelemetryType(), 'ssoProfile')
+        })
+    })
+
+    describe('getHashCode', function () {
+        it('should return correct hash code', function () {
+            const hashCode = derProvider.getHashCode()
+            assert.strictEqual(hashCode, `smus-der:${testDomainId}:${testSsoRegion}`)
+        })
+    })
+
+    describe('canAutoConnect', function () {
+        it('should return false', async function () {
+            const result = await derProvider.canAutoConnect()
+            assert.strictEqual(result, false)
+        })
+    })
+
+    describe('isAvailable', function () {
+        it('should return true when access token is available', async function () {
+            const result = await derProvider.isAvailable()
+            assert.strictEqual(result, true)
+            assert.ok(mockGetAccessToken.called)
+        })
+
+        it('should return false when access token throws error', async function () {
+            mockGetAccessToken.rejects(new Error('Token error'))
+            const result = await derProvider.isAvailable()
+            assert.strictEqual(result, false)
+        })
+    })
+
+    describe('getCredentials', function () {
+        it('should fetch and cache DER credentials', async function () {
+            const credentials = await derProvider.getCredentials()
+
+            // Verify access token was fetched
+            assert.ok(mockGetAccessToken.called)
+
+            // Verify fetch was called with correct parameters
+            assert.ok(fetchStub.called)
+            const fetchCall = fetchStub.firstCall
+            assert.strictEqual(fetchCall.args[0], `${testDomainUrl}/sso/redeem-token`)
+
+            const fetchOptions = fetchCall.args[1]
+            assert.strictEqual(fetchOptions.method, 'POST')
+            assert.strictEqual(fetchOptions.headers['Content-Type'], 'application/json')
+            assert.strictEqual(fetchOptions.headers['Accept'], 'application/json')
+            assert.strictEqual(fetchOptions.headers['User-Agent'], 'aws-toolkit-vscode')
+
+            const requestBody = JSON.parse(fetchOptions.body)
+            assert.strictEqual(requestBody.domainId, testDomainId)
+            assert.strictEqual(requestBody.accessToken, testAccessToken)
+
+            // Verify timeout is set
+            assert.strictEqual(fetchOptions.timeout, SmusTimeouts.apiCallTimeoutMs)
+            assert.strictEqual(fetchOptions.timeout, 10000) // 10 seconds
+
+            // Verify returned credentials
+            assert.strictEqual(credentials.accessKeyId, mockCredentialsResponse.credentials.accessKeyId)
+            assert.strictEqual(credentials.secretAccessKey, mockCredentialsResponse.credentials.secretAccessKey)
+            assert.strictEqual(credentials.sessionToken, mockCredentialsResponse.credentials.sessionToken)
+            assert.ok(credentials.expiration)
+        })
+
+        it('should use cached credentials when available', async function () {
+            // First call should fetch credentials
+            const credentials1 = await derProvider.getCredentials()
+
+            // Second call should use cache
+            const credentials2 = await derProvider.getCredentials()
+
+            // Fetch should only be called once
+            assert.strictEqual(fetchStub.callCount, 1)
+            assert.strictEqual(mockGetAccessToken.callCount, 1)
+
+            // Credentials should be the same
+            assert.strictEqual(credentials1, credentials2)
+        })
+
+        it('should handle missing access token', async function () {
+            mockGetAccessToken.resolves('')
+
+            await assert.rejects(
+                () => derProvider.getCredentials(),
+                (err: ToolkitError) => {
+                    return err.code === 'DerCredentialsFetchFailed' && err.message.includes('No access token available')
+                }
+            )
+        })
+
+        it('should handle HTTP errors from redeem token API', async function () {
+            fetchStub.resolves({
+                ok: false,
+                status: 401,
+                statusText: 'Unauthorized',
+                text: sinon.stub().resolves('Invalid token'),
+            } as any)
+
+            await assert.rejects(
+                () => derProvider.getCredentials(),
+                (err: ToolkitError) => {
+                    return err.code === 'DerCredentialsFetchFailed' && err.message.includes('401')
+                }
+            )
+        })
+
+        it('should handle timeout errors', async function () {
+            const timeoutError = new Error('Request timeout')
+            timeoutError.name = 'AbortError'
+            fetchStub.rejects(timeoutError)
+
+            await assert.rejects(
+                () => derProvider.getCredentials(),
+                (err: ToolkitError) => {
+                    return (
+                        err.code === 'DerCredentialsFetchFailed' && err.message.includes('timed out after 10 seconds')
+                    )
+                }
+            )
+        })
+
+        it('should handle network errors', async function () {
+            const networkError = new Error('Network error')
+            fetchStub.rejects(networkError)
+
+            await assert.rejects(
+                () => derProvider.getCredentials(),
+                (err: ToolkitError) => {
+                    return err.code === 'DerCredentialsFetchFailed'
+                }
+            )
+        })
+
+        it('should handle missing credentials object in response', async function () {
+            fetchStub.resolves({
+                ok: true,
+                status: 200,
+                statusText: 'OK',
+                text: sinon.stub().resolves(JSON.stringify({})),
+                json: sinon.stub().resolves({}), // Missing credentials object
+            } as any)
+
+            await assert.rejects(
+                () => derProvider.getCredentials(),
+                (err: ToolkitError) => {
+                    return (
+                        err.code === 'DerCredentialsFetchFailed' && err.message.includes('Missing credentials object')
+                    )
+                }
+            )
+        })
+
+        it('should handle invalid accessKeyId in response', async function () {
+            const invalidResponse = {
+                credentials: {
+                    accessKeyId: '', // Invalid empty string
+                    secretAccessKey: 'valid-secret',
+                    sessionToken: 'valid-token',
+                },
+            }
+
+            fetchStub.resolves({
+                ok: true,
+                status: 200,
+                statusText: 'OK',
+                text: sinon.stub().resolves(JSON.stringify(invalidResponse)),
+                json: sinon.stub().resolves(invalidResponse),
+            } as any)
+
+            await assert.rejects(
+                () => derProvider.getCredentials(),
+                (err: ToolkitError) => {
+                    return err.code === 'DerCredentialsFetchFailed' && err.message.includes('Invalid accessKeyId')
+                }
+            )
+        })
+
+        it('should handle invalid secretAccessKey in response', async function () {
+            const invalidResponse = {
+                credentials: {
+                    accessKeyId: 'valid-key',
+                    secretAccessKey: undefined, // Invalid null value
+                    sessionToken: 'valid-token',
+                },
+            }
+
+            fetchStub.resolves({
+                ok: true,
+                status: 200,
+                statusText: 'OK',
+                text: sinon.stub().resolves(JSON.stringify(invalidResponse)),
+                json: sinon.stub().resolves(invalidResponse),
+            } as any)
+
+            await assert.rejects(
+                () => derProvider.getCredentials(),
+                (err: ToolkitError) => {
+                    return err.code === 'DerCredentialsFetchFailed' && err.message.includes('Invalid secretAccessKey')
+                }
+            )
+        })
+
+        it('should handle invalid sessionToken in response', async function () {
+            const invalidResponse = {
+                credentials: {
+                    accessKeyId: 'valid-key',
+                    secretAccessKey: 'valid-secret',
+                    sessionToken: undefined, // Invalid undefined value
+                },
+            }
+
+            fetchStub.resolves({
+                ok: true,
+                status: 200,
+                statusText: 'OK',
+                text: sinon.stub().resolves(JSON.stringify(invalidResponse)),
+                json: sinon.stub().resolves(invalidResponse),
+            } as any)
+
+            await assert.rejects(
+                () => derProvider.getCredentials(),
+                (err: ToolkitError) => {
+                    return err.code === 'DerCredentialsFetchFailed' && err.message.includes('Invalid sessionToken')
+                }
+            )
+        })
+
+        it('should set default expiration when not provided in response', async function () {
+            const credentials = await derProvider.getCredentials()
+
+            // Should have expiration set to 10 mins from now
+            assert.ok(credentials.expiration)
+            const expirationTime = credentials.expiration!.getTime()
+            const expectedTime = Date.now() + 10 * 60 * 1000 // 10 minutes
+            const timeDiff = Math.abs(expirationTime - expectedTime)
+            assert.ok(timeDiff < 5000, 'Expiration should be 10 mins from now')
+        })
+
+        it('should use expiration from API response when provided as ISO string', async function () {
+            const futureExpiration = new Date(Date.now() + 2 * 60 * 60 * 1000) // 2 hours from now
+            const responseWithExpiration = {
+                credentials: {
+                    accessKeyId: 'AKIA-DER-KEY',
+                    secretAccessKey: 'der-secret-key',
+                    sessionToken: 'der-session-token',
+                    expiration: futureExpiration.toISOString(), // API returns expiration as ISO string
+                },
+            }
+
+            fetchStub.resolves({
+                ok: true,
+                status: 200,
+                statusText: 'OK',
+                text: sinon.stub().resolves(JSON.stringify(responseWithExpiration)),
+                json: sinon.stub().resolves(responseWithExpiration),
+            } as any)
+
+            const credentials = await derProvider.getCredentials()
+
+            // Should use the expiration from the API response
+            assert.ok(credentials.expiration)
+            const expirationTime = credentials.expiration!.getTime()
+            const expectedTime = futureExpiration.getTime()
+            const timeDiff = Math.abs(expirationTime - expectedTime)
+            assert.ok(timeDiff < 1000, 'Should use expiration from API response')
+        })
+
+        it('should handle epoch timestamp in seconds from API response', async function () {
+            const futureTime = Math.floor(Date.now() / 1000) + 3600 // 1 hour from now in seconds
+            const responseWithEpochExpiration = {
+                credentials: {
+                    accessKeyId: 'AKIA-DER-KEY',
+                    secretAccessKey: 'der-secret-key',
+                    sessionToken: 'der-session-token',
+                    expiration: futureTime.toString(), // Epoch timestamp in seconds as string
+                },
+            }
+
+            fetchStub.resolves({
+                ok: true,
+                status: 200,
+                statusText: 'OK',
+                text: sinon.stub().resolves(JSON.stringify(responseWithEpochExpiration)),
+                json: sinon.stub().resolves(responseWithEpochExpiration),
+            } as any)
+
+            const credentials = await derProvider.getCredentials()
+
+            // Should correctly parse epoch timestamp and convert to Date
+            assert.ok(credentials.expiration)
+            const expirationTime = credentials.expiration!.getTime()
+            const expectedTime = futureTime * 1000 // Convert to milliseconds
+            const timeDiff = Math.abs(expirationTime - expectedTime)
+            assert.ok(timeDiff < 1000, 'Should correctly parse epoch timestamp in seconds')
+        })
+
+        it('should handle epoch timestamp as number from API response', async function () {
+            const futureTime = Math.floor(Date.now() / 1000) + 7200 // 2 hours from now in seconds
+            const responseWithEpochExpiration = {
+                credentials: {
+                    accessKeyId: 'AKIA-DER-KEY',
+                    secretAccessKey: 'der-secret-key',
+                    sessionToken: 'der-session-token',
+                    expiration: futureTime, // Epoch timestamp in seconds as number
+                },
+            }
+
+            fetchStub.resolves({
+                ok: true,
+                status: 200,
+                statusText: 'OK',
+                text: sinon.stub().resolves(JSON.stringify(responseWithEpochExpiration)),
+                json: sinon.stub().resolves(responseWithEpochExpiration),
+            } as any)
+
+            const credentials = await derProvider.getCredentials()
+
+            // Should correctly parse epoch timestamp and convert to Date
+            assert.ok(credentials.expiration)
+            const expirationTime = credentials.expiration!.getTime()
+            const expectedTime = futureTime * 1000 // Convert to milliseconds
+            const timeDiff = Math.abs(expirationTime - expectedTime)
+            assert.ok(timeDiff < 1000, 'Should correctly parse epoch timestamp as number')
+        })
+
+        it('should handle zero epoch timestamp gracefully', async function () {
+            const responseWithZeroExpiration = {
+                credentials: {
+                    accessKeyId: 'AKIA-DER-KEY',
+                    secretAccessKey: 'der-secret-key',
+                    sessionToken: 'der-session-token',
+                    expiration: '0', // Zero is not > 0, so treated as ISO string "0" which represents year 0
+                },
+            }
+
+            fetchStub.resolves({
+                ok: true,
+                status: 200,
+                statusText: 'OK',
+                text: sinon.stub().resolves(JSON.stringify(responseWithZeroExpiration)),
+                json: sinon.stub().resolves(responseWithZeroExpiration),
+            } as any)
+
+            const credentials = await derProvider.getCredentials()
+
+            // "0" is parsed as a valid date (year 0), not as an invalid date
+            // So it should use the parsed date, not the default expiration
+            assert.ok(credentials.expiration)
+            const expirationTime = credentials.expiration!.getTime()
+            const expectedTime = new Date('0').getTime() // Year 0
+            assert.strictEqual(expirationTime, expectedTime, 'Should use parsed date for year 0')
+        })
+
+        it('should handle negative epoch timestamp gracefully', async function () {
+            const responseWithNegativeExpiration = {
+                credentials: {
+                    accessKeyId: 'AKIA-DER-KEY',
+                    secretAccessKey: 'der-secret-key',
+                    sessionToken: 'der-session-token',
+                    expiration: '-1', // Negative is not > 0, so treated as ISO string "-1" which represents year -1
+                },
+            }
+
+            fetchStub.resolves({
+                ok: true,
+                status: 200,
+                statusText: 'OK',
+                text: sinon.stub().resolves(JSON.stringify(responseWithNegativeExpiration)),
+                json: sinon.stub().resolves(responseWithNegativeExpiration),
+            } as any)
+
+            const credentials = await derProvider.getCredentials()
+
+            // "-1" is parsed as a valid date (year -1), not as an invalid date
+            // So it should use the parsed date, not the default expiration
+            assert.ok(credentials.expiration)
+            const expirationTime = credentials.expiration!.getTime()
+            const expectedTime = new Date('-1').getTime() // Year -1
+            assert.strictEqual(expirationTime, expectedTime, 'Should use parsed date for year -1')
+        })
+
+        it('should handle JSON parsing errors', async function () {
+            fetchStub.resolves({
+                ok: true,
+                status: 200,
+                statusText: 'OK',
+                text: sinon.stub().resolves('invalid json'),
+                json: sinon.stub().rejects(new Error('Invalid JSON')),
+            } as any)
+
+            await assert.rejects(
+                () => derProvider.getCredentials(),
+                (err: ToolkitError) => {
+                    return err.code === 'DerCredentialsFetchFailed'
+                }
+            )
+        })
+
+        it('should handle invalid expiration string in response', async function () {
+            const responseWithInvalidExpiration = {
+                credentials: {
+                    accessKeyId: 'AKIA-DER-KEY',
+                    secretAccessKey: 'der-secret-key',
+                    sessionToken: 'der-session-token',
+                    expiration: 'invalid-date-string', // Invalid date string
+                },
+            }
+
+            fetchStub.resolves({
+                ok: true,
+                status: 200,
+                statusText: 'OK',
+                text: sinon.stub().resolves(JSON.stringify(responseWithInvalidExpiration)),
+                json: sinon.stub().resolves(responseWithInvalidExpiration),
+            } as any)
+
+            const credentials = await derProvider.getCredentials()
+
+            // Should fall back to default expiration when date parsing fails
+            assert.ok(credentials.expiration)
+            const expirationTime = credentials.expiration!.getTime()
+
+            // Should be a valid timestamp (not NaN) using the default expiration
+            assert.ok(!isNaN(expirationTime), 'Should have valid expiration timestamp')
+
+            // Should be close to now + 10 minutes (default expiration)
+            const expectedTime = Date.now() + 10 * 60 * 1000
+            const timeDiff = Math.abs(expirationTime - expectedTime)
+            assert.ok(timeDiff < 5000, 'Should fall back to default expiration for invalid date string')
+        })
+
+        it('should handle empty expiration string in response', async function () {
+            const responseWithEmptyExpiration = {
+                credentials: {
+                    accessKeyId: 'AKIA-DER-KEY',
+                    secretAccessKey: 'der-secret-key',
+                    sessionToken: 'der-session-token',
+                    expiration: '', // Empty string
+                },
+            }
+
+            fetchStub.resolves({
+                ok: true,
+                status: 200,
+                statusText: 'OK',
+                text: sinon.stub().resolves(JSON.stringify(responseWithEmptyExpiration)),
+                json: sinon.stub().resolves(responseWithEmptyExpiration),
+            } as any)
+
+            const credentials = await derProvider.getCredentials()
+
+            // Should fall back to default expiration for empty string
+            assert.ok(credentials.expiration)
+            const expirationTime = credentials.expiration!.getTime()
+            const expectedTime = Date.now() + 10 * 60 * 1000 // Default 10 minutes
+            const timeDiff = Math.abs(expirationTime - expectedTime)
+            assert.ok(timeDiff < 5000, 'Should use default expiration for empty string')
+        })
+
+        it('should handle non-numeric string that looks like a number', async function () {
+            const responseWithInvalidNumber = {
+                credentials: {
+                    accessKeyId: 'AKIA-DER-KEY',
+                    secretAccessKey: 'der-secret-key',
+                    sessionToken: 'der-session-token',
+                    expiration: '123abc', // Non-numeric string
+                },
+            }
+
+            fetchStub.resolves({
+                ok: true,
+                status: 200,
+                statusText: 'OK',
+                text: sinon.stub().resolves(JSON.stringify(responseWithInvalidNumber)),
+                json: sinon.stub().resolves(responseWithInvalidNumber),
+            } as any)
+
+            const credentials = await derProvider.getCredentials()
+
+            // Should fall back to default expiration for invalid numeric string
+            assert.ok(credentials.expiration)
+            const expirationTime = credentials.expiration!.getTime()
+            const expectedTime = Date.now() + 10 * 60 * 1000 // Default 10 minutes
+            const timeDiff = Math.abs(expirationTime - expectedTime)
+            assert.ok(timeDiff < 5000, 'Should use default expiration for invalid numeric string')
+        })
+    })
+
+    describe('invalidate', function () {
+        it('should clear cache and force fresh fetch on next call', async function () {
+            // First call to populate cache
+            await derProvider.getCredentials()
+            assert.strictEqual(fetchStub.callCount, 1)
+
+            // Invalidate should clear cache
+            derProvider.invalidate()
+
+            // Next call should fetch fresh credentials
+            await derProvider.getCredentials()
+            assert.strictEqual(fetchStub.callCount, 2)
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/auth/model.test.ts b/packages/core/src/test/sagemakerunifiedstudio/auth/model.test.ts
new file mode 100644
index 00000000000..a6ca72736e9
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/auth/model.test.ts
@@ -0,0 +1,232 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import {
+    createSmusProfile,
+    isValidSmusConnection,
+    scopeSmus,
+    SmusConnection,
+} from '../../../sagemakerunifiedstudio/auth/model'
+import { SsoConnection } from '../../../auth/connection'
+
+describe('SMUS Auth Model', function () {
+    const testDomainUrl = 'https://dzd_domainId.sagemaker.us-east-2.on.aws'
+    const testDomainId = 'dzd_domainId'
+    const testStartUrl = 'https://identitycenter.amazonaws.com/ssoins-testInstanceId'
+    const testRegion = 'us-east-2'
+
+    describe('scopeSmus', function () {
+        it('should have correct scope value', function () {
+            assert.strictEqual(scopeSmus, 'datazone:domain:access')
+        })
+    })
+
+    describe('createSmusProfile', function () {
+        it('should create profile with default scopes', function () {
+            const profile = createSmusProfile(testDomainUrl, testDomainId, testStartUrl, testRegion)
+
+            assert.strictEqual(profile.domainUrl, testDomainUrl)
+            assert.strictEqual(profile.domainId, testDomainId)
+            assert.strictEqual(profile.startUrl, testStartUrl)
+            assert.strictEqual(profile.ssoRegion, testRegion)
+            assert.strictEqual(profile.type, 'sso')
+            assert.deepStrictEqual(profile.scopes, [scopeSmus])
+        })
+
+        it('should create profile with custom scopes', function () {
+            const customScopes = ['custom:scope', 'another:scope']
+            const profile = createSmusProfile(testDomainUrl, testDomainId, testStartUrl, testRegion, customScopes)
+
+            assert.strictEqual(profile.domainUrl, testDomainUrl)
+            assert.strictEqual(profile.domainId, testDomainId)
+            assert.strictEqual(profile.startUrl, testStartUrl)
+            assert.strictEqual(profile.ssoRegion, testRegion)
+            assert.strictEqual(profile.type, 'sso')
+            assert.deepStrictEqual(profile.scopes, customScopes)
+        })
+
+        it('should create profile with all required properties', function () {
+            const profile = createSmusProfile(testDomainUrl, testDomainId, testStartUrl, testRegion)
+
+            // Check SsoProfile properties
+            assert.strictEqual(profile.type, 'sso')
+            assert.strictEqual(profile.startUrl, testStartUrl)
+            assert.strictEqual(profile.ssoRegion, testRegion)
+            assert.ok(Array.isArray(profile.scopes))
+
+            // Check SmusProfile properties
+            assert.strictEqual(profile.domainUrl, testDomainUrl)
+            assert.strictEqual(profile.domainId, testDomainId)
+        })
+    })
+
+    describe('isValidSmusConnection', function () {
+        it('should return true for valid SMUS connection', function () {
+            const validConnection = {
+                id: 'test-connection-id',
+                type: 'sso',
+                startUrl: testStartUrl,
+                ssoRegion: testRegion,
+                scopes: [scopeSmus],
+                label: 'Test SMUS Connection',
+                domainUrl: testDomainUrl,
+                domainId: testDomainId,
+            } as SmusConnection
+
+            assert.strictEqual(isValidSmusConnection(validConnection), true)
+        })
+
+        it('should return false for connection without SMUS scope', function () {
+            const connectionWithoutScope = {
+                id: 'test-connection-id',
+                type: 'sso',
+                startUrl: testStartUrl,
+                ssoRegion: testRegion,
+                scopes: ['sso:account:access'],
+                label: 'Test Connection',
+                domainUrl: testDomainUrl,
+                domainId: testDomainId,
+            } as any
+
+            assert.strictEqual(isValidSmusConnection(connectionWithoutScope), false)
+        })
+
+        it('should return false for connection without SMUS properties', function () {
+            const connectionWithoutSmusProps = {
+                id: 'test-connection-id',
+                type: 'sso',
+                startUrl: testStartUrl,
+                ssoRegion: testRegion,
+                scopes: [scopeSmus],
+                label: 'Test Connection',
+            } as SsoConnection
+
+            assert.strictEqual(isValidSmusConnection(connectionWithoutSmusProps), false)
+        })
+
+        it('should return false for non-SSO connection', function () {
+            const nonSsoConnection = {
+                id: 'test-connection-id',
+                type: 'iam',
+                label: 'Test IAM Connection',
+                domainUrl: testDomainUrl,
+                domainId: testDomainId,
+                scopes: [scopeSmus],
+            }
+
+            assert.strictEqual(isValidSmusConnection(nonSsoConnection), false)
+        })
+
+        it('should return false for undefined connection', function () {
+            assert.strictEqual(isValidSmusConnection(undefined), false)
+        })
+
+        it('should return false for null connection', function () {
+            assert.strictEqual(isValidSmusConnection(undefined), false)
+        })
+
+        it('should return false for connection without scopes', function () {
+            const connectionWithoutScopes = {
+                id: 'test-connection-id',
+                type: 'sso',
+                startUrl: testStartUrl,
+                ssoRegion: testRegion,
+                label: 'Test Connection',
+                domainUrl: testDomainUrl,
+                domainId: testDomainId,
+            }
+
+            assert.strictEqual(isValidSmusConnection(connectionWithoutScopes), false)
+        })
+
+        it('should return false for connection with empty scopes array', function () {
+            const connectionWithEmptyScopes = {
+                id: 'test-connection-id',
+                type: 'sso',
+                startUrl: testStartUrl,
+                ssoRegion: testRegion,
+                scopes: [],
+                label: 'Test Connection',
+                domainUrl: testDomainUrl,
+                domainId: testDomainId,
+            }
+
+            assert.strictEqual(isValidSmusConnection(connectionWithEmptyScopes), false)
+        })
+
+        it('should return true for connection with SMUS scope among other scopes', function () {
+            const connectionWithMultipleScopes = {
+                id: 'test-connection-id',
+                type: 'sso',
+                startUrl: testStartUrl,
+                ssoRegion: testRegion,
+                scopes: ['sso:account:access', scopeSmus, 'other:scope'],
+                label: 'Test SMUS Connection',
+                domainUrl: testDomainUrl,
+                domainId: testDomainId,
+            } as SmusConnection
+
+            assert.strictEqual(isValidSmusConnection(connectionWithMultipleScopes), true)
+        })
+
+        it('should return false for connection missing domainUrl', function () {
+            const connectionMissingDomainUrl = {
+                id: 'test-connection-id',
+                type: 'sso',
+                startUrl: testStartUrl,
+                ssoRegion: testRegion,
+                scopes: [scopeSmus],
+                label: 'Test Connection',
+                domainId: testDomainId,
+            }
+
+            assert.strictEqual(isValidSmusConnection(connectionMissingDomainUrl), false)
+        })
+
+        it('should return false for connection missing domainId', function () {
+            const connectionMissingDomainId = {
+                id: 'test-connection-id',
+                type: 'sso',
+                startUrl: testStartUrl,
+                ssoRegion: testRegion,
+                scopes: [scopeSmus],
+                label: 'Test Connection',
+                domainUrl: testDomainUrl,
+            }
+
+            assert.strictEqual(isValidSmusConnection(connectionMissingDomainId), false)
+        })
+    })
+
+    describe('SmusConnection interface', function () {
+        it('should extend both SmusProfile and SsoConnection', function () {
+            const connection = {
+                id: 'test-connection-id',
+                type: 'sso',
+                startUrl: testStartUrl,
+                ssoRegion: testRegion,
+                scopes: [scopeSmus],
+                label: 'Test SMUS Connection',
+                domainUrl: testDomainUrl,
+                domainId: testDomainId,
+            } as SmusConnection
+
+            // Should have Connection properties
+            assert.strictEqual(connection.id, 'test-connection-id')
+            assert.strictEqual(connection.label, 'Test SMUS Connection')
+
+            // Should have SsoConnection properties
+            assert.strictEqual(connection.type, 'sso')
+            assert.strictEqual(connection.startUrl, testStartUrl)
+            assert.strictEqual(connection.ssoRegion, testRegion)
+            assert.ok(Array.isArray(connection.scopes))
+
+            // Should have SmusProfile properties
+            assert.strictEqual(connection.domainUrl, testDomainUrl)
+            assert.strictEqual(connection.domainId, testDomainId)
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/auth/projectRoleCredentialsProvider.test.ts b/packages/core/src/test/sagemakerunifiedstudio/auth/projectRoleCredentialsProvider.test.ts
new file mode 100644
index 00000000000..6dd206593f8
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/auth/projectRoleCredentialsProvider.test.ts
@@ -0,0 +1,241 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import { ProjectRoleCredentialsProvider } from '../../../sagemakerunifiedstudio/auth/providers/projectRoleCredentialsProvider'
+import { DataZoneClient } from '../../../sagemakerunifiedstudio/shared/client/datazoneClient'
+import { ToolkitError } from '../../../shared/errors'
+
+describe('ProjectRoleCredentialsProvider', function () {
+    let mockDataZoneClient: sinon.SinonStubbedInstance<DataZoneClient>
+    let mockSmusAuthProvider: any
+    let projectProvider: ProjectRoleCredentialsProvider
+    let dataZoneClientStub: sinon.SinonStub
+
+    const testProjectId = 'test-project-123'
+    const testDomainId = 'dzd_testdomain'
+    const testRegion = 'us-east-2'
+
+    const mockGetEnvironmentCredentialsResponse = {
+        accessKeyId: 'AKIA-PROJECT-KEY',
+        secretAccessKey: 'project-secret-key',
+        sessionToken: 'project-session-token',
+        expiration: new Date(Date.now() + 14 * 60 * 1000), // 14 minutes as Date object
+        $metadata: {
+            httpStatusCode: 200,
+            requestId: 'test-request-id',
+        },
+    }
+
+    beforeEach(function () {
+        // Mock SMUS auth provider
+        mockSmusAuthProvider = {
+            getDomainId: sinon.stub().returns(testDomainId),
+            getDomainRegion: sinon.stub().returns(testRegion),
+            isConnected: sinon.stub().returns(true),
+        } as any
+
+        // Mock DataZone client
+        mockDataZoneClient = {
+            getProjectDefaultEnvironmentCreds: sinon.stub().resolves(mockGetEnvironmentCredentialsResponse),
+        } as any
+
+        // Stub DataZoneClient.getInstance
+        dataZoneClientStub = sinon.stub(DataZoneClient, 'getInstance').resolves(mockDataZoneClient as any)
+
+        projectProvider = new ProjectRoleCredentialsProvider(mockSmusAuthProvider, testProjectId)
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    describe('constructor', function () {
+        it('should initialize with DER provider and project ID', function () {
+            assert.strictEqual(projectProvider.getProjectId(), testProjectId)
+        })
+    })
+
+    describe('getCredentialsId', function () {
+        it('should return correct credentials ID', function () {
+            const credentialsId = projectProvider.getCredentialsId()
+            assert.strictEqual(credentialsId.credentialSource, 'temp')
+            assert.strictEqual(credentialsId.credentialTypeId, `${testDomainId}:${testProjectId}`)
+        })
+    })
+
+    describe('getProviderType', function () {
+        it('should return sso provider type', function () {
+            assert.strictEqual(projectProvider.getProviderType(), 'temp')
+        })
+    })
+
+    describe('getTelemetryType', function () {
+        it('should return smusProfile telemetry type', function () {
+            assert.strictEqual(projectProvider.getTelemetryType(), 'other')
+        })
+    })
+
+    describe('getDefaultRegion', function () {
+        it('should return DER provider default region', function () {
+            assert.strictEqual(projectProvider.getDefaultRegion(), testRegion)
+        })
+    })
+
+    describe('getHashCode', function () {
+        it('should return correct hash code', function () {
+            const hashCode = projectProvider.getHashCode()
+            assert.strictEqual(hashCode, `smus-project:${testDomainId}:${testProjectId}`)
+        })
+    })
+
+    describe('canAutoConnect', function () {
+        it('should return false', async function () {
+            const result = await projectProvider.canAutoConnect()
+            assert.strictEqual(result, false)
+        })
+    })
+
+    describe('isAvailable', function () {
+        it('should delegate to SMUS auth provider', async function () {
+            const result = await projectProvider.isAvailable()
+            assert.strictEqual(result, true)
+            assert.ok(mockSmusAuthProvider.isConnected.called)
+        })
+    })
+
+    describe('getCredentials', function () {
+        it('should fetch and cache project credentials', async function () {
+            const credentials = await projectProvider.getCredentials()
+
+            // Verify DataZone client getInstance was called
+            assert.ok(dataZoneClientStub.calledWith(mockSmusAuthProvider))
+
+            // Verify getProjectDefaultEnvironmentCreds was called
+            assert.ok(mockDataZoneClient.getProjectDefaultEnvironmentCreds.called)
+            assert.ok(mockDataZoneClient.getProjectDefaultEnvironmentCreds.calledWith(testProjectId))
+
+            // Verify returned credentials
+            assert.strictEqual(credentials.accessKeyId, mockGetEnvironmentCredentialsResponse.accessKeyId)
+            assert.strictEqual(credentials.secretAccessKey, mockGetEnvironmentCredentialsResponse.secretAccessKey)
+            assert.strictEqual(credentials.sessionToken, mockGetEnvironmentCredentialsResponse.sessionToken)
+            assert.ok(credentials.expiration)
+        })
+
+        it('should use cached credentials when available', async function () {
+            // First call should fetch credentials
+            const credentials1 = await projectProvider.getCredentials()
+
+            // Second call should use cache
+            const credentials2 = await projectProvider.getCredentials()
+
+            // DataZone client method should only be called once
+            assert.strictEqual(mockDataZoneClient.getProjectDefaultEnvironmentCreds.callCount, 1)
+
+            // Credentials should be the same
+            assert.strictEqual(credentials1, credentials2)
+        })
+
+        it('should handle DataZone client errors', async function () {
+            const error = new Error('DataZone client failed')
+            mockDataZoneClient.getProjectDefaultEnvironmentCreds.rejects(error)
+
+            await assert.rejects(
+                () => projectProvider.getCredentials(),
+                (err: ToolkitError) => {
+                    return err.code === 'ProjectCredentialsFetchFailed' && err.message.includes(testProjectId)
+                }
+            )
+        })
+
+        it('should handle GetEnvironmentCredentials API errors', async function () {
+            const error = new Error('API call failed')
+            mockDataZoneClient.getProjectDefaultEnvironmentCreds.rejects(error)
+
+            await assert.rejects(
+                () => projectProvider.getCredentials(),
+                (err: ToolkitError) => {
+                    return err.code === 'ProjectCredentialsFetchFailed'
+                }
+            )
+        })
+
+        it('should handle missing credentials in response', async function () {
+            mockDataZoneClient.getProjectDefaultEnvironmentCreds.resolves({
+                accessKeyId: undefined,
+                $metadata: {
+                    httpStatusCode: 200,
+                    requestId: 'test-request-id',
+                },
+            })
+
+            await assert.rejects(
+                () => projectProvider.getCredentials(),
+                (err: ToolkitError) => {
+                    return err.code === 'ProjectCredentialsFetchFailed'
+                }
+            )
+        })
+
+        it('should handle invalid credential fields', async function () {
+            const invalidResponse = {
+                accessKeyId: '', // Invalid empty string
+                secretAccessKey: 'valid-secret',
+                sessionToken: 'valid-token',
+                $metadata: {
+                    httpStatusCode: 200,
+                    requestId: 'test-request-id',
+                },
+            }
+            mockDataZoneClient.getProjectDefaultEnvironmentCreds.resolves(invalidResponse)
+
+            await assert.rejects(
+                () => projectProvider.getCredentials(),
+                (err: ToolkitError) => {
+                    return err.code === 'ProjectCredentialsFetchFailed'
+                }
+            )
+        })
+
+        it('should use default expiration when not provided in response', async function () {
+            const responseWithoutExpiration = {
+                accessKeyId: 'AKIA-PROJECT-KEY',
+                secretAccessKey: 'project-secret-key',
+                sessionToken: 'project-session-token',
+                // No expiration field
+                $metadata: {
+                    httpStatusCode: 200,
+                    requestId: 'test-request-id',
+                },
+            }
+            mockDataZoneClient.getProjectDefaultEnvironmentCreds.resolves(responseWithoutExpiration)
+
+            const credentials = await projectProvider.getCredentials()
+
+            // Should have expiration set to ~10 minutes from now
+            assert.ok(credentials.expiration)
+            const expirationTime = credentials.expiration!.getTime()
+            const expectedTime = Date.now() + 10 * 60 * 1000
+            const timeDiff = Math.abs(expirationTime - expectedTime)
+            assert.ok(timeDiff < 5000, 'Expiration should be ~10 minutes from now')
+        })
+    })
+
+    describe('invalidate', function () {
+        it('should clear cache and force fresh fetch on next call', async function () {
+            // First call to populate cache
+            await projectProvider.getCredentials()
+            assert.strictEqual(mockDataZoneClient.getProjectDefaultEnvironmentCreds.callCount, 1)
+
+            // Invalidate should clear cache
+            projectProvider.invalidate()
+
+            // Next call should fetch fresh credentials
+            await projectProvider.getCredentials()
+            assert.strictEqual(mockDataZoneClient.getProjectDefaultEnvironmentCreds.callCount, 2)
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/auth/smusAuthenticationProvider.test.ts b/packages/core/src/test/sagemakerunifiedstudio/auth/smusAuthenticationProvider.test.ts
new file mode 100644
index 00000000000..7cd2662f467
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/auth/smusAuthenticationProvider.test.ts
@@ -0,0 +1,760 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import * as vscode from 'vscode'
+
+// Mock the setContext function BEFORE importing modules that use it
+const setContextModule = require('../../../shared/vscode/setContext')
+
+import { SmusAuthenticationProvider } from '../../../sagemakerunifiedstudio/auth/providers/smusAuthenticationProvider'
+import { SmusConnection } from '../../../sagemakerunifiedstudio/auth/model'
+import { DataZoneClient } from '../../../sagemakerunifiedstudio/shared/client/datazoneClient'
+import { SmusUtils } from '../../../sagemakerunifiedstudio/shared/smusUtils'
+import * as smusUtils from '../../../sagemakerunifiedstudio/shared/smusUtils'
+import { ToolkitError } from '../../../shared/errors'
+import * as messages from '../../../shared/utilities/messages'
+import * as vscodeSetContext from '../../../shared/vscode/setContext'
+import * as resourceMetadataUtils from '../../../sagemakerunifiedstudio/shared/utils/resourceMetadataUtils'
+import { DefaultStsClient } from '../../../shared/clients/stsClient'
+
+describe('SmusAuthenticationProvider', function () {
+    let mockAuth: any
+    let mockSecondaryAuth: any
+    let mockDataZoneClient: sinon.SinonStubbedInstance<DataZoneClient>
+    let smusAuthProvider: SmusAuthenticationProvider
+    let extractDomainInfoStub: sinon.SinonStub
+    let getSsoInstanceInfoStub: sinon.SinonStub
+    let isInSmusSpaceEnvironmentStub: sinon.SinonStub
+    let executeCommandStub: sinon.SinonStub
+    let setContextStubGlobal: sinon.SinonStub
+    let mockSecondaryAuthState: {
+        activeConnection: SmusConnection | undefined
+        hasSavedConnection: boolean
+        isConnectionExpired: boolean
+    }
+
+    const testDomainUrl = 'https://dzd_domainId.sagemaker.us-east-2.on.aws'
+    const testDomainId = 'dzd_domainId'
+    const testRegion = 'us-east-2'
+    const testSsoInstanceInfo = {
+        issuerUrl: 'https://identitycenter.amazonaws.com/ssoins-testInstanceId',
+        ssoInstanceId: 'ssoins-testInstanceId',
+        clientId: 'arn:aws:sso::123456789:application/ssoins-testInstanceId/apl-testAppId',
+        region: testRegion,
+    }
+
+    const mockSmusConnection: SmusConnection = {
+        id: 'test-connection-id',
+        type: 'sso',
+        startUrl: 'https://identitycenter.amazonaws.com/ssoins-testInstanceId',
+        ssoRegion: testRegion,
+        scopes: ['datazone:domain:access'],
+        label: 'Test SMUS Connection',
+        domainUrl: testDomainUrl,
+        domainId: testDomainId,
+        getToken: sinon.stub().resolves({ accessToken: 'mock-token', expiresAt: new Date() }),
+        getRegistration: sinon.stub().resolves({ clientId: 'mock-client', expiresAt: new Date() }),
+    }
+
+    beforeEach(function () {
+        // Create the setContext stub
+        setContextStubGlobal = sinon.stub(setContextModule, 'setContext').resolves()
+
+        mockAuth = {
+            createConnection: sinon.stub().resolves(mockSmusConnection),
+            listConnections: sinon.stub().resolves([]),
+            getConnectionState: sinon.stub().returns('valid'),
+            reauthenticate: sinon.stub().resolves(mockSmusConnection),
+        } as any
+
+        // Create a mock object with configurable properties
+        mockSecondaryAuthState = {
+            activeConnection: mockSmusConnection as SmusConnection | undefined,
+            hasSavedConnection: false,
+            isConnectionExpired: false,
+        }
+
+        mockSecondaryAuth = {
+            get activeConnection() {
+                return mockSecondaryAuthState.activeConnection
+            },
+            get hasSavedConnection() {
+                return mockSecondaryAuthState.hasSavedConnection
+            },
+            get isConnectionExpired() {
+                return mockSecondaryAuthState.isConnectionExpired
+            },
+            onDidChangeActiveConnection: sinon.stub().returns({ dispose: sinon.stub() }),
+            restoreConnection: sinon.stub().resolves(),
+            useNewConnection: sinon.stub().resolves(mockSmusConnection),
+            deleteConnection: sinon.stub().resolves(),
+        }
+
+        mockDataZoneClient = {
+            // Add any DataZoneClient methods that might be used
+        } as any
+
+        // Stub static methods
+        sinon.stub(DataZoneClient, 'getInstance').returns(mockDataZoneClient as any)
+        extractDomainInfoStub = sinon
+            .stub(SmusUtils, 'extractDomainInfoFromUrl')
+            .returns({ domainId: testDomainId, region: testRegion })
+        getSsoInstanceInfoStub = sinon.stub(SmusUtils, 'getSsoInstanceInfo').resolves(testSsoInstanceInfo)
+        isInSmusSpaceEnvironmentStub = sinon.stub(SmusUtils, 'isInSmusSpaceEnvironment').returns(false)
+        executeCommandStub = sinon.stub(vscode.commands, 'executeCommand').resolves()
+        sinon.stub(require('../../../auth/secondaryAuth'), 'getSecondaryAuth').returns(mockSecondaryAuth)
+
+        smusAuthProvider = new SmusAuthenticationProvider(mockAuth, mockSecondaryAuth)
+
+        // Reset the executeCommand stub for clean state
+        executeCommandStub.resetHistory()
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    describe('constructor', function () {
+        it('should initialize with auth and secondary auth', function () {
+            assert.strictEqual(smusAuthProvider.auth, mockAuth)
+            assert.strictEqual(smusAuthProvider.secondaryAuth, mockSecondaryAuth)
+        })
+
+        it('should register event listeners', function () {
+            assert.ok(mockSecondaryAuth.onDidChangeActiveConnection.called)
+        })
+
+        it('should set initial context', async function () {
+            // Context should be set during construction (async call)
+            // Wait a bit for the async call to complete
+            await new Promise((resolve) => setTimeout(resolve, 0))
+            assert.ok(setContextStubGlobal.called)
+        })
+    })
+
+    describe('activeConnection', function () {
+        it('should return secondary auth active connection', function () {
+            assert.strictEqual(smusAuthProvider.activeConnection, mockSmusConnection)
+        })
+    })
+
+    describe('isUsingSavedConnection', function () {
+        it('should return secondary auth hasSavedConnection value', function () {
+            mockSecondaryAuthState.hasSavedConnection = true
+            assert.strictEqual(smusAuthProvider.isUsingSavedConnection, true)
+
+            mockSecondaryAuthState.hasSavedConnection = false
+            assert.strictEqual(smusAuthProvider.isUsingSavedConnection, false)
+        })
+    })
+
+    describe('isConnectionValid', function () {
+        it('should return true when connection exists and is not expired', function () {
+            mockSecondaryAuthState.activeConnection = mockSmusConnection
+            mockSecondaryAuthState.isConnectionExpired = false
+
+            assert.strictEqual(smusAuthProvider.isConnectionValid(), true)
+        })
+
+        it('should return false when no connection exists', function () {
+            mockSecondaryAuthState.activeConnection = undefined
+
+            assert.strictEqual(smusAuthProvider.isConnectionValid(), false)
+        })
+
+        it('should return false when connection is expired', function () {
+            mockSecondaryAuthState.activeConnection = mockSmusConnection
+            mockSecondaryAuthState.isConnectionExpired = true
+
+            assert.strictEqual(smusAuthProvider.isConnectionValid(), false)
+        })
+    })
+
+    describe('isConnected', function () {
+        it('should return true when active connection exists', function () {
+            mockSecondaryAuthState.activeConnection = mockSmusConnection
+            assert.strictEqual(smusAuthProvider.isConnected(), true)
+        })
+
+        it('should return false when no active connection', function () {
+            mockSecondaryAuthState.activeConnection = undefined
+            assert.strictEqual(smusAuthProvider.isConnected(), false)
+        })
+    })
+
+    describe('restore', function () {
+        it('should call secondary auth restoreConnection', async function () {
+            await smusAuthProvider.restore()
+            assert.ok(mockSecondaryAuth.restoreConnection.called)
+        })
+    })
+
+    describe('connectToSmus', function () {
+        it('should create new connection when none exists', async function () {
+            mockAuth.listConnections.resolves([])
+
+            const result = await smusAuthProvider.connectToSmus(testDomainUrl)
+
+            assert.strictEqual(result, mockSmusConnection)
+            assert.ok(extractDomainInfoStub.calledWith(testDomainUrl))
+            assert.ok(getSsoInstanceInfoStub.calledWith(testDomainUrl))
+            assert.ok(mockAuth.createConnection.called)
+            assert.ok(mockSecondaryAuth.useNewConnection.called)
+            assert.ok(executeCommandStub.calledWith('aws.smus.switchProject'))
+        })
+
+        it('should reuse existing valid connection', async function () {
+            const existingConnection = { ...mockSmusConnection, domainUrl: testDomainUrl.toLowerCase() }
+            mockAuth.listConnections.resolves([existingConnection])
+            mockAuth.getConnectionState.returns('valid')
+
+            const result = await smusAuthProvider.connectToSmus(testDomainUrl)
+
+            assert.strictEqual(result, mockSmusConnection)
+            assert.ok(mockAuth.createConnection.notCalled)
+            assert.ok(mockSecondaryAuth.useNewConnection.calledWith(existingConnection))
+            assert.ok(executeCommandStub.calledWith('aws.smus.switchProject'))
+        })
+
+        it('should reauthenticate existing invalid connection', async function () {
+            const existingConnection = { ...mockSmusConnection, domainUrl: testDomainUrl.toLowerCase() }
+            mockAuth.listConnections.resolves([existingConnection])
+            mockAuth.getConnectionState.returns('invalid')
+
+            const result = await smusAuthProvider.connectToSmus(testDomainUrl)
+
+            assert.strictEqual(result, mockSmusConnection)
+            assert.ok(mockAuth.reauthenticate.calledWith(existingConnection))
+            assert.ok(mockSecondaryAuth.useNewConnection.called)
+            assert.ok(executeCommandStub.calledWith('aws.smus.switchProject'))
+        })
+
+        it('should throw error for invalid domain URL', async function () {
+            extractDomainInfoStub.returns({ domainId: undefined, region: testRegion })
+
+            await assert.rejects(
+                () => smusAuthProvider.connectToSmus('invalid-url'),
+                (err: ToolkitError) => {
+                    // The error is wrapped with FailedToConnect, but the original error should be in the cause
+                    return err.code === 'FailedToConnect' && (err.cause as any)?.code === 'InvalidDomainUrl'
+                }
+            )
+            // Should not trigger project selection on error
+            assert.ok(executeCommandStub.notCalled)
+        })
+
+        it('should handle SmusUtils errors', async function () {
+            const error = new Error('SmusUtils error')
+            getSsoInstanceInfoStub.rejects(error)
+
+            await assert.rejects(
+                () => smusAuthProvider.connectToSmus(testDomainUrl),
+                (err: ToolkitError) => err.code === 'FailedToConnect'
+            )
+            // Should not trigger project selection on error
+            assert.ok(executeCommandStub.notCalled)
+        })
+
+        it('should handle auth creation errors', async function () {
+            const error = new Error('Auth creation failed')
+            mockAuth.createConnection.rejects(error)
+
+            await assert.rejects(
+                () => smusAuthProvider.connectToSmus(testDomainUrl),
+                (err: ToolkitError) => err.code === 'FailedToConnect'
+            )
+            // Should not trigger project selection on error
+            assert.ok(executeCommandStub.notCalled)
+        })
+
+        it('should not trigger project selection in SMUS space environment', async function () {
+            isInSmusSpaceEnvironmentStub.returns(true)
+            mockAuth.listConnections.resolves([])
+
+            const result = await smusAuthProvider.connectToSmus(testDomainUrl)
+
+            assert.strictEqual(result, mockSmusConnection)
+            assert.ok(mockAuth.createConnection.called)
+            assert.ok(mockSecondaryAuth.useNewConnection.called)
+            assert.ok(executeCommandStub.notCalled)
+        })
+
+        it('should not trigger project selection when reusing connection in SMUS space environment', async function () {
+            isInSmusSpaceEnvironmentStub.returns(true)
+            const existingConnection = { ...mockSmusConnection, domainUrl: testDomainUrl.toLowerCase() }
+            mockAuth.listConnections.resolves([existingConnection])
+            mockAuth.getConnectionState.returns('valid')
+
+            const result = await smusAuthProvider.connectToSmus(testDomainUrl)
+
+            assert.strictEqual(result, mockSmusConnection)
+            assert.ok(mockSecondaryAuth.useNewConnection.calledWith(existingConnection))
+            assert.ok(executeCommandStub.notCalled)
+        })
+
+        it('should not trigger project selection when reauthenticating in SMUS space environment', async function () {
+            isInSmusSpaceEnvironmentStub.returns(true)
+            const existingConnection = { ...mockSmusConnection, domainUrl: testDomainUrl.toLowerCase() }
+            mockAuth.listConnections.resolves([existingConnection])
+            mockAuth.getConnectionState.returns('invalid')
+
+            const result = await smusAuthProvider.connectToSmus(testDomainUrl)
+
+            assert.strictEqual(result, mockSmusConnection)
+            assert.ok(mockAuth.reauthenticate.calledWith(existingConnection))
+            assert.ok(mockSecondaryAuth.useNewConnection.called)
+            assert.ok(executeCommandStub.notCalled)
+        })
+    })
+
+    describe('reauthenticate', function () {
+        it('should call auth reauthenticate', async function () {
+            const result = await smusAuthProvider.reauthenticate(mockSmusConnection)
+
+            assert.strictEqual(result, mockSmusConnection)
+            assert.ok(mockAuth.reauthenticate.calledWith(mockSmusConnection))
+        })
+
+        it('should wrap auth errors in ToolkitError', async function () {
+            const error = new Error('Reauthentication failed')
+            mockAuth.reauthenticate.rejects(error)
+
+            await assert.rejects(
+                () => smusAuthProvider.reauthenticate(mockSmusConnection),
+                (err: ToolkitError) => err.message.includes('Unable to reauthenticate')
+            )
+        })
+    })
+
+    describe('showReauthenticationPrompt', function () {
+        it('should show reauthentication message', async function () {
+            const showReauthenticateMessageStub = sinon.stub(messages, 'showReauthenticateMessage').resolves()
+
+            await smusAuthProvider.showReauthenticationPrompt(mockSmusConnection)
+
+            assert.ok(showReauthenticateMessageStub.called)
+            const callArgs = showReauthenticateMessageStub.firstCall.args[0]
+            assert.ok(callArgs.message.includes('SageMaker Unified Studio'))
+            assert.strictEqual(callArgs.suppressId, 'smusConnectionExpired')
+        })
+    })
+
+    describe('getAccessToken', function () {
+        beforeEach(function () {
+            mockSecondaryAuthState.activeConnection = mockSmusConnection
+            mockAuth.getSsoAccessToken = sinon.stub().resolves('mock-access-token')
+            mockAuth.invalidateConnection = sinon.stub()
+        })
+
+        it('should return access token when successful', async function () {
+            const token = await smusAuthProvider.getAccessToken()
+
+            assert.strictEqual(token, 'mock-access-token')
+            assert.ok(mockAuth.getSsoAccessToken.calledWith(mockSmusConnection))
+        })
+
+        it('should throw error when no active connection', async function () {
+            mockSecondaryAuthState.activeConnection = undefined
+
+            await assert.rejects(
+                () => smusAuthProvider.getAccessToken(),
+                (err: ToolkitError) => err.code === 'NoActiveConnection'
+            )
+        })
+
+        it('should handle InvalidGrantException and mark connection for reauthentication', async function () {
+            const invalidGrantError = new Error('UnknownError')
+            invalidGrantError.name = 'InvalidGrantException'
+            mockAuth.getSsoAccessToken.rejects(invalidGrantError)
+
+            await assert.rejects(
+                () => smusAuthProvider.getAccessToken(),
+                (err: ToolkitError) => {
+                    return (
+                        err.code === 'RedeemAccessTokenFailed' &&
+                        err.message.includes('Failed to retrieve SSO access token for connection')
+                    )
+                }
+            )
+
+            // Verify connection was NOT invalidated (current implementation doesn't handle InvalidGrantException specially)
+            assert.ok(mockAuth.invalidateConnection.notCalled)
+        })
+
+        it('should handle other errors normally', async function () {
+            const genericError = new Error('Network error')
+            mockAuth.getSsoAccessToken.rejects(genericError)
+
+            await assert.rejects(
+                () => smusAuthProvider.getAccessToken(),
+                (err: ToolkitError) =>
+                    err.message.includes('Failed to retrieve SSO access token for connection') &&
+                    err.code === 'RedeemAccessTokenFailed'
+            )
+
+            // Verify connection was NOT invalidated for generic errors
+            assert.ok(mockAuth.invalidateConnection.notCalled)
+        })
+    })
+
+    describe('fromContext', function () {
+        it('should return singleton instance', function () {
+            const instance1 = SmusAuthenticationProvider.fromContext()
+            const instance2 = SmusAuthenticationProvider.fromContext()
+
+            assert.strictEqual(instance1, instance2)
+        })
+
+        it('should return instance property', function () {
+            const instance = SmusAuthenticationProvider.fromContext()
+            assert.strictEqual(SmusAuthenticationProvider.instance, instance)
+        })
+    })
+
+    describe('getDomainAccountId', function () {
+        let getContextStub: sinon.SinonStub
+        let getResourceMetadataStub: sinon.SinonStub
+        let getDerCredentialsProviderStub: sinon.SinonStub
+        let getDomainRegionStub: sinon.SinonStub
+        let mockStsClient: any
+        let mockCredentialsProvider: any
+
+        beforeEach(function () {
+            // Mock dependencies
+            getContextStub = sinon.stub(vscodeSetContext, 'getContext')
+            getResourceMetadataStub = sinon.stub(resourceMetadataUtils, 'getResourceMetadata')
+
+            // Mock STS client
+            mockStsClient = {
+                getCallerIdentity: sinon.stub(),
+            }
+            sinon
+                .stub(DefaultStsClient.prototype, 'getCallerIdentity')
+                .callsFake(() => mockStsClient.getCallerIdentity())
+
+            // Mock credentials provider
+            mockCredentialsProvider = {
+                getCredentials: sinon.stub().resolves({
+                    accessKeyId: 'test-key',
+                    secretAccessKey: 'test-secret',
+                    sessionToken: 'test-token',
+                }),
+            }
+
+            // Stub methods on the provider instance
+            getDerCredentialsProviderStub = sinon
+                .stub(smusAuthProvider, 'getDerCredentialsProvider')
+                .resolves(mockCredentialsProvider)
+            getDomainRegionStub = sinon.stub(smusAuthProvider, 'getDomainRegion').returns('us-east-1')
+
+            // Reset cached value
+            smusAuthProvider['cachedDomainAccountId'] = undefined
+        })
+
+        afterEach(function () {
+            sinon.restore()
+        })
+
+        describe('when cached value exists', function () {
+            it('should return cached account ID without making any calls', async function () {
+                const cachedAccountId = '123456789012'
+                smusAuthProvider['cachedDomainAccountId'] = cachedAccountId
+
+                const result = await smusAuthProvider.getDomainAccountId()
+
+                assert.strictEqual(result, cachedAccountId)
+                assert.ok(getContextStub.notCalled)
+                assert.ok(getResourceMetadataStub.notCalled)
+                assert.ok(mockStsClient.getCallerIdentity.notCalled)
+            })
+        })
+
+        describe('in SMUS space environment', function () {
+            let extractAccountIdFromResourceMetadataStub: sinon.SinonStub
+
+            beforeEach(function () {
+                getContextStub.withArgs('aws.smus.inSmusSpaceEnvironment').returns(true)
+                extractAccountIdFromResourceMetadataStub = sinon
+                    .stub(smusUtils, 'extractAccountIdFromResourceMetadata')
+                    .resolves('123456789012')
+            })
+
+            it('should extract account from resource metadata and cache result', async function () {
+                const testAccountId = '123456789012'
+
+                const result = await smusAuthProvider.getDomainAccountId()
+
+                assert.strictEqual(result, testAccountId)
+                assert.strictEqual(smusAuthProvider['cachedDomainAccountId'], testAccountId)
+                assert.ok(extractAccountIdFromResourceMetadataStub.called)
+                assert.ok(mockStsClient.getCallerIdentity.notCalled)
+            })
+
+            it('should throw error when extractAccountIdFromResourceMetadata fails', async function () {
+                extractAccountIdFromResourceMetadataStub.rejects(new ToolkitError('Metadata extraction failed'))
+
+                await assert.rejects(
+                    () => smusAuthProvider.getDomainAccountId(),
+                    (err: ToolkitError) => err.message.includes('Metadata extraction failed')
+                )
+
+                assert.strictEqual(smusAuthProvider['cachedDomainAccountId'], undefined)
+            })
+        })
+
+        describe('in non-SMUS space environment', function () {
+            beforeEach(function () {
+                getContextStub.withArgs('aws.smus.inSmusSpaceEnvironment').returns(false)
+                mockSecondaryAuthState.activeConnection = mockSmusConnection
+            })
+
+            it('should use STS GetCallerIdentity to get account ID and cache it', async function () {
+                const testAccountId = '123456789012'
+                mockStsClient.getCallerIdentity.resolves({
+                    Account: testAccountId,
+                    UserId: 'test-user-id',
+                    Arn: 'arn:aws:sts::123456789012:assumed-role/test-role/test-session',
+                })
+
+                const result = await smusAuthProvider.getDomainAccountId()
+
+                assert.strictEqual(result, testAccountId)
+                assert.strictEqual(smusAuthProvider['cachedDomainAccountId'], testAccountId)
+                assert.ok(getDerCredentialsProviderStub.called)
+                assert.ok(getDomainRegionStub.called)
+                assert.ok(mockCredentialsProvider.getCredentials.called)
+                assert.ok(mockStsClient.getCallerIdentity.called)
+            })
+
+            it('should throw error when no active connection exists', async function () {
+                mockSecondaryAuthState.activeConnection = undefined
+
+                await assert.rejects(
+                    () => smusAuthProvider.getDomainAccountId(),
+                    (err: ToolkitError) => {
+                        return (
+                            err.code === 'NoActiveConnection' &&
+                            err.message.includes('No active SMUS connection available')
+                        )
+                    }
+                )
+
+                assert.strictEqual(smusAuthProvider['cachedDomainAccountId'], undefined)
+                assert.ok(getDerCredentialsProviderStub.notCalled)
+                assert.ok(mockStsClient.getCallerIdentity.notCalled)
+            })
+
+            it('should throw error when STS GetCallerIdentity fails', async function () {
+                mockStsClient.getCallerIdentity.rejects(new Error('STS call failed'))
+
+                await assert.rejects(
+                    () => smusAuthProvider.getDomainAccountId(),
+                    (err: ToolkitError) => {
+                        return (
+                            err.code === 'GetDomainAccountIdFailed' &&
+                            err.message.includes('Failed to retrieve AWS account ID for active domain connection')
+                        )
+                    }
+                )
+
+                assert.strictEqual(smusAuthProvider['cachedDomainAccountId'], undefined)
+            })
+        })
+    })
+
+    describe('getProjectAccountId', function () {
+        let getContextStub: sinon.SinonStub
+        let extractAccountIdFromResourceMetadataStub: sinon.SinonStub
+        let getProjectCredentialProviderStub: sinon.SinonStub
+        let mockProjectCredentialsProvider: any
+        let mockStsClient: any
+        let mockDataZoneClientForProject: any
+
+        const testProjectId = 'test-project-id'
+        const testAccountId = '123456789012'
+        const testRegion = 'us-east-1'
+
+        beforeEach(function () {
+            // Mock dependencies
+            getContextStub = sinon.stub(vscodeSetContext, 'getContext')
+            extractAccountIdFromResourceMetadataStub = sinon
+                .stub(smusUtils, 'extractAccountIdFromResourceMetadata')
+                .resolves(testAccountId)
+
+            // Mock project credentials provider
+            mockProjectCredentialsProvider = {
+                getCredentials: sinon.stub().resolves({
+                    accessKeyId: 'test-key',
+                    secretAccessKey: 'test-secret',
+                    sessionToken: 'test-token',
+                }),
+            }
+            getProjectCredentialProviderStub = sinon
+                .stub(smusAuthProvider, 'getProjectCredentialProvider')
+                .resolves(mockProjectCredentialsProvider)
+
+            // Update the existing mockDataZoneClient to include getToolingEnvironment
+            mockDataZoneClientForProject = {
+                getToolingEnvironment: sinon.stub().resolves({
+                    awsAccountRegion: testRegion,
+                    projectId: testProjectId,
+                    domainId: testDomainId,
+                    createdBy: 'test-user',
+                    name: 'test-environment',
+                    id: 'test-env-id',
+                    status: 'ACTIVE',
+                }),
+            }
+            // Update the existing mockDataZoneClient instead of creating a new stub
+            Object.assign(mockDataZoneClient, mockDataZoneClientForProject)
+
+            // Mock STS client
+            mockStsClient = {
+                getCallerIdentity: sinon.stub().resolves({
+                    Account: testAccountId,
+                    UserId: 'test-user-id',
+                    Arn: 'arn:aws:sts::123456789012:assumed-role/test-role/test-session',
+                }),
+            }
+
+            // Clear cache
+            smusAuthProvider['cachedProjectAccountIds'].clear()
+            mockSecondaryAuthState.activeConnection = mockSmusConnection
+        })
+
+        afterEach(function () {
+            sinon.restore()
+        })
+
+        describe('when cached value exists', function () {
+            it('should return cached project account ID without making any calls', async function () {
+                smusAuthProvider['cachedProjectAccountIds'].set(testProjectId, testAccountId)
+
+                const result = await smusAuthProvider.getProjectAccountId(testProjectId)
+
+                assert.strictEqual(result, testAccountId)
+                assert.ok(getContextStub.notCalled)
+                assert.ok(extractAccountIdFromResourceMetadataStub.notCalled)
+                assert.ok(getProjectCredentialProviderStub.notCalled)
+                assert.ok(mockStsClient.getCallerIdentity.notCalled)
+            })
+        })
+
+        describe('in SMUS space environment', function () {
+            beforeEach(function () {
+                getContextStub.withArgs('aws.smus.inSmusSpaceEnvironment').returns(true)
+            })
+
+            it('should extract account ID from resource metadata and cache it', async function () {
+                const result = await smusAuthProvider.getProjectAccountId(testProjectId)
+
+                assert.strictEqual(result, testAccountId)
+                assert.strictEqual(smusAuthProvider['cachedProjectAccountIds'].get(testProjectId), testAccountId)
+                assert.ok(extractAccountIdFromResourceMetadataStub.called)
+                assert.ok(getProjectCredentialProviderStub.notCalled)
+                assert.ok(mockStsClient.getCallerIdentity.notCalled)
+            })
+
+            it('should throw error when extractAccountIdFromResourceMetadata fails', async function () {
+                extractAccountIdFromResourceMetadataStub.rejects(new ToolkitError('Metadata extraction failed'))
+
+                await assert.rejects(
+                    () => smusAuthProvider.getProjectAccountId(testProjectId),
+                    (err: ToolkitError) => err.message.includes('Metadata extraction failed')
+                )
+
+                assert.ok(!smusAuthProvider['cachedProjectAccountIds'].has(testProjectId))
+            })
+        })
+
+        describe('in non-SMUS space environment', function () {
+            let stsConstructorStub: sinon.SinonStub
+
+            beforeEach(function () {
+                getContextStub.withArgs('aws.smus.inSmusSpaceEnvironment').returns(false)
+                // Stub the DefaultStsClient constructor to return our mock instance
+                const stsClientModule = require('../../../shared/clients/stsClient')
+                stsConstructorStub = sinon.stub(stsClientModule, 'DefaultStsClient').callsFake(() => mockStsClient)
+            })
+
+            afterEach(function () {
+                if (stsConstructorStub) {
+                    stsConstructorStub.restore()
+                }
+            })
+
+            it('should use project credentials with STS to get account ID and cache it', async function () {
+                const result = await smusAuthProvider.getProjectAccountId(testProjectId)
+
+                assert.strictEqual(result, testAccountId)
+                assert.strictEqual(smusAuthProvider['cachedProjectAccountIds'].get(testProjectId), testAccountId)
+                assert.ok(getProjectCredentialProviderStub.calledWith(testProjectId))
+                assert.ok(mockProjectCredentialsProvider.getCredentials.called)
+                assert.ok((DataZoneClient.getInstance as sinon.SinonStub).called)
+                assert.ok(mockDataZoneClientForProject.getToolingEnvironment.calledWith(testProjectId))
+                assert.ok(mockStsClient.getCallerIdentity.called)
+            })
+
+            it('should throw error when no active connection exists', async function () {
+                mockSecondaryAuthState.activeConnection = undefined
+
+                await assert.rejects(
+                    () => smusAuthProvider.getProjectAccountId(testProjectId),
+                    (err: ToolkitError) => {
+                        return (
+                            err.code === 'NoActiveConnection' &&
+                            err.message.includes('No active SMUS connection available')
+                        )
+                    }
+                )
+
+                assert.ok(!smusAuthProvider['cachedProjectAccountIds'].has(testProjectId))
+            })
+
+            it('should throw error when tooling environment has no region', async function () {
+                mockDataZoneClientForProject.getToolingEnvironment.resolves({
+                    id: 'env-123',
+                    awsAccountRegion: undefined,
+                    projectId: undefined,
+                    domainId: undefined,
+                    createdBy: undefined,
+                    name: undefined,
+                    provider: undefined,
+                    $metadata: {},
+                })
+
+                await assert.rejects(
+                    () => smusAuthProvider.getProjectAccountId(testProjectId),
+                    (err: ToolkitError) => {
+                        return (
+                            err.message.includes('Failed to get project account ID') &&
+                            err.message.includes('No AWS account region found in tooling environment')
+                        )
+                    }
+                )
+
+                assert.ok(!smusAuthProvider['cachedProjectAccountIds'].has(testProjectId))
+            })
+
+            it('should throw error when STS GetCallerIdentity fails', async function () {
+                mockStsClient.getCallerIdentity.rejects(new Error('STS call failed'))
+
+                await assert.rejects(
+                    () => smusAuthProvider.getProjectAccountId(testProjectId),
+                    (err: ToolkitError) => {
+                        return (
+                            err.message.includes('Failed to get project account ID') &&
+                            err.message.includes('STS call failed')
+                        )
+                    }
+                )
+
+                assert.ok(!smusAuthProvider['cachedProjectAccountIds'].has(testProjectId))
+            })
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/connectionMagicsSelector/activation.test.ts b/packages/core/src/test/sagemakerunifiedstudio/connectionMagicsSelector/activation.test.ts
new file mode 100644
index 00000000000..86e37c76444
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/connectionMagicsSelector/activation.test.ts
@@ -0,0 +1,11 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+
+describe('Connection magic selector test', function () {
+    it('example test', function () {
+        assert.ok(true)
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/explorer/activation.test.ts b/packages/core/src/test/sagemakerunifiedstudio/explorer/activation.test.ts
new file mode 100644
index 00000000000..982aa481bd3
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/explorer/activation.test.ts
@@ -0,0 +1,449 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import * as vscode from 'vscode'
+import { activate } from '../../../sagemakerunifiedstudio/explorer/activation'
+import {
+    SmusAuthenticationProvider,
+    setSmusConnectedContext,
+} from '../../../sagemakerunifiedstudio/auth/providers/smusAuthenticationProvider'
+import { DataZoneClient } from '../../../sagemakerunifiedstudio/shared/client/datazoneClient'
+import { ResourceTreeDataProvider } from '../../../shared/treeview/resourceTreeDataProvider'
+import { SageMakerUnifiedStudioRootNode } from '../../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioRootNode'
+import { getLogger } from '../../../shared/logger/logger'
+import { getTestWindow } from '../../shared/vscode/window'
+import { SeverityLevel } from '../../shared/vscode/message'
+import * as extensionUtilities from '../../../shared/extensionUtilities'
+import { createMockSpaceNode } from '../testUtils'
+
+describe('SMUS Explorer Activation', function () {
+    let mockExtensionContext: vscode.ExtensionContext
+    let mockSmusAuthProvider: sinon.SinonStubbedInstance<SmusAuthenticationProvider>
+    let mockTreeView: sinon.SinonStubbedInstance<vscode.TreeView<any>>
+    let mockTreeDataProvider: sinon.SinonStubbedInstance<ResourceTreeDataProvider>
+    let mockSmusRootNode: sinon.SinonStubbedInstance<SageMakerUnifiedStudioRootNode>
+    let createTreeViewStub: sinon.SinonStub
+    let registerCommandStub: sinon.SinonStub
+    let dataZoneDisposeStub: sinon.SinonStub
+    let setupUserActivityMonitoringStub: sinon.SinonStub
+
+    beforeEach(async function () {
+        mockExtensionContext = {
+            subscriptions: [],
+        } as any
+
+        mockSmusAuthProvider = {
+            restore: sinon.stub().resolves(),
+            isConnected: sinon.stub().returns(true),
+            reauthenticate: sinon.stub().resolves(),
+            onDidChange: sinon.stub().callsFake((_listener: () => void) => ({ dispose: sinon.stub() })),
+            activeConnection: {
+                id: 'test-connection',
+                domainId: 'test-domain',
+                ssoRegion: 'us-east-1',
+            },
+            getDomainAccountId: sinon.stub().resolves('123456789012'),
+        } as any
+
+        mockTreeView = {
+            dispose: sinon.stub(),
+        } as any
+
+        mockTreeDataProvider = {
+            refresh: sinon.stub(),
+        } as any
+
+        mockSmusRootNode = {
+            getChildren: sinon.stub().resolves([]),
+            getProjectSelectNode: sinon.stub().returns({ refreshNode: sinon.stub().resolves() }),
+        } as any
+
+        // Stub vscode APIs
+        createTreeViewStub = sinon.stub(vscode.window, 'createTreeView').returns(mockTreeView as any)
+        registerCommandStub = sinon.stub(vscode.commands, 'registerCommand').returns({ dispose: sinon.stub() } as any)
+
+        // Stub SmusAuthenticationProvider
+        sinon.stub(SmusAuthenticationProvider, 'fromContext').returns(mockSmusAuthProvider as any)
+
+        // Stub DataZoneClient
+        dataZoneDisposeStub = sinon.stub(DataZoneClient, 'dispose')
+
+        // Stub SageMakerUnifiedStudioRootNode constructor
+        sinon.stub(SageMakerUnifiedStudioRootNode.prototype, 'getChildren').returns(mockSmusRootNode.getChildren())
+        sinon
+            .stub(SageMakerUnifiedStudioRootNode.prototype, 'getProjectSelectNode')
+            .returns(mockSmusRootNode.getProjectSelectNode())
+
+        // Stub ResourceTreeDataProvider constructor
+        sinon.stub(ResourceTreeDataProvider.prototype, 'refresh').value(mockTreeDataProvider.refresh)
+
+        // Stub logger
+        sinon.stub({ getLogger }, 'getLogger').returns({
+            debug: sinon.stub(),
+            info: sinon.stub(),
+            error: sinon.stub(),
+        } as any)
+
+        // Stub setSmusConnectedContext
+        sinon.stub({ setSmusConnectedContext }, 'setSmusConnectedContext').resolves()
+
+        // Stub setupUserActivityMonitoring
+        setupUserActivityMonitoringStub = sinon
+            .stub(require('../../../awsService/sagemaker/sagemakerSpace'), 'setupUserActivityMonitoring')
+            .resolves()
+
+        // Stub isSageMaker to return true for SMUS
+        sinon.stub(extensionUtilities, 'isSageMaker').returns(true)
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    describe('activate', function () {
+        it('should initialize SMUS authentication provider and call restore', async function () {
+            await activate(mockExtensionContext)
+
+            assert.ok((SmusAuthenticationProvider.fromContext as sinon.SinonStub).called)
+            assert.ok(mockSmusAuthProvider.restore.called)
+        })
+
+        it('should create tree view with correct configuration', async function () {
+            await activate(mockExtensionContext)
+
+            assert.ok(createTreeViewStub.calledWith('aws.smus.rootView'))
+            const createTreeViewArgs = createTreeViewStub.firstCall.args[1]
+            assert.ok('treeDataProvider' in createTreeViewArgs)
+        })
+
+        it('should register all required commands', async function () {
+            await activate(mockExtensionContext)
+
+            // Check that commands are registered
+            const registeredCommands = registerCommandStub.getCalls().map((call) => call.args[0])
+
+            assert.ok(registeredCommands.includes('aws.smus.rootView.refresh'))
+            assert.ok(registeredCommands.includes('aws.smus.projectView'))
+            assert.ok(registeredCommands.includes('aws.smus.refreshProject'))
+            assert.ok(registeredCommands.includes('aws.smus.switchProject'))
+            assert.ok(registeredCommands.includes('aws.smus.stopSpace'))
+            assert.ok(registeredCommands.includes('aws.smus.openRemoteConnection'))
+            assert.ok(registeredCommands.includes('aws.smus.reauthenticate'))
+        })
+
+        it('should add all disposables to extension context subscriptions', async function () {
+            await activate(mockExtensionContext)
+
+            // Should have multiple subscriptions added
+            assert.ok(mockExtensionContext.subscriptions.length > 0)
+        })
+
+        it('should refresh tree data provider on initialization', async function () {
+            await activate(mockExtensionContext)
+
+            assert.ok(mockTreeDataProvider.refresh.called)
+        })
+
+        it('should register DataZone client disposal', async function () {
+            await activate(mockExtensionContext)
+
+            // Find the DataZone dispose subscription - it should be the last one added
+            const subscriptions = mockExtensionContext.subscriptions
+            assert.ok(subscriptions.length > 0)
+
+            // The DataZone dispose subscription should be among the subscriptions
+            let dataZoneDisposeFound = false
+            for (const subscription of subscriptions) {
+                if (subscription && typeof subscription.dispose === 'function') {
+                    // Try calling dispose and see if it calls DataZoneClient.dispose
+                    const callCountBefore = dataZoneDisposeStub.callCount
+                    subscription.dispose()
+                    if (dataZoneDisposeStub.callCount > callCountBefore) {
+                        dataZoneDisposeFound = true
+                        break
+                    }
+                }
+            }
+
+            assert.ok(dataZoneDisposeFound, 'Should register DataZone client disposal')
+        })
+
+        describe('command handlers', function () {
+            beforeEach(async function () {
+                await activate(mockExtensionContext)
+            })
+
+            it('should handle aws.smus.rootView.refresh command', async function () {
+                const refreshCommand = registerCommandStub
+                    .getCalls()
+                    .find((call) => call.args[0] === 'aws.smus.rootView.refresh')
+
+                assert.ok(refreshCommand)
+
+                // Execute the command handler
+                await refreshCommand.args[1]()
+
+                assert.ok(mockTreeDataProvider.refresh.called)
+            })
+
+            it('should handle aws.smus.reauthenticate command with connection', async function () {
+                const reauthCommand = registerCommandStub
+                    .getCalls()
+                    .find((call) => call.args[0] === 'aws.smus.reauthenticate')
+
+                assert.ok(reauthCommand)
+
+                const mockConnection = {
+                    id: 'test-connection',
+                    type: 'sso',
+                    startUrl: 'https://identitycenter.amazonaws.com/ssoins-testInstanceId',
+                    ssoRegion: 'us-east-1',
+                    scopes: ['datazone:domain:access'],
+                    label: 'Test Connection',
+                } as any
+
+                const testWindow = getTestWindow()
+
+                // Execute the command handler with connection
+                await reauthCommand.args[1](mockConnection)
+
+                assert.ok(mockSmusAuthProvider.reauthenticate.calledWith(mockConnection))
+                assert.ok(mockTreeDataProvider.refresh.called)
+
+                // Check that an information message was shown
+                const infoMessages = testWindow.shownMessages.filter(
+                    (msg) => msg.severity === SeverityLevel.Information
+                )
+                assert.ok(infoMessages.length > 0, 'Should show information message')
+                assert.ok(infoMessages.some((msg) => msg.message.includes('Successfully reauthenticated')))
+            })
+
+            it('should handle aws.smus.reauthenticate command without connection', async function () {
+                const reauthCommand = registerCommandStub
+                    .getCalls()
+                    .find((call) => call.args[0] === 'aws.smus.reauthenticate')
+
+                assert.ok(reauthCommand)
+
+                // Execute the command handler without connection
+                await reauthCommand.args[1]()
+
+                assert.ok(mockSmusAuthProvider.reauthenticate.notCalled)
+            })
+
+            it('should handle reauthentication errors', async function () {
+                const reauthCommand = registerCommandStub
+                    .getCalls()
+                    .find((call) => call.args[0] === 'aws.smus.reauthenticate')
+
+                assert.ok(reauthCommand)
+
+                const mockConnection = {
+                    id: 'test-connection',
+                    type: 'sso',
+                    startUrl: 'https://identitycenter.amazonaws.com/ssoins-testInstanceId',
+                    ssoRegion: 'us-east-1',
+                    scopes: ['datazone:domain:access'],
+                    label: 'Test Connection',
+                } as any
+                const error = new Error('Reauthentication failed')
+                mockSmusAuthProvider.reauthenticate.rejects(error)
+
+                const testWindow = getTestWindow()
+
+                // Execute the command handler
+                await reauthCommand.args[1](mockConnection)
+
+                // Check that an error message was shown
+                const errorMessages = testWindow.shownMessages.filter((msg) => msg.severity === SeverityLevel.Error)
+                assert.ok(errorMessages.length > 0, 'Should show error message')
+                assert.ok(errorMessages.some((msg) => msg.message.includes('Failed to reauthenticate')))
+            })
+
+            it('should handle aws.smus.refreshProject command', async function () {
+                const refreshProjectCommand = registerCommandStub
+                    .getCalls()
+                    .find((call) => call.args[0] === 'aws.smus.refreshProject')
+
+                assert.ok(refreshProjectCommand)
+
+                // Execute the command handler
+                await refreshProjectCommand.args[1]()
+
+                // Verify that getProjectSelectNode was called and refreshNode was called on the returned node
+                assert.ok(mockSmusRootNode.getProjectSelectNode.called)
+                const projectNode = mockSmusRootNode.getProjectSelectNode()
+                assert.ok((projectNode.refreshNode as sinon.SinonStub).called)
+            })
+
+            it('should handle aws.smus.stopSpace command with valid node', async function () {
+                const stopSpaceCommand = registerCommandStub
+                    .getCalls()
+                    .find((call) => call.args[0] === 'aws.smus.stopSpace')
+
+                assert.ok(stopSpaceCommand)
+
+                const mockSpaceNode = createMockSpaceNode()
+
+                // Mock the stopSpace function
+                const stopSpaceStub = sinon.stub()
+                sinon.stub(require('../../../awsService/sagemaker/commands'), 'stopSpace').value(stopSpaceStub)
+
+                // Execute the command handler
+                await stopSpaceCommand.args[1](mockSpaceNode)
+
+                assert.ok(
+                    stopSpaceStub.calledWith(
+                        mockSpaceNode.resource,
+                        mockExtensionContext,
+                        mockSpaceNode.resource.sageMakerClient
+                    )
+                )
+            })
+
+            it('should handle aws.smus.stopSpace command with invalid node', async function () {
+                const stopSpaceCommand = registerCommandStub
+                    .getCalls()
+                    .find((call) => call.args[0] === 'aws.smus.stopSpace')
+
+                assert.ok(stopSpaceCommand)
+
+                const testWindow = getTestWindow()
+
+                // Execute the command handler with undefined node
+                await stopSpaceCommand.args[1](undefined)
+
+                // Check that a warning message was shown
+                const warningMessages = testWindow.shownMessages.filter((msg) => msg.severity === SeverityLevel.Warning)
+                assert.ok(warningMessages.length > 0, 'Should show warning message')
+                assert.ok(warningMessages.some((msg) => msg.message.includes('Space information is being refreshed')))
+            })
+
+            it('should handle aws.smus.openRemoteConnection command with valid node', async function () {
+                const openRemoteCommand = registerCommandStub
+                    .getCalls()
+                    .find((call) => call.args[0] === 'aws.smus.openRemoteConnection')
+
+                assert.ok(openRemoteCommand)
+
+                const mockSpaceNode = createMockSpaceNode()
+
+                // Mock the openRemoteConnect function
+                const openRemoteConnectStub = sinon.stub()
+                sinon
+                    .stub(require('../../../awsService/sagemaker/commands'), 'openRemoteConnect')
+                    .value(openRemoteConnectStub)
+
+                // Execute the command handler
+                await openRemoteCommand.args[1](mockSpaceNode)
+
+                assert.ok(
+                    openRemoteConnectStub.calledWith(
+                        mockSpaceNode.resource,
+                        mockExtensionContext,
+                        mockSpaceNode.resource.sageMakerClient
+                    )
+                )
+            })
+
+            it('should handle aws.smus.openRemoteConnection command with invalid node', async function () {
+                const openRemoteCommand = registerCommandStub
+                    .getCalls()
+                    .find((call) => call.args[0] === 'aws.smus.openRemoteConnection')
+
+                assert.ok(openRemoteCommand)
+
+                const testWindow = getTestWindow()
+
+                // Execute the command handler with undefined node
+                await openRemoteCommand.args[1](undefined)
+
+                // Check that a warning message was shown
+                const warningMessages = testWindow.shownMessages.filter((msg) => msg.severity === SeverityLevel.Warning)
+                assert.ok(warningMessages.length > 0, 'Should show warning message')
+                assert.ok(warningMessages.some((msg) => msg.message.includes('Space information is being refreshed')))
+            })
+        })
+
+        it('should propagate auth provider initialization errors', async function () {
+            const error = new Error('Auth provider initialization failed')
+            mockSmusAuthProvider.restore.rejects(error)
+
+            // Should throw the error since there's no error handling in activate()
+            await assert.rejects(() => activate(mockExtensionContext), /Auth provider initialization failed/)
+        })
+
+        it('should create root node with auth provider', async function () {
+            await activate(mockExtensionContext)
+
+            // Verify that SageMakerUnifiedStudioRootNode was created with the auth provider
+            assert.ok(createTreeViewStub.called)
+            const treeDataProvider = createTreeViewStub.firstCall.args[1].treeDataProvider
+            assert.ok(treeDataProvider)
+        })
+
+        // TODO: Fix the activation test
+        it.skip('should setup user activity monitoring', async function () {
+            await activate(mockExtensionContext)
+
+            assert.ok(setupUserActivityMonitoringStub.called)
+        })
+    })
+
+    describe('command registration', function () {
+        it('should register commands with correct names', async function () {
+            await activate(mockExtensionContext)
+
+            const expectedCommands = [
+                'aws.smus.rootView.refresh',
+                'aws.smus.projectView',
+                'aws.smus.refreshProject',
+                'aws.smus.switchProject',
+                'aws.smus.stopSpace',
+                'aws.smus.openRemoteConnection',
+                'aws.smus.reauthenticate',
+            ]
+
+            const registeredCommands = registerCommandStub.getCalls().map((call) => call.args[0])
+
+            for (const command of expectedCommands) {
+                assert.ok(registeredCommands.includes(command), `Command ${command} should be registered`)
+            }
+        })
+
+        it('should register commands that return disposables', async function () {
+            await activate(mockExtensionContext)
+
+            for (const call of registerCommandStub.getCalls()) {
+                const disposable = call.returnValue
+                assert.ok(disposable && typeof disposable.dispose === 'function')
+            }
+        })
+    })
+
+    describe('resource cleanup', function () {
+        it('should dispose DataZone client on extension deactivation', async function () {
+            await activate(mockExtensionContext)
+
+            // Find and execute the DataZone dispose subscription
+            const disposeSubscription = mockExtensionContext.subscriptions.find(
+                (sub) => sub.dispose && sub.dispose.toString().includes('DataZoneClient.dispose')
+            )
+
+            if (disposeSubscription) {
+                disposeSubscription.dispose()
+                assert.ok(dataZoneDisposeStub.called)
+            }
+        })
+
+        it('should add tree view to subscriptions for disposal', async function () {
+            await activate(mockExtensionContext)
+
+            assert.ok(mockExtensionContext.subscriptions.includes(mockTreeView))
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/lakehouseStrategy.test.ts b/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/lakehouseStrategy.test.ts
new file mode 100644
index 00000000000..63e87c25f23
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/lakehouseStrategy.test.ts
@@ -0,0 +1,463 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import {
+    LakehouseNode,
+    createLakehouseConnectionNode,
+} from '../../../../sagemakerunifiedstudio/explorer/nodes/lakehouseStrategy'
+import { GlueCatalogClient } from '../../../../sagemakerunifiedstudio/shared/client/glueCatalogClient'
+import { GlueClient } from '../../../../sagemakerunifiedstudio/shared/client/glueClient'
+import { ConnectionClientStore } from '../../../../sagemakerunifiedstudio/shared/client/connectionClientStore'
+import { NodeType } from '../../../../sagemakerunifiedstudio/explorer/nodes/types'
+import { ConnectionCredentialsProvider } from '../../../../sagemakerunifiedstudio/auth/providers/connectionCredentialsProvider'
+
+describe('LakehouseStrategy', function () {
+    let sandbox: sinon.SinonSandbox
+    let mockGlueCatalogClient: sinon.SinonStubbedInstance<GlueCatalogClient>
+    let mockGlueClient: sinon.SinonStubbedInstance<GlueClient>
+
+    const mockConnection = {
+        connectionId: 'lakehouse-conn-123',
+        name: 'test-lakehouse-connection',
+        type: 'ATHENA',
+        domainId: 'domain-123',
+        projectId: 'project-123',
+    }
+
+    const mockCredentialsProvider = {
+        getCredentials: async () => ({
+            accessKeyId: 'test-key',
+            secretAccessKey: 'test-secret',
+            sessionToken: 'test-token',
+        }),
+        getDomainAccountId: async () => '123456789012',
+    }
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+
+        mockGlueCatalogClient = {
+            getCatalogs: sandbox.stub(),
+        } as any
+
+        mockGlueClient = {
+            getDatabases: sandbox.stub(),
+            getTables: sandbox.stub(),
+            getTable: sandbox.stub(),
+        } as any
+
+        sandbox.stub(GlueCatalogClient, 'createWithCredentials').returns(mockGlueCatalogClient as any)
+        sandbox.stub(GlueClient.prototype, 'getDatabases').callsFake(mockGlueClient.getDatabases)
+        sandbox.stub(GlueClient.prototype, 'getTables').callsFake(mockGlueClient.getTables)
+        sandbox.stub(GlueClient.prototype, 'getTable').callsFake(mockGlueClient.getTable)
+
+        const mockClientStore = {
+            getGlueClient: sandbox.stub().returns(mockGlueClient),
+            getGlueCatalogClient: sandbox.stub().returns(mockGlueCatalogClient),
+        }
+        sandbox.stub(ConnectionClientStore, 'getInstance').returns(mockClientStore as any)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    describe('LakehouseNode', function () {
+        it('should initialize with correct properties', function () {
+            const nodeData = {
+                id: 'test-node',
+                nodeType: NodeType.CONNECTION,
+                value: { test: 'value' },
+            }
+
+            const node = new LakehouseNode(nodeData)
+
+            assert.strictEqual(node.id, 'test-node')
+            assert.deepStrictEqual(node.resource, { test: 'value' })
+        })
+
+        it('should return empty array for leaf nodes', async function () {
+            const nodeData = {
+                id: 'leaf-node',
+                nodeType: NodeType.REDSHIFT_COLUMN,
+                value: {},
+            }
+
+            const node = new LakehouseNode(nodeData)
+            const children = await node.getChildren()
+
+            assert.strictEqual(children.length, 0)
+        })
+
+        it('should return error node when children provider fails', async function () {
+            const nodeData = {
+                id: 'error-node',
+                nodeType: NodeType.CONNECTION,
+                value: {},
+            }
+
+            const failingProvider = async () => {
+                throw new Error('Provider failed')
+            }
+
+            const node = new LakehouseNode(nodeData, failingProvider)
+            const children = await node.getChildren()
+
+            assert.strictEqual(children.length, 1)
+            assert.ok(children[0].id.startsWith('error-node-error-getChildren-'))
+        })
+
+        it('should create correct tree item for column node', async function () {
+            const nodeData = {
+                id: 'column-node',
+                nodeType: NodeType.REDSHIFT_COLUMN,
+                value: { name: 'test_column', type: 'varchar' },
+            }
+
+            const node = new LakehouseNode(nodeData)
+            const treeItem = await node.getTreeItem()
+
+            assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.None)
+            assert.strictEqual(treeItem.description, 'varchar')
+        })
+
+        it('should cache children after first load', async function () {
+            const provider = sandbox
+                .stub()
+                .resolves([new LakehouseNode({ id: 'child', nodeType: NodeType.GLUE_DATABASE })])
+            const node = new LakehouseNode({ id: 'parent', nodeType: NodeType.CONNECTION }, provider)
+
+            await node.getChildren()
+            await node.getChildren()
+
+            assert.ok(provider.calledOnce)
+        })
+    })
+
+    describe('createLakehouseConnectionNode', function () {
+        it('should create connection node with correct structure', function () {
+            const node = createLakehouseConnectionNode(
+                mockConnection as any,
+                mockCredentialsProvider as ConnectionCredentialsProvider,
+                'us-east-1'
+            )
+
+            assert.strictEqual(node.id, 'lakehouse-conn-123')
+            assert.strictEqual(node.data.nodeType, NodeType.CONNECTION)
+            assert.strictEqual(node.data.path?.connection, 'test-lakehouse-connection')
+        })
+
+        it('should create AWS Data Catalog node for default connections', async function () {
+            const defaultConnection = {
+                ...mockConnection,
+                name: 'project.default_lakehouse',
+            }
+
+            mockGlueCatalogClient.getCatalogs.resolves({ catalogs: [], nextToken: undefined })
+            mockGlueClient.getDatabases.resolves({
+                databases: [{ Name: 'default-db' }],
+                nextToken: undefined,
+            })
+
+            const node = createLakehouseConnectionNode(
+                defaultConnection as any,
+                mockCredentialsProvider as ConnectionCredentialsProvider,
+                'us-east-1'
+            )
+            const children = await node.getChildren()
+
+            const awsDataCatalogNode = children.find((child) => child.id.includes('AwsDataCatalog')) as LakehouseNode
+            assert.ok(awsDataCatalogNode)
+            assert.strictEqual(awsDataCatalogNode.data.nodeType, NodeType.GLUE_CATALOG)
+        })
+
+        it('should not create AWS Data Catalog node for non-default connections', async function () {
+            mockGlueCatalogClient.getCatalogs.resolves({ catalogs: [], nextToken: undefined })
+
+            const node = createLakehouseConnectionNode(
+                mockConnection as any,
+                mockCredentialsProvider as ConnectionCredentialsProvider,
+                'us-east-1'
+            )
+            const children = await node.getChildren()
+
+            const awsDataCatalogNode = children.find((child) => child.id.includes('AwsDataCatalog'))
+            assert.strictEqual(awsDataCatalogNode, undefined)
+        })
+
+        it('should handle errors gracefully', async function () {
+            mockGlueCatalogClient.getCatalogs.rejects(new Error('Catalog error'))
+            mockGlueClient.getDatabases.rejects(new Error('Database error'))
+
+            const node = createLakehouseConnectionNode(
+                mockConnection as any,
+                mockCredentialsProvider as ConnectionCredentialsProvider,
+                'us-east-1'
+            )
+            const children = await node.getChildren()
+
+            assert.ok(children.length > 0)
+            assert.ok(children.some((child) => child.id.startsWith('lakehouse-conn-123-error-')))
+        })
+
+        it('should create placeholder when no catalogs found', async function () {
+            mockGlueCatalogClient.getCatalogs.resolves({ catalogs: [], nextToken: undefined })
+
+            const node = createLakehouseConnectionNode(
+                mockConnection as any,
+                mockCredentialsProvider as ConnectionCredentialsProvider,
+                'us-east-1'
+            )
+            const children = await node.getChildren()
+
+            assert.ok(children.some((child) => child.resource === '[No data found]'))
+        })
+    })
+
+    describe('Catalog nodes', function () {
+        it('should create catalog nodes from API', async function () {
+            mockGlueCatalogClient.getCatalogs.resolves({
+                catalogs: [{ CatalogId: 'test-catalog', CatalogType: 'HIVE' }],
+            })
+            mockGlueClient.getDatabases.resolves({
+                databases: [{ Name: 'test-db' }],
+                nextToken: undefined,
+            })
+
+            const node = createLakehouseConnectionNode(
+                mockConnection as any,
+                mockCredentialsProvider as ConnectionCredentialsProvider,
+                'us-east-1'
+            )
+            const children = await node.getChildren()
+
+            assert.ok(children.length > 0)
+            assert.ok(mockGlueCatalogClient.getCatalogs.called)
+        })
+
+        it('should handle catalog database pagination', async function () {
+            const catalogNode = new LakehouseNode(
+                {
+                    id: 'catalog-node',
+                    nodeType: NodeType.GLUE_CATALOG,
+                    path: { catalog: 'test-catalog' },
+                },
+                async () => {
+                    const allDatabases = []
+                    let nextToken: string | undefined
+                    do {
+                        const { databases, nextToken: token } = await mockGlueClient.getDatabases(
+                            'test-catalog',
+                            undefined,
+                            undefined,
+                            nextToken
+                        )
+                        allDatabases.push(...databases)
+                        nextToken = token
+                    } while (nextToken)
+                    return allDatabases.map(
+                        (db) => new LakehouseNode({ id: db.Name || '', nodeType: NodeType.GLUE_DATABASE })
+                    )
+                }
+            )
+
+            mockGlueClient.getDatabases
+                .onFirstCall()
+                .resolves({ databases: [{ Name: 'db1' }], nextToken: 'token1' })
+                .onSecondCall()
+                .resolves({ databases: [{ Name: 'db2' }], nextToken: undefined })
+
+            const children = await catalogNode.getChildren()
+
+            assert.strictEqual(children.length, 2)
+            assert.ok(mockGlueClient.getDatabases.calledTwice)
+        })
+    })
+
+    describe('Database nodes', function () {
+        it('should handle table pagination', async function () {
+            const databaseNode = new LakehouseNode(
+                {
+                    id: 'database-node',
+                    nodeType: NodeType.GLUE_DATABASE,
+                    path: { catalog: 'test-catalog', database: 'test-db' },
+                },
+                async () => {
+                    const allTables = []
+                    let nextToken: string | undefined
+                    do {
+                        const { tables, nextToken: token } = await mockGlueClient.getTables(
+                            'test-db',
+                            'test-catalog',
+                            undefined,
+                            nextToken
+                        )
+                        allTables.push(...tables)
+                        nextToken = token
+                    } while (nextToken)
+                    return allTables.map(
+                        (table) => new LakehouseNode({ id: table.Name || '', nodeType: NodeType.GLUE_TABLE })
+                    )
+                }
+            )
+
+            mockGlueClient.getTables
+                .onFirstCall()
+                .resolves({ tables: [{ Name: 'table1' }], nextToken: 'token1' })
+                .onSecondCall()
+                .resolves({ tables: [{ Name: 'table2' }], nextToken: undefined })
+
+            const children = await databaseNode.getChildren()
+
+            assert.strictEqual(children.length, 2)
+            assert.ok(mockGlueClient.getTables.calledTwice)
+        })
+
+        it('should handle AWS Data Catalog database queries', async function () {
+            const databaseNode = new LakehouseNode(
+                {
+                    id: 'database-node',
+                    nodeType: NodeType.GLUE_DATABASE,
+                    path: { catalog: 'aws-data-catalog', database: 'test-db' },
+                },
+                async () => {
+                    const catalogId = undefined
+                    const { tables } = await mockGlueClient.getTables('test-db', catalogId)
+                    return tables.map(
+                        (table) => new LakehouseNode({ id: table.Name || '', nodeType: NodeType.GLUE_TABLE })
+                    )
+                }
+            )
+
+            mockGlueClient.getTables.resolves({ tables: [{ Name: 'aws-table' }], nextToken: undefined })
+
+            const children = await databaseNode.getChildren()
+
+            assert.strictEqual(children.length, 1)
+            assert.ok(mockGlueClient.getTables.calledWith('test-db', undefined))
+        })
+    })
+
+    describe('Table nodes', function () {
+        it('should create table node and load columns', async function () {
+            const tableNode = new LakehouseNode(
+                {
+                    id: 'table-node',
+                    nodeType: NodeType.GLUE_TABLE,
+                    path: { database: 'test-db', table: 'test-table' },
+                },
+                async () => {
+                    const tableDetails = await mockGlueClient.getTable('test-db', 'test-table')
+                    const columns = tableDetails?.StorageDescriptor?.Columns || []
+                    const partitions = tableDetails?.PartitionKeys || []
+                    return [...columns, ...partitions].map(
+                        (col) =>
+                            new LakehouseNode({
+                                id: `column-${col.Name}`,
+                                nodeType: NodeType.REDSHIFT_COLUMN,
+                                value: { name: col.Name, type: col.Type },
+                            })
+                    )
+                }
+            )
+
+            mockGlueClient.getTable.resolves({
+                StorageDescriptor: {
+                    Columns: [{ Name: 'col1', Type: 'string' }],
+                },
+                PartitionKeys: [{ Name: 'partition_col', Type: 'date' }],
+                Name: undefined,
+            })
+
+            const children = await tableNode.getChildren()
+
+            assert.strictEqual(children.length, 2)
+            assert.ok(mockGlueClient.getTable.calledWith('test-db', 'test-table'))
+        })
+
+        it('should handle table with no columns', async function () {
+            const tableNode = new LakehouseNode(
+                {
+                    id: 'empty-table-node',
+                    nodeType: NodeType.GLUE_TABLE,
+                    path: { database: 'test-db', table: 'empty-table' },
+                },
+                async () => {
+                    const tableDetails = await mockGlueClient.getTable('test-db', 'empty-table')
+                    const columns = tableDetails?.StorageDescriptor?.Columns || []
+                    const partitions = tableDetails?.PartitionKeys || []
+                    return [...columns, ...partitions].map(
+                        (col) =>
+                            new LakehouseNode({
+                                id: `column-${col.Name}`,
+                                nodeType: NodeType.REDSHIFT_COLUMN,
+                                value: { name: col.Name, type: col.Type },
+                            })
+                    )
+                }
+            )
+
+            mockGlueClient.getTable.resolves({
+                StorageDescriptor: { Columns: [] },
+                PartitionKeys: [],
+                Name: undefined,
+            })
+
+            const children = await tableNode.getChildren()
+
+            assert.strictEqual(children.length, 0)
+        })
+
+        it('should handle table getTable errors gracefully', async function () {
+            const tableNode = new LakehouseNode(
+                {
+                    id: 'error-table-node',
+                    nodeType: NodeType.GLUE_TABLE,
+                    path: { database: 'test-db', table: 'error-table' },
+                },
+                async () => {
+                    try {
+                        await mockGlueClient.getTable('test-db', 'error-table')
+                        return []
+                    } catch (err) {
+                        return []
+                    }
+                }
+            )
+
+            mockGlueClient.getTable.rejects(new Error('Table not found'))
+
+            const children = await tableNode.getChildren()
+
+            assert.strictEqual(children.length, 0)
+        })
+    })
+
+    describe('Column nodes', function () {
+        it('should create column node with correct properties', function () {
+            const parentNode = new LakehouseNode({
+                id: 'parent-table',
+                nodeType: NodeType.GLUE_TABLE,
+                path: { database: 'test-db', table: 'test-table' },
+            })
+
+            const columnNode = new LakehouseNode({
+                id: 'parent-table/test-column',
+                nodeType: NodeType.REDSHIFT_COLUMN,
+                value: { name: 'test-column', type: 'varchar' },
+                path: { database: 'test-db', table: 'test-table', column: 'test-column' },
+                parent: parentNode,
+            })
+
+            assert.strictEqual(columnNode.id, 'parent-table/test-column')
+            assert.strictEqual(columnNode.resource.name, 'test-column')
+            assert.strictEqual(columnNode.resource.type, 'varchar')
+            assert.strictEqual(columnNode.getParent(), parentNode)
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/redshiftStrategy.test.ts b/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/redshiftStrategy.test.ts
new file mode 100644
index 00000000000..50b5e36e251
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/redshiftStrategy.test.ts
@@ -0,0 +1,359 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import {
+    RedshiftNode,
+    createRedshiftConnectionNode,
+} from '../../../../sagemakerunifiedstudio/explorer/nodes/redshiftStrategy'
+import { SQLWorkbenchClient } from '../../../../sagemakerunifiedstudio/shared/client/sqlWorkbenchClient'
+import * as sqlWorkbenchClient from '../../../../sagemakerunifiedstudio/shared/client/sqlWorkbenchClient'
+import { ConnectionClientStore } from '../../../../sagemakerunifiedstudio/shared/client/connectionClientStore'
+import { NodeType } from '../../../../sagemakerunifiedstudio/explorer/nodes/types'
+import { ConnectionCredentialsProvider } from '../../../../sagemakerunifiedstudio/auth/providers/connectionCredentialsProvider'
+
+describe('redshiftStrategy', function () {
+    let sandbox: sinon.SinonSandbox
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    describe('RedshiftNode', function () {
+        describe('constructor', function () {
+            it('should create node with correct properties', function () {
+                const nodeData = {
+                    id: 'test-id',
+                    nodeType: NodeType.REDSHIFT_CLUSTER,
+                    value: { clusterName: 'test-cluster' },
+                }
+
+                const node = new RedshiftNode(nodeData)
+
+                assert.strictEqual(node.id, 'test-id')
+                assert.strictEqual(node.data.nodeType, NodeType.REDSHIFT_CLUSTER)
+                assert.deepStrictEqual(node.resource, { clusterName: 'test-cluster' })
+            })
+        })
+
+        describe('getChildren', function () {
+            it('should return cached children if available', async function () {
+                const nodeData = {
+                    id: 'test-id',
+                    nodeType: NodeType.REDSHIFT_CLUSTER,
+                }
+
+                const node = new RedshiftNode(nodeData)
+                // Simulate cached children
+                ;(node as any).childrenNodes = [{ id: 'cached-child' }]
+
+                const children = await node.getChildren()
+                assert.strictEqual(children.length, 1)
+                assert.strictEqual((children[0] as any).id, 'cached-child')
+            })
+
+            it('should return empty array for leaf nodes', async function () {
+                const nodeData = {
+                    id: 'test-id',
+                    nodeType: NodeType.REDSHIFT_COLUMN,
+                }
+
+                const node = new RedshiftNode(nodeData)
+                const children = await node.getChildren()
+                assert.strictEqual(children.length, 0)
+            })
+        })
+
+        describe('getTreeItem', function () {
+            it('should return correct tree item for regular nodes', async function () {
+                const nodeData = {
+                    id: 'test-cluster',
+                    nodeType: NodeType.REDSHIFT_CLUSTER,
+                    value: { clusterName: 'test-cluster' },
+                }
+
+                const node = new RedshiftNode(nodeData)
+                const treeItem = await node.getTreeItem()
+
+                assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.Collapsed)
+                assert.strictEqual(treeItem.contextValue, NodeType.REDSHIFT_CLUSTER)
+            })
+
+            it('should return column tree item for column nodes', async function () {
+                const nodeData = {
+                    id: 'test-column',
+                    nodeType: NodeType.REDSHIFT_COLUMN,
+                    value: { type: 'VARCHAR(255)' },
+                }
+
+                const node = new RedshiftNode(nodeData)
+                const treeItem = await node.getTreeItem()
+
+                assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.None)
+                assert.strictEqual(treeItem.description, 'VARCHAR(255)')
+            })
+
+            it('should return leaf tree item for leaf nodes', async function () {
+                const nodeData = {
+                    id: 'test-column',
+                    nodeType: NodeType.REDSHIFT_COLUMN,
+                }
+
+                const node = new RedshiftNode(nodeData)
+                const treeItem = await node.getTreeItem()
+
+                assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.None)
+            })
+        })
+
+        describe('getParent', function () {
+            it('should return parent node', function () {
+                const parentData = { id: 'parent', nodeType: NodeType.REDSHIFT_CLUSTER }
+                const parent = new RedshiftNode(parentData)
+
+                const nodeData = {
+                    id: 'child',
+                    nodeType: NodeType.REDSHIFT_DATABASE,
+                    parent: parent,
+                }
+
+                const node = new RedshiftNode(nodeData)
+                assert.strictEqual(node.getParent(), parent)
+            })
+        })
+    })
+
+    describe('createRedshiftConnectionNode', function () {
+        let mockSQLClient: sinon.SinonStubbedInstance<SQLWorkbenchClient>
+
+        beforeEach(function () {
+            mockSQLClient = {
+                executeQuery: sandbox.stub(),
+                getResources: sandbox.stub(),
+            } as any
+
+            sandbox.stub(SQLWorkbenchClient, 'createWithCredentials').returns(mockSQLClient as any)
+            sandbox.stub(sqlWorkbenchClient, 'createRedshiftConnectionConfig').resolves({
+                id: 'test-connection-id',
+                type: '4',
+                databaseType: 'REDSHIFT',
+                connectableResourceIdentifier: 'test-cluster',
+                connectableResourceType: 'CLUSTER',
+                database: 'test-db',
+            })
+
+            const mockClientStore = {
+                getSQLWorkbenchClient: sandbox.stub().returns(mockSQLClient),
+            }
+            sandbox.stub(ConnectionClientStore, 'getInstance').returns(mockClientStore as any)
+        })
+
+        it.skip('should create Redshift connection node with JDBC URL', async function () {
+            const connection = {
+                connectionId: 'conn-123',
+                name: 'Test Redshift Connection',
+                type: 'RedshiftConnection',
+                props: {
+                    jdbcConnection: {
+                        jdbcUrl: 'jdbc:redshift://test-cluster.123456789012.us-east-1.redshift.amazonaws.com:5439/dev',
+                        dbname: 'test-db',
+                    },
+                    redshiftProperties: {},
+                },
+                location: {
+                    awsAccountId: '',
+                    awsRegion: 'us-east-1',
+                },
+            }
+
+            const credentialsProvider = {
+                getCredentials: async () => ({
+                    accessKeyId: 'test-key',
+                    secretAccessKey: 'test-secret',
+                }),
+            }
+
+            mockSQLClient.executeQuery.resolves('query-id')
+            mockSQLClient.getResources.resolves({
+                resources: [
+                    {
+                        displayName: 'test-db',
+                        type: 'DATABASE',
+                        identifier: '',
+                        childObjectTypes: [],
+                    },
+                ],
+            })
+
+            const node = createRedshiftConnectionNode(
+                connection as any,
+                credentialsProvider as ConnectionCredentialsProvider
+            )
+
+            assert.strictEqual(node.data.nodeType, NodeType.CONNECTION)
+            assert.strictEqual(node.data.value.connection.name, 'Test Redshift Connection')
+
+            // Test children provider - now creates database nodes directly
+            const children = await node.getChildren()
+            assert.strictEqual(children.length, 1)
+            assert.strictEqual((children[0] as RedshiftNode).data.nodeType, NodeType.REDSHIFT_DATABASE)
+        })
+
+        it.skip('should create connection node with host from jdbcConnection', async function () {
+            const connection = {
+                connectionId: 'conn-123',
+                name: 'Test Connection',
+                type: 'RedshiftConnection',
+                props: {
+                    jdbcConnection: {
+                        host: 'test-host.redshift.amazonaws.com',
+                        dbname: 'test-db',
+                    },
+                    redshiftProperties: {},
+                },
+                location: {
+                    awsAccountId: '',
+                    awsRegion: 'us-east-1',
+                },
+            }
+
+            const credentialsProvider = {
+                getCredentials: async () => ({
+                    accessKeyId: 'test-key',
+                    secretAccessKey: 'test-secret',
+                }),
+            }
+
+            mockSQLClient.executeQuery.resolves('query-id')
+            mockSQLClient.getResources.resolves({ resources: [] })
+
+            const node = createRedshiftConnectionNode(
+                connection as any,
+                credentialsProvider as ConnectionCredentialsProvider
+            )
+            const children = await node.getChildren()
+
+            assert.strictEqual(children.length, 1)
+            assert.strictEqual((children[0] as RedshiftNode).data.nodeType, NodeType.REDSHIFT_DATABASE)
+        })
+
+        it('should return placeholder when connection params are missing', async function () {
+            const connection = {
+                connectionId: 'conn-123',
+                name: 'Test Connection',
+                type: 'RedshiftConnection',
+                props: {
+                    jdbcConnection: {},
+                    redshiftProperties: {},
+                },
+                location: {},
+            }
+
+            const credentialsProvider = {
+                getCredentials: async () => ({
+                    accessKeyId: 'test-key',
+                    secretAccessKey: 'test-secret',
+                }),
+                getDomainAccountId: async () => '123456789012',
+            }
+
+            const node = createRedshiftConnectionNode(
+                connection as any,
+                credentialsProvider as ConnectionCredentialsProvider
+            )
+            const children = await node.getChildren()
+
+            assert.strictEqual(children.length, 1)
+            assert.strictEqual(children[0].resource, '[No data found]')
+        })
+
+        it.skip('should handle workgroup name in host', async function () {
+            const connection = {
+                connectionId: 'conn-123',
+                name: 'Test Connection',
+                type: 'RedshiftConnection',
+                props: {
+                    jdbcConnection: {
+                        host: 'test-host.redshift-serverless.amazonaws.com',
+                        dbname: 'test-db',
+                    },
+                    redshiftProperties: {
+                        storage: {
+                            workgroupName: 'test-workgroup',
+                        },
+                    },
+                },
+                location: {
+                    awsAccountId: '',
+                    awsRegion: 'us-east-1',
+                },
+            }
+
+            const credentialsProvider = {
+                getCredentials: async () => ({
+                    accessKeyId: 'test-key',
+                    secretAccessKey: 'test-secret',
+                }),
+            }
+
+            mockSQLClient.executeQuery.resolves('query-id')
+            mockSQLClient.getResources.resolves({ resources: [] })
+
+            const node = createRedshiftConnectionNode(
+                connection as any,
+                credentialsProvider as ConnectionCredentialsProvider
+            )
+            const children = await node.getChildren()
+
+            assert.strictEqual(children.length, 1)
+        })
+
+        it.skip('should handle connection errors gracefully', async function () {
+            const connection = {
+                connectionId: 'conn-123',
+                name: 'Test Connection',
+                type: 'RedshiftConnection',
+                props: {
+                    jdbcConnection: {
+                        host: 'test-host.redshift.amazonaws.com',
+                        dbname: 'test-db',
+                    },
+                },
+                location: {
+                    awsAccountId: '',
+                    awsRegion: 'us-east-1',
+                },
+            }
+
+            const credentialsProvider = {
+                getCredentials: async () => ({
+                    accessKeyId: 'test-key',
+                    secretAccessKey: 'test-secret',
+                }),
+            }
+
+            // Make createRedshiftConnectionConfig throw an error
+            ;(sqlWorkbenchClient.createRedshiftConnectionConfig as sinon.SinonStub).rejects(
+                new Error('Connection config failed')
+            )
+
+            const node = createRedshiftConnectionNode(
+                connection as any,
+                credentialsProvider as ConnectionCredentialsProvider
+            )
+
+            // The error should be handled gracefully and return an error node
+            const children = await node.getChildren()
+            assert.strictEqual(children.length, 1)
+            assert.strictEqual((children[0] as any).id.includes('error'), true)
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/s3Strategy.test.ts b/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/s3Strategy.test.ts
new file mode 100644
index 00000000000..f6838ab483e
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/s3Strategy.test.ts
@@ -0,0 +1,253 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { S3Node, createS3ConnectionNode } from '../../../../sagemakerunifiedstudio/explorer/nodes/s3Strategy'
+import { S3Client } from '../../../../sagemakerunifiedstudio/shared/client/s3Client'
+import { ConnectionClientStore } from '../../../../sagemakerunifiedstudio/shared/client/connectionClientStore'
+import { NodeType, ConnectionType } from '../../../../sagemakerunifiedstudio/explorer/nodes/types'
+import { ConnectionCredentialsProvider } from '../../../../sagemakerunifiedstudio/auth/providers/connectionCredentialsProvider'
+import { createMockS3Connection, createMockCredentialsProvider } from '../../testUtils'
+
+describe('s3Strategy', function () {
+    let sandbox: sinon.SinonSandbox
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    describe('S3Node', function () {
+        describe('constructor', function () {
+            it('should create node with correct properties', function () {
+                const node = new S3Node({
+                    id: 'test-id',
+                    nodeType: NodeType.S3_BUCKET,
+                    connectionType: ConnectionType.S3,
+                    value: { bucket: 'test-bucket' },
+                    path: { bucket: 'test-bucket' },
+                })
+
+                assert.strictEqual(node.id, 'test-id')
+                assert.strictEqual(node.data.nodeType, NodeType.S3_BUCKET)
+                assert.strictEqual(node.data.connectionType, ConnectionType.S3)
+            })
+        })
+
+        describe('getChildren', function () {
+            it('should return empty array for leaf nodes', async function () {
+                const node = new S3Node({
+                    id: 'test-id',
+                    nodeType: NodeType.S3_FILE,
+                    connectionType: ConnectionType.S3,
+                })
+
+                const children = await node.getChildren()
+                assert.strictEqual(children.length, 0)
+            })
+
+            it('should handle children provider errors', async function () {
+                const errorProvider = async () => {
+                    throw new Error('Provider error')
+                }
+
+                const node = new S3Node(
+                    {
+                        id: 'test-id',
+                        nodeType: NodeType.S3_BUCKET,
+                        connectionType: ConnectionType.S3,
+                    },
+                    errorProvider
+                )
+
+                const children = await node.getChildren()
+                assert.strictEqual(children.length, 1)
+                assert.ok(children[0].id.startsWith('test-id-error-getChildren-'))
+            })
+        })
+
+        describe('getTreeItem', function () {
+            it('should return correct tree item for non-leaf node', async function () {
+                const node = new S3Node({
+                    id: 'test-id',
+                    nodeType: NodeType.S3_BUCKET,
+                    connectionType: ConnectionType.S3,
+                })
+
+                const treeItem = await node.getTreeItem()
+                assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.Collapsed)
+                assert.strictEqual(treeItem.contextValue, NodeType.S3_BUCKET)
+            })
+
+            it('should return correct tree item for leaf node', async function () {
+                const node = new S3Node({
+                    id: 'test-id',
+                    nodeType: NodeType.S3_FILE,
+                    connectionType: ConnectionType.S3,
+                })
+
+                const treeItem = await node.getTreeItem()
+                assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.None)
+            })
+        })
+    })
+
+    describe('createS3ConnectionNode', function () {
+        let mockS3Client: sinon.SinonStubbedInstance<S3Client>
+
+        beforeEach(function () {
+            mockS3Client = {
+                listPaths: sandbox.stub(),
+            } as any
+
+            sandbox.stub(S3Client.prototype, 'constructor' as any)
+            sandbox.stub(S3Client.prototype, 'listPaths').callsFake(mockS3Client.listPaths)
+
+            const mockClientStore = {
+                getS3Client: sandbox.stub().returns(mockS3Client),
+            }
+            sandbox.stub(ConnectionClientStore, 'getInstance').returns(mockClientStore as any)
+        })
+
+        it('should create S3 connection node successfully for non-default connection', function () {
+            const connection = {
+                connectionId: 'conn-123',
+                name: 'Test S3 Connection',
+                type: 'S3Connection',
+                props: {
+                    s3Properties: {
+                        s3Uri: 's3://test-bucket/prefix/',
+                    },
+                },
+            }
+
+            const credentialsProvider = {
+                getCredentials: async () => ({
+                    accessKeyId: 'test-key',
+                    secretAccessKey: 'test-secret',
+                }),
+            }
+
+            const node = createS3ConnectionNode(
+                connection as any,
+                credentialsProvider as ConnectionCredentialsProvider,
+                'us-east-1'
+            )
+
+            assert.strictEqual(node.data.nodeType, NodeType.CONNECTION)
+            assert.strictEqual(node.data.connectionType, ConnectionType.S3)
+        })
+
+        it('should create S3 connection node for default connection with full path', function () {
+            const connection = createMockS3Connection()
+            const credentialsProvider = createMockCredentialsProvider()
+
+            const node = createS3ConnectionNode(
+                connection as any,
+                credentialsProvider as ConnectionCredentialsProvider,
+                'us-east-1'
+            )
+
+            assert.strictEqual(node.data.nodeType, NodeType.CONNECTION)
+            assert.strictEqual(node.data.connectionType, ConnectionType.S3)
+        })
+
+        it('should return error node when no S3 URI found', function () {
+            const connection = {
+                connectionId: 'conn-123',
+                name: 'Test S3 Connection',
+                type: 'S3Connection',
+                props: {},
+            }
+
+            const credentialsProvider = {
+                getCredentials: async () => ({
+                    accessKeyId: 'test-key',
+                    secretAccessKey: 'test-secret',
+                }),
+            }
+
+            const node = createS3ConnectionNode(
+                connection as any,
+                credentialsProvider as ConnectionCredentialsProvider,
+                'us-east-1'
+            )
+
+            assert.ok(node.id.startsWith('conn-123-error-connection-'))
+        })
+
+        it('should handle bucket listing for non-default connection', async function () {
+            const connection = {
+                connectionId: 'conn-123',
+                name: 'Test S3 Connection',
+                type: 'S3Connection',
+                props: {
+                    s3Properties: {
+                        s3Uri: 's3://test-bucket/',
+                    },
+                },
+            }
+
+            const credentialsProvider = createMockCredentialsProvider()
+
+            mockS3Client.listPaths.resolves({
+                paths: [
+                    {
+                        bucket: 'test-bucket',
+                        prefix: 'file.txt',
+                        displayName: 'file.txt',
+                        isFolder: false,
+                    },
+                ],
+                nextToken: undefined,
+            })
+
+            const node = createS3ConnectionNode(
+                connection as any,
+                credentialsProvider as ConnectionCredentialsProvider,
+                'us-east-1'
+            )
+            const children = await node.getChildren()
+
+            assert.strictEqual(children.length, 1)
+            assert.strictEqual((children[0] as S3Node).data.nodeType, NodeType.S3_BUCKET)
+        })
+
+        it('should handle bucket listing for default connection with full path display', async function () {
+            const connection = createMockS3Connection()
+            const credentialsProvider = createMockCredentialsProvider()
+
+            mockS3Client.listPaths.resolves({
+                paths: [
+                    {
+                        bucket: 'test-bucket',
+                        prefix: 'domain/project/dev/',
+                        displayName: 'dev',
+                        isFolder: true,
+                    },
+                ],
+                nextToken: undefined,
+            })
+
+            const node = createS3ConnectionNode(
+                connection as any,
+                credentialsProvider as ConnectionCredentialsProvider,
+                'us-east-1'
+            )
+            const children = await node.getChildren()
+
+            assert.strictEqual(children.length, 1)
+            const bucketNode = children[0] as S3Node
+            assert.strictEqual(bucketNode.data.nodeType, NodeType.S3_BUCKET)
+            // For default connection, should show full path
+            assert.strictEqual(bucketNode.data.path?.label, 'test-bucket/domain/project/')
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioAuthInfoNode.test.ts b/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioAuthInfoNode.test.ts
new file mode 100644
index 00000000000..ebf2eae2cb0
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioAuthInfoNode.test.ts
@@ -0,0 +1,291 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import * as vscode from 'vscode'
+import { SageMakerUnifiedStudioAuthInfoNode } from '../../../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioAuthInfoNode'
+import { SmusAuthenticationProvider } from '../../../../sagemakerunifiedstudio/auth/providers/smusAuthenticationProvider'
+import { SmusConnection } from '../../../../sagemakerunifiedstudio/auth/model'
+
+describe('SageMakerUnifiedStudioAuthInfoNode', function () {
+    let authInfoNode: SageMakerUnifiedStudioAuthInfoNode
+    let mockAuthProvider: any
+    let mockConnection: SmusConnection
+    let currentActiveConnection: SmusConnection | undefined
+
+    beforeEach(function () {
+        mockConnection = {
+            id: 'test-connection-id',
+            type: 'sso',
+            startUrl: 'https://identitycenter.amazonaws.com/ssoins-testInstanceId',
+            ssoRegion: 'us-east-2',
+            scopes: ['datazone:domain:access'],
+            label: 'Test SMUS Connection',
+            domainUrl: 'https://dzd_domainId.sagemaker.us-east-2.on.aws',
+            domainId: 'dzd_domainId',
+            // Mock the required methods from SsoConnection
+            getToken: sinon.stub().resolves(),
+            getRegistration: sinon.stub().resolves(),
+        } as any
+
+        // Initialize the current active connection
+        currentActiveConnection = mockConnection
+
+        // Create mock auth provider with getter for activeConnection
+        mockAuthProvider = {
+            isConnected: sinon.stub().returns(true),
+            isConnectionValid: sinon.stub().returns(true),
+            onDidChange: sinon.stub().callsFake((listener: () => void) => ({ dispose: sinon.stub() })),
+            get activeConnection() {
+                return currentActiveConnection
+            },
+            set activeConnection(value: SmusConnection | undefined) {
+                currentActiveConnection = value
+            },
+        }
+
+        // Stub SmusAuthenticationProvider.fromContext
+        sinon.stub(SmusAuthenticationProvider, 'fromContext').returns(mockAuthProvider as any)
+
+        authInfoNode = new SageMakerUnifiedStudioAuthInfoNode()
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    describe('constructor', function () {
+        it('should initialize with correct properties', function () {
+            assert.strictEqual(authInfoNode.id, 'smusAuthInfoNode')
+            assert.strictEqual(authInfoNode.resource, authInfoNode)
+        })
+
+        it('should register for auth provider changes', function () {
+            assert.ok(mockAuthProvider.onDidChange.called)
+        })
+
+        it('should have onDidChangeTreeItem event', function () {
+            assert.ok(typeof authInfoNode.onDidChangeTreeItem === 'function')
+        })
+    })
+
+    describe('getTreeItem', function () {
+        describe('when connected and valid', function () {
+            beforeEach(function () {
+                mockAuthProvider.isConnected.returns(true)
+                mockAuthProvider.isConnectionValid.returns(true)
+                mockAuthProvider.activeConnection = mockConnection
+            })
+
+            it('should return connected tree item', function () {
+                const treeItem = authInfoNode.getTreeItem()
+
+                assert.strictEqual(treeItem.label, 'Domain: dzd_domainId')
+                assert.strictEqual(treeItem.description, 'us-east-2')
+                assert.strictEqual(treeItem.contextValue, 'smusAuthInfo')
+                assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.None)
+
+                // Check icon
+                assert.ok(treeItem.iconPath instanceof vscode.ThemeIcon)
+                assert.strictEqual((treeItem.iconPath as vscode.ThemeIcon).id, 'key')
+
+                // Check tooltip
+                const tooltip = treeItem.tooltip as string
+                assert.ok(tooltip?.includes('Connected to SageMaker Unified Studio'))
+                assert.ok(tooltip?.includes('dzd_domainId'))
+                assert.ok(tooltip?.includes('us-east-2'))
+                assert.ok(tooltip?.includes('Status: Connected'))
+
+                // Should not have command when valid
+                assert.strictEqual(treeItem.command, undefined)
+            })
+        })
+
+        describe('when connected but expired', function () {
+            beforeEach(function () {
+                mockAuthProvider.isConnected.returns(true)
+                mockAuthProvider.isConnectionValid.returns(false)
+                mockAuthProvider.activeConnection = mockConnection
+            })
+
+            it('should return expired tree item with reauthenticate command', function () {
+                const treeItem = authInfoNode.getTreeItem()
+
+                assert.strictEqual(treeItem.label, 'Domain: dzd_domainId (Expired) - Click to reauthenticate')
+                assert.strictEqual(treeItem.description, 'us-east-2')
+                assert.strictEqual(treeItem.contextValue, 'smusAuthInfo')
+
+                // Check icon
+                assert.ok(treeItem.iconPath instanceof vscode.ThemeIcon)
+                assert.strictEqual((treeItem.iconPath as vscode.ThemeIcon).id, 'warning')
+
+                // Check tooltip
+                const tooltip = treeItem.tooltip as string
+                assert.ok(tooltip?.includes('Connection to SageMaker Unified Studio has expired'))
+                assert.ok(tooltip?.includes('Status: Expired - Click to reauthenticate'))
+
+                // Should have reauthenticate command
+                assert.ok(treeItem.command)
+                assert.strictEqual(treeItem.command.command, 'aws.smus.reauthenticate')
+                assert.strictEqual(treeItem.command.title, 'Reauthenticate')
+                assert.deepStrictEqual(treeItem.command.arguments, [mockConnection])
+            })
+        })
+
+        describe('when not connected', function () {
+            beforeEach(function () {
+                mockAuthProvider.isConnected.returns(false)
+                mockAuthProvider.isConnectionValid.returns(false)
+                mockAuthProvider.activeConnection = undefined
+            })
+
+            it('should return not connected tree item', function () {
+                const treeItem = authInfoNode.getTreeItem()
+
+                assert.strictEqual(treeItem.label, 'Not Connected')
+                assert.strictEqual(treeItem.description, undefined)
+                assert.strictEqual(treeItem.contextValue, 'smusAuthInfo')
+
+                // Check icon
+                assert.ok(treeItem.iconPath instanceof vscode.ThemeIcon)
+                assert.strictEqual((treeItem.iconPath as vscode.ThemeIcon).id, 'circle-slash')
+
+                // Check tooltip
+                const tooltip = treeItem.tooltip as string
+                assert.ok(tooltip?.includes('Not connected to SageMaker Unified Studio'))
+                assert.ok(tooltip?.includes('Please sign in to access your projects'))
+
+                // Should not have command when not connected
+                assert.strictEqual(treeItem.command, undefined)
+            })
+        })
+
+        describe('with missing connection details', function () {
+            beforeEach(function () {
+                const incompleteConnection = {
+                    ...mockConnection,
+                    domainId: undefined,
+                    ssoRegion: undefined,
+                } as any
+
+                mockAuthProvider.isConnected.returns(true)
+                mockAuthProvider.isConnectionValid.returns(true)
+                mockAuthProvider.activeConnection = incompleteConnection
+            })
+
+            it('should handle missing domain ID and region gracefully', function () {
+                const treeItem = authInfoNode.getTreeItem()
+
+                assert.strictEqual(treeItem.label, 'Domain: Unknown')
+                assert.strictEqual(treeItem.description, 'Unknown')
+
+                const tooltip = treeItem.tooltip as string
+                assert.ok(tooltip?.includes('Domain ID: Unknown'))
+                assert.ok(tooltip?.includes('Region: Unknown'))
+            })
+        })
+    })
+
+    describe('getParent', function () {
+        it('should return undefined', function () {
+            assert.strictEqual(authInfoNode.getParent(), undefined)
+        })
+    })
+
+    describe('event handling', function () {
+        it('should fire onDidChangeTreeItem when auth provider changes', function () {
+            const eventSpy = sinon.spy()
+            authInfoNode.onDidChangeTreeItem(eventSpy)
+
+            // Simulate auth provider change
+            const onDidChangeCallback = mockAuthProvider.onDidChange.firstCall.args[0]
+            onDidChangeCallback()
+
+            assert.ok(eventSpy.called)
+        })
+
+        it('should dispose event listener properly', function () {
+            const disposeSpy = sinon.spy()
+            mockAuthProvider.onDidChange.returns({ dispose: disposeSpy })
+
+            // Create new node to trigger event listener registration
+            new SageMakerUnifiedStudioAuthInfoNode()
+
+            // The dispose should be available for cleanup
+            assert.ok(mockAuthProvider.onDidChange.called)
+        })
+    })
+
+    describe('theme icon colors', function () {
+        it('should use green color for connected state', function () {
+            mockAuthProvider.isConnected.returns(true)
+            mockAuthProvider.isConnectionValid.returns(true)
+
+            const treeItem = authInfoNode.getTreeItem()
+            const icon = treeItem.iconPath as vscode.ThemeIcon
+
+            assert.ok(icon.color instanceof vscode.ThemeColor)
+            assert.strictEqual((icon.color as any).id, 'charts.green')
+        })
+
+        it('should use yellow color for expired state', function () {
+            mockAuthProvider.isConnected.returns(true)
+            mockAuthProvider.isConnectionValid.returns(false)
+
+            const treeItem = authInfoNode.getTreeItem()
+            const icon = treeItem.iconPath as vscode.ThemeIcon
+
+            assert.ok(icon.color instanceof vscode.ThemeColor)
+            assert.strictEqual((icon.color as any).id, 'charts.yellow')
+        })
+
+        it('should use red color for not connected state', function () {
+            mockAuthProvider.isConnected.returns(false)
+
+            const treeItem = authInfoNode.getTreeItem()
+            const icon = treeItem.iconPath as vscode.ThemeIcon
+
+            assert.ok(icon.color instanceof vscode.ThemeColor)
+            assert.strictEqual((icon.color as any).id, 'charts.red')
+        })
+    })
+
+    describe('tooltip content', function () {
+        it('should include all relevant information for connected state', function () {
+            mockAuthProvider.isConnected.returns(true)
+            mockAuthProvider.isConnectionValid.returns(true)
+
+            const treeItem = authInfoNode.getTreeItem()
+            const tooltip = treeItem.tooltip as string
+
+            assert.ok(tooltip.includes('Connected to SageMaker Unified Studio'))
+            assert.ok(tooltip.includes(`Domain ID: ${mockConnection.domainId}`))
+            assert.ok(tooltip.includes(`Region: ${mockConnection.ssoRegion}`))
+            assert.ok(tooltip.includes('Status: Connected'))
+        })
+
+        it('should include expiration information for expired state', function () {
+            mockAuthProvider.isConnected.returns(true)
+            mockAuthProvider.isConnectionValid.returns(false)
+
+            const treeItem = authInfoNode.getTreeItem()
+            const tooltip = treeItem.tooltip as string
+
+            assert.ok(tooltip.includes('Connection to SageMaker Unified Studio has expired'))
+            assert.ok(tooltip.includes('Status: Expired - Click to reauthenticate'))
+        })
+
+        it('should include sign-in prompt for not connected state', function () {
+            mockAuthProvider.isConnected.returns(false)
+
+            const treeItem = authInfoNode.getTreeItem()
+            const tooltip = treeItem.tooltip as string
+
+            assert.ok(tooltip.includes('Not connected to SageMaker Unified Studio'))
+            assert.ok(tooltip.includes('Please sign in to access your projects'))
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioComputeNode.test.ts b/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioComputeNode.test.ts
new file mode 100644
index 00000000000..fc74eeab435
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioComputeNode.test.ts
@@ -0,0 +1,93 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import * as vscode from 'vscode'
+import { SageMakerUnifiedStudioComputeNode } from '../../../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioComputeNode'
+import { SageMakerUnifiedStudioProjectNode } from '../../../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioProjectNode'
+import { SageMakerUnifiedStudioSpacesParentNode } from '../../../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioSpacesParentNode'
+import { SagemakerClient } from '../../../../shared/clients/sagemaker'
+import { SmusAuthenticationProvider } from '../../../../sagemakerunifiedstudio/auth/providers/smusAuthenticationProvider'
+
+describe('SageMakerUnifiedStudioComputeNode', function () {
+    let computeNode: SageMakerUnifiedStudioComputeNode
+    let mockParent: SageMakerUnifiedStudioProjectNode
+    let mockExtensionContext: vscode.ExtensionContext
+    let mockAuthProvider: SmusAuthenticationProvider
+    let mockSagemakerClient: SagemakerClient
+
+    beforeEach(function () {
+        mockParent = {
+            getProject: sinon.stub(),
+        } as any
+
+        mockExtensionContext = {
+            subscriptions: [],
+            extensionUri: vscode.Uri.file('/test'),
+        } as any
+
+        mockAuthProvider = {} as any
+        mockSagemakerClient = {} as any
+
+        computeNode = new SageMakerUnifiedStudioComputeNode(
+            mockParent,
+            mockExtensionContext,
+            mockAuthProvider,
+            mockSagemakerClient
+        )
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    describe('constructor', function () {
+        it('creates instance with correct properties', function () {
+            assert.strictEqual(computeNode.id, 'smusComputeNode')
+            assert.strictEqual(computeNode.resource, computeNode)
+        })
+    })
+
+    describe('getTreeItem', function () {
+        it('returns correct tree item', async function () {
+            const treeItem = await computeNode.getTreeItem()
+
+            assert.strictEqual(treeItem.label, 'Compute')
+            assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.Expanded)
+            assert.strictEqual(treeItem.contextValue, 'smusComputeNode')
+            assert.ok(treeItem.iconPath)
+        })
+    })
+
+    describe('getChildren', function () {
+        it('returns empty array when no project is selected', async function () {
+            ;(mockParent.getProject as sinon.SinonStub).returns(undefined)
+
+            const children = await computeNode.getChildren()
+
+            assert.deepStrictEqual(children, [])
+        })
+
+        it('returns connection nodes and spaces node when project is selected', async function () {
+            const mockProject = { id: 'project-123', name: 'Test Project' }
+            ;(mockParent.getProject as sinon.SinonStub).returns(mockProject)
+
+            const children = await computeNode.getChildren()
+
+            assert.strictEqual(children.length, 3)
+            assert.strictEqual(children[0].id, 'Data warehouse')
+            assert.strictEqual(children[1].id, 'Data processing')
+            assert.ok(children[2] instanceof SageMakerUnifiedStudioSpacesParentNode)
+        })
+    })
+
+    describe('getParent', function () {
+        it('returns parent node', function () {
+            const parent = computeNode.getParent()
+            assert.strictEqual(parent, mockParent)
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioConnectionNode.test.ts b/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioConnectionNode.test.ts
new file mode 100644
index 00000000000..a85d63302a6
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioConnectionNode.test.ts
@@ -0,0 +1,144 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import * as vscode from 'vscode'
+import { SageMakerUnifiedStudioConnectionNode } from '../../../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioConnectionNode'
+import { SageMakerUnifiedStudioConnectionParentNode } from '../../../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioConnectionParentNode'
+import { ConnectionType, ConnectionSummary } from '@aws-sdk/client-datazone'
+import { getLogger } from '../../../../shared/logger/logger'
+
+describe('SageMakerUnifiedStudioConnectionNode', function () {
+    let connectionNode: SageMakerUnifiedStudioConnectionNode
+    let mockParent: sinon.SinonStubbedInstance<SageMakerUnifiedStudioConnectionParentNode>
+
+    const mockRedshiftConnection: ConnectionSummary = {
+        connectionId: 'conn-1',
+        name: 'Test Redshift Connection',
+        type: ConnectionType.REDSHIFT,
+        environmentId: 'env-1',
+        domainId: 'domain-1',
+        domainUnitId: 'unit-1',
+        physicalEndpoints: [],
+        props: {
+            redshiftProperties: {
+                jdbcUrl: 'jdbc:redshift://test-cluster:5439/testdb',
+            },
+        },
+    }
+
+    const mockSparkConnection: ConnectionSummary = {
+        connectionId: 'conn-2',
+        name: 'Test Spark Connection',
+        type: ConnectionType.SPARK,
+        environmentId: 'env-2',
+        domainId: 'domain-2',
+        domainUnitId: 'unit-2',
+        physicalEndpoints: [],
+        props: {
+            sparkGlueProperties: {
+                glueVersion: '4.0',
+                workerType: 'G.1X',
+                numberOfWorkers: 2,
+                idleTimeout: 30,
+            },
+        },
+    }
+
+    beforeEach(function () {
+        mockParent = {} as any
+        sinon.stub(getLogger(), 'debug')
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    describe('constructor', function () {
+        it('creates instance with correct properties for Redshift connection', function () {
+            connectionNode = new SageMakerUnifiedStudioConnectionNode(mockParent as any, mockRedshiftConnection)
+
+            assert.strictEqual(connectionNode.id, 'Test Redshift Connection')
+            assert.strictEqual(connectionNode.resource, connectionNode)
+            assert.strictEqual(connectionNode.contextValue, 'SageMakerUnifiedStudioConnectionNode')
+        })
+
+        it('creates instance with empty id when connection name is undefined', function () {
+            const connectionWithoutName = { ...mockRedshiftConnection, name: undefined }
+            connectionNode = new SageMakerUnifiedStudioConnectionNode(mockParent as any, connectionWithoutName)
+
+            assert.strictEqual(connectionNode.id, '')
+        })
+    })
+
+    describe('getTreeItem', function () {
+        it('returns correct tree item for Redshift connection', async function () {
+            connectionNode = new SageMakerUnifiedStudioConnectionNode(mockParent as any, mockRedshiftConnection)
+
+            const treeItem = await connectionNode.getTreeItem()
+
+            assert.strictEqual(treeItem.label, 'Test Redshift Connection')
+            assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.None)
+            assert.strictEqual(treeItem.contextValue, 'SageMakerUnifiedStudioConnectionNode')
+            assert.ok(treeItem.tooltip instanceof vscode.MarkdownString)
+        })
+
+        it('returns correct tree item for Spark connection', async function () {
+            connectionNode = new SageMakerUnifiedStudioConnectionNode(mockParent as any, mockSparkConnection)
+
+            const treeItem = await connectionNode.getTreeItem()
+
+            assert.strictEqual(treeItem.label, 'Test Spark Connection')
+            assert.ok(treeItem.tooltip instanceof vscode.MarkdownString)
+        })
+    })
+
+    describe('tooltip generation', function () {
+        it('generates correct tooltip for Redshift connection', async function () {
+            connectionNode = new SageMakerUnifiedStudioConnectionNode(mockParent as any, mockRedshiftConnection)
+
+            const treeItem = await connectionNode.getTreeItem()
+            const tooltip = (treeItem.tooltip as vscode.MarkdownString).value
+
+            assert(tooltip.includes('REDSHIFT'))
+            assert(tooltip.includes('env-1'))
+            assert(tooltip.includes('jdbc:redshift://test-cluster:5439/testdb'))
+        })
+
+        it('generates correct tooltip for Spark connection', async function () {
+            connectionNode = new SageMakerUnifiedStudioConnectionNode(mockParent as any, mockSparkConnection)
+
+            const treeItem = await connectionNode.getTreeItem()
+            const tooltip = (treeItem.tooltip as vscode.MarkdownString).value
+
+            assert(tooltip.includes('SPARK'))
+            assert(tooltip.includes('4.0'))
+            assert(tooltip.includes('G.1X'))
+            assert(tooltip.includes('2'))
+            assert(tooltip.includes('30'))
+        })
+
+        it('generates empty tooltip for unknown connection type', async function () {
+            const unknownConnection = { ...mockRedshiftConnection, type: 'UNKNOWN' as ConnectionType }
+            connectionNode = new SageMakerUnifiedStudioConnectionNode(mockParent as any, unknownConnection)
+
+            const treeItem = await connectionNode.getTreeItem()
+            const tooltip = (treeItem.tooltip as vscode.MarkdownString).value
+
+            assert.strictEqual(tooltip, '')
+        })
+    })
+
+    describe('getParent', function () {
+        it('returns the parent node', function () {
+            connectionNode = new SageMakerUnifiedStudioConnectionNode(mockParent as any, mockRedshiftConnection)
+
+            const parent = connectionNode.getParent()
+
+            assert.strictEqual(parent, mockParent)
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioConnectionParentNode.test.ts b/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioConnectionParentNode.test.ts
new file mode 100644
index 00000000000..686c85a0055
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioConnectionParentNode.test.ts
@@ -0,0 +1,234 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import * as vscode from 'vscode'
+import { SageMakerUnifiedStudioConnectionParentNode } from '../../../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioConnectionParentNode'
+import { SageMakerUnifiedStudioComputeNode } from '../../../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioComputeNode'
+import { SageMakerUnifiedStudioConnectionNode } from '../../../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioConnectionNode'
+import { DataZoneClient } from '../../../../sagemakerunifiedstudio/shared/client/datazoneClient'
+
+import { ConnectionType, ListConnectionsCommandOutput, ConnectionSummary } from '@aws-sdk/client-datazone'
+import { getLogger } from '../../../../shared/logger/logger'
+
+describe('SageMakerUnifiedStudioConnectionParentNode', function () {
+    let connectionParentNode: SageMakerUnifiedStudioConnectionParentNode
+    let mockComputeNode: sinon.SinonStubbedInstance<SageMakerUnifiedStudioComputeNode>
+
+    let mockDataZoneClient: sinon.SinonStubbedInstance<DataZoneClient>
+
+    const mockProject = {
+        id: 'project-123',
+        domainId: 'domain-123',
+    }
+
+    const mockConnectionsOutput: ListConnectionsCommandOutput = {
+        items: [
+            {
+                connectionId: 'conn-1',
+                name: 'Test Connection 1',
+                type: ConnectionType.REDSHIFT,
+                environmentId: 'env-1',
+            } as ConnectionSummary,
+            {
+                connectionId: 'conn-2',
+                name: 'Test Connection 2',
+                type: ConnectionType.REDSHIFT,
+                environmentId: 'env-2',
+            } as ConnectionSummary,
+        ],
+        $metadata: {},
+    }
+
+    beforeEach(function () {
+        // Create mock objects
+        mockDataZoneClient = {
+            fetchConnections: sinon.stub(),
+        } as any
+
+        mockComputeNode = {
+            authProvider: {} as any,
+            parent: {
+                project: mockProject,
+            } as any,
+        } as any
+
+        // Stub static methods
+        sinon.stub(DataZoneClient, 'getInstance').resolves(mockDataZoneClient as any)
+        sinon.stub(getLogger(), 'debug')
+
+        connectionParentNode = new SageMakerUnifiedStudioConnectionParentNode(
+            mockComputeNode as any,
+            ConnectionType.REDSHIFT,
+            'Data warehouse'
+        )
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    describe('constructor', function () {
+        it('creates instance with correct properties', function () {
+            assert.strictEqual(connectionParentNode.id, 'Data warehouse')
+            assert.strictEqual(connectionParentNode.resource, connectionParentNode)
+            assert.strictEqual(connectionParentNode.contextValue, 'SageMakerUnifiedStudioConnectionParentNode')
+        })
+    })
+
+    describe('getTreeItem', function () {
+        it('returns correct tree item', async function () {
+            const treeItem = await connectionParentNode.getTreeItem()
+
+            assert.strictEqual(treeItem.label, 'Data warehouse')
+            assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.Collapsed)
+            assert.strictEqual(treeItem.contextValue, 'SageMakerUnifiedStudioConnectionParentNode')
+        })
+    })
+
+    describe('getChildren', function () {
+        it('returns connection nodes when connections exist', async function () {
+            mockDataZoneClient.fetchConnections.resolves(mockConnectionsOutput)
+
+            const children = await connectionParentNode.getChildren()
+
+            assert.strictEqual(children.length, 2)
+            assert(children[0] instanceof SageMakerUnifiedStudioConnectionNode)
+            assert(children[1] instanceof SageMakerUnifiedStudioConnectionNode)
+
+            // Verify fetchConnections was called with correct parameters
+            assert(
+                mockDataZoneClient.fetchConnections.calledOnceWith(
+                    mockProject.domainId,
+                    mockProject.id,
+                    ConnectionType.REDSHIFT
+                )
+            )
+        })
+
+        it('returns no connections node when no connections exist', async function () {
+            const emptyOutput: ListConnectionsCommandOutput = { items: [], $metadata: {} }
+            mockDataZoneClient.fetchConnections.resolves(emptyOutput)
+
+            const children = await connectionParentNode.getChildren()
+
+            assert.strictEqual(children.length, 1)
+            assert.strictEqual(children[0].id, 'smusNoConnections')
+            const treeItem = await children[0].getTreeItem()
+            assert.strictEqual(treeItem.label, '[No connections found]')
+            assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.None)
+        })
+
+        it('returns no connections node when connections items is undefined', async function () {
+            const undefinedOutput: ListConnectionsCommandOutput = { items: undefined, $metadata: {} }
+            mockDataZoneClient.fetchConnections.resolves(undefinedOutput)
+
+            const children = await connectionParentNode.getChildren()
+
+            assert.strictEqual(children.length, 1)
+            assert.strictEqual(children[0].id, 'smusNoConnections')
+        })
+
+        it('handles missing project information gracefully', async function () {
+            const nodeWithoutProject = new SageMakerUnifiedStudioConnectionParentNode(
+                {
+                    authProvider: {} as any,
+                    parent: {
+                        project: undefined,
+                    } as any,
+                } as any,
+                ConnectionType.SPARK,
+                'Data processing'
+            )
+
+            mockDataZoneClient.fetchConnections.resolves({ items: [], $metadata: {} })
+
+            const children = await nodeWithoutProject.getChildren()
+
+            assert.strictEqual(children.length, 1)
+            assert.strictEqual(children[0].id, 'smusNoConnections')
+            assert(mockDataZoneClient.fetchConnections.calledOnceWith(undefined, undefined, ConnectionType.SPARK))
+        })
+    })
+
+    describe('getParent', function () {
+        it('returns the parent compute node', function () {
+            const parent = connectionParentNode.getParent()
+            assert.strictEqual(parent, mockComputeNode)
+        })
+    })
+
+    describe('error handling', function () {
+        it('handles DataZoneClient.getInstance error', async function () {
+            sinon.restore()
+            sinon.stub(DataZoneClient, 'getInstance').rejects(new Error('Client error'))
+            sinon.stub(getLogger(), 'debug')
+
+            try {
+                await connectionParentNode.getChildren()
+                assert.fail('Expected error to be thrown')
+            } catch (error) {
+                assert.strictEqual((error as Error).message, 'Client error')
+            }
+        })
+
+        it('handles fetchConnections error', async function () {
+            mockDataZoneClient.fetchConnections.rejects(new Error('Fetch error'))
+
+            try {
+                await connectionParentNode.getChildren()
+                assert.fail('Expected error to be thrown')
+            } catch (error) {
+                assert.strictEqual((error as Error).message, 'Fetch error')
+            }
+        })
+    })
+
+    describe('connections property', function () {
+        it('sets connections property after getChildren call', async function () {
+            mockDataZoneClient.fetchConnections.resolves(mockConnectionsOutput)
+
+            await connectionParentNode.getChildren()
+
+            assert.strictEqual(connectionParentNode.connections, mockConnectionsOutput)
+        })
+    })
+
+    describe('different connection types', function () {
+        it('works with SPARK connection type', async function () {
+            const sparkNode = new SageMakerUnifiedStudioConnectionParentNode(
+                mockComputeNode as any,
+                ConnectionType.SPARK,
+                'Spark connections'
+            )
+
+            const sparkOutput = {
+                items: [
+                    {
+                        connectionId: 'spark-1',
+                        name: 'Spark Connection',
+                        type: ConnectionType.SPARK,
+                        environmentId: 'env-spark',
+                    } as ConnectionSummary,
+                ],
+                $metadata: {},
+            }
+
+            mockDataZoneClient.fetchConnections.resolves(sparkOutput)
+
+            const children = await sparkNode.getChildren()
+
+            assert.strictEqual(children.length, 1)
+            assert(
+                mockDataZoneClient.fetchConnections.calledWith(
+                    mockProject.domainId,
+                    mockProject.id,
+                    ConnectionType.SPARK
+                )
+            )
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioDataNode.test.ts b/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioDataNode.test.ts
new file mode 100644
index 00000000000..991e5955989
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioDataNode.test.ts
@@ -0,0 +1,235 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { SageMakerUnifiedStudioDataNode } from '../../../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioDataNode'
+import { SageMakerUnifiedStudioProjectNode } from '../../../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioProjectNode'
+import { DataZoneClient, DataZoneProject } from '../../../../sagemakerunifiedstudio/shared/client/datazoneClient'
+import { SmusAuthenticationProvider } from '../../../../sagemakerunifiedstudio/auth/providers/smusAuthenticationProvider'
+import * as s3Strategy from '../../../../sagemakerunifiedstudio/explorer/nodes/s3Strategy'
+import * as redshiftStrategy from '../../../../sagemakerunifiedstudio/explorer/nodes/redshiftStrategy'
+import * as lakehouseStrategy from '../../../../sagemakerunifiedstudio/explorer/nodes/lakehouseStrategy'
+
+describe('SageMakerUnifiedStudioDataNode', function () {
+    let sandbox: sinon.SinonSandbox
+    let dataNode: SageMakerUnifiedStudioDataNode
+    let mockParent: sinon.SinonStubbedInstance<SageMakerUnifiedStudioProjectNode>
+    let mockDataZoneClient: sinon.SinonStubbedInstance<DataZoneClient>
+    let mockAuthProvider: sinon.SinonStubbedInstance<SmusAuthenticationProvider>
+    let mockProjectCredentialProvider: any
+
+    const mockProject: DataZoneProject = {
+        id: 'project-123',
+        name: 'Test Project',
+        domainId: 'domain-123',
+    }
+
+    const mockCredentials = {
+        accessKeyId: 'test-key',
+        secretAccessKey: 'test-secret',
+        sessionToken: 'test-token',
+        $metadata: {},
+    }
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+
+        mockParent = {
+            getProject: sandbox.stub().returns(mockProject),
+        } as any
+
+        mockProjectCredentialProvider = {
+            getCredentials: sandbox.stub().resolves(mockCredentials),
+        }
+
+        mockAuthProvider = {
+            getProjectCredentialProvider: sandbox.stub().resolves(mockProjectCredentialProvider),
+            getConnectionCredentialsProvider: sandbox.stub().resolves(mockProjectCredentialProvider),
+            getDomainRegion: sandbox.stub().returns('us-east-1'),
+        } as any
+
+        mockDataZoneClient = {
+            getInstance: sandbox.stub(),
+            getProjectDefaultEnvironmentCreds: sandbox.stub(),
+            listConnections: sandbox.stub(),
+            getConnection: sandbox.stub(),
+            getRegion: sandbox.stub().returns('us-east-1'),
+        } as any
+
+        sandbox.stub(DataZoneClient, 'getInstance').returns(mockDataZoneClient as any)
+        sandbox.stub(SmusAuthenticationProvider, 'fromContext').returns(mockAuthProvider as any)
+        sandbox.stub(s3Strategy, 'createS3ConnectionNode').returns({
+            id: 's3-node',
+            getChildren: () => Promise.resolve([]),
+            getTreeItem: () => ({}) as any,
+            getParent: () => undefined,
+        } as any)
+        sandbox.stub(s3Strategy, 'createS3AccessGrantNodes').resolves([])
+        sandbox.stub(redshiftStrategy, 'createRedshiftConnectionNode').returns({
+            id: 'redshift-node',
+            getChildren: () => Promise.resolve([]),
+            getTreeItem: () => ({}) as any,
+            getParent: () => undefined,
+        } as any)
+        sandbox.stub(lakehouseStrategy, 'createLakehouseConnectionNode').returns({
+            id: 'lakehouse-node',
+            getChildren: () => Promise.resolve([]),
+            getTreeItem: () => ({}) as any,
+            getParent: () => undefined,
+        } as any)
+
+        dataNode = new SageMakerUnifiedStudioDataNode(mockParent as any)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    describe('constructor', function () {
+        it('should initialize with correct properties', function () {
+            assert.strictEqual(dataNode.id, 'smusDataExplorer')
+            assert.deepStrictEqual(dataNode.resource, {})
+        })
+
+        it('should initialize with provided children', function () {
+            const initialChildren = [{ id: 'child1' } as any]
+            const nodeWithChildren = new SageMakerUnifiedStudioDataNode(mockParent as any, initialChildren)
+            // Children should be cached
+            assert.ok(nodeWithChildren)
+        })
+    })
+
+    describe('getTreeItem', function () {
+        it('should return correct tree item', function () {
+            const treeItem = dataNode.getTreeItem()
+
+            assert.strictEqual(treeItem.label, 'Data')
+            assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.Collapsed)
+            assert.strictEqual(treeItem.contextValue, 'dataFolder')
+        })
+    })
+
+    describe('getParent', function () {
+        it('should return parent node', function () {
+            assert.strictEqual(dataNode.getParent(), mockParent)
+        })
+    })
+
+    describe('getChildren', function () {
+        it('should return cached children if available', async function () {
+            const initialChildren = [{ id: 'cached' } as any]
+            const nodeWithCache = new SageMakerUnifiedStudioDataNode(mockParent as any, initialChildren)
+
+            const children = await nodeWithCache.getChildren()
+            assert.strictEqual(children, initialChildren)
+        })
+
+        it('should return error node when no project available', async function () {
+            mockParent.getProject.returns(undefined)
+
+            const children = await dataNode.getChildren()
+
+            assert.strictEqual(children.length, 1)
+            assert.ok(children[0].id.startsWith('smusDataExplorer-error-project-'))
+        })
+
+        it('should return error node when credentials are missing', async function () {
+            mockProjectCredentialProvider.getCredentials.resolves(undefined)
+
+            const children = await dataNode.getChildren()
+
+            assert.strictEqual(children.length, 1)
+            assert.ok(children[0].id.startsWith('smusDataExplorer-error-connections-'))
+        })
+
+        it('should return placeholder when no connections found', async function () {
+            mockDataZoneClient.listConnections.resolves([])
+
+            const children = await dataNode.getChildren()
+
+            assert.strictEqual(children.length, 1)
+            assert.strictEqual(children[0].resource, '[No data found]')
+        })
+
+        it('should create Bucket parent node and Redshift nodes for connections', async function () {
+            const mockConnections = [
+                { connectionId: 's3-conn', type: 'S3', name: 's3-connection' },
+                { connectionId: 'redshift-conn', type: 'REDSHIFT', name: 'redshift-connection' },
+            ]
+
+            mockDataZoneClient.listConnections.resolves(mockConnections as any)
+            mockDataZoneClient.getConnection
+                .onFirstCall()
+                .resolves({
+                    location: { awsRegion: 'us-east-1', awsAccountId: '' },
+                    connectionCredentials: mockCredentials,
+                    connectionId: '',
+                    name: '',
+                    type: '',
+                    domainId: '',
+                    projectId: '',
+                })
+                .onSecondCall()
+                .resolves({
+                    location: { awsRegion: 'us-east-1', awsAccountId: '' },
+                    connectionCredentials: mockCredentials,
+                    connectionId: '',
+                    name: '',
+                    type: '',
+                    domainId: '',
+                    projectId: '',
+                })
+
+            const children = await dataNode.getChildren()
+
+            // Should have Bucket parent node and Redshift node
+            assert.strictEqual(children.length, 2)
+
+            // Check for Bucket parent node
+            const bucketNode = children.find((child) => child.id === 'bucket-parent')
+            assert.ok(bucketNode, 'Should have bucket parent node')
+
+            // Verify Bucket node has correct tree item
+            const bucketTreeItem = await bucketNode!.getTreeItem()
+            assert.strictEqual(bucketTreeItem.label, 'Buckets')
+            assert.strictEqual(bucketTreeItem.contextValue, 'bucketFolder')
+
+            // Verify S3 nodes are created when Bucket node is expanded
+            await bucketNode!.getChildren!()
+            assert.ok((s3Strategy.createS3ConnectionNode as sinon.SinonStub).calledOnce)
+
+            assert.ok((redshiftStrategy.createRedshiftConnectionNode as sinon.SinonStub).calledOnce)
+        })
+
+        it('should handle connection detail errors gracefully', async function () {
+            const mockConnections = [{ connectionId: 's3-conn', type: 'S3', name: 's3-connection' }]
+
+            mockDataZoneClient.listConnections.resolves(mockConnections as any)
+            mockDataZoneClient.getConnection.rejects(new Error('Connection error'))
+
+            const children = await dataNode.getChildren()
+
+            // Should have Bucket parent node even with connection errors
+            assert.strictEqual(children.length, 1)
+            assert.strictEqual(children[0].id, 'bucket-parent')
+
+            // Error should occur when expanding the Bucket node
+            const bucketChildren = await children[0].getChildren!()
+            assert.strictEqual(bucketChildren.length, 1)
+            assert.ok(bucketChildren[0].id.startsWith('smusDataExplorer-error-s3-'))
+        })
+
+        it('should return error node when general error occurs', async function () {
+            mockAuthProvider.getProjectCredentialProvider.rejects(new Error('General error'))
+
+            const children = await dataNode.getChildren()
+
+            assert.strictEqual(children.length, 1)
+            assert.ok(children[0].id.startsWith('smusDataExplorer-error-connections-'))
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioProjectNode.test.ts b/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioProjectNode.test.ts
new file mode 100644
index 00000000000..2fd8317fe06
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioProjectNode.test.ts
@@ -0,0 +1,335 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import * as vscode from 'vscode'
+import { SageMakerUnifiedStudioProjectNode } from '../../../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioProjectNode'
+import { DataZoneClient, DataZoneProject } from '../../../../sagemakerunifiedstudio/shared/client/datazoneClient'
+import { getLogger } from '../../../../shared/logger/logger'
+import { telemetry } from '../../../../shared/telemetry/telemetry'
+import { SagemakerClient } from '../../../../shared/clients/sagemaker'
+import { SageMakerUnifiedStudioDataNode } from '../../../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioDataNode'
+import { SageMakerUnifiedStudioComputeNode } from '../../../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioComputeNode'
+import * as vscodeUtils from '../../../../shared/vscode/setContext'
+import { createMockExtensionContext } from '../../testUtils'
+
+describe('SageMakerUnifiedStudioProjectNode', function () {
+    let projectNode: SageMakerUnifiedStudioProjectNode
+    let mockDataZoneClient: sinon.SinonStubbedInstance<DataZoneClient>
+
+    const mockProject: DataZoneProject = {
+        id: 'project-123',
+        name: 'Test Project',
+        description: 'Test Description',
+        domainId: 'domain-123',
+    }
+
+    beforeEach(function () {
+        // Create mock parent
+        const mockParent = {} as any
+
+        // Create mock auth provider
+        const mockAuthProvider = {
+            activeConnection: { domainId: 'test-domain', ssoRegion: 'us-west-2' },
+            invalidateAllProjectCredentialsInCache: sinon.stub(),
+            getProjectCredentialProvider: sinon.stub(),
+            getDomainRegion: sinon.stub().returns('us-west-2'),
+            getDomainAccountId: sinon.stub().resolves('123456789012'),
+        } as any
+
+        // Create mock extension context
+        const mockExtensionContext = createMockExtensionContext()
+
+        projectNode = new SageMakerUnifiedStudioProjectNode(mockParent, mockAuthProvider, mockExtensionContext)
+
+        sinon.stub(getLogger(), 'info')
+        sinon.stub(getLogger(), 'warn')
+
+        // Stub telemetry
+        sinon.stub(telemetry, 'record')
+
+        // Create mock DataZone client
+        mockDataZoneClient = {
+            getProjectDefaultEnvironmentCreds: sinon.stub(),
+            getUserId: sinon.stub(),
+            fetchAllProjectMemberships: sinon.stub(),
+            getDomainId: sinon.stub().returns('test-domain-id'),
+            getToolingEnvironmentId: sinon.stub(),
+            getEnvironmentDetails: sinon.stub(),
+            getToolingEnvironment: sinon.stub(),
+        } as any
+
+        // Stub DataZoneClient static methods
+        sinon.stub(DataZoneClient, 'getInstance').returns(mockDataZoneClient as any)
+
+        // Stub SagemakerClient constructor
+        sinon.stub(SagemakerClient.prototype, 'dispose')
+
+        // Stub child node constructors to prevent actual instantiation
+        sinon.stub(SageMakerUnifiedStudioDataNode.prototype, 'constructor' as any).returns({})
+        sinon.stub(SageMakerUnifiedStudioComputeNode.prototype, 'constructor' as any).returns({})
+
+        // Stub getContext to return false for SMUS space environment
+        sinon.stub(vscodeUtils, 'getContext').returns(false)
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    describe('constructor', function () {
+        it('creates instance with correct properties', function () {
+            assert.strictEqual(projectNode.id, 'smusProjectNode')
+            assert.strictEqual(projectNode.resource, projectNode)
+        })
+    })
+
+    describe('getTreeItem', function () {
+        it('returns correct tree item when no project is selected', async function () {
+            const treeItem = await projectNode.getTreeItem()
+
+            assert.strictEqual(treeItem.label, 'Select a project')
+            assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.Expanded)
+            assert.strictEqual(treeItem.contextValue, 'smusProjectSelectPicker')
+            assert.ok(treeItem.command)
+            assert.strictEqual(treeItem.command?.command, 'aws.smus.projectView')
+        })
+
+        it('returns correct tree item when project is selected', async function () {
+            await projectNode.setProject(mockProject)
+            const treeItem = await projectNode.getTreeItem()
+
+            assert.strictEqual(treeItem.label, 'Project: ' + mockProject.name)
+            assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.Expanded)
+            assert.strictEqual(treeItem.contextValue, 'smusSelectedProject')
+            assert.strictEqual(treeItem.tooltip, `Project: ${mockProject.name}\nID: ${mockProject.id}`)
+        })
+    })
+
+    describe('getParent', function () {
+        it('returns parent node', function () {
+            const parent = projectNode.getParent()
+            assert.ok(parent)
+        })
+    })
+
+    describe('setProject', function () {
+        it('updates the project and calls cleanupProjectResources', async function () {
+            const cleanupSpy = sinon.spy(projectNode as any, 'cleanupProjectResources')
+            await projectNode.setProject(mockProject)
+            assert.strictEqual(projectNode['project'], mockProject)
+            assert(cleanupSpy.calledOnce)
+        })
+    })
+
+    describe('clearProject', function () {
+        it('clears the project, calls cleanupProjectResources and fires change event', async function () {
+            await projectNode.setProject(mockProject)
+            const cleanupSpy = sinon.spy(projectNode as any, 'cleanupProjectResources')
+            const emitterSpy = sinon.spy(projectNode['onDidChangeEmitter'], 'fire')
+
+            await projectNode.clearProject()
+
+            assert.strictEqual(projectNode['project'], undefined)
+            assert(cleanupSpy.calledOnce)
+            assert(emitterSpy.calledOnce)
+        })
+    })
+
+    describe('getProject', function () {
+        it('returns undefined when no project is set', function () {
+            assert.strictEqual(projectNode.getProject(), undefined)
+        })
+
+        it('returns project when set', async function () {
+            await projectNode.setProject(mockProject)
+            assert.strictEqual(projectNode.getProject(), mockProject)
+        })
+    })
+
+    describe('refreshNode', function () {
+        it('fires change event', async function () {
+            const emitterSpy = sinon.spy(projectNode['onDidChangeEmitter'], 'fire')
+            await projectNode.refreshNode()
+            assert(emitterSpy.calledOnce)
+        })
+    })
+
+    describe('getChildren', function () {
+        it('returns empty array when no project is selected', async function () {
+            const children = await projectNode.getChildren()
+            assert.deepStrictEqual(children, [])
+        })
+
+        it('returns data and compute nodes when project is selected and user has access', async function () {
+            await projectNode.setProject(mockProject)
+            const mockCredProvider = {
+                getCredentials: sinon.stub().resolves({
+                    accessKeyId: 'test-key',
+                    secretAccessKey: 'test-secret',
+                    sessionToken: 'test-token',
+                }),
+            }
+            projectNode['authProvider'].getProjectCredentialProvider = sinon.stub().resolves(mockCredProvider)
+
+            // Mock getToolingEnvironment method
+            mockDataZoneClient.getToolingEnvironment.resolves({
+                id: 'env-123',
+                awsAccountRegion: 'us-east-1',
+                projectId: undefined,
+                domainId: undefined,
+                createdBy: undefined,
+                name: undefined,
+                provider: undefined,
+                $metadata: {},
+            })
+
+            const children = await projectNode.getChildren()
+            assert.strictEqual(children.length, 2)
+        })
+
+        it('returns access denied message when user does not have project access', async function () {
+            await projectNode.setProject(mockProject)
+
+            // Mock access check to return false by throwing AccessDeniedException
+            const accessError = new Error('Access denied')
+            accessError.name = 'AccessDeniedException'
+            projectNode['authProvider'].getProjectCredentialProvider = sinon.stub().rejects(accessError)
+
+            const children = await projectNode.getChildren()
+            assert.strictEqual(children.length, 1)
+            assert.strictEqual(children[0].id, 'smusProjectAccessDenied')
+
+            const treeItem = await children[0].getTreeItem()
+            assert.strictEqual(treeItem.label, 'You do not have access to this project. Contact your administrator.')
+        })
+
+        it('throws error when initializeSagemakerClient fails', async function () {
+            await projectNode.setProject(mockProject)
+            const credError = new Error('Failed to initialize SageMaker client')
+
+            // First call succeeds for access check, second call fails for initializeSagemakerClient
+            const mockCredProvider = {
+                getCredentials: sinon.stub().resolves({
+                    accessKeyId: 'test-key',
+                    secretAccessKey: 'test-secret',
+                    sessionToken: 'test-token',
+                }),
+            }
+            projectNode['authProvider'].getProjectCredentialProvider = sinon
+                .stub()
+                .onFirstCall()
+                .resolves(mockCredProvider)
+                .onSecondCall()
+                .rejects(credError)
+
+            // Mock getToolingEnvironment method
+            mockDataZoneClient.getToolingEnvironment.resolves({
+                id: 'env-123',
+                awsAccountRegion: 'us-east-1',
+                projectId: undefined,
+                domainId: undefined,
+                createdBy: undefined,
+                name: undefined,
+                provider: undefined,
+                $metadata: {},
+            })
+
+            await assert.rejects(async () => await projectNode.getChildren(), credError)
+        })
+    })
+
+    describe('initializeSagemakerClient', function () {
+        it('throws error when no project is selected', async function () {
+            await assert.rejects(
+                async () => await projectNode['initializeSagemakerClient']('us-east-1'),
+                /No project selected for initializing SageMaker client/
+            )
+        })
+
+        it('creates SagemakerClient with project credentials', async function () {
+            await projectNode.setProject(mockProject)
+            const mockCredProvider = {
+                getCredentials: sinon.stub().resolves({
+                    accessKeyId: 'test-key',
+                    secretAccessKey: 'test-secret',
+                    sessionToken: 'test-token',
+                }),
+            }
+            projectNode['authProvider'].getProjectCredentialProvider = sinon.stub().resolves(mockCredProvider)
+
+            const client = await projectNode['initializeSagemakerClient']('us-east-1')
+            assert.ok(client instanceof SagemakerClient)
+            assert(
+                (projectNode['authProvider'].getProjectCredentialProvider as sinon.SinonStub).calledWith(mockProject.id)
+            )
+        })
+    })
+
+    describe('checkProjectCredsAccess', function () {
+        it('returns true when user has project access', async function () {
+            const mockCredProvider = {
+                getCredentials: sinon.stub().resolves({
+                    accessKeyId: 'test-key',
+                    secretAccessKey: 'test-secret',
+                    sessionToken: 'test-token',
+                }),
+            }
+            projectNode['authProvider'].getProjectCredentialProvider = sinon.stub().resolves(mockCredProvider)
+
+            const hasAccess = await projectNode['checkProjectCredsAccess']('project-123')
+            assert.strictEqual(hasAccess, true)
+        })
+
+        it('returns false when user does not have project access', async function () {
+            const accessError = new Error('Access denied')
+            accessError.name = 'AccessDeniedException'
+            projectNode['authProvider'].getProjectCredentialProvider = sinon.stub().rejects(accessError)
+
+            const hasAccess = await projectNode['checkProjectCredsAccess']('project-123')
+            assert.strictEqual(hasAccess, false)
+        })
+
+        it('returns false when getCredentials fails', async function () {
+            const mockCredProvider = {
+                getCredentials: sinon.stub().rejects(new Error('Credentials error')),
+            }
+            projectNode['authProvider'].getProjectCredentialProvider = sinon.stub().resolves(mockCredProvider)
+
+            const hasAccess = await projectNode['checkProjectCredsAccess']('project-123')
+            assert.strictEqual(hasAccess, false)
+        })
+
+        it('returns false when access check throws non-AccessDeniedException error', async function () {
+            projectNode['authProvider'].getProjectCredentialProvider = sinon.stub().rejects(new Error('Other error'))
+
+            const hasAccess = await projectNode['checkProjectCredsAccess']('project-123')
+            assert.strictEqual(hasAccess, false)
+        })
+    })
+
+    describe('cleanupProjectResources', function () {
+        it('invalidates credentials and disposes existing sagemaker client', async function () {
+            // Set up existing sagemaker client with mock
+            const mockClient = { dispose: sinon.stub() } as any
+            projectNode['sagemakerClient'] = mockClient
+
+            await projectNode['cleanupProjectResources']()
+
+            assert((projectNode['authProvider'].invalidateAllProjectCredentialsInCache as sinon.SinonStub).calledOnce)
+            assert(mockClient.dispose.calledOnce)
+            assert.strictEqual(projectNode['sagemakerClient'], undefined)
+        })
+
+        it('handles case when no sagemaker client exists', async function () {
+            projectNode['sagemakerClient'] = undefined
+
+            await projectNode['cleanupProjectResources']()
+
+            assert((projectNode['authProvider'].invalidateAllProjectCredentialsInCache as sinon.SinonStub).calledOnce)
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioRootNode.test.ts b/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioRootNode.test.ts
new file mode 100644
index 00000000000..64b866c7704
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioRootNode.test.ts
@@ -0,0 +1,527 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import * as vscode from 'vscode'
+import {
+    SageMakerUnifiedStudioRootNode,
+    selectSMUSProject,
+} from '../../../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioRootNode'
+import { SageMakerUnifiedStudioProjectNode } from '../../../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioProjectNode'
+import { DataZoneClient, DataZoneProject } from '../../../../sagemakerunifiedstudio/shared/client/datazoneClient'
+import { SageMakerUnifiedStudioAuthInfoNode } from '../../../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioAuthInfoNode'
+import { SmusAuthenticationProvider } from '../../../../sagemakerunifiedstudio/auth/providers/smusAuthenticationProvider'
+import * as pickerPrompter from '../../../../shared/ui/pickerPrompter'
+import { getTestWindow } from '../../../shared/vscode/window'
+import { assertTelemetry } from '../../../../../src/test/testUtil'
+import { createMockExtensionContext, createMockUnauthenticatedAuthProvider } from '../../testUtils'
+
+describe('SmusRootNode', function () {
+    let rootNode: SageMakerUnifiedStudioRootNode
+    let mockDataZoneClient: sinon.SinonStubbedInstance<DataZoneClient>
+
+    const testDomainId = 'test-domain-123'
+    const mockProject: DataZoneProject = {
+        id: 'project-123',
+        name: 'Test Project',
+        description: 'Test Description',
+        domainId: testDomainId,
+    }
+
+    /**
+     * Helper function to verify login and learn more nodes
+     */
+    async function verifyLoginAndLearnMoreNodes(children: any[]) {
+        assert.strictEqual(children.length, 2)
+        assert.strictEqual(children[0].id, 'smusLogin')
+        assert.strictEqual(children[1].id, 'smusLearnMore')
+
+        // Check login node
+        const loginTreeItem = await children[0].getTreeItem()
+        assert.strictEqual(loginTreeItem.label, 'Sign in to get started')
+        assert.strictEqual(loginTreeItem.contextValue, 'sageMakerUnifiedStudioLogin')
+        assert.deepStrictEqual(loginTreeItem.command, {
+            command: 'aws.smus.login',
+            title: 'Sign in to SageMaker Unified Studio',
+        })
+
+        // Check learn more node
+        const learnMoreTreeItem = await children[1].getTreeItem()
+        assert.strictEqual(learnMoreTreeItem.label, 'Learn more about SageMaker Unified Studio')
+        assert.strictEqual(learnMoreTreeItem.contextValue, 'sageMakerUnifiedStudioLearnMore')
+        assert.deepStrictEqual(learnMoreTreeItem.command, {
+            command: 'aws.smus.learnMore',
+            title: 'Learn more about SageMaker Unified Studio',
+        })
+    }
+
+    beforeEach(function () {
+        // Create mock extension context
+        const mockExtensionContext = createMockExtensionContext()
+
+        // Create a mock auth provider
+        const mockAuthProvider = {
+            isConnected: sinon.stub().returns(true),
+            isConnectionValid: sinon.stub().returns(true),
+            activeConnection: { domainId: testDomainId, ssoRegion: 'us-west-2' },
+            onDidChange: sinon.stub().returns({ dispose: sinon.stub() }),
+        } as any
+
+        rootNode = new SageMakerUnifiedStudioRootNode(mockAuthProvider, mockExtensionContext)
+
+        // Mock domain ID is handled by the mock auth provider
+
+        // Create mock DataZone client
+        mockDataZoneClient = {
+            getDomainId: sinon.stub().returns(testDomainId),
+            listProjects: sinon.stub(),
+        } as any
+
+        // Stub DataZoneClient static methods
+        sinon.stub(DataZoneClient, 'getInstance').returns(mockDataZoneClient as any)
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    describe('constructor', function () {
+        it('should initialize id and resource properties', function () {
+            // Create a mock auth provider
+            const mockAuthProvider = {
+                isConnected: sinon.stub().returns(true),
+                isConnectionValid: sinon.stub().returns(true),
+                activeConnection: { domainId: testDomainId, ssoRegion: 'us-west-2' },
+                onDidChange: sinon.stub().returns({ dispose: sinon.stub() }),
+            } as any
+
+            const mockExtensionContext = createMockExtensionContext()
+
+            const node = new SageMakerUnifiedStudioRootNode(mockAuthProvider, mockExtensionContext)
+            assert.strictEqual(node.id, 'smusRootNode')
+            assert.strictEqual(node.resource, node)
+            assert.ok(node.getAuthInfoNode() instanceof SageMakerUnifiedStudioAuthInfoNode)
+            assert.ok(node.getProjectSelectNode() instanceof SageMakerUnifiedStudioProjectNode)
+            assert.strictEqual(typeof node.onDidChangeTreeItem, 'function')
+            assert.strictEqual(typeof node.onDidChangeChildren, 'function')
+        })
+    })
+
+    describe('getTreeItem', function () {
+        it('returns correct tree item when authenticated', async function () {
+            const treeItem = rootNode.getTreeItem()
+
+            assert.strictEqual(treeItem.label, 'SageMaker Unified Studio')
+            assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.Expanded)
+            assert.strictEqual(treeItem.contextValue, 'sageMakerUnifiedStudioRoot')
+            assert.strictEqual(treeItem.description, 'Connected')
+            assert.ok(treeItem.iconPath)
+        })
+
+        it('returns correct tree item when not authenticated', async function () {
+            // Create a mock auth provider for unauthenticated state
+            const mockAuthProvider = createMockUnauthenticatedAuthProvider()
+            const mockExtensionContext = createMockExtensionContext()
+
+            const unauthenticatedNode = new SageMakerUnifiedStudioRootNode(mockAuthProvider, mockExtensionContext)
+            const treeItem = unauthenticatedNode.getTreeItem()
+
+            assert.strictEqual(treeItem.label, 'SageMaker Unified Studio')
+            assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.Expanded)
+            assert.strictEqual(treeItem.contextValue, 'sageMakerUnifiedStudioRoot')
+            assert.strictEqual(treeItem.description, 'Not authenticated')
+            assert.ok(treeItem.iconPath)
+        })
+    })
+
+    describe('getChildren', function () {
+        it('returns login node when not authenticated (empty domain ID)', async function () {
+            // Create a mock auth provider for unauthenticated state
+            const mockAuthProvider = createMockUnauthenticatedAuthProvider()
+            const mockExtensionContext = createMockExtensionContext()
+
+            const unauthenticatedNode = new SageMakerUnifiedStudioRootNode(mockAuthProvider, mockExtensionContext)
+            const children = await unauthenticatedNode.getChildren()
+            await verifyLoginAndLearnMoreNodes(children)
+        })
+
+        it('returns login node when DataZone client throws error', async function () {
+            // Create a mock auth provider that throws an error
+            const mockAuthProvider = {
+                isConnected: sinon.stub().throws(new Error('Auth provider error')),
+                isConnectionValid: sinon.stub().returns(false),
+                activeConnection: undefined,
+                onDidChange: sinon.stub().returns({ dispose: sinon.stub() }),
+            } as any
+
+            const mockExtensionContext = createMockExtensionContext()
+
+            const errorNode = new SageMakerUnifiedStudioRootNode(mockAuthProvider, mockExtensionContext)
+            const children = await errorNode.getChildren()
+            await verifyLoginAndLearnMoreNodes(children)
+        })
+
+        it('returns root nodes when authenticated', async function () {
+            mockDataZoneClient.listProjects.resolves({ projects: [mockProject], nextToken: undefined })
+
+            const children = await rootNode.getChildren()
+
+            assert.strictEqual(children.length, 2)
+            assert.ok(children[0] instanceof SageMakerUnifiedStudioAuthInfoNode)
+            assert.ok(children[1] instanceof SageMakerUnifiedStudioProjectNode)
+            // The first child is the auth info node, the second is the project node
+            assert.strictEqual(children[0].id, 'smusAuthInfoNode')
+            assert.strictEqual(children[1].id, 'smusProjectNode')
+
+            assert.strictEqual(children.length, 2)
+            assert.strictEqual(children[1].id, 'smusProjectNode')
+
+            const treeItem = await children[1].getTreeItem()
+            assert.strictEqual(treeItem.label, 'Select a project')
+            assert.strictEqual(treeItem.contextValue, 'smusProjectSelectPicker')
+            assert.deepStrictEqual(treeItem.command, {
+                command: 'aws.smus.projectView',
+                title: 'Select Project',
+                arguments: [children[1]],
+            })
+        })
+
+        it('returns auth info node when connection is expired', async function () {
+            // Create a mock auth provider with expired connection
+            const mockAuthProvider = {
+                isConnected: sinon.stub().returns(true),
+                isConnectionValid: sinon.stub().returns(false),
+                activeConnection: { domainId: testDomainId, ssoRegion: 'us-west-2' },
+                onDidChange: sinon.stub().returns({ dispose: sinon.stub() }),
+                showReauthenticationPrompt: sinon.stub(),
+            } as any
+
+            const mockExtensionContext = createMockExtensionContext()
+
+            const expiredNode = new SageMakerUnifiedStudioRootNode(mockAuthProvider, mockExtensionContext)
+            const children = await expiredNode.getChildren()
+
+            assert.strictEqual(children.length, 1)
+            assert.ok(children[0] instanceof SageMakerUnifiedStudioAuthInfoNode)
+            assert.ok(mockAuthProvider.showReauthenticationPrompt.calledOnce)
+        })
+    })
+
+    describe('refresh', function () {
+        it('fires change events', function () {
+            const onDidChangeTreeItemSpy = sinon.spy()
+            const onDidChangeChildrenSpy = sinon.spy()
+
+            rootNode.onDidChangeTreeItem(onDidChangeTreeItemSpy)
+            rootNode.onDidChangeChildren(onDidChangeChildrenSpy)
+
+            rootNode.refresh()
+
+            assert(onDidChangeTreeItemSpy.calledOnce)
+            assert(onDidChangeChildrenSpy.calledOnce)
+        })
+    })
+})
+
+describe('SelectSMUSProject', function () {
+    let mockDataZoneClient: sinon.SinonStubbedInstance<DataZoneClient>
+    let mockProjectNode: sinon.SinonStubbedInstance<SageMakerUnifiedStudioProjectNode>
+    let createQuickPickStub: sinon.SinonStub
+    let executeCommandStub: sinon.SinonStub
+
+    const testDomainId = 'test-domain-123'
+    const mockProject: DataZoneProject = {
+        id: 'project-123',
+        name: 'Test Project',
+        description: 'Test Description',
+        domainId: testDomainId,
+        updatedAt: new Date(),
+    }
+
+    const mockProject2: DataZoneProject = {
+        id: 'project-456',
+        name: 'Another Project',
+        description: 'Another Description',
+        domainId: testDomainId,
+        updatedAt: new Date(Date.now() - 86400000), // 1 day ago
+    }
+
+    beforeEach(function () {
+        // Create mock DataZone client
+        mockDataZoneClient = {
+            getDomainId: sinon.stub().returns(testDomainId),
+            listProjects: sinon.stub(),
+            fetchAllProjects: sinon.stub(),
+        } as any
+
+        // Create mock project node
+        mockProjectNode = {
+            setProject: sinon.stub(),
+            getProject: sinon.stub().returns(undefined),
+            project: undefined,
+        } as any
+
+        // Stub DataZoneClient static methods
+        sinon.stub(DataZoneClient, 'getInstance').returns(mockDataZoneClient as any)
+
+        // Stub SmusAuthenticationProvider
+        sinon.stub(SmusAuthenticationProvider, 'fromContext').returns({
+            isConnected: sinon.stub().returns(true),
+            isConnectionValid: sinon.stub().returns(true),
+            activeConnection: { domainId: testDomainId, ssoRegion: 'us-west-2' },
+            getDomainAccountId: sinon.stub().resolves('123456789012'),
+            getDomainId: sinon.stub().returns(testDomainId),
+            getDomainRegion: sinon.stub().returns('us-west-2'),
+        } as any)
+
+        // Stub quickPick - return the project directly (not wrapped in an item)
+        const mockQuickPick = {
+            prompt: sinon.stub().resolves(mockProject),
+        }
+        createQuickPickStub = sinon.stub(pickerPrompter, 'createQuickPick').returns(mockQuickPick as any)
+
+        // Stub vscode.commands.executeCommand
+        executeCommandStub = sinon.stub(vscode.commands, 'executeCommand')
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    it('fetches all projects and sets the project for first time', async function () {
+        mockDataZoneClient.fetchAllProjects.resolves([mockProject, mockProject2])
+
+        const result = await selectSMUSProject(mockProjectNode as any)
+
+        assert.strictEqual(result, mockProject)
+        assert.ok(mockDataZoneClient.fetchAllProjects.calledOnce)
+        assert.ok(mockDataZoneClient.fetchAllProjects.calledWith())
+        assert.ok(createQuickPickStub.calledOnce)
+        assert.ok(mockProjectNode.setProject.calledOnce)
+        assert.ok(executeCommandStub.calledWith('aws.smus.rootView.refresh'))
+        assertTelemetry('smus_accessProject', {
+            result: 'Succeeded',
+            smusProjectId: mockProject.id,
+        })
+    })
+
+    it('filters out GenerativeAIModelGovernanceProject', async function () {
+        const governanceProject: DataZoneProject = {
+            id: 'governance-123',
+            name: 'GenerativeAIModelGovernanceProject',
+            description: 'Governance project',
+            domainId: testDomainId,
+            updatedAt: new Date(),
+        }
+
+        mockDataZoneClient.fetchAllProjects.resolves([mockProject, governanceProject, mockProject2])
+
+        await selectSMUSProject(mockProjectNode as any)
+
+        // Verify that the governance project is filtered out
+        const quickPickCall = createQuickPickStub.getCall(0)
+        const items = quickPickCall.args[0]
+        assert.strictEqual(items.length, 2) // Should only have mockProject and mockProject2
+        assert.ok(!items.some((item: any) => item.data.name === 'GenerativeAIModelGovernanceProject'))
+    })
+
+    it('handles no active connection', async function () {
+        sinon.restore()
+        sinon.stub(SmusAuthenticationProvider, 'fromContext').returns({
+            activeConnection: undefined,
+            getDomainId: sinon.stub().returns(undefined),
+        } as any)
+
+        const result = await selectSMUSProject(mockProjectNode as any)
+        assert.strictEqual(result, undefined)
+
+        assertTelemetry('smus_accessProject', {
+            result: 'Succeeded',
+        })
+    })
+
+    it('fetches all projects and switches the current project', async function () {
+        mockProjectNode = {
+            setProject: sinon.stub(),
+            getProject: sinon.stub().returns(mockProject),
+            project: mockProject,
+        } as any
+        mockDataZoneClient.fetchAllProjects.resolves([mockProject, mockProject2])
+
+        // Stub quickPick to return mockProject2 for the second test
+        const mockQuickPick = {
+            prompt: sinon.stub().resolves(mockProject2),
+        }
+        createQuickPickStub.restore() // Remove the previous stub
+        createQuickPickStub = sinon.stub(pickerPrompter, 'createQuickPick').returns(mockQuickPick as any)
+
+        const result = await selectSMUSProject(mockProjectNode as any)
+
+        assert.strictEqual(result, mockProject2)
+        assert.ok(mockDataZoneClient.fetchAllProjects.calledOnce)
+        assert.ok(mockDataZoneClient.fetchAllProjects.calledWith())
+        assert.ok(createQuickPickStub.calledOnce)
+        assert.ok(mockProjectNode.setProject.calledOnce)
+        assert.ok(executeCommandStub.calledWith('aws.smus.rootView.refresh'))
+        assertTelemetry('smus_accessProject', {
+            result: 'Succeeded',
+            smusProjectId: mockProject2.id,
+        })
+    })
+
+    it('shows message when no projects found', async function () {
+        mockDataZoneClient.fetchAllProjects.resolves([])
+
+        const result = await selectSMUSProject(mockProjectNode as any)
+
+        assert.strictEqual(result, undefined)
+        assert.ok(!mockProjectNode.setProject.called)
+    })
+
+    it('handles API errors gracefully', async function () {
+        const error = new Error('API error')
+        mockDataZoneClient.fetchAllProjects.rejects(error)
+
+        const result = await selectSMUSProject(mockProjectNode as any)
+        assert.strictEqual(result, undefined)
+
+        assert.ok(!mockProjectNode.setProject.called)
+        assertTelemetry('smus_accessProject', {
+            result: 'Succeeded',
+        })
+    })
+
+    it('handles case when user cancels project selection', async function () {
+        mockDataZoneClient.fetchAllProjects.resolves([mockProject, mockProject2])
+
+        // Make quickPick return undefined (user cancelled)
+        const mockQuickPick = {
+            prompt: sinon.stub().resolves(undefined),
+        }
+        createQuickPickStub.returns(mockQuickPick as any)
+
+        const result = await selectSMUSProject(mockProjectNode as any)
+
+        // Should return undefined
+        assert.strictEqual(result, undefined)
+
+        // Verify project was not set
+        assert.ok(!mockProjectNode.setProject.called)
+
+        // Verify refresh command was not called
+        assert.ok(!executeCommandStub.called)
+    })
+
+    it('handles empty projects list correctly', async function () {
+        mockDataZoneClient.fetchAllProjects.resolves([])
+
+        const result = await selectSMUSProject(mockProjectNode as any)
+
+        assert.strictEqual(result, undefined)
+        assert.ok(mockDataZoneClient.fetchAllProjects.calledOnce)
+        assert.ok(!mockProjectNode.setProject.called)
+        assert.ok(!executeCommandStub.called)
+    })
+})
+
+describe('selectSMUSProject - Additional Tests', function () {
+    let mockDataZoneClient: sinon.SinonStubbedInstance<DataZoneClient>
+    let mockProjectNode: sinon.SinonStubbedInstance<SageMakerUnifiedStudioProjectNode>
+    let createQuickPickStub: sinon.SinonStub
+    let executeCommandStub: sinon.SinonStub
+
+    const testDomainId = 'test-domain-123'
+    const mockProject: DataZoneProject = {
+        id: 'project-123',
+        name: 'Test Project',
+        description: 'Test Description',
+        domainId: testDomainId,
+        updatedAt: new Date(),
+    }
+
+    beforeEach(function () {
+        mockDataZoneClient = {
+            getDomainId: sinon.stub().returns(testDomainId),
+            fetchAllProjects: sinon.stub(),
+        } as any
+
+        mockProjectNode = {
+            setProject: sinon.stub(),
+        } as any
+
+        sinon.stub(DataZoneClient, 'getInstance').returns(mockDataZoneClient as any)
+        sinon.stub(SmusAuthenticationProvider, 'fromContext').returns({
+            activeConnection: { domainId: testDomainId, ssoRegion: 'us-west-2' },
+            getDomainAccountId: sinon.stub().resolves('123456789012'),
+            getDomainId: sinon.stub().returns(testDomainId),
+            getDomainRegion: sinon.stub().returns('us-west-2'),
+        } as any)
+
+        const mockQuickPick = {
+            prompt: sinon.stub().resolves(mockProject),
+        }
+        createQuickPickStub = sinon.stub(pickerPrompter, 'createQuickPick').returns(mockQuickPick as any)
+        executeCommandStub = sinon.stub(vscode.commands, 'executeCommand')
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    it('handles access denied error gracefully', async function () {
+        const accessDeniedError = new Error('Access denied')
+        accessDeniedError.name = 'AccessDeniedError'
+        mockDataZoneClient.fetchAllProjects.rejects(accessDeniedError)
+
+        const result = await selectSMUSProject(mockProjectNode as any)
+
+        assert.strictEqual(result, undefined)
+        assert.ok(
+            createQuickPickStub.calledWith([
+                {
+                    label: '$(error)',
+                    description: "You don't have permissions to view projects. Please contact your administrator",
+                },
+            ])
+        )
+    })
+
+    it('shows "No projects found" message when projects list is empty', async function () {
+        mockDataZoneClient.fetchAllProjects.resolves([])
+
+        const result = await selectSMUSProject(mockProjectNode as any)
+
+        assert.strictEqual(result, undefined)
+        const testWindow = getTestWindow()
+        assert.ok(testWindow.shownMessages.some((msg) => msg.message === 'No projects found in the domain'))
+        assert.ok(
+            createQuickPickStub.calledWith([
+                {
+                    label: 'No projects found',
+                    detail: '',
+                    description: '',
+                    data: {},
+                },
+            ])
+        )
+    })
+
+    it('handles invalid selected project object', async function () {
+        mockDataZoneClient.fetchAllProjects.resolves([mockProject])
+
+        // Mock quickPick to return an object with 'type' property (invalid selection)
+        const mockQuickPick = {
+            prompt: sinon.stub().resolves({ type: 'invalid', data: mockProject }),
+        }
+        createQuickPickStub.returns(mockQuickPick as any)
+
+        const result = await selectSMUSProject(mockProjectNode as any)
+
+        assert.deepStrictEqual(result, { type: 'invalid', data: mockProject })
+        assert.ok(!mockProjectNode.setProject.called)
+        assert.ok(!executeCommandStub.called)
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioSpaceNode.test.ts b/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioSpaceNode.test.ts
new file mode 100644
index 00000000000..a44b2ec3e7d
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioSpaceNode.test.ts
@@ -0,0 +1,280 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import * as vscode from 'vscode'
+import { SagemakerUnifiedStudioSpaceNode } from '../../../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioSpaceNode'
+import { SageMakerUnifiedStudioSpacesParentNode } from '../../../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioSpacesParentNode'
+import { SagemakerClient, SagemakerSpaceApp } from '../../../../shared/clients/sagemaker'
+import { SagemakerSpace } from '../../../../awsService/sagemaker/sagemakerSpace'
+
+describe('SagemakerUnifiedStudioSpaceNode', function () {
+    let spaceNode: SagemakerUnifiedStudioSpaceNode
+    let mockParent: SageMakerUnifiedStudioSpacesParentNode
+    let mockSagemakerClient: SagemakerClient
+    let mockSpaceApp: SagemakerSpaceApp
+    let mockSagemakerSpace: sinon.SinonStubbedInstance<SagemakerSpace>
+    let trackPendingNodeStub: sinon.SinonStub
+
+    beforeEach(function () {
+        trackPendingNodeStub = sinon.stub()
+        mockParent = {
+            trackPendingNode: trackPendingNodeStub,
+        } as any
+
+        mockSagemakerClient = {
+            describeApp: sinon.stub(),
+            describeSpace: sinon.stub(),
+        } as any
+
+        mockSpaceApp = {
+            SpaceName: 'test-space',
+            DomainId: 'domain-123',
+            Status: 'InService',
+            DomainSpaceKey: 'domain-123:test-space',
+            App: {
+                AppName: 'test-app',
+                Status: 'InService',
+            },
+        } as any
+
+        mockSagemakerSpace = {
+            label: 'test-space (Running)',
+            description: 'Private space',
+            tooltip: new vscode.MarkdownString('Space tooltip'),
+            iconPath: { light: 'light-icon', dark: 'dark-icon' },
+            contextValue: 'smusSpaceNode',
+            updateSpace: sinon.stub(),
+            setSpaceStatus: sinon.stub(),
+            isPending: sinon.stub().returns(false),
+            getStatus: sinon.stub().returns('Running'),
+            getAppStatus: sinon.stub().resolves('InService'),
+            name: 'test-space',
+            arn: 'arn:aws:sagemaker:us-west-2:123456789012:space/test-space',
+            getAppArn: sinon.stub().resolves('arn:aws:sagemaker:us-west-2:123456789012:app/test-app'),
+            getSpaceArn: sinon.stub().resolves('arn:aws:sagemaker:us-west-2:123456789012:space/test-space'),
+            updateSpaceAppStatus: sinon.stub().resolves(),
+            buildTooltip: sinon.stub().returns('Space tooltip'),
+            getAppIcon: sinon.stub().returns({ light: 'light-icon', dark: 'dark-icon' }),
+            DomainSpaceKey: 'domain-123:test-space',
+        } as any
+
+        sinon.stub(SagemakerSpace.prototype, 'constructor' as any).returns(mockSagemakerSpace)
+
+        spaceNode = new SagemakerUnifiedStudioSpaceNode(
+            mockParent,
+            mockSagemakerClient,
+            'us-west-2',
+            mockSpaceApp,
+            true
+        )
+
+        // Replace the internal smSpace with our mock
+        ;(spaceNode as any).smSpace = mockSagemakerSpace
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    describe('constructor', function () {
+        it('creates instance with correct properties', function () {
+            assert.strictEqual(spaceNode.id, 'smusSpaceNodetest-space')
+            assert.strictEqual(spaceNode.resource, spaceNode)
+            assert.strictEqual(spaceNode.regionCode, 'us-west-2')
+            assert.strictEqual(spaceNode.spaceApp, mockSpaceApp)
+        })
+    })
+
+    describe('getTreeItem', function () {
+        it('returns correct tree item', function () {
+            const treeItem = spaceNode.getTreeItem()
+
+            assert.strictEqual(treeItem.label, 'test-space (Running)')
+            assert.strictEqual(treeItem.description, 'Private space')
+            assert.strictEqual(treeItem.contextValue, 'smusSpaceNode')
+            assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.None)
+            assert.ok(treeItem.iconPath)
+            assert.ok(treeItem.tooltip)
+        })
+    })
+
+    describe('getChildren', function () {
+        it('returns empty array', function () {
+            const children = spaceNode.getChildren()
+            assert.deepStrictEqual(children, [])
+        })
+    })
+
+    describe('getParent', function () {
+        it('returns parent node', function () {
+            const parent = spaceNode.getParent()
+            assert.strictEqual(parent, mockParent)
+        })
+    })
+
+    describe('refreshNode', function () {
+        it('fires change event', async function () {
+            const emitterSpy = sinon.spy(spaceNode['onDidChangeEmitter'], 'fire')
+            await spaceNode.refreshNode()
+            assert(emitterSpy.calledOnce)
+        })
+    })
+
+    describe('updateSpace', function () {
+        it('updates space and tracks pending node when pending', function () {
+            mockSagemakerSpace.isPending.returns(true)
+            const newSpaceApp = { ...mockSpaceApp, Status: 'Pending' }
+
+            spaceNode.updateSpace(newSpaceApp)
+
+            assert(mockSagemakerSpace.updateSpace.calledWith(newSpaceApp))
+            assert(trackPendingNodeStub.calledWith('domain-123:test-space'))
+        })
+
+        it('updates space without tracking when not pending', function () {
+            mockSagemakerSpace.isPending.returns(false)
+            const newSpaceApp = { ...mockSpaceApp, Status: 'InService' }
+
+            spaceNode.updateSpace(newSpaceApp)
+
+            assert(mockSagemakerSpace.updateSpace.calledWith(newSpaceApp))
+            assert(trackPendingNodeStub.notCalled)
+        })
+    })
+
+    describe('setSpaceStatus', function () {
+        it('delegates to SagemakerSpace', function () {
+            spaceNode.setSpaceStatus('InService', 'Running')
+            assert(mockSagemakerSpace.setSpaceStatus.calledWith('InService', 'Running'))
+        })
+    })
+
+    describe('isPending', function () {
+        it('delegates to SagemakerSpace', function () {
+            const result = spaceNode.isPending()
+            assert(mockSagemakerSpace.isPending.called)
+            assert.strictEqual(result, false)
+        })
+    })
+
+    describe('getStatus', function () {
+        it('delegates to SagemakerSpace', function () {
+            const result = spaceNode.getStatus()
+            assert(mockSagemakerSpace.getStatus.called)
+            assert.strictEqual(result, 'Running')
+        })
+    })
+
+    describe('getAppStatus', function () {
+        it('delegates to SagemakerSpace', async function () {
+            const result = await spaceNode.getAppStatus()
+            assert(mockSagemakerSpace.getAppStatus.called)
+            assert.strictEqual(result, 'InService')
+        })
+    })
+
+    describe('name property', function () {
+        it('returns space name', function () {
+            assert.strictEqual(spaceNode.name, 'test-space')
+        })
+    })
+
+    describe('arn property', function () {
+        it('returns space arn', function () {
+            assert.strictEqual(spaceNode.arn, 'arn:aws:sagemaker:us-west-2:123456789012:space/test-space')
+        })
+    })
+
+    describe('getAppArn', function () {
+        it('delegates to SagemakerSpace', async function () {
+            const result = await spaceNode.getAppArn()
+            assert(mockSagemakerSpace.getAppArn.called)
+            assert.strictEqual(result, 'arn:aws:sagemaker:us-west-2:123456789012:app/test-app')
+        })
+    })
+
+    describe('getSpaceArn', function () {
+        it('delegates to SagemakerSpace', async function () {
+            const result = await spaceNode.getSpaceArn()
+            assert(mockSagemakerSpace.getSpaceArn.called)
+            assert.strictEqual(result, 'arn:aws:sagemaker:us-west-2:123456789012:space/test-space')
+        })
+    })
+
+    describe('updateSpaceAppStatus', function () {
+        it('updates status and tracks pending node when pending', async function () {
+            mockSagemakerSpace.isPending.returns(true)
+
+            await spaceNode.updateSpaceAppStatus()
+
+            assert(mockSagemakerSpace.updateSpaceAppStatus.called)
+            assert(trackPendingNodeStub.calledWith('domain-123:test-space'))
+        })
+
+        it('updates status without tracking when not pending', async function () {
+            mockSagemakerSpace.isPending.returns(false)
+
+            await spaceNode.updateSpaceAppStatus()
+
+            assert(mockSagemakerSpace.updateSpaceAppStatus.called)
+            assert(trackPendingNodeStub.notCalled)
+        })
+    })
+
+    describe('buildTooltip', function () {
+        it('delegates to SagemakerSpace', function () {
+            const result = spaceNode.buildTooltip()
+            assert(mockSagemakerSpace.buildTooltip.called)
+            assert.strictEqual(result, 'Space tooltip')
+        })
+    })
+
+    describe('getAppIcon', function () {
+        it('delegates to SagemakerSpace', function () {
+            const result = spaceNode.getAppIcon()
+            assert(mockSagemakerSpace.getAppIcon.called)
+            assert.deepStrictEqual(result, { light: 'light-icon', dark: 'dark-icon' })
+        })
+    })
+
+    describe('DomainSpaceKey property', function () {
+        it('returns domain space key', function () {
+            assert.strictEqual(spaceNode.DomainSpaceKey, 'domain-123:test-space')
+        })
+    })
+
+    describe('SagemakerSpace getContext for SMUS', function () {
+        it('returns awsSagemakerSpaceRunningNode for running SMUS space with undefined RemoteAccess', function () {
+            // Create a space app without RemoteAccess setting (undefined)
+            const smusSpaceApp = {
+                SpaceName: 'test-space',
+                DomainId: 'domain-123',
+                Status: 'InService',
+                DomainSpaceKey: 'domain-123:test-space',
+                App: {
+                    AppName: 'test-app',
+                    Status: 'InService',
+                },
+                SpaceSettingsSummary: {
+                    // RemoteAccess is undefined
+                },
+            } as any
+
+            // Create a real SagemakerSpace instance for SMUS to test the actual getContext logic
+            const realSagemakerSpace = new SagemakerSpace(
+                mockSagemakerClient,
+                'us-west-2',
+                smusSpaceApp,
+                true // isSMUSSpace = true
+            )
+
+            const context = realSagemakerSpace.getContext()
+
+            assert.strictEqual(context, 'awsSagemakerSpaceRunningNode')
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioSpacesParentNode.test.ts b/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioSpacesParentNode.test.ts
new file mode 100644
index 00000000000..31481e70953
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioSpacesParentNode.test.ts
@@ -0,0 +1,421 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import * as vscode from 'vscode'
+import { SageMakerUnifiedStudioSpacesParentNode } from '../../../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioSpacesParentNode'
+import { SageMakerUnifiedStudioComputeNode } from '../../../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioComputeNode'
+import { SagemakerUnifiedStudioSpaceNode } from '../../../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioSpaceNode'
+import { DataZoneClient } from '../../../../sagemakerunifiedstudio/shared/client/datazoneClient'
+import { SagemakerClient } from '../../../../shared/clients/sagemaker'
+import { SmusAuthenticationProvider } from '../../../../sagemakerunifiedstudio/auth/providers/smusAuthenticationProvider'
+import { getLogger } from '../../../../shared/logger/logger'
+import { SmusUtils } from '../../../../sagemakerunifiedstudio/shared/smusUtils'
+
+describe('SageMakerUnifiedStudioSpacesParentNode', function () {
+    let spacesNode: SageMakerUnifiedStudioSpacesParentNode
+    let mockParent: SageMakerUnifiedStudioComputeNode
+    let mockExtensionContext: vscode.ExtensionContext
+    let mockAuthProvider: SmusAuthenticationProvider
+    let mockSagemakerClient: sinon.SinonStubbedInstance<SagemakerClient>
+    let mockDataZoneClient: sinon.SinonStubbedInstance<DataZoneClient>
+
+    beforeEach(function () {
+        mockParent = {} as any
+        mockExtensionContext = {
+            extensionUri: vscode.Uri.file('/test'),
+        } as any
+        mockAuthProvider = {
+            activeConnection: { domainId: 'test-domain', ssoRegion: 'us-west-2' },
+        } as any
+        mockSagemakerClient = sinon.createStubInstance(SagemakerClient)
+        mockSagemakerClient.fetchSpaceAppsAndDomains.resolves([new Map(), new Map()])
+
+        mockDataZoneClient = {
+            getInstance: sinon.stub(),
+            getUserId: sinon.stub(),
+            getDomainId: sinon.stub(),
+            getRegion: sinon.stub(),
+            getToolingEnvironmentId: sinon.stub(),
+            getEnvironmentDetails: sinon.stub(),
+            getToolingEnvironment: sinon.stub(),
+        } as any
+
+        sinon.stub(DataZoneClient, 'getInstance').resolves(mockDataZoneClient as any)
+        sinon.stub(getLogger(), 'debug')
+        sinon.stub(getLogger(), 'error')
+        sinon.stub(SmusUtils, 'extractSSOIdFromUserId').returns('user-12345')
+
+        spacesNode = new SageMakerUnifiedStudioSpacesParentNode(
+            mockParent,
+            'project-123',
+            mockExtensionContext,
+            mockAuthProvider,
+            mockSagemakerClient as any
+        )
+    })
+
+    afterEach(function () {
+        spacesNode.pollingSet.clear()
+        sinon.restore()
+    })
+
+    describe('constructor', function () {
+        it('creates instance with correct properties', function () {
+            assert.strictEqual(spacesNode.id, 'smusSpacesParentNode')
+            assert.strictEqual(spacesNode.resource, spacesNode)
+        })
+    })
+
+    describe('getTreeItem', function () {
+        it('returns correct tree item', async function () {
+            const treeItem = await spacesNode.getTreeItem()
+
+            assert.strictEqual(treeItem.label, 'Spaces')
+            assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.Expanded)
+            assert.strictEqual(treeItem.contextValue, 'smusSpacesNode')
+            assert.ok(treeItem.iconPath)
+        })
+    })
+
+    describe('getParent', function () {
+        it('returns parent node', function () {
+            const parent = spacesNode.getParent()
+            assert.strictEqual(parent, mockParent)
+        })
+    })
+
+    describe('getProjectId', function () {
+        it('returns project ID', function () {
+            assert.strictEqual(spacesNode.getProjectId(), 'project-123')
+        })
+    })
+
+    describe('getAuthProvider', function () {
+        it('returns auth provider', function () {
+            assert.strictEqual(spacesNode.getAuthProvider(), mockAuthProvider)
+        })
+    })
+
+    describe('refreshNode', function () {
+        it('fires change event', async function () {
+            const emitterSpy = sinon.spy(spacesNode['onDidChangeEmitter'], 'fire')
+            await spacesNode.refreshNode()
+            assert(emitterSpy.calledOnce)
+        })
+    })
+
+    describe('trackPendingNode', function () {
+        it('adds node to polling set', function () {
+            const addSpy = sinon.spy(spacesNode.pollingSet, 'add')
+            spacesNode.trackPendingNode('test-key')
+            assert(addSpy.calledWith('test-key'))
+        })
+    })
+
+    describe('getSpaceNodes', function () {
+        it('returns space node when found', function () {
+            const mockSpaceNode = {} as SagemakerUnifiedStudioSpaceNode
+            spacesNode['sagemakerSpaceNodes'].set('test-key', mockSpaceNode)
+
+            const result = spacesNode.getSpaceNodes('test-key')
+            assert.strictEqual(result, mockSpaceNode)
+        })
+
+        it('throws error when node not found', function () {
+            assert.throws(
+                () => spacesNode.getSpaceNodes('non-existent'),
+                /Node with id non-existent from polling set not found/
+            )
+        })
+    })
+
+    describe('getSageMakerDomainId', function () {
+        it('throws error when no active connection', async function () {
+            const mockAuthProviderNoConnection = {
+                activeConnection: undefined,
+            } as any
+
+            const spacesNodeNoConnection = new SageMakerUnifiedStudioSpacesParentNode(
+                mockParent,
+                'project-123',
+                mockExtensionContext,
+                mockAuthProviderNoConnection,
+                mockSagemakerClient as any
+            )
+
+            await assert.rejects(
+                async () => await spacesNodeNoConnection.getSageMakerDomainId(),
+                /No active connection found to get SageMaker domain ID/
+            )
+        })
+
+        it('throws error when DataZone client not initialized', async function () {
+            ;(DataZoneClient.getInstance as sinon.SinonStub).resolves(undefined)
+
+            await assert.rejects(
+                async () => await spacesNode.getSageMakerDomainId(),
+                /DataZone client is not initialized/
+            )
+        })
+
+        it('throws error when tooling environment ID not found', async function () {
+            mockDataZoneClient.getDomainId.returns('domain-123')
+            const error = new Error('Failed to get tooling environment ID: Environment not found')
+            mockDataZoneClient.getToolingEnvironment.rejects(error)
+
+            await assert.rejects(
+                async () => await spacesNode.getSageMakerDomainId(),
+                /Failed to get tooling environment ID: Environment not found/
+            )
+        })
+
+        it('throws error when no default environment found', async function () {
+            mockDataZoneClient.getDomainId.returns('domain-123')
+            const error = new Error('No default environment found for project')
+            mockDataZoneClient.getToolingEnvironment.rejects(error)
+
+            await assert.rejects(
+                async () => await spacesNode.getSageMakerDomainId(),
+                /No default environment found for project/
+            )
+        })
+
+        it('throws error when SageMaker domain ID not found in resources', async function () {
+            mockDataZoneClient.getDomainId.returns('domain-123')
+            mockDataZoneClient.getToolingEnvironment.resolves({
+                projectId: 'project-123',
+                domainId: 'domain-123',
+                createdBy: 'user',
+                name: 'test-env',
+                awsAccountRegion: 'us-west-2',
+                provisionedResources: [{ name: 'otherResource', value: 'value', type: 'OTHER' }],
+            } as any)
+
+            await assert.rejects(
+                async () => await spacesNode.getSageMakerDomainId(),
+                /No SageMaker domain found in the tooling environment/
+            )
+        })
+
+        it('returns SageMaker domain ID when found', async function () {
+            mockDataZoneClient.getDomainId.returns('domain-123')
+            mockDataZoneClient.getToolingEnvironment.resolves({
+                projectId: 'project-123',
+                domainId: 'domain-123',
+                createdBy: 'user',
+                name: 'test-env',
+                awsAccountRegion: 'us-west-2',
+                provisionedResources: [
+                    {
+                        name: 'sageMakerDomainId',
+                        value: 'sagemaker-domain-123',
+                        type: 'SAGEMAKER_DOMAIN',
+                    },
+                ],
+            } as any)
+
+            const result = await spacesNode.getSageMakerDomainId()
+            assert.strictEqual(result, 'sagemaker-domain-123')
+        })
+    })
+
+    describe('getChildren', function () {
+        let updateChildrenStub: sinon.SinonStub
+        let mockSpaceNode1: SagemakerUnifiedStudioSpaceNode
+        let mockSpaceNode2: SagemakerUnifiedStudioSpaceNode
+
+        beforeEach(function () {
+            updateChildrenStub = sinon.stub(spacesNode as any, 'updateChildren').resolves()
+            mockSpaceNode1 = { id: 'space1' } as any
+            mockSpaceNode2 = { id: 'space2' } as any
+        })
+
+        it('returns space nodes when spaces exist', async function () {
+            spacesNode['sagemakerSpaceNodes'].set('space1', mockSpaceNode1)
+            spacesNode['sagemakerSpaceNodes'].set('space2', mockSpaceNode2)
+
+            const children = await spacesNode.getChildren()
+
+            assert.strictEqual(children.length, 2)
+            assert(children.includes(mockSpaceNode1))
+            assert(children.includes(mockSpaceNode2))
+            assert(updateChildrenStub.calledOnce)
+        })
+
+        it('returns no spaces found node when no spaces exist', async function () {
+            const children = await spacesNode.getChildren()
+
+            assert.strictEqual(children.length, 1)
+            const noSpacesNode = children[0]
+            assert.strictEqual(noSpacesNode.id, 'smusNoSpaces')
+
+            const treeItem = await noSpacesNode.getTreeItem()
+            assert.strictEqual(treeItem.label, '[No Spaces found]')
+            assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.None)
+        })
+
+        it('returns no spaces found node when updateChildren throws error', async function () {
+            updateChildrenStub.rejects(new Error('Update failed'))
+
+            const children = await spacesNode.getChildren()
+
+            assert.strictEqual(children.length, 1)
+            assert.strictEqual(children[0].id, 'smusNoSpaces')
+        })
+
+        it('returns access denied node when AccessDeniedException is thrown', async function () {
+            const accessDeniedError = new Error('Access denied')
+            accessDeniedError.name = 'AccessDeniedException'
+            updateChildrenStub.rejects(accessDeniedError)
+
+            const children = await spacesNode.getChildren()
+
+            assert.strictEqual(children.length, 1)
+            const accessDeniedNode = children[0]
+            assert.strictEqual(accessDeniedNode.id, 'smusAccessDenied')
+
+            const treeItem = await accessDeniedNode.getTreeItem()
+            assert.ok(treeItem)
+            assert.strictEqual(
+                treeItem.label,
+                "You don't have permission to view spaces. Please contact your administrator."
+            )
+            assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.None)
+            assert.ok(treeItem.iconPath)
+            assert.strictEqual((treeItem.iconPath as vscode.ThemeIcon).id, 'error')
+        })
+    })
+
+    describe('updatePendingNodes', function () {
+        it('updates pending space nodes and removes from polling set when not pending', async function () {
+            const mockSpaceNode = {
+                DomainSpaceKey: 'test-key',
+                updateSpaceAppStatus: sinon.stub().resolves(),
+                isPending: sinon.stub().returns(false),
+                refreshNode: sinon.stub().resolves(),
+            } as any
+
+            spacesNode['sagemakerSpaceNodes'].set('test-key', mockSpaceNode)
+            spacesNode.pollingSet.add('test-key')
+
+            await spacesNode['updatePendingNodes']()
+
+            assert(mockSpaceNode.updateSpaceAppStatus.calledOnce)
+            assert(mockSpaceNode.refreshNode.calledOnce)
+            assert(!spacesNode.pollingSet.has('test-key'))
+        })
+
+        it('keeps pending nodes in polling set', async function () {
+            const mockSpaceNode = {
+                DomainSpaceKey: 'test-key',
+                updateSpaceAppStatus: sinon.stub().resolves(),
+                isPending: sinon.stub().returns(true),
+                refreshNode: sinon.stub().resolves(),
+            } as any
+
+            spacesNode['sagemakerSpaceNodes'].set('test-key', mockSpaceNode)
+            spacesNode.pollingSet.add('test-key')
+
+            await spacesNode['updatePendingNodes']()
+
+            assert(mockSpaceNode.updateSpaceAppStatus.calledOnce)
+            assert(mockSpaceNode.refreshNode.notCalled)
+            assert(spacesNode.pollingSet.has('test-key'))
+        })
+    })
+
+    describe('getAccessDeniedChildren', function () {
+        it('returns access denied tree node with error icon', async function () {
+            const accessDeniedChildren = spacesNode['getAccessDeniedChildren']()
+
+            assert.strictEqual(accessDeniedChildren.length, 1)
+            const accessDeniedNode = accessDeniedChildren[0]
+            assert.strictEqual(accessDeniedNode.id, 'smusAccessDenied')
+
+            const treeItem = await accessDeniedNode.getTreeItem()
+            assert.ok(treeItem)
+            assert.strictEqual(
+                treeItem.label,
+                "You don't have permission to view spaces. Please contact your administrator."
+            )
+            assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.None)
+            assert.ok(treeItem.iconPath)
+            assert.strictEqual((treeItem.iconPath as vscode.ThemeIcon).id, 'error')
+        })
+    })
+
+    describe('updateChildren', function () {
+        beforeEach(function () {
+            mockDataZoneClient.getUserId.resolves('ABCA4NU3S7PEOLDQPLXYZ:user-12345678-d061-70a4-0bf2-eeee67a6ab12')
+            mockDataZoneClient.getDomainId.returns('domain-123')
+            mockDataZoneClient.getRegion.returns('us-west-2')
+            mockDataZoneClient.getToolingEnvironment.resolves({
+                awsAccountRegion: 'us-west-2',
+                provisionedResources: [{ name: 'sageMakerDomainId', value: 'sagemaker-domain-123' }],
+            } as any)
+        })
+
+        it('filters spaces by current user ownership', async function () {
+            const spaceApps = new Map([
+                [
+                    'space1',
+                    {
+                        DomainId: 'domain-123',
+                        OwnershipSettingsSummary: { OwnerUserProfileName: 'user-12345' },
+                        DomainSpaceKey: 'space1',
+                    },
+                ],
+                [
+                    'space2',
+                    {
+                        DomainId: 'domain-123',
+                        OwnershipSettingsSummary: { OwnerUserProfileName: 'other-user' },
+                        DomainSpaceKey: 'space2',
+                    },
+                ],
+            ])
+            const domains = new Map([['domain-123', { DomainId: 'domain-123' }]])
+
+            mockSagemakerClient.fetchSpaceAppsAndDomains.resolves([spaceApps, domains])
+
+            await spacesNode['updateChildren']()
+
+            assert.strictEqual(spacesNode['spaceApps'].size, 1)
+            assert(spacesNode['spaceApps'].has('space1'))
+            assert(!spacesNode['spaceApps'].has('space2'))
+        })
+
+        it('creates space nodes for filtered spaces', async function () {
+            const spaceApps = new Map([
+                [
+                    'space1',
+                    {
+                        DomainId: 'domain-123',
+                        OwnershipSettingsSummary: { OwnerUserProfileName: 'user-12345' },
+                        DomainSpaceKey: 'space1',
+                    },
+                ],
+            ])
+            const domains = new Map([['domain-123', { DomainId: 'domain-123' }]])
+
+            mockSagemakerClient.fetchSpaceAppsAndDomains.resolves([spaceApps, domains])
+
+            await spacesNode['updateChildren']()
+
+            assert.strictEqual(spacesNode['sagemakerSpaceNodes'].size, 1)
+            assert(spacesNode['sagemakerSpaceNodes'].has('space1'))
+        })
+
+        it('throws AccessDeniedException when fetchSpaceAppsAndDomains fails with access denied', async function () {
+            const accessDeniedError = new Error('Access denied to spaces')
+            accessDeniedError.name = 'AccessDeniedException'
+            mockSagemakerClient.fetchSpaceAppsAndDomains.rejects(accessDeniedError)
+
+            await assert.rejects(async () => await spacesNode['updateChildren'](), /Access denied to spaces/)
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/utils.test.ts b/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/utils.test.ts
new file mode 100644
index 00000000000..cd92aa42981
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/explorer/nodes/utils.test.ts
@@ -0,0 +1,252 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as assert from 'assert'
+import * as vscode from 'vscode'
+import {
+    getLabel,
+    isLeafNode,
+    getIconForNodeType,
+    createTreeItem,
+    createColumnTreeItem,
+    createErrorTreeItem,
+    isRedLakeDatabase,
+    getTooltip,
+    getRedshiftTypeFromHost,
+} from '../../../../sagemakerunifiedstudio/explorer/nodes/utils'
+import { NodeType, ConnectionType, RedshiftType } from '../../../../sagemakerunifiedstudio/explorer/nodes/types'
+
+describe('utils', function () {
+    describe('getLabel', function () {
+        it('should return container labels for container nodes', function () {
+            assert.strictEqual(getLabel({ id: 'test', nodeType: NodeType.REDSHIFT_TABLE, isContainer: true }), 'Tables')
+            assert.strictEqual(getLabel({ id: 'test', nodeType: NodeType.REDSHIFT_VIEW, isContainer: true }), 'Views')
+            assert.strictEqual(
+                getLabel({ id: 'test', nodeType: NodeType.REDSHIFT_FUNCTION, isContainer: true }),
+                'Functions'
+            )
+            assert.strictEqual(
+                getLabel({ id: 'test', nodeType: NodeType.REDSHIFT_STORED_PROCEDURE, isContainer: true }),
+                'Stored Procedures'
+            )
+        })
+
+        it('should return path label when available', function () {
+            assert.strictEqual(
+                getLabel({ id: 'test', nodeType: NodeType.S3_FILE, path: { label: 'custom-label' } }),
+                'custom-label'
+            )
+        })
+
+        it('should return S3 folder name with trailing slash', function () {
+            assert.strictEqual(
+                getLabel({ id: 'test', nodeType: NodeType.S3_FOLDER, path: { key: 'folder/subfolder/' } }),
+                'subfolder/'
+            )
+        })
+
+        it('should return S3 file name', function () {
+            assert.strictEqual(
+                getLabel({ id: 'test', nodeType: NodeType.S3_FILE, path: { key: 'folder/file.txt' } }),
+                'file.txt'
+            )
+        })
+
+        it('should return last part of ID as fallback', function () {
+            assert.strictEqual(getLabel({ id: 'parent/child/node', nodeType: NodeType.CONNECTION }), 'node')
+        })
+    })
+
+    describe('isLeafNode', function () {
+        it('should return false for container nodes', function () {
+            assert.strictEqual(isLeafNode({ nodeType: NodeType.REDSHIFT_TABLE, isContainer: true }), false)
+        })
+
+        it('should return true for leaf node types', function () {
+            assert.strictEqual(isLeafNode({ nodeType: NodeType.S3_FILE }), true)
+            assert.strictEqual(isLeafNode({ nodeType: NodeType.REDSHIFT_COLUMN }), true)
+            assert.strictEqual(isLeafNode({ nodeType: NodeType.ERROR }), true)
+            assert.strictEqual(isLeafNode({ nodeType: NodeType.LOADING }), true)
+            assert.strictEqual(isLeafNode({ nodeType: NodeType.EMPTY }), true)
+        })
+
+        it('should return false for non-leaf node types', function () {
+            assert.strictEqual(isLeafNode({ nodeType: NodeType.CONNECTION }), false)
+            assert.strictEqual(isLeafNode({ nodeType: NodeType.REDSHIFT_CLUSTER }), false)
+        })
+    })
+
+    describe('getIconForNodeType', function () {
+        it('should return correct icons for different node types', function () {
+            const errorIcon = getIconForNodeType(NodeType.ERROR)
+            const loadingIcon = getIconForNodeType(NodeType.LOADING)
+
+            assert.ok(errorIcon instanceof vscode.ThemeIcon)
+            assert.strictEqual((errorIcon as vscode.ThemeIcon).id, 'error')
+            assert.ok(loadingIcon instanceof vscode.ThemeIcon)
+            assert.strictEqual((loadingIcon as vscode.ThemeIcon).id, 'loading~spin')
+        })
+
+        it('should return different icons for container vs non-container nodes', function () {
+            const containerIcon = getIconForNodeType(NodeType.REDSHIFT_TABLE, true)
+            const nonContainerIcon = getIconForNodeType(NodeType.REDSHIFT_TABLE, false)
+
+            assert.ok(containerIcon instanceof vscode.ThemeIcon)
+            assert.ok(nonContainerIcon instanceof vscode.ThemeIcon)
+            assert.strictEqual((containerIcon as vscode.ThemeIcon).id, 'table')
+            assert.strictEqual((nonContainerIcon as vscode.ThemeIcon).id, 'aws-redshift-table')
+        })
+
+        it('should return custom icon for GLUE_CATALOG', function () {
+            const catalogIcon = getIconForNodeType(NodeType.GLUE_CATALOG)
+
+            // The catalog icon should be a custom icon, not a ThemeIcon
+            assert.ok(catalogIcon)
+            // We can't easily test the exact icon path in unit tests, but we can verify it's not a ThemeIcon
+            assert.ok(
+                !(catalogIcon instanceof vscode.ThemeIcon) ||
+                    (catalogIcon as any).id === 'aws-sagemakerunifiedstudio-catalog'
+            )
+        })
+    })
+
+    describe('createTreeItem', function () {
+        it('should create tree item with correct properties', function () {
+            const item = createTreeItem('Test Label', NodeType.CONNECTION, false, false, 'Test Tooltip')
+
+            assert.strictEqual(item.label, 'Test Label')
+            assert.strictEqual(item.collapsibleState, vscode.TreeItemCollapsibleState.Collapsed)
+            assert.strictEqual(item.contextValue, NodeType.CONNECTION)
+            assert.strictEqual(item.tooltip, 'Test Tooltip')
+        })
+
+        it('should create leaf node with None collapsible state', function () {
+            const item = createTreeItem('Leaf Node', NodeType.S3_FILE, true)
+
+            assert.strictEqual(item.collapsibleState, vscode.TreeItemCollapsibleState.None)
+        })
+    })
+
+    describe('createColumnTreeItem', function () {
+        it('should create column tree item with type description', function () {
+            const item = createColumnTreeItem('column_name', 'VARCHAR(255)', NodeType.REDSHIFT_COLUMN)
+
+            assert.strictEqual(item.label, 'column_name')
+            assert.strictEqual(item.description, 'VARCHAR(255)')
+            assert.strictEqual(item.collapsibleState, vscode.TreeItemCollapsibleState.None)
+            assert.strictEqual(item.contextValue, NodeType.REDSHIFT_COLUMN)
+            assert.strictEqual(item.tooltip, 'column_name: VARCHAR(255)')
+        })
+    })
+
+    describe('createErrorTreeItem', function () {
+        it('should create error tree item', function () {
+            const item = createErrorTreeItem('Error message')
+
+            assert.strictEqual(item.label, 'Error message')
+            assert.strictEqual(item.collapsibleState, vscode.TreeItemCollapsibleState.None)
+            assert.ok(item.iconPath instanceof vscode.ThemeIcon)
+            assert.strictEqual((item.iconPath as vscode.ThemeIcon).id, 'error')
+        })
+    })
+
+    describe('isRedLakeDatabase', function () {
+        it('should return true for RedLake database names', function () {
+            assert.strictEqual(isRedLakeDatabase('database@catalog'), true)
+            assert.strictEqual(isRedLakeDatabase('my-db@my-catalog'), true)
+            assert.strictEqual(isRedLakeDatabase('test_db@test_catalog'), true)
+        })
+
+        it('should return false for regular database names', function () {
+            assert.strictEqual(isRedLakeDatabase('regular_database'), false)
+            assert.strictEqual(isRedLakeDatabase('dev'), false)
+            assert.strictEqual(isRedLakeDatabase(''), false)
+            assert.strictEqual(isRedLakeDatabase(undefined), false)
+        })
+    })
+
+    describe('getTooltip', function () {
+        it('should return correct tooltip for connection nodes', function () {
+            const redshiftData = {
+                id: 'conn1',
+                nodeType: NodeType.CONNECTION,
+                connectionType: ConnectionType.REDSHIFT,
+            }
+            const s3Data = {
+                id: 'conn2',
+                nodeType: NodeType.CONNECTION,
+                connectionType: ConnectionType.S3,
+            }
+
+            assert.strictEqual(getTooltip(redshiftData), 'Redshift Connection: conn1')
+            assert.strictEqual(getTooltip(s3Data), 'Connection: conn2\nType: S3')
+        })
+
+        it('should return correct tooltip for S3 nodes', function () {
+            const bucketData = {
+                id: 'bucket1',
+                nodeType: NodeType.S3_BUCKET,
+                path: { bucket: 'my-bucket' },
+            }
+            const fileData = {
+                id: 'file1',
+                nodeType: NodeType.S3_FILE,
+                path: { bucket: 'my-bucket', key: 'folder/file.txt' },
+            }
+
+            assert.strictEqual(getTooltip(bucketData), 'S3 Bucket: my-bucket')
+            assert.strictEqual(getTooltip(fileData), 'File: file.txt\nBucket: my-bucket')
+        })
+
+        it('should return correct tooltip for Redshift container nodes', function () {
+            const containerData = {
+                id: 'tables',
+                nodeType: NodeType.REDSHIFT_TABLE,
+                isContainer: true,
+                path: { schema: 'public' },
+            }
+
+            assert.strictEqual(getTooltip(containerData), 'Tables in public')
+        })
+
+        it('should return correct tooltip for Redshift object nodes', function () {
+            const tableData = {
+                id: 'table1',
+                nodeType: NodeType.REDSHIFT_TABLE,
+                path: { schema: 'public' },
+            }
+
+            assert.strictEqual(getTooltip(tableData), 'Table: public.table1')
+        })
+    })
+
+    describe('getRedshiftTypeFromHost', function () {
+        it('should return undefined for invalid hosts', function () {
+            assert.strictEqual(getRedshiftTypeFromHost(undefined), undefined)
+            assert.strictEqual(getRedshiftTypeFromHost(''), undefined)
+            assert.strictEqual(getRedshiftTypeFromHost('invalid-host'), undefined)
+        })
+
+        it('should identify serverless hosts', function () {
+            const serverlessHost = 'workgroup.123456789012.us-east-1.redshift-serverless.amazonaws.com'
+            assert.strictEqual(getRedshiftTypeFromHost(serverlessHost), RedshiftType.Serverless)
+        })
+
+        it('should identify cluster hosts', function () {
+            const clusterHost = 'cluster.123456789012.us-east-1.redshift.amazonaws.com'
+            assert.strictEqual(getRedshiftTypeFromHost(clusterHost), RedshiftType.Cluster)
+        })
+
+        it('should handle hosts with port numbers', function () {
+            const hostWithPort = 'cluster.123456789012.us-east-1.redshift.amazonaws.com:5439'
+            assert.strictEqual(getRedshiftTypeFromHost(hostWithPort), RedshiftType.Cluster)
+        })
+
+        it('should return undefined for unrecognized domains', function () {
+            const unknownHost = 'host.example.com'
+            assert.strictEqual(getRedshiftTypeFromHost(unknownHost), undefined)
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/shared/client/clientStore.test.ts b/packages/core/src/test/sagemakerunifiedstudio/shared/client/clientStore.test.ts
new file mode 100644
index 00000000000..e2c14ace96a
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/shared/client/clientStore.test.ts
@@ -0,0 +1,148 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as assert from 'assert'
+import * as sinon from 'sinon'
+import { ConnectionClientStore } from '../../../../sagemakerunifiedstudio/shared/client/connectionClientStore'
+import { S3Client } from '../../../../sagemakerunifiedstudio/shared/client/s3Client'
+import { SQLWorkbenchClient } from '../../../../sagemakerunifiedstudio/shared/client/sqlWorkbenchClient'
+import { GlueClient } from '../../../../sagemakerunifiedstudio/shared/client/glueClient'
+import { GlueCatalogClient } from '../../../../sagemakerunifiedstudio/shared/client/glueCatalogClient'
+import { ConnectionCredentialsProvider } from '../../../../sagemakerunifiedstudio/auth/providers/connectionCredentialsProvider'
+
+describe('ClientStore', function () {
+    let sandbox: sinon.SinonSandbox
+    let clientStore: ConnectionClientStore
+
+    const mockCredentialsProvider = {
+        getCredentials: async () => ({
+            accessKeyId: 'test-key',
+            secretAccessKey: 'test-secret',
+            sessionToken: 'test-token',
+        }),
+    }
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        clientStore = ConnectionClientStore.getInstance()
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+        clientStore.clearAll()
+    })
+
+    describe('getInstance', function () {
+        it('should return singleton instance', function () {
+            const instance1 = ConnectionClientStore.getInstance()
+            const instance2 = ConnectionClientStore.getInstance()
+            assert.strictEqual(instance1, instance2)
+        })
+    })
+
+    describe('getClient', function () {
+        it('should create and cache client', function () {
+            const factory = sandbox.stub().returns({ test: 'client' })
+
+            const client1 = clientStore.getClient('conn-1', 'TestClient', factory)
+            const client2 = clientStore.getClient('conn-1', 'TestClient', factory)
+
+            assert.strictEqual(client1, client2)
+            assert.ok(factory.calledOnce)
+        })
+
+        it('should create separate clients for different connections', function () {
+            const factory = sandbox.stub()
+            factory.onFirstCall().returns({ test: 'client1' })
+            factory.onSecondCall().returns({ test: 'client2' })
+
+            const client1 = clientStore.getClient('conn-1', 'TestClient', factory)
+            const client2 = clientStore.getClient('conn-2', 'TestClient', factory)
+
+            assert.notStrictEqual(client1, client2)
+            assert.ok(factory.calledTwice)
+        })
+    })
+
+    describe('getS3Client', function () {
+        it('should create S3Client with credentials provider', function () {
+            sandbox.stub(S3Client.prototype, 'constructor' as any)
+
+            const client = clientStore.getS3Client(
+                'conn-1',
+                'us-east-1',
+                mockCredentialsProvider as ConnectionCredentialsProvider
+            )
+
+            assert.ok(client instanceof S3Client)
+        })
+    })
+
+    describe('getSQLWorkbenchClient', function () {
+        it('should create SQLWorkbenchClient with credentials provider', function () {
+            const stub = sandbox.stub(SQLWorkbenchClient, 'createWithCredentials').returns({} as any)
+
+            clientStore.getSQLWorkbenchClient(
+                'conn-1',
+                'us-east-1',
+                mockCredentialsProvider as ConnectionCredentialsProvider
+            )
+
+            assert.ok(stub.calledOnce)
+        })
+    })
+
+    describe('getGlueClient', function () {
+        it('should create GlueClient with credentials provider', function () {
+            sandbox.stub(GlueClient.prototype, 'constructor' as any)
+
+            const client = clientStore.getGlueClient(
+                'conn-1',
+                'us-east-1',
+                mockCredentialsProvider as ConnectionCredentialsProvider
+            )
+
+            assert.ok(client instanceof GlueClient)
+        })
+    })
+
+    describe('getGlueCatalogClient', function () {
+        it('should create GlueCatalogClient with credentials provider', function () {
+            const stub = sandbox.stub(GlueCatalogClient, 'createWithCredentials').returns({} as any)
+
+            clientStore.getGlueCatalogClient(
+                'conn-1',
+                'us-east-1',
+                mockCredentialsProvider as ConnectionCredentialsProvider
+            )
+
+            assert.ok(stub.calledOnce)
+        })
+    })
+
+    describe('clearConnection', function () {
+        it('should clear cached clients for specific connection', function () {
+            const factory = sandbox.stub().returns({ test: 'client' })
+
+            clientStore.getClient('conn-1', 'TestClient', factory)
+            clientStore.clearConnection('conn-1')
+            clientStore.getClient('conn-1', 'TestClient', factory)
+
+            assert.strictEqual(factory.callCount, 2)
+        })
+    })
+
+    describe('clearAll', function () {
+        it('should clear all cached clients', function () {
+            const factory = sandbox.stub().returns({ test: 'client' })
+
+            clientStore.getClient('conn-1', 'TestClient', factory)
+            clientStore.clearAll()
+            clientStore.getClient('conn-1', 'TestClient', factory)
+
+            assert.strictEqual(factory.callCount, 2)
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/shared/client/credentialsAdapter.test.ts b/packages/core/src/test/sagemakerunifiedstudio/shared/client/credentialsAdapter.test.ts
new file mode 100644
index 00000000000..cfb2cfbce6e
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/shared/client/credentialsAdapter.test.ts
@@ -0,0 +1,53 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as assert from 'assert'
+import * as sinon from 'sinon'
+import * as AWS from 'aws-sdk'
+import { adaptConnectionCredentialsProvider } from '../../../../sagemakerunifiedstudio/shared/client/credentialsAdapter'
+
+describe('credentialsAdapter', function () {
+    let sandbox: sinon.SinonSandbox
+    let mockConnectionCredentialsProvider: any
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        mockConnectionCredentialsProvider = {
+            getCredentials: sandbox.stub(),
+        }
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    describe('adaptConnectionCredentialsProvider', function () {
+        it('should create CredentialProviderChain', function () {
+            const chain = adaptConnectionCredentialsProvider(mockConnectionCredentialsProvider)
+            assert.ok(chain instanceof AWS.CredentialProviderChain)
+        })
+
+        it('should create credentials with provider function', function () {
+            const chain = adaptConnectionCredentialsProvider(mockConnectionCredentialsProvider)
+            assert.ok(chain.providers)
+            assert.strictEqual(chain.providers.length, 1)
+            assert.strictEqual(typeof chain.providers[0], 'function')
+        })
+
+        it('should create AWS Credentials object', function () {
+            const chain = adaptConnectionCredentialsProvider(mockConnectionCredentialsProvider)
+            const provider = chain.providers[0] as () => AWS.Credentials
+            const credentials = provider()
+            assert.ok(credentials instanceof AWS.Credentials)
+        })
+
+        it('should set needsRefresh to always return true', function () {
+            const chain = adaptConnectionCredentialsProvider(mockConnectionCredentialsProvider)
+            const provider = chain.providers[0] as () => AWS.Credentials
+            const credentials = provider()
+            assert.strictEqual(credentials.needsRefresh(), true)
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/shared/client/datazoneClient.test.ts b/packages/core/src/test/sagemakerunifiedstudio/shared/client/datazoneClient.test.ts
new file mode 100644
index 00000000000..38dbd5e33f5
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/shared/client/datazoneClient.test.ts
@@ -0,0 +1,483 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as assert from 'assert'
+import * as sinon from 'sinon'
+import { DataZoneClient } from '../../../../sagemakerunifiedstudio/shared/client/datazoneClient'
+import { SmusAuthenticationProvider } from '../../../../sagemakerunifiedstudio/auth/providers/smusAuthenticationProvider'
+import { GetEnvironmentCommandOutput } from '@aws-sdk/client-datazone/dist-types/commands/GetEnvironmentCommand'
+
+describe('DataZoneClient', () => {
+    let dataZoneClient: DataZoneClient
+    let mockAuthProvider: any
+    const testDomainId = 'dzd_domainId'
+    const testRegion = 'us-east-2'
+
+    beforeEach(async () => {
+        // Create mock connection object
+        const mockConnection = {
+            domainId: testDomainId,
+            ssoRegion: testRegion,
+        }
+
+        // Create mock auth provider
+        mockAuthProvider = {
+            isConnected: sinon.stub().returns(true),
+            getDomainId: sinon.stub().returns(testDomainId),
+            getDomainRegion: sinon.stub().returns(testRegion),
+            activeConnection: mockConnection,
+            onDidChangeActiveConnection: sinon.stub().returns({
+                dispose: sinon.stub(),
+            }),
+        } as any
+
+        // Set up the DataZoneClient using getInstance since constructor is private
+        DataZoneClient.dispose()
+        dataZoneClient = await DataZoneClient.getInstance(mockAuthProvider)
+    })
+
+    afterEach(() => {
+        sinon.restore()
+    })
+
+    describe('getInstance', () => {
+        it('should return singleton instance', async () => {
+            const instance1 = await DataZoneClient.getInstance(mockAuthProvider)
+            const instance2 = await DataZoneClient.getInstance(mockAuthProvider)
+
+            assert.strictEqual(instance1, instance2)
+        })
+
+        it('should create new instance after dispose', async () => {
+            const instance1 = await DataZoneClient.getInstance(mockAuthProvider)
+            DataZoneClient.dispose()
+            const instance2 = await DataZoneClient.getInstance(mockAuthProvider)
+
+            assert.notStrictEqual(instance1, instance2)
+        })
+    })
+
+    describe('dispose', () => {
+        it('should clear singleton instance', async () => {
+            const instance = await DataZoneClient.getInstance(mockAuthProvider)
+            DataZoneClient.dispose()
+
+            // Should create new instance after dispose
+            const newInstance = await DataZoneClient.getInstance(mockAuthProvider)
+            assert.notStrictEqual(instance, newInstance)
+        })
+    })
+
+    describe('getRegion', () => {
+        it('should return configured region', () => {
+            const result = dataZoneClient.getRegion()
+            assert.strictEqual(typeof result, 'string')
+            assert.ok(result.length > 0)
+        })
+    })
+
+    describe('listProjects', () => {
+        it('should list projects with pagination', async () => {
+            const mockDataZone = {
+                listProjects: sinon.stub().resolves({
+                    items: [
+                        {
+                            id: 'project-1',
+                            name: 'Project 1',
+                            description: 'First project',
+                            createdAt: new Date('2023-01-01'),
+                            updatedAt: new Date('2023-01-02'),
+                        },
+                    ],
+                    nextToken: 'next-token',
+                }),
+            }
+
+            // Mock the getDataZoneClient method
+            sinon.stub(dataZoneClient as any, 'getDataZoneClient').resolves(mockDataZone)
+
+            const result = await dataZoneClient.listProjects({
+                maxResults: 10,
+            })
+
+            assert.strictEqual(result.projects.length, 1)
+            assert.strictEqual(result.projects[0].id, 'project-1')
+            assert.strictEqual(result.projects[0].name, 'Project 1')
+            assert.strictEqual(result.projects[0].domainId, testDomainId)
+            assert.strictEqual(result.nextToken, 'next-token')
+        })
+
+        it('should handle empty results', async () => {
+            const mockDataZone = {
+                listProjects: sinon.stub().resolves({
+                    items: [],
+                    nextToken: undefined,
+                }),
+            }
+
+            sinon.stub(dataZoneClient as any, 'getDataZoneClient').resolves(mockDataZone)
+
+            const result = await dataZoneClient.listProjects()
+
+            assert.strictEqual(result.projects.length, 0)
+            assert.strictEqual(result.nextToken, undefined)
+        })
+
+        it('should handle API errors', async () => {
+            const error = new Error('API Error')
+            sinon.stub(dataZoneClient as any, 'getDataZoneClient').rejects(error)
+
+            await assert.rejects(() => dataZoneClient.listProjects(), error)
+        })
+    })
+
+    describe('getProjectDefaultEnvironmentCreds', () => {
+        it('should get environment credentials for project', async () => {
+            const mockCredentials = {
+                accessKeyId: 'AKIATEST',
+                secretAccessKey: 'secret',
+                sessionToken: 'token',
+            }
+
+            const mockDataZone = {
+                listEnvironmentBlueprints: sinon.stub().resolves({
+                    items: [{ id: 'blueprint-1', name: 'Tooling' }],
+                }),
+                listEnvironments: sinon.stub().resolves({
+                    items: [{ id: 'env-1', name: 'Tooling' }],
+                }),
+                getEnvironmentCredentials: sinon.stub().resolves(mockCredentials),
+            }
+
+            sinon.stub(dataZoneClient as any, 'getDataZoneClient').resolves(mockDataZone)
+
+            const result = await dataZoneClient.getProjectDefaultEnvironmentCreds('project-1')
+
+            assert.deepStrictEqual(result, mockCredentials)
+            assert.ok(
+                mockDataZone.listEnvironmentBlueprints.calledWith({
+                    domainIdentifier: testDomainId,
+                    managed: true,
+                    name: 'Tooling',
+                })
+            )
+            assert.ok(
+                mockDataZone.listEnvironments.calledWith({
+                    domainIdentifier: testDomainId,
+                    projectIdentifier: 'project-1',
+                    environmentBlueprintIdentifier: 'blueprint-1',
+                    provider: 'Amazon SageMaker',
+                })
+            )
+            assert.ok(
+                mockDataZone.getEnvironmentCredentials.calledWith({
+                    domainIdentifier: testDomainId,
+                    environmentIdentifier: 'env-1',
+                })
+            )
+        })
+
+        it('should throw error when tooling blueprint not found', async () => {
+            const mockDataZone = {
+                listEnvironmentBlueprints: sinon.stub().resolves({
+                    items: [],
+                }),
+            }
+
+            sinon.stub(dataZoneClient as any, 'getDataZoneClient').resolves(mockDataZone)
+
+            await assert.rejects(
+                () => dataZoneClient.getProjectDefaultEnvironmentCreds('project-1'),
+                /Failed to get tooling blueprint/
+            )
+        })
+
+        it('should throw error when default environment not found', async () => {
+            const mockDataZone = {
+                listEnvironmentBlueprints: sinon.stub().resolves({
+                    items: [{ id: 'blueprint-1', name: 'Tooling' }],
+                }),
+                listEnvironments: sinon.stub().resolves({
+                    items: [],
+                }),
+            }
+
+            sinon.stub(dataZoneClient as any, 'getDataZoneClient').resolves(mockDataZone)
+
+            await assert.rejects(
+                () => dataZoneClient.getProjectDefaultEnvironmentCreds('project-1'),
+                /Failed to find default Tooling environment/
+            )
+        })
+    })
+
+    describe('fetchAllProjects', function () {
+        it('fetches all projects by handling pagination', async function () {
+            const client = await DataZoneClient.getInstance(mockAuthProvider)
+
+            // Create a stub for listProjects that returns paginated results
+            const listProjectsStub = sinon.stub()
+
+            // First call returns first page with nextToken
+            listProjectsStub.onFirstCall().resolves({
+                projects: [
+                    {
+                        id: 'project-1',
+                        name: 'Project 1',
+                        description: 'First project',
+                        domainId: testDomainId,
+                    },
+                ],
+                nextToken: 'next-page-token',
+            })
+
+            // Second call returns second page with no nextToken
+            listProjectsStub.onSecondCall().resolves({
+                projects: [
+                    {
+                        id: 'project-2',
+                        name: 'Project 2',
+                        description: 'Second project',
+                        domainId: testDomainId,
+                    },
+                ],
+                nextToken: undefined,
+            })
+
+            // Replace the listProjects method with our stub
+            client.listProjects = listProjectsStub
+
+            // Call fetchAllProjects
+            const result = await client.fetchAllProjects()
+
+            // Verify results
+            assert.strictEqual(result.length, 2)
+            assert.strictEqual(result[0].id, 'project-1')
+            assert.strictEqual(result[1].id, 'project-2')
+
+            // Verify listProjects was called correctly
+            assert.strictEqual(listProjectsStub.callCount, 2)
+            assert.deepStrictEqual(listProjectsStub.firstCall.args[0], {
+                maxResults: 50,
+                nextToken: undefined,
+            })
+            assert.deepStrictEqual(listProjectsStub.secondCall.args[0], {
+                maxResults: 50,
+                nextToken: 'next-page-token',
+            })
+        })
+
+        it('returns empty array when no projects found', async function () {
+            const client = await DataZoneClient.getInstance(mockAuthProvider)
+
+            // Create a stub for listProjects that returns empty results
+            const listProjectsStub = sinon.stub().resolves({
+                projects: [],
+                nextToken: undefined,
+            })
+
+            // Replace the listProjects method with our stub
+            client.listProjects = listProjectsStub
+
+            // Call fetchAllProjects
+            const result = await client.fetchAllProjects()
+
+            // Verify results
+            assert.strictEqual(result.length, 0)
+            assert.strictEqual(listProjectsStub.callCount, 1)
+        })
+
+        it('handles errors gracefully', async function () {
+            const client = await DataZoneClient.getInstance(mockAuthProvider)
+
+            // Create a stub for listProjects that throws an error
+            const listProjectsStub = sinon.stub().rejects(new Error('API error'))
+
+            // Replace the listProjects method with our stub
+            client.listProjects = listProjectsStub
+
+            // Call fetchAllProjects and expect it to throw
+            await assert.rejects(() => client.fetchAllProjects(), /API error/)
+        })
+    })
+
+    describe('getToolingEnvironmentId', () => {
+        it('should get tooling environment ID successfully', async () => {
+            const mockDataZone = {
+                listEnvironmentBlueprints: sinon.stub().resolves({
+                    items: [{ id: 'blueprint-1', name: 'Tooling' }],
+                }),
+                listEnvironments: sinon.stub().resolves({
+                    items: [{ id: 'env-1', name: 'Tooling' }],
+                }),
+            }
+
+            sinon.stub(dataZoneClient as any, 'getDataZoneClient').resolves(mockDataZone)
+
+            const result = await dataZoneClient.getToolingEnvironmentId('domain-1', 'project-1')
+
+            assert.strictEqual(result, 'env-1')
+        })
+
+        it('should handle listEnvironmentBlueprints error', async () => {
+            const error = new Error('Blueprint API Error')
+            const mockDataZone = {
+                listEnvironmentBlueprints: sinon.stub().rejects(error),
+            }
+
+            sinon.stub(dataZoneClient as any, 'getDataZoneClient').resolves(mockDataZone)
+
+            await assert.rejects(() => dataZoneClient.getToolingEnvironmentId('domain-1', 'project-1'), error)
+        })
+
+        it('should handle listEnvironments error', async () => {
+            const error = new Error('Environment API Error')
+            const mockDataZone = {
+                listEnvironmentBlueprints: sinon.stub().resolves({
+                    items: [{ id: 'blueprint-1', name: 'Tooling' }],
+                }),
+                listEnvironments: sinon.stub().rejects(error),
+            }
+
+            sinon.stub(dataZoneClient as any, 'getDataZoneClient').resolves(mockDataZone)
+
+            await assert.rejects(() => dataZoneClient.getToolingEnvironmentId('domain-1', 'project-1'), error)
+        })
+    })
+
+    describe('getToolingEnvironment', () => {
+        beforeEach(() => {
+            mockAuthProvider = {} as SmusAuthenticationProvider
+        })
+
+        it('should return environment details when successful', async () => {
+            const mockEnvironment: GetEnvironmentCommandOutput = {
+                id: 'env-123',
+                awsAccountRegion: 'us-east-1',
+                projectId: undefined,
+                domainId: undefined,
+                createdBy: undefined,
+                name: undefined,
+                provider: undefined,
+                $metadata: {},
+            }
+
+            const mockDataZone = {
+                listEnvironmentBlueprints: sinon.stub().resolves({
+                    items: [{ id: 'blueprint-1', name: 'Tooling' }],
+                }),
+                listEnvironments: sinon.stub().resolves({
+                    items: [{ id: 'env-1', name: 'Tooling' }],
+                }),
+                getEnvironment: sinon.stub().resolves(mockEnvironment),
+            }
+
+            sinon.stub(dataZoneClient as any, 'getDataZoneClient').resolves(mockDataZone)
+
+            const result = await dataZoneClient.getToolingEnvironment('project-123')
+
+            assert.strictEqual(result, mockEnvironment)
+        })
+
+        it('should throw error when no tooling environment ID found', async () => {
+            const mockDataZone = {
+                listEnvironmentBlueprints: sinon.stub().resolves({
+                    items: [{ id: 'blueprint-1', name: 'Tooling' }],
+                }),
+                listEnvironments: sinon.stub().resolves({
+                    items: [],
+                }),
+            }
+
+            sinon.stub(dataZoneClient as any, 'getDataZoneClient').resolves(mockDataZone)
+
+            await assert.rejects(
+                () => dataZoneClient.getToolingEnvironment('project-123'),
+                /Failed to get tooling environment ID: No default Tooling environment found for project/
+            )
+        })
+
+        it('should throw error when getToolingEnvironmentId fails', async () => {
+            const mockDataZone = {
+                listEnvironmentBlueprints: sinon.stub().rejects(new Error('API error')),
+            }
+
+            sinon.stub(dataZoneClient as any, 'getDataZoneClient').resolves(mockDataZone)
+
+            await assert.rejects(() => dataZoneClient.getToolingEnvironment('project-123'), /API error/)
+        })
+    })
+
+    describe('fetchAllProjectMemberships', () => {
+        it('should fetch all project memberships with pagination', async () => {
+            const mockDataZone = {
+                listProjectMemberships: sinon.stub(),
+            }
+
+            // First call returns first page with nextToken
+            mockDataZone.listProjectMemberships.onFirstCall().resolves({
+                members: [
+                    {
+                        memberDetails: {
+                            user: {
+                                userId: 'user-1',
+                            },
+                        },
+                    },
+                ],
+                nextToken: 'next-token',
+            })
+
+            // Second call returns second page without nextToken
+            mockDataZone.listProjectMemberships.onSecondCall().resolves({
+                members: [
+                    {
+                        memberDetails: {
+                            user: {
+                                userId: 'user-2',
+                            },
+                        },
+                    },
+                ],
+                nextToken: undefined,
+            })
+
+            sinon.stub(dataZoneClient as any, 'getDataZoneClient').resolves(mockDataZone)
+
+            const result = await dataZoneClient.fetchAllProjectMemberships('project-1')
+
+            assert.strictEqual(result.length, 2)
+            assert.strictEqual(result[0].memberDetails?.user?.userId, 'user-1')
+            assert.strictEqual(result[1].memberDetails?.user?.userId, 'user-2')
+            assert.strictEqual(mockDataZone.listProjectMemberships.callCount, 2)
+        })
+
+        it('should handle empty memberships', async () => {
+            const mockDataZone = {
+                listProjectMemberships: sinon.stub().resolves({
+                    members: [],
+                    nextToken: undefined,
+                }),
+            }
+
+            sinon.stub(dataZoneClient as any, 'getDataZoneClient').resolves(mockDataZone)
+
+            const result = await dataZoneClient.fetchAllProjectMemberships('project-1')
+
+            assert.strictEqual(result.length, 0)
+        })
+
+        it('should handle API errors', async () => {
+            const error = new Error('Membership API Error')
+            const mockDataZone = {
+                listProjectMemberships: sinon.stub().rejects(error),
+            }
+
+            sinon.stub(dataZoneClient as any, 'getDataZoneClient').resolves(mockDataZone)
+
+            await assert.rejects(() => dataZoneClient.fetchAllProjectMemberships('project-1'), error)
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/shared/client/glueClient.test.ts b/packages/core/src/test/sagemakerunifiedstudio/shared/client/glueClient.test.ts
new file mode 100644
index 00000000000..cd34fe7703e
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/shared/client/glueClient.test.ts
@@ -0,0 +1,202 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as assert from 'assert'
+import * as sinon from 'sinon'
+import { GlueClient } from '../../../../sagemakerunifiedstudio/shared/client/glueClient'
+import { Glue, GetDatabasesCommand, GetTablesCommand, GetTableCommand } from '@aws-sdk/client-glue'
+import { ConnectionCredentialsProvider } from '../../../../sagemakerunifiedstudio/auth/providers/connectionCredentialsProvider'
+
+describe('GlueClient', function () {
+    let sandbox: sinon.SinonSandbox
+    let glueClient: GlueClient
+    let mockGlue: sinon.SinonStubbedInstance<Glue>
+
+    const mockCredentialsProvider = {
+        getCredentials: async () => ({
+            accessKeyId: 'test-key',
+            secretAccessKey: 'test-secret',
+            sessionToken: 'test-token',
+        }),
+    }
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+
+        mockGlue = {
+            send: sandbox.stub(),
+        } as any
+
+        sandbox.stub(Glue.prototype, 'send').callsFake(mockGlue.send)
+
+        glueClient = new GlueClient('us-east-1', mockCredentialsProvider as ConnectionCredentialsProvider)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    describe('getDatabases', function () {
+        it('should get databases successfully', async function () {
+            const mockResponse = {
+                DatabaseList: [
+                    { Name: 'database1', Description: 'Test database 1' },
+                    { Name: 'database2', Description: 'Test database 2' },
+                ],
+                NextToken: 'next-token',
+            }
+
+            mockGlue.send.resolves(mockResponse)
+
+            const result = await glueClient.getDatabases('test-catalog', undefined, undefined, 'start-token')
+
+            assert.strictEqual(result.databases.length, 2)
+            assert.strictEqual(result.databases[0].Name, 'database1')
+            assert.strictEqual(result.nextToken, 'next-token')
+
+            const sendCall = mockGlue.send.getCall(0)
+            const command = sendCall.args[0] as GetDatabasesCommand
+            assert.ok(command instanceof GetDatabasesCommand)
+        })
+
+        it('should get databases without catalog ID', async function () {
+            const mockResponse = {
+                DatabaseList: [{ Name: 'default-db' }],
+            }
+
+            mockGlue.send.resolves(mockResponse)
+
+            const result = await glueClient.getDatabases()
+
+            assert.strictEqual(result.databases.length, 1)
+            assert.strictEqual(result.databases[0].Name, 'default-db')
+            assert.strictEqual(result.nextToken, undefined)
+        })
+
+        it('should handle errors when getting databases', async function () {
+            const error = new Error('Access denied')
+            mockGlue.send.rejects(error)
+
+            await assert.rejects(
+                async () => {
+                    await glueClient.getDatabases('test-catalog')
+                },
+                {
+                    message: 'Access denied',
+                }
+            )
+        })
+    })
+
+    describe('getTables', function () {
+        it('should get tables successfully', async function () {
+            const mockResponse = {
+                TableList: [
+                    { Name: 'table1', DatabaseName: 'test-db' },
+                    { Name: 'table2', DatabaseName: 'test-db' },
+                ],
+                NextToken: 'next-token',
+            }
+
+            mockGlue.send.resolves(mockResponse)
+
+            const result = await glueClient.getTables('test-db', 'test-catalog', undefined, 'start-token')
+
+            assert.strictEqual(result.tables.length, 2)
+            assert.strictEqual(result.tables[0].Name, 'table1')
+            assert.strictEqual(result.nextToken, 'next-token')
+
+            const sendCall = mockGlue.send.getCall(0)
+            const command = sendCall.args[0] as GetTablesCommand
+            assert.ok(command instanceof GetTablesCommand)
+        })
+
+        it('should get tables without catalog ID', async function () {
+            const mockResponse = {
+                TableList: [{ Name: 'default-table' }],
+            }
+
+            mockGlue.send.resolves(mockResponse)
+
+            const result = await glueClient.getTables('test-db')
+
+            assert.strictEqual(result.tables.length, 1)
+            assert.strictEqual(result.tables[0].Name, 'default-table')
+        })
+
+        it('should handle errors when getting tables', async function () {
+            const error = new Error('Database not found')
+            mockGlue.send.rejects(error)
+
+            await assert.rejects(
+                async () => {
+                    await glueClient.getTables('nonexistent-db')
+                },
+                {
+                    message: 'Database not found',
+                }
+            )
+        })
+    })
+
+    describe('getTable', function () {
+        it('should get table details successfully', async function () {
+            const mockResponse = {
+                Table: {
+                    Name: 'test-table',
+                    DatabaseName: 'test-db',
+                    StorageDescriptor: {
+                        Columns: [
+                            { Name: 'col1', Type: 'string' },
+                            { Name: 'col2', Type: 'int' },
+                        ],
+                    },
+                    PartitionKeys: [{ Name: 'partition_col', Type: 'date' }],
+                },
+            }
+
+            mockGlue.send.resolves(mockResponse)
+
+            const result = await glueClient.getTable('test-db', 'test-table', 'test-catalog')
+
+            assert.strictEqual(result?.Name, 'test-table')
+            assert.strictEqual(result?.StorageDescriptor?.Columns?.length, 2)
+            assert.strictEqual(result?.PartitionKeys?.length, 1)
+
+            const sendCall = mockGlue.send.getCall(0)
+            const command = sendCall.args[0] as GetTableCommand
+            assert.ok(command instanceof GetTableCommand)
+        })
+
+        it('should get table without catalog ID', async function () {
+            const mockResponse = {
+                Table: {
+                    Name: 'default-table',
+                    DatabaseName: 'default-db',
+                },
+            }
+
+            mockGlue.send.resolves(mockResponse)
+
+            const result = await glueClient.getTable('default-db', 'default-table')
+
+            assert.strictEqual(result?.Name, 'default-table')
+        })
+
+        it('should handle errors when getting table', async function () {
+            const error = new Error('Table not found')
+            mockGlue.send.rejects(error)
+
+            await assert.rejects(
+                async () => {
+                    await glueClient.getTable('test-db', 'nonexistent-table')
+                },
+                {
+                    message: 'Table not found',
+                }
+            )
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/shared/client/gluePrivateClient.test.ts b/packages/core/src/test/sagemakerunifiedstudio/shared/client/gluePrivateClient.test.ts
new file mode 100644
index 00000000000..22a97d82caf
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/shared/client/gluePrivateClient.test.ts
@@ -0,0 +1,143 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as assert from 'assert'
+import * as sinon from 'sinon'
+import globals from '../../../../shared/extensionGlobals'
+import { GlueCatalogClient } from '../../../../sagemakerunifiedstudio/shared/client/glueCatalogClient'
+import { ConnectionCredentialsProvider } from '../../../../sagemakerunifiedstudio/auth/providers/connectionCredentialsProvider'
+
+describe('GlueCatalogClient', function () {
+    let sandbox: sinon.SinonSandbox
+    let mockGlueClient: any
+    let mockSdkClientBuilder: any
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+
+        mockGlueClient = {
+            getCatalogs: sandbox.stub().returns({
+                promise: sandbox.stub().resolves({
+                    CatalogList: [
+                        {
+                            Name: 'test-catalog',
+                            CatalogType: 'HIVE',
+                            Parameters: { key1: 'value1' },
+                        },
+                    ],
+                }),
+            }),
+        }
+
+        mockSdkClientBuilder = {
+            createAwsService: sandbox.stub().resolves(mockGlueClient),
+        }
+
+        sandbox.stub(globals, 'sdkClientBuilder').value(mockSdkClientBuilder)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+        // Reset singleton instance
+        ;(GlueCatalogClient as any).instance = undefined
+    })
+
+    describe('getInstance', function () {
+        it('should create singleton instance', function () {
+            const client1 = GlueCatalogClient.getInstance('us-east-1')
+            const client2 = GlueCatalogClient.getInstance('us-east-1')
+
+            assert.strictEqual(client1, client2)
+        })
+
+        it('should return region correctly', function () {
+            const client = GlueCatalogClient.getInstance('us-west-2')
+            assert.strictEqual(client.getRegion(), 'us-west-2')
+        })
+    })
+
+    describe('createWithCredentials', function () {
+        it('should create client with credentials', function () {
+            const credentialsProvider = {
+                getCredentials: async () => ({
+                    accessKeyId: 'test-key',
+                    secretAccessKey: 'test-secret',
+                    sessionToken: 'test-token',
+                }),
+            }
+
+            const client = GlueCatalogClient.createWithCredentials(
+                'us-east-1',
+                credentialsProvider as ConnectionCredentialsProvider
+            )
+            assert.strictEqual(client.getRegion(), 'us-east-1')
+        })
+    })
+
+    describe('getCatalogs', function () {
+        it('should return catalogs successfully', async function () {
+            const client = GlueCatalogClient.getInstance('us-east-1')
+            const catalogs = await client.getCatalogs()
+
+            assert.strictEqual(catalogs.catalogs.length, 1)
+            assert.strictEqual(catalogs.catalogs[0].Name, 'test-catalog')
+            assert.strictEqual(catalogs.catalogs[0].CatalogType, 'HIVE')
+            assert.deepStrictEqual(catalogs.catalogs[0].Parameters, { key1: 'value1' })
+        })
+
+        it('should return empty array when no catalogs found', async function () {
+            mockGlueClient.getCatalogs.returns({
+                promise: sandbox.stub().resolves({ CatalogList: [] }),
+            })
+
+            const client = GlueCatalogClient.getInstance('us-east-1')
+            const catalogs = await client.getCatalogs()
+
+            assert.strictEqual(catalogs.catalogs.length, 0)
+        })
+
+        it('should handle API errors', async function () {
+            const error = new Error('API Error')
+            mockGlueClient.getCatalogs.returns({
+                promise: sandbox.stub().rejects(error),
+            })
+
+            const client = GlueCatalogClient.getInstance('us-east-1')
+
+            await assert.rejects(async () => await client.getCatalogs(), error)
+        })
+
+        it('should create client with credentials when provided', async function () {
+            const credentialsProvider = {
+                getCredentials: async () => ({
+                    accessKeyId: 'test-key',
+                    secretAccessKey: 'test-secret',
+                    sessionToken: 'test-token',
+                }),
+            }
+
+            const client = GlueCatalogClient.createWithCredentials(
+                'us-east-1',
+                credentialsProvider as ConnectionCredentialsProvider
+            )
+            await client.getCatalogs()
+
+            assert.ok(mockSdkClientBuilder.createAwsService.calledOnce)
+            const callArgs = mockSdkClientBuilder.createAwsService.getCall(0).args[1]
+            assert.ok(callArgs.credentialProvider)
+            assert.strictEqual(callArgs.region, 'us-east-1')
+        })
+
+        it('should create client without credentials when not provided', async function () {
+            const client = GlueCatalogClient.getInstance('us-east-1')
+            await client.getCatalogs()
+
+            assert.ok(mockSdkClientBuilder.createAwsService.calledOnce)
+            const callArgs = mockSdkClientBuilder.createAwsService.getCall(0).args[1]
+            assert.strictEqual(callArgs.region, 'us-east-1')
+            assert.ok(!callArgs.credentials)
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/shared/client/s3Client.test.ts b/packages/core/src/test/sagemakerunifiedstudio/shared/client/s3Client.test.ts
new file mode 100644
index 00000000000..714ced3d446
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/shared/client/s3Client.test.ts
@@ -0,0 +1,306 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as assert from 'assert'
+import * as sinon from 'sinon'
+import { S3Client } from '../../../../sagemakerunifiedstudio/shared/client/s3Client'
+import { S3 } from '@aws-sdk/client-s3'
+import { ConnectionCredentialsProvider } from '../../../../sagemakerunifiedstudio/auth/providers/connectionCredentialsProvider'
+
+describe('S3Client', function () {
+    let sandbox: sinon.SinonSandbox
+    let mockS3: sinon.SinonStubbedInstance<S3>
+    let s3Client: S3Client
+
+    const mockCredentialsProvider = {
+        getCredentials: async () => ({
+            accessKeyId: 'test-key',
+            secretAccessKey: 'test-secret',
+            sessionToken: 'test-token',
+        }),
+    }
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+
+        mockS3 = {
+            listObjectsV2: sandbox.stub(),
+        } as any
+
+        sandbox.stub(S3.prototype, 'constructor' as any)
+        sandbox.stub(S3.prototype, 'listObjectsV2').callsFake(mockS3.listObjectsV2)
+
+        s3Client = new S3Client('us-east-1', mockCredentialsProvider as ConnectionCredentialsProvider)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    describe('constructor', function () {
+        it('should create client with correct properties', function () {
+            const client = new S3Client('us-west-2', mockCredentialsProvider as ConnectionCredentialsProvider)
+            assert.ok(client)
+        })
+    })
+
+    describe('listPaths', function () {
+        it('should list folders and files successfully', async function () {
+            const mockResponse = {
+                CommonPrefixes: [{ Prefix: 'folder1/' }, { Prefix: 'folder2/' }],
+                Contents: [
+                    {
+                        Key: 'file1.txt',
+                        Size: 1024,
+                        LastModified: new Date('2023-01-01'),
+                    },
+                    {
+                        Key: 'file2.txt',
+                        Size: 2048,
+                        LastModified: new Date('2023-01-02'),
+                    },
+                ],
+            }
+
+            mockS3.listObjectsV2.resolves(mockResponse)
+
+            const result = await s3Client.listPaths('test-bucket')
+
+            assert.strictEqual(result.paths.length, 4)
+            const paths = result.paths
+
+            // Check folders
+            assert.strictEqual(paths[0].displayName, 'folder1')
+            assert.strictEqual(paths[0].isFolder, true)
+            assert.strictEqual(paths[0].bucket, 'test-bucket')
+            assert.strictEqual(paths[0].prefix, 'folder1/')
+
+            assert.strictEqual(paths[1].displayName, 'folder2')
+            assert.strictEqual(paths[1].isFolder, true)
+
+            // Check files
+            assert.strictEqual(paths[2].displayName, 'file1.txt')
+            assert.strictEqual(paths[2].isFolder, false)
+            assert.strictEqual(paths[2].size, 1024)
+            assert.deepStrictEqual(paths[2].lastModified, new Date('2023-01-01'))
+
+            assert.strictEqual(paths[3].displayName, 'file2.txt')
+            assert.strictEqual(paths[3].isFolder, false)
+            assert.strictEqual(paths[3].size, 2048)
+        })
+
+        it('should list paths with prefix', async function () {
+            const mockResponse = {
+                CommonPrefixes: [{ Prefix: 'prefix/subfolder/' }],
+                Contents: [
+                    {
+                        Key: 'prefix/file.txt',
+                        Size: 512,
+                        LastModified: new Date('2023-01-01'),
+                    },
+                ],
+            }
+
+            mockS3.listObjectsV2.resolves(mockResponse)
+
+            const result = await s3Client.listPaths('test-bucket', 'prefix/')
+
+            assert.strictEqual(result.paths.length, 2)
+            const paths = result.paths
+            assert.strictEqual(paths[0].displayName, 'subfolder')
+            assert.strictEqual(paths[0].isFolder, true)
+            assert.strictEqual(paths[1].displayName, 'file.txt')
+            assert.strictEqual(paths[1].isFolder, false)
+
+            // Verify API call
+            assert.ok(mockS3.listObjectsV2.calledOnce)
+            const callArgs = mockS3.listObjectsV2.getCall(0).args[0]
+            assert.strictEqual(callArgs.Bucket, 'test-bucket')
+            assert.strictEqual(callArgs.Prefix, 'prefix/')
+            assert.strictEqual(callArgs.Delimiter, '/')
+            assert.strictEqual(callArgs.ContinuationToken, undefined)
+        })
+
+        it('should return empty array when no objects found', async function () {
+            const mockResponse = {
+                CommonPrefixes: [],
+                Contents: [],
+            }
+
+            mockS3.listObjectsV2.resolves(mockResponse)
+
+            const result = await s3Client.listPaths('empty-bucket')
+
+            assert.strictEqual(result.paths.length, 0)
+        })
+
+        it('should handle response with only folders', async function () {
+            const mockResponse = {
+                CommonPrefixes: [{ Prefix: 'folder1/' }, { Prefix: 'folder2/' }],
+                Contents: undefined,
+            }
+
+            mockS3.listObjectsV2.resolves(mockResponse)
+
+            const result = await s3Client.listPaths('test-bucket')
+
+            assert.strictEqual(result.paths.length, 2)
+            const paths = result.paths
+            assert.strictEqual(paths[0].isFolder, true)
+            assert.strictEqual(paths[1].isFolder, true)
+        })
+
+        it('should handle response with only files', async function () {
+            const mockResponse = {
+                CommonPrefixes: undefined,
+                Contents: [
+                    {
+                        Key: 'file1.txt',
+                        Size: 1024,
+                        LastModified: new Date('2023-01-01'),
+                    },
+                ],
+            }
+
+            mockS3.listObjectsV2.resolves(mockResponse)
+
+            const result = await s3Client.listPaths('test-bucket')
+
+            assert.strictEqual(result.paths.length, 1)
+            const paths = result.paths
+            assert.strictEqual(paths[0].isFolder, false)
+            assert.strictEqual(paths[0].displayName, 'file1.txt')
+        })
+
+        it('should filter out folder markers and prefix matches', async function () {
+            const mockResponse = {
+                CommonPrefixes: [{ Prefix: 'folder/' }],
+                Contents: [
+                    {
+                        Key: 'prefix/',
+                        Size: 0,
+                        LastModified: new Date('2023-01-01'),
+                    },
+                    {
+                        Key: 'prefix/file.txt',
+                        Size: 1024,
+                        LastModified: new Date('2023-01-01'),
+                    },
+                    {
+                        Key: 'prefix/folder/',
+                        Size: 0,
+                        LastModified: new Date('2023-01-01'),
+                    },
+                ],
+            }
+
+            mockS3.listObjectsV2.resolves(mockResponse)
+
+            const result = await s3Client.listPaths('test-bucket', 'prefix/')
+
+            // Should only include the folder from CommonPrefixes and the file (not folder markers)
+            assert.strictEqual(result.paths.length, 2)
+            const paths = result.paths
+            assert.strictEqual(paths[0].displayName, 'folder')
+            assert.strictEqual(paths[0].isFolder, true)
+            assert.strictEqual(paths[1].displayName, 'file.txt')
+            assert.strictEqual(paths[1].isFolder, false)
+        })
+
+        it('should handle API errors', async function () {
+            const error = new Error('S3 API Error')
+            mockS3.listObjectsV2.rejects(error)
+
+            await assert.rejects(async () => await s3Client.listPaths('test-bucket'), error)
+        })
+
+        it('should handle missing object properties gracefully', async function () {
+            const mockResponse = {
+                CommonPrefixes: [{ Prefix: undefined }, { Prefix: 'valid-folder/' }],
+                Contents: [
+                    {
+                        Key: undefined,
+                        Size: 1024,
+                    },
+                    {
+                        Key: 'valid-file.txt',
+                        Size: undefined,
+                        LastModified: undefined,
+                    },
+                ],
+            }
+
+            mockS3.listObjectsV2.resolves(mockResponse)
+
+            const result = await s3Client.listPaths('test-bucket')
+
+            // Should only include valid entries
+            assert.strictEqual(result.paths.length, 2)
+            const paths = result.paths
+            assert.strictEqual(paths[0].displayName, 'valid-folder')
+            assert.strictEqual(paths[0].isFolder, true)
+            assert.strictEqual(paths[1].displayName, 'valid-file.txt')
+            assert.strictEqual(paths[1].isFolder, false)
+            assert.strictEqual(paths[1].size, undefined)
+            assert.strictEqual(paths[1].lastModified, undefined)
+        })
+
+        it('should create S3 client on first use', async function () {
+            const mockResponse = { CommonPrefixes: [], Contents: [] }
+            mockS3.listObjectsV2.resolves(mockResponse)
+
+            await s3Client.listPaths('test-bucket')
+
+            // Verify S3 client was created with correct parameters
+            assert.ok(S3.prototype.constructor)
+        })
+
+        it('should reuse existing S3 client on subsequent calls', async function () {
+            const mockResponse = { CommonPrefixes: [], Contents: [] }
+            mockS3.listObjectsV2.resolves(mockResponse)
+
+            // Make multiple calls
+            await s3Client.listPaths('test-bucket')
+            await s3Client.listPaths('test-bucket')
+
+            // S3 constructor should only be called once (during first call)
+            assert.ok(mockS3.listObjectsV2.calledTwice)
+        })
+
+        it('should handle ContinuationToken for pagination', async function () {
+            const mockResponse = {
+                CommonPrefixes: [{ Prefix: 'folder1/' }],
+                Contents: [{ Key: 'file1.txt', Size: 1024 }],
+                NextContinuationToken: 'next-token-123',
+            }
+
+            mockS3.listObjectsV2.resolves(mockResponse)
+
+            const result = await s3Client.listPaths('test-bucket', 'prefix/', 'continuation-token')
+
+            assert.strictEqual(result.paths.length, 2)
+            assert.strictEqual(result.nextToken, 'next-token-123')
+
+            // Verify ContinuationToken was passed
+            const callArgs = mockS3.listObjectsV2.getCall(0).args[0]
+            assert.strictEqual(callArgs.ContinuationToken, 'continuation-token')
+        })
+
+        it('should return undefined nextToken when no more pages', async function () {
+            const mockResponse = {
+                CommonPrefixes: [{ Prefix: 'folder1/' }],
+                Contents: [{ Key: 'file1.txt', Size: 1024 }],
+                NextContinuationToken: undefined,
+            }
+
+            mockS3.listObjectsV2.resolves(mockResponse)
+
+            const result = await s3Client.listPaths('test-bucket')
+
+            assert.strictEqual(result.paths.length, 2)
+            assert.strictEqual(result.nextToken, undefined)
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/shared/client/sqlWorkbenchClient.test.ts b/packages/core/src/test/sagemakerunifiedstudio/shared/client/sqlWorkbenchClient.test.ts
new file mode 100644
index 00000000000..e4b1dc50a85
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/shared/client/sqlWorkbenchClient.test.ts
@@ -0,0 +1,249 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as assert from 'assert'
+import * as sinon from 'sinon'
+import {
+    SQLWorkbenchClient,
+    generateSqlWorkbenchArn,
+    createRedshiftConnectionConfig,
+} from '../../../../sagemakerunifiedstudio/shared/client/sqlWorkbenchClient'
+import { STSClient } from '@aws-sdk/client-sts'
+import globals from '../../../../shared/extensionGlobals'
+import { ConnectionCredentialsProvider } from '../../../../sagemakerunifiedstudio/auth/providers/connectionCredentialsProvider'
+
+describe('SQLWorkbenchClient', function () {
+    let sandbox: sinon.SinonSandbox
+    let mockSqlClient: any
+    let mockSdkClientBuilder: any
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+
+        mockSqlClient = {
+            getResources: sandbox.stub().returns({
+                promise: sandbox.stub().resolves({
+                    resources: [{ name: 'test-resource' }],
+                    nextToken: 'next-token',
+                }),
+            }),
+            executeQuery: sandbox.stub().returns({
+                promise: sandbox.stub().resolves({
+                    queryExecutions: [{ queryExecutionId: 'test-execution-id' }],
+                }),
+            }),
+        }
+
+        mockSdkClientBuilder = {
+            createAwsService: sandbox.stub().resolves(mockSqlClient),
+        }
+
+        sandbox.stub(globals, 'sdkClientBuilder').value(mockSdkClientBuilder)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+        // Reset singleton instance
+        ;(SQLWorkbenchClient as any).instance = undefined
+    })
+
+    describe('getInstance', function () {
+        it('should create singleton instance', function () {
+            const client1 = SQLWorkbenchClient.getInstance('us-east-1')
+            const client2 = SQLWorkbenchClient.getInstance('us-east-1')
+
+            assert.strictEqual(client1, client2)
+        })
+
+        it('should return region correctly', function () {
+            const client = SQLWorkbenchClient.getInstance('us-west-2')
+            assert.strictEqual(client.getRegion(), 'us-west-2')
+        })
+    })
+
+    describe('createWithCredentials', function () {
+        it('should create client with credentials', function () {
+            const credentialsProvider = {
+                getCredentials: async () => ({
+                    accessKeyId: 'test-key',
+                    secretAccessKey: 'test-secret',
+                    sessionToken: 'test-token',
+                }),
+            }
+
+            const client = SQLWorkbenchClient.createWithCredentials(
+                'us-east-1',
+                credentialsProvider as ConnectionCredentialsProvider
+            )
+            assert.strictEqual(client.getRegion(), 'us-east-1')
+        })
+    })
+
+    describe('getResources', function () {
+        it('should get resources with connection', async function () {
+            const client = SQLWorkbenchClient.getInstance('us-east-1')
+            const connectionConfig = {
+                id: 'test-id',
+                type: 'test-type',
+                databaseType: 'REDSHIFT',
+                connectableResourceIdentifier: 'test-identifier',
+                connectableResourceType: 'CLUSTER',
+                database: 'test-db',
+            }
+
+            const result = await client.getResources({
+                connection: connectionConfig,
+                resourceType: 'TABLE',
+                maxItems: 50,
+            })
+
+            assert.deepStrictEqual(result.resources, [{ name: 'test-resource' }])
+            assert.strictEqual(result.nextToken, 'next-token')
+        })
+
+        it('should handle API errors', async function () {
+            const error = new Error('API Error')
+            mockSqlClient.getResources.returns({
+                promise: sandbox.stub().rejects(error),
+            })
+
+            const client = SQLWorkbenchClient.getInstance('us-east-1')
+
+            await assert.rejects(
+                async () =>
+                    await client.getResources({
+                        connection: {
+                            id: '',
+                            type: '',
+                            databaseType: '',
+                            connectableResourceIdentifier: '',
+                            connectableResourceType: '',
+                            database: '',
+                        },
+                        resourceType: '',
+                    }),
+                error
+            )
+        })
+    })
+
+    describe('executeQuery', function () {
+        it('should execute query successfully', async function () {
+            const client = SQLWorkbenchClient.getInstance('us-east-1')
+            const connectionConfig = {
+                id: 'test-id',
+                type: 'test-type',
+                databaseType: 'REDSHIFT',
+                connectableResourceIdentifier: 'test-identifier',
+                connectableResourceType: 'CLUSTER',
+                database: 'test-db',
+            }
+
+            const result = await client.executeQuery(connectionConfig, 'SELECT 1')
+
+            assert.strictEqual(result, 'test-execution-id')
+        })
+
+        it('should handle query execution errors', async function () {
+            const error = new Error('Query Error')
+            mockSqlClient.executeQuery.returns({
+                promise: sandbox.stub().rejects(error),
+            })
+
+            const client = SQLWorkbenchClient.getInstance('us-east-1')
+            const connectionConfig = {
+                id: 'test-id',
+                type: 'test-type',
+                databaseType: 'REDSHIFT',
+                connectableResourceIdentifier: 'test-identifier',
+                connectableResourceType: 'CLUSTER',
+                database: 'test-db',
+            }
+
+            await assert.rejects(async () => await client.executeQuery(connectionConfig, 'SELECT 1'), error)
+        })
+    })
+})
+
+describe('generateSqlWorkbenchArn', function () {
+    let sandbox: sinon.SinonSandbox
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('should generate ARN with provided account ID', async function () {
+        const arn = await generateSqlWorkbenchArn('us-east-1', '123456789012')
+
+        assert.ok(arn.startsWith('arn:aws:sqlworkbench:us-east-1:123456789012:connection/'))
+        assert.ok(arn.includes('-'))
+    })
+})
+
+describe('createRedshiftConnectionConfig', function () {
+    let sandbox: sinon.SinonSandbox
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        sandbox.stub(STSClient.prototype, 'send').resolves({ Account: '123456789012' })
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('should create serverless connection config', async function () {
+        const config = await createRedshiftConnectionConfig(
+            'test-workgroup.123456789012.us-east-1.redshift-serverless.amazonaws.com',
+            'test-db',
+            '123456789012',
+            'us-east-1',
+            '',
+            false
+        )
+
+        assert.strictEqual(config.databaseType, 'REDSHIFT')
+        assert.strictEqual(config.connectableResourceType, 'WORKGROUP')
+        assert.strictEqual(config.connectableResourceIdentifier, 'test-workgroup')
+        assert.strictEqual(config.database, 'test-db')
+        assert.strictEqual(config.type, '4') // FEDERATED
+    })
+
+    it('should create cluster connection config', async function () {
+        const config = await createRedshiftConnectionConfig(
+            'test-cluster.123456789012.us-east-1.redshift.amazonaws.com',
+            'test-db',
+            '123456789012',
+            'us-east-1',
+            '',
+            false
+        )
+
+        assert.strictEqual(config.databaseType, 'REDSHIFT')
+        assert.strictEqual(config.connectableResourceType, 'CLUSTER')
+        assert.strictEqual(config.connectableResourceIdentifier, 'test-cluster')
+        assert.strictEqual(config.database, 'test-db')
+        assert.strictEqual(config.type, '5') // TEMPORARY_CREDENTIALS_WITH_IAM
+    })
+
+    it('should create config with secret authentication', async function () {
+        const config = await createRedshiftConnectionConfig(
+            'test-cluster.123456789012.us-east-1.redshift.amazonaws.com',
+            'test-db',
+            '123456789012',
+            'us-east-1',
+            'arn:aws:secretsmanager:us-east-1:123456789012:secret:test-secret',
+            false
+        )
+
+        assert.strictEqual(config.type, '6') // SECRET
+        assert.ok(config.auth)
+        assert.strictEqual(config.auth.secretArn, 'arn:aws:secretsmanager:us-east-1:123456789012:secret:test-secret')
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/shared/smusUtils.test.ts b/packages/core/src/test/sagemakerunifiedstudio/shared/smusUtils.test.ts
new file mode 100644
index 00000000000..c03b55c64c6
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/shared/smusUtils.test.ts
@@ -0,0 +1,579 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as assert from 'assert'
+import * as sinon from 'sinon'
+import {
+    SmusUtils,
+    SmusErrorCodes,
+    SmusTimeouts,
+    SmusCredentialExpiry,
+    validateCredentialFields,
+    extractAccountIdFromSageMakerArn,
+    extractAccountIdFromResourceMetadata,
+} from '../../../sagemakerunifiedstudio/shared/smusUtils'
+import { ToolkitError } from '../../../shared/errors'
+import * as extensionUtilities from '../../../shared/extensionUtilities'
+import * as resourceMetadataUtils from '../../../sagemakerunifiedstudio/shared/utils/resourceMetadataUtils'
+import fetch from 'node-fetch'
+
+describe('SmusUtils', () => {
+    const testDomainUrl = 'https://dzd_domainId.sagemaker.us-east-2.on.aws'
+    const testDomainIdLowercase = 'dzd_domainid' // Domain IDs get lowercased by URL parsing
+    const testRegion = 'us-east-2'
+
+    afterEach(() => {
+        sinon.restore()
+    })
+
+    describe('extractDomainIdFromUrl', () => {
+        it('should extract domain ID from valid URL', () => {
+            const result = SmusUtils.extractDomainIdFromUrl(testDomainUrl)
+            assert.strictEqual(result, testDomainIdLowercase)
+        })
+
+        it('should return undefined for invalid URL', () => {
+            const result = SmusUtils.extractDomainIdFromUrl('invalid-url')
+            assert.strictEqual(result, undefined)
+        })
+
+        it('should handle URLs with dzd- prefix', () => {
+            const urlWithDash = 'https://dzd-domainId.sagemaker.us-east-2.on.aws'
+            const result = SmusUtils.extractDomainIdFromUrl(urlWithDash)
+            assert.strictEqual(result, 'dzd-domainid')
+        })
+
+        it('should handle URLs with dzd_ prefix', () => {
+            const urlWithUnderscore = 'https://dzd_domainId.sagemaker.us-east-2.on.aws'
+            const result = SmusUtils.extractDomainIdFromUrl(urlWithUnderscore)
+            assert.strictEqual(result, testDomainIdLowercase)
+        })
+    })
+
+    describe('extractRegionFromUrl', () => {
+        it('should extract region from valid URL', () => {
+            const result = SmusUtils.extractRegionFromUrl(testDomainUrl)
+            assert.strictEqual(result, testRegion)
+        })
+
+        it('should return fallback region for invalid URL', () => {
+            const result = SmusUtils.extractRegionFromUrl('invalid-url', 'us-west-2')
+            assert.strictEqual(result, 'us-west-2')
+        })
+
+        it('should return default fallback region when not specified', () => {
+            const result = SmusUtils.extractRegionFromUrl('invalid-url')
+            assert.strictEqual(result, 'us-east-1')
+        })
+
+        it('should handle different regions', () => {
+            const urlWithDifferentRegion = 'https://dzd_test.sagemaker.eu-west-1.on.aws'
+            const result = SmusUtils.extractRegionFromUrl(urlWithDifferentRegion)
+            assert.strictEqual(result, 'eu-west-1')
+        })
+
+        it('should handle non-prod stages', () => {
+            const urlWithStage = 'https://dzd_test.sagemaker-gamma.us-west-2.on.aws'
+            const result = SmusUtils.extractRegionFromUrl(urlWithStage)
+            assert.strictEqual(result, 'us-west-2')
+        })
+    })
+
+    describe('extractDomainInfoFromUrl', () => {
+        it('should extract both domain ID and region', () => {
+            const result = SmusUtils.extractDomainInfoFromUrl(testDomainUrl)
+            assert.strictEqual(result.domainId, testDomainIdLowercase)
+            assert.strictEqual(result.region, testRegion)
+        })
+
+        it('should use fallback region when extraction fails', () => {
+            const result = SmusUtils.extractDomainInfoFromUrl('invalid-url', 'us-west-2')
+            assert.strictEqual(result.domainId, undefined)
+            assert.strictEqual(result.region, 'us-west-2')
+        })
+    })
+
+    describe('validateDomainUrl', () => {
+        it('should return undefined for valid URL', () => {
+            const result = SmusUtils.validateDomainUrl(testDomainUrl)
+            assert.strictEqual(result, undefined)
+        })
+
+        it('should return error for empty URL', () => {
+            const result = SmusUtils.validateDomainUrl('')
+            assert.strictEqual(result, 'Domain URL is required')
+        })
+
+        it('should return error for whitespace-only URL', () => {
+            const result = SmusUtils.validateDomainUrl('   ')
+            assert.strictEqual(result, 'Domain URL is required')
+        })
+
+        it('should return error for non-HTTPS URL', () => {
+            const result = SmusUtils.validateDomainUrl('http://dzd_test.sagemaker.us-east-1.on.aws')
+            assert.strictEqual(result, 'Domain URL must use HTTPS (https://)')
+        })
+
+        it('should return error for non-SageMaker domain', () => {
+            const result = SmusUtils.validateDomainUrl('https://example.com')
+            assert.strictEqual(
+                result,
+                'URL must be a valid SageMaker Unified Studio domain (e.g., https://dzd_xxxxxxxxx.sagemaker.us-east-1.on.aws)'
+            )
+        })
+
+        it('should return error for URL without domain ID', () => {
+            const result = SmusUtils.validateDomainUrl('https://invalid.sagemaker.us-east-1.on.aws')
+            assert.strictEqual(result, 'URL must contain a valid domain ID (starting with dzd- or dzd_)')
+        })
+
+        it('should return error for invalid URL format', () => {
+            const result = SmusUtils.validateDomainUrl('not-a-url')
+            assert.strictEqual(result, 'Domain URL must use HTTPS (https://)')
+        })
+
+        it('should handle URLs with dzd- prefix', () => {
+            const urlWithDash = 'https://dzd-domainId.sagemaker.us-east-2.on.aws'
+            const result = SmusUtils.validateDomainUrl(urlWithDash)
+            assert.strictEqual(result, undefined)
+        })
+
+        it('should handle URLs with dzd_ prefix', () => {
+            const urlWithUnderscore = 'https://dzd_domainId.sagemaker.us-east-2.on.aws'
+            const result = SmusUtils.validateDomainUrl(urlWithUnderscore)
+            assert.strictEqual(result, undefined)
+        })
+
+        it('should trim whitespace from URL', () => {
+            const urlWithWhitespace = '  https://dzd_domainId.sagemaker.us-east-2.on.aws  '
+            const result = SmusUtils.validateDomainUrl(urlWithWhitespace)
+            assert.strictEqual(result, undefined)
+        })
+    })
+
+    describe('constants', () => {
+        it('should export SmusErrorCodes with correct values', () => {
+            assert.strictEqual(SmusErrorCodes.NoActiveConnection, 'NoActiveConnection')
+            assert.strictEqual(SmusErrorCodes.ApiTimeout, 'ApiTimeout')
+            assert.strictEqual(SmusErrorCodes.SmusLoginFailed, 'SmusLoginFailed')
+            assert.strictEqual(SmusErrorCodes.RedeemAccessTokenFailed, 'RedeemAccessTokenFailed')
+        })
+
+        it('should export SmusTimeouts with correct values', () => {
+            assert.strictEqual(SmusTimeouts.apiCallTimeoutMs, 10 * 1000)
+        })
+
+        it('should export SmusCredentialExpiry with correct values', () => {
+            assert.strictEqual(SmusCredentialExpiry.derExpiryMs, 10 * 60 * 1000)
+            assert.strictEqual(SmusCredentialExpiry.projectExpiryMs, 10 * 60 * 1000)
+            assert.strictEqual(SmusCredentialExpiry.connectionExpiryMs, 10 * 60 * 1000)
+        })
+    })
+
+    describe('getSsoInstanceInfo', () => {
+        let fetchStub: sinon.SinonStub
+
+        beforeEach(() => {
+            fetchStub = sinon.stub(fetch, 'default' as any)
+        })
+
+        afterEach(() => {
+            fetchStub.restore()
+        })
+
+        it('should throw error for invalid domain URL', async () => {
+            await assert.rejects(
+                () => SmusUtils.getSsoInstanceInfo('invalid-url'),
+                (error: any) => {
+                    assert.strictEqual(error.code, 'InvalidDomainUrl')
+                    return true
+                }
+            )
+        })
+
+        it('should throw error for URL without domain ID', async () => {
+            await assert.rejects(
+                () => SmusUtils.getSsoInstanceInfo('https://invalid.sagemaker.us-east-1.on.aws'),
+                (error: any) => {
+                    assert.strictEqual(error.code, 'InvalidDomainUrl')
+                    return true
+                }
+            )
+        })
+
+        it('should handle timeout errors', async () => {
+            const timeoutError = new Error('Request timeout')
+            timeoutError.name = 'AbortError'
+            fetchStub.rejects(timeoutError)
+
+            await assert.rejects(
+                () => SmusUtils.getSsoInstanceInfo(testDomainUrl),
+                (error: any) => {
+                    assert.strictEqual(error.code, SmusErrorCodes.ApiTimeout)
+                    assert.ok(error.message.includes('timed out after 10 seconds'))
+                    return true
+                }
+            )
+        })
+
+        it('should handle login failure errors', async () => {
+            fetchStub.resolves({
+                ok: false,
+                status: 401,
+                statusText: 'Unauthorized',
+            })
+
+            await assert.rejects(
+                () => SmusUtils.getSsoInstanceInfo(testDomainUrl),
+                (error: any) => {
+                    assert.strictEqual(error.code, SmusErrorCodes.SmusLoginFailed)
+                    assert.ok(error.message.includes('401'))
+                    return true
+                }
+            )
+        })
+
+        it('should successfully extract SSO instance info', async () => {
+            const mockResponse = {
+                ok: true,
+                json: sinon.stub().resolves({
+                    redirectUrl:
+                        'https://example.com/oauth/authorize?client_id=arn%3Aaws%3Asso%3A%3A123456789%3Aapplication%2Fssoins-123%2Fapl-456',
+                }),
+            }
+            fetchStub.resolves(mockResponse)
+
+            const result = await SmusUtils.getSsoInstanceInfo(testDomainUrl)
+
+            assert.strictEqual(result.ssoInstanceId, 'ssoins-123')
+            assert.strictEqual(result.issuerUrl, 'https://identitycenter.amazonaws.com/ssoins-123')
+            assert.strictEqual(result.clientId, 'arn:aws:sso::123456789:application/ssoins-123/apl-456')
+            assert.strictEqual(result.region, testRegion)
+        })
+
+        it('should throw error for missing redirect URL', async () => {
+            const mockResponse = {
+                ok: true,
+                json: sinon.stub().resolves({}),
+            }
+            fetchStub.resolves(mockResponse)
+
+            await assert.rejects(
+                () => SmusUtils.getSsoInstanceInfo(testDomainUrl),
+                (error: any) => {
+                    assert.strictEqual(error.code, 'InvalidLoginResponse')
+                    return true
+                }
+            )
+        })
+
+        it('should throw error for missing client_id in redirect URL', async () => {
+            const mockResponse = {
+                ok: true,
+                json: sinon.stub().resolves({
+                    redirectUrl: 'https://example.com/oauth/authorize',
+                }),
+            }
+            fetchStub.resolves(mockResponse)
+
+            await assert.rejects(
+                () => SmusUtils.getSsoInstanceInfo(testDomainUrl),
+                (error: any) => {
+                    assert.strictEqual(error.code, 'InvalidRedirectUrl')
+                    return true
+                }
+            )
+        })
+
+        it('should throw error for invalid ARN format', async () => {
+            const mockResponse = {
+                ok: true,
+                json: sinon.stub().resolves({
+                    redirectUrl: 'https://example.com/oauth/authorize?client_id=invalid-arn',
+                }),
+            }
+            fetchStub.resolves(mockResponse)
+
+            await assert.rejects(
+                () => SmusUtils.getSsoInstanceInfo(testDomainUrl),
+                (error: any) => {
+                    assert.strictEqual(error.code, 'InvalidArnFormat')
+                    return true
+                }
+            )
+        })
+    })
+
+    describe('extractSSOIdFromUserId', () => {
+        it('should extract SSO ID from valid user ID', () => {
+            const result = SmusUtils.extractSSOIdFromUserId('user-12345678-abcd-efgh-ijkl-123456789012')
+            assert.strictEqual(result, '12345678-abcd-efgh-ijkl-123456789012')
+        })
+
+        it('should throw error for invalid user ID format', () => {
+            assert.throws(
+                () => SmusUtils.extractSSOIdFromUserId('invalid-format'),
+                /Invalid UserId format: invalid-format/
+            )
+        })
+
+        it('should throw error for empty user ID', () => {
+            assert.throws(() => SmusUtils.extractSSOIdFromUserId(''), /Invalid UserId format: /)
+        })
+
+        it('should throw error for user ID without prefix', () => {
+            assert.throws(
+                () => SmusUtils.extractSSOIdFromUserId('12345678-abcd-efgh-ijkl-123456789012'),
+                /Invalid UserId format: 12345678-abcd-efgh-ijkl-123456789012/
+            )
+        })
+    })
+
+    describe('validateCredentialFields', () => {
+        it('should not throw for valid credentials', () => {
+            const validCredentials = {
+                accessKeyId: 'AKIAIOSFODNN7EXAMPLE',
+                secretAccessKey: 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY',
+                sessionToken:
+                    'AQoEXAMPLEH4aoAH0gNCAPyJxz4BlCFFxWNE1OPTgk5TthT+FvwqnKwRcOIfrRh3c/LTo6UDdyJwOOvEVPvLXCrrrUtdnniCEXAMPLE',
+            }
+
+            assert.doesNotThrow(() => {
+                validateCredentialFields(validCredentials, 'TestError', 'test context')
+            })
+        })
+
+        it('should throw for missing accessKeyId', () => {
+            const invalidCredentials = {
+                secretAccessKey: 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY',
+                sessionToken: 'token',
+            }
+
+            assert.throws(
+                () => validateCredentialFields(invalidCredentials, 'TestError', 'test context'),
+                (error: any) => {
+                    assert.ok(error instanceof ToolkitError)
+                    assert.strictEqual(error.code, 'TestError')
+                    assert.ok(error.message.includes('Invalid accessKeyId in test context'))
+                    return true
+                }
+            )
+        })
+
+        it('should throw for invalid accessKeyId type', () => {
+            const invalidCredentials = {
+                accessKeyId: 123,
+                secretAccessKey: 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY',
+                sessionToken: 'token',
+            }
+
+            assert.throws(
+                () => validateCredentialFields(invalidCredentials, 'TestError', 'test context'),
+                (error: any) => {
+                    assert.ok(error instanceof ToolkitError)
+                    assert.strictEqual(error.code, 'TestError')
+                    assert.ok(error.message.includes('Invalid accessKeyId in test context: number'))
+                    return true
+                }
+            )
+        })
+
+        it('should throw for missing secretAccessKey', () => {
+            const invalidCredentials = {
+                accessKeyId: 'AKIAIOSFODNN7EXAMPLE',
+                sessionToken: 'token',
+            }
+
+            assert.throws(
+                () => validateCredentialFields(invalidCredentials, 'TestError', 'test context'),
+                (error: any) => {
+                    assert.ok(error instanceof ToolkitError)
+                    assert.strictEqual(error.code, 'TestError')
+                    assert.ok(error.message.includes('Invalid secretAccessKey in test context'))
+                    return true
+                }
+            )
+        })
+
+        it('should throw for missing sessionToken', () => {
+            const invalidCredentials = {
+                accessKeyId: 'AKIAIOSFODNN7EXAMPLE',
+                secretAccessKey: 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY',
+            }
+
+            assert.throws(
+                () => validateCredentialFields(invalidCredentials, 'TestError', 'test context'),
+                (error: any) => {
+                    assert.ok(error instanceof ToolkitError)
+                    assert.strictEqual(error.code, 'TestError')
+                    assert.ok(error.message.includes('Invalid sessionToken in test context'))
+                    return true
+                }
+            )
+        })
+    })
+
+    describe('isInSmusSpaceEnvironment', () => {
+        let isSageMakerStub: sinon.SinonStub
+        let getResourceMetadataStub: sinon.SinonStub
+
+        beforeEach(() => {
+            isSageMakerStub = sinon.stub(extensionUtilities, 'isSageMaker')
+            getResourceMetadataStub = sinon.stub(resourceMetadataUtils, 'getResourceMetadata')
+        })
+
+        it('should return true when in SMUS space with DataZone domain ID', () => {
+            isSageMakerStub.withArgs('SMUS').returns(true)
+            getResourceMetadataStub.returns({
+                AdditionalMetadata: {
+                    DataZoneDomainId: 'dz-domain-123',
+                },
+            })
+
+            const result = SmusUtils.isInSmusSpaceEnvironment()
+            assert.strictEqual(result, true)
+        })
+
+        it('should return false when not in SMUS space', () => {
+            isSageMakerStub.withArgs('SMUS').returns(false)
+            isSageMakerStub.withArgs('SMUS-SPACE-REMOTE-ACCESS').returns(false)
+
+            const result = SmusUtils.isInSmusSpaceEnvironment()
+            assert.strictEqual(result, false)
+        })
+
+        it('should return false when in SMUS space but no resource metadata', () => {
+            isSageMakerStub.withArgs('SMUS').returns(true)
+            getResourceMetadataStub.returns(undefined)
+
+            const result = SmusUtils.isInSmusSpaceEnvironment()
+            assert.strictEqual(result, false)
+        })
+
+        it('should return false when in SMUS space but no DataZone domain ID', () => {
+            isSageMakerStub.withArgs('SMUS').returns(true)
+            getResourceMetadataStub.returns({
+                AdditionalMetadata: {},
+            })
+
+            const result = SmusUtils.isInSmusSpaceEnvironment()
+            assert.strictEqual(result, false)
+        })
+    })
+})
+
+describe('extractAccountIdFromSageMakerArn', () => {
+    describe('valid ARN formats', () => {
+        it('should extract account ID from valid ARN', () => {
+            const arn = 'arn:aws:sagemaker:us-west-2:123456789012:app/domain-id/ce/CodeEditor/default'
+            const result = extractAccountIdFromSageMakerArn(arn)
+
+            assert.strictEqual(result, '123456789012')
+        })
+    })
+
+    describe('invalid ARN formats', () => {
+        it('should throw error for empty ARN', () => {
+            assert.throws(
+                () => extractAccountIdFromSageMakerArn(''),
+                (error: any) => {
+                    assert.ok(error instanceof ToolkitError)
+                    assert.ok(error.message.includes('Invalid SageMaker ARN format'))
+                    return true
+                }
+            )
+        })
+
+        it('should throw error for non-ARN string', () => {
+            assert.throws(
+                () => extractAccountIdFromSageMakerArn('not-an-arn'),
+                (error: any) => {
+                    assert.ok(error instanceof ToolkitError)
+                    assert.ok(error.message.includes('Invalid SageMaker ARN format'))
+                    return true
+                }
+            )
+        })
+
+        it('should throw error for wrong service', () => {
+            const arn = 'arn:aws:s3:us-east-1:123456789012:bucket/my-bucket'
+            assert.throws(
+                () => extractAccountIdFromSageMakerArn(arn),
+                (error: any) => {
+                    assert.ok(error instanceof ToolkitError)
+                    assert.ok(error.message.includes('Invalid SageMaker ARN format'))
+                    return true
+                }
+            )
+        })
+
+        it('should throw error for missing account ID', () => {
+            const arn = 'arn:aws:sagemaker:us-east-1::space/domain/space'
+            assert.throws(
+                () => extractAccountIdFromSageMakerArn(arn),
+                (error: any) => {
+                    assert.ok(error instanceof ToolkitError)
+                    assert.ok(error.message.includes('Invalid SageMaker ARN format'))
+                    return true
+                }
+            )
+        })
+    })
+})
+
+describe('extractAccountIdFromResourceMetadata', () => {
+    let getResourceMetadataStub: sinon.SinonStub
+
+    beforeEach(() => {
+        getResourceMetadataStub = sinon.stub(resourceMetadataUtils, 'getResourceMetadata')
+    })
+
+    afterEach(() => {
+        sinon.restore()
+    })
+
+    it('should extract account ID from ResourceArn successfully', async () => {
+        const testAccountId = '123456789012'
+        const testResourceArn = `arn:aws:sagemaker:us-east-1:${testAccountId}:app/domain-id/appName/CodeEditor/default`
+
+        getResourceMetadataStub.returns({
+            ResourceArn: testResourceArn,
+        })
+
+        const result = await extractAccountIdFromResourceMetadata()
+
+        assert.strictEqual(result, testAccountId)
+        assert.ok(getResourceMetadataStub.called)
+    })
+
+    it('should throw error when ResourceArn is missing', async () => {
+        getResourceMetadataStub.returns({})
+
+        await assert.rejects(
+            () => extractAccountIdFromResourceMetadata(),
+            (err: Error) => {
+                return err.message.includes(
+                    'Failed to extract AWS account ID from ResourceArn in SMUS space environment'
+                )
+            }
+        )
+    })
+
+    it('should throw error when extractAccountIdFromSageMakerArn fails', async () => {
+        const testResourceArn = 'invalid-arn'
+        getResourceMetadataStub.returns({
+            ResourceArn: testResourceArn,
+        })
+
+        await assert.rejects(
+            () => extractAccountIdFromResourceMetadata(),
+            (err: Error) => {
+                return err.message.includes(
+                    'Failed to extract AWS account ID from ResourceArn in SMUS space environment'
+                )
+            }
+        )
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/shared/utils/resourceMetadataUtils.test.ts b/packages/core/src/test/sagemakerunifiedstudio/shared/utils/resourceMetadataUtils.test.ts
new file mode 100644
index 00000000000..3580a730fbc
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/shared/utils/resourceMetadataUtils.test.ts
@@ -0,0 +1,292 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as assert from 'assert'
+import * as sinon from 'sinon'
+import { fs } from '../../../../shared/fs/fs'
+import * as extensionUtilities from '../../../../shared/extensionUtilities'
+import {
+    initializeResourceMetadata,
+    getResourceMetadata,
+    resourceMetadataFileExists,
+    resetResourceMetadata,
+    ResourceMetadata,
+} from '../../../../sagemakerunifiedstudio/shared/utils/resourceMetadataUtils'
+
+describe('resourceMetadataUtils', function () {
+    let sandbox: sinon.SinonSandbox
+
+    const mockMetadata: ResourceMetadata = {
+        AppType: 'JupyterServer',
+        DomainId: 'domain-12345',
+        SpaceName: 'test-space',
+        UserProfileName: 'test-user',
+        ExecutionRoleArn: 'arn:aws:iam::123456789012:role/test-role',
+        ResourceArn: 'arn:aws:sagemaker:us-west-2:123456789012:app/domain-12345/test-user/jupyterserver/test-app',
+        ResourceName: 'test-app',
+        AppImageVersion: '1.0.0',
+        AdditionalMetadata: {
+            DataZoneDomainId: 'dz-domain-123',
+            DataZoneDomainRegion: 'us-west-2',
+            DataZoneEndpoint: 'https://datazone.us-west-2.amazonaws.com',
+            DataZoneEnvironmentId: 'env-123',
+            DataZoneProjectId: 'project-456',
+            DataZoneScopeName: 'test-scope',
+            DataZoneStage: 'prod',
+            DataZoneUserId: 'user-789',
+            PrivateSubnets: 'subnet-123,subnet-456',
+            ProjectS3Path: 's3://test-bucket/project/',
+            SecurityGroup: 'sg-123456789',
+        },
+        ResourceArnCaseSensitive:
+            'arn:aws:sagemaker:us-west-2:123456789012:app/domain-12345/test-user/JupyterServer/test-app',
+        IpAddressType: 'IPv4',
+    }
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        resetResourceMetadata()
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    describe('initializeResourceMetadata()', function () {
+        it('should initialize metadata when file exists and is valid JSON', async function () {
+            sandbox.stub(extensionUtilities, 'isSageMaker').withArgs('SMUS').returns(true)
+            sandbox.stub(fs, 'existsFile').resolves(true)
+            sandbox.stub(fs, 'readFileText').resolves(JSON.stringify(mockMetadata))
+
+            await initializeResourceMetadata()
+            const result = getResourceMetadata()
+
+            assert.deepStrictEqual(result, mockMetadata)
+        })
+
+        it('should not initialize when not in SMUS environment', async function () {
+            sandbox.stub(extensionUtilities, 'isSageMaker').withArgs('SMUS').returns(false)
+
+            await initializeResourceMetadata()
+            const result = getResourceMetadata()
+
+            assert.strictEqual(result, undefined)
+        })
+
+        it('should not throw when file does not exist', async function () {
+            sandbox.stub(extensionUtilities, 'isSageMaker').withArgs('SMUS').returns(true)
+            sandbox.stub(fs, 'existsFile').resolves(false)
+
+            await initializeResourceMetadata()
+            const result = getResourceMetadata()
+
+            assert.strictEqual(result, undefined)
+        })
+
+        it('should handle invalid JSON gracefully', async function () {
+            sandbox.stub(extensionUtilities, 'isSageMaker').withArgs('SMUS').returns(true)
+            sandbox.stub(fs, 'existsFile').resolves(true)
+            sandbox.stub(fs, 'readFileText').resolves('{ invalid json }')
+
+            await initializeResourceMetadata()
+            const result = getResourceMetadata()
+
+            assert.strictEqual(result, undefined)
+        })
+
+        it('should handle file read errors gracefully', async function () {
+            const error = new Error('File read error')
+            sandbox.stub(extensionUtilities, 'isSageMaker').withArgs('SMUS').returns(true)
+            sandbox.stub(fs, 'existsFile').resolves(true)
+            sandbox.stub(fs, 'readFileText').rejects(error)
+
+            await initializeResourceMetadata()
+            const result = getResourceMetadata()
+
+            assert.strictEqual(result, undefined)
+        })
+
+        it('should handle metadata with missing optional fields', async function () {
+            const minimalMetadata: ResourceMetadata = {
+                DomainId: 'domain-123',
+            }
+            sandbox.stub(extensionUtilities, 'isSageMaker').withArgs('SMUS').returns(true)
+            sandbox.stub(fs, 'existsFile').resolves(true)
+            sandbox.stub(fs, 'readFileText').resolves(JSON.stringify(minimalMetadata))
+
+            await initializeResourceMetadata()
+            const result = getResourceMetadata()
+
+            assert.deepStrictEqual(result, minimalMetadata)
+        })
+
+        it('should handle metadata with empty AdditionalMetadata', async function () {
+            const metadataWithEmptyAdditional: ResourceMetadata = {
+                DomainId: 'domain-123',
+                AdditionalMetadata: {},
+            }
+            sandbox.stub(extensionUtilities, 'isSageMaker').withArgs('SMUS').returns(true)
+            sandbox.stub(fs, 'existsFile').resolves(true)
+            sandbox.stub(fs, 'readFileText').resolves(JSON.stringify(metadataWithEmptyAdditional))
+
+            await initializeResourceMetadata()
+            const result = getResourceMetadata()
+
+            assert.deepStrictEqual(result, metadataWithEmptyAdditional)
+        })
+
+        it('should handle empty JSON file', async function () {
+            const emptyMetadata: ResourceMetadata = {}
+            sandbox.stub(extensionUtilities, 'isSageMaker').withArgs('SMUS').returns(true)
+            sandbox.stub(fs, 'existsFile').resolves(true)
+            sandbox.stub(fs, 'readFileText').resolves(JSON.stringify(emptyMetadata))
+
+            await initializeResourceMetadata()
+            const result = getResourceMetadata()
+
+            assert.deepStrictEqual(result, emptyMetadata)
+        })
+
+        it('should handle very large JSON files', async function () {
+            const largeMetadata = {
+                ...mockMetadata,
+                LargeField: 'x'.repeat(10000),
+            }
+            sandbox.stub(extensionUtilities, 'isSageMaker').withArgs('SMUS').returns(true)
+            sandbox.stub(fs, 'existsFile').resolves(true)
+            sandbox.stub(fs, 'readFileText').resolves(JSON.stringify(largeMetadata))
+
+            await initializeResourceMetadata()
+            const result = getResourceMetadata()
+
+            assert.strictEqual((result as any).LargeField?.length, 10000)
+        })
+
+        it('should handle JSON with unexpected additional fields', async function () {
+            const metadataWithExtraFields = {
+                ...mockMetadata,
+                UnexpectedField: 'unexpected-value',
+                AdditionalMetadata: {
+                    ...mockMetadata.AdditionalMetadata,
+                    UnexpectedNestedField: 'unexpected-nested-value',
+                },
+            }
+            sandbox.stub(extensionUtilities, 'isSageMaker').withArgs('SMUS').returns(true)
+            sandbox.stub(fs, 'existsFile').resolves(true)
+            sandbox.stub(fs, 'readFileText').resolves(JSON.stringify(metadataWithExtraFields))
+
+            await initializeResourceMetadata()
+            const result = getResourceMetadata()
+
+            assert.strictEqual((result as any).UnexpectedField, 'unexpected-value')
+            assert.strictEqual((result as any).AdditionalMetadata?.UnexpectedNestedField, 'unexpected-nested-value')
+        })
+
+        it('should handle JSON with undefined values', async function () {
+            const metadataWithUndefined = {
+                DomainId: undefined,
+                AdditionalMetadata: {
+                    DataZoneDomainId: undefined,
+                },
+            }
+            sandbox.stub(extensionUtilities, 'isSageMaker').withArgs('SMUS').returns(true)
+            sandbox.stub(fs, 'existsFile').resolves(true)
+            sandbox.stub(fs, 'readFileText').resolves(JSON.stringify(metadataWithUndefined))
+
+            await initializeResourceMetadata()
+            const result = getResourceMetadata()
+
+            assert.strictEqual(result?.DomainId, undefined)
+            assert.strictEqual(result?.AdditionalMetadata?.DataZoneDomainId, undefined)
+        })
+    })
+
+    describe('getResourceMetadata()', function () {
+        it('should return undefined when not initialized', function () {
+            const result = getResourceMetadata()
+            assert.strictEqual(result, undefined)
+        })
+
+        it('should return cached metadata after initialization', async function () {
+            sandbox.stub(extensionUtilities, 'isSageMaker').withArgs('SMUS').returns(true)
+            sandbox.stub(fs, 'existsFile').resolves(true)
+            sandbox.stub(fs, 'readFileText').resolves(JSON.stringify(mockMetadata))
+
+            await initializeResourceMetadata()
+
+            const result = getResourceMetadata()
+            assert.deepStrictEqual(result, mockMetadata)
+        })
+
+        it('should return the same instance on multiple calls', async function () {
+            sandbox.stub(extensionUtilities, 'isSageMaker').withArgs('SMUS').returns(true)
+            sandbox.stub(fs, 'existsFile').resolves(true)
+            sandbox.stub(fs, 'readFileText').resolves(JSON.stringify(mockMetadata))
+
+            await initializeResourceMetadata()
+
+            const result1 = getResourceMetadata()
+            const result2 = getResourceMetadata()
+
+            assert.strictEqual(result1, result2)
+            assert.deepStrictEqual(result1, mockMetadata)
+        })
+    })
+
+    describe('resetResourceMetadata()', function () {
+        it('should reset cached metadata and allow re-initialization', async function () {
+            sandbox.stub(extensionUtilities, 'isSageMaker').withArgs('SMUS').returns(true)
+            const existsFileStub = sandbox.stub(fs, 'existsFile').resolves(true)
+            const readFileTextStub = sandbox.stub(fs, 'readFileText').resolves(JSON.stringify(mockMetadata))
+
+            await initializeResourceMetadata()
+            const cached1 = getResourceMetadata()
+            assert.deepStrictEqual(cached1, mockMetadata)
+
+            sinon.assert.calledOnce(existsFileStub)
+            sinon.assert.calledOnce(readFileTextStub)
+
+            resetResourceMetadata()
+
+            const cached2 = getResourceMetadata()
+            assert.strictEqual(cached2, undefined)
+
+            await initializeResourceMetadata()
+            const cached3 = getResourceMetadata()
+            assert.deepStrictEqual(cached3, mockMetadata)
+
+            sinon.assert.calledTwice(existsFileStub)
+            sinon.assert.calledTwice(readFileTextStub)
+        })
+    })
+
+    describe('resourceMetadataFileExists()', function () {
+        it('should return true when file exists', async function () {
+            const existsStub = sandbox.stub(fs, 'existsFile').resolves(true)
+
+            const result = await resourceMetadataFileExists()
+
+            assert.strictEqual(result, true)
+            sinon.assert.calledOnceWithExactly(existsStub, '/opt/ml/metadata/resource-metadata.json')
+        })
+
+        it('should return false when file does not exist', async function () {
+            sandbox.stub(fs, 'existsFile').resolves(false)
+
+            const result = await resourceMetadataFileExists()
+
+            assert.strictEqual(result, false)
+        })
+
+        it('should return false and log error when fs.existsFile throws', async function () {
+            const error = new Error('Permission denied')
+            sandbox.stub(fs, 'existsFile').rejects(error)
+
+            const result = await resourceMetadataFileExists()
+
+            assert.strictEqual(result, false)
+        })
+    })
+})
diff --git a/packages/core/src/test/sagemakerunifiedstudio/testUtils.ts b/packages/core/src/test/sagemakerunifiedstudio/testUtils.ts
new file mode 100644
index 00000000000..ce1a706325d
--- /dev/null
+++ b/packages/core/src/test/sagemakerunifiedstudio/testUtils.ts
@@ -0,0 +1,89 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+
+/**
+ * Creates a mock extension context for SageMaker Unified Studio tests
+ */
+export function createMockExtensionContext(): any {
+    return {
+        subscriptions: [],
+        workspaceState: {
+            get: sinon.stub(),
+            update: sinon.stub(),
+        },
+        globalState: {
+            get: sinon.stub(),
+            update: sinon.stub(),
+        },
+    }
+}
+
+/**
+ * Creates a mock S3 connection for SageMaker Unified Studio tests
+ */
+export function createMockS3Connection() {
+    return {
+        connectionId: 'conn-123',
+        name: 'project.s3_default_folder',
+        type: 'S3Connection',
+        props: {
+            s3Properties: {
+                s3Uri: 's3://test-bucket/domain/project/',
+            },
+        },
+    }
+}
+
+/**
+ * Creates a mock credentials provider for SageMaker Unified Studio tests
+ */
+export function createMockCredentialsProvider() {
+    return {
+        getCredentials: async () => ({
+            accessKeyId: 'test-key',
+            secretAccessKey: 'test-secret',
+        }),
+        getDomainAccountId: async () => '123456789012',
+    }
+}
+/**
+ * Creates a mock unauthenticated auth provider for SageMaker Unified Studio tests
+ */
+export function createMockUnauthenticatedAuthProvider(): any {
+    return {
+        isConnected: sinon.stub().returns(false),
+        isConnectionValid: sinon.stub().returns(false),
+        activeConnection: undefined,
+        onDidChange: sinon.stub().returns({ dispose: sinon.stub() }),
+    }
+} /**
+ *
+ Creates a mock space node for SageMaker Unified Studio tests
+ */
+export function createMockSpaceNode(): any {
+    return {
+        resource: {
+            sageMakerClient: {},
+            DomainSpaceKey: 'test-space-key',
+            regionCode: 'us-east-1',
+            getParent: sinon.stub().returns({
+                getAuthProvider: sinon.stub().returns({
+                    activeConnection: { domainId: 'test-domain' },
+                    getDomainAccountId: sinon.stub().resolves('123456789012'),
+                }),
+                getProjectId: sinon.stub().returns('test-project'),
+            }),
+        },
+        getParent: sinon.stub().returns({
+            getAuthProvider: sinon.stub().returns({
+                activeConnection: { domainId: 'test-domain' },
+                getDomainAccountId: sinon.stub().resolves('123456789012'),
+            }),
+            getProjectId: sinon.stub().returns('test-project'),
+        }),
+    }
+}
diff --git a/packages/core/src/test/setupUtil.ts b/packages/core/src/test/setupUtil.ts
new file mode 100644
index 00000000000..5e00b06ff5e
--- /dev/null
+++ b/packages/core/src/test/setupUtil.ts
@@ -0,0 +1,279 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { parse } from '@aws-sdk/util-arn-parser'
+import { LambdaClient, InvokeCommand } from '@aws-sdk/client-lambda'
+import { STSClient, GetCallerIdentityCommand } from '@aws-sdk/client-sts'
+import * as vscode from 'vscode'
+import { getLogger } from '../shared/logger'
+import { hasKey } from '../shared/utilities/tsUtils'
+import { getTestWindow, printPendingUiElements } from './shared/vscode/window'
+import { ToolkitError, formatError } from '../shared/errors'
+import { proceedToBrowser } from '../auth/sso/model'
+import { decodeBase64 } from '../shared'
+
+const runnableTimeout = Symbol('runnableTimeout')
+
+/**
+ * Wraps the test function to bubble up errors that occurred in events from `TestWindow`
+ */
+export function setRunnableTimeout(test: Mocha.Runnable, maxTestDuration: number): Mocha.Runnable {
+    const testFn = test.fn
+    if (!testFn) {
+        return test
+    }
+
+    // The timeout duration is stored within the function itself, allowing
+    // us to know if we've already added a timeout
+    if (!hasKey(testFn, runnableTimeout)) {
+        const fn = function (this: Mocha.Context, done: Mocha.Done) {
+            const maxTestDuration = (fn as any)[runnableTimeout] as number
+
+            return Promise.race([
+                testFn.call(this, done),
+                new Promise<void>((_, reject) => {
+                    getTestWindow().onError(({ event, error }) => {
+                        event.dispose()
+                        reject(error)
+                    })
+
+                    // Set a hard time limit per-test so CI doesn't hang
+                    // Mocha's `timeout` method isn't used because we want to emit a custom message
+                    setTimeout(() => {
+                        const duration = `${maxTestDuration / 1000} seconds`
+                        const message = `Test length exceeded max duration: ${duration}\n${printPendingUiElements()}`
+                        reject(new Error(message))
+                    }, maxTestDuration)
+                }),
+            ])
+        }
+
+        test.fn = fn
+    }
+
+    Object.assign(test.fn!, { [runnableTimeout]: Math.max(maxTestDuration, test.timeout()) })
+
+    return test
+}
+
+export function skipTest(testOrCtx: Mocha.Context | Mocha.Test | undefined, reason?: string) {
+    let test
+
+    if (testOrCtx?.type === 'test') {
+        test = testOrCtx as Mocha.Test
+    } else {
+        const context = testOrCtx as Mocha.Context | undefined
+        test = context?.currentTest ?? context?.test
+    }
+
+    if (test) {
+        test.title += ` (skipped${reason ? ` - ${reason}` : ''})`
+        test.skip()
+    }
+}
+
+export function skipSuite(suite: Mocha.Suite, reason?: string) {
+    suite.eachTest((test) => skipTest(test, reason))
+}
+
+export function mapTestErrors(runner: Mocha.Runner, fn: (err: unknown, test: Mocha.Test) => any) {
+    return runner.prependListener('fail', (test, err) => {
+        test.err = fn(err, test) || err
+    })
+}
+
+/**
+ * Formats any known sub-classes of {@link Error} for better compatability with test reporters.
+ *
+ * Most test reporters will only output the name + message + stack trace so any relevant
+ * info must go into those fields.
+ */
+export function normalizeError(err?: unknown) {
+    if (err instanceof ToolkitError) {
+        // Error has to be mutated to show up in the report:
+        // https://github.com/michaelleeallen/mocha-junit-reporter/blob/4b17772f8da33d580fafa4d124e5c11142a70c1f/index.js#L262
+        //
+        // We'll just patch the message/stack trace even though it's arguably incorrect (and looks kind of ugly)
+        // Once `cause` is more common in the JS ecosystem we'll start to see support from test reporters
+
+        return Object.assign(err, {
+            message: formatError(err).replace(`${err.name}: `, ''),
+            stack: err.stack?.replace(err.message, err.trace.replace(`${err.name}: `, '') + '\n'),
+        })
+    }
+
+    return err
+}
+
+export function patchObject<T extends Record<string, any>, U extends keyof T>(
+    obj: T,
+    key: U,
+    value: T[U]
+): vscode.Disposable {
+    return patchObjectDescriptor(obj, key, { value })
+}
+
+export function patchObjectDescriptor<T extends Record<string, any>, U extends keyof T>(
+    obj: T,
+    key: U,
+    descriptor: TypedPropertyDescriptor<T[U]>
+): vscode.Disposable {
+    const original = Object.getOwnPropertyDescriptor(obj, key)
+    Object.defineProperty(obj, key, descriptor)
+
+    function dispose() {
+        if (original === undefined) {
+            delete obj[key]
+        } else {
+            Object.defineProperty(obj, key, original)
+        }
+    }
+
+    return { dispose }
+}
+
+async function createLambdaClient(functionId: string) {
+    if (!functionId.startsWith('arn:aws:lambda')) {
+        return Object.assign(new LambdaClient({}), { isCrossAccount: false })
+    }
+
+    const sts = new STSClient({})
+    const { region, accountId } = parse(functionId)
+    const identity = await sts.send(new GetCallerIdentityCommand({}))
+    const client = new LambdaClient({ region })
+
+    return Object.assign(client, { isCrossAccount: identity.Account !== accountId })
+}
+
+export async function invokeLambda(id: string, request: unknown): Promise<unknown> {
+    const client = await createLambdaClient(id)
+    const response = await client
+        .send(
+            new InvokeCommand({
+                FunctionName: id,
+                // Setting this to `Tail` with cross account calls results in
+                // `AccessDeniedException: Cross-account log access is not allowed`
+                LogType: client.isCrossAccount ? 'None' : 'Tail',
+                Payload: JSON.stringify(request),
+            })
+        )
+        .catch((err) => {
+            if (err instanceof Error) {
+                err.message = maskArns(err.message)
+            }
+            throw err
+        })
+
+    if (response.LogResult) {
+        const logs = decodeBase64(response.LogResult)
+        getLogger().debug('lambda invocation logs: %s', maskArns(logs))
+    } else {
+        getLogger().debug('lambda invocation request id: %s', response.$metadata?.requestId)
+    }
+
+    const respStr = response.Payload ? new TextDecoder().decode(response.Payload) : undefined
+    if (!respStr || respStr === 'null') {
+        return
+    }
+
+    const respPayload = JSON.parse(respStr)
+    if (response.FunctionError) {
+        const error = new Error()
+        error.name = respPayload.errorType || error.name
+        error.message = maskArns(respPayload.errorMessage || error.message)
+
+        throw error
+    }
+
+    return respPayload
+}
+
+function maskArns(text: string) {
+    return text.replace(/arn:(aws|aws-cn|aws-us-gov):(?:.*?):(.*?):(.*?):./g, (match, region, account) => {
+        if (region) {
+            match = match.replace(region, '[omitted]')
+        }
+        if (account) {
+            match = match.replace(account, '[omitted]')
+        }
+
+        return match
+    })
+}
+
+/**
+ * Registers a hook to proxy SSO logins to a Lambda function.
+ *
+ * The function is expected to perform a browser login using the following parameters:
+ * * `secret` - a SecretsManager secret containing login credentials.
+ * * `userCode` - the user verification code e.g. `ABCD-EFGH`. This is returned by the device authorization flow.
+ * * `verificationUri` - the url to login with. This is returned by the device authorization flow.
+ */
+export function registerAuthHook(secret: string, lambdaId = process.env['AUTH_UTIL_LAMBDA_ARN']) {
+    return getTestWindow().onDidShowMessage((message) => {
+        if (message.items.length > 0 && message.items[0].title.match(new RegExp(proceedToBrowser))) {
+            if (!lambdaId) {
+                const baseMessage = 'Browser login flow was shown during testing without an authorizer function'
+                if (process.env['AWS_TOOLKIT_AUTOMATION'] === 'local') {
+                    throw new Error(`${baseMessage}. You may need to login manually before running tests.`)
+                } else {
+                    throw new Error(`${baseMessage}. Check that environment variables are set correctly.`)
+                }
+            }
+
+            const openStub = patchObject(vscode.env, 'openExternal', async (target) => {
+                try {
+                    // Latest eg: 'https://nkomonen.awsapps.com/start/#/device?user_code=JXZC-NVRK'
+                    const urlString = target.toString(true)
+
+                    // Drop the user_code parameter since the auth lambda does not support it yet, and keeping it
+                    // would trigger a slightly different UI flow which breaks the automation.
+                    // TODO: If the auth lambda supports user_code in the parameters then we can skip this step
+                    const verificationUri = urlString.split('?')[0]
+
+                    const params = urlString.split('?')[1]
+                    const userCode = new URLSearchParams(params).get('user_code')
+
+                    await invokeLambda(lambdaId, {
+                        secret,
+                        userCode,
+                        verificationUri,
+                    })
+                } finally {
+                    openStub.dispose()
+                }
+
+                return true
+            })
+
+            message.items[0].select()
+        }
+    })
+}
+
+/**
+ * Calls {@link fn} and disposes {@link disposable} after the function finishes
+ */
+export function using<T extends (...args: any[]) => any>(
+    disposable: vscode.Disposable,
+    fn: T,
+    ...args: Parameters<T>
+): ReturnType<T> {
+    let isPromise = false
+
+    try {
+        const val = fn(...args)
+        if (val instanceof Promise) {
+            isPromise = true
+            return val.finally(() => disposable.dispose()) as any
+        }
+
+        return val
+    } finally {
+        if (!isPromise) {
+            disposable.dispose()
+        }
+    }
+}
diff --git a/packages/core/src/test/shared/activationReloadState.test.ts b/packages/core/src/test/shared/activationReloadState.test.ts
new file mode 100644
index 00000000000..2dd0ba35bbd
--- /dev/null
+++ b/packages/core/src/test/shared/activationReloadState.test.ts
@@ -0,0 +1,245 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+import assert from 'assert'
+import { ActivationReloadState } from '../../shared/activationReloadState'
+import globals, { checkDidReload } from '../../shared/extensionGlobals'
+import { Runtime } from '@aws-sdk/client-lambda'
+
+describe('ActivationReloadState', async function () {
+    const activationReloadState = new ActivationReloadState()
+
+    beforeEach(function () {
+        activationReloadState.clearSamInitState()
+    })
+
+    afterEach(function () {
+        activationReloadState.clearSamInitState()
+    })
+
+    it('decides globals.didReload', async function () {
+        await globals.globalState.update('ACTIVATION_LAUNCH_PATH_KEY', undefined)
+        assert.strictEqual(checkDidReload(globals.context), false)
+
+        await globals.globalState.update('ACTIVATION_LAUNCH_PATH_KEY', '/some/path')
+        assert.strictEqual(checkDidReload(globals.context), true)
+    })
+
+    describe('setSamInitState', async function () {
+        it('without runtime', async function () {
+            activationReloadState.setSamInitState({
+                template: 'sometemplate',
+                readme: 'somepath',
+                runtime: undefined,
+                isImage: false,
+                architecture: 'arm64',
+            })
+
+            assert.strictEqual(
+                globals.globalState.get('ACTIVATION_LAUNCH_PATH_KEY'),
+                'somepath',
+                'Unexpected Launch Path value was set'
+            )
+            assert.strictEqual(
+                globals.globalState.get('ACTIVATION_TEMPLATE_PATH_KEY'),
+                'sometemplate',
+                'Unexpected Template Path value was set'
+            )
+            assert.strictEqual(
+                globals.globalState.get('SAM_INIT_RUNTIME_KEY'),
+                undefined,
+                'Unexpected init runtime key value was set'
+            )
+            assert.strictEqual(
+                globals.globalState.get('SAM_INIT_IMAGE_BOOLEAN_KEY'),
+                false,
+                'Unexpected init image boolean value was set'
+            )
+        })
+
+        it('with runtime', async function () {
+            activationReloadState.setSamInitState({
+                template: 'sometemplate',
+                readme: 'somepath',
+                runtime: 'someruntime' as Runtime,
+                isImage: false,
+                architecture: 'arm64',
+            })
+
+            assert.strictEqual(
+                globals.globalState.get('ACTIVATION_LAUNCH_PATH_KEY'),
+                'somepath',
+                'Unexpected Launch Path value was set'
+            )
+            assert.strictEqual(
+                globals.globalState.get('ACTIVATION_TEMPLATE_PATH_KEY'),
+                'sometemplate',
+                'Unexpected Template Path value was set'
+            )
+            assert.strictEqual(
+                globals.globalState.get('SAM_INIT_RUNTIME_KEY'),
+                'someruntime',
+                'Unexpected init runtime value was set'
+            )
+            assert.strictEqual(
+                globals.globalState.get('SAM_INIT_IMAGE_BOOLEAN_KEY'),
+                false,
+                'Unexpected init image boolean value was set'
+            )
+        })
+
+        it('with image', async function () {
+            activationReloadState.setSamInitState({
+                template: 'sometemplate',
+                readme: 'somepath',
+                runtime: 'someruntime' as Runtime,
+                isImage: true,
+                architecture: 'arm64',
+            })
+
+            assert.strictEqual(
+                globals.globalState.get('ACTIVATION_LAUNCH_PATH_KEY'),
+                'somepath',
+                'Unexpected Launch Path value was set'
+            )
+            assert.strictEqual(
+                globals.globalState.get('ACTIVATION_TEMPLATE_PATH_KEY'),
+                'sometemplate',
+                'Unexpected Template Path value was set'
+            )
+            assert.strictEqual(
+                globals.globalState.get('SAM_INIT_RUNTIME_KEY'),
+                'someruntime',
+                'Unexpected init runtime value was set'
+            )
+            assert.strictEqual(
+                globals.globalState.get('SAM_INIT_IMAGE_BOOLEAN_KEY'),
+                true,
+                'Unexpected init image boolean value was set'
+            )
+        })
+    })
+
+    describe('getSamInitState', async function () {
+        it('path defined, without runtime', async function () {
+            await globals.globalState.update('ACTIVATION_LAUNCH_PATH_KEY', 'getsomepath')
+            await globals.globalState.update('ACTIVATION_TEMPLATE_PATH_KEY', 'gettemplatepath')
+            await globals.globalState.update('SAM_INIT_RUNTIME_KEY', undefined)
+
+            assert.strictEqual(
+                activationReloadState.getSamInitState()?.readme,
+                'getsomepath',
+                'Unexpected Launch Path value was retrieved'
+            )
+            assert.strictEqual(
+                activationReloadState.getSamInitState()?.template,
+                'gettemplatepath',
+                'Unexpected Template Path value was retrieved'
+            )
+            assert.strictEqual(
+                activationReloadState.getSamInitState()?.runtime,
+                undefined,
+                'Unexpected init runtime value was retrieved'
+            )
+            assert.strictEqual(
+                activationReloadState.getSamInitState()?.isImage,
+                undefined,
+                'Unexpected init image boolean value was retrieved'
+            )
+        })
+
+        it('path defined, with runtime', async function () {
+            await globals.globalState.update('ACTIVATION_LAUNCH_PATH_KEY', 'getsomepath')
+            await globals.globalState.update('ACTIVATION_TEMPLATE_PATH_KEY', 'gettemplatepath')
+            await globals.globalState.update('SAM_INIT_RUNTIME_KEY', 'getsomeruntime')
+
+            assert.strictEqual(
+                activationReloadState.getSamInitState()?.readme,
+                'getsomepath',
+                'Unexpected Launch Path value was retrieved'
+            )
+            assert.strictEqual(
+                activationReloadState.getSamInitState()?.template,
+                'gettemplatepath',
+                'Unexpected Template Path value was retrieved'
+            )
+            assert.strictEqual(
+                activationReloadState.getSamInitState()?.runtime,
+                'getsomeruntime',
+                'Unexpected init runtime value was retrieved'
+            )
+            assert.strictEqual(
+                activationReloadState.getSamInitState()?.isImage,
+                undefined,
+                'Unexpected init image boolean value was retrieved'
+            )
+        })
+
+        it('path defined, with runtime and isImage', async function () {
+            await globals.globalState.update('ACTIVATION_LAUNCH_PATH_KEY', 'getsomepath')
+            await globals.globalState.update('ACTIVATION_TEMPLATE_PATH_KEY', 'gettemplatepath')
+            await globals.globalState.update('SAM_INIT_RUNTIME_KEY', 'getsomeruntime')
+            await globals.globalState.update('SAM_INIT_IMAGE_BOOLEAN_KEY', true)
+
+            assert.strictEqual(
+                activationReloadState.getSamInitState()?.readme,
+                'getsomepath',
+                'Unexpected Launch Path value was retrieved'
+            )
+            assert.strictEqual(
+                activationReloadState.getSamInitState()?.template,
+                'gettemplatepath',
+                'Unexpected Template Path value was retrieved'
+            )
+            assert.strictEqual(
+                activationReloadState.getSamInitState()?.runtime,
+                'getsomeruntime',
+                'Unexpected init runtime value was retrieved'
+            )
+            assert.strictEqual(
+                activationReloadState.getSamInitState()?.isImage,
+                true,
+                'Unexpected init image boolean value was retrieved'
+            )
+        })
+    })
+
+    it('clearLaunchPath', async function () {
+        activationReloadState.setSamInitState({
+            template: 'sometemplate',
+            readme: 'somepath',
+            runtime: 'someruntime' as Runtime,
+            isImage: true,
+            architecture: 'x86_64',
+        })
+        activationReloadState.clearSamInitState()
+
+        assert.strictEqual(
+            globals.globalState.get('ACTIVATION_LAUNCH_PATH_KEY'),
+            undefined,
+            'Expected launch path to be cleared (undefined)'
+        )
+
+        assert.strictEqual(
+            globals.globalState.get('ACTIVATION_TEMPLATE_PATH_KEY'),
+            undefined,
+            'Expected template path to be cleared (undefined)'
+        )
+
+        assert.strictEqual(
+            globals.globalState.get('SAM_INIT_RUNTIME_KEY'),
+            undefined,
+            'Expected runtime key to be cleared (undefined)'
+        )
+
+        assert.strictEqual(
+            globals.globalState.get('SAM_INIT_IMAGE_BOOLEAN_KEY'),
+            undefined,
+            'Expected isImage key to be cleared (undefined)'
+        )
+    })
+})
diff --git a/packages/core/src/test/shared/applicationBuilder/explorer/nodes/appNode.test.ts b/packages/core/src/test/shared/applicationBuilder/explorer/nodes/appNode.test.ts
new file mode 100644
index 00000000000..d3c9b32555c
--- /dev/null
+++ b/packages/core/src/test/shared/applicationBuilder/explorer/nodes/appNode.test.ts
@@ -0,0 +1,251 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import assert from 'assert'
+import { AppNode } from '../../../../../awsService/appBuilder/explorer/nodes/appNode'
+import * as SamProjectModule from '../../../../../awsService/appBuilder/explorer/samProject'
+import * as ListSamResourcesModule from '../../../../../lambda/commands/listSamResources'
+import * as ResourceNodeModule from '../../../../../awsService/appBuilder/explorer/nodes/resourceNode'
+import * as DeployedStackModule from '../../../../../awsService/appBuilder/explorer/nodes/deployedStack'
+import sinon from 'sinon'
+import path from 'path'
+
+import { isTreeNode, TreeNode } from '../../../../../shared/treeview/resourceTreeDataProvider'
+
+describe('AppNode', () => {
+    let sandbox: sinon.SinonSandbox
+    let appNode: AppNode
+
+    // Create a mock samAppLocation object
+    const expectedWorkspaceFolder = {
+        uri: vscode.Uri.parse('/VSCode Example Workspace'),
+        name: 'VSCode Example Workspace',
+        index: 0,
+    }
+    const expectProjectRoot = vscode.Uri.parse('/VSCode Example Workspace/Project One Root Folder')
+    const expectedSamTemplateUri = vscode.Uri.parse('/VSCode Example Workspace/Project One Root Folder/template.yaml')
+    const expectedSamAppLocation = {
+        workspaceFolder: expectedWorkspaceFolder,
+        samTemplateUri: expectedSamTemplateUri,
+        projectRoot: expectProjectRoot,
+    }
+
+    beforeEach(function () {
+        // create sandbox
+        sandbox = sinon.createSandbox()
+        // Instantiate class
+        appNode = new AppNode(expectedSamAppLocation)
+    })
+
+    afterEach(function () {
+        // Restore the stubs after each test
+        sandbox.restore()
+    })
+
+    describe('constructor', () => {
+        it('should create a new AppNode instance', () => {
+            assert.strictEqual(appNode instanceof AppNode, true)
+        })
+
+        it('should set correct properties', () => {
+            assert.strictEqual(appNode.id, mockSamAppLocationResponse.samTemplateUri.toString())
+            assert.strictEqual(appNode.resource, expectedSamAppLocation)
+            assert.strictEqual(appNode.label, path.join('VSCode Example Workspace', 'Project One Root Folder'))
+        })
+    })
+
+    describe('getChildren', () => {
+        let getAppStub: sinon.SinonStub
+        let getStackNameStub: sinon.SinonStub
+        let generateStackNodeStub: sinon.SinonStub
+        let getDeployedResourcesStub: sinon.SinonStub
+        let generateResourceNodesStub: sinon.SinonStub
+
+        beforeEach(() => {
+            // Create a stub for helper functions used in getChildren() to call real method if not override in each test
+            getAppStub = sandbox.stub(SamProjectModule, 'getApp')
+            getStackNameStub = sandbox.stub(SamProjectModule, 'getStackName')
+            generateStackNodeStub = sandbox.stub(DeployedStackModule, 'generateStackNode')
+            getDeployedResourcesStub = sandbox.stub(ListSamResourcesModule, 'getDeployedResources')
+            generateResourceNodesStub = sandbox.stub(ResourceNodeModule, 'generateResourceNodes')
+        })
+
+        it('should return placeholder item for an empty App', async () => {
+            // stub getApp() and return mock response
+            getAppStub.resolves(mockGetAppResponse)
+            // stub getStackName() and return mock response
+            getStackNameStub.resolves(mockGetStackNameResponse)
+            // stub generateStackNode() and return []
+            generateStackNodeStub.resolves([])
+            // stub getDeployedResources() and return []
+            getDeployedResourcesStub.resolves([])
+            // stub  generateResourceNodes to return empty array simulate empty application
+            generateResourceNodesStub.returns([])
+
+            const resources = await appNode.getChildren()
+            assert.strictEqual(resources.length, 1)
+            assert(isTreeNode(resources[0]))
+
+            const resourceNode = resources[0] as TreeNode
+            assert.strictEqual(resourceNode.id, 'placeholder')
+            assert.strictEqual(resourceNode.resource, '[No resource found in SAM template]')
+            assert(getAppStub.calledOnce)
+            assert(getStackNameStub.calledOnce)
+            assert(generateStackNodeStub.notCalled)
+            assert(getDeployedResourcesStub.calledOnce)
+            assert(generateResourceNodesStub.calledOnce)
+        })
+
+        it('should return resource without deploy stack name node', async () => {
+            // stub getApp() and return mock response
+            getAppStub.resolves(mockGetAppResponse)
+            // stub getStackName() and return undefined stackName and region simulate undeployed stack
+            getStackNameStub.resolves({ stackName: undefined, region: undefined })
+            // call actual method
+            generateResourceNodesStub.callThrough()
+
+            const resources = await appNode.getChildren()
+            assert.strictEqual(resources.length, 1)
+            assert.strictEqual(resources[0].id, 'MyProjectLambdaFunction')
+            assert(getAppStub.calledOnce)
+            assert(getStackNameStub.calledOnce)
+            assert(generateStackNodeStub.notCalled)
+            assert(getDeployedResourcesStub.notCalled)
+            assert(generateResourceNodesStub.calledOnce)
+        })
+
+        it('should return resource with all deployed nodes when stack is deployed', async () => {
+            // stub getApp() and return mock response
+            getAppStub.resolves(mockGetAppResponse)
+            // stub getStackName() and return stack name and region
+            getStackNameStub.resolves(mockGetStackNameResponse)
+            // stub generateStackNode() and return mock response
+            generateStackNodeStub.resolves(mockGenerateStackNodeResponse)
+            // stub getDeployedResources() and return mock response
+            getDeployedResourcesStub.resolves(mockDeployedResourcesResponse)
+            // call actual method
+            generateResourceNodesStub.callThrough()
+
+            const resources = await appNode.getChildren()
+            assert.strictEqual(resources.length, 2)
+            assert(
+                resources.some((node) => node.id === 'MyProjectLambdaFunction'),
+                'Missing expected  childern node: MyProjectLambdaFunction'
+            )
+            assert(
+                resources.some((node) => node.id === 'my-project-one-stack-name'),
+                'Missing expected  childern node: my-project-one-stack-name'
+            )
+            assert(getAppStub.calledOnce)
+            assert(getStackNameStub.calledOnce)
+            assert(generateStackNodeStub.calledOnce)
+            assert(getDeployedResourcesStub.calledOnce)
+            assert(generateResourceNodesStub.calledOnce)
+        })
+
+        it('should return placeholder item when encounter error', async () => {
+            // stub getApp() and throw error
+            getAppStub.rejects(new Error('Mock error'))
+
+            const resources = await appNode.getChildren()
+            assert.strictEqual(resources.length, 1)
+            assert(isTreeNode(resources[0]))
+
+            const resourceNode = resources[0] as TreeNode
+            assert.strictEqual(resourceNode.id, 'placeholder')
+            assert.strictEqual(
+                resourceNode.resource,
+                '[Unable to load resource tree for this app. Ensure SAM template is correct.]'
+            )
+            assert(getAppStub.calledOnce)
+            assert(getStackNameStub.notCalled)
+            assert(generateStackNodeStub.notCalled)
+            assert(getDeployedResourcesStub.notCalled)
+            assert(generateResourceNodesStub.notCalled)
+        })
+    })
+
+    describe('getTreeItem', () => {
+        it('should return a TreeItem with the correct properties', () => {
+            const treeItem = appNode.getTreeItem()
+            const expextedLabel = path.join('VSCode Example Workspace', 'Project One Root Folder')
+
+            assert.strictEqual(treeItem.label, expextedLabel)
+            assert.strictEqual(treeItem.contextValue, 'awsAppBuilderAppNode')
+            assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.Collapsed)
+            assert.deepStrictEqual(treeItem.resourceUri, expectedSamTemplateUri)
+            assert.strictEqual(treeItem.tooltip, expectedSamTemplateUri.path)
+        })
+    })
+})
+
+const mockGetStackNameResponse = {
+    stackName: 'my-project-one-stack-name',
+    region: 'us-east-1',
+}
+
+const mockGenerateStackNodeResponse = [
+    {
+        stackName: 'my-project-one-stack-name',
+        regionCode: 'us-east-1',
+        id: 'my-project-one-stack-name',
+    },
+]
+
+const mockSamAppLocationResponse = {
+    samTemplateUri: vscode.Uri.file(path.join('VSCode Example Workspace', 'Project One Root Folder', 'template.yaml')),
+    workspaceFolder: {
+        uri: vscode.Uri.file(path.join('VSCode Example Workspace')),
+        name: 'VSCode Example Workspace',
+        index: 0,
+    },
+    projectRoot: vscode.Uri.file(path.join('VSCode Example Workspace', 'Project One Root Folder')),
+}
+const mockResourceTreeEntity = {
+    Id: 'MyProjectLambdaFunction',
+    Type: 'AWS::Serverless::Function',
+    Runtime: 'python3.12',
+    Handler: 'app.lambda_handler',
+    Events: [
+        {
+            Id: 'MyProjectLambda',
+            Type: 'Api',
+            Path: '/hello',
+            Method: 'get',
+        },
+    ],
+}
+
+const mockGetAppResponse = {
+    location: mockSamAppLocationResponse,
+    resourceTree: [mockResourceTreeEntity],
+}
+
+const mockDeployedResourcesResponse = [
+    {
+        LogicalResourceId: 'MyProjectLambdaFunctionRole',
+        PhysicalResourceId: 'my-project-one-stack-name-MyProjectLambdaFunctionRo-uvrNoVPn4YWa',
+    },
+    {
+        LogicalResourceId: 'MyProjectLambdaFunction',
+        PhysicalResourceId: '-',
+    },
+    {
+        LogicalResourceId: 'MyProjectLambdaFunctionMyProjectLambdaPermissionProd',
+        PhysicalResourceId: '-',
+    },
+    {
+        LogicalResourceId: 'ServerlessRestApi',
+        PhysicalResourceId: '-',
+    },
+    {
+        LogicalResourceId: 'ServerlessRestApiDeploymenteba9892cd9',
+        PhysicalResourceId: '-',
+    },
+    {
+        LogicalResourceId: 'ServerlessRestApiProdStage',
+        PhysicalResourceId: '-',
+    },
+]
diff --git a/packages/core/src/test/shared/applicationBuilder/explorer/nodes/deployedNode.test.ts b/packages/core/src/test/shared/applicationBuilder/explorer/nodes/deployedNode.test.ts
new file mode 100644
index 00000000000..04e936b1d06
--- /dev/null
+++ b/packages/core/src/test/shared/applicationBuilder/explorer/nodes/deployedNode.test.ts
@@ -0,0 +1,418 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import * as vscode from 'vscode'
+import * as os from 'os'
+import {
+    DeployedResource,
+    DeployedResourceNode,
+    generateDeployedNode,
+} from '../../../../../awsService/appBuilder/explorer/nodes/deployedNode'
+import * as sinon from 'sinon'
+import * as LambdaClientModule from '../../../../../../src/shared/clients/lambdaClient'
+import * as DefaultS3ClientModule from '../../../../../shared/clients/s3'
+import * as ApiGatewayNodeModule from '../../../../../awsService/apigateway/explorer/apiGatewayNodes'
+import { beforeEach } from 'mocha'
+import { LambdaFunctionNode } from '../../../../../lambda/explorer/lambdaFunctionNode'
+import { RestApiNode } from '../../../../../awsService/apigateway/explorer/apiNodes'
+import { S3BucketNode } from '../../../../../awsService/s3/explorer/s3BucketNode'
+import * as LambdaNodeModule from '../../../../../lambda/explorer/lambdaNodes'
+import { getIcon } from '../../../../../shared/icons'
+import _ from 'lodash'
+import { isTreeNode } from '../../../../../shared/treeview/resourceTreeDataProvider'
+import { Any } from '../../../../../shared/utilities/typeConstructors'
+import { IamConnection, ProfileMetadata } from '../../../../../auth/connection'
+import * as AuthUtils from '../../../../../auth/utils'
+import { assertLogsContain } from '../../../../../test/globalSetup.test'
+import { GetFunctionResponse } from '@aws-sdk/client-lambda'
+
+describe('DeployedResourceNode', () => {
+    const expectedStackName = 'myStack'
+    const expectedRegionCode = 'us-west-2'
+
+    beforeEach(() => {})
+
+    afterEach(() => {
+        // Restore the original function after each test
+        sinon.restore()
+    })
+
+    const getDeployedResource = (explorerNode: any, resourceArn: string, contextValue: string): DeployedResource => {
+        return {
+            stackName: expectedStackName,
+            regionCode: expectedRegionCode,
+            explorerNode: explorerNode,
+            arn: resourceArn,
+            contextValue: contextValue,
+        } as DeployedResource
+    }
+    const testCases = [
+        {
+            explorerNode: sinon.stub(LambdaFunctionNode),
+            resourceArn: 'arn:aws:lambda:us-east-1:123456789012:function:my-function-name',
+            contextValue: 'awsRegionFunctionNodeDownloadable',
+        },
+        {
+            explorerNode: sinon.stub(S3BucketNode),
+            resourceArn: 'arn:aws:s3:::my-bucket-name',
+            contextValue: 'awsS3BucketNode',
+        },
+        {
+            explorerNode: sinon.stub(RestApiNode),
+            resourceArn: 'arn:aws:apigateway:us-east-1::/apis/my-apgw',
+            contextValue: 'awsApiGatewayNode',
+        },
+    ].map(({ explorerNode, resourceArn, contextValue }) => getDeployedResource(explorerNode, resourceArn, contextValue))
+
+    describe('constructor', () => {
+        testCases.map((deployedResource: DeployedResource) => {
+            it(`should create an instance of DeployedResourceNode for ${deployedResource.contextValue}`, () => {
+                const deployedLambdaNode = new DeployedResourceNode(deployedResource)
+
+                assert.strictEqual(deployedLambdaNode.id, deployedResource.arn)
+                assert.strictEqual(deployedLambdaNode.contextValue, deployedResource.contextValue)
+                assert.deepStrictEqual(deployedLambdaNode.resource, deployedResource)
+            })
+
+            it('should  create an instance with empty id and when resource arn is missing', () => {
+                const emptyArnDeployedResource = _.cloneDeep(deployedResource)
+                emptyArnDeployedResource.arn = ''
+                const deployedLambdaNode = new DeployedResourceNode(emptyArnDeployedResource)
+
+                assert.strictEqual(deployedLambdaNode.id, '')
+                assert.strictEqual(deployedLambdaNode.contextValue, '')
+                assert.deepStrictEqual(deployedLambdaNode.resource, emptyArnDeployedResource)
+                assertLogsContain('Cannot create DeployedResourceNode, the ARN does not exist.', false, 'warn')
+            })
+        })
+    })
+
+    testCases.map((deployedResource: DeployedResource) => {
+        const deployedLambdaNode = new DeployedResourceNode(deployedResource)
+        describe('getChildren', () => {
+            it('should return an empty array', async () => {
+                const children = await deployedLambdaNode.getChildren()
+
+                assert.deepStrictEqual(children, [])
+            })
+        })
+
+        describe('getTreeItem', () => {
+            it('should return a TreeItem with correct properties', () => {
+                const treeItem = deployedLambdaNode.getTreeItem()
+                const expectedIconPath = getIcon('vscode-cloud')
+
+                assert.strictEqual(treeItem.label, deployedResource.arn)
+                assert.strictEqual(treeItem.contextValue, deployedResource.contextValue)
+                assert.deepStrictEqual(treeItem.iconPath, expectedIconPath)
+                assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.None)
+                assert.strictEqual(treeItem.tooltip, deployedResource.arn)
+            })
+        })
+    })
+})
+
+describe('generateDeployedNode', () => {
+    const expectedStackName = 'myStack'
+    const expectedRegionCode = 'us-west-2'
+
+    let sandbox: sinon.SinonSandbox
+
+    beforeEach(() => {
+        // Initiate stub sanbox
+        sandbox = sinon.createSandbox()
+        // Create a stub for the entire logger module
+    })
+    afterEach(async () => {
+        sandbox.restore()
+    })
+
+    describe('LambdaFunctionNode', () => {
+        let mockDefaultLambdaClientInstance: sinon.SinonStubbedInstance<LambdaClientModule.DefaultLambdaClient>
+        let mockLambdaNodeInstance: sinon.SinonStubbedInstance<LambdaNodeModule.LambdaNode>
+        const iamConnection: IamConnection & { readonly state: ProfileMetadata['connectionState'] } = {
+            type: 'iam',
+            id: '0',
+            label: 'iam',
+            getCredentials: sinon.stub(),
+            state: 'valid',
+            endpointUrl: undefined,
+        }
+
+        const lambdaDeployedNodeInput = {
+            deployedResource: {
+                LogicalResourceId: 'MyLambdaFunction',
+                PhysicalResourceId: 'my-project-lambda-physical-id',
+            },
+            regionCode: expectedRegionCode,
+            stackName: expectedStackName,
+            resourceTreeEntity: {
+                Id: 'MyLambdaFunction',
+                Type: 'AWS::Serverless::Function',
+            },
+        }
+
+        beforeEach(() => {
+            // Stub the constructor of DefaultLambdaClient to return the stub instance
+            mockDefaultLambdaClientInstance = sandbox.createStubInstance(LambdaClientModule.DefaultLambdaClient)
+            sandbox.stub(LambdaClientModule, 'DefaultLambdaClient').returns(mockDefaultLambdaClientInstance)
+            //  Stub the constructor of LambdaNode to return stub instance
+            mockLambdaNodeInstance = sandbox.createStubInstance(LambdaNodeModule.LambdaNode)
+            sandbox.stub(LambdaNodeModule, 'LambdaNode').returns(mockLambdaNodeInstance)
+            sandbox.stub(AuthUtils, 'getIAMConnection').resolves(iamConnection)
+        })
+
+        it('should return a DeployedResourceNode for valid Lambda function happy path', async () => {
+            // Simulate successful fetching Lambda function using DefaultLambdaClient
+            const defaultLambdaClientGetFunctionResponse = {
+                Configuration: {
+                    FunctionName: 'my-project-lambda-function',
+                    FunctionArn: 'arn:aws:lambda:us-east-1:123456789012:function:my-project-lambda-function',
+                    Runtime: 'python3.12',
+                },
+            } as GetFunctionResponse
+
+            mockDefaultLambdaClientInstance.getFunction.resolves(defaultLambdaClientGetFunctionResponse)
+
+            const expectedFunctionArn = 'arn:aws:lambda:us-east-1:123456789012:function:my-project-lambda-function'
+            const expectedFunctionName = 'my-project-lambda-function'
+            const expectedFunctionExplorerNodeTooltip = `${expectedFunctionName}${os.EOL}${expectedFunctionArn}`
+
+            const deployedResourceNodes = (await generateDeployedNode(
+                lambdaDeployedNodeInput.deployedResource,
+                lambdaDeployedNodeInput.regionCode,
+                lambdaDeployedNodeInput.stackName,
+                lambdaDeployedNodeInput.resourceTreeEntity
+            )) as DeployedResourceNode[]
+
+            const deployedResourceNodeExplorerNode: LambdaFunctionNode = validateBasicProperties(
+                deployedResourceNodes,
+                expectedFunctionArn,
+                'awsRegionFunctionNodeDownloadable',
+                expectedRegionCode,
+                expectedStackName,
+                LambdaFunctionNode
+            )
+
+            assert.strictEqual(deployedResourceNodeExplorerNode.contextValue, 'awsRegionFunctionNodeDownloadable')
+            assert.strictEqual(deployedResourceNodeExplorerNode.label, expectedFunctionName)
+            assert.strictEqual(deployedResourceNodeExplorerNode.iconPath, getIcon('aws-lambda-function'))
+            assert.strictEqual(deployedResourceNodeExplorerNode.regionCode, expectedRegionCode)
+            assert.strictEqual(deployedResourceNodeExplorerNode.tooltip, expectedFunctionExplorerNodeTooltip)
+            assert.strictEqual(deployedResourceNodeExplorerNode.configuration.FunctionArn, expectedFunctionArn)
+            assert.strictEqual(deployedResourceNodeExplorerNode.configuration.FunctionName, expectedFunctionName)
+            assert.strictEqual(deployedResourceNodeExplorerNode.configuration.Runtime, 'python3.12')
+        })
+
+        it('should log error message given any lambda client error', async () => {
+            // Simulate failure fetching Lambda function using DefaultLambdaClient
+            mockDefaultLambdaClientInstance.getFunction.rejects()
+
+            const deployedResourceNodes = await generateDeployedNode(
+                lambdaDeployedNodeInput.deployedResource,
+                lambdaDeployedNodeInput.regionCode,
+                lambdaDeployedNodeInput.stackName,
+                lambdaDeployedNodeInput.resourceTreeEntity
+            )
+
+            assertLogsContain('Error getting Lambda configuration', false, 'error')
+            assert(deployedResourceNodes.length === 1)
+
+            // Check placeholder propertries
+            const deployedResourceNode = deployedResourceNodes[0] as DeployedResourceNode
+            assert.strictEqual(deployedResourceNode.id, 'placeholder')
+            assert.strictEqual(
+                deployedResourceNode.resource,
+                '[Failed to retrieve deployed resource. Ensure correct stack name and region are in the samconfig.toml, and that your account is connected.]'
+            )
+        })
+    })
+
+    describe('S3BucketNode', () => {
+        let mockDefaultS3ClientInstance: sinon.SinonStubbedInstance<DefaultS3ClientModule.S3Client>
+        const s3DeployedNodeInput = {
+            deployedResource: {
+                LogicalResourceId: 'MyS3SourceBucket',
+                PhysicalResourceId: 'my-project-source-bucket-physical-id',
+            },
+            regionCode: expectedRegionCode,
+            stackName: expectedStackName,
+            resourceTreeEntity: {
+                Id: 'my-project-source-bucket-physical-id',
+                Type: 'AWS::S3::Bucket',
+            },
+        }
+
+        it('should return a DeployedResourceNode for valid S3 bucket happy path', async () => {
+            // Stub the constructor of DefaultLambdaClient to return the stub instance
+            mockDefaultS3ClientInstance = sandbox.createStubInstance(DefaultS3ClientModule.S3Client)
+            sandbox.stub(DefaultS3ClientModule, 'S3Client').returns(mockDefaultS3ClientInstance)
+            const deployedResourceNodes = await generateDeployedNode(
+                s3DeployedNodeInput.deployedResource,
+                s3DeployedNodeInput.regionCode,
+                s3DeployedNodeInput.stackName,
+                s3DeployedNodeInput.resourceTreeEntity
+            )
+
+            const expectedS3BucketArn = 'arn:aws:s3:::my-project-source-bucket-physical-id'
+            const expectedS3BucketName = 'my-project-source-bucket-physical-id'
+
+            const deployedResourceNodeExplorerNode: S3BucketNode = validateBasicProperties(
+                deployedResourceNodes as DeployedResourceNode[],
+                expectedS3BucketArn,
+                'awsS3BucketNode',
+                expectedRegionCode,
+                expectedStackName,
+                S3BucketNode
+            )
+            assert.strictEqual(deployedResourceNodeExplorerNode.bucket.Name, expectedS3BucketName)
+            assert.strictEqual(deployedResourceNodeExplorerNode.bucket.Arn, expectedS3BucketArn)
+            assert.strictEqual(deployedResourceNodeExplorerNode.bucket.BucketRegion, expectedRegionCode)
+            assert.strictEqual(deployedResourceNodeExplorerNode.contextValue, 'awsS3BucketNode')
+            assert.strictEqual(deployedResourceNodeExplorerNode.label, expectedS3BucketName)
+            assert.strictEqual(deployedResourceNodeExplorerNode.tooltip, expectedS3BucketName)
+            assert.strictEqual(deployedResourceNodeExplorerNode.iconPath, getIcon('aws-s3-bucket'))
+        })
+    })
+
+    describe('ApiGatewayNode', () => {
+        let mockApiGatewayNodeInstance: sinon.SinonStubbedInstance<ApiGatewayNodeModule.ApiGatewayNode>
+
+        const apigatewayDeployedNodeInput = {
+            deployedResource: {
+                LogicalResourceId: 'MyRestApi',
+                PhysicalResourceId: 'my-project-apigw-physical-id',
+            },
+            regionCode: expectedRegionCode,
+            stackName: expectedStackName,
+            resourceTreeEntity: {
+                Id: 'my-project-apigw-physical-id',
+                Type: 'AWS::Serverless::Api',
+            },
+        }
+
+        const createMockRestApiNode = (
+            sandbox: sinon.SinonSandbox,
+            options: {
+                id?: string
+                name?: string
+                description?: string
+            }
+        ) => {
+            const mockNode = sandbox.createStubInstance(RestApiNode) as sinon.SinonStubbedInstance<RestApiNode> & {
+                id?: string
+                name?: string
+                description?: string
+            }
+            for (const [key, value] of Object.entries(options)) {
+                value !== undefined && Object.defineProperty(mockNode, key, { value, writable: true })
+            }
+            return mockNode
+        }
+
+        it('should return a DeployedResourceNode for valid API Gateway happy path', async () => {
+            // Stub the constructor of DefaultLambdaClient to return the stub instance
+            mockApiGatewayNodeInstance = sandbox.createStubInstance(ApiGatewayNodeModule.ApiGatewayNode)
+            sandbox.stub(ApiGatewayNodeModule, 'ApiGatewayNode').returns(mockApiGatewayNodeInstance)
+            // Simulate successful fetching api gateway parentNode
+            mockApiGatewayNodeInstance.getChildren.resolves([
+                createMockRestApiNode(sandbox, { id: 'my-project-apigw-physical-id', name: 'targetAPI' }),
+                createMockRestApiNode(sandbox, { id: 'my-project-apigw-other-id-2', name: 'otherAPI1' }),
+                createMockRestApiNode(sandbox, { id: 'my-project-apigw-other-id-3', name: 'otherAPI2' }),
+            ])
+
+            const expectedApiGatewayArn = 'arn:aws:apigateway:us-west-2::/apis/my-project-apigw-physical-id'
+            const expectedApiGatewayName = apigatewayDeployedNodeInput.deployedResource.PhysicalResourceId
+            const expectedApiGatewayExplorerNodeLabel = 'targetAPI (my-project-apigw-physical-id)'
+
+            const deployedResourceNodes = await generateDeployedNode(
+                apigatewayDeployedNodeInput.deployedResource,
+                apigatewayDeployedNodeInput.regionCode,
+                apigatewayDeployedNodeInput.stackName,
+                apigatewayDeployedNodeInput.resourceTreeEntity
+            )
+
+            const deployedResourceNodeExplorerNode: RestApiNode = validateBasicProperties(
+                deployedResourceNodes as DeployedResourceNode[],
+                expectedApiGatewayArn,
+                'awsApiGatewayNode',
+                expectedRegionCode,
+                expectedStackName,
+                RestApiNode
+            )
+
+            assert.strictEqual(deployedResourceNodeExplorerNode.id, expectedApiGatewayName)
+            assert.strictEqual(deployedResourceNodeExplorerNode.regionCode, expectedRegionCode)
+            assert.strictEqual(deployedResourceNodeExplorerNode.partitionId, 'aws')
+            assert.strictEqual(deployedResourceNodeExplorerNode.label, expectedApiGatewayExplorerNodeLabel)
+            assert(!deployedResourceNodeExplorerNode.iconPath)
+            assert(!deployedResourceNodeExplorerNode.tooltip)
+        })
+    })
+
+    describe('UnsupportedResourceNode', () => {
+        const unsupportTypeInput = {
+            deployedResource: {
+                LogicalResourceId: 'myUnsupportedResource',
+                PhysicalResourceId: 'my-unsupported-resource-physical-id',
+            },
+            regionCode: expectedRegionCode,
+            stackName: expectedStackName,
+            resourceTreeEntity: {
+                Id: 'my-unsupported-resource-physical-id',
+                Type: 'AWS::Serverless::UnsupportType',
+            },
+        }
+
+        it('should return a DeployedResourceNode with placeholder', async () => {
+            const deployedResourceNodes = await generateDeployedNode(
+                unsupportTypeInput.deployedResource,
+                unsupportTypeInput.regionCode,
+                unsupportTypeInput.stackName,
+                unsupportTypeInput.resourceTreeEntity
+            )
+
+            assertLogsContain('Details are missing or are incomplete for:', false, 'info')
+
+            // Check deployedResourceNodes array propertries
+            assert(deployedResourceNodes.length === 1)
+            assert(isTreeNode(deployedResourceNodes[0]))
+
+            // Check placeholder propertries
+            const deployedResourceNode = deployedResourceNodes[0] as DeployedResourceNode
+            assert.strictEqual(deployedResourceNode.id, 'placeholder')
+            assert.strictEqual(deployedResourceNode.resource, '[This resource is not yet supported in AppBuilder.]')
+        })
+    })
+})
+
+function validateBasicProperties<T extends new (...args: any[]) => any>(
+    deployedResourceNodes: DeployedResourceNode[],
+    expectedArn: string,
+    expectedContextValue: string,
+    expectedRegionCode: string,
+    expectedStackName: string,
+    expectedExplorerNodeClass: T = Any as any
+): InstanceType<T> {
+    // Check deployedResourceNodes array propertries
+    assert(deployedResourceNodes.length === 1)
+    assert(deployedResourceNodes[0] instanceof DeployedResourceNode)
+
+    // // Check deployedResourceNode propertries
+    const deployedResourceNode = deployedResourceNodes[0] as DeployedResourceNode
+    assert.strictEqual(deployedResourceNode.id, expectedArn)
+    assert.strictEqual(deployedResourceNode.contextValue, expectedContextValue)
+
+    // Check deployedResourceNode resource propertries
+    const deployedResourceNodeResource = deployedResourceNode.resource
+    assert.strictEqual(deployedResourceNodeResource.regionCode, expectedRegionCode)
+    assert.strictEqual(deployedResourceNodeResource.stackName, expectedStackName)
+    assert.strictEqual(deployedResourceNodeResource.contextValue, expectedContextValue)
+    assert.strictEqual(deployedResourceNodeResource.arn, expectedArn)
+
+    // Check deployedResourceNode resource explorer node propertries
+    assert(deployedResourceNodeResource.explorerNode instanceof expectedExplorerNodeClass)
+    return deployedResourceNodeResource.explorerNode as InstanceType<T>
+}
diff --git a/packages/core/src/test/shared/applicationBuilder/explorer/nodes/deployedStack.test.ts b/packages/core/src/test/shared/applicationBuilder/explorer/nodes/deployedStack.test.ts
new file mode 100644
index 00000000000..96c560038f5
--- /dev/null
+++ b/packages/core/src/test/shared/applicationBuilder/explorer/nodes/deployedStack.test.ts
@@ -0,0 +1,40 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import { StackNameNode } from '../../../../../awsService/appBuilder/explorer/nodes/deployedStack'
+
+describe('StackNameNode', () => {
+    const expectedStackName = 'myStackName'
+    const expectedRegion = 'us-west-2'
+    const expectedStackLink =
+        'command:aws.explorer.cloudformation.showStack?%7B%22stackName%22%3A%22myStackName%22%2C%22region%22%3A%22us-west-2%22%7D'
+
+    let stackNameNode: StackNameNode
+
+    beforeEach(() => {
+        // Create an instance of StackNameNode
+        stackNameNode = new StackNameNode(expectedStackName, expectedRegion)
+    })
+
+    it('should create an instance of StackNameNode', () => {
+        assert.strictEqual(stackNameNode.link, expectedStackLink)
+        assert.strictEqual(stackNameNode.stackName, expectedStackName)
+        assert.strictEqual(stackNameNode.regionCode, expectedRegion)
+    })
+
+    it('should return empty array when call getChildren()', async () => {
+        const result = await stackNameNode.getChildren()
+        assert.deepStrictEqual(result, [])
+    })
+
+    it('should return correct getTreeItem properties when call getTreeItem()', () => {
+        const expectedContextValue = 'awsAppBuilderStackNode'
+        const expectedLabel = `Stack: ${expectedStackName} (${expectedRegion})`
+        const treeItem = stackNameNode.getTreeItem()
+
+        assert.deepStrictEqual(treeItem.contextValue, expectedContextValue)
+        assert.deepStrictEqual(treeItem.label, expectedLabel)
+    })
+})
diff --git a/packages/core/src/test/shared/applicationBuilder/explorer/nodes/propertyNode.test.ts b/packages/core/src/test/shared/applicationBuilder/explorer/nodes/propertyNode.test.ts
new file mode 100644
index 00000000000..8de0f71f50b
--- /dev/null
+++ b/packages/core/src/test/shared/applicationBuilder/explorer/nodes/propertyNode.test.ts
@@ -0,0 +1,115 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import { generatePropertyNodes, PropertyNode } from '../../../../../awsService/appBuilder/explorer/nodes/propertyNode'
+import { getIcon } from '../../../../../shared/icons'
+
+describe('PropertyNode', () => {
+    describe('constructor', () => {
+        it('should set properties correctly', async () => {
+            const expectedKey = 'key'
+            const expectedValue = 'value'
+            const node = new PropertyNode(expectedKey, expectedValue)
+            assert.strictEqual(node.id, expectedKey)
+            assert.strictEqual(node.resource, expectedValue)
+        })
+    })
+
+    describe('getChildren', () => {
+        it('should return an empty array for primitive values', async () => {
+            const node = new PropertyNode('key', 'value')
+            const children = await node.getChildren()
+            assert.deepStrictEqual(children, [])
+        })
+
+        it('should return an array of PropertyNodes for objects', async () => {
+            const node = new PropertyNode('key', { foo: 'bar', baz: 42 })
+            const children = await node.getChildren()
+            assert(children.every((child) => child instanceof PropertyNode))
+            assert.deepStrictEqual(
+                children.map(({ id, resource }) => ({ id, resource })),
+                [
+                    { id: 'foo', resource: 'bar' },
+                    { id: 'baz', resource: 42 },
+                ]
+            )
+        })
+
+        it('should return an array of PropertyNodes for arrays of objects', async () => {
+            const node = new PropertyNode('key', [
+                { foo: 'bar', baz: 42 },
+                { foo: 'barz', baz: 52 },
+            ])
+            const children = await node.getChildren()
+            assert(children.every((child) => child instanceof PropertyNode))
+            assert.deepStrictEqual(
+                children.map(({ id, resource }) => ({ id, resource })),
+                [
+                    { id: '0', resource: { foo: 'bar', baz: 42 } },
+                    { id: '1', resource: { foo: 'barz', baz: 52 } },
+                ]
+            )
+        })
+    })
+
+    describe('getTreeItem', () => {
+        const validateGetTreeItemBasic = (treeItem: vscode.TreeItem) => {
+            assert.strictEqual(treeItem.contextValue, 'awsAppBuilderPropertyNode')
+            assert.strictEqual(treeItem.iconPath, getIcon('vscode-gear'))
+        }
+
+        it('should return a TreeItem with the correct label for primitive values', () => {
+            const node = new PropertyNode('key', 'value')
+            const treeItem = node.getTreeItem()
+            validateGetTreeItemBasic(treeItem)
+            assert.strictEqual(treeItem.label, 'key: value')
+            assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.None)
+        })
+
+        it('should return a TreeItem with the correct label and collapsibleState for objects', () => {
+            const node = new PropertyNode('key', { foo: 'bar', baz: 42 })
+            const treeItem = node.getTreeItem()
+            validateGetTreeItemBasic(treeItem)
+            assert.strictEqual(treeItem.label, 'key')
+            assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.Collapsed)
+        })
+
+        it('should return a TreeItem with the correct label and collapsibleState for arrays of objects', () => {
+            const node = new PropertyNode('key', [
+                { foo: 'bar', baz: 42 },
+                { foo: 'barz', baz: 52 },
+            ])
+            const treeItem = node.getTreeItem()
+            validateGetTreeItemBasic(treeItem)
+            assert.strictEqual(treeItem.label, 'key')
+            assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.Collapsed)
+        })
+    })
+
+    describe('generatePropertyNodes', () => {
+        it('should filter out Id, Type, and Events properties', () => {
+            const properties = {
+                Id: 'id',
+                Type: 'type',
+                Events: ['event1', 'event2'],
+                foo: 'bar',
+                baz: 42,
+            }
+            const nodes = generatePropertyNodes(properties)
+            const expectedNodes = [
+                { key: 'foo', value: 'bar' },
+                { key: 'baz', value: 42 },
+            ]
+            assert.strictEqual(nodes.length, expectedNodes.length)
+            for (const [index, node] of nodes.entries()) {
+                assert(node instanceof PropertyNode)
+                assert.strictEqual(node.id, expectedNodes[index].key)
+                assert.strictEqual(node.resource, expectedNodes[index].value)
+            }
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/applicationBuilder/explorer/nodes/resourceNode.test.ts b/packages/core/src/test/shared/applicationBuilder/explorer/nodes/resourceNode.test.ts
new file mode 100644
index 00000000000..ca01168cd9a
--- /dev/null
+++ b/packages/core/src/test/shared/applicationBuilder/explorer/nodes/resourceNode.test.ts
@@ -0,0 +1,403 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import {
+    appRunnerType,
+    ecrRepositoryType,
+    s3BucketType,
+    SERVERLESS_FUNCTION_TYPE,
+} from '../../../../../shared/cloudformation/cloudformation'
+import assert from 'assert'
+import { ResourceTreeEntity, SamAppLocation } from '../../../../../awsService/appBuilder/explorer/samProject'
+import {
+    generateResourceNodes,
+    ResourceNode,
+    generateLambdaNodeFromResource,
+} from '../../../../../awsService/appBuilder/explorer/nodes/resourceNode'
+import { getIcon } from '../../../../../shared/icons'
+import * as DeployedResourceNodeModule from '../../../../../awsService/appBuilder/explorer/nodes/deployedNode'
+import * as sinon from 'sinon'
+import { afterEach } from 'mocha'
+import { DeployedResourceNode } from '../../../../../awsService/appBuilder/explorer/nodes/deployedNode'
+import { PropertyNode } from '../../../../../awsService/appBuilder/explorer/nodes/propertyNode'
+import { StackResource } from '../../../../../lambda/commands/listSamResources'
+import { LambdaFunctionNode } from '../../../../../lambda/explorer/lambdaFunctionNode'
+import { ToolkitError } from '../../../../../shared/errors'
+
+describe('generateLambdaNodeFromResource', () => {
+    let generateDeployedNodeStub: sinon.SinonStub
+    const resourceMock = {
+        deployedResource: {
+            LogicalResourceId: 'TestFunction',
+            PhysicalResourceId: 'arn:aws:lambda:us-west-2:123456789012:function:TestFunction',
+        },
+        region: 'us-west-2',
+        stackName: 'TestStack',
+        resource: { Id: 'TestFunction', Type: SERVERLESS_FUNCTION_TYPE },
+        projectRoot: vscode.Uri.parse('myworkspace/myprojectrootfolder'),
+        location: vscode.Uri.parse('myworkspace/myprojectrootfolder/template.yaml'),
+        workspaceFolder: {
+            uri: vscode.Uri.parse('myworkspace'),
+            name: 'my-workspace',
+            index: 0,
+        },
+        functionArn: 'arn:aws:lambda:us-west-2:123456789012:function:TestFunction',
+    }
+
+    beforeEach(() => {
+        generateDeployedNodeStub = sinon.stub(DeployedResourceNodeModule, 'generateDeployedNode')
+    })
+
+    afterEach(() => {
+        sinon.restore()
+    })
+
+    it('should successfully generate LambdaFunctionNode from resource', async () => {
+        const mockLambdaNode = {} as LambdaFunctionNode
+        const mockDeployedNode = {
+            resource: {
+                explorerNode: mockLambdaNode,
+            },
+        } as DeployedResourceNode
+
+        generateDeployedNodeStub.resolves([mockDeployedNode])
+        const resource = resourceMock
+        const result = await generateLambdaNodeFromResource(resource)
+
+        assert.strictEqual(result, mockLambdaNode)
+        assert(
+            generateDeployedNodeStub.calledOnceWith(
+                resource.deployedResource,
+                resource.region,
+                resource.stackName,
+                resource.resource,
+                resource.projectRoot
+            )
+        )
+    })
+
+    it('should throw error when deployedResource is missing', async () => {
+        const resource = {
+            region: 'us-west-2',
+            stackName: 'TestStack',
+            resource: { Id: 'TestFunction', Type: SERVERLESS_FUNCTION_TYPE },
+        }
+
+        await assert.rejects(
+            async () => await generateLambdaNodeFromResource(resource as any),
+            ToolkitError,
+            'Error getting Lambda info from Appbuilder Node, please check your connection'
+        )
+    })
+
+    it('should throw error when region is missing', async () => {
+        const resource = {
+            deployedResource: { LogicalResourceId: 'TestFunction' },
+            stackName: 'TestStack',
+            resource: { Id: 'TestFunction', Type: SERVERLESS_FUNCTION_TYPE },
+        }
+
+        await assert.rejects(
+            async () => await generateLambdaNodeFromResource(resource as any),
+            ToolkitError,
+            'Error getting Lambda info from Appbuilder Node, please check your connection'
+        )
+    })
+
+    it('should throw error when generateDeployedNode returns no nodes', async () => {
+        generateDeployedNodeStub.resolves([])
+
+        const resource = resourceMock
+
+        await assert.rejects(
+            async () => await generateLambdaNodeFromResource(resource),
+            ToolkitError,
+            'Error getting Lambda info from Appbuilder Node, please check your connection'
+        )
+    })
+
+    it('should throw error when generateDeployedNode returns multiple nodes', async () => {
+        const mockDeployedNode1 = {} as DeployedResourceNode
+        const mockDeployedNode2 = {} as DeployedResourceNode
+        generateDeployedNodeStub.resolves([mockDeployedNode1, mockDeployedNode2])
+
+        const resource = resourceMock
+
+        await assert.rejects(
+            async () => await generateLambdaNodeFromResource(resource),
+            ToolkitError,
+            'Error getting Lambda info from Appbuilder Node, please check your connection'
+        )
+    })
+})
+
+describe('ResourceNode', () => {
+    const lambdaResourceTreeEntity = {
+        Id: 'MyFunction',
+        Type: SERVERLESS_FUNCTION_TYPE,
+        Runtime: 'python3.12',
+        Handler: 'app.lambda_handler',
+        Events: [
+            {
+                Id: 'FileUpload',
+                Type: 'S3',
+                Path: undefined,
+                Method: undefined,
+            },
+        ],
+    } satisfies ResourceTreeEntity
+    const workspaceFolder = {
+        uri: vscode.Uri.parse('myworkspace'),
+        name: 'my-workspace',
+        index: 0,
+    }
+    const samAppLocation = {
+        samTemplateUri: vscode.Uri.parse('myworkspace/myprojectrootfolder/template.yaml'),
+        workspaceFolder,
+        projectRoot: vscode.Uri.parse('myworkspace/myprojectrootfolder'),
+    }
+    const stackName = 'MyStack'
+    const region = 'us-west-2'
+    const functionArn = 'arn:aws:lambda:us-west-2:123456789012:function:MyFunction'
+    const lambdaDeployedResource = {
+        LogicalResourceId: 'MyFunction',
+        PhysicalResourceId: functionArn,
+    }
+
+    describe('constructor', () => {
+        it('should create a ResourceNode with correct all optional properties', () => {
+            const resourceNode = new ResourceNode(
+                samAppLocation,
+                lambdaResourceTreeEntity,
+                stackName,
+                region,
+                lambdaDeployedResource
+            )
+
+            validateNodeBasics(resourceNode, samAppLocation, lambdaResourceTreeEntity)
+            validateDeployedResourceProps(resourceNode, stackName, region, lambdaDeployedResource)
+        })
+
+        it('should create a ResourceNode with correct properties with only required parameters', () => {
+            const resourceNode = new ResourceNode(samAppLocation, lambdaResourceTreeEntity)
+            validateNodeBasics(resourceNode, samAppLocation, lambdaResourceTreeEntity)
+            validateEmptyStackProps(resourceNode)
+            validateEmptyDeployedResourceProps(resourceNode)
+        })
+    })
+
+    describe('getChildren', () => {
+        const nonLambdaResourceTreeEntity = {
+            Id: 'MyS3Bucket',
+            Type: s3BucketType,
+        }
+        const s3Arn = 'arn:aws:s3:::my-example-bucket'
+        const nonLambdaDeployedResource = {
+            LogicalResourceId: 'MyS3BucketId',
+            PhysicalResourceId: s3Arn,
+        }
+
+        let generateDeployedNodeStub: sinon.SinonStub
+        const mockDeployedNodeInstance = sinon.createStubInstance(DeployedResourceNodeModule.DeployedResourceNode)
+
+        beforeEach(() => {
+            generateDeployedNodeStub = sinon.stub(DeployedResourceNodeModule, 'generateDeployedNode')
+        })
+
+        afterEach(() => {
+            sinon.restore()
+        })
+
+        it('should generate deployed nodes and property nodes for deployed lambda function', async () => {
+            // stub generateDeployedNode() call and return mock deploy
+            generateDeployedNodeStub.resolves([mockDeployedNodeInstance])
+
+            const resourceNode = new ResourceNode(
+                samAppLocation,
+                lambdaResourceTreeEntity,
+                stackName,
+                region,
+                lambdaDeployedResource
+            )
+            const childrenNodes = await resourceNode.getChildren()
+            assert(
+                generateDeployedNodeStub.calledOnceWith(
+                    lambdaDeployedResource,
+                    region,
+                    stackName,
+                    lambdaResourceTreeEntity
+                )
+            )
+            assert(childrenNodes.length === 3)
+            assert(childrenNodes.filter((node) => node instanceof DeployedResourceNode).length === 1)
+            // Validate 2 property node for Lambda `Runtime` and `Handler` properties
+            assert(childrenNodes.filter((node) => node instanceof PropertyNode).length === 2)
+        })
+
+        it('should generate deployed nodes without property nodes for deployed non lambda function', async () => {
+            // stub generateDeployedNode() call and return mock deploy
+            generateDeployedNodeStub.resolves([mockDeployedNodeInstance])
+            const resourceNode = new ResourceNode(
+                samAppLocation,
+                nonLambdaResourceTreeEntity,
+                stackName,
+                region,
+                nonLambdaDeployedResource
+            )
+            const childrenNodes = await resourceNode.getChildren()
+            assert(
+                generateDeployedNodeStub.calledOnceWith(
+                    nonLambdaDeployedResource,
+                    region,
+                    stackName,
+                    nonLambdaResourceTreeEntity
+                )
+            )
+            assert(childrenNodes.length === 1)
+            assert(childrenNodes[0] instanceof DeployedResourceNode)
+        })
+
+        it('should generate empty array for non-deployed non lambda resource', async () => {
+            const resourceNode = new ResourceNode(samAppLocation, nonLambdaResourceTreeEntity)
+            assert(generateDeployedNodeStub.notCalled)
+            const childrenNodes = await resourceNode.getChildren()
+            assert(childrenNodes.length === 0)
+        })
+    })
+
+    describe('getIconPath', () => {
+        const testCase = [
+            { type: SERVERLESS_FUNCTION_TYPE, expectedIconKey: 'aws-lambda-function' },
+            { type: s3BucketType, expectedIconKey: 'aws-s3-bucket' },
+            { type: appRunnerType, expectedIconKey: 'aws-apprunner-service' },
+            { type: ecrRepositoryType, expectedIconKey: 'aws-ecr-registry' },
+            { type: 'Unsupported', expectedIconKey: 'info' },
+        ]
+
+        testCase.map((test) => {
+            it(`should generate correct icon path for ${test.type}`, () => {
+                const resourceNode = new ResourceNode(samAppLocation, { Id: 'MyResource', Type: test.type })
+                // Access the private method using TypeScript's type assertion
+                const getIconPath = (resourceNode as any).getIconPath.bind(resourceNode)
+                const iconPath = getIconPath()
+                assert.strictEqual(iconPath.id, test.expectedIconKey)
+            })
+        })
+    })
+
+    describe('getTreeItem', () => {
+        it('should generate correct TreeItem with collapsible state given no deployed resource', () => {
+            const resourceNode = new ResourceNode(samAppLocation, lambdaResourceTreeEntity)
+            const treeItem = resourceNode.getTreeItem()
+
+            assert.strictEqual(treeItem.label, 'MyFunction')
+            assert.strictEqual(treeItem.tooltip, samAppLocation.samTemplateUri.toString())
+            assert.strictEqual(treeItem.resourceUri, samAppLocation.samTemplateUri)
+            assert.strictEqual(treeItem.contextValue, 'awsAppBuilderResourceNode.function')
+            assert.strictEqual(treeItem.iconPath, getIcon('aws-lambda-function'))
+            assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.Collapsed)
+        })
+
+        it('should generate correct TreeItem without collapsed state given node with deployed resource', () => {
+            const resourceNode = new ResourceNode(
+                samAppLocation,
+                lambdaResourceTreeEntity,
+                stackName,
+                region,
+                lambdaDeployedResource,
+                functionArn
+            )
+            const treeItem = resourceNode.getTreeItem()
+
+            assert.strictEqual(treeItem.label, 'MyFunction')
+            assert.strictEqual(treeItem.tooltip, samAppLocation.samTemplateUri.toString())
+            assert.strictEqual(treeItem.resourceUri, samAppLocation.samTemplateUri)
+            assert.strictEqual(treeItem.contextValue, 'awsAppBuilderResourceNode.deployed-function')
+            assert.strictEqual(treeItem.iconPath, getIcon('aws-lambda-deployed-function'))
+            assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.Collapsed)
+        })
+    })
+
+    describe('generateResourceNodes', () => {
+        it('should generate correct ResourceNodes without deployed resource', () => {
+            const resources: ResourceTreeEntity[] = [lambdaResourceTreeEntity, lambdaResourceTreeEntity]
+            const resourceNodes = generateResourceNodes(samAppLocation, resources)
+
+            assert(resourceNodes.length === 2)
+            resourceNodes.map((resourceNode) => {
+                assert(resourceNode instanceof ResourceNode)
+                validateNodeBasics(resourceNode, samAppLocation, lambdaResourceTreeEntity)
+                validateEmptyStackProps(resourceNode)
+                validateEmptyDeployedResourceProps(resourceNode)
+            })
+        })
+    })
+
+    it('should generate correct ResourceNodes with deployed resources without valid type', () => {
+        const resourceTreeEntityWithoutType = {
+            Id: 'MyFunction',
+            Type: '',
+        }
+
+        const resources: ResourceTreeEntity[] = [resourceTreeEntityWithoutType, resourceTreeEntityWithoutType]
+        const resourceNodes = generateResourceNodes(samAppLocation, resources, stackName, region)
+
+        assert(resourceNodes.length === 2)
+
+        resourceNodes.map((resourceNode) => {
+            assert(resourceNode instanceof ResourceNode)
+            validateNodeBasics(resourceNode, samAppLocation, resourceTreeEntityWithoutType)
+            assert.strictEqual(resourceNode.resource.stackName, stackName)
+            assert.strictEqual(resourceNode.resource.region, region)
+            validateEmptyDeployedResourceProps(resourceNode)
+        })
+    })
+
+    it('should generate correct ResourceNodes with deployed resources and valid resource type', () => {
+        const resources: ResourceTreeEntity[] = [lambdaResourceTreeEntity]
+        const resourceNodes = generateResourceNodes(samAppLocation, resources, stackName, region, [
+            lambdaDeployedResource,
+        ])
+
+        assert.strictEqual(resourceNodes.length, 1)
+        resourceNodes.map((resourceNode) => {
+            assert(resourceNode instanceof ResourceNode)
+            validateNodeBasics(resourceNode, samAppLocation, lambdaResourceTreeEntity)
+            validateDeployedResourceProps(resourceNode, stackName, region, lambdaDeployedResource)
+        })
+    })
+})
+
+function validateEmptyDeployedResourceProps(resourceNode: ResourceNode) {
+    assert(!resourceNode.resourceLogicalId)
+    assert(!resourceNode.resource.deployedResource)
+}
+
+function validateEmptyStackProps(resourceNode: ResourceNode) {
+    assert(!resourceNode.resource.stackName)
+    assert(!resourceNode.resource.region)
+}
+
+function validateNodeBasics(
+    resourceNode: ResourceNode,
+    samAppLocation: SamAppLocation,
+    resourceTreeEntity: ResourceTreeEntity
+) {
+    assert.strictEqual(resourceNode.id, resourceTreeEntity.Id)
+    assert.strictEqual(resourceNode.resource.resource, resourceTreeEntity)
+    assert.strictEqual(resourceNode.resource.location, samAppLocation.samTemplateUri)
+    assert.strictEqual(resourceNode.resource.workspaceFolder, samAppLocation.workspaceFolder)
+}
+function validateDeployedResourceProps(
+    resourceNode: ResourceNode,
+    stackName: string,
+    region: string,
+    lambdaDeployedResource: StackResource
+) {
+    assert.strictEqual(resourceNode.resource.region, region)
+    assert.strictEqual(resourceNode.resource.stackName, stackName)
+    assert.strictEqual(resourceNode.resourceLogicalId, lambdaDeployedResource.LogicalResourceId)
+    assert.strictEqual(resourceNode.resource.deployedResource, lambdaDeployedResource)
+}
diff --git a/packages/core/src/test/shared/applicationBuilder/explorer/nodes/rootNode.test.ts b/packages/core/src/test/shared/applicationBuilder/explorer/nodes/rootNode.test.ts
new file mode 100644
index 00000000000..f5711832ad6
--- /dev/null
+++ b/packages/core/src/test/shared/applicationBuilder/explorer/nodes/rootNode.test.ts
@@ -0,0 +1,153 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import assert from 'assert'
+import * as sinon from 'sinon'
+import { Commands } from '../../../../../shared/vscode/commands2'
+import * as Telemetry from '../../../../../shared/telemetry/telemetry'
+import * as VsCodeUtils from '../../../../../shared/utilities/vsCodeUtils'
+import * as DetectSamProjects from '../../../../../../src/awsService/appBuilder/explorer/detectSamProjects'
+import globals from '../../../../../shared/extensionGlobals'
+
+import { AppBuilderRootNode, getAppNodes } from '../../../../../awsService/appBuilder/explorer/nodes/rootNode'
+
+import { AppNode } from '../../../../../awsService/appBuilder/explorer/nodes/appNode'
+
+describe('getAppNodes', async () => {
+    let sandbox: sinon.SinonSandbox
+    let detectSamProjectsStub: sinon.SinonStub
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+        // Use sandbox.stub instead of sinon.stub
+        detectSamProjectsStub = sandbox.stub(DetectSamProjects, 'detectSamProjects')
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+
+    it('should return an placeholder item when no SAM projects are found', async () => {
+        detectSamProjectsStub.resolves([])
+        const appNodes = await getAppNodes()
+        assert.strictEqual(appNodes.length, 1)
+        assert.strictEqual(appNodes[0].id, 'placeholder')
+        assert.strictEqual(appNodes[0].resource, '[No SAM templates found in Workspaces]')
+    })
+
+    it('should return all SAM projects as AppNode', async () => {
+        const mockProjects = createMockProject(5)
+        detectSamProjectsStub.resolves(mockProjects)
+        const appNodes = await getAppNodes()
+        assert.strictEqual(appNodes.length, mockProjects.length)
+        assert(appNodes.every((node) => node instanceof AppNode))
+    })
+})
+
+describe('AppBuilderRootNode', () => {
+    let commandRegisterStub: sinon.SinonStub
+    let openUrlStub: sinon.SinonStub
+    let telemetryStub: sinon.SinonStub
+    let rootNode: AppBuilderRootNode
+    let sandbox: sinon.SinonSandbox
+    let detectSamProjectsStub: sinon.SinonStub
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+        // Use sandbox.stub instead of sinon.stub
+        detectSamProjectsStub = sandbox.stub(DetectSamProjects, 'detectSamProjects')
+        // Stub the Commands.register method
+        commandRegisterStub = sandbox.stub(Commands, 'register')
+        // Stub the openUrl function
+        openUrlStub = sandbox.stub(VsCodeUtils, 'openUrl')
+        // Stub the telemetry.aws_help.emit method
+        telemetryStub = sandbox.stub(Telemetry, 'telemetry')
+        rootNode = new AppBuilderRootNode()
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+
+    describe('constructor', () => {
+        it('should create an AppBuilderRootNode with correct properties', () => {
+            assert.strictEqual(rootNode.id, 'appBuilder')
+            assert.strictEqual(rootNode.resource, rootNode)
+        })
+
+        it('should register commands correctly', () => {
+            assert.strictEqual(commandRegisterStub.callCount, 1)
+            assert.strictEqual(commandRegisterStub.firstCall.args[0], 'aws.appBuilder.viewDocs')
+
+            // Helper functions that used for registering never get called
+            assert.strictEqual(openUrlStub.callCount, 0)
+            assert.strictEqual(telemetryStub.callCount, 0)
+            // Check that the refresh function is set correctly during instantiation
+            assert.strictEqual(typeof rootNode.refreshAppBuilderExplorer, 'function')
+            assert.strictEqual(typeof rootNode.refreshAppBuilderForFileExplorer, 'function')
+        })
+    })
+
+    describe('getChildren', () => {
+        const mockProjects = createMockProject(5)
+
+        beforeEach(() => {
+            // Stub detectSamProjectsStub() to return 5 projects
+            detectSamProjectsStub.resolves(mockProjects)
+        })
+
+        it('should generate all child  project nodes wihtouth walkthrough when walkthrogh is completed', async () => {
+            // Set walk throught status to false
+            const walkThroughState = await globals.globalState.get('aws.toolkit.lambda.walkthroughCompleted')
+            await globals.globalState.update('aws.toolkit.lambda.walkthroughCompleted', true)
+
+            const childrenAppNodes = await rootNode.getChildren()
+
+            assert.strictEqual(childrenAppNodes.length, mockProjects.length)
+            // Set walk throught status to original state
+            await globals.globalState.update('aws.toolkit.lambda.walkthroughCompleted', walkThroughState)
+        })
+
+        it('should generate all child  project nodes + walkthrough node when walkthrogh is incomplete', async () => {
+            // Set walk throught status to false
+            const walkThroughState = await globals.globalState.get('aws.toolkit.lambda.walkthroughCompleted')
+            await globals.globalState.update('aws.toolkit.lambda.walkthroughCompleted', false)
+
+            const childrenAppNodes = await rootNode.getChildren()
+
+            const walkThroughNode = childrenAppNodes[0]
+            assert.strictEqual(walkThroughNode.id, 'walkthrough')
+            assert.strictEqual(childrenAppNodes.filter((node) => node instanceof AppNode).length, mockProjects.length)
+
+            // Set walk throught status to original state
+            await globals.globalState.update('aws.toolkit.lambda.walkthroughCompleted', walkThroughState)
+        })
+    })
+
+    describe('getTreeItem', () => {
+        it('should generate correct TreeItem for AppBuilderRootNode', () => {
+            const rootNode = AppBuilderRootNode.instance
+            const treeItem = rootNode.getTreeItem()
+
+            assert.strictEqual(treeItem.label, 'APPLICATION BUILDER')
+            assert.strictEqual(treeItem.collapsibleState, vscode.TreeItemCollapsibleState.Collapsed)
+            assert.strictEqual(treeItem.contextValue, 'awsAppBuilderRootNode')
+        })
+    })
+})
+
+function createMockProject(count: number) {
+    return Array.from({ length: count }, (_, i) => ({
+        samTemplateUri: vscode.Uri.parse(`/Mock Workspace/Mock Project ${i + 1}/template.yaml`),
+        workspaceFolder: {
+            uri: vscode.Uri.parse('/Mock Workspace'),
+            name: 'Mock Workspace',
+            index: 0,
+        },
+        projectRoot: vscode.Uri.parse(`/Mock Workspace/Mock Project ${i + 1}`),
+        projectName: `Mock Project ${i + 1}`,
+        projectIndex: i,
+    }))
+}
diff --git a/packages/core/src/test/shared/applicationBuilder/explorer/nodes/walkthrough.test.ts b/packages/core/src/test/shared/applicationBuilder/explorer/nodes/walkthrough.test.ts
new file mode 100644
index 00000000000..f998e6b914b
--- /dev/null
+++ b/packages/core/src/test/shared/applicationBuilder/explorer/nodes/walkthrough.test.ts
@@ -0,0 +1,33 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import { WalkthroughNode } from '../../../../../awsService/appBuilder/explorer/nodes/walkthroughNode'
+
+describe('WalkthroughNode', () => {
+    let walkthroughNode: WalkthroughNode
+
+    // Initialize a new instance before each test to ensure test isolation
+    beforeEach(() => {
+        walkthroughNode = new WalkthroughNode()
+    })
+    describe('constructor', () => {
+        it('should create a WalkthroughNode with correct properties', () => {
+            assert.strictEqual(walkthroughNode.id, 'walkthrough')
+            assert.strictEqual(walkthroughNode.resource, walkthroughNode)
+        })
+    })
+    describe('getTreeItem', () => {
+        it('should generate correct TreeItem', () => {
+            const treeItem = walkthroughNode.getTreeItem()
+
+            assert.strictEqual(treeItem.label, 'Walkthrough of Application Builder')
+            assert.strictEqual(treeItem.contextValue, 'awsWalkthroughNode')
+            assert.deepStrictEqual(treeItem.command, {
+                title: 'Walkthrough of Application Builder',
+                command: 'aws.toolkit.lambda.openWalkthrough',
+            })
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/awsClientBuilder.test.ts b/packages/core/src/test/shared/awsClientBuilder.test.ts
new file mode 100644
index 00000000000..338748fa980
--- /dev/null
+++ b/packages/core/src/test/shared/awsClientBuilder.test.ts
@@ -0,0 +1,154 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { AWSError, Request, Service } from 'aws-sdk'
+import { version } from 'vscode'
+import { AWSClientBuilder, DefaultAWSClientBuilder } from '../../shared/awsClientBuilder'
+import { DevSettings } from '../../shared/settings'
+import { getClientId } from '../../shared/telemetry/util'
+import { FakeMemento } from '../fakeExtensionContext'
+import { FakeAwsContext } from '../utilities/fakeAwsContext'
+import { TestSettings } from '../utilities/testSettingsConfiguration'
+import { GlobalState } from '../../shared/globalState'
+
+describe('DefaultAwsClientBuilder', function () {
+    let builder: AWSClientBuilder
+
+    beforeEach(function () {
+        builder = new DefaultAWSClientBuilder(new FakeAwsContext())
+    })
+
+    describe('createAndConfigureSdkClient', function () {
+        it('includes Toolkit user-agent if no options are specified', async function () {
+            const service = await builder.createAwsService(Service)
+            const clientId = getClientId(new GlobalState(new FakeMemento()))
+
+            assert.strictEqual(!!service.config.customUserAgent, true)
+            assert.strictEqual(
+                service.config.customUserAgent!.replace('---Insiders', ''),
+                `AWS-Toolkit-For-VSCode/testPluginVersion Visual-Studio-Code/${version} ClientId/${clientId}`
+            )
+        })
+
+        it('adds Client-Id to user agent', async function () {
+            const service = await builder.createAwsService(Service)
+            const clientId = getClientId(new GlobalState(new FakeMemento()))
+            const regex = new RegExp(`ClientId/${clientId}`)
+            assert.ok(service.config.customUserAgent?.match(regex))
+        })
+
+        it('does not override custom user-agent if specified in options', async function () {
+            const service = await builder.createAwsService(Service, {
+                customUserAgent: 'CUSTOM USER AGENT',
+            })
+
+            assert.strictEqual(service.config.customUserAgent, 'CUSTOM USER AGENT')
+        })
+
+        it('can use endpoint override', async function () {
+            const settings = new TestSettings()
+            await settings.update('aws.dev.endpoints', { foo: 'http://example.com' })
+
+            const service = await builder.createAwsService(
+                Service,
+                {
+                    customUserAgent: 'CUSTOM USER AGENT',
+                    apiConfig: { metadata: { serviceId: 'foo' } },
+                } as any,
+                undefined,
+                undefined,
+                new DevSettings(settings)
+            )
+
+            assert.strictEqual(service.config.endpoint, 'http://example.com')
+        })
+
+        it('does not clobber endpoint setting if no override is present', async function () {
+            const settings = new TestSettings()
+
+            const service = await builder.createAwsService(
+                Service,
+                {
+                    customUserAgent: 'CUSTOM USER AGENT',
+                    apiConfig: { metadata: { serviceId: 'foo' } },
+                    endpoint: 'http://example.com',
+                } as any,
+                undefined,
+                undefined,
+                new DevSettings(settings)
+            )
+
+            assert.strictEqual(service.config.endpoint, 'http://example.com')
+        })
+
+        describe('request listeners', function () {
+            type WithConfig = Parameters<(typeof builder)['createAwsService']>[1] & { apiConfig: Record<string, any> }
+
+            it('calls listener with correct type', async function () {
+                const service = await builder.createAwsService(Service, {
+                    apiConfig: { operations: { FakeOperation: {} } },
+                    onRequestSetup: [
+                        (request) => {
+                            assert.ok(request.service instanceof Service)
+                            assert.strictEqual(request.operation, 'FakeOperation')
+                            assert.deepStrictEqual(request.params, { foo: 'bar' })
+
+                            request.on(
+                                'validate',
+                                () => {
+                                    throw new Error()
+                                },
+                                true
+                            )
+                        },
+                    ],
+                } as WithConfig)
+
+                const request = service.makeRequest('FakeOperation', { foo: 'bar' }).promise()
+                await assert.rejects(request)
+            })
+
+            it('can add listeners without affecting the original class', async function () {
+                let callCount = 0
+
+                const getDescriptors = (ctor: new (...args: any[]) => any) =>
+                    Object.getOwnPropertyDescriptors(ctor.prototype)
+
+                const base = class extends Service {
+                    public override setupRequestListeners(request: Request<any, AWSError>): void {
+                        callCount += 1
+                    }
+                }
+
+                // Pretty gross but we're dealing with old school JS inheritance here
+                function factory(...args: any[]) {
+                    const instance = new Service(...args)
+                    const proto = Object.create(Object.getPrototypeOf(instance), getDescriptors(base))
+                    Object.setPrototypeOf(instance, proto)
+
+                    return instance
+                }
+                const ctor = factory as unknown as typeof base
+
+                const expected = getDescriptors(ctor)
+                const service = await builder.createAwsService(ctor, {
+                    apiConfig: { operations: { Foo: {} } },
+                    onRequestSetup: () => {},
+                } as WithConfig)
+
+                assert.deepStrictEqual(getDescriptors(ctor), expected)
+                assert.ok(service instanceof Service)
+
+                // This is just a reference compare. Unbound methods don't matter here.
+                // eslint-disable-next-line @typescript-eslint/unbound-method
+                assert.notStrictEqual(service.setupRequestListeners, base.prototype.setupRequestListeners)
+
+                await assert.rejects(service.makeRequest('Foo').promise())
+                assert.strictEqual(callCount, 1)
+            })
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/awsClientBuilderV3.test.ts b/packages/core/src/test/shared/awsClientBuilderV3.test.ts
new file mode 100644
index 00000000000..650e72bca9f
--- /dev/null
+++ b/packages/core/src/test/shared/awsClientBuilderV3.test.ts
@@ -0,0 +1,498 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import sinon from 'sinon'
+import assert from 'assert'
+import { version } from 'vscode'
+import { getClientId } from '../../shared/telemetry/util'
+import { FakeMemento } from '../fakeExtensionContext'
+import { FakeAwsContext } from '../utilities/fakeAwsContext'
+import { GlobalState } from '../../shared/globalState'
+import {
+    AwsClient,
+    AWSClientBuilderV3,
+    AwsClientOptions,
+    AwsCommand,
+    emitOnRequest,
+    getServiceId,
+    logOnRequest,
+    overwriteEndpoint,
+    recordErrorTelemetry,
+} from '../../shared/awsClientBuilderV3'
+import { Client } from '@aws-sdk/smithy-client'
+import { DevSettings, extensionVersion } from '../../shared'
+import { assertTelemetry } from '../testUtil'
+import { telemetry } from '../../shared/telemetry'
+import { HttpRequest, HttpResponse } from '@aws-sdk/protocol-http'
+import { assertLogsContain, assertLogsContainAllOf } from '../globalSetup.test'
+import { TestSettings } from '../utilities/testSettingsConfiguration'
+import { CredentialsShim } from '../../auth/deprecated/loginManager'
+import { Credentials, MetadataBearer, MiddlewareStack } from '@aws-sdk/types'
+import { oneDay } from '../../shared/datetime'
+import { ConfiguredRetryStrategy } from '@smithy/util-retry'
+import { StandardRetryStrategy } from '@smithy/util-retry'
+import { NodeHttpHandler } from '@smithy/node-http-handler'
+
+describe('AwsClientBuilderV3', function () {
+    let builder: AWSClientBuilderV3
+
+    beforeEach(async function () {
+        builder = new AWSClientBuilderV3(new FakeAwsContext())
+    })
+
+    it('includes Toolkit user-agent if no options are specified', function () {
+        const service = builder.createAwsService({ serviceClient: Client })
+        const clientId = getClientId(new GlobalState(new FakeMemento()))
+
+        assert.ok(service.config.userAgent)
+        assert.strictEqual(
+            service.config.userAgent![0][0].replace('---Insiders', ''),
+            `AWS-Toolkit-For-VSCode/testPluginVersion Visual-Studio-Code/${version} ClientId/${clientId}`
+        )
+        assert.strictEqual(service.config.userAgent![0][1], extensionVersion)
+    })
+
+    it('adds region to client', function () {
+        const service = builder.createAwsService({ serviceClient: Client, region: 'us-west-2' })
+
+        assert.ok(service.config.region)
+        assert.strictEqual(service.config.region, 'us-west-2')
+    })
+
+    it('adds endpoint URL from context to client', function () {
+        const testEndpointUrl = 'https://custom-endpoint.example.com'
+        const fakeContext = new FakeAwsContext({
+            contextCredentials: {
+                credentials: {} as any,
+                credentialsId: 'test',
+                accountId: '123456789012',
+                endpointUrl: testEndpointUrl,
+            },
+        })
+        const builderWithEndpoint = new AWSClientBuilderV3(fakeContext)
+
+        const service = builderWithEndpoint.createAwsService({ serviceClient: Client })
+
+        assert.strictEqual(service.config.endpoint, testEndpointUrl)
+    })
+
+    it('does not set endpoint when context has no endpoint URL', function () {
+        const fakeContext = new FakeAwsContext({
+            contextCredentials: {
+                credentials: {} as any,
+                credentialsId: 'test',
+                accountId: '123456789012',
+            },
+        })
+        const builderWithoutEndpoint = new AWSClientBuilderV3(fakeContext)
+
+        const service = builderWithoutEndpoint.createAwsService({ serviceClient: Client })
+
+        assert.strictEqual(service.config.endpoint, undefined)
+    })
+
+    it('does not set endpoint when context has undefined endpoint URL', function () {
+        const fakeContext = new FakeAwsContext({
+            contextCredentials: {
+                credentials: {} as any,
+                credentialsId: 'test',
+                accountId: '123456789012',
+                endpointUrl: undefined,
+            },
+        })
+        const builderWithUndefinedEndpoint = new AWSClientBuilderV3(fakeContext)
+
+        const service = builderWithUndefinedEndpoint.createAwsService({ serviceClient: Client })
+
+        assert.strictEqual(service.config.endpoint, undefined)
+    })
+
+    it('adds Client-Id to user agent', function () {
+        const service = builder.createAwsService({ serviceClient: Client })
+        const clientId = getClientId(new GlobalState(new FakeMemento()))
+        const regex = new RegExp(`ClientId/${clientId}`)
+        assert.ok(service.config.userAgent![0][0].match(regex))
+    })
+
+    it('does not override custom user-agent if specified in options', function () {
+        const service = builder.createAwsService({
+            serviceClient: Client,
+            clientOptions: {
+                userAgent: [['CUSTOM USER AGENT']],
+            },
+        })
+
+        assert.strictEqual(service.config.userAgent[0][0], 'CUSTOM USER AGENT')
+    })
+
+    it('injects http client into handler', function () {
+        const requestHandler = new NodeHttpHandler({
+            requestTimeout: 1234,
+        })
+        const service = builder.createAwsService({
+            serviceClient: Client,
+            clientOptions: {
+                requestHandler: requestHandler,
+            },
+        })
+        assert.strictEqual(service.config.requestHandler, requestHandler)
+    })
+
+    it('defaults to reusing singular http handler', function () {
+        const service = builder.createAwsService({
+            serviceClient: Client,
+        })
+        const service2 = builder.createAwsService({
+            serviceClient: Client,
+        })
+
+        const firstHandler = service.config.requestHandler
+        const secondHandler = service2.config.requestHandler
+
+        // If not injected, the http handler can be undefined before making request.
+        if (firstHandler instanceof NodeHttpHandler && secondHandler instanceof NodeHttpHandler) {
+            assert.ok(firstHandler === secondHandler)
+        } else {
+            assert.fail('Expected both request handlers to be NodeHttpHandler instances')
+        }
+    })
+
+    describe('caching mechanism', function () {
+        it('avoids recreating client on duplicate calls', async function () {
+            const firstClient = builder.getAwsService({ serviceClient: TestClient })
+            const secondClient = builder.getAwsService({ serviceClient: TestClient })
+
+            assert.strictEqual(firstClient.id, secondClient.id)
+        })
+
+        it('recreates client when region changes', async function () {
+            const firstClient = builder.getAwsService({ serviceClient: TestClient, region: 'test-region' })
+            const secondClient = builder.getAwsService({ serviceClient: TestClient, region: 'test-region2' })
+            const thirdClient = builder.getAwsService({ serviceClient: TestClient, region: 'test-region' })
+
+            assert.notStrictEqual(firstClient.id, secondClient.id)
+            assert.strictEqual(firstClient.args.region, 'test-region')
+            assert.strictEqual(secondClient.args.region, 'test-region2')
+
+            assert.strictEqual(firstClient.id, thirdClient.id)
+        })
+
+        it('recreates client when the underlying service changes', async function () {
+            const firstClient = builder.getAwsService({ serviceClient: TestClient })
+            const secondClient = builder.getAwsService({ serviceClient: TestClient2 })
+            const thirdClient = builder.getAwsService({ serviceClient: TestClient })
+
+            assert.notStrictEqual(firstClient.type, secondClient.type)
+            assert.strictEqual(firstClient.id, thirdClient.id)
+        })
+
+        it('recreates client when config options change', async function () {
+            const retryStrategy = new ConfiguredRetryStrategy(10)
+            const firstClient = builder.getAwsService({
+                serviceClient: TestClient,
+                clientOptions: {
+                    retryStrategy: retryStrategy,
+                },
+            })
+
+            const secondClient = builder.getAwsService({
+                serviceClient: TestClient,
+                clientOptions: {
+                    retryStrategy: new StandardRetryStrategy(1),
+                },
+            })
+
+            const thirdClient = builder.getAwsService({
+                serviceClient: TestClient,
+                clientOptions: {
+                    retryStrategy: retryStrategy,
+                },
+            })
+
+            assert.notStrictEqual(firstClient.id, secondClient.id)
+            assert.strictEqual(firstClient.id, thirdClient.id)
+        })
+
+        it('recreates client when endpoints change', async function () {
+            const settings = new TestSettings()
+            await settings.update('aws.dev.endpoints', { foo: 'http://example.com:3000/path' })
+            const devSettings = new DevSettings(settings)
+
+            const otherSettings = new TestSettings()
+            await otherSettings.update('aws.dev.endpoints', { foo: 'http://example.com:3000/path2' })
+            const otherDevSettings = new DevSettings(otherSettings)
+
+            const firstClient = builder.getAwsService({
+                serviceClient: TestClient,
+                region: 'test-region',
+                settings: devSettings,
+            })
+            const secondClient = builder.getAwsService({
+                serviceClient: TestClient,
+                region: 'test-region',
+                settings: otherDevSettings,
+            })
+            const thirdClient = builder.getAwsService({
+                serviceClient: TestClient,
+                region: 'test-region',
+                settings: devSettings,
+            })
+
+            assert.notStrictEqual(firstClient.id, secondClient.id)
+            assert.strictEqual(firstClient.id, thirdClient.id)
+        })
+
+        it('recreates client when context endpoint URL changes', async function () {
+            const contextCredentials = {
+                credentials: {} as any,
+                credentialsId: 'test',
+                accountId: '123456789012',
+                endpointUrl: 'https://endpoint1.example.com',
+            }
+            const contextWithEndpoint = new FakeAwsContext({
+                contextCredentials,
+            })
+
+            const builder = new AWSClientBuilderV3(contextWithEndpoint)
+            const firstClient = builder.getAwsService({ serviceClient: TestClient })
+            // set different endpointUrl
+            await contextWithEndpoint.setCredentials({
+                ...contextCredentials,
+                endpointUrl: 'https://enpdoint2.example.com',
+            })
+            const secondClient = builder.getAwsService({ serviceClient: TestClient })
+            // no endpointUrl
+            await contextWithEndpoint.setCredentials({ ...contextCredentials, endpointUrl: undefined })
+            const thirdClient = builder.getAwsService({ serviceClient: TestClient })
+            // use the same endpointUrl again
+            await contextWithEndpoint.setCredentials({ ...contextCredentials })
+            const fourthClient = builder.getAwsService({ serviceClient: TestClient })
+
+            // Different endpoint URLs should create different clients
+            assert.notStrictEqual(firstClient.id, secondClient.id)
+            assert.notStrictEqual(firstClient.id, thirdClient.id)
+            assert.notStrictEqual(secondClient.id, thirdClient.id)
+
+            // Same endpoint URL should create same client
+            assert.strictEqual(firstClient.id, fourthClient.id)
+        })
+    })
+
+    describe('middlewareStack', function () {
+        let args: { request: { hostname: string; path: string }; input: any }
+        let context: { clientName?: string; commandName?: string }
+        let response: { response: { statusCode: number }; output: { message: string } }
+        let httpRequestStub: sinon.SinonStub
+        let httpResponseStub: sinon.SinonStub
+
+        before(function () {
+            httpRequestStub = sinon.stub(HttpRequest, 'isInstance')
+            httpResponseStub = sinon.stub(HttpResponse, 'isInstance')
+            httpRequestStub.callsFake(() => true)
+            httpResponseStub.callsFake(() => true)
+        })
+
+        beforeEach(function () {
+            args = {
+                request: {
+                    hostname: 'testHost',
+                    path: 'testPath',
+                },
+                input: {
+                    testKey: 'testValue',
+                },
+            }
+            context = {
+                clientName: 'fooClient',
+            }
+            response = {
+                response: {
+                    statusCode: 200,
+                },
+                output: {
+                    message: 'test output',
+                },
+            }
+        })
+        after(function () {
+            sinon.restore()
+        })
+
+        it('logs messages on request', async function () {
+            await logOnRequest((_: any) => _, args as any)
+            assertLogsContainAllOf(['testHost', 'testPath'], false, 'debug')
+        })
+
+        it('adds telemetry metadata and logs on error failure', async function () {
+            const next = (_: any) => {
+                throw new Error('test error')
+            }
+            await telemetry.vscode_executeCommand.run(async (span) => {
+                await assert.rejects(emitOnRequest(next, context, args))
+            })
+            assertLogsContain('test error', false, 'error')
+            assertTelemetry('vscode_executeCommand', { requestServiceType: 'foo' })
+        })
+
+        it('does not emit telemetry, but still logs on successes', async function () {
+            const next = async (_: any) => {
+                return response
+            }
+            await telemetry.vscode_executeCommand.run(async (span) => {
+                assert.deepStrictEqual(await emitOnRequest(next, context, args), response)
+            })
+            assertLogsContainAllOf(['testHost', 'testPath'], false, 'debug')
+            assert.throws(() => assertTelemetry('vscode_executeCommand', { requestServiceType: 'foo' }))
+        })
+
+        it('custom endpoints overwrite request url', async function () {
+            const settings = new TestSettings()
+            await settings.update('aws.dev.endpoints', { foo: 'http://example.com:3000/path' })
+            const next = async (args: any) => args
+            const newArgs: any = await overwriteEndpoint(next, context, new DevSettings(settings), args)
+
+            assert.strictEqual(newArgs.request.hostname, 'example.com')
+            assert.strictEqual(newArgs.request.protocol, 'http:')
+            assert.strictEqual(newArgs.request.port, '3000')
+            assert.strictEqual(newArgs.request.pathname, '/path')
+        })
+
+        it('custom endpoints are not overwritten if not specified', async function () {
+            const settings = new TestSettings()
+            const next = async (args: any) => args
+            const newArgs: any = await overwriteEndpoint(next, context, new DevSettings(settings), args)
+
+            assert.strictEqual(newArgs.request.hostname, 'testHost')
+            assert.strictEqual(newArgs.request.path, 'testPath')
+        })
+    })
+
+    describe('clientCredentials', function () {
+        let fakeContext: FakeAwsContext
+        let mockCredsShim: MockCredentialsShim
+        let oldCreds: Credentials
+        let newCreds: Credentials
+
+        beforeEach(function () {
+            fakeContext = new FakeAwsContext()
+            oldCreds = {
+                accessKeyId: 'old',
+                secretAccessKey: 'old',
+                sessionToken: 'old',
+                expiration: new Date(Date.now() + oneDay),
+            }
+            newCreds = {
+                accessKeyId: 'new',
+                secretAccessKey: 'new',
+                sessionToken: 'new',
+                expiration: new Date(Date.now() + oneDay),
+            }
+            mockCredsShim = new MockCredentialsShim(oldCreds, newCreds)
+            fakeContext.credentialsShim = mockCredsShim
+            builder = new AWSClientBuilderV3(fakeContext)
+        })
+
+        it('refreshes credentials when they expire', async function () {
+            const service = builder.createAwsService({ serviceClient: Client })
+            assert.strictEqual(await service.config.credentials(), oldCreds)
+            mockCredsShim.expire()
+            assert.strictEqual(await service.config.credentials(), newCreds)
+        })
+
+        it('does not cache stale credentials', async function () {
+            const service = builder.createAwsService({ serviceClient: Client })
+            assert.strictEqual(await service.config.credentials(), oldCreds)
+            const newerCreds = {
+                accessKeyId: 'old2',
+                secretAccessKey: 'old2',
+                sessionToken: 'old2',
+                expiration: new Date(Date.now() + oneDay),
+            }
+            mockCredsShim.update(newerCreds)
+            assert.strictEqual(await service.config.credentials(), newerCreds)
+        })
+
+        it('does not initialize credentials if token is provided', function () {
+            const service = builder.createAwsService({
+                serviceClient: Client,
+                clientOptions: {
+                    token: { token: 'my-token', expiration: new Date(Date.now() + oneDay) },
+                },
+            })
+            assert.ok(service.config.credentials === undefined)
+        })
+    })
+})
+
+describe('getServiceId', function () {
+    it('returns the service ID', function () {
+        assert.strictEqual(getServiceId({ clientName: 'ec2' }), 'ec2')
+        assert.strictEqual(getServiceId({ clientName: 'ec2client' }), 'ec2')
+        assert.strictEqual(getServiceId({ clientName: 's3client' }), 's3')
+    })
+})
+
+describe('recordErrorTelemetry', function () {
+    it('includes requestServiceType in span', function () {
+        const e = new Error('test error')
+        // Using vscode_executeCommand as general span to test functionality. This metric is unrelated to what is done here.
+        telemetry.vscode_executeCommand.run((span) => {
+            recordErrorTelemetry(e, 'aws-service')
+        })
+        assertTelemetry('vscode_executeCommand', { requestServiceType: 'aws-service' })
+    })
+})
+
+class MockCredentialsShim implements CredentialsShim {
+    public constructor(
+        public credentials: Credentials,
+        public readonly refreshedCredentials: Credentials
+    ) {}
+
+    public expire(): void {
+        this.credentials = {
+            ...this.credentials,
+            expiration: new Date(Date.now() - oneDay),
+        }
+    }
+
+    public update(newCreds: Credentials): void {
+        this.credentials = newCreds
+    }
+
+    public async get(): Promise<Credentials> {
+        return this.credentials
+    }
+
+    public async refresh(): Promise<Credentials> {
+        return this.refreshedCredentials
+    }
+}
+
+abstract class TestClientBase implements AwsClient {
+    public constructor(
+        public readonly args: AwsClientOptions,
+        public readonly id: number,
+        public readonly type: string
+    ) {}
+    public middlewareStack: { add: MiddlewareStack<any, MetadataBearer>['add'] } = {
+        add: (_: any, __: any) => {},
+    }
+    public async send(command: AwsCommand<object, object>, options?: any): Promise<any> {}
+    public destroy(): void {}
+}
+
+class TestClient extends TestClientBase {
+    private static nextId: number = 0
+    public constructor(args: AwsClientOptions) {
+        super(args, TestClient.nextId++, 'TestClient')
+    }
+}
+
+class TestClient2 extends TestClientBase {
+    private static nextId: number = 0
+    public constructor(args: AwsClientOptions) {
+        super(args, TestClient2.nextId++, 'TestClient2')
+    }
+}
diff --git a/packages/core/src/test/shared/clients/defaultDocdbClient.test.ts b/packages/core/src/test/shared/clients/defaultDocdbClient.test.ts
new file mode 100644
index 00000000000..0a6eaf7b567
--- /dev/null
+++ b/packages/core/src/test/shared/clients/defaultDocdbClient.test.ts
@@ -0,0 +1,98 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon, { SinonStub } from 'sinon'
+import { DefaultDocumentDBClient, DocumentDBClient } from '../../../shared/clients/docdbClient'
+
+describe('DefaultDocumentDBClient', function () {
+    const region = 'us-west-2'
+
+    let sdkStub: SinonStub
+
+    beforeEach(() => {
+        sdkStub = sinon.stub().resolves({
+            send: sinon.stub().resolves({
+                DBClusters: [],
+                DBInstances: [],
+            }),
+            destroy: sinon.stub(),
+        })
+    })
+
+    function createClient({ regionCode = region }: { regionCode?: string } = {}): DocumentDBClient {
+        const client = DefaultDocumentDBClient.create(regionCode)
+        client.getClient = sdkStub
+        return client
+    }
+
+    describe('listClusters', function () {
+        it('gets a list of clusters', async function () {
+            const client = createClient()
+            const result = await client.listClusters()
+
+            assert.ok(result)
+            assert.equal(0, result.length)
+            assert(sdkStub.calledOnce)
+        })
+
+        it('throws an Error during listing clusters on failure', async function () {
+            const client = createClient()
+            client.getClient = sinon.stub().resolves({
+                send: sinon.stub().throws(),
+            })
+
+            await assert.rejects(async () => await client.listClusters())
+        })
+    })
+
+    describe('listInstance', function () {
+        it('gets a list of instances', async function () {
+            const client = createClient()
+            const result = await client.listInstances()
+
+            assert.ok(result)
+            assert.equal(0, result.length)
+            assert(sdkStub.calledOnce)
+        })
+
+        it('throws an Error during listing instances on failure', async function () {
+            const client = createClient()
+            client.getClient = sinon.stub().resolves({
+                send: sinon.stub().throws(),
+            })
+
+            await assert.rejects(async () => await client.listInstances())
+        })
+    })
+
+    describe('startCluster', function () {
+        it('sends the correct command', async function () {
+            // arrange
+            const clusterId = 'test-cluster-1'
+            const client = createClient()
+
+            // act
+            await client.startCluster(clusterId)
+
+            // assert
+            assert(sdkStub.calledOnce)
+        })
+    })
+
+    describe('stopCluster', function () {
+        it('sends the correct command', async function () {
+            // arrange
+            const clusterId = 'test-cluster-1'
+            const client = createClient()
+
+            // act
+            await client.stopCluster(clusterId)
+
+            // assert
+            assert(sdkStub.calledOnce)
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/clients/defaultIamClient.test.ts b/packages/core/src/test/shared/clients/defaultIamClient.test.ts
new file mode 100644
index 00000000000..00d860ca542
--- /dev/null
+++ b/packages/core/src/test/shared/clients/defaultIamClient.test.ts
@@ -0,0 +1,26 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { IamClient } from '../../../shared/clients/iam'
+
+describe('getFriendlyName', function () {
+    const client = new IamClient('')
+    it('throws error on invalid arns', function () {
+        const testArn1 = 'arn:aws:iam::testId:name'
+        const testArn2 = 'thisIsNotAnArn'
+
+        assert.throws(() => client.getFriendlyName(testArn1))
+        assert.throws(() => client.getFriendlyName(testArn2))
+    })
+
+    it('correctly parses valid arns', function () {
+        const testArn1 = 'arn:aws:iam::testId/name1'
+        const testArn2 = 'arn:aws:iam::testId2/name2'
+
+        assert.strictEqual(client.getFriendlyName(testArn1), 'name1')
+        assert.strictEqual(client.getFriendlyName(testArn2), 'name2')
+    })
+})
diff --git a/packages/core/src/test/shared/clients/defaultIotClient.test.ts b/packages/core/src/test/shared/clients/defaultIotClient.test.ts
new file mode 100644
index 00000000000..01cd2740f6a
--- /dev/null
+++ b/packages/core/src/test/shared/clients/defaultIotClient.test.ts
@@ -0,0 +1,637 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { ServiceException } from '@smithy/smithy-client'
+import {
+    AttachPolicyCommand,
+    AttachPolicyRequest,
+    AttachThingPrincipalCommand,
+    AttachThingPrincipalRequest,
+    CreateKeysAndCertificateCommand,
+    CreateKeysAndCertificateRequest,
+    CreateKeysAndCertificateResponse,
+    CreatePolicyCommand,
+    CreatePolicyRequest,
+    CreatePolicyResponse,
+    CreatePolicyVersionCommand,
+    CreatePolicyVersionRequest,
+    CreatePolicyVersionResponse,
+    CreateThingCommand,
+    CreateThingResponse,
+    DeleteCertificateCommand,
+    DeleteCertificateRequest,
+    DeletePolicyCommand,
+    DeletePolicyRequest,
+    DeletePolicyVersionCommand,
+    DeletePolicyVersionRequest,
+    DeleteThingCommand,
+    DeleteThingRequest,
+    DeleteThingResponse,
+    DescribeCertificateCommand,
+    DescribeCertificateRequest,
+    DescribeCertificateResponse,
+    DescribeEndpointCommand,
+    DescribeEndpointRequest,
+    DescribeEndpointResponse,
+    DetachPolicyCommand,
+    DetachPolicyRequest,
+    DetachThingPrincipalCommand,
+    DetachThingPrincipalRequest,
+    GetPolicyVersionCommand,
+    GetPolicyVersionRequest,
+    GetPolicyVersionResponse,
+    IoTClient,
+    IoTClientResolvedConfig,
+    ListCertificatesCommand,
+    ListCertificatesRequest,
+    ListCertificatesResponse,
+    ListPoliciesCommand,
+    ListPoliciesRequest,
+    ListPoliciesResponse,
+    ListPolicyVersionsCommand,
+    ListPolicyVersionsRequest,
+    ListPolicyVersionsResponse,
+    ListPrincipalPoliciesCommand,
+    ListPrincipalPoliciesRequest,
+    ListPrincipalThingsCommand,
+    ListPrincipalThingsRequest,
+    ListPrincipalThingsResponse,
+    ListTargetsForPolicyCommand,
+    ListTargetsForPolicyRequest,
+    ListTargetsForPolicyResponse,
+    ListThingPrincipalsCommand,
+    ListThingPrincipalsRequest,
+    ListThingPrincipalsResponse,
+    ListThingsCommand,
+    ListThingsRequest,
+    ListThingsResponse,
+    PolicyVersion,
+    ServiceInputTypes,
+    ServiceOutputTypes,
+    SetDefaultPolicyVersionCommand,
+    SetDefaultPolicyVersionRequest,
+    UpdateCertificateCommand,
+    UpdateCertificateRequest,
+} from '@aws-sdk/client-iot'
+import { DefaultIotClient, ListThingCertificatesResponse } from '../../../shared/clients/iotClient'
+import { AwsStub, mockClient } from 'aws-sdk-client-mock'
+
+class FakeServiceException extends ServiceException {
+    public region: string = 'us-west-2'
+
+    public constructor(message: string) {
+        super({
+            name: 'FakeServiceException',
+            $fault: 'client',
+            $metadata: {},
+            message,
+        })
+    }
+}
+
+describe('DefaultIotClient', function () {
+    const region = 'us-west-2'
+    const thingName = 'thing'
+    const policyName = 'policy'
+    const policyDocument = '{ "key": "value" }'
+    const nextToken = 'nextToken'
+    const marker = nextToken
+    const maxResults = 10
+    const pageSize = maxResults
+    let mockIot: AwsStub<ServiceInputTypes, ServiceOutputTypes, IoTClientResolvedConfig>
+
+    beforeEach(function () {
+        mockIot = mockClient(IoTClient)
+    })
+
+    const error: ServiceException = new FakeServiceException('Expected failure') as ServiceException
+
+    function createClient({ regionCode = region }: { regionCode?: string } = {}): DefaultIotClient {
+        return new DefaultIotClient(regionCode, () => new IoTClient())
+    }
+
+    /* Functions that create or retrieve resources. */
+
+    describe('createThing', function () {
+        const expectedResponse: CreateThingResponse = { thingName: thingName, thingArn: 'arn' }
+        it('creates a thing', async function () {
+            mockIot.on(CreateThingCommand).resolves(expectedResponse)
+
+            const response = await createClient().createThing({ thingName })
+
+            assert.strictEqual(mockIot.commandCalls(CreateThingCommand).length, 1)
+            assert.deepStrictEqual(response, expectedResponse)
+        })
+
+        it('throws an Error on failure', async function () {
+            mockIot.on(CreateThingCommand).rejects(error)
+
+            await assert.rejects(createClient().createThing({ thingName }), error)
+        })
+    })
+
+    describe('createCertificateAndKeys', function () {
+        const certificateId = 'cert1'
+        const input: CreateKeysAndCertificateRequest = { setAsActive: undefined }
+        const expectedResponse: CreateKeysAndCertificateResponse = {
+            certificateId,
+            certificateArn: 'arn',
+            certificatePem: 'pem',
+            keyPair: { PublicKey: 'publicKey', PrivateKey: 'privateKey' },
+        }
+
+        it('creates Certificate and Key Pair', async function () {
+            mockIot.on(CreateKeysAndCertificateCommand).resolves(expectedResponse)
+
+            const response = await createClient().createCertificateAndKeys(input)
+
+            assert.deepStrictEqual(response, expectedResponse)
+        })
+
+        it('throws an Error on failure', async function () {
+            mockIot.on(CreateKeysAndCertificateCommand).rejects(error)
+
+            await assert.rejects(createClient().createCertificateAndKeys(input), error)
+        })
+    })
+
+    describe('getEndpoint', function () {
+        const input: DescribeEndpointRequest = { endpointType: 'iot:Data-ATS' }
+        const endpointAddress = 'address'
+        const describeResponse: DescribeEndpointResponse = { endpointAddress }
+
+        it('gets endpoint', async function () {
+            mockIot.on(DescribeEndpointCommand).resolves(describeResponse)
+
+            const response = await createClient().getEndpoint()
+
+            assert.strictEqual(mockIot.commandCalls(DescribeEndpointCommand).length, 1)
+            assert.deepStrictEqual(mockIot.commandCalls(DescribeEndpointCommand)[0].args[0].input, input)
+            assert.deepStrictEqual(response, endpointAddress)
+        })
+
+        it('throws an Error on failure', async function () {
+            mockIot.on(DescribeEndpointCommand).rejects(error)
+
+            await assert.rejects(createClient().getEndpoint(), error)
+        })
+    })
+
+    describe('getPolicyVersion', function () {
+        const input: GetPolicyVersionRequest = { policyName, policyVersionId: '1' }
+        const expectedResponse: GetPolicyVersionResponse = {
+            policyName,
+            policyDocument,
+            policyArn: 'arn1',
+            policyVersionId: '1',
+        }
+
+        it('gets policy document for version', async function () {
+            mockIot.on(GetPolicyVersionCommand).resolves(expectedResponse)
+
+            const response = await createClient().getPolicyVersion(input)
+
+            assert.deepStrictEqual(response, expectedResponse)
+        })
+
+        it('throws an Error on failure', async function () {
+            mockIot.on(GetPolicyVersionCommand).rejects(error)
+
+            await assert.rejects(createClient().getPolicyVersion(input), error)
+        })
+    })
+
+    /* Functions that return void .*/
+
+    describe('deleteThing', function () {
+        const input: DeleteThingRequest = { thingName }
+
+        it('deletes a thing', async function () {
+            mockIot.on(DeleteThingCommand).resolves({} as DeleteThingResponse)
+
+            await createClient().deleteThing({ thingName })
+
+            assert.strictEqual(mockIot.commandCalls(DeleteThingCommand).length, 1)
+            assert.deepStrictEqual(mockIot.commandCalls(DeleteThingCommand)[0].args[0].input, input)
+        })
+
+        it('throws an Error on failure', async function () {
+            mockIot.on(DeleteThingCommand).rejects(error)
+
+            await assert.rejects(createClient().deleteThing({ thingName }), error)
+        })
+    })
+
+    describe('deleteCertificate', function () {
+        const certificateId = 'cert1'
+        const input: DeleteCertificateRequest = { certificateId, forceDelete: undefined }
+
+        it('deletes a certificate', async function () {
+            mockIot.on(DeleteCertificateCommand).resolves({})
+
+            await createClient().deleteCertificate(input)
+
+            assert.strictEqual(mockIot.commandCalls(DeleteCertificateCommand).length, 1)
+            assert.deepStrictEqual(mockIot.commandCalls(DeleteCertificateCommand)[0].args[0].input, input)
+        })
+
+        it('throws an Error on failure', async function () {
+            mockIot.on(DeleteCertificateCommand).rejects(error)
+
+            await assert.rejects(createClient().deleteCertificate(input), error)
+        })
+    })
+
+    describe('updateCertificate', function () {
+        const certificateId = 'cert1'
+        const input: UpdateCertificateRequest = { certificateId, newStatus: 'ACTIVE' }
+
+        it('updates a certificate', async function () {
+            mockIot.on(UpdateCertificateCommand).resolves({})
+
+            await createClient().updateCertificate(input)
+
+            assert.strictEqual(mockIot.commandCalls(UpdateCertificateCommand).length, 1)
+            assert.deepStrictEqual(mockIot.commandCalls(UpdateCertificateCommand)[0].args[0].input, input)
+        })
+
+        it('throws an Error on failure', async function () {
+            mockIot.on(UpdateCertificateCommand).rejects(error)
+
+            await assert.rejects(createClient().updateCertificate(input), error)
+        })
+    })
+
+    describe('attachThingPrincipal', function () {
+        const input: AttachThingPrincipalRequest = { thingName, principal: 'arn1' }
+
+        it('attaches a certificate to a Thing', async function () {
+            mockIot.on(AttachThingPrincipalCommand).resolves({})
+
+            await createClient().attachThingPrincipal(input)
+
+            assert.strictEqual(mockIot.commandCalls(AttachThingPrincipalCommand).length, 1)
+            assert.deepStrictEqual(mockIot.commandCalls(AttachThingPrincipalCommand)[0].args[0].input, input)
+        })
+
+        it('throws an Error on failure', async function () {
+            mockIot.on(AttachThingPrincipalCommand).rejects(error)
+
+            await assert.rejects(createClient().attachThingPrincipal(input), error)
+        })
+    })
+
+    describe('detachThingPrincipal', function () {
+        const input: DetachThingPrincipalRequest = { thingName, principal: 'arn1' }
+
+        it('detaches a certificate from a Thing', async function () {
+            mockIot.on(DetachThingPrincipalCommand).resolves({})
+
+            await createClient().detachThingPrincipal(input)
+
+            assert.strictEqual(mockIot.commandCalls(DetachThingPrincipalCommand).length, 1)
+            assert.deepStrictEqual(mockIot.commandCalls(DetachThingPrincipalCommand)[0].args[0].input, input)
+        })
+
+        it('throws an Error on failure', async function () {
+            mockIot.on(DetachThingPrincipalCommand).rejects(error)
+
+            await assert.rejects(createClient().detachThingPrincipal(input), error)
+        })
+    })
+
+    describe('attachPolicy', function () {
+        const input: AttachPolicyRequest = { policyName, target: 'arn1' }
+
+        it('attaches a policy to a certificate', async function () {
+            mockIot.on(AttachPolicyCommand).resolves({})
+
+            await createClient().attachPolicy(input)
+
+            assert.strictEqual(mockIot.commandCalls(AttachPolicyCommand).length, 1)
+            assert.deepStrictEqual(mockIot.commandCalls(AttachPolicyCommand)[0].args[0].input, input)
+        })
+
+        it('throws an Error on failure', async function () {
+            mockIot.on(AttachPolicyCommand).rejects(error)
+
+            await assert.rejects(createClient().attachPolicy(input), error)
+        })
+    })
+
+    describe('detachPolicy', function () {
+        const input: DetachPolicyRequest = { policyName, target: 'arn1' }
+
+        it('detaches a policy from a certificate', async function () {
+            mockIot.on(DetachPolicyCommand).resolves({})
+
+            await createClient().detachPolicy(input)
+
+            assert.strictEqual(mockIot.commandCalls(DetachPolicyCommand).length, 1)
+            assert.deepStrictEqual(mockIot.commandCalls(DetachPolicyCommand)[0].args[0].input, input)
+        })
+
+        it('throws an Error on failure', async function () {
+            mockIot.on(DetachPolicyCommand).rejects(error)
+
+            await assert.rejects(createClient().detachPolicy(input), error)
+        })
+    })
+
+    describe('createPolicy', function () {
+        const input: CreatePolicyRequest = { policyName, policyDocument }
+        const expectedResponse: CreatePolicyResponse = { policyName, policyDocument, policyArn: 'arn1' }
+
+        it('creates a policy from a document', async function () {
+            mockIot.on(CreatePolicyCommand).resolves(expectedResponse)
+
+            await createClient().createPolicy(input)
+
+            assert.strictEqual(mockIot.commandCalls(CreatePolicyCommand).length, 1)
+            assert.deepStrictEqual(mockIot.commandCalls(CreatePolicyCommand)[0].args[0].input, input)
+        })
+
+        it('throws an Error on failure', async function () {
+            mockIot.on(CreatePolicyCommand).rejects(error)
+
+            await assert.rejects(createClient().createPolicy(input), error)
+        })
+    })
+
+    describe('deletePolicy', function () {
+        const input: DeletePolicyRequest = { policyName }
+
+        it('deletes a policy', async function () {
+            mockIot.on(DeletePolicyCommand).resolves({})
+
+            await createClient().deletePolicy(input)
+
+            assert.strictEqual(mockIot.commandCalls(DeletePolicyCommand).length, 1)
+            assert.deepStrictEqual(mockIot.commandCalls(DeletePolicyCommand)[0].args[0].input, input)
+        })
+
+        it('throws an Error on failure', async function () {
+            mockIot.on(DeletePolicyCommand).rejects(error)
+
+            await assert.rejects(createClient().deletePolicy(input), error)
+        })
+    })
+
+    describe('createPolicyVersion', function () {
+        const input: CreatePolicyVersionRequest = { policyName, policyDocument }
+        const expectedResponse: CreatePolicyVersionResponse = { policyDocument, policyArn: 'arn1' }
+
+        it('creates a policy version from a document', async function () {
+            mockIot.on(CreatePolicyVersionCommand).resolves(expectedResponse)
+
+            await createClient().createPolicyVersion(input)
+
+            assert.strictEqual(mockIot.commandCalls(CreatePolicyVersionCommand).length, 1)
+            assert.deepStrictEqual(mockIot.commandCalls(CreatePolicyVersionCommand)[0].args[0].input, input)
+        })
+
+        it('throws an Error on failure', async function () {
+            mockIot.on(CreatePolicyVersionCommand).rejects(error)
+
+            await assert.rejects(createClient().createPolicyVersion(input), error)
+        })
+    })
+
+    describe('deletePolicyVersion', function () {
+        const input: DeletePolicyVersionRequest = { policyName, policyVersionId: '1' }
+
+        it('deletes a policy version', async function () {
+            mockIot.on(DeletePolicyVersionCommand).resolves({})
+
+            await createClient().deletePolicyVersion(input)
+
+            assert.strictEqual(mockIot.commandCalls(DeletePolicyVersionCommand).length, 1)
+            assert.deepStrictEqual(mockIot.commandCalls(DeletePolicyVersionCommand)[0].args[0].input, input)
+        })
+
+        it('throws an Error on failure', async function () {
+            mockIot.on(DeletePolicyVersionCommand).rejects(error)
+
+            await assert.rejects(createClient().deletePolicyVersion(input), error)
+        })
+    })
+
+    describe('setDefaultPolicyVersion', function () {
+        const input: SetDefaultPolicyVersionRequest = { policyName, policyVersionId: '1' }
+
+        it('deletes a policy version', async function () {
+            mockIot.on(SetDefaultPolicyVersionCommand).resolves({})
+
+            await createClient().setDefaultPolicyVersion(input)
+
+            assert.strictEqual(mockIot.commandCalls(SetDefaultPolicyVersionCommand).length, 1)
+            assert.deepStrictEqual(mockIot.commandCalls(SetDefaultPolicyVersionCommand)[0].args[0].input, input)
+        })
+
+        it('throws an Error on failure', async function () {
+            mockIot.on(SetDefaultPolicyVersionCommand).rejects(error)
+
+            await assert.rejects(createClient().setDefaultPolicyVersion(input), error)
+        })
+    })
+
+    // /* Functions that list resources.
+
+    describe('listThings', function () {
+        const input: ListThingsRequest = { maxResults, nextToken }
+        const expectedResponse: ListThingsResponse = { things: [{ thingName: 'thing1' }], nextToken }
+
+        it('lists things', async function () {
+            mockIot.on(ListThingsCommand).resolves(expectedResponse)
+
+            const response = await createClient().listThings(input)
+
+            assert.deepStrictEqual(response, expectedResponse)
+        })
+
+        it('throws an Error on failure', async function () {
+            mockIot.on(ListThingsCommand).rejects(error)
+
+            await assert.rejects(createClient().listThings(input), error)
+        })
+    })
+
+    describe('listCertificates', function () {
+        const input: ListCertificatesRequest = { pageSize, marker, ascendingOrder: undefined }
+        const expectedResponse: ListCertificatesResponse = {
+            certificates: [{ certificateId: 'cert1' }],
+            nextMarker: marker,
+        }
+
+        it('lists certificates', async function () {
+            mockIot.on(ListCertificatesCommand).resolves(expectedResponse)
+
+            const response = await createClient().listCertificates(input)
+
+            assert.deepStrictEqual(response, expectedResponse)
+        })
+
+        it('throws an Error on failure', async function () {
+            mockIot.on(ListCertificatesCommand).rejects(error)
+
+            await assert.rejects(createClient().listCertificates(input), error)
+        })
+    })
+
+    describe('listThingCertificates', function () {
+        const certificateId = 'cert1'
+        const certArn = 'arn:aws:iot:us-west-2:0123456789:cert/cert1'
+        const input: ListThingPrincipalsRequest = { thingName, maxResults, nextToken }
+        const principalsResponse: ListThingPrincipalsResponse = { principals: [certArn], nextToken }
+
+        const describeInput: DescribeCertificateRequest = { certificateId }
+        const describeResponse: DescribeCertificateResponse = {
+            certificateDescription: { certificateId, certificateArn: certArn },
+        }
+
+        const expectedResponse: ListThingCertificatesResponse = {
+            certificates: [{ certificateId, certificateArn: certArn }],
+            nextToken: nextToken,
+        }
+
+        it('lists certificates', async function () {
+            mockIot.on(ListThingPrincipalsCommand).resolves(principalsResponse)
+            mockIot.on(DescribeCertificateCommand).resolves(describeResponse)
+
+            const response = await createClient().listThingCertificates(input)
+
+            assert.strictEqual(mockIot.commandCalls(DescribeCertificateCommand).length, 1)
+            assert.deepStrictEqual(mockIot.commandCalls(DescribeCertificateCommand)[0].args[0].input, describeInput)
+            assert.deepStrictEqual(response, expectedResponse)
+        })
+
+        it('throws an Error when certificate listing fails', async function () {
+            mockIot.on(ListThingPrincipalsCommand).rejects(error)
+
+            await assert.rejects(createClient().listThingCertificates(input), error)
+        })
+
+        it('throws an Error when certificate description fails', async function () {
+            mockIot.on(ListThingPrincipalsCommand).resolves(principalsResponse)
+            mockIot.on(DescribeCertificateCommand).rejects(error)
+
+            await assert.rejects(createClient().listThingCertificates(input), error)
+        })
+    })
+
+    describe('listThingsForCert', function () {
+        const input: ListPrincipalThingsRequest = { principal: 'arn1', maxResults, nextToken }
+        const listResponse: ListPrincipalThingsResponse = { things: [thingName], nextToken }
+        const expectedResponse = [thingName]
+
+        it('lists things', async function () {
+            mockIot.on(ListPrincipalThingsCommand).resolves(listResponse)
+
+            const response = await createClient().listThingsForCert(input)
+
+            assert.deepStrictEqual(response, expectedResponse)
+        })
+
+        it('throws an Error on failure', async function () {
+            mockIot.on(ListPrincipalThingsCommand).rejects(error)
+
+            await assert.rejects(createClient().listThingsForCert(input), error)
+        })
+    })
+
+    describe('listPolicies', function () {
+        const input: ListPoliciesRequest = { pageSize, marker, ascendingOrder: undefined }
+        const expectedResponse: ListPoliciesResponse = { policies: [{ policyName }], nextMarker: marker }
+
+        it('lists policies', async function () {
+            mockIot.on(ListPoliciesCommand).resolves(expectedResponse)
+
+            const response = await createClient().listPolicies(input)
+
+            assert.deepStrictEqual(response, expectedResponse)
+        })
+
+        it('throws an Error on failure', async function () {
+            mockIot.on(ListPoliciesCommand).rejects(error)
+
+            await assert.rejects(createClient().listPolicies(input), error)
+        })
+    })
+
+    describe('listPrincipalPolicies', function () {
+        const input: ListPrincipalPoliciesRequest = {
+            pageSize,
+            marker,
+            ascendingOrder: undefined,
+            principal: 'arn1',
+        }
+        const expectedResponse: ListPoliciesResponse = { policies: [{ policyName }], nextMarker: marker }
+
+        it('lists policies for certificate', async function () {
+            mockIot.on(ListPrincipalPoliciesCommand).resolves(expectedResponse)
+
+            const response = await createClient().listPrincipalPolicies(input)
+
+            assert.deepStrictEqual(response, expectedResponse)
+        })
+
+        it('throws an Error on failure', async function () {
+            mockIot.on(ListPrincipalPoliciesCommand).rejects(error)
+
+            await assert.rejects(createClient().listPrincipalPolicies(input), error)
+        })
+    })
+
+    describe('listPolicyTargets', function () {
+        const targets = ['arn1', 'arn2']
+        const input: ListTargetsForPolicyRequest = { policyName, pageSize, marker }
+        const listResponse: ListTargetsForPolicyResponse = { targets, nextMarker: marker }
+
+        it('lists certificates', async function () {
+            mockIot.on(ListTargetsForPolicyCommand).resolves(listResponse)
+
+            const response = await createClient().listPolicyTargets(input)
+
+            assert.deepStrictEqual(response, targets)
+        })
+
+        it('throws an Error on failure', async function () {
+            mockIot.on(ListTargetsForPolicyCommand).rejects(error)
+
+            await assert.rejects(createClient().listPolicyTargets(input), error)
+        })
+    })
+
+    describe('listPolicyVersions', function () {
+        const input: ListPolicyVersionsRequest = { policyName }
+        const expectedVersion1: PolicyVersion = { versionId: '1' }
+        const expectedVersion2: PolicyVersion = { versionId: '2' }
+        const listResponse: ListPolicyVersionsResponse = { policyVersions: [expectedVersion1, expectedVersion2] }
+
+        it('lists policy versions', async function () {
+            mockIot.on(ListPolicyVersionsCommand).resolves(listResponse)
+
+            const iterable = createClient().listPolicyVersions(input)
+            const responses = []
+            for await (const response of iterable) {
+                responses.push(response)
+            }
+
+            const [firstVersion, secondVersion, ...otherVersions] = responses
+
+            assert.deepStrictEqual(firstVersion, expectedVersion1)
+            assert.deepStrictEqual(secondVersion, expectedVersion2)
+            assert.deepStrictEqual(otherVersions, [])
+        })
+
+        it('throws an Error on iterate failure', async function () {
+            mockIot.on(ListPolicyVersionsCommand).rejects(error)
+
+            const iterable = createClient().listPolicyVersions(input)
+            await assert.rejects(iterable.next(), error)
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/clients/defaultRedshiftClient.test.ts b/packages/core/src/test/shared/clients/defaultRedshiftClient.test.ts
new file mode 100644
index 00000000000..77e2fced64b
--- /dev/null
+++ b/packages/core/src/test/shared/clients/defaultRedshiftClient.test.ts
@@ -0,0 +1,171 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ClustersMessage, RedshiftClient, DescribeClustersCommand } from '@aws-sdk/client-redshift'
+import {
+    ListDatabasesResponse,
+    ListSchemasResponse,
+    RedshiftDataClient,
+    ListDatabasesCommand,
+    ListSchemasCommand,
+} from '@aws-sdk/client-redshift-data'
+import {
+    ListWorkgroupsResponse,
+    RedshiftServerlessClient,
+    ListWorkgroupsCommand,
+} from '@aws-sdk/client-redshift-serverless'
+import { DefaultRedshiftClient } from '../../../shared/clients/redshiftClient'
+import assert = require('assert')
+import { ConnectionParams, ConnectionType, RedshiftWarehouseType } from '../../../awsService/redshift/models/models'
+import { mockClient, AwsClientStub } from 'aws-sdk-client-mock'
+
+const nextToken = 'testNextToken'
+describe('DefaultRedshiftClient', function () {
+    let defaultRedshiftClient: DefaultRedshiftClient
+    let mockRedshift: AwsClientStub<RedshiftClient>
+    let mockRedshiftData: AwsClientStub<RedshiftDataClient>
+    let mockRedshiftServerless: AwsClientStub<RedshiftServerlessClient>
+    const clusterIdentifier = 'ClusterId'
+    const workgroupName = 'Workgroup'
+    const dbName = 'DB'
+    const dbUsername = 'User'
+    const provisionedDbUserAndPasswordParams = new ConnectionParams(
+        ConnectionType.TempCreds,
+        dbName,
+        clusterIdentifier,
+        RedshiftWarehouseType.PROVISIONED,
+        dbUsername
+    )
+    const serverlessFederatedParams = new ConnectionParams(
+        ConnectionType.TempCreds,
+        dbName,
+        workgroupName,
+        RedshiftWarehouseType.SERVERLESS
+    )
+    beforeEach(function () {
+        mockRedshift = mockClient(RedshiftClient)
+        mockRedshiftData = mockClient(RedshiftDataClient)
+        mockRedshiftServerless = mockClient(RedshiftServerlessClient)
+        defaultRedshiftClient = new DefaultRedshiftClient(
+            'us-east-1',
+            // @ts-expect-error
+            () => mockRedshiftData,
+            () => mockRedshift,
+            () => mockRedshiftServerless
+        )
+    })
+
+    afterEach(function () {
+        mockRedshift.reset()
+        mockRedshiftData.reset()
+        mockRedshiftServerless.reset()
+    })
+
+    describe('describeProvisionedClusters', function () {
+        const expectedResponse = { Clusters: [] } as ClustersMessage
+
+        beforeEach(function () {
+            mockRedshift.on(DescribeClustersCommand).resolves(expectedResponse)
+        })
+
+        it('without nextToken should not set Marker', async () => {
+            const response = await defaultRedshiftClient.describeProvisionedClusters()
+            const calls = mockRedshift.commandCalls(DescribeClustersCommand)
+            assert.strictEqual(calls.length, 1)
+            assert.deepStrictEqual(calls[0].args[0].input, { Marker: undefined, MaxRecords: 20 })
+            assert.deepStrictEqual(response.Clusters, [])
+        })
+
+        it('with nextToken should set the Marker', async () => {
+            const response = await defaultRedshiftClient.describeProvisionedClusters(nextToken)
+            const calls = mockRedshift.commandCalls(DescribeClustersCommand)
+            assert.strictEqual(calls.length, 1)
+            assert.deepStrictEqual(calls[0].args[0].input, { Marker: nextToken, MaxRecords: 20 })
+            assert.deepStrictEqual(response.Clusters, [])
+        })
+    })
+
+    describe('listServerlessWorkgroups', function () {
+        const expectedResponse = { workgroups: [] } as ListWorkgroupsResponse
+
+        beforeEach(function () {
+            mockRedshiftServerless.on(ListWorkgroupsCommand).resolves(expectedResponse)
+        })
+
+        it('without nextToken should not set nextToken in RedshiftServerless request', async () => {
+            const response = await defaultRedshiftClient.listServerlessWorkgroups()
+            const calls = mockRedshiftServerless.commandCalls(ListWorkgroupsCommand)
+            assert.strictEqual(calls.length, 1)
+            assert.deepStrictEqual(calls[0].args[0].input, { nextToken: undefined, maxResults: 20 })
+            assert.deepStrictEqual(response.workgroups, [])
+        })
+
+        it('with nextToken should set nextToken in RedshiftServerless request', async () => {
+            const response = await defaultRedshiftClient.listServerlessWorkgroups(nextToken)
+            const calls = mockRedshiftServerless.commandCalls(ListWorkgroupsCommand)
+            assert.strictEqual(calls.length, 1)
+            assert.deepStrictEqual(calls[0].args[0].input, { nextToken: nextToken, maxResults: 20 })
+            assert.deepStrictEqual(response.workgroups, [])
+        })
+    })
+
+    describe('listDatabases', function () {
+        const expectedResponse = { Databases: [] } as ListDatabasesResponse
+
+        beforeEach(function () {
+            mockRedshiftData.on(ListDatabasesCommand).resolves(expectedResponse)
+        })
+
+        it('should list databases for provisioned clusters', async () => {
+            const response = await defaultRedshiftClient.listDatabases(provisionedDbUserAndPasswordParams)
+            const calls = mockRedshiftData.commandCalls(ListDatabasesCommand)
+            assert.strictEqual(calls.length, 1)
+            const input = calls[0].args[0].input
+            assert.strictEqual(input.ClusterIdentifier, clusterIdentifier)
+            assert.strictEqual(input.Database, dbName)
+            assert.strictEqual(input.DbUser, dbUsername)
+            assert.deepStrictEqual(response.Databases, [])
+        })
+
+        it('should list databases for serverless workgroups', async () => {
+            const response = await defaultRedshiftClient.listDatabases(serverlessFederatedParams)
+            const calls = mockRedshiftData.commandCalls(ListDatabasesCommand)
+            assert.strictEqual(calls.length, 1)
+            const input = calls[0].args[0].input
+            assert.strictEqual(input.WorkgroupName, workgroupName)
+            assert.strictEqual(input.Database, dbName)
+            assert.deepStrictEqual(response.Databases, [])
+        })
+    })
+
+    describe('listSchemas', function () {
+        const expectedResponse = { Schemas: [] } as ListSchemasResponse
+
+        beforeEach(function () {
+            mockRedshiftData.on(ListSchemasCommand).resolves(expectedResponse)
+        })
+
+        it('should list schemas for databases in provisioned clusters', async () => {
+            const response = await defaultRedshiftClient.listSchemas(provisionedDbUserAndPasswordParams, dbName)
+            const calls = mockRedshiftData.commandCalls(ListSchemasCommand)
+            assert.strictEqual(calls.length, 1)
+            const input = calls[0].args[0].input
+            assert.strictEqual(input.ClusterIdentifier, clusterIdentifier)
+            assert.strictEqual(input.Database, dbName)
+            assert.strictEqual(input.DbUser, dbUsername)
+            assert.deepStrictEqual(response.Schemas, [])
+        })
+
+        it('should list schemas for databases in serverless workgroups', async () => {
+            const response = await defaultRedshiftClient.listSchemas(serverlessFederatedParams, dbName)
+            const calls = mockRedshiftData.commandCalls(ListSchemasCommand)
+            assert.strictEqual(calls.length, 1)
+            const input = calls[0].args[0].input
+            assert.strictEqual(input.WorkgroupName, workgroupName)
+            assert.strictEqual(input.Database, dbName)
+            assert.deepStrictEqual(response.Schemas, [])
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/clients/defaultS3Client.test.ts b/packages/core/src/test/shared/clients/defaultS3Client.test.ts
new file mode 100644
index 00000000000..1bac5b9aada
--- /dev/null
+++ b/packages/core/src/test/shared/clients/defaultS3Client.test.ts
@@ -0,0 +1,265 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { FileStreams } from '../../../shared/utilities/streamUtilities'
+import {
+    DefaultFolder,
+    ListObjectVersionsResponse,
+    ListObjectVersionsRequest,
+    S3Client,
+    toFile,
+    toBucket,
+} from '../../../shared/clients/s3'
+import { DEFAULT_MAX_KEYS } from '../../../shared/clients/s3'
+import { FakeFileStreams } from './fakeFileStreams'
+import globals from '../../../shared/extensionGlobals'
+import {
+    Bucket,
+    ListObjectsV2Output,
+    ListObjectVersionsCommandInput,
+    ListObjectVersionsOutput,
+} from '@aws-sdk/client-s3'
+import { Progress } from '@aws-sdk/lib-storage'
+import { intoCollection } from '../../../shared/utilities/collectionUtils'
+import { AsyncCollection } from '../../../shared/utilities/asyncCollection'
+
+class FakeProgressCaptor {
+    public progress = 0
+    public lastUpdateAmount = 0
+
+    public listener(): (loadedBytes: number) => void {
+        return (loadedBytes) => {
+            this.progress += loadedBytes
+            this.lastUpdateAmount = loadedBytes
+        }
+    }
+}
+
+class FakeUploader {
+    private progressListeners: ((progress: Progress) => void)[] = []
+
+    emitProgress(p: Progress) {
+        for (const listener of this.progressListeners) {
+            listener(p)
+        }
+    }
+
+    on(_event: 'httpUploadProgress', listener: (progress: Progress) => void) {
+        this.progressListeners.push(listener)
+    }
+}
+
+describe('DefaultS3Client', function () {
+    const partition = 'aws'
+    const region = 'us-west-2'
+    const bucketName = 'bucketName'
+    const folderPath = 'foo/bar/'
+    const folderVersionId = 'folderVersionId'
+    const subFolderPath = 'foo/bar/subFolder/'
+    const emptySubFolderPath = 'foo/bar//'
+    const fileKey = 'foo/bar/file.jpg'
+    const fileVersionId = 'fileVersionId'
+    const fileSizeBytes = 5
+    const fileLastModified = new Date(2020, 5, 4)
+    const nextContinuationToken = 'nextContinuationToken'
+    const nextKeyMarker = 'nextKeyMarker'
+    const nextVersionIdMarker = 'nextVersionIdMarker'
+    const bucket = toBucket(bucketName, region, partition)
+    class ListObjectVersionsFixtures {
+        public readonly firstPageRequest: ListObjectVersionsCommandInput = {
+            Bucket: bucketName,
+            MaxKeys: DEFAULT_MAX_KEYS,
+            KeyMarker: undefined,
+            VersionIdMarker: undefined,
+        }
+
+        public readonly firstPageResponse: ListObjectVersionsOutput = {
+            Versions: [
+                { Key: folderPath, VersionId: folderVersionId },
+                { Key: fileKey, VersionId: fileVersionId },
+            ],
+            IsTruncated: true,
+            NextKeyMarker: nextKeyMarker,
+            NextVersionIdMarker: nextVersionIdMarker,
+        }
+
+        public readonly secondPageRequest: ListObjectVersionsCommandInput = {
+            Bucket: bucketName,
+            MaxKeys: DEFAULT_MAX_KEYS,
+            KeyMarker: nextKeyMarker,
+            VersionIdMarker: nextVersionIdMarker,
+        }
+
+        public readonly secondPageResponse: ListObjectVersionsOutput = {
+            Versions: [{ Key: fileKey, VersionId: undefined }],
+            IsTruncated: false,
+        }
+    }
+
+    function createClient({
+        regionCode = region,
+        partitionId = partition,
+        fileStreams = new FakeFileStreams(),
+    }: { regionCode?: string; partitionId?: string; fileStreams?: FileStreams } = {}): S3Client {
+        return new S3Client(regionCode, partitionId, fileStreams)
+    }
+
+    describe('createBucket', function () {
+        it('removes the region code for us-east-1', async function () {
+            class TestS3 extends S3Client {
+                public testGetCreateBucketConfiguration() {
+                    return this.getCreateBucketConfiguration()
+                }
+            }
+            const testS3 = new TestS3('us-east-1', 'partition')
+            assert.ok(testS3.testGetCreateBucketConfiguration() === undefined)
+        })
+    })
+
+    describe('uploadFile', function () {
+        it('links the progress listener to the upload', async function () {
+            const progressCaptor = new FakeProgressCaptor()
+
+            const upload = new FakeUploader()
+            createClient().linkProgressListenerToUpload(upload, progressCaptor.listener())
+
+            upload.emitProgress({ loaded: 10 })
+            assert.strictEqual(progressCaptor.progress, 10)
+            upload.emitProgress({ loaded: 20 })
+            assert.strictEqual(progressCaptor.progress, 20)
+            assert.strictEqual(progressCaptor.lastUpdateAmount, 10)
+            upload.emitProgress({ loaded: 40 })
+            assert.strictEqual(progressCaptor.progress, 40)
+            assert.strictEqual(progressCaptor.lastUpdateAmount, 20)
+        })
+    })
+
+    describe('listBuckets', function () {
+        it('Filters buckets with no name', async function () {
+            const getBucketCollection = () =>
+                intoCollection([
+                    [{ Name: 'bucket1', BucketRegion: 'test-region' }],
+                    [{ BucketRegion: 'test-region' }],
+                ]) satisfies AsyncCollection<Bucket[]>
+            const output = await createClient().listBuckets(getBucketCollection)
+
+            assert.deepStrictEqual(output.buckets, [toBucket('bucket1', 'test-region', 'aws')])
+        })
+
+        it('Filters buckets with no region', async function () {
+            const getBucketCollection = () =>
+                intoCollection([
+                    [{ Name: 'bucket1' }],
+                    [{ Name: 'bucket2', BucketRegion: 'test-region' }],
+                ]) satisfies AsyncCollection<Bucket[]>
+            const output = await createClient().listBuckets(getBucketCollection)
+
+            assert.deepStrictEqual(output.buckets, [toBucket('bucket2', 'test-region', 'aws')])
+        })
+    })
+
+    describe('listFilesFromResponse', function () {
+        it('parses response for list of files and folders', async function () {
+            const folder = { Key: folderPath, Size: fileSizeBytes, LastModified: fileLastModified }
+            const file = { Key: fileKey, Size: fileSizeBytes, LastModified: fileLastModified }
+            const sdkResponse: ListObjectsV2Output = {
+                Contents: [folder, file],
+                CommonPrefixes: [{ Prefix: subFolderPath }, { Prefix: emptySubFolderPath }],
+                NextContinuationToken: nextContinuationToken,
+            }
+
+            const processedResponse = createClient().listFilesFromResponse(sdkResponse, bucketName, folderPath)
+
+            assert.deepStrictEqual(processedResponse, {
+                files: [toFile(bucket, file)],
+                folders: [
+                    new DefaultFolder({ partitionId: partition, bucketName, path: subFolderPath }),
+                    new DefaultFolder({ partitionId: partition, bucketName, path: emptySubFolderPath }),
+                ],
+                continuationToken: nextContinuationToken,
+            })
+        })
+    })
+
+    describe('listObjectVersions', function () {
+        const { firstPageResponse, secondPageResponse } = new ListObjectVersionsFixtures()
+
+        it('lists objects and their versions with a continuation token for the next page of results', async function () {
+            const response = createClient().processListObjectVersionsResponse(firstPageResponse)
+            assert.deepStrictEqual(response, {
+                objects: [
+                    { key: folderPath, versionId: folderVersionId },
+                    { key: fileKey, versionId: fileVersionId },
+                ],
+                continuationToken: { keyMarker: nextKeyMarker, versionIdMarker: nextVersionIdMarker },
+            })
+        })
+
+        it('returns pages from listObjectVersionsIterable', async function () {
+            const firstRsp = createClient().processListObjectVersionsResponse(firstPageResponse)
+            const secondRsp = createClient().processListObjectVersionsResponse(secondPageResponse)
+
+            const getObjectVersions: (
+                request: ListObjectVersionsRequest
+            ) => Promise<ListObjectVersionsResponse> = async (req) => {
+                return req.continuationToken === firstRsp.continuationToken ? secondRsp : firstRsp
+            }
+
+            const iterable = createClient().listObjectVersionsIterable({ bucketName }, getObjectVersions)
+
+            const responses = []
+            for await (const response of iterable) {
+                responses.push(response)
+            }
+            const [firstPage, secondPage, ...otherPages] = responses
+
+            assert.deepStrictEqual(firstPage.objects, [
+                { key: folderPath, versionId: folderVersionId },
+                { key: fileKey, versionId: fileVersionId },
+            ])
+            assert.deepStrictEqual(secondPage.objects, [{ key: fileKey, versionId: undefined }])
+            assert.deepStrictEqual(otherPages, [])
+        })
+    })
+})
+
+describe('DefaultBucket', function () {
+    it('properly constructs an instance', function () {
+        const bucket = toBucket('name', 'region', 'partitionId')
+        assert.strictEqual(bucket.Name, 'name')
+        assert.strictEqual(bucket.BucketRegion, 'region')
+        assert.strictEqual(bucket.Arn, 'arn:partitionId:s3:::name')
+    })
+})
+
+describe('DefaultFolder', function () {
+    it('properly constructs an instance', function () {
+        const folder = new DefaultFolder({
+            partitionId: 'partitionId',
+            bucketName: 'bucketName',
+            path: 'path/to/folder/',
+        })
+        assert.strictEqual(folder.name, 'folder')
+        assert.strictEqual(folder.path, 'path/to/folder/')
+        assert.strictEqual(folder.arn, 'arn:partitionId:s3:::bucketName/path/to/folder/')
+    })
+})
+
+describe('toFile', function () {
+    it('properly constructs an instance', function () {
+        const bucket = toBucket('bucketName', 'us-west-2', 'partitionId')
+        const file = toFile(bucket, {
+            Size: 1337,
+            Key: 'key/for/file.jpg',
+            LastModified: new globals.clock.Date(2020, 5, 4),
+        })
+        assert.strictEqual(file.name, 'file.jpg')
+        assert.strictEqual(file.key, 'key/for/file.jpg')
+        assert.strictEqual(file.arn, 'arn:partitionId:s3:::bucketName/key/for/file.jpg')
+        assert.strictEqual(file.lastModified?.toString(), new globals.clock.Date(2020, 5, 4).toString())
+        assert.strictEqual(file.sizeBytes, 1337)
+    })
+})
diff --git a/packages/core/src/test/shared/clients/devenvClient.test.ts b/packages/core/src/test/shared/clients/devenvClient.test.ts
new file mode 100644
index 00000000000..6401faa6212
--- /dev/null
+++ b/packages/core/src/test/shared/clients/devenvClient.test.ts
@@ -0,0 +1,96 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { SinonStub, SinonStubbedInstance, SinonStubbedMember, createSandbox, createStubInstance } from 'sinon'
+import assert from 'assert'
+import * as vscode from 'vscode'
+
+import { UserActivity } from '../../../shared/extensionUtilities'
+import { DevEnvClient, DevEnvActivity } from '../../../shared/clients/devenvClient'
+import { sleep } from '../../../shared/utilities/timeoutUtils'
+
+describe('DevEnvActivity', function () {
+    let triggerUserActivityEvent: (obj: any) => Promise<void>
+    let userActivityEvent: SinonStub<Parameters<vscode.Event<any>>, vscode.Disposable>
+    let activitySubscriber: SinonStubbedMember<(timestamp: number) => void>
+    let devEnvClientStub: SinonStubbedInstance<DevEnvClient>
+    let devEnvActivity: DevEnvActivity
+    let sandbox: sinon.SinonSandbox
+
+    before(function () {
+        sandbox = createSandbox()
+    })
+
+    beforeEach(async function () {
+        userActivityEvent = sandbox.stub(vscode.window, 'onDidChangeActiveColorTheme')
+        userActivityEvent.callsFake((throttledEventFire: (obj: any) => void) => {
+            triggerUserActivityEvent = async (obj: any) => {
+                throttledEventFire(obj)
+                // There are multiple layers of emitters firing
+                // so we wait a bit before returning. Otherwise,
+                // racecondition when waiting for activitySubscriber
+                // to be called
+                await sleep(100)
+            }
+            return {
+                dispose: sandbox.stub(),
+            }
+        })
+
+        devEnvClientStub = createStubInstance(DevEnvClient)
+
+        devEnvActivity = (await DevEnvActivity.create(
+            devEnvClientStub as unknown as DevEnvClient,
+            new UserActivity(0, [userActivityEvent])
+        ))!
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('has expected throttle delay that we send updates on user activity', function () {
+        assert.strictEqual(DevEnvActivity.activityUpdateDelay, 10_000)
+    })
+
+    it('does not allow instance to be created if activity API not working', async function () {
+        devEnvClientStub.getActivity.throws()
+        const instance = await DevEnvActivity.create(
+            devEnvClientStub as unknown as DevEnvClient,
+            new UserActivity(0, [userActivityEvent])
+        )
+        assert.strictEqual(instance, undefined)
+    })
+
+    describe('activity subscribers are properly notified', function () {
+        beforeEach(function () {
+            activitySubscriber = sandbox.stub()
+            devEnvActivity.onActivityUpdate(activitySubscriber)
+        })
+
+        it('when user activity is explicitly updated', async () => {
+            assert.strictEqual(activitySubscriber.callCount, 0)
+            await devEnvActivity.sendActivityUpdate()
+            assert.strictEqual(activitySubscriber.callCount, 1)
+        })
+
+        it('when vscode user activity event is emitted', async () => {
+            assert.strictEqual(activitySubscriber.callCount, 0)
+            devEnvActivity.setUpdateActivityOnIdeActivity(true)
+            await triggerUserActivityEvent({})
+            assert.strictEqual(activitySubscriber.callCount, 1)
+        })
+
+        it('when we discover a different activity timestamp on the server', async () => {
+            assert.strictEqual(activitySubscriber.callCount, 0)
+
+            await devEnvActivity.sendActivityUpdate(111) // We send an activity update
+            assert.strictEqual(activitySubscriber.callCount, 1)
+
+            devEnvClientStub.getActivity.resolves(222) // If we retrieve the latest activity timestamp it will be different
+            await devEnvActivity.getLatestActivity()
+            assert.strictEqual(activitySubscriber.callCount, 2)
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/clients/ec2Client.test.ts b/packages/core/src/test/shared/clients/ec2Client.test.ts
new file mode 100644
index 00000000000..d82e9148097
--- /dev/null
+++ b/packages/core/src/test/shared/clients/ec2Client.test.ts
@@ -0,0 +1,215 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { Ec2Client, instanceHasName, Ec2Reservation } from '../../../shared/clients/ec2'
+import { Filter, InstanceStateName, Reservation } from '@aws-sdk/client-ec2'
+import { intoCollection } from '../../../shared/utilities/collectionUtils'
+
+const completeReservationsList: Reservation[] = [
+    {
+        Instances: [
+            {
+                InstanceId: 'running-1',
+                Tags: [{ Key: 'Name', Value: 'name1' }],
+            },
+            {
+                InstanceId: 'stopped-2',
+                Tags: [{ Key: 'Name', Value: 'name2' }],
+            },
+        ],
+    },
+    {
+        Instances: [
+            {
+                InstanceId: 'pending-3',
+                Tags: [{ Key: 'Name', Value: 'name3' }],
+            },
+            {
+                InstanceId: 'running-4',
+                Tags: [{ Key: 'Name', Value: 'name4' }],
+            },
+        ],
+    },
+]
+
+const incompleteReservationsList: Reservation[] = [
+    {
+        Instances: [
+            {
+                InstanceId: 'running-1',
+            },
+            {
+                InstanceId: 'stopped-2',
+                Tags: [],
+            },
+        ],
+    },
+    {
+        Instances: [
+            {
+                InstanceId: 'pending-3',
+                Tags: [{ Key: 'Name', Value: 'name3' }],
+            },
+            {},
+        ],
+    },
+]
+
+const getStatus: (i: string) => Promise<InstanceStateName> = (i) =>
+    new Promise((resolve) => {
+        resolve(i.split('-')[0] as InstanceStateName)
+    })
+
+describe('updateInstancesDetail', async function () {
+    let client: Ec2Client
+    before(function () {
+        client = new Ec2Client('test-region')
+    })
+
+    it('adds appropriate status and name field to the instance', async function () {
+        const actualResult = await client
+            .patchReservations(intoCollection([completeReservationsList]), getStatus)
+            .promise()
+        const expectedResult: Ec2Reservation[][] = [
+            [
+                {
+                    Instances: [
+                        {
+                            InstanceId: 'running-1',
+                            Name: 'name1',
+                            Tags: [{ Key: 'Name', Value: 'name1' }],
+                            LastSeenStatus: 'running',
+                        },
+                        {
+                            InstanceId: 'stopped-2',
+                            Name: 'name2',
+                            Tags: [{ Key: 'Name', Value: 'name2' }],
+                            LastSeenStatus: 'stopped',
+                        },
+                    ],
+                },
+                {
+                    Instances: [
+                        {
+                            InstanceId: 'pending-3',
+                            Tags: [{ Key: 'Name', Value: 'name3' }],
+                            LastSeenStatus: 'pending',
+                            Name: 'name3',
+                        },
+                        {
+                            InstanceId: 'running-4',
+                            Tags: [{ Key: 'Name', Value: 'name4' }],
+                            Name: 'name4',
+                            LastSeenStatus: 'running',
+                        },
+                    ],
+                },
+            ],
+        ]
+
+        assert.deepStrictEqual(actualResult, expectedResult)
+    })
+
+    it('handles incomplete and missing tag fields', async function () {
+        const actualResult = await client
+            .patchReservations(intoCollection([incompleteReservationsList]), getStatus)
+            .promise()
+
+        const expectedResult: Ec2Reservation[][] = [
+            [
+                {
+                    Instances: [
+                        {
+                            InstanceId: 'running-1',
+                            LastSeenStatus: 'running',
+                        },
+                        {
+                            InstanceId: 'stopped-2',
+                            LastSeenStatus: 'stopped',
+                            Tags: [],
+                        },
+                    ],
+                },
+                {
+                    Instances: [
+                        {
+                            InstanceId: 'pending-3',
+                            Tags: [{ Key: 'Name', Value: 'name3' }],
+                            LastSeenStatus: 'pending',
+                            Name: 'name3',
+                        },
+                    ],
+                },
+            ],
+        ]
+
+        assert.deepStrictEqual(actualResult, expectedResult)
+    })
+})
+
+describe('getInstancesFilter', function () {
+    const client = new Ec2Client('')
+
+    it('returns proper filter when given instanceId', function () {
+        const testInstanceId1 = 'test'
+        const actualFilters1 = client.getInstancesFilter([testInstanceId1])
+        const expectedFilters1: Filter[] = [
+            {
+                Name: 'instance-id',
+                Values: [testInstanceId1],
+            },
+        ]
+
+        assert.deepStrictEqual(expectedFilters1, actualFilters1)
+
+        const testInstanceId2 = 'test2'
+        const actualFilters2 = client.getInstancesFilter([testInstanceId1, testInstanceId2])
+        const expectedFilters2: Filter[] = [
+            {
+                Name: 'instance-id',
+                Values: [testInstanceId1, testInstanceId2],
+            },
+        ]
+
+        assert.deepStrictEqual(expectedFilters2, actualFilters2)
+    })
+})
+
+describe('instanceHasName', function () {
+    it('returns whether or not there is name attached to instance', function () {
+        const instances = [
+            { InstanceId: 'id1', Tags: [] },
+            { InstanceId: 'id2', name: 'name2', Tags: [{ Key: 'Name', Value: 'name2' }] },
+            { InstanceId: 'id3', Tags: [{ Key: 'NotName', Value: 'notAName' }] },
+            {
+                InstanceId: 'id4',
+                name: 'name4',
+                Tags: [
+                    { Key: 'Name', Value: 'name4' },
+                    { Key: 'anotherKey', Value: 'Another Key' },
+                ],
+            },
+        ]
+
+        assert.deepStrictEqual(false, instanceHasName(instances[0]))
+        assert.deepStrictEqual(true, instanceHasName(instances[1]))
+        assert.deepStrictEqual(false, instanceHasName(instances[2]))
+        assert.deepStrictEqual(true, instanceHasName(instances[3]))
+    })
+})
+
+describe('ensureInstanceNotInStatus', async function () {
+    it('only throws error if instance is in status', async function () {
+        const client = new Ec2Client('test-region')
+
+        await client.assertNotInStatus('stopped-instance', 'running', getStatus)
+
+        try {
+            await client.assertNotInStatus('running-instance', 'running', getStatus)
+            assert.ok(false)
+        } catch {}
+    })
+})
diff --git a/src/test/shared/clients/fakeFileStreams.ts b/packages/core/src/test/shared/clients/fakeFileStreams.ts
similarity index 91%
rename from src/test/shared/clients/fakeFileStreams.ts
rename to packages/core/src/test/shared/clients/fakeFileStreams.ts
index 61638000f73..420375c5c1d 100644
--- a/src/test/shared/clients/fakeFileStreams.ts
+++ b/packages/core/src/test/shared/clients/fakeFileStreams.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -34,7 +34,7 @@ export class FakeFileStreams implements FileStreams {
             read() {
                 this.push(readData)
                 // MUST be null or else it will not stop reading
-                // eslint-disable-next-line no-null/no-null
+                // eslint-disable-next-line unicorn/no-null
                 this.push(null)
             },
         })
@@ -67,7 +67,7 @@ export class FakeFileStreams implements FileStreams {
             read() {
                 this.push(data)
                 // MUST be null or else it will not stop reading
-                // eslint-disable-next-line no-null/no-null
+                // eslint-disable-next-line unicorn/no-null
                 this.push(null)
             },
         })
diff --git a/packages/core/src/test/shared/clients/iamClient.test.ts b/packages/core/src/test/shared/clients/iamClient.test.ts
new file mode 100644
index 00000000000..87f33710631
--- /dev/null
+++ b/packages/core/src/test/shared/clients/iamClient.test.ts
@@ -0,0 +1,56 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import { IamClient } from '../../../shared/clients/iam'
+import { SimulatePolicyResponse, SimulatePrincipalPolicyRequest } from '@aws-sdk/client-iam'
+
+describe('iamClient', function () {
+    describe('getDeniedActions', async function () {
+        const iamClient: IamClient = new IamClient('us-west-2')
+        const request: SimulatePrincipalPolicyRequest = {
+            PolicySourceArn: 'taskRoleArn1234',
+            ActionNames: ['example:permission'],
+        }
+        const correctPermissionsResponse: SimulatePolicyResponse = {
+            EvaluationResults: [{ EvalActionName: 'example:permission', EvalDecision: 'allowed' }],
+        }
+        const incorrectPermissionsResponse: SimulatePolicyResponse = {
+            EvaluationResults: [{ EvalActionName: 'example:permission', EvalDecision: 'explicitDeny' }],
+        }
+        const organizationsDenyPermissionsResponse: SimulatePolicyResponse = {
+            EvaluationResults: [
+                {
+                    EvalActionName: 'example:permission',
+                    EvalDecision: 'implicitDeny',
+                    OrganizationsDecisionDetail: { AllowedByOrganizations: false },
+                },
+            ],
+        }
+
+        afterEach(function () {
+            sinon.restore()
+        })
+
+        it('returns incorrect task permissions', async function () {
+            sinon.stub(iamClient, 'simulatePrincipalPolicy').resolves(incorrectPermissionsResponse)
+            assert.deepStrictEqual(
+                await iamClient.getDeniedActions(request),
+                incorrectPermissionsResponse.EvaluationResults
+            )
+        })
+
+        it('does not return correct task permissions', async function () {
+            sinon.stub(iamClient, 'simulatePrincipalPolicy').resolves(correctPermissionsResponse)
+            assert.deepStrictEqual(await iamClient.getDeniedActions(request), [])
+        })
+
+        it('does not return possibly false organizational implicitDeny', async function () {
+            sinon.stub(iamClient, 'simulatePrincipalPolicy').resolves(organizationsDenyPermissionsResponse)
+            assert.deepStrictEqual(await iamClient.getDeniedActions(request), [])
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/clients/sagemakerClient.test.ts b/packages/core/src/test/shared/clients/sagemakerClient.test.ts
new file mode 100644
index 00000000000..379cce02d3a
--- /dev/null
+++ b/packages/core/src/test/shared/clients/sagemakerClient.test.ts
@@ -0,0 +1,389 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+import * as assert from 'assert'
+import { SagemakerClient } from '../../../shared/clients/sagemaker'
+import { AppDetails, SpaceDetails, DescribeDomainCommandOutput, AppType } from '@aws-sdk/client-sagemaker'
+import { DescribeDomainResponse } from '@amzn/sagemaker-client'
+import { intoCollection } from '../../../shared/utilities/collectionUtils'
+import { ToolkitError } from '../../../shared/errors'
+import { getTestWindow } from '../vscode/window'
+
+describe('SagemakerClient.fetchSpaceAppsAndDomains', function () {
+    const region = 'test-region'
+    let client: SagemakerClient
+    let listAppsStub: sinon.SinonStub
+
+    const appDetails: AppDetails[] = [
+        { AppName: 'app1', DomainId: 'domain1', SpaceName: 'space1', AppType: 'CodeEditor' },
+        { AppName: 'app2', DomainId: 'domain2', SpaceName: 'space2', AppType: 'CodeEditor' },
+        { AppName: 'app3', DomainId: 'domain2', SpaceName: 'space3', AppType: 'JupyterLab' },
+    ]
+
+    const spaceDetails: SpaceDetails[] = [
+        { SpaceName: 'space1', DomainId: 'domain1' },
+        { SpaceName: 'space2', DomainId: 'domain2' },
+        { SpaceName: 'space3', DomainId: 'domain2' },
+        { SpaceName: 'space4', DomainId: 'domain3' },
+    ]
+
+    const domain1: DescribeDomainResponse = { DomainId: 'domain1', DomainName: 'domainName1' }
+    const domain2: DescribeDomainResponse = { DomainId: 'domain2', DomainName: 'domainName2' }
+    const domain3: DescribeDomainResponse = {
+        DomainId: 'domain3',
+        DomainName: 'domainName3',
+        DomainSettings: { UnifiedStudioSettings: { DomainId: 'unifiedStudioDomain1' } },
+    }
+
+    beforeEach(function () {
+        client = new SagemakerClient(region)
+
+        listAppsStub = sinon.stub(client, 'listApps').returns(intoCollection([appDetails]))
+        sinon.stub(client, 'listSpaces').returns(intoCollection([spaceDetails]))
+        sinon.stub(client, 'describeDomain').callsFake(async ({ DomainId }) => {
+            switch (DomainId) {
+                case 'domain1':
+                    return domain1 as DescribeDomainCommandOutput
+                case 'domain2':
+                    return domain2 as DescribeDomainCommandOutput
+                case 'domain3':
+                    return domain3 as DescribeDomainCommandOutput
+                default:
+                    return {} as DescribeDomainCommandOutput
+            }
+        })
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    it('returns a map of space details with corresponding app details', async function () {
+        const [spaceApps, domains] = await client.fetchSpaceAppsAndDomains()
+
+        assert.strictEqual(spaceApps.size, 3)
+        assert.strictEqual(domains.size, 3)
+
+        const spaceAppKey1 = 'domain1__space1'
+        const spaceAppKey2 = 'domain2__space2'
+        const spaceAppKey3 = 'domain2__space3'
+
+        assert.ok(spaceApps.has(spaceAppKey1), 'Expected spaceApps to have key for domain1__space1')
+        assert.ok(spaceApps.has(spaceAppKey2), 'Expected spaceApps to have key for domain2__space2')
+        assert.ok(spaceApps.has(spaceAppKey3), 'Expected spaceApps to have key for domain2__space3')
+
+        assert.deepStrictEqual(spaceApps.get(spaceAppKey1)?.App?.AppName, 'app1')
+        assert.deepStrictEqual(spaceApps.get(spaceAppKey2)?.App?.AppName, 'app2')
+        assert.deepStrictEqual(spaceApps.get(spaceAppKey3)?.App?.AppName, 'app3')
+
+        const domainKey1 = 'domain1'
+        const domainKey2 = 'domain2'
+
+        assert.ok(domains.has(domainKey1), 'Expected domains to have key for domain1')
+        assert.ok(domains.has(domainKey2), 'Expected domains to have key for domain2')
+
+        assert.deepStrictEqual(domains.get(domainKey1)?.DomainName, 'domainName1')
+        assert.deepStrictEqual(domains.get(domainKey2)?.DomainName, 'domainName2')
+    })
+
+    it('returns map even if some spaces have no matching apps', async function () {
+        listAppsStub.returns(intoCollection([{ AppName: 'app1', DomainId: 'domain1', SpaceName: 'space1' }]))
+
+        const [spaceApps] = await client.fetchSpaceAppsAndDomains()
+
+        const spaceAppKey2 = 'domain2__space2'
+        const spaceAppKey3 = 'domain2__space3'
+
+        assert.strictEqual(spaceApps.size, 3)
+        assert.strictEqual(spaceApps.get(spaceAppKey2)?.App, undefined)
+        assert.strictEqual(spaceApps.get(spaceAppKey3)?.App, undefined)
+    })
+
+    it('filters out unified studio domains when filterSmusDomains is true', async function () {
+        const [spaceApps] = await client.fetchSpaceAppsAndDomains(undefined, true)
+
+        assert.strictEqual(spaceApps.size, 3)
+        assert.ok(!spaceApps.has('domain3__space4'))
+    })
+
+    it('includes unified studio domains when filterSmusDomains is false', async function () {
+        const [spaceApps] = await client.fetchSpaceAppsAndDomains(undefined, false)
+
+        assert.strictEqual(spaceApps.size, 4)
+        assert.ok(spaceApps.has('domain3__space4'))
+    })
+
+    it('handles AccessDeniedException and shows error message', async function () {
+        sinon.stub(client, 'listSpaceApps').rejects({ name: 'AccessDeniedException' })
+
+        await assert.rejects(client.fetchSpaceAppsAndDomains())
+
+        const messages = getTestWindow().shownMessages
+        assert.ok(messages.some((m) => m.message.includes('AccessDeniedException')))
+    })
+})
+
+describe('SagemakerClient.listSpaceApps', function () {
+    const region = 'test-region'
+    let client: SagemakerClient
+
+    const appDetails: AppDetails[] = [
+        { AppName: 'app1', DomainId: 'domain1', SpaceName: 'space1', AppType: AppType.CodeEditor },
+        { AppName: 'app2', DomainId: 'domain2', SpaceName: 'space2', AppType: AppType.JupyterLab },
+        { AppName: 'app3', DomainId: 'domain2', SpaceName: 'space3', AppType: 'Studio' as any },
+    ]
+
+    const spaceDetails: SpaceDetails[] = [
+        { SpaceName: 'space1', DomainId: 'domain1' },
+        { SpaceName: 'space2', DomainId: 'domain2' },
+        { SpaceName: 'space3', DomainId: 'domain2' },
+    ]
+
+    beforeEach(function () {
+        client = new SagemakerClient(region)
+        sinon.stub(client, 'listApps').returns(intoCollection([appDetails]))
+        sinon.stub(client, 'listSpaces').returns(intoCollection([spaceDetails]))
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    it('returns space apps with correct mapping', async function () {
+        const spaceApps = await client.listSpaceApps()
+
+        assert.strictEqual(spaceApps.size, 3)
+        assert.strictEqual(spaceApps.get('domain1__space1')?.App?.AppName, 'app1')
+        assert.strictEqual(spaceApps.get('domain2__space2')?.App?.AppName, 'app2')
+        assert.strictEqual(spaceApps.get('domain2__space3')?.App, undefined) // Studio app filtered out
+    })
+
+    it('filters by domain when domainId provided', async function () {
+        const newClient = new SagemakerClient(region)
+        const listAppsStub = sinon.stub(newClient, 'listApps').returns(intoCollection([]))
+        const listSpacesStub = sinon.stub(newClient, 'listSpaces').returns(intoCollection([]))
+
+        await newClient.listSpaceApps('domain1')
+
+        sinon.assert.calledWith(listAppsStub, { DomainIdEquals: 'domain1' })
+        sinon.assert.calledWith(listSpacesStub, { DomainIdEquals: 'domain1' })
+    })
+})
+
+describe('SagemakerClient.waitForAppInService', function () {
+    const region = 'test-region'
+    let client: SagemakerClient
+    let describeAppStub: sinon.SinonStub
+
+    beforeEach(function () {
+        client = new SagemakerClient(region)
+        describeAppStub = sinon.stub(client, 'describeApp')
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    it('resolves when app reaches InService status', async function () {
+        describeAppStub.resolves({ Status: 'InService' })
+
+        await client.waitForAppInService('domain1', 'space1', 'CodeEditor')
+
+        sinon.assert.calledOnce(describeAppStub)
+    })
+
+    it('throws error when app status is Failed', async function () {
+        describeAppStub.resolves({ Status: 'Failed' })
+
+        await assert.rejects(
+            client.waitForAppInService('domain1', 'space1', 'CodeEditor'),
+            /App failed to start. Status: Failed/
+        )
+    })
+
+    it('throws error when app status is DeleteFailed', async function () {
+        describeAppStub.resolves({ Status: 'DeleteFailed' })
+
+        await assert.rejects(
+            client.waitForAppInService('domain1', 'space1', 'CodeEditor'),
+            /App failed to start. Status: DeleteFailed/
+        )
+    })
+
+    it('times out after max retries', async function () {
+        describeAppStub.resolves({ Status: 'Pending' })
+
+        await assert.rejects(
+            client.waitForAppInService('domain1', 'space1', 'CodeEditor', 2, 10),
+            /Timed out waiting for app/
+        )
+    })
+})
+
+describe('SagemakerClient.startSpace', function () {
+    const region = 'test-region'
+    let client: SagemakerClient
+    let describeSpaceStub: sinon.SinonStub
+    let updateSpaceStub: sinon.SinonStub
+    let waitForSpaceStub: sinon.SinonStub
+    let createAppStub: sinon.SinonStub
+
+    beforeEach(function () {
+        client = new SagemakerClient(region)
+        describeSpaceStub = sinon.stub(client, 'describeSpace')
+        updateSpaceStub = sinon.stub(client, 'updateSpace')
+        waitForSpaceStub = sinon.stub<any, any>(client as any, 'waitForSpaceInService')
+        createAppStub = sinon.stub(client, 'createApp')
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    it('enables remote access and starts the app', async function () {
+        describeSpaceStub.resolves({
+            SpaceSettings: {
+                RemoteAccess: 'DISABLED',
+                AppType: 'CodeEditor',
+                CodeEditorAppSettings: {
+                    DefaultResourceSpec: {
+                        InstanceType: 'ml.t3.large',
+                        SageMakerImageArn: 'arn:aws:sagemaker:us-west-2:img',
+                        SageMakerImageVersionAlias: '1.0.0',
+                    },
+                },
+            },
+        })
+
+        updateSpaceStub.resolves({})
+        waitForSpaceStub.resolves()
+        createAppStub.resolves({})
+
+        await client.startSpace('my-space', 'my-domain')
+
+        sinon.assert.calledOnce(updateSpaceStub)
+        sinon.assert.calledOnce(waitForSpaceStub)
+        sinon.assert.calledOnce(createAppStub)
+    })
+
+    it('skips enabling remote access if already enabled', async function () {
+        describeSpaceStub.resolves({
+            SpaceSettings: {
+                RemoteAccess: 'ENABLED',
+                AppType: 'CodeEditor',
+                CodeEditorAppSettings: {
+                    DefaultResourceSpec: {
+                        InstanceType: 'ml.t3.large',
+                        SageMakerImageArn: 'arn:aws:sagemaker:us-west-2:img',
+                        SageMakerImageVersionAlias: '1.0.0',
+                    },
+                },
+            },
+        })
+
+        createAppStub.resolves({})
+
+        await client.startSpace('my-space', 'my-domain')
+
+        sinon.assert.notCalled(updateSpaceStub)
+        sinon.assert.notCalled(waitForSpaceStub)
+        sinon.assert.calledOnce(createAppStub)
+    })
+
+    it('throws error on unsupported app type', async function () {
+        describeSpaceStub.resolves({
+            SpaceSettings: {
+                RemoteAccess: 'ENABLED',
+                AppType: 'Studio',
+            },
+        })
+
+        await assert.rejects(client.startSpace('my-space', 'my-domain'), /Unsupported AppType "Studio"/)
+    })
+
+    it('uses fallback resource spec when none provided', async function () {
+        describeSpaceStub.resolves({
+            SpaceSettings: {
+                RemoteAccess: 'ENABLED',
+                AppType: 'JupyterLab',
+                JupyterLabAppSettings: {
+                    DefaultResourceSpec: {
+                        InstanceType: 'ml.t3.large',
+                    },
+                },
+            },
+        })
+
+        createAppStub.resolves({})
+
+        await client.startSpace('my-space', 'my-domain')
+
+        sinon.assert.calledOnceWithExactly(
+            createAppStub,
+            sinon.match.hasNested('ResourceSpec', {
+                InstanceType: 'ml.t3.large',
+                SageMakerImageArn: 'arn:aws:sagemaker:us-west-2:542918446943:image/sagemaker-distribution-cpu',
+                SageMakerImageVersionAlias: '3.2.0',
+            })
+        )
+    })
+
+    it('handles AccessDeniedException gracefully', async function () {
+        describeSpaceStub.rejects({ name: 'AccessDeniedException', message: 'no access' })
+
+        await assert.rejects(client.startSpace('my-space', 'my-domain'), /You do not have permission to start spaces/)
+    })
+
+    it('prompts user for insufficient memory instance type', async function () {
+        describeSpaceStub.resolves({
+            SpaceName: 'my-space',
+            SpaceSettings: {
+                RemoteAccess: 'ENABLED',
+                AppType: 'CodeEditor',
+                CodeEditorAppSettings: {
+                    DefaultResourceSpec: {
+                        InstanceType: 'ml.t3.medium', // Insufficient memory type
+                    },
+                },
+            },
+        })
+
+        createAppStub.resolves({})
+
+        const promise = client.startSpace('my-space', 'my-domain')
+
+        // Wait for the error message to appear and select "Yes"
+        await getTestWindow().waitForMessage(/not supported for remote access/)
+        getTestWindow().getFirstMessage().selectItem('Yes')
+
+        await promise
+        sinon.assert.calledOnce(updateSpaceStub)
+        sinon.assert.calledOnce(createAppStub)
+    })
+
+    it('throws error when user declines insufficient memory upgrade', async function () {
+        describeSpaceStub.resolves({
+            SpaceName: 'my-space',
+            SpaceSettings: {
+                RemoteAccess: 'ENABLED',
+                AppType: 'CodeEditor',
+                CodeEditorAppSettings: {
+                    DefaultResourceSpec: {
+                        InstanceType: 'ml.t3.medium',
+                    },
+                },
+            },
+        })
+
+        const promise = client.startSpace('my-space', 'my-domain')
+
+        // Wait for the error message to appear and select "No"
+        await getTestWindow().waitForMessage(/not supported for remote access/)
+        getTestWindow().getFirstMessage().selectItem('No')
+
+        await assert.rejects(promise, (err: ToolkitError) => err.message === 'InstanceType has insufficient memory.')
+    })
+})
diff --git a/src/test/shared/cloudformation/cloudformation.test.ts b/packages/core/src/test/shared/cloudformation/cloudformation.test.ts
similarity index 96%
rename from src/test/shared/cloudformation/cloudformation.test.ts
rename to packages/core/src/test/shared/cloudformation/cloudformation.test.ts
index fb1f82e83f1..599873ca777 100644
--- a/src/test/shared/cloudformation/cloudformation.test.ts
+++ b/packages/core/src/test/shared/cloudformation/cloudformation.test.ts
@@ -1,15 +1,14 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as path from 'path'
-import * as fs from 'fs-extra'
+import fs from '../../../shared/fs/fs'
 
-import { CloudFormation } from '../../../shared/cloudformation/cloudformation'
+import * as CloudFormation from '../../../shared/cloudformation/cloudformation'
 import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
-import { SystemUtilities } from '../../../shared/systemUtilities'
 import {
     createBaseImageResource,
     createBaseImageTemplate,
@@ -31,7 +30,21 @@ describe('CloudFormation', function () {
     })
 
     afterEach(async function () {
-        await fs.remove(filename)
+        await fs.delete(filename, { recursive: true })
+    })
+
+    it('isValidFilename()', async function () {
+        assert.deepStrictEqual(CloudFormation.isValidFilename('/foo/bar.json'), true)
+        assert.deepStrictEqual(CloudFormation.isValidFilename('/foo/bar.template'), true)
+        assert.deepStrictEqual(CloudFormation.isValidFilename('/foo/bar.yaml'), true)
+        assert.deepStrictEqual(CloudFormation.isValidFilename('/foo/template.yaml'), true)
+        assert.deepStrictEqual(CloudFormation.isValidFilename('template.yaml'), true)
+        assert.deepStrictEqual(CloudFormation.isValidFilename('template.yml'), true)
+        assert.deepStrictEqual(CloudFormation.isValidFilename('/.aws-sam/template.yaml'), true)
+        assert.deepStrictEqual(CloudFormation.isValidFilename('devfile.yml'), false)
+        assert.deepStrictEqual(CloudFormation.isValidFilename('devfile.yaml'), false)
+        assert.deepStrictEqual(CloudFormation.isValidFilename('template.yml.bk'), false)
+        assert.deepStrictEqual(CloudFormation.isValidFilename('template.txt'), false)
     })
 
     describe('load', async function () {
@@ -174,13 +187,13 @@ Resources:
     describe('save', async function () {
         it('can successfully save a file', async function () {
             await CloudFormation.save(createBaseTemplate(), filename)
-            assert.strictEqual(await SystemUtilities.fileExists(filename), true)
+            assert.strictEqual(await fs.exists(filename), true)
         })
 
         it('can successfully save a file to YAML and load the file as a CloudFormation.Template', async function () {
             const baseTemplate = createBaseTemplate()
             await CloudFormation.save(baseTemplate, filename)
-            assert.strictEqual(await SystemUtilities.fileExists(filename), true)
+            assert.strictEqual(await fs.exists(filename), true)
             const loadedYaml: CloudFormation.Template = await CloudFormation.load(filename)
             assert.deepStrictEqual(loadedYaml, baseTemplate)
         })
diff --git a/src/test/shared/cloudformation/cloudformationTestUtils.ts b/packages/core/src/test/shared/cloudformation/cloudformationTestUtils.ts
similarity index 94%
rename from src/test/shared/cloudformation/cloudformationTestUtils.ts
rename to packages/core/src/test/shared/cloudformation/cloudformationTestUtils.ts
index 8b61c3ce4a8..0f60d4bc05e 100644
--- a/src/test/shared/cloudformation/cloudformationTestUtils.ts
+++ b/packages/core/src/test/shared/cloudformation/cloudformationTestUtils.ts
@@ -1,11 +1,10 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { writeFile } from 'fs-extra'
-
-import { CloudFormation } from '../../../shared/cloudformation/cloudformation'
+import { fs } from '../../../shared'
+import * as CloudFormation from '../../../shared/cloudformation/cloudformation'
 
 export function createBaseTemplate(): CloudFormation.Template {
     return {
@@ -67,7 +66,7 @@ export function createBaseImageResource(): CloudFormation.Resource {
 }
 
 export async function strToYamlFile(str: string, file: string): Promise<void> {
-    await writeFile(file, str, 'utf8')
+    await fs.writeFile(file, str)
 }
 
 export function makeSampleSamTemplateYaml(
diff --git a/packages/core/src/test/shared/cloudformation/templateSymbolResolver.test.ts b/packages/core/src/test/shared/cloudformation/templateSymbolResolver.test.ts
new file mode 100644
index 00000000000..c60518ad0b6
--- /dev/null
+++ b/packages/core/src/test/shared/cloudformation/templateSymbolResolver.test.ts
@@ -0,0 +1,97 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import {
+    TemplateFunctionResource,
+    TemplateSymbolProvider,
+    TemplateSymbolResolver,
+} from '../../../shared/cloudformation/templateSymbolResolver'
+import { Stub, stub } from '../../utilities/stubber'
+
+const range = new vscode.Range(0, 0, 0, 0)
+
+const firstFunctionType = string('Type')
+const firstFunction = module('Function1', [firstFunctionType])
+
+const secondFunctionType = string('Type')
+const secondFunction = module('Function2', [secondFunctionType])
+
+const looksLikeFunctionType = string('Type')
+const looksLikeFunction = module('LooksLikeFunction', [looksLikeFunctionType])
+
+const symbols: vscode.DocumentSymbol[] = [
+    module('Globals'),
+    module('Resources', [
+        firstFunction,
+        module('NumberType', [number('Type')]),
+        secondFunction,
+        module('MissingType', [string('Missing')]),
+        module('AnotherResource'),
+        looksLikeFunction,
+    ]),
+]
+
+function module(name: string, children: vscode.DocumentSymbol[] = []) {
+    return symbol(name, vscode.SymbolKind.Module, children)
+}
+
+function string(name: string, children: vscode.DocumentSymbol[] = []) {
+    return symbol(name, vscode.SymbolKind.String, children)
+}
+
+function number(name: string, children: vscode.DocumentSymbol[] = []) {
+    return symbol(name, vscode.SymbolKind.Number, children)
+}
+
+function symbol(name: string, kind: vscode.SymbolKind, children: vscode.DocumentSymbol[] = []) {
+    const newSymbol = new vscode.DocumentSymbol(name, 'detail', kind, range, range)
+    newSymbol.children = children
+
+    return newSymbol
+}
+
+describe('TemplateSymbolResolver', function () {
+    let mockDocument: vscode.TextDocument
+
+    let mockSymbolProvider: Stub<TemplateSymbolProvider>
+
+    beforeEach(function () {
+        mockDocument = {} as any as vscode.TextDocument
+        mockSymbolProvider = stub(TemplateSymbolProvider)
+        mockSymbolProvider.getSymbols.resolves(symbols)
+        mockSymbolProvider.getText.callsFake((type, document) => {
+            if (type === firstFunctionType) {
+                return '"Type": "AWS::Serverless::Function"'
+            } else if (type === secondFunctionType) {
+                return 'Type: AWS::Serverless::Function'
+            } else if (type === looksLikeFunctionType) {
+                return 'Type: NotActuallyAFunction'
+            }
+            throw new Error('unexpected type for test')
+        })
+    })
+
+    it('gets function resources', async function () {
+        const symbolResolver = new TemplateSymbolResolver(mockDocument, mockSymbolProvider)
+        const functionResources = await symbolResolver.getResourcesOfKind('function', false)
+
+        const expectedResources: TemplateFunctionResource[] = [
+            {
+                name: firstFunction.name,
+                range: firstFunction.range,
+                kind: 'function',
+            },
+            {
+                name: secondFunction.name,
+                range: secondFunction.range,
+                kind: 'function',
+            },
+        ]
+
+        assert.deepStrictEqual(functionResources, expectedResources)
+    })
+})
diff --git a/src/test/shared/cloudformation/yaml/template_api_endpoint_configuration.yaml b/packages/core/src/test/shared/cloudformation/yaml/template_api_endpoint_configuration.yaml
similarity index 96%
rename from src/test/shared/cloudformation/yaml/template_api_endpoint_configuration.yaml
rename to packages/core/src/test/shared/cloudformation/yaml/template_api_endpoint_configuration.yaml
index 2bf67c1986a..8cde4f8e8f7 100644
--- a/src/test/shared/cloudformation/yaml/template_api_endpoint_configuration.yaml
+++ b/packages/core/src/test/shared/cloudformation/yaml/template_api_endpoint_configuration.yaml
@@ -15,7 +15,7 @@ Resources:
         Properties:
             CodeUri: s3://sam-demo-bucket/member_portal.zip
             Handler: index.gethtml
-            Runtime: nodejs12.x
+            Runtime: nodejs18.x
             Events:
                 GetHtml:
                     Type: Api
diff --git a/src/test/shared/cloudformation/yaml/template_api_request_model.yaml b/packages/core/src/test/shared/cloudformation/yaml/template_api_request_model.yaml
similarity index 96%
rename from src/test/shared/cloudformation/yaml/template_api_request_model.yaml
rename to packages/core/src/test/shared/cloudformation/yaml/template_api_request_model.yaml
index a236fdd7de1..15ab99f1b16 100644
--- a/src/test/shared/cloudformation/yaml/template_api_request_model.yaml
+++ b/packages/core/src/test/shared/cloudformation/yaml/template_api_request_model.yaml
@@ -6,7 +6,7 @@ Resources:
         Properties:
             CodeUri: s3://sam-demo-bucket/member_portal.zip
             Handler: index.gethtml
-            Runtime: nodejs12.x
+            Runtime: nodejs18.x
             Events:
                 GetHtml:
                     Type: Api
diff --git a/src/test/shared/cloudformation/yaml/template_no_lambdas.yaml b/packages/core/src/test/shared/cloudformation/yaml/template_no_lambdas.yaml
similarity index 89%
rename from src/test/shared/cloudformation/yaml/template_no_lambdas.yaml
rename to packages/core/src/test/shared/cloudformation/yaml/template_no_lambdas.yaml
index 6398d4237a7..26795ea6f09 100644
--- a/src/test/shared/cloudformation/yaml/template_no_lambdas.yaml
+++ b/packages/core/src/test/shared/cloudformation/yaml/template_no_lambdas.yaml
@@ -1,4 +1,4 @@
-# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
 AWSTemplateFormatVersion: '2010-09-09'
diff --git a/src/test/shared/cloudformation/yaml/template_python3.9.yaml b/packages/core/src/test/shared/cloudformation/yaml/template_python3.9.yaml
similarity index 96%
rename from src/test/shared/cloudformation/yaml/template_python3.9.yaml
rename to packages/core/src/test/shared/cloudformation/yaml/template_python3.9.yaml
index 5dc5b6a9000..24f43fff0ba 100644
--- a/src/test/shared/cloudformation/yaml/template_python3.9.yaml
+++ b/packages/core/src/test/shared/cloudformation/yaml/template_python3.9.yaml
@@ -1,4 +1,4 @@
-# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
 AWSTemplateFormatVersion: '2010-09-09'
diff --git a/src/test/shared/cloudformation/yaml/template_python_mixed.yaml b/packages/core/src/test/shared/cloudformation/yaml/template_python_mixed.yaml
similarity index 97%
rename from src/test/shared/cloudformation/yaml/template_python_mixed.yaml
rename to packages/core/src/test/shared/cloudformation/yaml/template_python_mixed.yaml
index 055caf10876..a844aa9cf47 100644
--- a/src/test/shared/cloudformation/yaml/template_python_mixed.yaml
+++ b/packages/core/src/test/shared/cloudformation/yaml/template_python_mixed.yaml
@@ -1,4 +1,4 @@
-# Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 
 AWSTemplateFormatVersion: '2010-09-09'
diff --git a/src/test/shared/codelens/codeLensUtils.test.ts b/packages/core/src/test/shared/codelens/codeLensUtils.test.ts
similarity index 98%
rename from src/test/shared/codelens/codeLensUtils.test.ts
rename to packages/core/src/test/shared/codelens/codeLensUtils.test.ts
index bce675c83f3..55bde675fe9 100644
--- a/src/test/shared/codelens/codeLensUtils.test.ts
+++ b/packages/core/src/test/shared/codelens/codeLensUtils.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as sinon from 'sinon'
 import * as vscode from 'vscode'
 import * as path from 'path'
@@ -193,7 +193,7 @@ describe('codeLensUtils', async function () {
     })
 
     describe('pickAddSamDebugConfiguration', function () {
-        it('should use CODE_TARGET_TYPE with no templateConfigs', function () {
+        it('should use CODE_TARGET_TYPE with no templateConfigs', async function () {
             const addSamStub = sandbox.stub(AddSamDebugConfiguration, 'addSamDebugConfiguration')
             const codeConfig: AddSamDebugConfiguration.AddSamDebugConfigurationInput = {
                 resourceName: 'codeResource',
@@ -201,7 +201,7 @@ describe('codeLensUtils', async function () {
             }
             const templateConfigs: AddSamDebugConfiguration.AddSamDebugConfigurationInput[] = []
 
-            codeLensUtils.pickAddSamDebugConfiguration(codeConfig, templateConfigs, false)
+            await codeLensUtils.pickAddSamDebugConfiguration(codeConfig, templateConfigs, false)
 
             assert.strictEqual(addSamStub.calledOnceWith(codeConfig, CODE_TARGET_TYPE, false), true)
         })
diff --git a/src/test/shared/codelens/csharpCodeLensProvider.test.ts b/packages/core/src/test/shared/codelens/csharpCodeLensProvider.test.ts
similarity index 97%
rename from src/test/shared/codelens/csharpCodeLensProvider.test.ts
rename to packages/core/src/test/shared/codelens/csharpCodeLensProvider.test.ts
index bb54783eb78..86db6f54796 100644
--- a/src/test/shared/codelens/csharpCodeLensProvider.test.ts
+++ b/packages/core/src/test/shared/codelens/csharpCodeLensProvider.test.ts
@@ -1,16 +1,14 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as os from 'os'
 import * as path from 'path'
-import * as fs from 'fs-extra'
 import * as vscode from 'vscode'
 import * as sampleDotNetSamProgram from './sampleDotNetSamProgram'
 
-import { writeFile } from 'fs-extra'
 import {
     DotNetLambdaHandlerComponents,
     generateDotNetLambdaHandler,
@@ -19,6 +17,7 @@ import {
     isValidLambdaHandler,
 } from '../../../shared/codelens/csharpCodeLensProvider'
 import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
+import { fs } from '../../../shared'
 
 const fakeRange = new vscode.Range(0, 0, 0, 0)
 
@@ -31,12 +30,12 @@ describe('getLambdaHandlerComponents', async function () {
     })
 
     afterEach(async function () {
-        await fs.remove(tempFolder)
+        await fs.delete(tempFolder, { recursive: true })
     })
 
     it('Detects a public function symbol', async function () {
         const programFile = path.join(tempFolder, 'program.cs')
-        await writeFile(programFile, sampleDotNetSamProgram.getFunctionText())
+        await fs.writeFile(programFile, sampleDotNetSamProgram.getFunctionText())
 
         const textDoc = await vscode.workspace.openTextDocument(programFile)
         const documentSymbols = sampleDotNetSamProgram.getDocumentSymbols()
@@ -146,7 +145,7 @@ describe('isPublicMethodSymbol', async function () {
         },
     ]
 
-    validPublicMethodTests.forEach(test => {
+    for (const test of validPublicMethodTests) {
         const sampleMethodSymbol: vscode.DocumentSymbol = new vscode.DocumentSymbol(
             'FunctionHandler(APIGatewayProxyRequest apigProxyEvent, ILambdaContext context)',
             '',
@@ -165,7 +164,7 @@ describe('isPublicMethodSymbol', async function () {
             const isPublic = isValidLambdaHandler(doc, sampleMethodSymbol)
             assert.strictEqual(isPublic, true, 'Expected symbol to be a public method')
         })
-    })
+    }
 
     it('returns false for a symbol that is not a method', async function () {
         const symbol = new vscode.DocumentSymbol(
diff --git a/src/test/shared/codelens/goCodeLensProvider.test.ts b/packages/core/src/test/shared/codelens/goCodeLensProvider.test.ts
similarity index 92%
rename from src/test/shared/codelens/goCodeLensProvider.test.ts
rename to packages/core/src/test/shared/codelens/goCodeLensProvider.test.ts
index 00d230668a4..4c828249a48 100644
--- a/src/test/shared/codelens/goCodeLensProvider.test.ts
+++ b/packages/core/src/test/shared/codelens/goCodeLensProvider.test.ts
@@ -1,16 +1,15 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as path from 'path'
-import * as fs from 'fs-extra'
 import * as vscode from 'vscode'
 
-import { writeFile } from 'fs-extra'
 import { isValidFuncSignature } from '../../../shared/codelens/goCodeLensProvider'
 import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
+import { fs } from '../../../shared'
 
 describe('getLambdaHandlerCandidates', async function () {
     let tempFolder: string
@@ -23,17 +22,17 @@ describe('getLambdaHandlerCandidates', async function () {
         programFile = path.join(tempFolder, 'program.go')
         dummyMod = path.join(tempFolder, 'go.mod')
 
-        await writeFile(programFile, getFunctionText())
-        await writeFile(dummyMod, 'require github.com/aws/aws-lambda-go v1.13.3\nmodule hello-world\ngo 1.14')
+        await fs.writeFile(programFile, getFunctionText())
+        await fs.writeFile(dummyMod, 'require github.com/aws/aws-lambda-go v1.13.3\nmodule hello-world\ngo 1.14')
     })
 
     after(async function () {
-        await fs.remove(tempFolder)
+        await fs.delete(tempFolder, { recursive: true })
     })
 
     it('Detects only good function symbols from a mock program', async function () {
         const textDoc: vscode.TextDocument = await vscode.workspace.openTextDocument(programFile)
-        const candidates: vscode.DocumentSymbol[] = getDocumentSymbols().filter(symbol =>
+        const candidates: vscode.DocumentSymbol[] = getDocumentSymbols().filter((symbol) =>
             isValidFuncSignature(textDoc, symbol)
         )
 
diff --git a/src/test/shared/codelens/javaCodeLensProvider.test.ts b/packages/core/src/test/shared/codelens/javaCodeLensProvider.test.ts
similarity index 97%
rename from src/test/shared/codelens/javaCodeLensProvider.test.ts
rename to packages/core/src/test/shared/codelens/javaCodeLensProvider.test.ts
index 0dc96d48ed1..f7d42d516b6 100644
--- a/src/test/shared/codelens/javaCodeLensProvider.test.ts
+++ b/packages/core/src/test/shared/codelens/javaCodeLensProvider.test.ts
@@ -1,10 +1,9 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
-import * as fs from 'fs-extra'
+import assert from 'assert'
 import * as os from 'os'
 import * as path from 'path'
 import * as vscode from 'vscode'
@@ -17,6 +16,7 @@ import {
 } from '../../../shared/codelens/javaCodeLensProvider'
 import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
 import * as SampleJavaSamProgram from './sampleJavaSamProgram'
+import { fs } from '../../../shared'
 
 const fakeRange = new vscode.Range(0, 0, 0, 0)
 
@@ -30,7 +30,7 @@ describe('javaCodeLensProvider', () => {
         })
 
         afterEach(async () => {
-            await fs.remove(tempFolder)
+            await fs.delete(tempFolder, { recursive: true })
         })
 
         it('Detects a public function symbol', async function () {
@@ -210,7 +210,7 @@ describe('javaCodeLensProvider', () => {
             },
         ]
 
-        validPublicMethodTests.forEach(test => {
+        for (const test of validPublicMethodTests) {
             const sampleMethodSymbol: vscode.DocumentSymbol = new vscode.DocumentSymbol(
                 'FunctionHandler(APIGatewayProxyRequest apigProxyEvent, ILambdaContext context)',
                 '',
@@ -236,7 +236,7 @@ describe('javaCodeLensProvider', () => {
                 const isValid = isValidLambdaHandler(doc, sampleMethodSymbol)
                 assert.strictEqual(isValid, true, 'Expected symbol to be a valid method')
             })
-        })
+        }
 
         it('returns false for a symbol that is not a method', async function () {
             const symbol = new vscode.DocumentSymbol(
@@ -446,7 +446,7 @@ describe('javaCodeLensProvider', () => {
         beforeArgument: boolean = false
     ): string {
         const beforeArgumentText = beforeArgument ? os.EOL : ''
-        const paramsString = params.map(curr => `${beforeArgumentText}${curr.type} ${curr.name}`).join(', ')
+        const paramsString = params.map((curr) => `${beforeArgumentText}${curr.type} ${curr.name}`).join(', ')
 
         return `${functionName}(${paramsString})`
     }
diff --git a/src/test/shared/codelens/localLambdaRunner.test.ts b/packages/core/src/test/shared/codelens/localLambdaRunner.test.ts
similarity index 95%
rename from src/test/shared/codelens/localLambdaRunner.test.ts
rename to packages/core/src/test/shared/codelens/localLambdaRunner.test.ts
index 51e8e977f36..e9e396d7a78 100644
--- a/src/test/shared/codelens/localLambdaRunner.test.ts
+++ b/packages/core/src/test/shared/codelens/localLambdaRunner.test.ts
@@ -1,19 +1,19 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as vscode from 'vscode'
-import * as fs from 'fs-extra'
 import * as fsUtils from '../../../shared/filesystemUtilities'
 import { SamCliBuildInvocation, SamCliBuildInvocationArguments } from '../../../shared/sam/cli/samCliBuild'
 import * as localLambdaRunner from '../../../shared/sam/localLambdaRunner'
-import { ChildProcessResult } from '../../../shared/utilities/childProcess'
+import { ChildProcessResult } from '../../../shared/utilities/processUtils'
 import { FakeExtensionContext } from '../../fakeExtensionContext'
 import { SamLaunchRequestArgs } from '../../../shared/sam/debugger/awsSamDebugger'
 import { assertLogsContain } from '../../globalSetup.test'
 import { ToolkitError } from '../../../shared/errors'
+import { fs } from '../../../shared'
 
 describe('localLambdaRunner', async function () {
     let tempDir: string
@@ -26,7 +26,7 @@ describe('localLambdaRunner', async function () {
     })
 
     afterEach(async function () {
-        await fs.remove(tempDir)
+        await fs.delete(tempDir, { recursive: true })
     })
 
     describe('attachDebugger', async function () {
@@ -92,7 +92,7 @@ describe('localLambdaRunner', async function () {
                     onStartDebugging: startDebuggingReturnsFalse,
                     onWillRetry,
                 })
-                .catch(e => e)
+                .catch((e) => e)
 
             assert.ok(results instanceof ToolkitError)
             assert.strictEqual(results.code, 'DebuggerRetryLimit')
diff --git a/src/test/shared/codelens/pythonCodeLensProvider.test.ts b/packages/core/src/test/shared/codelens/pythonCodeLensProvider.test.ts
similarity index 93%
rename from src/test/shared/codelens/pythonCodeLensProvider.test.ts
rename to packages/core/src/test/shared/codelens/pythonCodeLensProvider.test.ts
index 29b1031e96d..f96d75e123a 100644
--- a/src/test/shared/codelens/pythonCodeLensProvider.test.ts
+++ b/packages/core/src/test/shared/codelens/pythonCodeLensProvider.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import { getLocalRootVariants } from '../../../shared/utilities/pathUtils'
 
 describe('pythonCodeLensProvider', async function () {
@@ -24,7 +24,7 @@ describe('pythonCodeLensProvider', async function () {
                 },
             ]
 
-            testScenarios.forEach(test => {
+            for (const test of testScenarios) {
                 it(`Returns cased-drive variants for windows platforms: ${test.situation}`, async () => {
                     const variants = getLocalRootVariants(test.inputText)
                     assert.ok(variants)
@@ -32,7 +32,7 @@ describe('pythonCodeLensProvider', async function () {
                     assert.strictEqual(variants[0], test.asLower, 'Unexpected variant text')
                     assert.strictEqual(variants[1], test.asUpper, 'Unexpected variant text')
                 })
-            })
+            }
 
             it('Returns the same string for network location - windows', async function () {
                 const variants = getLocalRootVariants('//share/src/code.js')
@@ -63,14 +63,14 @@ describe('pythonCodeLensProvider', async function () {
                 },
             ]
 
-            testScenarios.forEach(test => {
+            for (const test of testScenarios) {
                 it(`Returns the same string for non-windows platforms: ${test.situation}`, async () => {
                     const variants = getLocalRootVariants(test.inputText)
                     assert.ok(variants)
                     assert.strictEqual(variants.length, 1, 'Only expected one variant')
                     assert.strictEqual(variants[0], test.inputText, 'Unexpected variant text')
                 })
-            })
+            }
         }
     })
 })
diff --git a/src/test/shared/codelens/sampleDotNetSamProgram.ts b/packages/core/src/test/shared/codelens/sampleDotNetSamProgram.ts
similarity index 97%
rename from src/test/shared/codelens/sampleDotNetSamProgram.ts
rename to packages/core/src/test/shared/codelens/sampleDotNetSamProgram.ts
index 70b56624829..c800400eb8e 100644
--- a/src/test/shared/codelens/sampleDotNetSamProgram.ts
+++ b/packages/core/src/test/shared/codelens/sampleDotNetSamProgram.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/src/test/shared/codelens/sampleJavaSamProgram.ts b/packages/core/src/test/shared/codelens/sampleJavaSamProgram.ts
similarity index 97%
rename from src/test/shared/codelens/sampleJavaSamProgram.ts
rename to packages/core/src/test/shared/codelens/sampleJavaSamProgram.ts
index 071f01b964f..e9562a49b2d 100644
--- a/src/test/shared/codelens/sampleJavaSamProgram.ts
+++ b/packages/core/src/test/shared/codelens/sampleJavaSamProgram.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/packages/core/src/test/shared/crashMonitoring.test.ts b/packages/core/src/test/shared/crashMonitoring.test.ts
new file mode 100644
index 00000000000..85ea33dfcf7
--- /dev/null
+++ b/packages/core/src/test/shared/crashMonitoring.test.ts
@@ -0,0 +1,302 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { assertTelemetry, getMetrics, partialDeepCompare, TestFolder } from '../testUtil'
+import assert from 'assert'
+import globals from '../../shared/extensionGlobals'
+import { CrashMonitoring, ExtInstance, crashMonitoringStateFactory } from '../../shared/crashMonitoring'
+import { isCI } from '../../shared/vscode/env'
+import { getLogger } from '../../shared/logger/logger'
+import { SinonSandbox, createSandbox } from 'sinon'
+import { fs, randomUUID } from '../../shared'
+import path from 'path'
+
+class TestCrashMonitoring extends CrashMonitoring {
+    public constructor(...deps: ConstructorParameters<typeof CrashMonitoring>) {
+        super(...deps)
+    }
+    /** Imitates an extension crash */
+    public async crash() {
+        this.crashChecker.testCrash()
+        this.heartbeat.testCrash()
+    }
+
+    public getTimeLag() {
+        return this.crashChecker.timeLag
+    }
+}
+
+export const crashMonitoringTest = async () => {
+    let testFolder: TestFolder
+    let spawnedExtensions: TestCrashMonitoring[]
+    let sandbox: SinonSandbox
+
+    // Scale down the default interval we heartbeat and check for crashes to something much short for testing.
+    const checkInterval = 200
+
+    // Add some buffer since after 1 interval the work is actually done, including file i/o which may be slow.
+    // **IF FLAKY**, see if increasing the buffer helps.
+    const oneInterval = checkInterval + 1000
+
+    /**
+     * Makes N "extension instances" that can be used for testing.
+     * Each instances is actually the Crash Reporting instance, but there is a
+     * 1:1 mapping between Crash Reporting instances and the Extension instances.
+     */
+    async function makeTestExtensions(amount: number) {
+        const extensions: TestExtension[] = []
+        for (let i = 0; i < amount; i++) {
+            extensions[i] = await makeTestExtension(i)
+        }
+        return extensions
+    }
+
+    async function makeTestExtension(id: number, opts?: { isStateStale: () => Promise<boolean> }) {
+        const isStateStale = opts?.isStateStale ?? (() => Promise.resolve(false))
+        const sessionId = randomUUID()
+
+        const state = await crashMonitoringStateFactory({
+            workDirPath: testFolder.path,
+            isStateStale,
+            sessionId: sessionId,
+            now: () => globals.clock.Date.now(),
+            memento: globals.globalState,
+            isDevMode: true,
+            devLogger: getLogger(),
+        })
+        const ext = new TestCrashMonitoring(state, checkInterval, true, false, getLogger())
+        spawnedExtensions.push(ext)
+        const metadata = {
+            sessionId,
+            lastHeartbeat: globals.clock.Date.now(),
+            isDebug: undefined,
+        }
+        return { ext, metadata }
+    }
+
+    beforeEach(async function () {
+        testFolder = await TestFolder.create()
+        spawnedExtensions = []
+        sandbox = createSandbox()
+    })
+
+    afterEach(async function () {
+        // clean up all running instances
+        if (spawnedExtensions) {
+            for (const e of spawnedExtensions) {
+                void e.crash()
+            }
+        }
+        sandbox.restore()
+    })
+
+    it('graceful shutdown no metric emitted', async function () {
+        const exts = await makeTestExtensions(2)
+
+        await exts[0].ext.start()
+        await awaitIntervals(oneInterval) // allow time to become primary checker
+        // There is no other active instance to report the issue
+        assertTelemetry('session_end', [])
+
+        // Ext 1 does a graceful shutdown
+        await exts[1].ext.start()
+        await exts[1].ext.shutdown()
+        await awaitIntervals(oneInterval)
+        // Ext 1 did a graceful shutdown so no metric emitted
+        assertTelemetry('session_end', [])
+    })
+
+    it('single running instance crashes, so nothing is reported, but a new instaces appears and reports', async function () {
+        const exts = await makeTestExtensions(2)
+
+        await exts[0].ext.start()
+        await exts[0].ext.crash()
+        await awaitIntervals(oneInterval)
+        // There is no other active instance to report the issue
+        assertTelemetry('session_end', [])
+
+        await exts[1].ext.start()
+        await awaitIntervals(oneInterval)
+        // Starting a new instance will detect the previously crashed one
+        assertCrashedExtensions([exts[0]])
+    })
+
+    it('multiple running instances start+crash at different times, but another instance always reports', async function () {
+        const latestCrashedExts: TestExtension[] = []
+
+        const exts = await makeTestExtensions(4)
+
+        await exts[0].ext.start()
+        await awaitIntervals(oneInterval)
+
+        // start Ext 1 then crash it, Ext 0 finds the crash
+        await exts[1].ext.start()
+        await exts[1].ext.crash()
+        latestCrashedExts.push(exts[1])
+        await awaitIntervals(oneInterval * 1)
+
+        assertCrashedExtensions(latestCrashedExts)
+
+        // start Ext 2 and crash Ext 0, Ext 2 is promoted to Primary checker
+        await exts[2].ext.start()
+        await exts[0].ext.crash()
+        latestCrashedExts.push(exts[0])
+        await awaitIntervals(oneInterval * 1)
+        assertCrashedExtensions(latestCrashedExts)
+
+        // Ext 3 starts, then crashes. Ext 2 reports the crash since it is the Primary checker
+        await exts[3].ext.start()
+        await exts[3].ext.crash()
+        latestCrashedExts.push(exts[3])
+        await awaitIntervals(oneInterval * 1)
+        assertCrashedExtensions(latestCrashedExts)
+    })
+
+    it('clears the state when a new os session is determined', async function () {
+        const exts = await makeTestExtensions(1)
+
+        // Start an extension then crash it
+        await exts[0].ext.start()
+        await exts[0].ext.crash()
+        await awaitIntervals(oneInterval)
+        // There is no other active instance to report the issue
+        assertTelemetry('session_end', [])
+
+        // This extension clears the state due to it being stale, not reporting the previously crashed ext
+        const ext1 = await makeTestExtension(1, { isStateStale: () => Promise.resolve(true) })
+        await ext1.ext.start()
+        await awaitIntervals(oneInterval * 1)
+        assertCrashedExtensions([])
+    })
+
+    it('start the first extension, then start many subsequent ones and crash them all at once', async function () {
+        const latestCrashedExts: TestExtension[] = []
+
+        const extCount = 10
+        const exts = await makeTestExtensions(extCount)
+        for (let i = 0; i < extCount; i++) {
+            await exts[i].ext.start()
+        }
+
+        // Crash all exts except the 0th one
+        for (let i = 1; i < extCount; i++) {
+            await exts[i].ext.crash()
+            latestCrashedExts.push(exts[i])
+        }
+
+        // Give some extra time since there is a lot of file i/o
+        await awaitIntervals(oneInterval * 3)
+
+        assertCrashedExtensions(latestCrashedExts)
+    })
+
+    it('does not check for crashes when there is a time lag', async function () {
+        // This test handles the case for a users computer doing a sleep+wake and
+        // then a crash was incorrectly reported since a new heartbeat could not be sent in time
+
+        // Load up a crash
+        const ext0 = await makeTestExtension(0)
+        await ext0.ext.start()
+        await ext0.ext.crash()
+
+        const ext1 = await makeTestExtension(1)
+        // Indicate that we have a time lag, and until it returns false
+        // we will skip crash checking
+        const didLagStub = sandbox.stub(ext1.ext.getTimeLag(), 'didLag')
+        didLagStub.returns(true)
+        await ext1.ext.start()
+
+        // Since we have a time lag the crash checker will not run
+        await awaitIntervals(oneInterval * 2)
+        assertCrashedExtensions([])
+
+        // Now that the time lag is true, we will check for a crash
+        didLagStub.returns(false)
+        await awaitIntervals(oneInterval)
+        assertCrashedExtensions([ext0])
+    })
+
+    /**
+     * Something like the following code can switch contexts early and the test will
+     * finish before it has completed. Certain async functions that may take longer to run
+     * can cause the issue, an example is a FileSystem call like delete().
+     *
+     * Example:
+     * ```ts
+     * globals.clock.setInterval(async () => {
+     *   await thisThing
+     *
+     *   await fs.delete(fileName)
+     *
+     *   return 'result'
+     * })
+     * ```
+     *
+     * Because of this we need be able to block and await on something so that the callback can
+     * properly finish. Separately I noticed that if this function Timeout time was too small
+     * it would not actually block, and would simply continue.
+     *
+     * In general this is related to event loop Task Queues.
+     *
+     */
+    async function awaitIntervals(milliseconds: number) {
+        await new Promise((resolve) => {
+            setTimeout(resolve, milliseconds) // The lower this is, the less the chance this function will actually block the test from continuing
+        })
+    }
+
+    function assertCrashedExtensions(expectedExts: TestExtension[]) {
+        const allSessionEnds = getMetrics('session_end')
+
+        const deduplicatedSessionEnds = deduplicate(
+            [...allSessionEnds],
+            (a, b) => a.proxiedSessionId === b.proxiedSessionId
+        )
+        assert.strictEqual(deduplicatedSessionEnds.length, expectedExts.length)
+
+        expectedExts.sort((a, b) => a.metadata.sessionId.localeCompare(b.metadata.sessionId))
+        deduplicatedSessionEnds.sort((a, b) => a.proxiedSessionId!.localeCompare(b.proxiedSessionId!))
+
+        for (const [i, ext] of expectedExts.entries()) {
+            partialDeepCompare(deduplicatedSessionEnds[i], {
+                result: 'Failed',
+                proxiedSessionId: ext.metadata.sessionId,
+                reason: 'ExtHostCrashed',
+            })
+        }
+    }
+
+    function deduplicate<T>(array: T[], predicate: (a: T, b: T) => boolean): T[] {
+        return array.filter((item, index, self) => index === self.findIndex((t) => predicate(item, t)))
+    }
+
+    describe('FileSystemState', async function () {
+        it('ignores irrelevant files in state', async function () {
+            const state = await crashMonitoringStateFactory({
+                workDirPath: testFolder.path,
+                isStateStale: () => Promise.resolve(false),
+                sessionId: randomUUID(),
+                now: () => globals.clock.Date.now(),
+                memento: globals.globalState,
+                isDevMode: true,
+                devLogger: getLogger(),
+            })
+            const stateDirPath = state.stateDirPath
+
+            assert.deepStrictEqual((await fs.readdir(stateDirPath)).length, 0)
+            await fs.writeFile(path.join(stateDirPath, 'ignoreMe.json'), '')
+            await fs.mkdir(path.join(stateDirPath, 'ignoreMe'))
+            await state.sendHeartbeat() // creates a relevant file in the state
+            assert.deepStrictEqual((await fs.readdir(stateDirPath)).length, 3)
+
+            const result = await state.getAllExts()
+            assert.deepStrictEqual(result.length, 1)
+        })
+    })
+}
+// This test is slow, so we only want to run it locally and not in CI. It will be run in the integ CI tests though.
+;(isCI() ? describe.skip : describe)('CrashReporting', crashMonitoringTest)
+
+type TestExtension = { ext: TestCrashMonitoring; metadata: ExtInstance }
diff --git a/src/test/shared/credentials/credentialsProfileMru.test.ts b/packages/core/src/test/shared/credentials/credentialsProfileMru.test.ts
similarity index 76%
rename from src/test/shared/credentials/credentialsProfileMru.test.ts
rename to packages/core/src/test/shared/credentials/credentialsProfileMru.test.ts
index 7c574ddce48..fc7b6bac405 100644
--- a/src/test/shared/credentials/credentialsProfileMru.test.ts
+++ b/packages/core/src/test/shared/credentials/credentialsProfileMru.test.ts
@@ -1,15 +1,14 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import { CredentialsProfileMru } from '../../../shared/credentials/credentialsProfileMru'
-import { FakeExtensionContext } from '../../fakeExtensionContext'
 
 describe('CredentialsProfileMru', function () {
     it('lists no profile when none exist', async function () {
-        const credentialsMru = new CredentialsProfileMru(await FakeExtensionContext.create())
+        const credentialsMru = new CredentialsProfileMru()
 
         const mru = credentialsMru.getMruList()
 
@@ -18,7 +17,7 @@ describe('CredentialsProfileMru', function () {
     })
 
     it('lists single profile when only one exists', async function () {
-        const credentialsMru = new CredentialsProfileMru(await FakeExtensionContext.create())
+        const credentialsMru = new CredentialsProfileMru()
 
         await credentialsMru.setMostRecentlyUsedProfile('apples')
 
@@ -30,7 +29,7 @@ describe('CredentialsProfileMru', function () {
     })
 
     it('lists multiple profiles when multiple exist', async function () {
-        const credentialsMru = new CredentialsProfileMru(await FakeExtensionContext.create())
+        const credentialsMru = new CredentialsProfileMru()
 
         await credentialsMru.setMostRecentlyUsedProfile('dogs')
         await credentialsMru.setMostRecentlyUsedProfile('cats')
@@ -44,7 +43,7 @@ describe('CredentialsProfileMru', function () {
     })
 
     it('does not list duplicate profiles', async function () {
-        const credentialsMru = new CredentialsProfileMru(await FakeExtensionContext.create())
+        const credentialsMru = new CredentialsProfileMru()
 
         await credentialsMru.setMostRecentlyUsedProfile('bbq')
         await credentialsMru.setMostRecentlyUsedProfile('dill')
@@ -61,7 +60,7 @@ describe('CredentialsProfileMru', function () {
     })
 
     it('does not list more than MAX_CRENDTIAL_MRU_SIZE profiles', async function () {
-        const credentialsMru = new CredentialsProfileMru(await FakeExtensionContext.create())
+        const credentialsMru = new CredentialsProfileMru()
 
         for (let i = 0; i < CredentialsProfileMru.maxCredentialMruSize + 1; i++) {
             await credentialsMru.setMostRecentlyUsedProfile(`entry${i}`)
diff --git a/src/test/shared/credentials/credentialsStore.test.ts b/packages/core/src/test/shared/credentials/credentialsStore.test.ts
similarity index 94%
rename from src/test/shared/credentials/credentialsStore.test.ts
rename to packages/core/src/test/shared/credentials/credentialsStore.test.ts
index 1f466a1687d..1b85d785161 100644
--- a/src/test/shared/credentials/credentialsStore.test.ts
+++ b/packages/core/src/test/shared/credentials/credentialsStore.test.ts
@@ -1,13 +1,13 @@
 /*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as sinon from 'sinon'
-import { CredentialsStore } from '../../../credentials/credentialsStore'
+import { CredentialsStore } from '../../../auth/credentials/store'
 import { Credentials } from '@aws-sdk/types'
-import { CredentialsProvider, CredentialsId, asString } from '../../../credentials/providers/credentials'
+import { CredentialsProvider, CredentialsId, asString } from '../../../auth/providers/credentials'
 
 describe('CredentialsStore', async function () {
     let sandbox: sinon.SinonSandbox
@@ -39,6 +39,7 @@ describe('CredentialsStore', async function () {
         return {
             getCredentials: async () => testCredentials,
             getHashCode: () => credentialsHashCode,
+            getEndpointUrl: () => undefined,
         } as unknown as CredentialsProvider
     }
 
diff --git a/src/test/shared/credentials/defaultCredentialSelectionDataProvider.test.ts b/packages/core/src/test/shared/credentials/defaultCredentialSelectionDataProvider.test.ts
similarity index 95%
rename from src/test/shared/credentials/defaultCredentialSelectionDataProvider.test.ts
rename to packages/core/src/test/shared/credentials/defaultCredentialSelectionDataProvider.test.ts
index 2920d50c7cb..cda6652e421 100644
--- a/src/test/shared/credentials/defaultCredentialSelectionDataProvider.test.ts
+++ b/packages/core/src/test/shared/credentials/defaultCredentialSelectionDataProvider.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import { QuickPickItem } from 'vscode'
 import { CredentialSelectionDataProvider } from '../../../shared/credentials/credentialSelectionDataProvider'
 import { CredentialSelectionState } from '../../../shared/credentials/credentialSelectionState'
@@ -25,7 +25,7 @@ describe('defaultCredentialSelectionDataProvider', function () {
                     actions: QuickPickItem[],
                     partialState: Partial<CredentialSelectionState>
                 ): Promise<QuickPickItem> {
-                    return new Promise<QuickPickItem>(resolve => {
+                    return new Promise<QuickPickItem>((resolve) => {
                         resolve({ label: this.existingProfileNames[1] })
                     })
                 }
@@ -107,9 +107,8 @@ describe('defaultCredentialSelectionDataProvider', function () {
             const profileNames: string[] = ['profile1', 'profile2', 'profile3']
 
             const dataProvider = new MockCredentialSelectionDataProvider(profileNames)
-            const credentialState: CredentialSelectionState | undefined = await promptToDefineCredentialsProfile(
-                dataProvider
-            )
+            const credentialState: CredentialSelectionState | undefined =
+                await promptToDefineCredentialsProfile(dataProvider)
 
             assert(credentialState)
             assert(credentialState!.accesskey)
diff --git a/packages/core/src/test/shared/credentials/loginManager.test.ts b/packages/core/src/test/shared/credentials/loginManager.test.ts
new file mode 100644
index 00000000000..2fdf6b5d14e
--- /dev/null
+++ b/packages/core/src/test/shared/credentials/loginManager.test.ts
@@ -0,0 +1,277 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as AWS from '@aws-sdk/types'
+import assert from 'assert'
+import * as sinon from 'sinon'
+import { LoginManager } from '../../../auth/deprecated/loginManager'
+import { CredentialsProvider, CredentialsId } from '../../../auth/providers/credentials'
+import { CredentialsProviderManager } from '../../../auth/providers/credentialsProviderManager'
+import { AwsContext } from '../../../shared/awsContext'
+import { CredentialsStore } from '../../../auth/credentials/store'
+import { assertTelemetryCurried } from '../../testUtil'
+import { DefaultStsClient, GetCallerIdentityResponse } from '../../../shared/clients/stsClient'
+import globals from '../../../shared/extensionGlobals'
+import { localStackConnectionHeader, localStackConnectionString } from '../../../auth/utils'
+
+describe('LoginManager', async function () {
+    let sandbox: sinon.SinonSandbox
+
+    const awsContext = {
+        setCredentials: () => {
+            throw new Error('This test was not initialized')
+        },
+        getExplorerRegions: () => [],
+    } as any as AwsContext
+    const sampleCredentials = {} as any as AWS.Credentials
+    const sampleCredentialsId: CredentialsId = {
+        credentialSource: 'profile',
+        credentialTypeId: 'someId',
+    }
+    const credentialType = 'staticProfile'
+    const credentialSourceId = 'sharedCredentials'
+
+    const credentialsStore = new CredentialsStore()
+
+    let loginManager: LoginManager
+    let credentialsProvider: CredentialsProvider
+    let getAccountIdStub: sinon.SinonStub<[], Promise<{ Account?: string } | undefined>>
+    let getCredentialsProviderStub: sinon.SinonStub<[CredentialsId], Promise<CredentialsProvider | undefined>>
+
+    beforeEach(async function () {
+        sandbox = sinon.createSandbox()
+
+        loginManager = new LoginManager(awsContext, credentialsStore)
+        credentialsProvider = {
+            getCredentials: sandbox.stub().resolves(sampleCredentials),
+            getProviderType: sandbox.stub().returns('profile'),
+            getTelemetryType: sandbox.stub().returns('staticProfile'),
+            getCredentialsId: sandbox.stub().returns(sampleCredentialsId),
+            getDefaultRegion: sandbox.stub().returns('someRegion'),
+            getHashCode: sandbox.stub().returns('1234'),
+            canAutoConnect: sandbox.stub().returns(true),
+            isAvailable: sandbox.stub().returns(Promise.resolve(true)),
+        }
+
+        getAccountIdStub = sandbox.stub(DefaultStsClient.prototype, 'getCallerIdentity').resolves({
+            Account: 'AccountId1234',
+        })
+
+        getCredentialsProviderStub = sandbox.stub(CredentialsProviderManager.getInstance(), 'getCredentialsProvider')
+        getCredentialsProviderStub.resolves(credentialsProvider)
+    })
+
+    afterEach(async function () {
+        sandbox.restore()
+    })
+
+    const assertTelemetry = assertTelemetryCurried('aws_validateCredentials')
+
+    it('passive login sends telemetry with passive=true', async function () {
+        const passive = true
+        const setCredentialsStub = sandbox.stub(awsContext, 'setCredentials')
+        await loginManager.login({ passive, providerId: sampleCredentialsId })
+
+        assert.strictEqual(setCredentialsStub.callCount, 1)
+        assertTelemetry({ result: 'Succeeded', passive, credentialType, credentialSourceId })
+    })
+
+    it('non-passive login sends telemetry', async function () {
+        const passive = false
+        const setCredentialsStub = sandbox.stub(awsContext, 'setCredentials')
+        await loginManager.login({ passive, providerId: sampleCredentialsId })
+
+        assert.strictEqual(setCredentialsStub.callCount, 1)
+        assertTelemetry({ result: 'Succeeded', passive, credentialType, credentialSourceId })
+    })
+
+    it('logs in with credentials (happy path)', async function () {
+        const passive = false
+        const setCredentialsStub = sandbox.stub(awsContext, 'setCredentials')
+
+        await loginManager.login({ passive, providerId: sampleCredentialsId })
+        assert.strictEqual(setCredentialsStub.callCount, 1, 'Expected awsContext setCredentials to be called once')
+        assertTelemetry({ result: 'Succeeded', passive, credentialType, credentialSourceId })
+    })
+
+    it('logs out (happy path)', async function () {
+        const passive = false
+        const setCredentialsStub = sandbox.stub(awsContext, 'setCredentials')
+
+        await loginManager.login({ passive, providerId: sampleCredentialsId })
+        await loginManager.logout()
+        assert.strictEqual(setCredentialsStub.callCount, 2, 'Expected awsContext setCredentials to be called twice')
+        assertTelemetry({ result: 'Succeeded', passive, credentialType, credentialSourceId })
+    })
+
+    // Helper function to avoid duplicating code
+    async function assertUndefinedCredentialsOnLogin(passive: boolean, sampleCredentialsId: CredentialsId) {
+        const setCredentialsStub = sandbox.stub(awsContext, 'setCredentials').callsFake(async (credentials) => {
+            // Verify that logout is called
+            assert.strictEqual(credentials, undefined)
+        })
+        await loginManager.login({ passive, providerId: sampleCredentialsId })
+        assert.strictEqual(setCredentialsStub.callCount, 1, 'Expected awsContext setCredentials to be called once')
+    }
+
+    it('logs out if credentials could not be retrieved', async function () {
+        const passive = true
+        getCredentialsProviderStub.reset()
+        getCredentialsProviderStub.resolves(undefined)
+        await assertUndefinedCredentialsOnLogin(passive, sampleCredentialsId)
+        assertTelemetry({ result: 'Failed', passive })
+    })
+
+    it('logs out if an account Id could not be determined', async function () {
+        const passive = false
+        getAccountIdStub.reset()
+        getAccountIdStub.resolves(undefined)
+        await assertUndefinedCredentialsOnLogin(passive, sampleCredentialsId)
+        assertTelemetry({ result: 'Failed', passive, credentialType, credentialSourceId })
+    })
+
+    it('logs out if getting an account Id throws an Error', async function () {
+        const passive = false
+        getAccountIdStub.reset()
+        getAccountIdStub.throws('Simulating getAccountId throwing an Error')
+        await assertUndefinedCredentialsOnLogin(passive, sampleCredentialsId)
+        assertTelemetry({ result: 'Failed', passive, credentialType, credentialSourceId })
+    })
+
+    describe('validateCredentials', function () {
+        let globalStateUpdateStub: sinon.SinonStub
+
+        beforeEach(function () {
+            globalStateUpdateStub = sandbox.stub(globals.globalState, 'update')
+        })
+
+        it('validates credentials successfully and returns account ID', async function () {
+            const mockCallerIdentity: GetCallerIdentityResponse = {
+                Account: 'AccountId1234',
+                Arn: 'arn:aws:iam::AccountId1234:user/test-user',
+                UserId: 'AIDACKCEXAMPLEEXAMPLE',
+            }
+            getAccountIdStub.reset()
+            getAccountIdStub.resolves(mockCallerIdentity)
+
+            const result = await loginManager.validateCredentials(sampleCredentials)
+
+            assert.strictEqual(result, 'AccountId1234')
+            assert.strictEqual(getAccountIdStub.callCount, 1)
+            assert.strictEqual(globalStateUpdateStub.callCount, 1)
+            assert.strictEqual(globalStateUpdateStub.firstCall.args[0], 'aws.toolkit.externalConnection')
+            assert.strictEqual(globalStateUpdateStub.firstCall.args[1], undefined)
+        })
+
+        it('validates credentials with custom endpoint URL', async function () {
+            const customEndpoint = 'https://custom-endpoint.example.com'
+            const mockCallerIdentity: GetCallerIdentityResponse = {
+                Account: 'AccountId1234',
+            }
+            getAccountIdStub.reset()
+            getAccountIdStub.resolves(mockCallerIdentity)
+
+            const result = await loginManager.validateCredentials(sampleCredentials, customEndpoint)
+
+            assert.strictEqual(result, 'AccountId1234')
+            assert.strictEqual(getAccountIdStub.callCount, 1)
+        })
+
+        it('throws error when account ID is missing', async function () {
+            const mockCallerIdentity: GetCallerIdentityResponse = {
+                Arn: 'arn:aws:iam::AccountId1234:user/test-user',
+                UserId: 'AIDACKCEXAMPLEEXAMPLE',
+            }
+            getAccountIdStub.reset()
+            getAccountIdStub.resolves(mockCallerIdentity)
+
+            await assert.rejects(async () => await loginManager.validateCredentials(sampleCredentials), {
+                message: 'Could not determine Account Id for credentials',
+            })
+        })
+
+        it('propagates STS client errors', async function () {
+            const testError = new Error('STS service unavailable')
+            getAccountIdStub.reset()
+            getAccountIdStub.rejects(testError)
+
+            await assert.rejects(async () => await loginManager.validateCredentials(sampleCredentials), testError)
+        })
+    })
+
+    describe('detectExternalConnection', function () {
+        let globalStateUpdateStub: sinon.SinonStub
+
+        beforeEach(function () {
+            globalStateUpdateStub = sandbox.stub(globals.globalState, 'update')
+        })
+
+        it('detects LocalStack connection and updates global state', async function () {
+            const mockCallerIdentityWithLocalStack: GetCallerIdentityResponse = {
+                Account: 'AccountId1234',
+                Arn: 'arn:aws:iam::AccountId1234:user/test-user',
+                UserId: 'AIDACKCEXAMPLEEXAMPLE',
+                // @ts-ignore - Adding the $response property for testing
+                $response: {
+                    httpResponse: {
+                        headers: {
+                            [localStackConnectionHeader]: 'true',
+                            'content-type': 'application/json',
+                        },
+                    },
+                },
+            }
+            getAccountIdStub.reset()
+            getAccountIdStub.resolves(mockCallerIdentityWithLocalStack)
+
+            await loginManager.validateCredentials(sampleCredentials)
+
+            assert.strictEqual(globalStateUpdateStub.callCount, 1)
+            assert.strictEqual(globalStateUpdateStub.firstCall.args[0], 'aws.toolkit.externalConnection')
+            assert.strictEqual(globalStateUpdateStub.firstCall.args[1], localStackConnectionString)
+        })
+
+        it('does not detect external connection when LocalStack header is missing', async function () {
+            const mockCallerIdentityWithoutLocalStack: GetCallerIdentityResponse = {
+                Account: 'AccountId1234',
+                Arn: 'arn:aws:iam::AccountId1234:user/test-user',
+                UserId: 'AIDACKCEXAMPLEEXAMPLE',
+                // @ts-ignore - Adding the $response property for testing
+                $response: {
+                    httpResponse: {
+                        headers: {
+                            'content-type': 'application/json',
+                            'x-amzn-requestid': 'test-request-id',
+                        },
+                    },
+                },
+            }
+            getAccountIdStub.reset()
+            getAccountIdStub.resolves(mockCallerIdentityWithoutLocalStack)
+
+            await loginManager.validateCredentials(sampleCredentials)
+
+            assert.strictEqual(globalStateUpdateStub.callCount, 1)
+            assert.strictEqual(globalStateUpdateStub.firstCall.args[0], 'aws.toolkit.externalConnection')
+            assert.strictEqual(globalStateUpdateStub.firstCall.args[1], undefined)
+        })
+
+        it('handles response with no $response property', async function () {
+            const mockCallerIdentityWithoutResponse: GetCallerIdentityResponse = {
+                Account: 'AccountId1234',
+                Arn: 'arn:aws:iam::AccountId1234:user/test-user',
+                UserId: 'AIDACKCEXAMPLEEXAMPLE',
+            }
+            getAccountIdStub.reset()
+            getAccountIdStub.resolves(mockCallerIdentityWithoutResponse)
+
+            await loginManager.validateCredentials(sampleCredentials)
+
+            assert.strictEqual(globalStateUpdateStub.callCount, 1)
+            assert.strictEqual(globalStateUpdateStub.firstCall.args[0], 'aws.toolkit.externalConnection')
+            assert.strictEqual(globalStateUpdateStub.firstCall.args[1], undefined)
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/credentials/userCredentialsUtils.test.ts b/packages/core/src/test/shared/credentials/userCredentialsUtils.test.ts
new file mode 100644
index 00000000000..664eb454fd6
--- /dev/null
+++ b/packages/core/src/test/shared/credentials/userCredentialsUtils.test.ts
@@ -0,0 +1,169 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as path from 'path'
+import * as sinon from 'sinon'
+
+/* eslint @typescript-eslint/naming-convention: 0 */
+
+import { Uri } from 'vscode'
+import {
+    getSectionDataOrThrow,
+    loadSharedConfigFiles,
+    mergeAndValidateSections,
+} from '../../../auth/credentials/sharedCredentials'
+import { UserCredentialsUtils } from '../../../shared/credentials/userCredentialsUtils'
+import { EnvironmentVariables } from '../../../shared/environmentVariables'
+import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
+import { fs } from '../../../shared'
+
+describe('UserCredentialsUtils', function () {
+    let tempFolder: string
+
+    beforeEach(async function () {
+        // Make a temp folder for all these tests
+        // Stick some temp credentials files in there to load from
+        tempFolder = await makeTemporaryToolkitFolder()
+    })
+
+    afterEach(async function () {
+        await fs.delete(tempFolder, { recursive: true })
+        sinon.restore()
+    })
+
+    describe('findExistingCredentialsFilenames', function () {
+        it('returns both filenames if both files exist', async function () {
+            const credentialsFilename = path.join(tempFolder, 'credentials-both-exist-test')
+            const configFilename = path.join(tempFolder, 'config-both-exist-test')
+
+            sinon.stub(process, 'env').value({
+                AWS_SHARED_CREDENTIALS_FILE: credentialsFilename,
+                AWS_CONFIG_FILE: configFilename,
+            } as EnvironmentVariables)
+
+            await createCredentialsFile(credentialsFilename, ['default'])
+            await createCredentialsFile(configFilename, ['default'])
+
+            const foundFiles: string[] = await UserCredentialsUtils.findExistingCredentialsFilenames()
+            assert.strictEqual(foundFiles.length, 2)
+        })
+
+        it('returns credentials file if it exists and config file does not exist', async function () {
+            const credentialsFilename = path.join(tempFolder, 'credentials-exist-test')
+            const configFilename = path.join(tempFolder, 'config-not-exist-test')
+
+            sinon.stub(process, 'env').value({
+                AWS_SHARED_CREDENTIALS_FILE: credentialsFilename,
+                AWS_CONFIG_FILE: configFilename,
+            } as EnvironmentVariables)
+
+            await createCredentialsFile(credentialsFilename, ['default'])
+
+            const foundFiles: string[] = await UserCredentialsUtils.findExistingCredentialsFilenames()
+            assert.strictEqual(foundFiles.length, 1)
+            assert.strictEqual(foundFiles[0], Uri.file(credentialsFilename).fsPath)
+        })
+
+        it('returns config file if it exists and credentials file does not exist', async function () {
+            const credentialsFilename = path.join(tempFolder, 'credentials-not-exist-test')
+            const configFilename = path.join(tempFolder, 'config-exist-test')
+
+            sinon.stub(process, 'env').value({
+                AWS_SHARED_CREDENTIALS_FILE: credentialsFilename,
+                AWS_CONFIG_FILE: configFilename,
+            } as EnvironmentVariables)
+
+            await createCredentialsFile(configFilename, ['default'])
+
+            const foundFiles: string[] = await UserCredentialsUtils.findExistingCredentialsFilenames()
+            assert.strictEqual(foundFiles.length, 1)
+            assert.strictEqual(foundFiles[0], Uri.file(configFilename).fsPath)
+        })
+
+        it('returns empty result if neither file exists', async function () {
+            const credentialsFilename = path.join(tempFolder, 'credentials-not-exist-test')
+            const configFilename = path.join(tempFolder, 'config-not-exist-test')
+
+            sinon.stub(process, 'env').value({
+                AWS_SHARED_CREDENTIALS_FILE: credentialsFilename,
+                AWS_CONFIG_FILE: configFilename,
+            } as EnvironmentVariables)
+
+            const foundFiles: string[] = await UserCredentialsUtils.findExistingCredentialsFilenames()
+            assert.strictEqual(foundFiles.length, 0)
+        })
+    })
+
+    describe('generateCredentialsFile', function () {
+        it('generates a valid credentials file', async function () {
+            const credentialsFilename = path.join(tempFolder, 'credentials-generation-test')
+            const profileName = 'someRandomProfileName'
+
+            sinon.stub(process, 'env').value({
+                AWS_SHARED_CREDENTIALS_FILE: credentialsFilename,
+            } as EnvironmentVariables)
+            const creds = {
+                accessKey: '123',
+                profileName: profileName,
+                secretKey: 'ABC',
+            }
+            await createCredentialsFile(credentialsFilename, [profileName])
+            await UserCredentialsUtils.generateCredentialsFile(creds)
+
+            const sharedConfigFiles = await loadSharedConfigFiles({ credentials: Uri.file(credentialsFilename) })
+            const profile = getSectionDataOrThrow(
+                mergeAndValidateSections(sharedConfigFiles.credentials).sections,
+                profileName,
+                'profile'
+            )
+            assert.ok(profile)
+            assert.strictEqual(
+                profile.aws_access_key_id,
+                creds.accessKey,
+                `creds.accessKey: "${profile.aws_access_key_id}" !== "${creds.accessKey}"`
+            )
+            assert.strictEqual(
+                profile.aws_secret_access_key,
+                creds.secretKey,
+                `creds.secretKey: "${profile.aws_access_key_id}" !== "${creds.secretKey}"`
+            )
+
+            await assert.doesNotReject(async () => await fs.checkPerms(credentialsFilename, 'r--'))
+            await assert.doesNotReject(async () => await fs.checkPerms(credentialsFilename, '-w-'))
+        })
+    })
+
+    describe('loadSharedConfigFiles', function () {
+        it('normalizes fields by making them lowercase', async function () {
+            const credentialsFilename = path.join(tempFolder, 'credentials-generation-test')
+            const profileName = 'someRandomProfileName'
+
+            await createCredentialsFile(credentialsFilename, [profileName])
+
+            const sharedConfigFiles = await loadSharedConfigFiles({ credentials: Uri.file(credentialsFilename) })
+            const profile = getSectionDataOrThrow(
+                mergeAndValidateSections(sharedConfigFiles.credentials).sections,
+                profileName,
+                'profile'
+            )
+            assert.strictEqual(profile.region, 'us-weast-3')
+        })
+    })
+
+    async function createCredentialsFile(filename: string, profileNames: string[]): Promise<void> {
+        let fileContents = ''
+
+        for (const profileName of profileNames) {
+            fileContents += `[${profileName}]
+aws_access_key_id = FAKEKEY
+aws_SecRet_aCCess_key = FAKESECRET
+REGION = us-weast-3
+`
+        }
+
+        await fs.writeFile(filename, fileContents)
+    }
+})
diff --git a/packages/core/src/test/shared/crypto.test.ts b/packages/core/src/test/shared/crypto.test.ts
new file mode 100644
index 00000000000..f9620d41233
--- /dev/null
+++ b/packages/core/src/test/shared/crypto.test.ts
@@ -0,0 +1,64 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { isUuid, randomUUID, truncateUuid } from '../../shared/crypto'
+
+describe('crypto', function () {
+    describe('randomUUID()', function () {
+        const uuidPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
+
+        it('functions as normal', async function () {
+            const result1 = randomUUID()
+            const result2 = randomUUID()
+            const result3 = randomUUID()
+            assert(uuidPattern.test(result1))
+            assert(uuidPattern.test(result2))
+            assert(uuidPattern.test(result3))
+            assert(result1 !== result2)
+            assert(result2 !== result3)
+        })
+
+        it('test pattern fails on non-uuid', function () {
+            assert(uuidPattern.test('not-a-uuid') === false)
+        })
+    })
+
+    describe('isUuid()', function () {
+        assert.equal(isUuid(''), false)
+        assert.equal(isUuid('not-a-uuid'), false)
+        assert.equal(isUuid('47fe01cf-f37a-4e7c-b971'), false)
+        assert.equal(isUuid('47fe01cf_f37a_4e7c-b971-@10fe5897763'), false)
+        // The '9' in '9e7c' must actually be between 1-5 based on the UUID spec: https://stackoverflow.com/a/38191104
+        assert.equal(isUuid('47fe01cf-f37a-9e7c-b971-d10fe5897763'), false)
+        assert.equal(isUuid(' 47fe01cf-f37a-4e7c-b971-d10fe5897763'), false) // leading whitespace
+        assert.equal(isUuid('47fe01cf-f37a-4e7c-b971-d10fe5897763 '), false) // trailing whitespace
+        assert.equal(isUuid('47fe01cf-f37a-4e7c-b971-d10fe5897763z'), false) // one extra character
+        assert.equal(isUuid('47fe01cf-f37a-4e7c-b971-d10fe5897763 blah'), false) // trailing word
+
+        assert.equal(isUuid('47fe01cf-f37a-4e7c-b971-d10fe5897763'), true)
+        // The telemetry services indicates that per postel's law, uppercase is valid to pass in
+        // as they will lowerCase when necessary.
+        assert.equal(isUuid('47fe01cf-f37a-4e7c-b971-d10fe5897763'.toUpperCase()), true)
+    })
+})
+
+describe('truncateUUID', function () {
+    it('should return the first 4 and last 4 characters of a valid UUID', function () {
+        const fullUUID1 = 'aaaabbbb-cccc-dddd-eeee-ffffhhhhiiii'
+        const result1 = truncateUuid(fullUUID1)
+        assert.strictEqual(result1, 'aaaa...iiii')
+
+        const fullUUID2 = '12340000-0000-0000-0000-000000005678'
+        const result2 = truncateUuid(fullUUID2)
+        assert.strictEqual(result2, '1234...5678')
+    })
+
+    it('should throw an error if the input is not 36 characters long', function () {
+        assert.throws(() => {
+            truncateUuid('invalid-uuid')
+        }, /Cannot truncate uuid of value: "invalid-uuid"/)
+    })
+})
diff --git a/packages/core/src/test/shared/datetime.test.ts b/packages/core/src/test/shared/datetime.test.ts
new file mode 100644
index 00000000000..1bac62cf078
--- /dev/null
+++ b/packages/core/src/test/shared/datetime.test.ts
@@ -0,0 +1,49 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { formatLocalized, formatDateTimestamp, getRelativeDate } from '../../shared/datetime'
+import { globals } from '../../shared'
+
+// Test that the following imports all equal the expected milliseconds
+describe('simple tests', () => {
+    it('formatLocalized()', async function () {
+        const d = new globals.clock.Date(globals.clock.Date.UTC(2013, 11, 17, 3, 24, 0))
+        assert.deepStrictEqual(formatLocalized(d), 'Dec 16, 2013 7:24:00 PM GMT-8')
+    })
+
+    it('formatDateTimestamp()', async function () {
+        const d = new globals.clock.Date(globals.clock.Date.UTC(2013, 11, 17, 3, 24, 0))
+        assert.deepStrictEqual(formatDateTimestamp(true, d), '2013-12-17T03:24:00.000-08:00')
+        assert.deepStrictEqual(formatDateTimestamp(false, d), '2013-12-16T19:24:00.000+00:00')
+    })
+})
+
+describe('getRelativeDate', function () {
+    const now = new Date(2020, 4, 4, 4, 4, 4) // adjusts for clock skew modifier in `getRelativeDate` fn.
+    it('produces readable dates', function () {
+        const years = getRelativeDate(new Date(2018, 4, 4, 4, 4, 9), now)
+        const year = getRelativeDate(new Date(2019, 4, 4, 4, 4, 9), now)
+        const months = getRelativeDate(new Date(2019, 5, 4, 4, 4, 9), now)
+        const month = getRelativeDate(new Date(2020, 3, 4, 4, 4, 9), now)
+        const weeks = getRelativeDate(new Date(2020, 3, 9, 4, 4, 9), now)
+        const week = getRelativeDate(new Date(2020, 3, 27, 4, 4, 9), now)
+        const days = getRelativeDate(new Date(2020, 4, 2, 4, 4, 9), now)
+        const day = getRelativeDate(new Date(2020, 4, 3, 4, 4, 9), now)
+        const hour = getRelativeDate(new Date(2020, 4, 4, 3, 4, 9), now)
+        const minute = getRelativeDate(new Date(2020, 4, 4, 4, 3, 9), now)
+
+        assert.strictEqual(years, '2 years ago')
+        assert.strictEqual(year, 'last year')
+        assert.strictEqual(months, '11 months ago')
+        assert.strictEqual(month, 'last month')
+        assert.strictEqual(weeks, '4 weeks ago')
+        assert.strictEqual(week, 'last week')
+        assert.strictEqual(days, '2 days ago')
+        assert.strictEqual(day, 'yesterday')
+        assert.strictEqual(hour, '1 hour ago')
+        assert.strictEqual(minute, '1 minute ago')
+    })
+})
diff --git a/src/test/shared/debug/launchConfiguration.test.ts b/packages/core/src/test/shared/debug/launchConfiguration.test.ts
similarity index 78%
rename from src/test/shared/debug/launchConfiguration.test.ts
rename to packages/core/src/test/shared/debug/launchConfiguration.test.ts
index bf1168e1fa4..120e4f12c67 100644
--- a/src/test/shared/debug/launchConfiguration.test.ts
+++ b/packages/core/src/test/shared/debug/launchConfiguration.test.ts
@@ -1,11 +1,10 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as path from 'path'
-import { deepEqual, instance, mock, verify, when } from 'ts-mockito'
 import * as vscode from 'vscode'
 import {
     DebugConfigurationSource,
@@ -17,8 +16,10 @@ import { AwsSamDebuggerConfiguration } from '../../../shared/sam/debugger/awsSam
 import { AwsSamDebugConfigurationValidator } from '../../../shared/sam/debugger/awsSamDebugConfigurationValidator'
 import * as pathutils from '../../../shared/utilities/pathUtils'
 import * as testutil from '../../testUtil'
-import { templateFileGlobPattern } from '../../../shared/cloudformation/activation'
 import globals from '../../../shared/extensionGlobals'
+import * as CloudFormation from '../../../shared/cloudformation/cloudformation'
+import { stub } from '../../utilities/stubber'
+import sinon from 'sinon'
 
 const samDebugConfiguration: AwsSamDebuggerConfiguration = {
     type: 'aws-sam',
@@ -92,12 +93,13 @@ const templateUri = vscode.Uri.file('/template.yaml')
 describe('LaunchConfiguration', function () {
     let mockConfigSource: DebugConfigurationSource
     let mockSamValidator: AwsSamDebugConfigurationValidator
+    const setDebugConfigurationsStub = sinon.stub()
 
     /** Test workspace. */
     const workspace = vscode.workspace.workspaceFolders![0]
     const testLaunchJson = vscode.Uri.file(path.join(workspace.uri.fsPath, '.vscode/launch.json'))
     /** Object representation of the launch.json test file. */
-    const testLaunchJsonData = JSON.parse(testutil.fromFile(testLaunchJson.fsPath))
+    let testLaunchJsonData: any
     const templateUriJsPlainApp = vscode.Uri.file(path.join(workspace.uri.fsPath, 'js-plain-sam-app/template.yaml'))
     const templateUriPython37 = vscode.Uri.file(
         path.join(workspace.uri.fsPath, 'python3.7-plain-sam-app/template.yaml')
@@ -105,30 +107,39 @@ describe('LaunchConfiguration', function () {
     const templateUriCsharp = vscode.Uri.file(path.join(workspace.uri.fsPath, 'csharp6-zip/template.yaml'))
 
     beforeEach(async function () {
-        await globals.templateRegistry.addWatchPattern(templateFileGlobPattern)
+        testLaunchJsonData = JSON.parse(await testutil.fromFile(testLaunchJson.fsPath))
+        const registry = await globals.templateRegistry
+        registry.addWatchPatterns([CloudFormation.templateFileGlobPattern])
+        await registry.rebuild()
 
         // TODO: remove mocks in favor of testing src/testFixtures/ data.
-        mockConfigSource = mock()
-        mockSamValidator = mock()
-        when(mockConfigSource.getDebugConfigurations()).thenReturn(debugConfigurations)
-        when(mockSamValidator.validate(deepEqual(samDebugConfiguration))).thenReturn({ isValid: true })
+        mockConfigSource = {
+            getDebugConfigurations: () => debugConfigurations,
+            setDebugConfigurations: setDebugConfigurationsStub,
+        }
+        mockSamValidator = {
+            validate: async () => ({ isValid: true }),
+        }
     })
 
-    afterEach(function () {
-        globals.templateRegistry.reset()
+    afterEach(async function () {
+        setDebugConfigurationsStub.reset()
+        ;(await globals.templateRegistry).reset()
     })
 
     it('getConfigsMappedToTemplates(type=api)', async function () {
-        const actual = getConfigsMappedToTemplates(new LaunchConfiguration(templateUriJsPlainApp), 'api')
+        const actual = await getConfigsMappedToTemplates(new LaunchConfiguration(templateUriJsPlainApp), 'api')
         assert.deepStrictEqual(actual.size, 0)
 
-        const actual2 = Array.from(getConfigsMappedToTemplates(new LaunchConfiguration(templateUriPython37), 'api'))
+        const actual2 = Array.from(
+            await getConfigsMappedToTemplates(new LaunchConfiguration(templateUriPython37), 'api')
+        )
         assert.deepStrictEqual(actual2.length, 1)
         assert.deepStrictEqual(actual2[0].name, 'test-launchconfig-6-python3.7')
         assert.deepStrictEqual(actual2[0].invokeTarget.target, 'api')
         assert.deepStrictEqual((actual2[0].invokeTarget as any).logicalId, 'HelloWorldFunction')
 
-        const actual3 = Array.from(getConfigsMappedToTemplates(new LaunchConfiguration(templateUriCsharp), 'api'))
+        const actual3 = Array.from(await getConfigsMappedToTemplates(new LaunchConfiguration(templateUriCsharp), 'api'))
         assert.deepStrictEqual(actual3.length, 1)
         assert.deepStrictEqual(actual3[0].name, 'test-launchconfig-8-api')
         assert.deepStrictEqual(actual3[0].invokeTarget.target, 'api')
@@ -137,19 +148,23 @@ describe('LaunchConfiguration', function () {
 
     it('getConfigsMappedToTemplates(type=undefined) returns target=template + target=api resources', async function () {
         const actual = Array.from(
-            getConfigsMappedToTemplates(new LaunchConfiguration(templateUriJsPlainApp), undefined)
+            await getConfigsMappedToTemplates(new LaunchConfiguration(templateUriJsPlainApp), undefined)
         )
         assert.deepStrictEqual(actual.length, 1)
         assert.deepStrictEqual((actual[0].invokeTarget as any).logicalId, 'SourceCodeBesidePackageJson')
 
-        const actual2 = Array.from(getConfigsMappedToTemplates(new LaunchConfiguration(templateUriPython37), undefined))
+        const actual2 = Array.from(
+            await getConfigsMappedToTemplates(new LaunchConfiguration(templateUriPython37), undefined)
+        )
         assert.deepStrictEqual(actual2.length, 2)
         assert.deepStrictEqual(actual2[0].name, 'test-launchconfig-5-python3.7')
         assert.deepStrictEqual(actual2[1].name, 'test-launchconfig-6-python3.7')
         assert.deepStrictEqual(actual2[0].invokeTarget.target, 'template')
         assert.deepStrictEqual(actual2[1].invokeTarget.target, 'api')
 
-        const actual3 = Array.from(getConfigsMappedToTemplates(new LaunchConfiguration(templateUriCsharp), undefined))
+        const actual3 = Array.from(
+            await getConfigsMappedToTemplates(new LaunchConfiguration(templateUriCsharp), undefined)
+        )
         assert.deepStrictEqual(actual3.length, 1)
         assert.deepStrictEqual(actual3[0].name, 'test-launchconfig-8-api')
         assert.deepStrictEqual((actual3[0].invokeTarget as any).logicalId, 'HelloWorldFunction')
@@ -161,48 +176,40 @@ describe('LaunchConfiguration', function () {
         assertEqualLaunchJsons(launchConfig.getDebugConfigurations(), expected, workspace.uri, false)
     })
 
-    it('gets aws-sam debug configurations', function () {
+    it('gets aws-sam debug configurations', async function () {
         const launchConfig = new LaunchConfiguration(templateUriJsPlainApp)
         const expected = (testLaunchJsonData['configurations'] as any[]).filter(
-            o => o.type === 'aws-sam' && o.request === 'direct-invoke'
+            (o) => o.type === 'aws-sam' && o.request === 'direct-invoke'
         )
-        const actual = launchConfig.getSamDebugConfigurations()
+        const actual = await launchConfig.getSamDebugConfigurations()
         assertEqualLaunchJsons(actual, expected, workspace.uri, true)
     })
 
     it('adds single debug configuration', async function () {
-        const launchConfig = new LaunchConfiguration(
-            templateUri,
-            instance(mockConfigSource),
-            instance(mockSamValidator)
-        )
+        const launchConfig = new LaunchConfiguration(templateUri, mockConfigSource, mockSamValidator)
         await launchConfig.addDebugConfiguration(samDebugConfiguration)
 
         const expected = [samDebugConfiguration, ...debugConfigurations]
-        verify(mockConfigSource.setDebugConfigurations(deepEqual(expected))).once()
+        assert(setDebugConfigurationsStub.calledOnceWith(expected))
     })
 
     it('adds multiple debug configurations', async function () {
-        const launchConfig = new LaunchConfiguration(
-            templateUri,
-            instance(mockConfigSource),
-            instance(mockSamValidator)
-        )
+        const launchConfig = new LaunchConfiguration(templateUri, mockConfigSource, mockSamValidator)
         await launchConfig.addDebugConfigurations([samDebugConfiguration, samDebugConfiguration])
 
         const expected = [samDebugConfiguration, samDebugConfiguration, ...debugConfigurations]
-        verify(mockConfigSource.setDebugConfigurations(deepEqual(expected))).once()
+        assert(setDebugConfigurationsStub.calledOnceWith(expected))
     })
 })
 
 describe('getReferencedHandlerPaths', function () {
-    it('includes all resources as absolute paths to root dir + handlers', function () {
-        const mockLaunchConfig = instance(createMockLaunchConfig())
+    it('includes all resources as absolute paths to root dir + handlers', async function () {
+        const mockLaunchConfig = createMockLaunchConfig()
 
-        const resultSet = getReferencedHandlerPaths(mockLaunchConfig)
+        const resultSet = await getReferencedHandlerPaths(mockLaunchConfig)
         const workspaceFolder = mockLaunchConfig.workspaceFolder!.uri.fsPath
 
-        //template type handlers, these are all false as we throw all of these out
+        // template type handlers, these are all false as we throw all of these out
         assert.strictEqual(resultSet.has('resource'), false)
         assert.strictEqual(resultSet.has('relativePathGoodTemplate'), false)
         assert.strictEqual(resultSet.has('relativePathBadTemplate'), false)
@@ -232,14 +239,15 @@ function createMockLaunchConfig(): LaunchConfiguration {
     const workspaceFolder = '/absolutely/this/is/the/right/path'
 
     // init mockLaunchConfig
-    const mockLaunchConfig: LaunchConfiguration = mock()
-    when(mockLaunchConfig.workspaceFolder).thenReturn({
-        uri: vscode.Uri.file(workspaceFolder),
-        name: 'mockAroundTheClock',
-        index: 1,
+    const mockLaunchConfig = stub(LaunchConfiguration, {
+        workspaceFolder: {
+            uri: vscode.Uri.file(workspaceFolder),
+            name: 'mockAroundTheClock',
+            index: 1,
+        },
+        scopedResource: vscode.Uri.file(path.join(workspaceFolder, 'template.yaml')),
     })
-    when(mockLaunchConfig.scopedResource).thenReturn(vscode.Uri.file(path.join(workspaceFolder, 'template.yaml')))
-    when(mockLaunchConfig.getSamDebugConfigurations()).thenReturn([
+    mockLaunchConfig.getSamDebugConfigurations.resolves([
         // default: template target with not-in-workspace, absolute-pathed templatePath
         createMockSamDebugConfig(),
         createMockSamDebugConfig({
diff --git a/packages/core/src/test/shared/defaultAwsContext.test.ts b/packages/core/src/test/shared/defaultAwsContext.test.ts
new file mode 100644
index 00000000000..6623fa5dee7
--- /dev/null
+++ b/packages/core/src/test/shared/defaultAwsContext.test.ts
@@ -0,0 +1,134 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { AwsCredentialIdentity } from '@aws-sdk/types'
+import { AwsContextCredentials } from '../../shared/awsContext'
+import { DefaultAwsContext } from '../../shared/awsContext'
+
+describe('DefaultAwsContext', function () {
+    const testAccountIdValue: string = '123456789012'
+
+    it('instantiates with no credentials', async function () {
+        const testContext = new DefaultAwsContext()
+
+        assert.strictEqual(testContext.getCredentialProfileName(), undefined)
+        assert.strictEqual(testContext.getCredentialAccountId(), undefined)
+        assert.strictEqual(await testContext.getCredentials(), undefined)
+    })
+
+    it('sets credentials and gets credentialsId', async function () {
+        const awsCredentials = makeSampleAwsContextCredentials()
+
+        const testContext = new DefaultAwsContext()
+
+        await testContext.setCredentials(awsCredentials)
+        assert.strictEqual(testContext.getCredentialProfileName(), awsCredentials.credentialsId)
+    })
+
+    it('sets undefined credentials and gets credentialsId', async function () {
+        const testContext = new DefaultAwsContext()
+
+        await testContext.setCredentials(undefined)
+        assert.strictEqual(testContext.getCredentialProfileName(), undefined)
+    })
+
+    it('sets credentials and gets accountId', async function () {
+        const awsCredentials = makeSampleAwsContextCredentials()
+
+        const testContext = new DefaultAwsContext()
+
+        await testContext.setCredentials(awsCredentials)
+        assert.strictEqual(testContext.getCredentialAccountId(), awsCredentials.accountId)
+    })
+
+    it('sets undefined credentials and gets accountId', async function () {
+        const testContext = new DefaultAwsContext()
+
+        await testContext.setCredentials(undefined)
+        assert.strictEqual(testContext.getCredentialAccountId(), undefined)
+    })
+
+    it('sets credentials and gets credentials', async function () {
+        const awsCredentials = makeSampleAwsContextCredentials()
+
+        const testContext = new DefaultAwsContext()
+
+        await testContext.setCredentials(awsCredentials)
+        assert.strictEqual(await testContext.getCredentials(), awsCredentials.credentials)
+    })
+
+    it('sets undefined credentials and gets credentials', async function () {
+        const testContext = new DefaultAwsContext()
+
+        await testContext.setCredentials(undefined)
+        assert.strictEqual(await testContext.getCredentials(), undefined)
+    })
+
+    it('fires event on credentials change', async function () {
+        const testContext = new DefaultAwsContext()
+
+        const awsCredentials = makeSampleAwsContextCredentials()
+
+        await new Promise<void>(async (resolve) => {
+            testContext.onDidChangeContext((awsContextChangedEvent) => {
+                assert.strictEqual(awsContextChangedEvent.profileName, awsCredentials.credentialsId)
+                assert.strictEqual(awsContextChangedEvent.accountId, awsCredentials.accountId)
+                resolve()
+            })
+
+            await testContext.setCredentials(awsCredentials)
+        })
+    })
+
+    it('gets endpoint URL from credentials', async function () {
+        const testEndpointUrl = 'https://custom-endpoint.example.com'
+        const awsCredentials = makeSampleAwsContextCredentials(testEndpointUrl)
+
+        const testContext = new DefaultAwsContext()
+
+        await testContext.setCredentials(awsCredentials)
+        assert.strictEqual(testContext.getCredentialEndpointUrl(), testEndpointUrl)
+    })
+
+    it('returns undefined endpoint URL when not set in credentials', async function () {
+        const awsCredentials = makeSampleAwsContextCredentials()
+
+        const testContext = new DefaultAwsContext()
+
+        await testContext.setCredentials(awsCredentials)
+        assert.strictEqual(testContext.getCredentialEndpointUrl(), undefined)
+    })
+
+    it('returns undefined endpoint URL when no credentials are set', async function () {
+        const testContext = new DefaultAwsContext()
+
+        assert.strictEqual(testContext.getCredentialEndpointUrl(), undefined)
+    })
+
+    it('returns undefined endpoint URL after setting undefined credentials', async function () {
+        const testEndpointUrl = 'https://custom-endpoint.example.com'
+        const awsCredentials = makeSampleAwsContextCredentials(testEndpointUrl)
+
+        const testContext = new DefaultAwsContext()
+
+        // First set credentials with endpoint URL
+        await testContext.setCredentials(awsCredentials)
+        assert.strictEqual(testContext.getCredentialEndpointUrl(), testEndpointUrl)
+
+        // Then clear credentials
+        await testContext.setCredentials(undefined)
+        assert.strictEqual(testContext.getCredentialEndpointUrl(), undefined)
+    })
+
+    function makeSampleAwsContextCredentials(endpointUrl?: string): AwsContextCredentials {
+        return {
+            credentials: {} as AwsCredentialIdentity,
+            credentialsId: 'qwerty',
+            accountId: testAccountIdValue,
+            endpointUrl,
+        }
+    }
+})
diff --git a/packages/core/src/test/shared/env/resolveEnv.test.ts b/packages/core/src/test/shared/env/resolveEnv.test.ts
new file mode 100644
index 00000000000..d645df57f81
--- /dev/null
+++ b/packages/core/src/test/shared/env/resolveEnv.test.ts
@@ -0,0 +1,71 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as resolveEnv from '../../../shared/env/resolveEnv'
+import sinon from 'sinon'
+import path from 'path'
+
+describe('resolveEnv', async function () {
+    let sandbox: sinon.SinonSandbox
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    // a copy of resolveEnv.mergeResolvedShellPath for stubbing getResolvedShellEnv
+    // mergeResolvedShellPath is calling getResolvedShellEnv within the same file
+    // thus we need a copy to stub getResolvedShellEnv correctly
+    const testMergeResolveShellPath = async function mergeResolvedShellPath(
+        env: resolveEnv.IProcessEnvironment
+    ): Promise<typeof process.env> {
+        const shellEnv = await resolveEnv.getResolvedShellEnv(env)
+        // resolve failed or doesn't need to resolve
+        if (!shellEnv) {
+            return env
+        }
+        try {
+            const envPaths: string[] = env.PATH ? env.PATH.split(path.delimiter) : []
+            const resolvedPaths: string[] = shellEnv.PATH ? shellEnv.PATH.split(path.delimiter) : []
+            const envReturn = { ...env }
+            // merge, dedup, join
+            envReturn.PATH = [...new Set(envPaths.concat(resolvedPaths))].join(path.delimiter)
+
+            return envReturn
+        } catch (err) {
+            return env
+        }
+    }
+
+    describe('windows', async function () {
+        beforeEach(function () {
+            sandbox.stub(process, 'platform').value('win32')
+        })
+
+        it('mergeResolvedShellPath should not change path on windows', async function () {
+            const env = await resolveEnv.mergeResolvedShellPath(process.env)
+            assert(env.PATH)
+            assert.strictEqual(env, process.env)
+        })
+    })
+
+    describe('unix', async function () {
+        const originalEnv = { ...process.env }
+        // skip mac test on windows
+        if (process.platform !== 'win32') {
+            it('mergeResolvedShellPath should get path on mac/linux', async function () {
+                sandbox.stub(process.env, 'PATH').value('')
+                // stub the resolve Env logic cause this is platform sensitive.
+                sandbox.stub(resolveEnv, 'getResolvedShellEnv').resolves(originalEnv)
+                const env = await testMergeResolveShellPath(process.env)
+                assert(env.PATH)
+                assert.notEqual(env, process.env)
+            })
+        }
+    })
+})
diff --git a/packages/core/src/test/shared/errors.test.ts b/packages/core/src/test/shared/errors.test.ts
new file mode 100644
index 00000000000..32d18186912
--- /dev/null
+++ b/packages/core/src/test/shared/errors.test.ts
@@ -0,0 +1,733 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import vscode from 'vscode'
+import {
+    findBestErrorInChain,
+    formatError,
+    getErrorMsg,
+    getTelemetryReason,
+    getTelemetryReasonDesc,
+    getTelemetryResult,
+    isNetworkError,
+    resolveErrorMessageToDisplay,
+    scrubNames,
+    AwsClientResponseError,
+    ToolkitError,
+    tryRun,
+    UnknownError,
+    getErrorId,
+} from '../../shared/errors'
+import { CancellationError } from '../../shared/utilities/timeoutUtils'
+import { UnauthorizedException } from '@aws-sdk/client-sso'
+import { AWSError } from 'aws-sdk'
+import { AccessDeniedException } from '@aws-sdk/client-sso-oidc'
+import { OidcClient } from '../../auth/sso/clients'
+import { SamCliError } from '../../shared/sam/cli/samCliInvokerUtils'
+import { DiskCacheError } from '../../shared/utilities/cacheUtils'
+
+class TestAwsError extends Error implements AWSError {
+    constructor(
+        readonly code: string,
+        message: string,
+        readonly time: Date
+    ) {
+        super(message)
+    }
+}
+
+// Error containing `error_description`.
+function fakeAwsErrorAccessDenied() {
+    const e = new AccessDeniedException({
+        error: 'access_denied',
+        message: 'accessdenied message',
+        $metadata: {
+            attempts: 3,
+            requestId: 'or62s79n-r9ps-41pq-n755-r6920p56r4so',
+            totalRetryDelay: 3000,
+            httpStatusCode: 403,
+        },
+    }) as any
+    e.name = 'accessdenied-name'
+    e.code = 'accessdenied-code'
+    e.error_description = 'access_denied error_description'
+    e.time = new Date()
+    return e as AccessDeniedException
+}
+
+// Error NOT containing `error_description`.
+function fakeAwsErrorUnauth() {
+    const e = new UnauthorizedException({
+        message: 'unauthorized message',
+        $metadata: {
+            attempts: 3,
+            requestId: 'be62f79a-e9cf-41cd-a755-e6920c56e4fb',
+            totalRetryDelay: 3000,
+            httpStatusCode: 403,
+        },
+    }) as any
+    e.name = 'unauthorized-name'
+    e.code = 'unauthorized-code'
+    e.time = new Date()
+    return e as UnauthorizedException
+}
+
+function trySetCause(err: Error | undefined, cause: unknown) {
+    if (err && !(err instanceof ToolkitError)) {
+        ;(err as any).cause = cause
+    }
+}
+
+/** Creates a deep "cause chain", to test that error handler correctly gets the most relevant error. */
+export function fakeErrorChain(err1?: Error, err2?: Error, err3?: Error, err4?: Error) {
+    try {
+        if (err1) {
+            throw err1
+        } else {
+            throw new Error('generic error 1')
+        }
+    } catch (e1) {
+        try {
+            const e = err2 ? err2 : new UnknownError(e1)
+            trySetCause(e, e1)
+            throw e
+        } catch (e2) {
+            try {
+                // new Error('error 3')
+                const e = err3 ? err3 : new SamCliError('sam error', { cause: e2 as Error })
+                trySetCause(e, e2)
+                throw e
+            } catch (e3) {
+                const e = err4
+                    ? err4
+                    : ToolkitError.chain(e3, 'ToolkitError message', {
+                          documentationUri: vscode.Uri.parse('https://docs.aws.amazon.com/toolkit-for-vscode/'),
+                      })
+                trySetCause(e, e3)
+
+                return e
+            }
+        }
+    }
+}
+
+/** Sends a (broken) request to the AWS OIDC service, to get a "real" error response. */
+export async function getAwsServiceError(): Promise<Error> {
+    const oidc = OidcClient.create('us-east-1')
+    return oidc
+        .createToken({
+            clientId: 'AWS IDE Extensions',
+            clientSecret: 'xx',
+            deviceCode: 'xx',
+            grantType: 'urn:ietf:params:oauth:grant-type:device_code',
+        })
+        .catch((e) => e)
+}
+
+describe('ToolkitError', function () {
+    it('can store an error message', function () {
+        const error = new ToolkitError('uh oh!')
+        assert.strictEqual(error.message, 'uh oh!')
+    })
+
+    it('can store an error name', function () {
+        const error = new ToolkitError('uh oh!', { name: 'MyError' })
+        assert.strictEqual(error.name, 'MyError')
+    })
+
+    it('can store an error code', function () {
+        const error = new ToolkitError('uh oh!', { code: 'BrokeStuff' })
+        assert.strictEqual(error.code, 'BrokeStuff')
+    })
+
+    it('can store detailed information', function () {
+        const error = new ToolkitError('uh oh!', { details: { why: 'something broke' } })
+        assert.strictEqual(error.details?.why, 'something broke')
+    })
+
+    it('can chain errors together', function () {
+        const error1 = new Error()
+        const error2 = new ToolkitError('uh oh!', { cause: error1 })
+        assert.strictEqual(error2.cause, error1)
+    })
+
+    describe('immutability', function () {
+        it('throws if trying to assign to `cause` after instantiation', function () {
+            const error = new ToolkitError('uh oh!')
+            assert.throws(() => Object.assign(error, { cause: new Error() }))
+        })
+
+        it('does not use the indirect `cause` reference passed in during construction', function () {
+            const info = { cause: new Error() }
+            const error = new ToolkitError('uh oh!', info)
+            assert.strictEqual(error.cause, info.cause)
+
+            info.cause = new Error()
+            assert.notStrictEqual(error.cause, info.cause)
+        })
+    })
+
+    describe('cancels', function () {
+        it('treats `user` cancellations as cancelled', function () {
+            const error = new ToolkitError('', { cause: new CancellationError('user') })
+            assert.strictEqual(error.cancelled, true)
+        })
+
+        it('does not treat `timeout` cancellations as cancelled', function () {
+            const error = new ToolkitError('', { cause: new CancellationError('timeout') })
+            assert.strictEqual(error.cancelled, false)
+        })
+
+        it('traverses the error chain to determine cancellation', function () {
+            const error1 = new ToolkitError('', { cause: new CancellationError('user') })
+            const error2 = new ToolkitError('', { cause: error1 })
+            assert.strictEqual(error2.cancelled, true)
+        })
+
+        it('uses explicit `cancellation` flag if set to `true`', function () {
+            const error = new ToolkitError('', {
+                cancelled: true,
+                cause: new CancellationError('timeout'),
+            })
+            assert.strictEqual(error.cancelled, true)
+        })
+
+        it('uses explicit `cancellation` flag if set to `false`', function () {
+            const error = new ToolkitError('', {
+                cancelled: false,
+                cause: new CancellationError('user'),
+            })
+            assert.strictEqual(error.cancelled, false)
+        })
+    })
+
+    describe('traces', function () {
+        it('uses the error message + name', function () {
+            const error = new ToolkitError('uh oh!', { name: 'MyError' })
+            assert.strictEqual(error.trace, `MyError: uh oh!`)
+        })
+
+        it('formats error details and appends the result to the end of the message', function () {
+            const error = new ToolkitError('oops', { details: { foo: 'Foo', bar: 'Bar' } })
+            assert.strictEqual(error.trace, `Error: oops (foo: Foo; bar: Bar)`)
+        })
+
+        it('adds the error code if available', function () {
+            const error = new ToolkitError('oops', { code: 'MyBad', details: { foo: 'Foo' } })
+            assert.strictEqual(error.trace, `Error: oops [MyBad] (foo: Foo)`)
+        })
+
+        it('does not include the code when it is equal to the name', function () {
+            const error = new ToolkitError('oops', { code: 'MyBad', name: 'MyBad' })
+            assert.strictEqual(error.trace, `MyBad: oops`)
+        })
+
+        it('formats chains of errors', function () {
+            const first = new ToolkitError('oops', { code: 'MyBad' })
+            const second = ToolkitError.chain(first, 'uh oh!', { name: 'MyError' })
+            const third = ToolkitError.chain(second, 'something broke')
+
+            assert.strictEqual(third.trace, `Error: something broke\n\t -> MyError: uh oh!\n\t -> Error: oops [MyBad]`)
+        })
+
+        it('includes extra information for AWS errors', function () {
+            const original = Object.assign(new Error('Access Denied'), {
+                statusCode: 403,
+                time: new Date(),
+                name: 'AccessDeniedException',
+                code: 'AccessDeniedException',
+            })
+
+            const error = ToolkitError.chain(original, 'uh oh!')
+            assert.strictEqual(
+                error.trace,
+                `Error: uh oh!\n\t -> AccessDeniedException: Access Denied (statusCode: 403)`
+            )
+        })
+    })
+
+    describe('named', function () {
+        it('can be extended with a constant name', function () {
+            const MyError = ToolkitError.named('MyError')
+            assert.strictEqual(new MyError('uh oh!').name, 'MyError')
+        })
+
+        it('maintains the prototype chain with a constructor', function () {
+            const OopsieError = class extends ToolkitError.named('OopsieError') {
+                public constructor() {
+                    super('oopsies', { code: 'OopsieErrorCode' })
+                }
+            }
+
+            const error = OopsieError.chain(new Error('oops'), 'uh oh!')
+            assert.ok(error instanceof ToolkitError)
+            assert.ok(error instanceof OopsieError)
+            assert.strictEqual(error.cause, undefined)
+            assert.strictEqual(error.message, 'oopsies')
+            assert.strictEqual(error.code, 'OopsieErrorCode')
+        })
+
+        it('maintains the prototype chain without a constructor', function () {
+            const MyError = ToolkitError.named('MyError')
+            const MyOtherError = class extends MyError {
+                public readonly fault = 'foo'
+            }
+
+            const error = MyOtherError.chain(new Error('oops'), 'uh oh!')
+            assert.ok(error instanceof ToolkitError)
+            assert.ok(error instanceof MyError)
+            assert.ok(error instanceof MyOtherError)
+            assert.strictEqual(error.name, 'MyError')
+            assert.strictEqual(error.fault, 'foo')
+            assert.strictEqual(error.cause?.message, 'oops')
+        })
+    })
+
+    describe(`${DiskCacheError.name}`, function () {
+        it(`subclasses ${ToolkitError.named.name}()`, function () {
+            const dce = new DiskCacheError('foo')
+            assert.strictEqual(dce instanceof ToolkitError, true)
+            assert.strictEqual(dce.code, 'DiskCacheError')
+            assert.strictEqual(dce.name, 'DiskCacheError')
+        })
+    })
+})
+
+describe('Telemetry', function () {
+    describe('getTelemetryResult', function () {
+        it('returns `Succeeded` if no error is given', function () {
+            assert.strictEqual(getTelemetryResult(undefined), 'Succeeded')
+        })
+
+        it('returns `Cancelled` for user cancellation errors', function () {
+            assert.strictEqual(getTelemetryResult(new CancellationError('user')), 'Cancelled')
+        })
+
+        it('returns `Cancelled` for a cancelled `ToolkitError`', function () {
+            const error = ToolkitError.chain(new CancellationError('user'), '')
+            assert.strictEqual(getTelemetryResult(error), 'Cancelled')
+        })
+
+        it('returns `Failed` for timeout errors', function () {
+            assert.strictEqual(getTelemetryResult(new CancellationError('timeout')), 'Failed')
+        })
+
+        it('returns `Failed` for generic errors', function () {
+            assert.strictEqual(getTelemetryResult(new Error()), 'Failed')
+        })
+    })
+
+    describe('getTelemetryReason', function () {
+        it('uses the error name if there is no error chain', function () {
+            const error = new ToolkitError('', { name: 'MyError' })
+            assert.strictEqual(getTelemetryReason(error), 'MyError')
+        })
+
+        it('uses the error `code` instead of the name', function () {
+            const error = new ToolkitError('', { name: 'MyError', code: 'ErrorCode' })
+            assert.strictEqual(getTelemetryReason(error), 'ErrorCode')
+        })
+
+        it('can handle AWS errors (JS SDK v2)', function () {
+            const error = Object.assign(new Error(), { code: 'AccessDeniedException', time: new Date() })
+            assert.strictEqual(getTelemetryReason(error), 'AccessDeniedException')
+        })
+
+        it('can handle AWS errors (JS SDK v3)', function () {
+            const error = new UnauthorizedException({ message: '', $metadata: {} })
+            assert.strictEqual(getTelemetryReason(error), 'UnauthorizedException')
+        })
+
+        it('traverses the error chain for the root cause', function () {
+            const error1 = new ToolkitError('', { code: 'ErrorCode' })
+            const error2 = new ToolkitError('', { cause: error1 })
+            assert.strictEqual(getTelemetryReason(error2), 'ErrorCode')
+        })
+    })
+})
+
+describe('resolveErrorMessageToDisplay()', function () {
+    const defaultMessage = 'My Default Message!'
+    const normalErrorMessage = 'Normal error message'
+    const toolkitErrorMessage = 'Toolkit error message'
+    const awsErrorMessage = 'AWS error message'
+
+    const errorTime: Date = new Date()
+    const preferredErrors: string[] = [
+        'ServiceQuotaExceededException',
+        'ConflictException',
+        'ValidationException',
+        'ResourceNotFoundException',
+    ]
+    const prioritiziedAwsErrors: TestAwsError[] = preferredErrors.map((name) => {
+        return new TestAwsError(name, awsErrorMessage, errorTime)
+    })
+
+    // Sanity check specific errors are resolved as expected
+    for (const error of prioritiziedAwsErrors) {
+        it(`resolves ${error.code} message when provided directly`, function () {
+            const message = resolveErrorMessageToDisplay(error, defaultMessage)
+            assert.strictEqual(message, `${defaultMessage}: ${awsErrorMessage}`)
+        })
+    }
+
+    it('gets default message if no error is given', function () {
+        const message = resolveErrorMessageToDisplay(undefined, defaultMessage)
+        assert.strictEqual(message, defaultMessage)
+    })
+
+    it('gets default message if normal Error is given', function () {
+        const message = resolveErrorMessageToDisplay(new Error(normalErrorMessage), defaultMessage)
+        const expected = `${defaultMessage}: ${normalErrorMessage}`
+        assert.strictEqual(message, expected)
+    })
+
+    it('gets ToolkitError if given', function () {
+        const message = resolveErrorMessageToDisplay(new ToolkitError(toolkitErrorMessage), defaultMessage)
+        assert.strictEqual(message, toolkitErrorMessage)
+    })
+
+    it('gets AWSError nested in a ToolkitError cause', function () {
+        const awsError = prioritiziedAwsErrors[0]
+        const toolkitError = new ToolkitError(toolkitErrorMessage, { cause: awsError })
+
+        const message = resolveErrorMessageToDisplay(toolkitError, defaultMessage)
+
+        assert.strictEqual(message, `${toolkitErrorMessage}: ${awsErrorMessage}`)
+    })
+
+    it('gets AWSError nested multiple levels in a ToolkitError cause', function () {
+        const awsError = prioritiziedAwsErrors[0]
+        const toolkitErrorTail = new ToolkitError(`${toolkitErrorMessage}-tail`, { cause: awsError })
+        const toolkitErrorMiddle = new ToolkitError(`${toolkitErrorMessage}-middle`, { cause: toolkitErrorTail })
+        const toolkitErrorHead = new ToolkitError(`${toolkitErrorMessage}-head`, { cause: toolkitErrorMiddle })
+
+        const message = resolveErrorMessageToDisplay(toolkitErrorHead, defaultMessage)
+
+        assert.strictEqual(message, `${toolkitErrorMessage}-head: ${awsErrorMessage}`)
+    })
+
+    it('gets first error if no preferred error in cause-chain', function () {
+        const err1 = new Error(`${toolkitErrorMessage}-middle`)
+        const err2 = new Error(`${toolkitErrorMessage}-head`)
+        ;(err2 as any).cause = err1
+
+        const expected = `${defaultMessage}: ${toolkitErrorMessage}-head`
+        assert.strictEqual(resolveErrorMessageToDisplay(err2, defaultMessage), expected)
+    })
+
+    it('prefers AWSError matching preferredErrors', function () {
+        const awsErr1 = new TestAwsError('ValidationException', 'validation msg', errorTime)
+        const awsErr2 = new TestAwsError('NonPrioritizedAwsException', 'nonprioritized msg', errorTime)
+        ;(awsErr2 as any).cause = awsErr1
+        const err3 = new ToolkitError(toolkitErrorMessage, { cause: awsErr2 })
+
+        const expected = `${toolkitErrorMessage}: validation msg`
+        assert.strictEqual(resolveErrorMessageToDisplay(err3, defaultMessage), expected)
+        ;(awsErr2 as any).cause = new Error('foo')
+        assert.strictEqual(
+            resolveErrorMessageToDisplay(err3, defaultMessage),
+            `${toolkitErrorMessage}: nonprioritized msg`
+        )
+    })
+})
+
+describe('util', function () {
+    it('findBestErrorInChain()', function () {
+        // assert.deepStrictEqual(getErrorMsg(findBestErrorInChain(fakeErrorChain())), 'access_denied error_description')
+
+        const err1 = new TestAwsError('ValidationException', 'aws validation msg 1', new Date())
+        const err2 = new TestAwsError('ValidationException', 'aws validation msg 2', new Date())
+        ;(err2 as any).cause = err1
+        const err3 = new Error('err msg 3')
+        ;(err3 as any).cause = err2
+        assert.strictEqual(findBestErrorInChain(err3), err1)
+        ;(err2 as any).error_description = 'aws error desc 2'
+        assert.strictEqual(findBestErrorInChain(err3), err2)
+    })
+
+    it('formatError()', function () {
+        assert.deepStrictEqual(
+            formatError(
+                fakeErrorChain(undefined, fakeAwsErrorAccessDenied(), new Error('err 3'), fakeAwsErrorUnauth())
+            ),
+            'unauthorized-name: unauthorized message [unauthorized-code] (requestId: be62f79a-e9cf-41cd-a755-e6920c56e4fb)'
+        )
+    })
+
+    it('getErrorId', function () {
+        let error = new Error()
+        assert.deepStrictEqual(getErrorId(error), 'Error')
+
+        error = new Error()
+        error.name = 'MyError'
+        assert.deepStrictEqual(getErrorId(error), 'MyError')
+
+        error = new ToolkitError('', { code: 'MyCode' })
+        assert.deepStrictEqual(getErrorId(error), 'MyCode')
+
+        // `code` takes priority over `name`
+        error = new ToolkitError('', { code: 'MyCode', name: 'MyError' })
+        assert.deepStrictEqual(getErrorId(error), 'MyCode')
+    })
+
+    it('getErrorMsg()', function () {
+        assert.deepStrictEqual(
+            getErrorMsg(
+                fakeErrorChain(undefined, fakeAwsErrorAccessDenied(), new Error('err 3'), fakeAwsErrorUnauth())
+            ),
+            'unauthorized message'
+        )
+        assert.deepStrictEqual(getErrorMsg(undefined), undefined)
+        let awsErr = new TestAwsError('ValidationException', 'aws validation msg 1', new Date())
+        assert.deepStrictEqual(getErrorMsg(awsErr), 'aws validation msg 1')
+        ;(awsErr as any).error_description = ''
+        assert.deepStrictEqual(getErrorMsg(awsErr), 'aws validation msg 1')
+        ;(awsErr as any).error_description = {}
+        assert.deepStrictEqual(getErrorMsg(awsErr), 'aws validation msg 1')
+        ;(awsErr as any).error_description = 'aws error desc 1'
+        assert.deepStrictEqual(getErrorMsg(awsErr), 'aws error desc 1')
+
+        // Arg withCause=true
+        let toolkitError = new ToolkitError('ToolkitError Message')
+        assert.deepStrictEqual(getErrorMsg(toolkitError, true), 'ToolkitError Message')
+
+        awsErr = new TestAwsError('ValidationException', 'aws validation msg 1', new Date())
+        toolkitError = new ToolkitError('ToolkitError Message', { cause: awsErr })
+        assert.deepStrictEqual(
+            getErrorMsg(toolkitError, true),
+            `ToolkitError Message | ValidationException: aws validation msg 1`
+        )
+
+        const nestedNestedToolkitError = new Error('C')
+        nestedNestedToolkitError.name = 'NameC'
+        const nestedToolkitError = new ToolkitError('B', { cause: nestedNestedToolkitError, code: 'CodeB' })
+        toolkitError = new ToolkitError('A', { cause: nestedToolkitError, code: 'CodeA' })
+        assert.deepStrictEqual(getErrorMsg(toolkitError, true), `CodeA: A | CodeB: B | NameC: C`)
+
+        // Arg withCause=true excludes the generic 'Error' id
+        const errorWithGenericName = new Error('A') // note this does not set a value for `name`, by default it is 'Error'
+        assert.deepStrictEqual(getErrorMsg(errorWithGenericName, true), `A`)
+        errorWithGenericName.name = 'NameA' // now we set a `name`
+        assert.deepStrictEqual(getErrorMsg(errorWithGenericName, true), `NameA: A`)
+    })
+
+    it('getTelemetryReasonDesc()', () => {
+        const err = new Error('Cause Message a/b/c/d.txt')
+        const toolkitError = new ToolkitError('ToolkitError Message', { cause: err, code: 'CodeA' })
+        assert.deepStrictEqual(
+            getTelemetryReasonDesc(toolkitError),
+            'CodeA: ToolkitError Message | Cause Message x/x/x/x.txt'
+        )
+    })
+
+    function makeSyntaxErrorWithSdkClientError() {
+        // The following error messages are not arbitrary, changing them can break functionality
+        const syntaxError: Error = new SyntaxError(
+            'Unexpected token \'<\', "<html><bod"... is not valid JSON Deserialization error: to see the raw response, inspect the hidden field {error}.$response on this object.'
+        )
+        // Under the hood of a SyntaxError may be a hidden field with the real reason for the failure
+        ;(syntaxError as any)['$response'] = { reason: 'SDK Client unexpected error response: data response code: 500' }
+        return syntaxError
+    }
+
+    it('isNetworkError()', function () {
+        assert.deepStrictEqual(
+            isNetworkError(new Error('Failed to establish a socket connection to proxies BLAH BLAH BLAH')),
+            true,
+            'Did not VS Code Proxy error as network error'
+        )
+        assert.deepStrictEqual(
+            isNetworkError(new Error('I am NOT a network error')),
+            false,
+            'Incorrectly indicated as network error'
+        )
+
+        const awsClientResponseError = AwsClientResponseError.instanceIf(makeSyntaxErrorWithSdkClientError())
+        assert.deepStrictEqual(
+            isNetworkError(awsClientResponseError),
+            true,
+            'Did not indicate SyntaxError as network error'
+        )
+
+        const err = new Error('getaddrinfo ENOENT oidc.us-east-1.amazonaws.com')
+        ;(err as any).code = 'ENOENT'
+        assert.deepStrictEqual(isNetworkError(err), true, 'Did not indicate ENOENT error as network error')
+
+        const ebusyErr = new Error('getaddrinfo EBUSY oidc.us-east-1.amazonaws.com')
+        ;(ebusyErr as any).code = 'EBUSY'
+        assert.deepStrictEqual(isNetworkError(ebusyErr), true, 'Did not indicate EBUSY error as network error')
+
+        // Response code errors
+        let reponseCodeErr = new Error()
+        reponseCodeErr.name = '502'
+        assert.deepStrictEqual(isNetworkError(reponseCodeErr), true, 'Did not indicate 502 error as network error')
+        reponseCodeErr = new Error()
+        reponseCodeErr.name = '200'
+        assert.deepStrictEqual(
+            isNetworkError(reponseCodeErr),
+            false,
+            'Incorrectly indicated 200 error as network error'
+        )
+    })
+
+    describe('AwsClientResponseError', function () {
+        it('handles the happy path cases', function () {
+            const syntaxError = makeSyntaxErrorWithSdkClientError()
+
+            assert.deepStrictEqual(
+                AwsClientResponseError.tryExtractReasonFromSyntaxError(syntaxError),
+                'SDK Client unexpected error response: data response code: 500'
+            )
+            const responseError = AwsClientResponseError.instanceIf(syntaxError)
+            assert(!(responseError instanceof SyntaxError))
+            assert(responseError instanceof Error)
+            assert(responseError instanceof AwsClientResponseError)
+            assert(responseError.message === 'SDK Client unexpected error response: data response code: 500')
+        })
+
+        it('gracefully handles a SyntaxError with missing fields', function () {
+            let syntaxError = makeSyntaxErrorWithSdkClientError()
+
+            // No message about a '$response' field existing
+            syntaxError.message = 'This does not mention a "$response" field existing'
+            assert(!(AwsClientResponseError.instanceIf(syntaxError) instanceof AwsClientResponseError))
+            assert.equal(syntaxError, AwsClientResponseError.instanceIf(syntaxError))
+
+            // No '$response' field in SyntaxError
+            syntaxError = makeSyntaxErrorWithSdkClientError()
+            delete (syntaxError as any)['$response']
+            assertIsAwsClientResponseError(syntaxError, `No '$response' field in SyntaxError | ${syntaxError.message}`)
+            syntaxError = makeSyntaxErrorWithSdkClientError()
+            ;(syntaxError as any)['$response'] = undefined
+            assertIsAwsClientResponseError(syntaxError, `No '$response' field in SyntaxError | ${syntaxError.message}`)
+
+            // No 'reason' in '$response'
+            syntaxError = makeSyntaxErrorWithSdkClientError()
+            let response = (syntaxError as any)['$response']
+            delete response['reason']
+            assertIsAwsClientResponseError(
+                syntaxError,
+                `No 'reason' field in '$response' | ${JSON.stringify(response)} | ${syntaxError.message}`
+            )
+            syntaxError = makeSyntaxErrorWithSdkClientError()
+            response = (syntaxError as any)['$response']
+            response['reason'] = undefined
+            assertIsAwsClientResponseError(
+                syntaxError,
+                `No 'reason' field in '$response' | ${JSON.stringify(response)} | ${syntaxError.message}`
+            )
+
+            function assertIsAwsClientResponseError(e: Error, expectedMessage: string) {
+                assert.deepStrictEqual(AwsClientResponseError.tryExtractReasonFromSyntaxError(e), expectedMessage)
+                assert(AwsClientResponseError.instanceIf(e) instanceof AwsClientResponseError)
+            }
+        })
+    })
+
+    it('scrubNames()', async function () {
+        const fakeUser = 'jdoe123'
+        assert.deepStrictEqual(scrubNames('', fakeUser), '')
+        assert.deepStrictEqual(scrubNames('a ./ b', fakeUser), 'a ./ b')
+        assert.deepStrictEqual(scrubNames('a ../ b', fakeUser), 'a ../ b')
+        assert.deepStrictEqual(scrubNames('a /.. b', fakeUser), 'a /.. b')
+        assert.deepStrictEqual(scrubNames('a //..// b', fakeUser), 'a //..// b')
+        assert.deepStrictEqual(scrubNames('a / b', fakeUser), 'a / b')
+        assert.deepStrictEqual(scrubNames('a ~/ b', fakeUser), 'a ~/ b')
+        assert.deepStrictEqual(scrubNames('a //// b', fakeUser), 'a //// b')
+        assert.deepStrictEqual(scrubNames('a .. b', fakeUser), 'a .. b')
+        assert.deepStrictEqual(scrubNames('a . b', fakeUser), 'a . b')
+        assert.deepStrictEqual(scrubNames('      lots      of         space       ', 'space'), 'lots of x')
+        assert.deepStrictEqual(
+            scrubNames(
+                'Failed to save c:/fooß/aïböcß/aób∑c/∑ö/ππ¨p/ö/a/bar123öabc/baz.txt EACCES no permissions (error!)',
+                fakeUser
+            ),
+            'Failed to save c:/xß/xï/xó/x∑/xπ/xö/x/xö/x.txt EACCES no permissions (error!)'
+        )
+        assert.deepStrictEqual(
+            scrubNames('user: jdoe123 file: C:/Users/user1/.aws/sso/cache/abc123.json (regex: /foo/)', fakeUser),
+            'user: x file: C:/Users/x/.aws/sso/cache/x.json (regex: /x/)'
+        )
+        assert.deepStrictEqual(scrubNames('/Users/user1/foo.jso', fakeUser), '/Users/x/x.jso')
+        assert.deepStrictEqual(scrubNames('/Users/user1/foo.js', fakeUser), '/Users/x/x.js')
+        assert.deepStrictEqual(scrubNames('/Users/user1/noFileExtension', fakeUser), '/Users/x/x')
+        assert.deepStrictEqual(scrubNames('/Users/user1/minExtLength.a', fakeUser), '/Users/x/x.a')
+        assert.deepStrictEqual(scrubNames('/Users/user1/extIsNum.123456', fakeUser), '/Users/x/x.123456')
+        assert.deepStrictEqual(
+            scrubNames('/Users/user1/foo.looooooooongextension', fakeUser),
+            '/Users/x/x.looooooooongextension'
+        )
+        assert.deepStrictEqual(scrubNames('/Users/user1/multipleExts.ext1.ext2.ext3', fakeUser), '/Users/x/x.ext3')
+
+        assert.deepStrictEqual(scrubNames('c:\\fooß\\bar\\baz.txt', fakeUser), 'c:/xß/x/x.txt')
+        assert.deepStrictEqual(
+            scrubNames('uhh c:\\path with\\ spaces \\baz.. hmm...', fakeUser),
+            'uhh c:/x x/ spaces /x hmm...'
+        )
+        assert.deepStrictEqual(
+            scrubNames('unc path: \\\\server$\\pipename\\etc END', fakeUser),
+            'unc path: //x$/x/x END'
+        )
+        assert.deepStrictEqual(
+            scrubNames('c:\\Users\\user1\\.aws\\sso\\cache\\abc123.json jdoe123 abc', fakeUser),
+            'c:/Users/x/.aws/sso/cache/x.json x abc'
+        )
+        assert.deepStrictEqual(
+            scrubNames('unix /home/jdoe123/.aws/config failed', fakeUser),
+            'unix /home/x/.aws/config failed'
+        )
+        assert.deepStrictEqual(scrubNames('unix ~jdoe123/.aws/config failed', fakeUser), 'unix ~x/.aws/config failed')
+        assert.deepStrictEqual(scrubNames('unix ../../.aws/config failed', fakeUser), 'unix ../../.aws/config failed')
+        assert.deepStrictEqual(scrubNames('unix ~/.aws/config failed', fakeUser), 'unix ~/.aws/config failed')
+    })
+})
+
+describe('errors.tryRun()', function () {
+    it('swallows error from sync fn', function () {
+        const err = new Error('err')
+        tryRun(
+            () => {
+                throw err
+            },
+            () => false
+        )
+    })
+
+    it('swallows error from async fn', async function () {
+        const err = new Error('err')
+        await tryRun(
+            async () => {
+                throw err
+            },
+            () => false
+        )
+    })
+
+    it('throws error from sync fn', function () {
+        const err = new Error('err')
+        assert.throws(() => {
+            tryRun(
+                () => {
+                    throw err
+                },
+                () => true
+            )
+        }, err)
+    })
+
+    it('throws error from async fn', async function () {
+        const err = new Error('err')
+        await assert.rejects(async () => {
+            await tryRun(
+                async () => {
+                    throw err
+                },
+                () => true
+            )
+        }, err)
+    })
+})
diff --git a/packages/core/src/test/shared/extensionUtilities.test.ts b/packages/core/src/test/shared/extensionUtilities.test.ts
new file mode 100644
index 00000000000..ce4c764d3d5
--- /dev/null
+++ b/packages/core/src/test/shared/extensionUtilities.test.ts
@@ -0,0 +1,505 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+
+import { ServiceException } from '@smithy/smithy-client'
+import * as sinon from 'sinon'
+import { DefaultEc2MetadataClient } from '../../shared/clients/ec2MetadataClient'
+import * as vscode from 'vscode'
+import { UserActivity, getComputeRegion, initializeComputeRegion, isCn } from '../../shared/extensionUtilities'
+import { isDifferentVersion, setMostRecentVersion } from '../../shared/extensionUtilities'
+import { InstanceIdentity } from '../../shared/clients/ec2MetadataClient'
+import { extensionVersion } from '../../shared/vscode/env'
+import { sleep } from '../../shared/utilities/timeoutUtils'
+import globals from '../../shared/extensionGlobals'
+import { maybeShowMinVscodeWarning } from '../../shared/extensionStartup'
+import { getTestWindow } from './vscode/window'
+import { assertTelemetry } from '../testUtil'
+import { isSageMaker } from '../../shared/extensionUtilities'
+import { hasSageMakerEnvVars } from '../../shared/vscode/env'
+
+describe('extensionUtilities', function () {
+    it('maybeShowMinVscodeWarning', async () => {
+        const testVscodeVersion = '99.0.0'
+        await maybeShowMinVscodeWarning(testVscodeVersion)
+        const expectedMsg =
+            /will soon require .* 99\.0\.0 or newer. The currently running version .* will no longer receive updates./
+        const msg = await getTestWindow().waitForMessage(expectedMsg)
+        msg.close()
+        assertTelemetry('toolkit_showNotification', [])
+    })
+
+    describe('isDifferentVersion', function () {
+        it('returns false if the version exists and matches the existing version exactly', async function () {
+            const goodVersion = '1.2.3'
+            await globals.globalState.update('globalsMostRecentVersion', goodVersion)
+
+            assert.strictEqual(isDifferentVersion(goodVersion), false)
+        })
+
+        it("returns true if a most recent version isn't set", async () => {
+            assert.ok(isDifferentVersion())
+        })
+
+        it("returns true if a most recent version doesn't match the current version", async () => {
+            const oldVersion = '1.2.3'
+            const newVersion = '4.5.6'
+            await globals.globalState.update('globalsMostRecentVersion', oldVersion)
+
+            assert.ok(isDifferentVersion(newVersion))
+        })
+    })
+
+    describe('setMostRecentVersion', function () {
+        it('sets the most recent version', async function () {
+            setMostRecentVersion()
+            assert.strictEqual(globals.globalState.get('globalsMostRecentVersion'), extensionVersion)
+        })
+    })
+})
+
+describe('initializeComputeRegion, getComputeRegion', async function () {
+    const metadataService = new DefaultEc2MetadataClient()
+
+    let sandbox: sinon.SinonSandbox
+
+    before(function () {
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('throws if the region has not been set', async function () {
+        // not quite a pure test: we call activate during the test load so this value will always be set
+        // manually hack in the notInitialized value to trigger the error
+        sandbox.stub(metadataService, 'getInstanceIdentity').resolves({ region: 'notInitialized' })
+
+        await initializeComputeRegion(metadataService, true)
+        assert.throws(getComputeRegion)
+    })
+
+    it('returns a compute region', async function () {
+        sandbox.stub(metadataService, 'getInstanceIdentity').resolves({ region: 'us-weast-1' })
+
+        await initializeComputeRegion(metadataService, true)
+        assert.strictEqual(getComputeRegion(), 'us-weast-1')
+    })
+
+    it('returns a compute region for sagemaker', async function () {
+        sandbox.stub(metadataService, 'getInstanceIdentity').resolves({ region: 'us-weast-1' })
+
+        await initializeComputeRegion(metadataService, false, true)
+        assert.strictEqual(getComputeRegion(), 'us-weast-1')
+    })
+
+    it('returns "unknown" if cloud9 and the MetadataService request fails', async function () {
+        sandbox.stub(metadataService, 'getInstanceIdentity').rejects({} as ServiceException)
+
+        await initializeComputeRegion(metadataService, true)
+        assert.strictEqual(getComputeRegion(), 'unknown')
+    })
+
+    it('returns "unknown" if sagemaker and the MetadataService request fails', async function () {
+        sandbox.stub(metadataService, 'getInstanceIdentity').rejects({} as ServiceException)
+
+        await initializeComputeRegion(metadataService, false, true)
+        assert.strictEqual(getComputeRegion(), 'unknown')
+    })
+
+    it('returns "unknown" if cloud9 and can not find a region', async function () {
+        sandbox.stub(metadataService, 'getInstanceIdentity').resolves({} as InstanceIdentity)
+
+        await initializeComputeRegion(metadataService, true)
+        assert.strictEqual(getComputeRegion(), 'unknown')
+    })
+
+    it('returns "unknown" if sagemaker and can not find a region', async function () {
+        sandbox.stub(metadataService, 'getInstanceIdentity').resolves({} as InstanceIdentity)
+
+        await initializeComputeRegion(metadataService, false, true)
+        assert.strictEqual(getComputeRegion(), 'unknown')
+    })
+
+    it('returns undefined if not cloud9 or sagemaker', async function () {
+        sandbox.stub(metadataService, 'getInstanceIdentity').callsArgWith(1, undefined, 'lol')
+
+        await initializeComputeRegion(metadataService, false, false)
+        assert.strictEqual(getComputeRegion(), undefined)
+    })
+
+    it('handles invalid endpoint or invalid response', async function () {
+        await assert.rejects(metadataService.invoke('/bogus/path'))
+    })
+})
+
+describe('isCn', function () {
+    let sandbox: sinon.SinonSandbox
+    const metadataService = new DefaultEc2MetadataClient()
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('returns false when compute region is not defined', async function () {
+        // Reset the compute region to undefined first
+        const utils = require('../../shared/extensionUtilities')
+        Object.defineProperty(utils, 'computeRegion', {
+            value: undefined,
+            configurable: true,
+        })
+
+        const result = isCn()
+
+        assert.strictEqual(result, false, 'isCn() should return false when compute region is undefined')
+    })
+
+    it('returns false when compute region is not initialized', async function () {
+        // Set the compute region to "notInitialized"
+        const utils = require('../../shared/extensionUtilities')
+        Object.defineProperty(utils, 'computeRegion', {
+            value: 'notInitialized',
+            configurable: true,
+        })
+
+        const result = isCn()
+
+        assert.strictEqual(result, false, 'isCn() should return false when compute region is notInitialized')
+    })
+
+    it('returns true for CN regions', async function () {
+        sandbox.stub(metadataService, 'getInstanceIdentity').resolves({ region: 'cn-north-1' })
+        await initializeComputeRegion(metadataService, false, true)
+
+        const result = isCn()
+
+        assert.strictEqual(result, true, 'isCn() should return true for China regions')
+    })
+
+    it('returns false for non-CN regions', async function () {
+        sandbox.stub(metadataService, 'getInstanceIdentity').resolves({ region: 'us-east-1' })
+        await initializeComputeRegion(metadataService, false, true)
+
+        const result = isCn()
+
+        assert.strictEqual(result, false, 'isCn() should return false for non-China regions')
+    })
+
+    it('returns false when an error occurs', async function () {
+        const utils = require('../../shared/extensionUtilities')
+
+        sandbox.stub(utils, 'getComputeRegion').throws(new Error('Test error'))
+
+        const result = isCn()
+
+        assert.strictEqual(result, false, 'isCn() should return false when an error occurs')
+    })
+})
+
+describe('UserActivity', function () {
+    let count: number
+    let sandbox: sinon.SinonSandbox
+
+    function onEventTriggered() {
+        count++
+    }
+
+    before(function () {
+        count = 0
+        sandbox = sinon.createSandbox()
+    })
+
+    it('triggers twice when multiple user activities are fired in separate intervals', async function () {
+        const throttleDelay = 500
+
+        const firstInvervalMillisUntilFire = [100, 101, 102, 103]
+
+        const secondIntervalStart = firstInvervalMillisUntilFire[0] + throttleDelay + 1
+        const secondIntervalMillisUntilFire = [
+            secondIntervalStart + 200,
+            secondIntervalStart + 201,
+            secondIntervalStart + 201,
+            secondIntervalStart + 202,
+        ]
+        const instance = new UserActivity(throttleDelay, [
+            ...firstInvervalMillisUntilFire.map(delayedTriggeredEvent),
+            ...secondIntervalMillisUntilFire.map(delayedTriggeredEvent),
+        ])
+        instance.onUserActivity(onEventTriggered)
+        await sleep(secondIntervalStart + throttleDelay + 1)
+
+        assert.strictEqual(count, 2, 'May be flaky in CI, increase timings to improve reliability.')
+    })
+
+    describe('does not fire user activity events in specific scenarios', function () {
+        let userActivitySubscriber: sinon.SinonStubbedMember<() => void>
+        let _triggerUserActivity: (obj: any) => void
+        let instance: UserActivity
+
+        beforeEach(function () {
+            userActivitySubscriber = sandbox.stub()
+            _triggerUserActivity = () => {
+                throw Error('Called before UserActivity was instantiated')
+            }
+        })
+
+        afterEach(function () {
+            instance.dispose()
+            sandbox.restore()
+        })
+
+        it('does not fire onDidChangeWindowState when not active', function () {
+            stubUserActivityEvent(vscode.window, 'onDidChangeWindowState')
+
+            const triggerUserActivity = createTriggerActivityFunc()
+
+            triggerUserActivity({ active: false })
+            assert.strictEqual(userActivitySubscriber.callCount, 0)
+
+            triggerUserActivity({ active: true })
+            assert.strictEqual(userActivitySubscriber.callCount, 1)
+        })
+
+        it('does not fire onDidChangeTextEditorSelection when editor is `Output` panel', function () {
+            stubUserActivityEvent(vscode.window, 'onDidChangeTextEditorSelection')
+
+            const triggerUserActivity = createTriggerActivityFunc()
+
+            triggerUserActivity({ textEditor: { document: { uri: { scheme: 'output' } } } })
+            assert.strictEqual(userActivitySubscriber.callCount, 0)
+
+            triggerUserActivity({ textEditor: { document: { uri: { scheme: 'NOToutput' } } } })
+            assert.strictEqual(userActivitySubscriber.callCount, 1)
+        })
+
+        it('does not fire onDidChangeTextEditorVisibleRanges when when editor is `Output` panel', function () {
+            stubUserActivityEvent(vscode.window, 'onDidChangeTextEditorVisibleRanges')
+
+            const triggerUserActivity = createTriggerActivityFunc()
+
+            triggerUserActivity({ textEditor: { document: { uri: { scheme: 'output' } } } })
+            assert.strictEqual(userActivitySubscriber.callCount, 0)
+
+            triggerUserActivity({ textEditor: { document: { uri: { scheme: 'NOToutput' } } } })
+            assert.strictEqual(userActivitySubscriber.callCount, 1)
+        })
+
+        it('does not fire onDidChangeTextDocument when not the active user document', function () {
+            stubUserActivityEvent(vscode.workspace, 'onDidChangeTextDocument')
+            const activeEditorStub = sandbox.stub(vscode.window, 'activeTextEditor')
+
+            const triggerUserActivity = createTriggerActivityFunc()
+
+            activeEditorStub.get(() => undefined)
+            triggerUserActivity({})
+            assert.strictEqual(userActivitySubscriber.callCount, 0, 'Was not ignored when no active editor')
+
+            activeEditorStub.get(() => {
+                return { document: { uri: 'myUri' } }
+            })
+            triggerUserActivity({ document: { uri: 'myOtherUri' } })
+            assert.strictEqual(
+                userActivitySubscriber.callCount,
+                0,
+                'Was not ignored when active editor document was different from the event'
+            )
+
+            triggerUserActivity({ document: { uri: 'myUri' } })
+            assert.strictEqual(
+                userActivitySubscriber.callCount,
+                1,
+                'Was ignored when the active editor document was the same as the event'
+            )
+        })
+
+        it('fires for onDidChangeActiveColorTheme (sanity check)', function () {
+            stubUserActivityEvent(vscode.window, 'onDidChangeActiveColorTheme')
+
+            const triggerUserActivity = createTriggerActivityFunc()
+
+            triggerUserActivity({})
+            assert.strictEqual(userActivitySubscriber.callCount, 1)
+        })
+
+        /**
+         * Helper to stub a vscode event object.
+         *
+         * Once stubbed, you can call {@link _triggerUserActivity} to fire
+         * the event.
+         */
+        function stubUserActivityEvent<T, K extends keyof T>(vscodeObj: T, eventName: K) {
+            const eventStub = sandbox.stub(vscodeObj, eventName)
+
+            eventStub.callsFake((callback: any) => {
+                _triggerUserActivity = callback
+                return {
+                    dispose: sandbox.stub(),
+                }
+            })
+
+            return eventStub
+        }
+
+        function createTriggerActivityFunc() {
+            instance = new UserActivity(0)
+            instance.onUserActivity(userActivitySubscriber)
+            // Creation of the UserActivity instance will call the stubbed event and set the value
+            // for _triggerUserActivity.
+            return _triggerUserActivity
+        }
+    })
+
+    function delayedTriggeredEvent(millisUntilFire: number): vscode.Event<any> {
+        const event = new vscode.EventEmitter<void>()
+        globals.clock.setTimeout(() => event.fire(), millisUntilFire)
+        return event.event
+    }
+})
+
+describe('isSageMaker', function () {
+    let sandbox: sinon.SinonSandbox
+    const env = require('../../shared/vscode/env')
+    const utils = require('../../shared/extensionUtilities')
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        utils.resetSageMakerState()
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    describe('SMAI detection', function () {
+        it('returns true when both app name and env vars match', function () {
+            sandbox.stub(vscode.env, 'appName').value('SageMaker Code Editor')
+            sandbox.stub(env, 'hasSageMakerEnvVars').returns(true)
+
+            assert.strictEqual(isSageMaker('SMAI'), true)
+        })
+
+        it('returns false when app name is different', function () {
+            sandbox.stub(vscode.env, 'appName').value('Visual Studio Code')
+            sandbox.stub(env, 'hasSageMakerEnvVars').returns(true)
+
+            assert.strictEqual(isSageMaker('SMAI'), false)
+        })
+
+        it('returns false when env vars are missing', function () {
+            sandbox.stub(vscode.env, 'appName').value('SageMaker Code Editor')
+            sandbox.stub(env, 'hasSageMakerEnvVars').returns(false)
+
+            assert.strictEqual(isSageMaker('SMAI'), false)
+        })
+
+        it('defaults to SMAI when no parameter provided', function () {
+            sandbox.stub(vscode.env, 'appName').value('SageMaker Code Editor')
+            sandbox.stub(env, 'hasSageMakerEnvVars').returns(true)
+
+            assert.strictEqual(isSageMaker(), true)
+        })
+    })
+
+    describe('SMUS detection', function () {
+        it('returns true when all conditions are met', function () {
+            sandbox.stub(vscode.env, 'appName').value('SageMaker Code Editor')
+            sandbox.stub(env, 'hasSageMakerEnvVars').returns(true)
+            sandbox.stub(process, 'env').value({ SERVICE_NAME: 'SageMakerUnifiedStudio' })
+            utils.resetSageMakerState()
+
+            assert.strictEqual(isSageMaker('SMUS'), true)
+        })
+
+        it('returns false when unified studio is missing', function () {
+            sandbox.stub(vscode.env, 'appName').value('SageMaker Code Editor')
+            sandbox.stub(env, 'hasSageMakerEnvVars').returns(true)
+            sandbox.stub(process, 'env').value({ SERVICE_NAME: 'SomeOtherService' })
+            utils.resetSageMakerState()
+
+            assert.strictEqual(isSageMaker('SMUS'), false)
+        })
+
+        it('returns false when env vars are missing', function () {
+            sandbox.stub(vscode.env, 'appName').value('SageMaker Code Editor')
+            sandbox.stub(env, 'hasSageMakerEnvVars').returns(false)
+            sandbox.stub(process, 'env').value({ SERVICE_NAME: 'SageMakerUnifiedStudio' })
+            utils.resetSageMakerState()
+
+            assert.strictEqual(isSageMaker('SMUS'), false)
+        })
+
+        it('returns false when app name is different', function () {
+            sandbox.stub(vscode.env, 'appName').value('Visual Studio Code')
+            sandbox.stub(env, 'hasSageMakerEnvVars').returns(true)
+            sandbox.stub(process, 'env').value({ SERVICE_NAME: 'SageMakerUnifiedStudio' })
+            utils.resetSageMakerState()
+
+            assert.strictEqual(isSageMaker('SMUS'), false)
+        })
+    })
+
+    it('returns false for invalid appName parameter', function () {
+        sandbox.stub(vscode.env, 'appName').value('SageMaker Code Editor')
+        sandbox.stub(env, 'hasSageMakerEnvVars').returns(true)
+
+        // @ts-ignore - Testing invalid input
+        assert.strictEqual(isSageMaker('INVALID'), false)
+    })
+})
+
+describe('hasSageMakerEnvVars', function () {
+    let sandbox: sinon.SinonSandbox
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('detects SageMaker environment variables', function () {
+        // Test SAGEMAKER_ prefix
+        sandbox.stub(process, 'env').value({ SAGEMAKER_APP_TYPE: 'JupyterServer' })
+        assert.strictEqual(hasSageMakerEnvVars(), true)
+
+        // Test SM_ prefix
+        sandbox.stub(process, 'env').value({ SM_APP_TYPE: 'CodeEditor' })
+        assert.strictEqual(hasSageMakerEnvVars(), true)
+
+        // Test SERVICE_NAME with correct value
+        sandbox.stub(process, 'env').value({ SERVICE_NAME: 'SageMakerUnifiedStudio' })
+        assert.strictEqual(hasSageMakerEnvVars(), true)
+
+        // Test STUDIO_LOGGING_DIR with correct path
+        sandbox.stub(process, 'env').value({ STUDIO_LOGGING_DIR: '/var/log/studio/app.log' })
+        assert.strictEqual(hasSageMakerEnvVars(), true)
+
+        // Test invalid SERVICE_NAME
+        sandbox.stub(process, 'env').value({ SERVICE_NAME: 'SomeOtherService' })
+        assert.strictEqual(hasSageMakerEnvVars(), false)
+
+        // Test invalid STUDIO_LOGGING_DIR
+        sandbox.stub(process, 'env').value({ STUDIO_LOGGING_DIR: '/var/log/other/app.log' })
+        assert.strictEqual(hasSageMakerEnvVars(), false)
+
+        // Test multiple env vars
+        sandbox.stub(process, 'env').value({
+            SAGEMAKER_APP_TYPE: 'JupyterServer',
+            SM_APP_TYPE: 'CodeEditor',
+        })
+        assert.strictEqual(hasSageMakerEnvVars(), true)
+
+        // Test no env vars
+        sandbox.stub(process, 'env').value({})
+        assert.strictEqual(hasSageMakerEnvVars(), false)
+    })
+})
diff --git a/packages/core/src/test/shared/extensions/ssh.test.ts b/packages/core/src/test/shared/extensions/ssh.test.ts
new file mode 100644
index 00000000000..4e9bda41217
--- /dev/null
+++ b/packages/core/src/test/shared/extensions/ssh.test.ts
@@ -0,0 +1,115 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as assert from 'assert'
+import { ChildProcess } from '../../../shared/utilities/processUtils'
+import { startSshAgent, testSshConnection } from '../../../shared/extensions/ssh'
+import { createBoundProcess } from '../../../shared/remoteSession'
+import { createExecutableFile, createTestWorkspaceFolder } from '../../testUtil'
+import { WorkspaceFolder } from 'vscode'
+import path from 'path'
+import { StartSessionResponse } from '@aws-sdk/client-ssm'
+import { fs } from '../../../shared/fs/fs'
+import { isWin } from '../../../shared/vscode/env'
+
+describe('SSH Agent', function () {
+    it('can start the agent on windows', async function () {
+        this.retries(2)
+
+        // TODO: we should also skip this test if not running in CI
+        // Local machines probably won't have admin permissions in the spawned processes
+        if (process.platform !== 'win32') {
+            this.skip()
+        }
+
+        async function runCommand(command: string) {
+            const args = ['-NoLogo', '-NonInteractive', '-ExecutionPolicy', 'RemoteSigned', '-Command', command]
+            return await new ChildProcess('pwsh.exe', args).run({ rejectOnErrorCode: true })
+        }
+
+        async function getStatus() {
+            const c = await runCommand('echo (Get-Service ssh-agent).Status')
+            return c.stdout
+        }
+
+        await runCommand('Stop-Service ssh-agent')
+        assert.strictEqual(await getStatus(), 'Stopped')
+        await startSshAgent()
+        assert.strictEqual(await getStatus(), 'Running')
+    })
+})
+
+function echoEnvVarsCmd(varNames: string[]) {
+    const toShell = (s: string) => (isWin() ? `%${s}%` : `$${s}`)
+    return `echo "${varNames.map(toShell).join(' ')}"`
+}
+
+/**
+ * Trim noisy windows ChildProcess result to final line for easier testing.
+ */
+function assertOutputContains(rawOutput: string, expectedString: string): void | never {
+    const output = rawOutput.trim().split('\n').at(-1)?.replace('"', '') ?? ''
+    assert.ok(output.includes(expectedString), `Expected output to contain "${expectedString}", but got "${output}"`)
+}
+
+describe('testSshConnection', function () {
+    let testWorkspace: WorkspaceFolder
+    let sshPath: string
+
+    before(async function () {
+        testWorkspace = await createTestWorkspaceFolder()
+        sshPath = path.join(testWorkspace.uri.fsPath, `fakeSSH${isWin() ? '.cmd' : ''}`)
+    })
+
+    after(async function () {
+        await fs.delete(testWorkspace.uri.fsPath, { recursive: true, force: true })
+        await fs.delete(sshPath, { force: true })
+    })
+
+    it('runs in bound process', async function () {
+        const envProvider = async () => ({ MY_VAR: 'yes' })
+        const process = createBoundProcess(envProvider)
+        const session = {
+            SessionId: 'testSession',
+            StreamUrl: 'testUrl',
+            TokenValue: 'testToken',
+        } as StartSessionResponse
+
+        await createExecutableFile(sshPath, echoEnvVarsCmd(['MY_VAR']))
+        const r = await testSshConnection(process, 'localhost', sshPath, 'test-user', session)
+        assertOutputContains(r.stdout, 'yes')
+    })
+
+    it('injects new session into env', async function () {
+        const oldSession = {
+            SessionId: 'testSession1',
+            StreamUrl: 'testUrl1',
+            TokenValue: 'testToken1',
+        } as StartSessionResponse
+        const newSession = {
+            SessionId: 'testSession2',
+            StreamUrl: 'testUrl2',
+            TokenValue: 'testToken2',
+        } as StartSessionResponse
+        const envProvider = async () => ({
+            SESSION_ID: oldSession.SessionId,
+            STREAM_URL: oldSession.StreamUrl,
+            TOKEN: oldSession.TokenValue,
+        })
+        const process = createBoundProcess(envProvider)
+
+        await createExecutableFile(sshPath, echoEnvVarsCmd(['SESSION_ID', 'STREAM_URL', 'TOKEN']))
+        const r = await testSshConnection(process, 'localhost', sshPath, 'test-user', newSession)
+        assertOutputContains(r.stdout, `${newSession.SessionId} ${newSession.StreamUrl} ${newSession.TokenValue}`)
+    })
+
+    it('passes proper args to the ssh invoke', async function () {
+        const executableFileContent = isWin() ? `echo "%1 %2"` : `echo "$1 $2"`
+        const process = createBoundProcess(async () => ({}))
+        await createExecutableFile(sshPath, executableFileContent)
+        const r = await testSshConnection(process, 'localhost', sshPath, 'test-user', {} as StartSessionResponse)
+        assertOutputContains(r.stdout, '-T')
+        assertOutputContains(r.stdout, 'test-user@localhost')
+    })
+})
diff --git a/packages/core/src/test/shared/featureConfig.test.ts b/packages/core/src/test/shared/featureConfig.test.ts
new file mode 100644
index 00000000000..9c9f20cb5fb
--- /dev/null
+++ b/packages/core/src/test/shared/featureConfig.test.ts
@@ -0,0 +1,155 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import { AWSError, Request } from 'aws-sdk'
+import { Features, FeatureConfigProvider, featureDefinitions, FeatureName } from '../../shared/featureConfig'
+import { ListFeatureEvaluationsResponse } from '../../codewhisperer'
+import { createSpyClient } from '../codewhisperer/testUtil'
+import { mockFeatureConfigsData } from '../fake/mockFeatureConfigData'
+
+describe('FeatureConfigProvider', () => {
+    beforeEach(async () => {
+        const clientSpy = await createSpyClient()
+        sinon.stub(clientSpy, 'listFeatureEvaluations').returns({
+            promise: () =>
+                Promise.resolve({
+                    $response: {
+                        requestId: '',
+                    },
+                    featureEvaluations: mockFeatureConfigsData,
+                }),
+        } as Request<ListFeatureEvaluationsResponse, AWSError>)
+        await FeatureConfigProvider.instance.fetchFeatureConfigs()
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    it('featureDefinitions map is not empty', () => {
+        assert.notStrictEqual(featureDefinitions.size, 0)
+        assert.ok(featureDefinitions.has(Features.test))
+    })
+
+    it('provider has getters for all the features', () => {
+        for (const name of featureDefinitions.keys()) {
+            const methodName = `get${name.charAt(0).toUpperCase() + name.slice(1)}`
+            const method = Object.getOwnPropertyDescriptors(FeatureConfigProvider.prototype)[methodName]
+
+            assert.strictEqual(method.value.name, methodName)
+            assert.ok(method)
+        }
+    })
+
+    it('test getFeatureConfigsTelemetry will return expected string', async () => {
+        assert.strictEqual(
+            FeatureConfigProvider.instance.getFeatureConfigsTelemetry(),
+            `{testFeature: TREATMENT, featureA: CONTROL, featureB: TREATMENT, customizationArnOverride: customizationName}`
+        )
+    })
+
+    it('should should return all feature flags', async () => {
+        it('should should return all feature flags', async () => {
+            const featureConfigs = FeatureConfigProvider.getFeatureConfigs()
+            const expectedFeatureConfigs = {
+                featureA: {
+                    name: 'featureA',
+                    value: {
+                        stringValue: 'testValue',
+                    },
+                    variation: 'CONTROL',
+                },
+                featureB: {
+                    name: 'featureB',
+                    value: {
+                        stringValue: 'testValue',
+                    },
+                    variation: 'TREATMENT',
+                },
+                testFeature: {
+                    name: 'testFeature',
+                    value: {
+                        stringValue: 'testValue',
+                    },
+                    variation: 'TREATMENT',
+                },
+                customizationArnOverride: {
+                    name: 'customizationArnOverride',
+                    value: {
+                        stringValue: 'customizationARN',
+                    },
+                    variation: 'customizationName',
+                },
+            }
+
+            assert.deepStrictEqual(Object.fromEntries(featureConfigs), expectedFeatureConfigs)
+        })
+    })
+
+    it('should test featureA as disabled', async () => {
+        assert.strictEqual(FeatureConfigProvider.isEnabled('featureA' as FeatureName), false)
+    })
+
+    it('should test featureB as enabled', async () => {
+        assert.strictEqual(FeatureConfigProvider.isEnabled('featureB' as FeatureName), true)
+    })
+
+    it('should test feature-does-not-exist as disabled', async () => {
+        assert.strictEqual(FeatureConfigProvider.isEnabled('feature-does-not-exist' as FeatureName), false)
+    })
+
+    it('should retrieve customization override values', async () => {
+        assert.strictEqual(
+            FeatureConfigProvider.getFeature(Features.customizationArnOverride)?.value.stringValue,
+            'customizationARN'
+        )
+        assert.strictEqual(
+            FeatureConfigProvider.getFeature(Features.customizationArnOverride)?.variation,
+            'customizationName'
+        )
+    })
+
+    describe('getProjectContextGroup', function () {
+        beforeEach(function () {
+            sinon.restore()
+        })
+
+        afterEach(function () {
+            sinon.restore()
+        })
+
+        const cases: { variationName: string; expected: string }[] = [
+            { variationName: 'CONTROL', expected: 'control' },
+            { variationName: 'TREATMENT_1', expected: 't1' },
+            { variationName: 'TREATMENT_2', expected: 't2' },
+        ]
+
+        for (const tuple of cases) {
+            it(`should return ${tuple.expected} when variation name is ${tuple.variationName}`, async function () {
+                const clientSpy = await createSpyClient()
+                sinon.stub(clientSpy, 'listFeatureEvaluations').returns({
+                    promise: () =>
+                        Promise.resolve({
+                            $response: {
+                                requestId: '',
+                            },
+                            featureEvaluations: [
+                                {
+                                    feature: 'ProjectContextV2',
+                                    variation: tuple.variationName,
+                                    value: { stringValue: 'foo' },
+                                },
+                            ],
+                        }),
+                } as Request<ListFeatureEvaluationsResponse, AWSError>)
+                await FeatureConfigProvider.instance.fetchFeatureConfigs()
+
+                assert.strictEqual(FeatureConfigProvider.instance.getProjectContextGroup(), tuple.expected)
+            })
+        }
+    })
+})
diff --git a/packages/core/src/test/shared/filesystemUtilities.test.ts b/packages/core/src/test/shared/filesystemUtilities.test.ts
new file mode 100644
index 00000000000..3bb3a018b37
--- /dev/null
+++ b/packages/core/src/test/shared/filesystemUtilities.test.ts
@@ -0,0 +1,203 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as os from 'os'
+import * as path from 'path'
+import {
+    fileExists,
+    getFileDistance,
+    getNonexistentFilename,
+    isInDirectory,
+    makeTemporaryToolkitFolder,
+    tempDirPath,
+    throwOnUnstableFileSystem,
+} from '../../shared/filesystemUtilities'
+import { fs } from '../../shared'
+import { TestFolder } from '../testUtil'
+
+describe('filesystemUtilities', function () {
+    const targetFilename = 'findThisFile12345.txt'
+    let targetFilePath: string
+    let tempFolder: string
+    const foldersToCleanUp: string[] = []
+
+    beforeEach(async function () {
+        // Make a temp folder for all these tests
+        tempFolder = await makeTemporaryToolkitFolder()
+        targetFilePath = path.join(tempFolder, targetFilename)
+
+        await fs.writeFile(targetFilePath, 'Hello, World!', 'utf8')
+
+        foldersToCleanUp.push(tempFolder)
+    })
+
+    afterEach(async function () {
+        for (const folder of foldersToCleanUp) {
+            await fs.delete(folder, { recursive: true })
+        }
+    })
+
+    describe('getNonexistentFilename()', function () {
+        it(`failure modes`, async function () {
+            await assert.rejects(async () => getNonexistentFilename('/bogus/directory/', 'foo', '.txt', 99))
+            await assert.rejects(async () => getNonexistentFilename('zzz', 'foo', '.txt', 99))
+        })
+        it(`returns a filename that does not exist in the directory`, async function () {
+            const dir = tempFolder
+            await fs.writeFile(path.join(dir, 'foo.txt'), '', 'utf8')
+            await fs.writeFile(path.join(dir, 'foo-0.txt'), '', 'utf8')
+            await fs.writeFile(path.join(dir, 'foo-1.txt'), '', 'utf8')
+            await fs.writeFile(path.join(dir, 'foo-2.txt'), '', 'utf8')
+            assert.strictEqual(await getNonexistentFilename(dir, 'foo', '.txt', 99), 'foo-3.txt')
+            assert.strictEqual(await getNonexistentFilename(dir, 'foo', '', 99), 'foo')
+        })
+        it(`returns "foo-RANDOM.txt" if max is reached`, async function () {
+            const dir = tempFolder
+            await fs.writeFile(path.join(dir, 'foo.txt'), '', 'utf8')
+            await fs.writeFile(path.join(dir, 'foo-1.txt'), '', 'utf8')
+            // Looks like "foo-75446d5d.txt".
+            assert.ok(/^foo-[a-fA-F0-9]{8}.txt$/.test(await getNonexistentFilename(dir, 'foo', '.txt', 1)))
+        })
+    })
+
+    describe('makeTemporaryToolkitFolder()', function () {
+        it(`makes temp dirs as children to filesystemUtilities.tempDirPath ('${tempDirPath}')`, async () => {
+            const parentFolder = path.dirname(tempFolder)
+
+            assert.strictEqual(
+                parentFolder,
+                tempDirPath,
+                `expected tempFolder ('${tempFolder}') to be in tempDirPath ('${tempDirPath}')`
+            )
+        })
+
+        it('creates a folder', async function () {
+            assert.ok(await fileExists(tempFolder), `expected folder to exist: ${tempFolder}`)
+        })
+
+        it('makes nested temp dirs', async function () {
+            const nestedTempDirPath = await makeTemporaryToolkitFolder('nestedSubfolder', 'moreNestedSubfolder')
+
+            foldersToCleanUp.push(nestedTempDirPath)
+            foldersToCleanUp.push(path.join(tempDirPath, 'nestedSubfolder'))
+
+            assert(
+                nestedTempDirPath.startsWith(tempDirPath),
+                `expected nestedTempDirPath ('${nestedTempDirPath}') to be in tempDirPath ('${tempDirPath}')`
+            )
+            const tmpDirExists = await fileExists(nestedTempDirPath)
+            assert(tmpDirExists, `tempFolder should exist: '${nestedTempDirPath}'`)
+        })
+    })
+
+    it('isInDirectory()', function () {
+        const basePath = path.join('this', 'is', 'the', 'way')
+        const extendedPath = path.join(basePath, 'forward')
+        const filename = 'yadayadayada.log'
+
+        assert.ok(isInDirectory(basePath, basePath))
+        assert.ok(isInDirectory(basePath, extendedPath))
+        assert.ok(isInDirectory(basePath, path.join(basePath, filename)))
+        assert.ok(isInDirectory(basePath, path.join(extendedPath, filename)))
+        assert.ok(!isInDirectory(basePath, path.join('what', 'are', 'you', 'looking', 'at')))
+        assert.ok(!isInDirectory(basePath, `${basePath}point`))
+        assert.ok(isInDirectory('/foo/bar/baz/', '/foo/bar/baz/a.txt'))
+        assert.ok(isInDirectory('/foo/bar/baz/', ''))
+        assert.ok(isInDirectory('/', ''))
+        assert.ok(isInDirectory('', 'foo'))
+        assert.ok(isInDirectory('foo', 'foo'))
+
+        if (os.platform() === 'win32') {
+            assert.ok(isInDirectory('/foo/bar/baz/', '/FOO/BAR/BAZ/A.TXT'))
+            assert.ok(isInDirectory('C:\\foo\\bar\\baz\\', 'C:/FOO/BAR/BAZ/A.TXT'))
+            assert.ok(isInDirectory('C:\\foo\\bar\\baz', 'C:\\foo\\bar\\baz\\a.txt'))
+        } else {
+            assert.ok(!isInDirectory('/foo/bar/baz/', '/FOO/BAR/BAZ/A.TXT'))
+        }
+    })
+
+    describe('getFileDistance', function () {
+        let fileA: string
+        let fileB: string
+
+        it('distance 0', function () {
+            fileA = 'foo/bar/a.java'
+            fileB = 'foo/bar/b.java'
+            const actual = getFileDistance(fileA, fileB)
+            assert.strictEqual(actual, 0)
+        })
+
+        it('root distance 0', function () {
+            fileA = 'a.txt'
+            fileB = 'b.txt'
+            const actual = getFileDistance(fileA, fileB)
+            assert.strictEqual(actual, 0)
+        })
+
+        it('distance 1', function () {
+            fileA = 'foo/bar/a.java'
+            fileB = 'foo/b.java'
+            const actual = getFileDistance(fileA, fileB)
+            assert.strictEqual(actual, 1)
+        })
+
+        it('distance 3', function () {
+            fileA = 'foo/bar/a.java'
+            fileB = 'lzz/b.java'
+            const actual = getFileDistance(fileA, fileB)
+            assert.strictEqual(actual, 3)
+        })
+
+        it('distance 4', function () {
+            fileA = 'foo/bar/a.java'
+            fileB = 'lzz/baz/b.java'
+            const actual = getFileDistance(fileA, fileB)
+            assert.strictEqual(actual, 4)
+        })
+
+        it('another distance 4', function () {
+            fileA = 'foo/a.py'
+            fileB = 'foo/foo/foo/foo/foo/b.py'
+            const actual = getFileDistance(fileA, fileB)
+            assert.strictEqual(actual, 4)
+        })
+
+        it('distance 5', function () {
+            fileA = 'foo/bar/a.java'
+            fileB = 'lzz/baz/zoo/b.java'
+            const actual = getFileDistance(fileA, fileB)
+            assert.strictEqual(actual, 5)
+        })
+
+        it('distance 6', function () {
+            fileA = 'foo/zoo/a.java'
+            fileB = 'bar/baz/bee/bww/b.java'
+            const actual = getFileDistance(fileA, fileB)
+            assert.strictEqual(actual, 6)
+        })
+
+        it('backslash distance 1', function () {
+            fileA = 'C:\\FOO\\BAR\\BAZ\\A.TXT'
+            fileB = 'C:\\FOO\\BAR\\B.TXT'
+            const actual = getFileDistance(fileA, fileB)
+            assert.strictEqual(actual, 1)
+        })
+
+        it('backslash distnace 3', function () {
+            fileA = 'C:\\FOO\\BAR\\BAZ\\LOO\\WOW\\A.txt'
+            fileB = 'C:\\FOO\\BAR\\B.txt'
+            const actual = getFileDistance(fileA, fileB)
+            assert.strictEqual(actual, 3)
+        })
+    })
+
+    describe('throwOnUnstableFileSystem', async function () {
+        it('does not throw on stable filesystem', async function () {
+            const testFolder = await TestFolder.create()
+            await throwOnUnstableFileSystem(testFolder.path)
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/filetypes.test.ts b/packages/core/src/test/shared/filetypes.test.ts
new file mode 100644
index 00000000000..26e12631419
--- /dev/null
+++ b/packages/core/src/test/shared/filetypes.test.ts
@@ -0,0 +1,175 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import assert from 'assert'
+import * as path from 'path'
+import globals from '../../shared/extensionGlobals'
+import fs from '../../shared/fs/fs'
+import * as testUtil from '../testUtil'
+import * as workspaceUtils from '../../shared/utilities/workspaceUtils'
+import { toArrayAsync } from '../../shared/utilities/collectionUtils'
+import { waitUntil } from '../../shared/utilities/timeoutUtils'
+import { mapMetadata } from '../../shared/telemetry/telemetryLogger'
+import { isCodeFile } from '../../shared/filetypes'
+
+async function getMetrics(n: number, metricName: string, timeout = 1000) {
+    return await waitUntil(
+        async () => {
+            const metrics = await toArrayAsync(
+                globals.telemetry.findIter((m) => {
+                    return m.MetricName === metricName
+                })
+            )
+            return metrics.length >= n ? metrics : undefined
+        },
+        { interval: 200, timeout: timeout }
+    )
+}
+
+describe('ide_editCodeFile telemetry', function () {
+    let jsonUri1: vscode.Uri | undefined
+    let jsonUri2: vscode.Uri | undefined
+    let tsUri: vscode.Uri | undefined
+    let noiseUri1!: vscode.Uri
+    let noiseUri2!: vscode.Uri
+
+    beforeEach(async function () {
+        await testUtil.closeAllEditors()
+        const ws = vscode.workspace.workspaceFolders?.[0]
+
+        jsonUri1 = vscode.Uri.file(workspaceUtils.tryGetAbsolutePath(ws, 'ts-plain-sam-app/tsconfig.json'))
+        jsonUri2 = vscode.Uri.file(workspaceUtils.tryGetAbsolutePath(ws, 'ts-plain-sam-app/package.json'))
+        tsUri = vscode.Uri.file(workspaceUtils.tryGetAbsolutePath(ws, 'ts-plain-sam-app/src/app.ts'))
+        // Simulate ~/.vscode/argv.json which is emitted by vscode `onDidOpenTextDocument` event.
+        // filetypes.ts no longer listens to `onDidOpenTextDocument`, but this test protects against
+        // regressions.
+        noiseUri1 = vscode.Uri.file(workspaceUtils.tryGetAbsolutePath(ws, '.vscode/argv.json'))
+        await testUtil.toFile('fake argv.json', noiseUri1)
+        noiseUri2 = vscode.Uri.file(workspaceUtils.tryGetAbsolutePath(ws, 'foo/bar/zub.git'))
+        await testUtil.toFile('fake *.git file', noiseUri2)
+    })
+
+    after(async function () {
+        await testUtil.closeAllEditors()
+    })
+
+    // TODO
+    // it('is deduplicated up to 1 hour', async function () {})
+
+    it('emits exactly once per filetype in a given flush window', async function () {
+        await vscode.commands.executeCommand('vscode.open', tsUri)
+        await vscode.commands.executeCommand('vscode.open', jsonUri1)
+        // Different file, same extension (.json), thus `ide_editCodeFile` should be skipped/deduped.
+        await vscode.commands.executeCommand('vscode.open', jsonUri2)
+
+        // Open some "noise" documents WITHOUT showing them in a text editor. This triggers
+        // `onDidOpenTextDocument` but not `onDidChangeActiveTextEditor`. This simulates typical
+        // vscode activity. Noise documents should NOT trigger `ide_editCodeFile` or any similar
+        // metric.
+        await vscode.workspace.openTextDocument(noiseUri1)
+        await vscode.workspace.openTextDocument(noiseUri2)
+
+        // Wait for metrics...
+        const r1 = await getMetrics(2, 'ide_editCodeFile')
+        const m1 = r1?.[0]
+        const m2 = r1?.[1]
+        assert(m1?.Metadata)
+        assert(m2?.Metadata)
+        const metric1 = mapMetadata([])(m1.Metadata)
+        const metric2 = mapMetadata([])(m2.Metadata)
+        assert.deepStrictEqual(metric1['filenameExt'], '.ts')
+        assert.deepStrictEqual(metric2['filenameExt'], '.json')
+
+        await testUtil.closeAllEditors()
+        await vscode.commands.executeCommand('vscode.open', jsonUri1)
+        await vscode.commands.executeCommand('vscode.open', jsonUri2)
+
+        // Get metrics again (result should be the same)...
+        const r2 = await getMetrics(3, 'ide_editCodeFile')
+        // Should not emit the "same" metric.
+        assert.strictEqual(r2, undefined, 'emitted duplicate file_editAwsFile metric')
+        // assert.strictEqual(r?.length, 1, 'emitted file_editAwsFile too many times')
+    })
+})
+
+describe('file_editAwsFile telemetry', function () {
+    let awsConfigUri: vscode.Uri | undefined
+    let ssmJsonUri: vscode.Uri | undefined
+    let cfnUri: vscode.Uri | undefined
+
+    beforeEach(async function () {
+        await testUtil.closeAllEditors()
+        const ws = vscode.workspace.workspaceFolders?.[0]
+
+        // Create a dummy file in ~/.aws on the system.
+        // Note: We consider _any_ file in ~/.aws to be an "AWS config" file,
+        // so this will trigger "file_editAwsFile" telemetry.
+        const awsConfigFile = path.join(fs.getUserHomeDir(), '.aws/test_awstoolkit')
+        awsConfigUri = vscode.Uri.file(awsConfigFile)
+        await testUtil.toFile('Test file from the aws-toolkit-vscode test suite.', awsConfigFile)
+
+        ssmJsonUri = vscode.Uri.file(workspaceUtils.tryGetAbsolutePath(ws, 'test.ssm.json'))
+        cfnUri = vscode.Uri.file(workspaceUtils.tryGetAbsolutePath(ws, 'python3.7-plain-sam-app/template.yaml'))
+    })
+
+    after(async function () {
+        await testUtil.closeAllEditors()
+    })
+
+    it('emits when opened by user', async function () {
+        await vscode.commands.executeCommand('vscode.open', cfnUri)
+        await vscode.commands.executeCommand('vscode.open', awsConfigUri)
+        await vscode.commands.executeCommand('vscode.open', ssmJsonUri)
+
+        const r = await getMetrics(3, 'file_editAwsFile', 5000)
+
+        assert(r, 'did not emit expected telemetry')
+        assert(r.length === 3, 'emitted file_editAwsFile too many times')
+        const metrics = r.map((o) => o.Metadata?.find((o) => o.Key === 'awsFiletype')?.Value)
+        // The order is arbitrary (decided by vscode event system).
+        metrics.sort()
+        assert.deepStrictEqual(metrics, ['awsCredentials', 'cloudformationSam', 'ssmDocument'])
+    })
+
+    it('emits exactly once per filetype in a given flush window', async function () {
+        await vscode.commands.executeCommand('vscode.open', cfnUri)
+        // Wait for metrics...
+        await getMetrics(1, 'file_editAwsFile')
+        await testUtil.closeAllEditors()
+        await vscode.commands.executeCommand('vscode.open', cfnUri)
+        await vscode.commands.executeCommand('vscode.open', cfnUri)
+
+        // Get metrics again (result should be the same)...
+        const r = await getMetrics(2, 'file_editAwsFile')
+        // Should not emit the "same" metric.
+        assert.strictEqual(r, undefined, 'emitted duplicate file_editAwsFile metric')
+        // assert.strictEqual(r?.length, 1, 'emitted file_editAwsFile too many times')
+    })
+})
+
+describe('isCodeFile', () => {
+    it('returns true for code files', function () {
+        const codeFiles = [
+            'test.py',
+            'test.js',
+            'Dockerfile',
+            'gradlew',
+            'mvnw',
+            'build.gradle',
+            'gradle/wrapper/gradle-wrapper.properties',
+        ]
+        for (const codeFilePath of codeFiles) {
+            assert.strictEqual(isCodeFile(codeFilePath), true)
+        }
+    })
+
+    it('returns false for other files', function () {
+        const codeFiles = ['compiled.exe', 'random_file']
+        for (const filePath of codeFiles) {
+            assert.strictEqual(isCodeFile(filePath), false)
+        }
+    })
+})
diff --git a/packages/core/src/test/shared/fs/fs.test.ts b/packages/core/src/test/shared/fs/fs.test.ts
new file mode 100644
index 00000000000..15db2c6b73e
--- /dev/null
+++ b/packages/core/src/test/shared/fs/fs.test.ts
@@ -0,0 +1,704 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import vscode from 'vscode'
+import * as path from 'path'
+import * as utils from 'util'
+import { existsSync, mkdirSync, promises as nodefs, readFileSync } from 'fs' // eslint-disable-line no-restricted-imports
+import { stat } from 'fs/promises'
+import nodeFs from 'fs' // eslint-disable-line no-restricted-imports
+import fs, { FileSystem } from '../../../shared/fs/fs'
+import * as os from 'os'
+import { isMinVscode, isWin } from '../../../shared/vscode/env'
+import Sinon from 'sinon'
+import { PermissionsError, formatError, isFileNotFoundError, scrubNames } from '../../../shared/errors'
+import { EnvironmentVariables } from '../../../shared/environmentVariables'
+import * as testutil from '../../testUtil'
+import globals from '../../../shared/extensionGlobals'
+import { driveLetterRegex } from '../../../shared/utilities/pathUtils'
+import { IdeFileSystem } from '../../../shared/telemetry/telemetry.gen'
+import { TestFolder } from '../../testUtil'
+
+describe('FileSystem', function () {
+    let sandbox: Sinon.SinonSandbox
+    let testFolder: TestFolder
+
+    before(async function () {
+        sandbox = Sinon.createSandbox()
+    })
+
+    beforeEach(async function () {
+        testFolder = await TestFolder.create()
+    })
+
+    afterEach(async function () {
+        sandbox.restore()
+    })
+
+    describe('readFileAsString()', function () {
+        it('reads a file', async function () {
+            const path = await testFolder.write('test.txt', 'hello world')
+            const pathAsUri = vscode.Uri.file(path)
+
+            assert.strictEqual(await fs.readFileText(path), 'hello world')
+            assert.strictEqual(await fs.readFileText(pathAsUri), 'hello world')
+        })
+
+        it('throws when no permissions', async function () {
+            if (isWin()) {
+                console.log('Skipping since windows does not support mode permissions')
+                return this.skip()
+            }
+
+            const fileName = 'test.txt'
+            const path = await testFolder.write(fileName, 'hello world', { mode: 0o000 })
+
+            await assert.rejects(fs.readFileText(path), (err) => {
+                assert(err instanceof PermissionsError)
+                assert.strictEqual(err.code, 'InvalidPermissions')
+                assert(err.message.includes(fileName))
+                return true
+            })
+        })
+    })
+
+    describe('writeFile()', function () {
+        const opts: { atomic: boolean }[] = [{ atomic: false }, { atomic: true }]
+
+        for (const opt of opts) {
+            it(`writes a file (atomic: ${opt.atomic})`, async function () {
+                const filePath = testFolder.pathFrom('myFileName')
+                await fs.writeFile(filePath, 'MyContent', opt)
+                assert.strictEqual(readFileSync(filePath, 'utf-8'), 'MyContent')
+            })
+        }
+
+        it('writes a file with encoded text', async function () {
+            const filePath = testFolder.pathFrom('myFileName')
+            const text = 'hello'
+            const content = new TextEncoder().encode(text)
+
+            await fs.writeFile(filePath, content)
+
+            assert.strictEqual(readFileSync(filePath, 'utf-8'), text)
+        })
+
+        it('makes dirs if missing', async function () {
+            const filePath = testFolder.pathFrom('dirA/dirB/myFileName.txt')
+            await fs.writeFile(filePath, 'MyContent')
+            assert.strictEqual(readFileSync(filePath, 'utf-8'), 'MyContent')
+        })
+
+        // We try multiple methods to do an atomic write, but if one fails we want to fallback
+        // to the next method. The following are the different combinations of this when a method throws.
+        const throwCombinations = [
+            { vsc: false, node: false },
+            { vsc: true, node: false },
+            { vsc: true, node: true },
+        ]
+        for (const throws of throwCombinations) {
+            it(`still writes a file if one of the atomic write methods fails: ${JSON.stringify(throws)}`, async function () {
+                if (throws.vsc) {
+                    sandbox.stub(fs, 'rename').throws(new Error('Test Error Message VSC'))
+                }
+                if (throws.node) {
+                    sandbox.stub(nodeFs.promises, 'rename').throws(new Error('Test Error Message Node'))
+                }
+                const filePath = testFolder.pathFrom('myFileName')
+
+                await fs.writeFile(filePath, 'MyContent', { atomic: true })
+
+                assert.strictEqual(readFileSync(filePath, 'utf-8'), 'MyContent')
+                const expectedTelemetry: IdeFileSystem[] = []
+                if (throws.vsc) {
+                    expectedTelemetry.push({
+                        action: 'writeFile',
+                        result: 'Failed',
+                        reason: 'writeFileAtomicVscRename',
+                        reasonDesc: 'Test Error Message VSC',
+                    })
+                }
+                if (throws.node) {
+                    expectedTelemetry.push({
+                        action: 'writeFile',
+                        result: 'Failed',
+                        reason: 'writeFileAtomicNodeRename',
+                        reasonDesc: 'Test Error Message Node',
+                    })
+                }
+                if (expectedTelemetry.length > 0) {
+                    testutil.assertTelemetry('ide_fileSystem', expectedTelemetry)
+                }
+            })
+        }
+
+        it('throws when existing file + no permission', async function () {
+            if (isWin()) {
+                console.log('Skipping since windows does not support mode permissions')
+                return this.skip()
+            }
+            if (isMinVscode()) {
+                console.log('Skipping since min version has different error message')
+                return this.skip()
+            }
+
+            const fileName = 'test.txt'
+            const filePath = await testFolder.write(fileName, 'hello world', { mode: 0o000 })
+
+            await assert.rejects(fs.writeFile(filePath, 'MyContent'), (err) => {
+                assert(err instanceof PermissionsError)
+                assert.strictEqual(err.code, 'InvalidPermissions')
+                assert(err.message.includes(fileName))
+                return true
+            })
+        })
+    })
+
+    describe('appendFile()', function () {
+        it('appends to a file', async function () {
+            const filePath = await testFolder.write('test.txt', 'LINE-1-TEXT')
+            await fs.appendFile(filePath, '\nLINE-2-TEXT')
+            assert.strictEqual(readFileSync(filePath, 'utf-8'), 'LINE-1-TEXT\nLINE-2-TEXT')
+        })
+
+        it('creates new file if it does not exist', async function () {
+            const filePath = testFolder.pathFrom('thisDoesNotExist.txt')
+            await fs.appendFile(filePath, 'i am nikolas')
+            assert.strictEqual(readFileSync(filePath, 'utf-8'), 'i am nikolas')
+        })
+    })
+
+    describe('existsFile()', function () {
+        it('true for existing file', async function () {
+            const file = await testFolder.write('test.txt')
+            assert.strictEqual(await fs.existsFile(file), true)
+        })
+
+        it('false for non-existent file', async function () {
+            const nonExistantFile = testFolder.pathFrom('thisDoesNotExist.txt')
+            assert.strictEqual(await fs.existsFile(nonExistantFile), false)
+        })
+
+        it('false for existing directory', async function () {
+            const dir = await testFolder.mkdir('thisIsDirectory')
+            assert.strictEqual(await fs.existsFile(dir), false)
+        })
+    })
+
+    describe('existsDir()', function () {
+        it('true for existing directory', async function () {
+            const dir = await testFolder.mkdir('myDir')
+            assert.strictEqual(await fs.existsDir(dir), true)
+        })
+
+        it('false for non-existent directory', async function () {
+            const noFile = testFolder.pathFrom('non-existent')
+            assert.strictEqual(await fs.existsDir(noFile), false)
+        })
+    })
+
+    describe('exists()', function () {
+        it('true for existing file/directory', async function () {
+            const dir = await testFolder.mkdir('myDir')
+            const file = await testFolder.write('test.txt')
+            assert.strictEqual(await fs.exists(dir), true)
+            assert.strictEqual(await fs.exists(file), true)
+        })
+
+        it('false for non-existent file/directory', async function () {
+            const noFile = testFolder.pathFrom('non-existent')
+            assert.strictEqual(await fs.exists(noFile), false)
+        })
+    })
+
+    describe('mkdir()', function () {
+        const paths = ['a', 'a/b', 'a/b/c', 'a/b/c/d/']
+
+        // eslint-disable-next-line unicorn/no-array-for-each
+        paths.forEach(async function (p) {
+            it(`creates folder: '${p}'`, async function () {
+                const dirPath = testFolder.pathFrom(p)
+                await fs.mkdir(dirPath)
+                assert(existsSync(dirPath))
+            })
+        })
+
+        it('does NOT throw if dir already exists', async function () {
+            // We do not always want this behavior, but it seems that this is how the vsc implementation
+            // does it. Look at the Node FS implementation instead as that throws if the dir already exists.
+            const dirPath = testFolder.pathFrom('a')
+            await fs.mkdir(dirPath)
+            await fs.mkdir(dirPath)
+        })
+    })
+
+    describe('readdir()', function () {
+        it('lists files in a directory', async function () {
+            await testFolder.write('a.txt')
+            await testFolder.write('b.txt')
+            await testFolder.write('c.txt')
+            mkdirSync(testFolder.pathFrom('dirA'))
+            mkdirSync(testFolder.pathFrom('dirB'))
+            mkdirSync(testFolder.pathFrom('dirC'))
+
+            const files = await fs.readdir(testFolder.path)
+            assert.deepStrictEqual(
+                sorted(files),
+                sorted([
+                    ['a.txt', vscode.FileType.File],
+                    ['b.txt', vscode.FileType.File],
+                    ['c.txt', vscode.FileType.File],
+                    ['dirA', vscode.FileType.Directory],
+                    ['dirB', vscode.FileType.Directory],
+                    ['dirC', vscode.FileType.Directory],
+                ])
+            )
+        })
+
+        it('empty list if no files in directory', async function () {
+            const files = await fs.readdir(testFolder.path)
+            assert.deepStrictEqual(files, [])
+        })
+
+        function sorted(i: [string, vscode.FileType][]) {
+            return i.sort((a, b) => a[0].localeCompare(b[0]))
+        }
+    })
+
+    describe('copy()', function () {
+        it('copies files and folders from one dir to another', async function () {
+            const targetDir = await testFolder.mkdir('targetDir')
+            await testFolder.write('targetDir/a.txt', 'I am A')
+            await testFolder.write('targetDir/dirB/b.txt', 'I am B')
+
+            const destDir = path.join(testFolder.path, 'destDir')
+            await fs.copy(targetDir, destDir)
+
+            assert.strictEqual(await fs.readFileText(path.join(destDir, 'a.txt')), 'I am A')
+            assert.strictEqual(await fs.readFileText(path.join(destDir, 'dirB/b.txt')), 'I am B')
+        })
+    })
+
+    describe('delete()', function () {
+        it('deletes file', async function () {
+            const f = await testFolder.write('test.txt', 'hello world')
+            assert(existsSync(f))
+            await fs.delete(f)
+            assert(!existsSync(f))
+        })
+
+        it('fails to delete non-empty directory with recursive:false (the default)', async function () {
+            const dir = await testFolder.mkdir()
+            const f = path.join(dir, 'testfile.txt')
+            await testutil.toFile('some content', f)
+            assert(existsSync(dir))
+            await assert.rejects(() => fs.delete(dir), /not empty|non-empty/)
+            assert(existsSync(dir))
+        })
+
+        it('deletes directory with recursive:true', async function () {
+            const dir = await testFolder.mkdir()
+            await testFolder.write('testfile.txt', 'testText')
+            await fs.delete(dir, { recursive: true })
+            assert(!existsSync(dir))
+        })
+
+        it('no error if file not found (but parent exists)', async function () {
+            const dir = await testFolder.mkdir()
+            const f = path.join(dir, 'missingfile.txt')
+            assert(!existsSync(f))
+            await fs.delete(f)
+        })
+
+        it('error if file *and* its parent dir not found', async function () {
+            const dir = await testFolder.mkdir()
+            const f = path.join(dir, 'missingdir/missingfile.txt')
+            assert(!existsSync(f))
+            await assert.rejects(() => fs.delete(f))
+        })
+    })
+
+    describe('stat()', function () {
+        it('gets stat of a file', async function () {
+            const filePath = await testFolder.write('test.txt', 'hello world')
+            const stat = await fs.stat(filePath)
+            assert(stat)
+            assert.strictEqual(stat.type, vscode.FileType.File)
+        })
+
+        it('throws if no file exists', async function () {
+            const filePath = testFolder.pathFrom('thisDoesNotExist.txt')
+            await assert.rejects(() => fs.stat(filePath))
+        })
+    })
+
+    describe('chmod()', async function () {
+        it('changes permissions when not on web, otherwise does not throw', async function () {
+            const filePath = await testFolder.write('test.txt', 'hello world', { mode: 0o777 })
+            await fs.chmod(filePath, 0o644)
+            // chmod doesn't exist on windows, non-unix permission system.
+            if (!globals.isWeb && os.platform() !== 'win32') {
+                const result = await stat(filePath)
+                assert.strictEqual(result.mode & 0o777, 0o644)
+            }
+        })
+
+        it('throws if no file exists', async function () {
+            const filePath = testFolder.pathFrom('thisDoesNotExist.txt')
+            await assert.rejects(() => fs.chmod(filePath, 0o644))
+        })
+    })
+
+    describe('rename()', async () => {
+        it('renames a file', async () => {
+            const oldPath = await testFolder.write('oldFile.txt', 'hello world')
+            const newPath = path.join(path.dirname(oldPath), 'newFile.txt')
+
+            await fs.rename(oldPath, newPath)
+
+            assert.strictEqual(await fs.readFileText(newPath), 'hello world')
+            assert(!existsSync(oldPath))
+            assert.deepStrictEqual(testutil.getMetrics('ide_fileSystem').length, 0)
+        })
+
+        it('renames a folder', async () => {
+            const oldPath = await testFolder.mkdir('test')
+            await fs.writeFile(path.join(oldPath, 'file.txt'), 'test text')
+            const newPath = path.join(path.dirname(oldPath), 'newName')
+
+            await fs.rename(oldPath, newPath)
+
+            assert(existsSync(newPath))
+            assert.deepStrictEqual(await fs.readFileText(path.join(newPath, 'file.txt')), 'test text')
+            assert(!existsSync(oldPath))
+        })
+
+        it('overwrites if destination exists', async () => {
+            const oldPath = await testFolder.write('oldFile.txt', 'hello world')
+            const newPath = await testFolder.write('newFile.txt', 'some content')
+
+            await fs.rename(oldPath, newPath)
+
+            assert.strictEqual(await fs.readFileText(newPath), 'hello world')
+            assert(!existsSync(oldPath))
+        })
+
+        it('throws if source does not exist', async () => {
+            const clock = testutil.installFakeClock()
+            try {
+                const oldPath = testFolder.pathFrom('oldFile.txt')
+                const newPath = testFolder.pathFrom('newFile.txt')
+
+                const result = fs.rename(oldPath, newPath)
+                await clock.tickAsync(FileSystem.renameTimeoutOpts.timeout)
+                await assert.rejects(result)
+
+                testutil.assertTelemetry('ide_fileSystem', {
+                    action: 'rename',
+                    result: 'Failed',
+                    reason: 'SourceNotExists',
+                    reasonDesc: `After ${FileSystem.renameTimeoutOpts.timeout}ms the source path did not exist: ${scrubNames(oldPath)}`,
+                })
+            } finally {
+                clock.uninstall()
+            }
+        })
+
+        it('source file does not exist at first, but eventually appears', async () => {
+            const oldPath = testFolder.pathFrom('oldFile.txt')
+            const newPath = testFolder.pathFrom('newFile.txt')
+
+            const existsStub = Sinon.stub(FileSystem.prototype, 'exists')
+            existsStub.onFirstCall().resolves(false)
+            existsStub.callThrough()
+
+            await testutil.toFile('hello world', oldPath)
+            await fs.rename(oldPath, newPath)
+
+            testutil.assertTelemetry('ide_fileSystem', {
+                action: 'rename',
+                result: 'Succeeded',
+                reason: 'RenameRaceCondition',
+            })
+
+            existsStub.restore()
+        })
+    })
+
+    describe('getUserHomeDir()', function () {
+        let fakeHome: string
+        let saveEnv: EnvironmentVariables = {}
+
+        function restoreEnv() {
+            for (const name of ['HOME', 'HOMEDRIVE', 'HOMEPATH', 'USERPROFILE']) {
+                if (saveEnv[name] === undefined) {
+                    delete process.env[name]
+                } else {
+                    const v = saveEnv[name]
+                    assert(typeof v === 'string')
+                    process.env[name] = v
+                }
+            }
+        }
+
+        before(async function () {
+            const ws = await testutil.createTestWorkspaceFolder(undefined, 'test-home-dir')
+            fakeHome = ws.uri.fsPath
+            saveEnv = { ...process.env } as EnvironmentVariables
+        })
+
+        after(async function () {
+            await fs.delete(fakeHome, { recursive: true, force: true })
+            restoreEnv()
+            await fs.init(globals.context, () => undefined)
+        })
+
+        beforeEach(async function () {
+            restoreEnv()
+            await fs.init(globals.context, () => undefined)
+        })
+
+        it('getUsername() never fails', async function () {
+            const env = process.env as EnvironmentVariables
+            env.HOME = fakeHome
+            let homeDirLogs = await fs.init(globals.context, () => undefined)
+            assert.deepStrictEqual(homeDirLogs, [])
+
+            assert(fs.getUsername().length > 0)
+
+            // getUsername() falls back to $USER.
+            homeDirLogs = await fs.init(
+                globals.context,
+                () => undefined,
+                () => {
+                    throw new Error()
+                }
+            )
+            assert.deepStrictEqual(homeDirLogs, [])
+            env.USER = 'test-user-env-var'
+            assert.deepStrictEqual(fs.getUsername(), 'test-user-env-var')
+
+            // getUsername() falls back to home dir name.
+            delete env.USER
+            homeDirLogs = await fs.init(
+                globals.context,
+                () => undefined,
+                () => {
+                    throw new Error()
+                }
+            )
+            assert.deepStrictEqual(homeDirLogs, [])
+            assert.deepStrictEqual(fs.getUsername(), 'test-home-dir')
+        })
+
+        it('gets $HOME', async function () {
+            const env = process.env as EnvironmentVariables
+            env.HOME = fakeHome
+            const homeDirLogs = await fs.init(globals.context, () => undefined)
+            assert.strictEqual(fs.getUserHomeDir(), fakeHome)
+            assert.deepStrictEqual(homeDirLogs, [])
+        })
+
+        it('gets $USERPROFILE if $HOME is not defined', async function () {
+            const env = process.env as EnvironmentVariables
+            delete env.HOME
+            env.HOMEDRIVE = 'bogus1-nonexistent-HOMEDRIVE'
+            env.HOMEPATH = 'bogus1-nonexistent-HOMEPATH'
+            env.USERPROFILE = fakeHome
+            const homeDirLogs = await fs.init(globals.context, () => undefined)
+            testutil.assertEqualPaths(fs.getUserHomeDir(), fakeHome)
+            assert.deepStrictEqual(homeDirLogs, [])
+        })
+
+        it('gets $HOMEDRIVE/$HOMEPATH if $HOME and $USERPROFILE are not valid', async function () {
+            const env = process.env as EnvironmentVariables
+            env.HOME = 'bogus2-nonexistent-HOME'
+            env.USERPROFILE = 'bogus2-nonexistent-USERPROFILE'
+            env.HOMEDRIVE = env.HOMEDRIVE?.trim() ? env.HOMEDRIVE : '/'
+            env.HOMEPATH = fakeHome.replace(driveLetterRegex, '')
+
+            assert(env.HOMEDRIVE)
+            const homeDirLogs = await fs.init(globals.context, () => undefined)
+            testutil.assertEqualPaths(fs.getUserHomeDir(), path.join(env.HOMEDRIVE, env.HOMEPATH))
+            assert.deepStrictEqual(homeDirLogs, [
+                '$HOME filepath is invalid: "bogus2-nonexistent-HOME"',
+                '$USERPROFILE filepath is invalid: "bogus2-nonexistent-USERPROFILE"',
+            ])
+        })
+
+        it('gets os.homedir() if no environment variables are valid', async function () {
+            const env = process.env as EnvironmentVariables
+
+            delete env.HOME
+            delete env.USERPROFILE
+            delete env.HOMEPATH
+            delete env.HOMEDRIVE
+
+            const homeDirLogs = await fs.init(globals.context, () => undefined)
+            testutil.assertEqualPaths(fs.getUserHomeDir(), os.homedir())
+            assert.deepStrictEqual(homeDirLogs, [])
+
+            env.HOME = 'bogus3-nonexistent-HOME'
+            env.HOMEDRIVE = 'bogus3-nonexistent-HOMEDRIVE'
+            env.HOMEPATH = 'bogus3-nonexistent-HOMEPATH'
+            env.USERPROFILE = 'bogus3-nonexistent-USERPROFILE'
+
+            let isHomeDirValid: boolean | undefined
+            const homeDirLogs2 = await fs.init(globals.context, () => {
+                isHomeDirValid = false
+            })
+            testutil.assertEqualPaths(fs.getUserHomeDir(), os.homedir())
+            assert.strictEqual(isHomeDirValid, false)
+            assert.deepStrictEqual(homeDirLogs2, [
+                '$HOME filepath is invalid: "bogus3-nonexistent-HOME"',
+                '$USERPROFILE filepath is invalid: "bogus3-nonexistent-USERPROFILE"',
+                '$HOMEPATH filepath is invalid: "bogus3-nonexistent-HOMEDRIVE/bogus3-nonexistent-HOMEPATH"'.replace(
+                    /\//g,
+                    path.sep
+                ),
+            ])
+        })
+    })
+
+    if (!isWin()) {
+        // TODO: need to use sticky bit to easily write tests for group-owned directories
+        // Or potentially spawn new process with different uid...?
+        describe('permissions', function () {
+            let runCounter = 0
+            let testDir: string
+
+            before(async function () {
+                const ws = await testutil.createTestWorkspaceFolder()
+                testDir = ws.uri.fsPath
+            })
+
+            after(async function () {
+                await fs.delete(testDir, { recursive: true, force: true })
+            })
+
+            beforeEach(function () {
+                runCounter++
+            })
+
+            function assertError<T>(err: unknown, ctor: new (...args: any[]) => T): asserts err is T {
+                if (!(err instanceof ctor)) {
+                    throw new assert.AssertionError({
+                        message: `Error was not an instance of ${ctor.name}: ${utils.inspect(err)}`,
+                    })
+                }
+            }
+
+            describe('unrelated exceptions', function () {
+                it('bubbles up ENOENT', async function () {
+                    const dirPath = path.join(testDir, `dir${runCounter}`)
+                    await fs.mkdir(dirPath)
+                    const err = await fs.readFileText(path.join(dirPath, 'foo')).catch((e) => e)
+                    assertError(err, Error)
+                    assert.ok(isFileNotFoundError(err))
+                })
+            })
+
+            describe('owned by user', function () {
+                it('fails writing a new file to a directory without `u+x`', async function () {
+                    const dirPath = path.join(testDir, `dir${runCounter}`)
+                    await nodefs.mkdir(dirPath, { mode: 0o677 })
+                    const err = await fs.writeFile(path.join(dirPath, 'foo'), 'foo').catch((e) => e)
+                    assert.match(
+                        formatError(err),
+                        /incorrect permissions. Expected rwx, found rw-. \[InvalidPermissions\] \(isOwner: true; mode: drw-r.xr-x [^ ]* \d+\)/
+                    )
+                    assert.strictEqual(err.uri.fsPath, vscode.Uri.file(dirPath).fsPath)
+                    assert.strictEqual(err.expected, '*wx')
+                    assert.strictEqual(err.actual, 'rw-')
+                })
+
+                it('fails writing a new file to a directory without `u+w`', async function () {
+                    const dirPath = path.join(testDir, `dir${runCounter}`)
+                    await nodefs.mkdir(dirPath, { mode: 0o577 })
+                    const err = await fs.writeFile(path.join(dirPath, 'foo'), 'foo').catch((e) => e)
+                    assert.match(
+                        formatError(err),
+                        /incorrect permissions. Expected rwx, found r-x. \[InvalidPermissions\] \(isOwner: true; mode: dr-xr.xr-x [^ ]* \d+\)/
+                    )
+                    assertError(err, PermissionsError)
+                    assert.strictEqual(err.uri.fsPath, vscode.Uri.file(dirPath).fsPath)
+                    assert.strictEqual(err.expected, '*wx')
+                    assert.strictEqual(err.actual, 'r-x')
+                })
+
+                it('fails writing an existing file without `u+w`', async function () {
+                    const filePath = path.join(testDir, `file${runCounter}`)
+                    await nodefs.writeFile(filePath, 'foo', { mode: 0o400 })
+                    const err = await fs.writeFile(filePath, 'foo2').catch((e) => e)
+                    assert.match(
+                        formatError(err),
+                        /incorrect permissions. Expected rw-, found r--. \[InvalidPermissions\] \(isOwner: true; mode: -r-------- [^ ]* \d+\)/
+                    )
+                    assertError(err, PermissionsError)
+                    assert.strictEqual(err.uri.fsPath, vscode.Uri.file(filePath).fsPath)
+                    assert.strictEqual(err.expected, '*w*')
+                    assert.strictEqual(err.actual, 'r--')
+                })
+
+                it('fails reading an existing file without `u+r`', async function () {
+                    const filePath = path.join(testDir, `file${runCounter}`)
+                    await fs.writeFile(filePath, 'foo', { mode: 0o200 })
+                    const err = await fs.readFileBytes(filePath).catch((e) => e)
+                    assert.match(
+                        formatError(err),
+                        /incorrect permissions. Expected rw-, found -w-. \[InvalidPermissions\] \(isOwner: true; mode: --w------- [^ ]* \d+\)/
+                    )
+                    assertError(err, PermissionsError)
+                    assert.strictEqual(err.uri.fsPath, vscode.Uri.file(filePath).fsPath)
+                    assert.strictEqual(err.expected, 'r**')
+                    assert.strictEqual(err.actual, '-w-')
+                })
+
+                describe('existing files in a directory', function () {
+                    let dirPath: string
+                    let filePath: string
+
+                    beforeEach(async function () {
+                        dirPath = path.join(testDir, `dir${runCounter}`)
+                        await fs.mkdir(dirPath)
+                        filePath = path.join(dirPath, 'file')
+                        await fs.writeFile(filePath, 'foo')
+                    })
+
+                    afterEach(async function () {
+                        await nodefs.chmod(dirPath, 0o777)
+                    })
+
+                    it('fails to delete without `u+w` on the parent', async function () {
+                        await nodefs.chmod(dirPath, 0o577)
+                        const err = await fs.delete(filePath).catch((e) => e)
+                        assert.match(
+                            formatError(err),
+                            /incorrect permissions. Expected rwx, found r-x. \[InvalidPermissions\] \(isOwner: true; mode: dr-xrwxrwx [^ ]* \d+\)/
+                        )
+                        assertError(err, PermissionsError)
+                        assert.strictEqual(err.uri.fsPath, vscode.Uri.file(dirPath).fsPath)
+                        assert.strictEqual(err.expected, '*wx')
+                        assert.strictEqual(err.actual, 'r-x')
+                    })
+
+                    it('fails to delete without `u+x` on the parent', async function () {
+                        await nodefs.chmod(dirPath, 0o677)
+                        const err = await fs.delete(filePath).catch((e) => e)
+                        assert.match(
+                            formatError(err),
+                            /incorrect permissions. Expected rwx, found rw-. \[InvalidPermissions\] \(isOwner: true; mode: drw-rwxrwx [^ ]* \d+\)/
+                        )
+                        assertError(err, PermissionsError)
+                        assert.strictEqual(err.uri.fsPath, vscode.Uri.file(dirPath).fsPath)
+                        assert.strictEqual(err.expected, '*wx')
+                        assert.strictEqual(err.actual, 'rw-')
+                    })
+                })
+            })
+        })
+    }
+})
diff --git a/packages/core/src/test/shared/fs/node/fs.test.ts b/packages/core/src/test/shared/fs/node/fs.test.ts
new file mode 100644
index 00000000000..6f36440dc07
--- /dev/null
+++ b/packages/core/src/test/shared/fs/node/fs.test.ts
@@ -0,0 +1,52 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import nodeFs from 'fs/promises'
+import { TestFolder } from '../../../testUtil'
+import assert from 'assert'
+import { fs } from '../../../../shared'
+
+describe('Node FS', () => {
+    let testFolder: TestFolder
+
+    beforeEach(async function () {
+        testFolder = await TestFolder.create()
+    })
+
+    describe('open()', () => {
+        it('"w" flag clears file content', async () => {
+            const filePath = testFolder.pathFrom('file.txt')
+
+            // Make initial file with text
+            await nodeFs.writeFile(filePath, 'test')
+            assert.strictEqual(await fs.readFileText(filePath), 'test')
+
+            // Open file with "w"
+            const fileHandle = await nodeFs.open(filePath, 'w')
+            await fileHandle.close()
+
+            // file content was cleared
+            assert.strictEqual(await fs.readFileText(filePath), '')
+        })
+    })
+
+    describe('sync()', () => {
+        // we cannot accurately test if sync() works, so just assert nothing breaks when using it
+        it('runs without error', async () => {
+            const filePath = testFolder.pathFrom('file.txt')
+
+            // Make initial file with text
+            await nodeFs.writeFile(filePath, 'test')
+            assert.strictEqual(await fs.readFileText(filePath), 'test')
+
+            const fileHandle = await nodeFs.open(filePath, 'w')
+            await fileHandle.writeFile('updatedText')
+            await fileHandle.sync() // method under test
+            await fileHandle.close()
+
+            // file content was cleared
+            assert.strictEqual(await fs.readFileText(filePath), 'updatedText')
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/fs/templateRegistry.test.ts b/packages/core/src/test/shared/fs/templateRegistry.test.ts
new file mode 100644
index 00000000000..c7e92518c7e
--- /dev/null
+++ b/packages/core/src/test/shared/fs/templateRegistry.test.ts
@@ -0,0 +1,530 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as path from 'path'
+import * as vscode from 'vscode'
+import {
+    CloudFormationTemplateRegistry,
+    getResourcesForHandler,
+    getResourcesForHandlerFromTemplateDatum,
+} from '../../../shared/fs/templateRegistry'
+import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
+import { badYaml, makeSampleSamTemplateYaml, strToYamlFile } from '../cloudformation/cloudformationTestUtils'
+import { assertEqualPaths, toFile } from '../../testUtil'
+import * as CloudFormation from '../../../shared/cloudformation/cloudformation'
+import { WatchedItem } from '../../../shared/fs/watchedFiles'
+import { fs } from '../../../shared'
+
+// TODO almost all of these tests should be moved to test WatchedFiles instead
+describe('CloudFormation Template Registry', async function () {
+    const goodYaml1 = makeSampleSamTemplateYaml(false)
+
+    describe('CloudFormationTemplateRegistry', async function () {
+        let testRegistry: CloudFormationTemplateRegistry
+        let tempFolder: string
+
+        beforeEach(async function () {
+            tempFolder = await makeTemporaryToolkitFolder()
+            testRegistry = new CloudFormationTemplateRegistry()
+        })
+
+        afterEach(async function () {
+            await fs.delete(tempFolder, { recursive: true })
+        })
+
+        describe('addItem', async function () {
+            it("adds data from a template to the registry and can receive the template's data", async () => {
+                const filename = vscode.Uri.file(path.join(tempFolder, 'template.yaml'))
+                await strToYamlFile(goodYaml1, filename.fsPath)
+                await testRegistry.addItem(filename)
+
+                assert.strictEqual(testRegistry.items.length, 1)
+
+                const data = testRegistry.getItem(filename.fsPath)
+
+                assertValidTestTemplate(data, filename.fsPath)
+            })
+
+            it('throws an error if the file to add is not a CF template', async function () {
+                const filename = vscode.Uri.file(path.join(tempFolder, 'template.yaml'))
+                await strToYamlFile(badYaml, filename.fsPath)
+
+                assert.strictEqual(await testRegistry.addItem(vscode.Uri.file(filename.fsPath)), undefined)
+            })
+        })
+
+        // other get cases are tested in the add section
+        describe('items', async function () {
+            it('returns an empty array if the registry has no registered templates', function () {
+                assert.strictEqual(testRegistry.items.length, 0)
+            })
+        })
+
+        // other get cases are tested in the add section
+        describe('getRegisteredItem', async function () {
+            it('Returns the item from the VSCode URI', async function () {
+                const filename = vscode.Uri.file(path.join(tempFolder, 'template.yaml'))
+                await strToYamlFile(goodYaml1, filename.fsPath)
+                await testRegistry.addItem(filename)
+
+                const data = testRegistry.getItem(filename)
+
+                assertValidTestTemplate(data, filename.fsPath)
+            })
+
+            it('returns undefined if the registry has no registered templates', function () {
+                assert.strictEqual(testRegistry.getItem('/template.yaml'), undefined)
+            })
+
+            it('returns undefined if the registry does not contain the template in question', async function () {
+                const filename = vscode.Uri.file(path.join(tempFolder, 'template.yaml'))
+                await strToYamlFile(goodYaml1, filename.fsPath)
+                await testRegistry.addItem(vscode.Uri.file(filename.fsPath))
+
+                assert.strictEqual(testRegistry.getItem('/not-the-template.yaml'), undefined)
+            })
+        })
+
+        describe('removeTemplateFromRegistry', async function () {
+            it('removes an added template', async function () {
+                const filename = vscode.Uri.file(path.join(tempFolder, 'template.yaml'))
+                await strToYamlFile(goodYaml1, filename.fsPath)
+                await testRegistry.addItem(vscode.Uri.file(filename.fsPath))
+                assert.strictEqual(testRegistry.items.length, 1)
+
+                await testRegistry.remove(filename)
+                assert.strictEqual(testRegistry.items.length, 0)
+            })
+
+            it('does not affect the registry if a nonexistant template is removed', async function () {
+                const filename = vscode.Uri.file(path.join(tempFolder, 'template.yaml'))
+                await strToYamlFile(goodYaml1, filename.fsPath)
+                await testRegistry.addItem(vscode.Uri.file(filename.fsPath))
+                assert.strictEqual(testRegistry.items.length, 1)
+
+                await testRegistry.remove(vscode.Uri.file(path.join(tempFolder, 'wrong-template.yaml')))
+                assert.strictEqual(testRegistry.items.length, 1)
+            })
+        })
+    })
+
+    // Consts for the non-class functions
+    const rootPath = path.join('i', 'am', 'your', 'father')
+    const nestedPath = path.join('s', 'brothers', 'nephews', 'cousins', 'former', 'roommate')
+    const otherPath = path.join('obi-wan', 'killed', 'your', 'father')
+    const matchingResource: {
+        Type: 'AWS::Serverless::Function'
+        Properties: CloudFormation.ZipResourceProperties
+    } = {
+        Type: 'AWS::Serverless::Function',
+        Properties: {
+            Handler: 'index.handler',
+            CodeUri: path.join(nestedPath),
+            Runtime: 'nodejs16.x',
+        },
+    }
+    const nonParentTemplate = {
+        path: path.join(otherPath, 'template.yaml'),
+        item: {},
+    }
+    const workingTemplate = {
+        path: path.join(rootPath, 'template.yaml'),
+        item: {
+            Resources: {
+                resource1: matchingResource,
+            },
+        },
+    }
+    const noResourceTemplate = {
+        path: path.join(rootPath, 'template.yaml'),
+        item: {
+            Resources: {},
+        },
+    }
+    const compiledResource: {
+        Type: 'AWS::Serverless::Function'
+        Properties: CloudFormation.ZipResourceProperties
+    } = {
+        Type: 'AWS::Serverless::Function',
+        Properties: {
+            Handler: 'Asdf::Asdf.Function::FunctionHandler',
+            CodeUri: path.join(nestedPath),
+            Runtime: 'dotnet6',
+        },
+    }
+    const dotNetTemplate = {
+        path: path.join(rootPath, 'template.yaml'),
+        item: {
+            Resources: {
+                resource1: compiledResource,
+            },
+        },
+    }
+    const multiResourceTemplate = {
+        path: path.join(rootPath, 'template.yaml'),
+        item: {
+            Resources: {
+                resource1: matchingResource,
+                resource2: {
+                    ...matchingResource,
+                    Properties: {
+                        ...matchingResource.Properties,
+                        Timeout: 5000,
+                    },
+                },
+            },
+        },
+    }
+    const badRuntimeTemplate = {
+        path: path.join(rootPath, 'template.yaml'),
+        item: {
+            Resources: {
+                badResource: {
+                    ...matchingResource,
+                    Properties: {
+                        ...matchingResource.Properties,
+                        Runtime: 'COBOL-60',
+                    },
+                },
+                goodResource: matchingResource,
+            },
+        },
+    }
+
+    describe('getResourcesForHandler', function () {
+        it('handles empty input', function () {
+            // Empty `unfilteredTemplates` input:
+            assert.deepStrictEqual(
+                getResourcesForHandler(path.join(rootPath, nestedPath, 'index.js'), 'handler', []),
+                []
+            )
+        })
+
+        it('returns an array containing resources that contain references to the handler in question', function () {
+            const val = getResourcesForHandler(path.join(rootPath, nestedPath, 'index.js'), 'handler', [
+                nonParentTemplate,
+                workingTemplate,
+                noResourceTemplate,
+                dotNetTemplate,
+                multiResourceTemplate,
+                badRuntimeTemplate,
+            ])
+
+            assert.deepStrictEqual(val, [
+                {
+                    name: 'resource1',
+                    resourceData: matchingResource,
+                    templateDatum: workingTemplate,
+                },
+                {
+                    name: 'resource1',
+                    resourceData: matchingResource,
+                    templateDatum: multiResourceTemplate,
+                },
+                {
+                    name: 'resource2',
+                    resourceData: {
+                        ...matchingResource,
+                        Properties: {
+                            ...matchingResource.Properties,
+                            Timeout: 5000,
+                        },
+                    },
+                    templateDatum: multiResourceTemplate,
+                },
+                {
+                    name: 'goodResource',
+                    resourceData: matchingResource,
+                    templateDatum: badRuntimeTemplate,
+                },
+            ])
+        })
+    })
+
+    describe('getResourcesForHandlerFromTemplateDatum', function () {
+        it('returns an empty array if the given template is not a parent of the handler file in question', function () {
+            const val = getResourcesForHandlerFromTemplateDatum(
+                path.join(rootPath, 'index.js'),
+                'handler',
+                nonParentTemplate
+            )
+
+            assert.deepStrictEqual(val, [])
+        })
+
+        it('returns an empty array if the template has no resources', function () {
+            const val = getResourcesForHandlerFromTemplateDatum(
+                path.join(rootPath, nestedPath, 'index.js'),
+                'handler',
+                noResourceTemplate
+            )
+
+            assert.deepStrictEqual(val, [])
+        })
+
+        it('returns a template resource if it has a matching handler', function () {
+            const val = getResourcesForHandlerFromTemplateDatum(
+                path.join(rootPath, nestedPath, 'index.js'),
+                'handler',
+                workingTemplate
+            )
+
+            assert.deepStrictEqual(val, [
+                {
+                    name: 'resource1',
+                    resourceData: matchingResource,
+                },
+            ])
+        })
+
+        it('ignores path handling if using a compiled language', function () {
+            const val = getResourcesForHandlerFromTemplateDatum(
+                path.join(rootPath, nestedPath, 'index.cs'),
+                'Asdf::Asdf.Function::FunctionHandler',
+                dotNetTemplate
+            )
+
+            assert.deepStrictEqual(val, [
+                {
+                    name: 'resource1',
+                    resourceData: compiledResource,
+                },
+            ])
+        })
+
+        it('returns all template resources if it has multiple matching handlers', function () {
+            const val = getResourcesForHandlerFromTemplateDatum(
+                path.join(rootPath, nestedPath, 'index.js'),
+                'handler',
+                multiResourceTemplate
+            )
+
+            assert.deepStrictEqual(val, [
+                {
+                    name: 'resource1',
+                    resourceData: matchingResource,
+                },
+                {
+                    name: 'resource2',
+                    resourceData: {
+                        ...matchingResource,
+                        Properties: {
+                            ...matchingResource.Properties,
+                            Timeout: 5000,
+                        },
+                    },
+                },
+            ])
+        })
+
+        it('does not break if the resource has a non-parseable runtime', function () {
+            const val = getResourcesForHandlerFromTemplateDatum(
+                path.join(rootPath, nestedPath, 'index.js'),
+                'handler',
+                badRuntimeTemplate
+            )
+
+            assert.deepStrictEqual(val, [
+                {
+                    name: 'goodResource',
+                    resourceData: matchingResource,
+                },
+            ])
+        })
+    })
+
+    describe('getResourcesForHandlerFromTemplateDatum (image tests)', async function () {
+        let tempFolder: string
+        let helloPath: string
+        let nestedPath: string
+
+        beforeEach(async function () {
+            tempFolder = await makeTemporaryToolkitFolder()
+            helloPath = path.join(tempFolder, 'hello-world')
+            nestedPath = path.join(helloPath, 'nested')
+        })
+
+        afterEach(async function () {
+            await fs.delete(tempFolder, { recursive: true })
+        })
+
+        const resource: {
+            Type: 'AWS::Serverless::Function'
+            Properties: CloudFormation.ImageResourceProperties
+        } = {
+            Type: 'AWS::Serverless::Function',
+            Properties: {
+                PackageType: 'Image',
+                Events: {
+                    HelloWorld: {
+                        Type: 'Api',
+                        Properties: {
+                            Path: '/hello',
+                            Method: 'get',
+                        },
+                    },
+                },
+            },
+        }
+
+        it('checks for an exact handler match to a relative path in a Dockerfile for image functions', async function () {
+            await toFile('CMD: ["index.handler"]', path.join(helloPath, 'Dockerfile'))
+            await toFile('CMD: ["index.handler"]', path.join(nestedPath, 'Dockerfile'))
+
+            const helloWorldResource = {
+                ...resource,
+                Metadata: {
+                    DockerTag: 'nodejs16.x-v1',
+                    DockerContext: './hello-world',
+                    Dockerfile: 'Dockerfile',
+                },
+            }
+
+            const helloWorldNestedResource = {
+                ...resource,
+                Metadata: {
+                    DockerTag: 'nodejs16.x-v1',
+                    DockerContext: './hello-world/nested',
+                    Dockerfile: 'Dockerfile',
+                },
+            }
+
+            const template = {
+                path: path.join(tempFolder, 'template.yaml'),
+                item: {
+                    Resources: {
+                        helloWorldResource,
+                        helloWorldNestedResource,
+                    },
+                },
+            }
+            const val = getResourcesForHandlerFromTemplateDatum(
+                path.join(helloPath, 'index.js'),
+                'index.handler',
+                template
+            )
+
+            assert.deepStrictEqual(
+                val,
+                [
+                    {
+                        name: 'helloWorldResource',
+                        resourceData: helloWorldResource,
+                    },
+                ],
+                'non-nested case failed'
+            )
+
+            const val2 = getResourcesForHandlerFromTemplateDatum(
+                path.join(nestedPath, 'index.js'),
+                'index.handler',
+                template
+            )
+
+            assert.deepStrictEqual(
+                val2,
+                [
+                    {
+                        name: 'helloWorldNestedResource',
+                        resourceData: helloWorldNestedResource,
+                    },
+                ],
+                'nested case failed'
+            )
+        })
+
+        it('checks for an exact handler match for C# files in a Dockerfile for image functions', async function () {
+            await toFile(
+                'CMD: ["HelloWorld::HelloWorld.Function::FunctionHandler"]',
+                path.join(helloPath, 'Dockerfile')
+            )
+            await toFile(
+                'CMD: ["HelloWorld::HelloWorld.Function::FunctionHandler"]',
+                path.join(nestedPath, 'Dockerfile')
+            )
+
+            const helloWorldResource = {
+                ...resource,
+                Metadata: {
+                    DockerTag: 'dotnetcore3.1-v1',
+                    DockerContext: './hello-world',
+                    Dockerfile: 'Dockerfile',
+                    DockerBuildArgs: {
+                        SAM_BUILD_MODE: 'run',
+                    },
+                },
+            }
+
+            const helloWorldNestedResource = {
+                ...resource,
+                Metadata: {
+                    DockerTag: 'dotnetcore3.1-v1',
+                    DockerContext: './hello-world/nested',
+                    Dockerfile: 'Dockerfile',
+                    DockerBuildArgs: {
+                        SAM_BUILD_MODE: 'run',
+                    },
+                },
+            }
+
+            const template = {
+                path: path.join(tempFolder, 'template.yaml'),
+                item: {
+                    Resources: {
+                        helloWorldResource,
+                        helloWorldNestedResource,
+                    },
+                },
+            }
+            const val = getResourcesForHandlerFromTemplateDatum(
+                path.join(helloPath, 'HelloWorld.cs'),
+                'HelloWorld::HelloWorld.Function::FunctionHandler',
+                template
+            )
+
+            assert.deepStrictEqual(
+                val,
+                [
+                    {
+                        name: 'helloWorldResource',
+                        resourceData: helloWorldResource,
+                    },
+                ],
+                'non-nested case failed'
+            )
+
+            const val2 = getResourcesForHandlerFromTemplateDatum(
+                path.join(nestedPath, 'HelloWorld.cs'),
+                'HelloWorld::HelloWorld.Function::FunctionHandler',
+                template
+            )
+
+            // checks all Dockerfiles in parent paths
+            assert.deepStrictEqual(
+                val2,
+                [
+                    {
+                        name: 'helloWorldResource',
+                        resourceData: helloWorldResource,
+                    },
+                    {
+                        name: 'helloWorldNestedResource',
+                        resourceData: helloWorldNestedResource,
+                    },
+                ],
+                'nested case failed'
+            )
+        })
+    })
+})
+
+function assertValidTestTemplate(data: WatchedItem<CloudFormation.Template> | undefined, filename: string): void {
+    assert.ok(data)
+    if (data) {
+        assertEqualPaths(data.path, filename)
+        assert.ok(data.item.Resources?.TestResource)
+    }
+}
diff --git a/packages/core/src/test/shared/globalState.test.ts b/packages/core/src/test/shared/globalState.test.ts
new file mode 100644
index 00000000000..d632b745051
--- /dev/null
+++ b/packages/core/src/test/shared/globalState.test.ts
@@ -0,0 +1,206 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { GlobalState } from '../../shared/globalState'
+import { FakeMemento } from '../fakeExtensionContext'
+import * as redshift from '../../awsService/redshift/models/models'
+
+describe('GlobalState', function () {
+    let globalState: GlobalState
+    const testKey = 'aws.downloadPath'
+
+    beforeEach(async function () {
+        const memento = new FakeMemento()
+        globalState = new GlobalState(memento)
+    })
+
+    afterEach(async function () {})
+
+    const scenarios = [
+        { testValue: 1234, desc: 'number' },
+        { testValue: 0, desc: 'default number' },
+        { testValue: 'hello world', desc: 'string' },
+        { testValue: '', desc: 'default string' },
+        { testValue: true, desc: 'true' },
+        { testValue: false, desc: 'false' },
+        { testValue: [], desc: 'empty array' },
+        { testValue: [{ value: 'foo' }, { value: 'bar' }], desc: 'array' },
+        { testValue: {}, desc: 'empty object' },
+        { testValue: { value: 'foo' }, desc: 'object' },
+    ]
+
+    describe('get()', function () {
+        for (const scenario of scenarios) {
+            it(scenario.desc, async () => {
+                await globalState.update(testKey, scenario.testValue)
+
+                const actualValue = globalState.get(testKey)
+                assert.deepStrictEqual(actualValue, scenario.testValue)
+            })
+        }
+    })
+
+    describe('update()', function () {
+        for (const scenario of scenarios) {
+            it(scenario.desc, async () => {
+                await globalState.update(testKey, scenario.testValue)
+                const savedValue = globalState.get(testKey)
+                assert.deepStrictEqual(savedValue, scenario.testValue)
+            })
+        }
+    })
+
+    it('getStrict()', async () => {
+        //
+        // Missing item:
+        //
+        const testKey = 'aws.downloadPath'
+        assert.strictEqual(globalState.get(testKey), undefined)
+        assert.strictEqual(globalState.getStrict(testKey, Boolean), undefined)
+        assert.strictEqual(globalState.getStrict(testKey, Boolean, true), true)
+
+        //
+        // Item exists but has wrong type:
+        //
+        await globalState.update(testKey, 123)
+        assert.throws(() => globalState.getStrict(testKey, String))
+        assert.throws(() => globalState.getStrict(testKey, Object))
+        assert.throws(() => globalState.getStrict(testKey, Boolean))
+        // Wrong type, but defaultValue was given:
+        assert.throws(() => globalState.getStrict(testKey, String, ''))
+        assert.throws(() => globalState.getStrict(testKey, Object, {}))
+        assert.throws(() => globalState.getStrict(testKey, Boolean, true))
+    })
+
+    it('tryGet()', async () => {
+        //
+        // Missing item:
+        //
+        const testKey = 'aws.downloadPath'
+        assert.strictEqual(globalState.get(testKey), undefined)
+        assert.strictEqual(globalState.tryGet(testKey, Boolean), undefined)
+        assert.strictEqual(globalState.tryGet(testKey, Boolean, true), true)
+
+        //
+        // Item exists but has wrong type:
+        //
+        await globalState.update(testKey, 123)
+        assert.strictEqual(globalState.tryGet(testKey, String), undefined)
+        assert.strictEqual(globalState.tryGet(testKey, Object), undefined)
+        assert.strictEqual(globalState.tryGet(testKey, Boolean), undefined)
+        // Wrong type, but defaultValue was given:
+        assert.deepStrictEqual(globalState.tryGet(testKey, String, ''), '')
+        assert.deepStrictEqual(globalState.tryGet(testKey, Object, {}), {})
+        assert.deepStrictEqual(globalState.tryGet(testKey, Boolean, true), true)
+    })
+
+    it('clear()', async () => {
+        const keys = ['CODECATALYST_RECONNECT', 'SAM_INIT_ARCH_KEY', 'aws.redshift.connections']
+        await globalState.update(keys[0] as any, 'val1')
+        await globalState.update(keys[1] as any, 'val2')
+        await globalState.update(keys[2] as any, 'val3')
+        assert.deepStrictEqual(globalState.keys(), keys)
+        assert.deepStrictEqual(globalState.values(), ['val1', 'val2', 'val3'])
+
+        await globalState.clear()
+
+        assert.deepStrictEqual(globalState.keys(), [])
+        assert.deepStrictEqual(globalState.values(), [])
+    })
+
+    describe('redshift state', function () {
+        const testArn1 = 'arn:foo/bar/baz/1'
+        const testArn2 = 'arn:foo/bar/baz/2'
+
+        const fakeCxn1: redshift.ConnectionParams = {
+            connectionType: redshift.ConnectionType.SecretsManager,
+            database: 'fake-db',
+            warehouseIdentifier: 'warhouse-id-1',
+            warehouseType: redshift.RedshiftWarehouseType.SERVERLESS,
+            region: {
+                id: 'us-east-2',
+                name: 'region name',
+            },
+            password: 'password-1',
+            secret: 'secret 1',
+        }
+        const fakeCxn2: redshift.ConnectionParams = {
+            ...fakeCxn1,
+            password: 'pw 2',
+            secret: 'secret 2',
+            warehouseIdentifier: 'wh-id-2',
+            database: 'fake db 2',
+        }
+
+        it('get/set connection state and special DELETE_CONNECTION value', async () => {
+            await globalState.saveRedshiftConnection(testArn1, 'DELETE_CONNECTION')
+            await globalState.saveRedshiftConnection(testArn2, undefined)
+            assert.deepStrictEqual(globalState.getRedshiftConnection(testArn1), 'DELETE_CONNECTION')
+            assert.deepStrictEqual(globalState.getRedshiftConnection(testArn2), undefined)
+            await globalState.saveRedshiftConnection(testArn1, fakeCxn1)
+            await globalState.saveRedshiftConnection(testArn2, fakeCxn2)
+            assert.deepStrictEqual(globalState.getRedshiftConnection(testArn1), fakeCxn1)
+            assert.deepStrictEqual(globalState.getRedshiftConnection(testArn2), fakeCxn2)
+        })
+
+        it('validation', async () => {
+            await globalState.saveRedshiftConnection(testArn1, 'foo' as any)
+            await globalState.saveRedshiftConnection(testArn2, 99 as any)
+
+            // Assert that bad state was set.
+            assert.deepStrictEqual(globalState.get('aws.redshift.connections'), {
+                [testArn1]: 'foo',
+                [testArn2]: 99,
+            })
+
+            // Bad state is logged and returns undefined.
+            assert.deepStrictEqual(globalState.getRedshiftConnection(testArn1), undefined)
+            assert.deepStrictEqual(globalState.getRedshiftConnection(testArn2), undefined)
+
+            await globalState.saveRedshiftConnection(testArn2, fakeCxn2)
+            assert.deepStrictEqual(globalState.getRedshiftConnection(testArn2), fakeCxn2)
+            // Stored state is now "partially bad".
+            assert.deepStrictEqual(globalState.get('aws.redshift.connections'), {
+                [testArn1]: 'foo',
+                [testArn2]: fakeCxn2,
+            })
+        })
+    })
+
+    describe('SSO sessions', function () {
+        const session1 = 'session-1'
+        const session2 = 'session-2'
+        const time1 = new Date(Date.now() - 42 * 1000) // in the past.
+        const time2 = new Date()
+
+        it('get/set', async () => {
+            await globalState.setSsoSessionCreationDate(session1, time1)
+            await globalState.setSsoSessionCreationDate(session2, time2)
+            assert.deepStrictEqual(globalState.getSsoSessionCreationDate(session1), time1.getTime())
+            assert.deepStrictEqual(globalState.getSsoSessionCreationDate(session2), time2.getTime())
+        })
+
+        it('validation', async () => {
+            // Set bad state.
+            await globalState.update('#sessionCreationDates', {
+                [session1]: 'foo',
+                [session2]: {},
+            })
+
+            // Bad state is logged and returns undefined.
+            assert.deepStrictEqual(globalState.getSsoSessionCreationDate(session1), undefined)
+            assert.deepStrictEqual(globalState.getSsoSessionCreationDate(session2), undefined)
+
+            await globalState.setSsoSessionCreationDate(session2, time2)
+            assert.deepStrictEqual(globalState.getSsoSessionCreationDate(session2), time2.getTime())
+            // Stored state is now "partially bad".
+            assert.deepStrictEqual(globalState.get('#sessionCreationDates'), {
+                [session1]: 'foo',
+                [session2]: time2.getTime(),
+            })
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/icons.test.ts b/packages/core/src/test/shared/icons.test.ts
new file mode 100644
index 00000000000..edca2647d42
--- /dev/null
+++ b/packages/core/src/test/shared/icons.test.ts
@@ -0,0 +1,79 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as path from 'path'
+import { Uri, ThemeIcon } from 'vscode'
+import { codicon, getIcon } from '../../shared/icons'
+import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../../shared/filesystemUtilities'
+import { fs } from '../../shared'
+
+describe('getIcon', function () {
+    it('returns a ThemeIcon for `vscode` codicons', function () {
+        const icon = getIcon('vscode-gear')
+
+        assert.ok(icon instanceof ThemeIcon)
+        assert.strictEqual(icon.id, 'gear')
+    })
+
+    it('can use overrides for contributed icons', async function () {
+        const tempDir = await makeTemporaryToolkitFolder()
+
+        const paths = [
+            path.join(tempDir, 'aws', 'cdk', 'logo.svg'),
+            path.join(tempDir, 'aws', 'dark', 'cdk-logo.svg'),
+            path.join(tempDir, 'aws', 'light', 'cdk-logo.svg'),
+        ]
+
+        try {
+            for (const p of paths) {
+                await fs.mkdir(path.dirname(p))
+                await fs.writeFile(p, '<svg></svg>')
+            }
+
+            const icon = getIcon('aws-cdk-logo', tempDir)
+
+            assert.ok(!(icon instanceof ThemeIcon))
+            assert.strictEqual(icon.dark.fsPath, Uri.file(paths[1]).fsPath)
+            assert.strictEqual(icon.light.fsPath, Uri.file(paths[2]).fsPath)
+        } finally {
+            await tryRemoveFolder(tempDir)
+        }
+    })
+
+    it('provides the icon source if available', async function () {
+        const tempDir = await makeTemporaryToolkitFolder()
+        const logoPath = path.join(tempDir, 'aws', 'cdk', 'logo.svg')
+
+        try {
+            await fs.mkdir(path.dirname(logoPath))
+            await fs.writeFile(logoPath, '<svg></svg>')
+
+            const icon = getIcon('aws-cdk-logo', tempDir)
+
+            assert.ok(icon instanceof ThemeIcon)
+            assert.strictEqual(icon.source?.fsPath, Uri.file(logoPath).fsPath)
+        } finally {
+            await tryRemoveFolder(tempDir)
+        }
+    })
+})
+
+describe('codicon', function () {
+    it('inserts icon ids', function () {
+        const result = codicon`my icon: ${getIcon('vscode-gear')}`
+        assert.strictEqual(result, 'my icon: $(gear)')
+    })
+
+    it('skips adding icons if no icon font is available', function () {
+        const result = codicon`my icon: ${getIcon('vscode-help')}`
+        assert.strictEqual(result, 'my icon:')
+    })
+
+    it('trims the resulting string', function () {
+        const result = codicon`  some text ${getIcon('vscode-help')}      `
+        assert.strictEqual(result, 'some text')
+    })
+})
diff --git a/packages/core/src/test/shared/logger/activation.test.ts b/packages/core/src/test/shared/logger/activation.test.ts
new file mode 100644
index 00000000000..a9167c70ee9
--- /dev/null
+++ b/packages/core/src/test/shared/logger/activation.test.ts
@@ -0,0 +1,37 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import vscode from 'vscode'
+import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
+import { Logger } from '../../../shared/logger'
+import { makeLogger } from '../../../shared/logger/activation'
+import { ToolkitLogger } from '../../../shared/logger/toolkitLogger'
+import { fs } from '../../../shared'
+
+describe('makeLogger', function () {
+    let tempFolder: string
+    let testLogger: Logger | undefined
+
+    before(async function () {
+        tempFolder = await makeTemporaryToolkitFolder()
+        const logPath = vscode.Uri.joinPath(vscode.Uri.file(tempFolder), 'log.txt')
+        testLogger = makeLogger({ logLevel: 'debug', logFile: logPath })
+    })
+
+    after(async function () {
+        if (testLogger && testLogger instanceof ToolkitLogger) {
+            await testLogger.dispose()
+        }
+
+        testLogger = undefined
+        await fs.delete(tempFolder, { force: true, recursive: true })
+    })
+
+    it('creates a logger object', function () {
+        assert.notStrictEqual(testLogger, undefined)
+        assert.ok(testLogger instanceof ToolkitLogger)
+    })
+})
diff --git a/packages/core/src/test/shared/logger/consoleLogLogger.test.ts b/packages/core/src/test/shared/logger/consoleLogLogger.test.ts
new file mode 100644
index 00000000000..3a2f323d8d4
--- /dev/null
+++ b/packages/core/src/test/shared/logger/consoleLogLogger.test.ts
@@ -0,0 +1,53 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { SinonStub, SinonStubbedMember, stub } from 'sinon'
+import * as assert from 'assert'
+import { ConsoleLogTransport, Level, Levels } from '../../../shared/logger/consoleLogTransport'
+import { MESSAGE } from '../../../shared/logger/consoleLogTransport'
+
+describe('ConsoleLogTransport', async function () {
+    let fakeConsole: { [key in Level]: SinonStub } & { log: SinonStub }
+    let instance: ConsoleLogTransport
+    let next: SinonStubbedMember<() => void>
+
+    beforeEach(async function () {
+        fakeConsole = createBrowserFakeConsole()
+        instance = new ConsoleLogTransport(undefined, fakeConsole as unknown as typeof console)
+        next = stub()
+    })
+
+    const allLevels = Object.keys(Levels) as Level[]
+    for (const level of allLevels) {
+        it(`logs to console with level: '${level}'`, async function () {
+            const untilLogged = instance.log({ level, message: 'myMessage', [MESSAGE]: 'myMessageFormatted' }, next)
+            await untilLogged
+            assert.strictEqual(fakeConsole[level].callCount, 1)
+            assert.strictEqual(fakeConsole[level].getCall(0).args[0], 'myMessageFormatted')
+            assert.strictEqual(next.callCount, 1)
+        })
+    }
+
+    it(`logs to the default if non-supported log level provided`, async function () {
+        const untilLogged = instance.log(
+            { level: 'non-supported', message: 'myMessage', [MESSAGE]: 'myMessageFormatted' },
+            next
+        )
+        await untilLogged
+        assert.strictEqual(fakeConsole.log.callCount, 1)
+        assert.strictEqual(fakeConsole.log.getCall(0).args[0], 'myMessageFormatted')
+        assert.strictEqual(next.callCount, 1)
+    })
+
+    function createBrowserFakeConsole() {
+        return {
+            info: stub(),
+            warn: stub(),
+            error: stub(),
+            debug: stub(),
+            log: stub(),
+        }
+    }
+})
diff --git a/src/test/shared/logger/outputChannelLogger.test.ts b/packages/core/src/test/shared/logger/outputChannelLogger.test.ts
similarity index 93%
rename from src/test/shared/logger/outputChannelLogger.test.ts
rename to packages/core/src/test/shared/logger/outputChannelLogger.test.ts
index 8ac0bcc992d..fcb18ffaee4 100644
--- a/src/test/shared/logger/outputChannelLogger.test.ts
+++ b/packages/core/src/test/shared/logger/outputChannelLogger.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import { OutputChannelTransport, MESSAGE } from '../../../shared/logger/outputChannelTransport'
 import { MockOutputChannel } from '../../mockOutputChannel'
 
@@ -55,7 +55,7 @@ describe('OutputChannelTransport', async function () {
         const targetLog: string = outputText.join(raw ? '' : '\n')
 
         // OutputChannel is logged to in async manner
-        outputChannel.onDidAppendText(loggedText => {
+        outputChannel.onDidAppendText((loggedText) => {
             const res = targetMessages.get(loggedText)
             if (res) {
                 targetMessages.delete(loggedText)
@@ -69,7 +69,7 @@ describe('OutputChannelTransport', async function () {
 
         for (const text of outputText) {
             promises.push(
-                new Promise<void>(resolve => {
+                new Promise<void>((resolve) => {
                     targetMessages.set(raw ? text : `${text}\n`, resolve)
                 })
             )
diff --git a/packages/core/src/test/shared/logger/sharedFileTransport.test.ts b/packages/core/src/test/shared/logger/sharedFileTransport.test.ts
new file mode 100644
index 00000000000..7e09acbc724
--- /dev/null
+++ b/packages/core/src/test/shared/logger/sharedFileTransport.test.ts
@@ -0,0 +1,54 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import vscode from 'vscode'
+import assert from 'assert'
+import { SharedFileTransport, flushIntervalMillis } from '../../../shared/logger/sharedFileTransport'
+import fs from '../../../shared/fs/fs'
+import { stub, SinonStub } from 'sinon'
+import { MESSAGE } from '../../../shared/logger/consoleLogTransport'
+import { createTestFile } from '../../testUtil'
+import { readFileSync } from 'fs' // eslint-disable-line no-restricted-imports
+import { sleep } from '../../../shared/utilities/timeoutUtils'
+
+describe('SharedFileTransport', function () {
+    let instance: SharedFileTransport
+    let nextFunc: SinonStub<[], Promise<void>>
+    let logFile: vscode.Uri
+
+    beforeEach(async function () {
+        logFile = await createTestFile('testLogFile.log')
+        instance = new SharedFileTransport({ logFile })
+        nextFunc = stub()
+    })
+
+    afterEach(async function () {
+        await fs.delete(logFile)
+    })
+
+    it('logs are written to file', async function () {
+        // This test will write logs at different points in time,
+        // and should all be in the log file at the end.
+
+        void instance.log({ level: 'info', message: 'hello', [MESSAGE]: 'a1' }, nextFunc)
+        await sleep(flushIntervalMillis + 1) // wait a full flush interval
+
+        void instance.log({ level: 'info', message: 'hello', [MESSAGE]: 'a2' }, nextFunc)
+        void instance.log({ level: 'info', message: 'hello', [MESSAGE]: 'a3' }, nextFunc)
+        await sleep(flushIntervalMillis + 1) // wait a full flush interval
+
+        void instance.log({ level: 'info', message: 'hello', [MESSAGE]: 'a4' }, nextFunc)
+        void instance.log({ level: 'info', message: 'hello', [MESSAGE]: 'a5' }, nextFunc)
+        await sleep(flushIntervalMillis / 2) // wait half a flush interval
+
+        const lastLog = instance.log({ level: 'info', message: 'hello', [MESSAGE]: 'a6' }, nextFunc)
+        await lastLog // wait for the last log to be written to the file
+
+        // assert all logs were written to file
+        const actualText = readFileSync(logFile.fsPath, 'utf8')
+        assert.strictEqual(actualText, 'a1\na2\na3\na4\na5\na6\n')
+        assert.strictEqual(nextFunc.callCount, 6)
+    })
+})
diff --git a/packages/core/src/test/shared/logger/toolkitLogger.test.ts b/packages/core/src/test/shared/logger/toolkitLogger.test.ts
new file mode 100644
index 00000000000..80545f1c006
--- /dev/null
+++ b/packages/core/src/test/shared/logger/toolkitLogger.test.ts
@@ -0,0 +1,415 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as fs from 'fs' // eslint-disable-line no-restricted-imports
+import * as filesystemUtilities from '../../../shared/filesystemUtilities'
+import * as vscode from 'vscode'
+import { ToolkitLogger } from '../../../shared/logger/toolkitLogger'
+import { MockOutputChannel } from '../../mockOutputChannel'
+import { sleep, waitUntil } from '../../../shared/utilities/timeoutUtils'
+import { getLogger } from '../../../shared/logger'
+import { assertLogsContain } from '../../globalSetup.test'
+
+/**
+ * Disposes the logger then waits for the write streams to flush. The `expected` and `unexpected` arrays just look
+ * for any occurence within the file, passing if all expected strings were found or failing if any unexpected strings
+ * were found.
+ *
+ * TODO: merge this with `globalSetup.test.ts:assertLogsContain`
+ */
+async function checkFile(
+    logger: ToolkitLogger,
+    logPath: vscode.Uri,
+    expected: string[],
+    unexpected: string[] = []
+): Promise<void> {
+    const check = new Promise<void>(async (resolve, reject) => {
+        // Timeout if we wait too long for file to exist
+        setTimeout(() => reject(new Error('Timed out waiting for log message')), 10_000)
+
+        // Wait for file to exist
+        while (!fs.existsSync(logPath.fsPath)) {
+            await sleep(200)
+        }
+        const contents = fs.readFileSync(logPath.fsPath)
+
+        // Error if unexpected messages are in the log file
+        const foundUnexpected = unexpected
+            .filter((t) => contents.includes(t))
+            .reduce((a, b) => a + `Unexpected message in log: ${b}\n`, '')
+        if (foundUnexpected) {
+            return reject(new Error(foundUnexpected))
+        }
+
+        // Fail if any of the expected messages are not in the log file
+        const notFound = expected.filter((t) => !contents.includes(t))
+        if (notFound.length > 0) {
+            const last10Lines = contents.toString().split('\n').slice(-10)
+            reject(
+                new Error(
+                    notFound.reduce((a, b) => a + `Expected message not found in log: ${b}\n`, '') +
+                        `\n\n Last 10 log lines:\n${last10Lines.join('\n')}`
+                )
+            )
+        }
+
+        resolve()
+    })
+
+    return logger.dispose().then(() => check)
+}
+
+describe('ToolkitLogger', function () {
+    let tempFolder: string
+
+    before(async function () {
+        tempFolder = await filesystemUtilities.makeTemporaryToolkitFolder()
+    })
+
+    after(async function () {
+        await filesystemUtilities.tryRemoveFolder(tempFolder)
+    })
+
+    it('logLevelEnabled()', function () {
+        const logger = new ToolkitLogger('info')
+        // winston complains if we don't log to something
+        logger.logToOutputChannel(new MockOutputChannel(), false)
+
+        assert.strictEqual(true, logger.logLevelEnabled('error'))
+        assert.strictEqual(true, logger.logLevelEnabled('warn'))
+        assert.strictEqual(true, logger.logLevelEnabled('info'))
+        assert.strictEqual(false, logger.logLevelEnabled('verbose'))
+        assert.strictEqual(false, logger.logLevelEnabled('debug'))
+
+        logger.setLogLevel('error')
+        assert.strictEqual(true, logger.logLevelEnabled('error'))
+        assert.strictEqual(false, logger.logLevelEnabled('warn'))
+        assert.strictEqual(false, logger.logLevelEnabled('info'))
+        assert.strictEqual(false, logger.logLevelEnabled('verbose'))
+        assert.strictEqual(false, logger.logLevelEnabled('debug'))
+
+        logger.setLogLevel('debug')
+        assert.strictEqual(true, logger.logLevelEnabled('error'))
+        assert.strictEqual(true, logger.logLevelEnabled('warn'))
+        assert.strictEqual(true, logger.logLevelEnabled('info'))
+        assert.strictEqual(true, logger.logLevelEnabled('verbose'))
+        assert.strictEqual(true, logger.logLevelEnabled('debug'))
+    })
+
+    it('creates an object', function () {
+        assert.notStrictEqual(new ToolkitLogger('info'), undefined)
+    })
+
+    it('throws when logging to a disposed object', async function () {
+        const logger = new ToolkitLogger('info')
+        await logger.dispose()
+
+        assert.throws(() => logger.info('This should not log'))
+    })
+
+    const happyLogScenarios = [
+        {
+            name: 'logs debug',
+            logMessage: (logger: ToolkitLogger, msg: string, args: any[]) => {
+                logger.debug(msg, ...args)
+            },
+        },
+        {
+            name: 'logs verbose',
+            logMessage: (logger: ToolkitLogger, msg: string, args: any[]) => {
+                logger.verbose(msg, ...args)
+            },
+        },
+        {
+            name: 'logs info',
+            logMessage: (logger: ToolkitLogger, msg: string, args: any[]) => {
+                logger.info(msg, ...args)
+            },
+        },
+        {
+            name: 'logs warn',
+            logMessage: (logger: ToolkitLogger, msg: string, args: any[]) => {
+                logger.warn(msg, ...args)
+            },
+        },
+        {
+            name: 'logs error',
+            logMessage: (logger: ToolkitLogger, msg: string, args: any[]) => {
+                logger.error(msg, ...args)
+            },
+        },
+    ]
+
+    describe('logs to a file', async function () {
+        let tempLogPath: vscode.Uri
+        let tempFileCounter = 0
+        let testLogger: ToolkitLogger | undefined
+
+        beforeEach(async function () {
+            tempLogPath = vscode.Uri.joinPath(vscode.Uri.file(tempFolder), `temp-${++tempFileCounter}.log`)
+        })
+
+        it('does not log a lower level', async function () {
+            const debugMessage = 'debug message'
+            const errorMessage = 'error message'
+
+            testLogger = new ToolkitLogger('error')
+            testLogger.logToFile(tempLogPath)
+
+            testLogger.debug(debugMessage)
+            testLogger.error(errorMessage)
+
+            await checkFile(testLogger, tempLogPath, [errorMessage], [debugMessage])
+        })
+
+        it('supports updating the log type', async function () {
+            const nonLoggedVerboseEntry = 'verbose entry should not be logged'
+            const loggedVerboseEntry = 'verbose entry should be logged'
+
+            testLogger = new ToolkitLogger('info')
+            testLogger.logToFile(tempLogPath)
+
+            testLogger.verbose(nonLoggedVerboseEntry)
+            testLogger.setLogLevel('verbose')
+            testLogger.verbose(loggedVerboseEntry)
+
+            await checkFile(testLogger, tempLogPath, [loggedVerboseEntry], [nonLoggedVerboseEntry])
+        })
+
+        for (const scenario of happyLogScenarios) {
+            it(scenario.name, async () => {
+                const msg = `message for ${scenario.name} arg1 %s, arg2 %O`
+                const args = [42, ['a', 'b']]
+                const expectedMsg = `message for ${scenario.name} arg1 42, arg2 [ 'a', 'b' ]`
+                testLogger = new ToolkitLogger('debug')
+                testLogger.logToFile(tempLogPath)
+
+                scenario.logMessage(testLogger, msg, args)
+
+                await checkFile(testLogger, tempLogPath, [expectedMsg])
+            })
+        }
+    })
+
+    describe('logs to an OutputChannel', async function () {
+        let testLogger: ToolkitLogger | undefined
+        let outputChannel: MockOutputChannel
+
+        beforeEach(async function () {
+            outputChannel = new MockOutputChannel()
+        })
+
+        afterEach(async function () {
+            if (testLogger) {
+                await testLogger.dispose()
+                testLogger = undefined
+            }
+        })
+
+        it('does not log a lower level', async function () {
+            const debugMessage = 'debug message'
+            const errorMessage = 'error message'
+
+            testLogger = new ToolkitLogger('error')
+            testLogger.logToOutputChannel(outputChannel, false)
+
+            const waitForMessage = waitForLoggedTextByCount(1)
+
+            testLogger.debug(debugMessage)
+            testLogger.error(errorMessage)
+
+            assert.ok((await waitForMessage).includes(errorMessage), 'Expected error message to be logged')
+        })
+
+        it('supports updating the log type', async function () {
+            const nonLoggedVerboseEntry = 'verbose entry should not be logged'
+            const loggedVerboseEntry = 'verbose entry should be logged'
+
+            testLogger = new ToolkitLogger('info')
+            testLogger.logToOutputChannel(outputChannel, false)
+
+            testLogger.verbose(nonLoggedVerboseEntry)
+            testLogger.setLogLevel('verbose')
+            testLogger.verbose(loggedVerboseEntry)
+
+            const waitForMessage = waitForLoggedTextByContents(loggedVerboseEntry)
+            assert.ok((await waitForMessage).includes(loggedVerboseEntry), 'Expected error message to be logged')
+            assert.ok(!(await waitForMessage).includes(nonLoggedVerboseEntry), 'unexpected message in log')
+        })
+
+        it('prepends topic to message', async function () {
+            const logger = getLogger('notifications')
+            logger.setLogLevel('verbose')
+
+            logger.verbose('This is a test message')
+            assertLogsContain('notifications: This is a test message', true, 'verbose')
+
+            // TODO: prepending to an Error not working yet?
+            // logger.verbose(new ToolkitError('root error', { code: 'something went wrong' }))
+            // assertLogsContain("notifications: 'something went wrong'", true, 'verbose')
+
+            // 'unknown' is not prepended
+            const logger2 = getLogger('unknown')
+            logger2.verbose('This is a test message')
+            assertLogsContain('This is a test message', true, 'verbose')
+        })
+
+        for (const scenario of happyLogScenarios) {
+            it(scenario.name, async () => {
+                const message = `message for ${scenario.name}`
+                testLogger = new ToolkitLogger('debug')
+                testLogger.logToOutputChannel(outputChannel, false)
+
+                const waitForMessage = waitForLoggedTextByCount(1)
+
+                scenario.logMessage(testLogger, message, [])
+
+                assert.ok((await waitForMessage).includes(message), 'Expected error message to be logged')
+            })
+        }
+
+        // Logger writes to OutputChannel in async manner.
+        async function waitForLoggedTextByCount(entries: number): Promise<string> {
+            return new Promise<string>((resolve, reject) => {
+                let loggedEntries = 0
+                let loggedText = ''
+
+                const appendTextEvent = outputChannel.onDidAppendText((text) => {
+                    loggedText += text
+                    loggedEntries++
+
+                    if (loggedEntries >= entries) {
+                        appendTextEvent.dispose()
+                        resolve(loggedText)
+                    }
+                })
+            })
+        }
+
+        // Logger writes to OutputChannel in async manner.
+        async function waitForLoggedTextByContents(expectedText: string): Promise<string> {
+            return new Promise<string>((resolve, reject) => {
+                let loggedText = ''
+
+                const appendTextEvent = outputChannel.onDidAppendText((text) => {
+                    loggedText += text
+
+                    if (text.includes(expectedText)) {
+                        appendTextEvent.dispose()
+                        resolve(loggedText)
+                    }
+                })
+            })
+        }
+    })
+
+    // Log tracking functionality testing
+    describe('log tracking', function () {
+        let tempLogPath: vscode.Uri
+        let tempFileCounter: number = 0
+        let testLogger: ToolkitLogger
+
+        beforeEach(async function () {
+            testLogger = new ToolkitLogger('info')
+            tempLogPath = vscode.Uri.joinPath(vscode.Uri.file(tempFolder), `temp-tracker-${tempFileCounter++}.log`)
+            testLogger.logToFile(tempLogPath)
+        })
+
+        afterEach(async function () {
+            await testLogger.dispose()
+        })
+
+        it('get info log message', async function () {
+            const logID: number = testLogger.info('test')
+            await checkFile(testLogger, tempLogPath, ['test'])
+            assert.notStrictEqual(testLogger.getLogById(logID, tempLogPath), undefined)
+        })
+
+        it('debug log message is undefined', async function () {
+            const logID: number = testLogger.debug('debug test')
+            await checkFile(testLogger, tempLogPath, [], ['debug test'])
+            assert.strictEqual(testLogger.getLogById(logID, tempLogPath), undefined)
+        })
+
+        it('retrieve multiple unique logs with other logs', async function () {
+            const idMap = new Map<number, string>()
+            const expected: string[] = []
+            const unexpected: string[] = []
+
+            for (let i = 0; i < 5; i++) {
+                const logInfo = `log ${i}`
+                const logError = `error log ${i}`
+                const logDebug = `debug log ${i}`
+                expected.push(logInfo, logError)
+                unexpected.push(logDebug)
+                testLogger.error(logError)
+                testLogger.debug(logDebug)
+                idMap.set(testLogger.info(logInfo), logInfo)
+            }
+
+            await checkFile(testLogger, tempLogPath, expected, unexpected)
+            for (const [id, msg] of idMap.entries()) {
+                assert.ok(testLogger.getLogById(id, tempLogPath)?.includes(msg))
+            }
+        })
+
+        it('can find log from multiple files', async function () {
+            const logIDs: number[] = []
+            const filePaths: vscode.Uri[] = []
+            const expected: string[] = []
+
+            // Make a bunch of files
+            for (let i = 0; i < 4; i++) {
+                tempLogPath = vscode.Uri.joinPath(vscode.Uri.file(tempFolder), `temp-tracker-${tempFileCounter++}.log`)
+                testLogger.logToFile(tempLogPath)
+                filePaths.push(tempLogPath)
+            }
+
+            for (let i = 0; i < 10; i++) {
+                const errorLog = `error message ${i}`
+                logIDs.push(testLogger.error(errorLog))
+                expected.push(errorLog)
+            }
+
+            await Promise.all(filePaths.map((log) => checkFile(testLogger, log, expected)))
+
+            const middleFile: vscode.Uri = filePaths[Math.floor(filePaths.length / 2)]
+            const middleMsg = testLogger.getLogById(logIDs[Math.floor(logIDs.length / 2)], middleFile)
+            assert.notStrictEqual(middleMsg, undefined)
+        })
+
+        it('can find log from channel', async function () {
+            const outputChannel: MockOutputChannel = new MockOutputChannel()
+            testLogger.logToOutputChannel(outputChannel, true)
+            const logID: number = testLogger.error('Test error')
+
+            const msg: string | undefined = await waitUntil(
+                async () => testLogger.getLogById(logID, vscode.Uri.parse(`channel://${outputChannel.name}`)),
+                { timeout: 2000, interval: 5, truthy: false }
+            )
+
+            assert.notStrictEqual(msg, undefined)
+        })
+
+        it('invalid log id raises exception', async function () {
+            // Log ID counter will be at 3 after these
+            testLogger.error('error log')
+            testLogger.debug('debug log')
+
+            assert.throws(
+                () => testLogger.getLogById(-1, vscode.Uri.file('')),
+                Error,
+                'Invalid log state, logID=-1 must be in the range [0, 3)!'
+            )
+
+            assert.throws(
+                () => testLogger.getLogById(3, vscode.Uri.file('')),
+                Error,
+                'Invalid log state, logID=3 must be in the range [0, 3)!'
+            )
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/lsp/manifestResolver.test.ts b/packages/core/src/test/shared/lsp/manifestResolver.test.ts
new file mode 100644
index 00000000000..953a469c0ea
--- /dev/null
+++ b/packages/core/src/test/shared/lsp/manifestResolver.test.ts
@@ -0,0 +1,101 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import { Manifest, ManifestResolver } from '../../../shared'
+import { assertTelemetry } from '../../testUtil'
+import { ManifestLocation } from '../../../shared/telemetry'
+
+const manifestSchemaVersion = '1.0.0'
+const serverName = 'myLS'
+
+/**
+ * Helper function generating valid manifest results for tests.
+ * @param location
+ * @returns
+ */
+function manifestResult(location: ManifestLocation): Manifest {
+    return {
+        location,
+        manifestSchemaVersion,
+        artifactId: 'artifact-id',
+        artifactDescription: 'artifact-description',
+        isManifestDeprecated: false,
+        versions: [],
+    }
+}
+
+describe('manifestResolver', function () {
+    let remoteStub: sinon.SinonStub
+    let localStub: sinon.SinonStub
+
+    before(function () {
+        remoteStub = sinon.stub(ManifestResolver.prototype, 'fetchRemoteManifest' as any)
+        localStub = sinon.stub(ManifestResolver.prototype, 'getLocalManifest' as any)
+    })
+
+    after(function () {
+        sinon.restore()
+    })
+
+    it('attempts to fetch from remote first', async function () {
+        remoteStub.resolves(manifestResult('remote'))
+
+        const r = await new ManifestResolver('remote-manifest.com', serverName, '').resolve()
+        assert.strictEqual(r.location, 'remote')
+        assertTelemetry('languageServer_setup', {
+            manifestLocation: 'remote',
+            manifestSchemaVersion,
+            languageServerSetupStage: 'getManifest',
+            id: serverName,
+            result: 'Succeeded',
+        })
+    })
+
+    it('uses local cache when remote fails', async function () {
+        remoteStub.rejects(new Error('failed to fetch'))
+        localStub.resolves(manifestResult('cache'))
+
+        const r = await new ManifestResolver('remote-manifest.com', serverName, '').resolve()
+        assert.strictEqual(r.location, 'cache')
+        assertTelemetry('languageServer_setup', [
+            {
+                manifestLocation: 'remote',
+                languageServerSetupStage: 'getManifest',
+                id: serverName,
+                result: 'Failed',
+            },
+            {
+                manifestLocation: 'cache',
+                manifestSchemaVersion,
+                languageServerSetupStage: 'getManifest',
+                id: serverName,
+                result: 'Succeeded',
+            },
+        ])
+    })
+
+    it('fails if both local and remote fail', async function () {
+        remoteStub.rejects(new Error('failed to fetch'))
+        localStub.rejects(new Error('failed to fetch'))
+
+        await assert.rejects(new ManifestResolver('remote-manifest.com', serverName, '').resolve(), /failed to fetch/)
+        assertTelemetry('languageServer_setup', [
+            {
+                manifestLocation: 'remote',
+                languageServerSetupStage: 'getManifest',
+                id: serverName,
+                result: 'Failed',
+            },
+            {
+                manifestLocation: 'cache',
+                languageServerSetupStage: 'getManifest',
+                id: serverName,
+                result: 'Failed',
+            },
+        ])
+    })
+})
diff --git a/packages/core/src/test/shared/lsp/utils/cleanup.test.ts b/packages/core/src/test/shared/lsp/utils/cleanup.test.ts
new file mode 100644
index 00000000000..ec2f5a32059
--- /dev/null
+++ b/packages/core/src/test/shared/lsp/utils/cleanup.test.ts
@@ -0,0 +1,120 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Uri } from 'vscode'
+import { cleanLspDownloads, fs, getDownloadedVersions } from '../../../../shared'
+import { createTestWorkspaceFolder } from '../../../testUtil'
+import path from 'path'
+import assert from 'assert'
+
+async function fakeInstallVersion(version: string, installationDir: string): Promise<void> {
+    const versionDir = path.join(installationDir, version)
+    await fs.mkdir(versionDir)
+    await fs.writeFile(path.join(versionDir, 'file.txt'), 'content')
+}
+
+async function fakeInstallVersions(versions: string[], installationDir: string): Promise<void> {
+    for (const v of versions) {
+        await fakeInstallVersion(v, installationDir)
+    }
+}
+
+describe('cleanLSPDownloads', function () {
+    let installationDir: Uri
+
+    before(async function () {
+        installationDir = (await createTestWorkspaceFolder()).uri
+    })
+
+    afterEach(async function () {
+        const files = await fs.readdir(installationDir.fsPath)
+        for (const [name, _type] of files) {
+            await fs.delete(path.join(installationDir.fsPath, name), { force: true, recursive: true })
+        }
+    })
+
+    after(async function () {
+        await fs.delete(installationDir, { force: true, recursive: true })
+    })
+
+    it('keeps two newest versions', async function () {
+        await fakeInstallVersions(['1.0.0', '1.0.1', '1.1.1', '2.1.1'], installationDir.fsPath)
+        const deleted = await cleanLspDownloads('2.1.1', [], installationDir.fsPath)
+
+        const result = (await fs.readdir(installationDir.fsPath)).map(([filename, _filetype], _index) => filename)
+        assert.strictEqual(result.length, 2)
+        assert.ok(result.includes('2.1.1'))
+        assert.ok(result.includes('1.1.1'))
+        assert.strictEqual(deleted.length, 2)
+    })
+
+    it('deletes delisted versions', async function () {
+        await fakeInstallVersions(['1.0.0', '1.0.1', '1.1.1', '2.1.1'], installationDir.fsPath)
+        const deleted = await cleanLspDownloads(
+            '2.1.1',
+            [{ serverVersion: '1.1.1', isDelisted: true, targets: [] }],
+            installationDir.fsPath
+        )
+
+        const result = (await fs.readdir(installationDir.fsPath)).map(([filename, _filetype], _index) => filename)
+        assert.strictEqual(result.length, 2)
+        assert.ok(result.includes('2.1.1'))
+        assert.ok(result.includes('1.0.1'))
+        assert.strictEqual(deleted.length, 2)
+    })
+
+    it('handles case where less than 2 versions are not delisted', async function () {
+        await fakeInstallVersions(['1.0.0', '1.0.1', '1.1.1', '2.1.1'], installationDir.fsPath)
+        const deleted = await cleanLspDownloads(
+            '1.0.1',
+            [
+                { serverVersion: '1.1.1', isDelisted: true, targets: [] },
+                { serverVersion: '2.1.1', isDelisted: true, targets: [] },
+                { serverVersion: '1.0.0', isDelisted: true, targets: [] },
+            ],
+            installationDir.fsPath
+        )
+
+        const result = (await fs.readdir(installationDir.fsPath)).map(([filename, _filetype], _index) => filename)
+        assert.strictEqual(result.length, 1)
+        assert.ok(result.includes('1.0.1'))
+        assert.strictEqual(deleted.length, 3)
+    })
+
+    it('handles case where less than 2 versions exist', async function () {
+        await fakeInstallVersions(['1.0.0'], installationDir.fsPath)
+        const deleted = await cleanLspDownloads('1.0.0', [], installationDir.fsPath)
+
+        const result = (await fs.readdir(installationDir.fsPath)).map(([filename, _filetype], _index) => filename)
+        assert.strictEqual(result.length, 1)
+        assert.strictEqual(deleted.length, 0)
+    })
+
+    it('does not install delisted version when no other option exists', async function () {
+        await fakeInstallVersions(['1.0.0'], installationDir.fsPath)
+        const deleted = await cleanLspDownloads(
+            '1.0.0',
+            [{ serverVersion: '1.0.0', isDelisted: true, targets: [] }],
+            installationDir.fsPath
+        )
+
+        const result = (await fs.readdir(installationDir.fsPath)).map(([filename, _filetype], _index) => filename)
+        assert.strictEqual(result.length, 0)
+        assert.strictEqual(deleted.length, 1)
+    })
+
+    it('ignores invalid versions', async function () {
+        await fakeInstallVersions(['1.0.0', '.DS_STORE'], installationDir.fsPath)
+        const deleted = await cleanLspDownloads(
+            '1.0.0',
+            [{ serverVersion: '1.0.0', isDelisted: true, targets: [] }],
+            installationDir.fsPath
+        )
+
+        const result = await getDownloadedVersions(installationDir.fsPath)
+        assert.strictEqual(result.length, 0)
+        assert.strictEqual(deleted.length, 1)
+    })
+})
diff --git a/packages/core/src/test/shared/lsp/utils/platform.test.ts b/packages/core/src/test/shared/lsp/utils/platform.test.ts
new file mode 100644
index 00000000000..862bd06f990
--- /dev/null
+++ b/packages/core/src/test/shared/lsp/utils/platform.test.ts
@@ -0,0 +1,209 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { createServerOptions } from '../../../../shared/lsp/utils/platform'
+import * as extensionUtilities from '../../../../shared/extensionUtilities'
+import * as env from '../../../../shared/vscode/env'
+import { ChildProcess } from '../../../../shared/utilities/processUtils'
+
+describe('createServerOptions - SageMaker Authentication', function () {
+    let sandbox: sinon.SinonSandbox
+    let isSageMakerStub: sinon.SinonStub
+    let isRemoteWorkspaceStub: sinon.SinonStub
+    let executeCommandStub: sinon.SinonStub
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+
+        isSageMakerStub = sandbox.stub(extensionUtilities, 'isSageMaker')
+        isRemoteWorkspaceStub = sandbox.stub(env, 'isRemoteWorkspace')
+        sandbox.stub(env, 'isDebugInstance').returns(false)
+        executeCommandStub = sandbox.stub(vscode.commands, 'executeCommand')
+
+        sandbox.stub(ChildProcess.prototype, 'run').resolves()
+        sandbox.stub(ChildProcess.prototype, 'send').resolves()
+        sandbox.stub(ChildProcess.prototype, 'proc').returns({} as any)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    // jscpd:ignore-start
+    it('sets USE_IAM_AUTH=true when authMode is Iam', async function () {
+        isSageMakerStub.returns(true)
+        executeCommandStub.withArgs('sagemaker.parseCookies').resolves({ authMode: 'Iam' })
+
+        // Capture constructor arguments using sinon stub
+        let capturedOptions: any = undefined
+        const childProcessConstructorSpy = sandbox.stub().callsFake((command: string, args: string[], options: any) => {
+            capturedOptions = options
+            // Create a fake instance with the methods we need
+            const fakeInstance = {
+                run: sandbox.stub().resolves(),
+                send: sandbox.stub().resolves(),
+                proc: sandbox.stub().returns({}),
+                pid: sandbox.stub().returns(12345),
+                stop: sandbox.stub(),
+                stopped: false,
+            }
+            return fakeInstance
+        })
+
+        // Replace ChildProcess constructor
+        sandbox.replace(
+            require('../../../../shared/utilities/processUtils'),
+            'ChildProcess',
+            childProcessConstructorSpy
+        )
+
+        const serverOptions = createServerOptions({
+            encryptionKey: Buffer.from('test-key'),
+            executable: ['node'],
+            serverModule: 'test-module.js',
+            execArgv: ['--stdio'],
+        })
+
+        await serverOptions()
+
+        assert(capturedOptions, 'ChildProcess constructor should have been called')
+        assert(capturedOptions.spawnOptions, 'spawnOptions should be defined')
+        assert(capturedOptions.spawnOptions.env, 'spawnOptions.env should be defined')
+        assert.equal(capturedOptions.spawnOptions.env.USE_IAM_AUTH, 'true')
+    })
+
+    it('does not set USE_IAM_AUTH when authMode is Sso', async function () {
+        isSageMakerStub.returns(true)
+        executeCommandStub.withArgs('sagemaker.parseCookies').resolves({ authMode: 'Sso' })
+
+        // Capture constructor arguments using sinon stub
+        let capturedOptions: any = undefined
+        const childProcessConstructorSpy = sandbox.stub().callsFake((command: string, args: string[], options: any) => {
+            capturedOptions = options
+            // Create a fake instance with the methods we need
+            const fakeInstance = {
+                run: sandbox.stub().resolves(),
+                send: sandbox.stub().resolves(),
+                proc: sandbox.stub().returns({}),
+                pid: sandbox.stub().returns(12345),
+                stop: sandbox.stub(),
+                stopped: false,
+            }
+            return fakeInstance
+        })
+
+        // Replace ChildProcess constructor
+        sandbox.replace(
+            require('../../../../shared/utilities/processUtils'),
+            'ChildProcess',
+            childProcessConstructorSpy
+        )
+
+        const serverOptions = createServerOptions({
+            encryptionKey: Buffer.from('test-key'),
+            executable: ['node'],
+            serverModule: 'test-module.js',
+            execArgv: ['--stdio'],
+        })
+
+        await serverOptions()
+
+        assert(capturedOptions, 'ChildProcess constructor should have been called')
+        assert(capturedOptions.spawnOptions, 'spawnOptions should be defined')
+        assert(capturedOptions.spawnOptions.env, 'spawnOptions.env should be defined')
+        assert.equal(capturedOptions.spawnOptions.env.USE_IAM_AUTH, undefined)
+    })
+
+    it('defaults to IAM auth when parseCookies fails', async function () {
+        isSageMakerStub.returns(true)
+        isRemoteWorkspaceStub.returns(false)
+        executeCommandStub.withArgs('sagemaker.parseCookies').rejects(new Error('Command failed'))
+
+        // Capture constructor arguments using sinon stub
+        let capturedOptions: any = undefined
+        const childProcessConstructorSpy = sandbox.stub().callsFake((command: string, args: string[], options: any) => {
+            capturedOptions = options
+            // Create a fake instance with the methods we need
+            const fakeInstance = {
+                run: sandbox.stub().resolves(),
+                send: sandbox.stub().resolves(),
+                proc: sandbox.stub().returns({}),
+                pid: sandbox.stub().returns(12345),
+                stop: sandbox.stub(),
+                stopped: false,
+            }
+            return fakeInstance
+        })
+
+        // Replace ChildProcess constructor
+        sandbox.replace(
+            require('../../../../shared/utilities/processUtils'),
+            'ChildProcess',
+            childProcessConstructorSpy
+        )
+
+        const serverOptions = createServerOptions({
+            encryptionKey: Buffer.from('test-key'),
+            executable: ['node'],
+            serverModule: 'test-module.js',
+            execArgv: ['--stdio'],
+        })
+
+        await serverOptions()
+
+        assert(capturedOptions, 'ChildProcess constructor should have been called')
+        assert(capturedOptions.spawnOptions, 'spawnOptions should be defined')
+        assert(capturedOptions.spawnOptions.env, 'spawnOptions.env should be defined')
+        assert.equal(capturedOptions.spawnOptions.env.USE_IAM_AUTH, 'true')
+    })
+
+    it('does not default to IAM in remote workspace without SMUS', async function () {
+        isSageMakerStub.returns(true)
+        isRemoteWorkspaceStub.returns(true)
+        process.env.SERVICE_NAME = 'OtherService'
+        executeCommandStub.withArgs('sagemaker.parseCookies').rejects(new Error('Command failed'))
+
+        // Capture constructor arguments using sinon stub
+        let capturedOptions: any = undefined
+        const childProcessConstructorSpy = sandbox.stub().callsFake((command: string, args: string[], options: any) => {
+            capturedOptions = options
+            // Create a fake instance with the methods we need
+            const fakeInstance = {
+                run: sandbox.stub().resolves(),
+                send: sandbox.stub().resolves(),
+                proc: sandbox.stub().returns({}),
+                pid: sandbox.stub().returns(12345),
+                stop: sandbox.stub(),
+                stopped: false,
+            }
+            return fakeInstance
+        })
+
+        // Replace ChildProcess constructor
+        sandbox.replace(
+            require('../../../../shared/utilities/processUtils'),
+            'ChildProcess',
+            childProcessConstructorSpy
+        )
+
+        const serverOptions = createServerOptions({
+            encryptionKey: Buffer.from('test-key'),
+            executable: ['node'],
+            serverModule: 'test-module.js',
+            execArgv: ['--stdio'],
+        })
+
+        await serverOptions()
+
+        assert(capturedOptions, 'ChildProcess constructor should have been called')
+        assert(capturedOptions.spawnOptions, 'spawnOptions should be defined')
+        assert(capturedOptions.spawnOptions.env, 'spawnOptions.env should be defined')
+        assert.equal(capturedOptions.spawnOptions.env.USE_IAM_AUTH, undefined)
+    })
+    // jscpd:ignore-end
+})
diff --git a/packages/core/src/test/shared/markdown.test.ts b/packages/core/src/test/shared/markdown.test.ts
new file mode 100644
index 00000000000..f362a476925
--- /dev/null
+++ b/packages/core/src/test/shared/markdown.test.ts
@@ -0,0 +1,33 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { extractCodeBlockLanguage } from '../../shared/markdown'
+
+describe('extractCodeBlockLanguage', () => {
+    it('should return "plaintext" when no code block is present', () => {
+        const message = 'This is a message without a code block'
+        assert.strictEqual(extractCodeBlockLanguage(message), 'plaintext')
+    })
+
+    it('should return the language when a code block with language is present', () => {
+        const message = 'Here is some code:\n```javascript\nconsole.log("Hello");\n```'
+        assert.strictEqual(extractCodeBlockLanguage(message), 'javascript')
+    })
+
+    it('should return "plaintext" when a code block is present but no language is specified', () => {
+        const message = 'Here is some code:\n```\nconsole.log("Hello");\n```'
+        assert.strictEqual(extractCodeBlockLanguage(message), 'plaintext')
+    })
+
+    it('should handle whitespace before the language specification', () => {
+        const message = 'Code:\n```   typescript\nconst x: number = 5;\n```'
+        assert.strictEqual(extractCodeBlockLanguage(message), 'typescript')
+    })
+
+    it('should handle empty messages', () => {
+        assert.strictEqual(extractCodeBlockLanguage(''), 'plaintext')
+    })
+})
diff --git a/packages/core/src/test/shared/performance/performance.test.ts b/packages/core/src/test/shared/performance/performance.test.ts
new file mode 100644
index 00000000000..6de6d066b0e
--- /dev/null
+++ b/packages/core/src/test/shared/performance/performance.test.ts
@@ -0,0 +1,36 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as assert from 'assert'
+import * as sinon from 'sinon'
+import { PerformanceTracker } from '../../../shared/performance/performance'
+import { stubPerformance } from '../../utilities/performance'
+
+describe('performance tooling', () => {
+    let sandbox: sinon.SinonSandbox
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+
+    describe('PerformanceTracker', () => {
+        it('gets performance metrics', () => {
+            const { expectedUserCpuUsage, expectedSystemCpuUsage, expectedHeapTotal, expectedTotalSeconds } =
+                stubPerformance(sandbox)
+            const perf = new PerformanceTracker('foo')
+            perf.start()
+            const metrics = perf.stop()
+
+            assert.deepStrictEqual(metrics?.userCpuUsage, expectedUserCpuUsage)
+            assert.deepStrictEqual(metrics?.systemCpuUsage, expectedSystemCpuUsage)
+            assert.deepStrictEqual(metrics?.heapTotal, expectedHeapTotal)
+            assert.deepStrictEqual(metrics?.duration, expectedTotalSeconds)
+        })
+    })
+})
diff --git a/src/test/shared/regions/endpoints.test.ts b/packages/core/src/test/shared/regions/endpoints.test.ts
similarity index 96%
rename from src/test/shared/regions/endpoints.test.ts
rename to packages/core/src/test/shared/regions/endpoints.test.ts
index 097663bfbc7..99c52e5c85c 100644
--- a/src/test/shared/regions/endpoints.test.ts
+++ b/packages/core/src/test/shared/regions/endpoints.test.ts
@@ -1,11 +1,11 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 'use strict'
 
-import * as assert from 'assert'
+import assert from 'assert'
 import { loadEndpoints } from '../../../shared/regions/endpoints'
 
 const sampleEndpoints = {
diff --git a/packages/core/src/test/shared/regions/regionProvider.test.ts b/packages/core/src/test/shared/regions/regionProvider.test.ts
new file mode 100644
index 00000000000..4b146556901
--- /dev/null
+++ b/packages/core/src/test/shared/regions/regionProvider.test.ts
@@ -0,0 +1,237 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { RegionProvider } from '../../../shared/regions/regionProvider'
+import { createRegionPrompter } from '../../../shared/ui/common/region'
+import { createQuickPickPrompterTester } from '../ui/testUtils'
+import { createSsoProfile, createTestAuth } from '../../credentials/testUtil'
+import { Auth } from '../../../auth/auth'
+import * as extUtils from '../../../shared/extensionUtilities'
+import sinon from 'sinon'
+import globals from '../../../shared/extensionGlobals'
+
+const regionCode = 'someRegion'
+const serviceId = 'someService'
+const endpoints = {
+    partitions: [
+        {
+            dnsSuffix: 'totallyLegit.tld',
+            id: 'aws',
+            name: 'AWS',
+            regions: [
+                {
+                    id: regionCode,
+                    name: 'Some Region',
+                },
+            ],
+            services: [
+                {
+                    id: serviceId,
+                    endpoints: [
+                        {
+                            regionId: regionCode,
+                            data: {},
+                        },
+                    ],
+                },
+            ],
+        },
+        {
+            dnsSuffix: 'totallyLegit.cn',
+            id: 'aws-cn',
+            name: 'China',
+            regions: [
+                {
+                    id: 'awscnregion1',
+                    name: '',
+                    description: 'aws-cn region one',
+                },
+            ],
+            services: [],
+        },
+    ],
+}
+
+describe('RegionProvider', async function () {
+    describe('fromEndpointsProvider', function () {
+        it('pulls from the local source first and remote source later', async function () {
+            const localEndpoints = Promise.resolve({ partitions: endpoints.partitions.slice(0, 1) })
+            const remoteEndpoints = Promise.resolve(endpoints)
+            const regionProvider = RegionProvider.fromEndpointsProvider({
+                local: () => localEndpoints,
+                remote: () => remoteEndpoints,
+            })
+
+            await localEndpoints
+            assert.ok(regionProvider.isServiceInRegion(serviceId, regionCode), 'Expected service to be in region')
+            assert.strictEqual(regionProvider.getPartitionId('awscnregion1'), undefined)
+            await remoteEndpoints
+            assert.ok(regionProvider.isServiceInRegion(serviceId, regionCode), 'Expected service to be in region')
+            assert.strictEqual(regionProvider.getPartitionId('awscnregion1'), 'aws-cn')
+        })
+    })
+
+    describe('isServiceInRegion', async function () {
+        it('indicates when a service is in a region', async function () {
+            const regionProvider = new RegionProvider(endpoints)
+
+            assert.ok(regionProvider.isServiceInRegion(serviceId, regionCode), 'Expected service to be in region')
+        })
+
+        it('indicates when a service is not in a region', async function () {
+            const regionProvider = new RegionProvider(endpoints)
+
+            assert.ok(
+                !regionProvider.isServiceInRegion(`${serviceId}x`, regionCode),
+                'Expected service not to be in region'
+            )
+        })
+    })
+
+    describe('getDnsSuffixForRegion', async function () {
+        let regionProvider: RegionProvider
+
+        beforeEach(async function () {
+            regionProvider = new RegionProvider(endpoints)
+        })
+
+        it('gets DNS suffix for a known region', async function () {
+            const partitionId = regionProvider.getDnsSuffixForRegion(regionCode)
+            assert.strictEqual(partitionId, 'totallyLegit.tld')
+        })
+
+        it('returns undefined for an unknown region', async function () {
+            const partitionId = regionProvider.getDnsSuffixForRegion('foo')
+            assert.strictEqual(partitionId, undefined)
+        })
+    })
+
+    describe('getPartitionId', async function () {
+        let regionProvider: RegionProvider
+
+        beforeEach(async function () {
+            regionProvider = new RegionProvider(endpoints)
+        })
+
+        it('gets partition for a known region', async function () {
+            const partitionId = regionProvider.getPartitionId('awscnregion1')
+            assert.strictEqual(partitionId, 'aws-cn')
+        })
+
+        it('returns undefined for an unknown region', async function () {
+            const partitionId = regionProvider.getPartitionId('foo')
+            assert.strictEqual(partitionId, undefined)
+        })
+    })
+
+    describe('getRegions', async function () {
+        let regionProvider: RegionProvider
+
+        beforeEach(async function () {
+            regionProvider = new RegionProvider(endpoints)
+        })
+
+        it('gets regions for a known partition', async function () {
+            const regions = regionProvider.getRegions('aws')
+            assert.deepStrictEqual(regions, [{ id: 'someRegion', name: 'Some Region' }])
+        })
+
+        it('returns empty array for an unknown partition', async function () {
+            const regions = regionProvider.getRegions('foo')
+            assert.strictEqual(regions?.length, 0, 'Unexpected regions returned')
+        })
+    })
+
+    describe('updateExplorerRegions', function () {
+        let regionProvider: RegionProvider
+
+        beforeEach(function () {
+            regionProvider = new RegionProvider(endpoints)
+        })
+
+        it('remembers saved regions', async function () {
+            assert.deepStrictEqual(regionProvider.getExplorerRegions(), [])
+            await regionProvider.updateExplorerRegions(['foo', 'bar'])
+            assert.deepStrictEqual(regionProvider.getExplorerRegions(), ['foo', 'bar'])
+        })
+
+        it('removes duplicate regions', async function () {
+            await regionProvider.updateExplorerRegions(['foo', 'bar', 'foo'])
+            assert.deepStrictEqual(regionProvider.getExplorerRegions(), ['foo', 'bar'])
+        })
+    })
+
+    describe('guessDefaultRegion', function () {
+        beforeEach(async function () {
+            // guessDefaultRegion is informed by the current SSO connection.
+            await Auth.instance.logout()
+        })
+
+        afterEach(() => {
+            sinon.restore()
+        })
+
+        it('sets default region to last region from prompter', async function () {
+            const regionProvider = new RegionProvider()
+            const originalRegion = regionProvider.guessDefaultRegion()
+
+            const regions = [
+                { id: 'us-west-2', name: 'PDX' },
+                { id: 'us-east-1', name: 'IAD' },
+                { id: 'foo-bar-1', name: 'FOO' },
+            ]
+
+            const p = createRegionPrompter(regions, { defaultRegion: 'foo-bar-1' })
+            const tester = createQuickPickPrompterTester(p)
+            const selection = regions[2]
+            tester.acceptItem(selection.name)
+            await tester.result(selection)
+
+            const newRegion = regionProvider.guessDefaultRegion()
+            assert.notStrictEqual(
+                originalRegion,
+                newRegion,
+                `Region Prompter failed to update value of guessDefaultRegion from ${originalRegion}.`
+            )
+            assert.strictEqual(
+                newRegion,
+                selection.id,
+                `guessDefaultRegion gave region ${newRegion} while selection is region ${selection.id}`
+            )
+        })
+
+        it('prioritizes the AWS explorer region if there is only one', async function () {
+            const regionProvider = new RegionProvider(endpoints)
+            await regionProvider.updateExplorerRegions(['us-east-2'])
+            regionProvider.setLastTouchedRegion('us-west-1')
+            assert.strictEqual(regionProvider.guessDefaultRegion(), 'us-east-2')
+        })
+
+        it('returns undefined when unable to determine last used region', function () {
+            const regionProvider = new RegionProvider(endpoints)
+            assert.strictEqual(regionProvider.guessDefaultRegion(), undefined)
+        })
+
+        it('returns undefined when no active amazon Q connection', function () {
+            const regionProvider = new RegionProvider(endpoints)
+            sinon.stub(extUtils, 'isAmazonQ').returns(true)
+
+            assert.strictEqual(regionProvider.guessDefaultRegion(), undefined)
+        })
+
+        it('returns connection region with active amazon Q connection', async function () {
+            const region = 'us-west-2'
+            const regionProvider = new RegionProvider(endpoints)
+            const auth = createTestAuth(globals.globalState)
+            await auth.useConnection(await auth.createConnection(createSsoProfile({ ssoRegion: region })))
+
+            sinon.stub(Auth, 'instance').value(auth)
+            sinon.stub(extUtils, 'isAmazonQ').returns(true)
+
+            assert.strictEqual(regionProvider.guessDefaultRegion(), region)
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/regions/testUtil.ts b/packages/core/src/test/shared/regions/testUtil.ts
new file mode 100644
index 00000000000..0bc0247b898
--- /dev/null
+++ b/packages/core/src/test/shared/regions/testUtil.ts
@@ -0,0 +1,45 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { AwsContext } from '../../../shared/awsContext'
+import { RegionProvider } from '../../../shared/regions/regionProvider'
+
+export const DEFAULT_TEST_REGION_CODE = 'someRegion' // eslint-disable-line @typescript-eslint/naming-convention
+export const DEFAULT_TEST_REGION_NAME = 'Some Region' // eslint-disable-line @typescript-eslint/naming-convention
+
+const endpoints = {
+    partitions: [
+        {
+            dnsSuffix: 'totallyLegit.tld',
+            id: 'aws',
+            name: 'AWS',
+            regions: [
+                {
+                    id: DEFAULT_TEST_REGION_CODE,
+                    name: DEFAULT_TEST_REGION_NAME,
+                },
+                {
+                    id: 'us-west-2',
+                    name: 'US West (N. California)',
+                },
+            ],
+            services: [
+                {
+                    id: 'someService',
+                    endpoints: [
+                        {
+                            regionId: DEFAULT_TEST_REGION_CODE,
+                            data: {},
+                        },
+                    ],
+                },
+            ],
+        },
+    ],
+}
+
+export function createTestRegionProvider(opts?: { awsContext?: AwsContext }): RegionProvider {
+    return new RegionProvider(endpoints, opts?.awsContext)
+}
diff --git a/packages/core/src/test/shared/remoteSession.test.ts b/packages/core/src/test/shared/remoteSession.test.ts
new file mode 100644
index 00000000000..0d949620a31
--- /dev/null
+++ b/packages/core/src/test/shared/remoteSession.test.ts
@@ -0,0 +1,32 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import { minimumSsmActions, promptToAddInlinePolicy } from '../../shared/remoteSession'
+import { IamClient } from '../../shared/clients/iam'
+import { getTestWindow } from './vscode/window'
+import { cancel } from '../../shared'
+
+describe('minimumSsmActions', function () {
+    it('should contain minimal actions needed for ssm connection', function () {
+        assert.deepStrictEqual(minimumSsmActions, [
+            'ssmmessages:CreateControlChannel',
+            'ssmmessages:CreateDataChannel',
+            'ssmmessages:OpenControlChannel',
+            'ssmmessages:OpenDataChannel',
+            'ssm:DescribeAssociation',
+            'ssm:ListAssociations',
+            'ssm:UpdateInstanceInformation',
+        ])
+    })
+
+    it('prompts the user for confirmation before adding policies and allow cancels', async function () {
+        getTestWindow().onDidShowMessage((message) => {
+            assert.ok(message.message.includes('add'), 'should prompt to add policies')
+            getTestWindow().getFirstMessage().selectItem(cancel)
+        })
+        const added = await promptToAddInlinePolicy({} as IamClient, 'roleArnTest')
+        assert.ok(!added, 'should not add policies by default')
+    })
+})
diff --git a/packages/core/src/test/shared/request.test.ts b/packages/core/src/test/shared/request.test.ts
new file mode 100644
index 00000000000..ddfa811e751
--- /dev/null
+++ b/packages/core/src/test/shared/request.test.ts
@@ -0,0 +1,82 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { SinonStub, stub } from 'sinon'
+import assert from 'assert'
+import crossFetch from 'cross-fetch'
+import request, { RequestCancelledError, RequestError } from '../../shared/request'
+import globals from '../../shared/extensionGlobals'
+
+describe('fetch()', function () {
+    /** We built a wrapper around an actual fetch implementation, this is a fake stub of it for testing. */
+    let wrappedFetch: SinonStub<Parameters<typeof crossFetch>, Promise<Response>>
+    const testStatusCode = 123456
+    const actualResponse: Response = {
+        ok: true,
+        status: testStatusCode,
+    } as Response
+
+    beforeEach(function () {
+        // stub underlying fetch response with some default values
+        wrappedFetch = stub()
+        wrappedFetch.resolves(actualResponse)
+    })
+
+    it('passes the expected arguments to the wrapped fetch implementation', async function () {
+        const response = await request.fetch('GET', 'http://test.com', { mode: 'cors' }, wrappedFetch).response
+
+        assert.strictEqual(wrappedFetch.callCount, 1)
+        assert.deepStrictEqual(wrappedFetch.getCall(0).args, [
+            'http://test.com',
+            { method: 'GET', mode: 'cors', signal: new AbortController().signal },
+        ])
+
+        assert.strictEqual(response.status, actualResponse.status)
+    })
+
+    it('throws if a request gets a bad response', async function () {
+        // stub to resolve a bad response
+        wrappedFetch.resolves({
+            ok: false,
+            text: () => Promise.resolve('test text'),
+            status: testStatusCode,
+        } as Response)
+
+        const req = request.fetch('GET', 'http://test.com', {}, wrappedFetch)
+
+        await assert.rejects(async () => {
+            await req.response
+        }, RequestError)
+    })
+
+    it('throws an AbortError if cancel() is called while the request is being made', async function () {
+        // How does this test work?
+        // - There are multiple event queues that the event loop pops events from for asynchronous code
+        // - There are microtask and macrotask queues
+        // - A Promise is a microtask
+        // - A setTimeout is a macrotask
+        // - Microtasks take priority over macrotasks, so Promises take priority over setTimeouts
+        // - If a Promise has a ~nested Promise~, when it is popped for processing from the microtask queue it
+        //   will push the ~nested Promise~ to the microtask queue and then that will be popped/processed.
+        // - All of this is done before anything on the macrotask queue (setTimeout) is processed.
+        // - Once all microTasks are completed/exhausted, only then will the event loop
+        //   pickup a single macrotask. This process then repeats.
+
+        const req = request.fetch('GET', 'https://aws.amazon.com/', {})
+
+        // cancel() call is part of the macrotask queue.
+        globals.clock.setTimeout(() => {
+            req.cancel()
+        }, 0)
+
+        // The response and the wrapped fetch request pushed to the microtask queue.
+        await assert.rejects(
+            () => req.response,
+            (e) => {
+                return e instanceof RequestCancelledError
+            }
+        )
+    })
+})
diff --git a/src/test/shared/resourceFetcher/fileResourceFetcher.test.ts b/packages/core/src/test/shared/resourceFetcher/fileResourceFetcher.test.ts
similarity index 85%
rename from src/test/shared/resourceFetcher/fileResourceFetcher.test.ts
rename to packages/core/src/test/shared/resourceFetcher/fileResourceFetcher.test.ts
index a600bf6cb97..86b4ad634ab 100644
--- a/src/test/shared/resourceFetcher/fileResourceFetcher.test.ts
+++ b/packages/core/src/test/shared/resourceFetcher/fileResourceFetcher.test.ts
@@ -1,13 +1,13 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
-import * as fs from 'fs-extra'
+import assert from 'assert'
 import { join } from 'path'
 import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
 import { FileResourceFetcher } from '../../../shared/resourcefetcher/fileResourceFetcher'
+import { fs } from '../../../shared'
 
 describe('FileResourceFetcher', async function () {
     let tempFolder: string
@@ -17,7 +17,7 @@ describe('FileResourceFetcher', async function () {
     })
 
     afterEach(async function () {
-        await fs.remove(tempFolder)
+        await fs.delete(tempFolder, { recursive: true })
     })
 
     it('loads the contents of a file', async function () {
diff --git a/packages/core/src/test/shared/resourceFetcher/httpResourceFetcher.test.ts b/packages/core/src/test/shared/resourceFetcher/httpResourceFetcher.test.ts
new file mode 100644
index 00000000000..18a5f0e9cbb
--- /dev/null
+++ b/packages/core/src/test/shared/resourceFetcher/httpResourceFetcher.test.ts
@@ -0,0 +1,39 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { HttpResourceFetcher, getPropertyFromJsonUrl } from '../../../shared/resourcefetcher/httpResourceFetcher'
+import { stub } from '../../utilities/stubber'
+import { createResponse } from '../../testUtil'
+
+describe('getPropertyFromJsonUrl', function () {
+    const dummyUrl = 'url'
+    const dummyProperty = 'property'
+
+    it('undefined if resource is not present', async function () {
+        const mockFetcher = stub(HttpResourceFetcher)
+        mockFetcher.get.resolves(undefined)
+        assert.strictEqual(await getPropertyFromJsonUrl(dummyUrl, dummyProperty, mockFetcher), undefined)
+    })
+
+    it('undefined if resource is not JSON', async function () {
+        const mockFetcher = stub(HttpResourceFetcher)
+        mockFetcher.get.resolves(createResponse('foo'))
+        assert.strictEqual(await getPropertyFromJsonUrl(dummyUrl, dummyProperty, mockFetcher), undefined)
+    })
+
+    it('undefined if property is not present', async function () {
+        const mockFetcher = stub(HttpResourceFetcher)
+        mockFetcher.get.resolves(createResponse('{"foo": "bar"}'))
+        assert.strictEqual(await getPropertyFromJsonUrl(dummyUrl, dummyProperty, mockFetcher), undefined)
+    })
+    it('returns value if property is present', async function () {
+        const mockFetcher = stub(HttpResourceFetcher)
+        mockFetcher.get.resolves(createResponse('{"property": "111"}'))
+        mockFetcher.getNewETagContent.resolves({ content: 'foo', eTag: '' })
+        const value = await getPropertyFromJsonUrl(dummyUrl, dummyProperty, mockFetcher)
+        assert.strictEqual(value, '111')
+    })
+})
diff --git a/packages/core/src/test/shared/sam/build.test.ts b/packages/core/src/test/shared/sam/build.test.ts
new file mode 100644
index 00000000000..bed4fee7e25
--- /dev/null
+++ b/packages/core/src/test/shared/sam/build.test.ts
@@ -0,0 +1,654 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { globals, ToolkitError } from '../../../shared'
+import * as SamUtilsModule from '../../../shared/sam/utils'
+import * as ProcessTerminalUtils from '../../../shared/sam/processTerminal'
+import * as ResolveEnvModule from '../../../shared/env/resolveEnv'
+import * as ProcessUtilsModule from '../../../shared/utilities/processUtils'
+import { AppNode } from '../../../awsService/appBuilder/explorer/nodes/appNode'
+import {
+    BuildParams,
+    BuildWizard,
+    createParamsSourcePrompter,
+    getBuildFlags,
+    ParamsSource,
+    resolveBuildFlags,
+    runBuild,
+    SamBuildResult,
+} from '../../../shared/sam/build'
+import { TreeNode } from '../../../shared/treeview/resourceTreeDataProvider'
+import { createWizardTester } from '../wizards/wizardTestUtils'
+import assert from 'assert'
+import { createBaseTemplate } from '../cloudformation/cloudformationTestUtils'
+import { getProjectRootUri } from '../../../shared/sam/utils'
+import sinon from 'sinon'
+import { createMultiPick, DataQuickPickItem } from '../../../shared/ui/pickerPrompter'
+import * as config from '../../../shared/sam/config'
+import * as utils from '../../../shared/sam/utils'
+import { PrompterTester } from '../wizards/prompterTester'
+import { getWorkspaceFolder, TestFolder } from '../../testUtil'
+import { samconfigCompleteData, validTemplateData } from './samTestUtils'
+import { CloudFormationTemplateRegistry } from '../../../shared/fs/templateRegistry'
+import { getTestWindow } from '../vscode/window'
+import { CancellationError } from '../../../shared/utilities/timeoutUtils'
+import { SamAppLocation } from '../../../awsService/appBuilder/explorer/samProject'
+import { SemVer } from 'semver'
+
+describe('SAM BuildWizard', async function () {
+    const createTester = async (params?: Partial<BuildParams>, arg?: TreeNode | undefined) =>
+        createWizardTester(new BuildWizard({ ...params }, await globals.templateRegistry, arg))
+
+    it('shows steps in correct order when triggered from command palette', async function () {
+        const tester = await createTester()
+        tester.template.assertShowFirst()
+        tester.paramsSource.assertShowSecond()
+    })
+
+    it('shows steps in correct order when triggered from appBuilder', async function () {
+        const workspaceFolder = vscode.workspace.workspaceFolders?.[0]
+        assert.ok(workspaceFolder)
+
+        const templateUri = vscode.Uri.joinPath(workspaceFolder.uri, 'template.yaml')
+        const projectRootUri = getProjectRootUri(templateUri)
+        const samAppLocation = {
+            samTemplateUri: templateUri,
+            workspaceFolder: workspaceFolder,
+            projectRoot: projectRootUri,
+        }
+        const appNode = new AppNode(samAppLocation)
+        const tester = await createTester({}, appNode)
+        tester.template.assertDoesNotShow()
+        tester.paramsSource.assertShowFirst()
+    })
+
+    it('shows steps in correct order when triggered from command palette', async function () {
+        const workspaceFolder = vscode.workspace.workspaceFolders?.[0]
+        assert.ok(workspaceFolder)
+
+        const templateUri = vscode.Uri.joinPath(workspaceFolder.uri, 'template.yaml')
+        const template = { uri: templateUri, data: createBaseTemplate() }
+        const tester = await createTester({ template })
+        tester.template.assertDoesNotShow()
+        tester.paramsSource.assertShowFirst()
+    })
+
+    it('set the correct project root', async function () {
+        const workspaceFolder = vscode.workspace.workspaceFolders?.[0]
+        assert.ok(workspaceFolder)
+
+        const templateUri = vscode.Uri.joinPath(workspaceFolder.uri, 'template.yaml')
+        const template = { uri: templateUri, data: createBaseTemplate() }
+        const tester = await createTester({ template })
+        tester.projectRoot.path.assertValue(workspaceFolder.uri.path)
+    })
+})
+
+describe('SAM build helper functions', () => {
+    describe('getBuildFlags', () => {
+        let sandbox: sinon.SinonSandbox
+        let projectRoot: vscode.Uri
+        const defaultFlags: string[] = ['--cached', '--parallel', '--save-params', '--use-container']
+        let quickPickItems: DataQuickPickItem<string>[]
+
+        beforeEach(() => {
+            sandbox = sinon.createSandbox()
+            projectRoot = vscode.Uri.parse('file:///path/to/project')
+            quickPickItems = [
+                {
+                    label: 'Beta features',
+                    data: '--beta-features',
+                    description: 'Enable beta features',
+                },
+                {
+                    label: 'Build in source',
+                    data: '--build-in-source',
+                    description: 'Opts in to build project in the source folder',
+                },
+                {
+                    label: 'Cached',
+                    data: '--cached',
+                    description: 'Reuse build artifacts that have not changed from previous builds',
+                },
+                {
+                    label: 'Debug',
+                    data: '--debug',
+                    description: 'Turn on debug logging to print debug messages and display timestamps',
+                },
+                {
+                    label: 'Parallel',
+                    data: '--parallel',
+                    description: 'Enable parallel builds for AWS SAM template functions and layers',
+                },
+                {
+                    label: 'Skip prepare infra',
+                    data: '--skip-prepare-infra',
+                    description: 'Skip preparation stage when there are no infrastructure changes',
+                },
+                {
+                    label: 'Skip pull image',
+                    data: '--skip-pull-image',
+                    description: 'Skip pulling down the latest Docker image for Lambda runtime',
+                },
+                {
+                    label: 'Use container',
+                    data: '--use-container',
+                    description: 'Build functions with an AWS Lambda-like container',
+                },
+                {
+                    label: 'Save parameters',
+                    data: '--save-params',
+                    description: 'Save to samconfig.toml as default parameters',
+                },
+            ]
+        })
+
+        afterEach(() => {
+            sandbox.restore() // Restore all stubs after each test
+        })
+
+        it('should return flags from buildFlagsPrompter when paramsSource is Specify', async () => {
+            PrompterTester.init()
+                .handleQuickPick('Select build flags', async (picker) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items.length, 9)
+                    assert.strictEqual(picker.title, 'Select build flags')
+                    assert.deepStrictEqual(picker.items, quickPickItems)
+                    const betaFeatures = picker.items[0]
+                    const buildInSource = picker.items[1]
+                    const cached = picker.items[2]
+                    assert.strictEqual(betaFeatures.data, '--beta-features')
+                    assert.strictEqual(buildInSource.data, '--build-in-source')
+                    assert.strictEqual(cached.data, '--cached')
+                    const acceptedItems = [betaFeatures, buildInSource, cached]
+                    picker.acceptItems(...acceptedItems)
+                })
+                .build()
+
+            const flags = await createMultiPick(quickPickItems, {
+                title: 'Select build flags',
+                ignoreFocusOut: true,
+            }).prompt()
+
+            assert.deepStrictEqual(flags, JSON.stringify(['--beta-features', '--build-in-source', '--cached']))
+        })
+
+        it('should return config file flag when paramsSource is SamConfig', async () => {
+            const mockConfigFileUri = vscode.Uri.parse('file:///path/to/samconfig.toml')
+            const getConfigFileUriStub = sandbox.stub().resolves(mockConfigFileUri)
+            sandbox.stub(config, 'getConfigFileUri').callsFake(getConfigFileUriStub)
+
+            const flags = await getBuildFlags(ParamsSource.SamConfig, projectRoot, defaultFlags)
+            assert.deepStrictEqual(flags, ['--config-file', mockConfigFileUri.fsPath])
+        })
+
+        it('should return default flags if getConfigFileUri throws an error', async () => {
+            const getConfigFileUriStub = sinon.stub().rejects(new Error('Config file not found'))
+            sandbox.stub(config, 'getConfigFileUri').callsFake(getConfigFileUriStub)
+
+            const flags = await getBuildFlags(ParamsSource.SamConfig, projectRoot, defaultFlags)
+            assert.deepStrictEqual(flags, defaultFlags)
+        })
+    })
+
+    describe('createParamsSourcePrompter', () => {
+        it('should return a prompter with the correct items with no valid samconfig', () => {
+            const expectedItems: DataQuickPickItem<ParamsSource>[] = [
+                {
+                    label: 'Specify build flags',
+                    data: ParamsSource.Specify,
+                },
+                {
+                    label: 'Use default values',
+                    data: ParamsSource.DefaultValues,
+                    description: 'cached = true, parallel = true, use_container = true',
+                },
+            ]
+            const prompter = createParamsSourcePrompter(false)
+            const quickPick = prompter.quickPick
+            assert.strictEqual(quickPick.title, 'Specify parameter source for build')
+            assert.strictEqual(quickPick.placeholder, 'Select configuration options for sam build')
+            assert.strictEqual(quickPick.items.length, 2)
+            assert.deepStrictEqual(quickPick.items, expectedItems)
+        })
+
+        it('should return a prompter with the correct items with valid samconfig', () => {
+            const expectedItems: DataQuickPickItem<ParamsSource>[] = [
+                {
+                    label: 'Specify build flags',
+                    data: ParamsSource.Specify,
+                },
+                {
+                    label: 'Use default values from samconfig',
+                    data: ParamsSource.SamConfig,
+                },
+            ]
+            const prompter = createParamsSourcePrompter(true)
+            const quickPick = prompter.quickPick
+            assert.strictEqual(quickPick.title, 'Specify parameter source for build')
+            assert.strictEqual(quickPick.placeholder, 'Select configuration options for sam build')
+            assert.strictEqual(quickPick.items.length, 2)
+            assert.deepStrictEqual(quickPick.items, expectedItems)
+        })
+    })
+
+    describe('resolveBuildFlags', () => {
+        let sandbox: sinon.SinonSandbox
+        beforeEach(() => {
+            sandbox = sinon.createSandbox()
+        })
+
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        it('uses --no-use-container when --use-container is absent', async () => {
+            const normalVersion = new SemVer('1.133.0')
+            const buildFlags = ['--cached', '--debug', '--parallel']
+            const expectedBuildFlags = ['--cached', '--debug', '--parallel', '--no-use-container']
+            return testResolveBuildFlags(sandbox, normalVersion, buildFlags, expectedBuildFlags)
+        })
+
+        it('preserves buildFlags when SAM CLI version < 1.133', async () => {
+            const lowerVersion = new SemVer('1.110.0')
+            const buildFlags = ['--cached', '--parallel', '--save-params']
+            const expectedBuildFlags = ['--cached', '--parallel', '--save-params']
+            return testResolveBuildFlags(sandbox, lowerVersion, buildFlags, expectedBuildFlags)
+        })
+
+        it('respects existing --use-container flag', async () => {
+            const normalVersion = new SemVer('1.110.0')
+            const buildFlags = ['--cached', '--parallel', '--save-params', '--use-container']
+            const expectedBuildFlags = ['--cached', '--parallel', '--save-params', '--use-container']
+            return testResolveBuildFlags(sandbox, normalVersion, buildFlags, expectedBuildFlags)
+        })
+    })
+})
+
+describe('SAM runBuild', () => {
+    let sandbox: sinon.SinonSandbox
+    let testFolder: TestFolder
+    let projectRoot: vscode.Uri
+    let workspaceFolder: vscode.WorkspaceFolder
+    let templateFile: vscode.Uri
+
+    let mockGetSpawnEnv: sinon.SinonStub
+    let mockGetSamCliPath: sinon.SinonStub
+    let mockChildProcessClass: sinon.SinonStub
+    let mockSamBuildChildProcess: sinon.SinonStub
+
+    let registry: CloudFormationTemplateRegistry
+
+    // Dependency clients
+    beforeEach(async function () {
+        testFolder = await TestFolder.create()
+        projectRoot = vscode.Uri.file(testFolder.path)
+        workspaceFolder = getWorkspaceFolder(testFolder.path)
+        sandbox = sinon.createSandbox()
+        registry = await globals.templateRegistry
+
+        // Create template.yaml in temporary test folder and add to registery
+        templateFile = vscode.Uri.file(await testFolder.write('template.yaml', validTemplateData))
+        await registry.addItem(templateFile)
+
+        mockGetSpawnEnv = sandbox.stub(ResolveEnvModule, 'getSpawnEnv').callsFake(
+            sandbox.stub().resolves({
+                AWS_TOOLING_USER_AGENT: 'AWS-Toolkit-For-VSCode/testPluginVersion',
+                SAM_CLI_TELEMETRY: '0',
+            })
+        )
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+        registry.reset()
+    })
+
+    describe(':) path', () => {
+        let spyRunInterminal: sinon.SinonSpy
+
+        beforeEach(() => {
+            mockGetSamCliPath = sandbox
+                .stub(SamUtilsModule, 'getSamCliPathAndVersion')
+                .callsFake(sandbox.stub().resolves({ path: 'sam-cli-path' }))
+
+            // Mock  child process with required properties that get called in ProcessTerminal
+            mockSamBuildChildProcess = Object.create(ProcessUtilsModule.ChildProcess.prototype, {
+                stopped: { get: sandbox.stub().returns(false) },
+                stop: { value: sandbox.stub().resolves({}) },
+                run: {
+                    value: sandbox.stub().resolves({
+                        exitCode: 0,
+                        stdout: 'Mock successful build command execution ',
+                        stderr: '',
+                    }),
+                },
+            })
+            spyRunInterminal = sandbox.spy(ProcessTerminalUtils, 'runInTerminal')
+            mockChildProcessClass = sandbox.stub(ProcessUtilsModule, 'ChildProcess').returns(mockSamBuildChildProcess)
+        })
+
+        afterEach(() => {
+            spyRunInterminal.resetHistory()
+            sandbox.restore()
+        })
+
+        const verifyCorrectDependencyCall = () => {
+            // Prefer count comparison for debugging flakiness
+            assert.strictEqual(1, mockGetSamCliPath.callCount, 'GetSamCliPath')
+            assert.strictEqual(1, mockChildProcessClass.callCount, 'ChildProcessClass')
+            assert.strictEqual(1, mockGetSpawnEnv.callCount, 'GetSpawnEnv')
+            assert.strictEqual(1, spyRunInterminal.callCount, 'RunInterminal')
+            assert.deepEqual(spyRunInterminal.getCall(0).args, [mockSamBuildChildProcess, 'build'])
+        }
+
+        it('[entry: command palette] with specify flags should instantiate correct process in terminal', async () => {
+            const prompterTester = PrompterTester.init()
+                .handleQuickPick('Select a SAM/CloudFormation Template', async (quickPick) => {
+                    await quickPick.untilReady()
+                    assert.strictEqual(quickPick.items[0].label, templateFile.fsPath)
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .handleQuickPick('Specify parameter source for build', async (quickPick) => {
+                    // Need sometime to wait for the template to search for template file
+                    await quickPick.untilReady()
+                    assert.strictEqual(quickPick.items.length, 2)
+                    const items = quickPick.items
+                    assert.deepStrictEqual(items[0], { data: ParamsSource.Specify, label: 'Specify build flags' })
+                    assert.deepStrictEqual(items[1], {
+                        label: 'Use default values',
+                        data: ParamsSource.DefaultValues,
+                        description: 'cached = true, parallel = true, use_container = true',
+                    })
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .handleQuickPick('Select build flags', async (quickPick) => {
+                    await quickPick.untilReady()
+
+                    assert.strictEqual(quickPick.items.length, 9)
+                    const item1 = quickPick.items[2] as DataQuickPickItem<string>
+                    const item2 = quickPick.items[3] as DataQuickPickItem<string>
+                    const item3 = quickPick.items[7] as DataQuickPickItem<string>
+                    const item4 = quickPick.items[8] as DataQuickPickItem<string>
+
+                    assert.deepStrictEqual(item1, {
+                        label: 'Cached',
+                        data: '--cached',
+                        description: 'Reuse build artifacts that have not changed from previous builds',
+                    })
+                    assert.deepStrictEqual(item2, {
+                        label: 'Debug',
+                        data: '--debug',
+                        description: 'Turn on debug logging to print debug messages and display timestamps',
+                    })
+                    assert.deepStrictEqual(item3, {
+                        label: 'Use container',
+                        data: '--use-container',
+                        description: 'Build functions with an AWS Lambda-like container',
+                    })
+                    assert.deepStrictEqual(item4, {
+                        label: 'Save parameters',
+                        data: '--save-params',
+                        description: 'Save to samconfig.toml as default parameters',
+                    })
+                    quickPick.acceptItems(item1, item2, item3, item4)
+                })
+                .build()
+
+            // Invoke sync command from command palette
+            // Instead of await runBuild(), prefer this to avoid flakiness due to race condition
+            await delayedRunBuild()
+
+            assert.deepEqual(mockChildProcessClass.getCall(0).args, [
+                'sam-cli-path',
+                [
+                    'build',
+                    '--cached',
+                    '--debug',
+                    '--use-container',
+                    '--save-params',
+                    '--template',
+                    `${templateFile.fsPath}`,
+                ],
+                {
+                    spawnOptions: {
+                        cwd: projectRoot?.fsPath,
+                        env: {
+                            AWS_TOOLING_USER_AGENT: 'AWS-Toolkit-For-VSCode/testPluginVersion',
+                            SAM_CLI_TELEMETRY: '0',
+                        },
+                    },
+                },
+            ])
+            prompterTester.assertCallAll()
+            verifyCorrectDependencyCall()
+        })
+
+        it('[entry: appbuilder node] with default flags should instantiate correct process in terminal and show progress notification', async () => {
+            const prompterTester = getPrompterTester()
+            const expectedSamAppLocation = {
+                workspaceFolder: workspaceFolder,
+                samTemplateUri: templateFile,
+                projectRoot: projectRoot,
+            }
+
+            // Instead of await runBuild(), prefer this to avoid flakiness due to race condition
+            await delayedRunBuild(expectedSamAppLocation)
+
+            getTestWindow()
+                .getFirstMessage()
+                .assertProgress(`Building SAM template at ${expectedSamAppLocation.samTemplateUri.path}`)
+
+            assert.deepEqual(mockChildProcessClass.getCall(0).args, [
+                'sam-cli-path',
+                [
+                    'build',
+                    '--cached',
+                    '--parallel',
+                    '--save-params',
+                    '--use-container',
+                    '--template',
+                    `${templateFile.fsPath}`,
+                ],
+                {
+                    spawnOptions: {
+                        cwd: projectRoot?.fsPath,
+                        env: {
+                            AWS_TOOLING_USER_AGENT: 'AWS-Toolkit-For-VSCode/testPluginVersion',
+                            SAM_CLI_TELEMETRY: '0',
+                        },
+                    },
+                },
+            ])
+            verifyCorrectDependencyCall()
+            prompterTester.assertCallAll()
+        })
+
+        it('[entry: appbuilder node] should throw an error when running two build processes in parallel for the same template', async () => {
+            const prompterTester = getPrompterTester()
+            const expectedSamAppLocation = {
+                workspaceFolder: workspaceFolder,
+                samTemplateUri: templateFile,
+                projectRoot: projectRoot,
+            }
+            await assert.rejects(
+                async () => {
+                    await runInParallel(expectedSamAppLocation)
+                },
+                (e: any) => {
+                    assert.strictEqual(e instanceof ToolkitError, true)
+                    assert.strictEqual(e.message, 'This template is already being built')
+                    assert.strictEqual(e.code, 'BuildInProgress')
+                    return true
+                }
+            )
+            prompterTester.assertCallAll(undefined, 2)
+        })
+
+        it('[entry: command palette] use samconfig should instantiate correct process in terminal', async () => {
+            const samconfigFile = vscode.Uri.file(await testFolder.write('samconfig.toml', samconfigCompleteData))
+
+            const prompterTester = PrompterTester.init()
+                .handleQuickPick('Select a SAM/CloudFormation Template', async (quickPick) => {
+                    await quickPick.untilReady()
+                    assert.strictEqual(quickPick.items[0].label, templateFile.fsPath)
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .handleQuickPick('Specify parameter source for build', async (quickPick) => {
+                    // Need sometime to wait for the template to search for template file
+                    await quickPick.untilReady()
+
+                    assert.strictEqual(quickPick.items.length, 2)
+                    const items = quickPick.items
+
+                    assert.deepStrictEqual(items[1], {
+                        label: 'Use default values from samconfig',
+                        data: ParamsSource.SamConfig,
+                    })
+                    quickPick.acceptItem(quickPick.items[1])
+                })
+                .build()
+
+            // Reset the spy before running the test to ensure clean state
+            spyRunInterminal.resetHistory()
+
+            // Instead of await runBuild(), prefer this to avoid flakiness due to race condition
+            await delayedRunBuild()
+
+            assert.deepEqual(mockChildProcessClass.getCall(0).args, [
+                'sam-cli-path',
+                ['build', '--config-file', `${samconfigFile.fsPath}`, '--template', `${templateFile.fsPath}`],
+                {
+                    spawnOptions: {
+                        cwd: projectRoot?.fsPath,
+                        env: {
+                            AWS_TOOLING_USER_AGENT: 'AWS-Toolkit-For-VSCode/testPluginVersion',
+                            SAM_CLI_TELEMETRY: '0',
+                        },
+                    },
+                },
+            ])
+
+            verifyCorrectDependencyCall()
+            prompterTester.assertCallAll()
+        })
+    })
+
+    describe(':( path', () => {
+        let appNode: AppNode
+        beforeEach(async () => {
+            mockGetSamCliPath = sandbox
+                .stub(SamUtilsModule, 'getSamCliPathAndVersion')
+                .callsFake(sandbox.stub().resolves({ path: 'sam-cli-path' }))
+
+            appNode = new AppNode({
+                workspaceFolder: workspaceFolder,
+                samTemplateUri: templateFile,
+                projectRoot: projectRoot,
+            })
+            await testFolder.write('samconfig.toml', samconfigCompleteData)
+        })
+
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        it('should abort when customer cancel build wizard', async () => {
+            getTestWindow().onDidShowQuickPick(async (picker) => {
+                await picker.untilReady()
+                picker.dispose()
+            })
+
+            try {
+                await runBuild(appNode)
+                assert.fail('should have thrown CancellationError')
+            } catch (error: any) {
+                assert(error instanceof CancellationError)
+                assert.strictEqual(error.agent, 'user')
+            }
+        })
+
+        it('should throw ToolkitError when build command fail', async () => {
+            const prompterTester = PrompterTester.init()
+                .handleQuickPick('Specify parameter source for build', async (quickPick) => {
+                    await quickPick.untilReady()
+                    assert.deepStrictEqual(quickPick.items[1].label, 'Use default values from samconfig')
+                    quickPick.acceptItem(quickPick.items[1])
+                })
+                .build()
+
+            // Mock  child process with required properties that get called in ProcessTerminal
+            mockSamBuildChildProcess = Object.create(ProcessUtilsModule.ChildProcess.prototype, {
+                stopped: { get: sandbox.stub().returns(false) },
+                stop: { value: sandbox.stub().resolves({}) },
+                run: {
+                    value: sandbox.stub().resolves({
+                        exitCode: -1,
+                        stdout: 'Mock build command execution failure',
+                        stderr: 'Docker is unreachable.',
+                    }),
+                },
+            })
+            mockChildProcessClass = sandbox.stub(ProcessUtilsModule, 'ChildProcess').returns(mockSamBuildChildProcess)
+
+            try {
+                await runBuild(appNode)
+                assert.fail('should have thrown ToolkitError')
+            } catch (error: any) {
+                assert(error instanceof ToolkitError)
+                assert.strictEqual(error.message, 'Failed to build SAM template')
+                assert(error.details?.['terminal'] as unknown as vscode.Terminal)
+                assert.strictEqual((error.details?.['terminal'] as unknown as vscode.Terminal).name, 'SAM build')
+            }
+            prompterTester.assertCallAll()
+        })
+    })
+})
+
+async function runInParallel(samLocation: SamAppLocation): Promise<[SamBuildResult, SamBuildResult]> {
+    return Promise.all([runBuild(new AppNode(samLocation)), delayedRunBuild(samLocation)])
+}
+
+// We add a small delay to avoid the unlikely but possible race condition.
+async function delayedRunBuild(samLocation?: SamAppLocation): Promise<SamBuildResult> {
+    return new Promise(async (resolve, reject) => {
+        // Add a small delay before returning the build promise
+        setTimeout(() => {
+            // Do nothing, just let the delay pass
+        }, 20)
+
+        const buildPromise = samLocation ? runBuild(new AppNode(samLocation)) : runBuild()
+        buildPromise.then(resolve).catch(reject)
+    })
+}
+
+function getPrompterTester() {
+    return PrompterTester.init()
+        .handleQuickPick('Specify parameter source for build', async (quickPick) => {
+            // Need sometime to wait for the template to search for template file
+            await quickPick.untilReady()
+
+            assert.strictEqual(quickPick.items.length, 2)
+            const items = quickPick.items
+            assert.strictEqual(quickPick.items.length, 2)
+            assert.deepStrictEqual(items[0], { data: ParamsSource.Specify, label: 'Specify build flags' })
+            assert.deepStrictEqual(items[1].label, 'Use default values')
+            quickPick.acceptItem(quickPick.items[1])
+        })
+        .build()
+}
+function testResolveBuildFlags(
+    sandbox: sinon.SinonSandbox,
+    parsedVersion: SemVer,
+    buildFlags: string[],
+    expectedBuildFlags: string[]
+) {
+    const pathAndVersionStub = sandbox.stub().resolves({ path: 'file:///path/to/cli', parsedVersion })
+    sandbox.stub(utils, 'getSamCliPathAndVersion').callsFake(pathAndVersionStub)
+    return resolveBuildFlags(buildFlags, parsedVersion).then((resolvedBuildFlags) => {
+        assert.deepEqual(resolvedBuildFlags, expectedBuildFlags)
+    })
+}
diff --git a/src/test/shared/sam/cli/samCliBuild.test.ts b/packages/core/src/test/shared/sam/cli/samCliBuild.test.ts
similarity index 96%
rename from src/test/shared/sam/cli/samCliBuild.test.ts
rename to packages/core/src/test/shared/sam/cli/samCliBuild.test.ts
index 0eea0f3f19d..2082626c55d 100644
--- a/src/test/shared/sam/cli/samCliBuild.test.ts
+++ b/packages/core/src/test/shared/sam/cli/samCliBuild.test.ts
@@ -1,17 +1,16 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
-import { SpawnOptions } from 'child_process'
-import { writeFile, remove } from 'fs-extra'
+import assert from 'assert'
+import { SpawnOptions } from 'child_process' // eslint-disable-line no-restricted-imports
 import * as path from 'path'
 import { makeTemporaryToolkitFolder } from '../../../../shared/filesystemUtilities'
 import { makeUnexpectedExitCodeError } from '../../../../shared/sam/cli/samCliInvokerUtils'
 import { FileFunctions, SamCliBuildInvocation } from '../../../../shared/sam/cli/samCliBuild'
 import { SamCliProcessInvoker } from '../../../../shared/sam/cli/samCliInvokerUtils'
-import { ChildProcessResult } from '../../../../shared/utilities/childProcess'
+import { ChildProcessResult } from '../../../../shared/utilities/processUtils'
 import { getTestLogger } from '../../../globalSetup.test'
 import { assertArgNotPresent, assertArgsContainArgument } from './samCliTestUtils'
 import {
@@ -19,6 +18,7 @@ import {
     BadExitCodeSamCliProcessInvoker,
     TestSamCliProcessInvoker,
 } from './testSamCliProcessInvoker'
+import { fs } from '../../../../shared'
 
 describe('SamCliBuildInvocation', async function () {
     class FakeChildProcessResult implements ChildProcessResult {
@@ -50,11 +50,11 @@ describe('SamCliBuildInvocation', async function () {
     beforeEach(async function () {
         tempFolder = await makeTemporaryToolkitFolder()
         placeholderTemplateFile = path.join(tempFolder, 'template.yaml')
-        await writeFile(placeholderTemplateFile, '')
+        await fs.writeFile(placeholderTemplateFile, '')
     })
 
     afterEach(async function () {
-        await remove(tempFolder)
+        await fs.delete(tempFolder, { recursive: true })
     })
 
     it('invokes `sam build` with args', async function () {
diff --git a/src/test/shared/sam/cli/samCliConfiguration.test.ts b/packages/core/src/test/shared/sam/cli/samCliConfiguration.test.ts
similarity index 83%
rename from src/test/shared/sam/cli/samCliConfiguration.test.ts
rename to packages/core/src/test/shared/sam/cli/samCliConfiguration.test.ts
index 47097415463..476df036713 100644
--- a/src/test/shared/sam/cli/samCliConfiguration.test.ts
+++ b/packages/core/src/test/shared/sam/cli/samCliConfiguration.test.ts
@@ -1,14 +1,14 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
-import * as fs from 'fs-extra'
+import assert from 'assert'
 import * as path from 'path'
 import { makeTemporaryToolkitFolder } from '../../../../shared/filesystemUtilities'
 import { SamCliSettings } from '../../../../shared/sam/cli/samCliSettings'
 import { TestSettings } from '../../../utilities/testSettingsConfiguration'
+import { fs } from '../../../../shared'
 
 describe('samCliConfiguration', function () {
     let tempFolder: string
@@ -20,17 +20,17 @@ describe('samCliConfiguration', function () {
     })
 
     afterEach(async function () {
-        await fs.remove(tempFolder)
+        await fs.delete(tempFolder, { recursive: true })
     })
 
     it('uses config value when referencing file that exists', async function () {
         const fakeCliLocation = path.join(tempFolder, 'fakeSamCli')
 
-        createSampleFile(fakeCliLocation)
+        await createSampleFile(fakeCliLocation)
         const config = new SamCliSettings({} as any, settingsConfiguration)
         await config.update('location', fakeCliLocation)
 
-        assert.strictEqual(await config.getOrDetectSamCli().then(r => r.path), fakeCliLocation)
+        assert.strictEqual(await config.getOrDetectSamCli().then((r) => r.path), fakeCliLocation)
     })
 
     it('calls location provider when config not set', async function () {
@@ -63,7 +63,7 @@ describe('samCliConfiguration', function () {
         )
 
         assert.strictEqual(config.get('location', ''), '')
-        assert.strictEqual(await config.getOrDetectSamCli().then(r => r.path), fakeCliLocation)
+        assert.strictEqual(await config.getOrDetectSamCli().then((r) => r.path), fakeCliLocation)
     })
 
     it('location provider does not detect a file', async function () {
@@ -74,10 +74,10 @@ describe('samCliConfiguration', function () {
             settingsConfiguration
         )
 
-        assert.strictEqual(await config.getOrDetectSamCli().then(r => r.path), undefined)
+        assert.strictEqual(await config.getOrDetectSamCli().then((r) => r.path), undefined)
     })
 
-    function createSampleFile(filename: string): void {
-        fs.writeFileSync(filename, 'hi')
+    async function createSampleFile(filename: string): Promise<void> {
+        await fs.writeFile(filename, 'hi')
     }
 })
diff --git a/src/test/shared/sam/cli/samCliDeploy.test.ts b/packages/core/src/test/shared/sam/cli/samCliDeploy.test.ts
similarity index 90%
rename from src/test/shared/sam/cli/samCliDeploy.test.ts
rename to packages/core/src/test/shared/sam/cli/samCliDeploy.test.ts
index b13be5c5c4b..383418ee9f3 100644
--- a/src/test/shared/sam/cli/samCliDeploy.test.ts
+++ b/packages/core/src/test/shared/sam/cli/samCliDeploy.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import { makeUnexpectedExitCodeError } from '../../../../shared/sam/cli/samCliInvokerUtils'
 import { runSamCliDeploy, SamCliDeployParameters } from '../../../../shared/sam/cli/samCliDeploy'
 import { getTestLogger } from '../../../globalSetup.test'
@@ -27,7 +27,7 @@ describe('runSamCliDeploy', async function () {
     })
 
     it('does not include --parameter-overrides if there are no overrides', async function () {
-        const invoker = new MockSamCliProcessInvoker(args => {
+        const invoker = new MockSamCliProcessInvoker((args) => {
             invokeCount++
             assertArgNotPresent(args, '--parameter-overrides')
         })
@@ -38,10 +38,10 @@ describe('runSamCliDeploy', async function () {
     })
 
     it('includes overrides as a string of key=value pairs', async function () {
-        const invoker = new MockSamCliProcessInvoker(args => {
+        const invoker = new MockSamCliProcessInvoker((args) => {
             invokeCount++
             assertArgIsPresent(args, '--parameter-overrides')
-            const overridesIndex = args.findIndex(arg => arg === '--parameter-overrides')
+            const overridesIndex = args.findIndex((arg) => arg === '--parameter-overrides')
             assert.strictEqual(overridesIndex > -1, true)
             assert.strictEqual(args.length >= overridesIndex + 3, true)
             assert.strictEqual(args[overridesIndex + 1], 'key1=value1')
@@ -62,7 +62,7 @@ describe('runSamCliDeploy', async function () {
     })
 
     it('includes a template, stack name, bucket, and region', async function () {
-        const invoker = new MockSamCliProcessInvoker(args => {
+        const invoker = new MockSamCliProcessInvoker((args) => {
             invokeCount++
             assertArgsContainArgument(args, '--template-file', fakeTemplateFile)
             assertArgsContainArgument(args, '--stack-name', fakeStackName)
@@ -76,7 +76,7 @@ describe('runSamCliDeploy', async function () {
     })
 
     it('Passes all cloudformation capabilities', async function () {
-        const invoker = new MockSamCliProcessInvoker(args => {
+        const invoker = new MockSamCliProcessInvoker((args) => {
             invokeCount++
             assertArgIsPresent(args, '--capabilities')
             assertArgIsPresent(args, 'CAPABILITY_IAM')
diff --git a/src/test/shared/sam/cli/samCliInfo.test.ts b/packages/core/src/test/shared/sam/cli/samCliInfo.test.ts
similarity index 87%
rename from src/test/shared/sam/cli/samCliInfo.test.ts
rename to packages/core/src/test/shared/sam/cli/samCliInfo.test.ts
index 3a54dc7dee3..dc27ad4ed89 100644
--- a/src/test/shared/sam/cli/samCliInfo.test.ts
+++ b/packages/core/src/test/shared/sam/cli/samCliInfo.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import { SamCliInfoInvocation, SamCliInfoResponse } from '../../../../shared/sam/cli/samCliInfo'
 
 describe('SamCliInfoInvocation', async function () {
@@ -35,10 +35,10 @@ describe('SamCliInfoInvocation', async function () {
     })
 
     it('converts non-response to undefined', async function () {
-        ;['qwerty', '{"version": "1.2.3"} you have no new email messages'].forEach(output => {
+        for (const output of ['qwerty', '{"version": "1.2.3"} you have no new email messages']) {
             const response = new TestSamCliInfoCommand('').convertOutput(output)
 
             assert.strictEqual(response, undefined, `Expected text to not parse: ${output}`)
-        })
+        }
     })
 })
diff --git a/src/test/shared/sam/cli/samCliInit.test.ts b/packages/core/src/test/shared/sam/cli/samCliInit.test.ts
similarity index 96%
rename from src/test/shared/sam/cli/samCliInit.test.ts
rename to packages/core/src/test/shared/sam/cli/samCliInit.test.ts
index 5321296c4f3..854fdc91610 100644
--- a/src/test/shared/sam/cli/samCliInit.test.ts
+++ b/packages/core/src/test/shared/sam/cli/samCliInit.test.ts
@@ -1,20 +1,19 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
-import { SpawnOptions } from 'child_process'
+import assert from 'assert'
+import { SpawnOptions } from 'child_process' // eslint-disable-line no-restricted-imports
 import {
     eventBridgeStarterAppTemplate,
     getSamCliTemplateParameter,
     helloWorldTemplate,
-    lazyLoadSamTemplateStrings,
 } from '../../../../lambda/models/samTemplates'
 import { SamCliContext } from '../../../../shared/sam/cli/samCliContext'
 import { runSamCliInit, SamCliInitArgs } from '../../../../shared/sam/cli/samCliInit'
 import { SamCliProcessInvoker, makeUnexpectedExitCodeError } from '../../../../shared/sam/cli/samCliInvokerUtils'
-import { ChildProcessResult } from '../../../../shared/utilities/childProcess'
+import { ChildProcessResult } from '../../../../shared/utilities/processUtils'
 import { getTestLogger } from '../../../globalSetup.test'
 import { assertArgIsPresent, assertArgNotPresent, assertArgsContainArgument } from './samCliTestUtils'
 import {
@@ -52,8 +51,6 @@ describe('runSamCliInit', async function () {
     let sampleSamInitArgs: SamCliInitArgs
 
     before(function () {
-        lazyLoadSamTemplateStrings()
-
         sampleSamInitArgs = {
             name: 'qwerty',
             location: '/some/path/to/code.js',
@@ -198,8 +195,6 @@ describe('runSamCliInit', async function () {
         let samInitArgsWithExtraContent: SamCliInitArgs
 
         before(function () {
-            lazyLoadSamTemplateStrings()
-
             // eslint-disable-next-line @typescript-eslint/naming-convention
             extraContent = {
                 AWS_Schema_registry: 'testRegistry',
diff --git a/packages/core/src/test/shared/sam/cli/samCliInvokerUtils.test.ts b/packages/core/src/test/shared/sam/cli/samCliInvokerUtils.test.ts
new file mode 100644
index 00000000000..882166eab45
--- /dev/null
+++ b/packages/core/src/test/shared/sam/cli/samCliInvokerUtils.test.ts
@@ -0,0 +1,93 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import {
+    addTelemetryEnvVar,
+    collectSamErrors,
+    logAndThrowIfUnexpectedExitCode,
+    makeUnexpectedExitCodeError,
+} from '../../../../shared/sam/cli/samCliInvokerUtils'
+import { getTestLogger } from '../../../globalSetup.test'
+import { assertLogContainsBadExitInformation } from './testSamCliProcessInvoker'
+
+describe('logAndThrowIfUnexpectedExitCode', async function () {
+    it('does not throw on expected exit code', async function () {
+        logAndThrowIfUnexpectedExitCode(
+            {
+                exitCode: 123,
+                error: undefined,
+                stderr: '',
+                stdout: '',
+            },
+            123
+        )
+    })
+
+    it('throws on unexpected exit code', async function () {
+        const exitError = new Error('bad result')
+        const finalError = makeUnexpectedExitCodeError(exitError.message)
+        const childProcessResult = {
+            exitCode: 123,
+            error: exitError,
+            stderr: 'stderr text',
+            stdout: 'stdout text',
+        }
+
+        assert.throws(
+            () => logAndThrowIfUnexpectedExitCode(childProcessResult, 456),
+            finalError,
+            'Correct error was not thrown'
+        )
+        await assertLogContainsBadExitInformation(getTestLogger(), childProcessResult, 456)
+    })
+})
+
+/** Prepends ESC control character to `text`. */
+function prependEscapeCode(text: string): string {
+    return String.fromCodePoint(27) + text
+}
+
+describe('collectSamErrors()', async () => {
+    it('collects messages', async () => {
+        const input = `
+        This line is ignored
+        foo bar Error: xxx Docker is not reachable!!
+        another line
+        foo Error: user is bored Error: 
+        Error: Running AWS SAM projects locally requires Docker.
+        'urllib3.exceptions.ProtocolError: ('Connection aborted.', FileNotFoundError(2, 'No such file or directory'))'
+        ok
+        ${prependEscapeCode('[33m known escape sequence')}
+        ok again
+        ${prependEscapeCode('[100m unknown escape sequence')}
+        `
+        const result = collectSamErrors(input)
+        assert.deepStrictEqual(result, [
+            'Docker is not reachable',
+            'user is bored Error:',
+            'Running AWS SAM projects locally requires Docker.',
+            'known escape sequence',
+        ])
+    })
+})
+
+describe('addTelemetryEnvVar', async function () {
+    it('adds a new variable, preserving the existing contents', async function () {
+        const result = await addTelemetryEnvVar({
+            cwd: '/foo',
+            env: { AWS_REGION: 'us-east-1' },
+        })
+
+        assert.deepStrictEqual(result, {
+            cwd: '/foo',
+            env: {
+                AWS_TOOLING_USER_AGENT: result.env?.['AWS_TOOLING_USER_AGENT'],
+                SAM_CLI_TELEMETRY: '0',
+                AWS_REGION: 'us-east-1',
+            },
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/sam/cli/samCliListResources.test.ts b/packages/core/src/test/shared/sam/cli/samCliListResources.test.ts
new file mode 100644
index 00000000000..e03500dd2bf
--- /dev/null
+++ b/packages/core/src/test/shared/sam/cli/samCliListResources.test.ts
@@ -0,0 +1,79 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { runSamCliListResource, SamCliListResourcesParameters } from '../../../../shared/sam/cli/samCliListResources'
+import { assertArgIsPresent, assertArgsContainArgument, MockSamCliProcessInvoker } from './samCliTestUtils'
+import { getTestLogger } from '../../../globalSetup.test'
+
+describe('runSamCliListResource', function () {
+    let invokeCount: number
+    const fakeTemplateFile = 'template.yaml'
+    const fakeStackName = 'testStack'
+    const fakeRegion = 'us-west-2'
+    const fakeProjectRoot = { fsPath: '/project/root' } as any
+
+    beforeEach(function () {
+        invokeCount = 0
+    })
+
+    function makeSampleParameters(region?: string): SamCliListResourcesParameters {
+        return {
+            templateFile: fakeTemplateFile,
+            stackName: fakeStackName,
+            region: region,
+            projectRoot: fakeProjectRoot,
+        }
+    }
+
+    it('includes template file, stack name, and JSON output format', async function () {
+        const invoker = new MockSamCliProcessInvoker((args) => {
+            invokeCount++
+            assertArgsContainArgument(args, '--template-file', fakeTemplateFile)
+            assertArgsContainArgument(args, '--stack-name', fakeStackName)
+            assertArgsContainArgument(args, '--output', 'json')
+        })
+
+        await runSamCliListResource(makeSampleParameters(), invoker)
+
+        assert.strictEqual(invokeCount, 1, 'Unexpected invoke count')
+    })
+
+    it('includes the region argument if provided', async function () {
+        const invoker = new MockSamCliProcessInvoker((args) => {
+            invokeCount++
+            assertArgIsPresent(args, '--region')
+            assertArgsContainArgument(args, '--region', fakeRegion)
+        })
+
+        await runSamCliListResource(makeSampleParameters(fakeRegion), invoker)
+
+        assert.strictEqual(invokeCount, 1, 'Unexpected invoke count')
+    })
+
+    it('does not include region argument if not provided', async function () {
+        const invoker = new MockSamCliProcessInvoker((args) => {
+            invokeCount++
+            assert.strictEqual(args.includes('--region'), false, 'Region argument should not be present')
+        })
+
+        await runSamCliListResource(makeSampleParameters(), invoker)
+
+        assert.strictEqual(invokeCount, 1, 'Unexpected invoke count')
+    })
+
+    it('logs message on CFN error', async function () {
+        const message = 'Resource does not exist on Cloudformation'
+        const invoker = new MockSamCliProcessInvoker(() => {
+            throw new Error(message)
+        })
+        const logger = getTestLogger()
+
+        await runSamCliListResource(makeSampleParameters(), invoker)
+
+        const logs = logger.getLoggedEntries()
+        assert.ok(logs.find((entry) => entry === message))
+    })
+})
diff --git a/packages/core/src/test/shared/sam/cli/samCliLocalInvoke.test.ts b/packages/core/src/test/shared/sam/cli/samCliLocalInvoke.test.ts
new file mode 100644
index 00000000000..b1db2f4e161
--- /dev/null
+++ b/packages/core/src/test/shared/sam/cli/samCliLocalInvoke.test.ts
@@ -0,0 +1,223 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as path from 'path'
+import { makeTemporaryToolkitFolder } from '../../../../shared/filesystemUtilities'
+import {
+    SamCliLocalInvokeInvocation,
+    SamCliLocalInvokeInvocationArguments,
+    SamLocalInvokeCommand,
+    SamLocalInvokeCommandArgs,
+} from '../../../../shared/sam/cli/samCliLocalInvoke'
+import * as SamUtilsModule from '../../../../shared/sam/utils'
+import { ChildProcess } from '../../../../shared/utilities/processUtils'
+import { assertArgIsPresent, assertArgNotPresent, assertArgsContainArgument } from './samCliTestUtils'
+import { fs } from '../../../../shared'
+import { SamCliSettings } from '../../../../shared/sam/cli/samCliSettings'
+import { isWin } from '../../../../shared/vscode/env'
+import sinon from 'sinon'
+import { SemVer } from 'semver'
+
+describe('SamCliLocalInvokeInvocation', async function () {
+    class TestSamLocalInvokeCommand implements SamLocalInvokeCommand {
+        public constructor(private readonly onInvoke: ({ ...params }: SamLocalInvokeCommandArgs) => void) {}
+
+        public async invoke({ ...params }: SamLocalInvokeCommandArgs): Promise<ChildProcess> {
+            this.onInvoke(params)
+            return {} as ChildProcess // Fake, not used by tests.
+        }
+    }
+
+    let tempFolder: string
+    let placeholderTemplateFile: string
+    let placeholderEventFile: string
+    const nonRelevantArg = 'arg is not of interest to this test'
+    let mockGetSamCliVersion: sinon.SinonStub
+    const validRuntime = 'python3.10'
+    const invalidRuntime = 'python2.7'
+    const validCliVersion = new SemVer('1.135.0')
+    const invalidCliVersion = new SemVer('1.134.0')
+    let sandbox: sinon.SinonSandbox
+
+    before(async function () {
+        // File system search on windows can take a while.
+        if (isWin()) {
+            this.retries(3)
+        }
+        // This will place the result in the cache allowing all tests to run under same conditions.
+        await SamCliSettings.instance.getOrDetectSamCli()
+    })
+
+    beforeEach(async function () {
+        tempFolder = await makeTemporaryToolkitFolder()
+        placeholderTemplateFile = path.join(tempFolder, 'template.yaml')
+        placeholderEventFile = path.join(tempFolder, 'event.json')
+        await fs.writeFile(placeholderTemplateFile, '')
+        await fs.writeFile(placeholderEventFile, '')
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(async function () {
+        sandbox.restore()
+        await fs.delete(tempFolder, { recursive: true })
+    })
+
+    function createTaskInvoker(onInvoke: (invokeArgs: SamLocalInvokeCommandArgs) => void): SamLocalInvokeCommand {
+        return new TestSamLocalInvokeCommand(onInvoke)
+    }
+
+    async function executeInvocation(
+        options: Partial<SamCliLocalInvokeInvocationArguments>
+    ): Promise<SamLocalInvokeCommandArgs> {
+        let invokeArgs: SamLocalInvokeCommandArgs = {} as SamLocalInvokeCommandArgs
+        const invocation = new SamCliLocalInvokeInvocation({
+            templateResourceName: nonRelevantArg,
+            templatePath: placeholderTemplateFile,
+            eventPath: placeholderEventFile,
+            environmentVariablePath: nonRelevantArg,
+            invoker: createTaskInvoker((args: SamLocalInvokeCommandArgs) => {
+                invokeArgs = args
+            }),
+            ...options,
+        })
+        await invocation.execute()
+        return invokeArgs
+    }
+
+    it('invokes `sam local` with args', async function () {
+        mockGetSamCliVersion = sandbox
+            .stub(SamUtilsModule, 'getSamCliPathAndVersion')
+            .callsFake(sandbox.stub().resolves({ parsedVersion: validCliVersion }))
+
+        const taskInvoker: SamLocalInvokeCommand = new TestSamLocalInvokeCommand(
+            (invokeArgs: SamLocalInvokeCommandArgs) => {
+                assert(mockGetSamCliVersion.calledOnce)
+                assert.ok(invokeArgs.args.length >= 2, 'Expected args to be present')
+                assert.strictEqual(invokeArgs.args[0], 'local')
+                assert.strictEqual(invokeArgs.args[1], 'invoke')
+                // --debug is present because tests run with "debug" log-level. #1403
+                assert.strictEqual(invokeArgs.args[2], '--debug')
+                assert.strictEqual(invokeArgs.args[4], '--template')
+                assert.strictEqual(invokeArgs.args[6], '--event')
+                assert.strictEqual(invokeArgs.args[8], '--env-vars')
+                // `extraArgs` are appended to the end.
+                assert.strictEqual(invokeArgs.args[10], '--build-dir')
+                assert.strictEqual(invokeArgs.args[11], 'my/build/dir/')
+
+                // 'runtime' is the last argument.
+                assert.strictEqual(invokeArgs.args[invokeArgs.args.length - 2], '--runtime')
+                assert.strictEqual(invokeArgs.args[invokeArgs.args.length - 1], 'python3.10')
+            }
+        )
+
+        await new SamCliLocalInvokeInvocation({
+            templateResourceName: nonRelevantArg,
+            templatePath: placeholderTemplateFile,
+            eventPath: placeholderEventFile,
+            environmentVariablePath: nonRelevantArg,
+            invoker: taskInvoker,
+            extraArgs: ['--build-dir', 'my/build/dir/'],
+            runtime: validRuntime,
+        }).execute()
+    })
+
+    it('Passes template resource name to sam cli', async function () {
+        const expectedResourceName = 'HelloWorldResource'
+        const invokeArgs = await executeInvocation({ templateResourceName: expectedResourceName })
+        assertArgIsPresent(invokeArgs.args, expectedResourceName)
+    })
+
+    it('Passes template path to sam cli', async function () {
+        const invokeArgs = await executeInvocation({})
+        assertArgsContainArgument(invokeArgs.args, '--template', placeholderTemplateFile)
+    })
+
+    it('Passes event path to sam cli', async function () {
+        const invokeArgs = await executeInvocation({})
+        assertArgsContainArgument(invokeArgs.args, '--event', placeholderEventFile)
+    })
+
+    it('Passes env-vars path to sam cli', async function () {
+        const expectedEnvVarsPath = 'envvars.json'
+        const invokeArgs = await executeInvocation({ environmentVariablePath: expectedEnvVarsPath })
+        assertArgsContainArgument(invokeArgs.args, '--env-vars', expectedEnvVarsPath)
+    })
+
+    it('Passes debug port to sam cli', async function () {
+        const expectedDebugPort = '1234'
+        const invokeArgs = await executeInvocation({ debugPort: expectedDebugPort })
+        assertArgsContainArgument(invokeArgs.args, '-d', expectedDebugPort)
+    })
+
+    it('undefined debug port does not pass to sam cli', async function () {
+        const invokeArgs = await executeInvocation({ debugPort: undefined })
+        assertArgNotPresent(invokeArgs.args, '-d')
+    })
+
+    it('Passes docker network to sam cli', async function () {
+        const expectedDockerNetwork = 'hello-world'
+        const invokeArgs = await executeInvocation({ dockerNetwork: expectedDockerNetwork })
+        assertArgsContainArgument(invokeArgs.args, '--docker-network', expectedDockerNetwork)
+    })
+
+    it('Does not pass docker network to sam cli when undefined', async function () {
+        const invokeArgs = await executeInvocation({ dockerNetwork: undefined })
+        assertArgNotPresent(invokeArgs.args, '--docker-network')
+    })
+
+    it('passes --skip-pull-image to sam cli if skipPullImage is true', async function () {
+        const invokeArgs = await executeInvocation({ skipPullImage: true })
+        assertArgIsPresent(invokeArgs.args, '--skip-pull-image')
+    })
+
+    it('does not pass --skip-pull-image to sam cli if skipPullImage is false', async function () {
+        const invokeArgs = await executeInvocation({ skipPullImage: false })
+        assertArgNotPresent(invokeArgs.args, '--skip-pull-image')
+    })
+
+    it('does not pass --skip-pull-image to sam cli if skipPullImage is undefined', async function () {
+        const invokeArgs = await executeInvocation({ skipPullImage: undefined })
+        assertArgNotPresent(invokeArgs.args, '--skip-pull-image')
+    })
+
+    it('Passes debuggerPath to sam cli', async function () {
+        const expectedDebuggerPath = path.join('foo', 'bar')
+        const invokeArgs = await executeInvocation({ debuggerPath: expectedDebuggerPath })
+        assertArgsContainArgument(invokeArgs.args, '--debugger-path', expectedDebuggerPath)
+    })
+
+    it('Does not pass debuggerPath to sam cli when undefined', async function () {
+        const invokeArgs = await executeInvocation({})
+        assertArgNotPresent(invokeArgs.args, '--debugger-path')
+    })
+
+    it('Passes runtime to sam cli', async function () {
+        mockGetSamCliVersion = sandbox
+            .stub(SamUtilsModule, 'getSamCliPathAndVersion')
+            .callsFake(sandbox.stub().resolves({ parsedVersion: new SemVer('1.135.0') }))
+
+        const invokeArgs = await executeInvocation({ runtime: validRuntime })
+        assertArgsContainArgument(invokeArgs.args, '--runtime', validRuntime)
+    })
+
+    it('Does not pass runtime to sam cli when version < 1.135.0', async function () {
+        mockGetSamCliVersion = sandbox
+            .stub(SamUtilsModule, 'getSamCliPathAndVersion')
+            .callsFake(sandbox.stub().resolves({ parsedVersion: invalidCliVersion }))
+
+        const invokeArgs = await executeInvocation({ runtime: validRuntime })
+        assertArgNotPresent(invokeArgs.args, '--runtime')
+    })
+
+    it('Does not pass runtime to sam cli when runtime is deprecated', async function () {
+        mockGetSamCliVersion = sandbox
+            .stub(SamUtilsModule, 'getSamCliPathAndVersion')
+            .callsFake(sandbox.stub().resolves({ parsedVersion: validCliVersion }))
+
+        const invokeArgs = await executeInvocation({ runtime: invalidRuntime })
+        assertArgNotPresent(invokeArgs.args, '--runtime')
+    })
+})
diff --git a/src/test/shared/sam/cli/samCliPackage.test.ts b/packages/core/src/test/shared/sam/cli/samCliPackage.test.ts
similarity index 92%
rename from src/test/shared/sam/cli/samCliPackage.test.ts
rename to packages/core/src/test/shared/sam/cli/samCliPackage.test.ts
index bf2143b43ba..4bae0f7c4dd 100644
--- a/src/test/shared/sam/cli/samCliPackage.test.ts
+++ b/packages/core/src/test/shared/sam/cli/samCliPackage.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import { makeUnexpectedExitCodeError } from '../../../../shared/sam/cli/samCliInvokerUtils'
 import { runSamCliPackage, SamCliPackageParameters } from '../../../../shared/sam/cli/samCliPackage'
 import { getTestLogger } from '../../../globalSetup.test'
@@ -25,7 +25,7 @@ describe('SamCliPackageInvocation', async function () {
     })
 
     it('includes a template, s3 bucket, output template file, and region', async function () {
-        const invoker = new MockSamCliProcessInvoker(args => {
+        const invoker = new MockSamCliProcessInvoker((args) => {
             invokeCount++
             assertArgsContainArgument(args, '--template-file', 'template')
             assertArgsContainArgument(args, '--s3-bucket', 'bucket')
@@ -40,7 +40,7 @@ describe('SamCliPackageInvocation', async function () {
     })
 
     it('includes a template, s3 bucket, output template file, region, and repo', async function () {
-        const invoker = new MockSamCliProcessInvoker(args => {
+        const invoker = new MockSamCliProcessInvoker((args) => {
             invokeCount++
             assertArgsContainArgument(args, '--template-file', 'template')
             assertArgsContainArgument(args, '--s3-bucket', 'bucket')
diff --git a/packages/core/src/test/shared/sam/cli/samCliRemoteTestEvent.test.ts b/packages/core/src/test/shared/sam/cli/samCliRemoteTestEvent.test.ts
new file mode 100644
index 00000000000..928fd8fc07b
--- /dev/null
+++ b/packages/core/src/test/shared/sam/cli/samCliRemoteTestEvent.test.ts
@@ -0,0 +1,119 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    runSamCliRemoteTestEvents,
+    SamCliRemoteTestEventsParameters,
+    TestEventsOperation,
+} from '../../../../shared/sam/cli/samCliRemoteTestEvent'
+import assert from 'assert'
+import { makeUnexpectedExitCodeError } from '../../../../shared/sam/cli/samCliInvokerUtils'
+import { getTestLogger } from '../../../globalSetup.test'
+import {
+    assertArgIsPresent,
+    assertArgNotPresent,
+    assertArgsContainArgument,
+    MockSamCliProcessInvoker,
+} from './samCliTestUtils'
+import { assertLogContainsBadExitInformation, BadExitCodeSamCliProcessInvoker } from './testSamCliProcessInvoker'
+
+describe('runSamCliRemoteTestEvents', () => {
+    const fakeFunctionArn = 'arn::aws:123456'
+    const fakeName = 'name'
+    const fakeEventSample = '{testKey: testValue}'
+    let invokeCount: number
+
+    beforeEach(() => {
+        invokeCount = 0
+    })
+
+    it('should call invoker with correct arguments for List operation', async () => {
+        const invoker = new MockSamCliProcessInvoker((args) => {
+            invokeCount++
+            assertArgIsPresent(args, fakeFunctionArn)
+            assertArgNotPresent(args, '--file')
+            assertArgNotPresent(args, '--name')
+            assertArgIsPresent(args, 'remote')
+            assertArgIsPresent(args, 'test-event')
+            assertArgIsPresent(args, TestEventsOperation.List)
+        })
+
+        const params: SamCliRemoteTestEventsParameters = {
+            functionArn: fakeFunctionArn,
+            operation: TestEventsOperation.List,
+        }
+
+        await runSamCliRemoteTestEvents(params, invoker)
+
+        assert.strictEqual(invokeCount, 1, 'Unexpected invoke count')
+    })
+
+    it('should call invoker with correct arguments for Get operation with name', async () => {
+        const invoker = new MockSamCliProcessInvoker((args) => {
+            invokeCount++
+            assertArgIsPresent(args, fakeFunctionArn)
+            assertArgsContainArgument(args, '--name', fakeName)
+            assertArgIsPresent(args, 'remote')
+            assertArgIsPresent(args, 'test-event')
+            assertArgIsPresent(args, TestEventsOperation.Get)
+            assertArgNotPresent(args, '--file')
+        })
+
+        const params: SamCliRemoteTestEventsParameters = {
+            functionArn: fakeFunctionArn,
+            operation: TestEventsOperation.Get,
+            name: fakeName,
+        }
+
+        await runSamCliRemoteTestEvents(params, invoker)
+
+        assert.strictEqual(invokeCount, 1, 'Unexpected invoke count')
+    })
+
+    it('should call invoker with correct arguments for Put operation with event sample', async () => {
+        const invoker = new MockSamCliProcessInvoker((args) => {
+            invokeCount++
+            assertArgIsPresent(args, fakeFunctionArn)
+            assertArgsContainArgument(args, '--name', fakeName)
+            assertArgNotPresent(args, 'list')
+            assertArgIsPresent(args, 'remote')
+            assertArgIsPresent(args, 'test-event')
+            assertArgIsPresent(args, '--file')
+            assertArgIsPresent(args, TestEventsOperation.Put)
+        })
+
+        const params: SamCliRemoteTestEventsParameters = {
+            functionArn: fakeFunctionArn,
+            operation: TestEventsOperation.Put,
+            eventSample: fakeEventSample,
+            name: fakeName,
+        }
+
+        await runSamCliRemoteTestEvents(params, invoker)
+
+        assert.strictEqual(invokeCount, 1, 'Unexpected invoke count')
+    })
+
+    it('should show error message and return empty array on error', async () => {
+        const badExitCodeProcessInvoker = new BadExitCodeSamCliProcessInvoker({})
+
+        const params: SamCliRemoteTestEventsParameters = {
+            functionArn: fakeFunctionArn,
+            operation: TestEventsOperation.List,
+        }
+
+        await assert.rejects(
+            runSamCliRemoteTestEvents(params, badExitCodeProcessInvoker),
+            makeUnexpectedExitCodeError(badExitCodeProcessInvoker.error.message),
+            'Expected error was not thrown'
+        )
+
+        await assertLogContainsBadExitInformation(
+            getTestLogger(),
+            badExitCodeProcessInvoker.makeChildProcessResult(),
+            0
+        )
+    })
+})
diff --git a/src/test/shared/sam/cli/samCliStartApi.test.ts b/packages/core/src/test/shared/sam/cli/samCliStartApi.test.ts
similarity index 95%
rename from src/test/shared/sam/cli/samCliStartApi.test.ts
rename to packages/core/src/test/shared/sam/cli/samCliStartApi.test.ts
index 5d2fdff5230..8964d7740f7 100644
--- a/src/test/shared/sam/cli/samCliStartApi.test.ts
+++ b/packages/core/src/test/shared/sam/cli/samCliStartApi.test.ts
@@ -1,14 +1,14 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
-import { remove, writeFile } from 'fs-extra'
+import assert from 'assert'
 import { join } from 'path'
 import { makeTemporaryToolkitFolder } from '../../../../shared/filesystemUtilities'
 import { buildSamCliStartApiArguments } from '../../../../shared/sam/cli/samCliStartApi'
 import { assertArgIsPresent, assertArgNotPresent, assertArgsContainArgument } from './samCliTestUtils'
+import { fs } from '../../../../shared'
 
 describe('SamCliStartApi', async function () {
     let tempFolder: string
@@ -20,12 +20,12 @@ describe('SamCliStartApi', async function () {
         tempFolder = await makeTemporaryToolkitFolder()
         placeholderTemplateFile = join(tempFolder, 'template.yaml')
         placeholderEventFile = join(tempFolder, 'event.json')
-        await writeFile(placeholderTemplateFile, '')
-        await writeFile(placeholderEventFile, '')
+        await fs.writeFile(placeholderTemplateFile, '')
+        await fs.writeFile(placeholderEventFile, '')
     })
 
     afterEach(async function () {
-        await remove(tempFolder)
+        await fs.delete(tempFolder, { recursive: true })
     })
 
     it('invokes `sam local start-api` with correct args', async function () {
diff --git a/src/test/shared/sam/cli/samCliTestUtils.ts b/packages/core/src/test/shared/sam/cli/samCliTestUtils.ts
similarity index 89%
rename from src/test/shared/sam/cli/samCliTestUtils.ts
rename to packages/core/src/test/shared/sam/cli/samCliTestUtils.ts
index b7a69a4ff20..e3c541f10fa 100644
--- a/src/test/shared/sam/cli/samCliTestUtils.ts
+++ b/packages/core/src/test/shared/sam/cli/samCliTestUtils.ts
@@ -1,15 +1,15 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import {
     makeRequiredSamCliProcessInvokeOptions,
     SamCliProcessInvokeOptions,
     SamCliProcessInvoker,
 } from '../../../../shared/sam/cli/samCliInvokerUtils'
-import { ChildProcessResult } from '../../../../shared/utilities/childProcess'
+import { ChildProcessResult } from '../../../../shared/utilities/processUtils'
 
 export class MockSamCliProcessInvoker implements SamCliProcessInvoker {
     public constructor(private readonly validateArgs: (args: string[]) => void) {}
@@ -21,9 +21,9 @@ export class MockSamCliProcessInvoker implements SamCliProcessInvoker {
 
         this.validateArgs(invokeSettings.arguments)
 
-        return ({
+        return {
             exitCode: 0,
-        } as any) as ChildProcessResult
+        } as any as ChildProcessResult
     }
 }
 
diff --git a/packages/core/src/test/shared/sam/cli/samCliValidationNotification.test.ts b/packages/core/src/test/shared/sam/cli/samCliValidationNotification.test.ts
new file mode 100644
index 00000000000..3156e2afb1e
--- /dev/null
+++ b/packages/core/src/test/shared/sam/cli/samCliValidationNotification.test.ts
@@ -0,0 +1,111 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+
+import {
+    InvalidSamCliError,
+    InvalidSamCliVersionError,
+    SamCliNotFoundError,
+    SamCliVersionValidation,
+    SamCliVersionValidatorResult,
+} from '../../../../shared/sam/cli/samCliValidator'
+import {
+    SamCliValidationNotification,
+    SamCliValidationNotificationAction,
+    getInvalidSamMsg,
+} from '../../../../shared/sam/cli/samCliValidationNotification'
+
+describe('getInvalidSamMsg', async function () {
+    const fakeSamCliValidationNotification: SamCliValidationNotification = {
+        show: () => {
+            throw new Error('show is unused')
+        },
+    }
+    const actionLabelUpdateSamCli = 'Install latest SAM CLI'
+    const actionLabelUpdateToolkit = 'Install latest AWS Toolkit'
+
+    it('handles SamCliNotFoundError', async function () {
+        getInvalidSamMsg(
+            new SamCliNotFoundError(),
+            (message: string, actions: SamCliValidationNotificationAction[]): SamCliValidationNotification => {
+                assert.ok(message.includes('Cannot find SAM CLI'), `unexpected validation message: ${message}`)
+                assert.strictEqual(actions.length, 1, 'unexpected action count')
+                assert.strictEqual(
+                    actions[0].label(),
+                    actionLabelUpdateSamCli,
+                    `unexpected action label: ${actions[0].label()}`
+                )
+
+                return fakeSamCliValidationNotification
+            }
+        )
+    })
+
+    const versionValidationTestScenarios = [
+        {
+            situation: 'SAM CLI Version is too low',
+            versionValidation: SamCliVersionValidation.VersionTooLow,
+            messageFragment: 'Update SAM CLI.',
+            actionLabel: actionLabelUpdateSamCli,
+        },
+        {
+            situation: 'SAM CLI Version is too high',
+            versionValidation: SamCliVersionValidation.VersionTooHigh,
+            messageFragment: 'Update AWS Toolkit.',
+            actionLabel: actionLabelUpdateToolkit,
+        },
+        {
+            situation: 'SAM CLI failed to run',
+            versionValidation: SamCliVersionValidation.VersionNotParseable,
+            messageFragment: process.platform === 'win32' ? 'known issues' : 'SAM CLI failed to run',
+            actionLabel: actionLabelUpdateSamCli,
+        },
+    ]
+
+    for (const test of versionValidationTestScenarios) {
+        it(`handles InvalidSamCliVersionError - ${test.situation}`, async () => {
+            const validatorResult: SamCliVersionValidatorResult = {
+                version: '1.2.3',
+                validation: test.versionValidation,
+            }
+            const error = new InvalidSamCliVersionError(validatorResult)
+
+            getInvalidSamMsg(
+                error,
+                (message: string, actions: SamCliValidationNotificationAction[]): SamCliValidationNotification => {
+                    const hasMsg = message.includes(test.messageFragment)
+                    const hasVersion =
+                        test.versionValidation === SamCliVersionValidation.VersionNotParseable ||
+                        message.includes(validatorResult.version!)
+                    assert.ok(hasMsg && hasVersion, `unexpected validation message: ${message}`)
+                    assert.strictEqual(actions.length, 1, 'unexpected action count')
+                    assert.strictEqual(
+                        actions[0].label(),
+                        test.actionLabel,
+                        `unexpected action label: ${actions[0].label()}`
+                    )
+
+                    return fakeSamCliValidationNotification
+                }
+            )
+        })
+    }
+
+    it('handles Unexpected input', async function () {
+        getInvalidSamMsg(
+            new InvalidSamCliError('different error'),
+            (message: string, actions: SamCliValidationNotificationAction[]): SamCliValidationNotification => {
+                assert.ok(
+                    message.includes('Unexpected error while') && message.includes('different error'),
+                    `unexpected validation message: ${message}`
+                )
+                assert.strictEqual(actions.length, 0, 'unexpected actions found')
+
+                return fakeSamCliValidationNotification
+            }
+        )
+    })
+})
diff --git a/packages/core/src/test/shared/sam/cli/samCliValidator.test.ts b/packages/core/src/test/shared/sam/cli/samCliValidator.test.ts
new file mode 100644
index 00000000000..15c1a57a139
--- /dev/null
+++ b/packages/core/src/test/shared/sam/cli/samCliValidator.test.ts
@@ -0,0 +1,116 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import globals from '../../../../shared/extensionGlobals'
+import { SamCliInfoResponse } from '../../../../shared/sam/cli/samCliInfo'
+import {
+    DefaultSamCliValidator,
+    maxSamCliVersionExclusive,
+    minSamCliVersion,
+    SamCliValidatorContext,
+    SamCliVersionValidation,
+} from '../../../../shared/sam/cli/samCliValidator'
+
+describe('DefaultSamCliValidator', async function () {
+    class TestSamCliValidatorContext implements SamCliValidatorContext {
+        public samCliVersionId: string = new globals.clock.Date().valueOf().toString()
+        public getInfoCallCount: number = 0
+        public mockSamLocation: string = ''
+
+        public constructor(public samCliVersion: string) {}
+
+        public async samCliLocation(): Promise<string> {
+            return this.mockSamLocation
+        }
+
+        public async getSamCliInfo(): Promise<SamCliInfoResponse> {
+            this.getInfoCallCount++
+
+            return {
+                version: this.samCliVersion,
+            }
+        }
+    }
+
+    const scenarios = [
+        {
+            situation: 'valid version string',
+            version: minSamCliVersion,
+            expected: SamCliVersionValidation.Valid,
+        },
+        {
+            situation: '"nightly" version',
+            version: '1.86.1-dev202306120901',
+            expected: SamCliVersionValidation.Valid,
+        },
+        {
+            situation: 'version too low',
+            version: '0.1.0',
+            expected: SamCliVersionValidation.VersionTooLow,
+        },
+        {
+            situation: 'version too high',
+            version: maxSamCliVersionExclusive,
+            expected: SamCliVersionValidation.VersionTooHigh,
+        },
+        {
+            situation: 'version unparsable (empty string)',
+            version: '',
+            expected: SamCliVersionValidation.VersionNotParseable,
+        },
+        {
+            situation: 'version unparsable (random text)',
+            version: 'what.in.tarnation',
+            expected: SamCliVersionValidation.VersionNotParseable,
+        },
+    ] as const
+
+    describe('detectValidSamCli', async function () {
+        for (const test of scenarios) {
+            it(`found SAM CLI, ${test.situation}`, async () => {
+                const validatorContext = new TestSamCliValidatorContext(test.version)
+                validatorContext.mockSamLocation = 'somesamclipath'
+                const samCliValidator = new DefaultSamCliValidator(validatorContext)
+                const actual = await samCliValidator.detectValidSamCli()
+
+                assert.strictEqual(actual.samCliFound, true, 'Expected to find sam cli')
+                assert.strictEqual(actual.versionValidation?.version, test.version)
+                assert.strictEqual(actual.versionValidation?.validation, test.expected)
+            })
+        }
+
+        it('SAM CLI not found', async function () {
+            const validatorContext = new TestSamCliValidatorContext('')
+            validatorContext.mockSamLocation = ''
+            const samCliValidator = new DefaultSamCliValidator(validatorContext)
+            const actual = await samCliValidator.detectValidSamCli()
+
+            assert.strictEqual(actual.samCliFound, false, 'Expected sam cli NOT found')
+        })
+    })
+
+    describe('getVersionValidatorResult', async function () {
+        for (const test of scenarios) {
+            it(test.situation, async () => {
+                const validatorContext = new TestSamCliValidatorContext(test.version)
+                const samCliValidator = new DefaultSamCliValidator(validatorContext)
+                const actual = await samCliValidator.getVersionValidatorResult()
+
+                assert.strictEqual(actual.version, test.version)
+                assert.strictEqual(actual.validation, test.expected)
+            })
+        }
+    })
+
+    describe('validateSamCliVersion', async function () {
+        for (const test of scenarios) {
+            it(test.situation, async () => {
+                const validation = DefaultSamCliValidator.validateSamCliVersion(test.version)
+                assert.strictEqual(validation, test.expected)
+            })
+        }
+    })
+})
diff --git a/src/test/shared/sam/cli/testSamCliProcessInvoker.ts b/packages/core/src/test/shared/sam/cli/testSamCliProcessInvoker.ts
similarity index 80%
rename from src/test/shared/sam/cli/testSamCliProcessInvoker.ts
rename to packages/core/src/test/shared/sam/cli/testSamCliProcessInvoker.ts
index 39a6d0faa42..8528b0c6189 100644
--- a/src/test/shared/sam/cli/testSamCliProcessInvoker.ts
+++ b/packages/core/src/test/shared/sam/cli/testSamCliProcessInvoker.ts
@@ -1,10 +1,10 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
-import { SpawnOptions } from 'child_process'
+import assert from 'assert'
+import { SpawnOptions } from 'child_process' // eslint-disable-line no-restricted-imports
 
 import { isError } from 'lodash'
 import {
@@ -12,7 +12,7 @@ import {
     SamCliProcessInvokeOptions,
     SamCliProcessInvoker,
 } from '../../../../shared/sam/cli/samCliInvokerUtils'
-import { ChildProcessResult } from '../../../../shared/utilities/childProcess'
+import { ChildProcessResult } from '../../../../shared/utilities/processUtils'
 import { TestLogger } from '../../../testLogger'
 
 export class TestSamCliProcessInvoker implements SamCliProcessInvoker {
@@ -94,19 +94,16 @@ export async function assertLogContainsBadExitInformation(
 ): Promise<void> {
     const expectedTexts = [
         {
-            text: `Unexpected exitcode (${errantChildProcessResult.exitCode}), expecting (${expectedExitCode})`,
+            text: `SAM CLI failed (exitcode: ${errantChildProcessResult.exitCode}, expected ${expectedExitCode}`,
             verifyMessage: 'Log message missing for exit code',
         },
-        { text: `Error: ${errantChildProcessResult.error}`, verifyMessage: 'Log message missing for error' },
-        { text: `stderr: ${errantChildProcessResult.stderr}`, verifyMessage: 'Log message missing for stderr' },
-        { text: `stdout: ${errantChildProcessResult.stdout}`, verifyMessage: 'Log message missing for stdout' },
     ]
 
     const logText = logger
         .getLoggedEntries()
-        .filter(x => !isError(x))
+        .filter((x) => !isError(x))
         .join('\n')
-    expectedTexts.forEach(expectedText => {
+    for (const expectedText of expectedTexts) {
         assert.ok(logText.includes(expectedText.text), expectedText.verifyMessage)
-    })
+    }
 }
diff --git a/packages/core/src/test/shared/sam/config.test.ts b/packages/core/src/test/shared/sam/config.test.ts
new file mode 100644
index 00000000000..8125d436dab
--- /dev/null
+++ b/packages/core/src/test/shared/sam/config.test.ts
@@ -0,0 +1,460 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+
+import { TestFolder } from '../../testUtil'
+import { samconfigCompleteData, samconfigCompleteDataWithoutGlobal, samconfigInvalidData } from './samTestUtils'
+import {
+    createNewConfigFile,
+    getConfigFileUri,
+    SamConfig,
+    validateSamBuildConfig,
+    validateSamDeployConfig,
+    validateSamSyncConfig,
+    writeSamconfigGlobal,
+} from '../../../shared/sam/config'
+import assert from 'assert'
+import { ToolkitError } from '../../../shared'
+
+import { assertLogsContain } from '../../globalSetup.test'
+import { JsonMap } from '@iarna/toml'
+import path from 'path'
+
+describe('SamConfig', () => {
+    let testFolder: TestFolder
+    let projectRoot: vscode.Uri
+
+    beforeEach(async () => {
+        testFolder = await TestFolder.create()
+        projectRoot = vscode.Uri.file(testFolder.path)
+    })
+    describe('fromConfigFileUri', () => {
+        it('should load the valid config file', async () => {
+            const validSamconfigFile = vscode.Uri.file(await testFolder.write('samconfig.toml', samconfigCompleteData))
+            const config = await SamConfig.fromConfigFileUri(validSamconfigFile)
+            assert(config instanceof SamConfig)
+        })
+
+        it('should throw error when loading invalid config file', async () => {
+            const invalidSamconfigFile = vscode.Uri.file(await testFolder.write('samconfig.toml', samconfigInvalidData))
+            try {
+                await SamConfig.fromConfigFileUri(invalidSamconfigFile)
+                assert.fail('Should have thrown ToolkitError for parsing eror')
+            } catch (err) {
+                assert(err instanceof ToolkitError)
+                assert.strictEqual(err.code, 'samConfigParseError')
+            }
+        })
+    })
+
+    describe('fromProjectRoot', () => {
+        it('should load the valid config file', async () => {
+            await testFolder.write('samconfig.toml', samconfigCompleteData)
+            const config = await SamConfig.fromProjectRoot(projectRoot)
+            assert(config instanceof SamConfig)
+        })
+        it('should throw error when loading invalid config file', async () => {
+            await testFolder.write('samconfig.toml', samconfigInvalidData)
+
+            try {
+                await SamConfig.fromProjectRoot(projectRoot)
+                assert.fail('Should have thrown ToolkitError for parsing eror')
+            } catch (err) {
+                assert(err instanceof ToolkitError)
+                assert.strictEqual(err.code, 'samConfigParseError')
+            }
+        })
+
+        it('should throw error when (unlikely) no project root found', async () => {
+            try {
+                await SamConfig.fromProjectRoot(undefined as unknown as vscode.Uri)
+                assert.fail('Should have thrown ToolkitError for parsing eror')
+            } catch (err) {
+                assert(err instanceof ToolkitError)
+                assert.strictEqual(err.message, 'No project folder found')
+                assert.strictEqual(err.code, 'samNoProjectRootFound')
+            }
+        })
+    })
+
+    describe('getCommandParam', () => {
+        let samconfig: SamConfig
+
+        beforeEach(async () => {
+            await testFolder.write('samconfig.toml', samconfigCompleteData)
+            samconfig = await SamConfig.fromProjectRoot(projectRoot)
+        })
+
+        it('should return parameter from primary section if it exists', () => {
+            const region = samconfig.getCommandParam('global', 'region')
+            const deployChangeSet = samconfig.getCommandParam('deploy', 'confirm_changeset')
+
+            assert.strictEqual(region, 'us-west-2')
+            assert.strictEqual(deployChangeSet, false)
+        })
+
+        it('should return parameter from global section if primary section does not have it', () => {
+            const region = samconfig.getCommandParam('deploy', 'region')
+            const stackName = samconfig.getCommandParam('sync', 'stack_name')
+
+            assert.strictEqual(region, 'us-west-2')
+            assert.strictEqual(stackName, 'project-1')
+        })
+
+        it('should return undefined if parameter is not found in either section', () => {
+            // These flags are not expected to be in their respective commands
+            const cached = samconfig.getCommandParam('deploy', 'cached')
+            const resolveS3 = samconfig.getCommandParam('build', 'resolve_s3')
+
+            assert(!cached)
+            assert(!resolveS3)
+        })
+    })
+
+    describe('listEnvironments', () => {
+        let samconfig: SamConfig
+
+        beforeEach(async () => {
+            await testFolder.write('samconfig.toml', samconfigCompleteData)
+            samconfig = await SamConfig.fromProjectRoot(projectRoot)
+        })
+        it('should return a list of environments', () => {
+            const paramteres = samconfig.listEnvironments()
+            assert.strictEqual(paramteres.length, 1)
+            const defaultEnvironment = paramteres[0]
+            assert.strictEqual(defaultEnvironment.name, 'default')
+            assert.deepStrictEqual(defaultEnvironment.commands, {
+                build: {
+                    parameters: {
+                        cached: true,
+                        parallel: true,
+                        use_container: true,
+                    },
+                },
+                global: {
+                    parameters: {
+                        stack_name: 'project-1',
+                        region: 'us-west-2',
+                    },
+                },
+                deploy: {
+                    parameters: {
+                        confirm_changeset: false,
+                        resolve_s3: true,
+                    },
+                },
+                sync: {
+                    parameters: {
+                        s3_bucket: 'aws-sam-cli-managed-default-samclisourcebucket-lftqponsaxsr',
+                        dependency_layer: false,
+                        watch: false,
+                    },
+                },
+            })
+        })
+    })
+})
+
+describe('getConfigFileUri', () => {
+    let testFolder: TestFolder
+    let projectRoot: vscode.Uri
+
+    beforeEach(async () => {
+        testFolder = await TestFolder.create()
+        projectRoot = vscode.Uri.file(testFolder.path)
+    })
+
+    it('should return uri of a valid if a config file exists in a project root', async () => {
+        await testFolder.write('samconfig.toml', samconfigCompleteData)
+
+        const uri = await getConfigFileUri(projectRoot)
+        assert(uri instanceof vscode.Uri)
+        assert.strictEqual(uri.fsPath, path.join(testFolder.path, 'samconfig.toml'))
+    })
+
+    it('should throw error if a config file doesn not exists in a project root', async () => {
+        try {
+            // No samconfig.toml file created for this test
+            await getConfigFileUri(projectRoot)
+            assert.fail('Should have thrown ToolkitError eror')
+        } catch (err) {
+            assert(err instanceof ToolkitError)
+            assert.strictEqual(err.code, 'samNoConfigFound')
+            assert.strictEqual(err.message, `No samconfig.toml file found in ${projectRoot.fsPath}`)
+        }
+    })
+})
+
+describe('writeSamconfigGlobal', () => {
+    let testFolder: TestFolder
+    let projectRoot: vscode.Uri
+
+    beforeEach(async () => {
+        testFolder = await TestFolder.create()
+        projectRoot = vscode.Uri.file(testFolder.path)
+    })
+
+    it('should create a new samconfig.toml if not already exist', async () => {
+        try {
+            await SamConfig.fromProjectRoot(projectRoot)
+            assert.fail('Should not have any samconfig.toml in test folder is expected at this point')
+        } catch (err) {
+            // start writing
+            await writeSamconfigGlobal(projectRoot, 'stack-1', 'us-east-1')
+            assertLogsContain('No samconfig.toml found, creating...', true, 'warn')
+        }
+
+        const samconfig = await SamConfig.fromProjectRoot(projectRoot)
+        assert(samconfig instanceof SamConfig)
+
+        const paramteres = samconfig.listEnvironments()
+        assert.strictEqual(paramteres.length, 1)
+
+        const defaultEnvironment = paramteres[0]
+        assert.strictEqual(defaultEnvironment.name, 'default')
+        assert.deepStrictEqual(defaultEnvironment.commands, {
+            global: {
+                parameters: {
+                    stack_name: 'stack-1',
+                    region: 'us-east-1',
+                },
+            },
+        })
+    })
+
+    it('should edit existing samconfig.toml in global command only', async () => {
+        await testFolder.write('samconfig.toml', samconfigCompleteData)
+        await writeSamconfigGlobal(projectRoot, 'stack-1', 'us-east-1')
+
+        const samconfig = await SamConfig.fromProjectRoot(projectRoot)
+        assert(samconfig instanceof SamConfig)
+
+        const paramteres = samconfig.listEnvironments()
+        assert.strictEqual(paramteres.length, 1)
+
+        const defaultEnvironment = paramteres[0]
+        assert.strictEqual(defaultEnvironment.name, 'default')
+        assert.deepStrictEqual(defaultEnvironment.commands, {
+            build: {
+                parameters: {
+                    cached: true,
+                    parallel: true,
+                    use_container: true,
+                },
+            },
+            global: {
+                parameters: {
+                    stack_name: 'stack-1',
+                    region: 'us-east-1',
+                },
+            },
+            deploy: {
+                parameters: {
+                    confirm_changeset: false,
+                    resolve_s3: true,
+                },
+            },
+            sync: {
+                parameters: {
+                    s3_bucket: 'aws-sam-cli-managed-default-samclisourcebucket-lftqponsaxsr',
+                    dependency_layer: false,
+                    watch: false,
+                },
+            },
+        })
+    })
+
+    it('should add global command to existing samconfig.toml', async () => {
+        await testFolder.write('samconfig.toml', samconfigCompleteDataWithoutGlobal)
+        await writeSamconfigGlobal(projectRoot, 'stack-1', 'us-east-1')
+
+        const samconfig = await SamConfig.fromProjectRoot(projectRoot)
+        assert(samconfig instanceof SamConfig)
+
+        const paramteres = samconfig.listEnvironments()
+        assert.strictEqual(paramteres.length, 1)
+
+        const defaultEnvironment = paramteres[0]
+        assert.strictEqual(defaultEnvironment.name, 'default')
+        assert.deepStrictEqual(defaultEnvironment.commands, {
+            build: {
+                parameters: {
+                    cached: true,
+                    parallel: true,
+                    use_container: true,
+                },
+            },
+            global: {
+                parameters: {
+                    stack_name: 'stack-1',
+                    region: 'us-east-1',
+                },
+            },
+            deploy: {
+                parameters: {
+                    confirm_changeset: false,
+                    resolve_s3: true,
+                },
+            },
+            sync: {
+                parameters: {
+                    s3_bucket: 'aws-sam-cli-managed-default-samclisourcebucket-lftqponsaxsr',
+                    dependency_layer: false,
+                    watch: false,
+                },
+            },
+        })
+    })
+})
+
+describe('createNewConfigFile', () => {
+    let testFolder: TestFolder
+    let projectRoot: vscode.Uri
+
+    beforeEach(async () => {
+        testFolder = await TestFolder.create()
+        projectRoot = vscode.Uri.file(testFolder.path)
+    })
+
+    it('should create a new samconfig.toml if not already exist', async () => {
+        const data = {
+            default: {
+                global: {
+                    parameters: {
+                        stack_name: 'stack-1',
+                        region: 'us-east-1',
+                    },
+                },
+            },
+        } as JsonMap
+
+        await createNewConfigFile(projectRoot, data)
+
+        const samconfig = await SamConfig.fromProjectRoot(projectRoot)
+        assert(samconfig instanceof SamConfig)
+
+        const paramteres = samconfig.listEnvironments()
+        assert.strictEqual(paramteres.length, 1)
+
+        const defaultEnvironment = paramteres[0]
+        assert.strictEqual(defaultEnvironment.name, 'default')
+        assert.deepStrictEqual(defaultEnvironment.commands, {
+            global: {
+                parameters: {
+                    stack_name: 'stack-1',
+                    region: 'us-east-1',
+                },
+            },
+        })
+    })
+
+    it('should create a new samconfig.toml and overwrite existing file', async () => {
+        await testFolder.write('samconfig.toml', samconfigCompleteData)
+
+        const data = {
+            default: {
+                global: {
+                    parameters: {
+                        stack_name: 'stack-1',
+                        region: 'us-east-1',
+                    },
+                },
+            },
+        } as JsonMap
+
+        await createNewConfigFile(projectRoot, data)
+
+        const samconfig = await SamConfig.fromProjectRoot(projectRoot)
+        assert(samconfig instanceof SamConfig)
+
+        const paramteres = samconfig.listEnvironments()
+        assert.strictEqual(paramteres.length, 1)
+
+        const defaultEnvironment = paramteres[0]
+        assert.strictEqual(defaultEnvironment.name, 'default')
+        assert.deepStrictEqual(defaultEnvironment.commands, {
+            global: {
+                parameters: {
+                    stack_name: 'stack-1',
+                    region: 'us-east-1',
+                },
+            },
+        })
+    })
+})
+
+describe('with valid samconfig', () => {
+    let testFolder: TestFolder
+    let projectRoot: vscode.Uri
+
+    beforeEach(async () => {
+        testFolder = await TestFolder.create()
+        projectRoot = vscode.Uri.file(testFolder.path)
+
+        await testFolder.write('samconfig.toml', samconfigCompleteData)
+        await SamConfig.fromProjectRoot(projectRoot)
+    })
+
+    it('validateSamDeployConfig should return true', async () => {
+        assert(await validateSamDeployConfig(projectRoot))
+    })
+
+    it('validateSamSyncConfig should return true', async () => {
+        assert(await validateSamSyncConfig(projectRoot))
+    })
+
+    it('validateSamBuildConfig should return true', async () => {
+        assert(await validateSamBuildConfig(projectRoot))
+    })
+})
+
+describe('with valid samconfig missing global flag', () => {
+    let testFolder: TestFolder
+    let projectRoot: vscode.Uri
+
+    beforeEach(async () => {
+        testFolder = await TestFolder.create()
+        projectRoot = vscode.Uri.file(testFolder.path)
+
+        await testFolder.write('samconfig.toml', samconfigCompleteDataWithoutGlobal)
+    })
+
+    it('validateSamDeployConfig should return false', async () => {
+        assert.strictEqual(await validateSamDeployConfig(projectRoot), false)
+    })
+
+    it('validateSamSyncConfig should return false', async () => {
+        assert.strictEqual(await validateSamSyncConfig(projectRoot), false)
+    })
+
+    it('validateSamBuildConfig should return true', async () => {
+        assert(await validateSamBuildConfig(projectRoot))
+    })
+})
+
+describe('with valid samconfig with only global flag', () => {
+    let testFolder: TestFolder
+    let projectRoot: vscode.Uri
+
+    beforeEach(async () => {
+        testFolder = await TestFolder.create()
+        projectRoot = vscode.Uri.file(testFolder.path)
+
+        await writeSamconfigGlobal(projectRoot, 'stack1', 'us-east-1')
+        await SamConfig.fromProjectRoot(projectRoot)
+    })
+
+    it('validateSamDeployConfig should return false', async () => {
+        assert.strictEqual(await validateSamDeployConfig(projectRoot), false)
+    })
+
+    it('validateSamSyncConfig should return false', async () => {
+        assert.strictEqual(await validateSamSyncConfig(projectRoot), false)
+    })
+
+    it('validateSamBuildConfig should return false', async () => {
+        assert.strictEqual(await validateSamBuildConfig(projectRoot), false)
+    })
+})
diff --git a/packages/core/src/test/shared/sam/debugger/awsSamDebugConfigurationValidator.test.ts b/packages/core/src/test/shared/sam/debugger/awsSamDebugConfigurationValidator.test.ts
new file mode 100644
index 00000000000..fd112fcf6c9
--- /dev/null
+++ b/packages/core/src/test/shared/sam/debugger/awsSamDebugConfigurationValidator.test.ts
@@ -0,0 +1,204 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+
+import * as CloudFormation from '../../../../shared/cloudformation/cloudformation'
+import { CloudFormationTemplateRegistry } from '../../../../shared/fs/templateRegistry'
+import {
+    AwsSamDebuggerConfiguration,
+    TemplateTargetProperties,
+} from '../../../../shared/sam/debugger/awsSamDebugConfiguration'
+import { DefaultAwsSamDebugConfigurationValidator } from '../../../../shared/sam/debugger/awsSamDebugConfigurationValidator'
+import { createBaseTemplate } from '../../cloudformation/cloudformationTestUtils'
+import { WatchedItem } from '../../../../shared/fs/watchedFiles'
+import { stub } from '../../../utilities/stubber'
+
+function createTemplateConfig(): AwsSamDebuggerConfiguration {
+    return {
+        type: 'aws-sam',
+        name: 'name',
+        request: 'direct-invoke',
+        invokeTarget: {
+            target: 'template',
+            templatePath: '/',
+            logicalId: 'TestResource',
+        },
+    }
+}
+
+function createImageTemplateConfig(): AwsSamDebuggerConfiguration {
+    return {
+        type: 'aws-sam',
+        name: 'name',
+        request: 'direct-invoke',
+        invokeTarget: {
+            target: 'template',
+            templatePath: '/image',
+            logicalId: 'TestResource',
+        },
+        lambda: {
+            runtime: 'nodejs18.x',
+        },
+    }
+}
+
+function createCodeConfig(): AwsSamDebuggerConfiguration {
+    return {
+        type: 'aws-sam',
+        name: 'name',
+        request: 'direct-invoke',
+        invokeTarget: {
+            target: 'code',
+            lambdaHandler: 'foo',
+            projectRoot: 'bar',
+        },
+    }
+}
+
+function createApiConfig(): AwsSamDebuggerConfiguration {
+    return {
+        type: 'aws-sam',
+        name: 'name',
+        request: 'direct-invoke',
+        invokeTarget: {
+            target: 'api',
+            templatePath: '/',
+            logicalId: 'TestResource',
+        },
+        api: {
+            path: '/',
+            httpMethod: 'get',
+        },
+    }
+}
+
+function createTemplateData(): WatchedItem<CloudFormation.Template> {
+    return {
+        path: '/',
+        item: createBaseTemplate(),
+    }
+}
+
+function createImageTemplateData(): WatchedItem<CloudFormation.Template> {
+    return {
+        path: '/image',
+        item: createBaseTemplate(),
+    }
+}
+
+describe('DefaultAwsSamDebugConfigurationValidator', function () {
+    const templateConfig = createTemplateConfig()
+    const imageTemplateConfig = createImageTemplateConfig()
+    const codeConfig = createCodeConfig()
+    const apiConfig = createApiConfig()
+    const templateData = createTemplateData()
+    const imageTemplateData = createImageTemplateData()
+
+    const mockRegistry = stub(CloudFormationTemplateRegistry, { name: '', items: [] })
+    const mockFolder = <vscode.WorkspaceFolder>{ uri: vscode.Uri.file('/test') }
+
+    let validator: DefaultAwsSamDebugConfigurationValidator
+
+    beforeEach(function () {
+        mockRegistry.getItem.withArgs('/').returns(templateData)
+        mockRegistry.getItem.withArgs('/image').returns(imageTemplateData)
+
+        validator = new DefaultAwsSamDebugConfigurationValidator(mockFolder)
+    })
+
+    it('returns invalid when resolving debug configurations with an invalid request type', async () => {
+        templateConfig.request = 'not-direct-invoke'
+
+        const result = await validator.validate(templateConfig, mockRegistry)
+        assert.strictEqual(result.isValid, false)
+    })
+
+    it('returns invalid when resolving debug configurations with an invalid target type', async () => {
+        templateConfig.invokeTarget.target = 'not-valid' as any
+
+        const result = await validator.validate(templateConfig as any, mockRegistry)
+        assert.strictEqual(result.isValid, false)
+    })
+
+    it("returns invalid when resolving template debug configurations with a template that isn't in the registry", async () => {
+        const mockEmptyRegistry = stub(CloudFormationTemplateRegistry, { name: '', items: [] })
+        mockEmptyRegistry.getItem.withArgs('/').returns(undefined)
+
+        validator = new DefaultAwsSamDebugConfigurationValidator(mockFolder)
+
+        const result = await validator.validate(templateConfig, mockRegistry)
+        assert.strictEqual(result.isValid, false)
+    })
+
+    it("returns invalid when resolving template debug configurations with a template that doesn't have the set resource", async () => {
+        const target = templateConfig.invokeTarget as TemplateTargetProperties
+        target.logicalId = 'wrong'
+
+        const result = await validator.validate(templateConfig, mockRegistry)
+        assert.strictEqual(result.isValid, false)
+    })
+
+    it("returns invalid when resolving template debug configurations with a template that isn't serverless", async () => {
+        const target = templateConfig.invokeTarget as TemplateTargetProperties
+        target.logicalId = 'OtherResource'
+
+        const result = await validator.validate(templateConfig, mockRegistry)
+        assert.strictEqual(result.isValid, false)
+    })
+
+    it('returns undefined when resolving template debug configurations with a resource that has an invalid runtime in template', async () => {
+        const properties = templateData.item.Resources?.TestResource?.Properties as CloudFormation.ZipResourceProperties
+        properties.Runtime = 'invalid'
+
+        const result = await validator.validate(templateConfig, mockRegistry)
+        assert.strictEqual(result.isValid, false)
+    })
+
+    it("API config returns invalid when resolving with a template that isn't serverless", async () => {
+        const target = templateConfig.invokeTarget as TemplateTargetProperties
+        target.logicalId = 'OtherResource'
+        mockRegistry.addItem.resolves()
+
+        const result = await validator.validate(apiConfig, mockRegistry)
+        assert.strictEqual(result.isValid, false)
+    })
+
+    it('API config is invalid when it does not have an API field', async () => {
+        const config = createApiConfig()
+        config.api = undefined
+        mockRegistry.addItem.resolves()
+
+        const result = await validator.validate(config, mockRegistry)
+        assert.strictEqual(result.isValid, false)
+    })
+
+    it("API config is invalid when its path does not start with a '/'", async () => {
+        const config = createApiConfig()
+
+        config.api!.path = 'noleadingslash'
+        mockRegistry.addItem.resolves()
+
+        const result = await validator.validate(config, mockRegistry)
+        assert.strictEqual(result.isValid, false)
+    })
+
+    it('returns invalid when resolving code debug configurations with invalid runtimes', async () => {
+        codeConfig.lambda = { runtime: 'asd' }
+
+        const result = await validator.validate(codeConfig, mockRegistry)
+        assert.strictEqual(result.isValid, false)
+    })
+
+    it('returns invalid when Image app does not declare runtime', async () => {
+        const lambda = imageTemplateConfig.lambda
+
+        delete lambda?.runtime
+
+        const result = await validator.validate(templateConfig, mockRegistry)
+        assert.strictEqual(result.isValid, false)
+    })
+})
diff --git a/src/test/shared/sam/debugger/samDebugConfigProvider.test.ts b/packages/core/src/test/shared/sam/debugger/samDebugConfigProvider.test.ts
similarity index 87%
rename from src/test/shared/sam/debugger/samDebugConfigProvider.test.ts
rename to packages/core/src/test/shared/sam/debugger/samDebugConfigProvider.test.ts
index a4d62321eaa..ccdf113b580 100644
--- a/src/test/shared/sam/debugger/samDebugConfigProvider.test.ts
+++ b/packages/core/src/test/shared/sam/debugger/samDebugConfigProvider.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as os from 'os'
 import * as path from 'path'
 import * as sinon from 'sinon'
@@ -38,15 +38,15 @@ import {
     makeSampleYamlResource,
     makeSampleYamlParameters,
 } from '../../cloudformation/cloudformationTestUtils'
-import { readFileSync } from 'fs-extra'
-import { CredentialsStore } from '../../../../credentials/credentialsStore'
-import { CredentialsProviderManager } from '../../../../credentials/providers/credentialsProviderManager'
+import { CredentialsStore } from '../../../../auth/credentials/store'
+import { CredentialsProviderManager } from '../../../../auth/providers/credentialsProviderManager'
 import { Credentials } from '@aws-sdk/types'
 import { ExtContext } from '../../../../shared/extensions'
-import { mkdir, remove } from 'fs-extra'
 import { getLogger } from '../../../../shared/logger/logger'
-import { CredentialsProvider } from '../../../../credentials/providers/credentials'
+import { CredentialsProvider } from '../../../../auth/providers/credentials'
 import globals from '../../../../shared/extensionGlobals'
+import { isCI } from '../../../../shared/vscode/env'
+import { fs } from '../../../../shared'
 
 /**
  * Asserts the contents of a "launch config" (the result of `makeConfig()` or
@@ -147,7 +147,7 @@ describe('SamDebugConfigurationProvider', async function () {
 
     beforeEach(async function () {
         fakeContext = await FakeExtensionContext.getFakeExtContext()
-        fakeContext.awsContext.setCredentials({
+        await fakeContext.awsContext.setCredentials({
             accountId: '9888888',
             credentials: fakeCredentials,
             credentialsId: 'profile:fake',
@@ -163,11 +163,11 @@ describe('SamDebugConfigurationProvider', async function () {
     })
 
     afterEach(async function () {
-        await remove(tempFolder)
+        await fs.delete(tempFolder, { recursive: true })
         if (tempFolderSimilarName) {
-            await remove(tempFolderSimilarName)
+            await fs.delete(tempFolderSimilarName, { recursive: true })
         }
-        globals.templateRegistry.reset()
+        ;(await globals.templateRegistry).reset()
         sandbox.restore()
     })
 
@@ -179,23 +179,23 @@ describe('SamDebugConfigurationProvider', async function () {
             assert.deepStrictEqual(await debugConfigProvider.provideDebugConfigurations(fakeWorkspaceFolder), [])
 
             // Malformed template.yaml:
-            testutil.toFile('bogus', tempFile.fsPath)
-            await globals.templateRegistry.addItemToRegistry(tempFile)
+            await testutil.toFile('bogus', tempFile.fsPath)
+            await (await globals.templateRegistry).addItem(tempFile)
             assert.deepStrictEqual(await debugConfigProvider.provideDebugConfigurations(fakeWorkspaceFolder), [])
         })
 
         it('Ignores non function type resources', async function () {
             const bigYamlStr = `${makeSampleSamTemplateYaml(true)}\nTestResource2:\n .   Type: AWS::Serverless::Api`
 
-            testutil.toFile(bigYamlStr, tempFile.fsPath)
-            await globals.templateRegistry.addItemToRegistry(tempFile)
+            await testutil.toFile(bigYamlStr, tempFile.fsPath)
+            await (await globals.templateRegistry).addItem(tempFile)
             const provided = await debugConfigProvider.provideDebugConfigurations(fakeWorkspaceFolder)
             assert.strictEqual(provided!.length, 1)
         })
 
         it('returns one item if a template with one resource is in the workspace', async function () {
-            testutil.toFile(makeSampleSamTemplateYaml(true), tempFile.fsPath)
-            await globals.templateRegistry.addItemToRegistry(tempFile)
+            await testutil.toFile(makeSampleSamTemplateYaml(true), tempFile.fsPath)
+            await (await globals.templateRegistry).addItem(tempFile)
             const provided = await debugConfigProvider.provideDebugConfigurations(fakeWorkspaceFolder)
             assert.notStrictEqual(provided, undefined)
             assert.strictEqual(provided!.length, 1)
@@ -210,8 +210,8 @@ describe('SamDebugConfigurationProvider', async function () {
             const bigYamlStr = `${makeSampleSamTemplateYaml(true, {
                 resourceName: resources[0],
             })}\n${makeSampleYamlResource({ resourceName: resources[1] })}`
-            testutil.toFile(bigYamlStr, tempFile.fsPath)
-            await globals.templateRegistry.addItemToRegistry(tempFile)
+            await testutil.toFile(bigYamlStr, tempFile.fsPath)
+            await (await globals.templateRegistry).addItem(tempFile)
             const provided = await debugConfigProvider.provideDebugConfigurations(fakeWorkspaceFolder)
             assert.notStrictEqual(provided, undefined)
             if (provided) {
@@ -230,16 +230,19 @@ describe('SamDebugConfigurationProvider', async function () {
             tempFolderSimilarName = tempFolder + 'SimilarName'
             const similarNameYaml = vscode.Uri.file(path.join(tempFolderSimilarName, 'test.yaml'))
 
-            await mkdir(nestedDir)
-            await mkdir(tempFolderSimilarName)
+            await fs.mkdir(nestedDir)
+            await fs.mkdir(tempFolderSimilarName)
 
-            testutil.toFile(makeSampleSamTemplateYaml(true, { resourceName: resources[0] }), tempFile.fsPath)
-            testutil.toFile(makeSampleSamTemplateYaml(true, { resourceName: resources[1] }), nestedYaml.fsPath)
-            testutil.toFile(makeSampleSamTemplateYaml(true, { resourceName: badResourceName }), similarNameYaml.fsPath)
+            await testutil.toFile(makeSampleSamTemplateYaml(true, { resourceName: resources[0] }), tempFile.fsPath)
+            await testutil.toFile(makeSampleSamTemplateYaml(true, { resourceName: resources[1] }), nestedYaml.fsPath)
+            await testutil.toFile(
+                makeSampleSamTemplateYaml(true, { resourceName: badResourceName }),
+                similarNameYaml.fsPath
+            )
 
-            await globals.templateRegistry.addItemToRegistry(tempFile)
-            await globals.templateRegistry.addItemToRegistry(nestedYaml)
-            await globals.templateRegistry.addItemToRegistry(similarNameYaml)
+            await (await globals.templateRegistry).addItem(tempFile)
+            await (await globals.templateRegistry).addItem(nestedYaml)
+            await (await globals.templateRegistry).addItem(similarNameYaml)
 
             const provided = await debugConfigProvider.provideDebugConfigurations(fakeWorkspaceFolder)
             assert.notStrictEqual(provided, undefined)
@@ -260,8 +263,8 @@ describe('SamDebugConfigurationProvider', async function () {
                         Path: /hello
                         Method: get`
 
-            testutil.toFile(bigYamlStr, tempFile.fsPath)
-            await globals.templateRegistry.addItemToRegistry(tempFile)
+            await testutil.toFile(bigYamlStr, tempFile.fsPath)
+            await (await globals.templateRegistry).addItem(tempFile)
             const provided = await debugConfigProvider.provideDebugConfigurations(fakeWorkspaceFolder)
             assert.strictEqual(provided!.length, 2)
             assert.strictEqual(provided![1].invokeTarget.target, API_TARGET_TYPE)
@@ -275,8 +278,8 @@ describe('SamDebugConfigurationProvider', async function () {
                 HelloWorld2:
                     Type: HttpApi`
 
-            testutil.toFile(bigYamlStr, tempFile.fsPath)
-            await globals.templateRegistry.addItemToRegistry(tempFile)
+            await testutil.toFile(bigYamlStr, tempFile.fsPath)
+            await (await globals.templateRegistry).addItem(tempFile)
             const provided = await debugConfigProvider.provideDebugConfigurations(fakeWorkspaceFolder)
             assert.strictEqual(provided!.length, 1)
         })
@@ -285,11 +288,11 @@ describe('SamDebugConfigurationProvider', async function () {
     describe('makeConfig', async function () {
         describe('buildDir', function () {
             it('uses `buildDir` as `baseBuildDir` when provided', async function () {
-                const buildDir = path.resolve('/my', 'build', 'dir')
+                const buildDir = (await testutil.createTestWorkspaceFolder('my-build-dir')).uri.fsPath
                 const folder = testutil.getWorkspaceFolder(testutil.getProjectDir())
                 const launchConfig = await getConfig(
                     debugConfigProvider,
-                    globals.templateRegistry,
+                    await globals.templateRegistry,
                     'testFixtures/workspaceFolder/js-plain-sam-app/'
                 )
                 const config = launchConfig.config as AwsSamDebuggerConfiguration & {
@@ -302,19 +305,24 @@ describe('SamDebugConfigurationProvider', async function () {
                 )
 
                 const actual = await debugConfigProvider.makeConfig(folder, config)
-                assert.strictEqual(actual?.baseBuildDir, buildDir)
+                testutil.assertEqualPaths(actual?.baseBuildDir ?? '', buildDir)
             })
         })
 
         it('failure modes', async function () {
             const config = await getConfig(
                 debugConfigProvider,
-                globals.templateRegistry,
+                await globals.templateRegistry,
                 'testFixtures/workspaceFolder/csharp6-zip/'
             )
 
             // No workspace folder:
+            // Stub vscode.workspace.workspaceFolders to be undefined to ensure rejection
+            sandbox.stub(vscode.workspace, 'workspaceFolders').value(undefined)
             await assert.rejects(() => debugConfigProvider.makeConfig(undefined, config.config))
+            // Restore for subsequent tests
+            sandbox.restore()
+            sandbox = sinon.createSandbox()
 
             // No launch.json (vscode will pass an empty config.request):
             await assert.rejects(() => debugConfigProvider.makeConfig(undefined, { ...config.config, request: '' }))
@@ -382,7 +390,7 @@ describe('SamDebugConfigurationProvider', async function () {
             }
             const config = (await debugConfigProvider.makeConfig(folder, input))!
 
-            assertFileText(
+            await assertFileText(
                 config.templatePath,
                 `Resources:
   go1plainsamapp:
@@ -432,7 +440,7 @@ describe('SamDebugConfigurationProvider', async function () {
         })
 
         it("rejects when resolving template debug configurations with a template that doesn't have the set resource", async () => {
-            await createAndRegisterYaml({}, tempFile, globals.templateRegistry)
+            await createAndRegisterYaml({}, tempFile, await globals.templateRegistry)
             await assert.rejects(() =>
                 debugConfigProvider.makeConfig(undefined, createFakeConfig({ templatePath: tempFile.fsPath }))
             )
@@ -442,7 +450,7 @@ describe('SamDebugConfigurationProvider', async function () {
             await createAndRegisterYaml(
                 { resourceName, runtime: 'moreLikeRanOutOfTime' },
                 tempFile,
-                globals.templateRegistry
+                await globals.templateRegistry
             )
             await assert.rejects(
                 () =>
@@ -458,11 +466,10 @@ describe('SamDebugConfigurationProvider', async function () {
         })
 
         it('rejects when resolving template debug configurations with a resource that has an invalid runtime in template', async function () {
-            testutil.toFile(
+            await testutil.toFile(
                 makeSampleSamTemplateYaml(true, { resourceName, runtime: 'moreLikeRanOutOfTime' }),
                 tempFile.fsPath
             )
-            await globals.templateRegistry.addItemToRegistry(tempFile)
             await assert.rejects(() =>
                 debugConfigProvider.makeConfig(undefined, {
                     type: AWS_SAM_DEBUG_TYPE,
@@ -489,9 +496,9 @@ describe('SamDebugConfigurationProvider', async function () {
         })
 
         it('supports workspace-relative template path ("./foo.yaml")', async function () {
-            testutil.toFile(makeSampleSamTemplateYaml(true, { runtime: 'nodejs12.x' }), tempFile.fsPath)
+            await testutil.toFile(makeSampleSamTemplateYaml(true, { runtime: 'nodejs18.x' }), tempFile.fsPath)
             // Register with *full* path.
-            await globals.templateRegistry.addItemToRegistry(tempFile)
+            await (await globals.templateRegistry).addItem(tempFile)
             // Simulates launch.json:
             //     "invokeTarget": {
             //         "target": "./test.yaml",
@@ -508,8 +515,8 @@ describe('SamDebugConfigurationProvider', async function () {
                     target: TEMPLATE_TARGET_TYPE,
                     templatePath: relPath,
                     logicalId: 'TestResource',
-                    //lambdaHandler: 'sick handles',
-                    //projectRoot: 'root as in beer'
+                    // lambdaHandler: 'sick handles',
+                    // projectRoot: 'root as in beer'
                 },
             })
             assert.strictEqual(resolved!.name, name)
@@ -530,7 +537,7 @@ describe('SamDebugConfigurationProvider', async function () {
                     projectRoot: 'src',
                 },
                 lambda: {
-                    runtime: 'nodejs12.x',
+                    runtime: 'nodejs18.x',
                     // For target=code these envvars are written to the input-template.yaml.
                     environmentVariables: {
                         'test-envvar-1': 'test value 1',
@@ -551,9 +558,8 @@ describe('SamDebugConfigurationProvider', async function () {
                 type: AWS_SAM_DEBUG_TYPE,
                 awsCredentials: fakeCredentials,
                 request: 'attach', // Input "direct-invoke", output "attach".
-                runtime: 'nodejs12.x',
+                runtime: 'nodejs18.x',
                 runtimeFamily: lambdaModel.RuntimeFamily.NodeJS,
-                useIkpdb: false,
                 workspaceFolder: {
                     index: 0,
                     name: 'test-workspace-folder',
@@ -584,18 +590,23 @@ describe('SamDebugConfigurationProvider', async function () {
                 port: actual.debugPort,
                 preLaunchTask: undefined,
                 protocol: 'inspector',
+                region: 'us-west-2',
                 remoteRoot: '/var/task',
                 skipFiles: ['/var/runtime/node_modules/**/*.js', '<node_internals>/**/*.js'],
+                continueOnAttach: true,
                 stopOnEntry: false,
             }
 
             assertEqualLaunchConfigs(actual, expected)
-            assertFileText(expected.envFile!, '{"src":{"test-envvar-1":"test value 1","test-envvar-2":"test value 2"}}')
-            assertFileText(
+            await assertFileText(
+                expected.envFile!,
+                '{"src":{"test-envvar-1":"test value 1","test-envvar-2":"test value 2"}}'
+            )
+            await assertFileText(
                 expected.eventPayloadFile!,
                 '{"test-payload-key-1":"test payload value 1","test-payload-key-2":"test payload value 2"}'
             )
-            assertFileText(
+            await assertFileText(
                 expected.templatePath,
                 `Resources:
   src:
@@ -604,7 +615,7 @@ describe('SamDebugConfigurationProvider', async function () {
       Handler: my.test.handler
       CodeUri: >-
         ${expected.codeRoot}
-      Runtime: nodejs12.x
+      Runtime: nodejs18.x
       Environment:
         Variables:
           test-envvar-1: test value 1
@@ -667,6 +678,16 @@ describe('SamDebugConfigurationProvider', async function () {
         })
 
         it('target=code: typescript', async function () {
+            /**
+             * When executing the test on macOS in CI the tests fail with the following error:
+             *  'Error: TypeScript compiler "tsc" not found in node_modules/ or the system
+             *
+             * See: https://github.com/aws/aws-toolkit-vscode/issues/5587
+             */
+            if (isCI() && os.platform() === 'darwin') {
+                this.skip()
+            }
+
             const appDir = pathutil.normalize(
                 path.join(testutil.getProjectDir(), 'testFixtures/workspaceFolder/ts-plain-sam-app/')
             )
@@ -681,7 +702,7 @@ describe('SamDebugConfigurationProvider', async function () {
                     projectRoot: 'src',
                 },
                 lambda: {
-                    runtime: 'nodejs12.x',
+                    runtime: 'nodejs18.x',
                     // For target=code these envvars are written to the input-template.yaml.
                     environmentVariables: {
                         'test-envvar-1': 'test value 1',
@@ -702,9 +723,8 @@ describe('SamDebugConfigurationProvider', async function () {
                 type: AWS_SAM_DEBUG_TYPE,
                 awsCredentials: fakeCredentials,
                 request: 'attach', // Input "direct-invoke", output "attach".
-                runtime: 'nodejs12.x',
+                runtime: 'nodejs18.x',
                 runtimeFamily: lambdaModel.RuntimeFamily.NodeJS,
-                useIkpdb: false,
                 workspaceFolder: {
                     index: 0,
                     name: 'test-workspace-folder',
@@ -737,18 +757,23 @@ describe('SamDebugConfigurationProvider', async function () {
                 port: actual.debugPort,
                 preLaunchTask: undefined,
                 protocol: 'inspector',
+                region: 'us-west-2',
                 remoteRoot: '/var/task',
                 skipFiles: ['/var/runtime/node_modules/**/*.js', '<node_internals>/**/*.js'],
+                continueOnAttach: true,
                 stopOnEntry: false,
             }
 
             assertEqualLaunchConfigs(actual, expected)
-            assertFileText(expected.envFile!, '{"src":{"test-envvar-1":"test value 1","test-envvar-2":"test value 2"}}')
-            assertFileText(
+            await assertFileText(
+                expected.envFile!,
+                '{"src":{"test-envvar-1":"test value 1","test-envvar-2":"test value 2"}}'
+            )
+            await assertFileText(
                 expected.eventPayloadFile!,
                 '{"test-payload-key-1":"test payload value 1","test-payload-key-2":"test payload value 2"}'
             )
-            assertFileText(
+            await assertFileText(
                 expected.templatePath,
                 `Resources:
   src:
@@ -757,7 +782,7 @@ describe('SamDebugConfigurationProvider', async function () {
       Handler: app.handler
       CodeUri: >-
         ${expected.codeRoot}
-      Runtime: nodejs12.x
+      Runtime: nodejs18.x
       Environment:
         Variables:
           test-envvar-1: test value 1
@@ -851,16 +876,14 @@ describe('SamDebugConfigurationProvider', async function () {
                 },
             }
             const templatePath = vscode.Uri.file(path.join(appDir, 'template.yaml'))
-            await globals.templateRegistry.addItemToRegistry(templatePath)
             const actual = (await debugConfigProvider.makeConfig(folder, input))!
 
             const expected: SamLaunchRequestArgs = {
                 type: AWS_SAM_DEBUG_TYPE,
                 awsCredentials: fakeCredentials,
                 request: 'attach', // Input "direct-invoke", output "attach".
-                runtime: 'nodejs14.x',
+                runtime: 'nodejs20.x',
                 runtimeFamily: lambdaModel.RuntimeFamily.NodeJS,
-                useIkpdb: false,
                 workspaceFolder: {
                     index: 0,
                     name: 'test-workspace-folder',
@@ -891,17 +914,19 @@ describe('SamDebugConfigurationProvider', async function () {
                 port: actual.debugPort,
                 preLaunchTask: undefined,
                 protocol: 'inspector',
+                region: 'us-west-2',
                 remoteRoot: '/var/task',
                 skipFiles: ['/var/runtime/node_modules/**/*.js', '<node_internals>/**/*.js'],
+                continueOnAttach: true,
                 stopOnEntry: false,
             }
 
             assertEqualLaunchConfigs(actual, expected)
-            assertFileText(
+            await assertFileText(
                 expected.envFile!,
                 '{"SourceCodeTwoFoldersDeep":{"test-js-template-envvar-1":"test target=template envvar value 1","test-js-template-envvar-2":"test target=template envvar value 2"}}'
             )
-            assertFileText(
+            await assertFileText(
                 expected.eventPayloadFile!,
                 '{"test-js-template-key-1":"test js target=template value 1","test-js-template-key-2":"test js target=template value 2"}'
             )
@@ -973,20 +998,18 @@ describe('SamDebugConfigurationProvider', async function () {
                     logicalId: 'HelloWorldFunction',
                 },
                 lambda: {
-                    runtime: 'nodejs12.x',
+                    runtime: 'nodejs18.x',
                 },
             }
             const templatePath = vscode.Uri.file(path.join(appDir, 'template.yaml'))
-            await globals.templateRegistry.addItemToRegistry(templatePath)
             const actual = (await debugConfigProvider.makeConfig(folder, input))!
 
             const expected: SamLaunchRequestArgs = {
                 type: AWS_SAM_DEBUG_TYPE,
                 awsCredentials: fakeCredentials,
                 request: 'attach', // Input "direct-invoke", output "attach".
-                runtime: 'nodejs12.x',
+                runtime: 'nodejs18.x',
                 runtimeFamily: lambdaModel.RuntimeFamily.NodeJS,
-                useIkpdb: false,
                 workspaceFolder: {
                     index: 0,
                     name: 'test-workspace-folder',
@@ -995,7 +1018,7 @@ describe('SamDebugConfigurationProvider', async function () {
                 baseBuildDir: actual.baseBuildDir, // Random, sanity-checked by assertEqualLaunchConfigs().
                 containerEnvFile: `${actual.baseBuildDir}/container-env-vars.json`,
                 containerEnvVars: {
-                    NODE_OPTIONS: `--inspect-brk=0.0.0.0:${actual.debugPort} --max-http-header-size 81920`,
+                    NODE_OPTIONS: `--inspect=0.0.0.0:${actual.debugPort} --max-http-header-size 81920`,
                 },
                 envFile: undefined,
                 eventPayloadFile: undefined,
@@ -1023,16 +1046,18 @@ describe('SamDebugConfigurationProvider', async function () {
                 port: actual.debugPort,
                 preLaunchTask: undefined,
                 protocol: 'inspector',
+                region: 'us-west-2',
                 remoteRoot: '/var/task',
                 skipFiles: ['/var/runtime/node_modules/**/*.js', '<node_internals>/**/*.js'],
+                continueOnAttach: true,
                 stopOnEntry: false,
                 parameterOverrides: undefined,
             }
 
             assertEqualLaunchConfigs(actual, expected)
-            assertFileText(
+            await assertFileText(
                 expected.containerEnvFile!,
-                `{"NODE_OPTIONS":"--inspect-brk=0.0.0.0:${actual.debugPort} --max-http-header-size 81920"}`
+                `{"NODE_OPTIONS":"--inspect=0.0.0.0:${actual.debugPort} --max-http-header-size 81920"}`
             )
 
             //
@@ -1115,16 +1140,14 @@ describe('SamDebugConfigurationProvider', async function () {
                 },
             }
             const templatePath = vscode.Uri.file(path.join(appDir, 'template.yaml'))
-            await globals.templateRegistry.addItemToRegistry(templatePath)
             const actual = (await debugConfigProvider.makeConfig(folder, input))!
 
             const expected: SamLaunchRequestArgs = {
                 type: AWS_SAM_DEBUG_TYPE,
                 awsCredentials: fakeCredentials,
                 request: 'attach', // Input "direct-invoke", output "attach".
-                runtime: 'nodejs14.x',
+                runtime: 'nodejs20.x',
                 runtimeFamily: lambdaModel.RuntimeFamily.NodeJS,
-                useIkpdb: false,
                 workspaceFolder: {
                     index: 0,
                     name: 'test-workspace-folder',
@@ -1157,18 +1180,20 @@ describe('SamDebugConfigurationProvider', async function () {
                 port: actual.debugPort,
                 preLaunchTask: undefined,
                 protocol: 'inspector',
+                region: 'us-west-2',
                 remoteRoot: '/var/task',
                 skipFiles: ['/var/runtime/node_modules/**/*.js', '<node_internals>/**/*.js'],
+                continueOnAttach: true,
                 stopOnEntry: false,
                 parameterOverrides: undefined,
             }
 
             assertEqualLaunchConfigs(actual, expected)
-            assertFileText(
+            await assertFileText(
                 expected.envFile!,
                 '{"SourceCodeTwoFoldersDeep":{"test-js-template-envvar-1":"test target=template envvar value 1","test-js-template-envvar-2":"test target=template envvar value 2"}}'
             )
-            assertFileText(
+            await assertFileText(
                 expected.eventPayloadFile!,
                 '{"test-js-template-key-1":"test js target=template value 1","test-js-template-key-2":"test js target=template value 2"}'
             )
@@ -1177,9 +1202,9 @@ describe('SamDebugConfigurationProvider', async function () {
             await assertEqualNoDebugTemplateTarget(input, expected, folder, debugConfigProvider)
         })
 
-        it('target=code: java maven', async function () {
+        it('target=code: java17 maven', async function () {
             const appDir = pathutil.normalize(
-                path.join(testutil.getProjectDir(), 'testFixtures/workspaceFolder/java11-plain-maven-sam-app/')
+                path.join(testutil.getProjectDir(), 'testFixtures/workspaceFolder/java17-gradle/')
             )
             const folder = testutil.getWorkspaceFolder(appDir)
             const handler = 'helloworld.App::handleRequest'
@@ -1193,7 +1218,7 @@ describe('SamDebugConfigurationProvider', async function () {
                     projectRoot: 'HelloWorldFunction',
                 },
                 lambda: {
-                    runtime: 'java11',
+                    runtime: 'java17',
                 },
             }
             const actual = (await debugConfigProvider.makeConfig(folder, input))! as SamLaunchRequestArgs
@@ -1201,9 +1226,8 @@ describe('SamDebugConfigurationProvider', async function () {
             const expected: SamLaunchRequestArgs = {
                 awsCredentials: fakeCredentials,
                 request: 'attach', // Input "direct-invoke", output "attach".
-                runtime: 'java11',
+                runtime: 'java17',
                 runtimeFamily: lambdaModel.RuntimeFamily.Java,
-                useIkpdb: false,
                 type: AWS_SAM_DEBUG_TYPE,
                 workspaceFolder: {
                     index: 0,
@@ -1229,6 +1253,7 @@ describe('SamDebugConfigurationProvider', async function () {
                 templatePath: pathutil.normalize(path.join(actual.baseBuildDir!, 'app___vsctk___template.yaml')),
                 parameterOverrides: undefined,
                 architecture: undefined,
+                region: 'us-west-2',
             }
 
             const expectedDebug = {
@@ -1242,7 +1267,7 @@ describe('SamDebugConfigurationProvider', async function () {
 
             assertEqualLaunchConfigs(actual, expectedDebug)
 
-            assertFileText(
+            await assertFileText(
                 expected.templatePath,
                 `Resources:
   HelloWorldFunction:
@@ -1251,7 +1276,7 @@ describe('SamDebugConfigurationProvider', async function () {
       Handler: ${handler}
       CodeUri: >-
         ${input.invokeTarget.projectRoot}
-      Runtime: java11
+      Runtime: java17
 `
             )
 
@@ -1279,9 +1304,9 @@ describe('SamDebugConfigurationProvider', async function () {
             assertEqualLaunchConfigs(actualNoDebug, expectedNoDebug)
         })
 
-        it('target=code: java gradle', async function () {
+        it('target=code: java 17 gradle', async function () {
             const appDir = pathutil.normalize(
-                path.join(testutil.getProjectDir(), 'testFixtures/workspaceFolder/java11-plain-gradle-sam-app/')
+                path.join(testutil.getProjectDir(), 'testFixtures/workspaceFolder/java17-gradle/')
             )
             const folder = testutil.getWorkspaceFolder(appDir)
             const handler = 'helloworld.App::handleRequest'
@@ -1295,7 +1320,7 @@ describe('SamDebugConfigurationProvider', async function () {
                     projectRoot: 'HelloWorldFunction',
                 },
                 lambda: {
-                    runtime: 'java11',
+                    runtime: 'java17',
                 },
             }
             const actual = (await debugConfigProvider.makeConfig(folder, input))! as SamLaunchRequestArgs
@@ -1303,9 +1328,8 @@ describe('SamDebugConfigurationProvider', async function () {
             const expected: SamLaunchRequestArgs = {
                 awsCredentials: fakeCredentials,
                 request: 'attach', // Input "direct-invoke", output "attach".
-                runtime: 'java11',
+                runtime: 'java17',
                 runtimeFamily: lambdaModel.RuntimeFamily.Java,
-                useIkpdb: false,
                 type: AWS_SAM_DEBUG_TYPE,
                 workspaceFolder: {
                     index: 0,
@@ -1331,6 +1355,7 @@ describe('SamDebugConfigurationProvider', async function () {
                 templatePath: pathutil.normalize(path.join(actual.baseBuildDir!, 'app___vsctk___template.yaml')),
                 parameterOverrides: undefined,
                 architecture: undefined,
+                region: 'us-west-2',
             }
 
             const expectedDebug = {
@@ -1344,7 +1369,7 @@ describe('SamDebugConfigurationProvider', async function () {
 
             assertEqualLaunchConfigs(actual, expectedDebug)
 
-            assertFileText(
+            await assertFileText(
                 expectedDebug.templatePath,
                 `Resources:
   HelloWorldFunction:
@@ -1353,7 +1378,7 @@ describe('SamDebugConfigurationProvider', async function () {
       Handler: ${handler}
       CodeUri: >-
         ${input.invokeTarget.projectRoot}
-      Runtime: java11
+      Runtime: java17
 `
             )
 
@@ -1384,7 +1409,7 @@ describe('SamDebugConfigurationProvider', async function () {
         it('target=template: java maven', async function () {
             const handler = 'helloworld.App::handleRequest'
             const appDir = pathutil.normalize(
-                path.join(testutil.getProjectDir(), 'testFixtures/workspaceFolder/java11-plain-maven-sam-app/')
+                path.join(testutil.getProjectDir(), 'testFixtures/workspaceFolder/java17-maven/')
             )
             const folder = testutil.getWorkspaceFolder(appDir)
             const input = {
@@ -1410,15 +1435,13 @@ describe('SamDebugConfigurationProvider', async function () {
                 },
             }
             const templatePath = vscode.Uri.file(path.join(appDir, 'template.yaml'))
-            await globals.templateRegistry.addItemToRegistry(templatePath)
             const actual = (await debugConfigProvider.makeConfig(folder, input))! as SamLaunchRequestArgs
             const expectedCodeRoot = (actual.baseBuildDir ?? 'fail') + '/input'
             const expected: SamLaunchRequestArgs = {
                 awsCredentials: fakeCredentials,
                 request: 'attach', // Input "direct-invoke", output "attach".
-                runtime: 'java11',
+                runtime: 'java17',
                 runtimeFamily: lambdaModel.RuntimeFamily.Java,
-                useIkpdb: false,
                 type: AWS_SAM_DEBUG_TYPE,
                 workspaceFolder: {
                     index: 0,
@@ -1440,7 +1463,8 @@ describe('SamDebugConfigurationProvider', async function () {
                 name: input.name,
                 templatePath: pathutil.normalize(path.join(path.dirname(templatePath.fsPath), 'template.yaml')),
                 parameterOverrides: undefined,
-                architecture: undefined,
+                architecture: 'x86_64',
+                region: 'us-west-2',
             }
 
             const expectedDebug = {
@@ -1453,8 +1477,8 @@ describe('SamDebugConfigurationProvider', async function () {
             }
 
             assertEqualLaunchConfigs(actual, expectedDebug)
-            assertFileText(expectedDebug.envFile!, '{"HelloWorldFunction":{"test-envvar-1":"test value 1"}}')
-            assertFileText(expectedDebug.eventPayloadFile!, '{"test-payload-key-1":"test payload value 1"}')
+            await assertFileText(expectedDebug.envFile!, '{"HelloWorldFunction":{"test-envvar-1":"test value 1"}}')
+            await assertFileText(expectedDebug.eventPayloadFile!, '{"test-payload-key-1":"test payload value 1"}')
 
             //
             // Test noDebug=true.
@@ -1480,9 +1504,9 @@ describe('SamDebugConfigurationProvider', async function () {
             assertEqualLaunchConfigs(actualNoDebug, expectedNoDebug)
         })
 
-        it('target=template: Image java gradle', async function () {
+        it('target=template: Image java', async function () {
             const appDir = pathutil.normalize(
-                path.join(testutil.getProjectDir(), 'testFixtures/workspaceFolder/java11-image-gradle-sam-app')
+                path.join(testutil.getProjectDir(), 'testFixtures/workspaceFolder/java17-image')
             )
             const folder = testutil.getWorkspaceFolder(appDir)
             const input = {
@@ -1509,7 +1533,6 @@ describe('SamDebugConfigurationProvider', async function () {
                 },
             }
             const templatePath = vscode.Uri.file(path.join(appDir, 'template.yaml'))
-            await globals.templateRegistry.addItemToRegistry(templatePath)
             const actual = (await debugConfigProvider.makeConfig(folder, input))! as SamLaunchRequestArgs
             const expectedCodeRoot = (actual.baseBuildDir ?? 'fail') + '/input'
             const expected: SamLaunchRequestArgs = {
@@ -1517,7 +1540,6 @@ describe('SamDebugConfigurationProvider', async function () {
                 request: 'attach', // Input "direct-invoke", output "attach".
                 runtime: 'java11',
                 runtimeFamily: lambdaModel.RuntimeFamily.Java,
-                useIkpdb: false,
                 type: AWS_SAM_DEBUG_TYPE,
                 workspaceFolder: {
                     index: 0,
@@ -1543,7 +1565,8 @@ describe('SamDebugConfigurationProvider', async function () {
                 name: input.name,
                 templatePath: pathutil.normalize(path.join(path.dirname(templatePath.fsPath), 'template.yaml')),
                 parameterOverrides: undefined,
-                architecture: undefined,
+                architecture: 'x86_64',
+                region: 'us-west-2',
             }
 
             const expectedDebug = {
@@ -1556,9 +1579,9 @@ describe('SamDebugConfigurationProvider', async function () {
             }
 
             assertEqualLaunchConfigs(actual, expectedDebug)
-            assertFileText(expectedDebug.envFile!, '{"HelloWorldFunction":{"test-envvar-1":"test value 1"}}')
-            assertFileText(expectedDebug.eventPayloadFile!, '{"test-payload-key-1":"test payload value 1"}')
-            assertFileText(
+            await assertFileText(expectedDebug.envFile!, '{"HelloWorldFunction":{"test-envvar-1":"test value 1"}}')
+            await assertFileText(expectedDebug.eventPayloadFile!, '{"test-payload-key-1":"test payload value 1"}')
+            await assertFileText(
                 expectedDebug.containerEnvFile!,
                 `{"_JAVA_OPTIONS":"${expectedDebug.containerEnvVars!._JAVA_OPTIONS}"}`
             )
@@ -1612,8 +1635,7 @@ describe('SamDebugConfigurationProvider', async function () {
                 awsCredentials: fakeCredentials,
                 request: 'attach', // Input "direct-invoke", output "attach".
                 runtime: 'dotnet6', // lambdaModel.dotNetRuntimes[0],
-                runtimeFamily: lambdaModel.RuntimeFamily.DotNetCore,
-                useIkpdb: false,
+                runtimeFamily: lambdaModel.RuntimeFamily.DotNet,
                 type: AWS_SAM_DEBUG_TYPE,
                 workspaceFolder: {
                     index: 0,
@@ -1639,6 +1661,7 @@ describe('SamDebugConfigurationProvider', async function () {
                 templatePath: pathutil.normalize(path.join(actual.baseBuildDir!, 'app___vsctk___template.yaml')),
                 parameterOverrides: undefined,
                 architecture: undefined,
+                region: 'us-west-2',
 
                 //
                 // Csharp-related fields
@@ -1669,7 +1692,7 @@ describe('SamDebugConfigurationProvider', async function () {
 
             assertEqualLaunchConfigs(actual, expected)
 
-            assertFileText(
+            await assertFileText(
                 expected.templatePath,
                 `Resources:
   HelloWorld:
@@ -1756,6 +1779,9 @@ describe('SamDebugConfigurationProvider', async function () {
                     templatePath: 'template.yaml',
                     logicalId: 'HelloWorldFunction',
                 },
+                sam: {
+                    containerBuild: true, // #3864
+                },
                 lambda: {
                     environmentVariables: {
                         'test-envvar-1': 'test value 1',
@@ -1770,7 +1796,6 @@ describe('SamDebugConfigurationProvider', async function () {
                 },
             }
             const templatePath = vscode.Uri.file(path.join(appDir, 'template.yaml'))
-            await globals.templateRegistry.addItemToRegistry(templatePath)
             const actual = (await debugConfigProvider.makeConfig(folder, input))! as SamLaunchRequestArgs
             const codeRoot = `${appDir}/src/HelloWorld`
             const expectedCodeRoot = (actual.baseBuildDir ?? 'fail') + '/input'
@@ -1778,8 +1803,7 @@ describe('SamDebugConfigurationProvider', async function () {
                 awsCredentials: fakeCredentials,
                 request: 'attach', // Input "direct-invoke", output "attach".
                 runtime: 'dotnet6', // lambdaModel.dotNetRuntimes[0],
-                runtimeFamily: lambdaModel.RuntimeFamily.DotNetCore,
-                useIkpdb: false,
+                runtimeFamily: lambdaModel.RuntimeFamily.DotNet,
                 type: AWS_SAM_DEBUG_TYPE,
                 workspaceFolder: {
                     index: 0,
@@ -1795,12 +1819,15 @@ describe('SamDebugConfigurationProvider', async function () {
                 documentUri: vscode.Uri.file(''), // TODO: remove or test.
                 handlerName: 'HelloWorld::HelloWorld.Function::FunctionHandler',
                 invokeTarget: { ...input.invokeTarget },
+                sam: { ...input.sam },
                 lambda: {
                     ...input.lambda,
                 },
                 name: input.name,
                 architecture: 'x86_64',
                 templatePath: pathutil.normalize(path.join(path.dirname(templatePath.fsPath), 'template.yaml')),
+                mountWith: 'write',
+                region: 'us-west-2',
 
                 //
                 // Csharp-related fields
@@ -1831,8 +1858,8 @@ describe('SamDebugConfigurationProvider', async function () {
             }
 
             assertEqualLaunchConfigs(actual, expected)
-            assertFileText(expected.envFile!, '{"HelloWorldFunction":{"test-envvar-1":"test value 1"}}')
-            assertFileText(expected.eventPayloadFile!, '{"test-payload-key-1":"test payload value 1"}')
+            await assertFileText(expected.envFile!, '{"HelloWorldFunction":{"test-envvar-1":"test value 1"}}')
+            await assertFileText(expected.eventPayloadFile!, '{"test-payload-key-1":"test payload value 1"}')
 
             //
             // Test pathMapping
@@ -1923,7 +1950,6 @@ describe('SamDebugConfigurationProvider', async function () {
                 },
             }
             const templatePath = vscode.Uri.file(path.join(appDir, 'template.yaml'))
-            await globals.templateRegistry.addItemToRegistry(templatePath)
             const actual = (await debugConfigProvider.makeConfig(folder, input))! as SamLaunchRequestArgs
             const codeRoot = `${appDir}/src/HelloWorld`
             const expectedCodeRoot = (actual.baseBuildDir ?? 'fail') + '/input'
@@ -1931,8 +1957,7 @@ describe('SamDebugConfigurationProvider', async function () {
                 awsCredentials: fakeCredentials,
                 request: 'attach', // Input "direct-invoke", output "attach".
                 runtime: 'dotnet6', // lambdaModel.dotNetRuntimes[0],
-                runtimeFamily: lambdaModel.RuntimeFamily.DotNetCore,
-                useIkpdb: false,
+                runtimeFamily: lambdaModel.RuntimeFamily.DotNet,
                 type: AWS_SAM_DEBUG_TYPE,
                 workspaceFolder: {
                     index: 0,
@@ -1959,6 +1984,7 @@ describe('SamDebugConfigurationProvider', async function () {
                 templatePath: pathutil.normalize(path.join(path.dirname(templatePath.fsPath), 'template.yaml')),
                 parameterOverrides: undefined,
                 architecture: undefined,
+                region: 'us-west-2',
 
                 //
                 // Csharp-related fields
@@ -1993,9 +2019,9 @@ describe('SamDebugConfigurationProvider', async function () {
             }
 
             assertEqualLaunchConfigs(actual, expected)
-            assertFileText(expected.envFile!, '{"HelloWorldFunction":{"test-envvar-1":"test value 1"}}')
-            assertFileText(expected.eventPayloadFile!, '{"test-payload-key-1":"test payload value 1"}')
-            assertFileText(expected.containerEnvFile!, '{"_AWS_LAMBDA_DOTNET_DEBUGGING":"1"}')
+            await assertFileText(expected.envFile!, '{"HelloWorldFunction":{"test-envvar-1":"test value 1"}}')
+            await assertFileText(expected.eventPayloadFile!, '{"test-payload-key-1":"test payload value 1"}')
+            await assertFileText(expected.containerEnvFile!, '{"_AWS_LAMBDA_DOTNET_DEBUGGING":"1"}')
 
             // Windows: sourceFileMap driveletter must be uppercase.
             if (os.platform() === 'win32') {
@@ -2096,7 +2122,6 @@ describe('SamDebugConfigurationProvider', async function () {
                 request: 'attach', // Input "direct-invoke", output "attach".
                 runtime: 'python3.7',
                 runtimeFamily: lambdaModel.RuntimeFamily.Python,
-                useIkpdb: false,
                 type: AWS_SAM_DEBUG_TYPE,
                 handlerName: 'app.lambda_handler',
                 workspaceFolder: {
@@ -2127,6 +2152,7 @@ describe('SamDebugConfigurationProvider', async function () {
                 redirectOutput: false,
                 parameterOverrides: undefined,
                 architecture: undefined,
+                region: 'us-west-2',
 
                 //
                 // Python-related fields
@@ -2151,8 +2177,8 @@ describe('SamDebugConfigurationProvider', async function () {
             }
 
             assertEqualLaunchConfigs(actual, expected)
-            assert.strictEqual(readFileSync(actual.eventPayloadFile!, 'utf-8'), readFileSync(absPayloadPath, 'utf-8'))
-            assertFileText(
+            assert.strictEqual(await fs.readFileText(actual.eventPayloadFile!), await fs.readFileText(absPayloadPath))
+            await assertFileText(
                 expected.templatePath,
                 `Resources:
   helloworld:
@@ -2232,7 +2258,6 @@ describe('SamDebugConfigurationProvider', async function () {
                 },
             }
             const templatePath = vscode.Uri.file(path.join(appDir, 'python3.7-plain-sam-app/template.yaml'))
-            await globals.templateRegistry.addItemToRegistry(templatePath)
 
             // Invoke with noDebug=false (the default).
             const actual = (await debugConfigProvider.makeConfig(folder, input))!
@@ -2242,7 +2267,6 @@ describe('SamDebugConfigurationProvider', async function () {
                 request: 'attach', // Input "direct-invoke", output "attach".
                 runtime: 'python3.7',
                 runtimeFamily: lambdaModel.RuntimeFamily.Python,
-                useIkpdb: false,
                 type: AWS_SAM_DEBUG_TYPE,
                 handlerName: 'app.lambda_handler',
                 workspaceFolder: {
@@ -2272,6 +2296,7 @@ describe('SamDebugConfigurationProvider', async function () {
                 redirectOutput: false,
                 parameterOverrides: undefined,
                 architecture: undefined,
+                region: 'us-west-2',
 
                 //
                 // Python-related fields
@@ -2358,7 +2383,6 @@ describe('SamDebugConfigurationProvider', async function () {
                 },
             }
             const templatePath = vscode.Uri.file(path.join(appDir, 'python3.7-plain-sam-app/template.yaml'))
-            await globals.templateRegistry.addItemToRegistry(templatePath)
 
             // Invoke with noDebug=false (the default).
             const actual = (await debugConfigProvider.makeConfig(folder, input))!
@@ -2368,7 +2392,6 @@ describe('SamDebugConfigurationProvider', async function () {
                 request: 'attach', // Input "direct-invoke", output "attach".
                 runtime: 'python3.7',
                 runtimeFamily: lambdaModel.RuntimeFamily.Python,
-                useIkpdb: false,
                 type: AWS_SAM_DEBUG_TYPE,
                 handlerName: 'app.lambda_handler',
                 workspaceFolder: {
@@ -2400,6 +2423,7 @@ describe('SamDebugConfigurationProvider', async function () {
                 port: actual.debugPort,
                 redirectOutput: false,
                 architecture: undefined,
+                region: 'us-west-2',
 
                 //
                 // Python-related fields
@@ -2450,7 +2474,6 @@ describe('SamDebugConfigurationProvider', async function () {
                 },
             }
             const templatePath = vscode.Uri.file(path.join(appDir, 'python3.7-image-sam-app/template.yaml'))
-            await globals.templateRegistry.addItemToRegistry(templatePath)
 
             // Invoke with noDebug=false (the default).
             const actual = (await debugConfigProvider.makeConfig(folder, input))!
@@ -2460,7 +2483,6 @@ describe('SamDebugConfigurationProvider', async function () {
                 request: 'attach', // Input "direct-invoke", output "attach".
                 runtime: 'python3.7',
                 runtimeFamily: lambdaModel.RuntimeFamily.Python,
-                useIkpdb: false,
                 type: AWS_SAM_DEBUG_TYPE,
                 handlerName: 'HelloWorldFunction',
                 workspaceFolder: {
@@ -2490,6 +2512,7 @@ describe('SamDebugConfigurationProvider', async function () {
                 port: actual.debugPort,
                 redirectOutput: false,
                 architecture: undefined,
+                region: 'us-west-2',
 
                 //
                 // Python-related fields
@@ -2601,206 +2624,6 @@ describe('SamDebugConfigurationProvider', async function () {
             getLogger().setLogLevel('debug')
         })
 
-        it('target=code: ikpdb, python 3.7', async function () {
-            const appDir = pathutil.normalize(
-                path.join(testutil.getProjectDir(), 'testFixtures/workspaceFolder/python3.7-plain-sam-app')
-            )
-            const folder = testutil.getWorkspaceFolder(appDir)
-            const input = {
-                type: AWS_SAM_DEBUG_TYPE,
-                name: 'test: ikpdb target=code',
-                request: DIRECT_INVOKE_TYPE,
-                invokeTarget: {
-                    target: CODE_TARGET_TYPE,
-                    lambdaHandler: 'app.lambda_handler',
-                    projectRoot: 'hello_world',
-                },
-                lambda: {
-                    runtime: 'python3.7',
-                    payload: {
-                        path: `${appDir}/events/event.json`,
-                    },
-                },
-                // Force ikpdb in non-cloud9 environment.
-                useIkpdb: true,
-            }
-
-            // Invoke with noDebug=false (the default).
-            const actual = (await debugConfigProvider.makeConfig(folder, input))!
-            // Expected result with noDebug=false.
-            const expected: SamLaunchRequestArgs = {
-                awsCredentials: fakeCredentials,
-                request: 'attach', // Input "direct-invoke", output "attach".
-                runtime: 'python3.7',
-                runtimeFamily: lambdaModel.RuntimeFamily.Python,
-                useIkpdb: true,
-                type: AWS_SAM_DEBUG_TYPE,
-                handlerName: 'app.lambda_handler',
-                workspaceFolder: {
-                    index: 0,
-                    name: 'test-workspace-folder',
-                    uri: vscode.Uri.file(appDir),
-                },
-                baseBuildDir: actual.baseBuildDir, // Random, sanity-checked by assertEqualLaunchConfigs().
-                envFile: undefined,
-                eventPayloadFile: `${actual.baseBuildDir}/event.json`,
-                codeRoot: pathutil.normalize(path.join(appDir, 'hello_world')),
-                debugArgs: [
-                    `-m ikp3db --ikpdb-address=0.0.0.0 --ikpdb-port=${actual.debugPort} -ik_ccwd=hello_world -ik_cwd=/var/task --ikpdb-log=BEXFPG`,
-                ],
-                apiPort: actual.apiPort,
-                debugPort: actual.debugPort,
-                documentUri: vscode.Uri.file(''), // TODO: remove or test.
-                invokeTarget: { ...input.invokeTarget },
-                lambda: {
-                    ...input.lambda,
-                    environmentVariables: {},
-                    memoryMb: undefined,
-                    timeoutSec: undefined,
-                },
-                sam: {
-                    containerBuild: true,
-                },
-                name: input.name,
-                templatePath: pathutil.normalize(path.join(actual.baseBuildDir!, 'app___vsctk___template.yaml')),
-                parameterOverrides: undefined,
-                architecture: undefined,
-
-                //
-                // Python-ikpdb fields
-                //
-                port: actual.debugPort,
-                address: 'localhost',
-                localRoot: pathutil.normalize(path.join(appDir, 'hello_world')),
-                remoteRoot: '/var/task',
-            }
-
-            assertEqualLaunchConfigs(actual, expected)
-            assert.strictEqual(
-                readFileSync(actual.eventPayloadFile!, 'utf-8'),
-                readFileSync(input.lambda.payload.path, 'utf-8')
-            )
-            assertFileText(
-                expected.templatePath,
-                `Resources:
-  helloworld:
-    Type: AWS::Serverless::Function
-    Properties:
-      Handler: ${expected.handlerName}
-      CodeUri: >-
-        ${expected.codeRoot}
-      Runtime: python3.7
-`
-            )
-
-            //
-            // Test noDebug=true.
-            //
-            ;(input as any).noDebug = true
-            const actualNoDebug = (await debugConfigProvider.makeConfig(folder, input))! as SamLaunchRequestArgs
-            const expectedNoDebug: SamLaunchRequestArgs = {
-                ...expected,
-                noDebug: true,
-                request: 'launch',
-                debugPort: undefined,
-                port: -1,
-                handlerName: 'app.lambda_handler',
-                baseBuildDir: actualNoDebug.baseBuildDir,
-                envFile: undefined,
-                eventPayloadFile: `${actualNoDebug.baseBuildDir}/event.json`,
-            }
-            assertEqualLaunchConfigs(actualNoDebug, expectedNoDebug)
-        })
-
-        it('target=template: ikpdb, python 3.7 (deep project tree)', async function () {
-            // To test a deeper tree, use "testFixtures/workspaceFolder/" as the root.
-            const appDir = pathutil.normalize(path.join(testutil.getProjectDir(), 'testFixtures/workspaceFolder/'))
-            const folder = testutil.getWorkspaceFolder(appDir)
-            const input = {
-                type: AWS_SAM_DEBUG_TYPE,
-                name: 'test-py37-template',
-                request: DIRECT_INVOKE_TYPE,
-                invokeTarget: {
-                    target: TEMPLATE_TARGET_TYPE,
-                    templatePath: 'python3.7-plain-sam-app/template.yaml',
-                    logicalId: 'HelloWorldFunction',
-                },
-                // Force ikpdb in non-cloud9 environment.
-                useIkpdb: true,
-            }
-            const templatePath = vscode.Uri.file(path.join(appDir, 'python3.7-plain-sam-app/template.yaml'))
-            await globals.templateRegistry.addItemToRegistry(templatePath)
-
-            // Invoke with noDebug=false (the default).
-            const actual = (await debugConfigProvider.makeConfig(folder, input))!
-            // Expected result with noDebug=false.
-            const expected: SamLaunchRequestArgs = {
-                awsCredentials: fakeCredentials,
-                request: 'attach', // Input "direct-invoke", output "attach".
-                runtime: 'python3.7',
-                runtimeFamily: lambdaModel.RuntimeFamily.Python,
-                useIkpdb: true,
-                type: AWS_SAM_DEBUG_TYPE,
-                handlerName: 'app.lambda_handler',
-                workspaceFolder: {
-                    index: 0,
-                    name: 'test-workspace-folder',
-                    uri: vscode.Uri.file(appDir),
-                },
-                baseBuildDir: actual.baseBuildDir, // Random, sanity-checked by assertEqualLaunchConfigs().
-                envFile: undefined,
-                eventPayloadFile: undefined,
-                codeRoot: pathutil.normalize(path.join(appDir, 'python3.7-plain-sam-app/hello_world')),
-                apiPort: undefined,
-                debugArgs: [
-                    `-m ikp3db --ikpdb-address=0.0.0.0 --ikpdb-port=${actual.debugPort} -ik_ccwd=python3.7-plain-sam-app/hello_world -ik_cwd=/var/task --ikpdb-log=BEXFPG`,
-                ],
-                debugPort: actual.debugPort,
-                documentUri: vscode.Uri.file(''), // TODO: remove or test.
-                invokeTarget: { ...input.invokeTarget },
-                lambda: {
-                    environmentVariables: {},
-                    memoryMb: undefined,
-                    timeoutSec: 3,
-                },
-                sam: {
-                    containerBuild: true,
-                },
-                name: input.name,
-                templatePath: pathutil.normalize(path.join(path.dirname(templatePath.fsPath), 'template.yaml')),
-                parameterOverrides: undefined,
-                architecture: undefined,
-
-                //
-                // Python-ikpdb fields
-                //
-                port: actual.debugPort,
-                address: 'localhost',
-                localRoot: pathutil.normalize(path.join(appDir, 'hello_world')),
-                remoteRoot: '/var/task',
-            }
-
-            assertEqualLaunchConfigs(actual, expected)
-
-            //
-            // Test noDebug=true.
-            //
-            ;(input as any).noDebug = true
-            const actualNoDebug = (await debugConfigProvider.makeConfig(folder, input))!
-            const expectedNoDebug: SamLaunchRequestArgs = {
-                ...expected,
-                noDebug: true,
-                request: 'launch',
-                debugPort: undefined,
-                port: -1,
-                handlerName: 'app.lambda_handler',
-                baseBuildDir: actualNoDebug.baseBuildDir,
-                envFile: undefined,
-                eventPayloadFile: undefined,
-            }
-            assertEqualLaunchConfigs(actualNoDebug, expectedNoDebug)
-        })
-
         it('debugconfig with "aws" section', async function () {
             // Simluates credentials in "aws.credentials" launch-config field.
             const configCredentials: Credentials = {
@@ -2866,24 +2689,23 @@ describe('SamDebugConfigurationProvider', async function () {
                 },
                 ...awsSection,
             }
-            testutil.toFile(
+            await testutil.toFile(
                 makeSampleSamTemplateYaml(true, {
                     resourceName: resourceName,
-                    runtime: 'nodejs12.x',
+                    runtime: 'nodejs18.x',
                     handler: 'my.test.handler',
                     codeUri: 'codeuri',
                 }),
                 tempFile.fsPath
             )
-            await globals.templateRegistry.addItemToRegistry(tempFile)
             const actual = (await debugConfigProviderMockCredentials.makeConfig(folder, input))!
             const tempDir = path.dirname(actual.codeRoot)
 
             const expected: SamLaunchRequestArgs = {
+                // The `aws.credentials` field in debug config, overrides default toolkit credentials.
                 awsCredentials: configCredentials,
                 ...awsSection,
                 type: AWS_SAM_DEBUG_TYPE,
-                useIkpdb: false,
                 workspaceFolder: {
                     index: 0,
                     name: 'test-workspace-folder',
@@ -2915,6 +2737,8 @@ describe('SamDebugConfigurationProvider', async function () {
                 templatePath: pathutil.normalize(path.join(actual.baseBuildDir!, 'app___vsctk___template.yaml')),
                 parameterOverrides: undefined,
                 architecture: 'x86_64',
+                // The `aws.region` field in debug config, overrides default toolkit region.
+                region: 'us-weast-9',
 
                 //
                 // Node-related fields
@@ -2925,9 +2749,10 @@ describe('SamDebugConfigurationProvider', async function () {
                 protocol: 'inspector',
                 remoteRoot: '/var/task',
                 request: 'attach', // Input "direct-invoke", output "attach".
-                runtime: 'nodejs12.x',
+                runtime: 'nodejs18.x',
                 runtimeFamily: lambdaModel.RuntimeFamily.NodeJS,
                 skipFiles: ['/var/runtime/node_modules/**/*.js', '<node_internals>/**/*.js'],
+                continueOnAttach: true,
                 stopOnEntry: false,
             }
 
@@ -2972,7 +2797,6 @@ describe('SamDebugConfigurationProvider', async function () {
                 request: 'attach', // Input "direct-invoke", output "attach".
                 runtime: 'go1.x',
                 runtimeFamily: lambdaModel.RuntimeFamily.Go,
-                useIkpdb: false,
                 workspaceFolder: {
                     index: 0,
                     name: 'test-workspace-folder',
@@ -2994,6 +2818,7 @@ describe('SamDebugConfigurationProvider', async function () {
                 templatePath: pathutil.normalize(path.join(actual.baseBuildDir!, 'app___vsctk___template.yaml')),
                 parameterOverrides: undefined,
                 architecture: undefined,
+                region: 'us-west-2',
 
                 //
                 // Go-related fields
@@ -3009,15 +2834,15 @@ describe('SamDebugConfigurationProvider', async function () {
             }
 
             assertEqualLaunchConfigs(actual, expected)
-            assertFileText(
+            await assertFileText(
                 expected.envFile!,
                 '{"helloworld":{"test-envvar-1":"test value 1","test-envvar-2":"test value 2"}}'
             )
-            assertFileText(
+            await assertFileText(
                 expected.eventPayloadFile!,
                 '{"test-payload-key-1":"test payload value 1","test-payload-key-2":"test payload value 2"}'
             )
-            assertFileText(
+            await assertFileText(
                 expected.templatePath,
                 `Resources:
   helloworld:
@@ -3086,7 +2911,7 @@ describe('ensureRelativePaths', function () {
             undefined,
             'testName1',
             '/test1/project',
-            lambdaModel.getDefaultRuntime(lambdaModel.RuntimeFamily.NodeJS) ?? ''
+            lambdaModel.getDefaultRuntime(lambdaModel.RuntimeFamily.NodeJS)!
         )
         assert.strictEqual((codeConfig.invokeTarget as CodeTargetProperties).projectRoot, '/test1/project')
         ensureRelativePaths(workspace, codeConfig)
@@ -3123,7 +2948,7 @@ async function getConfig(
     const appDir = pathutil.normalize(path.join(testutil.getProjectDir(), rootFolder))
     const folder = testutil.getWorkspaceFolder(appDir)
     const templateFile = pathutil.normalize(path.join(appDir, 'template.yaml'))
-    await registry.addItemToRegistry(vscode.Uri.file(templateFile))
+    await registry.addItem(vscode.Uri.file(templateFile))
 
     // Generate config(s) from a sample project.
     const configs = await debugConfigProvider.provideDebugConfigurations(folder)
@@ -3171,8 +2996,8 @@ async function createAndRegisterYaml(
     file: vscode.Uri,
     registry: CloudFormationTemplateRegistry
 ) {
-    testutil.toFile(makeSampleSamTemplateYaml(true, subValues), file.fsPath)
-    await registry.addItemToRegistry(file)
+    await testutil.toFile(makeSampleSamTemplateYaml(true, subValues), file.fsPath)
+    await registry.addItem(file)
 }
 
 describe('createTemplateAwsSamDebugConfig', function () {
@@ -3285,8 +3110,9 @@ describe('debugConfiguration', function () {
     })
 
     afterEach(async function () {
-        await remove(tempFolder)
-        globals.templateRegistry.reset()
+        await fs.delete(tempFolder, { recursive: true })
+        const r = await globals.templateRegistry
+        r.reset()
     })
 
     it('getCodeRoot(), getHandlerName() with invokeTarget=code', async function () {
@@ -3308,15 +3134,15 @@ describe('debugConfiguration', function () {
             },
         }
 
-        assert.strictEqual(debugConfiguration.getHandlerName(folder, config), 'my.test.handler')
+        assert.strictEqual(await debugConfiguration.getHandlerName(folder, config), 'my.test.handler')
 
         // Config with relative path:
         config.invokeTarget.projectRoot = relativePath
-        assert.strictEqual(debugConfiguration.getCodeRoot(folder, config), fullPath)
+        assert.strictEqual(await debugConfiguration.getCodeRoot(folder, config), fullPath)
 
         // Config with absolute path:
         config.invokeTarget.projectRoot = fullPath
-        assert.strictEqual(debugConfiguration.getCodeRoot(folder, config), fullPath)
+        assert.strictEqual(await debugConfiguration.getCodeRoot(folder, config), fullPath)
     })
 
     it('getCodeRoot(), getHandlerName() with invokeTarget=template', async function () {
@@ -3346,15 +3172,18 @@ describe('debugConfiguration', function () {
         }
 
         // Template with relative path:
-        testutil.toFile(makeSampleSamTemplateYaml(true, { codeUri: relativePath, handler: 'handler' }), tempFile.fsPath)
-        await globals.templateRegistry.addItemToRegistry(tempFile)
-        assert.strictEqual(debugConfiguration.getCodeRoot(folder, config), fullPath)
-        assert.strictEqual(debugConfiguration.getHandlerName(folder, config), 'handler')
+        await testutil.toFile(
+            makeSampleSamTemplateYaml(true, { codeUri: relativePath, handler: 'handler' }),
+            tempFile.fsPath
+        )
+        await (await globals.templateRegistry).addItem(tempFile)
+        assert.strictEqual(await debugConfiguration.getCodeRoot(folder, config), fullPath)
+        assert.strictEqual(await debugConfiguration.getHandlerName(folder, config), 'handler')
 
         // Template with absolute path:
-        testutil.toFile(makeSampleSamTemplateYaml(true, { codeUri: fullPath }), tempFile.fsPath)
-        await globals.templateRegistry.addItemToRegistry(tempFile)
-        assert.strictEqual(debugConfiguration.getCodeRoot(folder, config), fullPath)
+        await testutil.toFile(makeSampleSamTemplateYaml(true, { codeUri: fullPath }), tempFile.fsPath)
+        await (await globals.templateRegistry).addItem(tempFile)
+        assert.strictEqual(await debugConfiguration.getCodeRoot(folder, config), fullPath)
 
         // Template with refs that don't override:
         const tempFileRefs = vscode.Uri.file(path.join(tempFolder, 'testRefs.yaml'))
@@ -3371,13 +3200,13 @@ describe('debugConfiguration', function () {
                 Default: 'notDoingAnything',
             },
         })
-        testutil.toFile(
+        await testutil.toFile(
             makeSampleSamTemplateYaml(true, { codeUri: fullPath, handler: 'handler' }, paramStr),
             tempFileRefs.fsPath
         )
-        await globals.templateRegistry.addItemToRegistry(tempFileRefs)
-        assert.strictEqual(debugConfiguration.getCodeRoot(folder, fileRefsConfig), fullPath)
-        assert.strictEqual(debugConfiguration.getHandlerName(folder, fileRefsConfig), 'handler')
+        await (await globals.templateRegistry).addItem(tempFileRefs)
+        assert.strictEqual(await debugConfiguration.getCodeRoot(folder, fileRefsConfig), fullPath)
+        assert.strictEqual(await debugConfiguration.getHandlerName(folder, fileRefsConfig), 'handler')
 
         // Template with refs that overrides handler via default parameter value in YAML template
         const tempFileDefaultRefs = vscode.Uri.file(path.join(tempFolder, 'testDefaultRefs.yaml'))
@@ -3394,7 +3223,7 @@ describe('debugConfiguration', function () {
                 Default: 'thisWillOverride',
             },
         })
-        testutil.toFile(
+        await testutil.toFile(
             makeSampleSamTemplateYaml(
                 true,
                 { codeUri: fullPath, handler: '!Ref defaultOverride' },
@@ -3402,9 +3231,9 @@ describe('debugConfiguration', function () {
             ),
             tempFileDefaultRefs.fsPath
         )
-        await globals.templateRegistry.addItemToRegistry(tempFileDefaultRefs)
-        assert.strictEqual(debugConfiguration.getCodeRoot(folder, fileDefaultRefsConfig), fullPath)
-        assert.strictEqual(debugConfiguration.getHandlerName(folder, fileDefaultRefsConfig), 'thisWillOverride')
+        await (await globals.templateRegistry).addItem(tempFileDefaultRefs)
+        assert.strictEqual(await debugConfiguration.getCodeRoot(folder, fileDefaultRefsConfig), fullPath)
+        assert.strictEqual(await debugConfiguration.getHandlerName(folder, fileDefaultRefsConfig), 'thisWillOverride')
 
         // Template with refs that overrides handler via override value in launch config
         const tempFileOverrideRef = vscode.Uri.file(path.join(tempFolder, 'testOverrideRefs.yaml'))
@@ -3420,12 +3249,12 @@ describe('debugConfiguration', function () {
                 Type: 'String',
             },
         })
-        testutil.toFile(
+        await testutil.toFile(
             makeSampleSamTemplateYaml(true, { codeUri: fullPath, handler: '!Ref override' }, paramStrNoDefaultOverride),
             tempFileOverrideRef.fsPath
         )
-        await globals.templateRegistry.addItemToRegistry(tempFileOverrideRef)
-        assert.strictEqual(debugConfiguration.getCodeRoot(folder, fileOverrideRefConfig), fullPath)
-        assert.strictEqual(debugConfiguration.getHandlerName(folder, fileOverrideRefConfig), 'override')
+        await (await globals.templateRegistry).addItem(tempFileOverrideRef)
+        assert.strictEqual(await debugConfiguration.getCodeRoot(folder, fileOverrideRefConfig), fullPath)
+        assert.strictEqual(await debugConfiguration.getHandlerName(folder, fileOverrideRefConfig), 'override')
     })
 })
diff --git a/packages/core/src/test/shared/sam/deploy.test.ts b/packages/core/src/test/shared/sam/deploy.test.ts
new file mode 100644
index 00000000000..3928f50ceb7
--- /dev/null
+++ b/packages/core/src/test/shared/sam/deploy.test.ts
@@ -0,0 +1,1313 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { S3Bucket } from '../../../shared/clients/s3'
+import { AppNode } from '../../../awsService/appBuilder/explorer/nodes/appNode'
+import { assertTelemetry, getWorkspaceFolder, TestFolder } from '../../testUtil'
+import { DeployParams, DeployWizard, getDeployWizard, runDeploy } from '../../../shared/sam/deploy'
+import { globals, ToolkitError } from '../../../shared'
+import sinon from 'sinon'
+import { samconfigCompleteData, samconfigInvalidData, validTemplateData } from './samTestUtils'
+import * as SamUtilsModule from '../../../shared/sam/utils'
+import assert from 'assert'
+import { getTestWindow } from '../vscode/window'
+import { CloudFormationClient } from '../../../shared/clients/cloudFormation'
+import { intoCollection } from '../../../shared/utilities/collectionUtils'
+import { clickBackButton, createPromptHandler, PrompterTester } from '../wizards/prompterTester'
+import { RegionNode } from '../../../awsexplorer/regionNode'
+import { createTestRegionProvider } from '../regions/testUtil'
+import { S3Client } from '../../../shared/clients/s3'
+import * as CloudFormationClientModule from '../../../shared/clients/cloudFormation'
+import * as S3ClientModule from '../../../shared/clients/s3'
+import * as ProcessUtilsModule from '../../../shared/utilities/processUtils'
+import * as ProcessTerminalModule from '../../../shared/sam/processTerminal'
+import * as ResolveEnvModule from '../../../shared/env/resolveEnv'
+import * as SamConfiModule from '../../../shared/sam/config'
+import { UserAgent as __UserAgent } from '@smithy/types'
+
+import { SamAppLocation } from '../../../awsService/appBuilder/explorer/samProject'
+import { CancellationError } from '../../../shared/utilities/timeoutUtils'
+import { TemplateItem } from '../../../shared/ui/sam/templatePrompter'
+import { ParamsSource } from '../../../shared/ui/sam/paramsSourcePrompter'
+import { BucketSource } from '../../../shared/ui/sam/bucketPrompter'
+import { TestInputBox, TestQuickPick } from '../vscode/quickInput'
+
+describe('SAM DeployWizard', async function () {
+    let sandbox: sinon.SinonSandbox
+    let testFolder: TestFolder
+    let projectRoot: vscode.Uri
+    let workspaceFolder: vscode.WorkspaceFolder
+    let templateFile: vscode.Uri
+
+    let mockDefaultCFNClient: sinon.SinonStubbedInstance<CloudFormationClient>
+    let mockDefaultS3Client: sinon.SinonStubbedInstance<S3Client>
+
+    beforeEach(async () => {
+        testFolder = await TestFolder.create()
+        projectRoot = vscode.Uri.file(testFolder.path)
+        workspaceFolder = getWorkspaceFolder(testFolder.path)
+        sandbox = sinon.createSandbox()
+
+        // Simulate return of deployed stacks
+        mockDefaultCFNClient = sandbox.createStubInstance(CloudFormationClientModule.CloudFormationClient)
+        sandbox.stub(CloudFormationClientModule, 'CloudFormationClient').returns(mockDefaultCFNClient)
+        mockDefaultCFNClient.listAllStacks.returns(intoCollection(stackSummaries))
+
+        // Simulate return of list bucket
+        mockDefaultS3Client = sandbox.createStubInstance(S3ClientModule.S3Client)
+        sandbox.stub(S3ClientModule, 'S3Client').returns(mockDefaultS3Client)
+        mockDefaultS3Client.listBucketsIterable.returns(intoCollection(s3BucketListSummary))
+
+        // generate template.yaml in temporary test folder and add to registery
+        templateFile = vscode.Uri.file(await testFolder.write('template.yaml', validTemplateData))
+        await (await globals.templateRegistry).addItem(templateFile)
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+
+    describe('entry: template file', () => {
+        it('happy path with invalid samconfig.toml', async () => {
+            /**
+             * Selection:
+             *  - SourceBucketName      : [Select]   prefill value
+             *  - DestinationBucketName : [Select]   prefill value
+             *
+             *  - template              : [Skip]     automatically set
+             *  - projectRoot           : [Skip]     automatically set
+             *  - paramsSource          : [Select]   1. ('Specify required parameters and save as defaults')
+             *  - region                : [Select]   'us-west-2'
+             *  - stackName             : [Select]   1. 'stack1'
+             *  - bucketSource          : [Select]   1. ('Create a SAM CLI managed S3 bucket')
+             *  - bucketName            : [Skip]     automatically set for bucketSource option 1
+             */
+
+            // generate samconfig.toml in temporary test folder
+            await testFolder.write('samconfig.toml', samconfigInvalidData)
+
+            const prompterTester = PrompterTester.init()
+                .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-source-bucket-name')
+                })
+                .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-destination-bucket-name')
+                })
+                .handleQuickPick('Specify parameter source for deploy', async (quickPick) => {
+                    // Need time to check samconfig.toml file and generate options
+                    await quickPick.untilReady()
+
+                    assert.strictEqual(quickPick.items.length, 2)
+                    assert.strictEqual(quickPick.items[0].label, 'Specify required parameters and save as defaults')
+                    assert.strictEqual(quickPick.items[1].label, 'Specify required parameters')
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .handleQuickPick('Select a region', (quickPick) => {
+                    const select = quickPick.items.filter((i) => i.detail === 'us-west-2')[0]
+                    quickPick.acceptItem(select || quickPick.items[0])
+                })
+                .handleQuickPick('Select a CloudFormation Stack', async (quickPick) => {
+                    // The prompt will need some time to generate option
+                    await quickPick.untilReady()
+
+                    assert.strictEqual(quickPick.items.length, 3)
+                    assert.strictEqual(quickPick.items[0].label, 'stack1')
+                    assert.strictEqual(quickPick.items[1].label, 'stack2')
+                    assert.strictEqual(quickPick.items[2].label, 'stack3')
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .handleQuickPick('Specify S3 bucket for deployment artifacts', (quickPick) => {
+                    assert.strictEqual(quickPick.items.length, 2)
+                    assert.strictEqual(quickPick.items[0].label, 'Create a SAM CLI managed S3 bucket')
+                    assert.strictEqual(quickPick.items[1].label, 'Specify an S3 bucket')
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .build()
+
+            const parameters = await (await getDeployWizard(templateFile)).run()
+
+            assert(parameters)
+            assert.strictEqual(parameters.templateParameters.SourceBucketName, 'my-source-bucket-name')
+            assert.strictEqual(parameters.templateParameters.DestinationBucketName, 'my-destination-bucket-name')
+
+            assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath)
+            assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath)
+            assert.strictEqual(parameters.paramsSource, 0)
+            assert.strictEqual(parameters.region, 'us-west-2')
+            assert.strictEqual(parameters.stackName, 'stack1')
+            assert.strictEqual(parameters.bucketSource, 0)
+            prompterTester.assertCallAll()
+        })
+
+        it('happy path with valid samconfig.toml', async () => {
+            /**
+             * Selection:
+             *  - SourceBucketName      : [Select]  prefill value
+             *  - DestinationBucketName : [Select]  prefill value
+             *
+             *  - template              : [Skip]    automatically set
+             *  - projectRoot           : [Skip]    automatically set
+             *  - paramsSource          : [Select]  3. ('Use default values from samconfig')
+             *  - region                : [Skip]    null; will use 'us-west-2' from samconfig
+             *  - stackName             : [Skip]    null; will use 'project-1' from samconfig
+             *  - bucketSource          : [Skip]    null; will use value from from samconfig
+             *  - bucketName            : [Skip]    automatically set for bucketSource option 1
+             */
+
+            // generate samconfig.toml in temporary test folder
+            await testFolder.write('samconfig.toml', samconfigCompleteData)
+
+            const prompterTester = PrompterTester.init()
+                .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-source-bucket-name')
+                })
+                .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-destination-bucket-name')
+                })
+                .handleQuickPick('Specify parameter source for deploy', async (quickPick) => {
+                    // Need time to check samconfig.toml file and generate options
+                    await quickPick.untilReady()
+
+                    assert.strictEqual(quickPick.items.length, 3)
+                    assert.strictEqual(quickPick.items[0].label, 'Specify required parameters and save as defaults')
+                    assert.strictEqual(quickPick.items[1].label, 'Specify required parameters')
+                    assert.strictEqual(quickPick.items[2].label, 'Use default values from samconfig')
+                    quickPick.acceptItem(quickPick.items[2])
+                })
+                .build()
+
+            const parameters = await (await getDeployWizard(templateFile)).run()
+
+            assert(parameters)
+            assert.strictEqual(parameters.templateParameters.SourceBucketName, 'my-source-bucket-name')
+            assert.strictEqual(parameters.templateParameters.DestinationBucketName, 'my-destination-bucket-name')
+
+            assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath)
+            assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath)
+            assert.strictEqual(parameters.paramsSource, 2)
+            assert(!parameters.region)
+            assert(!parameters.stackName)
+            assert(!parameters.bucketSource)
+            prompterTester.assertCallAll()
+        })
+    })
+
+    describe('entry: region node', () => {
+        const expectedRegionId = 'us-west-2'
+        let regionNode: RegionNode
+
+        beforeEach(async () => {
+            // Create RegionNode as entry point
+            regionNode = new RegionNode(
+                { id: expectedRegionId, name: 'US West (N. California)' },
+                createTestRegionProvider()
+            )
+        })
+
+        it('happy path without/invalid samconfig.toml', async () => {
+            /**
+             * Selection:
+             *  - SourceBucketName      : [Skip?]   undefined
+             *  - DestinationBucketName : [Skip?]   undefined
+             *
+             *  - template              : [Select]   template/yaml set
+             *  - projectRoot           : [Skip]     automatically set
+             *  - paramsSource          : [Select]   2. ('Specify required parameters')
+             *  - region                : [Skip]     automatically set from region node 'us-west-2'
+             *  - stackName             : [Select]   1. 'stack1'
+             *  - bucketSource          : [Select]   2. ('Specify an S3 bucket')
+             *  - bucketName            : [Select]   1. 'stack-1-bucket'
+             */
+
+            // provide testWindow so that we can call other api
+            const testWindow = getTestWindow()
+
+            PrompterTester.init({ testWindow })
+                .handleQuickPick('Select a SAM/CloudFormation Template', async (quickPick) => {
+                    // Need sometime to wait for the template to search for template file
+                    await quickPick.untilReady()
+                    assert.strictEqual(quickPick.items.length, 1)
+                    assert.strictEqual(quickPick.items[0].label, templateFile.fsPath)
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-source-bucket-name')
+                })
+                .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-destination-bucket-name')
+                })
+                .handleQuickPick('Specify parameter source for deploy', async (quickPick) => {
+                    // Need time to check samconfig.toml file and generate options
+                    await quickPick.untilReady()
+
+                    assert.strictEqual(quickPick.items.length, 2)
+                    assert.strictEqual(quickPick.items[0].label, 'Specify required parameters and save as defaults')
+                    assert.strictEqual(quickPick.items[1].label, 'Specify required parameters')
+                    quickPick.acceptItem(quickPick.items[1])
+                })
+                .handleQuickPick('Select a CloudFormation Stack', async (quickPick) => {
+                    // The prompt will need some time to generate option
+                    await quickPick.untilReady()
+                    assert.strictEqual(quickPick.items.length, 3)
+                    assert.strictEqual(quickPick.items[0].label, 'stack1')
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .handleQuickPick('Specify S3 bucket for deployment artifacts', (quickPick) => {
+                    assert.strictEqual(quickPick.items.length, 2)
+                    assert.strictEqual(quickPick.items[0].label, 'Create a SAM CLI managed S3 bucket')
+                    assert.strictEqual(quickPick.items[1].label, 'Specify an S3 bucket')
+                    quickPick.acceptItem(quickPick.items[1])
+                })
+                .handleQuickPick('Select an S3 Bucket', async (quickPick) => {
+                    // The prompt will need some time to generate option
+                    await quickPick.untilReady()
+
+                    assert.strictEqual(quickPick.items.length, 3)
+                    assert.strictEqual(quickPick.items[0].label, 'stack-1-bucket')
+                    assert.strictEqual(quickPick.items[1].label, 'stack-2-bucket')
+                    assert.strictEqual(quickPick.items[2].label, 'stack-3-bucket')
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .build()
+
+            const parameters = await (await getDeployWizard(regionNode)).run()
+
+            assert(parameters)
+            // assert.strictEqual(parameters.templateParameters.SourceBucketName, 'my-source-bucket-name')
+            // assert.strictEqual(parameters.templateParameters.DestinationBucketName, 'my-destination-bucket-name')
+
+            assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath)
+            assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath)
+            assert.strictEqual(parameters.templateParameters.SourceBucketName, 'my-source-bucket-name')
+            assert.strictEqual(parameters.templateParameters.DestinationBucketName, 'my-destination-bucket-name')
+            assert.strictEqual(parameters.paramsSource, 1)
+            assert.strictEqual(parameters.region, 'us-west-2')
+            assert.strictEqual(parameters.stackName, 'stack1')
+            assert.strictEqual(parameters.bucketSource, 1)
+            assert.strictEqual(parameters.bucketName, 'stack-1-bucket')
+        })
+
+        it('happy path with samconfig.toml', async () => {
+            /**
+             * Selection:
+             *  - SourceBucketName      : [Skip?]   undefined
+             *  - DestinationBucketName : [Skip?]   undefined
+             *
+             *  - template              : [Select]  template.yaml
+             *  - projectRoot           : [Skip]    automatically set
+             *  - paramsSource          : [Select]  3. ('Use default values from samconfig')
+             *  - region                : [Skip]    automatically set from region node 'us-west-2'
+             *  - stackName             : [Skip]    null; will use 'project-1' from samconfig
+             *  - bucketSource          : [Skip]    null; will use value from from samconfig
+             *  - bucketName            : [Skip]    null; will use value from samconfig file skip from bucketSource option
+             */
+
+            await testFolder.write('samconfig.toml', samconfigCompleteData)
+
+            const prompterTester = PrompterTester.init()
+                .handleQuickPick('Select a SAM/CloudFormation Template', async (quickPick) => {
+                    // Need sometime to wait for the template to search for template file
+                    await quickPick.untilReady()
+                    assert.strictEqual(quickPick.items.length, 1)
+                    assert.strictEqual(quickPick.items[0].label, templateFile.fsPath)
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-source-bucket-name')
+                })
+                .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-destination-bucket-name')
+                })
+                .handleQuickPick('Specify parameter source for deploy', async (quickPick) => {
+                    // Need time to check samconfig.toml file and generate options
+                    await quickPick.untilReady()
+
+                    assert.strictEqual(quickPick.items.length, 3)
+                    assert.strictEqual(quickPick.items[0].label, 'Specify required parameters and save as defaults')
+                    assert.strictEqual(quickPick.items[1].label, 'Specify required parameters')
+                    assert.strictEqual(quickPick.items[2].label, 'Use default values from samconfig')
+                    quickPick.acceptItem(quickPick.items[2])
+                })
+                .build()
+
+            const parameters = await (await getDeployWizard(regionNode)).run()
+
+            assert(parameters)
+
+            assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath)
+            assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath)
+            assert.strictEqual(parameters.templateParameters.SourceBucketName, 'my-source-bucket-name')
+            assert.strictEqual(parameters.templateParameters.DestinationBucketName, 'my-destination-bucket-name')
+            assert.strictEqual(parameters.paramsSource, 2)
+            assert.strictEqual(parameters.region, 'us-west-2')
+            assert(!parameters.stackName)
+            assert(!parameters.bucketSource)
+            prompterTester.assertCallAll()
+        })
+    })
+
+    describe('entry: appBuilder', () => {
+        let appNode: AppNode
+
+        beforeEach(async () => {
+            // Create a mock samAppLocation object
+            const expectedSamAppLocation = {
+                workspaceFolder: workspaceFolder,
+                samTemplateUri: templateFile,
+                projectRoot: projectRoot,
+            }
+            appNode = new AppNode(expectedSamAppLocation)
+        })
+
+        it('happy path without/invalid samconfig.toml', async () => {
+            /**
+             * Selection:
+             *  - SourceBucketName      : [Select]   prefill value
+             *  - DestinationBucketName : [Select]   prefill value
+             *
+             *  - template              : [Skip]     automatically set
+             *  - projectRoot           : [Skip]     automatically set
+             *  - paramsSource          : [Select]   2. ('Specify required parameters')
+             *  - region                : [Select]   'us-west-2'
+             *  - stackName             : [Select]   2. 'stack2'
+             *  - bucketSource          : [Select]   1. ('Create a SAM CLI managed S3 bucket')
+             *  - bucketName            : [Skip]     automatically set for bucketSource option 1
+             */
+
+            const prompterTester = PrompterTester.init()
+                .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-source-bucket-name')
+                })
+                .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-destination-bucket-name')
+                })
+                .handleQuickPick('Specify parameter source for deploy', async (quickPick) => {
+                    // Need time to check samconfig.toml file and generate options
+                    await quickPick.untilReady()
+
+                    assert.strictEqual(quickPick.items.length, 2)
+                    assert.strictEqual(quickPick.items[0].label, 'Specify required parameters and save as defaults')
+                    assert.strictEqual(quickPick.items[1].label, 'Specify required parameters')
+                    quickPick.acceptItem(quickPick.items[1])
+                })
+                .handleQuickPick('Select a region', (quickPick) => {
+                    const select = quickPick.items.filter((i) => i.detail === 'us-west-2')[0]
+                    quickPick.acceptItem(select || quickPick.items[0])
+                })
+                .handleQuickPick('Select a CloudFormation Stack', async (quickPick) => {
+                    // The prompt will need some time to generate option
+                    await quickPick.untilReady()
+                    assert.strictEqual(quickPick.items.length, 3)
+                    assert.strictEqual(quickPick.items[0].label, 'stack1')
+                    assert.strictEqual(quickPick.items[1].label, 'stack2')
+                    assert.strictEqual(quickPick.items[2].label, 'stack3')
+                    quickPick.acceptItem(quickPick.items[1])
+                })
+                .handleQuickPick('Specify S3 bucket for deployment artifacts', (quickPick) => {
+                    assert.strictEqual(quickPick.items.length, 2)
+                    assert.strictEqual(quickPick.items[0].label, 'Create a SAM CLI managed S3 bucket')
+                    assert.strictEqual(quickPick.items[1].label, 'Specify an S3 bucket')
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .build()
+
+            const parameters = await (await getDeployWizard(appNode)).run()
+
+            assert(parameters)
+            assert.strictEqual(parameters.templateParameters.SourceBucketName, 'my-source-bucket-name')
+            assert.strictEqual(parameters.templateParameters.DestinationBucketName, 'my-destination-bucket-name')
+
+            assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath)
+            assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath)
+            assert.strictEqual(parameters.paramsSource, 1)
+            assert.strictEqual(parameters.region, 'us-west-2')
+            assert.strictEqual(parameters.stackName, 'stack2')
+            assert.strictEqual(parameters.bucketSource, 0)
+            assert(!parameters.bucketName)
+            prompterTester.assertCallAll()
+        })
+
+        it('happy path with valid samconfig.toml', async () => {
+            /**
+             * Selection:
+             *  - SourceBucketName      : [Select]   prefill value
+             *  - DestinationBucketName : [Select]   prefill value
+             *
+             *  - template              : [Skip]     automatically set
+             *  - projectRoot           : [Skip]     automatically set
+             *  - paramsSource          : [Select]  3. ('Use default values from samconfig')
+             *  - region                : [Skip]    null; will use value from samconfig file
+             *  - stackName             : [Skip]    null; will use value from samconfig file
+             *  - bucketSource          : [Skip]    null; will use value from samconfig file
+             *  - bucketName            : [Skip]    automatically set for bucketSource option 1
+             */
+
+            // generate samconfig.toml in temporary test folder
+            await testFolder.write('samconfig.toml', samconfigCompleteData)
+
+            const prompterTester = PrompterTester.init()
+                .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-source-bucket-name')
+                })
+                .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-destination-bucket-name')
+                })
+                .handleQuickPick('Specify parameter source for deploy', async (quickPick) => {
+                    // Need time to check samconfig.toml file and generate options
+                    await quickPick.untilReady()
+
+                    assert.strictEqual(quickPick.items.length, 3)
+                    assert.strictEqual(quickPick.items[0].label, 'Specify required parameters and save as defaults')
+                    assert.strictEqual(quickPick.items[1].label, 'Specify required parameters')
+                    assert.strictEqual(quickPick.items[2].label, 'Use default values from samconfig')
+                    quickPick.acceptItem(quickPick.items[2])
+                })
+                .build()
+
+            const parameters = await (await getDeployWizard(appNode)).run()
+
+            assert(parameters)
+            assert.strictEqual(parameters.templateParameters.SourceBucketName, 'my-source-bucket-name')
+            assert.strictEqual(parameters.templateParameters.DestinationBucketName, 'my-destination-bucket-name')
+
+            assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath)
+            assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath)
+            assert.strictEqual(parameters.paramsSource, 2)
+            assert(!parameters.region)
+            assert(!parameters.stackName)
+            assert(!parameters.bucketSource)
+            prompterTester.assertCallAll()
+        })
+    })
+
+    describe('entry: command palette', () => {
+        it('happy path without/invalid samconfig.toml', async () => {
+            /**
+             * Selection:
+             *  - SourceBucketName      : [Skip?]   undefined
+             *  - DestinationBucketName : [Skip?]   undefined
+             *
+             *  - template              : [Select]   template/yaml set
+             *  - projectRoot           : [Skip]     automatically set
+             *  - paramsSource          : [Select]   2. ('Specify required parameters')
+             *  - region                : [Skip]     automatically set from region node 'us-west-2'
+             *  - stackName             : [Select]   3. 'stack3'
+             *  - bucketSource          : [Select]   2. ('Specify an S3 bucket')
+             *  - bucketName            : [Select]   3. 'stack-3-bucket'
+             */
+
+            // Create a second project folder to simulate multiple project in 1 workspace
+            const testFolder2 = await TestFolder.create()
+            const templateFile2 = vscode.Uri.file(await testFolder2.write('template.yaml', validTemplateData))
+            await (await globals.templateRegistry).addItem(templateFile2)
+
+            const prompterTester = PrompterTester.init()
+                .handleQuickPick('Select a SAM/CloudFormation Template', async (quickPick) => {
+                    // Need sometime to wait for the template to search for template file
+                    await quickPick.untilReady()
+                    assert.strictEqual(quickPick.items.length, 2)
+                    assert.strictEqual(quickPick.items[0].label, templateFile.fsPath)
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-source-bucket-name')
+                })
+                .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-destination-bucket-name')
+                })
+                .handleQuickPick('Specify parameter source for deploy', async (quickPick) => {
+                    // Need time to check samconfig.toml file and generate options
+                    await quickPick.untilReady()
+                    assert.strictEqual(quickPick.items.length, 2)
+                    assert.strictEqual(quickPick.items[0].label, 'Specify required parameters and save as defaults')
+                    assert.strictEqual(quickPick.items[1].label, 'Specify required parameters')
+                    quickPick.acceptItem(quickPick.items[1])
+                })
+                .handleQuickPick('Select a region', (quickPick) => {
+                    const select = quickPick.items.filter((i) => i.detail === 'us-west-2')[0]
+                    quickPick.acceptItem(select || quickPick.items[0])
+                })
+                .handleQuickPick('Select a CloudFormation Stack', async (quickPick) => {
+                    // The prompt will need some time to generate option
+                    await quickPick.untilReady()
+
+                    assert.strictEqual(quickPick.items.length, 3)
+                    assert.strictEqual(quickPick.items[0].label, 'stack1')
+                    assert.strictEqual(quickPick.items[1].label, 'stack2')
+                    assert.strictEqual(quickPick.items[2].label, 'stack3')
+                    quickPick.acceptItem(quickPick.items[2])
+                })
+                .handleQuickPick('Specify S3 bucket for deployment artifacts', (quickPick) => {
+                    assert.strictEqual(quickPick.items.length, 2)
+                    assert.strictEqual(quickPick.items[0].label, 'Create a SAM CLI managed S3 bucket')
+                    assert.strictEqual(quickPick.items[1].label, 'Specify an S3 bucket')
+                    quickPick.acceptItem(quickPick.items[1])
+                })
+                .handleQuickPick('Select an S3 Bucket', async (quickPick) => {
+                    // The prompt will need some time to generate option
+                    await quickPick.untilReady()
+                    assert.strictEqual(quickPick.items.length, 3)
+                    assert.strictEqual(quickPick.items[0].label, 'stack-1-bucket')
+                    assert.strictEqual(quickPick.items[1].label, 'stack-2-bucket')
+                    assert.strictEqual(quickPick.items[2].label, 'stack-3-bucket')
+                    quickPick.acceptItem(quickPick.items[2])
+                })
+                .build()
+
+            const parameters = await (await getDeployWizard()).run()
+            assert(parameters)
+
+            assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath)
+            assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath)
+            assert.strictEqual(parameters.templateParameters.SourceBucketName, 'my-source-bucket-name')
+            assert.strictEqual(parameters.templateParameters.DestinationBucketName, 'my-destination-bucket-name')
+            assert.strictEqual(parameters.paramsSource, 1)
+            assert.strictEqual(parameters.region, 'us-west-2')
+            assert.strictEqual(parameters.stackName, 'stack3')
+            assert.strictEqual(parameters.bucketSource, 1)
+            assert.strictEqual(parameters.bucketName, 'stack-3-bucket')
+            prompterTester.assertCallAll()
+        })
+
+        it('happy path without/invalid samconfig.toml with backward click', async () => {
+            /**
+             * Selection:
+             *  - SourceBucketName      : [Skip?]   undefined
+             *  - DestinationBucketName : [Skip?]   undefined
+             *
+             *  - template              : [Select]   template/yaml set
+             *  - projectRoot           : [Skip]     automatically set
+             *  - paramsSource          : [Select]   2. ('Specify required parameters')
+             *  - region                : [Skip]     automatically set from region node 'us-west-2'
+             *  - stackName             : [Select]   3. 'stack3'
+             *  - bucketSource          : [Select]   2. ('Specify an S3 bucket')
+             *  - bucketName            : [Select]   3. 'stack-3-bucket'
+             */
+
+            // Create a second project folder to simulate multiple project in 1 workspace
+            const testFolder2 = await TestFolder.create()
+            const templateFile2 = vscode.Uri.file(await testFolder2.write('template.yaml', validTemplateData))
+            await (await globals.templateRegistry).addItem(templateFile2)
+
+            const prompterTester = PrompterTester.init()
+                .handleQuickPick('Select a SAM/CloudFormation Template', async (quickPick) => {
+                    // Need sometime to wait for the template to search for template file
+                    await quickPick.untilReady()
+                    assert.strictEqual(quickPick.items.length, 2)
+                    assert.strictEqual(quickPick.items[0].label, templateFile.fsPath)
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .handleInputBox(
+                    'Specify SAM Template parameter value for SourceBucketName',
+                    (() => {
+                        return createPromptHandler({
+                            default: async (inputBox: TestInputBox) => {
+                                inputBox.acceptValue('my-source-bucket-name')
+                            },
+                            numbered: [
+                                {
+                                    order: [2],
+                                    handler: clickBackButton,
+                                },
+                                {
+                                    order: [1],
+                                    handler: async (inputBox: TestInputBox) => {
+                                        inputBox.acceptValue('my-source-bucket-name-not-final')
+                                    },
+                                },
+                            ],
+                        })
+                    })()
+                )
+                .handleInputBox(
+                    'Specify SAM Template parameter value for DestinationBucketName',
+                    (() => {
+                        return createPromptHandler({
+                            default: async (inputBox: TestInputBox) => {
+                                inputBox.acceptValue('my-destination-bucket-name')
+                            },
+                            numbered: [
+                                {
+                                    order: [2],
+                                    handler: clickBackButton,
+                                },
+                            ],
+                        })
+                    })()
+                )
+                .handleQuickPick(
+                    'Specify parameter source for deploy',
+                    (() => {
+                        return createPromptHandler({
+                            default: async (quickPick: TestQuickPick) => {
+                                await quickPick.untilReady()
+                                assert.strictEqual(quickPick.items.length, 2)
+                                assert.strictEqual(quickPick.items[1].label, 'Specify required parameters')
+                                quickPick.acceptItem(quickPick.items[1])
+                            },
+                            numbered: [
+                                {
+                                    order: [1],
+                                    handler: async (quickPick: TestQuickPick) => {
+                                        await quickPick.untilReady()
+                                        quickPick.acceptItem(quickPick.items[0])
+                                    },
+                                },
+                                {
+                                    order: [2],
+                                    handler: clickBackButton,
+                                },
+                            ],
+                        })
+                    })()
+                )
+                .handleQuickPick(
+                    'Select a region',
+                    (() => {
+                        return createPromptHandler({
+                            default: async (quickPick: TestQuickPick) => {
+                                await quickPick.untilReady()
+                                const select = quickPick.items.filter((i) => i.detail === 'us-west-2')[0]
+                                quickPick.acceptItem(select || quickPick.items[0])
+                            },
+                            numbered: [
+                                {
+                                    order: [2],
+                                    handler: clickBackButton,
+                                },
+                            ],
+                        })
+                    })()
+                )
+                .handleQuickPick(
+                    'Select a CloudFormation Stack',
+                    (() => {
+                        return createPromptHandler({
+                            default: async (quickPick: TestQuickPick) => {
+                                await quickPick.untilReady()
+                                assert.strictEqual(quickPick.items[2].label, 'stack3')
+                                quickPick.acceptItem(quickPick.items[2])
+                            },
+                            numbered: [
+                                {
+                                    order: [1],
+                                    handler: async (quickPick: TestQuickPick) => {
+                                        await quickPick.untilReady()
+                                        assert.strictEqual(quickPick.items[0].label, 'stack1')
+                                        quickPick.acceptItem(quickPick.items[0])
+                                    },
+                                },
+                                {
+                                    order: [2],
+                                    handler: clickBackButton,
+                                },
+                            ],
+                        })
+                    })()
+                )
+                .handleQuickPick(
+                    'Specify S3 bucket for deployment artifacts',
+                    (() => {
+                        return createPromptHandler({
+                            default: async (quickPick: TestQuickPick) => {
+                                await quickPick.untilReady()
+                                assert.strictEqual(quickPick.items[1].label, 'Specify an S3 bucket')
+                                quickPick.acceptItem(quickPick.items[1])
+                            },
+                            numbered: [
+                                {
+                                    order: [2],
+                                    handler: clickBackButton,
+                                },
+                            ],
+                        })
+                    })()
+                )
+                .handleQuickPick(
+                    'Select an S3 Bucket',
+                    (() => {
+                        return createPromptHandler({
+                            default: async (picker: TestQuickPick) => {
+                                await picker.untilReady()
+                                assert.strictEqual(picker.items[2].label, 'stack-3-bucket')
+                                picker.acceptItem(picker.items[2])
+                            },
+                            numbered: [
+                                {
+                                    order: [1],
+                                    handler: clickBackButton,
+                                },
+                            ],
+                        })
+                    })()
+                )
+                .build()
+
+            const parameters = await (await getDeployWizard()).run()
+            assert(parameters)
+
+            const expectedCallOrder = [
+                'Select a SAM/CloudFormation Template',
+                'Specify SAM Template parameter value for SourceBucketName',
+                'Specify SAM Template parameter value for DestinationBucketName',
+                'Specify parameter source for deploy',
+                'Select a region',
+                'Select a CloudFormation Stack',
+                'Specify S3 bucket for deployment artifacts',
+                'Select an S3 Bucket',
+                'Specify S3 bucket for deployment artifacts',
+                'Select a CloudFormation Stack',
+                'Select a region',
+                'Specify parameter source for deploy',
+                'Specify SAM Template parameter value for DestinationBucketName',
+                'Specify SAM Template parameter value for SourceBucketName',
+                'Select a SAM/CloudFormation Template',
+                'Specify SAM Template parameter value for SourceBucketName',
+                'Specify SAM Template parameter value for DestinationBucketName',
+                'Specify parameter source for deploy',
+                'Select a region',
+                'Select a CloudFormation Stack',
+                'Specify S3 bucket for deployment artifacts',
+                'Select an S3 Bucket',
+            ]
+
+            assert.deepStrictEqual(
+                {
+                    ...parameters,
+                    template: { uri: { fsPath: parameters.template.uri.fsPath } },
+                    projectRoot: { fsPath: parameters.projectRoot.fsPath },
+                },
+                {
+                    template: {
+                        uri: {
+                            fsPath: templateFile.fsPath,
+                        },
+                    },
+                    projectRoot: {
+                        fsPath: projectRoot.fsPath,
+                    },
+                    templateParameters: {
+                        SourceBucketName: 'my-source-bucket-name',
+                        DestinationBucketName: 'my-destination-bucket-name',
+                    },
+                    paramsSource: 1,
+                    region: 'us-west-2',
+                    stackName: 'stack3',
+                    bucketSource: 1,
+                    bucketName: 'stack-3-bucket',
+                }
+            )
+
+            for (const [index, title] of expectedCallOrder.entries()) {
+                prompterTester.assertCallOrder(title, index + 1)
+            }
+        })
+
+        it('happy path with samconfig.toml', async () => {
+            /**
+             * Selection:
+             *  - SourceBucketName      : [Skip?]   undefined
+             *  - DestinationBucketName : [Skip?]   undefined
+             *
+             *  - template              : [Select]  template.yaml
+             *  - projectRoot           : [Skip]    automatically set
+             *  - paramsSource          : [Select]  3. ('Use default values from samconfig')
+             *  - region                : [Skip]    null; will use value from samconfig file
+             *  - stackName             : [Skip]    null; will use value from samconfig file
+             *  - bucketSource          : [Skip]    null; will use value from samconfig file
+             *  - bucketName            : [Skip]    automatically set for bucketSource option 1
+             */
+
+            // Create a second project folder to simulate multiple project in 1 workspace
+            const testFolder2 = await TestFolder.create()
+            const templateFile2 = vscode.Uri.file(await testFolder2.write('template.yaml', validTemplateData))
+            await (await globals.templateRegistry).addItem(templateFile2)
+
+            await testFolder.write('samconfig.toml', samconfigCompleteData)
+            // Simulate return of deployed stacks
+
+            const prompterTester = PrompterTester.init()
+                .handleQuickPick('Select a SAM/CloudFormation Template', async (quickPick) => {
+                    // Need sometime to wait for the template to search for template file
+                    await quickPick.untilReady()
+
+                    assert.strictEqual(quickPick.items.length, 2)
+                    assert.strictEqual(quickPick.items[0].label, templateFile.fsPath)
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-source-bucket-name')
+                })
+                .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-destination-bucket-name')
+                })
+                .handleQuickPick('Specify parameter source for deploy', async (quickPick) => {
+                    // Need time to check samconfig.toml file and generate options
+                    await quickPick.untilReady()
+                    assert.strictEqual(quickPick.items.length, 3)
+                    assert.strictEqual(quickPick.items[0].label, 'Specify required parameters and save as defaults')
+                    assert.strictEqual(quickPick.items[1].label, 'Specify required parameters')
+                    assert.strictEqual(quickPick.items[2].label, 'Use default values from samconfig')
+                    quickPick.acceptItem(quickPick.items[2])
+                })
+                .build()
+            const parameters = await (await getDeployWizard()).run()
+            assert(parameters)
+            assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath)
+            assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath)
+            assert.strictEqual(parameters.templateParameters.SourceBucketName, 'my-source-bucket-name')
+            assert.strictEqual(parameters.templateParameters.DestinationBucketName, 'my-destination-bucket-name')
+            assert.strictEqual(parameters.paramsSource, 2)
+            assert(!parameters.region)
+            assert(!parameters.stackName)
+            assert(!parameters.bucketSource)
+            prompterTester.assertCallAll()
+        })
+    })
+})
+
+describe('SAM Deploy', () => {
+    let sandbox: sinon.SinonSandbox
+    let testFolder: TestFolder
+    let projectRoot: vscode.Uri
+    let workspaceFolder: vscode.WorkspaceFolder
+    let templateFile: vscode.Uri
+
+    let mockDeployParams: DeployParams
+    let mockGetSpawnEnv: sinon.SinonStub
+    let mockGetSamCliPath: sinon.SinonStub
+    let mockRunInTerminal: sinon.SinonStub
+    let spyWriteSamconfigGlobal: sinon.SinonSpy
+
+    let appNode: AppNode
+
+    // Dependency clients
+    let mockChildProcess: sinon.SinonStub
+    beforeEach(async function () {
+        testFolder = await TestFolder.create()
+        projectRoot = vscode.Uri.file(testFolder.path)
+        workspaceFolder = getWorkspaceFolder(testFolder.path)
+        sandbox = sinon.createSandbox()
+
+        // Create template.yaml in temporary test folder and add to registery
+        templateFile = vscode.Uri.file(await testFolder.write('template.yaml', validTemplateData))
+        await (await globals.templateRegistry).addItem(templateFile)
+
+        spyWriteSamconfigGlobal = sandbox.spy(SamConfiModule, 'writeSamconfigGlobal')
+
+        mockGetSpawnEnv = sandbox.stub().resolves({
+            AWS_TOOLING_USER_AGENT: 'AWS-Toolkit-For-VSCode/testPluginVersion',
+            SAM_CLI_TELEMETRY: '0',
+        })
+        sandbox.stub(ResolveEnvModule, 'getSpawnEnv').callsFake(mockGetSpawnEnv)
+
+        appNode = new AppNode({
+            samTemplateUri: templateFile,
+            workspaceFolder: workspaceFolder,
+        } as SamAppLocation)
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+
+    describe(':) path', () => {
+        beforeEach(() => {
+            mockGetSamCliPath = sandbox.stub().resolves({ path: 'sam-cli-path' })
+            sandbox.stub(SamUtilsModule, 'getSamCliPathAndVersion').callsFake(mockGetSamCliPath)
+
+            mockChildProcess = sandbox.stub().resolves({})
+            sandbox.stub(ProcessUtilsModule, 'ChildProcess').callsFake(mockChildProcess)
+
+            mockRunInTerminal = sandbox.stub().resolves(Promise.resolve())
+            sandbox.stub(ProcessTerminalModule, 'runInTerminal').callsFake(mockRunInTerminal)
+        })
+
+        it('[ParamsSource.SamConfig] should instantiate the correct ChildProcess', async () => {
+            // Mock result from DeployWizard; the Wizard is already tested separately
+            mockDeployParams = {
+                paramsSource: ParamsSource.SamConfig,
+                templateParameters: {
+                    SourceBucketName: 'my-source-bucket-name',
+                    DestinationBucketName: 'my-destination-bucket-name',
+                },
+                region: undefined,
+                stackName: undefined,
+                bucketName: undefined,
+                template: { uri: templateFile, data: {} } as TemplateItem,
+                bucketSource: BucketSource.UserProvided,
+                projectRoot: projectRoot,
+            } as unknown as DeployParams
+
+            // Create samconfig.toml in temporary test folder
+            const samconfigFile = await testFolder.write('samconfig.toml', samconfigCompleteData)
+
+            // Stub the DeployWizard output
+            sandbox.stub(DeployWizard.prototype, 'run').resolves(mockDeployParams)
+
+            await runDeploy(appNode)
+
+            // Check that ChildProcess for build and deploy are instantiated correctly
+            assert.strictEqual(mockChildProcess.callCount, 2)
+            const buildChildProcess = mockChildProcess.getCall(0)
+            const deployChildProcess = mockChildProcess.getCall(1)
+
+            assert.deepEqual(buildChildProcess.args, [
+                'sam-cli-path',
+                ['build', '--cached'],
+                {
+                    spawnOptions: {
+                        cwd: mockDeployParams.projectRoot?.fsPath,
+                        env: {
+                            AWS_TOOLING_USER_AGENT: 'AWS-Toolkit-For-VSCode/testPluginVersion',
+                            SAM_CLI_TELEMETRY: '0',
+                        },
+                    },
+                },
+            ])
+            assert.deepEqual(deployChildProcess.args, [
+                'sam-cli-path',
+                [
+                    'deploy',
+                    '--no-confirm-changeset',
+                    '--region',
+                    // Expect region information from samconfig.toml
+                    'us-west-2',
+                    '--config-file',
+                    `${samconfigFile}`,
+                    '--parameter-overrides',
+                    `ParameterKey=SourceBucketName,ParameterValue=${mockDeployParams.templateParameters.SourceBucketName} ` +
+                        `ParameterKey=DestinationBucketName,ParameterValue=${mockDeployParams.templateParameters.DestinationBucketName}`,
+                ],
+                {
+                    spawnOptions: {
+                        cwd: mockDeployParams.projectRoot?.fsPath,
+                        env: {
+                            AWS_TOOLING_USER_AGENT: 'AWS-Toolkit-For-VSCode/testPluginVersion',
+                            SAM_CLI_TELEMETRY: '0',
+                        },
+                    },
+                },
+            ])
+            assert(spyWriteSamconfigGlobal.notCalled)
+            // Check that runInTerminal is called with the correct arguments for build
+            assert.strictEqual(mockRunInTerminal.callCount, 2)
+            const buildProcess = mockChildProcess.getCall(0).returnValue
+            assert.deepEqual(mockRunInTerminal.getCall(0).args, [buildProcess, 'build'])
+
+            const deployProcess = mockChildProcess.getCall(1).returnValue // Get the instance from the first call
+            assert.deepEqual(mockRunInTerminal.getCall(1).args, [deployProcess, 'deploy'])
+
+            assertTelemetry('sam_deploy', { result: 'Succeeded', source: 'appBuilderDeploy' })
+        })
+
+        it('[ParamsSource.SamConfig] when trigger from region node should instantiate the correct ChildProcess without region flag', async () => {
+            // Mock result from DeployWizard; the Wizard is already tested separately
+            mockDeployParams = {
+                paramsSource: ParamsSource.SamConfig,
+                templateParameters: {
+                    SourceBucketName: 'my-source-bucket-name',
+                    DestinationBucketName: 'my-destination-bucket-name',
+                },
+                // Simulate entry from region node when region ('us-east-1') differ from 'us-west-2' in samconfig.toml
+                region: 'us-east-1',
+                stackName: undefined,
+                bucketName: undefined,
+                template: { uri: templateFile, data: {} } as TemplateItem,
+                bucketSource: BucketSource.UserProvided,
+                projectRoot: projectRoot,
+            } as unknown as DeployParams
+
+            // Create samconfig.toml in temporary test folder
+            const samconfigFile = await testFolder.write('samconfig.toml', samconfigCompleteData)
+
+            // Stub the DeployWizard output
+            sandbox.stub(DeployWizard.prototype, 'run').resolves(mockDeployParams)
+
+            await runDeploy(appNode)
+
+            // Check that ChildProcess for build and deploy are instantiated correctly
+            assert.strictEqual(mockChildProcess.callCount, 2)
+            const buildChildProcess = mockChildProcess.getCall(0)
+            const deployChildProcess = mockChildProcess.getCall(1)
+
+            assert.deepEqual(buildChildProcess.args, [
+                'sam-cli-path',
+                ['build', '--cached'],
+                {
+                    spawnOptions: {
+                        cwd: mockDeployParams.projectRoot?.fsPath,
+                        env: {
+                            AWS_TOOLING_USER_AGENT: 'AWS-Toolkit-For-VSCode/testPluginVersion',
+                            SAM_CLI_TELEMETRY: '0',
+                        },
+                    },
+                },
+            ])
+            assert.deepEqual(deployChildProcess.args, [
+                'sam-cli-path',
+                [
+                    'deploy',
+                    '--no-confirm-changeset',
+                    '--region',
+                    `${mockDeployParams.region}`,
+                    '--config-file',
+                    `${samconfigFile}`,
+                    '--parameter-overrides',
+                    `ParameterKey=SourceBucketName,ParameterValue=${mockDeployParams.templateParameters.SourceBucketName} ` +
+                        `ParameterKey=DestinationBucketName,ParameterValue=${mockDeployParams.templateParameters.DestinationBucketName}`,
+                ],
+                {
+                    spawnOptions: {
+                        cwd: mockDeployParams.projectRoot?.fsPath,
+                        env: {
+                            AWS_TOOLING_USER_AGENT: 'AWS-Toolkit-For-VSCode/testPluginVersion',
+                            SAM_CLI_TELEMETRY: '0',
+                        },
+                    },
+                },
+            ])
+            assert(spyWriteSamconfigGlobal.notCalled)
+            // Check that runInTerminal is called with the correct arguments for build
+            assert.strictEqual(mockRunInTerminal.callCount, 2)
+            const buildProcess = mockChildProcess.getCall(0).returnValue
+            assert.deepEqual(mockRunInTerminal.getCall(0).args, [buildProcess, 'build'])
+
+            const deployProcess = mockChildProcess.getCall(1).returnValue // Get the instance from the first call
+            assert.deepEqual(mockRunInTerminal.getCall(1).args, [deployProcess, 'deploy'])
+
+            assertTelemetry('sam_deploy', { result: 'Succeeded', source: 'appBuilderDeploy' })
+        })
+
+        it('[ParamsSource.SpecifyAndSave] should instantiate the correct ChildProcess for sam build and deploy', async () => {
+            // Mock result from DeployWizard; the Wizard is already tested separately
+            mockDeployParams = {
+                paramsSource: ParamsSource.SpecifyAndSave,
+                templateParameters: {
+                    SourceBucketName: 'my-source-bucket-name',
+                    DestinationBucketName: 'my-destination-bucket-name',
+                },
+                region: 'us-east-1',
+                stackName: 'stack1',
+                bucketName: undefined,
+                template: { uri: templateFile, data: {} } as TemplateItem,
+                bucketSource: BucketSource.SamCliManaged,
+                projectRoot: projectRoot,
+            } as unknown as DeployParams
+
+            // Stub the DeployWizard output
+            sandbox.stub(DeployWizard.prototype, 'run').resolves(mockDeployParams)
+
+            await runDeploy(appNode)
+
+            // Check that ChildProcess for build and deploy are instantiated correctly
+            assert.strictEqual(mockChildProcess.callCount, 2)
+            const buildChildProcess = mockChildProcess.getCall(0)
+            const deployChildProcess = mockChildProcess.getCall(1)
+
+            assert.deepEqual(buildChildProcess.args, [
+                'sam-cli-path',
+                ['build', '--cached'],
+                {
+                    spawnOptions: {
+                        cwd: mockDeployParams.projectRoot?.fsPath,
+                        env: {
+                            AWS_TOOLING_USER_AGENT: 'AWS-Toolkit-For-VSCode/testPluginVersion',
+                            SAM_CLI_TELEMETRY: '0',
+                        },
+                    },
+                },
+            ])
+
+            assert.deepEqual(deployChildProcess.args, [
+                'sam-cli-path',
+                [
+                    'deploy',
+                    '--no-confirm-changeset',
+                    '--region',
+                    `${mockDeployParams.region}`,
+                    '--stack-name',
+                    `${mockDeployParams.stackName}`,
+                    '--resolve-s3',
+                    '--capabilities',
+                    'CAPABILITY_IAM',
+                    'CAPABILITY_NAMED_IAM',
+                    '--save-params',
+                    '--parameter-overrides',
+                    `ParameterKey=SourceBucketName,ParameterValue=${mockDeployParams.templateParameters.SourceBucketName} ` +
+                        `ParameterKey=DestinationBucketName,ParameterValue=${mockDeployParams.templateParameters.DestinationBucketName}`,
+                ],
+                {
+                    spawnOptions: {
+                        cwd: mockDeployParams.projectRoot?.fsPath,
+                        env: {
+                            AWS_TOOLING_USER_AGENT: 'AWS-Toolkit-For-VSCode/testPluginVersion',
+                            SAM_CLI_TELEMETRY: '0',
+                        },
+                    },
+                },
+            ])
+
+            assert(
+                spyWriteSamconfigGlobal.calledOnceWith(projectRoot, mockDeployParams.stackName, mockDeployParams.region)
+            )
+
+            // Check that runInTerminal is called with the correct arguments for build
+            assert.strictEqual(mockRunInTerminal.callCount, 2)
+            const buildProcess = mockChildProcess.getCall(0).returnValue
+            assert.deepEqual(mockRunInTerminal.getCall(0).args, [buildProcess, 'build'])
+
+            const deployProcess = mockChildProcess.getCall(1).returnValue // Get the instance from the first call
+            assert.deepEqual(mockRunInTerminal.getCall(1).args, [deployProcess, 'deploy'])
+
+            assertTelemetry('sam_deploy', { result: 'Succeeded', source: 'appBuilderDeploy' })
+        })
+    })
+
+    describe(':( path', () => {
+        let mockDeployParams: DeployParams
+        beforeEach(async () => {
+            mockDeployParams = {
+                paramsSource: ParamsSource.SpecifyAndSave,
+                templateParameters: {
+                    SourceBucketName: 'my-source-bucket-name',
+                    DestinationBucketName: 'my-destination-bucket-name',
+                },
+                region: 'us-east-1',
+                stackName: 'stack1',
+                bucketName: undefined,
+                template: { uri: templateFile, data: {} } as TemplateItem,
+                bucketSource: BucketSource.SamCliManaged,
+                projectRoot: projectRoot,
+            } as unknown as DeployParams
+        })
+
+        it('should gracefully shut down when cancel by user', async () => {
+            try {
+                // Breaking point
+                sandbox.stub(DeployWizard.prototype, 'run').resolves(undefined as unknown as DeployParams)
+
+                await runDeploy(appNode)
+                assert.fail('Should have thrown an CancellationError')
+            } catch (err) {
+                assert(spyWriteSamconfigGlobal.notCalled)
+                assert(err instanceof CancellationError)
+            }
+        })
+
+        it('should throw error given issue with sam cli prerequisite version', async () => {
+            try {
+                // Expect to be called
+                sandbox.stub(DeployWizard.prototype, 'run').resolves(mockDeployParams)
+
+                // Break point
+                mockGetSamCliPath = sandbox
+                    .stub(SamUtilsModule, 'getSamCliPathAndVersion')
+                    .rejects(
+                        new ToolkitError('SAM CLI version 1.53.0 or higher is required', { code: 'VersionTooLow' })
+                    )
+
+                // Not expect to be called
+                mockChildProcess = sandbox.stub().resolves({})
+                sandbox.stub(ProcessUtilsModule, 'ChildProcess').callsFake(mockChildProcess)
+                mockRunInTerminal = sandbox.stub().resolves(Promise.resolve())
+                sandbox.stub(ProcessTerminalModule, 'runInTerminal').callsFake(mockRunInTerminal)
+
+                await runDeploy(appNode)
+                assert.fail('Should have thrown an Error')
+            } catch (err) {
+                assert(err instanceof ToolkitError)
+                assert(mockGetSamCliPath.calledOnce)
+                assert(mockChildProcess.notCalled)
+                assert(mockRunInTerminal.notCalled)
+                assert(spyWriteSamconfigGlobal.notCalled)
+                assert.strictEqual(err.message, 'Failed to deploy SAM template')
+            }
+        })
+
+        it('should throw error given issue with building template', async () => {
+            try {
+                // Happy Stub
+                sandbox.stub(DeployWizard.prototype, 'run').resolves(mockDeployParams)
+                mockGetSamCliPath = sandbox.stub().resolves({ path: 'sam-cli-path' })
+                sandbox.stub(SamUtilsModule, 'getSamCliPathAndVersion').callsFake(mockGetSamCliPath)
+                mockChildProcess = sandbox.stub().resolves({})
+                sandbox.stub(ProcessUtilsModule, 'ChildProcess').callsFake(mockChildProcess)
+
+                // Breaking point
+                mockRunInTerminal = sandbox
+                    .stub(ProcessTerminalModule, 'runInTerminal')
+                    .rejects(new ToolkitError('SAM CLI was cancelled before exiting', { cancelled: true }))
+
+                await runDeploy(appNode)
+                assert.fail('Should have thrown an Error')
+            } catch (err) {
+                assert(err instanceof ToolkitError)
+                assert(mockGetSamCliPath.calledOnce)
+                assert(mockChildProcess.calledOnce)
+                assert(mockRunInTerminal.calledOnce)
+                assert(spyWriteSamconfigGlobal.notCalled)
+                assert.strictEqual(err.message, 'Failed to deploy SAM template')
+            }
+        })
+
+        it('should throw error and write to samconfig.toml given no update when deploying template', async () => {
+            try {
+                // Happy Stub
+                sandbox.stub(DeployWizard.prototype, 'run').resolves(mockDeployParams)
+                mockGetSamCliPath = sandbox.stub().resolves({ path: 'sam-cli-path' })
+                sandbox.stub(SamUtilsModule, 'getSamCliPathAndVersion').callsFake(mockGetSamCliPath)
+                mockChildProcess = sandbox.stub().resolves({})
+                sandbox.stub(ProcessUtilsModule, 'ChildProcess').callsFake(mockChildProcess)
+
+                // Breaking point
+                mockRunInTerminal = sandbox.stub(ProcessTerminalModule, 'runInTerminal').callsFake((input, cmd) => {
+                    if (cmd === 'deploy') {
+                        throw new ToolkitError('The stack is up to date', {
+                            code: 'NoUpdateExitCode',
+                        })
+                    }
+                    return Promise.resolve()
+                })
+
+                await runDeploy(appNode)
+                assert.fail('Should have thrown an Error')
+            } catch (err) {
+                assert(err instanceof ToolkitError)
+                assert(mockGetSamCliPath.calledOnce)
+                assert(mockChildProcess.calledTwice)
+                assert(mockRunInTerminal.calledTwice)
+                assert(spyWriteSamconfigGlobal.calledOnce)
+                assert.strictEqual(err.message, 'Failed to deploy SAM template')
+            }
+        })
+    })
+})
+
+const s3BucketListSummary: Array<Omit<S3Bucket, 'BucketRegion'> & { readonly region: string }> = [
+    { Name: 'stack-1-bucket', region: 'us-west-2', Arn: 'arn-1' },
+    { Name: 'stack-2-bucket', region: 'us-west-2', Arn: 'arn-2' },
+    { Name: 'stack-3-bucket', region: 'us-west-2', Arn: 'arn-3' },
+]
+
+const stackSummaries: CloudFormationClientModule.StackSummary[][] = [
+    [
+        {
+            StackName: 'stack1',
+            StackStatus: 'CREATE_COMPLETE',
+            CreationTime: new Date(),
+        } as CloudFormationClientModule.StackSummary,
+        {
+            StackName: 'stack2',
+            StackStatus: 'CREATE_COMPLETE',
+            CreationTime: new Date(),
+        } as CloudFormationClientModule.StackSummary,
+        {
+            StackName: 'stack3',
+            StackStatus: 'CREATE_COMPLETE',
+            CreationTime: new Date(),
+        } as CloudFormationClientModule.StackSummary,
+    ],
+]
diff --git a/packages/core/src/test/shared/sam/samTestUtils.ts b/packages/core/src/test/shared/sam/samTestUtils.ts
new file mode 100644
index 00000000000..61b67446f5b
--- /dev/null
+++ b/packages/core/src/test/shared/sam/samTestUtils.ts
@@ -0,0 +1,117 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { fs } from '../../../shared'
+
+export async function generateSamconfigFileCustomData(dir: vscode.Uri, body: string) {
+    const uri = vscode.Uri.joinPath(dir, 'samconfig.toml')
+    const data = `
+    version = 0.1
+    
+    ${body}
+`
+    await fs.writeFile(uri, data)
+    return uri
+}
+
+export const samconfigCompleteData = `
+version = 0.1
+
+[default.build.parameters]
+cached = true
+parallel = true
+use_container = true
+
+[default.global.parameters]
+stack_name = "project-1"
+region = "us-west-2"
+
+[default.deploy.parameters]
+confirm_changeset = false
+resolve_s3 = true
+
+[default.sync.parameters]
+s3_bucket = "aws-sam-cli-managed-default-samclisourcebucket-lftqponsaxsr"
+dependency_layer = false
+watch = false
+`
+export const samconfigCompleteDataWithoutGlobal = `
+version = 0.1
+
+[default.build.parameters]
+cached = true
+parallel = true
+use_container = true
+
+[default.deploy.parameters]
+confirm_changeset = false
+resolve_s3 = true
+
+[default.sync.parameters]
+s3_bucket = "aws-sam-cli-managed-default-samclisourcebucket-lftqponsaxsr"
+dependency_layer = false
+watch = false
+`
+export const samconfigInvalidData = `
+version = 0.1
+
+[default.global.parameters]
+stack_name = project-1
+region = us-west-2
+`
+export function generateSamconfigData(data: {
+    sync?: Array<{ key: string; value: string }>
+    build?: Array<{ key: string; value: string }>
+    deploy?: Array<{ key: string; value: string }>
+    global?: Array<{ key: string; value: string }>
+}): string {
+    const result: string[] = ['version = 0.1']
+
+    for (const [operation, parameters] of Object.entries(data)) {
+        if (parameters && parameters.length > 0) {
+            result.push('', `[default.${operation}.parameters]`)
+            for (const { key, value } of parameters) {
+                value && result.push(`${key} = "${value}"`)
+            }
+        }
+    }
+
+    return result.join('\n')
+}
+
+export const validTemplateData = `
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+
+Parameters:
+  SourceBucketName:
+    Type: String
+    Default: project-1-source-bucket
+  DestinationBucketName:
+    Type: String
+    Default: project-1-destination-bucket
+
+Resources:
+  SourceBucket:
+    Type: AWS::S3::Bucket
+    Properties:
+      BucketName: !Ref SourceBucketName
+  ResizerFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      CodeUri: src/
+      Handler: app.lambda_handler
+      Runtime: python3.12
+      MemorySize: 2048
+      Environment:
+        Variables:
+          DESTINATION_BUCKETNAME: !Ref DestinationBucketName
+      Events:
+        FileUpload:
+          Type: S3
+          Properties:
+            Bucket: !Ref SourceBucket
+            Events: s3:ObjectCreated:*
+`
diff --git a/packages/core/src/test/shared/sam/sync.test.ts b/packages/core/src/test/shared/sam/sync.test.ts
new file mode 100644
index 00000000000..da7a8086f38
--- /dev/null
+++ b/packages/core/src/test/shared/sam/sync.test.ts
@@ -0,0 +1,2204 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as SamUtilsModule from '../../../shared/sam/utils'
+import * as ProcessTerminalUtils from '../../../shared/sam/processTerminal'
+import * as S3ClientModule from '../../../shared/clients/s3'
+import * as SamConfigModule from '../../../shared/sam/config'
+import * as ResolveEnvModule from '../../../shared/env/resolveEnv'
+import * as ProcessUtilsModule from '../../../shared/utilities/processUtils'
+import { CancellationError } from '../../../shared/utilities/timeoutUtils'
+import * as CloudFormationClientModule from '../../../shared/clients/cloudFormation'
+
+import {
+    createEnvironmentPrompter,
+    ensureBucket,
+    ensureRepo,
+    getSyncParamsFromConfig,
+    getSyncWizard,
+    prepareSyncParams,
+    runSync,
+    saveAndBindArgs,
+    syncFlagItems,
+    SyncParams,
+    SyncWizard,
+} from '../../../shared/sam/sync'
+
+import {
+    createBaseImageTemplate,
+    createBaseTemplate,
+    makeSampleSamTemplateYaml,
+} from '../cloudformation/cloudformationTestUtils'
+import { createWizardTester } from '../wizards/wizardTestUtils'
+import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
+import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
+import { ToolkitError } from '../../../shared/errors'
+import globals from '../../../shared/extensionGlobals'
+import fs from '../../../shared/fs/fs'
+import { createMultiPick, DataQuickPickItem } from '../../../shared/ui/pickerPrompter'
+import sinon from 'sinon'
+import { getTestWindow } from '../vscode/window'
+import { S3Client } from '../../../shared/clients/s3'
+import { RequiredProps } from '../../../shared/utilities/tsUtils'
+import { Bucket } from '@aws-sdk/client-s3'
+import { CloudFormationClient } from '../../../shared/clients/cloudFormation'
+import { intoCollection } from '../../../shared/utilities/collectionUtils'
+import { SamConfig, Environment, parseConfig } from '../../../shared/sam/config'
+import { RegionProvider } from '../../../shared/regions/regionProvider'
+import { Region } from '../../../shared/regions/endpoints'
+import { RegionNode } from '../../../awsexplorer/regionNode'
+import { getProjectRootUri } from '../../../shared/sam/utils'
+import { AppNode } from '../../../awsService/appBuilder/explorer/nodes/appNode'
+import * as Cfn from '../../../shared/cloudformation/cloudformation'
+import { getWorkspaceFolder, TestFolder } from '../../testUtil'
+import { TemplateItem } from '../../../shared/ui/sam/templatePrompter'
+import { ParamsSource } from '../../../shared/ui/sam/paramsSourcePrompter'
+import { CloudFormationTemplateRegistry } from '../../../shared/fs/templateRegistry'
+
+import { samconfigCompleteData, samconfigInvalidData, validTemplateData } from '../../shared/sam/samTestUtils'
+import { assertTelemetry, assertTelemetryCurried } from '../../testUtil'
+import { clickBackButton, createPromptHandler, PrompterTester } from '../wizards/prompterTester'
+import { createTestRegionProvider } from '../regions/testUtil'
+import { ToolkitPromptSettings } from '../../../shared/settings'
+import { DefaultEcrClient } from '../../../shared/clients/ecrClient'
+import assert from 'assert'
+import { BucketSource } from '../../../shared/ui/sam/bucketPrompter'
+import { TestInputBox, TestQuickPick } from '../vscode/quickInput'
+
+describe('SAM SyncWizard', async function () {
+    const createTester = async (params?: Partial<SyncParams>) =>
+        createWizardTester(new SyncWizard({ deployType: 'code', ...params }, await globals.templateRegistry))
+
+    it('skips prompts if user chooses samconfig file as params source', async function () {
+        const workspaceUri = vscode.workspace.workspaceFolders?.[0]?.uri || vscode.Uri.file('/')
+        const rootFolderUri = vscode.Uri.joinPath(workspaceUri, 'my')
+        const templateUri = vscode.Uri.joinPath(rootFolderUri, 'template.yaml')
+        const tester = await createTester({
+            template: { uri: templateUri, data: createBaseTemplate() },
+            paramsSource: ParamsSource.SamConfig,
+            projectRoot: rootFolderUri,
+        })
+        tester.template.assertDoesNotShow()
+        tester.region.assertDoesNotShow()
+        tester.stackName.assertDoesNotShow()
+        tester.bucketName.assertDoesNotShow()
+    })
+
+    it('prompts for ECR repo if template has image-based resource', async function () {
+        const workspaceUri = vscode.workspace.workspaceFolders?.[0]?.uri || vscode.Uri.file('/')
+        const rootFolderUri = vscode.Uri.joinPath(workspaceUri, 'my')
+        const templateUri = vscode.Uri.joinPath(rootFolderUri, 'template.yaml')
+        const template = { uri: templateUri, data: createBaseImageTemplate() }
+        const tester = await createTester({
+            template,
+            paramsSource: ParamsSource.Specify,
+        })
+        tester.ecrRepoUri.assertShow()
+    })
+
+    it('skips prompt for ECR repo if template has no image-based resources', async function () {
+        const template = { uri: vscode.Uri.file('/'), data: createBaseTemplate() }
+        const tester = await createTester({ template })
+        tester.ecrRepoUri.assertDoesNotShow()
+    })
+
+    it('skips prompt for ECR repo if param source is to use samconfig', async function () {
+        const template = { uri: vscode.Uri.file('/'), data: createBaseTemplate() }
+        const tester = await createTester({ template, paramsSource: ParamsSource.SamConfig })
+        tester.ecrRepoUri.assertDoesNotShow()
+    })
+
+    it("uses the template's workspace subfolder as the project root is not set", async function () {
+        const workspaceUri = vscode.workspace.workspaceFolders?.[0]?.uri
+        assert.ok(workspaceUri)
+        const rootFolderUri = vscode.Uri.joinPath(workspaceUri, 'my')
+        assert.ok(rootFolderUri)
+
+        const templateUri = vscode.Uri.joinPath(rootFolderUri, 'template.yaml')
+        const template = { uri: templateUri, data: createBaseTemplate() }
+        const tester = await createTester({ template, projectRoot: rootFolderUri })
+        tester.projectRoot.path.assertValue(rootFolderUri.path)
+    })
+})
+
+describe('SAM SyncWizard', async () => {
+    let sandbox: sinon.SinonSandbox
+    let testFolder: TestFolder
+    let projectRoot: vscode.Uri
+    let workspaceFolder: vscode.WorkspaceFolder
+    let templateFile: vscode.Uri
+
+    let mockDefaultCFNClient: sinon.SinonStubbedInstance<CloudFormationClient>
+    let mockDefaultS3Client: sinon.SinonStubbedInstance<S3Client>
+    let registry: CloudFormationTemplateRegistry
+
+    beforeEach(async () => {
+        testFolder = await TestFolder.create()
+        projectRoot = vscode.Uri.file(testFolder.path)
+        workspaceFolder = getWorkspaceFolder(testFolder.path)
+        sandbox = sinon.createSandbox()
+
+        // Simulate return of deployed stacks
+        mockDefaultCFNClient = sandbox.createStubInstance(CloudFormationClientModule.CloudFormationClient)
+        sandbox.stub(CloudFormationClientModule, 'CloudFormationClient').returns(mockDefaultCFNClient)
+        mockDefaultCFNClient.listAllStacks.returns(intoCollection(stackSummaries))
+
+        // Simulate return of list bucket
+        mockDefaultS3Client = sandbox.createStubInstance(S3ClientModule.S3Client)
+        sandbox.stub(S3ClientModule, 'S3Client').returns(mockDefaultS3Client)
+        mockDefaultS3Client.listBucketsIterable.returns(intoCollection(s3BucketListSummary))
+
+        // generate template.yaml in temporary test folder and add to registery
+        templateFile = vscode.Uri.file(await testFolder.write('template.yaml', validTemplateData))
+        registry = await globals.templateRegistry
+        await registry.addItem(templateFile)
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+        registry.reset()
+    })
+
+    describe('entry: template file', () => {
+        it('happy path with invalid samconfig.toml', async () => {
+            /**
+             * Selection:
+             *  - template              : [Skip]     automatically set
+             *  - projectRoot           : [Skip]     automatically set
+             *
+             *  - SourceBucketName      : [Select]   prefill value
+             *  - DestinationBucketName : [Select]   prefill value
+             *
+             *  - paramsSource          : [Select]   1. ('Specify required parameters and save as defaults')
+             *  - region                : [Select]   'us-west-2'
+             *  - stackName             : [Select]   1. 'stack1'
+             *  - bucketSource          : [Select]   1.  BucketSource.SamCliManaged
+             *  - bucketName            : [Skip]     undefined
+             *  - syncFlags             : [Select]   ["--dependency-layer","--use-container","--save-params"]
+             */
+
+            // generate samconfig.toml in temporary test folder
+            await testFolder.write('samconfig.toml', samconfigInvalidData)
+
+            const prompterTester = PrompterTester.init()
+                .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-source-bucket-name')
+                })
+                .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-destination-bucket-name')
+                })
+                .handleQuickPick('Specify parameter source for sync', async (picker) => {
+                    // Need time to check samconfig.toml file and generate options
+                    await picker.untilReady()
+
+                    assert.strictEqual(picker.items.length, 2)
+                    assert.strictEqual(picker.items[0].label, 'Specify required parameters and save as defaults')
+                    assert.strictEqual(picker.items[1].label, 'Specify required parameters')
+                    picker.acceptItem(picker.items[1])
+                })
+                .handleQuickPick('Select a region', (quickPick) => {
+                    const select = quickPick.items.filter((i) => i.detail === 'us-west-2')[0]
+                    quickPick.acceptItem(select || quickPick.items[0])
+                })
+                .handleQuickPick('Select a CloudFormation Stack', async (quickPick) => {
+                    // The prompt will need some time to generate option
+                    await quickPick.untilReady()
+
+                    assert.strictEqual(quickPick.items.length, 3)
+                    assert.strictEqual(quickPick.items[0].label, 'stack1')
+                    assert.strictEqual(quickPick.items[1].label, 'stack2')
+                    assert.strictEqual(quickPick.items[2].label, 'stack3')
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .handleQuickPick('Specify S3 bucket for deployment artifacts', async (picker) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items.length, 2)
+                    assert.deepEqual(picker.items[0], {
+                        label: 'Create a SAM CLI managed S3 bucket',
+                        data: BucketSource.SamCliManaged,
+                    })
+                    assert.deepEqual(picker.items[1], {
+                        label: 'Specify an S3 bucket',
+                        data: BucketSource.UserProvided,
+                    })
+                    picker.acceptItem(picker.items[0])
+                })
+                .handleQuickPick('Specify parameters for sync', async (picker) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items.length, 9)
+                    const dependencyLayer = picker.items.filter((item) => item.label === 'Dependency layer')[0]
+                    const useContainer = picker.items.filter((item) => item.label === 'Use container')[0]
+                    const saveParam = picker.items.filter((item) => item.label === 'Save parameters')[0]
+                    picker.acceptItems(dependencyLayer, useContainer, saveParam)
+                })
+                .build()
+
+            const parameters = await (await getSyncWizard('infra', templateFile, false, false)).run()
+
+            assert(parameters)
+
+            assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath)
+            assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath)
+            assert.strictEqual(parameters.paramsSource, ParamsSource.Specify)
+            assert.strictEqual(parameters.region, 'us-west-2')
+            assert.strictEqual(parameters.stackName, 'stack1')
+            assert.strictEqual(parameters.bucketSource, BucketSource.SamCliManaged)
+            assert(!parameters.bucketName)
+            assert.strictEqual(parameters.deployType, 'infra')
+            assert.strictEqual(parameters.skipDependencyLayer, true)
+            assert.strictEqual(parameters.syncFlags, '["--dependency-layer","--use-container","--save-params"]')
+            prompterTester.assertCallAll()
+        })
+
+        it('happy path with valid samconfig.toml', async () => {
+            /**
+             * Selection:
+             *  - template              : [Skip]    automatically set
+             *  - projectRoot           : [Skip]    automatically set
+             *
+             *  - SourceBucketName      : [Select]   prefill value
+             *  - DestinationBucketName : [Select]   prefill value
+             *
+             *  - paramsSource          : [Select]  3. ('Use default values from samconfig')
+             *  - region                : [Skip]    null; will use 'us-west-2' from samconfig
+             *  - stackName             : [Skip]    null; will use 'project-1' from samconfig
+             *  - bucketSource          : [Skip]    null;
+             *  - bucketName            : [Skip]    automatically set for bucketSource option 1
+             *  - syncFlags             : [Skip]    null; will use flags from samconfig
+             */
+
+            // generate samconfig.toml in temporary test folder
+            await testFolder.write('samconfig.toml', samconfigCompleteData)
+
+            const prompterTester = PrompterTester.init()
+                .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-source-bucket-name')
+                })
+                .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-destination-bucket-name')
+                })
+                .handleQuickPick('Specify parameter source for sync', async (quickPick) => {
+                    // Need time to check samconfig.toml file and generate options
+                    await quickPick.untilReady()
+                    assert.strictEqual(quickPick.items.length, 3)
+                    assert.strictEqual(quickPick.items[0].label, 'Specify required parameters and save as defaults')
+                    assert.strictEqual(quickPick.items[1].label, 'Specify required parameters')
+                    assert.strictEqual(quickPick.items[2].label, 'Use default values from samconfig')
+                    quickPick.acceptItem(quickPick.items[2])
+                })
+                .build()
+
+            const parameters = await (await getSyncWizard('infra', templateFile, false, false)).run()
+
+            assert(parameters)
+
+            assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath)
+            assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath)
+            assert.strictEqual(parameters.paramsSource, ParamsSource.SamConfig)
+            assert(!parameters.region)
+            assert(!parameters.stackName)
+            assert.strictEqual(parameters.deployType, 'infra')
+            assert(!parameters.bucketName)
+            assert.strictEqual(parameters.skipDependencyLayer, true)
+            assert(!parameters.syncFlags)
+            prompterTester.assertCallAll()
+        })
+    })
+
+    describe('entry: appBuilder', () => {
+        let appNode: AppNode
+
+        beforeEach(async () => {
+            const expectedSamAppLocation = {
+                workspaceFolder: workspaceFolder,
+                samTemplateUri: templateFile,
+                projectRoot: projectRoot,
+            }
+            appNode = new AppNode(expectedSamAppLocation)
+        })
+
+        it('happy path with invalid samconfig.toml', async () => {
+            /**
+             * Selection:
+             *  - template              : [Skip]     automatically set
+             *  - projectRoot           : [Skip]     automatically set
+             *
+             *  - SourceBucketName      : [Select]   prefill value
+             *  - DestinationBucketName : [Select]   prefill value
+             *
+             *  - paramsSource          : [Select]   2. ('Specify required parameters')
+             *  - region                : [Select]   'us-west-2'
+             *  - stackName             : [Select]   2. 'stack2'
+             *  - bucketSource          : [Select]   2.  BucketSource.UserProvided
+             *  - bucketName            : [select]   3. stack-3-bucket
+             *  - syncFlags             : [Select]   ["--save-params"]
+             */
+
+            const prompterTester = PrompterTester.init()
+                .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-source-bucket-name')
+                })
+                .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-destination-bucket-name')
+                })
+                .handleQuickPick('Specify parameter source for sync', async (picker) => {
+                    // Need time to check samconfig.toml file and generate options
+                    await picker.untilReady()
+
+                    assert.strictEqual(picker.items.length, 2)
+                    assert.strictEqual(picker.items[0].label, 'Specify required parameters and save as defaults')
+                    assert.strictEqual(picker.items[1].label, 'Specify required parameters')
+                    picker.acceptItem(picker.items[1])
+                })
+                .handleQuickPick('Select a region', async (picker) => {
+                    await picker.untilReady()
+                    const select = picker.items.filter((i) => i.detail === 'us-west-2')[0]
+                    picker.acceptItem(select || picker.items[0])
+                })
+                .handleQuickPick('Select a CloudFormation Stack', async (picker) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items.length, 3)
+                    assert.strictEqual(picker.items[0].label, 'stack1')
+                    assert.strictEqual(picker.items[1].label, 'stack2')
+                    assert.strictEqual(picker.items[2].label, 'stack3')
+                    picker.acceptItem(picker.items[1])
+                })
+                .handleQuickPick('Specify S3 bucket for deployment artifacts', async (picker) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items.length, 2)
+                    assert.deepStrictEqual(picker.items[0], {
+                        label: 'Create a SAM CLI managed S3 bucket',
+                        data: BucketSource.SamCliManaged,
+                    })
+                    assert.deepStrictEqual(picker.items[1], {
+                        label: 'Specify an S3 bucket',
+                        data: BucketSource.UserProvided,
+                    })
+                    picker.acceptItem(picker.items[1])
+                })
+                .handleQuickPick('Select an S3 Bucket', async (picker) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items.length, 3)
+                    assert.strictEqual(picker.items[0].label, 'stack-1-bucket')
+                    assert.strictEqual(picker.items[1].label, 'stack-2-bucket')
+                    assert.strictEqual(picker.items[2].label, 'stack-3-bucket')
+                    picker.acceptItem(picker.items[2])
+                })
+                .handleQuickPick('Specify parameters for sync', async (picker) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items.length, 9)
+                    const saveParam = picker.items.filter((item) => item.label === 'Save parameters')[0]
+                    picker.acceptItems(saveParam)
+                })
+                .build()
+
+            const parameters = await (await getSyncWizard('infra', appNode, false, false)).run()
+
+            assert(parameters)
+
+            assert.strictEqual(parameters.template.uri.path, templateFile.path)
+            assert.strictEqual(parameters.projectRoot.path, projectRoot.path)
+            assert.strictEqual(parameters.paramsSource, ParamsSource.Specify)
+            assert.strictEqual(parameters.region, 'us-west-2')
+            assert.strictEqual(parameters.stackName, 'stack2')
+            assert.strictEqual(parameters.bucketSource, BucketSource.UserProvided)
+            assert.strictEqual(parameters.bucketName, 'stack-3-bucket')
+            assert.strictEqual(parameters.deployType, 'infra')
+            assert.strictEqual(parameters.skipDependencyLayer, true)
+            assert.strictEqual(parameters.syncFlags, '["--save-params"]')
+            prompterTester.assertCallAll()
+        })
+
+        it('happy path with valid samconfig.toml', async () => {
+            /**
+             * Selection:
+             *  - template              : [Skip]     automatically set
+             *  - projectRoot           : [Skip]     automatically set
+             *
+             *  - SourceBucketName      : [Select]   prefill value
+             *  - DestinationBucketName : [Select]   prefill value
+             *
+             *  - paramsSource          : [Select]  3. ('Use default values from samconfig')
+             *  - region                : [Skip]    null; will use value from samconfig file
+             *  - stackName             : [Skip]    null; will use value from samconfig file
+             *  - bucketSource          : [Skip]    null;
+             *  - bucketName            : [Skip]    null; automatically set for bucketSource option 1
+             *  - syncFlags             : [Skip]    null; will use flags from samconfig
+             */
+
+            // generate samconfig.toml in temporary test folder
+            await testFolder.write('samconfig.toml', samconfigCompleteData)
+
+            const prompterTester = PrompterTester.init()
+                .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-source-bucket-name')
+                })
+                .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-destination-bucket-name')
+                })
+                .handleQuickPick('Specify parameter source for sync', async (picker) => {
+                    // Need time to check samconfig.toml file and generate options
+                    await picker.untilReady()
+
+                    assert.strictEqual(picker.items.length, 3)
+                    assert.strictEqual(picker.items[0].label, 'Specify required parameters and save as defaults')
+                    assert.strictEqual(picker.items[1].label, 'Specify required parameters')
+                    assert.strictEqual(picker.items[2].label, 'Use default values from samconfig')
+                    picker.acceptItem(picker.items[2])
+                })
+                .build()
+
+            const parameters = await (await getSyncWizard('infra', appNode, false, false)).run()
+
+            assert(parameters)
+
+            assert.strictEqual(parameters.template.uri.path, templateFile.path)
+            assert.strictEqual(parameters.projectRoot.path, projectRoot.path)
+            assert.strictEqual(parameters.paramsSource, ParamsSource.SamConfig)
+            assert.strictEqual(parameters.deployType, 'infra')
+            assert(!parameters.region)
+            assert(!parameters.stackName)
+            assert(!parameters.bucketSource)
+            assert(!parameters.bucketName)
+            assert.strictEqual(parameters.skipDependencyLayer, true)
+            prompterTester.assertCallAll()
+        })
+    })
+
+    describe('entry: region node', () => {
+        const expectedRegionId = 'us-west-2'
+        let regionNode: RegionNode
+
+        beforeEach(async () => {
+            // Create RegionNode as entry point
+            regionNode = new RegionNode(
+                { id: expectedRegionId, name: 'US West (N. California)' },
+                createTestRegionProvider()
+            )
+        })
+
+        it('happy path with invalid samconfig.toml', async () => {
+            /**
+             * Selection:
+             *  - template              : [Select]   template/yaml set
+             *  - projectRoot           : [Skip]     automatically set
+             *
+             *  - SourceBucketName      : [Select]   prefill value
+             *  - DestinationBucketName : [Select]   prefill value
+             *
+             *  - paramsSource          : [Select]   2. ('Specify required parameters')
+             *  - region                : [Skip]     automatically set from region node 'us-west-2'
+             *  - stackName             : [Select]   2. 'stack2'
+             *  - bucketName            : [select]   2. stack-2-bucket
+             *  - syncFlags             : [Select]   ["--dependency-layer","--use-container"]
+             */
+
+            const prompterTester = PrompterTester.init()
+                .handleQuickPick('Select a SAM/CloudFormation Template', async (quickPick) => {
+                    // Need sometime to wait for the template to search for template file
+                    await quickPick.untilReady()
+                    assert.strictEqual(quickPick.items.length, 1)
+                    assert.strictEqual(quickPick.items[0].label, templateFile.fsPath)
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-source-bucket-name')
+                })
+                .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-destination-bucket-name')
+                })
+                .handleQuickPick('Specify parameter source for sync', async (picker) => {
+                    // Need time to check samconfig.toml file and generate options
+                    await picker.untilReady()
+
+                    assert.strictEqual(picker.items.length, 2)
+                    assert.strictEqual(picker.items[0].label, 'Specify required parameters and save as defaults')
+                    assert.strictEqual(picker.items[1].label, 'Specify required parameters')
+                    picker.acceptItem(picker.items[1])
+                })
+                .handleQuickPick('Select a CloudFormation Stack', async (picker) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items.length, 3)
+                    assert.strictEqual(picker.items[0].label, 'stack1')
+                    assert.strictEqual(picker.items[1].label, 'stack2')
+                    assert.strictEqual(picker.items[2].label, 'stack3')
+                    picker.acceptItem(picker.items[1])
+                })
+                .handleQuickPick('Specify S3 bucket for deployment artifacts', async (picker) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items.length, 2)
+                    assert.deepStrictEqual(picker.items[0], {
+                        label: 'Create a SAM CLI managed S3 bucket',
+                        data: BucketSource.SamCliManaged,
+                    })
+                    assert.deepStrictEqual(picker.items[1], {
+                        label: 'Specify an S3 bucket',
+                        data: BucketSource.UserProvided,
+                    })
+                    picker.acceptItem(picker.items[1])
+                })
+                .handleQuickPick('Select an S3 Bucket', async (picker) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items.length, 3)
+                    assert.strictEqual(picker.items[0].label, 'stack-1-bucket')
+                    assert.strictEqual(picker.items[1].label, 'stack-2-bucket')
+                    assert.strictEqual(picker.items[2].label, 'stack-3-bucket')
+                    picker.acceptItem(picker.items[1])
+                })
+                .handleQuickPick('Specify parameters for sync', async (picker) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items.length, 9)
+                    const dependencyLayer = picker.items.filter((item) => item.label === 'Dependency layer')[0]
+                    const useContainer = picker.items.filter((item) => item.label === 'Use container')[0]
+                    picker.acceptItems(dependencyLayer, useContainer)
+                })
+                .build()
+
+            const parameters = await (await getSyncWizard('infra', regionNode, false, false)).run()
+
+            assert(parameters)
+
+            assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath)
+            assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath)
+            assert.strictEqual(parameters.paramsSource, ParamsSource.Specify)
+            assert.strictEqual(parameters.region, 'us-west-2')
+            assert.strictEqual(parameters.stackName, 'stack2')
+            assert.strictEqual(parameters.bucketSource, BucketSource.UserProvided)
+            assert.strictEqual(parameters.bucketName, 'stack-2-bucket')
+            assert.strictEqual(parameters.deployType, 'infra')
+            assert.strictEqual(parameters.skipDependencyLayer, true)
+            assert.strictEqual(parameters.syncFlags, '["--dependency-layer","--use-container"]')
+            prompterTester.assertCallAll()
+        })
+
+        it('happy path with valid samconfig.toml', async () => {
+            /**
+             * Selection:
+             *  - template              : [Select]  template.yaml
+             *  - projectRoot           : [Skip]     automatically set
+             *  - paramsSource          : [Select]  3. ('Use default values from samconfig')
+             *  - region                : [Skip]    automatically set from region node 'us-west-2'
+             *  - stackName             : [Skip]    null; will use value from samconfig file
+             *  - bucketName            : [Skip]    automatically set for bucketSource option 1
+             *  - syncFlags             : [Skip]    null; will use flags from samconfig
+             */
+
+            // generate samconfig.toml in temporary test folder
+            await testFolder.write('samconfig.toml', samconfigCompleteData)
+
+            const prompterTester = PrompterTester.init()
+                .handleQuickPick('Select a SAM/CloudFormation Template', async (quickPick) => {
+                    // Need sometime to wait for the template to search for template file
+                    await quickPick.untilReady()
+                    assert.strictEqual(quickPick.items.length, 1)
+                    assert.strictEqual(quickPick.items[0].label, templateFile.fsPath)
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-source-bucket-name')
+                })
+                .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-destination-bucket-name')
+                })
+                .handleQuickPick('Specify parameter source for sync', async (picker) => {
+                    // Need time to check samconfig.toml file and generate options
+                    await picker.untilReady()
+
+                    assert.strictEqual(picker.items.length, 3)
+                    assert.strictEqual(picker.items[0].label, 'Specify required parameters and save as defaults')
+                    assert.strictEqual(picker.items[1].label, 'Specify required parameters')
+                    assert.strictEqual(picker.items[2].label, 'Use default values from samconfig')
+                    picker.acceptItem(picker.items[2])
+                })
+                .build()
+
+            const parameters = await (await getSyncWizard('infra', regionNode, false, false)).run()
+
+            assert(parameters)
+
+            assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath)
+            assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath)
+            assert.strictEqual(parameters.paramsSource, ParamsSource.SamConfig)
+            assert.strictEqual(parameters.deployType, 'infra')
+            assert.strictEqual(parameters.region, 'us-west-2')
+            assert(!parameters.stackName)
+            assert(!parameters.bucketSource)
+            assert.strictEqual(parameters.skipDependencyLayer, true)
+            prompterTester.assertCallAll()
+        })
+    })
+
+    describe('entry: samconfig file context menu', () => {
+        it('sad path with invalid samconfig.toml should throw parsing config file error', async () => {
+            // generate samconfig.toml in temporary test folder
+            const samconfigFile = vscode.Uri.file(await testFolder.write('samconfig.toml', samconfigInvalidData))
+            try {
+                await (await getSyncWizard('infra', samconfigFile, false, false)).run()
+            } catch (error: any) {
+                assert.strictEqual(error.code, 'samConfigParseError')
+            }
+        })
+
+        it('happy path with valid samconfig.toml', async () => {
+            // generate samconfig.toml in temporary test folder
+            const samconfigFile = vscode.Uri.file(await testFolder.write('samconfig.toml', samconfigCompleteData))
+            const prompterTester = PrompterTester.init()
+                .handleQuickPick('Select a SAM/CloudFormation Template', async (quickPick) => {
+                    // Need sometime to wait for the template to search for template file
+                    await quickPick.untilReady()
+                    assert.strictEqual(quickPick.items.length, 1)
+                    assert.strictEqual(quickPick.items[0].label, templateFile.fsPath)
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-source-bucket-name')
+                })
+                .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-destination-bucket-name')
+                })
+                .handleQuickPick('Specify parameter source for sync', async (picker) => {
+                    // Need time to check samconfig.toml file and generate options
+                    await picker.untilReady()
+
+                    assert.strictEqual(picker.items.length, 3)
+                    assert.strictEqual(picker.items[0].label, 'Specify required parameters and save as defaults')
+                    assert.strictEqual(picker.items[1].label, 'Specify required parameters')
+                    assert.strictEqual(picker.items[2].label, 'Use default values from samconfig')
+                    picker.acceptItem(picker.items[2])
+                })
+                .build()
+
+            const parameters = await (await getSyncWizard('infra', samconfigFile, false, false)).run()
+            assert(parameters)
+            assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath)
+            assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath)
+            assert.strictEqual(parameters.paramsSource, ParamsSource.SamConfig)
+            assert.strictEqual(parameters.region, 'us-west-2')
+            assert.strictEqual(parameters.stackName, 'project-1')
+            assert.strictEqual(parameters.deployType, 'infra')
+            assert.strictEqual(parameters.bucketName, 'aws-sam-cli-managed-default-samclisourcebucket-lftqponsaxsr')
+            assert.strictEqual(parameters.skipDependencyLayer, true)
+            assert(!parameters.syncFlags)
+            prompterTester.assertCallAll()
+        })
+
+        it('happy path with empty samconfig.toml', async () => {
+            // generate samconfig.toml in temporary test folder
+            const samconfigFile = vscode.Uri.file(await testFolder.write('samconfig.toml', ''))
+            /**
+             * Selection:
+             *  - template              : [Skip]     automatically set
+             *  - projectRoot           : [Skip]     automatically set
+             *
+             *  - SourceBucketName      : [Select]   prefill value
+             *  - DestinationBucketName : [Select]   prefill value
+             *
+             *  - paramsSource          : [Select]   1. ('Specify required parameters and save as defaults')
+             *  - region                : [Select]   'us-west-2'
+             *  - stackName             : [Select]   2. 'stack2'
+             *  - bucketName            : [select]   2. stack-2-bucket
+             *  - syncFlags             : [Select]   ["--dependency-layer","--use-container","--watch"]
+             */
+
+            const prompterTester = PrompterTester.init()
+                .handleQuickPick('Select a SAM/CloudFormation Template', async (quickPick) => {
+                    // Need sometime to wait for the template to search for template file
+                    await quickPick.untilReady()
+                    assert.strictEqual(quickPick.items.length, 1)
+                    assert.strictEqual(quickPick.items[0].label, templateFile.fsPath)
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-source-bucket-name')
+                })
+                .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-destination-bucket-name')
+                })
+                .handleQuickPick('Specify parameter source for sync', async (picker) => {
+                    // Need time to check samconfig.toml file and generate options
+                    await picker.untilReady()
+
+                    assert.strictEqual(picker.items.length, 2)
+                    assert.strictEqual(picker.items[0].label, 'Specify required parameters and save as defaults')
+                    assert.strictEqual(picker.items[1].label, 'Specify required parameters')
+                    picker.acceptItem(picker.items[1])
+                })
+                .handleQuickPick('Select a CloudFormation Stack', async (picker) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items.length, 3)
+                    assert.strictEqual(picker.items[0].label, 'stack1')
+                    assert.strictEqual(picker.items[1].label, 'stack2')
+                    assert.strictEqual(picker.items[2].label, 'stack3')
+                    picker.acceptItem(picker.items[1])
+                })
+                .handleQuickPick('Select a region', (quickPick) => {
+                    const select = quickPick.items.filter((i) => i.detail === 'us-west-2')[0]
+                    quickPick.acceptItem(select || quickPick.items[0])
+                })
+                .handleQuickPick('Specify S3 bucket for deployment artifacts', async (picker) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items.length, 2)
+                    assert.deepStrictEqual(picker.items[0], {
+                        label: 'Create a SAM CLI managed S3 bucket',
+                        data: BucketSource.SamCliManaged,
+                    })
+                    assert.deepStrictEqual(picker.items[1], {
+                        label: 'Specify an S3 bucket',
+                        data: BucketSource.UserProvided,
+                    })
+                    picker.acceptItem(picker.items[1])
+                })
+                .handleQuickPick('Select an S3 Bucket', async (picker) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items.length, 3)
+                    assert.strictEqual(picker.items[0].label, 'stack-1-bucket')
+                    assert.strictEqual(picker.items[1].label, 'stack-2-bucket')
+                    assert.strictEqual(picker.items[2].label, 'stack-3-bucket')
+                    picker.acceptItem(picker.items[1])
+                })
+                .handleQuickPick('Specify parameters for sync', async (picker) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items.length, 9)
+                    const dependencyLayer = picker.items.filter((item) => item.label === 'Dependency layer')[0]
+                    const useContainer = picker.items.filter((item) => item.label === 'Use container')[0]
+                    const watch = picker.items.filter((item) => item.label === 'Watch')[0]
+                    picker.acceptItems(dependencyLayer, useContainer, watch)
+                })
+                .build()
+
+            const parameters = await (await getSyncWizard('infra', samconfigFile, false, false)).run()
+            assert(parameters)
+            assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath)
+            assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath)
+            assert.strictEqual(parameters.paramsSource, ParamsSource.Specify)
+            assert.strictEqual(parameters.region, 'us-west-2')
+            assert.strictEqual(parameters.stackName, 'stack2')
+            assert.strictEqual(parameters.bucketSource, BucketSource.UserProvided)
+            assert.strictEqual(parameters.bucketName, 'stack-2-bucket')
+            assert.strictEqual(parameters.deployType, 'infra')
+            assert.strictEqual(parameters.skipDependencyLayer, true)
+            assert.strictEqual(parameters.syncFlags, '["--dependency-layer","--use-container","--watch"]')
+            prompterTester.assertCallAll()
+        })
+
+        it('happy path with empty samconfig.toml with backward click', async () => {
+            // generate samconfig.toml in temporary test folder
+            const samconfigFile = vscode.Uri.file(await testFolder.write('samconfig.toml', ''))
+
+            const prompterTester = PrompterTester.init({ handlerTimeout: 300000 })
+                .handleQuickPick('Select a SAM/CloudFormation Template', async (quickPick) => {
+                    // Need sometime to wait for the template to search for template file
+                    // 1st
+                    await quickPick.untilReady()
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .handleInputBox('Specify SAM Template parameter value for SourceBucketName', async (inputBox) => {
+                    // 2nd
+                    // 6th
+                    await inputBox.untilReady()
+                    inputBox.acceptValue('my-source-bucket-name')
+                })
+                .handleInputBox(
+                    'Specify SAM Template parameter value for DestinationBucketName',
+                    (() => {
+                        return createPromptHandler({
+                            // 3rd
+                            // 7th
+                            // 9th
+                            default: async (input: TestInputBox) => {
+                                await input.untilReady()
+                                input.acceptValue('my-destination-bucket-name')
+                            },
+                            numbered: [
+                                {
+                                    // 5th
+                                    order: [2],
+                                    handler: clickBackButton,
+                                },
+                            ],
+                        })
+                    })()
+                )
+                .handleQuickPick(
+                    'Specify parameter source for sync',
+                    (() => {
+                        return createPromptHandler({
+                            // 10th
+                            default: async (picker: TestQuickPick) => {
+                                await picker.untilReady()
+                                picker.acceptItem(picker.items[1])
+                            },
+                            numbered: [
+                                {
+                                    // 4th
+                                    // 8th
+                                    order: [1, 2],
+                                    handler: clickBackButton,
+                                },
+                            ],
+                        })
+                    })()
+                )
+                .handleQuickPick('Select a region', (quickPick) => {
+                    // 11th
+                    const select = quickPick.items.filter((i) => i.detail === 'us-west-2')[0]
+                    quickPick.acceptItem(select || quickPick.items[0])
+                })
+                .handleQuickPick('Select a CloudFormation Stack', async (quickPick) => {
+                    await quickPick.untilReady()
+                    assert.strictEqual(quickPick.items[1].label, 'stack2')
+                    quickPick.acceptItem(quickPick.items[1])
+                })
+                .handleQuickPick('Specify S3 bucket for deployment artifacts', async (picker) => {
+                    await picker.untilReady()
+                    picker.acceptItem(picker.items[1])
+                })
+                .handleQuickPick('Select an S3 Bucket', async (picker) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items[1].label, 'stack-2-bucket')
+                    picker.acceptItem(picker.items[1])
+                })
+                .handleQuickPick('Specify parameters for sync', async (picker) => {
+                    await picker.untilReady()
+                    const dependencyLayer = picker.items.filter((item) => item.label === 'Dependency layer')[0]
+                    const useContainer = picker.items.filter((item) => item.label === 'Use container')[0]
+                    const watch = picker.items.filter((item) => item.label === 'Watch')[0]
+                    picker.acceptItems(dependencyLayer, useContainer, watch)
+                })
+                .build()
+
+            const parameters = await (await getSyncWizard('infra', samconfigFile, false, false)).run()
+            assert(parameters)
+            assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath)
+            assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath)
+            assert.strictEqual(parameters.paramsSource, ParamsSource.Specify)
+            assert.strictEqual(parameters.region, 'us-west-2')
+            assert.strictEqual(parameters.stackName, 'stack2')
+            assert.strictEqual(parameters.bucketSource, BucketSource.UserProvided)
+            assert.strictEqual(parameters.bucketName, 'stack-2-bucket')
+            assert.strictEqual(parameters.deployType, 'infra')
+            assert.strictEqual(parameters.skipDependencyLayer, true)
+            assert.strictEqual(parameters.syncFlags, '["--dependency-layer","--use-container","--watch"]')
+            prompterTester.assertCallAll()
+            const expectedCallOrder = [
+                'Select a SAM/CloudFormation Template',
+                'Specify SAM Template parameter value for SourceBucketName',
+                'Specify SAM Template parameter value for DestinationBucketName',
+                'Specify parameter source for sync',
+                'Specify SAM Template parameter value for DestinationBucketName',
+                'Specify SAM Template parameter value for SourceBucketName',
+                'Specify SAM Template parameter value for DestinationBucketName',
+                'Specify parameter source for sync',
+                'Specify SAM Template parameter value for DestinationBucketName',
+                'Specify parameter source for sync',
+                'Select a region',
+                'Select a CloudFormation Stack',
+                'Specify S3 bucket for deployment artifacts',
+                'Select an S3 Bucket',
+                'Specify parameters for sync',
+            ]
+            for (const [index, title] of expectedCallOrder.entries()) {
+                prompterTester.assertCallOrder(title, index + 1)
+            }
+        })
+
+        describe('entry: command palette', () => {
+            it('happy path with invalid samconfig.toml', async () => {
+                /**
+                 * Selection:
+                 *  - template              : [Select]   template/yaml set
+                 *  - projectRoot           : [Skip]     automatically set
+                 *
+                 *  - SourceBucketName      : [Select]   prefill value
+                 *  - DestinationBucketName : [Select]   prefill value
+                 *
+                 *  - paramsSource          : [Select]   1. ('Specify required parameters and save as defaults')
+                 *  - region                : [Select]   'us-west-2'
+                 *  - stackName             : [Select]   3. 'stack3'
+                 *  - bucketName            : [select]   3. stack-3-bucket
+                 *  - syncFlags             : [Select]   all
+                 */
+
+                const prompterTester = PrompterTester.init()
+                    .handleQuickPick('Select a SAM/CloudFormation Template', async (quickPick) => {
+                        // Need sometime to wait for the template to search for template file
+                        await quickPick.untilReady()
+                        assert.strictEqual(quickPick.items.length, 1)
+                        assert.strictEqual(quickPick.items[0].label, templateFile.fsPath)
+                        quickPick.acceptItem(quickPick.items[0])
+                    })
+                    .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => {
+                        inputBox.acceptValue('my-source-bucket-name')
+                    })
+                    .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => {
+                        inputBox.acceptValue('my-destination-bucket-name')
+                    })
+                    .handleQuickPick('Specify parameter source for sync', async (picker) => {
+                        // Need time to check samconfig.toml file and generate options
+                        await picker.untilReady()
+
+                        assert.strictEqual(picker.items.length, 2)
+                        assert.strictEqual(picker.items[0].label, 'Specify required parameters and save as defaults')
+                        assert.strictEqual(picker.items[1].label, 'Specify required parameters')
+                        picker.acceptItem(picker.items[0])
+                    })
+                    .handleQuickPick('Select a region', (quickPick) => {
+                        const select = quickPick.items.filter((i) => i.detail === 'us-west-2')[0]
+                        quickPick.acceptItem(select || quickPick.items[0])
+                    })
+                    .handleQuickPick('Select a CloudFormation Stack', async (picker) => {
+                        await picker.untilReady()
+                        assert.strictEqual(picker.items.length, 3)
+                        assert.strictEqual(picker.items[0].label, 'stack1')
+                        assert.strictEqual(picker.items[1].label, 'stack2')
+                        assert.strictEqual(picker.items[2].label, 'stack3')
+                        picker.acceptItem(picker.items[2])
+                    })
+                    .handleQuickPick('Specify S3 bucket for deployment artifacts', async (picker) => {
+                        await picker.untilReady()
+                        assert.strictEqual(picker.items.length, 2)
+                        assert.deepStrictEqual(picker.items[0], {
+                            label: 'Create a SAM CLI managed S3 bucket',
+                            data: BucketSource.SamCliManaged,
+                        })
+                        assert.deepStrictEqual(picker.items[1], {
+                            label: 'Specify an S3 bucket',
+                            data: BucketSource.UserProvided,
+                        })
+                        picker.acceptItem(picker.items[0])
+                    })
+                    .handleQuickPick('Specify parameters for sync', async (picker) => {
+                        await picker.untilReady()
+                        assert.strictEqual(picker.items.length, 9)
+                        const dependencyLayer = picker.items.filter((item) => item.label === 'Dependency layer')[0]
+                        const useContainer = picker.items.filter((item) => item.label === 'Use container')[0]
+                        picker.acceptItems(dependencyLayer, useContainer)
+                    })
+                    .build()
+
+                const parameters = await (await getSyncWizard('infra', undefined, false, false)).run()
+
+                assert(parameters)
+
+                assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath)
+                assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath)
+                assert.strictEqual(parameters.paramsSource, ParamsSource.SpecifyAndSave)
+                assert.strictEqual(parameters.region, 'us-west-2')
+                assert.strictEqual(parameters.stackName, 'stack3')
+                assert.strictEqual(parameters.bucketSource, BucketSource.SamCliManaged)
+                assert(!parameters.bucketName)
+                assert.strictEqual(parameters.deployType, 'infra')
+                assert.strictEqual(parameters.skipDependencyLayer, true)
+                assert.strictEqual(parameters.syncFlags, '["--dependency-layer","--use-container"]')
+                prompterTester.assertCallAll()
+            })
+
+            it('happy path with valid samconfig.toml', async () => {
+                /**
+                 * Selection:
+                 *  - template              : [Select]  template.yaml
+                 *  - projectRoot           : [Skip]     automatically set
+                 *
+                 *  - SourceBucketName      : [Select]   prefill value
+                 *  - DestinationBucketName : [Select]   prefill value
+                 *
+                 *  - paramsSource          : [Select]  3. ('Use default values from samconfig')
+                 *  - region                : [Skip]    automatically set from region node 'us-west-2'
+                 *  - stackName             : [Skip]    null; will use value from samconfig file
+                 *  - bucketName            : [Skip]    automatically set for bucketSource option 1
+                 *  - syncFlags             : [Skip]    null; will use flags from samconfig
+                 */
+
+                // generate samconfig.toml in temporary test folder
+                await testFolder.write('samconfig.toml', samconfigCompleteData)
+
+                const prompterTester = PrompterTester.init()
+                    .handleQuickPick('Select a SAM/CloudFormation Template', async (quickPick) => {
+                        // Need sometime to wait for the template to search for template file
+                        await quickPick.untilReady()
+                        assert.strictEqual(quickPick.items.length, 1)
+                        assert.strictEqual(quickPick.items[0].label, templateFile.fsPath)
+                        quickPick.acceptItem(quickPick.items[0])
+                    })
+                    .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => {
+                        inputBox.acceptValue('my-source-bucket-name')
+                    })
+                    .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => {
+                        inputBox.acceptValue('my-destination-bucket-name')
+                    })
+                    .handleQuickPick('Specify parameter source for sync', async (picker) => {
+                        // Need time to check samconfig.toml file and generate options
+                        await picker.untilReady()
+
+                        assert.strictEqual(picker.items.length, 3)
+                        assert.strictEqual(picker.items[0].label, 'Specify required parameters and save as defaults')
+                        assert.strictEqual(picker.items[1].label, 'Specify required parameters')
+                        assert.strictEqual(picker.items[2].label, 'Use default values from samconfig')
+                        picker.acceptItem(picker.items[2])
+                    })
+                    .build()
+
+                const parameters = await (await getSyncWizard('infra', undefined, false, false)).run()
+
+                assert(parameters)
+
+                assert.strictEqual(parameters.template.uri.fsPath, templateFile.fsPath)
+                assert.strictEqual(parameters.projectRoot.fsPath, projectRoot.fsPath)
+                assert.strictEqual(parameters.paramsSource, ParamsSource.SamConfig)
+                assert.strictEqual(parameters.deployType, 'infra')
+                assert(!parameters.region)
+                assert(!parameters.stackName)
+                assert(!parameters.bucketSource)
+                assert(!parameters.syncFlags)
+                assert.strictEqual(parameters.skipDependencyLayer, true)
+                prompterTester.assertCallAll()
+            })
+        })
+    })
+})
+describe('SAM runSync', () => {
+    let sandbox: sinon.SinonSandbox
+    let testFolder: TestFolder
+    let projectRoot: vscode.Uri
+    let workspaceFolder: vscode.WorkspaceFolder
+    let templateFile: vscode.Uri
+
+    let mockGetSpawnEnv: sinon.SinonStub
+    let mockGetSamCliPath: sinon.SinonStub
+    let mockChildProcessClass: sinon.SinonStub
+    let mockSamSyncChildProcess: sinon.SinonStub
+
+    let spyWriteSamconfigGlobal: sinon.SinonSpy
+    let spyRunInterminal: sinon.SinonSpy
+
+    let mockDefaultCFNClient: sinon.SinonStubbedInstance<CloudFormationClient>
+    let mockDefaultS3Client: sinon.SinonStubbedInstance<S3Client>
+    let registry: CloudFormationTemplateRegistry
+
+    // Dependency clients
+    beforeEach(async function () {
+        testFolder = await TestFolder.create()
+        projectRoot = vscode.Uri.file(testFolder.path)
+        workspaceFolder = getWorkspaceFolder(testFolder.path)
+        sandbox = sinon.createSandbox()
+        registry = await globals.templateRegistry
+
+        // Create template.yaml in temporary test folder and add to registery
+        templateFile = vscode.Uri.file(await testFolder.write('template.yaml', validTemplateData))
+
+        await registry.addItem(templateFile)
+
+        // Simulate return of deployed stacks
+        mockDefaultCFNClient = sandbox.createStubInstance(CloudFormationClientModule.CloudFormationClient)
+        sandbox.stub(CloudFormationClientModule, 'CloudFormationClient').returns(mockDefaultCFNClient)
+        mockDefaultCFNClient.listAllStacks.returns(intoCollection(stackSummaries))
+
+        // Simulate return of list bucket
+        mockDefaultS3Client = sandbox.createStubInstance(S3ClientModule.S3Client)
+        sandbox.stub(S3ClientModule, 'S3Client').returns(mockDefaultS3Client)
+        mockDefaultS3Client.listBucketsIterable.returns(intoCollection(s3BucketListSummary))
+
+        // Create Spy for validation
+        spyWriteSamconfigGlobal = sandbox.spy(SamConfigModule, 'writeSamconfigGlobal')
+        spyRunInterminal = sandbox.spy(ProcessTerminalUtils, 'runInTerminal')
+
+        // generate template.yaml in temporary test folder and add to registery
+        templateFile = vscode.Uri.file(await testFolder.write('template.yaml', validTemplateData))
+        await (await globals.templateRegistry).addItem(templateFile)
+
+        mockGetSpawnEnv = sandbox.stub(ResolveEnvModule, 'getSpawnEnv').callsFake(
+            sandbox.stub().resolves({
+                AWS_TOOLING_USER_AGENT: 'AWS-Toolkit-For-VSCode/testPluginVersion',
+                SAM_CLI_TELEMETRY: '0',
+            })
+        )
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+        registry.reset()
+    })
+
+    describe(':) path', () => {
+        beforeEach(() => {
+            mockGetSamCliPath = sandbox
+                .stub(SamUtilsModule, 'getSamCliPathAndVersion')
+                .callsFake(sandbox.stub().resolves({ path: 'sam-cli-path' }))
+
+            // Confirm confirmDevStack message
+            // getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'OK')?.select())
+            getTestWindow().onDidShowMessage((message) => {
+                message.selectItem("OK, and don't show this again")
+            })
+
+            // Mock  child process with required properties that get called in ProcessTerminal
+            mockSamSyncChildProcess = Object.create(ProcessUtilsModule.ChildProcess.prototype, {
+                stopped: { get: sandbox.stub().returns(false) },
+                stop: { value: sandbox.stub().resolves({}) },
+                run: {
+                    value: sandbox.stub().resolves({
+                        exitCode: 0,
+                        stdout: 'Mock successful sync command execution ',
+                        stderr: '',
+                    }),
+                },
+            })
+            mockChildProcessClass = sandbox.stub(ProcessUtilsModule, 'ChildProcess').returns(mockSamSyncChildProcess)
+        })
+
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        it('[entry: command palette] specify and save flag should instantiate correct process in terminal', async () => {
+            const prompterTester = PrompterTester.init()
+                .handleQuickPick('Select a SAM/CloudFormation Template', async (quickPick) => {
+                    // Need sometime to wait for the template to search for template file
+                    await quickPick.untilReady()
+                    assert.strictEqual(quickPick.items[0].label, templateFile.fsPath)
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-source-bucket-name')
+                })
+                .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-destination-bucket-name')
+                })
+                .handleQuickPick('Specify parameter source for sync', async (picker) => {
+                    // Need time to check samconfig.toml file and generate options
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items[0].label, 'Specify required parameters and save as defaults')
+                    picker.acceptItem(picker.items[0])
+                })
+                .handleQuickPick('Select a region', (quickPick) => {
+                    const select = quickPick.items.filter((i) => i.detail === 'us-west-2')[0]
+                    quickPick.acceptItem(select || quickPick.items[0])
+                })
+                .handleQuickPick('Select a CloudFormation Stack', async (picker) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items[2].label, 'stack3')
+                    picker.acceptItem(picker.items[2])
+                })
+                .handleQuickPick('Specify S3 bucket for deployment artifacts', async (picker) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items.length, 2)
+                    assert.strictEqual(picker.items[1].label, 'Specify an S3 bucket')
+                    picker.acceptItem(picker.items[1])
+                })
+                .handleQuickPick('Select an S3 Bucket', async (picker) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items.length, 3)
+                    assert.strictEqual(picker.items[2].label, 'stack-3-bucket')
+                    picker.acceptItem(picker.items[2])
+                })
+                .handleQuickPick('Specify parameters for sync', async (picker) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items.length, 9)
+                    const dependencyLayer = picker.items.filter((item) => item.label === 'Dependency layer')[0]
+                    const useContainer = picker.items.filter((item) => item.label === 'Use container')[0]
+                    picker.acceptItems(dependencyLayer, useContainer)
+                })
+                .build()
+
+            // Invoke sync command from command palette
+            await runSync('code', undefined)
+
+            assert(mockGetSamCliPath.calledOnce)
+            assert(mockChildProcessClass.calledOnce)
+            assert.deepEqual(mockChildProcessClass.getCall(0).args, [
+                'sam-cli-path',
+                [
+                    'sync',
+                    '--code',
+                    '--template',
+                    `${templateFile.fsPath}`,
+                    '--s3-bucket',
+                    'stack-3-bucket',
+                    '--stack-name',
+                    'stack3',
+                    '--region',
+                    'us-west-2',
+                    '--no-dependency-layer',
+                    '--save-params',
+                    '--parameter-overrides',
+                    'ParameterKey=SourceBucketName,ParameterValue=my-source-bucket-name ParameterKey=DestinationBucketName,ParameterValue=my-destination-bucket-name',
+                    '--dependency-layer',
+                    '--use-container',
+                ],
+                {
+                    spawnOptions: {
+                        cwd: projectRoot?.fsPath,
+                        env: {
+                            AWS_TOOLING_USER_AGENT: 'AWS-Toolkit-For-VSCode/testPluginVersion',
+                            SAM_CLI_TELEMETRY: '0',
+                        },
+                    },
+                },
+            ])
+            assert(mockGetSpawnEnv.calledOnce)
+            assert(spyRunInterminal.calledOnce)
+            assert.deepEqual(spyRunInterminal.getCall(0).args, [mockSamSyncChildProcess, 'sync'])
+            assert(spyWriteSamconfigGlobal.calledOnce)
+            // Check telementry
+            assertTelemetry('sam_sync', { result: 'Succeeded', source: undefined })
+            assertTelemetryCurried('sam_sync')({
+                syncedResources: 'CodeOnly',
+                source: undefined,
+            })
+            prompterTester.assertCallAll()
+        })
+
+        it('[entry: command palette] specify and save flag (with --watch) should save params before starting SAM process', async () => {
+            const prompterTester = PrompterTester.init()
+                .handleQuickPick('Select a SAM/CloudFormation Template', async (quickPick) => {
+                    // Need sometime to wait for the template to search for template file
+                    await quickPick.untilReady()
+                    assert.strictEqual(quickPick.items[0].label, templateFile.fsPath)
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-source-bucket-name')
+                })
+                .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-destination-bucket-name')
+                })
+                .handleQuickPick('Specify parameter source for sync', async (picker) => {
+                    // Need time to check samconfig.toml file and generate options
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items[0].label, 'Specify required parameters and save as defaults')
+                    picker.acceptItem(picker.items[0])
+                })
+                .handleQuickPick('Select a region', (quickPick) => {
+                    const select = quickPick.items.filter((i) => i.detail === 'us-west-2')[0]
+                    quickPick.acceptItem(select || quickPick.items[0])
+                })
+                .handleQuickPick('Select a CloudFormation Stack', async (picker) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items[2].label, 'stack3')
+                    picker.acceptItem(picker.items[2])
+                })
+                .handleQuickPick('Specify S3 bucket for deployment artifacts', async (picker) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items.length, 2)
+                    assert.strictEqual(picker.items[0].label, 'Create a SAM CLI managed S3 bucket')
+                    picker.acceptItem(picker.items[0])
+                })
+                .handleQuickPick('Specify parameters for sync', async (picker) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items.length, 9)
+                    const dependencyLayer = picker.items.filter((item) => item.label === 'Dependency layer')[0]
+                    const useContainer = picker.items.filter((item) => item.label === 'Use container')[0]
+                    const watch = picker.items.filter((item) => item.label === 'Watch')[0]
+                    picker.acceptItems(dependencyLayer, useContainer, watch)
+                })
+                .build()
+
+            // Invoke sync command from command palette
+            await runSync('code', undefined)
+
+            assert(mockGetSamCliPath.calledOnce)
+            assert(mockChildProcessClass.calledOnce)
+            assert.deepEqual(mockChildProcessClass.getCall(0).args, [
+                'sam-cli-path',
+                [
+                    'sync',
+                    '--code',
+                    '--template',
+                    `${templateFile.fsPath}`,
+                    '--stack-name',
+                    'stack3',
+                    '--region',
+                    'us-west-2',
+                    '--no-dependency-layer',
+                    '--save-params',
+                    '--parameter-overrides',
+                    'ParameterKey=SourceBucketName,ParameterValue=my-source-bucket-name ParameterKey=DestinationBucketName,ParameterValue=my-destination-bucket-name',
+                    '--dependency-layer',
+                    '--use-container',
+                    '--watch',
+                ],
+                {
+                    spawnOptions: {
+                        cwd: projectRoot?.fsPath,
+                        env: {
+                            AWS_TOOLING_USER_AGENT: 'AWS-Toolkit-For-VSCode/testPluginVersion',
+                            SAM_CLI_TELEMETRY: '0',
+                        },
+                    },
+                },
+            ])
+            assert(mockGetSpawnEnv.calledOnce)
+            assert(spyRunInterminal.calledOnce)
+            assert.deepEqual(spyRunInterminal.getCall(0).args, [mockSamSyncChildProcess, 'sync'])
+            assert.strictEqual(spyWriteSamconfigGlobal.callCount, 2)
+            assert(spyWriteSamconfigGlobal.calledBefore(spyRunInterminal))
+            // Check telementry
+            assertTelemetry('sam_sync', { result: 'Succeeded', source: undefined })
+            assertTelemetryCurried('sam_sync')({
+                syncedResources: 'CodeOnly',
+                source: undefined,
+            })
+            prompterTester.assertCallAll()
+        })
+
+        it('[entry: template file] specify flag should instantiate correct process in terminal', async () => {
+            const prompterTester = PrompterTester.init()
+                .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-source-bucket-name')
+                })
+                .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-destination-bucket-name')
+                })
+                .handleQuickPick('Specify parameter source for sync', async (picker) => {
+                    // Need time to check samconfig.toml file and generate options
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items[1].label, 'Specify required parameters')
+                    picker.acceptItem(picker.items[1])
+                })
+                .handleQuickPick('Select a region', (quickPick) => {
+                    const select = quickPick.items.filter((i) => i.detail === 'us-west-2')[0]
+                    quickPick.acceptItem(select || quickPick.items[0])
+                })
+                .handleQuickPick('Select a CloudFormation Stack', async (quickPick) => {
+                    // The prompt will need some time to generate option
+                    await quickPick.untilReady()
+                    assert.strictEqual(quickPick.items[0].label, 'stack1')
+                    quickPick.acceptItem(quickPick.items[0])
+                })
+                .handleQuickPick('Specify S3 bucket for deployment artifacts', async (picker) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items.length, 2)
+                    assert.strictEqual(picker.items[1].label, 'Specify an S3 bucket')
+                    picker.acceptItem(picker.items[1])
+                })
+                .handleQuickPick('Select an S3 Bucket', async (picker) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items[0].label, 'stack-1-bucket')
+                    picker.acceptItem(picker.items[0])
+                })
+                .handleQuickPick('Specify parameters for sync', async (picker) => {
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items.length, 9)
+                    const dependencyLayer = picker.items.filter((item) => item.label === 'Dependency layer')[0]
+                    const useContainer = picker.items.filter((item) => item.label === 'Use container')[0]
+                    picker.acceptItems(dependencyLayer, useContainer)
+                })
+                .build()
+
+            await runSync('infra', templateFile)
+
+            assert(mockGetSamCliPath.calledOnce)
+            assert(mockChildProcessClass.calledOnce)
+            assert.deepEqual(mockChildProcessClass.getCall(0).args, [
+                'sam-cli-path',
+                [
+                    'sync',
+                    '--template',
+                    `${templateFile.fsPath}`,
+                    '--s3-bucket',
+                    'stack-1-bucket',
+                    '--stack-name',
+                    'stack1',
+                    '--region',
+                    'us-west-2',
+                    '--no-dependency-layer',
+                    '--parameter-overrides',
+                    'ParameterKey=SourceBucketName,ParameterValue=my-source-bucket-name ParameterKey=DestinationBucketName,ParameterValue=my-destination-bucket-name',
+                    '--dependency-layer',
+                    '--use-container',
+                ],
+                {
+                    spawnOptions: {
+                        cwd: projectRoot?.fsPath,
+                        env: {
+                            AWS_TOOLING_USER_AGENT: 'AWS-Toolkit-For-VSCode/testPluginVersion',
+                            SAM_CLI_TELEMETRY: '0',
+                        },
+                    },
+                },
+            ])
+            assert(mockGetSpawnEnv.calledOnce)
+            assert(spyRunInterminal.calledOnce)
+            assert.deepEqual(spyRunInterminal.getCall(0).args, [mockSamSyncChildProcess, 'sync'])
+            assert(spyWriteSamconfigGlobal.calledOnce)
+
+            // Check telementry
+            assertTelemetry('sam_sync', { result: 'Succeeded', source: 'template' })
+            assertTelemetryCurried('sam_sync')({
+                syncedResources: 'AllResources',
+                source: 'template',
+            })
+            prompterTester.assertCallAll()
+        })
+
+        it('[entry: appBuilder] use samconfig should instantiate correct process in terminal', async () => {
+            const expectedSamAppLocation = {
+                workspaceFolder: workspaceFolder,
+                samTemplateUri: templateFile,
+                projectRoot: projectRoot,
+            }
+            const appNode = new AppNode(expectedSamAppLocation)
+            const samconfigFile = vscode.Uri.file(await testFolder.write('samconfig.toml', samconfigCompleteData))
+
+            const prompterTester = PrompterTester.init()
+                .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-source-bucket-name')
+                })
+                .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-destination-bucket-name')
+                })
+                .handleQuickPick('Specify parameter source for sync', async (picker) => {
+                    // Need time to check samconfig.toml file and generate options
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items[2].label, 'Use default values from samconfig')
+                    picker.acceptItem(picker.items[2])
+                })
+                .build()
+
+            await runSync('infra', appNode)
+
+            assert(mockGetSamCliPath.calledOnce)
+            assert(mockChildProcessClass.calledOnce)
+            assert.deepEqual(mockChildProcessClass.getCall(0).args, [
+                'sam-cli-path',
+                [
+                    'sync',
+                    '--template',
+                    `${templateFile.fsPath}`,
+                    '--no-dependency-layer',
+                    '--config-file',
+                    `${samconfigFile.fsPath}`,
+                    '--parameter-overrides',
+                    'ParameterKey=SourceBucketName,ParameterValue=my-source-bucket-name ParameterKey=DestinationBucketName,ParameterValue=my-destination-bucket-name',
+                ],
+                {
+                    spawnOptions: {
+                        cwd: projectRoot?.fsPath,
+                        env: {
+                            AWS_TOOLING_USER_AGENT: 'AWS-Toolkit-For-VSCode/testPluginVersion',
+                            SAM_CLI_TELEMETRY: '0',
+                        },
+                    },
+                },
+            ])
+            assert(mockGetSpawnEnv.calledOnce)
+            assert(spyRunInterminal.calledOnce)
+            assert.deepEqual(spyRunInterminal.getCall(0).args, [mockSamSyncChildProcess, 'sync'])
+            assert(spyWriteSamconfigGlobal.notCalled)
+
+            // Check telementry
+            assertTelemetry('sam_sync', { result: 'Succeeded', source: 'appBuilderDeploy' })
+            assertTelemetryCurried('sam_sync')({
+                syncedResources: 'AllResources',
+                source: 'appBuilderDeploy',
+            })
+            prompterTester.assertCallAll()
+        })
+    })
+
+    describe(':( path', () => {
+        let appNode: AppNode
+        beforeEach(async () => {
+            mockGetSamCliPath = sandbox
+                .stub(SamUtilsModule, 'getSamCliPathAndVersion')
+                .callsFake(sandbox.stub().resolves({ path: 'sam-cli-path' }))
+
+            appNode = new AppNode({
+                workspaceFolder: workspaceFolder,
+                samTemplateUri: templateFile,
+                projectRoot: projectRoot,
+            })
+            await testFolder.write('samconfig.toml', samconfigCompleteData)
+        })
+
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        it('should abort when customer cancel sync dev stack agreement', async () => {
+            // Set the
+            await ToolkitPromptSettings.instance.update('samcliConfirmDevStack', false)
+            // Confirm confirmDevStack message
+            getTestWindow().onDidShowMessage((message) => {
+                message.dispose()
+            })
+
+            try {
+                await runSync('infra', appNode)
+                assert.fail('should have thrown CancellationError')
+            } catch (error: any) {
+                assert(error instanceof CancellationError)
+                assert.strictEqual(error.agent, 'user')
+            }
+        })
+
+        it('should abort when customer cancel sync wizard', async () => {
+            // Confirm confirmDevStack message
+            getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'OK')?.select())
+            sandbox.stub(SyncWizard.prototype, 'run').resolves(undefined)
+
+            try {
+                await runSync('infra', appNode)
+                assert.fail('should have thrown CancellationError')
+            } catch (error: any) {
+                assert(error instanceof CancellationError)
+                assert.strictEqual(error.agent, 'user')
+            }
+        })
+
+        it('should throw ToolkitError when sync command fail', async () => {
+            // Confirm confirmDevStack message
+            getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'OK')?.select())
+
+            const prompterTester = PrompterTester.init()
+                .handleInputBox('Specify SAM Template parameter value for SourceBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-source-bucket-name')
+                })
+                .handleInputBox('Specify SAM Template parameter value for DestinationBucketName', (inputBox) => {
+                    inputBox.acceptValue('my-destination-bucket-name')
+                })
+                .handleQuickPick('Specify parameter source for sync', async (picker) => {
+                    // Need time to check samconfig.toml file and generate options
+                    await picker.untilReady()
+                    assert.strictEqual(picker.items[2].label, 'Use default values from samconfig')
+                    picker.acceptItem(picker.items[2])
+                })
+                .build()
+
+            // Mock  child process with required properties that get called in ProcessTerminal
+            mockSamSyncChildProcess = Object.create(ProcessUtilsModule.ChildProcess.prototype, {
+                stopped: { get: sandbox.stub().returns(false) },
+                stop: { value: sandbox.stub().resolves({}) },
+                run: {
+                    value: sandbox.stub().resolves({
+                        exitCode: -1,
+                        stdout: 'Mock sync command execution failure',
+                        stderr: '',
+                    }),
+                },
+            })
+            mockChildProcessClass = sandbox.stub(ProcessUtilsModule, 'ChildProcess').returns(mockSamSyncChildProcess)
+
+            try {
+                await runSync('infra', appNode)
+                assert.fail('should have thrown ToolkitError')
+            } catch (error: any) {
+                assert(error instanceof ToolkitError)
+                assert.strictEqual(error.message, 'Failed to sync SAM application')
+            }
+            prompterTester.assertCallAll()
+        })
+    })
+})
+
+describe('SAM sync helper functions', () => {
+    describe('prepareSyncParams', function () {
+        let tempDir: vscode.Uri
+
+        beforeEach(async function () {
+            tempDir = vscode.Uri.file(await makeTemporaryToolkitFolder())
+        })
+
+        afterEach(async function () {
+            await fs.delete(tempDir, { recursive: true })
+        })
+
+        it('uses region if given a tree node', async function () {
+            const params = await prepareSyncParams(
+                new (class extends AWSTreeNodeBase {
+                    public override readonly regionCode = 'foo'
+                })('')
+            )
+
+            assert.strictEqual(params.region, 'foo')
+        })
+
+        async function makeTemplateItem(dir: vscode.Uri) {
+            const uri = vscode.Uri.joinPath(dir, 'template.yaml')
+            const data = makeSampleSamTemplateYaml(true)
+            await fs.writeFile(uri, JSON.stringify(data))
+
+            return { uri, data }
+        }
+
+        it('loads template if given a URI', async function () {
+            const template = await makeTemplateItem(tempDir)
+
+            const params = await prepareSyncParams(template.uri)
+            assert.strictEqual(params.template?.uri.fsPath, template.uri.fsPath)
+            assert.deepStrictEqual(params.template?.data, template.data)
+        })
+
+        it('skips dependency layers by default', async function () {
+            const template = await makeTemplateItem(tempDir)
+
+            const params = await prepareSyncParams(template.uri)
+            assert.strictEqual(params.skipDependencyLayer, true)
+        })
+
+        describe('samconfig.toml', function () {
+            async function makeDefaultConfig(dir: vscode.Uri, body: string) {
+                const uri = vscode.Uri.joinPath(dir, 'samconfig.toml')
+                const data = `
+            [default.sync.parameters]
+            ${body}
+`
+                await fs.writeFile(uri, data)
+
+                return uri
+            }
+
+            async function getParams(body: string, dir = tempDir) {
+                const config = await makeDefaultConfig(dir, body)
+
+                return prepareSyncParams(config)
+            }
+
+            it('throws on non-string values', async function () {
+                await assert.rejects(() => getParams(`region = 0`), ToolkitError)
+            })
+
+            it('does not fail on missing values', async function () {
+                const params = await getParams(`region = "bar"`)
+                assert.strictEqual(params.region, 'bar')
+            })
+
+            it('sets the project root as the parent directory', async function () {
+                const params = await getParams(`region = "bar"`, tempDir)
+                assert.strictEqual(params.projectRoot?.fsPath, tempDir.fsPath)
+            })
+
+            it('uses the depdency layer option if provided', async function () {
+                const params = await getParams(`dependency_layer = true`, tempDir)
+                assert.strictEqual(params.skipDependencyLayer, false)
+            })
+
+            it('can load a relative template param', async function () {
+                const template = await makeTemplateItem(tempDir)
+                const params = await getParams(`template = "./template.yaml"`)
+                assert.deepStrictEqual(params.template?.data, template.data)
+            })
+
+            it('can load an absolute template param', async function () {
+                const template = await makeTemplateItem(tempDir)
+                const params = await getParams(`template = '${template.uri.fsPath}'`)
+                assert.deepStrictEqual(params.template?.data, template.data)
+            })
+
+            it('can load a relative template param without a path seperator', async function () {
+                const template = await makeTemplateItem(tempDir)
+                const params = await getParams(`template = "template.yaml"`)
+                assert.deepStrictEqual(params.template?.data, template.data)
+            })
+
+            it('can load a template param using an alternate key', async function () {
+                const template = await makeTemplateItem(tempDir)
+                const params = await getParams(`template_file = "template.yaml"`)
+                assert.deepStrictEqual(params.template?.data, template.data)
+            })
+
+            it('can use global params', async function () {
+                const params = await getParams(`
+            region = "bar"
+            [default.global.parameters]
+            stack_name = "my-app"
+            `)
+                assert.strictEqual(params.stackName, 'my-app')
+            })
+
+            it('prefers using the sync section over globals', async function () {
+                const params = await getParams(`
+            stack_name = "my-sync-app"
+            [default.global.parameters]
+            stack_name = "my-app"
+            `)
+                assert.strictEqual(params.stackName, 'my-sync-app')
+            })
+
+            it('loads all values if found', async function () {
+                const params = await getParams(`
+            region = "bar"
+            stack_name = "my-app"
+            s3_bucket = "my-bucket"
+            image_repository = "12345679010.dkr.ecr.bar.amazonaws.com/repo"
+            `)
+                assert.strictEqual(params.region, 'bar')
+                assert.strictEqual(params.stackName, 'my-app')
+                assert.strictEqual(params.bucketName, 'my-bucket')
+                assert.strictEqual(params.ecrRepoUri, '12345679010.dkr.ecr.bar.amazonaws.com/repo')
+            })
+        })
+    })
+
+    describe('syncFlagsPrompter', () => {
+        let sandbox: sinon.SinonSandbox
+        let acceptedItems: DataQuickPickItem<string>[]
+
+        beforeEach(() => {
+            sandbox = sinon.createSandbox()
+        })
+
+        afterEach(() => {
+            sandbox.restore() // Restore all stubs after each test
+        })
+
+        it('should return selected flags from buildFlagsPrompter', async () => {
+            getTestWindow().onDidShowQuickPick(async (picker) => {
+                await picker.untilReady()
+                assert.strictEqual(picker.items.length, 9)
+                assert.strictEqual(picker.title, 'Specify parameters for sync')
+                assert.deepStrictEqual(picker.items, syncFlagItems)
+                const buildInSource = picker.items[0]
+                const code = picker.items[1]
+                const dependencyLayer = picker.items[2]
+                assert.strictEqual(buildInSource.data, '--build-in-source')
+                assert.strictEqual(code.data, '--code')
+                assert.strictEqual(dependencyLayer.data, '--dependency-layer')
+                acceptedItems = [buildInSource, code, dependencyLayer]
+                picker.acceptItems(...acceptedItems)
+            })
+
+            const flags = await createMultiPick(syncFlagItems, {
+                title: 'Specify parameters for sync',
+                placeholder: 'Press enter to proceed with highlighted option',
+            }).prompt()
+
+            assert.deepStrictEqual(flags, JSON.stringify(acceptedItems.map((i) => i.data)))
+        })
+    })
+
+    describe('createEnvironmentPrompter', () => {
+        let sandbox: sinon.SinonSandbox
+        let config: SamConfig
+        let listEnvironmentsStub: sinon.SinonStub
+
+        beforeEach(() => {
+            sandbox = sinon.createSandbox()
+            // Create a stub for the SamConfig instance
+            config = new SamConfig(vscode.Uri.parse('dummy://uri'))
+            listEnvironmentsStub = sandbox.stub(config, 'listEnvironments')
+        })
+
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        it('should create a prompter with existing samconfig env', () => {
+            // Arrange
+            const defaultEnv: Environment = {
+                name: 'default',
+                commands: {},
+            }
+            const stagingEnv: Environment = {
+                name: 'staging',
+                commands: {},
+            }
+            const prodEnv: Environment = {
+                name: 'prod',
+                commands: {},
+            }
+            const envs: Environment[] = [defaultEnv, stagingEnv, prodEnv]
+
+            listEnvironmentsStub.returns(envs)
+            sandbox.stub(SamUtilsModule, 'getRecentResponse').returns(undefined)
+
+            // Act
+            const prompter = createEnvironmentPrompter(config)
+
+            // Assert
+            assert.ok(listEnvironmentsStub.calledOnce)
+            assert.strictEqual(prompter.quickPick.title, 'Select an Environment to Use')
+            assert.strictEqual(prompter.quickPick.placeholder, 'Select an environment')
+            assert.strictEqual(prompter.quickPick.items.length, 3)
+            assert.deepStrictEqual(prompter.quickPick.items, [
+                {
+                    label: 'default',
+                    data: defaultEnv,
+                    recentlyUsed: false,
+                },
+                {
+                    label: 'staging',
+                    data: stagingEnv,
+                    recentlyUsed: false,
+                },
+                {
+                    label: 'prod',
+                    data: prodEnv,
+                    recentlyUsed: false,
+                },
+            ])
+        })
+    })
+
+    describe('prepareSyncParams', () => {
+        let sandbox: sinon.SinonSandbox
+        beforeEach(() => {
+            sandbox = sinon.createSandbox()
+        })
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        it('should return correct params from region node', async () => {
+            const regionNode = new RegionNode({ name: 'us-east-1', id: 'IAD' } as Region, {} as RegionProvider)
+            const result = await prepareSyncParams(regionNode)
+            assert.deepStrictEqual(result, { skipDependencyLayer: true, region: 'IAD' })
+        })
+
+        it('should return correct params from appBuilder', async () => {
+            // setup appNode
+            const workspaceFolder = vscode.workspace.workspaceFolders?.[0]
+            assert.ok(workspaceFolder)
+            const templateUri = vscode.Uri.file('file://mock/path/project/file')
+            const projectRootUri = getProjectRootUri(templateUri)
+            const samAppLocation = {
+                samTemplateUri: templateUri,
+                workspaceFolder: workspaceFolder,
+                projectRoot: projectRootUri,
+            }
+            const appNode = new AppNode(samAppLocation)
+            const tryLoadStub = sandbox.stub(Cfn, 'load')
+
+            tryLoadStub.resolves({} as Cfn.Template)
+
+            const templateItem = {
+                uri: templateUri,
+                data: {},
+            }
+
+            // Act
+            const result = await prepareSyncParams(appNode)
+
+            // Assert
+            assert.deepStrictEqual(result, {
+                skipDependencyLayer: true,
+                template: templateItem,
+                projectRoot: projectRootUri,
+            })
+        })
+
+        it('should return correct params for undefined input', async () => {
+            const result = await prepareSyncParams(undefined)
+            assert.deepStrictEqual(result, { skipDependencyLayer: true })
+        })
+    })
+
+    describe('getSyncParamsFromConfig', () => {
+        let sandbox: sinon.SinonSandbox
+        beforeEach(() => {
+            sandbox = sinon.createSandbox()
+        })
+
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        it('should return correct params from config', async () => {
+            const configUri = vscode.Uri.file('file://mock/path/project/file')
+            const contents = `
+        [default]
+        [default.global.parameters]
+        stack_name = "TestApp"
+        [default.build.parameters]
+        cached = true
+        parallel = true
+        [default.deploy.parameters]
+        capabilities = "CAPABILITY_IAM"
+        confirm_changeset = true
+        resolve_s3 = true
+        [default.sync.parameters]
+        watch = true
+        template_file = "/Users/mbfreder/TestApp/JavaSamApp/serverless-patterns/s3-lambda-resizing-python/template.yaml"
+        s3_bucket = "aws-sam-cli-managed-default-samclisourcebucket-1o6ke33w96qag"
+        stack_name = "s3-lambda-resizing-java-4"
+        dependency_layer = false`
+
+            const config = await parseConfig(contents)
+            const samconfig = new SamConfig(configUri, config)
+
+            const result = getSyncParamsFromConfig(samconfig)
+            assert.strictEqual(
+                result['templatePath'],
+                '/Users/mbfreder/TestApp/JavaSamApp/serverless-patterns/s3-lambda-resizing-python/template.yaml'
+            )
+            assert.strictEqual(result['bucketName'], 'aws-sam-cli-managed-default-samclisourcebucket-1o6ke33w96qag')
+            assert.strictEqual(result['stackName'], 's3-lambda-resizing-java-4')
+        })
+
+        it('should return correct params from config with no template file', async () => {
+            const configUri = vscode.Uri.file('file://mock/path/project/file')
+            const contents = `
+        [default]
+        [default.global.parameters]
+        stack_name = "TestApp"
+        [default.build.parameters]
+        cached = true
+        parallel = true
+        [default.deploy.parameters]
+        capabilities = "CAPABILITY_IAM"
+        confirm_changeset = true
+        resolve_s3 = true
+        [default.sync.parameters]
+        watch = true
+        s3_bucket = "bucket-from-samconfig"
+        stack_name = "s3-lambda-resizing-java-4"
+        dependency_layer = false`
+
+            const config = await parseConfig(contents)
+            const samconfig = new SamConfig(configUri, config)
+
+            const result = getSyncParamsFromConfig(samconfig)
+            assert.strictEqual(result['templatePath'], undefined)
+            assert.strictEqual(result['bucketName'], 'bucket-from-samconfig')
+            assert.strictEqual(result['stackName'], 's3-lambda-resizing-java-4')
+        })
+    })
+
+    describe('saveAndBindArgs', () => {
+        let sandbox: sinon.SinonSandbox
+        let getConfigFileUriStub: sinon.SinonStub
+
+        beforeEach(() => {
+            sandbox = sinon.createSandbox()
+            getConfigFileUriStub = sandbox.stub()
+
+            // Replace the real implementations with stubs
+            sandbox.stub(SamUtilsModule, 'updateRecentResponse').resolves()
+        })
+
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        it('should bind arguments correctly for code deployment', async () => {
+            const testFolder = await TestFolder.create()
+            const templateFile = vscode.Uri.file(await testFolder.write('template.yaml', validTemplateData))
+
+            const args = {
+                deployType: 'code',
+                template: {
+                    uri: templateFile,
+                    data: {},
+                } as TemplateItem,
+                bucketName: 'myBucket',
+                ecrRepoUri: 'myEcrRepo',
+                stackName: 'myStack',
+                region: 'us-east-1',
+                skipDependencyLayer: false,
+                paramsSource: ParamsSource.SpecifyAndSave,
+            } as SyncParams
+
+            const result = await saveAndBindArgs(args)
+
+            assert.ok(result.boundArgs.includes('--template'))
+            assert.ok(result.boundArgs.includes('--s3-bucket'))
+            assert.ok(result.boundArgs.includes('--image-repository'))
+            assert.ok(result.boundArgs.includes('--stack-name'))
+            assert.ok(result.boundArgs.includes('--region'))
+            assert.ok(result.boundArgs.includes('--code'))
+            assert.ok(result.boundArgs.includes('--save-params'))
+            assert.ok(result.boundArgs.includes(templateFile.fsPath))
+            assert.ok(result.boundArgs.includes('myBucket'))
+            assert.ok(result.boundArgs.includes('myEcrRepo'))
+            assert.ok(result.boundArgs.includes('myStack'))
+            assert.ok(result.boundArgs.includes('us-east-1'))
+        })
+
+        it('should handle SamConfig paramsSource', async () => {
+            const testFolder = await TestFolder.create()
+            const projectRoot = vscode.Uri.file(testFolder.path)
+            const templateFile = vscode.Uri.file(await testFolder.write('template.yaml', validTemplateData))
+            const samConfigFile = vscode.Uri.file(await testFolder.write('samconfig.toml', '[default]'))
+
+            const args = {
+                deployType: 'code',
+                template: { uri: templateFile, data: {} } as TemplateItem,
+                bucketName: 'myBucket',
+                ecrRepoUri: 'myEcrRepo',
+                stackName: 'myStack',
+                region: 'us-east-1',
+                skipDependencyLayer: false,
+                paramsSource: ParamsSource.SamConfig,
+                projectRoot: projectRoot,
+            } as SyncParams
+
+            getConfigFileUriStub.resolves(samConfigFile)
+
+            const result = await saveAndBindArgs(args)
+
+            assert.ok(result.boundArgs.includes('--config-file'))
+            assert.ok(result.boundArgs.includes(samConfigFile.fsPath))
+        })
+    })
+
+    describe('ensureBucket', () => {
+        let sandbox: sinon.SinonSandbox
+        let createBucketStub
+
+        beforeEach(() => {
+            sandbox = sinon.createSandbox()
+        })
+
+        afterEach(() => {
+            sandbox.restore() // Restore original behavior after each test
+        })
+
+        it('should return the bucket name when it does not match newbucket:', async () => {
+            const resp = { region: 'us-east-1', bucketName: 'existing-bucket' }
+            const result = await ensureBucket(resp)
+            assert.strictEqual(result, 'existing-bucket')
+        })
+
+        it('should create a new bucket and return its name when bucketName matches newbucket:', async () => {
+            const resp = { region: 'us-east-1', bucketName: 'newbucket:my-new-bucket' }
+
+            // Stub the S3 client's createBucket method
+            createBucketStub = sandbox.stub(S3Client.prototype, 'createBucket').resolves()
+
+            const result = await ensureBucket(resp)
+            assert.ok(createBucketStub.calledOnce)
+            assert.strictEqual(createBucketStub.firstCall.args[0].bucketName, 'my-new-bucket')
+            assert.strictEqual(result, 'my-new-bucket')
+        })
+
+        it('should throw a ToolkitError when bucket creation fails', async () => {
+            const resp = { region: 'us-east-1', bucketName: 'newbucket:my-failing-bucket' }
+
+            // Stub the S3 client's createBucket method to throw an error
+            createBucketStub = sandbox
+                .stub(S3Client.prototype, 'createBucket')
+                .rejects(new Error('Failed to create S3 bucket'))
+
+            await assert.rejects(ensureBucket(resp)).catch((err) => {
+                assert.ok(err instanceof ToolkitError)
+                assert.ok(err.message, 'Failed to create S3 bucket')
+            })
+        })
+    })
+
+    describe('ensureRepo', () => {
+        let createRepositoryStub: sinon.SinonStub
+        let sandbox: sinon.SinonSandbox
+
+        beforeEach(() => {
+            sandbox = sinon.createSandbox()
+            createRepositoryStub = sandbox.stub()
+            sandbox.stub(DefaultEcrClient.prototype, 'createRepository').callsFake(createRepositoryStub)
+        })
+
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        const createInput = (ecrRepoUri: string | undefined) => ({
+            region: 'us-west-2',
+            ecrRepoUri,
+        })
+
+        const createNewRepoInput = (repoName: string) => createInput(`newrepo:${repoName}`)
+
+        describe('when not creating new repository', () => {
+            it('should return original ecrRepoUri when not matching newrepo pattern', async () => {
+                const input = createInput('existing-repo:latest')
+                const result = await ensureRepo(input)
+
+                assert(createRepositoryStub.notCalled)
+                assert.strictEqual(result, input.ecrRepoUri)
+            })
+
+            it('should return original ecrRepoUri when ecrRepoUri is undefined', async () => {
+                const input = createInput(undefined)
+                const result = await ensureRepo(input)
+
+                assert(!result)
+                assert(createRepositoryStub.notCalled)
+            })
+        })
+
+        describe('when creating new repository', () => {
+            const repoName = 'test-repo'
+            const input = createNewRepoInput(repoName)
+
+            it('should create new repository successfully', async () => {
+                const expectedUri = 'aws.ecr.test/test-repo'
+                createRepositoryStub.resolves({
+                    repository: {
+                        repositoryUri: expectedUri,
+                    },
+                })
+
+                const result = await ensureRepo(input)
+
+                assert.strictEqual(result, expectedUri)
+                assert(createRepositoryStub.calledOnceWith(repoName))
+            })
+
+            it('should handle repository creation failure', async () => {
+                createRepositoryStub.rejects(new Error('Repository creation failed'))
+
+                try {
+                    await ensureRepo(input)
+                    assert.fail('Should have thrown an error')
+                } catch (err) {
+                    assert(err instanceof ToolkitError)
+                    assert.strictEqual(err.message, `Failed to create new ECR repository "${repoName}"`)
+                }
+            })
+
+            const testCases = [
+                {
+                    name: 'undefined repositoryUri',
+                    response: { repository: { repositoryUri: undefined } },
+                },
+                {
+                    name: 'empty repository response',
+                    response: {},
+                },
+            ]
+
+            for (const { name, response } of testCases) {
+                it(`should handle ${name}`, async () => {
+                    createRepositoryStub.resolves(response)
+
+                    const result = await ensureRepo(input)
+
+                    assert(!result)
+                    assert(createRepositoryStub.calledOnceWith(repoName))
+                })
+            }
+        })
+    })
+})
+
+const s3BucketListSummary: Array<
+    RequiredProps<Bucket, 'Name'> & {
+        readonly region: string
+    }
+> = [
+    { Name: 'stack-1-bucket', region: 'us-west-2' },
+    { Name: 'stack-2-bucket', region: 'us-west-2' },
+    { Name: 'stack-3-bucket', region: 'us-west-2' },
+]
+
+const stackSummaries: CloudFormationClientModule.StackSummary[][] = [
+    [
+        {
+            StackName: 'stack1',
+            StackStatus: 'CREATE_COMPLETE',
+            CreationTime: new Date(),
+        } as CloudFormationClientModule.StackSummary,
+        {
+            StackName: 'stack2',
+            StackStatus: 'CREATE_COMPLETE',
+            CreationTime: new Date(),
+        } as CloudFormationClientModule.StackSummary,
+        {
+            StackName: 'stack3',
+            StackStatus: 'CREATE_COMPLETE',
+            CreationTime: new Date(),
+        } as CloudFormationClientModule.StackSummary,
+    ],
+]
diff --git a/packages/core/src/test/shared/sam/utils.test.ts b/packages/core/src/test/shared/sam/utils.test.ts
new file mode 100644
index 00000000000..991e6644471
--- /dev/null
+++ b/packages/core/src/test/shared/sam/utils.test.ts
@@ -0,0 +1,314 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import assert from 'assert'
+import sinon from 'sinon'
+import {
+    getProjectRootUri,
+    getProjectRoot,
+    getSource,
+    isDotnetRuntime,
+    getSamCliPathAndVersion,
+    getRecentResponse,
+    updateRecentResponse,
+    getSamCliErrorMessage,
+    throwIfErrorMatches,
+} from '../../../shared/sam/utils'
+
+import { RegionNode } from '../../../awsexplorer/regionNode'
+import { Region } from '../../../shared/regions/endpoints'
+import { RegionProvider, ToolkitError } from '../../../shared'
+import { DeployedResource, DeployedResourceNode } from '../../../awsService/appBuilder/explorer/nodes/deployedNode'
+import { TemplateItem } from '../../../shared/ui/sam/templatePrompter'
+import { SamCliInfoInvocation } from '../../../shared/sam/cli/samCliInfo'
+import { SamCliSettings } from '../../../shared/sam/cli/samCliSettings'
+import { telemetry } from '../../../shared/telemetry'
+import globals from '../../../shared/extensionGlobals'
+import { assertLogsContain } from '../../globalSetup.test'
+import { ChildProcessResult } from '../../../shared/utilities/processUtils'
+
+describe('SAM utils', async function () {
+    it('returns the projectRoot', async function () {
+        const templateItem: TemplateItem = {
+            uri: vscode.Uri.file('file://mock/path/project/file'),
+            data: {},
+        }
+        const response = getProjectRoot(templateItem)
+        assert.deepStrictEqual(response, vscode.Uri.file('file://mock/path/project'))
+    })
+    it('returns the projectRootUri', async function () {
+        const template: vscode.Uri = vscode.Uri.file('file://mock/path/project/uri')
+        const response = getProjectRootUri(template)
+        assert.deepStrictEqual(response, vscode.Uri.file('file://mock/path/project'))
+    })
+
+    describe('getSource', async function () {
+        const testScenarios = [
+            {
+                name: 'vscode.Uri',
+                value: vscode.Uri.file('file://file'),
+                expected: 'template',
+            },
+            {
+                name: 'AWSTreeNode',
+                value: new RegionNode({ name: 'us-east-1', id: 'IAD' } as Region, {} as RegionProvider),
+                expected: 'regionNode',
+            },
+            {
+                name: 'TreeNode',
+                value: new DeployedResourceNode({ arn: 'aws:arn:...', contextValue: '' } as DeployedResource),
+                expected: 'appBuilderDeploy',
+            },
+            {
+                name: 'undefined',
+                value: undefined,
+                expected: undefined,
+            },
+        ]
+        for (const scenario of testScenarios) {
+            it(`returns Source for ${scenario.name}`, async () => {
+                assert.strictEqual(getSource(scenario.value), scenario.expected)
+            })
+        }
+    })
+
+    describe('checks if it is DotNet', async function () {
+        let sandbox: sinon.SinonSandbox
+        const noUri = vscode.Uri.parse('untitled://')
+        const testScenarios = [
+            {
+                name: 'DotNet function',
+                template: `
+                    Transform: 'AWS::Serverless-2016-10-31'
+                    Resources:
+                        Func1:
+                            Type: 'AWS::Serverless::Function'
+                            Properties:
+                                Runtime: 'dotnet8'
+                `,
+                expected: true,
+            },
+            {
+                name: 'Global DotNet property',
+                template: `
+                    Transform: 'AWS::Serverless-2016-10-31'
+                    Globals:
+                        Function:
+                            Runtime: 'dotnet8'
+                    Resources:
+                        Func1:
+                            Type: 'AWS::Serverless::Function'
+                            Properties: {}
+                `,
+                expected: true,
+            },
+            {
+                name: 'different runtime',
+                template: `
+                    Transform: 'AWS::Serverless-2016-10-31'
+                    Resources:
+                        Func1:
+                            Type: 'AWS::Serverless::Function'
+                            Properties:
+                                Runtime: 'nodejs20.x'
+                `,
+                expected: false,
+            },
+            {
+                name: 'two functions, one DotNet',
+                template: `
+                    Transform: 'AWS::Serverless-2016-10-31'
+                    Resources:
+                        Func1:
+                            Type: 'AWS::Serverless::Function'
+                            Properties:
+                                Runtime: 'nodejs20.x'
+                        Func2:
+                            Type: 'AWS::Serverless::Function'
+                            Properties:
+                                Runtime: 'dotnet8'
+                `,
+                expected: true,
+            },
+            {
+                name: 'no function',
+                template: `
+                    Transform: 'AWS::Serverless-2016-10-31'
+                    Resources:
+                        Func1:
+                            Type: 'AWS::S3::Bucket'
+                            Properties:
+                                Runtime: 'nodejs20.x'
+                `,
+                expected: false,
+            },
+            {
+                name: 'no resources',
+                template: ``,
+                expected: false,
+            },
+        ]
+
+        beforeEach(() => {
+            sandbox = sinon.createSandbox()
+        })
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        for (const scenario of testScenarios) {
+            it(`returns isDotNetRuntime for ${scenario.name}`, async () => {
+                const response = await isDotnetRuntime(noUri, scenario.template)
+                assert.strictEqual(response, scenario.expected)
+            })
+        }
+    })
+
+    describe('getSamCliPathAndVersion', async function () {
+        let sandbox: sinon.SinonSandbox
+        let getOrDetectSamCliStub: sinon.SinonStub
+        let executeStub: sinon.SinonStub
+        let telemetryStub: sinon.SinonStub
+
+        beforeEach(() => {
+            sandbox = sinon.createSandbox()
+            getOrDetectSamCliStub = sandbox.stub(SamCliSettings.instance, 'getOrDetectSamCli')
+            executeStub = sandbox.stub(SamCliInfoInvocation.prototype, 'execute')
+            telemetryStub = sandbox.stub(telemetry, 'record')
+        })
+
+        afterEach(() => {
+            sandbox.restore()
+        })
+
+        it('returns path and version when SAM CLI is found and version is valid', async () => {
+            const expectedPath = '/usr/local/bin/sam'
+            const expectedVersion = '1.99.0'
+            getOrDetectSamCliStub.resolves({ path: expectedPath })
+            executeStub.resolves({ version: expectedVersion })
+
+            const result = await getSamCliPathAndVersion()
+
+            assert.strictEqual(result.path, expectedPath)
+            assert.strictEqual(result.parsedVersion?.version, expectedVersion)
+            assert(telemetryStub.calledOnceWith({ version: expectedVersion }))
+        })
+
+        it('throws MissingExecutable error when SAM CLI path is undefined', async () => {
+            getOrDetectSamCliStub.resolves({ path: undefined })
+
+            try {
+                await getSamCliPathAndVersion()
+                assert.fail('Should have thrown an error')
+            } catch (error) {
+                assert(error instanceof ToolkitError)
+                assert.strictEqual(error.code, 'MissingExecutable')
+                assert.strictEqual(error.message, 'SAM CLI could not be found')
+                assert(telemetryStub.notCalled)
+            }
+        })
+
+        it('throws VersionTooLow error when SAM CLI version is below 1.53.0', async () => {
+            const lowVersion = '1.52.0'
+            getOrDetectSamCliStub.resolves({ path: '/usr/local/bin/sam' })
+            executeStub.resolves({ version: lowVersion })
+
+            try {
+                await getSamCliPathAndVersion()
+                assert.fail('Should have thrown an error')
+            } catch (error) {
+                assert(error instanceof ToolkitError)
+                assert.strictEqual(error.code, 'VersionTooLow')
+                assert.strictEqual(error.message, 'SAM CLI version 1.53.0 or higher is required')
+                // records telemetry even when version is too low
+                assert(telemetryStub.calledOnceWith({ version: lowVersion }))
+            }
+        })
+    })
+
+    describe('get/update recent response', () => {
+        // Create stub for globals.context.workspaceState.get
+        const mementoRootKey = 'samcli.utils.key'
+        const nonExistingMementoRootKey = 'samcli.utils.no.key'
+        const identifier = 'us-east-1'
+        const key1 = 'stackName'
+        const key2 = 'bucketName'
+        const value1 = 'myStackName'
+        const value2 = 'myBucketName'
+
+        after(async () => {
+            await globals.context.workspaceState.update(mementoRootKey, {})
+        })
+
+        it('1. getRecentResponse should return undefined when mementoRootKey does not exist', async () => {
+            assert(!getRecentResponse(nonExistingMementoRootKey, identifier, key1))
+        })
+
+        it('2. updateRecentResponse should return the undefined when mementoRootKey does not exist', async () => {
+            try {
+                await updateRecentResponse(mementoRootKey, identifier, key1, value1)
+            } catch (err) {
+                assert.fail('The execution should have succeeded yet encounter unexpected exception')
+            }
+        })
+
+        it('3. getRecentResponse should return the correct value', async () => {
+            const result = getRecentResponse(mementoRootKey, identifier, key1)
+            assert.strictEqual(result, value1)
+        })
+
+        it('4. updateRecentResponse should only update the specified key', async () => {
+            await updateRecentResponse(mementoRootKey, identifier, key2, value2)
+            const result1 = getRecentResponse(mementoRootKey, identifier, key1)
+            const result2 = getRecentResponse(mementoRootKey, identifier, key2)
+            assert.strictEqual(result1, value1)
+            assert.strictEqual(result2, value2)
+        })
+
+        it('5. updateRecentResponse should log and swallow exception when fails to update value', async () => {
+            sinon.stub(globals.context.workspaceState, 'update').rejects(new Error('Error updating value'))
+            try {
+                await updateRecentResponse(mementoRootKey, identifier, key2, value2)
+            } catch (err) {
+                assert.fail('The target function should have handled exception internally')
+            }
+            assertLogsContain(`sam: unable to save response at key`, false, 'warn')
+            sinon.restore()
+        })
+    })
+
+    describe('gets the SAM CLI error from stderr', async function () {
+        it('returns the error message', async function () {
+            const stderr =
+                'Starting Build use cache\nStarting Build inside a container\nCache is invalid, running build and copying resources for following functions (ResizerFunction)\nBuilding codeuri: /Users/mbfreder/TestApp/JavaSamApp/serverless-patterns/s3lambda-resizing-python/src runtime: python3.12 metadata: {} architecture: x86_64 functions: ResizerFunction\nError: Docker is unreachable. Docker needs to be running to build inside a container.'
+            const response = getSamCliErrorMessage(stderr)
+            assert.deepStrictEqual(
+                response,
+                'Error: Docker is unreachable. Docker needs to be running to build inside a container.'
+            )
+        })
+    })
+
+    describe('throwIfErrorMatches', async function () {
+        it('should throw a ToolkitError with the correct code when an error message matches', () => {
+            const mockError = new Error('Mock Error')
+            const mockResult: ChildProcessResult = {
+                exitCode: 1,
+                error: mockError,
+                stdout: '',
+                stderr: 'Docker is unreachable.',
+            }
+            assert.throws(
+                () => throwIfErrorMatches(mockResult),
+                (e: any) => {
+                    assert.strictEqual(e instanceof ToolkitError, true)
+                    assert.strictEqual(e.code, 'DockerUnreachable')
+                    return true
+                }
+            )
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/schema/testUtils.ts b/packages/core/src/test/shared/schema/testUtils.ts
new file mode 100644
index 00000000000..3fb9530cfd2
--- /dev/null
+++ b/packages/core/src/test/shared/schema/testUtils.ts
@@ -0,0 +1,107 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as path from 'path'
+import { GitExtension } from '../../../shared/extensions/git'
+
+export type JSONValue = string | boolean | number | null | JSONValue[] | JSONObject
+
+export interface JSONObject {
+    [key: string]: JSONValue
+}
+
+export interface TestSchemas {
+    samSchema: JSONObject
+    cfnSchema: JSONObject
+}
+
+export async function getCITestSchemas(): Promise<TestSchemas> {
+    const fetchUrl = 'https://github.com/awslabs/goformation'
+    const repo = await GitExtension.instance.listAllRemoteFiles({
+        fetchUrl,
+    })
+
+    const samFilePath = path.join('schema', 'sam.schema.json')
+    const samSchemaFile = await repo.files.find((f) => f.name === samFilePath)?.read()
+    if (!samSchemaFile) {
+        throw new Error(`Unable to find the sam schema file in path ${samFilePath} in repository ${fetchUrl}`)
+    }
+
+    const cfnFilePath = path.join('schema', 'cloudformation.schema.json')
+    const cfnSchemaFile = await repo.files.find((f) => f.name === cfnFilePath)?.read()
+    if (!cfnSchemaFile) {
+        throw new Error(
+            `Unable to find the cloudformation schema file in path ${cfnFilePath} in repository ${fetchUrl}`
+        )
+    }
+
+    await repo.dispose()
+
+    const samSchema = JSON.parse(samSchemaFile)
+    const cfnSchema = JSON.parse(cfnSchemaFile)
+    return {
+        samSchema,
+        cfnSchema,
+    }
+}
+
+/**
+ * Assert whether or not name exists under definitionName in the JSON schema
+ * @param schema The JSON schema
+ * @param definitionName The name of the definition to use
+ * @param name The name of the property to look for
+ */
+export function assertDefinitionProperty(schema: JSONObject, definitionName: string, name: string): void | never {
+    const definitionProperties = unmarshal(schema, 'definitions', definitionName, 'properties')
+    assertProperty(definitionProperties, name)
+}
+
+/**
+ * Assert whether name exists at an arbitary location in the JSON schema
+ * @param arbitrarySchemaLocation An arbitary location in the JSON schema
+ * @param name The name of the property to look for
+ */
+export function assertProperty(arbitrarySchemaLocation: JSONObject, name: string): void | never {
+    assert.ok(name in arbitrarySchemaLocation, `Property ${name} was not found in the "Properties" object`)
+}
+
+/**
+ * Assert whether a reference exists at definitionLocation to referenceName in the JSON Schema
+ * @param definitionLocation A location in the JSON schema
+ * @param referenceName A name of a reference to look for
+ */
+export function assertRef(definitionLocation: JSONObject, referenceName: string): void | never {
+    const definitionRef = definitionLocation['$ref']
+    if (definitionRef !== `#/definitions/AWS::Serverless::${referenceName}`) {
+        assert.fail(`The reference for ${definitionRef} did not point to ${referenceName}`)
+    }
+}
+
+/**
+ * Assert that definitionName is in the JSON schemas definitions
+ * @param schema The JSON schema to use
+ * @param definitionName The name of the definition to check
+ */
+export function assertDefinition(schema: JSONObject, definitionName: string): void | never {
+    if (!(definitionName in (schema['definitions'] as JSONObject))) {
+        assert.fail(`Definition for ${definitionName} not found`)
+    }
+}
+
+/**
+ * Traverse through the initial JSON object, visiting all of the properties.
+ * Only suitable for accessing JSON objects.
+ * @param initialObject the object you want to start the traversal at
+ * @param properties the properties you want to visit and traverse into
+ * @returns The location in initialObject after visiting all of properties
+ */
+export function unmarshal(initialObject: JSONObject, ...properties: string[]) {
+    let processedObject = initialObject
+    for (const propertyName of properties) {
+        processedObject = processedObject[propertyName] as JSONObject
+    }
+    return processedObject
+}
diff --git a/packages/core/src/test/shared/schemas.test.ts b/packages/core/src/test/shared/schemas.test.ts
new file mode 100644
index 00000000000..7a33d19357c
--- /dev/null
+++ b/packages/core/src/test/shared/schemas.test.ts
@@ -0,0 +1,141 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import assert from 'assert'
+import { YamlExtension } from '../../shared/extensions/yaml'
+import {
+    JsonSchemaHandler,
+    JSONSchemaSettings,
+    SchemaHandler,
+    SchemaService,
+    SchemaType,
+    YamlSchemaHandler,
+} from '../../shared/schemas'
+import { Settings } from '../../shared/settings'
+import sinon from 'sinon'
+
+describe('SchemaService', function () {
+    let service: SchemaService
+    let config: Settings
+    let fakeYamlExtension: YamlExtension
+    const cfnSchema = vscode.Uri.file('cfn')
+    const samSchema = vscode.Uri.file('sam')
+
+    beforeEach(async function () {
+        fakeYamlExtension = {} as any as YamlExtension
+        config = new Settings(vscode.ConfigurationTarget.Workspace)
+
+        service = new SchemaService({
+            schemas: {
+                cfn: cfnSchema,
+                sam: samSchema,
+            },
+            handlers: new Map<SchemaType, SchemaHandler>([
+                ['json', new JsonSchemaHandler(config)],
+                ['yaml', new YamlSchemaHandler(fakeYamlExtension)],
+            ]),
+        })
+    })
+
+    it('assigns schemas to the yaml extension', async function () {
+        const stub = sinon.stub()
+        const fooUri = vscode.Uri.parse('/foo')
+        const barUri = vscode.Uri.parse('/bar')
+        fakeYamlExtension.assignSchema = stub
+        service.registerMapping({
+            uri: fooUri,
+            type: 'yaml',
+            schema: 'cfn',
+        })
+        service.registerMapping({
+            uri: barUri,
+            type: 'yaml',
+            schema: 'sam',
+        })
+        await service.processUpdates()
+        assert(stub.firstCall.calledWithExactly(fooUri, cfnSchema))
+        assert(stub.secondCall.calledWithExactly(barUri, samSchema))
+    })
+
+    it('removes schemas from the yaml extension', async function () {
+        const stub = sinon.stub()
+        const fooUri = vscode.Uri.parse('/foo')
+        fakeYamlExtension.removeSchema = stub
+        service.registerMapping({
+            uri: fooUri,
+            type: 'yaml',
+            schema: undefined,
+        })
+        await service.processUpdates()
+        assert(stub.calledOnceWithExactly(fooUri))
+    })
+
+    it('registers schemas to json configuration', async function () {
+        service.registerMapping({
+            uri: vscode.Uri.parse('/foo'),
+            type: 'json',
+            schema: 'cfn',
+        })
+        await service.processUpdates()
+
+        const mappings = config.get('json.schemas')
+        assert.ok(Array.isArray(mappings))
+
+        const added = mappings.find((s: JSONSchemaSettings) => s.url === cfnSchema.toString())
+        assert.ok(added)
+
+        assert.strictEqual(added.fileMatch?.length, 1)
+        assert.strictEqual(added.fileMatch[0], '/foo')
+    })
+
+    it('removes schemas from json configuration', async function () {
+        service.registerMapping({
+            uri: vscode.Uri.parse('/foo'),
+            type: 'json',
+            schema: undefined,
+        })
+        await service.processUpdates()
+
+        const mappings = config.get('json.schemas')
+        assert.ok(Array.isArray(mappings))
+
+        const added = mappings.find((s: JSONSchemaSettings) => s.url === cfnSchema.toString())
+        assert.strictEqual(added, undefined)
+    })
+
+    it('processes no updates if schemas are unavailable', async function () {
+        const stub = sinon.stub()
+        fakeYamlExtension.assignSchema = stub
+        service = new SchemaService({
+            handlers: new Map<SchemaType, SchemaHandler>([
+                ['json', new JsonSchemaHandler()],
+                ['yaml', new YamlSchemaHandler(fakeYamlExtension)],
+            ]),
+        })
+
+        service.registerMapping({
+            uri: vscode.Uri.parse('/foo'),
+            type: 'yaml',
+            schema: 'cfn',
+        })
+        await service.processUpdates()
+        assert(stub.notCalled)
+    })
+
+    it('processes no updates if yaml extension unavailable', async function () {
+        const stub = sinon.stub()
+        fakeYamlExtension.assignSchema = stub
+        service = new SchemaService()
+
+        service.registerMapping({
+            uri: vscode.Uri.parse('/foo'),
+            type: 'yaml',
+            schema: 'cfn',
+        })
+        await service.processUpdates()
+        assert(stub.notCalled)
+    })
+})
diff --git a/packages/core/src/test/shared/settings.test.ts b/packages/core/src/test/shared/settings.test.ts
new file mode 100644
index 00000000000..a868d6fbe66
--- /dev/null
+++ b/packages/core/src/test/shared/settings.test.ts
@@ -0,0 +1,557 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import {
+    DevSettings,
+    Experiments,
+    fromExtensionManifest,
+    ToolkitPromptSettings,
+    Settings,
+    testSetting,
+} from '../../shared/settings'
+import { TestSettings } from '../utilities/testSettingsConfiguration'
+import { ClassToInterfaceType } from '../../shared/utilities/tsUtils'
+import { Optional } from '../../shared/utilities/typeConstructors'
+import { ToolkitError } from '../../shared/errors'
+import { getTestWindow } from './vscode/window'
+
+const settingsTarget = vscode.ConfigurationTarget.Workspace
+
+describe('Settings', function () {
+    // These tests use an actual extension setting, because vscode.WorkspaceConfiguration fails when
+    // you attempt to update one that isn't defined in package.json. The 'workspace' target is used
+    // as to not touch the test runner's global settings.
+    const settingKey = 'aws.samcli.lambdaTimeout'
+
+    let sut: Settings
+
+    beforeEach(async function () {
+        sut = new Settings(settingsTarget)
+        await sut.update(settingKey, undefined)
+    })
+
+    afterEach(async function () {
+        sinon.restore()
+    })
+
+    const scenarios = [
+        { testValue: 1234, desc: 'number' },
+        { testValue: 0, desc: 'default number' },
+        { testValue: 'hello world', desc: 'string' },
+        { testValue: '', desc: 'default string' },
+        { testValue: true, desc: 'true' },
+        { testValue: false, desc: 'false' },
+        { testValue: [], desc: 'empty array' },
+        { testValue: [{ value: 'foo' }, { value: 'bar' }], desc: 'array' },
+        // Empty objects cause pass-through to the global scope; clear your settings if the below test fails
+        { testValue: {}, desc: 'empty object' },
+        { testValue: { value: 'foo' }, desc: 'object' },
+        // Note: we don't test undefined because retrieval returns the package.json configured default value, if there is one
+    ]
+
+    it('isReadable()', async () => {
+        // TODO: could avoid sinon if we can force vscode to use a dummy settings.json file.
+        const fake = {
+            get: (key: string) => {
+                if (key === testSetting) {
+                    throw Error()
+                }
+                return 'setting-value'
+            },
+            update: async () => {
+                throw Error()
+            },
+        } as unknown as vscode.WorkspaceConfiguration
+        sinon.stub(vscode.workspace, 'getConfiguration').returns(fake)
+
+        assert.deepStrictEqual(await sut.isReadable(), false)
+    })
+
+    describe('get', function () {
+        let settings: vscode.WorkspaceConfiguration
+
+        beforeEach(function () {
+            settings = vscode.workspace.getConfiguration()
+        })
+
+        for (const scenario of scenarios) {
+            it(scenario.desc, async () => {
+                await settings.update(settingKey, scenario.testValue, settingsTarget)
+
+                const actualValue = sut.get(settingKey)
+                assert.deepStrictEqual(actualValue, scenario.testValue)
+            })
+        }
+
+        it('failure modes', async () => {
+            //
+            // Missing setting:
+            //
+            const testSetting = 'aws.bogusSetting'
+            assert.strictEqual(sut.get(testSetting), undefined)
+            assert.strictEqual(sut.get(testSetting, Boolean), undefined)
+            assert.strictEqual(sut.get(testSetting, Boolean, true), true)
+
+            //
+            // Setting exists but has wrong type:
+            //
+            await settings.update(settingKey, 123, settingsTarget)
+            assert.throws(() => sut.get(settingKey, String))
+            assert.throws(() => sut.get(settingKey, Object))
+            assert.throws(() => sut.get(settingKey, Boolean))
+            // Wrong type, but defaultValue was given:
+            assert.deepStrictEqual(sut.get(settingKey, String, ''), '')
+            assert.deepStrictEqual(sut.get(settingKey, Object, {}), {})
+            assert.deepStrictEqual(sut.get(settingKey, Boolean, true), true)
+        })
+    })
+
+    describe('update', function () {
+        for (const scenario of scenarios) {
+            it(scenario.desc, async () => {
+                await sut.update(settingKey, scenario.testValue)
+
+                // Write tests need to retrieve vscode.WorkspaceConfiguration after writing the value
+                // because they seem to cache values.
+                const savedValue = vscode.workspace.getConfiguration().get(settingKey)
+
+                assert.deepStrictEqual(savedValue, scenario.testValue)
+            })
+        }
+
+        it('shows message on failure', async () => {
+            // TODO: could avoid sinon if we can force vscode to use a dummy settings.json file.
+            // const fakeSettings = {}
+            const fake = {
+                lastValue: 'x',
+                get: (key: string) => {
+                    return `${key}-value`
+                },
+                update: async (key: string, val: any) => {
+                    // Do nothing (success).
+                    // (fakeSettings as any)[key] = val
+                },
+                inspect: (key: string) => {
+                    return {}
+                },
+            } as unknown as vscode.WorkspaceConfiguration
+            sinon.stub(vscode.workspace, 'getConfiguration').returns(fake)
+
+            assert.deepStrictEqual(await sut.update(testSetting, 91234), true)
+            // No errors.
+            assert.deepStrictEqual(getTestWindow().shownMessages.length, 0)
+
+            fake.update = async () => {
+                throw Error('EACCES')
+            }
+            assert.deepStrictEqual(await sut.update(testSetting, 91234), false)
+            getTestWindow()
+                .getFirstMessage()
+                .assertError(
+                    `Failed to update settings (key: "${testSetting}"). Check settings.json for syntax errors or insufficient permissions.`
+                )
+
+            // Message skipped for duplicate error.
+            assert.deepStrictEqual(await sut.update(testSetting, 91234), false)
+            assert.deepStrictEqual(getTestWindow().shownMessages.length, 1)
+        })
+    })
+
+    describe('isSet', function () {
+        it('returns true when the value is set', async function () {
+            await sut.update(settingKey, 1)
+            assert.strictEqual(sut.isSet(settingKey), true)
+        })
+
+        it('returns true when the value is set to the default', async function () {
+            const val = sut.get(settingKey)
+            assert.notStrictEqual(val, undefined, `Settings key "${settingKey}" does not have a default value`)
+            await sut.update(settingKey, val)
+            assert.strictEqual(sut.isSet(settingKey), true)
+        })
+
+        it('returns false when the value is not set', async function () {
+            const globalSettings = new Settings(vscode.ConfigurationTarget.Global)
+            const globalValue = globalSettings.get(settingKey)
+            await globalSettings.update(settingKey, undefined)
+
+            try {
+                assert.strictEqual(sut.isSet(settingKey), false)
+            } catch (err) {
+                await globalSettings.update(settingKey, globalValue)
+                throw err
+            }
+        })
+    })
+
+    describe('onDidChangeSection', function () {
+        const rootSection = settingKey.split('.').shift() ?? ''
+
+        it('fires after a section changes', async function () {
+            // This test is a bit flaky but it's likely from the underlying VSC implementation, not us
+            this.retries(3)
+
+            let eventCount = 0
+            sut.onDidChangeSection(rootSection, () => (eventCount += 1))
+
+            await sut.update('editor.tabSize', 4)
+            assert.strictEqual(eventCount, 0)
+
+            await sut.update(settingKey, false)
+            assert.strictEqual(eventCount, 1)
+
+            await sut.update(settingKey, true)
+            assert.strictEqual(eventCount, 2)
+        })
+
+        it('scopes the event to the affected section', async function () {
+            const changedEvent = new Promise<vscode.ConfigurationChangeEvent>((resolve, reject) => {
+                setTimeout(() => reject(new Error('Timed out')), 1000)
+                sut.onDidChangeSection(rootSection, resolve)
+            })
+
+            await sut.update(settingKey, true)
+
+            const subKey = settingKey.replace(`${rootSection}.`, '')
+            const affectsConfiguration = await changedEvent.then((e) => e.affectsConfiguration.bind(e))
+
+            assert.strictEqual(affectsConfiguration('foo'), false)
+            assert.strictEqual(affectsConfiguration(subKey), true)
+        })
+    })
+
+    describe('fromExtensionManifest', function () {
+        const ProfileSettings = fromExtensionManifest('aws', { profile: String })
+        let settings: TestSettings
+        let instance: InstanceType<typeof ProfileSettings>
+
+        beforeEach(function () {
+            settings = new TestSettings()
+            instance = new ProfileSettings(settings)
+        })
+
+        it('throws if the setting does not exist', function () {
+            assert.throws(() => fromExtensionManifest('aws', { foo: Boolean }))
+        })
+
+        it('can use a default value', function () {
+            assert.strictEqual(instance.get('profile', 'bar'), 'bar')
+        })
+
+        it('can use `undefined` as a default value', function () {
+            const OptionalProfile = fromExtensionManifest('aws', { profile: Optional(String) })
+            assert.strictEqual(new OptionalProfile(settings).get('profile', undefined), undefined)
+        })
+
+        it('can use a saved setting', async function () {
+            await settings.update('aws.profile', 'foo')
+            assert.strictEqual(instance.get('profile'), 'foo')
+        })
+
+        it('ignores the default value if the setting exists', async function () {
+            await settings.update('aws.profile', 'foo')
+            assert.strictEqual(instance.get('profile', 'bar'), 'foo')
+        })
+
+        it('uses the default value if the setting is invalid', async function () {
+            await settings.update('aws.profile', true)
+            assert.strictEqual(instance.get('profile', 'foo'), 'foo')
+        })
+
+        it('throws when the types do not match', async function () {
+            assert.throws(() => instance.get('profile'))
+
+            await settings.update('aws.profile', true)
+            assert.throws(() => instance.get('profile'))
+
+            await settings.update('aws.profile', 123)
+            assert.throws(() => instance.get('profile'))
+        })
+    })
+})
+
+describe('DevSetting', function () {
+    const testSetting = 'renderDebugDetails'
+
+    let settings: ClassToInterfaceType<Settings>
+    let sut: DevSettings
+
+    beforeEach(function () {
+        settings = new TestSettings()
+        sut = new DevSettings(settings)
+    })
+
+    it('can read settings', async function () {
+        assert.strictEqual(sut.get(testSetting, false), false)
+        await settings.update(`aws.dev.${testSetting}`, true)
+        assert.strictEqual(sut.get(testSetting, false), true)
+    })
+
+    it('only changes active settings if a value exists', function () {
+        assert.strictEqual(sut.get(testSetting, true), true)
+        assert.deepStrictEqual(sut.activeSettings, {})
+    })
+
+    it('changes active settings even if the value is the default', async function () {
+        await settings.update(`aws.dev.${testSetting}`, false)
+        assert.strictEqual(sut.get(testSetting, false), false)
+        assert.deepStrictEqual(sut.activeSettings, { [testSetting]: false })
+    })
+
+    it('can notify listeners when a setting is retrieved', async function () {
+        const state = new Promise((resolve, reject) => {
+            setTimeout(() => reject(new Error('Timed out waiting for event')), 1000)
+            sut.onDidChangeActiveSettings(() => resolve(sut.activeSettings))
+        })
+
+        await settings.update(`aws.dev.${testSetting}`, true)
+        assert.strictEqual(sut.get(testSetting, false), true)
+        assert.deepStrictEqual(await state, { [testSetting]: true })
+    })
+
+    it('removes key from active settings when it is no longer set', async function () {
+        await settings.update(`aws.dev.${testSetting}`, true)
+        assert.strictEqual(sut.get(testSetting, false), true)
+        await settings.update(`aws.dev.${testSetting}`, undefined)
+        assert.strictEqual(sut.get(testSetting, false), false)
+        assert.deepStrictEqual(sut.activeSettings, {})
+    })
+
+    it('does not change active settings when reading objects as defaults', function () {
+        assert.deepStrictEqual(sut.get('endpoints', {}), {})
+        assert.deepStrictEqual(sut.activeSettings, {})
+    })
+
+    describe('isDevMode()', function () {
+        it('returns true if forceDevMode is true', async function () {
+            await settings.update('aws.dev.forceDevMode', true)
+            assert.strictEqual(sut.isDevMode(), true)
+        })
+        it('returns false if forceDevMode is false', async function () {
+            await settings.update('aws.dev.forceDevMode', false)
+            assert.strictEqual(sut.isDevMode(), false)
+        })
+        it('returns false if forceDevMode is not defined at all', async function () {
+            assert.strictEqual(sut.isDevMode(), false)
+        })
+
+        it('returns true if forceDevMode is not defined at all but active dev setting exists', async function () {
+            await settings.update(`aws.dev.${testSetting}`, true).then(() => sut.get(testSetting, false))
+            assert.strictEqual(sut.isDevMode(), true)
+        })
+        it('returns false if forceDevMode false even with other active dev setting', async function () {
+            await settings.update('aws.dev.forceDevMode', false)
+            await settings.update(`aws.dev.${testSetting}`, true).then(() => sut.get(testSetting, false))
+            assert.strictEqual(sut.isDevMode(), false)
+        })
+    })
+
+    describe('getServiceConfig()', function () {
+        describe('get CodeCatalyst config', function () {
+            const devSettingName = 'aws.dev.codecatalystService'
+            const defaultConfig = {
+                region: 'default',
+                endpoint: 'default',
+                hostname: 'default',
+                gitHostname: 'default',
+            }
+
+            it('throws an error for incomplete dev configuration', async function () {
+                const testSetting = {
+                    // missing region
+                    endpoint: 'test_endpoint',
+                    hostname: 'test_hostname',
+                    gitHostname: 'test_githostname',
+                }
+
+                await settings.update(devSettingName, testSetting)
+                assert.throws(() => sut.getServiceConfig('codecatalystService', defaultConfig), ToolkitError)
+            })
+
+            it('returns dev settings configuration when provided', async function () {
+                const testSetting = {
+                    region: 'test_region',
+                    endpoint: 'test_endpoint',
+                    hostname: 'test_hostname',
+                    gitHostname: 'test_githostname',
+                }
+
+                await settings.update(devSettingName, testSetting)
+                assert.deepStrictEqual(sut.getServiceConfig('codecatalystService', defaultConfig), testSetting)
+            })
+
+            it('returns default configuration when dev settings are not provided', function () {
+                assert.deepStrictEqual(sut.getServiceConfig('codecatalystService', defaultConfig), defaultConfig)
+            })
+        })
+
+        describe('get Codewhisperer config', function () {
+            const devSettingName = 'aws.dev.codewhispererService'
+            const defaultConfig = {
+                region: 'default',
+                endpoint: 'default',
+            }
+
+            it('throws an error for incomplete dev configuration', async function () {
+                const testSetting = {
+                    // missing region
+                    endpoint: 'test_endpoint',
+                }
+
+                await settings.update(devSettingName, testSetting)
+                assert.throws(() => sut.getServiceConfig('codewhispererService', defaultConfig), ToolkitError)
+            })
+
+            it('returns dev settings configuration when provided', async function () {
+                const testSetting = {
+                    region: 'test_region',
+                    endpoint: 'test_endpoint',
+                }
+
+                await settings.update(devSettingName, testSetting)
+                assert.deepStrictEqual(sut.getServiceConfig('codewhispererService', defaultConfig), testSetting)
+            })
+
+            it('returns default configuration when dev settings are not provided', function () {
+                assert.deepStrictEqual(sut.getServiceConfig('codewhispererService', defaultConfig), defaultConfig)
+            })
+        })
+    })
+})
+
+describe('PromptSetting', function () {
+    const promptSettingKey = 'aws.suppressPrompts'
+    const target = vscode.ConfigurationTarget.Workspace
+
+    let settings: Settings
+    let sut: ToolkitPromptSettings
+
+    beforeEach(async function () {
+        settings = new Settings(target)
+        sut = new ToolkitPromptSettings(settings)
+        await sut.reset()
+    })
+
+    describe('disablePrompt', async function () {
+        const promptName = 'apprunnerNotifyPricing'
+
+        const scenarios = [
+            {
+                testValue: { apprunnerNotifyPricing: true, other: false },
+                expected: { apprunnerNotifyPricing: true, other: false },
+                desc: 'stays suppressed',
+            },
+            {
+                testValue: { apprunnerNotifyPricing: false },
+                expected: { apprunnerNotifyPricing: true },
+                desc: 'suppresses prompt',
+            },
+        ]
+        for (const scenario of scenarios) {
+            it(scenario.desc, async () => {
+                const defaultSetting = settings.get(promptSettingKey, Object)
+                await settings.update(promptSettingKey, scenario.testValue)
+                await sut.disablePrompt(promptName)
+                const actual = settings.get(promptSettingKey)
+                const expected = { ...defaultSetting, ...scenario.expected }
+                assert.deepStrictEqual(actual, expected)
+            })
+        }
+    })
+
+    describe('isPromptEnabled', async function () {
+        const promptName = 'apprunnerNotifyPricing'
+
+        const scenarios = [
+            {
+                testValue: { apprunnerNotifyPricing: false },
+                expected: true,
+                promptAfter: { apprunnerNotifyPricing: false },
+                desc: 'true when not suppressed',
+            },
+            {
+                testValue: { apprunnerNotifyPricing: true },
+                expected: false,
+                promptAfter: { apprunnerNotifyPricing: true },
+                desc: 'false when suppressed',
+            },
+            {
+                testValue: { wrongName: false },
+                expected: true,
+                promptAfter: { wrongName: false },
+                desc: 'true when not found',
+            },
+            {
+                testValue: { apprunnerNotifyPricing: 7 },
+                expected: true,
+                promptAfter: {},
+                desc: 'true when prompt has wrong type',
+            },
+        ]
+
+        for (const scenario of scenarios) {
+            it(scenario.desc, async () => {
+                await settings.update(promptSettingKey, scenario.testValue)
+                const before = settings.get(promptSettingKey, Object, {})
+                const result = sut.isPromptEnabled(promptName)
+
+                assert.deepStrictEqual(result, scenario.expected)
+                assert.deepStrictEqual(
+                    { ...before, ...settings.get(promptSettingKey, Object) },
+                    { ...before, ...scenario.promptAfter }
+                )
+            })
+        }
+    })
+})
+
+describe('Experiments', function () {
+    let sut: Experiments
+
+    beforeEach(async function () {
+        sut = new Experiments(new TestSettings())
+        await sut.reset()
+    })
+
+    // The `Experiments` class is basically an immutable form of `PromptSettings`
+
+    it('returns false when the setting is missing', async function () {
+        assert.strictEqual(sut.isExperimentEnabled('jsonResourceModification'), false)
+    })
+
+    it('returns false for invalid types', async function () {
+        await sut.update('jsonResourceModification', 'definitely a boolean' as unknown as boolean)
+        assert.strictEqual(sut.isExperimentEnabled('jsonResourceModification'), false)
+    })
+
+    it('returns true when the flag is set', async function () {
+        await sut.update('jsonResourceModification', true)
+        assert.strictEqual(sut.isExperimentEnabled('jsonResourceModification'), true)
+    })
+
+    it('fires events from nested settings', async function () {
+        const info = vscode.workspace.getConfiguration().inspect('aws.experiments.jsonResourceModification')
+        if (info?.globalValue) {
+            this.skip()
+        }
+
+        const experiments = new Experiments(new Settings(vscode.ConfigurationTarget.Workspace))
+
+        try {
+            const key = new Promise<string>((resolve, reject) => {
+                experiments.onDidChange((event) => resolve(event.key))
+                setTimeout(() => reject(new Error('Timed out waiting for settings event')), 5000)
+            })
+
+            await experiments.update('jsonResourceModification', true)
+            assert.strictEqual(await key, 'jsonResourceModification')
+        } finally {
+            await experiments.reset()
+        }
+    })
+})
diff --git a/packages/core/src/test/shared/sshConfig.test.ts b/packages/core/src/test/shared/sshConfig.test.ts
new file mode 100644
index 00000000000..b828859586b
--- /dev/null
+++ b/packages/core/src/test/shared/sshConfig.test.ts
@@ -0,0 +1,293 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as path from 'path'
+import * as http from 'http'
+import { ToolkitError } from '../../shared/errors'
+import { Result } from '../../shared/utilities/result'
+import { ChildProcess, ChildProcessResult } from '../../shared/utilities/processUtils'
+import { SshConfig, ensureConnectScript, sshLogFileLocation } from '../../shared/sshConfig'
+import { fileExists, makeTemporaryToolkitFolder } from '../../shared/filesystemUtilities'
+import {
+    DevEnvironmentId,
+    bearerTokenCacheLocation,
+    connectScriptPrefix,
+    getCodeCatalystSsmEnv,
+} from '../../codecatalyst/model'
+import { StartDevEnvironmentSessionRequest } from '@aws-sdk/client-codecatalyst'
+import { mkdir, readFile } from 'fs/promises'
+import fs from '../../shared/fs/fs'
+import { globals } from '../../shared'
+
+class MockSshConfig extends SshConfig {
+    // State variables to track logic flow.
+    public testIsWin: boolean = false
+    public configSection: string = ''
+
+    public async getProxyCommandWrapper(command: string): Promise<Result<string, ToolkitError>> {
+        return await this.getProxyCommand(command)
+    }
+
+    public async testMatchSshSection(testSection: string) {
+        this.configSection = testSection
+        const result = await this.matchSshSection()
+        this.configSection = ''
+        return result
+    }
+
+    public async testVerifySshHostWrapper(proxyCommand: string, testSection: string) {
+        this.configSection = testSection
+        const result = this.verifySSHHost(proxyCommand)
+        this.configSection = ''
+        return result
+    }
+
+    protected override isWin() {
+        return this.testIsWin
+    }
+
+    protected override async checkSshOnHost(): Promise<ChildProcessResult> {
+        return {
+            exitCode: 0,
+            error: undefined,
+            stdout: this.configSection,
+            stderr: '',
+        }
+    }
+
+    public createSSHConfigSectionWrapper(proxyCommand: string): string {
+        return this.createSSHConfigSection(proxyCommand)
+    }
+}
+
+describe('VscodeRemoteSshConfig', async function () {
+    let config: MockSshConfig
+
+    const testCommand = 'test_connect'
+    const testProxyCommand = `'${testCommand}' '%h'`
+
+    before(function () {
+        config = new MockSshConfig('sshPath', 'testHostNamePrefix', testCommand)
+        config.testIsWin = false
+    })
+
+    describe('getProxyCommand', async function () {
+        it('returns correct proxyCommand on non-windows', async function () {
+            config.testIsWin = false
+            const result = await config.getProxyCommandWrapper(testCommand)
+            assert.ok(result.isOk())
+            const command = result.unwrap()
+            assert.strictEqual(command, testProxyCommand)
+        })
+
+        it('uses %n token for sagemaker_connect to preserve hostname case', async function () {
+            const sagemakerConfig = new MockSshConfig('sshPath', 'testHostNamePrefix', 'sagemaker_connect')
+            sagemakerConfig.testIsWin = false
+
+            const result = await sagemakerConfig.getProxyCommandWrapper('sagemaker_connect')
+            assert.ok(result.isOk())
+            const command = result.unwrap()
+            assert.strictEqual(command, `'sagemaker_connect' '%n'`)
+        })
+    })
+
+    describe('matchSshSection', async function () {
+        it('returns ok with match when proxycommand is present', async function () {
+            const testSection = `proxycommandfdsafdsafd${testProxyCommand}sa342432`
+            const result = await config.testMatchSshSection(testSection)
+            assert.ok(result.isOk())
+            const match = result.unwrap()
+            assert.ok(match)
+        })
+
+        it('returns ok result with undefined inside when proxycommand is not present', async function () {
+            const testSection = `fdsafdsafdsa342432`
+            const result = await config.testMatchSshSection(testSection)
+            assert.ok(result.isOk())
+            const match = result.unwrap()
+            assert.strictEqual(match, undefined)
+        })
+    })
+
+    describe('verifySSHHost', async function () {
+        let promptUserToConfigureSshConfigStub: sinon.SinonStub<
+            [configSection: string | undefined, proxyCommand: string],
+            Promise<void>
+        >
+        before(function () {
+            promptUserToConfigureSshConfigStub = sinon.stub(SshConfig.prototype, 'promptUserToConfigureSshConfig')
+        })
+
+        beforeEach(function () {
+            promptUserToConfigureSshConfigStub.resetHistory()
+        })
+
+        after(function () {
+            sinon.restore()
+        })
+
+        it('writes to ssh config if command not found.', async function () {
+            const testSection = 'no-command-here'
+            const result = await config.testVerifySshHostWrapper(testCommand, testSection)
+
+            assert.ok(result.isOk())
+            sinon.assert.calledOn(promptUserToConfigureSshConfigStub, config)
+            sinon.assert.calledOnce(promptUserToConfigureSshConfigStub)
+        })
+
+        it('does not write to ssh config if command is find', async function () {
+            const testSection = `this is some text that doesn't matter, but here proxycommand ${testProxyCommand}`
+            const result = await config.testVerifySshHostWrapper(testCommand, testSection)
+
+            assert.ok(result.isOk())
+            sinon.assert.notCalled(promptUserToConfigureSshConfigStub)
+        })
+    })
+
+    describe('createSSHConfigSection', async function () {
+        const testKeyPath = 'path/to/keys'
+        const newConfig = new MockSshConfig('sshPath', 'testHostNamePrefix', 'someScript', testKeyPath)
+        const expectedUserString = `User '%r'`
+        const expectedIdentityFileString = `IdentityFile '${testKeyPath}'`
+
+        it('section includes relevant script prefix', function () {
+            const testScriptName = 'testScript'
+            const section = config.createSSHConfigSectionWrapper(testScriptName)
+            assert.ok(section.includes(testScriptName))
+        })
+
+        it('includes keyPath if included in the class', function () {
+            const section = newConfig.createSSHConfigSectionWrapper('proxyCommand')
+            assert.ok(section.match(expectedIdentityFileString))
+        })
+
+        it('parses the remote username from the ssh execution', function () {
+            const section = newConfig.createSSHConfigSectionWrapper('proxyCommand')
+            assert.ok(section.match(expectedUserString))
+        })
+
+        it('omits User and IdentityFile fields when keyPath not given', function () {
+            const section = config.createSSHConfigSectionWrapper('proxyCommand')
+            assert.ok(!section.match(expectedUserString))
+            assert.ok(!section.match(expectedIdentityFileString))
+        })
+    })
+
+    describe('sshLogFileLocation', async function () {
+        it('combines service and id into proper log file', function () {
+            const testService = 'testScript'
+            const testId = 'id'
+            const result = sshLogFileLocation(testService, testId)
+
+            assert.ok(result.includes(testService))
+            assert.ok(result.includes(testId))
+            assert.ok(result.endsWith('.log'))
+        })
+    })
+})
+
+describe('CodeCatalyst Connect Script', function () {
+    function isWithin(path1: string, path2: string): boolean {
+        const rel = path.relative(path1, path2)
+        return !path.isAbsolute(rel) && !rel.startsWith('..') && !!rel
+    }
+
+    it('can get a connect script path, adding a copy to global storage', async function () {
+        const script = (await ensureConnectScript(connectScriptPrefix, globals.context)).unwrap().fsPath
+        assert.ok(await fileExists(script))
+        assert.ok(isWithin(globals.context.globalStorageUri.fsPath, script))
+    })
+
+    function createFakeServer(testDevEnv: DevEnvironmentId) {
+        return http.createServer(async (req, resp) => {
+            try {
+                const data = await new Promise<string>((resolve, reject) => {
+                    req.on('error', reject)
+                    req.on('data', (d) => resolve(d.toString()))
+                })
+
+                const body = JSON.parse(data)
+                const expected: Pick<StartDevEnvironmentSessionRequest, 'sessionConfiguration'> = {
+                    sessionConfiguration: { sessionType: 'SSH' },
+                }
+
+                const expectedPath = `/v1/spaces/${testDevEnv.org.name}/projects/${testDevEnv.project.name}/devEnvironments/${testDevEnv.id}/session`
+
+                assert.deepStrictEqual(body, expected)
+                assert.strictEqual(req.url, expectedPath)
+            } catch (e) {
+                resp.writeHead(400, { 'Content-Type': 'application/json' })
+                resp.end(JSON.stringify({ name: 'ValidationException', message: (e as Error).message }))
+
+                return
+            }
+
+            resp.writeHead(200, { 'Content-Type': 'application/json' })
+            resp.end(
+                JSON.stringify({
+                    tokenValue: 'a token',
+                    streamUrl: 'some url',
+                    sessionId: 'an id',
+                })
+            )
+        })
+    }
+
+    it('can run the script with environment variables', async function () {
+        const testDevEnv: DevEnvironmentId = {
+            id: '01234567890',
+            project: { name: 'project' },
+            org: { name: 'org' },
+        }
+
+        const server = createFakeServer(testDevEnv)
+        const address = await new Promise<string>((resolve, reject) => {
+            server.on('error', reject)
+            server.listen({ host: 'localhost', port: 28142 }, () => resolve(`http://localhost:28142`))
+        })
+
+        await fs.writeFile(bearerTokenCacheLocation(testDevEnv.id), 'token')
+        const script = (await ensureConnectScript(connectScriptPrefix, globals.context)).unwrap().fsPath
+        const env = getCodeCatalystSsmEnv('us-weast-1', 'echo', testDevEnv)
+        env.CODECATALYST_ENDPOINT = address
+
+        // This could be de-duped
+        const isWindows = process.platform === 'win32'
+        const cmd = isWindows ? 'powershell.exe' : script
+        const args = isWindows ? ['-ExecutionPolicy', 'Bypass', '-File', script, 'bar'] : [script, 'bar']
+
+        const output = await new ChildProcess(cmd, args).run({ spawnOptions: { env } })
+        if (output.exitCode !== 0) {
+            const logOutput = sshLogFileLocation('codecatalyst', testDevEnv.id)
+            const message = `stderr:\n${output.stderr}\n\nlogs:\n${await readFile(logOutput)}`
+
+            assert.fail(`Connect script should exit with a zero status:\n${message}`)
+        }
+    })
+
+    describe('~/.ssh', function () {
+        let tmpDir: string
+
+        beforeEach(async function () {
+            tmpDir = await makeTemporaryToolkitFolder()
+            sinon.stub(fs, 'getUserHomeDir').returns(tmpDir)
+        })
+
+        afterEach(async function () {
+            sinon.restore()
+            await fs.delete(tmpDir, { recursive: true })
+        })
+
+        it('works if the .ssh directory is missing', async function () {
+            ;(await ensureConnectScript(connectScriptPrefix, globals.context)).unwrap()
+        })
+
+        it('works if the .ssh directory exists but has different perms', async function () {
+            await mkdir(path.join(tmpDir, '.ssh'), 0o777)
+            ;(await ensureConnectScript(connectScriptPrefix, globals.context)).unwrap()
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/telemetry/activation.test.ts b/packages/core/src/test/shared/telemetry/activation.test.ts
new file mode 100644
index 00000000000..a277cb0b042
--- /dev/null
+++ b/packages/core/src/test/shared/telemetry/activation.test.ts
@@ -0,0 +1,68 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import {
+    handleTelemetryNoticeResponse,
+    noticeResponseViewSettings,
+    noticeResponseOk,
+    hasUserSeenTelemetryNotice,
+    setHasUserSeenTelemetryNotice,
+} from '../../../shared/telemetry/activation'
+import globals from '../../../shared/extensionGlobals'
+
+describe('handleTelemetryNoticeResponse', function () {
+    it('does nothing when notice is discarded', async function () {
+        await handleTelemetryNoticeResponse(undefined)
+        assert.strictEqual(
+            globals.globalState.get('awsTelemetryNoticeVersionAck'),
+            undefined,
+            'Expected opt out shown state to remain unchanged'
+        )
+    })
+
+    it('handles View Settings response', async function () {
+        await handleTelemetryNoticeResponse(noticeResponseViewSettings)
+        assert.strictEqual(
+            globals.globalState.get('awsTelemetryNoticeVersionAck'),
+            2,
+            'Expected opt out shown state to be set'
+        )
+    })
+
+    it('handles Ok response', async function () {
+        await handleTelemetryNoticeResponse(noticeResponseOk)
+
+        assert.strictEqual(
+            globals.globalState.get('awsTelemetryNoticeVersionAck'),
+            2,
+            'Expected opt out shown state to be set'
+        )
+    })
+})
+
+describe('hasUserSeenTelemetryNotice', async function () {
+    beforeEach(async function () {})
+
+    it('is affected by setHasUserSeenTelemetryNotice', async function () {
+        assert.ok(!hasUserSeenTelemetryNotice())
+        await setHasUserSeenTelemetryNotice()
+        assert.ok(hasUserSeenTelemetryNotice())
+    })
+
+    const scenarios = [
+        { currentState: undefined, expectedHasSeen: false, desc: 'never seen before' },
+        { currentState: 0, expectedHasSeen: false, desc: 'seen an older version' },
+        { currentState: 2, expectedHasSeen: true, desc: 'seen the current version' },
+        { currentState: 9999, expectedHasSeen: true, desc: 'seen a future version' },
+    ]
+
+    for (const scenario of scenarios) {
+        it(scenario.desc, async () => {
+            await globals.globalState.update('awsTelemetryNoticeVersionAck', scenario.currentState)
+            assert.strictEqual(hasUserSeenTelemetryNotice(), scenario.expectedHasSeen)
+        })
+    }
+})
diff --git a/packages/core/src/test/shared/telemetry/spans.test.ts b/packages/core/src/test/shared/telemetry/spans.test.ts
new file mode 100644
index 00000000000..7c0daacadc1
--- /dev/null
+++ b/packages/core/src/test/shared/telemetry/spans.test.ts
@@ -0,0 +1,738 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { getErrorId, ToolkitError } from '../../../shared/errors'
+import { asStringifiedStack, FunctionEntry, TelemetrySpan, TelemetryTracer } from '../../../shared/telemetry/spans'
+import { MetricName, MetricShapes, telemetry } from '../../../shared/telemetry/telemetry'
+import { assertTelemetry, getMetrics, installFakeClock } from '../../testUtil'
+import { selectFrom } from '../../../shared/utilities/tsUtils'
+import { getAwsServiceError } from '../errors.test'
+import { sleep } from '../../../shared'
+import { withTelemetryContext } from '../../../shared/telemetry/util'
+import { SinonSandbox } from 'sinon'
+import sinon from 'sinon'
+import * as crypto from '../../../shared/crypto'
+
+describe('TelemetrySpan', function () {
+    let clock: ReturnType<typeof installFakeClock>
+    let sandbox: SinonSandbox
+
+    beforeEach(function () {
+        clock = installFakeClock()
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(function () {
+        clock.uninstall()
+        sandbox.restore()
+    })
+
+    it('removes passive and value from the metadata', function () {
+        new TelemetrySpan('foo').emit({ passive: false, value: 100, result: 'Succeeded', reason: 'bar' })
+
+        assertTelemetry('foo' as MetricName, { result: 'Succeeded', reason: 'bar' })
+    })
+
+    it('records duration if a start time is available', function () {
+        const span = new TelemetrySpan('foo').start()
+        clock.tick(100)
+        span.stop()
+
+        assertTelemetry('foo' as MetricName, {
+            result: 'Succeeded',
+            duration: 100,
+        })
+    })
+
+    it('records failure reason if available', function () {
+        new TelemetrySpan('foo').start().stop(new ToolkitError('', { code: 'Foo' }))
+
+        assertTelemetry('foo' as MetricName, {
+            result: 'Failed',
+            reason: 'Foo',
+            duration: 0,
+        })
+    })
+
+    it('reports missing required fields', function () {
+        new TelemetrySpan('vscode_executeCommand').emit()
+
+        assertTelemetry('vscode_executeCommand', {
+            missingFields: String(['command']),
+        } as any)
+    })
+
+    it('can create clones that do not copy the start time', function () {
+        const span = new TelemetrySpan('foo').record({ reason: 'bar' }).start()
+        clock.tick(100)
+        span.clone().emit({ result: 'Failed' })
+        span.stop()
+
+        assertTelemetry('foo' as MetricName, [
+            { result: 'Failed', reason: 'bar' },
+            { result: 'Succeeded', duration: 100 },
+        ])
+    })
+})
+
+describe('TelemetryTracer', function () {
+    let tracer: TelemetryTracer
+    let clock: ReturnType<typeof installFakeClock> | undefined
+    let sandbox: SinonSandbox
+    const metricName = 'test_metric' as MetricName
+
+    beforeEach(function () {
+        tracer = new TelemetryTracer()
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(function () {
+        clock?.uninstall()
+        sandbox.restore()
+    })
+
+    describe('record()', function () {
+        it('only writes to the active span in the current context', function () {
+            tracer.apigateway_copyUrl.run(() => {
+                tracer.run(metricName, () => tracer.record({ source: 'bar' }))
+                tracer.spans[0]?.emit()
+            })
+
+            assertTelemetry(metricName, { result: 'Succeeded', source: 'bar' })
+            assertTelemetry('apigateway_copyUrl', {})
+        })
+
+        it('writes to all new spans in the current context', function () {
+            tracer.apigateway_copyUrl.run(() => {
+                tracer.record({ source: 'bar' })
+                tracer.run(metricName, () => {})
+            })
+
+            assertTelemetry(metricName, { result: 'Succeeded', source: 'bar' })
+            assertTelemetry('apigateway_copyUrl', { result: 'Succeeded', source: 'bar' })
+        })
+
+        it('does not propagate state outside of the execution', function () {
+            tracer.apigateway_copyUrl.run(() => tracer.record({ source: 'bar' }))
+            tracer.run(metricName, () => {})
+
+            assertTelemetry(metricName, { result: 'Succeeded' })
+        })
+
+        it('does not clobber subsequent writes to individual spans', function () {
+            tracer.run(metricName, (span) => {
+                tracer.record({ source: 'bar' })
+                span.record({ source: 'foo' })
+            })
+
+            assertTelemetry(metricName, { result: 'Succeeded', source: 'foo' })
+        })
+
+        it('has no effect when called outside of a context', function () {
+            tracer.record({ source: 'bar' })
+            tracer.run(metricName, () => {})
+
+            assertTelemetry(metricName, { result: 'Succeeded' })
+        })
+    })
+
+    describe('instrument()', function () {
+        async function assertPositive(n: number): Promise<number> {
+            if (n <= 0) {
+                throw new Error()
+            }
+
+            return n
+        }
+
+        it('can instrument a function', async function () {
+            const fn = tracer.instrument(metricName, assertPositive)
+
+            assert.strictEqual(await fn(1), 1)
+            assertTelemetry(metricName, { result: 'Succeeded' })
+        })
+
+        it('can instrument a function that fails', async function () {
+            const fn = tracer.instrument(metricName, assertPositive)
+
+            await assert.rejects(() => fn(-1))
+            assertTelemetry(metricName, { result: 'Failed', reason: 'Error' })
+        })
+    })
+
+    describe('metrics', function () {
+        it('does not change the context when emitting', function () {
+            tracer.vscode_executeCommand.emit({ command: 'foo', debounceCount: 1 })
+
+            assert.strictEqual(tracer.activeSpan, undefined)
+            assert.strictEqual(tracer.spans.length, 0)
+        })
+
+        it('does not change the active span when using a different span', function () {
+            tracer.run(metricName, (span) => {
+                tracer.vscode_executeCommand.emit({ command: 'foo', debounceCount: 1 })
+                assert.strictEqual(tracer.activeSpan, span)
+            })
+
+            assertTelemetry(metricName, { result: 'Succeeded' })
+            assert.strictEqual(tracer.activeSpan, undefined)
+        })
+    })
+
+    describe('increment()', function () {
+        it('starts at 0 for uninitialized fields', function () {
+            tracer.vscode_executeCommand.run((span) => {
+                span.record({ command: 'foo' })
+                span.increment({ debounceCount: 1 })
+                span.increment({ debounceCount: 1 })
+            })
+
+            assertTelemetry('vscode_executeCommand', {
+                result: 'Succeeded',
+                command: 'foo',
+                debounceCount: 2,
+            })
+        })
+
+        it('applies to spans independently from one another', function () {
+            tracer.vscode_executeCommand.run((span) => {
+                span.record({ debounceCount: 1 })
+                span.increment({ debounceCount: 1 })
+                tracer.vscode_executeCommand.run((span) => {
+                    span.increment({ debounceCount: 10 })
+                })
+            })
+
+            const metrics = getMetrics('vscode_executeCommand').map((m) => selectFrom(m, 'debounceCount'))
+            assert.deepStrictEqual(metrics[0], { debounceCount: '10' })
+            assert.deepStrictEqual(metrics[1], { debounceCount: '2' })
+        })
+    })
+
+    describe('run()', function () {
+        it('returns the result of the function', function () {
+            const result = tracer.run(metricName, () => 'foo')
+
+            assert.strictEqual(result, 'foo')
+        })
+
+        it('sets the active span', function () {
+            const checkSpan = () => tracer.run(metricName, (span) => assert.strictEqual(tracer.activeSpan, span))
+
+            assert.doesNotThrow(checkSpan)
+        })
+
+        it('uses a span over a telemetry metric', function () {
+            tracer.run(metricName, (span) => span.record({ source: 'bar' }))
+
+            assertTelemetry(metricName, { result: 'Succeeded', source: 'bar' })
+        })
+
+        it('records standard fields on failed service request', async function () {
+            await assert.rejects(async () => {
+                await tracer.aws_loginWithBrowser.run(async () => {
+                    throw await getAwsServiceError()
+                })
+            })
+
+            assertTelemetry('aws_loginWithBrowser', {
+                result: 'Failed',
+                reason: 'InvalidRequestException',
+                reasonDesc: 'InvalidRequestException: Invalid client ID provided',
+                httpStatusCode: '400',
+            })
+            const metric = getMetrics('aws_loginWithBrowser')[0]
+            assert.match(metric.awsAccount ?? '', /not-set|n\/a|\d+/)
+            assert.match(metric.awsRegion ?? '', /not-set|\w+-\w+-\d+/)
+            assert.match(String(metric.duration) ?? '', /\d+/)
+            assert.match(metric.requestId ?? '', /[a-z0-9-]+/)
+        })
+
+        describe('nested run()', function () {
+            let uuidStub: sinon.SinonStub
+            const nestedName = 'nested_metric' as MetricName
+            const testId = 'foo-foo-foo-foo-foo'
+            const flowName = 'testTraceFlow'
+
+            beforeEach(() => {
+                uuidStub = sandbox.stub(crypto, 'randomUUID')
+
+                // in the first call we set the trace id in subsequent calls we get the span ids
+                uuidStub.returns(testId)
+            })
+
+            it('can record metadata in nested spans', function () {
+                tracer.run(metricName, (span1) => {
+                    span1.record({ source: 'bar' })
+
+                    tracer.run(nestedName, (span2) => {
+                        span1.record({ attempts: 1 })
+                        span2.record({ source: 'foo' })
+                    })
+                })
+
+                assertTelemetry(metricName, { result: 'Succeeded', source: 'bar', attempts: 1 })
+                assertTelemetry(nestedName, { result: 'Succeeded', source: 'foo' })
+            })
+
+            it('removes spans when exiting an execution context', function () {
+                tracer.run(metricName, () => {
+                    tracer.run(nestedName, () => {
+                        assert.strictEqual(tracer.spans.length, 3)
+                    })
+
+                    assert.strictEqual(tracer.spans.length, 2)
+                })
+            })
+
+            it('adds spans during a nested execution, closing them when after', function () {
+                tracer.run(metricName, () => {
+                    tracer.run(nestedName, () => assert.strictEqual(tracer.spans.length, 3))
+                    tracer.run(nestedName, () => assert.strictEqual(tracer.spans.length, 3))
+                    assert.strictEqual(tracer.spans.length, 2)
+                })
+
+                assert.strictEqual(tracer.spans.length, 0)
+            })
+
+            it('supports nesting the same event name', function () {
+                tracer.run(metricName, () => {
+                    tracer.run(metricName, () => {
+                        assert.strictEqual(tracer.spans.length, 3)
+                        assert.ok(tracer.spans.filter((m) => m.name !== 'root').every((s) => s.name === metricName))
+                    })
+                })
+            })
+
+            it('attaches the parent id to the child span', function () {
+                tracer.run(metricName, () => tracer.run(nestedName, () => {}))
+                assertTelemetry(metricName, { result: 'Succeeded' })
+                assertTelemetry(nestedName, { result: 'Succeeded', parentId: testId })
+            })
+
+            it('should set trace id', function () {
+                telemetry.trace_event.run((span) => {
+                    span.record({ name: flowName })
+                    assert.deepStrictEqual(telemetry.activeSpan?.getMetricId(), testId)
+                })
+                const event = getMetrics('trace_event')
+                assert.deepStrictEqual(event[0].traceId, testId)
+                assert.deepStrictEqual(event[0].name, 'testTraceFlow')
+            })
+
+            it('trace id is propogated to children', function () {
+                const metricsIds = {
+                    trace_event: {
+                        metricId: 'traceEvent',
+                        traceId: testId,
+                        parentId: undefined,
+                    },
+                    amazonq_startConversation: {
+                        metricId: 'amazonq_startConversation',
+                        traceId: testId,
+                        parentId: 'traceEvent',
+                    },
+                    amazonq_addMessage: {
+                        metricId: 'amazonq_addMessage',
+                        traceId: testId,
+                        parentId: 'amazonq_startConversation',
+                    },
+                    vscode_executeCommand: {
+                        metricId: 'vscode_executeCommand',
+                        traceId: testId,
+                        parentId: 'traceEvent',
+                    },
+                    amazonq_enterFocusConversation: {
+                        metricId: 'amazonq_enterFocusConversation',
+                        traceId: testId,
+                        parentId: 'vscode_executeCommand',
+                    },
+                    amazonq_exitFocusConversation: {
+                        metricId: 'amazonq_exitFocusConversation',
+                        traceId: testId,
+                        parentId: 'amazonq_enterFocusConversation',
+                    },
+                    amazonq_closeChat: {
+                        metricId: 'amazonq_closeChat',
+                        traceId: testId,
+                        parentId: 'traceEvent',
+                    },
+                }
+
+                /**
+                 * randomUUID calls:
+                 * The first is called on the root event that never gets emitted
+                 * The second is called when generating the traceId
+                 * The rest are called when generating the spanIds
+                 */
+                uuidStub.onCall(1).returns(testId)
+                let index = 2
+                for (const v of Object.values(metricsIds)) {
+                    uuidStub.onCall(index).returns(v.metricId)
+                    index++
+                }
+
+                telemetry.trace_event.run(() => {
+                    telemetry.amazonq_startConversation.run(() => {
+                        telemetry.amazonq_addMessage.run(() => {})
+                    })
+                    telemetry.vscode_executeCommand.run(() => {
+                        telemetry.amazonq_enterFocusConversation.run(() => {
+                            telemetry.amazonq_exitFocusConversation.run(() => {})
+                        })
+                    })
+                    telemetry.amazonq_closeChat.emit({
+                        result: 'Succeeded',
+                    })
+                })
+
+                const spanEntries = Object.entries(metricsIds)
+                for (let x = 0; x < spanEntries.length; x++) {
+                    const [metricName, { metricId, traceId, parentId }] = spanEntries[x]
+                    const metric = getMetrics(metricName as keyof MetricShapes)[0] as any
+                    assert.deepStrictEqual(metric.traceId, traceId)
+                    assert.deepStrictEqual(metric.metricId, metricId)
+                    assert.deepStrictEqual(metric.parentId, parentId)
+                }
+            })
+        })
+
+        describe(`run() with emit false`, function () {
+            it('emits by default when not set', function () {
+                telemetry.run(metricName, (span) => {
+                    span.record({ awsRegion: 'us-east-1' })
+                })
+                assertTelemetry(metricName, [{ awsRegion: 'us-east-1' }])
+            })
+
+            it('emits when set to true', function () {
+                telemetry.run(
+                    metricName,
+                    (span) => {
+                        span.record({ awsRegion: 'us-east-1' })
+                    },
+                    { emit: true }
+                )
+                assertTelemetry(metricName, [{ awsRegion: 'us-east-1' }])
+            })
+
+            it('emits nothing when set to false', function () {
+                telemetry.run(
+                    metricName,
+                    (span) => {
+                        span.record({ awsRegion: 'us-east-1' })
+                    },
+                    { emit: false }
+                )
+                assertTelemetry(metricName, [])
+            })
+        })
+
+        describe('run() with function entry', function () {
+            /**
+             * A class that uses execution context in its methods calls
+             */
+            class TestClassA1 {
+                constructor(readonly a2: TestClassA2) {}
+
+                methodA(): Promise<FunctionEntry[]> {
+                    return telemetry.function_call.run(() => this.methodB(), {
+                        functionId: { name: 'methodA', class: 'TestClassA1' },
+                    })
+                }
+
+                /**
+                 * IMPORTANT: this does not set a context, so it will not be included. But
+                 * any nested calls that set their own execution context will.
+                 */
+                methodB() {
+                    return this.a2.methodX()
+                }
+            }
+
+            /**
+             * Another class that uses execution context in its calls
+             */
+            class TestClassA2 {
+                methodX(): Promise<FunctionEntry[]> {
+                    return telemetry.function_call.run(
+                        async () => {
+                            // sleep to hand over execution to the other class
+                            await sleep(100)
+                            return this.methodY()
+                        },
+                        {
+                            functionId: { name: 'methodX', class: 'TestClassA2' },
+                        }
+                    )
+                }
+
+                methodY() {
+                    return telemetry.function_call.run(() => this.methodZ(), {
+                        functionId: { name: 'methodY', class: 'TestClassA2' },
+                    })
+                }
+
+                methodZ() {
+                    return telemetry.function_call.run(() => functionWithExecutionContext(), {
+                        functionId: { name: 'thisIsAlsoZ', class: 'TestClassA2' },
+                    })
+                }
+            }
+
+            /**
+             * Another class that uses execution context in its calls
+             */
+            class TestClassB1 {
+                @withTelemetryContext({ name: 'methodJ', class: 'TestClassB1' })
+                async methodJ(): Promise<FunctionEntry[]> {
+                    return this.methodK()
+                }
+
+                methodK() {
+                    return telemetry.function_call.run(
+                        async () => {
+                            // sleep to hand over execution to the other class
+                            await sleep(100)
+                            return this.methodL()
+                        },
+                        {
+                            functionId: { name: 'methodK', class: 'TestClassB1' },
+                        }
+                    )
+                }
+
+                methodL() {
+                    return telemetry.accessanalyzer_iamPolicyChecksCustomChecks.run(
+                        () => {
+                            return functionWithExecutionContext()
+                        },
+                        {
+                            functionId: { name: 'methodL', class: 'TestClassB1' },
+                        }
+                    )
+                }
+            }
+
+            function functionWithExecutionContext() {
+                return telemetry.function_call.run(() => telemetry.getFunctionStack(), {
+                    functionId: { name: 'functionWithExecutionContext' },
+                })
+            }
+
+            it(`returns the correct call stack when the context switches`, async function () {
+                // This test runs multiple functions that use the context asynchronously. They sleep() part way through their entire flow,
+                // which allows the other to execute. We expect the async local storage to maintain the correct context for each execution.
+                // The final nested function call in each stack returns the final stringified source stack.
+
+                const a1 = new TestClassA1(new TestClassA2())
+                const b1 = new TestClassB1()
+
+                const [resA1, resB1] = await Promise.all([a1.methodA(), b1.methodJ()])
+
+                assert.deepStrictEqual(resA1, [
+                    { name: 'methodA', class: 'TestClassA1' },
+                    { name: 'methodX', class: 'TestClassA2' },
+                    { name: 'methodY', class: 'TestClassA2' },
+                    { name: 'thisIsAlsoZ', class: 'TestClassA2' },
+                    { name: 'functionWithExecutionContext' },
+                ])
+                assert.deepStrictEqual(
+                    asStringifiedStack(resA1),
+                    'TestClassA1#methodA:TestClassA2#methodX,methodY,thisIsAlsoZ:functionWithExecutionContext'
+                )
+
+                assert.deepStrictEqual(resB1, [
+                    { name: 'methodJ', class: 'TestClassB1' },
+                    { name: 'methodK', class: 'TestClassB1' },
+                    { name: 'methodL', class: 'TestClassB1' },
+                    { name: 'functionWithExecutionContext' },
+                ])
+                assert.deepStrictEqual(
+                    asStringifiedStack(resB1),
+                    'TestClassB1#methodJ,methodK,methodL:functionWithExecutionContext'
+                )
+            })
+
+            it(`${asStringifiedStack.name}() works as expected`, function () {
+                assert.deepStrictEqual(asStringifiedStack([]), '')
+                assert.deepStrictEqual(asStringifiedStack([{ name: 'a' }]), 'a')
+                assert.deepStrictEqual(asStringifiedStack([{ name: 'a' }, { name: 'b' }]), 'a:b')
+                assert.deepStrictEqual(
+                    asStringifiedStack([{ name: 'a' }, { name: 'b' }, { name: 'c', class: 'C' }]),
+                    'a:b:C#c'
+                )
+                assert.deepStrictEqual(
+                    asStringifiedStack([
+                        { name: 'a1', class: 'A' },
+                        { name: 'a2', class: 'A' },
+                        { name: 'b1', class: 'B' },
+                        { name: 'b2', class: 'B' },
+                    ]),
+                    'A#a1,a2:B#b1,b2'
+                )
+            })
+        })
+    })
+
+    describe('withTelemetryContext', async function () {
+        class TestEmit {
+            @withTelemetryContext({ name: 'doesNotEmit', class: 'TestEmit' })
+            doesNotEmit() {
+                return
+            }
+
+            @withTelemetryContext({ name: 'doesEmit', class: 'TestEmit', emit: false })
+            doesEmit() {
+                return this.doesEmitNested()
+            }
+
+            @withTelemetryContext({ name: 'doesEmitNested', class: 'TestEmit', emit: true })
+            doesEmitNested() {
+                return
+            }
+        }
+
+        it(`does NOT emit an event if not explicitly set`, function () {
+            const inst = new TestEmit()
+            inst.doesNotEmit()
+            assertTelemetry('function_call', [])
+        })
+
+        it(`does emit an event on its own when explicitly set`, function () {
+            const inst = new TestEmit()
+            inst.doesEmit()
+            assertTelemetry('function_call', [
+                {
+                    functionName: 'doesEmitNested',
+                    className: 'TestEmit',
+                    source: 'TestEmit#doesEmit,doesEmitNested',
+                },
+            ])
+        })
+
+        class TestThrows {
+            @withTelemetryContext({ name: 'throwsError', class: 'TestThrows', errorCtx: true })
+            throwsError() {
+                throw arbitraryError
+            }
+
+            @withTelemetryContext({ name: 'throwsError', errorCtx: true })
+            throwsErrorButNoClass() {
+                throw arbitraryError
+            }
+
+            @withTelemetryContext({ name: 'throwsError', errorCtx: true })
+            async throwsAsyncError() {
+                throw arbitraryError
+            }
+
+            @withTelemetryContext({ name: 'throwsErrorButNoCtx', class: 'TestThrows' })
+            throwsErrorButNoCtx() {
+                throw arbitraryError
+            }
+        }
+        const arbitraryError = new Error('arbitrary error')
+
+        it(`wraps errors with function id context`, async function () {
+            const inst = new TestThrows()
+            assert.throws(
+                () => inst.throwsError(),
+                (e) => {
+                    return (
+                        e instanceof ToolkitError &&
+                        getErrorId(e) === 'TestThrows' &&
+                        e.message === 'ctx: throwsError' &&
+                        e.cause === arbitraryError
+                    )
+                }
+            )
+            assert.throws(
+                () => inst.throwsErrorButNoClass(),
+                (e) => {
+                    return (
+                        e instanceof ToolkitError &&
+                        getErrorId(e) === 'Error' &&
+                        e.message === 'ctx: throwsError' &&
+                        e.cause === arbitraryError
+                    )
+                }
+            )
+            await assert.rejects(
+                () => inst.throwsAsyncError(),
+                (e) => {
+                    return (
+                        e instanceof ToolkitError &&
+                        getErrorId(e) === 'Error' &&
+                        e.message === 'ctx: throwsError' &&
+                        e.cause === arbitraryError
+                    )
+                }
+            )
+        })
+
+        it('does not add error context by default', async function () {
+            const inst = new TestThrows()
+
+            assert.throws(
+                () => inst.throwsErrorButNoCtx(),
+                (e) => e === arbitraryError
+            )
+        })
+    })
+
+    describe('withTraceId()', function () {
+        const expectedId = 'foo-foo-foo-foo-foo'
+
+        beforeEach(() => {
+            sandbox.stub(crypto, 'randomUUID').returns(expectedId)
+        })
+
+        it('uses trace id', function () {
+            telemetry.withTraceId(() => {
+                telemetry.vscode_viewLogs.emit({
+                    result: 'Succeeded',
+                })
+            }, expectedId)
+
+            const viewLogsEvent = getMetrics('vscode_viewLogs')[0]
+            assert.deepStrictEqual(viewLogsEvent.traceId, expectedId)
+        })
+
+        it('does not use traceId when in a span', function () {
+            telemetry.vscode_executeCommand.run(() => {
+                telemetry.withTraceId(() => {
+                    telemetry.vscode_viewLogs.emit({
+                        result: 'Succeeded',
+                    })
+                }, 'testTraceId')
+            })
+
+            const executeCommandEvent = getMetrics('vscode_executeCommand')[0]
+            assert.deepStrictEqual(executeCommandEvent.traceId, expectedId)
+
+            const viewLogsEvent = getMetrics('vscode_viewLogs')[0]
+            assert.deepStrictEqual(viewLogsEvent.traceId, expectedId)
+        })
+
+        it('passes traceId through regular functions', function () {
+            telemetry.withTraceId(() => {
+                function foo() {
+                    function fi() {
+                        telemetry.vscode_viewLogs.emit({
+                            result: 'Succeeded',
+                        })
+                    }
+                    fi()
+                }
+                foo()
+            }, expectedId)
+
+            const viewLogsEvent = getMetrics('vscode_viewLogs')[0]
+            assert.deepStrictEqual(viewLogsEvent.traceId, expectedId)
+        })
+    })
+})
diff --git a/src/test/shared/telemetry/telemetryCache.test.ts b/packages/core/src/test/shared/telemetry/telemetryCache.test.ts
similarity index 96%
rename from src/test/shared/telemetry/telemetryCache.test.ts
rename to packages/core/src/test/shared/telemetry/telemetryCache.test.ts
index 65bd8b28b65..1f2f08994be 100644
--- a/src/test/shared/telemetry/telemetryCache.test.ts
+++ b/packages/core/src/test/shared/telemetry/telemetryCache.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import { filterTelemetryCacheEvents } from '../../../shared/telemetry/telemetryService'
 
 describe('Telemetry cache', function () {
diff --git a/src/test/shared/telemetry/telemetryPublisher.test.ts b/packages/core/src/test/shared/telemetry/telemetryPublisher.test.ts
similarity index 95%
rename from src/test/shared/telemetry/telemetryPublisher.test.ts
rename to packages/core/src/test/shared/telemetry/telemetryPublisher.test.ts
index cfe11d77b11..8ff9ad0b132 100644
--- a/src/test/shared/telemetry/telemetryPublisher.test.ts
+++ b/packages/core/src/test/shared/telemetry/telemetryPublisher.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import AWS = require('aws-sdk')
 import { DefaultTelemetryPublisher } from '../../../shared/telemetry/telemetryPublisher'
 import { TelemetryClient, TelemetryFeedback } from '../../../shared/telemetry/telemetryClient'
diff --git a/packages/core/src/test/shared/telemetry/telemetryService.test.ts b/packages/core/src/test/shared/telemetry/telemetryService.test.ts
new file mode 100644
index 00000000000..a18c04e3f57
--- /dev/null
+++ b/packages/core/src/test/shared/telemetry/telemetryService.test.ts
@@ -0,0 +1,270 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as FakeTimers from '@sinonjs/fake-timers'
+import * as sinon from 'sinon'
+import { DefaultTelemetryService } from '../../../shared/telemetry/telemetryService'
+import { AccountStatus } from '../../../shared/telemetry/telemetryClient'
+
+import {
+    defaultTestAccountId,
+    FakeAwsContext,
+    makeFakeAwsContextWithPlaceholderIds,
+} from '../../utilities/fakeAwsContext'
+import { FakeTelemetryPublisher } from '../../fake/fakeTelemetryService'
+import ClientTelemetry = require('../../../shared/telemetry/clienttelemetry')
+import { installFakeClock } from '../../testUtil'
+import { TelemetryLogger } from '../../../shared/telemetry/telemetryLogger'
+import globals from '../../../shared/extensionGlobals'
+import { toArrayAsync } from '../../../shared/utilities/collectionUtils'
+import { fs } from '../../../shared'
+
+type Metric = { [P in keyof ClientTelemetry.MetricDatum as Uncapitalize<P>]: ClientTelemetry.MetricDatum[P] }
+
+export function fakeMetric(metric: Partial<Metric> = {}): ClientTelemetry.MetricDatum {
+    return {
+        Passive: metric.passive ?? true,
+        MetricName: metric.metricName ?? `metric${metric.value ?? ''}`,
+        Value: metric.value ?? 1,
+        Unit: metric.unit ?? 'None',
+        EpochTimestamp: metric.epochTimestamp ?? new globals.clock.Date().getTime(),
+    }
+}
+
+describe('TelemetryService', function () {
+    const testFlushPeriod = 10
+    let clock: FakeTimers.InstalledClock
+    let sandbox: sinon.SinonSandbox
+    let mockPublisher: FakeTelemetryPublisher
+    let service: DefaultTelemetryService
+    let logger: TelemetryLogger
+
+    async function initService(awsContext = new FakeAwsContext()): Promise<DefaultTelemetryService> {
+        const newService = await DefaultTelemetryService.create(awsContext, undefined, mockPublisher)
+        newService.flushPeriod = testFlushPeriod
+        await newService.setTelemetryEnabled(true)
+
+        return newService
+    }
+
+    function stubGlobal() {
+        // TODO: don't record session stop/start using the global object so we don't have to do this
+        sandbox.stub(globals, 'telemetry').value(service)
+    }
+
+    before(function () {
+        sandbox = sinon.createSandbox()
+    })
+
+    beforeEach(async function () {
+        mockPublisher = new FakeTelemetryPublisher()
+        service = await initService()
+        logger = service.logger
+        clock = installFakeClock()
+    })
+
+    afterEach(async function () {
+        await fs.delete(service.persistFilePath, { recursive: true })
+        sandbox.restore()
+        clock.uninstall()
+    })
+
+    after(function () {
+        clock.uninstall()
+    })
+
+    it('posts feedback', async function () {
+        await service.setTelemetryEnabled(false)
+        const feedback = { comment: '', sentiment: '' }
+        await service.postFeedback(feedback)
+
+        assert.strictEqual(mockPublisher.feedback, feedback)
+    })
+
+    it('assertPassiveTelemetry() throws if active, non-cached metric is emitted during startup', async function () {
+        // Simulate cached telemetry by prepopulating records before start().
+        // (Normally readEventsFromCache() does this.)
+        service.record(fakeMetric({ value: 1, passive: true }))
+        service.record(fakeMetric({ value: 2, passive: true }))
+        // Active *cached* metric.
+        service.record(fakeMetric({ value: 4, passive: false }))
+        await service.start()
+
+        // Passive *non-cached* metric.
+        service.record(fakeMetric({ value: 5, passive: true }))
+
+        // Must *not* throw.
+        service.assertPassiveTelemetry(false)
+
+        // Active *non-cached* metric.
+        service.record(fakeMetric({ value: 6, passive: false }))
+
+        // Must throw.
+        assert.throws(() => {
+            service.assertPassiveTelemetry(false)
+        })
+
+        await service.shutdown()
+    })
+
+    it('findIter() queries pending metric items', async function () {
+        await service.start()
+        const m1 = fakeMetric({ value: 1, passive: true })
+        const m2 = fakeMetric({ value: 2, passive: true })
+        const m3 = fakeMetric({ value: 4, passive: false })
+        const m4 = fakeMetric({ value: 5, passive: false })
+        const m5 = fakeMetric({ value: 6, passive: true })
+        service.record(m1)
+        service.record(m2)
+        service.record(m3)
+        service.record(m4)
+        service.record(m5)
+
+        assert.deepStrictEqual(
+            await toArrayAsync(
+                service.findIter((m) => {
+                    return m.MetricName === 'bogus'
+                })
+            ),
+            []
+        )
+        assert.deepStrictEqual(
+            await toArrayAsync(
+                service.findIter((m) => {
+                    return m.MetricName === 'metric1'
+                })
+            ),
+            [m1]
+        )
+        assert.deepStrictEqual(
+            await toArrayAsync(
+                service.findIter((m) => {
+                    return !!m.Passive
+                })
+            ),
+            [m1, m2, m5]
+        )
+
+        await service.shutdown()
+    })
+
+    it('publishes periodically if user has said ok', async function () {
+        stubGlobal()
+
+        service.record(fakeMetric())
+
+        await service.start()
+        assert.notStrictEqual(service.timer, undefined)
+
+        clock.tick(testFlushPeriod)
+        await service.shutdown()
+
+        assert.strictEqual(mockPublisher.flushCount, 1)
+        assert.strictEqual(mockPublisher.queue.length, 2)
+    })
+
+    it('flushes over multiple intervals', async function () {
+        stubGlobal()
+        await service.start()
+
+        // First interval
+        service.record(fakeMetric({ value: 10 }))
+        service.record(fakeMetric({ value: 11 }))
+        await clock.tickAsync(testFlushPeriod)
+
+        // Second interval
+        service.record(fakeMetric({ value: 20 }))
+        service.record(fakeMetric({ value: 21 }))
+        await clock.tickAsync(testFlushPeriod)
+
+        // Third interval
+        service.record(fakeMetric({ value: 30 }))
+        service.record(fakeMetric({ value: 31 }))
+        await clock.tickAsync(testFlushPeriod)
+
+        await service.shutdown()
+
+        assert.strictEqual(mockPublisher.flushCount, 3)
+        assert.strictEqual(mockPublisher.queue.length, 7)
+    })
+
+    it('events automatically inject the active account id into the metadata', async function () {
+        service = await initService(makeFakeAwsContextWithPlaceholderIds({} as any as AWS.Credentials))
+        logger = service.logger
+        service.record(fakeMetric({ metricName: 'name' }))
+
+        assert.strictEqual(logger.metricCount, 1)
+
+        const metrics = logger.queryFull({ metricName: 'name' })
+        assertMetadataContainsTestAccount(metrics[0], defaultTestAccountId)
+    })
+
+    it('events with `session` namespace do not have an account tied to them', async function () {
+        stubGlobal()
+
+        await service.start()
+        await service.shutdown()
+
+        assert.strictEqual(logger.metricCount, 1)
+        const startEvents = logger.queryFull({ metricName: 'session_start' })
+        assertMetadataContainsTestAccount(startEvents[0], AccountStatus.NotApplicable)
+
+        const shutdownEvents = logger.queryFull({ metricName: 'session_start' })
+        assertMetadataContainsTestAccount(shutdownEvents[0], AccountStatus.NotApplicable)
+    })
+
+    it('events created with a bad active account produce metadata mentioning the bad account', async function () {
+        service = await initService({ getCredentialAccountId: () => 'this is bad!' } as unknown as FakeAwsContext)
+        logger = service.logger
+
+        service.record(fakeMetric({ metricName: 'name' }))
+        assert.strictEqual(logger.metricCount, 1)
+
+        const metricDatum = logger.queryFull({ metricName: 'name' })
+        assertMetadataContainsTestAccount(metricDatum[0], AccountStatus.Invalid)
+    })
+
+    it('events created prior to signing in do not have an account attached', async function () {
+        service.record(fakeMetric({ metricName: 'name' }))
+        assert.strictEqual(logger.metricCount, 1)
+
+        const metricData = logger.queryFull({ metricName: 'name' })
+        assertMetadataContainsTestAccount(metricData[0], AccountStatus.NotSet)
+    })
+
+    it('new events are not recorded if telemetry has been disabled', async function () {
+        stubGlobal()
+
+        service.record(fakeMetric({ metricName: 'first' })) // emits 1 metric
+        await service.setTelemetryEnabled(false)
+        await service.start()
+
+        // telemetry off: new events are never recorded
+        service.record(fakeMetric({ metricName: 'second' })) // would emit 1 metric
+        await service.shutdown()
+        await clock.tickAsync(testFlushPeriod * 2)
+
+        // only the events prior to disabling are recorded
+        assert.strictEqual(mockPublisher.flushCount, 1)
+        assert.strictEqual(mockPublisher.enqueueCount, 1)
+        assert.strictEqual(mockPublisher.queue.length, 1)
+        // and newer events are not kept in memory
+        assert.strictEqual(logger.metricCount, 1)
+    })
+
+    function assertMetadataContainsTestAccount(
+        metricDatum: ClientTelemetry.MetricDatum | undefined,
+        expectedAccountId: string
+    ) {
+        assert.ok(metricDatum, 'Metric datum was undefined')
+        const metadata = metricDatum.Metadata
+        assert.ok(metadata, 'Metric metadata was undefined')
+        assert.ok(
+            metadata.some((item) => item.Key === 'awsAccount' && item.Value === expectedAccountId),
+            'Expected metadata to contain the test account'
+        )
+    }
+})
diff --git a/packages/core/src/test/shared/telemetry/util.test.ts b/packages/core/src/test/shared/telemetry/util.test.ts
new file mode 100644
index 00000000000..059d86a891e
--- /dev/null
+++ b/packages/core/src/test/shared/telemetry/util.test.ts
@@ -0,0 +1,464 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { Memento, ConfigurationTarget } from 'vscode'
+import { Settings } from '../../../shared/settings'
+import {
+    convertLegacy,
+    getClientId,
+    getUserAgent,
+    hadClientIdOnStartup,
+    platformPair,
+    SessionId,
+    telemetryClientIdEnvKey,
+    TelemetryConfig,
+    validateMetricEvent,
+} from '../../../shared/telemetry/util'
+import { extensionVersion } from '../../../shared/vscode/env'
+import { FakeMemento } from '../../fakeExtensionContext'
+import { GlobalState } from '../../../shared/globalState'
+import { randomUUID } from 'crypto'
+import { isUuid } from '../../../shared/crypto'
+import { MetricDatum } from '../../../shared/telemetry/clienttelemetry'
+import { assertLogsContain } from '../../globalSetup.test'
+import { getClientName } from '../../../shared/telemetry/util'
+import * as extensionUtilities from '../../../shared/extensionUtilities'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+
+describe('TelemetryConfig', function () {
+    const settingKey = 'aws.telemetry'
+    const settings = new Settings(ConfigurationTarget.Workspace)
+
+    let sut: TelemetryConfig
+
+    beforeEach(function () {
+        sut = new TelemetryConfig(settings)
+    })
+
+    afterEach(async function () {
+        await sut.toolkitConfig.reset()
+    })
+
+    const scenarios = [
+        {
+            initialSettingValue: 'Enable',
+            expectedIsEnabledValue: true,
+            desc: 'Original opt-in value',
+            expectedSanitizedValue: true,
+        },
+        {
+            initialSettingValue: 'Disable',
+            expectedIsEnabledValue: false,
+            desc: 'Original opt-out value',
+            expectedSanitizedValue: false,
+        },
+        {
+            initialSettingValue: 'Use IDE settings',
+            expectedIsEnabledValue: true,
+            desc: 'Original deferral value',
+            expectedSanitizedValue: 'Use IDE settings',
+        },
+        { initialSettingValue: true, expectedIsEnabledValue: true, desc: 'Opt in', expectedSanitizedValue: true },
+        { initialSettingValue: false, expectedIsEnabledValue: false, desc: 'Opt out', expectedSanitizedValue: false },
+        {
+            initialSettingValue: 1234,
+            expectedIsEnabledValue: true,
+            desc: 'Unexpected numbers',
+            expectedSanitizedValue: 1234,
+        },
+        {
+            initialSettingValue: { label: 'garbageData' },
+            expectedIsEnabledValue: true,
+            desc: 'Unexpected object',
+            expectedSanitizedValue: { label: 'garbageData' },
+        },
+        {
+            initialSettingValue: [{ label: 'garbageDataList' }],
+            expectedIsEnabledValue: true,
+            desc: 'Unexpected array',
+            expectedSanitizedValue: [{ label: 'garbageDataList' }],
+        },
+        {
+            initialSettingValue: undefined,
+            expectedIsEnabledValue: true,
+            desc: 'Unset value',
+            expectedSanitizedValue: undefined,
+        },
+    ]
+
+    describe('isTelemetryEnabled', function () {
+        for (const scenario of scenarios) {
+            it(scenario.desc, async () => {
+                await settings.update(settingKey, scenario.initialSettingValue)
+
+                assert.strictEqual(sut.isEnabled(), scenario.expectedIsEnabledValue)
+            })
+        }
+    })
+
+    describe('sanitizeTelemetrySetting', function () {
+        for (const scenario of scenarios) {
+            it(scenario.desc, () => {
+                const tryConvert = () => {
+                    try {
+                        return convertLegacy(scenario.initialSettingValue)
+                    } catch {
+                        return scenario.initialSettingValue
+                    }
+                }
+
+                assert.deepStrictEqual(tryConvert(), scenario.expectedSanitizedValue)
+            })
+        }
+    })
+})
+
+describe('getSessionId', function () {
+    it('returns a stable UUID', function () {
+        const result = SessionId.getSessionId()
+
+        assert.deepStrictEqual(isUuid(result), true)
+        assert.deepStrictEqual(SessionId.getSessionId(), result, 'Subsequent call did not return the same UUID')
+    })
+
+    it('overwrites something that does not look like a UUID', function () {
+        ;(globalThis as any).amzn_sessionId = 'notAUUID'
+        const result = SessionId.getSessionId()
+
+        assert.deepStrictEqual(isUuid(result), true)
+        assert.deepStrictEqual(SessionId.getSessionId(), result, 'Subsequent call did not return the same UUID')
+    })
+})
+
+describe('getClientId', function () {
+    before(function () {
+        setClientIdEnvVar(undefined)
+    })
+
+    afterEach(function () {
+        setClientIdEnvVar(undefined)
+    })
+
+    function testGetClientId(globalState: GlobalState) {
+        return getClientId(globalState, true, false, randomUUID())
+    }
+
+    function setClientIdEnvVar(val: string | undefined) {
+        if (val === undefined) {
+            delete process.env[telemetryClientIdEnvKey]
+            return
+        }
+
+        process.env[telemetryClientIdEnvKey] = val
+    }
+
+    it('generates a unique id if no other id is available', function () {
+        const c1 = testGetClientId(new GlobalState(new FakeMemento()))
+        setClientIdEnvVar(undefined)
+        const c2 = testGetClientId(new GlobalState(new FakeMemento()))
+        assert.notStrictEqual(c1, c2)
+    })
+
+    it('uses id stored in global state if an id is not found in process.env', async function () {
+        const expectedClientId = 'myId'
+
+        const memento = new GlobalState(new FakeMemento())
+        await memento.update('telemetryClientId', expectedClientId)
+
+        assert.strictEqual(testGetClientId(memento), expectedClientId)
+    })
+
+    it('uses the id stored in process.env if available', async function () {
+        const expectedClientId = 'myId'
+
+        const e = new GlobalState(new FakeMemento())
+        await e.update('telemetryClientId', randomUUID())
+        setClientIdEnvVar(expectedClientId)
+
+        assert.strictEqual(testGetClientId(new GlobalState(new FakeMemento())), expectedClientId)
+    })
+
+    it('returns the same value across the calls sequentially', async function () {
+        const memento = new GlobalState(new FakeMemento())
+        const c1 = testGetClientId(memento)
+        const c2 = testGetClientId(memento)
+        assert.strictEqual(c1, c2)
+    })
+
+    it('returns nil UUID if it fails to save generated UUID', async function () {
+        const memento: Memento = {
+            keys: () => [],
+            get(key) {
+                return undefined
+            },
+            update(key, value) {
+                throw new Error()
+            },
+        }
+        const clientId = testGetClientId(new GlobalState(memento))
+        // XXX: `notStrictEqual` since getClientId() is now synchronous. Because memento.update() is async.
+        assert.notStrictEqual(clientId, '00000000-0000-0000-0000-000000000000')
+    })
+
+    it('returns the nil UUID if it fails to get the saved UUID', async function () {
+        const memento: Memento = {
+            keys: () => [],
+            get(key) {
+                throw new Error()
+            },
+            async update(key, value) {},
+        }
+        class FakeGlobalState extends GlobalState {
+            override tryGet<T>(key: any, defaultVal?: T): T | undefined {
+                return this.memento.get(key)
+            }
+        }
+        const clientId = testGetClientId(new FakeGlobalState(memento))
+        assert.strictEqual(clientId, '00000000-0000-0000-0000-000000000000')
+    })
+
+    it('should be ffffffff-ffff-ffff-ffff-ffffffffffff if in test enviroment', async function () {
+        const clientId = getClientId(new GlobalState(new FakeMemento()), true)
+        assert.strictEqual(clientId, 'ffffffff-ffff-ffff-ffff-ffffffffffff')
+    })
+
+    it('should be ffffffff-ffff-ffff-ffff-ffffffffffff if telemetry is not enabled in test enviroment', async function () {
+        const clientId = getClientId(new GlobalState(new FakeMemento()), false)
+        assert.strictEqual(clientId, 'ffffffff-ffff-ffff-ffff-ffffffffffff')
+    })
+
+    it('should be 11111111-1111-1111-1111-111111111111 if telemetry is not enabled', async function () {
+        const clientId = getClientId(new GlobalState(new FakeMemento()), false, false)
+        assert.strictEqual(clientId, '11111111-1111-1111-1111-111111111111')
+    })
+
+    describe('hadClientIdOnStartup', async function () {
+        it('returns false when no existing clientId', async function () {
+            const globalState = new GlobalState(new FakeMemento())
+            assert.strictEqual(hadClientIdOnStartup(globalState, testGetClientId), false)
+        })
+
+        it('returns true when existing env var clientId', async function () {
+            const globalState = new GlobalState(new FakeMemento())
+            setClientIdEnvVar('aaa-111')
+            assert.strictEqual(hadClientIdOnStartup(globalState, testGetClientId), true)
+        })
+
+        it('returns true when existing state clientId', async function () {
+            const globalState = new GlobalState(new FakeMemento())
+            await globalState.update('telemetryClientId', 'bbb-222')
+            assert.strictEqual(hadClientIdOnStartup(globalState, testGetClientId), true)
+        })
+    })
+})
+
+describe('getUserAgent', function () {
+    it('includes product name and version', async function () {
+        const userAgent = getUserAgent()
+        const lastPair = userAgent.split(' ')[0]
+        assert.ok(lastPair?.startsWith(`AWS-Toolkit-For-VSCode/${extensionVersion}`))
+    })
+
+    it('includes only one pair by default', async function () {
+        const userAgent = getUserAgent()
+        const pairs = userAgent.split(' ')
+        assert.strictEqual(pairs.length, 1)
+    })
+
+    it('omits `ClientId` by default', async function () {
+        const userAgent = getUserAgent()
+        assert.ok(!userAgent.includes('ClientId'))
+    })
+
+    it('includes `ClientId` at the end if opted in', async function () {
+        const userAgent = getUserAgent({ includeClientId: true })
+        const lastPair = userAgent.split(' ').pop()
+        assert.ok(lastPair?.startsWith('ClientId/'))
+    })
+
+    it('includes the platform before `ClientId` if opted in', async function () {
+        const userAgent = getUserAgent({ includePlatform: true, includeClientId: true })
+        const pairs = userAgent.split(' ')
+        const clientPairIndex = pairs.findIndex((pair) => pair.startsWith('ClientId/'))
+        const beforeClient = pairs[clientPairIndex - 1]
+        assert.strictEqual(beforeClient, platformPair())
+    })
+})
+
+describe('validateMetricEvent', function () {
+    it('does not validate exempt metrics', function () {
+        const metricEvent: MetricDatum = {
+            MetricName: 'exempt_metric',
+            Value: 1,
+            Unit: 'None',
+            Metadata: [{ Key: 'result', Value: 'Succeeded' }],
+        } as MetricDatum
+
+        validateMetricEvent(metricEvent, true, (_) => true)
+        assert.throws(() => assertLogsContain('invalid Metric', false, 'warn'))
+    })
+
+    it('passes validation for metrics with proper result property', function () {
+        const metricEvent: MetricDatum = {
+            MetricName: 'valid_metric',
+            Value: 1,
+            Unit: 'None',
+            Metadata: [{ Key: 'result', Value: 'Succeeded' }],
+        } as MetricDatum
+
+        validateMetricEvent(metricEvent, true, (_) => false)
+        assert.throws(() => assertLogsContain('invalid Metric', false, 'warn'))
+    })
+
+    it('passes validation for metrics with Failed result and reason property', function () {
+        const metricEvent: MetricDatum = {
+            MetricName: 'valid_failed_metric',
+            Value: 1,
+            Unit: 'None',
+            Metadata: [
+                { Key: 'result', Value: 'Failed' },
+                { Key: 'reason', Value: 'Something went wrong' },
+            ],
+        } as MetricDatum
+
+        validateMetricEvent(metricEvent, true, (_) => false)
+    })
+
+    it('fails validation for metrics missing result property when fatal=true', function () {
+        const metricEvent: MetricDatum = {
+            MetricName: 'invalid_metric_no_result',
+            Value: 1,
+            Unit: 'None',
+            Metadata: [{ Key: 'someOtherProperty', Value: 'value' }],
+        } as MetricDatum
+
+        assert.throws(
+            () => validateMetricEvent(metricEvent, true, (_) => false),
+            /emitted without the `result` property/
+        )
+    })
+
+    it('logs warning for metrics missing result property when fatal=false', function () {
+        const metricEvent: MetricDatum = {
+            MetricName: 'invalid_metric_no_result',
+            Value: 1,
+            Unit: 'None',
+            Metadata: [{ Key: 'someOtherProperty', Value: 'value' }],
+        } as MetricDatum
+
+        validateMetricEvent(metricEvent, false, (_) => false)
+        assertLogsContain('invalid Metric', false, 'warn')
+    })
+
+    it('fails validation for metrics with Failed result but missing reason property when fatal=true', function () {
+        const metricEvent: MetricDatum = {
+            MetricName: 'invalid_metric_failed_no_reason',
+            Value: 1,
+            Unit: 'None',
+            Metadata: [{ Key: 'result', Value: 'Failed' }],
+        } as MetricDatum
+
+        assert.throws(
+            () => validateMetricEvent(metricEvent, true),
+            /emitted with result=Failed but without the `reason` property/
+        )
+    })
+
+    it('logs warning for metrics with Failed result but missing reason property when fatal=false', function () {
+        const metricEvent: MetricDatum = {
+            MetricName: 'invalid_metric_failed_no_reason',
+            Value: 1,
+            Unit: 'None',
+            Metadata: [{ Key: 'result', Value: 'Failed' }],
+        } as MetricDatum
+
+        validateMetricEvent(metricEvent, false)
+        assertLogsContain('invalid Metric', false, 'warn')
+    })
+
+    it('does not fail validation for metrics with missing fields with fatal=true', function () {
+        const metricEvent: MetricDatum = {
+            MetricName: 'invalid_metric_missing_fields',
+            Value: 1,
+            Unit: 'None',
+            Metadata: [
+                { Key: 'result', Value: 'Succeeded' },
+                { Key: 'missingFields', Value: 'field1,field2' },
+            ],
+        } as MetricDatum
+
+        validateMetricEvent(metricEvent, false)
+        assertLogsContain('invalid Metric', false, 'warn')
+    })
+})
+
+describe('getClientName', function () {
+    let sandbox: sinon.SinonSandbox
+    let isSageMakerStub: sinon.SinonStub
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        isSageMakerStub = sandbox.stub(extensionUtilities, 'isSageMaker')
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('returns "AmazonQ-For-SMUS-CE" when in SMUS environment', function () {
+        isSageMakerStub.withArgs('SMUS').returns(true)
+        sandbox.stub(vscode.env, 'appName').value('SageMaker Code Editor')
+
+        const result = getClientName()
+
+        assert.strictEqual(result, 'AmazonQ-For-SMUS-CE')
+        assert.ok(isSageMakerStub.calledOnceWith('SMUS'))
+    })
+
+    it('returns "AmazonQ-For-SMAI-CE" when in SMAI environment', function () {
+        isSageMakerStub.withArgs('SMUS').returns(false)
+        isSageMakerStub.withArgs('SMAI').returns(true)
+        sandbox.stub(vscode.env, 'appName').value('SageMaker Code Editor')
+
+        const result = getClientName()
+
+        assert.strictEqual(result, 'AmazonQ-For-SMAI-CE')
+        assert.ok(isSageMakerStub.calledWith('SMUS'))
+        assert.ok(isSageMakerStub.calledWith('SMAI'))
+    })
+
+    it('returns vscode app name when not in SMUS environment', function () {
+        const mockAppName = 'Visual Studio Code'
+        isSageMakerStub.withArgs('SMUS').returns(false)
+        isSageMakerStub.withArgs('SMAI').returns(false)
+        sandbox.stub(vscode.env, 'appName').value(mockAppName)
+
+        const result = getClientName()
+
+        assert.strictEqual(result, mockAppName)
+        assert.ok(isSageMakerStub.calledWith('SMUS'))
+        assert.ok(isSageMakerStub.calledWith('SMAI'))
+    })
+
+    it('handles undefined app name gracefully', function () {
+        isSageMakerStub.withArgs('SMUS').returns(false)
+        sandbox.stub(vscode.env, 'appName').value(undefined)
+
+        const result = getClientName()
+
+        assert.strictEqual(result, undefined)
+    })
+
+    it('prioritizes SMUS detection over app name', function () {
+        isSageMakerStub.withArgs('SMUS').returns(true)
+        sandbox.stub(vscode.env, 'appName').value('SageMaker Code Editor')
+
+        const result = getClientName()
+
+        assert.strictEqual(result, 'AmazonQ-For-SMUS-CE')
+    })
+})
diff --git a/src/test/shared/treeview/nodes/testAWSTreeNode.ts b/packages/core/src/test/shared/treeview/nodes/testAWSTreeNode.ts
similarity index 77%
rename from src/test/shared/treeview/nodes/testAWSTreeNode.ts
rename to packages/core/src/test/shared/treeview/nodes/testAWSTreeNode.ts
index d1bdf0cd313..832dda0141e 100644
--- a/src/test/shared/treeview/nodes/testAWSTreeNode.ts
+++ b/packages/core/src/test/shared/treeview/nodes/testAWSTreeNode.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/src/test/shared/treeview/resource.test.ts b/packages/core/src/test/shared/treeview/resource.test.ts
similarity index 96%
rename from src/test/shared/treeview/resource.test.ts
rename to packages/core/src/test/shared/treeview/resource.test.ts
index c341bd865c4..6f1240e134f 100644
--- a/src/test/shared/treeview/resource.test.ts
+++ b/packages/core/src/test/shared/treeview/resource.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import { TreeItem, Command, TreeItemCollapsibleState, EventEmitter } from 'vscode'
 import { loadMoreCommand, ResourceTreeNode } from '../../../shared/treeview/resource'
 import { TreeNode } from '../../../shared/treeview/resourceTreeDataProvider'
@@ -11,7 +11,7 @@ import { toCollection } from '../../../shared/utilities/asyncCollection'
 
 type Replace<T, K extends keyof T, U> = Omit<T, K> & { [P in K]: U }
 type BoundCommand<T extends any[]> = Replace<Command, 'arguments', T>
-type LoadMoreBoundCommand = BoundCommand<Parameters<typeof loadMoreCommand['execute']>>
+type LoadMoreBoundCommand = BoundCommand<Parameters<(typeof loadMoreCommand)['execute']>>
 type LoadMoreNode = Replace<TreeNode, 'getTreeItem', () => Replace<TreeItem, 'command', LoadMoreBoundCommand>>
 
 function isLoadMoreNode(node: TreeNode): node is LoadMoreNode {
@@ -54,7 +54,7 @@ describe('ResourceTreeNode', function () {
 
         const children = await node.getChildren()
         assert.deepStrictEqual(
-            children.map(n => n.id),
+            children.map((n) => n.id),
             ['1', '2', '3']
         )
     })
diff --git a/src/test/shared/treeview/resourceTreeDataProvider.test.ts b/packages/core/src/test/shared/treeview/resourceTreeDataProvider.test.ts
similarity index 94%
rename from src/test/shared/treeview/resourceTreeDataProvider.test.ts
rename to packages/core/src/test/shared/treeview/resourceTreeDataProvider.test.ts
index 0ed8ec9682c..cb54ce645bb 100644
--- a/src/test/shared/treeview/resourceTreeDataProvider.test.ts
+++ b/packages/core/src/test/shared/treeview/resourceTreeDataProvider.test.ts
@@ -1,11 +1,12 @@
 /*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import { EventEmitter, TreeItem } from 'vscode'
 import { ResourceTreeDataProvider, TreeNode } from '../../../shared/treeview/resourceTreeDataProvider'
+import { stringOrProp } from '../../../shared/utilities/tsUtils'
 
 interface Tree {
     readonly [id: string]: Tree
@@ -19,7 +20,10 @@ class TestNode implements TreeNode<TestNode> {
     public readonly onDidChangeChildren = this.onDidChangeChildrenEmitter.event
     public readonly onDidChangeTreeItem = this.onDidChangeTreeItemEmitter.event
 
-    public constructor(public readonly id: string, private readonly tree: Tree) {}
+    public constructor(
+        public readonly id: string,
+        private readonly tree: Tree
+    ) {}
 
     public refreshChildren() {
         this.onDidChangeChildrenEmitter.fire()
@@ -47,7 +51,7 @@ function getRoot(tree: Tree) {
 }
 
 function getLabels(nodes: TreeNode[]): Promise<string[]> {
-    return Promise.all(nodes.map(async n => (await n.getTreeItem()).label ?? 'not set'))
+    return Promise.all(nodes.map(async (n) => stringOrProp((await n.getTreeItem()).label, 'label') ?? 'not set'))
 }
 
 function toTestNode(node: TreeNode): TestNode | never {
@@ -60,7 +64,7 @@ function toTestNode(node: TreeNode): TestNode | never {
 
 function setupChanged(provider: ResourceTreeDataProvider): TreeNode[] {
     const changed: TreeNode[] = []
-    provider.onDidChangeTreeData(node => node && changed.push(node))
+    provider.onDidChangeTreeData((node) => node && changed.push(node))
 
     return changed
 }
diff --git a/packages/core/src/test/shared/treeview/testUtil.ts b/packages/core/src/test/shared/treeview/testUtil.ts
new file mode 100644
index 00000000000..cd4d1aee90e
--- /dev/null
+++ b/packages/core/src/test/shared/treeview/testUtil.ts
@@ -0,0 +1,43 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import assert from 'assert'
+import { selectFrom, keys } from '../../../shared/utilities/tsUtils'
+import { TreeNode } from '../../../shared/treeview/resourceTreeDataProvider'
+
+type Nodeable = { toTreeNode: () => TreeNode }
+type Node = TreeNode | Nodeable
+type Matcher = string | { [P in keyof vscode.TreeItem]: vscode.TreeItem[P] }
+
+const resolveNode = (node: Node) =>
+    (node as Nodeable).toTreeNode !== undefined ? (node as Nodeable).toTreeNode() : (node as TreeNode)
+
+const applyMatcher = (item: vscode.TreeItem, matcher: Matcher | undefined) =>
+    !!matcher && typeof matcher !== 'string' ? selectFrom(item, ...keys(matcher)) : item.label
+
+/**
+ * Checks if the explorer tree node produces an item that matches the expected properties.
+ *
+ * Only fields specified will be checked. Everything else on the item is ignored.
+ */
+export async function assertTreeItem(model: Node, expected: Exclude<Matcher, string>): Promise<void | never> {
+    const item = await resolveNode(model).getTreeItem()
+    assert.deepStrictEqual(applyMatcher(item, expected), expected)
+}
+
+/**
+ * Checks if the explorer tree node produces the expected children.
+ *
+ * Children can be matched either by their label or by an object of expected properties.
+ */
+export async function assertChildren(model: Node, ...expected: Matcher[]): Promise<void | never> {
+    const children = await resolveNode(model).getChildren?.()
+    assert.ok(children, 'Expected tree node to have children')
+
+    const items = await Promise.all(children.map((child) => child.getTreeItem()))
+    const matched = items.map((item, i) => applyMatcher(item, expected[i]))
+    assert.deepStrictEqual(matched, expected)
+}
diff --git a/src/test/shared/treeview/treeNodeUtilities.test.ts b/packages/core/src/test/shared/treeview/treeNodeUtilities.test.ts
similarity index 92%
rename from src/test/shared/treeview/treeNodeUtilities.test.ts
rename to packages/core/src/test/shared/treeview/treeNodeUtilities.test.ts
index 9997a0ef150..ad02f3600ce 100644
--- a/src/test/shared/treeview/treeNodeUtilities.test.ts
+++ b/packages/core/src/test/shared/treeview/treeNodeUtilities.test.ts
@@ -1,11 +1,11 @@
 /*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
-import { makeChildrenNodes } from '../../../shared/treeview/utils'
+import { compareTreeItems, makeChildrenNodes } from '../../../shared/treeview/utils'
 import { assertNodeListOnlyHasErrorNode } from '../../utilities/explorerNodeAssertions'
 import { TestAWSTreeNode } from './nodes/testAWSTreeNode'
 
@@ -59,7 +59,7 @@ describe('makeChildrenNodes', async function () {
     it('sorts the child nodes', async function () {
         const childNodes = await makeChildrenNodes({
             getChildNodes: async () => [nodeB, nodeA],
-            sort: (a, b) => a.label!.localeCompare(b.label!),
+            sort: (a, b) => compareTreeItems(a, b),
         })
 
         assert.strictEqual(childNodes.length, 2, 'Unexpected child node count')
diff --git a/src/test/shared/ui/buttons.test.ts b/packages/core/src/test/shared/ui/buttons.test.ts
similarity index 84%
rename from src/test/shared/ui/buttons.test.ts
rename to packages/core/src/test/shared/ui/buttons.test.ts
index d30a71840d0..34474e98347 100644
--- a/src/test/shared/ui/buttons.test.ts
+++ b/packages/core/src/test/shared/ui/buttons.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as buttons from '../../../shared/ui/buttons'
 
 describe('UI buttons', function () {
diff --git a/packages/core/src/test/shared/ui/inputPrompter.test.ts b/packages/core/src/test/shared/ui/inputPrompter.test.ts
new file mode 100644
index 00000000000..fdf8dbb1600
--- /dev/null
+++ b/packages/core/src/test/shared/ui/inputPrompter.test.ts
@@ -0,0 +1,145 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { createBackButton, QuickInputButton } from '../../../shared/ui/buttons'
+import { WIZARD_BACK } from '../../../shared/wizards/wizard'
+import * as vscode from 'vscode'
+import { createInputBox, defaultInputboxOptions, InputBoxPrompter } from '../../../shared/ui/inputPrompter'
+import { TestInputBox } from '../vscode/quickInput'
+import { getTestWindow } from '../../shared/vscode/window'
+
+describe('createInputBox', function () {
+    it('creates a new prompter with options', async function () {
+        const prompter = createInputBox({ title: 'test' })
+        assert.strictEqual(prompter.inputBox.title, 'test')
+    })
+
+    it('applies default options', async function () {
+        const prompter = createInputBox()
+        const inputBox = prompter.inputBox
+
+        for (const key of Object.keys(defaultInputboxOptions)) {
+            assert.strictEqual(inputBox[key as keyof vscode.InputBox], (defaultInputboxOptions as any)[key])
+        }
+    })
+})
+
+describe('InputBoxPrompter', function () {
+    let inputBox: TestInputBox
+    let testPrompter: InputBoxPrompter
+
+    beforeEach(function () {
+        inputBox = getTestWindow().createInputBox() as typeof inputBox
+        testPrompter = new InputBoxPrompter(inputBox)
+    })
+
+    it('accepts user input', async function () {
+        const result = testPrompter.prompt()
+        inputBox.acceptValue('input')
+        assert.strictEqual(await result, 'input')
+    })
+
+    it('steps can be set', async function () {
+        testPrompter.setSteps(1, 2)
+        assert.strictEqual(inputBox.step, 1)
+        assert.strictEqual(inputBox.totalSteps, 2)
+    })
+
+    it('returns last response', async function () {
+        const result = testPrompter.prompt()
+        inputBox.acceptValue('input')
+        assert.strictEqual(await result, 'input')
+        assert.strictEqual(testPrompter.recentItem, 'input')
+    })
+
+    it('can set last response', async function () {
+        testPrompter.recentItem = 'last response'
+        assert.strictEqual(inputBox.value, 'last response')
+    })
+
+    describe('buttons', function () {
+        it('back button returns control signal', async function () {
+            const back = createBackButton()
+            inputBox.buttons = [back]
+
+            const result = testPrompter.prompt()
+            inputBox.pressButton(back)
+
+            assert.strictEqual(await result, WIZARD_BACK)
+        })
+
+        it('buttons can return values', async function () {
+            const button: QuickInputButton<string> = {
+                iconPath: vscode.Uri.parse(''),
+                onClick: () => 'answer',
+            }
+            inputBox.buttons = [button]
+
+            const result = testPrompter.prompt()
+            inputBox.pressButton(button)
+
+            assert.strictEqual(await result, 'answer')
+        })
+
+        it('buttons with void return type do not close the prompter', async function () {
+            const button: QuickInputButton<void> = {
+                iconPath: vscode.Uri.parse(''),
+                onClick: () => {},
+            }
+            inputBox.buttons = [button]
+
+            const result = testPrompter.prompt()
+            inputBox.pressButton(button)
+            inputBox.acceptValue('answer')
+
+            assert.strictEqual(await result, 'answer')
+        })
+    })
+
+    describe('validation', function () {
+        it('will not accept input if validation message is showing', async function () {
+            const result = testPrompter.prompt()
+            inputBox.validationMessage = 'bad input'
+            inputBox.acceptValue('hello')
+            inputBox.validationMessage = undefined
+            inputBox.acceptValue('goodbye')
+
+            assert.strictEqual(await result, 'goodbye')
+        })
+
+        it('shows validation message and updates after accept', async function () {
+            const validateInput = (resp: string) => (Number.isNaN(Number.parseInt(resp)) ? 'NaN' : undefined)
+            testPrompter.setValidation(validateInput)
+            const result = testPrompter.prompt()
+            inputBox.acceptValue('hello')
+            assert.strictEqual(inputBox.validationMessage, 'NaN')
+            inputBox.value = '100'
+            assert.strictEqual(inputBox.validationMessage, undefined)
+            inputBox.acceptValue('we cannot accept this message')
+            inputBox.acceptValue('200')
+            assert.strictEqual(await result, '200')
+        })
+
+        it('passes isFinalInput', async function () {
+            function validateInput(resp: string, isFinalInput?: boolean) {
+                if (!isFinalInput) {
+                    return 'user is typing'
+                }
+                return undefined
+            }
+            testPrompter.setValidation(validateInput)
+            const result = testPrompter.prompt()
+
+            // NOT final input.
+            inputBox.value = 'hello'
+            assert.strictEqual(inputBox.validationMessage, 'user is typing')
+            // Final input (user confirmed / hit Enter).
+            inputBox.acceptValue('hello')
+            assert.strictEqual(inputBox.validationMessage, undefined)
+            assert.strictEqual(await result, 'hello')
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/ui/pickerPrompter.test.ts b/packages/core/src/test/shared/ui/pickerPrompter.test.ts
new file mode 100644
index 00000000000..cbf2a7ae3af
--- /dev/null
+++ b/packages/core/src/test/shared/ui/pickerPrompter.test.ts
@@ -0,0 +1,524 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import { createBackButton } from '../../../shared/ui/buttons'
+import {
+    createLabelQuickPick,
+    createQuickPick,
+    FilterBoxQuickPickPrompter,
+    DataQuickPickItem,
+    defaultQuickpickOptions,
+    QuickPickPrompter,
+    customUserInput,
+    createMultiPick,
+} from '../../../shared/ui/pickerPrompter'
+import { hasKey, isNonNullable } from '../../../shared/utilities/tsUtils'
+import { WIZARD_BACK, WIZARD_EXIT } from '../../../shared/wizards/wizard'
+import { getTestWindow } from '../../shared/vscode/window'
+import { TestQuickPick } from '../vscode/quickInput'
+
+describe('createQuickPick', function () {
+    const items: DataQuickPickItem<string>[] = [
+        { label: 'item1', data: 'yes' },
+        { label: 'item2', data: 'no' },
+    ]
+
+    it('applies default options', async function () {
+        const prompter = createQuickPick([])
+        const picker = prompter.quickPick
+
+        for (const key of Object.keys(picker)) {
+            const defaultValue = (defaultQuickpickOptions as Record<string, any>)[key]
+            if (defaultValue !== undefined) {
+                assert.strictEqual(picker[key as keyof vscode.QuickPick<any>], defaultValue)
+            }
+        }
+    })
+
+    it('creates a new prompter with options', async function () {
+        const prompter = createQuickPick(items, { title: 'test' })
+        assert.strictEqual(prompter.quickPick.title, 'test')
+    })
+
+    it('creates a new prompter when given a promise for items', async function () {
+        let resolveItems!: (items: DataQuickPickItem<string>[]) => void
+        const itemsPromise = new Promise<DataQuickPickItem<string>[]>((resolve) => (resolveItems = resolve))
+        const prompter = createQuickPick(itemsPromise)
+        void prompter.prompt()
+        assert.strictEqual(prompter.quickPick.busy, true)
+
+        resolveItems(items)
+        await itemsPromise
+
+        assert.strictEqual(prompter.quickPick.busy, false)
+        assert.deepStrictEqual(prompter.quickPick.items, items)
+    })
+
+    it('creates a new prompter when given an AsyncIterable', async function () {
+        let r1!: (v?: any) => void
+        let r2!: (v?: any) => void
+        const p1 = new Promise((r) => (r1 = r))
+        const p2 = new Promise((r) => (r2 = r))
+
+        async function* generator() {
+            for (const item of items) {
+                if (item === items[0]) {
+                    await p1
+                } else {
+                    await p2
+                }
+                yield [item]
+            }
+        }
+
+        const prompter = createQuickPick(generator())
+        r1()
+        await new Promise((r) => setImmediate(r))
+        assert.deepStrictEqual(prompter.quickPick.items, [items[0]])
+        assert.strictEqual(prompter.quickPick.busy, true)
+        r2()
+        await new Promise((r) => setImmediate(r))
+        assert.deepStrictEqual(prompter.quickPick.items, items)
+        assert.strictEqual(prompter.quickPick.busy, false)
+    })
+})
+
+describe('createLabelQuickPick', function () {
+    it('creates a new prompter using just labels', async function () {
+        const labelItems = [{ label: 'name1' }, { label: 'name2' }]
+        const prompter = createLabelQuickPick(labelItems)
+        assert.deepStrictEqual(
+            prompter.quickPick.items,
+            labelItems.map((item) => ({ label: item.label, data: item.label }))
+        )
+    })
+
+    it('can use promises', async function () {
+        const labelItems = [{ label: 'name1' }, { label: 'name2' }]
+        const itemsPromise = Promise.resolve(labelItems)
+
+        const prompter = createLabelQuickPick(itemsPromise)
+
+        assert.strictEqual(prompter.quickPick.busy, true)
+    })
+})
+
+describe('QuickPickPrompter', function () {
+    const testItems = [
+        { label: 'item1', data: 0 },
+        { label: 'item2', data: 1 },
+        { label: 'item3', data: 2 },
+    ]
+    let picker: TestQuickPick<DataQuickPickItem<number>>
+    let testPrompter: QuickPickPrompter<number>
+
+    beforeEach(function () {
+        picker = getTestWindow().createQuickPick() as typeof picker
+        picker.items = testItems
+        testPrompter = new QuickPickPrompter(picker)
+    })
+
+    it('can select an item', async function () {
+        picker.onDidShow(() => picker.acceptItem(testItems[0]))
+        const result = testPrompter.prompt()
+        assert.strictEqual(await result, testItems[0].data)
+    })
+
+    it('steps can be set', function () {
+        testPrompter.setSteps(1, 2)
+        assert.strictEqual(picker.step, 1)
+        assert.strictEqual(picker.totalSteps, 2)
+    })
+
+    it('can handle back button', async function () {
+        testPrompter.onDidShow(() => picker.pressButton(createBackButton()))
+        assert.strictEqual(await testPrompter.prompt(), WIZARD_BACK)
+    })
+
+    it('can accept input from buttons', async function () {
+        const testButton = { iconPath: vscode.Uri.parse(''), onClick: () => 5 }
+        testPrompter.onDidShow(() => picker.pressButton(testButton))
+        assert.strictEqual(await testPrompter.prompt(), 5)
+    })
+
+    it('can selectively enable input when loading', async function () {
+        const p = testPrompter.loadItems(new Promise((r) => setImmediate(() => r([]))), false)
+        assert.strictEqual(testPrompter.quickPick.enabled, true)
+        await p
+        assert.strictEqual(testPrompter.quickPick.enabled, true)
+    })
+
+    it('does not close if button does not return anything', async function () {
+        const testButton = { iconPath: vscode.Uri.parse(''), onClick: () => {} }
+        picker.onDidShow(() => {
+            picker.pressButton(testButton)
+            picker.acceptItem(testItems[0])
+        })
+
+        assert.strictEqual(await testPrompter.prompt(), testItems[0].data)
+    })
+
+    it('returns recent item', async function () {
+        picker.onDidShow(() => picker.acceptItem(testItems[1]))
+        const result = testPrompter.prompt()
+        assert.strictEqual(await result, testItems[1].data)
+        assert.strictEqual(testPrompter.recentItem, testItems[1])
+    })
+
+    it('can set recent item', async function () {
+        testPrompter.recentItem = testItems[2]
+        assert.deepStrictEqual(picker.activeItems, [testItems[2]])
+    })
+
+    it('tries to recover recent item from partial data', async function () {
+        testPrompter.recentItem = 2
+        assert.deepStrictEqual(picker.activeItems, [testItems[2]])
+    })
+
+    it('shows first item if recent item does not exist', async function () {
+        testPrompter.recentItem = { label: 'item4', data: 3 }
+        assert.deepStrictEqual(picker.activeItems, [testItems[0]])
+    })
+
+    it('shows a `noItemsFound` item if no items are loaded', async function () {
+        const noItemsFoundItem = { label: 'placeholder', data: 0 }
+        testPrompter = new QuickPickPrompter(picker, { noItemsFoundItem })
+        void testPrompter.clearAndLoadItems([])
+        assert.deepStrictEqual(picker.items, [noItemsFoundItem])
+    })
+
+    it('does not show a `noItemsFound` item if busy', async function () {
+        let resolveItems!: (items: DataQuickPickItem<number>[]) => void
+        const itemsPromise = new Promise<DataQuickPickItem<number>[]>((resolve) => (resolveItems = resolve))
+        const noItemsFoundItem = { label: 'placeholder', data: 0 }
+
+        testPrompter = new QuickPickPrompter(picker, { noItemsFoundItem })
+        void testPrompter.clearAndLoadItems(itemsPromise)
+        assert.strictEqual(picker.items.length, 0)
+        assert.strictEqual(picker.busy, true)
+        resolveItems(testItems)
+    })
+
+    it('shows an error item if a Promise fails to load things', async function () {
+        const badPromise = Promise.reject(new Error('my error'))
+        const errorItem = { label: 'error', data: 0 }
+        testPrompter = new QuickPickPrompter(picker, { errorItem })
+        await testPrompter.clearAndLoadItems(badPromise)
+        assert.deepStrictEqual(picker.items, [{ detail: 'my error', ...errorItem }])
+    })
+
+    it('handles AsyncIterables that return something', async function () {
+        async function* generator() {
+            for (const item of testItems.slice(0, -1)) {
+                yield [item]
+            }
+
+            return testItems.slice(-1)
+        }
+
+        await testPrompter.clearAndLoadItems(generator())
+        assert.strictEqual(picker.items.length, 3)
+    })
+
+    it('handles AsyncIterables that yield empty arrays', async function () {
+        async function* generator() {
+            for (const _ of testItems) {
+                yield []
+            }
+        }
+        const noItemsFoundItem = { label: 'placeholder', data: 0 }
+        testPrompter = new QuickPickPrompter(picker, { noItemsFoundItem })
+
+        await testPrompter.clearAndLoadItems(generator())
+        assert.deepStrictEqual(testPrompter.quickPick.items, [noItemsFoundItem])
+    })
+
+    it('handles AsyncIterables that throw', async function () {
+        const errorItem = { label: 'error', data: 0 }
+        testPrompter = new QuickPickPrompter(picker, { errorItem })
+
+        async function* generator() {
+            for (const item of testItems.slice(0, -1)) {
+                yield [item]
+            }
+
+            throw new Error('my error')
+        }
+
+        await testPrompter.clearAndLoadItems(generator())
+        assert.strictEqual(picker.items.length, 3)
+        assert.strictEqual(picker.items[picker.items.length - 1].detail, 'my error')
+    })
+
+    it('stops requesting from an AsyncIterable when hidden', async function () {
+        let unlock!: () => void
+        let lock = new Promise<void>((r) => (unlock = r))
+        async function* generator() {
+            for (const item of testItems) {
+                await lock
+                yield [item]
+                lock = new Promise<void>((r) => (unlock = r))
+            }
+        }
+
+        picker.show()
+        void testPrompter.clearAndLoadItems(generator())
+        picker.hide()
+        await new Promise((r) => picker.onDidHide(r))
+        unlock()
+        await new Promise((r) => setImmediate(r))
+        picker.assertItems([testItems[0]])
+        unlock()
+        await new Promise((r) => setImmediate(r))
+        picker.assertItems([testItems[0]])
+    })
+
+    it('loads `recentlyUsed` items at the top', async function () {
+        await testPrompter.loadItems([{ label: 'item4', data: 4, recentlyUsed: true }])
+        assert.strictEqual(picker.items[0].label, 'item4')
+        await testPrompter.loadItems([{ label: 'item5', data: 5 }])
+        assert.strictEqual(picker.items[0].label, 'item4')
+        assert.strictEqual(picker.items.length, 5)
+    })
+})
+
+describe('FilterBoxQuickPickPrompter', function () {
+    const testItems = [
+        { label: 'item1', data: 0 },
+        { label: 'item2', data: 1 },
+        { label: 'item3', data: 2 },
+    ]
+    const filterBoxInputSettings = {
+        label: 'Enter a number',
+        transform: (resp: string) => Number.parseInt(resp),
+        validator: (resp: string) => (Number.isNaN(Number.parseInt(resp)) ? 'NaN' : undefined),
+    }
+    const options = {
+        filterBoxInputSettings: filterBoxInputSettings,
+    }
+
+    let picker: TestQuickPick<DataQuickPickItem<number>>
+    let testPrompter: FilterBoxQuickPickPrompter<number>
+
+    function loadAndPrompt(): ReturnType<typeof testPrompter.prompt> {
+        return testPrompter.loadItems(testItems).then(() => testPrompter.prompt())
+    }
+
+    beforeEach(function () {
+        picker = getTestWindow().createQuickPick() as typeof picker
+        testPrompter = new FilterBoxQuickPickPrompter(picker, options)
+    })
+
+    it('adds a new item based off the filter box', async function () {
+        const input = '123'
+
+        picker.onDidShow(async () => {
+            picker.onDidChangeActive((items) => {
+                if (items[0]?.description !== undefined) {
+                    picker.acceptItem(items[0])
+                }
+            })
+            await picker.setFilter(input)
+        })
+
+        assert.strictEqual(await loadAndPrompt(), Number(input))
+    })
+
+    it('can handle additional items being added', async function () {
+        const input = '456'
+
+        picker.onDidShow(async () => {
+            picker.onDidChangeActive((items) => {
+                if (items[0]?.description !== undefined) {
+                    picker.acceptItem(items[0])
+                }
+            })
+
+            await picker.setFilter(input)
+
+            const newItems = [{ label: 'item4', data: 3 }]
+            const newItemsPromise = Promise.resolve(newItems)
+
+            await testPrompter.loadItems(newItems)
+            await testPrompter.loadItems(newItemsPromise)
+        })
+
+        assert.strictEqual(await loadAndPrompt(), Number(input))
+    })
+
+    it('can accept custom input as a last response', async function () {
+        const input = '123'
+
+        picker.onDidShow(async () => {
+            picker.onDidChangeActive((items) => {
+                if (items[0]?.description !== undefined) {
+                    picker.acceptItem(items[0])
+                }
+            })
+
+            testPrompter.recentItem = { data: customUserInput, description: input } as any
+            await picker.setFilter(input)
+        })
+
+        assert.strictEqual(await loadAndPrompt(), Number(input))
+    })
+
+    it('validates the custom input', async function () {
+        const input = 'not a number'
+
+        picker.onDidShow(async () => {
+            const disposable = picker.onDidChangeActive(async (items) => {
+                const item = items[0]
+                if (
+                    isNonNullable(item) &&
+                    item.description === input &&
+                    item.detail?.includes('NaN') &&
+                    hasKey(item, 'invalidSelection') &&
+                    item.invalidSelection
+                ) {
+                    picker.onDidChangeActive((items) => {
+                        if (items.length > 0) {
+                            picker.acceptItem(items[0])
+                        }
+                    })
+                    picker.acceptItem(picker.items[0])
+                    disposable.dispose()
+                    await picker.setFilter()
+                }
+            })
+
+            await picker.setFilter(input)
+        })
+
+        assert.strictEqual(await loadAndPrompt(), testItems[0].data)
+    })
+})
+
+describe('MultiPick', function () {
+    const items: DataQuickPickItem<string>[] = [
+        { label: 'item1', data: 'yes', picked: true },
+        { label: 'item2', data: 'no' },
+    ]
+    const itemsNoPicked: DataQuickPickItem<string>[] = [
+        { label: 'item1', data: 'yes' },
+        { label: 'item2', data: 'no' },
+    ]
+    let picker: TestQuickPick<DataQuickPickItem<string>>
+    let testPrompter: QuickPickPrompter<string>
+
+    const prepareMultipick = async (itemsToLoad: DataQuickPickItem<string>[]) => {
+        picker = getTestWindow().createQuickPick() as typeof picker
+        picker.canSelectMany = true
+        testPrompter = new QuickPickPrompter(picker)
+        await testPrompter.loadItems(itemsToLoad)
+    }
+
+    it('can handle back button', async function () {
+        await prepareMultipick(items)
+        testPrompter.onDidShow(() => picker.pressButton(createBackButton()))
+        assert.strictEqual(await testPrompter.prompt(), WIZARD_BACK)
+    })
+
+    it('can handle exit button', async function () {
+        await prepareMultipick(items)
+        testPrompter.onDidShow(() => picker.dispose())
+        assert.strictEqual(await testPrompter.prompt(), WIZARD_EXIT)
+    })
+
+    it('applies picked options', async function () {
+        await prepareMultipick(items)
+        picker.onDidShow(async () => {
+            picker.acceptDefault()
+        })
+
+        picker.onDidChangeActive(async (items) => {
+            assert.strictEqual(items[0].picked, true)
+            assert.strictEqual(items[1].picked, false)
+            assert.strictEqual(items[0].data, 'yes')
+            assert.strictEqual(items[1].data, 'no')
+        })
+
+        const result = await testPrompter.prompt()
+        assert.deepStrictEqual(result, JSON.stringify(['yes']))
+    })
+
+    it('pick non should return empty array', async function () {
+        await prepareMultipick(itemsNoPicked)
+
+        picker.onDidShow(async () => {
+            picker.acceptDefault()
+        })
+
+        picker.onDidChangeActive(async (items) => {
+            assert.strictEqual(items[0].picked, false)
+            assert.strictEqual(items[1].picked, false)
+            assert.strictEqual(items[0].data, 'yes')
+            assert.strictEqual(items[1].data, 'no')
+        })
+
+        const result = await testPrompter.prompt()
+        assert.deepStrictEqual(result, JSON.stringify([]))
+    })
+
+    it('accept all should return array', async function () {
+        await prepareMultipick(itemsNoPicked)
+        picker.onDidShow(async () => {
+            await picker.untilReady()
+            picker.acceptItems(itemsNoPicked[0], itemsNoPicked[1])
+        })
+
+        const result = await testPrompter.prompt()
+        assert.deepStrictEqual(result, JSON.stringify(['yes', 'no']))
+    })
+
+    it('creates a new prompter with options', async function () {
+        const prompter = createMultiPick(items, { title: 'test' })
+        assert.strictEqual(prompter.quickPick.title, 'test')
+    })
+
+    it('creates a new prompter when given a promise for items', async function () {
+        let resolveItems!: (items: DataQuickPickItem<string>[]) => void
+        const itemsPromise = new Promise<DataQuickPickItem<string>[]>((resolve) => (resolveItems = resolve))
+        const prompter = createMultiPick(itemsPromise)
+        void prompter.prompt()
+        assert.strictEqual(prompter.quickPick.busy, true)
+
+        resolveItems(items)
+        await itemsPromise
+
+        assert.strictEqual(prompter.quickPick.busy, false)
+        assert.deepStrictEqual(prompter.quickPick.items, items)
+    })
+
+    it('creates a new prompter when given an AsyncIterable', async function () {
+        let r1!: (v?: any) => void
+        let r2!: (v?: any) => void
+        const p1 = new Promise((r) => (r1 = r))
+        const p2 = new Promise((r) => (r2 = r))
+
+        async function* generator() {
+            for (const item of items) {
+                if (item === items[0]) {
+                    await p1
+                } else {
+                    await p2
+                }
+                yield [item]
+            }
+        }
+
+        const prompter = createMultiPick(generator())
+        r1()
+        await new Promise((r) => setImmediate(r))
+        assert.deepStrictEqual(prompter.quickPick.items, [items[0]])
+        assert.strictEqual(prompter.quickPick.busy, true)
+        r2()
+        await new Promise((r) => setImmediate(r))
+        assert.deepStrictEqual(prompter.quickPick.items, items)
+        assert.strictEqual(prompter.quickPick.busy, false)
+    })
+})
diff --git a/packages/core/src/test/shared/ui/prompter.test.ts b/packages/core/src/test/shared/ui/prompter.test.ts
new file mode 100644
index 00000000000..f7ca179699e
--- /dev/null
+++ b/packages/core/src/test/shared/ui/prompter.test.ts
@@ -0,0 +1,53 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { Prompter, PromptResult } from '../../../shared/ui/prompter'
+import { StepEstimator } from '../../../shared/wizards/wizard'
+
+export class SimplePrompter<T> extends Prompter<T> {
+    constructor(private readonly input: T | PromptResult<T>) {
+        super()
+    }
+    protected async promptUser(): Promise<PromptResult<T>> {
+        return this.input
+    }
+    public setSteps(current: number, total: number): void {}
+    public setStepEstimator(estimator: StepEstimator<T>): void {}
+    public set recentItem(response: any) {}
+    public get recentItem(): any {
+        return undefined
+    }
+}
+
+describe('Prompter', function () {
+    it('returns a value', async function () {
+        const prompter = new SimplePrompter(1)
+        assert.strictEqual(await prompter.prompt(), 1)
+    })
+
+    it('can map one type to another', async function () {
+        const prompter = new SimplePrompter(1).transform((resp) => resp.toString())
+        assert.strictEqual(await prompter.prompt(), '1')
+    })
+
+    it('throws error if calling prompt multiple times', async function () {
+        const prompter = new SimplePrompter(1)
+        await prompter.prompt()
+        await assert.rejects(prompter.prompt())
+    })
+
+    it('can attach multiple transformations', async function () {
+        const prompter = new SimplePrompter(1)
+        prompter
+            .transform((resp) => resp * 2)
+            .transform((resp) => resp + 2)
+            .transform((resp) => resp * 2)
+            .transform((resp) => resp - 2)
+            .transform((resp) => resp.toString())
+            .transform((resp) => `result: ${resp}`)
+        assert.strictEqual(await prompter.prompt(), 'result: 6')
+    })
+})
diff --git a/src/test/shared/ui/prompters/regionPrompter.test.ts b/packages/core/src/test/shared/ui/prompters/regionPrompter.test.ts
similarity index 81%
rename from src/test/shared/ui/prompters/regionPrompter.test.ts
rename to packages/core/src/test/shared/ui/prompters/regionPrompter.test.ts
index 531ecc36635..a1523047c01 100644
--- a/src/test/shared/ui/prompters/regionPrompter.test.ts
+++ b/packages/core/src/test/shared/ui/prompters/regionPrompter.test.ts
@@ -1,11 +1,11 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import { createRegionPrompter } from '../../../../shared/ui/common/region'
 import { createCommonButtons } from '../../../../shared/ui/buttons'
-import { createQuickPickTester } from '../testUtils'
+import { createQuickPickPrompterTester } from '../testUtils'
 
 describe('createRegionPrompter', function () {
     it('prompts for region', async function () {
@@ -19,7 +19,7 @@ describe('createRegionPrompter', function () {
             buttons: createCommonButtons('https://aws.amazon.com/'),
             defaultRegion: 'foo-bar-1',
         })
-        const tester = createQuickPickTester(p)
+        const tester = createQuickPickPrompterTester(p)
         tester.assertItems(['FOO', 'PDX', 'IAD'])
         tester.acceptItem(regions[1].name)
         await tester.result(regions[1])
diff --git a/packages/core/src/test/shared/ui/prompters/regionSubmenu.test.ts b/packages/core/src/test/shared/ui/prompters/regionSubmenu.test.ts
new file mode 100644
index 00000000000..00a9dd7eeb3
--- /dev/null
+++ b/packages/core/src/test/shared/ui/prompters/regionSubmenu.test.ts
@@ -0,0 +1,100 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import { RegionSubmenu } from '../../../../shared/ui/common/regionSubmenu'
+import { DataQuickPickItem, QuickPickPrompter } from '../../../../shared/ui/pickerPrompter'
+import { createQuickPickPrompterTester } from '../testUtils'
+
+describe('regionSubmenu', function () {
+    let submenuPrompter: RegionSubmenu<string>
+
+    const region1Data = ['option1a', 'option2a', 'option3a']
+    let region2Data = ['option1b', 'option2b', 'option3b']
+
+    before(async function () {
+        const mockDataProvider = function (regionCode: string) {
+            let data: Array<string>
+            switch (regionCode) {
+                case 'us-west-1':
+                    data = region1Data
+                    break
+                case 'us-west-2':
+                    data = region2Data
+                    break
+                default:
+                    data = []
+            }
+            return data.map<DataQuickPickItem<string>>((data) => ({
+                label: data,
+                data: data,
+            }))
+        }
+        submenuPrompter = new RegionSubmenu(mockDataProvider, {}, {}, 'us-west-1')
+    })
+
+    it('allow users to swap regions via escape hatch', async function () {
+        type Inner<T> = T extends QuickPickPrompter<infer U> ? U : never
+        type Combine<T> = QuickPickPrompter<Inner<T>>
+
+        const resp = submenuPrompter.prompt()
+        assert.ok(submenuPrompter.activePrompter)
+
+        const dataPrompterTester = createQuickPickPrompterTester(
+            submenuPrompter.activePrompter as Combine<typeof submenuPrompter.activePrompter>
+        )
+        dataPrompterTester.acceptItem('Switch Region')
+        await dataPrompterTester.result()
+
+        const regionTester = createQuickPickPrompterTester(
+            submenuPrompter.activePrompter as Combine<typeof submenuPrompter.activePrompter>
+        )
+        regionTester.acceptItem('US West (Oregon)')
+        await regionTester.result()
+
+        const dataPrompterTester2 = createQuickPickPrompterTester(
+            submenuPrompter.activePrompter as Combine<typeof submenuPrompter.activePrompter>
+        )
+        dataPrompterTester2.acceptItem('option2b')
+        await dataPrompterTester2.result()
+        assert.deepStrictEqual(await resp, {
+            region: 'us-west-2',
+            data: 'option2b',
+        })
+    })
+
+    it('only has a refresh button', function () {
+        const activeButtons = submenuPrompter.activePrompter!.quickPick.buttons
+        assert.strictEqual(activeButtons.length, 1)
+    })
+
+    it('refresh button calls refresh once onClick', function () {
+        const refreshButton = submenuPrompter.activePrompter!.quickPick.buttons[0]
+        const refreshStub = sinon.stub(RegionSubmenu.prototype, 'refresh')
+        refreshButton.onClick!()
+        sinon.assert.calledOnce(refreshStub)
+        sinon.restore()
+    })
+
+    it('refresh reloads items', async function () {
+        const itemsBeforeLabels = submenuPrompter.activePrompter!.quickPick.items.map((i) => i.label)
+        region2Data = ['option1c', 'option2c', 'option3c']
+
+        // Note that onDidChangeBusy event fires with busy=false when we load new items in.
+        // Since regionSubmenu retroactively adds the default items, they won't be there yet.
+        // So we don't check for them in test to avoid looking at implementation level details.
+        submenuPrompter.activePrompter!.onDidChangeBusy((b: boolean) => {
+            if (!b) {
+                const itemsAfterLabels = submenuPrompter.activePrompter!.quickPick.items.map((i) => i.label)
+                for (const item of region2Data) {
+                    assert(itemsAfterLabels.includes(item))
+                }
+                assert.notStrictEqual(itemsBeforeLabels, itemsAfterLabels)
+            }
+        })
+        submenuPrompter.refresh(submenuPrompter.activePrompter! as QuickPickPrompter<any>)
+    })
+})
diff --git a/packages/core/src/test/shared/ui/prompters/roles.test.ts b/packages/core/src/test/shared/ui/prompters/roles.test.ts
new file mode 100644
index 00000000000..4c99a30b69a
--- /dev/null
+++ b/packages/core/src/test/shared/ui/prompters/roles.test.ts
@@ -0,0 +1,83 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import assert from 'assert'
+import { IamClient, IamRole } from '../../../../shared/clients/iam'
+import { createQuickPickPrompterTester, QuickPickPrompterTester } from '../testUtils'
+import { createRolePrompter } from '../../../../shared/ui/common/roles'
+import { toCollection } from '../../../../shared/utilities/asyncCollection'
+import { stub } from '../../../utilities/stubber'
+import { getOpenExternalStub } from '../../../globalSetup.test'
+
+const helpUri = vscode.Uri.parse('https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles.html')
+
+describe('createRolePrompter', function () {
+    let roles: IamRole[]
+    let newRole: IamRole
+    let tester: QuickPickPrompterTester<IamRole>
+
+    beforeEach(function () {
+        roles = [
+            {
+                RoleName: 'test-role1',
+                Arn: 'test-arn1',
+            } as any,
+        ]
+
+        newRole = {
+            RoleName: 'new-role',
+            Arn: 'new-arn',
+        } as any
+
+        const client = stub(IamClient, { regionCode: 'region-1' })
+        client.getRoles.returns(
+            toCollection(async function* () {
+                yield roles
+            })
+        )
+
+        const prompter = createRolePrompter(client, {
+            createRole: () => Promise.resolve(newRole),
+            helpUrl: helpUri,
+        })
+
+        tester = createQuickPickPrompterTester(prompter)
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    it('prompts for role', async function () {
+        tester.acceptItem('test-role1')
+        await tester.result(roles[0])
+    })
+
+    it('can refresh', async function () {
+        const role2 = { RoleName: 'test-role2', Arn: 'test-arn2' } as any
+        tester.addCallback(() => roles.push(role2))
+        tester.pressButton('Refresh')
+        tester.assertItems(['test-role1', 'test-role2'])
+        tester.acceptItem('test-role2')
+        await tester.result(role2)
+    })
+
+    it('can create a new role', async function () {
+        tester.pressButton('Create Role...')
+        tester.assertItems(['test-role1', 'new-role'])
+        tester.acceptItem('new-role')
+        await tester.result(newRole)
+    })
+
+    it('can open documentation', async function () {
+        getOpenExternalStub().resolves(true)
+        tester.pressButton('View Toolkit Documentation')
+        tester.addCallback(() => assert.ok(getOpenExternalStub().calledWith(helpUri)))
+        tester.hide()
+        await tester.result()
+    })
+})
diff --git a/packages/core/src/test/shared/ui/sam/bucketPrompter.test.ts b/packages/core/src/test/shared/ui/sam/bucketPrompter.test.ts
new file mode 100644
index 00000000000..ae437c31053
--- /dev/null
+++ b/packages/core/src/test/shared/ui/sam/bucketPrompter.test.ts
@@ -0,0 +1,79 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import { S3Client } from '../../../../shared/clients/s3'
+import * as SamUtilsModule from '../../../../shared/sam/utils'
+import { createBucketNamePrompter } from '../../../../shared/ui/sam/bucketPrompter'
+import { AsyncCollection } from '../../../../shared/utilities/asyncCollection'
+import { RequiredProps } from '../../../../shared/utilities/tsUtils'
+import { samDeployUrl } from '../../../../shared/constants'
+import { Bucket } from '@aws-sdk/client-s3'
+
+describe('createBucketNamePrompter', () => {
+    let sandbox: sinon.SinonSandbox
+    const s3Client = new S3Client('us-east-1', 'aws')
+    const mementoRootKey = 'samcli.deploy.params'
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+
+    it('should create a prompter with existing buckets', () => {
+        // Arrange
+        const buckets = [
+            { Name: 'bucket1', region: 'us-east-1' },
+            { Name: 'bucket2', region: 'us-east-1' },
+            { Name: 'bucket3', region: 'us-east-1' },
+        ] as unknown as AsyncCollection<RequiredProps<Bucket, 'Name'> & { readonly region: string }>
+
+        const stub = sandbox.stub(s3Client, 'listBucketsIterable').callsFake(() => {
+            return buckets
+        })
+        sandbox.stub(SamUtilsModule, 'getRecentResponse').returns(undefined) // Mock recent bucket
+
+        // Act
+        const prompter = createBucketNamePrompter(s3Client, mementoRootKey, samDeployUrl)
+
+        // Assert
+        assert.ok(stub.calledOnce)
+        const expectedItems = buckets.map((b) => [
+            {
+                label: b.Name,
+                data: b.Name,
+                recentlyUsed: false,
+            },
+        ])
+        assert.strictEqual(prompter.quickPick.title, 'Select an S3 Bucket')
+        assert.strictEqual(prompter.quickPick.placeholder, 'Select a bucket (or enter a name to create one)')
+        assert.strictEqual(prompter.quickPick.items.length, 3)
+        assert.deepStrictEqual(prompter.quickPick.items, expectedItems)
+    })
+
+    it('should include no items found message if no stacks exist', () => {
+        const stub = sandbox.stub(s3Client, 'listBucketsIterable').callsFake(() => {
+            return [] as unknown as AsyncCollection<RequiredProps<Bucket, 'Name'> & { readonly region: string }>
+        })
+        sandbox.stub(SamUtilsModule, 'getRecentResponse').returns(undefined) // Mock recent bucket
+
+        // Act
+        const prompter = createBucketNamePrompter(s3Client, mementoRootKey, samDeployUrl)
+
+        // Assert
+        assert.ok(stub.calledOnce)
+        assert.strictEqual(prompter.quickPick.title, 'Select an S3 Bucket')
+        assert.strictEqual(prompter.quickPick.placeholder, 'Select a bucket (or enter a name to create one)')
+        assert.strictEqual(prompter.quickPick.items.length, 1)
+        assert.strictEqual(
+            prompter.quickPick.items[0].label,
+            'No S3 buckets for region "us-east-1". Enter a name to create a new one.'
+        )
+    })
+})
diff --git a/packages/core/src/test/shared/ui/sam/ecrPrompter.test.ts b/packages/core/src/test/shared/ui/sam/ecrPrompter.test.ts
new file mode 100644
index 00000000000..e981bf1396e
--- /dev/null
+++ b/packages/core/src/test/shared/ui/sam/ecrPrompter.test.ts
@@ -0,0 +1,127 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import sinon from 'sinon'
+import * as vscode from 'vscode'
+import * as AwsConsoleModule from '../../../../shared/awsConsole'
+import { DefaultEcrClient, EcrRepository } from '../../../../shared/clients/ecrClient'
+import { samSyncUrl } from '../../../../shared/constants'
+import * as SamUtilsModule from '../../../../shared/sam/utils'
+import * as ButtonsModule from '../../../../shared/ui/buttons'
+import { createEcrPrompter } from '../../../../shared/ui/sam/ecrPrompter'
+import { intoCollection } from '../../../../shared/utilities/collectionUtils'
+import { sleep } from '../../../../shared/utilities/timeoutUtils'
+
+describe('createEcrPrompter', () => {
+    let sandbox: sinon.SinonSandbox
+    const ecrClient = new DefaultEcrClient('us-east-1')
+    const mementoRootKey = 'samcli.sync.params'
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+
+    it('should create a prompter with existing repos', async () => {
+        // Arrange
+        const ecrRepos: EcrRepository[][] = [
+            [
+                {
+                    repositoryName: 'repo1',
+                    repositoryUri: 'repoUri1',
+                    repositoryArn: 'repoArn1',
+                } as EcrRepository,
+                {
+                    repositoryName: 'repo2',
+                    repositoryUri: 'repoUri2',
+                    repositoryArn: 'repoArn2',
+                } as EcrRepository,
+                {
+                    repositoryName: 'repo3',
+                    repositoryUri: 'repoUri3',
+                    repositoryArn: 'repoArn3',
+                } as EcrRepository,
+            ],
+        ]
+        const expectedItems = [
+            {
+                label: 'repo1',
+                data: 'repoUri1',
+                detail: 'repoArn1',
+                recentlyUsed: false,
+            },
+            {
+                label: 'repo2',
+                data: 'repoUri2',
+                detail: 'repoArn2',
+                recentlyUsed: false,
+            },
+            {
+                label: 'repo3',
+                data: 'repoUri3',
+                detail: 'repoArn3',
+                recentlyUsed: false,
+            },
+        ]
+        const listAllRepositoriesStub = sandbox.stub(ecrClient, 'listAllRepositories').returns(intoCollection(ecrRepos))
+        sandbox.stub(SamUtilsModule, 'getRecentResponse').returns(undefined)
+        const createCommonButtonsStub = sandbox.stub(ButtonsModule, 'createCommonButtons')
+        sandbox
+            .stub(AwsConsoleModule, 'getAwsConsoleUrl')
+            .returns(vscode.Uri.parse(`https://us-east-1.console.aws.amazon.com/cloudformation/home?region=us-east-1`))
+
+        // Act
+        const prompter = createEcrPrompter(ecrClient, mementoRootKey)
+        await sleep(50)
+
+        // Assert
+        assert.ok(createCommonButtonsStub.calledOnce)
+        assert.ok(
+            createCommonButtonsStub.calledWithExactly(
+                samSyncUrl,
+                vscode.Uri.parse(`https://us-east-1.console.aws.amazon.com/cloudformation/home?region=us-east-1`)
+            )
+        )
+        assert.ok(listAllRepositoriesStub.calledOnce)
+        assert.strictEqual(prompter.quickPick.title, 'Select an ECR Repository')
+        assert.strictEqual(prompter.quickPick.placeholder, 'Select a repository (or enter a name to create one)')
+        assert.strictEqual(prompter.quickPick.items.length, 3)
+        assert.deepStrictEqual(prompter.quickPick.items, expectedItems)
+    })
+
+    it('should include no items found message if no repos exist', async () => {
+        const listAllStacksStub = sandbox.stub(ecrClient, 'listAllRepositories').returns(intoCollection([]))
+        sandbox.stub(SamUtilsModule, 'getRecentResponse').returns(undefined)
+        const createCommonButtonsStub = sandbox.stub(ButtonsModule, 'createCommonButtons')
+        sandbox
+            .stub(AwsConsoleModule, 'getAwsConsoleUrl')
+            .returns(vscode.Uri.parse(`https://us-east-1.console.aws.amazon.com/cloudformation/home?region=us-east-1`))
+
+        // Act
+        const prompter = createEcrPrompter(ecrClient, mementoRootKey)
+        await sleep(50)
+
+        // Assert
+        assert.ok(createCommonButtonsStub.calledOnce)
+        assert.ok(
+            createCommonButtonsStub.calledWithExactly(
+                samSyncUrl,
+                vscode.Uri.parse(`https://us-east-1.console.aws.amazon.com/cloudformation/home?region=us-east-1`)
+            )
+        )
+        assert.ok(listAllStacksStub.calledOnce)
+        assert.strictEqual(prompter.quickPick.title, 'Select an ECR Repository')
+        assert.strictEqual(prompter.quickPick.placeholder, 'Select a repository (or enter a name to create one)')
+        assert.strictEqual(prompter.quickPick.items.length, 1)
+        assert.deepStrictEqual(
+            prompter.quickPick.items[0].label,
+            'No ECR repositories in region "us-east-1". Enter a name to create a new one.'
+        )
+        assert.deepStrictEqual(prompter.quickPick.items[0].data, undefined)
+    })
+})
diff --git a/packages/core/src/test/shared/ui/sam/paramsSourcePrompter.test.ts b/packages/core/src/test/shared/ui/sam/paramsSourcePrompter.test.ts
new file mode 100644
index 00000000000..e935e59acca
--- /dev/null
+++ b/packages/core/src/test/shared/ui/sam/paramsSourcePrompter.test.ts
@@ -0,0 +1,100 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import {
+    createDeployParamsSourcePrompter,
+    createSyncParamsSourcePrompter,
+    ParamsSource,
+} from '../../../../shared/ui/sam/paramsSourcePrompter'
+import { DataQuickPickItem } from '../../../../shared/ui/pickerPrompter'
+
+describe('createSyncParamsSourcePrompter', () => {
+    it('should return a prompter with the correct items with no valid samconfig', () => {
+        const expectedItems: DataQuickPickItem<ParamsSource>[] = [
+            {
+                label: 'Specify required parameters and save as defaults',
+                data: ParamsSource.SpecifyAndSave,
+            },
+            {
+                label: 'Specify required parameters',
+                data: ParamsSource.Specify,
+            },
+        ]
+        const prompter = createSyncParamsSourcePrompter(false)
+        const quickPick = prompter.quickPick
+        assert.strictEqual(quickPick.title, 'Specify parameter source for sync')
+        assert.strictEqual(quickPick.placeholder, 'Press enter to proceed with highlighted option')
+        assert.strictEqual(quickPick.items.length, 2)
+        assert.deepStrictEqual(quickPick.items, expectedItems)
+    })
+
+    it('should return a prompter with the correct items with valid samconfig', () => {
+        const expectedItems: DataQuickPickItem<ParamsSource>[] = [
+            {
+                label: 'Specify required parameters and save as defaults',
+                data: ParamsSource.SpecifyAndSave,
+            },
+            {
+                label: 'Specify required parameters',
+                data: ParamsSource.Specify,
+            },
+            {
+                label: 'Use default values from samconfig',
+                data: ParamsSource.SamConfig,
+            },
+        ]
+        const prompter = createSyncParamsSourcePrompter(true)
+        const quickPick = prompter.quickPick
+        assert.strictEqual(quickPick.title, 'Specify parameter source for sync')
+        assert.strictEqual(quickPick.placeholder, 'Press enter to proceed with highlighted option')
+        assert.strictEqual(quickPick.items.length, 3)
+        assert.deepStrictEqual(quickPick.items, expectedItems)
+    })
+})
+
+describe('createDeployParamsSourcePrompter', () => {
+    it('should return a prompter with the correct items with no valid samconfig', () => {
+        const expectedItems: DataQuickPickItem<ParamsSource>[] = [
+            {
+                label: 'Specify required parameters and save as defaults',
+                data: ParamsSource.SpecifyAndSave,
+            },
+            {
+                label: 'Specify required parameters',
+                data: ParamsSource.Specify,
+            },
+        ]
+        const prompter = createDeployParamsSourcePrompter(false)
+        const quickPick = prompter.quickPick
+        assert.strictEqual(quickPick.title, 'Specify parameter source for deploy')
+        assert.strictEqual(quickPick.placeholder, 'Press enter to proceed with highlighted option')
+        assert.strictEqual(quickPick.items.length, 2)
+        assert.deepStrictEqual(quickPick.items, expectedItems)
+    })
+
+    it('should return a prompter with the correct items with valid samconfig', () => {
+        const expectedItems: DataQuickPickItem<ParamsSource>[] = [
+            {
+                label: 'Specify required parameters and save as defaults',
+                data: ParamsSource.SpecifyAndSave,
+            },
+            {
+                label: 'Specify required parameters',
+                data: ParamsSource.Specify,
+            },
+            {
+                label: 'Use default values from samconfig',
+                data: ParamsSource.SamConfig,
+            },
+        ]
+        const prompter = createDeployParamsSourcePrompter(true)
+        const quickPick = prompter.quickPick
+        assert.strictEqual(quickPick.title, 'Specify parameter source for deploy')
+        assert.strictEqual(quickPick.placeholder, 'Press enter to proceed with highlighted option')
+        assert.strictEqual(quickPick.items.length, 3)
+        assert.deepStrictEqual(quickPick.items, expectedItems)
+    })
+})
diff --git a/packages/core/src/test/shared/ui/sam/stackPrompter.test.ts b/packages/core/src/test/shared/ui/sam/stackPrompter.test.ts
new file mode 100644
index 00000000000..206d26db9e1
--- /dev/null
+++ b/packages/core/src/test/shared/ui/sam/stackPrompter.test.ts
@@ -0,0 +1,131 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import * as vscode from 'vscode'
+import * as AwsConsoleModule from '../../../../shared/awsConsole'
+import * as SamUtilsModule from '../../../../shared/sam/utils'
+import * as ButtonsModule from '../../../../shared/ui/buttons'
+import { CloudFormationClient, StackSummary } from '../../../../shared/clients/cloudFormation'
+import { samSyncUrl } from '../../../../shared/constants'
+import { createStackPrompter } from '../../../../shared/ui/sam/stackPrompter'
+import { intoCollection } from '../../../../shared/utilities/collectionUtils'
+import { sleep } from '../../../../shared/utilities/timeoutUtils'
+
+describe('createStackPrompter', () => {
+    let sandbox: sinon.SinonSandbox
+    const cfnClient = new CloudFormationClient('us-east-1')
+    const mementoRootKey = 'samcli.sync.params'
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+
+    it('should create a prompter with existing stacks', async () => {
+        // Arrange
+        const stackSummaries: StackSummary[][] = [
+            [
+                {
+                    StackName: 'stack1',
+                    StackStatus: 'CREATE_COMPLETE',
+                    CreationTime: new Date(),
+                } as StackSummary,
+                {
+                    StackName: 'stack2',
+                    StackStatus: 'CREATE_COMPLETE',
+                    CreationTime: new Date(),
+                } as StackSummary,
+                {
+                    StackName: 'stack3',
+                    StackStatus: 'CREATE_COMPLETE',
+                    CreationTime: new Date(),
+                } as StackSummary,
+            ],
+        ]
+        const expectedItems = [
+            {
+                label: 'stack1',
+                data: 'stack1',
+                description: undefined,
+                invalidSelection: false,
+                recentlyUsed: false,
+            },
+            {
+                label: 'stack2',
+                data: 'stack2',
+                description: undefined,
+                invalidSelection: false,
+                recentlyUsed: false,
+            },
+            {
+                label: 'stack3',
+                data: 'stack3',
+                description: undefined,
+                invalidSelection: false,
+                recentlyUsed: false,
+            },
+        ]
+        const listAllStacksStub = sandbox.stub(cfnClient, 'listAllStacks').returns(intoCollection(stackSummaries))
+        sandbox.stub(SamUtilsModule, 'getRecentResponse').returns(undefined)
+        const createCommonButtonsStub = sandbox.stub(ButtonsModule, 'createCommonButtons')
+        sandbox
+            .stub(AwsConsoleModule, 'getAwsConsoleUrl')
+            .returns(vscode.Uri.parse(`https://us-east-1.console.aws.amazon.com/cloudformation/home?region=us-east-1`))
+
+        // Act
+        const prompter = createStackPrompter(cfnClient, mementoRootKey, samSyncUrl)
+        await sleep(50)
+
+        // Assert
+        assert.ok(createCommonButtonsStub.calledOnce)
+        assert.ok(
+            createCommonButtonsStub.calledWithExactly(
+                samSyncUrl,
+                vscode.Uri.parse(`https://us-east-1.console.aws.amazon.com/cloudformation/home?region=us-east-1`)
+            )
+        )
+        assert.ok(listAllStacksStub.calledOnce)
+        assert.strictEqual(prompter.quickPick.title, 'Select a CloudFormation Stack')
+        assert.strictEqual(prompter.quickPick.placeholder, 'Select a stack (or enter a name to create one)')
+        assert.strictEqual(prompter.quickPick.items.length, 3)
+        assert.deepStrictEqual(prompter.quickPick.items, expectedItems)
+    })
+
+    it('should include no items found message if no stacks exist', async () => {
+        const listAllStacksStub = sandbox.stub(cfnClient, 'listAllStacks').returns(intoCollection([]))
+        sandbox.stub(SamUtilsModule, 'getRecentResponse').returns(undefined)
+        const createCommonButtonsStub = sandbox.stub(ButtonsModule, 'createCommonButtons')
+        sandbox
+            .stub(AwsConsoleModule, 'getAwsConsoleUrl')
+            .returns(vscode.Uri.parse(`https://us-east-1.console.aws.amazon.com/cloudformation/home?region=us-east-1`))
+
+        // Act
+        const prompter = createStackPrompter(cfnClient, mementoRootKey, samSyncUrl)
+        await sleep(50)
+
+        // Assert
+        assert.ok(createCommonButtonsStub.calledOnce)
+        assert.ok(
+            createCommonButtonsStub.calledWithExactly(
+                samSyncUrl,
+                vscode.Uri.parse(`https://us-east-1.console.aws.amazon.com/cloudformation/home?region=us-east-1`)
+            )
+        )
+        assert.ok(listAllStacksStub.calledOnce)
+        assert.strictEqual(prompter.quickPick.title, 'Select a CloudFormation Stack')
+        assert.strictEqual(prompter.quickPick.placeholder, 'Select a stack (or enter a name to create one)')
+        assert.strictEqual(prompter.quickPick.items.length, 1)
+        assert.deepStrictEqual(
+            prompter.quickPick.items[0].label,
+            'No stacks in region "us-east-1". Enter a name to create a new one.'
+        )
+        assert.deepStrictEqual(prompter.quickPick.items[0].data, undefined)
+    })
+})
diff --git a/packages/core/src/test/shared/ui/sam/templatePrompter.test.ts b/packages/core/src/test/shared/ui/sam/templatePrompter.test.ts
new file mode 100644
index 00000000000..483b4fe8bc6
--- /dev/null
+++ b/packages/core/src/test/shared/ui/sam/templatePrompter.test.ts
@@ -0,0 +1,53 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+
+import sinon from 'sinon'
+import * as Cfn from '../../../../shared/cloudformation/cloudformation'
+import { CloudFormationTemplateRegistry } from '../../../../shared/fs/templateRegistry'
+import { WatchedItem } from '../../../../shared/fs/watchedFiles'
+import * as SamUtilsModule from '../../../../shared/sam/utils'
+import { createTemplatePrompter } from '../../../../shared/ui/sam/templatePrompter'
+import { assertEqualPaths } from '../../../testUtil'
+import { samDeployUrl } from '../../../../shared/constants'
+
+describe('createTemplatePrompter', () => {
+    let registry: CloudFormationTemplateRegistry
+    let sandbox: sinon.SinonSandbox
+    const mementoRootKey = 'samcli.sync.params'
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+        // Create a mock instance of CloudFormationTemplateRegistry
+        registry = {
+            items: [
+                { path: '/path/to/template1.yaml', item: {} } as WatchedItem<Cfn.Template>,
+                { path: '/path/to/template2.yaml', item: {} } as WatchedItem<Cfn.Template>,
+            ],
+        } as CloudFormationTemplateRegistry // Typecasting to match expected type
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+
+    it('should create quick pick items from registry items', () => {
+        // Arrange
+        const recentTemplatePathStub = sandbox.stub().returns(undefined)
+        sandbox.replace(SamUtilsModule, 'getRecentResponse', recentTemplatePathStub)
+        const workspaceFolder = vscode.workspace.workspaceFolders?.[0]
+        assert.ok(workspaceFolder)
+
+        const prompter = createTemplatePrompter(registry, mementoRootKey, samDeployUrl)
+
+        assert.strictEqual(prompter.quickPick.items.length, 2)
+        assertEqualPaths(prompter.quickPick.items[0].label, '/path/to/template1.yaml')
+        assertEqualPaths(prompter.quickPick.items[1].label, '/path/to/template2.yaml')
+        assert.strictEqual(prompter.quickPick.title, 'Select a SAM/CloudFormation Template')
+        assert.strictEqual(prompter.quickPick.placeholder, 'Select a SAM/CloudFormation Template')
+    })
+})
diff --git a/packages/core/src/test/shared/ui/testUtils.ts b/packages/core/src/test/shared/ui/testUtils.ts
new file mode 100644
index 00000000000..44d8a8f4b70
--- /dev/null
+++ b/packages/core/src/test/shared/ui/testUtils.ts
@@ -0,0 +1,153 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+// Common prompter testing utilities
+
+import { AssertionError, deepStrictEqual } from 'assert'
+import { DataQuickPickItem, QuickPickPrompter } from '../../../shared/ui/pickerPrompter'
+import { PromptResult } from '../../../shared/ui/prompter'
+import { isKeyOf } from '../../../shared/utilities/tsUtils'
+import { isTestQuickPick, PickerTester, TestQuickPick } from '../vscode/quickInput'
+import { getLogger } from '../../../shared/logger'
+
+type Methods<T> = PickerTester<DataQuickPickItem<T>> & {
+    /**
+     * Runs the given inputs and waits for the result or timeout.
+     * Can optionally pass in an expected return value.
+     *
+     * This **must** be called and awaited, otherwise errors will not be surfaced correctly.
+     */
+    result(exptected?: PromptResult<T>): Promise<PromptResult<T>>
+    /**
+     * Executes the callback with a snapshot of the prompter in a given moment.
+     *
+     * This can be used for things such as setting up external state, asserting side-effects, or
+     * inspecting the picker at test time.
+     */
+    addCallback(callback: (prompter?: QuickPickPrompter<T>) => Promise<any> | any): void
+    hide(): void
+}
+export type QuickPickPrompterTester<T> = Methods<T> & QuickPickPrompter<T>
+
+type Functions<T> = { [P in keyof T]: T[P] extends (...args: any[]) => any ? P : never }[keyof T]
+type Action<T> = {
+    [P in Functions<Methods<T>>]: [P, Parameters<Methods<T>[P]>]
+}[Functions<Methods<T>>]
+
+interface TestOptions {
+    /** Amount of time to wait per action before stopping the test. */
+    timeout?: number
+    // TODO: add formatting options?
+}
+
+const testDefaults: Required<TestOptions> = {
+    timeout: 5000,
+}
+
+/**
+ * Creates a tester for quick picks.
+ *
+ * Tests are constructed as a series of 'actions' that are executed sequentially. Any action that
+ * fails will immediately stop the test. The first action will always occur after the prompter is
+ * both visible and enabled. Actions will always wait until the prompter is not busy/disabled before
+ * continuing.
+ *
+ * @param prompter Prompter to test.
+ * @param options Additional test options.
+ *
+ * @returns A {@link QuickPickPrompterTester}
+ */
+export function createQuickPickPrompterTester<T>(
+    prompter: QuickPickPrompter<T>,
+    options: TestOptions = {}
+): QuickPickPrompterTester<T> {
+    type AssertionParams = ConstructorParameters<typeof AssertionError>[0]
+    const actions: Action<T>[] = []
+    const errors: Error[] = []
+    const traces: AssertionParams[] = []
+    const testPicker = prompter.quickPick as TestQuickPick<DataQuickPickItem<T>>
+    if (!isTestQuickPick(testPicker)) {
+        throw new Error('Expected prompter to contain a TestQuickPick')
+    }
+    const resolvedOptions = { ...testDefaults, ...options }
+    let running = false
+
+    function throwErrorWithTrace(trace: AssertionParams, message: string, actual?: any, expected?: any) {
+        errors.push(new AssertionError({ ...trace, message, actual, expected }))
+        testPicker.hide()
+    }
+
+    /* Executes a test action. Immediately hides the picker on any error */
+    async function executeAction(action: Action<T>, trace: AssertionParams): Promise<void> {
+        const throwError = throwErrorWithTrace.bind(undefined, trace)
+
+        const key = action[0]
+        if (isKeyOf(key, testPicker)) {
+            const fn = testPicker[key]
+            try {
+                await (fn as any)(...action[1])
+            } catch (err) {
+                errors.push(err as Error)
+                testPicker.hide()
+            }
+        } else if (key === 'addCallback') {
+            try {
+                await action[1][0](prompter)
+            } catch (err) {
+                throwError(`Callback threw: ${(err as Error).message}`)
+            }
+        }
+    }
+
+    async function start(): Promise<void> {
+        if (running) {
+            return
+        }
+        running = true
+
+        while (actions.length > 0) {
+            const trace = traces.shift()!
+            const timeout = setTimeout(() => throwErrorWithTrace(trace, 'Timed out'), resolvedOptions.timeout)
+            await testPicker.untilReady()
+            await executeAction(actions.shift()!, trace)
+            clearTimeout(timeout)
+        }
+    }
+
+    async function result(expected?: PromptResult<T>): Promise<PromptResult<T>> {
+        start().catch((e) => {
+            getLogger().error('createQuickPickPrompterTester.start failed: %s', (e as Error).message)
+        })
+        const result = await prompter.prompt()
+        if (errors.length > 0) {
+            // TODO: combine errors into a single one
+            throw errors[0]
+        }
+        if (arguments.length > 0) {
+            deepStrictEqual(result, expected)
+        }
+        return result
+    }
+
+    const withTrace = <T extends (...args: any[]) => any>(f: T, name: string) => {
+        return (...args: any[]) => {
+            traces.push({ stackStartFn: f, operator: name, message: name })
+            f(...args)
+        }
+    }
+
+    prompter.onDidShow(start)
+
+    return new Proxy(prompter, {
+        get: (target, prop, recv) => {
+            if (isKeyOf(prop, testPicker) || prop === 'addCallback') {
+                return withTrace((...args) => actions.push([prop as any, args]), prop)
+            }
+            if (prop === 'result') {
+                return result
+            }
+            return Reflect.get(target, prop, recv)
+        },
+    }) as any
+}
diff --git a/packages/core/src/test/shared/utilities/asyncCollection.test.ts b/packages/core/src/test/shared/utilities/asyncCollection.test.ts
new file mode 100644
index 00000000000..ee10a1ad4bd
--- /dev/null
+++ b/packages/core/src/test/shared/utilities/asyncCollection.test.ts
@@ -0,0 +1,235 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { toCollection } from '../../../shared/utilities/asyncCollection'
+
+describe('AsyncCollection', function () {
+    const items = [
+        { name: 'item1', data: 0 },
+        { name: 'item2', data: 1 },
+        { name: 'item3', data: 2 },
+    ]
+
+    async function* gen() {
+        yield 0
+        yield 1
+        yield 2
+    }
+
+    async function* returnGen() {
+        yield 0
+        yield 1
+        return 2
+    }
+
+    async function* genPage() {
+        yield [0, 1, 2]
+        yield [3, 4, 5]
+        yield [6, 7, 8]
+    }
+
+    async function* genItem() {
+        yield items[0]
+        yield items[1]
+        yield items[2]
+    }
+
+    it('can be iterated over', async function () {
+        const collection = toCollection(gen)
+        const expected = [0, 1, 2]
+        for await (const o of collection) {
+            assert.strictEqual(o, expected.shift())
+        }
+    })
+
+    it('can turn into a Promise', async function () {
+        const promise = toCollection(gen).promise()
+        assert.deepStrictEqual(await promise, [0, 1, 2])
+    })
+
+    it('can turn into a map using property key', async function () {
+        const map = await toCollection(genItem).toMap('name')
+        for (const v of items) {
+            assert.strictEqual(map.get(v.name), v)
+        }
+    })
+
+    it('can turn into a map using function', async function () {
+        const map = await toCollection(genItem).toMap((i) => i.data.toString())
+        for (const v of items) {
+            assert.strictEqual(map.get(v.data.toString()), v)
+        }
+    })
+
+    it('can map', async function () {
+        const mapped = toCollection(gen)
+            .map((o) => o + 1)
+            .map((o) => o.toString())
+            .map((s) => `${s}!`)
+        assert.deepStrictEqual(await mapped.promise(), ['1!', '2!', '3!'])
+    })
+
+    it('can flatten', async function () {
+        const flat = toCollection(genPage).flatten()
+        const expected = Array(9)
+            .fill(0)
+            .map((_, i) => i)
+        assert.deepStrictEqual(await flat.promise(), expected)
+    })
+
+    it('can flatten generators that return things', async function () {
+        const collection = toCollection(async function* () {
+            yield await toCollection(returnGen).promise()
+            yield await toCollection(returnGen)
+                .map((i) => i + 1)
+                .promise()
+            return await toCollection(returnGen)
+                .map((i) => i + 2)
+                .promise()
+        })
+
+        const flat = collection.flatten().map((i) => i * 2)
+        const expected = 0 + 2 + 4 + (2 + 4 + 6) + (4 + 6 + 8) // Writing it all out for readability
+        const actual = (await flat.promise()).reduce((a, b) => a + b, 0)
+        assert.deepStrictEqual(actual, expected)
+    })
+
+    it('can flatten generators that yield async iterables', async function () {
+        const collection = toCollection(async function* () {
+            yield toCollection(gen).filter((i) => i > 1)
+            yield toCollection(gen).map((i) => i + 1)
+        })
+
+        const flat = collection.flatten().map((i) => i * 2)
+        const actual = (await flat.promise()).reduce((a, b) => a + b, 0)
+        assert.deepStrictEqual(actual, 4 + (2 + 4 + 6))
+    })
+
+    it('can filter', async function () {
+        const filtered = toCollection(genPage)
+            .filter((o) => o.includes(5))
+            .flatten()
+        const expected = [3, 4, 5]
+        assert.deepStrictEqual(await filtered.promise(), expected)
+    })
+
+    it('can limit', async function () {
+        const limited = toCollection(gen).limit(2)
+        assert.deepStrictEqual(await limited.promise(), [0, 1])
+    })
+
+    it('can find a matching element', async function () {
+        assert.deepStrictEqual(await toCollection(gen).find((x) => x > 0), 1)
+        assert.deepStrictEqual(await toCollection(gen).find((x) => x > 2), undefined)
+    })
+
+    it('returns nothing if using non-positive limit count', async function () {
+        const limitZero = toCollection(gen).limit(0)
+        const limitNeg1 = toCollection(gen).limit(-1)
+        assert.deepStrictEqual(await limitZero.promise(), [])
+        assert.deepStrictEqual(await limitNeg1.promise(), [])
+    })
+
+    it('is immutable', async function () {
+        const x = toCollection(gen)
+        const y = x.map((o) => o + 1)
+        const z = y
+            .filter((o) => o !== 1)
+            .map((o) => [o, o])
+            .flatten()
+
+        assert.deepStrictEqual(await x.promise(), [0, 1, 2])
+        assert.deepStrictEqual(await y.promise(), [1, 2, 3])
+        assert.deepStrictEqual(await z.promise(), [2, 2, 3, 3])
+    })
+
+    it('can map with async functions', async function () {
+        const double = async (n: number) => 2 * n
+
+        const mapped = toCollection(gen)
+            .map((o) => o + 1)
+            .map(double)
+            .map((o) => o - 1)
+            .map(double)
+            .map((o) => `${o}!`)
+
+        assert.deepStrictEqual(await mapped.promise(), ['2!', '6!', '10!'])
+    })
+
+    function defineProperty<T, U, K extends PropertyKey>(
+        obj: T,
+        key: K,
+        desc: TypedPropertyDescriptor<U>
+    ): T & { [P in K]: U } {
+        return Object.defineProperty(obj, key, desc) as T & { [P in K]: U }
+    }
+
+    function createCounter(maxCalls = 1000) {
+        let callCount = 0
+
+        return defineProperty(
+            async function* () {
+                while (callCount < maxCalls) {
+                    yield callCount++
+                }
+            },
+            'callCount',
+            { get: () => callCount }
+        )
+    }
+
+    it('does not iterate over the generator when applying transformations', async function () {
+        const counter = createCounter()
+        const x = toCollection(counter)
+            .filter((o) => o > 1)
+            .map((o) => [o, o * o])
+            .flatten()
+
+        await new Promise((r) => setImmediate(r))
+        assert.strictEqual(counter.callCount, 0)
+        assert.deepStrictEqual(await x.limit(6).promise(), [2, 4, 3, 9, 4, 16])
+        assert.strictEqual(counter.callCount, 6)
+    })
+
+    it('does not iterate over the generator after finding a match', async function () {
+        const counter = createCounter()
+        const x = await toCollection(counter)
+            .filter((o) => o > 1)
+            .map((o) => [o, o * o])
+            .find((o) => o[1] > 25)
+
+        assert.deepStrictEqual(x, [6, 36])
+        assert.strictEqual(counter.callCount, 7)
+    })
+
+    describe('errors', function () {
+        async function* error() {
+            throw new Error()
+            yield 0
+        }
+
+        it('bubbles errors up when using a promise', async function () {
+            const errorPromise = toCollection(error)
+                .map((o) => o)
+                .filter((_) => true)
+                .flatten()
+                .promise()
+            await assert.rejects(errorPromise)
+        })
+
+        it('bubbles errors up when iterating', async function () {
+            const errorIter = toCollection(error)
+                .map((o) => o)
+                .filter((_) => true)
+                .flatten()
+            const iterate = async () => {
+                for await (const _ of errorIter) {
+                }
+            }
+            await assert.rejects(iterate)
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/utilities/cliUtils.test.ts b/packages/core/src/test/shared/utilities/cliUtils.test.ts
new file mode 100644
index 00000000000..9fa7270abb1
--- /dev/null
+++ b/packages/core/src/test/shared/utilities/cliUtils.test.ts
@@ -0,0 +1,64 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as path from 'path'
+import { installCli } from '../../../shared/utilities/cliUtils'
+import globals from '../../../shared/extensionGlobals'
+import { ChildProcess } from '../../../shared/utilities/processUtils'
+import { SeverityLevel } from '../vscode/message'
+import { assertTelemetryCurried } from '../../testUtil'
+import { getTestWindow } from '../../shared/vscode/window'
+import { fs } from '../../../shared'
+
+describe('cliUtils', async function () {
+    afterEach(async function () {
+        await fs.delete(path.join(globals.context.globalStorageUri.fsPath, 'tools'), { recursive: true, force: true })
+    })
+
+    describe('installCli', async function () {
+        async function hasFunctionalCli(cliPath: string): Promise<boolean> {
+            const { exitCode } = await new ChildProcess(cliPath).run()
+
+            return exitCode === 0
+        }
+
+        const assertTelemetry = assertTelemetryCurried('aws_toolInstallation')
+
+        it('downloads and installs the SSM CLI automatically', async function () {
+            const ssmCli = await installCli('session-manager-plugin', false)
+            assert.ok(await hasFunctionalCli(ssmCli))
+            assertTelemetry({
+                result: 'Succeeded',
+                toolId: 'session-manager-plugin',
+            })
+        })
+
+        it('downloads and installs the SSM CLI if prompted and accepted', async function () {
+            const ssmCli = installCli('session-manager-plugin', true)
+            const message = await getTestWindow().waitForMessage(/Install/)
+            message.assertSeverity(SeverityLevel.Information)
+            message.selectItem('Install')
+
+            assert.ok(await hasFunctionalCli(await ssmCli))
+            assertTelemetry({
+                result: 'Succeeded',
+                toolId: 'session-manager-plugin',
+            })
+        })
+
+        it('does not install a CLI if the user is prompted and opts out', async function () {
+            const ssmCli = installCli('session-manager-plugin', true)
+            const message = await getTestWindow().waitForMessage(/Install/)
+            message.close()
+
+            await assert.rejects(ssmCli, /cancelled/)
+            assertTelemetry({
+                result: 'Cancelled',
+                toolId: 'session-manager-plugin',
+            })
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/utilities/collectionUtils.test.ts b/packages/core/src/test/shared/utilities/collectionUtils.test.ts
new file mode 100644
index 00000000000..34aacb9f28e
--- /dev/null
+++ b/packages/core/src/test/shared/utilities/collectionUtils.test.ts
@@ -0,0 +1,806 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { AsyncCollection } from '../../../shared/utilities/asyncCollection'
+import {
+    complement,
+    difference,
+    filter,
+    filterAsync,
+    first,
+    intersection,
+    take,
+    toArrayAsync,
+    toMap,
+    toMapAsync,
+    union,
+    updateInPlace,
+    getPaginatedAwsCallIter,
+    getPaginatedAwsCallIterParams,
+    IteratorTransformer,
+    stripUndefined,
+    pageableToCollection,
+    join,
+    toStream,
+    joinAll,
+    isPresent,
+    partialClone,
+    inspect,
+} from '../../../shared/utilities/collectionUtils'
+import * as CloudWatchLogs from '@aws-sdk/client-cloudwatch-logs'
+import { asyncGenerator } from '../../../shared/utilities/collectionUtils'
+
+describe('CollectionUtils', async function () {
+    let sandbox: sinon.SinonSandbox
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    describe('union', async function () {
+        it('returns an empty set if both inputs are empty', async function () {
+            const result = union([], [])
+
+            assert.ok(result)
+            assert.strictEqual(result.size, 0)
+        })
+
+        it('includes all elements from both inputs', async function () {
+            const result = union(['a', 'b'], ['b', 'c'])
+
+            assert.ok(result)
+            assert.strictEqual(result.size, 3)
+            assert.ok(result.has('a'))
+            assert.ok(result.has('b'))
+            assert.ok(result.has('c'))
+        })
+    })
+
+    describe('intersection', async function () {
+        it('returns an empty set if both insputs are empty', async function () {
+            const result = intersection([], [])
+
+            assert.ok(result)
+            assert.strictEqual(result.size, 0)
+        })
+
+        it('returns an empty set if inputs have no elements in common', async function () {
+            const result = intersection(['a'], ['b'])
+
+            assert.ok(result)
+            assert.strictEqual(result.size, 0)
+        })
+
+        it('returns only elements that are present in both inputs', async function () {
+            const result = intersection(['a', 'b'], ['b', 'c'])
+
+            assert.ok(result)
+            assert.strictEqual(result.size, 1)
+            assert.ok(result.has('b'))
+        })
+    })
+
+    describe('difference', async function () {
+        it('returns an empty set if the first input is empty', async function () {
+            const result = difference([], ['a'])
+
+            assert.ok(result)
+            assert.strictEqual(result.size, 0)
+        })
+
+        it('returns the elements in the first input if the second input is empty', async function () {
+            const result = difference(['a'], [])
+
+            assert.ok(result)
+            assert.strictEqual(result.size, 1)
+            assert.ok(result.has('a'))
+        })
+
+        it('does not return elements that are present in the second input', async function () {
+            const result = difference(['a', 'b'], ['b'])
+
+            assert.ok(result)
+            assert.strictEqual(result.size, 1)
+            assert.ok(result.has('a'))
+        })
+    })
+
+    describe('complement', async function () {
+        it('returns an empty set if the second input is empty', async function () {
+            const result = complement(['a'], [])
+
+            assert.ok(result)
+            assert.strictEqual(result.size, 0)
+        })
+
+        it('returns the elements in the second input if the first input is empty', async function () {
+            const result = complement([], ['a'])
+
+            assert.ok(result)
+            assert.strictEqual(result.size, 1)
+            assert.ok(result.has('a'))
+        })
+
+        it('does not return elements that are present in the first input', async function () {
+            const result = complement(['b'], ['a', 'b'])
+
+            assert.ok(result)
+            assert.strictEqual(result.size, 1)
+            assert.ok(result.has('a'))
+        })
+    })
+
+    describe('toArrayAsync', async function () {
+        it('returns an empty array if input is empty', async function () {
+            const result = await toArrayAsync(asyncGenerator([]))
+
+            assert.ok(result)
+            assert.strictEqual(result.length, 0)
+        })
+
+        it('returns each item in input', async function () {
+            const result = await toArrayAsync(asyncGenerator(['a', 'b']))
+
+            assert.ok(result)
+            assert.strictEqual(result.length, 2)
+            assert.ok(result.find((item) => item === 'a'))
+            assert.ok(result.find((item) => item === 'b'))
+        })
+    })
+
+    describe('toMap', async function () {
+        it('returns an empty map if the input is empty', async function () {
+            const result = toMap<string, { key: string }>([], (item) => item.key)
+
+            assert.ok(result)
+            assert.strictEqual(result.size, 0)
+        })
+
+        it('uses selector to choose keys', async function () {
+            const result = toMap<string, { key: string }>(
+                [{ key: 'a' }, { key: 'b' }, { key: 'c' }],
+                (item) => item.key
+            )
+
+            assert.ok(result)
+            assert.strictEqual(result.size, 3)
+            assert.ok(result.has('a'))
+            assert.ok(result.has('b'))
+            assert.ok(result.has('c'))
+        })
+
+        it('throws an error on duplicate keys', async function () {
+            assert.throws(() =>
+                toMap<string, { key: string }>(
+                    [{ key: 'a' }, { key: 'b' }, { key: 'b' }, { key: 'c' }],
+                    (item) => item.key
+                )
+            )
+        })
+    })
+
+    describe('toMapAsync', async function () {
+        it('returns an empty map if the input is empty', async function () {
+            const result = await toMapAsync<string, { key: string }>(asyncGenerator([]), (item) => item.key)
+
+            assert.ok(result)
+            assert.strictEqual(result.size, 0)
+        })
+
+        it('uses selector to choose keys', async function () {
+            const result = await toMapAsync(
+                asyncGenerator([{ key: 'a' }, { key: 'b' }, { key: 'c' }]),
+                (item) => item.key
+            )
+
+            assert.ok(result)
+            assert.strictEqual(result.size, 3)
+            assert.ok(result.has('a'))
+            assert.ok(result.has('b'))
+            assert.ok(result.has('c'))
+        })
+
+        it('throws an error on duplicate keys', async function () {
+            await assert.rejects(
+                toMapAsync<string, { key: string }>(
+                    asyncGenerator([{ key: 'a' }, { key: 'b' }, { key: 'b' }, { key: 'c' }]),
+                    (item) => item.key
+                )
+            )
+        })
+    })
+
+    describe('updateInPlace', async function () {
+        it('removes items that are present in the original map, but not the input', async function () {
+            const map = new Map<string, number>()
+            map.set('a', 1)
+
+            updateInPlace(
+                map,
+                [],
+                (key) => assert.fail(),
+                (key) => assert.fail()
+            )
+
+            assert.ok(map)
+            assert.strictEqual(map.size, 0)
+        })
+
+        it('updates items that are present in both the original map and the input', async function () {
+            const map = new Map<string, number>()
+            map.set('a', 1)
+            map.set('b', 2)
+
+            updateInPlace(
+                map,
+                ['b'],
+                (key) => {
+                    assert.strictEqual(key, 'b')
+                    map.set(key, 42)
+                },
+                (key) => assert.fail()
+            )
+
+            assert.ok(map)
+            assert.strictEqual(map.size, 1)
+            assert.strictEqual(map.get('b'), 42)
+        })
+
+        it('adds items that are present in the input, but not the original map', async function () {
+            const map = new Map<string, number>()
+
+            updateInPlace(
+                map,
+                ['a'],
+                (key) => assert.fail(),
+                (key) => {
+                    assert.strictEqual(key, 'a')
+
+                    return 42
+                }
+            )
+
+            assert.ok(map)
+            assert.strictEqual(map.size, 1)
+            assert.strictEqual(map.get('a'), 42)
+        })
+    })
+
+    describe('first', async function () {
+        it('returns the first item the sequence is not empty', async function () {
+            const result = await first(asyncGenerator(['first']))
+
+            assert.strictEqual(result, 'first')
+        })
+
+        it('returns undefined if the sequence is empty', async function () {
+            const result = await first(asyncGenerator([]))
+
+            assert.strictEqual(result, undefined)
+        })
+
+        it('lazily iterates the sequence', async function () {
+            async function* generator(): AsyncIterable<string> {
+                yield 'first'
+                assert.fail('generator iterated too far')
+            }
+
+            const result = await first(generator())
+
+            assert.strictEqual(result, 'first')
+        })
+    })
+
+    describe('take', async function () {
+        it('returns the first <count> items if sequence contains at least that many items', async function () {
+            const result = await take(asyncGenerator(['first', 'second', 'third']), 2)
+
+            assert.ok(result)
+            assert.strictEqual(result.length, 2)
+        })
+
+        it('returns the first <sequence.length> items if sequence contains fewer than <count> items', async function () {
+            const result = await take(asyncGenerator(['first', 'second']), 3)
+
+            assert.ok(result)
+            assert.strictEqual(result.length, 2)
+        })
+
+        it('returns an empty array if sequence is empty', async function () {
+            const result = await take(asyncGenerator([]), 1)
+
+            assert.ok(result)
+            assert.strictEqual(result.length, 0)
+        })
+
+        it('returns an empty array if count is 0', async function () {
+            const result = await take(asyncGenerator(['first']), 0)
+
+            assert.ok(result)
+            assert.strictEqual(result.length, 0)
+        })
+
+        it('lazily iterates the sequence', async function () {
+            async function* generator(): AsyncIterable<string> {
+                yield 'first'
+                yield 'second'
+                assert.fail('generator iterated too far')
+            }
+
+            const result = await take(generator(), 2)
+
+            assert.ok(result)
+            assert.strictEqual(result.length, 2)
+        })
+    })
+
+    describe('filter', async function () {
+        it('returns the original sequence filtered by the predicate', async function () {
+            const input: Iterable<number> = [1, 2]
+            const result = filter(input, (i) => i % 2 === 0)
+
+            assert.ok(result)
+            assert.strictEqual(result.length, 1)
+            assert.strictEqual(result[0], 2)
+        })
+    })
+
+    describe('filterAsync', async function () {
+        it('returns the original sequence filtered by the predicate', async function () {
+            const result = await toArrayAsync(filterAsync([1, 2], async (i) => i % 2 === 0))
+
+            assert.ok(result)
+            assert.strictEqual(result.length, 1)
+            assert.strictEqual(result[0], 2)
+        })
+    })
+
+    describe('getPaginatedAwsCallIter', async function () {
+        it('iterates as long as results are present', async function () {
+            const fakeCall = sandbox.stub<
+                [CloudWatchLogs.DescribeLogStreamsRequest],
+                CloudWatchLogs.DescribeLogStreamsResponse
+            >()
+            const responses: CloudWatchLogs.LogStream[][] = [
+                [{ logStreamName: 'stream1' }, { logStreamName: 'stream2' }, { logStreamName: 'stream3' }],
+                [{ logStreamName: 'stream4' }, { logStreamName: 'stream5' }, { logStreamName: 'stream6' }],
+                [{ logStreamName: 'stream7' }, { logStreamName: 'stream8' }, { logStreamName: 'stream9' }],
+            ]
+            fakeCall
+                .onCall(0)
+                .returns({
+                    logStreams: responses[0],
+                    nextToken: 'gotAToken',
+                })
+                .onCall(1)
+                .returns({
+                    logStreams: responses[1],
+                    nextToken: 'gotAnotherToken',
+                })
+                .onCall(2)
+                .returns({
+                    logStreams: responses[2],
+                })
+                .onCall(3)
+                .returns({})
+            const params: getPaginatedAwsCallIterParams<
+                CloudWatchLogs.DescribeLogStreamsRequest,
+                CloudWatchLogs.DescribeLogStreamsResponse
+            > = {
+                awsCall: async (req) => fakeCall(req),
+                nextTokenNames: {
+                    request: 'nextToken',
+                    response: 'nextToken',
+                },
+                request: {
+                    logGroupName: 'imJustHereSoIWontGetFined',
+                },
+            }
+            const iter: AsyncIterator<CloudWatchLogs.DescribeLogStreamsResponse> = getPaginatedAwsCallIter(params)
+            const firstResult = await iter.next()
+            const secondResult = await iter.next()
+            const thirdResult = await iter.next()
+            const fourthResult = await iter.next()
+            assert.deepStrictEqual(firstResult.value.logStreams, responses[0])
+            assert.deepStrictEqual(secondResult.value.logStreams, responses[1])
+            assert.deepStrictEqual(thirdResult.value.logStreams, responses[2])
+            assert.deepStrictEqual(fourthResult, { done: true, value: undefined })
+        })
+    })
+
+    describe('IteratorTransformer', async function () {
+        it('transforms values from the iterator and does not carry state over when creating another iterator', async function () {
+            const values = ['a', 'b', 'c']
+            async function* iteratorFn(): AsyncIterator<string> {
+                for (const val of values) {
+                    yield val
+                }
+            }
+            const populator = new IteratorTransformer<string, vscode.QuickPickItem>(
+                () => iteratorFn(),
+                (val) => {
+                    if (val) {
+                        return [{ label: val.toUpperCase() }]
+                    }
+
+                    return []
+                }
+            )
+
+            const firstIter = populator.createPickIterator()
+            let firstI = 0
+            let firstItem = await firstIter.next()
+            while (!firstItem.done) {
+                assert.ok(Array.isArray(firstItem.value)),
+                    assert.strictEqual(firstItem.value.length, 1),
+                    assert.deepStrictEqual(firstItem.value[0], { label: values[firstI].toUpperCase() })
+                firstI++
+                firstItem = await firstIter.next()
+            }
+
+            const secondIter = populator.createPickIterator()
+            let secondI = 0
+            let secondItem = await secondIter.next()
+            while (!secondItem.done) {
+                assert.ok(Array.isArray(secondItem.value)),
+                    assert.strictEqual(secondItem.value.length, 1),
+                    assert.deepStrictEqual(secondItem.value[0], { label: values[secondI].toUpperCase() })
+                secondI++
+                secondItem = await secondIter.next()
+            }
+        })
+    })
+
+    describe('stripUndefined', function () {
+        it('removes undefined from objects', function () {
+            const obj = {
+                prop1: undefined,
+                prop2: 0,
+                prop3: {
+                    prop4: false,
+                    prop5: undefined,
+                    prop6: { prop7: '' },
+                },
+            }
+
+            stripUndefined(obj)
+            assert.deepStrictEqual(obj, {
+                prop2: 0,
+                prop3: {
+                    prop4: false,
+                    prop6: { prop7: '' },
+                },
+            })
+        })
+    })
+
+    describe('pageableToCollection', function () {
+        const pages: { [page: string]: { data: number[]; next?: string } } = {
+            page1: {
+                data: [0, 1, 2],
+                next: 'page2',
+            },
+            page2: {
+                data: [3, 4],
+                next: 'page3',
+            },
+            page3: {
+                data: [5],
+                next: 'page4',
+            },
+            page4: {
+                data: [],
+            },
+            secretPage: {
+                data: [-1],
+            },
+            falsePage: {
+                data: [],
+                next: '', // some APIs will return empty strings rather than undefined
+            },
+        }
+
+        const requester = async (request: { next?: string }) => pages[request.next ?? 'page1']
+
+        it('creates a new AsyncCollection', async function () {
+            const collection = pageableToCollection(requester, {}, 'next' as never, 'data')
+            assert.deepStrictEqual(await collection.promise(), [[0, 1, 2], [3, 4], [5], []])
+        })
+
+        it('uses initial request', async function () {
+            const collection = pageableToCollection(requester, { next: 'secretPage' }, 'next', 'data')
+            assert.deepStrictEqual(await collection.promise(), [[-1]])
+        })
+
+        it('terminates when `next` is an empty string', async function () {
+            const collection = pageableToCollection(requester, { next: 'falsePage' }, 'next', 'data')
+            assert.deepStrictEqual(await collection.promise(), [[]])
+        })
+
+        async function last<T>(iterable: AsyncCollection<T>): Promise<T | undefined> {
+            const iterator = iterable.iterator()
+            while (true) {
+                const { value, done } = await iterator.next()
+                if (done) {
+                    if (value === undefined) {
+                        break
+                    }
+                    return value
+                }
+            }
+        }
+
+        describe('last', function () {
+            it('it persists last element when mapped', async function () {
+                const collection = pageableToCollection(requester, {}, 'next' as never, 'data')
+                const mapped = collection.map((i) => i[0] ?? -1)
+                assert.strictEqual(await last(mapped), -1)
+            })
+        })
+    })
+
+    const promise = <T>(val: T) => new Promise<T>((resolve) => setImmediate(() => resolve(val)))
+    const cons = <T, U>(arr: Promise<T>[], next: U) => {
+        if (arr.length === 0) {
+            return [promise(next)]
+        } else {
+            return [...arr, arr[arr.length - 1].then(() => promise(next))]
+        }
+    }
+    const toPromiseChain = <T>(arr: T[]) => arr.reduce(cons, [] as Promise<T>[])
+
+    async function iterateAll<T>(iterable: AsyncIterable<T>) {
+        const result = [] as (T | Error)[]
+        try {
+            for await (const val of iterable) {
+                result.push(val)
+            }
+        } catch (err) {
+            assert.ok(err instanceof Error)
+            result.push(err)
+        }
+
+        return result
+    }
+
+    describe('toStream', function () {
+        it('yields values that resolve first regardless of order', async function () {
+            const values = toPromiseChain([0, 1, 2, 3])
+            const stream = toStream(values.reverse())
+
+            assert.deepStrictEqual(await iterateAll(stream), [0, 1, 2, 3])
+        })
+
+        it('immediately yields values that are not promises', async function () {
+            const stream = toStream([0, promise(1), 2, promise(3)])
+
+            assert.deepStrictEqual(await iterateAll(stream), [0, 2, 1, 3])
+        })
+
+        it('throws on any error', async function () {
+            const values = toPromiseChain([0, 1, 2, 3])
+            const err = new Error()
+            const rejected = values[0].then(() => Promise.reject(err))
+            const stream = toStream([...values, rejected])
+
+            assert.deepStrictEqual(await iterateAll(stream), [0, err])
+        })
+    })
+
+    describe('join', function () {
+        async function* toAsyncIterable<T>(iterable: Iterable<T | Promise<T>>, returnValue?: T) {
+            for await (const val of iterable) {
+                yield val
+            }
+
+            return returnValue
+        }
+
+        interface TestCase<T> {
+            readonly data: T[]
+            readonly left: number[]
+            readonly right: number[]
+            readonly expected?: T[]
+        }
+
+        async function run<T>(testCase: TestCase<T>) {
+            const expected = testCase.expected ?? testCase.data
+            const arr = toPromiseChain(testCase.data)
+            const left = toAsyncIterable(testCase.left.map((i) => arr[i]))
+            const right = toAsyncIterable(testCase.right.map((i) => arr[i]))
+
+            assert.deepStrictEqual(await iterateAll(join(left, right)), expected)
+        }
+
+        const cases: Record<string, TestCase<number>> = {
+            'empty left': { data: [0], left: [0], right: [] },
+            'empty right': { data: [0], left: [], right: [0] },
+            'even split': { data: [0, 1], left: [0], right: [1] },
+            'even split reversed': { data: [0, 1], left: [1], right: [0] },
+            'empty left 2': { data: [0, 1], left: [0, 1], right: [] },
+            'empty right 2': { data: [0, 1], left: [], right: [0, 1] },
+            'uneven split': { data: [0, 1, 2], left: [0], right: [1, 2] },
+            'uneven split 2': { data: [0, 1, 2], left: [1], right: [0, 2] },
+            'uneven split 3': { data: [0, 1, 2], left: [2], right: [0, 1] },
+            'out-of-order': { data: [0, 1, 2], left: [1], right: [2, 0], expected: [1, 2, 0] },
+            'out-of-order 2': { data: [0, 1, 2], left: [2], right: [1, 0], expected: [1, 0, 2] },
+        }
+
+        describe('resolves two async iterables simultaneously', function () {
+            for (const [name, testCase] of Object.entries(cases)) {
+                it(name, () => run(testCase))
+            }
+        })
+
+        it('throws if an iterable fails', async function () {
+            const err = new Error()
+            const arr = toPromiseChain([0, 1, 2, 3])
+            const rejected = arr[2].then(() => Promise.reject(err))
+            const left = toAsyncIterable([arr[0], arr[2]])
+            const right = toAsyncIterable([arr[1], rejected, arr[3]])
+
+            assert.deepStrictEqual(await iterateAll(join(left, right)), [0, 1, 2, err])
+        })
+
+        it('returns values returned by the iterables', async function () {
+            const expected = [0, 1, 2, 3]
+            const arr = toPromiseChain(expected)
+            const left = toAsyncIterable([arr[1]], 4)
+            const right = toAsyncIterable([arr[0], arr[2], arr[3]], 5)
+
+            assert.deepStrictEqual(await iterateAll(join(left, right)), expected)
+        })
+
+        describe('joinAll', function () {
+            it('resolves an async iterable of async iterables', async function () {
+                const data = [[0, 1], [2], [3, 4, 5]]
+                const expected = [0, 2, 3, 1, 4, 5]
+                const iterables = data.map(toPromiseChain).map((arr) => toAsyncIterable(arr))
+                const iterable = joinAll(toAsyncIterable(iterables))
+                assert.deepStrictEqual(await iterateAll(iterable), expected)
+            })
+        })
+    })
+
+    describe('isPresent', function () {
+        it('returns true for non undefined values', function () {
+            assert.strictEqual(isPresent<string>(`value`), true)
+        })
+        it('returns false for undefined', function () {
+            assert.strictEqual(isPresent<string>(undefined), false)
+        })
+    })
+
+    describe('inspect', function () {
+        let testData: any
+        before(function () {
+            testData = {
+                root: {
+                    A: {
+                        B: {
+                            C: {
+                                D: {
+                                    E: 'data',
+                                },
+                            },
+                        },
+                    },
+                },
+            }
+        })
+
+        it('defaults to a depth of 3', function () {
+            assert.strictEqual(inspect(testData), '{\n  root: { A: { B: { C: [Object] } } }\n}')
+        })
+
+        it('allows depth to be set manually', function () {
+            assert.strictEqual(
+                inspect(testData, { depth: 6 }),
+                "{\n  root: {\n    A: {\n      B: { C: { D: { E: 'data' } } }\n    }\n  }\n}"
+            )
+        })
+    })
+
+    describe('partialClone', function () {
+        let multipleTypedObj: object
+
+        before(async function () {
+            multipleTypedObj = {
+                a: 34234234234,
+                b: '123456789',
+                c: new Date(2023, 1, 1),
+                d: { d1: { d2: { d3: 'deep' } } },
+                e: {
+                    e1: [4, 3, 7],
+                    e2: 'loooooooooo \n nnnnnnnnnnn \n gggggggg \n string',
+                },
+                f: () => {
+                    throw Error()
+                },
+            }
+        })
+
+        it('omits properties by depth', function () {
+            assert.deepStrictEqual(partialClone(multipleTypedObj, 1), {
+                ...multipleTypedObj,
+                d: {},
+                e: {},
+            })
+            assert.deepStrictEqual(partialClone(multipleTypedObj, 0, [], { replacement: '[replaced]' }), '[replaced]')
+            assert.deepStrictEqual(partialClone(multipleTypedObj, 1, [], { replacement: '[replaced]' }), {
+                ...multipleTypedObj,
+                d: '[replaced]',
+                e: '[replaced]',
+            })
+            assert.deepStrictEqual(partialClone(multipleTypedObj, 3), {
+                ...multipleTypedObj,
+                d: { d1: { d2: {} } },
+            })
+            assert.deepStrictEqual(partialClone(multipleTypedObj, 4), multipleTypedObj)
+        })
+
+        it('omits properties by name', function () {
+            assert.deepStrictEqual(partialClone(multipleTypedObj, 2, ['c', 'e2'], { replacement: '[replaced]' }), {
+                ...multipleTypedObj,
+                c: '[replaced]',
+                d: { d1: '[replaced]' },
+                e: {
+                    e1: '[replaced]',
+                    e2: '[replaced]',
+                },
+            })
+            assert.deepStrictEqual(partialClone(multipleTypedObj, 3, ['c', 'e2'], { replacement: '[replaced]' }), {
+                ...multipleTypedObj,
+                c: '[replaced]',
+                d: { d1: { d2: '[replaced]' } },
+                e: {
+                    e1: [4, 3, 7],
+                    e2: '[replaced]',
+                },
+            })
+        })
+
+        it('truncates properties by maxLength', function () {
+            const testObj = {
+                strValue: '1',
+                boolValue: true,
+                longString: '11111',
+                nestedObj: {
+                    nestedObjAgain: {
+                        longNestedStr: '11111',
+                        shortNestedStr: '11',
+                    },
+                },
+                nestedObj2: {
+                    functionValue: (_: unknown) => {},
+                },
+                nestedObj3: {
+                    myArray: ['1', '11111', '1'],
+                },
+                objInArray: [{ shortString: '11', longString: '11111' }],
+            }
+            assert.deepStrictEqual(partialClone(testObj, 5, [], { maxStringLength: 2 }), {
+                ...testObj,
+                longString: '11...',
+                nestedObj: {
+                    nestedObjAgain: {
+                        longNestedStr: '11...',
+                        shortNestedStr: '11',
+                    },
+                },
+                nestedObj3: {
+                    myArray: ['1', '11...', '1'],
+                },
+                objInArray: [{ shortString: '11', longString: '11...' }],
+            })
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/utilities/commentUtils.test.ts b/packages/core/src/test/shared/utilities/commentUtils.test.ts
new file mode 100644
index 00000000000..a05eeb7f771
--- /dev/null
+++ b/packages/core/src/test/shared/utilities/commentUtils.test.ts
@@ -0,0 +1,101 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import sinon from 'sinon'
+import assert from 'assert'
+import vscode from 'vscode'
+import {
+    detectCommentAboveLine,
+    getLanguageCommentConfig,
+    insertCommentAboveLine,
+} from '../../../shared/utilities/commentUtils'
+import { createMockDocument } from '../../codewhisperer/testUtil'
+
+describe('CommentUtils', function () {
+    let sandbox: sinon.SinonSandbox
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    describe('getLanguageCommentConfig', function () {
+        it('should get comment config for a given languageId', function () {
+            assert.equal(getLanguageCommentConfig('java').lineComment, '//')
+            assert.equal(getLanguageCommentConfig('python').lineComment, '#')
+            assert.equal(getLanguageCommentConfig('javascript').lineComment, '//')
+            assert.deepEqual(getLanguageCommentConfig('xml').blockComment, ['<!--', '-->'])
+        })
+
+        it('should handle invalid languageIds', function () {
+            assert.deepEqual(getLanguageCommentConfig('invalid'), {})
+        })
+    })
+
+    describe('detectCommentAboveLine', function () {
+        it('should return true if the comment exists above the line in the given document', function () {
+            const document = createMockDocument('# some-comment\nfoo = 1', 'foo.py', 'python')
+            assert.equal(detectCommentAboveLine(document, 1, 'some-comment'), true)
+        })
+
+        it('should fallback to block comment if line comment is not found', function () {
+            const document = createMockDocument("''' some-comment '''\nfoo = 1", 'foo.py', 'python')
+            assert.equal(detectCommentAboveLine(document, 1, 'some-comment'), true)
+        })
+
+        it('should allow empty lines in between the line and the comment', function () {
+            const document = createMockDocument('# some-comment\n\n\nfoo = 1', 'foo.py', 'python')
+            assert.equal(detectCommentAboveLine(document, 3, 'some-comment'), true)
+        })
+
+        it('should return false if the comment is not found', function () {
+            const document = createMockDocument('foo = 1\nbar = 2', 'foo.py', 'python')
+            assert.equal(detectCommentAboveLine(document, 2, 'some-comment'), false)
+        })
+
+        it('should return false for invalid inputs', function () {
+            const document = createMockDocument('# some-comment\nfoo = 1', 'foo.py', 'python')
+            assert.equal(detectCommentAboveLine(document, -1, 'some-comment'), false)
+        })
+    })
+
+    describe('insertCommentAboveLine', function () {
+        let insertMock: sinon.SinonStub
+        let applyEditMock: sinon.SinonStub
+
+        beforeEach(function () {
+            insertMock = sandbox.stub()
+            applyEditMock = sandbox.stub()
+        })
+
+        it('should insert the comment above the line in the given document', function () {
+            sandbox.stub(vscode.WorkspaceEdit.prototype, 'insert').value(insertMock)
+            sandbox.stub(vscode.workspace, 'applyEdit').value(applyEditMock)
+
+            const document = createMockDocument('foo = 1\nbar = 2', 'foo.py', 'python')
+            insertCommentAboveLine(document, 1, 'some-comment')
+            assert.ok(insertMock.calledOnceWith(document.uri, new vscode.Position(0, 0), '\n# some-comment'))
+        })
+
+        it('should indent the comment by the same amount as the current line', function () {
+            sandbox.stub(vscode.WorkspaceEdit.prototype, 'insert').value(insertMock)
+            sandbox.stub(vscode.workspace, 'applyEdit').value(applyEditMock)
+
+            const document = createMockDocument('    foo = 1\n    bar = 2', 'foo.py', 'python')
+            insertCommentAboveLine(document, 1, 'some-comment')
+            assert.ok(insertMock.calledOnceWith(document.uri, new vscode.Position(0, 0), '\n    # some-comment'))
+        })
+
+        it('should fallback to block comment if line comment is undefined', function () {
+            sandbox.stub(vscode.WorkspaceEdit.prototype, 'insert').value(insertMock)
+            sandbox.stub(vscode.workspace, 'applyEdit').value(applyEditMock)
+
+            const document = createMockDocument('<aaa>\n  <bbb></bbb>\n</aaa>', 'foo.xml', 'xml')
+            insertCommentAboveLine(document, 1, 'some-comment')
+            assert.ok(insertMock.calledOnceWith(document.uri, new vscode.Position(0, 0), '\n  <!-- some-comment -->'))
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/utilities/downloadPatterns.ts b/packages/core/src/test/shared/utilities/downloadPatterns.ts
new file mode 100644
index 00000000000..fcc6e00430e
--- /dev/null
+++ b/packages/core/src/test/shared/utilities/downloadPatterns.ts
@@ -0,0 +1,46 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as assert from 'assert'
+import * as path from 'path'
+import * as vscode from 'vscode'
+import { getPattern } from '../../../shared/utilities/downloadPatterns'
+import { createTestWorkspaceFolder } from '../../testUtil'
+import { fs } from '../../../shared'
+
+describe('try', () => {
+    let tempFolder: vscode.Uri
+
+    beforeEach(async () => {
+        tempFolder = (await createTestWorkspaceFolder()).uri
+    })
+
+    afterEach(async () => {
+        try {
+            await fs.delete(tempFolder.fsPath, { recursive: true, force: true })
+        } catch (err) {
+            assert.fail(`Error deleting temporary folder ${tempFolder.fsPath}: ${err}`)
+        }
+    })
+
+    // This checks if the code's zip got extracted to destination folder
+    describe('getPattern', () => {
+        it('should extract the zip file to the output directory', async () => {
+            const owner = 'aws-samples'
+            const repoName = 'serverless-patterns'
+            const assetName = 'activemq-lambda.zip'
+
+            console.log(`Downloading zip file`)
+            await getPattern(owner, repoName, assetName, tempFolder)
+
+            console.log(`Extracting zip file to ${tempFolder.fsPath}`)
+            const folderContents = await fs.readdir(tempFolder.fsPath)
+            console.log(`Contents of ${tempFolder.fsPath}:`, folderContents)
+
+            const expectedFolderPath = path.join(tempFolder.fsPath, 'activemq-lambda')
+            console.log(`Expected folder path: ${expectedFolderPath}`)
+            assert.ok(await fs.exists(expectedFolderPath), `Expected folder ${expectedFolderPath} not found`)
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/utilities/editorUtilities.test.ts b/packages/core/src/test/shared/utilities/editorUtilities.test.ts
new file mode 100644
index 00000000000..b2c77bd4125
--- /dev/null
+++ b/packages/core/src/test/shared/utilities/editorUtilities.test.ts
@@ -0,0 +1,75 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as path from 'path'
+import sinon from 'sinon'
+import { closeAllEditors, assertTabCount, createTestWorkspaceFolder, toTextEditor } from '../../testUtil'
+import { getOpenFilesInWindow, isTextEditor } from '../../../shared/utilities/editorUtilities'
+
+describe('supplementalContextUtil', function () {
+    let tempFolder: string
+
+    describe('getOpenFilesInWindow', async function () {
+        before(async function () {
+            this.timeout(60000)
+        })
+
+        beforeEach(async function () {
+            await closeAllEditors()
+            tempFolder = (await createTestWorkspaceFolder()).uri.fsPath
+        })
+
+        afterEach(async function () {
+            await closeAllEditors()
+        })
+
+        it('isTextEditor returns false if scheme is debug, output or vscode-terminal', async function () {
+            const editor = await toTextEditor('content', 'file.java', tempFolder, { preview: false })
+            const uri = editor.document.uri
+
+            sinon.stub(uri, 'scheme').get(() => 'debug')
+            assert.strictEqual(isTextEditor(editor), false)
+
+            sinon.stub(uri, 'scheme').get(() => 'output')
+            assert.strictEqual(isTextEditor(editor), false)
+
+            sinon.stub(uri, 'scheme').get(() => 'vscode-terminal')
+            assert.strictEqual(isTextEditor(editor), false)
+        })
+
+        it('no filter provided as argument, should return all files opened', async function () {
+            await toTextEditor('content-1', 'file-1.java', tempFolder, { preview: false })
+            await toTextEditor('content-2', 'file-2.java', tempFolder, { preview: false })
+            await toTextEditor('content-3', 'file-3.java', tempFolder, { preview: false })
+            await toTextEditor('content-4', 'file-4.java', tempFolder, { preview: false })
+
+            await assertTabCount(4)
+
+            const actual = new Set<string>(await getOpenFilesInWindow())
+            assert.strictEqual(actual.size, 4)
+            assert.ok(actual.has(path.join(tempFolder, 'file-1.java')))
+            assert.ok(actual.has(path.join(tempFolder, 'file-2.java')))
+            assert.ok(actual.has(path.join(tempFolder, 'file-3.java')))
+            assert.ok(actual.has(path.join(tempFolder, 'file-4.java')))
+        })
+
+        it('filter argument provided, should return only files matching the predicate', async function () {
+            await toTextEditor('content-1', 'file-1.java', tempFolder, { preview: false })
+            await toTextEditor('content-2', 'file-2.java', tempFolder, { preview: false })
+            await toTextEditor('content-3', 'file-3.txt', tempFolder, { preview: false })
+            await toTextEditor('content-4', 'file-4.txt', tempFolder, { preview: false })
+
+            await assertTabCount(4)
+
+            const actual = new Set<string>(
+                await getOpenFilesInWindow(async (fileName) => path.extname(fileName) === '.java')
+            )
+            assert.strictEqual(actual.size, 2)
+            assert.ok(actual.has(path.join(tempFolder, 'file-1.java')))
+            assert.ok(actual.has(path.join(tempFolder, 'file-2.java')))
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/utilities/functionUtils.test.ts b/packages/core/src/test/shared/utilities/functionUtils.test.ts
new file mode 100644
index 00000000000..3ba11518414
--- /dev/null
+++ b/packages/core/src/test/shared/utilities/functionUtils.test.ts
@@ -0,0 +1,248 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import {
+    once,
+    onceChanged,
+    debounce,
+    oncePerUniqueArg,
+    onceChangedWithComparator,
+} from '../../../shared/utilities/functionUtils'
+import { installFakeClock } from '../../testUtil'
+
+describe('functionUtils', function () {
+    it('once()', function () {
+        let counter = 0
+        const fn = once(() => void counter++)
+
+        fn()
+        assert.strictEqual(counter, 1)
+
+        fn()
+        assert.strictEqual(counter, 1)
+    })
+
+    it('onceChanged()', function () {
+        let counter = 0
+        const arg2 = {}
+        const arg2_ = { a: 42 }
+        const fn = onceChanged((s: string, o: object) => void counter++)
+
+        fn('arg1', arg2)
+        assert.strictEqual(counter, 1)
+
+        fn('arg1', arg2)
+        fn('arg1', arg2)
+        assert.strictEqual(counter, 1)
+
+        fn('arg1_', arg2)
+        assert.strictEqual(counter, 2)
+
+        fn('arg1_', arg2)
+        fn('arg1_', arg2)
+        fn('arg1_', arg2)
+        assert.strictEqual(counter, 2)
+
+        fn('arg1', arg2_)
+        assert.strictEqual(counter, 3)
+
+        // TODO: bug/limitation: Objects are not discriminated.
+        // TODO: use lib?: https://github.com/anywhichway/nano-memoize
+        fn('arg1', arg2_)
+        assert.strictEqual(counter, 3)
+    })
+
+    it('onceChangedWithComparator()', function () {
+        let counter = 0
+        const credentialsEqual = ([prev]: [any], [current]: [any]) => {
+            if (!prev && !current) {
+                return true
+            }
+            if (!prev || !current) {
+                return false
+            }
+            return prev.accessKeyId === current.accessKeyId && prev.secretAccessKey === current.secretAccessKey
+        }
+        const fn = onceChangedWithComparator((creds: any) => void counter++, credentialsEqual)
+
+        const creds1 = { accessKeyId: 'key1', secretAccessKey: 'secret1' }
+        const creds2 = { accessKeyId: 'key1', secretAccessKey: 'secret1' }
+        const creds3 = { accessKeyId: 'key2', secretAccessKey: 'secret2' }
+
+        fn(creds1)
+        assert.strictEqual(counter, 1)
+
+        fn(creds2) // Same values, should not execute
+        assert.strictEqual(counter, 1)
+
+        fn(creds3) // Different values, should execute
+        assert.strictEqual(counter, 2)
+
+        fn(creds3) // Same as previous, should not execute
+        assert.strictEqual(counter, 2)
+    })
+
+    it('oncePerUniqueArg()', function () {
+        let counter = 0
+        const fn = oncePerUniqueArg((s: string) => {
+            counter++
+            return `processed-${s}`
+        })
+
+        const result1 = fn('hello')
+        assert.strictEqual(result1, 'processed-hello')
+        assert.strictEqual(counter, 1, 'First call with unique arg should execute')
+
+        const result2 = fn('hello')
+        assert.strictEqual(result2, undefined)
+        assert.strictEqual(counter, 1, 'Second call with same arg should not execute')
+
+        const result3 = fn('world')
+        assert.strictEqual(result3, 'processed-world')
+        assert.strictEqual(counter, 2, 'Call with new arg should execute')
+
+        fn('hello')
+        fn('world')
+        assert.strictEqual(counter, 2, 'Repeated calls with seen args should not execute')
+
+        // New arg should execute
+        const result4 = fn('test')
+        assert.strictEqual(result4, 'processed-test')
+        assert.strictEqual(counter, 3)
+    })
+
+    it('oncePerUniqueArg() with custom key', function () {
+        let counter = 0
+        const fn = oncePerUniqueArg(
+            (_s1: string, _s2: string) => {
+                counter++
+            },
+            { key: (s1, _s2) => s1 }
+        )
+
+        fn('hello', 'world')
+        assert.strictEqual(counter, 1, 'First call with unique arg should execute')
+
+        fn('hello', 'worldss')
+        assert.strictEqual(counter, 1, 'Second arg being different should not execute')
+
+        fn('world', 'hello')
+        assert.strictEqual(counter, 2, 'First arg being different should execute')
+    })
+
+    it('oncePerUniqueArg() with overflow limit', function () {
+        let counter = 0
+        // Create function with small overflow limit
+        const fn = oncePerUniqueArg(
+            (_s: string) => {
+                counter++
+                return counter
+            },
+            { overflow: 2 }
+        )
+
+        // Fill the buffer
+        fn('one')
+        fn('two')
+        assert.strictEqual(counter, 2)
+
+        fn('three')
+        assert.strictEqual(counter, 3, '"three" call should execute since it is a new value')
+
+        // 'one' should now be treated as new again since it was evicted
+        fn('one')
+        assert.strictEqual(counter, 4, 'one should still be in the buffer')
+
+        // 'three' should still be in the buffer (not executed)
+        fn('three')
+        assert.strictEqual(counter, 4, 'three should still be in the buffer')
+    })
+})
+
+describe('debounce', function () {
+    let counter: number
+    let fn: () => Promise<unknown>
+
+    beforeEach(function () {
+        counter = 0
+        fn = debounce(() => void counter++)
+    })
+
+    it('prevents a function from executing more than once in the `delay` window', async function () {
+        await Promise.all([fn(), fn()])
+        assert.strictEqual(counter, 1)
+    })
+
+    it('returns references to the promises', async function () {
+        const invokes = [fn(), fn()]
+        assert.strictEqual(invokes[0], invokes[1])
+        await Promise.all(invokes)
+    })
+
+    it('allows the function to be called again after resolving', async function () {
+        await Promise.all([fn(), fn()])
+        await Promise.all([fn(), fn(), fn()])
+        assert.strictEqual(counter, 2)
+    })
+
+    describe('useLastCall option', function () {
+        let args: number[]
+        let clock: ReturnType<typeof installFakeClock>
+        let addToArgs: (i: number) => void
+
+        before(function () {
+            args = []
+            clock = installFakeClock()
+            addToArgs = (n: number) => args.push(n)
+        })
+
+        afterEach(function () {
+            clock.uninstall()
+            args.length = 0
+        })
+
+        it('only calls with the last args', async function () {
+            const debounced = debounce(addToArgs, 10, true)
+            const p1 = debounced(1)
+            const p2 = debounced(2)
+            const p3 = debounced(3)
+            await clock.tickAsync(100)
+            await Promise.all([p1, p2, p3])
+            assert.deepStrictEqual(args, [3])
+        })
+    })
+
+    describe('window rolling', function () {
+        let clock: ReturnType<typeof installFakeClock>
+        const calls: ReturnType<typeof fn>[] = []
+        const callAndSleep = async (delayInMs: number) => {
+            calls.push(fn())
+            await clock.tickAsync(delayInMs)
+        }
+
+        beforeEach(function () {
+            clock = installFakeClock()
+            fn = debounce(() => void counter++, 10)
+        })
+
+        afterEach(function () {
+            clock.uninstall()
+            calls.length = 0
+        })
+
+        it('rolls the delay window when called', async function () {
+            await callAndSleep(5) // timeout set at T+10ms
+            await callAndSleep(5) // timeout moved to T+15ms
+            await callAndSleep(10) // timeout moved to T+20ms
+            await callAndSleep(10) // timeout expired, start new one at T+30ms
+
+            // finish at T+40ms
+            await Promise.all(calls)
+            assert.strictEqual(counter, 2)
+            assert.strictEqual(calls.length, 4)
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/utilities/map.test.ts b/packages/core/src/test/shared/utilities/map.test.ts
new file mode 100644
index 00000000000..b696ca504f7
--- /dev/null
+++ b/packages/core/src/test/shared/utilities/map.test.ts
@@ -0,0 +1,59 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { NestedMap } from '../../../shared/utilities/map'
+
+class TestInMemoryMap extends NestedMap<string, { a?: string; b: number }> {
+    protected override hash(key: string): string {
+        return key
+    }
+    protected override get name(): string {
+        return TestInMemoryMap.name
+    }
+    override get default(): { a?: string; b: number } {
+        return { a: undefined, b: 0 }
+    }
+}
+
+describe(NestedMap.name, () => {
+    it('behaves as expected', () => {
+        const map = new TestInMemoryMap()
+
+        // exist() returns false if the key does not exist
+        assert.deepStrictEqual(map.has('key1'), false)
+
+        // get() returns the default value if the key does not exist
+        assert.deepStrictEqual(map.get('key1'), map.default)
+
+        // set() adds a new key
+        map.set('key1', { a: 'key1Value', b: 1 })
+        assert.deepStrictEqual(map.has('key1'), true)
+        assert.deepStrictEqual(map.get('key1'), { a: 'key1Value', b: 1 })
+
+        // set() updates an existing key
+        map.set('key1', { a: 'key1ValueUpdated' })
+        assert.deepStrictEqual(map.has('key1'), true)
+        assert.deepStrictEqual(map.get('key1'), { a: 'key1ValueUpdated', b: 1 })
+
+        // set() another key
+        map.set('key2', { a: 'key2Value', b: 2 })
+
+        // First key still exists and so does the new one
+        assert.deepStrictEqual(map.has('key1'), true)
+        assert.deepStrictEqual(map.has('key2'), true)
+        assert.deepStrictEqual(map.get('key1'), { a: 'key1ValueUpdated', b: 1 })
+        assert.deepStrictEqual(map.get('key2'), { a: 'key2Value', b: 2 })
+
+        // clear() removes first key
+        map.delete('key1', 'removing for test')
+        assert.deepStrictEqual(map.has('key1'), false)
+        assert.deepStrictEqual(map.get('key1'), map.default)
+
+        // exist() is still true for the second key
+        assert.deepStrictEqual(map.has('key2'), true)
+        assert.deepStrictEqual(map.get('key2'), { a: 'key2Value', b: 2 })
+    })
+})
diff --git a/packages/core/src/test/shared/utilities/messages.test.ts b/packages/core/src/test/shared/utilities/messages.test.ts
new file mode 100644
index 00000000000..1b0ca5e8049
--- /dev/null
+++ b/packages/core/src/test/shared/utilities/messages.test.ts
@@ -0,0 +1,93 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import {
+    showConfirmationMessage,
+    showViewLogsMessage,
+    showOutputMessage,
+    showMessageWithCancel,
+} from '../../../shared/utilities/messages'
+import { Timeout } from '../../../shared/utilities/timeoutUtils'
+import { getTestWindow } from '../../shared/vscode/window'
+import { MockOutputChannel } from '../../mockOutputChannel'
+
+describe('messages', function () {
+    describe('showConfirmationMessage', function () {
+        const prompt = 'prompt'
+        const confirm = 'confirm'
+        const cancel = 'cancel'
+
+        it('confirms warning message when the user clicks confirm', async function () {
+            const isConfirmed = showConfirmationMessage({ prompt, confirm, cancel })
+            await getTestWindow()
+                .waitForMessage(prompt)
+                .then((message) => message.selectItem(confirm))
+
+            assert.strictEqual(await isConfirmed, true)
+        })
+
+        it('cancels warning message when the user clicks cancel', async function () {
+            const isConfirmed = showConfirmationMessage({ prompt, confirm, cancel })
+            await getTestWindow()
+                .waitForMessage(prompt)
+                .then((message) => message.selectItem(cancel))
+
+            assert.strictEqual(await isConfirmed, false)
+        })
+
+        it('cancels warning message on close', async function () {
+            const isConfirmed = showConfirmationMessage({ prompt, confirm, cancel })
+            await getTestWindow()
+                .waitForMessage(prompt)
+                .then((message) => message.close())
+
+            assert.strictEqual(await isConfirmed, false)
+        })
+    })
+
+    describe('showOutputMessage', function () {
+        it('shows and appends line to output channel', function () {
+            const outputChannel = new MockOutputChannel()
+            showOutputMessage('message', outputChannel)
+
+            assert.strictEqual(outputChannel.isFocused, false)
+            assert.strictEqual(outputChannel.isShown, true)
+            assert.strictEqual(outputChannel.value, 'message\n')
+        })
+    })
+
+    describe('showErrorWithLogs', function () {
+        const message = 'message'
+
+        it('shows error message with a button to view logs', async function () {
+            getTestWindow().onDidShowMessage((m) => m.selectItem('View Logs...'))
+            await showViewLogsMessage(message)
+            getTestWindow().getFirstMessage().assertError(message)
+        })
+    })
+
+    describe('showMessageWithCancel, showProgressWithTimeout', function () {
+        it('does not show if Timeout completes before "showAfterMs"', async function () {
+            const msg = 'test message'
+            const timeout = new Timeout(1) // Completes in 1 ms.
+            void showMessageWithCancel(msg, timeout, 20)
+            await assert.rejects(getTestWindow().waitForMessage(msg, 50))
+        })
+
+        it('shows after "showAfterMs"', async function () {
+            const msg = 'test message'
+            const timeout = new Timeout(9999) // Completes in 1 ms.
+            void showMessageWithCancel(msg, timeout, 50)
+            // timeout.cancel()  // Force complete.
+            await getTestWindow()
+                .waitForMessage(msg)
+                .then((message) => {
+                    message.close()
+                })
+            timeout.cancel() // Cleanup.
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/utilities/osUtils.test.ts b/packages/core/src/test/shared/utilities/osUtils.test.ts
new file mode 100644
index 00000000000..bd6e4489ac0
--- /dev/null
+++ b/packages/core/src/test/shared/utilities/osUtils.test.ts
@@ -0,0 +1,53 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { isNewOsSession } from '../../../shared/utilities/osUtils'
+import { InstalledClock } from '@sinonjs/fake-timers'
+import { createSandbox, SinonSandbox } from 'sinon'
+
+describe('isNewOsSession', () => {
+    let clock: InstalledClock | undefined
+    let sandbox: SinonSandbox
+
+    beforeEach(function () {
+        sandbox = createSandbox()
+    })
+
+    afterEach(function () {
+        clock?.uninstall()
+        sandbox.restore()
+    })
+
+    it('unix-like: returns true when expected', async () => {
+        const uptimeMillisStub = sandbox.stub()
+        const now = sandbox.stub()
+        // We started our computer at 1 minutes since epoch and the comptuer uptime has been 1 minute.
+        // So the OS started at the epoch  (time - uptime).
+        now.returns(0) // the epoch time
+        uptimeMillisStub.returns(0) // this session has just started
+
+        // On a brand new session the first caller will get true
+        assert.strictEqual(await isNewOsSession(now, uptimeMillisStub), true)
+        // Subsequent callers will get false
+        assert.strictEqual(await isNewOsSession(now, uptimeMillisStub), false)
+
+        // 10 minutes later, same session
+        now.returns(1000 * 60 * 10)
+        uptimeMillisStub.returns(1000 * 60 * 10) // This scales proportionately with the current time
+        // This is still the same session, so we get false
+        assert.strictEqual(await isNewOsSession(now, uptimeMillisStub), false)
+
+        // Test the lowerbound of what is considered a new session
+        // Pretend we started a new computer session 5 seconds after the initial session
+        uptimeMillisStub.returns(0)
+        now.returns(5000)
+        // Anything that is within a 5 second threshold of the last session time, is considered the SAME session
+        assert.strictEqual(await isNewOsSession(now, uptimeMillisStub), false)
+        // This is 1 millisecond after the threshold, it is considered a NEW session
+        now.returns(5000 + 1)
+        assert.strictEqual(await isNewOsSession(now, uptimeMillisStub), true)
+    })
+})
diff --git a/packages/core/src/test/shared/utilities/pathFind.test.ts b/packages/core/src/test/shared/utilities/pathFind.test.ts
new file mode 100644
index 00000000000..43ec92cf680
--- /dev/null
+++ b/packages/core/src/test/shared/utilities/pathFind.test.ts
@@ -0,0 +1,146 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import * as os from 'os'
+import * as path from 'path'
+import * as testutil from '../../testUtil'
+import { fs } from '../../../shared'
+import { findSshPath, findTypescriptCompiler, getVscodeCliPath, tryRun } from '../../../shared/utilities/pathFind'
+import { isCI, isWin } from '../../../shared/vscode/env'
+
+describe('pathFind', function () {
+    it('findTypescriptCompiler()', async function () {
+        const workspace = vscode.workspace.workspaceFolders![0]
+        const tscNodemodules = path.join(workspace.uri.fsPath, `foo/bar/node_modules/.bin/tsc${isWin() ? '.cmd' : ''}`)
+        await fs.delete(tscNodemodules, { force: true })
+
+        // The test workspace normally doesn't have node_modules so this will
+        // be undefined or it will find the globally-installed "tsc".
+        const tscGlobal = await findTypescriptCompiler()
+        assert.ok(tscGlobal === undefined || tscGlobal === 'tsc')
+
+        // Create a fake "node_modules/.bin/tsc" in the test workspace.
+        await testutil.createExecutableFile(tscNodemodules, 'echo "typescript Version 42"')
+
+        const result = await findTypescriptCompiler()
+        assert(result !== undefined)
+        testutil.assertEqualPaths(result, tscNodemodules)
+        await fs.delete(tscNodemodules)
+    })
+
+    it('getVscodeCliPath()', async function () {
+        if (os.platform() === 'linux') {
+            this.skip()
+        }
+        const vscPath = await getVscodeCliPath()
+        assert(vscPath)
+        const regex = /bin[\\\/](code|code-insiders)$/
+        assert.ok(regex.test(vscPath), `expected regex ${regex} to match: "${vscPath}"`)
+    })
+
+    describe('tryRun', function () {
+        it('returns true if output matches expected', async function () {
+            const posResult = await tryRun('echo', ['hello'], 'no', 'hello')
+            assert.ok(posResult)
+
+            const negResult = await tryRun('echo', ['hi'], 'no', 'hello')
+            assert.ok(!negResult)
+        })
+
+        it('supports regex on output match', async function () {
+            const posResult = await tryRun('echo', ['hello'], 'no', /hel*o/)
+            assert.ok(posResult)
+
+            const negResult = await tryRun('echo', ['hi'], 'no', /^(?!(hi)).*$/)
+            assert.ok(!negResult)
+        })
+    })
+
+    describe('findSshPath', function () {
+        let previousPath: string | undefined
+
+        beforeEach(function () {
+            previousPath = process.env.PATH
+        })
+
+        afterEach(function () {
+            process.env.PATH = previousPath
+        })
+
+        it('first tries ssh in $PATH (Non-Windows)', async function () {
+            // skip on windows because ssh in path will never work with .exe extension.
+            if (isWin()) {
+                return
+            }
+            const workspace = await testutil.createTestWorkspaceFolder()
+            const fakeSshPath = path.join(workspace.uri.fsPath, `ssh`)
+
+            process.env.PATH = workspace.uri.fsPath
+
+            await testutil.createExecutableFile(fakeSshPath, '')
+
+            const secondResult = await findSshPath(false)
+
+            assert.strictEqual(secondResult, 'ssh')
+        })
+
+        it('only returns valid executable ssh path (Non-Windows)', async function () {
+            if (isWin()) {
+                return
+            }
+            // On non-windows, we can overwrite path and create our own executable to find.
+            const workspace = await testutil.createTestWorkspaceFolder()
+            const fakeSshPath = path.join(workspace.uri.fsPath, `ssh`)
+
+            process.env.PATH = workspace.uri.fsPath
+
+            await testutil.createExecutableFile(fakeSshPath, '')
+
+            const ssh = await findSshPath(false)
+            assert.ok(ssh)
+            const result = await tryRun(ssh, [], 'yes')
+            assert.ok(result)
+        })
+
+        it('caches result from previous runs (Non-Windows)', async function () {
+            if (isWin()) {
+                return
+            }
+            // On non-windows, we can overwrite path and create our own executable to find.
+            const workspace = await testutil.createTestWorkspaceFolder()
+            // We move the ssh to a temp directory temporarily to test if cache works.
+            const fakeSshPath = path.join(workspace.uri.fsPath, `ssh`)
+
+            process.env.PATH = workspace.uri.fsPath
+
+            await testutil.createExecutableFile(fakeSshPath, '')
+
+            const ssh1 = (await findSshPath(true))!
+
+            await fs.delete(fakeSshPath)
+
+            const ssh2 = await findSshPath(true)
+
+            assert.strictEqual(ssh1, ssh2)
+        })
+
+        it('finds valid executable path (Windows CI)', async function () {
+            // Don't want to be messing with System32 on peoples local machines.
+            if (!isWin() || !isCI()) {
+                return
+            }
+            const expectedPathInCI = 'C:/Windows/System32/OpenSSH/ssh.exe'
+
+            if (!(await fs.exists(expectedPathInCI))) {
+                await testutil.createExecutableFile(expectedPathInCI, '')
+            }
+            const ssh = (await findSshPath(true))!
+            const result = await tryRun(ssh, ['-G', 'x'], 'noresult')
+            assert.ok(result)
+        })
+    })
+})
diff --git a/src/test/shared/utilities/pathUtils.test.ts b/packages/core/src/test/shared/utilities/pathUtils.test.ts
similarity index 97%
rename from src/test/shared/utilities/pathUtils.test.ts
rename to packages/core/src/test/shared/utilities/pathUtils.test.ts
index 9d5b510872b..63b92587ecf 100644
--- a/src/test/shared/utilities/pathUtils.test.ts
+++ b/packages/core/src/test/shared/utilities/pathUtils.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as os from 'os'
 import * as path from 'path'
 import {
diff --git a/packages/core/src/test/shared/utilities/pollingSet.test.ts b/packages/core/src/test/shared/utilities/pollingSet.test.ts
new file mode 100644
index 00000000000..74a7ffbe284
--- /dev/null
+++ b/packages/core/src/test/shared/utilities/pollingSet.test.ts
@@ -0,0 +1,102 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as FakeTimers from '@sinonjs/fake-timers'
+import { installFakeClock } from '../../testUtil'
+import { PollingSet } from '../../../shared/utilities/pollingSet'
+
+describe('pollingSet', function () {
+    let pollingSet: PollingSet<string>
+    let clock: FakeTimers.InstalledClock
+    before(function () {
+        clock = installFakeClock()
+    })
+
+    after(function () {})
+
+    beforeEach(function () {})
+
+    afterEach(function () {
+        if (pollingSet) {
+            pollingSet.clear()
+            pollingSet.clearTimer()
+        }
+    })
+
+    after(function () {
+        sinon.restore()
+        clock.uninstall()
+    })
+
+    it('inherits basic set properties', function () {
+        const pollingSet = new PollingSet(0, () => {})
+        const item1 = { id: 1 }
+        const item2 = { id: 2 }
+
+        pollingSet.add(item1)
+        assert.strictEqual(pollingSet.size, 1)
+        assert(pollingSet.has(item1))
+        assert.strictEqual(pollingSet.has(item2), false)
+
+        pollingSet.delete(item1)
+        assert.strictEqual(pollingSet.size, 0)
+        assert.strictEqual(pollingSet.has(item1), false)
+    })
+
+    it('does not poll on initialization', async function () {
+        const pollingSet = new PollingSet(0, () => {})
+        assert.strictEqual(pollingSet.isActive(), false)
+    })
+
+    it('does not trigger prematurely', async function () {
+        const action = sinon.spy()
+        pollingSet = new PollingSet(10, action)
+        sinon.assert.notCalled(action)
+        pollingSet.add('item')
+
+        await clock.tickAsync(9)
+        sinon.assert.notCalled(action)
+        await clock.tickAsync(1)
+        sinon.assert.calledOnce(action)
+    })
+
+    it('stops timer once polling set is empty', async function () {
+        const pollingSet = new PollingSet(10, () => {})
+        pollingSet.add('1')
+        pollingSet.add('2')
+
+        const clearStub = sinon.stub(pollingSet, 'clearTimer')
+        sinon.assert.notCalled(clearStub)
+        assert.strictEqual(pollingSet.isActive(), true)
+
+        pollingSet.delete('1')
+
+        sinon.assert.notCalled(clearStub)
+        assert.strictEqual(pollingSet.isActive(), true)
+
+        pollingSet.delete('2')
+
+        await clock.tickAsync(20)
+
+        assert.strictEqual(pollingSet.isActive(), false)
+        sinon.assert.callCount(clearStub, 2)
+        clearStub.restore()
+    })
+
+    it('runs action once per interval', async function () {
+        const action = sinon.spy()
+        pollingSet = new PollingSet(10, action)
+        pollingSet.add('1')
+        pollingSet.add('2')
+
+        sinon.assert.callCount(action, 0)
+        await clock.tickAsync(11)
+        sinon.assert.callCount(action, 1)
+        await clock.tickAsync(22)
+        sinon.assert.callCount(action, 3)
+    })
+})
diff --git a/packages/core/src/test/shared/utilities/processUtils.test.ts b/packages/core/src/test/shared/utilities/processUtils.test.ts
new file mode 100644
index 00000000000..fda6d93293e
--- /dev/null
+++ b/packages/core/src/test/shared/utilities/processUtils.test.ts
@@ -0,0 +1,560 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as os from 'os'
+import * as path from 'path'
+import * as sinon from 'sinon'
+import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../../../shared/filesystemUtilities'
+import {
+    ChildProcess,
+    ChildProcessOptions,
+    ChildProcessResult,
+    ChildProcessTracker,
+    defaultProcessWarnThresholds,
+    eof,
+    ProcessStats,
+} from '../../../shared/utilities/processUtils'
+import { sleep } from '../../../shared/utilities/timeoutUtils'
+import { Timeout, waitUntil } from '../../../shared/utilities/timeoutUtils'
+import { fs } from '../../../shared'
+import * as FakeTimers from '@sinonjs/fake-timers'
+import { installFakeClock } from '../../testUtil'
+import { isWin } from '../../../shared/vscode/env'
+import { assertLogsContain } from '../../globalSetup.test'
+
+describe('ChildProcess', async function () {
+    let tempFolder: string
+
+    beforeEach(async function () {
+        // Make a temp folder for all these tests
+        // Stick some temp credentials files in there to load from
+        tempFolder = await makeTemporaryToolkitFolder()
+    })
+
+    afterEach(async function () {
+        await tryRemoveFolder(tempFolder)
+    })
+
+    describe('run', async function () {
+        async function assertRegularRun(childProcess: ChildProcess): Promise<void> {
+            const result = await childProcess.run()
+            assert.strictEqual(result.exitCode, 0, 'Unexpected close code')
+            assert.strictEqual(result.stdout, 'hi', 'Unexpected stdout')
+        }
+
+        if (process.platform === 'win32') {
+            it('starts and captures stdout - windows', async function () {
+                const batchFile = path.join(tempFolder, 'test-script.bat')
+                await writeBatchFile(batchFile)
+
+                const childProcess = new ChildProcess(batchFile)
+
+                await assertRegularRun(childProcess)
+            })
+
+            it('runs cmd files containing a space in the filename and folder', async function () {
+                const subfolder: string = path.join(tempFolder, 'sub folder')
+                const command: string = path.join(subfolder, 'test script.cmd')
+
+                await fs.mkdir(subfolder)
+
+                await writeWindowsCommandFile(command)
+
+                const childProcess = new ChildProcess(command)
+
+                await assertRegularRun(childProcess)
+            })
+
+            it('errs when starting twice - windows', async function () {
+                const batchFile = path.join(tempFolder, 'test-script.bat')
+                await writeBatchFile(batchFile)
+
+                const childProcess = new ChildProcess(batchFile)
+
+                // We want to verify that the error is thrown even if the first
+                // invocation is still in progress, so we don't await the promise.
+                childProcess.run().catch(() => {
+                    // Do nothing.
+                })
+
+                try {
+                    await childProcess.run()
+                } catch (err) {
+                    return
+                }
+
+                assert.fail('Expected exception, but none was thrown.')
+            })
+        } // END Windows only tests
+
+        if (process.platform !== 'win32') {
+            it('runs and captures stdout - unix', async function () {
+                const scriptFile = path.join(tempFolder, 'test-script.sh')
+                await writeShellFile(scriptFile)
+
+                const childProcess = new ChildProcess(scriptFile)
+
+                await assertRegularRun(childProcess)
+            })
+
+            it('errs when starting twice - unix', async function () {
+                const scriptFile = path.join(tempFolder, 'test-script.sh')
+                await writeShellFile(scriptFile)
+
+                const childProcess = new ChildProcess(scriptFile)
+
+                // We want to verify that the error is thrown even if the first
+                // invocation is still in progress, so we don't await the promise.
+                childProcess.run().catch(() => {
+                    // Do nothing.
+                })
+
+                try {
+                    await childProcess.run()
+                } catch (err) {
+                    return
+                }
+
+                assert.fail('Expected exception, but none was thrown.')
+            })
+        } // END Linux only tests
+
+        it('runs scripts containing a space in the filename and folder', async function () {
+            const subfolder: string = path.join(tempFolder, 'sub folder')
+            let command: string
+
+            await fs.mkdir(subfolder)
+
+            if (process.platform === 'win32') {
+                command = path.join(subfolder, 'test script.bat')
+                await writeBatchFile(command)
+            } else {
+                command = path.join(subfolder, 'test script.sh')
+                await writeShellFile(command)
+            }
+
+            const childProcess = new ChildProcess(command)
+
+            await assertRegularRun(childProcess)
+        })
+
+        it('reports error for missing executable', async function () {
+            const batchFile = path.join(tempFolder, 'nonExistentScript')
+
+            const childProcess = new ChildProcess(batchFile)
+
+            const result = await childProcess.run()
+            assert.notStrictEqual(result.exitCode, 0, 'Expected an error close code')
+        })
+
+        describe('Extra options', function () {
+            let childProcess: ChildProcess
+
+            beforeEach(async function () {
+                const isWindows = process.platform === 'win32'
+                const command = path.join(tempFolder, `test-script.${isWindows ? 'bat' : 'sh'}`)
+
+                if (isWindows) {
+                    await writeBatchFile(
+                        command,
+                        ['@echo %1', '@echo %2', '@echo "%3"', 'SLEEP 20', 'exit 1'].join(os.EOL)
+                    )
+                } else {
+                    await writeShellFile(
+                        command,
+                        ['echo $1', 'echo $2', 'echo "$3"', 'sleep 20', 'exit 1'].join(os.EOL)
+                    )
+                }
+
+                childProcess = new ChildProcess(command, ['1', '2'], { collect: false })
+            })
+
+            it('can report errors', async function () {
+                const result = childProcess.run({
+                    rejectOnError: true,
+                    useForceStop: true,
+                    onStdout: (text, context) => {
+                        if (text.includes('2')) {
+                            context.reportError('Got 2')
+                        }
+                    },
+                })
+
+                return assert.rejects(result, { message: 'Got 2' })
+            })
+
+            it('can reject on errors if `rejectOnError` is set', async function () {
+                return await assert.rejects(() =>
+                    childProcess.run({
+                        rejectOnError: true,
+                        onStdout: (text, context) => {
+                            context.reportError('An error')
+                        },
+                    })
+                )
+            })
+
+            it('kills the process if an error is reported', async function () {
+                const result = await childProcess.run({
+                    waitForStreams: false,
+                    onStdout: (text, context) => {
+                        context.reportError('An error')
+                    },
+                })
+                assert.notStrictEqual(result.exitCode, 1)
+            })
+
+            it('can merge with base options', async function () {
+                const result = await childProcess.run({
+                    collect: true,
+                    waitForStreams: false,
+                    extraArgs: ['4'],
+                    onStdout: (text, context) => {
+                        if (text.includes('4')) {
+                            context.reportError('Got 4')
+                        }
+                    },
+                })
+                assert.ok(result.stdout.length !== 0)
+                assert.ok(result.error?.message.includes('Got 4'))
+            })
+
+            it('uses `Timeout` objects', async function () {
+                await childProcess.run({
+                    waitForStreams: false,
+                    timeout: new Timeout(10),
+                })
+                assert.strictEqual(childProcess.result()?.signal, 'SIGTERM')
+                assert.notStrictEqual(childProcess.result()?.error, undefined)
+            })
+
+            it('still runs if the timer completed (not rejected) after starting', async function () {
+                const timer = new Timeout(10)
+                setTimeout(() => timer.dispose())
+                await childProcess.run({
+                    waitForStreams: false,
+                    onStdout: (text, context) => {
+                        context.reportError('Got stuff')
+                    },
+                })
+
+                assert.strictEqual(childProcess.result()?.error?.message, 'Got stuff')
+            })
+
+            it('rejects if using a completed timer', async function () {
+                const timer = new Timeout(10)
+                timer.dispose()
+                await assert.rejects(childProcess.run({ timeout: timer }))
+                assert.strictEqual(childProcess.result(), undefined)
+                // Just make sure no process was ever ran
+                await sleep(20)
+                assert.strictEqual(childProcess.result(), undefined)
+            })
+        })
+    })
+
+    describe('stop()', async function () {
+        if (process.platform === 'win32') {
+            it('detects running processes and successfully stops a running process - Windows', async function () {
+                const batchFile = path.join(tempFolder, 'test-script.bat')
+                await writeBatchFileWithDelays(batchFile)
+
+                const childProcess = new ChildProcess(batchFile)
+
+                // `await` is intentionally not used, we want to check the process while it runs.
+                childProcess.run().catch(() => {
+                    // Do nothing.
+                })
+
+                assert.strictEqual(childProcess.stopped, false)
+                childProcess.stop()
+                await waitUntil(async () => childProcess.stopped, { timeout: 1000, interval: 100, truthy: true })
+                assert.strictEqual(childProcess.stopped, true)
+            })
+
+            it('can stop() previously stopped processes - Windows', async function () {
+                const batchFile = path.join(tempFolder, 'test-script.bat')
+                await writeBatchFileWithDelays(batchFile)
+
+                const childProcess = new ChildProcess(batchFile)
+
+                // `await` is intentionally not used, we want to check the process while it runs.
+                childProcess.run().catch(() => {
+                    // Do nothing.
+                })
+
+                childProcess.stop()
+                await waitUntil(async () => childProcess.stopped, { timeout: 1000, interval: 100, truthy: true })
+                assert.strictEqual(childProcess.stopped, true)
+                assert.doesNotThrow(() => childProcess.stop())
+            })
+        } // END Windows-only tests
+
+        if (process.platform !== 'win32') {
+            it('detects running processes and successfully stops a running process - Unix', async function () {
+                const scriptFile = path.join(tempFolder, 'test-script.sh')
+                await writeShellFileWithDelays(scriptFile)
+
+                const childProcess = new ChildProcess('sh', [scriptFile])
+                const result = childProcess.run()
+
+                assert.strictEqual(childProcess.stopped, false)
+                childProcess.stop()
+                await result
+
+                assert.strictEqual(childProcess.stopped, true)
+            })
+
+            it('can stop() previously stopped processes - Unix', async function () {
+                const scriptFile = path.join(tempFolder, 'test-script.sh')
+                await writeShellFileWithDelays(scriptFile)
+
+                const childProcess = new ChildProcess(scriptFile)
+
+                const result = childProcess.run()
+
+                childProcess.stop()
+                await result
+
+                assert.strictEqual(childProcess.stopped, true)
+                assert.doesNotThrow(() => childProcess.stop())
+            })
+
+            it('can send input - Unix', async function () {
+                const childProcess = new ChildProcess('cat')
+                const result = childProcess.run()
+                await childProcess.send('foo')
+                await childProcess.send(eof)
+                const { stdout } = await result
+                assert.strictEqual(stdout, 'foo')
+            })
+        } // END Unix-only tests
+    })
+
+    async function writeBatchFile(filename: string, contents?: string): Promise<void> {
+        await fs.writeFile(filename, contents ?? '@echo hi')
+    }
+
+    async function writeBatchFileWithDelays(filename: string): Promise<void> {
+        const file = `
+        @echo hi
+        SLEEP 20
+        @echo bye`
+        await fs.writeFile(filename, file)
+    }
+
+    async function writeWindowsCommandFile(filename: string): Promise<void> {
+        await fs.writeFile(filename, `@echo OFF${os.EOL}echo hi`)
+    }
+
+    async function writeShellFile(filename: string, contents = 'echo hi'): Promise<void> {
+        await fs.writeFile(filename, `#!/bin/sh\n${contents}`)
+        await fs.chmod(filename, 0o744)
+    }
+
+    async function writeShellFileWithDelays(filename: string): Promise<void> {
+        const file = `
+        echo hi
+        sleep 20
+        echo bye`
+        await writeShellFile(filename, file)
+    }
+})
+
+interface RunningProcess {
+    childProcess: ChildProcess
+    result: Promise<ChildProcessResult>
+}
+
+function getSleepCmd() {
+    return isWin() ? 'timeout' : 'sleep'
+}
+
+async function stopAndWait(runningProcess: RunningProcess): Promise<void> {
+    runningProcess.childProcess.stop(true)
+    await runningProcess.result
+}
+
+function startSleepProcess(options?: ChildProcessOptions, timeout: number = 90): RunningProcess {
+    const childProcess = new ChildProcess(getSleepCmd(), [timeout.toString()], options)
+    const result = childProcess.run().catch(() => assert.fail('sleep command threw an error'))
+    return { childProcess, result }
+}
+
+describe('ChildProcessTracker', function () {
+    let tracker: ChildProcessTracker
+    let clock: FakeTimers.InstalledClock
+    let usageMock: sinon.SinonStub
+
+    before(function () {
+        clock = installFakeClock()
+        tracker = new ChildProcessTracker()
+        usageMock = sinon.stub(ChildProcessTracker.prototype, 'getUsage')
+    })
+
+    afterEach(function () {
+        tracker.clear()
+        usageMock.reset()
+    })
+
+    after(function () {
+        clock.uninstall()
+    })
+
+    it(`removes stopped processes every ${ChildProcessTracker.pollingInterval / 1000} seconds`, async function () {
+        // Start a 'sleep' command, check it only removes after we stop it.
+        const runningProcess = startSleepProcess()
+        tracker.add(runningProcess.childProcess)
+        assert.strictEqual(tracker.has(runningProcess.childProcess), true, 'failed to add sleep command')
+
+        await clock.tickAsync(ChildProcessTracker.pollingInterval)
+        assert.strictEqual(tracker.has(runningProcess.childProcess), true, 'process was mistakenly removed')
+        await stopAndWait(runningProcess)
+
+        await clock.tickAsync(ChildProcessTracker.pollingInterval)
+        assert.strictEqual(tracker.has(runningProcess.childProcess), false, 'process was not removed after stopping')
+    })
+
+    it('multiple processes from same command are tracked seperately', async function () {
+        const runningProcess1 = startSleepProcess()
+        const runningProcess2 = startSleepProcess()
+        tracker.add(runningProcess1.childProcess)
+        tracker.add(runningProcess2.childProcess)
+
+        assert.strictEqual(tracker.has(runningProcess1.childProcess), true, 'Missing first process')
+        assert.strictEqual(tracker.has(runningProcess2.childProcess), true, 'Missing second process')
+
+        await stopAndWait(runningProcess1)
+        await clock.tickAsync(ChildProcessTracker.pollingInterval)
+        assert.strictEqual(tracker.has(runningProcess2.childProcess), true, 'second process was mistakenly removed')
+        assert.strictEqual(
+            tracker.has(runningProcess1.childProcess),
+            false,
+            'first process was not removed after stopping it'
+        )
+
+        await stopAndWait(runningProcess2)
+        await clock.tickAsync(ChildProcessTracker.pollingInterval)
+        assert.strictEqual(
+            tracker.has(runningProcess2.childProcess),
+            false,
+            'second process was not removed after stopping it'
+        )
+
+        assert.strictEqual(tracker.size, 0, 'expected tracker to be empty')
+    })
+
+    it('logs a warning message when cpu usage exceeds threshold', async function () {
+        const runningProcess = startSleepProcess()
+        tracker.add(runningProcess.childProcess)
+
+        const highCpu: ProcessStats = {
+            cpu: defaultProcessWarnThresholds.cpu + 1,
+            memory: 0,
+        }
+
+        usageMock.returns(highCpu)
+
+        await clock.tickAsync(ChildProcessTracker.pollingInterval)
+        assertLogsContain('exceeded cpu threshold', false, 'warn')
+
+        await stopAndWait(runningProcess)
+    })
+
+    it('logs a warning message when memory usage exceeds threshold', async function () {
+        const runningProcess = startSleepProcess()
+        tracker.add(runningProcess.childProcess)
+
+        const highMemory: ProcessStats = {
+            cpu: 0,
+            memory: defaultProcessWarnThresholds.memory + 1,
+        }
+        usageMock.returns(highMemory)
+
+        await clock.tickAsync(ChildProcessTracker.pollingInterval)
+        assertLogsContain('exceeded memory threshold', false, 'warn')
+
+        await stopAndWait(runningProcess)
+    })
+
+    it('includes pid in logs', async function () {
+        const runningProcess = startSleepProcess()
+        tracker.add(runningProcess.childProcess)
+
+        usageMock.returns({
+            cpu: defaultProcessWarnThresholds.cpu + 1,
+            memory: 0,
+        })
+
+        await clock.tickAsync(ChildProcessTracker.pollingInterval)
+        assertLogsContain(runningProcess.childProcess.pid().toString(), false, 'warn')
+
+        await stopAndWait(runningProcess)
+    })
+
+    it('does not log for processes within threshold', async function () {
+        const runningProcess = startSleepProcess()
+        tracker.add(runningProcess.childProcess)
+
+        usageMock.returns({
+            cpu: defaultProcessWarnThresholds.cpu - 1,
+            memory: defaultProcessWarnThresholds.memory - 1,
+        })
+
+        await clock.tickAsync(ChildProcessTracker.pollingInterval)
+
+        assert.throws(() => assertLogsContain(runningProcess.childProcess.pid().toString(), false, 'warn'))
+
+        await stopAndWait(runningProcess)
+    })
+
+    it('respects custom thresholds', async function () {
+        const largeRunningProcess = startSleepProcess({
+            warnThresholds: {
+                cpu: defaultProcessWarnThresholds.cpu + 10,
+                memory: defaultProcessWarnThresholds.memory + 10,
+            },
+        })
+        tracker.add(largeRunningProcess.childProcess)
+        const smallRunningProcess = startSleepProcess({
+            warnThresholds: {
+                cpu: defaultProcessWarnThresholds.cpu - 10,
+                memory: defaultProcessWarnThresholds.memory - 10,
+            },
+        })
+        tracker.add(smallRunningProcess.childProcess)
+
+        usageMock.returns({
+            cpu: defaultProcessWarnThresholds.cpu + 5,
+            memory: defaultProcessWarnThresholds.memory + 5,
+        })
+
+        await clock.tickAsync(ChildProcessTracker.pollingInterval)
+        assert.throws(() => assertLogsContain(largeRunningProcess.childProcess.pid().toString(), false, 'warn'))
+        assertLogsContain(smallRunningProcess.childProcess.pid().toString(), false, 'warn')
+
+        await stopAndWait(largeRunningProcess)
+        await stopAndWait(smallRunningProcess)
+    })
+
+    it('fills custom thresholds with default', async function () {
+        const runningProcess = startSleepProcess({
+            warnThresholds: {
+                cpu: defaultProcessWarnThresholds.cpu + 10,
+            },
+        })
+        tracker.add(runningProcess.childProcess)
+
+        usageMock.returns({
+            memory: defaultProcessWarnThresholds.memory + 1,
+        })
+
+        await clock.tickAsync(ChildProcessTracker.pollingInterval)
+        assertLogsContain(runningProcess.childProcess.pid().toString(), false, 'warn')
+
+        await stopAndWait(runningProcess)
+    })
+})
diff --git a/src/test/shared/utilities/symbolUtilities.test.ts b/packages/core/src/test/shared/utilities/symbolUtilities.test.ts
similarity index 94%
rename from src/test/shared/utilities/symbolUtilities.test.ts
rename to packages/core/src/test/shared/utilities/symbolUtilities.test.ts
index cf366283e06..b333d0769b3 100644
--- a/src/test/shared/utilities/symbolUtilities.test.ts
+++ b/packages/core/src/test/shared/utilities/symbolUtilities.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as path from 'path'
 import * as vscode from 'vscode'
 import { getChildrenRange, loadSymbols, LoadSymbolsContext } from '../../../shared/utilities/symbolUtilities'
@@ -22,8 +22,8 @@ describe('symbolUtilities', async function () {
     describe('loadSymbols', async function () {
         it('returns symbols if available', async function () {
             const context: LoadSymbolsContext = {
-                async executeCommand<T>(command: string, ...args: any[]): Promise<T | undefined> {
-                    return ([makeSymbol('MyName')] as unknown) as T
+                async executeCommand<T>(command: string, ...args: any[]): Promise<T> {
+                    return [makeSymbol('MyName')] as unknown as T
                 },
             }
 
@@ -41,11 +41,11 @@ describe('symbolUtilities', async function () {
         it('does not retry if maxRetries is 0', async function () {
             const executeCommandArgs: { command: string; uri: vscode.Uri }[] = []
             const context: LoadSymbolsContext = {
-                async executeCommand<T>(command: string, ...args: any[]): Promise<T | undefined> {
+                async executeCommand<T>(command: string, ...args: any[]): Promise<T> {
                     assert.strictEqual(args.length, 1)
                     executeCommandArgs.push({ command, uri: args[0] as vscode.Uri })
 
-                    return undefined
+                    return undefined as T
                 },
             }
 
@@ -65,11 +65,11 @@ describe('symbolUtilities', async function () {
             const executeReturnValues = [undefined, undefined, [makeSymbol('MyName')]].reverse()
             const executeCommandArgs: { command: string; uri: vscode.Uri }[] = []
             const context: LoadSymbolsContext = {
-                async executeCommand<T>(command: string, ...args: any[]): Promise<T | undefined> {
+                async executeCommand<T>(command: string, ...args: any[]): Promise<T> {
                     assert.strictEqual(args.length, 1)
                     executeCommandArgs.push({ command, uri: args[0] as vscode.Uri })
 
-                    return executeReturnValues.pop() as T | undefined
+                    return executeReturnValues.pop() as T
                 },
             }
 
@@ -92,11 +92,11 @@ describe('symbolUtilities', async function () {
         it('returns undefined if all retries fail', async function () {
             const executeCommandArgs: { command: string; uri: vscode.Uri }[] = []
             const context: LoadSymbolsContext = {
-                async executeCommand<T>(command: string, ...args: any[]): Promise<T | undefined> {
+                async executeCommand<T>(command: string, ...args: any[]): Promise<T> {
                     assert.strictEqual(args.length, 1)
                     executeCommandArgs.push({ command, uri: args[0] as vscode.Uri })
 
-                    return undefined
+                    return undefined as T
                 },
             }
 
diff --git a/packages/core/src/test/shared/utilities/testUtils.test.ts b/packages/core/src/test/shared/utilities/testUtils.test.ts
new file mode 100644
index 00000000000..91f1ecbc392
--- /dev/null
+++ b/packages/core/src/test/shared/utilities/testUtils.test.ts
@@ -0,0 +1,39 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import { createExecutableFile, createTestWorkspaceFolder, copyEnv } from '../../testUtil'
+import path from 'path'
+import { fs } from '../../../shared'
+import { isWin } from '../../../shared/vscode/env'
+import { tryRun } from '../../../shared/utilities/pathFind'
+
+describe('copyEnv', function () {
+    it('modifies the node environment variables (Non-Windows)', function () {
+        // PATH returns undefined on Windows.
+        if (isWin()) {
+            this.skip()
+        }
+
+        const originalPath = copyEnv().PATH
+        const fakePath = 'fakePath'
+        process.env.PATH = fakePath
+        assert.strictEqual(copyEnv().PATH, fakePath)
+
+        process.env.PATH = originalPath
+        assert.strictEqual(copyEnv().PATH, originalPath)
+    })
+})
+
+describe('createExecutableFile', function () {
+    it('creates a file that can be executed', async function () {
+        const tempDir = await createTestWorkspaceFolder()
+        const filePath = path.join(tempDir.uri.fsPath, `exec${isWin() ? '.cmd' : ''}`)
+        await createExecutableFile(filePath, '')
+
+        const result = await tryRun(filePath, [], 'yes')
+        assert.ok(result)
+        await fs.delete(tempDir.uri, { force: true, recursive: true })
+    })
+})
diff --git a/packages/core/src/test/shared/utilities/textDocumentUtilities.test.ts b/packages/core/src/test/shared/utilities/textDocumentUtilities.test.ts
new file mode 100644
index 00000000000..e907e09cb41
--- /dev/null
+++ b/packages/core/src/test/shared/utilities/textDocumentUtilities.test.ts
@@ -0,0 +1,140 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import assert from 'assert'
+import { createTempUrisForDiff } from '../../../shared/utilities/textDocumentUtilities'
+import { DiffContentProvider } from '../../../amazonq/commons/controllers/diffContentProvider'
+import fs from '../../../shared/fs/fs'
+
+describe('textDocumentUtilities', () => {
+    let sandbox: sinon.SinonSandbox
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+
+    describe('createTempUrisForDiff', () => {
+        const testScheme = 'test-scheme'
+        const testFilePath = '/path/to/testFile.js'
+        const testFileContent = 'line 1\nline 2\nline 3\nline 4\nline 5'
+        const testMessage = {
+            code: 'new line 3',
+        }
+        const testSelection = new vscode.Selection(
+            new vscode.Position(2, 0), // Start at line 3 (index 2)
+            new vscode.Position(2, 6) // End at line 3 (index 2)
+        )
+
+        let diffProvider: DiffContentProvider
+        let fsReadFileTextStub: sinon.SinonStub
+
+        beforeEach(() => {
+            diffProvider = new DiffContentProvider()
+            sandbox.stub(diffProvider, 'registerContent')
+            fsReadFileTextStub = sandbox.stub(fs, 'readFileText').resolves(testFileContent)
+        })
+
+        it('should create URIs with the correct scheme and file name', async () => {
+            const [originalUri, modifiedUri] = await createTempUrisForDiff(
+                testFilePath,
+                undefined,
+                testMessage,
+                testSelection,
+                testScheme,
+                diffProvider
+            )
+
+            assert.strictEqual(originalUri.scheme, testScheme)
+            assert.strictEqual(modifiedUri.scheme, testScheme)
+            assert.ok(originalUri.path.includes('testFile_original-'))
+            assert.ok(modifiedUri.path.includes('testFile_proposed-'))
+        })
+
+        it('should use provided fileText instead of reading from file when available', async () => {
+            const providedFileText = 'provided line 1\nprovided line 2\nprovided line 3'
+
+            await createTempUrisForDiff(
+                testFilePath,
+                providedFileText,
+                testMessage,
+                testSelection,
+                testScheme,
+                diffProvider
+            )
+
+            // Verify fs.readFileText was not called
+            assert.strictEqual(fsReadFileTextStub.called, false)
+
+            // Verify the diffProvider was called with the provided content
+            const registerContentCalls = (diffProvider.registerContent as sinon.SinonStub).getCalls()
+            assert.strictEqual(registerContentCalls.length, 2)
+            assert.strictEqual(registerContentCalls[0].args[1], providedFileText)
+        })
+
+        it('should read from file when fileText is not provided', async () => {
+            await createTempUrisForDiff(testFilePath, undefined, testMessage, testSelection, testScheme, diffProvider)
+
+            // Verify fs.readFileText was called with the correct path
+            assert.strictEqual(fsReadFileTextStub.calledWith(testFilePath), true)
+
+            // Verify the diffProvider was called with the file content
+            const registerContentCalls = (diffProvider.registerContent as sinon.SinonStub).getCalls()
+            assert.strictEqual(registerContentCalls.length, 2)
+            assert.strictEqual(registerContentCalls[0].args[1], testFileContent)
+        })
+
+        it('should create modified content by replacing the selected lines', async () => {
+            await createTempUrisForDiff(
+                testFilePath,
+                testFileContent,
+                testMessage,
+                testSelection,
+                testScheme,
+                diffProvider
+            )
+
+            // Verify the diffProvider was called with the correct modified content
+            const registerContentCalls = (diffProvider.registerContent as sinon.SinonStub).getCalls()
+            assert.strictEqual(registerContentCalls.length, 2)
+
+            // First call is for original content
+            assert.strictEqual(registerContentCalls[0].args[1], testFileContent)
+
+            // Second call is for modified content
+            const expectedModifiedContent = 'line 1\nline 2\nnew line 3\nline 4\nline 5'
+            assert.strictEqual(registerContentCalls[1].args[1], expectedModifiedContent)
+        })
+
+        it('should handle multi-line selections correctly', async () => {
+            // Selection spanning multiple lines (lines 2-4)
+            const multiLineSelection = new vscode.Selection(
+                new vscode.Position(1, 0), // Start at line 2 (index 1)
+                new vscode.Position(3, 6) // End at line 4 (index 3)
+            )
+
+            await createTempUrisForDiff(
+                testFilePath,
+                testFileContent,
+                testMessage,
+                multiLineSelection,
+                testScheme,
+                diffProvider
+            )
+
+            // Verify the diffProvider was called with the correct modified content
+            const registerContentCalls = (diffProvider.registerContent as sinon.SinonStub).getCalls()
+
+            // Expected content should have lines 2-4 replaced with the new code
+            const expectedModifiedContent = 'line 1\nnew line 3\nline 5'
+            assert.strictEqual(registerContentCalls[1].args[1], expectedModifiedContent)
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/utilities/textUtilities.test.ts b/packages/core/src/test/shared/utilities/textUtilities.test.ts
new file mode 100644
index 00000000000..0ea0e14377b
--- /dev/null
+++ b/packages/core/src/test/shared/utilities/textUtilities.test.ts
@@ -0,0 +1,165 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import {
+    getStringHash,
+    removeAnsi,
+    truncate,
+    truncateProps,
+    indent,
+    sanitizeFilename,
+    toSnakeCase,
+    undefinedIfEmpty,
+} from '../../../shared/utilities/textUtilities'
+
+describe('textUtilities', async function () {
+    it('truncateProps()', async function () {
+        const testObj = {
+            a: 34234234234,
+            b: '123456789',
+            c: new Date(2023, 1, 1),
+            d: '123456789_abcdefg_ABCDEFG',
+            e: {
+                e1: [4, 3, 7],
+                e2: 'loooooooooo \n nnnnnnnnnnn \n gggggggg \n string',
+            },
+            f: () => {
+                throw Error()
+            },
+        }
+        const expected = {
+            ...testObj,
+            e: {
+                e1: [...testObj.e.e1],
+                e2: testObj.e.e2,
+            },
+        }
+
+        assert.deepStrictEqual(truncateProps(testObj, 25), expected)
+        assert.deepStrictEqual(truncateProps(testObj, 3, ['b']), {
+            ...expected,
+            b: '123…',
+        })
+        // Assert that original object didn't change.
+        assert.deepStrictEqual(truncateProps(testObj, 25), expected)
+
+        assert.deepStrictEqual(truncateProps(testObj, 3, ['a', 'b', 'd', 'f']), {
+            ...expected,
+            b: '123…',
+            d: '123…',
+        })
+    })
+
+    it('truncate()', async function () {
+        assert.deepStrictEqual(truncate('abc 123', 3), 'abc…')
+        assert.deepStrictEqual(truncate('abc 123', -3), '…123')
+        assert.deepStrictEqual(truncate('abc 123', 1), 'a…')
+        assert.deepStrictEqual(truncate('abc 123', -1), '…3')
+        assert.deepStrictEqual(truncate('abc 123', 0), '…')
+        assert.deepStrictEqual(truncate('abc 123', 99), 'abc 123')
+        assert.deepStrictEqual(truncate('abc 123', -99), 'abc 123')
+    })
+
+    it('indent()', async function () {
+        assert.deepStrictEqual(indent('abc\n123', 2, false), '  abc\n  123')
+        assert.deepStrictEqual(indent('abc\n 123\n', 2, false), '  abc\n   123\n')
+        assert.deepStrictEqual(indent('abc\n 123\n', 2, true), '  abc\n  123\n')
+        assert.deepStrictEqual(indent('   abc\n\n  \n123\nfoo\n', 4, false), '       abc\n\n      \n    123\n    foo\n')
+        assert.deepStrictEqual(indent('   abc\n\n    \n123\nfoo\n', 4, true), '    abc\n\n    \n    123\n    foo\n')
+    })
+})
+
+describe('removeAnsi', async function () {
+    it('removes ansi code from text', async function () {
+        assert.strictEqual(removeAnsi('\u001b[31mHello World'), 'Hello World')
+    })
+
+    it('text without ansi code remains as-is', async function () {
+        const text = 'Hello World 123!'
+        assert.strictEqual(removeAnsi(text), text)
+    })
+})
+
+describe('getStringHash', async function () {
+    it('produces a hash', async function () {
+        assert.ok(getStringHash('hello'))
+    })
+
+    it('produces a different hash for different strings', async function () {
+        assert.notStrictEqual(getStringHash('hello'), getStringHash('hello '))
+    })
+})
+
+describe('toSnakeCase', function () {
+    const expected = {
+        foo_bar_fi: 'fi',
+        fi_fo_fum: 'fum',
+    }
+
+    it('converts camel case to snake case', function () {
+        const input = {
+            fooBarFi: 'fi',
+            fiFoFum: 'fum',
+        }
+
+        assert.deepStrictEqual(toSnakeCase(input), expected)
+    })
+
+    it('converts pascal case to snake case', function () {
+        const input = {
+            FooBarFi: 'fi',
+            FiFoFum: 'fum',
+        }
+
+        assert.deepStrictEqual(toSnakeCase(input), expected)
+    })
+
+    it('converts upper case to snake case', function () {
+        const input = {
+            FOO_BAR_FI: 'fi',
+            FI_FO_FUM: 'fum',
+        }
+
+        assert.deepStrictEqual(toSnakeCase(input), expected)
+    })
+
+    it('maintains snake case', function () {
+        assert.deepStrictEqual(toSnakeCase(expected), expected)
+    })
+})
+
+describe('sanitizeFilename', function () {
+    const cases: { input: string; output: string; case: string; replaceString?: string }[] = [
+        { input: 'foo🤷', output: 'foo_', case: 'removes emojis' },
+        { input: 'foo/zub', output: 'foo_zub', case: 'replaces slash with underscore' },
+        { input: 'foo zub', output: 'foo_zub', case: 'replaces space with underscore' },
+        { input: 'foo:bar', output: 'fooXbar', replaceString: 'X', case: 'replaces dot with replaceString' },
+        { input: 'foo🤷bar/zu b.txt', output: 'foo_bar_zu_b.txt', case: 'docstring example' },
+        { input: 'foo.txt', output: 'foo.txt', case: 'keeps dot' },
+        { input: 'züb', output: 'züb', case: 'keeps special chars' },
+    ]
+    for (const testCase of cases) {
+        it(testCase.case, function () {
+            assert.strictEqual(sanitizeFilename(testCase.input, testCase.replaceString), testCase.output)
+        })
+    }
+})
+
+describe('undefinedIfEmpty', function () {
+    const cases: { input: string | undefined; output: string | undefined; case: string }[] = [
+        { input: undefined, output: undefined, case: 'return undefined if input is undefined' },
+        { input: '', output: undefined, case: 'return undefined if input is empty string' },
+        { input: '   ', output: undefined, case: 'return undefined if input is blank' },
+        { input: 'foo', output: 'foo', case: 'return str if input is not empty' },
+        { input: ' foo ', output: ' foo ', case: 'return original str without trim' },
+    ]
+
+    for (const testCases of cases) {
+        it(testCases.case, function () {
+            assert.strictEqual(undefinedIfEmpty(testCases.input), testCases.output)
+        })
+    }
+})
diff --git a/packages/core/src/test/shared/utilities/timeoutUtils.test.ts b/packages/core/src/test/shared/utilities/timeoutUtils.test.ts
new file mode 100644
index 00000000000..71d854d3cc2
--- /dev/null
+++ b/packages/core/src/test/shared/utilities/timeoutUtils.test.ts
@@ -0,0 +1,575 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as FakeTimers from '@sinonjs/fake-timers'
+import * as timeoutUtils from '../../../shared/utilities/timeoutUtils'
+import { installFakeClock, tickPromise } from '../../../test/testUtil'
+import { sleep, waitUntil } from '../../../shared/utilities/timeoutUtils'
+import { SinonStub, SinonSandbox, createSandbox } from 'sinon'
+
+// We export this describe() so it can be used in the web tests as well
+export const timeoutUtilsDescribe = describe('timeoutUtils', async function () {
+    let clock: FakeTimers.InstalledClock
+    let sandbox: SinonSandbox
+
+    before(function () {
+        clock = installFakeClock()
+    })
+
+    beforeEach(function () {
+        sandbox = createSandbox()
+    })
+
+    after(function () {
+        clock.uninstall()
+    })
+
+    afterEach(function () {
+        clock.reset()
+        this.timer?.dispose()
+        sandbox.restore()
+    })
+
+    describe('Timeout', async function () {
+        it('returns > 0 if the timer is still active', async function () {
+            const timerLengthMs = 100
+            const longTimer = (this.timer = new timeoutUtils.Timeout(timerLengthMs))
+            clock.tick(timerLengthMs / 2)
+            assert.strictEqual(longTimer.remainingTime > 0, true)
+        })
+
+        it('returns 0 if timer is expired', async function () {
+            const timerLengthMs = 10
+            const shortTimer = (this.timer = new timeoutUtils.Timeout(timerLengthMs))
+            clock.tick(timerLengthMs + 1)
+            assert.strictEqual(shortTimer.remainingTime, 0)
+        })
+
+        it('returns a Promise if a timer is active', async function () {
+            const longTimer = (this.timer = new timeoutUtils.Timeout(300))
+            assert.strictEqual(longTimer.promisify() instanceof Promise, true)
+        })
+
+        it('timer object rejects if a timer is expired', async function () {
+            const timerLengthMs = 10
+            const shortTimer = (this.timer = new timeoutUtils.Timeout(timerLengthMs))
+            clock.tick(timerLengthMs + 1)
+            await assert.rejects(
+                shortTimer.promisify(),
+                new Error(timeoutUtils.timeoutExpiredMessage),
+                'Timer did not reject due to timeout'
+            )
+        })
+
+        it('expiration error does not happen when refreshing a completed timer', async function () {
+            const timerLengthMs = 10
+            const shortTimer = (this.timer = new timeoutUtils.Timeout(timerLengthMs))
+            shortTimer.dispose()
+            clock.tick(timerLengthMs + 1)
+            shortTimer.refresh()
+            await tickPromise(assert.doesNotReject(shortTimer.promisify()), clock, timerLengthMs + 1)
+        })
+
+        it('successfully kills active timers', async function () {
+            const longTimer = (this.timer = new timeoutUtils.Timeout(300))
+            // make sure this is an active Promise
+            assert.strictEqual(longTimer.promisify() instanceof Promise, true)
+            longTimer.dispose()
+            clock.tick(400)
+
+            // if the timer was not killed, promise will reject
+            await longTimer.promisify()
+        })
+
+        it('correctly reports an elapsed time', async function () {
+            const checkTimerMs = 50
+            const longTimer = (this.timer = new timeoutUtils.Timeout(checkTimerMs * 6))
+
+            // Simulate a small amount of time, then measure elapsed time
+            clock.tick(checkTimerMs)
+
+            assert.strictEqual(longTimer.elapsedTime, checkTimerMs)
+        })
+
+        it('correctly reports an elapsed time after completion', async function () {
+            const checkTimerMs = 50
+            const longTimer = (this.timer = new timeoutUtils.Timeout(checkTimerMs * 6))
+
+            clock.tick(checkTimerMs)
+            longTimer.dispose()
+            clock.tick(checkTimerMs)
+
+            assert.strictEqual(longTimer.elapsedTime, checkTimerMs)
+        })
+
+        it('Correctly reports elapsed time with refresh', async function () {
+            const longTimer = (this.timer = new timeoutUtils.Timeout(10))
+            clock.tick(5)
+            longTimer.refresh()
+            assert.strictEqual(longTimer.remainingTime, 10)
+
+            clock.tick(5)
+            assert.strictEqual(longTimer.elapsedTime, 10)
+            assert.strictEqual(longTimer.remainingTime, 5)
+        })
+
+        it('Refresh pushes back the start time', async function () {
+            const longTimer = (this.timer = new timeoutUtils.Timeout(10))
+            clock.tick(5)
+            longTimer.refresh()
+            assert.strictEqual(longTimer.remainingTime, 10)
+        })
+
+        it('does not reject if refreshed', async function () {
+            const longTimer = (this.timer = new timeoutUtils.Timeout(10))
+            clock.tick(5)
+            longTimer.refresh()
+            clock.tick(6)
+            longTimer.dispose()
+            clock.tick(10)
+            await longTimer.promisify()
+        })
+
+        describe('onCompletion', function () {
+            const checkTimerMs = 10
+            let timer: timeoutUtils.Timeout
+            let completion: Promise<void>
+
+            beforeEach(function () {
+                timer = this.timer = new timeoutUtils.Timeout(checkTimerMs * 6)
+                completion = new Promise<void>((resolve, reject) => {
+                    timer.onCompletion(resolve)
+                    setTimeout(() => reject(new Error('Timed out waiting for event')), 10000)
+                })
+            })
+
+            it('fires when completed', async function () {
+                timer.dispose()
+                await completion
+            })
+
+            it('fires when cancelled', async function () {
+                timer.cancel()
+                await completion
+            })
+
+            it('fires when expired', async function () {
+                clock.tick(checkTimerMs * 10)
+                await completion
+            })
+        })
+
+        describe('token', function () {
+            const checkTimerMs = 10
+            let timer: timeoutUtils.Timeout
+            let cancellation: Promise<'user' | 'timeout' | 'completed'>
+
+            beforeEach(function () {
+                timer = this.timer = new timeoutUtils.Timeout(checkTimerMs * 6)
+                cancellation = new Promise<'user' | 'timeout' | 'completed'>((resolve, reject) => {
+                    timer.token.onCancellationRequested(({ agent }) => resolve(agent))
+                    timer.onCompletion(() => resolve('completed'))
+                    setTimeout(() => reject(new Error('Timed out waiting for event')), 1000)
+                })
+            })
+
+            it('shows that a cancellation is requested after cancel', async function () {
+                assert.strictEqual(timer.token.isCancellationRequested, false)
+                timer.cancel()
+                assert.strictEqual(timer.token.isCancellationRequested, true)
+                assert.strictEqual(await cancellation, 'user')
+            })
+
+            it('shows that a cancellation is requested after expiration', async function () {
+                assert.strictEqual(timer.token.isCancellationRequested, false)
+                clock.tick(checkTimerMs * 10)
+                assert.strictEqual(timer.token.isCancellationRequested, true)
+                assert.strictEqual(await cancellation, 'timeout')
+            })
+
+            it('does not show that a cancellation is requested after completion', async function () {
+                assert.strictEqual(timer.token.isCancellationRequested, false)
+                timer.dispose()
+                assert.strictEqual(timer.token.isCancellationRequested, false)
+                assert.strictEqual(await cancellation, 'completed')
+            })
+        })
+    })
+
+    describe('Interval', async function () {
+        let interval: timeoutUtils.Interval
+        let onCompletionStub: SinonStub
+
+        beforeEach(async function () {
+            onCompletionStub = sandbox.stub()
+            interval = new timeoutUtils.Interval(1000, onCompletionStub)
+        })
+
+        afterEach(async function () {
+            interval?.dispose()
+        })
+
+        it('Executes the callback on an interval', async function () {
+            await clock.tickAsync(999)
+            assert.strictEqual(onCompletionStub.callCount, 0)
+            await clock.tickAsync(1)
+            assert.strictEqual(onCompletionStub.callCount, 1)
+
+            await clock.tickAsync(500)
+            assert.strictEqual(onCompletionStub.callCount, 1)
+            await clock.tickAsync(500)
+            assert.strictEqual(onCompletionStub.callCount, 2)
+
+            await clock.tickAsync(1000)
+            assert.strictEqual(onCompletionStub.callCount, 3)
+        })
+
+        it('allows to wait for next completion', async function () {
+            clock.uninstall()
+
+            let curr = 'Did Not Change'
+
+            const realInterval = new timeoutUtils.Interval(50, async () => {
+                await sleep(50)
+                curr = 'Did Change'
+            })
+
+            const withoutWait = curr
+            await realInterval.nextCompletion()
+            const withWait = curr
+
+            assert.strictEqual(withoutWait, 'Did Not Change')
+            assert.strictEqual(withWait, 'Did Change')
+        })
+    })
+
+    describe('waitUntil', async function () {
+        const testSettings = {
+            callCounter: 0,
+            callGoal: 0,
+            functionDelay: 10,
+            clockInterval: 1,
+            clockSpeed: 5,
+        }
+
+        let fastClock: NodeJS.Timeout
+
+        // Test function, increments a counter every time it is called
+        async function testFunction(): Promise<number | undefined> {
+            if (++testSettings.callCounter >= testSettings.callGoal) {
+                return testSettings.callGoal
+            } else {
+                return undefined
+            }
+        }
+
+        // Simple wrapper that waits until calling testFunction
+        async function slowTestFunction(): Promise<number | undefined> {
+            await sleep(testSettings.functionDelay)
+            return testFunction()
+        }
+
+        before(function () {
+            clock.uninstall()
+
+            // Makes a clock that runs clockSpeed times as fast as a normal clock (uses 1ms intervals)
+            // This works since we create an interval with the system clock, then trigger our fake clock with it
+            fastClock = setInterval(() => {
+                clock.tick(testSettings.clockSpeed * testSettings.clockInterval)
+            }, testSettings.clockInterval)
+
+            clock = installFakeClock()
+        })
+
+        after(function () {
+            clearInterval(fastClock)
+        })
+
+        beforeEach(function () {
+            testSettings.callCounter = 0
+            testSettings.functionDelay = 10
+        })
+
+        it('returns value after multiple function calls', async function () {
+            testSettings.callGoal = 4
+            const returnValue: number | undefined = await timeoutUtils.waitUntil(testFunction, {
+                timeout: 10000,
+                interval: 10,
+                truthy: false,
+            })
+            assert.strictEqual(returnValue, testSettings.callGoal)
+        })
+
+        it('returns value after multiple function calls WITH backoff', async function () {
+            testSettings.callGoal = 4
+            const returnValue: number | undefined = await timeoutUtils.waitUntil(testFunction, {
+                timeout: 10000,
+                interval: 10,
+                truthy: false,
+                backoff: 2,
+            })
+            assert.strictEqual(returnValue, testSettings.callGoal)
+        })
+
+        it('timeout before function returns defined value', async function () {
+            testSettings.callGoal = 7
+            const returnValue: number | undefined = await timeoutUtils.waitUntil(testFunction, {
+                timeout: 30,
+                interval: 10,
+                truthy: false,
+            })
+            assert.strictEqual(returnValue, undefined)
+        })
+
+        it('returns true/false values correctly', async function () {
+            assert.strictEqual(
+                true,
+                await timeoutUtils.waitUntil(async () => true, { timeout: 10000, interval: 10, truthy: false })
+            )
+            assert.strictEqual(
+                false,
+                await timeoutUtils.waitUntil(async () => false, { timeout: 10000, interval: 10, truthy: false })
+            )
+        })
+
+        it('timeout when function takes longer than timeout parameter', async function () {
+            testSettings.functionDelay = 100
+            const returnValue: number | undefined = await timeoutUtils.waitUntil(slowTestFunction, {
+                timeout: 50,
+                interval: 10,
+                truthy: false,
+            })
+            assert.strictEqual(returnValue, undefined)
+        })
+
+        it('timeout from slow function calls', async function () {
+            testSettings.callGoal = 10
+            const returnValue: number | undefined = await timeoutUtils.waitUntil(slowTestFunction, {
+                timeout: 50,
+                interval: 10,
+                truthy: false,
+            })
+            assert.strictEqual(returnValue, undefined)
+        })
+
+        it('returns value with after multiple calls and function delay ', async function () {
+            testSettings.callGoal = 3
+            testSettings.functionDelay = 5
+            const returnValue: number | undefined = await timeoutUtils.waitUntil(slowTestFunction, {
+                timeout: 10000,
+                interval: 5,
+                truthy: false,
+            })
+            assert.strictEqual(returnValue, testSettings.callGoal)
+        })
+
+        it('returns value after setting truthy parameter to true', async function () {
+            let counter: number = 0
+            const result: boolean | undefined = await timeoutUtils.waitUntil(async () => counter++ === 5, {
+                timeout: 1000,
+                interval: 5,
+                truthy: true,
+            })
+            assert.strictEqual(result, true)
+        })
+
+        it('timeout after setting truthy parameter to true', async function () {
+            let counter: number = 0
+            const result: boolean | undefined = await timeoutUtils.waitUntil(async () => counter++ === 5, {
+                timeout: 15,
+                interval: 5,
+                truthy: true,
+            })
+            assert.strictEqual(result, undefined)
+        })
+    })
+
+    describe('waitUntil w/ retries', function () {
+        let fn: SinonStub<[], Promise<string | boolean>>
+
+        beforeEach(function () {
+            fn = sandbox.stub()
+        })
+
+        it('should retry when retryOnFail callback returns true', async function () {
+            fn.onCall(0).throws(new Error('Retry error'))
+            fn.onCall(1).throws(new Error('Retry error'))
+            fn.onCall(2).resolves('success')
+
+            const res = waitUntil(fn, {
+                retryOnFail: (error: Error) => {
+                    return error.message === 'Retry error'
+                },
+            })
+
+            await clock.tickAsync(timeoutUtils.waitUntilDefaultInterval)
+            assert.strictEqual(fn.callCount, 2)
+            await clock.tickAsync(timeoutUtils.waitUntilDefaultInterval)
+            assert.strictEqual(fn.callCount, 3)
+            assert.strictEqual(await res, 'success')
+        })
+
+        it('should not retry when retryOnFail callback returns false', async function () {
+            fn.onCall(0).throws(new Error('Retry error'))
+            fn.onCall(1).throws(new Error('Retry error'))
+            fn.onCall(2).throws(new Error('Last error'))
+            fn.onCall(3).resolves('this is not hit')
+
+            const res = assert.rejects(
+                waitUntil(fn, {
+                    retryOnFail: (error: Error) => {
+                        return error.message === 'Retry error'
+                    },
+                }),
+                (e) => e instanceof Error && e.message === 'Last error'
+            )
+
+            await clock.tickAsync(timeoutUtils.waitUntilDefaultInterval)
+            assert.strictEqual(fn.callCount, 2)
+            await clock.tickAsync(timeoutUtils.waitUntilDefaultInterval)
+            assert.strictEqual(fn.callCount, 3)
+            await res
+        })
+
+        it('retries the function until it succeeds', async function () {
+            fn.onCall(0).throws()
+            fn.onCall(1).throws()
+            fn.onCall(2).resolves('success')
+
+            const res = waitUntil(fn, { retryOnFail: true })
+
+            await clock.tickAsync(timeoutUtils.waitUntilDefaultInterval)
+            assert.strictEqual(fn.callCount, 2)
+            await clock.tickAsync(timeoutUtils.waitUntilDefaultInterval)
+            assert.strictEqual(fn.callCount, 3)
+            assert.strictEqual(await res, 'success')
+        })
+
+        it('retryOnFail ignores truthiness', async function () {
+            fn.resolves(false)
+            const res = waitUntil(fn, { retryOnFail: true, truthy: true })
+            assert.strictEqual(await res, false)
+        })
+
+        // This test causes the following error, cannot figure out why:
+        // `rejected promise not handled within 1 second: Error: last`
+        it('throws the last error if the function always fails, using defaults', async function () {
+            fn.onCall(0).throws() // 0
+            fn.onCall(1).throws() // 500
+            fn.onCall(2).throws(new Error('second last')) // 1000
+            fn.onCall(3).throws(new Error('last')) // 1500
+            fn.onCall(4).resolves('this is not hit')
+
+            // We must wrap w/ assert.rejects() here instead of at the end, otherwise Mocha raise a
+            // `rejected promise not handled within 1 second: Error: last`
+            const res = assert.rejects(
+                waitUntil(fn, { retryOnFail: true }),
+                (e) => e instanceof Error && e.message === 'last'
+            )
+
+            await clock.tickAsync(timeoutUtils.waitUntilDefaultInterval) // 500
+            assert.strictEqual(fn.callCount, 2)
+            await clock.tickAsync(timeoutUtils.waitUntilDefaultInterval) // 1000
+            assert.strictEqual(fn.callCount, 3)
+            await clock.tickAsync(timeoutUtils.waitUntilDefaultInterval) // 1500
+            assert.strictEqual(fn.callCount, 4)
+
+            await res
+        })
+
+        it('honors retry delay + backoff multiplier', async function () {
+            fn.onCall(0).throws(Error('0')) // 0ms
+            fn.onCall(1).throws(Error('1')) // 100ms
+            fn.onCall(2).throws(Error('2')) // 200ms
+            fn.onCall(3).resolves('success') // 400ms
+
+            // Note 701 instead of 700 for timeout. The 1 millisecond allows the final call to execute
+            // since the timeout condition is >= instead of >
+            const res = waitUntil(fn, { timeout: 701, interval: 100, backoff: 2, retryOnFail: true })
+
+            // Check the call count after each iteration, ensuring the function is called
+            // after the correct delay between retries.
+            await clock.tickAsync(99)
+            assert.strictEqual(fn.callCount, 1)
+            await clock.tickAsync(1)
+            assert.strictEqual(fn.callCount, 2)
+
+            await clock.tickAsync(199)
+            assert.strictEqual(fn.callCount, 2)
+            await clock.tickAsync(1)
+            assert.strictEqual(fn.callCount, 3)
+
+            await clock.tickAsync(399)
+            assert.strictEqual(fn.callCount, 3)
+            await clock.tickAsync(1)
+            assert.strictEqual(fn.callCount, 4)
+
+            assert.strictEqual(await res, 'success')
+        })
+    })
+
+    describe('waitTimeout', async function () {
+        async function testFunction(delay: number = 500, error?: Error) {
+            await sleep(delay)
+
+            if (error) {
+                throw error
+            }
+
+            return 'test'
+        }
+
+        it('triggers "onExpire" callback', async function () {
+            const timeout = new timeoutUtils.Timeout(200)
+            const timedPromise = timeoutUtils.waitTimeout(testFunction(), timeout, { onExpire: () => 'expire' })
+            clock.tick(300)
+            assert.strictEqual(await timedPromise, 'expire')
+        })
+
+        it('triggers "onCancel" callback', async function () {
+            const timeout = new timeoutUtils.Timeout(400)
+            const timedPromise = timeoutUtils.waitTimeout(testFunction(), timeout, { onCancel: () => 'cancel' })
+            clock.tick(200)
+            timeout.cancel()
+            assert.strictEqual(await timedPromise, 'cancel')
+        })
+
+        it('propagates exception from function', async function () {
+            const timeout = new timeoutUtils.Timeout(400)
+            const testError = new Error('test error')
+            const timedPromise = timeoutUtils.waitTimeout(testFunction(200, testError), timeout)
+            clock.tick(300)
+            await assert.rejects(timedPromise, testError)
+        })
+
+        it('timer does not reject when function finishes in time', async function () {
+            const timeout = new timeoutUtils.Timeout(400)
+            const timedPromise = timeoutUtils.waitTimeout(testFunction(200), timeout)
+            clock.tick(300)
+            timeout.dispose()
+            clock.tick(200)
+            await assert.doesNotReject(timedPromise)
+        })
+
+        it('"allowUndefined" option set to false with undefined resolve throws error', async function () {
+            const timeout = new timeoutUtils.Timeout(400)
+            const timedPromise = timeoutUtils.waitTimeout(testFunction(500), timeout, { allowUndefined: false })
+            clock.tick(300)
+            timeout.dispose() // Promise now resolves undefined
+            clock.tick(200)
+            await assert.rejects(timedPromise, new Error(timeoutUtils.timeoutUnexpectedResolve))
+        })
+
+        it('"completeTimeout" option set to false throws expired error', async function () {
+            const timeout = new timeoutUtils.Timeout(800)
+            const timedPromise = timeoutUtils.waitTimeout(testFunction(500), timeout, { completeTimeout: false })
+            clock.tick(600)
+            await timedPromise
+            clock.tick(300)
+            await assert.rejects(timeout.promisify(), new Error(timeoutUtils.timeoutExpiredMessage))
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/utilities/tsUtils.test.ts b/packages/core/src/test/shared/utilities/tsUtils.test.ts
new file mode 100644
index 00000000000..384d47df6ec
--- /dev/null
+++ b/packages/core/src/test/shared/utilities/tsUtils.test.ts
@@ -0,0 +1,37 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import { tryFunctions } from '../../../shared/utilities/tsUtils'
+import { partition } from '../../../shared/utilities/tsUtils'
+
+describe('tryFunctions', function () {
+    it('should return the result of the first function that returns', async function () {
+        const f1 = () => Promise.reject('f1')
+        const f2 = () => Promise.resolve('f2')
+        const f3 = () => Promise.reject('f3')
+
+        assert.strictEqual(await tryFunctions([f1, f2, f3]), 'f2')
+    })
+
+    it('if all reject, then should throw final error', async function () {
+        const f1 = () => Promise.reject('f1')
+        const f2 = () => Promise.reject('f2')
+        const f3 = () => Promise.reject('f3')
+
+        await assert.rejects(
+            async () => await tryFunctions([f1, f2, f3]),
+            (e) => e === 'f3'
+        )
+    })
+})
+
+describe('partition', function () {
+    it('should split the list according to predicate', function () {
+        const items = [1, 2, 3, 4, 5, 6, 7, 8]
+        const [even, odd] = partition(items, (i) => i % 2 === 0)
+        assert.deepStrictEqual(even, [2, 4, 6, 8])
+        assert.deepStrictEqual(odd, [1, 3, 5, 7])
+    })
+})
diff --git a/src/test/shared/utilities/typeConstructors.test.ts b/packages/core/src/test/shared/utilities/typeConstructors.test.ts
similarity index 97%
rename from src/test/shared/utilities/typeConstructors.test.ts
rename to packages/core/src/test/shared/utilities/typeConstructors.test.ts
index 3ec5c96349b..22b0a465573 100644
--- a/src/test/shared/utilities/typeConstructors.test.ts
+++ b/packages/core/src/test/shared/utilities/typeConstructors.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import {
     addTypeName,
     ArrayConstructor,
@@ -148,7 +148,7 @@ describe('Type Constructors', function () {
 
         it('uses names attached to functions', function () {
             const typeName = 'Literal<"foo">'
-            const asFoo = addTypeName(typeName, input => {
+            const asFoo = addTypeName(typeName, (input) => {
                 if (typeof input === 'string' && input === 'foo') {
                     return input as 'foo'
                 }
diff --git a/packages/core/src/test/shared/utilities/uriUtils.test.ts b/packages/core/src/test/shared/utilities/uriUtils.test.ts
new file mode 100644
index 00000000000..d8c03ad0cf8
--- /dev/null
+++ b/packages/core/src/test/shared/utilities/uriUtils.test.ts
@@ -0,0 +1,48 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { fromQueryToParameters, isValidUrl } from '../../../shared/utilities/uriUtils'
+
+describe('uriUtils', function () {
+    it('returns empty when no query parameters are present', function () {
+        const params = fromQueryToParameters('')
+        assert.deepStrictEqual(params, new Map())
+    })
+
+    it('returns parameters', function () {
+        const params = fromQueryToParameters('param1=value')
+        assert.deepStrictEqual(params, new Map([['param1', 'value']]))
+    })
+
+    it('returns latest parameters when overlapped', function () {
+        const params = fromQueryToParameters('param1=value&param1=value2')
+        assert.deepStrictEqual(params, new Map([['param1', 'value2']]))
+    })
+
+    it('returns all parameters', function () {
+        const params = fromQueryToParameters('param1=value&param2=value2&param3=value3')
+        assert.deepStrictEqual(
+            params,
+            new Map([
+                ['param1', 'value'],
+                ['param2', 'value2'],
+                ['param3', 'value3'],
+            ])
+        )
+    })
+
+    it('isValidUrl()', function () {
+        assert.strictEqual(isValidUrl(''), false)
+        assert.strictEqual(isValidUrl('test.com'), false)
+        assert.strictEqual(isValidUrl('https://test'), false)
+        assert.strictEqual(isValidUrl('http://test.'), false)
+        assert.strictEqual(isValidUrl('https://test.com http://test2.com'), false)
+
+        assert.strictEqual(isValidUrl('https://test.com'), true)
+        assert.strictEqual(isValidUrl('http://test.com'), true)
+        assert.strictEqual(isValidUrl('http://test.com/path'), true)
+    })
+})
diff --git a/packages/core/src/test/shared/utilities/vscodeUtils.test.ts b/packages/core/src/test/shared/utilities/vscodeUtils.test.ts
new file mode 100644
index 00000000000..450a378589f
--- /dev/null
+++ b/packages/core/src/test/shared/utilities/vscodeUtils.test.ts
@@ -0,0 +1,121 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { VSCODE_EXTENSION_ID } from '../../../shared/extensions'
+import * as vscodeUtil from '../../../shared/utilities/vsCodeUtils'
+import * as vscode from 'vscode'
+import { getExcludePattern } from '../../../shared/fs/watchedFiles'
+
+describe('vscodeUtils', async function () {
+    it('activateExtension(), isExtensionActive()', async function () {
+        assert.deepStrictEqual(await vscodeUtil.activateExtension('invalid.extension'), undefined)
+        await assert.rejects(async () => {
+            await vscodeUtil.activateExtension('invalid', false)
+        })
+
+        assert.deepStrictEqual(vscodeUtil.isExtensionActive('invalid.extension'), false)
+
+        await vscodeUtil.activateExtension(VSCODE_EXTENSION_ID.awstoolkit, false)
+        assert.deepStrictEqual(vscodeUtil.isExtensionActive(VSCODE_EXTENSION_ID.awstoolkit), true)
+    })
+
+    it('globDirPatterns()', async function () {
+        const input = ['foo', '**/bar/**', '*baz*', '**/*with.star*/**', '/zub', 'zim/', '/zoo/']
+        assert.deepStrictEqual(vscodeUtil.globDirPatterns(input), [
+            'foo',
+            'bar',
+            'baz',
+            '*with.star*',
+            'zub',
+            'zim',
+            'zoo',
+        ])
+    })
+
+    it('watchedFiles.getExcludePattern()', async function () {
+        // If vscode defaults change in the future, just update this test.
+        // We intentionally want visibility into real-world defaults.
+        assert.match(getExcludePattern(), /node_modules,bower_components,\*\.code-search,/)
+    })
+})
+
+describe('isExtensionInstalled()', function () {
+    const smallerVersion = '0.9.0'
+    const extVersion = '1.0.0'
+    const largerVersion = '2.0.0'
+    const extId = 'my.ext.id'
+    let ext: vscode.Extension<any>
+    let getExtension: (extId: string) => vscode.Extension<any>
+
+    beforeEach(function () {
+        ext = {
+            packageJSON: {
+                version: extVersion,
+            },
+        } as vscode.Extension<any>
+        getExtension = (_) => ext
+    })
+
+    it('fails if extension could not be found', function () {
+        const noExtFunc = (extId: string) => undefined
+        assert.ok(!vscodeUtil.isExtensionInstalled(extId, undefined, noExtFunc))
+    })
+
+    it('succeeds on same min version', function () {
+        assert.ok(vscodeUtil.isExtensionInstalled(extId, extVersion, getExtension))
+    })
+
+    it('succeeds on smaller min version', function () {
+        assert.ok(vscodeUtil.isExtensionInstalled(extId, smallerVersion, getExtension))
+    })
+
+    it('fails on larger min version', function () {
+        assert.ok(!vscodeUtil.isExtensionInstalled(extId, largerVersion, getExtension))
+    })
+
+    it('can handle labels on a version', function () {
+        ext.packageJSON.version = `${extVersion}-SNAPSHOT`
+        assert.ok(vscodeUtil.isExtensionInstalled(extId, `${smallerVersion}-ALPHA`, getExtension))
+    })
+
+    it('is valid when no min version is provided', function () {
+        assert.ok(vscodeUtil.isExtensionInstalled(extId, undefined, getExtension))
+    })
+
+    it('fails on malformed version', function () {
+        // malformed min version
+        assert.ok(!vscodeUtil.isExtensionInstalled(extId, 'malformed.version', getExtension))
+
+        // malformed ext version
+        ext.packageJSON.version = 'malformed.version'
+        assert.ok(!vscodeUtil.isExtensionInstalled(extId, extVersion, getExtension))
+    })
+})
+
+describe('buildMissingExtensionMessage()', function () {
+    const extId = 'MY.EXT.ID'
+    const extName = 'MY EXTENSION'
+    const minVer = '1.0.0'
+    const feat = 'FEATURE'
+
+    // Test when a minVer is given
+    it('minVer', function () {
+        const message = vscodeUtil.buildMissingExtensionMessage(extId, extName, minVer, feat)
+        assert.strictEqual(
+            message,
+            `${feat} requires the ${extName} extension (\'${extId}\' of version >=${minVer}) to be installed and enabled.`
+        )
+    })
+
+    // Test when a minVer is not given
+    it('no minVer', function () {
+        const message = vscodeUtil.buildMissingExtensionMessage(extId, extName, undefined, feat)
+        assert.strictEqual(
+            message,
+            `${feat} requires the ${extName} extension (\'${extId}\') to be installed and enabled.`
+        )
+    })
+})
diff --git a/packages/core/src/test/shared/utilities/zipStream.test.ts b/packages/core/src/test/shared/utilities/zipStream.test.ts
new file mode 100644
index 00000000000..9186872bc96
--- /dev/null
+++ b/packages/core/src/test/shared/utilities/zipStream.test.ts
@@ -0,0 +1,103 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { ZipStream, ZipStreamResult } from '../../../shared/utilities/zipStream'
+import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
+import path from 'path'
+import fs from '../../../shared/fs/fs'
+import crypto from 'crypto'
+// @ts-ignore
+import { BlobWriter } from '@zip.js/zip.js'
+import { assertLogsContain } from '../../globalSetup.test'
+
+describe('zipStream', function () {
+    let tmpDir: string
+
+    beforeEach(async function () {
+        tmpDir = await makeTemporaryToolkitFolder()
+    })
+
+    afterEach(async function () {
+        await fs.delete(tmpDir, { recursive: true })
+    })
+
+    it('should create a zip stream from text content', async function () {
+        const zipStream = new ZipStream({ hashAlgorithm: 'md5' })
+        await zipStream.writeString('foo bar', 'file.txt', true)
+        const result = await zipStream.finalize()
+
+        await verifyResult(result, path.join(tmpDir, 'test.zip'))
+    })
+
+    it('should create a zip stream from file', async function () {
+        const testFilePath = path.join(tmpDir, 'test.txt')
+        await fs.writeFile(testFilePath, 'foo bar')
+
+        const zipStream = new ZipStream({ hashAlgorithm: 'md5' })
+        zipStream.writeFile(testFilePath, 'file.txt')
+        const result = await zipStream.finalize()
+
+        await verifyResult(result, path.join(tmpDir, 'test.zip'))
+    })
+
+    it('should unzip from a buffer', async function () {
+        const zipStream = new ZipStream()
+        await zipStream.writeString('foo bar foo', 'file.txt', true)
+        const result = await zipStream.finalize()
+
+        const zipBuffer = result.streamBuffer.getContents()
+        assert.ok(zipBuffer)
+        const zipEntries = await ZipStream.unzip(zipBuffer)
+        assert.strictEqual(zipEntries[0].filename, 'file.txt')
+        assert.strictEqual(zipEntries.length, 1)
+
+        // Read data back from zip to verify
+        const data = await zipEntries[0].getData!(new BlobWriter('text/plain'))
+        const textData = await data.text()
+        assert.strictEqual(textData, 'foo bar foo')
+    })
+
+    it('should write contents to file', async function () {
+        const zipStream = new ZipStream()
+        await zipStream.writeString('foo bar', 'file.txt', true)
+        const zipPath = path.join(tmpDir, 'test.zip')
+        const result = await zipStream.finalizeToFile(path.join(tmpDir, 'test.zip'))
+
+        assert.strictEqual(result.sizeInBytes, (await fs.stat(zipPath)).size)
+    })
+
+    it('only writes to target paths once', async function () {
+        const testFilePath = path.join(tmpDir, 'test.txt')
+        await fs.writeFile(testFilePath, 'foo bar')
+        const testFilePath2 = path.join(tmpDir, 'test2.txt')
+        await fs.writeFile(testFilePath2, 'foo bar')
+
+        const zipStream = new ZipStream()
+        zipStream.writeFile(testFilePath, 'file.txt')
+        zipStream.writeFile(testFilePath2, 'file.txt')
+        const result = await zipStream.finalize()
+
+        const zipBuffer = result.streamBuffer.getContents()
+        assert.ok(zipBuffer)
+        const zipEntries = await ZipStream.unzip(zipBuffer)
+
+        assert.strictEqual(zipEntries.length, 1)
+        assertLogsContain('duplicate file', false, 'debug')
+    })
+})
+
+async function verifyResult(result: ZipStreamResult, zipPath: string) {
+    const zipBuffer = result.streamBuffer.getContents()
+    assert.ok(zipBuffer)
+
+    await fs.writeFile(zipPath, zipBuffer)
+    const expectedMd5 = crypto
+        .createHash('md5')
+        .update(await fs.readFileBytes(zipPath))
+        .digest('base64')
+    assert.strictEqual(result.hash, expectedMd5)
+    assert.strictEqual(result.sizeInBytes, (await fs.stat(zipPath)).size)
+}
diff --git a/packages/core/src/test/shared/vscode/commands.test.ts b/packages/core/src/test/shared/vscode/commands.test.ts
new file mode 100644
index 00000000000..c8210f3906d
--- /dev/null
+++ b/packages/core/src/test/shared/vscode/commands.test.ts
@@ -0,0 +1,212 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import { Commands } from '../../../shared/vscode/commands2'
+
+describe('Commands', function () {
+    let commands: Commands
+    let from: Commands['from']
+
+    beforeEach(function () {
+        commands = new Commands()
+        from = commands.from.bind(commands)
+    })
+
+    afterEach(function () {
+        commands.dispose()
+    })
+
+    describe('get', function () {
+        it('returns a command if it exists', async function () {
+            const command = await commands.get('vscode.open')
+            assert.strictEqual(command?.id, 'vscode.open')
+        })
+
+        it('returns `undefined` when the command does not exist', async function () {
+            const command = await commands.get('aws.foo')
+            assert.strictEqual(command, undefined)
+        })
+    })
+
+    describe('declare', function () {
+        function sum(a: number, b: number) {
+            return a + b
+        }
+
+        const add = (a: number) => (b: number) => sum(a, b)
+
+        it('uses the provided factory function', async function () {
+            const declared = commands.declare('add3', add)
+            const registered = declared.register(3)
+
+            assert.strictEqual(await registered.execute(4), 7)
+        })
+
+        it('throws when declaring a declared id', function () {
+            commands.declare('add', add)
+            assert.throws(() => commands.declare('add', add))
+        })
+
+        it('throws when declaring a registered id', function () {
+            commands.register('add', add(0))
+            assert.throws(() => commands.declare('add', add))
+        })
+
+        it('can be built while not registered', async function () {
+            const declared = commands.declare('add3', add)
+            const built = declared.build(7).asCommand({ title: 'Add 3 to 7' })
+            const registered = declared.register(3)
+
+            assert.strictEqual(await registered.execute(7), 10)
+            assert.deepStrictEqual(built, {
+                title: 'Add 3 to 7',
+                command: 'add3',
+                arguments: [7],
+            })
+        })
+    })
+
+    describe('register', function () {
+        function sum(a: number, b: number) {
+            return a + b
+        }
+
+        it('uses the provided id', async function () {
+            const previous = await commands.get('sum')
+            commands.register('sum', sum)
+
+            assert.strictEqual(previous, undefined)
+            assert.ok(await commands.get('sum'))
+        })
+
+        it('can execute a command', async function () {
+            const registered = commands.register('sum', sum)
+            assert.strictEqual(await registered.execute(2, 2), 4)
+        })
+
+        it('throws when registering a command multiple times', function () {
+            commands.register('sum', sum)
+            assert.throws(() => commands.register('sum', sum))
+        })
+
+        describe('Command', function () {
+            it('can build a command with a title', function () {
+                const registered = commands.register('sum', sum)
+                const built = registered.build(1, 2).asCommand({ title: 'Sum' })
+
+                assert.deepStrictEqual(built, {
+                    title: 'Sum',
+                    command: 'sum',
+                    arguments: [1, 2],
+                })
+            })
+
+            it('can build a command with a tooltip', function () {
+                const registered = commands.register('sum', sum)
+                const built = registered.build(2, 3).asCommand({ title: '2 + 3', tooltip: 'Add 2 + 3' })
+
+                assert.deepStrictEqual(built, {
+                    title: '2 + 3',
+                    command: 'sum',
+                    tooltip: 'Add 2 + 3',
+                    arguments: [2, 3],
+                })
+            })
+        })
+
+        describe('Uri', function () {
+            it('can build a command uri', function () {
+                const registered = commands.register('sum', sum)
+                const built = registered.build(2, 3).asUri()
+
+                assert.strictEqual(built.toString(true), 'command:sum?[2,3]')
+            })
+
+            it('encodes arguments appropriately', function () {
+                const registered = commands.register('pass', (input: string) => input)
+                const built = registered.build('https://github.com/aws/aws-toolkit-vscode').asUri()
+
+                assert.strictEqual(built.toString(true), 'command:pass?["https://github.com/aws/aws-toolkit-vscode"]')
+            })
+        })
+
+        describe('TreeItem', function () {
+            it('can build a tree node', function () {
+                const registered = commands.register('sum', sum)
+                const built = registered.build(5, 4).asTreeNode({ label: 'Sum' })
+                const item = built.getTreeItem()
+
+                assert.ok(item instanceof vscode.TreeItem)
+                assert.strictEqual(item.label, 'Sum')
+                assert.strictEqual(item.command?.command, 'sum')
+                assert.deepStrictEqual(item.command?.arguments, [5, 4])
+                assert.strictEqual(built.resource, registered)
+            })
+        })
+    })
+
+    describe('from', function () {
+        class Foo {
+            public bar(p: number): string {
+                return this.s.repeat(p)
+            }
+            public constructor(protected readonly s: string) {}
+        }
+
+        it('can register a declared command', function () {
+            const declared = from(Foo).declareBar('my.command')
+            declared.register(new Foo('boo'))
+        })
+
+        it('can execute a declared command', async function () {
+            const declared = from(Foo).declareBar('my.command')
+            const registered = declared.register(new Foo('moo'))
+            assert.strictEqual(await registered.execute(2), 'moomoo')
+        })
+
+        it('works with inheritance (no override)', async function () {
+            class Foo2 extends Foo {
+                public bar2(): number {
+                    return this.s.length
+                }
+            }
+
+            const bar1 = from(Foo2).declareBar('my.command1')
+            const bar2 = from(Foo2).declareBar2('my.command2')
+
+            const instance = new Foo2('zero')
+            assert.strictEqual(await bar1.register(instance).execute(2), 'zerozero')
+            assert.strictEqual(await bar2.register(instance).execute(), 4)
+        })
+
+        it('works with inheritance (override)', async function () {
+            class Foo2 extends Foo {
+                public override bar(p: number): string {
+                    return this.s.toUpperCase().repeat(p)
+                }
+            }
+
+            // The current implementation operates more like "traditional" inheritance
+            // in that method bindings are static. Declaring a command from a class
+            // results in that exact implementation being executed, not whatever
+            // implementation exists at runtime. Dispatch at runtime would flip the results
+            // of these these two cases, making the first lowercase and the other uppercase.
+            //
+            // While runtime dispatch is nice for ad-hoc behavioral changes, it can also
+            // make things harder to reason about. Commands are not really meant to be
+            // dynamic, so any kind of differing behavior should rely on composition or
+            // parametric polymorphism rather than classical polymorphism.
+            const declared1 = from(Foo2).declareBar('my.command')
+            const command1 = declared1.register(new Foo('one'))
+            assert.strictEqual(await command1.execute(2), 'ONEONE')
+
+            const declared2 = from(Foo).declareBar('my.command2')
+            const command2 = declared2.register(new Foo2('one'))
+            assert.strictEqual(await command2.execute(3), 'oneoneone')
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/vscode/env.test.ts b/packages/core/src/test/shared/vscode/env.test.ts
new file mode 100644
index 00000000000..a71aca33e8d
--- /dev/null
+++ b/packages/core/src/test/shared/vscode/env.test.ts
@@ -0,0 +1,520 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import path from 'path'
+import {
+    isCloudDesktop,
+    getEnvVars,
+    getServiceEnvVarConfig,
+    isAmazonLinux2,
+    isBeta,
+    hasSageMakerEnvVars,
+} from '../../../shared/vscode/env'
+import { ChildProcess } from '../../../shared/utilities/processUtils'
+import * as sinon from 'sinon'
+import os from 'os'
+import fs from '../../../shared/fs/fs'
+import vscode from 'vscode'
+import { getComputeEnvType } from '../../../shared/telemetry/util'
+import * as globals from '../../../shared/extensionGlobals'
+
+describe('env', function () {
+    // create a sinon sandbox instance and instantiate in a beforeEach
+    let sandbox: sinon.SinonSandbox
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    describe('getServiceEnvVarConfig', function () {
+        const envVars: string[] = []
+
+        afterEach(() => {
+            for (const v of envVars) {
+                delete process.env[v]
+            }
+            envVars.length = 0
+        })
+
+        function addEnvVar(k: string, v: string) {
+            process.env[k] = v
+            envVars.push(k)
+        }
+
+        it('gets service config', async function () {
+            const service = 'codecatalyst'
+            const serviceConfigs = ['region', 'endpoint', 'gitHostname']
+            addEnvVar('__CODECATALYST_ENDPOINT', 'test.endpoint')
+            addEnvVar('__CODECATALYST_GIT_HOSTNAME', 'test.gitHostname')
+
+            const expectedConfig = {
+                endpoint: 'test.endpoint',
+                gitHostname: 'test.gitHostname',
+            }
+            assert.deepStrictEqual(getServiceEnvVarConfig(service, serviceConfigs), expectedConfig)
+        })
+    })
+
+    describe('getEnvVars', function () {
+        it('gets codecatalyst environment variables', async function () {
+            const expectedEnvVars = {
+                region: '__CODECATALYST_REGION',
+                endpoint: '__CODECATALYST_ENDPOINT',
+                hostname: '__CODECATALYST_HOSTNAME',
+                gitHostname: '__CODECATALYST_GIT_HOSTNAME',
+            }
+
+            const envVar = getEnvVars('codecatalyst', Object.keys(expectedEnvVars))
+            assert.deepStrictEqual(envVar, expectedEnvVars)
+        })
+
+        it('gets codewhisperer environment variables', async function () {
+            const expectedEnvVars = {
+                region: '__CODEWHISPERER_REGION',
+                endpoint: '__CODEWHISPERER_ENDPOINT',
+            }
+            const envVar = getEnvVars('codewhisperer', Object.keys(expectedEnvVars))
+            assert.deepStrictEqual(envVar, expectedEnvVars)
+        })
+    })
+
+    function stubOsVersion(verson: string) {
+        return sandbox.stub(os, 'release').returns(verson)
+    }
+
+    it('isBeta', async () => {
+        // HACK: read each package.json because env.ts thinks version is "testPluginVersion" during testing.
+        const toolkitPath = path.join(__dirname, '../../../../../../toolkit/package.json')
+        const amazonqPath = path.join(__dirname, '../../../../../../amazonq/package.json')
+        const toolkit = JSON.parse(await fs.readFileText(toolkitPath))
+        const amazonq = JSON.parse(await fs.readFileText(amazonqPath))
+        const toolkitVer = toolkit.version as string
+        const amazonqVer = amazonq.version as string
+        const toolkitBeta = toolkitVer.startsWith('99.')
+        const amazonqBeta = amazonqVer.startsWith('99.')
+
+        assert(toolkitBeta === amazonqBeta)
+        const expected = toolkitBeta
+        assert.strictEqual(isBeta(), expected)
+    })
+
+    describe('isAmazonLinux2', function () {
+        let fsExistsStub: sinon.SinonStub
+        let fsReadFileStub: sinon.SinonStub
+        let isWebStub: sinon.SinonStub
+        let platformStub: sinon.SinonStub
+        let osReleaseStub: sinon.SinonStub
+        let moduleLoadStub: sinon.SinonStub
+
+        beforeEach(function () {
+            // Default stubs
+            platformStub = sandbox.stub(process, 'platform').value('linux')
+            osReleaseStub = stubOsVersion('5.10.220-188.869.amzn2int.x86_64')
+            isWebStub = sandbox.stub(globals, 'isWeb').returns(false)
+
+            // Mock fs module
+            const fsMock = {
+                existsSync: sandbox.stub().returns(false),
+                readFileSync: sandbox.stub().returns(''),
+            }
+            fsExistsStub = fsMock.existsSync
+            fsReadFileStub = fsMock.readFileSync
+
+            // Stub Module._load to intercept require calls
+            const Module = require('module')
+            moduleLoadStub = sandbox.stub(Module, '_load').callThrough()
+            moduleLoadStub.withArgs('fs').returns(fsMock)
+        })
+
+        it('returns false in web environment', function () {
+            isWebStub.returns(true)
+            assert.strictEqual(isAmazonLinux2(), false)
+        })
+
+        it('returns false in SageMaker environment with SAGEMAKER_APP_TYPE', function () {
+            const originalValue = process.env.SAGEMAKER_APP_TYPE
+            process.env.SAGEMAKER_APP_TYPE = 'JupyterLab'
+            try {
+                assert.strictEqual(isAmazonLinux2(), false)
+            } finally {
+                if (originalValue === undefined) {
+                    delete process.env.SAGEMAKER_APP_TYPE
+                } else {
+                    process.env.SAGEMAKER_APP_TYPE = originalValue
+                }
+            }
+        })
+
+        it('returns false in SageMaker environment with SM_APP_TYPE', function () {
+            const originalValue = process.env.SM_APP_TYPE
+            process.env.SM_APP_TYPE = 'JupyterLab'
+            try {
+                assert.strictEqual(isAmazonLinux2(), false)
+            } finally {
+                if (originalValue === undefined) {
+                    delete process.env.SM_APP_TYPE
+                } else {
+                    process.env.SM_APP_TYPE = originalValue
+                }
+            }
+        })
+
+        it('returns false in SageMaker environment with SERVICE_NAME', function () {
+            const originalValue = process.env.SERVICE_NAME
+            process.env.SERVICE_NAME = 'SageMakerUnifiedStudio'
+            try {
+                assert.strictEqual(isAmazonLinux2(), false)
+            } finally {
+                if (originalValue === undefined) {
+                    delete process.env.SERVICE_NAME
+                } else {
+                    process.env.SERVICE_NAME = originalValue
+                }
+            }
+        })
+
+        it('returns false when /etc/os-release indicates Ubuntu in container', function () {
+            fsExistsStub.returns(true)
+            fsReadFileStub.returns(`
+NAME="Ubuntu"
+VERSION="20.04.6 LTS (Focal Fossa)"
+ID=ubuntu
+ID_LIKE=debian
+PRETTY_NAME="Ubuntu 20.04.6 LTS"
+VERSION_ID="20.04"
+            `)
+
+            // Even with AL2 kernel (host is AL2), should return false (container is Ubuntu)
+            assert.strictEqual(isAmazonLinux2(), false)
+        })
+
+        it('returns false when /etc/os-release indicates Amazon Linux 2023', function () {
+            fsExistsStub.returns(true)
+            fsReadFileStub.returns(`
+NAME="Amazon Linux"
+VERSION="2023"
+ID="amzn"
+ID_LIKE="fedora"
+VERSION_ID="2023"
+PLATFORM_ID="platform:al2023"
+PRETTY_NAME="Amazon Linux 2023"
+            `)
+
+            assert.strictEqual(isAmazonLinux2(), false)
+        })
+
+        it('returns true when /etc/os-release indicates Amazon Linux 2', function () {
+            fsExistsStub.returns(true)
+            fsReadFileStub.returns(`
+NAME="Amazon Linux 2"
+VERSION="2"
+ID="amzn"
+ID_LIKE="centos rhel fedora"
+VERSION_ID="2"
+PRETTY_NAME="Amazon Linux 2"
+            `)
+
+            assert.strictEqual(isAmazonLinux2(), true)
+        })
+
+        it('returns true when /etc/os-release has ID="amzn" and VERSION_ID="2"', function () {
+            fsExistsStub.returns(true)
+            fsReadFileStub.returns(`
+NAME="Amazon Linux"
+VERSION="2"
+ID="amzn"
+VERSION_ID="2"
+            `)
+
+            assert.strictEqual(isAmazonLinux2(), true)
+        })
+
+        it('returns false when /etc/os-release indicates CentOS', function () {
+            fsExistsStub.returns(true)
+            fsReadFileStub.returns(`
+NAME="CentOS Linux"
+VERSION="7 (Core)"
+ID="centos"
+ID_LIKE="rhel fedora"
+VERSION_ID="7"
+            `)
+
+            // Even with AL2 kernel
+            assert.strictEqual(isAmazonLinux2(), false)
+        })
+
+        it('falls back to kernel check when /etc/os-release does not exist', function () {
+            fsExistsStub.returns(false)
+
+            // Test with AL2 kernel
+            assert.strictEqual(isAmazonLinux2(), true)
+
+            // Test with non-AL2 kernel
+            osReleaseStub.returns('5.10.220-188.869.NOT_INTERNAL.x86_64')
+            assert.strictEqual(isAmazonLinux2(), false)
+        })
+
+        it('falls back to kernel check when /etc/os-release read fails', function () {
+            fsExistsStub.returns(true)
+            fsReadFileStub.throws(new Error('Permission denied'))
+
+            // Should fall back to kernel check
+            assert.strictEqual(isAmazonLinux2(), true)
+        })
+
+        it('returns true with .amzn2. kernel pattern', function () {
+            fsExistsStub.returns(false)
+            osReleaseStub.returns('5.10.236-227.928.amzn2.x86_64')
+            assert.strictEqual(isAmazonLinux2(), true)
+        })
+
+        it('returns true with .amzn2int. kernel pattern', function () {
+            fsExistsStub.returns(false)
+            osReleaseStub.returns('5.10.220-188.869.amzn2int.x86_64')
+            assert.strictEqual(isAmazonLinux2(), true)
+        })
+
+        it('returns false with non-AL2 kernel', function () {
+            fsExistsStub.returns(false)
+            osReleaseStub.returns('5.15.0-91-generic')
+            assert.strictEqual(isAmazonLinux2(), false)
+        })
+
+        it('returns false on non-Linux platforms', function () {
+            platformStub.value('darwin')
+            fsExistsStub.returns(false)
+            assert.strictEqual(isAmazonLinux2(), false)
+
+            platformStub.value('win32')
+            assert.strictEqual(isAmazonLinux2(), false)
+        })
+
+        it('returns false when container OS is different from host OS', function () {
+            // Scenario: Host is AL2 (kernel shows AL2) but container is Ubuntu
+            fsExistsStub.returns(true)
+            fsReadFileStub.returns(`
+NAME="Ubuntu"
+VERSION="22.04"
+ID=ubuntu
+VERSION_ID="22.04"
+            `)
+            osReleaseStub.returns('5.10.220-188.869.amzn2int.x86_64') // AL2 kernel from host
+
+            // Should trust container OS over kernel
+            assert.strictEqual(isAmazonLinux2(), false)
+        })
+
+        it('handles os-release with comments correctly', function () {
+            fsExistsStub.returns(true)
+            fsReadFileStub.returns(`
+# This is a comment with VERSION_ID="2023" that should be ignored
+NAME="Amazon Linux 2"
+VERSION="2"
+ID="amzn"
+# Another comment with PLATFORM_ID="platform:al2023"
+VERSION_ID="2"
+PRETTY_NAME="Amazon Linux 2"
+            `)
+
+            // Should correctly identify as AL2 despite comments containing AL2023 identifiers
+            assert.strictEqual(isAmazonLinux2(), true)
+        })
+
+        it('handles os-release with quoted values correctly', function () {
+            fsExistsStub.returns(true)
+            fsReadFileStub.returns(`
+NAME="Amazon Linux 2"
+VERSION='2'
+ID=amzn
+VERSION_ID="2"
+PRETTY_NAME='Amazon Linux 2'
+            `)
+
+            // Should correctly parse both single and double quoted values
+            assert.strictEqual(isAmazonLinux2(), true)
+        })
+
+        it('handles os-release with empty lines and whitespace', function () {
+            fsExistsStub.returns(true)
+            fsReadFileStub.returns(`
+
+NAME="Amazon Linux 2"
+
+VERSION="2"
+   ID="amzn"   
+VERSION_ID="2"
+
+PRETTY_NAME="Amazon Linux 2"
+
+            `)
+
+            // Should correctly parse despite empty lines and whitespace
+            assert.strictEqual(isAmazonLinux2(), true)
+        })
+
+        it('rejects Amazon Linux 2023 even with misleading comments', function () {
+            fsExistsStub.returns(true)
+            fsReadFileStub.returns(`
+# This comment mentions Amazon Linux 2 but should not affect parsing
+NAME="Amazon Linux"
+VERSION="2023"
+ID="amzn"
+# Comment with VERSION_ID="2" should be ignored
+VERSION_ID="2023"
+PLATFORM_ID="platform:al2023"
+PRETTY_NAME="Amazon Linux 2023"
+            `)
+
+            // Should correctly identify as AL2023 (not AL2) despite misleading comments
+            assert.strictEqual(isAmazonLinux2(), false)
+        })
+
+        it('handles malformed os-release lines gracefully', function () {
+            fsExistsStub.returns(true)
+            fsReadFileStub.returns(`
+NAME="Amazon Linux 2"
+VERSION="2"
+ID="amzn"
+INVALID_LINE_WITHOUT_EQUALS
+=INVALID_LINE_STARTING_WITH_EQUALS
+VERSION_ID="2"
+PRETTY_NAME="Amazon Linux 2"
+            `)
+
+            // Should correctly parse valid lines and ignore malformed ones
+            assert.strictEqual(isAmazonLinux2(), true)
+        })
+    })
+
+    describe('hasSageMakerEnvVars', function () {
+        afterEach(function () {
+            // Clean up environment variables
+            delete process.env.SAGEMAKER_APP_TYPE
+            delete process.env.SAGEMAKER_INTERNAL_IMAGE_URI
+            delete process.env.STUDIO_LOGGING_DIR
+            delete process.env.SM_APP_TYPE
+            delete process.env.SM_INTERNAL_IMAGE_URI
+            delete process.env.SERVICE_NAME
+        })
+
+        it('returns true when SAGEMAKER_APP_TYPE is set', function () {
+            process.env.SAGEMAKER_APP_TYPE = 'JupyterLab'
+            assert.strictEqual(hasSageMakerEnvVars(), true)
+        })
+
+        it('returns true when SM_APP_TYPE is set', function () {
+            process.env.SM_APP_TYPE = 'JupyterLab'
+            assert.strictEqual(hasSageMakerEnvVars(), true)
+        })
+
+        it('returns true when SERVICE_NAME is SageMakerUnifiedStudio', function () {
+            process.env.SERVICE_NAME = 'SageMakerUnifiedStudio'
+            assert.strictEqual(hasSageMakerEnvVars(), true)
+        })
+
+        it('returns true when STUDIO_LOGGING_DIR contains /var/log/studio', function () {
+            process.env.STUDIO_LOGGING_DIR = '/var/log/studio/logs'
+            assert.strictEqual(hasSageMakerEnvVars(), true)
+        })
+
+        it('returns false when no SageMaker env vars are set', function () {
+            assert.strictEqual(hasSageMakerEnvVars(), false)
+        })
+
+        it('returns false when SERVICE_NAME is set but not SageMakerUnifiedStudio', function () {
+            process.env.SERVICE_NAME = 'SomeOtherService'
+            assert.strictEqual(hasSageMakerEnvVars(), false)
+        })
+    })
+
+    it('isCloudDesktop', async function () {
+        // Mock fs module for isAmazonLinux2() calls
+        const fsMock = {
+            existsSync: sandbox.stub().returns(false),
+            readFileSync: sandbox.stub().returns(''),
+        }
+        const fsExistsStub = fsMock.existsSync
+
+        // Stub Module._load to intercept require calls
+        const Module = require('module')
+        const moduleLoadStub = sandbox.stub(Module, '_load').callThrough()
+        moduleLoadStub.withArgs('fs').returns(fsMock)
+
+        sandbox.stub(process, 'platform').value('linux')
+        sandbox.stub(globals, 'isWeb').returns(false)
+        stubOsVersion('5.10.220-188.869.amzn2int.x86_64')
+
+        // Mock fs to return false so it falls back to kernel check (which should return true for AL2)
+        fsExistsStub.returns(false)
+
+        const runStub = sandbox.stub(ChildProcess.prototype, 'run').resolves({ exitCode: 0 } as any)
+        assert.strictEqual(await isCloudDesktop(), true)
+
+        runStub.resolves({ exitCode: 1 } as any)
+        assert.strictEqual(await isCloudDesktop(), false)
+    })
+
+    describe('getComputeEnvType', async function () {
+        let fsExistsStub: sinon.SinonStub
+        let moduleLoadStub: sinon.SinonStub
+
+        beforeEach(function () {
+            // Mock fs module for isAmazonLinux2() calls
+            const fsMock = {
+                existsSync: sandbox.stub().returns(false),
+                readFileSync: sandbox.stub().returns(''),
+            }
+            fsExistsStub = fsMock.existsSync
+
+            // Stub Module._load to intercept require calls
+            const Module = require('module')
+            moduleLoadStub = sandbox.stub(Module, '_load').callThrough()
+            moduleLoadStub.withArgs('fs').returns(fsMock)
+        })
+
+        it('cloudDesktop', async function () {
+            sandbox.stub(process, 'platform').value('linux')
+            sandbox.stub(vscode.env, 'remoteName').value('ssh-remote')
+            sandbox.stub(globals, 'isWeb').returns(false)
+            stubOsVersion('5.10.220-188.869.amzn2int.x86_64')
+            sandbox.stub(ChildProcess.prototype, 'run').resolves({ exitCode: 0 } as any)
+
+            // Mock fs to return false so it falls back to kernel check (which should return true for AL2)
+            fsExistsStub.returns(false)
+
+            assert.deepStrictEqual(await getComputeEnvType(), 'cloudDesktop-amzn')
+        })
+
+        it('ec2-internal', async function () {
+            sandbox.stub(process, 'platform').value('linux')
+            sandbox.stub(vscode.env, 'remoteName').value('ssh-remote')
+            sandbox.stub(globals, 'isWeb').returns(false)
+            stubOsVersion('5.10.220-188.869.amzn2int.x86_64')
+            sandbox.stub(ChildProcess.prototype, 'run').resolves({ exitCode: 1 } as any)
+
+            // Mock fs to return false so it falls back to kernel check (which should return true for AL2)
+            fsExistsStub.returns(false)
+
+            assert.deepStrictEqual(await getComputeEnvType(), 'ec2-amzn')
+        })
+
+        it('ec2', async function () {
+            sandbox.stub(process, 'platform').value('linux')
+            sandbox.stub(vscode.env, 'remoteName').value('ssh-remote')
+            sandbox.stub(globals, 'isWeb').returns(false)
+            stubOsVersion('5.10.220-188.869.NOT_INTERNAL.x86_64')
+
+            // Mock fs to return false so it falls back to kernel check (which should return false for non-AL2)
+            fsExistsStub.returns(false)
+
+            assert.deepStrictEqual(await getComputeEnvType(), 'ec2')
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/vscode/fakeEnv.ts b/packages/core/src/test/shared/vscode/fakeEnv.ts
new file mode 100644
index 00000000000..8f294227af9
--- /dev/null
+++ b/packages/core/src/test/shared/vscode/fakeEnv.ts
@@ -0,0 +1,22 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+
+export class FakeClipboard implements vscode.Clipboard {
+    public text: string = ''
+
+    public async readText(): Promise<string> {
+        return this.text
+    }
+    /**
+     * Records the text that was written.
+     *
+     * @returns an empty Promise.
+     */
+    public async writeText(text: string): Promise<void> {
+        this.text = text
+    }
+}
diff --git a/packages/core/src/test/shared/vscode/message.ts b/packages/core/src/test/shared/vscode/message.ts
new file mode 100644
index 00000000000..46358188656
--- /dev/null
+++ b/packages/core/src/test/shared/vscode/message.ts
@@ -0,0 +1,391 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import assert from 'assert'
+
+// This is roughly how VS Code models things internally
+export enum SeverityLevel {
+    Information = 'Information',
+    Warning = 'Warning',
+    Error = 'Error',
+
+    // Special-case for progress notifications
+    Progress = 'Progress',
+}
+
+interface MessageOptions<T extends vscode.MessageItem> extends vscode.MessageOptions {
+    readonly severity?: SeverityLevel
+    readonly items?: T[]
+    readonly detail?: string
+}
+
+type Window = typeof vscode.window
+type ProgressReport = { message?: string; increment?: number }
+type ShowMessage = Window['showInformationMessage'] | Window['showWarningMessage'] | Window['showErrorMessage']
+export type ShownMessage = Omit<TestMessage, 'show'> & { items: ReturnType<TestMessage['show']> }
+
+/**
+ * In-memory model of vscode's message/notification UI element
+ */
+export class TestMessage<T extends vscode.MessageItem = vscode.MessageItem> {
+    private _message: string
+    private _progress = 0
+    private _showing = false
+    private _disposed = false
+    private _selected: T | undefined
+    private _progressMessage: string | undefined
+    private readonly _onDidSelectItem = new vscode.EventEmitter<T | undefined>()
+    private readonly _onDidUpdateProgress = new vscode.EventEmitter<ProgressReport>()
+    private readonly _progressReports: ProgressReport[] = []
+    public readonly modal: boolean
+    public readonly severity: SeverityLevel
+    public readonly onDidSelectItem = this._onDidSelectItem.event
+    public readonly onDidUpdateProgress = this._onDidUpdateProgress.event
+
+    public constructor(
+        message: string,
+        private readonly options?: MessageOptions<T>
+    ) {
+        this._message = message
+        this.modal = !!options?.modal
+        this.severity = options?.severity ?? SeverityLevel.Information
+    }
+
+    public get message() {
+        const prefix = this._message ? `${this._message}: ` : ''
+
+        return this._progressMessage ? `${prefix}${this._progressMessage}` : this._message
+    }
+
+    public get visible() {
+        return this._showing && !!this.message
+    }
+
+    public get detail() {
+        return this.options?.detail
+    }
+
+    public get totalProgress() {
+        return this._progress
+    }
+
+    public get progressReports(): Readonly<ProgressReport[]> {
+        return this._progressReports
+    }
+
+    public get cancellable() {
+        return !!this.options?.items?.find((i) => i.title === 'Cancel')
+    }
+
+    public assertMessage(expected: string | RegExp): void {
+        this.compare(expected)
+    }
+
+    public assertSeverity(expected: SeverityLevel): void {
+        assert.strictEqual(this.severity, expected)
+    }
+
+    public assertSelected(expected: T): void {
+        assert.deepStrictEqual(this._selected, expected)
+    }
+
+    /**
+     * Checks that the message matches the expected value and is an "Information" message
+     */
+    public assertInfo(expected: string | RegExp) {
+        this.compare(expected, SeverityLevel.Information)
+    }
+
+    /**
+     * Checks that the message matches the expected value and is a "Warning" message
+     */
+    public assertWarn(expected: string | RegExp) {
+        this.compare(expected, SeverityLevel.Warning)
+    }
+
+    /**
+     * Checks that the message matches the expected value and is an "Error" message
+     */
+    public assertError(expected: string | RegExp) {
+        this.compare(expected, SeverityLevel.Error)
+    }
+
+    /**
+     * Checks that the message matches the expected value and is a "Progress" message
+     *
+     * Use {@link totalProgress} and {@link progressReports} to check for more granular
+     * details related to progress notifications.
+     */
+    public assertProgress(expected: string | RegExp) {
+        this.compare(expected, SeverityLevel.Progress)
+    }
+
+    private compare(expected: string | RegExp, severity = this.severity) {
+        if (this.severity !== severity) {
+            throw new assert.AssertionError({
+                message: 'Expected severity to match',
+                actual: this.printDebug(),
+                expected: this.printDebug(expected, severity),
+            })
+        }
+        if (typeof expected === 'string') {
+            assert.strictEqual(this.message, expected)
+        } else if (!expected.test(this.message)) {
+            throw new assert.AssertionError({
+                message: 'Message did not match pattern',
+                actual: this.message,
+                expected: expected.source,
+            })
+        }
+    }
+
+    public printDebug(message: string | RegExp = this.message, severity = this.severity) {
+        return [
+            `severity: ${severity}`,
+            `message: ${message}`,
+            `items: ${this.options?.items?.map((i) => i.title).join(', ') || '[no items]'}`,
+        ].join(', ')
+    }
+
+    public dispose(): void {
+        this._disposed = true
+        this._showing = false
+        this._onDidSelectItem.fire(this._selected)
+        this._onDidSelectItem.dispose()
+        this._onDidUpdateProgress.dispose()
+    }
+
+    public close(): void {
+        const selected = this.options?.items?.find((item) => item.isCloseAffordance)
+
+        if (selected) {
+            this.selectItem(selected)
+        } else {
+            this.dispose()
+        }
+    }
+
+    public selectItem(item: string | RegExp | T): void {
+        if (this._disposed) {
+            throw new Error('Attempted to select from a disposed message')
+        }
+        if (!this.options?.items || this.options.items.length === 0) {
+            throw new Error(
+                `Could not find the specified item "${String(item)}". Message has no items: ${this.message}`
+            )
+        }
+
+        const selected =
+            typeof item === 'string' || item instanceof RegExp
+                ? this.options?.items?.find((i) => i.title.match(item))
+                : this.options?.items?.find((i) => i === item)
+
+        if (!selected) {
+            throw new Error(`Could not find the specified item "${String(item)}" on message: ${this.printDebug()}`)
+        }
+
+        this._selected = selected
+        this.dispose()
+    }
+
+    public updateProgress(value: { message?: string; increment?: number }) {
+        this._progress += value.increment ?? 0
+        this._progressMessage = value.message ?? this._progressMessage
+        this._progressReports.push(value)
+        this._onDidUpdateProgress.fire(value)
+    }
+
+    public show(): (T & { select(): void })[] {
+        this._showing = true
+
+        return (this.options?.items ?? []).map((item) => {
+            return {
+                ...item,
+                select: () => this.selectItem(item),
+            }
+        })
+    }
+
+    public static isMessageItem(obj: any): obj is vscode.MessageItem {
+        return typeof obj?.title === 'string'
+    }
+
+    /**
+     * Creates a new function to show a test message based off severity.
+     *
+     * Optionally takes a callback to notifiy when the message is shown.
+     *
+     * @param severity
+     * @param callback
+     */
+    public static createShowMessageFn(
+        severity: SeverityLevel,
+        callback?: (message: ShownMessage) => void
+    ): ShowMessage {
+        return async <T extends vscode.MessageItem>(
+            message: string,
+            ...rest: [string | T | vscode.MessageOptions, ...(string | T)[]]
+        ) => {
+            const firstRest = rest[0]
+            const stringMode = typeof firstRest === 'string' || typeof rest[1] === 'string'
+            const opt = typeof firstRest !== 'string' && !TestMessage.isMessageItem(firstRest) ? firstRest : undefined
+            const items = (opt === undefined ? rest : rest.slice(1)) as (string | T)[]
+            const mappedItems = items.map((i) => (typeof i === 'string' ? { title: i } : i))
+            const testMessage = new TestMessage(message, {
+                severity,
+                modal: opt?.modal,
+                items: mappedItems,
+                ...opt,
+            })
+
+            return new Promise<vscode.MessageItem | T | string | undefined>((resolve) => {
+                testMessage.onDidSelectItem((i) => resolve(stringMode ? i?.title : i))
+                const shownItems = testMessage.show()
+                callback?.(Object.assign(testMessage, { items: shownItems }))
+            })
+        }
+    }
+}
+
+interface OpenDialogOptions extends vscode.OpenDialogOptions {
+    readonly type: 'Open'
+}
+
+interface SaveDialogOptions extends vscode.SaveDialogOptions {
+    readonly type: 'Save'
+}
+
+type FileSystemDialogOptions = OpenDialogOptions | SaveDialogOptions
+
+interface FileSystemDialogItem {
+    readonly uri: vscode.Uri
+    readonly title: string
+    readonly type: Exclude<vscode.FileType, vscode.FileType.SymbolicLink | vscode.FileType.Unknown>
+}
+
+/**
+ * Test fixture for both opening files and saving files
+ *
+ * Using {@link vscode.workspace.fs} is not implemented. Tests can provide arbitrary URIs as user responses.
+ */
+export class TestFileSystemDialog {
+    private _showing = false
+    private _disposed = false
+    private _selected: vscode.Uri | vscode.Uri[] | undefined
+    private _onDidAcceptItem = new vscode.EventEmitter<vscode.Uri | vscode.Uri[] | undefined>()
+    public readonly onDidAcceptItem = this._onDidAcceptItem.event
+
+    public constructor(
+        private readonly items: FileSystemDialogItem[],
+        public readonly options: FileSystemDialogOptions
+    ) {
+        this._selected = options?.defaultUri
+    }
+
+    public get title() {
+        return this.options.title
+    }
+
+    public get visible() {
+        return this._showing
+    }
+
+    public get defaultUri() {
+        return this.options.defaultUri
+    }
+
+    public get filters() {
+        return this.options.filters
+    }
+
+    public get acceptButtonLabel() {
+        if (this.options.type === 'Save') {
+            return this.options.saveLabel
+        } else {
+            return this.options.openLabel
+        }
+    }
+
+    public dispose(): void {
+        this._disposed = true
+        this._showing = false
+        this._onDidAcceptItem.dispose()
+    }
+
+    public close(): void {
+        this._selected = undefined
+        this._onDidAcceptItem.fire(this._selected)
+        this.dispose()
+    }
+
+    public accept() {
+        if (this._disposed) {
+            throw new Error('Attempted to select from a disposed message')
+        }
+
+        this._onDidAcceptItem.fire(this._selected)
+        this.dispose()
+    }
+
+    public selectItem(item: vscode.Uri): void {
+        this._selected = item
+        this.accept()
+    }
+
+    public selectItems(...items: vscode.Uri[]): void {
+        this._selected = items
+        this.accept()
+    }
+
+    public show(): (FileSystemDialogItem & { select(): void })[] {
+        this._showing = true
+
+        return this.items.map((item) => {
+            return {
+                ...item,
+                select: () => this.selectItem(item.uri),
+            }
+        })
+    }
+
+    public printDebug() {
+        return [
+            `type: ${this.options.type}`,
+            `title: ${this.title ?? '[no title]'}`,
+            `acceptButtonLabel: ${this.acceptButtonLabel ?? '[no label]'}`,
+        ].join(', ')
+    }
+
+    public static createOpenSaveDialogFn(
+        fs: vscode.FileSystem,
+        callback?: (dialog: TestFileSystemDialog) => void
+    ): Window['showOpenDialog'] {
+        return async (options?: vscode.OpenDialogOptions) => {
+            const dialog = new TestFileSystemDialog([], { type: 'Open', ...options })
+
+            return new Promise<vscode.Uri[] | undefined>((resolve) => {
+                dialog.onDidAcceptItem((item) => resolve(item instanceof vscode.Uri ? [item] : item))
+                dialog.show()
+                callback?.(dialog)
+            })
+        }
+    }
+
+    public static createShowSaveDialogFn(
+        fs: vscode.FileSystem,
+        callback?: (dialog: TestFileSystemDialog) => void
+    ): Window['showSaveDialog'] {
+        return async (options?: vscode.SaveDialogOptions) => {
+            const dialog = new TestFileSystemDialog([], { type: 'Save', ...options })
+
+            return new Promise<vscode.Uri | undefined>((resolve) => {
+                dialog.onDidAcceptItem((item) => resolve(Array.isArray(item) ? item[0] : item))
+                dialog.show()
+                callback?.(dialog)
+            })
+        }
+    }
+}
diff --git a/packages/core/src/test/shared/vscode/quickInput.ts b/packages/core/src/test/shared/vscode/quickInput.ts
new file mode 100644
index 00000000000..1601485fc1d
--- /dev/null
+++ b/packages/core/src/test/shared/vscode/quickInput.ts
@@ -0,0 +1,513 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { AssertionError } from 'assert'
+import { toRecord } from '../../../shared/utilities/collectionUtils'
+import { EventEmitters } from './testUtils'
+import { isKeyOf, isNonNullable, keys } from '../../../shared/utilities/tsUtils'
+import { captureEventOnce } from '../../testUtil'
+
+/**
+ * A list of events to be proxied on input boxes
+ */
+const inputEvents = ['onDidAccept', 'onDidChangeValue', 'onDidTriggerButton'] as const
+
+/**
+ * A list of events to be proxied on quick picks
+ */
+const pickerEvents = [
+    'onDidAccept',
+    'onDidChangeValue',
+    'onDidTriggerButton',
+    'onDidTriggerItemButton',
+    // 'onDidChangeActive',
+    // 'onDidChangeSelection',
+    // 'onDidHide',
+] as const
+
+function untilReady(
+    quickInput: vscode.QuickInput,
+    extraEmitters: ReturnType<typeof createExtraEmitters>
+): Promise<unknown[]> {
+    return Promise.all([
+        quickInput.enabled ? Promise.resolve() : captureEventOnce(extraEmitters.onDidChangeEnablement.event),
+        !quickInput.busy ? Promise.resolve() : captureEventOnce(extraEmitters.onDidChangeBusy.event),
+    ])
+}
+
+// 'activeItems' will change twice after applying a filter
+/* Waits until the filter has been applied to the picker */
+async function whenAppliedFilter(picker: vscode.QuickPick<vscode.QuickPickItem>): Promise<void> {
+    await captureEventOnce(picker.onDidChangeActive)
+    await new Promise((r) => setImmediate(r))
+    await captureEventOnce(picker.onDidChangeActive)
+}
+
+/* Simulates the filtering of items. We do not have access to the picker's internal representation */
+function filterItems<T extends vscode.QuickPickItem>(picker: vscode.QuickPick<T>): T[] {
+    const val = picker.value
+    const filter = (item: T) => {
+        if (!item.label.match(val)) {
+            return (
+                (picker.matchOnDescription && (item.description ?? '').match(val)) ||
+                (picker.matchOnDetail && (item.detail ?? '').match(val))
+            )
+        }
+        return true
+    }
+    return picker.items.filter(filter)
+}
+
+type ItemMatcher<T extends vscode.QuickPickItem> = string | RegExp | T
+function matchItem<T extends vscode.QuickPickItem>(item: T, expected: ItemMatcher<T>): boolean {
+    if (expected instanceof RegExp) {
+        return expected.test(item.label)
+    } else if (typeof expected === 'string') {
+        return item.label === expected
+    } else {
+        return JSON.stringify(item) === JSON.stringify(expected)
+    }
+}
+
+/* Returns all items from source that are in target. Strings are matched based off label. Items are only matched once. */
+function matchItems<T extends vscode.QuickPickItem>(source: T[], ...expected: ItemMatcher<T>[]): T[] {
+    return source.filter((item) => {
+        const index = expected.findIndex((t) => matchItem(item, t))
+        if (index !== -1) {
+            expected.splice(index, 1)
+        }
+        return index !== -1
+    })
+}
+
+type ItemButtonMatcher<B extends vscode.QuickInputButton = vscode.QuickInputButton> = string | RegExp | Partial<B>
+function matchItemButton<T extends vscode.QuickInputButton>(item: T, expected: ItemButtonMatcher<T>): boolean {
+    if (expected instanceof RegExp) {
+        return expected.test(item.tooltip ?? '')
+    } else if (typeof expected === 'string') {
+        return item.tooltip === expected
+    } else {
+        return JSON.stringify(item) === JSON.stringify(expected)
+    }
+}
+
+function matchItemButtons<T extends vscode.QuickInputButton>(source: T[], expected: ItemButtonMatcher<T>): T[] {
+    return source.filter((item) => matchItemButton(item, expected))
+}
+
+const throwError = (message: string, actual?: any, expected?: any) => {
+    throw new AssertionError({ message, actual, expected })
+}
+
+function assertItems<T extends vscode.QuickPickItem>(actual: T[], expected: ItemMatcher<T>[]): void {
+    if (actual.length !== expected.length) {
+        return throwError('Picker had different number of items', actual, expected)
+    }
+
+    for (const [index, actualItem] of actual.entries()) {
+        if (!matchItem(actualItem, expected[index])) {
+            throwError(`Unexpected item found at index ${index}`, actual, expected[index])
+        }
+    }
+}
+
+function assertItemButtons<T extends vscode.QuickInputButton>(actual: T[], expected: ItemButtonMatcher<T>[]): void {
+    if (actual.length !== expected.length) {
+        return throwError('Item had different number of buttons', actual, expected)
+    }
+
+    for (const [index, actualItem] of actual.entries()) {
+        if (!matchItemButton(actualItem, expected[index])) {
+            throwError(`Unexpected item button found at index ${index}`, actual, expected[index])
+        }
+    }
+}
+
+function findButtonOrThrow(
+    input: vscode.QuickPick<vscode.QuickPickItem> | vscode.InputBox,
+    button: string | vscode.QuickInputButton
+) {
+    const target = typeof button === 'string' ? input.buttons.filter((b) => b.tooltip === button)[0] : button
+    if (target === undefined) {
+        throwError(`Unable to find button: ${String(button)}`)
+    }
+
+    return target
+}
+
+function printMatcher<T extends vscode.QuickPickItem>(matcher: ItemMatcher<T>) {
+    matcher instanceof RegExp
+        ? matcher.source
+        : typeof matcher === 'string'
+          ? matcher
+          : JSON.stringify(matcher, undefined, 4)
+}
+
+function findItemOrThrow<T extends vscode.QuickPickItem>(picker: vscode.QuickPick<T>, item: ItemMatcher<T>): T {
+    const filteredItems = filterItems(picker)
+    const match = matchItems(filteredItems, item)[0]
+    if (match === undefined) {
+        throwError(`Unable to find item: ${printMatcher(item)}`)
+    }
+
+    return match
+}
+
+function findItemButtonOrThrow<T extends vscode.QuickInputButton>(
+    item: vscode.QuickPickItem,
+    itemButton: ItemButtonMatcher<T>
+) {
+    const itemButtons = item.buttons ? [...item.buttons] : []
+    const match = matchItemButtons(itemButtons, itemButton)[0]
+    if (match === undefined) {
+        throwError(`Unable to find item: ${printMatcher(item)}`)
+    }
+
+    return match
+}
+
+export class PickerTester<T extends vscode.QuickPickItem> {
+    public readonly onDidShow = this.extraEmitters.onDidShow.event
+
+    public constructor(
+        private readonly picker: vscode.QuickPick<T>,
+        private readonly triggers: Pick<EventEmitters<vscode.QuickPick<T>>, (typeof pickerEvents)[number]>,
+        private readonly extraEmitters: ReturnType<typeof createExtraEmitters>
+    ) {}
+
+    /*
+     * Waits until the picker is both enabled and not busy
+     */
+    public async untilReady(): Promise<void> {
+        await untilReady(this.picker, this.extraEmitters)
+    }
+
+    /**
+     * Presses a button.
+     *
+     * Can either use the exact button object or pass in a string to search for a tooltip.
+     * The tooltip string must be an exact match.
+     */
+    public pressButton(button: string | vscode.QuickInputButton): void {
+        this.triggers.onDidTriggerButton.fire(findButtonOrThrow(this.picker, button))
+    }
+
+    /**
+     * Press the button of a specific quick pick item
+     */
+    public pressItemButton(item: ItemMatcher<T>, itemButton: ItemButtonMatcher) {
+        const _item = findItemOrThrow(this.picker, item)
+        const _itemButton = findItemButtonOrThrow(_item, itemButton)
+        this.triggers.onDidTriggerItemButton.fire({ button: _itemButton, item: _item })
+    }
+
+    /**
+     * Attempts to accept the given item.
+     *
+     * If a string is given, then the item will be matched based off label. Otherwise a deep compare will be performed.
+     * Only exact matches will be accepted.
+     */
+    public acceptItem(item: ItemMatcher<T>): void {
+        this.picker.selectedItems = [findItemOrThrow(this.picker, item)]
+        this.triggers.onDidAccept.fire()
+    }
+
+    /**
+     * Attempts to accept all given items.
+     *
+     * See {@link acceptItem}.
+     */
+    public acceptItems(...items: ItemMatcher<T>[]): void {
+        this.picker.selectedItems = items.map((i) => findItemOrThrow(this.picker, i))
+        this.triggers.onDidAccept.fire()
+    }
+
+    /**
+     * Attempts to accept the default state. Used to test Multipick
+     *
+     * See {@link acceptItem}.
+     */
+    public acceptDefault(): void {
+        this.triggers.onDidAccept.fire()
+    }
+
+    /**
+     * Asserts that the given items are loaded in the QuickPick, in the given order.
+     *
+     * Must include all visible items. Filtered items will not be considered.
+     */
+    public assertItems(items: ItemMatcher<T>[]): void {
+        const filteredItems = filterItems(this.picker)
+        assertItems(filteredItems, items)
+    }
+
+    /**
+     * Asserts that the buttons of the given quick pick item exist.
+     */
+    public assertItemButtons<B extends vscode.QuickInputButton>(
+        item: ItemMatcher<T>,
+        itemButtons: ItemButtonMatcher<B>[]
+    ) {
+        const _item = findItemOrThrow(this.picker, item)
+        const buttons = _item.buttons ? [..._item.buttons] : []
+        assertItemButtons(buttons, itemButtons)
+    }
+
+    /**
+     * Asserts that the given items are loaded in the QuickPick, in the given order.
+     *
+     * This can be a subset of the currently visible items.
+     */
+    public assertContainsItems(...items: ItemMatcher<T>[]): void {
+        const filteredItems = filterItems(this.picker)
+        const match = matchItems(filteredItems, ...items)
+        // Check length here first for better error output
+        if (match.length !== items.length) {
+            return throwError(`Did not find all items`, match, items)
+        }
+        assertItems(match, items)
+    }
+
+    /**
+     * Asserts that the items are currently selected.
+     *
+     * Not applicable to single-item pickers. Order does not matter, but it must be
+     * the same items. Filtering is not applied.
+     */
+    public assertSelectedItems(...items: ItemMatcher<T>[]): void {
+        // Filtered items can still be selected for multi-item pickers
+        const sortedSelected = [...this.picker.selectedItems].sort((a, b) => a.label.localeCompare(b.label))
+        const sortedExpected = [...items].sort((a, b) => {
+            const labelA = typeof a === 'string' ? a : a instanceof RegExp ? a.source : a.label
+            const labelB = typeof b === 'string' ? b : b instanceof RegExp ? b.source : b.label
+            return labelA.localeCompare(labelB)
+        })
+        assertItems(sortedSelected, sortedExpected)
+    }
+
+    /**
+     * Asserts that the items are currently active.
+     *
+     * Order does not matter, but it must be the same items.
+     */
+    public assertActiveItems(...items: ItemMatcher<T>[]): void {
+        const filteredActive = filterItems(this.picker).filter((i) => this.picker.activeItems.includes(i))
+        const sortedActive = [...filteredActive].sort((a, b) => a.label.localeCompare(b.label))
+        const sortedExpected = [...items].sort((a, b) => {
+            const labelA = typeof a === 'string' ? a : a instanceof RegExp ? a.source : a.label
+            const labelB = typeof b === 'string' ? b : b instanceof RegExp ? b.source : b.label
+            return labelA.localeCompare(labelB)
+        })
+        assertItems(sortedActive, sortedExpected)
+    }
+
+    public findItemOrThrow(item: ItemMatcher<T>): T {
+        return findItemOrThrow(this.picker, item)
+    }
+
+    /**
+     * Sets the Quick Pick's filter. `undefined` removes any applied filters.
+     *
+     * This will affect what items are considered 'visible' by the tester depending on which
+     * 'matchOn___' fields have been set in the picker.
+     */
+    public async setFilter(value?: string | undefined): Promise<void> {
+        this.picker.value = value ?? ''
+
+        await whenAppliedFilter(this.picker)
+    }
+}
+
+function createExtraEmitters() {
+    return {
+        onDidShow: new vscode.EventEmitter<void>(),
+        onDidChangeBusy: new vscode.EventEmitter<boolean>(),
+        onDidChangeEnablement: new vscode.EventEmitter<boolean>(),
+    }
+}
+
+export type TestQuickPick<T extends vscode.QuickPickItem = vscode.QuickPickItem> = vscode.QuickPick<T> &
+    PickerTester<T> & {
+        readonly visible: boolean
+    }
+
+export function createTestQuickPick<T extends vscode.QuickPickItem>(picker: vscode.QuickPick<T>): TestQuickPick<T> {
+    const emitters = toRecord(pickerEvents, () => new vscode.EventEmitter<any>())
+    const triggers = toRecord(pickerEvents, (k) => emitters[k].fire.bind(emitters[k]))
+    const extraEmitters = createExtraEmitters()
+    for (const key of keys(emitters)) {
+        picker[key](triggers[key])
+    }
+
+    const state = { visible: false }
+    const tester = new PickerTester(picker, emitters, extraEmitters)
+    return new Proxy(picker, {
+        get: (target, prop: keyof TestQuickPick<T>, recv) => {
+            if (isKeyOf(prop, emitters)) {
+                return emitters[prop].event
+            }
+            if (isKeyOf(prop, tester)) {
+                return tester[prop].bind(tester)
+            }
+            if (isKeyOf(prop, state)) {
+                return state[prop]
+            }
+            if (prop === 'show') {
+                return function () {
+                    const val = target.show()
+                    if (!state.visible) {
+                        state.visible = true
+                        extraEmitters.onDidShow.fire()
+                    }
+                    return val
+                }
+            }
+            if (prop === 'hide') {
+                return function () {
+                    const val = target.hide()
+                    state.visible = false
+                    return val
+                }
+            }
+
+            return Reflect.get(target, prop, recv)
+        },
+        set: (target, prop: keyof TestQuickPick<T>, val, recv) => {
+            if (prop === 'busy' || prop === 'enabled') {
+                const oldVal = Reflect.get(target, prop, recv)
+                const didSet = Reflect.set(target, prop, val, recv)
+                if (didSet && oldVal !== val) {
+                    if (prop === 'busy') {
+                        extraEmitters.onDidChangeBusy.fire(val)
+                    } else if (prop === 'enabled') {
+                        extraEmitters.onDidChangeEnablement.fire(val)
+                    }
+                }
+                return didSet
+            }
+            return Reflect.set(target, prop, val, recv)
+        },
+        has: (target, prop) => {
+            return isKeyOf(prop, emitters) || isKeyOf(prop, tester) || isKeyOf(prop, state) || Reflect.has(target, prop)
+        },
+    }) as TestQuickPick<T>
+}
+
+class InputBoxTester {
+    public readonly onDidShow = this.extraEmitters.onDidShow.event
+
+    public constructor(
+        private readonly inputBox: vscode.InputBox,
+        private readonly triggers: Pick<EventEmitters<vscode.InputBox>, (typeof inputEvents)[number]>,
+        private readonly extraEmitters: ReturnType<typeof createExtraEmitters>
+    ) {}
+
+    /*
+     * Waits until the input box is both enabled and not busy
+     */
+    public async untilReady(): Promise<void> {
+        await untilReady(this.inputBox, this.extraEmitters)
+    }
+
+    /**
+     * Presses a button.
+     * Can either use the exact button object or pass in a string to search for a tooltip.
+     * The tooltip string must be an exact match.
+     */
+    public pressButton(button: string | vscode.QuickInputButton): void {
+        this.triggers.onDidTriggerButton.fire(findButtonOrThrow(this.inputBox, button))
+    }
+
+    /**
+     * Sets the current value _and_ attempts accept the input.
+     */
+    public acceptValue(value: string): void {
+        this.inputBox.value = value
+        this.triggers.onDidChangeValue.fire(value)
+        this.triggers.onDidAccept.fire()
+    }
+}
+
+export type TestInputBox = vscode.InputBox &
+    InputBoxTester & {
+        readonly visible: boolean
+    }
+
+export function createTestInputBox(inputBox: vscode.InputBox): TestInputBox {
+    const emitters = toRecord(inputEvents, () => new vscode.EventEmitter<any>())
+    const triggers = toRecord(inputEvents, (k) => emitters[k].fire.bind(emitters[k]))
+    const extraEmitters = createExtraEmitters()
+
+    for (const key of keys(emitters)) {
+        inputBox[key](triggers[key])
+    }
+
+    const state = { visible: false }
+    const tester = new InputBoxTester(inputBox, emitters, extraEmitters)
+    return new Proxy(inputBox, {
+        get: (target, prop: keyof TestInputBox, recv) => {
+            if (isKeyOf(prop, emitters)) {
+                return emitters[prop].event
+            }
+            if (isKeyOf(prop, tester)) {
+                return tester[prop].bind(tester)
+            }
+            if (isKeyOf(prop, state)) {
+                return state[prop]
+            }
+            if (prop === 'show') {
+                return function () {
+                    const val = target.show()
+                    if (!state.visible) {
+                        state.visible = true
+                        extraEmitters.onDidShow.fire()
+                    }
+                    return val
+                }
+            }
+            if (prop === 'hide') {
+                return function () {
+                    const val = target.hide()
+                    state.visible = false
+                    return val
+                }
+            }
+
+            return Reflect.get(target, prop, recv)
+        },
+        set: (target, prop: keyof TestInputBox, val, recv) => {
+            if (prop === 'busy' || prop === 'enabled') {
+                const oldVal = Reflect.get(target, prop, recv)
+                const didSet = Reflect.set(target, prop, val, recv)
+                if (didSet && oldVal !== val) {
+                    if (prop === 'busy') {
+                        extraEmitters.onDidChangeBusy.fire(val)
+                    } else if (prop === 'enabled') {
+                        extraEmitters.onDidChangeEnablement.fire(val)
+                    }
+                }
+                return didSet
+            }
+            if (prop === 'value') {
+                const oldVal = Reflect.get(target, prop, recv)
+                const didSet = Reflect.set(target, prop, val, recv)
+                if (didSet && oldVal !== val) {
+                    triggers.onDidChangeValue(val)
+                }
+                return didSet
+            }
+            return Reflect.set(target, prop, val, recv)
+        },
+    }) as TestInputBox
+}
+
+export function isTestInputBox(quickInput: TestInputBox | TestQuickPick | undefined): quickInput is TestInputBox {
+    return isNonNullable(quickInput) && !isTestQuickPick(quickInput)
+}
+
+export function isTestQuickPick(quickInput: TestInputBox | TestQuickPick | undefined): quickInput is TestQuickPick {
+    return isNonNullable(quickInput) && 'onDidShow' in quickInput && 'items' in quickInput
+}
diff --git a/packages/core/src/test/shared/vscode/runCommand.test.ts b/packages/core/src/test/shared/vscode/runCommand.test.ts
new file mode 100644
index 00000000000..ad99c48c374
--- /dev/null
+++ b/packages/core/src/test/shared/vscode/runCommand.test.ts
@@ -0,0 +1,309 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../../../shared/extensionGlobals'
+
+import os from 'os'
+import { promises as fsPromises } from 'fs' // eslint-disable-line no-restricted-imports
+import fs from '../../../shared/fs/fs'
+import * as sinon from 'sinon'
+import assert from 'assert'
+import { ToolkitError } from '../../../shared/errors'
+import { CancellationError } from '../../../shared/utilities/timeoutUtils'
+import { Commands, defaultTelemetryThrottleMs } from '../../../shared/vscode/commands2'
+import { assertTelemetry, getMetrics, installFakeClock } from '../../testUtil'
+import { getTestWindow } from '../../shared/vscode/window'
+import { makeTemporaryToolkitFolder } from '../../../shared'
+import path from 'path'
+import { fakeErrorChain, getAwsServiceError } from '../errors.test'
+
+async function throwMe(errorOrFn?: Error | (() => Promise<never>)): Promise<void | never> {
+    if (errorOrFn && !(errorOrFn instanceof Error)) {
+        await errorOrFn()
+    }
+
+    if (errorOrFn) {
+        throw errorOrFn
+    }
+}
+
+const testCommand = Commands.register({ id: '_test.throwable', telemetryThrottleMs: false }, throwMe)
+
+describe('runCommand', function () {
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    it('emits a telemetry metric after the command terminates (success)', async function () {
+        await testCommand.execute()
+
+        assertTelemetry('vscode_executeCommand', {
+            passive: true,
+            command: testCommand.id,
+            result: 'Succeeded',
+        })
+    })
+
+    it('emits a telemetry metric after the command terminates (cancel)', async function () {
+        await testCommand.execute(new CancellationError('user'))
+
+        assertTelemetry('vscode_executeCommand', {
+            passive: true,
+            command: testCommand.id,
+            result: 'Cancelled',
+            reason: 'user',
+        })
+    })
+
+    it('emits a telemetry metric after the command terminates (failure)', async function () {
+        const viewLogsDialog = getTestWindow().waitForMessage(/Something failed/)
+
+        await Promise.all([
+            viewLogsDialog.then((dialog) => dialog.close()),
+            testCommand.execute(new ToolkitError('Something failed', { code: 'SomethingFailed' })),
+        ])
+
+        assertTelemetry('vscode_executeCommand', {
+            passive: true,
+            command: testCommand.id,
+            result: 'Failed',
+            reason: 'SomethingFailed',
+        })
+    })
+
+    describe('shows error', function () {
+        let tempFolder: string
+        let unwritableFile: string
+
+        before(async function () {
+            tempFolder = await makeTemporaryToolkitFolder()
+            unwritableFile = path.join(tempFolder, 'unwritableFile')
+            await fsPromises.writeFile(unwritableFile, 'foo', { mode: 0o400 })
+        })
+
+        after(async function () {
+            await fs.delete(tempFolder, { recursive: true })
+        })
+
+        async function runAndWaitForMessage(expectedMsg: string | RegExp, willThrow: () => Promise<never>) {
+            const viewLogsDialog = getTestWindow().waitForMessage(expectedMsg)
+
+            await Promise.all([viewLogsDialog.then((dialog) => dialog.close()), testCommand.execute(willThrow)])
+        }
+
+        function assertTelem(reason: string) {
+            assertTelemetry('vscode_executeCommand', {
+                passive: true,
+                command: testCommand.id,
+                result: 'Failed',
+                reason: reason,
+            })
+        }
+
+        it('vscode ISDIR', async function () {
+            const pat = (() => {
+                switch (os.platform()) {
+                    case 'win32':
+                        return /EPERM: operation not permitted/
+                    default:
+                        return /EISDIR: illegal operation on a directory/
+                }
+            })()
+            await runAndWaitForMessage(pat, async () => {
+                // Try to write to the current directory. 💩
+                const err = await fs.writeFile('.', 'foo').catch((e) => e)
+                const err2 = new Error('generic error')
+                ;(err2 as any).cause = err
+                throw err2
+            })
+            // TODO: commands.run() should use getBestError (if the top error is not ToolkitError)?
+            // assertTelem('FileExists')
+            assertTelem('Error')
+        })
+
+        it('nodejs ISDIR', async function () {
+            await runAndWaitForMessage(/EISDIR: illegal operation on a directory/, async () => {
+                // Try to write to the current directory. 💩
+                const err = await fsPromises.writeFile('.', 'foo').catch((e) => e)
+                const err2 = new Error('generic error')
+                ;(err2 as any).cause = err
+                throw err2
+            })
+            // TODO: commands.run() should use getBestError (if the top error is not ToolkitError)?
+            // assertTelem('EISDIR')
+            assertTelem('Error')
+        })
+
+        it('toolkit `PermissionsError`', async function () {
+            const expectedMsg =
+                os.platform() === 'win32'
+                    ? /EPERM: operation not permitted/
+                    : /incorrect permissions. Expected rw-, found r--/
+
+            const viewLogsDialog = getTestWindow().waitForMessage(expectedMsg)
+
+            await Promise.all([
+                viewLogsDialog.then((dialog) => dialog.close()),
+                testCommand.execute(async () => {
+                    const err = await fs.writeFile(unwritableFile, 'bar').catch((e) => e)
+                    throw fakeErrorChain(err, new Error('error 3'))
+                }),
+            ])
+
+            // TODO: commands.run() should use getBestError (if the top error is not ToolkitError)?
+            // assertTelem('InvalidPermissions')
+            assertTelem('Error')
+        })
+
+        it('nodejs EACCES (not wrapped by toolkit `PermissionsError`)', async function () {
+            const expectedMsg =
+                os.platform() === 'win32' ? /EPERM: operation not permitted/ : /EACCES: permission denied/
+            const viewLogsDialog = getTestWindow().waitForMessage(expectedMsg)
+
+            await Promise.all([
+                viewLogsDialog.then((dialog) => dialog.close()),
+                testCommand.execute(async () => {
+                    const err = await fsPromises.writeFile(unwritableFile, 'bar').catch((e) => e)
+                    throw fakeErrorChain(err, new Error('error 3'))
+                }),
+            ])
+
+            // TODO: commands.run() should use getBestError (if the top error is not ToolkitError)?
+            // assertTelem('EACCES')
+            assertTelem('Error')
+        })
+
+        it('AWS service error', async function () {
+            const expectedMsg = /Invalid client ID provided/
+            const viewLogsDialog = getTestWindow().waitForMessage(expectedMsg)
+            await Promise.all([
+                viewLogsDialog.then((dialog) => dialog.close()),
+                testCommand.execute(async () => {
+                    const err = await getAwsServiceError()
+
+                    throw err
+                }),
+            ])
+
+            assertTelem('InvalidRequestException')
+            const metric = getMetrics('vscode_executeCommand')[0]
+            assert.match(metric.awsAccount ?? '', /not-set|n\/a|\d+/)
+            assert.match(metric.awsRegion ?? '', /not-set|\w+-\w+-\d+/)
+            assert.match(String(metric.duration) ?? '', /\d+/)
+            assert.match(metric.requestId ?? '', /[a-z0-9-]+/)
+        })
+    })
+
+    describe('telemetry throttling', function () {
+        it('collapses events that occur within a brief period of time', async function () {
+            const command = Commands.register('_test.telemetry', () => {})
+            await command.execute()
+            await command.execute()
+            await command.execute()
+
+            const events = globals.telemetry.logger
+                .query({ metricName: 'vscode_executeCommand' })
+                .filter((event) => event.command === command.id)
+
+            assert.strictEqual(events.length, 1)
+            assertTelemetry('vscode_executeCommand', {
+                passive: true,
+                command: command.id,
+                result: 'Succeeded',
+            })
+        })
+
+        it('does not collapse events marked with a telemetry name', async function () {
+            const command = Commands.register({ id: '_test.telemetryName', telemetryName: 'aws_help' }, () => {})
+            await command.execute()
+            await command.execute()
+            await command.execute()
+
+            const events = globals.telemetry.logger.query({ metricName: 'aws_help' })
+            assert.strictEqual(events.length, 3)
+        })
+
+        describe('`compositeKey` parameter', async function () {
+            let clock: ReturnType<typeof installFakeClock>
+
+            beforeEach(function () {
+                clock = installFakeClock()
+            })
+
+            afterEach(function () {
+                clock.uninstall()
+            })
+
+            it('"source" field makes the metric unique', async function () {
+                const command = Commands.register(
+                    {
+                        id: '_test.telemetryName.sourceField',
+                        compositeKey: { 1: 'source' },
+                    },
+                    (irrelevantArg: any, source: string) => {}
+                )
+
+                await command.execute(1, 'a') // events[0]
+                await command.execute({}, 'b') // events[1]
+                // These are throttled and increment the debounce count
+                await command.execute([], 'a')
+                await command.execute([], 'a')
+                await command.execute([], 'b')
+                // Forward time to after throttle period is over
+                clock.tick(defaultTelemetryThrottleMs)
+                await command.execute([], 'a') // events[2]
+                await command.execute(undefined, 'b') // events[3]
+
+                // assert expected telemetry events
+                const events = globals.telemetry.logger.query({ metricName: 'vscode_executeCommand' })
+                assert.strictEqual(events.length, 4)
+                const event0 = events[0]
+                assert.strictEqual(event0['source'], 'a')
+                assert.strictEqual(event0['debounceCount'], undefined)
+                const event1 = events[1]
+                assert.strictEqual(event1['source'], 'b')
+                assert.strictEqual(event1['debounceCount'], undefined)
+                const event2 = events[2]
+                assert.strictEqual(event2['source'], 'a')
+                assert.strictEqual(event2['debounceCount'], '2')
+                const event3 = events[3]
+                assert.strictEqual(event3['source'], 'b')
+                assert.strictEqual(event3['debounceCount'], '1')
+            })
+
+            it('throttles events when compositeKey not set', async function () {
+                const command = Commands.register('_test.telemetryName.noCompositeKey', (obj: any) => {})
+
+                await command.execute({ id: 'a' })
+                // These will be throttled
+                await command.execute(undefined)
+                await command.execute('a')
+                await command.execute('b')
+
+                const events = globals.telemetry.logger.query({ metricName: 'vscode_executeCommand' })
+                assert.strictEqual(events.length, 1)
+            })
+
+            it('sets source="unset" if arg not provided', async function () {
+                // We do this so that an error isn't thrown but will indicate
+                // something is wrong in telemetry that needs to be fixed
+                const command = Commands.register(
+                    {
+                        id: '_test.telemetryName.outOfIndex',
+                        compositeKey: { 1: 'source' }, // out of index
+                    },
+                    (source: any) => {}
+                )
+                await command.execute(1)
+                assertTelemetry('vscode_executeCommand', {
+                    passive: true,
+                    command: command.id,
+                    result: 'Succeeded',
+                    source: 'vscodeUI',
+                })
+            })
+        })
+    })
+})
diff --git a/packages/core/src/test/shared/vscode/statusbar.ts b/packages/core/src/test/shared/vscode/statusbar.ts
new file mode 100644
index 00000000000..fac8fc48727
--- /dev/null
+++ b/packages/core/src/test/shared/vscode/statusbar.ts
@@ -0,0 +1,128 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { isKeyOf } from '../../../shared/utilities/tsUtils'
+
+export type TestStatusBarItem = vscode.StatusBarItem & {
+    readonly visible: boolean
+    readonly disposed: boolean
+    readonly onDidShow: vscode.Event<void>
+    readonly onDidHide: vscode.Event<void>
+}
+
+export function createTestStatusBarItem(item: vscode.StatusBarItem): TestStatusBarItem {
+    const state = { visible: false, disposed: false }
+    const emitters = {
+        onDidShow: new vscode.EventEmitter<void>(),
+        onDidHide: new vscode.EventEmitter<void>(),
+    }
+
+    return new Proxy(item, {
+        set: (target, prop, val) => Reflect.set(target, prop, val, target),
+        get: (target, prop: keyof TestStatusBarItem, recv) => {
+            if (isKeyOf(prop, state)) {
+                return state[prop]
+            }
+            if (isKeyOf(prop, emitters)) {
+                return emitters[prop].event
+            }
+            if (prop === 'show') {
+                return function () {
+                    const val = target.show()
+                    if (!state.visible) {
+                        state.visible = true
+                        emitters.onDidShow.fire()
+                    }
+                    return val
+                }
+            }
+            if (prop === 'hide') {
+                return function () {
+                    const val = target.hide()
+                    if (state.visible) {
+                        state.visible = false
+                        emitters.onDidHide.fire()
+                    }
+                    return val
+                }
+            }
+            if (prop === 'dispose') {
+                return function () {
+                    state.disposed = true
+                    return vscode.Disposable.from(target, ...Object.values(emitters)).dispose()
+                }
+            }
+            return Reflect.get(target, prop, recv)
+        },
+    }) as TestStatusBarItem
+}
+
+export class TestStatusBar implements Pick<typeof vscode.window, 'setStatusBarMessage' | 'createStatusBarItem'> {
+    readonly #items: TestStatusBarItem[] = []
+
+    public constructor(private readonly window: typeof vscode.window) {}
+
+    public get items(): Readonly<TestStatusBarItem[]> {
+        return [...this.#items]
+    }
+
+    /**
+     * Returns the text of all _visible_ status bar items
+     *
+     * This is sorted in the order they would normally appear, i.e. left to right
+     */
+    public get messages(): string[] {
+        return this.#items.filter((i) => i.visible).map((i) => i.text)
+    }
+
+    public setStatusBarMessage(text: string, hideWhen?: number | Thenable<any>): vscode.Disposable {
+        const item = this.createStatusBarItem(vscode.StatusBarAlignment.Right)
+        item.text = text
+        item.show()
+
+        if (typeof hideWhen === 'number') {
+            setTimeout(() => item.dispose(), hideWhen)
+        } else if (hideWhen !== undefined) {
+            hideWhen.then(
+                () => item.dispose(),
+                () => item.dispose()
+            )
+        }
+
+        return item
+    }
+
+    public createStatusBarItem(
+        alignmentOrId?: vscode.StatusBarAlignment | string,
+        priorityOrAlignment?: number | vscode.StatusBarAlignment,
+        priorityArg?: number
+    ): TestStatusBarItem {
+        // let id: string | undefined
+        let alignment: number | undefined
+        let priority: number | undefined
+
+        if (typeof alignmentOrId === 'string') {
+            // id = alignmentOrId
+            alignment = priorityOrAlignment
+            priority = priorityArg
+        } else {
+            alignment = alignmentOrId
+            priority = priorityOrAlignment
+        }
+
+        const item = createTestStatusBarItem(this.window.createStatusBarItem(alignment, priority))
+        this.#items.push(item)
+        this.#items.sort((a, b) => {
+            if (a.alignment === b.alignment) {
+                return (a.priority ?? 0) - (b.priority ?? 0)
+            }
+
+            return a.alignment === vscode.StatusBarAlignment.Left ? -1 : 1
+        })
+
+        return item
+    }
+}
diff --git a/packages/core/src/test/shared/vscode/testUtils.ts b/packages/core/src/test/shared/vscode/testUtils.ts
new file mode 100644
index 00000000000..ba7ff8bb728
--- /dev/null
+++ b/packages/core/src/test/shared/vscode/testUtils.ts
@@ -0,0 +1,45 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { Command, Commands } from '../../../shared/vscode/commands2'
+
+type Events<T> = {
+    [P in keyof T]: T[P] extends vscode.Event<any> ? P & string : never
+}[keyof T]
+export type EventEmitters<T> = {
+    [P in Events<T>]: T[P] extends vscode.Event<infer U> ? vscode.EventEmitter<U> : never
+}
+
+/**
+ * Creates a copy of the target command, injecting dependencies and registering it with a new id.
+ *
+ * ### Example
+ * ```ts
+ * const foo = Commands.declare('aws.foo', (memento: vscode.Memento) => () => memento.get<string>('foo'))
+ * const testMemento = new FakeMemento()
+ * const testFoo = testCommand(foo, testMemento)
+ *
+ * // Test commands are always prefixed with 'test.'
+ * assert.strictEqual(testFoo.id, 'test.aws.foo')
+ *
+ * await testMemento.update('foo', 'bar')
+ * assert.strictEqual(await testFoo.execute(), 'bar')
+ *
+ * // Clean-up the command afterwards
+ * testFoo.dispose()
+ * ```
+ */
+export function testCommand<T extends (...args: any[]) => unknown, U extends any[]>(
+    command: ReturnType<typeof Commands.declare<T, U>>,
+    ...args: U
+): Command<T> & vscode.Disposable {
+    const testCommands = new Commands()
+    const testId = `test.${command.id}`
+    // `command` refers to the hidden 'CommandResource' class in 'commands2.ts'
+    const resource = (command as any).resource as { id: string; factory: (...args: U) => any; info: any }
+
+    return testCommands.register({ ...resource.info, id: testId }, resource.factory(...args))
+}
diff --git a/packages/core/src/test/shared/vscode/uriHandler.test.ts b/packages/core/src/test/shared/vscode/uriHandler.test.ts
new file mode 100644
index 00000000000..5a6d2a646ac
--- /dev/null
+++ b/packages/core/src/test/shared/vscode/uriHandler.test.ts
@@ -0,0 +1,90 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import { SearchParams, UriHandler } from '../../../shared/vscode/uriHandler'
+
+describe('UriHandler', function () {
+    const testPath = '/my/path'
+    let uriHandler: UriHandler
+
+    function makeUri(query?: string): vscode.Uri {
+        return vscode.Uri.parse(`scheme://authority${testPath}${query !== undefined ? `?${query}` : ''}`)
+    }
+
+    beforeEach(function () {
+        uriHandler = new UriHandler()
+    })
+
+    it('can register a handler', async function () {
+        uriHandler.onPath(testPath, (q) => assert.strictEqual(q.get('key'), 'value'))
+        return uriHandler.handleUri(makeUri('key=value'))
+    })
+
+    it('uses parser if available', async function () {
+        uriHandler.onPath(
+            testPath,
+            (q) => assert.strictEqual(q.myNumber, 123),
+            (q: SearchParams) => ({ myNumber: Number(q.get('myString')) })
+        )
+        return uriHandler.handleUri(makeUri('myString=123'))
+    })
+
+    it('can handle lists', async function () {
+        uriHandler.onPath(testPath, (q) => assert.deepStrictEqual(q.get('list'), ['1', '2', '3']))
+        return uriHandler.handleUri(makeUri('list=1&list=2&list=3'))
+    })
+
+    it('can dispose handlers', async function () {
+        return new Promise((resolve, reject) => {
+            uriHandler.onPath(testPath, () => reject(new Error('this should not be called'))).dispose()
+            return uriHandler.handleUri(makeUri()).then(resolve)
+        })
+    })
+
+    it('throws when registering handler for same path', function () {
+        uriHandler.onPath(testPath, () => {})
+        assert.throws(() => uriHandler.onPath(testPath, () => {}))
+    })
+
+    it('catches errors thrown by the parser', async function () {
+        const handler = () => {
+            throw new Error('this should not be called')
+        }
+        const parser = () => {
+            throw new Error()
+        }
+
+        uriHandler.onPath(testPath, handler, parser)
+        await assert.doesNotReject(uriHandler.handleUri(makeUri('key=value')))
+    })
+
+    it('catches errors thrown by the handler', async function () {
+        const handler = () => {
+            throw new Error()
+        }
+
+        uriHandler.onPath(testPath, handler)
+        return assert.doesNotReject(uriHandler.handleUri(makeUri()))
+    })
+})
+
+describe('SearchParams', function () {
+    const params = new SearchParams({ foo: 'bar', baz: 'qaz', number: '1' })
+
+    it('can map params', function () {
+        assert.strictEqual(params.getAs('number', Number), 1)
+    })
+
+    it('can convert keys to an object', function () {
+        assert.deepStrictEqual(params.getFromKeys('foo', 'baz', 'xyz'), { foo: 'bar', baz: 'qaz', xyz: undefined })
+    })
+
+    it('can throw if the parameter does not exist', function () {
+        assert.throws(() => params.getOrThrow('foob', ''))
+        assert.throws(() => params.getOrThrow('foob', new Error()))
+    })
+})
diff --git a/packages/core/src/test/shared/vscode/window.ts b/packages/core/src/test/shared/vscode/window.ts
new file mode 100644
index 00000000000..c01cae66ded
--- /dev/null
+++ b/packages/core/src/test/shared/vscode/window.ts
@@ -0,0 +1,512 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { isKeyOf, isNonNullable, isThenable, Mutable } from '../../../shared/utilities/tsUtils'
+import { SeverityLevel, ShownMessage, TestFileSystemDialog, TestMessage } from './message'
+import { createTestInputBox, createTestQuickPick, TestInputBox, TestQuickPick } from './quickInput'
+import { TestStatusBar } from './statusbar'
+
+type Window = typeof vscode.window
+
+export interface TestWindow {
+    /**
+     * The status bar contains a list of statuses and is located at the bottom of the window
+     *
+     * Affected by:
+     * - {@link vscode.window.withProgress}
+     * - {@link vscode.window.setStatusBarMessage}
+     * - {@link vscode.window.createStatusBarItem}
+     */
+    readonly statusBar: TestStatusBar
+
+    /**
+     * Only a single quick input (quick pick or input box) can be visible at any time
+     *
+     * Affected by:
+     * - {@link vscode.window.showInputBox}
+     * - {@link vscode.window.showQuickPick}
+     * - {@link vscode.window.createInputBox}
+     * - {@link vscode.window.createQuickPick}
+     */
+    readonly activeQuickInput: TestQuickPick | TestInputBox | undefined
+
+    /**
+     * A list of all shown messages
+     *
+     * Affected by:
+     * - {@link vscode.window.withProgress}
+     * - {@link vscode.window.showInformationMessage}
+     * - {@link vscode.window.showWarningMessage}
+     * - {@link vscode.window.showErrorMessage}
+     */
+    readonly shownMessages: ShownMessage[]
+
+    /**
+     * A list of all shown file system dialogs
+     *
+     * Affected by:
+     * - {@link vscode.window.showOpenDialog}
+     * - {@link vscode.window.showSaveDialog}
+     */
+    readonly shownDialogs: TestFileSystemDialog[]
+
+    /**
+     * A list of all shown quick picks
+     *
+     * Affected by:
+     * - {@link vscode.window.showQuickPick}
+     * - {@link vscode.window.createQuickPick}
+     */
+    readonly shownQuickPicks: TestQuickPick[]
+
+    /**
+     * A list of all shown input boxes
+     *
+     * Affected by:
+     * - {@link vscode.window.showInputBox}
+     * - {@link vscode.window.createInputBox}
+     */
+    readonly shownInputBoxes: TestInputBox[]
+
+    /**
+     * Fired whenever a file system dialog is shown (see {@link shownDialogs})
+     */
+    readonly onDidShowDialog: vscode.Event<TestFileSystemDialog>
+
+    /**
+     * Fired whenever a notification or modal message is shown (see {@link shownMessages})
+     */
+    readonly onDidShowMessage: vscode.Event<ShownMessage>
+
+    /**
+     * Fired whenever a picker is shown (see {@link shownQuickPicks})
+     */
+    readonly onDidShowQuickPick: vscode.Event<TestQuickPick>
+
+    /**
+     * Fired whenever an input box is shown (see {@link shownInputBoxes})
+     */
+    readonly onDidShowInputBox: vscode.Event<TestInputBox>
+
+    /**
+     * Fired whenever a listener callback attached to the test window throws an error
+     */
+    readonly onError: vscode.Event<{ event: vscode.Disposable; error: unknown }>
+
+    /**
+     * Waits for a message to appear that matches the expected text
+     *
+     * Rejects if no message is found within the given timeout period (milliseconds)
+     */
+    waitForMessage(expected: string | RegExp, timeout?: number): Promise<ShownMessage>
+    getFirstMessage(): ShownMessage
+    getSecondMessage(): ShownMessage
+    getThirdMessage(): ShownMessage
+    dispose(): void
+}
+
+type StateKeys<T> = { [P in keyof T]: T[P] extends (...args: any[]) => any ? never : P }[keyof T]
+type State<T> = Mutable<Pick<T, StateKeys<T>>>
+
+/**
+ * A test window proxies {@link vscode.window}, intercepting calls whilst
+ * allowing for introspection and mocking as-needed.
+ */
+export function createTestWindow(workspace = vscode.workspace): Window & TestWindow {
+    // TODO: write mix-in Proxy factory function
+    const emitters = {
+        onDidShowMessage: createTestEventEmitter<ShownMessage>(),
+        onDidShowQuickPick: createTestEventEmitter<TestQuickPick>(),
+        onDidShowInputBox: createTestEventEmitter<TestInputBox>(),
+        onDidShowDialog: createTestEventEmitter<TestFileSystemDialog>(),
+    }
+
+    const state: State<TestWindow> = {
+        activeQuickInput: undefined,
+        shownMessages: [],
+        shownQuickPicks: [],
+        shownInputBoxes: [],
+        shownDialogs: [],
+        statusBar: new TestStatusBar(vscode.window),
+    }
+
+    const onErrorEmitter = new vscode.EventEmitter<{ event: vscode.Disposable; error: unknown }>()
+    for (const emitter of Object.values(emitters)) {
+        emitter.onError(onErrorEmitter.fire.bind(onErrorEmitter))
+    }
+
+    function dispose() {
+        vscode.Disposable.from(...Object.values(emitters), onErrorEmitter).dispose()
+    }
+
+    function fireOnDidShowMessage(message: ShownMessage) {
+        state.shownMessages.push(message)
+        emitters.onDidShowMessage.fire(message)
+    }
+
+    function fireOnDidShowDialog(dialog: TestFileSystemDialog) {
+        state.shownDialogs.push(dialog)
+        emitters.onDidShowDialog.fire(dialog)
+    }
+
+    function fireOnDidShowQuickPick(picker: TestQuickPick) {
+        if (!state.shownQuickPicks.includes(picker)) {
+            state.shownQuickPicks.push(picker)
+        }
+        emitters.onDidShowQuickPick.fire(picker)
+        setActiveQuickInput(picker)
+    }
+
+    function fireOnDidShowInputBox(inputBox: TestInputBox) {
+        if (!state.shownInputBoxes.includes(inputBox)) {
+            state.shownInputBoxes.push(inputBox)
+        }
+        emitters.onDidShowInputBox.fire(inputBox)
+        setActiveQuickInput(inputBox)
+    }
+
+    function setActiveQuickInput(input: TestQuickPick | TestInputBox) {
+        state.activeQuickInput?.hide()
+        state.activeQuickInput = input
+        const sub = input.onDidHide(() => {
+            sub.dispose()
+            if (state.activeQuickInput === input) {
+                state.activeQuickInput = undefined
+            }
+        })
+    }
+
+    const target = vscode.window
+    function createQuickPick<T extends vscode.QuickPickItem>(
+        ...args: Parameters<typeof vscode.window.createQuickPick<T>>
+    ): ReturnType<typeof vscode.window.createQuickPick<T>> {
+        const picker = createTestQuickPick<T>(target.createQuickPick(...args))
+        picker.onDidShow(() => fireOnDidShowQuickPick(picker))
+
+        return picker
+    }
+
+    function showQuickPick<T extends vscode.QuickPickItem>(
+        ...args: Parameters<typeof vscode.window.showQuickPick<T>>
+    ): ReturnType<typeof vscode.window.showQuickPick<T>> {
+        const [items, options, token] = args
+        const picker = createQuickPick()
+        const onDidSelectItem = options?.onDidSelectItem?.bind(options)
+        if (onDidSelectItem) {
+            // eslint-disable-next-line unicorn/no-array-for-each
+            picker.onDidChangeSelection((items) => items.forEach(onDidSelectItem))
+        }
+
+        const stringItem = Symbol()
+        const setItems = (arg: string[] | vscode.QuickPickItem[]) => {
+            picker.items = arg.map((v) =>
+                typeof v !== 'string'
+                    ? v
+                    : {
+                          label: v,
+                          [stringItem]: v,
+                      }
+            )
+        }
+
+        let itemsPromise: Promise<T[]>
+
+        if (Array.isArray(items)) {
+            itemsPromise = Promise.resolve(items)
+        } else if (items instanceof Promise) {
+            itemsPromise = items
+        } else {
+            // Not sure what this type is
+            throw new TypeError('Not implemented')
+        }
+
+        picker.canSelectMany = options?.canPickMany ?? false
+        picker.placeholder = options?.placeHolder
+        picker.ignoreFocusOut = options?.ignoreFocusOut ?? false
+        picker.matchOnDetail = options?.matchOnDetail ?? false
+        picker.matchOnDescription = options?.matchOnDescription ?? false
+        token?.onCancellationRequested(() => picker.dispose())
+
+        return itemsPromise.then((items) => {
+            setItems(items)
+
+            return new Promise((resolve, reject) => {
+                picker.onDidHide(() => resolve(undefined))
+                picker.onDidAccept(() => {
+                    const selected = picker.selectedItems.map((i) =>
+                        isKeyOf(stringItem, i) ? (i[stringItem] as string) : i
+                    )
+                    resolve(picker.canSelectMany ? (selected as any) : (selected[0] as any))
+                })
+
+                picker.show()
+            })
+        })
+    }
+
+    function createInputBox(...args: Parameters<Window['createInputBox']>): ReturnType<Window['createInputBox']> {
+        const inputBox = createTestInputBox(target.createInputBox(...args))
+        inputBox.onDidShow(() => fireOnDidShowInputBox(inputBox))
+
+        return inputBox
+    }
+
+    function showInputBox(...args: Parameters<Window['showInputBox']>): ReturnType<Window['showInputBox']> {
+        const [options, token] = args
+        const inputBox = createInputBox()
+        const validateInput = options?.validateInput?.bind(options)
+        if (validateInput) {
+            inputBox.onDidChangeValue((v) => {
+                const validationMessage = validateInput(v)
+                if (
+                    !isThenable(validationMessage) ||
+                    typeof validationMessage === 'string' ||
+                    validationMessage === undefined
+                ) {
+                    inputBox.validationMessage = isNonNullable(validationMessage) ? validationMessage : undefined
+                } else {
+                    validationMessage?.then(
+                        (val) => (val || val === undefined ? (inputBox.validationMessage = val) : void 0),
+                        (e) => {
+                            console.error('showInputBox.validationMessage: %s', (e as Error).message)
+                        }
+                    )
+                }
+            })
+        }
+
+        inputBox.placeholder = options?.placeHolder
+        inputBox.password = options?.password ?? false
+        inputBox.value = options?.value ?? ''
+        inputBox.ignoreFocusOut = options?.ignoreFocusOut ?? false
+        inputBox.prompt = options?.prompt
+        token?.onCancellationRequested(() => inputBox.dispose())
+
+        return new Promise<string | undefined>((resolve, reject) => {
+            inputBox.onDidHide(() => resolve(undefined))
+            inputBox.onDidAccept(() => resolve(inputBox.value))
+
+            inputBox.show()
+        })
+    }
+
+    function withProgress<R>(
+        ...args: Parameters<typeof vscode.window.withProgress<R>>
+    ): ReturnType<typeof vscode.window.withProgress<R>> {
+        const [options, task] = args
+        const tokenSource = new vscode.CancellationTokenSource()
+        if (options.location === vscode.ProgressLocation.Notification) {
+            const progress: Parameters<typeof task>[0] & { notification?: ShownMessage } = {
+                report(value) {
+                    if (!this.notification) {
+                        throw new Error('Progress was reported before the notification was shown')
+                    }
+                    this.notification.updateProgress(value)
+                },
+            }
+            const cancelItem: vscode.MessageItem = { title: 'Cancel' }
+            const items = options.cancellable ? [cancelItem] : []
+            const showMessage = TestMessage.createShowMessageFn(SeverityLevel.Progress, (message) => {
+                progress.notification = message
+                fireOnDidShowMessage(message)
+            })
+
+            void showMessage(options.title ?? '', ...items).then((resp) => {
+                if (resp === cancelItem) {
+                    tokenSource.cancel()
+                }
+            })
+
+            return Promise.resolve(task(progress, tokenSource.token)).finally(() => {
+                progress.notification?.dispose()
+                tokenSource.dispose()
+            })
+        } else if (options.location === vscode.ProgressLocation.Window) {
+            const statusBarItem = state.statusBar.createStatusBarItem()
+            const progress: Parameters<typeof task>[0] = {
+                report(value) {
+                    const message = value.message ?? ''
+                    statusBarItem.text = options.title ? `${options.title}${message ? ': ' : ''}${message}` : message
+                },
+            }
+            statusBarItem.show()
+
+            return Promise.resolve(task(progress, tokenSource.token)).finally(() => {
+                statusBarItem.dispose()
+                tokenSource.dispose()
+            })
+        }
+
+        return target.withProgress(options, task)
+    }
+
+    function waitForMessage(expected: string | RegExp, timeout: number = 5000) {
+        return new Promise<ShownMessage>((resolve, reject) => {
+            const found = state.shownMessages.find((m) => m.visible && m.message.match(expected))
+            if (found) {
+                return resolve(found)
+            }
+
+            const sub = emitters.onDidShowMessage.event((shownMessage) => {
+                if (shownMessage.message.match(expected)) {
+                    sub.dispose()
+                    resolve(shownMessage)
+                }
+            })
+            setTimeout(() => {
+                sub.dispose()
+                const gotMsgs = state.shownMessages.map((v) => v.message)
+                const got =
+                    gotMsgs.length > 0
+                        ? `, displayed:\n${JSON.stringify(gotMsgs, undefined, 4)}`
+                        : ' (no messages displayed)'
+                reject(new Error(`Timed out waiting for message: ${expected}${got}`))
+            }, timeout)
+        })
+    }
+
+    function getMessageOrThrow(index: number) {
+        if (state.shownMessages.length === 0) {
+            throw new Error('No messages have been shown')
+        }
+
+        const message = state.shownMessages[index]
+        if (message === undefined) {
+            const messages = state.shownMessages.map((m) => m.printDebug()).join('\n')
+            throw new Error(`No message found at index ${index}. Current state:\n${messages}`)
+        }
+
+        return message
+    }
+
+    type Fields = keyof typeof state | keyof typeof emitters
+    const methods: Partial<Omit<Window & TestWindow, Fields>> = {
+        dispose,
+        setStatusBarMessage: state.statusBar.setStatusBarMessage.bind(state.statusBar),
+        createStatusBarItem: state.statusBar.createStatusBarItem.bind(state.statusBar),
+        waitForMessage: waitForMessage,
+        getFirstMessage: getMessageOrThrow.bind(undefined, 0),
+        getSecondMessage: getMessageOrThrow.bind(undefined, 1),
+        getThirdMessage: getMessageOrThrow.bind(undefined, 2),
+        showInputBox: showInputBox,
+        showQuickPick: showQuickPick,
+        createInputBox: createInputBox,
+        createQuickPick: createQuickPick,
+        withProgress: withProgress,
+        showInformationMessage: TestMessage.createShowMessageFn(SeverityLevel.Information, fireOnDidShowMessage),
+        showWarningMessage: TestMessage.createShowMessageFn(SeverityLevel.Warning, fireOnDidShowMessage),
+        showErrorMessage: TestMessage.createShowMessageFn(SeverityLevel.Error, fireOnDidShowMessage),
+        showOpenDialog: TestFileSystemDialog.createOpenSaveDialogFn(workspace.fs, fireOnDidShowDialog),
+        showSaveDialog: TestFileSystemDialog.createShowSaveDialogFn(workspace.fs, fireOnDidShowDialog),
+        onError: onErrorEmitter.event,
+    }
+
+    return new Proxy(vscode.window, {
+        get: (target, prop: keyof (Window & TestWindow), recv) => {
+            if (isKeyOf(prop, emitters)) {
+                return emitters[prop].event
+            }
+            if (isKeyOf(prop, state)) {
+                return state[prop]
+            }
+            if (isKeyOf(prop, methods)) {
+                return methods[prop]
+            }
+
+            return Reflect.get(target, prop, recv)
+        },
+        set: (_, prop) => {
+            throw new Error(`The test window should not be mutated. Caller tried to change field "${String(prop)}"`)
+        },
+    }) as Window & TestWindow
+}
+
+let testWindow: ReturnType<typeof createTestWindow> | undefined
+
+/**
+ * Gets a testable version of {@link vscode.window} for the current test execution
+ *
+ * See {@link TestWindow} for a list of additional fields and methods.
+ */
+export function getTestWindow(): ReturnType<typeof createTestWindow> {
+    return (testWindow ??= createTestWindow())
+}
+
+/**
+ * Disposes the active test window, allowing a new one to be created
+ *
+ * **This currently does not reset the window for the current test execution!**
+ */
+export function resetTestWindow(): void {
+    testWindow?.dispose()
+    testWindow = undefined
+}
+
+/**
+ * Throws if there any error messages were shown during the test run
+ */
+export function assertNoErrorMessages() {
+    const errors = getTestWindow().shownMessages.filter((m) => m.severity === SeverityLevel.Error)
+    if (errors.length > 0) {
+        const messages = errors.map((m) => m.message).join('\n')
+        throw new Error(`The following error messages were shown: ${messages}`)
+    }
+}
+
+export function printPendingUiElements(window = getTestWindow()) {
+    const parts: string[] = []
+    const messages = window.shownMessages.filter((m) => m.visible)
+    const dialogs = window.shownDialogs.filter((d) => d.visible)
+
+    if (messages.length > 0) {
+        parts.push('Messages:', ...messages.map((m) => `  ${m.printDebug()}`))
+    }
+    if (dialogs.length > 0) {
+        parts.push('File System Dialogs:', ...dialogs.map((d) => `  ${d.printDebug()}`))
+    }
+    if (window.activeQuickInput?.visible) {
+        parts.push('Quick Inputs: ', `  ${window.activeQuickInput.title}`)
+    }
+
+    return parts.length > 0 ? ['Pending UI Elements:', ...parts].join('\n') : '[No Pending UI Elements Found]'
+}
+
+type TestEventEmitter<T> = vscode.EventEmitter<T> & {
+    readonly onError: vscode.Event<{ event: T; error: unknown }>
+}
+
+/**
+ * Catches and propagates any errors emitted by event listeners
+ */
+export function createTestEventEmitter<T>(): TestEventEmitter<T> {
+    const emitter = new vscode.EventEmitter<T>()
+    const errorEmitter = new vscode.EventEmitter<{ event: T; error: unknown }>()
+
+    return new Proxy(emitter, {
+        get: (target, prop: keyof TestEventEmitter<T>, recv) => {
+            if (prop === 'onError') {
+                return errorEmitter.event
+            }
+            if (prop === 'dispose') {
+                return function () {
+                    return vscode.Disposable.from(target, errorEmitter).dispose()
+                }
+            }
+            if (prop === 'event') {
+                return function (cb: (event: any) => unknown) {
+                    return emitter.event(async (event) => {
+                        try {
+                            await cb(event)
+                        } catch (error) {
+                            errorEmitter.fire({ event, error })
+                        }
+                    })
+                }
+            }
+            return Reflect.get(target, prop, recv)
+        },
+    }) as TestEventEmitter<T>
+}
diff --git a/packages/core/src/test/shared/wizards/compositWizard.test.ts b/packages/core/src/test/shared/wizards/compositWizard.test.ts
new file mode 100644
index 00000000000..e148a3deea1
--- /dev/null
+++ b/packages/core/src/test/shared/wizards/compositWizard.test.ts
@@ -0,0 +1,446 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import { createCommonButtons } from '../../../shared/ui/buttons'
+import { CompositeWizard } from '../../../shared/wizards/compositeWizard'
+import { createQuickPick, DataQuickPickItem } from '../../../shared/ui/pickerPrompter'
+import * as assert from 'assert'
+import { PrompterTester } from './prompterTester'
+import { TestQuickPick } from '../vscode/quickInput'
+
+interface ChildWizardForm {
+    childWizardProp1: string
+    childWizardProp2: string
+    childWizardProp3: string
+}
+
+interface SingleNestedWizardForm {
+    singleNestedWizardProp1: string
+    singleNestedWizardProp2: string
+    singleNestedWizardNestedProp: any
+    singleNestedWizardProp3: string
+}
+
+interface DoubleNestedWizardForm {
+    doubleNestedWizardProp1: string
+    doubleNestedWizardProp2: string
+    doubleNestedWizardNestedProp: any
+    singleNestedWizardConditionalSkipProps: any
+    doubleNestedWizardProp3: string
+}
+
+export function createTestPrompter(title: string, itemsString: string[]) {
+    const items: DataQuickPickItem<string>[] = itemsString.map((s) => ({
+        label: s,
+        data: s,
+    }))
+
+    return createQuickPick(items, { title: title, buttons: createCommonButtons() })
+}
+
+class ChildWizard extends CompositeWizard<ChildWizardForm> {
+    constructor() {
+        super()
+        this.form.childWizardProp1.bindPrompter(() =>
+            createTestPrompter('ChildWizard Prompter 1', ['c1p1', '**', '***'])
+        )
+        this.form.childWizardProp2.bindPrompter(() =>
+            createTestPrompter('ChildWizard Prompter 2', ['c2p1', '**', '***'])
+        )
+        this.form.childWizardProp3.bindPrompter(() =>
+            createTestPrompter('ChildWizard Prompter 3', ['c3p1', '**', '***'])
+        )
+    }
+}
+
+class SingleNestedWizard extends CompositeWizard<SingleNestedWizardForm> {
+    constructor() {
+        super()
+
+        this.form.singleNestedWizardProp1.bindPrompter(() =>
+            createTestPrompter('SingleNestedWizard Prompter 1', ['s1p1', '**', '***'])
+        )
+        this.form.singleNestedWizardProp2.bindPrompter(() =>
+            createTestPrompter('SingleNestedWizard Prompter 2', ['s2p1', '**', '***'])
+        )
+        this.form.singleNestedWizardNestedProp.bindPrompter(() =>
+            this.createWizardPrompter<ChildWizard, ChildWizardForm>(ChildWizard)
+        )
+        this.form.singleNestedWizardProp3.bindPrompter(() =>
+            createTestPrompter('SingleNestedWizard Prompter 3', ['s3p1', '**', '***'])
+        )
+    }
+}
+
+class DoubleNestedWizard extends CompositeWizard<DoubleNestedWizardForm> {
+    constructor() {
+        super()
+
+        this.form.doubleNestedWizardProp1.bindPrompter(() =>
+            createTestPrompter('DoubleNestedWizard Prompter 1', ['d1p1', '**', '***'])
+        )
+        this.form.doubleNestedWizardProp2.bindPrompter(() =>
+            createTestPrompter('DoubleNestedWizard Prompter 2', ['d2p1', '**', '***'])
+        )
+        this.form.doubleNestedWizardNestedProp.bindPrompter(() =>
+            this.createWizardPrompter<SingleNestedWizard, SingleNestedWizardForm>(SingleNestedWizard)
+        )
+        this.form.doubleNestedWizardProp3.bindPrompter(() =>
+            createTestPrompter('DoubleNestedWizard Prompter 3', ['d3p1', '**', '***'])
+        )
+    }
+}
+
+describe('NestedWizard', () => {
+    it('return the correct output from nested child wizard', async () => {
+        /**
+         * SingleNestedWizard
+            |
+            +-- Prompter 1
+            |
+            +-- Prompter 2
+            |
+            +-- ChildWizard
+            |   |
+            |   +-- Prompter 1
+            |   |
+            |   +-- Prompter 2
+            |   |
+            |   +-- Prompter 3
+            |
+            +-- Prompter 3
+         */
+        const expectedCallOrders = [
+            'SingleNestedWizard Prompter 1',
+            'SingleNestedWizard Prompter 2',
+            'ChildWizard Prompter 1',
+            'ChildWizard Prompter 2',
+            'ChildWizard Prompter 3',
+            'SingleNestedWizard Prompter 3',
+        ]
+        const expectedOutput = {
+            singleNestedWizardProp1: 's1p1',
+            singleNestedWizardProp2: 's2p1',
+            singleNestedWizardNestedProp: {
+                childWizardProp1: 'c1p1',
+                childWizardProp2: 'c2p1',
+                childWizardProp3: 'c3p1',
+            },
+            singleNestedWizardProp3: 's3p1',
+        }
+
+        const prompterTester = setupPrompterTester(expectedCallOrders)
+
+        const parentWizard = new SingleNestedWizard()
+        const result = await parentWizard.run()
+        assertWizardOutput(prompterTester, expectedCallOrders, result, expectedOutput)
+    })
+
+    it('return the correct output from double nested child wizard', async () => {
+        /**
+         * DoubleNestedWizard
+            |
+            +-- Prompter 1
+            |
+            +-- Prompter 2
+            |
+            +-- SingleNestedWizard
+            |       |
+            |       +-- Prompter 1
+            |       |
+            |       +-- Prompter 2
+            |       |
+            |       +-- ChildWizard
+            |       |       |
+            |       |       +-- Prompter 1
+            |       |       |
+            |       |       +-- Prompter 2
+            |       |       |
+            |       |       +-- Prompter 3
+            |       |
+            |       +-- Prompter 3
+            |
+            +-- Prompter 3
+         */
+        const expectedCallOrders = [
+            'DoubleNestedWizard Prompter 1',
+            'DoubleNestedWizard Prompter 2',
+            'SingleNestedWizard Prompter 1',
+            'SingleNestedWizard Prompter 2',
+            'ChildWizard Prompter 1',
+            'ChildWizard Prompter 2',
+            'ChildWizard Prompter 3',
+            'SingleNestedWizard Prompter 3',
+            'DoubleNestedWizard Prompter 3',
+        ]
+        const expectedOutput = {
+            doubleNestedWizardProp1: 'd1p1',
+            doubleNestedWizardProp2: 'd2p1',
+            doubleNestedWizardNestedProp: {
+                singleNestedWizardProp1: 's1p1',
+                singleNestedWizardProp2: 's2p1',
+                singleNestedWizardNestedProp: {
+                    childWizardProp1: 'c1p1',
+                    childWizardProp2: 'c2p1',
+                    childWizardProp3: 'c3p1',
+                },
+                singleNestedWizardProp3: 's3p1',
+            },
+            doubleNestedWizardProp3: 'd3p1',
+        }
+
+        const prompterTester = setupPrompterTester(expectedCallOrders)
+
+        const parentWizard = new DoubleNestedWizard()
+        const result = await parentWizard.run()
+
+        assertWizardOutput(prompterTester, expectedCallOrders, result, expectedOutput)
+    })
+
+    it('regenerates child wizard prompters in correct reverse order when going backward (back button)', async () => {
+        /**
+         * DoubleNestedWizard
+            |
+            +--> Prompter 1 (1)
+            |
+            +--> Prompter 2 (2)
+            |
+            |    SingleNestedWizard
+            |        |
+            |        +--> Prompter 1 (3)
+            |        |
+            |        +--> Prompter 2 (4)
+            |        |
+            |        |    ChildWizard
+            |        |        |
+            |        |        +--> Prompter 1 (5)
+            |        |        |
+            |        |        +--> Prompter 2 (6)
+            |        |        |
+            |        |        +--> Prompter 3 (7)
+            |        |        |
+            |        |        +--> Prompter 2 (8) <-- Back
+            |        |        |
+            |        |        +--> Prompter 1 (9) <-- Back
+            |        |        |
+            |        |        +--> Prompter 2 (10)
+            |        |        |
+            |        |        +--> Prompter 3 (11)
+            |        |
+            |        +--> Prompter 3 (12)
+            |
+            +--> Prompter 3 (13) <-- Back
+            |
+            |    SingleNestedWizard
+            |        |
+            |        +--> Prompter 3 (14) <-- Back
+            |        |
+            |        |    ChildWizard
+            |        |        |
+            |        |        +--> Prompter 3 (15)
+            |        |
+            |        +--> Prompter 3 (16)
+            |
+            +--> Prompter 3 (17)
+
+         */
+        const expectedCallOrders = [
+            'DoubleNestedWizard Prompter 1', // 1
+            'DoubleNestedWizard Prompter 2', // 2
+            'SingleNestedWizard Prompter 1', // 3
+            'SingleNestedWizard Prompter 2', // 4
+            'ChildWizard Prompter 1', // 5
+            'ChildWizard Prompter 2', // 6
+            'ChildWizard Prompter 3', // 7 (Back button)
+            'ChildWizard Prompter 2', // 8 (Back button)
+            'ChildWizard Prompter 1', // 9
+            'ChildWizard Prompter 2', // 10
+            'ChildWizard Prompter 3', // 11
+            'SingleNestedWizard Prompter 3', // 12
+            'DoubleNestedWizard Prompter 3', // 13 (Back button)
+            'SingleNestedWizard Prompter 3', // 14 (Back button)
+            'ChildWizard Prompter 3', // 15
+            'SingleNestedWizard Prompter 3', // 16
+            'DoubleNestedWizard Prompter 3', // 17
+        ]
+        const prompterTester = PrompterTester.init()
+            .handleQuickPick('DoubleNestedWizard Prompter 1', (quickPick) => {
+                // 1st
+                quickPick.acceptItem(quickPick.items[0])
+            })
+            .handleQuickPick('DoubleNestedWizard Prompter 2', (quickPick) => {
+                // 2nd
+                quickPick.acceptItem(quickPick.items[0])
+            })
+            .handleQuickPick('SingleNestedWizard Prompter 1', (quickPick) => {
+                // 3rd
+                quickPick.acceptItem(quickPick.items[0])
+            })
+            .handleQuickPick('SingleNestedWizard Prompter 2', (quickPick) => {
+                // 4th
+                quickPick.acceptItem(quickPick.items[0])
+            })
+            .handleQuickPick('ChildWizard Prompter 1', (quickPick) => {
+                // 5th
+                // 9th
+                quickPick.acceptItem(quickPick.items[0])
+            })
+            .handleQuickPick(
+                'ChildWizard Prompter 2',
+                (() => {
+                    const generator = (function* () {
+                        // 6th
+                        // First call, choose '**'
+                        yield async (picker: TestQuickPick) => {
+                            await picker.untilReady()
+                            assert.strictEqual(picker.items[1].label, '**')
+                            picker.acceptItem(picker.items[1])
+                        }
+                        //  8th
+                        yield async (picker: TestQuickPick) => {
+                            await picker.untilReady()
+                            picker.pressButton(vscode.QuickInputButtons.Back)
+                        }
+                        //  10th
+                        // Second call and subsequent call, should restore previously selected option  (**)
+                        while (true) {
+                            yield async (picker: TestQuickPick) => {
+                                await picker.untilReady()
+                                picker.acceptItem(picker.items[1])
+                            }
+                        }
+                    })()
+
+                    return (picker: TestQuickPick) => {
+                        const next = generator.next().value
+                        return next(picker)
+                    }
+                })()
+            )
+            .handleQuickPick(
+                'ChildWizard Prompter 3',
+                (() => {
+                    const generator = (function* () {
+                        //  7th
+                        // First call, check Back Button
+                        yield async (picker: TestQuickPick) => {
+                            await picker.untilReady()
+                            picker.pressButton(vscode.QuickInputButtons.Back)
+                        }
+                        // 11th
+                        // 15th
+                        while (true) {
+                            yield async (picker: TestQuickPick) => {
+                                await picker.untilReady()
+                                picker.acceptItem(picker.items[0])
+                            }
+                        }
+                    })()
+
+                    return (picker: TestQuickPick) => {
+                        const next = generator.next().value
+                        return next(picker)
+                    }
+                })()
+            )
+            .handleQuickPick(
+                'SingleNestedWizard Prompter 3',
+                (() => {
+                    const generator = (function* () {
+                        //  12th
+                        // First call, choose '***'
+                        yield async (picker: TestQuickPick) => {
+                            await picker.untilReady()
+                            assert.strictEqual(picker.items[2].label, '***')
+                            picker.acceptItem(picker.items[2])
+                        }
+                        //  14th
+                        yield async (picker: TestQuickPick) => {
+                            await picker.untilReady()
+                            picker.pressButton(vscode.QuickInputButtons.Back)
+                        }
+                        // 16th
+                        // Second call and after should restore previously selected option  (**)
+                        while (true) {
+                            yield async (picker: TestQuickPick) => {
+                                await picker.untilReady()
+                                picker.acceptItem(picker.items[2])
+                            }
+                        }
+                    })()
+
+                    return (picker: TestQuickPick) => {
+                        const next = generator.next().value
+                        return next(picker)
+                    }
+                })()
+            )
+            .handleQuickPick(
+                'DoubleNestedWizard Prompter 3',
+                (() => {
+                    const generator = (function* () {
+                        // 13th
+                        // First call, check Back Button
+                        yield async (picker: TestQuickPick) => {
+                            await picker.untilReady()
+                            picker.pressButton(vscode.QuickInputButtons.Back)
+                        }
+                        // 17th
+                        // Default behavior for any subsequent calls
+                        while (true) {
+                            yield async (picker: TestQuickPick) => {
+                                await picker.untilReady()
+                                picker.acceptItem(picker.items[0])
+                            }
+                        }
+                    })()
+
+                    return (picker: TestQuickPick) => {
+                        const next = generator.next().value
+                        return next(picker)
+                    }
+                })()
+            )
+            .build()
+
+        const parentWizard = new DoubleNestedWizard()
+
+        const result = await parentWizard.run()
+
+        assertWizardOutput(prompterTester, expectedCallOrders, result, {
+            doubleNestedWizardProp1: 'd1p1',
+            doubleNestedWizardProp2: 'd2p1',
+            doubleNestedWizardNestedProp: {
+                singleNestedWizardProp1: 's1p1',
+                singleNestedWizardProp2: 's2p1',
+                singleNestedWizardNestedProp: {
+                    childWizardProp1: 'c1p1',
+                    childWizardProp2: '**',
+                    childWizardProp3: 'c3p1',
+                },
+                singleNestedWizardProp3: '***',
+            },
+            doubleNestedWizardProp3: 'd3p1',
+        })
+    })
+})
+
+function setupPrompterTester(titles: string[]) {
+    const prompterTester = PrompterTester.init()
+    for (const title of titles) {
+        prompterTester.handleQuickPick(title, (quickPick) => {
+            quickPick.acceptItem(quickPick.items[0])
+        })
+    }
+    prompterTester.build()
+    return prompterTester
+}
+
+function assertWizardOutput(prompterTester: PrompterTester, orderedTitle: string[], result: any, output: any) {
+    assert.deepStrictEqual(result, output)
+    for (const [index, title] of orderedTitle.entries()) {
+        prompterTester.assertCallOrder(title, index + 1)
+    }
+}
diff --git a/src/test/shared/wizards/multiStepWizard.test.ts b/packages/core/src/test/shared/wizards/multiStepWizard.test.ts
similarity index 98%
rename from src/test/shared/wizards/multiStepWizard.test.ts
rename to packages/core/src/test/shared/wizards/multiStepWizard.test.ts
index 5a8ddc037e5..8ab9ea08488 100644
--- a/src/test/shared/wizards/multiStepWizard.test.ts
+++ b/packages/core/src/test/shared/wizards/multiStepWizard.test.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/packages/core/src/test/shared/wizards/prompterTester.ts b/packages/core/src/test/shared/wizards/prompterTester.ts
new file mode 100644
index 00000000000..e859816039e
--- /dev/null
+++ b/packages/core/src/test/shared/wizards/prompterTester.ts
@@ -0,0 +1,179 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import { TestInputBox, TestQuickPick } from '../vscode/quickInput'
+import { getTestWindow, TestWindow } from '../vscode/window'
+import { waitUntil } from '../../../shared/utilities/timeoutUtils'
+
+interface PrompterTesterConfig {
+    testWindow?: TestWindow
+    handlerTimeout?: number
+}
+
+export class PrompterTester {
+    private quickPickHandlers: Map<string, (input: TestQuickPick) => void> = new Map()
+    private inputBoxHanlder: Map<string, (input: TestInputBox) => void> = new Map()
+    private testWindow: TestWindow
+    private callLog = Array<string>()
+    private handlerTimeout: number = 3000 // Default timeout to 3 seconds
+    private callLogCount = new Map<string, number>()
+
+    private constructor(config?: PrompterTesterConfig) {
+        this.testWindow = config?.testWindow || getTestWindow()
+        this.handlerTimeout = config?.handlerTimeout || this.handlerTimeout
+    }
+
+    static init(config?: PrompterTesterConfig): PrompterTester {
+        return new PrompterTester(config)
+    }
+
+    handleQuickPick(titlePattern: string, handler: (input: TestQuickPick) => void | Promise<void>): PrompterTester {
+        this.quickPickHandlers.set(titlePattern, handler)
+        this.callLogCount.set(titlePattern, 0)
+        return this
+    }
+
+    handleInputBox(titlePattern: string, handler: (input: TestInputBox) => void | Promise<void>): PrompterTester {
+        this.inputBoxHanlder.set(titlePattern, handler)
+        this.callLogCount.set(titlePattern, 0)
+        return this
+    }
+
+    build(): PrompterTester {
+        this.testWindow.onDidShowQuickPick((input) => {
+            return this.handle(input, this.quickPickHandlers)
+        })
+        this.testWindow.onDidShowInputBox((input) => {
+            return this.handle(input, this.inputBoxHanlder)
+        })
+        return this
+    }
+
+    private record(title: string): void {
+        this.callLog.push(title)
+        this.callLogCount.set(title, (this.callLogCount.get(title) ?? 0) + 1)
+    }
+
+    /**
+     * Asserts that a specific prompter handler has been called the expected number of times.
+     *
+     * @param title - The title prompter to check.
+     * @param expectedCall - The expected number of times the prompted handler should have been called.
+     * @throws AssertionError if the actual number of calls doesn't match the expected number.
+     */
+    assertCall(title: string, expectedCall: number) {
+        assert.strictEqual(this.callLogCount.get(title), expectedCall, title)
+    }
+
+    /**
+     * Asserts that a specific prompter handler was called in the expected order.
+     *
+     * @param title - The title or identifier of the handler to check.
+     * @param expectedOrder - The expected position in the call order (one-based index).
+     * @throws AssertionError if the handler wasn't called in the expected order.
+     */
+    assertCallOrder(title: string, expectedOrder: number) {
+        assert.strictEqual(this.callLog[expectedOrder - 1], title)
+    }
+
+    /**
+     * Asserts that all specified prompter handlers were called in the expected number of times.
+     *
+     * @param titles - The array of propmter handler titles to check.
+     *                 If not provided, all registered handler titles are used
+     * @param expectedCall - The expected number of times all specified handlers should have been called.
+     *                       If not provided, it defaults to 1.
+     * @throws AssertionError if the actual number of calls doesn't match the expected number.
+     */
+    assertCallAll(titles: string[] = this.getHandlers(), expectedOrder: number = 1) {
+        titles.every((handler) => {
+            this.assertCall(handler, expectedOrder)
+        })
+    }
+
+    /**
+     * Retrieves all registered handler titles.
+     *
+     * @returns An array of strings containing all handler titles, including both
+     *          quick pick handlers and input box handlers.
+     */
+    getHandlers(): string[] {
+        return [...this.quickPickHandlers.keys(), ...this.inputBoxHanlder.keys()]
+    }
+
+    private async handle(input: any, handlers: any) {
+        const handler = handlers.get(input.title)
+
+        if (!handler) {
+            return this.handleUnknownPrompter(input)
+        }
+
+        try {
+            await waitUntil(
+                async () => {
+                    await handler(input)
+                    return true
+                },
+                { timeout: this.handlerTimeout, interval: 50, truthy: false }
+            )
+        } catch (e) {
+            // clean up UI on callback function early exit (e.g assertion failure)
+            await input.dispose()
+            throw e
+        }
+        this.record(input.title)
+    }
+
+    private handleUnknownPrompter(input: any) {
+        input.dispose()
+        throw assert.fail(`Unexpected prompter titled: "${input.title}"`)
+    }
+}
+
+export function createPromptHandler<T>(config: {
+    default: (input: T) => Promise<void>
+    numbered?: Array<{
+        order: number[]
+        handler: (input: T) => Promise<void>
+    }>
+}) {
+    const generator = (function* () {
+        let currentIteration = 0
+        const handlersMap = new Map()
+
+        // Setup handlers map
+        if (config.numbered) {
+            for (const item of config.numbered) {
+                for (const orderNum of item.order) {
+                    handlersMap.set(orderNum, item.handler)
+                }
+            }
+        }
+
+        while (true) {
+            currentIteration++
+            const handler = handlersMap.get(currentIteration)
+
+            if (handler) {
+                yield handler
+            } else {
+                yield config.default
+            }
+        }
+    })()
+
+    // Return a function that advances the generator and executes the handler
+    return (picker: T) => {
+        const next = generator.next().value
+        return next(picker)
+    }
+}
+
+export async function clickBackButton(input: TestQuickPick | TestInputBox) {
+    await input.untilReady()
+    input.pressButton(vscode.QuickInputButtons.Back)
+}
diff --git a/packages/core/src/test/shared/wizards/wizard.test.ts b/packages/core/src/test/shared/wizards/wizard.test.ts
new file mode 100644
index 00000000000..2e93ac2fa03
--- /dev/null
+++ b/packages/core/src/test/shared/wizards/wizard.test.ts
@@ -0,0 +1,390 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { Prompter, PromptResult } from '../../../shared/ui/prompter'
+import {
+    isWizardControl,
+    StateWithCache,
+    StepEstimator,
+    Wizard,
+    WizardState,
+    WIZARD_BACK,
+    WIZARD_EXIT,
+} from '../../../shared/wizards/wizard'
+import { SkipPrompter } from '../../../shared/ui/common/skipPrompter'
+
+interface TestWizardForm {
+    prop1: string
+    prop2?: number
+    prop3: string
+    prop4: string
+    nestedProp: {
+        prop1: string
+        prop2?: boolean
+    }
+}
+
+interface AssertStepMethods {
+    /** Order is 1-indexed, e.g. onCall(1) === onFirstCall() */
+    onCall(...order: number[]): void
+    onFirstCall(): void
+    onSecondCall(): void
+    onThirdCall(): void
+    onFourthCall(): void
+    onEveryCall(): void
+}
+
+type StepTuple = [current: number, total: number]
+type StateResponse<T, S> = (state: StateWithCache<S, T>) => PromptResult<T>
+type TestResponse<T, S> = PromptResult<T> | StateResponse<T, S>
+
+function makeGreen(s: string): string {
+    return `\u001b[32m${s}\u001b[0m`
+}
+
+function makeExpectedError(message: string, actual: any, expected: any): string {
+    return `${message}\n\tActual: ${actual}\n\t${makeGreen(`Expected: ${expected}`)}`
+}
+
+// TODO: rewrite this prompter to be a 'provider' type
+
+/**
+ * Note: This class should be used within this test file. Use 'FormTester' instead for testing wizard implementations since
+ * it can test behavior irrespective of prompter ordering.
+ *
+ * Test prompters are instantiated with a finite set of responses. Responses can be raw data or functions applied to the
+ * current state of the wizard. A developer-friendly name can be added using 'setName'.
+ */
+class TestPrompter<T, S = any> extends Prompter<T> {
+    private readonly responses: TestResponse<T, S>[]
+    private readonly acceptedStates: StateWithCache<S, T>[] = []
+    private readonly acceptedSteps: [current: number, total: number][] = []
+    private readonly acceptedEstimators: StepEstimator<T>[] = []
+    private _totalSteps: number = 1
+    private _lastResponse: PromptResult<T>
+    private promptCount: number = 0
+    private name: string = 'Test Prompter'
+
+    public get recentItem(): PromptResult<T> {
+        return this._lastResponse
+    }
+    public set recentItem(response: PromptResult<T>) {
+        if (response !== this._lastResponse) {
+            this.fail(
+                makeExpectedError('Received unexpected cached response from wizard', response, this._lastResponse)
+            )
+        }
+    }
+
+    public override get totalSteps(): number {
+        return this._totalSteps
+    }
+
+    constructor(...responses: TestResponse<T, S>[]) {
+        super()
+        this.responses = responses
+    }
+
+    public override async prompt(): Promise<PromptResult<T>> {
+        if (this.responses.length === this.promptCount) {
+            this.fail('Ran out of responses')
+        }
+        const resp = this.convertFunctionResponse(this.promptCount++)
+        this._lastResponse = !isWizardControl(resp) ? resp : this._lastResponse
+
+        return resp
+    }
+
+    protected promptUser(): Promise<PromptResult<T>> {
+        throw new Error('Do not call this')
+    }
+
+    public setSteps(current: number, total: number): void {
+        this.acceptedSteps.push([current, total])
+    }
+
+    public setStepEstimator(estimator: StepEstimator<T>): void {
+        this.acceptedEstimators.push(estimator)
+    }
+
+    // ----------------------------Test helper methods go below this line----------------------------//
+
+    public acceptState(state: StateWithCache<S, T>): this {
+        this.acceptedStates[this.promptCount] = state
+        return this
+    }
+
+    private fail(message: string): void {
+        assert.fail(this.makeErrorMessage(message))
+    }
+
+    private makeErrorMessage(message: string): string {
+        return `[${this.name}]: ${message}`
+    }
+
+    public setName(name: string): this {
+        this.name = name
+        return this
+    }
+
+    public setTotalSteps(total: number): void {
+        this._totalSteps = total
+    }
+
+    private convertFunctionResponse(count: number = this.promptCount): PromptResult<T> {
+        let response = this.responses[count]
+        if (typeof response === 'function') {
+            if (this.acceptedStates[count] === undefined) {
+                this.fail(`Undefined state, did you forget to bind the prompter with "acceptState"?`)
+            }
+            response = (response as StateResponse<T, S>)(this.acceptedStates[count])
+        }
+        return response
+    }
+
+    private checkEstimate(input: T, expected: number, when: number): void {
+        if (when > this.acceptedEstimators.length) {
+            this.fail('Cannot check estimate for a step that did not occur')
+        }
+
+        const estimator = this.acceptedEstimators[when - 1]
+        const actual = estimator(input)
+
+        if (actual !== expected) {
+            this.fail(makeExpectedError(`Estimator did not provide the expected steps: `, actual, expected))
+        }
+    }
+
+    public assertStepEstimate(input: T, expected: number): AssertStepMethods {
+        return {
+            onCall: (...order: number[]) => {
+                for (const i of order) {
+                    this.checkEstimate(input, expected, i)
+                }
+            },
+            onFirstCall: () => this.checkEstimate(input, expected, 1),
+            onSecondCall: () => this.checkEstimate(input, expected, 2),
+            onThirdCall: () => this.checkEstimate(input, expected, 3),
+            onFourthCall: () => this.checkEstimate(input, expected, 4),
+            onEveryCall: () => {
+                for (const [i, _] of this.acceptedStates.entries()) {
+                    this.checkEstimate(input, expected, i + 1)
+                }
+            },
+        } as AssertStepMethods
+    }
+
+    private checkSteps(expected: StepTuple, when: number): void {
+        if (when > this.acceptedSteps.length) {
+            this.fail(`Cannot check step counts for a step that did not occur`)
+        }
+
+        const actual = this.acceptedSteps[when - 1]
+
+        if (expected !== undefined) {
+            assert.strictEqual(actual[0], expected[0], this.makeErrorMessage('Incorrect current step'))
+            assert.strictEqual(actual[1], expected[1], this.makeErrorMessage('Incorrect total steps'))
+        }
+    }
+
+    /** Check if the prompter was given the expected steps */
+    public assertSteps(current: number, total: number): AssertStepMethods {
+        return {
+            onCall: (...order: number[]) => {
+                for (const i of order) {
+                    this.checkSteps([current, total], i)
+                }
+            },
+            onFirstCall: () => this.checkSteps([current, total], 1),
+            onSecondCall: () => this.checkSteps([current, total], 2),
+            onThirdCall: () => this.checkSteps([current, total], 3),
+            onFourthCall: () => this.checkSteps([current, total], 4),
+            onEveryCall: () => {
+                for (const [i, _] of this.acceptedSteps.entries()) {
+                    this.checkSteps([current, total], i + 1)
+                }
+            },
+        } as AssertStepMethods
+    }
+
+    public assertCallCount(count: number): void {
+        assert.strictEqual(this.promptCount, count, this.makeErrorMessage('Called an unexpected number of times'))
+    }
+}
+
+// We only need to test execution of prompters provided by the wizard form
+describe('Wizard', function () {
+    let wizard: Wizard<TestWizardForm>
+    let helloPrompter: TestPrompter<string>
+
+    beforeEach(function () {
+        wizard = new Wizard()
+        helloPrompter = new TestPrompter(...Array(100).fill('hello')).setName('Hello')
+    })
+
+    it('binds prompter to (sync AND async) property', async function () {
+        wizard.form.prop1.bindPrompter(() => helloPrompter)
+        wizard.form.prop3.bindPrompter(async () => new SkipPrompter())
+
+        const result = await wizard.run()
+        assert.strictEqual(result?.prop1, 'hello')
+        assert(!result?.prop3)
+    })
+
+    it('initializes state to empty object if not provided', async function () {
+        wizard.form.prop1.bindPrompter(() => helloPrompter, { showWhen: (state) => state !== undefined })
+
+        assert.strictEqual((await wizard.run())?.prop1, 'hello')
+    })
+
+    it('processes exit signal', async function () {
+        wizard.form.prop1.bindPrompter(() => helloPrompter)
+        wizard.form.prop3.bindPrompter(() => new TestPrompter<string>(WIZARD_EXIT).setName('Exit'))
+
+        assert.strictEqual(await wizard.run(), undefined)
+        helloPrompter.assertCallCount(1)
+    })
+
+    it('users exit prompter if provided', async function () {
+        const checkForHello = (state: TestWizardForm) => state.prop1 !== 'hello'
+        const exitPrompter = new TestPrompter(checkForHello, true).setName('Exit Dialog')
+        const exitSignalPrompter = new TestPrompter<string>(WIZARD_EXIT, WIZARD_EXIT).setName('Exit Signal')
+        wizard = new Wizard({ exitPrompterProvider: (state) => exitPrompter.acceptState(state as any) })
+        wizard.form.prop1.bindPrompter(() => helloPrompter)
+        wizard.form.prop3.bindPrompter(() => exitSignalPrompter)
+
+        assert.strictEqual(await wizard.run(), undefined)
+        helloPrompter.assertCallCount(1)
+        exitPrompter.assertCallCount(2)
+        exitSignalPrompter.assertCallCount(2)
+    })
+
+    // test is mostly redundant (state controller handles this logic) but good to have
+    it('regenerates prompters when going back', async function () {
+        const testPrompter = new TestPrompter(WIZARD_BACK, 'goodbye').setName('Goodbye')
+
+        wizard.form.prop1.bindPrompter(() => helloPrompter)
+        wizard.form.prop3.bindPrompter(() => testPrompter)
+
+        assert.deepStrictEqual(await wizard.run(), { prop1: 'hello', prop3: 'goodbye' })
+        helloPrompter.assertCallCount(2)
+        testPrompter.assertCallCount(2)
+    })
+
+    it('applies step offset', async function () {
+        const testPrompter = new TestPrompter('1')
+        wizard.stepOffset = [4, 5]
+
+        wizard.form.prop1.bindPrompter(() => testPrompter)
+
+        assert.deepStrictEqual(await wizard.run(), { prop1: '1' })
+        testPrompter.assertSteps(5, 6).onFirstCall()
+    })
+
+    it('provides a step estimator', async function () {
+        const firstStep = new TestPrompter('0')
+        const secondStep = new TestPrompter('1')
+
+        wizard.form.prop1.bindPrompter((state) => firstStep.acceptState(state))
+        wizard.form.prop3.bindPrompter(() => secondStep, { showWhen: (state) => state.prop1 === '1' })
+
+        assert.deepStrictEqual(await wizard.run(), { prop1: '0' })
+        firstStep.assertStepEstimate('0', 0).onFirstCall()
+        firstStep.assertStepEstimate('1', 1).onFirstCall()
+    })
+
+    it('uses a parent estimator if provided', async function () {
+        const parentEstimator = (state: TestWizardForm) => (state.prop1 === '1' ? (state.prop3 === '1' ? 2 : 1) : 0)
+        const firstStep = new TestPrompter('1', '0', '1')
+        const secondStep = new TestPrompter<string>(WIZARD_BACK, '1')
+        const thirdStep = new TestPrompter(WIZARD_BACK, 1)
+
+        wizard.parentEstimator = parentEstimator
+        wizard.form.prop1.bindPrompter((state) => firstStep.acceptState(state))
+        wizard.form.prop3.bindPrompter((state) => secondStep.acceptState(state), {
+            showWhen: (state) => state.prop1 === '1',
+        })
+        wizard.form.prop2.bindPrompter((state) => thirdStep.acceptState(state))
+
+        assert.deepStrictEqual(await wizard.run(), { prop1: '1', prop2: 1, prop3: '1' })
+        firstStep.assertStepEstimate('0', 0).onEveryCall()
+        secondStep.assertStepEstimate('1', 2).onSecondCall()
+    })
+
+    it('does not apply control values to state when going back', async function () {
+        const noWizardControl = (state: StateWithCache<WizardState<TestWizardForm>, string>) => {
+            assert.strictEqual(
+                isWizardControl(state.prop2),
+                false,
+                'Wizard flow control should not appear in wizard state'
+            )
+            return 'good'
+        }
+
+        const testPrompter1 = new TestPrompter('first', noWizardControl).setName('Test 1')
+        const testPrompter2 = new TestPrompter(WIZARD_BACK, 22).setName('Test 2')
+
+        wizard.form.prop1.bindPrompter((state) => testPrompter1.acceptState(state))
+        wizard.form.prop2.bindPrompter(() => testPrompter2)
+
+        assert.deepStrictEqual(await wizard.run(), { prop1: 'good', prop2: 22 })
+    })
+
+    describe('prompter state', function () {
+        // Execution order: 1 -> 2 -> 1 -> 2
+        it('accurately assigns current/total steps', async function () {
+            const testPrompter1 = new TestPrompter('1', '2', '3').setName('Test 1')
+            const testPrompter2 = new TestPrompter(WIZARD_BACK, 4).setName('Test 2')
+
+            testPrompter1.setTotalSteps(2)
+
+            wizard.form.prop1.bindPrompter(() => testPrompter1)
+            wizard.form.prop2.bindPrompter(() => testPrompter2)
+
+            assert.deepStrictEqual(await wizard.run(), { prop1: '2', prop2: 4 })
+            testPrompter1.assertCallCount(2)
+            testPrompter2.assertCallCount(2)
+            testPrompter1.assertSteps(1, 2).onFirstCall()
+            testPrompter2.assertSteps(3, 3).onSecondCall()
+        })
+
+        //       A --> Path 1
+        //      /             \
+        // Start               End
+        //      \             /
+        //       B --> Path 2
+        //
+        // Execution order:
+        // Start -> Path 1 -> End -> Path 1 -> Start -> Path 2 -> Start -> Path 1 -> Start -> Path 2 -> End -> Path 2 -> End
+        it('sets total steps correctly when branching', async function () {
+            const helloFunction = (state: WizardState<TestWizardForm>) =>
+                state.prop1 === 'B' ? `hello ${state.prop3}` : `extra step`
+            const testPrompterStart = new TestPrompter('A', 'B', 'A', 'B').setName('Start')
+            const testPrompterPath1 = new TestPrompter(99, WIZARD_BACK, WIZARD_BACK, 10).setName('Path 1')
+            const testPrompterPath2 = new TestPrompter(WIZARD_BACK, 'alice', 'bob').setName('Path 2')
+            const testPrompterEnd = new TestPrompter(WIZARD_BACK, WIZARD_BACK, helloFunction).setName('End')
+
+            testPrompterPath1.setTotalSteps(2)
+            testPrompterPath2.setTotalSteps(3)
+
+            wizard.form.prop1.bindPrompter(() => testPrompterStart)
+            wizard.form.prop2.bindPrompter(() => testPrompterPath1, { showWhen: (state) => state.prop1 === 'A' })
+            wizard.form.prop3.bindPrompter(() => testPrompterPath2, { showWhen: (state) => state.prop1 === 'B' })
+            wizard.form.prop4.bindPrompter((state) => testPrompterEnd.acceptState(state))
+
+            assert.deepStrictEqual(await wizard.run(), { prop1: 'B', prop3: 'bob', prop4: 'hello bob' })
+            testPrompterStart.assertCallCount(4)
+            testPrompterPath1.assertCallCount(3)
+            testPrompterPath2.assertCallCount(3)
+            testPrompterEnd.assertCallCount(3)
+            testPrompterStart.assertSteps(1, 2).onEveryCall()
+            testPrompterPath1.assertSteps(2, 3).onEveryCall()
+            testPrompterPath2.assertSteps(2, 3).onEveryCall()
+            testPrompterEnd.assertSteps(4, 4).onFirstCall()
+            testPrompterEnd.assertSteps(5, 5).onCall(2, 3)
+        })
+    })
+})
diff --git a/src/test/shared/wizards/wizardForm.test.ts b/packages/core/src/test/shared/wizards/wizardForm.test.ts
similarity index 90%
rename from src/test/shared/wizards/wizardForm.test.ts
rename to packages/core/src/test/shared/wizards/wizardForm.test.ts
index 54b9aef2cfb..90273ba19a5 100644
--- a/src/test/shared/wizards/wizardForm.test.ts
+++ b/packages/core/src/test/shared/wizards/wizardForm.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import { createWizardTester, WizardTester } from '../../shared/wizards/wizardTestUtils'
 import { WizardForm } from '../../../shared/wizards/wizardForm'
 import { SimplePrompter } from '../ui/prompter.test'
@@ -25,10 +25,10 @@ describe('WizardForm', function () {
     let testForm: Wizard<TestState>['form']
     let tester: WizardTester<TestState>
 
-    beforeEach(function () {
+    beforeEach(async function () {
         testWizard = new Wizard()
         testForm = testWizard.form
-        tester = createWizardTester(testWizard)
+        tester = await createWizardTester(testWizard)
     })
 
     it('can add prompter', function () {
@@ -46,7 +46,7 @@ describe('WizardForm', function () {
     })
 
     it('shows prompter based on context', function () {
-        testForm.prop1.bindPrompter(() => new SimplePrompter(0), { showWhen: state => state.prop2 === 'hello' })
+        testForm.prop1.bindPrompter(() => new SimplePrompter(0), { showWhen: (state) => state.prop2 === 'hello' })
         tester.prop1.assertDoesNotShow()
         tester.prop2.applyInput('hello')
         tester.prop1.assertShow()
@@ -69,7 +69,7 @@ describe('WizardForm', function () {
     // but allowing this behavior means loops are possible, so cycle detection would be needed
     it('default values do not depend on other default values', function () {
         testForm.prop1.setDefault(() => 100)
-        testForm.prop2.setDefault(state => `default: ${state.prop1}`)
+        testForm.prop2.setDefault((state) => `default: ${state.prop1}`)
         tester.prop1.assertValue(100)
         tester.prop2.assertValue('default: undefined')
         tester.prop1.applyInput(50)
@@ -90,7 +90,7 @@ describe('WizardForm', function () {
         it('works with "showWhen"', function () {
             testForm.nestedProp.prop1.bindPrompter(() => new SimplePrompter(''), {
                 requireParent: true,
-                showWhen: state => state.prop1 === 99,
+                showWhen: (state) => state.prop1 === 99,
             })
             tester.nestedProp.prop1.assertDoesNotShow()
             tester.prop1.applyInput(99)
@@ -134,7 +134,7 @@ describe('WizardForm', function () {
 
         it('propagates state to local forms', function () {
             nestedTestForm.body.prop1.bindPrompter(() => new SimplePrompter(''), {
-                showWhen: state => state.prop2 === 'hello',
+                showWhen: (state) => state.prop2 === 'hello',
             })
             testForm.nestedProp.applyBoundForm(nestedTestForm)
             tester.nestedProp.prop1.assertDoesNotShow()
@@ -144,7 +144,7 @@ describe('WizardForm', function () {
 
         it('can apply form with "requireParent"', function () {
             nestedTestForm.body.prop1.bindPrompter(() => new SimplePrompter(''), {
-                showWhen: state => state.prop2 === 'hello',
+                showWhen: (state) => state.prop2 === 'hello',
             })
             nestedTestForm.body.prop2.setDefault(() => 'hello')
             testForm.nestedProp.applyBoundForm(nestedTestForm, { requireParent: true })
@@ -156,13 +156,13 @@ describe('WizardForm', function () {
 
         it('can apply form with "showWhen"', function () {
             nestedTestForm.body.prop1.bindPrompter(() => new SimplePrompter(''), {
-                showWhen: state => state.prop2 === 'hello',
+                showWhen: (state) => state.prop2 === 'hello',
             })
             nestedTestForm.body.prop2.bindPrompter(() => new SimplePrompter(''), {
-                showWhen: state => state.prop1 === 'goodbye',
+                showWhen: (state) => state.prop1 === 'goodbye',
             })
 
-            testForm.nestedProp.applyBoundForm(nestedTestForm, { showWhen: state => state.prop2 === 'start' })
+            testForm.nestedProp.applyBoundForm(nestedTestForm, { showWhen: (state) => state.prop2 === 'start' })
             tester.nestedProp.assertDoesNotShowAny()
             tester.nestedProp.applyInput({})
             tester.nestedProp.assertDoesNotShowAny()
diff --git a/src/test/shared/wizards/wizardTestUtils.ts b/packages/core/src/test/shared/wizards/wizardTestUtils.ts
similarity index 84%
rename from src/test/shared/wizards/wizardTestUtils.ts
rename to packages/core/src/test/shared/wizards/wizardTestUtils.ts
index b5fa9e66ccb..8430278a4c6 100644
--- a/src/test/shared/wizards/wizardTestUtils.ts
+++ b/packages/core/src/test/shared/wizards/wizardTestUtils.ts
@@ -1,10 +1,10 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as _ from 'lodash'
-import * as assert from 'assert'
+import assert from 'assert'
 import { ExpandWithObject } from '../../../shared/utilities/tsUtils'
 import { Wizard } from '../../../shared/wizards/wizard'
 import { WizardForm } from '../../../shared/wizards/wizardForm'
@@ -61,7 +61,13 @@ function failIf(cond: boolean, message?: string): void {
     }
 }
 
-export function createWizardTester<T extends Partial<T>>(wizard: Wizard<T> | WizardForm<T>): Tester<T> {
+/** Wraps the `WizardForm` of a `Wizard` so you can assert its state. */
+export async function createWizardTester<T extends Partial<T>>(wizard: Wizard<T> | WizardForm<T>): Promise<Tester<T>> {
+    if (wizard instanceof Wizard && wizard.init) {
+        // Ensure that init() was called. Needed because createWizardTester() does not call run().
+        await wizard.init()
+    }
+
     const form = wizard instanceof Wizard ? wizard.boundForm : wizard
     const state = (wizard instanceof Wizard ? JSON.parse(JSON.stringify(wizard.initialState ?? {})) : {}) as T
 
@@ -78,11 +84,11 @@ export function createWizardTester<T extends Partial<T>>(wizard: Wizard<T> | Wiz
     }
 
     function showableChildren(parent: string): string[] {
-        return form.properties.filter(prop => prop !== parent && prop.startsWith(parent) && canShowPrompter(prop))
+        return form.properties.filter((prop) => prop !== parent && prop.startsWith(parent) && canShowPrompter(prop))
     }
 
     function getRelativeOrder(prop: string): number {
-        return form.properties.filter(prop => canShowPrompter(prop)).indexOf(prop)
+        return form.properties.filter((prop) => canShowPrompter(prop)).indexOf(prop)
     }
 
     function assertOrder(prop: string, expected: number): void {
@@ -105,7 +111,7 @@ export function createWizardTester<T extends Partial<T>>(wizard: Wizard<T> | Wiz
     function assertShowNone(prop: string): MockWizardFormElement<T>['assertDoesNotShowAny'] {
         return () => {
             const children = showableChildren(prop)
-            const message = children.map(p => p.replace(`${prop}.`, '')).join('\n\t')
+            const message = children.map((p) => p.replace(`${prop}.`, '')).join('\n\t')
 
             failIf(children.length !== 0, `Property "${prop}" would show the following:\n\t${message}`)
         }
@@ -148,15 +154,21 @@ export function createWizardTester<T extends Partial<T>>(wizard: Wizard<T> | Wiz
                                     `No properties of "${propPath}" would be shown`
                                 )
                         case NOT_ASSERT_SHOW:
-                            return () =>
-                                failIf(form.canShowProperty(propPath, state), `Property "${propPath}" would be shown`)
+                            return async () =>
+                                failIf(
+                                    await form.canShowProperty(propPath, state),
+                                    `Property "${propPath}" would be shown`
+                                )
                         case NOT_ASSERT_SHOW_ANY:
                             return assertShowNone(propPath)
                         case ASSERT_VALUE:
                             return assertValue(propPath)
                         case SHOW_COUNT:
                             return (count: number) =>
-                                assert.strictEqual(form.properties.filter(prop => canShowPrompter(prop)).length, count)
+                                assert.strictEqual(
+                                    form.properties.filter((prop) => canShowPrompter(prop)).length,
+                                    count
+                                )
                         default:
                             return Reflect.get(obj, prop, rec) ?? createFormWrapper([...path, prop.toString()])
                     }
diff --git a/src/test/ssmDocument/commands/createDocumentFromTemplate.test.ts b/packages/core/src/test/ssmDocument/commands/createDocumentFromTemplate.test.ts
similarity index 80%
rename from src/test/ssmDocument/commands/createDocumentFromTemplate.test.ts
rename to packages/core/src/test/ssmDocument/commands/createDocumentFromTemplate.test.ts
index e485cfa8721..c9cacb0908c 100644
--- a/src/test/ssmDocument/commands/createDocumentFromTemplate.test.ts
+++ b/packages/core/src/test/ssmDocument/commands/createDocumentFromTemplate.test.ts
@@ -1,11 +1,11 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as vscode from 'vscode'
-import * as assert from 'assert'
-import * as sinon from 'sinon'
+import vscode from 'vscode'
+import assert from 'assert'
+import sinon from 'sinon'
 import * as picker from '../../../shared/ui/picker'
 import {
     createSsmDocumentFromTemplate,
@@ -14,7 +14,6 @@ import {
 import * as ssmDocumentUtil from '../../../ssmDocument/util/util'
 import * as fsUtilities from '../../../shared/filesystemUtilities'
 
-import * as YAML from 'yaml'
 import { FakeExtensionContext } from '../../fakeExtensionContext'
 
 describe('createDocumentFromTemplate', async function () {
@@ -31,10 +30,15 @@ describe('createDocumentFromTemplate', async function () {
         sandbox.restore()
     })
 
-    const fakeContent = `{
-        "schemaVersion": "2.2",
-        "mainSteps": []
-    }`
+    const fakeContentYaml = `---
+schemaVersion: '2.2'
+mainSteps: []
+`
+
+    const fakeContentJson = `{
+    "schemaVersion": "2.2",
+    "mainSteps": []
+}`
 
     const fakeSelectionResult: SsmDocumentTemplateQuickPickItem = {
         label: 'test template',
@@ -49,16 +53,14 @@ describe('createDocumentFromTemplate', async function () {
     it('open and save document based on selected template', async function () {
         sandbox.stub(picker, 'promptUser').returns(Promise.resolve(fakeSelection))
         sandbox.stub(picker, 'verifySinglePickerOutput').returns(fakeSelectionResult)
-        sandbox.stub(fsUtilities, 'readFileAsString').returns(Promise.resolve(fakeContent))
+        sandbox.stub(fsUtilities, 'readFileAsString').returns(Promise.resolve(fakeContentYaml))
         sandbox.stub(ssmDocumentUtil, 'promptUserForDocumentFormat').returns(Promise.resolve('JSON'))
-        sandbox.stub(JSON, 'stringify').returns(fakeContent)
-        sandbox.stub(YAML, 'stringify').returns(fakeContent)
 
         const openTextDocumentStub = sandbox.stub(vscode.workspace, 'openTextDocument')
 
         await createSsmDocumentFromTemplate(mockContext)
 
-        assert.strictEqual(openTextDocumentStub.getCall(0).args[0]?.content, fakeContent)
+        assert.strictEqual(openTextDocumentStub.getCall(0).args[0]?.content, fakeContentJson)
         assert.strictEqual(openTextDocumentStub.getCall(0).args[0]?.language, 'ssm-json')
     })
 })
diff --git a/packages/core/src/test/ssmDocument/commands/deleteDocument.test.ts b/packages/core/src/test/ssmDocument/commands/deleteDocument.test.ts
new file mode 100644
index 00000000000..f79d217028d
--- /dev/null
+++ b/packages/core/src/test/ssmDocument/commands/deleteDocument.test.ts
@@ -0,0 +1,72 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+import { DocumentItemNodeWriteable } from '../../../ssmDocument/explorer/documentItemNodeWriteable'
+import { SsmDocumentClient } from '../../../shared/clients/ssmDocumentClient'
+import { deleteDocument } from '../../../ssmDocument/commands/deleteDocument'
+import { RegistryItemNode } from '../../../ssmDocument/explorer/registryItemNode'
+import { DocumentFormat, DocumentIdentifier } from '@aws-sdk/client-ssm'
+import { getTestWindow } from '../../shared/vscode/window'
+import { stub } from '../../utilities/stubber'
+
+describe('deleteDocument', async function () {
+    let ssmClient: SsmDocumentClient
+    let node: DocumentItemNodeWriteable
+    let parentNode: RegistryItemNode
+    let sandbox: sinon.SinonSandbox
+    let spyExecuteCommand: sinon.SinonSpy
+    const fakeName: string = 'testDocument'
+
+    const fakeDoc: DocumentIdentifier = {
+        Name: fakeName,
+        DocumentFormat: DocumentFormat.JSON,
+        DocumentType: 'Automation',
+        Owner: 'Amazon',
+    }
+
+    const fakeRegion: string = 'us-east-1'
+
+    beforeEach(function () {
+        sandbox = sinon.createSandbox()
+        spyExecuteCommand = sandbox.spy(vscode.commands, 'executeCommand')
+
+        ssmClient = {
+            deleteDocument: async (doc: string) => {
+                return {}
+            },
+        } as any as SsmDocumentClient
+        parentNode = stub(RegistryItemNode, {
+            regionCode: '',
+            registryName: '',
+            documentType: '',
+            serviceId: undefined,
+            label: undefined,
+            id: undefined,
+            iconPath: undefined,
+            description: undefined,
+            resourceUri: undefined,
+            tooltip: undefined,
+            command: undefined,
+            collapsibleState: undefined,
+            contextValue: undefined,
+            accessibilityInformation: undefined,
+            checkboxState: undefined,
+        })
+        node = new DocumentItemNodeWriteable(fakeDoc, ssmClient, fakeRegion, parentNode)
+    })
+
+    afterEach(function () {
+        sandbox.restore()
+    })
+
+    it('confirms deletion, deletes file, and refreshes parent node', async function () {
+        getTestWindow().onDidShowMessage((m) => m.items.find((i) => i.title === 'Delete')?.select())
+        await deleteDocument(node)
+        getTestWindow().getFirstMessage().assertWarn('Are you sure you want to delete document testDocument?')
+        sandbox.assert.calledWith(spyExecuteCommand, 'aws.refreshAwsExplorerNode', parentNode)
+    })
+})
diff --git a/src/test/ssmDocument/commands/openDocumentItem.test.ts b/packages/core/src/test/ssmDocument/commands/openDocumentItem.test.ts
similarity index 78%
rename from src/test/ssmDocument/commands/openDocumentItem.test.ts
rename to packages/core/src/test/ssmDocument/commands/openDocumentItem.test.ts
index 839eb1e9fa6..a02403be4dc 100644
--- a/src/test/ssmDocument/commands/openDocumentItem.test.ts
+++ b/packages/core/src/test/ssmDocument/commands/openDocumentItem.test.ts
@@ -1,11 +1,11 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { SSM } from 'aws-sdk'
+import { DocumentFormat, DocumentIdentifier, GetDocumentResult } from '@aws-sdk/client-ssm'
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as sinon from 'sinon'
 import * as vscode from 'vscode'
 
@@ -16,14 +16,15 @@ import * as picker from '../../../shared/ui/picker'
 import { FakeAwsContext } from '../../utilities/fakeAwsContext'
 import { DefaultSsmDocumentClient } from '../../../shared/clients/ssmDocumentClient'
 import { stub } from '../../utilities/stubber'
+import { getTestWindow } from '../../shared/vscode/window'
 
 describe('openDocumentItem', async function () {
     afterEach(function () {
         sinon.restore()
     })
 
-    const rawContent: SSM.Types.GetDocumentResult = {
-        DocumentFormat: 'json',
+    const rawContent: GetDocumentResult = {
+        DocumentFormat: DocumentFormat.JSON,
         DocumentType: 'Command',
         Name: 'testDocument',
         Content: `{
@@ -34,9 +35,9 @@ describe('openDocumentItem', async function () {
         }`,
     }
 
-    const fakeDoc: SSM.Types.DocumentIdentifier = {
+    const fakeDoc: DocumentIdentifier = {
         Name: 'testDocument',
-        DocumentFormat: 'json',
+        DocumentFormat: DocumentFormat.JSON,
         DocumentType: 'Command',
         Owner: 'Amazon',
     }
@@ -58,13 +59,13 @@ describe('openDocumentItem', async function () {
     }
 
     it('create DocumentItemNode and openDocumentItem functionality', async function () {
-        sinon.stub(vscode.window, 'showSaveDialog').returns(Promise.resolve(vscode.Uri.file('test')))
+        getTestWindow().onDidShowDialog((dialog) => dialog.selectItem(vscode.Uri.file('test')))
         sinon.stub(picker, 'promptUser').onFirstCall().returns(Promise.resolve(fakeFormatSelection))
         sinon.stub(picker, 'verifySinglePickerOutput').onFirstCall().returns(fakeFormatSelectionResult)
 
         const documentNode = generateDocumentItemNode()
         const openTextDocumentStub = sinon.stub(vscode.workspace, 'openTextDocument')
-        await openDocumentItem(documentNode, fakeAwsContext, 'json')
+        await openDocumentItem(documentNode, fakeAwsContext, DocumentFormat.JSON)
         assert.strictEqual(openTextDocumentStub.getCall(0).args[0]?.content, rawContent.Content)
         assert.strictEqual(openTextDocumentStub.getCall(0).args[0]?.language, 'ssm-json')
     })
diff --git a/packages/core/src/test/ssmDocument/commands/publishDocument.test.ts b/packages/core/src/test/ssmDocument/commands/publishDocument.test.ts
new file mode 100644
index 00000000000..c715d11ad18
--- /dev/null
+++ b/packages/core/src/test/ssmDocument/commands/publishDocument.test.ts
@@ -0,0 +1,119 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    CreateDocumentRequest,
+    CreateDocumentResult,
+    UpdateDocumentRequest,
+    UpdateDocumentResult,
+} from '@aws-sdk/client-ssm'
+
+import assert from 'assert'
+import * as sinon from 'sinon'
+import * as vscode from 'vscode'
+
+import { DefaultSsmDocumentClient } from '../../../shared/clients/ssmDocumentClient'
+import * as publish from '../../../ssmDocument/commands/publishDocument'
+import * as ssmUtils from '../../../ssmDocument/util/util'
+import {
+    PublishSSMDocumentAction,
+    PublishSSMDocumentWizardResponse,
+} from '../../../ssmDocument/wizards/publishDocumentWizard'
+import { closeAllEditors } from '../../testUtil'
+import { stub } from '../../utilities/stubber'
+import { getTestWindow } from '../../shared/vscode/window'
+import { SeverityLevel } from '../../shared/vscode/message'
+
+describe('publishDocument', async function () {
+    let wizardResponse: PublishSSMDocumentWizardResponse
+    let textDocument: vscode.TextDocument
+    let result: CreateDocumentResult | UpdateDocumentResult
+
+    const fakeCreateRequest: CreateDocumentRequest = {
+        Content: 'foo',
+        DocumentFormat: 'JSON',
+        DocumentType: 'Automation',
+        Name: 'test',
+    }
+    const fakeUpdateRequest: UpdateDocumentRequest = {
+        Content: 'foo',
+        DocumentFormat: 'JSON',
+        DocumentVersion: '$LATEST',
+        Name: 'test',
+    }
+
+    beforeEach(async function () {
+        wizardResponse = {
+            action: PublishSSMDocumentAction.QuickUpdate,
+            name: 'test',
+            documentType: 'Automation',
+            region: '',
+        }
+        result = {
+            DocumentDescription: {
+                Name: 'testName',
+            },
+        }
+        textDocument = await vscode.workspace.openTextDocument({ content: 'foo', language: 'ssm-json' })
+    })
+
+    afterEach(async function () {
+        sinon.restore()
+        await closeAllEditors()
+    })
+
+    describe('createDocument', async function () {
+        it('createDocument API returns successfully', async function () {
+            wizardResponse = {
+                action: PublishSSMDocumentAction.QuickCreate,
+                name: 'test',
+                documentType: 'Automation',
+                region: '',
+            }
+
+            const client = stub(DefaultSsmDocumentClient, { regionCode: 'region-1' })
+            client.createDocument.resolves(result)
+
+            await publish.createDocument(wizardResponse, textDocument, client)
+
+            assert(client.createDocument.calledOnce)
+            assert.deepStrictEqual(client.createDocument.args, [[fakeCreateRequest]])
+        })
+
+        it('createDocument API failed', async function () {
+            const client = stub(DefaultSsmDocumentClient, { regionCode: 'region-1' })
+            client.createDocument.rejects(new Error('Create Error'))
+
+            await publish.createDocument(wizardResponse, textDocument, client)
+            const errorMessage = getTestWindow().shownMessages.filter((m) => m.severity === SeverityLevel.Error)[0]
+            assert.ok(errorMessage)
+            errorMessage.assertMessage("Failed to create Systems Manager Document 'test'. \nCreate Error")
+        })
+    })
+
+    describe('updateDocument', async function () {
+        it('updateDocument API returns successfully', async function () {
+            const client = stub(DefaultSsmDocumentClient, { regionCode: 'region-1' })
+            client.updateDocument.resolves(result)
+
+            sinon.stub(ssmUtils, 'showConfirmationMessage').resolves(false)
+            await publish.updateDocument(wizardResponse, textDocument, client)
+
+            assert(client.updateDocument.calledOnce)
+            assert.deepStrictEqual(client.updateDocument.args, [[fakeUpdateRequest]])
+        })
+
+        it('updateDocument API failed', async function () {
+            const client = stub(DefaultSsmDocumentClient, { regionCode: 'region-1' })
+            client.updateDocument.rejects(new Error('Update Error'))
+
+            sinon.stub(ssmUtils, 'showConfirmationMessage').resolves(false)
+            await publish.updateDocument(wizardResponse, textDocument, client)
+            const errorMessage = getTestWindow().shownMessages.filter((m) => m.severity === SeverityLevel.Error)[0]
+            assert.ok(errorMessage)
+            errorMessage.assertMessage("Failed to update Systems Manager Document 'test'. \nUpdate Error")
+        })
+    })
+})
diff --git a/packages/core/src/test/ssmDocument/commands/updateDocumentVersion.test.ts b/packages/core/src/test/ssmDocument/commands/updateDocumentVersion.test.ts
new file mode 100644
index 00000000000..da941e43d62
--- /dev/null
+++ b/packages/core/src/test/ssmDocument/commands/updateDocumentVersion.test.ts
@@ -0,0 +1,85 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { DocumentFormat, DocumentIdentifier, DocumentVersionInfo } from '@aws-sdk/client-ssm'
+import * as sinon from 'sinon'
+import assert from 'assert'
+
+import { updateDocumentVersion } from '../../../ssmDocument/commands/updateDocumentVersion'
+import { DocumentItemNodeWriteable } from '../../../ssmDocument/explorer/documentItemNodeWriteable'
+
+import * as picker from '../../../shared/ui/picker'
+import { FakeAwsContext } from '../../utilities/fakeAwsContext'
+import { DefaultSsmDocumentClient } from '../../../shared/clients/ssmDocumentClient'
+import { stub } from '../../utilities/stubber'
+import { RegistryItemNode } from '../../../ssmDocument/explorer/registryItemNode'
+
+describe('openDocumentItem', async function () {
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    const fakeDoc: DocumentIdentifier = {
+        Name: 'testDocument',
+        DocumentFormat: DocumentFormat.JSON,
+        DocumentType: 'Command',
+        Owner: 'Amazon',
+    }
+
+    const fakeAwsContext = new FakeAwsContext()
+
+    const fakeRegion = 'us-east-1'
+
+    const fakeSchemaList: DocumentVersionInfo[] = [
+        {
+            Name: 'testDocument',
+            DocumentVersion: '1',
+        },
+        {
+            Name: 'testDocument',
+            DocumentVersion: '2',
+        },
+    ]
+
+    const fakeVersionSelectionResult = {
+        label: '2',
+        description: 'default',
+    }
+
+    it('updateDocumentVersion with correct name and version', async function () {
+        sinon.stub(picker, 'promptUser').onFirstCall().resolves(undefined)
+        sinon.stub(picker, 'verifySinglePickerOutput').onFirstCall().returns(fakeVersionSelectionResult)
+        sinon.stub(fakeAwsContext, 'getCredentialAccountId').returns('Amazon')
+        const ssmClient = stub(DefaultSsmDocumentClient, { regionCode: 'region-1' })
+        const documentNode = new DocumentItemNodeWriteable(
+            fakeDoc,
+            ssmClient,
+            fakeRegion,
+            // jscpd:ignore-start
+            stub(RegistryItemNode, {
+                documentType: '',
+                regionCode: '',
+                registryName: '',
+                serviceId: undefined,
+                label: undefined,
+                id: undefined,
+                iconPath: undefined,
+                description: undefined,
+                resourceUri: undefined,
+                tooltip: undefined,
+                command: undefined,
+                collapsibleState: undefined,
+                contextValue: undefined,
+                accessibilityInformation: undefined,
+                checkboxState: undefined,
+            })
+            // jscpd:ignore-end
+        )
+        sinon.stub(documentNode, 'listSchemaVersion').resolves(fakeSchemaList)
+        const updateVersionStub = sinon.stub(documentNode, 'updateDocumentVersion')
+        await updateDocumentVersion(documentNode, fakeAwsContext)
+        assert.strictEqual(updateVersionStub.getCall(0).args[0], '2')
+    })
+})
diff --git a/src/test/ssmDocument/explorer/documentItemNode.test.ts b/packages/core/src/test/ssmDocument/explorer/documentItemNode.test.ts
similarity index 85%
rename from src/test/ssmDocument/explorer/documentItemNode.test.ts
rename to packages/core/src/test/ssmDocument/explorer/documentItemNode.test.ts
index 6cdda017486..3fa5dedef21 100644
--- a/src/test/ssmDocument/explorer/documentItemNode.test.ts
+++ b/packages/core/src/test/ssmDocument/explorer/documentItemNode.test.ts
@@ -1,17 +1,17 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
-import { SSM } from 'aws-sdk'
+import assert from 'assert'
+import { DocumentIdentifier } from '@aws-sdk/client-ssm'
 import { DefaultSsmDocumentClient } from '../../../shared/clients/ssmDocumentClient'
 import { DocumentItemNode } from '../../../ssmDocument/explorer/documentItemNode'
 import { stub } from '../../utilities/stubber'
 
 describe('DocumentItemNode', async function () {
     let testNode: DocumentItemNode
-    const testDoc: SSM.DocumentIdentifier = {
+    const testDoc: DocumentIdentifier = {
         Name: 'testDoc',
         Owner: 'Amazon',
     }
diff --git a/src/test/ssmDocument/explorer/documentTypeNode.test.ts b/packages/core/src/test/ssmDocument/explorer/documentTypeNode.test.ts
similarity index 89%
rename from src/test/ssmDocument/explorer/documentTypeNode.test.ts
rename to packages/core/src/test/ssmDocument/explorer/documentTypeNode.test.ts
index 3135ca24160..771dff9a5dd 100644
--- a/src/test/ssmDocument/explorer/documentTypeNode.test.ts
+++ b/packages/core/src/test/ssmDocument/explorer/documentTypeNode.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as sinon from 'sinon'
 import { DocumentTypeNode } from '../../../ssmDocument/explorer/documentTypeNode'
 
@@ -29,9 +29,9 @@ describe('DocumentTypeNode', function () {
         const childNodes = await testNode.getChildren()
 
         assert.strictEqual(childNodes.length, expectedChildNodeNames.length)
-        childNodes.forEach((child, index) => {
+        for (const [index, child] of childNodes.entries()) {
             assert.strictEqual(child.label, expectedChildNodeNames[index])
-        })
+        }
     })
 
     it('handles error', async function () {
diff --git a/packages/core/src/test/ssmDocument/explorer/registryItemNode.test.ts b/packages/core/src/test/ssmDocument/explorer/registryItemNode.test.ts
new file mode 100644
index 00000000000..2c44bc45315
--- /dev/null
+++ b/packages/core/src/test/ssmDocument/explorer/registryItemNode.test.ts
@@ -0,0 +1,62 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { RegistryItemNode } from '../../../ssmDocument/explorer/registryItemNode'
+import { assertNodeListOnlyHasErrorNode } from '../../utilities/explorerNodeAssertions'
+import { asyncGenerator } from '../../../shared/utilities/collectionUtils'
+import { DefaultSsmDocumentClient } from '../../../shared/clients/ssmDocumentClient'
+import { stub } from '../../utilities/stubber'
+
+describe('RegistryItemNode', function () {
+    const regionCode = 'testRegion'
+    const documentType = 'Automation'
+    const registryNames = ['Owned by me', 'Owned by Amazon', 'Shared with me']
+
+    it('handles error', async function () {
+        const client = stub(DefaultSsmDocumentClient, { regionCode })
+        client.listDocuments.throws('error')
+
+        const testNode = new RegistryItemNode(regionCode, 'Owned by me', documentType, client)
+        const childNodes = await testNode.getChildren()
+
+        assertNodeListOnlyHasErrorNode(childNodes)
+    })
+
+    it('puts documents into right registry', async function () {
+        return Promise.all(
+            registryNames.map(async (registry) => {
+                let owner: string
+                if (registry === 'Owned by Amazon') {
+                    owner = 'Amazon'
+                } else if (registry === 'Owned by me') {
+                    owner = '123456789012'
+                } else {
+                    owner = '987654321012'
+                }
+
+                const client = stub(DefaultSsmDocumentClient, { regionCode })
+                client.listDocuments.callsFake(() => {
+                    return asyncGenerator([
+                        {
+                            Name: `${owner}doc`,
+                            Owner: `${owner}`,
+                            DocumentType: `${documentType}`,
+                        },
+                    ])
+                })
+
+                const testNode: RegistryItemNode = new RegistryItemNode(regionCode, registry, documentType, client)
+                const childNode = await testNode.getChildren()
+                const expectedNodeNames = [`${owner}doc`]
+
+                assert.strictEqual(childNode.length, expectedNodeNames.length)
+                for (const [index, node] of childNode.entries()) {
+                    assert.strictEqual(node.label, expectedNodeNames[index])
+                }
+            })
+        )
+    })
+})
diff --git a/src/test/ssmDocument/explorer/ssmDocumentNode.test.ts b/packages/core/src/test/ssmDocument/explorer/ssmDocumentNode.test.ts
similarity index 84%
rename from src/test/ssmDocument/explorer/ssmDocumentNode.test.ts
rename to packages/core/src/test/ssmDocument/explorer/ssmDocumentNode.test.ts
index 104ef17a24d..29eb906b7a8 100644
--- a/src/test/ssmDocument/explorer/ssmDocumentNode.test.ts
+++ b/packages/core/src/test/ssmDocument/explorer/ssmDocumentNode.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import { SsmDocumentNode } from '../../../ssmDocument/explorer/ssmDocumentNode'
 import { DocumentTypeNode } from '../../../ssmDocument/explorer/documentTypeNode'
 import { DEFAULT_TEST_REGION_CODE } from '../../shared/regions/testUtil'
@@ -16,9 +16,9 @@ describe('SsmDocumentNode', function () {
 
         assert.strictEqual(childNodes.length, expectedChildNodeNames.length, 'Unexpected child node length')
 
-        childNodes.forEach((node, index) => {
+        for (const [index, node] of childNodes.entries()) {
             assert.ok(node instanceof DocumentTypeNode, 'Expected child node to be RegistryItemNode')
             assert.strictEqual(node.label, expectedChildNodeNames[index])
-        })
+        }
     })
 })
diff --git a/src/test/ssmDocument/util/validateDocumentName.test.ts b/packages/core/src/test/ssmDocument/util/validateDocumentName.test.ts
similarity index 84%
rename from src/test/ssmDocument/util/validateDocumentName.test.ts
rename to packages/core/src/test/ssmDocument/util/validateDocumentName.test.ts
index d1074df4cdc..7aee7f61641 100644
--- a/src/test/ssmDocument/util/validateDocumentName.test.ts
+++ b/packages/core/src/test/ssmDocument/util/validateDocumentName.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import { validateDocumentName } from '../../../ssmDocument/util/validateDocumentName'
 
 describe('validateDocumenttName', function () {
@@ -26,13 +26,13 @@ describe('validateDocumenttName', function () {
         assert.strictEqual(validateDocumentName('Aaaaa'), undefined)
     })
 
-    invalidErrors.forEach(invalid => {
+    for (const invalid of invalidErrors) {
         describe(invalid.error, () => {
-            invalid.documentNames.forEach(documentName => {
+            for (const documentName of invalid.documentNames) {
                 it(documentName, () => {
                     assert.strictEqual(validateDocumentName(documentName), invalid.error)
                 })
-            })
+            }
         })
-    })
+    }
 })
diff --git a/src/test/ssmDocument/wizards/publishDocumentWizard.test.ts b/packages/core/src/test/ssmDocument/wizards/publishDocumentWizard.test.ts
similarity index 79%
rename from src/test/ssmDocument/wizards/publishDocumentWizard.test.ts
rename to packages/core/src/test/ssmDocument/wizards/publishDocumentWizard.test.ts
index 05bd65c05bf..d861bc3adb2 100644
--- a/src/test/ssmDocument/wizards/publishDocumentWizard.test.ts
+++ b/packages/core/src/test/ssmDocument/wizards/publishDocumentWizard.test.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -12,9 +12,9 @@ import {
 describe('AppRunnerCodeRepositoryWizard', function () {
     let tester: WizardTester<PublishSSMDocumentWizardResponse>
 
-    beforeEach(function () {
+    beforeEach(async function () {
         const wizard = new PublishSSMDocumentWizard()
-        tester = createWizardTester(wizard)
+        tester = await createWizardTester(wizard)
     })
 
     it('has 3 steps by default', function () {
@@ -32,9 +32,9 @@ describe('AppRunnerCodeRepositoryWizard', function () {
         tester.name.assertShowThird()
     })
 
-    it('skips the region prompt if provided a region', function () {
+    it('skips the region prompt if provided a region', async function () {
         const wizard = new PublishSSMDocumentWizard('us-west-2')
-        tester = createWizardTester(wizard)
+        tester = await createWizardTester(wizard)
         tester.region.assertDoesNotShow()
         tester.assertShowCount(2)
     })
diff --git a/src/test/stepFunctions/commands/getStateMachineDefinitionFromCfnTemplate.test.ts b/packages/core/src/test/stepFunctions/commands/getStateMachineDefinitionFromCfnTemplate.test.ts
similarity index 98%
rename from src/test/stepFunctions/commands/getStateMachineDefinitionFromCfnTemplate.test.ts
rename to packages/core/src/test/stepFunctions/commands/getStateMachineDefinitionFromCfnTemplate.test.ts
index f0818d22fe2..3a2cb4243f0 100644
--- a/src/test/stepFunctions/commands/getStateMachineDefinitionFromCfnTemplate.test.ts
+++ b/packages/core/src/test/stepFunctions/commands/getStateMachineDefinitionFromCfnTemplate.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as getCfnDefinition from '../../../stepFunctions/commands/visualizeStateMachine/getStateMachineDefinitionFromCfnTemplate'
 
 import { normalize } from '../../../shared/utilities/pathUtils'
diff --git a/src/test/stepFunctions/commands/resources/templateJsonTester.template.json b/packages/core/src/test/stepFunctions/commands/resources/templateJsonTester.template.json
similarity index 100%
rename from src/test/stepFunctions/commands/resources/templateJsonTester.template.json
rename to packages/core/src/test/stepFunctions/commands/resources/templateJsonTester.template.json
diff --git a/src/test/stepFunctions/explorer/stepFunctionNodes.test.ts b/packages/core/src/test/stepFunctions/explorer/stepFunctionNodes.test.ts
similarity index 83%
rename from src/test/stepFunctions/explorer/stepFunctionNodes.test.ts
rename to packages/core/src/test/stepFunctions/explorer/stepFunctionNodes.test.ts
index 8f1492e95f4..61b4f2b1813 100644
--- a/src/test/stepFunctions/explorer/stepFunctionNodes.test.ts
+++ b/packages/core/src/test/stepFunctions/explorer/stepFunctionNodes.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import {
     contextValueStateMachine,
     StateMachineNode,
@@ -13,19 +13,19 @@ import {
     assertNodeListOnlyHasErrorNode,
     assertNodeListOnlyHasPlaceholderNode,
 } from '../../utilities/explorerNodeAssertions'
-import { asyncGenerator } from '../../utilities/collectionUtils'
+import { asyncGenerator } from '../../../shared/utilities/collectionUtils'
 import globals from '../../../shared/extensionGlobals'
-import { DefaultStepFunctionsClient } from '../../../shared/clients/stepFunctionsClient'
+import { StepFunctionsClient } from '../../../shared/clients/stepFunctions'
 import { stub } from '../../utilities/stubber'
 
 const regionCode = 'someregioncode'
 
 describe('StepFunctionsNode', function () {
     function createStatesClient(...stateMachineNames: string[]) {
-        const client = stub(DefaultStepFunctionsClient, { regionCode })
+        const client = stub(StepFunctionsClient, { regionCode })
         client.listStateMachines.returns(
             asyncGenerator(
-                stateMachineNames.map(name => {
+                stateMachineNames.map((name) => {
                     return {
                         name: name,
                         stateMachineArn: 'arn:aws:states:us-east-1:123412341234:stateMachine:' + name,
@@ -52,14 +52,14 @@ describe('StepFunctionsNode', function () {
 
         assert.strictEqual(childNodes.length, 2, 'Unexpected child count')
 
-        childNodes.forEach(node => {
+        for (const node of childNodes) {
             assert.ok(node instanceof StateMachineNode, 'Expected child node to be StateMachineNode')
             assert.strictEqual(
                 node.contextValue,
                 contextValueStateMachine,
                 'expected the node to have a State Machine contextValue'
             )
-        })
+        }
     })
 
     it('sorts child nodes', async function () {
@@ -67,7 +67,7 @@ describe('StepFunctionsNode', function () {
         const testNode = new StepFunctionsNode(regionCode, client)
         const childNodes = await testNode.getChildren()
 
-        const actualChildOrder = childNodes.map(node => node.label)
+        const actualChildOrder = childNodes.map((node) => node.label)
         assert.deepStrictEqual(actualChildOrder, ['a', 'b', 'c'], 'Unexpected child sort order')
     })
 
diff --git a/packages/core/src/test/stepFunctions/utils.test.ts b/packages/core/src/test/stepFunctions/utils.test.ts
new file mode 100644
index 00000000000..2616316b6fd
--- /dev/null
+++ b/packages/core/src/test/stepFunctions/utils.test.ts
@@ -0,0 +1,121 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import { isDocumentValid, isStepFunctionsRole } from '../../stepFunctions/utils'
+import { IamRole } from '../../shared/clients/iam'
+
+describe('isStepFunctionsRole', function () {
+    const baseIamRole: IamRole = {
+        Path: '',
+        RoleName: '',
+        RoleId: 'myRole',
+        Arn: 'arn:aws:iam::123456789012:role/myRole',
+        CreateDate: new Date(),
+    }
+
+    it('return true if the Step Functions service principal is in the AssumeRolePolicyDocument', function () {
+        const role: IamRole = {
+            ...baseIamRole,
+            AssumeRolePolicyDocument: JSON.stringify({
+                Version: '2012-10-17',
+                Statement: [
+                    {
+                        Effect: 'Allow',
+                        Principal: {
+                            Service: ['states.amazonaws.com'],
+                        },
+                        Action: ['sts:AssumeRole'],
+                    },
+                ],
+            }),
+        }
+        assert.ok(isStepFunctionsRole(role))
+    })
+
+    it('returns false if the role does not have an AssumeRolePolicyDocument', function () {
+        assert.ok(!isStepFunctionsRole(baseIamRole))
+    })
+
+    it("returns false if the AssumeRolePolicyDocument does not contain Step Functions' service principal", () => {
+        const role: IamRole = {
+            ...baseIamRole,
+            AssumeRolePolicyDocument: JSON.stringify({
+                Version: '2012-10-17',
+                Statement: [
+                    {
+                        Effect: 'Allow',
+                        Principal: {
+                            Service: ['lambda.amazonaws.com'],
+                        },
+                        Action: ['sts:AssumeRole'],
+                    },
+                ],
+            }),
+        }
+        assert.ok(!isStepFunctionsRole(role))
+    })
+})
+
+describe('isDocumentValid', async function () {
+    it('returns true for valid ASL', async function () {
+        const aslText = `
+            {
+                "StartAt": "FirstMatchState",
+                "States": {
+                    "FirstMatchState": {
+                        "Type": "Task",
+                        "Resource": "arn:aws:lambda:us-west-2:000000000000:function:OnFirstMatch",
+                        "End": true
+                    }
+                }
+            } `
+
+        const textDocument = await vscode.workspace.openTextDocument({ language: 'asl' })
+
+        const isValid = await isDocumentValid(aslText, textDocument)
+        assert.ok(isValid)
+    })
+
+    it('returns true for ASL with invalid arns', async function () {
+        const aslText = `
+            {
+                "StartAt": "FirstMatchState",
+                "States": {
+                    "FirstMatchState": {
+                        "Type": "Task",
+                        "Resource": "arn:aws:lambda:REGION:ACCOUNT_ID:function:OnFirstMatch",
+                        "End": true
+                    }
+                }
+            } `
+
+        const textDocument = await vscode.workspace.openTextDocument({ language: 'asl' })
+
+        const isValid = await isDocumentValid(aslText, textDocument)
+        assert.ok(isValid)
+    })
+
+    it('returns false for invalid ASL', async function () {
+        const aslText = `
+            {
+                "StartAt": "Does not exist",
+                "States": {
+                    "FirstMatchState": {
+                        "Type": "Task",
+                        "Resource": "arn:aws:lambda:us-west-2:000000000000:function:OnFirstMatch",
+                        "End": true
+                    }
+                }
+            } `
+
+        const textDocument = await vscode.workspace.openTextDocument({ language: 'asl' })
+
+        const isValid = await isDocumentValid(aslText, textDocument)
+
+        assert.ok(!isValid)
+    })
+})
diff --git a/src/test/stepFunctions/wizards/createStateMachineWizard.test.ts b/packages/core/src/test/stepFunctions/wizards/createStateMachineWizard.test.ts
similarity index 75%
rename from src/test/stepFunctions/wizards/createStateMachineWizard.test.ts
rename to packages/core/src/test/stepFunctions/wizards/createStateMachineWizard.test.ts
index 8f90945f3f9..8ddad069fd1 100644
--- a/src/test/stepFunctions/wizards/createStateMachineWizard.test.ts
+++ b/packages/core/src/test/stepFunctions/wizards/createStateMachineWizard.test.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -9,8 +9,8 @@ import { createWizardTester, WizardTester } from '../../shared/wizards/wizardTes
 describe('CreateStateMachineWizard', function () {
     let tester: WizardTester<CreateStateMachineWizard>
 
-    beforeEach(function () {
-        tester = createWizardTester(new CreateStateMachineWizard())
+    beforeEach(async function () {
+        tester = await createWizardTester(new CreateStateMachineWizard())
     })
 
     it('prompts for a file name and format', async function () {
diff --git a/src/test/stepFunctions/wizards/previewStateMachineCDKWizard.test.ts b/packages/core/src/test/stepFunctions/wizards/previewStateMachineCDKWizard.test.ts
similarity index 90%
rename from src/test/stepFunctions/wizards/previewStateMachineCDKWizard.test.ts
rename to packages/core/src/test/stepFunctions/wizards/previewStateMachineCDKWizard.test.ts
index 67fd47ff028..9281f73948f 100644
--- a/src/test/stepFunctions/wizards/previewStateMachineCDKWizard.test.ts
+++ b/packages/core/src/test/stepFunctions/wizards/previewStateMachineCDKWizard.test.ts
@@ -1,10 +1,10 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
-import { ConstructTreeEntity } from '../../../cdk/explorer/tree/types'
+import assert from 'assert'
+import { ConstructTreeEntity } from '../../../awsService/cdk/explorer/tree/types'
 import {
     getStateMachines,
     PreviewStateMachineCDKWizard,
@@ -84,8 +84,8 @@ describe('getStateMachines', function () {
 describe('PreviewStateMachineCDKWizard', async function () {
     let tester: WizardTester<PreviewStateMachineCDKWizard>
 
-    beforeEach(function () {
-        tester = createWizardTester(new PreviewStateMachineCDKWizard())
+    beforeEach(async function () {
+        tester = await createWizardTester(new PreviewStateMachineCDKWizard())
     })
 
     it('prompts for location then a state machine', function () {
diff --git a/src/test/stepFunctions/wizards/publishStateMachineWizard.test.ts b/packages/core/src/test/stepFunctions/wizards/publishStateMachineWizard.test.ts
similarity index 88%
rename from src/test/stepFunctions/wizards/publishStateMachineWizard.test.ts
rename to packages/core/src/test/stepFunctions/wizards/publishStateMachineWizard.test.ts
index bc4aeb3f635..5d4b50d25b6 100644
--- a/src/test/stepFunctions/wizards/publishStateMachineWizard.test.ts
+++ b/packages/core/src/test/stepFunctions/wizards/publishStateMachineWizard.test.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -12,8 +12,8 @@ import { WizardTester, createWizardTester } from '../../shared/wizards/wizardTes
 describe('PublishStateMachineWizard', async function () {
     let tester: WizardTester<PublishStateMachineWizard>
 
-    beforeEach(function () {
-        tester = createWizardTester(new PublishStateMachineWizard())
+    beforeEach(async function () {
+        tester = await createWizardTester(new PublishStateMachineWizard())
     })
 
     it('only shows two steps until an action is selected', function () {
diff --git a/packages/core/src/test/stepFunctions/workflowStudio/workflowStudioApiHandler.test.ts b/packages/core/src/test/stepFunctions/workflowStudio/workflowStudioApiHandler.test.ts
new file mode 100644
index 00000000000..c16534abc4d
--- /dev/null
+++ b/packages/core/src/test/stepFunctions/workflowStudio/workflowStudioApiHandler.test.ts
@@ -0,0 +1,109 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import sinon from 'sinon'
+import { WorkflowStudioApiHandler } from '../../../stepFunctions/workflowStudio/workflowStudioApiHandler'
+import { MockDocument } from '../../fake/fakeDocument'
+import {
+    ApiAction,
+    Command,
+    MessageType,
+    WebviewContext,
+    WorkflowMode,
+} from '../../../stepFunctions/workflowStudio/types'
+import * as vscode from 'vscode'
+import { assertTelemetry } from '../../testUtil'
+import { StepFunctionsClient } from '../../../shared/clients/stepFunctions'
+import { IamClient } from '../../../shared/clients/iam'
+
+describe('WorkflowStudioApiHandler', function () {
+    let postMessageStub: sinon.SinonStub
+    let apiHandler: WorkflowStudioApiHandler
+    let testState: sinon.SinonStub
+
+    async function assertTestApiResponse(expectedResponse: any) {
+        await apiHandler.performApiCall({
+            apiName: ApiAction.SFNTestState,
+            params: {
+                definition: '',
+                roleArn: '',
+            },
+            requestId: 'test-request-id',
+            command: Command.API_CALL,
+            messageType: MessageType.REQUEST,
+        })
+
+        assertTelemetry('ui_click', {
+            elementId: 'stepfunctions_testState',
+        })
+        assert(postMessageStub.firstCall.calledWithExactly(expectedResponse))
+    }
+
+    beforeEach(() => {
+        const panel = vscode.window.createWebviewPanel('WorkflowStudioMock', 'WorkflowStudioMockTitle', {
+            viewColumn: vscode.ViewColumn.Active,
+            preserveFocus: true,
+        })
+
+        postMessageStub = sinon.stub(panel.webview, 'postMessage')
+
+        const context: WebviewContext = {
+            stateMachineName: '',
+            mode: WorkflowMode.Editable,
+            defaultTemplateName: '',
+            defaultTemplatePath: '',
+            disposables: [],
+            panel,
+            textDocument: new MockDocument('', 'foo', async () => true),
+            workSpacePath: '',
+            fileStates: {},
+            loaderNotification: undefined,
+            fileId: '',
+        }
+
+        const sfnClient = new StepFunctionsClient('us-east-1')
+        apiHandler = new WorkflowStudioApiHandler('us-east-1', context, {
+            sfn: sfnClient,
+            iam: new IamClient('us-east-1'),
+        })
+
+        testState = sinon.stub(sfnClient, 'testState')
+    })
+
+    it('should handle request and response for success', async function () {
+        testState.resolves({
+            output: 'Test state output',
+        })
+
+        await assertTestApiResponse({
+            messageType: MessageType.RESPONSE,
+            command: Command.API_CALL,
+            apiName: ApiAction.SFNTestState,
+            response: {
+                output: 'Test state output',
+            },
+            requestId: 'test-request-id',
+            isSuccess: true,
+        })
+    })
+
+    it('should handle request and response for error', async function () {
+        testState.rejects(new Error('Error testing state'))
+
+        await assertTestApiResponse({
+            messageType: MessageType.RESPONSE,
+            command: Command.API_CALL,
+            apiName: ApiAction.SFNTestState,
+            error: {
+                message: 'Error testing state',
+                name: 'Error',
+                stack: sinon.match.string,
+            },
+            isSuccess: false,
+            requestId: 'test-request-id',
+        })
+    })
+})
diff --git a/packages/core/src/test/techdebt.test.ts b/packages/core/src/test/techdebt.test.ts
new file mode 100644
index 00000000000..aa96726b046
--- /dev/null
+++ b/packages/core/src/test/techdebt.test.ts
@@ -0,0 +1,41 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as semver from 'semver'
+import * as env from '../shared/vscode/env'
+
+// Checks project config and dependencies, to remind us to remove old things
+// when possible.
+describe('tech debt', function () {
+    // @ts-ignore
+    function fixByDate(date: string, msg: string) {
+        const now = Date.now()
+        const cutoffDate = Date.parse(date)
+        assert.ok(now <= cutoffDate, msg)
+    }
+
+    it('vscode minimum version', async function () {
+        const minVscode = env.getMinVscodeVersion()
+        assert.ok(semver.lt(minVscode, '1.84.0'))
+
+        assert.ok(
+            semver.lt(minVscode, '1.110.0'),
+            'Check to see if https://github.com/microsoft/vscode/issues/173861 is resolved. Allows us to remove work done by https://github.com/aws/aws-toolkit-vscode-staging/pull/1214 and part of https://github.com/aws/aws-toolkit-vscode/pull/6664'
+        )
+    })
+
+    it('nodejs minimum version', async function () {
+        const minNodejs = env.getMinNodejsVersion()
+
+        // XXX: available since node 16, but not sure how much work this will be, yet.
+        assert.ok(
+            semver.lt(minNodejs, '18.0.0'),
+            'with node16+, we can now use AbortController to cancel Node things (child processes, HTTP requests, etc.)'
+        )
+        // This is relevant for the use of `fs.cpSync` in the copyFiles scripts.
+        assert.ok(semver.lt(minNodejs, '18.0.0'), 'with node18+, we can remove the dependency on @types/node@18')
+    })
+})
diff --git a/src/test/templates/sam/samTemplateGenerator.test.ts b/packages/core/src/test/templates/sam/samTemplateGenerator.test.ts
similarity index 85%
rename from src/test/templates/sam/samTemplateGenerator.test.ts
rename to packages/core/src/test/templates/sam/samTemplateGenerator.test.ts
index a9dee5ae021..615cc752c72 100644
--- a/src/test/templates/sam/samTemplateGenerator.test.ts
+++ b/packages/core/src/test/templates/sam/samTemplateGenerator.test.ts
@@ -1,15 +1,14 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
-import * as fs from 'fs-extra'
+import assert from 'assert'
 import * as path from 'path'
+import fs from '../../../shared/fs/fs'
 import { Architecture } from '../../../lambda/models/samLambdaRuntime'
-import { CloudFormation } from '../../../shared/cloudformation/cloudformation'
+import * as CloudFormation from '../../../shared/cloudformation/cloudformation'
 import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
-import { SystemUtilities } from '../../../shared/systemUtilities'
 import { SamTemplateGenerator } from '../../../shared/templates/sam/samTemplateGenerator'
 
 describe('SamTemplateGenerator', function () {
@@ -30,7 +29,7 @@ describe('SamTemplateGenerator', function () {
     })
 
     afterEach(async function () {
-        await fs.remove(tempFolder)
+        await fs.delete(tempFolder, { recursive: true })
     })
 
     function makeMinimalTemplate(): SamTemplateGenerator {
@@ -44,7 +43,7 @@ describe('SamTemplateGenerator', function () {
     it('Produces a minimal template', async function () {
         await makeMinimalTemplate().generate(templateFilename)
 
-        assert.strictEqual(await SystemUtilities.fileExists(templateFilename), true)
+        assert.strictEqual(await fs.exists(templateFilename), true)
 
         const template: CloudFormation.Template = await CloudFormation.load(templateFilename)
         assert.ok(template.Resources)
@@ -61,7 +60,7 @@ describe('SamTemplateGenerator', function () {
     it('Produces a template containing MemorySize', async function () {
         await makeMinimalTemplate().withMemorySize(sampleMemorySize).generate(templateFilename)
 
-        assert.strictEqual(await SystemUtilities.fileExists(templateFilename), true)
+        assert.strictEqual(await fs.exists(templateFilename), true)
 
         const template: CloudFormation.Template = await CloudFormation.load(templateFilename)
         assert.ok(template.Resources)
@@ -75,7 +74,7 @@ describe('SamTemplateGenerator', function () {
     it('Produces a template containing Timeout', async function () {
         await makeMinimalTemplate().withTimeout(sampleTimeout).generate(templateFilename)
 
-        assert.strictEqual(await SystemUtilities.fileExists(templateFilename), true)
+        assert.strictEqual(await fs.exists(templateFilename), true)
 
         const template: CloudFormation.Template = await CloudFormation.load(templateFilename)
         assert.ok(template.Resources)
@@ -89,7 +88,7 @@ describe('SamTemplateGenerator', function () {
     it('Produces a template containing Environment', async function () {
         await makeMinimalTemplate().withEnvironment(sampleEnvironment).generate(templateFilename)
 
-        assert.strictEqual(await SystemUtilities.fileExists(templateFilename), true)
+        assert.strictEqual(await fs.exists(templateFilename), true)
 
         const template: CloudFormation.Template = await CloudFormation.load(templateFilename)
         assert.ok(template.Resources)
@@ -103,7 +102,7 @@ describe('SamTemplateGenerator', function () {
     it('Produces a template containing Architectures', async function () {
         await makeMinimalTemplate().withArchitectures([sampleArchitecture]).generate(templateFilename)
 
-        assert.strictEqual(await SystemUtilities.fileExists(templateFilename), true)
+        assert.strictEqual(await fs.exists(templateFilename), true)
 
         const template: CloudFormation.Template = await CloudFormation.load(templateFilename)
         assert.ok(template.Resources)
@@ -123,7 +122,7 @@ describe('SamTemplateGenerator', function () {
             })
             .generate(templateFilename)
 
-        assert.strictEqual(await SystemUtilities.fileExists(templateFilename), true)
+        assert.strictEqual(await fs.exists(templateFilename), true)
 
         const template: CloudFormation.Template = await CloudFormation.load(templateFilename)
         assert.ok(template.Globals, 'Expected loaded template to have a Globals section')
@@ -147,7 +146,7 @@ describe('SamTemplateGenerator', function () {
             new Error('Missing value: at least one of ResourceName or TemplateResources')
         )
 
-        assert.strictEqual(await SystemUtilities.fileExists(templateFilename), false)
+        assert.strictEqual(await fs.exists(templateFilename), false)
     })
 
     it('errs if function handler is missing', async function () {
@@ -160,7 +159,7 @@ describe('SamTemplateGenerator', function () {
             new Error('Missing value: Handler')
         )
 
-        assert.strictEqual(await SystemUtilities.fileExists(templateFilename), false)
+        assert.strictEqual(await fs.exists(templateFilename), false)
     })
 
     it('errs if code uri is missing', async function () {
@@ -173,7 +172,7 @@ describe('SamTemplateGenerator', function () {
             new Error('Missing value: CodeUri')
         )
 
-        assert.strictEqual(await SystemUtilities.fileExists(templateFilename), false)
+        assert.strictEqual(await fs.exists(templateFilename), false)
     })
 
     it('errs if runtime is missing', async function () {
@@ -186,6 +185,6 @@ describe('SamTemplateGenerator', function () {
             new Error('Missing value: Runtime')
         )
 
-        assert.strictEqual(await SystemUtilities.fileExists(templateFilename), false)
+        assert.strictEqual(await fs.exists(templateFilename), false)
     })
 })
diff --git a/packages/core/src/test/testLogger.test.ts b/packages/core/src/test/testLogger.test.ts
new file mode 100644
index 00000000000..b75be47c8e4
--- /dev/null
+++ b/packages/core/src/test/testLogger.test.ts
@@ -0,0 +1,61 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { getLogger } from '../shared'
+import { assertLogsContain, getTestLogger } from './globalSetup.test'
+
+describe('TestLogger', function () {
+    describe('assertLogsContain', function () {
+        it('checks only at specified log level', function () {
+            const logger = getLogger()
+            logger.info('here is some info')
+            logger.debug('here is some debug')
+
+            assertLogsContain('here is some info', true, 'info')
+            assert.throws(() => assertLogsContain('here is some info', true, 'debug'))
+
+            assertLogsContain('here is some debug', true, 'debug')
+            assert.throws(() => assertLogsContain('here is some debug', true, 'info'))
+        })
+
+        it('only requires substring without exactMatch=true', function () {
+            const logger = getLogger()
+            logger.info('here is some info')
+            logger.debug('here is some debug')
+
+            assertLogsContain('some info', false, 'info')
+            assertLogsContain('some debug', false, 'debug')
+        })
+    })
+
+    it('formats objects into logs', function () {
+        const testObj = {
+            info: 'some info',
+        }
+
+        getLogger().debug('here is my testObj: %O', testObj)
+        assertLogsContain(`here is my testObj: { info: 'some info' }`, true, 'debug')
+    })
+
+    it('has one logging entry for each logging statement', function () {
+        const logger = getLogger()
+        const startingEntries = getTestLogger().getLoggedEntries().length
+        logger.info('here is some info %O', { info: 'this is info' })
+        logger.debug('here is some debug %O', { debug: 'this is debug' })
+        assert.strictEqual(getTestLogger().getLoggedEntries().length - startingEntries, 2)
+    })
+
+    it('returns entry number on each log statement', function () {
+        const logger = getLogger()
+        const startingEntryNumber = getTestLogger().getLoggedEntries().length
+        const entry1 = logger.info('here is some info %O', { info: 'this is info' })
+        const entry2 = logger.debug('here is some debug %O', { debug: 'this is debug' })
+        const entry3 = logger.debug('here is some warn %O', { warn: 'this is warn' })
+        assert.strictEqual(entry1, startingEntryNumber)
+        assert.strictEqual(entry2, startingEntryNumber + 1)
+        assert.strictEqual(entry3, startingEntryNumber + 2)
+    })
+})
diff --git a/packages/core/src/test/testLogger.ts b/packages/core/src/test/testLogger.ts
new file mode 100644
index 00000000000..ae75be5c9ba
--- /dev/null
+++ b/packages/core/src/test/testLogger.ts
@@ -0,0 +1,64 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Loggable, LogLevel } from '../shared/logger/logger'
+import { BaseLogger, compareLogLevel } from '../shared/logger/logger'
+import { Uri } from 'vscode'
+import util from 'util'
+import { isWeb } from '../shared'
+import { inspect } from '../shared/utilities/collectionUtils'
+
+/**
+ * In-memory Logger implementation suitable for use by tests.
+ */
+export class TestLogger extends BaseLogger {
+    private readonly loggedEntries: {
+        logLevel: LogLevel
+        entry: Loggable
+    }[] = []
+    private count: number = 0
+    public constructor(private logLevel: LogLevel = 'debug') {
+        super()
+    }
+
+    public getLoggedEntries(...logLevels: LogLevel[]): Loggable[] {
+        return this.loggedEntries
+            .filter((loggedEntry) => logLevels.length === 0 || logLevels.includes(loggedEntry.logLevel))
+            .map((loggedEntry) => loggedEntry.entry)
+    }
+
+    public sendToLog(logLevel: LogLevel, msg: string, ...meta: any[]): number {
+        return this.addLoggedEntries(logLevel, msg, ...meta)
+    }
+
+    private formatString(message: string, ...meta: any[]): string {
+        // Want to avoid reimplementing nodes `format` so instead concat to end of string
+        // Node's format implementation: https://github.com/nodejs/node/blob/3178a762d6a2b1a37b74f02266eea0f3d86603be/lib/internal/util/inspect.js#L2191-L2315
+        return isWeb() ? [message, meta.map((s) => inspect(s))].join(' ') : util.format(message, ...meta)
+    }
+
+    private addLoggedEntries(logLevel: LogLevel, message: Loggable, ...meta: any[]): number {
+        this.loggedEntries.push({
+            logLevel,
+            entry: typeof message === 'string' && meta.length > 0 ? this.formatString(message, ...meta) : message,
+        })
+
+        return this.count++
+    }
+
+    // No need to actually implement this. Log tracking is tested in toolkitLogger.test.ts
+    public getLogById(logID: number, file: Uri): string | undefined {
+        return undefined
+    }
+
+    public setLogLevel(logLevel: LogLevel) {
+        this.logLevel = logLevel
+    }
+
+    public logLevelEnabled(logLevel: LogLevel): boolean {
+        const currentLevel = this.logLevel as LogLevel
+        return compareLogLevel(currentLevel, logLevel) >= 0
+    }
+}
diff --git a/packages/core/src/test/testRunner.ts b/packages/core/src/test/testRunner.ts
new file mode 100644
index 00000000000..7078a785a89
--- /dev/null
+++ b/packages/core/src/test/testRunner.ts
@@ -0,0 +1,160 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import '@cspotcode/source-map-support/register'
+import * as path from 'path'
+import Mocha from 'mocha'
+import { glob } from 'glob'
+import { fs } from '../shared'
+
+// Set explicit timezone to ensure that tests run locally do not use the user's actual timezone, otherwise
+// the test can pass on one persons machine but not anothers.
+// Intentionally _not_ UTC, to increase variation in tests.
+// process.env.TZ = 'Europe/London'
+process.env.TZ = 'US/Pacific'
+
+/**
+ * @param initTests List of relative paths to test files containing root hooks: https://mochajs.org/#available-root-hooks
+ */
+export async function runTests(
+    testFolder: string | string[],
+    extensionId: string,
+    initTests: string[] = [],
+    options?: { testFiles?: string[] }
+): Promise<void> {
+    if (!process.env['AWS_TOOLKIT_AUTOMATION']) {
+        throw new Error('Expected the "AWS_TOOLKIT_AUTOMATION" environment variable to be set for tests.')
+    }
+
+    function getRoot(): string {
+        const abs = process.env['DEVELOPMENT_PATH'] ?? process.cwd()
+        if (process.platform !== 'win32') {
+            return abs
+        }
+
+        /**
+         * Tests are not run for core at the moment, but leaving this here because it may be useful in the future.
+         * It might also explain why `import { global } ...` works in web tests but `import global ...` does not.
+         *
+         * Node's `require` caches modules by case-sensitive paths, regardless of the underlying
+         * file system. This is normally not a problem, but VS Code also happens to normalize paths
+         * on Windows to use lowercase drive letters when using its bootstrap loader. This means
+         * that each module ends up getting loaded twice, once by the extension and once by any test
+         * code, causing all sorts of bizarre behavior during tests unless you normalize paths like
+         * below.
+         *
+         * In multi root npm workspaces on windows it looks like imports into other npm workspace packages
+         * makes the loaded module id an uppercase drive letter in the node require cache. #5154
+         *
+         * E.g. when we import a file from core the module ids inside of amazonq/toolkits node require
+         * cache are something like:
+         *  - C:\${pathToWorkspace}\packages\core\myfile.js
+         *
+         * However, internal workspace package imports are lower case drive letters. That means when
+         * core imports a module inside of core we see this as:
+         *  - c:\${pathToWorkspace}\packages\core\myfile.js
+         *
+         * This can cause things like globals to be undefined, since tests inside of amazonq/toolkit
+         * are looking for uppercase module ids, whereas tests inside of core are always looking for
+         * lower case module ids (since the tests live inside of core itself)
+         */
+        const [drive, ...rest] = abs.split(':')
+        return rest.length === 0 ? abs : [drive.toUpperCase(), ...rest].join(':')
+    }
+
+    const root = getRoot()
+    // output the report to the individual package
+    const outputFile = path.resolve(root, '.test-reports', 'report.xml')
+    const colorOutput = !process.env['AWS_TOOLKIT_TEST_NO_COLOR']
+
+    // Create the mocha test
+    const mocha = new Mocha({
+        ui: 'bdd',
+        color: colorOutput,
+        reporter: 'mocha-multi-reporters',
+        reporterOptions: {
+            reporterEnabled: 'mocha-junit-reporter, spec',
+            mochaJunitReporterReporterOptions: {
+                mochaFile: outputFile,
+            },
+        },
+        timeout: 0,
+    })
+
+    const dist = path.resolve(root, 'dist')
+    const rawTestFile = process.env['TEST_FILE']
+    const testFile = rawTestFile?.replace(/\\/g, '/').replace('.ts', '.js')
+    let testFilePath: string | undefined
+    if (testFile?.includes('../core/')) {
+        testFilePath = path.resolve(root, testFile.replace('../core/', '../core/dist/'))
+    } else {
+        testFilePath = testFile ? path.resolve(dist, testFile) : undefined
+    }
+
+    if (testFile && options?.testFiles) {
+        throw new Error('Individual file and list of files given to run tests on. One must be chosen.')
+    }
+
+    // The `require` option for Mocha isn't working for some reason (maybe user error?)
+    // So instead we are loading the modules ourselves and registering the relevant hooks
+    for (const relativePath of initTests) {
+        const fullPath = path.join(dist, relativePath).replace('.ts', '.js')
+        if (!fs.exists(fullPath)) {
+            console.error(`error: missing ${fullPath}`)
+            throw Error(`missing ${fullPath}`)
+        }
+
+        const pluginFile = require(fullPath)
+        if (pluginFile.mochaGlobalSetup) {
+            mocha.globalSetup(pluginFile.mochaGlobalSetup(extensionId))
+        }
+        if (pluginFile.mochaGlobalTeardown) {
+            mocha.globalTeardown(pluginFile.mochaGlobalTeardown)
+        }
+        if (pluginFile.mochaHooks) {
+            mocha.rootHooks(pluginFile.mochaHooks)
+        }
+    }
+
+    function runMocha(files: string[]): Promise<void> {
+        for (const f of files) {
+            mocha.addFile(path.resolve(dist, f))
+        }
+        return new Promise<void>((resolve, reject) => {
+            mocha.run((failures) => {
+                if (failures > 0) {
+                    reject(new Error(`${failures} tests failed.`))
+                } else {
+                    resolve()
+                }
+            })
+        })
+    }
+
+    async function writeCoverage(): Promise<void> {
+        const coverage = (globalThis as typeof globalThis & { __coverage__?: any }).__coverage__
+
+        if (coverage) {
+            const dst = path.resolve(root, '.nyc_output', 'out.json')
+            console.log(`Writing test coverage to "${dst}"`)
+            await fs.mkdir(path.dirname(dst))
+            await fs.writeFile(dst, JSON.stringify(coverage))
+        } else {
+            console.log('No test coverage found')
+        }
+    }
+
+    let files: string[] = []
+    if (options?.testFiles) {
+        files = options.testFiles
+    } else {
+        for (const f of Array.isArray(testFolder) ? testFolder : [testFolder]) {
+            files = [...files, ...(await glob(testFilePath ?? `**/${f}/**/**.test.js`, { cwd: dist }))]
+        }
+    }
+
+    await runMocha(files)
+    await writeCoverage()
+}
diff --git a/packages/core/src/test/testUtil.ts b/packages/core/src/test/testUtil.ts
new file mode 100644
index 00000000000..22b9bf6fcad
--- /dev/null
+++ b/packages/core/src/test/testUtil.ts
@@ -0,0 +1,643 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as path from 'path'
+import * as vscode from 'vscode'
+import * as FakeTimers from '@sinonjs/fake-timers'
+import * as pathutil from '../shared/utilities/pathUtils'
+import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../shared/filesystemUtilities'
+import globals from '../shared/extensionGlobals'
+import { waitUntil } from '../shared/utilities/timeoutUtils'
+import { MetricName, MetricShapes } from '../shared/telemetry/telemetry'
+import { keys, selectFrom } from '../shared/utilities/tsUtils'
+import fs from '../shared/fs/fs'
+import { DeclaredCommand } from '../shared/vscode/commands2'
+import { mkdirSync, existsSync } from 'fs' // eslint-disable-line no-restricted-imports
+import { randomBytes } from 'crypto'
+import request from '../shared/request'
+import { createStubInstance, stub } from 'sinon'
+
+const testTempDirs: string[] = []
+
+/**
+ * Writes the string form of `o` to `filepath` as UTF-8 text.
+ *
+ * Creates parent directories in `filepath`, if necessary.
+ */
+export async function toFile(o: any, filepath: string | vscode.Uri) {
+    const file = typeof filepath === 'string' ? filepath : filepath.fsPath
+    const text = o === undefined ? '' : o.toString()
+    const dir = path.dirname(file)
+    await fs.mkdir(dir)
+    await fs.writeFile(file, text)
+}
+
+/**
+ * Gets the contents of `filepath` as UTF-8 encoded string.
+ */
+export async function fromFile(filepath: string): Promise<string> {
+    return await fs.readFileText(filepath)
+}
+
+/** Gets the full path to the Toolkit source root on this machine. */
+export function getProjectDir(): string {
+    return path.join(__dirname, '../')
+}
+
+/** Instantiates a `WorkspaceFolder` object for use in tests. */
+export function getWorkspaceFolder(dir: string): vscode.WorkspaceFolder {
+    const folder = {
+        uri: vscode.Uri.file(dir),
+        name: 'test-workspace-folder',
+        index: 0,
+    }
+    return folder
+}
+
+/**
+ * An all-in-one solution for a folder to use during tests:
+ * - Cleans up after all tests complete
+ * - Each instance is isolated from other tests
+ * - Convenient methods for files operations on paths RELATIVE to the folder
+ *
+ * Create an instance using {@link TestFolder.create()}.
+ *
+ * Add any new methods to this class when needed.
+ *
+ * ---
+ *
+ * IMPORTANT:Web: This uses Node specific FS functions.
+ * This class is used in our agnostic FileSystem unit tests to do the setup.
+ * Since we do not want our FS code to be used to test itself, we aren't using it here.
+ * But if the day comes that we need it for web, we should be able to add some agnostic FS methods in here.
+ */
+export class TestFolder {
+    protected constructor(public readonly path: string) {}
+
+    /** Creates a folder that deletes itself once all tests are done running. */
+    static async create() {
+        const rootFolder = (await createTestWorkspaceFolder()).uri.fsPath
+        return new TestFolder(rootFolder)
+    }
+
+    /**
+     * Creates a file at the given path relative to the test folder.
+     * Any directories that do not exist in the given path will also be created.
+     *
+     * @returns an absolute path to the file
+     */
+    async write(relativeFilePath: string, content?: string, options?: { mode?: number }): Promise<string> {
+        const filePath = path.join(this.path, relativeFilePath)
+
+        await toFile(content ?? '', filePath)
+
+        if (options?.mode !== undefined) {
+            await fs.chmod(filePath, options.mode)
+        }
+
+        return filePath
+    }
+
+    /**
+     * Creates a directory at the given path relative to the test folder.
+     *
+     * @returns an absolute path to the folder
+     */
+    async mkdir(relativeDirPath?: string): Promise<string> {
+        relativeDirPath ??= randomBytes(4).toString('hex')
+        const absolutePath = this.pathFrom(relativeDirPath)
+        mkdirSync(absolutePath, { recursive: true })
+        assert(existsSync(absolutePath))
+        return absolutePath
+    }
+
+    /** Returns an absolute path compose of the test folder path and the given relative path. */
+    pathFrom(relativePath: string): string {
+        return path.join(this.path, relativePath)
+    }
+}
+
+/**
+ * @deprecated Use {@link TestFolder} instead.
+ *
+ * TODO: move this inside of {@link TestFolder}.
+ *
+ * ---
+ *
+ * Creates a random, temporary workspace folder on the filesystem and returns a `WorkspaceFolder`
+ * object. The folder will be automatically deleted after tests complete.
+ *
+ * @param name  Folder name (default: "test-workspace-folder").
+ * @param subDir Subdirectory created in the workspace folder and returned in the result.
+ */
+export async function createTestWorkspaceFolder(name?: string, subDir?: string): Promise<vscode.WorkspaceFolder> {
+    const tempFolder = await makeTemporaryToolkitFolder()
+    testTempDirs.push(tempFolder)
+    const finalWsFolder = subDir === undefined ? tempFolder : path.join(tempFolder, subDir)
+    if (subDir !== undefined && subDir.length > 0) {
+        await fs.mkdir(finalWsFolder)
+    }
+    return {
+        uri: vscode.Uri.file(finalWsFolder),
+        name: name ?? 'test-workspace-folder',
+        index: 0,
+    }
+}
+
+export async function createTestFile(fileName: string): Promise<vscode.Uri> {
+    const tempFolder = await makeTemporaryToolkitFolder()
+    testTempDirs.push(tempFolder) // ensures this is deleted at the end
+    const tempFilePath = path.join(tempFolder, fileName)
+    await fs.writeFile(tempFilePath, '')
+    return vscode.Uri.file(tempFilePath)
+}
+
+/**
+ * Creates a temporary workspace with test files in it.
+ *
+ * @param n number of temporary test files to create in the workspace
+ * @param opts allows to pass options to have a custom fileName and/or file content and also to add a file with an exclusion pattern from src/shared/fs/watchedFiles.ts
+ * @returns the path to the workspace folder
+ */
+export async function createTestWorkspace(
+    n: number,
+    opts: {
+        /**
+         * optional filename prefix for all created files
+         */
+        fileNamePrefix?: string
+        /**
+         * optional file content
+         */
+        fileContent?: string
+        /**
+         * name of the workspace folder
+         */
+        workspaceName?: string
+        /**
+         * the subDir where the workspace folder will point to within the temp folder
+         */
+        subDir?: string
+        /**
+         * optional file name suffix
+         */
+        fileNameSuffix?: string
+    }
+): Promise<vscode.WorkspaceFolder> {
+    const workspace = await createTestWorkspaceFolder(opts.workspaceName, opts.subDir)
+
+    if (n <= 0) {
+        throw new Error('test file numbers cannot be less or equal to zero')
+    }
+
+    const fileNamePrefix = opts?.fileNamePrefix ?? 'test-file-'
+    const fileNameSuffix = opts?.fileNameSuffix ?? ''
+    const fileContent = opts?.fileContent ?? ''
+
+    do {
+        const tempFilePath = path.join(workspace.uri.fsPath, `${fileNamePrefix}${n}${fileNameSuffix}`)
+        await fs.writeFile(tempFilePath, fileContent)
+    } while (--n > 0)
+
+    return workspace
+}
+
+export async function deleteTestTempDirs(): Promise<void> {
+    let failed = 0
+    for (const s of testTempDirs) {
+        if (!tryRemoveFolder(s)) {
+            failed += 1
+        }
+    }
+    if (failed > 0) {
+        console.error('deleteTestTempDirs: failed to delete %d/%d test temp dirs', failed, testTempDirs.length)
+    } else {
+        console.error('deleteTestTempDirs: deleted %d test temp dirs', testTempDirs.length)
+    }
+}
+
+/**
+ * Asserts that filepaths are equal, after normalizing for platform differences.
+ */
+export function assertEqualPaths(actual: string, expected: string, message?: string | Error) {
+    assert.strictEqual(pathutil.normalize(actual), pathutil.normalize(expected), message)
+}
+
+/**
+ * Asserts that UTF-8 contents of `file` are equal to `expected`.
+ */
+export async function assertFileText(file: string, expected: string, message?: string | Error) {
+    const actualContents = await fs.readFileText(file)
+    assert.strictEqual(actualContents, expected, message)
+}
+
+/** A lot of code will create a Promise, tick the clock, then wait for resolution. This function turns 3 lines into 1. */
+export async function tickPromise<T>(promise: Promise<T>, clock: FakeTimers.InstalledClock, t: number): Promise<T> {
+    clock.tick(t)
+    return await promise
+}
+
+/**
+ * Creates an executable file (including any parent directories) with the given contents.
+ */
+export async function createExecutableFile(filepath: string, contents: string): Promise<void> {
+    await fs.mkdir(path.dirname(filepath))
+    if (process.platform === 'win32') {
+        await fs.writeFile(filepath, `@echo OFF$\r\n${contents}\r\n`)
+    } else {
+        await fs.writeFile(filepath, `#!/bin/sh\n${contents}`)
+        await fs.chmod(filepath, 0o744)
+    }
+}
+
+/**
+ * Installs a fake clock in place of `globals.clock` and allows you to
+ * control time in tests.
+ *
+ * **Implementations must use `globals.clock` for this to work.**
+ *
+ * @example
+ * new globals.clock.Date() // Use this
+ * new Date() // Not this
+ *
+ * globals.clock.setTimeout(...) // Use this
+ * setTimeout(...) // Not this
+ */
+export function installFakeClock(): FakeTimers.InstalledClock {
+    return FakeTimers.withGlobal(globals.clock).install({
+        shouldClearNativeTimers: true,
+        shouldAdvanceTime: false,
+    })
+}
+
+/**
+ * Gets all recorded metrics with the corresponding name.
+ *
+ * Unlike {@link assertTelemetry}, this function does not do any transformations to
+ * handle fields being converted into strings. It will also not return `passive` or `value`.
+ */
+export function getMetrics<K extends MetricName>(name: K): readonly Partial<MetricShapes[K]>[] {
+    const query = { metricName: name }
+
+    return globals.telemetry.logger.query(query) as unknown as Partial<MetricShapes[K]>[]
+}
+
+// Note that Typescript is unable to describe the set of all supertypes of a type.
+// This should be typed something like `asserts actual is * extends T`
+export function partialDeepCompare<T>(actual: unknown, expected: T, message?: string): asserts actual is T {
+    if (typeof actual !== 'object' || !actual || typeof expected !== 'object' || !expected) {
+        assert.deepStrictEqual(actual, expected, message)
+    }
+
+    const partial = selectFrom(actual, ...keys(expected as object))
+    assert.deepStrictEqual(partial, expected, message)
+}
+/**
+ * Asserts that no metrics metadata (key OR value) matches the given regex.
+ * @param keyword target substring to search for
+ */
+export function assertNoTelemetryMatch(re: RegExp | string): void | never {
+    return assert.ok(globals.telemetry.logger.queryRegex(re).length === 0)
+}
+
+/**
+ * Finds the emitted telemetry metrics with the given `name`, then checks if the metadata fields
+ * match the expected values, in the order specified by `expected`. Comparisons are done using
+ * {@link partialDeepCompare}. **Only fields present in {@link expected} will be checked.**
+ *
+ * @param name Metric name
+ * @param expected Metric(s) shape(s) which are compared _in order_ to metrics matching `name`.
+ */
+export function assertTelemetry<K extends MetricName>(
+    name: K,
+    expected: Partial<MetricShapes[K]> | Partial<MetricShapes[K]>[]
+): void | never
+export function assertTelemetry<K extends MetricName>(
+    name: K,
+    expected: Partial<MetricShapes[MetricName]> | Partial<MetricShapes[MetricName]>[]
+): void | never
+export function assertTelemetry<K extends MetricName>(
+    name: K,
+    expected: Partial<MetricShapes[K]> | Partial<MetricShapes[K]>[]
+): void | never {
+    const expectedList = Array.isArray(expected) ? expected : [expected]
+    const query = { metricName: name }
+    const metadata = globals.telemetry.logger.query(query)
+
+    // When an empty expected array was given
+    if (Array.isArray(expected) && expected.length === 0) {
+        if (metadata.length === 0) {
+            // succeeds if no results found, but none were expected
+            return
+        }
+        assert.fail(`Expected no metrics for "${name}", but some exist`)
+    }
+
+    assert.ok(metadata.length > 0, `telemetry metric not found: "${name}"`)
+
+    for (let i = 0; i < expectedList.length; i++) {
+        const metric = expectedList[i]
+        const expectedCopy = { ...metric } as { -readonly [P in keyof MetricShapes[K]]: MetricShapes[K][P] }
+        const passive = expectedCopy?.passive
+        delete expectedCopy['passive']
+
+        for (const k of Object.keys(expectedCopy)) {
+            ;(expectedCopy as any)[k] = (expectedCopy as Record<string, any>)[k]?.toString()
+        }
+
+        const msg = `telemetry metric ${i + 1} (of ${
+            expectedList.length
+        }) not found (in the expected order): "${name}" `
+        partialDeepCompare(metadata[i], expectedCopy, msg)
+
+        // Check this explicitly because we deleted it above.
+        if (passive !== undefined) {
+            const metric = globals.telemetry.logger.queryFull(query)
+            assert.strictEqual(metric[0].Passive, passive)
+        }
+    }
+}
+
+/**
+ * Curried form of {@link assertTelemetry} for when you want partial application.
+ */
+export const assertTelemetryCurried =
+    <K extends MetricName>(name: K) =>
+    (expected: MetricShapes[K]) =>
+        assertTelemetry(name, expected)
+
+/**
+ * Waits for _any_ active text editor to appear and have the desired contents.
+ * This is important since there may be delays between showing a new document and
+ * updates to the `activeTextEditor` field.
+ *
+ * Assumes that only a single document will be edited while polling. The contents of
+ * the document must match exactly to the text editor at some point, otherwise this
+ * function will timeout.
+ */
+export async function assertTextEditorContains(contents: string, exact: boolean = true): Promise<void | never> {
+    const editor = await waitUntil(
+        async () => {
+            if (vscode.window.activeTextEditor?.document.getText() === contents) {
+                return vscode.window.activeTextEditor
+            }
+        },
+        { interval: 5 }
+    )
+
+    if (!vscode.window.activeTextEditor) {
+        throw new Error('No active text editor found')
+    }
+
+    if (!editor) {
+        const actual = vscode.window.activeTextEditor.document
+        const documentName = actual.uri.toString(true)
+        const message = `Document "${documentName}" contained "${actual.getText()}", expected: "${contents}"`
+        if (exact) {
+            assert.strictEqual(actual.getText(), contents, message)
+        } else {
+            assert(actual.getText().includes(contents), message)
+        }
+    }
+}
+
+/**
+ * Saves `fileText` to `fileName` relative to `folder` (or an auto-created temp workspace folder,
+ * which will be automatically deleted after tests finish), and opens it as a `TextDocument` (not
+ * a `TextEditor`, which is *slow*; use {@link toTextEditor} for that).
+ *
+ * @param fileText Text content
+ * @param fileName Name of the file (including extension) to save it as.
+ * @param folder?  Optional workspace folder where the file will be written to.
+ *
+ * @returns TextDocument that was just opened
+ */
+export async function toTextDocument(
+    fileText: string,
+    fileName: string,
+    folder?: string
+): Promise<ReturnType<typeof vscode.workspace.openTextDocument>> {
+    const myWorkspaceFolder = folder ? folder : (await createTestWorkspaceFolder()).uri.fsPath
+    const filePath = path.join(myWorkspaceFolder, fileName)
+    await toFile(fileText, filePath)
+
+    return await vscode.workspace.openTextDocument(filePath)
+}
+
+/**
+ * Same as {@link toTextDocument}, but opens the result in a TextEditor. This is *much* slower, use
+ * `toTextDocument` if you don't need a text editor.
+ *
+ * @param fileText Text content
+ * @param fileName Name of the file (including extension) to save it as.
+ * @param folder?  Optional workspace folder where the file will be written to.
+ *
+ * @returns TextEditor that was just opened
+ */
+export async function toTextEditor(
+    fileText: string,
+    fileName: string,
+    folder?: string,
+    options?: vscode.TextDocumentShowOptions
+): Promise<vscode.TextEditor> {
+    const textDocument = await toTextDocument(fileText, fileName, folder)
+
+    return await vscode.window.showTextDocument(textDocument, options)
+}
+
+/**
+ * Waits for _any_ tab to appear and have the desired count
+ */
+export async function assertTabCount(size: number): Promise<void | never> {
+    const tabs = await waitUntil(
+        async () => {
+            const tabs = vscode.window.tabGroups.all
+                .map((tabGroup) => tabGroup.tabs)
+                .reduce((acc, curVal) => acc.concat(curVal), [])
+
+            if (tabs.length === size) {
+                return tabs
+            }
+        },
+        { interval: 5 }
+    )
+
+    if (!tabs) {
+        throw new Error('No desired tabs found')
+    }
+}
+
+/**
+ * Executes the "openEditors.closeAll" command and asserts that all visible
+ * editors were closed after waiting.
+ */
+export async function closeAllEditors(): Promise<void> {
+    // Derived by inspecting 'Keyboard Shortcuts' via command `>Preferences: Open Keyboard Shortcuts`
+    // Note: `workbench.action.closeAllEditors` is unreliable.
+    const closeAllCmd = 'openEditors.closeAll'
+
+    // Ignore these "editors" not closed by "openEditors.closeAll":
+    //  - `vscode.OutputChannel` name prefixed with "extension-output". https://github.com/microsoft/vscode/issues/148993#issuecomment-1167654358
+    //  - `vscode.LogOutputChannel` name (created with `vscode.window.createOutputChannel(…,{log:true})`
+    // Maybe we can close these with a command?
+    // For nullExtensionDescription, see https://github.com/aws/aws-toolkit-vscode/issues/4658
+    const ignorePatterns = [
+        /extension-output/,
+        /tasks/,
+        /amazonwebservices\.[a-z\-]+-vscode\./,
+        /nullExtensionDescription./, // Sometimes exists instead of the prior line, see https://github.com/aws/aws-toolkit-vscode/issues/4658
+    ]
+    const editorsToClose: vscode.TextEditor[] = []
+
+    const noVisibleEditor: boolean | undefined = await waitUntil(
+        async () => {
+            // Race: documents could appear after the call to closeAllEditors(), so retry.
+            await vscode.commands.executeCommand(closeAllCmd)
+            editorsToClose.length = 0
+            editorsToClose.push(
+                ...vscode.window.visibleTextEditors.filter(
+                    (editor) => !ignorePatterns.some((p) => p.test(editor.document.fileName))
+                )
+            )
+
+            return editorsToClose.length === 0
+        },
+        {
+            timeout: 1000, // Arbitrary values. Should succeed except when VS Code is lagging heavily.
+            interval: 250,
+            truthy: true,
+        }
+    )
+
+    if (!noVisibleEditor && editorsToClose.length > 0) {
+        const editorNames = editorsToClose.map((editor) => `\t${editor.document.fileName}`)
+        throw new Error(`Editors were still open after closeAllEditors():\n${editorNames.join('\n')}`)
+    }
+}
+
+export interface EventCapturer<T = unknown> extends vscode.Disposable {
+    /**
+     * All events captured after instrumentation
+     */
+    readonly emits: readonly T[]
+
+    /**
+     * The most recently emitted event
+     */
+    readonly last: T | undefined
+
+    /**
+     * Waits for the next event to be emitted
+     */
+    next(timeout?: number): Promise<T>
+}
+
+/**
+ * Instruments an event for easier inspection.
+ */
+export function captureEvent<T>(event: vscode.Event<T>): EventCapturer<T> {
+    let disposed = false
+    let idx = 0
+    const emits: T[] = []
+    const listeners: vscode.Disposable[] = []
+    listeners.push(event((data) => emits.push(data)))
+
+    return {
+        emits,
+        get last() {
+            return emits[emits.length - 1]
+        },
+        next: (timeout?: number) => {
+            if (disposed) {
+                throw new Error('Capturer has been disposed')
+            }
+
+            if (idx < emits.length) {
+                return Promise.resolve(emits[idx++])
+            }
+
+            return captureEventOnce(event, timeout)
+        },
+        dispose: () => {
+            disposed = true
+            vscode.Disposable.from(...listeners).dispose()
+        },
+    }
+}
+
+/**
+ * Captures the first value emitted by an event, optionally with a timeout
+ */
+export function captureEventOnce<T>(event: vscode.Event<T>, timeout?: number): Promise<T> {
+    return captureEventNTimes(event, 1, timeout)
+}
+
+export function captureEventNTimes<T>(event: vscode.Event<T>, amount: number, timeout?: number): Promise<T> {
+    return new Promise<T>((resolve, reject) => {
+        const stop = () => reject(new Error('Timed out waiting for event'))
+        let count = 0
+        event((data) => {
+            if (++count === amount) {
+                resolve(data)
+            }
+        })
+
+        if (timeout !== undefined) {
+            setTimeout(stop, timeout)
+        }
+    })
+}
+
+/**
+ * Shuffle a list, Fisher-Yates Sorting Algorithm
+ */
+export function shuffleList<T>(list: T[]): T[] {
+    const shuffledList = [...list]
+
+    for (let i = shuffledList.length - 1; i > 0; i--) {
+        const j = Math.floor(Math.random() * (i + 1))
+        ;[shuffledList[i], shuffledList[j]] = [shuffledList[j], shuffledList[i]]
+    }
+
+    return shuffledList
+}
+
+/**
+ * Try to register a command for tests since some commands are only registered during
+ * extension activation. These commands will need to be manually activated here.
+ *
+ * Swallows 'already exists' exceptions because these commands can persist
+ * across tests.
+ *
+ * TODO: This is a workaround because some code being tested exists in multiple extensions.
+ * Activating/debugging multiple extensions at once is currently not functional.
+ * To avoid this, we should drop tests/code down to their respective extensions.
+ */
+export function tryRegister(command: DeclaredCommand<() => Promise<any>>) {
+    try {
+        command.register()
+    } catch (err) {
+        if (!(err as Error).message.includes('already exists')) {
+            throw err
+        }
+    }
+}
+
+// Returns a stubbed fetch for other tests.
+export function getFetchStubWithResponse(response: Partial<Response>) {
+    return stub(request, 'fetch').returns({ response: new Promise((res, _) => res(response)) } as any)
+}
+
+export function copyEnv(): NodeJS.ProcessEnv {
+    return { ...process.env }
+}
+
+// Returns a stubbed response object
+export function createResponse(text: string): Response {
+    const responseStub = createStubInstance(Response)
+    responseStub.text.resolves(text)
+    return responseStub
+}
diff --git a/src/test/typescriptLambdaHandlerSearch.test.ts b/packages/core/src/test/typescriptLambdaHandlerSearch.test.ts
similarity index 80%
rename from src/test/typescriptLambdaHandlerSearch.test.ts
rename to packages/core/src/test/typescriptLambdaHandlerSearch.test.ts
index 71faccbf435..4b9d347fd07 100644
--- a/src/test/typescriptLambdaHandlerSearch.test.ts
+++ b/packages/core/src/test/typescriptLambdaHandlerSearch.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as path from 'path'
 import { readFileAsString } from '../shared/filesystemUtilities'
 import { RootlessLambdaHandlerCandidate } from '../shared/lambdaHandlerSearch'
@@ -11,7 +11,7 @@ import { TypescriptLambdaHandlerSearch } from '../shared/typescriptLambdaHandler
 
 describe('TypescriptLambdaHandlerSearch', function () {
     it('finds export declared functions in Typescript code', async function () {
-        const filename: string = path.join(getSamplesFolder(), 'typescript', 'sampleFunctions.ts')
+        const filename: string = path.join(testFixturesDir(), 'typescript/sampleFunctions.ts')
 
         const expectedHandlerNames: Set<string> = new Set([
             'sampleFunctions.exportedFunctionWithNoArgs',
@@ -28,7 +28,7 @@ describe('TypescriptLambdaHandlerSearch', function () {
     })
 
     it('ignores class declarations in Typescript code', async function () {
-        const filename: string = path.join(getSamplesFolder(), 'typescript', 'sampleClasses.ts')
+        const filename: string = path.join(testFixturesDir(), 'typescript/sampleClasses.ts')
 
         const expectedHandlerNames: Set<string> = new Set(['sampleClasses.exportedFunctionWithNoArgs'])
 
@@ -36,7 +36,7 @@ describe('TypescriptLambdaHandlerSearch', function () {
     })
 
     it('ignores interface declarations in Typescript code', async function () {
-        const filename: string = path.join(getSamplesFolder(), 'typescript', 'sampleInterfaces.ts')
+        const filename: string = path.join(testFixturesDir(), 'typescript/sampleInterfaces.ts')
 
         const expectedHandlerNames: Set<string> = new Set(['sampleInterfaces.exportedFunctionWithNoArgs'])
 
@@ -44,7 +44,7 @@ describe('TypescriptLambdaHandlerSearch', function () {
     })
 
     it('finds module.exports declared functions in javascript code', async function () {
-        const filename: string = path.join(getSamplesFolder(), 'javascript', 'sampleFunctions.js')
+        const filename: string = path.join(testFixturesDir(), 'javascript/sampleFunctions.js')
 
         const expectedHandlerNames: Set<string> = new Set([
             'sampleFunctions.exportedFunctionWithNoArgs',
@@ -62,7 +62,7 @@ describe('TypescriptLambdaHandlerSearch', function () {
     })
 
     it('ignores class declarations in javascript code', async function () {
-        const filename: string = path.join(getSamplesFolder(), 'javascript', 'sampleClasses.js')
+        const filename: string = path.join(testFixturesDir(), 'javascript/sampleClasses.js')
 
         const expectedHandlerNames: Set<string> = new Set(['sampleClasses.exportedFunctionWithNoArgs'])
 
@@ -82,14 +82,14 @@ describe('TypescriptLambdaHandlerSearch', function () {
         assertCandidateHandlers(handlers, expectedHandlerNames)
     }
 
-    function getSamplesFolder(): string {
-        return path.join(__dirname, '..', '..', '..', 'src', 'test', 'samples')
+    function testFixturesDir(): string {
+        return path.join(__dirname, '../../../src/testFixtures')
     }
 
     function assertCandidateHandlers(actual: RootlessLambdaHandlerCandidate[], expectedHandlerNames: Set<string>) {
         assert.strictEqual(actual.length, expectedHandlerNames.size)
         assert.strictEqual(
-            actual.map(handler => handler.handlerName).every(handlerName => expectedHandlerNames.has(handlerName)),
+            actual.map((handler) => handler.handlerName).every((handlerName) => expectedHandlerNames.has(handlerName)),
             true
         )
     }
diff --git a/src/test/utilities/explorerNodeAssertions.ts b/packages/core/src/test/utilities/explorerNodeAssertions.ts
similarity index 87%
rename from src/test/utilities/explorerNodeAssertions.ts
rename to packages/core/src/test/utilities/explorerNodeAssertions.ts
index 7b4549ff85a..6fae90c46e8 100644
--- a/src/test/utilities/explorerNodeAssertions.ts
+++ b/packages/core/src/test/utilities/explorerNodeAssertions.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
 import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
 
diff --git a/src/test/utilities/fakeAwsContext.ts b/packages/core/src/test/utilities/fakeAwsContext.ts
similarity index 92%
rename from src/test/utilities/fakeAwsContext.ts
rename to packages/core/src/test/utilities/fakeAwsContext.ts
index 8eeff58c4e0..d256980572c 100644
--- a/src/test/utilities/fakeAwsContext.ts
+++ b/packages/core/src/test/utilities/fakeAwsContext.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -57,6 +57,10 @@ export class FakeAwsContext implements AwsContext {
     public getCredentialDefaultRegion(): string {
         return this.awsContextCredentials?.defaultRegion ?? defaultRegion
     }
+
+    public getCredentialEndpointUrl(): string | undefined {
+        return this.awsContextCredentials?.endpointUrl
+    }
 }
 
 export function makeFakeAwsContextWithPlaceholderIds(credentials: AWS.Credentials): FakeAwsContext {
diff --git a/packages/core/src/test/utilities/performance.ts b/packages/core/src/test/utilities/performance.ts
new file mode 100644
index 00000000000..d498ea22c88
--- /dev/null
+++ b/packages/core/src/test/utilities/performance.ts
@@ -0,0 +1,29 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import Sinon from 'sinon'
+
+export function stubPerformance(sandbox: Sinon.SinonSandbox) {
+    const cpuUsage = { user: 10000, system: 2000 }
+    const initialHeapTotal = 1
+    const totalNanoseconds = 30000000 // 0.03 seconds
+
+    sandbox.stub(process, 'cpuUsage').returns(cpuUsage)
+
+    const memoryUsageStub = sandbox.stub(process, 'memoryUsage')
+    memoryUsageStub
+        .onCall(0)
+        .returns({ heapTotal: initialHeapTotal, arrayBuffers: 0, external: 0, rss: 0, heapUsed: 0 })
+    memoryUsageStub.onCall(1).returns({ heapTotal: 10485761, arrayBuffers: 0, external: 0, rss: 0, heapUsed: 0 })
+
+    sandbox.stub(process, 'hrtime').returns([0, totalNanoseconds])
+
+    return {
+        expectedUserCpuUsage: 33.333333333333336,
+        expectedSystemCpuUsage: 6.666666666666667,
+        expectedHeapTotal: 10,
+        expectedTotalSeconds: totalNanoseconds / 1e9,
+    }
+}
diff --git a/src/test/utilities/stubber.ts b/packages/core/src/test/utilities/stubber.ts
similarity index 75%
rename from src/test/utilities/stubber.ts
rename to packages/core/src/test/utilities/stubber.ts
index 804443f4456..a8dff3a6339 100644
--- a/src/test/utilities/stubber.ts
+++ b/packages/core/src/test/utilities/stubber.ts
@@ -1,15 +1,24 @@
 /*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import * as sinon from 'sinon'
 
-type Stub<T> = T & { [P in keyof T]: sinon.SinonStubbedMember<T[P]> }
+export type Stub<T> = T & { [P in keyof T]: sinon.SinonStubbedMember<T[P]> }
 type Fields<T> = { [P in FieldKeys<T>]-?: T[P] }
 type FieldKeys<T> = { [P in keyof T]: T[P] extends (...args: any[]) => unknown ? never : P }[keyof T]
 type PartialStub<T> = FieldKeys<T> extends never ? Stub<T> : Stub<Omit<T, FieldKeys<T>>>
 
+/**
+ * Stubs classes for testing. Does NOT work when an object is defined by an interface or type alone.
+ * To stub an interface/type, use the following:
+ * ```
+ * const mockObject = <ObjectType>{ <keyFromObjectType>: <overridden value> }
+ * ```
+ * @param ctor Class constructor
+ * @param fields _Optional_ fields to ensure class matches signature
+ */
 export function stub<T>(ctor: new (...args: any[]) => T): PartialStub<T>
 export function stub<T>(ctor: new (...args: any[]) => T, fields: Fields<T>): Stub<T>
 export function stub<T>(ctor: new (...args: any[]) => T, fields?: Fields<T>): Stub<T> {
diff --git a/src/test/utilities/testSettingsConfiguration.ts b/packages/core/src/test/utilities/testSettingsConfiguration.ts
similarity index 78%
rename from src/test/utilities/testSettingsConfiguration.ts
rename to packages/core/src/test/utilities/testSettingsConfiguration.ts
index d84ec1cf565..ecbf32bf36b 100644
--- a/src/test/utilities/testSettingsConfiguration.ts
+++ b/packages/core/src/test/utilities/testSettingsConfiguration.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -11,8 +11,8 @@ import { cast, TypeConstructor } from '../../shared/utilities/typeConstructors'
 type ObjectPath<T extends Record<string, any>, K extends PropertyKey[] = []> = K extends []
     ? [keyof T]
     : IndexObject<T, K> extends Record<string, any>
-    ? K | [...K, keyof IndexObject<T, K>]
-    : K
+      ? K | [...K, keyof IndexObject<T, K>]
+      : K
 
 type IndexObject<T extends Record<string, any>, K> = K extends [infer L, ...infer R]
     ? L extends keyof T
@@ -48,6 +48,10 @@ export class TestSettings implements ClassToInterfaceType<Settings> {
         return !type || value === undefined ? value : cast(value, type)
     }
 
+    public async isReadable(): Promise<boolean> {
+        return true
+    }
+
     public async update(key: string, value: unknown): Promise<boolean> {
         const parts = key.split('.')
 
@@ -64,12 +68,13 @@ export class TestSettings implements ClassToInterfaceType<Settings> {
 
     public getSection(section: string, scope?: vscode.ConfigurationScope): ResetableMemento {
         return {
+            keys: () => [],
             get: (key, defaultValue?) => this.get(`${section}.${key}`) ?? defaultValue,
             reset: async () => {
                 delete this.data[section]
             },
             update: async (key, value) => {
-                this.update(`${section}.${key}`, value)
+                await this.update(`${section}.${key}`, value)
             },
         }
     }
@@ -78,19 +83,20 @@ export class TestSettings implements ClassToInterfaceType<Settings> {
         section: string,
         listener: (event: vscode.ConfigurationChangeEvent) => unknown
     ): vscode.Disposable {
-        return this.onDidChangeEmitter.event(prop => {
+        return this.onDidChangeEmitter.event((prop) => {
             if (prop.startsWith(section)) {
                 const remainder = prop.replace(section, '').replace(/^\./, '')
-                listener({ affectsConfiguration: key => remainder.startsWith(key) })
+                listener({ affectsConfiguration: (key) => remainder.startsWith(key) })
             } else if (section.startsWith(prop)) {
-                listener({ affectsConfiguration: key => key.startsWith(section) })
+                listener({ affectsConfiguration: (key) => key.startsWith(section) })
             }
         })
     }
 
-    public async disabledExperiments(pluginName: string): Promise<void> {}
-    public async enabledExperiments(pluginName: string): Promise<void> {}
-    public async getExperimentsSetting(promptName: string): Promise<{ [prompt: string]: boolean } | undefined> {
-        return {}
+    public isSet(key: string, section?: string): boolean {
+        const merged = section ? [section, key].join('.') : key
+        const value = get(this.data, merged.split('.'))
+
+        return value !== undefined
     }
 }
diff --git a/packages/core/src/test/web.test.ts b/packages/core/src/test/web.test.ts
new file mode 100644
index 00000000000..1327674222d
--- /dev/null
+++ b/packages/core/src/test/web.test.ts
@@ -0,0 +1,13 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as assert from 'assert'
+import { isWeb } from '../shared/extensionGlobals'
+
+describe('isWeb', function () {
+    it('returns false since not in browser', function () {
+        assert.strictEqual(isWeb(), false)
+    })
+})
diff --git a/packages/core/src/test/webview/server.test.ts b/packages/core/src/test/webview/server.test.ts
new file mode 100644
index 00000000000..d51740c0056
--- /dev/null
+++ b/packages/core/src/test/webview/server.test.ts
@@ -0,0 +1,42 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { ToolkitError } from '../../shared/errors'
+import { handleWebviewError } from '../../webviews/server'
+import { assertLogsContain } from '../globalSetup.test'
+
+describe('logAndShowWebviewError()', function () {
+    const myWebviewId = 'myWebviewId'
+    const myCommand = 'myCommand'
+
+    beforeEach(function () {})
+
+    afterEach(function () {})
+
+    it('logs the provided error, but is wrapped in ToolkitErrors for more context', function () {
+        // The method is being tested due to its fragile implementation. This test
+        // protects against changes in the underlying logAndShowError() implementation.
+
+        const inputError = new Error('Random Error')
+
+        const err = handleWebviewError(inputError, myWebviewId, myCommand)
+
+        // assertLogsContain('Random Error', false, 'error')
+
+        // A shortened error is shown to the user
+        assertLogsContain('Webview error', false, 'error')
+
+        // A higher level context of what caused the error
+        const detailedError = err.cause
+        assert(detailedError instanceof ToolkitError)
+        assert.strictEqual(detailedError.message, `Webview backend command failed: "${myCommand}()"`)
+
+        // The actual error
+        const rootError = detailedError.cause
+        assert(rootError instanceof Error)
+        assert.strictEqual(rootError, inputError)
+    })
+})
diff --git a/packages/core/src/testE2E/codecatalyst/client.test.ts b/packages/core/src/testE2E/codecatalyst/client.test.ts
new file mode 100644
index 00000000000..84e9309120c
--- /dev/null
+++ b/packages/core/src/testE2E/codecatalyst/client.test.ts
@@ -0,0 +1,639 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import {
+    CodeCatalystClient,
+    CodeCatalystOrg,
+    CodeCatalystProject,
+    createClient as createCodeCatalystClient,
+    DevEnvironment,
+} from '../../shared/clients/codecatalystClient'
+import { getThisDevEnv, prepareDevEnvConnection } from '../../codecatalyst/model'
+import { Auth } from '../../auth/auth'
+import { CodeCatalystAuthenticationProvider } from '../../codecatalyst/auth'
+import { CodeCatalystCommands, DevEnvironmentSettings, UpdateDevEnvironmentSettings } from '../../codecatalyst/commands'
+import globals from '../../shared/extensionGlobals'
+import { CodeCatalystCreateWebview, SourceResponse } from '../../codecatalyst/vue/create/backend'
+import { waitUntil } from '../../shared/utilities/timeoutUtils'
+import { AccessDeniedException } from '@aws-sdk/client-sso-oidc'
+import { GetDevEnvironmentRequest, _InstanceType } from '@aws-sdk/client-codecatalyst'
+import { getTestWindow } from '../../test/shared/vscode/window'
+import { patchObject, registerAuthHook, skipTest, using } from '../../test/setupUtil'
+import { isExtensionInstalled } from '../../shared/utilities/vsCodeUtils'
+import { VSCODE_EXTENSION_ID } from '../../shared/extensions'
+import { captureEventOnce } from '../../test/testUtil'
+import { toStream } from '../../shared/utilities/collectionUtils'
+import { toCollection } from '../../shared/utilities/asyncCollection'
+import { getLogger } from '../../shared/logger'
+import { isAwsError, ToolkitError } from '../../shared/errors'
+import {
+    scopesCodeCatalyst,
+    createBuilderIdProfile,
+    isValidCodeCatalystConnection,
+    SsoConnection,
+} from '../../auth/connection'
+import { hasKey } from '../../shared/utilities/tsUtils'
+
+let spaceName: CodeCatalystOrg['name']
+let projectName: CodeCatalystProject['name']
+
+/**
+ * Key Information:
+ *
+ * This test can be run locally under the following conditions:
+ *
+ *   - You have previously configured BuilderId using the vscode extension.
+ *     This is because this test uses BuilderId/SSO information
+ *     that the extension would have naturally created in that process.
+ *
+ *   - A Space already exists in your CodeCatalyst account.
+ *     We cannot currently automate this due to space creation
+ *     not being available in the CodeCatalyst API.
+ *
+ *     TODO: Create a new space instead of using an existing one,
+ *     if the api eventually allows us to do so.
+ *
+ *   - You do not have a CodeCatalyst project with the same name
+ *     as {@link projectName} and {@link isolatedProjectName}.
+ *     These projects are modified when this test is run.
+ *
+ * The test project cannot be torn down.
+ *
+ *   - The CodeCatalyst api does not provide a way to delete
+ *     a Project. So the projects will exist in the Space unless
+ *     deleted manually.
+ *
+ *     TODO: Delete the project when the test is done,
+ *     if the api eventually allows us to do so.
+ *
+ * This provides a best effort to test the api functionality.
+ *
+ *   - There are more complexities involved in testing api functionality
+ *     as if we were using the vscode UI, so this tests the underlying CC
+ *     api functionliaty.
+ *
+ *     There are different clients in this test that are used in different
+ *     parts of the CC process. Choose the best client for your usecase.
+ *
+ *     TODO: We can borrow some components from `src/test/globalSetup.test.ts`
+ *     to be able to leverage `getTestWindow()` and then use that
+ *     for UI actions testing.
+ *
+ *     TODO: Create separate tests that spin up a vscode extensionHost
+ *     integ tests, but using the ssh hostname that we get from
+ *     {@link prepareDevEnvConnection}.
+ */
+describe('Test how this codebase uses the CodeCatalyst API', function () {
+    let client: CodeCatalystClient
+    let commands: CodeCatalystCommands
+    let webviewClient: CodeCatalystCreateWebview
+
+    /**
+     * Stores all dev environments created during this test suite
+     */
+    const testDevEnvironments: DevEnvironment[] = []
+
+    before(async function () {
+        await using(registerAuthHook('codecatalyst-test-account'), async () => {
+            // These instances all interact with the CC API at some point.
+            // Use the right one for your use case.
+            commands = await createTestCodeCatalystCommands()
+            client = await createTestCodeCatalystClient(Auth.instance)
+            webviewClient = new CodeCatalystCreateWebview(client, CodeCatalystCommands.declared, () => {})
+
+            spaceName = (await getCurrentUsersSpace()).name
+            projectName = (await tryCreateTestProject(spaceName)).name
+        })
+    })
+
+    beforeEach(function () {
+        registerAuthHook('codecatalyst-test-account')
+    })
+
+    describe('Dev Environment functionality', function () {
+        let defaultDevEnv: DevEnvironment
+        let defaultDevEnvSettings: DevEnvironmentSettings
+
+        const isolatedProjectName = 'aws-toolkit-integ-test-project-isolated'
+
+        before(async function () {
+            // Attempt to reap older dev environments associated with the test projects
+            await Promise.all([deleteOldDevEnvironments(projectName), deleteOldDevEnvironments(isolatedProjectName)])
+
+            defaultDevEnvSettings = buildDevEnvSettings()
+            defaultDevEnv = await createDevEnv(defaultDevEnvSettings)
+        })
+
+        after(async function () {
+            await deleteTestDevEnvs()
+        })
+
+        beforeEach(function () {
+            getTestWindow().onDidShowMessage((m) => {
+                const updateSshConfigItem = m.items.find((i) => i.title === 'Update SSH config')
+                updateSshConfigItem?.select()
+            })
+        })
+
+        describe('getThisDevEnv', function () {
+            let ccAuth: CodeCatalystAuthenticationProvider
+
+            before(function () {
+                ccAuth = CodeCatalystAuthenticationProvider.fromContext(globals.context)
+            })
+
+            it('returns `undefined` if not in a dev environment', async function () {
+                const result = await getThisDevEnv(ccAuth)
+                assert.strictEqual(result, undefined)
+            })
+
+            it('returns an error if in a dev environment but the API calls fail', async function () {
+                const oldEnv = { ...process.env }
+                process.env['__DEV_ENVIRONMENT_ID'] = defaultDevEnv.id
+                process.env['__DEV_ENVIRONMENT_SPACE_NAME'] = defaultDevEnv.org.name
+                process.env['__DEV_ENVIRONMENT_PROJECT_NAME'] = 'wrong-project-name'
+
+                try {
+                    const result = await getThisDevEnv(ccAuth)
+                    assert.ok(result?.isErr(), 'Expected an error to be returned')
+                } finally {
+                    process.env = oldEnv
+                }
+            })
+        })
+
+        it('creates an empty Dev Environment', async function () {
+            const emptyDevEnvSettings = buildDevEnvSettings()
+            const emptyDevEnv = await createDevEnvFromWebview(emptyDevEnvSettings, {
+                type: 'none',
+                selectedSpace: { name: spaceName },
+                selectedProject: { name: projectName, org: { name: spaceName }, type: 'project' },
+            })
+
+            assert.strictEqual(emptyDevEnv.project.name, projectName)
+            assert.strictEqual(emptyDevEnv.org.name, spaceName)
+        })
+
+        it('creates a Dev Environment with a different instance type + storage', async function () {
+            const differentDevEnvSettings = buildDevEnvSettings('dev.standard1.medium', { sizeInGiB: 32 })
+
+            const actualDevEnv = await createDevEnvFromWebview(differentDevEnvSettings, {
+                type: 'none',
+                selectedSpace: { name: spaceName },
+                selectedProject: { name: projectName, org: { name: spaceName }, type: 'project' },
+            })
+
+            assert.strictEqual(actualDevEnv.project.name, projectName)
+            assert.strictEqual(actualDevEnv.org.name, spaceName)
+            assert.strictEqual(actualDevEnv.alias, differentDevEnvSettings.alias)
+            assert.strictEqual(actualDevEnv.instanceType, 'dev.standard1.medium')
+            assert.strictEqual(actualDevEnv.persistentStorage.sizeInGiB, 32)
+        })
+
+        it.skip('creates a Dev Environment using an existing branch', async function () {
+            // TODO: Write this test now that an API is available in the SDK:
+            // https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/CodeCatalyst.html#createSourceRepository-property
+            // https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/CodeCatalyst.html#createSourceRepositoryBranch-property
+            // For now, the repository is manually created in the account.
+        })
+
+        it('prompts to install the ssh extension if not available', async function () {
+            if (isExtensionInstalled(VSCODE_EXTENSION_ID.remotessh)) {
+                skipTest(this, 'remote ssh already installed')
+            }
+
+            await assert.rejects(
+                prepareDevEnvConnection(client, { ...defaultDevEnv }),
+                /Remote SSH extension not installed/
+            )
+            const notification = await getTestWindow().waitForMessage(
+                /Connecting to Dev Environment requires the Remote SSH extension/
+            )
+
+            // Normally selecting `Install...` would open up the extensions tab
+            // But for this test we actually do want to install the extension programtically
+            const executeCommand = vscode.commands.executeCommand
+            const patchInstall = patchObject(vscode.commands, 'executeCommand', (command, ...args) => {
+                if (command === 'extension.open') {
+                    patchInstall.dispose()
+                    return executeCommand('workbench.extensions.installExtension', ...args)
+                } else {
+                    return executeCommand(command, ...args)
+                }
+            })
+
+            notification.selectItem('Install...')
+            await captureEventOnce(vscode.extensions.onDidChange, 60_000).catch(() => {
+                throw new Error('Timed out waiting to install remote SSH extension')
+            })
+        })
+
+        it('connects to a running Dev Environment', async function () {
+            // Get necessary objects to run the ssh command.
+            const { SessionProcess, hostname, sshPath } = await prepareDevEnvConnection(client, {
+                ...defaultDevEnv,
+            })
+
+            // Through the actual ssh connection, run 'ls' command in the dev env.
+            const lsOutput = (await new SessionProcess(sshPath, [hostname, 'ls', '/projects']).run()).stdout
+
+            // Assert that a certain file exists in the dev env.
+            const expectedFile = 'devfile.yaml' // File automatically created by CC
+            assert(lsOutput.split('\n').includes(expectedFile))
+        })
+
+        it('has environment variables that identify the Dev Environment', async function () {
+            const { SessionProcess, hostname, sshPath } = await prepareDevEnvConnection(client, {
+                ...defaultDevEnv,
+            })
+
+            const output = (
+                await new SessionProcess(sshPath, [hostname, 'printenv', '|', 'grep', '__DEV_ENVIRONMENT']).run()
+            ).stdout
+
+            const parsed: Record<string, string> = {}
+            for (const line of output.split('\n')) {
+                const [_, key, value] = line.match(/(.*)=(.*)/) ?? []
+                if (!key || !value) {
+                    throw new Error(`Failed to parse environment variables from dev env`)
+                }
+
+                parsed[key] = value
+            }
+
+            assert.deepStrictEqual(parsed['__DEV_ENVIRONMENT_ID'], defaultDevEnv.id)
+            assert.deepStrictEqual(parsed['__DEV_ENVIRONMENT_PROJECT_NAME'], defaultDevEnv.project.name)
+            assert.deepStrictEqual(parsed['__DEV_ENVIRONMENT_ORGANIZATION_NAME'], defaultDevEnv.org.name)
+        })
+
+        /**
+         * IMPORTANT: This test takes a while to run. Stopping a Dev Env takes time.
+         */
+        it('stops a running Dev Environment, then starts it up again', async function () {
+            // Ensure existing Dev Env is running
+            const devEnvData = {
+                spaceName: defaultDevEnv.org.name,
+                projectName: defaultDevEnv.project.name,
+                id: defaultDevEnv.id,
+            }
+            await waitUntilDevEnvStatus(devEnvData, ['RUNNING'])
+
+            // Stop Dev Env
+            await client.stopDevEnvironment(devEnvData)
+            await waitUntilDevEnvStatus(devEnvData, ['STOPPED'])
+
+            // Start Dev Env
+            await prepareDevEnvConnection(client, { ...defaultDevEnv })
+            await waitUntilDevEnvStatus(devEnvData, ['RUNNING'])
+        })
+
+        it('updates the properties of an existing dev environment', async function () {
+            const newDevEnvSettings = {
+                alias: createAlias(),
+                instanceType: 'dev.standard1.medium',
+            } satisfies UpdateDevEnvironmentSettings
+
+            // Ensure current properties do not equal the updated properties
+            assert.notStrictEqual(defaultDevEnv.alias, newDevEnvSettings.alias)
+            assert.notStrictEqual(defaultDevEnv.instanceType, newDevEnvSettings.instanceType)
+
+            // Sanity Check due to: https://issues.amazon.com/Velox-Bug-42
+            assert.ok(defaultDevEnv.id, 'Dev Env ID should not be empty.')
+
+            // Update dev env
+            const updatedDevEnv = await commands.updateDevEnv(defaultDevEnv, newDevEnvSettings)
+
+            // Ensure our update succeeded by checking for new properties
+            assert.strictEqual(updatedDevEnv?.alias, newDevEnvSettings.alias)
+            assert.strictEqual(updatedDevEnv?.instanceType, newDevEnvSettings.instanceType)
+        })
+
+        it('creates multiple dev envs, lists them, then deletes them', async function () {
+            // We want a clean project for this test due to additional dev envs
+            // from previous tests polluting the 'list dev env' output.
+            await tryCreateTestProject(spaceName, isolatedProjectName)
+            await deleteTestDevEnvs(isolatedProjectName)
+
+            // Create multiple Dev Envs
+            const projectSource: SourceResponse = {
+                type: 'none',
+                selectedSpace: { name: spaceName },
+                selectedProject: { name: isolatedProjectName, org: { name: spaceName }, type: 'project' },
+            }
+            const createdDevEnvs = await Promise.all([
+                createDevEnvFromWebview(buildDevEnvSettings(), projectSource),
+                createDevEnvFromWebview(buildDevEnvSettings(), projectSource),
+            ])
+            assert.strictEqual(createdDevEnvs.length, 2)
+
+            // List all Dev Envs
+            const listedDevEnvs = await getAllTestDevEnvironments(isolatedProjectName)
+
+            const actualDevEnvIds = listedDevEnvs.map((d) => d.id)
+            const expectedDevEnvIds = createdDevEnvs.map((d) => d.id)
+            assert.deepStrictEqual(
+                actualDevEnvIds.sort((a, b) => a.localeCompare(b)),
+                expectedDevEnvIds.sort((a, b) => a.localeCompare(b)),
+                'The list dev envs dont match'
+            )
+
+            // Delete all Dev Envs
+            await Promise.all(listedDevEnvs.map((devEnv) => commands.deleteDevEnv(devEnv)))
+            const remainingDevEnvs = await getAllTestDevEnvironments(isolatedProjectName)
+            if (remainingDevEnvs.length > 0) {
+                // Dev Envs may still be returned if they are still in the process of being deleted.
+                // Just ensure they are in the process or fully deleted.
+                for (const devEnv of remainingDevEnvs) {
+                    assert.ok(['DELETING', 'DELETED'].includes(devEnv.status), 'Dev Env was not successfully deleted')
+                }
+            }
+        })
+
+        it('lists all spaces for the given user', async function () {
+            const spaces = await client.listSpaces().flatten().promise()
+            assert.ok(spaces.find((space) => space.name === spaceName))
+        })
+
+        // TODO: Re-add this test when the CoCa SDK offers a way to delete projects.
+        it.skip('lists all projects for the given user', async function () {
+            // Create lots of projects
+            const ephemeralProjectNames = []
+            for (let index = 0; index < 30; index++) {
+                ephemeralProjectNames.push(`ephemeral-project-${index}`)
+            }
+            await Promise.all(ephemeralProjectNames.map((name) => tryCreateTestProject(spaceName, name)))
+            await client.listProjects({ spaceName }).flatten().promise()
+        })
+
+        function buildDevEnvSettings(
+            instanceType: DevEnvironmentSettings['instanceType'] = 'dev.standard1.small',
+            persistentStorage: DevEnvironmentSettings['persistentStorage'] = { sizeInGiB: 16 }
+        ): DevEnvironmentSettings {
+            return {
+                instanceType,
+                persistentStorage,
+                alias: createAlias(),
+                inactivityTimeoutMinutes: 15,
+            }
+        }
+
+        /** Creates a unique alias for a dev environment. */
+        function createAlias(): NonNullable<DevEnvironment['alias']> {
+            return `test-alias-${Date.now() + Math.random()}`
+        }
+
+        async function createDevEnv(devEnvSettings: DevEnvironmentSettings): Promise<DevEnvironment> {
+            const env = await client.createDevEnvironment({
+                spaceName,
+                projectName,
+                ides: [{ name: 'VSCode' }],
+                ...devEnvSettings,
+            })
+
+            testDevEnvironments.push(env)
+            return env
+        }
+
+        async function createDevEnvFromWebview(
+            ...args: Parameters<typeof webviewClient.createDevEnvOfType>
+        ): Promise<DevEnvironment> {
+            const env = await webviewClient.createDevEnvOfType(...args)
+            testDevEnvironments.push(env)
+
+            return env
+        }
+    })
+
+    /**
+     * Creates a CodeCatalyst commands instance.
+     *
+     * This holds the underlying functions that are triggered
+     * when the user interacts with the vscode UI model.
+     *
+     * The goal is to test using this object as much as we can,
+     * so we can test as close as we can to the user experience.
+     * This can have interactions with vscode UI model.
+     */
+    async function createTestCodeCatalystCommands(): Promise<CodeCatalystCommands> {
+        const ccAuthProvider = CodeCatalystAuthenticationProvider.fromContext(globals.context)
+        return new CodeCatalystCommands(ccAuthProvider)
+    }
+
+    /**
+     * Creates a CodeCatalyst api client.
+     */
+    async function createTestCodeCatalystClient(auth: Auth): Promise<CodeCatalystClient> {
+        const conn = await useCodeCatalystSsoConnection(auth)
+        return await createCodeCatalystClient(conn, undefined, undefined)
+    }
+
+    /**
+     * Returns the existing Sso connection that has been
+     * verified to work with CodeCatalyst.
+     *
+     * A new connection will be created if one is not available.
+     * The returned connection is set as the active connection if not already.
+     */
+    async function useCodeCatalystSsoConnection(auth: Auth): Promise<SsoConnection> {
+        const builderIdSsoConnection = (await auth.listConnections()).find(isValidCodeCatalystConnection)
+        const conn = builderIdSsoConnection ?? (await auth.createConnection(createBuilderIdProfile(scopesCodeCatalyst)))
+
+        return auth.useConnection(conn)
+    }
+
+    /**
+     * Creates a specific CC Project if it does not already exist in the space.
+     * @param projectName The name of the test project. Be careful changing this if you plan to run locally.
+     */
+    async function tryCreateTestProject(
+        spaceName: CodeCatalystOrg['name'],
+        projectName: CodeCatalystProject['name'] = 'aws-vscode-toolkit-integ-test-project'
+    ): Promise<CodeCatalystProject> {
+        try {
+            return await client.createProject({
+                spaceName,
+                displayName: projectName,
+                description: 'This project is autogenerated by the AWS Toolkit VSCode Integ Test.',
+            })
+        } catch (e) {
+            if ((isAwsError(e) || e instanceof ToolkitError) && e.code === 'ConflictException') {
+                getLogger().debug(`Tried to create test project but it already exists: ${spaceName}/${projectName}`)
+                return client.getProject({
+                    spaceName,
+                    name: projectName,
+                })
+            }
+
+            throw e
+        }
+    }
+
+    /**
+     * Gets the first CodeCatalyst space it finds.
+     *
+     * The intention for this is to require no setup of a Space by the
+     * user if they want to run this test locally.
+     */
+    async function getCurrentUsersSpace(): Promise<CodeCatalystOrg> {
+        const firstPageOfSpaces = (await client.listSpaces().iterator().next()).value
+
+        if (firstPageOfSpaces === undefined || firstPageOfSpaces.length === 0) {
+            // Space must already exist due to CC not providing an api to create a space.
+            throw new Error(
+                'No spaces found in account. A CodeCatalyst Space must be created manually before running this test.'
+            )
+        }
+
+        const firstSpaceFound = firstPageOfSpaces[0]
+        return firstSpaceFound
+    }
+
+    /**
+     * Deletes any existing dev envs created by this test suite, resolves only
+     * once all are fully deleted on the server side. Can optionally filter per-project.
+     */
+    async function deleteTestDevEnvs(projectName?: CodeCatalystProject['name']): Promise<void> {
+        const environments = await getAllTestDevEnvironments(projectName)
+
+        // Deleting a dev env that has already been deleted will throw an error.
+        // We need to be selective about which dev envs get explicitly deleted.
+        const devEnvsToDelete = environments
+            .filter((devEnv) => !['DELETING', 'DELETED'].includes(devEnv.status))
+            .map(async (devEnv) => deleteDevEnv(devEnv.project.name, devEnv.id))
+
+        // These dev envs are already in the process of being deleted, so we just need to wait until they are fully deleted.
+        const devEnvsToWaitForDeletion = environments
+            .filter((devEnv) => ['DELETING'].includes(devEnv.status))
+            .map(async (devEnv) => waitUntilDevEnvDeleted(devEnv.project.name, devEnv.id))
+
+        await Promise.all([...devEnvsToDelete, ...devEnvsToWaitForDeletion])
+    }
+
+    /**
+     * Deletes all dev environments associated with the project that are older than one day
+     */
+    async function deleteOldDevEnvironments(projectName: CodeCatalystProject['name']): Promise<void> {
+        const environments = await getAllDevEnvs(projectName)
+
+        // Deleting a dev env that has already been deleted will throw an error.
+        // We need to be selective about which dev envs get explicitly deleted.
+        const oneDayInMs = 60 * 60 * 24 * 1000
+        await Promise.all(
+            environments
+                .filter((devEnv) => Date.now() - devEnv.lastUpdatedTime.getTime() >= oneDayInMs)
+                .filter((devEnv) => !['DELETING', 'DELETED'].includes(devEnv.status))
+                .map((devEnv) =>
+                    deleteDevEnv(devEnv.project.name, devEnv.id).catch((err) => {
+                        getLogger().warn(`tests: failed to deleted old dev environment "${devEnv.id}": %s`, err)
+                    })
+                )
+        )
+    }
+
+    async function getAllDevEnvs(projectName: CodeCatalystProject['name']): Promise<DevEnvironment[]> {
+        const currentDevEnvs = await client
+            .listDevEnvironments({ name: projectName, org: { name: spaceName }, type: 'project' })
+            .flatten()
+            .promise()
+        return currentDevEnvs
+    }
+
+    function getAllTestDevEnvironments(projectName?: CodeCatalystProject['name']) {
+        const projects = Array.from(
+            testDevEnvironments.map((env) => env.project.name).reduce((set, name) => set.add(name), new Set<string>())
+        )
+
+        const currentDevEnvs = toCollection(() => toStream(projects.map((name) => getAllDevEnvs(name))))
+            .flatten()
+            .filter((env) => !!testDevEnvironments.some((other) => other.id === env.id))
+            .filter((env) => !projectName || env.project.name === projectName)
+
+        return currentDevEnvs.promise()
+    }
+
+    /**
+     * Deletes a specific dev env and only returns when it is fully
+     * deleted on the server
+     */
+    async function deleteDevEnv(projectName: CodeCatalystProject['name'], id: DevEnvironment['id']): Promise<void> {
+        await commands.deleteDevEnv({
+            org: { name: spaceName },
+            project: { name: projectName },
+            id: id,
+        })
+
+        return waitUntilDevEnvDeleted(projectName, id)
+    }
+
+    /**
+     * waits until the dev env is fully deleted in the server.
+     *
+     * This function is needed specifically for a dev env in the deletion
+     * process since an error will be thrown when we try to get the dev environment
+     * but it has been successfully deleted.
+     */
+    async function waitUntilDevEnvDeleted(projectName: CodeCatalystProject['name'], id: DevEnvironment['id']) {
+        const result = await waitUntil(
+            async function () {
+                let devEnvBeingDeleted: DevEnvironment
+                try {
+                    devEnvBeingDeleted = await client.getDevEnvironment({ spaceName, projectName, id })
+                } catch (e: any) {
+                    // Cannot use isAwsError() because the client actually returns a regular Error
+                    // with a 'code' property for this call.
+                    if (hasKey(e, 'code') && e.code === AccessDeniedException.name) {
+                        // This error is thrown because the dev env does not exist anymore
+                        // on the server. The name doesn't make it obvious IMO.
+                        return true
+                    }
+                    throw e
+                }
+                return devEnvBeingDeleted.status === 'DELETED'
+            },
+            {
+                interval: 1000,
+                timeout: 60000,
+            }
+        )
+        if (!result) {
+            throw new Error(`Dev env ${id} did not transition to DELETED status before timeout.`)
+        }
+    }
+
+    /**
+     * Asserts that a given dev env has one of the given statuses, it will fail
+     * if the timeout is reached.
+     */
+    async function waitUntilDevEnvStatus(
+        devEnv: GetDevEnvironmentRequest,
+        status: DevEnvironment['status'][]
+    ): Promise<void> {
+        const result = await waitUntil(
+            async function () {
+                if (!devEnv.spaceName || !devEnv.projectName) {
+                    return false
+                }
+                const devEnvData = await client.getDevEnvironment({
+                    spaceName: devEnv.spaceName,
+                    projectName: devEnv.projectName,
+                    id: devEnv.id,
+                })
+                return status.includes(devEnvData.status)
+            },
+            {
+                interval: 1000,
+                timeout: 120000,
+            }
+        )
+
+        if (!result) {
+            throw new Error(
+                `Dev env ${devEnv.id} did not transition to one of the following statuses before timeout: "${status}"`
+            )
+        }
+    }
+})
diff --git a/packages/core/src/testE2E/codewhisperer/referenceTracker.test.ts b/packages/core/src/testE2E/codewhisperer/referenceTracker.test.ts
new file mode 100644
index 00000000000..d173500c608
--- /dev/null
+++ b/packages/core/src/testE2E/codewhisperer/referenceTracker.test.ts
@@ -0,0 +1,124 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as codewhispererClient from '../../codewhisperer/client/codewhisperer'
+import { ConfigurationEntry } from '../../codewhisperer/models/model'
+import { setValidConnection, skipTestIfNoValidConn } from '../util/connection'
+import { RecommendationHandler } from '../../codewhisperer/service/recommendationHandler'
+import { createMockTextEditor, resetCodeWhispererGlobalVariables } from '../../test/codewhisperer/testUtil'
+import { invokeRecommendation } from '../../codewhisperer/commands/invokeRecommendation'
+import { session } from '../../codewhisperer/util/codeWhispererSession'
+
+/*
+New model deployment may impact references returned. 
+These tests:
+    1) are not required for github approval flow 
+    2) will be auto-skipped until fix for manual runs is posted.
+*/
+
+const leftContext = `InAuto.GetContent(
+    InAuto.servers.auto, "vendors.json",
+    function (data) {
+        let block = '';
+        for(let i = 0; i < data.length; i++) {
+            block += '<a href="' + data`
+
+const rightContext = `[i].title + '">' + cars[i].title + '</a>';
+        }
+        $('#cars').html(block);
+    });`
+
+describe('CodeWhisperer service invocation', async function () {
+    let validConnection: boolean
+    const client = new codewhispererClient.DefaultCodeWhispererClient()
+    const configWithRefs: ConfigurationEntry = {
+        isShowMethodsEnabled: true,
+        isManualTriggerEnabled: true,
+        isAutomatedTriggerEnabled: true,
+        isSuggestionsWithCodeReferencesEnabled: true,
+    }
+    const configWithNoRefs: ConfigurationEntry = {
+        isShowMethodsEnabled: true,
+        isManualTriggerEnabled: true,
+        isAutomatedTriggerEnabled: true,
+        isSuggestionsWithCodeReferencesEnabled: false,
+    }
+
+    before(async function () {
+        validConnection = await setValidConnection()
+    })
+
+    beforeEach(function () {
+        void resetCodeWhispererGlobalVariables()
+        RecommendationHandler.instance.clearRecommendations()
+        // TODO: remove this line (this.skip()) when these tests no longer auto-skipped
+        this.skip()
+        // valid connection required to run tests
+        skipTestIfNoValidConn(validConnection, this)
+    })
+
+    it('trigger known to return recs with references returns rec with reference', async function () {
+        // check that handler is empty before invocation
+        const requestIdBefore = RecommendationHandler.instance.requestId
+        const sessionIdBefore = session.sessionId
+        const validRecsBefore = RecommendationHandler.instance.isValidResponse()
+
+        assert.ok(requestIdBefore.length === 0)
+        assert.ok(sessionIdBefore.length === 0)
+        assert.ok(!validRecsBefore)
+
+        const doc = leftContext + rightContext
+        const filename = 'test.js'
+        const language = 'javascript'
+        const line = 5
+        const character = 39
+        const mockEditor = createMockTextEditor(doc, filename, language, line, character)
+
+        await invokeRecommendation(mockEditor, client, configWithRefs)
+
+        const requestId = RecommendationHandler.instance.requestId
+        const sessionId = session.sessionId
+        const validRecs = RecommendationHandler.instance.isValidResponse()
+        const references = session.recommendations[0].references
+
+        assert.ok(requestId.length > 0)
+        assert.ok(sessionId.length > 0)
+        assert.ok(validRecs)
+        assert.ok(references !== undefined)
+        // TODO: uncomment this assert when this test is no longer auto-skipped
+        // assert.ok(references.length > 0)
+    })
+
+    // This test will fail if user is logged in with IAM identity center
+    it('trigger known to return rec with references does not return rec with references when reference tracker setting is off', async function () {
+        // check that handler is empty before invocation
+        const requestIdBefore = RecommendationHandler.instance.requestId
+        const sessionIdBefore = session.sessionId
+        const validRecsBefore = RecommendationHandler.instance.isValidResponse()
+
+        assert.ok(requestIdBefore.length === 0)
+        assert.ok(sessionIdBefore.length === 0)
+        assert.ok(!validRecsBefore)
+
+        const doc = leftContext + rightContext
+        const filename = 'test.js'
+        const language = 'javascript'
+        const line = 5
+        const character = 39
+        const mockEditor = createMockTextEditor(doc, filename, language, line, character)
+
+        await invokeRecommendation(mockEditor, client, configWithNoRefs)
+
+        const requestId = RecommendationHandler.instance.requestId
+        const sessionId = session.sessionId
+        const validRecs = RecommendationHandler.instance.isValidResponse()
+
+        assert.ok(requestId.length > 0)
+        assert.ok(sessionId.length > 0)
+        // no recs returned because example request returns 1 rec with reference, so no recs returned when references off
+        assert.ok(!validRecs)
+    })
+})
diff --git a/packages/core/src/testE2E/codewhisperer/securityScan.test.ts b/packages/core/src/testE2E/codewhisperer/securityScan.test.ts
new file mode 100644
index 00000000000..730b9628290
--- /dev/null
+++ b/packages/core/src/testE2E/codewhisperer/securityScan.test.ts
@@ -0,0 +1,212 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import * as codewhispererClient from '../../codewhisperer/client/codewhisperer'
+import * as CodeWhispererConstants from '../../codewhisperer/models/constants'
+import * as path from 'path'
+import * as testutil from '../../test/testUtil'
+import { setValidConnection, skipTestIfNoValidConn } from '../util/connection'
+import { resetCodeWhispererGlobalVariables } from '../../test/codewhisperer/testUtil'
+import { getTestWorkspaceFolder } from '../../testInteg/integrationTestsUtilities'
+import { closeAllEditors } from '../../test/testUtil'
+import {
+    getPresignedUrlAndUpload,
+    createScanJob,
+    pollScanJobStatus,
+    listScanResults,
+} from '../../codewhisperer/service/securityScanHandler'
+import { makeTemporaryToolkitFolder } from '../../shared/filesystemUtilities'
+import fs from '../../shared/fs/fs'
+import { ZipUtil } from '../../codewhisperer/util/zipUtil'
+import { randomUUID } from '../../shared/crypto'
+
+const filePromptWithSecurityIssues = `from flask import app
+
+def execute_input_noncompliant():
+    from flask import request
+    module_version = request.args.get("module_version")
+    # Noncompliant: executes unsanitized inputs.
+    exec("import urllib%s as urllib" % module_version)
+
+def execute_input_compliant():
+    from flask import request
+    module_version = request.args.get("module_version")
+    # Compliant: executes sanitized inputs.
+    exec("import urllib%d as urllib" % int(module_version))`
+
+const largePrompt = 'a'.repeat(CodeWhispererConstants.codeScanPythonPayloadSizeLimitBytes + 1)
+
+const javaPromptNoBuild = `class HelloWorld {
+    public static void main(String[] args) {
+        System.out.println("Hello World!");
+    }
+}`
+
+describe('CodeWhisperer security scan', async function () {
+    let validConnection: boolean
+    let tempFolder: string
+    const client = new codewhispererClient.DefaultCodeWhispererClient()
+    const workspaceFolder = getTestWorkspaceFolder()
+
+    before(async function () {
+        validConnection = await setValidConnection()
+    })
+
+    beforeEach(function () {
+        void resetCodeWhispererGlobalVariables()
+        // valid connection required to run tests
+        skipTestIfNoValidConn(validConnection, this)
+    })
+
+    afterEach(async function () {
+        if (tempFolder !== undefined) {
+            await fs.delete(tempFolder, { recursive: true })
+        }
+    })
+
+    after(async function () {
+        await closeAllEditors()
+    })
+
+    const openTestFile = async (filePath: string) => {
+        const doc = await vscode.workspace.openTextDocument(filePath)
+        return await vscode.window.showTextDocument(doc, {
+            selection: new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 1)),
+        })
+    }
+
+    /*
+    securityJobSetup: combines steps 1 and 2 in startSecurityScan:
+
+        Step 1: Generate context truncations
+        Step 2: Get presigned Url and upload
+
+    returns artifactMap, projectPath and codeScanName
+    */
+    async function securityJobSetup(editor: vscode.TextEditor) {
+        const codeScanStartTime = performance.now()
+        const zipUtil = new ZipUtil()
+        const uri = editor.document.uri
+
+        const projectPaths = zipUtil.getProjectPaths()
+        const scope = CodeWhispererConstants.CodeAnalysisScope.PROJECT
+        const zipMetadata = await zipUtil.generateZip(uri, scope)
+        const codeScanName = randomUUID()
+
+        let artifactMap
+        try {
+            artifactMap = await getPresignedUrlAndUpload(client, zipMetadata, scope, codeScanName)
+        } finally {
+            await zipUtil.removeTmpFiles(zipMetadata, scope)
+        }
+        return {
+            artifactMap: artifactMap,
+            projectPaths: projectPaths,
+            codeScanName: codeScanName,
+            codeScanStartTime: codeScanStartTime,
+        }
+    }
+
+    it('codescan request with valid input params and no security issues completes scan and returns no recommendations', async function () {
+        // set up file and editor
+        const appRoot = path.join(workspaceFolder, 'python3.7-plain-sam-app')
+        const appCodePath = path.join(appRoot, 'hello_world', 'app.py')
+        const editor = await openTestFile(appCodePath)
+
+        // run security scan
+        const securityJobSetupResult = await securityJobSetup(editor)
+        const artifactMap = securityJobSetupResult.artifactMap
+        const projectPaths = securityJobSetupResult.projectPaths
+
+        const scope = CodeWhispererConstants.CodeAnalysisScope.PROJECT
+
+        // get job status and result
+        const scanJob = await createScanJob(
+            client,
+            artifactMap,
+            editor.document.languageId,
+            scope,
+            securityJobSetupResult.codeScanName
+        )
+        const jobStatus = await pollScanJobStatus(
+            client,
+            scanJob.jobId,
+            scope,
+            securityJobSetupResult.codeScanStartTime
+        )
+        const securityRecommendationCollection = await listScanResults(
+            client,
+            scanJob.jobId,
+            CodeWhispererConstants.codeScanFindingsSchema,
+            projectPaths,
+            scope,
+            editor
+        )
+
+        assert.deepStrictEqual(jobStatus, 'Completed')
+        assert.ok(securityRecommendationCollection.length === 0)
+    })
+
+    it('codescan request with valid input params and security issues completes scan and returns recommendations', async function () {
+        // set up file and editor
+        tempFolder = await makeTemporaryToolkitFolder()
+        const tempFile = path.join(tempFolder, 'test.py')
+        await testutil.toFile(filePromptWithSecurityIssues, tempFile)
+        const editor = await openTestFile(tempFile)
+
+        const scope = CodeWhispererConstants.CodeAnalysisScope.PROJECT
+
+        // run security scan
+        const securityJobSetupResult = await securityJobSetup(editor)
+        const artifactMap = securityJobSetupResult.artifactMap
+        const projectPaths = securityJobSetupResult.projectPaths
+        const scanJob = await createScanJob(
+            client,
+            artifactMap,
+            editor.document.languageId,
+            scope,
+            securityJobSetupResult.codeScanName
+        )
+
+        // get job status and result
+        const jobStatus = await pollScanJobStatus(
+            client,
+            scanJob.jobId,
+            scope,
+            securityJobSetupResult.codeScanStartTime
+        )
+        const securityRecommendationCollection = await listScanResults(
+            client,
+            scanJob.jobId,
+            CodeWhispererConstants.codeScanFindingsSchema,
+            projectPaths,
+            scope,
+            editor
+        )
+
+        assert.deepStrictEqual(jobStatus, 'Completed')
+        assert.ok(securityRecommendationCollection.length === 1)
+    })
+
+    it('codescan request on file that is too large causes scan job setup to fail', async function () {
+        tempFolder = await makeTemporaryToolkitFolder()
+        const tempFile = path.join(tempFolder, 'test2.py')
+        await testutil.toFile(largePrompt, tempFile)
+        const editor = await openTestFile(tempFile)
+
+        await assert.rejects(() => securityJobSetup(editor))
+    })
+
+    it('codescan request on java file with no build causes scan job setup to fail', async function () {
+        tempFolder = await makeTemporaryToolkitFolder()
+        const tempFile = path.join(tempFolder, 'test.java')
+        await testutil.toFile(javaPromptNoBuild, tempFile)
+        const editor = await openTestFile(tempFile)
+
+        await assert.rejects(() => securityJobSetup(editor))
+    })
+})
diff --git a/packages/core/src/testE2E/codewhisperer/serviceInvocations.test.ts b/packages/core/src/testE2E/codewhisperer/serviceInvocations.test.ts
new file mode 100644
index 00000000000..37f32b130dd
--- /dev/null
+++ b/packages/core/src/testE2E/codewhisperer/serviceInvocations.test.ts
@@ -0,0 +1,124 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import * as path from 'path'
+import { setValidConnection, skipTestIfNoValidConn } from '../util/connection'
+import { ConfigurationEntry } from '../../codewhisperer/models/model'
+import * as codewhispererClient from '../../codewhisperer/client/codewhisperer'
+import { RecommendationHandler } from '../../codewhisperer/service/recommendationHandler'
+import {
+    createMockTextEditor,
+    createTextDocumentChangeEvent,
+    resetCodeWhispererGlobalVariables,
+} from '../../test/codewhisperer/testUtil'
+import { KeyStrokeHandler } from '../../codewhisperer/service/keyStrokeHandler'
+import { sleep } from '../../shared/utilities/timeoutUtils'
+import { invokeRecommendation } from '../../codewhisperer/commands/invokeRecommendation'
+import { getTestWorkspaceFolder } from '../../testInteg/integrationTestsUtilities'
+import { session } from '../../codewhisperer/util/codeWhispererSession'
+
+describe('CodeWhisperer service invocation', async function () {
+    let validConnection: boolean
+    const client = new codewhispererClient.DefaultCodeWhispererClient()
+    const config: ConfigurationEntry = {
+        isShowMethodsEnabled: true,
+        isManualTriggerEnabled: true,
+        isAutomatedTriggerEnabled: true,
+        isSuggestionsWithCodeReferencesEnabled: true,
+    }
+
+    before(async function () {
+        validConnection = await setValidConnection()
+    })
+
+    beforeEach(function () {
+        void resetCodeWhispererGlobalVariables()
+        RecommendationHandler.instance.clearRecommendations()
+        // valid connection required to run tests
+        skipTestIfNoValidConn(validConnection, this)
+    })
+
+    it('manual trigger returns valid recommendation response', async function () {
+        // check that handler is empty before invocation
+        const requestIdBefore = RecommendationHandler.instance.requestId
+        const sessionIdBefore = session.sessionId
+        const validRecsBefore = RecommendationHandler.instance.isValidResponse()
+
+        assert.ok(requestIdBefore.length === 0)
+        assert.ok(sessionIdBefore.length === 0)
+        assert.ok(!validRecsBefore)
+
+        const mockEditor = createMockTextEditor()
+        await invokeRecommendation(mockEditor, client, config)
+
+        const requestId = RecommendationHandler.instance.requestId
+        const sessionId = session.sessionId
+        const validRecs = RecommendationHandler.instance.isValidResponse()
+
+        assert.ok(requestId.length > 0)
+        assert.ok(sessionId.length > 0)
+        assert.ok(validRecs)
+    })
+
+    it('auto trigger returns valid recommendation response', async function () {
+        // check that handler is empty before invocation
+        const requestIdBefore = RecommendationHandler.instance.requestId
+        const sessionIdBefore = session.sessionId
+        const validRecsBefore = RecommendationHandler.instance.isValidResponse()
+
+        assert.ok(requestIdBefore.length === 0)
+        assert.ok(sessionIdBefore.length === 0)
+        assert.ok(!validRecsBefore)
+
+        const mockEditor = createMockTextEditor()
+
+        const mockEvent: vscode.TextDocumentChangeEvent = createTextDocumentChangeEvent(
+            mockEditor.document,
+            new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 1)),
+            '\n'
+        )
+
+        await KeyStrokeHandler.instance.processKeyStroke(mockEvent, mockEditor, client, config)
+        // wait for 5 seconds to allow time for response to be generated
+        await sleep(5000)
+
+        const requestId = RecommendationHandler.instance.requestId
+        const sessionId = session.sessionId
+        const validRecs = RecommendationHandler.instance.isValidResponse()
+
+        assert.ok(requestId.length > 0)
+        assert.ok(sessionId.length > 0)
+        assert.ok(validRecs)
+    })
+
+    it('invocation in unsupported language does not generate a request', async function () {
+        const workspaceFolder = getTestWorkspaceFolder()
+        const appRoot = path.join(workspaceFolder, 'go1-plain-sam-app')
+        const appCodePath = path.join(appRoot, 'hello-world', 'go.mod')
+
+        // check that handler is empty before invocation
+        const requestIdBefore = RecommendationHandler.instance.requestId
+        const sessionIdBefore = session.sessionId
+        const validRecsBefore = RecommendationHandler.instance.isValidResponse()
+
+        assert.ok(requestIdBefore.length === 0)
+        assert.ok(sessionIdBefore.length === 0)
+        assert.ok(!validRecsBefore)
+
+        const doc = await vscode.workspace.openTextDocument(vscode.Uri.file(appCodePath))
+        const editor = await vscode.window.showTextDocument(doc)
+        await invokeRecommendation(editor, client, config)
+
+        const requestId = RecommendationHandler.instance.requestId
+        const sessionId = session.sessionId
+        const validRecs = RecommendationHandler.instance.isValidResponse()
+
+        assert.ok(requestId.length === 0)
+        assert.ok(sessionId.length === 0)
+        assert.ok(!validRecs)
+    })
+})
diff --git a/packages/core/src/testE2E/shared/awsClientBuilderV3.test.ts b/packages/core/src/testE2E/shared/awsClientBuilderV3.test.ts
new file mode 100644
index 00000000000..82325c7964e
--- /dev/null
+++ b/packages/core/src/testE2E/shared/awsClientBuilderV3.test.ts
@@ -0,0 +1,87 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import http from 'http'
+import assert from 'assert'
+import { SSMClient, DescribeSessionsCommand } from '@aws-sdk/client-ssm'
+import { globals } from '../../shared'
+import { Socket } from 'net'
+
+async function closeSocket(socket: Socket) {
+    return new Promise((resolve, reject) => {
+        socket.end(() => {
+            resolve(true)
+        })
+    })
+}
+
+describe('AWSClientBuilderV3', function () {
+    const port = 3000
+    let server: http.Server
+    let requests: http.IncomingMessage[]
+    let connections: Socket[]
+
+    before(function () {
+        server = http.createServer({ keepAlive: true }, (req, rsp) => {
+            rsp.writeHead(200, { 'Content-Type': 'application/json' })
+            rsp.end(JSON.stringify({ message: 'success' }))
+        })
+        server.listen(port, () => {})
+        server.on('request', (req) => {
+            requests.push(req)
+        })
+        server.on('connection', (connection) => {
+            connections.push(connection)
+        })
+        connections = []
+    })
+
+    beforeEach(async function () {
+        requests = []
+        await Promise.all(connections.map((c) => closeSocket(c)))
+        connections = []
+    })
+
+    after(function () {
+        server.close()
+    })
+
+    it('reuses existing HTTP connections by default', async function () {
+        const client = globals.sdkClientBuilderV3.createAwsService({
+            serviceClient: SSMClient,
+            clientOptions: {
+                region: 'us-east-1',
+                endpoint: `http://localhost:${port}`,
+            },
+        })
+        assert.strictEqual(connections.length, 0)
+        await client.send(new DescribeSessionsCommand({ State: 'Active' }))
+        assert.strictEqual(connections.length, 1)
+        await client.send(new DescribeSessionsCommand({ State: 'Active' }))
+        assert.strictEqual(connections.length, 1)
+
+        assert.strictEqual(requests[0].headers.connection, 'keep-alive')
+        assert.strictEqual(requests[1].headers.connection, 'keep-alive')
+    })
+
+    it('does not reuse HTTP connections if told not to', async function () {
+        const client = globals.sdkClientBuilderV3.createAwsService({
+            serviceClient: SSMClient,
+            clientOptions: {
+                region: 'us-east-1',
+                endpoint: `http://localhost:${port}`,
+            },
+            keepAlive: false,
+        })
+        assert.strictEqual(connections.length, 0, 'no connections before requesting')
+        await client.send(new DescribeSessionsCommand({ State: 'Active' }))
+        assert.strictEqual(connections.length, 1, 'one connection after first request')
+        await client.send(new DescribeSessionsCommand({ State: 'Active' }))
+        assert.strictEqual(connections.length, 2, 'two connections after both requests')
+
+        assert.strictEqual(requests[0].headers.connection, 'close')
+        assert.strictEqual(requests[1].headers.connection, 'close')
+    })
+})
diff --git a/packages/core/src/testE2E/util/connection.ts b/packages/core/src/testE2E/util/connection.ts
new file mode 100644
index 00000000000..bf158426a2a
--- /dev/null
+++ b/packages/core/src/testE2E/util/connection.ts
@@ -0,0 +1,42 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { isValidAmazonQConnection } from '../../codewhisperer/util/authUtil'
+import { Auth } from '../../auth/auth'
+
+/*
+In order to run codewhisperer or gumby integration tests user must:
+   
+    1) run using VSC launch config.
+    2) have a valid codewhisperer/amazon q connection.
+
+Test cases will skip if the above criteria are not met.
+If user has an expired connection they must reauthenticate prior to running tests.
+*/
+
+async function getValidConnection() {
+    return (await Auth.instance.listConnections()).find(isValidAmazonQConnection)
+}
+
+export async function setValidConnection() {
+    const conn = await getValidConnection()
+    let validConnection: boolean
+
+    if (conn !== undefined && Auth.instance.getConnectionState(conn) === 'valid') {
+        validConnection = true
+        await Auth.instance.useConnection(conn)
+    } else {
+        validConnection = false
+        console.log(`No valid auth connection, will skip Amazon Q integration test cases`)
+    }
+    return validConnection
+}
+
+export function skipTestIfNoValidConn(validConnection: boolean, ctx: Mocha.Context) {
+    if (!validConnection && ctx.currentTest) {
+        ctx.currentTest.title += ` (skipped - no valid connection)`
+        ctx.currentTest.skip()
+    }
+}
diff --git a/src/test/samples/javascript/sampleClasses.js b/packages/core/src/testFixtures/javascript/sampleClasses.js
similarity index 83%
rename from src/test/samples/javascript/sampleClasses.js
rename to packages/core/src/testFixtures/javascript/sampleClasses.js
index e41215c1a6d..5842ba1fde0 100644
--- a/src/test/samples/javascript/sampleClasses.js
+++ b/packages/core/src/testFixtures/javascript/sampleClasses.js
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/src/test/samples/javascript/sampleFunctions.js b/packages/core/src/testFixtures/javascript/sampleFunctions.js
similarity index 84%
rename from src/test/samples/javascript/sampleFunctions.js
rename to packages/core/src/testFixtures/javascript/sampleFunctions.js
index 0acf020df6f..912b3e54e8f 100644
--- a/src/test/samples/javascript/sampleFunctions.js
+++ b/packages/core/src/testFixtures/javascript/sampleFunctions.js
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -29,10 +29,10 @@ module.exports.directExportsArrowFunction = name => {
 module.exports.directExportsArrowFunctionAsync = async name => {
     console.log(name)
 }
-module.exports.directExportsFunction = function(name) {
+module.exports.directExportsFunction = function (name) {
     console.log(name)
 }
-module.exports.directExportsFunctionAsync = async function(name) {
+module.exports.directExportsFunctionAsync = async function (name) {
     console.log(name)
 }
 
diff --git a/src/test/samples/typescript/sampleClasses.ts b/packages/core/src/testFixtures/typescript/sampleClasses.ts
similarity index 86%
rename from src/test/samples/typescript/sampleClasses.ts
rename to packages/core/src/testFixtures/typescript/sampleClasses.ts
index 3186783a419..17fadf8c1be 100644
--- a/src/test/samples/typescript/sampleClasses.ts
+++ b/packages/core/src/testFixtures/typescript/sampleClasses.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/src/test/samples/typescript/sampleFunctions.ts b/packages/core/src/testFixtures/typescript/sampleFunctions.ts
similarity index 95%
rename from src/test/samples/typescript/sampleFunctions.ts
rename to packages/core/src/testFixtures/typescript/sampleFunctions.ts
index 0386b1c7b88..5c88fd8f2ea 100644
--- a/src/test/samples/typescript/sampleFunctions.ts
+++ b/packages/core/src/testFixtures/typescript/sampleFunctions.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/src/test/samples/typescript/sampleInterfaces.ts b/packages/core/src/testFixtures/typescript/sampleInterfaces.ts
similarity index 81%
rename from src/test/samples/typescript/sampleInterfaces.ts
rename to packages/core/src/testFixtures/typescript/sampleInterfaces.ts
index b02171e9031..29e36e7d25e 100644
--- a/src/test/samples/typescript/sampleInterfaces.ts
+++ b/packages/core/src/testFixtures/typescript/sampleInterfaces.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/src/testFixtures/workspaceFolder/.vscode/launch.json b/packages/core/src/testFixtures/workspaceFolder/.vscode/launch.json
similarity index 100%
rename from src/testFixtures/workspaceFolder/.vscode/launch.json
rename to packages/core/src/testFixtures/workspaceFolder/.vscode/launch.json
diff --git a/packages/core/src/testFixtures/workspaceFolder/.vscode/settings.json b/packages/core/src/testFixtures/workspaceFolder/.vscode/settings.json
new file mode 100644
index 00000000000..f9add98e04f
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/.vscode/settings.json
@@ -0,0 +1,8 @@
+{
+    "aws.resources.enabledResources": [
+        "type1",
+        "type2"
+    ],
+    "json.schemas": [],
+    "editor.tabSize": 4
+}
\ No newline at end of file
diff --git a/packages/core/src/testFixtures/workspaceFolder/QCAFolder/InsecureCode.java b/packages/core/src/testFixtures/workspaceFolder/QCAFolder/InsecureCode.java
new file mode 100644
index 00000000000..884a41495d2
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/QCAFolder/InsecureCode.java
@@ -0,0 +1,79 @@
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.Statement;
+import java.io.*;
+import java.util.Base64;
+import javax.crypto.Cipher;
+import javax.crypto.spec.SecretKeySpec;
+
+public class InsecureCode {
+    // Hardcoded credentials - security issue
+    public static final String DB_PASSWORD = "fhasiufl7324kjs";
+    public static final String API_KEY = "AIzaSyB4x9K2mW7_dJ6hN3pL5tR8";
+    
+    // Weak encryption key
+    private static byte[] key = "weak1234".getBytes();
+    
+    public static void main(String[] args) {
+        try {
+            processUserData("admin");
+        } catch (Exception e) {
+            // Empty catch block - bad practice
+        }
+    }
+    
+    public static void processUserData(String input) throws Exception {
+        // SQL Injection vulnerability
+        Connection conn = DriverManager.getConnection("jdbc:mysql://localhost/db", "root", System.getenv("PASSWORD_VALUE"));
+        Statement stmt = conn.createStatement();
+        stmt.execute("SELECT * FROM users WHERE name = '" + input + "'");
+        
+        // Resource leak - not closing resources properly
+        FileInputStream fis = new FileInputStream("data.txt");
+        byte[] data = new byte[1024];
+        fis.read(data);
+        
+        // Weak encryption algorithm
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        SecretKeySpec secretKey = new SecretKeySpec(key, "AES");
+        cipher.init(Cipher.ENCRYPT_MODE, secretKey);
+        
+        // Potential information exposure
+        System.out.println("Debug: API Key = " + API_KEY);
+        
+        // Infinite loop potential
+        while(true) {
+            if(Math.random() > 0.999) break;
+        }
+    }
+    
+    public static boolean validatePassword(String password) {
+        // Hardcoded password comparison
+        return password.equals("admin123");
+    }
+    
+    public static void writeToFile(String input) {
+        try {
+            // Path traversal vulnerability
+            FileWriter fw = new FileWriter("../" + input);
+            fw.write("data");
+            // Resource leak - not closing the FileWriter
+        } catch (IOException e) {
+            // Swallowing exception
+        }
+    }
+    
+    public static void executeCommand(String cmd) throws IOException {
+        // Command injection vulnerability
+        Runtime.getRuntime().exec(cmd);
+    }
+    
+    private static class User {
+        // Public fields - encapsulation violation
+        public String username;
+        public String password;
+        
+        // Non-final field in serializable class
+        private static String secretKey;
+    }
+}
diff --git a/packages/core/src/testFixtures/workspaceFolder/QCAFolder/ProblematicCode.java b/packages/core/src/testFixtures/workspaceFolder/QCAFolder/ProblematicCode.java
new file mode 100644
index 00000000000..825f9b03733
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/QCAFolder/ProblematicCode.java
@@ -0,0 +1,70 @@
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.Statement;
+import java.io.*;
+import javax.crypto.Cipher;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.MessageDigest;
+
+public class ProblematicCode {
+    // Critical: Hardcoded credentials
+    private static final String DATABASE_PASSWORD = "mySecretPassword123";
+    private static final String API_KEY = "sk_live_12345abcdef";
+    
+    public static void main(String[] args) {
+        processUserInput("user input");
+    }
+    
+    public static void processUserInput(String userInput) {
+        try {
+            // Critical: SQL Injection vulnerability
+            Connection conn = DriverManager.getConnection(
+                "jdbc:mysql://localhost/db", "admin", DATABASE_PASSWORD);
+            Statement stmt = conn.createStatement();
+            stmt.execute("SELECT * FROM users WHERE name = '" + userInput + "'");
+            
+            // High: Command Injection
+            Runtime.getRuntime().exec("cmd.exe /c dir " + userInput);
+            
+            // Critical: Path Traversal
+            File file = new File("../../../" + userInput);
+            FileInputStream fis = new FileInputStream(file);
+            
+            // High: Unsafe Deserialization
+            ObjectInputStream ois = new ObjectInputStream(
+                new FileInputStream("data.ser"));
+            Object obj = ois.readObject();
+            
+            // Critical: HTTP Response Splitting
+            String header = "Location: " + userInput;
+            System.out.println(header);
+            
+        } catch (Exception e) {
+            // Swallowing exception
+        }
+    }
+    
+    public static void processFile(String fileName) throws IOException {
+        // High: XML External Entity (XXE)
+        javax.xml.parsers.DocumentBuilderFactory factory = 
+            javax.xml.parsers.DocumentBuilderFactory.newInstance();
+        factory.newDocumentBuilder().parse(new File(fileName));
+    }
+    
+    public static String encryptData(String data) throws Exception {
+        // High: Weak Cryptography
+        MessageDigest md = MessageDigest.getInstance("MD5");
+        byte[] hash = md.digest(data.getBytes());
+        return new String(hash);
+    }
+    
+    public static void writeToLog(String userInput) {
+        try {
+            // High: Log Injection
+            System.err.println("User activity: " + userInput);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
+
diff --git a/packages/core/src/testFixtures/workspaceFolder/QCAFolder/RLinker.java b/packages/core/src/testFixtures/workspaceFolder/QCAFolder/RLinker.java
new file mode 100644
index 00000000000..0012ec73813
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/QCAFolder/RLinker.java
@@ -0,0 +1,248 @@
+package recall;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.clyze.utils.ContainerUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.*;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+/** A linker of R-class data.
+ *
+ *  Given a list of AAR files, this linker extracts R.txt from each
+ *  file and creates the corresponding R classes that are needed so
+ *  that Doop does not report them as phantom classes. This linker does
+ *  not mimic the full logic of the aapt tool, it only generates code
+ *  that is good enough for linking (in the form of a JAR file
+ *  containing all R.java and R*.class files).
+ *
+ *  This code calls 'javac' and 'jar', so it may fail when these
+ *  programs are not in the path.
+ */
+public class RLinker {
+
+    private static final String R_AUTOGEN_JAR = "doop-autogen-R.jar";
+
+    // A map from package names -> nested class -> field -> element
+    // ids. Used by lookupConst() and XML parsing for layout controls.
+    private final Map<String, Map<String, Map<String, Integer> > > constants;
+
+    // A map from package names -> nested class -> set of text
+    // entries. Used for code generation.
+    private final Map<String, Map<String, Set<String> > > rs;
+
+    // Singleton instance.
+    private static RLinker instance;
+
+    private RLinker() {
+        this.constants = new HashMap<>();
+        this.rs = new HashMap<>();
+    }
+
+    public static RLinker getInstance() {
+        if (instance == null)
+            instance = new RLinker();
+        return instance;
+    }
+
+    Integer lookupConst(String packageName, String nestedName, String fld) {
+        Map<String, Map<String, Integer> > pkgEntry = constants.get(packageName);
+        if (pkgEntry != null) {
+            Map<String, Integer> fieldEntry = pkgEntry.get(nestedName);
+            if (fieldEntry != null) {
+                Integer c = fieldEntry.get(fld);
+                if (c != null)
+                    return c;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * The entry point of the linker. Takes a list of archives
+     * (containing paths of AAR files) and a map of AAR paths to
+     * package names. Returns the path of the generated JAR (or null
+     * if no code generation was done). 
+     */ 
+    String linkRs(String rDir, Set<String> tmpDirs) {
+        if ((rDir == null) || rs.isEmpty()) {
+            return null;
+        } else {
+            final String tmpDir = ContainerUtils.createTmpDir(tmpDirs);
+            rs.forEach ((k, v) -> runProcess("javac " + genR(tmpDir, k, v)));
+
+            // Compile JAR and optionally copy to output directory.
+            String tmpJarName = tmpDir + "/" + R_AUTOGEN_JAR;
+            runProcess("jar cf " + tmpJarName + " -C " + tmpDir + " .");
+            String outJarName = rDir + "/" + R_AUTOGEN_JAR;
+            try {
+                FileUtils.copyFile(new File(tmpJarName), new File(outJarName));
+                return outJarName;
+            } catch (IOException ex) {
+                System.err.println("Failed to copy ");
+            }
+
+            return tmpJarName;
+        }
+    }
+
+    /**
+     * Given an AAR input and a package name, the R constants are read
+     * from the R.txt file contained in the archive and the
+     * appropriate data structures of the linker are filled in.
+     *
+     * @param ar   The path of the input.
+     * @param pkg  The package name of the input.
+     */
+    public void readRConstants(String ar, String pkg) {
+        if (!ar.endsWith(".aar"))
+            return;
+        try {
+            String rText = getZipEntry(new ZipFile(ar), "R.txt");
+            if (rText != null) {
+                for (String line : rText.split("\n|\r"))
+                    if (line.length() != 0)
+                        processRLine(ar, line, pkg);
+            }
+        } catch (IOException ex) {
+            System.err.println("Error while reading R.txt: " + ar);
+            System.err.println(ex.getMessage());
+        }
+    }
+
+    /**
+     * Process each line in R.txt and (a) generate Java code for later
+     * use (in 'rs') and (b) remember constant ids (in 'constants').
+     *
+     * @param ar    The path of the archive.
+     * @param line  The line of text to be processed.
+     * @param pkg   The package name of the archive.
+     */
+    private void processRLine(String ar, String line, String pkg) {
+        final String delim = " ";
+        String[] parts = line.split(delim);
+        if (parts.length < 2) {
+            System.err.println("Error processing R.txt"); 
+        } else if (pkg == null) {
+            System.err.println("WARNING: no package: " + ar);
+        } else {
+
+            // Extract information from the line text.
+            String nestedR = parts[1];
+            // String rName = pkg + "." + "R$" + nestedR;
+            String[] newParts = new String[parts.length];
+            newParts[0] = parts[0];
+            newParts[1] = parts[2];
+            newParts[2] = "=";
+            System.arraycopy(parts, 3, newParts, 3, parts.length - 3);
+
+            // Remember int constants.
+            if (newParts[0].equals("int") && (newParts.length > 3)) {
+                String num = newParts[3];
+                int val = num.startsWith("0x") ?
+                    (int)(Long.parseLong(num.substring(2), 16)) :
+                    Integer.parseInt(num);
+                addConstant(pkg, nestedR, newParts[1], val);
+            }
+
+            // Generate Java code.
+            Map<String, Set<String>> pkgEntry = rs.getOrDefault(pkg, new HashMap<>());
+            Set<String> set = pkgEntry.getOrDefault(nestedR, new HashSet<>());
+            String declaration = "        public static ";
+            boolean first= true;
+            for (String part: newParts){
+                if (first) {
+                    declaration+=part;
+                    first=false;
+                } else {
+                    declaration+=delim+part;
+                }
+            }
+            declaration+=";";
+            set.add(declaration);
+            pkgEntry.put(nestedR, set);
+            rs.put(pkg, pkgEntry);
+        }
+    }
+
+    /**
+     * Adds a tuple (packageName, nested, f, c) to 'constants'.
+     */
+    private void addConstant(String packageName, String nested, String f, int c) {
+        Map<String, Map<String, Integer>> packageEntry = constants.getOrDefault(packageName, new HashMap<>());
+        Map<String, Integer> nestedEntry = packageEntry.getOrDefault(nested, new HashMap<>());
+        Integer val = nestedEntry.get(f);
+        if (val == null)
+            nestedEntry.put(f, c);
+        else if (!val.equals(c))
+            System.err.println("WARNING: duplicate values"); 
+        packageEntry.put(nested, nestedEntry);
+        constants.put(packageName, packageEntry);
+    }
+
+    private static void runProcess(String cmd) {
+        try {
+            Process p = Runtime.getRuntime().exec(cmd); p.waitFor(); int exitVal = p.exitValue(); 
+            if (exitVal != 0) {
+                System.out.println(cmd + " exit value = " + exitVal);
+            }
+        } catch (Exception ex) {
+            System.err.println("Error invoking command");
+        }
+    }
+
+    private static String genR(String tmpDir, String pkg, 
+                               Map<String, Set<String>> rData) {
+        String subdir = tmpDir + File.separator + pkg.replaceAll("\\.", File.separator);
+        if (new File(subdir).mkdirs())
+            System.out.println("Created directory: " + subdir);
+        String rFile = subdir + "/R.java";
+        System.out.println("Generating " + rFile);
+        Collection<String> lines = new ArrayList<>();
+        lines.add("// Auto-generated R.java by Doop.\n");
+        lines.add("package " + pkg + ";\n");
+        lines.add("public final class R {");
+        rData.forEach ((k, v) -> genNestedR(k, v, lines));
+        lines.add("}");
+
+        try {
+            Files.write(Paths.get(rFile), lines, StandardCharsets.UTF_8);
+        } catch (IOException ex) {
+            System.err.println("Error generating R class for package: " + pkg);
+            ex.printStackTrace();
+            return null;
+        }
+        return rFile;
+    }
+
+    private static void genNestedR(String nestedName, Collection<String> data,
+                                   Collection<String> lines) {
+        lines.add("    public static final class " + nestedName + " {\n");
+        lines.addAll(data);
+        lines.add("    }\n");
+    }
+
+    private static String getZipEntry(ZipFile zip, String entryName) {
+        try {
+            Enumeration<? extends ZipEntry> entries = zip.entries();
+            while(entries.hasMoreElements()) {
+                ZipEntry e = entries.nextElement();
+                if (e.getName().equals(entryName)) {
+                    InputStream is = zip.getInputStream(e);
+                    return IOUtils.toString(is, StandardCharsets.UTF_8);
+                }
+            }
+        } catch (IOException ex) {
+            System.err.println("Error reading zip file"); 
+        }
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/packages/core/src/testFixtures/workspaceFolder/appbuilder-test-app/README.md b/packages/core/src/testFixtures/workspaceFolder/appbuilder-test-app/README.md
new file mode 100644
index 00000000000..80cb2d450b9
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/appbuilder-test-app/README.md
@@ -0,0 +1,7 @@
+# Appbuilder-Test-App 
+
+This is an example app used in [appBuilderNode.test.ts](../../../testInteg/appBuilder/sidebar/appBuilderNode.test.ts) integration test. 
+
+This blank app template consists of 4 type of resources meant to generate 4 types of corresponding resource nodes in Application Builder in Explore and AWS Explore view.
+
+***Modified template.yaml or samconfig.toml file will result in integration test failure.***
\ No newline at end of file
diff --git a/packages/core/src/testFixtures/workspaceFolder/appbuilder-test-app/samconfig.toml b/packages/core/src/testFixtures/workspaceFolder/appbuilder-test-app/samconfig.toml
new file mode 100644
index 00000000000..e88fb0b68dd
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/appbuilder-test-app/samconfig.toml
@@ -0,0 +1,5 @@
+version = 0.1
+
+[default.global.parameters]
+stack_name = "appbuilder-test-project"
+region = "us-west-2"
diff --git a/packages/core/src/testFixtures/workspaceFolder/appbuilder-test-app/template.yaml b/packages/core/src/testFixtures/workspaceFolder/appbuilder-test-app/template.yaml
new file mode 100644
index 00000000000..4beb0026300
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/appbuilder-test-app/template.yaml
@@ -0,0 +1,94 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: |
+  This is an example application consist of  Amazon API Gateway REST API,
+  Sample AWS SAM template to create a simple Lambda function connected to a REST API, and S3 bucket.
+
+Globals:
+  Function:
+    Timeout: 3
+
+Resources:
+  AppBuilderProjectAPI:
+    Type: AWS::Serverless::Api
+    Properties:
+      Name: !Sub
+        - ${ResourceName} From Stack ${AWS::StackName}
+        - ResourceName: AppBuilderProjectAPI
+      StageName: Prod
+      DefinitionBody:
+        openapi: '3.0'
+        info: {}
+        paths:
+          /:
+            get:
+              x-amazon-apigateway-integration:
+                httpMethod: POST
+                type: aws_proxy
+                uri: !Sub arn:${AWS::Partition}:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${AppBuilderProjectLambda.Arn}/invocations
+              responses: {}
+      EndpointConfiguration: REGIONAL
+      TracingEnabled: true
+      Cors:
+        MaxAge: 5
+  AppBuilderProjectLambda:
+    Type: AWS::Serverless::Function 
+    Properties:
+      CodeUri: hello_world/
+      Handler: app.lambda_handler
+      Runtime: python3.12
+      Events:
+        HelloWorld:
+          Type: Api 
+          Properties:
+            Path: /hello
+            Method: get
+        AppBuilderProjectAPIGET:
+          Type: Api
+          Properties:
+            Path: /
+            Method: GET
+            RestApiId: !Ref AppBuilderProjectAPI
+      Environment:
+        Variables:
+          APPBUILDERPROJECTBUCKET_BUCKET_NAME: !Ref AppBuilderProjectBucket
+          APPBUILDERPROJECTBUCKET_BUCKET_ARN: !GetAtt AppBuilderProjectBucket.Arn
+      Policies:
+        - Statement:
+            - Effect: Allow
+              Action:
+                - s3:*
+              Resource:
+                - !Sub arn:${AWS::Partition}:s3:::${AppBuilderProjectBucket}
+                - !Sub arn:${AWS::Partition}:s3:::${AppBuilderProjectBucket}/*
+      MemorySize: 3008
+      Timeout: 30
+  AppBuilderProjectBucket:
+    Type: AWS::S3::Bucket
+    Properties:
+      BucketName: !Sub ${AWS::StackName}-appbuilde-${AWS::AccountId}
+      BucketEncryption:
+        ServerSideEncryptionConfiguration:
+          - ServerSideEncryptionByDefault:
+              SSEAlgorithm: aws:kms
+              KMSMasterKeyID: alias/aws/s3
+      PublicAccessBlockConfiguration:
+        IgnorePublicAcls: true
+        RestrictPublicBuckets: true
+  AppBuilderProjectBucketBucketPolicy:
+    Type: AWS::S3::BucketPolicy
+    Properties:
+      Bucket: !Ref AppBuilderProjectBucket
+      PolicyDocument:
+        Id: RequireEncryptionInTransit
+        Version: '2012-10-17'
+        Statement:
+          - Principal: '*'
+            Action: '*'
+            Effect: Deny
+            Resource:
+              - !GetAtt AppBuilderProjectBucket.Arn
+              - !Sub ${AppBuilderProjectBucket.Arn}/*
+            Condition:
+              Bool:
+                aws:SecureTransport: 'false'
\ No newline at end of file
diff --git a/packages/core/src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/src/app.json b/packages/core/src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/src/app.json
new file mode 100644
index 00000000000..8248ea15c8a
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/src/app.json
@@ -0,0 +1,7 @@
+{
+    "Resources": {
+        "HelloBucket": {
+            "Type": "AWS::S3::Bucket"
+        }
+    }
+}
\ No newline at end of file
diff --git a/packages/core/src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/src/app.yaml b/packages/core/src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/src/app.yaml
new file mode 100644
index 00000000000..78c1ed80e93
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/src/app.yaml
@@ -0,0 +1,3 @@
+Resources:
+  HelloBucket:
+    Type: 'AWS::S3::Bucket'
\ No newline at end of file
diff --git a/packages/core/src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/src/appYml.yml b/packages/core/src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/src/appYml.yml
new file mode 100644
index 00000000000..78c1ed80e93
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/src/appYml.yml
@@ -0,0 +1,3 @@
+Resources:
+  HelloBucket:
+    Type: 'AWS::S3::Bucket'
\ No newline at end of file
diff --git a/packages/core/src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/template.yaml b/packages/core/src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/template.yaml
new file mode 100644
index 00000000000..e61591ea95f
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/cloudformation-plain-sam-app/template.yaml
@@ -0,0 +1,5 @@
+Resources:
+    SourceCodeForCloudFormation:
+        Type: AWS::Serverless::Function
+        Properties:
+            Runtime: nodejs20.x
diff --git a/src/testFixtures/workspaceFolder/csharp6-image/src/HelloWorld/Dockerfile b/packages/core/src/testFixtures/workspaceFolder/csharp6-image/src/HelloWorld/Dockerfile
similarity index 100%
rename from src/testFixtures/workspaceFolder/csharp6-image/src/HelloWorld/Dockerfile
rename to packages/core/src/testFixtures/workspaceFolder/csharp6-image/src/HelloWorld/Dockerfile
diff --git a/src/testFixtures/workspaceFolder/csharp6-image/src/HelloWorld/Function.cs b/packages/core/src/testFixtures/workspaceFolder/csharp6-image/src/HelloWorld/Function.cs
similarity index 100%
rename from src/testFixtures/workspaceFolder/csharp6-image/src/HelloWorld/Function.cs
rename to packages/core/src/testFixtures/workspaceFolder/csharp6-image/src/HelloWorld/Function.cs
diff --git a/src/testFixtures/workspaceFolder/csharp6-image/src/HelloWorld/HelloWorld.csproj b/packages/core/src/testFixtures/workspaceFolder/csharp6-image/src/HelloWorld/HelloWorld.csproj
similarity index 100%
rename from src/testFixtures/workspaceFolder/csharp6-image/src/HelloWorld/HelloWorld.csproj
rename to packages/core/src/testFixtures/workspaceFolder/csharp6-image/src/HelloWorld/HelloWorld.csproj
diff --git a/src/testFixtures/workspaceFolder/csharp6-image/template.yaml b/packages/core/src/testFixtures/workspaceFolder/csharp6-image/template.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/csharp6-image/template.yaml
rename to packages/core/src/testFixtures/workspaceFolder/csharp6-image/template.yaml
diff --git a/src/testFixtures/workspaceFolder/csharp6-zip/src/HelloWorld/Function.cs b/packages/core/src/testFixtures/workspaceFolder/csharp6-zip/src/HelloWorld/Function.cs
similarity index 100%
rename from src/testFixtures/workspaceFolder/csharp6-zip/src/HelloWorld/Function.cs
rename to packages/core/src/testFixtures/workspaceFolder/csharp6-zip/src/HelloWorld/Function.cs
diff --git a/src/testFixtures/workspaceFolder/csharp6-zip/src/HelloWorld/HelloWorld.csproj b/packages/core/src/testFixtures/workspaceFolder/csharp6-zip/src/HelloWorld/HelloWorld.csproj
similarity index 100%
rename from src/testFixtures/workspaceFolder/csharp6-zip/src/HelloWorld/HelloWorld.csproj
rename to packages/core/src/testFixtures/workspaceFolder/csharp6-zip/src/HelloWorld/HelloWorld.csproj
diff --git a/src/testFixtures/workspaceFolder/csharp6-zip/template.yaml b/packages/core/src/testFixtures/workspaceFolder/csharp6-zip/template.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/csharp6-zip/template.yaml
rename to packages/core/src/testFixtures/workspaceFolder/csharp6-zip/template.yaml
diff --git a/src/testFixtures/workspaceFolder/deeper-projects/js-plain-sam-app/src/app.js b/packages/core/src/testFixtures/workspaceFolder/deeper-projects/js-plain-sam-app/src/app.js
similarity index 100%
rename from src/testFixtures/workspaceFolder/deeper-projects/js-plain-sam-app/src/app.js
rename to packages/core/src/testFixtures/workspaceFolder/deeper-projects/js-plain-sam-app/src/app.js
diff --git a/src/testFixtures/workspaceFolder/deeper-projects/js-plain-sam-app/src/package.json b/packages/core/src/testFixtures/workspaceFolder/deeper-projects/js-plain-sam-app/src/package.json
similarity index 100%
rename from src/testFixtures/workspaceFolder/deeper-projects/js-plain-sam-app/src/package.json
rename to packages/core/src/testFixtures/workspaceFolder/deeper-projects/js-plain-sam-app/src/package.json
diff --git a/packages/core/src/testFixtures/workspaceFolder/deeper-projects/js-plain-sam-app/template.yaml b/packages/core/src/testFixtures/workspaceFolder/deeper-projects/js-plain-sam-app/template.yaml
new file mode 100644
index 00000000000..0c873432f28
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/deeper-projects/js-plain-sam-app/template.yaml
@@ -0,0 +1,7 @@
+Resources:
+    SourceCodeBesidePackageJson:
+        Type: AWS::Serverless::Function
+        Properties:
+            CodeUri: src
+            Handler: app.projectDeepInWorkspace
+            Runtime: nodejs20.x
diff --git a/src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/Dockerfile b/packages/core/src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/Dockerfile
similarity index 100%
rename from src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/Dockerfile
rename to packages/core/src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/Dockerfile
diff --git a/src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/go.mod b/packages/core/src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/go.mod
similarity index 100%
rename from src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/go.mod
rename to packages/core/src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/go.mod
diff --git a/src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/main.go b/packages/core/src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/main.go
similarity index 100%
rename from src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/main.go
rename to packages/core/src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/main.go
diff --git a/src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/main_test.go b/packages/core/src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/main_test.go
similarity index 100%
rename from src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/main_test.go
rename to packages/core/src/testFixtures/workspaceFolder/go1-image-sam-app/hello-world/main_test.go
diff --git a/src/testFixtures/workspaceFolder/go1-image-sam-app/template.yaml b/packages/core/src/testFixtures/workspaceFolder/go1-image-sam-app/template.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/go1-image-sam-app/template.yaml
rename to packages/core/src/testFixtures/workspaceFolder/go1-image-sam-app/template.yaml
diff --git a/src/testFixtures/workspaceFolder/go1-plain-sam-app/Makefile b/packages/core/src/testFixtures/workspaceFolder/go1-plain-sam-app/Makefile
similarity index 100%
rename from src/testFixtures/workspaceFolder/go1-plain-sam-app/Makefile
rename to packages/core/src/testFixtures/workspaceFolder/go1-plain-sam-app/Makefile
diff --git a/src/testFixtures/workspaceFolder/go1-plain-sam-app/hello-world/go.mod b/packages/core/src/testFixtures/workspaceFolder/go1-plain-sam-app/hello-world/go.mod
similarity index 100%
rename from src/testFixtures/workspaceFolder/go1-plain-sam-app/hello-world/go.mod
rename to packages/core/src/testFixtures/workspaceFolder/go1-plain-sam-app/hello-world/go.mod
diff --git a/src/testFixtures/workspaceFolder/go1-plain-sam-app/hello-world/main.go b/packages/core/src/testFixtures/workspaceFolder/go1-plain-sam-app/hello-world/main.go
similarity index 100%
rename from src/testFixtures/workspaceFolder/go1-plain-sam-app/hello-world/main.go
rename to packages/core/src/testFixtures/workspaceFolder/go1-plain-sam-app/hello-world/main.go
diff --git a/src/testFixtures/workspaceFolder/go1-plain-sam-app/hello-world/main_test.go b/packages/core/src/testFixtures/workspaceFolder/go1-plain-sam-app/hello-world/main_test.go
similarity index 100%
rename from src/testFixtures/workspaceFolder/go1-plain-sam-app/hello-world/main_test.go
rename to packages/core/src/testFixtures/workspaceFolder/go1-plain-sam-app/hello-world/main_test.go
diff --git a/src/testFixtures/workspaceFolder/go1-plain-sam-app/template.yaml b/packages/core/src/testFixtures/workspaceFolder/go1-plain-sam-app/template.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/go1-plain-sam-app/template.yaml
rename to packages/core/src/testFixtures/workspaceFolder/go1-plain-sam-app/template.yaml
diff --git a/packages/core/src/testFixtures/workspaceFolder/go1-zip/go.mod b/packages/core/src/testFixtures/workspaceFolder/go1-zip/go.mod
new file mode 100644
index 00000000000..dfe86d20da9
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/go1-zip/go.mod
@@ -0,0 +1,3 @@
+module example/random-number
+
+go 1.21.4
diff --git a/packages/core/src/testFixtures/workspaceFolder/go1-zip/help.go b/packages/core/src/testFixtures/workspaceFolder/go1-zip/help.go
new file mode 100644
index 00000000000..d50796d5473
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/go1-zip/help.go
@@ -0,0 +1,7 @@
+package main
+
+import "fmt"
+
+func Help() {
+	fmt.Printf("./main")
+}
diff --git a/packages/core/src/testFixtures/workspaceFolder/go1-zip/main.go b/packages/core/src/testFixtures/workspaceFolder/go1-zip/main.go
new file mode 100644
index 00000000000..4f8e9fb429d
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/go1-zip/main.go
@@ -0,0 +1,10 @@
+package main
+
+import (
+	"example/random-number/util"
+	"fmt"
+)
+
+func main() {
+	fmt.Printf("Number: %d\n", util.RandomNumber())
+}
diff --git a/packages/core/src/testFixtures/workspaceFolder/go1-zip/util/number.go b/packages/core/src/testFixtures/workspaceFolder/go1-zip/util/number.go
new file mode 100644
index 00000000000..781c4345c30
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/go1-zip/util/number.go
@@ -0,0 +1,7 @@
+package util
+
+import "math/rand"
+
+func RandomNumber() int {
+	return rand.Intn(100)
+}
diff --git a/src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/HelloWorldFunction/pom.xml b/packages/core/src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/HelloWorldFunction/pom.xml
similarity index 100%
rename from src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/HelloWorldFunction/pom.xml
rename to packages/core/src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/HelloWorldFunction/pom.xml
diff --git a/src/testFixtures/workspaceFolder/java11-image-gradle-sam-app/HelloWorldFunction/src/main/java/helloworld/App.java b/packages/core/src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/HelloWorldFunction/src/main/java/helloworld/App.java
similarity index 100%
rename from src/testFixtures/workspaceFolder/java11-image-gradle-sam-app/HelloWorldFunction/src/main/java/helloworld/App.java
rename to packages/core/src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/HelloWorldFunction/src/main/java/helloworld/App.java
diff --git a/src/testFixtures/workspaceFolder/java11-image-gradle-sam-app/HelloWorldFunction/src/test/java/helloworld/AppTest.java b/packages/core/src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/HelloWorldFunction/src/test/java/helloworld/AppTest.java
similarity index 100%
rename from src/testFixtures/workspaceFolder/java11-image-gradle-sam-app/HelloWorldFunction/src/test/java/helloworld/AppTest.java
rename to packages/core/src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/HelloWorldFunction/src/test/java/helloworld/AppTest.java
diff --git a/src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/template.yaml b/packages/core/src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/template.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/template.yaml
rename to packages/core/src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/template.yaml
diff --git a/packages/core/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/build.gradle b/packages/core/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/build.gradle
new file mode 100644
index 00000000000..5057e23c89b
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/build.gradle
@@ -0,0 +1,16 @@
+plugins {
+    id 'java'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'com.amazonaws:aws-lambda-java-core:1.2.2'
+    implementation 'com.amazonaws:aws-lambda-java-events:3.11.0'
+    testImplementation 'junit:junit:4.13.2'
+}
+
+sourceCompatibility = 17
+targetCompatibility = 17
diff --git a/packages/core/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/gradle/wrapper/gradle-wrapper.properties b/packages/core/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000000..2e6e5897b52
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/packages/core/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/gradlew b/packages/core/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/gradlew
new file mode 100755
index 00000000000..1b6c787337f
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/gradlew
@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/packages/core/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/gradlew.bat b/packages/core/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/gradlew.bat
new file mode 100644
index 00000000000..ac1b06f9382
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/src/testFixtures/workspaceFolder/java11-plain-gradle-sam-app/HelloWorldFunction/src/main/java/helloworld/App.java b/packages/core/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/src/main/java/helloworld/App.java
similarity index 100%
rename from src/testFixtures/workspaceFolder/java11-plain-gradle-sam-app/HelloWorldFunction/src/main/java/helloworld/App.java
rename to packages/core/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/src/main/java/helloworld/App.java
diff --git a/packages/core/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/src/test/java/helloworld/AppTest.java b/packages/core/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/src/test/java/helloworld/AppTest.java
new file mode 100644
index 00000000000..240323bb7c8
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/src/test/java/helloworld/AppTest.java
@@ -0,0 +1,22 @@
+package helloworld;
+
+import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+
+public class AppTest {
+  @Test
+  public void successfulResponse() {
+    App app = new App();
+    APIGatewayProxyResponseEvent result = app.handleRequest(null, null);
+    assertEquals(200, result.getStatusCode().intValue());
+    assertEquals("application/json", result.getHeaders().get("Content-Type"));
+    String content = result.getBody();
+    assertNotNull(content);
+    assertTrue(content.contains("\"message\""));
+    assertTrue(content.contains("\"hello world\""));
+    assertTrue(content.contains("\"location\""));
+  }
+}
diff --git a/packages/core/src/testFixtures/workspaceFolder/java17-gradle/events/event.json b/packages/core/src/testFixtures/workspaceFolder/java17-gradle/events/event.json
new file mode 100644
index 00000000000..b0f2053f4b1
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/java17-gradle/events/event.json
@@ -0,0 +1,63 @@
+{
+    "body": "{\"message\": \"hello world\"}",
+    "resource": "/{proxy+}",
+    "path": "/path/to/resource",
+    "httpMethod": "POST",
+    "isBase64Encoded": false,
+    "queryStringParameters": {
+      "foo": "bar"
+    },
+    "pathParameters": {
+      "proxy": "/path/to/resource"
+    },
+    "stageVariables": {
+      "baz": "qux"
+    },
+    "headers": {
+      "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8",
+      "Accept-Encoding": "gzip, deflate, sdch",
+      "Accept-Language": "en-US,en;q=0.8",
+      "Cache-Control": "max-age=0",
+      "CloudFront-Forwarded-Proto": "https",
+      "CloudFront-Is-Desktop-Viewer": "true",
+      "CloudFront-Is-Mobile-Viewer": "false",
+      "CloudFront-Is-SmartTV-Viewer": "false",
+      "CloudFront-Is-Tablet-Viewer": "false",
+      "CloudFront-Viewer-Country": "US",
+      "Host": "1234567890.execute-api.us-east-1.amazonaws.com",
+      "Upgrade-Insecure-Requests": "1",
+      "User-Agent": "Custom User Agent String",
+      "Via": "1.1 08f323deadbeefa7af34d5feb414ce27.cloudfront.net (CloudFront)",
+      "X-Amz-Cf-Id": "cDehVQoZnx43VYQb9j2-nvCh-9z396Uhbp027Y2JvkCPNLmGJHqlaA==",
+      "X-Forwarded-For": "127.0.0.1, 127.0.0.2",
+      "X-Forwarded-Port": "443",
+      "X-Forwarded-Proto": "https"
+    },
+    "requestContext": {
+      "accountId": "123456789012",
+      "resourceId": "123456",
+      "stage": "prod",
+      "requestId": "c6af9ac6-7b61-11e6-9a41-93e8deadbeef",
+      "requestTime": "09/Apr/2015:12:34:56 +0000",
+      "requestTimeEpoch": 1428582896000,
+      "identity": {
+        "cognitoIdentityPoolId": null,
+        "accountId": null,
+        "cognitoIdentityId": null,
+        "caller": null,
+        "accessKey": null,
+        "sourceIp": "127.0.0.1",
+        "cognitoAuthenticationType": null,
+        "cognitoAuthenticationProvider": null,
+        "userArn": null,
+        "userAgent": "Custom User Agent String",
+        "user": null
+      },
+      "path": "/prod/path/to/resource",
+      "resourcePath": "/{proxy+}",
+      "httpMethod": "POST",
+      "apiId": "1234567890",
+      "protocol": "HTTP/1.1"
+    }
+  }
+  
diff --git a/packages/core/src/testFixtures/workspaceFolder/java17-gradle/template.yaml b/packages/core/src/testFixtures/workspaceFolder/java17-gradle/template.yaml
new file mode 100644
index 00000000000..6b063302a40
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/java17-gradle/template.yaml
@@ -0,0 +1,46 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: >
+  lambda-java17
+
+  Sample SAM Template for lambda-java17
+
+# More info about Globals: https://github.com/awslabs/serverless-application-model/blob/master/docs/globals.rst
+Globals:
+  Function:
+    Timeout: 20
+    MemorySize: 512
+
+Resources:
+  HelloWorldFunction:
+    Type: AWS::Serverless::Function # More info about Function Resource: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+    Properties:
+      CodeUri: HelloWorldFunction
+      Handler: helloworld.App::handleRequest
+      Runtime: java17
+      Architectures:
+        - arm64
+      MemorySize: 512
+      Environment: # More info about Env Vars: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#environment-object
+        Variables:
+          PARAM1: VALUE
+      Events:
+        HelloWorld:
+          Type: Api # More info about API Event Source: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
+          Properties:
+            Path: /hello
+            Method: get
+
+Outputs:
+  # ServerlessRestApi is an implicit API created out of Events key under Serverless::Function
+  # Find out more about other implicit resources you can reference within SAM
+  # https://github.com/awslabs/serverless-application-model/blob/master/docs/internals/generated_resources.rst#api
+  HelloWorldApi:
+    Description: "API Gateway endpoint URL for Prod stage for Hello World function"
+    Value: !Sub "https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/hello/"
+  HelloWorldFunction:
+    Description: "Hello World Lambda Function ARN"
+    Value: !GetAtt HelloWorldFunction.Arn
+  HelloWorldFunctionIamRole:
+    Description: "Implicit IAM Role created for Hello World function"
+    Value: !GetAtt HelloWorldFunctionRole.Arn
diff --git a/packages/core/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/Dockerfile b/packages/core/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/Dockerfile
new file mode 100644
index 00000000000..8ec7de93eab
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/Dockerfile
@@ -0,0 +1,23 @@
+FROM public.ecr.aws/sam/build-java17:latest as build-image
+
+ARG SCRATCH_DIR=/var/task/build
+
+COPY src/ src/
+COPY gradle/ gradle/
+COPY build.gradle gradlew ./
+
+RUN mkdir build
+COPY gradle/lambda-build-init.gradle ./build
+
+RUN ./gradlew --project-cache-dir $SCRATCH_DIR/gradle-cache -Dsoftware.amazon.aws.lambdabuilders.scratch-dir=$SCRATCH_DIR --init-script $SCRATCH_DIR/lambda-build-init.gradle build
+RUN rm -r $SCRATCH_DIR/gradle-cache
+RUN rm -r $SCRATCH_DIR/lambda-build-init.gradle
+RUN cp -r $SCRATCH_DIR/*/build/distributions/lambda-build/* .
+
+FROM public.ecr.aws/lambda/java:17
+
+COPY --from=build-image /var/task/META-INF ./
+COPY --from=build-image /var/task/helloworld ./helloworld
+COPY --from=build-image /var/task/lib/ ./lib
+# Command can be overwritten by providing a different command in the template directly.
+CMD ["helloworld.App::handleRequest"]
\ No newline at end of file
diff --git a/packages/core/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/build.gradle b/packages/core/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/build.gradle
new file mode 100644
index 00000000000..042ce3b320b
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/build.gradle
@@ -0,0 +1,16 @@
+plugins {
+    id 'java'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation 'com.amazonaws:aws-lambda-java-core:1.2.2'
+    implementation 'com.amazonaws:aws-lambda-java-events:3.11.0'
+    testImplementation 'junit:junit:4.12'
+}
+
+sourceCompatibility = 17
+targetCompatibility = 17
diff --git a/src/testFixtures/workspaceFolder/java11-image-gradle-sam-app/HelloWorldFunction/gradle/lambda-build-init.gradle b/packages/core/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/gradle/lambda-build-init.gradle
similarity index 100%
rename from src/testFixtures/workspaceFolder/java11-image-gradle-sam-app/HelloWorldFunction/gradle/lambda-build-init.gradle
rename to packages/core/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/gradle/lambda-build-init.gradle
diff --git a/packages/core/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/gradle/wrapper/gradle-wrapper.properties b/packages/core/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000000..2e6e5897b52
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/src/testFixtures/workspaceFolder/java11-image-gradle-sam-app/HelloWorldFunction/gradlew b/packages/core/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/gradlew
old mode 100644
new mode 100755
similarity index 100%
rename from src/testFixtures/workspaceFolder/java11-image-gradle-sam-app/HelloWorldFunction/gradlew
rename to packages/core/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/gradlew
diff --git a/src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/HelloWorldFunction/src/main/java/helloworld/App.java b/packages/core/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/src/main/java/helloworld/App.java
similarity index 100%
rename from src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/HelloWorldFunction/src/main/java/helloworld/App.java
rename to packages/core/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/src/main/java/helloworld/App.java
diff --git a/packages/core/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/src/test/java/helloworld/AppTest.java b/packages/core/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/src/test/java/helloworld/AppTest.java
new file mode 100644
index 00000000000..240323bb7c8
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/java17-image/HelloWorldFunction/src/test/java/helloworld/AppTest.java
@@ -0,0 +1,22 @@
+package helloworld;
+
+import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+
+public class AppTest {
+  @Test
+  public void successfulResponse() {
+    App app = new App();
+    APIGatewayProxyResponseEvent result = app.handleRequest(null, null);
+    assertEquals(200, result.getStatusCode().intValue());
+    assertEquals("application/json", result.getHeaders().get("Content-Type"));
+    String content = result.getBody();
+    assertNotNull(content);
+    assertTrue(content.contains("\"message\""));
+    assertTrue(content.contains("\"hello world\""));
+    assertTrue(content.contains("\"location\""));
+  }
+}
diff --git a/packages/core/src/testFixtures/workspaceFolder/java17-image/events/event.json b/packages/core/src/testFixtures/workspaceFolder/java17-image/events/event.json
new file mode 100644
index 00000000000..3822fadaaa9
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/java17-image/events/event.json
@@ -0,0 +1,63 @@
+{
+    "body": "{\"message\": \"hello world\"}",
+    "resource": "/{proxy+}",
+    "path": "/path/to/resource",
+    "httpMethod": "POST",
+    "isBase64Encoded": false,
+    "queryStringParameters": {
+      "foo": "bar"
+    },
+    "pathParameters": {
+      "proxy": "/path/to/resource"
+    },
+    "stageVariables": {
+      "baz": "qux"
+    },
+    "headers": {
+      "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8",
+      "Accept-Encoding": "gzip, deflate, sdch",
+      "Accept-Language": "en-US,en;q=0.8",
+      "Cache-Control": "max-age=0",
+      "CloudFront-Forwarded-Proto": "https",
+      "CloudFront-Is-Desktop-Viewer": "true",
+      "CloudFront-Is-Mobile-Viewer": "false",
+      "CloudFront-Is-SmartTV-Viewer": "false",
+      "CloudFront-Is-Tablet-Viewer": "false",
+      "CloudFront-Viewer-Country": "US",
+      "Host": "1234567890.execute-api.us-east-1.amazonaws.com",
+      "Upgrade-Insecure-Requests": "1",
+      "User-Agent": "Custom User Agent String",
+      "Via": "1.1 08f323deadbeefa7af34d5feb414ce27.cloudfront.net (CloudFront)",
+      "X-Amz-Cf-Id": "cDehVQoZnx43VYQb9j2-nvCh-9z396Uhbp027Y2JvkCPNLmGJHqlaA==",
+      "X-Forwarded-For": "127.0.0.1, 127.0.0.2",
+      "X-Forwarded-Port": "443",
+      "X-Forwarded-Proto": "https"
+    },
+    "requestContext": {
+      "accountId": "123456789012",
+      "resourceId": "123456",
+      "stage": "prod",
+      "requestId": "c6af9ac6-7b61-11e6-9a41-93e8deadbeef",
+      "requestTime": "09/Apr/2015:12:34:56 +0000",
+      "requestTimeEpoch": 1428582896000,
+      "identity": {
+        "cognitoIdentityPoolId": null,
+        "accountId": null,
+        "cognitoIdentityId": null,
+        "caller": null,
+        "accessKey": null,
+        "sourceIp": "127.0.0.1",
+        "cognitoAuthenticationType": null,
+        "cognitoAuthenticationProvider": null,
+        "userArn": null,
+        "userAgent": "Custom User Agent String",
+        "user": null
+      },
+      "path": "/prod/path/to/resource",
+      "resourcePath": "/{proxy+}",
+      "httpMethod": "POST",
+      "apiId": "1234567890",
+      "protocol": "HTTP/1.1"
+    }
+  }
+  
\ No newline at end of file
diff --git a/packages/core/src/testFixtures/workspaceFolder/java17-image/template.yaml b/packages/core/src/testFixtures/workspaceFolder/java17-image/template.yaml
new file mode 100644
index 00000000000..eb1f4f47c17
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/java17-image/template.yaml
@@ -0,0 +1,47 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: >
+  lambda-java17-x86-image
+
+  Sample SAM Template for lambda-java17-x86-image
+
+# More info about Globals: https://github.com/awslabs/serverless-application-model/blob/master/docs/globals.rst
+Globals:
+  Function:
+    Timeout: 20
+    MemorySize: 512
+
+Resources:
+  HelloWorldFunction:
+    Type: AWS::Serverless::Function # More info about Function Resource: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+    Properties:
+      PackageType: Image
+      Architectures:
+        - x86_64
+      Environment: # More info about Env Vars: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#environment-object
+        Variables:
+          PARAM1: VALUE
+      Events:
+        HelloWorld:
+          Type: Api # More info about API Event Source: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
+          Properties:
+            Path: /hello
+            Method: get
+    Metadata:
+      DockerTag: java17-gradle-v1
+      DockerContext: ./HelloWorldFunction
+      Dockerfile: Dockerfile
+
+Outputs:
+  # ServerlessRestApi is an implicit API created out of Events key under Serverless::Function
+  # Find out more about other implicit resources you can reference within SAM
+  # https://github.com/awslabs/serverless-application-model/blob/master/docs/internals/generated_resources.rst#api
+  HelloWorldApi:
+    Description: "API Gateway endpoint URL for Prod stage for Hello World function"
+    Value: !Sub "https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/hello/"
+  HelloWorldFunction:
+    Description: "Hello World Lambda Function ARN"
+    Value: !GetAtt HelloWorldFunction.Arn
+  HelloWorldFunctionIamRole:
+    Description: "Implicit IAM Role created for Hello World function"
+    Value: !GetAtt HelloWorldFunctionRole.Arn
diff --git a/packages/core/src/testFixtures/workspaceFolder/java17-maven/HelloWorldFunction/pom.xml b/packages/core/src/testFixtures/workspaceFolder/java17-maven/HelloWorldFunction/pom.xml
new file mode 100644
index 00000000000..9ebabad9387
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/java17-maven/HelloWorldFunction/pom.xml
@@ -0,0 +1,52 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>helloworld</groupId>
+    <artifactId>HelloWorld</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+    <name>A sample Hello World created for SAM CLI.</name>
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-lambda-java-core</artifactId>
+            <version>1.2.2</version>
+        </dependency>
+        <dependency>
+          <groupId>com.amazonaws</groupId>
+          <artifactId>aws-lambda-java-events</artifactId>
+          <version>3.11.0</version>
+        </dependency>
+        <dependency>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+          <version>4.13.2</version>
+          <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-shade-plugin</artifactId>
+          <version>3.2.4</version>
+          <configuration>
+          </configuration>
+          <executions>
+            <execution>
+              <phase>package</phase>
+              <goals>
+                <goal>shade</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </build>
+</project>
diff --git a/packages/core/src/testFixtures/workspaceFolder/java17-maven/HelloWorldFunction/src/main/java/helloworld/App.java b/packages/core/src/testFixtures/workspaceFolder/java17-maven/HelloWorldFunction/src/main/java/helloworld/App.java
new file mode 100644
index 00000000000..0cbd0f88995
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/java17-maven/HelloWorldFunction/src/main/java/helloworld/App.java
@@ -0,0 +1,48 @@
+package helloworld;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
+
+/**
+ * Handler for requests to Lambda function.
+ */
+public class App implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> {
+
+    public APIGatewayProxyResponseEvent handleRequest(final APIGatewayProxyRequestEvent input, final Context context) {
+        Map<String, String> headers = new HashMap<>();
+        headers.put("Content-Type", "application/json");
+        headers.put("X-Custom-Header", "application/json");
+
+        APIGatewayProxyResponseEvent response = new APIGatewayProxyResponseEvent()
+                .withHeaders(headers);
+        try {
+            final String pageContents = this.getPageContents("https://checkip.amazonaws.com");
+            String output = String.format("{ \"message\": \"hello world\", \"location\": \"%s\" }", pageContents);
+
+            return response
+                    .withStatusCode(200)
+                    .withBody(output);
+        } catch (IOException e) {
+            return response
+                    .withBody("{}")
+                    .withStatusCode(500);
+        }
+    }
+
+    private String getPageContents(String address) throws IOException{
+        URL url = new URL(address);
+        try(BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()))) {
+            return br.lines().collect(Collectors.joining(System.lineSeparator()));
+        }
+    }
+}
diff --git a/packages/core/src/testFixtures/workspaceFolder/java17-maven/HelloWorldFunction/src/test/java/helloworld/AppTest.java b/packages/core/src/testFixtures/workspaceFolder/java17-maven/HelloWorldFunction/src/test/java/helloworld/AppTest.java
new file mode 100644
index 00000000000..240323bb7c8
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/java17-maven/HelloWorldFunction/src/test/java/helloworld/AppTest.java
@@ -0,0 +1,22 @@
+package helloworld;
+
+import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+
+public class AppTest {
+  @Test
+  public void successfulResponse() {
+    App app = new App();
+    APIGatewayProxyResponseEvent result = app.handleRequest(null, null);
+    assertEquals(200, result.getStatusCode().intValue());
+    assertEquals("application/json", result.getHeaders().get("Content-Type"));
+    String content = result.getBody();
+    assertNotNull(content);
+    assertTrue(content.contains("\"message\""));
+    assertTrue(content.contains("\"hello world\""));
+    assertTrue(content.contains("\"location\""));
+  }
+}
diff --git a/packages/core/src/testFixtures/workspaceFolder/java17-maven/events/event.json b/packages/core/src/testFixtures/workspaceFolder/java17-maven/events/event.json
new file mode 100644
index 00000000000..3822fadaaa9
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/java17-maven/events/event.json
@@ -0,0 +1,63 @@
+{
+    "body": "{\"message\": \"hello world\"}",
+    "resource": "/{proxy+}",
+    "path": "/path/to/resource",
+    "httpMethod": "POST",
+    "isBase64Encoded": false,
+    "queryStringParameters": {
+      "foo": "bar"
+    },
+    "pathParameters": {
+      "proxy": "/path/to/resource"
+    },
+    "stageVariables": {
+      "baz": "qux"
+    },
+    "headers": {
+      "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8",
+      "Accept-Encoding": "gzip, deflate, sdch",
+      "Accept-Language": "en-US,en;q=0.8",
+      "Cache-Control": "max-age=0",
+      "CloudFront-Forwarded-Proto": "https",
+      "CloudFront-Is-Desktop-Viewer": "true",
+      "CloudFront-Is-Mobile-Viewer": "false",
+      "CloudFront-Is-SmartTV-Viewer": "false",
+      "CloudFront-Is-Tablet-Viewer": "false",
+      "CloudFront-Viewer-Country": "US",
+      "Host": "1234567890.execute-api.us-east-1.amazonaws.com",
+      "Upgrade-Insecure-Requests": "1",
+      "User-Agent": "Custom User Agent String",
+      "Via": "1.1 08f323deadbeefa7af34d5feb414ce27.cloudfront.net (CloudFront)",
+      "X-Amz-Cf-Id": "cDehVQoZnx43VYQb9j2-nvCh-9z396Uhbp027Y2JvkCPNLmGJHqlaA==",
+      "X-Forwarded-For": "127.0.0.1, 127.0.0.2",
+      "X-Forwarded-Port": "443",
+      "X-Forwarded-Proto": "https"
+    },
+    "requestContext": {
+      "accountId": "123456789012",
+      "resourceId": "123456",
+      "stage": "prod",
+      "requestId": "c6af9ac6-7b61-11e6-9a41-93e8deadbeef",
+      "requestTime": "09/Apr/2015:12:34:56 +0000",
+      "requestTimeEpoch": 1428582896000,
+      "identity": {
+        "cognitoIdentityPoolId": null,
+        "accountId": null,
+        "cognitoIdentityId": null,
+        "caller": null,
+        "accessKey": null,
+        "sourceIp": "127.0.0.1",
+        "cognitoAuthenticationType": null,
+        "cognitoAuthenticationProvider": null,
+        "userArn": null,
+        "userAgent": "Custom User Agent String",
+        "user": null
+      },
+      "path": "/prod/path/to/resource",
+      "resourcePath": "/{proxy+}",
+      "httpMethod": "POST",
+      "apiId": "1234567890",
+      "protocol": "HTTP/1.1"
+    }
+  }
+  
\ No newline at end of file
diff --git a/packages/core/src/testFixtures/workspaceFolder/java17-maven/template.yaml b/packages/core/src/testFixtures/workspaceFolder/java17-maven/template.yaml
new file mode 100644
index 00000000000..deb299a038d
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/java17-maven/template.yaml
@@ -0,0 +1,46 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: >
+  lambda-java17-maven
+
+  Sample SAM Template for lambda-java17-maven
+
+# More info about Globals: https://github.com/awslabs/serverless-application-model/blob/master/docs/globals.rst
+Globals:
+  Function:
+    Timeout: 20
+    MemorySize: 512
+
+Resources:
+  HelloWorldFunction:
+    Type: AWS::Serverless::Function # More info about Function Resource: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+    Properties:
+      CodeUri: HelloWorldFunction
+      Handler: helloworld.App::handleRequest
+      Runtime: java17
+      Architectures:
+        - x86_64
+      MemorySize: 512
+      Environment: # More info about Env Vars: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#environment-object
+        Variables:
+          PARAM1: VALUE
+      Events:
+        HelloWorld:
+          Type: Api # More info about API Event Source: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
+          Properties:
+            Path: /hello
+            Method: get
+
+Outputs:
+  # ServerlessRestApi is an implicit API created out of Events key under Serverless::Function
+  # Find out more about other implicit resources you can reference within SAM
+  # https://github.com/awslabs/serverless-application-model/blob/master/docs/internals/generated_resources.rst#api
+  HelloWorldApi:
+    Description: "API Gateway endpoint URL for Prod stage for Hello World function"
+    Value: !Sub "https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Prod/hello/"
+  HelloWorldFunction:
+    Description: "Hello World Lambda Function ARN"
+    Value: !GetAtt HelloWorldFunction.Arn
+  HelloWorldFunctionIamRole:
+    Description: "Implicit IAM Role created for Hello World function"
+    Value: !GetAtt HelloWorldFunctionRole.Arn
diff --git a/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/.npmignore b/packages/core/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/.npmignore
similarity index 100%
rename from src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/.npmignore
rename to packages/core/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/.npmignore
diff --git a/packages/core/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/Dockerfile b/packages/core/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/Dockerfile
new file mode 100644
index 00000000000..23728fa3e2c
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/Dockerfile
@@ -0,0 +1,8 @@
+FROM public.ecr.aws/lambda/nodejs:18
+
+COPY app.js package.json ./
+
+RUN npm install
+
+# Command can be overwritten by providing a different command in the template directly.
+CMD ["app.lambdaHandler"]
diff --git a/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/app.js b/packages/core/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/app.js
similarity index 100%
rename from src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/app.js
rename to packages/core/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/app.js
diff --git a/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/package.json b/packages/core/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/package.json
similarity index 100%
rename from src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/package.json
rename to packages/core/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/package.json
diff --git a/packages/core/src/testFixtures/workspaceFolder/js-image-sam-app/template.yaml b/packages/core/src/testFixtures/workspaceFolder/js-image-sam-app/template.yaml
new file mode 100644
index 00000000000..41d9f38d83d
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/js-image-sam-app/template.yaml
@@ -0,0 +1,31 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: >
+    js-image-sam-app
+
+    Sample SAM Template for js-image-sam-app
+
+# More info about Globals: https://github.com/awslabs/serverless-application-model/blob/master/docs/globals.rst
+Globals:
+    Function:
+        Timeout: 3
+
+Resources:
+    HelloWorldFunction:
+        Type: AWS::Serverless::Function
+        Properties:
+            PackageType: Image
+            # ImageConfig:
+            # Uncomment this to override command here from the Dockerfile
+            # Command: ["app.lambdaHandler"]
+            Events:
+                HelloWorld:
+                    Type: Api
+                    Properties:
+                        Path: /hello
+                        Method: get
+        Metadata:
+            DockerTag: nodejs20.x-v1
+            DockerContext: ./hello-world
+            Dockerfile: Dockerfile
+
diff --git a/src/testFixtures/workspaceFolder/js-manifest-in-root/package.json b/packages/core/src/testFixtures/workspaceFolder/js-manifest-in-root/package.json
similarity index 100%
rename from src/testFixtures/workspaceFolder/js-manifest-in-root/package.json
rename to packages/core/src/testFixtures/workspaceFolder/js-manifest-in-root/package.json
diff --git a/src/testFixtures/workspaceFolder/js-manifest-in-root/src/subfolder/app.js b/packages/core/src/testFixtures/workspaceFolder/js-manifest-in-root/src/subfolder/app.js
similarity index 100%
rename from src/testFixtures/workspaceFolder/js-manifest-in-root/src/subfolder/app.js
rename to packages/core/src/testFixtures/workspaceFolder/js-manifest-in-root/src/subfolder/app.js
diff --git a/packages/core/src/testFixtures/workspaceFolder/js-manifest-in-root/src/subfolder/app.mjs b/packages/core/src/testFixtures/workspaceFolder/js-manifest-in-root/src/subfolder/app.mjs
new file mode 100644
index 00000000000..300fe976098
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/js-manifest-in-root/src/subfolder/app.mjs
@@ -0,0 +1,13 @@
+export const handlerTwoFoldersDeep = async (event, context) => {
+    console.log('hello world')
+
+    const response = {
+      statusCode: 200,
+      body: JSON.stringify({
+        message: 'hello world',
+      })
+    };
+
+    return response;
+  };
+  
diff --git a/packages/core/src/testFixtures/workspaceFolder/js-manifest-in-root/template.yaml b/packages/core/src/testFixtures/workspaceFolder/js-manifest-in-root/template.yaml
new file mode 100644
index 00000000000..65d832d2d9a
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/js-manifest-in-root/template.yaml
@@ -0,0 +1,7 @@
+Resources:
+    SourceCodeTwoFoldersDeep:
+        Type: AWS::Serverless::Function
+        Properties:
+            CodeUri: .
+            Handler: src/subfolder/app.handlerTwoFoldersDeep
+            Runtime: nodejs20.x
diff --git a/src/testFixtures/workspaceFolder/js-manifest-in-subfolder/src/package.json b/packages/core/src/testFixtures/workspaceFolder/js-manifest-in-subfolder/src/package.json
similarity index 100%
rename from src/testFixtures/workspaceFolder/js-manifest-in-subfolder/src/package.json
rename to packages/core/src/testFixtures/workspaceFolder/js-manifest-in-subfolder/src/package.json
diff --git a/src/testFixtures/workspaceFolder/js-manifest-in-subfolder/src/subfolder/app.js b/packages/core/src/testFixtures/workspaceFolder/js-manifest-in-subfolder/src/subfolder/app.js
similarity index 100%
rename from src/testFixtures/workspaceFolder/js-manifest-in-subfolder/src/subfolder/app.js
rename to packages/core/src/testFixtures/workspaceFolder/js-manifest-in-subfolder/src/subfolder/app.js
diff --git a/packages/core/src/testFixtures/workspaceFolder/js-manifest-in-subfolder/template.yaml b/packages/core/src/testFixtures/workspaceFolder/js-manifest-in-subfolder/template.yaml
new file mode 100644
index 00000000000..4f7755b8eff
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/js-manifest-in-subfolder/template.yaml
@@ -0,0 +1,7 @@
+Resources:
+    SourceCodeInSubfolderToManifest:
+        Type: AWS::Serverless::Function
+        Properties:
+            CodeUri: src/
+            Handler: subfolder/app.handlerInManifestSubfolder
+            Runtime: nodejs20.x
diff --git a/src/testFixtures/workspaceFolder/js-plain-sam-app/src/app.js b/packages/core/src/testFixtures/workspaceFolder/js-plain-sam-app/src/app.js
similarity index 100%
rename from src/testFixtures/workspaceFolder/js-plain-sam-app/src/app.js
rename to packages/core/src/testFixtures/workspaceFolder/js-plain-sam-app/src/app.js
diff --git a/src/testFixtures/workspaceFolder/js-plain-sam-app/src/package.json b/packages/core/src/testFixtures/workspaceFolder/js-plain-sam-app/src/package.json
similarity index 100%
rename from src/testFixtures/workspaceFolder/js-plain-sam-app/src/package.json
rename to packages/core/src/testFixtures/workspaceFolder/js-plain-sam-app/src/package.json
diff --git a/packages/core/src/testFixtures/workspaceFolder/js-plain-sam-app/template.yaml b/packages/core/src/testFixtures/workspaceFolder/js-plain-sam-app/template.yaml
new file mode 100644
index 00000000000..39783773265
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/js-plain-sam-app/template.yaml
@@ -0,0 +1,7 @@
+Resources:
+    SourceCodeBesidePackageJson:
+        Type: AWS::Serverless::Function
+        Properties:
+            CodeUri: src
+            Handler: app.handlerBesidePackageJson
+            Runtime: nodejs20.x
diff --git a/src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/Dockerfile b/packages/core/src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/Dockerfile
similarity index 100%
rename from src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/Dockerfile
rename to packages/core/src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/Dockerfile
diff --git a/src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/__init__.py b/packages/core/src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/__init__.py
similarity index 100%
rename from src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/__init__.py
rename to packages/core/src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/__init__.py
diff --git a/src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/app.py b/packages/core/src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/app.py
similarity index 100%
rename from src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/app.py
rename to packages/core/src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/app.py
diff --git a/src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/requirements.txt b/packages/core/src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/requirements.txt
similarity index 100%
rename from src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/requirements.txt
rename to packages/core/src/testFixtures/workspaceFolder/python3.7-image-sam-app/hello_world/requirements.txt
diff --git a/src/testFixtures/workspaceFolder/python3.7-image-sam-app/template.yaml b/packages/core/src/testFixtures/workspaceFolder/python3.7-image-sam-app/template.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/python3.7-image-sam-app/template.yaml
rename to packages/core/src/testFixtures/workspaceFolder/python3.7-image-sam-app/template.yaml
diff --git a/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/events/event.json b/packages/core/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/events/event.json
similarity index 100%
rename from src/testFixtures/workspaceFolder/python3.7-plain-sam-app/events/event.json
rename to packages/core/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/events/event.json
diff --git a/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/hello_world/__init__.py b/packages/core/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/hello_world/__init__.py
similarity index 100%
rename from src/testFixtures/workspaceFolder/python3.7-plain-sam-app/hello_world/__init__.py
rename to packages/core/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/hello_world/__init__.py
diff --git a/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/hello_world/app.py b/packages/core/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/hello_world/app.py
similarity index 100%
rename from src/testFixtures/workspaceFolder/python3.7-plain-sam-app/hello_world/app.py
rename to packages/core/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/hello_world/app.py
diff --git a/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/hello_world/requirements.txt b/packages/core/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/hello_world/requirements.txt
similarity index 100%
rename from src/testFixtures/workspaceFolder/python3.7-plain-sam-app/hello_world/requirements.txt
rename to packages/core/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/hello_world/requirements.txt
diff --git a/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/template.yaml b/packages/core/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/template.yaml
similarity index 100%
rename from src/testFixtures/workspaceFolder/python3.7-plain-sam-app/template.yaml
rename to packages/core/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/template.yaml
diff --git a/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/tests/unit/__init__.py b/packages/core/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/tests/unit/__init__.py
similarity index 100%
rename from src/testFixtures/workspaceFolder/python3.7-plain-sam-app/tests/unit/__init__.py
rename to packages/core/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/tests/unit/__init__.py
diff --git a/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/tests/unit/test_handler.py b/packages/core/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/tests/unit/test_handler.py
similarity index 100%
rename from src/testFixtures/workspaceFolder/python3.7-plain-sam-app/tests/unit/test_handler.py
rename to packages/core/src/testFixtures/workspaceFolder/python3.7-plain-sam-app/tests/unit/test_handler.py
diff --git a/packages/core/src/testFixtures/workspaceFolder/ruby-plain-sam-app/src/app.rb b/packages/core/src/testFixtures/workspaceFolder/ruby-plain-sam-app/src/app.rb
new file mode 100644
index 00000000000..27eac06092c
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/ruby-plain-sam-app/src/app.rb
@@ -0,0 +1,7 @@
+require 'date'
+
+# Define a function to print the current date
+def handler_beside_package_json(event, context)
+  current_date = Date.today
+  puts "Today's date is: #{current_date}"
+end
\ No newline at end of file
diff --git a/packages/core/src/testFixtures/workspaceFolder/ruby-plain-sam-app/template.yaml b/packages/core/src/testFixtures/workspaceFolder/ruby-plain-sam-app/template.yaml
new file mode 100644
index 00000000000..99fd5f7cd93
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/ruby-plain-sam-app/template.yaml
@@ -0,0 +1,13 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: >
+  Sample SAM Template for ruby-plain-sam-app
+
+# More info about Globals: https://github.com/awslabs/serverless-application-model/blob/master/docs/globals.rst
+Resources:
+    RubyApplication:
+        Type: AWS::Serverless::Function
+        Properties:
+            CodeUri: src
+            Handler: dist/app.handler_beside_package_json
+            Runtime: ruby2.7
\ No newline at end of file
diff --git a/packages/core/src/testFixtures/workspaceFolder/terraform-plain-sam-app/src/app.hcl b/packages/core/src/testFixtures/workspaceFolder/terraform-plain-sam-app/src/app.hcl
new file mode 100644
index 00000000000..24517a18d87
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/terraform-plain-sam-app/src/app.hcl
@@ -0,0 +1,32 @@
+# Define the provider, in this case, AWS
+provider "aws" {
+  region = "us-west-2"
+}
+
+# Define an AWS instance resource
+resource "aws_instance" "example" {
+  ami           = "ami-0c55b159cbfafe1f0"  # Amazon Linux 2 AMI ID
+  instance_type = "t2.micro"
+
+  tags = {
+    Name = "example-instance"
+  }
+}
+
+# Define a security group for the instance
+resource "aws_security_group" "example" {
+  name        = "example"
+  description = "Example security group"
+
+  ingress {
+    from_port   = 22
+    to_port     = 22
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+}
+
+# Associate the security group with the instance
+resource "aws_instance" "example" {
+  security_groups = [aws_security_group.example.name]
+}
diff --git a/packages/core/src/testFixtures/workspaceFolder/terraform-plain-sam-app/src/app.tf b/packages/core/src/testFixtures/workspaceFolder/terraform-plain-sam-app/src/app.tf
new file mode 100644
index 00000000000..ef2f76c88bd
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/terraform-plain-sam-app/src/app.tf
@@ -0,0 +1,3 @@
+provider "linode" {
+    token = "my-token"
+}
\ No newline at end of file
diff --git a/packages/core/src/testFixtures/workspaceFolder/terraform-plain-sam-app/template.yaml b/packages/core/src/testFixtures/workspaceFolder/terraform-plain-sam-app/template.yaml
new file mode 100644
index 00000000000..9b4bdc696d4
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/terraform-plain-sam-app/template.yaml
@@ -0,0 +1,5 @@
+Resources:
+    SourceCodeForTerraform:
+        Type: AWS::Serverless::Function
+        Properties:
+            Runtime: nodejs20.x
diff --git a/packages/core/src/testFixtures/workspaceFolder/test.ssm.json b/packages/core/src/testFixtures/workspaceFolder/test.ssm.json
new file mode 100644
index 00000000000..1e5213c6fb6
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/test.ssm.json
@@ -0,0 +1,28 @@
+{
+    "description": "Attach IAM Policy to Instance",
+    "assumeRole": "{{ AutomationAssumeRole }}",
+    "schemaVersion": "0.3",
+    "parameters": {
+        "AutomationAssumeRole": {
+            "description": "ARN role",
+            "type": "String"
+        },
+        "InstanceId": {
+            "description": "Instance ID",
+            "type": "String"
+        }
+    },
+    "mainSteps": [
+        {
+            "inputs": {
+                "FunctionName": "SSMOnboardingLambda",
+                "InputPayload": {
+                    "instance_id": "{{ InstanceId }}"
+                }
+            },
+            "name": "AttachPoliciesToInstance",
+            "action": "aws:invokeLambdaFunction",
+            "onFailure": "Abort"
+        }
+    ]
+}
diff --git a/packages/core/src/testFixtures/workspaceFolder/testGenFolder/src/main/Math.java b/packages/core/src/testFixtures/workspaceFolder/testGenFolder/src/main/Math.java
new file mode 100644
index 00000000000..ba2a15afcd3
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/testGenFolder/src/main/Math.java
@@ -0,0 +1,8 @@
+/**
+ * Math functions
+ */
+public class Math {
+    public int add(int a, int b) {
+        return a + b;
+    }
+}
diff --git a/packages/core/src/testFixtures/workspaceFolder/testGenFolder/src/main/math.js b/packages/core/src/testFixtures/workspaceFolder/testGenFolder/src/main/math.js
new file mode 100644
index 00000000000..29278e04ad1
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/testGenFolder/src/main/math.js
@@ -0,0 +1,3 @@
+function addNum(num1, num2) {
+    return num1 + num2;
+}
diff --git a/packages/core/src/testFixtures/workspaceFolder/testGenFolder/src/main/math.py b/packages/core/src/testFixtures/workspaceFolder/testGenFolder/src/main/math.py
new file mode 100644
index 00000000000..abccf85f16a
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/testGenFolder/src/main/math.py
@@ -0,0 +1,3 @@
+# adds two numbers
+def add(a, b):
+    return a + b
diff --git a/packages/core/src/testFixtures/workspaceFolder/testGenFolder/src/main/math.ts b/packages/core/src/testFixtures/workspaceFolder/testGenFolder/src/main/math.ts
new file mode 100644
index 00000000000..4139509d210
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/testGenFolder/src/main/math.ts
@@ -0,0 +1,3 @@
+function addTwoNums(a: number, b: number): number {
+    return a + b;
+}
diff --git a/packages/core/src/testFixtures/workspaceFolder/testGenFolder/src/test/MathTest.java b/packages/core/src/testFixtures/workspaceFolder/testGenFolder/src/test/MathTest.java
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/packages/core/src/testFixtures/workspaceFolder/testGenFolder/src/test/test_math.py b/packages/core/src/testFixtures/workspaceFolder/testGenFolder/src/test/test_math.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/src/testFixtures/workspaceFolder/ts-plain-sam-app/package.json b/packages/core/src/testFixtures/workspaceFolder/ts-plain-sam-app/package.json
similarity index 100%
rename from src/testFixtures/workspaceFolder/ts-plain-sam-app/package.json
rename to packages/core/src/testFixtures/workspaceFolder/ts-plain-sam-app/package.json
diff --git a/src/testFixtures/workspaceFolder/ts-plain-sam-app/src/app.ts b/packages/core/src/testFixtures/workspaceFolder/ts-plain-sam-app/src/app.ts
similarity index 100%
rename from src/testFixtures/workspaceFolder/ts-plain-sam-app/src/app.ts
rename to packages/core/src/testFixtures/workspaceFolder/ts-plain-sam-app/src/app.ts
diff --git a/packages/core/src/testFixtures/workspaceFolder/ts-plain-sam-app/template.yaml b/packages/core/src/testFixtures/workspaceFolder/ts-plain-sam-app/template.yaml
new file mode 100644
index 00000000000..f5650d82390
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/ts-plain-sam-app/template.yaml
@@ -0,0 +1,7 @@
+Resources:
+    TypeScriptApplication:
+        Type: AWS::Serverless::Function
+        Properties:
+            CodeUri: src
+            Handler: dist/app.handler
+            Runtime: nodejs18.x
diff --git a/src/testFixtures/workspaceFolder/ts-plain-sam-app/tsconfig.json b/packages/core/src/testFixtures/workspaceFolder/ts-plain-sam-app/tsconfig.json
similarity index 100%
rename from src/testFixtures/workspaceFolder/ts-plain-sam-app/tsconfig.json
rename to packages/core/src/testFixtures/workspaceFolder/ts-plain-sam-app/tsconfig.json
diff --git a/packages/core/src/testFixtures/workspaceFolder/workspaceFolder/App.java b/packages/core/src/testFixtures/workspaceFolder/workspaceFolder/App.java
new file mode 100644
index 00000000000..0cbd0f88995
--- /dev/null
+++ b/packages/core/src/testFixtures/workspaceFolder/workspaceFolder/App.java
@@ -0,0 +1,48 @@
+package helloworld;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
+
+/**
+ * Handler for requests to Lambda function.
+ */
+public class App implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> {
+
+    public APIGatewayProxyResponseEvent handleRequest(final APIGatewayProxyRequestEvent input, final Context context) {
+        Map<String, String> headers = new HashMap<>();
+        headers.put("Content-Type", "application/json");
+        headers.put("X-Custom-Header", "application/json");
+
+        APIGatewayProxyResponseEvent response = new APIGatewayProxyResponseEvent()
+                .withHeaders(headers);
+        try {
+            final String pageContents = this.getPageContents("https://checkip.amazonaws.com");
+            String output = String.format("{ \"message\": \"hello world\", \"location\": \"%s\" }", pageContents);
+
+            return response
+                    .withStatusCode(200)
+                    .withBody(output);
+        } catch (IOException e) {
+            return response
+                    .withBody("{}")
+                    .withStatusCode(500);
+        }
+    }
+
+    private String getPageContents(String address) throws IOException{
+        URL url = new URL(address);
+        try(BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()))) {
+            return br.lines().collect(Collectors.joining(System.lineSeparator()));
+        }
+    }
+}
diff --git a/packages/core/src/testInteg/amazonQTransform/transformByQ.test.ts b/packages/core/src/testInteg/amazonQTransform/transformByQ.test.ts
new file mode 100644
index 00000000000..b191997a236
--- /dev/null
+++ b/packages/core/src/testInteg/amazonQTransform/transformByQ.test.ts
@@ -0,0 +1,98 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as os from 'os'
+import * as path from 'path'
+import * as CodeWhispererConstants from '../../codewhisperer/models/constants'
+import * as codeWhisperer from '../../codewhisperer/client/codewhisperer'
+import assert from 'assert'
+import { getSha256, uploadArtifactToS3, zipCode } from '../../codewhisperer/service/transformByQ/transformApiHandler'
+import request from '../../shared/request'
+import { transformByQState, ZipManifest } from '../../codewhisperer/models/model'
+import globals from '../../shared/extensionGlobals'
+import { fs } from '../../shared'
+import { setValidConnection } from '../../testE2E/util/connection'
+
+describe('transformByQ', async function () {
+    let tempDir = ''
+    let tempFileName = ''
+    let tempFilePath = ''
+    let zippedCodePath = ''
+    let validConnection: boolean
+
+    before(async function () {
+        validConnection = await setValidConnection()
+        if (!validConnection) {
+            this.skip()
+        }
+        tempDir = path.join(os.tmpdir(), 'gumby-test')
+        await fs.mkdir(tempDir)
+        tempFileName = `testfile-${globals.clock.Date.now()}.txt`
+        tempFilePath = path.join(tempDir, tempFileName)
+        await fs.writeFile(tempFilePath, 'sample content for the test file')
+        transformByQState.setProjectPath(tempDir)
+        const zipCodeResult = await zipCode({
+            projectPath: tempDir,
+            zipManifest: new ZipManifest(),
+        })
+        zippedCodePath = zipCodeResult.tempFilePath
+    })
+
+    after(async function () {
+        if (tempDir !== '') {
+            await fs.delete(tempDir, { recursive: true })
+        }
+    })
+
+    it('WHEN upload payload with missing sha256 in headers THEN fails to upload', async function () {
+        const buffer = Buffer.from(await fs.readFileBytes(zippedCodePath))
+        const sha256 = getSha256(buffer)
+        const response = await codeWhisperer.codeWhispererClient.createUploadUrl({
+            contentChecksum: sha256,
+            contentChecksumType: CodeWhispererConstants.contentChecksumType,
+            uploadIntent: CodeWhispererConstants.uploadIntent,
+        })
+        const headersObj = {
+            'x-amz-checksum-sha256': '',
+            'Content-Type': 'application/zip',
+        }
+        const body = await fs.readFileText(zippedCodePath)
+        await assert.rejects(
+            () =>
+                request.fetch('PUT', response.uploadUrl, {
+                    body: body,
+                    headers: headersObj,
+                }).response
+        )
+    })
+
+    it('WHEN upload artifact to S3 with unsigned upload URL THEN fails to upload', async function () {
+        await assert.rejects(() =>
+            uploadArtifactToS3(
+                zippedCodePath,
+                {
+                    uploadId: 'dummyId',
+                    uploadUrl: 'https://aws-transform-artifacts-us-east-1.s3.amazonaws.com',
+                },
+                'dummy',
+                Buffer.from('', 'utf-8')
+            )
+        )
+    })
+
+    it('WHEN createUploadUrl THEN URL uses HTTPS and sets 30 minute expiration', async function () {
+        const buffer = Buffer.from(await fs.readFileBytes(zippedCodePath))
+        const sha256 = getSha256(buffer)
+        const response = await codeWhisperer.codeWhispererClient.createUploadUrl({
+            contentChecksum: sha256,
+            contentChecksumType: CodeWhispererConstants.contentChecksumType,
+            uploadIntent: CodeWhispererConstants.uploadIntent,
+        })
+        const uploadUrl = response.uploadUrl
+        const usesHttpsAndExpiresAfter30Minutes =
+            uploadUrl.includes('https') && uploadUrl.includes('X-Amz-Expires=1800')
+        assert.strictEqual(usesHttpsAndExpiresAfter30Minutes, true)
+    })
+})
diff --git a/packages/core/src/testInteg/appBuilder/serverlessLand/main.test.ts b/packages/core/src/testInteg/appBuilder/serverlessLand/main.test.ts
new file mode 100644
index 00000000000..7a443483440
--- /dev/null
+++ b/packages/core/src/testInteg/appBuilder/serverlessLand/main.test.ts
@@ -0,0 +1,144 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import path from 'path'
+import { PrompterTester } from '../../../test/shared/wizards/prompterTester'
+import { describe } from 'mocha'
+import { ProjectMetadata } from '../../../awsService/appBuilder/serverlessLand/metadataManager'
+import fs from '../../../shared/fs/fs'
+import { AppBuilderRootNode } from '../../../awsService/appBuilder/explorer/nodes/rootNode'
+import * as sinon from 'sinon'
+import { AppNode } from '../../../awsService/appBuilder/explorer/nodes/appNode'
+import { ResourceNode } from '../../../awsService/appBuilder/explorer/nodes/resourceNode'
+import { getTestWindow } from '../../../test/shared/vscode/window'
+
+describe('Serverless Land Integration', async () => {
+    const metadataPath = path.resolve(
+        __dirname,
+        '../../../../../src/awsService/appBuilder/serverlessLand/metadata.json'
+    )
+    const metadataContent = await fs.readFileText(metadataPath)
+    const parseMetadata = JSON.parse(metadataContent) as ProjectMetadata
+    const workspaceFolder = vscode.workspace.workspaceFolders![0]
+    const projectFolder = 'my-project-from-Serverless-Land'
+
+    // Additional layer of describe() needed here to prevent side effect from
+    // `sandbox.spy(AppBuilderRootNode.instance)`
+    describe('Happy Path', async () => {
+        let rootNode: sinon.SinonSpiedInstance<AppBuilderRootNode>
+        let sandbox: sinon.SinonSandbox
+
+        beforeEach(async () => {
+            sandbox = sinon.createSandbox()
+            rootNode = sandbox.spy(AppBuilderRootNode.instance)
+            await fs.delete(path.join(workspaceFolder.uri.fsPath, projectFolder), { recursive: true })
+        })
+
+        afterEach(async () => {
+            await fs.delete(path.join(workspaceFolder.uri.fsPath, projectFolder), { recursive: true })
+            sandbox.restore()
+        })
+
+        it('creates project from Serverless Land integration', async () => {
+            /**
+             * Selection:
+             *  - pattern               : [Select]  2   apigw-rest-api-lambda-sam
+             *  - runtime               : [Select]  3   dotnet
+             *  - iac                   : [Select]  1   sam
+             *  - location              : [Input]   From TestFolder.uri
+             *  - name                  : [Input]   "my-project-from-Serverless-Land"
+             */
+
+            const testWindow = getTestWindow()
+            const prompterTester = PrompterTester.init({ testWindow })
+                .handleQuickPick('Select a Pattern for your application', async (quickPick) => {
+                    await quickPick.untilReady()
+                    const options = quickPick.items
+                    Object.entries(parseMetadata.patterns).map(([key, pattern]) => {
+                        options.find((option) => option.label === key && option.detail === pattern.description)
+                    })
+                    quickPick.acceptItem(quickPick.items[1])
+                })
+                .handleQuickPick('Select Runtime', async (quickPick) => {
+                    await quickPick.untilReady()
+                    const options = quickPick.items
+                    assert.strictEqual(options[0].label, 'python')
+                    assert.strictEqual(options[1].label, 'javascript')
+                    assert.strictEqual(options[2].label, 'java')
+                    assert.strictEqual(options[3].label, 'dotnet')
+                    quickPick.acceptItem(options[3])
+                })
+                .handleQuickPick('Select IaC', async (quickPick) => {
+                    await quickPick.untilReady()
+                    const options = quickPick.items
+                    assert.strictEqual(options[0].label, 'sam')
+                    quickPick.acceptItem(options[0])
+                })
+                .handleQuickPick('Select Project Location', async (quickPick) => {
+                    await quickPick.untilReady()
+                    const options = quickPick.items
+                    assert.strictEqual(options[0].label, '$(folder) workspaceFolder')
+                    assert.strictEqual(options[1].label, '$(folder-opened) Select a folder...')
+                    quickPick.acceptItem(options[0])
+                })
+                .handleInputBox('Enter Project Name', (inputBox) => {
+                    inputBox.acceptValue('my-project-from-Serverless-Land')
+                })
+                .build()
+
+            // Validate that the README.md is shown.
+            testWindow.onDidChangeActiveTextEditor((editors) => {
+                assert(editors)
+                const readMe = path.join(workspaceFolder.uri.fsPath, projectFolder, 'README.md')
+                assert.strictEqual(editors?.document.fileName, readMe)
+            })
+
+            await vscode.commands.executeCommand('aws.toolkit.lambda.createServerlessLandProject')
+
+            // projectNodes set from previous step
+
+            const projectNode = await rootNode
+                .getChildren()
+                .then(
+                    (children) =>
+                        children.find(
+                            (node) =>
+                                node instanceof AppNode &&
+                                node.label === 'workspaceFolder/my-project-from-Serverless-Land'
+                        ) as AppNode | undefined
+                )
+
+            assert.ok(projectNode, 'Expect Serverless Land project node in Application Builder')
+
+            // Check App Builder resources
+            const resourceNodes = await projectNode.getChildren()
+            assert.strictEqual(resourceNodes.length, 1)
+            assert.ok(resourceNodes[0] instanceof ResourceNode)
+
+            // Validate Lambda resource configuration
+            const lambdaResource = resourceNodes[0] as ResourceNode
+            assert.strictEqual(lambdaResource.resource.resource.Type, 'AWS::Serverless::Function')
+            assert.strictEqual(lambdaResource.resource.resource.Runtime, 'dotnet8')
+            assert.strictEqual(lambdaResource.resource.resource.Id, 'HelloWorldFunction')
+            assert.deepStrictEqual(lambdaResource.resource.resource.Events, [
+                {
+                    Id: 'HelloWorld',
+                    Type: 'Api',
+                    Path: '/hello',
+                    Method: 'get',
+                },
+            ])
+            assert.deepStrictEqual(lambdaResource.resource.resource.Environment, {
+                Variables: {
+                    PARAM1: 'VALUE',
+                },
+            })
+
+            prompterTester.assertCallAll()
+        })
+    })
+})
diff --git a/packages/core/src/testInteg/appBuilder/sidebar/appBuilderNode.test.ts b/packages/core/src/testInteg/appBuilder/sidebar/appBuilderNode.test.ts
new file mode 100644
index 00000000000..cd9416f0156
--- /dev/null
+++ b/packages/core/src/testInteg/appBuilder/sidebar/appBuilderNode.test.ts
@@ -0,0 +1,194 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as vscode from 'vscode'
+import { AppBuilderRootNode } from '../../../awsService/appBuilder/explorer/nodes/rootNode'
+import { detectSamProjects } from '../../../awsService/appBuilder/explorer/detectSamProjects'
+import { SamAppLocation } from '../../../awsService/appBuilder/explorer/samProject'
+import { AppNode } from '../../../awsService/appBuilder/explorer/nodes/appNode'
+import { ResourceNode } from '../../../awsService/appBuilder/explorer/nodes/resourceNode'
+import * as sinon from 'sinon'
+import { writeSamconfigGlobal, SamConfig } from '../../../shared/sam/config'
+import { globals, sleep } from '../../../shared'
+import path from 'path'
+
+describe('Application Builder', async () => {
+    let rootNode: sinon.SinonSpiedInstance<AppBuilderRootNode>
+    let projects: SamAppLocation[]
+    let originalWalkThroughState: boolean
+    let projectNodes: any[]
+    let sandbox: sinon.SinonSandbox
+
+    before(async () => {
+        sandbox = sinon.createSandbox()
+        // Set the workspace to the testFixtures folder to avoid side effects from other tests.
+        sandbox.stub(vscode.workspace, 'workspaceFolders').value([
+            {
+                index: 0,
+                name: 'workspaceFolder',
+                uri: vscode.Uri.file(path.join(__dirname, '../../../../src/testFixtures/workspaceFolder')),
+            },
+        ])
+        rootNode = sandbox.spy(AppBuilderRootNode.instance)
+
+        projects = await detectSamProjects()
+
+        // Set the walkthrough status to true to ensure the root node has a walkthrough node
+        originalWalkThroughState = (await globals.globalState.get('aws.toolkit.lambda.walkthroughCompleted')) || false
+        await globals.globalState.update('aws.toolkit.lambda.walkthroughCompleted', false)
+    })
+
+    after(async () => {
+        // Restore original status of walkthroughCompleted status
+        await globals.globalState.update('aws.toolkit.lambda.walkthroughCompleted', originalWalkThroughState)
+        sandbox.restore()
+    })
+
+    describe('root node', async () => {
+        it('creates an AppBuilderRootNode with correct label', async () => {
+            const appBuidlerNode = rootNode.getTreeItem()
+            assert.strictEqual(appBuidlerNode.label, 'APPLICATION BUILDER')
+        })
+
+        it('generates correct number of children nodes: walkthrough node + project nodes', async () => {
+            const rootNodeChildern = await rootNode.getChildren()
+
+            // walkthrough node should be at the first position in the list
+            const walkthroughNode = rootNodeChildern[0]
+            assert.strictEqual(walkthroughNode.id, 'walkthrough')
+
+            // project nodes in the workspace should be AppNode instances for all project in the workspace
+            projectNodes = rootNodeChildern.filter((node) => node instanceof AppNode)
+            assert.strictEqual(projectNodes.length, projects.length)
+        })
+    })
+
+    describe('application nodes in workspace (Test in order)', async () => {
+        // The following `it()` statement within this block is meant to be executed in order
+        let appBuilderTestApp: AppNode
+        let appBuilderTestAppResourceNodes
+        let samConfig: SamConfig
+        let projectRoot: vscode.Uri
+
+        it('1: contains application node for appbuilder-test-app', async () => {
+            // projectNodes set from previous step
+            const filterResult = projectNodes.filter(
+                (node): node is AppNode =>
+                    node instanceof AppNode && node.label === 'workspaceFolder/appbuilder-test-app'
+            )
+            assert.strictEqual(filterResult.length, 1)
+
+            // Set properties for succeeding tests
+            appBuilderTestApp = filterResult[0]
+            projectRoot = appBuilderTestApp.resource.projectRoot
+            samConfig = await SamConfig.fromProjectRoot(projectRoot)
+        })
+
+        it('2: contains correct application node properties', async () => {
+            // Validate App Node
+            const appBuilderTestAppTreeItem = appBuilderTestApp.getTreeItem()
+            assert.strictEqual(appBuilderTestAppTreeItem.collapsibleState, vscode.TreeItemCollapsibleState.Collapsed)
+            assert(appBuilderTestAppTreeItem.label, 'workspaceFolder/appbuilder-test-app')
+            assert(appBuilderTestAppTreeItem.contextValue, 'awsAppBuilderAppNode')
+        })
+
+        it('3: contains correct resource node properties', async () => {
+            // Validate Resource Node
+            appBuilderTestAppResourceNodes = await appBuilderTestApp.getChildren()
+
+            // Expect 4 undeployed resources in this example projects
+            assert(appBuilderTestAppResourceNodes.length === 4)
+            assert(appBuilderTestAppResourceNodes.every((resourceNode) => resourceNode instanceof ResourceNode))
+
+            assert(
+                appBuilderTestAppResourceNodes.every(
+                    (resourceNode): resourceNode is ResourceNode => resourceNode instanceof ResourceNode
+                )
+            )
+
+            const expectedStackName = await samConfig.getCommandParam('global', 'stack_name')
+            const expectedRegion = await samConfig.getCommandParam('global', 'region')
+            for (const node of appBuilderTestAppResourceNodes) {
+                if (node instanceof ResourceNode) {
+                    assert.strictEqual(node.resource.region, expectedRegion)
+                    assert.strictEqual(node.resource.stackName, expectedStackName)
+                    assert(!node.resource.deployedResource)
+                    assert(!node.resourceLogicalId)
+                } else {
+                    assert.fail('Node is not an instance of ResourceNode')
+                }
+            }
+
+            // Validate Lambda resource node
+            const lambdaResourceNode = getResourceNodeByType(
+                appBuilderTestAppResourceNodes,
+                'AWS::Serverless::Function'
+            )
+            assert.strictEqual(lambdaResourceNode.id, 'AppBuilderProjectLambda')
+            const lambdaTreeItemProperties = lambdaResourceNode.getTreeItem()
+            assert.strictEqual(lambdaTreeItemProperties.collapsibleState, vscode.TreeItemCollapsibleState.Collapsed)
+            assert.strictEqual(lambdaTreeItemProperties.iconPath?.toString(), '$(aws-lambda-function)')
+
+            // Validate s3 bucket
+            const s3BucketResourceNode = getResourceNodeByType(appBuilderTestAppResourceNodes, 'AWS::S3::Bucket')
+            assert.strictEqual(s3BucketResourceNode.id, 'AppBuilderProjectBucket')
+            const s3BucketTreeItemProperties = s3BucketResourceNode.getTreeItem()
+            assert.strictEqual(s3BucketTreeItemProperties.collapsibleState, vscode.TreeItemCollapsibleState.Collapsed)
+            assert.strictEqual(s3BucketTreeItemProperties.iconPath?.toString(), '$(aws-s3-bucket)')
+
+            // Validate s3 policy
+            const s3PolicyResourceNode = getResourceNodeByType(appBuilderTestAppResourceNodes, 'AWS::S3::BucketPolicy')
+            assert.strictEqual(s3PolicyResourceNode.id, 'AppBuilderProjectBucketBucketPolicy')
+            const s3PolicyTreeItemProperties = s3PolicyResourceNode.getTreeItem()
+            assert.strictEqual(s3PolicyTreeItemProperties.collapsibleState, vscode.TreeItemCollapsibleState.Collapsed)
+            assert.strictEqual(s3PolicyTreeItemProperties.iconPath?.toString(), '$(info)')
+
+            // Validate api gateway resource node
+            const apigwResourceNode = getResourceNodeByType(appBuilderTestAppResourceNodes, 'AWS::Serverless::Api')
+            assert.strictEqual(apigwResourceNode.id, 'AppBuilderProjectAPI')
+            const apigwTreeItemProperties = apigwResourceNode.getTreeItem()
+            assert.strictEqual(apigwTreeItemProperties.collapsibleState, vscode.TreeItemCollapsibleState.Collapsed)
+            assert.strictEqual(apigwTreeItemProperties.iconPath?.toString(), '$(info)')
+        })
+
+        it('4: has registered refresh command successfully', async () => {
+            const originalCount = rootNode.refresh.callCount
+            let accumulateCount: number
+
+            await vscode.commands.executeCommand('aws.appBuilderForFileExplorer.refresh')
+            accumulateCount = rootNode.refresh.callCount
+            assert.strictEqual(accumulateCount - originalCount, 1)
+
+            await vscode.commands.executeCommand('aws.appBuilder.refresh')
+            accumulateCount = rootNode.refresh.callCount
+            assert.strictEqual(accumulateCount - originalCount, 2)
+        })
+
+        it('5: triggers auto refresh when there a file getting updated', async () => {
+            // Get existing stack name and region information
+            const orignalStackName = `${await samConfig.getCommandParam('global', 'stack_name')}`
+            const originalRegion = `${await samConfig.getCommandParam('global', 'region')}`
+            const updateStackName = `${orignalStackName}-updated`
+            const originalCount = rootNode.refresh.callCount
+
+            // Update stack name in samconfig.toml
+            await writeSamconfigGlobal(projectRoot, updateStackName, originalRegion)
+            await sleep(500)
+            const accumulateCount = rootNode.refresh.callCount
+            assert.strictEqual(accumulateCount - originalCount, 2)
+
+            // Restore region  to us-west-2
+            await writeSamconfigGlobal(projectRoot, orignalStackName, originalRegion)
+        })
+    })
+})
+
+function getResourceNodeByType(resourceNodes: any[], type: string) {
+    const matches = resourceNodes.filter((node) => node.resource.resource.Type === type)
+    // Expect only 1 resource node per resource type specifically for this appbuilder-test-app
+    assert(matches.length === 1)
+    return matches[0]
+}
diff --git a/packages/core/src/testInteg/appBuilder/walkthrough.test.ts b/packages/core/src/testInteg/appBuilder/walkthrough.test.ts
new file mode 100644
index 00000000000..a8097101b1e
--- /dev/null
+++ b/packages/core/src/testInteg/appBuilder/walkthrough.test.ts
@@ -0,0 +1,23 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { appMap } from '../../awsService/appBuilder/walkthrough'
+import assert from 'assert'
+
+describe('Walkthrough pattern URL exists', function () {
+    const serverlessLandOwner = 'aws-samples'
+    const serverlessLandRepo = 'serverless-patterns'
+
+    for (const [key, app] of appMap.entries()) {
+        it(`Walkthrough pattern URL exists for ${key}`, async function () {
+            const url = `https://github.com/${serverlessLandOwner}/${serverlessLandRepo}/releases/latest/download/${app.asset}`
+            const response = await fetch(url, {
+                method: 'HEAD',
+            })
+            // ignore if too frequent
+            assert.ok(response.status === 200 || response.status === 429)
+        })
+    }
+})
diff --git a/packages/core/src/testInteg/cloudformation/templateRegistry.test.ts b/packages/core/src/testInteg/cloudformation/templateRegistry.test.ts
new file mode 100644
index 00000000000..3859bdde033
--- /dev/null
+++ b/packages/core/src/testInteg/cloudformation/templateRegistry.test.ts
@@ -0,0 +1,146 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as path from 'path'
+
+import { CloudFormationTemplateRegistry } from '../../shared/fs/templateRegistry'
+import { makeSampleSamTemplateYaml, strToYamlFile } from '../../test/shared/cloudformation/cloudformationTestUtils'
+import { getTestWorkspaceFolder } from '../integrationTestsUtilities'
+import { Timeout, sleep, waitUntil } from '../../shared/utilities/timeoutUtils'
+import assert from 'assert'
+import { fs } from '../../shared'
+
+/**
+ * Note: these tests are pretty shallow right now. They do not test the following:
+ * * Adding/removing workspace folders
+ */
+describe('CloudFormation Template Registry', async function () {
+    let registry: CloudFormationTemplateRegistry
+    let workspaceDir: string
+    let testDir: string
+    let testDirNested: string
+    let dir: number = 0
+
+    before(async function () {
+        workspaceDir = getTestWorkspaceFolder()
+    })
+
+    beforeEach(async function () {
+        testDir = path.join(workspaceDir, dir.toString())
+        testDirNested = path.join(testDir, 'nested')
+        await fs.mkdir(testDirNested)
+        registry = new CloudFormationTemplateRegistry()
+        dir++
+    })
+
+    afterEach(async function () {
+        registry.dispose()
+        await fs.delete(testDir, { recursive: true })
+    })
+
+    it('adds initial template files with yaml and yml extensions at various nesting levels', async function () {
+        await strToYamlFile(makeSampleSamTemplateYaml(true), path.join(testDir, 'test.yaml'))
+        await strToYamlFile(makeSampleSamTemplateYaml(false), path.join(testDirNested, 'test.yml'))
+
+        registry.addWatchPatterns(['**/test.{yaml,yml}'])
+        await registry.rebuild()
+
+        await registryHasTargetNumberOfFiles(registry, 2)
+    })
+
+    it.skip('adds dynamically-added template files with yaml and yml extensions at various nesting levels', async function () {
+        registry.addWatchPatterns(['**/test.{yaml,yml}'])
+        await registry.rebuild()
+
+        await strToYamlFile(makeSampleSamTemplateYaml(false), path.join(testDir, 'test.yml'))
+        await strToYamlFile(makeSampleSamTemplateYaml(true), path.join(testDirNested, 'test.yaml'))
+
+        await registryHasTargetNumberOfFiles(registry, 2)
+    })
+
+    it('Ignores templates matching excluded patterns', async function () {
+        registry.addWatchPatterns(['**/test.{yaml,yml}'])
+        registry.addExcludedPattern(/.*nested.*/)
+        await registry.rebuild()
+
+        await strToYamlFile(makeSampleSamTemplateYaml(false), path.join(testDir, 'test.yml'))
+        await strToYamlFile(makeSampleSamTemplateYaml(true), path.join(testDirNested, 'test.yaml'))
+
+        await registryHasTargetNumberOfFiles(registry, 1)
+    })
+
+    it('can handle changed files', async function () {
+        const filepath = path.join(testDir, 'changeMe.yml')
+        await strToYamlFile(makeSampleSamTemplateYaml(false), filepath)
+
+        registry.addWatchPatterns(['**/changeMe.yml'])
+        await registry.rebuild()
+
+        await registryHasTargetNumberOfFiles(registry, 1)
+
+        await queryRegistryForFileWithGlobalsKeyStatus(registry, filepath, false)
+
+        await strToYamlFile(makeSampleSamTemplateYaml(true), filepath)
+
+        await queryRegistryForFileWithGlobalsKeyStatus(registry, filepath, true)
+    })
+
+    it('can handle deleted files', async function () {
+        registry.addWatchPatterns(['**/deleteMe.yml'])
+        await registry.rebuild()
+
+        // Specifically creating the file after the watcher is added
+        // Otherwise, it seems the file is deleted before the file watcher realizes the file exists
+        // This way, we know that a file watcher detects the create event on this file and thus is tracking it
+        const filepath = path.join(testDir, 'deleteMe.yml')
+        await strToYamlFile(makeSampleSamTemplateYaml(false), filepath)
+
+        await registryHasTargetNumberOfFiles(registry, 1)
+
+        await fs.delete(filepath, { recursive: true })
+
+        await registryHasTargetNumberOfFiles(registry, 0)
+    })
+
+    it('fails if you set watch patterns after init', async function () {
+        registry.addWatchPatterns(['first/set'])
+        await registry.rebuild()
+        await assert.rejects(async () => {
+            registry.addWatchPatterns(['second/set'])
+        }, new Error('CloudFormationTemplateRegistry: cannot add watch patterns after watcher has begun watching'))
+        await assert.rejects(async () => {
+            registry.addExcludedPattern(/exclude me/)
+        }, new Error('CloudFormationTemplateRegistry: cannot add excluded patterns after watcher has begun watching'))
+    })
+
+    it('cancels the rebuild if the cancellation timeout is completed', async function () {
+        registry.addWatchPatterns(['**/test.{yaml,yml}'])
+        const t = new Timeout(100)
+        t.cancel()
+        await registry.rebuild(t)
+        await registryHasTargetNumberOfFiles(registry, 0)
+    })
+})
+
+async function registryHasTargetNumberOfFiles(registry: CloudFormationTemplateRegistry, target: number) {
+    if (!(await waitUntil(async () => registry.items.length === target, { timeout: 30000 }))) {
+        throw new Error(`watchedFiles found wrong number files: expected ${target}, got ${registry.items.length}`)
+    }
+}
+
+async function queryRegistryForFileWithGlobalsKeyStatus(
+    registry: CloudFormationTemplateRegistry,
+    filepath: string,
+    hasGlobals: boolean
+) {
+    let foundMatch = false
+    while (!foundMatch) {
+        await sleep(20)
+        const obj = registry.getItem(filepath)
+        if (obj) {
+            foundMatch = Object.keys(obj.item).includes('Globals') === hasGlobals
+        }
+    }
+}
diff --git a/packages/core/src/testInteg/codecatalyst/devEnv.test.ts b/packages/core/src/testInteg/codecatalyst/devEnv.test.ts
new file mode 100644
index 00000000000..7a96ce79ec4
--- /dev/null
+++ b/packages/core/src/testInteg/codecatalyst/devEnv.test.ts
@@ -0,0 +1,187 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { InactivityMessage, shouldSendActivity } from '../../codecatalyst/devEnv'
+import * as sinon from 'sinon'
+import { sleep, waitUntil } from '../../shared/utilities/timeoutUtils'
+import { TestWindow, getTestWindow } from '../../test/shared/vscode/window'
+import { DevEnvActivity } from '../../shared/clients/devenvClient'
+
+describe('shouldSendActivity', function () {
+    it('returns true when inactivity timeout > 0', function () {
+        assert.strictEqual(shouldSendActivity(1), true)
+        assert.strictEqual(shouldSendActivity(15), true)
+    })
+
+    it('returns false when inactivity timeout <== 0', function () {
+        assert.strictEqual(shouldSendActivity(0), false)
+        assert.strictEqual(shouldSendActivity(-1), false)
+    })
+})
+
+describe('InactivityMessage', function () {
+    /** Actual minute in prod is this value instead so testing is faster. */
+    let relativeMinuteMillis: number
+    let testWindow: TestWindow
+    let devEnvActivity: sinon.SinonStubbedInstance<DevEnvActivity>
+    let actualMessages: { message: string; minute: number }[] = []
+    let inactivityMsg: InactivityMessage
+    let userActivity: number
+
+    beforeEach(function () {
+        relativeMinuteMillis = 100
+        testWindow = getTestWindow()
+        inactivityMsg = new InactivityMessage()
+        userActivity = 0
+        setInitialOffset(0)
+
+        devEnvActivity = sinon.createStubInstance(DevEnvActivity)
+        devEnvActivity.sendActivityUpdate.callsFake(async () => {
+            userActivity += 1
+            const timestamp = getLatestTimestamp()
+            return timestamp
+        })
+        devEnvActivity.onActivityUpdate.callsFake((activityCallback) => {
+            const timestamp = getLatestTimestamp()
+            activityCallback(timestamp)
+        })
+        devEnvActivity.isLocalActivityStale.callsFake(async () => {
+            return false
+        })
+
+        startCapturingMessages()
+    })
+
+    afterEach(function () {
+        inactivityMsg.dispose()
+        testWindow.dispose()
+    })
+
+    it('shows warning 5 minutes before shutdown for 15 minute timeout', async function () {
+        setInitialOffset(9)
+        await inactivityMsg.init(15, devEnvActivity as unknown as DevEnvActivity, relativeMinuteMillis)
+
+        await assertMessagesShown([
+            ['Your CodeCatalyst Dev Environment has been inactive for 10 minutes, and will stop soon.', 10],
+        ])
+    })
+
+    it('shows warning 5 minutes before shutdown for 60 minute timeout', async function () {
+        setInitialOffset(54)
+        await inactivityMsg.init(60, devEnvActivity as unknown as DevEnvActivity, relativeMinuteMillis)
+
+        await assertMessagesShown([
+            ['Your CodeCatalyst Dev Environment has been inactive for 55 minutes, and will stop soon.', 55],
+        ])
+    })
+
+    it.skip('resets inactivity countdown when a user confirms the message', async function () {
+        await inactivityMsg.init(10, devEnvActivity as unknown as DevEnvActivity, relativeMinuteMillis)
+        const msg = await testWindow.waitForMessage(/Dev Environment has been inactive/)
+        assert.deepStrictEqual(userActivity, 1)
+        msg.selectItem("I'm here!")
+        await waitUntil(async () => userActivity > 1, { truthy: true, interval: 100, timeout: 5_000 })
+        assert.deepStrictEqual(userActivity, 2, 'confirming the message should trigger user activity')
+
+        await assertMessagesShown([
+            ['Your CodeCatalyst Dev Environment has been inactive for 5 minutes, and will stop soon.', 5],
+        ])
+    })
+
+    it('offsets when 2.5 minutes have already passed for an inactive external client', async function () {
+        setInitialOffset(2.5)
+        await inactivityMsg.init(9, devEnvActivity as unknown as DevEnvActivity, relativeMinuteMillis)
+
+        await assertMessagesShown([
+            ['Your CodeCatalyst Dev Environment has been inactive for 4 minutes, and will stop soon.', 4],
+        ])
+    })
+
+    it('does not show inactivity message if user activity is found using the API', async function () {
+        // This gets checked each time before we decide to show the message.
+        // If a new user activity exists then we abort showing the message.
+        devEnvActivity.isLocalActivityStale.callsFake(async () => {
+            return true
+        })
+
+        await inactivityMsg.init(
+            inactivityMsg.shutdownWarningThreshold + 1,
+            devEnvActivity as unknown as DevEnvActivity,
+            relativeMinuteMillis
+        )
+        await devEnvActivity.sendActivityUpdate()
+        await sleep(relativeMinuteMillis * 3)
+        assert.strictEqual(testWindow.shownMessages.length, 0)
+        assert.strictEqual(devEnvActivity.isLocalActivityStale.calledOnce, true)
+    })
+
+    /**
+     * Assert the expected inactivity message was shown at the
+     * right time.
+     *
+     * @param text The actual message itself
+     * @param minute The minute the message was expected to be shown at
+     */
+    async function assertMessagesShown(expectedMessages: [text: string, minute: number][]) {
+        await waitUntil(
+            async () => {
+                return expectedMessages.length === actualMessages.length
+            },
+            { truthy: true, interval: 200, timeout: 10_000 }
+        )
+        if (expectedMessages.length !== actualMessages.length) {
+            assert.fail(`Expected ${expectedMessages.length} messages, but got ${actualMessages.length}`)
+        }
+
+        for (let i = 0; i < expectedMessages.length; i++) {
+            const expected = {
+                message: expectedMessages[i][0],
+                minute: expectedMessages[i][1],
+            }
+            assert.deepStrictEqual(actualMessages[i].message, expected.message)
+            // Avoid flakiness in the timing by looking within a minute rather than exact.
+            assert.ok(
+                Math.abs(actualMessages[i].minute - expected.minute) <= 1,
+                `Expected to be within 60 seconds of minute ${expected.minute}, but instead was at minute ${actualMessages[i].minute}`
+            )
+        }
+    }
+
+    let _initialOffset = 0
+    /**
+     * This is used for the edge case where the MDE was previously updated with an activity
+     * timestamp, but once our client retrieves this value some time has already passed.
+     */
+    function setInitialOffset(minutes: number) {
+        _initialOffset = minutes * relativeMinuteMillis
+    }
+
+    function getLatestTimestamp() {
+        let timestamp = Date.now()
+        timestamp -= _initialOffset
+
+        return timestamp
+    }
+
+    /**
+     * Starts capturing all vscode messages shown and records them in {@link actualMessages}.
+     *
+     * The `minute` field in {@link actualMessages} records the minute the message was shown.
+     * This value is relative to {@link relativeMinuteMillis}.
+     */
+    function startCapturingMessages() {
+        const start = Date.now()
+        const messages: { message: string; minute: number }[] = []
+        testWindow.onDidShowMessage(async (message) => {
+            const now = Date.now()
+            messages.push({
+                message: message.message,
+                minute: Math.floor((now + _initialOffset - start) / relativeMinuteMillis),
+            })
+        })
+        actualMessages = messages
+    }
+})
diff --git a/src/integrationTest/codelens.js.test.ts b/packages/core/src/testInteg/codelens.js.test.ts
similarity index 96%
rename from src/integrationTest/codelens.js.test.ts
rename to packages/core/src/testInteg/codelens.js.test.ts
index 2d94cde31ec..c7f3582a05d 100644
--- a/src/integrationTest/codelens.js.test.ts
+++ b/packages/core/src/testInteg/codelens.js.test.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import { dirname, join } from 'path'
 import * as vscode from 'vscode'
 import { getAddConfigCodeLens, getTestWorkspaceFolder } from './integrationTestsUtilities'
@@ -36,7 +36,7 @@ describe('SAM Local CodeLenses (JS)', async function () {
 
     it('appear when manifest in root', async function () {
         const appRoot = join(workspaceFolder, 'js-manifest-in-root')
-        const appCodePath = join(appRoot, 'src', 'subfolder', 'app.js')
+        const appCodePath = join(appRoot, 'src', 'subfolder', 'app.mjs')
         const expectedHandlerName = 'src/subfolder/app.handlerTwoFoldersDeep'
         const document = await vscode.workspace.openTextDocument(appCodePath)
 
@@ -74,7 +74,7 @@ describe('SAM Local CodeLenses (JS)', async function () {
     ) {
         assert.ok(codeLenses !== undefined, 'Did not expect undefined when requesting CodeLenses')
 
-        const debugCodeLenses = getLocalInvokeCodeLenses(codeLenses).filter(codeLens =>
+        const debugCodeLenses = getLocalInvokeCodeLenses(codeLenses).filter((codeLens) =>
             hasLocalInvokeArguments(codeLens, expectedHandlerName, manifestPath)
         )
 
@@ -83,7 +83,7 @@ describe('SAM Local CodeLenses (JS)', async function () {
 
     function getLocalInvokeCodeLenses(codeLenses: vscode.CodeLens[]): vscode.CodeLens[] {
         return codeLenses.filter(
-            codeLens =>
+            (codeLens) =>
                 codeLens.command &&
                 codeLens.command.command === 'aws.pickAddSamDebugConfiguration' &&
                 codeLens.command.arguments &&
diff --git a/packages/core/src/testInteg/common/request.ts b/packages/core/src/testInteg/common/request.ts
new file mode 100644
index 00000000000..c1ca7a345ef
--- /dev/null
+++ b/packages/core/src/testInteg/common/request.ts
@@ -0,0 +1,16 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { endpointsFileUrl } from '../../shared/constants'
+import request from '../../shared/request'
+import assert from 'assert'
+
+describe('fetch()', function () {
+    it('makes a fetch request', async function () {
+        const response = await request.fetch('GET', endpointsFileUrl).response
+        assert.strictEqual(response.ok, true)
+        assert.strictEqual(response.status, 200)
+    })
+})
diff --git a/packages/core/src/testInteg/globalSetup.test.ts b/packages/core/src/testInteg/globalSetup.test.ts
new file mode 100644
index 00000000000..7254f5b6e76
--- /dev/null
+++ b/packages/core/src/testInteg/globalSetup.test.ts
@@ -0,0 +1,103 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Before/After hooks for all integration tests.
+ */
+import vscode from 'vscode'
+import { getLogger } from '../shared/logger'
+import { ToolkitLogger } from '../shared/logger/toolkitLogger'
+import { mapTestErrors, normalizeError, patchObject, setRunnableTimeout } from '../test/setupUtil'
+import { getTestWindow, resetTestWindow } from '../test/shared/vscode/window'
+import * as sinon from 'sinon'
+import * as tokenProvider from '../auth/sso/ssoAccessTokenProvider'
+import * as testUtil from '../test/testUtil'
+import { DeviceFlowAuthorization } from '../auth/sso/ssoAccessTokenProvider'
+import { globals } from '../shared'
+import { GlobalState } from '../shared/globalState'
+import { FakeExtensionContext } from '../test/fakeExtensionContext'
+
+// ASSUMPTION: Tests are not run concurrently
+
+let windowPatch: vscode.Disposable
+const maxTestDuration = 300_000
+const globalSandbox = sinon.createSandbox()
+
+export async function mochaGlobalSetup(extensionId: string) {
+    return async function (this: Mocha.Runner) {
+        console.log('globalSetup: before()')
+
+        // Prevent CI from hanging by forcing a timeout on both hooks and tests
+        this.on('hook', (hook) => setRunnableTimeout(hook, maxTestDuration))
+        this.on('test', (test) => setRunnableTimeout(test, maxTestDuration))
+
+        // Shows the full error chain when tests fail
+        mapTestErrors(this, normalizeError)
+
+        // Set up a listener for proxying login requests
+        patchWindow()
+
+        // always use device code authorization
+        patchAuth()
+
+        // Needed for getLogger().
+        await vscode.extensions.getExtension(extensionId)?.activate()
+
+        // Log as much as possible, useful for debugging integration tests.
+        getLogger().setLogLevel('debug')
+        if (getLogger() instanceof ToolkitLogger) {
+            ;(getLogger() as ToolkitLogger).logToConsole()
+        }
+
+        const fakeContext = await FakeExtensionContext.create()
+        const testFolder = await testUtil.TestFolder.create()
+        fakeContext.globalStorageUri = vscode.Uri.parse(testFolder.pathFrom('.'))
+        fakeContext.extensionPath = globals.context.extensionPath
+        Object.assign(globals, {
+            // eslint-disable-next-line aws-toolkits/no-banned-usages
+            globalState: new GlobalState(fakeContext.globalState),
+        })
+    }
+}
+
+export async function mochaGlobalTeardown(this: Mocha.Context) {
+    console.log('globalSetup: after()')
+    windowPatch.dispose()
+    await testUtil.deleteTestTempDirs()
+}
+
+export const mochaHooks = {
+    async beforeEach(this: Mocha.Context) {
+        globals.telemetry.clearRecords()
+        globals.telemetry.logger.clear()
+
+        // mochaGlobalSetup() set this to a fake, so it's safe to clear it here.
+        await globals.globalState.clear()
+    },
+    afterEach(this: Mocha.Context) {
+        patchWindow()
+    },
+    after(this: Mocha.Context) {
+        globalSandbox.restore()
+    },
+}
+
+function patchWindow() {
+    windowPatch?.dispose()
+    resetTestWindow()
+    windowPatch = patchObject(vscode, 'window', getTestWindow())
+}
+
+/**
+ * We have to fall back to device flow authorization until:
+ * 1. We can find a way to automatically press the "trust external url" popup
+ * 2. We support the authorization grant flow in the auth lambda
+ * otherwise we get: "Error: DialogService: refused to show dialog in tests. Contents: Do you want Code to open the external website?"
+ */
+function patchAuth() {
+    globalSandbox.stub(tokenProvider.SsoAccessTokenProvider, 'create').callsFake((profile, cache, oidc) => {
+        return new DeviceFlowAuthorization(profile, cache, oidc)
+    })
+}
diff --git a/src/integrationTest/integrationTestsUtilities.ts b/packages/core/src/testInteg/integrationTestsUtilities.ts
similarity index 87%
rename from src/integrationTest/integrationTestsUtilities.ts
rename to packages/core/src/testInteg/integrationTestsUtilities.ts
index 2e9a019a368..d7874cc8a35 100644
--- a/src/integrationTest/integrationTestsUtilities.ts
+++ b/packages/core/src/testInteg/integrationTestsUtilities.ts
@@ -1,9 +1,9 @@
 /*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import { waitUntil } from '../shared/utilities/timeoutUtils'
 import * as vscode from 'vscode'
 
@@ -34,13 +34,6 @@ export async function configureAwsToolkitExtension(): Promise<void> {
     await configAws.update('samcli.enableCodeLenses', true, false)
 }
 
-export async function configurePythonExtension(): Promise<void> {
-    const configPy = vscode.workspace.getConfiguration('python')
-    // Disable linting to silence some of the Python extension's log spam
-    await configPy.update('linting.pylintEnabled', false, false)
-    await configPy.update('linting.enabled', false, false)
-}
-
 // Installs tools that the Go extension wants (it complains a lot if we don't)
 // Had to dig around for the commands used by the Go extension.
 // Ref: https://github.com/golang/vscode-go/blob/0058bd16ba31394f98aa3396056998e4808998a7/src/goTools.ts#L211
@@ -87,7 +80,7 @@ export async function getAddConfigCodeLens(
 
                 // omnisharp spits out some undefined code lenses for some reason, we filter them because they are
                 // not shown to the user and do not affect how our extension is working
-                codeLenses = codeLenses.filter(codeLens => {
+                codeLenses = codeLenses.filter((codeLens) => {
                     if (codeLens.command && codeLens.command.arguments && codeLens.command.arguments.length === 3) {
                         return codeLens.command.command === 'aws.pickAddSamDebugConfiguration'
                     }
diff --git a/packages/core/src/testInteg/notifications/notifications.test.ts b/packages/core/src/testInteg/notifications/notifications.test.ts
new file mode 100644
index 00000000000..c8979308005
--- /dev/null
+++ b/packages/core/src/testInteg/notifications/notifications.test.ts
@@ -0,0 +1,113 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0 fort
+ */
+
+import { RemoteFetcher } from '../../notifications/controller'
+import { NotificationsController } from '../../notifications/controller'
+import { NotificationsNode } from '../../notifications/panelNode'
+import { NotificationsState, RuleContext } from '../../notifications/types'
+import globals from '../../shared/extensionGlobals'
+import assert from 'assert'
+import { VSCODE_EXTENSION_ID } from '../../shared/extensions'
+import sinon from 'sinon'
+import { globalKey } from '../../shared/globalState'
+
+describe('Notifications Integration Test', function () {
+    const storageKey = 'aws.notifications.test' as globalKey
+    let fetcher: RemoteFetcher
+    let panelNode: NotificationsNode
+
+    function getController(activeExtensions: string[], connected: boolean) {
+        const authState = connected ? 'connected' : 'notConnected'
+
+        const ruleContext: RuleContext = {
+            ideVersion: '1.83.0',
+            extensionVersion: '1.20.0',
+            os: 'LINUX',
+            computeEnv: 'local',
+            authTypes: ['builderId'],
+            authRegions: ['us-east-2'],
+            authStates: [authState],
+            authScopes: ['codewhisperer:completions', 'codewhisperer:analysis'],
+            activeExtensions: activeExtensions,
+        }
+
+        return new NotificationsController(panelNode, async () => ruleContext, fetcher, storageKey)
+    }
+
+    beforeEach(async function () {
+        panelNode = NotificationsNode.instance
+        // fetch from test host file folder
+        fetcher = new RemoteFetcher(
+            'https://idetoolkits-hostedfiles.amazonaws.com/Notifications/integ/VSCode/startup/1.x.json',
+            'https://idetoolkits-hostedfiles.amazonaws.com/Notifications/integ/VSCode/emergency/1.x.json'
+        )
+    })
+
+    // Clear all global states after each test
+    afterEach(async function () {
+        await globals.globalState.update(storageKey, undefined)
+    })
+
+    it('Receive notifications polling from endpoint', async function () {
+        const controller = getController([VSCODE_EXTENSION_ID.amazonq], true)
+
+        await controller.pollForStartUp()
+        await controller.pollForEmergencies()
+
+        // Verify that notifications are stored in the state
+        const state = globals.globalState.get<NotificationsState>(controller.storageKey)
+        assert.ok(state, 'State should be defined')
+        assert.ok(state.startUp.payload?.notifications, 'StartUp received')
+        assert.strictEqual(
+            state?.startUp.payload?.notifications.length,
+            2,
+            'There should be 2 startup notifications stored'
+        )
+        assert.ok(state?.emergency.payload?.notifications, 'Emergency received')
+        assert.strictEqual(
+            state?.emergency.payload?.notifications.length,
+            2,
+            'There should be 2 emergency notifications stored'
+        )
+    })
+
+    it('Display notification according to criterias', async function () {
+        const controller = getController([VSCODE_EXTENSION_ID.amazonq], false)
+        await controller.pollForEmergencies()
+
+        // Verify that only the not authed notification is displayed
+        const displayedNotifications = panelNode.emergencyNotifications
+        assert.strictEqual(displayedNotifications.length, 1, 'Only one notification displayed"')
+        assert.strictEqual(
+            displayedNotifications[0].id,
+            'emergency1',
+            'The displayed notification have the ID "emergency1"'
+        )
+    })
+
+    it('Should trigger onReceive only for newly received notifications', async function () {
+        const controller = getController([VSCODE_EXTENSION_ID.amazonq], true)
+        const onReceiveSpy = sinon.spy(panelNode, 'onReceiveNotifications')
+
+        // Simulate alreadying receving a notification
+        const existingNotificationID = 'startup1'
+        const state = globals.globalState.get<NotificationsState>(controller.storageKey)
+        if (state) {
+            state.newlyReceived.push(existingNotificationID)
+            await globals.globalState.update(controller.storageKey, state)
+        }
+
+        // Poll for new notification
+        await controller.pollForStartUp()
+
+        /**
+         * Since we simulated startup1 is already received
+         * onReceived should be called exactly once for startup2
+         */
+        assert.ok(onReceiveSpy.calledOnce, 'only one new notification received')
+
+        onReceiveSpy.restore()
+    })
+})
diff --git a/packages/core/src/testInteg/perf/collectFiles.test.ts b/packages/core/src/testInteg/perf/collectFiles.test.ts
new file mode 100644
index 00000000000..506d9b5da7c
--- /dev/null
+++ b/packages/core/src/testInteg/perf/collectFiles.test.ts
@@ -0,0 +1,84 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import { getEqualOSTestOptions, performanceTest } from '../../shared/performance/performance'
+import { createTestWorkspaceFolder, toFile } from '../../test/testUtil'
+import path from 'path'
+import { fs, randomUUID } from '../../shared'
+import { collectFiles } from '../../shared/utilities/workspaceUtils'
+import { getFsCallsUpperBound } from './utilities'
+import { FileSystem } from '../../shared/fs/fs'
+
+function performanceTestWrapper(totalFiles: number) {
+    return performanceTest(
+        getEqualOSTestOptions({
+            userCpuUsage: 100,
+            systemCpuUsage: 35,
+            heapTotal: 2,
+        }),
+        'calculate cpu and memory usage',
+        function () {
+            return {
+                setup: async () => {
+                    const workspace = await createTestWorkspaceFolder()
+
+                    sinon.stub(vscode.workspace, 'workspaceFolders').value([workspace])
+                    const fsSpy = sinon.spy(fs)
+                    const findFilesSpy = sinon.spy(vscode.workspace, 'findFiles')
+                    const fileContent = randomUUID()
+                    for (let x = 0; x < totalFiles; x++) {
+                        await toFile(fileContent, path.join(workspace.uri.fsPath, `file.${x}`))
+                    }
+
+                    return {
+                        workspace,
+                        fsSpy,
+                        findFilesSpy,
+                    }
+                },
+                execute: async ({ workspace }: { workspace: vscode.WorkspaceFolder }) => {
+                    return {
+                        result: await collectFiles([workspace.uri.fsPath], [workspace]),
+                    }
+                },
+                verify: (
+                    setup: {
+                        workspace: vscode.WorkspaceFolder
+                        fsSpy: sinon.SinonSpiedInstance<FileSystem>
+                        findFilesSpy: sinon.SinonSpy
+                    },
+                    { result }: { result: Awaited<ReturnType<typeof collectFiles>> }
+                ) => {
+                    assert.deepStrictEqual(result.length, totalFiles)
+                    const sortedFiles = [...result].sort((a, b) => {
+                        const numA = parseInt(a.relativeFilePath.split('.')[1])
+                        const numB = parseInt(b.relativeFilePath.split('.')[1])
+                        return numA - numB
+                    })
+                    for (let x = 0; x < totalFiles; x++) {
+                        assert.deepStrictEqual(sortedFiles[x].relativeFilePath, `file.${x}`)
+                    }
+
+                    assert.ok(
+                        getFsCallsUpperBound(setup.fsSpy) <= totalFiles * 5,
+                        'total system calls below 5 per file'
+                    )
+                    assert.ok(setup.findFilesSpy.callCount <= 2, 'findFiles not called more than twice')
+                },
+            }
+        }
+    )
+}
+
+describe('collectFiles', function () {
+    afterEach(function () {
+        sinon.restore()
+    })
+    performanceTestWrapper(10)
+    performanceTestWrapper(100)
+    performanceTestWrapper(250)
+})
diff --git a/packages/core/src/testInteg/perf/downloadExportResultArchive.test.ts b/packages/core/src/testInteg/perf/downloadExportResultArchive.test.ts
new file mode 100644
index 00000000000..6fe99ad277a
--- /dev/null
+++ b/packages/core/src/testInteg/perf/downloadExportResultArchive.test.ts
@@ -0,0 +1,95 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import { WorkspaceFolder } from 'vscode'
+import { ExportResultArchiveCommandInput } from '@amzn/codewhisperer-streaming'
+import * as sinon from 'sinon'
+import path from 'path'
+import { fs, getRandomString } from '../../shared'
+import { createTestWorkspace } from '../../test/testUtil'
+import { getEqualOSTestOptions, performanceTest } from '../../shared/performance/performance'
+import { downloadExportResultArchive } from '../../shared/utilities/download'
+import { RegionProfile } from '../../codewhisperer'
+
+interface SetupResult {
+    workspace: WorkspaceFolder
+    exportCommandInput: ExportResultArchiveCommandInput
+    writeFileStub: sinon.SinonStub
+    cwStreaming: any
+    profile: RegionProfile
+}
+
+interface FakeCommandOutput {
+    body: { binaryPayloadEvent: { bytes: Buffer } }[]
+}
+
+function generateCommandOutput(numPieces: number, pieceSize: number): FakeCommandOutput {
+    const body = Array.from({ length: numPieces }, (_, i) => {
+        return {
+            binaryPayloadEvent: {
+                bytes: Buffer.from(getRandomString(pieceSize)),
+            },
+        }
+    })
+    return { body }
+}
+
+async function setup(pieces: number, pieceSize: number): Promise<SetupResult> {
+    // Force VSCode to find test workspace only to keep test contained and controlled.
+    const workspace = await createTestWorkspace(1, {})
+    const exportCommandInput = {} as ExportResultArchiveCommandInput
+    // Manutally stub the CodeWhispererStreaming to avoid constructor call.
+    const cwStreaming = { exportResultArchive: () => generateCommandOutput(pieces, pieceSize) }
+
+    const writeFileStub = sinon.stub(fs, 'writeFile')
+    const profile: RegionProfile = { name: 'foo', region: 'us-east-1', arn: 'foo-arn', description: '' }
+    return { workspace, exportCommandInput, writeFileStub, cwStreaming, profile }
+}
+
+function perfTest(pieces: number, pieceSize: number, label: string) {
+    return performanceTest(
+        getEqualOSTestOptions({
+            userCpuUsage: 200,
+            systemCpuUsage: 35,
+            heapTotal: 4,
+        }),
+        label,
+        function () {
+            return {
+                setup: async () => await setup(pieces, pieceSize),
+                execute: async ({
+                    workspace,
+                    cwStreaming,
+                    exportCommandInput,
+                    writeFileStub,
+                    profile,
+                }: SetupResult) => {
+                    await downloadExportResultArchive(
+                        cwStreaming,
+                        exportCommandInput,
+                        path.join(workspace.uri.fsPath, 'result'),
+                        profile
+                    )
+                },
+                verify: async (setup: SetupResult) => {
+                    assert.ok(setup.writeFileStub.calledOnce)
+                    assert.ok((setup.writeFileStub.firstCall.args[1] as Buffer).length === pieces * pieceSize)
+                },
+            }
+        }
+    )
+}
+
+describe('downloadExportResultArchive', function () {
+    describe('performanceTests', function () {
+        afterEach(function () {
+            sinon.restore()
+        })
+        perfTest(1, 1000, '1x1KB')
+        perfTest(10, 100, '10x100B')
+        perfTest(100, 10, '100x10B')
+        perfTest(1000, 1, '1000x1B')
+    })
+})
diff --git a/packages/core/src/testInteg/perf/startSecurityScan.test.ts b/packages/core/src/testInteg/perf/startSecurityScan.test.ts
new file mode 100644
index 00000000000..6883d765c83
--- /dev/null
+++ b/packages/core/src/testInteg/perf/startSecurityScan.test.ts
@@ -0,0 +1,124 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+import * as sinon from 'sinon'
+import * as startSecurityScan from '../../codewhisperer/commands/startSecurityScan'
+import * as diagnosticsProvider from '../../codewhisperer/service/diagnosticsProvider'
+import * as model from '../../codewhisperer/models/model'
+import * as timeoutUtils from '../../shared/utilities/timeoutUtils'
+import assert from 'assert'
+import { SecurityPanelViewProvider } from '../../codewhisperer/views/securityPanelViewProvider'
+import { FakeExtensionContext } from '../../test/fakeExtensionContext'
+import { join } from 'path'
+import {
+    assertTelemetry,
+    closeAllEditors,
+    createTestWorkspaceFolder,
+    getFetchStubWithResponse,
+    toFile,
+} from '../../test/testUtil'
+import { getTestWindow } from '../../test/shared/vscode/window'
+import { SeverityLevel } from '../../test/shared/vscode/message'
+import { CodeAnalysisScope, ZipUtil } from '../../codewhisperer'
+import { getEqualOSTestOptions, performanceTest } from '../../shared/performance/performance'
+import { createClient } from '../../test/codewhisperer/testUtil'
+import { fs } from '../../shared'
+import { FileSystem } from '../../shared/fs/fs'
+import { getFsCallsUpperBound } from './utilities'
+
+interface SetupResult {
+    commandSpy: sinon.SinonSpy
+    securityScanRenderSpy: sinon.SinonSpy
+    zipUtil: ZipUtil
+    zipSpy: sinon.SinonSpiedInstance<ZipUtil>
+    fsSpy: sinon.SinonSpiedInstance<FileSystem>
+}
+
+describe('startSecurityScanPerformanceTest', function () {
+    let extensionContext: FakeExtensionContext
+    let mockSecurityPanelViewProvider: SecurityPanelViewProvider
+    let appCodePath: string
+    let editor: vscode.TextEditor
+    beforeEach(async function () {
+        extensionContext = await FakeExtensionContext.create()
+        mockSecurityPanelViewProvider = new SecurityPanelViewProvider(extensionContext)
+        const folder = await createTestWorkspaceFolder()
+        const mockFilePath = join(folder.uri.fsPath, 'app.py')
+        await toFile('hello_world', mockFilePath)
+        appCodePath = mockFilePath
+        editor = await openTestFile(appCodePath)
+        await model.CodeScansState.instance.setScansEnabled(false)
+        sinon.stub(timeoutUtils, 'sleep')
+    })
+
+    afterEach(function () {
+        sinon.restore()
+    })
+
+    after(async function () {
+        await closeAllEditors()
+    })
+
+    const openTestFile = async (filePath: string) => {
+        const doc = await vscode.workspace.openTextDocument(filePath)
+        return await vscode.window.showTextDocument(doc, {
+            selection: new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 1)),
+        })
+    }
+
+    performanceTest(
+        getEqualOSTestOptions({
+            userCpuUsage: 150,
+            systemCpuUsage: 35,
+            heapTotal: 2,
+        }),
+        'Should calculate cpu and memory usage for file scans',
+        function () {
+            return {
+                setup: async () => {
+                    getFetchStubWithResponse({ status: 200, statusText: 'testing stub' })
+                    const commandSpy = sinon.spy(vscode.commands, 'executeCommand')
+                    const securityScanRenderSpy = sinon.spy(diagnosticsProvider, 'initSecurityScanRender')
+                    const zipUtil = new ZipUtil()
+                    const zipSpy = sinon.spy(zipUtil)
+                    const fsSpy = sinon.spy(fs)
+                    await model.CodeScansState.instance.setScansEnabled(true)
+                    return { commandSpy, securityScanRenderSpy, zipUtil, zipSpy, fsSpy }
+                },
+                execute: async (setup: SetupResult) => {
+                    await startSecurityScan.startSecurityScan(
+                        mockSecurityPanelViewProvider,
+                        editor,
+                        createClient(),
+                        extensionContext,
+                        CodeAnalysisScope.FILE_AUTO,
+                        false,
+                        setup.zipUtil
+                    )
+                },
+                verify: (setup: SetupResult) => {
+                    assert.ok(setup.commandSpy.neverCalledWith('workbench.action.problems.focus'))
+                    assert.ok(setup.securityScanRenderSpy.calledOnce)
+
+                    assert.ok(setup.zipSpy.generateZip.calledOnce)
+                    assert.ok(setup.zipSpy.removeTmpFiles.calledOnce)
+                    assert.ok(
+                        getFsCallsUpperBound(setup.fsSpy) <= 5,
+                        'should make less than a small constant number of file system calls'
+                    )
+                    const warnings = getTestWindow().shownMessages.filter((m) => m.severity === SeverityLevel.Warning)
+                    // If we see a warning, make sure its about the toolkit and unrelated to security scan.
+                    if (warnings.length > 0) {
+                        assert.ok(!warnings.some((s) => !s.message.includes('AWS Toolkit PREVIEW')))
+                    }
+                    assertTelemetry('codewhisperer_securityScan', {
+                        codewhispererCodeScanScope: 'FILE_AUTO',
+                        passive: true,
+                    })
+                },
+            }
+        }
+    )
+})
diff --git a/packages/core/src/testInteg/perf/utilities.ts b/packages/core/src/testInteg/perf/utilities.ts
new file mode 100644
index 00000000000..e35fb148e95
--- /dev/null
+++ b/packages/core/src/testInteg/perf/utilities.ts
@@ -0,0 +1,49 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as sinon from 'sinon'
+import { FileSystem } from '../../shared/fs/fs'
+
+/**
+ * Provide an upper bound on total number of system calls done through our fs module.
+ * @param fsSpy filesystem spy (Ex. `sinon.spy(fs)`)
+ * @returns count of operations
+ */
+export function getFsCallsUpperBound(fsSpy: sinon.SinonSpiedInstance<FileSystem>): number {
+    return getFsReadsUpperBound(fsSpy) + getFsWritesUpperBound(fsSpy)
+}
+
+/**
+ * Provide an upper bound on the number of filesystem reads done through our fs module.
+ * This is an upper bound because some of the functions call eachother.
+ * @param fsSpy filesystem spy (Ex. `sinon.spy(fs)`)
+ * @returns value
+ */
+export function getFsReadsUpperBound(fsSpy: sinon.SinonSpiedInstance<FileSystem>): number {
+    return (
+        fsSpy.readFileBytes.callCount +
+        fsSpy.exists.callCount +
+        fsSpy.exists.callCount +
+        fsSpy.readdir.callCount +
+        fsSpy.copy.callCount +
+        fsSpy.checkPerms.callCount +
+        fsSpy.tryGetFilepathEnvVar.callCount
+    )
+}
+/**
+ * Provide an upper bound on the number of filesystem writes done through our fs module.
+ * This is an upper bound because some of the functions call eachother.
+ * @param fsSpy filesystem spy (Ex. `sinon.spy(fs)`)
+ * @returns value
+ */
+export function getFsWritesUpperBound(fsSpy: sinon.SinonSpiedInstance<FileSystem>): number {
+    return (
+        fsSpy.writeFile.callCount +
+        fsSpy.mkdir.callCount +
+        fsSpy.rename.callCount +
+        fsSpy.chmod.callCount +
+        fsSpy.delete.callCount +
+        fsSpy.copy.callCount
+    )
+}
diff --git a/packages/core/src/testInteg/perf/zipcode.test.ts b/packages/core/src/testInteg/perf/zipcode.test.ts
new file mode 100644
index 00000000000..71303e493c9
--- /dev/null
+++ b/packages/core/src/testInteg/perf/zipcode.test.ts
@@ -0,0 +1,83 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import assert from 'assert'
+import * as sinon from 'sinon'
+import { TransformByQState, ZipManifest } from '../../codewhisperer'
+import { fs, getRandomString, globals } from '../../shared'
+import { createTestWorkspace } from '../../test/testUtil'
+import * as CodeWhispererConstants from '../../codewhisperer/models/constants'
+import { getEqualOSTestOptions, performanceTest } from '../../shared/performance/performance'
+import { zipCode } from '../../codewhisperer/indexNode'
+import { FileSystem } from '../../shared/fs/fs'
+import { getFsCallsUpperBound } from './utilities'
+
+interface SetupResult {
+    tempDir: string
+    tempFileName: string
+    transformQManifest: ZipManifest
+    fsSpy: sinon.SinonSpiedInstance<FileSystem>
+}
+
+async function setup(numberOfFiles: number, fileSize: number): Promise<SetupResult> {
+    const transformByQState: TransformByQState = new TransformByQState()
+    const tempFileName = `testfile-${globals.clock.Date.now()}.zip`
+    const tempDir = (
+        await createTestWorkspace(numberOfFiles, {
+            fileNamePrefix: 'file',
+            fileContent: getRandomString(fileSize),
+            fileNameSuffix: '.md',
+        })
+    ).uri.fsPath
+    const fsSpy = sinon.spy(fs)
+    const transformQManifest = new ZipManifest()
+    transformByQState.setProjectPath(tempDir)
+    transformQManifest.customBuildCommand = CodeWhispererConstants.skipUnitTestsBuildCommand
+    return { tempDir, tempFileName, transformQManifest, fsSpy }
+}
+
+function performanceTestWrapper(numberOfFiles: number, fileSize: number) {
+    return performanceTest(
+        getEqualOSTestOptions({
+            userCpuUsage: 350,
+            systemCpuUsage: 50,
+            heapTotal: 4,
+        }),
+        'zipCode',
+        function () {
+            return {
+                setup: async () => await setup(numberOfFiles, fileSize),
+                execute: async (setup: SetupResult) => {
+                    await zipCode({
+                        dependenciesFolder: {
+                            path: setup.tempDir,
+                            name: setup.tempFileName,
+                        },
+                        projectPath: setup.tempDir,
+                        zipManifest: setup.transformQManifest,
+                    })
+                },
+                verify: async (setup: SetupResult) => {
+                    assert.ok(
+                        setup.fsSpy.writeFile.args.find((arg) => {
+                            return arg[0].toString().endsWith('.zip')
+                        })
+                    )
+
+                    assert.ok(getFsCallsUpperBound(setup.fsSpy) <= 15)
+                },
+            }
+        }
+    )
+}
+
+describe('zipCode', function () {
+    describe('performance tests', function () {
+        afterEach(function () {
+            sinon.restore()
+        })
+        performanceTestWrapper(250, 10)
+        performanceTestWrapper(10, 1000)
+    })
+})
diff --git a/packages/core/src/testInteg/regionProvider.test.ts b/packages/core/src/testInteg/regionProvider.test.ts
new file mode 100644
index 00000000000..a3486c2bac0
--- /dev/null
+++ b/packages/core/src/testInteg/regionProvider.test.ts
@@ -0,0 +1,37 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { makeEndpointsProvider } from '../extension'
+import { RegionProvider } from '../shared/regions/regionProvider'
+import globals from '../shared/extensionGlobals'
+import path from 'path'
+import { TestFolder } from '../test/testUtil'
+
+describe('Region Provider', async function () {
+    let tempFolder: TestFolder
+
+    before(async () => {
+        tempFolder = await TestFolder.create()
+    })
+
+    it('resolves from remote', async function () {
+        /**
+         * Make sure the local file doesn't resolve to any endpoints.
+         * That way we can make sure remote contents are fetched
+         */
+        await tempFolder.write('foo.json', '{}')
+        globals.manifestPaths.endpoints = path.join(tempFolder.path, 'foo.json')
+
+        await assert.doesNotReject(async () => {
+            const endpointProvider = makeEndpointsProvider()
+            const regionProvider = new RegionProvider()
+            await regionProvider.init(endpointProvider)
+
+            // regions loaded from the remote
+            assert.ok(regionProvider.getRegions().length > 0)
+        })
+    })
+})
diff --git a/packages/core/src/testInteg/sam.test.ts b/packages/core/src/testInteg/sam.test.ts
new file mode 100644
index 00000000000..4f80d550df8
--- /dev/null
+++ b/packages/core/src/testInteg/sam.test.ts
@@ -0,0 +1,644 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { Runtime } from '@aws-sdk/client-lambda'
+import { mkdtempSync } from 'fs' // eslint-disable-line no-restricted-imports
+import * as path from 'path'
+import * as semver from 'semver'
+import * as vscode from 'vscode'
+import * as vscodeUtils from '../../src/shared/utilities/vsCodeUtils'
+import { DependencyManager } from '../../src/lambda/models/samLambdaRuntime'
+import { helloWorldTemplate } from '../../src/lambda/models/samTemplates'
+import { getSamCliContext } from '../../src/shared/sam/cli/samCliContext'
+import { runSamCliInit, SamCliInitArgs } from '../../src/shared/sam/cli/samCliInit'
+import { Language } from '../shared/codelens/codeLensUtils'
+import { VSCODE_EXTENSION_ID } from '../shared/extensions'
+import { fileExists, tryRemoveFolder } from '../shared/filesystemUtilities'
+import { AddSamDebugConfigurationInput } from '../shared/sam/debugger/commands/addSamDebugConfiguration'
+import { findParentProjectFile } from '../shared/utilities/workspaceUtils'
+import * as testUtils from './integrationTestsUtilities'
+import { waitUntil } from '../shared/utilities/timeoutUtils'
+import { AwsSamDebuggerConfiguration } from '../shared/sam/debugger/awsSamDebugConfiguration.gen'
+import { AwsSamTargetType } from '../shared/sam/debugger/awsSamDebugConfiguration'
+import { insertTextIntoFile } from '../shared/utilities/textUtilities'
+import globals from '../shared/extensionGlobals'
+import { closeAllEditors, getWorkspaceFolder } from '../test/testUtil'
+import { ToolkitError } from '../shared/errors'
+import { SamAppLocation } from '../awsService/appBuilder/explorer/samProject'
+import { AppNode } from '../awsService/appBuilder/explorer/nodes/appNode'
+import sinon from 'sinon'
+import { getTestWindow } from '../test/shared/vscode/window'
+import { ParamsSource, runBuild } from '../shared/sam/build'
+import { DataQuickPickItem } from '../shared/ui/pickerPrompter'
+import fs from '../shared/fs/fs'
+
+const projectFolder = testUtils.getTestWorkspaceFolder()
+
+/* Test constants go here */
+const codelensTimeout: number = 60000
+const codelensRetryInterval: number = 5000
+const noDebugSessionTimeout: number = 5000
+const noDebugSessionInterval: number = 100
+
+/** Go can't handle API tests yet */
+const skipLanguagesOnApi = ['go']
+
+interface TestScenarioDefaults {
+    path: string
+    debugSessionType: string
+    language: Language
+    dependencyManager: DependencyManager
+    /** Minimum vscode version required by the relevant third-party extension. */
+    vscodeMinimum: string
+}
+type TestScenario = {
+    displayName: string
+    runtime: Runtime
+    baseImage?: string
+} & TestScenarioDefaults
+
+const nodeDefaults = {
+    path: 'hello-world/app.mjs',
+    debugSessionType: 'pwa-node',
+    dependencyManager: 'npm' as DependencyManager,
+    language: 'javascript' as Language,
+    vscodeMinimum: '1.50.0',
+}
+// https://github.com/microsoft/vscode-python/blob/main/package.json
+const pythonDefaults = {
+    path: 'hello_world/app.py',
+    debugSessionType: 'python',
+    dependencyManager: 'pip' as DependencyManager,
+    language: 'python' as Language,
+    vscodeMinimum: '1.77.0',
+}
+
+const javaDefaults = {
+    path: 'HelloWorldFunction/src/main/java/helloworld/App.java',
+    debugSessionType: 'java',
+    dependencyManager: 'gradle' as DependencyManager,
+    language: 'java' as Language,
+    vscodeMinimum: '1.50.0',
+}
+
+const dotnetDefaults = {
+    path: 'src/HelloWorld/Function.cs',
+    debugSessionType: 'coreclr',
+    language: 'csharp' as Language,
+    dependencyManager: 'cli-package' as DependencyManager,
+    vscodeMinimum: '1.80.0',
+}
+
+const defaults: Record<string, TestScenarioDefaults> = {
+    nodejs: nodeDefaults,
+    java: javaDefaults,
+    python: pythonDefaults,
+    dotnet: dotnetDefaults,
+}
+
+function generateScenario(
+    runtime: string,
+    version: string,
+    options: Partial<TestScenario & { sourceTag: string }> = {},
+    fromImage: boolean = false
+): TestScenario {
+    if (fromImage && !options.baseImage) {
+        throw new Error('baseImage property must be specified when testing from image')
+    }
+    const { sourceTag, ...defaultOverride } = options
+    const source = `(${options.sourceTag ? `${options.sourceTag} ` : ''}${fromImage ? 'Image' : 'ZIP'})`
+    const fullName = `${runtime}${version}` as Runtime
+    return {
+        runtime: fullName,
+        displayName: `${fullName} ${source}`,
+        ...defaults[runtime],
+        ...defaultOverride,
+    }
+}
+// When testing additional runtimes, consider pulling the docker container in buildspec\linuxIntegrationTests.yml
+// to reduce the chance of automated tests timing out.
+
+const scenarios: TestScenario[] = [
+    // zips
+    generateScenario('nodejs', '20.x'),
+    generateScenario('nodejs', '22.x', { vscodeMinimum: '1.78.0' }),
+    generateScenario('python', '3.10'),
+    generateScenario('python', '3.11', { vscodeMinimum: '1.78.0' }),
+    generateScenario('python', '3.12', { vscodeMinimum: '1.78.0' }),
+    generateScenario('python', '3.13', { vscodeMinimum: '1.78.0' }),
+    generateScenario('dotnet', '6'),
+    generateScenario('java', '8.al2', { sourceTag: 'Maven', dependencyManager: 'maven' }),
+    generateScenario('java', '11', { sourceTag: 'Gradle' }),
+    generateScenario('java', '17', { sourceTag: 'Gradle' }),
+    // images
+    generateScenario('nodejs', '20.x', { baseImage: 'amazon/nodejs20.x-base' }, true),
+    generateScenario('nodejs', '22.x', { baseImage: 'amazon/nodejs22.x-base', vscodeMinimum: '1.78.0' }, true),
+    generateScenario('python', '3.10', { baseImage: 'amazon/python3.10-base' }, true),
+    generateScenario('python', '3.11', { baseImage: 'amazon/python3.11-base', vscodeMinimum: '1.78.0' }, true),
+    generateScenario('python', '3.12', { baseImage: 'amazon/python3.12-base', vscodeMinimum: '1.78.0' }, true),
+    generateScenario('python', '3.13', { baseImage: 'amazon/python3.13-base', vscodeMinimum: '1.78.0' }, true),
+    generateScenario('dotnet', '6', { baseImage: 'amazon/dotnet6-base' }, true),
+    generateScenario(
+        'java',
+        '.al2',
+        { baseImage: 'amazon/java8.al2-base', sourceTag: 'Maven', dependencyManager: 'maven' },
+        true
+    ),
+    generateScenario('java', '11', { baseImage: 'amazon/java11-base', sourceTag: 'Gradle' }, true),
+    generateScenario('java', '17', { baseImage: 'amazon/java17-base', sourceTag: 'Gradle' }, true),
+]
+
+async function openSamAppFile(applicationPath: string): Promise<vscode.Uri> {
+    const document = await vscode.workspace.openTextDocument(applicationPath)
+
+    return document.uri
+}
+
+/**
+ * Returns a string if there is a validation issue, undefined if there is no issue.
+ */
+function validateSamDebugSession(
+    debugSession: vscode.DebugSession,
+    expectedName: string,
+    expectedRuntime: string
+): string | undefined {
+    const runtime = (debugSession.configuration as any).runtime
+    const name = (debugSession.configuration as any).name
+    if (name !== expectedName || runtime !== expectedRuntime) {
+        const failMsg =
+            `Unexpected DebugSession (expected name="${expectedName}" runtime="${expectedRuntime}"):` +
+            `\n${JSON.stringify(debugSession)}`
+        return failMsg
+    }
+}
+
+/**
+ * Simulates pressing 'F5' to start debugging. Sets up events to see if debugging was successful
+ * or not. Since we are not checking outputs we treat a successful operation as the debug session
+ * closing on its own (i.e. the container executable terminated)
+ *
+ * @param scenario Scenario to run, used for logging information
+ * @param scenarioIndex Scenario number, used for logging information
+ * @param testConfig Debug configuration to start the debugging with
+ * @param testDisposables All events registered by this function are pushed here to be removed later
+ * @param sessionLog An array where session logs are stored
+ */
+async function startDebugger(
+    scenario: TestScenario,
+    scenarioIndex: number,
+    target: AwsSamTargetType,
+    testConfig: vscode.DebugConfiguration,
+    testDisposables: vscode.Disposable[],
+    sessionLog: string[]
+) {
+    function logSession(startEnd: 'START' | 'END' | 'EXIT' | 'FAIL', name: string) {
+        sessionLog.push(
+            `scenario ${scenarioIndex}.${target.toString()[0]} ${startEnd.padEnd(5, ' ')} ${target}/${
+                scenario.displayName
+            }: ${name}`
+        )
+    }
+
+    // Create a Promise that encapsulates our success critera
+    const success = new Promise<void>((resolve, reject) => {
+        testDisposables.push(
+            vscode.debug.onDidTerminateDebugSession(async (session) => {
+                logSession('END', session.name)
+                const sessionRuntime = (session.configuration as any).runtime
+                if (!sessionRuntime) {
+                    // It's a coprocess, ignore it.
+                    return
+                }
+                const failMsg = validateSamDebugSession(session, testConfig.name, scenario.runtime)
+                if (failMsg) {
+                    reject(new Error(failMsg))
+                }
+                resolve()
+                await stopDebugger(`${scenario.runtime} / onDidTerminateDebugSession`)
+            })
+        )
+    })
+
+    // Executes the 'F5' action to start debugging
+    await vscode.debug.startDebugging(undefined, testConfig)
+    if (!vscode.debug.activeDebugSession) {
+        logSession('EXIT', `${testConfig.name} (exited immediately)`)
+        return
+    }
+    logSession('START', vscode.debug.activeDebugSession.name)
+
+    // Some tests need to hit debug continue to the debugger to complete.
+    // Testing locally seemed to take 600-800 millis to run.
+    const result = await waitUntil(
+        async () => {
+            try {
+                await vscode.commands.executeCommand('workbench.action.debug.continue')
+                return true
+            } catch {
+                return false
+            }
+        },
+        { interval: 500, timeout: 10_000 }
+    )
+    if (result === undefined) {
+        throw new ToolkitError(`Toolkit: Debug session did not stop. Something may have gotten stuck.`)
+    }
+
+    return success
+}
+
+async function stopDebugger(logMsg: string | undefined): Promise<void> {
+    if (logMsg) {
+        console.log(`sam.test.ts: stopDebugger(): ${logMsg}`)
+    }
+    await vscode.commands.executeCommand('workbench.action.debug.stop')
+}
+
+async function activateExtensions(): Promise<void> {
+    console.log('Activating extensions...')
+    await vscodeUtils.activateExtension(VSCODE_EXTENSION_ID.python, false)
+    // TODO: Must be reactivated when go tests are enabled above.
+    // Caveat: v0.40.1 of the go extension breaks this line (see changelog for this version)
+    // await vscodeUtils.activateExtension(VSCODE_EXTENSION_ID.go, false)
+    await vscodeUtils.activateExtension(VSCODE_EXTENSION_ID.java, false)
+    await vscodeUtils.activateExtension(VSCODE_EXTENSION_ID.javadebug, false)
+    console.log('Extensions activated')
+}
+
+describe('SAM Integration Tests', async function () {
+    const samApplicationName = 'testProject'
+    /**
+     * Breadcrumbs from each process, printed at end of all scenarios to give
+     * us an idea of the timeline.
+     */
+    const sessionLog: string[] = []
+    let javaLanguageSetting: string | undefined
+    const config = vscode.workspace.getConfiguration('java')
+    let testSuiteRoot: string
+
+    before(async function () {
+        javaLanguageSetting = config.get('server.launchMode')
+        await config.update('server.launchMode', 'Standard')
+
+        await activateExtensions()
+        await testUtils.configureAwsToolkitExtension()
+        // await testUtils.configureGoExtension()
+
+        testSuiteRoot = mkdtempSync(path.join(projectFolder, 'inttest'))
+        console.log('testSuiteRoot: ', testSuiteRoot)
+        await fs.mkdir(testSuiteRoot)
+    })
+
+    after(async function () {
+        await tryRemoveFolder(testSuiteRoot)
+        // Print a summary of session that were seen by `onDidStartDebugSession`.
+        const sessionReport = sessionLog.map((x) => `    ${x}`).join('\n')
+        await config.update('server.launchMode', javaLanguageSetting)
+        console.log(`DebugSessions seen in this run:\n${sessionReport}`)
+    })
+
+    describe('SAM install test', async () => {
+        let runtimeTestRoot: string
+        let randomTestScenario: TestScenario
+
+        before(async function () {
+            if (scenarios.length === 0) {
+                throw new Error('There are no scenarios available.')
+            }
+            randomTestScenario = scenarios[0]
+
+            runtimeTestRoot = path.join(testSuiteRoot, 'randomScenario')
+            await fs.mkdir(runtimeTestRoot)
+        })
+
+        after(async function () {
+            await tryRemoveFolder(runtimeTestRoot)
+        })
+
+        it('produces an error when creating a SAM Application to the same location', async function () {
+            await createSamApplication(runtimeTestRoot, randomTestScenario)
+            await assert.rejects(createSamApplication(runtimeTestRoot, randomTestScenario), 'Promise was not rejected')
+        })
+    })
+
+    function assertCodeLensReferencesHasSameRoot(codeLens: vscode.CodeLens, expectedUri: vscode.Uri) {
+        assert.ok(codeLens.command, 'CodeLens did not have a command')
+        const command = codeLens.command!
+
+        assert.ok(command.arguments, 'CodeLens command had no arguments')
+        const commandArguments = command.arguments!
+
+        assert.strictEqual(commandArguments.length, 3, 'CodeLens command had unexpected arg count')
+        const params: AddSamDebugConfigurationInput = commandArguments[0]
+        assert.ok(params, 'unexpected non-defined command argument')
+
+        assert.strictEqual(path.dirname(params.rootUri.fsPath), path.dirname(expectedUri.fsPath))
+    }
+
+    for (let scenarioIndex = 0; scenarioIndex < scenarios.length; scenarioIndex++) {
+        const scenario = scenarios[scenarioIndex]
+
+        describe(`SAM runtime: ${scenario.displayName}`, async function () {
+            let runtimeTestRoot: string
+
+            before(async function () {
+                runtimeTestRoot = path.join(testSuiteRoot, scenario.runtime)
+                console.log('runtimeTestRoot: ', runtimeTestRoot)
+                await fs.mkdir(runtimeTestRoot)
+            })
+
+            after(async function () {
+                // don't clean up after java tests so the java language server doesn't freak out
+                if (scenario.language !== 'java') {
+                    await tryRemoveFolder(runtimeTestRoot)
+                }
+            })
+
+            function log(o: any) {
+                console.log(`sam.test.ts: scenario ${scenarioIndex} (${scenario.displayName}): ${o}`)
+            }
+
+            /**
+             * This suite makes a sam app that all tests operate on.
+             * Cleanup happens at the end of the suite.
+             */
+            describe(`Starting with a newly created ${scenario.displayName} SAM Application...`, async function () {
+                let testDisposables: vscode.Disposable[]
+
+                let testDir: string
+                let samAppCodeUri: vscode.Uri
+                let appPath: string
+                let cfnTemplatePath: string
+
+                before(async function () {
+                    testDir = mkdtempSync(path.join(runtimeTestRoot, 'samapp-'))
+                    log(`testDir: ${testDir}`)
+
+                    await createSamApplication(testDir, scenario)
+                    appPath = path.join(testDir, samApplicationName, scenario.path)
+
+                    cfnTemplatePath = path.join(testDir, samApplicationName, 'template.yaml')
+                    const readmePath = path.join(testDir, samApplicationName, 'README.md')
+                    assert.ok(await fileExists(cfnTemplatePath), `Expected SAM template to exist at ${cfnTemplatePath}`)
+                    assert.ok(await fileExists(readmePath), `Expected SAM App readme to exist at ${readmePath}`)
+
+                    samAppCodeUri = await openSamAppFile(appPath)
+                })
+
+                beforeEach(async function () {
+                    testDisposables = []
+                    await closeAllEditors()
+                })
+
+                afterEach(async function () {
+                    for (const d of testDisposables) {
+                        d.dispose()
+                    }
+                    await stopDebugger(undefined)
+                })
+
+                after(async function () {
+                    // don't clean up after java tests so the java language server doesn't freak out
+                    if (scenario.language !== 'java') {
+                        await tryRemoveFolder(testDir)
+                    }
+                })
+
+                it('produces an Add Debug Configuration codelens', async function () {
+                    if (
+                        scenario.language === 'csharp' || // TODO
+                        semver.lt(vscode.version, scenario.vscodeMinimum)
+                    ) {
+                        this.skip()
+                    }
+                    const codeLenses = await testUtils.getAddConfigCodeLens(
+                        samAppCodeUri,
+                        codelensTimeout,
+                        codelensRetryInterval
+                    )
+                    assert.ok(codeLenses, 'No CodeLenses provided')
+                    assert.strictEqual(codeLenses.length, 2, 'Incorrect amount of CodeLenses provided')
+
+                    let manifestFile: RegExp
+                    switch (scenario.language) {
+                        case 'javascript':
+                            manifestFile = /^package\.json$/
+                            break
+                        case 'python':
+                            manifestFile = /^requirements\.txt$/
+                            break
+                        // case 'csharp':
+                        //     manifestFile = /^.*\.csproj$/
+                        //     break
+                        case 'go':
+                            manifestFile = /^go\.mod$/
+                            break
+                        case 'java':
+                            if (scenario.dependencyManager === 'maven') {
+                                manifestFile = /^.*pom\.xml$/
+                                break
+                            } else if (scenario.dependencyManager === 'gradle') {
+                                manifestFile = /^.*build\.gradle$/
+                                break
+                            }
+                            assert.fail(`invalid dependency manager for java: ${scenario.dependencyManager}`)
+                            break
+                        default:
+                            assert.fail('invalid scenario language')
+                    }
+
+                    const projectRoot = await findParentProjectFile(samAppCodeUri, manifestFile)
+                    assert.ok(projectRoot, 'projectRoot not found')
+                    for (const codeLens of codeLenses) {
+                        assertCodeLensReferencesHasSameRoot(codeLens, projectRoot!)
+                    }
+                })
+
+                it('target=api: invokes and attaches on debug request (F5)', async function () {
+                    if (
+                        skipLanguagesOnApi.includes(scenario.language) ||
+                        semver.lt(vscode.version, scenario.vscodeMinimum)
+                    ) {
+                        this.skip()
+                    }
+
+                    await testTarget('api', {
+                        api: {
+                            path: '/hello',
+                            httpMethod: 'get',
+                            headers: { 'accept-language': 'fr-FR' },
+                        },
+                    })
+                })
+
+                it('target=template: invokes and attaches on debug request (F5)', async function () {
+                    if (semver.lt(vscode.version, scenario.vscodeMinimum)) {
+                        this.skip()
+                    }
+
+                    await testTarget('template')
+                })
+
+                async function testTarget(target: AwsSamTargetType, extraConfig: any = {}) {
+                    // Allow previous sessions to go away.
+                    await waitUntil(async () => vscode.debug.activeDebugSession === undefined, {
+                        timeout: noDebugSessionTimeout,
+                        interval: noDebugSessionInterval,
+                        truthy: true,
+                    })
+
+                    // We exclude the Node debug type since it causes the most erroneous failures with CI.
+                    // However, the fact that there are sessions from previous tests is still an issue, so
+                    // a warning will be logged under the current session.
+                    if (vscode.debug.activeDebugSession) {
+                        assert.strictEqual(
+                            vscode.debug.activeDebugSession.type,
+                            'pwa-node',
+                            `unexpected debug session in progress: ${JSON.stringify(
+                                vscode.debug.activeDebugSession,
+                                undefined,
+                                2
+                            )}`
+                        )
+
+                        sessionLog.push(`(WARNING) Unexpected debug session ${vscode.debug.activeDebugSession.name}`)
+                    }
+
+                    const testConfig = {
+                        type: 'aws-sam',
+                        request: 'direct-invoke',
+                        name: `test-config-${scenarioIndex}`,
+                        invokeTarget: {
+                            target: target,
+                            // Resource defined in `src/testFixtures/.../template.yaml`.
+                            logicalId: 'HelloWorldFunction',
+                            templatePath: cfnTemplatePath,
+                        },
+                        sam: {
+                            containerBuild: true,
+                        },
+                        ...extraConfig,
+                    } as AwsSamDebuggerConfiguration
+
+                    // runtime is optional for ZIP, but required for image-based
+                    if (scenario.baseImage) {
+                        testConfig.lambda = {
+                            runtime: scenario.runtime,
+                        }
+
+                        // HACK: set GOPROXY=direct or it will fail to build. https://golang.org/ref/mod#module-proxy
+                        // This only applies for our internal systems
+                        if (scenario.language === 'go') {
+                            const dockerfilePath: string = path.join(path.dirname(appPath), 'Dockerfile')
+                            await insertTextIntoFile('ENV GOPROXY=direct', dockerfilePath, 1)
+                        }
+                    }
+
+                    // XXX: force load since template registry seems a bit flakey
+                    await (await globals.templateRegistry).addItem(vscode.Uri.file(cfnTemplatePath))
+
+                    await startDebugger(scenario, scenarioIndex, target, testConfig, testDisposables, sessionLog)
+                }
+            })
+        })
+    }
+
+    describe('SAM Build', async function () {
+        let workspaceFolder: vscode.WorkspaceFolder
+        // We're testing only one case (python 3.10 (ZIP)) on the integration tests. More niche cases are handled as unit tests.
+        const scenarioIndex = 3
+        const scenario = scenarios[scenarioIndex]
+        let testRoot: string
+        let sandbox: sinon.SinonSandbox
+        let testDir: string
+        let cfnTemplatePath: string
+
+        before(async function () {
+            workspaceFolder = getWorkspaceFolder(testSuiteRoot)
+            testRoot = path.join(testSuiteRoot, scenario.runtime)
+            await fs.mkdir(testRoot)
+
+            testDir = mkdtempSync(path.join(testRoot, 'samapp-'))
+            console.log(`testDir: ${testDir}`)
+
+            await createSamApplication(testDir, scenario)
+
+            cfnTemplatePath = path.join(testDir, samApplicationName, 'template.yaml')
+        })
+
+        after(async function () {
+            await tryRemoveFolder(testSuiteRoot)
+            // don't clean up after java tests so the java language server doesn't freak out
+            if (scenario.language !== 'java') {
+                await tryRemoveFolder(testRoot)
+            }
+        })
+
+        beforeEach(async function () {
+            sandbox = sinon.createSandbox()
+            await closeAllEditors()
+        })
+
+        afterEach(async function () {
+            sandbox.restore()
+        })
+
+        it('can build a SAM Template', async function () {
+            // Instantiate AppNode
+            const samAppLocation = {
+                samTemplateUri: vscode.Uri.file(cfnTemplatePath),
+                workspaceFolder: workspaceFolder,
+            } as SamAppLocation
+            const appNode = new AppNode(samAppLocation)
+
+            getTestWindow().onDidShowQuickPick((input) => {
+                if (input.title?.includes('Specify parameter source for build')) {
+                    input.acceptItem(input.items[0])
+                    const item = input.items[0] as DataQuickPickItem<ParamsSource>
+                    assert.deepStrictEqual(item.data as ParamsSource, ParamsSource.Specify)
+                } else if (input.title?.includes('Select build flags')) {
+                    const item1 = input.items[2] as DataQuickPickItem<string>
+                    const item2 = input.items[4] as DataQuickPickItem<string>
+                    const item3 = input.items[7] as DataQuickPickItem<string>
+                    input.acceptItems(item1, item2, item3) // --cached, --parallel, --use-container
+
+                    assert.strictEqual(item1.data as string, '--cached')
+                    assert.strictEqual(item2.data as string, '--parallel')
+                    assert.strictEqual(item3.data as string, '--use-container')
+                }
+            })
+
+            const response = await runBuild(appNode)
+
+            assert.deepStrictEqual(response, {
+                isSuccess: true,
+            })
+
+            const builtTemplatePath = path.join(testDir, samApplicationName, '.aws-sam', 'build', 'template.yaml')
+            assert.ok(await fs.existsFile(builtTemplatePath))
+        })
+    })
+
+    async function createSamApplication(location: string, scenario: TestScenario): Promise<void> {
+        const initArguments: SamCliInitArgs = {
+            name: samApplicationName,
+            location: location,
+            dependencyManager: scenario.dependencyManager,
+        }
+        if (scenario.baseImage) {
+            initArguments.baseImage = scenario.baseImage
+        } else {
+            initArguments.runtime = scenario.runtime
+            initArguments.template = helloWorldTemplate
+        }
+        const samCliContext = getSamCliContext()
+        await runSamCliInit(initArguments, samCliContext)
+        // XXX: Fixes flakiness. Ensures the files from creation of sam
+        // app are processed by code lens file watcher. Otherwise, potential
+        // issues of file not in registry before it is found.
+        await globals.codelensRootRegistry.rebuild()
+    }
+})
diff --git a/packages/core/src/testInteg/schema/schema.test.ts b/packages/core/src/testInteg/schema/schema.test.ts
new file mode 100644
index 00000000000..aa70989d163
--- /dev/null
+++ b/packages/core/src/testInteg/schema/schema.test.ts
@@ -0,0 +1,97 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import globals from '../../shared/extensionGlobals'
+import { GlobalStorage } from '../../shared/globalStorage'
+import { getDefaultSchemas, samAndCfnSchemaUrl } from '../../shared/schemas'
+import {
+    getCITestSchemas,
+    JSONObject,
+    unmarshal,
+    assertDefinitionProperty,
+    assertProperty,
+    assertRef,
+    assertDefinition,
+} from '../../test/shared/schema/testUtils'
+import { assertTelemetry } from '../../test/testUtil'
+import { waitUntil } from '../../shared/utilities/timeoutUtils'
+import { fs } from '../../shared'
+
+describe('Sam Schema Regression', function () {
+    let samSchema: JSONObject
+
+    before(async function () {
+        ;({ samSchema } = await getCITestSchemas())
+    })
+
+    it('has Policy Templates', function () {
+        const samPolicyTemplate = 'AWS::Serverless::Function.SAMPolicyTemplate'
+        assertDefinitionProperty(samSchema, samPolicyTemplate, 'S3WritePolicy')
+        assertDefinitionProperty(samSchema, samPolicyTemplate, 'DynamoDBWritePolicy')
+        assertDefinitionProperty(samSchema, samPolicyTemplate, 'SSMParameterReadPolicy')
+        assertDefinitionProperty(samSchema, samPolicyTemplate, 'AWSSecretsManagerGetSecretValuePolicy')
+    })
+
+    it('has property Domain in AWS::Serverless::Api', function () {
+        const domainLocation = unmarshal(
+            samSchema,
+            'definitions',
+            'AWS::Serverless::Api',
+            'properties',
+            'Properties',
+            'properties'
+        )
+        assertProperty(domainLocation, 'Domain')
+        assertRef(unmarshal(domainLocation, 'Domain'), 'Api.DomainConfiguration')
+
+        assertDefinition(samSchema, 'AWS::Serverless::Api.DomainConfiguration')
+        assertDefinition(samSchema, 'AWS::Serverless::Api.MutualTlsAuthentication')
+        assertDefinition(samSchema, 'AWS::Serverless::Api.Route53Configuration')
+    })
+
+    it('has Property Version in AWS::Serverless::Function.IAMPolicyDocument and AWS::Serverless::StateMachine.IAMPolicyDocument', function () {
+        assertDefinitionProperty(samSchema, 'AWS::Serverless::Function.IAMPolicyDocument', 'Version')
+        assertDefinitionProperty(samSchema, 'AWS::Serverless::StateMachine.IAMPolicyDocument', 'Version')
+    })
+
+    it('has Property RequestModel and RequestParameters in AWS::Serverless::Function.ApiEvent', function () {
+        assertDefinitionProperty(samSchema, 'AWS::Serverless::Function.ApiEvent', 'RequestModel')
+        assertDefinitionProperty(samSchema, 'AWS::Serverless::Function.ApiEvent', 'RequestParameters')
+        assertDefinition(samSchema, 'AWS::Serverless::Function.RequestModel')
+        assertDefinition(samSchema, 'AWS::Serverless::Function.RequestParameter')
+    })
+
+    it('has Property AddDefaultAuthorizerToCorsPreflight in AWS::Serverless::Api.Auth', function () {
+        assertDefinitionProperty(samSchema, 'AWS::Serverless::Api.Auth', 'AddDefaultAuthorizerToCorsPreflight')
+    })
+})
+
+describe('getDefaultSchemas()', () => {
+    beforeEach(async () => {})
+
+    it('uses cache after initial fetch for CFN/SAM schema', async () => {
+        await fs.delete(GlobalStorage.samAndCfnSchemaDestinationUri().fsPath)
+        await globals.telemetry.setTelemetryEnabled(true)
+        globals.telemetry.clearRecords()
+        globals.telemetry.logger.clear()
+        await getDefaultSchemas()
+        await getDefaultSchemas()
+        await getDefaultSchemas()
+        await waitUntil(
+            async () => {
+                return await fs.exists(GlobalStorage.samAndCfnSchemaDestinationUri().fsPath)
+            },
+            { truthy: true, interval: 200, timeout: 5000 }
+        )
+        assertTelemetry('toolkit_getExternalResource', [
+            // Initial retrieval.
+            // (Technically, this is done on activation, not any of the getDefaultSchemas() calls above.)
+            { url: samAndCfnSchemaUrl, passive: true, result: 'Succeeded' },
+            // Use cache after initial fetch.
+            { url: samAndCfnSchemaUrl, passive: true, result: 'Cancelled', reason: 'Cache hit' },
+            { url: samAndCfnSchemaUrl, passive: true, result: 'Cancelled', reason: 'Cache hit' },
+        ])
+    })
+})
diff --git a/src/integrationTest/shared/codelens/samTemplateCodeLensProvider.test.ts b/packages/core/src/testInteg/shared/codelens/samTemplateCodeLensProvider.test.ts
similarity index 80%
rename from src/integrationTest/shared/codelens/samTemplateCodeLensProvider.test.ts
rename to packages/core/src/testInteg/shared/codelens/samTemplateCodeLensProvider.test.ts
index 2e47ce41545..45167136a0a 100644
--- a/src/integrationTest/shared/codelens/samTemplateCodeLensProvider.test.ts
+++ b/packages/core/src/testInteg/shared/codelens/samTemplateCodeLensProvider.test.ts
@@ -1,12 +1,11 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
+import assert from 'assert'
 import * as vscode from 'vscode'
 import * as semver from 'semver'
-import { anything, instance, mock, when } from 'ts-mockito'
 import { TemplateSymbolResolver } from '../../../shared/cloudformation/templateSymbolResolver'
 import { SamTemplateCodeLensProvider } from '../../../shared/codelens/samTemplateCodeLensProvider'
 import { LaunchConfiguration } from '../../../shared/debug/launchConfiguration'
@@ -14,33 +13,34 @@ import { API_TARGET_TYPE, TEMPLATE_TARGET_TYPE } from '../../../shared/sam/debug
 import * as workspaceUtils from '../../../shared/utilities/workspaceUtils'
 import { VSCODE_EXTENSION_ID } from '../../../shared/extensions'
 import { activateExtension } from '../../../shared/utilities/vsCodeUtils'
+import { stub } from '../../../test/utilities/stubber'
 
 describe('SamTemplateCodeLensProvider', async function () {
     let codeLensProvider: SamTemplateCodeLensProvider = new SamTemplateCodeLensProvider()
     let document: vscode.TextDocument
     let launchConfig: LaunchConfiguration
     let templateUri: vscode.Uri
-    let mockCancellationToken: vscode.CancellationToken
+    // not used in `provideCodeLenses`
+    const mockCancellationToken: vscode.CancellationToken = {} as any as vscode.CancellationToken
 
     beforeEach(async function () {
         codeLensProvider = new SamTemplateCodeLensProvider()
         document = (await workspaceUtils.openTextDocument('python3.7-plain-sam-app/template.yaml'))!
         templateUri = document.uri
         launchConfig = new LaunchConfiguration(document.uri)
-        mockCancellationToken = mock()
     })
 
     it('provides a CodeLens for a file with a new resource', async function () {
-        // redhat.vscode-yaml requires vscode 1.52
-        // https://github.com/redhat-developer/vscode-yaml/blob/main/package.json
-        if (semver.lt(vscode.version, '1.52.0')) {
+        // - redhat.vscode-yaml requires vscode 1.63: https://github.com/redhat-developer/vscode-yaml/blob/main/package.json
+        // - the codelens behavior changed with the vscode 1.66 release
+        if (semver.lt(vscode.version, '1.66.0')) {
             this.skip()
         }
         await activateExtension(VSCODE_EXTENSION_ID.yaml, false)
 
         const codeLenses = await codeLensProvider.provideCodeLenses(
             document,
-            instance(mockCancellationToken),
+            mockCancellationToken,
             new TemplateSymbolResolver(document),
             launchConfig,
             true
@@ -73,13 +73,13 @@ describe('SamTemplateCodeLensProvider', async function () {
     })
 
     it('provides no code lenses for a file with no resources', async function () {
-        const mockSymbolResolver: TemplateSymbolResolver = mock()
-        when(mockSymbolResolver.getResourcesOfKind('function', anything())).thenResolve([])
+        const resolver = stub(TemplateSymbolResolver)
+        resolver.getResourcesOfKind.resolves([])
 
         const codeLenses = await codeLensProvider.provideCodeLenses(
             document,
-            instance(mockCancellationToken),
-            instance(mockSymbolResolver),
+            mockCancellationToken,
+            resolver,
             launchConfig
         )
 
diff --git a/packages/core/src/testInteg/shared/crashMonitoring.test.ts b/packages/core/src/testInteg/shared/crashMonitoring.test.ts
new file mode 100644
index 00000000000..7f27e2fdc94
--- /dev/null
+++ b/packages/core/src/testInteg/shared/crashMonitoring.test.ts
@@ -0,0 +1,9 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { crashMonitoringTest } from '../../test/shared/crashMonitoring.test'
+
+// This test is slower so we want to it to run as an integ test for CI
+describe('CrashMonitoring', crashMonitoringTest)
diff --git a/src/integrationTest/shared/extensions/git.test.ts b/packages/core/src/testInteg/shared/extensions/git.test.ts
similarity index 81%
rename from src/integrationTest/shared/extensions/git.test.ts
rename to packages/core/src/testInteg/shared/extensions/git.test.ts
index 41c120667a5..04580c77360 100644
--- a/src/integrationTest/shared/extensions/git.test.ts
+++ b/packages/core/src/testInteg/shared/extensions/git.test.ts
@@ -1,19 +1,19 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as assert from 'assert'
-import * as bytes from 'bytes'
-import * as vscode from 'vscode'
+import assert from 'assert'
+import bytes from 'bytes'
+import vscode from 'vscode'
 import * as GitTypes from '../../../../types/git'
 import { GitExtension, Repository } from '../../../shared/extensions/git'
 import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
-import { realpath } from 'fs-extra'
-import { execFileSync } from 'child_process'
+import { realpathSync } from 'fs' // eslint-disable-line no-restricted-imports
+import { execFileSync } from 'child_process' // eslint-disable-line no-restricted-imports
 import { sleep } from '../../../shared/utilities/timeoutUtils'
 import { getLogger } from '../../../shared/logger/logger'
-import { getMinVsCodeVersion } from '../../../../scripts/test/launchTestUtilities' // TODO: don't use stuff from 'scripts'
+import { getMinVscodeVersion } from '../../../shared/vscode/env'
 
 const testRemoteName = 'test-origin'
 const testRemoteUrl = 'https://github.com/aws/aws-toolkit-vscode'
@@ -69,16 +69,16 @@ describe.skip('GitExtension', function () {
 
     before(async function () {
         // extension is missing some functionality on the minimum version
-        if (vscode.version === getMinVsCodeVersion()) {
+        if (vscode.version === getMinVscodeVersion()) {
             this.test?.skip()
         }
 
         // API may not be initialized by the time this test starts
-        await new Promise<string | void>(r => (git.$api.state === 'initialized' ? r() : git.$api.onDidChangeState(r)))
+        await new Promise<string | void>((r) => (git.$api.state === 'initialized' ? r() : git.$api.onDidChangeState(r)))
         await initConfig()
 
         // realpath is used in case of symlinks
-        const tmpDirUri = vscode.Uri.file(await realpath(await makeTemporaryToolkitFolder()))
+        const tmpDirUri = vscode.Uri.file(realpathSync(await makeTemporaryToolkitFolder()))
         const repo = await git.$api.init(tmpDirUri).catch(parseGitError)
         if (!repo) {
             throw new Error(`Failed to create test repository: ${tmpDirUri.fsPath}`)
@@ -100,9 +100,9 @@ describe.skip('GitExtension', function () {
     })
 
     it('can detect opening a repository', async function () {
-        const newRepoUri = vscode.Uri.file(await realpath(await makeTemporaryToolkitFolder()))
+        const newRepoUri = vscode.Uri.file(realpathSync(await makeTemporaryToolkitFolder()))
         const onOpen = new Promise<Repository>((resolve, reject) => {
-            git.onDidOpenRepository(repo => {
+            git.onDidOpenRepository((repo) => {
                 if (repo.rootUri.fsPath === newRepoUri.fsPath) {
                     resolve(repo)
                 }
@@ -115,12 +115,12 @@ describe.skip('GitExtension', function () {
     })
 
     it('can detect changed branch', async function () {
-        const wrapped = (await git.getRepositories()).find(r => r.rootUri.fsPath === testRepo.rootUri.fsPath)
+        const wrapped = (await git.getRepositories()).find((r) => r.rootUri.fsPath === testRepo.rootUri.fsPath)
         if (!wrapped) {
             throw new Error('Failed to find repository')
         }
         const checkBranch = new Promise<GitTypes.Branch | undefined>((resolve, reject) => {
-            wrapped.onDidChangeBranch(branch => {
+            wrapped.onDidChangeBranch((branch) => {
                 resolve(branch)
             })
             setTimeout(() => reject(new Error('Timed out waiting for branch to change')), testTimeout)
@@ -136,16 +136,16 @@ describe.skip('GitExtension', function () {
 
     it('can list remotes and branches', async function () {
         const targetBranch = `${testRemoteName}/${testRemoteBranch}`
-        const remote = (await git.getRemotes()).find(r => r.name === testRemoteName)
+        const remote = (await git.getRemotes()).find((r) => r.name === testRemoteName)
         assert.ok(remote, `Did not find "${testRemoteName}" in list of remotes`)
         await testRepo.fetch({ remote: testRemoteName, ref: testRemoteBranch }).catch(parseGitError)
-        const branch = (await git.getBranchesForRemote(remote)).find(branch => branch.name === targetBranch)
+        const branch = (await git.getBranchesForRemote(remote)).find((branch) => branch.name === targetBranch)
         assert.ok(branch, `Failed to find "${targetBranch}" associated with remote`)
     })
 
     it('can get repository config', async function () {
-        testRepo.setConfig('user.name', 'name')
-        testRepo.setConfig('user.email', 'email')
+        await testRepo.setConfig('user.name', 'name')
+        await testRepo.setConfig('user.email', 'email')
         const config = await git.getConfig(testRepo).catch(parseGitError)
         assert.strictEqual(config['user.name'], 'name')
         assert.strictEqual(config['user.email'], 'email')
@@ -162,11 +162,11 @@ describe.skip('GitExtension', function () {
         this.timeout(listRemoteTimeout)
         const result = await git.listAllRemoteFiles({ fetchUrl: testRemoteUrl, branch: testRemoteHead })
 
-        const readme = result.files.find(f => f.name === 'NOTICE')
+        const readme = result.files.find((f) => f.name === 'NOTICE')
         assert.ok(readme, 'Expected to find NOTICE file in repository root')
         const contents = await readme.read()
         assert.ok(contents.startsWith('AWS Vscode Toolkit'))
-        const extension = result.files.find(f => f.name === 'src/extension.ts')
+        const extension = result.files.find((f) => f.name === 'src/extension.ts')
         assert.ok(extension, 'Expected to find "extension.ts" under "src"')
 
         if (!result.stats.downloadSize) {
diff --git a/packages/core/src/testInteg/shared/utilities/workspaceUtils.test.ts b/packages/core/src/testInteg/shared/utilities/workspaceUtils.test.ts
new file mode 100644
index 00000000000..55c551b87d0
--- /dev/null
+++ b/packages/core/src/testInteg/shared/utilities/workspaceUtils.test.ts
@@ -0,0 +1,611 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import * as path from 'path'
+import * as vscode from 'vscode'
+import {
+    collectFiles,
+    collectFilesForIndex,
+    CollectFilesResultItem,
+    findParentProjectFile,
+    findStringInDirectory,
+    getWorkspaceFoldersByPrefixes,
+    getWorkspaceRelativePath,
+} from '../../../shared/utilities/workspaceUtils'
+import { getTestWorkspaceFolder } from '../../integrationTestsUtilities'
+import globals from '../../../shared/extensionGlobals'
+import { CodelensRootRegistry } from '../../../shared/fs/codelensRootRegistry'
+import { createTestWorkspace, createTestWorkspaceFolder, toFile } from '../../../test/testUtil'
+import sinon from 'sinon'
+import { fs, ToolkitError } from '../../../shared'
+
+describe('workspaceUtils', () => {
+    let sandbox: sinon.SinonSandbox
+
+    beforeEach(() => {
+        sandbox = sinon.createSandbox()
+    })
+
+    afterEach(() => {
+        sandbox.restore()
+    })
+
+    describe('findParentProjectFile', async function () {
+        const workspaceDir = getTestWorkspaceFolder()
+        let filesToDelete: vscode.Uri[]
+
+        // Save the global registry and restore it after the test
+        let globalRegistry: CodelensRootRegistry
+
+        const sourceCodeUri = vscode.Uri.file(path.join(workspaceDir, 'someproject', 'src', 'Program.cs'))
+        const projectInSameFolderUri = vscode.Uri.file(path.join(workspaceDir, 'someproject', 'src', 'App.csproj'))
+        const projectInParentFolderUri = vscode.Uri.file(path.join(workspaceDir, 'someproject', 'App.csproj'))
+        const projectInParentParentFolderUri = vscode.Uri.file(path.join(workspaceDir, 'App.csproj'))
+        const projectOutOfParentChainUri = vscode.Uri.file(path.join(workspaceDir, 'someotherproject', 'App.csproj'))
+
+        const testScenarios = [
+            {
+                scenario: 'locates project in same folder',
+                filesToUse: [projectInSameFolderUri],
+                expectedResult: projectInSameFolderUri,
+            },
+            {
+                scenario: 'locates project in parent folder',
+                filesToUse: [projectInParentFolderUri],
+                expectedResult: projectInParentFolderUri,
+            },
+            {
+                scenario: 'locates project two parent folders up',
+                filesToUse: [projectInParentParentFolderUri],
+                expectedResult: projectInParentParentFolderUri,
+            },
+            {
+                scenario: 'selects project in same folder over parent folder',
+                filesToUse: [projectInSameFolderUri, projectInParentFolderUri],
+                expectedResult: projectInSameFolderUri,
+            },
+            {
+                scenario: 'always selects project in same folder over parent folder regardless of order',
+                filesToUse: [projectInParentFolderUri, projectInSameFolderUri],
+                expectedResult: projectInSameFolderUri,
+            },
+            {
+                scenario: 'returns undefined when no project files are located',
+                filesToUse: [],
+                expectedResult: undefined,
+            },
+            {
+                scenario: 'returns undefined when no project files are located in parent chain',
+                filesToUse: [projectOutOfParentChainUri],
+                expectedResult: undefined,
+            },
+        ]
+
+        before(async function () {
+            await fs.mkdir(path.join(workspaceDir, 'someproject', 'src'))
+            await fs.mkdir(path.join(workspaceDir, 'someotherproject'))
+            globalRegistry = globals.codelensRootRegistry
+        })
+
+        after(async function () {
+            await fs.delete(path.join(workspaceDir, 'someproject'), { recursive: true })
+            await fs.delete(path.join(workspaceDir, 'someotherproject'), { recursive: true })
+            globals.codelensRootRegistry = globalRegistry
+        })
+
+        beforeEach(function () {
+            globals.codelensRootRegistry = new CodelensRootRegistry()
+        })
+
+        afterEach(async function () {
+            for (const file of filesToDelete) {
+                await fs.delete(file.fsPath)
+            }
+            filesToDelete = []
+            globals.codelensRootRegistry.dispose()
+        })
+
+        for (const test of testScenarios) {
+            it(test.scenario, async () => {
+                filesToDelete = test.filesToUse
+                for (const file of test.filesToUse) {
+                    await fs.writeFile(file.fsPath, '')
+                    // Add it to the registry. The registry is async and we are not
+                    // testing the registry in this test, so manually use it
+                    await globals.codelensRootRegistry.addItem(file)
+                }
+                const projectFile = await findParentProjectFile(sourceCodeUri, /^.*\.csproj$/)
+                if (test.expectedResult) {
+                    // doesn't do a deepStrictEqual because VS Code sets a hidden field to `undefined` when returning instead of `null` (when it's created)
+                    // for all intents and purposes, if this matches, it's good enough for us.
+                    assert.strictEqual(projectFile?.fsPath, test.expectedResult?.fsPath)
+                } else {
+                    assert.strictEqual(projectFile, test.expectedResult)
+                }
+            })
+        }
+    })
+
+    describe('getWorkspaceRelativePath', function () {
+        const parentPath = path.join('/', 'level1', 'level2')
+        const nestedPath = path.join(parentPath, 'level3')
+        const childPath = path.join(nestedPath, 'level4')
+
+        it('returns a path relative to the first parent path it sees', function () {
+            const workspaceFolder = {
+                index: 0,
+                name: '',
+                uri: vscode.Uri.file(nestedPath),
+            }
+
+            const relativePath = getWorkspaceRelativePath(childPath, {
+                workspaceFolders: [
+                    workspaceFolder,
+                    {
+                        index: 1,
+                        name: '',
+                        uri: vscode.Uri.file(parentPath),
+                    },
+                ],
+            })
+
+            assert.strictEqual(relativePath?.relativePath, 'level4')
+            assert.strictEqual(relativePath?.workspaceFolder, workspaceFolder)
+        })
+
+        it('returns undefined if no workspace folders exist', function () {
+            const relativePath = getWorkspaceRelativePath(childPath, { workspaceFolders: undefined })
+            assert.strictEqual(relativePath, undefined)
+        })
+
+        it('returns undefined if no paths are parents', function () {
+            const relativePath = getWorkspaceRelativePath(childPath, {
+                workspaceFolders: [
+                    {
+                        index: 0,
+                        name: '',
+                        uri: vscode.Uri.file(path.join('different', nestedPath)),
+                    },
+                    {
+                        index: 1,
+                        name: '',
+                        uri: vscode.Uri.file(path.join('different', parentPath)),
+                    },
+                ],
+            })
+            assert.strictEqual(relativePath, undefined)
+        })
+    })
+
+    describe('collectFiles', function () {
+        it('returns all files in the workspace', async function () {
+            // these variables are a manual selection of settings for the test in order to test the collectFiles function
+            const workspaceFolders = [
+                { fileAmount: 2, fileNamePrefix: 'file', fileContent: 'test content', workspaceName: 'app' },
+                { fileAmount: 2, fileNamePrefix: 'file', fileContent: 'test content', workspaceName: 'test' },
+            ] satisfies (Parameters<typeof createTestWorkspace>[1] & { fileAmount: number })[]
+
+            const workspaces: [vscode.WorkspaceFolder, vscode.WorkspaceFolder] = [
+                await createTestWorkspace(workspaceFolders[0].fileAmount, workspaceFolders[0]),
+                await createTestWorkspace(workspaceFolders[1].fileAmount, workspaceFolders[1]),
+            ]
+            sandbox.stub(vscode.workspace, 'workspaceFolders').value(workspaces)
+
+            const result = await collectFiles(
+                workspaces.map((ws) => ws.uri.fsPath),
+                workspaces,
+                { excludeByGitIgnore: false }
+            )
+            assert.strictEqual(
+                result.length,
+                workspaceFolders.reduce((sum, ws) => sum + ws.fileAmount, 0)
+            )
+            let currentIndex = 0
+            for (const workspaceFolder of workspaceFolders) {
+                for (let i = currentIndex; i < currentIndex + workspaceFolder.fileAmount; i++) {
+                    assert.strictEqual(result[i].relativeFilePath.includes(workspaceFolder.fileNamePrefix), true)
+                    assert.strictEqual(result[i].zipFilePath.startsWith(workspaceFolder.workspaceName), true)
+                    assert.strictEqual(result[i].fileContent, workspaceFolder.fileContent)
+                }
+                currentIndex += workspaceFolder.fileAmount
+            }
+        })
+
+        it('returns all files in the workspace not excluded by gitignore', async function () {
+            // these variables are a manual selection of settings for the test in order to test the collectFiles function
+            const fileAmount = 3
+            const fileNamePrefix = 'file'
+            const fileContent = 'test content'
+
+            const workspaceFolder = await createTestWorkspace(fileAmount, { fileNamePrefix, fileContent })
+
+            const writeFile = (pathParts: string[], fileContent: string) => {
+                return toFile(fileContent, path.join(workspaceFolder.uri.fsPath, ...pathParts))
+            }
+
+            sandbox.stub(vscode.workspace, 'workspaceFolders').value([workspaceFolder])
+            const gitignoreContent = `file2
+            # different formats of prefixes
+            /build
+            node_modules
+
+            #some comment
+
+            range_file[0-5]
+            `
+            await writeFile(['.gitignore'], gitignoreContent)
+
+            await writeFile(['build', `ignored1`], fileContent)
+            await writeFile(['build', `ignored2`], fileContent)
+
+            await writeFile(['node_modules', `ignored1`], fileContent)
+            await writeFile(['node_modules', `ignored2`], fileContent)
+
+            await writeFile([`range_file0`], fileContent)
+            await writeFile([`range_file9`], fileContent)
+
+            const gitignore2 = 'folder1\n'
+            await writeFile(['src', '.gitignore'], gitignore2)
+            await writeFile(['src', 'folder2', 'a.js'], fileContent)
+
+            const gitignore3 = `negate_test*
+            !negate_test[0-5]`
+            await writeFile(['src', 'folder3', '.gitignore'], gitignore3)
+            await writeFile(['src', 'folder3', 'negate_test1'], fileContent)
+            await writeFile(['src', 'folder3', 'negate_test6'], fileContent)
+
+            const result = processIndexResults(await collectFiles([workspaceFolder.uri.fsPath], [workspaceFolder]))
+
+            // non-posix filePath check here is important.
+            assert.deepStrictEqual(
+                [
+                    {
+                        workspaceFolder,
+                        relativeFilePath: '.gitignore',
+                        fileContent: gitignoreContent,
+                        fileSizeBytes: 162,
+                    },
+                    {
+                        workspaceFolder,
+                        relativeFilePath: 'file1',
+                        fileContent: 'test content',
+                        fileSizeBytes: 12,
+                    },
+                    {
+                        workspaceFolder,
+                        relativeFilePath: 'file3',
+                        fileContent: 'test content',
+                        fileSizeBytes: 12,
+                    },
+                    {
+                        workspaceFolder,
+                        relativeFilePath: 'range_file9',
+                        fileContent: 'test content',
+                        fileSizeBytes: 12,
+                    },
+                    {
+                        workspaceFolder,
+                        relativeFilePath: path.join('src', '.gitignore'),
+                        fileContent: gitignore2,
+                        fileSizeBytes: 8,
+                    },
+                    {
+                        workspaceFolder,
+                        relativeFilePath: path.join('src', 'folder2', 'a.js'),
+                        fileContent: fileContent,
+                        fileSizeBytes: 12,
+                    },
+                    {
+                        workspaceFolder,
+                        relativeFilePath: path.join('src', 'folder3', '.gitignore'),
+                        fileContent: gitignore3,
+                        fileSizeBytes: 42,
+                    },
+                    {
+                        workspaceFolder,
+                        relativeFilePath: path.join('src', 'folder3', 'negate_test1'),
+                        fileContent: fileContent,
+                        fileSizeBytes: 12,
+                    },
+                ] satisfies typeof result,
+                result
+            )
+        })
+
+        it('does not return license files', async function () {
+            const workspace = await createTestWorkspaceFolder()
+
+            sandbox.stub(vscode.workspace, 'workspaceFolders').value([workspace])
+
+            const fileContent = ''
+            for (const fmt of ['txt', 'md']) {
+                // root license files
+                await toFile(fileContent, path.join(workspace.uri.fsPath, `license.${fmt}`))
+                await toFile(fileContent, path.join(workspace.uri.fsPath, `License.${fmt}`))
+                await toFile(fileContent, path.join(workspace.uri.fsPath, `LICENSE.${fmt}`))
+
+                // nested license files
+                await toFile(fileContent, path.join(workspace.uri.fsPath, `src/license.${fmt}`))
+                await toFile(fileContent, path.join(workspace.uri.fsPath, `src/License.${fmt}`))
+                await toFile(fileContent, path.join(workspace.uri.fsPath, `src/LICENSE.${fmt}`))
+            }
+
+            // add a non license file too, to make sure it is returned
+            await toFile(fileContent, path.join(workspace.uri.fsPath, 'non-license.md'))
+
+            const result = await collectFiles([workspace.uri.fsPath], [workspace])
+
+            assert.deepStrictEqual(1, result.length)
+            assert.deepStrictEqual('non-license.md', result[0].relativeFilePath)
+        })
+
+        it('throws when total size limit is exceeded (by default)', async function () {
+            const workspace = await createTestWorkspaceFolder()
+            sandbox.stub(vscode.workspace, 'workspaceFolders').value([workspace])
+
+            const fileContent = 'this is some text'
+            await toFile(fileContent, path.join(workspace.uri.fsPath, 'file1'))
+            await toFile(fileContent, path.join(workspace.uri.fsPath, 'file2'))
+
+            await assert.rejects(
+                () => collectFiles([workspace.uri.fsPath], [workspace], { maxTotalSizeBytes: 15 }),
+                (e) => e instanceof ToolkitError && e.code === 'ContentLengthError'
+            )
+        })
+    })
+
+    describe('getWorkspaceFoldersByPrefixes', function () {
+        it('returns undefined for single workspace folder', async () => {
+            const result = getWorkspaceFoldersByPrefixes([await createTestWorkspace(1, {})])
+            assert.strictEqual(result, undefined)
+        })
+        it('prefixes folders based on their name if possible', async () => {
+            const ws1 = await createTestWorkspace(1, { fileNamePrefix: 'ws1', workspaceName: 'test' })
+            const ws2 = await createTestWorkspace(1, { fileNamePrefix: 'ws2', workspaceName: 'app' })
+            const result = getWorkspaceFoldersByPrefixes([ws1, ws2])
+            assert.deepStrictEqual(result, { test: ws1, app: ws2 })
+        })
+
+        it('prefixes folders based on their folder parts, if the names collide', async () => {
+            const ws1 = await createTestWorkspace(1, {
+                fileNamePrefix: 'ws1',
+                workspaceName: 'cdk',
+                subDir: 'test/app/cdk',
+            })
+            const ws2 = await createTestWorkspace(1, {
+                fileNamePrefix: 'ws2',
+                workspaceName: 'cdk',
+                subDir: 'canary/app/cdk',
+            })
+            const result = getWorkspaceFoldersByPrefixes([ws1, ws2])
+            assert.deepStrictEqual(result, { test_app_cdk_cdk: ws1, canary_app_cdk_cdk: ws2 })
+        })
+
+        it('when a folder collides with another one in prefixing, it will get the shorter prefix if there are no contenders', async () => {
+            const ws1 = await createTestWorkspace(1, {
+                fileNamePrefix: 'ws1',
+                workspaceName: 'cdk',
+                subDir: 'test/app/cdk',
+            })
+            const ws2 = await createTestWorkspace(1, {
+                fileNamePrefix: 'ws2',
+                workspaceName: 'cdk',
+                subDir: ws1.uri.fsPath.replace(':', '_'),
+            })
+            const result = getWorkspaceFoldersByPrefixes([ws1, ws2])
+            const keys = Object.keys(result ?? {})
+            assert.strictEqual(keys.length, 2)
+            const keyForWs1 = result?.[keys[0]] === ws1 ? keys[0] : keys[1]
+            const keyForWs2 = keyForWs1 === keys[0] ? keys[1] : keys[0]
+            assert.strictEqual(
+                keyForWs2.includes(keyForWs1),
+                true,
+                `Expected [${keyForWs1}] to be a prefix of [${keyForWs2}]`
+            )
+            assert.strictEqual(
+                keyForWs2.length > keyForWs1.length,
+                true,
+                `Expected [${keyForWs1}] to be a prefix of [${keyForWs2}]`
+            )
+        })
+
+        it('when 2 folders collide, they will get suffixed', async () => {
+            // the first 2 collide all the way
+            const ws1 = await createTestWorkspace(1, {
+                fileNamePrefix: 'ws1',
+                workspaceName: 'cdk_ws',
+                subDir: 'test/app',
+            })
+            const newRoot = path.join(ws1.uri.fsPath, '../app_cdk')
+            await fs.mkdir(newRoot)
+            const ws2: vscode.WorkspaceFolder = {
+                index: 0,
+                uri: vscode.Uri.file(newRoot),
+                name: 'ws',
+            }
+            const ws3 = await createTestWorkspace(1, {
+                fileNamePrefix: 'ws2',
+                workspaceName: 'cdk_ws',
+                subDir: 'test/zz1',
+            })
+            const ws4 = await createTestWorkspace(1, {
+                fileNamePrefix: 'ws2',
+                workspaceName: 'ws',
+                subDir: 'test/zz2',
+            })
+            const result = getWorkspaceFoldersByPrefixes([ws1, ws2, ws3, ws4])
+            const keys = Object.keys(result ?? {})
+            assert.strictEqual(keys.length, 4, `Incorrect number of entries in result [${JSON.stringify(result)}]`)
+            const orderedKeys = keys.sort()
+            assert.strictEqual(
+                orderedKeys[0].substring(0, orderedKeys[0].length - 2),
+                orderedKeys[1].substring(0, orderedKeys[1].length - 2),
+                `Incorrect prefixes for colliding workspaces [${orderedKeys[0]}, ${orderedKeys[1]}]`
+            )
+            assert.strictEqual(
+                orderedKeys[0].substring(orderedKeys[0].length - 2),
+                '_1',
+                `Incorrect prefix for first workspace [${orderedKeys[0]}]`
+            )
+            assert.strictEqual(
+                orderedKeys[1].substring(orderedKeys[1].length - 2),
+                '_2',
+                `Incorrect prefix for second workspace [${orderedKeys[1]}]`
+            )
+        })
+    })
+
+    describe('collectFilesForIndex', function () {
+        let workspaceFolder: vscode.WorkspaceFolder
+
+        const writeFile = (pathParts: string[], fileContent: string) => {
+            return toFile(fileContent, path.join(workspaceFolder.uri.fsPath, ...pathParts))
+        }
+
+        beforeEach(async function () {
+            workspaceFolder = await createTestWorkspaceFolder()
+            sandbox.stub(vscode.workspace, 'workspaceFolders').value([workspaceFolder])
+        })
+
+        it('returns all files in the workspace not excluded by gitignore and is a supported programming language', async function () {
+            const fileContent = 'test content'
+
+            const gitignoreContent = `file2
+            # different formats of prefixes
+            /build
+            node_modules
+
+            #some comment
+
+            range_file[0-5]
+            `
+            await writeFile(['.gitignore'], gitignoreContent)
+
+            await writeFile(['build', `ignored1`], fileContent)
+            await writeFile(['build', `ignored2`], fileContent)
+
+            await writeFile(['node_modules', `ignored1`], fileContent)
+            await writeFile(['node_modules', `ignored2`], fileContent)
+
+            await writeFile([`range_file0`], fileContent)
+            await writeFile([`range_file9`], fileContent)
+
+            const gitignore2 = 'folder1\n'
+            await writeFile(['src', '.gitignore'], gitignore2)
+            await writeFile(['src', 'folder2', 'a.js'], fileContent)
+            await writeFile(['src', 'folder2', 'b.cs'], fileContent)
+            await writeFile(['src', 'folder2', 'c.bin'], fileContent)
+            await writeFile(['src', 'folder2', 'd.pyc'], fileContent)
+
+            const gitignore3 = `negate_test*
+            !negate_test[0-5]`
+            await writeFile(['src', 'folder3', '.gitignore'], gitignore3)
+            await writeFile(['src', 'folder3', 'negate_test1'], fileContent)
+            await writeFile(['src', 'folder3', 'negate_test6'], fileContent)
+
+            const result = processIndexResults(
+                await collectFilesForIndex([workspaceFolder.uri.fsPath], [workspaceFolder], true)
+            )
+
+            // non-posix filePath check here is important.
+            assert.deepStrictEqual(
+                [
+                    {
+                        workspaceFolder,
+                        relativeFilePath: path.join('src', 'folder2', 'a.js'),
+                        fileSizeBytes: 12,
+                    },
+                    {
+                        workspaceFolder,
+                        relativeFilePath: path.join('src', 'folder2', 'b.cs'),
+                        fileSizeBytes: 12,
+                    },
+                ] satisfies typeof result,
+                result
+            )
+        })
+
+        it('does not include build related files', async function () {
+            const fileContent = 'this is a file'
+
+            await writeFile(['bin', `ignored1`], fileContent)
+            await writeFile(['bin', `ignored2`], fileContent)
+
+            await writeFile([`a.js`], fileContent)
+            await writeFile([`b.java`], fileContent)
+
+            const result = processIndexResults(
+                await collectFilesForIndex([workspaceFolder.uri.fsPath], [workspaceFolder], true)
+            )
+
+            // non-posix filePath check here is important.
+            assert.deepStrictEqual(
+                [
+                    {
+                        workspaceFolder,
+                        relativeFilePath: 'a.js',
+                        fileSizeBytes: 14,
+                    },
+                    {
+                        workspaceFolder,
+                        relativeFilePath: 'b.java',
+                        fileSizeBytes: 14,
+                    },
+                ] satisfies typeof result,
+                result
+            )
+        })
+
+        it('returns top level files when max size is reached', async function () {
+            const fileContent = 'this is a file'
+
+            await writeFile(['path', 'to', 'file', 'bot.js'], fileContent)
+            await writeFile(['path', 'to', 'file', `bot.java`], fileContent)
+
+            await writeFile([`top.js`], fileContent)
+            await writeFile([`top.java`], fileContent)
+
+            const result = processIndexResults(
+                await collectFilesForIndex([workspaceFolder.uri.fsPath], [workspaceFolder], true, 30)
+            )
+
+            // non-posix filePath check here is important.
+            assert.deepStrictEqual(
+                [
+                    {
+                        workspaceFolder,
+                        relativeFilePath: 'top.java',
+                        fileSizeBytes: 14,
+                    },
+                    {
+                        workspaceFolder,
+                        relativeFilePath: 'top.js',
+                        fileSizeBytes: 14,
+                    },
+                ] satisfies typeof result,
+                result
+            )
+        })
+    })
+
+    describe('findStringInDirectory', function () {
+        it('prints the line with the detected string to stdout', async () => {
+            const fileAmount = 1
+            const searchStr = 'oracle.jdbc.OracleDriver'
+            const fileContent = `test content ${searchStr} more test content`
+            const workspaceFolder = await createTestWorkspace(fileAmount, { fileContent: fileContent })
+            const spawnResult = await findStringInDirectory(searchStr, workspaceFolder.uri.fsPath)
+            assert.equal(spawnResult.stdout.includes(searchStr), true)
+        })
+    })
+})
+
+// for some reason, uri created inline differ in subfields, so skipping them from assertion
+function processIndexResults(results: Omit<CollectFilesResultItem, 'fileContent'>[] | CollectFilesResultItem[]) {
+    return results
+        .map(({ zipFilePath, fileUri, ...r }) => ({ ...r }))
+        .sort((l, r) => l.relativeFilePath.localeCompare(r.relativeFilePath))
+}
diff --git a/packages/core/src/testInteg/stepFunctions/init.test.ts b/packages/core/src/testInteg/stepFunctions/init.test.ts
new file mode 100644
index 00000000000..894fcedb35a
--- /dev/null
+++ b/packages/core/src/testInteg/stepFunctions/init.test.ts
@@ -0,0 +1,41 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { createTestWorkspaceFolder, toTextEditor } from '../../test/testUtil'
+import vscode from 'vscode'
+import { ASLLanguageClient } from '../../stepFunctions/asl/client'
+import { waitUntil } from '../../shared'
+
+describe('stepFunctions ASL LSP', async function () {
+    let tempFolder: string
+
+    beforeEach(async function () {
+        // Make a temp folder for all these tests
+        const d = await createTestWorkspaceFolder()
+        tempFolder = d.uri.fsPath
+    })
+
+    it('init', async function () {
+        const stateMachineFileText = `{
+
+}`
+        const fileName = 'stepfunction.asl'
+        const editor = await toTextEditor(stateMachineFileText, fileName, tempFolder)
+        await waitUntil(async () => ASLLanguageClient.isReady, {
+            timeout: 30000,
+            interval: 500,
+        })
+        const result = (await vscode.commands.executeCommand(
+            'vscode.executeCompletionItemProvider',
+            editor.document.uri,
+            new vscode.Position(1, 4)
+        )) as vscode.CompletionList
+        assert.deepStrictEqual(
+            result.items.map((item) => item.label),
+            ['Comment', 'QueryLanguage', 'StartAt', 'States', 'TimeoutSeconds', 'Version']
+        )
+    })
+})
diff --git a/packages/core/src/testLint/README.md b/packages/core/src/testLint/README.md
new file mode 100644
index 00000000000..988c680b18e
--- /dev/null
+++ b/packages/core/src/testLint/README.md
@@ -0,0 +1,4 @@
+# Lint Tests
+
+These are linting related tests that must pass in CI. Lint code is nodejs-only, they
+must not use the vscode API.
diff --git a/packages/core/src/testLint/eslint.test.ts b/packages/core/src/testLint/eslint.test.ts
new file mode 100644
index 00000000000..fc3607008bb
--- /dev/null
+++ b/packages/core/src/testLint/eslint.test.ts
@@ -0,0 +1,46 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import assert from 'assert'
+import { runCmd } from './testUtils'
+
+describe('eslint', function () {
+    this.timeout(180_000)
+
+    it('passes eslint', function () {
+        const result = runCmd(
+            [
+                'node',
+                '--max-old-space-size=8192',
+                '../../node_modules/.bin/eslint',
+                '-c',
+                '../../.eslintrc.js',
+                // Note: eslint currently does not support multiple  --ignore-path args.
+                // Use --ignore-pattern as a workaround.
+                '--ignore-path',
+                '../../.gitignore',
+                '--ignore-pattern',
+                '**/*.json',
+                '--ignore-pattern',
+                '**/*.gen.ts',
+                '--ignore-pattern',
+                '**/types/*.d.ts',
+                '--ignore-pattern',
+                '**/src/testFixtures/**',
+                '--ext',
+                '.ts',
+                '../amazonq',
+                '../core',
+                '../toolkit',
+                // TODO: fix lint issues in scripts/
+                // '../../scripts',
+            ],
+            {
+                throws: false,
+            }
+        )
+        assert.strictEqual(result.status, 0, result.output.toString())
+    })
+})
diff --git a/packages/core/src/testLint/gitSecrets.test.ts b/packages/core/src/testLint/gitSecrets.test.ts
new file mode 100644
index 00000000000..49091665ea1
--- /dev/null
+++ b/packages/core/src/testLint/gitSecrets.test.ts
@@ -0,0 +1,132 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe } from 'mocha'
+
+import assert from 'assert'
+import * as path from 'path'
+import { platform } from 'os'
+import { existsSync, mkdirSync, unlinkSync, writeFileSync } from 'fs' // eslint-disable-line no-restricted-imports
+import { runCmd } from './testUtils'
+
+/**
+ * NOTES:
+ * - git-secrets patterns are set in the project's `.git/config` file
+ */
+describe('git-secrets', function () {
+    let accessKeyFilePath: string
+    let toolkitProjectDir: string
+    let testFixturesPath: string
+    let gitSecrets: string // path to the git-secrets executable
+
+    /** git-secrets patterns that will not cause a failure during the scan */
+    function setAllowListPatterns(gitSecrets: string) {
+        const allowListPatterns: string[] = [
+            '"accountId": "123456789012"',
+            "'accountId': '123456789012'",
+            "Account: '123456789012'",
+            "accountId: '123456789012'",
+        ]
+
+        for (const pattern of allowListPatterns) {
+            // Returns non-zero exit code if pattern already exists
+            runCmd([gitSecrets, '--add', '--allowed', pattern], { cwd: toolkitProjectDir, throws: false })
+        }
+    }
+
+    function setDenyListPatterns(gitSecrets: string) {
+        const denyListPatterns: string[] = []
+
+        for (const pattern of denyListPatterns) {
+            // Returns non-zero exit code if pattern already exists
+            runCmd([gitSecrets, '--add', pattern], { cwd: toolkitProjectDir, throws: false })
+        }
+    }
+
+    function setupTestFixturesDir(toolkitProjectDir: string) {
+        const testFixturesPath = path.join(toolkitProjectDir, 'src', 'testFixtures', 'bin')
+        mkdirSync(testFixturesPath, { recursive: true })
+        return testFixturesPath
+    }
+
+    function setupAccessKeyFile(testFixturesPath: string) {
+        const accessKeyFilePath = path.join(testFixturesPath, 'fileWithAccessKey.ts')
+        deleteFileIfExists(accessKeyFilePath)
+        return accessKeyFilePath
+    }
+
+    function setupGitSecretsExecutable(testFixturesPath: string) {
+        const gitSecretsExecutablePath = path.join(testFixturesPath, 'git-secrets')
+
+        if (existsSync(gitSecretsExecutablePath)) {
+            console.log('INFO: git-secrets already installed')
+        } else {
+            console.log('INFO: Installing git-secrets...')
+            runCmd(['mkdir', '-p', path.parse(gitSecretsExecutablePath).dir])
+            runCmd([
+                'curl',
+                '-o',
+                gitSecretsExecutablePath,
+                'https://raw.githubusercontent.com/awslabs/git-secrets/99d01d58ebcc06e237c0e3f3ff5ae628aeef6aa6/git-secrets',
+            ])
+            runCmd(['chmod', '+x', gitSecretsExecutablePath])
+        }
+
+        return gitSecretsExecutablePath
+    }
+
+    function deleteFileIfExists(filePath: string) {
+        if (existsSync(filePath)) {
+            unlinkSync(filePath)
+        }
+    }
+
+    function createFileWithSecretKey(accessKeyFilePath: string) {
+        // Create file in project that has secret key value.
+        // Need to build access key string incrementally to not trigger git-secrets.
+        const keyValue = 'yAki21XLhAIBiKvyaxr4p/ltr8OxkZTHISISFAKE'
+        const mySecretAccessKey = `const x = { "aws_secret_access_key": "${keyValue}" }`
+        const fileContent = `
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+${mySecretAccessKey}
+`.trim()
+        writeFileSync(accessKeyFilePath, fileContent)
+    }
+
+    before(function () {
+        if (platform() === 'win32') {
+            this.skip()
+        }
+
+        toolkitProjectDir = path.resolve()
+        testFixturesPath = setupTestFixturesDir(toolkitProjectDir)
+        gitSecrets = setupGitSecretsExecutable(testFixturesPath)
+        accessKeyFilePath = setupAccessKeyFile(testFixturesPath)
+
+        // Register all patterns with `git-secrets`
+        runCmd([gitSecrets, '--register-aws'], { cwd: toolkitProjectDir })
+        setDenyListPatterns(gitSecrets)
+        setAllowListPatterns(gitSecrets)
+    })
+
+    afterEach(function () {
+        deleteFileIfExists(accessKeyFilePath)
+    })
+
+    it('ensures no git secrets are found', function () {
+        const result = runCmd([gitSecrets, '--scan'], { cwd: toolkitProjectDir })
+        assert.strictEqual(result.status, 0, `Failure output: ${result.stderr.toString()}`)
+    })
+
+    it('sanity check it finds secrets', function () {
+        createFileWithSecretKey(accessKeyFilePath)
+        const result = runCmd([gitSecrets, '--scan', accessKeyFilePath], { cwd: toolkitProjectDir, throws: false })
+        assert.strictEqual(result.status, 1)
+    })
+})
diff --git a/packages/core/src/testLint/testUtils.ts b/packages/core/src/testLint/testUtils.ts
new file mode 100644
index 00000000000..a960d239945
--- /dev/null
+++ b/packages/core/src/testLint/testUtils.ts
@@ -0,0 +1,24 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { SpawnSyncOptions, spawnSync } from 'child_process' // eslint-disable-line no-restricted-imports
+
+export function runCmd(args: string[], options?: SpawnSyncOptions & { throws?: boolean }) {
+    const result = spawnSync(args[0], args.slice(1), options)
+
+    const throws = options?.throws ?? true
+    if (throws && result.status !== 0) {
+        throw new Error(`
+-----
+Error running: $ ${args.join(' ')}
+
+status: ${result.status}
+error: ${result.error?.toString()}
+stdout: ${result.stdout?.toString()}
+stderr: ${result.stderr?.toString()}
+-----`)
+    }
+    return result
+}
diff --git a/packages/core/src/testWeb/index.ts b/packages/core/src/testWeb/index.ts
new file mode 100644
index 00000000000..5a2f96dfb51
--- /dev/null
+++ b/packages/core/src/testWeb/index.ts
@@ -0,0 +1,8 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/** Web-compatible tests and test utilities. */
+
+export { timeoutUtilsDescribe } from '../test/shared/utilities/timeoutUtils.test'
diff --git a/packages/core/src/threatComposer/activation.ts b/packages/core/src/threatComposer/activation.ts
new file mode 100644
index 00000000000..b3e644959f3
--- /dev/null
+++ b/packages/core/src/threatComposer/activation.ts
@@ -0,0 +1,20 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { ThreatComposerEditorProvider } from './threatComposerEditorProvider'
+import { CreateNewThreatComposer, NewThreatComposerFile } from './commands/createNewThreatComposerFile'
+
+/**
+ * Activates the extension and registers all necessary components.
+ * @param extensionContext The extension context object.
+ */
+export async function activate(extensionContext: vscode.ExtensionContext): Promise<void> {
+    extensionContext.subscriptions.push(
+        ThreatComposerEditorProvider.register(extensionContext),
+        CreateNewThreatComposer.register(),
+        NewThreatComposerFile.register()
+    )
+}
diff --git a/packages/core/src/threatComposer/commands/createNewThreatComposerFile.ts b/packages/core/src/threatComposer/commands/createNewThreatComposerFile.ts
new file mode 100644
index 00000000000..dbcf6c29047
--- /dev/null
+++ b/packages/core/src/threatComposer/commands/createNewThreatComposerFile.ts
@@ -0,0 +1,62 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import path from 'path'
+import { Commands } from '../../shared/vscode/commands2'
+import vscode from 'vscode'
+import { ThreatComposerEditorProvider } from '../threatComposerEditorProvider'
+import fs from '../../shared/fs/fs'
+
+/**
+ * This is a helper function to create a new Threat Composer file.
+ * It first checks if a workspace has been opened, as we would need a workspace to save the file.
+ * User is then prompted for a file name that is saved in the workspace as <name>.tc.json.
+ * The new file is then opened in a Threat Composer view.
+ */
+const createNewThreatComposerFile = async () => {
+    if (vscode.workspace.workspaceFolders) {
+        const rootFolder = vscode.workspace.workspaceFolders[0].uri.fsPath
+
+        const title = await vscode.window.showInputBox({
+            prompt: 'Enter name for file',
+            validateInput: async (text) => {
+                if (text && (await fs.existsFile(path.join(rootFolder, `${text}.tc.json`)))) {
+                    return 'The specified file already exists'
+                }
+            },
+        })
+
+        if (!title) {
+            return
+        }
+
+        const fileContent = '' // Empty content would be accepted by TC which will save default structure automatically
+        const filePath = path.join(rootFolder, `${title}.tc.json`)
+        await fs.writeFile(filePath, fileContent)
+
+        await vscode.commands.executeCommand(
+            'vscode.openWith',
+            vscode.Uri.file(filePath),
+            ThreatComposerEditorProvider.viewType
+        )
+    } else {
+        void vscode.window.showErrorMessage('Workspace folder not defined')
+    }
+}
+
+/**
+ * Command to Create a new Threat Composer File through the command pallet.
+ * The only difference with `NewThreatComposerFile` is in the text that is displayed
+ */
+export const CreateNewThreatComposer = Commands.declare(
+    'aws.createNewThreatComposer',
+    () => createNewThreatComposerFile
+)
+
+/**
+ * Command to Create a new Threat Composer File through the New File option.
+ * The only difference with `CreateNewThreatComposer` is in the text that is displayed
+ */
+export const NewThreatComposerFile = Commands.declare('aws.newThreatComposerFile', () => createNewThreatComposerFile)
diff --git a/packages/core/src/threatComposer/handleMessage.ts b/packages/core/src/threatComposer/handleMessage.ts
new file mode 100644
index 00000000000..d12db251c7b
--- /dev/null
+++ b/packages/core/src/threatComposer/handleMessage.ts
@@ -0,0 +1,59 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+    Command,
+    LoadStageMessage,
+    LogMessage,
+    Message,
+    MessageType,
+    SaveFileRequestMessage,
+    WebviewContext,
+} from './types'
+import { autoSaveFileMessageHandler, saveFileMessageHandler } from './handlers/saveFileMessageHandler'
+import { logMessageHandler } from './handlers/logMessageHandler'
+import { openFeedbackMessageHandler } from './handlers/openFeedbackMessageHandler'
+import { initMessageHandler, reloadMessageHandler } from './handlers/initMessageHandler'
+import { loadStageMessageHandler } from './handlers/loadStageMessageHandler'
+
+/**
+ * Handles messages received from the webview. Depending on the message type and command, it
+ * calls the appropriate handler function
+ * @param message The message received from the webview
+ * @param context The context object containing information about the webview environment
+ */
+export async function handleMessage(message: unknown, context: WebviewContext) {
+    const composerMessage = message as Message
+
+    const { command, messageType } = composerMessage
+
+    if (messageType === MessageType.REQUEST) {
+        switch (command) {
+            case Command.AUTO_SAVE_FILE:
+                void autoSaveFileMessageHandler(message as SaveFileRequestMessage, context)
+                break
+            case Command.SAVE_FILE:
+                void saveFileMessageHandler(message as SaveFileRequestMessage, context)
+                break
+            case Command.INIT:
+                void initMessageHandler(context)
+                break
+            case Command.RELOAD:
+                void reloadMessageHandler(context)
+        }
+    } else if (messageType === MessageType.BROADCAST) {
+        switch (command) {
+            case Command.LOG:
+                void logMessageHandler(message as LogMessage, context)
+                break
+            case Command.OPEN_FEEDBACK:
+                openFeedbackMessageHandler()
+                break
+            case Command.LOAD_STAGE:
+                void loadStageMessageHandler(message as LoadStageMessage, context)
+                break
+        }
+    }
+}
diff --git a/packages/core/src/threatComposer/handlers/initMessageHandler.ts b/packages/core/src/threatComposer/handlers/initMessageHandler.ts
new file mode 100644
index 00000000000..aed5f73a8bb
--- /dev/null
+++ b/packages/core/src/threatComposer/handlers/initMessageHandler.ts
@@ -0,0 +1,66 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Command, MessageType, WebviewContext } from '../types'
+import { broadcastFileChange } from './onFileChangedHandler'
+
+/**
+ * Handler for when the Threat Composer view is ready.
+ * This handler is used to initialize the webview with the contents of the Threat Composer file
+ * selected.
+ * @param context The context object containing the necessary information for the webview.
+ */
+export async function initMessageHandler(context: WebviewContext) {
+    const filePath = context.defaultTemplatePath
+
+    try {
+        const fileContents = context.textDocument.getText().toString()
+        context.fileStates[filePath] = { fileContents: fileContents }
+        context.autoSaveFileState[filePath] = { fileContents: fileContents }
+        await broadcastFileChange(context.defaultTemplateName, filePath, fileContents, context.panel)
+        if (context.loaderNotification) {
+            context.loaderNotification.progress.report({ increment: 20 })
+        }
+    } catch (e) {
+        await context.panel.webview.postMessage({
+            messageType: MessageType.RESPONSE,
+            command: Command.INIT,
+            filePath: filePath,
+            isSuccess: false,
+            failureReason: (e as Error).message,
+        })
+    }
+}
+
+/**
+ * Handler for reloading the Threat Composer file.
+ * This handler is used to reload the Threat Composer file with the latest contents.
+ * @param context The context object containing the necessary information for the webview.
+ */
+export async function reloadMessageHandler(context: WebviewContext) {
+    const filePath = context.defaultTemplatePath
+
+    try {
+        if (!context.fileStates[filePath]) {
+            const fileContents = context.textDocument.getText().toString()
+            context.fileStates[filePath] = { fileContents: fileContents }
+        }
+
+        if (!context.autoSaveFileState[filePath]) {
+            context.autoSaveFileState[filePath] = context.fileStates[filePath]
+        }
+
+        const fileContents = context.autoSaveFileState[filePath].fileContents
+        await broadcastFileChange(context.defaultTemplateName, filePath, fileContents, context.panel)
+    } catch (e) {
+        await context.panel.webview.postMessage({
+            messageType: MessageType.RESPONSE,
+            command: Command.RELOAD,
+            filePath: filePath,
+            isSuccess: false,
+            failureReason: (e as Error).message,
+        })
+    }
+}
diff --git a/packages/core/src/threatComposer/handlers/loadStageMessageHandler.ts b/packages/core/src/threatComposer/handlers/loadStageMessageHandler.ts
new file mode 100644
index 00000000000..044180ab4fe
--- /dev/null
+++ b/packages/core/src/threatComposer/handlers/loadStageMessageHandler.ts
@@ -0,0 +1,31 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { LoadStageMessage as LoadStageMessage, WebviewContext } from '../types'
+
+/**
+ * Handler for managing the various stages of the webview.
+ * As the webview completes each stage, it sends a message to the extension, which updates the
+ * Threat Composer load notification.
+ * @param message The message containing the load stage.
+ * @param context The context object containing the necessary information for the webview.
+ */
+export async function loadStageMessageHandler(message: LoadStageMessage, context: WebviewContext) {
+    switch (message.loadStage) {
+        case 'API_LOADED':
+            if (context.loaderNotification) {
+                context.loaderNotification.progress.report({ increment: 20 })
+            }
+            break
+        case 'RENDER_COMPLETE':
+            if (context.loaderNotification) {
+                context.loaderNotification.progress.report({ increment: 30 })
+                if (context.loaderNotification.promiseResolve) {
+                    context.loaderNotification.promiseResolve()
+                }
+            }
+            break
+    }
+}
diff --git a/packages/core/src/threatComposer/handlers/logMessageHandler.ts b/packages/core/src/threatComposer/handlers/logMessageHandler.ts
new file mode 100644
index 00000000000..85ed05af104
--- /dev/null
+++ b/packages/core/src/threatComposer/handlers/logMessageHandler.ts
@@ -0,0 +1,61 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Command, LogMessage, Message, MessageType, WebviewContext } from '../types'
+import { getLogger } from '../../shared/logger/logger'
+import * as vscode from 'vscode'
+import { sendThreatComposerErrored } from './webviewTelemetryHandler'
+
+/**
+ * Handler for logging messages from the webview.
+ * @param message The message containing the log message and other metadata.
+ * @param context The context object containing the necessary information for the webview.
+ */
+export async function logMessageHandler(message: LogMessage, context: WebviewContext) {
+    const logger = getLogger()
+    switch (message.logType) {
+        case 'INFO':
+            logger.info(message.logMessage)
+            if (message.showNotification) {
+                void vscode.window.showInformationMessage(message.logMessage)
+            }
+            return
+        case 'WARNING':
+            logger.warn(message.logMessage)
+            if (message.showNotification) {
+                void vscode.window.showWarningMessage(message.logMessage)
+            }
+            return
+        case 'ERROR':
+            logger.error(message.logMessage)
+            sendThreatComposerErrored({
+                reason: message.logMessage,
+                id: context.fileId,
+            })
+            if (message.showNotification) {
+                if (message.notificationType === 'INVALID_JSON') {
+                    const selection = await vscode.window.showErrorMessage(
+                        `${message.logMessage}. Please re-open the file in a text editor or overwrite the contents of the file with Threat Composer JSON.`,
+                        'Open in default editor',
+                        'Overwrite'
+                    )
+
+                    if (selection === 'Open in default editor') {
+                        context.panel.dispose()
+                        await vscode.commands.executeCommand('vscode.openWith', context.textDocument.uri, 'default')
+                    } else if (selection === 'Overwrite') {
+                        const broadcastMessage: Message = {
+                            messageType: MessageType.BROADCAST,
+                            command: Command.OVERWRITE_FILE,
+                        }
+                        await context.panel.webview.postMessage(broadcastMessage)
+                    }
+                } else {
+                    void vscode.window.showErrorMessage(message.logMessage)
+                }
+            }
+            return
+    }
+}
diff --git a/packages/core/src/threatComposer/handlers/onFileChangedHandler.ts b/packages/core/src/threatComposer/handlers/onFileChangedHandler.ts
new file mode 100644
index 00000000000..6f40b8ddbd6
--- /dev/null
+++ b/packages/core/src/threatComposer/handlers/onFileChangedHandler.ts
@@ -0,0 +1,77 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Command, FileChangedMessage, MessageType, WebviewContext } from '../types'
+import vscode from 'vscode'
+import fs from '../../shared/fs/fs'
+import { getLogger } from '../../shared/logger/logger'
+
+/**
+ * Function to call when the text document has been modified
+ * If the change occurs due to
+ *    a user save action, file change is ignored.
+ *    an auto save that is persisted as a result of the 'AutoSave' setting turned on in VSCode,
+ *      update file state.
+ *    an external file change,
+ *       if a local, unsaved change exist in Threat Composer, the file change is ignored and the
+ *          user is warned.
+ *       if no unsaved local changes exist, the web view is notified of the external file change.
+ * @param context: The Webview Context that contain the details of the file and the webview
+ */
+export async function onFileChanged(context: WebviewContext) {
+    const filePath = context.defaultTemplatePath
+    const fileName = context.defaultTemplateName
+
+    const fileContents = await fs.readFileText(filePath)
+
+    // If the change event is due to a save action by the user, this trigger can be ignored.
+    if (fileContents !== context.fileStates[filePath].fileContents) {
+        if (fileContents === context.autoSaveFileState[filePath].fileContents) {
+            // Contents of the file are the same as that of the 'autoSaveFileState'. This
+            // means that the file change was triggered as a result of auto save, we
+            // don't have to notify the webview However, 'fileStates' need to be updated.
+            context.fileStates[filePath] = { fileContents: fileContents }
+        } else if (context.fileStates[filePath].fileContents === context.autoSaveFileState[filePath].fileContents) {
+            // There are no unsaved local changes in the file, so the file change is
+            // triggered due to an external change in the file. This must be propagated
+            // to the webview, so that it can be updated.
+            getLogger().debug('DocumentChanged')
+            await broadcastFileChange(fileName, filePath, fileContents, context.panel)
+            context.fileStates[filePath] = { fileContents: fileContents }
+            context.autoSaveFileState[filePath] = { fileContents: fileContents }
+        } else {
+            // There are unsaved local changes in the file, and the file has been
+            // changed externally. The file is currently in a dirty state. This file
+            // change trigger is ignored. When the user decides to save the local
+            // changes, they can decide to overwrite the file.
+            void vscode.window.showWarningMessage(`${fileName}  has been modified externally.`)
+            getLogger().warn('Document Changed externally before local changes are saved')
+        }
+    }
+}
+
+/**
+ * Helper Function to broadcast the file change to the Threat Composer view
+ * @param fileName: Name of the file that was changed
+ * @param filePath: The path to the file
+ * @param fileContents: The updated file contents
+ * @param panel: the panel which contains the webview to be notified.
+ */
+export async function broadcastFileChange(
+    fileName: string,
+    filePath: string,
+    fileContents: string,
+    panel: vscode.WebviewPanel
+) {
+    const fileChangedMessage: FileChangedMessage = {
+        messageType: MessageType.BROADCAST,
+        command: Command.FILE_CHANGED,
+        fileName: fileName,
+        fileContents: fileContents,
+        filePath: filePath,
+    }
+
+    await panel.webview.postMessage(fileChangedMessage)
+}
diff --git a/packages/core/src/threatComposer/handlers/onThemeChangedHandler.ts b/packages/core/src/threatComposer/handlers/onThemeChangedHandler.ts
new file mode 100644
index 00000000000..697f87d72c8
--- /dev/null
+++ b/packages/core/src/threatComposer/handlers/onThemeChangedHandler.ts
@@ -0,0 +1,35 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Command, MessageType, ThemeChangedMessage } from '../types'
+import { ColorTheme, ColorThemeKind, WebviewPanel } from 'vscode'
+
+/**
+ * Handler for theme change event. It will broadcast the theme change event to the
+ * Threat Composer webview, so that it can update the UI accordingly.
+ * @param colorTheme The updated color theme
+ * @param panel The panel which contains the webview to be notified.
+ */
+export async function onThemeChanged(colorTheme: ColorTheme, panel: WebviewPanel) {
+    const colorThemeKind = colorTheme.kind
+    const newTheme =
+        colorThemeKind === ColorThemeKind.Dark || colorThemeKind === ColorThemeKind.HighContrast ? 'dark' : 'light'
+    await broadcastThemeChange(newTheme, panel)
+}
+
+/**
+ * Helper Function to broadcast the theme change to the Threat Composer view
+ * @param newTheme: The updated theme
+ * @param panel: the panel which contains the webview to be notified.
+ */
+export async function broadcastThemeChange(newTheme: string, panel: WebviewPanel) {
+    const themeChangedMessage: ThemeChangedMessage = {
+        messageType: MessageType.BROADCAST,
+        command: Command.THEME_CHANGED,
+        newTheme: newTheme,
+    }
+
+    await panel.webview.postMessage(themeChangedMessage)
+}
diff --git a/packages/core/src/threatComposer/handlers/openFeedbackMessageHandler.ts b/packages/core/src/threatComposer/handlers/openFeedbackMessageHandler.ts
new file mode 100644
index 00000000000..4d8886f8f92
--- /dev/null
+++ b/packages/core/src/threatComposer/handlers/openFeedbackMessageHandler.ts
@@ -0,0 +1,17 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { submitFeedback } from '../../feedback/vue/submitFeedback'
+import { placeholder } from '../../shared/vscode/commands2'
+
+/**
+ * Handler for opening the feedback message.
+ * This function is responsible for submitting the feedback message
+ * to the feedback service.
+ * @returns {Promise<void>} A promise that resolves when the feedback message has been submitted.
+ */
+export function openFeedbackMessageHandler() {
+    void submitFeedback(placeholder, 'Threat Composer')
+}
diff --git a/packages/core/src/threatComposer/handlers/saveFileMessageHandler.ts b/packages/core/src/threatComposer/handlers/saveFileMessageHandler.ts
new file mode 100644
index 00000000000..dc042305aa6
--- /dev/null
+++ b/packages/core/src/threatComposer/handlers/saveFileMessageHandler.ts
@@ -0,0 +1,181 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import vscode from 'vscode'
+import {
+    Command,
+    MessageType,
+    SaveCompleteSubType,
+    SaveFileRequestMessage,
+    SaveFileResponseMessage,
+    WebviewContext,
+} from '../types'
+import { telemetry } from '../../shared/telemetry/telemetry'
+import { ToolkitError } from '../../shared/errors'
+import _ from 'lodash'
+
+/**
+ * Handler for saving a file message from the webview.
+ * This function performs the following tasks:
+ * 1. It saves the file contents to the workspace.
+ * 2. It saves the file using the `vscode` command `workbench.action.files.save`.
+ * 3. It handles the case where the file has been externally modified.
+ * 4. It sends a response message back to the webview with the save status and any failure reason.
+ * @returns {Promise<void>} A promise that resolves when the file has been saved.
+ * @param request The request message containing the file contents and path.
+ * @param context The webview context containing the necessary information for saving the file.
+ */
+export async function saveFileMessageHandler(request: SaveFileRequestMessage, context: WebviewContext) {
+    let saveCompleteSubType = SaveCompleteSubType.SAVE_FAILED
+    let saveSuccess = false
+    let errorMessage: string | undefined = undefined
+    let previousAutoSaveFileContent: string | undefined = undefined
+
+    // If filePath is empty, save contents in default template file
+    const filePath = context.defaultTemplatePath
+
+    await telemetry.threatComposer_fileSaved.run(async (span) => {
+        span.record({
+            id: context.fileId,
+            saveType: 'MANUAL_SAVE',
+        })
+
+        try {
+            if (context.fileStates[filePath] && context.autoSaveFileState[filePath]) {
+                previousAutoSaveFileContent = context.autoSaveFileState[filePath].fileContents
+
+                if (context.fileStates[filePath].fileContents !== request.fileContents) {
+                    context.autoSaveFileState[filePath] = { fileContents: request.fileContents }
+
+                    await saveWorkspace(context, request.fileContents)
+
+                    await vscode.commands.executeCommand('workbench.action.files.save')
+
+                    if (context.textDocument.isDirty) {
+                        throw new Error('Document has been modified externally')
+                    }
+
+                    void vscode.window.showInformationMessage('Threat Composer JSON has been saved')
+
+                    saveCompleteSubType = SaveCompleteSubType.SAVED
+                } else {
+                    saveCompleteSubType = SaveCompleteSubType.SAVE_SKIPPED_SAME_CONTENT
+                }
+                saveSuccess = true
+            } else {
+                throw new Error('Previous state of file not found')
+            }
+        } catch (e) {
+            if (previousAutoSaveFileContent !== undefined) {
+                context.autoSaveFileState[filePath] = { fileContents: previousAutoSaveFileContent }
+            }
+
+            errorMessage = (e as Error).message
+            saveSuccess = false
+            saveCompleteSubType = SaveCompleteSubType.SAVE_FAILED
+            void vscode.window.showErrorMessage(errorMessage)
+            throw new ToolkitError(errorMessage, { code: 'Failed to Save' })
+        } finally {
+            const saveFileResponseMessage: SaveFileResponseMessage = {
+                messageType: MessageType.RESPONSE,
+                command: Command.SAVE_FILE,
+                filePath: filePath,
+                isSuccess: saveSuccess,
+                failureReason: errorMessage,
+                saveCompleteSubType: saveCompleteSubType,
+            }
+            await context.panel.webview.postMessage(saveFileResponseMessage)
+        }
+    })
+}
+
+/**
+ * Handler for auto saving a file message from the webview.
+ * This function performs the following tasks:
+ * 1. It saves the file contents to the workspace.
+ * 2. It handles the case when the change has resulted in a similar JSON (will not save if the
+ * change is due to formatting or ordering changes that do not affect the JSON structure).
+ * 3. It sends a response message back to the webview with the save status and any failure reason.
+ * @returns {Promise<void>} A promise that resolves when the file has been saved.
+ * @param request The request message containing the file contents and path.
+ * @param context The webview context containing the necessary information for saving the file.
+ */
+export async function autoSaveFileMessageHandler(request: SaveFileRequestMessage, context: WebviewContext) {
+    let saveCompleteSubType = SaveCompleteSubType.SAVE_FAILED
+    let saveSuccess = false
+    let errorMessage: string | undefined = undefined
+    let previousAutoSaveFileContent: string | undefined = undefined
+
+    // If filePath is empty, save contents in default template file
+    const filePath = context.defaultTemplatePath
+
+    try {
+        if (context.autoSaveFileState[filePath]) {
+            previousAutoSaveFileContent = context.autoSaveFileState[filePath].fileContents
+
+            if (previousAutoSaveFileContent !== request.fileContents) {
+                let previousState
+
+                try {
+                    previousState = JSON.parse(previousAutoSaveFileContent)
+                } catch (e) {
+                    previousState = {}
+                }
+
+                const currentState = JSON.parse(request.fileContents)
+
+                if (!_.isEqual(previousState, currentState)) {
+                    context.autoSaveFileState[filePath] = { fileContents: request.fileContents }
+
+                    await saveWorkspace(context, request.fileContents)
+                    saveCompleteSubType = SaveCompleteSubType.SAVED
+                } else {
+                    saveCompleteSubType = SaveCompleteSubType.SAVE_SKIPPED_SAME_JSON
+                }
+            } else {
+                saveCompleteSubType = SaveCompleteSubType.SAVE_SKIPPED_SAME_CONTENT
+            }
+            saveSuccess = true
+        } else {
+            throw new Error('Previous state of file not found')
+        }
+    } catch (e) {
+        if (previousAutoSaveFileContent !== undefined) {
+            context.autoSaveFileState[filePath] = { fileContents: previousAutoSaveFileContent }
+        }
+
+        errorMessage = (e as Error).message
+        saveSuccess = false
+        saveCompleteSubType = SaveCompleteSubType.SAVE_FAILED
+        void vscode.window.showErrorMessage(errorMessage)
+        throw new ToolkitError(errorMessage, { code: 'Failed to Auto Save' })
+    } finally {
+        const saveFileResponseMessage: SaveFileResponseMessage = {
+            messageType: MessageType.RESPONSE,
+            command: Command.AUTO_SAVE_FILE,
+            filePath: filePath,
+            isSuccess: saveSuccess,
+            failureReason: errorMessage,
+            saveCompleteSubType: saveCompleteSubType,
+        }
+        await context.panel.webview.postMessage(saveFileResponseMessage)
+    }
+}
+
+/**
+ * Saves to the workspace with the provided file contents.
+ * @param context The webview context containing the necessary information for saving the file.
+ * @param fileContents The file contents to save.
+ */
+async function saveWorkspace(context: WebviewContext, fileContents: string) {
+    context.autoSaveFileState[context.defaultTemplatePath] = { fileContents: fileContents }
+
+    const edit = new vscode.WorkspaceEdit()
+    // Just replace the entire document every time for this example extension.
+    // A more complete extension should compute minimal edits instead.
+    edit.replace(context.textDocument.uri, new vscode.Range(0, 0, context.textDocument.lineCount, 0), fileContents)
+
+    await vscode.workspace.applyEdit(edit)
+}
diff --git a/packages/core/src/threatComposer/handlers/webviewTelemetryHandler.ts b/packages/core/src/threatComposer/handlers/webviewTelemetryHandler.ts
new file mode 100644
index 00000000000..cd5ef8a36d9
--- /dev/null
+++ b/packages/core/src/threatComposer/handlers/webviewTelemetryHandler.ts
@@ -0,0 +1,33 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { telemetry, ThreatComposerClosed, ThreatComposerError } from '../../shared/telemetry/telemetry'
+
+/**
+ * Function to send an error occurred telemetry, for errors that have occurred
+ * in the Threat Composer view.
+ * @param metadata: Error metadata, including the error reason and result
+ */
+export function sendThreatComposerErrored(metadata: ThreatComposerError) {
+    telemetry.threatComposer_error.emit({
+        result: metadata.result ?? 'Succeeded',
+        reason: metadata.reason ?? '',
+        id: metadata.id,
+    })
+}
+
+/**
+ * Function to send a cancelled telemetry when the open action is cancelled by
+ * the user. This is usually when Threat Composer takes longer than usual to open,
+ * and the user has cancelled the open action.
+ * @param metadata: Cancelled metadata, including the error reason and result
+ */
+export function sendThreatComposerOpenCancelled(metadata: ThreatComposerClosed) {
+    telemetry.threatComposer_closed.emit({
+        result: metadata.result ?? 'Succeeded',
+        reason: metadata.reason ?? '',
+        id: metadata.id,
+    })
+}
diff --git a/packages/core/src/threatComposer/threatComposerEditor.ts b/packages/core/src/threatComposer/threatComposerEditor.ts
new file mode 100644
index 00000000000..6bfb9ce9732
--- /dev/null
+++ b/packages/core/src/threatComposer/threatComposerEditor.ts
@@ -0,0 +1,233 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nls from 'vscode-nls'
+import * as path from 'path'
+import * as vscode from 'vscode'
+import { handleMessage } from './handleMessage'
+import { FileWatchInfo, WebviewContext } from './types'
+import { telemetry } from '../shared/telemetry/telemetry'
+import { onFileChanged } from './handlers/onFileChangedHandler'
+import { onThemeChanged } from './handlers/onThemeChangedHandler'
+import { sendThreatComposerOpenCancelled } from './handlers/webviewTelemetryHandler'
+import { getLogger } from '../shared/logger/logger'
+
+const localize = nls.loadMessageBundle()
+
+/**
+ * The main class for the Threat Composer Editor. This class handles the creation and management
+ * of the webview panel for the Threat Composer Editor. It also handles the communication
+ * between the webview and the extension context. This class also stores the state of the
+ * tc.json file, that is being edited in the webview panel, in the property 'fileStates'. The
+ * 'autoSaveFileStates' property is used to store local changes that are being made in the
+ * webview panel.
+ */
+export class ThreatComposerEditor {
+    public readonly documentUri: vscode.Uri
+    public webviewPanel: vscode.WebviewPanel
+    protected readonly disposables: vscode.Disposable[] = []
+    protected isPanelDisposed = false
+    private readonly onVisualizationDisposeEmitter = new vscode.EventEmitter<void>()
+    private fileId: string
+    public workSpacePath: string
+    public defaultTemplatePath: string
+    public defaultTemplateName: string
+    // fileStates is used to store the state of the file being edited and achieve bi-direction sync
+    public fileStates: Record<string, FileWatchInfo>
+    // autoSaveFileStates is used to store local changes that are being made in the webview panel.
+    public autoSaveFileStates: Record<string, FileWatchInfo>
+    private getWebviewContent: () => Promise<string>
+
+    public constructor(
+        textDocument: vscode.TextDocument,
+        webviewPanel: vscode.WebviewPanel,
+        context: vscode.ExtensionContext,
+        fileId: string,
+        getWebviewContent: () => Promise<string>
+    ) {
+        this.getWebviewContent = getWebviewContent
+        this.documentUri = textDocument.uri
+        this.webviewPanel = webviewPanel
+        this.fileStates = {}
+        this.autoSaveFileStates = {}
+        this.workSpacePath = path.dirname(textDocument.uri.fsPath)
+        this.defaultTemplatePath = textDocument.uri.fsPath
+        this.defaultTemplateName = path.basename(this.defaultTemplatePath)
+        this.fileId = fileId
+
+        this.setupWebviewPanel(textDocument, context)
+    }
+
+    public get onVisualizationDisposeEvent(): vscode.Event<void> {
+        return this.onVisualizationDisposeEmitter.event
+    }
+
+    public getPanel(): vscode.WebviewPanel | undefined {
+        if (!this.isPanelDisposed) {
+            return this.webviewPanel
+        }
+    }
+
+    public showPanel(): void {
+        this.getPanel()?.reveal()
+    }
+
+    public async refreshPanel(context: vscode.ExtensionContext) {
+        if (!this.isPanelDisposed) {
+            this.webviewPanel.dispose()
+            const document = await vscode.workspace.openTextDocument(this.documentUri)
+            this.setupWebviewPanel(document, context)
+        }
+    }
+
+    protected getText(textDocument: vscode.TextDocument): string {
+        return textDocument.getText()
+    }
+
+    /**
+     * Sets up the webview panel for the Threat Composer Editor. This includes creating the
+     * panel, setting up the webview content, and handling the communication between the webview
+     * and the extension context.
+     * @param textDocument The text document to be displayed in the webview panel.
+     * @param context The extension context.
+     * @private
+     */
+    private setupWebviewPanel(textDocument: vscode.TextDocument, context: vscode.ExtensionContext) {
+        const documentUri = textDocument.uri
+
+        const contextObject: WebviewContext = {
+            panel: this.webviewPanel,
+            textDocument: textDocument,
+            disposables: this.disposables,
+            workSpacePath: this.workSpacePath,
+            defaultTemplatePath: this.defaultTemplatePath,
+            defaultTemplateName: this.defaultTemplateName,
+            fileStates: this.fileStates,
+            autoSaveFileState: this.autoSaveFileStates,
+            loaderNotification: undefined,
+            fileId: this.fileId,
+        }
+
+        async function cancelOpenInThreatComposer(reason: string) {
+            contextObject.panel.dispose()
+            await vscode.commands.executeCommand('vscode.openWith', documentUri, 'default')
+            sendThreatComposerOpenCancelled({
+                reason: reason,
+                id: contextObject.fileId,
+            })
+        }
+
+        void vscode.window.withProgress(
+            {
+                location: vscode.ProgressLocation.Notification,
+                title: 'Opening file in Threat Composer',
+                cancellable: true,
+            },
+            (progress, token) => {
+                token.onCancellationRequested(async () => {
+                    getLogger().debug('User canceled opening in TC operation')
+                    await cancelOpenInThreatComposer('User canceled opening in THreatComposer operation')
+                })
+
+                progress.report({ increment: 0 })
+
+                return new Promise<void>(async (resolve) => {
+                    contextObject.loaderNotification = {
+                        progress: progress,
+                        cancellationToken: token,
+                        promiseResolve: () => {
+                            resolve()
+                        },
+                    }
+
+                    // Initialise the panel panel
+                    this.initialiseVisualizationWebviewPanel(documentUri, context)
+
+                    // Hook up event handlers so that we can synchronize the webview with the text document.
+                    //
+                    // The text document acts as our model, so we have to sync change in the document to our
+                    // editor and sync changes in the editor back to the document.
+                    //
+                    // Remember that a single text document can also be shared between multiple custom
+                    // editors (this happens for example when you split a custom editor)
+
+                    contextObject.disposables.push(
+                        vscode.workspace.onDidChangeTextDocument(async () => {
+                            await onFileChanged(contextObject)
+                        })
+                    )
+
+                    // Hook up event handler to update the UI on theme changes within VSCode.
+                    contextObject.disposables.push(
+                        vscode.window.onDidChangeActiveColorTheme(async (data) => {
+                            await onThemeChanged(data, contextObject.panel)
+                        })
+                    )
+
+                    // Handle messages from the webview
+                    this.disposables.push(
+                        this.webviewPanel.webview.onDidReceiveMessage((message) =>
+                            handleMessage(message, contextObject)
+                        )
+                    )
+
+                    // When the panel is closed, dispose of any disposables/remove subscriptions
+                    const disposePanel = async () => {
+                        if (this.isPanelDisposed) {
+                            return
+                        }
+
+                        await telemetry.threatComposer_closed.run(async (span) => {
+                            span.record({
+                                id: this.fileId,
+                            })
+                            this.isPanelDisposed = true
+                            contextObject.loaderNotification?.promiseResolve()
+                            this.onVisualizationDisposeEmitter.fire()
+                            for (const disposable of this.disposables) {
+                                disposable.dispose()
+                            }
+                            this.onVisualizationDisposeEmitter.dispose()
+                        })
+                    }
+
+                    this.disposables.push(
+                        this.webviewPanel.onDidDispose(async () => {
+                            await disposePanel()
+                        })
+                    )
+
+                    progress.report({ increment: 10 })
+
+                    // Set the initial html for the webpage
+                    this.webviewPanel.webview.html = await this.getWebviewContent()
+
+                    progress.report({ increment: 20 })
+                })
+            }
+        )
+    }
+
+    /**
+     * Initialises the webview panel for the Threat Composer Editor. This includes setting up the
+     * panel's title and webview options.
+     * @param documentUri
+     * @param context
+     * @private
+     */
+    private initialiseVisualizationWebviewPanel(documentUri: vscode.Uri, context: vscode.ExtensionContext) {
+        // Setup initial content for the webview
+        this.webviewPanel.webview.options = {
+            enableScripts: true,
+            localResourceRoots: [context.extensionUri],
+        }
+
+        this.webviewPanel.title = localize(
+            'AWS.threatComposer.page.title',
+            '{0} (Threat Composer)',
+            path.basename(documentUri.fsPath)
+        )
+    }
+}
diff --git a/packages/core/src/threatComposer/threatComposerEditorProvider.ts b/packages/core/src/threatComposer/threatComposerEditorProvider.ts
new file mode 100644
index 00000000000..a742e17b40c
--- /dev/null
+++ b/packages/core/src/threatComposer/threatComposerEditorProvider.ts
@@ -0,0 +1,186 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import * as nls from 'vscode-nls'
+import fs from '../shared/fs/fs'
+import request from '../shared/request'
+import { getLogger } from '../shared/logger/logger'
+import { ThreatComposerEditor } from './threatComposerEditor'
+import { ToolkitError } from '../shared/errors'
+import { telemetry } from '../shared/telemetry/telemetry'
+import { getClientId } from '../shared/telemetry/util'
+import { getRandomString, getStringHash } from '../shared/utilities/textUtilities'
+import globals from '../shared/extensionGlobals'
+
+const localize = nls.loadMessageBundle()
+
+// Change this to true for local dev
+const isLocalDev = false
+const localhost = 'http://127.0.0.1:3000'
+const cdn = 'https://ide-toolkits.threat-composer.aws.dev'
+let clientId = ''
+
+/**
+ * Provider for ThreatComposer editors.
+ *
+ * ThreatComposer editor is used for `.tc.json` files, which are just json files.
+ * To get started, run this extension and open an empty `.tc.json` file in VS Code.
+ */
+export class ThreatComposerEditorProvider implements vscode.CustomTextEditorProvider {
+    public static readonly viewType = 'threatComposer.tc.json'
+
+    /**
+     * Registers a new custom editor provider for `.tc.json` files.
+     * @remarks This should only be called once per extension.
+     * @param context The extension context
+     */
+    public static register(context: vscode.ExtensionContext): vscode.Disposable {
+        const provider = new ThreatComposerEditorProvider(context)
+        return vscode.window.registerCustomEditorProvider(ThreatComposerEditorProvider.viewType, provider, {
+            webviewOptions: {
+                enableFindWidget: true,
+                retainContextWhenHidden: true, // Set to 'false' to re-render on tab switch
+            },
+        })
+    }
+
+    protected readonly name: string = 'ThreatComposerManager'
+    protected readonly managedVisualizations = new Map<string, ThreatComposerEditor>()
+    protected extensionContext: vscode.ExtensionContext
+    protected webviewHtml: string
+    protected readonly logger = getLogger()
+
+    constructor(context: vscode.ExtensionContext) {
+        this.extensionContext = context
+        this.webviewHtml = ''
+    }
+
+    /**
+     * Fetches the webview HTML from the CDN or local server.
+     * @private
+     */
+    private async fetchWebviewHtml() {
+        const source = isLocalDev ? localhost : cdn
+        const response = await request.fetch('GET', `${source}/index.html`).response
+        this.webviewHtml = await response.text()
+
+        for (const visualization of this.managedVisualizations.values()) {
+            await visualization.refreshPanel(this.extensionContext)
+        }
+    }
+
+    /**
+     * Gets the webview content for the Threat Composer Editor.
+     * @private
+     */
+    private getWebviewContent = async () => {
+        if (!this.webviewHtml) {
+            await this.fetchWebviewHtml()
+        }
+        let htmlFileSplit = this.webviewHtml.split('<head>')
+
+        // Set asset source to CDN
+        const source = isLocalDev ? localhost : cdn
+        const baseTag = `<base href='${source}'/>`
+
+        // Set dark mode, locale, and feature flags
+        const locale = vscode.env.language
+        const localeTag = `<meta name='locale' content='${locale}'>`
+        const theme = vscode.window.activeColorTheme.kind
+        const isDarkMode = theme === vscode.ColorThemeKind.Dark || theme === vscode.ColorThemeKind.HighContrast
+        const darkModeTag = `<meta name='dark-mode' content='${isDarkMode}'>`
+        let html = `${htmlFileSplit[0]} <head> ${baseTag} ${localeTag} ${darkModeTag} ${htmlFileSplit[1]}`
+
+        const nonce = getRandomString()
+        htmlFileSplit = html.split("script-src 'self'")
+
+        let localDevURL = ''
+        if (isLocalDev) {
+            localDevURL = ` ${localhost}`
+        }
+
+        html = `${htmlFileSplit[0]} script-src 'self' 'nonce-${nonce}' ${localDevURL} ${htmlFileSplit[1]}`
+
+        htmlFileSplit = html.split('<body>')
+        const script = await fs.readFileText(
+            vscode.Uri.joinPath(this.extensionContext.extensionUri, 'resources', 'js', 'vsCodeExtensionInterface.js')
+        )
+
+        return `${htmlFileSplit[0]} <body> <script nonce='${nonce}'>${script}</script> ${htmlFileSplit[1]}`
+    }
+
+    /**
+     * Called when our custom editor is opened.
+     * @param document:  The document to be displayed in the editor.
+     * @param webviewPanel: The webview panel that the editor should be displayed in.
+     * @param _token: A cancellation token that can be used to cancel the editor.
+     * @returns A promise that resolves when the editor is resolved.
+     */
+    public async resolveCustomTextEditor(
+        document: vscode.TextDocument,
+        webviewPanel: vscode.WebviewPanel,
+        _token: vscode.CancellationToken
+    ): Promise<void> {
+        await telemetry.threatComposer_opened.run(async (span) => {
+            if (!this.webviewHtml) {
+                await this.fetchWebviewHtml()
+            }
+
+            if (clientId === '') {
+                clientId = getClientId(globals.globalState)
+            }
+            // Attempt to retrieve existing visualization if it exists.
+            const existingVisualization = this.getExistingVisualization(document.uri.fsPath)
+            if (existingVisualization) {
+                existingVisualization.showPanel()
+            } else {
+                // Existing visualization does not exist, construct new visualization
+                try {
+                    const fileId = getStringHash(`${document.uri.fsPath}${clientId}`)
+                    const newVisualization = new ThreatComposerEditor(
+                        document,
+                        webviewPanel,
+                        this.extensionContext,
+                        fileId,
+                        this.getWebviewContent
+                    )
+                    this.handleNewVisualization(document.uri.fsPath, newVisualization)
+                    span.record({ id: fileId })
+                } catch (err) {
+                    this.handleErr(err as Error)
+                    throw new ToolkitError((err as Error).message, { code: 'Failed to Open Threat Composer' })
+                }
+            }
+        })
+    }
+
+    protected handleErr(err: Error): void {
+        void vscode.window.showInformationMessage(
+            localize(
+                'AWS.threatComposer.visualisation.errors.rendering',
+                'There was an error rendering Threat Composer, check logs for details.'
+            )
+        )
+        this.logger.error(`${this.name}: Unable to open in ThreatComposer view: ${err}`)
+    }
+
+    protected handleNewVisualization(key: string, visualization: ThreatComposerEditor): void {
+        this.managedVisualizations.set(key, visualization)
+
+        const visualizationDisposable = visualization.onVisualizationDisposeEvent(() => {
+            this.managedVisualizations.delete(key)
+        })
+        this.pushToExtensionContextSubscriptions(visualizationDisposable)
+    }
+
+    protected pushToExtensionContextSubscriptions(visualizationDisposable: vscode.Disposable): void {
+        this.extensionContext.subscriptions.push(visualizationDisposable)
+    }
+
+    protected getExistingVisualization(key: string): ThreatComposerEditor | undefined {
+        return this.managedVisualizations.get(key)
+    }
+}
diff --git a/packages/core/src/threatComposer/types.ts b/packages/core/src/threatComposer/types.ts
new file mode 100644
index 00000000000..c0358a67b88
--- /dev/null
+++ b/packages/core/src/threatComposer/types.ts
@@ -0,0 +1,144 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as vscode from 'vscode'
+
+export type WebviewContext = {
+    panel: vscode.WebviewPanel
+    textDocument: vscode.TextDocument
+    disposables: vscode.Disposable[]
+    workSpacePath: string
+    defaultTemplatePath: string
+    defaultTemplateName: string
+    fileStates: Record<string, FileWatchInfo>
+    autoSaveFileState: Record<string, FileWatchInfo>
+    loaderNotification: undefined | LoaderNotification
+    fileId: string
+}
+
+export type LoaderNotification = {
+    progress: vscode.Progress<{
+        message?: string | undefined
+        increment?: number | undefined
+    }>
+    cancellationToken: vscode.CancellationToken
+    promiseResolve: any
+}
+
+export type FileWatchInfo = {
+    fileContents: string
+}
+
+export interface Message {
+    command: Command
+    messageType: MessageType
+}
+
+export enum Command {
+    AUTO_SAVE_FILE = 'AUTO_SAVE_FILE',
+    SAVE_FILE = 'SAVE_FILE',
+    LOG = 'LOG',
+    EMIT_TELEMETRY = 'EMIT_TELEMETRY',
+    OPEN_FEEDBACK = 'OPEN_FEEDBACK',
+    INIT = 'INIT',
+    RELOAD = 'RELOAD',
+    LOAD_STAGE = 'LOAD_STAGE',
+
+    FILE_CHANGED = 'FILE_CHANGED',
+    THEME_CHANGED = 'THEME_CHANGED',
+    OVERWRITE_FILE = 'OVERWRITE_FILE',
+}
+
+export enum MessageType {
+    REQUEST = 'REQUEST',
+    RESPONSE = 'RESPONSE',
+    BROADCAST = 'BROADCAST',
+}
+
+enum TelemetryType {
+    GENERATE_CLICKED = 'GENERATE_CLICKED',
+    REGENERATE_CLICKED = 'REGENERATE_CLICKED',
+    GENERATE_ACCEPTED = 'GENERATE_ACCEPTED',
+    GENERATE_REJECTED = 'GENERATE_REJECTED',
+    INVALID_GENERATION = 'INVALID_GENERATION',
+    POST_PROCESS = 'POST_PROCESS',
+    CUSTOMER_READY = 'CUSTOMER_READY',
+    FPS = 'FPS',
+    ADD_RESOURCE = 'ADD_RESOURCE',
+    ADD_CONNECTION = 'ADD_CONNECTION',
+    OPEN_WFS = 'OPEN_WFS',
+    CLOSE_WFS = 'CLOSE_WFS',
+}
+
+export enum SaveCompleteSubType {
+    SAVED = 'SAVED',
+    SAVE_SKIPPED_SAME_CONTENT = 'SAVE_SKIPPED_SAME_CONTENT',
+    SAVE_SKIPPED_SAME_JSON = 'SAVE_SKIPPED_SAME_JSON',
+    SAVE_FAILED = 'SAVE_FAILED',
+}
+
+export interface SaveFileResponseMessage extends Message {
+    filePath: string
+    isSuccess: boolean
+    saveCompleteSubType: SaveCompleteSubType
+    failureReason?: string
+}
+
+export interface FileChangedMessage extends Message {
+    fileName: string
+    fileContents: string
+    filePath: string
+}
+
+export interface ThemeChangedMessage extends Message {
+    newTheme: string
+}
+
+export interface SaveFileRequestMessage extends Message {
+    fileContents: string
+}
+
+export interface AddFileWatchRequestMessage extends Message {
+    eventId: string
+    fileName: string
+}
+
+export interface NotifyUserRequestMessage extends Message {
+    eventId?: string
+    notification: string
+    notificationType: 'INFO' | 'WARNING' | 'ERROR'
+}
+
+export interface LogMessage extends Message {
+    eventId?: string
+    logMessage: string
+    logType: 'INFO' | 'WARNING' | 'ERROR'
+    showNotification: boolean
+    notificationType: 'INVALID_JSON' | undefined
+}
+
+export interface EmitTelemetryMessage extends Message {
+    eventId?: string
+    eventType: TelemetryType
+    metadata?: string
+}
+
+export interface LoadStageMessage extends Message {
+    loadStage: 'API_LOADED' | 'RENDER_COMPLETE'
+}
+
+export interface ReferenceDetails {
+    title: string | undefined
+    url: string | undefined
+    snippet?: string
+}
+
+export interface GenerateResourceResponseMessage extends Message {
+    chatResponse: string
+    references: ReferenceDetails[]
+    metadata: object
+    isSuccess: boolean
+    errorMessage?: string
+    traceId: string
+}
diff --git a/packages/core/src/web/README.md b/packages/core/src/web/README.md
new file mode 100644
index 00000000000..0b97220b81f
--- /dev/null
+++ b/packages/core/src/web/README.md
@@ -0,0 +1,17 @@
+# Web
+
+There is currently no reason to add any other files to this folder other than `package.json`.
+
+## `package.json`
+
+To create a separation of concerns, we put web specific dependencies in the [web
+`package.json`](./package.json) from the [root `package.json`](../../package.json). Now web
+specific dependencies aren't mixed in with the non-web specific dependencies in the root.
+
+To do this we use the built-in `npm` [`workspace`](https://docs.npmjs.com/cli/v7/using-npm/workspaces) functionality, which allows us to create linked packages within the same project.
+Now, an `npm install` will install all dependencies from the root `package.json` as well as all
+dependencies from the workspace `package.json`s in a single go.
+
+### How to add a Web specific dependency
+
+While in the project root, run `npm install {MODULE} --workspace packages/core/src/web`.
diff --git a/packages/core/src/web/package.json b/packages/core/src/web/package.json
new file mode 100644
index 00000000000..97cae5d68ef
--- /dev/null
+++ b/packages/core/src/web/package.json
@@ -0,0 +1,15 @@
+{
+    "name": "web-toolkit",
+    "description": "Browser specific modules to separate concerns from main package.json",
+    "license": "Apache-2.0",
+    "dependencies": {
+        "crypto-browserify": "^3.12.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "^1.0.1",
+        "process": "^0.11.10",
+        "stream-browserify": "^3.0.0"
+    },
+    "devDependencies": {
+        "assert": "^2.1.0"
+    }
+}
diff --git a/packages/core/src/webviews/client.ts b/packages/core/src/webviews/client.ts
new file mode 100644
index 00000000000..e68935cf658
--- /dev/null
+++ b/packages/core/src/webviews/client.ts
@@ -0,0 +1,212 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { EventEmitter } from 'vscode'
+import { WebviewApi } from 'vscode-webview'
+import { ClassToProtocol, VueWebview } from './main'
+import { Protocol } from './server'
+
+declare const vscode: WebviewApi<any>
+
+interface MessageBase<U extends string = string> {
+    id: string
+    command: U
+}
+
+export interface Message<T = any, U extends string = string> extends MessageBase<U> {
+    data: T | Error
+    event?: false
+    error?: boolean
+}
+
+interface EventMessage<T = any, U extends string = string> extends MessageBase<U> {
+    event: true
+    data: T
+    command: U
+}
+
+/**
+ * Message used for delivering errors. The `data` field is a stringified `Error`.
+ * Currently only `Error` instances are rebuilt, though it is possible to extend this.
+ */
+interface ErrorMessage<U extends string = string> extends MessageBase<U> {
+    error: true
+    data: string
+    command: U
+}
+
+type ClientCommands<T> = {
+    readonly [P in keyof T]: T[P] extends EventEmitter<infer P>
+        ? (listener: (e: P) => void) => Promise<{ dispose: () => void }>
+        : OmitThisParameter<T[P]> extends (...args: infer P) => infer R
+          ? (...args: P) => R extends Promise<any> ? R : Promise<R>
+          : never
+}
+
+export type WebviewClient<T> = ClientCommands<T>
+/**
+ * Used to create a new 'WebviewClient' to communicate with the backend.
+ */
+export class WebviewClientFactory {
+    /** Used to generate unique ids per request/message. */
+    private static counter = 0
+    /** Set to true the first time a client is created. */
+    private static initialized = false
+    /** All listeners (except the 'global' commands) registered to `message`. */
+    private static messageListeners: Set<() => any> = new Set()
+
+    /**
+     * Sets up 'global' commands used internally for special functionality that is otherwise
+     * not exposed to the frontend or backend code.
+     */
+    private static registerGlobalCommands() {
+        const remountEvent = new Event('remount')
+
+        window.addEventListener('message', (event: { data: Message }) => {
+            const { command } = event.data
+            if (command === '$clear') {
+                vscode.setState({})
+                for (const listener of this.messageListeners) {
+                    this.removeListener(listener)
+                }
+                window.dispatchEvent(remountEvent)
+            }
+        })
+    }
+
+    /**
+     * Adds a new listener to the `message` event.
+     */
+    private static addListener(listener: (...args: any) => void): void {
+        this.messageListeners.add(listener)
+        window.addEventListener('message', listener)
+    }
+
+    /**
+     * Removes the listener from the backing store and unregisters it from the window.
+     */
+    private static removeListener(listener: (...args: any) => void): void {
+        this.messageListeners.delete(listener)
+        window.removeEventListener('message', listener)
+    }
+
+    /**
+     * Sends a request to the backend server. This effectively wraps a 'message' event into a Promise.
+     * Registered listeners are automatically disposed of after receiving the desired message. Arguments
+     * are 'de-proxied' and parsed into plain objects.
+     *
+     * If no response has been received after 5 minutes, the Promise is rejected and listener removed.
+     *
+     * @param id Message ID. Should be unique to each individual request.
+     * @param command Identifier associated with the backend command.
+     * @param args Arguments to pass to the backend command.
+     *
+     * @returns The backend's response as a Promise.
+     */
+    private static sendRequest<T extends any[], R, U extends string>(
+        id: string,
+        command: U,
+        args: T
+    ): Promise<R | { dispose: () => void }> {
+        const deproxied = JSON.parse(JSON.stringify(args))
+        const response = new Promise<R | { dispose: () => void }>((resolve, reject) => {
+            const listener = (event: { data: Message<R, U> | ErrorMessage<U> }) => {
+                const message = event.data
+
+                if (id !== message.id) {
+                    return
+                }
+
+                this.removeListener(listener)
+                window.clearTimeout(timeout)
+
+                if (message.error === true) {
+                    const revived = JSON.parse(message.data as string)
+                    reject(new Error(revived.message))
+                } else if (message.event) {
+                    if (typeof args[0] !== 'function') {
+                        reject(new Error(`Expected frontend event handler to be a function: ${command}`))
+                    }
+                    resolve(this.registerEventHandler(command, args[0]))
+                } else {
+                    resolve(message.data as R) // TODO: interfaces need a bit of refinement in terms of types
+                }
+            }
+
+            const timeout = setTimeout(() => {
+                this.removeListener(listener)
+                reject(new Error(`Timed out while waiting for response: id: ${id}, command: ${command}`))
+            }, 300000)
+
+            this.addListener(listener)
+        })
+
+        vscode.postMessage({ id, command, data: deproxied } as Message<T, U>)
+        return response
+    }
+
+    private static registerEventHandler<T extends (e: R) => void, R, U extends string>(
+        command: U,
+        args: T
+    ): { dispose: () => void } {
+        const listener = (event: { data: Message<R, U> | EventMessage<R, U> }) => {
+            const message = event.data
+
+            if (message.command !== command) {
+                return
+            }
+
+            if (!message.event) {
+                throw new Error(`Expected backend handler to be an event emitter: ${command}`)
+            }
+
+            args(message.data)
+        }
+        this.addListener(listener)
+
+        return { dispose: () => this.removeListener(listener) }
+    }
+
+    /**
+     * Creates a new client. These clients are defined by their types; they do not have any knowledge
+     * of the backend protocol other than the specified type.
+     */
+    public static create<T extends VueWebview>(): WebviewClient<ClassToProtocol<T>>
+    public static create<T extends ClientCommands<T>>(): WebviewClient<T>
+    public static create<T extends Protocol>(): WebviewClient<T> {
+        if (!this.initialized) {
+            this.initialized = true
+            this.registerGlobalCommands()
+        }
+
+        return new Proxy(
+            {},
+            {
+                set: () => {
+                    throw new TypeError('Cannot set property to webview client')
+                },
+                get: (_, prop) => {
+                    if (typeof prop !== 'string') {
+                        // Disable because we cannot log to extension in a webview.
+                        // eslint-disable-next-line aws-toolkits/no-console-log
+                        console.warn(`Tried to index webview client with non-string property: ${String(prop)}`)
+                        return
+                    }
+
+                    if (prop === 'init') {
+                        const state = vscode.getState() ?? {}
+                        if (state['__once']) {
+                            return () => Promise.resolve()
+                        }
+                        vscode.setState(Object.assign(state, { __once: true }))
+                    }
+
+                    const id = (this.counter++).toString()
+                    return (...args: any) => this.sendRequest(id, prop, args)
+                },
+            }
+        ) as WebviewClient<T>
+    }
+}
diff --git a/src/webviews/components/settingsPanel.vue b/packages/core/src/webviews/components/settingsPanel.vue
similarity index 91%
rename from src/webviews/components/settingsPanel.vue
rename to packages/core/src/webviews/components/settingsPanel.vue
index 1b4340753b7..6016454db02 100644
--- a/src/webviews/components/settingsPanel.vue
+++ b/packages/core/src/webviews/components/settingsPanel.vue
@@ -1,4 +1,4 @@
-/*! * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */
+/*! * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */
 
 <template>
     <div :id="id" class="settings-panel">
@@ -100,7 +100,9 @@ export default defineComponent({
     padding: 0;
 }
 .sub-pane {
-    transition: max-height 0.5s, padding 0.5s;
+    transition:
+        max-height 0.5s,
+        padding 0.5s;
     padding: 1rem;
     overflow: hidden;
 }
@@ -111,13 +113,18 @@ export default defineComponent({
     max-height: var(--max-height);
 }
 .collapse-leave-active {
-    transition: max-height 0.5s, visibility 0.5s, padding 0.5s;
+    transition:
+        max-height 0.5s,
+        visibility 0.5s,
+        padding 0.5s;
     visibility: hidden;
     padding: 0 1rem;
     max-height: 0;
 }
 .collapse-enter-active {
-    transition: max-height 0.5s, padding 0.5s;
+    transition:
+        max-height 0.5s,
+        padding 0.5s;
     max-height: 0;
     padding: 0 1rem;
 }
@@ -141,6 +148,7 @@ input[type='checkbox'] ~ label .collapse-button {
     color: var(--vscode-foreground);
     transition: transform 0.5s;
     transform: rotate(180deg);
+    text-align: right;
 }
 
 input[type='checkbox']:checked ~ label .collapse-button {
diff --git a/src/webviews/components/validatedInput.vue b/packages/core/src/webviews/components/validatedInput.vue
similarity index 100%
rename from src/webviews/components/validatedInput.vue
rename to packages/core/src/webviews/components/validatedInput.vue
diff --git a/packages/core/src/webviews/main.ts b/packages/core/src/webviews/main.ts
new file mode 100644
index 00000000000..2b78eb42df8
--- /dev/null
+++ b/packages/core/src/webviews/main.ts
@@ -0,0 +1,566 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { Protocol, registerWebviewServer } from './server'
+import { getIdeProperties } from '../shared/extensionUtilities'
+import { getFunctions } from '../shared/utilities/classUtils'
+import { telemetry } from '../shared/telemetry/telemetry'
+import { randomUUID } from '../shared/crypto'
+import { Timeout } from '../shared/utilities/timeoutUtils'
+import globals from '../shared/extensionGlobals'
+
+interface WebviewParams {
+    /**
+     * The entry-point into the webview.
+     */
+    webviewJs: string
+
+    /**
+     * Stylesheets to use in addition to "base.css".
+     */
+    cssFiles?: string[]
+
+    /**
+     * Additional JS files to loaded in.
+     */
+    libFiles?: string[]
+}
+
+interface WebviewPanelParams extends WebviewParams {
+    /**
+     * ID of the webview which should be globally unique per view.
+     */
+    id: string
+
+    /**
+     * Title of the webview panel. This is shown in the editor tab.
+     */
+    title: string
+
+    /**
+     * Preserves the webview when not focused by the user.
+     *
+     * This has a performance penalty and should be avoided.
+     */
+    retainContextWhenHidden?: boolean
+
+    /**
+     * View column to initally show the view in. Defaults to split view.
+     */
+    viewColumn?: vscode.ViewColumn
+}
+
+interface WebviewViewParams extends WebviewParams {
+    /**
+     * ID of the webview which must be the same as the one used in `package.json`.
+     */
+    id: string
+
+    /**
+     * Title of the view. Defaults to the title set in `package.json` is not provided.
+     */
+    title?: string
+
+    /**
+     * Optional 'description' text applied to the title.
+     */
+    description?: string
+}
+
+export interface VueWebviewPanel<T extends VueWebview = VueWebview> {
+    setup(webview: vscode.Webview): Promise<void>
+    /**
+     * Shows the webview with the given parameters.
+     *
+     * @returns A Promise that is resolved once the view is closed.
+     */
+    show(params: Omit<WebviewPanelParams, 'id' | 'webviewJs'>): Promise<vscode.WebviewPanel>
+
+    /**
+     * Forces a reload of the Vue runtime, resetting saved state without reloading the whole webview.
+     */
+    clear(): Promise<boolean>
+
+    /**
+     * The backend {@link VueWebview proxy} connected to this instance
+     */
+    readonly server: T
+}
+
+export interface VueWebviewView<T extends VueWebview = VueWebview> {
+    /**
+     * Registers the webview with VS Code.
+     *
+     * The view will not be rendered untl this is called.
+     */
+    register(params?: Partial<Omit<WebviewViewParams, 'id' | 'webviewJs'>>): vscode.Disposable
+
+    /**
+     * Event fired whenever the associated view is resolved.
+     *
+     * This can happen when the view first becomes visisble or when it is hidden and revealed again.
+     */
+    readonly onDidResolveView: vscode.Event<vscode.WebviewView>
+
+    /**
+     * The backend {@link VueWebview proxy} connected to this instance
+     */
+    readonly server: T
+}
+
+/**
+ * Base class used to define client/server bindings for webviews.
+ *
+ * Sub-classes can be used to create new classes with fully-resolved bindings:
+ * ```ts
+ * class MyVueWebview extends VueWebview {
+ *     public readonly id = 'foo'
+ *     public readonly source = 'foo.js'
+ *
+ *     public constructor(private readonly myData: string) {
+ *         super()
+ *     }
+ *
+ *     public getMyData() {
+ *         return this.myData
+ *     }
+ * }
+ *
+ * const Panel = VueWebview.compilePanel(MyVueWebview)
+ * const view = new Panel(context, 'data')
+ * view.show({ title: 'Foo' })
+ * ```
+ *
+ * The unbound class type should then be used on the frontend:
+ * ```ts
+ * const client = WebviewClientFactory.create<MyVueWebview>()
+ *
+ * defineComponent({
+ *   async created() {
+ *       const data = await client.getMyData()
+ *       console.log(data)
+ *   },
+ * })
+ * ```
+ *
+ */
+export abstract class VueWebview {
+    /**
+     * A unique identifier to associate with the webview.
+     *
+     * This must be the same as the `id` in `package.json` when using a WebviewView.
+     */
+    public abstract readonly id: string
+
+    /**
+     * Implementations must override this field to `true` if the webview can support
+     * {@link telemetry.toolkit_didLoadModule}.
+     * A webview that supports this will call {@link setDidLoad}
+     * to confirm the UI has successfully loaded.
+     */
+    public supportsLoadTelemetry: boolean = false
+    /**
+     * The metadata used to connect {@link telemetry.toolkit_willOpenModule} and {@link telemetry.toolkit_didLoadModule}.
+     * Always clear this field after load is completed, as it should not be shared with future open/loads.
+     */
+    public loadMetadata:
+        | {
+              /**
+               * A unique identifier used to connect the opening/loaded metrics of a webview
+               */
+              traceId: string
+              /**
+               * When the webview is doing its initial render/load, this times out if it takes too long
+               * to get a "success" message (we assume something went wrong)
+               */
+              loadTimeout: Timeout | undefined
+              /**
+               * The time in milliseconds, when the module was triggered to start loading
+               */
+              start: number
+          }
+        | undefined = undefined
+
+    /**
+     * The relative location, from the repository root, to the frontend entrypoint.
+     */
+    public readonly source: string
+
+    private readonly protocol: Protocol
+    private readonly onDidDisposeEmitter = new vscode.EventEmitter<void>()
+    private readonly onDidDispose = this.onDidDisposeEmitter.event
+
+    private disposed = false
+    private context?: vscode.ExtensionContext
+
+    public constructor(source: string) {
+        const commands: Record<string, (...args: any[]) => unknown> = {}
+        const ctor = this.constructor as new (...args: any[]) => any
+
+        for (const [k, v] of Object.entries(getFunctions(ctor))) {
+            commands[k] = v.bind(this)
+        }
+
+        this.protocol = commands
+
+        // All vue files defined by `source` are collected in to `dist/vue`
+        // so we must update the relative paths to point here
+        const sourcePath = vscode.Uri.joinPath(vscode.Uri.parse('vue/'), source).path
+        this.source = sourcePath[0] === '/' ? sourcePath.slice(1) : sourcePath // VSCode URIs like to create root paths...
+    }
+
+    public get isDisposed() {
+        return this.disposed
+    }
+
+    public getCompanyName(): string {
+        return getIdeProperties().company
+    }
+
+    protected dispose(): void {
+        this.disposed = true
+        this.loadMetadata?.loadTimeout?.dispose()
+        this.onDidDisposeEmitter.fire()
+    }
+
+    protected getContext(): vscode.ExtensionContext {
+        if (!this.context) {
+            throw new Error('Webview was not initialized with "ExtContext"')
+        }
+
+        return this.context
+    }
+
+    public static compilePanel<T extends new (...args: any[]) => VueWebview>(
+        target: T
+    ): new (context: vscode.ExtensionContext, ...args: ConstructorParameters<T>) => VueWebviewPanel<InstanceType<T>> {
+        return class Panel {
+            private readonly instance: InstanceType<T>
+            private panel?: vscode.WebviewPanel
+
+            public constructor(
+                protected readonly context: vscode.ExtensionContext,
+                ...args: ConstructorParameters<T>
+            ) {
+                this.instance = new target(...args) as InstanceType<T>
+
+                for (const [prop, val] of Object.entries(this.instance)) {
+                    if (val instanceof vscode.EventEmitter) {
+                        Object.assign(this.instance.protocol, { [prop]: val })
+                    }
+                }
+            }
+
+            public get server() {
+                return this.instance
+            }
+
+            public async setup(webview: vscode.Webview) {
+                this.setupTelemetry()
+
+                const server = registerWebviewServer(webview, this.instance.protocol, this.instance.id)
+                this.instance.onDidDispose(() => {
+                    server.dispose()
+                })
+            }
+
+            /**
+             * Setup telemetry events that report on the initial loading of a webview
+             */
+            private setupTelemetry() {
+                const traceId = randomUUID()
+                // Notify intent to open a module, this does not mean it successfully opened
+                telemetry.toolkit_willOpenModule.emit({
+                    module: this.instance.id,
+                    result: 'Succeeded',
+                    traceId: traceId,
+                })
+
+                // setup for when the webview is (possibly) loaded
+                if (this.instance.supportsLoadTelemetry) {
+                    // Arbitrary assumption that UI will take no longer than 10 seconds to load
+                    const loadTimeout = new Timeout(10_000)
+                    const start = globals.clock.Date.now()
+                    this.instance.loadMetadata = {
+                        traceId,
+                        loadTimeout,
+                        start,
+                    }
+
+                    // webview frontend did not successfuly respond quick enough, so we assume loading failed
+                    loadTimeout.token.onCancellationRequested(() => {
+                        telemetry.toolkit_didLoadModule.emit({
+                            module: this.instance.id,
+                            result: 'Failed',
+                            traceId: traceId,
+                            reason: 'LoadTimedOut',
+                            reasonDesc: 'Likely due to an error in the frontend',
+                        })
+                        this.instance.loadMetadata = undefined
+                    })
+                }
+            }
+
+            public async show(params: Omit<WebviewPanelParams, 'id' | 'webviewJs'>): Promise<vscode.WebviewPanel> {
+                if (this.panel) {
+                    this.panel.reveal(params.viewColumn, false)
+                    return this.panel
+                }
+
+                const panel = createWebviewPanel(this.context, {
+                    id: this.instance.id,
+                    webviewJs: this.instance.source,
+                    ...params,
+                })
+                const server = registerWebviewServer(panel.webview, this.instance.protocol, this.instance.id)
+                this.instance.onDidDispose(() => {
+                    server.dispose()
+                    this.panel?.dispose()
+                    this.panel = undefined
+                })
+
+                return (this.panel = panel)
+            }
+
+            public async clear(): Promise<boolean> {
+                return this.panel?.webview.postMessage({ command: '$clear' }) ?? false
+            }
+        }
+    }
+
+    public static compileView<T extends new (...args: any[]) => VueWebview>(
+        target: T
+    ): new (context: vscode.ExtensionContext, ...args: ConstructorParameters<T>) => VueWebviewView<InstanceType<T>> {
+        return class View {
+            private readonly onDidResolveViewEmitter = new vscode.EventEmitter<vscode.WebviewView>()
+            private readonly instance: InstanceType<T>
+            private resolvedView?: vscode.WebviewView
+
+            public readonly onDidResolveView = this.onDidResolveViewEmitter.event
+
+            public constructor(
+                protected readonly context: vscode.ExtensionContext,
+                ...args: ConstructorParameters<T>
+            ) {
+                this.instance = new target(...args) as InstanceType<T>
+
+                for (const [prop, val] of Object.entries(this.instance)) {
+                    if (val instanceof vscode.EventEmitter) {
+                        Object.assign(this.instance.protocol, { [prop]: val })
+                    }
+                }
+
+                this.instance.context = this.context
+            }
+
+            public get server() {
+                return this.instance
+            }
+
+            public register(params: Omit<WebviewViewParams, 'id' | 'webviewJs'>): vscode.Disposable {
+                return vscode.window.registerWebviewViewProvider(this.instance.id, {
+                    resolveWebviewView: async (view) => {
+                        view.title = params.title ?? view.title
+                        view.description = params.description ?? view.description
+                        updateWebview(this.context, view.webview, {
+                            ...params,
+                            webviewJs: this.instance.source,
+                        })
+
+                        if (!this.resolvedView) {
+                            this.resolvedView = view
+
+                            const server = registerWebviewServer(
+                                this.resolvedView.webview,
+                                this.instance.protocol,
+                                this.instance.id
+                            )
+                            this.resolvedView.onDidDispose(() => {
+                                server.dispose()
+                                this.resolvedView = undefined
+                            })
+                        }
+
+                        this.onDidResolveViewEmitter.fire(view)
+                    },
+                })
+            }
+        }
+    }
+
+    /**
+     * Call this after the webview has successfully loaded
+     */
+    protected setDidLoad(module: string) {
+        this.loadMetadata?.loadTimeout?.dispose()
+
+        // Represents time from intent to open, to confirmation of a successful load
+        const duration = globals.clock.Date.now() - this.loadMetadata!.start
+
+        telemetry.toolkit_didLoadModule.emit({
+            passive: true,
+            module,
+            result: 'Succeeded',
+            traceId: this.loadMetadata?.traceId,
+            duration,
+        })
+
+        this.loadMetadata = undefined
+    }
+
+    /**
+     * Call this if we catch an error in the frontend, and are able to forward it to the backed
+     *
+     * @param message Error message from the frontend
+     */
+    public setLoadFailure(module: string, message: string) {
+        this.loadMetadata?.loadTimeout?.dispose()
+
+        telemetry.toolkit_didLoadModule.emit({
+            passive: true,
+            module,
+            result: 'Failed',
+            traceId: this.loadMetadata?.traceId,
+            reason: 'CaughtFrontendError',
+            reasonDesc: message,
+        })
+
+        this.loadMetadata = undefined
+    }
+}
+
+type FilteredKeys<T> = { [P in keyof T]: unknown extends T[P] ? never : P }[keyof T]
+type FilterUnknown<T> = Pick<T, FilteredKeys<T>>
+type Commands<T extends VueWebview> = {
+    [P in keyof T]: T[P] extends (...args: any[]) => any ? T[P] : unknown
+}
+type Events<T extends VueWebview> = {
+    [P in keyof T]: T[P] extends vscode.EventEmitter<any> ? T[P] : unknown
+}
+export type ClassToProtocol<T extends VueWebview> = FilterUnknown<Commands<T> & Events<T>>
+
+/**
+ * This is the {@link vscode.WebviewView} version of {@link compileVueWebview}.
+ *
+ * The biggest difference is that only a single view per-id can exist at a time, while multiple panels can exist per-id.
+ * Views also cannot register handlers for `submit`; any `submit` commands made by the fronend are ignored.
+ *
+ * @param params Required parameters are defined by {@link WebviewViewParams}, optional parameters are defined by {@link WebviewCompileOptions}
+ *
+ * @returns An anonymous class that can instantiate instances of {@link VueWebviewView}.
+ */
+
+/**
+ * Creates a brand new webview panel, setting some basic initial parameters and updating the webview.
+ */
+function createWebviewPanel(ctx: vscode.ExtensionContext, params: WebviewPanelParams): vscode.WebviewPanel {
+    const viewColumn = params.viewColumn ?? vscode.ViewColumn.Active
+
+    const panel = vscode.window.createWebviewPanel(
+        params.id,
+        params.title,
+        { viewColumn },
+        {
+            // The redundancy here is to correct a bug with Cloud9's Webview implementation
+            // We need to assign certain things on instantiation, otherwise they'll never be applied to the view
+            // TODO: Comment is old, no cloud9 support anymore. Is this needed?
+            enableScripts: true,
+            enableCommandUris: true,
+            retainContextWhenHidden: params.retainContextWhenHidden,
+        }
+    )
+    updateWebview(ctx, panel.webview, params)
+
+    return panel
+}
+
+function resolveRelative(webview: vscode.Webview, rootUri: vscode.Uri, files: string[]): vscode.Uri[] {
+    return files.map((f) => webview.asWebviewUri(vscode.Uri.joinPath(rootUri, f)))
+}
+
+/**
+ * Mutates a webview, applying various options and a static HTML page to bootstrap the Vue code.
+ */
+function updateWebview(ctx: vscode.ExtensionContext, webview: vscode.Webview, params: WebviewParams): vscode.Webview {
+    const dist = vscode.Uri.joinPath(ctx.extensionUri, 'dist')
+    const resources = vscode.Uri.joinPath(ctx.extensionUri, 'resources')
+
+    webview.options = {
+        enableScripts: true,
+        enableCommandUris: true,
+        localResourceRoots: [dist, resources],
+    }
+
+    const libs = resolveRelative(webview, vscode.Uri.joinPath(dist, 'libs'), [
+        'vscode.js',
+        'vue.min.js',
+        ...(params.libFiles ?? []),
+    ])
+
+    const css = resolveRelative(webview, vscode.Uri.joinPath(resources, 'css'), [
+        'base.css',
+        ...(params.cssFiles ?? []),
+    ])
+
+    const mainScript = webview.asWebviewUri(vscode.Uri.joinPath(dist, params.webviewJs))
+
+    webview.html = resolveWebviewHtml({
+        scripts: libs.map((p) => `<script src="${p}"></script>`).join('\n'),
+        stylesheets: css.map((p) => `<link rel="stylesheet" href="${p}">\n`).join('\n'),
+        main: mainScript,
+        webviewJs: params.webviewJs,
+        cspSource: webview.cspSource,
+    })
+
+    return webview
+}
+
+/**
+ * Resolves the webview HTML based off whether we're running from a development server or bundled extension.
+ */
+function resolveWebviewHtml(params: {
+    scripts: string
+    stylesheets: string
+    cspSource: string
+    webviewJs: string
+    main: vscode.Uri
+}): string {
+    const resolvedParams = { ...params, connectSource: `'none'` }
+    const localServer = process.env.WEBPACK_DEVELOPER_SERVER
+
+    if (localServer) {
+        const local = vscode.Uri.parse(localServer)
+        resolvedParams.cspSource = `${params.cspSource} ${local.toString()}`
+        resolvedParams.main = local.with({ path: `/${params.webviewJs}` })
+        resolvedParams.connectSource = `'self' ws:`
+    }
+
+    return `<html>
+    <head>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+        <meta
+            http-equiv="Content-Security-Policy"
+            content=
+                "default-src 'none';
+                connect-src ${resolvedParams.connectSource};
+                img-src ${resolvedParams.cspSource} https: data:;
+                script-src ${resolvedParams.cspSource};
+                style-src ${resolvedParams.cspSource} 'unsafe-inline';
+                font-src ${resolvedParams.cspSource} 'self' data:;"
+        >
+    </head>
+    <body>
+        <div id="vue-app"></div>
+        <!-- Dependencies -->
+        ${resolvedParams.scripts}
+        ${resolvedParams.stylesheets}
+        <!-- Main -->
+        <script src="${resolvedParams.main}"></script>
+    </body>
+</html>`
+}
diff --git a/src/webviews/mixins/saveData.ts b/packages/core/src/webviews/mixins/saveData.ts
similarity index 86%
rename from src/webviews/mixins/saveData.ts
rename to packages/core/src/webviews/mixins/saveData.ts
index 2e6433e31ca..da0fdd8923d 100644
--- a/src/webviews/mixins/saveData.ts
+++ b/packages/core/src/webviews/mixins/saveData.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -36,6 +36,8 @@ const saveData: Vue.ComponentOptionsMixin = {
         this.$options._unid = unid
 
         if (_unids.has(unid)) {
+            // Disable because we cannot log to extension in a webview.
+            // eslint-disable-next-line aws-toolkits/no-console-log
             console.warn(`Component "${unid}" already exists. State-saving functionality will be disabled.`)
             return
         }
@@ -43,11 +45,11 @@ const saveData: Vue.ComponentOptionsMixin = {
         _unids.add(unid)
         const old = state[unid] ?? {}
 
-        Object.keys(this.$data).forEach(k => {
+        for (const k of Object.keys(this.$data)) {
             this.$data[k] = old[k] ?? this.$data[k]
-        })
+        }
 
-        Object.keys(this.$data).forEach(k => {
+        for (const k of Object.keys(this.$data)) {
             this.$watch(
                 k,
                 (v: unknown) => {
@@ -59,7 +61,7 @@ const saveData: Vue.ComponentOptionsMixin = {
                 },
                 { deep: true }
             )
-        })
+        }
     },
 }
 
diff --git a/packages/core/src/webviews/server.ts b/packages/core/src/webviews/server.ts
new file mode 100644
index 00000000000..a80b44a8253
--- /dev/null
+++ b/packages/core/src/webviews/server.ts
@@ -0,0 +1,118 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as vscode from 'vscode'
+import { getLogger } from '../shared/logger/logger'
+import { Message } from './client'
+import { AsyncResource } from 'async_hooks'
+import { ToolkitError } from '../shared/errors'
+
+interface Command<T extends any[] = any, R = any> {
+    (...args: T): R | never
+}
+
+export interface Protocol {
+    [key: string]: Command | vscode.EventEmitter<any> | undefined
+}
+
+/**
+ * Sets up an event listener for the webview to call registered commands.
+ *
+ * @param webview Target webview to add the event hook.
+ * @param commands Commands to register.
+ * @param webviewId A human readable string that will identify the webview
+ */
+export function registerWebviewServer(
+    webview: vscode.Webview,
+    commands: Protocol,
+    webviewId: string
+): vscode.Disposable {
+    const eventListeners: vscode.Disposable[] = []
+    const disposeListeners = () => {
+        while (eventListeners.length) {
+            eventListeners.pop()?.dispose()
+        }
+    }
+
+    const messageListener = webview.onDidReceiveMessage(
+        // XXX: In earlier versions of Node the first parameter was used as
+        // the `thisArg` for calling the bound function.
+        //
+        // Fixed in https://github.com/nodejs/node/commit/324a6c235a5bfcbcd7cc7491d55461915c10af34
+        AsyncResource.bind(async function (this: any, event: Message) {
+            const { id, command, data } = event ?? (this as Message)
+            const metadata: Omit<Message, 'id' | 'command' | 'data'> = {}
+
+            const handler = commands[command]
+
+            if (!handler) {
+                return getLogger().warn(`Received invalid message from client: ${command}`)
+            }
+
+            if (id === '0') {
+                disposeListeners() // Webview reloaded, dispose all listeners
+            }
+
+            if (handler instanceof vscode.EventEmitter) {
+                // TODO: make server dipose of event if client calls `dispose`
+                eventListeners.push(handler.event((e) => webview.postMessage({ command, event: true, data: e })))
+                getLogger().verbose(`Registered event handler for: ${command}`)
+                return webview.postMessage({ id, command, event: true })
+            }
+
+            // TODO: these commands could potentially have sensitive data, we don't want to log in that case
+            getLogger().debug(`Webview called command "${command}" with args: %O`, data)
+
+            let result: any
+            try {
+                result = await handler.call(webview, ...data)
+            } catch (err) {
+                if (!(err instanceof Error)) {
+                    getLogger().debug(`Webview server threw on command "${command}" but it was not an error: `, err)
+                    return
+                }
+                result = JSON.stringify(err, Object.getOwnPropertyNames(err))
+                delete result.stack // Not relevant to frontend code, we only care about the message
+                metadata.error = true
+
+                // A command failed in the backend/server, this will surface the error to the user as a vscode error message.
+                // This is the base error handler that will end up catching all unhandled errors.
+                handleWebviewError(err, webviewId, command)
+            }
+
+            // TODO: check if webview has been disposed of before posting message (not necessary but nice)
+            // We also get a boolean value back, maybe retry sending on false?
+            await webview.postMessage({ id, command, data: result, ...metadata })
+        })
+    )
+
+    return { dispose: () => (messageListener.dispose(), disposeListeners()) }
+}
+
+/**
+ * Logs and handles an error.
+ *
+ * @returns final, chained, user-facing error
+ */
+let errorHandler: (error: unknown, webviewId: string, command: string) => ToolkitError
+/**
+ * Registers the handler for errors thrown by the webview backend/server code.
+ */
+export function registerWebviewErrorHandler(handler: typeof errorHandler): void {
+    if (errorHandler !== undefined) {
+        throw new TypeError('Webview error handler has already been registered')
+    }
+
+    errorHandler = handler
+}
+/**
+ * Invokes the registered webview error handler.
+ */
+export function handleWebviewError(error: unknown, webviewId: string, command: string): ToolkitError {
+    if (errorHandler === undefined) {
+        throw new Error('Webview error handler not registered')
+    }
+    return errorHandler(error, webviewId, command)
+}
diff --git a/packages/core/src/webviews/types.ts b/packages/core/src/webviews/types.ts
new file mode 100644
index 00000000000..2001516d507
--- /dev/null
+++ b/packages/core/src/webviews/types.ts
@@ -0,0 +1,13 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { DefineComponent, defineComponent } from 'vue'
+
+/**
+ * This is the type of the output of {@link defineComponent}.
+ *
+ * For exmaple, this can be used to represent multiple components that
+ * extend a base component.
+ */
+export type DefinedComponent = DefineComponent<any, any, any, any, any, any, any, any, any, any>
diff --git a/packages/core/src/webviews/util.ts b/packages/core/src/webviews/util.ts
new file mode 100644
index 00000000000..aaa21e59ee1
--- /dev/null
+++ b/packages/core/src/webviews/util.ts
@@ -0,0 +1,52 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * IMPORTANT:
+ *
+ * This class is used in the frontend vue.js webview code.
+ * Do not put backend code in this module.
+ */
+
+import { PropType } from 'vue'
+
+/**
+ * Creates an anonymous class whose constructor automatically applies default values.
+ *
+ * Mostly just used for Vue as the types expect a class. Otherwise one would need to
+ * manually describe constructor parameters and assignments for every field.
+ *
+ * Example (type inferred):
+ * ```ts
+ * export const MyClass = createClass({
+ *     foo: 0,
+ *     bar: 'a' as 'a' | 'b',
+ * })
+ * ```
+ *
+ * @param defaults Defaults to use during construction.
+ *
+ * @returns Anonymous class. Use `typeof MyClass` to extract its type.
+ */
+export function createClass<T>(defaults: T): { new (initial?: Partial<T>): T }
+export function createClass<T>(defaults: Partial<T>, required: true): { new (initial: T): T }
+export function createClass<T>(defaults: T): { new (initial?: Partial<T>): T } | { new (initial: T): T } {
+    return class {
+        constructor(initial: T | Partial<T> = {}) {
+            Object.assign(this, defaults, initial)
+        }
+    } as any
+}
+
+/**
+ * Creates a Vue 'type' from a class. Note that nothing is actually created; a type is only inferred from the `Model`.
+ *
+ * @param Model Model class, usually created from {@link createClass}.
+ *
+ * @returns The {@link Object} class with the typed coerced as a {@link PropType} for the `Model` instance.
+ */
+export function createType<T extends new (obj: any) => any>(Model: T): PropType<InstanceType<T>> {
+    return Object
+}
diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
new file mode 100644
index 00000000000..702a86ee8e6
--- /dev/null
+++ b/packages/core/tsconfig.json
@@ -0,0 +1,12 @@
+{
+    "extends": "../tsconfig.packages.json",
+    "compilerOptions": {
+        "outDir": "dist",
+        "baseUrl": ".",
+        "rootDir": ".",
+        "declaration": true,
+        "declarationMap": true
+    },
+    "exclude": ["node_modules", ".vscode-test", "src/testFixtures", "dist"],
+    "noEmitOnError": false // allow emitting even with type errors
+}
diff --git a/packages/core/types/cloudformation-schema-js-yaml.d.ts b/packages/core/types/cloudformation-schema-js-yaml.d.ts
new file mode 100644
index 00000000000..54e3b8ca542
--- /dev/null
+++ b/packages/core/types/cloudformation-schema-js-yaml.d.ts
@@ -0,0 +1,6 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+declare module 'cloudformation-schema-js-yaml'
diff --git a/types/git.d.ts b/packages/core/types/git.d.ts
similarity index 98%
rename from types/git.d.ts
rename to packages/core/types/git.d.ts
index 0f43a3f69be..e037dfdac9e 100644
--- a/types/git.d.ts
+++ b/packages/core/types/git.d.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -7,7 +7,7 @@
 // https://github.com/microsoft/vscode/blob/7ed4699079f647ef53807f511ac87ff06a7b37b5/extensions/git/src/api/git.d.ts
 // Note that this file should be imported as 'git.d' since it contains enums and thus must be compiled.
 
-/*---------------------------------------------------------------------------------------------
+/* ---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
diff --git a/packages/core/types/gitignore-parser.d.ts b/packages/core/types/gitignore-parser.d.ts
new file mode 100644
index 00000000000..de23302bd2f
--- /dev/null
+++ b/packages/core/types/gitignore-parser.d.ts
@@ -0,0 +1,11 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+declare module '@gerhobbelt/gitignore-parser' {
+    export interface GitIgnoreAcceptor {
+        accepts(filePath: string)
+    }
+    export function compile(content: string): GitIgnoreAcceptor
+}
diff --git a/types/jsonSchemaService.d.ts b/packages/core/types/jsonSchemaService.d.ts
similarity index 81%
rename from types/jsonSchemaService.d.ts
rename to packages/core/types/jsonSchemaService.d.ts
index 4b9b30120a8..427f77a271e 100644
--- a/types/jsonSchemaService.d.ts
+++ b/packages/core/types/jsonSchemaService.d.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
diff --git a/packages/core/types/vue-types.d.ts b/packages/core/types/vue-types.d.ts
new file mode 100644
index 00000000000..496857e4241
--- /dev/null
+++ b/packages/core/types/vue-types.d.ts
@@ -0,0 +1,18 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// temporary ambient declaration
+// this does not really extract types from vue components
+// it just prevents TSC from complaining when trying to import them
+declare module '*.vue' {
+    import { defineComponent } from 'vue'
+    const Component: ReturnType<typeof defineComponent>
+    export default Component
+}
+
+declare module '*.svg' {
+    const content: React.FunctionComponent<React.SVGAttributes<SVGElement>>
+    export default content
+}
diff --git a/packages/core/webpack.config.js b/packages/core/webpack.config.js
new file mode 100644
index 00000000000..b58c990704a
--- /dev/null
+++ b/packages/core/webpack.config.js
@@ -0,0 +1,42 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * This webpack config is used for everything else that the TypeScript transpilation does not do.
+ *
+ * Some things include:
+ *   - Building the Web toolkit (Web extensions must be a single file, hence webpack)
+ *   - Building Vue.js files for webviews
+ */
+
+const baseConfigFactory = require('../webpack.base.config')
+const baseVueConfigFactory = require('../webpack.vue.config')
+const baseWebConfigsFactory = require('../webpack.web.config')
+
+module.exports = (env, argv) => {
+    const baseVueConfig = baseVueConfigFactory(env, argv)
+    const baseConfig = baseConfigFactory(env, argv)
+
+    const config = {
+        ...baseConfig,
+        entry: {
+            'src/stepFunctions/asl/aslServer': './src/stepFunctions/asl/aslServer.ts',
+            'src/awsService/sagemaker/detached-server/server': './src/awsService/sagemaker/detached-server/server.ts',
+        },
+    }
+
+    const vueConfig = {
+        ...baseVueConfig.config,
+        // Inject entry point into all configs.
+        entry: {
+            ...baseVueConfig.createVueEntries(),
+            // The above `createVueEntries` path pattern match does not catch this:
+            'src/amazonq/webview/ui/amazonq-ui': './src/amazonq/webview/ui/main.ts',
+            'src/amazonq/webview/ui/amazonq-ui-connector-adapter': './src/amazonq/webview/ui/connectorAdapter.ts',
+        },
+    }
+
+    return [config, vueConfig]
+}
diff --git a/packages/toolkit/.c8rc.json b/packages/toolkit/.c8rc.json
new file mode 100644
index 00000000000..9702d17bc89
--- /dev/null
+++ b/packages/toolkit/.c8rc.json
@@ -0,0 +1,6 @@
+{
+    "report-dir": "../../coverage/toolkit",
+    "reporter": ["lcov"],
+    "all": true,
+    "exclude": ["**/test*/**", "**/node_modules/**", "**/ssmServer.js", "**/ssmDocument/external *"]
+}
diff --git a/.changes/1.1.0.json b/packages/toolkit/.changes/1.1.0.json
similarity index 100%
rename from .changes/1.1.0.json
rename to packages/toolkit/.changes/1.1.0.json
diff --git a/.changes/1.10.0.json b/packages/toolkit/.changes/1.10.0.json
similarity index 100%
rename from .changes/1.10.0.json
rename to packages/toolkit/.changes/1.10.0.json
diff --git a/packages/toolkit/.changes/1.100.0.json b/packages/toolkit/.changes/1.100.0.json
new file mode 100644
index 00000000000..c65c0b76942
--- /dev/null
+++ b/packages/toolkit/.changes/1.100.0.json
@@ -0,0 +1,26 @@
+{
+	"date": "2023-11-26",
+	"version": "1.100.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Fix a not connected error when starting connection to CodeCatalyst Dev Environment from link"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer supports Json, yaml and Tf"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer security scans support typescript, csharp, json, yaml, tf and hcl files."
+		},
+		{
+			"type": "Feature",
+			"description": "Auth: Redesign Add Connection page to show all options at once"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer: Uses Generative AI and automated reasoning to rewrite lines of code flagged for security vulnerabilities during a security scan."
+		}
+	]
+}
\ No newline at end of file
diff --git a/.changes/1.11.0.json b/packages/toolkit/.changes/1.11.0.json
similarity index 100%
rename from .changes/1.11.0.json
rename to packages/toolkit/.changes/1.11.0.json
diff --git a/.changes/1.12.0.json b/packages/toolkit/.changes/1.12.0.json
similarity index 100%
rename from .changes/1.12.0.json
rename to packages/toolkit/.changes/1.12.0.json
diff --git a/.changes/1.13.0.json b/packages/toolkit/.changes/1.13.0.json
similarity index 100%
rename from .changes/1.13.0.json
rename to packages/toolkit/.changes/1.13.0.json
diff --git a/.changes/1.14.0.json b/packages/toolkit/.changes/1.14.0.json
similarity index 100%
rename from .changes/1.14.0.json
rename to packages/toolkit/.changes/1.14.0.json
diff --git a/.changes/1.15.0.json b/packages/toolkit/.changes/1.15.0.json
similarity index 100%
rename from .changes/1.15.0.json
rename to packages/toolkit/.changes/1.15.0.json
diff --git a/.changes/1.16.0.json b/packages/toolkit/.changes/1.16.0.json
similarity index 100%
rename from .changes/1.16.0.json
rename to packages/toolkit/.changes/1.16.0.json
diff --git a/.changes/1.17.0.json b/packages/toolkit/.changes/1.17.0.json
similarity index 100%
rename from .changes/1.17.0.json
rename to packages/toolkit/.changes/1.17.0.json
diff --git a/.changes/1.18.0.json b/packages/toolkit/.changes/1.18.0.json
similarity index 100%
rename from .changes/1.18.0.json
rename to packages/toolkit/.changes/1.18.0.json
diff --git a/.changes/1.19.0.json b/packages/toolkit/.changes/1.19.0.json
similarity index 100%
rename from .changes/1.19.0.json
rename to packages/toolkit/.changes/1.19.0.json
diff --git a/.changes/1.2.0.json b/packages/toolkit/.changes/1.2.0.json
similarity index 100%
rename from .changes/1.2.0.json
rename to packages/toolkit/.changes/1.2.0.json
diff --git a/.changes/1.20.0.json b/packages/toolkit/.changes/1.20.0.json
similarity index 100%
rename from .changes/1.20.0.json
rename to packages/toolkit/.changes/1.20.0.json
diff --git a/.changes/1.21.0.json b/packages/toolkit/.changes/1.21.0.json
similarity index 100%
rename from .changes/1.21.0.json
rename to packages/toolkit/.changes/1.21.0.json
diff --git a/.changes/1.22.0.json b/packages/toolkit/.changes/1.22.0.json
similarity index 100%
rename from .changes/1.22.0.json
rename to packages/toolkit/.changes/1.22.0.json
diff --git a/.changes/1.23.0.json b/packages/toolkit/.changes/1.23.0.json
similarity index 100%
rename from .changes/1.23.0.json
rename to packages/toolkit/.changes/1.23.0.json
diff --git a/.changes/1.24.0.json b/packages/toolkit/.changes/1.24.0.json
similarity index 100%
rename from .changes/1.24.0.json
rename to packages/toolkit/.changes/1.24.0.json
diff --git a/.changes/1.25.0.json b/packages/toolkit/.changes/1.25.0.json
similarity index 100%
rename from .changes/1.25.0.json
rename to packages/toolkit/.changes/1.25.0.json
diff --git a/.changes/1.26.0.json b/packages/toolkit/.changes/1.26.0.json
similarity index 100%
rename from .changes/1.26.0.json
rename to packages/toolkit/.changes/1.26.0.json
diff --git a/.changes/1.27.0.json b/packages/toolkit/.changes/1.27.0.json
similarity index 100%
rename from .changes/1.27.0.json
rename to packages/toolkit/.changes/1.27.0.json
diff --git a/.changes/1.28.0.json b/packages/toolkit/.changes/1.28.0.json
similarity index 100%
rename from .changes/1.28.0.json
rename to packages/toolkit/.changes/1.28.0.json
diff --git a/.changes/1.29.0.json b/packages/toolkit/.changes/1.29.0.json
similarity index 100%
rename from .changes/1.29.0.json
rename to packages/toolkit/.changes/1.29.0.json
diff --git a/.changes/1.3.0.json b/packages/toolkit/.changes/1.3.0.json
similarity index 100%
rename from .changes/1.3.0.json
rename to packages/toolkit/.changes/1.3.0.json
diff --git a/.changes/1.30.0.json b/packages/toolkit/.changes/1.30.0.json
similarity index 100%
rename from .changes/1.30.0.json
rename to packages/toolkit/.changes/1.30.0.json
diff --git a/.changes/1.31.0.json b/packages/toolkit/.changes/1.31.0.json
similarity index 100%
rename from .changes/1.31.0.json
rename to packages/toolkit/.changes/1.31.0.json
diff --git a/.changes/1.32.0.json b/packages/toolkit/.changes/1.32.0.json
similarity index 100%
rename from .changes/1.32.0.json
rename to packages/toolkit/.changes/1.32.0.json
diff --git a/.changes/1.33.0.json b/packages/toolkit/.changes/1.33.0.json
similarity index 100%
rename from .changes/1.33.0.json
rename to packages/toolkit/.changes/1.33.0.json
diff --git a/.changes/1.34.0.json b/packages/toolkit/.changes/1.34.0.json
similarity index 100%
rename from .changes/1.34.0.json
rename to packages/toolkit/.changes/1.34.0.json
diff --git a/.changes/1.35.0.json b/packages/toolkit/.changes/1.35.0.json
similarity index 100%
rename from .changes/1.35.0.json
rename to packages/toolkit/.changes/1.35.0.json
diff --git a/.changes/1.36.0.json b/packages/toolkit/.changes/1.36.0.json
similarity index 100%
rename from .changes/1.36.0.json
rename to packages/toolkit/.changes/1.36.0.json
diff --git a/.changes/1.37.0.json b/packages/toolkit/.changes/1.37.0.json
similarity index 100%
rename from .changes/1.37.0.json
rename to packages/toolkit/.changes/1.37.0.json
diff --git a/.changes/1.38.0.json b/packages/toolkit/.changes/1.38.0.json
similarity index 100%
rename from .changes/1.38.0.json
rename to packages/toolkit/.changes/1.38.0.json
diff --git a/.changes/1.39.0.json b/packages/toolkit/.changes/1.39.0.json
similarity index 100%
rename from .changes/1.39.0.json
rename to packages/toolkit/.changes/1.39.0.json
diff --git a/.changes/1.4.0.json b/packages/toolkit/.changes/1.4.0.json
similarity index 100%
rename from .changes/1.4.0.json
rename to packages/toolkit/.changes/1.4.0.json
diff --git a/.changes/1.40.0.json b/packages/toolkit/.changes/1.40.0.json
similarity index 100%
rename from .changes/1.40.0.json
rename to packages/toolkit/.changes/1.40.0.json
diff --git a/.changes/1.41.0.json b/packages/toolkit/.changes/1.41.0.json
similarity index 100%
rename from .changes/1.41.0.json
rename to packages/toolkit/.changes/1.41.0.json
diff --git a/.changes/1.42.0.json b/packages/toolkit/.changes/1.42.0.json
similarity index 100%
rename from .changes/1.42.0.json
rename to packages/toolkit/.changes/1.42.0.json
diff --git a/.changes/1.44.0.json b/packages/toolkit/.changes/1.44.0.json
similarity index 100%
rename from .changes/1.44.0.json
rename to packages/toolkit/.changes/1.44.0.json
diff --git a/.changes/1.45.0.json b/packages/toolkit/.changes/1.45.0.json
similarity index 100%
rename from .changes/1.45.0.json
rename to packages/toolkit/.changes/1.45.0.json
diff --git a/.changes/1.46.0.json b/packages/toolkit/.changes/1.46.0.json
similarity index 100%
rename from .changes/1.46.0.json
rename to packages/toolkit/.changes/1.46.0.json
diff --git a/.changes/1.47.0.json b/packages/toolkit/.changes/1.47.0.json
similarity index 100%
rename from .changes/1.47.0.json
rename to packages/toolkit/.changes/1.47.0.json
diff --git a/.changes/1.48.0.json b/packages/toolkit/.changes/1.48.0.json
similarity index 100%
rename from .changes/1.48.0.json
rename to packages/toolkit/.changes/1.48.0.json
diff --git a/.changes/1.49.0.json b/packages/toolkit/.changes/1.49.0.json
similarity index 100%
rename from .changes/1.49.0.json
rename to packages/toolkit/.changes/1.49.0.json
diff --git a/.changes/1.5.0.json b/packages/toolkit/.changes/1.5.0.json
similarity index 100%
rename from .changes/1.5.0.json
rename to packages/toolkit/.changes/1.5.0.json
diff --git a/.changes/1.50.0.json b/packages/toolkit/.changes/1.50.0.json
similarity index 100%
rename from .changes/1.50.0.json
rename to packages/toolkit/.changes/1.50.0.json
diff --git a/.changes/1.51.0.json b/packages/toolkit/.changes/1.51.0.json
similarity index 100%
rename from .changes/1.51.0.json
rename to packages/toolkit/.changes/1.51.0.json
diff --git a/.changes/1.52.0.json b/packages/toolkit/.changes/1.52.0.json
similarity index 100%
rename from .changes/1.52.0.json
rename to packages/toolkit/.changes/1.52.0.json
diff --git a/.changes/1.53.0.json b/packages/toolkit/.changes/1.53.0.json
similarity index 100%
rename from .changes/1.53.0.json
rename to packages/toolkit/.changes/1.53.0.json
diff --git a/.changes/1.54.0.json b/packages/toolkit/.changes/1.54.0.json
similarity index 100%
rename from .changes/1.54.0.json
rename to packages/toolkit/.changes/1.54.0.json
diff --git a/.changes/1.55.0.json b/packages/toolkit/.changes/1.55.0.json
similarity index 100%
rename from .changes/1.55.0.json
rename to packages/toolkit/.changes/1.55.0.json
diff --git a/.changes/1.56.0.json b/packages/toolkit/.changes/1.56.0.json
similarity index 100%
rename from .changes/1.56.0.json
rename to packages/toolkit/.changes/1.56.0.json
diff --git a/.changes/1.57.0.json b/packages/toolkit/.changes/1.57.0.json
similarity index 100%
rename from .changes/1.57.0.json
rename to packages/toolkit/.changes/1.57.0.json
diff --git a/.changes/1.58.0.json b/packages/toolkit/.changes/1.58.0.json
similarity index 100%
rename from .changes/1.58.0.json
rename to packages/toolkit/.changes/1.58.0.json
diff --git a/.changes/1.59.0.json b/packages/toolkit/.changes/1.59.0.json
similarity index 100%
rename from .changes/1.59.0.json
rename to packages/toolkit/.changes/1.59.0.json
diff --git a/.changes/1.6.0.json b/packages/toolkit/.changes/1.6.0.json
similarity index 100%
rename from .changes/1.6.0.json
rename to packages/toolkit/.changes/1.6.0.json
diff --git a/.changes/1.6.1.json b/packages/toolkit/.changes/1.6.1.json
similarity index 100%
rename from .changes/1.6.1.json
rename to packages/toolkit/.changes/1.6.1.json
diff --git a/.changes/1.60.0.json b/packages/toolkit/.changes/1.60.0.json
similarity index 100%
rename from .changes/1.60.0.json
rename to packages/toolkit/.changes/1.60.0.json
diff --git a/.changes/1.61.0.json b/packages/toolkit/.changes/1.61.0.json
similarity index 100%
rename from .changes/1.61.0.json
rename to packages/toolkit/.changes/1.61.0.json
diff --git a/.changes/1.62.0.json b/packages/toolkit/.changes/1.62.0.json
similarity index 100%
rename from .changes/1.62.0.json
rename to packages/toolkit/.changes/1.62.0.json
diff --git a/packages/toolkit/.changes/1.63.0.json b/packages/toolkit/.changes/1.63.0.json
new file mode 100644
index 00000000000..f025c5ec2e0
--- /dev/null
+++ b/packages/toolkit/.changes/1.63.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2023-02-16",
+	"version": "1.63.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Bump amazon-states-language-service dependency to ^1.8.0 to allow state machines to be created with the new intrinsic functions and Map state"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Authenticating through the browser now requires users to manually enter a user verification code. Previously this was done automatically."
+		},
+		{
+			"type": "Feature",
+			"description": "CloudWatch Logs: one click to list log streams for a log group"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.64.0.json b/packages/toolkit/.changes/1.64.0.json
new file mode 100644
index 00000000000..0f8d4fa9c82
--- /dev/null
+++ b/packages/toolkit/.changes/1.64.0.json
@@ -0,0 +1,22 @@
+{
+	"date": "2023-03-07",
+	"version": "1.64.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "auth: \"Copy Code\" modal is shown twice when refreshing expired IAM Identity Center connections"
+		},
+		{
+			"type": "Feature",
+			"description": "auth: verification codes for browser logins are now shown in a notification after opening the login URL"
+		},
+		{
+			"type": "Feature",
+			"description": "S3: Choose last-touched and last-uploaded-to S3 folders in the Upload Files wizard."
+		},
+		{
+			"type": "Feature",
+			"description": "\"Sync SAM Application\" command provides Create and Help actions at each step (SAM template, S3 bucket, ECR repo, CloudFormation stack)"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.65.0.json b/packages/toolkit/.changes/1.65.0.json
new file mode 100644
index 00000000000..947912994ec
--- /dev/null
+++ b/packages/toolkit/.changes/1.65.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2023-03-15",
+	"version": "1.65.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "auth: The status bar shows more information about which connections are in-use and which of those are expired or invalid."
+		},
+		{
+			"type": "Feature",
+			"description": "auth: Expired connections are now easier to recognize and re-authenticate from the \"Switch Connections\" quick pick menu"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.66.0.json b/packages/toolkit/.changes/1.66.0.json
new file mode 100644
index 00000000000..93a3d83f60f
--- /dev/null
+++ b/packages/toolkit/.changes/1.66.0.json
@@ -0,0 +1,42 @@
+{
+	"date": "2023-03-24",
+	"version": "1.66.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "CodeCatalyst: connecting to a Dev Environment while it is updating sometimes fails"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "\"Enable Command Execution\" shows wrong message"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Update dependency amazon-states-language-service from 1.8.0 -> 1.9.0. This will allow newlines in Step Functions intrinsic functions."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeCatalyst: Disable new branch option when creating new Dev Environment for linked repo"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeCatalyst: `Clone CodeCatalyst Repository` command now only lists non-linked repos"
+		},
+		{
+			"type": "Feature",
+			"description": "Option to sign out of existing Builder ID when adding a new one"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeCatalyst: wait up to 1 hour (instead of 3 minutes) for Dev Environment to start"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer improves right context handling"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer will no longer automatically format code after accepting code suggestions"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.67.0.json b/packages/toolkit/.changes/1.67.0.json
new file mode 100644
index 00000000000..c6ac9a22a5d
--- /dev/null
+++ b/packages/toolkit/.changes/1.67.0.json
@@ -0,0 +1,34 @@
+{
+	"date": "2023-03-29",
+	"version": "1.67.0",
+	"entries": [
+		{
+			"type": "Breaking Change",
+			"description": "\"Sync SAM Application\" will now always ignore the 'watch' flag in `samconfig.toml`. The Toolkit does not support running `sam sync` in 'watch' mode."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "auth: switching to a connection that just expired shows an error"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "S3 filesystem provider is not case-sensitive, so requesting \"s3://bucket1/Test.json\" may open \"s3://bucket1/test.json\""
+		},
+		{
+			"type": "Feature",
+			"description": "SAM: create, run and debug Python 3.10 Lambdas"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeCatalyst: retry connection to \"FAILED\" Dev Environments"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeCatalyst: improved messages and logging when connecting to Dev Environment"
+		},
+		{
+			"type": "Removal",
+			"description": "`aws.experiments.samSyncCode` has been removed as similiar functionality is now in SAM CLI by default in 1.78.0."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.68.0.json b/packages/toolkit/.changes/1.68.0.json
new file mode 100644
index 00000000000..e1da9869010
--- /dev/null
+++ b/packages/toolkit/.changes/1.68.0.json
@@ -0,0 +1,34 @@
+{
+	"date": "2023-04-13",
+	"version": "1.68.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Dev Env Space quick pick shows all Spaces + Projects"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeCatalyst: Toolkit attempts reconnect to non-vscode Dev Environment"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "The AWS status bar item is colored despite there not being anything that needs user attention"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer: Now also provides import recommendations"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer: new code scan features: \n1. highlighting scanned files \n2. stop security scan"
+		},
+		{
+			"type": "Feature",
+			"description": "auth: support `sso_session` for profiles in AWS shared ini files"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer: new supported programming languages: c, cpp, go, kotlin, php, ruby, rust, scala, shell, sql. "
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.69.0.json b/packages/toolkit/.changes/1.69.0.json
new file mode 100644
index 00000000000..82429a6a9f7
--- /dev/null
+++ b/packages/toolkit/.changes/1.69.0.json
@@ -0,0 +1,22 @@
+{
+	"date": "2023-04-18",
+	"version": "1.69.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "endpoints: local file never loads if remote call hangs"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeCatalyst: improved efficiency by reducing unnecessary service calls #3333"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Incorrect offset icons in webviews"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeCatalyst: show readme on first load of a Dev Environment"
+		}
+	]
+}
\ No newline at end of file
diff --git a/.changes/1.7.0.json b/packages/toolkit/.changes/1.7.0.json
similarity index 100%
rename from .changes/1.7.0.json
rename to packages/toolkit/.changes/1.7.0.json
diff --git a/packages/toolkit/.changes/1.70.0.json b/packages/toolkit/.changes/1.70.0.json
new file mode 100644
index 00000000000..dec87e8fe27
--- /dev/null
+++ b/packages/toolkit/.changes/1.70.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2023-04-22",
+	"version": "1.70.0",
+	"entries": [
+		{
+			"type": "Deprecation",
+			"description": "Minimum required VS Code version is now 1.65"
+		},
+		{
+			"type": "Feature",
+			"description": "auth: AWS accounts and roles from IAM Identity Center are automatically discovered by the Toolkit when selecting a connection."
+		},
+		{
+			"type": "Feature",
+			"description": "feat(auth): IAM Identity Center connections now request the least permissive set of scopes for features. Using the same connection for multiple features will request additional scopes to be used."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.71.0.json b/packages/toolkit/.changes/1.71.0.json
new file mode 100644
index 00000000000..e670d884ba9
--- /dev/null
+++ b/packages/toolkit/.changes/1.71.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2023-04-28",
+	"version": "1.71.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer shows \"The security token included in this request is expired\" in Cloud9"
+		},
+		{
+			"type": "Feature",
+			"description": "Improved error messages for file system permissions issues"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.72.0.json b/packages/toolkit/.changes/1.72.0.json
new file mode 100644
index 00000000000..8f0ddf35c17
--- /dev/null
+++ b/packages/toolkit/.changes/1.72.0.json
@@ -0,0 +1,22 @@
+{
+	"date": "2023-05-04",
+	"version": "1.72.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "\"Open CodeCatalyst Dev Environment\" fails on flatpak (steamdeck)"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "auth: changes to the AWS shared configuration files are not always respected when fetching credentials"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer status bar showing even when not in use"
+		},
+		{
+			"type": "Feature",
+			"description": "Improved startup performance on large workspaces #3370"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.73.0.json b/packages/toolkit/.changes/1.73.0.json
new file mode 100644
index 00000000000..f78f2566cf0
--- /dev/null
+++ b/packages/toolkit/.changes/1.73.0.json
@@ -0,0 +1,30 @@
+{
+	"date": "2023-05-11",
+	"version": "1.73.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon CodeCatalyst: using CodeCatalyst features without onboarding shows `AccessDeniedException`"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeCatalyst: When a Space has reached quota, trying to connect to a DevEnv waits a long time instead of failing immediately."
+		},
+		{
+			"type": "Feature",
+			"description": "Faster startup and less filesystem usage when the `aws.samcli.enableCodeLenses` setting is disabled"
+		},
+		{
+			"type": "Removal",
+			"description": "Removed legacy setting `aws.sam.enableCodeLenses` (use `aws.samcli.enableCodeLenses` instead)"
+		},
+		{
+			"type": "Removal",
+			"description": "Removed legacy setting `aws.manuallySelectedBuckets` (use `aws.samcli.manuallySelectedBuckets` instead)"
+		},
+		{
+			"type": "Removal",
+			"description": "Removed legacy setting `aws.samcli.lambda.timeout` (use `aws.samcli.lambdaTimeout` instead)"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.74.0.json b/packages/toolkit/.changes/1.74.0.json
new file mode 100644
index 00000000000..f13028861ab
--- /dev/null
+++ b/packages/toolkit/.changes/1.74.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2023-05-18",
+	"version": "1.74.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer: cannot navigate to next or previous code suggestion in VS Code 1.78+"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeCatalyst: `AWS: Open CodeCatalyst Dev Environment` command allows filtering by Space and Project name"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeCatalyst: `AWS: Open CodeCatalyst Dev Environment` command now sorts Dev Environments by most recent usage"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.75.0.json b/packages/toolkit/.changes/1.75.0.json
new file mode 100644
index 00000000000..9dbe46fa6c0
--- /dev/null
+++ b/packages/toolkit/.changes/1.75.0.json
@@ -0,0 +1,34 @@
+{
+	"date": "2023-05-31",
+	"version": "1.75.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "auth: IAM Identity Center connections expire sooner than expected"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer: user is sometimes required to re-login before token expiration"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Add fallback to local cached files for Step Function Visualizations where host doesn't have internet."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Update dependency amazon-states-language-service from 1.9->1.10. This fixes  support for Yaml Comments in states machines, ProcessorConfig property & Credentials key."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer: Requested operation is not recognized by the service when fetching recommendations"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer sometimes add extra space at the beginning of suggestion"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer no longer trigger suggestions on IntelliSense acceptance"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.76.0.json b/packages/toolkit/.changes/1.76.0.json
new file mode 100644
index 00000000000..a802c32ad15
--- /dev/null
+++ b/packages/toolkit/.changes/1.76.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2023-06-02",
+	"version": "1.76.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Fix CodeWhisperer not found error when it is disabled by users issue #3490"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.77.0.json b/packages/toolkit/.changes/1.77.0.json
new file mode 100644
index 00000000000..471e4d9ebd8
--- /dev/null
+++ b/packages/toolkit/.changes/1.77.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2023-06-12",
+	"version": "1.77.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "SAM CLI 1.85-1.86 fails on Windows"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer: Improve file context fetching logic"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.78.0.json b/packages/toolkit/.changes/1.78.0.json
new file mode 100644
index 00000000000..9d8a99705ff
--- /dev/null
+++ b/packages/toolkit/.changes/1.78.0.json
@@ -0,0 +1,22 @@
+{
+	"date": "2023-06-27",
+	"version": "1.78.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "ECS: tasks from unrelated task definitions are shown in the \"Open Terminal...\" command"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Show re-authentication prompt if connection expires at extension restart."
+		},
+		{
+			"type": "Feature",
+			"description": "Use the `Search Log Group` command to search all log streams in a CloudWatch Log Group"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer improves auto-suggestions for tsx and jsx"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.79.0.json b/packages/toolkit/.changes/1.79.0.json
new file mode 100644
index 00000000000..cdcf057d995
--- /dev/null
+++ b/packages/toolkit/.changes/1.79.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2023-06-30",
+	"version": "1.79.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "New Add Connection workflow"
+		}
+	]
+}
\ No newline at end of file
diff --git a/.changes/1.8.0.json b/packages/toolkit/.changes/1.8.0.json
similarity index 100%
rename from .changes/1.8.0.json
rename to packages/toolkit/.changes/1.8.0.json
diff --git a/packages/toolkit/.changes/1.80.0.json b/packages/toolkit/.changes/1.80.0.json
new file mode 100644
index 00000000000..1a58c6379c4
--- /dev/null
+++ b/packages/toolkit/.changes/1.80.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2023-07-05",
+	"version": "1.80.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Fix function that determined who was a first time user"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.81.0.json b/packages/toolkit/.changes/1.81.0.json
new file mode 100644
index 00000000000..edcd2be47d7
--- /dev/null
+++ b/packages/toolkit/.changes/1.81.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2023-07-13",
+	"version": "1.81.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "codewhisperer: improper request format when sending empty supplemental context"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer: Improve suggestion quality with enhanced file context fetching"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.82.0.json b/packages/toolkit/.changes/1.82.0.json
new file mode 100644
index 00000000000..f530d92451c
--- /dev/null
+++ b/packages/toolkit/.changes/1.82.0.json
@@ -0,0 +1,22 @@
+{
+	"date": "2023-07-26",
+	"version": "1.82.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer: issue with fetching enhanced file context"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "User setting for \"Share CodeWhisperer Content With AWS\" was not reflected in workspace-level settings"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer: Improve Java suggestion quality with enhanced file context fetching"
+		},
+		{
+			"type": "Feature",
+			"description": "Lambda \"Download\" action now expects \".mjs\" extension for Node18+ lambdas"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.83.0.json b/packages/toolkit/.changes/1.83.0.json
new file mode 100644
index 00000000000..ead15c57659
--- /dev/null
+++ b/packages/toolkit/.changes/1.83.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2023-08-03",
+	"version": "1.83.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "IAM Identity Center (SSO): log a warning if SSO user is not linked to an account"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.84.0.json b/packages/toolkit/.changes/1.84.0.json
new file mode 100644
index 00000000000..4729ef26cae
--- /dev/null
+++ b/packages/toolkit/.changes/1.84.0.json
@@ -0,0 +1,26 @@
+{
+	"date": "2023-08-11",
+	"version": "1.84.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "misleading error when downloading a Lambda to a workspace without a folder"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer: Fix in some cases the inline suggestions are not showing in the editor"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Regions quickpick menu shows duplicate \"recently used\" labels"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer: Improve file context fetching for Java test files"
+		},
+		{
+			"type": "Feature",
+			"description": "IAM Identity Center (SSO): show an error if SSO user is not assigned to an account with a Permission Set"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.85.0.json b/packages/toolkit/.changes/1.85.0.json
new file mode 100644
index 00000000000..7a1d586a1ee
--- /dev/null
+++ b/packages/toolkit/.changes/1.85.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2023-08-17",
+	"version": "1.85.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "IAM Identity Center (SSO): misleading \"Permission set\" warning for scope-based SSO/IdC connection"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "auth: remote workspaces use the global state, showing incorrect profile info"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer: Improve file context fetching for Python Typescript Javascript source files"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.86.0.json b/packages/toolkit/.changes/1.86.0.json
new file mode 100644
index 00000000000..78b03f12300
--- /dev/null
+++ b/packages/toolkit/.changes/1.86.0.json
@@ -0,0 +1,34 @@
+{
+	"date": "2023-08-24",
+	"version": "1.86.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer: Fix test file supplemental context not working as expected on OS not using '/' as file path separator"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer sometimes fails on big files"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer: fix java test file name MyClassTests.java (plural) will not be captured if file is not living in a test folder"
+		},
+		{
+			"type": "Feature",
+			"description": "SAM: create, run and debug Python 3.11 Lambdas #3753"
+		},
+		{
+			"type": "Feature",
+			"description": "SAM run/debug detects and displays SAM CLI errors, so you spend less time inspecting the Output"
+		},
+		{
+			"type": "Feature",
+			"description": "SAM template detection now skips directories specified in [user settings](https://code.visualstudio.com/docs/getstarted/settings) `files.exclude`, `search.exclude`, or `files.watcherExclude`. This improves performance on big workspaces and avoids the \"Scanning CloudFormation templates...\" message. [#3510](https://github.com/aws/aws-toolkit-vscode/issues/3510)"
+		},
+		{
+			"type": "Feature",
+			"description": "Toolkit no longer explicitly checks if Docker is running, instead it lets SAM CLI decide that #3588"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.87.0.json b/packages/toolkit/.changes/1.87.0.json
new file mode 100644
index 00000000000..7ab9ff5deef
--- /dev/null
+++ b/packages/toolkit/.changes/1.87.0.json
@@ -0,0 +1,22 @@
+{
+	"date": "2023-08-31",
+	"version": "1.87.0",
+	"entries": [
+		{
+			"type": "Breaking Change",
+			"description": "Minimum required VS Code version is now 1.68"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CloudWatch Logs: \"Search Log Group\" shows multiple progress popups"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CloudWatch Logs: \"View Full Log Stream\" is limited to 1000 events instead of the `aws.cwl.limit` user setting"
+		},
+		{
+			"type": "Feature",
+			"description": "Telemetry setting description includes a details link"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.88.0.json b/packages/toolkit/.changes/1.88.0.json
new file mode 100644
index 00000000000..c578c22e027
--- /dev/null
+++ b/packages/toolkit/.changes/1.88.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2023-09-07",
+	"version": "1.88.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "ECS: \"Insufficient permissions\" message shows more details about missing permissions"
+		},
+		{
+			"type": "Feature",
+			"description": "Step Functions: Upgrade amazon-states-language-service to 1.11. This new version adds Fail State fields ErrorPath and CausePath, and on Retriers MaxDelaySeconds and JitterStrategy."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.89.0.json b/packages/toolkit/.changes/1.89.0.json
new file mode 100644
index 00000000000..968d2fecf1c
--- /dev/null
+++ b/packages/toolkit/.changes/1.89.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2023-09-08",
+	"version": "1.89.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer: show \"Reconnect\" instead of \"Start\" for expired connections to make reconnecting easier"
+		}
+	]
+}
\ No newline at end of file
diff --git a/.changes/1.9.0.json b/packages/toolkit/.changes/1.9.0.json
similarity index 100%
rename from .changes/1.9.0.json
rename to packages/toolkit/.changes/1.9.0.json
diff --git a/packages/toolkit/.changes/1.90.0.json b/packages/toolkit/.changes/1.90.0.json
new file mode 100644
index 00000000000..67fe2ea6b64
--- /dev/null
+++ b/packages/toolkit/.changes/1.90.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2023-09-15",
+	"version": "1.90.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "CodeCatalyst: \"Open CodeCatalyst Dev Environment\" may fail to connect from a new Windows system"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer: Fixed an issue where sometimes the suggestions are not matching the current editor context."
+		},
+		{
+			"type": "Feature",
+			"description": "Authentication: When signing in to AWS Builder Id or IAM Identity Center (SSO), verify the device code matches instead of copy-pasting it"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.91.0.json b/packages/toolkit/.changes/1.91.0.json
new file mode 100644
index 00000000000..401370e3455
--- /dev/null
+++ b/packages/toolkit/.changes/1.91.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2023-09-22",
+	"version": "1.91.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "SAM: Debugging a nodejs Lambda always hits breakpoint in nodejs async_hooks module before reaching the user-specified breakpoint"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer: fixed case where 'CodeWhisperer' status bar stuck loading"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.92.0.json b/packages/toolkit/.changes/1.92.0.json
new file mode 100644
index 00000000000..3ca58f49ad4
--- /dev/null
+++ b/packages/toolkit/.changes/1.92.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2023-09-29",
+	"version": "1.92.0",
+	"entries": [
+		{
+			"type": "Deprecation",
+			"description": "SAM: removed support for Node.js 12.x [Lambda runtime](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html)"
+		},
+		{
+			"type": "Deprecation",
+			"description": "SAM: removed support for .NET core 3.1 [Lambda runtime](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html)"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer: new onboarding tutorial for first-time users"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.93.0.json b/packages/toolkit/.changes/1.93.0.json
new file mode 100644
index 00000000000..45c12579f8a
--- /dev/null
+++ b/packages/toolkit/.changes/1.93.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2023-10-05",
+	"version": "1.93.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "SAM: local debugging of a .NET lambda may fail if `containerbuild=true`"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "BuilderID/IdentityCenter: Fix 'Invalid Client' error in the browser when re-authenticating"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer: remove unnecessary \"Proceed to login\" prompt"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.94.0.json b/packages/toolkit/.changes/1.94.0.json
new file mode 100644
index 00000000000..38617b5a2c1
--- /dev/null
+++ b/packages/toolkit/.changes/1.94.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2023-10-12",
+	"version": "1.94.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer: improve auto-suggestions for additional languages"
+		},
+		{
+			"type": "Feature",
+			"description": "StepFunctions: Support rendering SFN graph with ItemProcessor field"
+		},
+		{
+			"type": "Feature",
+			"description": "auth: Adding or switching connections in CodeWhisperer, CodeCatalyst and Explorer is now faster and requires fewer steps"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.95.0.json b/packages/toolkit/.changes/1.95.0.json
new file mode 100644
index 00000000000..adb95e60697
--- /dev/null
+++ b/packages/toolkit/.changes/1.95.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2023-10-17",
+	"version": "1.95.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Amazon Redshift is now available in AWS Explorer. You can author and execute SQL queries from VS Code notebooks, and view your database objects in their Redshift warehouses."
+		},
+		{
+			"type": "Feature",
+			"description": "Public preview for CodeWhisperer Enterprise: Enterprise customers can now customize CodeWhisperer to adopt and suggest code based on organization specific codebases."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.96.0.json b/packages/toolkit/.changes/1.96.0.json
new file mode 100644
index 00000000000..f597d5b5ba3
--- /dev/null
+++ b/packages/toolkit/.changes/1.96.0.json
@@ -0,0 +1,46 @@
+{
+	"date": "2023-10-26",
+	"version": "1.96.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "SAM debugging: \"Invalid (or missing) template file\" may occur even when a valid template.yaml is specified by `invokeTarget.templatePath` in the launch config. #2614"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Redshift: The output message is not clear when a sql query is successful but returns no record."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Redshift: Re-launched connection wizard shows the old (stale) connection."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "`AWS: Add SAM Debug Configuration` command only works the first time it is invoked."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Improved performance of CloudFormation file watcher startup"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Output panel always opens at VS Code launch."
+		},
+		{
+			"type": "Feature",
+			"description": "Detect and notify about invalid settings.json #3910"
+		},
+		{
+			"type": "Feature",
+			"description": "Redshift: \"Create Notebook\" opens an untitled document instead of prompting to \"Save As\""
+		},
+		{
+			"type": "Feature",
+			"description": "CloudWatch Logs: Preserve quickpick menu position when loading more items."
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer: reduce auto-suggestions when there is immediate right context"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.97.0.json b/packages/toolkit/.changes/1.97.0.json
new file mode 100644
index 00000000000..2b723aa03fb
--- /dev/null
+++ b/packages/toolkit/.changes/1.97.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2023-11-02",
+	"version": "1.97.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer: fix and improve closing symbols handling (brackets, parenthesis, quotes etc)"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.98.0.json b/packages/toolkit/.changes/1.98.0.json
new file mode 100644
index 00000000000..fc993e6e911
--- /dev/null
+++ b/packages/toolkit/.changes/1.98.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2023-11-09",
+	"version": "1.98.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer, CodeCatalyst may require login again after Switching VSCode workspaces"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "\"Scanning CloudFormation templates...\" message `Cancel` button does not fully stop the scan"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "ECS: `SimulatePrincipalPolicy` permission is no longer required for users to run `exec command`"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/1.99.0.json b/packages/toolkit/.changes/1.99.0.json
new file mode 100644
index 00000000000..724b3c8d104
--- /dev/null
+++ b/packages/toolkit/.changes/1.99.0.json
@@ -0,0 +1,22 @@
+{
+	"date": "2023-11-17",
+	"version": "1.99.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer: status bar lists options when clicked and shows suggestion state"
+		},
+		{
+			"type": "Feature",
+			"description": "Don't show \"invalid settings.json\" message if settings.json is valid but unwritable"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer: faster code completion by enabling HTTP connection reuse for completions API"
+		},
+		{
+			"type": "Feature",
+			"description": "Connect to Amazon CodeCatalyst Dev Environments with IAM Identity Center"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/2.0.0.json b/packages/toolkit/.changes/2.0.0.json
new file mode 100644
index 00000000000..cdb3f54ebc2
--- /dev/null
+++ b/packages/toolkit/.changes/2.0.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2023-11-28",
+	"version": "2.0.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer status bar showing even when not in use"
+		},
+		{
+			"type": "Feature",
+			"description": "Auth: Delete SSO connections from quickpick with button on hover"
+		},
+		{
+			"type": "Feature",
+			"description": "Support for Amazon Q, your generative AI–powered assistant designed for work that can be tailored to your business, code, data, and operations."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/2.1.0.json b/packages/toolkit/.changes/2.1.0.json
new file mode 100644
index 00000000000..8cbcc552fd0
--- /dev/null
+++ b/packages/toolkit/.changes/2.1.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2023-11-30",
+	"version": "2.1.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Use MDE endpoint set by environment variable"
+		},
+		{
+			"type": "Feature",
+			"description": "AWS Application Composer is now available from the AWS Toolkit for Visual Studio Code. Visualize and design AWS CloudFormation and AWS SAM applications from your local machine. Use integrations with featured services such as Amazon CodeWhisperer, AWS Step Functions, and AWS SAM to improve your development experience."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/2.10.0.json b/packages/toolkit/.changes/2.10.0.json
new file mode 100644
index 00000000000..b929ca6767d
--- /dev/null
+++ b/packages/toolkit/.changes/2.10.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2024-02-16",
+	"version": "2.10.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "CDK Explorer: Refresh button is now visible."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/2.11.0.json b/packages/toolkit/.changes/2.11.0.json
new file mode 100644
index 00000000000..3cb5b5b5bf8
--- /dev/null
+++ b/packages/toolkit/.changes/2.11.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2024-02-22",
+	"version": "2.11.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Amazon Q: /dev command now supports the InvalidState event during the GenerateApproach step. The reason for the Approach to reach an Invalid State is printed in /dev's chat response."
+		},
+		{
+			"type": "Feature",
+			"description": "CloudFormation and SAM templates now have a CodeLens link to Application Composer"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q CodeTransformation: show user build logs for Maven install and copy-deps commands"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/2.12.0.json b/packages/toolkit/.changes/2.12.0.json
new file mode 100644
index 00000000000..ee7d88c0cad
--- /dev/null
+++ b/packages/toolkit/.changes/2.12.0.json
@@ -0,0 +1,30 @@
+{
+	"date": "2024-02-29",
+	"version": "2.12.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q: Static analysis of document symbols used as context in Amazon Q requests must filter tree-sitter \"extra\" CST nodes (comments) in order to avoid crashes which freeze the chat panel"
+		},
+		{
+			"type": "Feature",
+			"description": "Enable node 20 for SAM create and local Lambda debugging"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q CodeTransform: show link to documentation after errors"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer: Improve percentage code written metrics to include user multi character input"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer: Add startUrl to security scan telemetry"
+		},
+		{
+			"type": "Feature",
+			"description": "UI: Improve text description in login page"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/2.13.0.json b/packages/toolkit/.changes/2.13.0.json
new file mode 100644
index 00000000000..ce070be0077
--- /dev/null
+++ b/packages/toolkit/.changes/2.13.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2024-03-07",
+	"version": "2.13.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "fix(CodeTransform): Updating commands for copying dependencies"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "\"Failed to access settings\" error when restarting multiple vscode instances"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q: Fix code snippet borders, action button border radius, text alignment and overlay UI issues"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/2.14.0.json b/packages/toolkit/.changes/2.14.0.json
new file mode 100644
index 00000000000..332918d0a2d
--- /dev/null
+++ b/packages/toolkit/.changes/2.14.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2024-03-08",
+	"version": "2.14.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Amazon Q Feature Dev (/dev): Ask Q to generate code based on the suggested plan"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/2.15.0.json b/packages/toolkit/.changes/2.15.0.json
new file mode 100644
index 00000000000..c6156edf69f
--- /dev/null
+++ b/packages/toolkit/.changes/2.15.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2024-03-14",
+	"version": "2.15.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer: Include copied code in percentage code written metrics"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q: Fixed prompt input submit with enter if IME enabled [#4125](https://github.com/aws/aws-toolkit-vscode/issues/4125), requires shift+enter while IME enabled"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/2.16.0.json b/packages/toolkit/.changes/2.16.0.json
new file mode 100644
index 00000000000..e82c897ef71
--- /dev/null
+++ b/packages/toolkit/.changes/2.16.0.json
@@ -0,0 +1,46 @@
+{
+	"date": "2024-03-21",
+	"version": "2.16.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer: UI notification \"no suggestion\" not shown correctly"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Lower chance of project upload failures when using Q CodeTransform."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "FeatureDev: Rejected files are excluded when generated code is accepted by the customer"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix CodeWhisperer API call failure in SageMaker Code Editor"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer: Improve UI to indicate CodeWhisperer is generating suggestions"
+		},
+		{
+			"type": "Feature",
+			"description": "Q CodeTransformation: show prompt to submit feedback at end of job"
+		},
+		{
+			"type": "Feature",
+			"description": "Improved performance: SSM Documents and Step Functions LSP clients/servers are now started only when they are needed."
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer: Improve UI to walk through new CodeWhisperer users how-to"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer/Q actions are now available from the status bar menu instead of a dedicated panel."
+		},
+		{
+			"type": "Feature",
+			"description": "Expose listConnections API in AWS Toolkit"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/2.17.0.json b/packages/toolkit/.changes/2.17.0.json
new file mode 100644
index 00000000000..f45481a9f47
--- /dev/null
+++ b/packages/toolkit/.changes/2.17.0.json
@@ -0,0 +1,26 @@
+{
+	"date": "2024-03-28",
+	"version": "2.17.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer: Infinite loop of logging if users' editor focus is on OUTPUT tab"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Code block colors remapped to proper ones"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer: Inline tutorial state not persisted when user press ESC to skip the tutorial"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q Code Transformation: show detailed progress updates in Transformation Hub"
+		},
+		{
+			"type": "Feature",
+			"description": "Code Transformation runs through Amazon Q Chat"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/2.18.0.json b/packages/toolkit/.changes/2.18.0.json
new file mode 100644
index 00000000000..b1acc623183
--- /dev/null
+++ b/packages/toolkit/.changes/2.18.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2024-04-04",
+	"version": "2.18.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Feature Dev: Fix followups after hitting iteration limit"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Code Transformation: remove Transform button from side panel, use /transform in chat now"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Code Transformation: allow \"Start a new transformation\" button in chat to work after job fails"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/2.19.0.json b/packages/toolkit/.changes/2.19.0.json
new file mode 100644
index 00000000000..9858bc0543e
--- /dev/null
+++ b/packages/toolkit/.changes/2.19.0.json
@@ -0,0 +1,30 @@
+{
+	"date": "2024-04-15",
+	"version": "2.19.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q: Fixed quick action command list inconsistency between Q tabs"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Code Transform: Handle whitespaces in manually entered JAVA_HOME"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q: Fixed cursor not focuses to prompt input when code is sent to Q Chat"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q: Fixed newly opening tabs have all quick actions disabled."
+		},
+		{
+			"type": "Feature",
+			"description": "Support extended CodeWhisperer session durations when using CodeCatalyst on the same SSO connection"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q Feature Dev: Use project context from workspace root directory instead of the /src folder"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/2.2.0.json b/packages/toolkit/.changes/2.2.0.json
new file mode 100644
index 00000000000..fcb56907580
--- /dev/null
+++ b/packages/toolkit/.changes/2.2.0.json
@@ -0,0 +1,26 @@
+{
+	"date": "2023-12-06",
+	"version": "2.2.0",
+	"entries": [
+		{
+			"type": "Breaking Change",
+			"description": "validate that pom.xml is in root directory of project, not anywhere in project"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "AWS Toolkit submenus appear in other extension views #4111"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeCatalyst: \"No handler found\" error may occur when opening `vscode://` URI #4105"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer: Security scans for Java no longer require build artifacts"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q: Input prompt gets wrapped to new line which avoids focusing"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/2.20.0.json b/packages/toolkit/.changes/2.20.0.json
new file mode 100644
index 00000000000..be8f6ed52b4
--- /dev/null
+++ b/packages/toolkit/.changes/2.20.0.json
@@ -0,0 +1,26 @@
+{
+	"date": "2024-04-19",
+	"version": "2.20.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q CodeTransform may fail if JAVA_HOME has leading or trailing whitespace"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q FeatureDev: code generation may fail with \"conversation id not found\" error"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Code Transformation: show error messages in chat"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Code Transformation - Omit Maven metadata files when uploading dependencies to fix certain build failures in backend."
+		},
+		{
+			"type": "Feature",
+			"description": "Enable Amazon Q feature development and Amazon Q transform capabilities (/dev and /transform) for AWS Builder ID users."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/2.3.0.json b/packages/toolkit/.changes/2.3.0.json
new file mode 100644
index 00000000000..1d0572b7c46
--- /dev/null
+++ b/packages/toolkit/.changes/2.3.0.json
@@ -0,0 +1,38 @@
+{
+	"date": "2023-12-15",
+	"version": "2.3.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Help > View Toolkit Logs opens an empty file if other menu items were interacted with first."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer: Increase polling frequency for security scans."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Opening a CodeCatalyst dev env triggers a builder ID login in certain situations."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q: Fixed an issue where sometimes /transform won't appear when switching between idC/builder id"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q: 'Switch to Q Chat' button not working for some users."
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer security scans support ruby files."
+		},
+		{
+			"type": "Feature",
+			"description": "The `aws.samcli.enableCodeLenses` setting now enables/disables SAM codelenses in `template.yaml` files, in addition to source code files."
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer security scans now support Go files."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/2.4.0.json b/packages/toolkit/.changes/2.4.0.json
new file mode 100644
index 00000000000..677973978f7
--- /dev/null
+++ b/packages/toolkit/.changes/2.4.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2023-12-19",
+	"version": "2.4.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q: `/dev` command may fail with \"Conversation id must exist\""
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer supports code generation for Iac languages without external extensions"
+		},
+		{
+			"type": "Feature",
+			"description": "Code Transform Telemetry includes additional metadata"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/2.5.0.json b/packages/toolkit/.changes/2.5.0.json
new file mode 100644
index 00000000000..a66da362a2f
--- /dev/null
+++ b/packages/toolkit/.changes/2.5.0.json
@@ -0,0 +1,58 @@
+{
+	"date": "2024-01-11",
+	"version": "2.5.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer: Fixes a bug where accepting a recommendation in AWS Cloud9 will trigger another suggestion"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q: correct code selection range for one-line selections"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer: Security Scan Log output is blank if log level is not \"verbose\"."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Chat: Fixed code block text background"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Transform: delete temp files we create when no longer needed"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q Transform: make copy-dependencies command less error prone"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer: fix incorrect error handling causing TypeError .includes is not a function"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q: \"Transformation Hub\" is always visible, even if Transform feature is not enabled or used"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer: add select customization action to notification"
+		},
+		{
+			"type": "Feature",
+			"description": "feat(sam): python 3.12 support for SAM, lambda"
+		},
+		{
+			"type": "Feature",
+			"description": "Browser: Enable generic global commands in ellipses menus, e.g. About Toolkit, Report Toolkit Issue, etc."
+		},
+		{
+			"type": "Removal",
+			"description": "Commands: Remove redundant 'View Quick Start' command from appearing in non-Cloud9 versions of the toolkit."
+		},
+		{
+			"type": "Removal",
+			"description": "Amazon Q, CodeWhisperer: Remove 'Switch Connections' menu item, and only show 'Add new connection' when not signed in."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/2.6.0.json b/packages/toolkit/.changes/2.6.0.json
new file mode 100644
index 00000000000..a83175da873
--- /dev/null
+++ b/packages/toolkit/.changes/2.6.0.json
@@ -0,0 +1,34 @@
+{
+	"date": "2024-01-18",
+	"version": "2.6.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer suggestions may be trimmed under certain criteria"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Amazon Q CodeTransform: open summary.md automatically when job finishes"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer not handling extra closing symbols (parenthesis, brackets, quotes) when user typeahead exists"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Cloud9: error when expanding S3 folder"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "SAM local debugging: Toolkit showed SamLaunchRequestError for `AWS::Lambda::Function` template resource"
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon Q CodeTransform: use Maven wrapper (if present) to copy dependencies if Maven not installed"
+		},
+		{
+			"type": "Feature",
+			"description": "SAM lambda debugging: SAM output and other logs are now presented with VSCode's log highlighting"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/2.7.0.json b/packages/toolkit/.changes/2.7.0.json
new file mode 100644
index 00000000000..77fa2a863e7
--- /dev/null
+++ b/packages/toolkit/.changes/2.7.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2024-01-25",
+	"version": "2.7.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Add invalid auth handling to Application Composer's Sync button"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/2.8.0.json b/packages/toolkit/.changes/2.8.0.json
new file mode 100644
index 00000000000..3b2a48c398b
--- /dev/null
+++ b/packages/toolkit/.changes/2.8.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2024-02-01",
+	"version": "2.8.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer: Improve CodePercentage telemetry reporting"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/2.9.0.json b/packages/toolkit/.changes/2.9.0.json
new file mode 100644
index 00000000000..94ff6436aee
--- /dev/null
+++ b/packages/toolkit/.changes/2.9.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2024-02-09",
+	"version": "2.9.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Cloud9: certain filesystem calls did not work in Cloud9"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "EC2 Credentials: Use IMDSv2 calls if available, otherwise fall back IMDSv1."
+		},
+		{
+			"type": "Feature",
+			"description": "Enable java 17 for SAM create and local Lambda debugging"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.0.0.json b/packages/toolkit/.changes/3.0.0.json
new file mode 100644
index 00000000000..22db8ba051a
--- /dev/null
+++ b/packages/toolkit/.changes/3.0.0.json
@@ -0,0 +1,22 @@
+{
+	"date": "2024-04-30",
+	"version": "3.0.0",
+	"entries": [
+		{
+			"type": "Breaking Change",
+			"description": "Remove Amazon Q and CodeWhisperer features. They are now a part of the [Amazon Q extension](https://marketplace.visualstudio.com/items?itemName=AmazonWebServices.amazon-q-vscode)."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeCatalyst: User can create a dev environment inside a dev environment"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeCatalyst: Fix extension activation in new dev environments"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeCatalyst: Fix heartbeat activity registration"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.1.0.json b/packages/toolkit/.changes/3.1.0.json
new file mode 100644
index 00000000000..266b350f870
--- /dev/null
+++ b/packages/toolkit/.changes/3.1.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2024-04-30",
+	"version": "3.1.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Installation error when installing amazon q in remote AND you have the extension locally"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Application Composer: Support template file watching outside of the workspace."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.10.0.json b/packages/toolkit/.changes/3.10.0.json
new file mode 100644
index 00000000000..0bc6cb02889
--- /dev/null
+++ b/packages/toolkit/.changes/3.10.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2024-06-14",
+	"version": "3.10.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "UX: Amazon Q continues to install even if users uninstall it."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "CodeCatalyst: Dev Environment may time out if user is not authenticated"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.11.0.json b/packages/toolkit/.changes/3.11.0.json
new file mode 100644
index 00000000000..09b6ae81ec1
--- /dev/null
+++ b/packages/toolkit/.changes/3.11.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2024-06-21",
+	"version": "3.11.0",
+	"entries": [
+		{
+			"type": "Removal",
+			"description": "Auth: No longer share SSO sessions with Amazon Q."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.12.0.json b/packages/toolkit/.changes/3.12.0.json
new file mode 100644
index 00000000000..819dc8c9793
--- /dev/null
+++ b/packages/toolkit/.changes/3.12.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2024-06-27",
+	"version": "3.12.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Step functions language server activates when editing ASL documents from previous session"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Step functions language server activation fails"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.13.0.json b/packages/toolkit/.changes/3.13.0.json
new file mode 100644
index 00000000000..44ed9856222
--- /dev/null
+++ b/packages/toolkit/.changes/3.13.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2024-07-08",
+	"version": "3.13.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Add warning message for drag and drop bug on VS Code 1.91.0"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeCatalyst: always show Dev Environment timeout warning as modal prompt"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.14.0.json b/packages/toolkit/.changes/3.14.0.json
new file mode 100644
index 00000000000..7826e01fcba
--- /dev/null
+++ b/packages/toolkit/.changes/3.14.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2024-07-11",
+	"version": "3.14.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "App composer generate suggestion unclickable when logged in"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "AD/LDAP users may see \"uv_os_get_passwd ENOENT\" error on startup #5277"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.15.0.json b/packages/toolkit/.changes/3.15.0.json
new file mode 100644
index 00000000000..88cb0c986f7
--- /dev/null
+++ b/packages/toolkit/.changes/3.15.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2024-07-18",
+	"version": "3.15.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Unexpected SSO expiration on Windows due to EPERM"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.16.0.json b/packages/toolkit/.changes/3.16.0.json
new file mode 100644
index 00000000000..cd7f96fb9a1
--- /dev/null
+++ b/packages/toolkit/.changes/3.16.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2024-07-25",
+	"version": "3.16.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "AccessAnalyzer: error when running CheckNoPublicAccess with only role trust policy in template"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.17.0.json b/packages/toolkit/.changes/3.17.0.json
new file mode 100644
index 00000000000..c5cbb6dcf33
--- /dev/null
+++ b/packages/toolkit/.changes/3.17.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2024-07-29",
+	"version": "3.17.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "FileNotFound error causing early SSO expiration"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.2.0.json b/packages/toolkit/.changes/3.2.0.json
new file mode 100644
index 00000000000..1370dc4c637
--- /dev/null
+++ b/packages/toolkit/.changes/3.2.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2024-05-06",
+	"version": "3.2.0",
+	"entries": [
+		{
+			"type": "Release",
+			"description": "No user-facing changes"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.21.0.json b/packages/toolkit/.changes/3.21.0.json
new file mode 100644
index 00000000000..db3bfd4b710
--- /dev/null
+++ b/packages/toolkit/.changes/3.21.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2024-08-22",
+	"version": "3.21.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Various backend fixes"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.22.0.json b/packages/toolkit/.changes/3.22.0.json
new file mode 100644
index 00000000000..4ad488ccf8a
--- /dev/null
+++ b/packages/toolkit/.changes/3.22.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2024-08-29",
+	"version": "3.22.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Auth: `SyntaxError` causing unexpected SSO logout"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Auth: Users may be silently logged out due to network issues when starting the extension."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.23.0.json b/packages/toolkit/.changes/3.23.0.json
new file mode 100644
index 00000000000..627f309eaf4
--- /dev/null
+++ b/packages/toolkit/.changes/3.23.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2024-09-05",
+	"version": "3.23.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Network errors causing premature SSO logout"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Fix SyntaxError causing premature expiration (edge case)"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.24.0.json b/packages/toolkit/.changes/3.24.0.json
new file mode 100644
index 00000000000..cfb34f015a9
--- /dev/null
+++ b/packages/toolkit/.changes/3.24.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2024-09-12",
+	"version": "3.24.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Record telemetry event when AWS Toolkits extension is uninstalled."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.25.0.json b/packages/toolkit/.changes/3.25.0.json
new file mode 100644
index 00000000000..a239721cf94
--- /dev/null
+++ b/packages/toolkit/.changes/3.25.0.json
@@ -0,0 +1,30 @@
+{
+	"date": "2024-09-19",
+	"version": "3.25.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "no longer gives option to copy instance id on ec2 parent node."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Login state not updating across multiple VS Code windows."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Redshift: updated the list clusters and workgroups for regions which do not have serverless APIs"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "when connecting to ec2 instance, check for IAM role permitted actions, rather than full policies"
+		},
+		{
+			"type": "Feature",
+			"description": "EC2 nodes in explorer update status automatically"
+		},
+		{
+			"type": "Feature",
+			"description": "ec2 instance status is reinforced with icons and text"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.26.0.json b/packages/toolkit/.changes/3.26.0.json
new file mode 100644
index 00000000000..3e0d8210979
--- /dev/null
+++ b/packages/toolkit/.changes/3.26.0.json
@@ -0,0 +1,22 @@
+{
+	"date": "2024-09-27",
+	"version": "3.26.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "EC2 connect: remote connection will no longer fail with 'too many authentication attempt'"
+		},
+		{
+			"type": "Feature",
+			"description": "EC2 connect: use ed25519 to generate ec2 ssh key pair"
+		},
+		{
+			"type": "Feature",
+			"description": "EC2 connect: default to ed25519, but fall back on rsa if unsupported"
+		},
+		{
+			"type": "Feature",
+			"description": "EC2: Launch ec2 instances from AWS Explorer"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.27.0.json b/packages/toolkit/.changes/3.27.0.json
new file mode 100644
index 00000000000..77f6aa63120
--- /dev/null
+++ b/packages/toolkit/.changes/3.27.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2024-10-03",
+	"version": "3.27.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "rename Application Composer to Infrastructure Composer"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.28.0.json b/packages/toolkit/.changes/3.28.0.json
new file mode 100644
index 00000000000..524679e9c3e
--- /dev/null
+++ b/packages/toolkit/.changes/3.28.0.json
@@ -0,0 +1,26 @@
+{
+	"date": "2024-10-10",
+	"version": "3.28.0",
+	"entries": [
+		{
+			"type": "Breaking Change",
+			"description": "Bumping VS Code minimum version to 1.83.0"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "update animate graph for infraComposer in toolkit README"
+		},
+		{
+			"type": "Deprecation",
+			"description": "The next release of this extension will require VS Code 1.83.0 or newer."
+		},
+		{
+			"type": "Feature",
+			"description": "Show a one-time warning if new VS Code is required"
+		},
+		{
+			"type": "Removal",
+			"description": "Minimum required VSCode version is now 1.83"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.29.0.json b/packages/toolkit/.changes/3.29.0.json
new file mode 100644
index 00000000000..0be09e8c1b8
--- /dev/null
+++ b/packages/toolkit/.changes/3.29.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2024-10-17",
+	"version": "3.29.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Fix userCredentialsUtils.test.ts so it won't remove the actual aws config"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.3.0.json b/packages/toolkit/.changes/3.3.0.json
new file mode 100644
index 00000000000..0821c162ca1
--- /dev/null
+++ b/packages/toolkit/.changes/3.3.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2024-05-13",
+	"version": "3.3.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "UX: Added keyboard navigation to login screen."
+		},
+		{
+			"type": "Feature",
+			"description": "New SSO Authorization Code flow for faster logins"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.30.0.json b/packages/toolkit/.changes/3.30.0.json
new file mode 100644
index 00000000000..f199ad627ad
--- /dev/null
+++ b/packages/toolkit/.changes/3.30.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2024-10-29",
+	"version": "3.30.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "EC2 connect: improve management of SSM sessions to minimize chance they are left active."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "fixed device code detection when running auth through tunneled vscode"
+		},
+		{
+			"type": "Feature",
+			"description": "EC2: provide view of ec2 system logs"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.31.0.json b/packages/toolkit/.changes/3.31.0.json
new file mode 100644
index 00000000000..65caa0bc180
--- /dev/null
+++ b/packages/toolkit/.changes/3.31.0.json
@@ -0,0 +1,38 @@
+{
+	"date": "2024-10-30",
+	"version": "3.31.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "SAM: Added support for Java 21 Lambda runtime"
+		},
+		{
+			"type": "Feature",
+			"description": "AWS Lambda: AWS Explorer command palette actions and hover buttons to build, local invoke, deploy, and remote invoke"
+		},
+		{
+			"type": "Feature",
+			"description": "AWS Lambda: Improved local test and debug and remote invoke to streamline creating and sharing sample events"
+		},
+		{
+			"type": "Feature",
+			"description": "AWS Lambda: 'Application Builder' is a new sidebar view for viewing application resources and links to create, build, debug, and test serverless applications"
+		},
+		{
+			"type": "Feature",
+			"description": "SAM: Added support for Ruby 3.3 Lambda runtime"
+		},
+		{
+			"type": "Feature",
+			"description": "SAM: Added support for Ruby 3.2 Lambda runtime"
+		},
+		{
+			"type": "Feature",
+			"description": "AWS Lambda: Guided walkthrough contains links to set up local IDE environment, install required tools, several starter templates, and guidance on how to get started building serverless applications"
+		},
+		{
+			"type": "Feature",
+			"description": "SAM: Added support for .NET 8.0 Lambda runtime"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.32.0.json b/packages/toolkit/.changes/3.32.0.json
new file mode 100644
index 00000000000..4a9f16b7c63
--- /dev/null
+++ b/packages/toolkit/.changes/3.32.0.json
@@ -0,0 +1,22 @@
+{
+	"date": "2024-11-07",
+	"version": "3.32.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "SAM: Save SAM deploy parameters to correct samconfig.toml in project folder"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "System Path parsing should ignore Windows and only parse Mac/Linux system, Sam Local Invoke should get correct system Path on windows #5933 #5918"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "SAM: Skip unnecessary prompters for sync operation when using flag from samconfig.toml file"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "AWS Lambda: Removed action to delete a Lambda or S3 bucket in the AppBuilder section as resources created through IaC frameworks should not be directly modified since this creates drift"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.33.0.json b/packages/toolkit/.changes/3.33.0.json
new file mode 100644
index 00000000000..23b5512bafa
--- /dev/null
+++ b/packages/toolkit/.changes/3.33.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2024-11-11",
+	"version": "3.33.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "UI: region-related quickpicks now have a refresh button"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.34.0.json b/packages/toolkit/.changes/3.34.0.json
new file mode 100644
index 00000000000..45d8da40a9f
--- /dev/null
+++ b/packages/toolkit/.changes/3.34.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2024-11-14",
+	"version": "3.34.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "SAM debugging: misleading 'IaC' message/placeholder"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "SAM local debugging: `aws.region` and `aws.credentials` specified in launch config should override default Toolkit region and credentials"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.35.0.json b/packages/toolkit/.changes/3.35.0.json
new file mode 100644
index 00000000000..94e1b8d6f74
--- /dev/null
+++ b/packages/toolkit/.changes/3.35.0.json
@@ -0,0 +1,38 @@
+{
+	"date": "2024-11-22",
+	"version": "3.35.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "SAM: Update Sync and Deploy prompter titles for parameter source"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "SAM: Add artifact bucket source prompter for SAM sync command"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "SAM: Update Sync prompter title for sync parameters"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "SAM: Fix prompter button URLs for build, deploy and sync commands"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "EC2: terminated instances no longer show pending icon"
+		},
+		{
+			"type": "Feature",
+			"description": "python 3.13 support for SAM and lambda"
+		},
+		{
+			"type": "Feature",
+			"description": "nodejs22.x support for SAM and lambda"
+		},
+		{
+			"type": "Feature",
+			"description": "Notifications: Support for delivering critical alerts and product updates"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.36.0.json b/packages/toolkit/.changes/3.36.0.json
new file mode 100644
index 00000000000..b47a6aed217
--- /dev/null
+++ b/packages/toolkit/.changes/3.36.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2024-11-27",
+	"version": "3.36.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "appBuilder refresh feature doesnt work during sync --watch"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "'View Logs...' action redirects to output channel instead of Terminal"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.38.0.json b/packages/toolkit/.changes/3.38.0.json
new file mode 100644
index 00000000000..00d492c4add
--- /dev/null
+++ b/packages/toolkit/.changes/3.38.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2024-12-10",
+	"version": "3.38.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Step Functions: Upgrade amazon-states-language-service to 1.13. This new version adds support for [JSONata and Variables](https://aws.amazon.com/blogs/compute/simplifying-developer-experience-with-variables-and-jsonata-in-aws-step-functions/)."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.39.0.json b/packages/toolkit/.changes/3.39.0.json
new file mode 100644
index 00000000000..f10ef838df4
--- /dev/null
+++ b/packages/toolkit/.changes/3.39.0.json
@@ -0,0 +1,22 @@
+{
+	"date": "2024-12-12",
+	"version": "3.39.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "EC2: avoid overwriting authorized_keys file on remote"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Auth: SSO session was bad, but no reauth prompt given"
+		},
+		{
+			"type": "Feature",
+			"description": "Enable the EC2 experiment (setting id: `aws.experiments`) in VSCode settings to try the new EC2 features of AWS Toolkit! Remote Connect and Open Terminal to EC2 instances, list EC2 instances and view their status in AWS Explorer. "
+		},
+		{
+			"type": "Feature",
+			"description": "CloudWatch Logs: Added support for Live Tailing LogGroups. Start using LiveTail by: selecting 'Tail Log Group' in the command palette, or, right clicking/pressing the 'Play' icon on a Log Group in the Explorer menu. See [Troubleshoot with CloudWatch Logs Live Tail](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatchLogs_LiveTail.html) for more information. LiveTail is a paid feature - for more information about pricing, see the Logs tab at [Amazon CloudWatch Pricing](https://aws.amazon.com/cloudwatch/pricing/)."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.4.0.json b/packages/toolkit/.changes/3.4.0.json
new file mode 100644
index 00000000000..2e1a877e478
--- /dev/null
+++ b/packages/toolkit/.changes/3.4.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2024-05-17",
+	"version": "3.4.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "CodeCatalyst: No longer display a prompt to 'Onboard' if re-using an existing connection from Amazon Q and it is already onboarded."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.40.0.json b/packages/toolkit/.changes/3.40.0.json
new file mode 100644
index 00000000000..526c5d6578e
--- /dev/null
+++ b/packages/toolkit/.changes/3.40.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2024-12-17",
+	"version": "3.40.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Auth: SSO failed to missing refreshToken"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "AppBuilder : Support template parameters override for SAM deploy and sync for all entry points"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.41.0.json b/packages/toolkit/.changes/3.41.0.json
new file mode 100644
index 00000000000..029c2753563
--- /dev/null
+++ b/packages/toolkit/.changes/3.41.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2025-01-09",
+	"version": "3.41.0",
+	"entries": [
+		{
+			"type": "Removal",
+			"description": "Amazon Q: No longer autoinstall Amazon Q if the user had used CodeWhisperer in old Toolkit versions."
+		},
+		{
+			"type": "Removal",
+			"description": "Auth: No longer inform users that Amazon Q and Toolkit extensions have separate auth sessions."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.42.0.json b/packages/toolkit/.changes/3.42.0.json
new file mode 100644
index 00000000000..73b08afc915
--- /dev/null
+++ b/packages/toolkit/.changes/3.42.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2025-01-15",
+	"version": "3.42.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Auth: Valid StartURL not accepted at login"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.43.0.json b/packages/toolkit/.changes/3.43.0.json
new file mode 100644
index 00000000000..f8785bff22f
--- /dev/null
+++ b/packages/toolkit/.changes/3.43.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2025-01-23",
+	"version": "3.43.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "AppBuilder: Update error messaging to make more legible and actionable"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Notifications: 'Dismiss' command visible in command palette."
+		},
+		{
+			"type": "Removal",
+			"description": "Cloud9: remove special-case logic."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.44.0.json b/packages/toolkit/.changes/3.44.0.json
new file mode 100644
index 00000000000..34d1a2217c4
--- /dev/null
+++ b/packages/toolkit/.changes/3.44.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2025-01-30",
+	"version": "3.44.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Policy Checks selected profile is always default"
+		},
+		{
+			"type": "Feature",
+			"description": "From the Lambda treeview in AWS Explorer, you can now right-click on a function name and start a CloudWatch Logs Live Tail sessions for the selected function."
+		},
+		{
+			"type": "Feature",
+			"description": "EC2 is now available in AWS Explorer:\n\n1. Remote-connect VSCode to your EC2 instances.\n2. Open terminal to your EC2 instances.\n3. Start, stop, and visit the Launch page."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.45.0.json b/packages/toolkit/.changes/3.45.0.json
new file mode 100644
index 00000000000..c5166f34091
--- /dev/null
+++ b/packages/toolkit/.changes/3.45.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2025-02-05",
+	"version": "3.45.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Add support for DocumentDB clusters"
+		},
+		{
+			"type": "Feature",
+			"description": "Step Functions: Upgrade amazon-states-language-service to 1.15. This new version enhance autocomplete for variable and JSONata expression in JSON ASL files."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.46.0.json b/packages/toolkit/.changes/3.46.0.json
new file mode 100644
index 00000000000..0db6d895b2c
--- /dev/null
+++ b/packages/toolkit/.changes/3.46.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2025-02-13",
+	"version": "3.46.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Lambda: Support for environment variables in the editor webview."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.47.0.json b/packages/toolkit/.changes/3.47.0.json
new file mode 100644
index 00000000000..247f2ba11f5
--- /dev/null
+++ b/packages/toolkit/.changes/3.47.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2025-02-20",
+	"version": "3.47.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "appBuilder: pass '--no-use-container' when '--use-container' is not selected in quickpick"
+		},
+		{
+			"type": "Feature",
+			"description": "App Builder: Autoload debug configuration for local invoke webview"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.48.0.json b/packages/toolkit/.changes/3.48.0.json
new file mode 100644
index 00000000000..1e019ba60d5
--- /dev/null
+++ b/packages/toolkit/.changes/3.48.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2025-02-27",
+	"version": "3.48.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Step Functions: Expand data source and output options for Distributed Map in ASL language schema"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.49.0.json b/packages/toolkit/.changes/3.49.0.json
new file mode 100644
index 00000000000..5d640a1c383
--- /dev/null
+++ b/packages/toolkit/.changes/3.49.0.json
@@ -0,0 +1,30 @@
+{
+	"date": "2025-03-06",
+	"version": "3.49.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Step Functions: Updated previewStateMachine command to open with Workflow Studio instead"
+		},
+		{
+			"type": "Feature",
+			"description": "Lambda: Users can explore Serverless Land patterns"
+		},
+		{
+			"type": "Feature",
+			"description": "Step Functions: Added support for calling the TestState API in Workflow Studio"
+		},
+		{
+			"type": "Feature",
+			"description": "Step Functions: Added support for using Workflow Studio for editing ASL files in JSON and YAML"
+		},
+		{
+			"type": "Feature",
+			"description": "AppBuilder: selecting a runtime in the local invoke view can override the runtime specified in template.yaml"
+		},
+		{
+			"type": "Feature",
+			"description": "Step Functions: Allow starting state machine execution with no input provided"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.51.0.json b/packages/toolkit/.changes/3.51.0.json
new file mode 100644
index 00000000000..53ab636d4d4
--- /dev/null
+++ b/packages/toolkit/.changes/3.51.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2025-03-20",
+	"version": "3.51.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Update Step Functions marketplace documentation."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.52.0.json b/packages/toolkit/.changes/3.52.0.json
new file mode 100644
index 00000000000..7fb11ef522f
--- /dev/null
+++ b/packages/toolkit/.changes/3.52.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2025-03-28",
+	"version": "3.52.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "SAM build: prevent running multiple build processes for the same template"
+		},
+		{
+			"type": "Feature",
+			"description": "Lambda: Add 'Process SNS notification messages with Lambda' Serverless Land pattern."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.53.0.json b/packages/toolkit/.changes/3.53.0.json
new file mode 100644
index 00000000000..79344520031
--- /dev/null
+++ b/packages/toolkit/.changes/3.53.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2025-04-03",
+	"version": "3.53.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Step Functions: Use WorkflowStudio to render StateMachine Graph in CDK applications"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.54.0.json b/packages/toolkit/.changes/3.54.0.json
new file mode 100644
index 00000000000..4fd39ef1882
--- /dev/null
+++ b/packages/toolkit/.changes/3.54.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-04-09",
+	"version": "3.54.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.55.0.json b/packages/toolkit/.changes/3.55.0.json
new file mode 100644
index 00000000000..6260a59c447
--- /dev/null
+++ b/packages/toolkit/.changes/3.55.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-04-18",
+	"version": "3.55.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.56.0.json b/packages/toolkit/.changes/3.56.0.json
new file mode 100644
index 00000000000..58ce02582e1
--- /dev/null
+++ b/packages/toolkit/.changes/3.56.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-04-25",
+	"version": "3.56.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.57.0.json b/packages/toolkit/.changes/3.57.0.json
new file mode 100644
index 00000000000..b7deaa57598
--- /dev/null
+++ b/packages/toolkit/.changes/3.57.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2025-05-01",
+	"version": "3.57.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "AppBuilder: unchecking the 'Attach a debugger' checkbox in local invoke webview invokes the function without a debugger"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.58.0.json b/packages/toolkit/.changes/3.58.0.json
new file mode 100644
index 00000000000..2fdddbec911
--- /dev/null
+++ b/packages/toolkit/.changes/3.58.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-05-02",
+	"version": "3.58.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.59.0.json b/packages/toolkit/.changes/3.59.0.json
new file mode 100644
index 00000000000..954cadb9161
--- /dev/null
+++ b/packages/toolkit/.changes/3.59.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-05-05",
+	"version": "3.59.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.6.0.json b/packages/toolkit/.changes/3.6.0.json
new file mode 100644
index 00000000000..a849885d675
--- /dev/null
+++ b/packages/toolkit/.changes/3.6.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2024-05-23",
+	"version": "3.6.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "IAM Policy Checks: add feature to validate IAM policies within VS Code"
+		},
+		{
+			"type": "Feature",
+			"description": "AWS Toolkit now publishes to Open VSX: https://open-vsx.org/namespace/amazonwebservices"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.60.0.json b/packages/toolkit/.changes/3.60.0.json
new file mode 100644
index 00000000000..2464e57a4b0
--- /dev/null
+++ b/packages/toolkit/.changes/3.60.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-05-06",
+	"version": "3.60.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.61.0.json b/packages/toolkit/.changes/3.61.0.json
new file mode 100644
index 00000000000..8c9ca524a61
--- /dev/null
+++ b/packages/toolkit/.changes/3.61.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-05-14",
+	"version": "3.61.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.62.0.json b/packages/toolkit/.changes/3.62.0.json
new file mode 100644
index 00000000000..7c2d15933be
--- /dev/null
+++ b/packages/toolkit/.changes/3.62.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-05-15",
+	"version": "3.62.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.63.0.json b/packages/toolkit/.changes/3.63.0.json
new file mode 100644
index 00000000000..238e3d2d3b6
--- /dev/null
+++ b/packages/toolkit/.changes/3.63.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-05-22",
+	"version": "3.63.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.64.0.json b/packages/toolkit/.changes/3.64.0.json
new file mode 100644
index 00000000000..c9fd077f42d
--- /dev/null
+++ b/packages/toolkit/.changes/3.64.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-06-04",
+	"version": "3.64.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.65.0.json b/packages/toolkit/.changes/3.65.0.json
new file mode 100644
index 00000000000..1cc912907bc
--- /dev/null
+++ b/packages/toolkit/.changes/3.65.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-06-13",
+	"version": "3.65.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.66.0.json b/packages/toolkit/.changes/3.66.0.json
new file mode 100644
index 00000000000..60eeb3bb16f
--- /dev/null
+++ b/packages/toolkit/.changes/3.66.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-06-18",
+	"version": "3.66.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.67.0.json b/packages/toolkit/.changes/3.67.0.json
new file mode 100644
index 00000000000..21522dc5d87
--- /dev/null
+++ b/packages/toolkit/.changes/3.67.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2025-06-25",
+	"version": "3.67.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "State Machine deployments can now be initiated directly from Workflow Studio without closing the editor"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Step Function performance metrics now accurately reflect only Workflow Studio document activity"
+		},
+		{
+			"type": "Feature",
+			"description": "AccessAnalyzer: CheckNoPublicAccess custom policy check supports additional resource types."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.68.0.json b/packages/toolkit/.changes/3.68.0.json
new file mode 100644
index 00000000000..2c650f157ad
--- /dev/null
+++ b/packages/toolkit/.changes/3.68.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2025-07-03",
+	"version": "3.68.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "[StepFunctions]: Cannot call TestState with variables in Workflow Studio"
+		},
+		{
+			"type": "Feature",
+			"description": "Lambda to SAM Transformation: AWS Toolkit Explorer now can convert existing Lambda functions into SAM (Serverless Application Model) projects. This conversion creates a project structure that's ready for local development and can be managed using Application Builder"
+		},
+		{
+			"type": "Feature",
+			"description": "Lambda Quick Edit: AWS Toolkit Explorer now offers a streamlined editing experience for Lambda functions. Download a function's code with double-click, make local modifications, and easily synchronize changes back to the cloud."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.69.0.json b/packages/toolkit/.changes/3.69.0.json
new file mode 100644
index 00000000000..dc2d04d1582
--- /dev/null
+++ b/packages/toolkit/.changes/3.69.0.json
@@ -0,0 +1,46 @@
+{
+	"date": "2025-07-16",
+	"version": "3.69.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "SageMaker: Enable per-region manual filtering of Spaces"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "SageMaker: Show error message when connecting remotely from a remote workspace"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "SageMaker: Prompt user to use upgraded instance type if the chosen one has insufficient memory"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Lambda upload from directory doesn't allow selection of directory"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "Toolkit fails to recognize it's logged in when editing Lambda function"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "SageMaker: Resolve race condition when reconnecting from multiple remote windows."
+		},
+		{
+			"type": "Bug Fix",
+			"description": "SageMaker: Resolve connection issues to SageMaker Spaces with capital letters in the name"
+		},
+		{
+			"type": "Feature",
+			"description": "SageMaker: Add support for deep-linked Space reconnection"
+		},
+		{
+			"type": "Feature",
+			"description": "Lambda Remote Debugging: Remote invoke configuration webview now supports attaching a debugger to directly debug your lambda function in the cloud."
+		},
+		{
+			"type": "Feature",
+			"description": "SageMaker: Enable auto-shutdown support for Spaces"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.7.0.json b/packages/toolkit/.changes/3.7.0.json
new file mode 100644
index 00000000000..cb1c66f2987
--- /dev/null
+++ b/packages/toolkit/.changes/3.7.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2024-05-23",
+	"version": "3.7.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "AWS Toolkit now publishes to Open VSX: https://open-vsx.org/namespace/amazonwebservices"
+		},
+		{
+			"type": "Feature",
+			"description": "IAM Policy Checks: validate IAM policies within VS Code"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.70.0.json b/packages/toolkit/.changes/3.70.0.json
new file mode 100644
index 00000000000..a41386724ab
--- /dev/null
+++ b/packages/toolkit/.changes/3.70.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2025-07-30",
+	"version": "3.70.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Improved connection actions for SSO"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.71.0.json b/packages/toolkit/.changes/3.71.0.json
new file mode 100644
index 00000000000..9d22c0cd9e7
--- /dev/null
+++ b/packages/toolkit/.changes/3.71.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-08-06",
+	"version": "3.71.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.72.0.json b/packages/toolkit/.changes/3.72.0.json
new file mode 100644
index 00000000000..352b80850ee
--- /dev/null
+++ b/packages/toolkit/.changes/3.72.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-08-22",
+	"version": "3.72.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.73.0.json b/packages/toolkit/.changes/3.73.0.json
new file mode 100644
index 00000000000..12676252824
--- /dev/null
+++ b/packages/toolkit/.changes/3.73.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-09-05",
+	"version": "3.73.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.74.0.json b/packages/toolkit/.changes/3.74.0.json
new file mode 100644
index 00000000000..001efa81cb9
--- /dev/null
+++ b/packages/toolkit/.changes/3.74.0.json
@@ -0,0 +1,18 @@
+{
+	"date": "2025-09-10",
+	"version": "3.74.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Feature to support the access of SageMakerUnified Studio resources from the local VSCode IDE"
+		},
+		{
+			"type": "Feature",
+			"description": "AWS Toolkit now correctly uses the endpoint URL specified in the AWS config file for the selected profile"
+		},
+		{
+			"type": "Feature",
+			"description": "Lambda AppBuilder: Now you can install LocalStack VS Code extension from the AppBuilder walkthrough"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.75.0.json b/packages/toolkit/.changes/3.75.0.json
new file mode 100644
index 00000000000..a863028083b
--- /dev/null
+++ b/packages/toolkit/.changes/3.75.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-09-19",
+	"version": "3.75.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.76.0.json b/packages/toolkit/.changes/3.76.0.json
new file mode 100644
index 00000000000..1b61d94d46d
--- /dev/null
+++ b/packages/toolkit/.changes/3.76.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-09-25",
+	"version": "3.76.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.77.0.json b/packages/toolkit/.changes/3.77.0.json
new file mode 100644
index 00000000000..cd8e1686932
--- /dev/null
+++ b/packages/toolkit/.changes/3.77.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-09-29",
+	"version": "3.77.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.78.0.json b/packages/toolkit/.changes/3.78.0.json
new file mode 100644
index 00000000000..b0b05902c21
--- /dev/null
+++ b/packages/toolkit/.changes/3.78.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2025-10-02",
+	"version": "3.78.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Refactor and optimize Lambda Remote Invoke UI with enhanced payload management"
+		},
+		{
+			"type": "Feature",
+			"description": "Appbuilder now show local invoke icon on deployed local lambda node. Remote Debugging now auto detect sam, cdk outFiles for typescript debug."
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.79.0.json b/packages/toolkit/.changes/3.79.0.json
new file mode 100644
index 00000000000..ce9c5531853
--- /dev/null
+++ b/packages/toolkit/.changes/3.79.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-10-10",
+	"version": "3.79.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.8.0.json b/packages/toolkit/.changes/3.8.0.json
new file mode 100644
index 00000000000..4a3b2ff0f0a
--- /dev/null
+++ b/packages/toolkit/.changes/3.8.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2024-05-30",
+	"version": "3.8.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "auth: use device code auth when running in a web browser"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.80.0.json b/packages/toolkit/.changes/3.80.0.json
new file mode 100644
index 00000000000..4db49741fa7
--- /dev/null
+++ b/packages/toolkit/.changes/3.80.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2025-10-16",
+	"version": "3.80.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "The space is updated upon creation of a new app with the requested settings"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.81.0.json b/packages/toolkit/.changes/3.81.0.json
new file mode 100644
index 00000000000..43f8ac55d1a
--- /dev/null
+++ b/packages/toolkit/.changes/3.81.0.json
@@ -0,0 +1,5 @@
+{
+	"date": "2025-10-22",
+	"version": "3.81.0",
+	"entries": []
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.82.0.json b/packages/toolkit/.changes/3.82.0.json
new file mode 100644
index 00000000000..a56b15acf24
--- /dev/null
+++ b/packages/toolkit/.changes/3.82.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2025-10-30",
+	"version": "3.82.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Lambda AppBuilder: Now you can install Finch from the AppBuilder walkthrough"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.changes/3.9.0.json b/packages/toolkit/.changes/3.9.0.json
new file mode 100644
index 00000000000..d310ea3a2a3
--- /dev/null
+++ b/packages/toolkit/.changes/3.9.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2024-06-07",
+	"version": "3.9.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Toolkit now supports creating, viewing and editing [Threat Composer](https://github.com/awslabs/threat-composer#readme) threat models (`*.tc.json`)"
+		}
+	]
+}
\ No newline at end of file
diff --git a/packages/toolkit/.vscode/launch.json b/packages/toolkit/.vscode/launch.json
new file mode 100644
index 00000000000..f8596e05190
--- /dev/null
+++ b/packages/toolkit/.vscode/launch.json
@@ -0,0 +1,213 @@
+// A launch configuration that compiles the extension and then opens it inside a new window
+// Use IntelliSense to learn about possible attributes.
+// Hover to view descriptions of existing attributes.
+// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Extension",
+            "type": "extensionHost",
+            "request": "launch",
+            "debugWebviews": true,
+            "rendererDebugOptions": {
+                "urlFilter": "*amazonwebservices.aws-toolkit-vscode*",
+                "webRoot": "${workspaceFolder}"
+            },
+            "runtimeExecutable": "${execPath}",
+            "args": ["--extensionDevelopmentPath=${workspaceFolder}"],
+            "env": {
+                "SSMDOCUMENT_LANGUAGESERVER_PORT": "6010",
+                "WEBPACK_DEVELOPER_SERVER": "http://localhost:8080"
+            },
+            "envFile": "${workspaceFolder}/.local.env",
+            "outFiles": ["${workspaceFolder}/dist/**/*.js", "${workspaceFolder}/../core/dist/**/*.js"],
+            "preLaunchTask": "extensionInit",
+            "postDebugTask": "extensionTerminate",
+            "presentation": {
+                "group": "1_Extension",
+                "order": 1
+            }
+        },
+        {
+            /** Handles the entire process of building and running the toolkit extension in the browser. **/
+            "name": "Extension (Chrome)",
+            "type": "chrome",
+            "request": "attach",
+            "port": 9222,
+            /**
+            To get an understanding why we need the following:
+              - comment out the following
+              - set a breakpoint in VS Code that gets triggerd on extension startup
+            Now in the Chrome Developer Tools menu, the extension will load slower and open up random files.
+            I think this is due to source maps for irrelevant code being attempted to be resolved and slowing execution.
+
+            What this is doing is ignoring certain modules that match the following paths, it matches the path of
+            a file in `Developer Tools` > `Sources`.
+            I was inspired by this: https://github.com/microsoft/vscode-test-web/blob/897bca4907a87a6bc564efc242ce6794e5da3232/.vscode/launch.json#L28
+            **/
+            "resolveSourceMapLocations": ["!**/node_modules/**", "!**/vs/**", "!**/extensions/**"],
+            "preLaunchTask": "webRun",
+            "postDebugTask": "webRunTerminate",
+            "presentation": {
+                "group": "1_Extension",
+                "order": 3
+            }
+        },
+        {
+            "name": "Extension Tests",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": [
+                "--disable-extensions",
+                "--extensionDevelopmentPath=${workspaceFolder}",
+                "--extensionTestsPath=${workspaceFolder}/dist/test/unit/index",
+                "${workspaceFolder}/../core/dist/src/testFixtures/workspaceFolder"
+            ],
+            "env": {
+                "DEVELOPMENT_PATH": "${workspaceFolder}",
+                "AWS_TOOLKIT_AUTOMATION": "local"
+            },
+            "outFiles": ["${workspaceFolder}/dist/**/*.js", "${workspaceFolder}/../core/dist/**/*.js"],
+            "preLaunchTask": "watch",
+            "presentation": {
+                "group": "3_ExtensionTests",
+                "order": 2
+            }
+        },
+        {
+            "name": "Extension Tests (current file)",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": [
+                "--disable-extensions",
+                "--extensionDevelopmentPath=${workspaceFolder}",
+                "--extensionTestsPath=${workspaceFolder}/dist/test/unit/index",
+                "${workspaceFolder}/../core/dist/src/testFixtures/workspaceFolder"
+            ],
+            "env": {
+                "TEST_FILE": "${relativeFile}",
+                "DEVELOPMENT_PATH": "${workspaceFolder}",
+                "AWS_TOOLKIT_AUTOMATION": "local"
+            },
+            "outFiles": ["${workspaceFolder}/dist/**/*.js", "${workspaceFolder}/../core/dist/**/*.js"],
+            "preLaunchTask": "watch",
+            "presentation": {
+                "group": "2_ExtensionTestsCurrentFile",
+                "order": 2
+            }
+        },
+        {
+            "name": "Integration Tests",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": [
+                "${workspaceFolder}/../core/dist/src/testFixtures/workspaceFolder",
+                "--extensionDevelopmentPath=${workspaceFolder}",
+                "--extensionTestsPath=${workspaceFolder}/dist/test/integ/index.js"
+            ],
+            "env": {
+                "DEVELOPMENT_PATH": "${workspaceFolder}",
+                "AWS_TOOLKIT_AUTOMATION": "local"
+            },
+            "outFiles": ["${workspaceFolder}/dist/**/*.js", "${workspaceFolder}/../core/dist/**/*.js"],
+            "preLaunchTask": "extensionInit",
+            "presentation": {
+                "group": "6_IntegrationTests",
+                "order": 1
+            }
+        },
+        {
+            "name": "Integration Tests (current file)",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": [
+                "${workspaceFolder}/../core/dist/src/testFixtures/workspaceFolder",
+                "--extensionDevelopmentPath=${workspaceFolder}",
+                "--extensionTestsPath=${workspaceFolder}/dist/test/integ/index.js"
+            ],
+            "env": {
+                "TEST_FILE": "${relativeFile}",
+                "DEVELOPMENT_PATH": "${workspaceFolder}",
+                "AWS_TOOLKIT_AUTOMATION": "local"
+            },
+            "outFiles": ["${workspaceFolder}/dist/**/*.js", "${workspaceFolder}/../core/dist/**/*.js"],
+            "preLaunchTask": "extensionInit",
+            "presentation": {
+                "group": "5_IntegrationTestsCurrentFile",
+                "order": 1
+            }
+        },
+        {
+            "name": "E2E Test (current file)",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": [
+                "${workspaceFolder}/../core/dist/src/testFixtures/workspaceFolder",
+                "--extensionDevelopmentPath=${workspaceFolder}",
+                "--extensionTestsPath=${workspaceFolder}/dist/test/e2e/index.js"
+            ],
+            "env": {
+                "TEST_FILE": "${relativeFile}",
+                "DEVELOPMENT_PATH": "${workspaceFolder}",
+                "AWS_TOOLKIT_AUTOMATION": "local"
+            },
+            "outFiles": ["${workspaceFolder}/dist/**/*.js", "${workspaceFolder}/../core/dist/**/*.js"],
+            "preLaunchTask": "watch",
+            "presentation": {
+                "group": "4_E2ETestCurrentFile",
+                "order": 2
+            }
+        },
+        {
+            "name": "Test Lint",
+            "type": "node",
+            "request": "launch",
+            "program": "${workspaceFolder}/scripts/lint/testLint.ts",
+            "outFiles": ["${workspaceFolder}/dist/**/*.js"],
+            "preLaunchTask": "${defaultBuildTask}",
+            "presentation": {
+                "group": "7_TestLint",
+                "order": 3
+            }
+        }
+        // ---- We do not need the following currently, and we want to reduce clutter. Re-enable if necessary ----
+        // {
+        //     "name": "Extension (webpack)",
+        //     "type": "extensionHost",
+        //     "request": "launch",
+        //     "runtimeExecutable": "${execPath}",
+        //     "args": ["--extensionDevelopmentPath=${workspaceFolder}"],
+        //     "outFiles": ["${workspaceFolder}/dist/**/*.js", "${workspaceFolder}/../core/dist/**/*.js"],
+        //     "preLaunchTask": "npm: compile",
+        //     "postDebugTask": "terminate"
+        // },
+        // {
+        //     "name": "Attach to ASL Server",
+        //     "type": "node",
+        //     "request": "attach",
+        //     "port": 6009,
+        //     "restart": true,
+        //     "outFiles": ["${workspaceRoot}/dist/src/stepFunctions/asl/**.js"]
+        // },
+        // {
+        //     "name": "Attach to SSM Document Language Server",
+        //     "type": "node",
+        //     "request": "attach",
+        //     "port": 6010,
+        //     "restart": true,
+        //     "outFiles": ["${workspaceRoot}/dist/src/ssmDocument/ssm/ssmServer.js"],
+        // }
+    ],
+    "compounds": [
+        // {
+        //     "name": "Extension + Attach to SSM Document Language Server",
+        //     "configurations": ["Extension", "Attach to SSM Document Language Server"]
+        // }
+    ]
+}
diff --git a/packages/toolkit/.vscode/settings.json b/packages/toolkit/.vscode/settings.json
new file mode 100644
index 00000000000..4bcaf47f09d
--- /dev/null
+++ b/packages/toolkit/.vscode/settings.json
@@ -0,0 +1,17 @@
+{
+    "files.exclude": {
+        "**/src/testFixtures": true
+    },
+    "search.exclude": {
+        "dist": true,
+        "node_modules": true,
+        ".vscode-test*": true
+    },
+    "files.watcherExclude": {
+        "**/src/testFixtures": true
+    },
+    "typescript.preferences.importModuleSpecifier": "relative",
+    "javascript.preferences.importModuleSpecifier": "relative",
+    "typescript.tsdk": "../../node_modules/typescript/lib",
+    "npm.packageManager": "npm"
+}
diff --git a/packages/toolkit/.vscode/tasks.json b/packages/toolkit/.vscode/tasks.json
new file mode 100644
index 00000000000..597f7408029
--- /dev/null
+++ b/packages/toolkit/.vscode/tasks.json
@@ -0,0 +1,183 @@
+// See https://go.microsoft.com/fwlink/?LinkId=733558
+// for the documentation about the tasks.json format
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "extensionInit",
+            "type": "shell",
+            "command": "echo 'extensionInit'",
+            "dependsOn": ["watch"],
+            "presentation": {
+                "close": true
+            }
+        },
+        {
+            "label": "watch",
+            "type": "shell",
+            "command": "npm",
+            "args": ["run", "watch"],
+            "problemMatcher": "$tsc-watch",
+            "isBackground": true,
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "dependsOn": ["watchCore", "webpackCore", "serveVueCore"]
+        },
+        {
+            "label": "watchCore",
+            "command": "npm run compileOnly -- --watch",
+            "type": "shell",
+            "isBackground": true,
+            "problemMatcher": "$tsc-watch",
+            "options": {
+                "cwd": "${workspaceFolder}/../../packages/core"
+            }
+        },
+        {
+            "label": "webpackCore",
+            "command": "npm run webpackDev -- --watch",
+            "type": "shell",
+            "isBackground": true,
+            "problemMatcher": "$ts-webpack-watch",
+            "options": {
+                "cwd": "${workspaceFolder}/../../packages/core"
+            }
+        },
+        {
+            "label": "serveVueCore",
+            "command": "npm run serveVue",
+            "type": "shell",
+            "detail": "Webpack + local server for Vue webview files from `core`.",
+            "isBackground": true,
+            "problemMatcher": "$ts-webpack-watch",
+            "options": {
+                "cwd": "${workspaceFolder}/../../packages/core"
+            }
+        },
+        {
+            "label": "extensionTerminate",
+            "command": "echo run terminate",
+            "type": "shell",
+            "presentation": {
+                "close": true
+            },
+            "dependsOn": []
+        },
+        // ---------- Start: Web Mode Tasks ----------
+        {
+            "label": "webRun",
+            "type": "npm",
+            "script": "webRun",
+            "detail": "Runs VS Code in the Chrome browser with our toolkit installed",
+            "isBackground": true,
+            "dependsOn": ["webWatch"],
+            /**
+            We only need this problem matcher to signal when this task is completed.
+            Since this task starts a web server it does not terminate and we need to use
+            problemMatcher.background.endsPattern to read the CLI and know when this task
+            can signal it is done.
+
+            The rest of the data in problemMatcher is required by VS Code to be "valid",
+            but not important for what we need.
+
+            Doc: https://code.visualstudio.com/Docs/editor/tasks#_defining-a-problem-matcher
+            **/
+            "problemMatcher": {
+                "pattern": [
+                    {
+                        "regexp": "this section irrelevant but it must exist to work",
+                        "file": 1,
+                        "location": 2,
+                        "message": 3
+                    }
+                ],
+                "background": {
+                    "activeOnStart": true,
+                    "beginsPattern": "^@vscode/test-web",
+                    "endsPattern": "^Listening on"
+                }
+            }
+        },
+        {
+            "label": "webWatch",
+            "type": "npm",
+            "script": "webWatch",
+            "detail": "Webpacks our toolkit code (with --watch) in preparation to be run in the browser",
+            "isBackground": true,
+            // Since `webpack --watch` never terminates (but finishes packaging at some point),
+            // VS Code uses this to parse the CLI output to pattern match something that indicates it is done
+            "problemMatcher": "$ts-webpack-watch",
+            "dependsOn": ["webCoreModuleWatch"]
+        },
+        {
+            "label": "webCoreModuleWatch",
+            "type": "shell",
+            "command": "npm run compileDev -- --watch",
+            "detail": "Webpacks our toolkit code as a module in preparation to be webpacked by the toolkit package",
+            "isBackground": true,
+            // Since `webpack --watch` never terminates (but finishes packaging at some point),
+            // VS Code uses this to parse the CLI output to pattern match something that indicates it is done
+            "problemMatcher": "$ts-webpack-watch",
+            "options": {
+                "cwd": "${workspaceFolder}/../../packages/core"
+            }
+        },
+        /**
+        After we stop debugging our browser, we also want to stop the web server.
+        When this task is ran it will stop the web server.
+
+        From: https://stackoverflow.com/a/60330174
+        **/
+        {
+            "label": "webRunTerminate",
+            "command": "echo ${input:webRunTerminate}",
+            "type": "shell",
+            "dependsOn": []
+        },
+        // ---------- End: Web Mode Tasks ----------
+        {
+            "type": "npm",
+            "script": "lint",
+            "problemMatcher": "$eslint-stylish"
+        },
+        {
+            "type": "npm",
+            "script": "lintfix",
+            "problemMatcher": "$eslint-stylish"
+        },
+        {
+            "type": "npm",
+            "script": "compile",
+            "dependsOn": ["Kill Tasks"],
+            "problemMatcher": "$tsc"
+        },
+        {
+            "type": "npm",
+            "script": "clean",
+            "dependsOn": ["Kill Tasks"],
+            "problemMatcher": []
+        },
+        {
+            "label": "Kill Tasks",
+            "type": "process",
+            "command": "${input:killTasks}",
+            "problemMatcher": []
+        }
+    ],
+    "inputs": [
+        {
+            "id": "killTasks",
+            "type": "command",
+            "command": "workbench.action.tasks.terminate",
+            "args": "terminateAll"
+        },
+        {
+            "id": "webRunTerminate",
+            "type": "command",
+            "command": "workbench.action.tasks.terminate",
+            "args": "webRun"
+        }
+    ]
+}
diff --git a/packages/toolkit/CHANGELOG.md b/packages/toolkit/CHANGELOG.md
new file mode 100644
index 00000000000..9b8b5ed5854
--- /dev/null
+++ b/packages/toolkit/CHANGELOG.md
@@ -0,0 +1,1337 @@
+## 3.82.0 2025-10-30
+
+- **Feature** Lambda AppBuilder: Now you can install Finch from the AppBuilder walkthrough
+
+## 3.81.0 2025-10-22
+
+- Miscellaneous non-user-facing changes
+
+## 3.80.0 2025-10-16
+
+- **Bug Fix** The space is updated upon creation of a new app with the requested settings
+
+## 3.79.0 2025-10-10
+
+- Miscellaneous non-user-facing changes
+
+## 3.78.0 2025-10-02
+
+- **Feature** Refactor and optimize Lambda Remote Invoke UI with enhanced payload management
+- **Feature** Appbuilder now show local invoke icon on deployed local lambda node. Remote Debugging now auto detect sam, cdk outFiles for typescript debug.
+
+## 3.77.0 2025-09-29
+
+- Miscellaneous non-user-facing changes
+
+## 3.76.0 2025-09-25
+
+- Miscellaneous non-user-facing changes
+
+## 3.75.0 2025-09-19
+
+- Miscellaneous non-user-facing changes
+
+## 3.74.0 2025-09-10
+
+- **Feature** Feature to support the access of SageMakerUnified Studio resources from the local VSCode IDE
+- **Feature** AWS Toolkit now correctly uses the endpoint URL specified in the AWS config file for the selected profile
+- **Feature** Lambda AppBuilder: Now you can install LocalStack VS Code extension from the AppBuilder walkthrough
+
+## 3.73.0 2025-09-05
+
+- Miscellaneous non-user-facing changes
+
+## 3.72.0 2025-08-22
+
+- Miscellaneous non-user-facing changes
+
+## 3.71.0 2025-08-06
+
+- Miscellaneous non-user-facing changes
+
+## 3.70.0 2025-07-30
+
+- **Feature** Improved connection actions for SSO
+
+## 3.69.0 2025-07-16
+
+- **Bug Fix** SageMaker: Enable per-region manual filtering of Spaces
+- **Bug Fix** SageMaker: Show error message when connecting remotely from a remote workspace
+- **Bug Fix** SageMaker: Prompt user to use upgraded instance type if the chosen one has insufficient memory
+- **Bug Fix** Lambda upload from directory doesn't allow selection of directory
+- **Bug Fix** Toolkit fails to recognize it's logged in when editing Lambda function
+- **Bug Fix** SageMaker: Resolve race condition when reconnecting from multiple remote windows.
+- **Bug Fix** SageMaker: Resolve connection issues to SageMaker Spaces with capital letters in the name
+- **Feature** SageMaker: Add support for deep-linked Space reconnection
+- **Feature** Lambda Remote Debugging: Remote invoke configuration webview now supports attaching a debugger to directly debug your lambda function in the cloud.
+- **Feature** SageMaker: Enable auto-shutdown support for Spaces
+
+## 3.68.0 2025-07-03
+
+- **Bug Fix** [StepFunctions]: Cannot call TestState with variables in Workflow Studio
+- **Feature** Lambda to SAM Transformation: AWS Toolkit Explorer now can convert existing Lambda functions into SAM (Serverless Application Model) projects. This conversion creates a project structure that's ready for local development and can be managed using Application Builder
+- **Feature** Lambda Quick Edit: AWS Toolkit Explorer now offers a streamlined editing experience for Lambda functions. Download a function's code with double-click, make local modifications, and easily synchronize changes back to the cloud.
+
+## 3.67.0 2025-06-25
+
+- **Bug Fix** State Machine deployments can now be initiated directly from Workflow Studio without closing the editor
+- **Bug Fix** Step Function performance metrics now accurately reflect only Workflow Studio document activity
+- **Feature** AccessAnalyzer: CheckNoPublicAccess custom policy check supports additional resource types.
+
+## 3.66.0 2025-06-18
+
+- Miscellaneous non-user-facing changes
+
+## 3.65.0 2025-06-13
+
+- Miscellaneous non-user-facing changes
+
+## 3.64.0 2025-06-04
+
+- Miscellaneous non-user-facing changes
+
+## 3.63.0 2025-05-22
+
+- Miscellaneous non-user-facing changes
+
+## 3.62.0 2025-05-15
+
+- Miscellaneous non-user-facing changes
+
+## 3.61.0 2025-05-14
+
+- Miscellaneous non-user-facing changes
+
+## 3.60.0 2025-05-06
+
+- Miscellaneous non-user-facing changes
+
+## 3.59.0 2025-05-05
+
+- Miscellaneous non-user-facing changes
+
+## 3.58.0 2025-05-02
+
+- Miscellaneous non-user-facing changes
+
+## 3.57.0 2025-05-01
+
+- **Feature** AppBuilder: unchecking the 'Attach a debugger' checkbox in local invoke webview invokes the function without a debugger
+
+## 3.56.0 2025-04-25
+
+- Miscellaneous non-user-facing changes
+
+## 3.55.0 2025-04-18
+
+- Miscellaneous non-user-facing changes
+
+## 3.54.0 2025-04-09
+
+- Miscellaneous non-user-facing changes
+
+## 3.53.0 2025-04-03
+
+- **Feature** Step Functions: Use WorkflowStudio to render StateMachine Graph in CDK applications
+
+## 3.52.0 2025-03-28
+
+- **Bug Fix** SAM build: prevent running multiple build processes for the same template
+- **Feature** Lambda: Add 'Process SNS notification messages with Lambda' Serverless Land pattern.
+
+## 3.51.0 2025-03-20
+
+- **Feature** Update Step Functions marketplace documentation.
+
+## 3.50.0 2025-03-13
+
+- Miscellaneous non-user-facing changes
+
+## 3.49.0 2025-03-06
+
+- **Feature** Step Functions: Updated previewStateMachine command to open with Workflow Studio instead
+- **Feature** Lambda: Users can explore Serverless Land patterns
+- **Feature** Step Functions: Added support for calling the TestState API in Workflow Studio
+- **Feature** Step Functions: Added support for using Workflow Studio for editing ASL files in JSON and YAML
+- **Feature** AppBuilder: selecting a runtime in the local invoke view can override the runtime specified in template.yaml
+- **Feature** Step Functions: Allow starting state machine execution with no input provided
+
+## 3.48.0 2025-02-27
+
+- **Feature** Step Functions: Expand data source and output options for Distributed Map in ASL language schema
+
+## 3.47.0 2025-02-20
+
+- **Bug Fix** appBuilder: pass '--no-use-container' when '--use-container' is not selected in quickpick
+- **Feature** App Builder: Autoload debug configuration for local invoke webview
+
+## 3.46.0 2025-02-13
+
+- **Feature** Lambda: Support for environment variables in the editor webview.
+
+## 3.45.0 2025-02-05
+
+- **Feature** Add support for DocumentDB clusters
+- **Feature** Step Functions: Upgrade amazon-states-language-service to 1.15. This new version enhance autocomplete for variable and JSONata expression in JSON ASL files.
+
+## 3.44.0 2025-01-30
+
+- **Bug Fix** Policy Checks selected profile is always default
+- **Feature** From the Lambda treeview in AWS Explorer, you can now right-click on a function name and start a CloudWatch Logs Live Tail sessions for the selected function.
+- **Feature** EC2 is now available in AWS Explorer:
+
+1. Remote-connect VSCode to your EC2 instances.
+2. Open terminal to your EC2 instances.
+3. Start, stop, and visit the Launch page.
+
+## 3.43.0 2025-01-23
+
+- **Bug Fix** AppBuilder: Update error messaging to make more legible and actionable
+- **Bug Fix** Notifications: 'Dismiss' command visible in command palette.
+- **Removal** Cloud9: remove special-case logic.
+
+## 3.42.0 2025-01-15
+
+- **Bug Fix** Auth: Valid StartURL not accepted at login
+
+## 3.41.0 2025-01-09
+
+- **Removal** Amazon Q: No longer autoinstall Amazon Q if the user had used CodeWhisperer in old Toolkit versions.
+- **Removal** Auth: No longer inform users that Amazon Q and Toolkit extensions have separate auth sessions.
+
+## 3.40.0 2024-12-17
+
+- **Bug Fix** Auth: SSO failed to missing refreshToken
+- **Bug Fix** AppBuilder : Support template parameters override for SAM deploy and sync for all entry points
+
+## 3.39.0 2024-12-12
+
+- **Bug Fix** EC2: avoid overwriting authorized_keys file on remote
+- **Bug Fix** Auth: SSO session was bad, but no reauth prompt given
+- **Feature** Enable the EC2 experiment (setting id: `aws.experiments`) in VSCode settings to try the new EC2 features of AWS Toolkit! Remote Connect and Open Terminal to EC2 instances, list EC2 instances and view their status in AWS Explorer. 
+- **Feature** CloudWatch Logs: Added support for Live Tailing LogGroups. Start using LiveTail by: selecting 'Tail Log Group' in the command palette, or, right clicking/pressing the 'Play' icon on a Log Group in the Explorer menu. See [Troubleshoot with CloudWatch Logs Live Tail](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CloudWatchLogs_LiveTail.html) for more information. LiveTail is a paid feature - for more information about pricing, see the Logs tab at [Amazon CloudWatch Pricing](https://aws.amazon.com/cloudwatch/pricing/).
+
+## 3.38.0 2024-12-10
+
+- **Feature** Step Functions: Upgrade amazon-states-language-service to 1.13. This new version adds support for [JSONata and Variables](https://aws.amazon.com/blogs/compute/simplifying-developer-experience-with-variables-and-jsonata-in-aws-step-functions/).
+
+## 3.36.0 2024-11-27
+
+- **Bug Fix** appBuilder refresh feature doesnt work during sync --watch
+- **Bug Fix** 'View Logs...' action redirects to output channel instead of Terminal
+
+## 3.35.0 2024-11-22
+
+- **Bug Fix** SAM: Update Sync and Deploy prompter titles for parameter source
+- **Bug Fix** SAM: Add artifact bucket source prompter for SAM sync command
+- **Bug Fix** SAM: Update Sync prompter title for sync parameters
+- **Bug Fix** SAM: Fix prompter button URLs for build, deploy and sync commands
+- **Bug Fix** EC2: terminated instances no longer show pending icon
+- **Feature** python 3.13 support for SAM and lambda
+- **Feature** nodejs22.x support for SAM and lambda
+- **Feature** Notifications: Support for delivering critical alerts and product updates
+
+## 3.34.0 2024-11-14
+
+- **Bug Fix** SAM debugging: misleading 'IaC' message/placeholder
+- **Bug Fix** SAM local debugging: `aws.region` and `aws.credentials` specified in launch config should override default Toolkit region and credentials
+
+## 3.33.0 2024-11-11
+
+- **Feature** UI: region-related quickpicks now have a refresh button
+
+## 3.32.0 2024-11-07
+
+- **Bug Fix** SAM: Save SAM deploy parameters to correct samconfig.toml in project folder
+- **Bug Fix** System Path parsing should ignore Windows and only parse Mac/Linux system, Sam Local Invoke should get correct system Path on windows #5933 #5918
+- **Bug Fix** SAM: Skip unnecessary prompters for sync operation when using flag from samconfig.toml file
+- **Bug Fix** AWS Lambda: Removed action to delete a Lambda or S3 bucket in the AppBuilder section as resources created through IaC frameworks should not be directly modified since this creates drift
+
+## 3.31.0 2024-10-30
+
+- **Feature** SAM: Added support for Java 21 Lambda runtime
+- **Feature** AWS Lambda: AWS Explorer command palette actions and hover buttons to build, local invoke, deploy, and remote invoke
+- **Feature** AWS Lambda: Improved local test and debug and remote invoke to streamline creating and sharing sample events
+- **Feature** AWS Lambda: 'Application Builder' is a new sidebar view for viewing application resources and links to create, build, debug, and test serverless applications
+- **Feature** SAM: Added support for Ruby 3.3 Lambda runtime
+- **Feature** SAM: Added support for Ruby 3.2 Lambda runtime
+- **Feature** AWS Lambda: Guided walkthrough contains links to set up local IDE environment, install required tools, several starter templates, and guidance on how to get started building serverless applications
+- **Feature** SAM: Added support for .NET 8.0 Lambda runtime
+
+## 3.30.0 2024-10-29
+
+- **Bug Fix** EC2 connect: improve management of SSM sessions to minimize chance they are left active.
+- **Bug Fix** fixed device code detection when running auth through tunneled vscode
+- **Feature** EC2: provide view of ec2 system logs
+
+## 3.29.0 2024-10-17
+
+- **Bug Fix** Fix userCredentialsUtils.test.ts so it won't remove the actual aws config
+
+## 3.28.0 2024-10-10
+
+- **Breaking Change** Bumping VS Code minimum version to 1.83.0
+- **Bug Fix** update animate graph for infraComposer in toolkit README
+- **Deprecation** The next release of this extension will require VS Code 1.83.0 or newer.
+- **Feature** Show a one-time warning if new VS Code is required
+- **Removal** Minimum required VSCode version is now 1.83
+
+## 3.27.0 2024-10-03
+
+- **Bug Fix** rename Application Composer to Infrastructure Composer
+
+## 3.26.0 2024-09-27
+
+- **Bug Fix** EC2 connect: remote connection will no longer fail with 'too many authentication attempt'
+- **Feature** EC2 connect: use ed25519 to generate ec2 ssh key pair
+- **Feature** EC2 connect: default to ed25519, but fall back on rsa if unsupported
+- **Feature** EC2: Launch ec2 instances from AWS Explorer
+
+## 3.25.0 2024-09-19
+
+- **Bug Fix** no longer gives option to copy instance id on ec2 parent node.
+- **Bug Fix** Login state not updating across multiple VS Code windows.
+- **Bug Fix** Redshift: updated the list clusters and workgroups for regions which do not have serverless APIs
+- **Bug Fix** when connecting to ec2 instance, check for IAM role permitted actions, rather than full policies
+- **Feature** EC2 nodes in explorer update status automatically
+- **Feature** ec2 instance status is reinforced with icons and text
+
+## 3.24.0 2024-09-12
+
+- **Feature** Record telemetry event when AWS Toolkits extension is uninstalled.
+
+## 3.23.0 2024-09-05
+
+- **Bug Fix** Network errors causing premature SSO logout
+- **Bug Fix** Fix SyntaxError causing premature expiration (edge case)
+
+## 3.22.0 2024-08-29
+
+- **Bug Fix** Auth: `SyntaxError` causing unexpected SSO logout
+- **Bug Fix** Auth: Users may be silently logged out due to network issues when starting the extension.
+
+## 3.21.0 2024-08-22
+
+- **Bug Fix** Various backend fixes
+
+## 3.17.0 2024-07-29
+
+- **Bug Fix** FileNotFound error causing early SSO expiration
+
+## 3.16.0 2024-07-25
+
+- **Bug Fix** AccessAnalyzer: error when running CheckNoPublicAccess with only role trust policy in template
+
+## 3.15.0 2024-07-18
+
+- **Bug Fix** Unexpected SSO expiration on Windows due to EPERM
+
+## 3.14.0 2024-07-11
+
+- **Bug Fix** App composer generate suggestion unclickable when logged in
+- **Bug Fix** AD/LDAP users may see "uv_os_get_passwd ENOENT" error on startup #5277
+
+## 3.13.0 2024-07-08
+
+- **Bug Fix** Add warning message for drag and drop bug on VS Code 1.91.0
+- **Feature** CodeCatalyst: always show Dev Environment timeout warning as modal prompt
+
+## 3.12.0 2024-06-27
+
+- **Bug Fix** Step functions language server activates when editing ASL documents from previous session
+- **Bug Fix** Step functions language server activation fails
+
+## 3.11.0 2024-06-21
+
+- **Removal** Auth: No longer share SSO sessions with Amazon Q.
+
+## 3.10.0 2024-06-14
+
+- **Bug Fix** UX: Amazon Q continues to install even if users uninstall it.
+- **Bug Fix** CodeCatalyst: Dev Environment may time out if user is not authenticated
+
+## 3.9.0 2024-06-07
+
+- **Feature** Toolkit now supports creating, viewing and editing [Threat Composer](https://github.com/awslabs/threat-composer#readme) threat models (`*.tc.json`)
+
+## 3.8.0 2024-05-30
+
+- **Bug Fix** auth: use device code auth when running in a web browser
+
+## 3.7.0 2024-05-23
+
+- **Feature** AWS Toolkit now publishes to Open VSX: https://open-vsx.org/namespace/amazonwebservices
+- **Feature** IAM Policy Checks: validate IAM policies within VS Code
+
+## 3.6.0 2024-05-23
+
+- **Feature** IAM Policy Checks: add feature to validate IAM policies within VS Code
+- **Feature** AWS Toolkit now publishes to Open VSX: https://open-vsx.org/namespace/amazonwebservices
+
+## 3.4.0 2024-05-17
+
+- **Bug Fix** CodeCatalyst: No longer display a prompt to 'Onboard' if re-using an existing connection from Amazon Q and it is already onboarded.
+
+## 3.3.0 2024-05-13
+
+- **Feature** UX: Added keyboard navigation to login screen.
+- **Feature** New SSO Authorization Code flow for faster logins
+
+## 3.2.0 2024-05-06
+
+- **Release** No user-facing changes
+
+## 3.1.0 2024-04-30
+
+- **Bug Fix** Installation error when installing amazon q in remote AND you have the extension locally
+- **Bug Fix** Application Composer: Support template file watching outside of the workspace.
+
+## 3.0.0 2024-04-30
+
+- **Breaking Change** Remove Amazon Q and CodeWhisperer features. They are now a part of the [Amazon Q extension](https://marketplace.visualstudio.com/items?itemName=AmazonWebServices.amazon-q-vscode).
+- **Bug Fix** CodeCatalyst: User can create a dev environment inside a dev environment
+- **Bug Fix** CodeCatalyst: Fix extension activation in new dev environments
+- **Bug Fix** CodeCatalyst: Fix heartbeat activity registration
+
+## 2.20.0 2024-04-19
+
+- **Bug Fix** Amazon Q CodeTransform may fail if JAVA_HOME has leading or trailing whitespace
+- **Bug Fix** Amazon Q FeatureDev: code generation may fail with "conversation id not found" error
+- **Bug Fix** Amazon Q Code Transformation: show error messages in chat
+- **Bug Fix** Amazon Q Code Transformation - Omit Maven metadata files when uploading dependencies to fix certain build failures in backend.
+- **Feature** Enable Amazon Q feature development and Amazon Q transform capabilities (/dev and /transform) for AWS Builder ID users.
+
+## 2.19.0 2024-04-15
+
+- **Bug Fix** Amazon Q: Fixed quick action command list inconsistency between Q tabs
+- **Bug Fix** Amazon Q Code Transform: Handle whitespaces in manually entered JAVA_HOME
+- **Bug Fix** Amazon Q: Fixed cursor not focuses to prompt input when code is sent to Q Chat
+- **Bug Fix** Amazon Q: Fixed newly opening tabs have all quick actions disabled.
+- **Feature** Support extended CodeWhisperer session durations when using CodeCatalyst on the same SSO connection
+- **Feature** Amazon Q Feature Dev: Use project context from workspace root directory instead of the /src folder
+
+## 2.18.0 2024-04-04
+
+- **Bug Fix** Amazon Q Feature Dev: Fix followups after hitting iteration limit
+- **Bug Fix** Amazon Q Code Transformation: remove Transform button from side panel, use /transform in chat now
+- **Bug Fix** Amazon Q Code Transformation: allow "Start a new transformation" button in chat to work after job fails
+
+## 2.17.0 2024-03-28
+
+- **Bug Fix** CodeWhisperer: Infinite loop of logging if users' editor focus is on OUTPUT tab
+- **Bug Fix** Amazon Q Chat: Code block colors remapped to proper ones
+- **Bug Fix** CodeWhisperer: Inline tutorial state not persisted when user press ESC to skip the tutorial
+- **Feature** Amazon Q Code Transformation: show detailed progress updates in Transformation Hub
+- **Feature** Code Transformation runs through Amazon Q Chat
+
+## 2.16.0 2024-03-21
+
+- **Bug Fix** CodeWhisperer: UI notification "no suggestion" not shown correctly
+- **Bug Fix** Lower chance of project upload failures when using Q CodeTransform.
+- **Bug Fix** FeatureDev: Rejected files are excluded when generated code is accepted by the customer
+- **Bug Fix** Fix CodeWhisperer API call failure in SageMaker Code Editor
+- **Feature** CodeWhisperer: Improve UI to indicate CodeWhisperer is generating suggestions
+- **Feature** Q CodeTransformation: show prompt to submit feedback at end of job
+- **Feature** Improved performance: SSM Documents and Step Functions LSP clients/servers are now started only when they are needed.
+- **Feature** CodeWhisperer: Improve UI to walk through new CodeWhisperer users how-to
+- **Feature** CodeWhisperer/Q actions are now available from the status bar menu instead of a dedicated panel.
+- **Feature** Expose listConnections API in AWS Toolkit
+
+## 2.15.0 2024-03-14
+
+- **Bug Fix** CodeWhisperer: Include copied code in percentage code written metrics
+- **Bug Fix** Amazon Q: Fixed prompt input submit with enter if IME enabled [#4125](https://github.com/aws/aws-toolkit-vscode/issues/4125), requires shift+enter while IME enabled
+
+## 2.14.0 2024-03-08
+
+- **Feature** Amazon Q Feature Dev (/dev): Ask Q to generate code based on the suggested plan
+
+## 2.13.0 2024-03-07
+
+- **Bug Fix** fix(CodeTransform): Updating commands for copying dependencies
+- **Bug Fix** "Failed to access settings" error when restarting multiple vscode instances
+- **Bug Fix** Amazon Q: Fix code snippet borders, action button border radius, text alignment and overlay UI issues
+
+## 2.12.0 2024-02-29
+
+- **Bug Fix** Amazon Q: Static analysis of document symbols used as context in Amazon Q requests must filter tree-sitter "extra" CST nodes (comments) in order to avoid crashes which freeze the chat panel
+- **Feature** Enable node 20 for SAM create and local Lambda debugging
+- **Feature** Amazon Q CodeTransform: show link to documentation after errors
+- **Feature** CodeWhisperer: Improve percentage code written metrics to include user multi character input
+- **Feature** CodeWhisperer: Add startUrl to security scan telemetry
+- **Feature** UI: Improve text description in login page
+
+## 2.11.0 2024-02-22
+
+- **Feature** Amazon Q: /dev command now supports the InvalidState event during the GenerateApproach step. The reason for the Approach to reach an Invalid State is printed in /dev's chat response.
+- **Feature** CloudFormation and SAM templates now have a CodeLens link to Application Composer
+- **Feature** Amazon Q CodeTransformation: show user build logs for Maven install and copy-deps commands
+
+## 2.10.0 2024-02-16
+
+- **Bug Fix** CDK Explorer: Refresh button is now visible.
+
+## 2.9.0 2024-02-09
+
+- **Bug Fix** Cloud9: certain filesystem calls did not work in Cloud9
+- **Bug Fix** EC2 Credentials: Use IMDSv2 calls if available, otherwise fall back IMDSv1.
+- **Feature** Enable java 17 for SAM create and local Lambda debugging
+
+## 2.8.0 2024-02-01
+
+- **Bug Fix** CodeWhisperer: Improve CodePercentage telemetry reporting
+
+## 2.7.0 2024-01-25
+
+- **Bug Fix** Add invalid auth handling to Application Composer's Sync button
+
+## 2.6.0 2024-01-18
+
+- **Bug Fix** CodeWhisperer suggestions may be trimmed under certain criteria
+- **Bug Fix** Amazon Q CodeTransform: open summary.md automatically when job finishes
+- **Bug Fix** CodeWhisperer not handling extra closing symbols (parenthesis, brackets, quotes) when user typeahead exists
+- **Bug Fix** Cloud9: error when expanding S3 folder
+- **Bug Fix** SAM local debugging: Toolkit showed SamLaunchRequestError for `AWS::Lambda::Function` template resource
+- **Feature** Amazon Q CodeTransform: use Maven wrapper (if present) to copy dependencies if Maven not installed
+- **Feature** SAM lambda debugging: SAM output and other logs are now presented with VSCode's log highlighting
+
+## 2.5.0 2024-01-11
+
+- **Bug Fix** CodeWhisperer: Fixes a bug where accepting a recommendation in AWS Cloud9 will trigger another suggestion
+- **Bug Fix** Amazon Q: correct code selection range for one-line selections
+- **Bug Fix** CodeWhisperer: Security Scan Log output is blank if log level is not "verbose".
+- **Bug Fix** Amazon Q Chat: Fixed code block text background
+- **Bug Fix** Amazon Q Transform: delete temp files we create when no longer needed
+- **Bug Fix** Amazon Q Transform: make copy-dependencies command less error prone
+- **Bug Fix** CodeWhisperer: fix incorrect error handling causing TypeError .includes is not a function
+- **Bug Fix** Amazon Q: "Transformation Hub" is always visible, even if Transform feature is not enabled or used
+- **Feature** CodeWhisperer: add select customization action to notification
+- **Feature** feat(sam): python 3.12 support for SAM, lambda
+- **Feature** Browser: Enable generic global commands in ellipses menus, e.g. About Toolkit, Report Toolkit Issue, etc.
+- **Removal** Commands: Remove redundant 'View Quick Start' command from appearing in non-Cloud9 versions of the toolkit.
+- **Removal** Amazon Q, CodeWhisperer: Remove 'Switch Connections' menu item, and only show 'Add new connection' when not signed in.
+
+## 2.4.0 2023-12-19
+
+- **Bug Fix** Amazon Q: `/dev` command may fail with "Conversation id must exist"
+- **Bug Fix** CodeWhisperer supports code generation for Iac languages without external extensions
+- **Feature** Code Transform Telemetry includes additional metadata
+
+## 2.3.0 2023-12-15
+
+- **Bug Fix** Help > View Toolkit Logs opens an empty file if other menu items were interacted with first.
+- **Bug Fix** CodeWhisperer: Increase polling frequency for security scans.
+- **Bug Fix** Opening a CodeCatalyst dev env triggers a builder ID login in certain situations.
+- **Bug Fix** Amazon Q: Fixed an issue where sometimes /transform won't appear when switching between idC/builder id
+- **Bug Fix** Amazon Q: 'Switch to Q Chat' button not working for some users.
+- **Feature** CodeWhisperer security scans support ruby files.
+- **Feature** The `aws.samcli.enableCodeLenses` setting now enables/disables SAM codelenses in `template.yaml` files, in addition to source code files.
+- **Feature** CodeWhisperer security scans now support Go files.
+
+## 2.2.0 2023-12-06
+
+- **Breaking Change** validate that pom.xml is in root directory of project, not anywhere in project
+- **Bug Fix** AWS Toolkit submenus appear in other extension views #4111
+- **Bug Fix** CodeCatalyst: "No handler found" error may occur when opening `vscode://` URI #4105
+- **Bug Fix** CodeWhisperer: Security scans for Java no longer require build artifacts
+- **Bug Fix** Amazon Q: Input prompt gets wrapped to new line which avoids focusing
+
+## 2.1.0 2023-11-30
+
+- **Feature** Use MDE endpoint set by environment variable
+- **Feature** AWS Application Composer is now available from the AWS Toolkit for Visual Studio Code. Visualize and design AWS CloudFormation and AWS SAM applications from your local machine. Use integrations with featured services such as Amazon CodeWhisperer, AWS Step Functions, and AWS SAM to improve your development experience.
+
+## 2.0.0 2023-11-28
+
+- **Bug Fix** CodeWhisperer status bar showing even when not in use
+- **Feature** Auth: Delete SSO connections from quickpick with button on hover
+- **Feature** Support for Amazon Q, your generative AI–powered assistant designed for work that can be tailored to your business, code, data, and operations.
+
+## 1.100.0 2023-11-26
+
+- **Bug Fix** Fix a not connected error when starting connection to CodeCatalyst Dev Environment from link
+- **Feature** CodeWhisperer supports Json, yaml and Tf
+- **Feature** CodeWhisperer security scans support typescript, csharp, json, yaml, tf and hcl files.
+- **Feature** Auth: Redesign Add Connection page to show all options at once
+- **Feature** CodeWhisperer: Uses Generative AI and automated reasoning to rewrite lines of code flagged for security vulnerabilities during a security scan.
+
+## 1.99.0 2023-11-17
+
+- **Feature** CodeWhisperer: status bar lists options when clicked and shows suggestion state
+- **Feature** Don't show "invalid settings.json" message if settings.json is valid but unwritable
+- **Feature** CodeWhisperer: faster code completion by enabling HTTP connection reuse for completions API
+- **Feature** Connect to Amazon CodeCatalyst Dev Environments with IAM Identity Center
+
+## 1.98.0 2023-11-09
+
+- **Bug Fix** CodeWhisperer, CodeCatalyst may require login again after Switching VSCode workspaces
+- **Bug Fix** "Scanning CloudFormation templates..." message `Cancel` button does not fully stop the scan
+- **Bug Fix** ECS: `SimulatePrincipalPolicy` permission is no longer required for users to run `exec command`
+
+## 1.97.0 2023-11-02
+
+- **Bug Fix** CodeWhisperer: fix and improve closing symbols handling (brackets, parenthesis, quotes etc)
+
+## 1.96.0 2023-10-26
+
+- **Bug Fix** SAM debugging: "Invalid (or missing) template file" may occur even when a valid template.yaml is specified by `invokeTarget.templatePath` in the launch config. #2614
+- **Bug Fix** Redshift: The output message is not clear when a sql query is successful but returns no record.
+- **Bug Fix** Redshift: Re-launched connection wizard shows the old (stale) connection.
+- **Bug Fix** `AWS: Add SAM Debug Configuration` command only works the first time it is invoked.
+- **Bug Fix** Improved performance of CloudFormation file watcher startup
+- **Bug Fix** Output panel always opens at VS Code launch.
+- **Feature** Detect and notify about invalid settings.json #3910
+- **Feature** Redshift: "Create Notebook" opens an untitled document instead of prompting to "Save As"
+- **Feature** CloudWatch Logs: Preserve quickpick menu position when loading more items.
+- **Feature** CodeWhisperer: reduce auto-suggestions when there is immediate right context
+
+## 1.95.0 2023-10-17
+
+- **Feature** Amazon Redshift is now available in AWS Explorer. You can author and execute SQL queries from VS Code notebooks, and view your database objects in their Redshift warehouses.
+- **Feature** Public preview for CodeWhisperer Enterprise: Enterprise customers can now customize CodeWhisperer to adopt and suggest code based on organization specific codebases.
+
+## 1.94.0 2023-10-12
+
+- **Feature** CodeWhisperer: improve auto-suggestions for additional languages
+- **Feature** StepFunctions: Support rendering SFN graph with ItemProcessor field
+- **Feature** auth: Adding or switching connections in CodeWhisperer, CodeCatalyst and Explorer is now faster and requires fewer steps
+
+## 1.93.0 2023-10-05
+
+- **Bug Fix** SAM: local debugging of a .NET lambda may fail if `containerbuild=true`
+- **Bug Fix** BuilderID/IdentityCenter: Fix 'Invalid Client' error in the browser when re-authenticating
+- **Feature** CodeWhisperer: remove unnecessary "Proceed to login" prompt
+
+## 1.92.0 2023-09-29
+
+- **Deprecation** SAM: removed support for Node.js 12.x [Lambda runtime](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html)
+- **Deprecation** SAM: removed support for .NET core 3.1 [Lambda runtime](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html)
+- **Feature** CodeWhisperer: new onboarding tutorial for first-time users
+
+## 1.91.0 2023-09-22
+
+- **Bug Fix** SAM: Debugging a nodejs Lambda always hits breakpoint in nodejs async_hooks module before reaching the user-specified breakpoint
+- **Bug Fix** CodeWhisperer: fixed case where 'CodeWhisperer' status bar stuck loading
+
+## 1.90.0 2023-09-15
+
+- **Bug Fix** CodeCatalyst: "Open CodeCatalyst Dev Environment" may fail to connect from a new Windows system
+- **Bug Fix** CodeWhisperer: Fixed an issue where sometimes the suggestions are not matching the current editor context.
+- **Feature** Authentication: When signing in to AWS Builder Id or IAM Identity Center (SSO), verify the device code matches instead of copy-pasting it
+
+## 1.89.0 2023-09-08
+
+- **Bug Fix** CodeWhisperer: show "Reconnect" instead of "Start" for expired connections to make reconnecting easier
+
+## 1.88.0 2023-09-07
+
+- **Feature** ECS: "Insufficient permissions" message shows more details about missing permissions
+- **Feature** Step Functions: Upgrade amazon-states-language-service to 1.11. This new version adds Fail State fields ErrorPath and CausePath, and on Retriers MaxDelaySeconds and JitterStrategy.
+
+## 1.87.0 2023-08-31
+
+- **Breaking Change** Minimum required VS Code version is now 1.68
+- **Bug Fix** CloudWatch Logs: "Search Log Group" shows multiple progress popups
+- **Bug Fix** CloudWatch Logs: "View Full Log Stream" is limited to 1000 events instead of the `aws.cwl.limit` user setting
+- **Feature** Telemetry setting description includes a details link
+
+## 1.86.0 2023-08-24
+
+- **Bug Fix** CodeWhisperer: Fix test file supplemental context not working as expected on OS not using '/' as file path separator
+- **Bug Fix** CodeWhisperer sometimes fails on big files
+- **Bug Fix** CodeWhisperer: fix java test file name MyClassTests.java (plural) will not be captured if file is not living in a test folder
+- **Feature** SAM: create, run and debug Python 3.11 Lambdas #3753
+- **Feature** SAM run/debug detects and displays SAM CLI errors, so you spend less time inspecting the Output
+- **Feature** SAM template detection now skips directories specified in [user settings](https://code.visualstudio.com/docs/getstarted/settings) `files.exclude`, `search.exclude`, or `files.watcherExclude`. This improves performance on big workspaces and avoids the "Scanning CloudFormation templates..." message. [#3510](https://github.com/aws/aws-toolkit-vscode/issues/3510)
+- **Feature** Toolkit no longer explicitly checks if Docker is running, instead it lets SAM CLI decide that #3588
+
+## 1.85.0 2023-08-17
+
+- **Bug Fix** IAM Identity Center (SSO): misleading "Permission set" warning for scope-based SSO/IdC connection
+- **Bug Fix** auth: remote workspaces use the global state, showing incorrect profile info
+- **Feature** CodeWhisperer: Improve file context fetching for Python Typescript Javascript source files
+
+## 1.84.0 2023-08-11
+
+- **Bug Fix** misleading error when downloading a Lambda to a workspace without a folder
+- **Bug Fix** CodeWhisperer: Fix in some cases the inline suggestions are not showing in the editor
+- **Bug Fix** Regions quickpick menu shows duplicate "recently used" labels
+- **Feature** CodeWhisperer: Improve file context fetching for Java test files
+- **Feature** IAM Identity Center (SSO): show an error if SSO user is not assigned to an account with a Permission Set
+
+## 1.83.0 2023-08-03
+
+- **Feature** IAM Identity Center (SSO): log a warning if SSO user is not linked to an account
+
+## 1.82.0 2023-07-26
+
+- **Bug Fix** CodeWhisperer: issue with fetching enhanced file context
+- **Bug Fix** User setting for "Share CodeWhisperer Content With AWS" was not reflected in workspace-level settings
+- **Feature** CodeWhisperer: Improve Java suggestion quality with enhanced file context fetching
+- **Feature** Lambda "Download" action now expects ".mjs" extension for Node18+ lambdas
+
+## 1.81.0 2023-07-13
+
+- **Bug Fix** codewhisperer: improper request format when sending empty supplemental context
+- **Feature** CodeWhisperer: Improve suggestion quality with enhanced file context fetching
+
+## 1.80.0 2023-07-05
+
+- **Bug Fix** Fix function that determined who was a first time user
+
+## 1.79.0 2023-06-30
+
+- **Feature** New Add Connection workflow
+
+## 1.78.0 2023-06-27
+
+- **Bug Fix** ECS: tasks from unrelated task definitions are shown in the "Open Terminal..." command
+- **Bug Fix** Show re-authentication prompt if connection expires at extension restart.
+- **Feature** Use the `Search Log Group` command to search all log streams in a CloudWatch Log Group
+- **Feature** CodeWhisperer improves auto-suggestions for tsx and jsx
+
+## 1.77.0 2023-06-12
+
+- **Bug Fix** SAM CLI 1.85-1.86 fails on Windows
+- **Feature** CodeWhisperer: Improve file context fetching logic
+
+## 1.76.0 2023-06-02
+
+- **Bug Fix** Fix CodeWhisperer not found error when it is disabled by users issue #3490
+
+## 1.75.0 2023-05-31
+
+- **Bug Fix** auth: IAM Identity Center connections expire sooner than expected
+- **Bug Fix** CodeWhisperer: user is sometimes required to re-login before token expiration
+- **Bug Fix** Add fallback to local cached files for Step Function Visualizations where host doesn't have internet.
+- **Bug Fix** Update dependency amazon-states-language-service from 1.9->1.10. This fixes  support for Yaml Comments in states machines, ProcessorConfig property & Credentials key.
+- **Bug Fix** CodeWhisperer: Requested operation is not recognized by the service when fetching recommendations
+- **Bug Fix** CodeWhisperer sometimes add extra space at the beginning of suggestion
+- **Feature** CodeWhisperer no longer trigger suggestions on IntelliSense acceptance
+
+## 1.74.0 2023-05-18
+
+- **Bug Fix** CodeWhisperer: cannot navigate to next or previous code suggestion in VS Code 1.78+
+- **Feature** CodeCatalyst: `AWS: Open CodeCatalyst Dev Environment` command allows filtering by Space and Project name
+- **Feature** CodeCatalyst: `AWS: Open CodeCatalyst Dev Environment` command now sorts Dev Environments by most recent usage
+
+## 1.73.0 2023-05-11
+
+- **Bug Fix** Amazon CodeCatalyst: using CodeCatalyst features without onboarding shows `AccessDeniedException`
+- **Bug Fix** CodeCatalyst: When a Space has reached quota, trying to connect to a DevEnv waits a long time instead of failing immediately.
+- **Feature** Faster startup and less filesystem usage when the `aws.samcli.enableCodeLenses` setting is disabled
+- **Removal** Removed legacy setting `aws.sam.enableCodeLenses` (use `aws.samcli.enableCodeLenses` instead)
+- **Removal** Removed legacy setting `aws.manuallySelectedBuckets` (use `aws.samcli.manuallySelectedBuckets` instead)
+- **Removal** Removed legacy setting `aws.samcli.lambda.timeout` (use `aws.samcli.lambdaTimeout` instead)
+
+## 1.72.0 2023-05-04
+
+- **Bug Fix** "Open CodeCatalyst Dev Environment" fails on flatpak (steamdeck)
+- **Bug Fix** auth: changes to the AWS shared configuration files are not always respected when fetching credentials
+- **Bug Fix** CodeWhisperer status bar showing even when not in use
+- **Feature** Improved startup performance on large workspaces #3370
+
+## 1.71.0 2023-04-28
+
+- **Bug Fix** CodeWhisperer shows "The security token included in this request is expired" in Cloud9
+- **Feature** Improved error messages for file system permissions issues
+
+## 1.70.0 2023-04-22
+
+- **Deprecation** Minimum required VS Code version is now 1.65
+- **Feature** auth: AWS accounts and roles from IAM Identity Center are automatically discovered by the Toolkit when selecting a connection.
+- **Feature** feat(auth): IAM Identity Center connections now request the least permissive set of scopes for features. Using the same connection for multiple features will request additional scopes to be used.
+
+## 1.69.0 2023-04-18
+
+- **Bug Fix** endpoints: local file never loads if remote call hangs
+- **Bug Fix** CodeCatalyst: improved efficiency by reducing unnecessary service calls #3333
+- **Bug Fix** Incorrect offset icons in webviews
+- **Feature** CodeCatalyst: show readme on first load of a Dev Environment
+
+## 1.68.0 2023-04-13
+
+- **Bug Fix** Dev Env Space quick pick shows all Spaces + Projects
+- **Bug Fix** CodeCatalyst: Toolkit attempts reconnect to non-vscode Dev Environment
+- **Bug Fix** The AWS status bar item is colored despite there not being anything that needs user attention
+- **Feature** CodeWhisperer: Now also provides import recommendations
+- **Feature** CodeWhisperer: new code scan features: 
+1. highlighting scanned files 
+2. stop security scan
+- **Feature** auth: support `sso_session` for profiles in AWS shared ini files
+- **Feature** CodeWhisperer: new supported programming languages: c, cpp, go, kotlin, php, ruby, rust, scala, shell, sql. 
+
+## 1.67.0 2023-03-29
+
+- **Breaking Change** "Sync SAM Application" will now always ignore the 'watch' flag in `samconfig.toml`. The Toolkit does not support running `sam sync` in 'watch' mode.
+- **Bug Fix** auth: switching to a connection that just expired shows an error
+- **Bug Fix** S3 filesystem provider is not case-sensitive, so requesting "s3://bucket1/Test.json" may open "s3://bucket1/test.json"
+- **Feature** SAM: create, run and debug Python 3.10 Lambdas
+- **Feature** CodeCatalyst: retry connection to "FAILED" Dev Environments
+- **Feature** CodeCatalyst: improved messages and logging when connecting to Dev Environment
+- **Removal** `aws.experiments.samSyncCode` has been removed as similiar functionality is now in SAM CLI by default in 1.78.0.
+
+## 1.66.0 2023-03-24
+
+- **Bug Fix** CodeCatalyst: connecting to a Dev Environment while it is updating sometimes fails
+- **Bug Fix** "Enable Command Execution" shows wrong message
+- **Bug Fix** Update dependency amazon-states-language-service from 1.8.0 -> 1.9.0. This will allow newlines in Step Functions intrinsic functions.
+- **Bug Fix** CodeCatalyst: Disable new branch option when creating new Dev Environment for linked repo
+- **Bug Fix** CodeCatalyst: `Clone CodeCatalyst Repository` command now only lists non-linked repos
+- **Feature** Option to sign out of existing Builder ID when adding a new one
+- **Feature** CodeCatalyst: wait up to 1 hour (instead of 3 minutes) for Dev Environment to start
+- **Feature** CodeWhisperer improves right context handling
+- **Feature** CodeWhisperer will no longer automatically format code after accepting code suggestions
+
+## 1.65.0 2023-03-15
+
+- **Feature** auth: The status bar shows more information about which connections are in-use and which of those are expired or invalid.
+- **Feature** auth: Expired connections are now easier to recognize and re-authenticate from the "Switch Connections" quick pick menu
+
+## 1.64.0 2023-03-07
+
+- **Bug Fix** auth: "Copy Code" modal is shown twice when refreshing expired IAM Identity Center connections
+- **Feature** auth: verification codes for browser logins are now shown in a notification after opening the login URL
+- **Feature** S3: Choose last-touched and last-uploaded-to S3 folders in the Upload Files wizard.
+- **Feature** "Sync SAM Application" command provides Create and Help actions at each step (SAM template, S3 bucket, ECR repo, CloudFormation stack)
+
+## 1.63.0 2023-02-16
+
+- **Bug Fix** Bump amazon-states-language-service dependency to ^1.8.0 to allow state machines to be created with the new intrinsic functions and Map state
+- **Bug Fix** Authenticating through the browser now requires users to manually enter a user verification code. Previously this was done automatically.
+- **Feature** CloudWatch Logs: one click to list log streams for a log group
+
+## 1.62.0 2023-01-31
+
+- **Bug Fix** SAM template.yaml syntax support for PayloadFormatVersion, HttpApi event source, HttpApiFunctionAuth #2867
+- **Bug Fix** iam: ignore permission check when denial comes from organization csp policy
+- **Bug Fix** Improve extension start-up performance, especially on devices with slower file systems
+- **Bug Fix** Duplicate resource type definitions break the "Resources" node (#3132)
+- **Bug Fix** SAM template.yaml syntax support for FunctionResponseTypes #2924
+- **Feature** SAM: run/debug now works for a larger variety of TypeScript projects
+- **Feature** Upload Lambda wizard will skip prompts and auto select parent directory when invoked from a template file.
+
+## 1.61.0 2023-01-12
+
+- **Bug Fix** AWS regions are not dynamically fetched by the Toolkit
+- **Bug Fix** S3: saving files from the editor overwrites existing content types
+- **Bug Fix** S3: file editor fails on binary files with no file extension
+- **Feature** CodeWhisperer: more responsive Auto-Suggestions
+- **Feature** Copy Lambda Function URL in AWS Explorer
+
+## 1.60.0 2022-12-16
+
+- **Bug Fix** CodeWhisperer: fix potential undefined reference
+
+## 1.59.0 2022-12-15
+
+- **Bug Fix** Help button on the "save connection" prompt does nothing
+- **Bug Fix** CodeWhisperer may alter editor.hover.enabled configuration
+- **Feature** CodeWhisperer: Add 'Do not show again' button to authentication migration prompt
+
+## 1.58.0 2022-12-06
+
+- **Feature** S3: "Download As" action defaults to the last-used download path.
+- **Feature** Amazon CodeCatalyst: faster listing of repositories and Dev Environments
+- **Feature** Cloud9: browse and generate code for EventBridge Schemas from AWS Explorer
+- **Feature** Amazon CodeCatalyst: Connecting to AWS Builder ID when coming from the browser has been made easier
+
+## 1.57.0 2022-12-01
+
+- **Feature** Amazon CodeCatalyst: Connect VS Code to your remote Dev Environments.
+- **Feature** Amazon CodeCatalyst: Clone your repositories to your local workspace.
+- **Feature** Amazon CodeCatalyst: Connect using your AWS Builder ID.
+
+## 1.56.0 2022-11-28
+
+- **Feature** Amazon CodeWhisperer now adds new access methods with AWS Builder ID and AWS IAM Identity Center to enable and get started. 
+- **Feature** Amazon CodeWhisperer recommendations are more context aware. We are removing the overlaps from CodeWhisperer suggestions specifically when the cursor is inside a code block.
+- **Feature** Amazon CodeWhisperer now supports TypeScript and C# programming languages.
+- **Feature** Amazon CodeWhisperer is now available as a supported feature and no longer an experimental feature.
+- **Feature** Amazon CodeWhisperer now supports JavaScript for Security Scan to catch security vulnerabilities.
+
+## 1.55.0 2022-11-23
+
+- **Bug Fix** logging: `aws.viewLogsAtMessage` no longer fails when the log message cannot be found
+- **Feature** SAM: the `Sync SAM Application` command remembers your most recent selections per-region.
+- **Feature** SAM: deployment of CloudFormation templates now uses `sam sync` by default, reducing the amount of time it takes to deploy to AWS. The `aws.samcli.legacyDeploy` setting can be used to revert to the old experience.
+
+## 1.54.0 2022-11-19
+
+- **Bug Fix** JSON-schemas download logic is brittle #2957
+- **Bug Fix** "Connect" and "Choose Profile" open create credentials wizard/profile selector when credentials aren't present in aws configs
+- **Feature** SAM: create, run and debug nodejs18.x Lambdas
+- **Feature** New credentials experience. Includes the ability to set up SSO ("IAM Identity Center") from AWS Toolkit (`AWS: Connect to AWS` > `Add New Connection`)
+
+## 1.53.0 2022-10-24
+
+- **Bug Fix** Execessive CodeWhisperer latency caused by unnecessary refreshing of credentials
+- **Bug Fix** CodeWhisperer auto trigger not working correctly in certain circumstances
+
+## 1.52.0 2022-10-20
+
+- **Bug Fix** CodeWhisperer left/right arrow keybinding conflict with other plugins
+- **Feature** Enable syntax features for untitled (unsaved) cloudformation/sam yaml files
+
+## 1.51.0 2022-10-01
+
+- **Bug Fix** styling issue in CodeWhisperer reference log
+- **Bug Fix** CodeWhisperer duplicate closing bracket when using recommendation inside brackets
+- **Bug Fix** CodeWhisperer triggered by React plugin generated code snippets
+- **Bug Fix** cached ECS/EC2 credentials not refreshed when expired
+- **Bug Fix** malformed ECS icons on recent versions of VS Code
+- **Bug Fix** CodeWhisperer sometimes edits user's code
+- **Feature** running commands on ECS tasks can now be cancelled
+- **Feature** "AWS (Developer)" menu now includes a "Show Global State" item
+- **Feature** Resources (in AWS Explorer) can list more resource types for EC2, IoT, RDS, Redshift, NetworkManager, and other services
+- **Feature** Prompt users to install YAML plugin when AWSTemplateFormatVersion becomes available in their YAML document
+- **Feature** ECS tasks can be opened up in the terminal
+- **Feature** Improved CodeWhisperer inline suggestion experience
+
+## 1.50.0 2022-09-13
+
+- **Bug Fix** Debugging Python image-based lambdas fails with `Init failed error=exec: "-m": executable file not found`
+- **Feature** if "Create Credentials Profile" fails, error message now shows "Edit Credentials" button
+- **Feature** Decrease the amount of space SAM/CFN schemas take on the status bar
+- **Feature** CodeWhisperer now supports .jsx files
+
+## 1.49.0 2022-08-29
+
+- **Bug Fix** CodeWhisperer adds redundant closing brackets/parens/braces
+- **Feature** Don't open webviews in a split window (except SAM debug configuration editor).
+- **Removal** Python 3.6 is no longer supported
+
+## 1.48.0 2022-08-15
+
+- **Bug Fix** "API proposal" error on vscode 1.63 or older
+
+## 1.47.0 2022-08-06
+
+- **Bug Fix** Delve debugger installation fails for Go Lambdas on MacOS
+- **Bug Fix** restored `Connect to AWS` command (alias to the `Choose AWS Profile` command)
+- **Bug Fix** CodeWhisperer: when pressing up or down does not move cursor when suggestion is active
+- **Bug Fix** CodeWhisperer access token validation may sometimes fail
+- **Bug Fix** "Connect to AWS" does not handle missing credentials file
+- **Feature** basic syntax highlighting for ~/.aws/credentials and ~/.aws/config files
+- **Feature** `Choose AWS Profile` quickpick now includes an `Edit Credentials` action
+- **Feature** Add `Edit Credentials` command which opens all known credential files
+- **Feature** CodeWhisperer: References include a link to the source repository if possible.
+- **Feature** Auto-connect tries a maximum of one non-default profile instead of three
+
+## 1.46.0 2022-07-25
+
+- **Bug Fix** "Read-only file system" error when deploying or debugging a SAM project #2395
+
+## 1.45.0 2022-07-07
+
+- **Bug Fix** `Add SAM Debug Configuration` codelenses in source files are now disabled by default. (To enable the codelenses, use the `AWS: Toggle SAM hints in source files` command or the `Enable SAM hints` setting.)
+- **Bug Fix** CodeWhisperer features were not fully disabled if the experiment was disabled
+- **Bug Fix** 'security token expired' errors when using CodeWhisperer in Cloud9 with managed credentials
+
+## 1.44.0 2022-06-30
+
+- **Bug Fix** Fixed a bug where CodeWhisperer incorrectly changes the `snippetSuggestions` setting in VSCode
+
+## 1.42.0 2022-06-23
+
+- **Feature** [CodeWhisperer](https://aws.amazon.com/codewhisperer) uses machine learning to generate code suggestions from the existing code and comments in your IDE. Supported languages include: Java, Python, and JavaScript.
+
+## 1.41.0 2022-06-22
+
+- **Bug Fix** Credentials are now automatically refreshed on certain AWS API errors
+
+## 1.40.0 2022-06-17
+
+- **Bug Fix** The `Upload Lambda` command now automatically causes the Toolkit to login
+- **Bug Fix** S3 "Presigned URL" feature may silently fail #2687
+- **Bug Fix** Fix issue where some http errors were logging undefined on error
+- **Feature** UI: buttons for Lambda invoke, API invoke, and other forms are now always visible at the top of the form
+
+## 1.39.0 2022-06-06
+
+- **Bug Fix** StepFunctions: allow state machines with non-object values for Parameters property
+- **Bug Fix** Fix incorrect use of Markdown in new SAM application READMEs
+- **Bug Fix** Fix: syntax support (JSON schemas) for CloudFormation/SAM yaml sometimes doesn't work
+- **Bug Fix** Credential profiles that do not require user-input now correctly refresh when expired
+- **Feature** "Upload Lambda" from any folder in VS Code File Explorer
+- **Feature** "Send Feedback" form always enables Send button and doesn't require text input
+- **Feature** SAM: create, run and debug nodejs16.x Lambdas
+- **Feature** CDK features are now found in the _Developer Tools_ view. This view will contain more ways to work with local project resources in future releases.
+
+## 1.38.0 2022-05-12
+
+- **Breaking Change** Removed the `aws.onDefaultRegionMissing` setting
+- **Bug Fix** SAM template.yaml syntax support for condition, requestmodel, requestparameters, custom resources, SSMParameterReadPolicy and AWSSecretsManagerGetSecretValuePolicy
+- **Bug Fix** Fixed issue with API Gateway 'Invoke on AWS' resource names always showing 'resource.path'
+- **Bug Fix** S3 File Viewer: file paths containing reserved URI characters are now handled correctly
+- **Feature** `Edit SAM Debug Configuration` and `View Toolkit Logs` commands are now shown in the AWS Explorer main menu
+- **Feature** Lambda: Use Upload Lambda from a folder, template file, or the command palette.
+- **Feature** renamed `SAM Debug Configuration Editor` command to `Edit SAM Debug Configuration`
+- **Feature** SAM run/debug now uses the current active credentials (if the `aws.credentials` launch-config field is not set)
+- **Feature** Show "Add Debug Config" codelens in JS/TS files even if package.json is missing #2579
+- **Feature** "Show or Hide Regions" is now one command that supports multiple selections
+- **Feature** added `Show AWS Commands...` command to AWS Explorer menu
+- **Feature** Open schemas directly when clicking on schema item nodes
+
+## 1.37.0 2022-03-25
+
+- **Bug Fix** SAM run/debug: slow debugger attachment for API configurations now shows a cancellable notification instead of automatically failing
+- **Feature** "Adding Go (Golang) as a supported language for code binding generation through the EventBridge Schemas service"
+
+## 1.36.0 2022-03-03
+
+- **Bug Fix** Step Functions: fixed issue with opening a graph render from the editor
+- **Bug Fix** ECS: avoid null reference error when loading nodes #2441
+- **Feature** SAM/Lambda: add support for .NET 6 (dotnet6)
+- **Feature** ECS: Container node displays when there is no running containers
+- **Feature** Cloud9: user can choose which Resources to show
+- **Feature** ECS: Toolkit checks if the current credentials have permissions for "Run Command in Container"
+
+## 1.35.0 2022-01-13
+
+- **Bug Fix** Schemas: handle errors for invalid settings configurations on activation
+- **Bug Fix** Logging: Toolkit logs are now cleaned up automatically by the extension to prevent excessive storage consumption
+- **Bug Fix** fix newline in 'About Toolkit' command
+- **Bug Fix** S3: fix 'Upload to Parent...' command
+- **Bug Fix** Credentials: profile field names no longer need to be all lowercase
+- **Feature** ECS Exec: only show tasks that have the ECS Exec agent. #2416
+- **Feature** IoT: add attached policies in Things subtree
+
+## 1.34.0 2021-11-22
+
+- **Bug Fix** Improve auto-connect reliability
+- **Bug Fix** Toolkit appeared stuck at "Connecting..."
+- **Bug Fix** CDK: fixed performance issue with project detection. Detection is no longer limited to a depth of two directories.
+- **Feature** S3: Upload now supports multiple files
+- **Feature** Add AWS IoT Explorer
+- **Feature** AWS Explorer shows ECS resources and supports "Run command in container"
+
+## 1.33.0 2021-11-04
+
+- **Breaking Change** Bumping VS Code minimum version: 1.42.0 => 1.44.2
+- **Bug Fix** Credentials: Handle case when running in an ECS container but no credentials are available.
+- **Bug Fix** Resources: Avoid redundant close of active editor when resource documents are explicitly closed
+
+## 1.32.0 2021-10-21
+
+- **Breaking Change** DEPRECATION: SAM actions using `dotnetcore2.1` runtime (Phase 2 Lambda deprecation)
+- **Bug Fix** Resources: Better handling of unsupported resource actions
+- **Bug Fix** Resources: Filter S3 bucket resources by region in list view
+- **Bug Fix** Resources: Exclude resource types that do not support LIST in Cloud9
+- **Bug Fix** Resources: Handle undefined type schema properties
+
+## 1.31.0 2021-10-14
+
+- **Bug Fix** StepFunctions: "Publish" command now asks for target region
+- **Feature** SAM "Edit Debug Configuration" UI is no longer "Beta"
+- **Feature** Surface read-only support for hundreds of resources under the Resources node in the AWS Explorer
+- **Feature** Create new Step Functions state machine template from AWS Explorer
+
+## 1.30.0 2021-10-04
+
+- **Breaking Change** DEPRECATION:  SAM actions using `python2.7` and `nodejs10.x` runtimes (Phase 2 Lambda deprecation)
+- **Breaking Change** SAM run/debug: The launch configuration options 'timeoutSec' and 'memoryMb' no longer apply to template or API targets
+- **Bug Fix** SAM/nodejs: do not check for "tsc" (typescript compiler) for plain javascript projects
+- **Bug Fix** SAM Debug Configuration Editor: All fields will persist after Save or Invoke action.
+- **Bug Fix** SAM: refresh timeout timer during build step
+- **Bug Fix** SAM/typescript: fix run/debug for target=code if source dir name has special chars
+- **Bug Fix** App Runner: fix issue with create wizard failing at the end after backing out of the select file dialog
+- **Feature** SAM: `arm64` support (through SAM CLI's Architectures property) on select runtimes
+- **Feature** Step Functions: Adds ability to render state machine graph from AWS Explorer.
+- **Feature** Credentials: SSO profiles will reconnect on startup if the token is still valid
+- **Feature** SAM run/debug: You can now change where SAM CLI builds your lambda by adding a 'buildDir' field to your launch configuration's "sam" section
+- **Feature** UI: Toolkit statusbar now shows on the left and takes less space
+- **Feature** Step Functions: enable visualizing ASL files in YAML (not asl-yaml) mode.
+- **Feature** SAM/CFN schema support: avoid changes to user settings, improve reliability.
+- **Feature** Adds Command Palette and CDK Explorer tree visualization capability for Step Functions state machines defined using the AWS CDK
+- **Feature** SAM/typescript: search node_modules in the workspace for "tsc" typescript compiler
+- **Feature** SAM Debug Configuration Editor: The UI has been updated to more closely match VS Code's style
+
+## 1.29.0 2021-08-19
+
+- **Bug Fix** SAM: the Toolkit now correctly skips sending '--env-vars' when no environment variables are present in the launch config
+- **Bug Fix** Credentials: correctly handle different `source_profile` combinations
+- **Bug Fix** SAM/CFN: fix JSON schema path causing a symlink on some operating systems
+- **Bug Fix** SAM/CFN JSON schema: schemas now load correctly on first-load
+- **Bug Fix** SAM/CFN JSON schema: write yaml.customTags to user-global settings (instead of workspace-local)
+- **Feature** SAM Application support for the python3.9 runtime
+
+## 1.28.0 2021-08-09
+
+- **Bug Fix** SAM Invoke Webview: fix 'Show All Fields' causing a blank page
+- **Bug Fix** CloudWatch Logs: show a placeholder message instead of an error when no logs exist
+- **Feature** Credentials: support for ECS container provided credentials
+- **Feature** Credentials: Improved guidance during new credential profile creation
+- **Feature** Added Getting Started walkthroughs to aid in configuring the Toolkit
+- **Feature** S3: new command/action: 'Generate Presigned URL'
+- **Feature** App Runner: You can now create, pause, resume, deploy, and delete App Runner services within the AWS explorer.
+- **Feature** New SAM applications come with toolkit-specific instructions
+- **Feature** Apply JSON schemas to Cloudformation and SAM templates (must be named `template.yaml`)
+
+## 1.27.0 2021-07-01
+
+- **Bug Fix** SAM: fixed issue with downloading deployed lambdas
+- **Bug Fix** Credentials: Validate attached IAM role when deciding if EC2 instance credentials are available
+
+## 1.26.0 2021-06-30
+
+- **Bug Fix** S3: improved performance in private VPC (via getBucketLocation)
+- **Bug Fix** Add new setting `aws.samcli.lambda.timeout` and remove `aws.samcli.debug.attach.timeout.millis` setting. The new setting sets the maximum time to wait for a local Lambda to start.
+- **Bug Fix** CloudWatch Logs: timestamps were incorrectly shown in 12 hour notation instead of 24 hour notation
+- **Bug Fix** Settings: write 'recently used buckets' setting as JSON object
+- **Feature** Renamed "Import Lambda" -> "Download Lambda" for clarity
+- **Feature** New command: `AWS: Upload current file to S3`
+- **Feature** File Explorer: "Deploy SAM Application" is available from the context-menu for template.yaml files #263
+- **Feature** SAM run/debug: support TypeScript SAM Lambda projects #1845
+- **Feature** credentials: support for credentials provided by EC2 instance metadata and environment variables
+
+## 1.25.0 2021-05-10
+
+- **Bug Fix** Credentials: cannot access 'canAutoConnect' of undefined
+- **Feature** UX: Add progress notification when connecting to AWS
+- **Feature** SAM run/debug: fail early so that build/invoke errors are more obvious #1689
+- **Feature** CDK: search for CDK projects up to 2 levels deep (previously 1)
+- **Feature** CDK: menu includes standard items if AWS view is hidden
+- **Feature** Skip auto-connect until AWS Explorer is shown #1433
+- **Feature** Toggle CodeLenses via "AWS: Toggle SAM hints in source files" command
+- **Feature** SAM run/debug: Add support for Go 1.x
+- **Feature** UX: write logs to extension's 'globalStoragePath' for all operating systems #1692
+- **Feature** Create aws-sam debug configurations via Command Palette using the `AWS: Add SAM Debug Configuration` command
+- **Removal** Settings: remove "Enable CDK Explorer" option (VSCode has built-in support for showing/hiding panels already)
+
+## 1.24.0 2021-04-22
+
+- **Bug Fix** SAM Python debugging: restore retry to ensure successful attach #1666
+- **Feature** SAM run/debug: Add support for Java 8, Java 8.al2, and Java 11 runtimes using Maven and Gradle
+- **Feature** CDK panel now appears below the AWS Explorer instead of the VSCode File Explorer
+- **Feature** UI: Refresh AWS Explorer after performing "Deploy SAM application"
+
+## 1.23.0 2021-04-16
+
+- **Feature** Beta UI for editing and directly invoking AWS SAM debug configurations
+- **Feature** AWS Explorer: clicking "Failed to load" node navigates to failure details #1569
+- **Feature** SAM Deploy wizard: show recently-used S3 buckets; ability to input S3 bucket name manually #1527
+- **Feature** SAM run/debug: Add support for Java 8, Java 8.al2, and Java 11 runtimes using Maven and Gradle
+- **Feature** Step Functions: adds ability to publish/update state machine from ASL YAML files.
+- **Feature** SAM run/debug: improve display of partial lines #1581
+- **Feature** "Create Lambda SAM Application": navigate to README.md instead of template.yaml #1574
+
+## 1.22.0 2021-03-19
+
+- **Bug Fix** fix unwanted "invalid SAM CLI" error on startup
+- **Feature** StepFunctions: show "View Logs" button on failure
+
+## 1.21.0 2021-03-17
+
+- **Breaking Change** SAM debug: remove nodejs8.10 support
+- **Bug Fix** Toolkit correctly handles failures when importing Lambdas for supported language families that have not been added explicitly as importable
+- **Bug Fix** Launch configurations created by the Toolkit use correct relative paths
+- **Feature** Support ${workspaceFolder} in aws-sam debug configs
+- **Feature** Renaming "Create new SAM Application" to "Create Lambda SAM Application" to make it clear that this is an entrypoint for creating a Lambda function
+- **Feature** SAM deploy wizard: optionally create a new S3 bucket
+
+## 1.20.0 2021-02-04
+
+- **Feature** SAM templates handle Global values correctly when Resource-level fields are missing.
+- **Feature** Support for SAM CLI 1.17: SAM create/run nodejs14.x
+
+## 1.19.0 2021-02-01
+
+- **Bug Fix** Schemas: download failure would not trigger code generation under certain conditions
+- **Feature** "Create new SAM Application" command suggests a more-intuitive name
+- **Feature** Support for SAM CLI 1.16: SAM create/run dotnet5.0
+- **Feature** List API Gateway names with their ID (so Toolkit can list APIs with identical names)
+- **Feature** Improved validation when searching for SAM CLI #1465
+
+## 1.18.0 2021-01-07
+
+- **Bug Fix** WatchedFiles improvements (Windows) #1416
+- **Bug Fix** SAM debug: Fix deployment for image based lambdas in sam cli 1.14+ #1448
+- **Bug Fix** SAM debug: fix payload JSON validation #1440
+- **Feature** Adds ASL YAML linting and visualization support.
+- **Feature** SAM debug: use debugpy instead of ptvsd #1365
+- **Feature** SAM debug: Ignore build failures and attempt to continue invoke/deploy
+- **Feature** SAM debug: detect & surface "low disk space"
+- **Feature** Adds Amazon States Language (YAML) format to the ASL Language Server. Adds option to choose YAML format when creating new Step Functions state machine from a template.
+
+## 1.17.0 2020-12-11
+
+- **Bug Fix** Automatically add runtime to the autogenerated launch configuration for Image-based Lambdas
+- **Feature** API Gateway support: debug local SAM resources, list and run remote resources
+
+## 1.16.0 2020-12-01
+
+- **Bug Fix** Fix showing templates from .aws-sam in Sam Deploy (#1380)
+- **Bug Fix** Fix creating S3 buckets in us-east-1
+- **Bug Fix** Retain view state for Step Functions and Lambda when changing tabs
+- **Feature** Container Image Support in Lambda
+- **Feature** Add an explorer node for managing ECR repositories
+- **Feature** NodeJS and Python Lambda functions can be imported from an AWS account into a local workspace
+- **Feature** Lambda functions can be updated with code from ZIP files and directories containing built or unbuilt code
+- **Feature** Codelenses in source files can create launch configurations that reference template.yaml resources.
+- **Feature** "Create new SAM Application" action is available from the context menu of Lambda nodes in the AWS Explorer
+- **Feature** The amount of CloudWatch Logs entries retrieved per request is now configurable.
+- **Feature** "Deploy SAM Application" action is available from the context menu of Lambda, CloudFormation, and Region nodes in the AWS Explorer
+
+## 1.15.0 2020-10-06
+
+- **Bug Fix** Fix issues which prevented SAM debugging in WSL #1300
+- **Feature** Add support for debugging dotnet 3.1 local lambdas (requires minimum SAM CLI version of 1.4.0)
+- **Feature** Add Arn and Region to Lambda invoke view
+
+## 1.14.0 2020-09-30
+
+- **Bug Fix** Fix ASL validation bug marking states as unreachable when defined before a Choice state
+- **Feature** Add AWS Systems Manager integration to allow users to view, create and publish Automation documents. Support for code completion and validation with templates and code snippets to help users author their Automation documents.
+- **Feature** When deploying a SAM application, the S3 bucket is now chosen from a list. Previously, the bucket name had to be typed in.
+
+## 1.13.0 2020-08-24
+
+- **Feature** Toolkit automatically adds a launch configuration to the workspace when creating SAM applications
+- **Feature** CloudWatch Logs functionality
+- **Feature** Amazon States Language Server: Add validation for new ASL specification released on August 11.
+
+## 1.12.0 2020-07-30
+
+- **Feature** A new experience for locally Running/Debugging Lambdas with SAM that uses VS Code launch configurations (PR #1215)
+- **Feature** SAM Apps that are in SAM Templates are now run/debugged through the Run panel via `aws-sam` Launch Configurations.
+- **Feature** Add S3 integration to allow users to create buckets, list buckets, list files and folders, upload files, download files, delete files, delete buckets, and more!
+
+## 1.11.0 2020-07-18
+
+- **Breaking Change** Bumped minimum (inclusive) supported SAM CLI version from 0.38.0 to 0.47.0.
+- **Bug Fix** Amazon States Language Server: Replaces "True" strings of End with boolean in snippets.
+- **Bug Fix** Makes the ItemsPath property of Map state optional in ASL linter.
+- **Bug Fix** Amazon States Language Server: Adds validation of next property for Catch of Map state.
+- **Bug Fix** Amazon States Language Server: Adds missing "Comment" property for ChoiceRules, Catcher and Retrier.
+- **Feature** Amazon States Language Server: Adds validation of JSON Paths within Parameters.
+- **Feature** Added `dotnetcore3.1` app creation and local run support. Local debug is not currently supported.
+- **Feature** support SAM CLI version 1.x
+
+## 1.10.0 2020-05-27
+
+- **Feature** Add basic visualisation capability for step function state machines defined in YAML.
+- **Feature** Step Functions Linter: Resource property of Task state will accept any string instead of just arn. Additional disallowed properties will be marked as invalid.
+- **Feature** If a file conflict is detected when downloading event schemas code bindings, a confirmation prompt is shown
+
+## 1.9.0 2020-04-29
+
+- **Breaking Change** Bumping VS Code minimum version: 1.31.1 => 1.42.0
+- **Bug Fix** Bug fixes for step functions language server.: One is related to the error when there is "Default" property missing on "Choice" state.  Second,  “Unreachable state” error when the default state is declared before being referenced by “Choice” state.
+- **Bug Fix** Fixed a validation issue with VS Code's `settings.json` and `launch.json` files (#1027)
+- **Feature** Add context menu command to copy ARNs from the AWS Explorer
+- **Feature** Bumped maximum (exclusive) supported SAM CLI version from 0.50.0 to 0.60.0.
+- **Feature** Users are shown a notification reflecting changes to how usage data is gathered. Usage data can still be configured through the editor's settings.
+- **Feature** Visualising of step functions step machines will be allowed when ARN strings within ASL definition are invalid.
+
+## 1.8.0 2020-03-31
+
+- **Bug Fix** SAM applications deployed through the toolkit now support IAM resources with custom names
+- **Bug Fix** Fix issue where CodeLenses appeared on wrong lines in .js files when adding or removing lines
+- **Feature** Toolkit dynamically chooses an available port when debugging SAM applications, starting at port 5858 and counting upwards until one is found
+- **Feature** Rebranding the toolkit as the "AWS Toolkit"
+- **Feature** New Step Function capabilities: Step Function state machine resources are now shown in the AWS Explorer. Language support (auto-completion, validation) for authoring state machine files. State machines can be created from starting templates. State machines can be downloaded from, published to, and executed within an account.
+
+## 1.7.0 2020-02-18
+
+- **Feature** The Toolkit now supports China and GovCloud regions. If you have a shared credentials profile based in one of these regions, you can add a "region" property to that profile, and the Toolkit will know to use a different region set.
+- **Feature** Added the 'About AWS Toolkit' command and menu option to show AWS Toolkit versioning details that are useful to include with bug reports.
+
+## 1.6.1 2020-02-10
+
+- **Bug Fix** Fixed an issue related to toolkit metrics
+
+## 1.6.0 2020-02-06
+
+- **Breaking Change** Minimum version of SAM CLI has been adjusted from 0.32.0 to 0.38.0 to accommodate new SAM application support for EventBridge Schemas
+- **Bug Fix** AWS Explorer no longer shows service nodes under regions where the service is not available (#850)
+- **Bug Fix** Fixed an issue where invalid credentials were reused until VS Code was closed and re-opened, even if the credentials source was updated. It is no longer necessary to restart VS Code. (#705)
+- **Feature** The MFA prompt now shows which MFA Device a code is being asked for.
+- **Feature** When credentials are invalid a notification is shown. To help diagnose these situations, a button was added to the notification that can open the logs.
+- **Feature** Removed the ability to create node.js 8.10 SAM Applications. This runtime has been deprecated. See https://docs.aws.amazon.com/lambda/latest/dg/runtime-support-policy.html for more information.
+- **Feature** When changes are made to Shared Credentials files, they will be picked up by the Toolkit the next time credentials are selected during the 'Connect to AWS' command.
+- **Feature** Added support to locally run SAM applications in containers.
+- **Feature** AWS Explorer now sorts region nodes by the region name
+- **Feature** Credentials were previously shown by their Shared Credentials profile names. They are now displayed in a "type:name" format, to better indicate the type of Credentials being used, and to support additional Credentials types in the future. Shared Credentials are shown with the type "profile".
+- **Feature** Added the ability to create new Serverless Applications with EventBridge Schemas support.
+
+## 1.5.0 2020-01-06
+
+- **Breaking Change** Minimum version of SAM CLI has been adjusted from 0.16.0 to 0.32.0 to accommodate new runtime support
+- **Feature** Bumped maximum (exclusive) supported SAM CLI version from 0.40.0 to 0.50.0.
+- **Feature** SAM Application support for the python3.8 runtime
+- **Feature** Reduced plugin size and startup time significantly
+- **Feature** SAM Application support for the nodejs12.x runtime
+- **Feature** The StatusBar item displaying the current credentials used by the toolkit now shows when no credentials are being used. It can also be clicked to change the Toolkit's active credentials.
+- **Feature** The Toolkit now applies configuration changes to the log level when it changes instead of the next time the toolkit is started (#860)
+- **Feature** The folder depth within a workspace that SAM Template files are searched for is now configurable. Previously, this was fixed at 2.
+
+## 1.4.0 2019-12-02
+
+- **Feature** Added support for Amazon EventBridge schema registry, making it easy to discover and write code for events in EventBridge
+
+## 1.3.0 2019-11-22
+
+- **Bug Fix** AWS Explorer now shows a node indicating when CloudFormation Stacks cannot be found in a region
+- **Bug Fix** AWS Explorer now sorts the resources that belong to each CloudFormation Stack
+- **Bug Fix** AWS Explorer now shows a node indicating when Lambda Functions cannot be found in a region
+- **Feature** CDK projects can now be visualized with the CDK Explorer
+
+## 1.2.0 2019-10-17
+
+- **Bug Fix** Add '--no-interactive' flag to 'sam init' calls when SAM CLI version is greater than or equal to 0.30.0
+- **Feature** Added docker network option support for invoking sam applications
+- **Feature** Ansi codes are removed from text shown in the Output tab when Locally Invoking Lambda handlers
+- **Feature** Adding support for SAM CLI 0.30.0 features in `sam init`: --app-template and --dependency-manager
+- **Feature** Bumped maximum (exclusive) supported SAM CLI version from 0.30.0 to 0.40.0.
+
+## 1.1.0 2019-09-20
+
+- **Bug Fix** Creating SAM Applications into a different folder than the current VS Code workspaces will now open an application file after app creation (#678)
+- **Feature** Support credential_process (#317)
+- **Feature** Improved the description of the selection item when picking a location for a new SAM Application (#673, #675)
+- **Feature** Added JSON validation for ECS task definition intellisense
+- **Feature** Bumped maximum (exclusive) supported SAM CLI version from 0.23.0 to 0.30.0.
+
+## 1.0.0
+
+* A toast greets the user upon launching a new version of the toolkit for the first time which provides a link to a quick start page. This quick start page can be re-accessed through the explorer's context menu. (#610-612)
+* Local Run/Debug now honors MemorySize values from SAM Template file (#509)
+* Local Run/Debug now honors Timeout values from SAM Template file (#510)
+* Local Run/Debug now honors the Globals section from SAM Template file
+* Fixed issue preventing users from connecting with assumed roles (#620)
+* Added ability to report an issue from the AWS Explorer menu (#613)
+* Added SAM Application-related commands to the AWS Explorer menu
+* Removed support for nodejs6.10 SAM Applications
+* Regions that are not in the standard AWS partition have been removed from the UI until proper partition support can be added
+
+## 0.2.1 (Developer Preview)
+
+* Fixed issue preventing users from connecting with assumed roles (#620)
+
+## 0.2.0 (Developer Preview)
+
+* Local Run/Debug is now available for .NET Core 2.1 functions within SAM Applications
+* Local Run/Debug is now available for Python 2.7, 3.6, and 3.7 functions within SAM Applications
+* Local Run/Debug is now available for NodeJS 10.x functions within SAM Applications
+* Local Run/Debug of SAM Lambda Functions now outputs to the Output and Debug Console, and reduces timing issues for attaching the debugger
+* Removed Lambda view that showed the Lambda Policy
+* Removed Lambda view that showed the Lambda Configuration
+* Removed unsupported Lambda runtimes from the 'Create New SAM Application' wizard.
+* The AWS Explorer menu items no longer appear on other VS Code panel menus
+* When creating a new SAM Application, the toolkit now checks for a valid SAM CLI version before prompting the user for inputs
+* When deploying a SAM Application, the toolkit now checks for a valid SAM CLI version before prompting the user for inputs
+* Telemetry now sends AWS account data
+* Minimum SAM CLI version has been bumped to 0.16.0
+
+## 0.1.2 (Developer Preview)
+
+* Bumped maximum (exclusive) supported SAM CLI version from 0.16.0 to 0.23.0.
+
+## 0.1.1 (Developer Preview)
+
+* Updated Marketplace page to display information on how to use the Toolkit once installed
+
+## 0.1.0 (Developer Preview)
+
+* Initial release
diff --git a/packages/toolkit/README.md b/packages/toolkit/README.md
new file mode 100644
index 00000000000..25fa152f5f0
--- /dev/null
+++ b/packages/toolkit/README.md
@@ -0,0 +1,98 @@
+[![Twitter Follow](https://img.shields.io/badge/follow-@aws-1DA1F2?style=flat-square&logo=aws&logoColor=white&label=Follow)](https://x.com/awscloud)
+[![Youtube Channel Views](https://img.shields.io/youtube/channel/views/UCd6MoB9NC6uYN2grvUNT-Zg?style=flat-square&logo=youtube&label=Youtube)](https://www.youtube.com/@amazonwebservices)
+![Marketplace Installs](https://img.shields.io/vscode-marketplace/i/AmazonWebServices.aws-toolkit-vscode.svg?label=Installs&style=flat-square)
+
+# Amazon Q and CodeWhisperer
+
+Amazon CodeWhisperer is now part of Amazon Q. [Try the Amazon Q extension](https://marketplace.visualstudio.com/items?itemName=AmazonWebServices.amazon-q-vscode).
+
+# Getting Started
+
+1. Open the AWS Toolkit extension
+2. Sign in with your AWS credentials
+
+![getting-started](https://raw.githubusercontent.com/aws/aws-toolkit-vscode/HEAD/docs/marketplace/vscode/auth-Toolkit.gif)
+
+The AWS Toolkit lets you interact with AWS directly from VS Code. Ready to install? See [Getting Started](#getting-started).
+
+# Features
+
+## [Threat Composer](https://github.com/awslabs/threat-composer#readme)
+
+Integrate threat modeling practices into your development workflow by creating and version controlling your threat models as code.
+
+Threat Composer for the AWS Toolkit for Visual Studio Code allows you to create, view and edit [Threat Composer](https://github.com/awslabs/threat-composer#readme) threat models `.tc.json` directly within VSCode.
+
+![Threat Composer](https://raw.githubusercontent.com/aws/aws-toolkit-vscode/HEAD/docs/marketplace/vscode/threatComposer.gif)
+
+## [Infrastructure Composer](https://aws.amazon.com/application-composer/)
+
+AWS Infrastructure Composer maintains a real-time visual representation of your application architecture in sync with your IaC. Changes to the architecture—such as adding new resources or changing service configuration—are reflected in the IaC artifacts, and vice versa.
+
+-   Visually compose modern applications from 1,000+ AWS CloudFormation resources with little guesswork.
+-   Use the right tool for the task, including visual, code, or generative AI powered code suggestions in your IDE.
+-   Integrate with Workflow Studio to visually orchestrate over 220 AWS services or public http endpoints with Step Functions workflows.
+
+![Infrastructure Composer](https://raw.githubusercontent.com/aws/aws-toolkit-vscode/HEAD/docs/marketplace/vscode/infraComposer.webp)
+
+## [Amazon CodeCatalyst](https://codecatalyst.aws/explore)
+
+Unified software development service to quickly build and deliver applications on AWS.
+
+## [Step Functions](https://aws.amazon.com/step-functions/)
+
+Step Functions Workflow Studio provides a dynamic, visual representation of your state machine definition. Any changes you make, such as adding new resources or adjusting service configurations, are automatically reflected in your state machine definition.
+
+With Workflow Studio integrated with VS Code, you can do the following:
+
+-   Design state machines visually from within VS Code
+-   Seamlessly use both text and visual editing
+-   Test and debug your workflow states
+
+![Step Functions](https://raw.githubusercontent.com/aws/aws-toolkit-vscode/HEAD/docs/marketplace/vscode/stepFunctions.gif)
+
+**Dev Environments** - launch VS Code in a cloud development environment, available on-demand in the cloud and automatically created with branch code and consistent project settings, providing faster setup, development, and testing
+
+## View, modify, and deploy AWS resources
+
+**Multiple AWS accounts and regions** - access AWS resources across your accounts and regions
+
+![creds](https://raw.githubusercontent.com/aws/aws-toolkit-vscode/HEAD/docs/marketplace/vscode/creds.gif)
+
+**S3 support** - view, create, and edit S3 buckets, folders, and files
+
+![S3](https://raw.githubusercontent.com/aws/aws-toolkit-vscode/HEAD/docs/marketplace/vscode/S3.gif)
+
+**Lambda** - download & upload Lambda functions
+
+![download-Lambda](https://raw.githubusercontent.com/aws/aws-toolkit-vscode/HEAD/docs/marketplace/vscode/download-Lambda.gif)
+
+## Troubleshoot AWS from the IDE
+
+**Lambda** - step-through AWS Lambda functions using the VS Code debugger
+
+![Lambda_step_through_debugging](https://raw.githubusercontent.com/aws/aws-toolkit-vscode/HEAD/docs/marketplace/vscode/Lambda_step_through_debugging.gif)
+
+**CloudWatch** - find logs generated by your AWS resources
+
+![cw_logs](https://raw.githubusercontent.com/aws/aws-toolkit-vscode/HEAD/docs/marketplace/vscode/cw_logs.gif)
+
+**ECS** - execute commands against running ECS containers (or open a terminal)
+
+![ecs-terminal](https://raw.githubusercontent.com/aws/aws-toolkit-vscode/HEAD/docs/marketplace/vscode/ecs-terminal.gif)
+
+## More features
+
+-   **EC2** - `Connect VS Code` or `Open Terminal` to EC2 instances
+-   **Redshift** - view database objects and run SQL queries in a notebook interface
+-   **CloudFormation** - view CloudFormation stacks
+-   **API Gateway** - invoke an API gateway endpoint
+-   **S3** - view and create S3 folders and buckets, download and upload files, and edit supported files
+
+For a full list of features, visit [our documentation](https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/working-with-aws.html).
+
+## Troubleshooting
+
+Submit bug reports and feature requests [on our Github repository](https://github.com/aws/aws-toolkit-vscode/issues/new/choose).
+
+Looking for Amazon Q or CodeWhisperer? [Try the Amazon Q extension](https://marketplace.visualstudio.com/items?itemName=AmazonWebServices.amazon-q-vscode).
diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json
new file mode 100644
index 00000000000..6a697d27596
--- /dev/null
+++ b/packages/toolkit/package.json
@@ -0,0 +1,5101 @@
+{
+    "name": "aws-toolkit-vscode",
+    "displayName": "AWS Toolkit",
+    "description": "Including CodeCatalyst, Infrastructure Composer, and support for Lambda, S3, CloudWatch Logs, CloudFormation, and many other services.",
+    "version": "3.83.0-SNAPSHOT",
+    "extensionKind": [
+        "workspace"
+    ],
+    "publisher": "amazonwebservices",
+    "license": "Apache-2.0",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/aws/aws-toolkit-vscode"
+    },
+    "icon": "resources/marketplace/aws-icon-256x256.png",
+    "bugs": {
+        "url": "https://github.com/aws/aws-toolkit-vscode/issues"
+    },
+    "galleryBanner": {
+        "color": "#232F3E",
+        "theme": "dark"
+    },
+    "categories": [
+        "Debuggers",
+        "Linters",
+        "Visualization",
+        "Notebooks",
+        "Other"
+    ],
+    "keywords": [
+        "Lambda",
+        "CodeCatalyst",
+        "Composer",
+        "Amazon",
+        "S3"
+    ],
+    "preview": false,
+    "qna": "https://github.com/aws/aws-toolkit-vscode/issues",
+    "activationEvents": [
+        "onStartupFinished",
+        "onUri",
+        "onDebugResolve:aws-sam",
+        "onDebugInitialConfigurations",
+        "onLanguage:javascript",
+        "onLanguage:java",
+        "onLanguage:python",
+        "onLanguage:csharp",
+        "onLanguage:yaml",
+        "onFileSystem:s3",
+        "onFileSystem:s3-readonly"
+    ],
+    "main": "./dist/src/extensionNode",
+    "browser": "./dist/src/extensionWeb",
+    "engines": {
+        "npm": "^10.1.0",
+        "vscode": "^1.83.0"
+    },
+    "scripts": {
+        "vscode:prepublish": "npm run clean && npm run buildScripts && webpack --mode production",
+        "buildScripts": "npm run generateNonCodeFiles && npm run copyFiles && npm run generateIcons && npm run generateSettings && npm run generateConfigurationAttributes && tsc -p ./ --noEmit",
+        "generateConfigurationAttributes": "ts-node ./scripts/build/generateConfigurationAttributes.ts",
+        "generateNonCodeFiles": "ts-node ../../scripts/generateNonCodeFiles.ts",
+        "copyFiles": "ts-node ./scripts/build/copyFiles.ts",
+        "clean": "ts-node ../../scripts/clean.ts dist/ LICENSE NOTICE quickStart*",
+        "compile": "npm run clean && npm run buildScripts && webpack",
+        "compileDev": "npm run compile -- --mode development",
+        "compileOnly": "tsc -p ./",
+        "webWatch": "npm run clean && npm run buildScripts && webpack --mode development --watch",
+        "webCompile": "npm run clean && npm run buildScripts && webpack --config-name web",
+        "webRun": "npx @vscode/test-web --open-devtools --browserOption=--disable-web-security --waitForDebugger=9222 --extensionDevelopmentPath=. .",
+        "testCompile": "npm run clean && npm run buildScripts && npm run compileOnly",
+        "test": "npm run testCompile && c8 --allowExternal ts-node ../core/scripts/test/launchTest.ts unit dist/test/unit/index.js ../core/dist/src/testFixtures/workspaceFolder",
+        "testE2E": "npm run testCompile && c8 --allowExternal ts-node ../core/scripts/test/launchTest.ts e2e dist/test/e2e/index.js ../core/dist/src/testFixtures/workspaceFolder",
+        "testInteg": "npm run testCompile && c8 --allowExternal ts-node ../core/scripts/test/launchTest.ts integration dist/test/integ/index.js ../core/dist/src/testFixtures/workspaceFolder",
+        "package": "ts-node ../../scripts/package.ts",
+        "lint": "true",
+        "createRelease": "ts-node ../../scripts/createRelease.ts",
+        "newChange": "ts-node ../../scripts/newChange.ts",
+        "watch": "npm run clean && npm run buildScripts && tsc -watch -p ./",
+        "generateIcons": "ts-node ../../scripts/generateIcons.ts",
+        "generateSettings": "ts-node ../../scripts/generateSettings.ts"
+    },
+    "contributes": {
+        "configuration": {
+            "type": "object",
+            "title": "%AWS.productName%",
+            "cloud9": {
+                "cn": {
+                    "title": "%AWS.productName.cn%"
+                }
+            },
+            "properties": {
+                "aws.profile": {
+                    "type": "string",
+                    "deprecationMessage": "The current profile is now stored internally by the Toolkit.",
+                    "description": "%AWS.configuration.profileDescription%"
+                },
+                "aws.ecs.openTerminalCommand": {
+                    "type": "string",
+                    "default": "/bin/sh",
+                    "markdownDescription": "%AWS.configuration.description.ecs.openTerminalCommand%"
+                },
+                "aws.iot.maxItemsPerPage": {
+                    "type": "number",
+                    "default": 100,
+                    "minimum": 1,
+                    "maximum": 250,
+                    "markdownDescription": "%AWS.configuration.description.iot.maxItemsPerPage%"
+                },
+                "aws.s3.maxItemsPerPage": {
+                    "type": "number",
+                    "default": 300,
+                    "minimum": 3,
+                    "maximum": 1000,
+                    "markdownDescription": "%AWS.configuration.description.s3.maxItemsPerPage%"
+                },
+                "aws.samcli.location": {
+                    "type": "string",
+                    "scope": "machine",
+                    "default": "",
+                    "markdownDescription": "%AWS.configuration.description.samcli.location%"
+                },
+                "aws.samcli.lambdaTimeout": {
+                    "type": "number",
+                    "default": 90000,
+                    "markdownDescription": "%AWS.configuration.description.samcli.lambdaTimeout%"
+                },
+                "aws.samcli.legacyDeploy": {
+                    "type": "boolean",
+                    "default": false,
+                    "markdownDescription": "%AWS.configuration.description.samcli.legacyDeploy%"
+                },
+                "aws.telemetry": {
+                    "type": "boolean",
+                    "default": true,
+                    "markdownDescription": "%AWS.configuration.description.telemetry%",
+                    "cloud9": {
+                        "cn": {
+                            "markdownDescription": "%AWS.configuration.description.telemetry.cn%"
+                        }
+                    }
+                },
+                "aws.stepfunctions.asl.format.enable": {
+                    "type": "boolean",
+                    "scope": "window",
+                    "default": true,
+                    "description": "%AWS.stepFunctions.asl.format.enable.desc%"
+                },
+                "aws.stepfunctions.asl.maxItemsComputed": {
+                    "type": "number",
+                    "default": 5000,
+                    "description": "%AWS.stepFunctions.asl.maxItemsComputed.desc%"
+                },
+                "aws.ssmDocument.ssm.maxItemsComputed": {
+                    "type": "number",
+                    "default": 5000,
+                    "description": "%AWS.ssmDocument.ssm.maxItemsComputed.desc%"
+                },
+                "aws.cwl.limit": {
+                    "type": "number",
+                    "default": 10000,
+                    "description": "%AWS.cwl.limit.desc%",
+                    "maximum": 10000
+                },
+                "aws.samcli.manuallySelectedBuckets": {
+                    "type": "object",
+                    "description": "%AWS.samcli.deploy.bucket.recentlyUsed%",
+                    "default": []
+                },
+                "aws.samcli.enableCodeLenses": {
+                    "type": "boolean",
+                    "description": "%AWS.configuration.enableCodeLenses%",
+                    "default": false
+                },
+                "aws.suppressPrompts": {
+                    "type": "object",
+                    "description": "%AWS.configuration.description.suppressPrompts%",
+                    "default": {},
+                    "properties": {
+                        "apprunnerNotifyPricing": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "apprunnerNotifyPause": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "ecsRunCommand": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "ecsRunCommandEnable": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "ecsRunCommandDisable": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "regionAddAutomatically": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "yamlExtPrompt": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "fileViewerEdit": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "createCredentialsProfile": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "samcliConfirmDevStack": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "remoteConnected": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "codeCatalystConnectionExpired": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "minIdeVersion": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "ssoCacheError": {
+                            "type": "boolean",
+                            "default": false
+                        }
+                    },
+                    "additionalProperties": false
+                },
+                "aws.experiments": {
+                    "type": "object",
+                    "markdownDescription": "%AWS.configuration.description.experiments%",
+                    "default": {
+                        "jsonResourceModification": false
+                    },
+                    "properties": {
+                        "jsonResourceModification": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "amazonqLSP": {
+                            "type": "boolean",
+                            "default": true
+                        },
+                        "amazonqLSPInline": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "amazonqChatLSP": {
+                            "type": "boolean",
+                            "default": true
+                        },
+                        "amazonqLSPInlineChat": {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        "amazonqLSPNEP": {
+                            "type": "boolean",
+                            "default": false
+                        }
+                    },
+                    "additionalProperties": false
+                },
+                "aws.resources.enabledResources": {
+                    "type": "array",
+                    "description": "%AWS.configuration.description.resources.enabledResources%",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "aws.lambda.recentlyUploaded": {
+                    "type": "object",
+                    "description": "%AWS.configuration.description.lambda.recentlyUploaded%",
+                    "default": []
+                },
+                "aws.accessAnalyzer.policyChecks.checkNoNewAccessFilePath": {
+                    "type": "string",
+                    "default": "",
+                    "description": "File path or S3 path to a text document for CheckNoNewAccess custom check.",
+                    "scope": "window"
+                },
+                "aws.accessAnalyzer.policyChecks.checkAccessNotGrantedFilePath": {
+                    "type": "string",
+                    "default": "",
+                    "description": "File path or S3 path to a text document for CheckAccessNotGranted custom check.",
+                    "scope": "window"
+                },
+                "aws.accessAnalyzer.policyChecks.cloudFormationParameterFilePath": {
+                    "type": "string",
+                    "default": "",
+                    "description": "A JSON formatted file that specifies template parameter values, a stack policy, and tags. Only parameters are used from this file.",
+                    "scope": "machine-overridable"
+                },
+                "aws.sagemaker.studio.spaces.enableIdentityFiltering": {
+                    "type": "boolean",
+                    "default": false,
+                    "description": "Enable automatic filtration of spaces based on your AWS identity."
+                }
+            }
+        },
+        "debuggers": [
+            {
+                "type": "aws-sam",
+                "when": "isCloud9 || !aws.isWebExtHost",
+                "label": "%AWS.configuration.description.awssam.debug.label%",
+                "configurationAttributes": {
+                    "direct-invoke": {
+                        "$schema": "http://json-schema.org/draft-07/schema#",
+                        "title": "AwsSamDebuggerConfiguration",
+                        "additionalProperties": false,
+                        "properties": {
+                            "aws": {
+                                "title": "AWS Connection",
+                                "description": "%AWS.configuration.description.awssam.debug.aws%",
+                                "properties": {
+                                    "credentials": {
+                                        "description": "%AWS.configuration.description.awssam.debug.credentials%",
+                                        "type": "string",
+                                        "cloud9": {
+                                            "cn": {
+                                                "description": "%AWS.configuration.description.awssam.debug.credentials.cn%"
+                                            }
+                                        }
+                                    },
+                                    "region": {
+                                        "description": "%AWS.configuration.description.awssam.debug.region%",
+                                        "type": "string"
+                                    }
+                                },
+                                "additionalProperties": false,
+                                "type": "object"
+                            },
+                            "invokeTarget": {
+                                "oneOf": [
+                                    {
+                                        "title": "Template Target Properties",
+                                        "description": "%AWS.configuration.description.awssam.debug.invokeTarget%",
+                                        "properties": {
+                                            "templatePath": {
+                                                "description": "%AWS.configuration.description.awssam.debug.templatePath%",
+                                                "type": "string"
+                                            },
+                                            "logicalId": {
+                                                "description": "%AWS.configuration.description.awssam.debug.logicalId%",
+                                                "type": "string"
+                                            },
+                                            "target": {
+                                                "description": "%AWS.configuration.description.awssam.debug.target%",
+                                                "type": "string",
+                                                "enum": [
+                                                    "template"
+                                                ]
+                                            }
+                                        },
+                                        "additionalProperties": false,
+                                        "required": [
+                                            "templatePath",
+                                            "logicalId",
+                                            "target"
+                                        ],
+                                        "type": "object"
+                                    },
+                                    {
+                                        "title": "Code Target Properties",
+                                        "description": "%AWS.configuration.description.awssam.debug.invokeTarget%",
+                                        "properties": {
+                                            "lambdaHandler": {
+                                                "description": "%AWS.configuration.description.awssam.debug.lambdaHandler%",
+                                                "type": "string"
+                                            },
+                                            "projectRoot": {
+                                                "description": "%AWS.configuration.description.awssam.debug.projectRoot%",
+                                                "type": "string"
+                                            },
+                                            "target": {
+                                                "description": "%AWS.configuration.description.awssam.debug.target%",
+                                                "type": "string",
+                                                "enum": [
+                                                    "code"
+                                                ]
+                                            },
+                                            "architecture": {
+                                                "description": "%AWS.configuration.description.awssam.debug.architecture%",
+                                                "type": "string",
+                                                "enum": [
+                                                    "x86_64",
+                                                    "arm64"
+                                                ]
+                                            }
+                                        },
+                                        "additionalProperties": false,
+                                        "required": [
+                                            "lambdaHandler",
+                                            "projectRoot",
+                                            "target"
+                                        ],
+                                        "type": "object"
+                                    },
+                                    {
+                                        "title": "API Target Properties",
+                                        "description": "%AWS.configuration.description.awssam.debug.invokeTarget%",
+                                        "properties": {
+                                            "templatePath": {
+                                                "description": "%AWS.configuration.description.awssam.debug.templatePath%",
+                                                "type": "string"
+                                            },
+                                            "logicalId": {
+                                                "description": "%AWS.configuration.description.awssam.debug.logicalId%",
+                                                "type": "string"
+                                            },
+                                            "target": {
+                                                "description": "%AWS.configuration.description.awssam.debug.target%",
+                                                "type": "string",
+                                                "enum": [
+                                                    "api"
+                                                ]
+                                            }
+                                        },
+                                        "additionalProperties": false,
+                                        "required": [
+                                            "templatePath",
+                                            "logicalId",
+                                            "target"
+                                        ],
+                                        "type": "object"
+                                    }
+                                ]
+                            },
+                            "lambda": {
+                                "title": "Lambda Properties",
+                                "description": "%AWS.configuration.description.awssam.debug.lambda%",
+                                "properties": {
+                                    "environmentVariables": {
+                                        "description": "%AWS.configuration.description.awssam.debug.envvars%",
+                                        "additionalProperties": {
+                                            "type": [
+                                                "string"
+                                            ]
+                                        },
+                                        "type": "object"
+                                    },
+                                    "payload": {
+                                        "description": "%AWS.configuration.description.awssam.debug.event%",
+                                        "properties": {
+                                            "json": {
+                                                "description": "%AWS.configuration.description.awssam.debug.event.json%",
+                                                "type": "object"
+                                            },
+                                            "path": {
+                                                "description": "%AWS.configuration.description.awssam.debug.event.path%",
+                                                "type": "string"
+                                            }
+                                        },
+                                        "additionalProperties": false,
+                                        "type": "object"
+                                    },
+                                    "memoryMb": {
+                                        "description": "%AWS.configuration.description.awssam.debug.memoryMb%",
+                                        "type": "number"
+                                    },
+                                    "runtime": {
+                                        "description": "%AWS.configuration.description.awssam.debug.runtime%",
+                                        "type": "string"
+                                    },
+                                    "timeoutSec": {
+                                        "description": "%AWS.configuration.description.awssam.debug.timeout%",
+                                        "type": "number"
+                                    },
+                                    "pathMappings": {
+                                        "type:": "array",
+                                        "items": {
+                                            "title": "Path Mapping",
+                                            "type": "object",
+                                            "properties": {
+                                                "localRoot": {
+                                                    "type": "string"
+                                                },
+                                                "remoteRoot": {
+                                                    "type": "string"
+                                                }
+                                            },
+                                            "additionalProperties": false,
+                                            "required": [
+                                                "localRoot",
+                                                "remoteRoot"
+                                            ]
+                                        }
+                                    }
+                                },
+                                "additionalProperties": false,
+                                "type": "object"
+                            },
+                            "sam": {
+                                "title": "SAM CLI Properties",
+                                "description": "%AWS.configuration.description.awssam.debug.sam%",
+                                "properties": {
+                                    "buildArguments": {
+                                        "description": "%AWS.configuration.description.awssam.debug.buildArguments%",
+                                        "type": "array",
+                                        "items": {
+                                            "type": "string"
+                                        }
+                                    },
+                                    "buildDir": {
+                                        "description": "%AWS.configuration.description.awssam.debug.buildDir%",
+                                        "type": "string"
+                                    },
+                                    "containerBuild": {
+                                        "description": "%AWS.configuration.description.awssam.debug.containerBuild%",
+                                        "type": "boolean"
+                                    },
+                                    "dockerNetwork": {
+                                        "description": "%AWS.configuration.description.awssam.debug.dockerNetwork%",
+                                        "type": "string"
+                                    },
+                                    "localArguments": {
+                                        "description": "%AWS.configuration.description.awssam.debug.localArguments%",
+                                        "type": "array",
+                                        "items": {
+                                            "type": "string"
+                                        }
+                                    },
+                                    "skipNewImageCheck": {
+                                        "description": "%AWS.configuration.description.awssam.debug.skipNewImageCheck%",
+                                        "type": "boolean"
+                                    },
+                                    "template": {
+                                        "description": "%AWS.configuration.description.awssam.debug.template%",
+                                        "properties": {
+                                            "parameters": {
+                                                "description": "%AWS.configuration.description.awssam.debug.templateParameters%",
+                                                "additionalProperties": {
+                                                    "type": [
+                                                        "string",
+                                                        "number"
+                                                    ]
+                                                },
+                                                "type": "object"
+                                            }
+                                        },
+                                        "type": "object",
+                                        "additionalProperties": false
+                                    }
+                                },
+                                "additionalProperties": false,
+                                "type": "object"
+                            },
+                            "api": {
+                                "title": "API Gateway Properties",
+                                "description": "%AWS.configuration.description.awssam.debug.api%",
+                                "properties": {
+                                    "path": {
+                                        "description": "%AWS.configuration.description.awssam.debug.api.path%",
+                                        "type": "string"
+                                    },
+                                    "httpMethod": {
+                                        "description": "%AWS.configuration.description.awssam.debug.api.httpMethod%",
+                                        "type": "string",
+                                        "enum": [
+                                            "delete",
+                                            "get",
+                                            "head",
+                                            "options",
+                                            "patch",
+                                            "post",
+                                            "put"
+                                        ]
+                                    },
+                                    "payload": {
+                                        "description": "%AWS.configuration.description.awssam.debug.event%",
+                                        "properties": {
+                                            "json": {
+                                                "description": "%AWS.configuration.description.awssam.debug.event.json%",
+                                                "type": "object"
+                                            },
+                                            "path": {
+                                                "description": "%AWS.configuration.description.awssam.debug.event.path%",
+                                                "type": "string"
+                                            }
+                                        },
+                                        "additionalProperties": false,
+                                        "type": "object"
+                                    },
+                                    "headers": {
+                                        "description": "%AWS.configuration.description.awssam.debug.api.headers%",
+                                        "type": "object",
+                                        "additionalProperties": {
+                                            "type": "string"
+                                        }
+                                    },
+                                    "querystring": {
+                                        "description": "%AWS.configuration.description.awssam.debug.api.queryString%",
+                                        "type": "string"
+                                    },
+                                    "stageVariables": {
+                                        "description": "%AWS.configuration.description.awssam.debug.api.stageVariables%",
+                                        "type": "object",
+                                        "additionalProperties": {
+                                            "type": "string"
+                                        }
+                                    },
+                                    "clientCertificateId": {
+                                        "description": "%AWS.configuration.description.awssam.debug.api.clientCertId%",
+                                        "type": "string"
+                                    }
+                                },
+                                "additionalProperties": false,
+                                "required": [
+                                    "path",
+                                    "httpMethod"
+                                ],
+                                "type": "object"
+                            }
+                        },
+                        "required": [
+                            "invokeTarget"
+                        ],
+                        "type": "object"
+                    }
+                },
+                "configurationSnippets": [
+                    {
+                        "label": "%AWS.configuration.description.awssam.debug.snippets.lambdaCode.label%",
+                        "description": "%AWS.configuration.description.awssam.debug.snippets.lambdaCode.description%",
+                        "body": {
+                            "type": "aws-sam",
+                            "request": "direct-invoke",
+                            "name": "${3:Invoke Lambda}",
+                            "invokeTarget": {
+                                "target": "code",
+                                "lambdaHandler": "${1:Function Handler}",
+                                "projectRoot": "^\"\\${workspaceFolder}\""
+                            },
+                            "lambda": {
+                                "runtime": "${2:Lambda Runtime}",
+                                "payload": {
+                                    "json": {}
+                                }
+                            }
+                        },
+                        "cloud9": {
+                            "cn": {
+                                "label": "%AWS.configuration.description.awssam.debug.snippets.lambdaCode.label.cn%",
+                                "description": "%AWS.configuration.description.awssam.debug.snippets.lambdaCode.description.cn%"
+                            }
+                        }
+                    },
+                    {
+                        "label": "%AWS.configuration.description.awssam.debug.snippets.lambdaTemplate.label%",
+                        "description": "%AWS.configuration.description.awssam.debug.snippets.lambdaTemplate.description%",
+                        "body": {
+                            "type": "aws-sam",
+                            "request": "direct-invoke",
+                            "name": "${3:Invoke Lambda}",
+                            "invokeTarget": {
+                                "target": "template",
+                                "templatePath": "${1:Template Location}",
+                                "logicalId": "${2:Function Logical ID}"
+                            },
+                            "lambda": {
+                                "payload": {
+                                    "json": {}
+                                }
+                            }
+                        },
+                        "cloud9": {
+                            "cn": {
+                                "label": "%AWS.configuration.description.awssam.debug.snippets.lambdaTemplate.label.cn%",
+                                "description": "%AWS.configuration.description.awssam.debug.snippets.lambdaTemplate.description.cn%"
+                            }
+                        }
+                    },
+                    {
+                        "label": "%AWS.configuration.description.awssam.debug.snippets.api.label%",
+                        "description": "%AWS.configuration.description.awssam.debug.snippets.api.description%",
+                        "body": {
+                            "type": "aws-sam",
+                            "request": "direct-invoke",
+                            "name": "${5:Invoke Lambda with API Gateway}",
+                            "invokeTarget": {
+                                "target": "api",
+                                "templatePath": "${1:Template Location}",
+                                "logicalId": "${2:Function Logical ID}"
+                            },
+                            "api": {
+                                "path": "${3:Path}",
+                                "httpMethod": "${4:Method}",
+                                "payload": {
+                                    "json": {}
+                                }
+                            }
+                        },
+                        "cloud9": {
+                            "cn": {
+                                "label": "%AWS.configuration.description.awssam.debug.snippets.api.label.cn%",
+                                "description": "%AWS.configuration.description.awssam.debug.snippets.api.description.cn%"
+                            }
+                        }
+                    }
+                ]
+            }
+        ],
+        "viewsContainers": {
+            "activitybar": [
+                {
+                    "id": "aws-explorer",
+                    "title": "%AWS.title%",
+                    "icon": "resources/aws-logo.svg",
+                    "cloud9": {
+                        "cn": {
+                            "title": "%AWS.title.cn%",
+                            "icon": "resources/aws-cn-logo.svg"
+                        }
+                    }
+                }
+            ]
+        },
+        "viewsWelcome": [
+            {
+                "view": "aws.appBuilderForFileExplorer",
+                "when": "!aws.isWebExtHost",
+                "contents": "[Open Walkthrough](command:aws.toolkit.lambda.openWalkthrough)\n [Open Folder](command:vscode.openFolder)"
+            },
+            {
+                "view": "aws.appBuilder",
+                "when": "!aws.isWebExtHost",
+                "contents": "[Open Walkthrough](command:aws.toolkit.lambda.openWalkthrough)\n [Open Folder](command:vscode.openFolder)"
+            }
+        ],
+        "views": {
+            "explorer": [
+                {
+                    "id": "aws.appBuilderForFileExplorer",
+                    "name": "%AWS.appBuilder.explorerTitle%",
+                    "when": "(isCloud9 || !aws.isWebExtHost) && !aws.appBuilder.hide",
+                    "contextualTitle": "Application Builder",
+                    "widget": {
+                        "type": "inspector"
+                    }
+                }
+            ],
+            "aws-explorer": [
+                {
+                    "id": "aws.toolkit.notifications",
+                    "name": "%AWS.notifications.title%",
+                    "when": "!(isCloud9 || aws.isSageMaker) && aws.toolkit.notifications.show"
+                },
+                {
+                    "id": "aws.amazonq.codewhisperer",
+                    "name": "%AWS.amazonq.codewhisperer.title%",
+                    "when": "!isCloud9 && !aws.isSageMaker && !aws.toolkit.amazonq.dismissed && !aws.explorer.showAuthView"
+                },
+                {
+                    "id": "aws.explorer",
+                    "name": "%AWS.lambda.explorerTitle%",
+                    "when": "(isCloud9 || !aws.isWebExtHost) && !aws.explorer.showAuthView"
+                },
+                {
+                    "id": "aws.cdk",
+                    "name": "%AWS.cdk.explorerTitle%",
+                    "when": "!aws.explorer.showAuthView"
+                },
+                {
+                    "id": "aws.appBuilder",
+                    "name": "%AWS.appBuilder.explorerTitle%",
+                    "when": "(isCloud9 || !aws.isWebExtHost) && !aws.explorer.showAuthView"
+                },
+                {
+                    "id": "aws.codecatalyst",
+                    "name": "%AWS.codecatalyst.explorerTitle%",
+                    "when": "(!isCloud9 && !aws.isSageMaker || isCloud9CodeCatalyst) && !aws.explorer.showAuthView"
+                },
+                {
+                    "id": "aws.smus.rootView",
+                    "name": "%AWS.sagemakerunifiedstudio.explorerTitle%",
+                    "when": "!aws.explorer.showAuthView"
+                },
+                {
+                    "type": "webview",
+                    "id": "aws.toolkit.AmazonCommonAuth",
+                    "name": "%AWS.amazonq.login%",
+                    "when": "!isCloud9 && !aws.isSageMaker && aws.explorer.showAuthView"
+                }
+            ]
+        },
+        "submenus": [
+            {
+                "id": "aws.toolkit.auth",
+                "label": "%AWS.submenu.auth.title%",
+                "icon": "$(ellipsis)",
+                "when": "isCloud9 || !aws.isWebExtHost"
+            },
+            {
+                "id": "aws.codecatalyst.submenu",
+                "label": "%AWS.codecatalyst.submenu.title%",
+                "icon": "$(ellipsis)",
+                "when": "isCloud9 || !aws.isWebExtHost"
+            },
+            {
+                "label": "%AWS.generic.feedback%",
+                "id": "aws.toolkit.submenu.feedback"
+            },
+            {
+                "label": "%AWS.generic.help%",
+                "id": "aws.toolkit.submenu.help"
+            }
+        ],
+        "menus": {
+            "commandPalette": [
+                {
+                    "command": "aws.apig.copyUrl",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.launchDebugConfigForm",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.apig.invokeRemoteRestApi",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.deleteCloudFormation",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.downloadStateMachineDefinition",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.toolkit.lambda.convertToSam",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ecr.createRepository",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.executeStateMachine",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.copyArn",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.openAwsConsole",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.openAwsCFNConsole",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.copyName",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.listCommands",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.codecatalyst.listCommands",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.codecatalyst.manageConnections",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.codecatalyst.openDevEnv",
+                    "when": "!isCloud9"
+                },
+                {
+                    "command": "aws.codecatalyst.createDevEnv",
+                    "when": "!isCloud9"
+                },
+                {
+                    "command": "aws.downloadSchemaItemCode",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.deleteLambda",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.downloadLambda",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.invokeLambda",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.copyLambdaUrl",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.viewSchemaItem",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.searchSchema",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.searchSchemaPerRegistry",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.refreshAwsExplorer",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.cdk.refresh",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.cdk.viewDocs",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.appBuilder.refresh",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.appBuilderForFileExplorer.refresh",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.appBuilder.tailLogs",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.appBuilder.viewDocs",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ssmDocument.openLocalDocument",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ssmDocument.openLocalDocumentJson",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ssmDocument.openLocalDocumentYaml",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ssmDocument.deleteDocument",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ssmDocument.updateDocumentVersion",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.copyLogResource",
+                    "when": "resourceScheme == aws-cwl"
+                },
+                {
+                    "command": "aws.saveCurrentLogDataContent",
+                    "when": "resourceScheme == aws-cwl"
+                },
+                {
+                    "command": "aws.s3.editFile",
+                    "when": "resourceScheme == s3-readonly"
+                },
+                {
+                    "command": "aws.cwl.viewLogStream",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.cwl.changeFilterPattern",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.cwl.changeTimeFilter",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ecr.deleteRepository",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ecr.copyTagUri",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ecr.copyRepositoryUri",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ecr.deleteTag",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.createThing",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.deleteThing",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.createCert",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.deleteCert",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.attachCert",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.attachPolicy",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.activateCert",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.deactivateCert",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.revokeCert",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.createPolicy",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.deletePolicy",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.createPolicyVersion",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.deletePolicyVersion",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.detachCert",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.detachPolicy",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.viewPolicyVersion",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.setDefaultPolicy",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.iot.copyEndpoint",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.deploySamApplication",
+                    "when": "config.aws.samcli.legacyDeploy"
+                },
+                {
+                    "command": "aws.redshift.editConnection",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.redshift.deleteConnection",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.samcli.sync",
+                    "when": "!config.aws.samcli.legacyDeploy"
+                },
+                {
+                    "command": "aws.appBuilder.build",
+                    "when": "!aws.isWebExtHost"
+                },
+                {
+                    "command": "aws.s3.copyPath",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.s3.createBucket",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.s3.createFolder",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.s3.deleteBucket",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.s3.deleteFile",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.s3.downloadFileAs",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.s3.openFile",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.s3.editFile",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.s3.uploadFileToParent",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.apprunner.startDeployment",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.apprunner.createService",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.apprunner.pauseService",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.apprunner.resumeService",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.apprunner.copyServiceUrl",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.apprunner.open",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.apprunner.deleteService",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.apprunner.createServiceFromEcr",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.resources.copyIdentifier",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.resources.openResourcePreview",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.resources.createResource",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.resources.deleteResource",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.resources.updateResource",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.resources.updateResourceInline",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.resources.saveResource",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.resources.closeResource",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.resources.viewDocs",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ecs.runCommandInContainer",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ecs.openTaskInTerminal",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ecs.enableEcsExec",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ecs.disableEcsExec",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.ecs.viewDocumentation",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.stepfunctions.openWithWorkflowStudio",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.toolkit.auth.addConnection",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.toolkit.auth.switchConnections",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.toolkit.auth.help",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.toolkit.auth.manageConnections"
+                },
+                {
+                    "command": "aws.dev.openMenu",
+                    "when": "aws.isDevMode || isCloud9"
+                },
+                {
+                    "command": "aws.openInApplicationComposer",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.toolkit.amazonq.learnMore",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.toolkit.amazonq.extensionpage",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.newThreatComposerFile",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.sagemaker.filterSpaceApps",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.smus.switchProject",
+                    "when": "false"
+                },
+                {
+                    "command": "aws.smus.refreshProject",
+                    "when": "false"
+                }
+            ],
+            "editor/title": [
+                {
+                    "command": "aws.previewStateMachine",
+                    "when": "editorLangId == asl || editorLangId == asl-yaml",
+                    "group": "navigation"
+                },
+                {
+                    "command": "aws.saveCurrentLogDataContent",
+                    "when": "resourceScheme == aws-cwl",
+                    "group": "navigation"
+                },
+                {
+                    "command": "aws.cwl.changeFilterPattern",
+                    "when": "resourceScheme == aws-cwl",
+                    "group": "navigation"
+                },
+                {
+                    "command": "aws.cwl.changeTimeFilter",
+                    "when": "resourceScheme == aws-cwl",
+                    "group": "navigation"
+                },
+                {
+                    "command": "aws.s3.editFile",
+                    "when": "resourceScheme == s3-readonly",
+                    "group": "navigation"
+                },
+                {
+                    "command": "aws.ssmDocument.publishDocument",
+                    "when": "editorLangId =~ /^(ssm-yaml|ssm-json)$/",
+                    "group": "navigation"
+                },
+                {
+                    "command": "aws.resources.updateResourceInline",
+                    "when": "resourceScheme == awsResource && !isCloud9 && config.aws.experiments.jsonResourceModification",
+                    "group": "navigation"
+                },
+                {
+                    "command": "aws.resources.closeResource",
+                    "when": "resourcePath =~ /^.+(awsResource.json)$/",
+                    "group": "navigation"
+                },
+                {
+                    "command": "aws.resources.saveResource",
+                    "when": "resourcePath =~ /^.+(awsResource.json)$/",
+                    "group": "navigation"
+                },
+                {
+                    "command": "aws.openInApplicationComposer",
+                    "when": "(editorLangId == json && !(resourceFilename =~ /^.*\\.tc\\.json$/)) || editorLangId == yaml || resourceFilename =~ /^.*\\.(template)$/",
+                    "group": "navigation"
+                }
+            ],
+            "editor/title/context": [
+                {
+                    "command": "aws.copyLogResource",
+                    "when": "resourceScheme == aws-cwl",
+                    "group": "1_cutcopypaste@1"
+                }
+            ],
+            "view/title": [
+                {
+                    "command": "aws.smus.switchProject",
+                    "when": "view == aws.smus.rootView && !aws.isWebExtHost && aws.smus.connected && !aws.smus.inSmusSpaceEnvironment",
+                    "group": "smus@0"
+                },
+                {
+                    "command": "aws.smus.refreshProject",
+                    "when": "view == aws.smus.rootView && !aws.isWebExtHost && aws.smus.connected",
+                    "group": "smus@1"
+                },
+                {
+                    "command": "aws.smus.signOut",
+                    "when": "view == aws.smus.rootView && !aws.isWebExtHost && aws.smus.connected && !aws.smus.inSmusSpaceEnvironment",
+                    "group": "smus@2"
+                },
+                {
+                    "command": "aws.toolkit.submitFeedback",
+                    "when": "view == aws.explorer && !aws.isWebExtHost",
+                    "group": "navigation@6"
+                },
+                {
+                    "command": "aws.refreshAwsExplorer",
+                    "when": "view == aws.explorer",
+                    "group": "navigation@5"
+                },
+                {
+                    "command": "aws.cdk.refresh",
+                    "when": "view == aws.cdk",
+                    "group": "navigation@1"
+                },
+                {
+                    "command": "aws.appBuilder.refresh",
+                    "when": "view == aws.appBuilder",
+                    "group": "navigation@1"
+                },
+                {
+                    "command": "aws.appBuilderForFileExplorer.refresh",
+                    "when": "view == aws.appBuilderForFileExplorer",
+                    "group": "navigation@1"
+                },
+                {
+                    "command": "aws.toolkit.login",
+                    "when": "view == aws.explorer",
+                    "group": "1_account@1"
+                },
+                {
+                    "command": "aws.showRegion",
+                    "when": "view == aws.explorer",
+                    "group": "1_account@2"
+                },
+                {
+                    "command": "aws.listCommands",
+                    "when": "view == aws.explorer && !isCloud9",
+                    "group": "1_account@3"
+                },
+                {
+                    "command": "aws.toolkit.lambda.createServerlessLandProject",
+                    "when": "view == aws.explorer",
+                    "group": "3_lambda@1"
+                },
+                {
+                    "command": "aws.lambda.createNewSamApp",
+                    "when": "view == aws.explorer",
+                    "group": "3_lambda@2"
+                },
+                {
+                    "command": "aws.launchConfigForm",
+                    "when": "view == aws.explorer",
+                    "group": "3_lambda@3"
+                },
+                {
+                    "command": "aws.deploySamApplication",
+                    "when": "config.aws.samcli.legacyDeploy && view == aws.explorer",
+                    "group": "3_lambda@4"
+                },
+                {
+                    "command": "aws.samcli.sync",
+                    "when": "!config.aws.samcli.legacyDeploy && view == aws.explorer",
+                    "group": "3_lambda@4"
+                },
+                {
+                    "submenu": "aws.toolkit.submenu.feedback",
+                    "when": "view =~ /^aws\\./ && !(view =~ /^aws\\.amazonq/)",
+                    "group": "y_toolkitMeta@1"
+                },
+                {
+                    "submenu": "aws.toolkit.submenu.help",
+                    "when": "view =~ /^aws\\./ && !(view =~ /^aws\\.amazonq/)",
+                    "group": "y_toolkitMeta@2"
+                },
+                {
+                    "command": "aws.toolkit.lambda.openWalkthrough",
+                    "when": "view =~ /^(aws.appBuilder|aws.appBuilderForFileExplorer)$/",
+                    "group": "y_toolkitWalkthrough@1"
+                },
+                {
+                    "command": "aws.toolkit.lambda.createServerlessLandProject",
+                    "when": "view =~ /^(aws.appBuilder|aws.appBuilderForFileExplorer)$/",
+                    "group": "y_toolkitWalkthrough@2"
+                },
+                {
+                    "command": "aws.codecatalyst.cloneRepo",
+                    "when": "view == aws.codecatalyst && !isCloud9 && aws.codecatalyst.connected",
+                    "group": "1_codeCatalyst@1"
+                },
+                {
+                    "command": "aws.codecatalyst.createDevEnv",
+                    "when": "view == aws.codecatalyst && !isCloud9 && aws.codecatalyst.connected",
+                    "group": "1_codeCatalyst@1"
+                },
+                {
+                    "command": "aws.codecatalyst.listCommands",
+                    "when": "view == aws.codecatalyst && !isCloud9 && aws.codecatalyst.connected",
+                    "group": "1_codeCatalyst@1"
+                },
+                {
+                    "command": "aws.codecatalyst.openDevEnv",
+                    "when": "view == aws.codecatalyst && !isCloud9 && aws.codecatalyst.connected",
+                    "group": "1_codeCatalyst@1"
+                },
+                {
+                    "command": "aws.codecatalyst.manageConnections",
+                    "when": "view == aws.codecatalyst && !isCloud9 && !aws.codecatalyst.connected",
+                    "group": "2_codeCatalyst@1"
+                },
+                {
+                    "command": "aws.codecatalyst.signout",
+                    "when": "view == aws.codecatalyst && !isCloud9 && aws.codecatalyst.connected",
+                    "group": "2_codeCatalyst@1"
+                }
+            ],
+            "explorer/context": [
+                {
+                    "command": "aws.deploySamApplication",
+                    "when": "config.aws.samcli.legacyDeploy && isFileSystemResource && resourceFilename =~ /^template\\.(json|yml|yaml)$/",
+                    "group": "z_aws@1"
+                },
+                {
+                    "command": "aws.samcli.sync",
+                    "when": "!config.aws.samcli.legacyDeploy && isFileSystemResource && resourceFilename =~ /^(template\\.(json|yml|yaml))|(samconfig\\.toml)$/",
+                    "group": "z_aws@1"
+                },
+                {
+                    "command": "aws.uploadLambda",
+                    "when": "explorerResourceIsFolder || isFileSystemResource && resourceFilename =~ /^template\\.(json|yml|yaml)$/",
+                    "group": "z_aws@3"
+                },
+                {
+                    "command": "aws.openInApplicationComposer",
+                    "when": "isFileSystemResource && !(resourceFilename =~ /^.*\\.tc\\.json$/) && resourceFilename =~ /^.*\\.(json|yml|yaml|template)$/",
+                    "group": "z_aws@1"
+                },
+                {
+                    "command": "aws.stepfunctions.openWithWorkflowStudio",
+                    "when": "isFileSystemResource && resourceFilename =~ /^.*\\.asl\\.(json|yml|yaml)$/",
+                    "group": "z_aws@1"
+                },
+                {
+                    "command": "aws.smus.notebookscheduling.createjob",
+                    "when": "resourceExtname == .ipynb",
+                    "group": "z_aws@1"
+                },
+                {
+                    "command": "aws.smus.notebookscheduling.viewjobs",
+                    "when": "resourceExtname == .ipynb",
+                    "group": "z_aws@1"
+                }
+            ],
+            "view/item/context": [
+                {
+                    "command": "aws.sagemaker.stopSpace",
+                    "group": "inline@0",
+                    "when": "view != aws.smus.rootView  && viewItem =~ /^(awsSagemakerSpaceRunningRemoteEnabledNode|awsSagemakerSpaceRunningRemoteDisabledNode)$/"
+                },
+                {
+                    "command": "aws.smus.stopSpace",
+                    "group": "inline@0",
+                    "when": "view == aws.smus.rootView && viewItem =~ /^(awsSagemakerSpaceRunningRemoteEnabledNode|awsSagemakerSpaceRunningRemoteDisabledNode|awsSagemakerSpaceRunningNode)$/"
+                },
+                {
+                    "command": "aws.sagemaker.openRemoteConnection",
+                    "group": "inline@1",
+                    "when": "view != aws.smus.rootView && viewItem =~ /^(awsSagemakerSpaceRunningRemoteEnabledNode|awsSagemakerSpaceStoppedRemoteEnabledNode|awsSagemakerSpaceStoppedRemoteDisabledNode)$/"
+                },
+                {
+                    "command": "aws.smus.openRemoteConnection",
+                    "group": "inline@1",
+                    "when": "view == aws.smus.rootView && viewItem =~ /^(awsSagemakerSpaceRunningRemoteEnabledNode|awsSagemakerSpaceStoppedRemoteEnabledNode|awsSagemakerSpaceStoppedRemoteDisabledNode)$/"
+                },
+                {
+                    "command": "_aws.toolkit.notifications.dismiss",
+                    "when": "viewItem == toolkitNotificationStartUp",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.apig.invokeRemoteRestApi",
+                    "when": "view =~ /^(aws.explorer|aws.appBuilder|aws.appBuilderForFileExplorer)$/ && viewItem =~ /^(awsApiGatewayNode)$/",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.ec2.openTerminal",
+                    "group": "0@1",
+                    "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/"
+                },
+                {
+                    "command": "aws.ec2.openTerminal",
+                    "group": "inline@1",
+                    "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/"
+                },
+                {
+                    "command": "aws.ec2.linkToLaunch",
+                    "group": "0@0",
+                    "when": "viewItem =~ /^(awsEc2ParentNode)$/"
+                },
+                {
+                    "command": "aws.ec2.linkToLaunch",
+                    "group": "inline@0",
+                    "when": "viewItem =~ /^(awsEc2ParentNode)$/"
+                },
+                {
+                    "command": "aws.ec2.openRemoteConnection",
+                    "group": "0@1",
+                    "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/"
+                },
+                {
+                    "command": "aws.ec2.openRemoteConnection",
+                    "group": "inline@1",
+                    "when": "viewItem =~ /^(awsEc2(Parent|Running)Node)$/"
+                },
+                {
+                    "command": "aws.ec2.startInstance",
+                    "group": "0@1",
+                    "when": "viewItem == awsEc2StoppedNode"
+                },
+                {
+                    "command": "aws.ec2.startInstance",
+                    "group": "inline@1",
+                    "when": "viewItem == awsEc2StoppedNode"
+                },
+                {
+                    "command": "aws.ec2.stopInstance",
+                    "group": "0@1",
+                    "when": "viewItem == awsEc2RunningNode"
+                },
+                {
+                    "command": "aws.ec2.stopInstance",
+                    "group": "inline@1",
+                    "when": "viewItem == awsEc2RunningNode"
+                },
+                {
+                    "command": "aws.ec2.rebootInstance",
+                    "group": "0@1",
+                    "when": "viewItem == awsEc2RunningNode"
+                },
+                {
+                    "command": "aws.ec2.rebootInstance",
+                    "group": "inline@1",
+                    "when": "viewItem == awsEc2RunningNode"
+                },
+                {
+                    "command": "aws.ec2.copyInstanceId",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsEc2(Running|Stopped|Pending)Node)$/",
+                    "group": "2@0"
+                },
+                {
+                    "command": "aws.ecr.createRepository",
+                    "when": "view == aws.explorer && viewItem == awsEcrNode",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.iot.createThing",
+                    "when": "view == aws.explorer && viewItem == awsIotThingsNode",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.iot.createCert",
+                    "when": "view == aws.explorer && viewItem == awsIotCertsNode",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.iot.createPolicy",
+                    "when": "view == aws.explorer && viewItem == awsIotPoliciesNode",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.iot.attachCert",
+                    "when": "view == aws.explorer && viewItem == awsIotThingNode",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.iot.attachPolicy",
+                    "when": "view == aws.explorer && viewItem =~ /^awsIotCertificateNode.(Things|Policies)/",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.redshift.editConnection",
+                    "when": "view == aws.explorer && viewItem == awsRedshiftWarehouseNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.redshift.deleteConnection",
+                    "when": "view == aws.explorer && viewItem == awsRedshiftWarehouseNode",
+                    "group": "0@2"
+                },
+                {
+                    "command": "aws.s3.openFile",
+                    "when": "view == aws.explorer && viewItem == awsS3FileNode && !isCloud9",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.s3.editFile",
+                    "when": "view == aws.explorer && viewItem == awsS3FileNode && !isCloud9",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.s3.downloadFileAs",
+                    "when": "view == aws.explorer && viewItem == awsS3FileNode",
+                    "group": "inline@2"
+                },
+                {
+                    "command": "aws.s3.createBucket",
+                    "when": "view == aws.explorer && viewItem == awsS3Node",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.s3.createFolder",
+                    "when": "view =~ /^(aws.explorer|aws.appBuilder|aws.appBuilderForFileExplorer)$/ && viewItem =~ /^(awsS3BucketNode|awsS3FolderNode)$/",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.ssmDocument.openLocalDocument",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsDocumentItemNode|awsDocumentItemNodeWriteable)$/",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.s3.uploadFile",
+                    "when": "view =~ /^(aws.explorer|aws.appBuilder|aws.appBuilderForFileExplorer)$/ && viewItem =~ /^(awsS3BucketNode|awsS3FolderNode)$/",
+                    "group": "inline@2"
+                },
+                {
+                    "command": "aws.showRegion",
+                    "when": "view == aws.explorer && viewItem == awsRegionNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.sagemaker.filterSpaceApps",
+                    "when": "view == aws.explorer && viewItem == awsSagemakerParentNode",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.smus.refreshProject",
+                    "when": "view == aws.smus.rootView && viewItem == smusSelectedProject",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.toolkit.lambda.createServerlessLandProject",
+                    "when": "view == aws.explorer && viewItem == awsLambdaNode || viewItem == awsRegionNode",
+                    "group": "1@1"
+                },
+                {
+                    "command": "aws.lambda.createNewSamApp",
+                    "when": "view == aws.explorer && viewItem == awsLambdaNode || viewItem == awsRegionNode",
+                    "group": "1@2"
+                },
+                {
+                    "command": "aws.launchConfigForm",
+                    "when": "view == aws.explorer && viewItem == awsLambdaNode || viewItem == awsRegionNode || viewItem == awsCloudFormationRootNode",
+                    "group": "1@2"
+                },
+                {
+                    "command": "aws.deploySamApplication",
+                    "when": "config.aws.samcli.legacyDeploy && view == aws.explorer && viewItem =~ /^(awsLambdaNode|awsRegionNode|awsCloudFormationRootNode)$/",
+                    "group": "1@3"
+                },
+                {
+                    "command": "aws.samcli.sync",
+                    "when": "!config.aws.samcli.legacyDeploy && view == aws.explorer && viewItem =~ /^(awsLambdaNode|awsRegionNode|awsCloudFormationRootNode)$/",
+                    "group": "1@3"
+                },
+                {
+                    "command": "aws.ecr.copyTagUri",
+                    "when": "view == aws.explorer && viewItem == awsEcrTagNode",
+                    "group": "2@1"
+                },
+                {
+                    "command": "aws.ecr.deleteTag",
+                    "when": "view == aws.explorer && viewItem == awsEcrTagNode",
+                    "group": "3@1"
+                },
+                {
+                    "command": "aws.ecr.copyRepositoryUri",
+                    "when": "view == aws.explorer && viewItem == awsEcrRepositoryNode",
+                    "group": "2@1"
+                },
+                {
+                    "command": "aws.ecr.createRepository",
+                    "when": "view == aws.explorer && viewItem == awsEcrNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.ecr.deleteRepository",
+                    "when": "view == aws.explorer && viewItem == awsEcrRepositoryNode",
+                    "group": "3@1"
+                },
+                {
+                    "command": "aws.invokeLambda",
+                    "when": "view =~ /^(aws.explorer|aws.appBuilder|aws.appBuilderForFileExplorer)$/ && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable|awsRegionFunctionNodeDownloadableOnly|awsCloudFormationFunctionNode|awsAppBuilderResourceNode.deployed-function)$/ || viewItem == awsAppBuilderDeployedNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.downloadLambda",
+                    "when": "view =~ /^(aws.explorer|aws.appBuilder|aws.appBuilderForFileExplorer)$/ && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable|awsRegionFunctionNodeDownloadableOnly)$/ || viewItem == awsAppBuilderDeployedNode",
+                    "group": "0@2"
+                },
+                {
+                    "command": "aws.lambda.openWorkspace",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsRegionFunctionNodeDownloadable|awsRegionFunctionNodeDownloadableOnly)$/",
+                    "group": "0@6"
+                },
+                {
+                    "command": "aws.toolkit.lambda.convertToSam",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsRegionFunctionNodeDownloadable)$/",
+                    "group": "0@3"
+                },
+                {
+                    "command": "aws.uploadLambda",
+                    "when": "view =~ /^(aws.explorer|aws.appBuilder|aws.appBuilderForFileExplorer)$/ && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable|awsRegionFunctionNodeDownloadableOnly)$/ || viewItem == awsAppBuilderDeployedNode",
+                    "group": "1@1"
+                },
+                {
+                    "command": "aws.deleteLambda",
+                    "when": "view =~ /^(aws.explorer)$/ && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable|awsRegionFunctionNodeDownloadableOnly)$/",
+                    "group": "4@1"
+                },
+                {
+                    "command": "aws.copyLambdaUrl",
+                    "when": "view =~ /^(aws.explorer|aws.appBuilder|aws.appBuilderForFileExplorer)$/ && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable|awsRegionFunctionNodeDownloadableOnly)$/ || viewItem == awsAppBuilderDeployedNode",
+                    "group": "2@0"
+                },
+                {
+                    "command": "aws.appBuilder.searchLogs",
+                    "when": "view =~ /^(aws.explorer|aws.appBuilder|aws.appBuilderForFileExplorer)$/ && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable|awsRegionFunctionNodeDownloadableOnly|awsCloudFormationFunctionNode|awsAppBuilderResourceNode.deployed-function)$/",
+                    "group": "0@3"
+                },
+                {
+                    "command": "aws.appBuilder.tailLogs",
+                    "when": "view =~ /^(aws.explorer|aws.appBuilder|aws.appBuilderForFileExplorer)$/ && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable|awsRegionFunctionNodeDownloadableOnly|awsCloudFormationFunctionNode)$/",
+                    "group": "0@4"
+                },
+                {
+                    "command": "aws.deleteCloudFormation",
+                    "when": "view == aws.explorer && viewItem == awsCloudFormationNode",
+                    "group": "3@5"
+                },
+                {
+                    "command": "aws.searchSchema",
+                    "when": "view == aws.explorer && viewItem == awsSchemasNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.searchSchemaPerRegistry",
+                    "when": "view == aws.explorer && viewItem == awsRegistryItemNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.viewSchemaItem",
+                    "when": "view == aws.explorer && viewItem == awsSchemaItemNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.stepfunctions.createStateMachineFromTemplate",
+                    "when": "view == aws.explorer && viewItem == awsStepFunctionsNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.downloadStateMachineDefinition",
+                    "when": "view == aws.explorer && viewItem == awsStateMachineNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.previewStateMachine",
+                    "when": "view == aws.explorer && viewItem == awsStateMachineNode",
+                    "group": "0@2"
+                },
+                {
+                    "command": "aws.cdk.renderStateMachineGraph",
+                    "when": "viewItem == awsCdkStateMachineNode",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.cdk.renderStateMachineGraph",
+                    "when": "viewItem == awsCdkStateMachineNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.executeStateMachine",
+                    "when": "view == aws.explorer && viewItem == awsStateMachineNode",
+                    "group": "0@3"
+                },
+                {
+                    "command": "aws.iot.createThing",
+                    "when": "view == aws.explorer && viewItem == awsIotThingsNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.iot.createCert",
+                    "when": "view == aws.explorer && viewItem == awsIotCertsNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.iot.createPolicy",
+                    "when": "view == aws.explorer && viewItem == awsIotPoliciesNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.iot.createPolicyVersion",
+                    "when": "view == aws.explorer && viewItem == awsIotPolicyNode.WithVersions",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.iot.viewPolicyVersion",
+                    "when": "view == aws.explorer && viewItem =~ /^awsIotPolicyVersionNode./",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.iot.attachCert",
+                    "when": "view == aws.explorer && viewItem == awsIotThingNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.iot.attachPolicy",
+                    "when": "view == aws.explorer && viewItem =~ /^awsIotCertificateNode.(Things|Policies)/",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.sagemaker.filterSpaceApps",
+                    "when": "view == aws.explorer && viewItem == awsSagemakerParentNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.s3.createBucket",
+                    "when": "view == aws.explorer && viewItem == awsS3Node",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.s3.downloadFileAs",
+                    "when": "view == aws.explorer && viewItem == awsS3FileNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.s3.uploadFile",
+                    "when": "view =~ /^(aws.explorer|aws.appBuilder|aws.appBuilderForFileExplorer)$/ && viewItem =~ /^(awsS3BucketNode|awsS3FolderNode)$/",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.s3.uploadFileToParent",
+                    "when": "view == aws.explorer && viewItem == awsS3FileNode",
+                    "group": "1@1"
+                },
+                {
+                    "command": "aws.s3.createFolder",
+                    "when": "view =~ /^(aws.explorer|aws.appBuilder|aws.appBuilderForFileExplorer)$/ && viewItem =~ /^(awsS3BucketNode|awsS3FolderNode)$/",
+                    "group": "1@1"
+                },
+                {
+                    "command": "aws.iot.deactivateCert",
+                    "when": "view == aws.explorer && viewItem =~ /^awsIotCertificateNode.(Things|Policies).ACTIVE$/",
+                    "group": "1@1"
+                },
+                {
+                    "command": "aws.iot.activateCert",
+                    "when": "view == aws.explorer && viewItem =~ /^awsIotCertificateNode.(Things|Policies).INACTIVE$/",
+                    "group": "1@1"
+                },
+                {
+                    "command": "aws.iot.revokeCert",
+                    "when": "view == aws.explorer && viewItem =~ /^awsIotCertificateNode.(Things|Policies).(ACTIVE|INACTIVE)$/",
+                    "group": "1@2"
+                },
+                {
+                    "command": "aws.iot.setDefaultPolicy",
+                    "when": "view == aws.explorer && viewItem == awsIotPolicyVersionNode.NONDEFAULT",
+                    "group": "1@1"
+                },
+                {
+                    "command": "aws.iot.copyEndpoint",
+                    "when": "view == aws.explorer && viewItem == awsIotNode",
+                    "group": "2@1"
+                },
+                {
+                    "command": "aws.copyName",
+                    "when": "view =~ /^(aws.explorer|aws.appBuilder|aws.appBuilderForFileExplorer)$/ && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable|awsRegionFunctionNodeDownloadableOnly|awsCloudFormationFunctionNode|awsStateMachineNode|awsCloudFormationNode|awsS3BucketNode|awsS3FolderNode|awsS3FileNode|awsApiGatewayNode|awsIotThingNode)$|^(awsAppRunnerServiceNode|awsIotCertificateNode|awsIotPolicyNode|awsIotPolicyVersionNode|(awsEc2(Running|Pending|Stopped)Node))/",
+                    "group": "2@1"
+                },
+                {
+                    "command": "aws.copyArn",
+                    "when": "view =~ /^(aws.explorer|aws.appBuilder|aws.appBuilderForFileExplorer)$/ && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable|awsRegionFunctionNodeDownloadableOnly|awsCloudFormationFunctionNode|awsStateMachineNode|awsCloudFormationNode|awsCloudWatchLogNode|awsS3BucketNode|awsS3FolderNode|awsS3FileNode|awsApiGatewayNode|awsEcrRepositoryNode|awsIotThingNode)$|^(awsAppRunnerServiceNode|awsEcsServiceNode|awsIotCertificateNode|awsIotPolicyNode|awsIotPolicyVersionNode|awsMdeInstanceNode|(awsEc2(Running|Pending|Stopped)Node))/",
+                    "group": "2@2"
+                },
+                {
+                    "command": "aws.openAwsConsole",
+                    "when": "view =~ /^(aws.explorer|aws.appBuilder|aws.appBuilderForFileExplorer)$/ && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable|awsRegionFunctionNodeDownloadableOnly|awsS3BucketNode)$/",
+                    "group": "2@3"
+                },
+                {
+                    "command": "aws.openAwsCFNConsole",
+                    "when": "view =~ /^(aws.appBuilder|aws.appBuilderForFileExplorer)$/ && viewItem =~ /^(awsAppBuilderStackNode)$/",
+                    "group": "2@3"
+                },
+                {
+                    "command": "aws.cwl.searchLogGroup",
+                    "group": "0@1",
+                    "when": "view == aws.explorer && viewItem =~ /^awsCloudWatchLogNode|awsCloudWatchLogParentNode$/"
+                },
+                {
+                    "command": "aws.cwl.searchLogGroup",
+                    "group": "inline@1",
+                    "when": "view == aws.explorer && viewItem =~ /^awsCloudWatchLogNode|awsCloudWatchLogParentNode$/"
+                },
+                {
+                    "command": "aws.cwl.tailLogGroup",
+                    "group": "0@1",
+                    "when": "view == aws.explorer && viewItem =~ /^awsCloudWatchLogNode|awsCloudWatchLogParentNode$/"
+                },
+                {
+                    "command": "aws.cwl.tailLogGroup",
+                    "group": "inline@1",
+                    "when": "view == aws.explorer && viewItem =~ /^awsCloudWatchLogNode|awsCloudWatchLogParentNode$/"
+                },
+                {
+                    "command": "aws.apig.copyUrl",
+                    "when": "view =~ /^(aws.explorer|aws.appBuilder|aws.appBuilderForFileExplorer)$/ && viewItem =~ /^(awsApiGatewayNode)$/",
+                    "group": "2@0"
+                },
+                {
+                    "command": "aws.s3.copyPath",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsS3FolderNode|awsS3FileNode)$/",
+                    "group": "2@3"
+                },
+                {
+                    "command": "aws.s3.presignedURL",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsS3FileNode)$/",
+                    "group": "2@4"
+                },
+                {
+                    "command": "aws.iot.detachCert",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsIotCertificateNode.Things)/",
+                    "group": "3@1"
+                },
+                {
+                    "command": "aws.iot.detachPolicy",
+                    "when": "view == aws.explorer && viewItem == awsIotPolicyNode.Certificates",
+                    "group": "3@1"
+                },
+                {
+                    "command": "aws.iot.deleteThing",
+                    "when": "view == aws.explorer && viewItem == awsIotThingNode",
+                    "group": "3@1"
+                },
+                {
+                    "command": "aws.iot.deleteCert",
+                    "when": "view == aws.explorer && viewItem =~ /^awsIotCertificateNode.Policies/",
+                    "group": "3@1"
+                },
+                {
+                    "command": "aws.iot.deletePolicy",
+                    "when": "view == aws.explorer && viewItem == awsIotPolicyNode.WithVersions",
+                    "group": "3@1"
+                },
+                {
+                    "command": "aws.iot.deletePolicyVersion",
+                    "when": "view == aws.explorer && viewItem == awsIotPolicyVersionNode.NONDEFAULT",
+                    "group": "3@1"
+                },
+                {
+                    "command": "aws.s3.deleteBucket",
+                    "when": "view =~ /^(aws.explorer)$/ && viewItem == awsS3BucketNode",
+                    "group": "3@1"
+                },
+                {
+                    "command": "aws.s3.deleteFile",
+                    "when": "view == aws.explorer && viewItem == awsS3FileNode",
+                    "group": "3@1"
+                },
+                {
+                    "command": "aws.downloadSchemaItemCode",
+                    "when": "view == aws.explorer && viewItem == awsSchemaItemNode",
+                    "group": "1@1"
+                },
+                {
+                    "command": "aws.cwl.viewLogStream",
+                    "group": "0@1",
+                    "when": "view == aws.explorer && viewItem == awsCloudWatchLogNode"
+                },
+                {
+                    "command": "aws.ssmDocument.openLocalDocumentYaml",
+                    "group": "0@1",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsDocumentItemNode|awsDocumentItemNodeWriteable)$/"
+                },
+                {
+                    "command": "aws.ssmDocument.openLocalDocumentJson",
+                    "group": "0@2",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsDocumentItemNode|awsDocumentItemNodeWriteable)$/"
+                },
+                {
+                    "command": "aws.ssmDocument.updateDocumentVersion",
+                    "group": "2@1",
+                    "when": "view == aws.explorer && viewItem == awsDocumentItemNodeWriteable"
+                },
+                {
+                    "command": "aws.ssmDocument.deleteDocument",
+                    "group": "3@2",
+                    "when": "view == aws.explorer && viewItem == awsDocumentItemNodeWriteable"
+                },
+                {
+                    "command": "aws.ecs.runCommandInContainer",
+                    "group": "0@1",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsEcsContainerNodeExec)(.*)$/"
+                },
+                {
+                    "command": "aws.ecs.openTaskInTerminal",
+                    "group": "0@2",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsEcsContainerNodeExec)(.*)$/ && !isCloud9"
+                },
+                {
+                    "command": "aws.ecs.enableEcsExec",
+                    "group": "0@2",
+                    "when": "view == aws.explorer && viewItem == awsEcsServiceNode.DISABLED"
+                },
+                {
+                    "command": "aws.ecs.disableEcsExec",
+                    "group": "0@2",
+                    "when": "view == aws.explorer && viewItem == awsEcsServiceNode.ENABLED"
+                },
+                {
+                    "command": "aws.ecs.viewDocumentation",
+                    "group": "1@3",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsEcsClusterNode|awsEcsContainerNode)$|^awsEcsServiceNode/"
+                },
+                {
+                    "command": "aws.resources.configure",
+                    "when": "view == aws.explorer && viewItem == resourcesRootNode",
+                    "group": "1@1"
+                },
+                {
+                    "command": "aws.resources.configure",
+                    "when": "view == aws.explorer && viewItem == resourcesRootNode",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.resources.openResourcePreview",
+                    "when": "view == aws.explorer && viewItem =~ /^(.*)(ResourceNode)$/",
+                    "group": "1@1"
+                },
+                {
+                    "command": "aws.resources.copyIdentifier",
+                    "when": "view == aws.explorer && viewItem =~ /^(.*)(ResourceNode)$/",
+                    "group": "1@1"
+                },
+                {
+                    "command": "aws.resources.viewDocs",
+                    "when": "view == aws.explorer && viewItem =~ /^(.*)(Documented)(.*)(ResourceTypeNode)$/",
+                    "group": "1@1"
+                },
+                {
+                    "command": "aws.resources.createResource",
+                    "when": "view == aws.explorer && viewItem =~ /^(.*)(Creatable)(.*)(ResourceTypeNode)$/ && !isCloud9 && config.aws.experiments.jsonResourceModification",
+                    "group": "2@1"
+                },
+                {
+                    "command": "aws.resources.createResource",
+                    "when": "view == aws.explorer && viewItem =~ /^(.*)(Creatable)(.*)(ResourceTypeNode)$/ && !isCloud9 && config.aws.experiments.jsonResourceModification",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.resources.updateResource",
+                    "when": "view == aws.explorer && viewItem =~ /^(.*)(Updatable)(.*)(ResourceNode)$/ && !isCloud9 && config.aws.experiments.jsonResourceModification",
+                    "group": "2@1"
+                },
+                {
+                    "command": "aws.resources.deleteResource",
+                    "when": "view == aws.explorer && viewItem =~ /^(.*)(Deletable)(.*)(ResourceNode)$/ && !isCloud9 && config.aws.experiments.jsonResourceModification",
+                    "group": "2@2"
+                },
+                {
+                    "command": "aws.apprunner.createServiceFromEcr",
+                    "group": "0@2",
+                    "when": "view == aws.explorer && viewItem =~ /awsEcrTagNode|awsEcrRepositoryNode/"
+                },
+                {
+                    "command": "aws.apprunner.startDeployment",
+                    "group": "0@1",
+                    "when": "view == aws.explorer && viewItem == awsAppRunnerServiceNode.RUNNING"
+                },
+                {
+                    "command": "aws.apprunner.createService",
+                    "group": "0@2",
+                    "when": "view == aws.explorer && viewItem == awsAppRunnerNode"
+                },
+                {
+                    "command": "aws.apprunner.pauseService",
+                    "group": "0@3",
+                    "when": "view == aws.explorer && viewItem == awsAppRunnerServiceNode.RUNNING"
+                },
+                {
+                    "command": "aws.apprunner.resumeService",
+                    "group": "0@3",
+                    "when": "view == aws.explorer && viewItem == awsAppRunnerServiceNode.PAUSED"
+                },
+                {
+                    "command": "aws.apprunner.copyServiceUrl",
+                    "group": "1@1",
+                    "when": "view == aws.explorer && viewItem == awsAppRunnerServiceNode.RUNNING"
+                },
+                {
+                    "command": "aws.apprunner.open",
+                    "group": "1@2",
+                    "when": "view == aws.explorer && viewItem == awsAppRunnerServiceNode.RUNNING"
+                },
+                {
+                    "command": "aws.apprunner.deleteService",
+                    "group": "3@1",
+                    "when": "view == aws.explorer && viewItem =~ /awsAppRunnerServiceNode.[RUNNING|PAUSED|CREATE_FAILED]/"
+                },
+                {
+                    "command": "aws.cloudFormation.newTemplate",
+                    "group": "0@1",
+                    "when": "view == aws.explorer && viewItem == awsCloudFormationRootNode"
+                },
+                {
+                    "command": "aws.sam.newTemplate",
+                    "group": "0@2",
+                    "when": "view == aws.explorer && viewItem == awsCloudFormationRootNode"
+                },
+                {
+                    "command": "aws.appBuilder.viewDocs",
+                    "when": "viewItem == awsAppBuilderRootNode",
+                    "group": "0@2"
+                },
+                {
+                    "command": "aws.cdk.viewDocs",
+                    "when": "viewItem == awsCdkRootNode",
+                    "group": "0@2"
+                },
+                {
+                    "command": "aws.toolkit.auth.addConnection",
+                    "when": "viewItem == awsAuthNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.toolkit.auth.switchConnections",
+                    "when": "viewItem == awsAuthNode",
+                    "group": "0@2"
+                },
+                {
+                    "command": "aws.toolkit.auth.signout",
+                    "when": "viewItem == awsAuthNode && !isCloud9",
+                    "group": "0@3"
+                },
+                {
+                    "command": "aws.toolkit.auth.help",
+                    "when": "viewItem == awsAuthNode",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.openInApplicationComposer",
+                    "when": "viewItem == awsAppBuilderAppNode",
+                    "group": "inline@2"
+                },
+                {
+                    "command": "aws.appBuilder.deploy",
+                    "when": "viewItem == awsAppBuilderAppNode",
+                    "group": "inline@4"
+                },
+                {
+                    "command": "aws.appBuilder.build",
+                    "when": "viewItem == awsAppBuilderAppNode",
+                    "group": "inline@3"
+                },
+                {
+                    "command": "aws.appBuilder.openTemplate",
+                    "when": "viewItem == awsAppBuilderAppNode",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.launchDebugConfigForm",
+                    "when": "viewItem == awsAppBuilderResourceNode.function || viewItem == awsAppBuilderResourceNode.deployed-function",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.invokeLambda",
+                    "when": "viewItem == awsAppBuilderResourceNode.deployed-function",
+                    "group": "inline@2"
+                },
+                {
+                    "command": "aws.appBuilder.searchLogs",
+                    "when": "viewItem == awsAppBuilderResourceNode.deployed-function",
+                    "group": "inline@3"
+                },
+                {
+                    "command": "aws.appBuilder.openHandler",
+                    "when": "viewItem == awsAppBuilderResourceNode.function || viewItem == awsAppBuilderResourceNode.deployed-function",
+                    "group": "inline@4"
+                },
+                {
+                    "command": "aws.appBuilder.tailLogs",
+                    "when": "viewItem == awsAppBuilderResourceNode.deployed-function",
+                    "group": "0@5"
+                },
+                {
+                    "submenu": "aws.toolkit.auth",
+                    "when": "viewItem == awsAuthNode",
+                    "group": "inline@2"
+                },
+                {
+                    "submenu": "aws.codecatalyst.submenu",
+                    "when": "viewItem =~ /^awsCodeCatalystNode/",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.codecatalyst.manageConnections",
+                    "when": "viewItem =~ /^awsCodeCatalystNode/",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.codecatalyst.signout",
+                    "when": "viewItem =~ /^awsCodeCatalystNode/&& !isCloud9 && aws.codecatalyst.connected",
+                    "group": "0@2"
+                },
+                {
+                    "command": "aws.appBuilder.build",
+                    "when": "viewItem == awsAppBuilderAppNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.appBuilder.openHandler",
+                    "when": "viewItem == awsAppBuilderResourceNode.function|| viewItem == awsAppBuilderResourceNode.deployed-function",
+                    "group": "1@1"
+                },
+                {
+                    "command": "aws.launchConfigForm",
+                    "when": "viewItem == awsAppBuilderAppNode",
+                    "group": "1@2"
+                },
+                {
+                    "command": "aws.launchDebugConfigForm",
+                    "when": "viewItem == awsAppBuilderResourceNode.function || viewItem == awsAppBuilderResourceNode.deployed-function",
+                    "group": "1@2"
+                },
+                {
+                    "command": "aws.appBuilder.deploy",
+                    "when": "viewItem == awsAppBuilderAppNode",
+                    "group": "2@1"
+                },
+                {
+                    "command": "aws.openInApplicationComposer",
+                    "when": "viewItem == awsAppBuilderAppNode",
+                    "group": "3@1"
+                },
+                {
+                    "command": "aws.invokeLambda",
+                    "when": "view =~ /^(aws.explorer|aws.appBuilder|aws.appBuilderForFileExplorer)$/ && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable|awsRegionFunctionNodeDownloadableOnly|awsCloudFormationFunctionNode)$/",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.appBuilder.searchLogs",
+                    "when": "view =~ /^(aws.explorer|aws.appBuilder|aws.appBuilderForFileExplorer)$/ && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable|awsRegionFunctionNodeDownloadableOnly|awsCloudFormationFunctionNode)$/",
+                    "group": "inline@2"
+                },
+                {
+                    "command": "aws.quickDeployLambda",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsRegionFunctionNodeDownloadable|awsRegionFunctionNodeDownloadableOnly)$/",
+                    "group": "inline@3"
+                },
+                {
+                    "command": "aws.toolkit.lambda.convertToSam",
+                    "when": "view == aws.explorer && viewItem =~ /^(awsRegionFunctionNodeDownloadable)$/",
+                    "group": "inline@4"
+                },
+                {
+                    "command": "aws.docdb.createCluster",
+                    "when": "view == aws.explorer && viewItem == awsDocDBNode",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.docdb.createCluster",
+                    "when": "view == aws.explorer && viewItem == awsDocDBNode",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.docdb.startCluster",
+                    "when": "viewItem =~ /^awsDocDB-cluster-(regional|elastic)-stopped/",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.docdb.startCluster",
+                    "when": "viewItem =~ /^awsDocDB-cluster-(regional|elastic)-stopped/"
+                },
+                {
+                    "command": "aws.docdb.stopCluster",
+                    "when": "viewItem =~ /^awsDocDB-cluster-(regional|elastic)-running/",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.docdb.stopCluster",
+                    "when": "viewItem =~ /^awsDocDB-cluster-(regional|elastic)-running/"
+                },
+                {
+                    "command": "aws.docdb.renameCluster",
+                    "when": "viewItem =~ /^awsDocDB-cluster(?!.*-elastic.*)/",
+                    "group": "0@2"
+                },
+                {
+                    "command": "aws.docdb.deleteCluster",
+                    "when": "viewItem =~ /^awsDocDB-cluster-(regional|elastic)/",
+                    "group": "0@4"
+                },
+                {
+                    "command": "aws.docdb.createInstance",
+                    "when": "viewItem =~ /^awsDocDB-cluster-(?!elastic|global)(?!-stopped)/"
+                },
+                {
+                    "command": "aws.docdb.renameInstance",
+                    "when": " viewItem =~ /^awsDocDB-instance/",
+                    "group": "0@2"
+                },
+                {
+                    "command": "aws.docdb.modifyInstance",
+                    "when": " viewItem =~ /^awsDocDB-instance/",
+                    "group": "0@3"
+                },
+                {
+                    "command": "aws.docdb.rebootInstance",
+                    "when": "viewItem =~ /^awsDocDB-instance/",
+                    "group": "inline@1"
+                },
+                {
+                    "command": "aws.docdb.rebootInstance",
+                    "when": "viewItem =~ /^awsDocDB-instance/"
+                },
+                {
+                    "command": "aws.docdb.deleteInstance",
+                    "when": " viewItem =~ /^awsDocDB-instance/",
+                    "group": "0@4"
+                },
+                {
+                    "command": "aws.docdb.listTags",
+                    "when": "viewItem =~ /^awsDocDB-(?!cluster-global).*/"
+                },
+                {
+                    "command": "aws.docdb.viewConsole",
+                    "when": "viewItem =~ /^awsDocDB-/",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.docdb.viewDocs",
+                    "when": "viewItem == awsDocDBNode"
+                },
+                {
+                    "command": "aws.docdb.copyEndpoint",
+                    "when": "viewItem =~ /^awsDocDB-/",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.appBuilder.tailLogs",
+                    "when": "view =~ /^(aws.appBuilder|aws.appBuilderForFileExplorer)$/ && viewItem =~ /^(awsRegionFunctionNode|awsRegionFunctionNodeDownloadable|awsRegionFunctionNodeDownloadableOnly|awsCloudFormationFunctionNode)$/",
+                    "group": "inline@3"
+                }
+            ],
+            "aws.toolkit.auth": [
+                {
+                    "command": "aws.toolkit.auth.manageConnections",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.toolkit.auth.switchConnections",
+                    "group": "0@2"
+                },
+                {
+                    "command": "aws.toolkit.auth.signout",
+                    "enablement": "!isCloud9",
+                    "group": "0@3"
+                }
+            ],
+            "aws.toolkit.submenu.feedback": [
+                {
+                    "command": "aws.toolkit.submitFeedback",
+                    "when": "!aws.isWebExtHost",
+                    "group": "1_feedback@1"
+                },
+                {
+                    "command": "aws.toolkit.createIssueOnGitHub",
+                    "group": "1_feedback@2"
+                }
+            ],
+            "aws.toolkit.submenu.help": [
+                {
+                    "command": "aws.quickStart",
+                    "when": "isCloud9",
+                    "group": "1_help@1"
+                },
+                {
+                    "command": "aws.toolkit.help",
+                    "group": "1_help@2"
+                },
+                {
+                    "command": "aws.toolkit.github",
+                    "group": "1_help@3"
+                },
+                {
+                    "command": "aws.toolkit.aboutExtension",
+                    "group": "1_help@4"
+                },
+                {
+                    "command": "aws.toolkit.viewLogs",
+                    "group": "1_help@5"
+                }
+            ],
+            "file/newFile": [
+                {
+                    "command": "aws.newThreatComposerFile"
+                }
+            ]
+        },
+        "commands": [
+            {
+                "command": "aws.smus.openSpaceRemoteConnection",
+                "title": "Connect to SageMaker-Unified-Studio Space",
+                "icon": "$(remote-explorer)"
+            },
+            {
+                "command": "_aws.toolkit.notifications.dismiss",
+                "title": "%AWS.generic.dismiss%",
+                "category": "%AWS.title%",
+                "enablement": "view == aws.toolkit.notifications",
+                "icon": "$(remove-close)"
+            },
+            {
+                "command": "aws.accessanalyzer.iamPolicyChecks",
+                "title": "%AWS.command.accessanalyzer.iamPolicyChecks%",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.launchConfigForm",
+                "title": "%AWS.command.launchConfigForm.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "icon": "$(play)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.apig.copyUrl",
+                "title": "%AWS.command.apig.copyUrl%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.apig.invokeRemoteRestApi",
+                "title": "%AWS.command.apig.invokeRemoteRestApi%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%",
+                        "title": "%AWS.command.apig.invokeRemoteRestApi.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.lambda.createNewSamApp",
+                "title": "%AWS.command.createNewSamApp%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.launchDebugConfigForm",
+                "title": "%AWS.command.launchConfigForm.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "icon": "$(play)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.toolkit.login",
+                "title": "%AWS.command.login%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "title": "%AWS.command.login.cn%",
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.toolkit.credentials.profile.create",
+                "title": "%AWS.command.credentials.profile.create%",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.toolkit.credentials.edit",
+                "title": "%AWS.command.credentials.edit%",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.codecatalyst.openOrg",
+                "title": "%AWS.command.codecatalyst.openOrg%",
+                "category": "AWS",
+                "enablement": "isCloud9 || !aws.isWebExtHost"
+            },
+            {
+                "command": "aws.codecatalyst.openProject",
+                "title": "%AWS.command.codecatalyst.openProject%",
+                "category": "AWS",
+                "enablement": "isCloud9 || !aws.isWebExtHost"
+            },
+            {
+                "command": "aws.codecatalyst.openRepo",
+                "title": "%AWS.command.codecatalyst.openRepo%",
+                "category": "AWS",
+                "enablement": "isCloud9 || !aws.isWebExtHost"
+            },
+            {
+                "command": "aws.codecatalyst.openDevEnv",
+                "title": "%AWS.command.codecatalyst.openDevEnv%",
+                "category": "AWS",
+                "enablement": "!isCloud9 && !aws.isWebExtHost"
+            },
+            {
+                "command": "aws.codecatalyst.listCommands",
+                "title": "%AWS.command.codecatalyst.listCommands%",
+                "category": "AWS",
+                "enablement": "!isCloud9 && !aws.isWebExtHost"
+            },
+            {
+                "command": "aws.codecatalyst.cloneRepo",
+                "title": "%AWS.command.codecatalyst.cloneRepo%",
+                "category": "AWS",
+                "enablement": "!isCloud9 && !aws.isWebExtHost"
+            },
+            {
+                "command": "aws.codecatalyst.createDevEnv",
+                "title": "%AWS.command.codecatalyst.createDevEnv%",
+                "category": "AWS",
+                "enablement": "!isCloud9 && !aws.isWebExtHost"
+            },
+            {
+                "command": "aws.codecatalyst.signout",
+                "title": "%AWS.command.codecatalyst.signout%",
+                "category": "AWS",
+                "icon": "$(debug-disconnect)",
+                "enablement": "isCloud9 || !aws.isWebExtHost"
+            },
+            {
+                "command": "aws.toolkit.auth.addConnection",
+                "title": "%AWS.command.auth.addConnection%",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.toolkit.auth.manageConnections",
+                "title": "%AWS.command.auth.showConnectionsPage%",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.codecatalyst.manageConnections",
+                "title": "%AWS.command.auth.showConnectionsPage%",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.toolkit.auth.switchConnections",
+                "title": "%AWS.command.auth.switchConnections%",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.toolkit.auth.signout",
+                "title": "%AWS.command.auth.signout%",
+                "category": "%AWS.title%",
+                "enablement": "!isCloud9"
+            },
+            {
+                "command": "aws.toolkit.auth.help",
+                "title": "%AWS.generic.viewDocs%",
+                "category": "%AWS.title%",
+                "icon": "$(question)"
+            },
+            {
+                "command": "aws.toolkit.createIssueOnGitHub",
+                "title": "%AWS.command.createIssueOnGitHub%",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ec2.openTerminal",
+                "title": "%AWS.command.ec2.openTerminal%",
+                "icon": "$(terminal-view-icon)",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ec2.linkToLaunch",
+                "title": "%AWS.command.ec2.linkToLaunch%",
+                "icon": "$(add)",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ec2.openRemoteConnection",
+                "title": "%AWS.command.ec2.openRemoteConnection%",
+                "icon": "$(remote-explorer)",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.sagemaker.filterSpaceApps",
+                "title": "%AWS.command.sagemaker.filterSpaces%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(extensions-filter)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.sagemaker.openRemoteConnection",
+                "title": "Connect to SageMaker Space",
+                "icon": "$(remote-explorer)",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.smus.openRemoteConnection",
+                "title": "Connect to SageMaker Space",
+                "icon": "$(remote-explorer)",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.sagemaker.stopSpace",
+                "title": "Stop SageMaker Space",
+                "icon": "$(debug-stop)",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.smus.stopSpace",
+                "title": "Stop SageMaker Space",
+                "icon": "$(debug-stop)",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.smus.switchProject",
+                "title": "%AWS.command.smus.switchProject%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.smus.refreshProject",
+                "title": "%AWS.command.smus.refreshProject%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": {
+                    "dark": "resources/icons/vscode/dark/refresh.svg",
+                    "light": "resources/icons/vscode/light/refresh.svg"
+                },
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.smus.signOut",
+                "title": "%AWS.command.smus.signOut%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(sign-out)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ec2.startInstance",
+                "title": "%AWS.command.ec2.startInstance%",
+                "icon": "$(debug-start)",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ec2.stopInstance",
+                "title": "%AWS.command.ec2.stopInstance%",
+                "icon": "$(debug-stop)",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ec2.rebootInstance",
+                "title": "%AWS.command.ec2.rebootInstance%",
+                "icon": "$(debug-restart)",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ec2.copyInstanceId",
+                "title": "%AWS.command.ec2.copyInstanceId%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ecr.copyTagUri",
+                "title": "%AWS.command.ecr.copyTagUri%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ecr.deleteTag",
+                "title": "%AWS.command.ecr.deleteTag%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ecr.copyRepositoryUri",
+                "title": "%AWS.command.ecr.copyRepositoryUri%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ecr.createRepository",
+                "title": "%AWS.command.ecr.createRepository%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(add)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ecr.deleteRepository",
+                "title": "%AWS.command.ecr.deleteRepository%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.showRegion",
+                "title": "%AWS.command.showRegion%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.createThing",
+                "title": "%AWS.command.iot.createThing%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(add)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.deleteThing",
+                "title": "%AWS.generic.promptDelete%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.createCert",
+                "title": "%AWS.command.iot.createCert%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(add)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.deleteCert",
+                "title": "%AWS.generic.promptDelete%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.attachCert",
+                "title": "%AWS.command.iot.attachCert%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(aws-generic-attach-file)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.attachPolicy",
+                "title": "%AWS.command.iot.attachPolicy%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(aws-generic-attach-file)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.activateCert",
+                "title": "%AWS.command.iot.activateCert%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.deactivateCert",
+                "title": "%AWS.command.iot.deactivateCert%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.revokeCert",
+                "title": "%AWS.command.iot.revokeCert%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.createPolicy",
+                "title": "%AWS.command.iot.createPolicy%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(add)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.deletePolicy",
+                "title": "%AWS.generic.promptDelete%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.createPolicyVersion",
+                "title": "%AWS.command.iot.createPolicyVersion%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.deletePolicyVersion",
+                "title": "%AWS.generic.promptDelete%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.detachCert",
+                "title": "%AWS.command.iot.detachCert%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.detachPolicy",
+                "title": "%AWS.command.iot.detachCert%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.viewPolicyVersion",
+                "title": "%AWS.command.iot.viewPolicyVersion%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.setDefaultPolicy",
+                "title": "%AWS.command.iot.setDefaultPolicy%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.iot.copyEndpoint",
+                "title": "%AWS.command.iot.copyEndpoint%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.redshift.editConnection",
+                "title": "Edit connection",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.redshift.deleteConnection",
+                "title": "Delete connection",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.s3.presignedURL",
+                "title": "%AWS.command.s3.presignedURL%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost"
+            },
+            {
+                "command": "aws.s3.copyPath",
+                "title": "%AWS.command.s3.copyPath%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.s3.downloadFileAs",
+                "title": "%AWS.command.s3.downloadFileAs%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(cloud-download)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.s3.openFile",
+                "title": "%AWS.command.s3.openFile%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(open-preview)"
+            },
+            {
+                "command": "aws.s3.editFile",
+                "title": "%AWS.command.s3.editFile%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(edit)"
+            },
+            {
+                "command": "aws.s3.uploadFile",
+                "title": "%AWS.command.s3.uploadFile%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(cloud-upload)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.s3.uploadFileToParent",
+                "title": "%AWS.command.s3.uploadFileToParent%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.s3.createFolder",
+                "title": "%AWS.command.s3.createFolder%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(new-folder)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.s3.createBucket",
+                "title": "%AWS.command.s3.createBucket%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(aws-s3-create-bucket)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.s3.deleteBucket",
+                "title": "%AWS.generic.promptDelete%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.s3.deleteFile",
+                "title": "%AWS.generic.promptDelete%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.lambda.remoteDebugging.clearSnapshot",
+                "title": "%AWS.command.remoteDebugging.clearSnapshot%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.invokeLambda",
+                "title": "%AWS.command.invokeLambda%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(aws-lambda-invoke-remotely)",
+                "cloud9": {
+                    "cn": {
+                        "title": "%AWS.command.invokeLambda.cn%",
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.toolkit.lambda.convertToSam",
+                "title": "%AWS.command.lambda.convertToSam%",
+                "category": "%AWS.title%",
+                "enablement": "viewItem =~ /^(awsRegionFunctionNodeDownloadable|awsRegionFunctionNodeDownloadableOnly)$/",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                },
+                "icon": {
+                    "light": "resources/icons/aws/lambda/create-stack.svg",
+                    "dark": "resources/icons/aws/lambda/create-stack-light.svg"
+                }
+            },
+            {
+                "command": "aws.downloadLambda",
+                "title": "%AWS.command.downloadLambda%",
+                "category": "%AWS.title%",
+                "enablement": "viewItem =~ /^(awsRegionFunctionNodeDownloadable|awsRegionFunctionNodeDownloadableOnly)$/",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.lambda.openWorkspace",
+                "title": "%AWS.command.openLambdaWorkspace%",
+                "category": "%AWS.title%",
+                "enablement": "viewItem =~ /^(awsRegionFunctionNodeDownloadable|awsRegionFunctionNodeDownloadableOnly)$/",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.uploadLambda",
+                "title": "%AWS.command.uploadLambda%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                },
+                "icon": "$(cloud-upload)"
+            },
+            {
+                "command": "aws.openLambdaFile",
+                "title": "%AWS.command.openLambdaFile%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(preview)"
+            },
+            {
+                "command": "aws.quickDeployLambda",
+                "title": "%AWS.command.quickDeployLambda%",
+                "category": "%AWS.title%",
+                "enablement": "viewItem =~ /^(awsRegionFunctionNodeDownloadable|awsRegionFunctionNodeDownloadableOnly)$/",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                },
+                "icon": "$(cloud-upload)"
+            },
+            {
+                "command": "aws.deleteLambda",
+                "title": "%AWS.generic.promptDelete%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.copyLambdaUrl",
+                "title": "%AWS.generic.copyUrl%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.deploySamApplication",
+                "title": "%AWS.command.deploySamApplication%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.toolkit.submitFeedback",
+                "title": "%AWS.command.submitFeedback%",
+                "enablement": "!aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "icon": "$(comment)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.refreshAwsExplorer",
+                "title": "%AWS.command.refreshAwsExplorer%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "icon": {
+                    "dark": "resources/icons/vscode/dark/refresh.svg",
+                    "light": "resources/icons/vscode/light/refresh.svg"
+                }
+            },
+            {
+                "command": "aws.samcli.detect",
+                "title": "%AWS.command.samcli.detect%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.deleteCloudFormation",
+                "title": "%AWS.command.deleteCloudFormation%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.downloadStateMachineDefinition",
+                "title": "%AWS.command.downloadStateMachineDefinition%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.executeStateMachine",
+                "title": "%AWS.command.executeStateMachine%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.copyArn",
+                "title": "%AWS.command.copyArn%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.openAwsConsole",
+                "title": "%AWS.command.openAwsConsole%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "title": "%AWS.command.openAwsConsole.cn%",
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.openAwsCFNConsole",
+                "title": "%AWS.command.openAwsConsole%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "title": "%AWS.command.openAwsConsole.cn%",
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.copyName",
+                "title": "%AWS.command.copyName%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.listCommands",
+                "title": "%AWS.command.listCommands%",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "title": "%AWS.command.listCommands.cn%",
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.viewSchemaItem",
+                "title": "%AWS.command.viewSchemaItem%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.searchSchema",
+                "title": "%AWS.command.searchSchema%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.searchSchemaPerRegistry",
+                "title": "%AWS.command.searchSchemaPerRegistry%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.downloadSchemaItemCode",
+                "title": "%AWS.command.downloadSchemaItemCode%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.toolkit.viewLogs",
+                "title": "%AWS.command.viewLogs%",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.toolkit.help",
+                "title": "%AWS.command.help%",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.toolkit.github",
+                "title": "%AWS.command.github%",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.toolkit.lambda.openWalkthrough",
+                "title": "%AWS.toolkit.lambda.walkthrough.quickpickTitle%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.toolkit.lambda.createServerlessLandProject",
+                "title": "%AWS.toolkit.lambda.serverlessLand.quickpickTitle%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.quickStart",
+                "title": "%AWS.command.quickStart%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.cdk.refresh",
+                "title": "%AWS.command.refreshCdkExplorer%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": {
+                    "dark": "resources/icons/vscode/dark/refresh.svg",
+                    "light": "resources/icons/vscode/light/refresh.svg"
+                },
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.cdk.viewDocs",
+                "title": "%AWS.generic.viewDocs%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost"
+            },
+            {
+                "command": "aws.appBuilder.refresh",
+                "title": "%AWS.command.refreshappBuilderExplorer%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": {
+                    "dark": "resources/icons/vscode/dark/refresh.svg",
+                    "light": "resources/icons/vscode/light/refresh.svg"
+                },
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.appBuilderForFileExplorer.refresh",
+                "title": "%AWS.command.refreshappBuilderExplorer%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": {
+                    "dark": "resources/icons/vscode/dark/refresh.svg",
+                    "light": "resources/icons/vscode/light/refresh.svg"
+                },
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.appBuilder.viewDocs",
+                "title": "%AWS.generic.viewDocs%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost"
+            },
+            {
+                "command": "aws.stepfunctions.createStateMachineFromTemplate",
+                "title": "%AWS.command.stepFunctions.createStateMachineFromTemplate%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.stepfunctions.publishStateMachine",
+                "title": "%AWS.command.stepFunctions.publishStateMachine%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.previewStateMachine",
+                "title": "%AWS.command.stepFunctions.openWithWorkflowStudio%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(aws-stepfunctions-preview)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.cdk.renderStateMachineGraph",
+                "title": "%AWS.command.cdk.previewStateMachine%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "AWS",
+                "icon": "$(aws-stepfunctions-preview)"
+            },
+            {
+                "command": "aws.toolkit.aboutExtension",
+                "title": "%AWS.command.aboutToolkit%",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.cwl.viewLogStream",
+                "title": "%AWS.command.viewLogStream%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ssmDocument.createLocalDocument",
+                "title": "%AWS.command.ssmDocument.createLocalDocument%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ssmDocument.openLocalDocument",
+                "title": "%AWS.command.ssmDocument.openLocalDocument%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(cloud-download)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ssmDocument.openLocalDocumentJson",
+                "title": "%AWS.command.ssmDocument.openLocalDocumentJson%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ssmDocument.openLocalDocumentYaml",
+                "title": "%AWS.command.ssmDocument.openLocalDocumentYaml%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ssmDocument.deleteDocument",
+                "title": "%AWS.command.ssmDocument.deleteDocument%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ssmDocument.publishDocument",
+                "title": "%AWS.command.ssmDocument.publishDocument%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(cloud-upload)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ssmDocument.updateDocumentVersion",
+                "title": "%AWS.command.ssmDocument.updateDocumentVersion%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.copyLogResource",
+                "title": "%AWS.command.copyLogResource%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(files)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.cwl.searchLogGroup",
+                "title": "%AWS.command.cloudWatchLogs.searchLogGroup%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(search-view-icon)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.cwl.tailLogGroup",
+                "title": "%AWS.command.cloudWatchLogs.tailLogGroup%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(notebook-execute)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.saveCurrentLogDataContent",
+                "title": "%AWS.command.saveCurrentLogDataContent%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(save)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.cwl.changeFilterPattern",
+                "title": "%AWS.command.cwl.changeFilterPattern%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(search-view-icon)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.cwl.changeTimeFilter",
+                "title": "%AWS.command.cwl.changeTimeFilter%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(calendar)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.addSamDebugConfig",
+                "title": "%AWS.command.addSamDebugConfig%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.toggleSamCodeLenses",
+                "title": "%AWS.command.toggleSamCodeLenses%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ecs.runCommandInContainer",
+                "title": "%AWS.ecs.runCommandInContainer%",
+                "category": "%AWS.title%",
+                "enablement": "viewItem == awsEcsContainerNodeExecEnabled",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ecs.openTaskInTerminal",
+                "title": "%AWS.ecs.openTaskInTerminal%",
+                "category": "%AWS.title%",
+                "enablement": "viewItem == awsEcsContainerNodeExecEnabled",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ecs.enableEcsExec",
+                "title": "%AWS.ecs.enableEcsExec%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ecs.viewDocumentation",
+                "title": "%AWS.generic.viewDocs%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.resources.copyIdentifier",
+                "title": "%AWS.command.resources.copyIdentifier%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.resources.openResourcePreview",
+                "title": "%AWS.generic.preview%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(open-preview)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.resources.createResource",
+                "title": "%AWS.generic.create%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(add)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.resources.deleteResource",
+                "title": "%AWS.generic.promptDelete%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.resources.updateResource",
+                "title": "%AWS.generic.promptUpdate%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(pencil)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.resources.updateResourceInline",
+                "title": "%AWS.generic.promptUpdate%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(pencil)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.resources.saveResource",
+                "title": "%AWS.generic.save%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(save)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.resources.closeResource",
+                "title": "%AWS.generic.close%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(close)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.resources.viewDocs",
+                "title": "%AWS.generic.viewDocs%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(book)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.resources.configure",
+                "title": "%AWS.command.resources.configure%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": "$(gear)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.apprunner.createService",
+                "title": "%AWS.command.apprunner.createService%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.ecs.disableEcsExec",
+                "title": "%AWS.ecs.disableEcsExec%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.apprunner.createServiceFromEcr",
+                "title": "%AWS.command.apprunner.createServiceFromEcr%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.apprunner.pauseService",
+                "title": "%AWS.command.apprunner.pauseService%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.apprunner.resumeService",
+                "title": "%AWS.command.apprunner.resumeService%",
+                "category": "AWS",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.apprunner.copyServiceUrl",
+                "title": "%AWS.command.apprunner.copyServiceUrl%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.apprunner.open",
+                "title": "%AWS.command.apprunner.open%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.apprunner.deleteService",
+                "title": "%AWS.generic.promptDelete%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.apprunner.startDeployment",
+                "title": "%AWS.command.apprunner.startDeployment%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.cloudFormation.newTemplate",
+                "title": "%AWS.command.cloudFormation.newTemplate%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.sam.newTemplate",
+                "title": "%AWS.command.sam.newTemplate%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.samcli.sync",
+                "title": "%AWS.command.samcli.sync%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost"
+            },
+            {
+                "command": "aws.appBuilder.build",
+                "title": "%AWS.command.appBuilder.build%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "icon": "$(package)"
+            },
+            {
+                "command": "aws.appBuilder.searchLogs",
+                "title": "%AWS.command.appBuilder.searchLogs%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "icon": "$(search-view-icon)"
+            },
+            {
+                "command": "aws.appBuilder.tailLogs",
+                "title": "%AWS.command.appBuilder.tailLogs%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "icon": "$(search-show-context)"
+            },
+            {
+                "command": "aws.appBuilder.deploy",
+                "title": "%AWS.command.appBuilder.deploy%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "icon": "$(cloud-upload)"
+            },
+            {
+                "command": "aws.appBuilder.openTemplate",
+                "title": "%AWS.command.appBuilder.openTemplate%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "icon": "$(code)"
+            },
+            {
+                "command": "aws.appBuilder.openHandler",
+                "title": "%AWS.command.appBuilder.openHandler%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "category": "%AWS.title%",
+                "icon": "$(code)"
+            },
+            {
+                "command": "aws.toolkit.amazonq.learnMore",
+                "title": "%AWS.amazonq.learnMore%",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.toolkit.amazonq.extensionpage",
+                "title": "Open Amazon Q Extension",
+                "category": "%AWS.title%"
+            },
+            {
+                "command": "aws.dev.openMenu",
+                "title": "Open Developer Menu",
+                "category": "AWS (Developer)",
+                "enablement": "aws.isDevMode"
+            },
+            {
+                "command": "aws.openInApplicationComposerDialog",
+                "title": "%AWS.command.applicationComposer.openDialog%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.openInApplicationComposer",
+                "title": "%AWS.command.applicationComposer.open%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "icon": {
+                    "dark": "resources/icons/aws/applicationcomposer/icon-dark.svg",
+                    "light": "resources/icons/aws/applicationcomposer/icon.svg"
+                },
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.stepfunctions.openWithWorkflowStudio",
+                "title": "%AWS.command.stepFunctions.openWithWorkflowStudio%",
+                "category": "%AWS.title%",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.createNewThreatComposer",
+                "title": "%AWS.command.threatComposer.createNew%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.newThreatComposerFile",
+                "title": "%AWS.command.threatComposer.newFile%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.docdb.createCluster",
+                "title": "%AWS.command.docdb.createCluster%",
+                "icon": "$(add)",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.docdb.createInstance",
+                "title": "%AWS.command.docdb.createInstance%",
+                "icon": "$(add)",
+                "category": "%AWS.title%",
+                "enablement": "(isCloud9 || !aws.isWebExtHost)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.docdb.deleteInstance",
+                "title": "%AWS.generic.promptDelete%",
+                "category": "%AWS.title%",
+                "enablement": "(isCloud9 || !aws.isWebExtHost) && viewItem == awsDocDB-instance-available",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.docdb.renameInstance",
+                "title": "%AWS.generic.promptRename%",
+                "category": "%AWS.title%",
+                "enablement": "(isCloud9 || !aws.isWebExtHost) && viewItem == awsDocDB-instance-available",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.docdb.modifyInstance",
+                "title": "%AWS.command.docdb.modifyInstance%",
+                "category": "%AWS.title%",
+                "enablement": "isCloud9 || !aws.isWebExtHost && viewItem == awsDocDB-instance-available",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.docdb.rebootInstance",
+                "title": "%AWS.command.docdb.rebootInstance%",
+                "icon": "$(debug-restart)",
+                "category": "%AWS.title%",
+                "enablement": "(isCloud9 || !aws.isWebExtHost) && viewItem == awsDocDB-instance-available",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.docdb.renameCluster",
+                "title": "%AWS.generic.promptRename%",
+                "category": "%AWS.title%",
+                "enablement": "(isCloud9 || !aws.isWebExtHost) && viewItem =~ /^awsDocDB-cluster.*-running/",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.docdb.startCluster",
+                "title": "%AWS.command.docdb.startCluster%",
+                "icon": "$(debug-start)",
+                "category": "%AWS.title%",
+                "enablement": "!aws.isWebExtHost && viewItem =~ /^awsDocDB-cluster.*-stopped/"
+            },
+            {
+                "command": "aws.docdb.stopCluster",
+                "title": "%AWS.command.docdb.stopCluster%",
+                "icon": "$(debug-pause)",
+                "category": "%AWS.title%",
+                "enablement": "!aws.isWebExtHost && viewItem =~ /^awsDocDB-cluster.*-running/"
+            },
+            {
+                "command": "aws.docdb.deleteCluster",
+                "title": "%AWS.generic.promptDelete%",
+                "category": "%AWS.title%",
+                "enablement": "(isCloud9 || !aws.isWebExtHost) && viewItem =~ /^awsDocDB-cluster.*-running/",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.docdb.listTags",
+                "title": "%AWS.command.docdb.tags%",
+                "category": "%AWS.title%",
+                "enablement": "(isCloud9 || !aws.isWebExtHost) && viewItem =~ /^awsDocDB/",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.docdb.viewConsole",
+                "title": "%AWS.command.docdb.open%",
+                "category": "%AWS.title%",
+                "enablement": "(isCloud9 || !aws.isWebExtHost) && viewItem =~ /^awsDocDB/",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.docdb.viewDocs",
+                "title": "%AWS.generic.viewDocs%",
+                "category": "%AWS.title%",
+                "enablement": "(isCloud9 || !aws.isWebExtHost)",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.docdb.copyEndpoint",
+                "title": "%AWS.command.docdb.copyEndpoint%",
+                "category": "%AWS.title%",
+                "enablement": "(isCloud9 || !aws.isWebExtHost) && viewItem =~ /^awsDocDB/",
+                "cloud9": {
+                    "cn": {
+                        "category": "%AWS.title.cn%"
+                    }
+                }
+            },
+            {
+                "command": "aws.smus.notebookscheduling.createjob",
+                "title": "Create Notebook Job",
+                "category": "Job"
+            },
+            {
+                "command": "aws.smus.notebookscheduling.viewjobs",
+                "title": "View Notebook Jobs",
+                "category": "Job"
+            }
+        ],
+        "jsonValidation": [
+            {
+                "fileMatch": ".aws/templates.json",
+                "url": "./dist/src/templates/templates.json"
+            },
+            {
+                "fileMatch": "*ecs-task-def.json",
+                "url": "https://ecs-intellisense.s3-us-west-2.amazonaws.com/task-definition/schema.json"
+            }
+        ],
+        "languages": [
+            {
+                "id": "asl",
+                "extensions": [
+                    ".asl.json",
+                    ".asl"
+                ],
+                "aliases": [
+                    "Amazon States Language"
+                ]
+            },
+            {
+                "id": "asl-yaml",
+                "aliases": [
+                    "Amazon States Language (YAML)"
+                ],
+                "extensions": [
+                    ".asl.yaml",
+                    ".asl.yml"
+                ]
+            },
+            {
+                "id": "ssm-json",
+                "extensions": [
+                    ".ssm.json"
+                ],
+                "aliases": [
+                    "AWS Systems Manager Document (JSON)"
+                ]
+            },
+            {
+                "id": "ssm-yaml",
+                "extensions": [
+                    ".ssm.yaml",
+                    ".ssm.yml"
+                ],
+                "aliases": [
+                    "AWS Systems Manager Document (YAML)"
+                ]
+            }
+        ],
+        "keybindings": [
+            {
+                "command": "aws.previewStateMachine",
+                "key": "ctrl+shift+v",
+                "mac": "cmd+shift+v",
+                "when": "editorTextFocus && editorLangId == asl || editorTextFocus && editorLangId == asl-yaml"
+            },
+            {
+                "command": "noop",
+                "key": "ctrl+z",
+                "mac": "cmd+z",
+                "when": "aws.stepFunctions.isWorkflowStudioFocused"
+            },
+            {
+                "command": "aws.samcli.sync",
+                "key": "ctrl+shift+s",
+                "mac": "cmd+shift+s",
+                "when": "editorLangId == yaml || workspaceContains:**/template.yaml"
+            }
+        ],
+        "grammars": [
+            {
+                "language": "asl",
+                "scopeName": "source.asl",
+                "path": "./syntaxes/ASL.tmLanguage"
+            },
+            {
+                "language": "asl-yaml",
+                "scopeName": "source.asl.yaml",
+                "path": "./syntaxes/asl-yaml.tmLanguage.json"
+            },
+            {
+                "language": "ssm-json",
+                "scopeName": "source.ssmjson",
+                "path": "./syntaxes/SSMJSON.tmLanguage"
+            },
+            {
+                "language": "ssm-yaml",
+                "scopeName": "source.ssmyaml",
+                "path": "./syntaxes/SSMYAML.tmLanguage"
+            }
+        ],
+        "resourceLabelFormatters": [
+            {
+                "scheme": "aws-cwl",
+                "formatting": {
+                    "label": "${path}",
+                    "separator": "/"
+                }
+            },
+            {
+                "scheme": "s3*",
+                "formatting": {
+                    "label": "[S3] ${path}",
+                    "separator": "/"
+                }
+            }
+        ],
+        "walkthroughs": [
+            {
+                "id": "aws.toolkit.lambda.walkthrough",
+                "title": "%AWS.toolkit.lambda.walkthrough.title%",
+                "description": "%AWS.toolkit.lambda.walkthrough.description%",
+                "when": "workspacePlatform != webworker",
+                "steps": [
+                    {
+                        "id": "toolInstallWindows",
+                        "title": "%AWS.toolkit.lambda.walkthrough.toolInstall.title%",
+                        "description": "%AWS.toolkit.lambda.walkthrough.toolInstall.description.windows%",
+                        "media": {
+                            "image": "./resources/walkthrough/appBuilder/install.png",
+                            "altText": "Showing GUI installer"
+                        },
+                        "when": "isWindows"
+                    },
+                    {
+                        "id": "toolInstall",
+                        "title": "%AWS.toolkit.lambda.walkthrough.toolInstall.title%",
+                        "description": "%AWS.toolkit.lambda.walkthrough.toolInstall.description%",
+                        "media": {
+                            "image": "./resources/walkthrough/appBuilder/install.png",
+                            "altText": "Showing GUI installer"
+                        },
+                        "when": "!isWindows"
+                    },
+                    {
+                        "id": "chooseTemplate",
+                        "title": "%AWS.toolkit.lambda.walkthrough.chooseTemplate.title%",
+                        "description": "%AWS.toolkit.lambda.walkthrough.chooseTemplate.description%",
+                        "media": {
+                            "markdown": "./resources/walkthrough/appBuilder/AppPicker.md"
+                        }
+                    },
+                    {
+                        "id": "step1",
+                        "title": "%AWS.toolkit.lambda.walkthrough.step1.title%",
+                        "description": "%AWS.toolkit.lambda.walkthrough.step1.description%",
+                        "media": {
+                            "markdown": "./resources/walkthrough/appBuilder/InnerLoop.md"
+                        }
+                    },
+                    {
+                        "id": "step2",
+                        "title": "%AWS.toolkit.lambda.walkthrough.step2.title%",
+                        "description": "%AWS.toolkit.lambda.walkthrough.step2.description%",
+                        "media": {
+                            "markdown": "./resources/walkthrough/appBuilder/RemoteLoop.md"
+                        }
+                    }
+                ]
+            }
+        ],
+        "icons": {
+            "aws-amazonq-q-gradient": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1aa"
+                }
+            },
+            "aws-amazonq-q-squid-ink": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ab"
+                }
+            },
+            "aws-amazonq-q-white": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ac"
+                }
+            },
+            "aws-amazonq-severity-critical": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ad"
+                }
+            },
+            "aws-amazonq-severity-high": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ae"
+                }
+            },
+            "aws-amazonq-severity-info": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1af"
+                }
+            },
+            "aws-amazonq-severity-low": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b0"
+                }
+            },
+            "aws-amazonq-severity-medium": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b1"
+                }
+            },
+            "aws-amazonq-transform-arrow-dark": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b2"
+                }
+            },
+            "aws-amazonq-transform-arrow-light": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b3"
+                }
+            },
+            "aws-amazonq-transform-default-dark": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b4"
+                }
+            },
+            "aws-amazonq-transform-default-light": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b5"
+                }
+            },
+            "aws-amazonq-transform-dependencies-dark": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b6"
+                }
+            },
+            "aws-amazonq-transform-dependencies-light": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b7"
+                }
+            },
+            "aws-amazonq-transform-file-dark": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b8"
+                }
+            },
+            "aws-amazonq-transform-file-light": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1b9"
+                }
+            },
+            "aws-amazonq-transform-logo": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ba"
+                }
+            },
+            "aws-amazonq-transform-step-into-dark": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1bb"
+                }
+            },
+            "aws-amazonq-transform-step-into-light": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1bc"
+                }
+            },
+            "aws-amazonq-transform-variables-dark": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1bd"
+                }
+            },
+            "aws-amazonq-transform-variables-light": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1be"
+                }
+            },
+            "aws-applicationcomposer-icon": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1bf"
+                }
+            },
+            "aws-applicationcomposer-icon-dark": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c0"
+                }
+            },
+            "aws-apprunner-service": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c1"
+                }
+            },
+            "aws-cdk-logo": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c2"
+                }
+            },
+            "aws-cloudformation-stack": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c3"
+                }
+            },
+            "aws-cloudwatch-log-group": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c4"
+                }
+            },
+            "aws-codecatalyst-logo": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c5"
+                }
+            },
+            "aws-codewhisperer-icon-black": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c6"
+                }
+            },
+            "aws-codewhisperer-icon-white": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c7"
+                }
+            },
+            "aws-codewhisperer-learn": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c8"
+                }
+            },
+            "aws-ecr-registry": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1c9"
+                }
+            },
+            "aws-ecs-cluster": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ca"
+                }
+            },
+            "aws-ecs-container": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1cb"
+                }
+            },
+            "aws-ecs-service": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1cc"
+                }
+            },
+            "aws-generic-attach-file": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1cd"
+                }
+            },
+            "aws-iot-certificate": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ce"
+                }
+            },
+            "aws-iot-policy": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1cf"
+                }
+            },
+            "aws-iot-thing": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d0"
+                }
+            },
+            "aws-lambda-create-stack": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d1"
+                }
+            },
+            "aws-lambda-create-stack-light": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d2"
+                }
+            },
+            "aws-lambda-deployed-function": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d3"
+                }
+            },
+            "aws-lambda-function": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d4"
+                }
+            },
+            "aws-lambda-invoke-remotely": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d5"
+                }
+            },
+            "aws-mynah-MynahIconBlack": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d6"
+                }
+            },
+            "aws-mynah-MynahIconWhite": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d7"
+                }
+            },
+            "aws-mynah-logo": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d8"
+                }
+            },
+            "aws-redshift-cluster": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1d9"
+                }
+            },
+            "aws-redshift-cluster-connected": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1da"
+                }
+            },
+            "aws-redshift-database": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1db"
+                }
+            },
+            "aws-redshift-redshift-cluster-connected": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1dc"
+                }
+            },
+            "aws-redshift-schema": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1dd"
+                }
+            },
+            "aws-redshift-table": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1de"
+                }
+            },
+            "aws-s3-bucket": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1df"
+                }
+            },
+            "aws-s3-create-bucket": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e0"
+                }
+            },
+            "aws-sagemaker-code-editor": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e1"
+                }
+            },
+            "aws-sagemaker-jupyter-lab": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e2"
+                }
+            },
+            "aws-sagemakerunifiedstudio-catalog": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e3"
+                }
+            },
+            "aws-sagemakerunifiedstudio-spaces": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e4"
+                }
+            },
+            "aws-sagemakerunifiedstudio-spaces-dark": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e5"
+                }
+            },
+            "aws-sagemakerunifiedstudio-symbol-int": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e6"
+                }
+            },
+            "aws-sagemakerunifiedstudio-table": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e7"
+                }
+            },
+            "aws-schemas-registry": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e8"
+                }
+            },
+            "aws-schemas-schema": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1e9"
+                }
+            },
+            "aws-stepfunctions-preview": {
+                "description": "AWS Contributed Icon",
+                "default": {
+                    "fontPath": "./resources/fonts/aws-toolkit-icons.woff",
+                    "fontCharacter": "\\f1ea"
+                }
+            }
+        },
+        "notebooks": [
+            {
+                "type": "aws-redshift-sql-notebook",
+                "displayName": "Redshift SQL notebook",
+                "selector": [
+                    {
+                        "filenamePattern": "*.redshiftnb"
+                    }
+                ]
+            }
+        ],
+        "customEditors": [
+            {
+                "viewType": "threatComposer.tc.json",
+                "displayName": "%AWS.threatComposer.title%",
+                "selector": [
+                    {
+                        "filenamePattern": "*.tc.json"
+                    }
+                ]
+            },
+            {
+                "viewType": "workflowStudio.asl",
+                "displayName": "Workflow Studio",
+                "selector": [
+                    {
+                        "filenamePattern": "*.asl.json"
+                    },
+                    {
+                        "filenamePattern": "*.asl.yaml"
+                    },
+                    {
+                        "filenamePattern": "*.asl.yml"
+                    }
+                ]
+            }
+        ],
+        "configurationDefaults": {
+            "workbench.editorAssociations": {
+                "{git,gitlens,conflictResolution,vscode-local-history}:/**/*.tc.json": "default",
+                "{git,gitlens,conflictResolution,vscode-local-history}:/**/*.{asl.json,asl.yaml,asl.yml}": "default"
+            }
+        }
+    },
+    "devDependencies": {},
+    "dependencies": {
+        "aws-core-vscode": "file:../core/"
+    }
+}
diff --git a/packages/toolkit/scripts/build/copyFiles.ts b/packages/toolkit/scripts/build/copyFiles.ts
new file mode 100644
index 00000000000..782c16ddb50
--- /dev/null
+++ b/packages/toolkit/scripts/build/copyFiles.ts
@@ -0,0 +1,142 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* eslint-disable no-restricted-imports */
+import fs from 'fs'
+import * as path from 'path'
+
+// Copies various dependencies into "dist/".
+
+const projectRoot = process.cwd()
+const outRoot = path.join(projectRoot, 'dist')
+
+// The target file or directory must exist, otherwise we should fail the whole build.
+interface CopyTask {
+    /**
+     * Target file or directory to copy.
+     */
+    readonly target: string
+
+    /**
+     * Providing no destination means the target will be copied relative to the root directory.
+     */
+    readonly destination?: string
+}
+
+const tasks: CopyTask[] = [
+    ...['LICENSE', 'NOTICE'].map((f) => {
+        return { target: path.join('../../', f), destination: path.join(projectRoot, f) }
+    }),
+    { target: path.join('../core', 'resources'), destination: path.join('..', 'resources') },
+    {
+        target: path.join('../core/', 'package.nls.json'),
+        destination: path.join('..', 'package.nls.json'),
+    },
+    { target: path.join('../core', 'src', 'templates'), destination: path.join('src', 'templates') },
+    {
+        target: '../core/src/auth/sso/vue',
+        destination: 'src/auth/sso/vue',
+    },
+
+    // SSM
+    {
+        target: path.join('../../node_modules', 'aws-ssm-document-language-service', 'dist', 'server.js'),
+        destination: path.join('src', 'ssmDocument', 'ssm', 'ssmServer.js'),
+    },
+    {
+        target: path.join('../../node_modules', 'aws-ssm-document-language-service', 'dist', 'server.js.LICENSE.txt'),
+        destination: path.join('src', 'ssmDocument', 'ssm', 'ssmServer.js.LICENSE.txt'),
+    },
+    {
+        target: path.join('../../node_modules', 'aws-ssm-document-language-service', 'dist', 'server.js.map'),
+        destination: path.join('src', 'ssmDocument', 'ssm', 'server.js.map'),
+    },
+
+    // ASL
+    {
+        target: path.join(
+            '../../node_modules',
+            'aws-core-vscode',
+            'dist',
+            'src',
+            'stepFunctions',
+            'asl',
+            'aslServer.js'
+        ),
+        destination: path.join('src', 'stepFunctions', 'asl', 'aslServer.js'),
+    },
+
+    // Sagemaker local server
+    {
+        target: path.join(
+            '../../node_modules',
+            'aws-core-vscode',
+            'dist',
+            'src',
+            'awsService',
+            'sagemaker',
+            'detached-server',
+            'server.js'
+        ),
+        destination: path.join('src', 'awsService', 'sagemaker', 'detached-server', 'server.js'),
+    },
+
+    // Serverless Land
+    {
+        target: path.join(
+            '../../node_modules/aws-core-vscode',
+            'src',
+            'awsService',
+            'appBuilder',
+            'serverlessLand',
+            'metadata.json'
+        ),
+        destination: path.join('src', 'serverlessLand', 'metadata.json'),
+    },
+
+    // Vue
+    {
+        target: path.join('../core', 'resources', 'js', 'vscode.js'),
+        destination: path.join('libs', 'vscode.js'),
+    },
+    {
+        target: path.join('../../node_modules', 'vue', 'dist', 'vue.global.prod.js'),
+        destination: path.join('libs', 'vue.min.js'),
+    },
+    {
+        target: path.join('../../node_modules/aws-core-vscode/dist', 'vue'),
+        destination: 'vue/',
+    },
+    {
+        target: path.join('../../node_modules', 'web-tree-sitter', 'tree-sitter.wasm'),
+        destination: path.join('src', 'tree-sitter.wasm'),
+    },
+]
+
+function copy(task: CopyTask): void {
+    const src = path.resolve(projectRoot, task.target)
+    const dst = path.resolve(outRoot, task.destination ?? task.target)
+
+    try {
+        fs.cpSync(src, dst, {
+            recursive: true,
+            force: true,
+            errorOnExist: false,
+        })
+    } catch (error) {
+        throw new Error(`Copy "${src}" to "${dst}" failed: ${error instanceof Error ? error.message : error}`)
+    }
+}
+function main() {
+    try {
+        tasks.map(copy)
+    } catch (error) {
+        console.error('`copyFiles.ts` failed')
+        console.error(error)
+        process.exit(1)
+    }
+}
+
+void main()
diff --git a/packages/toolkit/scripts/build/generateConfigurationAttributes.ts b/packages/toolkit/scripts/build/generateConfigurationAttributes.ts
new file mode 100644
index 00000000000..b0d276f6753
--- /dev/null
+++ b/packages/toolkit/scripts/build/generateConfigurationAttributes.ts
@@ -0,0 +1,78 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as fs from 'fs' // eslint-disable-line no-restricted-imports
+import * as path from 'path'
+import { JSONSchema4 } from 'json-schema'
+import { compile } from 'json-schema-to-typescript'
+import * as nlsJson from '../../package.nls.json'
+
+const config = [
+    {
+        debugger: 'aws-sam',
+        requestType: 'direct-invoke' as const,
+        // writes to core-lib, because that is where the code that uses the definitions lives
+        // TODO: Drop down all code that uses definitions to packages/toolkit and stop writing definitions to core lib.
+        outputFile: '../core/src/shared/sam/debugger/awsSamDebugConfiguration.gen.ts',
+        imports: ["import * as vscode from 'vscode'"],
+        topLevelClass: 'AwsSamDebuggerConfiguration',
+    },
+]
+
+const docRegex = /%([a-zA-Z.]{1,})%/g
+const replacer: (match: string, key: string) => string = (match, key) =>
+    (nlsJson as { [key: string]: string })[key].replace(/\n/g, '\n* ') ?? match
+
+function addBaseClass(generated: string, topLevelClass: string): string {
+    return generated.replace(topLevelClass, `${topLevelClass} extends vscode.DebugConfiguration`)
+}
+
+async function generateConfigurationAttributes(): Promise<void> {
+    const packageJson = JSON.parse(fs.readFileSync('./package.json', { encoding: 'utf-8' }))
+    for (const debugConfiguration of packageJson.contributes.debuggers) {
+        const debuggerConfig = config.find((cfg) => {
+            return cfg.debugger === debugConfiguration.type
+        })
+        if (debuggerConfig === undefined) {
+            continue
+        }
+
+        if (!fs.existsSync(path.dirname(debuggerConfig.outputFile))) {
+            throw new Error(`Output folder of ${debuggerConfig.outputFile} does not exist.`)
+        }
+
+        const header = `
+/*!
+* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+* SPDX-License-Identifier: Apache-2.0
+*/
+
+/**
+ * This file is not generated from the core library. Please regenerate from 
+ * 'packages/toolkit', e.g. \`npm run generateConfigurationAttributes -w packages/toolkit\`
+ */
+
+/**
+ * This file was automatically generated by json-schema-to-typescript.
+ * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+ * and run json-schema-to-typescript to regenerate this file.
+ */
+
+import * as vscode from 'vscode'
+`
+
+        // JSONSchema4 impl doesn't like properties with type undefined, but the compilation works correctly
+        const schema = debugConfiguration.configurationAttributes[debuggerConfig.requestType] as any as JSONSchema4
+        await compile(schema, 'DirectInvoke', { bannerComment: header })
+            .then((ts) => addBaseClass(ts, debuggerConfig.topLevelClass))
+            .then((ts) => ts.replace(docRegex, replacer))
+            .then((ts) => fs.writeFileSync(debuggerConfig.outputFile, ts))
+    }
+}
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+;(async () => {
+    await generateConfigurationAttributes()
+})()
diff --git a/packages/toolkit/src/api.ts b/packages/toolkit/src/api.ts
new file mode 100644
index 00000000000..9c9bb1f7a85
--- /dev/null
+++ b/packages/toolkit/src/api.ts
@@ -0,0 +1,112 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Auth, Connection, AwsConnection } from 'aws-core-vscode/auth'
+import { getLogger } from 'aws-core-vscode/shared'
+
+export const awsToolkitApi = {
+    /**
+     * Creating API object for external extensions.
+     * @param extensionId Extension id that identifies the caller.
+     */
+    getApi(extensionId: string) {
+        return {
+            /**
+             * Exposing listConnections API for other extension to read or re-use
+             * the available connections in aws toolkit.
+             */
+            async listConnections(): Promise<AwsConnection[]> {
+                getLogger().debug(`listConnections: extension ${extensionId}`)
+                const connections = await Auth.instance.listConnections()
+                const exposedConnections: AwsConnection[] = []
+                // eslint-disable-next-line unicorn/no-array-for-each
+                connections.forEach((x: Connection) => {
+                    if (x.type === 'sso') {
+                        const connState = Auth.instance.getConnectionState(x)
+                        if (connState) {
+                            exposedConnections.push({
+                                id: x.id,
+                                label: x.label,
+                                type: x.type,
+                                ssoRegion: x.ssoRegion,
+                                startUrl: x.startUrl,
+                                scopes: x.scopes,
+                                state: connState,
+                            })
+                        }
+                    }
+                })
+                return exposedConnections
+            },
+
+            /**
+             * Exposing setConnection API for other extension to push its connection state to aws toolkit
+             * @param connection The AWS connection of the source extension that is intended to be shared with toolkit
+             */
+            async setConnection(connection: AwsConnection): Promise<void> {
+                getLogger().debug(`setConnection: extension ${extensionId}, connection id ${connection.id}`)
+                await Auth.instance.setConnectionFromApi(connection)
+            },
+
+            /**
+             * Declares a connection to toolkit to re-use SSO SSO metadata (e.g. region, startURL),
+             * but the connection is not re-used directly. These do not persist across restarts.
+             * @param connection The AWS connection of the source extension that is intended to be shared with toolkit
+             */
+            declareConnection(conn: Pick<AwsConnection, 'startUrl' | 'ssoRegion'>, source: string) {
+                getLogger().debug(`declareConnection: extension ${extensionId}, connection starturl: ${conn.startUrl}`)
+                Auth.instance.declareConnectionFromApi(conn, source)
+            },
+
+            /**
+             * Undeclares a connection (e.g. logged out in the API caller). This will remove the
+             * connection's parameters (startURL, region) from the list of available logins.
+             * @param connId The connection id of a declared connection.
+             */
+            undeclareConnection(conn: Pick<AwsConnection, 'startUrl'>) {
+                getLogger().debug(`declareConnection: extension ${extensionId}, connection starturl: ${conn.startUrl}`)
+                Auth.instance.undeclareConnectionFromApi(conn)
+            },
+
+            /**
+             * Exposing deleteConnection API for other extension to push connection deletion event to AWS toolkit
+             * @param id The connection id of the to be deleted connection in aws toolkit
+             */
+            async deleteConnection(id: string): Promise<void> {
+                getLogger().debug(`deleteConnection: extension ${extensionId}, connection id ${id}`)
+                await Auth.instance.deleteConnection({ id })
+            },
+
+            /**
+             * Exposing onDidChangeConnection API for other extension to know when aws toolkit connection changed
+             * @param onConnectionStateChange The callback that toolkit invokes when toolkit connection state changes
+             * @param onConnectionDeletion The callback that toolkit invokes when toolkit connection is deleted.
+             */
+            async onDidChangeConnection(
+                onConnectionStateChange: (c: AwsConnection) => Promise<void>,
+                onConnectionDeletion: (id: string) => Promise<void>
+            ) {
+                getLogger().debug(`onDidChangeConnection: extension ${extensionId}`)
+                Auth.instance.onDidChangeConnectionState(async (e) => {
+                    const conn = await Auth.instance.getConnection({ id: e.id })
+                    if (conn && conn.type === 'sso') {
+                        await onConnectionStateChange({
+                            type: conn.type,
+                            ssoRegion: conn.ssoRegion,
+                            scopes: conn.scopes,
+                            startUrl: conn.startUrl,
+                            state: e.state,
+                            id: e.id,
+                            label: conn.label,
+                        } as AwsConnection)
+                    }
+                })
+                Auth.instance.onDidDeleteConnection(async (event) => {
+                    await onConnectionDeletion(event.connId)
+                })
+            },
+        }
+    },
+}
diff --git a/packages/toolkit/src/extensionNode.ts b/packages/toolkit/src/extensionNode.ts
new file mode 100644
index 00000000000..5d2abbfe078
--- /dev/null
+++ b/packages/toolkit/src/extensionNode.ts
@@ -0,0 +1,21 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type { ExtensionContext } from 'vscode'
+import { activate as activateCore, deactivate as deactivateCore } from 'aws-core-vscode/node'
+import { awsToolkitApi } from './api'
+import { Commands } from 'aws-core-vscode/shared'
+
+export async function activate(context: ExtensionContext) {
+    await activateCore(context)
+
+    // after toolkit is activated, ask Amazon Q to register toolkit api callbacks
+    await Commands.tryExecute('aws.amazonq.refreshConnectionCallback', awsToolkitApi)
+    return awsToolkitApi
+}
+
+export async function deactivate() {
+    await deactivateCore()
+}
diff --git a/packages/toolkit/src/extensionWeb.ts b/packages/toolkit/src/extensionWeb.ts
new file mode 100644
index 00000000000..cb792466824
--- /dev/null
+++ b/packages/toolkit/src/extensionWeb.ts
@@ -0,0 +1,15 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type { ExtensionContext } from 'vscode'
+import { activate as activateWeb, deactivate as deactivateWeb } from 'aws-core-vscode/web'
+
+export async function activate(context: ExtensionContext) {
+    return activateWeb(context)
+}
+
+export async function deactivate() {
+    await deactivateWeb()
+}
diff --git a/syntaxes/ASL.tmLanguage b/packages/toolkit/syntaxes/ASL.tmLanguage
similarity index 100%
rename from syntaxes/ASL.tmLanguage
rename to packages/toolkit/syntaxes/ASL.tmLanguage
diff --git a/syntaxes/SSMJSON.tmLanguage b/packages/toolkit/syntaxes/SSMJSON.tmLanguage
similarity index 100%
rename from syntaxes/SSMJSON.tmLanguage
rename to packages/toolkit/syntaxes/SSMJSON.tmLanguage
diff --git a/syntaxes/SSMYAML.tmLanguage b/packages/toolkit/syntaxes/SSMYAML.tmLanguage
similarity index 100%
rename from syntaxes/SSMYAML.tmLanguage
rename to packages/toolkit/syntaxes/SSMYAML.tmLanguage
diff --git a/syntaxes/asl-yaml.tmLanguage.json b/packages/toolkit/syntaxes/asl-yaml.tmLanguage.json
similarity index 100%
rename from syntaxes/asl-yaml.tmLanguage.json
rename to packages/toolkit/syntaxes/asl-yaml.tmLanguage.json
diff --git a/templates/CatchFailure.asl.json b/packages/toolkit/templates/CatchFailure.asl.json
similarity index 100%
rename from templates/CatchFailure.asl.json
rename to packages/toolkit/templates/CatchFailure.asl.json
diff --git a/templates/ChoiceState.asl.json b/packages/toolkit/templates/ChoiceState.asl.json
similarity index 100%
rename from templates/ChoiceState.asl.json
rename to packages/toolkit/templates/ChoiceState.asl.json
diff --git a/templates/HelloWorld.asl.json b/packages/toolkit/templates/HelloWorld.asl.json
similarity index 100%
rename from templates/HelloWorld.asl.json
rename to packages/toolkit/templates/HelloWorld.asl.json
diff --git a/templates/HelloWorldPowershell.ssm.yaml b/packages/toolkit/templates/HelloWorldPowershell.ssm.yaml
similarity index 100%
rename from templates/HelloWorldPowershell.ssm.yaml
rename to packages/toolkit/templates/HelloWorldPowershell.ssm.yaml
diff --git a/templates/HelloWorldPython.ssm.yaml b/packages/toolkit/templates/HelloWorldPython.ssm.yaml
similarity index 100%
rename from templates/HelloWorldPython.ssm.yaml
rename to packages/toolkit/templates/HelloWorldPython.ssm.yaml
diff --git a/templates/MapState.asl.json b/packages/toolkit/templates/MapState.asl.json
similarity index 100%
rename from templates/MapState.asl.json
rename to packages/toolkit/templates/MapState.asl.json
diff --git a/templates/Parallel.asl.json b/packages/toolkit/templates/Parallel.asl.json
similarity index 100%
rename from templates/Parallel.asl.json
rename to packages/toolkit/templates/Parallel.asl.json
diff --git a/templates/RetryFailure.asl.json b/packages/toolkit/templates/RetryFailure.asl.json
similarity index 100%
rename from templates/RetryFailure.asl.json
rename to packages/toolkit/templates/RetryFailure.asl.json
diff --git a/templates/WaitState.asl.json b/packages/toolkit/templates/WaitState.asl.json
similarity index 100%
rename from templates/WaitState.asl.json
rename to packages/toolkit/templates/WaitState.asl.json
diff --git a/packages/toolkit/test/e2e/index.ts b/packages/toolkit/test/e2e/index.ts
new file mode 100644
index 00000000000..e6c624889c6
--- /dev/null
+++ b/packages/toolkit/test/e2e/index.ts
@@ -0,0 +1,15 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { runTests } from 'aws-core-vscode/test'
+import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
+
+export function run(): Promise<void> {
+    return runTests(
+        process.env.TEST_DIR ?? ['test/e2e', '../../core/dist/src/testE2E'],
+        VSCODE_EXTENSION_ID.awstoolkit,
+        ['../../core/dist/src/testInteg/globalSetup.test.ts']
+    )
+}
diff --git a/packages/toolkit/test/integ/index.ts b/packages/toolkit/test/integ/index.ts
new file mode 100644
index 00000000000..1bad70fe545
--- /dev/null
+++ b/packages/toolkit/test/integ/index.ts
@@ -0,0 +1,15 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { runTests } from 'aws-core-vscode/test'
+import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
+
+export function run(): Promise<void> {
+    return runTests(
+        process.env.TEST_DIR ?? ['test/integ', '../../core/dist/src/testInteg'],
+        VSCODE_EXTENSION_ID.awstoolkit,
+        ['../../core/dist/src/testInteg/globalSetup.test.ts']
+    )
+}
diff --git a/packages/toolkit/test/unit/index.ts b/packages/toolkit/test/unit/index.ts
new file mode 100644
index 00000000000..998953c7fd4
--- /dev/null
+++ b/packages/toolkit/test/unit/index.ts
@@ -0,0 +1,13 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { runTests } from 'aws-core-vscode/test'
+import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
+
+export function run(): Promise<void> {
+    return runTests(process.env.TEST_DIR ?? ['test/unit', '../../core/dist/src/test'], VSCODE_EXTENSION_ID.awstoolkit, [
+        '../../core/dist/src/test/globalSetup.test.ts',
+    ])
+}
diff --git a/packages/toolkit/tsconfig.json b/packages/toolkit/tsconfig.json
new file mode 100644
index 00000000000..0aef63efe5a
--- /dev/null
+++ b/packages/toolkit/tsconfig.json
@@ -0,0 +1,10 @@
+{
+    "extends": "../tsconfig.packages.json",
+    "compilerOptions": {
+        "outDir": "dist",
+        "baseUrl": ".",
+        "rootDir": "."
+    },
+    "exclude": ["node_modules", ".vscode-test", "src/testFixtures", "dist"],
+    "noEmitOnError": false // allow emitting even with type errors
+}
diff --git a/packages/toolkit/webpack.config.js b/packages/toolkit/webpack.config.js
new file mode 100644
index 00000000000..ca78287ce7e
--- /dev/null
+++ b/packages/toolkit/webpack.config.js
@@ -0,0 +1,28 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+const path = require('path')
+const currentDir = process.cwd()
+
+const baseConfigFactory = require('../webpack.base.config')
+const baseWebConfigsFactory = require('../webpack.web.config')
+
+module.exports = (env, argv) => {
+    const config = {
+        ...baseConfigFactory(env, argv),
+        entry: {
+            'src/extensionNode': './src/extensionNode.ts',
+        },
+    }
+
+    const webConfig = {
+        ...baseWebConfigsFactory(env, argv),
+        entry: {
+            'src/extensionWeb': './src/extensionWeb.ts',
+        },
+    }
+
+    return [config, webConfig]
+}
diff --git a/packages/tsconfig.packages.json b/packages/tsconfig.packages.json
new file mode 100644
index 00000000000..95ff55262ef
--- /dev/null
+++ b/packages/tsconfig.packages.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "paths": {
+            "*": ["types/*"],
+            "@sinonjs/fake-timers": ["node_modules/@types/sinonjs__fake-timers"]
+        },
+        "incremental": true,
+        "module": "node16",
+        "target": "es2021",
+        "sourceMap": true,
+        "moduleResolution": "node16",
+        "resolveJsonModule": true,
+        "strict": true,
+        "noUnusedLocals": true,
+        "noImplicitOverride": true,
+        "lib": ["dom", "es2021"],
+        "skipLibCheck": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "preserve",
+        "esModuleInterop": true
+    }
+}
diff --git a/packages/webpack.base.config.js b/packages/webpack.base.config.js
new file mode 100644
index 00000000000..9f281a23cd0
--- /dev/null
+++ b/packages/webpack.base.config.js
@@ -0,0 +1,131 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// @ts-check
+
+'use strict'
+
+const path = require('path')
+const webpack = require('webpack')
+const { ESBuildMinifyPlugin } = require('esbuild-loader')
+const fs = require('fs')
+const { NLSBundlePlugin } = require('vscode-nls-dev/lib/webpack-bundler')
+const CircularDependencyPlugin = require('circular-dependency-plugin')
+
+// Webpack must run from subproject/package dir.
+const currentDir = process.cwd()
+const packageJsonFile = path.join(currentDir, 'package.json')
+const packageJson = JSON.parse(fs.readFileSync(packageJsonFile, 'utf8'))
+const packageId = `${packageJson.publisher}.${packageJson.name}`
+
+// @ts-check
+/** @typedef {import('webpack').Configuration} WebpackConfig **/
+
+module.exports = (env = {}, argv = {}) => {
+    const isDevelopment = argv.mode === 'development'
+    /** @type WebpackConfig */
+    const baseConfig = {
+        name: 'main',
+        target: 'node',
+        output: {
+            path: path.resolve(currentDir, 'dist'),
+            filename: '[name].js',
+            libraryTarget: 'commonjs2',
+        },
+        devtool: isDevelopment ? 'source-map' : undefined,
+        externals: {
+            vscode: 'commonjs vscode',
+            vue: 'root Vue',
+            tls: 'commonjs tls',
+        },
+        resolve: {
+            extensions: ['.ts', '.js'],
+            alias: {
+                // Forces webpack to resolve the `main` (cjs) entrypoint
+                //
+                // This is only necessary because of issues with transitive dependencies
+                // `umd-compat-loader` cannot handle ES2018 syntax which is used in later versions of `vscode-json-languageservice`
+                // But, for whatever reason, the ESM output is used if we don't explicitly set `mainFields` under webpack's `resolve`
+                '@aws/fully-qualified-names$': '@aws/fully-qualified-names/node/aws_fully_qualified_names.js',
+            },
+            fallback: {
+                /**
+                 * required by xml2js otherwise we get:
+                 * BREAKING CHANGE: webpack < 5 used to include polyfills for node.js core modules by default.
+                 * This is no longer the case. Verify if you need this module and configure a polyfill for it.
+                 */
+                timers: false,
+            },
+        },
+        node: {
+            __dirname: false, // preserve the default node.js behavior for __dirname
+        },
+        module: {
+            rules: [
+                {
+                    test: /\.ts$/,
+                    exclude: /node_modules|testFixtures/,
+                    use: [
+                        // This creates nls-metadata.json in dist/, but we don't need this functionality currently.
+                        // If we want to have language locale support later we should look to re-enable this.
+                        // This was disabled since it caused issues with the browser version of the toolkit.
+                        // THe localize() func does not work in the browser when used this loader, we got
+                        // the error from
+                        // https://github.com/microsoft/vscode-nls/blob/6f88c23c3ab630e9d4c60f65ed33839bd4a0cec2/src/browser/main.ts#L15
+                        // Now, with this disabled we do not create externalized strings.
+                        // {
+                        //     loader: require.resolve('vscode-nls-dev/lib/webpack-loader'),
+                        //     options: {
+                        //         base: path.join(__dirname, 'src'),
+                        //     },
+                        // },
+                        {
+                            // This transpiles our typescript to javascript.
+                            loader: 'esbuild-loader',
+                            options: {
+                                loader: 'ts',
+                                target: 'es2021',
+                            },
+                        },
+                    ],
+                },
+                {
+                    test: /node_modules[\\|/](amazon-states-language-service|vscode-json-languageservice)/,
+                    use: { loader: 'umd-compat-loader' },
+                },
+            ],
+        },
+        plugins: [
+            new NLSBundlePlugin(packageId),
+            new webpack.DefinePlugin({
+                EXTENSION_VERSION: JSON.stringify(packageJson.version),
+            }),
+            new webpack.DefinePlugin({
+                __VUE_OPTIONS_API__: 'true',
+                __VUE_PROD_DEVTOOLS__: 'false',
+            }),
+            new CircularDependencyPlugin({
+                exclude: /node_modules|testFixtures/,
+                failOnError: true,
+            }),
+        ],
+        optimization: {
+            minimize: !isDevelopment,
+            minimizer: [
+                new ESBuildMinifyPlugin({
+                    target: 'es2021',
+                    // Are these enabled by default?
+                    // minify: true,
+                    // treeShaking: true,
+
+                    // De-duplicate license headers and list them at end of file.
+                    legalComments: 'eof',
+                    // sourcemap: 'external',
+                }),
+            ],
+        },
+    }
+    return baseConfig
+}
diff --git a/packages/webpack.vue.config.js b/packages/webpack.vue.config.js
new file mode 100644
index 00000000000..1ca91ceed4d
--- /dev/null
+++ b/packages/webpack.vue.config.js
@@ -0,0 +1,100 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// @ts-check
+
+'use strict'
+
+const path = require('path')
+const glob = require('glob')
+const { VueLoaderPlugin } = require('vue-loader')
+const baseConfigFactory = require('./webpack.base.config')
+const { merge } = require('webpack-merge')
+const currentDir = process.cwd()
+
+// @ts-check
+/** @typedef {import('webpack').Configuration} WebpackConfig **/
+
+/**
+ * Renames all Vue entry files to be `index`, located within the same directory.
+ * Example: `src/lambda/vue/index.ts` -> `dist/src/lambda/vue/index.js`
+ * @param {string} file
+ */
+const createVueBundleName = (file) => {
+    return path.relative(currentDir, file).split('.').slice(0, -1).join(path.sep)
+}
+
+/**
+ * Generates Vue entry points if the filename is matches `targetPattern` (default: index.ts)
+ * and is under a `vue` directory.
+ */
+const createVueEntries = (targetPattern = 'index.ts') => {
+    return glob
+        .sync(path.resolve(currentDir, 'src', '**', 'vue', '**', targetPattern).replace(/\\/g, '/'))
+        .map((f) => ({ name: createVueBundleName(f), path: f }))
+        .reduce((a, b) => ((a[b.name] = b.path), a), {})
+}
+
+module.exports = (env, argv) => {
+    const isDevelopment = argv.mode === 'development'
+    const baseConfig = baseConfigFactory(env, argv)
+
+    /** @type WebpackConfig */
+    let config = merge(baseConfig, {
+        name: 'vue',
+        target: 'web',
+        output: {
+            // IMPORTANT: This path influences `VueWebview.constructor` as it updates `VueWebview.source` paths relative to this
+            path: path.resolve(currentDir, 'dist', 'vue'),
+            libraryTarget: 'this',
+        },
+        module: {
+            rules: [
+                {
+                    test: /\.vue$/,
+                    loader: 'vue-loader',
+                },
+                {
+                    test: /\.css$/,
+                    use: ['vue-style-loader', 'css-loader'],
+                },
+                {
+                    test: /\.(png|jpg|gif|svg)$/,
+                    use: 'file-loader',
+                },
+                // sass loaders for Mynah
+                { test: /\.scss$/, use: ['style-loader', 'css-loader', 'sass-loader'] },
+            ],
+        },
+        plugins: [new VueLoaderPlugin()],
+    })
+
+    if (isDevelopment) {
+        // add development specific vue config settings
+        config = {
+            ...config,
+            devServer: {
+                static: {
+                    directory: path.resolve(currentDir, 'dist'),
+                },
+                headers: {
+                    'Access-Control-Allow-Origin': '*',
+                },
+                // This is not ideal, but since we're only running the server locally it's not too bad
+                // The webview debugger tries to establish a websocket with a GUID as its origin, so not much of a workaround
+                allowedHosts: 'all',
+            },
+            // Normally we want to exclude Vue from the bundle, but for hot reloads we need it
+            externals: {
+                vscode: 'commonjs vscode',
+            },
+        }
+    }
+
+    return {
+        config,
+        createVueEntries,
+    }
+}
diff --git a/packages/webpack.web.config.js b/packages/webpack.web.config.js
new file mode 100644
index 00000000000..4495088a773
--- /dev/null
+++ b/packages/webpack.web.config.js
@@ -0,0 +1,91 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Notes:
+ *
+ * Followed guide from: https://code.visualstudio.com/api/extension-guides/web-extensions#webpack-configuration
+ *
+ */
+const webpack = require('webpack')
+const { merge } = require('webpack-merge')
+const baseConfigFactory = require('./webpack.base.config')
+
+module.exports = (env, argv) => {
+    const baseConfig = baseConfigFactory(env, argv)
+    const isDevelopment = argv.mode === 'development'
+
+    /** @type WebpackConfig */
+    const config = merge(baseConfig, {
+        name: 'webBase',
+        target: 'webworker',
+        devtool: isDevelopment ? 'inline-source-map' : undefined,
+        plugins: [
+            new webpack.optimize.LimitChunkCountPlugin({
+                maxChunks: 1, // disable chunks by default since web extensions must be a single bundle
+            }),
+            // some modules are provided globally and dont require an explicit import,
+            // so we need to polyfill them using this method
+            new webpack.ProvidePlugin({
+                process: require.resolve('process/browser'),
+                Buffer: ['buffer', 'Buffer'],
+            }),
+            new webpack.EnvironmentPlugin({
+                NODE_DEBUG: 'development',
+                READABLE_STREAM: 'disable',
+            }),
+            /**
+             * HACK: the HttpResourceFetcher breaks Web mode if imported, BUT we still dynamically import this module for non web mode
+             * environments. The following allows compilation to pass in Web mode by never bundling the module in the final output for web mode.
+             */
+            new webpack.IgnorePlugin({
+                resourceRegExp: /node\/httpResourceFetcher/, // matches the path in the require() statement
+            }),
+            /**
+             * HACK: the ps-list module breaks Web mode if imported, BUT we still dynamically import this module for non web mode
+             * environments. The following allows compilation to pass by never bundling the module in the final output for web mode.
+             */
+            new webpack.IgnorePlugin({
+                resourceRegExp: /ps-list/, // matches the path in the require() statement
+            }),
+            new webpack.IgnorePlugin({
+                resourceRegExp: /svgdom/, // matches the path in the require() statement
+            }),
+        ],
+        resolve: {
+            extensions: ['.ts', '.js'],
+            fallback: {
+                stream: require.resolve('stream-browserify'),
+                os: require.resolve('os-browserify/browser'),
+                path: require.resolve('path-browserify'),
+                assert: require.resolve('assert'),
+                fs: false,
+                crypto: require.resolve('crypto-browserify'),
+                'fs-extra': false,
+                perf_hooks: false, // should be using globalThis.performance instead
+
+                // *** If one of these modules actually gets used an error will be raised ***
+                // You may see something like: "TypeError: path_ignored_0.join is not a function"
+
+                // We don't need these yet, but as we start enabling functionality in the web
+                // we may need to polyfill.
+                http: false, // http: require.resolve('stream-http'),
+                https: false, // https: require.resolve('https-browserify'),
+                zlib: false, // zlib: require.resolve('browserify-zlib'),
+                constants: false, // constants: require.resolve('constants-browserify'),
+                // These do not have a straight forward replacement
+                child_process: false, // Reason for error: 'TypeError: The "original" argument must be of type Function'
+                async_hooks: false,
+                net: false,
+            },
+        },
+        optimization: {
+            // If `true` then we will get confusing variable names in the debugging menu
+            minimize: !isDevelopment,
+        },
+    })
+
+    return config
+}
diff --git a/plugins/eslint-plugin-aws-toolkits/index.ts b/plugins/eslint-plugin-aws-toolkits/index.ts
new file mode 100644
index 00000000000..88afc893348
--- /dev/null
+++ b/plugins/eslint-plugin-aws-toolkits/index.ts
@@ -0,0 +1,28 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import NoAwaitOnVscodeMsg from './lib/rules/no-await-on-vscode-msg'
+import NoBannedUsages from './lib/rules/no-banned-usages'
+import NoIncorrectOnceUsage from './lib/rules/no-incorrect-once-usage'
+import NoOnlyInTests from './lib/rules/no-only-in-tests'
+import NoStringExecForChildProcess from './lib/rules/no-string-exec-for-child-process'
+import NoConsoleLog from './lib/rules/no-console-log'
+import noJsonStringifyInLog from './lib/rules/no-json-stringify-in-log'
+import noPrintfMismatch from './lib/rules/no-printf-mismatch'
+import noIndexImport from './lib/rules/no-index-import'
+
+const rules = {
+    'no-await-on-vscode-msg': NoAwaitOnVscodeMsg,
+    'no-banned-usages': NoBannedUsages,
+    'no-incorrect-once-usage': NoIncorrectOnceUsage,
+    'no-only-in-tests': NoOnlyInTests,
+    'no-string-exec-for-child-process': NoStringExecForChildProcess,
+    'no-console-log': NoConsoleLog,
+    'no-json-stringify-in-log': noJsonStringifyInLog,
+    'no-printf-mismatch': noPrintfMismatch,
+    'no-index-import': noIndexImport,
+}
+
+export { rules }
diff --git a/plugins/eslint-plugin-aws-toolkits/lib/rules/no-await-on-vscode-msg.ts b/plugins/eslint-plugin-aws-toolkits/lib/rules/no-await-on-vscode-msg.ts
new file mode 100644
index 00000000000..aaccbf00206
--- /dev/null
+++ b/plugins/eslint-plugin-aws-toolkits/lib/rules/no-await-on-vscode-msg.ts
@@ -0,0 +1,88 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Showing vscode notifications is an async process. If we await on a notification, then we are
+ * telling VSCode that we need a response from the user to continue the codepath. Not all
+ * notifications require user input, so a user may ignore one indefinitely, blocking the codepath.
+ * Awaiting without assigning or otherwise using the response could keep code blocked and cause subtle issues.
+ */
+
+import { ESLintUtils, TSESTree } from '@typescript-eslint/utils'
+import { AST_NODE_TYPES } from '@typescript-eslint/types'
+import { Rule } from 'eslint'
+
+export const errMsg =
+    'cannot await on vscode window messages unless the response is assigned; use `void`, assign to a response variable, or add a .then callback'
+
+const notificationFuncNames = ['showInformationMessage', 'showWarningMessage', 'showErrorMessage']
+
+function isVariableAssignment(node: TSESTree.Node) {
+    while (node.parent) {
+        if (node.parent.type === AST_NODE_TYPES.VariableDeclarator) {
+            return true // we are assigning the response, i.e. its being used.
+        } else if (node.parent.type === AST_NODE_TYPES.ConditionalExpression) {
+            node = node.parent
+        } else {
+            return false
+        }
+    }
+    return false
+}
+
+export default ESLintUtils.RuleCreator.withoutDocs({
+    meta: {
+        docs: {
+            description: 'disallow awaiting on vscode notifications if the response is unused',
+            recommended: 'recommended',
+        },
+        messages: {
+            errMsg,
+        },
+        type: 'problem',
+        fixable: 'code',
+        schema: [],
+    },
+    defaultOptions: [],
+    create(context) {
+        return {
+            AwaitExpression(node) {
+                if (isVariableAssignment(node)) {
+                    // we are assigning the response, i.e. its being used.
+                    return
+                }
+
+                if (node.parent?.type === AST_NODE_TYPES.IfStatement) {
+                    return // we are in an if statement, so we are probably expecting a response
+                }
+
+                if (node.argument.type !== AST_NODE_TYPES.CallExpression) {
+                    return
+                }
+
+                const expr = node.argument.callee
+                let property
+                if (expr.type === AST_NODE_TYPES.MemberExpression) {
+                    property = expr.property as TSESTree.Identifier
+                } else if (expr.type === AST_NODE_TYPES.Identifier) {
+                    property = expr as TSESTree.Identifier
+                } else {
+                    return
+                }
+
+                if (property.name === 'then') {
+                    return // we are using the response in a callback, but waiting on it.
+                }
+
+                if (notificationFuncNames.includes(property.name)) {
+                    return context.report({
+                        node,
+                        messageId: 'errMsg',
+                    })
+                }
+            },
+        }
+    },
+}) as unknown as Rule.RuleModule
diff --git a/plugins/eslint-plugin-aws-toolkits/lib/rules/no-banned-usages.ts b/plugins/eslint-plugin-aws-toolkits/lib/rules/no-banned-usages.ts
new file mode 100644
index 00000000000..2265012f99c
--- /dev/null
+++ b/plugins/eslint-plugin-aws-toolkits/lib/rules/no-banned-usages.ts
@@ -0,0 +1,99 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ESLintUtils, TSESTree } from '@typescript-eslint/utils'
+import { AST_NODE_TYPES } from '@typescript-eslint/types'
+import { Rule } from 'eslint'
+// import * as util from 'util'
+
+export const errMsgs = {
+    setContext: 'Use `shared/vscode/setContext.ts`, do not use `executeCommand("setContext")` directly',
+    globalState: 'Use `globals.globalState`, do not use `ExtensionContext.globalState` directly or indirectly',
+}
+
+/**
+ * Each key is the member name, value is its expected container name.
+ */
+const memberContainers: Record<string, string> = {
+    // Disallow accesses like `extContext.globalState` and `globals.context.globalState`.
+    // Preferred usage is exactly: `globals.globalState`.
+    globalState: 'globals',
+}
+
+/**
+ * Prevents use of banned APIs:
+ *
+ * - vscode.commands.executeCommand('setContext', …)
+ */
+export default ESLintUtils.RuleCreator.withoutDocs({
+    meta: {
+        docs: {
+            description: 'disallow use of banned APIs',
+            recommended: 'recommended',
+        },
+        messages: errMsgs,
+        type: 'problem',
+        fixable: 'code',
+        schema: [],
+    },
+    defaultOptions: [],
+    create(context) {
+        return {
+            MemberExpression(node: TSESTree.MemberExpression) {
+                const o = node.object
+                const p = node.property
+                // Disallow accesses like: `banned1.member`.
+                if (
+                    o.type === AST_NODE_TYPES.Identifier &&
+                    p.type === AST_NODE_TYPES.Identifier &&
+                    typeof memberContainers[p.name] === 'string' &&
+                    o.name !== memberContainers[p.name]
+                ) {
+                    return context.report({
+                        node,
+                        messageId: p.name as any,
+                    })
+                }
+
+                // Disallow accesses like: `banned1.banned2.member`.
+                if (
+                    o.type === AST_NODE_TYPES.MemberExpression &&
+                    o.object.type === AST_NODE_TYPES.Identifier &&
+                    p.type === AST_NODE_TYPES.Identifier &&
+                    typeof memberContainers[p.name] === 'string' &&
+                    o.property.type === AST_NODE_TYPES.Identifier &&
+                    o.property.name !== memberContainers[p.name]
+                ) {
+                    return context.report({
+                        node,
+                        messageId: p.name as any,
+                    })
+                }
+            },
+            CallExpression(node) {
+                if (
+                    node.callee.type !== AST_NODE_TYPES.MemberExpression ||
+                    node.callee.property.type !== AST_NODE_TYPES.Identifier ||
+                    node.callee.parent.type !== AST_NODE_TYPES.CallExpression
+                ) {
+                    return
+                }
+
+                const args = node.callee.parent.arguments
+
+                if (args[0]?.type !== AST_NODE_TYPES.Literal) {
+                    return
+                }
+
+                if (node.callee.property.name === 'executeCommand' && args[0].value === 'setContext') {
+                    return context.report({
+                        node,
+                        messageId: 'setContext',
+                    })
+                }
+            },
+        }
+    },
+}) as unknown as Rule.RuleModule
diff --git a/plugins/eslint-plugin-aws-toolkits/lib/rules/no-console-log.ts b/plugins/eslint-plugin-aws-toolkits/lib/rules/no-console-log.ts
new file mode 100644
index 00000000000..b549376159a
--- /dev/null
+++ b/plugins/eslint-plugin-aws-toolkits/lib/rules/no-console-log.ts
@@ -0,0 +1,61 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Enforce usage of our getLogger() function instead of using node's built in console.log() and similar.
+ * An eslint rule already exists for this (https://eslint.org/docs/latest/rules/no-console), but this
+ * rule is trivial to implement and we can add our own error message, so here it is.
+ */
+
+import { ESLintUtils, TSESTree } from '@typescript-eslint/utils'
+import { AST_NODE_TYPES } from '@typescript-eslint/types'
+import { Rule } from 'eslint'
+
+export const errMsg =
+    'do not use console.log, console.warn, or console.err, or similar; instead, use `getLogger().info`, `getLogger().warn`, etc; disable this rule for files that cannot import getLogger()'
+
+const disallowFunctions = new Set(['info', 'debug', 'error', 'warn', 'log'])
+
+export default ESLintUtils.RuleCreator.withoutDocs({
+    meta: {
+        docs: {
+            description: 'disallow use of console.log() to encourage use of getLogger()',
+            recommended: 'recommended',
+        },
+        messages: {
+            errMsg,
+        },
+        type: 'problem',
+        fixable: 'code',
+        schema: [],
+    },
+    defaultOptions: [],
+    create(context) {
+        return {
+            MemberExpression(node: TSESTree.MemberExpression) {
+                // Exception for anything that isn't extension code (in a src/ folder) (e.g. build scripts, tests)
+                if (context.physicalFilename.includes('test') || !context.physicalFilename.includes('src')) {
+                    return
+                }
+
+                // Validate this node
+                if (
+                    node.object.type !== AST_NODE_TYPES.Identifier ||
+                    node.object.name !== 'console' ||
+                    node.property.type !== AST_NODE_TYPES.Identifier
+                ) {
+                    return
+                }
+
+                if (disallowFunctions.has(node.property.name)) {
+                    return context.report({
+                        node,
+                        messageId: 'errMsg',
+                    })
+                }
+            },
+        }
+    },
+}) as unknown as Rule.RuleModule
diff --git a/plugins/eslint-plugin-aws-toolkits/lib/rules/no-incorrect-once-usage.ts b/plugins/eslint-plugin-aws-toolkits/lib/rules/no-incorrect-once-usage.ts
new file mode 100644
index 00000000000..a41dfd784fa
--- /dev/null
+++ b/plugins/eslint-plugin-aws-toolkits/lib/rules/no-incorrect-once-usage.ts
@@ -0,0 +1,173 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * This rule aims to prevent developers from misusing the once() util function. It is possible
+ * that they intended for code to run only once, but due to certain usage patterns it is actually
+ * executed many times due to the nature of the once() function.
+ *
+ * NOTE: This problem is not trivial and there may be false positives/negatives. It may not be
+ * complete. We can ignore the rule and amend this function if edge cases are found. As of this
+ * writing it correctly identified all known good and bad cases in the codebase.
+ *
+ * Details:
+ * once() is a commonly used util function defined in src/shared/utilities/functionUtils.ts.
+ * It works by accepting a function as input, and returns a new function that can only ever be
+ * executed one time. This "one time use" only applies to that specific instance of once, so if
+ * the instance is not re-used, then once() serves no purpose. Examples:
+ *
+ * ```
+ * function log() {
+ *     const logOnce = once(() => console.log('hello'))
+ *     logOnce()
+ * }
+ * log()
+ * log()
+ * ```
+ *
+ * This prints 'hello' multiple times.
+ *
+ * The correct usage is:
+ * ```
+ * let logOnce
+ * function log() {
+ *     logOnce ?= once(() => console.log('hello'))
+ *     logOnce()
+ * }
+ * log()
+ * log()
+ * ```
+ *
+ * This prints 'hello' only one time.
+ *
+ * This rule will try to detect when once() has been used in a way that could make the
+ * developer think the code will only run once, but in reality will run each time since a new
+ * once() instance is being created each time.
+ */
+
+import { ESLintUtils, TSESTree } from '@typescript-eslint/utils'
+import { AST_NODE_TYPES } from '@typescript-eslint/types'
+import { Rule } from 'eslint'
+
+export const oneOffErr =
+    '`once()` is being called immediately after it returns, which will make a new `once` instance each time. This means the passed function can effectively run many times. Remove once or assign to a higher level-variable that can be re-used.'
+export const notAssignedErr =
+    '`once()` is not being assigned, so it cannot be re-used. This may result in the inner function being called multiple times.'
+export const notReusableErr =
+    '`once()` does not appear to be used in a re-usable context, e.g. a nested loop scope, object property assignment, top-level declaration, or literally only called a single time. If it is not re-usable, then once() serves no purpose. (If this error seems incorrect, disable with // eslint-disable-line)'
+
+export default ESLintUtils.RuleCreator.withoutDocs({
+    meta: {
+        docs: {
+            description: 'disallow usages of once() where the function can be called multiple times',
+            recommended: 'recommended',
+        },
+        messages: {
+            oneOffErr,
+            notAssignedErr,
+            notReusableErr,
+        },
+        type: 'problem',
+        fixable: 'code',
+        schema: [],
+    },
+    defaultOptions: [],
+    create(context) {
+        return {
+            // Check for calls of once (e.g. once()()) and assignment of once (e.g. const x = once())
+            CallExpression(node) {
+                if (
+                    node.callee.type !== AST_NODE_TYPES.Identifier || // check for any func()
+                    node.callee.name !== 'once' // check for once() and not myFunc()
+                ) {
+                    return
+                }
+
+                // Check for once()()
+                if (node.parent?.type === AST_NODE_TYPES.CallExpression) {
+                    return context.report({
+                        node: node.parent,
+                        messageId: 'oneOffErr',
+                    })
+                }
+
+                // Check for cases where we don't assign once() to anything.
+                if (
+                    node.parent?.type !== AST_NODE_TYPES.VariableDeclarator &&
+                    node.parent?.type !== AST_NODE_TYPES.AssignmentExpression &&
+                    node.parent?.type !== AST_NODE_TYPES.PropertyDefinition
+                ) {
+                    return context.report({
+                        node: node,
+                        messageId: 'notAssignedErr',
+                    })
+                }
+            },
+            // Check that assignments of once() are valid, e.g. re-usable in other scopes.
+            VariableDeclaration(node) {
+                // Top-level module assignment is ok
+                if (
+                    node.parent?.type === AST_NODE_TYPES.Program ||
+                    node.parent?.type === AST_NODE_TYPES.ExportNamedDeclaration
+                ) {
+                    return
+                }
+
+                for (const declaration of node.declarations) {
+                    if (
+                        declaration.init?.type === AST_NODE_TYPES.CallExpression &&
+                        declaration.id.type === AST_NODE_TYPES.Identifier &&
+                        declaration.init.callee?.type === AST_NODE_TYPES.Identifier &&
+                        declaration.init.callee.name === 'once'
+                    ) {
+                        const scope = context.sourceCode.getScope(declaration)
+                        const variable = scope.variables.find(
+                            (v) => v.name === (declaration.id as TSESTree.Identifier).name
+                        ) // we already confirmed the type in the if statement... why is TS mad?
+                        let isUsedInLoopScope = false
+
+                        if (variable) {
+                            const refs = variable.references.filter((ref) => ref.identifier !== declaration.id)
+
+                            // Check if it is being referenced multiple times
+                            // TODO: expand to check if it is being referenced inside nested scopes only? (currently checks current scope as well)
+                            if (refs.length > 1) {
+                                continue
+                            }
+
+                            // Check if it is being referenced once, but inside a loop.
+                            for (const ref of refs) {
+                                let currNode: TSESTree.Node | undefined = ref.identifier
+
+                                while (currNode && currNode !== scope.block) {
+                                    if (
+                                        currNode.type === AST_NODE_TYPES.ForStatement ||
+                                        currNode.type === AST_NODE_TYPES.ForInStatement ||
+                                        currNode.type === AST_NODE_TYPES.ForOfStatement ||
+                                        currNode.type === AST_NODE_TYPES.WhileStatement ||
+                                        currNode.type === AST_NODE_TYPES.DoWhileStatement
+                                    ) {
+                                        isUsedInLoopScope = true
+                                        break
+                                    }
+                                    currNode = currNode.parent
+                                }
+                            }
+                        }
+
+                        // If the variable is somehow not assigned? or only used once and not in a loop.
+                        if (variable === undefined || !isUsedInLoopScope) {
+                            context.report({
+                                node: declaration.init.callee,
+                                messageId: 'notReusableErr',
+                            })
+                            continue
+                        }
+                    }
+                }
+            },
+        }
+    },
+}) as unknown as Rule.RuleModule
diff --git a/plugins/eslint-plugin-aws-toolkits/lib/rules/no-index-import.ts b/plugins/eslint-plugin-aws-toolkits/lib/rules/no-index-import.ts
new file mode 100644
index 00000000000..caebd59e803
--- /dev/null
+++ b/plugins/eslint-plugin-aws-toolkits/lib/rules/no-index-import.ts
@@ -0,0 +1,95 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ESLintUtils, TSESTree } from '@typescript-eslint/utils'
+import { Rule } from 'eslint'
+import path from 'path'
+// eslint-disable-next-line no-restricted-imports
+import * as fs from 'fs'
+
+export const errMsg =
+    'do not import from folders or index.ts files since it can cause circular dependencies. import from the file directly.'
+
+/**
+ * Prevents TS imports from index.ts in packages/core/src (test files ignored).
+ * It is easy to create cryptic circular dependency issues in packages/core due to the current import/export structure.
+ *
+ * Example:
+ * - index.ts
+ *     export Auth from './auth'
+ *     export Connection from './connection'
+ * - auth.ts
+ *     export class Auth
+ * - connection.ts
+ *     import { Auth } from '.'                // circular dependency
+ *     export type Connection
+ *
+ * This is a problem because connection.ts depends on index.ts to export 'Auth', which depends on connection.ts
+ * to export `Connection`.
+ */
+export default ESLintUtils.RuleCreator.withoutDocs({
+    meta: {
+        docs: {
+            description: 'disallow importing from index.ts files in packages/core/src/',
+            recommended: 'recommended',
+        },
+        messages: {
+            default: errMsg,
+        },
+        type: 'problem',
+        fixable: 'code',
+        schema: [],
+    },
+    defaultOptions: [],
+    create(context) {
+        const filePath = context.physicalFilename
+        if (!filePath.match(/packages\/core\/src\/(?!test)/)) {
+            // only trigger for import statements inside packages/core/ src files,
+            // but don't include test files
+            return {}
+        }
+
+        return {
+            ImportDeclaration(node: TSESTree.ImportDeclaration) {
+                const relativeImportPath = node.source.value
+
+                // likely importing from some external module or is an irrelevant file
+                if (
+                    !relativeImportPath.startsWith('.') ||
+                    ['.json', '.js', '.vue'].includes(path.extname(relativeImportPath))
+                ) {
+                    return
+                }
+
+                const absoluteImportPath = path
+                    .resolve(path.dirname(filePath), relativeImportPath)
+                    .replace(/(\.d)?\.ts/, '') // remove any .d.ts or .ts file extensions on the import (unlikely)
+
+                if (path.basename(absoluteImportPath) !== 'index') {
+                    // Not an index.ts file but is some typescript file.
+                    if (['.ts', '.d.ts'].some((e) => fs.existsSync(absoluteImportPath + e))) {
+                        return
+                    }
+
+                    // If it does not exist as a folder, then the path is simply wrong. Another, more descriptive error will surface instead.
+                    if (!fs.existsSync(absoluteImportPath)) {
+                        return
+                    }
+                }
+
+                return context.report({
+                    node: node.source,
+                    messageId: 'default',
+                    // TODO: We can add a fixer to resolve the import for us.
+                    // fix: (fixer) => {
+                    //     // somehow parse the exports of the imported index.ts file to get the actual export path,
+                    //     // then replace the index import with it.
+                    //     return fixer.replaceText(node.source, newImport)
+                    // },
+                })
+            },
+        }
+    },
+}) as unknown as Rule.RuleModule
diff --git a/plugins/eslint-plugin-aws-toolkits/lib/rules/no-json-stringify-in-log.ts b/plugins/eslint-plugin-aws-toolkits/lib/rules/no-json-stringify-in-log.ts
new file mode 100644
index 00000000000..87f183b4b3d
--- /dev/null
+++ b/plugins/eslint-plugin-aws-toolkits/lib/rules/no-json-stringify-in-log.ts
@@ -0,0 +1,101 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { AST_NODE_TYPES, ESLintUtils, TSESTree } from '@typescript-eslint/utils'
+import { Rule } from 'eslint'
+
+export const errMsg =
+    'Avoid using JSON.stringify within logging and error messages, prefer %O in general or inspect from collectionUtils for custom depth formatting'
+
+/**
+ * Check if a given expression is a JSON.stringify call.
+ */
+function isJsonStringifyCall(node: TSESTree.CallExpressionArgument): boolean {
+    return (
+        node.type === AST_NODE_TYPES.CallExpression &&
+        node.callee.type === AST_NODE_TYPES.MemberExpression &&
+        node.callee.object.type === AST_NODE_TYPES.Identifier &&
+        node.callee.object.name === 'JSON' &&
+        node.callee.property.type === AST_NODE_TYPES.Identifier &&
+        node.callee.property.name === 'stringify'
+    )
+}
+
+function isTemplateWithStringifyCall(node: TSESTree.CallExpressionArgument): boolean {
+    return (
+        node.type === AST_NODE_TYPES.TemplateLiteral &&
+        node.expressions.some((e: TSESTree.Expression) => isJsonStringifyCall(e))
+    )
+}
+
+/**
+ * Check if node is representing syntax of the form getLogger().f(msg) for some f and msg or
+ * if it is doing so indirectly via a logger variable.
+ */
+export function isLoggerCall(node: TSESTree.CallExpression): boolean {
+    return (
+        node.callee.type === AST_NODE_TYPES.MemberExpression &&
+        (isGetLoggerCall(node.callee.object) || isDisguisedGetLoggerCall(node.callee.object)) &&
+        node.callee.property.type === AST_NODE_TYPES.Identifier &&
+        ['debug', 'verbose', 'info', 'warn', 'error'].includes(node.callee.property.name)
+    )
+}
+
+function isGetLoggerCall(node: TSESTree.Expression): boolean {
+    return (
+        node.type === AST_NODE_TYPES.CallExpression &&
+        node.callee.type === AST_NODE_TYPES.Identifier &&
+        node.callee.name === 'getLogger'
+    )
+}
+
+/**
+ * Use two simple heuristics to detect `disguised` logger calls. This is when we log without getLogger in the same statement.
+ * Ex.
+ *      const logger = getLogger()
+ *      logger.debug(m)
+ * To catch these we try two checks:
+ *  1) If the left side is an identifier including the word logger
+ *  2) If the left side is a property of some object, including the word logger.
+ */
+function isDisguisedGetLoggerCall(node: TSESTree.Expression): boolean {
+    return (
+        (node.type === AST_NODE_TYPES.Identifier && node.name.toLowerCase().includes('logger')) ||
+        (node.type === AST_NODE_TYPES.MemberExpression &&
+            node.property.type === AST_NODE_TYPES.Identifier &&
+            node.property.name.toLowerCase().includes('logger'))
+    )
+}
+
+export default ESLintUtils.RuleCreator.withoutDocs({
+    meta: {
+        docs: {
+            description: 'disallow use of JSON.stringify in logs and errors, to encourage use %O',
+            recommended: 'recommended',
+        },
+        messages: {
+            errMsg,
+        },
+        type: 'problem',
+        fixable: 'code',
+        schema: [],
+    },
+    defaultOptions: [],
+    create(context) {
+        return {
+            CallExpression(node: TSESTree.CallExpression) {
+                if (
+                    isLoggerCall(node) &&
+                    node.arguments.some((arg) => isJsonStringifyCall(arg) || isTemplateWithStringifyCall(arg))
+                ) {
+                    return context.report({
+                        node: node,
+                        messageId: 'errMsg',
+                    })
+                }
+            },
+        }
+    },
+}) as unknown as Rule.RuleModule
diff --git a/plugins/eslint-plugin-aws-toolkits/lib/rules/no-only-in-tests.ts b/plugins/eslint-plugin-aws-toolkits/lib/rules/no-only-in-tests.ts
new file mode 100644
index 00000000000..8376ac507a5
--- /dev/null
+++ b/plugins/eslint-plugin-aws-toolkits/lib/rules/no-only-in-tests.ts
@@ -0,0 +1,69 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * .only() can be important during testing to test a specific feature/unit test.
+ * This rule prevents us from accidentially committing this to the public repo.
+ */
+
+import { ESLintUtils, TSESTree } from '@typescript-eslint/utils'
+import { AST_NODE_TYPES } from '@typescript-eslint/types'
+import { Rule } from 'eslint'
+
+function isValidExpression(node: TSESTree.CallExpression): TSESTree.MemberExpression | undefined {
+    const isValid =
+        node.callee.type === AST_NODE_TYPES.MemberExpression &&
+        node.callee.object.type === AST_NODE_TYPES.Identifier &&
+        node.callee.property.type === AST_NODE_TYPES.Identifier
+
+    return isValid ? (node.callee as TSESTree.MemberExpression) : undefined
+}
+
+export const describeOnlyErrMsg = 'mocha test `.only()` not allowed for `describe`'
+export const itOnlyErrMsg = 'mocha test `.only()` not allowed for `it`'
+
+export default ESLintUtils.RuleCreator.withoutDocs({
+    meta: {
+        docs: {
+            description: "disallow mocha's only() from being published in test code",
+            recommended: 'recommended',
+        },
+        messages: {
+            describeOnlyErrMsg,
+            itOnlyErrMsg,
+        },
+        type: 'problem',
+        fixable: 'code',
+        schema: [],
+    },
+    defaultOptions: [],
+    create(context) {
+        return {
+            CallExpression(node) {
+                if (!isValidExpression(node)) {
+                    return
+                }
+                const expr = node.callee as TSESTree.MemberExpression
+                const property = expr.property as TSESTree.Identifier
+                const object = expr.object as TSESTree.Identifier
+
+                if (property.name !== 'only') {
+                    return
+                }
+
+                if (object.name === 'describe' || object.name === 'it') {
+                    return context.report({
+                        node: node.callee,
+                        messageId: `${object.name}OnlyErrMsg`,
+                        fix: (fixer) => {
+                            // Range - 1 removes the period in `it.only()`
+                            return fixer.removeRange([property.range[0] - 1, property.range[1]])
+                        },
+                    })
+                }
+            },
+        }
+    },
+}) as unknown as Rule.RuleModule
diff --git a/plugins/eslint-plugin-aws-toolkits/lib/rules/no-printf-mismatch.ts b/plugins/eslint-plugin-aws-toolkits/lib/rules/no-printf-mismatch.ts
new file mode 100644
index 00000000000..41485540a04
--- /dev/null
+++ b/plugins/eslint-plugin-aws-toolkits/lib/rules/no-printf-mismatch.ts
@@ -0,0 +1,62 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { AST_NODE_TYPES, ESLintUtils, TSESTree } from '@typescript-eslint/utils'
+import { isLoggerCall } from './no-json-stringify-in-log'
+import { Rule } from 'eslint'
+
+/**
+ * reuse solution done in logger itself: https://github.com/winstonjs/winston/blob/195e55c7e7fc58914ae4967ea7b832c9e0ced930/lib/winston/logger.js#L27
+ */
+function countSubTokens(literalNode: TSESTree.StringLiteral) {
+    const formatRegExp = /%[scdjifoO%]/g
+    return literalNode.value.match(formatRegExp)?.length || 0
+}
+/**
+ * Form the error message using templates or actual values.
+ * Allows us to avoid copy pasting message into test file.
+ */
+export function formErrorMsg(substitutionTokens: string | number, numArgs: string | number): string {
+    return `printf-style (console.log) call has ${substitutionTokens} format specifiers, but ${numArgs} arguments.`
+}
+
+export default ESLintUtils.RuleCreator.withoutDocs({
+    meta: {
+        docs: {
+            description: 'ensure string substitution args and templates match',
+            recommended: 'recommended',
+        },
+        messages: {
+            errMsg: formErrorMsg('{{ substitutionTokens }}', '{{ args }}'),
+        },
+        type: 'problem',
+        fixable: 'code',
+        schema: [],
+    },
+    defaultOptions: [],
+    create(context) {
+        return {
+            CallExpression(node: TSESTree.CallExpression) {
+                if (
+                    isLoggerCall(node) &&
+                    node.arguments[0].type === AST_NODE_TYPES.Literal &&
+                    typeof node.arguments[0].value === 'string'
+                ) {
+                    const numSubTokens = countSubTokens(node.arguments[0])
+                    const numExtraArgs = node.arguments.length - 1
+                    if (numSubTokens !== numExtraArgs) {
+                        return context.report({
+                            node: node,
+                            data: {
+                                substitutionTokens: numSubTokens,
+                                args: numExtraArgs,
+                            },
+                            messageId: 'errMsg',
+                        })
+                    }
+                }
+            },
+        }
+    },
+}) as unknown as Rule.RuleModule
diff --git a/plugins/eslint-plugin-aws-toolkits/lib/rules/no-string-exec-for-child-process.ts b/plugins/eslint-plugin-aws-toolkits/lib/rules/no-string-exec-for-child-process.ts
new file mode 100644
index 00000000000..7313ceed61e
--- /dev/null
+++ b/plugins/eslint-plugin-aws-toolkits/lib/rules/no-string-exec-for-child-process.ts
@@ -0,0 +1,92 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Developers sometimes use string input form of child_process.exec (and similar functions), e.g.:
+ * `child_process.execSync(`vsce package --ignoreFile "../.vscodeignore.packages"`, { stdio: 'inherit' })`
+ * However, the array input form functions should be used instead:
+ * child_process.execFile('vsce', ['package', '--ignoreFile', '../.vscodeignore.packages'], { stdio: 'inherit' })
+ *
+ * The "string form" is highly discouraged because
+ * (1) it invokes a shell, which has security and performance costs, and
+ * (2) it causes bugs related to platform specific quoting rules (and other shell forms such as $foo vs %foo%, etc).
+ */
+
+import { ESLintUtils, TSESTree } from '@typescript-eslint/utils'
+import { AST_NODE_TYPES } from '@typescript-eslint/types'
+import { Rule } from 'eslint'
+
+export const errMsg =
+    "do not use child_process functions that accept string inputs (e.g. `exec('ls -h')`), instead use those with array inputs, e.g. `execFile('ls', ['-h'])`"
+
+// child_process functions that accept string input
+const disallowedFunctions = new Set(['exec', 'execSync'])
+
+export default ESLintUtils.RuleCreator.withoutDocs({
+    meta: {
+        docs: {
+            description: 'disallow child_process functions that allow string inputs over array inputs',
+            recommended: 'recommended',
+        },
+        messages: {
+            errMsg,
+        },
+        type: 'problem',
+        fixable: 'code',
+        schema: [],
+    },
+    defaultOptions: [],
+    create(context) {
+        let libImportName: string | undefined
+
+        return {
+            ImportDeclaration(node: TSESTree.ImportDeclaration) {
+                // Detect imports for child_process
+                if (node.source.value === 'child_process') {
+                    for (const specifier of node.specifiers) {
+                        if (specifier.type === AST_NODE_TYPES.ImportNamespaceSpecifier) {
+                            // Detect the name of the import, e.g. "proc" from "import * as proc from child_process"
+                            libImportName = specifier.local.name
+                        } else if (
+                            // Detect importing directly, e.g. "import { exec } from child_process"
+                            specifier.type === AST_NODE_TYPES.ImportSpecifier &&
+                            disallowedFunctions.has(specifier.imported.name)
+                        ) {
+                            context.report({
+                                node,
+                                messageId: 'errMsg',
+                            })
+                        }
+                    }
+                }
+            },
+            CallExpression(node: TSESTree.CallExpression) {
+                // Example: proc.execSync('...')
+                if (
+                    !libImportName || // child_process not imported
+                    node.callee.type !== AST_NODE_TYPES.MemberExpression || // proc.execSync
+                    node.callee.object.type !== AST_NODE_TYPES.Identifier || // object is proc
+                    node.callee.property.type !== AST_NODE_TYPES.Identifier // property is execSync
+                ) {
+                    return
+                }
+                if (
+                    node.callee.object.name === libImportName && // "proc" is the name from the statement "import * as proc from child_process"
+                    disallowedFunctions.has(node.callee.property.name)
+                ) {
+                    return context.report({
+                        node,
+                        messageId: 'errMsg',
+                    })
+                }
+            },
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            'Program:exit'() {
+                // Reset after each file is checked
+                libImportName = undefined
+            },
+        }
+    },
+}) as unknown as Rule.RuleModule
diff --git a/plugins/eslint-plugin-aws-toolkits/package.json b/plugins/eslint-plugin-aws-toolkits/package.json
new file mode 100644
index 00000000000..924b08e2b95
--- /dev/null
+++ b/plugins/eslint-plugin-aws-toolkits/package.json
@@ -0,0 +1,19 @@
+{
+    "name": "eslint-plugin-aws-toolkits",
+    "version": "1.0.0",
+    "description": "Local custom lint rules for AWS Toolkit VSCode",
+    "main": "dist/index.js",
+    "scripts": {
+        "build": "tsc",
+        "test": "npm run build && mocha dist/test --recursive",
+        "clean": "ts-node ../../scripts/clean.ts dist"
+    },
+    "devDependencies": {
+        "@types/eslint": "^8.56.0",
+        "mocha": "^10.1.0"
+    },
+    "engines": {
+        "npm": "^10.1.0"
+    },
+    "license": "Apache-2.0"
+}
diff --git a/plugins/eslint-plugin-aws-toolkits/test/resources/noIndexImports/index.ts b/plugins/eslint-plugin-aws-toolkits/test/resources/noIndexImports/index.ts
new file mode 100644
index 00000000000..86e8ab59505
--- /dev/null
+++ b/plugins/eslint-plugin-aws-toolkits/test/resources/noIndexImports/index.ts
@@ -0,0 +1,6 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export { doNothing } from './utils'
diff --git a/plugins/eslint-plugin-aws-toolkits/test/resources/noIndexImports/types.d.ts b/plugins/eslint-plugin-aws-toolkits/test/resources/noIndexImports/types.d.ts
new file mode 100644
index 00000000000..f448ecf26f8
--- /dev/null
+++ b/plugins/eslint-plugin-aws-toolkits/test/resources/noIndexImports/types.d.ts
@@ -0,0 +1,6 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export interface doNothing {}
diff --git a/plugins/eslint-plugin-aws-toolkits/test/resources/noIndexImports/utils.ts b/plugins/eslint-plugin-aws-toolkits/test/resources/noIndexImports/utils.ts
new file mode 100644
index 00000000000..6975f4fffdd
--- /dev/null
+++ b/plugins/eslint-plugin-aws-toolkits/test/resources/noIndexImports/utils.ts
@@ -0,0 +1,6 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export function doNothing() {}
diff --git a/plugins/eslint-plugin-aws-toolkits/test/rules/no-await-on-vscode-msg.test.ts b/plugins/eslint-plugin-aws-toolkits/test/rules/no-await-on-vscode-msg.test.ts
new file mode 100644
index 00000000000..81eb556030b
--- /dev/null
+++ b/plugins/eslint-plugin-aws-toolkits/test/rules/no-await-on-vscode-msg.test.ts
@@ -0,0 +1,79 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { rules } from '../../index'
+import { errMsg } from '../../lib/rules/no-await-on-vscode-msg'
+import { getRuleTester } from '../testUtil'
+
+getRuleTester().run('no-await-on-vscode-msg', rules['no-await-on-vscode-msg'], {
+    valid: [
+        "vscode.window.showInformationMessage('Hey there!')",
+        "vscode.window.showWarningMessage('Hey there!')",
+        "vscode.window.showErrorMessage('Hey there!')",
+
+        "void vscode.window.showInformationMessage('Hey there!')",
+        "void vscode.window.showWarningMessage('Hey there!')",
+        "void vscode.window.showErrorMessage('Hey there!')",
+
+        "async function test() { const response = await vscode.window.showInformationMessage('Hey there!') }",
+        "async function test() { const response = await vscode.window.showWarningMessage('Hey there!') }",
+        "async function test() { const response = await vscode.window.showErrorMessage('Hey there!') }",
+
+        "showInformationMessage('Hey there!')",
+        "showWarningMessage('Hey there!')",
+        "showErrorMessage('Hey there!')",
+
+        "vscode.window.showInformationMessage('Hey there!').then(r => console.log(r))",
+        "vscode.window.showWarningMessage('Hey there!').then(r => console.log(r))",
+        "vscode.window.showErrorMessage('Hey there!').then(r => console.log(r))",
+
+        "async function test() { await vscode.window.showInformationMessage('Hey there!').then(r => console.log(r)) }",
+        "async function test() { await vscode.window.showWarningMessage('Hey there!').then(r => console.log(r)) }",
+        "async function test() { await vscode.window.showErrorMessage('Hey there!').then(r => console.log(r)) }",
+
+        "async function test() { const resp = isSomething() ? doSomething() : await vscode.window.showInformationMessage('Hey there!')}",
+        "async function test() { const resp = isSomething() ? doSomething() : isOtherThing() ? doOtherThing() : await vscode.window.showInformationMessage('Hey there!')}",
+
+        "async function test() { if(await vscode.window.showInformationMessage('Hey there!')) { console.log('ok') } }",
+    ],
+
+    invalid: [
+        {
+            code: "async function test() { await vscode.window.showInformationMessage('Hey there!') }",
+            errors: [errMsg],
+        },
+        {
+            code: "async function test() { await vscode.window.showWarningMessage('Hey there!') }",
+            errors: [errMsg],
+        },
+        {
+            code: "async function test() { await vscode.window.showErrorMessage('Hey there!') }",
+            errors: [errMsg],
+        },
+
+        {
+            code: "async function test() { isSomething() ? doSomething() : await vscode.window.showInformationMessage('Hey there!')}",
+            errors: [errMsg],
+        },
+        {
+            code: "async function test() { isSomething() ? doSomething() : isOtherThing() ? doOtherThing() : await vscode.window.showInformationMessage('Hey there!')}",
+            errors: [errMsg],
+        },
+
+        // Devs shouldn't use these as function names; we assume them to be referring to vscode.window...
+        {
+            code: "async function test() { await showInformationMessage('Hey there!') }",
+            errors: [errMsg],
+        },
+        {
+            code: "async function test() { await showWarningMessage('Hey there!') }",
+            errors: [errMsg],
+        },
+        {
+            code: "async function test() { await showErrorMessage('Hey there!') }",
+            errors: [errMsg],
+        },
+    ],
+})
diff --git a/plugins/eslint-plugin-aws-toolkits/test/rules/no-banned-usages.test.ts b/plugins/eslint-plugin-aws-toolkits/test/rules/no-banned-usages.test.ts
new file mode 100644
index 00000000000..0592bb98e34
--- /dev/null
+++ b/plugins/eslint-plugin-aws-toolkits/test/rules/no-banned-usages.test.ts
@@ -0,0 +1,76 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { rules } from '../../index'
+import { errMsgs } from '../../lib/rules/no-banned-usages'
+import { getRuleTester } from '../testUtil'
+
+getRuleTester().run('no-banned-usages', rules['no-banned-usages'], {
+    valid: [
+        // setContext
+        "vscode.commands.executeCommand('foo', 'aws.foo', true, 42)",
+        // globalState
+        'globals.globalState',
+        'await globals.globalState.update("foo", 42)',
+        'globals.globalState.get("foo")',
+        'globalState.get("foo")',
+    ],
+
+    invalid: [
+        //
+        // setContext
+        //
+        {
+            code: "async function test() { await vscode.commands.executeCommand('setContext', key, val) }",
+            errors: [errMsgs.setContext],
+        },
+        {
+            code: "const vsc = vscode; vsc.commands.executeCommand('setContext', key, val)",
+            errors: [errMsgs.setContext],
+        },
+        {
+            code: "const vsc = vscode; const cmds = vsc.commands; cmds.executeCommand('setContext', key, val)",
+            errors: [errMsgs.setContext],
+        },
+        {
+            code: "vscode.commands.executeCommand('setContext', 'aws.foo', true, 42)",
+            errors: [errMsgs.setContext],
+        },
+        {
+            code: "void vscode.commands.executeCommand('setContext', 'aws.foo', true, 42)",
+            errors: [errMsgs.setContext],
+        },
+        {
+            code: "const x = vscode.commands.executeCommand('setContext', key, val).catch(e => { return e })",
+            errors: [errMsgs.setContext],
+        },
+
+        //
+        // globalState
+        //
+        {
+            code: 'const memento = globals.context.globalState',
+            errors: [errMsgs.globalState],
+        },
+        {
+            code: 'const val = globals.context.globalState.get("foo")',
+            errors: [errMsgs.globalState],
+        },
+        {
+            code: 'const val = extContext.globalState.get("foo")',
+            errors: [errMsgs.globalState],
+        },
+        {
+            code: 'return this.openState(targetContext.globalState, key)',
+            errors: [errMsgs.globalState],
+        },
+
+        // TODO: prevent assignment of GlobalState to Memento.
+        // {
+        //     code: 'const state: vscode.Memento = globals.globalState',
+        //     errors: [errMsgs.globalState],
+        // },
+    ],
+})
diff --git a/plugins/eslint-plugin-aws-toolkits/test/rules/no-console-log.test.ts b/plugins/eslint-plugin-aws-toolkits/test/rules/no-console-log.test.ts
new file mode 100644
index 00000000000..f8037689670
--- /dev/null
+++ b/plugins/eslint-plugin-aws-toolkits/test/rules/no-console-log.test.ts
@@ -0,0 +1,52 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { rules } from '../../index'
+import { errMsg } from '../../lib/rules/no-console-log'
+import { getRuleTester } from '../testUtil'
+
+getRuleTester().run('no-console-log', rules['no-console-log'], {
+    valid: [
+        {
+            code: "getLogger().warn('my message')",
+            filename: '/src/client.ts',
+        },
+        {
+            code: "console.log('hi')",
+            filename: '/scripts/build.ts',
+        },
+        {
+            code: "console.log('hi')",
+            filename: '/src/test/client.test.ts',
+        },
+    ],
+    invalid: [
+        {
+            code: "console.log('test')",
+            filename: '/src/client.ts',
+            errors: [errMsg],
+        },
+        {
+            code: "console.warn('test')",
+            filename: '/src/client.ts',
+            errors: [errMsg],
+        },
+        {
+            code: "console.error('test')",
+            filename: '/src/client.ts',
+            errors: [errMsg],
+        },
+        {
+            code: "console.debug('test')",
+            filename: '/src/client.ts',
+            errors: [errMsg],
+        },
+        {
+            code: "console.info('test')",
+            filename: '/src/client.ts',
+            errors: [errMsg],
+        },
+    ],
+})
diff --git a/plugins/eslint-plugin-aws-toolkits/test/rules/no-incorrect-once-usage.test.ts b/plugins/eslint-plugin-aws-toolkits/test/rules/no-incorrect-once-usage.test.ts
new file mode 100644
index 00000000000..f52aa544f12
--- /dev/null
+++ b/plugins/eslint-plugin-aws-toolkits/test/rules/no-incorrect-once-usage.test.ts
@@ -0,0 +1,50 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { rules } from '../../index'
+import { notAssignedErr, notReusableErr, oneOffErr } from '../../lib/rules/no-incorrect-once-usage'
+import { getRuleTester } from '../testUtil'
+
+getRuleTester().run('no-incorrect-once-usage', rules['no-incorrect-once-usage'], {
+    valid: [
+        'class A { private readonly logOnce = once(() => {}) }', // class property
+        'const logOnce = once(() => {})', // top-level declaration
+        'export const logOnce = once(() => {})', // top-level declaration
+        'function test() { const logOnce = once(() => {}); while (true) { if (myVal) { logOnce() } } }', // used in a lower while loop scope
+        'function test() { const logOnce = once(() => {}); for (let i = 0; i < 10; i++) { if (myVal) { logOnce() } } }', // used in a lower for loop scope
+        'function test() { const logOnce = once(() => {}); for (let t in types) { if (myVal) { logOnce() } } }', // used in a lower for in loop scope
+        'function test() { const logOnce = once(() => {}); for (let t of types) { if (myVal) { logOnce() } } }', // used in a lower for of loop scope
+        'function test() { logOnce = once(() => {}) }', // assigned a higher-level variable (NOT FOOLPROOF)
+        'class A { test() { this.logOnce = once(() => {}) } }', // assigned a property
+        'function test() { const logOnce = once(() => {}); logOnce(); logOnce();}', // used multiple times, even if the usage is questionable.
+    ],
+
+    invalid: [
+        {
+            code: 'once(() => {})()',
+            errors: [oneOffErr],
+        },
+        {
+            code: 'function test() { once(() => {})() }',
+            errors: [oneOffErr],
+        },
+        {
+            code: 'const logOnce = once(() => {})()',
+            errors: [oneOffErr],
+        },
+        {
+            code: 'once(() => {})',
+            errors: [notAssignedErr],
+        },
+        {
+            code: 'function test() { const logOnce = once(() => {}); logOnce() }',
+            errors: [notReusableErr],
+        },
+        {
+            code: 'function test() { const logOnce = once(() => {}); if (myCond) { logOnce() } }',
+            errors: [notReusableErr],
+        },
+    ],
+})
diff --git a/plugins/eslint-plugin-aws-toolkits/test/rules/no-index-import.test.ts b/plugins/eslint-plugin-aws-toolkits/test/rules/no-index-import.test.ts
new file mode 100644
index 00000000000..0185c544b92
--- /dev/null
+++ b/plugins/eslint-plugin-aws-toolkits/test/rules/no-index-import.test.ts
@@ -0,0 +1,93 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import path from 'path'
+import { rules } from '../../index'
+import { errMsg } from '../../lib/rules/no-index-import'
+import { getRuleTester } from '../testUtil'
+
+// Linted files need `packages/core/src` in their filepaths for them to pass, but we are referencing test resource files
+// from this project directory. So, "inject" the expected substring into this filepath.
+const verboseFilePath = `${__dirname.replace('dist/', '')}/../../../../packages/core/src/../../../plugins/eslint-plugin-aws-toolkits/test/rules/${path.basename(__filename.replace('.js', '.ts'))}`
+
+getRuleTester().run('no-index-import', rules['no-index-import'], {
+    valid: [
+        {
+            code: "import { doNothing } from '../resources/noIndexImports/utils'",
+            filename: verboseFilePath,
+        },
+        {
+            code: "import { doNothing } from '../resources/noIndexImports/utils.ts'",
+            filename: verboseFilePath,
+        },
+        {
+            code: "import config from '.eslintrc'",
+            filename: 'packages/amazonq/src/test.ts',
+        },
+        {
+            code: "import ts from '@typescript'",
+            filename: verboseFilePath,
+        },
+        {
+            code: "import { doNothing } from '../resources/noIndexImports'",
+            filename: verboseFilePath.replace('packages/core/src/', 'packages/core/src/test/../'),
+        },
+        {
+            code: "import { doNothing } from '../resources/noIndexImports'",
+            filename: verboseFilePath.replace('packages/core/src/', 'packages/core/src/testInteg/../'),
+        },
+        {
+            code: "import { doNothing } from '../resources/noIndexImports/utils'",
+            filename: verboseFilePath.replace('packages/core/src/', 'packages/core/src/index/../'),
+        },
+        {
+            code: "import { doNothing } from '../resources/noIndexImports/types.d.ts'",
+            filename: verboseFilePath,
+        },
+        {
+            code: "import { doNothing } from '../resources/noIndexImports/types'",
+            filename: verboseFilePath,
+        },
+        {
+            code: "import { doNothing } from '../resources/noIndexImports/doesNotExist.json'",
+            filename: verboseFilePath,
+        },
+        {
+            code: "import { doNothing } from '../resources/noIndexImports/utils.js'",
+            filename: verboseFilePath,
+        },
+        {
+            code: "import { doNothing } from '../resources/noIndexImports/utils.vue'",
+            filename: verboseFilePath,
+        },
+        {
+            code: "import { doNothing } from '../resources/nonexistantpath'",
+            filename: verboseFilePath,
+        },
+    ],
+
+    invalid: [
+        {
+            code: "import { doNothing } from '../resources/noIndexImports'",
+            errors: [errMsg],
+            filename: verboseFilePath,
+        },
+        {
+            code: "import { doNothing } from '../resources/noIndexImports/'",
+            errors: [errMsg],
+            filename: verboseFilePath,
+        },
+        {
+            code: "import { doNothing } from '../resources/noIndexImports/index'",
+            errors: [errMsg],
+            filename: verboseFilePath,
+        },
+        {
+            code: "import { doNothing } from '../resources/noIndexImports/index.ts'",
+            errors: [errMsg],
+            filename: verboseFilePath,
+        },
+    ],
+})
diff --git a/plugins/eslint-plugin-aws-toolkits/test/rules/no-json-stringify-in-log.test.ts b/plugins/eslint-plugin-aws-toolkits/test/rules/no-json-stringify-in-log.test.ts
new file mode 100644
index 00000000000..408b76e666e
--- /dev/null
+++ b/plugins/eslint-plugin-aws-toolkits/test/rules/no-json-stringify-in-log.test.ts
@@ -0,0 +1,56 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { rules } from '../../index'
+import { errMsg } from '../../lib/rules/no-json-stringify-in-log'
+import { getRuleTester } from '../testUtil'
+
+getRuleTester().run('no-json-stringify-in-log', rules['no-json-stringify-in-log'], {
+    valid: [
+        'getLogger().debug(`the object is %O`)',
+        'return JSON.stringify(d)',
+        'getLogger().debug(`this does not include anything`)',
+        'getLogger().debug(`another example ${JSON.notString(something)}`)',
+        'getLogger().fakeFunction(`another example ${JSON.notString(something)}`)',
+        'this.deps.devLogger?.debug("crashMonitoring: CLEAR_STATE: Succeeded")',
+        'getLogger().debug(`called startBuilderIdSetup()`)',
+        'this.logger.exit(`${JSON.stringify(obj)}`)',
+    ],
+
+    invalid: [
+        {
+            code: 'getLogger().debug(`the object is ${JSON.stringify(obj)}`)',
+            errors: [errMsg],
+        },
+        {
+            code: 'getLogger().debug(`the object is ${notThis} but ${JSON.stringify(obj)}`)',
+            errors: [errMsg],
+        },
+        {
+            code: 'getLogger().debug(`the object is ${notThis} or ${thisOne} but ${JSON.stringify(obj)}`)',
+            errors: [errMsg],
+        },
+        {
+            code: 'getLogger().verbose(`Invalid Request : `, JSON.stringify(request, undefined, EditorContext.getTabSize()))',
+            errors: [errMsg],
+        },
+        {
+            code: 'getLogger().verbose(`provideDebugConfigurations: debugconfigs: ${JSON.stringify(configs)}`)',
+            errors: [errMsg],
+        },
+        {
+            code: 'devLogger?.debug(`crashMonitoring: CHECKED: Result of cleaning up crashed instances\nBEFORE: ${JSON.stringify(before)}\nAFTER:  ${JSON.stringify(after)}\nACTUAL: ${JSON.stringify(afterActual)}`)',
+            errors: [errMsg],
+        },
+        {
+            code: 'getLogger().warn(`skipping invalid item in telemetry cache: ${JSON.stringify(item)}\n`)',
+            errors: [errMsg],
+        },
+        {
+            code: 'this.deps.devLogger?.debug(`crashMonitoring: CLEAR_STATE: Succeeded ${JSON.stringify(item)}`)',
+            errors: [errMsg],
+        },
+    ],
+})
diff --git a/plugins/eslint-plugin-aws-toolkits/test/rules/no-only-in-tests.test.ts b/plugins/eslint-plugin-aws-toolkits/test/rules/no-only-in-tests.test.ts
new file mode 100644
index 00000000000..d420152cf05
--- /dev/null
+++ b/plugins/eslint-plugin-aws-toolkits/test/rules/no-only-in-tests.test.ts
@@ -0,0 +1,39 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { rules } from '../../index'
+import { describeOnlyErrMsg, itOnlyErrMsg } from '../../lib/rules/no-only-in-tests'
+import { getRuleTester } from '../testUtil'
+
+getRuleTester().run('no-only-in-tests', rules['no-only-in-tests'], {
+    valid: [
+        "describe('my suite', function () {})",
+        "describe('my suite', function () { it('does things', () => {})})",
+        "it('does things', async function () {})",
+    ],
+
+    invalid: [
+        {
+            code: "describe.only('mySuite', function () { it('does things', async function () {} ) })",
+            errors: [describeOnlyErrMsg],
+            output: "describe('mySuite', function () { it('does things', async function () {} ) })",
+        },
+        {
+            code: "describe('mySuite', function() { it.only('does things', async function () { console.log('did things') })})",
+            errors: [itOnlyErrMsg],
+            output: "describe('mySuite', function() { it('does things', async function () { console.log('did things') })})",
+        },
+        {
+            code: "describe.only('mySuite', function() { it.only('does things', async function () { console.log('did things') })})",
+            errors: [describeOnlyErrMsg, itOnlyErrMsg],
+            output: "describe('mySuite', function() { it('does things', async function () { console.log('did things') })})",
+        },
+        {
+            code: "it.only('does things', async function () { console.log('did things') })",
+            errors: [itOnlyErrMsg],
+            output: "it('does things', async function () { console.log('did things') })",
+        },
+    ],
+})
diff --git a/plugins/eslint-plugin-aws-toolkits/test/rules/no-printf-mismatch.test.ts b/plugins/eslint-plugin-aws-toolkits/test/rules/no-printf-mismatch.test.ts
new file mode 100644
index 00000000000..160f6dc505a
--- /dev/null
+++ b/plugins/eslint-plugin-aws-toolkits/test/rules/no-printf-mismatch.test.ts
@@ -0,0 +1,32 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { rules } from '../../index'
+import { formErrorMsg } from '../../lib/rules/no-printf-mismatch'
+import { getRuleTester } from '../testUtil'
+
+getRuleTester().run('no-string-sub-mismatch', rules['no-printf-mismatch'], {
+    valid: [
+        'getLogger().debug("this is a string %s and a number %d", "s", 2)',
+        'getLogger().debug("this is a number %d", 2)',
+        'getLogger().debug("this has no substitutions")',
+        'getLogger().debug("1 %s 2 %d 3 %O 4 %o 5 %s", arg1, arg2, arg3, arg4, arg5)',
+        'getLogger().debug("not real a sub-token %z")',
+    ],
+    invalid: [
+        {
+            code: 'getLogger().debug("this is a string %s and a number %d", "s")',
+            errors: [formErrorMsg(2, 1)],
+        },
+        {
+            code: 'getLogger().debug("this is a string %s a string %s a string %s")',
+            errors: [formErrorMsg(3, 0)],
+        },
+        {
+            code: 'getLogger().debug("this is a string", err)',
+            errors: [formErrorMsg(0, 1)],
+        },
+    ],
+})
diff --git a/plugins/eslint-plugin-aws-toolkits/test/rules/no-string-exec-for-child-process.test.ts b/plugins/eslint-plugin-aws-toolkits/test/rules/no-string-exec-for-child-process.test.ts
new file mode 100644
index 00000000000..8638b0891f6
--- /dev/null
+++ b/plugins/eslint-plugin-aws-toolkits/test/rules/no-string-exec-for-child-process.test.ts
@@ -0,0 +1,38 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { rules } from '../../index'
+import { errMsg } from '../../lib/rules/no-string-exec-for-child-process'
+import { getRuleTester } from '../testUtil'
+
+getRuleTester().run('no-string-exec-for-child-process', rules['no-string-exec-for-child-process'], {
+    valid: [
+        "import * as proc from 'child_process'; proc.execFile('ls -h')",
+        "import * as child_process from 'child_process'; child_process.execFile('ls -h')",
+        "import { execFileSync } from 'child_process'; execFile('ls -h')",
+    ],
+    invalid: [
+        {
+            code: "import * as proc from 'child_process'; proc.execSync('ls -h');",
+            errors: [errMsg],
+        },
+        {
+            code: "import * as child_process from 'child_process'; child_process.exec('ls -h');",
+            errors: [errMsg],
+        },
+        {
+            code: "import { execSync } from 'child_process'; execSync('ls -h');",
+            errors: [errMsg],
+        },
+        {
+            code: "import { exec } from 'child_process'; exec('ls -h')",
+            errors: [errMsg],
+        },
+        {
+            code: "import { exec, execSync } from 'child_process'; execSync('ls -h');",
+            errors: [errMsg, errMsg],
+        },
+    ],
+})
diff --git a/plugins/eslint-plugin-aws-toolkits/test/testUtil.ts b/plugins/eslint-plugin-aws-toolkits/test/testUtil.ts
new file mode 100644
index 00000000000..877ac34c0ee
--- /dev/null
+++ b/plugins/eslint-plugin-aws-toolkits/test/testUtil.ts
@@ -0,0 +1,17 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { RuleTester } from 'eslint'
+
+export function getRuleTester() {
+    return new RuleTester({
+        // TODO: For tests that need to access TS types, we will need to pass a parser:
+        parser: require.resolve('@typescript-eslint/parser'),
+        parserOptions: {
+            tsconfigRootDir: '../..',
+            ecmaVersion: 2021,
+        },
+    })
+}
diff --git a/plugins/eslint-plugin-aws-toolkits/tsconfig.json b/plugins/eslint-plugin-aws-toolkits/tsconfig.json
new file mode 100644
index 00000000000..028f3597dcc
--- /dev/null
+++ b/plugins/eslint-plugin-aws-toolkits/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "baseUrl": ".",
+        "incremental": true,
+        "module": "node16",
+        "target": "es2021",
+        "outDir": "dist",
+        "lib": ["dom", "es2021"],
+        "sourceMap": true,
+        "moduleResolution": "node16",
+        "resolveJsonModule": true,
+        "strict": true,
+        "noUnusedLocals": true,
+        "skipLibCheck": true
+    },
+    "include": ["lib/**/*", "test/**/*", "index.ts"]
+}
diff --git a/resources/css/base-cloud9.css b/resources/css/base-cloud9.css
deleted file mode 100644
index ec1e30468c6..00000000000
--- a/resources/css/base-cloud9.css
+++ /dev/null
@@ -1,68 +0,0 @@
-/* TODO: remove this when Cloud9 injects the correct styling information into webviews */
-@import url('./base.css');
-
-body {
-    /* Temporary variables for C9 to shade/tint elements. Best-effort styling based off current theme. */
-    /* Since these are applied as rgba, it's very easy to make things look 'washed-out' or too dark */
-    --tint: 255, 255, 255;
-    --shade: 0, 0, 0;
-}
-
-input[type='text'][data-invalid='true'],
-input[type='number'][data-invalid='true'] {
-    border: 1px solid var(--vscode-inputValidation-errorBorder);
-    border-bottom: 0;
-    background: none;
-}
-
-/* "Cloud9 gray" in input boxes (not buttons/radios). */
-body.vscode-dark input:not([type='submit']):not([type='radio']) {
-    background-color: rgba(var(--shade), 0.1);
-}
-
-input:disabled {
-    filter: none;
-}
-
-body.vscode-dark select {
-    background: rgba(var(--shade), 0.1);
-}
-
-body.vscode-dark .header {
-    background-color: rgba(var(--tint), 0.02);
-}
-body.vscode-light .header {
-    background-color: rgba(var(--shade), 0.02);
-}
-
-body.vscode-dark .notification {
-    background-color: #2a2a2a;
-}
-body.vscode-light .notification {
-    background-color: #f7f7f7;
-    box-shadow: 2px 2px 8px #aaa;
-}
-
-button:disabled {
-    filter: none;
-}
-
-/* Text area */
-textarea {
-    background: none;
-}
-body.vscode-dark textarea {
-    background: rgba(var(--shade), 0.1);
-}
-
-/* Overrides */
-body.vscode-dark .settings-panel {
-    background: rgba(var(--tint), 0.02) !important;
-}
-body.vscode-light .settings-panel {
-    background: rgba(var(--shade), 0.02) !important;
-}
-
-.button-container h1 {
-    margin: 0px;
-}
diff --git a/resources/css/base.css b/resources/css/base.css
deleted file mode 100644
index 9314dbcf740..00000000000
--- a/resources/css/base.css
+++ /dev/null
@@ -1,280 +0,0 @@
-/* Base styling sheet for standard tags and common classes */
-@import url('./icons.css');
-
-/* Radio button */
-input[type='radio'] {
-    -webkit-appearance: none;
-    display: inline-block;
-    width: 16px;
-    min-width: 16px;
-    height: 16px;
-    padding: 4px;
-    border: 1px solid var(--vscode-settings-textInputForeground);
-    background-clip: content-box;
-    background-color: transparent;
-    border-radius: 50%;
-    margin: 0;
-}
-input[type='radio']:checked {
-    background-color: var(--vscode-focusBorder);
-    border: 1px solid var(--vscode-focusBorder);
-}
-input:focus:not(:focus-visible) {
-    outline-color: transparent;
-}
-
-/* Checkbox */
-input[type='checkbox'] {
-    -webkit-appearance: none;
-    display: inline-block;
-    width: 16px;
-    min-width: 16px;
-    height: 16px;
-    border: 1px solid var(--vscode-settings-checkboxBorder);
-    border-radius: 20%;
-    background-size: 16px;
-    background-color: var(--vscode-settings-checkboxBackground);
-    background-position: center;
-    background-repeat: no-repeat;
-    margin: 0;
-}
-
-body.vscode-dark input[type='checkbox']:checked {
-    background-image: url('../../resources/icons/vscode/dark/check.svg');
-}
-
-body.vscode-light input[type='checkbox']:checked {
-    background-image: url('../../resources/icons/vscode/light/check.svg');
-}
-
-/* Placeholder */
-::placeholder {
-    color: var(--vscode-input-placeholderForeground);
-}
-
-/* Text/number input box */
-input[type='text'],
-input[type='number'] {
-    color: var(--vscode-settings-textInputForeground);
-    background: var(--vscode-settings-textInputBackground);
-    border: 1px solid var(--vscode-settings-textInputBorder);
-    padding: 4px 4px;
-}
-input[type='text'][data-invalid='true'],
-input[type='number'][data-invalid='true'] {
-    border: 1px solid var(--vscode-inputValidation-errorBorder);
-    border-bottom: 0;
-}
-input:disabled {
-    /* TODO: use VSC webcomponent library instead */
-    filter: brightness(0.8);
-}
-.input-validation {
-    color: var(--vscode-inputValidation-errorForeground);
-    background: var(--vscode-inputValidation-errorBackground);
-    border: 1px solid var(--vscode-inputValidation-errorBorder);
-    padding: 4px 4px;
-}
-
-/* Select drop-down */
-select {
-    margin: 0px 0px;
-    padding: 2px 0px;
-    border-radius: 4px;
-    border: 1px solid var(--vscode-settings-dropdownBorder);
-    background: var(--vscode-settings-dropdownBackground);
-    color: var(--vscode-settings-dropdownForeground);
-}
-select:invalid {
-    color: var(--vscode-input-placeholderForeground);
-}
-option {
-    color: var(--vscode-settings-dropdownForeground);
-    background: var(--vscode-settings-dropdownBackground);
-}
-
-/* Header (for settings) (TODO: move to different sheet) */
-.header {
-    padding: 16px;
-    display: flex;
-    align-items: flex-start;
-    flex-direction: row;
-    flex-wrap: wrap;
-}
-/* The below selectors apply a tint depending on the theme: light for dark and dark for light */
-/* `backdrop-filter` with a brightness offset of 0.2 would be better here but it causes some slight flickering */
-body.vscode-dark .header {
-    background-color: rgb(255, 255, 255, 0.05);
-}
-body.vscode-light .header {
-    background-color: rgba(0, 0, 0, 0.05);
-}
-
-/* Buttons */
-button,
-.button-theme-primary {
-    color: var(--vscode-button-foreground);
-    background: var(--vscode-button-background);
-    border: 1px solid var(--vscode-button-border);
-    padding: 8px 12px;
-}
-button,
-.button-theme-primary:hover:not(:disabled) {
-    background: var(--vscode-button-hoverBackground);
-    cursor: pointer;
-}
-.button-theme-secondary {
-    color: var(--vscode-button-secondaryForeground);
-    background: var(--vscode-button-secondaryBackground);
-    border: 1px solid var(--vscode-button-border);
-}
-.button-theme-secondary:hover:not(:disabled) {
-    background: var(--vscode-button-secondaryHoverBackground);
-    cursor: pointer;
-}
-.button-theme-soft {
-    color: var(--vscode-settings-textInputForeground);
-    background: var(--vscode-settings-textInputBackground);
-}
-button:disabled {
-    /* TODO: use VSC webcomponent library instead */
-    filter: brightness(0.8);
-}
-
-/* Text area */
-textarea {
-    color: var(--vscode-settings-textInputForeground);
-    background: var(--vscode-settings-textInputBackground);
-    border: 1px solid var(--vscode-settings-textInputBorder);
-}
-
-/* Badge */
-.badge {
-    color: var(--vscode-activityBarBadge-foreground);
-    background-color: var(--vscode-activityBarBadge-background);
-    padding: 3px 8px;
-    font-size: 0.75rem;
-    border-radius: 16px;
-    white-space: nowrap;
-}
-
-/* Labels */
-.label-context {
-    display: block;
-    padding: 0 0 4px 0;
-}
-.option-label {
-    display: block;
-    /* max-width: 560px; */
-    padding: 0 0 8px 0;
-}
-
-/* Layout */
-.ml-0 {
-    margin-left: 0px;
-}
-.ml-2 {
-    margin-left: 2px;
-}
-.ml-4 {
-    margin-left: 4px;
-}
-.ml-8 {
-    margin-left: 8px;
-}
-.ml-16 {
-    margin-left: 16px;
-}
-.mr-0 {
-    margin-right: 0px;
-}
-.mr-2 {
-    margin-right: 2px;
-}
-.mr-4 {
-    margin-right: 4px;
-}
-.mr-8 {
-    margin-right: 8px;
-}
-.mr-16 {
-    margin-right: 16px;
-}
-.mt-0 {
-    margin-top: 0px;
-}
-.mt-2 {
-    margin-top: 2px;
-}
-.mt-4 {
-    margin-top: 4px;
-}
-.mt-8 {
-    margin-top: 8px;
-}
-.mt-16 {
-    margin-top: 16px;
-}
-.mb-0 {
-    margin-bottom: 0px;
-}
-.mb-2 {
-    margin-bottom: 2px;
-}
-.mb-4 {
-    margin-bottom: 4px;
-}
-.mb-8 {
-    margin-bottom: 8px;
-}
-.mb-16 {
-    margin-bottom: 16px;
-}
-
-/* Basic 16px icon class */
-.icon {
-    display: inline;
-    height: 16px;
-    width: 16px;
-    padding: 8px;
-    background-repeat: no-repeat;
-    background-position: center;
-}
-
-/* Misc. */
-.no-spacing {
-    margin: 0;
-    padding: 0;
-}
-.no-wrap {
-    white-space: nowrap;
-}
-.soft {
-    color: var(--vscode-input-placeholderForeground);
-}
-.container {
-    background: var(--vscode-menu-background);
-}
-.display-contents {
-    display: contents;
-}
-.button-container {
-    display: flex;
-    align-items: flex-start;
-    flex-direction: row;
-    /* margin: 16px 0 0 0; */
-    padding: 10px;
-    position: sticky;
-    top: 10px;
-    justify-content: flex-end;
-    border-bottom: 1px solid var(--vscode-menu-separatorBackground);
-    /**
-     * HACK: Using background-color alpha as a workaround because "opacity" affects children.
-     * TODO: Is there a way to use alpha with var(--vscode-menu-background) ?
-     */
-    /* background-color: rgba(0, 0, 0, 0.1); */
-}
-
-.button-container h1 {
-    margin: 0px;
-}
diff --git a/resources/css/stateMachineRender.css b/resources/css/stateMachineRender.css
deleted file mode 100644
index a2fb51a56a8..00000000000
--- a/resources/css/stateMachineRender.css
+++ /dev/null
@@ -1,265 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * Custom theming applied on top of existing styles.
- * Adds additional styles for when user has dark/light/high-contrast themes.
- * Fixes height issue in vscode webview iframe. 
- */
-
-/*  
- * General
- */
-
-:root {
-    --btnDarkOutlineColor: #c5c5c5;
-    --btnDarkIconColor: #888;
-    --btnLightOutlineColor: #b8b8b8;
-    --btnLightIconColor: #616161;
-}
-
-/* Sizing CSS */
-html,
-body {
-    height: 100%;
-    margin: 0px;
-    padding: 0px;
-    overflow-y: hidden;
-}
-
-#svgcontainer {
-    flex-grow: 1;
-    padding: 0px;
-}
-
-/* Theming CSS Below */
-body {
-    background-color: var(--vscode-editor-background);
-    display: flex;
-    align-items: stretch;
-    justify-content: center;
-}
-
-/* 
- * Dark Theme Styles
- */
-
-body.vscode-dark .path {
-    stroke: #d3d3d3;
-    background-color: #d3d3d3;
-}
-
-body.vscode-dark path {
-    stroke: #d3d3d3;
-}
-
-body.vscode-dark .node > .shape {
-    fill: var(--vscode-editor-background);
-    stroke: #d3d3d3;
-}
-
-body.vscode-dark .node.anchor > .shape {
-    fill: #808080;
-}
-
-body.vscode-dark .label {
-    fill: #ffffff;
-}
-
-body.vscode-dark marker {
-    fill: #d3d3d3;
-}
-
-/*
- * High Contrast Theme Styles
- */
-
-body.vscode-high-contrast .path {
-    stroke: var(--vscode-contrastActiveBorder);
-    background-color: var(--vscode-contrastActiveBorder);
-}
-
-body.vscode-high-contrast path {
-    stroke: var(--vscode-contrastActiveBorder);
-}
-
-body.vscode-high-contrast .node.anchor > .shape {
-    fill: var(--vscode-contrastActiveBorder);
-}
-
-body.vscode-high-contrast marker {
-    fill: var(--vscode-contrastActiveBorder);
-}
-
-.status-info {
-    display: flex;
-    position: absolute;
-    bottom: 10px;
-    left: 10px;
-    font-size: 12px;
-    padding: 10px;
-    align-items: center;
-    background-color: var(--vscode-editor-background);
-    border: 1px solid #c9c9c9;
-    color: #7b7b7b;
-}
-
-body .status-info.start-error-asl {
-    display: inline-block;
-    border: 1px solid #da6363;
-    color: #da6363;
-    padding: 10px;
-    bottom: 50%;
-    left: 50%;
-    transform: translate(-50%, 50%);
-}
-
-.status-info.start-error-asl svg,
-.status-info.start-error-asl + .graph-buttons-container {
-    display: none;
-}
-
-.vscode-dark .status-info {
-    border: 1px solid #6c6c6c;
-    color: #949494;
-}
-
-.vscode-high-contrast .status-info {
-    border: 1px solid var(--vscode-contrastActiveBorder);
-    color: var(--vscode-contrastActiveBorder);
-}
-
-.status-messages span {
-    display: none;
-    white-space: nowrap;
-    line-height: 1;
-}
-
-.status-info svg {
-    height: 10px;
-    width: 10px;
-    margin-right: 10px;
-}
-
-.in-sync-asl .status-messages .previewing-asl-message {
-    display: inline-block;
-}
-
-.syncing-asl .status-messages .rendering-asl-message {
-    display: inline-block;
-}
-
-.not-in-sync-asl .status-messages .error-asl-message,
-.start-error-asl .status-messages .error-asl-message {
-    display: inline-block;
-}
-
-.vscode-dark .in-sync-asl svg circle {
-    fill: #46a52c;
-}
-
-.vscode-dark .syncing-asl svg circle {
-    fill: #888;
-}
-
-.vscode-dark .not-in-sync-asl svg circle {
-    fill: #f37f6a;
-}
-
-.in-sync-asl svg circle {
-    stroke: #004d00;
-    fill: #a5d099;
-}
-
-.syncing-asl svg circle {
-    stroke: #333;
-    fill: #d8d8d8;
-}
-
-.not-in-sync-asl svg circle {
-    stroke: #660000;
-    fill: #f2ada0;
-}
-
-a {
-    cursor: pointer;
-}
-
-.graph-buttons-container {
-    position: absolute;
-    top: 10px;
-    right: 10px;
-    display: flex;
-    flex-direction: column;
-    z-index: 1000;
-}
-
-.graph-buttons-container button {
-    background-color: var(--vscode-editor-background);
-    border: 1px solid var(--btnLightOutlineColor);
-    border-radius: 2px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    text-decoration: none;
-    cursor: pointer;
-    width: 38px;
-    height: 30px;
-    margin-bottom: 10px;
-}
-
-#center svg circle:nth-child(2) {
-    fill: var(--btnLightIconColor);
-}
-
-.vscode-dark #center svg circle:nth-child(2) {
-    fill: var(--btnLightIconColor);
-}
-
-.graph-buttons-container button svg {
-    width: 14px;
-    height: 14px;
-    stroke-width: 2px;
-}
-
-.graph-buttons-container button:active {
-    opacity: 0.7;
-}
-
-.vscode-high-contrast .graph-buttons-container button {
-    border: 1px solid white;
-}
-
-.vscode-dark .graph-buttons-container button {
-    border: 1px solid var(--btnDarkOutlineColor);
-}
-
-.graph-buttons-container button line,
-.graph-buttons-container button circle {
-    stroke: var(--btnLightIconColor);
-    fill: transparent;
-}
-
-.graph-buttons-container button circle:nth-child(2) {
-    fill: var(--btnLightIconColor);
-}
-
-.vscode-high-contrast .graph-buttons-container button line,
-.vscode-high-contrast .graph-buttons-container button circle {
-    stroke: white;
-}
-
-.vscode-dark .graph-buttons-container button line,
-.vscode-dark .graph-buttons-container button circle {
-    stroke: var(--btnDarkIconColor);
-}
-
-.vscode-high-contrast .graph-buttons-container button circle:nth-child(2) {
-    fill: var(--btnDarkIconColor);
-}
-
-.graph-buttons-container button:focus {
-    outline: none;
-}
diff --git a/resources/endpoints.json b/resources/endpoints.json
deleted file mode 100644
index 43b2aab69de..00000000000
--- a/resources/endpoints.json
+++ /dev/null
@@ -1,12047 +0,0 @@
-{
-  "partitions" : [ {
-    "defaults" : {
-      "hostname" : "{service}.{region}.{dnsSuffix}",
-      "protocols" : [ "https" ],
-      "signatureVersions" : [ "v4" ]
-    },
-    "dnsSuffix" : "amazonaws.com",
-    "partition" : "aws",
-    "partitionName" : "AWS Standard",
-    "regionRegex" : "^(us|eu|ap|sa|ca|me|af)\\-\\w+\\-\\d+$",
-    "regions" : {
-      "af-south-1" : {
-        "description" : "Africa (Cape Town)"
-      },
-      "ap-east-1" : {
-        "description" : "Asia Pacific (Hong Kong)"
-      },
-      "ap-northeast-1" : {
-        "description" : "Asia Pacific (Tokyo)"
-      },
-      "ap-northeast-2" : {
-        "description" : "Asia Pacific (Seoul)"
-      },
-      "ap-northeast-3" : {
-        "description" : "Asia Pacific (Osaka)"
-      },
-      "ap-south-1" : {
-        "description" : "Asia Pacific (Mumbai)"
-      },
-      "ap-southeast-1" : {
-        "description" : "Asia Pacific (Singapore)"
-      },
-      "ap-southeast-2" : {
-        "description" : "Asia Pacific (Sydney)"
-      },
-      "ca-central-1" : {
-        "description" : "Canada (Central)"
-      },
-      "eu-central-1" : {
-        "description" : "Europe (Frankfurt)"
-      },
-      "eu-north-1" : {
-        "description" : "Europe (Stockholm)"
-      },
-      "eu-south-1" : {
-        "description" : "Europe (Milan)"
-      },
-      "eu-west-1" : {
-        "description" : "Europe (Ireland)"
-      },
-      "eu-west-2" : {
-        "description" : "Europe (London)"
-      },
-      "eu-west-3" : {
-        "description" : "Europe (Paris)"
-      },
-      "me-south-1" : {
-        "description" : "Middle East (Bahrain)"
-      },
-      "sa-east-1" : {
-        "description" : "South America (Sao Paulo)"
-      },
-      "us-east-1" : {
-        "description" : "US East (N. Virginia)"
-      },
-      "us-east-2" : {
-        "description" : "US East (Ohio)"
-      },
-      "us-west-1" : {
-        "description" : "US West (N. California)"
-      },
-      "us-west-2" : {
-        "description" : "US West (Oregon)"
-      }
-    },
-    "services" : {
-      "a4b" : {
-        "endpoints" : {
-          "us-east-1" : { }
-        }
-      },
-      "access-analyzer" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "access-analyzer-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "access-analyzer-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "access-analyzer-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "access-analyzer-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "access-analyzer-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "account" : {
-        "endpoints" : {
-          "aws-global" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "account.us-east-1.amazonaws.com"
-          }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-global"
-      },
-      "acm" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "ca-central-1-fips" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "acm-fips.ca-central-1.amazonaws.com"
-          },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "acm-fips.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : { },
-          "us-east-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "acm-fips.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : { },
-          "us-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "acm-fips.us-west-1.amazonaws.com"
-          },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "acm-fips.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "acm-pca" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "acm-pca-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "acm-pca-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "acm-pca-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "acm-pca-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "acm-pca-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "airflow" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "amplify" : {
-        "endpoints" : {
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "amplifybackend" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "api.detective" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "api.detective-fips.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : { },
-          "us-east-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "api.detective-fips.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : { },
-          "us-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "api.detective-fips.us-west-1.amazonaws.com"
-          },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "api.detective-fips.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "api.ecr" : {
-        "endpoints" : {
-          "af-south-1" : {
-            "credentialScope" : {
-              "region" : "af-south-1"
-            },
-            "hostname" : "api.ecr.af-south-1.amazonaws.com"
-          },
-          "ap-east-1" : {
-            "credentialScope" : {
-              "region" : "ap-east-1"
-            },
-            "hostname" : "api.ecr.ap-east-1.amazonaws.com"
-          },
-          "ap-northeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-1"
-            },
-            "hostname" : "api.ecr.ap-northeast-1.amazonaws.com"
-          },
-          "ap-northeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-2"
-            },
-            "hostname" : "api.ecr.ap-northeast-2.amazonaws.com"
-          },
-          "ap-northeast-3" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-3"
-            },
-            "hostname" : "api.ecr.ap-northeast-3.amazonaws.com"
-          },
-          "ap-south-1" : {
-            "credentialScope" : {
-              "region" : "ap-south-1"
-            },
-            "hostname" : "api.ecr.ap-south-1.amazonaws.com"
-          },
-          "ap-southeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-1"
-            },
-            "hostname" : "api.ecr.ap-southeast-1.amazonaws.com"
-          },
-          "ap-southeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-2"
-            },
-            "hostname" : "api.ecr.ap-southeast-2.amazonaws.com"
-          },
-          "ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "api.ecr.ca-central-1.amazonaws.com"
-          },
-          "dkr-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            }
-          },
-          "dkr-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            }
-          },
-          "dkr-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            }
-          },
-          "dkr-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            }
-          },
-          "eu-central-1" : {
-            "credentialScope" : {
-              "region" : "eu-central-1"
-            },
-            "hostname" : "api.ecr.eu-central-1.amazonaws.com"
-          },
-          "eu-north-1" : {
-            "credentialScope" : {
-              "region" : "eu-north-1"
-            },
-            "hostname" : "api.ecr.eu-north-1.amazonaws.com"
-          },
-          "eu-south-1" : {
-            "credentialScope" : {
-              "region" : "eu-south-1"
-            },
-            "hostname" : "api.ecr.eu-south-1.amazonaws.com"
-          },
-          "eu-west-1" : {
-            "credentialScope" : {
-              "region" : "eu-west-1"
-            },
-            "hostname" : "api.ecr.eu-west-1.amazonaws.com"
-          },
-          "eu-west-2" : {
-            "credentialScope" : {
-              "region" : "eu-west-2"
-            },
-            "hostname" : "api.ecr.eu-west-2.amazonaws.com"
-          },
-          "eu-west-3" : {
-            "credentialScope" : {
-              "region" : "eu-west-3"
-            },
-            "hostname" : "api.ecr.eu-west-3.amazonaws.com"
-          },
-          "fips-dkr-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "ecr-fips.us-east-1.amazonaws.com"
-          },
-          "fips-dkr-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "ecr-fips.us-east-2.amazonaws.com"
-          },
-          "fips-dkr-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "ecr-fips.us-west-1.amazonaws.com"
-          },
-          "fips-dkr-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "ecr-fips.us-west-2.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "ecr-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "ecr-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "ecr-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "ecr-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : {
-            "credentialScope" : {
-              "region" : "me-south-1"
-            },
-            "hostname" : "api.ecr.me-south-1.amazonaws.com"
-          },
-          "sa-east-1" : {
-            "credentialScope" : {
-              "region" : "sa-east-1"
-            },
-            "hostname" : "api.ecr.sa-east-1.amazonaws.com"
-          },
-          "us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "api.ecr.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "api.ecr.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "api.ecr.us-west-1.amazonaws.com"
-          },
-          "us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "api.ecr.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "api.elastic-inference" : {
-        "endpoints" : {
-          "ap-northeast-1" : {
-            "hostname" : "api.elastic-inference.ap-northeast-1.amazonaws.com"
-          },
-          "ap-northeast-2" : {
-            "hostname" : "api.elastic-inference.ap-northeast-2.amazonaws.com"
-          },
-          "eu-west-1" : {
-            "hostname" : "api.elastic-inference.eu-west-1.amazonaws.com"
-          },
-          "us-east-1" : {
-            "hostname" : "api.elastic-inference.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : {
-            "hostname" : "api.elastic-inference.us-east-2.amazonaws.com"
-          },
-          "us-west-2" : {
-            "hostname" : "api.elastic-inference.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "api.fleethub.iot" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "api.fleethub.iot-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "api.fleethub.iot-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "api.fleethub.iot-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "api.fleethub.iot-fips.us-west-2.amazonaws.com"
-          },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "api.mediatailor" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "us-east-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "api.pricing" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "pricing"
-          }
-        },
-        "endpoints" : {
-          "ap-south-1" : { },
-          "us-east-1" : { }
-        }
-      },
-      "api.sagemaker" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "api-fips.sagemaker.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : { },
-          "us-east-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "api-fips.sagemaker.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : { },
-          "us-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "api-fips.sagemaker.us-west-1.amazonaws.com"
-          },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "api-fips.sagemaker.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "apigateway" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "app-integrations" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "appflow" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "application-autoscaling" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
-        },
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "applicationinsights" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "appmesh" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "apprunner" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "eu-west-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "appstream2" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "appstream"
-          },
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "appstream2-fips.us-west-2.amazonaws.com"
-          },
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "appstream2-fips.us-east-1.amazonaws.com"
-          },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "appstream2-fips.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "appsync" : {
-        "endpoints" : {
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "aps" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "athena" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "athena-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "athena-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "athena-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "athena-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "auditmanager" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "autoscaling" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
-        },
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "autoscaling-plans" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
-        },
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "backup" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "batch" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "fips.batch.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "fips.batch.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "fips.batch.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "fips.batch.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "braket" : {
-        "endpoints" : {
-          "us-east-1" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "budgets" : {
-        "endpoints" : {
-          "aws-global" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "budgets.amazonaws.com"
-          }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-global"
-      },
-      "ce" : {
-        "endpoints" : {
-          "aws-global" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "ce.us-east-1.amazonaws.com"
-          }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-global"
-      },
-      "chime" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "aws-global" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "chime.us-east-1.amazonaws.com",
-            "protocols" : [ "https" ]
-          }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-global"
-      },
-      "cloud9" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "cloudcontrolapi" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "cloudcontrolapi-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "cloudcontrolapi-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "cloudcontrolapi-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "cloudcontrolapi-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "cloudcontrolapi-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "clouddirectory" : {
-        "endpoints" : {
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "cloudformation" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "cloudformation-fips.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : { },
-          "us-east-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "cloudformation-fips.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : { },
-          "us-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "cloudformation-fips.us-west-1.amazonaws.com"
-          },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "cloudformation-fips.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "cloudfront" : {
-        "endpoints" : {
-          "aws-global" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "cloudfront.amazonaws.com",
-            "protocols" : [ "http", "https" ]
-          }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-global"
-      },
-      "cloudhsm" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "cloudhsmv2" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "cloudhsm"
-          }
-        },
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "cloudsearch" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "cloudtrail" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "cloudtrail-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "cloudtrail-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "cloudtrail-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "cloudtrail-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "codeartifact" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "codebuild" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "codebuild-fips.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : { },
-          "us-east-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "codebuild-fips.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : { },
-          "us-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "codebuild-fips.us-west-1.amazonaws.com"
-          },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "codebuild-fips.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "codecommit" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "ca-central-1-fips" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "codecommit-fips.ca-central-1.amazonaws.com"
-          },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "codecommit-fips.ca-central-1.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "codecommit-fips.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : { },
-          "us-east-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "codecommit-fips.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : { },
-          "us-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "codecommit-fips.us-west-1.amazonaws.com"
-          },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "codecommit-fips.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "codedeploy" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "codedeploy-fips.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : { },
-          "us-east-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "codedeploy-fips.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : { },
-          "us-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "codedeploy-fips.us-west-1.amazonaws.com"
-          },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "codedeploy-fips.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "codeguru-reviewer" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "codepipeline" : {
-        "endpoints" : {
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "codepipeline-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "codepipeline-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "codepipeline-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "codepipeline-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "codepipeline-fips.us-west-2.amazonaws.com"
-          },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "codestar" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "codestar-connections" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "cognito-identity" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "cognito-identity-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "cognito-identity-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "cognito-identity-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "cognito-idp" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "cognito-idp-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "cognito-idp-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "cognito-idp-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "cognito-idp-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "cognito-sync" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "comprehend" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "comprehend-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "comprehend-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "comprehend-fips.us-west-2.amazonaws.com"
-          },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "comprehendmedical" : {
-        "endpoints" : {
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "comprehendmedical-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "comprehendmedical-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "comprehendmedical-fips.us-west-2.amazonaws.com"
-          },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "config" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "config-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "config-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "config-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "config-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "connect" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "contact-lens" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "cur" : {
-        "endpoints" : {
-          "us-east-1" : { }
-        }
-      },
-      "data.iot" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "iotdata"
-          },
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "service" : "iotdata"
-            },
-            "hostname" : "data.iot-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "service" : "iotdata"
-            },
-            "hostname" : "data.iot-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "service" : "iotdata"
-            },
-            "hostname" : "data.iot-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "service" : "iotdata"
-            },
-            "hostname" : "data.iot-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "service" : "iotdata"
-            },
-            "hostname" : "data.iot-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "data.jobs.iot" : {
-        "endpoints" : {
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "data.jobs.iot-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "data.jobs.iot-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "data.jobs.iot-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "data.jobs.iot-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "data.jobs.iot-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "data.mediastore" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "databrew" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "dataexchange" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "datapipeline" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-west-1" : { },
-          "us-east-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "datasync" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "datasync-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "datasync-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "datasync-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "datasync-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "datasync-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "dax" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "devicefarm" : {
-        "endpoints" : {
-          "us-west-2" : { }
-        }
-      },
-      "directconnect" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "directconnect-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "directconnect-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "directconnect-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "directconnect-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "discovery" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "dms" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "dms" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            }
-          },
-          "dms-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "dms-fips.us-west-1.amazonaws.com"
-          },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "dms-fips.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : { },
-          "us-east-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "dms-fips.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : { },
-          "us-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "dms-fips.us-west-1.amazonaws.com"
-          },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "dms-fips.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "docdb" : {
-        "endpoints" : {
-          "ap-northeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-1"
-            },
-            "hostname" : "rds.ap-northeast-1.amazonaws.com"
-          },
-          "ap-northeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-2"
-            },
-            "hostname" : "rds.ap-northeast-2.amazonaws.com"
-          },
-          "ap-south-1" : {
-            "credentialScope" : {
-              "region" : "ap-south-1"
-            },
-            "hostname" : "rds.ap-south-1.amazonaws.com"
-          },
-          "ap-southeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-1"
-            },
-            "hostname" : "rds.ap-southeast-1.amazonaws.com"
-          },
-          "ap-southeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-2"
-            },
-            "hostname" : "rds.ap-southeast-2.amazonaws.com"
-          },
-          "ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "rds.ca-central-1.amazonaws.com"
-          },
-          "eu-central-1" : {
-            "credentialScope" : {
-              "region" : "eu-central-1"
-            },
-            "hostname" : "rds.eu-central-1.amazonaws.com"
-          },
-          "eu-west-1" : {
-            "credentialScope" : {
-              "region" : "eu-west-1"
-            },
-            "hostname" : "rds.eu-west-1.amazonaws.com"
-          },
-          "eu-west-2" : {
-            "credentialScope" : {
-              "region" : "eu-west-2"
-            },
-            "hostname" : "rds.eu-west-2.amazonaws.com"
-          },
-          "eu-west-3" : {
-            "credentialScope" : {
-              "region" : "eu-west-3"
-            },
-            "hostname" : "rds.eu-west-3.amazonaws.com"
-          },
-          "sa-east-1" : {
-            "credentialScope" : {
-              "region" : "sa-east-1"
-            },
-            "hostname" : "rds.sa-east-1.amazonaws.com"
-          },
-          "us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "rds.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "rds.us-east-2.amazonaws.com"
-          },
-          "us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "rds.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "ds" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "ds-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "ds-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "ds-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "ds-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "ds-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "dynamodb" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
-        },
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "ca-central-1-fips" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "dynamodb-fips.ca-central-1.amazonaws.com"
-          },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "local" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "localhost:8000",
-            "protocols" : [ "http" ]
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "dynamodb-fips.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : { },
-          "us-east-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "dynamodb-fips.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : { },
-          "us-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "dynamodb-fips.us-west-1.amazonaws.com"
-          },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "dynamodb-fips.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "ebs" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "ebs-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "ebs-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "ebs-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "ebs-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "ebs-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "ec2" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
-        },
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "ec2-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "ec2-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "ec2-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "ec2-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "ec2-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "ecr" : {
-        "endpoints" : {
-          "af-south-1" : {
-            "credentialScope" : {
-              "region" : "af-south-1"
-            },
-            "hostname" : "api.ecr.af-south-1.amazonaws.com"
-          },
-          "ap-east-1" : {
-            "credentialScope" : {
-              "region" : "ap-east-1"
-            },
-            "hostname" : "api.ecr.ap-east-1.amazonaws.com"
-          },
-          "ap-northeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-1"
-            },
-            "hostname" : "api.ecr.ap-northeast-1.amazonaws.com"
-          },
-          "ap-northeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-2"
-            },
-            "hostname" : "api.ecr.ap-northeast-2.amazonaws.com"
-          },
-          "ap-northeast-3" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-3"
-            },
-            "hostname" : "api.ecr.ap-northeast-3.amazonaws.com"
-          },
-          "ap-south-1" : {
-            "credentialScope" : {
-              "region" : "ap-south-1"
-            },
-            "hostname" : "api.ecr.ap-south-1.amazonaws.com"
-          },
-          "ap-southeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-1"
-            },
-            "hostname" : "api.ecr.ap-southeast-1.amazonaws.com"
-          },
-          "ap-southeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-2"
-            },
-            "hostname" : "api.ecr.ap-southeast-2.amazonaws.com"
-          },
-          "ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "api.ecr.ca-central-1.amazonaws.com"
-          },
-          "dkr-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            }
-          },
-          "dkr-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            }
-          },
-          "dkr-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            }
-          },
-          "dkr-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            }
-          },
-          "eu-central-1" : {
-            "credentialScope" : {
-              "region" : "eu-central-1"
-            },
-            "hostname" : "api.ecr.eu-central-1.amazonaws.com"
-          },
-          "eu-north-1" : {
-            "credentialScope" : {
-              "region" : "eu-north-1"
-            },
-            "hostname" : "api.ecr.eu-north-1.amazonaws.com"
-          },
-          "eu-south-1" : {
-            "credentialScope" : {
-              "region" : "eu-south-1"
-            },
-            "hostname" : "api.ecr.eu-south-1.amazonaws.com"
-          },
-          "eu-west-1" : {
-            "credentialScope" : {
-              "region" : "eu-west-1"
-            },
-            "hostname" : "api.ecr.eu-west-1.amazonaws.com"
-          },
-          "eu-west-2" : {
-            "credentialScope" : {
-              "region" : "eu-west-2"
-            },
-            "hostname" : "api.ecr.eu-west-2.amazonaws.com"
-          },
-          "eu-west-3" : {
-            "credentialScope" : {
-              "region" : "eu-west-3"
-            },
-            "hostname" : "api.ecr.eu-west-3.amazonaws.com"
-          },
-          "fips-dkr-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "ecr-fips.us-east-1.amazonaws.com"
-          },
-          "fips-dkr-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "ecr-fips.us-east-2.amazonaws.com"
-          },
-          "fips-dkr-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "ecr-fips.us-west-1.amazonaws.com"
-          },
-          "fips-dkr-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "ecr-fips.us-west-2.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "ecr-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "ecr-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "ecr-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "ecr-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : {
-            "credentialScope" : {
-              "region" : "me-south-1"
-            },
-            "hostname" : "api.ecr.me-south-1.amazonaws.com"
-          },
-          "sa-east-1" : {
-            "credentialScope" : {
-              "region" : "sa-east-1"
-            },
-            "hostname" : "api.ecr.sa-east-1.amazonaws.com"
-          },
-          "us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "api.ecr.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "api.ecr.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "api.ecr.us-west-1.amazonaws.com"
-          },
-          "us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "api.ecr.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "ecs" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "ecs-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "ecs-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "ecs-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "ecs-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "eks" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
-        },
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "fips.eks.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "fips.eks.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "fips.eks.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "fips.eks.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "elasticache" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "elasticache-fips.us-west-1.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "elasticache-fips.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : { },
-          "us-east-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "elasticache-fips.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : { },
-          "us-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "elasticache-fips.us-west-1.amazonaws.com"
-          },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "elasticache-fips.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "elasticbeanstalk" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "elasticbeanstalk-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "elasticbeanstalk-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "elasticbeanstalk-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "elasticbeanstalk-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "elasticfilesystem" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-af-south-1" : {
-            "credentialScope" : {
-              "region" : "af-south-1"
-            },
-            "hostname" : "elasticfilesystem-fips.af-south-1.amazonaws.com"
-          },
-          "fips-ap-east-1" : {
-            "credentialScope" : {
-              "region" : "ap-east-1"
-            },
-            "hostname" : "elasticfilesystem-fips.ap-east-1.amazonaws.com"
-          },
-          "fips-ap-northeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-1"
-            },
-            "hostname" : "elasticfilesystem-fips.ap-northeast-1.amazonaws.com"
-          },
-          "fips-ap-northeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-2"
-            },
-            "hostname" : "elasticfilesystem-fips.ap-northeast-2.amazonaws.com"
-          },
-          "fips-ap-northeast-3" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-3"
-            },
-            "hostname" : "elasticfilesystem-fips.ap-northeast-3.amazonaws.com"
-          },
-          "fips-ap-south-1" : {
-            "credentialScope" : {
-              "region" : "ap-south-1"
-            },
-            "hostname" : "elasticfilesystem-fips.ap-south-1.amazonaws.com"
-          },
-          "fips-ap-southeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-1"
-            },
-            "hostname" : "elasticfilesystem-fips.ap-southeast-1.amazonaws.com"
-          },
-          "fips-ap-southeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-2"
-            },
-            "hostname" : "elasticfilesystem-fips.ap-southeast-2.amazonaws.com"
-          },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "elasticfilesystem-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-eu-central-1" : {
-            "credentialScope" : {
-              "region" : "eu-central-1"
-            },
-            "hostname" : "elasticfilesystem-fips.eu-central-1.amazonaws.com"
-          },
-          "fips-eu-north-1" : {
-            "credentialScope" : {
-              "region" : "eu-north-1"
-            },
-            "hostname" : "elasticfilesystem-fips.eu-north-1.amazonaws.com"
-          },
-          "fips-eu-south-1" : {
-            "credentialScope" : {
-              "region" : "eu-south-1"
-            },
-            "hostname" : "elasticfilesystem-fips.eu-south-1.amazonaws.com"
-          },
-          "fips-eu-west-1" : {
-            "credentialScope" : {
-              "region" : "eu-west-1"
-            },
-            "hostname" : "elasticfilesystem-fips.eu-west-1.amazonaws.com"
-          },
-          "fips-eu-west-2" : {
-            "credentialScope" : {
-              "region" : "eu-west-2"
-            },
-            "hostname" : "elasticfilesystem-fips.eu-west-2.amazonaws.com"
-          },
-          "fips-eu-west-3" : {
-            "credentialScope" : {
-              "region" : "eu-west-3"
-            },
-            "hostname" : "elasticfilesystem-fips.eu-west-3.amazonaws.com"
-          },
-          "fips-me-south-1" : {
-            "credentialScope" : {
-              "region" : "me-south-1"
-            },
-            "hostname" : "elasticfilesystem-fips.me-south-1.amazonaws.com"
-          },
-          "fips-sa-east-1" : {
-            "credentialScope" : {
-              "region" : "sa-east-1"
-            },
-            "hostname" : "elasticfilesystem-fips.sa-east-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "elasticfilesystem-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "elasticfilesystem-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "elasticfilesystem-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "elasticfilesystem-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "elasticloadbalancing" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "elasticloadbalancing-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "elasticloadbalancing-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "elasticloadbalancing-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "elasticloadbalancing-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "elasticmapreduce" : {
-        "defaults" : {
-          "protocols" : [ "https" ],
-          "sslCommonName" : "{region}.{service}.{dnsSuffix}"
-        },
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : {
-            "sslCommonName" : "{service}.{region}.{dnsSuffix}"
-          },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "elasticmapreduce-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "elasticmapreduce-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "elasticmapreduce-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "elasticmapreduce-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "elasticmapreduce-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : {
-            "sslCommonName" : "{service}.{region}.{dnsSuffix}"
-          },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "elastictranscoder" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-west-1" : { },
-          "us-east-1" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "email" : {
-        "endpoints" : {
-          "ap-south-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "us-east-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "emr-containers" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "emr-containers-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "emr-containers-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "emr-containers-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "emr-containers-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "emr-containers-fips.us-west-2.amazonaws.com"
-          },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "entitlement.marketplace" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "aws-marketplace"
-          }
-        },
-        "endpoints" : {
-          "us-east-1" : { }
-        }
-      },
-      "es" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "es-fips.us-west-1.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "es-fips.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : { },
-          "us-east-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "es-fips.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : { },
-          "us-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "es-fips.us-west-1.amazonaws.com"
-          },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "es-fips.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "events" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "events-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "events-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "events-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "events-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "finspace" : {
-        "endpoints" : {
-          "ca-central-1" : { },
-          "eu-west-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "finspace-api" : {
-        "endpoints" : {
-          "ca-central-1" : { },
-          "eu-west-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "firehose" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "firehose-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "firehose-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "firehose-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "firehose-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "fms" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-af-south-1" : {
-            "credentialScope" : {
-              "region" : "af-south-1"
-            },
-            "hostname" : "fms-fips.af-south-1.amazonaws.com"
-          },
-          "fips-ap-east-1" : {
-            "credentialScope" : {
-              "region" : "ap-east-1"
-            },
-            "hostname" : "fms-fips.ap-east-1.amazonaws.com"
-          },
-          "fips-ap-northeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-1"
-            },
-            "hostname" : "fms-fips.ap-northeast-1.amazonaws.com"
-          },
-          "fips-ap-northeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-2"
-            },
-            "hostname" : "fms-fips.ap-northeast-2.amazonaws.com"
-          },
-          "fips-ap-south-1" : {
-            "credentialScope" : {
-              "region" : "ap-south-1"
-            },
-            "hostname" : "fms-fips.ap-south-1.amazonaws.com"
-          },
-          "fips-ap-southeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-1"
-            },
-            "hostname" : "fms-fips.ap-southeast-1.amazonaws.com"
-          },
-          "fips-ap-southeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-2"
-            },
-            "hostname" : "fms-fips.ap-southeast-2.amazonaws.com"
-          },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "fms-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-eu-central-1" : {
-            "credentialScope" : {
-              "region" : "eu-central-1"
-            },
-            "hostname" : "fms-fips.eu-central-1.amazonaws.com"
-          },
-          "fips-eu-south-1" : {
-            "credentialScope" : {
-              "region" : "eu-south-1"
-            },
-            "hostname" : "fms-fips.eu-south-1.amazonaws.com"
-          },
-          "fips-eu-west-1" : {
-            "credentialScope" : {
-              "region" : "eu-west-1"
-            },
-            "hostname" : "fms-fips.eu-west-1.amazonaws.com"
-          },
-          "fips-eu-west-2" : {
-            "credentialScope" : {
-              "region" : "eu-west-2"
-            },
-            "hostname" : "fms-fips.eu-west-2.amazonaws.com"
-          },
-          "fips-eu-west-3" : {
-            "credentialScope" : {
-              "region" : "eu-west-3"
-            },
-            "hostname" : "fms-fips.eu-west-3.amazonaws.com"
-          },
-          "fips-me-south-1" : {
-            "credentialScope" : {
-              "region" : "me-south-1"
-            },
-            "hostname" : "fms-fips.me-south-1.amazonaws.com"
-          },
-          "fips-sa-east-1" : {
-            "credentialScope" : {
-              "region" : "sa-east-1"
-            },
-            "hostname" : "fms-fips.sa-east-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "fms-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "fms-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "fms-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "fms-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "forecast" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "forecast-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "forecast-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "forecast-fips.us-west-2.amazonaws.com"
-          },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "forecastquery" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "forecastquery-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "forecastquery-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "forecastquery-fips.us-west-2.amazonaws.com"
-          },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "frauddetector" : {
-        "endpoints" : {
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-west-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "fsx" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "fsx-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-prod-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "fsx-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-prod-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "fsx-fips.us-east-1.amazonaws.com"
-          },
-          "fips-prod-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "fsx-fips.us-east-2.amazonaws.com"
-          },
-          "fips-prod-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "fsx-fips.us-west-1.amazonaws.com"
-          },
-          "fips-prod-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "fsx-fips.us-west-2.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "fsx-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "fsx-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "fsx-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "fsx-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "prod-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            }
-          },
-          "prod-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            }
-          },
-          "prod-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            }
-          },
-          "prod-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            }
-          },
-          "prod-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            }
-          },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "gamelift" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "glacier" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
-        },
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "glacier-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "glacier-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "glacier-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "glacier-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "glacier-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "glue" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "glue-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "glue-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "glue-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "glue-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "grafana" : {
-        "endpoints" : {
-          "ap-northeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-1"
-            },
-            "hostname" : "grafana.ap-northeast-1.amazonaws.com"
-          },
-          "ap-northeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-2"
-            },
-            "hostname" : "grafana.ap-northeast-2.amazonaws.com"
-          },
-          "ap-southeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-1"
-            },
-            "hostname" : "grafana.ap-southeast-1.amazonaws.com"
-          },
-          "ap-southeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-2"
-            },
-            "hostname" : "grafana.ap-southeast-2.amazonaws.com"
-          },
-          "eu-central-1" : {
-            "credentialScope" : {
-              "region" : "eu-central-1"
-            },
-            "hostname" : "grafana.eu-central-1.amazonaws.com"
-          },
-          "eu-west-1" : {
-            "credentialScope" : {
-              "region" : "eu-west-1"
-            },
-            "hostname" : "grafana.eu-west-1.amazonaws.com"
-          },
-          "eu-west-2" : {
-            "credentialScope" : {
-              "region" : "eu-west-2"
-            },
-            "hostname" : "grafana.eu-west-2.amazonaws.com"
-          },
-          "us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "grafana.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "grafana.us-east-2.amazonaws.com"
-          },
-          "us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "grafana.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "greengrass" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        },
-        "isRegionalized" : true
-      },
-      "groundstation" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-northeast-2" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "groundstation-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "groundstation-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "groundstation-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "guardduty" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "guardduty-fips.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : { },
-          "us-east-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "guardduty-fips.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : { },
-          "us-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "guardduty-fips.us-west-1.amazonaws.com"
-          },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "guardduty-fips.us-west-2.amazonaws.com"
-          }
-        },
-        "isRegionalized" : true
-      },
-      "health" : {
-        "endpoints" : {
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "health-fips.us-east-2.amazonaws.com"
-          },
-          "us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            }
-          }
-        }
-      },
-      "healthlake" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "honeycode" : {
-        "endpoints" : {
-          "us-west-2" : { }
-        }
-      },
-      "iam" : {
-        "endpoints" : {
-          "aws-global" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "iam.amazonaws.com"
-          },
-          "aws-global-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "iam-fips.amazonaws.com"
-          },
-          "iam" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            }
-          },
-          "iam-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "iam-fips.amazonaws.com"
-          }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-global"
-      },
-      "identity-chime" : {
-        "endpoints" : {
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "identity-chime-fips.us-east-1.amazonaws.com"
-          }
-        }
-      },
-      "identitystore" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "importexport" : {
-        "endpoints" : {
-          "aws-global" : {
-            "credentialScope" : {
-              "region" : "us-east-1",
-              "service" : "IngestionService"
-            },
-            "hostname" : "importexport.amazonaws.com",
-            "signatureVersions" : [ "v2", "v4" ]
-          }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-global"
-      },
-      "inspector" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "inspector-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "inspector-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "inspector-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "inspector-fips.us-west-2.amazonaws.com"
-          },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "iot" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "execute-api"
-          }
-        },
-        "endpoints" : {
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "service" : "execute-api"
-            },
-            "hostname" : "iot-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "service" : "execute-api"
-            },
-            "hostname" : "iot-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "service" : "execute-api"
-            },
-            "hostname" : "iot-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "service" : "execute-api"
-            },
-            "hostname" : "iot-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "service" : "execute-api"
-            },
-            "hostname" : "iot-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "iotanalytics" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-south-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "iotevents" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "ioteventsdata" : {
-        "endpoints" : {
-          "ap-northeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-1"
-            },
-            "hostname" : "data.iotevents.ap-northeast-1.amazonaws.com"
-          },
-          "ap-northeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-2"
-            },
-            "hostname" : "data.iotevents.ap-northeast-2.amazonaws.com"
-          },
-          "ap-south-1" : {
-            "credentialScope" : {
-              "region" : "ap-south-1"
-            },
-            "hostname" : "data.iotevents.ap-south-1.amazonaws.com"
-          },
-          "ap-southeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-1"
-            },
-            "hostname" : "data.iotevents.ap-southeast-1.amazonaws.com"
-          },
-          "ap-southeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-2"
-            },
-            "hostname" : "data.iotevents.ap-southeast-2.amazonaws.com"
-          },
-          "eu-central-1" : {
-            "credentialScope" : {
-              "region" : "eu-central-1"
-            },
-            "hostname" : "data.iotevents.eu-central-1.amazonaws.com"
-          },
-          "eu-west-1" : {
-            "credentialScope" : {
-              "region" : "eu-west-1"
-            },
-            "hostname" : "data.iotevents.eu-west-1.amazonaws.com"
-          },
-          "eu-west-2" : {
-            "credentialScope" : {
-              "region" : "eu-west-2"
-            },
-            "hostname" : "data.iotevents.eu-west-2.amazonaws.com"
-          },
-          "us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "data.iotevents.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "data.iotevents.us-east-2.amazonaws.com"
-          },
-          "us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "data.iotevents.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "iotsecuredtunneling" : {
-        "endpoints" : {
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "api.tunneling.iot-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "api.tunneling.iot-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "api.tunneling.iot-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "api.tunneling.iot-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "api.tunneling.iot-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "iotsitewise" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "us-east-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "iotthingsgraph" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "iotthingsgraph"
-          }
-        },
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-southeast-2" : { },
-          "eu-west-1" : { },
-          "us-east-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "iotwireless" : {
-        "endpoints" : {
-          "ap-northeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-1"
-            },
-            "hostname" : "api.iotwireless.ap-northeast-1.amazonaws.com"
-          },
-          "ap-southeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-2"
-            },
-            "hostname" : "api.iotwireless.ap-southeast-2.amazonaws.com"
-          },
-          "eu-west-1" : {
-            "credentialScope" : {
-              "region" : "eu-west-1"
-            },
-            "hostname" : "api.iotwireless.eu-west-1.amazonaws.com"
-          },
-          "us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "api.iotwireless.us-east-1.amazonaws.com"
-          },
-          "us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "api.iotwireless.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "ivs" : {
-        "endpoints" : {
-          "eu-west-1" : { },
-          "us-east-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "kafka" : {
-        "endpoints" : {
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "kafkaconnect" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "kendra" : {
-        "endpoints" : {
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-west-1" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "kendra-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "kendra-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "kendra-fips.us-west-2.amazonaws.com"
-          },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "kinesis" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "kinesis-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "kinesis-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "kinesis-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "kinesis-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "kinesisanalytics" : {
-        "endpoints" : {
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "kinesisvideo" : {
-        "endpoints" : {
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "kms" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "af-south-1-fips" : {
-            "credentialScope" : {
-              "region" : "af-south-1"
-            },
-            "hostname" : "kms-fips.af-south-1.amazonaws.com"
-          },
-          "ap-east-1" : { },
-          "ap-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "ap-east-1"
-            },
-            "hostname" : "kms-fips.ap-east-1.amazonaws.com"
-          },
-          "ap-northeast-1" : { },
-          "ap-northeast-1-fips" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-1"
-            },
-            "hostname" : "kms-fips.ap-northeast-1.amazonaws.com"
-          },
-          "ap-northeast-2" : { },
-          "ap-northeast-2-fips" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-2"
-            },
-            "hostname" : "kms-fips.ap-northeast-2.amazonaws.com"
-          },
-          "ap-northeast-3" : { },
-          "ap-northeast-3-fips" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-3"
-            },
-            "hostname" : "kms-fips.ap-northeast-3.amazonaws.com"
-          },
-          "ap-south-1" : { },
-          "ap-south-1-fips" : {
-            "credentialScope" : {
-              "region" : "ap-south-1"
-            },
-            "hostname" : "kms-fips.ap-south-1.amazonaws.com"
-          },
-          "ap-southeast-1" : { },
-          "ap-southeast-1-fips" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-1"
-            },
-            "hostname" : "kms-fips.ap-southeast-1.amazonaws.com"
-          },
-          "ap-southeast-2" : { },
-          "ap-southeast-2-fips" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-2"
-            },
-            "hostname" : "kms-fips.ap-southeast-2.amazonaws.com"
-          },
-          "ca-central-1" : { },
-          "ca-central-1-fips" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "kms-fips.ca-central-1.amazonaws.com"
-          },
-          "eu-central-1" : { },
-          "eu-central-1-fips" : {
-            "credentialScope" : {
-              "region" : "eu-central-1"
-            },
-            "hostname" : "kms-fips.eu-central-1.amazonaws.com"
-          },
-          "eu-north-1" : { },
-          "eu-north-1-fips" : {
-            "credentialScope" : {
-              "region" : "eu-north-1"
-            },
-            "hostname" : "kms-fips.eu-north-1.amazonaws.com"
-          },
-          "eu-south-1" : { },
-          "eu-south-1-fips" : {
-            "credentialScope" : {
-              "region" : "eu-south-1"
-            },
-            "hostname" : "kms-fips.eu-south-1.amazonaws.com"
-          },
-          "eu-west-1" : { },
-          "eu-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "eu-west-1"
-            },
-            "hostname" : "kms-fips.eu-west-1.amazonaws.com"
-          },
-          "eu-west-2" : { },
-          "eu-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "eu-west-2"
-            },
-            "hostname" : "kms-fips.eu-west-2.amazonaws.com"
-          },
-          "eu-west-3" : { },
-          "eu-west-3-fips" : {
-            "credentialScope" : {
-              "region" : "eu-west-3"
-            },
-            "hostname" : "kms-fips.eu-west-3.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "me-south-1-fips" : {
-            "credentialScope" : {
-              "region" : "me-south-1"
-            },
-            "hostname" : "kms-fips.me-south-1.amazonaws.com"
-          },
-          "sa-east-1" : { },
-          "sa-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "sa-east-1"
-            },
-            "hostname" : "kms-fips.sa-east-1.amazonaws.com"
-          },
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "kms-fips.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : { },
-          "us-east-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "kms-fips.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : { },
-          "us-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "kms-fips.us-west-1.amazonaws.com"
-          },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "kms-fips.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "lakeformation" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "lakeformation-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "lakeformation-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "lakeformation-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "lakeformation-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "lambda" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "lambda-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "lambda-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "lambda-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "lambda-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "license-manager" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "license-manager-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "license-manager-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "license-manager-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "license-manager-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "lightsail" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "logs" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "logs-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "logs-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "logs-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "logs-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "lookoutequipment" : {
-        "endpoints" : {
-          "ap-northeast-2" : { },
-          "eu-west-1" : { },
-          "us-east-1" : { }
-        }
-      },
-      "lookoutvision" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "machinelearning" : {
-        "endpoints" : {
-          "eu-west-1" : { },
-          "us-east-1" : { }
-        }
-      },
-      "macie" : {
-        "endpoints" : {
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "macie-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "macie-fips.us-west-2.amazonaws.com"
-          },
-          "us-east-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "macie2" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "macie2-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "macie2-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "macie2-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "macie2-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "managedblockchain" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-southeast-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { }
-        }
-      },
-      "marketplacecommerceanalytics" : {
-        "endpoints" : {
-          "us-east-1" : { }
-        }
-      },
-      "mediaconnect" : {
-        "endpoints" : {
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "mediaconvert" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "mediaconvert-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "mediaconvert-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "mediaconvert-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "mediaconvert-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "mediaconvert-fips.us-west-2.amazonaws.com"
-          },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "medialive" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "medialive-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "medialive-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "medialive-fips.us-west-2.amazonaws.com"
-          },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "mediapackage" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "mediapackage-vod" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "mediastore" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "messaging-chime" : {
-        "endpoints" : {
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "messaging-chime-fips.us-east-1.amazonaws.com"
-          }
-        }
-      },
-      "metering.marketplace" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "aws-marketplace"
-          }
-        },
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "mgh" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "mgn" : {
-        "endpoints" : {
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "mobileanalytics" : {
-        "endpoints" : {
-          "us-east-1" : { }
-        }
-      },
-      "models-v2-lex" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "models.lex" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "lex"
-          }
-        },
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "models-fips.lex.us-east-1.amazonaws.com"
-          },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "models-fips.lex.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "monitoring" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
-        },
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "monitoring-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "monitoring-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "monitoring-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "monitoring-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "mq" : {
-        "endpoints" : {
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "mq-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "mq-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "mq-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "mq-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "mturk-requester" : {
-        "endpoints" : {
-          "sandbox" : {
-            "hostname" : "mturk-requester-sandbox.us-east-1.amazonaws.com"
-          },
-          "us-east-1" : { }
-        },
-        "isRegionalized" : false
-      },
-      "neptune" : {
-        "endpoints" : {
-          "ap-east-1" : {
-            "credentialScope" : {
-              "region" : "ap-east-1"
-            },
-            "hostname" : "rds.ap-east-1.amazonaws.com"
-          },
-          "ap-northeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-1"
-            },
-            "hostname" : "rds.ap-northeast-1.amazonaws.com"
-          },
-          "ap-northeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-2"
-            },
-            "hostname" : "rds.ap-northeast-2.amazonaws.com"
-          },
-          "ap-south-1" : {
-            "credentialScope" : {
-              "region" : "ap-south-1"
-            },
-            "hostname" : "rds.ap-south-1.amazonaws.com"
-          },
-          "ap-southeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-1"
-            },
-            "hostname" : "rds.ap-southeast-1.amazonaws.com"
-          },
-          "ap-southeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-2"
-            },
-            "hostname" : "rds.ap-southeast-2.amazonaws.com"
-          },
-          "ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "rds.ca-central-1.amazonaws.com"
-          },
-          "eu-central-1" : {
-            "credentialScope" : {
-              "region" : "eu-central-1"
-            },
-            "hostname" : "rds.eu-central-1.amazonaws.com"
-          },
-          "eu-north-1" : {
-            "credentialScope" : {
-              "region" : "eu-north-1"
-            },
-            "hostname" : "rds.eu-north-1.amazonaws.com"
-          },
-          "eu-west-1" : {
-            "credentialScope" : {
-              "region" : "eu-west-1"
-            },
-            "hostname" : "rds.eu-west-1.amazonaws.com"
-          },
-          "eu-west-2" : {
-            "credentialScope" : {
-              "region" : "eu-west-2"
-            },
-            "hostname" : "rds.eu-west-2.amazonaws.com"
-          },
-          "eu-west-3" : {
-            "credentialScope" : {
-              "region" : "eu-west-3"
-            },
-            "hostname" : "rds.eu-west-3.amazonaws.com"
-          },
-          "me-south-1" : {
-            "credentialScope" : {
-              "region" : "me-south-1"
-            },
-            "hostname" : "rds.me-south-1.amazonaws.com"
-          },
-          "sa-east-1" : {
-            "credentialScope" : {
-              "region" : "sa-east-1"
-            },
-            "hostname" : "rds.sa-east-1.amazonaws.com"
-          },
-          "us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "rds.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "rds.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "rds.us-west-1.amazonaws.com"
-          },
-          "us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "rds.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "network-firewall" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "network-firewall-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "network-firewall-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "network-firewall-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "network-firewall-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "network-firewall-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "networkmanager" : {
-        "endpoints" : {
-          "aws-global" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "networkmanager.us-west-2.amazonaws.com"
-          }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-global"
-      },
-      "nimble" : {
-        "endpoints" : {
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "oidc" : {
-        "endpoints" : {
-          "ap-northeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-1"
-            },
-            "hostname" : "oidc.ap-northeast-1.amazonaws.com"
-          },
-          "ap-northeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-2"
-            },
-            "hostname" : "oidc.ap-northeast-2.amazonaws.com"
-          },
-          "ap-south-1" : {
-            "credentialScope" : {
-              "region" : "ap-south-1"
-            },
-            "hostname" : "oidc.ap-south-1.amazonaws.com"
-          },
-          "ap-southeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-1"
-            },
-            "hostname" : "oidc.ap-southeast-1.amazonaws.com"
-          },
-          "ap-southeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-2"
-            },
-            "hostname" : "oidc.ap-southeast-2.amazonaws.com"
-          },
-          "ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "oidc.ca-central-1.amazonaws.com"
-          },
-          "eu-central-1" : {
-            "credentialScope" : {
-              "region" : "eu-central-1"
-            },
-            "hostname" : "oidc.eu-central-1.amazonaws.com"
-          },
-          "eu-north-1" : {
-            "credentialScope" : {
-              "region" : "eu-north-1"
-            },
-            "hostname" : "oidc.eu-north-1.amazonaws.com"
-          },
-          "eu-west-1" : {
-            "credentialScope" : {
-              "region" : "eu-west-1"
-            },
-            "hostname" : "oidc.eu-west-1.amazonaws.com"
-          },
-          "eu-west-2" : {
-            "credentialScope" : {
-              "region" : "eu-west-2"
-            },
-            "hostname" : "oidc.eu-west-2.amazonaws.com"
-          },
-          "eu-west-3" : {
-            "credentialScope" : {
-              "region" : "eu-west-3"
-            },
-            "hostname" : "oidc.eu-west-3.amazonaws.com"
-          },
-          "sa-east-1" : {
-            "credentialScope" : {
-              "region" : "sa-east-1"
-            },
-            "hostname" : "oidc.sa-east-1.amazonaws.com"
-          },
-          "us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "oidc.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "oidc.us-east-2.amazonaws.com"
-          },
-          "us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "oidc.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "opsworks" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "opsworks-cm" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "organizations" : {
-        "endpoints" : {
-          "aws-global" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "organizations.us-east-1.amazonaws.com"
-          },
-          "fips-aws-global" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "organizations-fips.us-east-1.amazonaws.com"
-          }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-global"
-      },
-      "outposts" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "outposts-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "outposts-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "outposts-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "outposts-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "outposts-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "personalize" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "pinpoint" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "mobiletargeting"
-          }
-        },
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "pinpoint-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "pinpoint-fips.us-west-2.amazonaws.com"
-          },
-          "us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "pinpoint.us-east-1.amazonaws.com"
-          },
-          "us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "pinpoint.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "polly" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "polly-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "polly-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "polly-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "polly-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "portal.sso" : {
-        "endpoints" : {
-          "ap-northeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-1"
-            },
-            "hostname" : "portal.sso.ap-northeast-1.amazonaws.com"
-          },
-          "ap-northeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-2"
-            },
-            "hostname" : "portal.sso.ap-northeast-2.amazonaws.com"
-          },
-          "ap-south-1" : {
-            "credentialScope" : {
-              "region" : "ap-south-1"
-            },
-            "hostname" : "portal.sso.ap-south-1.amazonaws.com"
-          },
-          "ap-southeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-1"
-            },
-            "hostname" : "portal.sso.ap-southeast-1.amazonaws.com"
-          },
-          "ap-southeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-2"
-            },
-            "hostname" : "portal.sso.ap-southeast-2.amazonaws.com"
-          },
-          "ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "portal.sso.ca-central-1.amazonaws.com"
-          },
-          "eu-central-1" : {
-            "credentialScope" : {
-              "region" : "eu-central-1"
-            },
-            "hostname" : "portal.sso.eu-central-1.amazonaws.com"
-          },
-          "eu-north-1" : {
-            "credentialScope" : {
-              "region" : "eu-north-1"
-            },
-            "hostname" : "portal.sso.eu-north-1.amazonaws.com"
-          },
-          "eu-west-1" : {
-            "credentialScope" : {
-              "region" : "eu-west-1"
-            },
-            "hostname" : "portal.sso.eu-west-1.amazonaws.com"
-          },
-          "eu-west-2" : {
-            "credentialScope" : {
-              "region" : "eu-west-2"
-            },
-            "hostname" : "portal.sso.eu-west-2.amazonaws.com"
-          },
-          "eu-west-3" : {
-            "credentialScope" : {
-              "region" : "eu-west-3"
-            },
-            "hostname" : "portal.sso.eu-west-3.amazonaws.com"
-          },
-          "sa-east-1" : {
-            "credentialScope" : {
-              "region" : "sa-east-1"
-            },
-            "hostname" : "portal.sso.sa-east-1.amazonaws.com"
-          },
-          "us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "portal.sso.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "portal.sso.us-east-2.amazonaws.com"
-          },
-          "us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "portal.sso.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "profile" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "projects.iot1click" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "qldb" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "qldb-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "qldb-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "qldb-fips.us-west-2.amazonaws.com"
-          },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "quicksight" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "api" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "ram" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "ram-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "ram-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "ram-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "ram-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "ram-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "rds" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "ca-central-1-fips" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "rds-fips.ca-central-1.amazonaws.com"
-          },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "rds-fips.ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "rds-fips.ca-central-1.amazonaws.com"
-          },
-          "rds-fips.us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "rds-fips.us-east-1.amazonaws.com"
-          },
-          "rds-fips.us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "rds-fips.us-east-2.amazonaws.com"
-          },
-          "rds-fips.us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "rds-fips.us-west-1.amazonaws.com"
-          },
-          "rds-fips.us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "rds-fips.us-west-2.amazonaws.com"
-          },
-          "rds.ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            }
-          },
-          "rds.us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            }
-          },
-          "rds.us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            }
-          },
-          "rds.us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            }
-          },
-          "rds.us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            }
-          },
-          "sa-east-1" : { },
-          "us-east-1" : {
-            "sslCommonName" : "{service}.{dnsSuffix}"
-          },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "rds-fips.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : { },
-          "us-east-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "rds-fips.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : { },
-          "us-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "rds-fips.us-west-1.amazonaws.com"
-          },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "rds-fips.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "redshift" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "redshift-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "redshift-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "redshift-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "redshift-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "redshift-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "rekognition" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "ca-central-1-fips" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "rekognition-fips.ca-central-1.amazonaws.com"
-          },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "rekognition-fips.ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "rekognition-fips.ca-central-1.amazonaws.com"
-          },
-          "rekognition-fips.us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "rekognition-fips.us-east-1.amazonaws.com"
-          },
-          "rekognition-fips.us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "rekognition-fips.us-east-2.amazonaws.com"
-          },
-          "rekognition-fips.us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "rekognition-fips.us-west-1.amazonaws.com"
-          },
-          "rekognition-fips.us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "rekognition-fips.us-west-2.amazonaws.com"
-          },
-          "rekognition.ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            }
-          },
-          "rekognition.us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            }
-          },
-          "rekognition.us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            }
-          },
-          "rekognition.us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            }
-          },
-          "rekognition.us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            }
-          },
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "rekognition-fips.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : { },
-          "us-east-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "rekognition-fips.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : { },
-          "us-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "rekognition-fips.us-west-1.amazonaws.com"
-          },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "rekognition-fips.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "resource-groups" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "resource-groups-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "resource-groups-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "resource-groups-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "resource-groups-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "robomaker" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-southeast-1" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "route53" : {
-        "endpoints" : {
-          "aws-global" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "route53.amazonaws.com"
-          },
-          "fips-aws-global" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "route53-fips.amazonaws.com"
-          }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-global"
-      },
-      "route53-recovery-control-config" : {
-        "endpoints" : {
-          "aws-global" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "route53-recovery-control-config.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "route53domains" : {
-        "endpoints" : {
-          "us-east-1" : { }
-        }
-      },
-      "route53resolver" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "runtime-v2-lex" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "runtime.lex" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "lex"
-          }
-        },
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "runtime-fips.lex.us-east-1.amazonaws.com"
-          },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "runtime-fips.lex.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "runtime.sagemaker" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "runtime-fips.sagemaker.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : { },
-          "us-east-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "runtime-fips.sagemaker.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : { },
-          "us-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "runtime-fips.sagemaker.us-west-1.amazonaws.com"
-          },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "runtime-fips.sagemaker.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "s3" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ],
-          "signatureVersions" : [ "s3v4" ]
-        },
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : {
-            "hostname" : "s3.ap-northeast-1.amazonaws.com",
-            "signatureVersions" : [ "s3", "s3v4" ]
-          },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : {
-            "hostname" : "s3.ap-southeast-1.amazonaws.com",
-            "signatureVersions" : [ "s3", "s3v4" ]
-          },
-          "ap-southeast-2" : {
-            "hostname" : "s3.ap-southeast-2.amazonaws.com",
-            "signatureVersions" : [ "s3", "s3v4" ]
-          },
-          "aws-global" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "s3.amazonaws.com",
-            "signatureVersions" : [ "s3", "s3v4" ]
-          },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : {
-            "hostname" : "s3.eu-west-1.amazonaws.com",
-            "signatureVersions" : [ "s3", "s3v4" ]
-          },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "s3-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "s3-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "s3-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "s3-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "s3-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "s3-external-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "s3-external-1.amazonaws.com",
-            "signatureVersions" : [ "s3", "s3v4" ]
-          },
-          "sa-east-1" : {
-            "hostname" : "s3.sa-east-1.amazonaws.com",
-            "signatureVersions" : [ "s3", "s3v4" ]
-          },
-          "us-east-1" : {
-            "hostname" : "s3.us-east-1.amazonaws.com",
-            "signatureVersions" : [ "s3", "s3v4" ]
-          },
-          "us-east-2" : { },
-          "us-west-1" : {
-            "hostname" : "s3.us-west-1.amazonaws.com",
-            "signatureVersions" : [ "s3", "s3v4" ]
-          },
-          "us-west-2" : {
-            "hostname" : "s3.us-west-2.amazonaws.com",
-            "signatureVersions" : [ "s3", "s3v4" ]
-          }
-        },
-        "isRegionalized" : true,
-        "partitionEndpoint" : "aws-global"
-      },
-      "s3-control" : {
-        "defaults" : {
-          "protocols" : [ "https" ],
-          "signatureVersions" : [ "s3v4" ]
-        },
-        "endpoints" : {
-          "ap-northeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-1"
-            },
-            "hostname" : "s3-control.ap-northeast-1.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "ap-northeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-2"
-            },
-            "hostname" : "s3-control.ap-northeast-2.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "ap-northeast-3" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-3"
-            },
-            "hostname" : "s3-control.ap-northeast-3.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "ap-south-1" : {
-            "credentialScope" : {
-              "region" : "ap-south-1"
-            },
-            "hostname" : "s3-control.ap-south-1.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "ap-southeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-1"
-            },
-            "hostname" : "s3-control.ap-southeast-1.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "ap-southeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-2"
-            },
-            "hostname" : "s3-control.ap-southeast-2.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "s3-control.ca-central-1.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "ca-central-1-fips" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "s3-control-fips.ca-central-1.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "eu-central-1" : {
-            "credentialScope" : {
-              "region" : "eu-central-1"
-            },
-            "hostname" : "s3-control.eu-central-1.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "eu-north-1" : {
-            "credentialScope" : {
-              "region" : "eu-north-1"
-            },
-            "hostname" : "s3-control.eu-north-1.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "eu-west-1" : {
-            "credentialScope" : {
-              "region" : "eu-west-1"
-            },
-            "hostname" : "s3-control.eu-west-1.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "eu-west-2" : {
-            "credentialScope" : {
-              "region" : "eu-west-2"
-            },
-            "hostname" : "s3-control.eu-west-2.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "eu-west-3" : {
-            "credentialScope" : {
-              "region" : "eu-west-3"
-            },
-            "hostname" : "s3-control.eu-west-3.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "sa-east-1" : {
-            "credentialScope" : {
-              "region" : "sa-east-1"
-            },
-            "hostname" : "s3-control.sa-east-1.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "s3-control.us-east-1.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "s3-control-fips.us-east-1.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "s3-control.us-east-2.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "us-east-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "s3-control-fips.us-east-2.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "s3-control.us-west-1.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "us-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "s3-control-fips.us-west-1.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "s3-control.us-west-2.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "s3-control-fips.us-west-2.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          }
-        }
-      },
-      "savingsplans" : {
-        "endpoints" : {
-          "aws-global" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "savingsplans.amazonaws.com"
-          }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-global"
-      },
-      "schemas" : {
-        "endpoints" : {
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "sdb" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ],
-          "signatureVersions" : [ "v2" ]
-        },
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-west-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : {
-            "hostname" : "sdb.amazonaws.com"
-          },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "secretsmanager" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "secretsmanager-fips.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : { },
-          "us-east-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "secretsmanager-fips.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : { },
-          "us-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "secretsmanager-fips.us-west-1.amazonaws.com"
-          },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "secretsmanager-fips.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "securityhub" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "securityhub-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "securityhub-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "securityhub-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "securityhub-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "serverlessrepo" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "ap-east-1" : {
-            "protocols" : [ "https" ]
-          },
-          "ap-northeast-1" : {
-            "protocols" : [ "https" ]
-          },
-          "ap-northeast-2" : {
-            "protocols" : [ "https" ]
-          },
-          "ap-south-1" : {
-            "protocols" : [ "https" ]
-          },
-          "ap-southeast-1" : {
-            "protocols" : [ "https" ]
-          },
-          "ap-southeast-2" : {
-            "protocols" : [ "https" ]
-          },
-          "ca-central-1" : {
-            "protocols" : [ "https" ]
-          },
-          "eu-central-1" : {
-            "protocols" : [ "https" ]
-          },
-          "eu-north-1" : {
-            "protocols" : [ "https" ]
-          },
-          "eu-west-1" : {
-            "protocols" : [ "https" ]
-          },
-          "eu-west-2" : {
-            "protocols" : [ "https" ]
-          },
-          "eu-west-3" : {
-            "protocols" : [ "https" ]
-          },
-          "me-south-1" : {
-            "protocols" : [ "https" ]
-          },
-          "sa-east-1" : {
-            "protocols" : [ "https" ]
-          },
-          "us-east-1" : {
-            "protocols" : [ "https" ]
-          },
-          "us-east-2" : {
-            "protocols" : [ "https" ]
-          },
-          "us-west-1" : {
-            "protocols" : [ "https" ]
-          },
-          "us-west-2" : {
-            "protocols" : [ "https" ]
-          }
-        }
-      },
-      "servicecatalog" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "servicecatalog-fips.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : { },
-          "us-east-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "servicecatalog-fips.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : { },
-          "us-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "servicecatalog-fips.us-west-1.amazonaws.com"
-          },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "servicecatalog-fips.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "servicecatalog-appregistry" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "servicecatalog-appregistry-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "servicecatalog-appregistry-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "servicecatalog-appregistry-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "servicecatalog-appregistry-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "servicecatalog-appregistry-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "servicediscovery" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "ca-central-1-fips" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "servicediscovery-fips.ca-central-1.amazonaws.com"
-          },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "servicediscovery" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            }
-          },
-          "servicediscovery-fips" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "servicediscovery-fips.ca-central-1.amazonaws.com"
-          },
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "servicediscovery-fips.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : { },
-          "us-east-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "servicediscovery-fips.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : { },
-          "us-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "servicediscovery-fips.us-west-1.amazonaws.com"
-          },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "servicediscovery-fips.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "servicequotas" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "session.qldb" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "session.qldb-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "session.qldb-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "session.qldb-fips.us-west-2.amazonaws.com"
-          },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "shield" : {
-        "defaults" : {
-          "protocols" : [ "https" ],
-          "sslCommonName" : "shield.us-east-1.amazonaws.com"
-        },
-        "endpoints" : {
-          "aws-global" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "shield.us-east-1.amazonaws.com"
-          },
-          "fips-aws-global" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "shield-fips.us-east-1.amazonaws.com"
-          }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-global"
-      },
-      "sms" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "sms-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "sms-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "sms-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "sms-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "snowball" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ap-northeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-1"
-            },
-            "hostname" : "snowball-fips.ap-northeast-1.amazonaws.com"
-          },
-          "fips-ap-northeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-2"
-            },
-            "hostname" : "snowball-fips.ap-northeast-2.amazonaws.com"
-          },
-          "fips-ap-northeast-3" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-3"
-            },
-            "hostname" : "snowball-fips.ap-northeast-3.amazonaws.com"
-          },
-          "fips-ap-south-1" : {
-            "credentialScope" : {
-              "region" : "ap-south-1"
-            },
-            "hostname" : "snowball-fips.ap-south-1.amazonaws.com"
-          },
-          "fips-ap-southeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-1"
-            },
-            "hostname" : "snowball-fips.ap-southeast-1.amazonaws.com"
-          },
-          "fips-ap-southeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-2"
-            },
-            "hostname" : "snowball-fips.ap-southeast-2.amazonaws.com"
-          },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "snowball-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-eu-central-1" : {
-            "credentialScope" : {
-              "region" : "eu-central-1"
-            },
-            "hostname" : "snowball-fips.eu-central-1.amazonaws.com"
-          },
-          "fips-eu-west-1" : {
-            "credentialScope" : {
-              "region" : "eu-west-1"
-            },
-            "hostname" : "snowball-fips.eu-west-1.amazonaws.com"
-          },
-          "fips-eu-west-2" : {
-            "credentialScope" : {
-              "region" : "eu-west-2"
-            },
-            "hostname" : "snowball-fips.eu-west-2.amazonaws.com"
-          },
-          "fips-eu-west-3" : {
-            "credentialScope" : {
-              "region" : "eu-west-3"
-            },
-            "hostname" : "snowball-fips.eu-west-3.amazonaws.com"
-          },
-          "fips-sa-east-1" : {
-            "credentialScope" : {
-              "region" : "sa-east-1"
-            },
-            "hostname" : "snowball-fips.sa-east-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "snowball-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "snowball-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "snowball-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "snowball-fips.us-west-2.amazonaws.com"
-          },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "sns" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
-        },
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "sns-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "sns-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "sns-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "sns-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "sqs" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ],
-          "sslCommonName" : "{region}.queue.{dnsSuffix}"
-        },
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "sqs-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "sqs-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "sqs-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "sqs-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : {
-            "sslCommonName" : "queue.{dnsSuffix}"
-          },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "ssm" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "ssm-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "ssm-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "ssm-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "ssm-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "ssm-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "ssm-incidents" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "states" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "states-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "states-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "states-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "states-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "storagegateway" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "ca-central-1-fips" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "storagegateway-fips.ca-central-1.amazonaws.com"
-          },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "storagegateway-fips.ca-central-1.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "storagegateway-fips.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : { },
-          "us-east-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "storagegateway-fips.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : { },
-          "us-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "storagegateway-fips.us-west-1.amazonaws.com"
-          },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "storagegateway-fips.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "streams.dynamodb" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "dynamodb"
-          },
-          "protocols" : [ "http", "https" ]
-        },
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "ca-central-1-fips" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "dynamodb-fips.ca-central-1.amazonaws.com"
-          },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "local" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "localhost:8000",
-            "protocols" : [ "http" ]
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "dynamodb-fips.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : { },
-          "us-east-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "dynamodb-fips.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : { },
-          "us-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "dynamodb-fips.us-west-1.amazonaws.com"
-          },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "dynamodb-fips.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "sts" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "aws-global" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "sts.amazonaws.com"
-          },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "sts-fips.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : { },
-          "us-east-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "sts-fips.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : { },
-          "us-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "sts-fips.us-west-1.amazonaws.com"
-          },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "sts-fips.us-west-2.amazonaws.com"
-          }
-        },
-        "partitionEndpoint" : "aws-global"
-      },
-      "support" : {
-        "endpoints" : {
-          "aws-global" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "support.us-east-1.amazonaws.com"
-          }
-        },
-        "partitionEndpoint" : "aws-global"
-      },
-      "swf" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "swf-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "swf-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "swf-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "swf-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "tagging" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "textract" : {
-        "endpoints" : {
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "textract-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "textract-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "textract-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "textract-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "textract-fips.us-west-2.amazonaws.com"
-          },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "transcribe" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "fips.transcribe.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "fips.transcribe.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "fips.transcribe.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "fips.transcribe.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "transcribestreaming" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "sa-east-1" : { },
-          "transcribestreaming-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            }
-          },
-          "transcribestreaming-fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "transcribestreaming-fips.ca-central-1.amazonaws.com"
-          },
-          "transcribestreaming-fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "transcribestreaming-fips.us-east-1.amazonaws.com"
-          },
-          "transcribestreaming-fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "transcribestreaming-fips.us-east-2.amazonaws.com"
-          },
-          "transcribestreaming-fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "transcribestreaming-fips.us-west-2.amazonaws.com"
-          },
-          "transcribestreaming-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            }
-          },
-          "transcribestreaming-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            }
-          },
-          "transcribestreaming-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            }
-          },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-2" : { }
-        }
-      },
-      "transfer" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "transfer-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "transfer-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "transfer-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "transfer-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "transfer-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "translate" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "us-east-1" : { },
-          "us-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "translate-fips.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : { },
-          "us-east-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "translate-fips.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : { },
-          "us-west-2" : { },
-          "us-west-2-fips" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "translate-fips.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "voiceid" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "waf" : {
-        "endpoints" : {
-          "aws" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            }
-          },
-          "aws-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "waf-fips.amazonaws.com"
-          },
-          "aws-global" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "waf.amazonaws.com"
-          },
-          "aws-global-fips" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "waf-fips.amazonaws.com"
-          }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-global"
-      },
-      "waf-regional" : {
-        "endpoints" : {
-          "af-south-1" : {
-            "credentialScope" : {
-              "region" : "af-south-1"
-            },
-            "hostname" : "waf-regional.af-south-1.amazonaws.com"
-          },
-          "ap-east-1" : {
-            "credentialScope" : {
-              "region" : "ap-east-1"
-            },
-            "hostname" : "waf-regional.ap-east-1.amazonaws.com"
-          },
-          "ap-northeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-1"
-            },
-            "hostname" : "waf-regional.ap-northeast-1.amazonaws.com"
-          },
-          "ap-northeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-2"
-            },
-            "hostname" : "waf-regional.ap-northeast-2.amazonaws.com"
-          },
-          "ap-northeast-3" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-3"
-            },
-            "hostname" : "waf-regional.ap-northeast-3.amazonaws.com"
-          },
-          "ap-south-1" : {
-            "credentialScope" : {
-              "region" : "ap-south-1"
-            },
-            "hostname" : "waf-regional.ap-south-1.amazonaws.com"
-          },
-          "ap-southeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-1"
-            },
-            "hostname" : "waf-regional.ap-southeast-1.amazonaws.com"
-          },
-          "ap-southeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-2"
-            },
-            "hostname" : "waf-regional.ap-southeast-2.amazonaws.com"
-          },
-          "ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "waf-regional.ca-central-1.amazonaws.com"
-          },
-          "eu-central-1" : {
-            "credentialScope" : {
-              "region" : "eu-central-1"
-            },
-            "hostname" : "waf-regional.eu-central-1.amazonaws.com"
-          },
-          "eu-north-1" : {
-            "credentialScope" : {
-              "region" : "eu-north-1"
-            },
-            "hostname" : "waf-regional.eu-north-1.amazonaws.com"
-          },
-          "eu-south-1" : {
-            "credentialScope" : {
-              "region" : "eu-south-1"
-            },
-            "hostname" : "waf-regional.eu-south-1.amazonaws.com"
-          },
-          "eu-west-1" : {
-            "credentialScope" : {
-              "region" : "eu-west-1"
-            },
-            "hostname" : "waf-regional.eu-west-1.amazonaws.com"
-          },
-          "eu-west-2" : {
-            "credentialScope" : {
-              "region" : "eu-west-2"
-            },
-            "hostname" : "waf-regional.eu-west-2.amazonaws.com"
-          },
-          "eu-west-3" : {
-            "credentialScope" : {
-              "region" : "eu-west-3"
-            },
-            "hostname" : "waf-regional.eu-west-3.amazonaws.com"
-          },
-          "fips-af-south-1" : {
-            "credentialScope" : {
-              "region" : "af-south-1"
-            },
-            "hostname" : "waf-regional-fips.af-south-1.amazonaws.com"
-          },
-          "fips-ap-east-1" : {
-            "credentialScope" : {
-              "region" : "ap-east-1"
-            },
-            "hostname" : "waf-regional-fips.ap-east-1.amazonaws.com"
-          },
-          "fips-ap-northeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-1"
-            },
-            "hostname" : "waf-regional-fips.ap-northeast-1.amazonaws.com"
-          },
-          "fips-ap-northeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-2"
-            },
-            "hostname" : "waf-regional-fips.ap-northeast-2.amazonaws.com"
-          },
-          "fips-ap-northeast-3" : {
-            "credentialScope" : {
-              "region" : "ap-northeast-3"
-            },
-            "hostname" : "waf-regional-fips.ap-northeast-3.amazonaws.com"
-          },
-          "fips-ap-south-1" : {
-            "credentialScope" : {
-              "region" : "ap-south-1"
-            },
-            "hostname" : "waf-regional-fips.ap-south-1.amazonaws.com"
-          },
-          "fips-ap-southeast-1" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-1"
-            },
-            "hostname" : "waf-regional-fips.ap-southeast-1.amazonaws.com"
-          },
-          "fips-ap-southeast-2" : {
-            "credentialScope" : {
-              "region" : "ap-southeast-2"
-            },
-            "hostname" : "waf-regional-fips.ap-southeast-2.amazonaws.com"
-          },
-          "fips-ca-central-1" : {
-            "credentialScope" : {
-              "region" : "ca-central-1"
-            },
-            "hostname" : "waf-regional-fips.ca-central-1.amazonaws.com"
-          },
-          "fips-eu-central-1" : {
-            "credentialScope" : {
-              "region" : "eu-central-1"
-            },
-            "hostname" : "waf-regional-fips.eu-central-1.amazonaws.com"
-          },
-          "fips-eu-north-1" : {
-            "credentialScope" : {
-              "region" : "eu-north-1"
-            },
-            "hostname" : "waf-regional-fips.eu-north-1.amazonaws.com"
-          },
-          "fips-eu-south-1" : {
-            "credentialScope" : {
-              "region" : "eu-south-1"
-            },
-            "hostname" : "waf-regional-fips.eu-south-1.amazonaws.com"
-          },
-          "fips-eu-west-1" : {
-            "credentialScope" : {
-              "region" : "eu-west-1"
-            },
-            "hostname" : "waf-regional-fips.eu-west-1.amazonaws.com"
-          },
-          "fips-eu-west-2" : {
-            "credentialScope" : {
-              "region" : "eu-west-2"
-            },
-            "hostname" : "waf-regional-fips.eu-west-2.amazonaws.com"
-          },
-          "fips-eu-west-3" : {
-            "credentialScope" : {
-              "region" : "eu-west-3"
-            },
-            "hostname" : "waf-regional-fips.eu-west-3.amazonaws.com"
-          },
-          "fips-me-south-1" : {
-            "credentialScope" : {
-              "region" : "me-south-1"
-            },
-            "hostname" : "waf-regional-fips.me-south-1.amazonaws.com"
-          },
-          "fips-sa-east-1" : {
-            "credentialScope" : {
-              "region" : "sa-east-1"
-            },
-            "hostname" : "waf-regional-fips.sa-east-1.amazonaws.com"
-          },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "waf-regional-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "waf-regional-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "waf-regional-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "waf-regional-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : {
-            "credentialScope" : {
-              "region" : "me-south-1"
-            },
-            "hostname" : "waf-regional.me-south-1.amazonaws.com"
-          },
-          "sa-east-1" : {
-            "credentialScope" : {
-              "region" : "sa-east-1"
-            },
-            "hostname" : "waf-regional.sa-east-1.amazonaws.com"
-          },
-          "us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "waf-regional.us-east-1.amazonaws.com"
-          },
-          "us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "waf-regional.us-east-2.amazonaws.com"
-          },
-          "us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "waf-regional.us-west-1.amazonaws.com"
-          },
-          "us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "waf-regional.us-west-2.amazonaws.com"
-          }
-        }
-      },
-      "wisdom" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-central-1" : { },
-          "eu-west-2" : { },
-          "us-east-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "workdocs" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "eu-west-1" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "workdocs-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "workdocs-fips.us-west-2.amazonaws.com"
-          },
-          "us-east-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "workmail" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "eu-west-1" : { },
-          "us-east-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "workspaces" : {
-        "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "workspaces-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "workspaces-fips.us-west-2.amazonaws.com"
-          },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-west-2" : { }
-        }
-      },
-      "xray" : {
-        "endpoints" : {
-          "af-south-1" : { },
-          "ap-east-1" : { },
-          "ap-northeast-1" : { },
-          "ap-northeast-2" : { },
-          "ap-northeast-3" : { },
-          "ap-south-1" : { },
-          "ap-southeast-1" : { },
-          "ap-southeast-2" : { },
-          "ca-central-1" : { },
-          "eu-central-1" : { },
-          "eu-north-1" : { },
-          "eu-south-1" : { },
-          "eu-west-1" : { },
-          "eu-west-2" : { },
-          "eu-west-3" : { },
-          "fips-us-east-1" : {
-            "credentialScope" : {
-              "region" : "us-east-1"
-            },
-            "hostname" : "xray-fips.us-east-1.amazonaws.com"
-          },
-          "fips-us-east-2" : {
-            "credentialScope" : {
-              "region" : "us-east-2"
-            },
-            "hostname" : "xray-fips.us-east-2.amazonaws.com"
-          },
-          "fips-us-west-1" : {
-            "credentialScope" : {
-              "region" : "us-west-1"
-            },
-            "hostname" : "xray-fips.us-west-1.amazonaws.com"
-          },
-          "fips-us-west-2" : {
-            "credentialScope" : {
-              "region" : "us-west-2"
-            },
-            "hostname" : "xray-fips.us-west-2.amazonaws.com"
-          },
-          "me-south-1" : { },
-          "sa-east-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
-        }
-      }
-    }
-  }, {
-    "defaults" : {
-      "hostname" : "{service}.{region}.{dnsSuffix}",
-      "protocols" : [ "https" ],
-      "signatureVersions" : [ "v4" ]
-    },
-    "dnsSuffix" : "amazonaws.com.cn",
-    "partition" : "aws-cn",
-    "partitionName" : "AWS China",
-    "regionRegex" : "^cn\\-\\w+\\-\\d+$",
-    "regions" : {
-      "cn-north-1" : {
-        "description" : "China (Beijing)"
-      },
-      "cn-northwest-1" : {
-        "description" : "China (Ningxia)"
-      }
-    },
-    "services" : {
-      "access-analyzer" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "account" : {
-        "endpoints" : {
-          "aws-cn-global" : {
-            "credentialScope" : {
-              "region" : "cn-northwest-1"
-            },
-            "hostname" : "account.cn-northwest-1.amazonaws.com.cn"
-          }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-cn-global"
-      },
-      "acm" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "api.ecr" : {
-        "endpoints" : {
-          "cn-north-1" : {
-            "credentialScope" : {
-              "region" : "cn-north-1"
-            },
-            "hostname" : "api.ecr.cn-north-1.amazonaws.com.cn"
-          },
-          "cn-northwest-1" : {
-            "credentialScope" : {
-              "region" : "cn-northwest-1"
-            },
-            "hostname" : "api.ecr.cn-northwest-1.amazonaws.com.cn"
-          }
-        }
-      },
-      "api.sagemaker" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "apigateway" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "application-autoscaling" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
-        },
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "applicationinsights" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "appmesh" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "appsync" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "athena" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "autoscaling" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
-        },
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "autoscaling-plans" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
-        },
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "backup" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "batch" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "budgets" : {
-        "endpoints" : {
-          "aws-cn-global" : {
-            "credentialScope" : {
-              "region" : "cn-northwest-1"
-            },
-            "hostname" : "budgets.amazonaws.com.cn"
-          }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-cn-global"
-      },
-      "ce" : {
-        "endpoints" : {
-          "aws-cn-global" : {
-            "credentialScope" : {
-              "region" : "cn-northwest-1"
-            },
-            "hostname" : "ce.cn-northwest-1.amazonaws.com.cn"
-          }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-cn-global"
-      },
-      "cloudformation" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "cloudfront" : {
-        "endpoints" : {
-          "aws-cn-global" : {
-            "credentialScope" : {
-              "region" : "cn-northwest-1"
-            },
-            "hostname" : "cloudfront.cn-northwest-1.amazonaws.com.cn",
-            "protocols" : [ "http", "https" ]
-          }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-cn-global"
-      },
-      "cloudtrail" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "codebuild" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "codecommit" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "codedeploy" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "cognito-identity" : {
-        "endpoints" : {
-          "cn-north-1" : { }
-        }
-      },
-      "config" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "cur" : {
-        "endpoints" : {
-          "cn-northwest-1" : { }
-        }
-      },
-      "data.iot" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "iotdata"
-          },
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "data.jobs.iot" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "databrew" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "dax" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "directconnect" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "dms" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "docdb" : {
-        "endpoints" : {
-          "cn-northwest-1" : {
-            "credentialScope" : {
-              "region" : "cn-northwest-1"
-            },
-            "hostname" : "rds.cn-northwest-1.amazonaws.com.cn"
-          }
-        }
-      },
-      "ds" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "dynamodb" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
-        },
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "ebs" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "ec2" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
-        },
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "ecr" : {
-        "endpoints" : {
-          "cn-north-1" : {
-            "credentialScope" : {
-              "region" : "cn-north-1"
-            },
-            "hostname" : "api.ecr.cn-north-1.amazonaws.com.cn"
-          },
-          "cn-northwest-1" : {
-            "credentialScope" : {
-              "region" : "cn-northwest-1"
-            },
-            "hostname" : "api.ecr.cn-northwest-1.amazonaws.com.cn"
-          }
-        }
-      },
-      "ecs" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "eks" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
-        },
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "elasticache" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "elasticbeanstalk" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "elasticfilesystem" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { },
-          "fips-cn-north-1" : {
-            "credentialScope" : {
-              "region" : "cn-north-1"
-            },
-            "hostname" : "elasticfilesystem-fips.cn-north-1.amazonaws.com.cn"
-          },
-          "fips-cn-northwest-1" : {
-            "credentialScope" : {
-              "region" : "cn-northwest-1"
-            },
-            "hostname" : "elasticfilesystem-fips.cn-northwest-1.amazonaws.com.cn"
-          }
-        }
-      },
-      "elasticloadbalancing" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "elasticmapreduce" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "emr-containers" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "es" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "events" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "firehose" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "fms" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "fsx" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "gamelift" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "glacier" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
-        },
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "glue" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "greengrass" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "cn-north-1" : { }
-        },
-        "isRegionalized" : true
-      },
-      "guardduty" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        },
-        "isRegionalized" : true
-      },
-      "health" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "iam" : {
-        "endpoints" : {
-          "aws-cn-global" : {
-            "credentialScope" : {
-              "region" : "cn-north-1"
-            },
-            "hostname" : "iam.cn-north-1.amazonaws.com.cn"
-          }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-cn-global"
-      },
-      "iot" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "execute-api"
-          }
-        },
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "iotanalytics" : {
-        "endpoints" : {
-          "cn-north-1" : { }
-        }
-      },
-      "iotevents" : {
-        "endpoints" : {
-          "cn-north-1" : { }
-        }
-      },
-      "ioteventsdata" : {
-        "endpoints" : {
-          "cn-north-1" : {
-            "credentialScope" : {
-              "region" : "cn-north-1"
-            },
-            "hostname" : "data.iotevents.cn-north-1.amazonaws.com.cn"
-          }
-        }
-      },
-      "iotsecuredtunneling" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "iotsitewise" : {
-        "endpoints" : {
-          "cn-north-1" : { }
-        }
-      },
-      "kafka" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "kinesis" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "kinesisanalytics" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "kms" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "lakeformation" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "lambda" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "license-manager" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "logs" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "mediaconvert" : {
-        "endpoints" : {
-          "cn-northwest-1" : {
-            "credentialScope" : {
-              "region" : "cn-northwest-1"
-            },
-            "hostname" : "subscribe.mediaconvert.cn-northwest-1.amazonaws.com.cn"
-          }
-        }
-      },
-      "monitoring" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
-        },
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "mq" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "neptune" : {
-        "endpoints" : {
-          "cn-north-1" : {
-            "credentialScope" : {
-              "region" : "cn-north-1"
-            },
-            "hostname" : "rds.cn-north-1.amazonaws.com.cn"
-          },
-          "cn-northwest-1" : {
-            "credentialScope" : {
-              "region" : "cn-northwest-1"
-            },
-            "hostname" : "rds.cn-northwest-1.amazonaws.com.cn"
-          }
-        }
-      },
-      "organizations" : {
-        "endpoints" : {
-          "aws-cn-global" : {
-            "credentialScope" : {
-              "region" : "cn-northwest-1"
-            },
-            "hostname" : "organizations.cn-northwest-1.amazonaws.com.cn"
-          }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-cn-global"
-      },
-      "personalize" : {
-        "endpoints" : {
-          "cn-north-1" : { }
-        }
-      },
-      "polly" : {
-        "endpoints" : {
-          "cn-northwest-1" : { }
-        }
-      },
-      "ram" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "rds" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "redshift" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "resource-groups" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "route53" : {
-        "endpoints" : {
-          "aws-cn-global" : {
-            "credentialScope" : {
-              "region" : "cn-northwest-1"
-            },
-            "hostname" : "route53.amazonaws.com.cn"
-          }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-cn-global"
-      },
-      "route53resolver" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "runtime.sagemaker" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "s3" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ],
-          "signatureVersions" : [ "s3v4" ]
-        },
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "s3-control" : {
-        "defaults" : {
-          "protocols" : [ "https" ],
-          "signatureVersions" : [ "s3v4" ]
-        },
-        "endpoints" : {
-          "cn-north-1" : {
-            "credentialScope" : {
-              "region" : "cn-north-1"
-            },
-            "hostname" : "s3-control.cn-north-1.amazonaws.com.cn",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "cn-northwest-1" : {
-            "credentialScope" : {
-              "region" : "cn-northwest-1"
-            },
-            "hostname" : "s3-control.cn-northwest-1.amazonaws.com.cn",
-            "signatureVersions" : [ "s3v4" ]
-          }
-        }
-      },
-      "secretsmanager" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "securityhub" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "serverlessrepo" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "cn-north-1" : {
-            "protocols" : [ "https" ]
-          },
-          "cn-northwest-1" : {
-            "protocols" : [ "https" ]
-          }
-        }
-      },
-      "servicecatalog" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "servicediscovery" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "sms" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "snowball" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { },
-          "fips-cn-north-1" : {
-            "credentialScope" : {
-              "region" : "cn-north-1"
-            },
-            "hostname" : "snowball-fips.cn-north-1.amazonaws.com.cn"
-          },
-          "fips-cn-northwest-1" : {
-            "credentialScope" : {
-              "region" : "cn-northwest-1"
-            },
-            "hostname" : "snowball-fips.cn-northwest-1.amazonaws.com.cn"
-          }
-        }
-      },
-      "sns" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
-        },
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "sqs" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ],
-          "sslCommonName" : "{region}.queue.{dnsSuffix}"
-        },
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "ssm" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "states" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "storagegateway" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "streams.dynamodb" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "dynamodb"
-          },
-          "protocols" : [ "http", "https" ]
-        },
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "sts" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "support" : {
-        "endpoints" : {
-          "aws-cn-global" : {
-            "credentialScope" : {
-              "region" : "cn-north-1"
-            },
-            "hostname" : "support.cn-north-1.amazonaws.com.cn"
-          }
-        },
-        "partitionEndpoint" : "aws-cn-global"
-      },
-      "swf" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "tagging" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "transcribe" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "cn-north-1" : {
-            "credentialScope" : {
-              "region" : "cn-north-1"
-            },
-            "hostname" : "cn.transcribe.cn-north-1.amazonaws.com.cn"
-          },
-          "cn-northwest-1" : {
-            "credentialScope" : {
-              "region" : "cn-northwest-1"
-            },
-            "hostname" : "cn.transcribe.cn-northwest-1.amazonaws.com.cn"
-          }
-        }
-      },
-      "transcribestreaming" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "transfer" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      },
-      "waf-regional" : {
-        "endpoints" : {
-          "cn-north-1" : {
-            "credentialScope" : {
-              "region" : "cn-north-1"
-            },
-            "hostname" : "waf-regional.cn-north-1.amazonaws.com.cn"
-          },
-          "cn-northwest-1" : {
-            "credentialScope" : {
-              "region" : "cn-northwest-1"
-            },
-            "hostname" : "waf-regional.cn-northwest-1.amazonaws.com.cn"
-          },
-          "fips-cn-north-1" : {
-            "credentialScope" : {
-              "region" : "cn-north-1"
-            },
-            "hostname" : "waf-regional-fips.cn-north-1.amazonaws.com.cn"
-          },
-          "fips-cn-northwest-1" : {
-            "credentialScope" : {
-              "region" : "cn-northwest-1"
-            },
-            "hostname" : "waf-regional-fips.cn-northwest-1.amazonaws.com.cn"
-          }
-        }
-      },
-      "workspaces" : {
-        "endpoints" : {
-          "cn-northwest-1" : { }
-        }
-      },
-      "xray" : {
-        "endpoints" : {
-          "cn-north-1" : { },
-          "cn-northwest-1" : { }
-        }
-      }
-    }
-  }, {
-    "defaults" : {
-      "hostname" : "{service}.{region}.{dnsSuffix}",
-      "protocols" : [ "https" ],
-      "signatureVersions" : [ "v4" ]
-    },
-    "dnsSuffix" : "amazonaws.com",
-    "partition" : "aws-us-gov",
-    "partitionName" : "AWS GovCloud (US)",
-    "regionRegex" : "^us\\-gov\\-\\w+\\-\\d+$",
-    "regions" : {
-      "us-gov-east-1" : {
-        "description" : "AWS GovCloud (US-East)"
-      },
-      "us-gov-west-1" : {
-        "description" : "AWS GovCloud (US-West)"
-      }
-    },
-    "services" : {
-      "access-analyzer" : {
-        "endpoints" : {
-          "us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "access-analyzer.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "access-analyzer.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "acm" : {
-        "endpoints" : {
-          "us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "acm.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "acm.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "acm-pca" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "acm-pca.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "acm-pca.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "api.detective" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "api.detective-fips.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "api.detective-fips.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "api.ecr" : {
-        "endpoints" : {
-          "dkr-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            }
-          },
-          "dkr-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            }
-          },
-          "fips-dkr-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "ecr-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-dkr-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "ecr-fips.us-gov-west-1.amazonaws.com"
-          },
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "ecr-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "ecr-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "api.ecr.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "api.ecr.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "api.sagemaker" : {
-        "endpoints" : {
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "api-fips.sagemaker.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-west-1-fips-secondary" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "api.sagemaker.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-west-1-secondary" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            }
-          }
-        }
-      },
-      "apigateway" : {
-        "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "application-autoscaling" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
-        },
-        "endpoints" : {
-          "us-gov-east-1" : {
-            "protocols" : [ "http", "https" ]
-          },
-          "us-gov-west-1" : {
-            "protocols" : [ "http", "https" ]
-          }
-        }
-      },
-      "applicationinsights" : {
-        "endpoints" : {
-          "us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "applicationinsights.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "applicationinsights.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "appstream2" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "appstream"
-          },
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "appstream2-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "appstream2-fips.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "athena" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "athena-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "athena-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "autoscaling" : {
-        "endpoints" : {
-          "us-gov-east-1" : {
-            "protocols" : [ "http", "https" ]
-          },
-          "us-gov-west-1" : {
-            "protocols" : [ "http", "https" ]
-          }
-        }
-      },
-      "autoscaling-plans" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
-        },
-        "endpoints" : {
-          "us-gov-east-1" : {
-            "protocols" : [ "http", "https" ]
-          },
-          "us-gov-west-1" : {
-            "protocols" : [ "http", "https" ]
-          }
-        }
-      },
-      "backup" : {
-        "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "batch" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "batch.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "batch.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "cloudcontrolapi" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "cloudcontrolapi-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "cloudcontrolapi-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "clouddirectory" : {
-        "endpoints" : {
-          "us-gov-west-1" : { }
-        }
-      },
-      "cloudformation" : {
-        "endpoints" : {
-          "us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "cloudformation.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "cloudformation.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "cloudhsm" : {
-        "endpoints" : {
-          "us-gov-west-1" : { }
-        }
-      },
-      "cloudhsmv2" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "cloudhsm"
-          }
-        },
-        "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "cloudtrail" : {
-        "endpoints" : {
-          "us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "cloudtrail.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "cloudtrail.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "codebuild" : {
-        "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "codebuild-fips.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "codebuild-fips.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "codecommit" : {
-        "endpoints" : {
-          "fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "codecommit-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "codecommit-fips.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "codecommit-fips.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "codedeploy" : {
-        "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "codedeploy-fips.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "codedeploy-fips.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "codepipeline" : {
-        "endpoints" : {
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "codepipeline-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { }
-        }
-      },
-      "cognito-identity" : {
-        "endpoints" : {
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "cognito-identity-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { }
-        }
-      },
-      "cognito-idp" : {
-        "endpoints" : {
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "cognito-idp-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { }
-        }
-      },
-      "comprehend" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "comprehend-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { }
-        }
-      },
-      "comprehendmedical" : {
-        "endpoints" : {
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "comprehendmedical-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { }
-        }
-      },
-      "config" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "config.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "config.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "connect" : {
-        "endpoints" : {
-          "us-gov-west-1" : { }
-        }
-      },
-      "data.iot" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "iotdata"
-          },
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "service" : "iotdata"
-            },
-            "hostname" : "data.iot-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "service" : "iotdata"
-            },
-            "hostname" : "data.iot-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "data.jobs.iot" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "data.jobs.iot-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "data.jobs.iot-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "databrew" : {
-        "endpoints" : {
-          "us-gov-west-1" : { }
-        }
-      },
-      "datasync" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "datasync-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "datasync-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "directconnect" : {
-        "endpoints" : {
-          "us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "directconnect.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "directconnect.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "dms" : {
-        "endpoints" : {
-          "dms" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            }
-          },
-          "dms-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "dms.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "dms.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "dms.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "docdb" : {
-        "endpoints" : {
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "rds.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "ds" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "ds-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "ds-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "dynamodb" : {
-        "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "dynamodb.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "dynamodb.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "ebs" : {
-        "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "ec2" : {
-        "endpoints" : {
-          "us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "ec2.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "ec2.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "ecr" : {
-        "endpoints" : {
-          "dkr-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            }
-          },
-          "dkr-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            }
-          },
-          "fips-dkr-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "ecr-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-dkr-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "ecr-fips.us-gov-west-1.amazonaws.com"
-          },
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "ecr-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "ecr-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "api.ecr.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "api.ecr.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "ecs" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "ecs-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "ecs-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "eks" : {
-        "defaults" : {
-          "protocols" : [ "http", "https" ]
-        },
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "eks.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "eks.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "elasticache" : {
-        "endpoints" : {
-          "fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "elasticache.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "elasticache.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "elasticbeanstalk" : {
-        "endpoints" : {
-          "us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "elasticbeanstalk.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "elasticbeanstalk.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "elasticfilesystem" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "elasticfilesystem-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "elasticfilesystem-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "elasticloadbalancing" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "elasticloadbalancing.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "elasticloadbalancing.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : {
-            "protocols" : [ "http", "https" ]
-          }
-        }
-      },
-      "elasticmapreduce" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "elasticmapreduce.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "elasticmapreduce.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : {
-            "protocols" : [ "https" ]
-          }
-        }
-      },
-      "email" : {
-        "endpoints" : {
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "email-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { }
-        }
-      },
-      "es" : {
-        "endpoints" : {
-          "fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "es-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "es-fips.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "es-fips.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "events" : {
-        "endpoints" : {
-          "us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "events.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "events.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "firehose" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "firehose-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "firehose-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "fms" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "fms-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "fms-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "fsx" : {
-        "endpoints" : {
-          "fips-prod-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "fsx-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-prod-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "fsx-fips.us-gov-west-1.amazonaws.com"
-          },
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "fsx-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "fsx-fips.us-gov-west-1.amazonaws.com"
-          },
-          "prod-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            }
-          },
-          "prod-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            }
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "glacier" : {
-        "endpoints" : {
-          "us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "glacier.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "glacier.us-gov-west-1.amazonaws.com",
-            "protocols" : [ "http", "https" ]
-          }
-        }
-      },
-      "glue" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "glue-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "glue-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "greengrass" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "dataplane-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "greengrass-ats.iot.us-gov-east-1.amazonaws.com"
-          },
-          "dataplane-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "greengrass-ats.iot.us-gov-west-1.amazonaws.com"
-          },
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "greengrass-fips.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "greengrass.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "greengrass.us-gov-west-1.amazonaws.com"
-          }
-        },
-        "isRegionalized" : true
-      },
-      "guardduty" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "guardduty.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "guardduty.us-gov-west-1.amazonaws.com"
-          }
-        },
-        "isRegionalized" : true
-      },
-      "health" : {
-        "endpoints" : {
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "health-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            }
-          }
-        }
-      },
-      "iam" : {
-        "endpoints" : {
-          "aws-us-gov-global" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "iam.us-gov.amazonaws.com"
-          },
-          "aws-us-gov-global-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "iam.us-gov.amazonaws.com"
-          },
-          "iam-govcloud" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            }
-          },
-          "iam-govcloud-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "iam.us-gov.amazonaws.com"
-          }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-us-gov-global"
-      },
-      "identitystore" : {
-        "endpoints" : {
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "identitystore.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { }
-        }
-      },
-      "inspector" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "inspector-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "inspector-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "iot" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "execute-api"
-          }
-        },
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "service" : "execute-api"
-            },
-            "hostname" : "iot-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "service" : "execute-api"
-            },
-            "hostname" : "iot-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "iotevents" : {
-        "endpoints" : {
-          "us-gov-west-1" : { }
-        }
-      },
-      "ioteventsdata" : {
-        "endpoints" : {
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "data.iotevents.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "iotsecuredtunneling" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "api.tunneling.iot-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "api.tunneling.iot-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "iotsitewise" : {
-        "endpoints" : {
-          "us-gov-west-1" : { }
-        }
-      },
-      "kafka" : {
-        "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "kendra" : {
-        "endpoints" : {
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "kendra-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { }
-        }
-      },
-      "kinesis" : {
-        "endpoints" : {
-          "us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "kinesis.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "kinesis.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "kinesisanalytics" : {
-        "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "kms" : {
-        "endpoints" : {
-          "ProdFips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "kms-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "kms-fips.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "kms-fips.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "lakeformation" : {
-        "endpoints" : {
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "lakeformation-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { }
-        }
-      },
-      "lambda" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "lambda-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "lambda-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "license-manager" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "license-manager-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "license-manager-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "logs" : {
-        "endpoints" : {
-          "us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "logs.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "logs.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "mediaconvert" : {
-        "endpoints" : {
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "mediaconvert.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "metering.marketplace" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "aws-marketplace"
-          }
-        },
-        "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "models.lex" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "lex"
-          }
-        },
-        "endpoints" : {
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "models-fips.lex.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "monitoring" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "monitoring.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "monitoring.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "mq" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "mq-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "mq-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "neptune" : {
-        "endpoints" : {
-          "us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "rds.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "rds.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "network-firewall" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "network-firewall-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "network-firewall-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "networkmanager" : {
-        "endpoints" : {
-          "aws-us-gov-global" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "networkmanager.us-gov-west-1.amazonaws.com"
-          }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-us-gov-global"
-      },
-      "oidc" : {
-        "endpoints" : {
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "oidc.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "organizations" : {
-        "endpoints" : {
-          "aws-us-gov-global" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "organizations.us-gov-west-1.amazonaws.com"
-          },
-          "fips-aws-us-gov-global" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "organizations.us-gov-west-1.amazonaws.com"
-          }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-us-gov-global"
-      },
-      "outposts" : {
-        "endpoints" : {
-          "us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "outposts.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "outposts.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "pinpoint" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "mobiletargeting"
-          }
-        },
-        "endpoints" : {
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "pinpoint-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "pinpoint.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "polly" : {
-        "endpoints" : {
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "polly-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { }
-        }
-      },
-      "portal.sso" : {
-        "endpoints" : {
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "portal.sso.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "quicksight" : {
-        "endpoints" : {
-          "api" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "ram" : {
-        "endpoints" : {
-          "us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "ram.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "ram.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "rds" : {
-        "endpoints" : {
-          "rds.us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "rds.us-gov-east-1.amazonaws.com"
-          },
-          "rds.us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "rds.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "rds.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "rds.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "redshift" : {
-        "endpoints" : {
-          "us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "redshift.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "redshift.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "rekognition" : {
-        "endpoints" : {
-          "rekognition-fips.us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "rekognition-fips.us-gov-west-1.amazonaws.com"
-          },
-          "rekognition.us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            }
-          },
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "rekognition-fips.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "resource-groups" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "resource-groups.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "resource-groups.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "route53" : {
-        "endpoints" : {
-          "aws-us-gov-global" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "route53.us-gov.amazonaws.com"
-          },
-          "fips-aws-us-gov-global" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "route53.us-gov.amazonaws.com"
-          }
-        },
-        "isRegionalized" : false,
-        "partitionEndpoint" : "aws-us-gov-global"
-      },
-      "route53resolver" : {
-        "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "runtime.lex" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "lex"
-          }
-        },
-        "endpoints" : {
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "runtime-fips.lex.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "runtime.sagemaker" : {
-        "endpoints" : {
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "runtime.sagemaker.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "s3" : {
-        "defaults" : {
-          "signatureVersions" : [ "s3", "s3v4" ]
-        },
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "s3-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "s3-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : {
-            "hostname" : "s3.us-gov-east-1.amazonaws.com",
-            "protocols" : [ "http", "https" ]
-          },
-          "us-gov-west-1" : {
-            "hostname" : "s3.us-gov-west-1.amazonaws.com",
-            "protocols" : [ "http", "https" ]
-          }
-        }
-      },
-      "s3-control" : {
-        "defaults" : {
-          "protocols" : [ "https" ],
-          "signatureVersions" : [ "s3v4" ]
-        },
-        "endpoints" : {
-          "us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "s3-control.us-gov-east-1.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "us-gov-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "s3-control-fips.us-gov-east-1.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "s3-control.us-gov-west-1.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "s3-control-fips.us-gov-west-1.amazonaws.com",
-            "signatureVersions" : [ "s3v4" ]
-          }
-        }
-      },
-      "secretsmanager" : {
-        "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "secretsmanager-fips.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "secretsmanager-fips.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "securityhub" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "securityhub-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "securityhub-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "serverlessrepo" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "serverlessrepo.us-gov-east-1.amazonaws.com",
-            "protocols" : [ "https" ]
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "serverlessrepo.us-gov-west-1.amazonaws.com",
-            "protocols" : [ "https" ]
-          }
-        }
-      },
-      "servicecatalog" : {
-        "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "servicecatalog-fips.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "servicecatalog-fips.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "servicecatalog-appregistry" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "servicecatalog-appregistry.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "servicecatalog-appregistry.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "servicediscovery" : {
-        "endpoints" : {
-          "servicediscovery" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            }
-          },
-          "servicediscovery-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "servicediscovery-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "servicediscovery-fips.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "servicediscovery-fips.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "servicequotas" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "servicequotas.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "servicequotas.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "sms" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "sms-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "sms-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "snowball" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "snowball-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "snowball-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "sns" : {
-        "endpoints" : {
-          "us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "sns.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "sns.us-gov-west-1.amazonaws.com",
-            "protocols" : [ "http", "https" ]
-          }
-        }
-      },
-      "sqs" : {
-        "endpoints" : {
-          "us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "sqs.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "sqs.us-gov-west-1.amazonaws.com",
-            "protocols" : [ "http", "https" ],
-            "sslCommonName" : "{region}.queue.{dnsSuffix}"
-          }
-        }
-      },
-      "ssm" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "ssm.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "ssm.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "states" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "states-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "states.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "storagegateway" : {
-        "endpoints" : {
-          "fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "storagegateway-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "storagegateway-fips.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "storagegateway-fips.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "streams.dynamodb" : {
-        "defaults" : {
-          "credentialScope" : {
-            "service" : "dynamodb"
-          }
-        },
-        "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "dynamodb.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "dynamodb.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "sts" : {
-        "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-east-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "sts.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "sts.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "support" : {
-        "endpoints" : {
-          "aws-us-gov-global" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "support.us-gov-west-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "support.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            }
-          }
-        },
-        "partitionEndpoint" : "aws-us-gov-global"
-      },
-      "swf" : {
-        "endpoints" : {
-          "us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "swf.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "swf.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "tagging" : {
-        "endpoints" : {
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "textract" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "textract-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "textract-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "transcribe" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "fips.transcribe.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "fips.transcribe.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "transfer" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "transfer-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "transfer-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      },
-      "translate" : {
-        "defaults" : {
-          "protocols" : [ "https" ]
-        },
-        "endpoints" : {
-          "us-gov-west-1" : { },
-          "us-gov-west-1-fips" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "translate-fips.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "waf-regional" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "waf-regional-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "waf-regional-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "waf-regional.us-gov-east-1.amazonaws.com"
-          },
-          "us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "waf-regional.us-gov-west-1.amazonaws.com"
-          }
-        }
-      },
-      "workspaces" : {
-        "endpoints" : {
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "workspaces-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-west-1" : { }
-        }
-      },
-      "xray" : {
-        "endpoints" : {
-          "fips-us-gov-east-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-east-1"
-            },
-            "hostname" : "xray-fips.us-gov-east-1.amazonaws.com"
-          },
-          "fips-us-gov-west-1" : {
-            "credentialScope" : {
-              "region" : "us-gov-west-1"
-            },
-            "hostname" : "xray-fips.us-gov-west-1.amazonaws.com"
-          },
-          "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
-        }
-      }
-    }
-  } ],
-  "version" : 3
-}
diff --git a/resources/icons/cloud9/dark/vscode-help.svg b/resources/icons/cloud9/dark/vscode-help.svg
deleted file mode 100644
index 94b17dfd8b4..00000000000
--- a/resources/icons/cloud9/dark/vscode-help.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g transform="translate(-205.896826, 0.500000)">
-            <g transform="translate(207.574860, 1.006419)">
-                <path d="M5.5,11 C2.46243388,11 0,8.53756612 0,5.5 C0,2.46243388 2.46243388,0 5.5,0 C8.53756612,0 11,2.46243388 11,5.5 C11,7.0535128 10.3559156,8.45659164 9.32021617,9.45676719 C8.33082412,10.4122237 6.98405332,11 5.5,11 Z" stroke="#EBEDF4" stroke-width="1.5"></path>
-                <rect fill="#EAECF3" x="4.63375" y="7.93038485" width="1.7325" height="1.73461804" rx="0.86625"></rect>
-                <path d="M4.71632086,4.18930803 C4.71632086,3.75898616 5.06967813,3.43448981 5.5,3.43448981 C5.93032187,3.43448981 6.27916667,3.78333461 6.27916667,4.21365648 C6.27916667,4.2709537 6.14234021,4.45680963 5.73523031,4.85374178 C5.5034906,5.079688 5.4382403,5.14470527 5.33046806,5.26190758 C4.93881063,5.68783503 4.72083333,6.07038519 4.72083333,6.55115648 C4.72083333,6.98147834 5.06967813,7.33032314 5.5,7.33032314 C5.93032187,7.33032314 6.27916667,6.98147834 6.27916667,6.55115648 L6.27916667,6.55115648 L6.27916667,6.55115648 C6.27916667,6.56529351 6.32836928,6.47894291 6.47755663,6.31670167 C6.55821032,6.22899079 6.61475786,6.17264521 6.82310302,5.96950867 C7.55933551,5.25168199 7.8375,4.8738419 7.8375,4.21365648 C7.8375,2.92269087 6.7909656,1.87615648 5.5,1.87615648 C4.2090344,1.87615648 3.1625,2.92269087 3.1625,4.21365648 C3.21166288,4.71587206 4.51469429,5.01477793 4.71632086,4.18930803 Z" fill="#EAECF3"></path>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/resources/icons/cloud9/light/vscode-help.svg b/resources/icons/cloud9/light/vscode-help.svg
deleted file mode 100644
index 81c89a3b963..00000000000
--- a/resources/icons/cloud9/light/vscode-help.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g transform="translate(-219.896826, -52.500000)">
-            <g transform="translate(221.442751, 54.006419)">
-                <path d="M5.5,11 C2.46243388,11 0,8.53756612 0,5.5 C0,2.46243388 2.46243388,0 5.5,0 C8.53756612,0 11,2.46243388 11,5.5 C11,7.0535128 10.3559156,8.45659164 9.32021617,9.45676719 C8.33082412,10.4122237 6.98405332,11 5.5,11 Z" stroke="#979797" stroke-width="1.5"></path>
-                <rect fill="#979797" x="4.63375" y="7.93038485" width="1.7325" height="1.73461804" rx="0.86625"></rect>
-                <path d="M4.71632086,4.18930803 C4.71632086,3.75898616 5.06967813,3.43448981 5.5,3.43448981 C5.93032187,3.43448981 6.27916667,3.78333461 6.27916667,4.21365648 C6.27916667,4.2709537 6.14234021,4.45680963 5.73523031,4.85374178 C5.5034906,5.079688 5.4382403,5.14470527 5.33046806,5.26190758 C4.93881063,5.68783503 4.72083333,6.07038519 4.72083333,6.55115648 C4.72083333,6.98147834 5.06967813,7.33032314 5.5,7.33032314 C5.93032187,7.33032314 6.27916667,6.98147834 6.27916667,6.55115648 L6.27916667,6.55115648 L6.27916667,6.55115648 C6.27916667,6.56529351 6.32836928,6.47894291 6.47755663,6.31670167 C6.55821032,6.22899079 6.61475786,6.17264521 6.82310302,5.96950867 C7.55933551,5.25168199 7.8375,4.8738419 7.8375,4.21365648 C7.8375,2.92269087 6.7909656,1.87615648 5.5,1.87615648 C4.2090344,1.87615648 3.1625,2.92269087 3.1625,4.21365648 C3.21166288,4.71587206 4.51469429,5.01477793 4.71632086,4.18930803 Z" fill="#979797"></path>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/resources/js/graphStateMachine.js b/resources/js/graphStateMachine.js
deleted file mode 100644
index 14bc0d4ea89..00000000000
--- a/resources/js/graphStateMachine.js
+++ /dev/null
@@ -1,126 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-const vscode = acquireVsCodeApi()
-
-let containerId = '#svgcontainer'
-let graph
-
-function renderStateMachine(data) {
-    let options = {
-        width: window.innerWidth,
-        height: window.innerHeight,
-        resizeHeight: false,
-    }
-    graph = new sfn.StateMachineGraph(JSON.parse(data), containerId, options)
-    graph.render()
-}
-
-const centerBtn = document.getElementById('center')
-const zoominBtn = document.getElementById('zoomin')
-const zoomoutBtn = document.getElementById('zoomout')
-let lastStateMachineData
-
-function updateGraph(message) {
-    let options = {
-        width: window.innerWidth,
-        height: window.innerHeight,
-        resizeHeight: false,
-    }
-
-    statusInfoContainer.classList.remove('in-sync-asl', 'not-in-sync-asl', 'start-error-asl')
-    statusInfoContainer.classList.add('syncing-asl')
-
-    if (!message.isValid) {
-        statusInfoContainer.classList.remove('syncing-asl', 'in-sync-asl', 'start-error-asl')
-
-        if (hasRenderedOnce) {
-            statusInfoContainer.classList.add('not-in-sync-asl')
-        } else {
-            statusInfoContainer.classList.add('start-error-asl')
-        }
-
-        return
-    }
-
-    try {
-        renderStateMachine(message.stateMachineData)
-
-        vscode.postMessage({
-            command: 'updateResult',
-            text: 'Successfully updated state machine graph.',
-            stateMachineData: message.stateMachineData,
-        })
-        statusInfoContainer.classList.remove('syncing-asl', 'not-in-sync-asl', 'start-error-asl')
-        statusInfoContainer.classList.add('in-sync-asl')
-        hasRenderedOnce = true
-        lastStateMachineData = message.stateMachineData
-    } catch (err) {
-        console.log('Error parsing state machine definition.')
-        console.log(err)
-
-        vscode.postMessage({
-            command: 'updateResult',
-            text: 'Error parsing state machine definition.',
-            error: err.toString(),
-            stateMachineData: message.stateMachineData,
-        })
-
-        statusInfoContainer.classList.remove('syncing-asl', 'in-sync-asl', 'start-error-asl')
-
-        if (hasRenderedOnce) {
-            statusInfoContainer.classList.add('not-in-sync-asl')
-        } else {
-            statusInfoContainer.classList.add('start-error-asl')
-        }
-    }
-}
-
-const statusInfoContainer = document.querySelector('.status-info')
-const previewButton = document.querySelector('.previewing-asl-message a')
-let hasRenderedOnce = false
-
-if (previewButton) {
-    previewButton.addEventListener('click', () => {
-        vscode.postMessage({ command: 'viewDocument' })
-    })
-}
-
-centerBtn.addEventListener('click', () => {
-    if (lastStateMachineData) {
-        renderStateMachine(lastStateMachineData)
-    }
-})
-
-zoominBtn.addEventListener('click', () => {
-    if (graph) {
-        graph.zoomIn()
-    }
-})
-
-zoomoutBtn.addEventListener('click', () => {
-    if (graph) {
-        graph.zoomOut()
-    }
-})
-
-// Message passing from extension to webview.
-// Capture state machine definition
-window.addEventListener('message', event => {
-    // event.data is object passed in from postMessage from vscode
-    const message = event.data
-    switch (message.command) {
-        case 'update': {
-            updateGraph(message)
-            break
-        }
-    }
-})
-
-// Let vscode know that the webview is finished rendering
-vscode.postMessage({
-    command: 'webviewRendered',
-    text: 'Webivew has finished rendering and is visible',
-})
diff --git a/resources/js/vscode.js b/resources/js/vscode.js
deleted file mode 100644
index 6cb30cade40..00000000000
--- a/resources/js/vscode.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-// This injects the VSC webview API into frontend components
-// eslint-disable-next-line no-undef
-const vscode = acquireVsCodeApi()
diff --git a/resources/marketplace/vscode/Codelens-YAML-template.png b/resources/marketplace/vscode/Codelens-YAML-template.png
deleted file mode 100644
index 25177d366cc..00000000000
Binary files a/resources/marketplace/vscode/Codelens-YAML-template.png and /dev/null differ
diff --git a/resources/marketplace/vscode/Codelens-direct-function.png b/resources/marketplace/vscode/Codelens-direct-function.png
deleted file mode 100644
index f3a3d725929..00000000000
Binary files a/resources/marketplace/vscode/Codelens-direct-function.png and /dev/null differ
diff --git a/resources/marketplace/vscode/cdk-tree-view.png b/resources/marketplace/vscode/cdk-tree-view.png
deleted file mode 100644
index 1a8f879345c..00000000000
Binary files a/resources/marketplace/vscode/cdk-tree-view.png and /dev/null differ
diff --git a/resources/marketplace/vscode/cloudwatch-logs.png b/resources/marketplace/vscode/cloudwatch-logs.png
deleted file mode 100644
index 8dd0cffa967..00000000000
Binary files a/resources/marketplace/vscode/cloudwatch-logs.png and /dev/null differ
diff --git a/resources/marketplace/vscode/ecs-task-def-intellisense.png b/resources/marketplace/vscode/ecs-task-def-intellisense.png
deleted file mode 100644
index 6f7be070988..00000000000
Binary files a/resources/marketplace/vscode/ecs-task-def-intellisense.png and /dev/null differ
diff --git a/resources/marketplace/vscode/eventbridge-search.png b/resources/marketplace/vscode/eventbridge-search.png
deleted file mode 100644
index caedb32e01a..00000000000
Binary files a/resources/marketplace/vscode/eventbridge-search.png and /dev/null differ
diff --git a/resources/marketplace/vscode/open-command-palette.gif b/resources/marketplace/vscode/open-command-palette.gif
deleted file mode 100644
index cbdfa964bec..00000000000
Binary files a/resources/marketplace/vscode/open-command-palette.gif and /dev/null differ
diff --git a/resources/marketplace/vscode/overview-aws-explorer.png b/resources/marketplace/vscode/overview-aws-explorer.png
deleted file mode 100644
index 0fbcde737b8..00000000000
Binary files a/resources/marketplace/vscode/overview-aws-explorer.png and /dev/null differ
diff --git a/resources/marketplace/vscode/overview-cdk.png b/resources/marketplace/vscode/overview-cdk.png
deleted file mode 100644
index bcea1e2c332..00000000000
Binary files a/resources/marketplace/vscode/overview-cdk.png and /dev/null differ
diff --git a/resources/marketplace/vscode/overview-codewhisperer.png b/resources/marketplace/vscode/overview-codewhisperer.png
deleted file mode 100644
index a3acd1af2fe..00000000000
Binary files a/resources/marketplace/vscode/overview-codewhisperer.png and /dev/null differ
diff --git a/resources/marketplace/vscode/sam-configure-and-run-still.png b/resources/marketplace/vscode/sam-configure-and-run-still.png
deleted file mode 100644
index cc9d6360d3c..00000000000
Binary files a/resources/marketplace/vscode/sam-configure-and-run-still.png and /dev/null differ
diff --git a/resources/marketplace/vscode/sam-launch-config.png b/resources/marketplace/vscode/sam-launch-config.png
deleted file mode 100644
index 709caad5236..00000000000
Binary files a/resources/marketplace/vscode/sam-launch-config.png and /dev/null differ
diff --git a/resources/marketplace/vscode/sfn-state-machine.png b/resources/marketplace/vscode/sfn-state-machine.png
deleted file mode 100644
index aabfb55b2c0..00000000000
Binary files a/resources/marketplace/vscode/sfn-state-machine.png and /dev/null differ
diff --git a/resources/marketplace/vscode/ssm-snippets.png b/resources/marketplace/vscode/ssm-snippets.png
deleted file mode 100644
index 2afd2cf2d95..00000000000
Binary files a/resources/marketplace/vscode/ssm-snippets.png and /dev/null differ
diff --git a/scripts/build/copyFiles.ts b/scripts/build/copyFiles.ts
deleted file mode 100644
index 36e234227d6..00000000000
--- a/scripts/build/copyFiles.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as fs from 'fs-extra'
-import * as path from 'path'
-
-// Moves all dependencies into `dist`
-// There is a single, optional flag `--webpacked` that moves localization files when present
-
-const repoRoot = process.cwd()
-const outRoot = path.join(repoRoot, 'dist')
-
-// The target file or directory must exist, otherwise we should fail the whole build.
-interface CopyTask {
-    /**
-     * Target file or directory to copy.
-     */
-    readonly target: string
-
-    /**
-     * Providing no destination means the target will be copied relative to the root directory.
-     */
-    readonly destination?: string
-}
-
-const tasks: CopyTask[] = [
-    { target: path.join('src', 'templates') },
-    { target: path.join('src', 'test', 'shared', 'cloudformation', 'yaml') },
-    { target: path.join('src', 'testFixtures') },
-
-    // SSM
-    {
-        target: path.join('node_modules', 'aws-ssm-document-language-service', 'dist', 'server.js'),
-        destination: path.join('src', 'ssmDocument', 'ssm', 'ssmServer.js'),
-    },
-    {
-        target: path.join('node_modules', 'aws-ssm-document-language-service', 'dist', 'server.js.LICENSE.txt'),
-        destination: path.join('src', 'ssmDocument', 'ssm', 'ssmServer.js.LICENSE.txt'),
-    },
-    {
-        target: path.join('node_modules', 'aws-ssm-document-language-service', 'dist', 'server.js.map'),
-        destination: path.join('src', 'ssmDocument', 'ssm', 'server.js.map'),
-    },
-
-    // Vue
-    {
-        target: path.join('resources', 'js', 'vscode.js'),
-        destination: path.join('libs', 'vscode.js'),
-    },
-    {
-        target: path.join('node_modules', 'vue', 'dist', 'vue.global.prod.js'),
-        destination: path.join('libs', 'vue.min.js'),
-    },
-]
-
-// Localization files are produced relative to `src` despite `tsc` emitting a compilation relative to the root
-const webpackedTasks: CopyTask[] = [
-    {
-        target: path.join('dist', 'nls.metadata.json'),
-        destination: path.join('src', 'nls.metadata.json'),
-    },
-    {
-        target: path.join('dist', 'nls.metadata.header.json'),
-        destination: path.join('src', 'nls.metadata.header.json'),
-    },
-]
-
-async function copy(task: CopyTask): Promise<void> {
-    const src = path.resolve(repoRoot, task.target)
-    const dst = path.resolve(outRoot, task.destination ?? task.target)
-
-    try {
-        await fs.copy(src, dst, {
-            recursive: true,
-            overwrite: true,
-            errorOnExist: false,
-        })
-    } catch (error) {
-        throw new Error(`Copy "${src}" to "${dst}" failed: ${error instanceof Error ? error.message : error}`)
-    }
-}
-
-;(async () => {
-    const args = process.argv.slice(2)
-
-    if (args.includes('--webpacked')) {
-        tasks.push(...webpackedTasks)
-    }
-
-    try {
-        await Promise.all(tasks.map(copy))
-    } catch (error) {
-        console.error('`copyFiles.ts` failed')
-        console.error(error)
-        process.exit(1)
-    }
-})()
diff --git a/scripts/build/createRelease.ts b/scripts/build/createRelease.ts
deleted file mode 100644
index 361491ccc7a..00000000000
--- a/scripts/build/createRelease.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-//
-// Generates CHANGELOG.md
-//
-
-import * as child_process from 'child_process'
-import * as fs from 'fs-extra'
-import * as path from 'path'
-import { version } from '../../package.json'
-
-const cwd = process.cwd()
-const changesDirectory = path.join(cwd, '.changes')
-const nextReleaseDirectory = path.join(changesDirectory, 'next-release')
-const changesFile = path.join(changesDirectory, `${version}.json`)
-
-fs.mkdirpSync(nextReleaseDirectory)
-
-const changeFiles = fs.readdirSync(nextReleaseDirectory)
-if (changeFiles.length === 0) {
-    console.warn('no changes to release (missing .changes/ directory)')
-    process.exit()
-}
-try {
-    fs.accessSync(changesFile)
-    console.log(`error: changelog data file already exists: ${changesFile}`)
-    process.exit(-1)
-} catch (err) {
-    // This is what we want to happen, the file should not exist
-}
-
-const timestamp = new Date().toISOString().split('T')[0]
-const changelog: any = {
-    date: timestamp,
-    version: version,
-    entries: [],
-}
-
-for (const changeFile of changeFiles) {
-    const file = JSON.parse(fs.readFileSync(path.join(nextReleaseDirectory, changeFile)).toString())
-    changelog.entries.push(file)
-}
-
-changelog.entries.sort((x: { type: string }, y: { type: string }) => x.type.localeCompare(y.type))
-
-// Write changelog file
-fs.writeFileSync(changesFile, JSON.stringify(changelog, undefined, '\t'))
-const fileData = fs.readFileSync(path.join(cwd, 'CHANGELOG.md'))
-let append = `## ${version} ${timestamp}\n\n`
-for (const file of changelog.entries) {
-    append += `- **${file.type}** ${file.description}\n`
-}
-
-append += '\n' + fileData.toString()
-fs.writeFileSync('CHANGELOG.md', append)
-
-child_process.execSync(`git add ${changesDirectory}`)
-child_process.execSync(`git rm -rf ${nextReleaseDirectory}`)
-child_process.execSync('git add CHANGELOG.md')
-
-console.log(changesFile)
diff --git a/scripts/build/generateConfigurationAttributes.ts b/scripts/build/generateConfigurationAttributes.ts
deleted file mode 100644
index e4e4a5b53ac..00000000000
--- a/scripts/build/generateConfigurationAttributes.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as fs from 'fs'
-import { JSONSchema4 } from 'json-schema'
-import { compile } from 'json-schema-to-typescript'
-import * as packageJson from '../../package.json'
-import * as nlsJson from '../../package.nls.json'
-
-const config = [
-    {
-        debugger: 'aws-sam',
-        requestType: 'direct-invoke' as const,
-        outputFile: 'src/shared/sam/debugger/awsSamDebugConfiguration.gen.ts',
-        imports: ["import * as vscode from 'vscode'"],
-        topLevelClass: 'AwsSamDebuggerConfiguration',
-    },
-]
-
-const header = `
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-/**
- * This file was automatically generated by json-schema-to-typescript.
- * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
- * and run json-schema-to-typescript to regenerate this file.
- */
-
-import * as vscode from 'vscode'
-`
-
-const docRegex = /%([a-zA-Z.]{1,})%/g
-const replacer: (match: string, key: string) => string = (match, key) =>
-    (nlsJson as { [key: string]: string })[key].replace(/\n/g, '\n* ') ?? match
-
-function addBaseClass(generated: string, topLevelClass: string): string {
-    return generated.replace(topLevelClass, `${topLevelClass} extends vscode.DebugConfiguration`)
-}
-
-async function generateConfigurationAttributes(): Promise<void> {
-    for (const debugConfiguration of packageJson.contributes.debuggers) {
-        const debuggerConfig = config.find(cfg => {
-            return cfg.debugger === debugConfiguration.type
-        })
-        if (debuggerConfig === undefined) {
-            continue
-        }
-        // JSONSchema4 impl doesn't like properties with type undefined, but the compilation works correctly
-        const schema = debugConfiguration.configurationAttributes[debuggerConfig.requestType] as any as JSONSchema4
-        await compile(schema, 'DirectInvoke', { bannerComment: header })
-            .then(ts => addBaseClass(ts, debuggerConfig.topLevelClass))
-            .then(ts => ts.replace(docRegex, replacer))
-            .then(ts => fs.writeFileSync(debuggerConfig.outputFile, ts))
-    }
-}
-
-;(async () => {
-    await generateConfigurationAttributes()
-})()
diff --git a/scripts/build/generateIcons.ts b/scripts/build/generateIcons.ts
deleted file mode 100644
index 378e86d8682..00000000000
--- a/scripts/build/generateIcons.ts
+++ /dev/null
@@ -1,218 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import webfont from 'webfont'
-import * as path from 'path'
-import * as fs from 'fs-extra'
-import * as packageJson from '../../package.json'
-
-const fontId = 'aws-toolkit-icons'
-const projectDir = process.cwd()
-const iconsDir = path.join(projectDir, 'resources', 'icons')
-const fontsDir = path.join(projectDir, 'resources', 'fonts')
-const stylesheetsDir = path.join(projectDir, 'resources', 'css')
-const iconSources = [
-    `resources/icons/**/*.svg`,
-    `node_modules/@vscode/codicons/src/icons/**/*.svg`,
-    '!**/{cloud9,dark,light}/**',
-]
-
-interface PackageIcon {
-    readonly description: string
-    readonly default: {
-        readonly fontPath: string
-        readonly fontCharacter: string
-    }
-}
-
-interface IconsContribution {
-    [id: string]: PackageIcon
-}
-
-function createPackageIcon(fontPath: string, unicode: string, description?: string): PackageIcon {
-    const codePoint = unicode.codePointAt(0)?.toString(16)
-
-    if (!codePoint) {
-        throw new Error(`Invalid unicode character: ${unicode}`)
-    }
-
-    return {
-        description: description ?? 'AWS Contributed Icon',
-        default: {
-            fontPath,
-            fontCharacter: `\\${codePoint}`,
-        },
-    }
-}
-
-async function updatePackage(fontPath: string, icons: [id: string, icon: PackageIcon][]): Promise<void> {
-    const contributes = packageJson.contributes as { icons?: IconsContribution }
-    const iconsContribution = (contributes.icons ??= {})
-
-    if (typeof iconsContribution !== 'object') {
-        throw new Error('Expected `icons` contribution to be an object')
-    }
-
-    for (const [id, icon] of Object.entries(iconsContribution)) {
-        if (icon.default?.fontPath === fontPath) {
-            delete iconsContribution[id]
-        }
-    }
-
-    for (const [id, icon] of icons) {
-        iconsContribution[id] = icon
-    }
-
-    // prettier adds a newline to JSON files
-    const newPackage = `${JSON.stringify(packageJson, undefined, 4)}\n`
-    await fs.writeFile(path.join(projectDir, 'package.json'), newPackage)
-    console.log('Updated package.json')
-}
-
-const themes = {
-    dark: '#C5C5C5',
-    light: '#424242',
-}
-
-async function generateCloud9Icons(targets: { name: string; path: string }[], destination: string): Promise<void> {
-    console.log('Generating icons for Cloud9')
-
-    async function replaceColor(file: string, color: string, dst: string): Promise<void> {
-        const contents = await fs.readFile(file, 'utf-8')
-        const replaced = contents.replace(/currentColor/g, color)
-        await fs.writeFile(dst, replaced)
-    }
-
-    for (const [theme, color] of Object.entries(themes)) {
-        const themeDest = path.join(destination, theme)
-        await fs.mkdirp(themeDest)
-        await Promise.all(targets.map(t => replaceColor(t.path, color, path.join(themeDest, `${t.name}.svg`))))
-    }
-}
-
-async function generate(mappings: Record<string, number | undefined> = {}) {
-    const dest = path.join(fontsDir, `${fontId}.woff`)
-    const relativeDest = path.relative(projectDir, dest)
-    const icons: { name: string; path: string; data?: PackageIcon }[] = []
-    const generated = new GeneratedFilesManifest()
-
-    const result = await webfont({
-        files: iconSources,
-        fontName: fontId,
-        formats: ['woff'],
-        startUnicode: 0xe000,
-        verbose: true,
-        normalize: true,
-        sort: true,
-        fontHeight: 1000,
-        template: 'css',
-        templateClassName: 'icon',
-        templateFontPath: path.relative(stylesheetsDir, fontsDir),
-        glyphTransformFn: obj => {
-            const filePath = (obj as { path?: string }).path
-
-            if (!filePath) {
-                throw new Error(`Expected glyph "${obj.name}" to have a file path`)
-            }
-
-            if (!obj.unicode) {
-                throw new Error(`Expected glyph "${obj.name}" to have the unicode property.`)
-            }
-
-            // If icon came from `node_modules` -> it's a codicon
-            if (filePath.includes('node_modules')) {
-                obj.name = `vscode-${path.basename(filePath).replace('.svg', '')}`
-                const mapping = mappings[obj.name]
-                if (mapping === undefined) {
-                    throw new Error(`No unicode mapping found for icon "${obj.name}"`)
-                }
-
-                obj.unicode = [String.fromCharCode(mapping)]
-            } else {
-                const parts = path.relative(iconsDir, filePath).split(path.sep)
-                obj.name = parts.join('-').replace('.svg', '')
-            }
-
-            if (!obj.name.startsWith('vscode')) {
-                // Normalize the font path regardless of platform
-                // See https://github.com/aws/aws-toolkit-vscode/pull/3066#discussion_r1063662657
-                const normalizedPath = relativeDest.split(path.sep).join(path.posix.sep)
-                icons.push({
-                    name: obj.name,
-                    path: filePath,
-                    data: createPackageIcon(`./${normalizedPath}`, obj.unicode[0]),
-                })
-            } else {
-                icons.push({ name: obj.name, path: filePath })
-            }
-            return obj
-        },
-    })
-
-    const template = `
-/* 
- * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. 
- * SPDX-License-Identifier: Apache-2.0 
- * 
- * This style sheet was generated using "${path.relative(projectDir, __filename)}". 
- */ 
-
-${result.template}
-`.trim()
-
-    const stylesheetPath = path.join(stylesheetsDir, 'icons.css')
-    const cloud9Dest = path.join(iconsDir, 'cloud9', 'generated')
-    const isValidIcon = (i: typeof icons[number]): i is Required<typeof i> => i.data !== undefined
-
-    await fs.mkdirp(fontsDir)
-    await fs.writeFile(dest, result.woff)
-    await fs.writeFile(stylesheetPath, template)
-    await updatePackage(
-        `./${relativeDest}`,
-        icons.filter(isValidIcon).map(i => [i.name, i.data])
-    )
-    await generateCloud9Icons(icons, cloud9Dest)
-
-    generated.addEntry(dest)
-    generated.addEntry(stylesheetPath)
-    generated.addEntry(cloud9Dest)
-
-    await generated.emit(path.join(projectDir, 'dist'))
-}
-
-class GeneratedFilesManifest {
-    private readonly files: string[] = []
-
-    public addEntry(file: string): void {
-        this.files.push(file)
-    }
-
-    public async emit(dir: string): Promise<void> {
-        const dest = path.join(dir, 'generated.buildinfo')
-        const data = JSON.stringify(this.files, undefined, 4)
-        await fs.mkdirp(dir)
-        await fs.writeFile(dest, data)
-    }
-}
-
-async function loadCodiconMappings(): Promise<Record<string, number | undefined>> {
-    const codicons = path.join(projectDir, 'node_modules', '@vscode', 'codicons', 'src')
-    const data = JSON.parse(await fs.readFile(path.join(codicons, 'template', 'mapping.json'), 'utf-8'))
-    const mappings: Record<string, number | undefined> = {}
-    for (const [k, v] of Object.entries(data)) {
-        if (typeof k === 'string' && typeof v === 'number') {
-            mappings[`vscode-${k}`] = v - 0xd000
-        }
-    }
-
-    return mappings
-}
-
-async function main() {
-    const mappings = await loadCodiconMappings()
-    await generate(mappings)
-}
-
-main()
diff --git a/scripts/build/generateNonCodeFiles.ts b/scripts/build/generateNonCodeFiles.ts
deleted file mode 100644
index e6aa48da3ee..00000000000
--- a/scripts/build/generateNonCodeFiles.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as child_process from 'child_process'
-import * as fs from 'fs-extra'
-import { marked } from 'marked'
-import * as path from 'path'
-
-// doesn't use path utils as this should be formatted for finding images with HTML markup
-const repoRoot = process.cwd()
-
-/**
- * replaces relative paths with an `!!EXTENSIONROOT!!` token.
- * This makes it easier to swap in relative links when the extension loads.
- * @param root Repository root
- * @param inputFile Input .md file to swap to HTML
- * @param outputFile Filepath to output HTML to
- * @param cn Converts "AWS" to "Amazon" for CN-based compute.
- */
-function translateReadmeToHtml(root: string, inputFile: string, outputFile: string, cn: boolean = false) {
-    const fileText = fs.readFileSync(path.join(root, inputFile)).toString()
-    const relativePathRegex = /]\(\.\//g
-    let transformedText = fileText.replace(relativePathRegex, '](!!EXTENSIONROOT!!/')
-    if (cn) {
-        transformedText = transformedText.replace(/AWS/g, 'Amazon').replace(/-en.png/g, '-cn.png')
-    }
-
-    marked.parse(transformedText, (err, result) => {
-        fs.writeFileSync(path.join(root, outputFile), result)
-    })
-}
-
-/**
- * Do a best effort job of generating a git hash and putting it into the package
- */
-function generateFileHash(root: string) {
-    try {
-        const response = child_process.execSync('git rev-parse HEAD')
-        fs.outputFileSync(path.join(root, '.gitcommit'), response)
-    } catch (e) {
-        console.log(`Getting commit hash failed ${e}`)
-    }
-}
-
-try {
-    translateReadmeToHtml(repoRoot, 'README.quickstart.vscode.md', 'quickStartVscode.html')
-    translateReadmeToHtml(repoRoot, 'README.quickstart.cloud9.md', 'quickStartCloud9.html')
-    translateReadmeToHtml(repoRoot, 'README.quickstart.cloud9.md', 'quickStartCloud9-cn.html', true)
-    generateFileHash(repoRoot)
-} catch (error) {
-    console.error(error)
-    process.exit(100)
-}
diff --git a/scripts/build/generateServiceClient.ts b/scripts/build/generateServiceClient.ts
deleted file mode 100644
index 6fdcffe27d9..00000000000
--- a/scripts/build/generateServiceClient.ts
+++ /dev/null
@@ -1,223 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as child_process from 'child_process'
-import * as fs from 'fs-extra'
-import * as path from 'path'
-
-const repoRoot = process.cwd()
-/**
- * This script uses the AWS JS SDK to generate service clients where the client definition is contained within
- * this repo. Client definitions are added at the bottom of this script.
- */
-
-interface ServiceClientDefinition {
-    serviceName: string
-    serviceJsonPath: string
-}
-
-async function generateServiceClients(serviceClientDefinitions: ServiceClientDefinition[]): Promise<void> {
-    const tempJsSdkPath = path.join(repoRoot, 'node_modules', '.zzz-awssdk2')
-    console.log(`Temp JS SDK Repo location: ${tempJsSdkPath}`)
-    console.log('Service Clients to Generate: ', serviceClientDefinitions.map(x => x.serviceName).join(', '))
-
-    await cloneJsSdk(tempJsSdkPath)
-    await insertServiceClientsIntoJsSdk(tempJsSdkPath, serviceClientDefinitions)
-    await runTypingsGenerator(tempJsSdkPath)
-    await integrateServiceClients(tempJsSdkPath, serviceClientDefinitions)
-
-    console.log('Done generating service client(s)')
-}
-
-/** When cloning aws-sdk-js, we want to pull the version actually used in package-lock.json. */
-function getJsSdkVersion(): string {
-    const json = fs.readFileSync(path.resolve(repoRoot, 'package-lock.json')).toString()
-    const packageLock = JSON.parse(json)
-
-    return packageLock['dependencies']['aws-sdk']['version']
-}
-
-async function cloneJsSdk(dir: string): Promise<void> {
-    // Output stderr while it clones so it doesn't look frozen
-    return new Promise<void>((resolve, reject) => {
-        const tag = `v${getJsSdkVersion()}`
-
-        const gitHead = child_process.spawnSync('git', ['-C', dir, 'rev-parse', 'HEAD'])
-
-        const alreadyCloned = gitHead.status !== undefined && gitHead.status === 0
-        const msg = `${alreadyCloned ? 'Updating' : 'Cloning'} AWS JS SDK...
-    tag: ${tag}
-    git: status=${gitHead.status} output=${gitHead.output.toString()}`
-        console.log(msg)
-
-        const gitArgs = alreadyCloned
-            ? // Local repo exists already: just update it and checkout the tag.
-              // Fetch only the tag we need.
-              //      git fetch origin tag v2.950.0 --no-tags
-              ['-C', dir, 'fetch', 'origin', 'tag', tag, '--no-tags']
-            : // Local repo does not exist: clone it.
-              ['clone', '-b', tag, '--depth', '1', 'https://github.com/aws/aws-sdk-js.git', dir]
-
-        const gitCmd = child_process.execFile('git', gitArgs, { encoding: 'utf8' })
-
-        gitCmd.stderr?.on('data', (data: any) => {
-            console.log(data)
-        })
-        gitCmd.once('close', (code, signal) => {
-            gitCmd.stdout?.removeAllListeners()
-
-            // Only needed for the "update" case, but harmless for "clone".
-            const gitCheckout = child_process.spawnSync('git', ['-C', dir, 'checkout', '--force', tag])
-            if (gitCheckout.status !== undefined && gitCheckout.status !== 0) {
-                console.log(`error: git: status=${gitCheckout.status} output=${gitCheckout.output.toString()}`)
-            }
-
-            resolve()
-        })
-    })
-}
-
-async function insertServiceClientsIntoJsSdk(
-    jsSdkPath: string,
-    serviceClientDefinitions: ServiceClientDefinition[]
-): Promise<void> {
-    serviceClientDefinitions.forEach(serviceClientDefinition => {
-        const apiVersion = getApiVersion(serviceClientDefinition.serviceJsonPath)
-
-        // Copy the Service Json into the JS SDK for generation
-        const jsSdkServiceJsonPath = path.join(
-            jsSdkPath,
-            'apis',
-            `${serviceClientDefinition.serviceName.toLowerCase()}-${apiVersion}.normal.json`
-        )
-        fs.copyFileSync(serviceClientDefinition.serviceJsonPath, jsSdkServiceJsonPath)
-    })
-
-    const apiMetadataPath = path.join(jsSdkPath, 'apis', 'metadata.json')
-    await patchServicesIntoApiMetadata(
-        apiMetadataPath,
-        serviceClientDefinitions.map(x => x.serviceName)
-    )
-}
-
-interface ServiceJsonSchema {
-    metadata: {
-        apiVersion: string
-    }
-}
-
-function getApiVersion(serviceJsonPath: string): string {
-    const json = fs.readFileSync(serviceJsonPath).toString()
-    const serviceJson = JSON.parse(json) as ServiceJsonSchema
-
-    return serviceJson.metadata.apiVersion
-}
-
-interface ApiMetadata {
-    [key: string]: { name: string }
-}
-
-/**
- * Updates the JS SDK's api metadata to contain the provided services
- */
-async function patchServicesIntoApiMetadata(apiMetadataPath: string, serviceNames: string[]): Promise<void> {
-    console.log(`Patching services (${serviceNames.join(', ')}) into API Metadata...`)
-
-    const apiMetadataJson = fs.readFileSync(apiMetadataPath).toString()
-    const apiMetadata = JSON.parse(apiMetadataJson) as ApiMetadata
-
-    serviceNames.forEach(serviceName => {
-        apiMetadata[serviceName.toLowerCase()] = { name: serviceName }
-    })
-
-    fs.writeFileSync(apiMetadataPath, JSON.stringify(apiMetadata, undefined, 4))
-}
-
-/**
- * Generates service clients
- */
-async function runTypingsGenerator(repoPath: string): Promise<void> {
-    console.log('Generating service client typings...')
-
-    const stdout = child_process.execFileSync('node', ['scripts/typings-generator.js'], {
-        encoding: 'utf8',
-        cwd: repoPath,
-    })
-    console.log(stdout)
-}
-
-/**
- * Copies the generated service clients into the repo
- */
-async function integrateServiceClients(
-    repoPath: string,
-    serviceClientDefinitions: ServiceClientDefinition[]
-): Promise<void> {
-    for (const serviceClientDefinition of serviceClientDefinitions) {
-        await integrateServiceClient(
-            repoPath,
-            serviceClientDefinition.serviceJsonPath,
-            serviceClientDefinition.serviceName
-        )
-    }
-}
-
-/**
- * Copies the generated service client into the repo
- */
-async function integrateServiceClient(repoPath: string, serviceJsonPath: string, serviceName: string): Promise<void> {
-    const typingsFilename = `${serviceName.toLowerCase()}.d.ts`
-    const sourceClientPath = path.join(repoPath, 'clients', typingsFilename)
-    const destinationClientPath = path.join(path.dirname(serviceJsonPath), typingsFilename)
-
-    console.log(`Integrating ${typingsFilename} ...`)
-
-    fs.copyFileSync(sourceClientPath, destinationClientPath)
-
-    await sanitizeServiceClient(destinationClientPath)
-}
-
-/**
- * Patches the type file imports to be relative to the SDK module
- */
-async function sanitizeServiceClient(generatedClientPath: string): Promise<void> {
-    console.log('Altering Service Client to fit the codebase...')
-
-    let fileContents = fs.readFileSync(generatedClientPath).toString()
-
-    // Add a header stating the file is autogenerated
-    fileContents = `
-/**
- * THIS FILE IS AUTOGENERATED BY 'generateServiceClient.ts'.
- * DO NOT EDIT BY HAND.
- */
-
-${fileContents}
-    `
-
-    fileContents = fileContents.replace(/(import .* from.*)\.\.(.*)/g, '$1aws-sdk$2')
-
-    fs.writeFileSync(generatedClientPath, fileContents)
-}
-
-// ---------------------------------------------------------------------------------------------------------------------
-
-;(async () => {
-    const serviceClientDefinitions: ServiceClientDefinition[] = [
-        {
-            serviceJsonPath: 'src/shared/telemetry/service-2.json',
-            serviceName: 'ClientTelemetry',
-        },
-        {
-            serviceJsonPath: 'src/codewhisperer/client/service-2.json',
-            serviceName: 'CodeWhispererClient',
-        },
-        {
-            serviceJsonPath: 'src/codewhisperer/client/user-service-2.json',
-            serviceName: 'CodeWhispererUserClient',
-        },
-    ]
-    await generateServiceClients(serviceClientDefinitions)
-})()
diff --git a/scripts/build/package.ts b/scripts/build/package.ts
deleted file mode 100644
index 824ba5ed3ed..00000000000
--- a/scripts/build/package.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-//
-// Creates an artifact that can be given to users for testing alpha/beta builds:
-//
-//     aws-toolkit-vscode-1.999.0-xxxxxxxxxxxx.vsix
-//
-// Where `xxxxxxxxxxxx` is the first 12 characters of the commit hash that produced the artifact
-//
-// The script works like this:
-// 1. temporarily change `version` in package.json
-// 2. invoke `vsce package`
-// 3. restore the original package.json
-//
-
-import type * as manifest from '../../package.json'
-import * as child_process from 'child_process'
-import * as fs from 'fs-extra'
-
-// Importing from `src` isn't great but it does make things simple
-import { betaUrl } from '../../src/dev/config'
-
-const packageJsonFile = './package.json'
-const webpackConfigJsFile = './webpack.config.js'
-
-function parseArgs() {
-    // Invoking this script with argument "foo":
-    //   $ npm run package -- foo
-    // yields this argv:
-    //   0: /…/node_modules/.bin/ts-node
-    //   1: /…/src/scripts/build/package.ts
-    //   2: foo
-
-    const givenArgs = process.argv.slice(2)
-    const validOptions = ['--debug', '--no-clean']
-
-    for (const a of givenArgs) {
-        if (!validOptions.includes(a)) {
-            throw Error(`invalid argument: ${a}`)
-        }
-    }
-
-    return {
-        /** Produce an unoptimized VSIX. Include git SHA in version string. */
-        debug: givenArgs.includes('--debug'),
-        /** Skips `npm run clean` when building the VSIX. This prevents file watching from breaking. */
-        skipClean: givenArgs.includes('--no-clean'),
-    }
-}
-
-/**
- * If the current commit is tagged then it is a "release build", else it is
- * a prerelease/nightly/edge/preview build.
- */
-function isRelease(): boolean {
-    return child_process.execSync('git tag -l --contains HEAD').toString() !== ''
-}
-
-/**
- * Whether or not this a private beta build
- */
-function isBeta(): boolean {
-    return !!betaUrl
-}
-
-/**
- * Gets a suffix to append to the version-string, or empty for release builds.
- *
- * TODO: use `git describe` instead.
- *
- * @returns version-string suffix, for example: "-e6ecd84685a9"
- */
-function getVersionSuffix(): string {
-    if (isRelease()) {
-        return ''
-    }
-    const commitId = child_process.execSync('git rev-parse --short=12 HEAD').toString().trim()
-    if (!commitId) {
-        return ''
-    }
-    return `-${commitId}`
-}
-
-function main() {
-    const args = parseArgs()
-    let release = true
-
-    try {
-        release = isRelease()
-
-        if (release && isBeta()) {
-            throw new Error('Cannot package VSIX as both a release and a beta simultaneously')
-        }
-
-        if (!release || args.debug) {
-            // Create backup files so we can restore the originals later.
-            fs.copyFileSync(packageJsonFile, `${packageJsonFile}.bk`)
-            fs.copyFileSync(webpackConfigJsFile, `${webpackConfigJsFile}.bk`)
-
-            const packageJson: typeof manifest = JSON.parse(fs.readFileSync(packageJsonFile, { encoding: 'utf-8' }))
-            const versionSuffix = getVersionSuffix()
-            const version = packageJson.version
-            // Setting the version to an arbitrarily high number stops VSC from auto-updating the beta extension
-            const betaOrDebugVersion = `1.999.0${versionSuffix}`
-            if (isBeta() || args.debug) {
-                packageJson.version = betaOrDebugVersion
-            } else {
-                packageJson.version = version.replace('-SNAPSHOT', versionSuffix)
-            }
-
-            if (args.skipClean) {
-                // Clearly we need `prepublish` to be a standalone script and not a bunch of `npm` commands
-                const prepublish = packageJson.scripts['vscode:prepublish']
-                const replaced = prepublish.replace('npm run clean', 'echo "Skipped clean"')
-                packageJson.scripts['vscode:prepublish'] = replaced
-            }
-
-            fs.writeFileSync(packageJsonFile, JSON.stringify(packageJson, undefined, '    '))
-
-            if (args.debug) {
-                const webpackConfigJs = fs.readFileSync(webpackConfigJsFile, { encoding: 'utf-8' })
-                fs.writeFileSync(webpackConfigJsFile, webpackConfigJs.replace(/minimize: true/, 'minimize: false'))
-            }
-        }
-
-        child_process.execSync(`vsce package`, { stdio: 'inherit' })
-        const packageJson = JSON.parse(fs.readFileSync(packageJsonFile, { encoding: 'utf-8' }))
-        console.log(`VSIX Version: ${packageJson.version}`)
-    } catch (e) {
-        console.log(e)
-        throw Error('package.ts: failed')
-    } finally {
-        if (!release) {
-            // Restore the original files.
-            fs.copyFileSync(`${packageJsonFile}.bk`, packageJsonFile)
-            fs.copyFileSync(`${webpackConfigJsFile}.bk`, webpackConfigJsFile)
-            fs.unlinkSync(`${packageJsonFile}.bk`)
-            fs.unlinkSync(`${webpackConfigJsFile}.bk`)
-        }
-    }
-}
-
-main()
diff --git a/scripts/clean.ts b/scripts/clean.ts
index d27eb827be5..4076e6d6480 100644
--- a/scripts/clean.ts
+++ b/scripts/clean.ts
@@ -1,5 +1,5 @@
 /*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -24,15 +24,19 @@ const unlink = util.promisify(fs.unlink)
 // to be run before `npm install`.
 async function rdelete(p: string) {
     const stats = await stat(p)
-    if (stats.isFile()) {
+    if (!stats.isFile() && !stats.isDirectory()) {
+        throw new Error(`Could not delete '${p}' because it is neither a file nor directory`)
+    }
+
+    try {
         await unlink(p)
-    } else if (stats.isDirectory()) {
+    } catch {
+        // Unlink should only fail if it is a non-empty directory that is NOT a symbolic link.
+        // stats.isSymoblicLink() does not seem to detect symbolic links to folders?
         const promises = (await readdir(p)).map(child => rdelete(path.join(p, child)))
 
         await Promise.all(promises)
         await rmdir(p)
-    } else {
-        throw new Error(`Could not delete '${p}' because it is neither a file nor directory`)
     }
 }
 
@@ -83,7 +87,7 @@ async function getGenerated(): Promise<string[]> {
     }
 }
 
-;(async () => {
+void (async () => {
     const args = process.argv.slice(2).concat(await getGenerated())
     await Promise.all(args.map(tryDeleteRelative))
 })()
diff --git a/scripts/createRelease.ts b/scripts/createRelease.ts
new file mode 100644
index 00000000000..d6f39203fc1
--- /dev/null
+++ b/scripts/createRelease.ts
@@ -0,0 +1,65 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+//
+// Generates CHANGELOG.md
+//
+
+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'
+
+// Must run from a subproject root folder, e.g packages/toolkit
+const cwd = process.cwd()
+const packageJson = JSON.parse(nodefs.readFileSync('./package.json', { encoding: 'utf-8' }))
+const changesDirectory = path.join(cwd, '.changes')
+const nextReleaseDirectory = path.join(changesDirectory, 'next-release')
+const changesFile = path.join(changesDirectory, `${packageJson.version}.json`)
+
+nodefs.mkdirSync(nextReleaseDirectory, { recursive: true })
+
+const changeFiles = nodefs.readdirSync(nextReleaseDirectory)
+try {
+    nodefs.accessSync(changesFile)
+    console.log(`error: changelog data file already exists: ${changesFile}`)
+    process.exit(-1)
+} catch (err) {
+    // This is what we want to happen, the file should not exist
+}
+
+const timestamp = new Date().toISOString().split('T')[0]
+const changelog: any = {
+    date: timestamp,
+    version: packageJson.version,
+    entries: [],
+}
+
+for (const changeFile of changeFiles) {
+    const file = JSON.parse(nodefs.readFileSync(path.join(nextReleaseDirectory, changeFile)).toString())
+    changelog.entries.push(file)
+}
+
+// Write changelog file
+nodefs.writeFileSync(changesFile, JSON.stringify(changelog, undefined, '\t'))
+const fileData = nodefs.readFileSync(path.join(cwd, 'CHANGELOG.md'))
+let append = `## ${packageJson.version} ${timestamp}\n\n`
+if (changelog.entries.length === 0) {
+    console.warn('no changes to release (missing .changes/ directory)')
+    append += '- Miscellaneous non-user-facing changes\n'
+} else {
+    changelog.entries.sort((x: { type: string }, y: { type: string }) => x.type.localeCompare(y.type))
+    for (const file of changelog.entries) {
+        append += `- **${file.type}** ${file.description}\n`
+    }
+}
+
+append += '\n' + fileData.toString()
+nodefs.writeFileSync('CHANGELOG.md', append)
+
+child_process.execSync(`git add ${changesDirectory}`)
+child_process.execSync(`git rm -rf --ignore-unmatch ${nextReleaseDirectory}`)
+child_process.execSync('git add CHANGELOG.md')
+
+console.log(changesFile)
diff --git a/scripts/generateIcons.ts b/scripts/generateIcons.ts
new file mode 100644
index 00000000000..e3f2d42da42
--- /dev/null
+++ b/scripts/generateIcons.ts
@@ -0,0 +1,203 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import webfont from 'webfont'
+import * as path from 'path'
+import * as nodefs from 'fs' // eslint-disable-line no-restricted-imports
+
+const fontId = 'aws-toolkit-icons'
+const projectDir = process.cwd() // root/packages/toolkit
+const rootDir = path.join(projectDir, '../..') // root/
+const iconsDir = path.join(projectDir, 'resources', 'icons')
+const fontsDir = path.join(projectDir, 'resources', 'fonts')
+const stylesheetsDir = path.join(projectDir, 'resources', 'css')
+const packageJson = JSON.parse(nodefs.readFileSync(path.join(projectDir, 'package.json'), { encoding: 'utf-8' }))
+const iconSources = [
+    // Paths relative to packages/toolkit
+    `resources/icons/**/*.svg`,
+    `../../node_modules/@vscode/codicons/src/icons/**/*.svg`,
+    '!**/{dark,light}/**',
+]
+
+interface PackageIcon {
+    readonly description: string
+    readonly default: {
+        readonly fontPath: string
+        readonly fontCharacter: string
+    }
+}
+
+interface IconsContribution {
+    [id: string]: PackageIcon
+}
+
+function createPackageIcon(fontPath: string, unicode: string, description?: string): PackageIcon {
+    const codePoint = unicode.codePointAt(0)?.toString(16)
+
+    if (!codePoint) {
+        throw new Error(`Invalid unicode character: ${unicode}`)
+    }
+
+    return {
+        description: description ?? 'AWS Contributed Icon',
+        default: {
+            fontPath,
+            fontCharacter: `\\${codePoint}`,
+        },
+    }
+}
+
+async function updatePackage(fontPath: string, icons: [id: string, icon: PackageIcon][]): Promise<void> {
+    const contributes = packageJson.contributes as { icons?: IconsContribution }
+    const iconsContribution = (contributes.icons ??= {})
+
+    if (typeof iconsContribution !== 'object') {
+        throw new TypeError('Expected `icons` contribution to be an object')
+    }
+
+    for (const [id, icon] of Object.entries(iconsContribution)) {
+        if (icon.default?.fontPath === fontPath) {
+            delete iconsContribution[id]
+        }
+    }
+
+    for (const [id, icon] of icons) {
+        iconsContribution[id] = icon
+    }
+
+    // prettier adds a newline to JSON files
+    const newPackage = `${JSON.stringify(packageJson, undefined, 4)}\n`
+    nodefs.writeFileSync(path.join(projectDir, 'package.json'), newPackage)
+    console.log('Updated package.json')
+}
+
+async function generate(mappings: Record<string, number | undefined> = {}) {
+    const dest = path.join(fontsDir, `${fontId}.woff`)
+    const relativeDest = path.relative(projectDir, dest)
+    const icons: { name: string; path: string; data?: PackageIcon }[] = []
+    const generated = new GeneratedFilesManifest()
+
+    const result = await webfont({
+        files: iconSources,
+        fontName: fontId,
+        formats: ['woff'],
+        startUnicode: 0xf000,
+        verbose: true,
+        normalize: true,
+        sort: true,
+        fontHeight: 1000,
+        template: 'css',
+        templateClassName: 'icon',
+        descent: 200, // Icons were negatively offset on the y-axes, this fixes it
+        templateFontPath: path.relative(stylesheetsDir, fontsDir).replace(/\\/g, '/'),
+        glyphTransformFn: (obj) => {
+            const filePath = (obj as { path?: string }).path
+
+            if (!filePath) {
+                throw new Error(`Expected glyph "${obj.name}" to have a file path`)
+            }
+
+            if (!obj.unicode) {
+                throw new Error(`Expected glyph "${obj.name}" to have the unicode property.`)
+            }
+
+            // If icon came from `node_modules` -> it's a codicon
+            if (filePath.includes('node_modules')) {
+                obj.name = `vscode-${path.basename(filePath).replace('.svg', '')}`
+                const mapping = mappings[obj.name]
+                if (mapping === undefined) {
+                    throw new Error(`No unicode mapping found for icon "${obj.name}"`)
+                }
+
+                obj.unicode = [String.fromCodePoint(mapping)]
+            } else {
+                const parts = path.relative(iconsDir, filePath).split(path.sep)
+                obj.name = parts.join('-').replace('.svg', '')
+            }
+
+            if (!obj.name.startsWith('vscode')) {
+                // Normalize the font path regardless of platform
+                // See https://github.com/aws/aws-toolkit-vscode/pull/3066#discussion_r1063662657
+                const normalizedPath = relativeDest.split(path.sep).join(path.posix.sep)
+                icons.push({
+                    name: obj.name,
+                    path: filePath,
+                    data: createPackageIcon(`./${normalizedPath}`, obj.unicode[0]),
+                })
+            } else {
+                icons.push({ name: obj.name, path: filePath })
+            }
+            return obj
+        },
+    })
+
+    const template = `
+/* 
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. 
+ * SPDX-License-Identifier: Apache-2.0 
+ * 
+ * This style sheet was generated using "${path.relative(rootDir, __filename)}". 
+ */ 
+
+${result.template}
+`.trim()
+
+    const stylesheetPath = path.join(stylesheetsDir, 'icons.css')
+    const isValidIcon = (i: (typeof icons)[number]): i is Required<typeof i> => i.data !== undefined
+
+    nodefs.mkdirSync(fontsDir, { recursive: true })
+    if (result.woff) {
+        nodefs.writeFileSync(dest, result.woff)
+    }
+    nodefs.writeFileSync(stylesheetPath, template)
+    await updatePackage(
+        `./${relativeDest}`,
+        icons.filter(isValidIcon).map((i) => [i.name, i.data])
+    )
+
+    generated.addEntry(dest)
+    generated.addEntry(stylesheetPath)
+
+    generated.emit(path.join(projectDir, 'dist'))
+}
+
+class GeneratedFilesManifest {
+    private readonly files: string[] = []
+
+    public addEntry(file: string): void {
+        this.files.push(file)
+    }
+
+    public emit(dir: string): void {
+        const dest = path.join(dir, 'generated.buildinfo')
+        const data = JSON.stringify(this.files, undefined, 4)
+        nodefs.mkdirSync(dir, { recursive: true })
+        nodefs.writeFileSync(dest, data)
+    }
+}
+
+async function loadCodiconMappings(): Promise<Record<string, number | undefined>> {
+    const codicons = path.join(rootDir, 'node_modules', '@vscode', 'codicons', 'src')
+    const data = JSON.parse(nodefs.readFileSync(path.join(codicons, 'template', 'mapping.json'), 'utf-8'))
+    const mappings: Record<string, number | undefined> = {}
+    for (const [k, v] of Object.entries(data)) {
+        if (typeof k === 'string' && typeof v === 'number') {
+            if (v < 0xe000 || v >= 0xf000) {
+                // Will warn us if the codepoint moves outside the expected range
+                throw new Error(`Codicon "${k}" has unexpected codepoint: ${v}`)
+            }
+            mappings[`vscode-${k}`] = v
+        }
+    }
+
+    return mappings
+}
+
+async function main() {
+    const mappings = await loadCodiconMappings()
+    await generate(mappings)
+}
+
+void main()
diff --git a/scripts/generateNonCodeFiles.ts b/scripts/generateNonCodeFiles.ts
new file mode 100644
index 00000000000..c165e9e6b36
--- /dev/null
+++ b/scripts/generateNonCodeFiles.ts
@@ -0,0 +1,70 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+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 { marked } from 'marked'
+import * as path from 'path'
+
+// doesn't use path utils as this should be formatted for finding images with HTML markup
+const projectRoot = process.cwd()
+
+/**
+ * replaces relative paths with an `!!EXTENSIONROOT!!` token.
+ * This makes it easier to swap in relative links when the extension loads.
+ * @param root Repository root
+ * @param inputFile Input .md file to swap to HTML
+ * @param outputFile Filepath to output HTML to
+ * @param cn Converts "AWS" to "Amazon" for CN-based compute.
+ */
+function translateReadmeToHtml(
+    root: string,
+    inputFile: string,
+    outputFile: string,
+    throwIfNotExists: boolean,
+    cn: boolean = false
+) {
+    const inputPath = path.join(root, inputFile)
+    if (!nodefs.existsSync(inputPath)) {
+        if (throwIfNotExists) {
+            throw Error(`File ${inputFile} was not found, but it is required.`)
+        }
+        console.log(`File ${inputFile} was not found, skipping transformation...`)
+        return
+    }
+    const fileText = nodefs.readFileSync(path.join(root, inputFile)).toString()
+    const relativePathRegex = /]\(\.\//g
+    let transformedText = fileText.replace(relativePathRegex, '](!!EXTENSIONROOT!!/')
+    if (cn) {
+        transformedText = transformedText.replace(/AWS/g, 'Amazon').replace(/-en.png/g, '-cn.png')
+    }
+
+    const r = marked.parse(transformedText, { async: false })
+    if (typeof r !== 'string') {
+        throw Error()
+    }
+    nodefs.writeFileSync(path.join(root, outputFile), r)
+}
+
+/**
+ * Do a best effort job of generating a git hash and putting it into the package
+ */
+function generateFileHash(root: string) {
+    try {
+        const response = child_process.execSync('git rev-parse HEAD')
+        nodefs.mkdirSync(root, { recursive: true })
+        nodefs.writeFileSync(path.join(root, '.gitcommit'), response)
+    } catch (e) {
+        console.log(`Getting commit hash failed ${e}`)
+    }
+}
+
+try {
+    translateReadmeToHtml(projectRoot, 'README.md', 'quickStartVscode.html', true)
+    generateFileHash(projectRoot)
+} catch (error) {
+    console.error(error)
+    process.exit(100)
+}
diff --git a/scripts/generateSettings.ts b/scripts/generateSettings.ts
new file mode 100644
index 00000000000..5fe210f9ed3
--- /dev/null
+++ b/scripts/generateSettings.ts
@@ -0,0 +1,56 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as nodefs from 'fs' // eslint-disable-line no-restricted-imports
+import * as path from 'path'
+
+/**
+ * Generate a settings type based on `package.json:contributes.configuration`.
+ * It will create a settings-<subproject>.gen.ts file in the core lib which will
+ * allow it to provide autocomplete and compile-time type checking of settings names.
+ *
+ * This script is meant to be run from individual from subprojects.
+ */
+
+function main() {
+    const ext = path.basename(process.cwd())
+    const packageJsonFile = './package.json'
+    const packageJson = JSON.parse(nodefs.readFileSync(packageJsonFile, { encoding: 'utf-8' }))
+
+    const genFile = `../core/src/shared/settings-${ext}.gen.ts`
+    type Configuration = { [key: string]: { [key: string]: {} } }
+    const settings: Configuration = {}
+
+    Object.entries(packageJson.contributes.configuration.properties as { [key: string]: { properties?: {} } }).forEach(
+        ([k, v]) => {
+            settings[k] = {}
+            if (v.properties !== undefined) {
+                for (const inner of Object.keys(v.properties)) {
+                    settings[k][inner] = {}
+                }
+            }
+        }
+    )
+
+    const contents = `/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * This file was autogenerated by generateSettings.ts. Do NOT modify by hand.
+ * To update this file, update the settings in the extension package.json
+ * and run \`npm run generateSettings\` for that extension.
+ */
+
+export const ${ext}Settings = ${JSON.stringify(settings, undefined, '    ')}
+
+export default ${ext}Settings
+`
+
+    nodefs.writeFileSync(genFile, contents)
+}
+
+main()
diff --git a/scripts/lspArtifact.ts b/scripts/lspArtifact.ts
new file mode 100644
index 00000000000..42b5c59907d
--- /dev/null
+++ b/scripts/lspArtifact.ts
@@ -0,0 +1,183 @@
+import * as https from 'https'
+import * as fs from 'fs'
+import * as crypto from 'crypto'
+import * as path from 'path'
+import * as os from 'os'
+import * as semver from 'semver'
+import AdmZip from 'adm-zip'
+
+interface ManifestContent {
+    filename: string
+    url: string
+    hashes: string[]
+    bytes: number
+}
+
+interface ManifestTarget {
+    platform: string
+    arch: string
+    contents: ManifestContent[]
+}
+
+interface ManifestVersion {
+    serverVersion: string
+    isDelisted: boolean
+    targets: ManifestTarget[]
+}
+
+interface Manifest {
+    versions: ManifestVersion[]
+}
+
+async function verifyFileHash(filePath: string, expectedHash: string): Promise<boolean> {
+    return new Promise((resolve, reject) => {
+        const hash = crypto.createHash('sha384')
+        const stream = fs.createReadStream(filePath)
+
+        stream.on('data', (data) => {
+            hash.update(data)
+        })
+
+        stream.on('end', () => {
+            const fileHash = hash.digest('hex')
+            // Remove 'sha384:' prefix from expected hash if present
+            const expectedHashValue = expectedHash.replace('sha384:', '')
+            resolve(fileHash === expectedHashValue)
+        })
+
+        stream.on('error', reject)
+    })
+}
+
+async function ensureDirectoryExists(dirPath: string): Promise<void> {
+    if (!fs.existsSync(dirPath)) {
+        await fs.promises.mkdir(dirPath, { recursive: true })
+    }
+}
+
+export async function downloadLanguageServer(): Promise<void> {
+    const tempDir = path.join(os.tmpdir(), 'amazonq-download-temp')
+    const resourcesDir = path.join(__dirname, '../packages/amazonq/resources/language-server')
+
+    // clear previous cached language server
+    try {
+        if (fs.existsSync(resourcesDir)) {
+            fs.rmdirSync(resourcesDir, { recursive: true })
+        }
+    } catch (e) {
+        throw Error(`Failed to clean up language server ${resourcesDir}`)
+    }
+
+    await ensureDirectoryExists(tempDir)
+    await ensureDirectoryExists(resourcesDir)
+
+    return new Promise((resolve, reject) => {
+        const manifestUrl = 'https://aws-toolkit-language-servers.amazonaws.com/qAgenticChatServer/0/manifest.json'
+
+        https
+            .get(manifestUrl, (res) => {
+                let data = ''
+
+                res.on('data', (chunk) => {
+                    data += chunk
+                })
+
+                res.on('end', async () => {
+                    try {
+                        const manifest: Manifest = JSON.parse(data)
+
+                        const latestVersion = manifest.versions
+                            .filter((v) => !v.isDelisted)
+                            .sort((a, b) => semver.compare(b.serverVersion, a.serverVersion))[0]
+
+                        if (!latestVersion) {
+                            throw new Error('No valid version found in manifest')
+                        }
+
+                        const darwinArm64Target = latestVersion.targets.find(
+                            (t) => t.platform === 'darwin' && t.arch === 'arm64'
+                        )
+
+                        if (!darwinArm64Target) {
+                            throw new Error('No darwin arm64 target found')
+                        }
+
+                        for (const content of darwinArm64Target.contents) {
+                            const fileName = content.filename
+                            const fileUrl = content.url
+                            const expectedHash = content.hashes[0]
+                            const tempFilePath = path.join(tempDir, fileName)
+                            const fileFolderName = content.filename.replace('.zip', '')
+
+                            console.log(`Downloading ${fileName} from ${fileUrl} ...`)
+
+                            await new Promise((downloadResolve, downloadReject) => {
+                                https
+                                    .get(fileUrl, (fileRes) => {
+                                        const fileStream = fs.createWriteStream(tempFilePath)
+                                        fileRes.pipe(fileStream)
+
+                                        fileStream.on('finish', () => {
+                                            fileStream.close()
+                                            downloadResolve(void 0)
+                                        })
+
+                                        fileStream.on('error', (err) => {
+                                            fs.unlink(tempFilePath, () => {})
+                                            downloadReject(err)
+                                        })
+                                    })
+                                    .on('error', (err) => {
+                                        fs.unlink(tempFilePath, () => {})
+                                        downloadReject(err)
+                                    })
+                            })
+
+                            console.log(`Verifying hash for ${fileName}...`)
+                            const isHashValid = await verifyFileHash(tempFilePath, expectedHash)
+
+                            if (!isHashValid) {
+                                fs.unlinkSync(tempFilePath)
+                                throw new Error(`Hash verification failed for ${fileName}`)
+                            }
+
+                            console.log(`Extracting ${fileName}...`)
+                            const zip = new AdmZip(tempFilePath)
+                            zip.extractAllTo(path.join(resourcesDir, fileFolderName), true) // true for overwrite
+
+                            // Clean up temp file
+                            fs.unlinkSync(tempFilePath)
+                            console.log(`Successfully processed ${fileName}`)
+                        }
+
+                        // Clean up temp directory
+                        fs.rmdirSync(tempDir)
+                        fs.rmdirSync(path.join(resourcesDir, 'servers', 'indexing'), { recursive: true })
+                        fs.rmdirSync(path.join(resourcesDir, 'servers', 'ripgrep'), { recursive: true })
+                        fs.rmSync(path.join(resourcesDir, 'servers', 'node'))
+                        if (!fs.existsSync(path.join(resourcesDir, 'servers', 'aws-lsp-codewhisperer.js'))) {
+                            throw new Error(`Extracting aws-lsp-codewhisperer.js failure`)
+                        }
+                        if (!fs.existsSync(path.join(resourcesDir, 'clients', 'amazonq-ui.js'))) {
+                            throw new Error(`Extracting amazonq-ui.js failure`)
+                        }
+                        console.log('Download and extraction completed successfully')
+                        resolve()
+                    } catch (err) {
+                        // Clean up temp directory on error
+                        if (fs.existsSync(tempDir)) {
+                            fs.rmdirSync(tempDir, { recursive: true })
+                        }
+                        reject(err)
+                    }
+                })
+            })
+            .on('error', (err) => {
+                // Clean up temp directory on error
+                if (fs.existsSync(tempDir)) {
+                    fs.rmdirSync(tempDir, { recursive: true })
+                }
+                reject(err)
+            })
+    })
+}
diff --git a/scripts/mergeReports.ts b/scripts/mergeReports.ts
new file mode 100644
index 00000000000..08b9dd6cd23
--- /dev/null
+++ b/scripts/mergeReports.ts
@@ -0,0 +1,71 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as fs from 'fs'
+import * as path from 'path'
+import * as xml2js from 'xml2js'
+
+/**
+ * Merge all of the packages/ test reports into a single directory
+ */
+async function mergeReports() {
+    console.log('Merging test reports')
+
+    const packagesDir = `${__dirname}/../packages`
+
+    // Get all packages/* directories
+    const packageDirs = fs.readdirSync(packagesDir).map((dir) => path.join(packagesDir, dir))
+
+    // Find report.xml files in .test-reports subdirectories
+    const testReports = packageDirs
+        .map((dir) => `${dir}/.test-reports/report.xml`)
+        .filter((file) => fs.existsSync(file))
+
+    const mergedReport = {
+        testsuites: {
+            testsuite: [],
+        },
+    }
+
+    // Collect all test reports into a single merged test report object
+    for (const file of testReports) {
+        const content = fs.readFileSync(file)
+        const result: { testsuites: { testsuite: [] } } = await xml2js.parseStringPromise(content)
+        if (result.testsuites && result.testsuites.testsuite) {
+            mergedReport.testsuites.testsuite.push(...result.testsuites.testsuite)
+        }
+    }
+
+    const builder = new xml2js.Builder()
+    const xml = builder.buildObject(mergedReport)
+
+    /**
+     * Create the new test reports directory and write the test report
+     */
+    const reportsDir = path.join(__dirname, '..', '.test-reports')
+
+    // Create reports directory if it doesn't exist
+    if (!fs.existsSync(reportsDir)) {
+        fs.mkdirSync(reportsDir, { recursive: true })
+    }
+
+    fs.writeFileSync(`${reportsDir}/report.xml`, xml)
+
+    const exitCodeArg = process.argv[2]
+    if (exitCodeArg) {
+        /**
+         * Retrieves the exit code from the previous test run execution.
+         *
+         * This allows us to:
+         * 1. Merge and upload test reports regardless of the test execution status
+         * 2. Preserve the original test run exit code
+         * 3. Report the test status back to CI
+         */
+        const exitCode = parseInt(exitCodeArg || '0', 10)
+        process.exit(exitCode)
+    }
+}
+
+mergeReports()
diff --git a/scripts/newChange.ts b/scripts/newChange.ts
index 4b0cf78f0e1..7490e68631d 100644
--- a/scripts/newChange.ts
+++ b/scripts/newChange.ts
@@ -1,13 +1,13 @@
 /*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as child_process from 'child_process'
-import * as fs from 'fs-extra'
+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 { join } from 'path'
 import * as readlineSync from 'readline-sync'
-import { v4 as uuid } from 'uuid'
+import * as crypto from 'crypto'
 
 const directory = join(process.cwd(), '.changes', 'next-release')
 const changeTypes = ['Breaking Change', 'Feature', 'Bug Fix', 'Deprecation', 'Removal', 'Test']
@@ -40,7 +40,7 @@ function promptForChange(): string {
     }
 }
 
-fs.mkdirpSync(directory)
+nodefs.mkdirSync(directory, { recursive: true })
 
 const type = promptForType()
 const description = promptForChange()
@@ -48,9 +48,9 @@ const contents: NewChange = {
     type: type,
     description: description,
 }
-const fileName = `${type}-${uuid()}.json`
+const fileName = `${type}-${crypto.randomUUID()}.json`
 const path = join(directory, fileName)
-fs.writeFileSync(path, JSON.stringify(contents, undefined, '\t'))
+nodefs.writeFileSync(path, JSON.stringify(contents, undefined, '\t') + '\n')
 
 console.log(`Change log written to ${path}`)
 child_process.execSync(`git add ${directory}`)
diff --git a/scripts/package.ts b/scripts/package.ts
new file mode 100644
index 00000000000..203777e8131
--- /dev/null
+++ b/scripts/package.ts
@@ -0,0 +1,206 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+//
+// Creates an artifact that can be given to users for testing alpha/beta builds:
+//
+//     aws-toolkit-vscode-99.0.0-gxxxxxxx.vsix
+//     or amazon-q-vscode-99.0.0-gxxxxxxx.vsix
+//
+// Where `xxxxxxx` is the first 7 characters of the commit hash that produced the artifact.
+//
+// The script works like this:
+// 1. temporarily change `version` in package.json
+// 2. invoke `vsce package`
+// 3. restore the original package.json
+//
+
+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 { downloadLanguageServer } from './lspArtifact'
+
+function parseArgs() {
+    // Invoking this script with argument "foo":
+    //   $ npm run package -- foo
+    // yields this argv:
+    //   0: /…/node_modules/.bin/ts-node
+    //   1: /…/src/scripts/build/package.ts
+    //   2: foo
+
+    const args: { [key: string]: any } = {
+        /** Produce an unoptimized VSIX. Include git SHA in version string. */
+        debug: false,
+        /** Skips `npm run clean` when building the VSIX. This prevents file watching from breaking. */
+        skipClean: false,
+        feature: '',
+    }
+
+    const givenArgs = process.argv.slice(2)
+    const validOptions = ['--debug', '--no-clean', '--feature']
+    const expectValue = ['--feature']
+
+    for (let i = 0; i < givenArgs.length; i++) {
+        const a = givenArgs[i]
+        const argName = a.replace(/^-+/, '') // "--foo" => "foo"
+        if (!validOptions.includes(a)) {
+            throw Error(`invalid argument: ${a}`)
+        }
+        if (expectValue.includes(a)) {
+            i++
+            const val = givenArgs[i]
+            if (val === undefined) {
+                throw Error(`missing value for arg: ${a}`)
+            }
+            args[argName] = val
+        } else {
+            args[argName] = true
+        }
+    }
+
+    return args
+}
+
+/**
+ * If the _current_ commit is tagged as a release ("v1.26.0") then it is a "release build", else it
+ * is a prerelease/nightly/edge/preview build.
+ */
+function isRelease(): boolean {
+    const tag = child_process.execFileSync('git', ['tag', '-l', '--contains', 'HEAD']).toString()
+    return !!tag?.match(/v\d+\.\d+\.\d+/)
+}
+
+/**
+ * Whether or not this a private beta build
+ */
+function isBeta(): boolean {
+    try {
+        // This path only exists for packages/toolkit.
+        // As noted before: "Importing from `src` isn't great but it does make things simple"
+        // TODO: Generalize betaUrl for all packages.
+        const betaUrl = require(path.resolve('./src/dev/config')).betaUrl
+        return !!betaUrl
+    } catch {
+        return false
+    }
+}
+
+/**
+ * Gets a suffix to append to the version-string, or empty for release builds.
+ *
+ * TODO: use `git describe` instead.
+ *
+ * @returns version-string suffix, for example: "-e6ecd84685a9"
+ */
+function getVersionSuffix(feature: string, debug: boolean): string {
+    if (isRelease()) {
+        return ''
+    }
+    const debugSuffix = debug ? '-debug' : ''
+    const featureSuffix = feature === '' ? '' : `-${feature}`
+    const commitId = child_process.execFileSync('git', ['rev-parse', '--short=7', 'HEAD']).toString().trim()
+    // Commit id is prefixed with "g" because "-0abc123" is not a valid semver prerelease, and will cause vsce to fail.
+    const commitSuffix = commitId ? `-g${commitId}` : ''
+    return `${debugSuffix}${featureSuffix}${commitSuffix}`
+}
+
+async function main() {
+    const args = parseArgs()
+    // It is expected that this will package from a packages/{subproject} folder.
+    // There is a base config in packages/
+    const packageJsonFile = './package.json'
+    const backupJsonFile = `${packageJsonFile}.package.bk`
+    const webpackConfigJsFile = '../webpack.base.config.js'
+    const backupWebpackConfigFile = `${webpackConfigJsFile}.package.bk`
+
+    if (!nodefs.existsSync(packageJsonFile)) {
+        throw new Error(`package.json not found, cannot package this directory: ${process.cwd()}`)
+    }
+
+    let release = true
+
+    try {
+        release = isRelease()
+
+        if (release && isBeta()) {
+            throw new Error('Cannot package VSIX as both a release and a beta simultaneously')
+        }
+        // Create backup file so we can restore the originals later.
+        nodefs.copyFileSync(packageJsonFile, backupJsonFile)
+        const packageJson = JSON.parse(nodefs.readFileSync(packageJsonFile, { encoding: 'utf-8' }))
+
+        if (!release || args.debug) {
+            const versionSuffix = getVersionSuffix(args.feature, args.debug)
+            const version = packageJson.version
+            if (isBeta()) {
+                // Declare an arbitrarily high version number, to stop VSC from auto-updating "beta" builds.
+                packageJson.version = `99.0.0${versionSuffix}`
+            } else {
+                packageJson.version = version.replace('-SNAPSHOT', versionSuffix)
+            }
+
+            if (args.skipClean) {
+                // Clearly we need `prepublish` to be a standalone script and not a bunch of `npm` commands
+                const prepublish = packageJson.scripts['vscode:prepublish']
+                const replaced = prepublish.replace('npm run clean', 'echo "Skipped clean"')
+                packageJson.scripts['vscode:prepublish'] = replaced
+            }
+
+            if (args.debug) {
+                nodefs.copyFileSync(webpackConfigJsFile, backupWebpackConfigFile)
+                const webpackConfigJs = nodefs.readFileSync(webpackConfigJsFile, { encoding: 'utf-8' })
+                nodefs.writeFileSync(webpackConfigJsFile, webpackConfigJs.replace(/minimize: true/, 'minimize: false'))
+            }
+        }
+
+        nodefs.writeFileSync(packageJsonFile, JSON.stringify(packageJson, undefined, '    '))
+
+        // add language server bundle
+        if (packageJson.name === 'amazon-q-vscode') {
+            await downloadLanguageServer()
+        }
+
+        child_process.execFileSync(
+            'vsce',
+            [
+                'package',
+                '--ignoreFile',
+                '../.vscodeignore.packages',
+                /**
+                 * Depdendency gathering not required because we bundle with webpack: https://github.com/microsoft/vscode-vsce/issues/439
+                 *
+                 * Removing this arg will cause packaging to break due to issues in src.gen/.../node_modules,
+                 * since those dependencies are disjoint (i.e. not a workspace in the root package.json)
+                 */
+                '--no-dependencies',
+            ],
+            {
+                stdio: 'inherit',
+                shell: process.platform === 'win32', // For vsce.cmd on Windows.
+            }
+        )
+
+        console.log(`VSIX Version: ${packageJson.version}`)
+
+        // Hoist .vsix to root folder, because the release infra expects it to be there.
+        // TODO: Once we can support releasing multiple artifacts,
+        // let's just keep the .vsix in its respective project folder in packages/
+        const vsixName = `${packageJson.name}-${packageJson.version}.vsix`
+        nodefs.renameSync(vsixName, `../../${vsixName}`)
+    } catch (e) {
+        console.log(e)
+        throw Error('package.ts: failed')
+    } finally {
+        // Restore the original files.
+        nodefs.copyFileSync(backupJsonFile, packageJsonFile)
+        nodefs.unlinkSync(backupJsonFile)
+        if (args.debug) {
+            nodefs.copyFileSync(backupWebpackConfigFile, webpackConfigJsFile)
+            nodefs.unlinkSync(backupWebpackConfigFile)
+        }
+    }
+}
+
+main()
diff --git a/scripts/prepare.ts b/scripts/prepare.ts
new file mode 100644
index 00000000000..34ccd450ec2
--- /dev/null
+++ b/scripts/prepare.ts
@@ -0,0 +1,33 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+//
+// Performs NPM "prepare" step, except when running in CI.
+//
+// prepare: https://docs.npmjs.com/cli/v9/using-npm/scripts#prepare-and-prepublish:
+//  - Runs BEFORE the package is packed, i.e. during "npm publish" AND "npm pack".
+//  - Runs on local "npm install".
+//  - Runs AFTER `prepublish`, but BEFORE `prepublishOnly`.
+//  - Runs in the background. To see the output, run with "--foreground-scripts".
+//
+
+import * as child_process from 'child_process' // eslint-disable-line no-restricted-imports
+
+/**
+ * Returns true if the current build is running on CI (build server).
+ */
+export function isCI(): boolean {
+    return undefined !== process.env['GITHUB_ACTION'] || undefined !== process.env['CODEBUILD_BUILD_ID']
+}
+
+function main() {
+    if (isCI()) {
+        console.log('prepare: skipped (running in CI)')
+        return
+    }
+    child_process.execSync('husky', { stdio: 'inherit' })
+}
+
+main()
diff --git a/scripts/scan-licenses.sh b/scripts/scan-licenses.sh
new file mode 100644
index 00000000000..25ba2781356
--- /dev/null
+++ 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
\ No newline at end of file
diff --git a/scripts/scan-licenses.ts b/scripts/scan-licenses.ts
new file mode 100644
index 00000000000..75759d930d0
--- /dev/null
+++ b/scripts/scan-licenses.ts
@@ -0,0 +1,83 @@
+#!/usr/bin/env node
+
+import { execSync } from 'child_process'
+import { existsSync, rmSync, renameSync, writeFileSync } from 'fs'
+import { join } from 'path'
+
+function banner() {
+    console.log('*****************************************')
+    console.log('**     AWS Toolkit License Scanner     **')
+    console.log('*****************************************')
+    console.log('')
+}
+
+function genAttribution() {
+    console.log('')
+    console.log(' == Generating Attribution Document ==')
+
+    try {
+        execSync('npm install -g oss-attribution-generator', { stdio: 'inherit' })
+        execSync('generate-attribution', { stdio: 'inherit' })
+
+        if (existsSync('oss-attribution')) {
+            renameSync(join('oss-attribution', 'attribution.txt'), 'LICENSE-THIRD-PARTY')
+            rmSync('oss-attribution', { recursive: true, force: true })
+            console.log('Attribution document generated: LICENSE-THIRD-PARTY')
+        } else {
+            console.log('Warning: oss-attribution directory not found')
+        }
+    } catch (error) {
+        console.error('Error generating attribution:', error)
+    }
+}
+
+function genFullLicenseReport() {
+    console.log('')
+    console.log(' == Generating Full License Report ==')
+
+    try {
+        execSync('npm install -g license-checker', { stdio: 'inherit' })
+        const licenseData = execSync('license-checker --json', { encoding: 'utf8' })
+        writeFileSync('licenses-full.json', licenseData)
+        console.log('Full license report generated: licenses-full.json')
+    } catch (error) {
+        console.error('Error generating license report:', error)
+    }
+}
+
+function main() {
+    banner()
+
+    if (!existsSync('package.json')) {
+        console.error('Error: package.json not found. Please run this script from the project root.')
+        process.exit(1)
+    }
+
+    if (!existsSync('node_modules')) {
+        console.log('node_modules not found. Running npm install...')
+        try {
+            execSync('npm install', { stdio: 'inherit' })
+        } catch (error) {
+            console.error('Error running npm install:', error)
+            process.exit(1)
+        }
+    }
+
+    console.log('Scanning licenses for AWS Toolkit VS Code project...')
+    console.log(`Project root: ${process.cwd()}`)
+    console.log('')
+
+    genAttribution()
+    genFullLicenseReport()
+
+    console.log('')
+    console.log('=== License Scan Complete ===')
+    console.log('Generated files:')
+    console.log('  - LICENSE-THIRD-PARTY (attribution document)')
+    console.log('  - licenses-full.json (complete license data)')
+    console.log('')
+}
+
+if (require.main === module) {
+    main()
+}
diff --git a/scripts/skippedTestReport.ts b/scripts/skippedTestReport.ts
new file mode 100644
index 00000000000..75ed194f244
--- /dev/null
+++ b/scripts/skippedTestReport.ts
@@ -0,0 +1,117 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Scans test files for skipped Mocha tests.
+ *
+ * It uses a regex instead of mocha's loader, because mocha's
+ * loader can't resolve vscode by default
+ *
+ * Note: This script doesn't handle cases where teams use this.skip() inside of their tests
+ *
+ * Usage: node skippedTestReport.js <directoryPath>
+ */
+
+import * as fs from 'fs'
+import * as path from 'path'
+
+interface SkippedTest {
+    file: string
+    testName: string
+    lineNumber: number
+}
+
+function findSkippedTests(directoryPath: string): SkippedTest[] {
+    const skippedTests: SkippedTest[] = []
+
+    const skipPatterns = [/\b(describe|it)\.skip\(['"`](.*?)['"`]/g]
+
+    function searchInFile(filePath: string): void {
+        try {
+            const content = fs.readFileSync(filePath, 'utf8')
+            const lines = content.split('\n')
+
+            lines.forEach((line, index) => {
+                for (const pattern of skipPatterns) {
+                    const matches = line.matchAll(pattern)
+                    for (const match of matches) {
+                        skippedTests.push({
+                            file: filePath,
+                            testName: match[2],
+                            lineNumber: index + 1,
+                        })
+                    }
+                }
+            })
+        } catch (error) {
+            console.error(`Error reading file ${filePath}:`, error)
+        }
+    }
+
+    function visitDirectory(currentPath: string): void {
+        const files = fs.readdirSync(currentPath)
+
+        files.forEach((file) => {
+            const fullPath = path.join(currentPath, file)
+            const stat = fs.statSync(fullPath)
+
+            if (stat.isDirectory()) {
+                // Skip hidden directories
+                if (!file.startsWith('.')) {
+                    visitDirectory(fullPath)
+                }
+            } else if (stat.isFile() && file.endsWith('.ts')) {
+                searchInFile(fullPath)
+            }
+        })
+    }
+
+    visitDirectory(directoryPath)
+    return skippedTests
+}
+
+function main() {
+    const targetDirectory = process.argv[2] || '.'
+
+    try {
+        const skippedTests = findSkippedTests(targetDirectory)
+
+        if (skippedTests.length === 0) {
+            console.log('No skipped tests found.')
+            return
+        }
+
+        const testsByFile = skippedTests.reduce(
+            (acc, test) => {
+                const file = test.file
+                if (!acc[file]) {
+                    acc[file] = []
+                }
+                acc[file].push(test)
+                return acc
+            },
+            {} as Record<string, SkippedTest[]>
+        )
+
+        console.log('\nSkipped Tests Report')
+        console.log(`Total skipped tests: ${skippedTests.length}`)
+        console.log(`Files affected: ${Object.keys(testsByFile).length}`)
+        console.log('===================\n')
+
+        Object.entries(testsByFile).forEach(([file, tests]) => {
+            console.log(`📁 ${file}`)
+            console.log('     Skipped tests:')
+            tests.forEach((test) => {
+                console.log(`      • ${test.testName} (line ${test.lineNumber})`)
+            })
+            console.log('')
+        })
+    } catch (error) {
+        console.error('Error:', error)
+        process.exit(1)
+    }
+}
+
+main()
diff --git a/scripts/test/integrationTest.ts b/scripts/test/integrationTest.ts
deleted file mode 100644
index 2cfc53b8ea5..00000000000
--- a/scripts/test/integrationTest.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { join, resolve } from 'path'
-import { runTests } from '@vscode/test-electron'
-import { VSCODE_EXTENSION_ID } from '../../src/shared/extensions'
-import { installVSCodeExtension, setupVSCodeTestInstance, getCliArgsToDisableExtensions } from './launchTestUtilities'
-
-const disableWorkspaceTrust = '--disable-workspace-trust'
-
-async function setupVSCode(): Promise<string> {
-    console.log('Setting up VS Code Test instance...')
-    const vsCodeExecutablePath = await setupVSCodeTestInstance()
-    await installVSCodeExtension(vsCodeExecutablePath, VSCODE_EXTENSION_ID.python)
-    await installVSCodeExtension(vsCodeExecutablePath, VSCODE_EXTENSION_ID.yaml)
-    await installVSCodeExtension(vsCodeExecutablePath, VSCODE_EXTENSION_ID.go)
-    await installVSCodeExtension(vsCodeExecutablePath, VSCODE_EXTENSION_ID.java)
-    await installVSCodeExtension(vsCodeExecutablePath, VSCODE_EXTENSION_ID.javadebug)
-    console.log('VS Code Test instance has been set up')
-    return vsCodeExecutablePath
-}
-
-;(async () => {
-    try {
-        console.log('Running Integration test suite...')
-        const vsCodeExecutablePath = await setupVSCode()
-        const cwd = process.cwd()
-        const testEntrypoint = resolve(cwd, 'dist', 'src', 'integrationTest', 'index.js')
-        const workspacePath = join(cwd, 'dist', 'src', 'testFixtures', 'workspaceFolder')
-        console.log(`Starting tests: ${testEntrypoint}`)
-
-        const disableExtensions = await getCliArgsToDisableExtensions(vsCodeExecutablePath, {
-            except: [
-                VSCODE_EXTENSION_ID.python,
-                VSCODE_EXTENSION_ID.yaml,
-                VSCODE_EXTENSION_ID.jupyter,
-                VSCODE_EXTENSION_ID.go,
-                VSCODE_EXTENSION_ID.java,
-                VSCODE_EXTENSION_ID.javadebug,
-                VSCODE_EXTENSION_ID.git,
-            ],
-        })
-        const args = {
-            vscodeExecutablePath: vsCodeExecutablePath,
-            extensionDevelopmentPath: cwd,
-            extensionTestsPath: testEntrypoint,
-            launchArgs: [...disableExtensions, workspacePath, disableWorkspaceTrust],
-            extensionTestsEnv: {
-                ['DEVELOPMENT_PATH']: cwd,
-                ['AWS_TOOLKIT_AUTOMATION']: 'integration',
-            },
-        }
-        console.log(`runTests() args:\n${JSON.stringify(args, undefined, 2)}`)
-        const result = await runTests(args)
-
-        console.log(`Finished running Integration test suite with result code: ${result}`)
-        process.exit(result)
-    } catch (err) {
-        console.error(err)
-        console.error('Failed to run tests')
-        process.exit(1)
-    }
-})()
diff --git a/scripts/test/launchTestUtilities.ts b/scripts/test/launchTestUtilities.ts
deleted file mode 100644
index aa4961e41d6..00000000000
--- a/scripts/test/launchTestUtilities.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as child_process from 'child_process'
-import * as manifest from '../../package.json'
-import { downloadAndUnzipVSCode, resolveCliArgsFromVSCodeExecutablePath } from '@vscode/test-electron'
-
-const envvarVscodeTestVersion = 'VSCODE_TEST_VERSION'
-
-const stable = 'stable'
-const minimum = 'minimum'
-
-/**
- * Downloads and unzips a copy of VS Code to run tests against.
- *
- * Prints the result of `code --version`.
- *
- * Test suites can set up an experimental instance of VS Code however they want.
- * This method provides the common use-case, pulling down the latest version (aka 'stable').
- * The VS Code version under test can be altered by setting the environment variable
- * VSCODE_TEST_VERSION prior to running the tests.
- */
-export async function setupVSCodeTestInstance(): Promise<string> {
-    let vsCodeVersion = process.env[envvarVscodeTestVersion]
-    if (!vsCodeVersion) {
-        vsCodeVersion = stable
-    } else if (vsCodeVersion === minimum) {
-        vsCodeVersion = getMinVsCodeVersion()
-    }
-
-    console.log(`Setting up VS Code test instance, version: ${vsCodeVersion}`)
-    const platform = process.platform === 'win32' ? 'win32-x64-archive' : undefined
-    const vsCodeExecutablePath = await downloadAndUnzipVSCode(vsCodeVersion, platform)
-    console.log(`VS Code test instance location: ${vsCodeExecutablePath}`)
-    console.log(await invokeVSCodeCli(vsCodeExecutablePath, ['--version']))
-
-    return vsCodeExecutablePath
-}
-
-export async function invokeVSCodeCli(vsCodeExecutablePath: string, args: string[]): Promise<string> {
-    const [cli, ...cliArgs] = resolveCliArgsFromVSCodeExecutablePath(vsCodeExecutablePath)
-    const cmdArgs = [...cliArgs, ...args]
-
-    // Workaround: set --user-data-dir to avoid this error in CI:
-    // "You are trying to start Visual Studio Code as a super user …"
-    if (process.env.AWS_TOOLKIT_TEST_USER_DIR) {
-        cmdArgs.push('--user-data-dir', process.env.AWS_TOOLKIT_TEST_USER_DIR)
-    }
-
-    console.log(`Invoking vscode CLI command:\n    "${cli}" ${JSON.stringify(cmdArgs)}`)
-    const spawnResult = child_process.spawnSync(cli, cmdArgs, {
-        encoding: 'utf-8',
-        stdio: 'pipe',
-    })
-
-    if (spawnResult.status !== 0) {
-        console.log('output: %s', spawnResult.output)
-        throw new Error(`VS Code CLI command failed (exit-code: ${spawnResult.status}): ${cli} ${cmdArgs}`)
-    }
-
-    if (spawnResult.error) {
-        throw spawnResult.error
-    }
-
-    return spawnResult.stdout
-}
-
-export async function installVSCodeExtension(vsCodeExecutablePath: string, extensionIdentifier: string): Promise<void> {
-    console.log(`Installing VS Code Extension: ${extensionIdentifier}`)
-    console.log(await invokeVSCodeCli(vsCodeExecutablePath, ['--install-extension', extensionIdentifier]))
-}
-
-/**
- * Alternative to the `--disable-extensions` CLI flag which allows us to
- * selectively keep some extensions enabled.
- *
- * @param vsCodeExecutablePath Path to vscode CLI program.
- * @param exceptIds List of extension ids that should *not* be disabled.
- *
- * @returns List of args which the caller is expected to pass to vscode CLI, of the form:
- * ["--disable-extension", "foo.bar.baz", "--disable-extension", ...]
- */
-export async function getCliArgsToDisableExtensions(
-    vsCodeExecutablePath: string,
-    params: { except: string[] }
-): Promise<string[]> {
-    console.log(`Disabling all VS Code extensions *except*: ${params.except}`)
-    const output = await invokeVSCodeCli(vsCodeExecutablePath, ['--list-extensions'])
-    const foundExtensions = output.split('\n')
-    const ids: string[] = []
-    for (const extId of foundExtensions) {
-        if (extId.trim() && !params.except.includes(extId)) {
-            ids.push('--disable-extension')
-            ids.push(extId)
-        }
-    }
-    return ids
-}
-
-export function getMinVsCodeVersion(): string {
-    const vsCodeVersion = manifest.engines.vscode
-
-    // We assume that we specify a minium, so it matches ^<number>, so remove ^'s
-    const sanitizedVersion = vsCodeVersion.replace('^', '')
-    console.log(`Using minimum VSCode version specified in package.json: ${sanitizedVersion}`)
-    return sanitizedVersion
-}
diff --git a/scripts/test/test.ts b/scripts/test/test.ts
deleted file mode 100644
index 50ce8511611..00000000000
--- a/scripts/test/test.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { resolve } from 'path'
-import { runTests } from '@vscode/test-electron'
-import { setupVSCodeTestInstance } from './launchTestUtilities'
-;(async () => {
-    try {
-        console.log('Running Main test suite...')
-
-        const vsCodeExecutablePath = await setupVSCodeTestInstance()
-        const rootDir = process.cwd()
-        const testEntrypoint = resolve(rootDir, 'dist/src/test/index.js')
-        const testWorkspace = resolve(rootDir, 'src/testFixtures/workspaceFolder')
-        console.log(`Starting tests: ${testEntrypoint}`)
-
-        const result = await runTests({
-            vscodeExecutablePath: vsCodeExecutablePath,
-            extensionDevelopmentPath: rootDir,
-            extensionTestsPath: testEntrypoint,
-            // For verbose VSCode logs, add "--verbose --log debug". c2165cf48e62c
-            launchArgs: [testWorkspace],
-            extensionTestsEnv: {
-                ['DEVELOPMENT_PATH']: rootDir,
-                ['AWS_TOOLKIT_AUTOMATION']: 'unit',
-            },
-        })
-
-        console.log(`Finished running Main test suite with result code: ${result}`)
-        process.exit(result)
-    } catch (err) {
-        console.error(err)
-        console.error('Failed to run tests')
-        process.exit(1)
-    }
-})()
diff --git a/src.gen/@amzn/.gitignore b/src.gen/@amzn/.gitignore
new file mode 100644
index 00000000000..f31061d0373
--- /dev/null
+++ b/src.gen/@amzn/.gitignore
@@ -0,0 +1,2 @@
+**/dist-*/
+**/*.tsbuildinfo
\ No newline at end of file
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/LICENSE b/src.gen/@amzn/amazon-q-developer-streaming-client/LICENSE
new file mode 100644
index 00000000000..ba9d6d15269
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/LICENSE
@@ -0,0 +1,201 @@
+                                Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2018-2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/README.md b/src.gen/@amzn/amazon-q-developer-streaming-client/README.md
new file mode 100644
index 00000000000..653e9d07be2
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/README.md
@@ -0,0 +1,815 @@
+<!-- generated file, do not edit directly -->
+
+# @amzn/amazon-q-developer-streaming-client
+
+## Description
+
+AWS SDK for JavaScript QDeveloperStreaming Client for Node.js, Browser and React Native.
+
+## Installing
+To install this package, simply type add or install @amzn/amazon-q-developer-streaming-client
+using your favorite package manager:
+- `npm install @amzn/amazon-q-developer-streaming-client`
+- `yarn add @amzn/amazon-q-developer-streaming-client`
+- `pnpm add @amzn/amazon-q-developer-streaming-client`
+
+## Getting Started
+
+### Import
+
+The AWS SDK is modulized by clients and commands.
+To send a request, you only need to import the `QDeveloperStreamingClient` and
+the commands you need, for example `SendMessageCommand`:
+
+```js
+// ES5 example
+const { QDeveloperStreamingClient, SendMessageCommand } = require("@amzn/amazon-q-developer-streaming-client");
+```
+
+```ts
+// ES6+ example
+import { QDeveloperStreamingClient, SendMessageCommand } from "@amzn/amazon-q-developer-streaming-client";
+```
+
+### Usage
+
+To send a request, you:
+
+- Initiate client with configuration (e.g. credentials, region).
+- Initiate command with input parameters.
+- Call `send` operation on client with command object as input.
+- If you are using a custom http handler, you may call `destroy()` to close open connections.
+
+```js
+// a client can be shared by different commands.
+const client = new QDeveloperStreamingClient({ region: "REGION" });
+
+const params = { /** input parameters */ };
+const command = new SendMessageCommand(params);
+```
+
+#### Async/await
+
+We recommend using [await](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/await)
+operator to wait for the promise returned by send operation as follows:
+
+```js
+// async/await.
+try {
+  const data = await client.send(command);
+  // process data.
+} catch (error) {
+  // error handling.
+} finally {
+  // finally.
+}
+```
+
+Async-await is clean, concise, intuitive, easy to debug and has better error handling
+as compared to using Promise chains or callbacks.
+
+#### Promises
+
+You can also use [Promise chaining](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises#chaining)
+to execute send operation.
+
+```js
+client.send(command).then(
+  (data) => {
+    // process data.
+  },
+  (error) => {
+    // error handling.
+  }
+);
+```
+
+Promises can also be called using `.catch()` and `.finally()` as follows:
+
+```js
+client
+  .send(command)
+  .then((data) => {
+    // process data.
+  })
+  .catch((error) => {
+    // error handling.
+  })
+  .finally(() => {
+    // finally.
+  });
+```
+
+#### Callbacks
+
+We do not recommend using callbacks because of [callback hell](http://callbackhell.com/),
+but they are supported by the send operation.
+
+```js
+// callbacks.
+client.send(command, (err, data) => {
+  // process err and data.
+});
+```
+
+#### v2 compatible style
+
+The client can also send requests using v2 compatible style.
+However, it results in a bigger bundle size and may be dropped in next major version. More details in the blog post
+on [modular packages in AWS SDK for JavaScript](https://aws.amazon.com/blogs/developer/modular-packages-in-aws-sdk-for-javascript/)
+
+```ts
+import * as AWS from "@amzn/amazon-q-developer-streaming-client";
+const client = new AWS.QDeveloperStreaming({ region: "REGION" });
+
+// async/await.
+try {
+  const data = await client.sendMessage(params);
+  // process data.
+} catch (error) {
+  // error handling.
+}
+
+// Promises.
+client
+  .sendMessage(params)
+  .then((data) => {
+    // process data.
+  })
+  .catch((error) => {
+    // error handling.
+  });
+
+// callbacks.
+client.sendMessage(params, (err, data) => {
+  // process err and data.
+});
+```
+
+### Troubleshooting
+
+When the service returns an exception, the error will include the exception information,
+as well as response metadata (e.g. request id).
+
+```js
+try {
+  const data = await client.send(command);
+  // process data.
+} catch (error) {
+  const { requestId, cfId, extendedRequestId } = error.$metadata;
+  console.log({ requestId, cfId, extendedRequestId });
+  /**
+   * The keys within exceptions are also parsed.
+   * You can access them by specifying exception names:
+   * if (error.name === 'SomeServiceException') {
+   *     const value = error.specialKeyInException;
+   * }
+   */
+}
+```
+
+## Getting Help
+
+Please use these community resources for getting help.
+We use the GitHub issues for tracking bugs and feature requests, but have limited bandwidth to address them.
+
+- Visit [Developer Guide](https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/welcome.html)
+  or [API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/index.html).
+- Check out the blog posts tagged with [`aws-sdk-js`](https://aws.amazon.com/blogs/developer/tag/aws-sdk-js/)
+  on AWS Developer Blog.
+- Ask a question on [StackOverflow](https://stackoverflow.com/questions/tagged/aws-sdk-js) and tag it with `aws-sdk-js`.
+- Join the AWS JavaScript community on [gitter](https://gitter.im/aws/aws-sdk-js-v3).
+- If it turns out that you may have found a bug, please [open an issue](https://github.com/aws/aws-sdk-js-v3/issues/new/choose).
+
+To test your universal JavaScript code in Node.js, browser and react-native environments,
+visit our [code samples repo](https://github.com/aws-samples/aws-sdk-js-tests).
+
+## Contributing
+
+This client code is generated automatically. Any modifications will be overwritten the next time the `@amzn/amazon-q-developer-streaming-client` package is updated.
+To contribute to client you can check our [generate clients scripts](https://github.com/aws/aws-sdk-js-v3/tree/main/scripts/generate-clients).
+
+## License
+
+This SDK is distributed under the
+[Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0),
+see LICENSE for more information.
+
+## Client Commands (Operations List)
+
+<details>
+<summary>
+AllowVendedLogDeliveryForResource
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/AllowVendedLogDeliveryForResourceCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/AllowVendedLogDeliveryForResourceCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/AllowVendedLogDeliveryForResourceCommandOutput/)
+</details>
+<details>
+<summary>
+AssociateCustomizationPermission
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/AssociateCustomizationPermissionCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/AssociateCustomizationPermissionCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/AssociateCustomizationPermissionCommandOutput/)
+</details>
+<details>
+<summary>
+CreateCustomization
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/CreateCustomizationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/CreateCustomizationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/CreateCustomizationCommandOutput/)
+</details>
+<details>
+<summary>
+CreateProfile
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/CreateProfileCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/CreateProfileCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/CreateProfileCommandOutput/)
+</details>
+<details>
+<summary>
+DeleteCustomization
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/DeleteCustomizationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/DeleteCustomizationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/DeleteCustomizationCommandOutput/)
+</details>
+<details>
+<summary>
+DeleteProfile
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/DeleteProfileCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/DeleteProfileCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/DeleteProfileCommandOutput/)
+</details>
+<details>
+<summary>
+DisassociateCustomizationPermission
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/DisassociateCustomizationPermissionCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/DisassociateCustomizationPermissionCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/DisassociateCustomizationPermissionCommandOutput/)
+</details>
+<details>
+<summary>
+GenerateRecommendations
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/GenerateRecommendationsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GenerateRecommendationsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GenerateRecommendationsCommandOutput/)
+</details>
+<details>
+<summary>
+GetCustomization
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/GetCustomizationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetCustomizationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetCustomizationCommandOutput/)
+</details>
+<details>
+<summary>
+ListCustomizationPermissions
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/ListCustomizationPermissionsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListCustomizationPermissionsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListCustomizationPermissionsCommandOutput/)
+</details>
+<details>
+<summary>
+ListCustomizations
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/ListCustomizationsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListCustomizationsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListCustomizationsCommandOutput/)
+</details>
+<details>
+<summary>
+ListCustomizationVersions
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/ListCustomizationVersionsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListCustomizationVersionsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListCustomizationVersionsCommandOutput/)
+</details>
+<details>
+<summary>
+ListProfiles
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/ListProfilesCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListProfilesCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListProfilesCommandOutput/)
+</details>
+<details>
+<summary>
+ListTagsForResource
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/ListTagsForResourceCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListTagsForResourceCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListTagsForResourceCommandOutput/)
+</details>
+<details>
+<summary>
+TagResource
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/TagResourceCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/TagResourceCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/TagResourceCommandOutput/)
+</details>
+<details>
+<summary>
+UntagResource
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/UntagResourceCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/UntagResourceCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/UntagResourceCommandOutput/)
+</details>
+<details>
+<summary>
+UpdateCustomization
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/UpdateCustomizationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/UpdateCustomizationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/UpdateCustomizationCommandOutput/)
+</details>
+<details>
+<summary>
+UpdateProfile
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/UpdateProfileCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/UpdateProfileCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/UpdateProfileCommandOutput/)
+</details>
+<details>
+<summary>
+VendKeyGrant
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/VendKeyGrantCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/VendKeyGrantCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/VendKeyGrantCommandOutput/)
+</details>
+<details>
+<summary>
+CreateArtifactUploadUrl
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/CreateArtifactUploadUrlCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/CreateArtifactUploadUrlCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/CreateArtifactUploadUrlCommandOutput/)
+</details>
+<details>
+<summary>
+CreateTaskAssistConversation
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/CreateTaskAssistConversationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/CreateTaskAssistConversationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/CreateTaskAssistConversationCommandOutput/)
+</details>
+<details>
+<summary>
+CreateUploadUrl
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/CreateUploadUrlCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/CreateUploadUrlCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/CreateUploadUrlCommandOutput/)
+</details>
+<details>
+<summary>
+CreateWorkspace
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/CreateWorkspaceCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/CreateWorkspaceCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/CreateWorkspaceCommandOutput/)
+</details>
+<details>
+<summary>
+DeleteTaskAssistConversation
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/DeleteTaskAssistConversationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/DeleteTaskAssistConversationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/DeleteTaskAssistConversationCommandOutput/)
+</details>
+<details>
+<summary>
+DeleteWorkspace
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/DeleteWorkspaceCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/DeleteWorkspaceCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/DeleteWorkspaceCommandOutput/)
+</details>
+<details>
+<summary>
+GenerateCompletions
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/GenerateCompletionsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GenerateCompletionsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GenerateCompletionsCommandOutput/)
+</details>
+<details>
+<summary>
+GetCodeAnalysis
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/GetCodeAnalysisCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetCodeAnalysisCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetCodeAnalysisCommandOutput/)
+</details>
+<details>
+<summary>
+GetCodeFixJob
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/GetCodeFixJobCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetCodeFixJobCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetCodeFixJobCommandOutput/)
+</details>
+<details>
+<summary>
+GetTaskAssistCodeGeneration
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/GetTaskAssistCodeGenerationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetTaskAssistCodeGenerationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetTaskAssistCodeGenerationCommandOutput/)
+</details>
+<details>
+<summary>
+GetTestGeneration
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/GetTestGenerationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetTestGenerationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetTestGenerationCommandOutput/)
+</details>
+<details>
+<summary>
+GetTransformation
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/GetTransformationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetTransformationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetTransformationCommandOutput/)
+</details>
+<details>
+<summary>
+GetTransformationPlan
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/GetTransformationPlanCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetTransformationPlanCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetTransformationPlanCommandOutput/)
+</details>
+<details>
+<summary>
+ListAvailableCustomizations
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/ListAvailableCustomizationsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListAvailableCustomizationsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListAvailableCustomizationsCommandOutput/)
+</details>
+<details>
+<summary>
+ListAvailableProfiles
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/ListAvailableProfilesCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListAvailableProfilesCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListAvailableProfilesCommandOutput/)
+</details>
+<details>
+<summary>
+ListCodeAnalysisFindings
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/ListCodeAnalysisFindingsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListCodeAnalysisFindingsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListCodeAnalysisFindingsCommandOutput/)
+</details>
+<details>
+<summary>
+ListFeatureEvaluations
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/ListFeatureEvaluationsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListFeatureEvaluationsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListFeatureEvaluationsCommandOutput/)
+</details>
+<details>
+<summary>
+ListWorkspaceMetadata
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/ListWorkspaceMetadataCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListWorkspaceMetadataCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListWorkspaceMetadataCommandOutput/)
+</details>
+<details>
+<summary>
+ResumeTransformation
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/ResumeTransformationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ResumeTransformationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ResumeTransformationCommandOutput/)
+</details>
+<details>
+<summary>
+SendTelemetryEvent
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/SendTelemetryEventCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/SendTelemetryEventCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/SendTelemetryEventCommandOutput/)
+</details>
+<details>
+<summary>
+StartCodeAnalysis
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/StartCodeAnalysisCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/StartCodeAnalysisCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/StartCodeAnalysisCommandOutput/)
+</details>
+<details>
+<summary>
+StartCodeFixJob
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/StartCodeFixJobCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/StartCodeFixJobCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/StartCodeFixJobCommandOutput/)
+</details>
+<details>
+<summary>
+StartTaskAssistCodeGeneration
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/StartTaskAssistCodeGenerationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/StartTaskAssistCodeGenerationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/StartTaskAssistCodeGenerationCommandOutput/)
+</details>
+<details>
+<summary>
+StartTestGeneration
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/StartTestGenerationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/StartTestGenerationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/StartTestGenerationCommandOutput/)
+</details>
+<details>
+<summary>
+StartTransformation
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/StartTransformationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/StartTransformationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/StartTransformationCommandOutput/)
+</details>
+<details>
+<summary>
+StopTransformation
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/StopTransformationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/StopTransformationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/StopTransformationCommandOutput/)
+</details>
+<details>
+<summary>
+ExportResultArchive
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/ExportResultArchiveCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ExportResultArchiveCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ExportResultArchiveCommandOutput/)
+</details>
+<details>
+<summary>
+GenerateAssistantResponse
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/GenerateAssistantResponseCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GenerateAssistantResponseCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GenerateAssistantResponseCommandOutput/)
+</details>
+<details>
+<summary>
+GenerateTaskAssistPlan
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/GenerateTaskAssistPlanCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GenerateTaskAssistPlanCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GenerateTaskAssistPlanCommandOutput/)
+</details>
+<details>
+<summary>
+AssociateConnectorResource
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/AssociateConnectorResourceCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/AssociateConnectorResourceCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/AssociateConnectorResourceCommandOutput/)
+</details>
+<details>
+<summary>
+CreateAssignment
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/CreateAssignmentCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/CreateAssignmentCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/CreateAssignmentCommandOutput/)
+</details>
+<details>
+<summary>
+CreateExtension
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/CreateExtensionCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/CreateExtensionCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/CreateExtensionCommandOutput/)
+</details>
+<details>
+<summary>
+CreatePlugin
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/CreatePluginCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/CreatePluginCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/CreatePluginCommandOutput/)
+</details>
+<details>
+<summary>
+CreateResolution
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/CreateResolutionCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/CreateResolutionCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/CreateResolutionCommandOutput/)
+</details>
+<details>
+<summary>
+DeleteAssignment
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/DeleteAssignmentCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/DeleteAssignmentCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/DeleteAssignmentCommandOutput/)
+</details>
+<details>
+<summary>
+DeleteConversation
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/DeleteConversationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/DeleteConversationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/DeleteConversationCommandOutput/)
+</details>
+<details>
+<summary>
+DeleteExtension
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/DeleteExtensionCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/DeleteExtensionCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/DeleteExtensionCommandOutput/)
+</details>
+<details>
+<summary>
+DeletePlugin
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/DeletePluginCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/DeletePluginCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/DeletePluginCommandOutput/)
+</details>
+<details>
+<summary>
+GetConnector
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/GetConnectorCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetConnectorCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetConnectorCommandOutput/)
+</details>
+<details>
+<summary>
+GetConversation
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/GetConversationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetConversationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetConversationCommandOutput/)
+</details>
+<details>
+<summary>
+GetExtension
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/GetExtensionCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetExtensionCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetExtensionCommandOutput/)
+</details>
+<details>
+<summary>
+GetIdentityMetadata
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/GetIdentityMetadataCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetIdentityMetadataCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetIdentityMetadataCommandOutput/)
+</details>
+<details>
+<summary>
+GetPlugin
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/GetPluginCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetPluginCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetPluginCommandOutput/)
+</details>
+<details>
+<summary>
+GetTask
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/GetTaskCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetTaskCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetTaskCommandOutput/)
+</details>
+<details>
+<summary>
+GetTroubleshootingResults
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/GetTroubleshootingResultsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetTroubleshootingResultsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GetTroubleshootingResultsCommandOutput/)
+</details>
+<details>
+<summary>
+InvokeTask
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/InvokeTaskCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/InvokeTaskCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/InvokeTaskCommandOutput/)
+</details>
+<details>
+<summary>
+ListConversations
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/ListConversationsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListConversationsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListConversationsCommandOutput/)
+</details>
+<details>
+<summary>
+ListDashboardMetrics
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/ListDashboardMetricsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListDashboardMetricsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListDashboardMetricsCommandOutput/)
+</details>
+<details>
+<summary>
+ListExtensionProviders
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/ListExtensionProvidersCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListExtensionProvidersCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListExtensionProvidersCommandOutput/)
+</details>
+<details>
+<summary>
+ListExtensions
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/ListExtensionsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListExtensionsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListExtensionsCommandOutput/)
+</details>
+<details>
+<summary>
+ListPluginProviders
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/ListPluginProvidersCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListPluginProvidersCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListPluginProvidersCommandOutput/)
+</details>
+<details>
+<summary>
+ListPlugins
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/ListPluginsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListPluginsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListPluginsCommandOutput/)
+</details>
+<details>
+<summary>
+ListTagsForResource
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/ListTagsForResourceCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListTagsForResourceCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListTagsForResourceCommandOutput/)
+</details>
+<details>
+<summary>
+ListTasks
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/ListTasksCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListTasksCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/ListTasksCommandOutput/)
+</details>
+<details>
+<summary>
+PassRequest
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/PassRequestCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/PassRequestCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/PassRequestCommandOutput/)
+</details>
+<details>
+<summary>
+RejectConnector
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/RejectConnectorCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/RejectConnectorCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/RejectConnectorCommandOutput/)
+</details>
+<details>
+<summary>
+SendEvent
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/SendEventCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/SendEventCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/SendEventCommandOutput/)
+</details>
+<details>
+<summary>
+SendMessage
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/SendMessageCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/SendMessageCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/SendMessageCommandOutput/)
+</details>
+<details>
+<summary>
+StartConversation
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/StartConversationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/StartConversationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/StartConversationCommandOutput/)
+</details>
+<details>
+<summary>
+StartTroubleshootingAnalysis
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/StartTroubleshootingAnalysisCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/StartTroubleshootingAnalysisCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/StartTroubleshootingAnalysisCommandOutput/)
+</details>
+<details>
+<summary>
+StartTroubleshootingResolutionExplanation
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/StartTroubleshootingResolutionExplanationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/StartTroubleshootingResolutionExplanationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/StartTroubleshootingResolutionExplanationCommandOutput/)
+</details>
+<details>
+<summary>
+TagResource
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/TagResourceCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/TagResourceCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/TagResourceCommandOutput/)
+</details>
+<details>
+<summary>
+UntagResource
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/UntagResourceCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/UntagResourceCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/UntagResourceCommandOutput/)
+</details>
+<details>
+<summary>
+UpdateConversation
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/UpdateConversationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/UpdateConversationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/UpdateConversationCommandOutput/)
+</details>
+<details>
+<summary>
+UpdatePlugin
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/UpdatePluginCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/UpdatePluginCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/UpdatePluginCommandOutput/)
+</details>
+<details>
+<summary>
+UpdateTroubleshootingCommandResult
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/UpdateTroubleshootingCommandResultCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/UpdateTroubleshootingCommandResultCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/UpdateTroubleshootingCommandResultCommandOutput/)
+</details>
+<details>
+<summary>
+UsePlugin
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/UsePluginCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/UsePluginCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/UsePluginCommandOutput/)
+</details>
+<details>
+<summary>
+GenerateCodeFromCommands
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/GenerateCodeFromCommandsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GenerateCodeFromCommandsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/GenerateCodeFromCommandsCommandOutput/)
+</details>
+<details>
+<summary>
+SendMessage
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/qdeveloperstreaming/command/SendMessageCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/SendMessageCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-qdeveloperstreaming/Interface/SendMessageCommandOutput/)
+</details>
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/api-extractor.json b/src.gen/@amzn/amazon-q-developer-streaming-client/api-extractor.json
new file mode 100644
index 00000000000..d5bf5ffeee8
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/api-extractor.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../../api-extractor.json",
+  "mainEntryPointFilePath": "<projectFolder>/dist-types/index.d.ts"
+}
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/package-lock.json b/src.gen/@amzn/amazon-q-developer-streaming-client/package-lock.json
new file mode 100644
index 00000000000..e5a2bb386b4
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/package-lock.json
@@ -0,0 +1,1876 @@
+{
+    "name": "@amzn/amazon-q-developer-streaming-client",
+    "version": "1.0.0",
+    "lockfileVersion": 3,
+    "requires": true,
+    "packages": {
+        "": {
+            "name": "@amzn/amazon-q-developer-streaming-client",
+            "version": "1.0.0",
+            "hasInstallScript": true,
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.731.0",
+                "@aws-sdk/credential-provider-node": "3.731.1",
+                "@aws-sdk/middleware-host-header": "3.731.0",
+                "@aws-sdk/middleware-logger": "3.731.0",
+                "@aws-sdk/middleware-recursion-detection": "3.731.0",
+                "@aws-sdk/middleware-user-agent": "3.731.0",
+                "@aws-sdk/region-config-resolver": "3.731.0",
+                "@aws-sdk/types": "3.731.0",
+                "@aws-sdk/util-user-agent-browser": "3.731.0",
+                "@aws-sdk/util-user-agent-node": "3.731.0",
+                "@smithy/config-resolver": "^4.0.1",
+                "@smithy/core": "^3.1.1",
+                "@smithy/eventstream-serde-browser": "^4.0.1",
+                "@smithy/eventstream-serde-config-resolver": "^4.0.1",
+                "@smithy/eventstream-serde-node": "^4.0.1",
+                "@smithy/fetch-http-handler": "^5.0.1",
+                "@smithy/hash-node": "^4.0.1",
+                "@smithy/invalid-dependency": "^4.0.1",
+                "@smithy/middleware-content-length": "^4.0.1",
+                "@smithy/middleware-retry": "^4.0.3",
+                "@smithy/middleware-serde": "^4.0.1",
+                "@smithy/middleware-stack": "^4.0.1",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/node-http-handler": "^4.0.2",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/smithy-client": "^4.1.2",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.3",
+                "@smithy/util-defaults-mode-node": "^4.0.3",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-retry": "^4.0.1",
+                "@smithy/util-utf8": "^4.0.0",
+                "@types/uuid": "^9.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "devDependencies": {
+                "@tsconfig/node18": "18.2.4",
+                "@types/node": "^18.19.69",
+                "concurrently": "7.0.0",
+                "downlevel-dts": "0.10.1",
+                "rimraf": "^3.0.0",
+                "typescript": "~5.2.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-crypto/crc32": {
+            "version": "5.2.0",
+            "integrity": "sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/util": "^5.2.0",
+                "@aws-sdk/types": "^3.222.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-crypto/sha256-browser": {
+            "version": "5.2.0",
+            "integrity": "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-js": "^5.2.0",
+                "@aws-crypto/supports-web-crypto": "^5.2.0",
+                "@aws-crypto/util": "^5.2.0",
+                "@aws-sdk/types": "^3.222.0",
+                "@aws-sdk/util-locate-window": "^3.0.0",
+                "@smithy/util-utf8": "^2.0.0",
+                "tslib": "^2.6.2"
+            }
+        },
+        "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/is-array-buffer": {
+            "version": "2.2.0",
+            "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-buffer-from": {
+            "version": "2.2.0",
+            "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^2.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-utf8": {
+            "version": "2.3.0",
+            "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^2.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/@aws-crypto/sha256-js": {
+            "version": "5.2.0",
+            "integrity": "sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/util": "^5.2.0",
+                "@aws-sdk/types": "^3.222.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-crypto/supports-web-crypto": {
+            "version": "5.2.0",
+            "integrity": "sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            }
+        },
+        "node_modules/@aws-crypto/util": {
+            "version": "5.2.0",
+            "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "^3.222.0",
+                "@smithy/util-utf8": "^2.0.0",
+                "tslib": "^2.6.2"
+            }
+        },
+        "node_modules/@aws-crypto/util/node_modules/@smithy/is-array-buffer": {
+            "version": "2.2.0",
+            "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/@aws-crypto/util/node_modules/@smithy/util-buffer-from": {
+            "version": "2.2.0",
+            "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^2.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": {
+            "version": "2.3.0",
+            "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^2.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/client-sso": {
+            "version": "3.731.0",
+            "integrity": "sha512-O4C/UYGgqMsBg21MMApFdgyh8BX568hQhbdoNFmRVTBoSnCZ3w+H4a1wBPX4Gyl0NX+ab6Xxo9rId8HiyPXJ0A==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.731.0",
+                "@aws-sdk/middleware-host-header": "3.731.0",
+                "@aws-sdk/middleware-logger": "3.731.0",
+                "@aws-sdk/middleware-recursion-detection": "3.731.0",
+                "@aws-sdk/middleware-user-agent": "3.731.0",
+                "@aws-sdk/region-config-resolver": "3.731.0",
+                "@aws-sdk/types": "3.731.0",
+                "@aws-sdk/util-endpoints": "3.731.0",
+                "@aws-sdk/util-user-agent-browser": "3.731.0",
+                "@aws-sdk/util-user-agent-node": "3.731.0",
+                "@smithy/config-resolver": "^4.0.0",
+                "@smithy/core": "^3.0.0",
+                "@smithy/fetch-http-handler": "^5.0.0",
+                "@smithy/hash-node": "^4.0.0",
+                "@smithy/invalid-dependency": "^4.0.0",
+                "@smithy/middleware-content-length": "^4.0.0",
+                "@smithy/middleware-endpoint": "^4.0.0",
+                "@smithy/middleware-retry": "^4.0.0",
+                "@smithy/middleware-serde": "^4.0.0",
+                "@smithy/middleware-stack": "^4.0.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/node-http-handler": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/smithy-client": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/url-parser": "^4.0.0",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.0",
+                "@smithy/util-defaults-mode-node": "^4.0.0",
+                "@smithy/util-endpoints": "^3.0.0",
+                "@smithy/util-middleware": "^4.0.0",
+                "@smithy/util-retry": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/core": {
+            "version": "3.731.0",
+            "integrity": "sha512-ithBN1VWASkvAIlozJmenqDvNnFddr/SZXAs58+jCnBHgy3tXLHABZGVNCjetZkHRqNdXEO1kirnoxaFeXMeDA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/core": "^3.0.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/signature-v4": "^5.0.0",
+                "@smithy/smithy-client": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.0",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/credential-provider-env": {
+            "version": "3.731.0",
+            "integrity": "sha512-h0WWZg4QMLgFVyIvQrC43zpVqsUWg1mPM1clpogP43B8+wEhDEQ4qWRzvFs3dQ4cqx/FLyDUZZF4cqgd94z7kw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.731.0",
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/credential-provider-http": {
+            "version": "3.731.0",
+            "integrity": "sha512-iRtrjtcYaWgbvtu2cvDhIsPWXZGvhy1Hgks4682MEBNTc9AUwlfvDrYz2EEnTtJJyrbOdEHVrYrzqD8qPyVLCg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.731.0",
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/fetch-http-handler": "^5.0.0",
+                "@smithy/node-http-handler": "^4.0.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/smithy-client": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/util-stream": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/credential-provider-ini": {
+            "version": "3.731.1",
+            "integrity": "sha512-0M0ejuqW8iHNcTH2ZXSY9m+I7Y06qVkj6k3vfQU9XaB//mTUCxxfGfqWAtgfr7Yi73egABTcPc0jyPdcvSW4Kw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.731.0",
+                "@aws-sdk/credential-provider-env": "3.731.0",
+                "@aws-sdk/credential-provider-http": "3.731.0",
+                "@aws-sdk/credential-provider-process": "3.731.0",
+                "@aws-sdk/credential-provider-sso": "3.731.1",
+                "@aws-sdk/credential-provider-web-identity": "3.731.1",
+                "@aws-sdk/nested-clients": "3.731.1",
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/credential-provider-imds": "^4.0.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/shared-ini-file-loader": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/credential-provider-node": {
+            "version": "3.731.1",
+            "integrity": "sha512-5c0ZiagMTPmWilXNffeXJCLoCEz97jilHr3QJWwf2GaTay4tzN+Ld71rpdfEenzUR7fuxEWFfVlwQbFOzFNYHg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/credential-provider-env": "3.731.0",
+                "@aws-sdk/credential-provider-http": "3.731.0",
+                "@aws-sdk/credential-provider-ini": "3.731.1",
+                "@aws-sdk/credential-provider-process": "3.731.0",
+                "@aws-sdk/credential-provider-sso": "3.731.1",
+                "@aws-sdk/credential-provider-web-identity": "3.731.1",
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/credential-provider-imds": "^4.0.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/shared-ini-file-loader": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/credential-provider-process": {
+            "version": "3.731.0",
+            "integrity": "sha512-6yNMY6q3xHLbs2f2+C6GhvMrjTgtFBiPJJqKaPLsTIhlTRvh4sK8pGm3ITcma0jOxtPDIuoPfBAV8N8XVMBlZg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.731.0",
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/shared-ini-file-loader": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/credential-provider-sso": {
+            "version": "3.731.1",
+            "integrity": "sha512-p1tp+rMUf5YNQLr8rVRmDgNtKGYLL0KCdq3K2hwwvFnx9MjReF1sA4lfm3xWsxBQM+j3QN9AvMQqBzDJ+NOSdw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/client-sso": "3.731.0",
+                "@aws-sdk/core": "3.731.0",
+                "@aws-sdk/token-providers": "3.731.1",
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/shared-ini-file-loader": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/credential-provider-web-identity": {
+            "version": "3.731.1",
+            "integrity": "sha512-+ynAvEGWDR5ZJFxgpwwzhvlQ3WQ7BleWXU6JwpIw3yFrD4eZEn85b8DZC1aEz7C9kb1HSV6B3gpqHqlyS6wj8g==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.731.0",
+                "@aws-sdk/nested-clients": "3.731.1",
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.731.0",
+            "integrity": "sha512-ndAJsm5uWPPJRZowLKpB1zuL17qWlWVtCJP4I/ynBkq1PU1DijDXBul2UZaG6Mpvsgms1NXo/h9noHuK7T3v8w==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.731.0",
+            "integrity": "sha512-IIZrOdjbY2vKzPJPrwE7FoFQCIPEL6UqURi8LEaiVyCag4p2fvaTN5pgKuQtGC2+iYd/HHcGT4qn2bAqF5Jmmw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.731.0",
+            "integrity": "sha512-y6FLASB1iKWuR5tUipMyo77bt0lEl3OnCrrd2xw/H24avq1HhJjjPR0HHhJE6QKJzF/FYXeV88tcyPSMe32VDw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.731.0",
+            "integrity": "sha512-Ngr2Gz0aec/uduoKaO3srN52SYkEHndYtFzkK/gDUyQwQzi4ha2eIisxPiuHEX6RvXT31V9ouqn/YtVkt0R76A==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.731.0",
+                "@aws-sdk/types": "3.731.0",
+                "@aws-sdk/util-endpoints": "3.731.0",
+                "@smithy/core": "^3.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/nested-clients": {
+            "version": "3.731.1",
+            "integrity": "sha512-/L8iVrulnXZl+kgmTn+oxRxNnhcSIbf+r12C06vGUq60w0YMidLvxJZN7vt8H9SnCAGCHqud2MS7ExCEvhc0gA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.731.0",
+                "@aws-sdk/middleware-host-header": "3.731.0",
+                "@aws-sdk/middleware-logger": "3.731.0",
+                "@aws-sdk/middleware-recursion-detection": "3.731.0",
+                "@aws-sdk/middleware-user-agent": "3.731.0",
+                "@aws-sdk/region-config-resolver": "3.731.0",
+                "@aws-sdk/types": "3.731.0",
+                "@aws-sdk/util-endpoints": "3.731.0",
+                "@aws-sdk/util-user-agent-browser": "3.731.0",
+                "@aws-sdk/util-user-agent-node": "3.731.0",
+                "@smithy/config-resolver": "^4.0.0",
+                "@smithy/core": "^3.0.0",
+                "@smithy/fetch-http-handler": "^5.0.0",
+                "@smithy/hash-node": "^4.0.0",
+                "@smithy/invalid-dependency": "^4.0.0",
+                "@smithy/middleware-content-length": "^4.0.0",
+                "@smithy/middleware-endpoint": "^4.0.0",
+                "@smithy/middleware-retry": "^4.0.0",
+                "@smithy/middleware-serde": "^4.0.0",
+                "@smithy/middleware-stack": "^4.0.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/node-http-handler": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/smithy-client": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/url-parser": "^4.0.0",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.0",
+                "@smithy/util-defaults-mode-node": "^4.0.0",
+                "@smithy/util-endpoints": "^3.0.0",
+                "@smithy/util-middleware": "^4.0.0",
+                "@smithy/util-retry": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.731.0",
+            "integrity": "sha512-XlDpRNkDVHF59f07JmkuAidEv//m3hT6/JL85h0l3+zrpaRWhf8n8lVUyAPNq35ZujK8AcorYM+93u7hdWsliQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/token-providers": {
+            "version": "3.731.1",
+            "integrity": "sha512-t34GOPwBZsX7zGHjiTXmMHGY3kHM7fLiQ60Jqk0On9P0ASHTDE5U75RgCXboE3u+qEv9wyKyaqMNyMWj9qQlFg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/nested-clients": "3.731.1",
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/shared-ini-file-loader": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/types": {
+            "version": "3.731.0",
+            "integrity": "sha512-NrdkJg6oOUbXR2r9WvHP408CLyvST8cJfp1/jP9pemtjvjPoh6NukbCtiSFdOOb1eryP02CnqQWItfJC1p2Y/Q==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.731.0",
+            "integrity": "sha512-riztxTAfncFS9yQWcBJffGgOgLoKSa63ph+rxWJxKl6BHAmWEvHICj1qDcVmnWfIcvJ5cClclY75l9qKaUH7rQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/util-endpoints": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/util-locate-window": {
+            "version": "3.723.0",
+            "integrity": "sha512-Yf2CS10BqK688DRsrKI/EO6B8ff5J86NXe4C+VCysK7UOgN0l1zOTeTukZ3H8Q9tYYX3oaF1961o8vRkFm7Nmw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.731.0",
+            "integrity": "sha512-EnYXxTkCNCjTTBjW/pelRPv4Thsi9jepoB6qQjPMA9/ixrZ71BhhQecz9kgqzZLR9BPCwb6hgJ/Yd702jqJ4aQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/types": "^4.0.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
+            }
+        },
+        "node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.731.0",
+            "integrity": "sha512-Rze78Ym5Bx7aWMvmZE2iL3JPo2INNCC5N9rLVx98Gg1G0ZaxclVRUvJrh1AojNlOFxU+otkxAe7FA3Foy2iLLQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/middleware-user-agent": "3.731.0",
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            },
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@babel/runtime": {
+            "version": "7.26.9",
+            "integrity": "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "regenerator-runtime": "^0.14.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@smithy/abort-controller": {
+            "version": "4.0.1",
+            "integrity": "sha512-fiUIYgIgRjMWznk6iLJz35K2YxSLHzLBA/RC6lBrKfQ8fHbPfvk7Pk9UvpKoHgJjI18MnbPuEju53zcVy6KF1g==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/config-resolver": {
+            "version": "4.0.1",
+            "integrity": "sha512-Igfg8lKu3dRVkTSEm98QpZUvKEOa71jDX4vKRcvJVyRc3UgN3j7vFMf0s7xLQhYmKa8kyJGQgUJDOV5V3neVlQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/core": {
+            "version": "3.1.5",
+            "integrity": "sha512-HLclGWPkCsekQgsyzxLhCQLa8THWXtB5PxyYN+2O6nkyLt550KQKTlbV2D1/j5dNIQapAZM1+qFnpBFxZQkgCA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-stream": "^4.1.2",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/credential-provider-imds": {
+            "version": "4.0.1",
+            "integrity": "sha512-l/qdInaDq1Zpznpmev/+52QomsJNZ3JkTl5yrTl02V6NBgJOQ4LY0SFw/8zsMwj3tLe8vqiIuwF6nxaEwgf6mg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/eventstream-codec": {
+            "version": "4.0.1",
+            "integrity": "sha512-Q2bCAAR6zXNVtJgifsU16ZjKGqdw/DyecKNgIgi7dlqw04fqDu0mnq+JmGphqheypVc64CYq3azSuCpAdFk2+A==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/crc32": "5.2.0",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/eventstream-serde-browser": {
+            "version": "4.0.1",
+            "integrity": "sha512-HbIybmz5rhNg+zxKiyVAnvdM3vkzjE6ccrJ620iPL8IXcJEntd3hnBl+ktMwIy12Te/kyrSbUb8UCdnUT4QEdA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/eventstream-serde-universal": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/eventstream-serde-config-resolver": {
+            "version": "4.0.1",
+            "integrity": "sha512-lSipaiq3rmHguHa3QFF4YcCM3VJOrY9oq2sow3qlhFY+nBSTF/nrO82MUQRPrxHQXA58J5G1UnU2WuJfi465BA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/eventstream-serde-node": {
+            "version": "4.0.1",
+            "integrity": "sha512-o4CoOI6oYGYJ4zXo34U8X9szDe3oGjmHgsMGiZM0j4vtNoT+h80TLnkUcrLZR3+E6HIxqW+G+9WHAVfl0GXK0Q==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/eventstream-serde-universal": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/eventstream-serde-universal": {
+            "version": "4.0.1",
+            "integrity": "sha512-Z94uZp0tGJuxds3iEAZBqGU2QiaBHP4YytLUjwZWx+oUeohCsLyUm33yp4MMBmhkuPqSbQCXq5hDet6JGUgHWA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/eventstream-codec": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/fetch-http-handler": {
+            "version": "5.0.1",
+            "integrity": "sha512-3aS+fP28urrMW2KTjb6z9iFow6jO8n3MFfineGbndvzGZit3taZhKWtTorf+Gp5RpFDDafeHlhfsGlDCXvUnJA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/querystring-builder": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-base64": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/hash-node": {
+            "version": "4.0.1",
+            "integrity": "sha512-TJ6oZS+3r2Xu4emVse1YPB3Dq3d8RkZDKcPr71Nj/lJsdAP1c7oFzYqEn1IBc915TsgLl2xIJNuxCz+gLbLE0w==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/invalid-dependency": {
+            "version": "4.0.1",
+            "integrity": "sha512-gdudFPf4QRQ5pzj7HEnu6FhKRi61BfH/Gk5Yf6O0KiSbr1LlVhgjThcvjdu658VE6Nve8vaIWB8/fodmS1rBPQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/is-array-buffer": {
+            "version": "4.0.0",
+            "integrity": "sha512-saYhF8ZZNoJDTvJBEWgeBccCg+yvp1CX+ed12yORU3NilJScfc6gfch2oVb4QgxZrGUx3/ZJlb+c/dJbyupxlw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/middleware-content-length": {
+            "version": "4.0.1",
+            "integrity": "sha512-OGXo7w5EkB5pPiac7KNzVtfCW2vKBTZNuCctn++TTSOMpe6RZO/n6WEC1AxJINn3+vWLKW49uad3lo/u0WJ9oQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/middleware-endpoint": {
+            "version": "4.0.6",
+            "integrity": "sha512-ftpmkTHIFqgaFugcjzLZv3kzPEFsBFSnq1JsIkr2mwFzCraZVhQk2gqN51OOeRxqhbPTkRFj39Qd2V91E/mQxg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/core": "^3.1.5",
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "@smithy/util-middleware": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/middleware-retry": {
+            "version": "4.0.7",
+            "integrity": "sha512-58j9XbUPLkqAcV1kHzVX/kAR16GT+j7DUZJqwzsxh1jtz7G82caZiGyyFgUvogVfNTg3TeAOIJepGc8TXF4AVQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/service-error-classification": "^4.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-retry": "^4.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/middleware-serde": {
+            "version": "4.0.2",
+            "integrity": "sha512-Sdr5lOagCn5tt+zKsaW+U2/iwr6bI9p08wOkCp6/eL6iMbgdtc2R5Ety66rf87PeohR0ExI84Txz9GYv5ou3iQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/middleware-stack": {
+            "version": "4.0.1",
+            "integrity": "sha512-dHwDmrtR/ln8UTHpaIavRSzeIk5+YZTBtLnKwDW3G2t6nAupCiQUvNzNoHBpik63fwUaJPtlnMzXbQrNFWssIA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/node-config-provider": {
+            "version": "4.0.1",
+            "integrity": "sha512-8mRTjvCtVET8+rxvmzRNRR0hH2JjV0DFOmwXPrISmTIJEfnCBugpYYGAsCj8t41qd+RB5gbheSQ/6aKZCQvFLQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/node-http-handler": {
+            "version": "4.0.3",
+            "integrity": "sha512-dYCLeINNbYdvmMLtW0VdhW1biXt+PPCGazzT5ZjKw46mOtdgToQEwjqZSS9/EN8+tNs/RO0cEWG044+YZs97aA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/abort-controller": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/querystring-builder": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/property-provider": {
+            "version": "4.0.1",
+            "integrity": "sha512-o+VRiwC2cgmk/WFV0jaETGOtX16VNPp2bSQEzu0whbReqE1BMqsP2ami2Vi3cbGVdKu1kq9gQkDAGKbt0WOHAQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/protocol-http": {
+            "version": "5.0.1",
+            "integrity": "sha512-TE4cpj49jJNB/oHyh/cRVEgNZaoPaxd4vteJNB0yGidOCVR0jCw/hjPVsT8Q8FRmj8Bd3bFZt8Dh7xGCT+xMBQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/querystring-builder": {
+            "version": "4.0.1",
+            "integrity": "sha512-wU87iWZoCbcqrwszsOewEIuq+SU2mSoBE2CcsLwE0I19m0B2gOJr1MVjxWcDQYOzHbR1xCk7AcOBbGFUYOKvdg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/querystring-parser": {
+            "version": "4.0.1",
+            "integrity": "sha512-Ma2XC7VS9aV77+clSFylVUnPZRindhB7BbmYiNOdr+CHt/kZNJoPP0cd3QxCnCFyPXC4eybmyE98phEHkqZ5Jw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/service-error-classification": {
+            "version": "4.0.1",
+            "integrity": "sha512-3JNjBfOWpj/mYfjXJHB4Txc/7E4LVq32bwzE7m28GN79+M1f76XHflUaSUkhOriprPDzev9cX/M+dEB80DNDKA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/shared-ini-file-loader": {
+            "version": "4.0.1",
+            "integrity": "sha512-hC8F6qTBbuHRI/uqDgqqi6J0R4GtEZcgrZPhFQnMhfJs3MnUTGSnR1NSJCJs5VWlMydu0kJz15M640fJlRsIOw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/signature-v4": {
+            "version": "5.0.1",
+            "integrity": "sha512-nCe6fQ+ppm1bQuw5iKoeJ0MJfz2os7Ic3GBjOkLOPtavbD1ONoyE3ygjBfz2ythFWm4YnRm6OxW+8p/m9uCoIA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/smithy-client": {
+            "version": "4.1.6",
+            "integrity": "sha512-UYDolNg6h2O0L+cJjtgSyKKvEKCOa/8FHYJnBobyeoeWDmNpXjwOAtw16ezyeu1ETuuLEOZbrynK0ZY1Lx9Jbw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/core": "^3.1.5",
+                "@smithy/middleware-endpoint": "^4.0.6",
+                "@smithy/middleware-stack": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-stream": "^4.1.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/types": {
+            "version": "4.1.0",
+            "integrity": "sha512-enhjdwp4D7CXmwLtD6zbcDMbo6/T6WtuuKCY49Xxc6OMOmUWlBEBDREsxxgV2LIdeQPW756+f97GzcgAwp3iLw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/url-parser": {
+            "version": "4.0.1",
+            "integrity": "sha512-gPXcIEUtw7VlK8f/QcruNXm7q+T5hhvGu9tl63LsJPZ27exB6dtNwvh2HIi0v7JcXJ5emBxB+CJxwaLEdJfA+g==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/querystring-parser": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-base64": {
+            "version": "4.0.0",
+            "integrity": "sha512-CvHfCmO2mchox9kjrtzoHkWHxjHZzaFojLc8quxXY7WAAMAg43nuxwv95tATVgQFNDwd4M9S1qFzj40Ul41Kmg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-body-length-browser": {
+            "version": "4.0.0",
+            "integrity": "sha512-sNi3DL0/k64/LO3A256M+m3CDdG6V7WKWHdAiBBMUN8S3hK3aMPhwnPik2A/a2ONN+9doY9UxaLfgqsIRg69QA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-body-length-node": {
+            "version": "4.0.0",
+            "integrity": "sha512-q0iDP3VsZzqJyje8xJWEJCNIu3lktUGVoSy1KB0UWym2CL1siV3artm+u1DFYTLejpsrdGyCSWBdGNjJzfDPjg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-buffer-from": {
+            "version": "4.0.0",
+            "integrity": "sha512-9TOQ7781sZvddgO8nxueKi3+yGvkY35kotA0Y6BWRajAv8jjmigQ1sBwz0UX47pQMYXJPahSKEKYFgt+rXdcug==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-config-provider": {
+            "version": "4.0.0",
+            "integrity": "sha512-L1RBVzLyfE8OXH+1hsJ8p+acNUSirQnWQ6/EgpchV88G6zGBTDPdXiiExei6Z1wR2RxYvxY/XLw6AMNCCt8H3w==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-defaults-mode-browser": {
+            "version": "4.0.7",
+            "integrity": "sha512-CZgDDrYHLv0RUElOsmZtAnp1pIjwDVCSuZWOPhIOBvG36RDfX1Q9+6lS61xBf+qqvHoqRjHxgINeQz47cYFC2Q==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-defaults-mode-node": {
+            "version": "4.0.7",
+            "integrity": "sha512-79fQW3hnfCdrfIi1soPbK3zmooRFnLpSx3Vxi6nUlqaaQeC5dm8plt4OTNDNqEEEDkvKghZSaoti684dQFVrGQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/config-resolver": "^4.0.1",
+                "@smithy/credential-provider-imds": "^4.0.1",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-endpoints": {
+            "version": "3.0.1",
+            "integrity": "sha512-zVdUENQpdtn9jbpD9SCFK4+aSiavRb9BxEtw9ZGUR1TYo6bBHbIoi7VkrFQ0/RwZlzx0wRBaRmPclj8iAoJCLA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-hex-encoding": {
+            "version": "4.0.0",
+            "integrity": "sha512-Yk5mLhHtfIgW2W2WQZWSg5kuMZCVbvhFmC7rV4IO2QqnZdbEFPmQnCcGMAX2z/8Qj3B9hYYNjZOhWym+RwhePw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-middleware": {
+            "version": "4.0.1",
+            "integrity": "sha512-HiLAvlcqhbzhuiOa0Lyct5IIlyIz0PQO5dnMlmQ/ubYM46dPInB+3yQGkfxsk6Q24Y0n3/JmcA1v5iEhmOF5mA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-retry": {
+            "version": "4.0.1",
+            "integrity": "sha512-WmRHqNVwn3kI3rKk1LsKcVgPBG6iLTBGC1iYOV3GQegwJ3E8yjzHytPt26VNzOWr1qu0xE03nK0Ug8S7T7oufw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/service-error-classification": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-stream": {
+            "version": "4.1.2",
+            "integrity": "sha512-44PKEqQ303d3rlQuiDpcCcu//hV8sn+u2JBo84dWCE0rvgeiVl0IlLMagbU++o0jCWhYCsHaAt9wZuZqNe05Hw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/fetch-http-handler": "^5.0.1",
+                "@smithy/node-http-handler": "^4.0.3",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-uri-escape": {
+            "version": "4.0.0",
+            "integrity": "sha512-77yfbCbQMtgtTylO9itEAdpPXSog3ZxMe09AEhm0dU0NLTalV70ghDZFR+Nfi1C60jnJoh/Re4090/DuZh2Omg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-utf8": {
+            "version": "4.0.0",
+            "integrity": "sha512-b+zebfKCfRdgNJDknHCob3O7FpeYQN6ZG6YLExMcasDHsCXlsXCEuiPZeLnJLpwa5dvPetGlnGCiMHuLwGvFow==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@tsconfig/node18": {
+            "version": "18.2.4",
+            "integrity": "sha512-5xxU8vVs9/FNcvm3gE07fPbn9tl6tqGGWA9tSlwsUEkBxtRnTsNmwrV8gasZ9F/EobaSv9+nu8AxUKccw77JpQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/node": {
+            "version": "18.19.80",
+            "integrity": "sha512-kEWeMwMeIvxYkeg1gTc01awpwLbfMRZXdIhwRcakd/KlK53jmRC26LqcbIt7fnAQTu5GzlnWmzA3H6+l1u6xxQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "undici-types": "~5.26.4"
+            }
+        },
+        "node_modules/@types/uuid": {
+            "version": "9.0.8",
+            "integrity": "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==",
+            "license": "MIT"
+        },
+        "node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+            }
+        },
+        "node_modules/balanced-match": {
+            "version": "1.0.2",
+            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/bowser": {
+            "version": "2.11.0",
+            "integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==",
+            "license": "MIT"
+        },
+        "node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/chalk": {
+            "version": "4.1.2",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/chalk?sponsor=1"
+            }
+        },
+        "node_modules/chalk/node_modules/supports-color": {
+            "version": "7.2.0",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/cliui": {
+            "version": "7.0.4",
+            "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "string-width": "^4.2.0",
+                "strip-ansi": "^6.0.0",
+                "wrap-ansi": "^7.0.0"
+            }
+        },
+        "node_modules/color-convert": {
+            "version": "2.0.1",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/color-name": {
+            "version": "1.1.4",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/concat-map": {
+            "version": "0.0.1",
+            "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/concurrently": {
+            "version": "7.0.0",
+            "integrity": "sha512-WKM7PUsI8wyXpF80H+zjHP32fsgsHNQfPLw/e70Z5dYkV7hF+rf8q3D+ScWJIEr57CpkO3OWBko6hwhQLPR8Pw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "chalk": "^4.1.0",
+                "date-fns": "^2.16.1",
+                "lodash": "^4.17.21",
+                "rxjs": "^6.6.3",
+                "spawn-command": "^0.0.2-1",
+                "supports-color": "^8.1.0",
+                "tree-kill": "^1.2.2",
+                "yargs": "^16.2.0"
+            },
+            "bin": {
+                "concurrently": "dist/bin/concurrently.js"
+            },
+            "engines": {
+                "node": "^12.20.0 || ^14.13.0 || >=16.0.0"
+            }
+        },
+        "node_modules/date-fns": {
+            "version": "2.30.0",
+            "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/runtime": "^7.21.0"
+            },
+            "engines": {
+                "node": ">=0.11"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/date-fns"
+            }
+        },
+        "node_modules/downlevel-dts": {
+            "version": "0.10.1",
+            "integrity": "sha512-bwY63Y0Gfwotcly4vU6rB66m5txvfQzDGd1Gai9E9orqsDIswXKjkdR18Tm6TidnAk9+J5N68a5VMDO2bsQCKQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "semver": "^7.3.2",
+                "shelljs": "^0.8.3",
+                "typescript": "next"
+            },
+            "bin": {
+                "downlevel-dts": "index.js"
+            }
+        },
+        "node_modules/downlevel-dts/node_modules/typescript": {
+            "version": "5.9.0-dev.20250324",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.0-dev.20250324.tgz",
+            "integrity": "sha512-qehVULhODb1IphPefX/jq0wAXpk6ifAt2lF3mxTsyR3yPDoPkiQdvxw9cURaDjJw6vCijSER6dU8kWmHdWaQnA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "bin": {
+                "tsc": "bin/tsc",
+                "tsserver": "bin/tsserver"
+            },
+            "engines": {
+                "node": ">=14.17"
+            }
+        },
+        "node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/escalade": {
+            "version": "3.2.0",
+            "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/fast-xml-parser": {
+            "version": "4.4.1",
+            "integrity": "sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/NaturalIntelligence"
+                },
+                {
+                    "type": "paypal",
+                    "url": "https://paypal.me/naturalintelligence"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "strnum": "^1.0.5"
+            },
+            "bin": {
+                "fxparser": "src/cli/cli.js"
+            }
+        },
+        "node_modules/fs.realpath": {
+            "version": "1.0.0",
+            "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/function-bind": {
+            "version": "1.1.2",
+            "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/get-caller-file": {
+            "version": "2.0.5",
+            "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": "6.* || 8.* || >= 10.*"
+            }
+        },
+        "node_modules/glob": {
+            "version": "7.2.3",
+            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+            "deprecated": "Glob versions prior to v9 are no longer supported",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/has-flag": {
+            "version": "4.0.0",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/hasown": {
+            "version": "2.0.2",
+            "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "function-bind": "^1.1.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/inflight": {
+            "version": "1.0.6",
+            "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+            "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+            }
+        },
+        "node_modules/inherits": {
+            "version": "2.0.4",
+            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/interpret": {
+            "version": "1.4.0",
+            "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/is-core-module": {
+            "version": "2.16.1",
+            "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "hasown": "^2.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/is-fullwidth-code-point": {
+            "version": "3.0.0",
+            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/lodash": {
+            "version": "4.17.21",
+            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/minimatch": {
+            "version": "3.1.2",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/once": {
+            "version": "1.4.0",
+            "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "wrappy": "1"
+            }
+        },
+        "node_modules/path-is-absolute": {
+            "version": "1.0.1",
+            "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/path-parse": {
+            "version": "1.0.7",
+            "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/rechoir": {
+            "version": "0.6.2",
+            "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+            "dev": true,
+            "dependencies": {
+                "resolve": "^1.1.6"
+            },
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/regenerator-runtime": {
+            "version": "0.14.1",
+            "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/require-directory": {
+            "version": "2.1.1",
+            "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/resolve": {
+            "version": "1.22.10",
+            "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-core-module": "^2.16.0",
+                "path-parse": "^1.0.7",
+                "supports-preserve-symlinks-flag": "^1.0.0"
+            },
+            "bin": {
+                "resolve": "bin/resolve"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/rimraf": {
+            "version": "3.0.2",
+            "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+            "deprecated": "Rimraf versions prior to v4 are no longer supported",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "glob": "^7.1.3"
+            },
+            "bin": {
+                "rimraf": "bin.js"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/rxjs": {
+            "version": "6.6.7",
+            "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^1.9.0"
+            },
+            "engines": {
+                "npm": ">=2.0.0"
+            }
+        },
+        "node_modules/rxjs/node_modules/tslib": {
+            "version": "1.14.1",
+            "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+            "dev": true,
+            "license": "0BSD"
+        },
+        "node_modules/semver": {
+            "version": "7.7.1",
+            "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/shelljs": {
+            "version": "0.8.5",
+            "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "glob": "^7.0.0",
+                "interpret": "^1.0.0",
+                "rechoir": "^0.6.2"
+            },
+            "bin": {
+                "shjs": "bin/shjs"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/spawn-command": {
+            "version": "0.0.2",
+            "integrity": "sha1-lUThpDygRfhTGqwaSMspva5iM44=",
+            "dev": true
+        },
+        "node_modules/string-width": {
+            "version": "4.2.3",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strnum": {
+            "version": "1.1.2",
+            "integrity": "sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/NaturalIntelligence"
+                }
+            ],
+            "license": "MIT"
+        },
+        "node_modules/supports-color": {
+            "version": "8.1.1",
+            "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/supports-color?sponsor=1"
+            }
+        },
+        "node_modules/supports-preserve-symlinks-flag": {
+            "version": "1.0.0",
+            "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/tree-kill": {
+            "version": "1.2.2",
+            "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "tree-kill": "cli.js"
+            }
+        },
+        "node_modules/tslib": {
+            "version": "2.8.1",
+            "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+            "license": "0BSD"
+        },
+        "node_modules/typescript": {
+            "version": "5.2.2",
+            "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "bin": {
+                "tsc": "bin/tsc",
+                "tsserver": "bin/tsserver"
+            },
+            "engines": {
+                "node": ">=14.17"
+            }
+        },
+        "node_modules/undici-types": {
+            "version": "5.26.5",
+            "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/uuid": {
+            "version": "9.0.1",
+            "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+            "funding": [
+                "https://github.com/sponsors/broofa",
+                "https://github.com/sponsors/ctavan"
+            ],
+            "license": "MIT",
+            "bin": {
+                "uuid": "dist/bin/uuid"
+            }
+        },
+        "node_modules/wrap-ansi": {
+            "version": "7.0.0",
+            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+            }
+        },
+        "node_modules/wrappy": {
+            "version": "1.0.2",
+            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/y18n": {
+            "version": "5.0.8",
+            "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/yargs": {
+            "version": "16.2.0",
+            "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "cliui": "^7.0.2",
+                "escalade": "^3.1.1",
+                "get-caller-file": "^2.0.5",
+                "require-directory": "^2.1.1",
+                "string-width": "^4.2.0",
+                "y18n": "^5.0.5",
+                "yargs-parser": "^20.2.2"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/yargs-parser": {
+            "version": "20.2.9",
+            "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=10"
+            }
+        }
+    }
+}
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/package.json b/src.gen/@amzn/amazon-q-developer-streaming-client/package.json
new file mode 100644
index 00000000000..c2519c978fe
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/package.json
@@ -0,0 +1,89 @@
+{
+    "name": "@amzn/amazon-q-developer-streaming-client",
+    "description": "@amzn/amazon-q-developer-streaming-client client",
+    "version": "1.0.0",
+    "scripts": {
+        "build": "concurrently 'npm:build:cjs' 'npm:build:es' 'npm:build:types'",
+        "build:cjs": "tsc -p tsconfig.cjs.json",
+        "build:es": "tsc -p tsconfig.es.json",
+        "build:types": "tsc -p tsconfig.types.json",
+        "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
+        "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo || exit 0",
+        "prepack": "npm run clean && npm run build",
+        "postinstall": "npm run build"
+    },
+    "main": "./dist-cjs/index.js",
+    "types": "./dist-types/index.d.ts",
+    "module": "./dist-es/index.js",
+    "sideEffects": false,
+    "dependencies": {
+        "tslib": "^2.6.2",
+        "@aws-crypto/sha256-browser": "5.2.0",
+        "@aws-crypto/sha256-js": "5.2.0",
+        "@aws-sdk/core": "3.731.0",
+        "@aws-sdk/credential-provider-node": "3.731.1",
+        "@aws-sdk/middleware-host-header": "3.731.0",
+        "@aws-sdk/middleware-logger": "3.731.0",
+        "@aws-sdk/middleware-recursion-detection": "3.731.0",
+        "@aws-sdk/middleware-user-agent": "3.731.0",
+        "@aws-sdk/region-config-resolver": "3.731.0",
+        "@aws-sdk/types": "3.731.0",
+        "@aws-sdk/util-user-agent-browser": "3.731.0",
+        "@aws-sdk/util-user-agent-node": "3.731.0",
+        "@smithy/config-resolver": "^4.0.1",
+        "@smithy/core": "^3.1.1",
+        "@smithy/eventstream-serde-browser": "^4.0.1",
+        "@smithy/eventstream-serde-config-resolver": "^4.0.1",
+        "@smithy/eventstream-serde-node": "^4.0.1",
+        "@smithy/fetch-http-handler": "^5.0.1",
+        "@smithy/hash-node": "^4.0.1",
+        "@smithy/invalid-dependency": "^4.0.1",
+        "@smithy/middleware-content-length": "^4.0.1",
+        "@smithy/middleware-retry": "^4.0.3",
+        "@smithy/middleware-serde": "^4.0.1",
+        "@smithy/middleware-stack": "^4.0.1",
+        "@smithy/node-config-provider": "^4.0.1",
+        "@smithy/node-http-handler": "^4.0.2",
+        "@smithy/protocol-http": "^5.0.1",
+        "@smithy/smithy-client": "^4.1.2",
+        "@smithy/types": "^4.1.0",
+        "@smithy/url-parser": "^4.0.1",
+        "@smithy/util-base64": "^4.0.0",
+        "@smithy/util-body-length-browser": "^4.0.0",
+        "@smithy/util-body-length-node": "^4.0.0",
+        "@smithy/util-defaults-mode-browser": "^4.0.3",
+        "@smithy/util-defaults-mode-node": "^4.0.3",
+        "@smithy/util-middleware": "^4.0.1",
+        "@smithy/util-retry": "^4.0.1",
+        "@smithy/util-utf8": "^4.0.0",
+        "@types/uuid": "^9.0.1",
+        "uuid": "^9.0.1"
+    },
+    "devDependencies": {
+        "@tsconfig/node18": "18.2.4",
+        "concurrently": "7.0.0",
+        "downlevel-dts": "0.10.1",
+        "rimraf": "^3.0.0",
+        "typescript": "~5.2.2",
+        "@types/node": "^18.19.69"
+    },
+    "engines": {
+        "node": ">=18.0.0"
+    },
+    "typesVersions": {
+        "<4.0": {
+            "dist-types/*": [
+                "dist-types/ts3.4/*"
+            ]
+        }
+    },
+    "files": [
+        "dist-*/**"
+    ],
+    "browser": {
+        "./dist-es/runtimeConfig": "./dist-es/runtimeConfig.browser"
+    },
+    "react-native": {
+        "./dist-es/runtimeConfig": "./dist-es/runtimeConfig.native"
+    }
+}
\ No newline at end of file
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/src/QDeveloperStreaming.ts b/src.gen/@amzn/amazon-q-developer-streaming-client/src/QDeveloperStreaming.ts
new file mode 100644
index 00000000000..1c6ce1cfb24
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/src/QDeveloperStreaming.ts
@@ -0,0 +1,65 @@
+// smithy-typescript generated code
+import {
+  QDeveloperStreamingClient,
+  QDeveloperStreamingClientConfig,
+} from "./QDeveloperStreamingClient";
+import {
+  GenerateCodeFromCommandsCommand,
+  GenerateCodeFromCommandsCommandInput,
+  GenerateCodeFromCommandsCommandOutput,
+} from "./commands/GenerateCodeFromCommandsCommand";
+import {
+  SendMessageCommand,
+  SendMessageCommandInput,
+  SendMessageCommandOutput,
+} from "./commands/SendMessageCommand";
+import { createAggregatedClient } from "@smithy/smithy-client";
+import { HttpHandlerOptions as __HttpHandlerOptions } from "@smithy/types";
+
+const commands = {
+  GenerateCodeFromCommandsCommand,
+  SendMessageCommand,
+}
+
+export interface QDeveloperStreaming {
+  /**
+   * @see {@link GenerateCodeFromCommandsCommand}
+   */
+  generateCodeFromCommands(
+    args: GenerateCodeFromCommandsCommandInput,
+    options?: __HttpHandlerOptions,
+  ): Promise<GenerateCodeFromCommandsCommandOutput>;
+  generateCodeFromCommands(
+    args: GenerateCodeFromCommandsCommandInput,
+    cb: (err: any, data?: GenerateCodeFromCommandsCommandOutput) => void
+  ): void;
+  generateCodeFromCommands(
+    args: GenerateCodeFromCommandsCommandInput,
+    options: __HttpHandlerOptions,
+    cb: (err: any, data?: GenerateCodeFromCommandsCommandOutput) => void
+  ): void;
+
+  /**
+   * @see {@link SendMessageCommand}
+   */
+  sendMessage(
+    args: SendMessageCommandInput,
+    options?: __HttpHandlerOptions,
+  ): Promise<SendMessageCommandOutput>;
+  sendMessage(
+    args: SendMessageCommandInput,
+    cb: (err: any, data?: SendMessageCommandOutput) => void
+  ): void;
+  sendMessage(
+    args: SendMessageCommandInput,
+    options: __HttpHandlerOptions,
+    cb: (err: any, data?: SendMessageCommandOutput) => void
+  ): void;
+
+}
+
+/**
+ * @public
+ */
+export class QDeveloperStreaming extends QDeveloperStreamingClient implements QDeveloperStreaming {}
+createAggregatedClient(commands, QDeveloperStreaming);
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/src/QDeveloperStreamingClient.ts b/src.gen/@amzn/amazon-q-developer-streaming-client/src/QDeveloperStreamingClient.ts
new file mode 100644
index 00000000000..22fdeb7fbe8
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/src/QDeveloperStreamingClient.ts
@@ -0,0 +1,361 @@
+// smithy-typescript generated code
+import {
+  HttpAuthSchemeInputConfig,
+  HttpAuthSchemeResolvedConfig,
+  defaultQDeveloperStreamingHttpAuthSchemeParametersProvider,
+  resolveHttpAuthSchemeConfig,
+} from "./auth/httpAuthSchemeProvider";
+import {
+  GenerateCodeFromCommandsCommandInput,
+  GenerateCodeFromCommandsCommandOutput,
+} from "./commands/GenerateCodeFromCommandsCommand";
+import {
+  SendMessageCommandInput,
+  SendMessageCommandOutput,
+} from "./commands/SendMessageCommand";
+import { getRuntimeConfig as __getRuntimeConfig } from "./runtimeConfig";
+import {
+  RuntimeExtension,
+  RuntimeExtensionsConfig,
+  resolveRuntimeExtensions,
+} from "./runtimeExtensions";
+import {
+  HostHeaderInputConfig,
+  HostHeaderResolvedConfig,
+  getHostHeaderPlugin,
+  resolveHostHeaderConfig,
+} from "@aws-sdk/middleware-host-header";
+import { getLoggerPlugin } from "@aws-sdk/middleware-logger";
+import { getRecursionDetectionPlugin } from "@aws-sdk/middleware-recursion-detection";
+import {
+  UserAgentInputConfig,
+  UserAgentResolvedConfig,
+  getUserAgentPlugin,
+  resolveUserAgentConfig,
+} from "@aws-sdk/middleware-user-agent";
+import {
+  EndpointsInputConfig,
+  EndpointsResolvedConfig,
+  RegionInputConfig,
+  RegionResolvedConfig,
+  resolveEndpointsConfig,
+  resolveRegionConfig,
+} from "@smithy/config-resolver";
+import {
+  DefaultIdentityProviderConfig,
+  getHttpAuthSchemePlugin,
+  getHttpSigningPlugin,
+} from "@smithy/core";
+import {
+  EventStreamSerdeInputConfig,
+  EventStreamSerdeResolvedConfig,
+  resolveEventStreamSerdeConfig,
+} from "@smithy/eventstream-serde-config-resolver";
+import { getContentLengthPlugin } from "@smithy/middleware-content-length";
+import {
+  RetryInputConfig,
+  RetryResolvedConfig,
+  getRetryPlugin,
+  resolveRetryConfig,
+} from "@smithy/middleware-retry";
+import { HttpHandlerUserInput as __HttpHandlerUserInput } from "@smithy/protocol-http";
+import {
+  Client as __Client,
+  DefaultsMode as __DefaultsMode,
+  SmithyConfiguration as __SmithyConfiguration,
+  SmithyResolvedConfiguration as __SmithyResolvedConfiguration,
+} from "@smithy/smithy-client";
+import {
+  AwsCredentialIdentityProvider,
+  Provider,
+  RegionInfoProvider,
+  BodyLengthCalculator as __BodyLengthCalculator,
+  CheckOptionalClientConfig as __CheckOptionalClientConfig,
+  ChecksumConstructor as __ChecksumConstructor,
+  Decoder as __Decoder,
+  Encoder as __Encoder,
+  EventStreamSerdeProvider as __EventStreamSerdeProvider,
+  HashConstructor as __HashConstructor,
+  HttpHandlerOptions as __HttpHandlerOptions,
+  Logger as __Logger,
+  Provider as __Provider,
+  StreamCollector as __StreamCollector,
+  UrlParser as __UrlParser,
+  UserAgent as __UserAgent,
+} from "@smithy/types";
+
+export { __Client }
+
+/**
+ * @public
+ */
+export type ServiceInputTypes =
+  | GenerateCodeFromCommandsCommandInput
+  | SendMessageCommandInput;
+
+/**
+ * @public
+ */
+export type ServiceOutputTypes =
+  | GenerateCodeFromCommandsCommandOutput
+  | SendMessageCommandOutput;
+
+/**
+ * @public
+ */
+export interface ClientDefaults
+  extends Partial<__SmithyConfiguration<__HttpHandlerOptions>> {
+  /**
+   * The HTTP handler to use or its constructor options. Fetch in browser and Https in Nodejs.
+   */
+  requestHandler?: __HttpHandlerUserInput;
+
+  /**
+   * A constructor for a class implementing the {@link @smithy/types#ChecksumConstructor} interface
+   * that computes the SHA-256 HMAC or checksum of a string or binary buffer.
+   * @internal
+   */
+  sha256?: __ChecksumConstructor | __HashConstructor;
+
+  /**
+   * The function that will be used to convert strings into HTTP endpoints.
+   * @internal
+   */
+  urlParser?: __UrlParser;
+
+  /**
+   * A function that can calculate the length of a request body.
+   * @internal
+   */
+  bodyLengthChecker?: __BodyLengthCalculator;
+
+  /**
+   * A function that converts a stream into an array of bytes.
+   * @internal
+   */
+  streamCollector?: __StreamCollector;
+
+  /**
+   * The function that will be used to convert a base64-encoded string to a byte array.
+   * @internal
+   */
+  base64Decoder?: __Decoder;
+
+  /**
+   * The function that will be used to convert binary data to a base64-encoded string.
+   * @internal
+   */
+  base64Encoder?: __Encoder;
+
+  /**
+   * The function that will be used to convert a UTF8-encoded string to a byte array.
+   * @internal
+   */
+  utf8Decoder?: __Decoder;
+
+  /**
+   * The function that will be used to convert binary data to a UTF-8 encoded string.
+   * @internal
+   */
+  utf8Encoder?: __Encoder;
+
+  /**
+   * The runtime environment.
+   * @internal
+   */
+  runtime?: string;
+
+  /**
+   * Disable dynamically changing the endpoint of the client based on the hostPrefix
+   * trait of an operation.
+   */
+  disableHostPrefix?: boolean;
+
+  /**
+   * Unique service identifier.
+   * @internal
+   */
+  serviceId?: string;
+
+  /**
+   * Enables IPv6/IPv4 dualstack endpoint.
+   */
+  useDualstackEndpoint?: boolean | __Provider<boolean>;
+
+  /**
+   * Enables FIPS compatible endpoints.
+   */
+  useFipsEndpoint?: boolean | __Provider<boolean>;
+
+  /**
+   * The AWS region to which this client will send requests
+   */
+  region?: string | __Provider<string>;
+
+  /**
+   * Setting a client profile is similar to setting a value for the
+   * AWS_PROFILE environment variable. Setting a profile on a client
+   * in code only affects the single client instance, unlike AWS_PROFILE.
+   *
+   * When set, and only for environments where an AWS configuration
+   * file exists, fields configurable by this file will be retrieved
+   * from the specified profile within that file.
+   * Conflicting code configuration and environment variables will
+   * still have higher priority.
+   *
+   * For client credential resolution that involves checking the AWS
+   * configuration file, the client's profile (this value) will be
+   * used unless a different profile is set in the credential
+   * provider options.
+   *
+   */
+  profile?: string;
+
+  /**
+   * Fetch related hostname, signing name or signing region with given region.
+   * @internal
+   */
+  regionInfoProvider?: RegionInfoProvider;
+
+  /**
+   * The provider populating default tracking information to be sent with `user-agent`, `x-amz-user-agent` header
+   * @internal
+   */
+  defaultUserAgentProvider?: Provider<__UserAgent>;
+
+  /**
+   * Default credentials provider; Not available in browser runtime.
+   * @deprecated
+   * @internal
+   */
+  credentialDefaultProvider?: (input: any) => AwsCredentialIdentityProvider;
+
+  /**
+   * Value for how many times a request will be made at most in case of retry.
+   */
+  maxAttempts?: number | __Provider<number>;
+
+  /**
+   * Specifies which retry algorithm to use.
+   * @see https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-smithy-util-retry/Enum/RETRY_MODES/
+   *
+   */
+  retryMode?: string | __Provider<string>;
+
+  /**
+   * Optional logger for logging debug/info/warn/error.
+   */
+  logger?: __Logger;
+
+  /**
+   * Optional extensions
+   */
+  extensions?: RuntimeExtension[];
+
+  /**
+   * The function that provides necessary utilities for generating and parsing event stream
+   */
+  eventStreamSerdeProvider?: __EventStreamSerdeProvider;
+
+  /**
+   * The {@link @smithy/smithy-client#DefaultsMode} that will be used to determine how certain default configuration options are resolved in the SDK.
+   */
+  defaultsMode?: __DefaultsMode | __Provider<__DefaultsMode>;
+
+}
+
+/**
+ * @public
+ */
+export type QDeveloperStreamingClientConfigType = Partial<__SmithyConfiguration<__HttpHandlerOptions>>
+  & ClientDefaults
+  & UserAgentInputConfig
+  & RetryInputConfig
+  & RegionInputConfig
+  & HostHeaderInputConfig
+  & EndpointsInputConfig
+  & EventStreamSerdeInputConfig
+  & HttpAuthSchemeInputConfig
+/**
+ * @public
+ *
+ *  The configuration interface of QDeveloperStreamingClient class constructor that set the region, credentials and other options.
+ */
+export interface QDeveloperStreamingClientConfig extends QDeveloperStreamingClientConfigType {}
+
+/**
+ * @public
+ */
+export type QDeveloperStreamingClientResolvedConfigType = __SmithyResolvedConfiguration<__HttpHandlerOptions>
+  & Required<ClientDefaults>
+  & RuntimeExtensionsConfig
+  & UserAgentResolvedConfig
+  & RetryResolvedConfig
+  & RegionResolvedConfig
+  & HostHeaderResolvedConfig
+  & EndpointsResolvedConfig
+  & EventStreamSerdeResolvedConfig
+  & HttpAuthSchemeResolvedConfig
+/**
+ * @public
+ *
+ *  The resolved configuration interface of QDeveloperStreamingClient class. This is resolved and normalized from the {@link QDeveloperStreamingClientConfig | constructor configuration interface}.
+ */
+export interface QDeveloperStreamingClientResolvedConfig extends QDeveloperStreamingClientResolvedConfigType {}
+
+/**
+ * @public
+ */
+export class QDeveloperStreamingClient extends __Client<
+  __HttpHandlerOptions,
+  ServiceInputTypes,
+  ServiceOutputTypes,
+  QDeveloperStreamingClientResolvedConfig
+> {
+  /**
+   * The resolved configuration of QDeveloperStreamingClient class. This is resolved and normalized from the {@link QDeveloperStreamingClientConfig | constructor configuration interface}.
+   */
+  readonly config: QDeveloperStreamingClientResolvedConfig;
+
+  constructor(...[configuration]: __CheckOptionalClientConfig<QDeveloperStreamingClientConfig>) {
+    let _config_0 = __getRuntimeConfig(configuration || {});
+    let _config_1 = resolveUserAgentConfig(_config_0);
+    let _config_2 = resolveRetryConfig(_config_1);
+    let _config_3 = resolveRegionConfig(_config_2);
+    let _config_4 = resolveHostHeaderConfig(_config_3);
+    let _config_5 = resolveEndpointsConfig(_config_4);
+    let _config_6 = resolveEventStreamSerdeConfig(_config_5);
+    let _config_7 = resolveHttpAuthSchemeConfig(_config_6);
+    let _config_8 = resolveRuntimeExtensions(_config_7, configuration?.extensions || []);
+    super(_config_8);
+    this.config = _config_8;
+    this.middlewareStack.use(getUserAgentPlugin(this.config
+    ));
+    this.middlewareStack.use(getRetryPlugin(this.config
+    ));
+    this.middlewareStack.use(getContentLengthPlugin(this.config
+    ));
+    this.middlewareStack.use(getHostHeaderPlugin(this.config
+    ));
+    this.middlewareStack.use(getLoggerPlugin(this.config
+    ));
+    this.middlewareStack.use(getRecursionDetectionPlugin(this.config
+    ));
+    this.middlewareStack.use(getHttpAuthSchemePlugin(this.config
+      , {
+        httpAuthSchemeParametersProvider: defaultQDeveloperStreamingHttpAuthSchemeParametersProvider,identityProviderConfigProvider: async (config: QDeveloperStreamingClientResolvedConfig) => new DefaultIdentityProviderConfig({
+          "aws.auth#sigv4": config.credentials,}), }
+    ));
+    this.middlewareStack.use(getHttpSigningPlugin(this.config
+    ));
+  }
+
+  /**
+   * Destroy underlying resources, like sockets. It's usually not necessary to do this.
+   * However in Node.js, it's best to explicitly shut down the client's agent when it is no longer needed.
+   * Otherwise, sockets might stay open for quite a long time before the server terminates them.
+   */
+  destroy(): void {
+    super.destroy();
+  }
+}
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/src/auth/httpAuthExtensionConfiguration.ts b/src.gen/@amzn/amazon-q-developer-streaming-client/src/auth/httpAuthExtensionConfiguration.ts
new file mode 100644
index 00000000000..01057e6bcbd
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/src/auth/httpAuthExtensionConfiguration.ts
@@ -0,0 +1,73 @@
+// smithy-typescript generated code
+import { QDeveloperStreamingHttpAuthSchemeProvider } from "./httpAuthSchemeProvider";
+import {
+  AwsCredentialIdentity,
+  AwsCredentialIdentityProvider,
+  HttpAuthScheme,
+} from "@smithy/types";
+
+/**
+ * @internal
+ */
+export interface HttpAuthExtensionConfiguration {
+  setHttpAuthScheme(httpAuthScheme: HttpAuthScheme): void;
+  httpAuthSchemes(): HttpAuthScheme[];
+  setHttpAuthSchemeProvider(httpAuthSchemeProvider: QDeveloperStreamingHttpAuthSchemeProvider): void;
+  httpAuthSchemeProvider(): QDeveloperStreamingHttpAuthSchemeProvider;
+  setCredentials(credentials: AwsCredentialIdentity | AwsCredentialIdentityProvider): void;
+  credentials(): AwsCredentialIdentity | AwsCredentialIdentityProvider | undefined;
+}
+
+/**
+ * @internal
+ */
+export type HttpAuthRuntimeConfig = Partial<{
+  httpAuthSchemes: HttpAuthScheme[];
+  httpAuthSchemeProvider: QDeveloperStreamingHttpAuthSchemeProvider;
+  credentials: AwsCredentialIdentity | AwsCredentialIdentityProvider;
+}>;
+
+/**
+ * @internal
+ */
+export const getHttpAuthExtensionConfiguration = (runtimeConfig: HttpAuthRuntimeConfig): HttpAuthExtensionConfiguration => {
+  let _httpAuthSchemes = runtimeConfig.httpAuthSchemes!;
+  let _httpAuthSchemeProvider = runtimeConfig.httpAuthSchemeProvider!;
+  let _credentials = runtimeConfig.credentials;
+  return {
+    setHttpAuthScheme(httpAuthScheme: HttpAuthScheme): void {
+      const index = _httpAuthSchemes.findIndex(scheme => scheme.schemeId === httpAuthScheme.schemeId);
+      if (index === -1) {
+        _httpAuthSchemes.push(httpAuthScheme);
+      } else {
+        _httpAuthSchemes.splice(index, 1, httpAuthScheme);
+      }
+    },
+    httpAuthSchemes(): HttpAuthScheme[] {
+      return _httpAuthSchemes;
+    },
+    setHttpAuthSchemeProvider(httpAuthSchemeProvider: QDeveloperStreamingHttpAuthSchemeProvider): void {
+      _httpAuthSchemeProvider = httpAuthSchemeProvider;
+    },
+    httpAuthSchemeProvider(): QDeveloperStreamingHttpAuthSchemeProvider {
+      return _httpAuthSchemeProvider;
+    },
+    setCredentials(credentials: AwsCredentialIdentity | AwsCredentialIdentityProvider): void {
+        _credentials = credentials;
+    },
+    credentials(): AwsCredentialIdentity | AwsCredentialIdentityProvider | undefined {
+        return _credentials;
+    },
+  }
+};
+
+/**
+ * @internal
+ */
+export const resolveHttpAuthRuntimeConfig = (config: HttpAuthExtensionConfiguration): HttpAuthRuntimeConfig => {
+  return {
+    httpAuthSchemes: config.httpAuthSchemes(),
+    httpAuthSchemeProvider: config.httpAuthSchemeProvider(),
+    credentials: config.credentials(),
+  };
+};
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/src/auth/httpAuthSchemeProvider.ts b/src.gen/@amzn/amazon-q-developer-streaming-client/src/auth/httpAuthSchemeProvider.ts
new file mode 100644
index 00000000000..54c624f577d
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/src/auth/httpAuthSchemeProvider.ts
@@ -0,0 +1,130 @@
+// smithy-typescript generated code
+import {
+  QDeveloperStreamingClientConfig,
+  QDeveloperStreamingClientResolvedConfig,
+} from "../QDeveloperStreamingClient";
+import {
+  AwsSdkSigV4AuthInputConfig,
+  AwsSdkSigV4AuthResolvedConfig,
+  AwsSdkSigV4PreviouslyResolved,
+  resolveAwsSdkSigV4Config,
+} from "@aws-sdk/core";
+import {
+  HandlerExecutionContext,
+  HttpAuthOption,
+  HttpAuthScheme,
+  HttpAuthSchemeParameters,
+  HttpAuthSchemeParametersProvider,
+  HttpAuthSchemeProvider,
+} from "@smithy/types";
+import {
+  getSmithyContext,
+  normalizeProvider,
+} from "@smithy/util-middleware";
+
+/**
+ * @internal
+ */
+export interface QDeveloperStreamingHttpAuthSchemeParameters extends HttpAuthSchemeParameters {
+  region?: string;
+}
+
+/**
+ * @internal
+ */
+export interface QDeveloperStreamingHttpAuthSchemeParametersProvider extends HttpAuthSchemeParametersProvider<QDeveloperStreamingClientResolvedConfig, HandlerExecutionContext, QDeveloperStreamingHttpAuthSchemeParameters, object> {}
+
+/**
+ * @internal
+ */
+export const defaultQDeveloperStreamingHttpAuthSchemeParametersProvider = async (config: QDeveloperStreamingClientResolvedConfig, context: HandlerExecutionContext, input: object): Promise<QDeveloperStreamingHttpAuthSchemeParameters> => {
+  return {
+    operation: getSmithyContext(context).operation as string,
+    region: await normalizeProvider(config.region)() || (() => {
+      throw new Error("expected `region` to be configured for `aws.auth#sigv4`");
+    })(),
+  };
+};
+
+function createAwsAuthSigv4HttpAuthOption(authParameters: QDeveloperStreamingHttpAuthSchemeParameters): HttpAuthOption {
+  return {
+    schemeId: "aws.auth#sigv4",
+    signingProperties: {
+      name: "q",
+      region: authParameters.region,
+    },
+    propertiesExtractor: (config: Partial<QDeveloperStreamingClientConfig>, context) => ({
+      /**
+       * @internal
+       */
+      signingProperties: {
+        config,
+        context,
+      },
+    }),
+  };
+};
+
+/**
+ * @internal
+ */
+export interface QDeveloperStreamingHttpAuthSchemeProvider extends HttpAuthSchemeProvider<QDeveloperStreamingHttpAuthSchemeParameters> {}
+
+/**
+ * @internal
+ */
+export const defaultQDeveloperStreamingHttpAuthSchemeProvider: QDeveloperStreamingHttpAuthSchemeProvider = (authParameters) => {
+  const options: HttpAuthOption[] = [];
+  switch (authParameters.operation) {
+    default: {
+      options.push(createAwsAuthSigv4HttpAuthOption(authParameters));
+    };
+  };
+  return options;
+};
+
+/**
+ * @internal
+ */
+export interface HttpAuthSchemeInputConfig extends AwsSdkSigV4AuthInputConfig {
+  /**
+   * Configuration of HttpAuthSchemes for a client which provides default identity providers and signers per auth scheme.
+   * @internal
+   */
+  httpAuthSchemes?: HttpAuthScheme[];
+
+  /**
+   * Configuration of an HttpAuthSchemeProvider for a client which resolves which HttpAuthScheme to use.
+   * @internal
+   */
+  httpAuthSchemeProvider?: QDeveloperStreamingHttpAuthSchemeProvider;
+
+}
+
+/**
+ * @internal
+ */
+export interface HttpAuthSchemeResolvedConfig extends AwsSdkSigV4AuthResolvedConfig {
+  /**
+   * Configuration of HttpAuthSchemes for a client which provides default identity providers and signers per auth scheme.
+   * @internal
+   */
+  readonly httpAuthSchemes: HttpAuthScheme[];
+
+  /**
+   * Configuration of an HttpAuthSchemeProvider for a client which resolves which HttpAuthScheme to use.
+   * @internal
+   */
+  readonly httpAuthSchemeProvider: QDeveloperStreamingHttpAuthSchemeProvider;
+
+}
+
+/**
+ * @internal
+ */
+export const resolveHttpAuthSchemeConfig = <T>(config: T & HttpAuthSchemeInputConfig & AwsSdkSigV4PreviouslyResolved): T & HttpAuthSchemeResolvedConfig => {
+  const config_0 = resolveAwsSdkSigV4Config(config);
+  return {
+    ...config_0,
+  } as T & HttpAuthSchemeResolvedConfig;
+};
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/src/commands/GenerateCodeFromCommandsCommand.ts b/src.gen/@amzn/amazon-q-developer-streaming-client/src/commands/GenerateCodeFromCommandsCommand.ts
new file mode 100644
index 00000000000..94969cd6c34
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/src/commands/GenerateCodeFromCommandsCommand.ts
@@ -0,0 +1,132 @@
+// smithy-typescript generated code
+import {
+  QDeveloperStreamingClientResolvedConfig,
+  ServiceInputTypes,
+  ServiceOutputTypes,
+} from "../QDeveloperStreamingClient";
+import {
+  GenerateCodeFromCommandsRequest,
+  GenerateCodeFromCommandsRequestFilterSensitiveLog,
+  GenerateCodeFromCommandsResponse,
+  GenerateCodeFromCommandsResponseFilterSensitiveLog,
+} from "../models/models_0";
+import {
+  de_GenerateCodeFromCommandsCommand,
+  se_GenerateCodeFromCommandsCommand,
+} from "../protocols/Aws_json1_0";
+import { getSerdePlugin } from "@smithy/middleware-serde";
+import { Command as $Command } from "@smithy/smithy-client";
+import { MetadataBearer as __MetadataBearer } from "@smithy/types";
+
+/**
+ * @public
+ */
+export type { __MetadataBearer };
+export { $Command };
+/**
+ * @public
+ *
+ * The input for {@link GenerateCodeFromCommandsCommand}.
+ */
+export interface GenerateCodeFromCommandsCommandInput extends GenerateCodeFromCommandsRequest {}
+/**
+ * @public
+ *
+ * The output of {@link GenerateCodeFromCommandsCommand}.
+ */
+export interface GenerateCodeFromCommandsCommandOutput extends GenerateCodeFromCommandsResponse, __MetadataBearer {}
+
+/**
+ * API to generate infrastructure as code from cli commands.
+ * @example
+ * Use a bare-bones client and the command you need to make an API call.
+ * ```javascript
+ * import { QDeveloperStreamingClient, GenerateCodeFromCommandsCommand } from "@amzn/amazon-q-developer-streaming-client"; // ES Modules import
+ * // const { QDeveloperStreamingClient, GenerateCodeFromCommandsCommand } = require("@amzn/amazon-q-developer-streaming-client"); // CommonJS import
+ * const client = new QDeveloperStreamingClient(config);
+ * const input = { // GenerateCodeFromCommandsRequest
+ *   outputFormat: "typescript/cdk" || "java/cdk" || "python/cdk" || "yaml/cfn" || "json/cfn", // required
+ *   commands: { // CommandInput Union: only one key present
+ *     commandsList: [ // CliCommandsList
+ *       "STRING_VALUE",
+ *     ],
+ *   },
+ * };
+ * const command = new GenerateCodeFromCommandsCommand(input);
+ * const response = await client.send(command);
+ * // { // GenerateCodeFromCommandsResponse
+ * //   generatedCodeFromCommandsResponse: { // GenerateCodeFromCommandsResponseStream Union: only one key present
+ * //     codeEvent: { // CodeEvent
+ * //       content: "STRING_VALUE", // required
+ * //     },
+ * //     Error: { // InternalServerException
+ * //       message: "STRING_VALUE", // required
+ * //     },
+ * //     QuotaLevelExceededError: { // ServiceQuotaExceededException
+ * //       message: "STRING_VALUE", // required
+ * //     },
+ * //     ValidationError: { // ValidationException
+ * //       message: "STRING_VALUE", // required
+ * //       reason: "INVALID_CONVERSATION_ID" || "CONTENT_LENGTH_EXCEEDS_THRESHOLD" || "INVALID_KMS_GRANT",
+ * //     },
+ * //   },
+ * // };
+ *
+ * ```
+ *
+ * @param GenerateCodeFromCommandsCommandInput - {@link GenerateCodeFromCommandsCommandInput}
+ * @returns {@link GenerateCodeFromCommandsCommandOutput}
+ * @see {@link GenerateCodeFromCommandsCommandInput} for command's `input` shape.
+ * @see {@link GenerateCodeFromCommandsCommandOutput} for command's `response` shape.
+ * @see {@link QDeveloperStreamingClientResolvedConfig | config} for QDeveloperStreamingClient's `config` shape.
+ *
+ * @throws {@link InternalServerException} (server fault)
+ *  This exception is thrown when an unexpected error occurred during the processing of a request.
+ *
+ * @throws {@link ThrottlingException} (client fault)
+ *  This exception is thrown when request was denied due to request throttling.
+ *
+ * @throws {@link ValidationException} (client fault)
+ *  This exception is thrown when the input fails to satisfy the constraints specified by the service.
+ *
+ * @throws {@link AccessDeniedException} (client fault)
+ *  This exception is thrown when the user does not have sufficient access to perform this action.
+ *
+ * @throws {@link QDeveloperStreamingServiceException}
+ * <p>Base exception class for all service exceptions from QDeveloperStreaming service.</p>
+ *
+ * @public
+ */
+export class GenerateCodeFromCommandsCommand extends $Command.classBuilder<GenerateCodeFromCommandsCommandInput, GenerateCodeFromCommandsCommandOutput, QDeveloperStreamingClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes>()
+      .m(function (this: any, Command: any, cs: any, config: QDeveloperStreamingClientResolvedConfig, o: any) {
+          return [
+
+  getSerdePlugin(config, this.serialize, this.deserialize),
+      ];
+  })
+  .s("AmazonQDeveloperStreamingService", "GenerateCodeFromCommands", {
+
+    /**
+     * @internal
+     */
+    eventStream: {
+      output: true,
+    },
+  })
+  .n("QDeveloperStreamingClient", "GenerateCodeFromCommandsCommand")
+  .f(GenerateCodeFromCommandsRequestFilterSensitiveLog, GenerateCodeFromCommandsResponseFilterSensitiveLog)
+  .ser(se_GenerateCodeFromCommandsCommand)
+  .de(de_GenerateCodeFromCommandsCommand)
+.build() {
+/** @internal type navigation helper, not in runtime. */
+declare protected static __types: {
+  api: {
+      input: GenerateCodeFromCommandsRequest;
+      output: GenerateCodeFromCommandsResponse;
+  };
+  sdk: {
+      input: GenerateCodeFromCommandsCommandInput;
+      output: GenerateCodeFromCommandsCommandOutput;
+  };
+};
+}
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/src/commands/SendMessageCommand.ts b/src.gen/@amzn/amazon-q-developer-streaming-client/src/commands/SendMessageCommand.ts
new file mode 100644
index 00000000000..c5b7780c0e4
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/src/commands/SendMessageCommand.ts
@@ -0,0 +1,783 @@
+// smithy-typescript generated code
+import {
+  QDeveloperStreamingClientResolvedConfig,
+  ServiceInputTypes,
+  ServiceOutputTypes,
+} from "../QDeveloperStreamingClient";
+import {
+  SendMessageRequest,
+  SendMessageRequestFilterSensitiveLog,
+  SendMessageResponse,
+  SendMessageResponseFilterSensitiveLog,
+} from "../models/models_0";
+import {
+  de_SendMessageCommand,
+  se_SendMessageCommand,
+} from "../protocols/Aws_json1_0";
+import { getSerdePlugin } from "@smithy/middleware-serde";
+import { Command as $Command } from "@smithy/smithy-client";
+import { MetadataBearer as __MetadataBearer } from "@smithy/types";
+
+/**
+ * @public
+ */
+export type { __MetadataBearer };
+export { $Command };
+/**
+ * @public
+ *
+ * The input for {@link SendMessageCommand}.
+ */
+export interface SendMessageCommandInput extends SendMessageRequest {}
+/**
+ * @public
+ *
+ * The output of {@link SendMessageCommand}.
+ */
+export interface SendMessageCommandOutput extends SendMessageResponse, __MetadataBearer {}
+
+/**
+ * @public
+ *
+ * @example
+ * Use a bare-bones client and the command you need to make an API call.
+ * ```javascript
+ * import { QDeveloperStreamingClient, SendMessageCommand } from "@amzn/amazon-q-developer-streaming-client"; // ES Modules import
+ * // const { QDeveloperStreamingClient, SendMessageCommand } = require("@amzn/amazon-q-developer-streaming-client"); // CommonJS import
+ * const client = new QDeveloperStreamingClient(config);
+ * const input = { // SendMessageRequest
+ *   conversationState: { // ConversationState
+ *     conversationId: "STRING_VALUE",
+ *     history: [ // ChatHistory
+ *       { // ChatMessage Union: only one key present
+ *         userInputMessage: { // UserInputMessage
+ *           content: "STRING_VALUE", // required
+ *           userInputMessageContext: { // UserInputMessageContext
+ *             editorState: { // EditorState
+ *               document: { // TextDocument
+ *                 relativeFilePath: "STRING_VALUE", // required
+ *                 programmingLanguage: { // ProgrammingLanguage
+ *                   languageName: "STRING_VALUE", // required
+ *                 },
+ *                 text: "STRING_VALUE",
+ *                 documentSymbols: [ // DocumentSymbols
+ *                   { // DocumentSymbol
+ *                     name: "STRING_VALUE", // required
+ *                     type: "DECLARATION" || "USAGE", // required
+ *                     source: "STRING_VALUE",
+ *                   },
+ *                 ],
+ *               },
+ *               cursorState: { // CursorState Union: only one key present
+ *                 position: { // Position
+ *                   line: Number("int"), // required
+ *                   character: Number("int"), // required
+ *                 },
+ *                 range: { // Range
+ *                   start: {
+ *                     line: Number("int"), // required
+ *                     character: Number("int"), // required
+ *                   },
+ *                   end: {
+ *                     line: Number("int"), // required
+ *                     character: Number("int"), // required
+ *                   },
+ *                 },
+ *               },
+ *               relevantDocuments: [ // RelevantDocumentList
+ *                 { // RelevantTextDocument
+ *                   relativeFilePath: "STRING_VALUE", // required
+ *                   programmingLanguage: {
+ *                     languageName: "STRING_VALUE", // required
+ *                   },
+ *                   text: "STRING_VALUE",
+ *                   documentSymbols: [
+ *                     {
+ *                       name: "STRING_VALUE", // required
+ *                       type: "DECLARATION" || "USAGE", // required
+ *                       source: "STRING_VALUE",
+ *                     },
+ *                   ],
+ *                 },
+ *               ],
+ *               useRelevantDocuments: true || false,
+ *               workspaceFolders: [ // WorkspaceFolderList
+ *                 "STRING_VALUE",
+ *               ],
+ *             },
+ *             shellState: { // ShellState
+ *               shellName: "STRING_VALUE", // required
+ *               shellHistory: [ // ShellHistory
+ *                 { // ShellHistoryEntry
+ *                   command: "STRING_VALUE", // required
+ *                   directory: "STRING_VALUE",
+ *                   exitCode: Number("int"),
+ *                   stdout: "STRING_VALUE",
+ *                   stderr: "STRING_VALUE",
+ *                 },
+ *               ],
+ *             },
+ *             gitState: { // GitState
+ *               status: "STRING_VALUE",
+ *             },
+ *             envState: { // EnvState
+ *               operatingSystem: "STRING_VALUE",
+ *               currentWorkingDirectory: "STRING_VALUE",
+ *               environmentVariables: [ // EnvironmentVariables
+ *                 { // EnvironmentVariable
+ *                   key: "STRING_VALUE",
+ *                   value: "STRING_VALUE",
+ *                 },
+ *               ],
+ *               timezoneOffset: Number("int"),
+ *             },
+ *             appStudioContext: { // AppStudioState
+ *               namespace: "STRING_VALUE", // required
+ *               propertyName: "STRING_VALUE", // required
+ *               propertyValue: "STRING_VALUE",
+ *               propertyContext: "STRING_VALUE", // required
+ *             },
+ *             diagnostic: { // Diagnostic Union: only one key present
+ *               textDocumentDiagnostic: { // TextDocumentDiagnostic
+ *                 document: {
+ *                   relativeFilePath: "STRING_VALUE", // required
+ *                   programmingLanguage: {
+ *                     languageName: "STRING_VALUE", // required
+ *                   },
+ *                   text: "STRING_VALUE",
+ *                   documentSymbols: [
+ *                     {
+ *                       name: "STRING_VALUE", // required
+ *                       type: "DECLARATION" || "USAGE", // required
+ *                       source: "STRING_VALUE",
+ *                     },
+ *                   ],
+ *                 },
+ *                 range: {
+ *                   start: {
+ *                     line: Number("int"), // required
+ *                     character: Number("int"), // required
+ *                   },
+ *                   end: {
+ *                     line: Number("int"), // required
+ *                     character: Number("int"), // required
+ *                   },
+ *                 },
+ *                 source: "STRING_VALUE", // required
+ *                 severity: "ERROR" || "WARNING" || "INFORMATION" || "HINT", // required
+ *                 message: "STRING_VALUE", // required
+ *               },
+ *               runtimeDiagnostic: { // RuntimeDiagnostic
+ *                 source: "STRING_VALUE", // required
+ *                 severity: "ERROR" || "WARNING" || "INFORMATION" || "HINT", // required
+ *                 message: "STRING_VALUE", // required
+ *               },
+ *             },
+ *             consoleState: { // ConsoleState
+ *               region: "STRING_VALUE",
+ *               consoleUrl: "STRING_VALUE",
+ *               serviceId: "STRING_VALUE",
+ *               serviceConsolePage: "STRING_VALUE",
+ *               serviceSubconsolePage: "STRING_VALUE",
+ *               taskName: "STRING_VALUE",
+ *             },
+ *             userSettings: { // UserSettings
+ *               hasConsentedToCrossRegionCalls: true || false,
+ *             },
+ *             additionalContext: [ // AdditionalContentList
+ *               { // AdditionalContentEntry
+ *                 name: "STRING_VALUE", // required
+ *                 description: "STRING_VALUE", // required
+ *                 innerContext: "STRING_VALUE",
+ *               },
+ *             ],
+ *             toolResults: [ // ToolResults
+ *               { // ToolResult
+ *                 toolUseId: "STRING_VALUE", // required
+ *                 content: [ // ToolResultContent // required
+ *                   { // ToolResultContentBlock Union: only one key present
+ *                     text: "STRING_VALUE",
+ *                     json: "DOCUMENT_VALUE",
+ *                   },
+ *                 ],
+ *                 status: "success" || "error",
+ *               },
+ *             ],
+ *             tools: [ // Tools
+ *               { // Tool Union: only one key present
+ *                 toolSpecification: { // ToolSpecification
+ *                   inputSchema: { // ToolInputSchema
+ *                     json: "DOCUMENT_VALUE",
+ *                   },
+ *                   name: "STRING_VALUE", // required
+ *                   description: "STRING_VALUE",
+ *                 },
+ *               },
+ *             ],
+ *           },
+ *           userIntent: "SUGGEST_ALTERNATE_IMPLEMENTATION" || "APPLY_COMMON_BEST_PRACTICES" || "IMPROVE_CODE" || "SHOW_EXAMPLES" || "CITE_SOURCES" || "EXPLAIN_LINE_BY_LINE" || "EXPLAIN_CODE_SELECTION" || "GENERATE_CLOUDFORMATION_TEMPLATE" || "GENERATE_UNIT_TESTS" || "CODE_GENERATION",
+ *           origin: "STRING_VALUE",
+ *           images: [ // ImageBlocks
+ *             { // ImageBlock
+ *               format: "png" || "jpeg" || "gif" || "webp", // required
+ *               source: { // ImageSource Union: only one key present
+ *                 bytes: new Uint8Array(), // e.g. Buffer.from("") or new TextEncoder().encode("")
+ *               },
+ *             },
+ *           ],
+ *         },
+ *         assistantResponseMessage: { // AssistantResponseMessage
+ *           messageId: "STRING_VALUE",
+ *           content: "STRING_VALUE", // required
+ *           supplementaryWebLinks: [ // SupplementaryWebLinks
+ *             { // SupplementaryWebLink
+ *               url: "STRING_VALUE", // required
+ *               title: "STRING_VALUE", // required
+ *               snippet: "STRING_VALUE",
+ *             },
+ *           ],
+ *           references: [ // References
+ *             { // Reference
+ *               licenseName: "STRING_VALUE",
+ *               repository: "STRING_VALUE",
+ *               url: "STRING_VALUE",
+ *               recommendationContentSpan: { // Span
+ *                 start: Number("int"),
+ *                 end: Number("int"),
+ *               },
+ *             },
+ *           ],
+ *           followupPrompt: { // FollowupPrompt
+ *             content: "STRING_VALUE", // required
+ *             userIntent: "SUGGEST_ALTERNATE_IMPLEMENTATION" || "APPLY_COMMON_BEST_PRACTICES" || "IMPROVE_CODE" || "SHOW_EXAMPLES" || "CITE_SOURCES" || "EXPLAIN_LINE_BY_LINE" || "EXPLAIN_CODE_SELECTION" || "GENERATE_CLOUDFORMATION_TEMPLATE" || "GENERATE_UNIT_TESTS" || "CODE_GENERATION",
+ *           },
+ *           toolUses: [ // ToolUses
+ *             { // ToolUse
+ *               toolUseId: "STRING_VALUE", // required
+ *               name: "STRING_VALUE", // required
+ *               input: "DOCUMENT_VALUE", // required
+ *             },
+ *           ],
+ *         },
+ *       },
+ *     ],
+ *     currentMessage: {//  Union: only one key present
+ *       userInputMessage: {
+ *         content: "STRING_VALUE", // required
+ *         userInputMessageContext: {
+ *           editorState: {
+ *             document: "<TextDocument>",
+ *             cursorState: {//  Union: only one key present
+ *               position: "<Position>",
+ *               range: {
+ *                 start: "<Position>", // required
+ *                 end: "<Position>", // required
+ *               },
+ *             },
+ *             relevantDocuments: [
+ *               {
+ *                 relativeFilePath: "STRING_VALUE", // required
+ *                 programmingLanguage: {
+ *                   languageName: "STRING_VALUE", // required
+ *                 },
+ *                 text: "STRING_VALUE",
+ *                 documentSymbols: [
+ *                   {
+ *                     name: "STRING_VALUE", // required
+ *                     type: "DECLARATION" || "USAGE", // required
+ *                     source: "STRING_VALUE",
+ *                   },
+ *                 ],
+ *               },
+ *             ],
+ *             useRelevantDocuments: true || false,
+ *             workspaceFolders: [
+ *               "STRING_VALUE",
+ *             ],
+ *           },
+ *           shellState: {
+ *             shellName: "STRING_VALUE", // required
+ *             shellHistory: [
+ *               {
+ *                 command: "STRING_VALUE", // required
+ *                 directory: "STRING_VALUE",
+ *                 exitCode: Number("int"),
+ *                 stdout: "STRING_VALUE",
+ *                 stderr: "STRING_VALUE",
+ *               },
+ *             ],
+ *           },
+ *           gitState: {
+ *             status: "STRING_VALUE",
+ *           },
+ *           envState: {
+ *             operatingSystem: "STRING_VALUE",
+ *             currentWorkingDirectory: "STRING_VALUE",
+ *             environmentVariables: [
+ *               {
+ *                 key: "STRING_VALUE",
+ *                 value: "STRING_VALUE",
+ *               },
+ *             ],
+ *             timezoneOffset: Number("int"),
+ *           },
+ *           appStudioContext: {
+ *             namespace: "STRING_VALUE", // required
+ *             propertyName: "STRING_VALUE", // required
+ *             propertyValue: "STRING_VALUE",
+ *             propertyContext: "STRING_VALUE", // required
+ *           },
+ *           diagnostic: {//  Union: only one key present
+ *             textDocumentDiagnostic: {
+ *               document: "<TextDocument>", // required
+ *               range: {
+ *                 start: "<Position>", // required
+ *                 end: "<Position>", // required
+ *               },
+ *               source: "STRING_VALUE", // required
+ *               severity: "ERROR" || "WARNING" || "INFORMATION" || "HINT", // required
+ *               message: "STRING_VALUE", // required
+ *             },
+ *             runtimeDiagnostic: {
+ *               source: "STRING_VALUE", // required
+ *               severity: "ERROR" || "WARNING" || "INFORMATION" || "HINT", // required
+ *               message: "STRING_VALUE", // required
+ *             },
+ *           },
+ *           consoleState: {
+ *             region: "STRING_VALUE",
+ *             consoleUrl: "STRING_VALUE",
+ *             serviceId: "STRING_VALUE",
+ *             serviceConsolePage: "STRING_VALUE",
+ *             serviceSubconsolePage: "STRING_VALUE",
+ *             taskName: "STRING_VALUE",
+ *           },
+ *           userSettings: {
+ *             hasConsentedToCrossRegionCalls: true || false,
+ *           },
+ *           additionalContext: [
+ *             {
+ *               name: "STRING_VALUE", // required
+ *               description: "STRING_VALUE", // required
+ *               innerContext: "STRING_VALUE",
+ *             },
+ *           ],
+ *           toolResults: [
+ *             {
+ *               toolUseId: "STRING_VALUE", // required
+ *               content: [ // required
+ *                 {//  Union: only one key present
+ *                   text: "STRING_VALUE",
+ *                   json: "DOCUMENT_VALUE",
+ *                 },
+ *               ],
+ *               status: "success" || "error",
+ *             },
+ *           ],
+ *           tools: [
+ *             {//  Union: only one key present
+ *               toolSpecification: {
+ *                 inputSchema: {
+ *                   json: "DOCUMENT_VALUE",
+ *                 },
+ *                 name: "STRING_VALUE", // required
+ *                 description: "STRING_VALUE",
+ *               },
+ *             },
+ *           ],
+ *         },
+ *         userIntent: "SUGGEST_ALTERNATE_IMPLEMENTATION" || "APPLY_COMMON_BEST_PRACTICES" || "IMPROVE_CODE" || "SHOW_EXAMPLES" || "CITE_SOURCES" || "EXPLAIN_LINE_BY_LINE" || "EXPLAIN_CODE_SELECTION" || "GENERATE_CLOUDFORMATION_TEMPLATE" || "GENERATE_UNIT_TESTS" || "CODE_GENERATION",
+ *         origin: "STRING_VALUE",
+ *         images: [
+ *           {
+ *             format: "png" || "jpeg" || "gif" || "webp", // required
+ *             source: {//  Union: only one key present
+ *               bytes: new Uint8Array(), // e.g. Buffer.from("") or new TextEncoder().encode("")
+ *             },
+ *           },
+ *         ],
+ *       },
+ *       assistantResponseMessage: {
+ *         messageId: "STRING_VALUE",
+ *         content: "STRING_VALUE", // required
+ *         supplementaryWebLinks: [
+ *           {
+ *             url: "STRING_VALUE", // required
+ *             title: "STRING_VALUE", // required
+ *             snippet: "STRING_VALUE",
+ *           },
+ *         ],
+ *         references: [
+ *           {
+ *             licenseName: "STRING_VALUE",
+ *             repository: "STRING_VALUE",
+ *             url: "STRING_VALUE",
+ *             recommendationContentSpan: {
+ *               start: Number("int"),
+ *               end: Number("int"),
+ *             },
+ *           },
+ *         ],
+ *         followupPrompt: {
+ *           content: "STRING_VALUE", // required
+ *           userIntent: "SUGGEST_ALTERNATE_IMPLEMENTATION" || "APPLY_COMMON_BEST_PRACTICES" || "IMPROVE_CODE" || "SHOW_EXAMPLES" || "CITE_SOURCES" || "EXPLAIN_LINE_BY_LINE" || "EXPLAIN_CODE_SELECTION" || "GENERATE_CLOUDFORMATION_TEMPLATE" || "GENERATE_UNIT_TESTS" || "CODE_GENERATION",
+ *         },
+ *         toolUses: [
+ *           {
+ *             toolUseId: "STRING_VALUE", // required
+ *             name: "STRING_VALUE", // required
+ *             input: "DOCUMENT_VALUE", // required
+ *           },
+ *         ],
+ *       },
+ *     },
+ *     chatTriggerType: "MANUAL" || "DIAGNOSTIC" || "INLINE_CHAT", // required
+ *     customizationArn: "STRING_VALUE",
+ *   },
+ *   profileArn: "STRING_VALUE",
+ *   source: "STRING_VALUE",
+ *   dryRun: true || false,
+ * };
+ * const command = new SendMessageCommand(input);
+ * const response = await client.send(command);
+ * // { // SendMessageResponse
+ * //   sendMessageResponse: { // ChatResponseStream Union: only one key present
+ * //     messageMetadataEvent: { // MessageMetadataEvent
+ * //       conversationId: "STRING_VALUE",
+ * //       utteranceId: "STRING_VALUE",
+ * //     },
+ * //     assistantResponseEvent: { // AssistantResponseEvent
+ * //       content: "STRING_VALUE", // required
+ * //     },
+ * //     dryRunSucceedEvent: {},
+ * //     codeReferenceEvent: { // CodeReferenceEvent
+ * //       references: [ // References
+ * //         { // Reference
+ * //           licenseName: "STRING_VALUE",
+ * //           repository: "STRING_VALUE",
+ * //           url: "STRING_VALUE",
+ * //           recommendationContentSpan: { // Span
+ * //             start: Number("int"),
+ * //             end: Number("int"),
+ * //           },
+ * //         },
+ * //       ],
+ * //     },
+ * //     supplementaryWebLinksEvent: { // SupplementaryWebLinksEvent
+ * //       supplementaryWebLinks: [ // SupplementaryWebLinks
+ * //         { // SupplementaryWebLink
+ * //           url: "STRING_VALUE", // required
+ * //           title: "STRING_VALUE", // required
+ * //           snippet: "STRING_VALUE",
+ * //         },
+ * //       ],
+ * //     },
+ * //     followupPromptEvent: { // FollowupPromptEvent
+ * //       followupPrompt: { // FollowupPrompt
+ * //         content: "STRING_VALUE", // required
+ * //         userIntent: "SUGGEST_ALTERNATE_IMPLEMENTATION" || "APPLY_COMMON_BEST_PRACTICES" || "IMPROVE_CODE" || "SHOW_EXAMPLES" || "CITE_SOURCES" || "EXPLAIN_LINE_BY_LINE" || "EXPLAIN_CODE_SELECTION" || "GENERATE_CLOUDFORMATION_TEMPLATE" || "GENERATE_UNIT_TESTS" || "CODE_GENERATION",
+ * //       },
+ * //     },
+ * //     codeEvent: { // CodeEvent
+ * //       content: "STRING_VALUE", // required
+ * //     },
+ * //     intentsEvent: { // IntentsEvent
+ * //       intents: { // IntentMap
+ * //         "<keys>": { // IntentData
+ * //           "<keys>": { // IntentDataType Union: only one key present
+ * //             string: "STRING_VALUE",
+ * //           },
+ * //         },
+ * //       },
+ * //     },
+ * //     interactionComponentsEvent: { // InteractionComponentsEvent
+ * //       interactionComponentEntries: [ // InteractionComponentEntryList // required
+ * //         { // InteractionComponentEntry
+ * //           interactionComponentId: "STRING_VALUE",
+ * //           interactionComponent: { // InteractionComponent
+ * //             text: { // Text
+ * //               content: "STRING_VALUE", // required
+ * //             },
+ * //             alert: { // Alert
+ * //               type: "INFO" || "ERROR" || "WARNING", // required
+ * //               content: [ // AlertComponentList // required
+ * //                 { // AlertComponent
+ * //                   text: {
+ * //                     content: "STRING_VALUE", // required
+ * //                   },
+ * //                 },
+ * //               ],
+ * //             },
+ * //             infrastructureUpdate: { // InfrastructureUpdate
+ * //               transition: { // InfrastructureUpdateTransition
+ * //                 currentState: "STRING_VALUE", // required
+ * //                 nextState: "STRING_VALUE", // required
+ * //               },
+ * //             },
+ * //             progress: { // Progress
+ * //               content: [ // ProgressComponentList // required
+ * //                 { // ProgressComponent
+ * //                   step: { // Step
+ * //                     id: Number("int"), // required
+ * //                     state: "FAILED" || "SUCCEEDED" || "STOPPED" || "PENDING" || "IN_PROGRESS" || "LOADING" || "PAUSED", // required
+ * //                     label: "STRING_VALUE", // required
+ * //                     content: [ // StepComponentList
+ * //                       { // StepComponent
+ * //                         text: "<Text>",
+ * //                       },
+ * //                     ],
+ * //                   },
+ * //                 },
+ * //               ],
+ * //             },
+ * //             step: {
+ * //               id: Number("int"), // required
+ * //               state: "FAILED" || "SUCCEEDED" || "STOPPED" || "PENDING" || "IN_PROGRESS" || "LOADING" || "PAUSED", // required
+ * //               label: "STRING_VALUE", // required
+ * //               content: [
+ * //                 {
+ * //                   text: "<Text>",
+ * //                 },
+ * //               ],
+ * //             },
+ * //             taskDetails: { // TaskDetails
+ * //               overview: { // TaskOverview
+ * //                 label: "STRING_VALUE", // required
+ * //                 description: "STRING_VALUE", // required
+ * //               },
+ * //               content: [ // TaskComponentList // required
+ * //                 { // TaskComponent
+ * //                   text: "<Text>",
+ * //                   infrastructureUpdate: {
+ * //                     transition: {
+ * //                       currentState: "STRING_VALUE", // required
+ * //                       nextState: "STRING_VALUE", // required
+ * //                     },
+ * //                   },
+ * //                   alert: {
+ * //                     type: "INFO" || "ERROR" || "WARNING", // required
+ * //                     content: [ // required
+ * //                       {
+ * //                         text: "<Text>",
+ * //                       },
+ * //                     ],
+ * //                   },
+ * //                   progress: {
+ * //                     content: [ // required
+ * //                       {
+ * //                         step: "<Step>",
+ * //                       },
+ * //                     ],
+ * //                   },
+ * //                 },
+ * //               ],
+ * //               actions: [ // TaskActionList
+ * //                 { // TaskAction
+ * //                   label: "STRING_VALUE", // required
+ * //                   note: { // TaskActionNote
+ * //                     content: "STRING_VALUE", // required
+ * //                     type: "INFO" || "WARNING",
+ * //                   },
+ * //                   primary: true || false,
+ * //                   disabled: true || false,
+ * //                   payload: { // TaskActionPayload // required
+ * //                     "<keys>": "STRING_VALUE",
+ * //                   },
+ * //                   confirmation: { // TaskActionConfirmation
+ * //                     content: "STRING_VALUE",
+ * //                   },
+ * //                 },
+ * //               ],
+ * //             },
+ * //             taskReference: { // TaskReference
+ * //               taskId: "STRING_VALUE", // required
+ * //             },
+ * //             suggestions: { // Suggestions
+ * //               items: [ // SuggestionList // required
+ * //                 { // Suggestion
+ * //                   value: "STRING_VALUE", // required
+ * //                 },
+ * //               ],
+ * //             },
+ * //             section: { // Section
+ * //               title: "STRING_VALUE", // required
+ * //               content: [ // SectionComponentList // required
+ * //                 { // SectionComponent
+ * //                   text: "<Text>",
+ * //                   alert: {
+ * //                     type: "INFO" || "ERROR" || "WARNING", // required
+ * //                     content: [ // required
+ * //                       {
+ * //                         text: "<Text>",
+ * //                       },
+ * //                     ],
+ * //                   },
+ * //                   resource: { // Resource
+ * //                     title: "STRING_VALUE", // required
+ * //                     link: "STRING_VALUE", // required
+ * //                     description: "STRING_VALUE", // required
+ * //                     type: "STRING_VALUE", // required
+ * //                     ARN: "STRING_VALUE", // required
+ * //                     resourceJsonString: "STRING_VALUE", // required
+ * //                   },
+ * //                   resourceList: { // ResourceList
+ * //                     action: { // Action
+ * //                       webLink: { // WebLink
+ * //                         label: "STRING_VALUE", // required
+ * //                         url: "STRING_VALUE", // required
+ * //                       },
+ * //                       moduleLink: { // ModuleLink
+ * //                         cloudWatchTroubleshootingLink: { // CloudWatchTroubleshootingLink
+ * //                           label: "STRING_VALUE", // required
+ * //                           investigationPayload: "STRING_VALUE", // required
+ * //                           defaultText: "STRING_VALUE",
+ * //                         },
+ * //                       },
+ * //                     },
+ * //                     items: [ // Resources // required
+ * //                       {
+ * //                         title: "STRING_VALUE", // required
+ * //                         link: "STRING_VALUE", // required
+ * //                         description: "STRING_VALUE", // required
+ * //                         type: "STRING_VALUE", // required
+ * //                         ARN: "STRING_VALUE", // required
+ * //                         resourceJsonString: "STRING_VALUE", // required
+ * //                       },
+ * //                     ],
+ * //                   },
+ * //                 },
+ * //               ],
+ * //               action: {
+ * //                 webLink: {
+ * //                   label: "STRING_VALUE", // required
+ * //                   url: "STRING_VALUE", // required
+ * //                 },
+ * //                 moduleLink: {
+ * //                   cloudWatchTroubleshootingLink: {
+ * //                     label: "STRING_VALUE", // required
+ * //                     investigationPayload: "STRING_VALUE", // required
+ * //                     defaultText: "STRING_VALUE",
+ * //                   },
+ * //                 },
+ * //               },
+ * //             },
+ * //             resource: "<Resource>",
+ * //             resourceList: {
+ * //               action: {
+ * //                 webLink: {
+ * //                   label: "STRING_VALUE", // required
+ * //                   url: "STRING_VALUE", // required
+ * //                 },
+ * //                 moduleLink: {
+ * //                   cloudWatchTroubleshootingLink: {
+ * //                     label: "STRING_VALUE", // required
+ * //                     investigationPayload: "STRING_VALUE", // required
+ * //                     defaultText: "STRING_VALUE",
+ * //                   },
+ * //                 },
+ * //               },
+ * //               items: [ // required
+ * //                 "<Resource>",
+ * //               ],
+ * //             },
+ * //             action: "<Action>",
+ * //           },
+ * //         },
+ * //       ],
+ * //     },
+ * //     toolUseEvent: { // ToolUseEvent
+ * //       toolUseId: "STRING_VALUE", // required
+ * //       name: "STRING_VALUE", // required
+ * //       input: "STRING_VALUE",
+ * //       stop: true || false,
+ * //     },
+ * //     citationEvent: { // CitationEvent
+ * //       target: { // CitationTarget Union: only one key present
+ * //         location: Number("int"),
+ * //         range: {
+ * //           start: Number("int"),
+ * //           end: Number("int"),
+ * //         },
+ * //       },
+ * //       citationText: "STRING_VALUE",
+ * //       citationLink: "STRING_VALUE", // required
+ * //     },
+ * //     invalidStateEvent: { // InvalidStateEvent
+ * //       reason: "INVALID_TASK_ASSIST_PLAN", // required
+ * //       message: "STRING_VALUE", // required
+ * //     },
+ * //     error: { // InternalServerException
+ * //       message: "STRING_VALUE", // required
+ * //     },
+ * //   },
+ * // };
+ *
+ * ```
+ *
+ * @param SendMessageCommandInput - {@link SendMessageCommandInput}
+ * @returns {@link SendMessageCommandOutput}
+ * @see {@link SendMessageCommandInput} for command's `input` shape.
+ * @see {@link SendMessageCommandOutput} for command's `response` shape.
+ * @see {@link QDeveloperStreamingClientResolvedConfig | config} for QDeveloperStreamingClient's `config` shape.
+ *
+ * @throws {@link InternalServerException} (server fault)
+ *  This exception is thrown when an unexpected error occurred during the processing of a request.
+ *
+ * @throws {@link ServiceQuotaExceededException} (client fault)
+ *  This exception is thrown when request was denied due to caller exceeding their usage limits
+ *
+ * @throws {@link DryRunOperationException} (client fault)
+ *  This exception is translated to a 204 as it succeeded the IAM Auth.
+ *
+ * @throws {@link ThrottlingException} (client fault)
+ *  This exception is thrown when request was denied due to request throttling.
+ *
+ * @throws {@link ValidationException} (client fault)
+ *  This exception is thrown when the input fails to satisfy the constraints specified by the service.
+ *
+ * @throws {@link ConflictException} (client fault)
+ *  This exception is thrown when the action to perform could not be completed because the resource is in a conflicting state.
+ *
+ * @throws {@link ResourceNotFoundException} (client fault)
+ *  This exception is thrown when describing a resource that does not exist.
+ *
+ * @throws {@link AccessDeniedException} (client fault)
+ *  This exception is thrown when the user does not have sufficient access to perform this action.
+ *
+ * @throws {@link QDeveloperStreamingServiceException}
+ * <p>Base exception class for all service exceptions from QDeveloperStreaming service.</p>
+ *
+ */
+export class SendMessageCommand extends $Command.classBuilder<SendMessageCommandInput, SendMessageCommandOutput, QDeveloperStreamingClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes>()
+      .m(function (this: any, Command: any, cs: any, config: QDeveloperStreamingClientResolvedConfig, o: any) {
+          return [
+
+  getSerdePlugin(config, this.serialize, this.deserialize),
+      ];
+  })
+  .s("AmazonQDeveloperStreamingService", "SendMessage", {
+
+    /**
+     * @internal
+     */
+    eventStream: {
+      output: true,
+    },
+  })
+  .n("QDeveloperStreamingClient", "SendMessageCommand")
+  .f(SendMessageRequestFilterSensitiveLog, SendMessageResponseFilterSensitiveLog)
+  .ser(se_SendMessageCommand)
+  .de(de_SendMessageCommand)
+.build() {
+/** @internal type navigation helper, not in runtime. */
+declare protected static __types: {
+  api: {
+      input: SendMessageRequest;
+      output: SendMessageResponse;
+  };
+  sdk: {
+      input: SendMessageCommandInput;
+      output: SendMessageCommandOutput;
+  };
+};
+}
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/src/commands/index.ts b/src.gen/@amzn/amazon-q-developer-streaming-client/src/commands/index.ts
new file mode 100644
index 00000000000..cda6c546e4d
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/src/commands/index.ts
@@ -0,0 +1,3 @@
+// smithy-typescript generated code
+export * from "./GenerateCodeFromCommandsCommand";
+export * from "./SendMessageCommand";
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/src/endpoints.ts b/src.gen/@amzn/amazon-q-developer-streaming-client/src/endpoints.ts
new file mode 100644
index 00000000000..dbcad4b3d28
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/src/endpoints.ts
@@ -0,0 +1,226 @@
+// smithy-typescript generated code
+import {
+  RegionInfoProvider,
+  RegionInfoProviderOptions,
+} from "@aws-sdk/types";
+import {
+  PartitionHash,
+  RegionHash,
+  getRegionInfo,
+} from "@smithy/config-resolver";
+
+const regionHash: RegionHash = {
+};
+
+const partitionHash: PartitionHash = {
+  "aws": {
+    regions: [
+      "af-south-1",
+      "ap-east-1",
+      "ap-northeast-1",
+      "ap-northeast-2",
+      "ap-northeast-3",
+      "ap-south-1",
+      "ap-south-2",
+      "ap-southeast-1",
+      "ap-southeast-2",
+      "ap-southeast-3",
+      "ap-southeast-4",
+      "ap-southeast-5",
+      "ap-southeast-7",
+      "ca-central-1",
+      "ca-west-1",
+      "eu-central-1",
+      "eu-central-2",
+      "eu-north-1",
+      "eu-south-1",
+      "eu-south-2",
+      "eu-west-1",
+      "eu-west-2",
+      "eu-west-3",
+      "il-central-1",
+      "me-central-1",
+      "me-south-1",
+      "mx-central-1",
+      "sa-east-1",
+      "us-east-1",
+      "us-east-2",
+      "us-west-1",
+      "us-west-2",
+    ],
+    regionRegex: "^(us|eu|ap|sa|ca|me|af|il|mx)\\-\\w+\\-\\d+$",
+    variants: [
+        {
+            "hostname": "amazonqdeveloperstreamingservice.{region}.amazonaws.com",
+            "tags": []
+        },
+        {
+            "hostname": "amazonqdeveloperstreamingservice-fips.{region}.amazonaws.com",
+            "tags": [
+                "fips"
+            ]
+        },
+        {
+            "hostname": "amazonqdeveloperstreamingservice-fips.{region}.api.aws",
+            "tags": [
+                "dualstack",
+                "fips"
+            ]
+        },
+        {
+            "hostname": "amazonqdeveloperstreamingservice.{region}.api.aws",
+            "tags": [
+                "dualstack"
+            ]
+        }
+    ],
+  },
+  "aws-cn": {
+    regions: [
+      "cn-north-1",
+      "cn-northwest-1",
+    ],
+    regionRegex: "^cn\\-\\w+\\-\\d+$",
+    variants: [
+        {
+            "hostname": "amazonqdeveloperstreamingservice.{region}.amazonaws.com.cn",
+            "tags": []
+        },
+        {
+            "hostname": "amazonqdeveloperstreamingservice-fips.{region}.amazonaws.com.cn",
+            "tags": [
+                "fips"
+            ]
+        },
+        {
+            "hostname": "amazonqdeveloperstreamingservice-fips.{region}.api.amazonwebservices.com.cn",
+            "tags": [
+                "dualstack",
+                "fips"
+            ]
+        },
+        {
+            "hostname": "amazonqdeveloperstreamingservice.{region}.api.amazonwebservices.com.cn",
+            "tags": [
+                "dualstack"
+            ]
+        }
+    ],
+  },
+  "aws-iso": {
+    regions: [
+      "us-iso-east-1",
+      "us-iso-west-1",
+    ],
+    regionRegex: "^us\\-iso\\-\\w+\\-\\d+$",
+    variants: [
+        {
+            "hostname": "amazonqdeveloperstreamingservice.{region}.c2s.ic.gov",
+            "tags": []
+        },
+        {
+            "hostname": "amazonqdeveloperstreamingservice-fips.{region}.c2s.ic.gov",
+            "tags": [
+                "fips"
+            ]
+        }
+    ],
+  },
+  "aws-iso-b": {
+    regions: [
+      "us-isob-east-1",
+    ],
+    regionRegex: "^us\\-isob\\-\\w+\\-\\d+$",
+    variants: [
+        {
+            "hostname": "amazonqdeveloperstreamingservice.{region}.sc2s.sgov.gov",
+            "tags": []
+        },
+        {
+            "hostname": "amazonqdeveloperstreamingservice-fips.{region}.sc2s.sgov.gov",
+            "tags": [
+                "fips"
+            ]
+        }
+    ],
+  },
+  "aws-iso-e": {
+    regions: [
+      "eu-isoe-west-1",
+    ],
+    regionRegex: "^eu\\-isoe\\-\\w+\\-\\d+$",
+    variants: [
+        {
+            "hostname": "amazonqdeveloperstreamingservice.{region}.cloud.adc-e.uk",
+            "tags": []
+        },
+        {
+            "hostname": "amazonqdeveloperstreamingservice-fips.{region}.cloud.adc-e.uk",
+            "tags": [
+                "fips"
+            ]
+        }
+    ],
+  },
+  "aws-iso-f": {
+    regions: [
+    ],
+    regionRegex: "^us\\-isof\\-\\w+\\-\\d+$",
+    variants: [
+        {
+            "hostname": "amazonqdeveloperstreamingservice.{region}.csp.hci.ic.gov",
+            "tags": []
+        },
+        {
+            "hostname": "amazonqdeveloperstreamingservice-fips.{region}.csp.hci.ic.gov",
+            "tags": [
+                "fips"
+            ]
+        }
+    ],
+  },
+  "aws-us-gov": {
+    regions: [
+      "us-gov-east-1",
+      "us-gov-west-1",
+    ],
+    regionRegex: "^us\\-gov\\-\\w+\\-\\d+$",
+    variants: [
+        {
+            "hostname": "amazonqdeveloperstreamingservice.{region}.amazonaws.com",
+            "tags": []
+        },
+        {
+            "hostname": "amazonqdeveloperstreamingservice-fips.{region}.amazonaws.com",
+            "tags": [
+                "fips"
+            ]
+        },
+        {
+            "hostname": "amazonqdeveloperstreamingservice-fips.{region}.api.aws",
+            "tags": [
+                "dualstack",
+                "fips"
+            ]
+        },
+        {
+            "hostname": "amazonqdeveloperstreamingservice.{region}.api.aws",
+            "tags": [
+                "dualstack"
+            ]
+        }
+    ],
+  },
+};
+
+export const defaultRegionInfoProvider: RegionInfoProvider = async (
+  region: string,
+  options?: RegionInfoProviderOptions
+) =>
+  getRegionInfo(region, {
+    ...options,
+    signingService: "q",
+    regionHash,
+    partitionHash,
+  })
+;
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/src/extensionConfiguration.ts b/src.gen/@amzn/amazon-q-developer-streaming-client/src/extensionConfiguration.ts
new file mode 100644
index 00000000000..74ed575070f
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/src/extensionConfiguration.ts
@@ -0,0 +1,10 @@
+// smithy-typescript generated code
+import { HttpAuthExtensionConfiguration } from "./auth/httpAuthExtensionConfiguration";
+import { AwsRegionExtensionConfiguration } from "@aws-sdk/types";
+import { HttpHandlerExtensionConfiguration } from "@smithy/protocol-http";
+import { DefaultExtensionConfiguration } from "@smithy/types";
+
+/**
+ * @internal
+ */
+export interface QDeveloperStreamingExtensionConfiguration extends HttpHandlerExtensionConfiguration, DefaultExtensionConfiguration, AwsRegionExtensionConfiguration, HttpAuthExtensionConfiguration {}
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/src/index.ts b/src.gen/@amzn/amazon-q-developer-streaming-client/src/index.ts
new file mode 100644
index 00000000000..2fe51ba01b5
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/src/index.ts
@@ -0,0 +1,10 @@
+// smithy-typescript generated code
+/* eslint-disable */
+export * from "./QDeveloperStreamingClient";
+export * from "./QDeveloperStreaming";
+export type { RuntimeExtension } from "./runtimeExtensions";
+export type { QDeveloperStreamingExtensionConfiguration } from "./extensionConfiguration";
+export * from "./commands";
+export * from "./models";
+
+export { QDeveloperStreamingServiceException } from "./models/QDeveloperStreamingServiceException";
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/src/models/QDeveloperStreamingServiceException.ts b/src.gen/@amzn/amazon-q-developer-streaming-client/src/models/QDeveloperStreamingServiceException.ts
new file mode 100644
index 00000000000..78c4dae9807
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/src/models/QDeveloperStreamingServiceException.ts
@@ -0,0 +1,24 @@
+// smithy-typescript generated code
+import {
+  ServiceException as __ServiceException,
+  ServiceExceptionOptions as __ServiceExceptionOptions,
+} from "@smithy/smithy-client";
+
+export type { __ServiceExceptionOptions }
+
+export { __ServiceException }
+
+/**
+ * @public
+ *
+ * Base exception class for all service exceptions from QDeveloperStreaming service.
+ */
+export class QDeveloperStreamingServiceException extends __ServiceException {
+  /**
+   * @internal
+   */
+  constructor(options: __ServiceExceptionOptions) {
+    super(options);
+    Object.setPrototypeOf(this, QDeveloperStreamingServiceException.prototype);
+  }
+}
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/src/models/index.ts b/src.gen/@amzn/amazon-q-developer-streaming-client/src/models/index.ts
new file mode 100644
index 00000000000..9eaceb12865
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/src/models/index.ts
@@ -0,0 +1,2 @@
+// smithy-typescript generated code
+export * from "./models_0";
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/src/models/models_0.ts b/src.gen/@amzn/amazon-q-developer-streaming-client/src/models/models_0.ts
new file mode 100644
index 00000000000..19c55b518b8
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/src/models/models_0.ts
@@ -0,0 +1,4133 @@
+// smithy-typescript generated code
+import { QDeveloperStreamingServiceException as __BaseException } from "./QDeveloperStreamingServiceException";
+import {
+  SENSITIVE_STRING,
+  ExceptionOptionType as __ExceptionOptionType,
+} from "@smithy/smithy-client";
+import { DocumentType as __DocumentType } from "@smithy/types";
+
+/**
+ * @public
+ * @enum
+ */
+export const AccessDeniedExceptionReason = {
+  UNAUTHORIZED_CUSTOMIZATION_RESOURCE_ACCESS: "UNAUTHORIZED_CUSTOMIZATION_RESOURCE_ACCESS",
+} as const
+/**
+ * @public
+ */
+export type AccessDeniedExceptionReason = typeof AccessDeniedExceptionReason[keyof typeof AccessDeniedExceptionReason]
+
+/**
+ * This exception is thrown when the user does not have sufficient access to perform this action.
+ * @public
+ */
+export class AccessDeniedException extends __BaseException {
+  readonly name: "AccessDeniedException" = "AccessDeniedException";
+  readonly $fault: "client" = "client";
+  /**
+   * Reason for AccessDeniedException
+   * @public
+   */
+  reason?: AccessDeniedExceptionReason | undefined;
+
+  /**
+   * @internal
+   */
+  constructor(opts: __ExceptionOptionType<AccessDeniedException, __BaseException>) {
+    super({
+      name: "AccessDeniedException",
+      $fault: "client",
+      ...opts
+    });
+    Object.setPrototypeOf(this, AccessDeniedException.prototype);
+    this.reason = opts.reason;
+  }
+}
+
+/**
+ * Structure representing a single entry of additional contextual content
+ * @public
+ */
+export interface AdditionalContentEntry {
+  /**
+   * The name/identifier for this context entry
+   * @public
+   */
+  name: string | undefined;
+
+  /**
+   * A description of what this context entry represents
+   * @public
+   */
+  description: string | undefined;
+
+  /**
+   * The actual contextual content
+   * @public
+   */
+  innerContext?: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const AdditionalContentEntryFilterSensitiveLog = (obj: AdditionalContentEntry): any => ({
+  ...obj,
+  ...(obj.name && { name:
+    SENSITIVE_STRING
+  }),
+  ...(obj.description && { description:
+    SENSITIVE_STRING
+  }),
+  ...(obj.innerContext && { innerContext:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * This exception is thrown when an unexpected error occurred during the processing of a request.
+ * @public
+ */
+export class InternalServerException extends __BaseException {
+  readonly name: "InternalServerException" = "InternalServerException";
+  readonly $fault: "server" = "server";
+  $retryable = {
+  };
+  /**
+   * @internal
+   */
+  constructor(opts: __ExceptionOptionType<InternalServerException, __BaseException>) {
+    super({
+      name: "InternalServerException",
+      $fault: "server",
+      ...opts
+    });
+    Object.setPrototypeOf(this, InternalServerException.prototype);
+  }
+}
+
+/**
+ * This exception is thrown when describing a resource that does not exist.
+ * @public
+ */
+export class ResourceNotFoundException extends __BaseException {
+  readonly name: "ResourceNotFoundException" = "ResourceNotFoundException";
+  readonly $fault: "client" = "client";
+  /**
+   * @internal
+   */
+  constructor(opts: __ExceptionOptionType<ResourceNotFoundException, __BaseException>) {
+    super({
+      name: "ResourceNotFoundException",
+      $fault: "client",
+      ...opts
+    });
+    Object.setPrototypeOf(this, ResourceNotFoundException.prototype);
+  }
+}
+
+/**
+ * @public
+ * @enum
+ */
+export const ThrottlingExceptionReason = {
+  MONTHLY_REQUEST_COUNT: "MONTHLY_REQUEST_COUNT",
+} as const
+/**
+ * @public
+ */
+export type ThrottlingExceptionReason = typeof ThrottlingExceptionReason[keyof typeof ThrottlingExceptionReason]
+
+/**
+ * This exception is thrown when request was denied due to request throttling.
+ * @public
+ */
+export class ThrottlingException extends __BaseException {
+  readonly name: "ThrottlingException" = "ThrottlingException";
+  readonly $fault: "client" = "client";
+  $retryable = {
+    throttling: true,
+  };
+  /**
+   * Reason for ThrottlingException
+   * @public
+   */
+  reason?: ThrottlingExceptionReason | undefined;
+
+  /**
+   * @internal
+   */
+  constructor(opts: __ExceptionOptionType<ThrottlingException, __BaseException>) {
+    super({
+      name: "ThrottlingException",
+      $fault: "client",
+      ...opts
+    });
+    Object.setPrototypeOf(this, ThrottlingException.prototype);
+    this.reason = opts.reason;
+  }
+}
+
+/**
+ * @public
+ * @enum
+ */
+export const ValidationExceptionReason = {
+  CONTENT_LENGTH_EXCEEDS_THRESHOLD: "CONTENT_LENGTH_EXCEEDS_THRESHOLD",
+  INVALID_CONVERSATION_ID: "INVALID_CONVERSATION_ID",
+  INVALID_KMS_GRANT: "INVALID_KMS_GRANT",
+} as const
+/**
+ * @public
+ */
+export type ValidationExceptionReason = typeof ValidationExceptionReason[keyof typeof ValidationExceptionReason]
+
+/**
+ * This exception is thrown when the input fails to satisfy the constraints specified by the service.
+ * @public
+ */
+export class ValidationException extends __BaseException {
+  readonly name: "ValidationException" = "ValidationException";
+  readonly $fault: "client" = "client";
+  /**
+   * Reason for ValidationException
+   * @public
+   */
+  reason?: ValidationExceptionReason | undefined;
+
+  /**
+   * @internal
+   */
+  constructor(opts: __ExceptionOptionType<ValidationException, __BaseException>) {
+    super({
+      name: "ValidationException",
+      $fault: "client",
+      ...opts
+    });
+    Object.setPrototypeOf(this, ValidationException.prototype);
+    this.reason = opts.reason;
+  }
+}
+
+/**
+ * Description of a user's context when they are calling Q Chat from AppStudio
+ * @public
+ */
+export interface AppStudioState {
+  /**
+   * The namespace of the context. Examples: 'ui.Button', 'ui.Table.DataSource', 'ui.Table.RowActions.Button', 'logic.invokeAWS', 'logic.JavaScript'
+   * @public
+   */
+  namespace: string | undefined;
+
+  /**
+   * The name of the property. Examples: 'visibility', 'disability', 'value', 'code'
+   * @public
+   */
+  propertyName: string | undefined;
+
+  /**
+   * The value of the property.
+   * @public
+   */
+  propertyValue?: string | undefined;
+
+  /**
+   * Context about how the property is used
+   * @public
+   */
+  propertyContext: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const AppStudioStateFilterSensitiveLog = (obj: AppStudioState): any => ({
+  ...obj,
+  ...(obj.namespace && { namespace:
+    SENSITIVE_STRING
+  }),
+  ...(obj.propertyName && { propertyName:
+    SENSITIVE_STRING
+  }),
+  ...(obj.propertyValue && { propertyValue:
+    SENSITIVE_STRING
+  }),
+  ...(obj.propertyContext && { propertyContext:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Streaming Response Event for Assistant Markdown text message.
+ * @public
+ */
+export interface AssistantResponseEvent {
+  /**
+   * The content of the text message in markdown format.
+   * @public
+   */
+  content: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const AssistantResponseEventFilterSensitiveLog = (obj: AssistantResponseEvent): any => ({
+  ...obj,
+  ...(obj.content && { content:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * @public
+ * @enum
+ */
+export const UserIntent = {
+  /**
+   * Apply Common Best Practices
+   */
+  APPLY_COMMON_BEST_PRACTICES: "APPLY_COMMON_BEST_PRACTICES",
+  /**
+   * Cite Sources
+   */
+  CITE_SOURCES: "CITE_SOURCES",
+  /**
+   * generate code
+   */
+  CODE_GENERATION: "CODE_GENERATION",
+  /**
+   * Explain Code Selection
+   */
+  EXPLAIN_CODE_SELECTION: "EXPLAIN_CODE_SELECTION",
+  /**
+   * Explain Code Line By Line
+   */
+  EXPLAIN_LINE_BY_LINE: "EXPLAIN_LINE_BY_LINE",
+  /**
+   * Generate CloudFormation Template
+   */
+  GENERATE_CLOUDFORMATION_TEMPLATE: "GENERATE_CLOUDFORMATION_TEMPLATE",
+  /**
+   * Generate Unit Tests
+   */
+  GENERATE_UNIT_TESTS: "GENERATE_UNIT_TESTS",
+  /**
+   * Improve Code
+   */
+  IMPROVE_CODE: "IMPROVE_CODE",
+  /**
+   * Show More Examples
+   */
+  SHOW_EXAMPLES: "SHOW_EXAMPLES",
+  /**
+   * Suggest Alternative Implementation
+   */
+  SUGGEST_ALTERNATE_IMPLEMENTATION: "SUGGEST_ALTERNATE_IMPLEMENTATION",
+} as const
+/**
+ * @public
+ */
+export type UserIntent = typeof UserIntent[keyof typeof UserIntent]
+
+/**
+ * Followup Prompt for the Assistant Response
+ * @public
+ */
+export interface FollowupPrompt {
+  /**
+   * The content of the text message in markdown format.
+   * @public
+   */
+  content: string | undefined;
+
+  /**
+   * User Intent
+   * @public
+   */
+  userIntent?: UserIntent | undefined;
+}
+
+/**
+ * @internal
+ */
+export const FollowupPromptFilterSensitiveLog = (obj: FollowupPrompt): any => ({
+  ...obj,
+  ...(obj.content && { content:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Represents span in a text.
+ * @public
+ */
+export interface Span {
+  start?: number | undefined;
+  end?: number | undefined;
+}
+
+/**
+ * Code Reference / Repository details
+ * @public
+ */
+export interface Reference {
+  /**
+   * License name
+   * @public
+   */
+  licenseName?: string | undefined;
+
+  /**
+   * Code Repsitory for the associated reference
+   * @public
+   */
+  repository?: string | undefined;
+
+  /**
+   * Respository URL
+   * @public
+   */
+  url?: string | undefined;
+
+  /**
+   * Span / Range for the Reference
+   * @public
+   */
+  recommendationContentSpan?: Span | undefined;
+}
+
+/**
+ * Represents an additional reference link retured with the Chat message
+ * @public
+ */
+export interface SupplementaryWebLink {
+  /**
+   * URL of the web reference link.
+   * @public
+   */
+  url: string | undefined;
+
+  /**
+   * Title of the web reference link.
+   * @public
+   */
+  title: string | undefined;
+
+  /**
+   * Relevant text snippet from the link.
+   * @public
+   */
+  snippet?: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const SupplementaryWebLinkFilterSensitiveLog = (obj: SupplementaryWebLink): any => ({
+  ...obj,
+  ...(obj.url && { url:
+    SENSITIVE_STRING
+  }),
+  ...(obj.title && { title:
+    SENSITIVE_STRING
+  }),
+  ...(obj.snippet && { snippet:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Contains information about a tool that the model is requesting be run. The model uses the result from the tool to generate a response.
+ * @public
+ */
+export interface ToolUse {
+  /**
+   * The ID for the tool request.
+   * @public
+   */
+  toolUseId: string | undefined;
+
+  /**
+   * The name for the tool.
+   * @public
+   */
+  name: string | undefined;
+
+  /**
+   * The input to pass to the tool.
+   * @public
+   */
+  input: __DocumentType | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ToolUseFilterSensitiveLog = (obj: ToolUse): any => ({
+  ...obj,
+  ...(obj.name && { name:
+    SENSITIVE_STRING
+  }),
+  ...(obj.input && { input:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Markdown text message.
+ * @public
+ */
+export interface AssistantResponseMessage {
+  /**
+   * Unique identifier for the chat message
+   * @public
+   */
+  messageId?: string | undefined;
+
+  /**
+   * The content of the text message in markdown format.
+   * @public
+   */
+  content: string | undefined;
+
+  /**
+   * Web References
+   * @public
+   */
+  supplementaryWebLinks?: (SupplementaryWebLink)[] | undefined;
+
+  /**
+   * Code References
+   * @public
+   */
+  references?: (Reference)[] | undefined;
+
+  /**
+   * Followup Prompt
+   * @public
+   */
+  followupPrompt?: FollowupPrompt | undefined;
+
+  /**
+   * ToolUse Request
+   * @public
+   */
+  toolUses?: (ToolUse)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const AssistantResponseMessageFilterSensitiveLog = (obj: AssistantResponseMessage): any => ({
+  ...obj,
+  ...(obj.content && { content:
+    SENSITIVE_STRING
+  }),
+  ...(obj.supplementaryWebLinks && { supplementaryWebLinks:
+    obj.supplementaryWebLinks.map(
+      item =>
+      SupplementaryWebLinkFilterSensitiveLog(item)
+    )
+  }),
+  ...(obj.followupPrompt && { followupPrompt:
+    FollowupPromptFilterSensitiveLog(obj.followupPrompt)
+  }),
+  ...(obj.toolUses && { toolUses:
+    obj.toolUses.map(
+      item =>
+      ToolUseFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * @public
+ * @enum
+ */
+export const ConflictExceptionReason = {
+  CUSTOMER_KMS_KEY_DISABLED: "CUSTOMER_KMS_KEY_DISABLED",
+  CUSTOMER_KMS_KEY_INVALID_KEY_POLICY: "CUSTOMER_KMS_KEY_INVALID_KEY_POLICY",
+  MISMATCHED_KMS_KEY: "MISMATCHED_KMS_KEY",
+} as const
+/**
+ * @public
+ */
+export type ConflictExceptionReason = typeof ConflictExceptionReason[keyof typeof ConflictExceptionReason]
+
+/**
+ * This exception is thrown when the action to perform could not be completed because the resource is in a conflicting state.
+ * @public
+ */
+export class ConflictException extends __BaseException {
+  readonly name: "ConflictException" = "ConflictException";
+  readonly $fault: "client" = "client";
+  /**
+   * Reason for ConflictException
+   * @public
+   */
+  reason?: ConflictExceptionReason | undefined;
+
+  /**
+   * @internal
+   */
+  constructor(opts: __ExceptionOptionType<ConflictException, __BaseException>) {
+    super({
+      name: "ConflictException",
+      $fault: "client",
+      ...opts
+    });
+    Object.setPrototypeOf(this, ConflictException.prototype);
+    this.reason = opts.reason;
+  }
+}
+
+/**
+ * Programming Languages supported by CodeWhisperer
+ * @public
+ */
+export interface ProgrammingLanguage {
+  languageName: string | undefined;
+}
+
+/**
+ * @public
+ * @enum
+ */
+export const ImageFormat = {
+  GIF: "gif",
+  JPEG: "jpeg",
+  PNG: "png",
+  WEBP: "webp",
+} as const
+/**
+ * @public
+ */
+export type ImageFormat = typeof ImageFormat[keyof typeof ImageFormat]
+
+/**
+ * Image bytes limited to ~10MB considering overhead of base64 encoding
+ * @public
+ */
+export type ImageSource =
+  | ImageSource.BytesMember
+  | ImageSource.$UnknownMember
+
+/**
+ * @public
+ */
+export namespace ImageSource {
+
+  export interface BytesMember {
+    bytes: Uint8Array;
+    $unknown?: never;
+  }
+
+  /**
+   * @public
+   */
+  export interface $UnknownMember {
+    bytes?: never;
+    $unknown: [string, any];
+  }
+
+  export interface Visitor<T> {
+    bytes: (value: Uint8Array) => T;
+    _: (name: string, value: any) => T;
+  }
+
+  export const visit = <T>(
+    value: ImageSource,
+    visitor: Visitor<T>
+  ): T => {
+    if (value.bytes !== undefined) return visitor.bytes(value.bytes);
+    return visitor._(value.$unknown[0], value.$unknown[1]);
+  }
+
+}
+/**
+ * @internal
+ */
+export const ImageSourceFilterSensitiveLog = (obj: ImageSource): any => {
+  if (obj.bytes !== undefined) return {bytes:
+    obj.bytes
+  };
+  if (obj.$unknown !== undefined) return {[obj.$unknown[0]]: 'UNKNOWN'};
+}
+
+/**
+ * Represents the image source itself and the format of the image.
+ * @public
+ */
+export interface ImageBlock {
+  format: ImageFormat | undefined;
+  /**
+   * Image bytes limited to ~10MB considering overhead of base64 encoding
+   * @public
+   */
+  source: ImageSource | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ImageBlockFilterSensitiveLog = (obj: ImageBlock): any => ({
+  ...obj,
+  ...(obj.source && { source:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * @public
+ * @enum
+ */
+export const Origin = {
+  /**
+   * Any AI Editor.
+   */
+  AI_EDITOR: "AI_EDITOR",
+  /**
+   * AWS Chatbot
+   */
+  CHATBOT: "CHATBOT",
+  /**
+   * Any CLI caller.
+   */
+  CLI: "CLI",
+  /**
+   * AWS Management Console (https://<region>.console.aws.amazon.com)
+   */
+  CONSOLE: "CONSOLE",
+  /**
+   * AWS Documentation Website (https://docs.aws.amazon.com)
+   */
+  DOCUMENTATION: "DOCUMENTATION",
+  /**
+   * Any caller from GitLab Q integration.
+   */
+  GITLAB: "GITLAB",
+  /**
+   * Any IDE caller.
+   */
+  IDE: "IDE",
+  /**
+   * AWS Marketing Website (https://aws.amazon.com)
+   */
+  MARKETING: "MARKETING",
+  /**
+   * MD.
+   */
+  MD: "MD",
+  /**
+   * AWS Mobile Application (ACMA)
+   */
+  MOBILE: "MOBILE",
+  /**
+   * Amazon OpenSearch dashboard
+   */
+  OPENSEARCH_DASHBOARD: "OPENSEARCH_DASHBOARD",
+  /**
+   * Amazon SageMaker's Rome Chat.
+   */
+  SAGE_MAKER: "SAGE_MAKER",
+  /**
+   * Internal Service Traffic (Integ Tests, Canaries, etc.). This is the default when no Origin header present in request.
+   */
+  SERVICE_INTERNAL: "SERVICE_INTERNAL",
+  /**
+   * Unified Search in AWS Management Console (https://<region>.console.aws.amazon.com)
+   */
+  UNIFIED_SEARCH: "UNIFIED_SEARCH",
+  /**
+   * Origin header is not set.
+   */
+  UNKNOWN: "UNKNOWN",
+} as const
+/**
+ * @public
+ */
+export type Origin = typeof Origin[keyof typeof Origin]
+
+/**
+ * Information about the state of the AWS management console page from which the user is calling
+ * @public
+ */
+export interface ConsoleState {
+  region?: string | undefined;
+  consoleUrl?: string | undefined;
+  serviceId?: string | undefined;
+  serviceConsolePage?: string | undefined;
+  serviceSubconsolePage?: string | undefined;
+  taskName?: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ConsoleStateFilterSensitiveLog = (obj: ConsoleState): any => ({
+  ...obj,
+  ...(obj.consoleUrl && { consoleUrl:
+    SENSITIVE_STRING
+  }),
+  ...(obj.taskName && { taskName:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * @public
+ * @enum
+ */
+export const DiagnosticSeverity = {
+  ERROR: "ERROR",
+  HINT: "HINT",
+  INFORMATION: "INFORMATION",
+  WARNING: "WARNING",
+} as const
+/**
+ * @public
+ */
+export type DiagnosticSeverity = typeof DiagnosticSeverity[keyof typeof DiagnosticSeverity]
+
+/**
+ * Structure to represent metadata about a Runtime Diagnostics
+ * @public
+ */
+export interface RuntimeDiagnostic {
+  /**
+   * A human-readable string describing the source of the diagnostic
+   * @public
+   */
+  source: string | undefined;
+
+  /**
+   * Diagnostic Error type
+   * @public
+   */
+  severity: DiagnosticSeverity | undefined;
+
+  /**
+   * The diagnostic's message.
+   * @public
+   */
+  message: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const RuntimeDiagnosticFilterSensitiveLog = (obj: RuntimeDiagnostic): any => ({
+  ...obj,
+  ...(obj.source && { source:
+    SENSITIVE_STRING
+  }),
+  ...(obj.message && { message:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * @public
+ * @enum
+ */
+export const SymbolType = {
+  DECLARATION: "DECLARATION",
+  USAGE: "USAGE",
+} as const
+/**
+ * @public
+ */
+export type SymbolType = typeof SymbolType[keyof typeof SymbolType]
+
+/**
+ * @public
+ */
+export interface DocumentSymbol {
+  /**
+   * Name of the Document Symbol
+   * @public
+   */
+  name: string | undefined;
+
+  /**
+   * Symbol type - DECLARATION / USAGE
+   * @public
+   */
+  type: SymbolType | undefined;
+
+  /**
+   * Symbol package / source for FullyQualified names
+   * @public
+   */
+  source?: string | undefined;
+}
+
+/**
+ * Represents a Text Document / File
+ * @public
+ */
+export interface TextDocument {
+  /**
+   * Filepath relative to the root of the workspace
+   * @public
+   */
+  relativeFilePath: string | undefined;
+
+  /**
+   * The text document's language identifier.
+   * @public
+   */
+  programmingLanguage?: ProgrammingLanguage | undefined;
+
+  /**
+   * Content of the text document
+   * @public
+   */
+  text?: string | undefined;
+
+  /**
+   * DocumentSymbols parsed from a text document
+   * @public
+   */
+  documentSymbols?: (DocumentSymbol)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const TextDocumentFilterSensitiveLog = (obj: TextDocument): any => ({
+  ...obj,
+  ...(obj.relativeFilePath && { relativeFilePath:
+    SENSITIVE_STRING
+  }),
+  ...(obj.text && { text:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Indicates Cursor postion in a Text Document
+ * @public
+ */
+export interface Position {
+  /**
+   * Line position in a document.
+   * @public
+   */
+  line: number | undefined;
+
+  /**
+   * Character offset on a line in a document (zero-based)
+   * @public
+   */
+  character: number | undefined;
+}
+
+/**
+ * Indicates Range / Span in a Text Document
+ * @public
+ */
+export interface Range {
+  /**
+   * The range's start position.
+   * @public
+   */
+  start: Position | undefined;
+
+  /**
+   * The range's end position.
+   * @public
+   */
+  end: Position | undefined;
+}
+
+/**
+ * Structure to represent metadata about a TextDocument Diagnostic
+ * @public
+ */
+export interface TextDocumentDiagnostic {
+  /**
+   * Represents a Text Document associated with Diagnostic
+   * @public
+   */
+  document: TextDocument | undefined;
+
+  /**
+   * The range at which the message applies.
+   * @public
+   */
+  range: Range | undefined;
+
+  /**
+   * A human-readable string describing the source of the diagnostic
+   * @public
+   */
+  source: string | undefined;
+
+  /**
+   * Diagnostic Error type
+   * @public
+   */
+  severity: DiagnosticSeverity | undefined;
+
+  /**
+   * The diagnostic's message.
+   * @public
+   */
+  message: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const TextDocumentDiagnosticFilterSensitiveLog = (obj: TextDocumentDiagnostic): any => ({
+  ...obj,
+  ...(obj.document && { document:
+    TextDocumentFilterSensitiveLog(obj.document)
+  }),
+  ...(obj.source && { source:
+    SENSITIVE_STRING
+  }),
+  ...(obj.message && { message:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Represents a Diagnostic message
+ * @public
+ */
+export type Diagnostic =
+  | Diagnostic.RuntimeDiagnosticMember
+  | Diagnostic.TextDocumentDiagnosticMember
+  | Diagnostic.$UnknownMember
+
+/**
+ * @public
+ */
+export namespace Diagnostic {
+
+  /**
+   * Diagnostics originating from a TextDocument
+   * @public
+   */
+  export interface TextDocumentDiagnosticMember {
+    textDocumentDiagnostic: TextDocumentDiagnostic;
+    runtimeDiagnostic?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Diagnostics originating from a Runtime
+   * @public
+   */
+  export interface RuntimeDiagnosticMember {
+    textDocumentDiagnostic?: never;
+    runtimeDiagnostic: RuntimeDiagnostic;
+    $unknown?: never;
+  }
+
+  /**
+   * @public
+   */
+  export interface $UnknownMember {
+    textDocumentDiagnostic?: never;
+    runtimeDiagnostic?: never;
+    $unknown: [string, any];
+  }
+
+  export interface Visitor<T> {
+    textDocumentDiagnostic: (value: TextDocumentDiagnostic) => T;
+    runtimeDiagnostic: (value: RuntimeDiagnostic) => T;
+    _: (name: string, value: any) => T;
+  }
+
+  export const visit = <T>(
+    value: Diagnostic,
+    visitor: Visitor<T>
+  ): T => {
+    if (value.textDocumentDiagnostic !== undefined) return visitor.textDocumentDiagnostic(value.textDocumentDiagnostic);
+    if (value.runtimeDiagnostic !== undefined) return visitor.runtimeDiagnostic(value.runtimeDiagnostic);
+    return visitor._(value.$unknown[0], value.$unknown[1]);
+  }
+
+}
+/**
+ * @internal
+ */
+export const DiagnosticFilterSensitiveLog = (obj: Diagnostic): any => {
+  if (obj.textDocumentDiagnostic !== undefined) return {textDocumentDiagnostic:
+    TextDocumentDiagnosticFilterSensitiveLog(obj.textDocumentDiagnostic)
+  };
+  if (obj.runtimeDiagnostic !== undefined) return {runtimeDiagnostic:
+    RuntimeDiagnosticFilterSensitiveLog(obj.runtimeDiagnostic)
+  };
+  if (obj.$unknown !== undefined) return {[obj.$unknown[0]]: 'UNKNOWN'};
+}
+
+/**
+ * Represents the state of the Cursor in an Editor
+ * @public
+ */
+export type CursorState =
+  | CursorState.PositionMember
+  | CursorState.RangeMember
+  | CursorState.$UnknownMember
+
+/**
+ * @public
+ */
+export namespace CursorState {
+
+  /**
+   * Represents a cursor position in a Text Document
+   * @public
+   */
+  export interface PositionMember {
+    position: Position;
+    range?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Represents a text selection in a Text Document
+   * @public
+   */
+  export interface RangeMember {
+    position?: never;
+    range: Range;
+    $unknown?: never;
+  }
+
+  /**
+   * @public
+   */
+  export interface $UnknownMember {
+    position?: never;
+    range?: never;
+    $unknown: [string, any];
+  }
+
+  export interface Visitor<T> {
+    position: (value: Position) => T;
+    range: (value: Range) => T;
+    _: (name: string, value: any) => T;
+  }
+
+  export const visit = <T>(
+    value: CursorState,
+    visitor: Visitor<T>
+  ): T => {
+    if (value.position !== undefined) return visitor.position(value.position);
+    if (value.range !== undefined) return visitor.range(value.range);
+    return visitor._(value.$unknown[0], value.$unknown[1]);
+  }
+
+}
+
+/**
+ * Represents an IDE retrieved relevant Text Document / File
+ * @public
+ */
+export interface RelevantTextDocument {
+  /**
+   * Filepath relative to the root of the workspace
+   * @public
+   */
+  relativeFilePath: string | undefined;
+
+  /**
+   * The text document's language identifier.
+   * @public
+   */
+  programmingLanguage?: ProgrammingLanguage | undefined;
+
+  /**
+   * Content of the text document
+   * @public
+   */
+  text?: string | undefined;
+
+  /**
+   * DocumentSymbols parsed from a text document
+   * @public
+   */
+  documentSymbols?: (DocumentSymbol)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const RelevantTextDocumentFilterSensitiveLog = (obj: RelevantTextDocument): any => ({
+  ...obj,
+  ...(obj.relativeFilePath && { relativeFilePath:
+    SENSITIVE_STRING
+  }),
+  ...(obj.text && { text:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Represents the state of an Editor
+ * @public
+ */
+export interface EditorState {
+  /**
+   * Represents currently edited file
+   * @public
+   */
+  document?: TextDocument | undefined;
+
+  /**
+   * Position of the cursor
+   * @public
+   */
+  cursorState?: CursorState | undefined;
+
+  /**
+   * Represents IDE provided relevant files
+   * @public
+   */
+  relevantDocuments?: (RelevantTextDocument)[] | undefined;
+
+  /**
+   * Whether service should use relevant document in prompt
+   * @public
+   */
+  useRelevantDocuments?: boolean | undefined;
+
+  /**
+   * Represents IDE provided list of workspace folders
+   * @public
+   */
+  workspaceFolders?: (string)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const EditorStateFilterSensitiveLog = (obj: EditorState): any => ({
+  ...obj,
+  ...(obj.document && { document:
+    TextDocumentFilterSensitiveLog(obj.document)
+  }),
+  ...(obj.cursorState && { cursorState:
+    obj.cursorState
+  }),
+  ...(obj.relevantDocuments && { relevantDocuments:
+    obj.relevantDocuments.map(
+      item =>
+      RelevantTextDocumentFilterSensitiveLog(item)
+    )
+  }),
+  ...(obj.workspaceFolders && { workspaceFolders:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * An environment variable
+ * @public
+ */
+export interface EnvironmentVariable {
+  /**
+   * The key of an environment variable
+   * @public
+   */
+  key?: string | undefined;
+
+  /**
+   * The value of an environment variable
+   * @public
+   */
+  value?: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const EnvironmentVariableFilterSensitiveLog = (obj: EnvironmentVariable): any => ({
+  ...obj,
+  ...(obj.key && { key:
+    SENSITIVE_STRING
+  }),
+  ...(obj.value && { value:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * State related to the user's environment
+ * @public
+ */
+export interface EnvState {
+  /**
+   * The name of the operating system in use
+   * @public
+   */
+  operatingSystem?: string | undefined;
+
+  /**
+   * The current working directory of the environment
+   * @public
+   */
+  currentWorkingDirectory?: string | undefined;
+
+  /**
+   * The environment variables set in the current environment
+   * @public
+   */
+  environmentVariables?: (EnvironmentVariable)[] | undefined;
+
+  /**
+   * Local timezone offset of the client. For more information, see documentation https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getTimezoneOffset
+   * @public
+   */
+  timezoneOffset?: number | undefined;
+}
+
+/**
+ * @internal
+ */
+export const EnvStateFilterSensitiveLog = (obj: EnvState): any => ({
+  ...obj,
+  ...(obj.currentWorkingDirectory && { currentWorkingDirectory:
+    SENSITIVE_STRING
+  }),
+  ...(obj.environmentVariables && { environmentVariables:
+    obj.environmentVariables.map(
+      item =>
+      EnvironmentVariableFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * State related to the Git VSC
+ * @public
+ */
+export interface GitState {
+  /**
+   * The output of the command `git status --porcelain=v1 -b`
+   * @public
+   */
+  status?: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const GitStateFilterSensitiveLog = (obj: GitState): any => ({
+  ...obj,
+  ...(obj.status && { status:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * An single entry in the shell history
+ * @public
+ */
+export interface ShellHistoryEntry {
+  /**
+   * The shell command that was run
+   * @public
+   */
+  command: string | undefined;
+
+  /**
+   * The directory the command was ran in
+   * @public
+   */
+  directory?: string | undefined;
+
+  /**
+   * The exit code of the command after it finished
+   * @public
+   */
+  exitCode?: number | undefined;
+
+  /**
+   * The stdout from the command
+   * @public
+   */
+  stdout?: string | undefined;
+
+  /**
+   * The stderr from the command
+   * @public
+   */
+  stderr?: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ShellHistoryEntryFilterSensitiveLog = (obj: ShellHistoryEntry): any => ({
+  ...obj,
+  ...(obj.command && { command:
+    SENSITIVE_STRING
+  }),
+  ...(obj.directory && { directory:
+    SENSITIVE_STRING
+  }),
+  ...(obj.stdout && { stdout:
+    SENSITIVE_STRING
+  }),
+  ...(obj.stderr && { stderr:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Represents the state of a shell
+ * @public
+ */
+export interface ShellState {
+  /**
+   * The name of the current shell
+   * @public
+   */
+  shellName: string | undefined;
+
+  /**
+   * The history previous shell commands for the current shell
+   * @public
+   */
+  shellHistory?: (ShellHistoryEntry)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ShellStateFilterSensitiveLog = (obj: ShellState): any => ({
+  ...obj,
+  ...(obj.shellHistory && { shellHistory:
+    obj.shellHistory.map(
+      item =>
+      ShellHistoryEntryFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * @public
+ */
+export type ToolResultContentBlock =
+  | ToolResultContentBlock.JsonMember
+  | ToolResultContentBlock.TextMember
+  | ToolResultContentBlock.$UnknownMember
+
+/**
+ * @public
+ */
+export namespace ToolResultContentBlock {
+
+  /**
+   * A tool result that is text.
+   * @public
+   */
+  export interface TextMember {
+    text: string;
+    json?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * A tool result that is JSON format data.
+   * @public
+   */
+  export interface JsonMember {
+    text?: never;
+    json: __DocumentType;
+    $unknown?: never;
+  }
+
+  /**
+   * @public
+   */
+  export interface $UnknownMember {
+    text?: never;
+    json?: never;
+    $unknown: [string, any];
+  }
+
+  export interface Visitor<T> {
+    text: (value: string) => T;
+    json: (value: __DocumentType) => T;
+    _: (name: string, value: any) => T;
+  }
+
+  export const visit = <T>(
+    value: ToolResultContentBlock,
+    visitor: Visitor<T>
+  ): T => {
+    if (value.text !== undefined) return visitor.text(value.text);
+    if (value.json !== undefined) return visitor.json(value.json);
+    return visitor._(value.$unknown[0], value.$unknown[1]);
+  }
+
+}
+/**
+ * @internal
+ */
+export const ToolResultContentBlockFilterSensitiveLog = (obj: ToolResultContentBlock): any => {
+  if (obj.text !== undefined) return {text:
+    SENSITIVE_STRING
+  };
+  if (obj.json !== undefined) return {json:
+    SENSITIVE_STRING
+  };
+  if (obj.$unknown !== undefined) return {[obj.$unknown[0]]: 'UNKNOWN'};
+}
+
+/**
+ * @public
+ * @enum
+ */
+export const ToolResultStatus = {
+  ERROR: "error",
+  SUCCESS: "success",
+} as const
+/**
+ * @public
+ */
+export type ToolResultStatus = typeof ToolResultStatus[keyof typeof ToolResultStatus]
+
+/**
+ * A tool result that contains the results for a tool request that was previously made.
+ * @public
+ */
+export interface ToolResult {
+  /**
+   * The ID for the tool request.
+   * @public
+   */
+  toolUseId: string | undefined;
+
+  /**
+   * Content of the tool result.
+   * @public
+   */
+  content: (ToolResultContentBlock)[] | undefined;
+
+  /**
+   * Status of the tools result.
+   * @public
+   */
+  status?: ToolResultStatus | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ToolResultFilterSensitiveLog = (obj: ToolResult): any => ({
+  ...obj,
+  ...(obj.content && { content:
+    obj.content.map(
+      item =>
+      ToolResultContentBlockFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * The input schema for the tool in JSON format.
+ * @public
+ */
+export interface ToolInputSchema {
+  json?: __DocumentType | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ToolInputSchemaFilterSensitiveLog = (obj: ToolInputSchema): any => ({
+  ...obj,
+  ...(obj.json && { json:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * The specification for the tool.
+ * @public
+ */
+export interface ToolSpecification {
+  /**
+   * The input schema for the tool in JSON format.
+   * @public
+   */
+  inputSchema: ToolInputSchema | undefined;
+
+  /**
+   * The name for the tool.
+   * @public
+   */
+  name: string | undefined;
+
+  /**
+   * The description for the tool.
+   * @public
+   */
+  description?: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ToolSpecificationFilterSensitiveLog = (obj: ToolSpecification): any => ({
+  ...obj,
+  ...(obj.inputSchema && { inputSchema:
+    ToolInputSchemaFilterSensitiveLog(obj.inputSchema)
+  }),
+  ...(obj.name && { name:
+    SENSITIVE_STRING
+  }),
+  ...(obj.description && { description:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Information about a tool that can be used.
+ * @public
+ */
+export type Tool =
+  | Tool.ToolSpecificationMember
+  | Tool.$UnknownMember
+
+/**
+ * @public
+ */
+export namespace Tool {
+
+  /**
+   * The specification for the tool.
+   * @public
+   */
+  export interface ToolSpecificationMember {
+    toolSpecification: ToolSpecification;
+    $unknown?: never;
+  }
+
+  /**
+   * @public
+   */
+  export interface $UnknownMember {
+    toolSpecification?: never;
+    $unknown: [string, any];
+  }
+
+  export interface Visitor<T> {
+    toolSpecification: (value: ToolSpecification) => T;
+    _: (name: string, value: any) => T;
+  }
+
+  export const visit = <T>(
+    value: Tool,
+    visitor: Visitor<T>
+  ): T => {
+    if (value.toolSpecification !== undefined) return visitor.toolSpecification(value.toolSpecification);
+    return visitor._(value.$unknown[0], value.$unknown[1]);
+  }
+
+}
+/**
+ * @internal
+ */
+export const ToolFilterSensitiveLog = (obj: Tool): any => {
+  if (obj.toolSpecification !== undefined) return {toolSpecification:
+    ToolSpecificationFilterSensitiveLog(obj.toolSpecification)
+  };
+  if (obj.$unknown !== undefined) return {[obj.$unknown[0]]: 'UNKNOWN'};
+}
+
+/**
+ * Settings information passed by the Q widget
+ * @public
+ */
+export interface UserSettings {
+  hasConsentedToCrossRegionCalls?: boolean | undefined;
+}
+
+/**
+ * Additional Chat message context associated with the Chat Message
+ * @public
+ */
+export interface UserInputMessageContext {
+  /**
+   * Editor state chat message context.
+   * @public
+   */
+  editorState?: EditorState | undefined;
+
+  /**
+   * Shell state chat message context.
+   * @public
+   */
+  shellState?: ShellState | undefined;
+
+  /**
+   * Git state chat message context.
+   * @public
+   */
+  gitState?: GitState | undefined;
+
+  /**
+   * Environment state chat message context.
+   * @public
+   */
+  envState?: EnvState | undefined;
+
+  /**
+   * The state of a user's AppStudio UI when sending a message.
+   * @public
+   */
+  appStudioContext?: AppStudioState | undefined;
+
+  /**
+   * Diagnostic chat message context.
+   * @public
+   */
+  diagnostic?: Diagnostic | undefined;
+
+  /**
+   * Contextual information about the environment from which the user is calling.
+   * @public
+   */
+  consoleState?: ConsoleState | undefined;
+
+  /**
+   * Settings information, e.g., whether the user has enabled cross-region API calls.
+   * @public
+   */
+  userSettings?: UserSettings | undefined;
+
+  /**
+   * List of additional contextual content entries that can be included with the message.
+   * @public
+   */
+  additionalContext?: (AdditionalContentEntry)[] | undefined;
+
+  /**
+   * ToolResults for the requested ToolUses.
+   * @public
+   */
+  toolResults?: (ToolResult)[] | undefined;
+
+  /**
+   * Tools that can be used.
+   * @public
+   */
+  tools?: (Tool)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const UserInputMessageContextFilterSensitiveLog = (obj: UserInputMessageContext): any => ({
+  ...obj,
+  ...(obj.editorState && { editorState:
+    EditorStateFilterSensitiveLog(obj.editorState)
+  }),
+  ...(obj.shellState && { shellState:
+    ShellStateFilterSensitiveLog(obj.shellState)
+  }),
+  ...(obj.gitState && { gitState:
+    GitStateFilterSensitiveLog(obj.gitState)
+  }),
+  ...(obj.envState && { envState:
+    EnvStateFilterSensitiveLog(obj.envState)
+  }),
+  ...(obj.appStudioContext && { appStudioContext:
+    AppStudioStateFilterSensitiveLog(obj.appStudioContext)
+  }),
+  ...(obj.diagnostic && { diagnostic:
+    DiagnosticFilterSensitiveLog(obj.diagnostic)
+  }),
+  ...(obj.consoleState && { consoleState:
+    ConsoleStateFilterSensitiveLog(obj.consoleState)
+  }),
+  ...(obj.additionalContext && { additionalContext:
+    obj.additionalContext.map(
+      item =>
+      AdditionalContentEntryFilterSensitiveLog(item)
+    )
+  }),
+  ...(obj.toolResults && { toolResults:
+    obj.toolResults.map(
+      item =>
+      ToolResultFilterSensitiveLog(item)
+    )
+  }),
+  ...(obj.tools && { tools:
+    obj.tools.map(
+      item =>
+      ToolFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * Structure to represent a chat input message from User.
+ * @public
+ */
+export interface UserInputMessage {
+  /**
+   * The content of the chat message.
+   * @public
+   */
+  content: string | undefined;
+
+  /**
+   * Chat message context associated with the Chat Message.
+   * @public
+   */
+  userInputMessageContext?: UserInputMessageContext | undefined;
+
+  /**
+   * User Intent.
+   * @public
+   */
+  userIntent?: UserIntent | undefined;
+
+  /**
+   * User Input Origin.
+   * @public
+   */
+  origin?: Origin | undefined;
+
+  /**
+   * Images associated with the Chat Message.
+   * @public
+   */
+  images?: (ImageBlock)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const UserInputMessageFilterSensitiveLog = (obj: UserInputMessage): any => ({
+  ...obj,
+  ...(obj.content && { content:
+    SENSITIVE_STRING
+  }),
+  ...(obj.userInputMessageContext && { userInputMessageContext:
+    UserInputMessageContextFilterSensitiveLog(obj.userInputMessageContext)
+  }),
+  ...(obj.images && { images:
+    obj.images.map(
+      item =>
+      ImageBlockFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * @public
+ */
+export type ChatMessage =
+  | ChatMessage.AssistantResponseMessageMember
+  | ChatMessage.UserInputMessageMember
+  | ChatMessage.$UnknownMember
+
+/**
+ * @public
+ */
+export namespace ChatMessage {
+
+  /**
+   * Structure to represent a chat input message from User.
+   * @public
+   */
+  export interface UserInputMessageMember {
+    userInputMessage: UserInputMessage;
+    assistantResponseMessage?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Markdown text message.
+   * @public
+   */
+  export interface AssistantResponseMessageMember {
+    userInputMessage?: never;
+    assistantResponseMessage: AssistantResponseMessage;
+    $unknown?: never;
+  }
+
+  /**
+   * @public
+   */
+  export interface $UnknownMember {
+    userInputMessage?: never;
+    assistantResponseMessage?: never;
+    $unknown: [string, any];
+  }
+
+  export interface Visitor<T> {
+    userInputMessage: (value: UserInputMessage) => T;
+    assistantResponseMessage: (value: AssistantResponseMessage) => T;
+    _: (name: string, value: any) => T;
+  }
+
+  export const visit = <T>(
+    value: ChatMessage,
+    visitor: Visitor<T>
+  ): T => {
+    if (value.userInputMessage !== undefined) return visitor.userInputMessage(value.userInputMessage);
+    if (value.assistantResponseMessage !== undefined) return visitor.assistantResponseMessage(value.assistantResponseMessage);
+    return visitor._(value.$unknown[0], value.$unknown[1]);
+  }
+
+}
+/**
+ * @internal
+ */
+export const ChatMessageFilterSensitiveLog = (obj: ChatMessage): any => {
+  if (obj.userInputMessage !== undefined) return {userInputMessage:
+    UserInputMessageFilterSensitiveLog(obj.userInputMessage)
+  };
+  if (obj.assistantResponseMessage !== undefined) return {assistantResponseMessage:
+    AssistantResponseMessageFilterSensitiveLog(obj.assistantResponseMessage)
+  };
+  if (obj.$unknown !== undefined) return {[obj.$unknown[0]]: 'UNKNOWN'};
+}
+
+/**
+ * Represents the target of a citation event
+ * @public
+ */
+export type CitationTarget =
+  | CitationTarget.LocationMember
+  | CitationTarget.RangeMember
+  | CitationTarget.$UnknownMember
+
+/**
+ * @public
+ */
+export namespace CitationTarget {
+
+  /**
+   * Represents a position in the response text where a citation should be added
+   * @public
+   */
+  export interface LocationMember {
+    location: number;
+    range?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Represents the range in the response text to be targetted by a citation
+   * @public
+   */
+  export interface RangeMember {
+    location?: never;
+    range: Span;
+    $unknown?: never;
+  }
+
+  /**
+   * @public
+   */
+  export interface $UnknownMember {
+    location?: never;
+    range?: never;
+    $unknown: [string, any];
+  }
+
+  export interface Visitor<T> {
+    location: (value: number) => T;
+    range: (value: Span) => T;
+    _: (name: string, value: any) => T;
+  }
+
+  export const visit = <T>(
+    value: CitationTarget,
+    visitor: Visitor<T>
+  ): T => {
+    if (value.location !== undefined) return visitor.location(value.location);
+    if (value.range !== undefined) return visitor.range(value.range);
+    return visitor._(value.$unknown[0], value.$unknown[1]);
+  }
+
+}
+
+/**
+ * Streaming response event for citations
+ * @public
+ */
+export interface CitationEvent {
+  /**
+   * The position or the range of the response text to be cited
+   * @public
+   */
+  target: CitationTarget | undefined;
+
+  /**
+   * The text inside the citation '1' in [1]
+   * @public
+   */
+  citationText?: string | undefined;
+
+  /**
+   * The link to the document being cited
+   * @public
+   */
+  citationLink: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const CitationEventFilterSensitiveLog = (obj: CitationEvent): any => ({
+  ...obj,
+  ...(obj.target && { target:
+    obj.target
+  }),
+  ...(obj.citationText && { citationText:
+    SENSITIVE_STRING
+  }),
+  ...(obj.citationLink && { citationLink:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Streaming response event for generated code text.
+ * @public
+ */
+export interface CodeEvent {
+  /**
+   * Generated code snippet.
+   * @public
+   */
+  content: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const CodeEventFilterSensitiveLog = (obj: CodeEvent): any => ({
+  ...obj,
+  ...(obj.content && { content:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Streaming Response Event for CodeReferences
+ * @public
+ */
+export interface CodeReferenceEvent {
+  /**
+   * Code References for Assistant Response Message
+   * @public
+   */
+  references?: (Reference)[] | undefined;
+}
+
+/**
+ * Streaming Response Event when DryRun is succeessful
+ * @public
+ */
+export interface DryRunSucceedEvent {
+}
+
+/**
+ * Streaming Response Event for Followup Prompt.
+ * @public
+ */
+export interface FollowupPromptEvent {
+  /**
+   * Followup Prompt for the Assistant Response
+   * @public
+   */
+  followupPrompt?: FollowupPrompt | undefined;
+}
+
+/**
+ * @internal
+ */
+export const FollowupPromptEventFilterSensitiveLog = (obj: FollowupPromptEvent): any => ({
+  ...obj,
+  ...(obj.followupPrompt && { followupPrompt:
+    FollowupPromptFilterSensitiveLog(obj.followupPrompt)
+  }),
+})
+
+/**
+ * @public
+ * @enum
+ */
+export const IntentType = {
+  GLUE_SENSEI: "GLUE_SENSEI",
+  RESOURCE_DATA: "RESOURCE_DATA",
+  SUPPORT: "SUPPORT",
+} as const
+/**
+ * @public
+ */
+export type IntentType = typeof IntentType[keyof typeof IntentType]
+
+/**
+ * @public
+ */
+export type IntentDataType =
+  | IntentDataType.StringMember
+  | IntentDataType.$UnknownMember
+
+/**
+ * @public
+ */
+export namespace IntentDataType {
+
+  export interface StringMember {
+    string: string;
+    $unknown?: never;
+  }
+
+  /**
+   * @public
+   */
+  export interface $UnknownMember {
+    string?: never;
+    $unknown: [string, any];
+  }
+
+  export interface Visitor<T> {
+    string: (value: string) => T;
+    _: (name: string, value: any) => T;
+  }
+
+  export const visit = <T>(
+    value: IntentDataType,
+    visitor: Visitor<T>
+  ): T => {
+    if (value.string !== undefined) return visitor.string(value.string);
+    return visitor._(value.$unknown[0], value.$unknown[1]);
+  }
+
+}
+
+/**
+ * Streaming Response Event for Intents
+ * @public
+ */
+export interface IntentsEvent {
+  /**
+   * A map of Intent objects
+   * @public
+   */
+  intents?: Partial<Record<IntentType, Record<string, IntentDataType>>> | undefined;
+}
+
+/**
+ * @internal
+ */
+export const IntentsEventFilterSensitiveLog = (obj: IntentsEvent): any => ({
+  ...obj,
+  ...(obj.intents && { intents:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * For CloudWatch Troubleshooting Link Module
+ * @public
+ */
+export interface CloudWatchTroubleshootingLink {
+  /**
+   * A label for the link.
+   * @public
+   */
+  label: string | undefined;
+
+  /**
+   * Stringified JSON payload. See spec here https://code.amazon.com/packages/CloudWatchOdysseyModel/blobs/50c0832f0e393e4ab68827eb4f04d832366821c1/--/model/events.smithy#L28 .
+   * @public
+   */
+  investigationPayload: string | undefined;
+
+  /**
+   * Fallback string, if target channel does not support the CloudWatchTroubleshootingLink.
+   * @public
+   */
+  defaultText?: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const CloudWatchTroubleshootingLinkFilterSensitiveLog = (obj: CloudWatchTroubleshootingLink): any => ({
+  ...obj,
+  ...(obj.label && { label:
+    SENSITIVE_STRING
+  }),
+  ...(obj.investigationPayload && { investigationPayload:
+    SENSITIVE_STRING
+  }),
+  ...(obj.defaultText && { defaultText:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * @public
+ */
+export interface ModuleLink {
+  /**
+   * For CloudWatch Troubleshooting Link Module
+   * @public
+   */
+  cloudWatchTroubleshootingLink?: CloudWatchTroubleshootingLink | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ModuleLinkFilterSensitiveLog = (obj: ModuleLink): any => ({
+  ...obj,
+  ...(obj.cloudWatchTroubleshootingLink && { cloudWatchTroubleshootingLink:
+    CloudWatchTroubleshootingLinkFilterSensitiveLog(obj.cloudWatchTroubleshootingLink)
+  }),
+})
+
+/**
+ * @public
+ */
+export interface WebLink {
+  /**
+   * A label for the link
+   * @public
+   */
+  label: string | undefined;
+
+  /**
+   * URL of the Weblink
+   * @public
+   */
+  url: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const WebLinkFilterSensitiveLog = (obj: WebLink): any => ({
+  ...obj,
+  ...(obj.label && { label:
+    SENSITIVE_STRING
+  }),
+  ...(obj.url && { url:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * @public
+ */
+export interface Action {
+  webLink?: WebLink | undefined;
+  moduleLink?: ModuleLink | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ActionFilterSensitiveLog = (obj: Action): any => ({
+  ...obj,
+  ...(obj.webLink && { webLink:
+    WebLinkFilterSensitiveLog(obj.webLink)
+  }),
+  ...(obj.moduleLink && { moduleLink:
+    ModuleLinkFilterSensitiveLog(obj.moduleLink)
+  }),
+})
+
+/**
+ * Structure representing a simple text component with sensitive content, which can include Markdown formatting.
+ * @public
+ */
+export interface Text {
+  /**
+   * Contains text content that may include sensitive information and can support Markdown formatting.
+   * @public
+   */
+  content: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const TextFilterSensitiveLog = (obj: Text): any => ({
+  ...obj,
+  ...(obj.content && { content:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * @public
+ */
+export interface AlertComponent {
+  /**
+   * Structure representing a simple text component with sensitive content, which can include Markdown formatting.
+   * @public
+   */
+  text?: Text | undefined;
+}
+
+/**
+ * @internal
+ */
+export const AlertComponentFilterSensitiveLog = (obj: AlertComponent): any => ({
+  ...obj,
+  ...(obj.text && { text:
+    TextFilterSensitiveLog(obj.text)
+  }),
+})
+
+/**
+ * @public
+ * @enum
+ */
+export const AlertType = {
+  /**
+   * Alert indicating an error or failure that requires attention.
+   */
+  ERROR: "ERROR",
+  /**
+   * Informational alert providing general information.
+   */
+  INFO: "INFO",
+  /**
+   * Alert indicating a warning or potential issue that should be noted.
+   */
+  WARNING: "WARNING",
+} as const
+/**
+ * @public
+ */
+export type AlertType = typeof AlertType[keyof typeof AlertType]
+
+/**
+ * Structure representing an alert with a type and content.
+ * @public
+ */
+export interface Alert {
+  /**
+   * Enum defining types of alerts that can be issued.
+   * @public
+   */
+  type: AlertType | undefined;
+
+  /**
+   * Contains the content of the alert, which may include sensitive information.
+   * @public
+   */
+  content: (AlertComponent)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const AlertFilterSensitiveLog = (obj: Alert): any => ({
+  ...obj,
+  ...(obj.content && { content:
+    obj.content.map(
+      item =>
+      AlertComponentFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * Structure describing a transition between two states in an infrastructure update.
+ * @public
+ */
+export interface InfrastructureUpdateTransition {
+  /**
+   * The current state of the infrastructure before the update.
+   * @public
+   */
+  currentState: string | undefined;
+
+  /**
+   * The next state of the infrastructure following the update.
+   * @public
+   */
+  nextState: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const InfrastructureUpdateTransitionFilterSensitiveLog = (obj: InfrastructureUpdateTransition): any => ({
+  ...obj,
+  ...(obj.currentState && { currentState:
+    SENSITIVE_STRING
+  }),
+  ...(obj.nextState && { nextState:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Structure representing different types of infrastructure updates.
+ * @public
+ */
+export interface InfrastructureUpdate {
+  /**
+   * Structure describing a transition between two states in an infrastructure update.
+   * @public
+   */
+  transition?: InfrastructureUpdateTransition | undefined;
+}
+
+/**
+ * @internal
+ */
+export const InfrastructureUpdateFilterSensitiveLog = (obj: InfrastructureUpdate): any => ({
+  ...obj,
+  ...(obj.transition && { transition:
+    InfrastructureUpdateTransitionFilterSensitiveLog(obj.transition)
+  }),
+})
+
+/**
+ * @public
+ */
+export interface StepComponent {
+  /**
+   * Structure representing a simple text component with sensitive content, which can include Markdown formatting.
+   * @public
+   */
+  text?: Text | undefined;
+}
+
+/**
+ * @internal
+ */
+export const StepComponentFilterSensitiveLog = (obj: StepComponent): any => ({
+  ...obj,
+  ...(obj.text && { text:
+    TextFilterSensitiveLog(obj.text)
+  }),
+})
+
+/**
+ * @public
+ * @enum
+ */
+export const StepState = {
+  /**
+   * Indicates a failure or issue that needs to be addressed.
+   */
+  FAILED: "FAILED",
+  /**
+   * Indicates that the step is currently being processed. This is a non-terminal state, meaning the process is active and ongoing.
+   */
+  IN_PROGRESS: "IN_PROGRESS",
+  /**
+   * Indicates that the step is being loaded or initialized. This is a non-terminal state, meaning the process is in the setup phase.
+   */
+  LOADING: "LOADING",
+  /**
+   * Indicates that the step is temporarily halted but can resume. This is a non-terminal state, representing a temporary pause.
+   */
+  PAUSED: "PAUSED",
+  /**
+   * Indicates that the step is waiting for some condition or input. This is a non-terminal state, meaning the process is paused but not complete.
+   */
+  PENDING: "PENDING",
+  /**
+   * Indicates that the step was stopped, either intentionally or unintentionally.
+   */
+  STOPPED: "STOPPED",
+  /**
+   * Indicates successful completion of the step.
+   */
+  SUCCEEDED: "SUCCEEDED",
+} as const
+/**
+ * @public
+ */
+export type StepState = typeof StepState[keyof typeof StepState]
+
+/**
+ * Structure representing an individual step in a process.
+ * @public
+ */
+export interface Step {
+  /**
+   * A unique identifier for the step. It must be a non-negative integer to ensure each step is distinct.
+   * @public
+   */
+  id: number | undefined;
+
+  /**
+   * Enum representing all possible step states, combining terminal and non-terminal states.
+   * @public
+   */
+  state: StepState | undefined;
+
+  /**
+   * A label for the step, providing a concise description.
+   * @public
+   */
+  label: string | undefined;
+
+  /**
+   * Optional content providing additional details about the step.
+   * @public
+   */
+  content?: (StepComponent)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const StepFilterSensitiveLog = (obj: Step): any => ({
+  ...obj,
+  ...(obj.label && { label:
+    SENSITIVE_STRING
+  }),
+  ...(obj.content && { content:
+    obj.content.map(
+      item =>
+      StepComponentFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * @public
+ */
+export interface ProgressComponent {
+  /**
+   * Structure representing an individual step in a process.
+   * @public
+   */
+  step?: Step | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ProgressComponentFilterSensitiveLog = (obj: ProgressComponent): any => ({
+  ...obj,
+  ...(obj.step && { step:
+    StepFilterSensitiveLog(obj.step)
+  }),
+})
+
+/**
+ * Structure representing a collection of steps in a process.
+ * @public
+ */
+export interface Progress {
+  /**
+   * A collection of steps that make up a process. Each step is detailed using the Step structure.
+   * @public
+   */
+  content: (ProgressComponent)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ProgressFilterSensitiveLog = (obj: Progress): any => ({
+  ...obj,
+  ...(obj.content && { content:
+    obj.content.map(
+      item =>
+      ProgressComponentFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * Structure representing a resource item
+ * @public
+ */
+export interface Resource {
+  /**
+   * Card title.
+   * @public
+   */
+  title: string | undefined;
+
+  /**
+   * Link for the resource item
+   * @public
+   */
+  link: string | undefined;
+
+  /**
+   * Short text about that resource for example Region: us-east-1
+   * @public
+   */
+  description: string | undefined;
+
+  /**
+   * Resource type e.g AWS EC2
+   * @public
+   */
+  type: string | undefined;
+
+  /**
+   * Amazon resource number e.g arn:aws:aec:.....
+   * @public
+   */
+  ARN: string | undefined;
+
+  /**
+   * A stringified object
+   * @public
+   */
+  resourceJsonString: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ResourceFilterSensitiveLog = (obj: Resource): any => ({
+  ...obj,
+  ...(obj.title && { title:
+    SENSITIVE_STRING
+  }),
+  ...(obj.link && { link:
+    SENSITIVE_STRING
+  }),
+  ...(obj.description && { description:
+    SENSITIVE_STRING
+  }),
+  ...(obj.type && { type:
+    SENSITIVE_STRING
+  }),
+  ...(obj.ARN && { ARN:
+    SENSITIVE_STRING
+  }),
+  ...(obj.resourceJsonString && { resourceJsonString:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Structure representing a list of Items
+ * @public
+ */
+export interface ResourceList {
+  /**
+   * Action associated with the list
+   * @public
+   */
+  action?: Action | undefined;
+
+  /**
+   * List of resources
+   * @public
+   */
+  items: (Resource)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ResourceListFilterSensitiveLog = (obj: ResourceList): any => ({
+  ...obj,
+  ...(obj.action && { action:
+    ActionFilterSensitiveLog(obj.action)
+  }),
+  ...(obj.items && { items:
+    obj.items.map(
+      item =>
+      ResourceFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * @public
+ */
+export interface SectionComponent {
+  /**
+   * Structure representing a simple text component with sensitive content, which can include Markdown formatting.
+   * @public
+   */
+  text?: Text | undefined;
+
+  /**
+   * Structure representing an alert with a type and content.
+   * @public
+   */
+  alert?: Alert | undefined;
+
+  /**
+   * Structure representing a resource item
+   * @public
+   */
+  resource?: Resource | undefined;
+
+  /**
+   * Structure representing a list of Items
+   * @public
+   */
+  resourceList?: ResourceList | undefined;
+}
+
+/**
+ * @internal
+ */
+export const SectionComponentFilterSensitiveLog = (obj: SectionComponent): any => ({
+  ...obj,
+  ...(obj.text && { text:
+    TextFilterSensitiveLog(obj.text)
+  }),
+  ...(obj.alert && { alert:
+    AlertFilterSensitiveLog(obj.alert)
+  }),
+  ...(obj.resource && { resource:
+    ResourceFilterSensitiveLog(obj.resource)
+  }),
+  ...(obj.resourceList && { resourceList:
+    ResourceListFilterSensitiveLog(obj.resourceList)
+  }),
+})
+
+/**
+ * Structure representing a collapsable section
+ * @public
+ */
+export interface Section {
+  /**
+   * Contains text content that may include sensitive information and can support Markdown formatting.
+   * @public
+   */
+  title: string | undefined;
+
+  /**
+   * Contains a list of interaction components e.g Text, Alert, List, etc.
+   * @public
+   */
+  content: (SectionComponent)[] | undefined;
+
+  /**
+   * Action associated with the Section
+   * @public
+   */
+  action?: Action | undefined;
+}
+
+/**
+ * @internal
+ */
+export const SectionFilterSensitiveLog = (obj: Section): any => ({
+  ...obj,
+  ...(obj.title && { title:
+    SENSITIVE_STRING
+  }),
+  ...(obj.content && { content:
+    obj.content.map(
+      item =>
+      SectionComponentFilterSensitiveLog(item)
+    )
+  }),
+  ...(obj.action && { action:
+    ActionFilterSensitiveLog(obj.action)
+  }),
+})
+
+/**
+ * Structure representing a suggestion for follow-ups.
+ * @public
+ */
+export interface Suggestion {
+  value: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const SuggestionFilterSensitiveLog = (obj: Suggestion): any => ({
+  ...obj,
+  ...(obj.value && { value:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Structure containing a list of suggestions.
+ * @public
+ */
+export interface Suggestions {
+  items: (Suggestion)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const SuggestionsFilterSensitiveLog = (obj: Suggestions): any => ({
+  ...obj,
+  ...(obj.items && { items:
+    obj.items.map(
+      item =>
+      SuggestionFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * Structure representing a confirmation message related to a task action.
+ * @public
+ */
+export interface TaskActionConfirmation {
+  /**
+   * Confirmation message related to the action note, which may include sensitive information.
+   * @public
+   */
+  content?: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const TaskActionConfirmationFilterSensitiveLog = (obj: TaskActionConfirmation): any => ({
+  ...obj,
+  ...(obj.content && { content:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * @public
+ * @enum
+ */
+export const TaskActionNoteType = {
+  /**
+   * Information note providing general details.
+   */
+  INFO: "INFO",
+  /**
+   * Warning note indicating a potential issue.
+   */
+  WARNING: "WARNING",
+} as const
+/**
+ * @public
+ */
+export type TaskActionNoteType = typeof TaskActionNoteType[keyof typeof TaskActionNoteType]
+
+/**
+ * Structure representing a note associated with a task action.
+ * @public
+ */
+export interface TaskActionNote {
+  /**
+   * Content of the note, which may include sensitive information.
+   * @public
+   */
+  content: string | undefined;
+
+  /**
+   * Enum defining the types of notes that can be associated with a task action.
+   * @public
+   */
+  type?: TaskActionNoteType | undefined;
+}
+
+/**
+ * @internal
+ */
+export const TaskActionNoteFilterSensitiveLog = (obj: TaskActionNote): any => ({
+  ...obj,
+  ...(obj.content && { content:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Structure representing an action associated with a task.
+ * @public
+ */
+export interface TaskAction {
+  /**
+   * A label for the action.
+   * @public
+   */
+  label: string | undefined;
+
+  /**
+   * Structure representing a note associated with a task action.
+   * @public
+   */
+  note?: TaskActionNote | undefined;
+
+  /**
+   * Indicates whether the action is primary or not.
+   * @public
+   */
+  primary?: boolean | undefined;
+
+  /**
+   * Indicates whether the action is disabled or not.
+   * @public
+   */
+  disabled?: boolean | undefined;
+
+  /**
+   * Map representing key-value pairs for the payload of a task action.
+   * @public
+   */
+  payload: Record<string, string> | undefined;
+
+  /**
+   * Structure representing a confirmation message related to a task action.
+   * @public
+   */
+  confirmation?: TaskActionConfirmation | undefined;
+}
+
+/**
+ * @internal
+ */
+export const TaskActionFilterSensitiveLog = (obj: TaskAction): any => ({
+  ...obj,
+  ...(obj.label && { label:
+    SENSITIVE_STRING
+  }),
+  ...(obj.note && { note:
+    TaskActionNoteFilterSensitiveLog(obj.note)
+  }),
+  ...(obj.payload && { payload:
+    SENSITIVE_STRING
+  }),
+  ...(obj.confirmation && { confirmation:
+    TaskActionConfirmationFilterSensitiveLog(obj.confirmation)
+  }),
+})
+
+/**
+ * Structure representing different types of components that can be part of a task.
+ * @public
+ */
+export interface TaskComponent {
+  /**
+   * Structure representing a simple text component with sensitive content, which can include Markdown formatting.
+   * @public
+   */
+  text?: Text | undefined;
+
+  /**
+   * Structure representing different types of infrastructure updates.
+   * @public
+   */
+  infrastructureUpdate?: InfrastructureUpdate | undefined;
+
+  /**
+   * Structure representing an alert with a type and content.
+   * @public
+   */
+  alert?: Alert | undefined;
+
+  /**
+   * Structure representing a collection of steps in a process.
+   * @public
+   */
+  progress?: Progress | undefined;
+}
+
+/**
+ * @internal
+ */
+export const TaskComponentFilterSensitiveLog = (obj: TaskComponent): any => ({
+  ...obj,
+  ...(obj.text && { text:
+    TextFilterSensitiveLog(obj.text)
+  }),
+  ...(obj.infrastructureUpdate && { infrastructureUpdate:
+    InfrastructureUpdateFilterSensitiveLog(obj.infrastructureUpdate)
+  }),
+  ...(obj.alert && { alert:
+    AlertFilterSensitiveLog(obj.alert)
+  }),
+  ...(obj.progress && { progress:
+    ProgressFilterSensitiveLog(obj.progress)
+  }),
+})
+
+/**
+ * Structure representing an overview of a task, including a label and description.
+ * @public
+ */
+export interface TaskOverview {
+  /**
+   * A label for the task overview.
+   * @public
+   */
+  label: string | undefined;
+
+  /**
+   * Text description providing details about the task. This field may include sensitive information and supports Markdown formatting.
+   * @public
+   */
+  description: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const TaskOverviewFilterSensitiveLog = (obj: TaskOverview): any => ({
+  ...obj,
+  ...(obj.label && { label:
+    SENSITIVE_STRING
+  }),
+  ...(obj.description && { description:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Structure containing details about a task.
+ * @public
+ */
+export interface TaskDetails {
+  /**
+   * Structure representing an overview of a task, including a label and description.
+   * @public
+   */
+  overview: TaskOverview | undefined;
+
+  /**
+   * Lists the components that can be used to form the task's content.
+   * @public
+   */
+  content: (TaskComponent)[] | undefined;
+
+  /**
+   * Optional list of actions associated with the task.
+   * @public
+   */
+  actions?: (TaskAction)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const TaskDetailsFilterSensitiveLog = (obj: TaskDetails): any => ({
+  ...obj,
+  ...(obj.overview && { overview:
+    TaskOverviewFilterSensitiveLog(obj.overview)
+  }),
+  ...(obj.content && { content:
+    obj.content.map(
+      item =>
+      TaskComponentFilterSensitiveLog(item)
+    )
+  }),
+  ...(obj.actions && { actions:
+    obj.actions.map(
+      item =>
+      TaskActionFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * Structure representing a reference to a task.
+ * @public
+ */
+export interface TaskReference {
+  /**
+   * Unique identifier for the task.
+   * @public
+   */
+  taskId: string | undefined;
+}
+
+/**
+ * Structure representing different types of interaction components.
+ * @public
+ */
+export interface InteractionComponent {
+  /**
+   * Structure representing a simple text component with sensitive content, which can include Markdown formatting.
+   * @public
+   */
+  text?: Text | undefined;
+
+  /**
+   * Structure representing an alert with a type and content.
+   * @public
+   */
+  alert?: Alert | undefined;
+
+  /**
+   * Structure representing different types of infrastructure updates.
+   * @public
+   */
+  infrastructureUpdate?: InfrastructureUpdate | undefined;
+
+  /**
+   * Structure representing a collection of steps in a process.
+   * @public
+   */
+  progress?: Progress | undefined;
+
+  /**
+   * Structure representing an individual step in a process.
+   * @public
+   */
+  step?: Step | undefined;
+
+  /**
+   * Structure containing details about a task.
+   * @public
+   */
+  taskDetails?: TaskDetails | undefined;
+
+  /**
+   * Structure representing a reference to a task.
+   * @public
+   */
+  taskReference?: TaskReference | undefined;
+
+  /**
+   * Structure containing a list of suggestions.
+   * @public
+   */
+  suggestions?: Suggestions | undefined;
+
+  /**
+   * Structure representing a collapsable section
+   * @public
+   */
+  section?: Section | undefined;
+
+  /**
+   * Structure representing a resource item
+   * @public
+   */
+  resource?: Resource | undefined;
+
+  /**
+   * Structure representing a list of Items
+   * @public
+   */
+  resourceList?: ResourceList | undefined;
+
+  action?: Action | undefined;
+}
+
+/**
+ * @internal
+ */
+export const InteractionComponentFilterSensitiveLog = (obj: InteractionComponent): any => ({
+  ...obj,
+  ...(obj.text && { text:
+    TextFilterSensitiveLog(obj.text)
+  }),
+  ...(obj.alert && { alert:
+    AlertFilterSensitiveLog(obj.alert)
+  }),
+  ...(obj.infrastructureUpdate && { infrastructureUpdate:
+    InfrastructureUpdateFilterSensitiveLog(obj.infrastructureUpdate)
+  }),
+  ...(obj.progress && { progress:
+    ProgressFilterSensitiveLog(obj.progress)
+  }),
+  ...(obj.step && { step:
+    StepFilterSensitiveLog(obj.step)
+  }),
+  ...(obj.taskDetails && { taskDetails:
+    TaskDetailsFilterSensitiveLog(obj.taskDetails)
+  }),
+  ...(obj.suggestions && { suggestions:
+    SuggestionsFilterSensitiveLog(obj.suggestions)
+  }),
+  ...(obj.section && { section:
+    SectionFilterSensitiveLog(obj.section)
+  }),
+  ...(obj.resource && { resource:
+    ResourceFilterSensitiveLog(obj.resource)
+  }),
+  ...(obj.resourceList && { resourceList:
+    ResourceListFilterSensitiveLog(obj.resourceList)
+  }),
+  ...(obj.action && { action:
+    ActionFilterSensitiveLog(obj.action)
+  }),
+})
+
+/**
+ * Interaction component with an identifier
+ * @public
+ */
+export interface InteractionComponentEntry {
+  /**
+   * Identifier that can uniquely identify the interaction component within
+   *         stream response. This field is optional.
+   * @public
+   */
+  interactionComponentId?: string | undefined;
+
+  /**
+   * Interaction component
+   * @public
+   */
+  interactionComponent: InteractionComponent | undefined;
+}
+
+/**
+ * @internal
+ */
+export const InteractionComponentEntryFilterSensitiveLog = (obj: InteractionComponentEntry): any => ({
+  ...obj,
+  ...(obj.interactionComponent && { interactionComponent:
+    InteractionComponentFilterSensitiveLog(obj.interactionComponent)
+  }),
+})
+
+/**
+ * Streaming Event for interaction components list
+ * @public
+ */
+export interface InteractionComponentsEvent {
+  /**
+   * List of identifiable interaction components
+   * @public
+   */
+  interactionComponentEntries: (InteractionComponentEntry)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const InteractionComponentsEventFilterSensitiveLog = (obj: InteractionComponentsEvent): any => ({
+  ...obj,
+  ...(obj.interactionComponentEntries && { interactionComponentEntries:
+    obj.interactionComponentEntries.map(
+      item =>
+      InteractionComponentEntryFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * @public
+ * @enum
+ */
+export const InvalidStateReason = {
+  INVALID_TASK_ASSIST_PLAN: "INVALID_TASK_ASSIST_PLAN",
+} as const
+/**
+ * @public
+ */
+export type InvalidStateReason = typeof InvalidStateReason[keyof typeof InvalidStateReason]
+
+/**
+ * Streaming Response Event when an Invalid State is reached
+ * @public
+ */
+export interface InvalidStateEvent {
+  /**
+   * Reasons for Invalid State Event
+   * @public
+   */
+  reason: InvalidStateReason | undefined;
+
+  message: string | undefined;
+}
+
+/**
+ * Streaming Response Event for AssistantResponse Metadata
+ * @public
+ */
+export interface MessageMetadataEvent {
+  /**
+   * Unique identifier for the conversation
+   * @public
+   */
+  conversationId?: string | undefined;
+
+  /**
+   * Unique identifier for the utterance
+   * @public
+   */
+  utteranceId?: string | undefined;
+}
+
+/**
+ * Streaming Response Event for SupplementaryWebLinks
+ * @public
+ */
+export interface SupplementaryWebLinksEvent {
+  /**
+   * Web References for Assistant Response Message
+   * @public
+   */
+  supplementaryWebLinks?: (SupplementaryWebLink)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const SupplementaryWebLinksEventFilterSensitiveLog = (obj: SupplementaryWebLinksEvent): any => ({
+  ...obj,
+  ...(obj.supplementaryWebLinks && { supplementaryWebLinks:
+    obj.supplementaryWebLinks.map(
+      item =>
+      SupplementaryWebLinkFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * Event for a ToolUse request. Multiple ToolUse requests can be returned from a single request, so each ToolUse has a unique 'toolUseId'.
+ * @public
+ */
+export interface ToolUseEvent {
+  /**
+   * The ID for the tool request.
+   * @public
+   */
+  toolUseId: string | undefined;
+
+  /**
+   * The name for the tool.
+   * @public
+   */
+  name: string | undefined;
+
+  /**
+   * Represents the serialized json input for the ToolUse request. This field should be concatenated until 'stop' is true.
+   * @public
+   */
+  input?: string | undefined;
+
+  /**
+   * This field is true when all of the serialized input for this ToolUse request has been sent.
+   * @public
+   */
+  stop?: boolean | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ToolUseEventFilterSensitiveLog = (obj: ToolUseEvent): any => ({
+  ...obj,
+  ...(obj.name && { name:
+    SENSITIVE_STRING
+  }),
+  ...(obj.input && { input:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Streaming events from UniDirectional Streaming Conversational APIs.
+ * @public
+ */
+export type ChatResponseStream =
+  | ChatResponseStream.AssistantResponseEventMember
+  | ChatResponseStream.CitationEventMember
+  | ChatResponseStream.CodeEventMember
+  | ChatResponseStream.CodeReferenceEventMember
+  | ChatResponseStream.DryRunSucceedEventMember
+  | ChatResponseStream.ErrorMember
+  | ChatResponseStream.FollowupPromptEventMember
+  | ChatResponseStream.IntentsEventMember
+  | ChatResponseStream.InteractionComponentsEventMember
+  | ChatResponseStream.InvalidStateEventMember
+  | ChatResponseStream.MessageMetadataEventMember
+  | ChatResponseStream.SupplementaryWebLinksEventMember
+  | ChatResponseStream.ToolUseEventMember
+  | ChatResponseStream.$UnknownMember
+
+/**
+ * @public
+ */
+export namespace ChatResponseStream {
+
+  /**
+   * Message Metadata event
+   * @public
+   */
+  export interface MessageMetadataEventMember {
+    messageMetadataEvent: MessageMetadataEvent;
+    assistantResponseEvent?: never;
+    dryRunSucceedEvent?: never;
+    codeReferenceEvent?: never;
+    supplementaryWebLinksEvent?: never;
+    followupPromptEvent?: never;
+    codeEvent?: never;
+    intentsEvent?: never;
+    interactionComponentsEvent?: never;
+    toolUseEvent?: never;
+    citationEvent?: never;
+    invalidStateEvent?: never;
+    error?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Assistant response event - Text / Code snippet
+   * @public
+   */
+  export interface AssistantResponseEventMember {
+    messageMetadataEvent?: never;
+    assistantResponseEvent: AssistantResponseEvent;
+    dryRunSucceedEvent?: never;
+    codeReferenceEvent?: never;
+    supplementaryWebLinksEvent?: never;
+    followupPromptEvent?: never;
+    codeEvent?: never;
+    intentsEvent?: never;
+    interactionComponentsEvent?: never;
+    toolUseEvent?: never;
+    citationEvent?: never;
+    invalidStateEvent?: never;
+    error?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * DryRun Succeed Event
+   * @public
+   */
+  export interface DryRunSucceedEventMember {
+    messageMetadataEvent?: never;
+    assistantResponseEvent?: never;
+    dryRunSucceedEvent: DryRunSucceedEvent;
+    codeReferenceEvent?: never;
+    supplementaryWebLinksEvent?: never;
+    followupPromptEvent?: never;
+    codeEvent?: never;
+    intentsEvent?: never;
+    interactionComponentsEvent?: never;
+    toolUseEvent?: never;
+    citationEvent?: never;
+    invalidStateEvent?: never;
+    error?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Code References event
+   * @public
+   */
+  export interface CodeReferenceEventMember {
+    messageMetadataEvent?: never;
+    assistantResponseEvent?: never;
+    dryRunSucceedEvent?: never;
+    codeReferenceEvent: CodeReferenceEvent;
+    supplementaryWebLinksEvent?: never;
+    followupPromptEvent?: never;
+    codeEvent?: never;
+    intentsEvent?: never;
+    interactionComponentsEvent?: never;
+    toolUseEvent?: never;
+    citationEvent?: never;
+    invalidStateEvent?: never;
+    error?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Web Reference links event
+   * @public
+   */
+  export interface SupplementaryWebLinksEventMember {
+    messageMetadataEvent?: never;
+    assistantResponseEvent?: never;
+    dryRunSucceedEvent?: never;
+    codeReferenceEvent?: never;
+    supplementaryWebLinksEvent: SupplementaryWebLinksEvent;
+    followupPromptEvent?: never;
+    codeEvent?: never;
+    intentsEvent?: never;
+    interactionComponentsEvent?: never;
+    toolUseEvent?: never;
+    citationEvent?: never;
+    invalidStateEvent?: never;
+    error?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Followup prompt event
+   * @public
+   */
+  export interface FollowupPromptEventMember {
+    messageMetadataEvent?: never;
+    assistantResponseEvent?: never;
+    dryRunSucceedEvent?: never;
+    codeReferenceEvent?: never;
+    supplementaryWebLinksEvent?: never;
+    followupPromptEvent: FollowupPromptEvent;
+    codeEvent?: never;
+    intentsEvent?: never;
+    interactionComponentsEvent?: never;
+    toolUseEvent?: never;
+    citationEvent?: never;
+    invalidStateEvent?: never;
+    error?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Code Generated event
+   * @public
+   */
+  export interface CodeEventMember {
+    messageMetadataEvent?: never;
+    assistantResponseEvent?: never;
+    dryRunSucceedEvent?: never;
+    codeReferenceEvent?: never;
+    supplementaryWebLinksEvent?: never;
+    followupPromptEvent?: never;
+    codeEvent: CodeEvent;
+    intentsEvent?: never;
+    interactionComponentsEvent?: never;
+    toolUseEvent?: never;
+    citationEvent?: never;
+    invalidStateEvent?: never;
+    error?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Intents event
+   * @public
+   */
+  export interface IntentsEventMember {
+    messageMetadataEvent?: never;
+    assistantResponseEvent?: never;
+    dryRunSucceedEvent?: never;
+    codeReferenceEvent?: never;
+    supplementaryWebLinksEvent?: never;
+    followupPromptEvent?: never;
+    codeEvent?: never;
+    intentsEvent: IntentsEvent;
+    interactionComponentsEvent?: never;
+    toolUseEvent?: never;
+    citationEvent?: never;
+    invalidStateEvent?: never;
+    error?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Interactions components event
+   * @public
+   */
+  export interface InteractionComponentsEventMember {
+    messageMetadataEvent?: never;
+    assistantResponseEvent?: never;
+    dryRunSucceedEvent?: never;
+    codeReferenceEvent?: never;
+    supplementaryWebLinksEvent?: never;
+    followupPromptEvent?: never;
+    codeEvent?: never;
+    intentsEvent?: never;
+    interactionComponentsEvent: InteractionComponentsEvent;
+    toolUseEvent?: never;
+    citationEvent?: never;
+    invalidStateEvent?: never;
+    error?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * ToolUse event
+   * @public
+   */
+  export interface ToolUseEventMember {
+    messageMetadataEvent?: never;
+    assistantResponseEvent?: never;
+    dryRunSucceedEvent?: never;
+    codeReferenceEvent?: never;
+    supplementaryWebLinksEvent?: never;
+    followupPromptEvent?: never;
+    codeEvent?: never;
+    intentsEvent?: never;
+    interactionComponentsEvent?: never;
+    toolUseEvent: ToolUseEvent;
+    citationEvent?: never;
+    invalidStateEvent?: never;
+    error?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Citation event
+   * @public
+   */
+  export interface CitationEventMember {
+    messageMetadataEvent?: never;
+    assistantResponseEvent?: never;
+    dryRunSucceedEvent?: never;
+    codeReferenceEvent?: never;
+    supplementaryWebLinksEvent?: never;
+    followupPromptEvent?: never;
+    codeEvent?: never;
+    intentsEvent?: never;
+    interactionComponentsEvent?: never;
+    toolUseEvent?: never;
+    citationEvent: CitationEvent;
+    invalidStateEvent?: never;
+    error?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Invalid State event
+   * @public
+   */
+  export interface InvalidStateEventMember {
+    messageMetadataEvent?: never;
+    assistantResponseEvent?: never;
+    dryRunSucceedEvent?: never;
+    codeReferenceEvent?: never;
+    supplementaryWebLinksEvent?: never;
+    followupPromptEvent?: never;
+    codeEvent?: never;
+    intentsEvent?: never;
+    interactionComponentsEvent?: never;
+    toolUseEvent?: never;
+    citationEvent?: never;
+    invalidStateEvent: InvalidStateEvent;
+    error?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Internal Server Exception
+   * @public
+   */
+  export interface ErrorMember {
+    messageMetadataEvent?: never;
+    assistantResponseEvent?: never;
+    dryRunSucceedEvent?: never;
+    codeReferenceEvent?: never;
+    supplementaryWebLinksEvent?: never;
+    followupPromptEvent?: never;
+    codeEvent?: never;
+    intentsEvent?: never;
+    interactionComponentsEvent?: never;
+    toolUseEvent?: never;
+    citationEvent?: never;
+    invalidStateEvent?: never;
+    error: InternalServerException;
+    $unknown?: never;
+  }
+
+  /**
+   * @public
+   */
+  export interface $UnknownMember {
+    messageMetadataEvent?: never;
+    assistantResponseEvent?: never;
+    dryRunSucceedEvent?: never;
+    codeReferenceEvent?: never;
+    supplementaryWebLinksEvent?: never;
+    followupPromptEvent?: never;
+    codeEvent?: never;
+    intentsEvent?: never;
+    interactionComponentsEvent?: never;
+    toolUseEvent?: never;
+    citationEvent?: never;
+    invalidStateEvent?: never;
+    error?: never;
+    $unknown: [string, any];
+  }
+
+  export interface Visitor<T> {
+    messageMetadataEvent: (value: MessageMetadataEvent) => T;
+    assistantResponseEvent: (value: AssistantResponseEvent) => T;
+    dryRunSucceedEvent: (value: DryRunSucceedEvent) => T;
+    codeReferenceEvent: (value: CodeReferenceEvent) => T;
+    supplementaryWebLinksEvent: (value: SupplementaryWebLinksEvent) => T;
+    followupPromptEvent: (value: FollowupPromptEvent) => T;
+    codeEvent: (value: CodeEvent) => T;
+    intentsEvent: (value: IntentsEvent) => T;
+    interactionComponentsEvent: (value: InteractionComponentsEvent) => T;
+    toolUseEvent: (value: ToolUseEvent) => T;
+    citationEvent: (value: CitationEvent) => T;
+    invalidStateEvent: (value: InvalidStateEvent) => T;
+    error: (value: InternalServerException) => T;
+    _: (name: string, value: any) => T;
+  }
+
+  export const visit = <T>(
+    value: ChatResponseStream,
+    visitor: Visitor<T>
+  ): T => {
+    if (value.messageMetadataEvent !== undefined) return visitor.messageMetadataEvent(value.messageMetadataEvent);
+    if (value.assistantResponseEvent !== undefined) return visitor.assistantResponseEvent(value.assistantResponseEvent);
+    if (value.dryRunSucceedEvent !== undefined) return visitor.dryRunSucceedEvent(value.dryRunSucceedEvent);
+    if (value.codeReferenceEvent !== undefined) return visitor.codeReferenceEvent(value.codeReferenceEvent);
+    if (value.supplementaryWebLinksEvent !== undefined) return visitor.supplementaryWebLinksEvent(value.supplementaryWebLinksEvent);
+    if (value.followupPromptEvent !== undefined) return visitor.followupPromptEvent(value.followupPromptEvent);
+    if (value.codeEvent !== undefined) return visitor.codeEvent(value.codeEvent);
+    if (value.intentsEvent !== undefined) return visitor.intentsEvent(value.intentsEvent);
+    if (value.interactionComponentsEvent !== undefined) return visitor.interactionComponentsEvent(value.interactionComponentsEvent);
+    if (value.toolUseEvent !== undefined) return visitor.toolUseEvent(value.toolUseEvent);
+    if (value.citationEvent !== undefined) return visitor.citationEvent(value.citationEvent);
+    if (value.invalidStateEvent !== undefined) return visitor.invalidStateEvent(value.invalidStateEvent);
+    if (value.error !== undefined) return visitor.error(value.error);
+    return visitor._(value.$unknown[0], value.$unknown[1]);
+  }
+
+}
+/**
+ * @internal
+ */
+export const ChatResponseStreamFilterSensitiveLog = (obj: ChatResponseStream): any => {
+  if (obj.messageMetadataEvent !== undefined) return {messageMetadataEvent:
+    obj.messageMetadataEvent
+  };
+  if (obj.assistantResponseEvent !== undefined) return {assistantResponseEvent:
+    AssistantResponseEventFilterSensitiveLog(obj.assistantResponseEvent)
+  };
+  if (obj.dryRunSucceedEvent !== undefined) return {dryRunSucceedEvent:
+    obj.dryRunSucceedEvent
+  };
+  if (obj.codeReferenceEvent !== undefined) return {codeReferenceEvent:
+    obj.codeReferenceEvent
+  };
+  if (obj.supplementaryWebLinksEvent !== undefined) return {supplementaryWebLinksEvent:
+    SupplementaryWebLinksEventFilterSensitiveLog(obj.supplementaryWebLinksEvent)
+  };
+  if (obj.followupPromptEvent !== undefined) return {followupPromptEvent:
+    FollowupPromptEventFilterSensitiveLog(obj.followupPromptEvent)
+  };
+  if (obj.codeEvent !== undefined) return {codeEvent:
+    CodeEventFilterSensitiveLog(obj.codeEvent)
+  };
+  if (obj.intentsEvent !== undefined) return {intentsEvent:
+    IntentsEventFilterSensitiveLog(obj.intentsEvent)
+  };
+  if (obj.interactionComponentsEvent !== undefined) return {interactionComponentsEvent:
+    InteractionComponentsEventFilterSensitiveLog(obj.interactionComponentsEvent)
+  };
+  if (obj.toolUseEvent !== undefined) return {toolUseEvent:
+    ToolUseEventFilterSensitiveLog(obj.toolUseEvent)
+  };
+  if (obj.citationEvent !== undefined) return {citationEvent:
+    CitationEventFilterSensitiveLog(obj.citationEvent)
+  };
+  if (obj.invalidStateEvent !== undefined) return {invalidStateEvent:
+    obj.invalidStateEvent
+  };
+  if (obj.error !== undefined) return {error:
+    obj.error
+  };
+  if (obj.$unknown !== undefined) return {[obj.$unknown[0]]: 'UNKNOWN'};
+}
+
+/**
+ * @public
+ * @enum
+ */
+export const ChatTriggerType = {
+  /**
+   * Indicates the Chat was triggered in response to a IDE diagnostic
+   */
+  DIAGNOSTIC: "DIAGNOSTIC",
+  /**
+   * Indicates the Chat was triggered in response to an inline chat event
+   */
+  INLINE_CHAT: "INLINE_CHAT",
+  /**
+   * Indicates the Chat was triggered due to an explicit chat request by an end-user
+   */
+  MANUAL: "MANUAL",
+} as const
+/**
+ * @public
+ */
+export type ChatTriggerType = typeof ChatTriggerType[keyof typeof ChatTriggerType]
+
+/**
+ * CommandInput can be extended to either a list of strings or a single string.
+ * @public
+ */
+export type CommandInput =
+  | CommandInput.CommandsListMember
+  | CommandInput.$UnknownMember
+
+/**
+ * @public
+ */
+export namespace CommandInput {
+
+  /**
+   * The list of context items used to generate output.
+   * @public
+   */
+  export interface CommandsListMember {
+    commandsList: (string)[];
+    $unknown?: never;
+  }
+
+  /**
+   * @public
+   */
+  export interface $UnknownMember {
+    commandsList?: never;
+    $unknown: [string, any];
+  }
+
+  export interface Visitor<T> {
+    commandsList: (value: (string)[]) => T;
+    _: (name: string, value: any) => T;
+  }
+
+  export const visit = <T>(
+    value: CommandInput,
+    visitor: Visitor<T>
+  ): T => {
+    if (value.commandsList !== undefined) return visitor.commandsList(value.commandsList);
+    return visitor._(value.$unknown[0], value.$unknown[1]);
+  }
+
+}
+/**
+ * @internal
+ */
+export const CommandInputFilterSensitiveLog = (obj: CommandInput): any => {
+  if (obj.commandsList !== undefined) return {commandsList:
+    SENSITIVE_STRING
+  };
+  if (obj.$unknown !== undefined) return {[obj.$unknown[0]]: 'UNKNOWN'};
+}
+
+/**
+ * Structure to represent the current state of a chat conversation.
+ * @public
+ */
+export interface ConversationState {
+  /**
+   * Unique identifier for the chat conversation stream
+   * @public
+   */
+  conversationId?: string | undefined;
+
+  /**
+   * Holds the history of chat messages.
+   * @public
+   */
+  history?: (ChatMessage)[] | undefined;
+
+  /**
+   * Holds the current message being processed or displayed.
+   * @public
+   */
+  currentMessage: ChatMessage | undefined;
+
+  /**
+   * Trigger Reason for Chat
+   * @public
+   */
+  chatTriggerType: ChatTriggerType | undefined;
+
+  customizationArn?: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ConversationStateFilterSensitiveLog = (obj: ConversationState): any => ({
+  ...obj,
+  ...(obj.history && { history:
+    obj.history.map(
+      item =>
+      ChatMessageFilterSensitiveLog(item)
+    )
+  }),
+  ...(obj.currentMessage && { currentMessage:
+    ChatMessageFilterSensitiveLog(obj.currentMessage)
+  }),
+})
+
+/**
+ * This exception is translated to a 204 as it succeeded the IAM Auth.
+ * @public
+ */
+export class DryRunOperationException extends __BaseException {
+  readonly name: "DryRunOperationException" = "DryRunOperationException";
+  readonly $fault: "client" = "client";
+  responseCode?: number | undefined;
+  /**
+   * @internal
+   */
+  constructor(opts: __ExceptionOptionType<DryRunOperationException, __BaseException>) {
+    super({
+      name: "DryRunOperationException",
+      $fault: "client",
+      ...opts
+    });
+    Object.setPrototypeOf(this, DryRunOperationException.prototype);
+    this.responseCode = opts.responseCode;
+  }
+}
+
+/**
+ * @public
+ * @enum
+ */
+export const OutputFormat = {
+  JAVA_CDK: "java/cdk",
+  JSON_CFN: "json/cfn",
+  PYTHON_CDK: "python/cdk",
+  TYPESCRIPT_CDK: "typescript/cdk",
+  YAML_CFN: "yaml/cfn",
+} as const
+/**
+ * @public
+ */
+export type OutputFormat = typeof OutputFormat[keyof typeof OutputFormat]
+
+/**
+ * This exception is thrown when request was denied due to caller exceeding their usage limits
+ * @public
+ */
+export class ServiceQuotaExceededException extends __BaseException {
+  readonly name: "ServiceQuotaExceededException" = "ServiceQuotaExceededException";
+  readonly $fault: "client" = "client";
+  /**
+   * @internal
+   */
+  constructor(opts: __ExceptionOptionType<ServiceQuotaExceededException, __BaseException>) {
+    super({
+      name: "ServiceQuotaExceededException",
+      $fault: "client",
+      ...opts
+    });
+    Object.setPrototypeOf(this, ServiceQuotaExceededException.prototype);
+  }
+}
+
+/**
+ * Structure to represent a SendMessage request.
+ * @public
+ */
+export interface SendMessageRequest {
+  /**
+   * Structure to represent the current state of a chat conversation.
+   * @public
+   */
+  conversationState: ConversationState | undefined;
+
+  profileArn?: string | undefined;
+  /**
+   * The origin of the caller
+   * @public
+   */
+  source?: Origin | undefined;
+
+  dryRun?: boolean | undefined;
+}
+
+/**
+ * @internal
+ */
+export const SendMessageRequestFilterSensitiveLog = (obj: SendMessageRequest): any => ({
+  ...obj,
+  ...(obj.conversationState && { conversationState:
+    ConversationStateFilterSensitiveLog(obj.conversationState)
+  }),
+})
+
+/**
+ * Structure to represent a SendMessage response.
+ * @public
+ */
+export interface SendMessageResponse {
+  /**
+   * Streaming events from UniDirectional Streaming Conversational APIs.
+   * @public
+   */
+  sendMessageResponse: AsyncIterable<ChatResponseStream> | undefined;
+}
+
+/**
+ * @internal
+ */
+export const SendMessageResponseFilterSensitiveLog = (obj: SendMessageResponse): any => ({
+  ...obj,
+  ...(obj.sendMessageResponse && { sendMessageResponse:
+    'STREAMING_CONTENT'
+  }),
+})
+
+/**
+ * @public
+ */
+export interface GenerateCodeFromCommandsRequest {
+  /**
+   * Format of the output - language/format eg. typescript/cdk
+   * @public
+   */
+  outputFormat: OutputFormat | undefined;
+
+  /**
+   * CommandInput can be extended to either a list of strings or a single string.
+   * @public
+   */
+  commands: CommandInput | undefined;
+}
+
+/**
+ * @internal
+ */
+export const GenerateCodeFromCommandsRequestFilterSensitiveLog = (obj: GenerateCodeFromCommandsRequest): any => ({
+  ...obj,
+  ...(obj.commands && { commands:
+    CommandInputFilterSensitiveLog(obj.commands)
+  }),
+})
+
+/**
+ * Streaming events from UniDirectional streaming infrastructure code generation APIs.
+ * @public
+ */
+export type GenerateCodeFromCommandsResponseStream =
+  | GenerateCodeFromCommandsResponseStream.ErrorMember
+  | GenerateCodeFromCommandsResponseStream.QuotaLevelExceededErrorMember
+  | GenerateCodeFromCommandsResponseStream.ValidationErrorMember
+  | GenerateCodeFromCommandsResponseStream.CodeEventMember
+  | GenerateCodeFromCommandsResponseStream.$UnknownMember
+
+/**
+ * @public
+ */
+export namespace GenerateCodeFromCommandsResponseStream {
+
+  /**
+   * Generated code snippet
+   * @public
+   */
+  export interface CodeEventMember {
+    codeEvent: CodeEvent;
+    Error?: never;
+    QuotaLevelExceededError?: never;
+    ValidationError?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Internal Server Exception
+   * @public
+   */
+  export interface ErrorMember {
+    codeEvent?: never;
+    Error: InternalServerException;
+    QuotaLevelExceededError?: never;
+    ValidationError?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Exceptions for quota level exceeded errors
+   * @public
+   */
+  export interface QuotaLevelExceededErrorMember {
+    codeEvent?: never;
+    Error?: never;
+    QuotaLevelExceededError: ServiceQuotaExceededException;
+    ValidationError?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Validation errors in the ConsoleToCodeService
+   * @public
+   */
+  export interface ValidationErrorMember {
+    codeEvent?: never;
+    Error?: never;
+    QuotaLevelExceededError?: never;
+    ValidationError: ValidationException;
+    $unknown?: never;
+  }
+
+  /**
+   * @public
+   */
+  export interface $UnknownMember {
+    codeEvent?: never;
+    Error?: never;
+    QuotaLevelExceededError?: never;
+    ValidationError?: never;
+    $unknown: [string, any];
+  }
+
+  export interface Visitor<T> {
+    codeEvent: (value: CodeEvent) => T;
+    Error: (value: InternalServerException) => T;
+    QuotaLevelExceededError: (value: ServiceQuotaExceededException) => T;
+    ValidationError: (value: ValidationException) => T;
+    _: (name: string, value: any) => T;
+  }
+
+  export const visit = <T>(
+    value: GenerateCodeFromCommandsResponseStream,
+    visitor: Visitor<T>
+  ): T => {
+    if (value.codeEvent !== undefined) return visitor.codeEvent(value.codeEvent);
+    if (value.Error !== undefined) return visitor.Error(value.Error);
+    if (value.QuotaLevelExceededError !== undefined) return visitor.QuotaLevelExceededError(value.QuotaLevelExceededError);
+    if (value.ValidationError !== undefined) return visitor.ValidationError(value.ValidationError);
+    return visitor._(value.$unknown[0], value.$unknown[1]);
+  }
+
+}
+/**
+ * @internal
+ */
+export const GenerateCodeFromCommandsResponseStreamFilterSensitiveLog = (obj: GenerateCodeFromCommandsResponseStream): any => {
+  if (obj.codeEvent !== undefined) return {codeEvent:
+    CodeEventFilterSensitiveLog(obj.codeEvent)
+  };
+  if (obj.Error !== undefined) return {Error:
+    obj.Error
+  };
+  if (obj.QuotaLevelExceededError !== undefined) return {QuotaLevelExceededError:
+    obj.QuotaLevelExceededError
+  };
+  if (obj.ValidationError !== undefined) return {ValidationError:
+    obj.ValidationError
+  };
+  if (obj.$unknown !== undefined) return {[obj.$unknown[0]]: 'UNKNOWN'};
+}
+
+/**
+ * Structure to represent generated code response.
+ * @public
+ */
+export interface GenerateCodeFromCommandsResponse {
+  /**
+   * Streaming events from UniDirectional streaming infrastructure code generation APIs.
+   * @public
+   */
+  generatedCodeFromCommandsResponse: AsyncIterable<GenerateCodeFromCommandsResponseStream> | undefined;
+}
+
+/**
+ * @internal
+ */
+export const GenerateCodeFromCommandsResponseFilterSensitiveLog = (obj: GenerateCodeFromCommandsResponse): any => ({
+  ...obj,
+  ...(obj.generatedCodeFromCommandsResponse && { generatedCodeFromCommandsResponse:
+    'STREAMING_CONTENT'
+  }),
+})
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/src/protocols/Aws_json1_0.ts b/src.gen/@amzn/amazon-q-developer-streaming-client/src/protocols/Aws_json1_0.ts
new file mode 100644
index 00000000000..8d65ac48ac7
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/src/protocols/Aws_json1_0.ts
@@ -0,0 +1,1178 @@
+// smithy-typescript generated code
+import {
+  GenerateCodeFromCommandsCommandInput,
+  GenerateCodeFromCommandsCommandOutput,
+} from "../commands/GenerateCodeFromCommandsCommand";
+import {
+  SendMessageCommandInput,
+  SendMessageCommandOutput,
+} from "../commands/SendMessageCommand";
+import { QDeveloperStreamingServiceException as __BaseException } from "../models/QDeveloperStreamingServiceException";
+import {
+  AccessDeniedException,
+  AdditionalContentEntry,
+  AppStudioState,
+  AssistantResponseEvent,
+  AssistantResponseMessage,
+  ChatMessage,
+  ChatResponseStream,
+  CitationEvent,
+  CodeEvent,
+  CodeReferenceEvent,
+  CommandInput,
+  ConflictException,
+  ConsoleState,
+  ConversationState,
+  CursorState,
+  Diagnostic,
+  DocumentSymbol,
+  DryRunOperationException,
+  DryRunSucceedEvent,
+  EditorState,
+  EnvState,
+  EnvironmentVariable,
+  FollowupPrompt,
+  FollowupPromptEvent,
+  GenerateCodeFromCommandsRequest,
+  GenerateCodeFromCommandsResponseStream,
+  GitState,
+  ImageBlock,
+  ImageSource,
+  IntentsEvent,
+  InteractionComponent,
+  InteractionComponentEntry,
+  InteractionComponentsEvent,
+  InternalServerException,
+  InvalidStateEvent,
+  MessageMetadataEvent,
+  Position,
+  ProgrammingLanguage,
+  Range,
+  Reference,
+  RelevantTextDocument,
+  ResourceNotFoundException,
+  RuntimeDiagnostic,
+  SendMessageRequest,
+  ServiceQuotaExceededException,
+  ShellHistoryEntry,
+  ShellState,
+  Span,
+  SupplementaryWebLink,
+  SupplementaryWebLinksEvent,
+  TextDocument,
+  TextDocumentDiagnostic,
+  ThrottlingException,
+  Tool,
+  ToolInputSchema,
+  ToolResult,
+  ToolResultContentBlock,
+  ToolSpecification,
+  ToolUse,
+  ToolUseEvent,
+  UserInputMessage,
+  UserInputMessageContext,
+  UserSettings,
+  ValidationException,
+} from "../models/models_0";
+import {
+  loadRestJsonErrorCode,
+  parseJsonBody as parseBody,
+  parseJsonErrorBody as parseErrorBody,
+} from "@aws-sdk/core";
+import {
+  HttpRequest as __HttpRequest,
+  HttpResponse as __HttpResponse,
+} from "@smithy/protocol-http";
+import {
+  decorateServiceException as __decorateServiceException,
+  expectString as __expectString,
+  _json,
+  collectBody,
+  take,
+  withBaseException,
+} from "@smithy/smithy-client";
+import {
+  DocumentType as __DocumentType,
+  Endpoint as __Endpoint,
+  EventStreamSerdeContext as __EventStreamSerdeContext,
+  HeaderBag as __HeaderBag,
+  ResponseMetadata as __ResponseMetadata,
+  SerdeContext as __SerdeContext,
+} from "@smithy/types";
+import { v4 as generateIdempotencyToken } from "uuid";
+
+/**
+ * serializeAws_json1_0GenerateCodeFromCommandsCommand
+ */
+export const se_GenerateCodeFromCommandsCommand = async(
+  input: GenerateCodeFromCommandsCommandInput,
+  context: __SerdeContext
+): Promise<__HttpRequest> => {
+  const headers: __HeaderBag = sharedHeaders("GenerateCodeFromCommands")
+  let body: any;
+  body = JSON.stringify(_json(input));
+  return buildHttpRpcRequest(context, headers, "/", undefined, body);
+}
+
+/**
+ * serializeAws_json1_0SendMessageCommand
+ */
+export const se_SendMessageCommand = async(
+  input: SendMessageCommandInput,
+  context: __SerdeContext
+): Promise<__HttpRequest> => {
+  const headers: __HeaderBag = sharedHeaders("SendMessage")
+  let body: any;
+  body = JSON.stringify(se_SendMessageRequest(input, context));
+  return buildHttpRpcRequest(context, headers, "/", undefined, body);
+}
+
+/**
+ * deserializeAws_json1_0GenerateCodeFromCommandsCommand
+ */
+export const de_GenerateCodeFromCommandsCommand = async(
+  output: __HttpResponse,
+  context: __SerdeContext & __EventStreamSerdeContext
+): Promise<GenerateCodeFromCommandsCommandOutput> => {
+  if (output.statusCode >= 300) {
+    return de_CommandError(output, context);
+  }
+  const contents = { generatedCodeFromCommandsResponse: de_GenerateCodeFromCommandsResponseStream(output.body, context) };
+  const response: GenerateCodeFromCommandsCommandOutput = {
+    $metadata: deserializeMetadata(output),
+    ...contents,
+  };
+  return response;
+}
+
+/**
+ * deserializeAws_json1_0SendMessageCommand
+ */
+export const de_SendMessageCommand = async(
+  output: __HttpResponse,
+  context: __SerdeContext & __EventStreamSerdeContext
+): Promise<SendMessageCommandOutput> => {
+  if (output.statusCode >= 300) {
+    return de_CommandError(output, context);
+  }
+  const contents = { sendMessageResponse: de_ChatResponseStream(output.body, context) };
+  const response: SendMessageCommandOutput = {
+    $metadata: deserializeMetadata(output),
+    ...contents,
+  };
+  return response;
+}
+
+/**
+ * deserialize_Aws_json1_0CommandError
+ */
+const de_CommandError = async(
+  output: __HttpResponse,
+  context: __SerdeContext,
+): Promise<never> => {
+  const parsedOutput: any = {
+    ...output,
+    body: await parseErrorBody(output.body, context)
+  };
+  const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
+  switch (errorCode) {
+    case "AccessDeniedException":
+    case "com.amazon.aws.codewhisperer#AccessDeniedException":
+      throw await de_AccessDeniedExceptionRes(parsedOutput, context);
+    case "InternalServerException":
+    case "com.amazon.aws.codewhisperer#InternalServerException":
+      throw await de_InternalServerExceptionRes(parsedOutput, context);
+    case "ThrottlingException":
+    case "com.amazon.aws.codewhisperer#ThrottlingException":
+      throw await de_ThrottlingExceptionRes(parsedOutput, context);
+    case "ValidationException":
+    case "com.amazon.aws.codewhisperer#ValidationException":
+      throw await de_ValidationExceptionRes(parsedOutput, context);
+    case "ConflictException":
+    case "com.amazon.aws.codewhisperer#ConflictException":
+      throw await de_ConflictExceptionRes(parsedOutput, context);
+    case "DryRunOperationException":
+    case "com.amazon.aws.codewhisperer#DryRunOperationException":
+      throw await de_DryRunOperationExceptionRes(parsedOutput, context);
+    case "ResourceNotFoundException":
+    case "com.amazon.aws.codewhisperer#ResourceNotFoundException":
+      throw await de_ResourceNotFoundExceptionRes(parsedOutput, context);
+    case "ServiceQuotaExceededException":
+    case "com.amazon.aws.codewhisperer#ServiceQuotaExceededException":
+      throw await de_ServiceQuotaExceededExceptionRes(parsedOutput, context);
+    default:
+      const parsedBody = parsedOutput.body;
+      return throwDefaultError({
+        output,
+        parsedBody,
+        errorCode
+      }) as never
+    }
+  }
+
+  /**
+   * deserializeAws_json1_0AccessDeniedExceptionRes
+   */
+  const de_AccessDeniedExceptionRes = async (
+    parsedOutput: any,
+    context: __SerdeContext
+  ): Promise<AccessDeniedException> => {
+    const body = parsedOutput.body
+    const deserialized: any = _json(body);
+    const exception = new AccessDeniedException({
+      $metadata: deserializeMetadata(parsedOutput),
+      ...deserialized
+    });
+    return __decorateServiceException(exception, body);
+  };
+
+  /**
+   * deserializeAws_json1_0ConflictExceptionRes
+   */
+  const de_ConflictExceptionRes = async (
+    parsedOutput: any,
+    context: __SerdeContext
+  ): Promise<ConflictException> => {
+    const body = parsedOutput.body
+    const deserialized: any = _json(body);
+    const exception = new ConflictException({
+      $metadata: deserializeMetadata(parsedOutput),
+      ...deserialized
+    });
+    return __decorateServiceException(exception, body);
+  };
+
+  /**
+   * deserializeAws_json1_0DryRunOperationExceptionRes
+   */
+  const de_DryRunOperationExceptionRes = async (
+    parsedOutput: any,
+    context: __SerdeContext
+  ): Promise<DryRunOperationException> => {
+    const body = parsedOutput.body
+    const deserialized: any = _json(body);
+    const exception = new DryRunOperationException({
+      $metadata: deserializeMetadata(parsedOutput),
+      ...deserialized
+    });
+    return __decorateServiceException(exception, body);
+  };
+
+  /**
+   * deserializeAws_json1_0InternalServerExceptionRes
+   */
+  const de_InternalServerExceptionRes = async (
+    parsedOutput: any,
+    context: __SerdeContext
+  ): Promise<InternalServerException> => {
+    const body = parsedOutput.body
+    const deserialized: any = _json(body);
+    const exception = new InternalServerException({
+      $metadata: deserializeMetadata(parsedOutput),
+      ...deserialized
+    });
+    return __decorateServiceException(exception, body);
+  };
+
+  /**
+   * deserializeAws_json1_0ResourceNotFoundExceptionRes
+   */
+  const de_ResourceNotFoundExceptionRes = async (
+    parsedOutput: any,
+    context: __SerdeContext
+  ): Promise<ResourceNotFoundException> => {
+    const body = parsedOutput.body
+    const deserialized: any = _json(body);
+    const exception = new ResourceNotFoundException({
+      $metadata: deserializeMetadata(parsedOutput),
+      ...deserialized
+    });
+    return __decorateServiceException(exception, body);
+  };
+
+  /**
+   * deserializeAws_json1_0ServiceQuotaExceededExceptionRes
+   */
+  const de_ServiceQuotaExceededExceptionRes = async (
+    parsedOutput: any,
+    context: __SerdeContext
+  ): Promise<ServiceQuotaExceededException> => {
+    const body = parsedOutput.body
+    const deserialized: any = _json(body);
+    const exception = new ServiceQuotaExceededException({
+      $metadata: deserializeMetadata(parsedOutput),
+      ...deserialized
+    });
+    return __decorateServiceException(exception, body);
+  };
+
+  /**
+   * deserializeAws_json1_0ThrottlingExceptionRes
+   */
+  const de_ThrottlingExceptionRes = async (
+    parsedOutput: any,
+    context: __SerdeContext
+  ): Promise<ThrottlingException> => {
+    const body = parsedOutput.body
+    const deserialized: any = _json(body);
+    const exception = new ThrottlingException({
+      $metadata: deserializeMetadata(parsedOutput),
+      ...deserialized
+    });
+    return __decorateServiceException(exception, body);
+  };
+
+  /**
+   * deserializeAws_json1_0ValidationExceptionRes
+   */
+  const de_ValidationExceptionRes = async (
+    parsedOutput: any,
+    context: __SerdeContext
+  ): Promise<ValidationException> => {
+    const body = parsedOutput.body
+    const deserialized: any = _json(body);
+    const exception = new ValidationException({
+      $metadata: deserializeMetadata(parsedOutput),
+      ...deserialized
+    });
+    return __decorateServiceException(exception, body);
+  };
+
+  /**
+   * deserializeAws_json1_0ChatResponseStream
+   */
+  const de_ChatResponseStream = (
+    output: any,
+    context: __SerdeContext & __EventStreamSerdeContext
+  ): AsyncIterable<ChatResponseStream> => {
+    return context.eventStreamMarshaller.deserialize(
+      output,
+      async event => {
+        if (event["messageMetadataEvent"] != null) {
+          return {
+            messageMetadataEvent: await de_MessageMetadataEvent_event(event["messageMetadataEvent"], context),
+          };
+        }
+        if (event["assistantResponseEvent"] != null) {
+          return {
+            assistantResponseEvent: await de_AssistantResponseEvent_event(event["assistantResponseEvent"], context),
+          };
+        }
+        if (event["dryRunSucceedEvent"] != null) {
+          return {
+            dryRunSucceedEvent: await de_DryRunSucceedEvent_event(event["dryRunSucceedEvent"], context),
+          };
+        }
+        if (event["codeReferenceEvent"] != null) {
+          return {
+            codeReferenceEvent: await de_CodeReferenceEvent_event(event["codeReferenceEvent"], context),
+          };
+        }
+        if (event["supplementaryWebLinksEvent"] != null) {
+          return {
+            supplementaryWebLinksEvent: await de_SupplementaryWebLinksEvent_event(event["supplementaryWebLinksEvent"], context),
+          };
+        }
+        if (event["followupPromptEvent"] != null) {
+          return {
+            followupPromptEvent: await de_FollowupPromptEvent_event(event["followupPromptEvent"], context),
+          };
+        }
+        if (event["codeEvent"] != null) {
+          return {
+            codeEvent: await de_CodeEvent_event(event["codeEvent"], context),
+          };
+        }
+        if (event["intentsEvent"] != null) {
+          return {
+            intentsEvent: await de_IntentsEvent_event(event["intentsEvent"], context),
+          };
+        }
+        if (event["interactionComponentsEvent"] != null) {
+          return {
+            interactionComponentsEvent: await de_InteractionComponentsEvent_event(event["interactionComponentsEvent"], context),
+          };
+        }
+        if (event["toolUseEvent"] != null) {
+          return {
+            toolUseEvent: await de_ToolUseEvent_event(event["toolUseEvent"], context),
+          };
+        }
+        if (event["citationEvent"] != null) {
+          return {
+            citationEvent: await de_CitationEvent_event(event["citationEvent"], context),
+          };
+        }
+        if (event["invalidStateEvent"] != null) {
+          return {
+            invalidStateEvent: await de_InvalidStateEvent_event(event["invalidStateEvent"], context),
+          };
+        }
+        if (event["error"] != null) {
+          return {
+            error: await de_InternalServerException_event(event["error"], context),
+          };
+        }
+        return {$unknown: output};
+      }
+    );
+  }
+  /**
+   * deserializeAws_json1_0GenerateCodeFromCommandsResponseStream
+   */
+  const de_GenerateCodeFromCommandsResponseStream = (
+    output: any,
+    context: __SerdeContext & __EventStreamSerdeContext
+  ): AsyncIterable<GenerateCodeFromCommandsResponseStream> => {
+    return context.eventStreamMarshaller.deserialize(
+      output,
+      async event => {
+        if (event["codeEvent"] != null) {
+          return {
+            codeEvent: await de_CodeEvent_event(event["codeEvent"], context),
+          };
+        }
+        if (event["Error"] != null) {
+          return {
+            Error: await de_InternalServerException_event(event["Error"], context),
+          };
+        }
+        if (event["QuotaLevelExceededError"] != null) {
+          return {
+            QuotaLevelExceededError: await de_ServiceQuotaExceededException_event(event["QuotaLevelExceededError"], context),
+          };
+        }
+        if (event["ValidationError"] != null) {
+          return {
+            ValidationError: await de_ValidationException_event(event["ValidationError"], context),
+          };
+        }
+        return {$unknown: output};
+      }
+    );
+  }
+  const de_AssistantResponseEvent_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<AssistantResponseEvent> => {
+    const contents: AssistantResponseEvent = {} as any;
+    const data: any = await parseBody(output.body, context);
+    Object.assign(contents, _json(data));
+    return contents;
+  }
+  const de_CitationEvent_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<CitationEvent> => {
+    const contents: CitationEvent = {} as any;
+    const data: any = await parseBody(output.body, context);
+    Object.assign(contents, _json(data));
+    return contents;
+  }
+  const de_CodeEvent_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<CodeEvent> => {
+    const contents: CodeEvent = {} as any;
+    const data: any = await parseBody(output.body, context);
+    Object.assign(contents, _json(data));
+    return contents;
+  }
+  const de_CodeReferenceEvent_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<CodeReferenceEvent> => {
+    const contents: CodeReferenceEvent = {} as any;
+    const data: any = await parseBody(output.body, context);
+    Object.assign(contents, _json(data));
+    return contents;
+  }
+  const de_DryRunSucceedEvent_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<DryRunSucceedEvent> => {
+    const contents: DryRunSucceedEvent = {} as any;
+    const data: any = await parseBody(output.body, context);
+    Object.assign(contents, _json(data));
+    return contents;
+  }
+  const de_FollowupPromptEvent_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<FollowupPromptEvent> => {
+    const contents: FollowupPromptEvent = {} as any;
+    const data: any = await parseBody(output.body, context);
+    Object.assign(contents, _json(data));
+    return contents;
+  }
+  const de_IntentsEvent_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<IntentsEvent> => {
+    const contents: IntentsEvent = {} as any;
+    const data: any = await parseBody(output.body, context);
+    Object.assign(contents, _json(data));
+    return contents;
+  }
+  const de_InternalServerException_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<InternalServerException> => {
+    const parsedOutput: any = {
+      ...output,
+      body: await parseBody(output.body, context)
+    };
+    return de_InternalServerExceptionRes(parsedOutput, context);
+  }
+  const de_InvalidStateEvent_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<InvalidStateEvent> => {
+    const contents: InvalidStateEvent = {} as any;
+    const data: any = await parseBody(output.body, context);
+    Object.assign(contents, _json(data));
+    return contents;
+  }
+  const de_MessageMetadataEvent_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<MessageMetadataEvent> => {
+    const contents: MessageMetadataEvent = {} as any;
+    const data: any = await parseBody(output.body, context);
+    Object.assign(contents, _json(data));
+    return contents;
+  }
+  const de_ServiceQuotaExceededException_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<ServiceQuotaExceededException> => {
+    const parsedOutput: any = {
+      ...output,
+      body: await parseBody(output.body, context)
+    };
+    return de_ServiceQuotaExceededExceptionRes(parsedOutput, context);
+  }
+  const de_SupplementaryWebLinksEvent_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<SupplementaryWebLinksEvent> => {
+    const contents: SupplementaryWebLinksEvent = {} as any;
+    const data: any = await parseBody(output.body, context);
+    Object.assign(contents, _json(data));
+    return contents;
+  }
+  const de_ToolUseEvent_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<ToolUseEvent> => {
+    const contents: ToolUseEvent = {} as any;
+    const data: any = await parseBody(output.body, context);
+    Object.assign(contents, _json(data));
+    return contents;
+  }
+  const de_ValidationException_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<ValidationException> => {
+    const parsedOutput: any = {
+      ...output,
+      body: await parseBody(output.body, context)
+    };
+    return de_ValidationExceptionRes(parsedOutput, context);
+  }
+  const de_InteractionComponentsEvent_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<InteractionComponentsEvent> => {
+    const contents: InteractionComponentsEvent = {} as any;
+    const data: any = await parseBody(output.body, context);
+    Object.assign(contents, de_InteractionComponentsEvent(data, context));
+    return contents;
+  }
+  // se_AdditionalContentEntry omitted.
+
+  // se_AdditionalContentList omitted.
+
+  // se_AppStudioState omitted.
+
+  /**
+   * serializeAws_json1_0AssistantResponseMessage
+   */
+  const se_AssistantResponseMessage = (
+    input: AssistantResponseMessage,
+    context: __SerdeContext
+  ): any => {
+    return take(input, {
+      'content': [],
+      'followupPrompt': _json,
+      'messageId': [],
+      'references': _json,
+      'supplementaryWebLinks': _json,
+      'toolUses': _ => se_ToolUses(_, context),
+    });
+  }
+
+  /**
+   * serializeAws_json1_0ChatHistory
+   */
+  const se_ChatHistory = (
+    input: (ChatMessage)[],
+    context: __SerdeContext
+  ): any => {
+    return input.filter((e: any) => e != null).map(entry => {
+      return se_ChatMessage(entry, context);
+    });
+  }
+
+  /**
+   * serializeAws_json1_0ChatMessage
+   */
+  const se_ChatMessage = (
+    input: ChatMessage,
+    context: __SerdeContext
+  ): any => {
+    return ChatMessage.visit(input, {
+      assistantResponseMessage: value => ({ "assistantResponseMessage": se_AssistantResponseMessage(value, context) }),
+      userInputMessage: value => ({ "userInputMessage": se_UserInputMessage(value, context) }),
+      _: (name, value) => ({ name: value } as any)
+    });
+  }
+
+  // se_CliCommandsList omitted.
+
+  // se_CommandInput omitted.
+
+  // se_ConsoleState omitted.
+
+  /**
+   * serializeAws_json1_0ConversationState
+   */
+  const se_ConversationState = (
+    input: ConversationState,
+    context: __SerdeContext
+  ): any => {
+    return take(input, {
+      'chatTriggerType': [],
+      'conversationId': [],
+      'currentMessage': _ => se_ChatMessage(_, context),
+      'customizationArn': [],
+      'history': _ => se_ChatHistory(_, context),
+    });
+  }
+
+  // se_CursorState omitted.
+
+  // se_Diagnostic omitted.
+
+  // se_DocumentSymbol omitted.
+
+  // se_DocumentSymbols omitted.
+
+  // se_EditorState omitted.
+
+  // se_EnvironmentVariable omitted.
+
+  // se_EnvironmentVariables omitted.
+
+  // se_EnvState omitted.
+
+  // se_FollowupPrompt omitted.
+
+  // se_GitState omitted.
+
+  /**
+   * serializeAws_json1_0ImageBlock
+   */
+  const se_ImageBlock = (
+    input: ImageBlock,
+    context: __SerdeContext
+  ): any => {
+    return take(input, {
+      'format': [],
+      'source': _ => se_ImageSource(_, context),
+    });
+  }
+
+  /**
+   * serializeAws_json1_0ImageBlocks
+   */
+  const se_ImageBlocks = (
+    input: (ImageBlock)[],
+    context: __SerdeContext
+  ): any => {
+    return input.filter((e: any) => e != null).map(entry => {
+      return se_ImageBlock(entry, context);
+    });
+  }
+
+  /**
+   * serializeAws_json1_0ImageSource
+   */
+  const se_ImageSource = (
+    input: ImageSource,
+    context: __SerdeContext
+  ): any => {
+    return ImageSource.visit(input, {
+      bytes: value => ({ "bytes": context.base64Encoder(value) }),
+      _: (name, value) => ({ name: value } as any)
+    });
+  }
+
+  // se_Position omitted.
+
+  // se_ProgrammingLanguage omitted.
+
+  // se_Range omitted.
+
+  // se_Reference omitted.
+
+  // se_References omitted.
+
+  // se_RelevantDocumentList omitted.
+
+  // se_RelevantTextDocument omitted.
+
+  // se_RuntimeDiagnostic omitted.
+
+  /**
+   * serializeAws_json1_0SensitiveDocument
+   */
+  const se_SensitiveDocument = (
+    input: __DocumentType,
+    context: __SerdeContext
+  ): any => {
+    return input;
+  }
+
+  // se_ShellHistory omitted.
+
+  // se_ShellHistoryEntry omitted.
+
+  // se_ShellState omitted.
+
+  // se_Span omitted.
+
+  // se_SupplementaryWebLink omitted.
+
+  // se_SupplementaryWebLinks omitted.
+
+  // se_TextDocument omitted.
+
+  // se_TextDocumentDiagnostic omitted.
+
+  /**
+   * serializeAws_json1_0Tool
+   */
+  const se_Tool = (
+    input: Tool,
+    context: __SerdeContext
+  ): any => {
+    return Tool.visit(input, {
+      toolSpecification: value => ({ "toolSpecification": se_ToolSpecification(value, context) }),
+      _: (name, value) => ({ name: value } as any)
+    });
+  }
+
+  /**
+   * serializeAws_json1_0ToolInputSchema
+   */
+  const se_ToolInputSchema = (
+    input: ToolInputSchema,
+    context: __SerdeContext
+  ): any => {
+    return take(input, {
+      'json': _ => se_SensitiveDocument(_, context),
+    });
+  }
+
+  /**
+   * serializeAws_json1_0ToolResult
+   */
+  const se_ToolResult = (
+    input: ToolResult,
+    context: __SerdeContext
+  ): any => {
+    return take(input, {
+      'content': _ => se_ToolResultContent(_, context),
+      'status': [],
+      'toolUseId': [],
+    });
+  }
+
+  /**
+   * serializeAws_json1_0ToolResultContent
+   */
+  const se_ToolResultContent = (
+    input: (ToolResultContentBlock)[],
+    context: __SerdeContext
+  ): any => {
+    return input.filter((e: any) => e != null).map(entry => {
+      return se_ToolResultContentBlock(entry, context);
+    });
+  }
+
+  /**
+   * serializeAws_json1_0ToolResultContentBlock
+   */
+  const se_ToolResultContentBlock = (
+    input: ToolResultContentBlock,
+    context: __SerdeContext
+  ): any => {
+    return ToolResultContentBlock.visit(input, {
+      json: value => ({ "json": se_SensitiveDocument(value, context) }),
+      text: value => ({ "text": value }),
+      _: (name, value) => ({ name: value } as any)
+    });
+  }
+
+  /**
+   * serializeAws_json1_0ToolResults
+   */
+  const se_ToolResults = (
+    input: (ToolResult)[],
+    context: __SerdeContext
+  ): any => {
+    return input.filter((e: any) => e != null).map(entry => {
+      return se_ToolResult(entry, context);
+    });
+  }
+
+  /**
+   * serializeAws_json1_0Tools
+   */
+  const se_Tools = (
+    input: (Tool)[],
+    context: __SerdeContext
+  ): any => {
+    return input.filter((e: any) => e != null).map(entry => {
+      return se_Tool(entry, context);
+    });
+  }
+
+  /**
+   * serializeAws_json1_0ToolSpecification
+   */
+  const se_ToolSpecification = (
+    input: ToolSpecification,
+    context: __SerdeContext
+  ): any => {
+    return take(input, {
+      'description': [],
+      'inputSchema': _ => se_ToolInputSchema(_, context),
+      'name': [],
+    });
+  }
+
+  /**
+   * serializeAws_json1_0ToolUse
+   */
+  const se_ToolUse = (
+    input: ToolUse,
+    context: __SerdeContext
+  ): any => {
+    return take(input, {
+      'input': _ => se_SensitiveDocument(_, context),
+      'name': [],
+      'toolUseId': [],
+    });
+  }
+
+  /**
+   * serializeAws_json1_0ToolUses
+   */
+  const se_ToolUses = (
+    input: (ToolUse)[],
+    context: __SerdeContext
+  ): any => {
+    return input.filter((e: any) => e != null).map(entry => {
+      return se_ToolUse(entry, context);
+    });
+  }
+
+  /**
+   * serializeAws_json1_0UserInputMessage
+   */
+  const se_UserInputMessage = (
+    input: UserInputMessage,
+    context: __SerdeContext
+  ): any => {
+    return take(input, {
+      'content': [],
+      'images': _ => se_ImageBlocks(_, context),
+      'origin': [],
+      'userInputMessageContext': _ => se_UserInputMessageContext(_, context),
+      'userIntent': [],
+    });
+  }
+
+  /**
+   * serializeAws_json1_0UserInputMessageContext
+   */
+  const se_UserInputMessageContext = (
+    input: UserInputMessageContext,
+    context: __SerdeContext
+  ): any => {
+    return take(input, {
+      'additionalContext': _json,
+      'appStudioContext': _json,
+      'consoleState': _json,
+      'diagnostic': _json,
+      'editorState': _json,
+      'envState': _json,
+      'gitState': _json,
+      'shellState': _json,
+      'toolResults': _ => se_ToolResults(_, context),
+      'tools': _ => se_Tools(_, context),
+      'userSettings': _json,
+    });
+  }
+
+  // se_UserSettings omitted.
+
+  // se_WorkspaceFolderList omitted.
+
+  // se_GenerateCodeFromCommandsRequest omitted.
+
+  /**
+   * serializeAws_json1_0SendMessageRequest
+   */
+  const se_SendMessageRequest = (
+    input: SendMessageRequest,
+    context: __SerdeContext
+  ): any => {
+    return take(input, {
+      'conversationState': _ => se_ConversationState(_, context),
+      'dryRun': [],
+      'profileArn': [],
+      'source': [],
+    });
+  }
+
+  // de_AccessDeniedException omitted.
+
+  // de_AssistantResponseEvent omitted.
+
+  // de_CitationEvent omitted.
+
+  // de_CitationTarget omitted.
+
+  // de_CodeEvent omitted.
+
+  // de_CodeReferenceEvent omitted.
+
+  // de_ConflictException omitted.
+
+  // de_DryRunOperationException omitted.
+
+  // de_DryRunSucceedEvent omitted.
+
+  // de_FollowupPrompt omitted.
+
+  // de_FollowupPromptEvent omitted.
+
+  // de_IntentData omitted.
+
+  // de_IntentDataType omitted.
+
+  // de_IntentMap omitted.
+
+  // de_IntentsEvent omitted.
+
+  // de_InternalServerException omitted.
+
+  // de_InvalidStateEvent omitted.
+
+  // de_MessageMetadataEvent omitted.
+
+  // de_Reference omitted.
+
+  // de_References omitted.
+
+  // de_ResourceNotFoundException omitted.
+
+  // de_ServiceQuotaExceededException omitted.
+
+  // de_Span omitted.
+
+  // de_SupplementaryWebLink omitted.
+
+  // de_SupplementaryWebLinks omitted.
+
+  // de_SupplementaryWebLinksEvent omitted.
+
+  // de_ThrottlingException omitted.
+
+  // de_ToolUseEvent omitted.
+
+  // de_ValidationException omitted.
+
+  /**
+   * deserializeAws_json1_0InteractionComponentsEvent
+   */
+  const de_InteractionComponentsEvent = (
+    output: any,
+    context: __SerdeContext
+  ): InteractionComponentsEvent => {
+    return take(output, {
+      'interactionComponentEntries': (_: any) => de_InteractionComponentEntryList(_, context),
+    }) as any;
+  }
+
+  // de_Action omitted.
+
+  // de_Alert omitted.
+
+  // de_AlertComponent omitted.
+
+  // de_AlertComponentList omitted.
+
+  // de_CloudWatchTroubleshootingLink omitted.
+
+  // de_InfrastructureUpdate omitted.
+
+  // de_InfrastructureUpdateTransition omitted.
+
+  /**
+   * deserializeAws_json1_0InteractionComponent
+   */
+  const de_InteractionComponent = (
+    output: any,
+    context: __SerdeContext
+  ): InteractionComponent => {
+    return take(output, {
+      'action': _json,
+      'alert': _json,
+      'infrastructureUpdate': _json,
+      'progress': _json,
+      'resource': _json,
+      'resourceList': _json,
+      'section': _json,
+      'step': _json,
+      'suggestions': _json,
+      'taskDetails': _json,
+      'taskReference': _json,
+      'text': _json,
+    }) as any;
+  }
+
+  /**
+   * deserializeAws_json1_0InteractionComponentEntry
+   */
+  const de_InteractionComponentEntry = (
+    output: any,
+    context: __SerdeContext
+  ): InteractionComponentEntry => {
+    return take(output, {
+      'interactionComponent': (_: any) => de_InteractionComponent(_, context),
+      'interactionComponentId': __expectString,
+    }) as any;
+  }
+
+  /**
+   * deserializeAws_json1_0InteractionComponentEntryList
+   */
+  const de_InteractionComponentEntryList = (
+    output: any,
+    context: __SerdeContext
+  ): (InteractionComponentEntry)[] => {
+    const retVal = (output || []).filter((e: any) => e != null).map((entry: any) => {
+      return de_InteractionComponentEntry(entry, context);
+    });
+    return retVal;
+  }
+
+  // de_ModuleLink omitted.
+
+  // de_Progress omitted.
+
+  // de_ProgressComponent omitted.
+
+  // de_ProgressComponentList omitted.
+
+  // de_Resource omitted.
+
+  // de_ResourceList omitted.
+
+  // de_Resources omitted.
+
+  // de_Section omitted.
+
+  // de_SectionComponent omitted.
+
+  // de_SectionComponentList omitted.
+
+  // de_Step omitted.
+
+  // de_StepComponent omitted.
+
+  // de_StepComponentList omitted.
+
+  // de_Suggestion omitted.
+
+  // de_SuggestionList omitted.
+
+  // de_Suggestions omitted.
+
+  // de_TaskAction omitted.
+
+  // de_TaskActionConfirmation omitted.
+
+  // de_TaskActionList omitted.
+
+  // de_TaskActionNote omitted.
+
+  // de_TaskActionPayload omitted.
+
+  // de_TaskComponent omitted.
+
+  // de_TaskComponentList omitted.
+
+  // de_TaskDetails omitted.
+
+  // de_TaskOverview omitted.
+
+  // de_TaskReference omitted.
+
+  // de_Text omitted.
+
+  // de_WebLink omitted.
+
+  const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
+    httpStatusCode: output.statusCode,
+    requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"] ?? output.headers["x-amz-request-id"],
+    extendedRequestId: output.headers["x-amz-id-2"],
+    cfId: output.headers["x-amz-cf-id"],
+  });
+
+  // Encode Uint8Array data into string with utf-8.
+  const collectBodyString = (streamBody: any, context: __SerdeContext): Promise<string> => collectBody(streamBody, context).then(body => context.utf8Encoder(body))
+
+  const throwDefaultError = withBaseException(__BaseException);
+  const buildHttpRpcRequest = async (
+    context: __SerdeContext,
+    headers: __HeaderBag,
+    path: string,
+    resolvedHostname: string | undefined,
+    body: any,
+  ): Promise<__HttpRequest> => {
+    const {hostname, protocol = "https", port, path: basePath} = await context.endpoint();
+    const contents: any = {
+      protocol,
+      hostname,
+      port,
+      method: "POST",
+      path: basePath.endsWith("/") ? basePath.slice(0, -1) + path : basePath + path,
+      headers,
+    };
+    if (resolvedHostname !== undefined) {
+      contents.hostname = resolvedHostname;
+    }
+    if (body !== undefined) {
+      contents.body = body;
+    }
+    return new __HttpRequest(contents);
+  };
+  function sharedHeaders(operation: string): __HeaderBag { return {
+    'content-type': "application/x-amz-json-1.0",
+    'x-amz-target': `AmazonQDeveloperStreamingService.${operation}`,
+  }};
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/src/runtimeConfig.browser.ts b/src.gen/@amzn/amazon-q-developer-streaming-client/src/runtimeConfig.browser.ts
new file mode 100644
index 00000000000..fff8a5d9a3f
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/src/runtimeConfig.browser.ts
@@ -0,0 +1,52 @@
+// smithy-typescript generated code
+// @ts-ignore: package.json will be imported from dist folders
+import packageInfo from "../package.json"; // eslint-disable-line
+
+import { Sha256 } from "@aws-crypto/sha256-browser";
+import { createDefaultUserAgentProvider } from "@aws-sdk/util-user-agent-browser";
+import {
+  DEFAULT_USE_DUALSTACK_ENDPOINT,
+  DEFAULT_USE_FIPS_ENDPOINT,
+} from "@smithy/config-resolver";
+import { eventStreamSerdeProvider } from "@smithy/eventstream-serde-browser";
+import {
+  FetchHttpHandler as RequestHandler,
+  streamCollector,
+} from "@smithy/fetch-http-handler";
+import { invalidProvider } from "@smithy/invalid-dependency";
+import { calculateBodyLength } from "@smithy/util-body-length-browser";
+import {
+  DEFAULT_MAX_ATTEMPTS,
+  DEFAULT_RETRY_MODE,
+} from "@smithy/util-retry";
+import { QDeveloperStreamingClientConfig } from "./QDeveloperStreamingClient";
+import { getRuntimeConfig as getSharedRuntimeConfig } from "./runtimeConfig.shared";
+import { loadConfigsForDefaultMode } from "@smithy/smithy-client";
+import { resolveDefaultsModeConfig } from "@smithy/util-defaults-mode-browser";
+
+/**
+ * @internal
+ */
+export const getRuntimeConfig = (config: QDeveloperStreamingClientConfig) => {
+  const defaultsMode = resolveDefaultsModeConfig(config);
+  const defaultConfigProvider = () => defaultsMode().then(loadConfigsForDefaultMode);
+  const clientSharedValues = getSharedRuntimeConfig(config);
+  return {
+    ...clientSharedValues,
+    ...config,
+    runtime: "browser",
+    defaultsMode,
+    bodyLengthChecker: config?.bodyLengthChecker ?? calculateBodyLength,
+    credentialDefaultProvider: config?.credentialDefaultProvider ?? ((_: unknown) => () => Promise.reject(new Error("Credential is missing"))),
+    defaultUserAgentProvider: config?.defaultUserAgentProvider ?? createDefaultUserAgentProvider({serviceId: clientSharedValues.serviceId, clientVersion: packageInfo.version}),
+    eventStreamSerdeProvider: config?.eventStreamSerdeProvider ?? eventStreamSerdeProvider,
+    maxAttempts: config?.maxAttempts ?? DEFAULT_MAX_ATTEMPTS,
+    region: config?.region ?? invalidProvider("Region is missing"),
+    requestHandler: RequestHandler.create(config?.requestHandler ?? defaultConfigProvider),
+    retryMode: config?.retryMode ?? (async () => (await defaultConfigProvider()).retryMode || DEFAULT_RETRY_MODE),
+    sha256: config?.sha256 ?? Sha256,
+    streamCollector: config?.streamCollector ?? streamCollector,
+    useDualstackEndpoint: config?.useDualstackEndpoint ?? (() => Promise.resolve(DEFAULT_USE_DUALSTACK_ENDPOINT)),
+    useFipsEndpoint: config?.useFipsEndpoint ?? (() => Promise.resolve(DEFAULT_USE_FIPS_ENDPOINT)),
+  };
+};
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/src/runtimeConfig.native.ts b/src.gen/@amzn/amazon-q-developer-streaming-client/src/runtimeConfig.native.ts
new file mode 100644
index 00000000000..ef1555fc70e
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/src/runtimeConfig.native.ts
@@ -0,0 +1,17 @@
+// smithy-typescript generated code
+import { Sha256 } from "@aws-crypto/sha256-js";
+import { QDeveloperStreamingClientConfig } from "./QDeveloperStreamingClient";
+import { getRuntimeConfig as getBrowserRuntimeConfig } from "./runtimeConfig.browser";
+
+/**
+ * @internal
+ */
+export const getRuntimeConfig = (config: QDeveloperStreamingClientConfig) => {
+  const browserDefaults = getBrowserRuntimeConfig(config);
+  return {
+    ...browserDefaults,
+    ...config,
+    runtime: "react-native",
+    sha256: config?.sha256 ?? Sha256,
+  };
+};
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/src/runtimeConfig.shared.ts b/src.gen/@amzn/amazon-q-developer-streaming-client/src/runtimeConfig.shared.ts
new file mode 100644
index 00000000000..d225ea9de71
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/src/runtimeConfig.shared.ts
@@ -0,0 +1,42 @@
+// smithy-typescript generated code
+import { defaultQDeveloperStreamingHttpAuthSchemeProvider } from "./auth/httpAuthSchemeProvider";
+import { defaultRegionInfoProvider } from "./endpoints";
+import { AwsSdkSigV4Signer } from "@aws-sdk/core";
+import { NoOpLogger } from "@smithy/smithy-client";
+import { IdentityProviderConfig } from "@smithy/types";
+import { parseUrl } from "@smithy/url-parser";
+import {
+  fromBase64,
+  toBase64,
+} from "@smithy/util-base64";
+import {
+  fromUtf8,
+  toUtf8,
+} from "@smithy/util-utf8";
+import { QDeveloperStreamingClientConfig } from "./QDeveloperStreamingClient";
+
+/**
+ * @internal
+ */
+export const getRuntimeConfig = (config: QDeveloperStreamingClientConfig) => {
+  return {
+    apiVersion: "2024-06-11",
+      base64Decoder: config?.base64Decoder ?? fromBase64,
+  base64Encoder: config?.base64Encoder ?? toBase64,
+  disableHostPrefix: config?.disableHostPrefix ?? false,
+  extensions: config?.extensions ?? [],
+  httpAuthSchemeProvider: config?.httpAuthSchemeProvider ?? defaultQDeveloperStreamingHttpAuthSchemeProvider,
+  httpAuthSchemes: config?.httpAuthSchemes ?? [{
+        schemeId: "aws.auth#sigv4",
+        identityProvider: (ipc: IdentityProviderConfig) =>
+          ipc.getIdentityProvider("aws.auth#sigv4"),
+        signer: new AwsSdkSigV4Signer(),
+      }],
+  logger: config?.logger ?? new NoOpLogger(),
+  regionInfoProvider: config?.regionInfoProvider ?? defaultRegionInfoProvider,
+  serviceId: config?.serviceId ?? "QDeveloperStreaming",
+  urlParser: config?.urlParser ?? parseUrl,
+  utf8Decoder: config?.utf8Decoder ?? fromUtf8,
+  utf8Encoder: config?.utf8Encoder ?? toUtf8,
+  }
+};
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/src/runtimeConfig.ts b/src.gen/@amzn/amazon-q-developer-streaming-client/src/runtimeConfig.ts
new file mode 100644
index 00000000000..4435e1b5d2f
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/src/runtimeConfig.ts
@@ -0,0 +1,68 @@
+// smithy-typescript generated code
+// @ts-ignore: package.json will be imported from dist folders
+import packageInfo from "../package.json"; // eslint-disable-line
+
+import { emitWarningIfUnsupportedVersion as awsCheckVersion } from "@aws-sdk/core";
+import { defaultProvider as credentialDefaultProvider } from "@aws-sdk/credential-provider-node";
+import {
+  NODE_APP_ID_CONFIG_OPTIONS,
+  createDefaultUserAgentProvider,
+} from "@aws-sdk/util-user-agent-node";
+import {
+  NODE_REGION_CONFIG_FILE_OPTIONS,
+  NODE_REGION_CONFIG_OPTIONS,
+  NODE_USE_DUALSTACK_ENDPOINT_CONFIG_OPTIONS,
+  NODE_USE_FIPS_ENDPOINT_CONFIG_OPTIONS,
+} from "@smithy/config-resolver";
+import { eventStreamSerdeProvider } from "@smithy/eventstream-serde-node";
+import { Hash } from "@smithy/hash-node";
+import {
+  NODE_MAX_ATTEMPT_CONFIG_OPTIONS,
+  NODE_RETRY_MODE_CONFIG_OPTIONS,
+} from "@smithy/middleware-retry";
+import { loadConfig as loadNodeConfig } from "@smithy/node-config-provider";
+import {
+  NodeHttpHandler as RequestHandler,
+  streamCollector,
+} from "@smithy/node-http-handler";
+import { calculateBodyLength } from "@smithy/util-body-length-node";
+import { DEFAULT_RETRY_MODE } from "@smithy/util-retry";
+import { QDeveloperStreamingClientConfig } from "./QDeveloperStreamingClient";
+import { getRuntimeConfig as getSharedRuntimeConfig } from "./runtimeConfig.shared";
+import { loadConfigsForDefaultMode } from "@smithy/smithy-client";
+import { resolveDefaultsModeConfig } from "@smithy/util-defaults-mode-node";
+import { emitWarningIfUnsupportedVersion } from "@smithy/smithy-client";
+
+/**
+ * @internal
+ */
+export const getRuntimeConfig = (config: QDeveloperStreamingClientConfig) => {
+  emitWarningIfUnsupportedVersion(process.version);
+  const defaultsMode = resolveDefaultsModeConfig(config);
+  const defaultConfigProvider = () => defaultsMode().then(loadConfigsForDefaultMode);
+  const clientSharedValues = getSharedRuntimeConfig(config);
+  awsCheckVersion(process.version);
+const profileConfig = { profile: config?.profile };return {
+    ...clientSharedValues,
+    ...config,
+    runtime: "node",
+    defaultsMode,
+    bodyLengthChecker: config?.bodyLengthChecker ?? calculateBodyLength,
+    credentialDefaultProvider: config?.credentialDefaultProvider ?? credentialDefaultProvider,
+    defaultUserAgentProvider: config?.defaultUserAgentProvider ?? createDefaultUserAgentProvider({serviceId: clientSharedValues.serviceId, clientVersion: packageInfo.version}),
+    eventStreamSerdeProvider: config?.eventStreamSerdeProvider ?? eventStreamSerdeProvider,
+    maxAttempts: config?.maxAttempts ?? loadNodeConfig(NODE_MAX_ATTEMPT_CONFIG_OPTIONS, config),
+    region: config?.region ?? loadNodeConfig(
+          NODE_REGION_CONFIG_OPTIONS,
+          {...NODE_REGION_CONFIG_FILE_OPTIONS, ...profileConfig}
+      )
+    ,
+    requestHandler: RequestHandler.create(config?.requestHandler ?? defaultConfigProvider),
+    retryMode: config?.retryMode ?? loadNodeConfig({...NODE_RETRY_MODE_CONFIG_OPTIONS,default: async () => (await defaultConfigProvider()).retryMode || DEFAULT_RETRY_MODE,}, config),
+    sha256: config?.sha256 ?? Hash.bind(null, "sha256"),
+    streamCollector: config?.streamCollector ?? streamCollector,
+    useDualstackEndpoint: config?.useDualstackEndpoint ?? loadNodeConfig(NODE_USE_DUALSTACK_ENDPOINT_CONFIG_OPTIONS, profileConfig),
+    useFipsEndpoint: config?.useFipsEndpoint ?? loadNodeConfig(NODE_USE_FIPS_ENDPOINT_CONFIG_OPTIONS, profileConfig),
+    userAgentAppId: config?.userAgentAppId ?? loadNodeConfig(NODE_APP_ID_CONFIG_OPTIONS, profileConfig),
+  };
+};
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/src/runtimeExtensions.ts b/src.gen/@amzn/amazon-q-developer-streaming-client/src/runtimeExtensions.ts
new file mode 100644
index 00000000000..2db7927eff2
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/src/runtimeExtensions.ts
@@ -0,0 +1,59 @@
+// smithy-typescript generated code
+import {
+  getHttpAuthExtensionConfiguration,
+  resolveHttpAuthRuntimeConfig,
+} from "./auth/httpAuthExtensionConfiguration";
+import {
+  getAwsRegionExtensionConfiguration,
+  resolveAwsRegionExtensionConfiguration,
+} from "@aws-sdk/region-config-resolver";
+import {
+  getHttpHandlerExtensionConfiguration,
+  resolveHttpHandlerRuntimeConfig,
+} from "@smithy/protocol-http";
+import {
+  getDefaultExtensionConfiguration,
+  resolveDefaultRuntimeConfig,
+} from "@smithy/smithy-client";
+import { QDeveloperStreamingExtensionConfiguration } from "./extensionConfiguration";
+
+/**
+ * @public
+ */
+export interface RuntimeExtension {
+    configure(extensionConfiguration: QDeveloperStreamingExtensionConfiguration): void;
+}
+
+/**
+ * @public
+ */
+export interface RuntimeExtensionsConfig {
+    extensions: RuntimeExtension[]
+}
+
+const asPartial = <T extends Partial<QDeveloperStreamingExtensionConfiguration>>(t: T) => t;
+
+/**
+ * @internal
+ */
+export const resolveRuntimeExtensions = (
+    runtimeConfig: any,
+    extensions: RuntimeExtension[]
+) => {
+  const extensionConfiguration: QDeveloperStreamingExtensionConfiguration = {
+    ...asPartial(getAwsRegionExtensionConfiguration(runtimeConfig)),
+    ...asPartial(getDefaultExtensionConfiguration(runtimeConfig)),
+    ...asPartial(getHttpHandlerExtensionConfiguration(runtimeConfig)),
+    ...asPartial(getHttpAuthExtensionConfiguration(runtimeConfig)),
+  };
+
+  extensions.forEach(extension => extension.configure(extensionConfiguration));
+
+  return {
+    ...runtimeConfig,
+    ...resolveAwsRegionExtensionConfiguration(extensionConfiguration),
+    ...resolveDefaultRuntimeConfig(extensionConfiguration),
+    ...resolveHttpHandlerRuntimeConfig(extensionConfiguration),
+    ...resolveHttpAuthRuntimeConfig(extensionConfiguration),
+  };
+}
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/tsconfig.cjs.json b/src.gen/@amzn/amazon-q-developer-streaming-client/tsconfig.cjs.json
new file mode 100644
index 00000000000..3567d85ba84
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/tsconfig.cjs.json
@@ -0,0 +1,6 @@
+{
+  "extends": "./tsconfig",
+  "compilerOptions": {
+    "outDir": "dist-cjs"
+  }
+}
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/tsconfig.es.json b/src.gen/@amzn/amazon-q-developer-streaming-client/tsconfig.es.json
new file mode 100644
index 00000000000..3e988e83261
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/tsconfig.es.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig",
+  "compilerOptions": {
+    "lib": ["dom"],
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "outDir": "dist-es"
+  }
+}
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/tsconfig.json b/src.gen/@amzn/amazon-q-developer-streaming-client/tsconfig.json
new file mode 100644
index 00000000000..956bed461a6
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "extends": "@tsconfig/node18/tsconfig.json",
+  "compilerOptions": {
+    "downlevelIteration": true,
+    "importHelpers": true,
+    "incremental": true,
+    "removeComments": true,
+    "resolveJsonModule": true,
+    "rootDir": "src",
+    "useUnknownInCatchVariables": false
+  },
+  "exclude": ["test/"]
+}
diff --git a/src.gen/@amzn/amazon-q-developer-streaming-client/tsconfig.types.json b/src.gen/@amzn/amazon-q-developer-streaming-client/tsconfig.types.json
new file mode 100644
index 00000000000..4c3dfa7b3d2
--- /dev/null
+++ b/src.gen/@amzn/amazon-q-developer-streaming-client/tsconfig.types.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig",
+  "compilerOptions": {
+    "removeComments": false,
+    "declaration": true,
+    "declarationDir": "dist-types",
+    "emitDeclarationOnly": true
+  },
+  "exclude": ["test/**/*", "dist-types/**/*"]
+}
diff --git a/src.gen/@amzn/codewhisperer-streaming/LICENSE b/src.gen/@amzn/codewhisperer-streaming/LICENSE
new file mode 100644
index 00000000000..ba9d6d15269
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/LICENSE
@@ -0,0 +1,201 @@
+                                Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2018-2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/src.gen/@amzn/codewhisperer-streaming/README.md b/src.gen/@amzn/codewhisperer-streaming/README.md
new file mode 100644
index 00000000000..ea254be0911
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/README.md
@@ -0,0 +1,815 @@
+<!-- generated file, do not edit directly -->
+
+# @amzn/codewhisperer-streaming
+
+## Description
+
+AWS SDK for JavaScript CodeWhispererStreaming Client for Node.js, Browser and React Native.
+
+## Installing
+To install this package, simply type add or install @amzn/codewhisperer-streaming
+using your favorite package manager:
+- `npm install @amzn/codewhisperer-streaming`
+- `yarn add @amzn/codewhisperer-streaming`
+- `pnpm add @amzn/codewhisperer-streaming`
+
+## Getting Started
+
+### Import
+
+The AWS SDK is modulized by clients and commands.
+To send a request, you only need to import the `CodeWhispererStreamingClient` and
+the commands you need, for example `SendMessageCommand`:
+
+```js
+// ES5 example
+const { CodeWhispererStreamingClient, SendMessageCommand } = require("@amzn/codewhisperer-streaming");
+```
+
+```ts
+// ES6+ example
+import { CodeWhispererStreamingClient, SendMessageCommand } from "@amzn/codewhisperer-streaming";
+```
+
+### Usage
+
+To send a request, you:
+
+- Initiate client with configuration (e.g. credentials, region).
+- Initiate command with input parameters.
+- Call `send` operation on client with command object as input.
+- If you are using a custom http handler, you may call `destroy()` to close open connections.
+
+```js
+// a client can be shared by different commands.
+const client = new CodeWhispererStreamingClient({ region: "REGION" });
+
+const params = { /** input parameters */ };
+const command = new SendMessageCommand(params);
+```
+
+#### Async/await
+
+We recommend using [await](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/await)
+operator to wait for the promise returned by send operation as follows:
+
+```js
+// async/await.
+try {
+  const data = await client.send(command);
+  // process data.
+} catch (error) {
+  // error handling.
+} finally {
+  // finally.
+}
+```
+
+Async-await is clean, concise, intuitive, easy to debug and has better error handling
+as compared to using Promise chains or callbacks.
+
+#### Promises
+
+You can also use [Promise chaining](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises#chaining)
+to execute send operation.
+
+```js
+client.send(command).then(
+  (data) => {
+    // process data.
+  },
+  (error) => {
+    // error handling.
+  }
+);
+```
+
+Promises can also be called using `.catch()` and `.finally()` as follows:
+
+```js
+client
+  .send(command)
+  .then((data) => {
+    // process data.
+  })
+  .catch((error) => {
+    // error handling.
+  })
+  .finally(() => {
+    // finally.
+  });
+```
+
+#### Callbacks
+
+We do not recommend using callbacks because of [callback hell](http://callbackhell.com/),
+but they are supported by the send operation.
+
+```js
+// callbacks.
+client.send(command, (err, data) => {
+  // process err and data.
+});
+```
+
+#### v2 compatible style
+
+The client can also send requests using v2 compatible style.
+However, it results in a bigger bundle size and may be dropped in next major version. More details in the blog post
+on [modular packages in AWS SDK for JavaScript](https://aws.amazon.com/blogs/developer/modular-packages-in-aws-sdk-for-javascript/)
+
+```ts
+import * as AWS from "@amzn/codewhisperer-streaming";
+const client = new AWS.CodeWhispererStreaming({ region: "REGION" });
+
+// async/await.
+try {
+  const data = await client.sendMessage(params);
+  // process data.
+} catch (error) {
+  // error handling.
+}
+
+// Promises.
+client
+  .sendMessage(params)
+  .then((data) => {
+    // process data.
+  })
+  .catch((error) => {
+    // error handling.
+  });
+
+// callbacks.
+client.sendMessage(params, (err, data) => {
+  // process err and data.
+});
+```
+
+### Troubleshooting
+
+When the service returns an exception, the error will include the exception information,
+as well as response metadata (e.g. request id).
+
+```js
+try {
+  const data = await client.send(command);
+  // process data.
+} catch (error) {
+  const { requestId, cfId, extendedRequestId } = error.$metadata;
+  console.log({ requestId, cfId, extendedRequestId });
+  /**
+   * The keys within exceptions are also parsed.
+   * You can access them by specifying exception names:
+   * if (error.name === 'SomeServiceException') {
+   *     const value = error.specialKeyInException;
+   * }
+   */
+}
+```
+
+## Getting Help
+
+Please use these community resources for getting help.
+We use the GitHub issues for tracking bugs and feature requests, but have limited bandwidth to address them.
+
+- Visit [Developer Guide](https://docs.aws.amazon.com/sdk-for-javascript/v3/developer-guide/welcome.html)
+  or [API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/index.html).
+- Check out the blog posts tagged with [`aws-sdk-js`](https://aws.amazon.com/blogs/developer/tag/aws-sdk-js/)
+  on AWS Developer Blog.
+- Ask a question on [StackOverflow](https://stackoverflow.com/questions/tagged/aws-sdk-js) and tag it with `aws-sdk-js`.
+- Join the AWS JavaScript community on [gitter](https://gitter.im/aws/aws-sdk-js-v3).
+- If it turns out that you may have found a bug, please [open an issue](https://github.com/aws/aws-sdk-js-v3/issues/new/choose).
+
+To test your universal JavaScript code in Node.js, browser and react-native environments,
+visit our [code samples repo](https://github.com/aws-samples/aws-sdk-js-tests).
+
+## Contributing
+
+This client code is generated automatically. Any modifications will be overwritten the next time the `@amzn/codewhisperer-streaming` package is updated.
+To contribute to client you can check our [generate clients scripts](https://github.com/aws/aws-sdk-js-v3/tree/main/scripts/generate-clients).
+
+## License
+
+This SDK is distributed under the
+[Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0),
+see LICENSE for more information.
+
+## Client Commands (Operations List)
+
+<details>
+<summary>
+AllowVendedLogDeliveryForResource
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/AllowVendedLogDeliveryForResourceCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/AllowVendedLogDeliveryForResourceCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/AllowVendedLogDeliveryForResourceCommandOutput/)
+</details>
+<details>
+<summary>
+AssociateCustomizationPermission
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/AssociateCustomizationPermissionCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/AssociateCustomizationPermissionCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/AssociateCustomizationPermissionCommandOutput/)
+</details>
+<details>
+<summary>
+CreateCustomization
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/CreateCustomizationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/CreateCustomizationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/CreateCustomizationCommandOutput/)
+</details>
+<details>
+<summary>
+CreateProfile
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/CreateProfileCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/CreateProfileCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/CreateProfileCommandOutput/)
+</details>
+<details>
+<summary>
+DeleteCustomization
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/DeleteCustomizationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/DeleteCustomizationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/DeleteCustomizationCommandOutput/)
+</details>
+<details>
+<summary>
+DeleteProfile
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/DeleteProfileCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/DeleteProfileCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/DeleteProfileCommandOutput/)
+</details>
+<details>
+<summary>
+DisassociateCustomizationPermission
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/DisassociateCustomizationPermissionCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/DisassociateCustomizationPermissionCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/DisassociateCustomizationPermissionCommandOutput/)
+</details>
+<details>
+<summary>
+GenerateRecommendations
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/GenerateRecommendationsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GenerateRecommendationsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GenerateRecommendationsCommandOutput/)
+</details>
+<details>
+<summary>
+GetCustomization
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/GetCustomizationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetCustomizationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetCustomizationCommandOutput/)
+</details>
+<details>
+<summary>
+ListCustomizationPermissions
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/ListCustomizationPermissionsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListCustomizationPermissionsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListCustomizationPermissionsCommandOutput/)
+</details>
+<details>
+<summary>
+ListCustomizations
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/ListCustomizationsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListCustomizationsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListCustomizationsCommandOutput/)
+</details>
+<details>
+<summary>
+ListCustomizationVersions
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/ListCustomizationVersionsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListCustomizationVersionsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListCustomizationVersionsCommandOutput/)
+</details>
+<details>
+<summary>
+ListProfiles
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/ListProfilesCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListProfilesCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListProfilesCommandOutput/)
+</details>
+<details>
+<summary>
+ListTagsForResource
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/ListTagsForResourceCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListTagsForResourceCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListTagsForResourceCommandOutput/)
+</details>
+<details>
+<summary>
+TagResource
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/TagResourceCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/TagResourceCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/TagResourceCommandOutput/)
+</details>
+<details>
+<summary>
+UntagResource
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/UntagResourceCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/UntagResourceCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/UntagResourceCommandOutput/)
+</details>
+<details>
+<summary>
+UpdateCustomization
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/UpdateCustomizationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/UpdateCustomizationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/UpdateCustomizationCommandOutput/)
+</details>
+<details>
+<summary>
+UpdateProfile
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/UpdateProfileCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/UpdateProfileCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/UpdateProfileCommandOutput/)
+</details>
+<details>
+<summary>
+VendKeyGrant
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/VendKeyGrantCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/VendKeyGrantCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/VendKeyGrantCommandOutput/)
+</details>
+<details>
+<summary>
+CreateArtifactUploadUrl
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/CreateArtifactUploadUrlCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/CreateArtifactUploadUrlCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/CreateArtifactUploadUrlCommandOutput/)
+</details>
+<details>
+<summary>
+CreateTaskAssistConversation
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/CreateTaskAssistConversationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/CreateTaskAssistConversationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/CreateTaskAssistConversationCommandOutput/)
+</details>
+<details>
+<summary>
+CreateUploadUrl
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/CreateUploadUrlCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/CreateUploadUrlCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/CreateUploadUrlCommandOutput/)
+</details>
+<details>
+<summary>
+CreateWorkspace
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/CreateWorkspaceCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/CreateWorkspaceCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/CreateWorkspaceCommandOutput/)
+</details>
+<details>
+<summary>
+DeleteTaskAssistConversation
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/DeleteTaskAssistConversationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/DeleteTaskAssistConversationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/DeleteTaskAssistConversationCommandOutput/)
+</details>
+<details>
+<summary>
+DeleteWorkspace
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/DeleteWorkspaceCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/DeleteWorkspaceCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/DeleteWorkspaceCommandOutput/)
+</details>
+<details>
+<summary>
+GenerateCompletions
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/GenerateCompletionsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GenerateCompletionsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GenerateCompletionsCommandOutput/)
+</details>
+<details>
+<summary>
+GetCodeAnalysis
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/GetCodeAnalysisCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetCodeAnalysisCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetCodeAnalysisCommandOutput/)
+</details>
+<details>
+<summary>
+GetCodeFixJob
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/GetCodeFixJobCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetCodeFixJobCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetCodeFixJobCommandOutput/)
+</details>
+<details>
+<summary>
+GetTaskAssistCodeGeneration
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/GetTaskAssistCodeGenerationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetTaskAssistCodeGenerationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetTaskAssistCodeGenerationCommandOutput/)
+</details>
+<details>
+<summary>
+GetTestGeneration
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/GetTestGenerationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetTestGenerationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetTestGenerationCommandOutput/)
+</details>
+<details>
+<summary>
+GetTransformation
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/GetTransformationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetTransformationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetTransformationCommandOutput/)
+</details>
+<details>
+<summary>
+GetTransformationPlan
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/GetTransformationPlanCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetTransformationPlanCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetTransformationPlanCommandOutput/)
+</details>
+<details>
+<summary>
+ListAvailableCustomizations
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/ListAvailableCustomizationsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListAvailableCustomizationsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListAvailableCustomizationsCommandOutput/)
+</details>
+<details>
+<summary>
+ListAvailableProfiles
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/ListAvailableProfilesCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListAvailableProfilesCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListAvailableProfilesCommandOutput/)
+</details>
+<details>
+<summary>
+ListCodeAnalysisFindings
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/ListCodeAnalysisFindingsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListCodeAnalysisFindingsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListCodeAnalysisFindingsCommandOutput/)
+</details>
+<details>
+<summary>
+ListFeatureEvaluations
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/ListFeatureEvaluationsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListFeatureEvaluationsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListFeatureEvaluationsCommandOutput/)
+</details>
+<details>
+<summary>
+ListWorkspaceMetadata
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/ListWorkspaceMetadataCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListWorkspaceMetadataCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListWorkspaceMetadataCommandOutput/)
+</details>
+<details>
+<summary>
+ResumeTransformation
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/ResumeTransformationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ResumeTransformationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ResumeTransformationCommandOutput/)
+</details>
+<details>
+<summary>
+SendTelemetryEvent
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/SendTelemetryEventCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/SendTelemetryEventCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/SendTelemetryEventCommandOutput/)
+</details>
+<details>
+<summary>
+StartCodeAnalysis
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/StartCodeAnalysisCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/StartCodeAnalysisCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/StartCodeAnalysisCommandOutput/)
+</details>
+<details>
+<summary>
+StartCodeFixJob
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/StartCodeFixJobCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/StartCodeFixJobCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/StartCodeFixJobCommandOutput/)
+</details>
+<details>
+<summary>
+StartTaskAssistCodeGeneration
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/StartTaskAssistCodeGenerationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/StartTaskAssistCodeGenerationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/StartTaskAssistCodeGenerationCommandOutput/)
+</details>
+<details>
+<summary>
+StartTestGeneration
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/StartTestGenerationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/StartTestGenerationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/StartTestGenerationCommandOutput/)
+</details>
+<details>
+<summary>
+StartTransformation
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/StartTransformationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/StartTransformationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/StartTransformationCommandOutput/)
+</details>
+<details>
+<summary>
+StopTransformation
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/StopTransformationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/StopTransformationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/StopTransformationCommandOutput/)
+</details>
+<details>
+<summary>
+ExportResultArchive
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/ExportResultArchiveCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ExportResultArchiveCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ExportResultArchiveCommandOutput/)
+</details>
+<details>
+<summary>
+GenerateAssistantResponse
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/GenerateAssistantResponseCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GenerateAssistantResponseCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GenerateAssistantResponseCommandOutput/)
+</details>
+<details>
+<summary>
+GenerateTaskAssistPlan
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/GenerateTaskAssistPlanCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GenerateTaskAssistPlanCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GenerateTaskAssistPlanCommandOutput/)
+</details>
+<details>
+<summary>
+AssociateConnectorResource
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/AssociateConnectorResourceCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/AssociateConnectorResourceCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/AssociateConnectorResourceCommandOutput/)
+</details>
+<details>
+<summary>
+CreateAssignment
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/CreateAssignmentCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/CreateAssignmentCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/CreateAssignmentCommandOutput/)
+</details>
+<details>
+<summary>
+CreateExtension
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/CreateExtensionCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/CreateExtensionCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/CreateExtensionCommandOutput/)
+</details>
+<details>
+<summary>
+CreatePlugin
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/CreatePluginCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/CreatePluginCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/CreatePluginCommandOutput/)
+</details>
+<details>
+<summary>
+CreateResolution
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/CreateResolutionCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/CreateResolutionCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/CreateResolutionCommandOutput/)
+</details>
+<details>
+<summary>
+DeleteAssignment
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/DeleteAssignmentCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/DeleteAssignmentCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/DeleteAssignmentCommandOutput/)
+</details>
+<details>
+<summary>
+DeleteConversation
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/DeleteConversationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/DeleteConversationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/DeleteConversationCommandOutput/)
+</details>
+<details>
+<summary>
+DeleteExtension
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/DeleteExtensionCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/DeleteExtensionCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/DeleteExtensionCommandOutput/)
+</details>
+<details>
+<summary>
+DeletePlugin
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/DeletePluginCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/DeletePluginCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/DeletePluginCommandOutput/)
+</details>
+<details>
+<summary>
+GetConnector
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/GetConnectorCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetConnectorCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetConnectorCommandOutput/)
+</details>
+<details>
+<summary>
+GetConversation
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/GetConversationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetConversationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetConversationCommandOutput/)
+</details>
+<details>
+<summary>
+GetExtension
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/GetExtensionCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetExtensionCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetExtensionCommandOutput/)
+</details>
+<details>
+<summary>
+GetIdentityMetadata
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/GetIdentityMetadataCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetIdentityMetadataCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetIdentityMetadataCommandOutput/)
+</details>
+<details>
+<summary>
+GetPlugin
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/GetPluginCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetPluginCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetPluginCommandOutput/)
+</details>
+<details>
+<summary>
+GetTask
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/GetTaskCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetTaskCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetTaskCommandOutput/)
+</details>
+<details>
+<summary>
+GetTroubleshootingResults
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/GetTroubleshootingResultsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetTroubleshootingResultsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GetTroubleshootingResultsCommandOutput/)
+</details>
+<details>
+<summary>
+InvokeTask
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/InvokeTaskCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/InvokeTaskCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/InvokeTaskCommandOutput/)
+</details>
+<details>
+<summary>
+ListConversations
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/ListConversationsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListConversationsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListConversationsCommandOutput/)
+</details>
+<details>
+<summary>
+ListDashboardMetrics
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/ListDashboardMetricsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListDashboardMetricsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListDashboardMetricsCommandOutput/)
+</details>
+<details>
+<summary>
+ListExtensionProviders
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/ListExtensionProvidersCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListExtensionProvidersCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListExtensionProvidersCommandOutput/)
+</details>
+<details>
+<summary>
+ListExtensions
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/ListExtensionsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListExtensionsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListExtensionsCommandOutput/)
+</details>
+<details>
+<summary>
+ListPluginProviders
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/ListPluginProvidersCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListPluginProvidersCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListPluginProvidersCommandOutput/)
+</details>
+<details>
+<summary>
+ListPlugins
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/ListPluginsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListPluginsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListPluginsCommandOutput/)
+</details>
+<details>
+<summary>
+ListTagsForResource
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/ListTagsForResourceCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListTagsForResourceCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListTagsForResourceCommandOutput/)
+</details>
+<details>
+<summary>
+ListTasks
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/ListTasksCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListTasksCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/ListTasksCommandOutput/)
+</details>
+<details>
+<summary>
+PassRequest
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/PassRequestCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/PassRequestCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/PassRequestCommandOutput/)
+</details>
+<details>
+<summary>
+RejectConnector
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/RejectConnectorCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/RejectConnectorCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/RejectConnectorCommandOutput/)
+</details>
+<details>
+<summary>
+SendEvent
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/SendEventCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/SendEventCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/SendEventCommandOutput/)
+</details>
+<details>
+<summary>
+SendMessage
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/SendMessageCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/SendMessageCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/SendMessageCommandOutput/)
+</details>
+<details>
+<summary>
+StartConversation
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/StartConversationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/StartConversationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/StartConversationCommandOutput/)
+</details>
+<details>
+<summary>
+StartTroubleshootingAnalysis
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/StartTroubleshootingAnalysisCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/StartTroubleshootingAnalysisCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/StartTroubleshootingAnalysisCommandOutput/)
+</details>
+<details>
+<summary>
+StartTroubleshootingResolutionExplanation
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/StartTroubleshootingResolutionExplanationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/StartTroubleshootingResolutionExplanationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/StartTroubleshootingResolutionExplanationCommandOutput/)
+</details>
+<details>
+<summary>
+TagResource
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/TagResourceCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/TagResourceCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/TagResourceCommandOutput/)
+</details>
+<details>
+<summary>
+UntagResource
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/UntagResourceCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/UntagResourceCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/UntagResourceCommandOutput/)
+</details>
+<details>
+<summary>
+UpdateConversation
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/UpdateConversationCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/UpdateConversationCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/UpdateConversationCommandOutput/)
+</details>
+<details>
+<summary>
+UpdatePlugin
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/UpdatePluginCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/UpdatePluginCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/UpdatePluginCommandOutput/)
+</details>
+<details>
+<summary>
+UpdateTroubleshootingCommandResult
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/UpdateTroubleshootingCommandResultCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/UpdateTroubleshootingCommandResultCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/UpdateTroubleshootingCommandResultCommandOutput/)
+</details>
+<details>
+<summary>
+UsePlugin
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/UsePluginCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/UsePluginCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/UsePluginCommandOutput/)
+</details>
+<details>
+<summary>
+GenerateCodeFromCommands
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/GenerateCodeFromCommandsCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GenerateCodeFromCommandsCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/GenerateCodeFromCommandsCommandOutput/)
+</details>
+<details>
+<summary>
+SendMessage
+</summary>
+
+[Command API Reference](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/codewhispererstreaming/command/SendMessageCommand/) / [Input](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/SendMessageCommandInput/) / [Output](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-aws-sdk-client-codewhispererstreaming/Interface/SendMessageCommandOutput/)
+</details>
diff --git a/src.gen/@amzn/codewhisperer-streaming/api-extractor.json b/src.gen/@amzn/codewhisperer-streaming/api-extractor.json
new file mode 100644
index 00000000000..d5bf5ffeee8
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/api-extractor.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../../api-extractor.json",
+  "mainEntryPointFilePath": "<projectFolder>/dist-types/index.d.ts"
+}
diff --git a/src.gen/@amzn/codewhisperer-streaming/package-lock.json b/src.gen/@amzn/codewhisperer-streaming/package-lock.json
new file mode 100644
index 00000000000..8c668cff199
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/package-lock.json
@@ -0,0 +1,1698 @@
+{
+    "name": "@amzn/codewhisperer-streaming",
+    "version": "1.0.0",
+    "lockfileVersion": 3,
+    "requires": true,
+    "packages": {
+        "": {
+            "name": "@amzn/codewhisperer-streaming",
+            "version": "1.0.0",
+            "hasInstallScript": true,
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.731.0",
+                "@aws-sdk/middleware-host-header": "3.731.0",
+                "@aws-sdk/middleware-logger": "3.731.0",
+                "@aws-sdk/middleware-recursion-detection": "3.731.0",
+                "@aws-sdk/middleware-user-agent": "3.731.0",
+                "@aws-sdk/region-config-resolver": "3.731.0",
+                "@aws-sdk/token-providers": "3.731.1",
+                "@aws-sdk/types": "3.731.0",
+                "@aws-sdk/util-user-agent-browser": "3.731.0",
+                "@aws-sdk/util-user-agent-node": "3.731.0",
+                "@smithy/config-resolver": "^4.0.1",
+                "@smithy/core": "^3.1.1",
+                "@smithy/eventstream-serde-browser": "^4.0.1",
+                "@smithy/eventstream-serde-config-resolver": "^4.0.1",
+                "@smithy/eventstream-serde-node": "^4.0.1",
+                "@smithy/fetch-http-handler": "^5.0.1",
+                "@smithy/hash-node": "^4.0.1",
+                "@smithy/invalid-dependency": "^4.0.1",
+                "@smithy/middleware-content-length": "^4.0.1",
+                "@smithy/middleware-retry": "^4.0.3",
+                "@smithy/middleware-serde": "^4.0.1",
+                "@smithy/middleware-stack": "^4.0.1",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/node-http-handler": "^4.0.2",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/smithy-client": "^4.1.2",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.3",
+                "@smithy/util-defaults-mode-node": "^4.0.3",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-retry": "^4.0.1",
+                "@smithy/util-utf8": "^4.0.0",
+                "@types/uuid": "^9.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "devDependencies": {
+                "@tsconfig/node18": "18.2.4",
+                "@types/node": "^18.19.69",
+                "concurrently": "7.0.0",
+                "downlevel-dts": "0.10.1",
+                "rimraf": "^3.0.0",
+                "typescript": "~5.2.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-crypto/crc32": {
+            "version": "5.2.0",
+            "integrity": "sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/util": "^5.2.0",
+                "@aws-sdk/types": "^3.222.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-crypto/sha256-browser": {
+            "version": "5.2.0",
+            "integrity": "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-js": "^5.2.0",
+                "@aws-crypto/supports-web-crypto": "^5.2.0",
+                "@aws-crypto/util": "^5.2.0",
+                "@aws-sdk/types": "^3.222.0",
+                "@aws-sdk/util-locate-window": "^3.0.0",
+                "@smithy/util-utf8": "^2.0.0",
+                "tslib": "^2.6.2"
+            }
+        },
+        "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/is-array-buffer": {
+            "version": "2.2.0",
+            "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-buffer-from": {
+            "version": "2.2.0",
+            "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^2.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-utf8": {
+            "version": "2.3.0",
+            "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^2.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/@aws-crypto/sha256-js": {
+            "version": "5.2.0",
+            "integrity": "sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/util": "^5.2.0",
+                "@aws-sdk/types": "^3.222.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/@aws-crypto/supports-web-crypto": {
+            "version": "5.2.0",
+            "integrity": "sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            }
+        },
+        "node_modules/@aws-crypto/util": {
+            "version": "5.2.0",
+            "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "^3.222.0",
+                "@smithy/util-utf8": "^2.0.0",
+                "tslib": "^2.6.2"
+            }
+        },
+        "node_modules/@aws-crypto/util/node_modules/@smithy/is-array-buffer": {
+            "version": "2.2.0",
+            "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/@aws-crypto/util/node_modules/@smithy/util-buffer-from": {
+            "version": "2.2.0",
+            "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^2.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": {
+            "version": "2.3.0",
+            "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^2.2.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/core": {
+            "version": "3.731.0",
+            "integrity": "sha512-ithBN1VWASkvAIlozJmenqDvNnFddr/SZXAs58+jCnBHgy3tXLHABZGVNCjetZkHRqNdXEO1kirnoxaFeXMeDA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/core": "^3.0.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/signature-v4": "^5.0.0",
+                "@smithy/smithy-client": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.0",
+                "fast-xml-parser": "4.4.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/middleware-host-header": {
+            "version": "3.731.0",
+            "integrity": "sha512-ndAJsm5uWPPJRZowLKpB1zuL17qWlWVtCJP4I/ynBkq1PU1DijDXBul2UZaG6Mpvsgms1NXo/h9noHuK7T3v8w==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/middleware-logger": {
+            "version": "3.731.0",
+            "integrity": "sha512-IIZrOdjbY2vKzPJPrwE7FoFQCIPEL6UqURi8LEaiVyCag4p2fvaTN5pgKuQtGC2+iYd/HHcGT4qn2bAqF5Jmmw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/middleware-recursion-detection": {
+            "version": "3.731.0",
+            "integrity": "sha512-y6FLASB1iKWuR5tUipMyo77bt0lEl3OnCrrd2xw/H24avq1HhJjjPR0HHhJE6QKJzF/FYXeV88tcyPSMe32VDw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/middleware-user-agent": {
+            "version": "3.731.0",
+            "integrity": "sha512-Ngr2Gz0aec/uduoKaO3srN52SYkEHndYtFzkK/gDUyQwQzi4ha2eIisxPiuHEX6RvXT31V9ouqn/YtVkt0R76A==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/core": "3.731.0",
+                "@aws-sdk/types": "3.731.0",
+                "@aws-sdk/util-endpoints": "3.731.0",
+                "@smithy/core": "^3.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/nested-clients": {
+            "version": "3.731.1",
+            "integrity": "sha512-/L8iVrulnXZl+kgmTn+oxRxNnhcSIbf+r12C06vGUq60w0YMidLvxJZN7vt8H9SnCAGCHqud2MS7ExCEvhc0gA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/sha256-browser": "5.2.0",
+                "@aws-crypto/sha256-js": "5.2.0",
+                "@aws-sdk/core": "3.731.0",
+                "@aws-sdk/middleware-host-header": "3.731.0",
+                "@aws-sdk/middleware-logger": "3.731.0",
+                "@aws-sdk/middleware-recursion-detection": "3.731.0",
+                "@aws-sdk/middleware-user-agent": "3.731.0",
+                "@aws-sdk/region-config-resolver": "3.731.0",
+                "@aws-sdk/types": "3.731.0",
+                "@aws-sdk/util-endpoints": "3.731.0",
+                "@aws-sdk/util-user-agent-browser": "3.731.0",
+                "@aws-sdk/util-user-agent-node": "3.731.0",
+                "@smithy/config-resolver": "^4.0.0",
+                "@smithy/core": "^3.0.0",
+                "@smithy/fetch-http-handler": "^5.0.0",
+                "@smithy/hash-node": "^4.0.0",
+                "@smithy/invalid-dependency": "^4.0.0",
+                "@smithy/middleware-content-length": "^4.0.0",
+                "@smithy/middleware-endpoint": "^4.0.0",
+                "@smithy/middleware-retry": "^4.0.0",
+                "@smithy/middleware-serde": "^4.0.0",
+                "@smithy/middleware-stack": "^4.0.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/node-http-handler": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.0",
+                "@smithy/smithy-client": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/url-parser": "^4.0.0",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-body-length-node": "^4.0.0",
+                "@smithy/util-defaults-mode-browser": "^4.0.0",
+                "@smithy/util-defaults-mode-node": "^4.0.0",
+                "@smithy/util-endpoints": "^3.0.0",
+                "@smithy/util-middleware": "^4.0.0",
+                "@smithy/util-retry": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/region-config-resolver": {
+            "version": "3.731.0",
+            "integrity": "sha512-XlDpRNkDVHF59f07JmkuAidEv//m3hT6/JL85h0l3+zrpaRWhf8n8lVUyAPNq35ZujK8AcorYM+93u7hdWsliQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/token-providers": {
+            "version": "3.731.1",
+            "integrity": "sha512-t34GOPwBZsX7zGHjiTXmMHGY3kHM7fLiQ60Jqk0On9P0ASHTDE5U75RgCXboE3u+qEv9wyKyaqMNyMWj9qQlFg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/nested-clients": "3.731.1",
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/property-provider": "^4.0.0",
+                "@smithy/shared-ini-file-loader": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/types": {
+            "version": "3.731.0",
+            "integrity": "sha512-NrdkJg6oOUbXR2r9WvHP408CLyvST8cJfp1/jP9pemtjvjPoh6NukbCtiSFdOOb1eryP02CnqQWItfJC1p2Y/Q==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/util-endpoints": {
+            "version": "3.731.0",
+            "integrity": "sha512-riztxTAfncFS9yQWcBJffGgOgLoKSa63ph+rxWJxKl6BHAmWEvHICj1qDcVmnWfIcvJ5cClclY75l9qKaUH7rQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/types": "^4.0.0",
+                "@smithy/util-endpoints": "^3.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/util-locate-window": {
+            "version": "3.723.0",
+            "integrity": "sha512-Yf2CS10BqK688DRsrKI/EO6B8ff5J86NXe4C+VCysK7UOgN0l1zOTeTukZ3H8Q9tYYX3oaF1961o8vRkFm7Nmw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@aws-sdk/util-user-agent-browser": {
+            "version": "3.731.0",
+            "integrity": "sha512-EnYXxTkCNCjTTBjW/pelRPv4Thsi9jepoB6qQjPMA9/ixrZ71BhhQecz9kgqzZLR9BPCwb6hgJ/Yd702jqJ4aQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/types": "^4.0.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
+            }
+        },
+        "node_modules/@aws-sdk/util-user-agent-node": {
+            "version": "3.731.0",
+            "integrity": "sha512-Rze78Ym5Bx7aWMvmZE2iL3JPo2INNCC5N9rLVx98Gg1G0ZaxclVRUvJrh1AojNlOFxU+otkxAe7FA3Foy2iLLQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-sdk/middleware-user-agent": "3.731.0",
+                "@aws-sdk/types": "3.731.0",
+                "@smithy/node-config-provider": "^4.0.0",
+                "@smithy/types": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            },
+            "peerDependencies": {
+                "aws-crt": ">=1.0.0"
+            },
+            "peerDependenciesMeta": {
+                "aws-crt": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@babel/runtime": {
+            "version": "7.26.9",
+            "integrity": "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "regenerator-runtime": "^0.14.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@smithy/abort-controller": {
+            "version": "4.0.1",
+            "integrity": "sha512-fiUIYgIgRjMWznk6iLJz35K2YxSLHzLBA/RC6lBrKfQ8fHbPfvk7Pk9UvpKoHgJjI18MnbPuEju53zcVy6KF1g==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/config-resolver": {
+            "version": "4.0.1",
+            "integrity": "sha512-Igfg8lKu3dRVkTSEm98QpZUvKEOa71jDX4vKRcvJVyRc3UgN3j7vFMf0s7xLQhYmKa8kyJGQgUJDOV5V3neVlQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-config-provider": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/core": {
+            "version": "3.1.5",
+            "integrity": "sha512-HLclGWPkCsekQgsyzxLhCQLa8THWXtB5PxyYN+2O6nkyLt550KQKTlbV2D1/j5dNIQapAZM1+qFnpBFxZQkgCA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-body-length-browser": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-stream": "^4.1.2",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/credential-provider-imds": {
+            "version": "4.0.1",
+            "integrity": "sha512-l/qdInaDq1Zpznpmev/+52QomsJNZ3JkTl5yrTl02V6NBgJOQ4LY0SFw/8zsMwj3tLe8vqiIuwF6nxaEwgf6mg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/eventstream-codec": {
+            "version": "4.0.1",
+            "integrity": "sha512-Q2bCAAR6zXNVtJgifsU16ZjKGqdw/DyecKNgIgi7dlqw04fqDu0mnq+JmGphqheypVc64CYq3azSuCpAdFk2+A==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@aws-crypto/crc32": "5.2.0",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/eventstream-serde-browser": {
+            "version": "4.0.1",
+            "integrity": "sha512-HbIybmz5rhNg+zxKiyVAnvdM3vkzjE6ccrJ620iPL8IXcJEntd3hnBl+ktMwIy12Te/kyrSbUb8UCdnUT4QEdA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/eventstream-serde-universal": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/eventstream-serde-config-resolver": {
+            "version": "4.0.1",
+            "integrity": "sha512-lSipaiq3rmHguHa3QFF4YcCM3VJOrY9oq2sow3qlhFY+nBSTF/nrO82MUQRPrxHQXA58J5G1UnU2WuJfi465BA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/eventstream-serde-node": {
+            "version": "4.0.1",
+            "integrity": "sha512-o4CoOI6oYGYJ4zXo34U8X9szDe3oGjmHgsMGiZM0j4vtNoT+h80TLnkUcrLZR3+E6HIxqW+G+9WHAVfl0GXK0Q==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/eventstream-serde-universal": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/eventstream-serde-universal": {
+            "version": "4.0.1",
+            "integrity": "sha512-Z94uZp0tGJuxds3iEAZBqGU2QiaBHP4YytLUjwZWx+oUeohCsLyUm33yp4MMBmhkuPqSbQCXq5hDet6JGUgHWA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/eventstream-codec": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/fetch-http-handler": {
+            "version": "5.0.1",
+            "integrity": "sha512-3aS+fP28urrMW2KTjb6z9iFow6jO8n3MFfineGbndvzGZit3taZhKWtTorf+Gp5RpFDDafeHlhfsGlDCXvUnJA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/querystring-builder": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-base64": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/hash-node": {
+            "version": "4.0.1",
+            "integrity": "sha512-TJ6oZS+3r2Xu4emVse1YPB3Dq3d8RkZDKcPr71Nj/lJsdAP1c7oFzYqEn1IBc915TsgLl2xIJNuxCz+gLbLE0w==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/invalid-dependency": {
+            "version": "4.0.1",
+            "integrity": "sha512-gdudFPf4QRQ5pzj7HEnu6FhKRi61BfH/Gk5Yf6O0KiSbr1LlVhgjThcvjdu658VE6Nve8vaIWB8/fodmS1rBPQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/is-array-buffer": {
+            "version": "4.0.0",
+            "integrity": "sha512-saYhF8ZZNoJDTvJBEWgeBccCg+yvp1CX+ed12yORU3NilJScfc6gfch2oVb4QgxZrGUx3/ZJlb+c/dJbyupxlw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/middleware-content-length": {
+            "version": "4.0.1",
+            "integrity": "sha512-OGXo7w5EkB5pPiac7KNzVtfCW2vKBTZNuCctn++TTSOMpe6RZO/n6WEC1AxJINn3+vWLKW49uad3lo/u0WJ9oQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/middleware-endpoint": {
+            "version": "4.0.6",
+            "integrity": "sha512-ftpmkTHIFqgaFugcjzLZv3kzPEFsBFSnq1JsIkr2mwFzCraZVhQk2gqN51OOeRxqhbPTkRFj39Qd2V91E/mQxg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/core": "^3.1.5",
+                "@smithy/middleware-serde": "^4.0.2",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/url-parser": "^4.0.1",
+                "@smithy/util-middleware": "^4.0.1",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/middleware-retry": {
+            "version": "4.0.7",
+            "integrity": "sha512-58j9XbUPLkqAcV1kHzVX/kAR16GT+j7DUZJqwzsxh1jtz7G82caZiGyyFgUvogVfNTg3TeAOIJepGc8TXF4AVQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/service-error-classification": "^4.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-retry": "^4.0.1",
+                "tslib": "^2.6.2",
+                "uuid": "^9.0.1"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/middleware-serde": {
+            "version": "4.0.2",
+            "integrity": "sha512-Sdr5lOagCn5tt+zKsaW+U2/iwr6bI9p08wOkCp6/eL6iMbgdtc2R5Ety66rf87PeohR0ExI84Txz9GYv5ou3iQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/middleware-stack": {
+            "version": "4.0.1",
+            "integrity": "sha512-dHwDmrtR/ln8UTHpaIavRSzeIk5+YZTBtLnKwDW3G2t6nAupCiQUvNzNoHBpik63fwUaJPtlnMzXbQrNFWssIA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/node-config-provider": {
+            "version": "4.0.1",
+            "integrity": "sha512-8mRTjvCtVET8+rxvmzRNRR0hH2JjV0DFOmwXPrISmTIJEfnCBugpYYGAsCj8t41qd+RB5gbheSQ/6aKZCQvFLQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/shared-ini-file-loader": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/node-http-handler": {
+            "version": "4.0.3",
+            "integrity": "sha512-dYCLeINNbYdvmMLtW0VdhW1biXt+PPCGazzT5ZjKw46mOtdgToQEwjqZSS9/EN8+tNs/RO0cEWG044+YZs97aA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/abort-controller": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/querystring-builder": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/property-provider": {
+            "version": "4.0.1",
+            "integrity": "sha512-o+VRiwC2cgmk/WFV0jaETGOtX16VNPp2bSQEzu0whbReqE1BMqsP2ami2Vi3cbGVdKu1kq9gQkDAGKbt0WOHAQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/protocol-http": {
+            "version": "5.0.1",
+            "integrity": "sha512-TE4cpj49jJNB/oHyh/cRVEgNZaoPaxd4vteJNB0yGidOCVR0jCw/hjPVsT8Q8FRmj8Bd3bFZt8Dh7xGCT+xMBQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/querystring-builder": {
+            "version": "4.0.1",
+            "integrity": "sha512-wU87iWZoCbcqrwszsOewEIuq+SU2mSoBE2CcsLwE0I19m0B2gOJr1MVjxWcDQYOzHbR1xCk7AcOBbGFUYOKvdg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/querystring-parser": {
+            "version": "4.0.1",
+            "integrity": "sha512-Ma2XC7VS9aV77+clSFylVUnPZRindhB7BbmYiNOdr+CHt/kZNJoPP0cd3QxCnCFyPXC4eybmyE98phEHkqZ5Jw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/service-error-classification": {
+            "version": "4.0.1",
+            "integrity": "sha512-3JNjBfOWpj/mYfjXJHB4Txc/7E4LVq32bwzE7m28GN79+M1f76XHflUaSUkhOriprPDzev9cX/M+dEB80DNDKA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/shared-ini-file-loader": {
+            "version": "4.0.1",
+            "integrity": "sha512-hC8F6qTBbuHRI/uqDgqqi6J0R4GtEZcgrZPhFQnMhfJs3MnUTGSnR1NSJCJs5VWlMydu0kJz15M640fJlRsIOw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/signature-v4": {
+            "version": "5.0.1",
+            "integrity": "sha512-nCe6fQ+ppm1bQuw5iKoeJ0MJfz2os7Ic3GBjOkLOPtavbD1ONoyE3ygjBfz2ythFWm4YnRm6OxW+8p/m9uCoIA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^4.0.0",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-middleware": "^4.0.1",
+                "@smithy/util-uri-escape": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/smithy-client": {
+            "version": "4.1.6",
+            "integrity": "sha512-UYDolNg6h2O0L+cJjtgSyKKvEKCOa/8FHYJnBobyeoeWDmNpXjwOAtw16ezyeu1ETuuLEOZbrynK0ZY1Lx9Jbw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/core": "^3.1.5",
+                "@smithy/middleware-endpoint": "^4.0.6",
+                "@smithy/middleware-stack": "^4.0.1",
+                "@smithy/protocol-http": "^5.0.1",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-stream": "^4.1.2",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/types": {
+            "version": "4.1.0",
+            "integrity": "sha512-enhjdwp4D7CXmwLtD6zbcDMbo6/T6WtuuKCY49Xxc6OMOmUWlBEBDREsxxgV2LIdeQPW756+f97GzcgAwp3iLw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/url-parser": {
+            "version": "4.0.1",
+            "integrity": "sha512-gPXcIEUtw7VlK8f/QcruNXm7q+T5hhvGu9tl63LsJPZ27exB6dtNwvh2HIi0v7JcXJ5emBxB+CJxwaLEdJfA+g==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/querystring-parser": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-base64": {
+            "version": "4.0.0",
+            "integrity": "sha512-CvHfCmO2mchox9kjrtzoHkWHxjHZzaFojLc8quxXY7WAAMAg43nuxwv95tATVgQFNDwd4M9S1qFzj40Ul41Kmg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-body-length-browser": {
+            "version": "4.0.0",
+            "integrity": "sha512-sNi3DL0/k64/LO3A256M+m3CDdG6V7WKWHdAiBBMUN8S3hK3aMPhwnPik2A/a2ONN+9doY9UxaLfgqsIRg69QA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-body-length-node": {
+            "version": "4.0.0",
+            "integrity": "sha512-q0iDP3VsZzqJyje8xJWEJCNIu3lktUGVoSy1KB0UWym2CL1siV3artm+u1DFYTLejpsrdGyCSWBdGNjJzfDPjg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-buffer-from": {
+            "version": "4.0.0",
+            "integrity": "sha512-9TOQ7781sZvddgO8nxueKi3+yGvkY35kotA0Y6BWRajAv8jjmigQ1sBwz0UX47pQMYXJPahSKEKYFgt+rXdcug==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/is-array-buffer": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-config-provider": {
+            "version": "4.0.0",
+            "integrity": "sha512-L1RBVzLyfE8OXH+1hsJ8p+acNUSirQnWQ6/EgpchV88G6zGBTDPdXiiExei6Z1wR2RxYvxY/XLw6AMNCCt8H3w==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-defaults-mode-browser": {
+            "version": "4.0.7",
+            "integrity": "sha512-CZgDDrYHLv0RUElOsmZtAnp1pIjwDVCSuZWOPhIOBvG36RDfX1Q9+6lS61xBf+qqvHoqRjHxgINeQz47cYFC2Q==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "bowser": "^2.11.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-defaults-mode-node": {
+            "version": "4.0.7",
+            "integrity": "sha512-79fQW3hnfCdrfIi1soPbK3zmooRFnLpSx3Vxi6nUlqaaQeC5dm8plt4OTNDNqEEEDkvKghZSaoti684dQFVrGQ==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/config-resolver": "^4.0.1",
+                "@smithy/credential-provider-imds": "^4.0.1",
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/property-provider": "^4.0.1",
+                "@smithy/smithy-client": "^4.1.6",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-endpoints": {
+            "version": "3.0.1",
+            "integrity": "sha512-zVdUENQpdtn9jbpD9SCFK4+aSiavRb9BxEtw9ZGUR1TYo6bBHbIoi7VkrFQ0/RwZlzx0wRBaRmPclj8iAoJCLA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/node-config-provider": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-hex-encoding": {
+            "version": "4.0.0",
+            "integrity": "sha512-Yk5mLhHtfIgW2W2WQZWSg5kuMZCVbvhFmC7rV4IO2QqnZdbEFPmQnCcGMAX2z/8Qj3B9hYYNjZOhWym+RwhePw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-middleware": {
+            "version": "4.0.1",
+            "integrity": "sha512-HiLAvlcqhbzhuiOa0Lyct5IIlyIz0PQO5dnMlmQ/ubYM46dPInB+3yQGkfxsk6Q24Y0n3/JmcA1v5iEhmOF5mA==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-retry": {
+            "version": "4.0.1",
+            "integrity": "sha512-WmRHqNVwn3kI3rKk1LsKcVgPBG6iLTBGC1iYOV3GQegwJ3E8yjzHytPt26VNzOWr1qu0xE03nK0Ug8S7T7oufw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/service-error-classification": "^4.0.1",
+                "@smithy/types": "^4.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-stream": {
+            "version": "4.1.2",
+            "integrity": "sha512-44PKEqQ303d3rlQuiDpcCcu//hV8sn+u2JBo84dWCE0rvgeiVl0IlLMagbU++o0jCWhYCsHaAt9wZuZqNe05Hw==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/fetch-http-handler": "^5.0.1",
+                "@smithy/node-http-handler": "^4.0.3",
+                "@smithy/types": "^4.1.0",
+                "@smithy/util-base64": "^4.0.0",
+                "@smithy/util-buffer-from": "^4.0.0",
+                "@smithy/util-hex-encoding": "^4.0.0",
+                "@smithy/util-utf8": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-uri-escape": {
+            "version": "4.0.0",
+            "integrity": "sha512-77yfbCbQMtgtTylO9itEAdpPXSog3ZxMe09AEhm0dU0NLTalV70ghDZFR+Nfi1C60jnJoh/Re4090/DuZh2Omg==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@smithy/util-utf8": {
+            "version": "4.0.0",
+            "integrity": "sha512-b+zebfKCfRdgNJDknHCob3O7FpeYQN6ZG6YLExMcasDHsCXlsXCEuiPZeLnJLpwa5dvPetGlnGCiMHuLwGvFow==",
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@smithy/util-buffer-from": "^4.0.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": ">=18.0.0"
+            }
+        },
+        "node_modules/@tsconfig/node18": {
+            "version": "18.2.4",
+            "integrity": "sha512-5xxU8vVs9/FNcvm3gE07fPbn9tl6tqGGWA9tSlwsUEkBxtRnTsNmwrV8gasZ9F/EobaSv9+nu8AxUKccw77JpQ==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/@types/node": {
+            "version": "18.19.80",
+            "integrity": "sha512-kEWeMwMeIvxYkeg1gTc01awpwLbfMRZXdIhwRcakd/KlK53jmRC26LqcbIt7fnAQTu5GzlnWmzA3H6+l1u6xxQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "undici-types": "~5.26.4"
+            }
+        },
+        "node_modules/@types/uuid": {
+            "version": "9.0.8",
+            "integrity": "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==",
+            "license": "MIT"
+        },
+        "node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+            }
+        },
+        "node_modules/balanced-match": {
+            "version": "1.0.2",
+            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/bowser": {
+            "version": "2.11.0",
+            "integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==",
+            "license": "MIT"
+        },
+        "node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/chalk": {
+            "version": "4.1.2",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/chalk?sponsor=1"
+            }
+        },
+        "node_modules/chalk/node_modules/supports-color": {
+            "version": "7.2.0",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/cliui": {
+            "version": "7.0.4",
+            "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "string-width": "^4.2.0",
+                "strip-ansi": "^6.0.0",
+                "wrap-ansi": "^7.0.0"
+            }
+        },
+        "node_modules/color-convert": {
+            "version": "2.0.1",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/color-name": {
+            "version": "1.1.4",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/concat-map": {
+            "version": "0.0.1",
+            "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/concurrently": {
+            "version": "7.0.0",
+            "integrity": "sha512-WKM7PUsI8wyXpF80H+zjHP32fsgsHNQfPLw/e70Z5dYkV7hF+rf8q3D+ScWJIEr57CpkO3OWBko6hwhQLPR8Pw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "chalk": "^4.1.0",
+                "date-fns": "^2.16.1",
+                "lodash": "^4.17.21",
+                "rxjs": "^6.6.3",
+                "spawn-command": "^0.0.2-1",
+                "supports-color": "^8.1.0",
+                "tree-kill": "^1.2.2",
+                "yargs": "^16.2.0"
+            },
+            "bin": {
+                "concurrently": "dist/bin/concurrently.js"
+            },
+            "engines": {
+                "node": "^12.20.0 || ^14.13.0 || >=16.0.0"
+            }
+        },
+        "node_modules/date-fns": {
+            "version": "2.30.0",
+            "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/runtime": "^7.21.0"
+            },
+            "engines": {
+                "node": ">=0.11"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/date-fns"
+            }
+        },
+        "node_modules/downlevel-dts": {
+            "version": "0.10.1",
+            "integrity": "sha512-bwY63Y0Gfwotcly4vU6rB66m5txvfQzDGd1Gai9E9orqsDIswXKjkdR18Tm6TidnAk9+J5N68a5VMDO2bsQCKQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "semver": "^7.3.2",
+                "shelljs": "^0.8.3",
+                "typescript": "next"
+            },
+            "bin": {
+                "downlevel-dts": "index.js"
+            }
+        },
+        "node_modules/downlevel-dts/node_modules/typescript": {
+            "version": "5.9.0-dev.20250324",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.0-dev.20250324.tgz",
+            "integrity": "sha512-qehVULhODb1IphPefX/jq0wAXpk6ifAt2lF3mxTsyR3yPDoPkiQdvxw9cURaDjJw6vCijSER6dU8kWmHdWaQnA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "bin": {
+                "tsc": "bin/tsc",
+                "tsserver": "bin/tsserver"
+            },
+            "engines": {
+                "node": ">=14.17"
+            }
+        },
+        "node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/escalade": {
+            "version": "3.2.0",
+            "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/fast-xml-parser": {
+            "version": "4.4.1",
+            "integrity": "sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/NaturalIntelligence"
+                },
+                {
+                    "type": "paypal",
+                    "url": "https://paypal.me/naturalintelligence"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "strnum": "^1.0.5"
+            },
+            "bin": {
+                "fxparser": "src/cli/cli.js"
+            }
+        },
+        "node_modules/fs.realpath": {
+            "version": "1.0.0",
+            "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/function-bind": {
+            "version": "1.1.2",
+            "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+            "dev": true,
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/get-caller-file": {
+            "version": "2.0.5",
+            "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": "6.* || 8.* || >= 10.*"
+            }
+        },
+        "node_modules/glob": {
+            "version": "7.2.3",
+            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+            "deprecated": "Glob versions prior to v9 are no longer supported",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/has-flag": {
+            "version": "4.0.0",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/hasown": {
+            "version": "2.0.2",
+            "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "function-bind": "^1.1.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/inflight": {
+            "version": "1.0.6",
+            "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+            "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+            }
+        },
+        "node_modules/inherits": {
+            "version": "2.0.4",
+            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/interpret": {
+            "version": "1.4.0",
+            "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/is-core-module": {
+            "version": "2.16.1",
+            "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "hasown": "^2.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/is-fullwidth-code-point": {
+            "version": "3.0.0",
+            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/lodash": {
+            "version": "4.17.21",
+            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/minimatch": {
+            "version": "3.1.2",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/once": {
+            "version": "1.4.0",
+            "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "wrappy": "1"
+            }
+        },
+        "node_modules/path-is-absolute": {
+            "version": "1.0.1",
+            "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/path-parse": {
+            "version": "1.0.7",
+            "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/rechoir": {
+            "version": "0.6.2",
+            "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+            "dev": true,
+            "dependencies": {
+                "resolve": "^1.1.6"
+            },
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/regenerator-runtime": {
+            "version": "0.14.1",
+            "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/require-directory": {
+            "version": "2.1.1",
+            "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/resolve": {
+            "version": "1.22.10",
+            "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "is-core-module": "^2.16.0",
+                "path-parse": "^1.0.7",
+                "supports-preserve-symlinks-flag": "^1.0.0"
+            },
+            "bin": {
+                "resolve": "bin/resolve"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/rimraf": {
+            "version": "3.0.2",
+            "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+            "deprecated": "Rimraf versions prior to v4 are no longer supported",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "glob": "^7.1.3"
+            },
+            "bin": {
+                "rimraf": "bin.js"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/rxjs": {
+            "version": "6.6.7",
+            "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "tslib": "^1.9.0"
+            },
+            "engines": {
+                "npm": ">=2.0.0"
+            }
+        },
+        "node_modules/rxjs/node_modules/tslib": {
+            "version": "1.14.1",
+            "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+            "dev": true,
+            "license": "0BSD"
+        },
+        "node_modules/semver": {
+            "version": "7.7.1",
+            "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/shelljs": {
+            "version": "0.8.5",
+            "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "dependencies": {
+                "glob": "^7.0.0",
+                "interpret": "^1.0.0",
+                "rechoir": "^0.6.2"
+            },
+            "bin": {
+                "shjs": "bin/shjs"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/spawn-command": {
+            "version": "0.0.2",
+            "integrity": "sha1-lUThpDygRfhTGqwaSMspva5iM44=",
+            "dev": true
+        },
+        "node_modules/string-width": {
+            "version": "4.2.3",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strnum": {
+            "version": "1.1.2",
+            "integrity": "sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/NaturalIntelligence"
+                }
+            ],
+            "license": "MIT"
+        },
+        "node_modules/supports-color": {
+            "version": "8.1.1",
+            "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/supports-color?sponsor=1"
+            }
+        },
+        "node_modules/supports-preserve-symlinks-flag": {
+            "version": "1.0.0",
+            "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
+        "node_modules/tree-kill": {
+            "version": "1.2.2",
+            "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "tree-kill": "cli.js"
+            }
+        },
+        "node_modules/tslib": {
+            "version": "2.8.1",
+            "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+            "license": "0BSD"
+        },
+        "node_modules/typescript": {
+            "version": "5.2.2",
+            "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "bin": {
+                "tsc": "bin/tsc",
+                "tsserver": "bin/tsserver"
+            },
+            "engines": {
+                "node": ">=14.17"
+            }
+        },
+        "node_modules/undici-types": {
+            "version": "5.26.5",
+            "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/uuid": {
+            "version": "9.0.1",
+            "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+            "funding": [
+                "https://github.com/sponsors/broofa",
+                "https://github.com/sponsors/ctavan"
+            ],
+            "license": "MIT",
+            "bin": {
+                "uuid": "dist/bin/uuid"
+            }
+        },
+        "node_modules/wrap-ansi": {
+            "version": "7.0.0",
+            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+            }
+        },
+        "node_modules/wrappy": {
+            "version": "1.0.2",
+            "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/y18n": {
+            "version": "5.0.8",
+            "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/yargs": {
+            "version": "16.2.0",
+            "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "cliui": "^7.0.2",
+                "escalade": "^3.1.1",
+                "get-caller-file": "^2.0.5",
+                "require-directory": "^2.1.1",
+                "string-width": "^4.2.0",
+                "y18n": "^5.0.5",
+                "yargs-parser": "^20.2.2"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/yargs-parser": {
+            "version": "20.2.9",
+            "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=10"
+            }
+        }
+    }
+}
diff --git a/src.gen/@amzn/codewhisperer-streaming/package.json b/src.gen/@amzn/codewhisperer-streaming/package.json
new file mode 100644
index 00000000000..114af69ec88
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/package.json
@@ -0,0 +1,89 @@
+{
+    "name": "@amzn/codewhisperer-streaming",
+    "description": "@amzn/codewhisperer-streaming client",
+    "version": "1.0.0",
+    "scripts": {
+        "build": "concurrently 'npm:build:cjs' 'npm:build:es' 'npm:build:types'",
+        "build:cjs": "tsc -p tsconfig.cjs.json",
+        "build:es": "tsc -p tsconfig.es.json",
+        "build:types": "tsc -p tsconfig.types.json",
+        "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
+        "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo || exit 0",
+        "prepack": "npm run clean && npm run build",
+        "postinstall": "npm run build"
+    },
+    "main": "./dist-cjs/index.js",
+    "types": "./dist-types/index.d.ts",
+    "module": "./dist-es/index.js",
+    "sideEffects": false,
+    "dependencies": {
+        "tslib": "^2.6.2",
+        "@aws-crypto/sha256-browser": "5.2.0",
+        "@aws-crypto/sha256-js": "5.2.0",
+        "@aws-sdk/core": "3.731.0",
+        "@aws-sdk/middleware-host-header": "3.731.0",
+        "@aws-sdk/middleware-logger": "3.731.0",
+        "@aws-sdk/middleware-recursion-detection": "3.731.0",
+        "@aws-sdk/middleware-user-agent": "3.731.0",
+        "@aws-sdk/region-config-resolver": "3.731.0",
+        "@aws-sdk/token-providers": "3.731.1",
+        "@aws-sdk/types": "3.731.0",
+        "@aws-sdk/util-user-agent-browser": "3.731.0",
+        "@aws-sdk/util-user-agent-node": "3.731.0",
+        "@smithy/config-resolver": "^4.0.1",
+        "@smithy/core": "^3.1.1",
+        "@smithy/eventstream-serde-browser": "^4.0.1",
+        "@smithy/eventstream-serde-config-resolver": "^4.0.1",
+        "@smithy/eventstream-serde-node": "^4.0.1",
+        "@smithy/fetch-http-handler": "^5.0.1",
+        "@smithy/hash-node": "^4.0.1",
+        "@smithy/invalid-dependency": "^4.0.1",
+        "@smithy/middleware-content-length": "^4.0.1",
+        "@smithy/middleware-retry": "^4.0.3",
+        "@smithy/middleware-serde": "^4.0.1",
+        "@smithy/middleware-stack": "^4.0.1",
+        "@smithy/node-config-provider": "^4.0.1",
+        "@smithy/node-http-handler": "^4.0.2",
+        "@smithy/protocol-http": "^5.0.1",
+        "@smithy/smithy-client": "^4.1.2",
+        "@smithy/types": "^4.1.0",
+        "@smithy/url-parser": "^4.0.1",
+        "@smithy/util-base64": "^4.0.0",
+        "@smithy/util-body-length-browser": "^4.0.0",
+        "@smithy/util-body-length-node": "^4.0.0",
+        "@smithy/util-defaults-mode-browser": "^4.0.3",
+        "@smithy/util-defaults-mode-node": "^4.0.3",
+        "@smithy/util-middleware": "^4.0.1",
+        "@smithy/util-retry": "^4.0.1",
+        "@smithy/util-utf8": "^4.0.0",
+        "@types/uuid": "^9.0.1",
+        "uuid": "^9.0.1"
+    },
+    "devDependencies": {
+        "@tsconfig/node18": "18.2.4",
+        "concurrently": "7.0.0",
+        "downlevel-dts": "0.10.1",
+        "rimraf": "^3.0.0",
+        "typescript": "~5.2.2",
+        "@types/node": "^18.19.69"
+    },
+    "engines": {
+        "node": ">=18.0.0"
+    },
+    "typesVersions": {
+        "<4.0": {
+            "dist-types/*": [
+                "dist-types/ts3.4/*"
+            ]
+        }
+    },
+    "files": [
+        "dist-*/**"
+    ],
+    "browser": {
+        "./dist-es/runtimeConfig": "./dist-es/runtimeConfig.browser"
+    },
+    "react-native": {
+        "./dist-es/runtimeConfig": "./dist-es/runtimeConfig.native"
+    }
+}
\ No newline at end of file
diff --git a/src.gen/@amzn/codewhisperer-streaming/src/CodeWhispererStreaming.ts b/src.gen/@amzn/codewhisperer-streaming/src/CodeWhispererStreaming.ts
new file mode 100644
index 00000000000..b7e543f8062
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/src/CodeWhispererStreaming.ts
@@ -0,0 +1,111 @@
+// smithy-typescript generated code
+import {
+  CodeWhispererStreamingClient,
+  CodeWhispererStreamingClientConfig,
+} from "./CodeWhispererStreamingClient";
+import {
+  ExportResultArchiveCommand,
+  ExportResultArchiveCommandInput,
+  ExportResultArchiveCommandOutput,
+} from "./commands/ExportResultArchiveCommand";
+import {
+  GenerateAssistantResponseCommand,
+  GenerateAssistantResponseCommandInput,
+  GenerateAssistantResponseCommandOutput,
+} from "./commands/GenerateAssistantResponseCommand";
+import {
+  GenerateTaskAssistPlanCommand,
+  GenerateTaskAssistPlanCommandInput,
+  GenerateTaskAssistPlanCommandOutput,
+} from "./commands/GenerateTaskAssistPlanCommand";
+import {
+  SendMessageCommand,
+  SendMessageCommandInput,
+  SendMessageCommandOutput,
+} from "./commands/SendMessageCommand";
+import { createAggregatedClient } from "@smithy/smithy-client";
+import { HttpHandlerOptions as __HttpHandlerOptions } from "@smithy/types";
+
+const commands = {
+  ExportResultArchiveCommand,
+  GenerateAssistantResponseCommand,
+  GenerateTaskAssistPlanCommand,
+  SendMessageCommand,
+}
+
+export interface CodeWhispererStreaming {
+  /**
+   * @see {@link ExportResultArchiveCommand}
+   */
+  exportResultArchive(
+    args: ExportResultArchiveCommandInput,
+    options?: __HttpHandlerOptions,
+  ): Promise<ExportResultArchiveCommandOutput>;
+  exportResultArchive(
+    args: ExportResultArchiveCommandInput,
+    cb: (err: any, data?: ExportResultArchiveCommandOutput) => void
+  ): void;
+  exportResultArchive(
+    args: ExportResultArchiveCommandInput,
+    options: __HttpHandlerOptions,
+    cb: (err: any, data?: ExportResultArchiveCommandOutput) => void
+  ): void;
+
+  /**
+   * @see {@link GenerateAssistantResponseCommand}
+   */
+  generateAssistantResponse(
+    args: GenerateAssistantResponseCommandInput,
+    options?: __HttpHandlerOptions,
+  ): Promise<GenerateAssistantResponseCommandOutput>;
+  generateAssistantResponse(
+    args: GenerateAssistantResponseCommandInput,
+    cb: (err: any, data?: GenerateAssistantResponseCommandOutput) => void
+  ): void;
+  generateAssistantResponse(
+    args: GenerateAssistantResponseCommandInput,
+    options: __HttpHandlerOptions,
+    cb: (err: any, data?: GenerateAssistantResponseCommandOutput) => void
+  ): void;
+
+  /**
+   * @see {@link GenerateTaskAssistPlanCommand}
+   */
+  generateTaskAssistPlan(
+    args: GenerateTaskAssistPlanCommandInput,
+    options?: __HttpHandlerOptions,
+  ): Promise<GenerateTaskAssistPlanCommandOutput>;
+  generateTaskAssistPlan(
+    args: GenerateTaskAssistPlanCommandInput,
+    cb: (err: any, data?: GenerateTaskAssistPlanCommandOutput) => void
+  ): void;
+  generateTaskAssistPlan(
+    args: GenerateTaskAssistPlanCommandInput,
+    options: __HttpHandlerOptions,
+    cb: (err: any, data?: GenerateTaskAssistPlanCommandOutput) => void
+  ): void;
+
+  /**
+   * @see {@link SendMessageCommand}
+   */
+  sendMessage(
+    args: SendMessageCommandInput,
+    options?: __HttpHandlerOptions,
+  ): Promise<SendMessageCommandOutput>;
+  sendMessage(
+    args: SendMessageCommandInput,
+    cb: (err: any, data?: SendMessageCommandOutput) => void
+  ): void;
+  sendMessage(
+    args: SendMessageCommandInput,
+    options: __HttpHandlerOptions,
+    cb: (err: any, data?: SendMessageCommandOutput) => void
+  ): void;
+
+}
+
+/**
+ * @public
+ */
+export class CodeWhispererStreaming extends CodeWhispererStreamingClient implements CodeWhispererStreaming {}
+createAggregatedClient(commands, CodeWhispererStreaming);
diff --git a/src.gen/@amzn/codewhisperer-streaming/src/CodeWhispererStreamingClient.ts b/src.gen/@amzn/codewhisperer-streaming/src/CodeWhispererStreamingClient.ts
new file mode 100644
index 00000000000..8e5cbe07560
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/src/CodeWhispererStreamingClient.ts
@@ -0,0 +1,365 @@
+// smithy-typescript generated code
+import {
+  HttpAuthSchemeInputConfig,
+  HttpAuthSchemeResolvedConfig,
+  defaultCodeWhispererStreamingHttpAuthSchemeParametersProvider,
+  resolveHttpAuthSchemeConfig,
+} from "./auth/httpAuthSchemeProvider";
+import {
+  ExportResultArchiveCommandInput,
+  ExportResultArchiveCommandOutput,
+} from "./commands/ExportResultArchiveCommand";
+import {
+  GenerateAssistantResponseCommandInput,
+  GenerateAssistantResponseCommandOutput,
+} from "./commands/GenerateAssistantResponseCommand";
+import {
+  GenerateTaskAssistPlanCommandInput,
+  GenerateTaskAssistPlanCommandOutput,
+} from "./commands/GenerateTaskAssistPlanCommand";
+import {
+  SendMessageCommandInput,
+  SendMessageCommandOutput,
+} from "./commands/SendMessageCommand";
+import { getRuntimeConfig as __getRuntimeConfig } from "./runtimeConfig";
+import {
+  RuntimeExtension,
+  RuntimeExtensionsConfig,
+  resolveRuntimeExtensions,
+} from "./runtimeExtensions";
+import {
+  HostHeaderInputConfig,
+  HostHeaderResolvedConfig,
+  getHostHeaderPlugin,
+  resolveHostHeaderConfig,
+} from "@aws-sdk/middleware-host-header";
+import { getLoggerPlugin } from "@aws-sdk/middleware-logger";
+import { getRecursionDetectionPlugin } from "@aws-sdk/middleware-recursion-detection";
+import {
+  UserAgentInputConfig,
+  UserAgentResolvedConfig,
+  getUserAgentPlugin,
+  resolveUserAgentConfig,
+} from "@aws-sdk/middleware-user-agent";
+import {
+  EndpointsInputConfig,
+  EndpointsResolvedConfig,
+  RegionInputConfig,
+  RegionResolvedConfig,
+  resolveEndpointsConfig,
+  resolveRegionConfig,
+} from "@smithy/config-resolver";
+import {
+  DefaultIdentityProviderConfig,
+  getHttpAuthSchemePlugin,
+  getHttpSigningPlugin,
+} from "@smithy/core";
+import {
+  EventStreamSerdeInputConfig,
+  EventStreamSerdeResolvedConfig,
+  resolveEventStreamSerdeConfig,
+} from "@smithy/eventstream-serde-config-resolver";
+import { getContentLengthPlugin } from "@smithy/middleware-content-length";
+import {
+  RetryInputConfig,
+  RetryResolvedConfig,
+  getRetryPlugin,
+  resolveRetryConfig,
+} from "@smithy/middleware-retry";
+import { HttpHandlerUserInput as __HttpHandlerUserInput } from "@smithy/protocol-http";
+import {
+  Client as __Client,
+  DefaultsMode as __DefaultsMode,
+  SmithyConfiguration as __SmithyConfiguration,
+  SmithyResolvedConfiguration as __SmithyResolvedConfiguration,
+} from "@smithy/smithy-client";
+import {
+  Provider,
+  RegionInfoProvider,
+  BodyLengthCalculator as __BodyLengthCalculator,
+  CheckOptionalClientConfig as __CheckOptionalClientConfig,
+  ChecksumConstructor as __ChecksumConstructor,
+  Decoder as __Decoder,
+  Encoder as __Encoder,
+  EventStreamSerdeProvider as __EventStreamSerdeProvider,
+  HashConstructor as __HashConstructor,
+  HttpHandlerOptions as __HttpHandlerOptions,
+  Logger as __Logger,
+  Provider as __Provider,
+  StreamCollector as __StreamCollector,
+  UrlParser as __UrlParser,
+  UserAgent as __UserAgent,
+} from "@smithy/types";
+
+export { __Client }
+
+/**
+ * @public
+ */
+export type ServiceInputTypes =
+  | ExportResultArchiveCommandInput
+  | GenerateAssistantResponseCommandInput
+  | GenerateTaskAssistPlanCommandInput
+  | SendMessageCommandInput;
+
+/**
+ * @public
+ */
+export type ServiceOutputTypes =
+  | ExportResultArchiveCommandOutput
+  | GenerateAssistantResponseCommandOutput
+  | GenerateTaskAssistPlanCommandOutput
+  | SendMessageCommandOutput;
+
+/**
+ * @public
+ */
+export interface ClientDefaults
+  extends Partial<__SmithyConfiguration<__HttpHandlerOptions>> {
+  /**
+   * The HTTP handler to use or its constructor options. Fetch in browser and Https in Nodejs.
+   */
+  requestHandler?: __HttpHandlerUserInput;
+
+  /**
+   * A constructor for a class implementing the {@link @smithy/types#ChecksumConstructor} interface
+   * that computes the SHA-256 HMAC or checksum of a string or binary buffer.
+   * @internal
+   */
+  sha256?: __ChecksumConstructor | __HashConstructor;
+
+  /**
+   * The function that will be used to convert strings into HTTP endpoints.
+   * @internal
+   */
+  urlParser?: __UrlParser;
+
+  /**
+   * A function that can calculate the length of a request body.
+   * @internal
+   */
+  bodyLengthChecker?: __BodyLengthCalculator;
+
+  /**
+   * A function that converts a stream into an array of bytes.
+   * @internal
+   */
+  streamCollector?: __StreamCollector;
+
+  /**
+   * The function that will be used to convert a base64-encoded string to a byte array.
+   * @internal
+   */
+  base64Decoder?: __Decoder;
+
+  /**
+   * The function that will be used to convert binary data to a base64-encoded string.
+   * @internal
+   */
+  base64Encoder?: __Encoder;
+
+  /**
+   * The function that will be used to convert a UTF8-encoded string to a byte array.
+   * @internal
+   */
+  utf8Decoder?: __Decoder;
+
+  /**
+   * The function that will be used to convert binary data to a UTF-8 encoded string.
+   * @internal
+   */
+  utf8Encoder?: __Encoder;
+
+  /**
+   * The runtime environment.
+   * @internal
+   */
+  runtime?: string;
+
+  /**
+   * Disable dynamically changing the endpoint of the client based on the hostPrefix
+   * trait of an operation.
+   */
+  disableHostPrefix?: boolean;
+
+  /**
+   * Unique service identifier.
+   * @internal
+   */
+  serviceId?: string;
+
+  /**
+   * Enables IPv6/IPv4 dualstack endpoint.
+   */
+  useDualstackEndpoint?: boolean | __Provider<boolean>;
+
+  /**
+   * Enables FIPS compatible endpoints.
+   */
+  useFipsEndpoint?: boolean | __Provider<boolean>;
+
+  /**
+   * The AWS region to which this client will send requests
+   */
+  region?: string | __Provider<string>;
+
+  /**
+   * Setting a client profile is similar to setting a value for the
+   * AWS_PROFILE environment variable. Setting a profile on a client
+   * in code only affects the single client instance, unlike AWS_PROFILE.
+   *
+   * When set, and only for environments where an AWS configuration
+   * file exists, fields configurable by this file will be retrieved
+   * from the specified profile within that file.
+   * Conflicting code configuration and environment variables will
+   * still have higher priority.
+   *
+   * For client credential resolution that involves checking the AWS
+   * configuration file, the client's profile (this value) will be
+   * used unless a different profile is set in the credential
+   * provider options.
+   *
+   */
+  profile?: string;
+
+  /**
+   * Fetch related hostname, signing name or signing region with given region.
+   * @internal
+   */
+  regionInfoProvider?: RegionInfoProvider;
+
+  /**
+   * The provider populating default tracking information to be sent with `user-agent`, `x-amz-user-agent` header
+   * @internal
+   */
+  defaultUserAgentProvider?: Provider<__UserAgent>;
+
+  /**
+   * Value for how many times a request will be made at most in case of retry.
+   */
+  maxAttempts?: number | __Provider<number>;
+
+  /**
+   * Specifies which retry algorithm to use.
+   * @see https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/Package/-smithy-util-retry/Enum/RETRY_MODES/
+   *
+   */
+  retryMode?: string | __Provider<string>;
+
+  /**
+   * Optional logger for logging debug/info/warn/error.
+   */
+  logger?: __Logger;
+
+  /**
+   * Optional extensions
+   */
+  extensions?: RuntimeExtension[];
+
+  /**
+   * The function that provides necessary utilities for generating and parsing event stream
+   */
+  eventStreamSerdeProvider?: __EventStreamSerdeProvider;
+
+  /**
+   * The {@link @smithy/smithy-client#DefaultsMode} that will be used to determine how certain default configuration options are resolved in the SDK.
+   */
+  defaultsMode?: __DefaultsMode | __Provider<__DefaultsMode>;
+
+}
+
+/**
+ * @public
+ */
+export type CodeWhispererStreamingClientConfigType = Partial<__SmithyConfiguration<__HttpHandlerOptions>>
+  & ClientDefaults
+  & UserAgentInputConfig
+  & RetryInputConfig
+  & RegionInputConfig
+  & HostHeaderInputConfig
+  & EndpointsInputConfig
+  & EventStreamSerdeInputConfig
+  & HttpAuthSchemeInputConfig
+/**
+ * @public
+ *
+ *  The configuration interface of CodeWhispererStreamingClient class constructor that set the region, credentials and other options.
+ */
+export interface CodeWhispererStreamingClientConfig extends CodeWhispererStreamingClientConfigType {}
+
+/**
+ * @public
+ */
+export type CodeWhispererStreamingClientResolvedConfigType = __SmithyResolvedConfiguration<__HttpHandlerOptions>
+  & Required<ClientDefaults>
+  & RuntimeExtensionsConfig
+  & UserAgentResolvedConfig
+  & RetryResolvedConfig
+  & RegionResolvedConfig
+  & HostHeaderResolvedConfig
+  & EndpointsResolvedConfig
+  & EventStreamSerdeResolvedConfig
+  & HttpAuthSchemeResolvedConfig
+/**
+ * @public
+ *
+ *  The resolved configuration interface of CodeWhispererStreamingClient class. This is resolved and normalized from the {@link CodeWhispererStreamingClientConfig | constructor configuration interface}.
+ */
+export interface CodeWhispererStreamingClientResolvedConfig extends CodeWhispererStreamingClientResolvedConfigType {}
+
+/**
+ * @public
+ */
+export class CodeWhispererStreamingClient extends __Client<
+  __HttpHandlerOptions,
+  ServiceInputTypes,
+  ServiceOutputTypes,
+  CodeWhispererStreamingClientResolvedConfig
+> {
+  /**
+   * The resolved configuration of CodeWhispererStreamingClient class. This is resolved and normalized from the {@link CodeWhispererStreamingClientConfig | constructor configuration interface}.
+   */
+  readonly config: CodeWhispererStreamingClientResolvedConfig;
+
+  constructor(...[configuration]: __CheckOptionalClientConfig<CodeWhispererStreamingClientConfig>) {
+    let _config_0 = __getRuntimeConfig(configuration || {});
+    let _config_1 = resolveUserAgentConfig(_config_0);
+    let _config_2 = resolveRetryConfig(_config_1);
+    let _config_3 = resolveRegionConfig(_config_2);
+    let _config_4 = resolveHostHeaderConfig(_config_3);
+    let _config_5 = resolveEndpointsConfig(_config_4);
+    let _config_6 = resolveEventStreamSerdeConfig(_config_5);
+    let _config_7 = resolveHttpAuthSchemeConfig(_config_6);
+    let _config_8 = resolveRuntimeExtensions(_config_7, configuration?.extensions || []);
+    super(_config_8);
+    this.config = _config_8;
+    this.middlewareStack.use(getUserAgentPlugin(this.config
+    ));
+    this.middlewareStack.use(getRetryPlugin(this.config
+    ));
+    this.middlewareStack.use(getContentLengthPlugin(this.config
+    ));
+    this.middlewareStack.use(getHostHeaderPlugin(this.config
+    ));
+    this.middlewareStack.use(getLoggerPlugin(this.config
+    ));
+    this.middlewareStack.use(getRecursionDetectionPlugin(this.config
+    ));
+    this.middlewareStack.use(getHttpAuthSchemePlugin(this.config
+      , {
+        httpAuthSchemeParametersProvider: defaultCodeWhispererStreamingHttpAuthSchemeParametersProvider,identityProviderConfigProvider: async (config: CodeWhispererStreamingClientResolvedConfig) => new DefaultIdentityProviderConfig({
+          "smithy.api#httpBearerAuth": config.token,}), }
+    ));
+    this.middlewareStack.use(getHttpSigningPlugin(this.config
+    ));
+  }
+
+  /**
+   * Destroy underlying resources, like sockets. It's usually not necessary to do this.
+   * However in Node.js, it's best to explicitly shut down the client's agent when it is no longer needed.
+   * Otherwise, sockets might stay open for quite a long time before the server terminates them.
+   */
+  destroy(): void {
+    super.destroy();
+  }
+}
diff --git a/src.gen/@amzn/codewhisperer-streaming/src/auth/httpAuthExtensionConfiguration.ts b/src.gen/@amzn/codewhisperer-streaming/src/auth/httpAuthExtensionConfiguration.ts
new file mode 100644
index 00000000000..d1964378679
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/src/auth/httpAuthExtensionConfiguration.ts
@@ -0,0 +1,73 @@
+// smithy-typescript generated code
+import { CodeWhispererStreamingHttpAuthSchemeProvider } from "./httpAuthSchemeProvider";
+import {
+  HttpAuthScheme,
+  TokenIdentity,
+  TokenIdentityProvider,
+} from "@smithy/types";
+
+/**
+ * @internal
+ */
+export interface HttpAuthExtensionConfiguration {
+  setHttpAuthScheme(httpAuthScheme: HttpAuthScheme): void;
+  httpAuthSchemes(): HttpAuthScheme[];
+  setHttpAuthSchemeProvider(httpAuthSchemeProvider: CodeWhispererStreamingHttpAuthSchemeProvider): void;
+  httpAuthSchemeProvider(): CodeWhispererStreamingHttpAuthSchemeProvider;
+  setToken(token: TokenIdentity | TokenIdentityProvider): void;
+  token(): TokenIdentity | TokenIdentityProvider | undefined;
+}
+
+/**
+ * @internal
+ */
+export type HttpAuthRuntimeConfig = Partial<{
+  httpAuthSchemes: HttpAuthScheme[];
+  httpAuthSchemeProvider: CodeWhispererStreamingHttpAuthSchemeProvider;
+  token: TokenIdentity | TokenIdentityProvider;
+}>;
+
+/**
+ * @internal
+ */
+export const getHttpAuthExtensionConfiguration = (runtimeConfig: HttpAuthRuntimeConfig): HttpAuthExtensionConfiguration => {
+  let _httpAuthSchemes = runtimeConfig.httpAuthSchemes!;
+  let _httpAuthSchemeProvider = runtimeConfig.httpAuthSchemeProvider!;
+  let _token = runtimeConfig.token;
+  return {
+    setHttpAuthScheme(httpAuthScheme: HttpAuthScheme): void {
+      const index = _httpAuthSchemes.findIndex(scheme => scheme.schemeId === httpAuthScheme.schemeId);
+      if (index === -1) {
+        _httpAuthSchemes.push(httpAuthScheme);
+      } else {
+        _httpAuthSchemes.splice(index, 1, httpAuthScheme);
+      }
+    },
+    httpAuthSchemes(): HttpAuthScheme[] {
+      return _httpAuthSchemes;
+    },
+    setHttpAuthSchemeProvider(httpAuthSchemeProvider: CodeWhispererStreamingHttpAuthSchemeProvider): void {
+      _httpAuthSchemeProvider = httpAuthSchemeProvider;
+    },
+    httpAuthSchemeProvider(): CodeWhispererStreamingHttpAuthSchemeProvider {
+      return _httpAuthSchemeProvider;
+    },
+    setToken(token: TokenIdentity | TokenIdentityProvider): void {
+        _token = token;
+    },
+    token(): TokenIdentity | TokenIdentityProvider | undefined {
+        return _token;
+    },
+  }
+};
+
+/**
+ * @internal
+ */
+export const resolveHttpAuthRuntimeConfig = (config: HttpAuthExtensionConfiguration): HttpAuthRuntimeConfig => {
+  return {
+    httpAuthSchemes: config.httpAuthSchemes(),
+    httpAuthSchemeProvider: config.httpAuthSchemeProvider(),
+    token: config.token(),
+  };
+};
diff --git a/src.gen/@amzn/codewhisperer-streaming/src/auth/httpAuthSchemeProvider.ts b/src.gen/@amzn/codewhisperer-streaming/src/auth/httpAuthSchemeProvider.ts
new file mode 100644
index 00000000000..b5f24e5660b
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/src/auth/httpAuthSchemeProvider.ts
@@ -0,0 +1,134 @@
+// smithy-typescript generated code
+import { CodeWhispererStreamingClientResolvedConfig } from "../CodeWhispererStreamingClient";
+import { FromSsoInit } from "@aws-sdk/token-providers";
+import {
+  doesIdentityRequireRefresh,
+  isIdentityExpired,
+  memoizeIdentityProvider,
+} from "@smithy/core";
+import {
+  HandlerExecutionContext,
+  HttpAuthOption,
+  HttpAuthScheme,
+  HttpAuthSchemeParameters,
+  HttpAuthSchemeParametersProvider,
+  HttpAuthSchemeProvider,
+  TokenIdentity,
+  TokenIdentityProvider,
+} from "@smithy/types";
+import { getSmithyContext } from "@smithy/util-middleware";
+
+/**
+ * @internal
+ */
+export interface CodeWhispererStreamingHttpAuthSchemeParameters extends HttpAuthSchemeParameters {
+}
+
+/**
+ * @internal
+ */
+export interface CodeWhispererStreamingHttpAuthSchemeParametersProvider extends HttpAuthSchemeParametersProvider<CodeWhispererStreamingClientResolvedConfig, HandlerExecutionContext, CodeWhispererStreamingHttpAuthSchemeParameters, object> {}
+
+/**
+ * @internal
+ */
+export const defaultCodeWhispererStreamingHttpAuthSchemeParametersProvider = async (config: CodeWhispererStreamingClientResolvedConfig, context: HandlerExecutionContext, input: object): Promise<CodeWhispererStreamingHttpAuthSchemeParameters> => {
+  return {
+    operation: getSmithyContext(context).operation as string,
+  };
+};
+
+function createSmithyApiHttpBearerAuthHttpAuthOption(authParameters: CodeWhispererStreamingHttpAuthSchemeParameters): HttpAuthOption {
+  return {
+    schemeId: "smithy.api#httpBearerAuth",
+    propertiesExtractor: <T>({
+      profile,
+      filepath,
+      configFilepath,
+      ignoreCache,
+    }: T & FromSsoInit, context: HandlerExecutionContext) => ({
+      /**
+       * @internal
+       */
+      identityProperties: {
+        profile,
+        filepath,
+        configFilepath,
+        ignoreCache,
+      },
+    }),
+  };
+};
+
+/**
+ * @internal
+ */
+export interface CodeWhispererStreamingHttpAuthSchemeProvider extends HttpAuthSchemeProvider<CodeWhispererStreamingHttpAuthSchemeParameters> {}
+
+/**
+ * @internal
+ */
+export const defaultCodeWhispererStreamingHttpAuthSchemeProvider: CodeWhispererStreamingHttpAuthSchemeProvider = (authParameters) => {
+  const options: HttpAuthOption[] = [];
+  switch (authParameters.operation) {
+    default: {
+      options.push(createSmithyApiHttpBearerAuthHttpAuthOption(authParameters));
+    };
+  };
+  return options;
+};
+
+/**
+ * @internal
+ */
+export interface HttpAuthSchemeInputConfig {
+  /**
+   * Configuration of HttpAuthSchemes for a client which provides default identity providers and signers per auth scheme.
+   * @internal
+   */
+  httpAuthSchemes?: HttpAuthScheme[];
+
+  /**
+   * Configuration of an HttpAuthSchemeProvider for a client which resolves which HttpAuthScheme to use.
+   * @internal
+   */
+  httpAuthSchemeProvider?: CodeWhispererStreamingHttpAuthSchemeProvider;
+
+  /**
+   * The token used to authenticate requests.
+   */
+  token?: TokenIdentity | TokenIdentityProvider;
+}
+
+/**
+ * @internal
+ */
+export interface HttpAuthSchemeResolvedConfig {
+  /**
+   * Configuration of HttpAuthSchemes for a client which provides default identity providers and signers per auth scheme.
+   * @internal
+   */
+  readonly httpAuthSchemes: HttpAuthScheme[];
+
+  /**
+   * Configuration of an HttpAuthSchemeProvider for a client which resolves which HttpAuthScheme to use.
+   * @internal
+   */
+  readonly httpAuthSchemeProvider: CodeWhispererStreamingHttpAuthSchemeProvider;
+
+  /**
+   * The token used to authenticate requests.
+   */
+  readonly token?: TokenIdentityProvider;
+}
+
+/**
+ * @internal
+ */
+export const resolveHttpAuthSchemeConfig = <T>(config: T & HttpAuthSchemeInputConfig): T & HttpAuthSchemeResolvedConfig => {
+  const token = memoizeIdentityProvider(config.token, isIdentityExpired, doesIdentityRequireRefresh);
+  return {
+    ...config,
+    token,
+  } as T & HttpAuthSchemeResolvedConfig;
+};
diff --git a/src.gen/@amzn/codewhisperer-streaming/src/commands/ExportResultArchiveCommand.ts b/src.gen/@amzn/codewhisperer-streaming/src/commands/ExportResultArchiveCommand.ts
new file mode 100644
index 00000000000..c2376564160
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/src/commands/ExportResultArchiveCommand.ts
@@ -0,0 +1,143 @@
+// smithy-typescript generated code
+import {
+  CodeWhispererStreamingClientResolvedConfig,
+  ServiceInputTypes,
+  ServiceOutputTypes,
+} from "../CodeWhispererStreamingClient";
+import {
+  ExportResultArchiveRequest,
+  ExportResultArchiveResponse,
+  ExportResultArchiveResponseFilterSensitiveLog,
+} from "../models/models_0";
+import {
+  de_ExportResultArchiveCommand,
+  se_ExportResultArchiveCommand,
+} from "../protocols/Aws_restJson1";
+import { getSerdePlugin } from "@smithy/middleware-serde";
+import { Command as $Command } from "@smithy/smithy-client";
+import { MetadataBearer as __MetadataBearer } from "@smithy/types";
+
+/**
+ * @public
+ */
+export type { __MetadataBearer };
+export { $Command };
+/**
+ * @public
+ *
+ * The input for {@link ExportResultArchiveCommand}.
+ */
+export interface ExportResultArchiveCommandInput extends ExportResultArchiveRequest {}
+/**
+ * @public
+ *
+ * The output of {@link ExportResultArchiveCommand}.
+ */
+export interface ExportResultArchiveCommandOutput extends ExportResultArchiveResponse, __MetadataBearer {}
+
+/**
+ * API to export operation result as an archive
+ * @example
+ * Use a bare-bones client and the command you need to make an API call.
+ * ```javascript
+ * import { CodeWhispererStreamingClient, ExportResultArchiveCommand } from "@amzn/codewhisperer-streaming"; // ES Modules import
+ * // const { CodeWhispererStreamingClient, ExportResultArchiveCommand } = require("@amzn/codewhisperer-streaming"); // CommonJS import
+ * const client = new CodeWhispererStreamingClient(config);
+ * const input = { // ExportResultArchiveRequest
+ *   exportId: "STRING_VALUE", // required
+ *   exportIntent: "TRANSFORMATION" || "TASK_ASSIST" || "UNIT_TESTS", // required
+ *   exportContext: { // ExportContext Union: only one key present
+ *     transformationExportContext: { // TransformationExportContext
+ *       downloadArtifactId: "STRING_VALUE", // required
+ *       downloadArtifactType: "ClientInstructions" || "Logs" || "GeneratedCode", // required
+ *     },
+ *     unitTestGenerationExportContext: { // UnitTestGenerationExportContext
+ *       testGenerationJobGroupName: "STRING_VALUE", // required
+ *       testGenerationJobId: "STRING_VALUE",
+ *     },
+ *   },
+ *   profileArn: "STRING_VALUE",
+ * };
+ * const command = new ExportResultArchiveCommand(input);
+ * const response = await client.send(command);
+ * // { // ExportResultArchiveResponse
+ * //   body: { // ResultArchiveStream Union: only one key present
+ * //     binaryMetadataEvent: { // BinaryMetadataEvent
+ * //       size: Number("long"),
+ * //       mimeType: "STRING_VALUE",
+ * //       contentChecksum: "STRING_VALUE",
+ * //       contentChecksumType: "SHA_256",
+ * //     },
+ * //     binaryPayloadEvent: { // BinaryPayloadEvent
+ * //       bytes: new Uint8Array(),
+ * //     },
+ * //     internalServerException: { // InternalServerException
+ * //       message: "STRING_VALUE", // required
+ * //     },
+ * //   },
+ * // };
+ *
+ * ```
+ *
+ * @param ExportResultArchiveCommandInput - {@link ExportResultArchiveCommandInput}
+ * @returns {@link ExportResultArchiveCommandOutput}
+ * @see {@link ExportResultArchiveCommandInput} for command's `input` shape.
+ * @see {@link ExportResultArchiveCommandOutput} for command's `response` shape.
+ * @see {@link CodeWhispererStreamingClientResolvedConfig | config} for CodeWhispererStreamingClient's `config` shape.
+ *
+ * @throws {@link InternalServerException} (server fault)
+ *  This exception is thrown when an unexpected error occurred during the processing of a request.
+ *
+ * @throws {@link ThrottlingException} (client fault)
+ *  This exception is thrown when request was denied due to request throttling.
+ *
+ * @throws {@link ValidationException} (client fault)
+ *  This exception is thrown when the input fails to satisfy the constraints specified by the service.
+ *
+ * @throws {@link ConflictException} (client fault)
+ *  This exception is thrown when the action to perform could not be completed because the resource is in a conflicting state.
+ *
+ * @throws {@link ResourceNotFoundException} (client fault)
+ *  This exception is thrown when describing a resource that does not exist.
+ *
+ * @throws {@link AccessDeniedException} (client fault)
+ *  This exception is thrown when the user does not have sufficient access to perform this action.
+ *
+ * @throws {@link CodeWhispererStreamingServiceException}
+ * <p>Base exception class for all service exceptions from CodeWhispererStreaming service.</p>
+ *
+ * @public
+ */
+export class ExportResultArchiveCommand extends $Command.classBuilder<ExportResultArchiveCommandInput, ExportResultArchiveCommandOutput, CodeWhispererStreamingClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes>()
+      .m(function (this: any, Command: any, cs: any, config: CodeWhispererStreamingClientResolvedConfig, o: any) {
+          return [
+
+  getSerdePlugin(config, this.serialize, this.deserialize),
+      ];
+  })
+  .s("AmazonCodeWhispererStreamingService", "ExportResultArchive", {
+
+    /**
+     * @internal
+     */
+    eventStream: {
+      output: true,
+    },
+  })
+  .n("CodeWhispererStreamingClient", "ExportResultArchiveCommand")
+  .f(void 0, ExportResultArchiveResponseFilterSensitiveLog)
+  .ser(se_ExportResultArchiveCommand)
+  .de(de_ExportResultArchiveCommand)
+.build() {
+/** @internal type navigation helper, not in runtime. */
+declare protected static __types: {
+  api: {
+      input: ExportResultArchiveRequest;
+      output: ExportResultArchiveResponse;
+  };
+  sdk: {
+      input: ExportResultArchiveCommandInput;
+      output: ExportResultArchiveCommandOutput;
+  };
+};
+}
diff --git a/src.gen/@amzn/codewhisperer-streaming/src/commands/GenerateAssistantResponseCommand.ts b/src.gen/@amzn/codewhisperer-streaming/src/commands/GenerateAssistantResponseCommand.ts
new file mode 100644
index 00000000000..f952da3895f
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/src/commands/GenerateAssistantResponseCommand.ts
@@ -0,0 +1,770 @@
+// smithy-typescript generated code
+import {
+  CodeWhispererStreamingClientResolvedConfig,
+  ServiceInputTypes,
+  ServiceOutputTypes,
+} from "../CodeWhispererStreamingClient";
+import {
+  GenerateAssistantResponseRequest,
+  GenerateAssistantResponseRequestFilterSensitiveLog,
+  GenerateAssistantResponseResponse,
+  GenerateAssistantResponseResponseFilterSensitiveLog,
+} from "../models/models_0";
+import {
+  de_GenerateAssistantResponseCommand,
+  se_GenerateAssistantResponseCommand,
+} from "../protocols/Aws_restJson1";
+import { getSerdePlugin } from "@smithy/middleware-serde";
+import { Command as $Command } from "@smithy/smithy-client";
+import { MetadataBearer as __MetadataBearer } from "@smithy/types";
+
+/**
+ * @public
+ */
+export type { __MetadataBearer };
+export { $Command };
+/**
+ * @public
+ *
+ * The input for {@link GenerateAssistantResponseCommand}.
+ */
+export interface GenerateAssistantResponseCommandInput extends GenerateAssistantResponseRequest {}
+/**
+ * @public
+ *
+ * The output of {@link GenerateAssistantResponseCommand}.
+ */
+export interface GenerateAssistantResponseCommandOutput extends GenerateAssistantResponseResponse, __MetadataBearer {}
+
+/**
+ * API to generate assistant response.
+ * @example
+ * Use a bare-bones client and the command you need to make an API call.
+ * ```javascript
+ * import { CodeWhispererStreamingClient, GenerateAssistantResponseCommand } from "@amzn/codewhisperer-streaming"; // ES Modules import
+ * // const { CodeWhispererStreamingClient, GenerateAssistantResponseCommand } = require("@amzn/codewhisperer-streaming"); // CommonJS import
+ * const client = new CodeWhispererStreamingClient(config);
+ * const input = { // GenerateAssistantResponseRequest
+ *   conversationState: { // ConversationState
+ *     conversationId: "STRING_VALUE",
+ *     history: [ // ChatHistory
+ *       { // ChatMessage Union: only one key present
+ *         userInputMessage: { // UserInputMessage
+ *           content: "STRING_VALUE", // required
+ *           userInputMessageContext: { // UserInputMessageContext
+ *             editorState: { // EditorState
+ *               document: { // TextDocument
+ *                 relativeFilePath: "STRING_VALUE", // required
+ *                 programmingLanguage: { // ProgrammingLanguage
+ *                   languageName: "STRING_VALUE", // required
+ *                 },
+ *                 text: "STRING_VALUE",
+ *                 documentSymbols: [ // DocumentSymbols
+ *                   { // DocumentSymbol
+ *                     name: "STRING_VALUE", // required
+ *                     type: "DECLARATION" || "USAGE", // required
+ *                     source: "STRING_VALUE",
+ *                   },
+ *                 ],
+ *               },
+ *               cursorState: { // CursorState Union: only one key present
+ *                 position: { // Position
+ *                   line: Number("int"), // required
+ *                   character: Number("int"), // required
+ *                 },
+ *                 range: { // Range
+ *                   start: {
+ *                     line: Number("int"), // required
+ *                     character: Number("int"), // required
+ *                   },
+ *                   end: {
+ *                     line: Number("int"), // required
+ *                     character: Number("int"), // required
+ *                   },
+ *                 },
+ *               },
+ *               relevantDocuments: [ // RelevantDocumentList
+ *                 { // RelevantTextDocument
+ *                   relativeFilePath: "STRING_VALUE", // required
+ *                   programmingLanguage: {
+ *                     languageName: "STRING_VALUE", // required
+ *                   },
+ *                   text: "STRING_VALUE",
+ *                   documentSymbols: [
+ *                     {
+ *                       name: "STRING_VALUE", // required
+ *                       type: "DECLARATION" || "USAGE", // required
+ *                       source: "STRING_VALUE",
+ *                     },
+ *                   ],
+ *                 },
+ *               ],
+ *               useRelevantDocuments: true || false,
+ *               workspaceFolders: [ // WorkspaceFolderList
+ *                 "STRING_VALUE",
+ *               ],
+ *             },
+ *             shellState: { // ShellState
+ *               shellName: "STRING_VALUE", // required
+ *               shellHistory: [ // ShellHistory
+ *                 { // ShellHistoryEntry
+ *                   command: "STRING_VALUE", // required
+ *                   directory: "STRING_VALUE",
+ *                   exitCode: Number("int"),
+ *                   stdout: "STRING_VALUE",
+ *                   stderr: "STRING_VALUE",
+ *                 },
+ *               ],
+ *             },
+ *             gitState: { // GitState
+ *               status: "STRING_VALUE",
+ *             },
+ *             envState: { // EnvState
+ *               operatingSystem: "STRING_VALUE",
+ *               currentWorkingDirectory: "STRING_VALUE",
+ *               environmentVariables: [ // EnvironmentVariables
+ *                 { // EnvironmentVariable
+ *                   key: "STRING_VALUE",
+ *                   value: "STRING_VALUE",
+ *                 },
+ *               ],
+ *               timezoneOffset: Number("int"),
+ *             },
+ *             appStudioContext: { // AppStudioState
+ *               namespace: "STRING_VALUE", // required
+ *               propertyName: "STRING_VALUE", // required
+ *               propertyValue: "STRING_VALUE",
+ *               propertyContext: "STRING_VALUE", // required
+ *             },
+ *             diagnostic: { // Diagnostic Union: only one key present
+ *               textDocumentDiagnostic: { // TextDocumentDiagnostic
+ *                 document: {
+ *                   relativeFilePath: "STRING_VALUE", // required
+ *                   programmingLanguage: {
+ *                     languageName: "STRING_VALUE", // required
+ *                   },
+ *                   text: "STRING_VALUE",
+ *                   documentSymbols: [
+ *                     {
+ *                       name: "STRING_VALUE", // required
+ *                       type: "DECLARATION" || "USAGE", // required
+ *                       source: "STRING_VALUE",
+ *                     },
+ *                   ],
+ *                 },
+ *                 range: {
+ *                   start: {
+ *                     line: Number("int"), // required
+ *                     character: Number("int"), // required
+ *                   },
+ *                   end: {
+ *                     line: Number("int"), // required
+ *                     character: Number("int"), // required
+ *                   },
+ *                 },
+ *                 source: "STRING_VALUE", // required
+ *                 severity: "ERROR" || "WARNING" || "INFORMATION" || "HINT", // required
+ *                 message: "STRING_VALUE", // required
+ *               },
+ *               runtimeDiagnostic: { // RuntimeDiagnostic
+ *                 source: "STRING_VALUE", // required
+ *                 severity: "ERROR" || "WARNING" || "INFORMATION" || "HINT", // required
+ *                 message: "STRING_VALUE", // required
+ *               },
+ *             },
+ *             consoleState: { // ConsoleState
+ *               region: "STRING_VALUE",
+ *               consoleUrl: "STRING_VALUE",
+ *               serviceId: "STRING_VALUE",
+ *               serviceConsolePage: "STRING_VALUE",
+ *               serviceSubconsolePage: "STRING_VALUE",
+ *               taskName: "STRING_VALUE",
+ *             },
+ *             userSettings: { // UserSettings
+ *               hasConsentedToCrossRegionCalls: true || false,
+ *             },
+ *             additionalContext: [ // AdditionalContentList
+ *               { // AdditionalContentEntry
+ *                 name: "STRING_VALUE", // required
+ *                 description: "STRING_VALUE", // required
+ *                 innerContext: "STRING_VALUE",
+ *               },
+ *             ],
+ *             toolResults: [ // ToolResults
+ *               { // ToolResult
+ *                 toolUseId: "STRING_VALUE", // required
+ *                 content: [ // ToolResultContent // required
+ *                   { // ToolResultContentBlock Union: only one key present
+ *                     text: "STRING_VALUE",
+ *                     json: "DOCUMENT_VALUE",
+ *                   },
+ *                 ],
+ *                 status: "success" || "error",
+ *               },
+ *             ],
+ *             tools: [ // Tools
+ *               { // Tool Union: only one key present
+ *                 toolSpecification: { // ToolSpecification
+ *                   inputSchema: { // ToolInputSchema
+ *                     json: "DOCUMENT_VALUE",
+ *                   },
+ *                   name: "STRING_VALUE", // required
+ *                   description: "STRING_VALUE",
+ *                 },
+ *               },
+ *             ],
+ *           },
+ *           userIntent: "SUGGEST_ALTERNATE_IMPLEMENTATION" || "APPLY_COMMON_BEST_PRACTICES" || "IMPROVE_CODE" || "SHOW_EXAMPLES" || "CITE_SOURCES" || "EXPLAIN_LINE_BY_LINE" || "EXPLAIN_CODE_SELECTION" || "GENERATE_CLOUDFORMATION_TEMPLATE" || "GENERATE_UNIT_TESTS" || "CODE_GENERATION",
+ *           origin: "STRING_VALUE",
+ *           images: [ // ImageBlocks
+ *             { // ImageBlock
+ *               format: "png" || "jpeg" || "gif" || "webp", // required
+ *               source: { // ImageSource Union: only one key present
+ *                 bytes: new Uint8Array(), // e.g. Buffer.from("") or new TextEncoder().encode("")
+ *               },
+ *             },
+ *           ],
+ *         },
+ *         assistantResponseMessage: { // AssistantResponseMessage
+ *           messageId: "STRING_VALUE",
+ *           content: "STRING_VALUE", // required
+ *           supplementaryWebLinks: [ // SupplementaryWebLinks
+ *             { // SupplementaryWebLink
+ *               url: "STRING_VALUE", // required
+ *               title: "STRING_VALUE", // required
+ *               snippet: "STRING_VALUE",
+ *             },
+ *           ],
+ *           references: [ // References
+ *             { // Reference
+ *               licenseName: "STRING_VALUE",
+ *               repository: "STRING_VALUE",
+ *               url: "STRING_VALUE",
+ *               recommendationContentSpan: { // Span
+ *                 start: Number("int"),
+ *                 end: Number("int"),
+ *               },
+ *             },
+ *           ],
+ *           followupPrompt: { // FollowupPrompt
+ *             content: "STRING_VALUE", // required
+ *             userIntent: "SUGGEST_ALTERNATE_IMPLEMENTATION" || "APPLY_COMMON_BEST_PRACTICES" || "IMPROVE_CODE" || "SHOW_EXAMPLES" || "CITE_SOURCES" || "EXPLAIN_LINE_BY_LINE" || "EXPLAIN_CODE_SELECTION" || "GENERATE_CLOUDFORMATION_TEMPLATE" || "GENERATE_UNIT_TESTS" || "CODE_GENERATION",
+ *           },
+ *           toolUses: [ // ToolUses
+ *             { // ToolUse
+ *               toolUseId: "STRING_VALUE", // required
+ *               name: "STRING_VALUE", // required
+ *               input: "DOCUMENT_VALUE", // required
+ *             },
+ *           ],
+ *         },
+ *       },
+ *     ],
+ *     currentMessage: {//  Union: only one key present
+ *       userInputMessage: {
+ *         content: "STRING_VALUE", // required
+ *         userInputMessageContext: {
+ *           editorState: {
+ *             document: "<TextDocument>",
+ *             cursorState: {//  Union: only one key present
+ *               position: "<Position>",
+ *               range: {
+ *                 start: "<Position>", // required
+ *                 end: "<Position>", // required
+ *               },
+ *             },
+ *             relevantDocuments: [
+ *               {
+ *                 relativeFilePath: "STRING_VALUE", // required
+ *                 programmingLanguage: {
+ *                   languageName: "STRING_VALUE", // required
+ *                 },
+ *                 text: "STRING_VALUE",
+ *                 documentSymbols: [
+ *                   {
+ *                     name: "STRING_VALUE", // required
+ *                     type: "DECLARATION" || "USAGE", // required
+ *                     source: "STRING_VALUE",
+ *                   },
+ *                 ],
+ *               },
+ *             ],
+ *             useRelevantDocuments: true || false,
+ *             workspaceFolders: [
+ *               "STRING_VALUE",
+ *             ],
+ *           },
+ *           shellState: {
+ *             shellName: "STRING_VALUE", // required
+ *             shellHistory: [
+ *               {
+ *                 command: "STRING_VALUE", // required
+ *                 directory: "STRING_VALUE",
+ *                 exitCode: Number("int"),
+ *                 stdout: "STRING_VALUE",
+ *                 stderr: "STRING_VALUE",
+ *               },
+ *             ],
+ *           },
+ *           gitState: {
+ *             status: "STRING_VALUE",
+ *           },
+ *           envState: {
+ *             operatingSystem: "STRING_VALUE",
+ *             currentWorkingDirectory: "STRING_VALUE",
+ *             environmentVariables: [
+ *               {
+ *                 key: "STRING_VALUE",
+ *                 value: "STRING_VALUE",
+ *               },
+ *             ],
+ *             timezoneOffset: Number("int"),
+ *           },
+ *           appStudioContext: {
+ *             namespace: "STRING_VALUE", // required
+ *             propertyName: "STRING_VALUE", // required
+ *             propertyValue: "STRING_VALUE",
+ *             propertyContext: "STRING_VALUE", // required
+ *           },
+ *           diagnostic: {//  Union: only one key present
+ *             textDocumentDiagnostic: {
+ *               document: "<TextDocument>", // required
+ *               range: {
+ *                 start: "<Position>", // required
+ *                 end: "<Position>", // required
+ *               },
+ *               source: "STRING_VALUE", // required
+ *               severity: "ERROR" || "WARNING" || "INFORMATION" || "HINT", // required
+ *               message: "STRING_VALUE", // required
+ *             },
+ *             runtimeDiagnostic: {
+ *               source: "STRING_VALUE", // required
+ *               severity: "ERROR" || "WARNING" || "INFORMATION" || "HINT", // required
+ *               message: "STRING_VALUE", // required
+ *             },
+ *           },
+ *           consoleState: {
+ *             region: "STRING_VALUE",
+ *             consoleUrl: "STRING_VALUE",
+ *             serviceId: "STRING_VALUE",
+ *             serviceConsolePage: "STRING_VALUE",
+ *             serviceSubconsolePage: "STRING_VALUE",
+ *             taskName: "STRING_VALUE",
+ *           },
+ *           userSettings: {
+ *             hasConsentedToCrossRegionCalls: true || false,
+ *           },
+ *           additionalContext: [
+ *             {
+ *               name: "STRING_VALUE", // required
+ *               description: "STRING_VALUE", // required
+ *               innerContext: "STRING_VALUE",
+ *             },
+ *           ],
+ *           toolResults: [
+ *             {
+ *               toolUseId: "STRING_VALUE", // required
+ *               content: [ // required
+ *                 {//  Union: only one key present
+ *                   text: "STRING_VALUE",
+ *                   json: "DOCUMENT_VALUE",
+ *                 },
+ *               ],
+ *               status: "success" || "error",
+ *             },
+ *           ],
+ *           tools: [
+ *             {//  Union: only one key present
+ *               toolSpecification: {
+ *                 inputSchema: {
+ *                   json: "DOCUMENT_VALUE",
+ *                 },
+ *                 name: "STRING_VALUE", // required
+ *                 description: "STRING_VALUE",
+ *               },
+ *             },
+ *           ],
+ *         },
+ *         userIntent: "SUGGEST_ALTERNATE_IMPLEMENTATION" || "APPLY_COMMON_BEST_PRACTICES" || "IMPROVE_CODE" || "SHOW_EXAMPLES" || "CITE_SOURCES" || "EXPLAIN_LINE_BY_LINE" || "EXPLAIN_CODE_SELECTION" || "GENERATE_CLOUDFORMATION_TEMPLATE" || "GENERATE_UNIT_TESTS" || "CODE_GENERATION",
+ *         origin: "STRING_VALUE",
+ *         images: [
+ *           {
+ *             format: "png" || "jpeg" || "gif" || "webp", // required
+ *             source: {//  Union: only one key present
+ *               bytes: new Uint8Array(), // e.g. Buffer.from("") or new TextEncoder().encode("")
+ *             },
+ *           },
+ *         ],
+ *       },
+ *       assistantResponseMessage: {
+ *         messageId: "STRING_VALUE",
+ *         content: "STRING_VALUE", // required
+ *         supplementaryWebLinks: [
+ *           {
+ *             url: "STRING_VALUE", // required
+ *             title: "STRING_VALUE", // required
+ *             snippet: "STRING_VALUE",
+ *           },
+ *         ],
+ *         references: [
+ *           {
+ *             licenseName: "STRING_VALUE",
+ *             repository: "STRING_VALUE",
+ *             url: "STRING_VALUE",
+ *             recommendationContentSpan: {
+ *               start: Number("int"),
+ *               end: Number("int"),
+ *             },
+ *           },
+ *         ],
+ *         followupPrompt: {
+ *           content: "STRING_VALUE", // required
+ *           userIntent: "SUGGEST_ALTERNATE_IMPLEMENTATION" || "APPLY_COMMON_BEST_PRACTICES" || "IMPROVE_CODE" || "SHOW_EXAMPLES" || "CITE_SOURCES" || "EXPLAIN_LINE_BY_LINE" || "EXPLAIN_CODE_SELECTION" || "GENERATE_CLOUDFORMATION_TEMPLATE" || "GENERATE_UNIT_TESTS" || "CODE_GENERATION",
+ *         },
+ *         toolUses: [
+ *           {
+ *             toolUseId: "STRING_VALUE", // required
+ *             name: "STRING_VALUE", // required
+ *             input: "DOCUMENT_VALUE", // required
+ *           },
+ *         ],
+ *       },
+ *     },
+ *     chatTriggerType: "MANUAL" || "DIAGNOSTIC" || "INLINE_CHAT", // required
+ *     customizationArn: "STRING_VALUE",
+ *   },
+ *   profileArn: "STRING_VALUE",
+ * };
+ * const command = new GenerateAssistantResponseCommand(input);
+ * const response = await client.send(command);
+ * // { // GenerateAssistantResponseResponse
+ * //   conversationId: "STRING_VALUE", // required
+ * //   generateAssistantResponseResponse: { // ChatResponseStream Union: only one key present
+ * //     messageMetadataEvent: { // MessageMetadataEvent
+ * //       conversationId: "STRING_VALUE",
+ * //       utteranceId: "STRING_VALUE",
+ * //     },
+ * //     assistantResponseEvent: { // AssistantResponseEvent
+ * //       content: "STRING_VALUE", // required
+ * //     },
+ * //     dryRunSucceedEvent: {},
+ * //     codeReferenceEvent: { // CodeReferenceEvent
+ * //       references: [ // References
+ * //         { // Reference
+ * //           licenseName: "STRING_VALUE",
+ * //           repository: "STRING_VALUE",
+ * //           url: "STRING_VALUE",
+ * //           recommendationContentSpan: { // Span
+ * //             start: Number("int"),
+ * //             end: Number("int"),
+ * //           },
+ * //         },
+ * //       ],
+ * //     },
+ * //     supplementaryWebLinksEvent: { // SupplementaryWebLinksEvent
+ * //       supplementaryWebLinks: [ // SupplementaryWebLinks
+ * //         { // SupplementaryWebLink
+ * //           url: "STRING_VALUE", // required
+ * //           title: "STRING_VALUE", // required
+ * //           snippet: "STRING_VALUE",
+ * //         },
+ * //       ],
+ * //     },
+ * //     followupPromptEvent: { // FollowupPromptEvent
+ * //       followupPrompt: { // FollowupPrompt
+ * //         content: "STRING_VALUE", // required
+ * //         userIntent: "SUGGEST_ALTERNATE_IMPLEMENTATION" || "APPLY_COMMON_BEST_PRACTICES" || "IMPROVE_CODE" || "SHOW_EXAMPLES" || "CITE_SOURCES" || "EXPLAIN_LINE_BY_LINE" || "EXPLAIN_CODE_SELECTION" || "GENERATE_CLOUDFORMATION_TEMPLATE" || "GENERATE_UNIT_TESTS" || "CODE_GENERATION",
+ * //       },
+ * //     },
+ * //     codeEvent: { // CodeEvent
+ * //       content: "STRING_VALUE", // required
+ * //     },
+ * //     intentsEvent: { // IntentsEvent
+ * //       intents: { // IntentMap
+ * //         "<keys>": { // IntentData
+ * //           "<keys>": { // IntentDataType Union: only one key present
+ * //             string: "STRING_VALUE",
+ * //           },
+ * //         },
+ * //       },
+ * //     },
+ * //     interactionComponentsEvent: { // InteractionComponentsEvent
+ * //       interactionComponentEntries: [ // InteractionComponentEntryList // required
+ * //         { // InteractionComponentEntry
+ * //           interactionComponentId: "STRING_VALUE",
+ * //           interactionComponent: { // InteractionComponent
+ * //             text: { // Text
+ * //               content: "STRING_VALUE", // required
+ * //             },
+ * //             alert: { // Alert
+ * //               type: "INFO" || "ERROR" || "WARNING", // required
+ * //               content: [ // AlertComponentList // required
+ * //                 { // AlertComponent
+ * //                   text: {
+ * //                     content: "STRING_VALUE", // required
+ * //                   },
+ * //                 },
+ * //               ],
+ * //             },
+ * //             infrastructureUpdate: { // InfrastructureUpdate
+ * //               transition: { // InfrastructureUpdateTransition
+ * //                 currentState: "STRING_VALUE", // required
+ * //                 nextState: "STRING_VALUE", // required
+ * //               },
+ * //             },
+ * //             progress: { // Progress
+ * //               content: [ // ProgressComponentList // required
+ * //                 { // ProgressComponent
+ * //                   step: { // Step
+ * //                     id: Number("int"), // required
+ * //                     state: "FAILED" || "SUCCEEDED" || "STOPPED" || "PENDING" || "IN_PROGRESS" || "LOADING" || "PAUSED", // required
+ * //                     label: "STRING_VALUE", // required
+ * //                     content: [ // StepComponentList
+ * //                       { // StepComponent
+ * //                         text: "<Text>",
+ * //                       },
+ * //                     ],
+ * //                   },
+ * //                 },
+ * //               ],
+ * //             },
+ * //             step: {
+ * //               id: Number("int"), // required
+ * //               state: "FAILED" || "SUCCEEDED" || "STOPPED" || "PENDING" || "IN_PROGRESS" || "LOADING" || "PAUSED", // required
+ * //               label: "STRING_VALUE", // required
+ * //               content: [
+ * //                 {
+ * //                   text: "<Text>",
+ * //                 },
+ * //               ],
+ * //             },
+ * //             taskDetails: { // TaskDetails
+ * //               overview: { // TaskOverview
+ * //                 label: "STRING_VALUE", // required
+ * //                 description: "STRING_VALUE", // required
+ * //               },
+ * //               content: [ // TaskComponentList // required
+ * //                 { // TaskComponent
+ * //                   text: "<Text>",
+ * //                   infrastructureUpdate: {
+ * //                     transition: {
+ * //                       currentState: "STRING_VALUE", // required
+ * //                       nextState: "STRING_VALUE", // required
+ * //                     },
+ * //                   },
+ * //                   alert: {
+ * //                     type: "INFO" || "ERROR" || "WARNING", // required
+ * //                     content: [ // required
+ * //                       {
+ * //                         text: "<Text>",
+ * //                       },
+ * //                     ],
+ * //                   },
+ * //                   progress: {
+ * //                     content: [ // required
+ * //                       {
+ * //                         step: "<Step>",
+ * //                       },
+ * //                     ],
+ * //                   },
+ * //                 },
+ * //               ],
+ * //               actions: [ // TaskActionList
+ * //                 { // TaskAction
+ * //                   label: "STRING_VALUE", // required
+ * //                   note: { // TaskActionNote
+ * //                     content: "STRING_VALUE", // required
+ * //                     type: "INFO" || "WARNING",
+ * //                   },
+ * //                   primary: true || false,
+ * //                   disabled: true || false,
+ * //                   payload: { // TaskActionPayload // required
+ * //                     "<keys>": "STRING_VALUE",
+ * //                   },
+ * //                   confirmation: { // TaskActionConfirmation
+ * //                     content: "STRING_VALUE",
+ * //                   },
+ * //                 },
+ * //               ],
+ * //             },
+ * //             taskReference: { // TaskReference
+ * //               taskId: "STRING_VALUE", // required
+ * //             },
+ * //             suggestions: { // Suggestions
+ * //               items: [ // SuggestionList // required
+ * //                 { // Suggestion
+ * //                   value: "STRING_VALUE", // required
+ * //                 },
+ * //               ],
+ * //             },
+ * //             section: { // Section
+ * //               title: "STRING_VALUE", // required
+ * //               content: [ // SectionComponentList // required
+ * //                 { // SectionComponent
+ * //                   text: "<Text>",
+ * //                   alert: {
+ * //                     type: "INFO" || "ERROR" || "WARNING", // required
+ * //                     content: [ // required
+ * //                       {
+ * //                         text: "<Text>",
+ * //                       },
+ * //                     ],
+ * //                   },
+ * //                   resource: { // Resource
+ * //                     title: "STRING_VALUE", // required
+ * //                     link: "STRING_VALUE", // required
+ * //                     description: "STRING_VALUE", // required
+ * //                     type: "STRING_VALUE", // required
+ * //                     ARN: "STRING_VALUE", // required
+ * //                     resourceJsonString: "STRING_VALUE", // required
+ * //                   },
+ * //                   resourceList: { // ResourceList
+ * //                     action: { // Action
+ * //                       webLink: { // WebLink
+ * //                         label: "STRING_VALUE", // required
+ * //                         url: "STRING_VALUE", // required
+ * //                       },
+ * //                       moduleLink: { // ModuleLink
+ * //                         cloudWatchTroubleshootingLink: { // CloudWatchTroubleshootingLink
+ * //                           label: "STRING_VALUE", // required
+ * //                           investigationPayload: "STRING_VALUE", // required
+ * //                           defaultText: "STRING_VALUE",
+ * //                         },
+ * //                       },
+ * //                     },
+ * //                     items: [ // Resources // required
+ * //                       {
+ * //                         title: "STRING_VALUE", // required
+ * //                         link: "STRING_VALUE", // required
+ * //                         description: "STRING_VALUE", // required
+ * //                         type: "STRING_VALUE", // required
+ * //                         ARN: "STRING_VALUE", // required
+ * //                         resourceJsonString: "STRING_VALUE", // required
+ * //                       },
+ * //                     ],
+ * //                   },
+ * //                 },
+ * //               ],
+ * //               action: {
+ * //                 webLink: {
+ * //                   label: "STRING_VALUE", // required
+ * //                   url: "STRING_VALUE", // required
+ * //                 },
+ * //                 moduleLink: {
+ * //                   cloudWatchTroubleshootingLink: {
+ * //                     label: "STRING_VALUE", // required
+ * //                     investigationPayload: "STRING_VALUE", // required
+ * //                     defaultText: "STRING_VALUE",
+ * //                   },
+ * //                 },
+ * //               },
+ * //             },
+ * //             resource: "<Resource>",
+ * //             resourceList: {
+ * //               action: {
+ * //                 webLink: {
+ * //                   label: "STRING_VALUE", // required
+ * //                   url: "STRING_VALUE", // required
+ * //                 },
+ * //                 moduleLink: {
+ * //                   cloudWatchTroubleshootingLink: {
+ * //                     label: "STRING_VALUE", // required
+ * //                     investigationPayload: "STRING_VALUE", // required
+ * //                     defaultText: "STRING_VALUE",
+ * //                   },
+ * //                 },
+ * //               },
+ * //               items: [ // required
+ * //                 "<Resource>",
+ * //               ],
+ * //             },
+ * //             action: "<Action>",
+ * //           },
+ * //         },
+ * //       ],
+ * //     },
+ * //     toolUseEvent: { // ToolUseEvent
+ * //       toolUseId: "STRING_VALUE", // required
+ * //       name: "STRING_VALUE", // required
+ * //       input: "STRING_VALUE",
+ * //       stop: true || false,
+ * //     },
+ * //     citationEvent: { // CitationEvent
+ * //       target: { // CitationTarget Union: only one key present
+ * //         location: Number("int"),
+ * //         range: {
+ * //           start: Number("int"),
+ * //           end: Number("int"),
+ * //         },
+ * //       },
+ * //       citationText: "STRING_VALUE",
+ * //       citationLink: "STRING_VALUE", // required
+ * //     },
+ * //     invalidStateEvent: { // InvalidStateEvent
+ * //       reason: "INVALID_TASK_ASSIST_PLAN", // required
+ * //       message: "STRING_VALUE", // required
+ * //     },
+ * //     error: { // InternalServerException
+ * //       message: "STRING_VALUE", // required
+ * //     },
+ * //   },
+ * // };
+ *
+ * ```
+ *
+ * @param GenerateAssistantResponseCommandInput - {@link GenerateAssistantResponseCommandInput}
+ * @returns {@link GenerateAssistantResponseCommandOutput}
+ * @see {@link GenerateAssistantResponseCommandInput} for command's `input` shape.
+ * @see {@link GenerateAssistantResponseCommandOutput} for command's `response` shape.
+ * @see {@link CodeWhispererStreamingClientResolvedConfig | config} for CodeWhispererStreamingClient's `config` shape.
+ *
+ * @throws {@link InternalServerException} (server fault)
+ *  This exception is thrown when an unexpected error occurred during the processing of a request.
+ *
+ * @throws {@link ThrottlingException} (client fault)
+ *  This exception is thrown when request was denied due to request throttling.
+ *
+ * @throws {@link ValidationException} (client fault)
+ *  This exception is thrown when the input fails to satisfy the constraints specified by the service.
+ *
+ * @throws {@link AccessDeniedException} (client fault)
+ *  This exception is thrown when the user does not have sufficient access to perform this action.
+ *
+ * @throws {@link CodeWhispererStreamingServiceException}
+ * <p>Base exception class for all service exceptions from CodeWhispererStreaming service.</p>
+ *
+ * @public
+ */
+export class GenerateAssistantResponseCommand extends $Command.classBuilder<GenerateAssistantResponseCommandInput, GenerateAssistantResponseCommandOutput, CodeWhispererStreamingClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes>()
+      .m(function (this: any, Command: any, cs: any, config: CodeWhispererStreamingClientResolvedConfig, o: any) {
+          return [
+
+  getSerdePlugin(config, this.serialize, this.deserialize),
+      ];
+  })
+  .s("AmazonCodeWhispererStreamingService", "GenerateAssistantResponse", {
+
+    /**
+     * @internal
+     */
+    eventStream: {
+      output: true,
+    },
+  })
+  .n("CodeWhispererStreamingClient", "GenerateAssistantResponseCommand")
+  .f(GenerateAssistantResponseRequestFilterSensitiveLog, GenerateAssistantResponseResponseFilterSensitiveLog)
+  .ser(se_GenerateAssistantResponseCommand)
+  .de(de_GenerateAssistantResponseCommand)
+.build() {
+/** @internal type navigation helper, not in runtime. */
+declare protected static __types: {
+  api: {
+      input: GenerateAssistantResponseRequest;
+      output: GenerateAssistantResponseResponse;
+  };
+  sdk: {
+      input: GenerateAssistantResponseCommandInput;
+      output: GenerateAssistantResponseCommandOutput;
+  };
+};
+}
diff --git a/src.gen/@amzn/codewhisperer-streaming/src/commands/GenerateTaskAssistPlanCommand.ts b/src.gen/@amzn/codewhisperer-streaming/src/commands/GenerateTaskAssistPlanCommand.ts
new file mode 100644
index 00000000000..edd5c5aa6ef
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/src/commands/GenerateTaskAssistPlanCommand.ts
@@ -0,0 +1,783 @@
+// smithy-typescript generated code
+import {
+  CodeWhispererStreamingClientResolvedConfig,
+  ServiceInputTypes,
+  ServiceOutputTypes,
+} from "../CodeWhispererStreamingClient";
+import {
+  GenerateTaskAssistPlanRequest,
+  GenerateTaskAssistPlanRequestFilterSensitiveLog,
+  GenerateTaskAssistPlanResponse,
+  GenerateTaskAssistPlanResponseFilterSensitiveLog,
+} from "../models/models_0";
+import {
+  de_GenerateTaskAssistPlanCommand,
+  se_GenerateTaskAssistPlanCommand,
+} from "../protocols/Aws_restJson1";
+import { getSerdePlugin } from "@smithy/middleware-serde";
+import { Command as $Command } from "@smithy/smithy-client";
+import { MetadataBearer as __MetadataBearer } from "@smithy/types";
+
+/**
+ * @public
+ */
+export type { __MetadataBearer };
+export { $Command };
+/**
+ * @public
+ *
+ * The input for {@link GenerateTaskAssistPlanCommand}.
+ */
+export interface GenerateTaskAssistPlanCommandInput extends GenerateTaskAssistPlanRequest {}
+/**
+ * @public
+ *
+ * The output of {@link GenerateTaskAssistPlanCommand}.
+ */
+export interface GenerateTaskAssistPlanCommandOutput extends GenerateTaskAssistPlanResponse, __MetadataBearer {}
+
+/**
+ * API to generate task assist plan.
+ * @example
+ * Use a bare-bones client and the command you need to make an API call.
+ * ```javascript
+ * import { CodeWhispererStreamingClient, GenerateTaskAssistPlanCommand } from "@amzn/codewhisperer-streaming"; // ES Modules import
+ * // const { CodeWhispererStreamingClient, GenerateTaskAssistPlanCommand } = require("@amzn/codewhisperer-streaming"); // CommonJS import
+ * const client = new CodeWhispererStreamingClient(config);
+ * const input = { // GenerateTaskAssistPlanRequest
+ *   conversationState: { // ConversationState
+ *     conversationId: "STRING_VALUE",
+ *     history: [ // ChatHistory
+ *       { // ChatMessage Union: only one key present
+ *         userInputMessage: { // UserInputMessage
+ *           content: "STRING_VALUE", // required
+ *           userInputMessageContext: { // UserInputMessageContext
+ *             editorState: { // EditorState
+ *               document: { // TextDocument
+ *                 relativeFilePath: "STRING_VALUE", // required
+ *                 programmingLanguage: { // ProgrammingLanguage
+ *                   languageName: "STRING_VALUE", // required
+ *                 },
+ *                 text: "STRING_VALUE",
+ *                 documentSymbols: [ // DocumentSymbols
+ *                   { // DocumentSymbol
+ *                     name: "STRING_VALUE", // required
+ *                     type: "DECLARATION" || "USAGE", // required
+ *                     source: "STRING_VALUE",
+ *                   },
+ *                 ],
+ *               },
+ *               cursorState: { // CursorState Union: only one key present
+ *                 position: { // Position
+ *                   line: Number("int"), // required
+ *                   character: Number("int"), // required
+ *                 },
+ *                 range: { // Range
+ *                   start: {
+ *                     line: Number("int"), // required
+ *                     character: Number("int"), // required
+ *                   },
+ *                   end: {
+ *                     line: Number("int"), // required
+ *                     character: Number("int"), // required
+ *                   },
+ *                 },
+ *               },
+ *               relevantDocuments: [ // RelevantDocumentList
+ *                 { // RelevantTextDocument
+ *                   relativeFilePath: "STRING_VALUE", // required
+ *                   programmingLanguage: {
+ *                     languageName: "STRING_VALUE", // required
+ *                   },
+ *                   text: "STRING_VALUE",
+ *                   documentSymbols: [
+ *                     {
+ *                       name: "STRING_VALUE", // required
+ *                       type: "DECLARATION" || "USAGE", // required
+ *                       source: "STRING_VALUE",
+ *                     },
+ *                   ],
+ *                 },
+ *               ],
+ *               useRelevantDocuments: true || false,
+ *               workspaceFolders: [ // WorkspaceFolderList
+ *                 "STRING_VALUE",
+ *               ],
+ *             },
+ *             shellState: { // ShellState
+ *               shellName: "STRING_VALUE", // required
+ *               shellHistory: [ // ShellHistory
+ *                 { // ShellHistoryEntry
+ *                   command: "STRING_VALUE", // required
+ *                   directory: "STRING_VALUE",
+ *                   exitCode: Number("int"),
+ *                   stdout: "STRING_VALUE",
+ *                   stderr: "STRING_VALUE",
+ *                 },
+ *               ],
+ *             },
+ *             gitState: { // GitState
+ *               status: "STRING_VALUE",
+ *             },
+ *             envState: { // EnvState
+ *               operatingSystem: "STRING_VALUE",
+ *               currentWorkingDirectory: "STRING_VALUE",
+ *               environmentVariables: [ // EnvironmentVariables
+ *                 { // EnvironmentVariable
+ *                   key: "STRING_VALUE",
+ *                   value: "STRING_VALUE",
+ *                 },
+ *               ],
+ *               timezoneOffset: Number("int"),
+ *             },
+ *             appStudioContext: { // AppStudioState
+ *               namespace: "STRING_VALUE", // required
+ *               propertyName: "STRING_VALUE", // required
+ *               propertyValue: "STRING_VALUE",
+ *               propertyContext: "STRING_VALUE", // required
+ *             },
+ *             diagnostic: { // Diagnostic Union: only one key present
+ *               textDocumentDiagnostic: { // TextDocumentDiagnostic
+ *                 document: {
+ *                   relativeFilePath: "STRING_VALUE", // required
+ *                   programmingLanguage: {
+ *                     languageName: "STRING_VALUE", // required
+ *                   },
+ *                   text: "STRING_VALUE",
+ *                   documentSymbols: [
+ *                     {
+ *                       name: "STRING_VALUE", // required
+ *                       type: "DECLARATION" || "USAGE", // required
+ *                       source: "STRING_VALUE",
+ *                     },
+ *                   ],
+ *                 },
+ *                 range: {
+ *                   start: {
+ *                     line: Number("int"), // required
+ *                     character: Number("int"), // required
+ *                   },
+ *                   end: {
+ *                     line: Number("int"), // required
+ *                     character: Number("int"), // required
+ *                   },
+ *                 },
+ *                 source: "STRING_VALUE", // required
+ *                 severity: "ERROR" || "WARNING" || "INFORMATION" || "HINT", // required
+ *                 message: "STRING_VALUE", // required
+ *               },
+ *               runtimeDiagnostic: { // RuntimeDiagnostic
+ *                 source: "STRING_VALUE", // required
+ *                 severity: "ERROR" || "WARNING" || "INFORMATION" || "HINT", // required
+ *                 message: "STRING_VALUE", // required
+ *               },
+ *             },
+ *             consoleState: { // ConsoleState
+ *               region: "STRING_VALUE",
+ *               consoleUrl: "STRING_VALUE",
+ *               serviceId: "STRING_VALUE",
+ *               serviceConsolePage: "STRING_VALUE",
+ *               serviceSubconsolePage: "STRING_VALUE",
+ *               taskName: "STRING_VALUE",
+ *             },
+ *             userSettings: { // UserSettings
+ *               hasConsentedToCrossRegionCalls: true || false,
+ *             },
+ *             additionalContext: [ // AdditionalContentList
+ *               { // AdditionalContentEntry
+ *                 name: "STRING_VALUE", // required
+ *                 description: "STRING_VALUE", // required
+ *                 innerContext: "STRING_VALUE",
+ *               },
+ *             ],
+ *             toolResults: [ // ToolResults
+ *               { // ToolResult
+ *                 toolUseId: "STRING_VALUE", // required
+ *                 content: [ // ToolResultContent // required
+ *                   { // ToolResultContentBlock Union: only one key present
+ *                     text: "STRING_VALUE",
+ *                     json: "DOCUMENT_VALUE",
+ *                   },
+ *                 ],
+ *                 status: "success" || "error",
+ *               },
+ *             ],
+ *             tools: [ // Tools
+ *               { // Tool Union: only one key present
+ *                 toolSpecification: { // ToolSpecification
+ *                   inputSchema: { // ToolInputSchema
+ *                     json: "DOCUMENT_VALUE",
+ *                   },
+ *                   name: "STRING_VALUE", // required
+ *                   description: "STRING_VALUE",
+ *                 },
+ *               },
+ *             ],
+ *           },
+ *           userIntent: "SUGGEST_ALTERNATE_IMPLEMENTATION" || "APPLY_COMMON_BEST_PRACTICES" || "IMPROVE_CODE" || "SHOW_EXAMPLES" || "CITE_SOURCES" || "EXPLAIN_LINE_BY_LINE" || "EXPLAIN_CODE_SELECTION" || "GENERATE_CLOUDFORMATION_TEMPLATE" || "GENERATE_UNIT_TESTS" || "CODE_GENERATION",
+ *           origin: "STRING_VALUE",
+ *           images: [ // ImageBlocks
+ *             { // ImageBlock
+ *               format: "png" || "jpeg" || "gif" || "webp", // required
+ *               source: { // ImageSource Union: only one key present
+ *                 bytes: new Uint8Array(), // e.g. Buffer.from("") or new TextEncoder().encode("")
+ *               },
+ *             },
+ *           ],
+ *         },
+ *         assistantResponseMessage: { // AssistantResponseMessage
+ *           messageId: "STRING_VALUE",
+ *           content: "STRING_VALUE", // required
+ *           supplementaryWebLinks: [ // SupplementaryWebLinks
+ *             { // SupplementaryWebLink
+ *               url: "STRING_VALUE", // required
+ *               title: "STRING_VALUE", // required
+ *               snippet: "STRING_VALUE",
+ *             },
+ *           ],
+ *           references: [ // References
+ *             { // Reference
+ *               licenseName: "STRING_VALUE",
+ *               repository: "STRING_VALUE",
+ *               url: "STRING_VALUE",
+ *               recommendationContentSpan: { // Span
+ *                 start: Number("int"),
+ *                 end: Number("int"),
+ *               },
+ *             },
+ *           ],
+ *           followupPrompt: { // FollowupPrompt
+ *             content: "STRING_VALUE", // required
+ *             userIntent: "SUGGEST_ALTERNATE_IMPLEMENTATION" || "APPLY_COMMON_BEST_PRACTICES" || "IMPROVE_CODE" || "SHOW_EXAMPLES" || "CITE_SOURCES" || "EXPLAIN_LINE_BY_LINE" || "EXPLAIN_CODE_SELECTION" || "GENERATE_CLOUDFORMATION_TEMPLATE" || "GENERATE_UNIT_TESTS" || "CODE_GENERATION",
+ *           },
+ *           toolUses: [ // ToolUses
+ *             { // ToolUse
+ *               toolUseId: "STRING_VALUE", // required
+ *               name: "STRING_VALUE", // required
+ *               input: "DOCUMENT_VALUE", // required
+ *             },
+ *           ],
+ *         },
+ *       },
+ *     ],
+ *     currentMessage: {//  Union: only one key present
+ *       userInputMessage: {
+ *         content: "STRING_VALUE", // required
+ *         userInputMessageContext: {
+ *           editorState: {
+ *             document: "<TextDocument>",
+ *             cursorState: {//  Union: only one key present
+ *               position: "<Position>",
+ *               range: {
+ *                 start: "<Position>", // required
+ *                 end: "<Position>", // required
+ *               },
+ *             },
+ *             relevantDocuments: [
+ *               {
+ *                 relativeFilePath: "STRING_VALUE", // required
+ *                 programmingLanguage: {
+ *                   languageName: "STRING_VALUE", // required
+ *                 },
+ *                 text: "STRING_VALUE",
+ *                 documentSymbols: [
+ *                   {
+ *                     name: "STRING_VALUE", // required
+ *                     type: "DECLARATION" || "USAGE", // required
+ *                     source: "STRING_VALUE",
+ *                   },
+ *                 ],
+ *               },
+ *             ],
+ *             useRelevantDocuments: true || false,
+ *             workspaceFolders: [
+ *               "STRING_VALUE",
+ *             ],
+ *           },
+ *           shellState: {
+ *             shellName: "STRING_VALUE", // required
+ *             shellHistory: [
+ *               {
+ *                 command: "STRING_VALUE", // required
+ *                 directory: "STRING_VALUE",
+ *                 exitCode: Number("int"),
+ *                 stdout: "STRING_VALUE",
+ *                 stderr: "STRING_VALUE",
+ *               },
+ *             ],
+ *           },
+ *           gitState: {
+ *             status: "STRING_VALUE",
+ *           },
+ *           envState: {
+ *             operatingSystem: "STRING_VALUE",
+ *             currentWorkingDirectory: "STRING_VALUE",
+ *             environmentVariables: [
+ *               {
+ *                 key: "STRING_VALUE",
+ *                 value: "STRING_VALUE",
+ *               },
+ *             ],
+ *             timezoneOffset: Number("int"),
+ *           },
+ *           appStudioContext: {
+ *             namespace: "STRING_VALUE", // required
+ *             propertyName: "STRING_VALUE", // required
+ *             propertyValue: "STRING_VALUE",
+ *             propertyContext: "STRING_VALUE", // required
+ *           },
+ *           diagnostic: {//  Union: only one key present
+ *             textDocumentDiagnostic: {
+ *               document: "<TextDocument>", // required
+ *               range: {
+ *                 start: "<Position>", // required
+ *                 end: "<Position>", // required
+ *               },
+ *               source: "STRING_VALUE", // required
+ *               severity: "ERROR" || "WARNING" || "INFORMATION" || "HINT", // required
+ *               message: "STRING_VALUE", // required
+ *             },
+ *             runtimeDiagnostic: {
+ *               source: "STRING_VALUE", // required
+ *               severity: "ERROR" || "WARNING" || "INFORMATION" || "HINT", // required
+ *               message: "STRING_VALUE", // required
+ *             },
+ *           },
+ *           consoleState: {
+ *             region: "STRING_VALUE",
+ *             consoleUrl: "STRING_VALUE",
+ *             serviceId: "STRING_VALUE",
+ *             serviceConsolePage: "STRING_VALUE",
+ *             serviceSubconsolePage: "STRING_VALUE",
+ *             taskName: "STRING_VALUE",
+ *           },
+ *           userSettings: {
+ *             hasConsentedToCrossRegionCalls: true || false,
+ *           },
+ *           additionalContext: [
+ *             {
+ *               name: "STRING_VALUE", // required
+ *               description: "STRING_VALUE", // required
+ *               innerContext: "STRING_VALUE",
+ *             },
+ *           ],
+ *           toolResults: [
+ *             {
+ *               toolUseId: "STRING_VALUE", // required
+ *               content: [ // required
+ *                 {//  Union: only one key present
+ *                   text: "STRING_VALUE",
+ *                   json: "DOCUMENT_VALUE",
+ *                 },
+ *               ],
+ *               status: "success" || "error",
+ *             },
+ *           ],
+ *           tools: [
+ *             {//  Union: only one key present
+ *               toolSpecification: {
+ *                 inputSchema: {
+ *                   json: "DOCUMENT_VALUE",
+ *                 },
+ *                 name: "STRING_VALUE", // required
+ *                 description: "STRING_VALUE",
+ *               },
+ *             },
+ *           ],
+ *         },
+ *         userIntent: "SUGGEST_ALTERNATE_IMPLEMENTATION" || "APPLY_COMMON_BEST_PRACTICES" || "IMPROVE_CODE" || "SHOW_EXAMPLES" || "CITE_SOURCES" || "EXPLAIN_LINE_BY_LINE" || "EXPLAIN_CODE_SELECTION" || "GENERATE_CLOUDFORMATION_TEMPLATE" || "GENERATE_UNIT_TESTS" || "CODE_GENERATION",
+ *         origin: "STRING_VALUE",
+ *         images: [
+ *           {
+ *             format: "png" || "jpeg" || "gif" || "webp", // required
+ *             source: {//  Union: only one key present
+ *               bytes: new Uint8Array(), // e.g. Buffer.from("") or new TextEncoder().encode("")
+ *             },
+ *           },
+ *         ],
+ *       },
+ *       assistantResponseMessage: {
+ *         messageId: "STRING_VALUE",
+ *         content: "STRING_VALUE", // required
+ *         supplementaryWebLinks: [
+ *           {
+ *             url: "STRING_VALUE", // required
+ *             title: "STRING_VALUE", // required
+ *             snippet: "STRING_VALUE",
+ *           },
+ *         ],
+ *         references: [
+ *           {
+ *             licenseName: "STRING_VALUE",
+ *             repository: "STRING_VALUE",
+ *             url: "STRING_VALUE",
+ *             recommendationContentSpan: {
+ *               start: Number("int"),
+ *               end: Number("int"),
+ *             },
+ *           },
+ *         ],
+ *         followupPrompt: {
+ *           content: "STRING_VALUE", // required
+ *           userIntent: "SUGGEST_ALTERNATE_IMPLEMENTATION" || "APPLY_COMMON_BEST_PRACTICES" || "IMPROVE_CODE" || "SHOW_EXAMPLES" || "CITE_SOURCES" || "EXPLAIN_LINE_BY_LINE" || "EXPLAIN_CODE_SELECTION" || "GENERATE_CLOUDFORMATION_TEMPLATE" || "GENERATE_UNIT_TESTS" || "CODE_GENERATION",
+ *         },
+ *         toolUses: [
+ *           {
+ *             toolUseId: "STRING_VALUE", // required
+ *             name: "STRING_VALUE", // required
+ *             input: "DOCUMENT_VALUE", // required
+ *           },
+ *         ],
+ *       },
+ *     },
+ *     chatTriggerType: "MANUAL" || "DIAGNOSTIC" || "INLINE_CHAT", // required
+ *     customizationArn: "STRING_VALUE",
+ *   },
+ *   workspaceState: { // WorkspaceState
+ *     uploadId: "STRING_VALUE", // required
+ *     programmingLanguage: "<ProgrammingLanguage>", // required
+ *     contextTruncationScheme: "ANALYSIS" || "GUMBY",
+ *   },
+ *   profileArn: "STRING_VALUE",
+ * };
+ * const command = new GenerateTaskAssistPlanCommand(input);
+ * const response = await client.send(command);
+ * // { // GenerateTaskAssistPlanResponse
+ * //   planningResponseStream: { // ChatResponseStream Union: only one key present
+ * //     messageMetadataEvent: { // MessageMetadataEvent
+ * //       conversationId: "STRING_VALUE",
+ * //       utteranceId: "STRING_VALUE",
+ * //     },
+ * //     assistantResponseEvent: { // AssistantResponseEvent
+ * //       content: "STRING_VALUE", // required
+ * //     },
+ * //     dryRunSucceedEvent: {},
+ * //     codeReferenceEvent: { // CodeReferenceEvent
+ * //       references: [ // References
+ * //         { // Reference
+ * //           licenseName: "STRING_VALUE",
+ * //           repository: "STRING_VALUE",
+ * //           url: "STRING_VALUE",
+ * //           recommendationContentSpan: { // Span
+ * //             start: Number("int"),
+ * //             end: Number("int"),
+ * //           },
+ * //         },
+ * //       ],
+ * //     },
+ * //     supplementaryWebLinksEvent: { // SupplementaryWebLinksEvent
+ * //       supplementaryWebLinks: [ // SupplementaryWebLinks
+ * //         { // SupplementaryWebLink
+ * //           url: "STRING_VALUE", // required
+ * //           title: "STRING_VALUE", // required
+ * //           snippet: "STRING_VALUE",
+ * //         },
+ * //       ],
+ * //     },
+ * //     followupPromptEvent: { // FollowupPromptEvent
+ * //       followupPrompt: { // FollowupPrompt
+ * //         content: "STRING_VALUE", // required
+ * //         userIntent: "SUGGEST_ALTERNATE_IMPLEMENTATION" || "APPLY_COMMON_BEST_PRACTICES" || "IMPROVE_CODE" || "SHOW_EXAMPLES" || "CITE_SOURCES" || "EXPLAIN_LINE_BY_LINE" || "EXPLAIN_CODE_SELECTION" || "GENERATE_CLOUDFORMATION_TEMPLATE" || "GENERATE_UNIT_TESTS" || "CODE_GENERATION",
+ * //       },
+ * //     },
+ * //     codeEvent: { // CodeEvent
+ * //       content: "STRING_VALUE", // required
+ * //     },
+ * //     intentsEvent: { // IntentsEvent
+ * //       intents: { // IntentMap
+ * //         "<keys>": { // IntentData
+ * //           "<keys>": { // IntentDataType Union: only one key present
+ * //             string: "STRING_VALUE",
+ * //           },
+ * //         },
+ * //       },
+ * //     },
+ * //     interactionComponentsEvent: { // InteractionComponentsEvent
+ * //       interactionComponentEntries: [ // InteractionComponentEntryList // required
+ * //         { // InteractionComponentEntry
+ * //           interactionComponentId: "STRING_VALUE",
+ * //           interactionComponent: { // InteractionComponent
+ * //             text: { // Text
+ * //               content: "STRING_VALUE", // required
+ * //             },
+ * //             alert: { // Alert
+ * //               type: "INFO" || "ERROR" || "WARNING", // required
+ * //               content: [ // AlertComponentList // required
+ * //                 { // AlertComponent
+ * //                   text: {
+ * //                     content: "STRING_VALUE", // required
+ * //                   },
+ * //                 },
+ * //               ],
+ * //             },
+ * //             infrastructureUpdate: { // InfrastructureUpdate
+ * //               transition: { // InfrastructureUpdateTransition
+ * //                 currentState: "STRING_VALUE", // required
+ * //                 nextState: "STRING_VALUE", // required
+ * //               },
+ * //             },
+ * //             progress: { // Progress
+ * //               content: [ // ProgressComponentList // required
+ * //                 { // ProgressComponent
+ * //                   step: { // Step
+ * //                     id: Number("int"), // required
+ * //                     state: "FAILED" || "SUCCEEDED" || "STOPPED" || "PENDING" || "IN_PROGRESS" || "LOADING" || "PAUSED", // required
+ * //                     label: "STRING_VALUE", // required
+ * //                     content: [ // StepComponentList
+ * //                       { // StepComponent
+ * //                         text: "<Text>",
+ * //                       },
+ * //                     ],
+ * //                   },
+ * //                 },
+ * //               ],
+ * //             },
+ * //             step: {
+ * //               id: Number("int"), // required
+ * //               state: "FAILED" || "SUCCEEDED" || "STOPPED" || "PENDING" || "IN_PROGRESS" || "LOADING" || "PAUSED", // required
+ * //               label: "STRING_VALUE", // required
+ * //               content: [
+ * //                 {
+ * //                   text: "<Text>",
+ * //                 },
+ * //               ],
+ * //             },
+ * //             taskDetails: { // TaskDetails
+ * //               overview: { // TaskOverview
+ * //                 label: "STRING_VALUE", // required
+ * //                 description: "STRING_VALUE", // required
+ * //               },
+ * //               content: [ // TaskComponentList // required
+ * //                 { // TaskComponent
+ * //                   text: "<Text>",
+ * //                   infrastructureUpdate: {
+ * //                     transition: {
+ * //                       currentState: "STRING_VALUE", // required
+ * //                       nextState: "STRING_VALUE", // required
+ * //                     },
+ * //                   },
+ * //                   alert: {
+ * //                     type: "INFO" || "ERROR" || "WARNING", // required
+ * //                     content: [ // required
+ * //                       {
+ * //                         text: "<Text>",
+ * //                       },
+ * //                     ],
+ * //                   },
+ * //                   progress: {
+ * //                     content: [ // required
+ * //                       {
+ * //                         step: "<Step>",
+ * //                       },
+ * //                     ],
+ * //                   },
+ * //                 },
+ * //               ],
+ * //               actions: [ // TaskActionList
+ * //                 { // TaskAction
+ * //                   label: "STRING_VALUE", // required
+ * //                   note: { // TaskActionNote
+ * //                     content: "STRING_VALUE", // required
+ * //                     type: "INFO" || "WARNING",
+ * //                   },
+ * //                   primary: true || false,
+ * //                   disabled: true || false,
+ * //                   payload: { // TaskActionPayload // required
+ * //                     "<keys>": "STRING_VALUE",
+ * //                   },
+ * //                   confirmation: { // TaskActionConfirmation
+ * //                     content: "STRING_VALUE",
+ * //                   },
+ * //                 },
+ * //               ],
+ * //             },
+ * //             taskReference: { // TaskReference
+ * //               taskId: "STRING_VALUE", // required
+ * //             },
+ * //             suggestions: { // Suggestions
+ * //               items: [ // SuggestionList // required
+ * //                 { // Suggestion
+ * //                   value: "STRING_VALUE", // required
+ * //                 },
+ * //               ],
+ * //             },
+ * //             section: { // Section
+ * //               title: "STRING_VALUE", // required
+ * //               content: [ // SectionComponentList // required
+ * //                 { // SectionComponent
+ * //                   text: "<Text>",
+ * //                   alert: {
+ * //                     type: "INFO" || "ERROR" || "WARNING", // required
+ * //                     content: [ // required
+ * //                       {
+ * //                         text: "<Text>",
+ * //                       },
+ * //                     ],
+ * //                   },
+ * //                   resource: { // Resource
+ * //                     title: "STRING_VALUE", // required
+ * //                     link: "STRING_VALUE", // required
+ * //                     description: "STRING_VALUE", // required
+ * //                     type: "STRING_VALUE", // required
+ * //                     ARN: "STRING_VALUE", // required
+ * //                     resourceJsonString: "STRING_VALUE", // required
+ * //                   },
+ * //                   resourceList: { // ResourceList
+ * //                     action: { // Action
+ * //                       webLink: { // WebLink
+ * //                         label: "STRING_VALUE", // required
+ * //                         url: "STRING_VALUE", // required
+ * //                       },
+ * //                       moduleLink: { // ModuleLink
+ * //                         cloudWatchTroubleshootingLink: { // CloudWatchTroubleshootingLink
+ * //                           label: "STRING_VALUE", // required
+ * //                           investigationPayload: "STRING_VALUE", // required
+ * //                           defaultText: "STRING_VALUE",
+ * //                         },
+ * //                       },
+ * //                     },
+ * //                     items: [ // Resources // required
+ * //                       {
+ * //                         title: "STRING_VALUE", // required
+ * //                         link: "STRING_VALUE", // required
+ * //                         description: "STRING_VALUE", // required
+ * //                         type: "STRING_VALUE", // required
+ * //                         ARN: "STRING_VALUE", // required
+ * //                         resourceJsonString: "STRING_VALUE", // required
+ * //                       },
+ * //                     ],
+ * //                   },
+ * //                 },
+ * //               ],
+ * //               action: {
+ * //                 webLink: {
+ * //                   label: "STRING_VALUE", // required
+ * //                   url: "STRING_VALUE", // required
+ * //                 },
+ * //                 moduleLink: {
+ * //                   cloudWatchTroubleshootingLink: {
+ * //                     label: "STRING_VALUE", // required
+ * //                     investigationPayload: "STRING_VALUE", // required
+ * //                     defaultText: "STRING_VALUE",
+ * //                   },
+ * //                 },
+ * //               },
+ * //             },
+ * //             resource: "<Resource>",
+ * //             resourceList: {
+ * //               action: {
+ * //                 webLink: {
+ * //                   label: "STRING_VALUE", // required
+ * //                   url: "STRING_VALUE", // required
+ * //                 },
+ * //                 moduleLink: {
+ * //                   cloudWatchTroubleshootingLink: {
+ * //                     label: "STRING_VALUE", // required
+ * //                     investigationPayload: "STRING_VALUE", // required
+ * //                     defaultText: "STRING_VALUE",
+ * //                   },
+ * //                 },
+ * //               },
+ * //               items: [ // required
+ * //                 "<Resource>",
+ * //               ],
+ * //             },
+ * //             action: "<Action>",
+ * //           },
+ * //         },
+ * //       ],
+ * //     },
+ * //     toolUseEvent: { // ToolUseEvent
+ * //       toolUseId: "STRING_VALUE", // required
+ * //       name: "STRING_VALUE", // required
+ * //       input: "STRING_VALUE",
+ * //       stop: true || false,
+ * //     },
+ * //     citationEvent: { // CitationEvent
+ * //       target: { // CitationTarget Union: only one key present
+ * //         location: Number("int"),
+ * //         range: {
+ * //           start: Number("int"),
+ * //           end: Number("int"),
+ * //         },
+ * //       },
+ * //       citationText: "STRING_VALUE",
+ * //       citationLink: "STRING_VALUE", // required
+ * //     },
+ * //     invalidStateEvent: { // InvalidStateEvent
+ * //       reason: "INVALID_TASK_ASSIST_PLAN", // required
+ * //       message: "STRING_VALUE", // required
+ * //     },
+ * //     error: { // InternalServerException
+ * //       message: "STRING_VALUE", // required
+ * //     },
+ * //   },
+ * // };
+ *
+ * ```
+ *
+ * @param GenerateTaskAssistPlanCommandInput - {@link GenerateTaskAssistPlanCommandInput}
+ * @returns {@link GenerateTaskAssistPlanCommandOutput}
+ * @see {@link GenerateTaskAssistPlanCommandInput} for command's `input` shape.
+ * @see {@link GenerateTaskAssistPlanCommandOutput} for command's `response` shape.
+ * @see {@link CodeWhispererStreamingClientResolvedConfig | config} for CodeWhispererStreamingClient's `config` shape.
+ *
+ * @throws {@link InternalServerException} (server fault)
+ *  This exception is thrown when an unexpected error occurred during the processing of a request.
+ *
+ * @throws {@link ServiceQuotaExceededException} (client fault)
+ *  This exception is thrown when request was denied due to caller exceeding their usage limits
+ *
+ * @throws {@link ThrottlingException} (client fault)
+ *  This exception is thrown when request was denied due to request throttling.
+ *
+ * @throws {@link ValidationException} (client fault)
+ *  This exception is thrown when the input fails to satisfy the constraints specified by the service.
+ *
+ * @throws {@link ConflictException} (client fault)
+ *  This exception is thrown when the action to perform could not be completed because the resource is in a conflicting state.
+ *
+ * @throws {@link ResourceNotFoundException} (client fault)
+ *  This exception is thrown when describing a resource that does not exist.
+ *
+ * @throws {@link AccessDeniedException} (client fault)
+ *  This exception is thrown when the user does not have sufficient access to perform this action.
+ *
+ * @throws {@link CodeWhispererStreamingServiceException}
+ * <p>Base exception class for all service exceptions from CodeWhispererStreaming service.</p>
+ *
+ * @public
+ */
+export class GenerateTaskAssistPlanCommand extends $Command.classBuilder<GenerateTaskAssistPlanCommandInput, GenerateTaskAssistPlanCommandOutput, CodeWhispererStreamingClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes>()
+      .m(function (this: any, Command: any, cs: any, config: CodeWhispererStreamingClientResolvedConfig, o: any) {
+          return [
+
+  getSerdePlugin(config, this.serialize, this.deserialize),
+      ];
+  })
+  .s("AmazonCodeWhispererStreamingService", "GenerateTaskAssistPlan", {
+
+    /**
+     * @internal
+     */
+    eventStream: {
+      output: true,
+    },
+  })
+  .n("CodeWhispererStreamingClient", "GenerateTaskAssistPlanCommand")
+  .f(GenerateTaskAssistPlanRequestFilterSensitiveLog, GenerateTaskAssistPlanResponseFilterSensitiveLog)
+  .ser(se_GenerateTaskAssistPlanCommand)
+  .de(de_GenerateTaskAssistPlanCommand)
+.build() {
+/** @internal type navigation helper, not in runtime. */
+declare protected static __types: {
+  api: {
+      input: GenerateTaskAssistPlanRequest;
+      output: GenerateTaskAssistPlanResponse;
+  };
+  sdk: {
+      input: GenerateTaskAssistPlanCommandInput;
+      output: GenerateTaskAssistPlanCommandOutput;
+  };
+};
+}
diff --git a/src.gen/@amzn/codewhisperer-streaming/src/commands/SendMessageCommand.ts b/src.gen/@amzn/codewhisperer-streaming/src/commands/SendMessageCommand.ts
new file mode 100644
index 00000000000..d2e9ad6631a
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/src/commands/SendMessageCommand.ts
@@ -0,0 +1,783 @@
+// smithy-typescript generated code
+import {
+  CodeWhispererStreamingClientResolvedConfig,
+  ServiceInputTypes,
+  ServiceOutputTypes,
+} from "../CodeWhispererStreamingClient";
+import {
+  SendMessageRequest,
+  SendMessageRequestFilterSensitiveLog,
+  SendMessageResponse,
+  SendMessageResponseFilterSensitiveLog,
+} from "../models/models_0";
+import {
+  de_SendMessageCommand,
+  se_SendMessageCommand,
+} from "../protocols/Aws_restJson1";
+import { getSerdePlugin } from "@smithy/middleware-serde";
+import { Command as $Command } from "@smithy/smithy-client";
+import { MetadataBearer as __MetadataBearer } from "@smithy/types";
+
+/**
+ * @public
+ */
+export type { __MetadataBearer };
+export { $Command };
+/**
+ * @public
+ *
+ * The input for {@link SendMessageCommand}.
+ */
+export interface SendMessageCommandInput extends SendMessageRequest {}
+/**
+ * @public
+ *
+ * The output of {@link SendMessageCommand}.
+ */
+export interface SendMessageCommandOutput extends SendMessageResponse, __MetadataBearer {}
+
+/**
+ * @public
+ *
+ * @example
+ * Use a bare-bones client and the command you need to make an API call.
+ * ```javascript
+ * import { CodeWhispererStreamingClient, SendMessageCommand } from "@amzn/codewhisperer-streaming"; // ES Modules import
+ * // const { CodeWhispererStreamingClient, SendMessageCommand } = require("@amzn/codewhisperer-streaming"); // CommonJS import
+ * const client = new CodeWhispererStreamingClient(config);
+ * const input = { // SendMessageRequest
+ *   conversationState: { // ConversationState
+ *     conversationId: "STRING_VALUE",
+ *     history: [ // ChatHistory
+ *       { // ChatMessage Union: only one key present
+ *         userInputMessage: { // UserInputMessage
+ *           content: "STRING_VALUE", // required
+ *           userInputMessageContext: { // UserInputMessageContext
+ *             editorState: { // EditorState
+ *               document: { // TextDocument
+ *                 relativeFilePath: "STRING_VALUE", // required
+ *                 programmingLanguage: { // ProgrammingLanguage
+ *                   languageName: "STRING_VALUE", // required
+ *                 },
+ *                 text: "STRING_VALUE",
+ *                 documentSymbols: [ // DocumentSymbols
+ *                   { // DocumentSymbol
+ *                     name: "STRING_VALUE", // required
+ *                     type: "DECLARATION" || "USAGE", // required
+ *                     source: "STRING_VALUE",
+ *                   },
+ *                 ],
+ *               },
+ *               cursorState: { // CursorState Union: only one key present
+ *                 position: { // Position
+ *                   line: Number("int"), // required
+ *                   character: Number("int"), // required
+ *                 },
+ *                 range: { // Range
+ *                   start: {
+ *                     line: Number("int"), // required
+ *                     character: Number("int"), // required
+ *                   },
+ *                   end: {
+ *                     line: Number("int"), // required
+ *                     character: Number("int"), // required
+ *                   },
+ *                 },
+ *               },
+ *               relevantDocuments: [ // RelevantDocumentList
+ *                 { // RelevantTextDocument
+ *                   relativeFilePath: "STRING_VALUE", // required
+ *                   programmingLanguage: {
+ *                     languageName: "STRING_VALUE", // required
+ *                   },
+ *                   text: "STRING_VALUE",
+ *                   documentSymbols: [
+ *                     {
+ *                       name: "STRING_VALUE", // required
+ *                       type: "DECLARATION" || "USAGE", // required
+ *                       source: "STRING_VALUE",
+ *                     },
+ *                   ],
+ *                 },
+ *               ],
+ *               useRelevantDocuments: true || false,
+ *               workspaceFolders: [ // WorkspaceFolderList
+ *                 "STRING_VALUE",
+ *               ],
+ *             },
+ *             shellState: { // ShellState
+ *               shellName: "STRING_VALUE", // required
+ *               shellHistory: [ // ShellHistory
+ *                 { // ShellHistoryEntry
+ *                   command: "STRING_VALUE", // required
+ *                   directory: "STRING_VALUE",
+ *                   exitCode: Number("int"),
+ *                   stdout: "STRING_VALUE",
+ *                   stderr: "STRING_VALUE",
+ *                 },
+ *               ],
+ *             },
+ *             gitState: { // GitState
+ *               status: "STRING_VALUE",
+ *             },
+ *             envState: { // EnvState
+ *               operatingSystem: "STRING_VALUE",
+ *               currentWorkingDirectory: "STRING_VALUE",
+ *               environmentVariables: [ // EnvironmentVariables
+ *                 { // EnvironmentVariable
+ *                   key: "STRING_VALUE",
+ *                   value: "STRING_VALUE",
+ *                 },
+ *               ],
+ *               timezoneOffset: Number("int"),
+ *             },
+ *             appStudioContext: { // AppStudioState
+ *               namespace: "STRING_VALUE", // required
+ *               propertyName: "STRING_VALUE", // required
+ *               propertyValue: "STRING_VALUE",
+ *               propertyContext: "STRING_VALUE", // required
+ *             },
+ *             diagnostic: { // Diagnostic Union: only one key present
+ *               textDocumentDiagnostic: { // TextDocumentDiagnostic
+ *                 document: {
+ *                   relativeFilePath: "STRING_VALUE", // required
+ *                   programmingLanguage: {
+ *                     languageName: "STRING_VALUE", // required
+ *                   },
+ *                   text: "STRING_VALUE",
+ *                   documentSymbols: [
+ *                     {
+ *                       name: "STRING_VALUE", // required
+ *                       type: "DECLARATION" || "USAGE", // required
+ *                       source: "STRING_VALUE",
+ *                     },
+ *                   ],
+ *                 },
+ *                 range: {
+ *                   start: {
+ *                     line: Number("int"), // required
+ *                     character: Number("int"), // required
+ *                   },
+ *                   end: {
+ *                     line: Number("int"), // required
+ *                     character: Number("int"), // required
+ *                   },
+ *                 },
+ *                 source: "STRING_VALUE", // required
+ *                 severity: "ERROR" || "WARNING" || "INFORMATION" || "HINT", // required
+ *                 message: "STRING_VALUE", // required
+ *               },
+ *               runtimeDiagnostic: { // RuntimeDiagnostic
+ *                 source: "STRING_VALUE", // required
+ *                 severity: "ERROR" || "WARNING" || "INFORMATION" || "HINT", // required
+ *                 message: "STRING_VALUE", // required
+ *               },
+ *             },
+ *             consoleState: { // ConsoleState
+ *               region: "STRING_VALUE",
+ *               consoleUrl: "STRING_VALUE",
+ *               serviceId: "STRING_VALUE",
+ *               serviceConsolePage: "STRING_VALUE",
+ *               serviceSubconsolePage: "STRING_VALUE",
+ *               taskName: "STRING_VALUE",
+ *             },
+ *             userSettings: { // UserSettings
+ *               hasConsentedToCrossRegionCalls: true || false,
+ *             },
+ *             additionalContext: [ // AdditionalContentList
+ *               { // AdditionalContentEntry
+ *                 name: "STRING_VALUE", // required
+ *                 description: "STRING_VALUE", // required
+ *                 innerContext: "STRING_VALUE",
+ *               },
+ *             ],
+ *             toolResults: [ // ToolResults
+ *               { // ToolResult
+ *                 toolUseId: "STRING_VALUE", // required
+ *                 content: [ // ToolResultContent // required
+ *                   { // ToolResultContentBlock Union: only one key present
+ *                     text: "STRING_VALUE",
+ *                     json: "DOCUMENT_VALUE",
+ *                   },
+ *                 ],
+ *                 status: "success" || "error",
+ *               },
+ *             ],
+ *             tools: [ // Tools
+ *               { // Tool Union: only one key present
+ *                 toolSpecification: { // ToolSpecification
+ *                   inputSchema: { // ToolInputSchema
+ *                     json: "DOCUMENT_VALUE",
+ *                   },
+ *                   name: "STRING_VALUE", // required
+ *                   description: "STRING_VALUE",
+ *                 },
+ *               },
+ *             ],
+ *           },
+ *           userIntent: "SUGGEST_ALTERNATE_IMPLEMENTATION" || "APPLY_COMMON_BEST_PRACTICES" || "IMPROVE_CODE" || "SHOW_EXAMPLES" || "CITE_SOURCES" || "EXPLAIN_LINE_BY_LINE" || "EXPLAIN_CODE_SELECTION" || "GENERATE_CLOUDFORMATION_TEMPLATE" || "GENERATE_UNIT_TESTS" || "CODE_GENERATION",
+ *           origin: "STRING_VALUE",
+ *           images: [ // ImageBlocks
+ *             { // ImageBlock
+ *               format: "png" || "jpeg" || "gif" || "webp", // required
+ *               source: { // ImageSource Union: only one key present
+ *                 bytes: new Uint8Array(), // e.g. Buffer.from("") or new TextEncoder().encode("")
+ *               },
+ *             },
+ *           ],
+ *         },
+ *         assistantResponseMessage: { // AssistantResponseMessage
+ *           messageId: "STRING_VALUE",
+ *           content: "STRING_VALUE", // required
+ *           supplementaryWebLinks: [ // SupplementaryWebLinks
+ *             { // SupplementaryWebLink
+ *               url: "STRING_VALUE", // required
+ *               title: "STRING_VALUE", // required
+ *               snippet: "STRING_VALUE",
+ *             },
+ *           ],
+ *           references: [ // References
+ *             { // Reference
+ *               licenseName: "STRING_VALUE",
+ *               repository: "STRING_VALUE",
+ *               url: "STRING_VALUE",
+ *               recommendationContentSpan: { // Span
+ *                 start: Number("int"),
+ *                 end: Number("int"),
+ *               },
+ *             },
+ *           ],
+ *           followupPrompt: { // FollowupPrompt
+ *             content: "STRING_VALUE", // required
+ *             userIntent: "SUGGEST_ALTERNATE_IMPLEMENTATION" || "APPLY_COMMON_BEST_PRACTICES" || "IMPROVE_CODE" || "SHOW_EXAMPLES" || "CITE_SOURCES" || "EXPLAIN_LINE_BY_LINE" || "EXPLAIN_CODE_SELECTION" || "GENERATE_CLOUDFORMATION_TEMPLATE" || "GENERATE_UNIT_TESTS" || "CODE_GENERATION",
+ *           },
+ *           toolUses: [ // ToolUses
+ *             { // ToolUse
+ *               toolUseId: "STRING_VALUE", // required
+ *               name: "STRING_VALUE", // required
+ *               input: "DOCUMENT_VALUE", // required
+ *             },
+ *           ],
+ *         },
+ *       },
+ *     ],
+ *     currentMessage: {//  Union: only one key present
+ *       userInputMessage: {
+ *         content: "STRING_VALUE", // required
+ *         userInputMessageContext: {
+ *           editorState: {
+ *             document: "<TextDocument>",
+ *             cursorState: {//  Union: only one key present
+ *               position: "<Position>",
+ *               range: {
+ *                 start: "<Position>", // required
+ *                 end: "<Position>", // required
+ *               },
+ *             },
+ *             relevantDocuments: [
+ *               {
+ *                 relativeFilePath: "STRING_VALUE", // required
+ *                 programmingLanguage: {
+ *                   languageName: "STRING_VALUE", // required
+ *                 },
+ *                 text: "STRING_VALUE",
+ *                 documentSymbols: [
+ *                   {
+ *                     name: "STRING_VALUE", // required
+ *                     type: "DECLARATION" || "USAGE", // required
+ *                     source: "STRING_VALUE",
+ *                   },
+ *                 ],
+ *               },
+ *             ],
+ *             useRelevantDocuments: true || false,
+ *             workspaceFolders: [
+ *               "STRING_VALUE",
+ *             ],
+ *           },
+ *           shellState: {
+ *             shellName: "STRING_VALUE", // required
+ *             shellHistory: [
+ *               {
+ *                 command: "STRING_VALUE", // required
+ *                 directory: "STRING_VALUE",
+ *                 exitCode: Number("int"),
+ *                 stdout: "STRING_VALUE",
+ *                 stderr: "STRING_VALUE",
+ *               },
+ *             ],
+ *           },
+ *           gitState: {
+ *             status: "STRING_VALUE",
+ *           },
+ *           envState: {
+ *             operatingSystem: "STRING_VALUE",
+ *             currentWorkingDirectory: "STRING_VALUE",
+ *             environmentVariables: [
+ *               {
+ *                 key: "STRING_VALUE",
+ *                 value: "STRING_VALUE",
+ *               },
+ *             ],
+ *             timezoneOffset: Number("int"),
+ *           },
+ *           appStudioContext: {
+ *             namespace: "STRING_VALUE", // required
+ *             propertyName: "STRING_VALUE", // required
+ *             propertyValue: "STRING_VALUE",
+ *             propertyContext: "STRING_VALUE", // required
+ *           },
+ *           diagnostic: {//  Union: only one key present
+ *             textDocumentDiagnostic: {
+ *               document: "<TextDocument>", // required
+ *               range: {
+ *                 start: "<Position>", // required
+ *                 end: "<Position>", // required
+ *               },
+ *               source: "STRING_VALUE", // required
+ *               severity: "ERROR" || "WARNING" || "INFORMATION" || "HINT", // required
+ *               message: "STRING_VALUE", // required
+ *             },
+ *             runtimeDiagnostic: {
+ *               source: "STRING_VALUE", // required
+ *               severity: "ERROR" || "WARNING" || "INFORMATION" || "HINT", // required
+ *               message: "STRING_VALUE", // required
+ *             },
+ *           },
+ *           consoleState: {
+ *             region: "STRING_VALUE",
+ *             consoleUrl: "STRING_VALUE",
+ *             serviceId: "STRING_VALUE",
+ *             serviceConsolePage: "STRING_VALUE",
+ *             serviceSubconsolePage: "STRING_VALUE",
+ *             taskName: "STRING_VALUE",
+ *           },
+ *           userSettings: {
+ *             hasConsentedToCrossRegionCalls: true || false,
+ *           },
+ *           additionalContext: [
+ *             {
+ *               name: "STRING_VALUE", // required
+ *               description: "STRING_VALUE", // required
+ *               innerContext: "STRING_VALUE",
+ *             },
+ *           ],
+ *           toolResults: [
+ *             {
+ *               toolUseId: "STRING_VALUE", // required
+ *               content: [ // required
+ *                 {//  Union: only one key present
+ *                   text: "STRING_VALUE",
+ *                   json: "DOCUMENT_VALUE",
+ *                 },
+ *               ],
+ *               status: "success" || "error",
+ *             },
+ *           ],
+ *           tools: [
+ *             {//  Union: only one key present
+ *               toolSpecification: {
+ *                 inputSchema: {
+ *                   json: "DOCUMENT_VALUE",
+ *                 },
+ *                 name: "STRING_VALUE", // required
+ *                 description: "STRING_VALUE",
+ *               },
+ *             },
+ *           ],
+ *         },
+ *         userIntent: "SUGGEST_ALTERNATE_IMPLEMENTATION" || "APPLY_COMMON_BEST_PRACTICES" || "IMPROVE_CODE" || "SHOW_EXAMPLES" || "CITE_SOURCES" || "EXPLAIN_LINE_BY_LINE" || "EXPLAIN_CODE_SELECTION" || "GENERATE_CLOUDFORMATION_TEMPLATE" || "GENERATE_UNIT_TESTS" || "CODE_GENERATION",
+ *         origin: "STRING_VALUE",
+ *         images: [
+ *           {
+ *             format: "png" || "jpeg" || "gif" || "webp", // required
+ *             source: {//  Union: only one key present
+ *               bytes: new Uint8Array(), // e.g. Buffer.from("") or new TextEncoder().encode("")
+ *             },
+ *           },
+ *         ],
+ *       },
+ *       assistantResponseMessage: {
+ *         messageId: "STRING_VALUE",
+ *         content: "STRING_VALUE", // required
+ *         supplementaryWebLinks: [
+ *           {
+ *             url: "STRING_VALUE", // required
+ *             title: "STRING_VALUE", // required
+ *             snippet: "STRING_VALUE",
+ *           },
+ *         ],
+ *         references: [
+ *           {
+ *             licenseName: "STRING_VALUE",
+ *             repository: "STRING_VALUE",
+ *             url: "STRING_VALUE",
+ *             recommendationContentSpan: {
+ *               start: Number("int"),
+ *               end: Number("int"),
+ *             },
+ *           },
+ *         ],
+ *         followupPrompt: {
+ *           content: "STRING_VALUE", // required
+ *           userIntent: "SUGGEST_ALTERNATE_IMPLEMENTATION" || "APPLY_COMMON_BEST_PRACTICES" || "IMPROVE_CODE" || "SHOW_EXAMPLES" || "CITE_SOURCES" || "EXPLAIN_LINE_BY_LINE" || "EXPLAIN_CODE_SELECTION" || "GENERATE_CLOUDFORMATION_TEMPLATE" || "GENERATE_UNIT_TESTS" || "CODE_GENERATION",
+ *         },
+ *         toolUses: [
+ *           {
+ *             toolUseId: "STRING_VALUE", // required
+ *             name: "STRING_VALUE", // required
+ *             input: "DOCUMENT_VALUE", // required
+ *           },
+ *         ],
+ *       },
+ *     },
+ *     chatTriggerType: "MANUAL" || "DIAGNOSTIC" || "INLINE_CHAT", // required
+ *     customizationArn: "STRING_VALUE",
+ *   },
+ *   profileArn: "STRING_VALUE",
+ *   source: "STRING_VALUE",
+ *   dryRun: true || false,
+ * };
+ * const command = new SendMessageCommand(input);
+ * const response = await client.send(command);
+ * // { // SendMessageResponse
+ * //   sendMessageResponse: { // ChatResponseStream Union: only one key present
+ * //     messageMetadataEvent: { // MessageMetadataEvent
+ * //       conversationId: "STRING_VALUE",
+ * //       utteranceId: "STRING_VALUE",
+ * //     },
+ * //     assistantResponseEvent: { // AssistantResponseEvent
+ * //       content: "STRING_VALUE", // required
+ * //     },
+ * //     dryRunSucceedEvent: {},
+ * //     codeReferenceEvent: { // CodeReferenceEvent
+ * //       references: [ // References
+ * //         { // Reference
+ * //           licenseName: "STRING_VALUE",
+ * //           repository: "STRING_VALUE",
+ * //           url: "STRING_VALUE",
+ * //           recommendationContentSpan: { // Span
+ * //             start: Number("int"),
+ * //             end: Number("int"),
+ * //           },
+ * //         },
+ * //       ],
+ * //     },
+ * //     supplementaryWebLinksEvent: { // SupplementaryWebLinksEvent
+ * //       supplementaryWebLinks: [ // SupplementaryWebLinks
+ * //         { // SupplementaryWebLink
+ * //           url: "STRING_VALUE", // required
+ * //           title: "STRING_VALUE", // required
+ * //           snippet: "STRING_VALUE",
+ * //         },
+ * //       ],
+ * //     },
+ * //     followupPromptEvent: { // FollowupPromptEvent
+ * //       followupPrompt: { // FollowupPrompt
+ * //         content: "STRING_VALUE", // required
+ * //         userIntent: "SUGGEST_ALTERNATE_IMPLEMENTATION" || "APPLY_COMMON_BEST_PRACTICES" || "IMPROVE_CODE" || "SHOW_EXAMPLES" || "CITE_SOURCES" || "EXPLAIN_LINE_BY_LINE" || "EXPLAIN_CODE_SELECTION" || "GENERATE_CLOUDFORMATION_TEMPLATE" || "GENERATE_UNIT_TESTS" || "CODE_GENERATION",
+ * //       },
+ * //     },
+ * //     codeEvent: { // CodeEvent
+ * //       content: "STRING_VALUE", // required
+ * //     },
+ * //     intentsEvent: { // IntentsEvent
+ * //       intents: { // IntentMap
+ * //         "<keys>": { // IntentData
+ * //           "<keys>": { // IntentDataType Union: only one key present
+ * //             string: "STRING_VALUE",
+ * //           },
+ * //         },
+ * //       },
+ * //     },
+ * //     interactionComponentsEvent: { // InteractionComponentsEvent
+ * //       interactionComponentEntries: [ // InteractionComponentEntryList // required
+ * //         { // InteractionComponentEntry
+ * //           interactionComponentId: "STRING_VALUE",
+ * //           interactionComponent: { // InteractionComponent
+ * //             text: { // Text
+ * //               content: "STRING_VALUE", // required
+ * //             },
+ * //             alert: { // Alert
+ * //               type: "INFO" || "ERROR" || "WARNING", // required
+ * //               content: [ // AlertComponentList // required
+ * //                 { // AlertComponent
+ * //                   text: {
+ * //                     content: "STRING_VALUE", // required
+ * //                   },
+ * //                 },
+ * //               ],
+ * //             },
+ * //             infrastructureUpdate: { // InfrastructureUpdate
+ * //               transition: { // InfrastructureUpdateTransition
+ * //                 currentState: "STRING_VALUE", // required
+ * //                 nextState: "STRING_VALUE", // required
+ * //               },
+ * //             },
+ * //             progress: { // Progress
+ * //               content: [ // ProgressComponentList // required
+ * //                 { // ProgressComponent
+ * //                   step: { // Step
+ * //                     id: Number("int"), // required
+ * //                     state: "FAILED" || "SUCCEEDED" || "STOPPED" || "PENDING" || "IN_PROGRESS" || "LOADING" || "PAUSED", // required
+ * //                     label: "STRING_VALUE", // required
+ * //                     content: [ // StepComponentList
+ * //                       { // StepComponent
+ * //                         text: "<Text>",
+ * //                       },
+ * //                     ],
+ * //                   },
+ * //                 },
+ * //               ],
+ * //             },
+ * //             step: {
+ * //               id: Number("int"), // required
+ * //               state: "FAILED" || "SUCCEEDED" || "STOPPED" || "PENDING" || "IN_PROGRESS" || "LOADING" || "PAUSED", // required
+ * //               label: "STRING_VALUE", // required
+ * //               content: [
+ * //                 {
+ * //                   text: "<Text>",
+ * //                 },
+ * //               ],
+ * //             },
+ * //             taskDetails: { // TaskDetails
+ * //               overview: { // TaskOverview
+ * //                 label: "STRING_VALUE", // required
+ * //                 description: "STRING_VALUE", // required
+ * //               },
+ * //               content: [ // TaskComponentList // required
+ * //                 { // TaskComponent
+ * //                   text: "<Text>",
+ * //                   infrastructureUpdate: {
+ * //                     transition: {
+ * //                       currentState: "STRING_VALUE", // required
+ * //                       nextState: "STRING_VALUE", // required
+ * //                     },
+ * //                   },
+ * //                   alert: {
+ * //                     type: "INFO" || "ERROR" || "WARNING", // required
+ * //                     content: [ // required
+ * //                       {
+ * //                         text: "<Text>",
+ * //                       },
+ * //                     ],
+ * //                   },
+ * //                   progress: {
+ * //                     content: [ // required
+ * //                       {
+ * //                         step: "<Step>",
+ * //                       },
+ * //                     ],
+ * //                   },
+ * //                 },
+ * //               ],
+ * //               actions: [ // TaskActionList
+ * //                 { // TaskAction
+ * //                   label: "STRING_VALUE", // required
+ * //                   note: { // TaskActionNote
+ * //                     content: "STRING_VALUE", // required
+ * //                     type: "INFO" || "WARNING",
+ * //                   },
+ * //                   primary: true || false,
+ * //                   disabled: true || false,
+ * //                   payload: { // TaskActionPayload // required
+ * //                     "<keys>": "STRING_VALUE",
+ * //                   },
+ * //                   confirmation: { // TaskActionConfirmation
+ * //                     content: "STRING_VALUE",
+ * //                   },
+ * //                 },
+ * //               ],
+ * //             },
+ * //             taskReference: { // TaskReference
+ * //               taskId: "STRING_VALUE", // required
+ * //             },
+ * //             suggestions: { // Suggestions
+ * //               items: [ // SuggestionList // required
+ * //                 { // Suggestion
+ * //                   value: "STRING_VALUE", // required
+ * //                 },
+ * //               ],
+ * //             },
+ * //             section: { // Section
+ * //               title: "STRING_VALUE", // required
+ * //               content: [ // SectionComponentList // required
+ * //                 { // SectionComponent
+ * //                   text: "<Text>",
+ * //                   alert: {
+ * //                     type: "INFO" || "ERROR" || "WARNING", // required
+ * //                     content: [ // required
+ * //                       {
+ * //                         text: "<Text>",
+ * //                       },
+ * //                     ],
+ * //                   },
+ * //                   resource: { // Resource
+ * //                     title: "STRING_VALUE", // required
+ * //                     link: "STRING_VALUE", // required
+ * //                     description: "STRING_VALUE", // required
+ * //                     type: "STRING_VALUE", // required
+ * //                     ARN: "STRING_VALUE", // required
+ * //                     resourceJsonString: "STRING_VALUE", // required
+ * //                   },
+ * //                   resourceList: { // ResourceList
+ * //                     action: { // Action
+ * //                       webLink: { // WebLink
+ * //                         label: "STRING_VALUE", // required
+ * //                         url: "STRING_VALUE", // required
+ * //                       },
+ * //                       moduleLink: { // ModuleLink
+ * //                         cloudWatchTroubleshootingLink: { // CloudWatchTroubleshootingLink
+ * //                           label: "STRING_VALUE", // required
+ * //                           investigationPayload: "STRING_VALUE", // required
+ * //                           defaultText: "STRING_VALUE",
+ * //                         },
+ * //                       },
+ * //                     },
+ * //                     items: [ // Resources // required
+ * //                       {
+ * //                         title: "STRING_VALUE", // required
+ * //                         link: "STRING_VALUE", // required
+ * //                         description: "STRING_VALUE", // required
+ * //                         type: "STRING_VALUE", // required
+ * //                         ARN: "STRING_VALUE", // required
+ * //                         resourceJsonString: "STRING_VALUE", // required
+ * //                       },
+ * //                     ],
+ * //                   },
+ * //                 },
+ * //               ],
+ * //               action: {
+ * //                 webLink: {
+ * //                   label: "STRING_VALUE", // required
+ * //                   url: "STRING_VALUE", // required
+ * //                 },
+ * //                 moduleLink: {
+ * //                   cloudWatchTroubleshootingLink: {
+ * //                     label: "STRING_VALUE", // required
+ * //                     investigationPayload: "STRING_VALUE", // required
+ * //                     defaultText: "STRING_VALUE",
+ * //                   },
+ * //                 },
+ * //               },
+ * //             },
+ * //             resource: "<Resource>",
+ * //             resourceList: {
+ * //               action: {
+ * //                 webLink: {
+ * //                   label: "STRING_VALUE", // required
+ * //                   url: "STRING_VALUE", // required
+ * //                 },
+ * //                 moduleLink: {
+ * //                   cloudWatchTroubleshootingLink: {
+ * //                     label: "STRING_VALUE", // required
+ * //                     investigationPayload: "STRING_VALUE", // required
+ * //                     defaultText: "STRING_VALUE",
+ * //                   },
+ * //                 },
+ * //               },
+ * //               items: [ // required
+ * //                 "<Resource>",
+ * //               ],
+ * //             },
+ * //             action: "<Action>",
+ * //           },
+ * //         },
+ * //       ],
+ * //     },
+ * //     toolUseEvent: { // ToolUseEvent
+ * //       toolUseId: "STRING_VALUE", // required
+ * //       name: "STRING_VALUE", // required
+ * //       input: "STRING_VALUE",
+ * //       stop: true || false,
+ * //     },
+ * //     citationEvent: { // CitationEvent
+ * //       target: { // CitationTarget Union: only one key present
+ * //         location: Number("int"),
+ * //         range: {
+ * //           start: Number("int"),
+ * //           end: Number("int"),
+ * //         },
+ * //       },
+ * //       citationText: "STRING_VALUE",
+ * //       citationLink: "STRING_VALUE", // required
+ * //     },
+ * //     invalidStateEvent: { // InvalidStateEvent
+ * //       reason: "INVALID_TASK_ASSIST_PLAN", // required
+ * //       message: "STRING_VALUE", // required
+ * //     },
+ * //     error: { // InternalServerException
+ * //       message: "STRING_VALUE", // required
+ * //     },
+ * //   },
+ * // };
+ *
+ * ```
+ *
+ * @param SendMessageCommandInput - {@link SendMessageCommandInput}
+ * @returns {@link SendMessageCommandOutput}
+ * @see {@link SendMessageCommandInput} for command's `input` shape.
+ * @see {@link SendMessageCommandOutput} for command's `response` shape.
+ * @see {@link CodeWhispererStreamingClientResolvedConfig | config} for CodeWhispererStreamingClient's `config` shape.
+ *
+ * @throws {@link InternalServerException} (server fault)
+ *  This exception is thrown when an unexpected error occurred during the processing of a request.
+ *
+ * @throws {@link ServiceQuotaExceededException} (client fault)
+ *  This exception is thrown when request was denied due to caller exceeding their usage limits
+ *
+ * @throws {@link DryRunOperationException} (client fault)
+ *  This exception is translated to a 204 as it succeeded the IAM Auth.
+ *
+ * @throws {@link ThrottlingException} (client fault)
+ *  This exception is thrown when request was denied due to request throttling.
+ *
+ * @throws {@link ValidationException} (client fault)
+ *  This exception is thrown when the input fails to satisfy the constraints specified by the service.
+ *
+ * @throws {@link ConflictException} (client fault)
+ *  This exception is thrown when the action to perform could not be completed because the resource is in a conflicting state.
+ *
+ * @throws {@link ResourceNotFoundException} (client fault)
+ *  This exception is thrown when describing a resource that does not exist.
+ *
+ * @throws {@link AccessDeniedException} (client fault)
+ *  This exception is thrown when the user does not have sufficient access to perform this action.
+ *
+ * @throws {@link CodeWhispererStreamingServiceException}
+ * <p>Base exception class for all service exceptions from CodeWhispererStreaming service.</p>
+ *
+ */
+export class SendMessageCommand extends $Command.classBuilder<SendMessageCommandInput, SendMessageCommandOutput, CodeWhispererStreamingClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes>()
+      .m(function (this: any, Command: any, cs: any, config: CodeWhispererStreamingClientResolvedConfig, o: any) {
+          return [
+
+  getSerdePlugin(config, this.serialize, this.deserialize),
+      ];
+  })
+  .s("AmazonCodeWhispererStreamingService", "SendMessage", {
+
+    /**
+     * @internal
+     */
+    eventStream: {
+      output: true,
+    },
+  })
+  .n("CodeWhispererStreamingClient", "SendMessageCommand")
+  .f(SendMessageRequestFilterSensitiveLog, SendMessageResponseFilterSensitiveLog)
+  .ser(se_SendMessageCommand)
+  .de(de_SendMessageCommand)
+.build() {
+/** @internal type navigation helper, not in runtime. */
+declare protected static __types: {
+  api: {
+      input: SendMessageRequest;
+      output: SendMessageResponse;
+  };
+  sdk: {
+      input: SendMessageCommandInput;
+      output: SendMessageCommandOutput;
+  };
+};
+}
diff --git a/src.gen/@amzn/codewhisperer-streaming/src/commands/index.ts b/src.gen/@amzn/codewhisperer-streaming/src/commands/index.ts
new file mode 100644
index 00000000000..d129f09766c
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/src/commands/index.ts
@@ -0,0 +1,5 @@
+// smithy-typescript generated code
+export * from "./ExportResultArchiveCommand";
+export * from "./GenerateAssistantResponseCommand";
+export * from "./GenerateTaskAssistPlanCommand";
+export * from "./SendMessageCommand";
diff --git a/src.gen/@amzn/codewhisperer-streaming/src/endpoints.ts b/src.gen/@amzn/codewhisperer-streaming/src/endpoints.ts
new file mode 100644
index 00000000000..81aad20c2c2
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/src/endpoints.ts
@@ -0,0 +1,226 @@
+// smithy-typescript generated code
+import {
+  RegionInfoProvider,
+  RegionInfoProviderOptions,
+} from "@aws-sdk/types";
+import {
+  PartitionHash,
+  RegionHash,
+  getRegionInfo,
+} from "@smithy/config-resolver";
+
+const regionHash: RegionHash = {
+};
+
+const partitionHash: PartitionHash = {
+  "aws": {
+    regions: [
+      "af-south-1",
+      "ap-east-1",
+      "ap-northeast-1",
+      "ap-northeast-2",
+      "ap-northeast-3",
+      "ap-south-1",
+      "ap-south-2",
+      "ap-southeast-1",
+      "ap-southeast-2",
+      "ap-southeast-3",
+      "ap-southeast-4",
+      "ap-southeast-5",
+      "ap-southeast-7",
+      "ca-central-1",
+      "ca-west-1",
+      "eu-central-1",
+      "eu-central-2",
+      "eu-north-1",
+      "eu-south-1",
+      "eu-south-2",
+      "eu-west-1",
+      "eu-west-2",
+      "eu-west-3",
+      "il-central-1",
+      "me-central-1",
+      "me-south-1",
+      "mx-central-1",
+      "sa-east-1",
+      "us-east-1",
+      "us-east-2",
+      "us-west-1",
+      "us-west-2",
+    ],
+    regionRegex: "^(us|eu|ap|sa|ca|me|af|il|mx)\\-\\w+\\-\\d+$",
+    variants: [
+        {
+            "hostname": "amazoncodewhispererstreamingservice.{region}.amazonaws.com",
+            "tags": []
+        },
+        {
+            "hostname": "amazoncodewhispererstreamingservice-fips.{region}.amazonaws.com",
+            "tags": [
+                "fips"
+            ]
+        },
+        {
+            "hostname": "amazoncodewhispererstreamingservice-fips.{region}.api.aws",
+            "tags": [
+                "dualstack",
+                "fips"
+            ]
+        },
+        {
+            "hostname": "amazoncodewhispererstreamingservice.{region}.api.aws",
+            "tags": [
+                "dualstack"
+            ]
+        }
+    ],
+  },
+  "aws-cn": {
+    regions: [
+      "cn-north-1",
+      "cn-northwest-1",
+    ],
+    regionRegex: "^cn\\-\\w+\\-\\d+$",
+    variants: [
+        {
+            "hostname": "amazoncodewhispererstreamingservice.{region}.amazonaws.com.cn",
+            "tags": []
+        },
+        {
+            "hostname": "amazoncodewhispererstreamingservice-fips.{region}.amazonaws.com.cn",
+            "tags": [
+                "fips"
+            ]
+        },
+        {
+            "hostname": "amazoncodewhispererstreamingservice-fips.{region}.api.amazonwebservices.com.cn",
+            "tags": [
+                "dualstack",
+                "fips"
+            ]
+        },
+        {
+            "hostname": "amazoncodewhispererstreamingservice.{region}.api.amazonwebservices.com.cn",
+            "tags": [
+                "dualstack"
+            ]
+        }
+    ],
+  },
+  "aws-iso": {
+    regions: [
+      "us-iso-east-1",
+      "us-iso-west-1",
+    ],
+    regionRegex: "^us\\-iso\\-\\w+\\-\\d+$",
+    variants: [
+        {
+            "hostname": "amazoncodewhispererstreamingservice.{region}.c2s.ic.gov",
+            "tags": []
+        },
+        {
+            "hostname": "amazoncodewhispererstreamingservice-fips.{region}.c2s.ic.gov",
+            "tags": [
+                "fips"
+            ]
+        }
+    ],
+  },
+  "aws-iso-b": {
+    regions: [
+      "us-isob-east-1",
+    ],
+    regionRegex: "^us\\-isob\\-\\w+\\-\\d+$",
+    variants: [
+        {
+            "hostname": "amazoncodewhispererstreamingservice.{region}.sc2s.sgov.gov",
+            "tags": []
+        },
+        {
+            "hostname": "amazoncodewhispererstreamingservice-fips.{region}.sc2s.sgov.gov",
+            "tags": [
+                "fips"
+            ]
+        }
+    ],
+  },
+  "aws-iso-e": {
+    regions: [
+      "eu-isoe-west-1",
+    ],
+    regionRegex: "^eu\\-isoe\\-\\w+\\-\\d+$",
+    variants: [
+        {
+            "hostname": "amazoncodewhispererstreamingservice.{region}.cloud.adc-e.uk",
+            "tags": []
+        },
+        {
+            "hostname": "amazoncodewhispererstreamingservice-fips.{region}.cloud.adc-e.uk",
+            "tags": [
+                "fips"
+            ]
+        }
+    ],
+  },
+  "aws-iso-f": {
+    regions: [
+    ],
+    regionRegex: "^us\\-isof\\-\\w+\\-\\d+$",
+    variants: [
+        {
+            "hostname": "amazoncodewhispererstreamingservice.{region}.csp.hci.ic.gov",
+            "tags": []
+        },
+        {
+            "hostname": "amazoncodewhispererstreamingservice-fips.{region}.csp.hci.ic.gov",
+            "tags": [
+                "fips"
+            ]
+        }
+    ],
+  },
+  "aws-us-gov": {
+    regions: [
+      "us-gov-east-1",
+      "us-gov-west-1",
+    ],
+    regionRegex: "^us\\-gov\\-\\w+\\-\\d+$",
+    variants: [
+        {
+            "hostname": "amazoncodewhispererstreamingservice.{region}.amazonaws.com",
+            "tags": []
+        },
+        {
+            "hostname": "amazoncodewhispererstreamingservice-fips.{region}.amazonaws.com",
+            "tags": [
+                "fips"
+            ]
+        },
+        {
+            "hostname": "amazoncodewhispererstreamingservice-fips.{region}.api.aws",
+            "tags": [
+                "dualstack",
+                "fips"
+            ]
+        },
+        {
+            "hostname": "amazoncodewhispererstreamingservice.{region}.api.aws",
+            "tags": [
+                "dualstack"
+            ]
+        }
+    ],
+  },
+};
+
+export const defaultRegionInfoProvider: RegionInfoProvider = async (
+  region: string,
+  options?: RegionInfoProviderOptions
+) =>
+  getRegionInfo(region, {
+    ...options,
+    signingService: "amazoncodewhispererstreamingservice",
+    regionHash,
+    partitionHash,
+  })
+;
diff --git a/src.gen/@amzn/codewhisperer-streaming/src/extensionConfiguration.ts b/src.gen/@amzn/codewhisperer-streaming/src/extensionConfiguration.ts
new file mode 100644
index 00000000000..99cf43fdd3a
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/src/extensionConfiguration.ts
@@ -0,0 +1,10 @@
+// smithy-typescript generated code
+import { HttpAuthExtensionConfiguration } from "./auth/httpAuthExtensionConfiguration";
+import { AwsRegionExtensionConfiguration } from "@aws-sdk/types";
+import { HttpHandlerExtensionConfiguration } from "@smithy/protocol-http";
+import { DefaultExtensionConfiguration } from "@smithy/types";
+
+/**
+ * @internal
+ */
+export interface CodeWhispererStreamingExtensionConfiguration extends HttpHandlerExtensionConfiguration, DefaultExtensionConfiguration, AwsRegionExtensionConfiguration, HttpAuthExtensionConfiguration {}
diff --git a/src.gen/@amzn/codewhisperer-streaming/src/index.ts b/src.gen/@amzn/codewhisperer-streaming/src/index.ts
new file mode 100644
index 00000000000..99403eb1a21
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/src/index.ts
@@ -0,0 +1,10 @@
+// smithy-typescript generated code
+/* eslint-disable */
+export * from "./CodeWhispererStreamingClient";
+export * from "./CodeWhispererStreaming";
+export type { RuntimeExtension } from "./runtimeExtensions";
+export type { CodeWhispererStreamingExtensionConfiguration } from "./extensionConfiguration";
+export * from "./commands";
+export * from "./models";
+
+export { CodeWhispererStreamingServiceException } from "./models/CodeWhispererStreamingServiceException";
diff --git a/src.gen/@amzn/codewhisperer-streaming/src/models/CodeWhispererStreamingServiceException.ts b/src.gen/@amzn/codewhisperer-streaming/src/models/CodeWhispererStreamingServiceException.ts
new file mode 100644
index 00000000000..242c89f66d9
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/src/models/CodeWhispererStreamingServiceException.ts
@@ -0,0 +1,24 @@
+// smithy-typescript generated code
+import {
+  ServiceException as __ServiceException,
+  ServiceExceptionOptions as __ServiceExceptionOptions,
+} from "@smithy/smithy-client";
+
+export type { __ServiceExceptionOptions }
+
+export { __ServiceException }
+
+/**
+ * @public
+ *
+ * Base exception class for all service exceptions from CodeWhispererStreaming service.
+ */
+export class CodeWhispererStreamingServiceException extends __ServiceException {
+  /**
+   * @internal
+   */
+  constructor(options: __ServiceExceptionOptions) {
+    super(options);
+    Object.setPrototypeOf(this, CodeWhispererStreamingServiceException.prototype);
+  }
+}
diff --git a/src.gen/@amzn/codewhisperer-streaming/src/models/index.ts b/src.gen/@amzn/codewhisperer-streaming/src/models/index.ts
new file mode 100644
index 00000000000..9eaceb12865
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/src/models/index.ts
@@ -0,0 +1,2 @@
+// smithy-typescript generated code
+export * from "./models_0";
diff --git a/src.gen/@amzn/codewhisperer-streaming/src/models/models_0.ts b/src.gen/@amzn/codewhisperer-streaming/src/models/models_0.ts
new file mode 100644
index 00000000000..33559867823
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/src/models/models_0.ts
@@ -0,0 +1,4367 @@
+// smithy-typescript generated code
+import { CodeWhispererStreamingServiceException as __BaseException } from "./CodeWhispererStreamingServiceException";
+import {
+  SENSITIVE_STRING,
+  ExceptionOptionType as __ExceptionOptionType,
+} from "@smithy/smithy-client";
+import { DocumentType as __DocumentType } from "@smithy/types";
+
+/**
+ * @public
+ * @enum
+ */
+export const AccessDeniedExceptionReason = {
+  UNAUTHORIZED_CUSTOMIZATION_RESOURCE_ACCESS: "UNAUTHORIZED_CUSTOMIZATION_RESOURCE_ACCESS",
+} as const
+/**
+ * @public
+ */
+export type AccessDeniedExceptionReason = typeof AccessDeniedExceptionReason[keyof typeof AccessDeniedExceptionReason]
+
+/**
+ * This exception is thrown when the user does not have sufficient access to perform this action.
+ * @public
+ */
+export class AccessDeniedException extends __BaseException {
+  readonly name: "AccessDeniedException" = "AccessDeniedException";
+  readonly $fault: "client" = "client";
+  /**
+   * Reason for AccessDeniedException
+   * @public
+   */
+  reason?: AccessDeniedExceptionReason | undefined;
+
+  /**
+   * @internal
+   */
+  constructor(opts: __ExceptionOptionType<AccessDeniedException, __BaseException>) {
+    super({
+      name: "AccessDeniedException",
+      $fault: "client",
+      ...opts
+    });
+    Object.setPrototypeOf(this, AccessDeniedException.prototype);
+    this.reason = opts.reason;
+  }
+}
+
+/**
+ * Structure representing a single entry of additional contextual content
+ * @public
+ */
+export interface AdditionalContentEntry {
+  /**
+   * The name/identifier for this context entry
+   * @public
+   */
+  name: string | undefined;
+
+  /**
+   * A description of what this context entry represents
+   * @public
+   */
+  description: string | undefined;
+
+  /**
+   * The actual contextual content
+   * @public
+   */
+  innerContext?: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const AdditionalContentEntryFilterSensitiveLog = (obj: AdditionalContentEntry): any => ({
+  ...obj,
+  ...(obj.name && { name:
+    SENSITIVE_STRING
+  }),
+  ...(obj.description && { description:
+    SENSITIVE_STRING
+  }),
+  ...(obj.innerContext && { innerContext:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * This exception is thrown when an unexpected error occurred during the processing of a request.
+ * @public
+ */
+export class InternalServerException extends __BaseException {
+  readonly name: "InternalServerException" = "InternalServerException";
+  readonly $fault: "server" = "server";
+  $retryable = {
+  };
+  /**
+   * @internal
+   */
+  constructor(opts: __ExceptionOptionType<InternalServerException, __BaseException>) {
+    super({
+      name: "InternalServerException",
+      $fault: "server",
+      ...opts
+    });
+    Object.setPrototypeOf(this, InternalServerException.prototype);
+  }
+}
+
+/**
+ * This exception is thrown when describing a resource that does not exist.
+ * @public
+ */
+export class ResourceNotFoundException extends __BaseException {
+  readonly name: "ResourceNotFoundException" = "ResourceNotFoundException";
+  readonly $fault: "client" = "client";
+  /**
+   * @internal
+   */
+  constructor(opts: __ExceptionOptionType<ResourceNotFoundException, __BaseException>) {
+    super({
+      name: "ResourceNotFoundException",
+      $fault: "client",
+      ...opts
+    });
+    Object.setPrototypeOf(this, ResourceNotFoundException.prototype);
+  }
+}
+
+/**
+ * @public
+ * @enum
+ */
+export const ThrottlingExceptionReason = {
+  MONTHLY_REQUEST_COUNT: "MONTHLY_REQUEST_COUNT",
+} as const
+/**
+ * @public
+ */
+export type ThrottlingExceptionReason = typeof ThrottlingExceptionReason[keyof typeof ThrottlingExceptionReason]
+
+/**
+ * This exception is thrown when request was denied due to request throttling.
+ * @public
+ */
+export class ThrottlingException extends __BaseException {
+  readonly name: "ThrottlingException" = "ThrottlingException";
+  readonly $fault: "client" = "client";
+  $retryable = {
+    throttling: true,
+  };
+  /**
+   * Reason for ThrottlingException
+   * @public
+   */
+  reason?: ThrottlingExceptionReason | undefined;
+
+  /**
+   * @internal
+   */
+  constructor(opts: __ExceptionOptionType<ThrottlingException, __BaseException>) {
+    super({
+      name: "ThrottlingException",
+      $fault: "client",
+      ...opts
+    });
+    Object.setPrototypeOf(this, ThrottlingException.prototype);
+    this.reason = opts.reason;
+  }
+}
+
+/**
+ * @public
+ * @enum
+ */
+export const ValidationExceptionReason = {
+  CONTENT_LENGTH_EXCEEDS_THRESHOLD: "CONTENT_LENGTH_EXCEEDS_THRESHOLD",
+  INVALID_CONVERSATION_ID: "INVALID_CONVERSATION_ID",
+  INVALID_KMS_GRANT: "INVALID_KMS_GRANT",
+} as const
+/**
+ * @public
+ */
+export type ValidationExceptionReason = typeof ValidationExceptionReason[keyof typeof ValidationExceptionReason]
+
+/**
+ * This exception is thrown when the input fails to satisfy the constraints specified by the service.
+ * @public
+ */
+export class ValidationException extends __BaseException {
+  readonly name: "ValidationException" = "ValidationException";
+  readonly $fault: "client" = "client";
+  /**
+   * Reason for ValidationException
+   * @public
+   */
+  reason?: ValidationExceptionReason | undefined;
+
+  /**
+   * @internal
+   */
+  constructor(opts: __ExceptionOptionType<ValidationException, __BaseException>) {
+    super({
+      name: "ValidationException",
+      $fault: "client",
+      ...opts
+    });
+    Object.setPrototypeOf(this, ValidationException.prototype);
+    this.reason = opts.reason;
+  }
+}
+
+/**
+ * Description of a user's context when they are calling Q Chat from AppStudio
+ * @public
+ */
+export interface AppStudioState {
+  /**
+   * The namespace of the context. Examples: 'ui.Button', 'ui.Table.DataSource', 'ui.Table.RowActions.Button', 'logic.invokeAWS', 'logic.JavaScript'
+   * @public
+   */
+  namespace: string | undefined;
+
+  /**
+   * The name of the property. Examples: 'visibility', 'disability', 'value', 'code'
+   * @public
+   */
+  propertyName: string | undefined;
+
+  /**
+   * The value of the property.
+   * @public
+   */
+  propertyValue?: string | undefined;
+
+  /**
+   * Context about how the property is used
+   * @public
+   */
+  propertyContext: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const AppStudioStateFilterSensitiveLog = (obj: AppStudioState): any => ({
+  ...obj,
+  ...(obj.namespace && { namespace:
+    SENSITIVE_STRING
+  }),
+  ...(obj.propertyName && { propertyName:
+    SENSITIVE_STRING
+  }),
+  ...(obj.propertyValue && { propertyValue:
+    SENSITIVE_STRING
+  }),
+  ...(obj.propertyContext && { propertyContext:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Streaming Response Event for Assistant Markdown text message.
+ * @public
+ */
+export interface AssistantResponseEvent {
+  /**
+   * The content of the text message in markdown format.
+   * @public
+   */
+  content: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const AssistantResponseEventFilterSensitiveLog = (obj: AssistantResponseEvent): any => ({
+  ...obj,
+  ...(obj.content && { content:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * @public
+ * @enum
+ */
+export const UserIntent = {
+  /**
+   * Apply Common Best Practices
+   */
+  APPLY_COMMON_BEST_PRACTICES: "APPLY_COMMON_BEST_PRACTICES",
+  /**
+   * Cite Sources
+   */
+  CITE_SOURCES: "CITE_SOURCES",
+  /**
+   * generate code
+   */
+  CODE_GENERATION: "CODE_GENERATION",
+  /**
+   * Explain Code Selection
+   */
+  EXPLAIN_CODE_SELECTION: "EXPLAIN_CODE_SELECTION",
+  /**
+   * Explain Code Line By Line
+   */
+  EXPLAIN_LINE_BY_LINE: "EXPLAIN_LINE_BY_LINE",
+  /**
+   * Generate CloudFormation Template
+   */
+  GENERATE_CLOUDFORMATION_TEMPLATE: "GENERATE_CLOUDFORMATION_TEMPLATE",
+  /**
+   * Generate Unit Tests
+   */
+  GENERATE_UNIT_TESTS: "GENERATE_UNIT_TESTS",
+  /**
+   * Improve Code
+   */
+  IMPROVE_CODE: "IMPROVE_CODE",
+  /**
+   * Show More Examples
+   */
+  SHOW_EXAMPLES: "SHOW_EXAMPLES",
+  /**
+   * Suggest Alternative Implementation
+   */
+  SUGGEST_ALTERNATE_IMPLEMENTATION: "SUGGEST_ALTERNATE_IMPLEMENTATION",
+} as const
+/**
+ * @public
+ */
+export type UserIntent = typeof UserIntent[keyof typeof UserIntent]
+
+/**
+ * Followup Prompt for the Assistant Response
+ * @public
+ */
+export interface FollowupPrompt {
+  /**
+   * The content of the text message in markdown format.
+   * @public
+   */
+  content: string | undefined;
+
+  /**
+   * User Intent
+   * @public
+   */
+  userIntent?: UserIntent | undefined;
+}
+
+/**
+ * @internal
+ */
+export const FollowupPromptFilterSensitiveLog = (obj: FollowupPrompt): any => ({
+  ...obj,
+  ...(obj.content && { content:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Represents span in a text.
+ * @public
+ */
+export interface Span {
+  start?: number | undefined;
+  end?: number | undefined;
+}
+
+/**
+ * Code Reference / Repository details
+ * @public
+ */
+export interface Reference {
+  /**
+   * License name
+   * @public
+   */
+  licenseName?: string | undefined;
+
+  /**
+   * Code Repsitory for the associated reference
+   * @public
+   */
+  repository?: string | undefined;
+
+  /**
+   * Respository URL
+   * @public
+   */
+  url?: string | undefined;
+
+  /**
+   * Span / Range for the Reference
+   * @public
+   */
+  recommendationContentSpan?: Span | undefined;
+}
+
+/**
+ * Represents an additional reference link retured with the Chat message
+ * @public
+ */
+export interface SupplementaryWebLink {
+  /**
+   * URL of the web reference link.
+   * @public
+   */
+  url: string | undefined;
+
+  /**
+   * Title of the web reference link.
+   * @public
+   */
+  title: string | undefined;
+
+  /**
+   * Relevant text snippet from the link.
+   * @public
+   */
+  snippet?: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const SupplementaryWebLinkFilterSensitiveLog = (obj: SupplementaryWebLink): any => ({
+  ...obj,
+  ...(obj.url && { url:
+    SENSITIVE_STRING
+  }),
+  ...(obj.title && { title:
+    SENSITIVE_STRING
+  }),
+  ...(obj.snippet && { snippet:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Contains information about a tool that the model is requesting be run. The model uses the result from the tool to generate a response.
+ * @public
+ */
+export interface ToolUse {
+  /**
+   * The ID for the tool request.
+   * @public
+   */
+  toolUseId: string | undefined;
+
+  /**
+   * The name for the tool.
+   * @public
+   */
+  name: string | undefined;
+
+  /**
+   * The input to pass to the tool.
+   * @public
+   */
+  input: __DocumentType | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ToolUseFilterSensitiveLog = (obj: ToolUse): any => ({
+  ...obj,
+  ...(obj.name && { name:
+    SENSITIVE_STRING
+  }),
+  ...(obj.input && { input:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Markdown text message.
+ * @public
+ */
+export interface AssistantResponseMessage {
+  /**
+   * Unique identifier for the chat message
+   * @public
+   */
+  messageId?: string | undefined;
+
+  /**
+   * The content of the text message in markdown format.
+   * @public
+   */
+  content: string | undefined;
+
+  /**
+   * Web References
+   * @public
+   */
+  supplementaryWebLinks?: (SupplementaryWebLink)[] | undefined;
+
+  /**
+   * Code References
+   * @public
+   */
+  references?: (Reference)[] | undefined;
+
+  /**
+   * Followup Prompt
+   * @public
+   */
+  followupPrompt?: FollowupPrompt | undefined;
+
+  /**
+   * ToolUse Request
+   * @public
+   */
+  toolUses?: (ToolUse)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const AssistantResponseMessageFilterSensitiveLog = (obj: AssistantResponseMessage): any => ({
+  ...obj,
+  ...(obj.content && { content:
+    SENSITIVE_STRING
+  }),
+  ...(obj.supplementaryWebLinks && { supplementaryWebLinks:
+    obj.supplementaryWebLinks.map(
+      item =>
+      SupplementaryWebLinkFilterSensitiveLog(item)
+    )
+  }),
+  ...(obj.followupPrompt && { followupPrompt:
+    FollowupPromptFilterSensitiveLog(obj.followupPrompt)
+  }),
+  ...(obj.toolUses && { toolUses:
+    obj.toolUses.map(
+      item =>
+      ToolUseFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * @public
+ * @enum
+ */
+export const ConflictExceptionReason = {
+  CUSTOMER_KMS_KEY_DISABLED: "CUSTOMER_KMS_KEY_DISABLED",
+  CUSTOMER_KMS_KEY_INVALID_KEY_POLICY: "CUSTOMER_KMS_KEY_INVALID_KEY_POLICY",
+  MISMATCHED_KMS_KEY: "MISMATCHED_KMS_KEY",
+} as const
+/**
+ * @public
+ */
+export type ConflictExceptionReason = typeof ConflictExceptionReason[keyof typeof ConflictExceptionReason]
+
+/**
+ * This exception is thrown when the action to perform could not be completed because the resource is in a conflicting state.
+ * @public
+ */
+export class ConflictException extends __BaseException {
+  readonly name: "ConflictException" = "ConflictException";
+  readonly $fault: "client" = "client";
+  /**
+   * Reason for ConflictException
+   * @public
+   */
+  reason?: ConflictExceptionReason | undefined;
+
+  /**
+   * @internal
+   */
+  constructor(opts: __ExceptionOptionType<ConflictException, __BaseException>) {
+    super({
+      name: "ConflictException",
+      $fault: "client",
+      ...opts
+    });
+    Object.setPrototypeOf(this, ConflictException.prototype);
+    this.reason = opts.reason;
+  }
+}
+
+/**
+ * Programming Languages supported by CodeWhisperer
+ * @public
+ */
+export interface ProgrammingLanguage {
+  languageName: string | undefined;
+}
+
+/**
+ * @public
+ * @enum
+ */
+export const ContentChecksumType = {
+  SHA_256: "SHA_256",
+} as const
+/**
+ * @public
+ */
+export type ContentChecksumType = typeof ContentChecksumType[keyof typeof ContentChecksumType]
+
+/**
+ * Payload Part
+ * @public
+ */
+export interface BinaryMetadataEvent {
+  /**
+   * Content length of the binary payload
+   * @public
+   */
+  size?: number | undefined;
+
+  /**
+   * Content type of the response
+   * @public
+   */
+  mimeType?: string | undefined;
+
+  /**
+   * Content checksum of the binary payload
+   * @public
+   */
+  contentChecksum?: string | undefined;
+
+  /**
+   * Content checksum type of the binary payload
+   * @public
+   */
+  contentChecksumType?: ContentChecksumType | undefined;
+}
+
+/**
+ * @internal
+ */
+export const BinaryMetadataEventFilterSensitiveLog = (obj: BinaryMetadataEvent): any => ({
+  ...obj,
+})
+
+/**
+ * Payload Part
+ * @public
+ */
+export interface BinaryPayloadEvent {
+  /**
+   * Payload Part's body
+   * @public
+   */
+  bytes?: Uint8Array | undefined;
+}
+
+/**
+ * @internal
+ */
+export const BinaryPayloadEventFilterSensitiveLog = (obj: BinaryPayloadEvent): any => ({
+  ...obj,
+  ...(obj.bytes && { bytes:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * @public
+ * @enum
+ */
+export const ImageFormat = {
+  GIF: "gif",
+  JPEG: "jpeg",
+  PNG: "png",
+  WEBP: "webp",
+} as const
+/**
+ * @public
+ */
+export type ImageFormat = typeof ImageFormat[keyof typeof ImageFormat]
+
+/**
+ * Image bytes limited to ~10MB considering overhead of base64 encoding
+ * @public
+ */
+export type ImageSource =
+  | ImageSource.BytesMember
+  | ImageSource.$UnknownMember
+
+/**
+ * @public
+ */
+export namespace ImageSource {
+
+  export interface BytesMember {
+    bytes: Uint8Array;
+    $unknown?: never;
+  }
+
+  /**
+   * @public
+   */
+  export interface $UnknownMember {
+    bytes?: never;
+    $unknown: [string, any];
+  }
+
+  export interface Visitor<T> {
+    bytes: (value: Uint8Array) => T;
+    _: (name: string, value: any) => T;
+  }
+
+  export const visit = <T>(
+    value: ImageSource,
+    visitor: Visitor<T>
+  ): T => {
+    if (value.bytes !== undefined) return visitor.bytes(value.bytes);
+    return visitor._(value.$unknown[0], value.$unknown[1]);
+  }
+
+}
+/**
+ * @internal
+ */
+export const ImageSourceFilterSensitiveLog = (obj: ImageSource): any => {
+  if (obj.bytes !== undefined) return {bytes:
+    obj.bytes
+  };
+  if (obj.$unknown !== undefined) return {[obj.$unknown[0]]: 'UNKNOWN'};
+}
+
+/**
+ * Represents the image source itself and the format of the image.
+ * @public
+ */
+export interface ImageBlock {
+  format: ImageFormat | undefined;
+  /**
+   * Image bytes limited to ~10MB considering overhead of base64 encoding
+   * @public
+   */
+  source: ImageSource | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ImageBlockFilterSensitiveLog = (obj: ImageBlock): any => ({
+  ...obj,
+  ...(obj.source && { source:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * @public
+ * @enum
+ */
+export const Origin = {
+  /**
+   * Any AI Editor.
+   */
+  AI_EDITOR: "AI_EDITOR",
+  /**
+   * AWS Chatbot
+   */
+  CHATBOT: "CHATBOT",
+  /**
+   * Any CLI caller.
+   */
+  CLI: "CLI",
+  /**
+   * AWS Management Console (https://<region>.console.aws.amazon.com)
+   */
+  CONSOLE: "CONSOLE",
+  /**
+   * AWS Documentation Website (https://docs.aws.amazon.com)
+   */
+  DOCUMENTATION: "DOCUMENTATION",
+  /**
+   * Any caller from GitLab Q integration.
+   */
+  GITLAB: "GITLAB",
+  /**
+   * Any IDE caller.
+   */
+  IDE: "IDE",
+  /**
+   * AWS Marketing Website (https://aws.amazon.com)
+   */
+  MARKETING: "MARKETING",
+  /**
+   * MD.
+   */
+  MD: "MD",
+  /**
+   * AWS Mobile Application (ACMA)
+   */
+  MOBILE: "MOBILE",
+  /**
+   * Amazon OpenSearch dashboard
+   */
+  OPENSEARCH_DASHBOARD: "OPENSEARCH_DASHBOARD",
+  /**
+   * Amazon SageMaker's Rome Chat.
+   */
+  SAGE_MAKER: "SAGE_MAKER",
+  /**
+   * Internal Service Traffic (Integ Tests, Canaries, etc.). This is the default when no Origin header present in request.
+   */
+  SERVICE_INTERNAL: "SERVICE_INTERNAL",
+  /**
+   * Unified Search in AWS Management Console (https://<region>.console.aws.amazon.com)
+   */
+  UNIFIED_SEARCH: "UNIFIED_SEARCH",
+  /**
+   * Origin header is not set.
+   */
+  UNKNOWN: "UNKNOWN",
+} as const
+/**
+ * @public
+ */
+export type Origin = typeof Origin[keyof typeof Origin]
+
+/**
+ * Information about the state of the AWS management console page from which the user is calling
+ * @public
+ */
+export interface ConsoleState {
+  region?: string | undefined;
+  consoleUrl?: string | undefined;
+  serviceId?: string | undefined;
+  serviceConsolePage?: string | undefined;
+  serviceSubconsolePage?: string | undefined;
+  taskName?: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ConsoleStateFilterSensitiveLog = (obj: ConsoleState): any => ({
+  ...obj,
+  ...(obj.consoleUrl && { consoleUrl:
+    SENSITIVE_STRING
+  }),
+  ...(obj.taskName && { taskName:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * @public
+ * @enum
+ */
+export const DiagnosticSeverity = {
+  ERROR: "ERROR",
+  HINT: "HINT",
+  INFORMATION: "INFORMATION",
+  WARNING: "WARNING",
+} as const
+/**
+ * @public
+ */
+export type DiagnosticSeverity = typeof DiagnosticSeverity[keyof typeof DiagnosticSeverity]
+
+/**
+ * Structure to represent metadata about a Runtime Diagnostics
+ * @public
+ */
+export interface RuntimeDiagnostic {
+  /**
+   * A human-readable string describing the source of the diagnostic
+   * @public
+   */
+  source: string | undefined;
+
+  /**
+   * Diagnostic Error type
+   * @public
+   */
+  severity: DiagnosticSeverity | undefined;
+
+  /**
+   * The diagnostic's message.
+   * @public
+   */
+  message: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const RuntimeDiagnosticFilterSensitiveLog = (obj: RuntimeDiagnostic): any => ({
+  ...obj,
+  ...(obj.source && { source:
+    SENSITIVE_STRING
+  }),
+  ...(obj.message && { message:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * @public
+ * @enum
+ */
+export const SymbolType = {
+  DECLARATION: "DECLARATION",
+  USAGE: "USAGE",
+} as const
+/**
+ * @public
+ */
+export type SymbolType = typeof SymbolType[keyof typeof SymbolType]
+
+/**
+ * @public
+ */
+export interface DocumentSymbol {
+  /**
+   * Name of the Document Symbol
+   * @public
+   */
+  name: string | undefined;
+
+  /**
+   * Symbol type - DECLARATION / USAGE
+   * @public
+   */
+  type: SymbolType | undefined;
+
+  /**
+   * Symbol package / source for FullyQualified names
+   * @public
+   */
+  source?: string | undefined;
+}
+
+/**
+ * Represents a Text Document / File
+ * @public
+ */
+export interface TextDocument {
+  /**
+   * Filepath relative to the root of the workspace
+   * @public
+   */
+  relativeFilePath: string | undefined;
+
+  /**
+   * The text document's language identifier.
+   * @public
+   */
+  programmingLanguage?: ProgrammingLanguage | undefined;
+
+  /**
+   * Content of the text document
+   * @public
+   */
+  text?: string | undefined;
+
+  /**
+   * DocumentSymbols parsed from a text document
+   * @public
+   */
+  documentSymbols?: (DocumentSymbol)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const TextDocumentFilterSensitiveLog = (obj: TextDocument): any => ({
+  ...obj,
+  ...(obj.relativeFilePath && { relativeFilePath:
+    SENSITIVE_STRING
+  }),
+  ...(obj.text && { text:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Indicates Cursor postion in a Text Document
+ * @public
+ */
+export interface Position {
+  /**
+   * Line position in a document.
+   * @public
+   */
+  line: number | undefined;
+
+  /**
+   * Character offset on a line in a document (zero-based)
+   * @public
+   */
+  character: number | undefined;
+}
+
+/**
+ * Indicates Range / Span in a Text Document
+ * @public
+ */
+export interface Range {
+  /**
+   * The range's start position.
+   * @public
+   */
+  start: Position | undefined;
+
+  /**
+   * The range's end position.
+   * @public
+   */
+  end: Position | undefined;
+}
+
+/**
+ * Structure to represent metadata about a TextDocument Diagnostic
+ * @public
+ */
+export interface TextDocumentDiagnostic {
+  /**
+   * Represents a Text Document associated with Diagnostic
+   * @public
+   */
+  document: TextDocument | undefined;
+
+  /**
+   * The range at which the message applies.
+   * @public
+   */
+  range: Range | undefined;
+
+  /**
+   * A human-readable string describing the source of the diagnostic
+   * @public
+   */
+  source: string | undefined;
+
+  /**
+   * Diagnostic Error type
+   * @public
+   */
+  severity: DiagnosticSeverity | undefined;
+
+  /**
+   * The diagnostic's message.
+   * @public
+   */
+  message: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const TextDocumentDiagnosticFilterSensitiveLog = (obj: TextDocumentDiagnostic): any => ({
+  ...obj,
+  ...(obj.document && { document:
+    TextDocumentFilterSensitiveLog(obj.document)
+  }),
+  ...(obj.source && { source:
+    SENSITIVE_STRING
+  }),
+  ...(obj.message && { message:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Represents a Diagnostic message
+ * @public
+ */
+export type Diagnostic =
+  | Diagnostic.RuntimeDiagnosticMember
+  | Diagnostic.TextDocumentDiagnosticMember
+  | Diagnostic.$UnknownMember
+
+/**
+ * @public
+ */
+export namespace Diagnostic {
+
+  /**
+   * Diagnostics originating from a TextDocument
+   * @public
+   */
+  export interface TextDocumentDiagnosticMember {
+    textDocumentDiagnostic: TextDocumentDiagnostic;
+    runtimeDiagnostic?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Diagnostics originating from a Runtime
+   * @public
+   */
+  export interface RuntimeDiagnosticMember {
+    textDocumentDiagnostic?: never;
+    runtimeDiagnostic: RuntimeDiagnostic;
+    $unknown?: never;
+  }
+
+  /**
+   * @public
+   */
+  export interface $UnknownMember {
+    textDocumentDiagnostic?: never;
+    runtimeDiagnostic?: never;
+    $unknown: [string, any];
+  }
+
+  export interface Visitor<T> {
+    textDocumentDiagnostic: (value: TextDocumentDiagnostic) => T;
+    runtimeDiagnostic: (value: RuntimeDiagnostic) => T;
+    _: (name: string, value: any) => T;
+  }
+
+  export const visit = <T>(
+    value: Diagnostic,
+    visitor: Visitor<T>
+  ): T => {
+    if (value.textDocumentDiagnostic !== undefined) return visitor.textDocumentDiagnostic(value.textDocumentDiagnostic);
+    if (value.runtimeDiagnostic !== undefined) return visitor.runtimeDiagnostic(value.runtimeDiagnostic);
+    return visitor._(value.$unknown[0], value.$unknown[1]);
+  }
+
+}
+/**
+ * @internal
+ */
+export const DiagnosticFilterSensitiveLog = (obj: Diagnostic): any => {
+  if (obj.textDocumentDiagnostic !== undefined) return {textDocumentDiagnostic:
+    TextDocumentDiagnosticFilterSensitiveLog(obj.textDocumentDiagnostic)
+  };
+  if (obj.runtimeDiagnostic !== undefined) return {runtimeDiagnostic:
+    RuntimeDiagnosticFilterSensitiveLog(obj.runtimeDiagnostic)
+  };
+  if (obj.$unknown !== undefined) return {[obj.$unknown[0]]: 'UNKNOWN'};
+}
+
+/**
+ * Represents the state of the Cursor in an Editor
+ * @public
+ */
+export type CursorState =
+  | CursorState.PositionMember
+  | CursorState.RangeMember
+  | CursorState.$UnknownMember
+
+/**
+ * @public
+ */
+export namespace CursorState {
+
+  /**
+   * Represents a cursor position in a Text Document
+   * @public
+   */
+  export interface PositionMember {
+    position: Position;
+    range?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Represents a text selection in a Text Document
+   * @public
+   */
+  export interface RangeMember {
+    position?: never;
+    range: Range;
+    $unknown?: never;
+  }
+
+  /**
+   * @public
+   */
+  export interface $UnknownMember {
+    position?: never;
+    range?: never;
+    $unknown: [string, any];
+  }
+
+  export interface Visitor<T> {
+    position: (value: Position) => T;
+    range: (value: Range) => T;
+    _: (name: string, value: any) => T;
+  }
+
+  export const visit = <T>(
+    value: CursorState,
+    visitor: Visitor<T>
+  ): T => {
+    if (value.position !== undefined) return visitor.position(value.position);
+    if (value.range !== undefined) return visitor.range(value.range);
+    return visitor._(value.$unknown[0], value.$unknown[1]);
+  }
+
+}
+
+/**
+ * Represents an IDE retrieved relevant Text Document / File
+ * @public
+ */
+export interface RelevantTextDocument {
+  /**
+   * Filepath relative to the root of the workspace
+   * @public
+   */
+  relativeFilePath: string | undefined;
+
+  /**
+   * The text document's language identifier.
+   * @public
+   */
+  programmingLanguage?: ProgrammingLanguage | undefined;
+
+  /**
+   * Content of the text document
+   * @public
+   */
+  text?: string | undefined;
+
+  /**
+   * DocumentSymbols parsed from a text document
+   * @public
+   */
+  documentSymbols?: (DocumentSymbol)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const RelevantTextDocumentFilterSensitiveLog = (obj: RelevantTextDocument): any => ({
+  ...obj,
+  ...(obj.relativeFilePath && { relativeFilePath:
+    SENSITIVE_STRING
+  }),
+  ...(obj.text && { text:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Represents the state of an Editor
+ * @public
+ */
+export interface EditorState {
+  /**
+   * Represents currently edited file
+   * @public
+   */
+  document?: TextDocument | undefined;
+
+  /**
+   * Position of the cursor
+   * @public
+   */
+  cursorState?: CursorState | undefined;
+
+  /**
+   * Represents IDE provided relevant files
+   * @public
+   */
+  relevantDocuments?: (RelevantTextDocument)[] | undefined;
+
+  /**
+   * Whether service should use relevant document in prompt
+   * @public
+   */
+  useRelevantDocuments?: boolean | undefined;
+
+  /**
+   * Represents IDE provided list of workspace folders
+   * @public
+   */
+  workspaceFolders?: (string)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const EditorStateFilterSensitiveLog = (obj: EditorState): any => ({
+  ...obj,
+  ...(obj.document && { document:
+    TextDocumentFilterSensitiveLog(obj.document)
+  }),
+  ...(obj.cursorState && { cursorState:
+    obj.cursorState
+  }),
+  ...(obj.relevantDocuments && { relevantDocuments:
+    obj.relevantDocuments.map(
+      item =>
+      RelevantTextDocumentFilterSensitiveLog(item)
+    )
+  }),
+  ...(obj.workspaceFolders && { workspaceFolders:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * An environment variable
+ * @public
+ */
+export interface EnvironmentVariable {
+  /**
+   * The key of an environment variable
+   * @public
+   */
+  key?: string | undefined;
+
+  /**
+   * The value of an environment variable
+   * @public
+   */
+  value?: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const EnvironmentVariableFilterSensitiveLog = (obj: EnvironmentVariable): any => ({
+  ...obj,
+  ...(obj.key && { key:
+    SENSITIVE_STRING
+  }),
+  ...(obj.value && { value:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * State related to the user's environment
+ * @public
+ */
+export interface EnvState {
+  /**
+   * The name of the operating system in use
+   * @public
+   */
+  operatingSystem?: string | undefined;
+
+  /**
+   * The current working directory of the environment
+   * @public
+   */
+  currentWorkingDirectory?: string | undefined;
+
+  /**
+   * The environment variables set in the current environment
+   * @public
+   */
+  environmentVariables?: (EnvironmentVariable)[] | undefined;
+
+  /**
+   * Local timezone offset of the client. For more information, see documentation https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getTimezoneOffset
+   * @public
+   */
+  timezoneOffset?: number | undefined;
+}
+
+/**
+ * @internal
+ */
+export const EnvStateFilterSensitiveLog = (obj: EnvState): any => ({
+  ...obj,
+  ...(obj.currentWorkingDirectory && { currentWorkingDirectory:
+    SENSITIVE_STRING
+  }),
+  ...(obj.environmentVariables && { environmentVariables:
+    obj.environmentVariables.map(
+      item =>
+      EnvironmentVariableFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * State related to the Git VSC
+ * @public
+ */
+export interface GitState {
+  /**
+   * The output of the command `git status --porcelain=v1 -b`
+   * @public
+   */
+  status?: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const GitStateFilterSensitiveLog = (obj: GitState): any => ({
+  ...obj,
+  ...(obj.status && { status:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * An single entry in the shell history
+ * @public
+ */
+export interface ShellHistoryEntry {
+  /**
+   * The shell command that was run
+   * @public
+   */
+  command: string | undefined;
+
+  /**
+   * The directory the command was ran in
+   * @public
+   */
+  directory?: string | undefined;
+
+  /**
+   * The exit code of the command after it finished
+   * @public
+   */
+  exitCode?: number | undefined;
+
+  /**
+   * The stdout from the command
+   * @public
+   */
+  stdout?: string | undefined;
+
+  /**
+   * The stderr from the command
+   * @public
+   */
+  stderr?: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ShellHistoryEntryFilterSensitiveLog = (obj: ShellHistoryEntry): any => ({
+  ...obj,
+  ...(obj.command && { command:
+    SENSITIVE_STRING
+  }),
+  ...(obj.directory && { directory:
+    SENSITIVE_STRING
+  }),
+  ...(obj.stdout && { stdout:
+    SENSITIVE_STRING
+  }),
+  ...(obj.stderr && { stderr:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Represents the state of a shell
+ * @public
+ */
+export interface ShellState {
+  /**
+   * The name of the current shell
+   * @public
+   */
+  shellName: string | undefined;
+
+  /**
+   * The history previous shell commands for the current shell
+   * @public
+   */
+  shellHistory?: (ShellHistoryEntry)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ShellStateFilterSensitiveLog = (obj: ShellState): any => ({
+  ...obj,
+  ...(obj.shellHistory && { shellHistory:
+    obj.shellHistory.map(
+      item =>
+      ShellHistoryEntryFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * @public
+ */
+export type ToolResultContentBlock =
+  | ToolResultContentBlock.JsonMember
+  | ToolResultContentBlock.TextMember
+  | ToolResultContentBlock.$UnknownMember
+
+/**
+ * @public
+ */
+export namespace ToolResultContentBlock {
+
+  /**
+   * A tool result that is text.
+   * @public
+   */
+  export interface TextMember {
+    text: string;
+    json?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * A tool result that is JSON format data.
+   * @public
+   */
+  export interface JsonMember {
+    text?: never;
+    json: __DocumentType;
+    $unknown?: never;
+  }
+
+  /**
+   * @public
+   */
+  export interface $UnknownMember {
+    text?: never;
+    json?: never;
+    $unknown: [string, any];
+  }
+
+  export interface Visitor<T> {
+    text: (value: string) => T;
+    json: (value: __DocumentType) => T;
+    _: (name: string, value: any) => T;
+  }
+
+  export const visit = <T>(
+    value: ToolResultContentBlock,
+    visitor: Visitor<T>
+  ): T => {
+    if (value.text !== undefined) return visitor.text(value.text);
+    if (value.json !== undefined) return visitor.json(value.json);
+    return visitor._(value.$unknown[0], value.$unknown[1]);
+  }
+
+}
+/**
+ * @internal
+ */
+export const ToolResultContentBlockFilterSensitiveLog = (obj: ToolResultContentBlock): any => {
+  if (obj.text !== undefined) return {text:
+    SENSITIVE_STRING
+  };
+  if (obj.json !== undefined) return {json:
+    SENSITIVE_STRING
+  };
+  if (obj.$unknown !== undefined) return {[obj.$unknown[0]]: 'UNKNOWN'};
+}
+
+/**
+ * @public
+ * @enum
+ */
+export const ToolResultStatus = {
+  ERROR: "error",
+  SUCCESS: "success",
+} as const
+/**
+ * @public
+ */
+export type ToolResultStatus = typeof ToolResultStatus[keyof typeof ToolResultStatus]
+
+/**
+ * A tool result that contains the results for a tool request that was previously made.
+ * @public
+ */
+export interface ToolResult {
+  /**
+   * The ID for the tool request.
+   * @public
+   */
+  toolUseId: string | undefined;
+
+  /**
+   * Content of the tool result.
+   * @public
+   */
+  content: (ToolResultContentBlock)[] | undefined;
+
+  /**
+   * Status of the tools result.
+   * @public
+   */
+  status?: ToolResultStatus | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ToolResultFilterSensitiveLog = (obj: ToolResult): any => ({
+  ...obj,
+  ...(obj.content && { content:
+    obj.content.map(
+      item =>
+      ToolResultContentBlockFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * The input schema for the tool in JSON format.
+ * @public
+ */
+export interface ToolInputSchema {
+  json?: __DocumentType | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ToolInputSchemaFilterSensitiveLog = (obj: ToolInputSchema): any => ({
+  ...obj,
+  ...(obj.json && { json:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * The specification for the tool.
+ * @public
+ */
+export interface ToolSpecification {
+  /**
+   * The input schema for the tool in JSON format.
+   * @public
+   */
+  inputSchema: ToolInputSchema | undefined;
+
+  /**
+   * The name for the tool.
+   * @public
+   */
+  name: string | undefined;
+
+  /**
+   * The description for the tool.
+   * @public
+   */
+  description?: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ToolSpecificationFilterSensitiveLog = (obj: ToolSpecification): any => ({
+  ...obj,
+  ...(obj.inputSchema && { inputSchema:
+    ToolInputSchemaFilterSensitiveLog(obj.inputSchema)
+  }),
+  ...(obj.name && { name:
+    SENSITIVE_STRING
+  }),
+  ...(obj.description && { description:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Information about a tool that can be used.
+ * @public
+ */
+export type Tool =
+  | Tool.ToolSpecificationMember
+  | Tool.$UnknownMember
+
+/**
+ * @public
+ */
+export namespace Tool {
+
+  /**
+   * The specification for the tool.
+   * @public
+   */
+  export interface ToolSpecificationMember {
+    toolSpecification: ToolSpecification;
+    $unknown?: never;
+  }
+
+  /**
+   * @public
+   */
+  export interface $UnknownMember {
+    toolSpecification?: never;
+    $unknown: [string, any];
+  }
+
+  export interface Visitor<T> {
+    toolSpecification: (value: ToolSpecification) => T;
+    _: (name: string, value: any) => T;
+  }
+
+  export const visit = <T>(
+    value: Tool,
+    visitor: Visitor<T>
+  ): T => {
+    if (value.toolSpecification !== undefined) return visitor.toolSpecification(value.toolSpecification);
+    return visitor._(value.$unknown[0], value.$unknown[1]);
+  }
+
+}
+/**
+ * @internal
+ */
+export const ToolFilterSensitiveLog = (obj: Tool): any => {
+  if (obj.toolSpecification !== undefined) return {toolSpecification:
+    ToolSpecificationFilterSensitiveLog(obj.toolSpecification)
+  };
+  if (obj.$unknown !== undefined) return {[obj.$unknown[0]]: 'UNKNOWN'};
+}
+
+/**
+ * Settings information passed by the Q widget
+ * @public
+ */
+export interface UserSettings {
+  hasConsentedToCrossRegionCalls?: boolean | undefined;
+}
+
+/**
+ * Additional Chat message context associated with the Chat Message
+ * @public
+ */
+export interface UserInputMessageContext {
+  /**
+   * Editor state chat message context.
+   * @public
+   */
+  editorState?: EditorState | undefined;
+
+  /**
+   * Shell state chat message context.
+   * @public
+   */
+  shellState?: ShellState | undefined;
+
+  /**
+   * Git state chat message context.
+   * @public
+   */
+  gitState?: GitState | undefined;
+
+  /**
+   * Environment state chat message context.
+   * @public
+   */
+  envState?: EnvState | undefined;
+
+  /**
+   * The state of a user's AppStudio UI when sending a message.
+   * @public
+   */
+  appStudioContext?: AppStudioState | undefined;
+
+  /**
+   * Diagnostic chat message context.
+   * @public
+   */
+  diagnostic?: Diagnostic | undefined;
+
+  /**
+   * Contextual information about the environment from which the user is calling.
+   * @public
+   */
+  consoleState?: ConsoleState | undefined;
+
+  /**
+   * Settings information, e.g., whether the user has enabled cross-region API calls.
+   * @public
+   */
+  userSettings?: UserSettings | undefined;
+
+  /**
+   * List of additional contextual content entries that can be included with the message.
+   * @public
+   */
+  additionalContext?: (AdditionalContentEntry)[] | undefined;
+
+  /**
+   * ToolResults for the requested ToolUses.
+   * @public
+   */
+  toolResults?: (ToolResult)[] | undefined;
+
+  /**
+   * Tools that can be used.
+   * @public
+   */
+  tools?: (Tool)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const UserInputMessageContextFilterSensitiveLog = (obj: UserInputMessageContext): any => ({
+  ...obj,
+  ...(obj.editorState && { editorState:
+    EditorStateFilterSensitiveLog(obj.editorState)
+  }),
+  ...(obj.shellState && { shellState:
+    ShellStateFilterSensitiveLog(obj.shellState)
+  }),
+  ...(obj.gitState && { gitState:
+    GitStateFilterSensitiveLog(obj.gitState)
+  }),
+  ...(obj.envState && { envState:
+    EnvStateFilterSensitiveLog(obj.envState)
+  }),
+  ...(obj.appStudioContext && { appStudioContext:
+    AppStudioStateFilterSensitiveLog(obj.appStudioContext)
+  }),
+  ...(obj.diagnostic && { diagnostic:
+    DiagnosticFilterSensitiveLog(obj.diagnostic)
+  }),
+  ...(obj.consoleState && { consoleState:
+    ConsoleStateFilterSensitiveLog(obj.consoleState)
+  }),
+  ...(obj.additionalContext && { additionalContext:
+    obj.additionalContext.map(
+      item =>
+      AdditionalContentEntryFilterSensitiveLog(item)
+    )
+  }),
+  ...(obj.toolResults && { toolResults:
+    obj.toolResults.map(
+      item =>
+      ToolResultFilterSensitiveLog(item)
+    )
+  }),
+  ...(obj.tools && { tools:
+    obj.tools.map(
+      item =>
+      ToolFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * Structure to represent a chat input message from User.
+ * @public
+ */
+export interface UserInputMessage {
+  /**
+   * The content of the chat message.
+   * @public
+   */
+  content: string | undefined;
+
+  /**
+   * Chat message context associated with the Chat Message.
+   * @public
+   */
+  userInputMessageContext?: UserInputMessageContext | undefined;
+
+  /**
+   * User Intent.
+   * @public
+   */
+  userIntent?: UserIntent | undefined;
+
+  /**
+   * User Input Origin.
+   * @public
+   */
+  origin?: Origin | undefined;
+
+  /**
+   * Images associated with the Chat Message.
+   * @public
+   */
+  images?: (ImageBlock)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const UserInputMessageFilterSensitiveLog = (obj: UserInputMessage): any => ({
+  ...obj,
+  ...(obj.content && { content:
+    SENSITIVE_STRING
+  }),
+  ...(obj.userInputMessageContext && { userInputMessageContext:
+    UserInputMessageContextFilterSensitiveLog(obj.userInputMessageContext)
+  }),
+  ...(obj.images && { images:
+    obj.images.map(
+      item =>
+      ImageBlockFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * @public
+ */
+export type ChatMessage =
+  | ChatMessage.AssistantResponseMessageMember
+  | ChatMessage.UserInputMessageMember
+  | ChatMessage.$UnknownMember
+
+/**
+ * @public
+ */
+export namespace ChatMessage {
+
+  /**
+   * Structure to represent a chat input message from User.
+   * @public
+   */
+  export interface UserInputMessageMember {
+    userInputMessage: UserInputMessage;
+    assistantResponseMessage?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Markdown text message.
+   * @public
+   */
+  export interface AssistantResponseMessageMember {
+    userInputMessage?: never;
+    assistantResponseMessage: AssistantResponseMessage;
+    $unknown?: never;
+  }
+
+  /**
+   * @public
+   */
+  export interface $UnknownMember {
+    userInputMessage?: never;
+    assistantResponseMessage?: never;
+    $unknown: [string, any];
+  }
+
+  export interface Visitor<T> {
+    userInputMessage: (value: UserInputMessage) => T;
+    assistantResponseMessage: (value: AssistantResponseMessage) => T;
+    _: (name: string, value: any) => T;
+  }
+
+  export const visit = <T>(
+    value: ChatMessage,
+    visitor: Visitor<T>
+  ): T => {
+    if (value.userInputMessage !== undefined) return visitor.userInputMessage(value.userInputMessage);
+    if (value.assistantResponseMessage !== undefined) return visitor.assistantResponseMessage(value.assistantResponseMessage);
+    return visitor._(value.$unknown[0], value.$unknown[1]);
+  }
+
+}
+/**
+ * @internal
+ */
+export const ChatMessageFilterSensitiveLog = (obj: ChatMessage): any => {
+  if (obj.userInputMessage !== undefined) return {userInputMessage:
+    UserInputMessageFilterSensitiveLog(obj.userInputMessage)
+  };
+  if (obj.assistantResponseMessage !== undefined) return {assistantResponseMessage:
+    AssistantResponseMessageFilterSensitiveLog(obj.assistantResponseMessage)
+  };
+  if (obj.$unknown !== undefined) return {[obj.$unknown[0]]: 'UNKNOWN'};
+}
+
+/**
+ * Represents the target of a citation event
+ * @public
+ */
+export type CitationTarget =
+  | CitationTarget.LocationMember
+  | CitationTarget.RangeMember
+  | CitationTarget.$UnknownMember
+
+/**
+ * @public
+ */
+export namespace CitationTarget {
+
+  /**
+   * Represents a position in the response text where a citation should be added
+   * @public
+   */
+  export interface LocationMember {
+    location: number;
+    range?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Represents the range in the response text to be targetted by a citation
+   * @public
+   */
+  export interface RangeMember {
+    location?: never;
+    range: Span;
+    $unknown?: never;
+  }
+
+  /**
+   * @public
+   */
+  export interface $UnknownMember {
+    location?: never;
+    range?: never;
+    $unknown: [string, any];
+  }
+
+  export interface Visitor<T> {
+    location: (value: number) => T;
+    range: (value: Span) => T;
+    _: (name: string, value: any) => T;
+  }
+
+  export const visit = <T>(
+    value: CitationTarget,
+    visitor: Visitor<T>
+  ): T => {
+    if (value.location !== undefined) return visitor.location(value.location);
+    if (value.range !== undefined) return visitor.range(value.range);
+    return visitor._(value.$unknown[0], value.$unknown[1]);
+  }
+
+}
+
+/**
+ * Streaming response event for citations
+ * @public
+ */
+export interface CitationEvent {
+  /**
+   * The position or the range of the response text to be cited
+   * @public
+   */
+  target: CitationTarget | undefined;
+
+  /**
+   * The text inside the citation '1' in [1]
+   * @public
+   */
+  citationText?: string | undefined;
+
+  /**
+   * The link to the document being cited
+   * @public
+   */
+  citationLink: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const CitationEventFilterSensitiveLog = (obj: CitationEvent): any => ({
+  ...obj,
+  ...(obj.target && { target:
+    obj.target
+  }),
+  ...(obj.citationText && { citationText:
+    SENSITIVE_STRING
+  }),
+  ...(obj.citationLink && { citationLink:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Streaming response event for generated code text.
+ * @public
+ */
+export interface CodeEvent {
+  /**
+   * Generated code snippet.
+   * @public
+   */
+  content: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const CodeEventFilterSensitiveLog = (obj: CodeEvent): any => ({
+  ...obj,
+  ...(obj.content && { content:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Streaming Response Event for CodeReferences
+ * @public
+ */
+export interface CodeReferenceEvent {
+  /**
+   * Code References for Assistant Response Message
+   * @public
+   */
+  references?: (Reference)[] | undefined;
+}
+
+/**
+ * Streaming Response Event when DryRun is succeessful
+ * @public
+ */
+export interface DryRunSucceedEvent {
+}
+
+/**
+ * Streaming Response Event for Followup Prompt.
+ * @public
+ */
+export interface FollowupPromptEvent {
+  /**
+   * Followup Prompt for the Assistant Response
+   * @public
+   */
+  followupPrompt?: FollowupPrompt | undefined;
+}
+
+/**
+ * @internal
+ */
+export const FollowupPromptEventFilterSensitiveLog = (obj: FollowupPromptEvent): any => ({
+  ...obj,
+  ...(obj.followupPrompt && { followupPrompt:
+    FollowupPromptFilterSensitiveLog(obj.followupPrompt)
+  }),
+})
+
+/**
+ * @public
+ * @enum
+ */
+export const IntentType = {
+  GLUE_SENSEI: "GLUE_SENSEI",
+  RESOURCE_DATA: "RESOURCE_DATA",
+  SUPPORT: "SUPPORT",
+} as const
+/**
+ * @public
+ */
+export type IntentType = typeof IntentType[keyof typeof IntentType]
+
+/**
+ * @public
+ */
+export type IntentDataType =
+  | IntentDataType.StringMember
+  | IntentDataType.$UnknownMember
+
+/**
+ * @public
+ */
+export namespace IntentDataType {
+
+  export interface StringMember {
+    string: string;
+    $unknown?: never;
+  }
+
+  /**
+   * @public
+   */
+  export interface $UnknownMember {
+    string?: never;
+    $unknown: [string, any];
+  }
+
+  export interface Visitor<T> {
+    string: (value: string) => T;
+    _: (name: string, value: any) => T;
+  }
+
+  export const visit = <T>(
+    value: IntentDataType,
+    visitor: Visitor<T>
+  ): T => {
+    if (value.string !== undefined) return visitor.string(value.string);
+    return visitor._(value.$unknown[0], value.$unknown[1]);
+  }
+
+}
+
+/**
+ * Streaming Response Event for Intents
+ * @public
+ */
+export interface IntentsEvent {
+  /**
+   * A map of Intent objects
+   * @public
+   */
+  intents?: Partial<Record<IntentType, Record<string, IntentDataType>>> | undefined;
+}
+
+/**
+ * @internal
+ */
+export const IntentsEventFilterSensitiveLog = (obj: IntentsEvent): any => ({
+  ...obj,
+  ...(obj.intents && { intents:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * For CloudWatch Troubleshooting Link Module
+ * @public
+ */
+export interface CloudWatchTroubleshootingLink {
+  /**
+   * A label for the link.
+   * @public
+   */
+  label: string | undefined;
+
+  /**
+   * Stringified JSON payload. See spec here https://code.amazon.com/packages/CloudWatchOdysseyModel/blobs/50c0832f0e393e4ab68827eb4f04d832366821c1/--/model/events.smithy#L28 .
+   * @public
+   */
+  investigationPayload: string | undefined;
+
+  /**
+   * Fallback string, if target channel does not support the CloudWatchTroubleshootingLink.
+   * @public
+   */
+  defaultText?: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const CloudWatchTroubleshootingLinkFilterSensitiveLog = (obj: CloudWatchTroubleshootingLink): any => ({
+  ...obj,
+  ...(obj.label && { label:
+    SENSITIVE_STRING
+  }),
+  ...(obj.investigationPayload && { investigationPayload:
+    SENSITIVE_STRING
+  }),
+  ...(obj.defaultText && { defaultText:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * @public
+ */
+export interface ModuleLink {
+  /**
+   * For CloudWatch Troubleshooting Link Module
+   * @public
+   */
+  cloudWatchTroubleshootingLink?: CloudWatchTroubleshootingLink | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ModuleLinkFilterSensitiveLog = (obj: ModuleLink): any => ({
+  ...obj,
+  ...(obj.cloudWatchTroubleshootingLink && { cloudWatchTroubleshootingLink:
+    CloudWatchTroubleshootingLinkFilterSensitiveLog(obj.cloudWatchTroubleshootingLink)
+  }),
+})
+
+/**
+ * @public
+ */
+export interface WebLink {
+  /**
+   * A label for the link
+   * @public
+   */
+  label: string | undefined;
+
+  /**
+   * URL of the Weblink
+   * @public
+   */
+  url: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const WebLinkFilterSensitiveLog = (obj: WebLink): any => ({
+  ...obj,
+  ...(obj.label && { label:
+    SENSITIVE_STRING
+  }),
+  ...(obj.url && { url:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * @public
+ */
+export interface Action {
+  webLink?: WebLink | undefined;
+  moduleLink?: ModuleLink | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ActionFilterSensitiveLog = (obj: Action): any => ({
+  ...obj,
+  ...(obj.webLink && { webLink:
+    WebLinkFilterSensitiveLog(obj.webLink)
+  }),
+  ...(obj.moduleLink && { moduleLink:
+    ModuleLinkFilterSensitiveLog(obj.moduleLink)
+  }),
+})
+
+/**
+ * Structure representing a simple text component with sensitive content, which can include Markdown formatting.
+ * @public
+ */
+export interface Text {
+  /**
+   * Contains text content that may include sensitive information and can support Markdown formatting.
+   * @public
+   */
+  content: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const TextFilterSensitiveLog = (obj: Text): any => ({
+  ...obj,
+  ...(obj.content && { content:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * @public
+ */
+export interface AlertComponent {
+  /**
+   * Structure representing a simple text component with sensitive content, which can include Markdown formatting.
+   * @public
+   */
+  text?: Text | undefined;
+}
+
+/**
+ * @internal
+ */
+export const AlertComponentFilterSensitiveLog = (obj: AlertComponent): any => ({
+  ...obj,
+  ...(obj.text && { text:
+    TextFilterSensitiveLog(obj.text)
+  }),
+})
+
+/**
+ * @public
+ * @enum
+ */
+export const AlertType = {
+  /**
+   * Alert indicating an error or failure that requires attention.
+   */
+  ERROR: "ERROR",
+  /**
+   * Informational alert providing general information.
+   */
+  INFO: "INFO",
+  /**
+   * Alert indicating a warning or potential issue that should be noted.
+   */
+  WARNING: "WARNING",
+} as const
+/**
+ * @public
+ */
+export type AlertType = typeof AlertType[keyof typeof AlertType]
+
+/**
+ * Structure representing an alert with a type and content.
+ * @public
+ */
+export interface Alert {
+  /**
+   * Enum defining types of alerts that can be issued.
+   * @public
+   */
+  type: AlertType | undefined;
+
+  /**
+   * Contains the content of the alert, which may include sensitive information.
+   * @public
+   */
+  content: (AlertComponent)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const AlertFilterSensitiveLog = (obj: Alert): any => ({
+  ...obj,
+  ...(obj.content && { content:
+    obj.content.map(
+      item =>
+      AlertComponentFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * Structure describing a transition between two states in an infrastructure update.
+ * @public
+ */
+export interface InfrastructureUpdateTransition {
+  /**
+   * The current state of the infrastructure before the update.
+   * @public
+   */
+  currentState: string | undefined;
+
+  /**
+   * The next state of the infrastructure following the update.
+   * @public
+   */
+  nextState: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const InfrastructureUpdateTransitionFilterSensitiveLog = (obj: InfrastructureUpdateTransition): any => ({
+  ...obj,
+  ...(obj.currentState && { currentState:
+    SENSITIVE_STRING
+  }),
+  ...(obj.nextState && { nextState:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Structure representing different types of infrastructure updates.
+ * @public
+ */
+export interface InfrastructureUpdate {
+  /**
+   * Structure describing a transition between two states in an infrastructure update.
+   * @public
+   */
+  transition?: InfrastructureUpdateTransition | undefined;
+}
+
+/**
+ * @internal
+ */
+export const InfrastructureUpdateFilterSensitiveLog = (obj: InfrastructureUpdate): any => ({
+  ...obj,
+  ...(obj.transition && { transition:
+    InfrastructureUpdateTransitionFilterSensitiveLog(obj.transition)
+  }),
+})
+
+/**
+ * @public
+ */
+export interface StepComponent {
+  /**
+   * Structure representing a simple text component with sensitive content, which can include Markdown formatting.
+   * @public
+   */
+  text?: Text | undefined;
+}
+
+/**
+ * @internal
+ */
+export const StepComponentFilterSensitiveLog = (obj: StepComponent): any => ({
+  ...obj,
+  ...(obj.text && { text:
+    TextFilterSensitiveLog(obj.text)
+  }),
+})
+
+/**
+ * @public
+ * @enum
+ */
+export const StepState = {
+  /**
+   * Indicates a failure or issue that needs to be addressed.
+   */
+  FAILED: "FAILED",
+  /**
+   * Indicates that the step is currently being processed. This is a non-terminal state, meaning the process is active and ongoing.
+   */
+  IN_PROGRESS: "IN_PROGRESS",
+  /**
+   * Indicates that the step is being loaded or initialized. This is a non-terminal state, meaning the process is in the setup phase.
+   */
+  LOADING: "LOADING",
+  /**
+   * Indicates that the step is temporarily halted but can resume. This is a non-terminal state, representing a temporary pause.
+   */
+  PAUSED: "PAUSED",
+  /**
+   * Indicates that the step is waiting for some condition or input. This is a non-terminal state, meaning the process is paused but not complete.
+   */
+  PENDING: "PENDING",
+  /**
+   * Indicates that the step was stopped, either intentionally or unintentionally.
+   */
+  STOPPED: "STOPPED",
+  /**
+   * Indicates successful completion of the step.
+   */
+  SUCCEEDED: "SUCCEEDED",
+} as const
+/**
+ * @public
+ */
+export type StepState = typeof StepState[keyof typeof StepState]
+
+/**
+ * Structure representing an individual step in a process.
+ * @public
+ */
+export interface Step {
+  /**
+   * A unique identifier for the step. It must be a non-negative integer to ensure each step is distinct.
+   * @public
+   */
+  id: number | undefined;
+
+  /**
+   * Enum representing all possible step states, combining terminal and non-terminal states.
+   * @public
+   */
+  state: StepState | undefined;
+
+  /**
+   * A label for the step, providing a concise description.
+   * @public
+   */
+  label: string | undefined;
+
+  /**
+   * Optional content providing additional details about the step.
+   * @public
+   */
+  content?: (StepComponent)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const StepFilterSensitiveLog = (obj: Step): any => ({
+  ...obj,
+  ...(obj.label && { label:
+    SENSITIVE_STRING
+  }),
+  ...(obj.content && { content:
+    obj.content.map(
+      item =>
+      StepComponentFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * @public
+ */
+export interface ProgressComponent {
+  /**
+   * Structure representing an individual step in a process.
+   * @public
+   */
+  step?: Step | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ProgressComponentFilterSensitiveLog = (obj: ProgressComponent): any => ({
+  ...obj,
+  ...(obj.step && { step:
+    StepFilterSensitiveLog(obj.step)
+  }),
+})
+
+/**
+ * Structure representing a collection of steps in a process.
+ * @public
+ */
+export interface Progress {
+  /**
+   * A collection of steps that make up a process. Each step is detailed using the Step structure.
+   * @public
+   */
+  content: (ProgressComponent)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ProgressFilterSensitiveLog = (obj: Progress): any => ({
+  ...obj,
+  ...(obj.content && { content:
+    obj.content.map(
+      item =>
+      ProgressComponentFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * Structure representing a resource item
+ * @public
+ */
+export interface Resource {
+  /**
+   * Card title.
+   * @public
+   */
+  title: string | undefined;
+
+  /**
+   * Link for the resource item
+   * @public
+   */
+  link: string | undefined;
+
+  /**
+   * Short text about that resource for example Region: us-east-1
+   * @public
+   */
+  description: string | undefined;
+
+  /**
+   * Resource type e.g AWS EC2
+   * @public
+   */
+  type: string | undefined;
+
+  /**
+   * Amazon resource number e.g arn:aws:aec:.....
+   * @public
+   */
+  ARN: string | undefined;
+
+  /**
+   * A stringified object
+   * @public
+   */
+  resourceJsonString: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ResourceFilterSensitiveLog = (obj: Resource): any => ({
+  ...obj,
+  ...(obj.title && { title:
+    SENSITIVE_STRING
+  }),
+  ...(obj.link && { link:
+    SENSITIVE_STRING
+  }),
+  ...(obj.description && { description:
+    SENSITIVE_STRING
+  }),
+  ...(obj.type && { type:
+    SENSITIVE_STRING
+  }),
+  ...(obj.ARN && { ARN:
+    SENSITIVE_STRING
+  }),
+  ...(obj.resourceJsonString && { resourceJsonString:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Structure representing a list of Items
+ * @public
+ */
+export interface ResourceList {
+  /**
+   * Action associated with the list
+   * @public
+   */
+  action?: Action | undefined;
+
+  /**
+   * List of resources
+   * @public
+   */
+  items: (Resource)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ResourceListFilterSensitiveLog = (obj: ResourceList): any => ({
+  ...obj,
+  ...(obj.action && { action:
+    ActionFilterSensitiveLog(obj.action)
+  }),
+  ...(obj.items && { items:
+    obj.items.map(
+      item =>
+      ResourceFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * @public
+ */
+export interface SectionComponent {
+  /**
+   * Structure representing a simple text component with sensitive content, which can include Markdown formatting.
+   * @public
+   */
+  text?: Text | undefined;
+
+  /**
+   * Structure representing an alert with a type and content.
+   * @public
+   */
+  alert?: Alert | undefined;
+
+  /**
+   * Structure representing a resource item
+   * @public
+   */
+  resource?: Resource | undefined;
+
+  /**
+   * Structure representing a list of Items
+   * @public
+   */
+  resourceList?: ResourceList | undefined;
+}
+
+/**
+ * @internal
+ */
+export const SectionComponentFilterSensitiveLog = (obj: SectionComponent): any => ({
+  ...obj,
+  ...(obj.text && { text:
+    TextFilterSensitiveLog(obj.text)
+  }),
+  ...(obj.alert && { alert:
+    AlertFilterSensitiveLog(obj.alert)
+  }),
+  ...(obj.resource && { resource:
+    ResourceFilterSensitiveLog(obj.resource)
+  }),
+  ...(obj.resourceList && { resourceList:
+    ResourceListFilterSensitiveLog(obj.resourceList)
+  }),
+})
+
+/**
+ * Structure representing a collapsable section
+ * @public
+ */
+export interface Section {
+  /**
+   * Contains text content that may include sensitive information and can support Markdown formatting.
+   * @public
+   */
+  title: string | undefined;
+
+  /**
+   * Contains a list of interaction components e.g Text, Alert, List, etc.
+   * @public
+   */
+  content: (SectionComponent)[] | undefined;
+
+  /**
+   * Action associated with the Section
+   * @public
+   */
+  action?: Action | undefined;
+}
+
+/**
+ * @internal
+ */
+export const SectionFilterSensitiveLog = (obj: Section): any => ({
+  ...obj,
+  ...(obj.title && { title:
+    SENSITIVE_STRING
+  }),
+  ...(obj.content && { content:
+    obj.content.map(
+      item =>
+      SectionComponentFilterSensitiveLog(item)
+    )
+  }),
+  ...(obj.action && { action:
+    ActionFilterSensitiveLog(obj.action)
+  }),
+})
+
+/**
+ * Structure representing a suggestion for follow-ups.
+ * @public
+ */
+export interface Suggestion {
+  value: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const SuggestionFilterSensitiveLog = (obj: Suggestion): any => ({
+  ...obj,
+  ...(obj.value && { value:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Structure containing a list of suggestions.
+ * @public
+ */
+export interface Suggestions {
+  items: (Suggestion)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const SuggestionsFilterSensitiveLog = (obj: Suggestions): any => ({
+  ...obj,
+  ...(obj.items && { items:
+    obj.items.map(
+      item =>
+      SuggestionFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * Structure representing a confirmation message related to a task action.
+ * @public
+ */
+export interface TaskActionConfirmation {
+  /**
+   * Confirmation message related to the action note, which may include sensitive information.
+   * @public
+   */
+  content?: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const TaskActionConfirmationFilterSensitiveLog = (obj: TaskActionConfirmation): any => ({
+  ...obj,
+  ...(obj.content && { content:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * @public
+ * @enum
+ */
+export const TaskActionNoteType = {
+  /**
+   * Information note providing general details.
+   */
+  INFO: "INFO",
+  /**
+   * Warning note indicating a potential issue.
+   */
+  WARNING: "WARNING",
+} as const
+/**
+ * @public
+ */
+export type TaskActionNoteType = typeof TaskActionNoteType[keyof typeof TaskActionNoteType]
+
+/**
+ * Structure representing a note associated with a task action.
+ * @public
+ */
+export interface TaskActionNote {
+  /**
+   * Content of the note, which may include sensitive information.
+   * @public
+   */
+  content: string | undefined;
+
+  /**
+   * Enum defining the types of notes that can be associated with a task action.
+   * @public
+   */
+  type?: TaskActionNoteType | undefined;
+}
+
+/**
+ * @internal
+ */
+export const TaskActionNoteFilterSensitiveLog = (obj: TaskActionNote): any => ({
+  ...obj,
+  ...(obj.content && { content:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Structure representing an action associated with a task.
+ * @public
+ */
+export interface TaskAction {
+  /**
+   * A label for the action.
+   * @public
+   */
+  label: string | undefined;
+
+  /**
+   * Structure representing a note associated with a task action.
+   * @public
+   */
+  note?: TaskActionNote | undefined;
+
+  /**
+   * Indicates whether the action is primary or not.
+   * @public
+   */
+  primary?: boolean | undefined;
+
+  /**
+   * Indicates whether the action is disabled or not.
+   * @public
+   */
+  disabled?: boolean | undefined;
+
+  /**
+   * Map representing key-value pairs for the payload of a task action.
+   * @public
+   */
+  payload: Record<string, string> | undefined;
+
+  /**
+   * Structure representing a confirmation message related to a task action.
+   * @public
+   */
+  confirmation?: TaskActionConfirmation | undefined;
+}
+
+/**
+ * @internal
+ */
+export const TaskActionFilterSensitiveLog = (obj: TaskAction): any => ({
+  ...obj,
+  ...(obj.label && { label:
+    SENSITIVE_STRING
+  }),
+  ...(obj.note && { note:
+    TaskActionNoteFilterSensitiveLog(obj.note)
+  }),
+  ...(obj.payload && { payload:
+    SENSITIVE_STRING
+  }),
+  ...(obj.confirmation && { confirmation:
+    TaskActionConfirmationFilterSensitiveLog(obj.confirmation)
+  }),
+})
+
+/**
+ * Structure representing different types of components that can be part of a task.
+ * @public
+ */
+export interface TaskComponent {
+  /**
+   * Structure representing a simple text component with sensitive content, which can include Markdown formatting.
+   * @public
+   */
+  text?: Text | undefined;
+
+  /**
+   * Structure representing different types of infrastructure updates.
+   * @public
+   */
+  infrastructureUpdate?: InfrastructureUpdate | undefined;
+
+  /**
+   * Structure representing an alert with a type and content.
+   * @public
+   */
+  alert?: Alert | undefined;
+
+  /**
+   * Structure representing a collection of steps in a process.
+   * @public
+   */
+  progress?: Progress | undefined;
+}
+
+/**
+ * @internal
+ */
+export const TaskComponentFilterSensitiveLog = (obj: TaskComponent): any => ({
+  ...obj,
+  ...(obj.text && { text:
+    TextFilterSensitiveLog(obj.text)
+  }),
+  ...(obj.infrastructureUpdate && { infrastructureUpdate:
+    InfrastructureUpdateFilterSensitiveLog(obj.infrastructureUpdate)
+  }),
+  ...(obj.alert && { alert:
+    AlertFilterSensitiveLog(obj.alert)
+  }),
+  ...(obj.progress && { progress:
+    ProgressFilterSensitiveLog(obj.progress)
+  }),
+})
+
+/**
+ * Structure representing an overview of a task, including a label and description.
+ * @public
+ */
+export interface TaskOverview {
+  /**
+   * A label for the task overview.
+   * @public
+   */
+  label: string | undefined;
+
+  /**
+   * Text description providing details about the task. This field may include sensitive information and supports Markdown formatting.
+   * @public
+   */
+  description: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const TaskOverviewFilterSensitiveLog = (obj: TaskOverview): any => ({
+  ...obj,
+  ...(obj.label && { label:
+    SENSITIVE_STRING
+  }),
+  ...(obj.description && { description:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Structure containing details about a task.
+ * @public
+ */
+export interface TaskDetails {
+  /**
+   * Structure representing an overview of a task, including a label and description.
+   * @public
+   */
+  overview: TaskOverview | undefined;
+
+  /**
+   * Lists the components that can be used to form the task's content.
+   * @public
+   */
+  content: (TaskComponent)[] | undefined;
+
+  /**
+   * Optional list of actions associated with the task.
+   * @public
+   */
+  actions?: (TaskAction)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const TaskDetailsFilterSensitiveLog = (obj: TaskDetails): any => ({
+  ...obj,
+  ...(obj.overview && { overview:
+    TaskOverviewFilterSensitiveLog(obj.overview)
+  }),
+  ...(obj.content && { content:
+    obj.content.map(
+      item =>
+      TaskComponentFilterSensitiveLog(item)
+    )
+  }),
+  ...(obj.actions && { actions:
+    obj.actions.map(
+      item =>
+      TaskActionFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * Structure representing a reference to a task.
+ * @public
+ */
+export interface TaskReference {
+  /**
+   * Unique identifier for the task.
+   * @public
+   */
+  taskId: string | undefined;
+}
+
+/**
+ * Structure representing different types of interaction components.
+ * @public
+ */
+export interface InteractionComponent {
+  /**
+   * Structure representing a simple text component with sensitive content, which can include Markdown formatting.
+   * @public
+   */
+  text?: Text | undefined;
+
+  /**
+   * Structure representing an alert with a type and content.
+   * @public
+   */
+  alert?: Alert | undefined;
+
+  /**
+   * Structure representing different types of infrastructure updates.
+   * @public
+   */
+  infrastructureUpdate?: InfrastructureUpdate | undefined;
+
+  /**
+   * Structure representing a collection of steps in a process.
+   * @public
+   */
+  progress?: Progress | undefined;
+
+  /**
+   * Structure representing an individual step in a process.
+   * @public
+   */
+  step?: Step | undefined;
+
+  /**
+   * Structure containing details about a task.
+   * @public
+   */
+  taskDetails?: TaskDetails | undefined;
+
+  /**
+   * Structure representing a reference to a task.
+   * @public
+   */
+  taskReference?: TaskReference | undefined;
+
+  /**
+   * Structure containing a list of suggestions.
+   * @public
+   */
+  suggestions?: Suggestions | undefined;
+
+  /**
+   * Structure representing a collapsable section
+   * @public
+   */
+  section?: Section | undefined;
+
+  /**
+   * Structure representing a resource item
+   * @public
+   */
+  resource?: Resource | undefined;
+
+  /**
+   * Structure representing a list of Items
+   * @public
+   */
+  resourceList?: ResourceList | undefined;
+
+  action?: Action | undefined;
+}
+
+/**
+ * @internal
+ */
+export const InteractionComponentFilterSensitiveLog = (obj: InteractionComponent): any => ({
+  ...obj,
+  ...(obj.text && { text:
+    TextFilterSensitiveLog(obj.text)
+  }),
+  ...(obj.alert && { alert:
+    AlertFilterSensitiveLog(obj.alert)
+  }),
+  ...(obj.infrastructureUpdate && { infrastructureUpdate:
+    InfrastructureUpdateFilterSensitiveLog(obj.infrastructureUpdate)
+  }),
+  ...(obj.progress && { progress:
+    ProgressFilterSensitiveLog(obj.progress)
+  }),
+  ...(obj.step && { step:
+    StepFilterSensitiveLog(obj.step)
+  }),
+  ...(obj.taskDetails && { taskDetails:
+    TaskDetailsFilterSensitiveLog(obj.taskDetails)
+  }),
+  ...(obj.suggestions && { suggestions:
+    SuggestionsFilterSensitiveLog(obj.suggestions)
+  }),
+  ...(obj.section && { section:
+    SectionFilterSensitiveLog(obj.section)
+  }),
+  ...(obj.resource && { resource:
+    ResourceFilterSensitiveLog(obj.resource)
+  }),
+  ...(obj.resourceList && { resourceList:
+    ResourceListFilterSensitiveLog(obj.resourceList)
+  }),
+  ...(obj.action && { action:
+    ActionFilterSensitiveLog(obj.action)
+  }),
+})
+
+/**
+ * Interaction component with an identifier
+ * @public
+ */
+export interface InteractionComponentEntry {
+  /**
+   * Identifier that can uniquely identify the interaction component within
+   *         stream response. This field is optional.
+   * @public
+   */
+  interactionComponentId?: string | undefined;
+
+  /**
+   * Interaction component
+   * @public
+   */
+  interactionComponent: InteractionComponent | undefined;
+}
+
+/**
+ * @internal
+ */
+export const InteractionComponentEntryFilterSensitiveLog = (obj: InteractionComponentEntry): any => ({
+  ...obj,
+  ...(obj.interactionComponent && { interactionComponent:
+    InteractionComponentFilterSensitiveLog(obj.interactionComponent)
+  }),
+})
+
+/**
+ * Streaming Event for interaction components list
+ * @public
+ */
+export interface InteractionComponentsEvent {
+  /**
+   * List of identifiable interaction components
+   * @public
+   */
+  interactionComponentEntries: (InteractionComponentEntry)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const InteractionComponentsEventFilterSensitiveLog = (obj: InteractionComponentsEvent): any => ({
+  ...obj,
+  ...(obj.interactionComponentEntries && { interactionComponentEntries:
+    obj.interactionComponentEntries.map(
+      item =>
+      InteractionComponentEntryFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * @public
+ * @enum
+ */
+export const InvalidStateReason = {
+  INVALID_TASK_ASSIST_PLAN: "INVALID_TASK_ASSIST_PLAN",
+} as const
+/**
+ * @public
+ */
+export type InvalidStateReason = typeof InvalidStateReason[keyof typeof InvalidStateReason]
+
+/**
+ * Streaming Response Event when an Invalid State is reached
+ * @public
+ */
+export interface InvalidStateEvent {
+  /**
+   * Reasons for Invalid State Event
+   * @public
+   */
+  reason: InvalidStateReason | undefined;
+
+  message: string | undefined;
+}
+
+/**
+ * Streaming Response Event for AssistantResponse Metadata
+ * @public
+ */
+export interface MessageMetadataEvent {
+  /**
+   * Unique identifier for the conversation
+   * @public
+   */
+  conversationId?: string | undefined;
+
+  /**
+   * Unique identifier for the utterance
+   * @public
+   */
+  utteranceId?: string | undefined;
+}
+
+/**
+ * Streaming Response Event for SupplementaryWebLinks
+ * @public
+ */
+export interface SupplementaryWebLinksEvent {
+  /**
+   * Web References for Assistant Response Message
+   * @public
+   */
+  supplementaryWebLinks?: (SupplementaryWebLink)[] | undefined;
+}
+
+/**
+ * @internal
+ */
+export const SupplementaryWebLinksEventFilterSensitiveLog = (obj: SupplementaryWebLinksEvent): any => ({
+  ...obj,
+  ...(obj.supplementaryWebLinks && { supplementaryWebLinks:
+    obj.supplementaryWebLinks.map(
+      item =>
+      SupplementaryWebLinkFilterSensitiveLog(item)
+    )
+  }),
+})
+
+/**
+ * Event for a ToolUse request. Multiple ToolUse requests can be returned from a single request, so each ToolUse has a unique 'toolUseId'.
+ * @public
+ */
+export interface ToolUseEvent {
+  /**
+   * The ID for the tool request.
+   * @public
+   */
+  toolUseId: string | undefined;
+
+  /**
+   * The name for the tool.
+   * @public
+   */
+  name: string | undefined;
+
+  /**
+   * Represents the serialized json input for the ToolUse request. This field should be concatenated until 'stop' is true.
+   * @public
+   */
+  input?: string | undefined;
+
+  /**
+   * This field is true when all of the serialized input for this ToolUse request has been sent.
+   * @public
+   */
+  stop?: boolean | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ToolUseEventFilterSensitiveLog = (obj: ToolUseEvent): any => ({
+  ...obj,
+  ...(obj.name && { name:
+    SENSITIVE_STRING
+  }),
+  ...(obj.input && { input:
+    SENSITIVE_STRING
+  }),
+})
+
+/**
+ * Streaming events from UniDirectional Streaming Conversational APIs.
+ * @public
+ */
+export type ChatResponseStream =
+  | ChatResponseStream.AssistantResponseEventMember
+  | ChatResponseStream.CitationEventMember
+  | ChatResponseStream.CodeEventMember
+  | ChatResponseStream.CodeReferenceEventMember
+  | ChatResponseStream.DryRunSucceedEventMember
+  | ChatResponseStream.ErrorMember
+  | ChatResponseStream.FollowupPromptEventMember
+  | ChatResponseStream.IntentsEventMember
+  | ChatResponseStream.InteractionComponentsEventMember
+  | ChatResponseStream.InvalidStateEventMember
+  | ChatResponseStream.MessageMetadataEventMember
+  | ChatResponseStream.SupplementaryWebLinksEventMember
+  | ChatResponseStream.ToolUseEventMember
+  | ChatResponseStream.$UnknownMember
+
+/**
+ * @public
+ */
+export namespace ChatResponseStream {
+
+  /**
+   * Message Metadata event
+   * @public
+   */
+  export interface MessageMetadataEventMember {
+    messageMetadataEvent: MessageMetadataEvent;
+    assistantResponseEvent?: never;
+    dryRunSucceedEvent?: never;
+    codeReferenceEvent?: never;
+    supplementaryWebLinksEvent?: never;
+    followupPromptEvent?: never;
+    codeEvent?: never;
+    intentsEvent?: never;
+    interactionComponentsEvent?: never;
+    toolUseEvent?: never;
+    citationEvent?: never;
+    invalidStateEvent?: never;
+    error?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Assistant response event - Text / Code snippet
+   * @public
+   */
+  export interface AssistantResponseEventMember {
+    messageMetadataEvent?: never;
+    assistantResponseEvent: AssistantResponseEvent;
+    dryRunSucceedEvent?: never;
+    codeReferenceEvent?: never;
+    supplementaryWebLinksEvent?: never;
+    followupPromptEvent?: never;
+    codeEvent?: never;
+    intentsEvent?: never;
+    interactionComponentsEvent?: never;
+    toolUseEvent?: never;
+    citationEvent?: never;
+    invalidStateEvent?: never;
+    error?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * DryRun Succeed Event
+   * @public
+   */
+  export interface DryRunSucceedEventMember {
+    messageMetadataEvent?: never;
+    assistantResponseEvent?: never;
+    dryRunSucceedEvent: DryRunSucceedEvent;
+    codeReferenceEvent?: never;
+    supplementaryWebLinksEvent?: never;
+    followupPromptEvent?: never;
+    codeEvent?: never;
+    intentsEvent?: never;
+    interactionComponentsEvent?: never;
+    toolUseEvent?: never;
+    citationEvent?: never;
+    invalidStateEvent?: never;
+    error?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Code References event
+   * @public
+   */
+  export interface CodeReferenceEventMember {
+    messageMetadataEvent?: never;
+    assistantResponseEvent?: never;
+    dryRunSucceedEvent?: never;
+    codeReferenceEvent: CodeReferenceEvent;
+    supplementaryWebLinksEvent?: never;
+    followupPromptEvent?: never;
+    codeEvent?: never;
+    intentsEvent?: never;
+    interactionComponentsEvent?: never;
+    toolUseEvent?: never;
+    citationEvent?: never;
+    invalidStateEvent?: never;
+    error?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Web Reference links event
+   * @public
+   */
+  export interface SupplementaryWebLinksEventMember {
+    messageMetadataEvent?: never;
+    assistantResponseEvent?: never;
+    dryRunSucceedEvent?: never;
+    codeReferenceEvent?: never;
+    supplementaryWebLinksEvent: SupplementaryWebLinksEvent;
+    followupPromptEvent?: never;
+    codeEvent?: never;
+    intentsEvent?: never;
+    interactionComponentsEvent?: never;
+    toolUseEvent?: never;
+    citationEvent?: never;
+    invalidStateEvent?: never;
+    error?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Followup prompt event
+   * @public
+   */
+  export interface FollowupPromptEventMember {
+    messageMetadataEvent?: never;
+    assistantResponseEvent?: never;
+    dryRunSucceedEvent?: never;
+    codeReferenceEvent?: never;
+    supplementaryWebLinksEvent?: never;
+    followupPromptEvent: FollowupPromptEvent;
+    codeEvent?: never;
+    intentsEvent?: never;
+    interactionComponentsEvent?: never;
+    toolUseEvent?: never;
+    citationEvent?: never;
+    invalidStateEvent?: never;
+    error?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Code Generated event
+   * @public
+   */
+  export interface CodeEventMember {
+    messageMetadataEvent?: never;
+    assistantResponseEvent?: never;
+    dryRunSucceedEvent?: never;
+    codeReferenceEvent?: never;
+    supplementaryWebLinksEvent?: never;
+    followupPromptEvent?: never;
+    codeEvent: CodeEvent;
+    intentsEvent?: never;
+    interactionComponentsEvent?: never;
+    toolUseEvent?: never;
+    citationEvent?: never;
+    invalidStateEvent?: never;
+    error?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Intents event
+   * @public
+   */
+  export interface IntentsEventMember {
+    messageMetadataEvent?: never;
+    assistantResponseEvent?: never;
+    dryRunSucceedEvent?: never;
+    codeReferenceEvent?: never;
+    supplementaryWebLinksEvent?: never;
+    followupPromptEvent?: never;
+    codeEvent?: never;
+    intentsEvent: IntentsEvent;
+    interactionComponentsEvent?: never;
+    toolUseEvent?: never;
+    citationEvent?: never;
+    invalidStateEvent?: never;
+    error?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Interactions components event
+   * @public
+   */
+  export interface InteractionComponentsEventMember {
+    messageMetadataEvent?: never;
+    assistantResponseEvent?: never;
+    dryRunSucceedEvent?: never;
+    codeReferenceEvent?: never;
+    supplementaryWebLinksEvent?: never;
+    followupPromptEvent?: never;
+    codeEvent?: never;
+    intentsEvent?: never;
+    interactionComponentsEvent: InteractionComponentsEvent;
+    toolUseEvent?: never;
+    citationEvent?: never;
+    invalidStateEvent?: never;
+    error?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * ToolUse event
+   * @public
+   */
+  export interface ToolUseEventMember {
+    messageMetadataEvent?: never;
+    assistantResponseEvent?: never;
+    dryRunSucceedEvent?: never;
+    codeReferenceEvent?: never;
+    supplementaryWebLinksEvent?: never;
+    followupPromptEvent?: never;
+    codeEvent?: never;
+    intentsEvent?: never;
+    interactionComponentsEvent?: never;
+    toolUseEvent: ToolUseEvent;
+    citationEvent?: never;
+    invalidStateEvent?: never;
+    error?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Citation event
+   * @public
+   */
+  export interface CitationEventMember {
+    messageMetadataEvent?: never;
+    assistantResponseEvent?: never;
+    dryRunSucceedEvent?: never;
+    codeReferenceEvent?: never;
+    supplementaryWebLinksEvent?: never;
+    followupPromptEvent?: never;
+    codeEvent?: never;
+    intentsEvent?: never;
+    interactionComponentsEvent?: never;
+    toolUseEvent?: never;
+    citationEvent: CitationEvent;
+    invalidStateEvent?: never;
+    error?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Invalid State event
+   * @public
+   */
+  export interface InvalidStateEventMember {
+    messageMetadataEvent?: never;
+    assistantResponseEvent?: never;
+    dryRunSucceedEvent?: never;
+    codeReferenceEvent?: never;
+    supplementaryWebLinksEvent?: never;
+    followupPromptEvent?: never;
+    codeEvent?: never;
+    intentsEvent?: never;
+    interactionComponentsEvent?: never;
+    toolUseEvent?: never;
+    citationEvent?: never;
+    invalidStateEvent: InvalidStateEvent;
+    error?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Internal Server Exception
+   * @public
+   */
+  export interface ErrorMember {
+    messageMetadataEvent?: never;
+    assistantResponseEvent?: never;
+    dryRunSucceedEvent?: never;
+    codeReferenceEvent?: never;
+    supplementaryWebLinksEvent?: never;
+    followupPromptEvent?: never;
+    codeEvent?: never;
+    intentsEvent?: never;
+    interactionComponentsEvent?: never;
+    toolUseEvent?: never;
+    citationEvent?: never;
+    invalidStateEvent?: never;
+    error: InternalServerException;
+    $unknown?: never;
+  }
+
+  /**
+   * @public
+   */
+  export interface $UnknownMember {
+    messageMetadataEvent?: never;
+    assistantResponseEvent?: never;
+    dryRunSucceedEvent?: never;
+    codeReferenceEvent?: never;
+    supplementaryWebLinksEvent?: never;
+    followupPromptEvent?: never;
+    codeEvent?: never;
+    intentsEvent?: never;
+    interactionComponentsEvent?: never;
+    toolUseEvent?: never;
+    citationEvent?: never;
+    invalidStateEvent?: never;
+    error?: never;
+    $unknown: [string, any];
+  }
+
+  export interface Visitor<T> {
+    messageMetadataEvent: (value: MessageMetadataEvent) => T;
+    assistantResponseEvent: (value: AssistantResponseEvent) => T;
+    dryRunSucceedEvent: (value: DryRunSucceedEvent) => T;
+    codeReferenceEvent: (value: CodeReferenceEvent) => T;
+    supplementaryWebLinksEvent: (value: SupplementaryWebLinksEvent) => T;
+    followupPromptEvent: (value: FollowupPromptEvent) => T;
+    codeEvent: (value: CodeEvent) => T;
+    intentsEvent: (value: IntentsEvent) => T;
+    interactionComponentsEvent: (value: InteractionComponentsEvent) => T;
+    toolUseEvent: (value: ToolUseEvent) => T;
+    citationEvent: (value: CitationEvent) => T;
+    invalidStateEvent: (value: InvalidStateEvent) => T;
+    error: (value: InternalServerException) => T;
+    _: (name: string, value: any) => T;
+  }
+
+  export const visit = <T>(
+    value: ChatResponseStream,
+    visitor: Visitor<T>
+  ): T => {
+    if (value.messageMetadataEvent !== undefined) return visitor.messageMetadataEvent(value.messageMetadataEvent);
+    if (value.assistantResponseEvent !== undefined) return visitor.assistantResponseEvent(value.assistantResponseEvent);
+    if (value.dryRunSucceedEvent !== undefined) return visitor.dryRunSucceedEvent(value.dryRunSucceedEvent);
+    if (value.codeReferenceEvent !== undefined) return visitor.codeReferenceEvent(value.codeReferenceEvent);
+    if (value.supplementaryWebLinksEvent !== undefined) return visitor.supplementaryWebLinksEvent(value.supplementaryWebLinksEvent);
+    if (value.followupPromptEvent !== undefined) return visitor.followupPromptEvent(value.followupPromptEvent);
+    if (value.codeEvent !== undefined) return visitor.codeEvent(value.codeEvent);
+    if (value.intentsEvent !== undefined) return visitor.intentsEvent(value.intentsEvent);
+    if (value.interactionComponentsEvent !== undefined) return visitor.interactionComponentsEvent(value.interactionComponentsEvent);
+    if (value.toolUseEvent !== undefined) return visitor.toolUseEvent(value.toolUseEvent);
+    if (value.citationEvent !== undefined) return visitor.citationEvent(value.citationEvent);
+    if (value.invalidStateEvent !== undefined) return visitor.invalidStateEvent(value.invalidStateEvent);
+    if (value.error !== undefined) return visitor.error(value.error);
+    return visitor._(value.$unknown[0], value.$unknown[1]);
+  }
+
+}
+/**
+ * @internal
+ */
+export const ChatResponseStreamFilterSensitiveLog = (obj: ChatResponseStream): any => {
+  if (obj.messageMetadataEvent !== undefined) return {messageMetadataEvent:
+    obj.messageMetadataEvent
+  };
+  if (obj.assistantResponseEvent !== undefined) return {assistantResponseEvent:
+    AssistantResponseEventFilterSensitiveLog(obj.assistantResponseEvent)
+  };
+  if (obj.dryRunSucceedEvent !== undefined) return {dryRunSucceedEvent:
+    obj.dryRunSucceedEvent
+  };
+  if (obj.codeReferenceEvent !== undefined) return {codeReferenceEvent:
+    obj.codeReferenceEvent
+  };
+  if (obj.supplementaryWebLinksEvent !== undefined) return {supplementaryWebLinksEvent:
+    SupplementaryWebLinksEventFilterSensitiveLog(obj.supplementaryWebLinksEvent)
+  };
+  if (obj.followupPromptEvent !== undefined) return {followupPromptEvent:
+    FollowupPromptEventFilterSensitiveLog(obj.followupPromptEvent)
+  };
+  if (obj.codeEvent !== undefined) return {codeEvent:
+    CodeEventFilterSensitiveLog(obj.codeEvent)
+  };
+  if (obj.intentsEvent !== undefined) return {intentsEvent:
+    IntentsEventFilterSensitiveLog(obj.intentsEvent)
+  };
+  if (obj.interactionComponentsEvent !== undefined) return {interactionComponentsEvent:
+    InteractionComponentsEventFilterSensitiveLog(obj.interactionComponentsEvent)
+  };
+  if (obj.toolUseEvent !== undefined) return {toolUseEvent:
+    ToolUseEventFilterSensitiveLog(obj.toolUseEvent)
+  };
+  if (obj.citationEvent !== undefined) return {citationEvent:
+    CitationEventFilterSensitiveLog(obj.citationEvent)
+  };
+  if (obj.invalidStateEvent !== undefined) return {invalidStateEvent:
+    obj.invalidStateEvent
+  };
+  if (obj.error !== undefined) return {error:
+    obj.error
+  };
+  if (obj.$unknown !== undefined) return {[obj.$unknown[0]]: 'UNKNOWN'};
+}
+
+/**
+ * @public
+ * @enum
+ */
+export const ChatTriggerType = {
+  /**
+   * Indicates the Chat was triggered in response to a IDE diagnostic
+   */
+  DIAGNOSTIC: "DIAGNOSTIC",
+  /**
+   * Indicates the Chat was triggered in response to an inline chat event
+   */
+  INLINE_CHAT: "INLINE_CHAT",
+  /**
+   * Indicates the Chat was triggered due to an explicit chat request by an end-user
+   */
+  MANUAL: "MANUAL",
+} as const
+/**
+ * @public
+ */
+export type ChatTriggerType = typeof ChatTriggerType[keyof typeof ChatTriggerType]
+
+/**
+ * @public
+ * @enum
+ */
+export const ContextTruncationScheme = {
+  ANALYSIS: "ANALYSIS",
+  GUMBY: "GUMBY",
+} as const
+/**
+ * @public
+ */
+export type ContextTruncationScheme = typeof ContextTruncationScheme[keyof typeof ContextTruncationScheme]
+
+/**
+ * Structure to represent the current state of a chat conversation.
+ * @public
+ */
+export interface ConversationState {
+  /**
+   * Unique identifier for the chat conversation stream
+   * @public
+   */
+  conversationId?: string | undefined;
+
+  /**
+   * Holds the history of chat messages.
+   * @public
+   */
+  history?: (ChatMessage)[] | undefined;
+
+  /**
+   * Holds the current message being processed or displayed.
+   * @public
+   */
+  currentMessage: ChatMessage | undefined;
+
+  /**
+   * Trigger Reason for Chat
+   * @public
+   */
+  chatTriggerType: ChatTriggerType | undefined;
+
+  customizationArn?: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ConversationStateFilterSensitiveLog = (obj: ConversationState): any => ({
+  ...obj,
+  ...(obj.history && { history:
+    obj.history.map(
+      item =>
+      ChatMessageFilterSensitiveLog(item)
+    )
+  }),
+  ...(obj.currentMessage && { currentMessage:
+    ChatMessageFilterSensitiveLog(obj.currentMessage)
+  }),
+})
+
+/**
+ * This exception is translated to a 204 as it succeeded the IAM Auth.
+ * @public
+ */
+export class DryRunOperationException extends __BaseException {
+  readonly name: "DryRunOperationException" = "DryRunOperationException";
+  readonly $fault: "client" = "client";
+  responseCode?: number | undefined;
+  /**
+   * @internal
+   */
+  constructor(opts: __ExceptionOptionType<DryRunOperationException, __BaseException>) {
+    super({
+      name: "DryRunOperationException",
+      $fault: "client",
+      ...opts
+    });
+    Object.setPrototypeOf(this, DryRunOperationException.prototype);
+    this.responseCode = opts.responseCode;
+  }
+}
+
+/**
+ * @public
+ * @enum
+ */
+export const TransformationDownloadArtifactType = {
+  CLIENT_INSTRUCTIONS: "ClientInstructions",
+  GENERATED_CODE: "GeneratedCode",
+  LOGS: "Logs",
+} as const
+/**
+ * @public
+ */
+export type TransformationDownloadArtifactType = typeof TransformationDownloadArtifactType[keyof typeof TransformationDownloadArtifactType]
+
+/**
+ * Transformation export context
+ * @public
+ */
+export interface TransformationExportContext {
+  downloadArtifactId: string | undefined;
+  downloadArtifactType: TransformationDownloadArtifactType | undefined;
+}
+
+/**
+ * Unit test generation export context
+ * @public
+ */
+export interface UnitTestGenerationExportContext {
+  /**
+   * Test generation job group name
+   * @public
+   */
+  testGenerationJobGroupName: string | undefined;
+
+  testGenerationJobId?: string | undefined;
+}
+
+/**
+ * Export Context
+ * @public
+ */
+export type ExportContext =
+  | ExportContext.TransformationExportContextMember
+  | ExportContext.UnitTestGenerationExportContextMember
+  | ExportContext.$UnknownMember
+
+/**
+ * @public
+ */
+export namespace ExportContext {
+
+  /**
+   * Transformation export context
+   * @public
+   */
+  export interface TransformationExportContextMember {
+    transformationExportContext: TransformationExportContext;
+    unitTestGenerationExportContext?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Unit test generation export context
+   * @public
+   */
+  export interface UnitTestGenerationExportContextMember {
+    transformationExportContext?: never;
+    unitTestGenerationExportContext: UnitTestGenerationExportContext;
+    $unknown?: never;
+  }
+
+  /**
+   * @public
+   */
+  export interface $UnknownMember {
+    transformationExportContext?: never;
+    unitTestGenerationExportContext?: never;
+    $unknown: [string, any];
+  }
+
+  export interface Visitor<T> {
+    transformationExportContext: (value: TransformationExportContext) => T;
+    unitTestGenerationExportContext: (value: UnitTestGenerationExportContext) => T;
+    _: (name: string, value: any) => T;
+  }
+
+  export const visit = <T>(
+    value: ExportContext,
+    visitor: Visitor<T>
+  ): T => {
+    if (value.transformationExportContext !== undefined) return visitor.transformationExportContext(value.transformationExportContext);
+    if (value.unitTestGenerationExportContext !== undefined) return visitor.unitTestGenerationExportContext(value.unitTestGenerationExportContext);
+    return visitor._(value.$unknown[0], value.$unknown[1]);
+  }
+
+}
+
+/**
+ * @public
+ * @enum
+ */
+export const ExportIntent = {
+  /**
+   * Code Task Assist
+   */
+  TASK_ASSIST: "TASK_ASSIST",
+  /**
+   * Code Transformation
+   */
+  TRANSFORMATION: "TRANSFORMATION",
+  /**
+   * Unit Test
+   */
+  UNIT_TESTS: "UNIT_TESTS",
+} as const
+/**
+ * @public
+ */
+export type ExportIntent = typeof ExportIntent[keyof typeof ExportIntent]
+
+/**
+ * Response Stream
+ * @public
+ */
+export type ResultArchiveStream =
+  | ResultArchiveStream.BinaryMetadataEventMember
+  | ResultArchiveStream.BinaryPayloadEventMember
+  | ResultArchiveStream.InternalServerExceptionMember
+  | ResultArchiveStream.$UnknownMember
+
+/**
+ * @public
+ */
+export namespace ResultArchiveStream {
+
+  /**
+   * Payload Part
+   * @public
+   */
+  export interface BinaryMetadataEventMember {
+    binaryMetadataEvent: BinaryMetadataEvent;
+    binaryPayloadEvent?: never;
+    internalServerException?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * Payload Part
+   * @public
+   */
+  export interface BinaryPayloadEventMember {
+    binaryMetadataEvent?: never;
+    binaryPayloadEvent: BinaryPayloadEvent;
+    internalServerException?: never;
+    $unknown?: never;
+  }
+
+  /**
+   * This exception is thrown when an unexpected error occurred during the processing of a request.
+   * @public
+   */
+  export interface InternalServerExceptionMember {
+    binaryMetadataEvent?: never;
+    binaryPayloadEvent?: never;
+    internalServerException: InternalServerException;
+    $unknown?: never;
+  }
+
+  /**
+   * @public
+   */
+  export interface $UnknownMember {
+    binaryMetadataEvent?: never;
+    binaryPayloadEvent?: never;
+    internalServerException?: never;
+    $unknown: [string, any];
+  }
+
+  export interface Visitor<T> {
+    binaryMetadataEvent: (value: BinaryMetadataEvent) => T;
+    binaryPayloadEvent: (value: BinaryPayloadEvent) => T;
+    internalServerException: (value: InternalServerException) => T;
+    _: (name: string, value: any) => T;
+  }
+
+  export const visit = <T>(
+    value: ResultArchiveStream,
+    visitor: Visitor<T>
+  ): T => {
+    if (value.binaryMetadataEvent !== undefined) return visitor.binaryMetadataEvent(value.binaryMetadataEvent);
+    if (value.binaryPayloadEvent !== undefined) return visitor.binaryPayloadEvent(value.binaryPayloadEvent);
+    if (value.internalServerException !== undefined) return visitor.internalServerException(value.internalServerException);
+    return visitor._(value.$unknown[0], value.$unknown[1]);
+  }
+
+}
+/**
+ * @internal
+ */
+export const ResultArchiveStreamFilterSensitiveLog = (obj: ResultArchiveStream): any => {
+  if (obj.binaryMetadataEvent !== undefined) return {binaryMetadataEvent:
+    SENSITIVE_STRING
+  };
+  if (obj.binaryPayloadEvent !== undefined) return {binaryPayloadEvent:
+    SENSITIVE_STRING
+  };
+  if (obj.internalServerException !== undefined) return {internalServerException:
+    obj.internalServerException
+  };
+  if (obj.$unknown !== undefined) return {[obj.$unknown[0]]: 'UNKNOWN'};
+}
+
+/**
+ * This exception is thrown when request was denied due to caller exceeding their usage limits
+ * @public
+ */
+export class ServiceQuotaExceededException extends __BaseException {
+  readonly name: "ServiceQuotaExceededException" = "ServiceQuotaExceededException";
+  readonly $fault: "client" = "client";
+  /**
+   * @internal
+   */
+  constructor(opts: __ExceptionOptionType<ServiceQuotaExceededException, __BaseException>) {
+    super({
+      name: "ServiceQuotaExceededException",
+      $fault: "client",
+      ...opts
+    });
+    Object.setPrototypeOf(this, ServiceQuotaExceededException.prototype);
+  }
+}
+
+/**
+ * Represents a Workspace state uploaded to S3 for Async Code Actions
+ * @public
+ */
+export interface WorkspaceState {
+  /**
+   * Upload ID representing an Upload using a PreSigned URL
+   * @public
+   */
+  uploadId: string | undefined;
+
+  /**
+   * Primary programming language of the Workspace
+   * @public
+   */
+  programmingLanguage: ProgrammingLanguage | undefined;
+
+  /**
+   * Workspace context truncation schemes based on usecase
+   * @public
+   */
+  contextTruncationScheme?: ContextTruncationScheme | undefined;
+}
+
+/**
+ * Structure to represent a new generate assistant response request.
+ * @public
+ */
+export interface GenerateAssistantResponseRequest {
+  /**
+   * Structure to represent the current state of a chat conversation.
+   * @public
+   */
+  conversationState: ConversationState | undefined;
+
+  profileArn?: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const GenerateAssistantResponseRequestFilterSensitiveLog = (obj: GenerateAssistantResponseRequest): any => ({
+  ...obj,
+  ...(obj.conversationState && { conversationState:
+    ConversationStateFilterSensitiveLog(obj.conversationState)
+  }),
+})
+
+/**
+ * Structure to represent generate assistant response response.
+ * @public
+ */
+export interface GenerateAssistantResponseResponse {
+  /**
+   * ID which represents a multi-turn conversation
+   * @public
+   */
+  conversationId: string | undefined;
+
+  /**
+   * Streaming events from UniDirectional Streaming Conversational APIs.
+   * @public
+   */
+  generateAssistantResponseResponse: AsyncIterable<ChatResponseStream> | undefined;
+}
+
+/**
+ * @internal
+ */
+export const GenerateAssistantResponseResponseFilterSensitiveLog = (obj: GenerateAssistantResponseResponse): any => ({
+  ...obj,
+  ...(obj.generateAssistantResponseResponse && { generateAssistantResponseResponse:
+    'STREAMING_CONTENT'
+  }),
+})
+
+/**
+ * Structure to represent a new ExportResultArchive request.
+ * @public
+ */
+export interface ExportResultArchiveRequest {
+  exportId: string | undefined;
+  /**
+   * Export Intent
+   * @public
+   */
+  exportIntent: ExportIntent | undefined;
+
+  /**
+   * Export Context
+   * @public
+   */
+  exportContext?: ExportContext | undefined;
+
+  profileArn?: string | undefined;
+}
+
+/**
+ * Structure to represent ExportResultArchive response.
+ * @public
+ */
+export interface ExportResultArchiveResponse {
+  /**
+   * Response Stream
+   * @public
+   */
+  body: AsyncIterable<ResultArchiveStream> | undefined;
+}
+
+/**
+ * @internal
+ */
+export const ExportResultArchiveResponseFilterSensitiveLog = (obj: ExportResultArchiveResponse): any => ({
+  ...obj,
+  ...(obj.body && { body:
+    'STREAMING_CONTENT'
+  }),
+})
+
+/**
+ * Structure to represent a SendMessage request.
+ * @public
+ */
+export interface SendMessageRequest {
+  /**
+   * Structure to represent the current state of a chat conversation.
+   * @public
+   */
+  conversationState: ConversationState | undefined;
+
+  profileArn?: string | undefined;
+  /**
+   * The origin of the caller
+   * @public
+   */
+  source?: Origin | undefined;
+
+  dryRun?: boolean | undefined;
+}
+
+/**
+ * @internal
+ */
+export const SendMessageRequestFilterSensitiveLog = (obj: SendMessageRequest): any => ({
+  ...obj,
+  ...(obj.conversationState && { conversationState:
+    ConversationStateFilterSensitiveLog(obj.conversationState)
+  }),
+})
+
+/**
+ * Structure to represent a SendMessage response.
+ * @public
+ */
+export interface SendMessageResponse {
+  /**
+   * Streaming events from UniDirectional Streaming Conversational APIs.
+   * @public
+   */
+  sendMessageResponse: AsyncIterable<ChatResponseStream> | undefined;
+}
+
+/**
+ * @internal
+ */
+export const SendMessageResponseFilterSensitiveLog = (obj: SendMessageResponse): any => ({
+  ...obj,
+  ...(obj.sendMessageResponse && { sendMessageResponse:
+    'STREAMING_CONTENT'
+  }),
+})
+
+/**
+ * Structure to represent execute planning interaction request.
+ * @public
+ */
+export interface GenerateTaskAssistPlanRequest {
+  /**
+   * Structure to represent the current state of a chat conversation.
+   * @public
+   */
+  conversationState: ConversationState | undefined;
+
+  /**
+   * Represents a Workspace state uploaded to S3 for Async Code Actions
+   * @public
+   */
+  workspaceState: WorkspaceState | undefined;
+
+  profileArn?: string | undefined;
+}
+
+/**
+ * @internal
+ */
+export const GenerateTaskAssistPlanRequestFilterSensitiveLog = (obj: GenerateTaskAssistPlanRequest): any => ({
+  ...obj,
+  ...(obj.conversationState && { conversationState:
+    ConversationStateFilterSensitiveLog(obj.conversationState)
+  }),
+})
+
+/**
+ * Structure to represent execute planning interaction response.
+ * @public
+ */
+export interface GenerateTaskAssistPlanResponse {
+  /**
+   * Streaming events from UniDirectional Streaming Conversational APIs.
+   * @public
+   */
+  planningResponseStream?: AsyncIterable<ChatResponseStream> | undefined;
+}
+
+/**
+ * @internal
+ */
+export const GenerateTaskAssistPlanResponseFilterSensitiveLog = (obj: GenerateTaskAssistPlanResponse): any => ({
+  ...obj,
+  ...(obj.planningResponseStream && { planningResponseStream:
+    'STREAMING_CONTENT'
+  }),
+})
diff --git a/src.gen/@amzn/codewhisperer-streaming/src/protocols/Aws_restJson1.ts b/src.gen/@amzn/codewhisperer-streaming/src/protocols/Aws_restJson1.ts
new file mode 100644
index 00000000000..e6cb747b960
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/src/protocols/Aws_restJson1.ts
@@ -0,0 +1,1294 @@
+// smithy-typescript generated code
+import {
+  ExportResultArchiveCommandInput,
+  ExportResultArchiveCommandOutput,
+} from "../commands/ExportResultArchiveCommand";
+import {
+  GenerateAssistantResponseCommandInput,
+  GenerateAssistantResponseCommandOutput,
+} from "../commands/GenerateAssistantResponseCommand";
+import {
+  GenerateTaskAssistPlanCommandInput,
+  GenerateTaskAssistPlanCommandOutput,
+} from "../commands/GenerateTaskAssistPlanCommand";
+import {
+  SendMessageCommandInput,
+  SendMessageCommandOutput,
+} from "../commands/SendMessageCommand";
+import { CodeWhispererStreamingServiceException as __BaseException } from "../models/CodeWhispererStreamingServiceException";
+import {
+  AccessDeniedException,
+  AdditionalContentEntry,
+  AppStudioState,
+  AssistantResponseEvent,
+  AssistantResponseMessage,
+  BinaryMetadataEvent,
+  BinaryPayloadEvent,
+  ChatMessage,
+  ChatResponseStream,
+  CitationEvent,
+  CodeEvent,
+  CodeReferenceEvent,
+  ConflictException,
+  ConsoleState,
+  ConversationState,
+  CursorState,
+  Diagnostic,
+  DocumentSymbol,
+  DryRunOperationException,
+  DryRunSucceedEvent,
+  EditorState,
+  EnvState,
+  EnvironmentVariable,
+  ExportContext,
+  FollowupPrompt,
+  FollowupPromptEvent,
+  GitState,
+  ImageBlock,
+  ImageSource,
+  IntentsEvent,
+  InteractionComponent,
+  InteractionComponentEntry,
+  InteractionComponentsEvent,
+  InternalServerException,
+  InvalidStateEvent,
+  MessageMetadataEvent,
+  Position,
+  ProgrammingLanguage,
+  Range,
+  Reference,
+  RelevantTextDocument,
+  ResourceNotFoundException,
+  ResultArchiveStream,
+  RuntimeDiagnostic,
+  ServiceQuotaExceededException,
+  ShellHistoryEntry,
+  ShellState,
+  Span,
+  SupplementaryWebLink,
+  SupplementaryWebLinksEvent,
+  TextDocument,
+  TextDocumentDiagnostic,
+  ThrottlingException,
+  Tool,
+  ToolInputSchema,
+  ToolResult,
+  ToolResultContentBlock,
+  ToolSpecification,
+  ToolUse,
+  ToolUseEvent,
+  TransformationExportContext,
+  UnitTestGenerationExportContext,
+  UserInputMessage,
+  UserInputMessageContext,
+  UserSettings,
+  ValidationException,
+  WorkspaceState,
+} from "../models/models_0";
+import {
+  loadRestJsonErrorCode,
+  parseJsonBody as parseBody,
+  parseJsonErrorBody as parseErrorBody,
+} from "@aws-sdk/core";
+import { requestBuilder as rb } from "@smithy/core";
+import {
+  HttpRequest as __HttpRequest,
+  HttpResponse as __HttpResponse,
+} from "@smithy/protocol-http";
+import {
+  decorateServiceException as __decorateServiceException,
+  expectString as __expectString,
+  _json,
+  collectBody,
+  map,
+  take,
+  withBaseException,
+} from "@smithy/smithy-client";
+import {
+  DocumentType as __DocumentType,
+  Endpoint as __Endpoint,
+  EventStreamSerdeContext as __EventStreamSerdeContext,
+  ResponseMetadata as __ResponseMetadata,
+  SerdeContext as __SerdeContext,
+} from "@smithy/types";
+import { v4 as generateIdempotencyToken } from "uuid";
+
+/**
+ * serializeAws_restJson1ExportResultArchiveCommand
+ */
+export const se_ExportResultArchiveCommand = async(
+  input: ExportResultArchiveCommandInput,
+  context: __SerdeContext
+): Promise<__HttpRequest> => {
+  const b = rb(input, context);
+  const headers: any = {
+    'content-type': 'application/json',
+  };
+  b.bp("/exportResultArchive");
+  let body: any;
+  body = JSON.stringify(take(input, {
+    'exportContext': _ => _json(_),
+    'exportId': [],
+    'exportIntent': [],
+    'profileArn': [],
+  }));
+  b.m("POST")
+  .h(headers)
+  .b(body);
+  return b.build();
+}
+
+/**
+ * serializeAws_restJson1GenerateAssistantResponseCommand
+ */
+export const se_GenerateAssistantResponseCommand = async(
+  input: GenerateAssistantResponseCommandInput,
+  context: __SerdeContext
+): Promise<__HttpRequest> => {
+  const b = rb(input, context);
+  const headers: any = {
+    'content-type': 'application/json',
+  };
+  b.bp("/generateAssistantResponse");
+  let body: any;
+  body = JSON.stringify(take(input, {
+    'conversationState': _ => se_ConversationState(_, context),
+    'profileArn': [],
+  }));
+  b.m("POST")
+  .h(headers)
+  .b(body);
+  return b.build();
+}
+
+/**
+ * serializeAws_restJson1GenerateTaskAssistPlanCommand
+ */
+export const se_GenerateTaskAssistPlanCommand = async(
+  input: GenerateTaskAssistPlanCommandInput,
+  context: __SerdeContext
+): Promise<__HttpRequest> => {
+  const b = rb(input, context);
+  const headers: any = {
+    'content-type': 'application/json',
+  };
+  b.bp("/generateTaskAssistPlan");
+  let body: any;
+  body = JSON.stringify(take(input, {
+    'conversationState': _ => se_ConversationState(_, context),
+    'profileArn': [],
+    'workspaceState': _ => _json(_),
+  }));
+  b.m("POST")
+  .h(headers)
+  .b(body);
+  return b.build();
+}
+
+/**
+ * serializeAws_restJson1SendMessageCommand
+ */
+export const se_SendMessageCommand = async(
+  input: SendMessageCommandInput,
+  context: __SerdeContext
+): Promise<__HttpRequest> => {
+  const b = rb(input, context);
+  const headers: any = {
+    'content-type': 'application/json',
+  };
+  b.bp("/SendMessageStreaming");
+  let body: any;
+  body = JSON.stringify(take(input, {
+    'conversationState': _ => se_ConversationState(_, context),
+    'dryRun': [],
+    'profileArn': [],
+    'source': [],
+  }));
+  b.m("POST")
+  .h(headers)
+  .b(body);
+  return b.build();
+}
+
+/**
+ * deserializeAws_restJson1ExportResultArchiveCommand
+ */
+export const de_ExportResultArchiveCommand = async(
+  output: __HttpResponse,
+  context: __SerdeContext & __EventStreamSerdeContext
+): Promise<ExportResultArchiveCommandOutput> => {
+  if (output.statusCode !== 200 && output.statusCode >= 300) {
+    return de_CommandError(output, context);
+  }
+  const contents: any = map({
+    $metadata: deserializeMetadata(output),
+  });
+  const data: any = output.body;
+  contents.body = de_ResultArchiveStream(data, context);
+  return contents;
+}
+
+/**
+ * deserializeAws_restJson1GenerateAssistantResponseCommand
+ */
+export const de_GenerateAssistantResponseCommand = async(
+  output: __HttpResponse,
+  context: __SerdeContext & __EventStreamSerdeContext
+): Promise<GenerateAssistantResponseCommandOutput> => {
+  if (output.statusCode !== 200 && output.statusCode >= 300) {
+    return de_CommandError(output, context);
+  }
+  const contents: any = map({
+    $metadata: deserializeMetadata(output),
+    [_cI]: [, output.headers[_xacci]],
+  });
+  const data: any = output.body;
+  contents.generateAssistantResponseResponse = de_ChatResponseStream(data, context);
+  return contents;
+}
+
+/**
+ * deserializeAws_restJson1GenerateTaskAssistPlanCommand
+ */
+export const de_GenerateTaskAssistPlanCommand = async(
+  output: __HttpResponse,
+  context: __SerdeContext & __EventStreamSerdeContext
+): Promise<GenerateTaskAssistPlanCommandOutput> => {
+  if (output.statusCode !== 200 && output.statusCode >= 300) {
+    return de_CommandError(output, context);
+  }
+  const contents: any = map({
+    $metadata: deserializeMetadata(output),
+  });
+  const data: any = output.body;
+  contents.planningResponseStream = de_ChatResponseStream(data, context);
+  return contents;
+}
+
+/**
+ * deserializeAws_restJson1SendMessageCommand
+ */
+export const de_SendMessageCommand = async(
+  output: __HttpResponse,
+  context: __SerdeContext & __EventStreamSerdeContext
+): Promise<SendMessageCommandOutput> => {
+  if (output.statusCode !== 200 && output.statusCode >= 300) {
+    return de_CommandError(output, context);
+  }
+  const contents: any = map({
+    $metadata: deserializeMetadata(output),
+  });
+  const data: any = output.body;
+  contents.sendMessageResponse = de_ChatResponseStream(data, context);
+  return contents;
+}
+
+/**
+ * deserialize_Aws_restJson1CommandError
+ */
+const de_CommandError = async(
+  output: __HttpResponse,
+  context: __SerdeContext,
+): Promise<never> => {
+  const parsedOutput: any = {
+    ...output,
+    body: await parseErrorBody(output.body, context)
+  };
+  const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
+  switch (errorCode) {
+    case "AccessDeniedException":
+    case "com.amazon.aws.codewhisperer#AccessDeniedException":
+      throw await de_AccessDeniedExceptionRes(parsedOutput, context);
+    case "ConflictException":
+    case "com.amazon.aws.codewhisperer#ConflictException":
+      throw await de_ConflictExceptionRes(parsedOutput, context);
+    case "InternalServerException":
+    case "com.amazon.aws.codewhisperer#InternalServerException":
+      throw await de_InternalServerExceptionRes(parsedOutput, context);
+    case "ResourceNotFoundException":
+    case "com.amazon.aws.codewhisperer#ResourceNotFoundException":
+      throw await de_ResourceNotFoundExceptionRes(parsedOutput, context);
+    case "ThrottlingException":
+    case "com.amazon.aws.codewhisperer#ThrottlingException":
+      throw await de_ThrottlingExceptionRes(parsedOutput, context);
+    case "ValidationException":
+    case "com.amazon.aws.codewhisperer#ValidationException":
+      throw await de_ValidationExceptionRes(parsedOutput, context);
+    case "ServiceQuotaExceededException":
+    case "com.amazon.aws.codewhisperer#ServiceQuotaExceededException":
+      throw await de_ServiceQuotaExceededExceptionRes(parsedOutput, context);
+    case "DryRunOperationException":
+    case "com.amazon.aws.codewhisperer#DryRunOperationException":
+      throw await de_DryRunOperationExceptionRes(parsedOutput, context);
+    default:
+      const parsedBody = parsedOutput.body;
+      return throwDefaultError({
+        output,
+        parsedBody,
+        errorCode
+      }) as never
+    }
+  }
+
+  const throwDefaultError = withBaseException(__BaseException);
+  /**
+   * deserializeAws_restJson1AccessDeniedExceptionRes
+   */
+  const de_AccessDeniedExceptionRes = async (
+    parsedOutput: any,
+    context: __SerdeContext
+  ): Promise<AccessDeniedException> => {
+    const contents: any = map({
+    });
+    const data: any = parsedOutput.body;
+    const doc = take(data, {
+      'message': __expectString,
+      'reason': __expectString,
+    });
+    Object.assign(contents, doc);
+    const exception = new AccessDeniedException({
+      $metadata: deserializeMetadata(parsedOutput),
+      ...contents
+    });
+    return __decorateServiceException(exception, parsedOutput.body);
+  };
+
+  /**
+   * deserializeAws_restJson1ConflictExceptionRes
+   */
+  const de_ConflictExceptionRes = async (
+    parsedOutput: any,
+    context: __SerdeContext
+  ): Promise<ConflictException> => {
+    const contents: any = map({
+    });
+    const data: any = parsedOutput.body;
+    const doc = take(data, {
+      'message': __expectString,
+      'reason': __expectString,
+    });
+    Object.assign(contents, doc);
+    const exception = new ConflictException({
+      $metadata: deserializeMetadata(parsedOutput),
+      ...contents
+    });
+    return __decorateServiceException(exception, parsedOutput.body);
+  };
+
+  /**
+   * deserializeAws_restJson1DryRunOperationExceptionRes
+   */
+  const de_DryRunOperationExceptionRes = async (
+    parsedOutput: any,
+    context: __SerdeContext
+  ): Promise<DryRunOperationException> => {
+    const contents: any = map({
+    });
+    const data: any = parsedOutput.body;
+    const doc = take(data, {
+      'message': __expectString,
+    });
+    Object.assign(contents, doc);
+    const exception = new DryRunOperationException({
+      $metadata: deserializeMetadata(parsedOutput),
+      ...contents
+    });
+    return __decorateServiceException(exception, parsedOutput.body);
+  };
+
+  /**
+   * deserializeAws_restJson1InternalServerExceptionRes
+   */
+  const de_InternalServerExceptionRes = async (
+    parsedOutput: any,
+    context: __SerdeContext
+  ): Promise<InternalServerException> => {
+    const contents: any = map({
+    });
+    const data: any = parsedOutput.body;
+    const doc = take(data, {
+      'message': __expectString,
+    });
+    Object.assign(contents, doc);
+    const exception = new InternalServerException({
+      $metadata: deserializeMetadata(parsedOutput),
+      ...contents
+    });
+    return __decorateServiceException(exception, parsedOutput.body);
+  };
+
+  /**
+   * deserializeAws_restJson1ResourceNotFoundExceptionRes
+   */
+  const de_ResourceNotFoundExceptionRes = async (
+    parsedOutput: any,
+    context: __SerdeContext
+  ): Promise<ResourceNotFoundException> => {
+    const contents: any = map({
+    });
+    const data: any = parsedOutput.body;
+    const doc = take(data, {
+      'message': __expectString,
+    });
+    Object.assign(contents, doc);
+    const exception = new ResourceNotFoundException({
+      $metadata: deserializeMetadata(parsedOutput),
+      ...contents
+    });
+    return __decorateServiceException(exception, parsedOutput.body);
+  };
+
+  /**
+   * deserializeAws_restJson1ServiceQuotaExceededExceptionRes
+   */
+  const de_ServiceQuotaExceededExceptionRes = async (
+    parsedOutput: any,
+    context: __SerdeContext
+  ): Promise<ServiceQuotaExceededException> => {
+    const contents: any = map({
+    });
+    const data: any = parsedOutput.body;
+    const doc = take(data, {
+      'message': __expectString,
+    });
+    Object.assign(contents, doc);
+    const exception = new ServiceQuotaExceededException({
+      $metadata: deserializeMetadata(parsedOutput),
+      ...contents
+    });
+    return __decorateServiceException(exception, parsedOutput.body);
+  };
+
+  /**
+   * deserializeAws_restJson1ThrottlingExceptionRes
+   */
+  const de_ThrottlingExceptionRes = async (
+    parsedOutput: any,
+    context: __SerdeContext
+  ): Promise<ThrottlingException> => {
+    const contents: any = map({
+    });
+    const data: any = parsedOutput.body;
+    const doc = take(data, {
+      'message': __expectString,
+      'reason': __expectString,
+    });
+    Object.assign(contents, doc);
+    const exception = new ThrottlingException({
+      $metadata: deserializeMetadata(parsedOutput),
+      ...contents
+    });
+    return __decorateServiceException(exception, parsedOutput.body);
+  };
+
+  /**
+   * deserializeAws_restJson1ValidationExceptionRes
+   */
+  const de_ValidationExceptionRes = async (
+    parsedOutput: any,
+    context: __SerdeContext
+  ): Promise<ValidationException> => {
+    const contents: any = map({
+    });
+    const data: any = parsedOutput.body;
+    const doc = take(data, {
+      'message': __expectString,
+      'reason': __expectString,
+    });
+    Object.assign(contents, doc);
+    const exception = new ValidationException({
+      $metadata: deserializeMetadata(parsedOutput),
+      ...contents
+    });
+    return __decorateServiceException(exception, parsedOutput.body);
+  };
+
+  /**
+   * deserializeAws_restJson1ChatResponseStream
+   */
+  const de_ChatResponseStream = (
+    output: any,
+    context: __SerdeContext & __EventStreamSerdeContext
+  ): AsyncIterable<ChatResponseStream> => {
+    return context.eventStreamMarshaller.deserialize(
+      output,
+      async event => {
+        if (event["messageMetadataEvent"] != null) {
+          return {
+            messageMetadataEvent: await de_MessageMetadataEvent_event(event["messageMetadataEvent"], context),
+          };
+        }
+        if (event["assistantResponseEvent"] != null) {
+          return {
+            assistantResponseEvent: await de_AssistantResponseEvent_event(event["assistantResponseEvent"], context),
+          };
+        }
+        if (event["dryRunSucceedEvent"] != null) {
+          return {
+            dryRunSucceedEvent: await de_DryRunSucceedEvent_event(event["dryRunSucceedEvent"], context),
+          };
+        }
+        if (event["codeReferenceEvent"] != null) {
+          return {
+            codeReferenceEvent: await de_CodeReferenceEvent_event(event["codeReferenceEvent"], context),
+          };
+        }
+        if (event["supplementaryWebLinksEvent"] != null) {
+          return {
+            supplementaryWebLinksEvent: await de_SupplementaryWebLinksEvent_event(event["supplementaryWebLinksEvent"], context),
+          };
+        }
+        if (event["followupPromptEvent"] != null) {
+          return {
+            followupPromptEvent: await de_FollowupPromptEvent_event(event["followupPromptEvent"], context),
+          };
+        }
+        if (event["codeEvent"] != null) {
+          return {
+            codeEvent: await de_CodeEvent_event(event["codeEvent"], context),
+          };
+        }
+        if (event["intentsEvent"] != null) {
+          return {
+            intentsEvent: await de_IntentsEvent_event(event["intentsEvent"], context),
+          };
+        }
+        if (event["interactionComponentsEvent"] != null) {
+          return {
+            interactionComponentsEvent: await de_InteractionComponentsEvent_event(event["interactionComponentsEvent"], context),
+          };
+        }
+        if (event["toolUseEvent"] != null) {
+          return {
+            toolUseEvent: await de_ToolUseEvent_event(event["toolUseEvent"], context),
+          };
+        }
+        if (event["citationEvent"] != null) {
+          return {
+            citationEvent: await de_CitationEvent_event(event["citationEvent"], context),
+          };
+        }
+        if (event["invalidStateEvent"] != null) {
+          return {
+            invalidStateEvent: await de_InvalidStateEvent_event(event["invalidStateEvent"], context),
+          };
+        }
+        if (event["error"] != null) {
+          return {
+            error: await de_InternalServerException_event(event["error"], context),
+          };
+        }
+        return {$unknown: output};
+      }
+    );
+  }
+  /**
+   * deserializeAws_restJson1ResultArchiveStream
+   */
+  const de_ResultArchiveStream = (
+    output: any,
+    context: __SerdeContext & __EventStreamSerdeContext
+  ): AsyncIterable<ResultArchiveStream> => {
+    return context.eventStreamMarshaller.deserialize(
+      output,
+      async event => {
+        if (event["binaryMetadataEvent"] != null) {
+          return {
+            binaryMetadataEvent: await de_BinaryMetadataEvent_event(event["binaryMetadataEvent"], context),
+          };
+        }
+        if (event["binaryPayloadEvent"] != null) {
+          return {
+            binaryPayloadEvent: await de_BinaryPayloadEvent_event(event["binaryPayloadEvent"], context),
+          };
+        }
+        if (event["internalServerException"] != null) {
+          return {
+            internalServerException: await de_InternalServerException_event(event["internalServerException"], context),
+          };
+        }
+        return {$unknown: output};
+      }
+    );
+  }
+  const de_AssistantResponseEvent_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<AssistantResponseEvent> => {
+    const contents: AssistantResponseEvent = {} as any;
+    const data: any = await parseBody(output.body, context);
+    Object.assign(contents, _json(data));
+    return contents;
+  }
+  const de_BinaryMetadataEvent_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<BinaryMetadataEvent> => {
+    const contents: BinaryMetadataEvent = {} as any;
+    const data: any = await parseBody(output.body, context);
+    Object.assign(contents, _json(data));
+    return contents;
+  }
+  const de_BinaryPayloadEvent_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<BinaryPayloadEvent> => {
+    const contents: BinaryPayloadEvent = {} as any;
+    const data: any = await parseBody(output.body, context);
+    Object.assign(contents, de_BinaryPayloadEvent(data, context));
+    return contents;
+  }
+  const de_CitationEvent_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<CitationEvent> => {
+    const contents: CitationEvent = {} as any;
+    const data: any = await parseBody(output.body, context);
+    Object.assign(contents, _json(data));
+    return contents;
+  }
+  const de_CodeEvent_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<CodeEvent> => {
+    const contents: CodeEvent = {} as any;
+    const data: any = await parseBody(output.body, context);
+    Object.assign(contents, _json(data));
+    return contents;
+  }
+  const de_CodeReferenceEvent_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<CodeReferenceEvent> => {
+    const contents: CodeReferenceEvent = {} as any;
+    const data: any = await parseBody(output.body, context);
+    Object.assign(contents, _json(data));
+    return contents;
+  }
+  const de_DryRunSucceedEvent_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<DryRunSucceedEvent> => {
+    const contents: DryRunSucceedEvent = {} as any;
+    const data: any = await parseBody(output.body, context);
+    Object.assign(contents, _json(data));
+    return contents;
+  }
+  const de_FollowupPromptEvent_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<FollowupPromptEvent> => {
+    const contents: FollowupPromptEvent = {} as any;
+    const data: any = await parseBody(output.body, context);
+    Object.assign(contents, _json(data));
+    return contents;
+  }
+  const de_IntentsEvent_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<IntentsEvent> => {
+    const contents: IntentsEvent = {} as any;
+    const data: any = await parseBody(output.body, context);
+    Object.assign(contents, _json(data));
+    return contents;
+  }
+  const de_InternalServerException_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<InternalServerException> => {
+    const parsedOutput: any = {
+      ...output,
+      body: await parseBody(output.body, context)
+    };
+    return de_InternalServerExceptionRes(parsedOutput, context);
+  }
+  const de_InvalidStateEvent_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<InvalidStateEvent> => {
+    const contents: InvalidStateEvent = {} as any;
+    const data: any = await parseBody(output.body, context);
+    Object.assign(contents, _json(data));
+    return contents;
+  }
+  const de_MessageMetadataEvent_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<MessageMetadataEvent> => {
+    const contents: MessageMetadataEvent = {} as any;
+    const data: any = await parseBody(output.body, context);
+    Object.assign(contents, _json(data));
+    return contents;
+  }
+  const de_SupplementaryWebLinksEvent_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<SupplementaryWebLinksEvent> => {
+    const contents: SupplementaryWebLinksEvent = {} as any;
+    const data: any = await parseBody(output.body, context);
+    Object.assign(contents, _json(data));
+    return contents;
+  }
+  const de_ToolUseEvent_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<ToolUseEvent> => {
+    const contents: ToolUseEvent = {} as any;
+    const data: any = await parseBody(output.body, context);
+    Object.assign(contents, _json(data));
+    return contents;
+  }
+  const de_InteractionComponentsEvent_event = async (
+    output: any,
+    context: __SerdeContext
+  ): Promise<InteractionComponentsEvent> => {
+    const contents: InteractionComponentsEvent = {} as any;
+    const data: any = await parseBody(output.body, context);
+    Object.assign(contents, de_InteractionComponentsEvent(data, context));
+    return contents;
+  }
+  // se_AdditionalContentEntry omitted.
+
+  // se_AdditionalContentList omitted.
+
+  // se_AppStudioState omitted.
+
+  /**
+   * serializeAws_restJson1AssistantResponseMessage
+   */
+  const se_AssistantResponseMessage = (
+    input: AssistantResponseMessage,
+    context: __SerdeContext
+  ): any => {
+    return take(input, {
+      'content': [],
+      'followupPrompt': _json,
+      'messageId': [],
+      'references': _json,
+      'supplementaryWebLinks': _json,
+      'toolUses': _ => se_ToolUses(_, context),
+    });
+  }
+
+  /**
+   * serializeAws_restJson1ChatHistory
+   */
+  const se_ChatHistory = (
+    input: (ChatMessage)[],
+    context: __SerdeContext
+  ): any => {
+    return input.filter((e: any) => e != null).map(entry => {
+      return se_ChatMessage(entry, context);
+    });
+  }
+
+  /**
+   * serializeAws_restJson1ChatMessage
+   */
+  const se_ChatMessage = (
+    input: ChatMessage,
+    context: __SerdeContext
+  ): any => {
+    return ChatMessage.visit(input, {
+      assistantResponseMessage: value => ({ "assistantResponseMessage": se_AssistantResponseMessage(value, context) }),
+      userInputMessage: value => ({ "userInputMessage": se_UserInputMessage(value, context) }),
+      _: (name, value) => ({ name: value } as any)
+    });
+  }
+
+  // se_ConsoleState omitted.
+
+  /**
+   * serializeAws_restJson1ConversationState
+   */
+  const se_ConversationState = (
+    input: ConversationState,
+    context: __SerdeContext
+  ): any => {
+    return take(input, {
+      'chatTriggerType': [],
+      'conversationId': [],
+      'currentMessage': _ => se_ChatMessage(_, context),
+      'customizationArn': [],
+      'history': _ => se_ChatHistory(_, context),
+    });
+  }
+
+  // se_CursorState omitted.
+
+  // se_Diagnostic omitted.
+
+  // se_DocumentSymbol omitted.
+
+  // se_DocumentSymbols omitted.
+
+  // se_EditorState omitted.
+
+  // se_EnvironmentVariable omitted.
+
+  // se_EnvironmentVariables omitted.
+
+  // se_EnvState omitted.
+
+  // se_ExportContext omitted.
+
+  // se_FollowupPrompt omitted.
+
+  // se_GitState omitted.
+
+  /**
+   * serializeAws_restJson1ImageBlock
+   */
+  const se_ImageBlock = (
+    input: ImageBlock,
+    context: __SerdeContext
+  ): any => {
+    return take(input, {
+      'format': [],
+      'source': _ => se_ImageSource(_, context),
+    });
+  }
+
+  /**
+   * serializeAws_restJson1ImageBlocks
+   */
+  const se_ImageBlocks = (
+    input: (ImageBlock)[],
+    context: __SerdeContext
+  ): any => {
+    return input.filter((e: any) => e != null).map(entry => {
+      return se_ImageBlock(entry, context);
+    });
+  }
+
+  /**
+   * serializeAws_restJson1ImageSource
+   */
+  const se_ImageSource = (
+    input: ImageSource,
+    context: __SerdeContext
+  ): any => {
+    return ImageSource.visit(input, {
+      bytes: value => ({ "bytes": context.base64Encoder(value) }),
+      _: (name, value) => ({ name: value } as any)
+    });
+  }
+
+  // se_Position omitted.
+
+  // se_ProgrammingLanguage omitted.
+
+  // se_Range omitted.
+
+  // se_Reference omitted.
+
+  // se_References omitted.
+
+  // se_RelevantDocumentList omitted.
+
+  // se_RelevantTextDocument omitted.
+
+  // se_RuntimeDiagnostic omitted.
+
+  /**
+   * serializeAws_restJson1SensitiveDocument
+   */
+  const se_SensitiveDocument = (
+    input: __DocumentType,
+    context: __SerdeContext
+  ): any => {
+    return input;
+  }
+
+  // se_ShellHistory omitted.
+
+  // se_ShellHistoryEntry omitted.
+
+  // se_ShellState omitted.
+
+  // se_Span omitted.
+
+  // se_SupplementaryWebLink omitted.
+
+  // se_SupplementaryWebLinks omitted.
+
+  // se_TextDocument omitted.
+
+  // se_TextDocumentDiagnostic omitted.
+
+  /**
+   * serializeAws_restJson1Tool
+   */
+  const se_Tool = (
+    input: Tool,
+    context: __SerdeContext
+  ): any => {
+    return Tool.visit(input, {
+      toolSpecification: value => ({ "toolSpecification": se_ToolSpecification(value, context) }),
+      _: (name, value) => ({ name: value } as any)
+    });
+  }
+
+  /**
+   * serializeAws_restJson1ToolInputSchema
+   */
+  const se_ToolInputSchema = (
+    input: ToolInputSchema,
+    context: __SerdeContext
+  ): any => {
+    return take(input, {
+      'json': _ => se_SensitiveDocument(_, context),
+    });
+  }
+
+  /**
+   * serializeAws_restJson1ToolResult
+   */
+  const se_ToolResult = (
+    input: ToolResult,
+    context: __SerdeContext
+  ): any => {
+    return take(input, {
+      'content': _ => se_ToolResultContent(_, context),
+      'status': [],
+      'toolUseId': [],
+    });
+  }
+
+  /**
+   * serializeAws_restJson1ToolResultContent
+   */
+  const se_ToolResultContent = (
+    input: (ToolResultContentBlock)[],
+    context: __SerdeContext
+  ): any => {
+    return input.filter((e: any) => e != null).map(entry => {
+      return se_ToolResultContentBlock(entry, context);
+    });
+  }
+
+  /**
+   * serializeAws_restJson1ToolResultContentBlock
+   */
+  const se_ToolResultContentBlock = (
+    input: ToolResultContentBlock,
+    context: __SerdeContext
+  ): any => {
+    return ToolResultContentBlock.visit(input, {
+      json: value => ({ "json": se_SensitiveDocument(value, context) }),
+      text: value => ({ "text": value }),
+      _: (name, value) => ({ name: value } as any)
+    });
+  }
+
+  /**
+   * serializeAws_restJson1ToolResults
+   */
+  const se_ToolResults = (
+    input: (ToolResult)[],
+    context: __SerdeContext
+  ): any => {
+    return input.filter((e: any) => e != null).map(entry => {
+      return se_ToolResult(entry, context);
+    });
+  }
+
+  /**
+   * serializeAws_restJson1Tools
+   */
+  const se_Tools = (
+    input: (Tool)[],
+    context: __SerdeContext
+  ): any => {
+    return input.filter((e: any) => e != null).map(entry => {
+      return se_Tool(entry, context);
+    });
+  }
+
+  /**
+   * serializeAws_restJson1ToolSpecification
+   */
+  const se_ToolSpecification = (
+    input: ToolSpecification,
+    context: __SerdeContext
+  ): any => {
+    return take(input, {
+      'description': [],
+      'inputSchema': _ => se_ToolInputSchema(_, context),
+      'name': [],
+    });
+  }
+
+  /**
+   * serializeAws_restJson1ToolUse
+   */
+  const se_ToolUse = (
+    input: ToolUse,
+    context: __SerdeContext
+  ): any => {
+    return take(input, {
+      'input': _ => se_SensitiveDocument(_, context),
+      'name': [],
+      'toolUseId': [],
+    });
+  }
+
+  /**
+   * serializeAws_restJson1ToolUses
+   */
+  const se_ToolUses = (
+    input: (ToolUse)[],
+    context: __SerdeContext
+  ): any => {
+    return input.filter((e: any) => e != null).map(entry => {
+      return se_ToolUse(entry, context);
+    });
+  }
+
+  // se_TransformationExportContext omitted.
+
+  // se_UnitTestGenerationExportContext omitted.
+
+  /**
+   * serializeAws_restJson1UserInputMessage
+   */
+  const se_UserInputMessage = (
+    input: UserInputMessage,
+    context: __SerdeContext
+  ): any => {
+    return take(input, {
+      'content': [],
+      'images': _ => se_ImageBlocks(_, context),
+      'origin': [],
+      'userInputMessageContext': _ => se_UserInputMessageContext(_, context),
+      'userIntent': [],
+    });
+  }
+
+  /**
+   * serializeAws_restJson1UserInputMessageContext
+   */
+  const se_UserInputMessageContext = (
+    input: UserInputMessageContext,
+    context: __SerdeContext
+  ): any => {
+    return take(input, {
+      'additionalContext': _json,
+      'appStudioContext': _json,
+      'consoleState': _json,
+      'diagnostic': _json,
+      'editorState': _json,
+      'envState': _json,
+      'gitState': _json,
+      'shellState': _json,
+      'toolResults': _ => se_ToolResults(_, context),
+      'tools': _ => se_Tools(_, context),
+      'userSettings': _json,
+    });
+  }
+
+  // se_UserSettings omitted.
+
+  // se_WorkspaceFolderList omitted.
+
+  // se_WorkspaceState omitted.
+
+  // de_AssistantResponseEvent omitted.
+
+  // de_BinaryMetadataEvent omitted.
+
+  /**
+   * deserializeAws_restJson1BinaryPayloadEvent
+   */
+  const de_BinaryPayloadEvent = (
+    output: any,
+    context: __SerdeContext
+  ): BinaryPayloadEvent => {
+    return take(output, {
+      'bytes': context.base64Decoder,
+    }) as any;
+  }
+
+  // de_CitationEvent omitted.
+
+  // de_CitationTarget omitted.
+
+  // de_CodeEvent omitted.
+
+  // de_CodeReferenceEvent omitted.
+
+  // de_DryRunSucceedEvent omitted.
+
+  // de_FollowupPrompt omitted.
+
+  // de_FollowupPromptEvent omitted.
+
+  // de_IntentData omitted.
+
+  // de_IntentDataType omitted.
+
+  // de_IntentMap omitted.
+
+  // de_IntentsEvent omitted.
+
+  // de_InvalidStateEvent omitted.
+
+  // de_MessageMetadataEvent omitted.
+
+  // de_Reference omitted.
+
+  // de_References omitted.
+
+  // de_Span omitted.
+
+  // de_SupplementaryWebLink omitted.
+
+  // de_SupplementaryWebLinks omitted.
+
+  // de_SupplementaryWebLinksEvent omitted.
+
+  // de_ToolUseEvent omitted.
+
+  /**
+   * deserializeAws_restJson1InteractionComponentsEvent
+   */
+  const de_InteractionComponentsEvent = (
+    output: any,
+    context: __SerdeContext
+  ): InteractionComponentsEvent => {
+    return take(output, {
+      'interactionComponentEntries': (_: any) => de_InteractionComponentEntryList(_, context),
+    }) as any;
+  }
+
+  // de_Action omitted.
+
+  // de_Alert omitted.
+
+  // de_AlertComponent omitted.
+
+  // de_AlertComponentList omitted.
+
+  // de_CloudWatchTroubleshootingLink omitted.
+
+  // de_InfrastructureUpdate omitted.
+
+  // de_InfrastructureUpdateTransition omitted.
+
+  /**
+   * deserializeAws_restJson1InteractionComponent
+   */
+  const de_InteractionComponent = (
+    output: any,
+    context: __SerdeContext
+  ): InteractionComponent => {
+    return take(output, {
+      'action': _json,
+      'alert': _json,
+      'infrastructureUpdate': _json,
+      'progress': _json,
+      'resource': _json,
+      'resourceList': _json,
+      'section': _json,
+      'step': _json,
+      'suggestions': _json,
+      'taskDetails': _json,
+      'taskReference': _json,
+      'text': _json,
+    }) as any;
+  }
+
+  /**
+   * deserializeAws_restJson1InteractionComponentEntry
+   */
+  const de_InteractionComponentEntry = (
+    output: any,
+    context: __SerdeContext
+  ): InteractionComponentEntry => {
+    return take(output, {
+      'interactionComponent': (_: any) => de_InteractionComponent(_, context),
+      'interactionComponentId': __expectString,
+    }) as any;
+  }
+
+  /**
+   * deserializeAws_restJson1InteractionComponentEntryList
+   */
+  const de_InteractionComponentEntryList = (
+    output: any,
+    context: __SerdeContext
+  ): (InteractionComponentEntry)[] => {
+    const retVal = (output || []).filter((e: any) => e != null).map((entry: any) => {
+      return de_InteractionComponentEntry(entry, context);
+    });
+    return retVal;
+  }
+
+  // de_ModuleLink omitted.
+
+  // de_Progress omitted.
+
+  // de_ProgressComponent omitted.
+
+  // de_ProgressComponentList omitted.
+
+  // de_Resource omitted.
+
+  // de_ResourceList omitted.
+
+  // de_Resources omitted.
+
+  // de_Section omitted.
+
+  // de_SectionComponent omitted.
+
+  // de_SectionComponentList omitted.
+
+  // de_Step omitted.
+
+  // de_StepComponent omitted.
+
+  // de_StepComponentList omitted.
+
+  // de_Suggestion omitted.
+
+  // de_SuggestionList omitted.
+
+  // de_Suggestions omitted.
+
+  // de_TaskAction omitted.
+
+  // de_TaskActionConfirmation omitted.
+
+  // de_TaskActionList omitted.
+
+  // de_TaskActionNote omitted.
+
+  // de_TaskActionPayload omitted.
+
+  // de_TaskComponent omitted.
+
+  // de_TaskComponentList omitted.
+
+  // de_TaskDetails omitted.
+
+  // de_TaskOverview omitted.
+
+  // de_TaskReference omitted.
+
+  // de_Text omitted.
+
+  // de_WebLink omitted.
+
+  const deserializeMetadata = (output: __HttpResponse): __ResponseMetadata => ({
+    httpStatusCode: output.statusCode,
+    requestId: output.headers["x-amzn-requestid"] ?? output.headers["x-amzn-request-id"] ?? output.headers["x-amz-request-id"],
+    extendedRequestId: output.headers["x-amz-id-2"],
+    cfId: output.headers["x-amz-cf-id"],
+  });
+
+  // Encode Uint8Array data into string with utf-8.
+  const collectBodyString = (streamBody: any, context: __SerdeContext): Promise<string> => collectBody(streamBody, context).then(body => context.utf8Encoder(body))
+
+  const _cI = "conversationId";
+  const _xacci = "x-amzn-codewhisperer-conversation-id";
diff --git a/src.gen/@amzn/codewhisperer-streaming/src/runtimeConfig.browser.ts b/src.gen/@amzn/codewhisperer-streaming/src/runtimeConfig.browser.ts
new file mode 100644
index 00000000000..c4d80b94bb5
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/src/runtimeConfig.browser.ts
@@ -0,0 +1,51 @@
+// smithy-typescript generated code
+// @ts-ignore: package.json will be imported from dist folders
+import packageInfo from "../package.json"; // eslint-disable-line
+
+import { Sha256 } from "@aws-crypto/sha256-browser";
+import { createDefaultUserAgentProvider } from "@aws-sdk/util-user-agent-browser";
+import {
+  DEFAULT_USE_DUALSTACK_ENDPOINT,
+  DEFAULT_USE_FIPS_ENDPOINT,
+} from "@smithy/config-resolver";
+import { eventStreamSerdeProvider } from "@smithy/eventstream-serde-browser";
+import {
+  FetchHttpHandler as RequestHandler,
+  streamCollector,
+} from "@smithy/fetch-http-handler";
+import { invalidProvider } from "@smithy/invalid-dependency";
+import { calculateBodyLength } from "@smithy/util-body-length-browser";
+import {
+  DEFAULT_MAX_ATTEMPTS,
+  DEFAULT_RETRY_MODE,
+} from "@smithy/util-retry";
+import { CodeWhispererStreamingClientConfig } from "./CodeWhispererStreamingClient";
+import { getRuntimeConfig as getSharedRuntimeConfig } from "./runtimeConfig.shared";
+import { loadConfigsForDefaultMode } from "@smithy/smithy-client";
+import { resolveDefaultsModeConfig } from "@smithy/util-defaults-mode-browser";
+
+/**
+ * @internal
+ */
+export const getRuntimeConfig = (config: CodeWhispererStreamingClientConfig) => {
+  const defaultsMode = resolveDefaultsModeConfig(config);
+  const defaultConfigProvider = () => defaultsMode().then(loadConfigsForDefaultMode);
+  const clientSharedValues = getSharedRuntimeConfig(config);
+  return {
+    ...clientSharedValues,
+    ...config,
+    runtime: "browser",
+    defaultsMode,
+    bodyLengthChecker: config?.bodyLengthChecker ?? calculateBodyLength,
+    defaultUserAgentProvider: config?.defaultUserAgentProvider ?? createDefaultUserAgentProvider({serviceId: clientSharedValues.serviceId, clientVersion: packageInfo.version}),
+    eventStreamSerdeProvider: config?.eventStreamSerdeProvider ?? eventStreamSerdeProvider,
+    maxAttempts: config?.maxAttempts ?? DEFAULT_MAX_ATTEMPTS,
+    region: config?.region ?? invalidProvider("Region is missing"),
+    requestHandler: RequestHandler.create(config?.requestHandler ?? defaultConfigProvider),
+    retryMode: config?.retryMode ?? (async () => (await defaultConfigProvider()).retryMode || DEFAULT_RETRY_MODE),
+    sha256: config?.sha256 ?? Sha256,
+    streamCollector: config?.streamCollector ?? streamCollector,
+    useDualstackEndpoint: config?.useDualstackEndpoint ?? (() => Promise.resolve(DEFAULT_USE_DUALSTACK_ENDPOINT)),
+    useFipsEndpoint: config?.useFipsEndpoint ?? (() => Promise.resolve(DEFAULT_USE_FIPS_ENDPOINT)),
+  };
+};
diff --git a/src.gen/@amzn/codewhisperer-streaming/src/runtimeConfig.native.ts b/src.gen/@amzn/codewhisperer-streaming/src/runtimeConfig.native.ts
new file mode 100644
index 00000000000..36c385cdb22
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/src/runtimeConfig.native.ts
@@ -0,0 +1,17 @@
+// smithy-typescript generated code
+import { Sha256 } from "@aws-crypto/sha256-js";
+import { CodeWhispererStreamingClientConfig } from "./CodeWhispererStreamingClient";
+import { getRuntimeConfig as getBrowserRuntimeConfig } from "./runtimeConfig.browser";
+
+/**
+ * @internal
+ */
+export const getRuntimeConfig = (config: CodeWhispererStreamingClientConfig) => {
+  const browserDefaults = getBrowserRuntimeConfig(config);
+  return {
+    ...browserDefaults,
+    ...config,
+    runtime: "react-native",
+    sha256: config?.sha256 ?? Sha256,
+  };
+};
diff --git a/src.gen/@amzn/codewhisperer-streaming/src/runtimeConfig.shared.ts b/src.gen/@amzn/codewhisperer-streaming/src/runtimeConfig.shared.ts
new file mode 100644
index 00000000000..50601826426
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/src/runtimeConfig.shared.ts
@@ -0,0 +1,42 @@
+// smithy-typescript generated code
+import { defaultCodeWhispererStreamingHttpAuthSchemeProvider } from "./auth/httpAuthSchemeProvider";
+import { defaultRegionInfoProvider } from "./endpoints";
+import { HttpBearerAuthSigner } from "@smithy/core";
+import { NoOpLogger } from "@smithy/smithy-client";
+import { IdentityProviderConfig } from "@smithy/types";
+import { parseUrl } from "@smithy/url-parser";
+import {
+  fromBase64,
+  toBase64,
+} from "@smithy/util-base64";
+import {
+  fromUtf8,
+  toUtf8,
+} from "@smithy/util-utf8";
+import { CodeWhispererStreamingClientConfig } from "./CodeWhispererStreamingClient";
+
+/**
+ * @internal
+ */
+export const getRuntimeConfig = (config: CodeWhispererStreamingClientConfig) => {
+  return {
+    apiVersion: "2023-11-27",
+      base64Decoder: config?.base64Decoder ?? fromBase64,
+  base64Encoder: config?.base64Encoder ?? toBase64,
+  disableHostPrefix: config?.disableHostPrefix ?? false,
+  extensions: config?.extensions ?? [],
+  httpAuthSchemeProvider: config?.httpAuthSchemeProvider ?? defaultCodeWhispererStreamingHttpAuthSchemeProvider,
+  httpAuthSchemes: config?.httpAuthSchemes ?? [{
+        schemeId: "smithy.api#httpBearerAuth",
+        identityProvider: (ipc: IdentityProviderConfig) =>
+          ipc.getIdentityProvider("smithy.api#httpBearerAuth"),
+        signer: new HttpBearerAuthSigner(),
+      }],
+  logger: config?.logger ?? new NoOpLogger(),
+  regionInfoProvider: config?.regionInfoProvider ?? defaultRegionInfoProvider,
+  serviceId: config?.serviceId ?? "CodeWhispererStreaming",
+  urlParser: config?.urlParser ?? parseUrl,
+  utf8Decoder: config?.utf8Decoder ?? fromUtf8,
+  utf8Encoder: config?.utf8Encoder ?? toUtf8,
+  }
+};
diff --git a/src.gen/@amzn/codewhisperer-streaming/src/runtimeConfig.ts b/src.gen/@amzn/codewhisperer-streaming/src/runtimeConfig.ts
new file mode 100644
index 00000000000..b17d8b65cce
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/src/runtimeConfig.ts
@@ -0,0 +1,78 @@
+// smithy-typescript generated code
+// @ts-ignore: package.json will be imported from dist folders
+import packageInfo from "../package.json"; // eslint-disable-line
+
+import { emitWarningIfUnsupportedVersion as awsCheckVersion } from "@aws-sdk/core";
+import {
+  FromSsoInit,
+  nodeProvider,
+} from "@aws-sdk/token-providers";
+import {
+  NODE_APP_ID_CONFIG_OPTIONS,
+  createDefaultUserAgentProvider,
+} from "@aws-sdk/util-user-agent-node";
+import {
+  NODE_REGION_CONFIG_FILE_OPTIONS,
+  NODE_REGION_CONFIG_OPTIONS,
+  NODE_USE_DUALSTACK_ENDPOINT_CONFIG_OPTIONS,
+  NODE_USE_FIPS_ENDPOINT_CONFIG_OPTIONS,
+} from "@smithy/config-resolver";
+import { HttpBearerAuthSigner } from "@smithy/core";
+import { eventStreamSerdeProvider } from "@smithy/eventstream-serde-node";
+import { Hash } from "@smithy/hash-node";
+import {
+  NODE_MAX_ATTEMPT_CONFIG_OPTIONS,
+  NODE_RETRY_MODE_CONFIG_OPTIONS,
+} from "@smithy/middleware-retry";
+import { loadConfig as loadNodeConfig } from "@smithy/node-config-provider";
+import {
+  NodeHttpHandler as RequestHandler,
+  streamCollector,
+} from "@smithy/node-http-handler";
+import { IdentityProviderConfig } from "@smithy/types";
+import { calculateBodyLength } from "@smithy/util-body-length-node";
+import { DEFAULT_RETRY_MODE } from "@smithy/util-retry";
+import { CodeWhispererStreamingClientConfig } from "./CodeWhispererStreamingClient";
+import { getRuntimeConfig as getSharedRuntimeConfig } from "./runtimeConfig.shared";
+import { loadConfigsForDefaultMode } from "@smithy/smithy-client";
+import { resolveDefaultsModeConfig } from "@smithy/util-defaults-mode-node";
+import { emitWarningIfUnsupportedVersion } from "@smithy/smithy-client";
+
+/**
+ * @internal
+ */
+export const getRuntimeConfig = (config: CodeWhispererStreamingClientConfig) => {
+  emitWarningIfUnsupportedVersion(process.version);
+  const defaultsMode = resolveDefaultsModeConfig(config);
+  const defaultConfigProvider = () => defaultsMode().then(loadConfigsForDefaultMode);
+  const clientSharedValues = getSharedRuntimeConfig(config);
+  awsCheckVersion(process.version);
+const profileConfig = { profile: config?.profile };return {
+    ...clientSharedValues,
+    ...config,
+    runtime: "node",
+    defaultsMode,
+    bodyLengthChecker: config?.bodyLengthChecker ?? calculateBodyLength,
+    defaultUserAgentProvider: config?.defaultUserAgentProvider ?? createDefaultUserAgentProvider({serviceId: clientSharedValues.serviceId, clientVersion: packageInfo.version}),
+    eventStreamSerdeProvider: config?.eventStreamSerdeProvider ?? eventStreamSerdeProvider,
+    httpAuthSchemes: config?.httpAuthSchemes ?? [{
+          schemeId: "smithy.api#httpBearerAuth",
+          identityProvider: (ipc: IdentityProviderConfig) =>
+            ipc.getIdentityProvider("smithy.api#httpBearerAuth") || (async (idProps) => await nodeProvider(idProps as FromSsoInit)(idProps)),
+          signer: new HttpBearerAuthSigner(),
+        }],
+    maxAttempts: config?.maxAttempts ?? loadNodeConfig(NODE_MAX_ATTEMPT_CONFIG_OPTIONS, config),
+    region: config?.region ?? loadNodeConfig(
+          NODE_REGION_CONFIG_OPTIONS,
+          {...NODE_REGION_CONFIG_FILE_OPTIONS, ...profileConfig}
+      )
+    ,
+    requestHandler: RequestHandler.create(config?.requestHandler ?? defaultConfigProvider),
+    retryMode: config?.retryMode ?? loadNodeConfig({...NODE_RETRY_MODE_CONFIG_OPTIONS,default: async () => (await defaultConfigProvider()).retryMode || DEFAULT_RETRY_MODE,}, config),
+    sha256: config?.sha256 ?? Hash.bind(null, "sha256"),
+    streamCollector: config?.streamCollector ?? streamCollector,
+    useDualstackEndpoint: config?.useDualstackEndpoint ?? loadNodeConfig(NODE_USE_DUALSTACK_ENDPOINT_CONFIG_OPTIONS, profileConfig),
+    useFipsEndpoint: config?.useFipsEndpoint ?? loadNodeConfig(NODE_USE_FIPS_ENDPOINT_CONFIG_OPTIONS, profileConfig),
+    userAgentAppId: config?.userAgentAppId ?? loadNodeConfig(NODE_APP_ID_CONFIG_OPTIONS, profileConfig),
+  };
+};
diff --git a/src.gen/@amzn/codewhisperer-streaming/src/runtimeExtensions.ts b/src.gen/@amzn/codewhisperer-streaming/src/runtimeExtensions.ts
new file mode 100644
index 00000000000..174ceda287d
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/src/runtimeExtensions.ts
@@ -0,0 +1,59 @@
+// smithy-typescript generated code
+import {
+  getHttpAuthExtensionConfiguration,
+  resolveHttpAuthRuntimeConfig,
+} from "./auth/httpAuthExtensionConfiguration";
+import {
+  getAwsRegionExtensionConfiguration,
+  resolveAwsRegionExtensionConfiguration,
+} from "@aws-sdk/region-config-resolver";
+import {
+  getHttpHandlerExtensionConfiguration,
+  resolveHttpHandlerRuntimeConfig,
+} from "@smithy/protocol-http";
+import {
+  getDefaultExtensionConfiguration,
+  resolveDefaultRuntimeConfig,
+} from "@smithy/smithy-client";
+import { CodeWhispererStreamingExtensionConfiguration } from "./extensionConfiguration";
+
+/**
+ * @public
+ */
+export interface RuntimeExtension {
+    configure(extensionConfiguration: CodeWhispererStreamingExtensionConfiguration): void;
+}
+
+/**
+ * @public
+ */
+export interface RuntimeExtensionsConfig {
+    extensions: RuntimeExtension[]
+}
+
+const asPartial = <T extends Partial<CodeWhispererStreamingExtensionConfiguration>>(t: T) => t;
+
+/**
+ * @internal
+ */
+export const resolveRuntimeExtensions = (
+    runtimeConfig: any,
+    extensions: RuntimeExtension[]
+) => {
+  const extensionConfiguration: CodeWhispererStreamingExtensionConfiguration = {
+    ...asPartial(getAwsRegionExtensionConfiguration(runtimeConfig)),
+    ...asPartial(getDefaultExtensionConfiguration(runtimeConfig)),
+    ...asPartial(getHttpHandlerExtensionConfiguration(runtimeConfig)),
+    ...asPartial(getHttpAuthExtensionConfiguration(runtimeConfig)),
+  };
+
+  extensions.forEach(extension => extension.configure(extensionConfiguration));
+
+  return {
+    ...runtimeConfig,
+    ...resolveAwsRegionExtensionConfiguration(extensionConfiguration),
+    ...resolveDefaultRuntimeConfig(extensionConfiguration),
+    ...resolveHttpHandlerRuntimeConfig(extensionConfiguration),
+    ...resolveHttpAuthRuntimeConfig(extensionConfiguration),
+  };
+}
diff --git a/src.gen/@amzn/codewhisperer-streaming/tsconfig.cjs.json b/src.gen/@amzn/codewhisperer-streaming/tsconfig.cjs.json
new file mode 100644
index 00000000000..3567d85ba84
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/tsconfig.cjs.json
@@ -0,0 +1,6 @@
+{
+  "extends": "./tsconfig",
+  "compilerOptions": {
+    "outDir": "dist-cjs"
+  }
+}
diff --git a/src.gen/@amzn/codewhisperer-streaming/tsconfig.es.json b/src.gen/@amzn/codewhisperer-streaming/tsconfig.es.json
new file mode 100644
index 00000000000..3e988e83261
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/tsconfig.es.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig",
+  "compilerOptions": {
+    "lib": ["dom"],
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "outDir": "dist-es"
+  }
+}
diff --git a/src.gen/@amzn/codewhisperer-streaming/tsconfig.json b/src.gen/@amzn/codewhisperer-streaming/tsconfig.json
new file mode 100644
index 00000000000..956bed461a6
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "extends": "@tsconfig/node18/tsconfig.json",
+  "compilerOptions": {
+    "downlevelIteration": true,
+    "importHelpers": true,
+    "incremental": true,
+    "removeComments": true,
+    "resolveJsonModule": true,
+    "rootDir": "src",
+    "useUnknownInCatchVariables": false
+  },
+  "exclude": ["test/"]
+}
diff --git a/src.gen/@amzn/codewhisperer-streaming/tsconfig.types.json b/src.gen/@amzn/codewhisperer-streaming/tsconfig.types.json
new file mode 100644
index 00000000000..4c3dfa7b3d2
--- /dev/null
+++ b/src.gen/@amzn/codewhisperer-streaming/tsconfig.types.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig",
+  "compilerOptions": {
+    "removeComments": false,
+    "declaration": true,
+    "declarationDir": "dist-types",
+    "emitDeclarationOnly": true
+  },
+  "exclude": ["test/**/*", "dist-types/**/*"]
+}
diff --git a/src.gen/@amzn/sagemaker-client/1.0.0.tgz b/src.gen/@amzn/sagemaker-client/1.0.0.tgz
new file mode 100644
index 00000000000..4821da0e727
Binary files /dev/null and b/src.gen/@amzn/sagemaker-client/1.0.0.tgz differ
diff --git a/src/apigateway/activation.ts b/src/apigateway/activation.ts
deleted file mode 100644
index c2f015293c9..00000000000
--- a/src/apigateway/activation.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { RestApiNode } from './explorer/apiNodes'
-import { invokeRemoteRestApi } from './vue/invokeRemoteRestApi'
-import { copyUrlCommand } from './commands/copyUrl'
-import { ExtContext } from '../shared/extensions'
-import { Commands } from '../shared/vscode/commands2'
-
-/**
- * Activate API Gateway functionality for the extension.
- */
-export async function activate(activateArguments: {
-    extContext: ExtContext
-    outputChannel: vscode.OutputChannel
-}): Promise<void> {
-    const extensionContext = activateArguments.extContext.extensionContext
-    const regionProvider = activateArguments.extContext.regionProvider
-    extensionContext.subscriptions.push(
-        Commands.register('aws.apig.copyUrl', async (node: RestApiNode) => await copyUrlCommand(node, regionProvider)),
-        Commands.register(
-            'aws.apig.invokeRemoteRestApi',
-            async (node: RestApiNode) =>
-                await invokeRemoteRestApi(activateArguments.extContext, {
-                    apiNode: node,
-                    outputChannel: activateArguments.outputChannel,
-                })
-        )
-    )
-}
diff --git a/src/apigateway/commands/copyUrl.ts b/src/apigateway/commands/copyUrl.ts
deleted file mode 100644
index 021d895cea1..00000000000
--- a/src/apigateway/commands/copyUrl.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Window } from '../../shared/vscode/window'
-import { copyToClipboard } from '../../shared/utilities/messages'
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-import { RestApiNode } from '../explorer/apiNodes'
-import * as picker from '../../shared/ui/picker'
-import * as vscode from 'vscode'
-import { ProgressLocation } from 'vscode'
-
-import { Stage } from 'aws-sdk/clients/apigateway'
-import { DefaultApiGatewayClient } from '../../shared/clients/apiGatewayClient'
-import { defaultDnsSuffix, RegionProvider } from '../../shared/regions/regionProvider'
-import { getLogger } from '../../shared/logger'
-import { telemetry } from '../../shared/telemetry/telemetry'
-
-interface StageInvokeUrlQuickPick extends vscode.QuickPickItem {
-    // override declaration so this can't be undefined
-    detail: string
-}
-
-export async function copyUrlCommand(
-    node: RestApiNode,
-    regionProvider: RegionProvider,
-    window = Window.vscode()
-): Promise<void> {
-    const region = node.regionCode
-    const dnsSuffix = regionProvider.getDnsSuffixForRegion(region) || defaultDnsSuffix
-    const client = new DefaultApiGatewayClient(region)
-
-    let stages: Stage[]
-    try {
-        stages = await window.withProgress(
-            {
-                cancellable: false,
-                location: ProgressLocation.Window,
-            },
-            async progress => {
-                progress.report({
-                    message: localize('AWS.apig.loadingStages', 'Loading stage list for API: {0}', node.name),
-                })
-                return (await client.getStages(node.id)).item || []
-            }
-        )
-    } catch (e) {
-        getLogger().error(`Failed to load stages: %s`, e)
-        telemetry.apigateway_copyUrl.emit({ result: 'Failed' })
-        return
-    }
-
-    const quickPickItems = stages.map<StageInvokeUrlQuickPick>(stage => ({
-        label: stage.stageName!,
-        detail: buildDefaultApiInvokeUrl(node.id, region, dnsSuffix, stage.stageName!),
-    }))
-
-    if (quickPickItems.length === 0) {
-        window.showInformationMessage(
-            localize('AWS.apig.copyUrlNoStages', "Failed to copy URL because '{0}' has no stages", node.name)
-        )
-        telemetry.apigateway_copyUrl.emit({ result: 'Failed' })
-        return
-    } else if (quickPickItems.length === 1) {
-        const url = quickPickItems[0].detail
-        await copyToClipboard(url, 'URL')
-        telemetry.apigateway_copyUrl.emit({ result: 'Succeeded' })
-        return
-    }
-
-    const quickPick = picker.createQuickPick({
-        options: {
-            ignoreFocusOut: true,
-            title: localize('AWS.apig.selectStage', 'Select an API stage'),
-        },
-        items: quickPickItems,
-    })
-
-    const choices = await picker.promptUser({
-        picker: quickPick,
-        onDidTriggerButton: (button, resolve, reject) => {
-            if (button === vscode.QuickInputButtons.Back) {
-                resolve(undefined)
-            }
-        },
-    })
-    const pickerResponse = picker.verifySinglePickerOutput<StageInvokeUrlQuickPick>(choices)
-
-    if (!pickerResponse) {
-        telemetry.apigateway_copyUrl.emit({ result: 'Cancelled' })
-        return
-    }
-
-    const url = pickerResponse.detail
-    await copyToClipboard(url, 'URL')
-    telemetry.apigateway_copyUrl.emit({ result: 'Succeeded' })
-}
-
-export function buildDefaultApiInvokeUrl(apiId: string, region: string, dnsSuffix: string, stage: string): string {
-    return `https://${apiId}.execute-api.${region}.${dnsSuffix}/${stage}`
-}
diff --git a/src/apigateway/explorer/apiGatewayNodes.ts b/src/apigateway/explorer/apiGatewayNodes.ts
deleted file mode 100644
index fa31474ef0b..00000000000
--- a/src/apigateway/explorer/apiGatewayNodes.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as vscode from 'vscode'
-
-import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
-import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
-import { makeChildrenNodes } from '../../shared/treeview/utils'
-import { DefaultApiGatewayClient } from '../../shared/clients/apiGatewayClient'
-import { RestApi } from 'aws-sdk/clients/apigateway'
-import { toArrayAsync, toMap, updateInPlace } from '../../shared/utilities/collectionUtils'
-import { RestApiNode } from './apiNodes'
-
-/**
- * An AWS Explorer node representing the API Gateway (v1) service.
- */
-export class ApiGatewayNode extends AWSTreeNodeBase {
-    private readonly apiNodes: Map<string, RestApiNode>
-
-    public constructor(
-        private readonly partitionId: string,
-        public override readonly regionCode: string,
-        private readonly client = new DefaultApiGatewayClient(regionCode)
-    ) {
-        super('API Gateway', vscode.TreeItemCollapsibleState.Collapsed)
-        this.apiNodes = new Map<string, RestApiNode>()
-    }
-
-    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
-        return await makeChildrenNodes({
-            getChildNodes: async () => {
-                await this.updateChildren()
-
-                return [...this.apiNodes.values()]
-            },
-            getNoChildrenPlaceholderNode: async () =>
-                new PlaceholderNode(
-                    this,
-                    localize('AWS.explorerNode.apigateway.noApis', '[No API Gateway REST APIs found]')
-                ),
-            sort: (nodeA, nodeB) => nodeA.label!.localeCompare(nodeB.label!),
-        })
-    }
-
-    public async updateChildren(): Promise<void> {
-        const apis: Map<string, RestApi> = toMap(
-            await toArrayAsync(this.client.listApis()),
-            configuration => `${configuration.name} (${configuration.id})`
-        )
-
-        updateInPlace(
-            this.apiNodes,
-            apis.keys(),
-            key => this.apiNodes.get(key)!.update(apis.get(key)!),
-            key => new RestApiNode(this, this.partitionId, this.regionCode, apis.get(key)!)
-        )
-    }
-}
diff --git a/src/apigateway/vue/index.ts b/src/apigateway/vue/index.ts
deleted file mode 100644
index 18bdf9ec7c1..00000000000
--- a/src/apigateway/vue/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { createApp } from 'vue'
-import component from './invokeApi.vue'
-
-const create = () => createApp(component)
-const app = create()
-app.mount('#vue-app')
-
-window.addEventListener('remount', () => {
-    app.unmount()
-    create().mount('#vue-app')
-})
diff --git a/src/apprunner/activation.ts b/src/apprunner/activation.ts
deleted file mode 100644
index 7e8208fbc02..00000000000
--- a/src/apprunner/activation.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as nls from 'vscode-nls'
-import { showViewLogsMessage } from '../shared/utilities/messages'
-import { AppRunnerServiceNode } from './explorer/apprunnerServiceNode'
-import { getLogger } from '../shared/logger/logger'
-import { createAppRunnerService } from './commands/createService'
-import { pauseService } from './commands/pauseService'
-import { deleteService } from './commands/deleteService'
-import { createFromEcr } from './commands/createServiceFromEcr'
-import { ExtContext } from '../shared/extensions'
-import { copyToClipboard } from '../shared/utilities/messages'
-import { Commands } from '../shared/vscode/commands2'
-import { telemetry } from '../shared/telemetry/telemetry'
-import { Result } from '../shared/telemetry/telemetry'
-
-const localize = nls.loadMessageBundle()
-
-const commandMap = new Map<[command: string, errorMessage: string], (...args: any) => Promise<any>>()
-
-const createServiceFailed = localize('aws.apprunner.createService.failed', 'Failed to create App Runner service')
-const createServiceEcrFailed = localize(
-    'aws.apprunner.createServiceFromEcr.failed',
-    'Failed to create App Runner service from ECR'
-)
-const pauseServiceFailed = localize('aws.apprunner.pauseService.failed', 'Failed to pause App Runner service')
-const resumeServiceFailed = localize('aws.apprunner.resumeService.failed', 'Failed to resume App Runner service')
-const copyServiceUrlFailed = localize('aws.apprunner.copyServiceUrl.failed', 'Failed to copy App Runner service URL')
-const openServiceFailed = localize('aws.apprunner.open.failed', 'Failed to open App Runner service')
-const deployServiceFailed = localize(
-    'aws.apprunner.startDeployment.failed',
-    'Failed to start deployment of App Runner service'
-)
-const deleteServiceFailed = localize('aws.apprunner.deleteService.failed', 'Failed to delete App Runner service')
-
-const copyUrl = async (node: AppRunnerServiceNode) => {
-    copyToClipboard(node.url, 'URL')
-    telemetry.apprunner_copyServiceUrl.emit({ passive: false })
-}
-const openUrl = async (node: AppRunnerServiceNode) => {
-    await vscode.env.openExternal(vscode.Uri.parse(node.url))
-    telemetry.apprunner_openServiceUrl.emit({ passive: false })
-}
-
-const resumeService = async (node: AppRunnerServiceNode) => {
-    let telemetryResult: Result = 'Failed'
-    try {
-        await node.resume()
-        telemetryResult = 'Succeeded'
-    } finally {
-        telemetry.apprunner_resumeService.emit({ result: telemetryResult, passive: false })
-    }
-}
-
-const deployService = async (node: AppRunnerServiceNode) => {
-    let telemetryResult: Result = 'Failed'
-    try {
-        await node.deploy()
-        telemetryResult = 'Succeeded'
-    } finally {
-        telemetry.apprunner_startDeployment.emit({ result: telemetryResult, passive: false })
-    }
-}
-
-commandMap.set(['aws.apprunner.createService', createServiceFailed], createAppRunnerService)
-commandMap.set(['aws.apprunner.createServiceFromEcr', createServiceEcrFailed], createFromEcr)
-commandMap.set(['aws.apprunner.pauseService', pauseServiceFailed], pauseService)
-commandMap.set(['aws.apprunner.resumeService', resumeServiceFailed], resumeService)
-commandMap.set(['aws.apprunner.copyServiceUrl', copyServiceUrlFailed], copyUrl)
-commandMap.set(['aws.apprunner.open', openServiceFailed], openUrl)
-commandMap.set(['aws.apprunner.startDeployment', deployServiceFailed], deployService)
-commandMap.set(['aws.apprunner.deleteService', deleteServiceFailed], deleteService)
-
-/**
- * Activates App Runner
- */
-export async function activate(context: ExtContext): Promise<void> {
-    commandMap.forEach((command, tuple) => {
-        context.extensionContext.subscriptions.push(
-            Commands.register(tuple[0], async (...args: any) => {
-                try {
-                    await command(...args)
-                } catch (err) {
-                    getLogger().error(`${tuple[1]}: %s`, err)
-                    showViewLogsMessage(tuple[1])
-                }
-            })
-        )
-    })
-}
diff --git a/src/apprunner/commands/createService.ts b/src/apprunner/commands/createService.ts
deleted file mode 100644
index b7197ab1997..00000000000
--- a/src/apprunner/commands/createService.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { telemetry } from '../../shared/telemetry/telemetry'
-import { AppRunnerServiceSource, Result } from '../../shared/telemetry/telemetry'
-import { AppRunnerNode } from '../explorer/apprunnerNode'
-import { CreateAppRunnerServiceWizard } from '../wizards/apprunnerCreateServiceWizard'
-
-export async function createAppRunnerService(node: AppRunnerNode): Promise<void> {
-    let telemetryResult: Result = 'Failed'
-    let source: AppRunnerServiceSource | undefined = undefined
-
-    try {
-        const wizard = new CreateAppRunnerServiceWizard(node.regionCode)
-        const result = await wizard.run()
-        if (result === undefined) {
-            telemetryResult = 'Cancelled'
-            return
-        }
-
-        await node.createService(result)
-        source =
-            result.SourceConfiguration.CodeRepository !== undefined
-                ? 'repository'
-                : result.SourceConfiguration.ImageRepository !== undefined
-                ? result.SourceConfiguration.ImageRepository.ImageRepositoryType === 'ECR_PUBLIC'
-                    ? 'ecrPublic'
-                    : 'ecr'
-                : undefined
-        telemetryResult = 'Succeeded'
-    } finally {
-        telemetry.apprunner_createService.emit({
-            result: telemetryResult,
-            // If we cancel there is no source type (so this should be optional)
-            appRunnerServiceSource: source as any,
-            passive: false,
-        })
-    }
-}
diff --git a/src/apprunner/commands/createServiceFromEcr.ts b/src/apprunner/commands/createServiceFromEcr.ts
deleted file mode 100644
index 0369b9ed527..00000000000
--- a/src/apprunner/commands/createServiceFromEcr.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { EcrRepositoryNode } from '../../ecr/explorer/ecrRepositoryNode'
-import { EcrTagNode } from '../../ecr/explorer/ecrTagNode'
-
-import { CreateAppRunnerServiceWizard } from '../wizards/apprunnerCreateServiceWizard'
-import { DefaultAppRunnerClient } from '../../shared/clients/apprunnerClient'
-import { telemetry } from '../../shared/telemetry/telemetry'
-import { Result } from '../../shared/telemetry/telemetry'
-
-export async function createFromEcr(
-    node: EcrTagNode | EcrRepositoryNode,
-    client = new DefaultAppRunnerClient(node.regionCode)
-): Promise<void> {
-    let telemetryResult: Result = 'Failed'
-
-    try {
-        const ecrNode = (node as any).tag === undefined ? (node as EcrRepositoryNode) : (node as EcrTagNode).parent
-        const wizard = new CreateAppRunnerServiceWizard(node.regionCode, {
-            SourceConfiguration: {
-                ImageRepository: {
-                    ImageIdentifier: `${ecrNode.repository.repositoryUri}:${(node as any).tag ?? 'latest'}`,
-                    ImageRepositoryType: 'ECR',
-                    ImageConfiguration: {},
-                },
-                AuthenticationConfiguration: {},
-            },
-        })
-        const result = await wizard.run()
-
-        if (result === undefined) {
-            telemetryResult = 'Cancelled'
-            return
-        }
-
-        await client.createService(result)
-        vscode.commands.executeCommand('aws.refreshAwsExplorer', true)
-        telemetryResult = 'Succeeded'
-    } finally {
-        telemetry.apprunner_createService.emit({
-            result: telemetryResult,
-            appRunnerServiceSource: 'ecr',
-            passive: false,
-        })
-    }
-
-    return undefined
-}
diff --git a/src/apprunner/commands/pauseService.ts b/src/apprunner/commands/pauseService.ts
deleted file mode 100644
index 0e84ae9860a..00000000000
--- a/src/apprunner/commands/pauseService.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as vscode from 'vscode'
-import * as localizedText from '../../shared/localizedText'
-import { showConfirmationMessage } from '../../shared/utilities/messages'
-import { AppRunnerServiceNode } from '../explorer/apprunnerServiceNode'
-import { PromptSettings } from '../../shared/settings'
-import { telemetry } from '../../shared/telemetry/telemetry'
-import { Result } from '../../shared/telemetry/telemetry'
-
-export async function pauseService(node: AppRunnerServiceNode): Promise<void> {
-    let telemetryResult: Result = 'Failed'
-
-    try {
-        const prompts = PromptSettings.instance
-        const shouldNotify = await prompts.isPromptEnabled('apprunnerNotifyPause')
-        const notifyPrompt = localize(
-            'aws.apprunner.pauseService.notify',
-            'Your service will be unavailable while paused. ' +
-                'You can resume the service once the pause operation is complete.'
-        )
-        const confirmationOptions = { prompt: notifyPrompt, confirm: localizedText.ok, cancel: localizedText.cancel }
-
-        if (shouldNotify && !(await showConfirmationMessage(confirmationOptions, vscode.window))) {
-            telemetryResult = 'Cancelled'
-            return
-        }
-
-        await node.pause()
-        telemetryResult = 'Succeeded'
-    } finally {
-        telemetry.apprunner_pauseService.emit({
-            result: telemetryResult,
-            passive: false,
-        })
-    }
-}
diff --git a/src/apprunner/explorer/apprunnerNode.ts b/src/apprunner/explorer/apprunnerNode.ts
deleted file mode 100644
index 1f7ad99852b..00000000000
--- a/src/apprunner/explorer/apprunnerNode.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import { makeChildrenNodes } from '../../shared/treeview/utils'
-import * as vscode from 'vscode'
-import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
-import { AppRunnerServiceNode } from './apprunnerServiceNode'
-import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
-import * as nls from 'vscode-nls'
-import { AppRunnerClient } from '../../shared/clients/apprunnerClient'
-import { getPaginatedAwsCallIter } from '../../shared/utilities/collectionUtils'
-import { AppRunner } from 'aws-sdk'
-import globals from '../../shared/extensionGlobals'
-
-const localize = nls.loadMessageBundle()
-
-const pollingInterval = 20000
-export class AppRunnerNode extends AWSTreeNodeBase {
-    private readonly serviceNodes: Map<AppRunner.ServiceId, AppRunnerServiceNode> = new Map()
-    private readonly pollingNodes: Set<string> = new Set()
-    private pollTimer?: NodeJS.Timeout
-
-    public constructor(public override readonly regionCode: string, public readonly client: AppRunnerClient) {
-        super('App Runner', vscode.TreeItemCollapsibleState.Collapsed)
-        this.contextValue = 'awsAppRunnerNode'
-    }
-
-    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
-        return await makeChildrenNodes({
-            getChildNodes: async () => {
-                await this.updateChildren()
-
-                return [...this.serviceNodes.values()]
-            },
-            getNoChildrenPlaceholderNode: async () =>
-                new PlaceholderNode(
-                    this,
-                    localize('AWS.explorerNode.apprunner.noServices', '[No App Runner services found]')
-                ),
-            sort: (nodeA, nodeB) => nodeA.label!.localeCompare(nodeB.label!),
-        })
-    }
-
-    private async getServiceSummaries(request: AppRunner.ListServicesRequest = {}): Promise<AppRunner.Service[]> {
-        const iterator = getPaginatedAwsCallIter({
-            awsCall: async request => await this.client.listServices(request),
-            nextTokenNames: {
-                request: 'NextToken',
-                response: 'NextToken',
-            },
-            request,
-        })
-
-        const services: AppRunner.Service[] = []
-
-        while (true) {
-            const next = await iterator.next()
-
-            next.value.ServiceSummaryList.forEach((summary: AppRunner.Service) => services.push(summary))
-
-            if (next.done) {
-                break
-            }
-        }
-
-        return services
-    }
-
-    public async updateChildren(): Promise<void> {
-        const serviceSummaries = await this.getServiceSummaries()
-        const deletedNodeArns = new Set(this.serviceNodes.keys())
-
-        await Promise.all(
-            serviceSummaries.map(async summary => {
-                if (this.serviceNodes.has(summary.ServiceArn)) {
-                    this.serviceNodes.get(summary.ServiceArn)!.update(summary)
-                    if (summary.Status !== 'OPERATION_IN_PROGRESS') {
-                        this.pollingNodes.delete(summary.ServiceArn)
-                        this.clearPollTimer()
-                    }
-                } else {
-                    this.serviceNodes.set(summary.ServiceArn, new AppRunnerServiceNode(this, this.client, summary))
-                }
-                deletedNodeArns.delete(summary.ServiceArn)
-            })
-        )
-
-        deletedNodeArns.forEach(this.deleteNode.bind(this))
-    }
-
-    private clearPollTimer(): void {
-        if (this.pollingNodes.size === 0 && this.pollTimer) {
-            globals.clock.clearInterval(this.pollTimer)
-            this.pollTimer = undefined
-        }
-    }
-
-    public startPolling(id: string): void {
-        this.pollingNodes.add(id)
-        this.pollTimer = this.pollTimer ?? globals.clock.setInterval(this.refresh.bind(this), pollingInterval)
-    }
-
-    public stopPolling(id: string): void {
-        this.pollingNodes.delete(id)
-        this.serviceNodes.get(id)?.refresh()
-        this.clearPollTimer()
-    }
-
-    public deleteNode(id: string): void {
-        this.serviceNodes.delete(id)
-        this.pollingNodes.delete(id)
-    }
-
-    public async createService(request: AppRunner.CreateServiceRequest): Promise<void> {
-        await this.client.createService(request)
-        this.refresh()
-    }
-}
diff --git a/src/apprunner/wizards/apprunnerCreateServiceWizard.ts b/src/apprunner/wizards/apprunnerCreateServiceWizard.ts
deleted file mode 100644
index 7063e7c9486..00000000000
--- a/src/apprunner/wizards/apprunnerCreateServiceWizard.ts
+++ /dev/null
@@ -1,147 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { AppRunner } from 'aws-sdk'
-import * as nls from 'vscode-nls'
-import { createCommonButtons, QuickInputToggleButton } from '../../shared/ui/buttons'
-import * as input from '../../shared/ui/inputPrompter'
-import * as picker from '../../shared/ui/pickerPrompter'
-import { Prompter } from '../../shared/ui/prompter'
-import { Wizard, WizardState } from '../../shared/wizards/wizard'
-import { AppRunnerImageRepositoryWizard } from './imageRepositoryWizard'
-import { AppRunnerCodeRepositoryWizard } from './codeRepositoryWizard'
-import { GitExtension } from '../../shared/extensions/git'
-import { makeDeploymentButton } from './deploymentButton'
-import { apprunnerCreateServiceDocsUrl } from '../../shared/constants'
-import { createExitPrompter } from '../../shared/ui/common/exitPrompter'
-import { DefaultIamClient } from '../../shared/clients/iamClient'
-import { DefaultEcrClient } from '../../shared/clients/ecrClient'
-import { DefaultAppRunnerClient } from '../../shared/clients/apprunnerClient'
-
-const localize = nls.loadMessageBundle()
-
-// I'm sure this code could be reused in many places
-const validateName = (name: string) => {
-    const badNameRegExp = /[^A-Za-z0-9-_]/g
-    if (!name || name.length < 4) {
-        return localize('AWS.apprunner.createService.name.validation', 'Service names must be at least 4 characters')
-    } else if (name.length > 40) {
-        return localize(
-            'AWS.apprunner.createService.name.validationExceeds',
-            'Service names cannot be more than 40 characters'
-        )
-    } else if (name.match(/\s/)) {
-        return localize(
-            'AWS.apprunner.createService.name.validationWhitespace',
-            'Service names cannot contain whitespace'
-        )
-    }
-
-    let matches = name.match(badNameRegExp)
-    if (name[0] === '_' || name[0] === '-') {
-        matches = matches ? [name[0]].concat(matches) : [name[0]]
-    }
-    if (matches && matches.length > 0) {
-        return localize(
-            'AWS.apprunner.createService.name.validationBadChar',
-            'Invalid character(s): {0}',
-            Array.from(new Set(matches)).join('')
-        )
-    }
-
-    return undefined
-}
-
-function createInstanceStep(): Prompter<AppRunner.InstanceConfiguration> {
-    const enumerations = [
-        [1, 2],
-        [1, 3],
-        [2, 4],
-    ]
-
-    const items: picker.DataQuickPickItem<AppRunner.InstanceConfiguration>[] = enumerations.map(e => ({
-        label: `${e[0]} vCPUs, ${e[1]} GBs Memory`,
-        data: { Cpu: `${e[0]} vCPU`, Memory: `${e[1]} GB` },
-    }))
-
-    return picker.createQuickPick(items, {
-        title: localize('AWS.apprunner.createService.selectInstanceConfig.title', 'Select instance configuration'),
-        buttons: createCommonButtons(apprunnerCreateServiceDocsUrl),
-    })
-}
-
-function createSourcePrompter(
-    autoDeployButton: QuickInputToggleButton
-): Prompter<AppRunner.CreateServiceRequest['SourceConfiguration']> {
-    const ecrPath = {
-        label: 'ECR',
-        data: { ImageRepository: {} } as AppRunner.SourceConfiguration,
-        detail: localize(
-            'AWS.apprunner.createService.ecr.detail',
-            'Create a service from a public or private Elastic Container Registry repository'
-        ),
-    }
-
-    const repositoryPath = {
-        label: 'Repository',
-        data: { CodeRepository: {} } as AppRunner.SourceConfiguration,
-        detail: localize('AWS.apprunner.createService.repository.detail', 'Create a service from a GitHub repository'),
-    }
-
-    return picker.createQuickPick([ecrPath, repositoryPath], {
-        title: localize('AWS.apprunner.createService.sourceType.title', 'Select a source code location type'),
-        buttons: [autoDeployButton, ...createCommonButtons(apprunnerCreateServiceDocsUrl)],
-    })
-}
-
-export class CreateAppRunnerServiceWizard extends Wizard<AppRunner.CreateServiceRequest> {
-    public constructor(
-        region: string,
-        initState: WizardState<AppRunner.CreateServiceRequest> = {},
-        implicitState: WizardState<AppRunner.CreateServiceRequest> = {},
-        clients = {
-            iam: new DefaultIamClient(region),
-            ecr: new DefaultEcrClient(region),
-            apprunner: new DefaultAppRunnerClient(region),
-        }
-    ) {
-        super({
-            initState,
-            implicitState,
-            exitPrompterProvider: createExitPrompter,
-        })
-
-        const autoDeployButton = makeDeploymentButton()
-        const gitExtension = GitExtension.instance
-        const codeRepositoryWizard = new AppRunnerCodeRepositoryWizard(
-            clients.apprunner,
-            gitExtension,
-            autoDeployButton
-        )
-        const imageRepositoryWizard = new AppRunnerImageRepositoryWizard(clients.ecr, clients.iam, autoDeployButton)
-
-        const form = this.form
-
-        form.SourceConfiguration.bindPrompter(() => createSourcePrompter(autoDeployButton))
-
-        form.SourceConfiguration.applyBoundForm(imageRepositoryWizard.boundForm, {
-            showWhen: state => state.SourceConfiguration?.ImageRepository !== undefined,
-        })
-        form.SourceConfiguration.applyBoundForm(codeRepositoryWizard.boundForm, {
-            showWhen: state => state.SourceConfiguration?.CodeRepository !== undefined,
-        })
-
-        form.ServiceName.bindPrompter(() =>
-            input.createInputBox({
-                title: localize('AWS.apprunner.createService.name.title', 'Name your service'),
-                validateInput: validateName, // TODO: we can check if names match any already made services
-                buttons: createCommonButtons(apprunnerCreateServiceDocsUrl),
-            })
-        )
-
-        form.InstanceConfiguration.bindPrompter(() => createInstanceStep())
-        form.SourceConfiguration.AutoDeploymentsEnabled.setDefault(() => autoDeployButton.state === 'on')
-    }
-}
diff --git a/src/apprunner/wizards/codeRepositoryWizard.ts b/src/apprunner/wizards/codeRepositoryWizard.ts
deleted file mode 100644
index d305aa4f265..00000000000
--- a/src/apprunner/wizards/codeRepositoryWizard.ts
+++ /dev/null
@@ -1,248 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { AppRunner } from 'aws-sdk'
-import * as nls from 'vscode-nls'
-import { createCommonButtons, createRefreshButton, QuickInputToggleButton } from '../../shared/ui/buttons'
-import { Remote } from '../../../types/git.d'
-import { GitExtension } from '../../shared/extensions/git'
-import * as vscode from 'vscode'
-import { WizardForm } from '../../shared/wizards/wizardForm'
-import { createVariablesPrompter } from '../../shared/ui/common/variablesPrompter'
-import { AppRunnerClient } from '../../shared/clients/apprunnerClient'
-import { makeDeploymentButton } from './deploymentButton'
-import { createLabelQuickPick, createQuickPick, QuickPickPrompter } from '../../shared/ui/pickerPrompter'
-import { createInputBox, InputBoxPrompter } from '../../shared/ui/inputPrompter'
-import {
-    apprunnerConnectionHelpUrl,
-    apprunnerConfigHelpUrl,
-    apprunnerRuntimeHelpUrl,
-    apprunnerCreateServiceDocsUrl,
-} from '../../shared/constants'
-import { Wizard, WIZARD_BACK } from '../../shared/wizards/wizard'
-
-const localize = nls.loadMessageBundle()
-
-function validateCommand(command: string): string | undefined {
-    if (command == '') {
-        return localize('AWS.apprunner.command.invalid', 'Command cannot be empty')
-    }
-
-    return undefined
-}
-
-function createRepoPrompter(git: GitExtension): QuickPickPrompter<Remote> {
-    const mapRemote = (remote: Remote) => ({ label: remote.name, detail: remote.fetchUrl, data: remote })
-    const remotes = git.getRemotes().then(r => r.map(mapRemote))
-    const userInputString = localize('AWS.apprunner.createService.customRepo', 'Enter GitHub URL')
-
-    return createQuickPick(remotes, {
-        title: localize('AWS.apprunner.createService.selectRepository.title', 'Select a remote GitHub repository'),
-        placeholder: localize(
-            'AWS.apprunner.createService.selectRepository.placeholder',
-            'Select a remote repository or enter a URL'
-        ),
-        filterBoxInputSettings: {
-            label: userInputString,
-            transform: resp => ({ name: 'UserRemote', isReadOnly: true, fetchUrl: resp }),
-        },
-        buttons: createCommonButtons(),
-    })
-}
-
-function createBranchPrompter(
-    git: GitExtension,
-    cache: { [key: string]: any },
-    repo: string = ''
-): QuickPickPrompter<string> {
-    const last = cache[repo]
-    const branchItems =
-        last ??
-        git.getBranchesForRemote({ name: '', fetchUrl: repo } as any).then(branches => {
-            const branchItems = branches
-                .filter(b => b.name !== undefined && b.name !== '')
-                .map(branch => ({
-                    label: branch.name!.split('/').slice(1).join('/'),
-                }))
-            cache[repo] = branchItems
-            return branchItems
-        })
-    const userInputString = localize('AWS.apprunner.createService.customRepo', 'Enter branch name')
-    return createLabelQuickPick(branchItems, {
-        title: localize('AWS.apprunner.createService.selectBranch.title', 'Select a branch'),
-        filterBoxInputSettings: {
-            label: userInputString,
-            transform: resp => resp,
-        },
-        buttons: createCommonButtons(),
-        placeholder: localize(
-            'AWS.apprunner.createService.selectBranch.placeholder',
-            'Select a branch or enter a branch name'
-        ),
-    })
-}
-
-function createRuntimePrompter(): QuickPickPrompter<AppRunner.Runtime> {
-    const items = [
-        { label: 'python3', data: 'PYTHON_3' },
-        { label: 'nodejs12', data: 'NODEJS_12' },
-    ]
-
-    return createQuickPick(items, {
-        title: localize('AWS.apprunner.createService.selectRuntime.title', 'Select a runtime'),
-        buttons: createCommonButtons(apprunnerRuntimeHelpUrl),
-    })
-}
-
-function createBuildCommandPrompter(runtime: AppRunner.Runtime): InputBoxPrompter {
-    const buildCommandMap = {
-        python: 'pip install -r requirements.txt',
-        node: 'npm install',
-    } as { [key: string]: string }
-
-    return createInputBox({
-        title: localize('AWS.apprunner.createService.buildCommand.title', 'Enter a build command'),
-        buttons: createCommonButtons(apprunnerRuntimeHelpUrl),
-        placeholder:
-            buildCommandMap[Object.keys(buildCommandMap).filter(key => runtime.toLowerCase().includes(key))[0]],
-        validateInput: validateCommand,
-    })
-}
-
-function createStartCommandPrompter(runtime: AppRunner.Runtime): InputBoxPrompter {
-    const startCommandMap = {
-        python: 'python runapp.py',
-        node: 'node app.js',
-    } as { [key: string]: string }
-
-    return createInputBox({
-        title: localize('AWS.apprunner.createService.startCommand.title', 'Enter a start command'),
-        buttons: createCommonButtons(apprunnerRuntimeHelpUrl),
-        placeholder:
-            startCommandMap[Object.keys(startCommandMap).filter(key => runtime.toLowerCase().includes(key))[0]],
-        validateInput: validateCommand,
-    })
-}
-
-function createPortPrompter(): InputBoxPrompter {
-    const validatePort = (port: string) => {
-        if (isNaN(Number(port)) || port === '') {
-            return localize('AWS.apprunner.createService.selectPort.invalidPort', 'Port must be a number')
-        }
-
-        return undefined
-    }
-
-    return createInputBox({
-        validateInput: validatePort,
-        title: localize('AWS.apprunner.createService.selectPort.title', 'Enter a port for the new service'),
-        placeholder: 'Enter a port',
-        buttons: createCommonButtons(apprunnerCreateServiceDocsUrl),
-    })
-}
-
-export function createConnectionPrompter(client: AppRunnerClient) {
-    const noItemsFoundItem = {
-        label: 'No connections found',
-        detail: 'Click for documentation on creating a new GitHub connection for App Runner',
-        data: {} as any,
-        invalidSelection: true,
-        onClick: () => vscode.env.openExternal(vscode.Uri.parse(apprunnerConnectionHelpUrl)),
-    }
-
-    const errorItem = {
-        label: localize('AWS.apprunner.createService.selectConnection.failed', 'Failed to list GitHub connections'),
-        description: localize('AWS.generic.goBack', 'Click to go back'),
-        data: WIZARD_BACK,
-    }
-
-    const getItems = async () => {
-        const resp = await client.listConnections()
-
-        return resp.ConnectionSummaryList.filter(conn => conn.Status === 'AVAILABLE').map(conn => ({
-            label: conn.ConnectionName!,
-            data: conn,
-        }))
-    }
-
-    const refreshButton = createRefreshButton()
-    refreshButton.onClick = () => void prompter.clearAndLoadItems(getItems())
-
-    const prompter = createQuickPick(getItems(), {
-        errorItem,
-        noItemsFoundItem,
-        buttons: [refreshButton, ...createCommonButtons(apprunnerConnectionHelpUrl)],
-        title: localize('AWS.apprunner.createService.selectConnection.title', 'Select a connection'),
-    })
-
-    return prompter
-}
-
-function createSourcePrompter(): QuickPickPrompter<AppRunner.ConfigurationSource> {
-    const configDetail = localize(
-        'AWS.apprunner.createService.configSource.detail',
-        'App Runner will read "apprunner.yaml" in the root of your repository for configuration details'
-    )
-    const apiLabel = localize('AWS.apprunner.createService.configSource.apiLabel', 'Configure all settings here')
-    const repoLabel = localize('AWS.apprunner.createService.configSource.repoLabel', 'Use configuration file')
-
-    return createQuickPick(
-        [
-            { label: apiLabel, data: 'API' },
-            { label: repoLabel, data: 'REPOSITORY', detail: configDetail },
-        ],
-        {
-            title: localize('AWS.apprunner.createService.configSource.title', 'Choose configuration source'),
-            buttons: createCommonButtons(apprunnerConfigHelpUrl),
-        }
-    )
-}
-
-function createCodeRepositorySubForm(git: GitExtension): WizardForm<AppRunner.CodeRepository> {
-    const subform = new WizardForm<AppRunner.CodeRepository>()
-    const form = subform.body
-
-    form.RepositoryUrl.bindPrompter(() => createRepoPrompter(git).transform(r => r.fetchUrl!))
-    form.SourceCodeVersion.Value.bindPrompter(state =>
-        createBranchPrompter(git, state.stepCache, state.RepositoryUrl).transform(resp =>
-            resp.replace(`${state.RepositoryUrl}/`, '')
-        )
-    )
-    form.CodeConfiguration.ConfigurationSource.bindPrompter(createSourcePrompter)
-    form.SourceCodeVersion.Type.setDefault(() => 'BRANCH')
-
-    const codeConfigForm = new WizardForm<AppRunner.CodeConfigurationValues>()
-    codeConfigForm.body.Runtime.bindPrompter(createRuntimePrompter)
-    codeConfigForm.body.BuildCommand.bindPrompter(state => createBuildCommandPrompter(state.Runtime!))
-    codeConfigForm.body.StartCommand.bindPrompter(state => createStartCommandPrompter(state.Runtime!))
-    codeConfigForm.body.Port.bindPrompter(createPortPrompter)
-    codeConfigForm.body.RuntimeEnvironmentVariables.bindPrompter(() =>
-        createVariablesPrompter(createCommonButtons(apprunnerCreateServiceDocsUrl))
-    )
-    // TODO: ask user if they would like to save their parameters into an App Runner config file
-
-    form.CodeConfiguration.CodeConfigurationValues.applyBoundForm(codeConfigForm, {
-        showWhen: state => state.CodeConfiguration?.ConfigurationSource === 'API',
-    })
-
-    return subform
-}
-
-export class AppRunnerCodeRepositoryWizard extends Wizard<AppRunner.SourceConfiguration> {
-    constructor(
-        client: AppRunnerClient,
-        git: GitExtension,
-        autoDeployButton: QuickInputToggleButton = makeDeploymentButton()
-    ) {
-        super()
-        const form = this.form
-
-        form.AuthenticationConfiguration.ConnectionArn.bindPrompter(() =>
-            createConnectionPrompter(client).transform(conn => conn.ConnectionArn!)
-        )
-        form.CodeRepository.applyBoundForm(createCodeRepositorySubForm(git))
-        form.AutoDeploymentsEnabled.setDefault(() => autoDeployButton.state === 'on')
-    }
-}
diff --git a/src/apprunner/wizards/deploymentButton.ts b/src/apprunner/wizards/deploymentButton.ts
deleted file mode 100644
index cccd49671a9..00000000000
--- a/src/apprunner/wizards/deploymentButton.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-import * as vscode from 'vscode'
-
-import { QuickInputButton, QuickInputToggleButton } from '../../shared/ui/buttons'
-import { apprunnerPricingUrl } from '../../shared/constants'
-import { PromptSettings } from '../../shared/settings'
-import { getIcon } from '../../shared/icons'
-import { dontShow } from '../../shared/localizedText'
-
-const localize = nls.loadMessageBundle()
-
-function makeDeployButtons() {
-    const autoDeploymentsEnable: QuickInputButton<void> = {
-        iconPath: getIcon('vscode-sync-ignore'),
-        tooltip: localize('AWS.apprunner.buttons.enableAutoDeploy', 'Turn on automatic deployment'),
-    }
-
-    const autoDeploymentsDisable: QuickInputButton<void> = {
-        iconPath: getIcon('vscode-sync'),
-        tooltip: localize('AWS.apprunner.buttons.disableAutoDeploy', 'Turn off automatic deployment'),
-    }
-
-    return [autoDeploymentsDisable, autoDeploymentsEnable]
-}
-
-async function showDeploymentCostNotification(): Promise<void> {
-    const settings = PromptSettings.instance
-
-    if (await settings.isPromptEnabled('apprunnerNotifyPricing')) {
-        const notice = localize(
-            'aws.apprunner.createService.priceNotice.message',
-            'App Runner automatic deployments incur an additional cost.'
-        )
-        const viewPricing = localize('aws.apprunner.createService.priceNotice.view', 'View Pricing')
-        const pricingUri = vscode.Uri.parse(apprunnerPricingUrl)
-
-        vscode.window.showInformationMessage(notice, viewPricing, dontShow).then(async button => {
-            if (button === viewPricing) {
-                vscode.env.openExternal(pricingUri)
-                await showDeploymentCostNotification()
-            } else if (button === dontShow) {
-                settings.disablePrompt('apprunnerNotifyPricing')
-            }
-        })
-    }
-}
-
-export function makeDeploymentButton() {
-    const [autoDeploymentsDisable, autoDeploymentsEnable] = makeDeployButtons()
-
-    return new QuickInputToggleButton(autoDeploymentsDisable, autoDeploymentsEnable, {
-        onCallback: showDeploymentCostNotification,
-    })
-}
diff --git a/src/apprunner/wizards/imageRepositoryWizard.ts b/src/apprunner/wizards/imageRepositoryWizard.ts
deleted file mode 100644
index ded4bc42c12..00000000000
--- a/src/apprunner/wizards/imageRepositoryWizard.ts
+++ /dev/null
@@ -1,273 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { AppRunner, IAM } from 'aws-sdk'
-import { createCommonButtons, QuickInputButton, QuickInputToggleButton } from '../../shared/ui/buttons'
-import { toArrayAsync } from '../../shared/utilities/collectionUtils'
-import { EcrClient, EcrRepository } from '../../shared/clients/ecrClient'
-import * as input from '../../shared/ui/inputPrompter'
-import * as picker from '../../shared/ui/pickerPrompter'
-import { Prompter } from '../../shared/ui/prompter'
-import { Wizard, WizardControl, WIZARD_BACK } from '../../shared/wizards/wizard'
-import { WizardPrompter } from '../../shared/ui/wizardPrompter'
-
-import * as nls from 'vscode-nls'
-import { WizardForm } from '../../shared/wizards/wizardForm'
-import { createVariablesPrompter } from '../../shared/ui/common/variablesPrompter'
-import { makeDeploymentButton } from './deploymentButton'
-import { IamClient } from '../../shared/clients/iamClient'
-import { createRolePrompter } from '../../shared/ui/common/roles'
-import { getLogger } from '../../shared/logger/logger'
-import { isCloud9 } from '../../shared/extensionUtilities'
-import { apprunnerCreateServiceDocsUrl } from '../../shared/constants'
-import { createExitPrompter } from '../../shared/ui/common/exitPrompter'
-
-const localize = nls.loadMessageBundle()
-
-const publicEcr = 'public.ecr.aws'
-const appRunnerEcrEntity = 'build.apprunner.amazonaws'
-
-export type TaggedEcrRepository = EcrRepository & { tag?: string }
-
-interface ImagePrompterOptions {
-    noPublicMessage?: string
-    extraButtons?: QuickInputButton<void | WizardControl>
-}
-
-function createEcrRole(client: IamClient): Promise<IAM.Role> {
-    const policy = {
-        Version: '2008-10-17',
-        Statement: [
-            {
-                Sid: '',
-                Effect: 'Allow',
-                Principal: {
-                    Service: ['build.apprunner.amazonaws.com'],
-                },
-                Action: 'sts:AssumeRole',
-            },
-        ],
-    }
-    const ecrPolicy = 'arn:aws:iam::aws:policy/service-role/AWSAppRunnerServicePolicyForECRAccess'
-
-    return client
-        .createRole({
-            RoleName: `${isCloud9() ? 'Cloud9-' : ''}AppRunnerECRAccessRole${
-                Math.floor(Math.random() * 1000000000) + 1000
-            }`,
-            AssumeRolePolicyDocument: JSON.stringify(policy),
-        })
-        .then(resp => {
-            const role = resp.Role
-            return client.attachRolePolicy({ RoleName: role.RoleName, PolicyArn: ecrPolicy }).then(() => role)
-        })
-}
-
-function createImagePrompter(
-    ecrClient: EcrClient,
-    cache: { [key: string]: any },
-    options: ImagePrompterOptions = {}
-): picker.QuickPickPrompter<TaggedEcrRepository> {
-    const last = cache['repos']
-    const imageRepos =
-        last ??
-        toArrayAsync(ecrClient.describeRepositories())
-            .then(resp => {
-                const repos = resp.map(repo => ({ label: repo.repositoryName, detail: repo.repositoryUri, data: repo }))
-                cache['repos'] = repos
-                return repos
-            })
-            .catch(err => {
-                getLogger().error(`Unabled to list repositories: %s`, err)
-                return [
-                    {
-                        label: localize(
-                            'AWS.apprunner.createService.selectImageRepo.failed',
-                            'Failed to list repositories'
-                        ),
-                        description: localize('AWS.generic.goBack', 'Click to go back'),
-                        data: WIZARD_BACK,
-                    },
-                ]
-            })
-
-    const customUserInputLabel = localize('AWS.apprunner.createService.selectImageRepo.input', 'Custom ECR URL')
-    const customUserInputTransform = (resp: string) => {
-        const userInputParts = resp.split(':')
-
-        return {
-            repositoryArn: '',
-            repositoryName: 'UserDefined',
-            repositoryUri: userInputParts[0],
-            tag: userInputParts[1]?.trim() ?? 'latest',
-        }
-    }
-
-    const ecrUriValidator = (input: string) => {
-        const userInputParts = input.split(':')
-
-        if (userInputParts.length > 2) {
-            return 'colon should be used to delimit tag'
-        }
-
-        if (userInputParts.length === 2 && userInputParts[1].trim() === '') {
-            return 'tag cannot be empty'
-        }
-
-        const privateRegExp = /[0-9]+\.dkr\.ecr\.[a-zA-z0-9\-]+\.amazonaws\.com/
-
-        if (options.noPublicMessage && userInputParts[0].startsWith(publicEcr)) {
-            return options.noPublicMessage
-        }
-
-        if (!userInputParts[0].startsWith(publicEcr) && !userInputParts[0].match(privateRegExp)) {
-            return 'not a valid ECR URL'
-        }
-    }
-
-    const customUserInputValidator = (input: string) => {
-        const message = ecrUriValidator(input)
-        return message !== undefined ? `$(close) Invalid input: ${message}` : undefined
-    }
-
-    return picker.createQuickPick<TaggedEcrRepository>(imageRepos, {
-        title: localize('AWS.apprunner.createService.selectImageRepo.title', 'Select or enter an image repository'),
-        placeholder: '123456789012.dkr.ecr.us-east-1.amazonaws.com/myrepo:latest',
-        filterBoxInputSettings: {
-            label: customUserInputLabel,
-            transform: customUserInputTransform,
-            validator: customUserInputValidator,
-        },
-        buttons: createCommonButtons(),
-    })
-}
-
-function createPortPrompter(): Prompter<string> {
-    const validatePort = (port: string) => {
-        if (isNaN(Number(port)) || port === '') {
-            return localize('AWS.apprunner.createService.selectPort.invalidPort', 'Port must be a number')
-        }
-
-        return undefined
-    }
-
-    return input.createInputBox({
-        validateInput: validatePort,
-        title: localize('AWS.apprunner.createService.selectPort.title', 'Enter a port for the new service'),
-        placeholder: 'Enter a port',
-        buttons: createCommonButtons(apprunnerCreateServiceDocsUrl),
-    })
-}
-
-function createTagPrompter(
-    ecrClient: EcrClient,
-    imageRepo: EcrRepository,
-    cache: { [key: string]: any }
-): picker.QuickPickPrompter<string> {
-    const last: picker.DataQuickPickItem<TaggedEcrRepository>[] = cache[imageRepo.repositoryName]
-    const tagItems =
-        last ??
-        toArrayAsync(ecrClient.describeTags(imageRepo.repositoryName))
-            .then(tags => {
-                if (tags.length === 0) {
-                    return [
-                        {
-                            label: localize('AWS.apprunner.createService.selectTags.noFound', 'No tags found'),
-                            description: localize('AWS.generic.goBack', 'Click to go back'),
-                            data: WIZARD_BACK,
-                        },
-                    ]
-                }
-
-                const tagT = tags.map(tag => ({ label: tag }))
-                cache[imageRepo.repositoryName] = tagT
-                return tagT
-            })
-            .catch(err => {
-                getLogger().error(`Unabled to list tags for repository "${imageRepo.repositoryName}": %s`, err)
-                return [
-                    {
-                        label: localize(
-                            'AWS.apprunner.createService.selectTag.failed',
-                            'Failed to get tags for repository'
-                        ),
-                        description: localize('AWS.generic.goBack', 'Click to go back'),
-                        data: WIZARD_BACK,
-                    },
-                ]
-            })
-
-    return picker.createLabelQuickPick(tagItems, {
-        title: localize('AWS.apprunner.createService.selectTag.title', 'Select an ECR tag'),
-        placeholder: 'latest',
-        buttons: createCommonButtons(),
-    })
-}
-
-export class ImageIdentifierForm extends WizardForm<{ repo: TaggedEcrRepository }> {
-    constructor(ecrClient: EcrClient, options: ImagePrompterOptions = {}) {
-        super()
-
-        this.body.repo.bindPrompter(state => createImagePrompter(ecrClient, state.stepCache, options))
-        this.body.repo.tag.bindPrompter(state => createTagPrompter(ecrClient, state.repo!, state.stepCache), {
-            requireParent: true,
-        })
-    }
-}
-
-function createImageRepositorySubForm(
-    ecrClient: EcrClient,
-    autoDeployButton: QuickInputToggleButton
-): WizardForm<AppRunner.ImageRepository> {
-    const subform = new WizardForm<AppRunner.ImageRepository>()
-    const form = subform.body
-
-    // note: this is intentionally initialized only once to preserve caches
-    const imageIdentifierWizard = new Wizard({
-        initForm: new ImageIdentifierForm(ecrClient),
-        exitPrompterProvider: createExitPrompter,
-    })
-
-    form.ImageIdentifier.bindPrompter(() =>
-        new WizardPrompter(imageIdentifierWizard).transform(resp => `${resp.repo.repositoryUri}:${resp.repo.tag}`)
-    )
-
-    function isPublic(imageRepo: string): boolean {
-        return imageRepo.search(/^public.ecr.aws/) !== -1
-    }
-
-    form.ImageRepositoryType.setDefault(state =>
-        state.ImageIdentifier !== undefined ? (isPublic(state.ImageIdentifier) ? 'ECR_PUBLIC' : 'ECR') : undefined
-    )
-
-    form.ImageConfiguration.Port.bindPrompter(() => createPortPrompter())
-    form.ImageConfiguration.RuntimeEnvironmentVariables.bindPrompter(() =>
-        createVariablesPrompter(createCommonButtons(apprunnerCreateServiceDocsUrl))
-    )
-
-    return subform
-}
-
-export class AppRunnerImageRepositoryWizard extends Wizard<AppRunner.SourceConfiguration> {
-    constructor(ecrClient: EcrClient, iamClient: IamClient, autoDeployButton = makeDeploymentButton()) {
-        super()
-        const form = this.form
-        const createAccessRolePrompter = () => {
-            return createRolePrompter(iamClient, {
-                title: localize('AWS.apprunner.createService.selectRole.title', 'Select a role to pull from ECR'),
-                helpUrl: vscode.Uri.parse(apprunnerCreateServiceDocsUrl),
-                roleFilter: role => (role.AssumeRolePolicyDocument ?? '').includes(appRunnerEcrEntity),
-                createRole: createEcrRole.bind(undefined, iamClient),
-            }).transform(resp => resp.Arn)
-        }
-
-        form.ImageRepository.applyBoundForm(createImageRepositorySubForm(ecrClient, autoDeployButton))
-        form.AuthenticationConfiguration.AccessRoleArn.bindPrompter(createAccessRolePrompter, {
-            showWhen: form => form.ImageRepository?.ImageRepositoryType === 'ECR',
-        })
-        form.AutoDeploymentsEnabled.setDefault(() => autoDeployButton.state === 'on')
-    }
-}
diff --git a/src/awsexplorer/activation.ts b/src/awsexplorer/activation.ts
deleted file mode 100644
index 8e720d9341f..00000000000
--- a/src/awsexplorer/activation.ts
+++ /dev/null
@@ -1,152 +0,0 @@
-/*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { submitFeedback } from '../feedback/vue/submitFeedback'
-import { deleteCloudFormation } from '../lambda/commands/deleteCloudFormation'
-import { CloudFormationStackNode } from '../lambda/explorer/cloudFormationNodes'
-import globals from '../shared/extensionGlobals'
-import { isCloud9 } from '../shared/extensionUtilities'
-import { ExtContext } from '../shared/extensions'
-import { getLogger } from '../shared/logger'
-import { RegionProvider } from '../shared/regions/regionProvider'
-import { AWSResourceNode } from '../shared/treeview/nodes/awsResourceNode'
-import { AWSTreeNodeBase } from '../shared/treeview/nodes/awsTreeNodeBase'
-import { Commands } from '../shared/vscode/commands2'
-import { downloadStateMachineDefinition } from '../stepFunctions/commands/downloadStateMachineDefinition'
-import { executeStateMachine } from '../stepFunctions/vue/executeStateMachine/executeStateMachine'
-import { StateMachineNode } from '../stepFunctions/explorer/stepFunctionsNodes'
-import { AwsExplorer } from './awsExplorer'
-import { copyArnCommand } from './commands/copyArn'
-import { copyNameCommand } from './commands/copyName'
-import { loadMoreChildrenCommand } from './commands/loadMoreChildren'
-import { checkExplorerForDefaultRegion } from './defaultRegion'
-import { createLocalExplorerView } from './localExplorer'
-import { telemetry } from '../shared/telemetry/telemetry'
-import { cdkNode, CdkRootNode } from '../cdk/explorer/rootNode'
-import { CodeWhispererNode, codewhispererNode } from '../codewhisperer/explorer/codewhispererNode'
-import { once } from '../shared/utilities/functionUtils'
-import { Auth, AuthNode } from '../credentials/auth'
-import { CodeCatalystRootNode } from '../codecatalyst/explorer'
-import { CodeCatalystAuthenticationProvider } from '../codecatalyst/auth'
-
-/**
- * Activates the AWS Explorer UI and related functionality.
- */
-export async function activate(args: {
-    context: ExtContext
-    regionProvider: RegionProvider
-    toolkitOutputChannel: vscode.OutputChannel
-    remoteInvokeOutputChannel: vscode.OutputChannel
-}): Promise<void> {
-    const awsExplorer = new AwsExplorer(globals.context, args.regionProvider)
-
-    const view = vscode.window.createTreeView(awsExplorer.viewProviderId, {
-        treeDataProvider: awsExplorer,
-        showCollapseAll: true,
-    })
-    globals.context.subscriptions.push(view)
-
-    await registerAwsExplorerCommands(args.context, awsExplorer, args.toolkitOutputChannel)
-
-    telemetry.vscode_activeRegions.emit({ value: args.regionProvider.getExplorerRegions().length })
-
-    args.context.extensionContext.subscriptions.push(
-        args.context.awsContext.onDidChangeContext(async credentialsChangedEvent => {
-            getLogger().verbose(`Credentials changed (${credentialsChangedEvent.profileName}), updating AWS Explorer`)
-            awsExplorer.refresh()
-
-            if (credentialsChangedEvent.profileName) {
-                await checkExplorerForDefaultRegion(
-                    credentialsChangedEvent.profileName,
-                    args.regionProvider,
-                    awsExplorer
-                )
-            }
-        })
-    )
-
-    const authProvider = CodeCatalystAuthenticationProvider.fromContext(args.context.extensionContext)
-    const codecatalystNode = isCloud9('classic') ? [] : [new CodeCatalystRootNode(authProvider)]
-    const nodes = [new AuthNode(Auth.instance), ...codecatalystNode, cdkNode, codewhispererNode]
-    const developerTools = createLocalExplorerView(nodes)
-    args.context.extensionContext.subscriptions.push(developerTools)
-
-    // Legacy CDK behavior. Mostly useful for C9 as they do not have inline buttons.
-    developerTools.onDidChangeVisibility(({ visible }) => visible && cdkNode.refresh())
-
-    // Legacy CDK metric, remove this when we add something generic
-    const recordExpandCdkOnce = once(() => telemetry.cdk_appExpanded.emit())
-    const onDidExpandCodeWhisperer = once(() => telemetry.ui_click.emit({ elementId: 'cw_parentNode' }))
-    developerTools.onDidExpandElement(e => {
-        if (e.element.resource instanceof CdkRootNode) {
-            recordExpandCdkOnce()
-        } else if (e.element.resource instanceof CodeWhispererNode) {
-            onDidExpandCodeWhisperer()
-        }
-    })
-}
-
-async function registerAwsExplorerCommands(
-    context: ExtContext,
-    awsExplorer: AwsExplorer,
-    toolkitOutputChannel: vscode.OutputChannel
-): Promise<void> {
-    context.extensionContext.subscriptions.push(
-        Commands.register({ id: 'aws.showRegion', autoconnect: false }, async () => {
-            try {
-                await globals.awsContextCommands.onCommandShowRegion()
-            } finally {
-                telemetry.aws_setRegion.emit()
-                telemetry.vscode_activeRegions.emit({ value: awsExplorer.getRegionNodesSize() })
-            }
-        }),
-        Commands.register({ id: 'aws.submitFeedback', autoconnect: false }, async () => {
-            await submitFeedback(context)
-        }),
-        Commands.register({ id: 'aws.refreshAwsExplorer', autoconnect: true }, async (passive: boolean = false) => {
-            awsExplorer.refresh()
-
-            if (!passive) {
-                telemetry.aws_refreshExplorer.emit()
-            }
-        }),
-        Commands.register(
-            { id: 'aws.deleteCloudFormation', autoconnect: true },
-            async (node: CloudFormationStackNode) =>
-                await deleteCloudFormation(() => awsExplorer.refresh(node.parent), node)
-        ),
-        Commands.register(
-            { id: 'aws.downloadStateMachineDefinition', autoconnect: true },
-            async (node: StateMachineNode) =>
-                await downloadStateMachineDefinition({
-                    stateMachineNode: node,
-                    outputChannel: toolkitOutputChannel,
-                })
-        )
-    )
-
-    context.extensionContext.subscriptions.push(
-        Commands.register(
-            'aws.executeStateMachine',
-            async (node: StateMachineNode) => await executeStateMachine(context, node)
-        ),
-        Commands.register(
-            'aws.renderStateMachineGraph',
-            async (node: StateMachineNode) =>
-                await downloadStateMachineDefinition({
-                    stateMachineNode: node,
-                    outputChannel: toolkitOutputChannel,
-                    isPreviewAndRender: true,
-                })
-        ),
-        Commands.register('aws.copyArn', async (node: AWSResourceNode) => await copyArnCommand(node)),
-        Commands.register('aws.copyName', async (node: AWSResourceNode) => await copyNameCommand(node)),
-        Commands.register('aws.refreshAwsExplorerNode', async (element: AWSTreeNodeBase | undefined) => {
-            awsExplorer.refresh(element)
-        }),
-        loadMoreChildrenCommand.register(awsExplorer)
-    )
-}
diff --git a/src/awsexplorer/commands/copyArn.ts b/src/awsexplorer/commands/copyArn.ts
deleted file mode 100644
index 4d6a09dd17d..00000000000
--- a/src/awsexplorer/commands/copyArn.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-import { showLogOutputChannel } from '../../shared/logger'
-const localize = nls.loadMessageBundle()
-
-import { AWSResourceNode } from '../../shared/treeview/nodes/awsResourceNode'
-import { Env } from '../../shared/vscode/env'
-import { copyToClipboard } from '../../shared/utilities/messages'
-import { Window } from '../../shared/vscode/window'
-import { Commands } from '../../shared/vscode/commands'
-import { getIdeProperties } from '../../shared/extensionUtilities'
-import { TreeShim } from '../../shared/treeview/utils'
-
-/**
- * Copies the arn of the resource represented by the given node.
- */
-export async function copyArnCommand(
-    node: AWSResourceNode | TreeShim<AWSResourceNode>,
-    window = Window.vscode(),
-    env = Env.vscode(),
-    commands = Commands.vscode()
-): Promise<void> {
-    node = node instanceof TreeShim ? node.node.resource : node
-
-    try {
-        copyToClipboard(node.arn, 'ARN', window, env)
-    } catch (e) {
-        const logsItem = localize('AWS.generic.message.viewLogs', 'View Logs...')
-        window
-            .showErrorMessage(
-                localize(
-                    'AWS.explorerNode.noArnFound',
-                    'Could not find an ARN for selected {0} Explorer node',
-                    getIdeProperties().company
-                ),
-                logsItem
-            )
-            .then(selection => {
-                if (selection === logsItem) {
-                    showLogOutputChannel()
-                }
-            })
-    }
-}
diff --git a/src/awsexplorer/commands/copyName.ts b/src/awsexplorer/commands/copyName.ts
deleted file mode 100644
index 9c40705599c..00000000000
--- a/src/awsexplorer/commands/copyName.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Env } from '../../shared/vscode/env'
-import { copyToClipboard } from '../../shared/utilities/messages'
-import { Window } from '../../shared/vscode/window'
-import { AWSResourceNode } from '../../shared/treeview/nodes/awsResourceNode'
-import { TreeShim } from '../../shared/treeview/utils'
-
-/**
- * Copies the name of the resource represented by the given node.
- */
-export async function copyNameCommand(
-    node: AWSResourceNode | TreeShim<AWSResourceNode>,
-    window = Window.vscode(),
-    env = Env.vscode()
-): Promise<void> {
-    node = node instanceof TreeShim ? node.node.resource : node
-
-    await copyToClipboard(node.name, 'name', window, env)
-}
diff --git a/src/awsexplorer/defaultRegion.ts b/src/awsexplorer/defaultRegion.ts
deleted file mode 100644
index 176ef0ac1b4..00000000000
--- a/src/awsexplorer/defaultRegion.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as vscode from 'vscode'
-import * as localizedText from '../shared/localizedText'
-import { createQuickPick, promptUser } from '../shared/ui/picker'
-import { AwsExplorer } from './awsExplorer'
-import { getIdeProperties, isCloud9 } from '../shared/extensionUtilities'
-import { PromptSettings } from '../shared/settings'
-import { RegionProvider } from '../shared/regions/regionProvider'
-
-class RegionMissingUI {
-    public static readonly add: string = localizedText.yes
-    public static readonly alwaysIgnore: string = localize('AWS.message.prompt.noDontAskAgain', "No, don't ask again")
-    public static readonly ignore: string = localizedText.no
-}
-
-export async function checkExplorerForDefaultRegion(
-    profileName: string,
-    regionProvider: RegionProvider,
-    awsExplorer: AwsExplorer
-): Promise<void> {
-    const profileRegion = regionProvider.defaultRegionId
-
-    const explorerRegions = new Set(regionProvider.getExplorerRegions())
-    if (explorerRegions.has(profileRegion)) {
-        return
-    }
-
-    if (isCloud9()) {
-        await regionProvider.updateExplorerRegions([...explorerRegions, profileRegion])
-        awsExplorer.refresh()
-        return
-    }
-
-    const shouldPrompt = await PromptSettings.instance.isPromptEnabled('regionAddAutomatically')
-    if (!shouldPrompt) {
-        return
-    }
-
-    // Prompt: "Add region?"
-    // Choices: "Yes", "No", "No, don't ask again"
-    const items = [RegionMissingUI.add, RegionMissingUI.ignore, RegionMissingUI.alwaysIgnore].map<vscode.QuickPickItem>(
-        item => {
-            return {
-                label: item,
-            }
-        }
-    )
-
-    const picker = createQuickPick({
-        options: {
-            canPickMany: false,
-            ignoreFocusOut: true,
-            title: localize(
-                'AWS.message.prompt.defaultRegionHidden',
-                'Show the default region "{0}" for credentials "{1}" in {2} Explorer?',
-                profileRegion,
-                profileName,
-                getIdeProperties().company
-            ),
-        },
-        items: items,
-    })
-    const r = await promptUser({ picker: picker })
-
-    // User Cancelled
-    if (!r || r.length === 0) {
-        return
-    }
-
-    const response = r[0].label
-
-    if (response === RegionMissingUI.add) {
-        await regionProvider.updateExplorerRegions([...explorerRegions, profileRegion])
-        awsExplorer.refresh()
-    } else if (response === RegionMissingUI.alwaysIgnore) {
-        PromptSettings.instance.disablePrompt('regionAddAutomatically')
-    }
-}
diff --git a/src/awsexplorer/localExplorer.ts b/src/awsexplorer/localExplorer.ts
deleted file mode 100644
index 5f8d57e441f..00000000000
--- a/src/awsexplorer/localExplorer.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { ResourceTreeDataProvider, TreeNode } from '../shared/treeview/resourceTreeDataProvider'
-import { isCloud9 } from '../shared/extensionUtilities'
-
-export interface RootNode<T = unknown> extends TreeNode<T> {
-    /**
-     * An optional event to signal that this node's visibility has changed.
-     */
-    readonly onDidChangeVisibility?: vscode.Event<void>
-
-    /**
-     * Determines whether this node should be rendered in the tree view.
-     *
-     * If not implemented, it is assumed that the node is always visible.
-     */
-    canShow?(): Promise<boolean> | boolean
-}
-
-function throttle<T>(cb: () => T | Promise<T>, delay: number): () => Promise<T> {
-    let timer: NodeJS.Timeout | undefined
-    let promise: Promise<T> | undefined
-
-    return () => {
-        timer?.refresh()
-
-        return (promise ??= new Promise<T>((resolve, reject) => {
-            timer = setTimeout(async () => {
-                timer = promise = undefined
-                try {
-                    resolve(await cb())
-                } catch (err) {
-                    reject(err)
-                }
-            }, delay)
-        }))
-    }
-}
-
-/**
- * The 'local' explorer is represented as 'Developer Tools' in the UI. We use a different name within
- * source code to differentiate between _Toolkit developers_ and _Toolkit users_.
- *
- * Components placed under this view do not strictly need to be 'local'. They just need to place greater
- * emphasis on the developer's local development environment.
- */
-export function createLocalExplorerView(rootNodes: RootNode[]): vscode.TreeView<TreeNode> {
-    const treeDataProvider = new ResourceTreeDataProvider({ getChildren: () => getChildren(rootNodes) })
-    const view = vscode.window.createTreeView('aws.developerTools', { treeDataProvider })
-
-    rootNodes.forEach(node => node.onDidChangeVisibility?.(() => treeDataProvider.refresh(node)))
-
-    // Cloud9 will only refresh when refreshing the entire tree
-    if (isCloud9()) {
-        rootNodes.forEach(node => {
-            // Refreshes are delayed to guard against excessive calls to `getTreeItem` and `getChildren`
-            // The 10ms delay is arbitrary. A single event loop may be good enough in many scenarios.
-            const refresh = throttle(() => treeDataProvider.refresh(node), 10)
-            node.onDidChangeTreeItem?.(() => refresh())
-            node.onDidChangeChildren?.(() => refresh())
-        })
-    }
-
-    return view
-}
-
-async function getChildren(roots: RootNode[]) {
-    const nodes: TreeNode[] = []
-
-    for (const node of roots) {
-        if (!node.canShow || (await node.canShow())) {
-            nodes.push(node)
-        }
-    }
-
-    return nodes
-}
diff --git a/src/awsexplorer/regionNode.ts b/src/awsexplorer/regionNode.ts
deleted file mode 100644
index 242fc53c1c7..00000000000
--- a/src/awsexplorer/regionNode.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { TreeItemCollapsibleState } from 'vscode'
-import { ApiGatewayNode } from '../apigateway/explorer/apiGatewayNodes'
-import { SchemasNode } from '../eventSchemas/explorer/schemasNode'
-import { CloudFormationNode } from '../lambda/explorer/cloudFormationNodes'
-import { CloudWatchLogsNode } from '../cloudWatchLogs/explorer/cloudWatchLogsNode'
-import { LambdaNode } from '../lambda/explorer/lambdaNodes'
-import { S3Node } from '../s3/explorer/s3Nodes'
-import { EcrNode } from '../ecr/explorer/ecrNode'
-import { IotNode } from '../iot/explorer/iotNodes'
-import { Region } from '../shared/regions/endpoints'
-import { defaultPartition, RegionProvider } from '../shared/regions/regionProvider'
-import { AWSTreeNodeBase } from '../shared/treeview/nodes/awsTreeNodeBase'
-import { StepFunctionsNode } from '../stepFunctions/explorer/stepFunctionsNodes'
-import { SsmDocumentNode } from '../ssmDocument/explorer/ssmDocumentNode'
-import { ResourcesNode } from '../dynamicResources/explorer/nodes/resourcesNode'
-import { AppRunnerNode } from '../apprunner/explorer/apprunnerNode'
-import { DefaultAppRunnerClient } from '../shared/clients/apprunnerClient'
-import { DefaultEcrClient } from '../shared/clients/ecrClient'
-import { DefaultIotClient } from '../shared/clients/iotClient'
-import { DefaultS3Client } from '../shared/clients/s3Client'
-import { DefaultSchemaClient } from '../shared/clients/schemaClient'
-import { getEcsRootNode } from '../ecs/model'
-import { TreeShim } from '../shared/treeview/utils'
-
-const serviceCandidates = [
-    {
-        serviceId: 'apigateway',
-        createFn: (regionCode: string, partitionId: string) => new ApiGatewayNode(partitionId, regionCode),
-    },
-    {
-        serviceId: 'apprunner',
-        createFn: (regionCode: string) => new AppRunnerNode(regionCode, new DefaultAppRunnerClient(regionCode)),
-    },
-    {
-        serviceId: 'cloudformation',
-        createFn: (regionCode: string) => new CloudFormationNode(regionCode),
-    },
-    {
-        serviceId: 'logs',
-        createFn: (regionCode: string) => new CloudWatchLogsNode(regionCode),
-    },
-    {
-        serviceId: 'ecr',
-        createFn: (regionCode: string) => new EcrNode(new DefaultEcrClient(regionCode)),
-    },
-    {
-        serviceId: 'ecs',
-        createFn: (regionCode: string) => new TreeShim(getEcsRootNode(regionCode)),
-    },
-    {
-        serviceId: 'iot',
-        createFn: (regionCode: string) => new IotNode(new DefaultIotClient(regionCode)),
-    },
-    {
-        serviceId: 'lambda',
-        createFn: (regionCode: string) => new LambdaNode(regionCode),
-    },
-    {
-        serviceId: 's3',
-        createFn: (regionCode: string) => new S3Node(new DefaultS3Client(regionCode)),
-    },
-    {
-        serviceId: 'schemas',
-        createFn: (regionCode: string) => new SchemasNode(new DefaultSchemaClient(regionCode)),
-    },
-    {
-        serviceId: 'states',
-        createFn: (regionCode: string) => new StepFunctionsNode(regionCode),
-    },
-    {
-        serviceId: 'ssm',
-        createFn: (regionCode: string) => new SsmDocumentNode(regionCode),
-    },
-]
-
-/**
- * An AWS Explorer node representing a region.
- * Contains resource types as child nodes (for example, nodes representing
- * an account's Lambda Functions and CloudFormation stacks for this region)
- */
-export class RegionNode extends AWSTreeNodeBase {
-    private region: Region
-    public override readonly regionCode: string
-
-    public get regionName(): string {
-        return this.region.name
-    }
-
-    public constructor(region: Region, private readonly regionProvider: RegionProvider) {
-        super(region.name, TreeItemCollapsibleState.Expanded)
-        this.contextValue = 'awsRegionNode'
-        this.region = region
-        this.regionCode = region.id
-        this.update(region)
-    }
-
-    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
-        //  Services that are candidates to add to the region explorer.
-        //  `serviceId`s are checked against ~/resources/endpoints.json to see whether or not the service is available in the given region.
-        //  If the service is available, we use the `createFn` to generate the node for the region.
-        //  This interface exists so we can add additional nodes to the array (otherwise Typescript types the array to what's already in the array at creation)
-        const partitionId = this.regionProvider.getPartitionId(this.regionCode) ?? defaultPartition
-        const childNodes: AWSTreeNodeBase[] = []
-        for (const { serviceId, createFn } of serviceCandidates) {
-            if (this.regionProvider.isServiceInRegion(serviceId, this.regionCode)) {
-                const node = createFn(this.regionCode, partitionId)
-                if (node !== undefined) {
-                    childNodes.push(node)
-                }
-            }
-        }
-        childNodes.push(new ResourcesNode(this.regionCode))
-
-        return this.sortNodes(childNodes)
-    }
-
-    private sortNodes(nodes: AWSTreeNodeBase[]) {
-        return nodes.sort((a, b) => {
-            // Always sort `ResourcesNode` at the bottom
-            return a instanceof ResourcesNode
-                ? 1
-                : b instanceof ResourcesNode
-                ? -1
-                : (a.label ?? '').localeCompare(b.label ?? '')
-        })
-    }
-    public update(region: Region): void {
-        this.region = region
-        this.label = this.regionName
-        this.tooltip = `${this.regionName} [${this.regionCode}]`
-    }
-}
diff --git a/src/cdk/explorer/cdkProject.ts b/src/cdk/explorer/cdkProject.ts
deleted file mode 100644
index a9d064277fe..00000000000
--- a/src/cdk/explorer/cdkProject.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { SystemUtilities } from '../../shared/systemUtilities'
-import { ConstructTree } from './tree/types'
-
-export interface CdkApp {
-    location: CdkAppLocation
-    constructTree: ConstructTree
-}
-
-export interface CdkAppLocation {
-    cdkJsonUri: vscode.Uri
-    treeUri: vscode.Uri
-}
-
-export async function getApp(location: CdkAppLocation): Promise<CdkApp> {
-    const constructTree = JSON.parse(await SystemUtilities.readFile(location.treeUri)) as ConstructTree
-
-    return { location, constructTree }
-}
diff --git a/src/cdk/explorer/nodes/appNode.ts b/src/cdk/explorer/nodes/appNode.ts
deleted file mode 100644
index 50b0198df52..00000000000
--- a/src/cdk/explorer/nodes/appNode.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as vscode from 'vscode'
-import { getLogger } from '../../../shared/logger'
-import { CdkAppLocation, getApp } from '../cdkProject'
-import { ConstructNode, generateConstructNodes } from './constructNode'
-import { TreeNode } from '../../../shared/treeview/resourceTreeDataProvider'
-import { createPlaceholderItem } from '../../../shared/treeview/utils'
-import { getIcon } from '../../../shared/icons'
-
-/**
- * Represents a CDK App
- * Existence of apps is determined by the presence of `cdk.json` in a workspace folder
- */
-export class AppNode implements TreeNode {
-    public readonly id = this.location.cdkJsonUri.toString()
-    public readonly resource = this.location
-    public readonly label = vscode.workspace.asRelativePath(vscode.Uri.joinPath(this.location.cdkJsonUri, '..'))
-
-    public constructor(private readonly location: CdkAppLocation) {}
-
-    public async getChildren(): Promise<(ConstructNode | TreeNode)[]> {
-        const constructs = []
-        try {
-            const successfulApp = await getApp(this.location)
-
-            const constructsInTree = successfulApp.constructTree.tree.children
-            if (constructsInTree) {
-                constructs.push(...generateConstructNodes(this.location, constructsInTree))
-            }
-
-            // indicate that App exists, but it is empty
-            if (constructs.length === 0) {
-                return [
-                    createPlaceholderItem(localize('AWS.cdk.explorerNode.app.noStacks', '[No stacks in this CDK App]')),
-                ]
-            }
-
-            return constructs
-        } catch (error) {
-            getLogger().error(`Could not load the construct tree located at '${this.id}': %O`, error as Error)
-
-            return [
-                createPlaceholderItem(
-                    localize(
-                        'AWS.cdk.explorerNode.app.noConstructTree',
-                        '[Unable to load construct tree for this App. Run `cdk synth`]'
-                    )
-                ),
-            ]
-        }
-    }
-
-    public getTreeItem() {
-        const item = new vscode.TreeItem(this.label, vscode.TreeItemCollapsibleState.Collapsed)
-
-        item.contextValue = 'awsCdkAppNode'
-        item.iconPath = getIcon('aws-cdk-logo')
-        item.tooltip = this.location.cdkJsonUri.path
-
-        return item
-    }
-}
diff --git a/src/cdk/explorer/nodes/propertyNode.ts b/src/cdk/explorer/nodes/propertyNode.ts
deleted file mode 100644
index 1a47dcc59f9..00000000000
--- a/src/cdk/explorer/nodes/propertyNode.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { getIcon } from '../../../shared/icons'
-import { TreeNode } from '../../../shared/treeview/resourceTreeDataProvider'
-
-/*
- * Represents a property of a CDK construct. Properties can be simple key-value pairs, Arrays,
- * or objects that are nested deeply
- */
-export class PropertyNode implements TreeNode {
-    public readonly id = this.key
-    public readonly resource = this.value
-
-    public constructor(private readonly key: string, private readonly value: unknown) {}
-
-    public async getChildren(): Promise<TreeNode[]> {
-        if (this.value instanceof Array || this.value instanceof Object) {
-            return generatePropertyNodes(this.value)
-        } else {
-            return []
-        }
-    }
-
-    public getTreeItem() {
-        const item = new vscode.TreeItem(`${this.key}: ${this.value}`)
-
-        item.contextValue = 'awsCdkPropertyNode'
-        item.iconPath = getIcon('vscode-gear')
-
-        if (this.value instanceof Array || this.value instanceof Object) {
-            item.label = this.key
-            item.collapsibleState = vscode.TreeItemCollapsibleState.Collapsed
-        }
-
-        return item
-    }
-}
-
-export function generatePropertyNodes(properties: { [key: string]: any }): TreeNode[] {
-    return Object.entries(properties).map(([k, v]) => new PropertyNode(k, v))
-}
diff --git a/src/cdk/explorer/rootNode.ts b/src/cdk/explorer/rootNode.ts
deleted file mode 100644
index 2821be9ccb4..00000000000
--- a/src/cdk/explorer/rootNode.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-/*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { cdkDocumentationUrl } from '../../shared/constants'
-import { telemetry } from '../../shared/telemetry/telemetry'
-import { TreeNode } from '../../shared/treeview/resourceTreeDataProvider'
-import { createPlaceholderItem } from '../../shared/treeview/utils'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { Commands } from '../../shared/vscode/commands2'
-import { detectCdkProjects } from './detectCdkProjects'
-import { AppNode } from './nodes/appNode'
-
-export async function getAppNodes(): Promise<TreeNode[]> {
-    const appsFound = await detectCdkProjects(vscode.workspace.workspaceFolders)
-
-    if (appsFound.length === 0) {
-        return [createPlaceholderItem(localize('AWS.cdk.explorerNode.noApps', '[No CDK Apps found in Workspaces]'))]
-    }
-
-    return appsFound.map(appLocation => new AppNode(appLocation)).sort((a, b) => a.label.localeCompare(b.label) ?? 0)
-}
-
-export class CdkRootNode implements TreeNode {
-    public readonly id = 'cdk'
-    public readonly resource = this
-    private readonly onDidChangeChildrenEmitter = new vscode.EventEmitter<void>()
-    public readonly onDidChangeChildren = this.onDidChangeChildrenEmitter.event
-
-    public getChildren() {
-        return getAppNodes()
-    }
-
-    public refresh(): void {
-        this.onDidChangeChildrenEmitter.fire()
-    }
-
-    public getTreeItem() {
-        const item = new vscode.TreeItem('CDK')
-        item.collapsibleState = vscode.TreeItemCollapsibleState.Collapsed
-        item.contextValue = 'awsCdkRootNode'
-
-        return item
-    }
-}
-
-export const cdkNode = new CdkRootNode()
-export const refreshCdkExplorer = Commands.register('aws.cdk.refresh', cdkNode.refresh.bind(cdkNode))
-
-Commands.register('aws.cdk.viewDocs', () => {
-    vscode.env.openExternal(vscode.Uri.parse(cdkDocumentationUrl))
-    telemetry.aws_help.emit({ name: 'cdk' })
-})
diff --git a/src/cdk/explorer/tree/types.ts b/src/cdk/explorer/tree/types.ts
deleted file mode 100644
index a02ebdbdae6..00000000000
--- a/src/cdk/explorer/tree/types.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-/*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * The CDK construct tree is the hierarchy of a CDK application. Every time a CDK application
- * is built and `cdk synth` is called on it from the CLI, the construct tree is written to a
- * file named `tree.json`.
- *
- * The tree includes all of the resources that are encapsulated by the CDK.
- * A motivation for sharing this tree is to provide a design-time view of the resources that are
- * contained with a CDK application
- *
- * The intial RFC around the construct tree can be found here:
- * https://github.com/aws/aws-cdk/pull/4053
- *
- * @attribute version - version of the tree to leverage if the spec changes
- * @attribute tree - every construct in the tree adheres to this schema
- */
-export interface ConstructTree {
-    readonly version: string
-    readonly tree: ConstructTreeEntity
-}
-
-/**
- * Represents a construct in the CDK construct tree.
- * The tree is produced by a construct called `Tree` which visits every construct in an application
- * and adds an entry for it.
- *
- * @attribute id - identifier in the tree. At the top level every CDK application will have a construct called "App"
- * The children of "App" will include 'Tree'
- * @attribute path - path in the tree. All application start with a path of ''. The path represents the depth of a
- * construct in a CDK application (i.e Apps contain Stacks which contain Resource - the path would be Stack/Resource)
- * @attribute children - All of the chidren encapsulated by the current level in the tree. Children are keyed on their ids
- * @attribute attributes - An Attribute bag that constructs can voluntarily contribute towards. All CloudFormation
- * resources contribute their type and properties. Attributes will be keyed on convention. i.e. CloudFormation properties
- * are prefixed `aws:cdk:cloudformation`
- */
-export interface ConstructTreeEntity {
-    readonly id: string
-    readonly path: string
-    readonly children?: { [key: string]: ConstructTreeEntity }
-    readonly attributes?: { [key: string]: any }
-}
-
-/**
- * CloudFormation attributes in the construct tree will contain these keys
- * The keys are defined by convention and the prefix `aws:cdk:cloudformation`
- * indicates that the attribute is a property of a CloudFormation resource
- *
- */
-export enum CfnResourceKeys {
-    TYPE = 'aws:cdk:cloudformation:type',
-    PROPS = 'aws:cdk:cloudformation:props',
-}
-
-/**
- * Attributes of a CDK construct
- */
-export interface ConstructAttributes {
-    readonly type: string
-    readonly props: ConstructProps
-}
-
-/**
- * Represents a bag of properties
- * Construct properties can be arrays, objects, strings, or boolean
- */
-export interface ConstructProps {
-    readonly props: { [key: string]: any }
-}
diff --git a/src/cloudWatchLogs/activation.ts b/src/cloudWatchLogs/activation.ts
deleted file mode 100644
index 6e7f8ac8041..00000000000
--- a/src/cloudWatchLogs/activation.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { CLOUDWATCH_LOGS_SCHEME } from '../shared/constants'
-import { Settings } from '../shared/settings'
-import { CloudWatchLogsSettings } from './cloudWatchLogsUtils'
-import { addLogEvents } from './commands/addLogEvents'
-import { copyLogStreamName } from './commands/copyLogStreamName'
-import { saveCurrentLogStreamContent } from './commands/saveCurrentLogStreamContent'
-import { viewLogStream } from './commands/viewLogStream'
-import { LogStreamCodeLensProvider } from './document/logStreamCodeLensProvider'
-import { LogStreamDocumentProvider } from './document/logStreamDocumentProvider'
-import { LogGroupNode } from './explorer/logGroupNode'
-import { LogStreamRegistry } from './registry/logStreamRegistry'
-import { Commands } from '../shared/vscode/commands2'
-
-export async function activate(context: vscode.ExtensionContext, configuration: Settings): Promise<void> {
-    const settings = new CloudWatchLogsSettings(configuration)
-    const registry = new LogStreamRegistry(settings)
-
-    context.subscriptions.push(
-        vscode.workspace.registerTextDocumentContentProvider(
-            CLOUDWATCH_LOGS_SCHEME,
-            new LogStreamDocumentProvider(registry)
-        )
-    )
-
-    context.subscriptions.push(
-        vscode.workspace.onDidCloseTextDocument(doc => {
-            if (doc.isClosed && doc.uri.scheme === CLOUDWATCH_LOGS_SCHEME) {
-                registry.deregisterLog(doc.uri)
-            }
-        })
-    )
-
-    context.subscriptions.push(
-        vscode.languages.registerCodeLensProvider(
-            {
-                language: 'log',
-                scheme: CLOUDWATCH_LOGS_SCHEME,
-            },
-            new LogStreamCodeLensProvider(registry)
-        )
-    )
-
-    context.subscriptions.push(Commands.register('aws.copyLogStreamName', copyLogStreamName))
-    context.subscriptions.push(
-        Commands.register(
-            'aws.addLogEvents',
-            async (
-                document: vscode.TextDocument,
-                registry: LogStreamRegistry,
-                headOrTail: 'head' | 'tail',
-                onDidChangeCodeLensEvent: vscode.EventEmitter<void>
-            ) => addLogEvents(document, registry, headOrTail, onDidChangeCodeLensEvent)
-        ),
-        Commands.register(
-            'aws.saveCurrentLogStreamContent',
-            async (uri?: vscode.Uri) => await saveCurrentLogStreamContent(uri, registry)
-        ),
-        // AWS Explorer right-click action
-        // Here instead of in ../awsexplorer/activation due to dependence on the registry.
-        Commands.register(
-            'aws.cloudWatchLogs.viewLogStream',
-            async (node: LogGroupNode) => await viewLogStream(node, registry)
-        )
-    )
-}
diff --git a/src/cloudWatchLogs/cloudWatchLogsUtils.ts b/src/cloudWatchLogs/cloudWatchLogsUtils.ts
deleted file mode 100644
index 6f32f302449..00000000000
--- a/src/cloudWatchLogs/cloudWatchLogsUtils.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { CLOUDWATCH_LOGS_SCHEME } from '../shared/constants'
-import { fromExtensionManifest } from '../shared/settings'
-
-// URIs are the only vehicle for delivering information to a TextDocumentContentProvider.
-// The following functions are used to structure and destructure relevant information to/from a URI.
-// Colons are not valid characters in either the group name or stream name and will be used as separators.
-
-/**
- * Destructures an awsCloudWatchLogs URI into its component pieces.
- * @param uri URI for a Cloudwatch Logs file
- */
-export function parseCloudWatchLogsUri(uri: vscode.Uri): { groupName: string; streamName: string; regionName: string } {
-    const parts = uri.path.split(':')
-
-    // splits into <CLOUDWATCH_LOGS_SCHEME>:"<groupName>:<streamName>:<regionName>"
-    if (uri.scheme !== CLOUDWATCH_LOGS_SCHEME || parts.length !== 3) {
-        throw new Error(`URI ${uri} is not parseable for CloudWatch Logs`)
-    }
-
-    return {
-        groupName: parts[0],
-        streamName: parts[1],
-        regionName: parts[2],
-    }
-}
-
-/**
- * Converts relevant information for CloudWatch Logs Streams into an awsCloudWatchLogs URI
- * @param groupName Log group name
- * @param streamName Log stream name
- * @param regionName AWS region
- */
-export function convertLogGroupInfoToUri(groupName: string, streamName: string, regionName: string): vscode.Uri {
-    return vscode.Uri.parse(`${CLOUDWATCH_LOGS_SCHEME}:${groupName}:${streamName}:${regionName}`)
-}
-
-export class CloudWatchLogsSettings extends fromExtensionManifest('aws.cloudWatchLogs', { limit: Number }) {}
diff --git a/src/cloudWatchLogs/commands/addLogEvents.ts b/src/cloudWatchLogs/commands/addLogEvents.ts
deleted file mode 100644
index 34c963b4737..00000000000
--- a/src/cloudWatchLogs/commands/addLogEvents.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as AsyncLock from 'async-lock'
-import { getLogger } from '../../shared/logger/logger'
-import { LogStreamRegistry } from '../registry/logStreamRegistry'
-
-// TODO: Cut a PR to the async-lock package?...as of now, maxPending = 0 is theoretically ideal, but also falsy (which sets maxPending = 1000):
-// https://github.com/rogierschouten/async-lock/blob/78cb0c2441650d7bdc148548f99542ccc9c93fd7/lib/index.js#L19
-const lock = new AsyncLock({ maxPending: 1 })
-
-export async function addLogEvents(
-    document: vscode.TextDocument,
-    registry: LogStreamRegistry,
-    headOrTail: 'head' | 'tail',
-    onDidChangeCodeLensEvent: vscode.EventEmitter<void>
-): Promise<void> {
-    const uri = document.uri
-    const lockName = `${headOrTail === 'head' ? 'logStreamHeadLock' : 'logStreamTailLock'}:${uri.path}`
-
-    if (lock.isBusy(lockName)) {
-        getLogger().debug(`addLogEvents already locked for lock: ${lockName}`)
-        return
-    }
-
-    try {
-        await lock.acquire(lockName, async () => {
-            // TODO: Find a way to force this to fire and run through codelens provider prior to updateLog call?
-            // Currently EXTREMELY unreliable that the event signaling that the busy status is set occurs before updateLog completes.
-            registry.setBusyStatus(uri, true)
-            if (onDidChangeCodeLensEvent) {
-                onDidChangeCodeLensEvent.fire()
-            }
-            await registry.updateLog(uri, headOrTail)
-            getLogger().debug('Update done, releasing lock...')
-        })
-    } catch (e) {
-        // contingency in case lock isn't busy but still locked out. Don't want to accidentally trigger making codelens not busy
-        getLogger().debug(`addLogEvents already locked for lock: ${lockName}`)
-        return
-    }
-
-    registry.setBusyStatus(uri, false)
-    if (onDidChangeCodeLensEvent) {
-        onDidChangeCodeLensEvent.fire()
-    }
-}
diff --git a/src/cloudWatchLogs/commands/copyLogStreamName.ts b/src/cloudWatchLogs/commands/copyLogStreamName.ts
deleted file mode 100644
index 745712ae461..00000000000
--- a/src/cloudWatchLogs/commands/copyLogStreamName.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as vscode from 'vscode'
-import { parseCloudWatchLogsUri } from '../cloudWatchLogsUtils'
-
-export async function copyLogStreamName(uri?: vscode.Uri): Promise<void> {
-    try {
-        if (!uri) {
-            // No URI = used command palette as entrypoint, attempt to get URI from active editor
-            // should work correctly under any normal circumstances since the action only appears in command palette when the editor is a CloudWatch Logs editor
-            uri = vscode.window.activeTextEditor?.document.uri
-            if (!uri) {
-                throw new Error()
-            }
-        }
-        const parsedUri = parseCloudWatchLogsUri(uri)
-        await vscode.env.clipboard.writeText(parsedUri.streamName)
-    } catch (e) {
-        vscode.window.showErrorMessage(
-            localize(
-                'AWS.cloudWatchLogs.invalidEditor',
-                'Not a Cloudwatch Log stream: {0}',
-                vscode.window.activeTextEditor?.document.fileName
-            )
-        )
-        return
-    }
-}
diff --git a/src/cloudWatchLogs/commands/saveCurrentLogStreamContent.ts b/src/cloudWatchLogs/commands/saveCurrentLogStreamContent.ts
deleted file mode 100644
index e14d934bef2..00000000000
--- a/src/cloudWatchLogs/commands/saveCurrentLogStreamContent.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as fs from 'fs-extra'
-import * as path from 'path'
-import { SystemUtilities } from '../../shared/systemUtilities'
-import { Result } from '../../shared/telemetry/telemetry'
-import { Window } from '../../shared/vscode/window'
-import { parseCloudWatchLogsUri } from '../cloudWatchLogsUtils'
-import { LogStreamRegistry } from '../registry/logStreamRegistry'
-import { telemetry } from '../../shared/telemetry/telemetry'
-
-export async function saveCurrentLogStreamContent(
-    uri: vscode.Uri | undefined,
-    registry: LogStreamRegistry,
-    window = Window.vscode()
-): Promise<void> {
-    let result: Result = 'Succeeded'
-
-    try {
-        if (!uri) {
-            // No URI = used command palette as entrypoint, attempt to get URI from active editor
-            // should work correctly under any normal circumstances since the action only appears in command palette when the editor is a CloudWatch Logs editor
-            uri = vscode.window.activeTextEditor?.document.uri
-            if (!uri) {
-                throw new Error()
-            }
-        }
-        const content = registry.getLogContent(uri, { timestamps: true })
-        const workspaceDir = vscode.workspace.workspaceFolders
-            ? vscode.workspace.workspaceFolders[0].uri
-            : vscode.Uri.file(SystemUtilities.getHomeDirectory())
-        const uriComponents = parseCloudWatchLogsUri(uri)
-
-        const localizedLogFile = localize('AWS.command.saveCurrentLogStreamContent.logfile', 'Log File')
-        const selectedUri = await window.showSaveDialog({
-            defaultUri: vscode.Uri.parse(path.join(workspaceDir.toString(), uriComponents.streamName)),
-            filters: {
-                [localizedLogFile]: ['log'],
-            },
-        })
-
-        if (selectedUri) {
-            try {
-                await fs.writeFile(selectedUri.fsPath, content)
-                // TODO: Open file and close virtual doc? Is this possible?
-            } catch (e) {
-                result = 'Failed'
-                const err = e as Error
-                vscode.window.showErrorMessage(
-                    localize(
-                        'AWS.command.saveCurrentLogStreamContent.error',
-                        'Error saving current log to {0}: {1}',
-                        selectedUri.fsPath,
-                        err.message
-                    )
-                )
-            }
-        } else {
-            result = 'Cancelled'
-        }
-    } catch (e) {
-        result = 'Failed'
-        vscode.window.showErrorMessage(
-            localize(
-                'AWS.cloudWatchLogs.invalidEditor',
-                'Not a Cloudwatch Log stream: {0}',
-                vscode.window.activeTextEditor?.document.fileName
-            )
-        )
-    }
-
-    telemetry.cloudwatchlogs_downloadStreamToFile.emit({
-        result: result,
-    })
-}
diff --git a/src/cloudWatchLogs/commands/viewLogStream.ts b/src/cloudWatchLogs/commands/viewLogStream.ts
deleted file mode 100644
index bf7d4d8cc4d..00000000000
--- a/src/cloudWatchLogs/commands/viewLogStream.ts
+++ /dev/null
@@ -1,171 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as vscode from 'vscode'
-import * as moment from 'moment'
-import * as picker from '../../shared/ui/picker'
-import { MultiStepWizard, WIZARD_RETRY, WIZARD_TERMINATE, WizardStep } from '../../shared/wizards/multiStepWizard'
-import { LogGroupNode } from '../explorer/logGroupNode'
-import { CloudWatchLogs } from 'aws-sdk'
-
-import { DefaultCloudWatchLogsClient } from '../../shared/clients/cloudWatchLogsClient'
-import { LOCALIZED_DATE_FORMAT } from '../../shared/constants'
-import { getPaginatedAwsCallIter, IteratorTransformer } from '../../shared/utilities/collectionUtils'
-import { LogStreamRegistry } from '../registry/logStreamRegistry'
-import { convertLogGroupInfoToUri } from '../cloudWatchLogsUtils'
-import { telemetry } from '../../shared/telemetry/telemetry'
-import { Result } from '../../shared/telemetry/telemetry'
-
-export interface SelectLogStreamResponse {
-    region: string
-    logGroupName: string
-    logStreamName: string
-}
-
-export async function viewLogStream(node: LogGroupNode, registry: LogStreamRegistry): Promise<void> {
-    let result: Result = 'Succeeded'
-    const logStreamResponse = await new SelectLogStreamWizard(node).run()
-    if (logStreamResponse) {
-        const uri = convertLogGroupInfoToUri(
-            logStreamResponse.logGroupName,
-            logStreamResponse.logStreamName,
-            logStreamResponse.region
-        )
-        await registry.registerLog(uri)
-        const doc = await vscode.workspace.openTextDocument(uri) // calls back into the provider
-        vscode.languages.setTextDocumentLanguage(doc, 'log')
-        await vscode.window.showTextDocument(doc, { preview: false })
-    } else {
-        result = 'Cancelled'
-    }
-
-    telemetry.cloudwatchlogs_openStream.emit({ result })
-}
-
-export interface SelectLogStreamWizardContext {
-    pickLogStream(): Promise<string | undefined>
-}
-
-export class DefaultSelectLogStreamWizardContext implements SelectLogStreamWizardContext {
-    private readonly totalSteps = 1
-    public constructor(private readonly regionCode: string, private readonly logGroupName: string) {}
-
-    public async pickLogStream(): Promise<string | undefined> {
-        let telemetryResult: Result = 'Succeeded'
-
-        const client = new DefaultCloudWatchLogsClient(this.regionCode)
-        const request: CloudWatchLogs.DescribeLogStreamsRequest = {
-            logGroupName: this.logGroupName,
-            orderBy: 'LastEventTime',
-            descending: true,
-        }
-        const qp = picker.createQuickPick({
-            options: {
-                title: localize('AWS.cloudWatchLogs.viewLogStream.workflow.prompt', 'Select a log stream'),
-                step: 1,
-                totalSteps: this.totalSteps,
-            },
-        })
-        const populator = new IteratorTransformer(
-            () =>
-                getPaginatedAwsCallIter({
-                    awsCall: request => client.describeLogStreams(request),
-                    nextTokenNames: {
-                        request: 'nextToken',
-                        response: 'nextToken',
-                    },
-                    request,
-                }),
-            response => convertDescribeLogToQuickPickItems(response)
-        )
-
-        const controller = new picker.IteratingQuickPickController(qp, populator)
-        controller.startRequests()
-        const choices = await picker.promptUser({
-            picker: qp,
-            onDidTriggerButton: (button, resolve, reject) =>
-                controller.iteratingOnDidTriggerButton(button, resolve, reject),
-        })
-
-        const val = picker.verifySinglePickerOutput(choices)
-
-        let result = val?.label
-
-        // handle no items for a group as a cancel
-        if (!result || result === picker.IteratingQuickPickController.NO_ITEMS_ITEM.label) {
-            result = undefined
-            telemetryResult = 'Cancelled'
-        }
-        // retry handled by caller -- should this be a "Failed"?
-        // of note: we don't track if an error pops up, we just track if the error is selected.
-        if (result === picker.IteratingQuickPickController.ERROR_ITEM.label) {
-            telemetryResult = 'Failed'
-        }
-
-        telemetry.cloudwatchlogs_openGroup.emit({ result: telemetryResult })
-        return result
-    }
-}
-
-export function convertDescribeLogToQuickPickItems(
-    response: CloudWatchLogs.DescribeLogStreamsResponse
-): vscode.QuickPickItem[] {
-    return (response.logStreams ?? []).map<vscode.QuickPickItem>(stream => ({
-        label: stream.logStreamName!,
-        detail: stream.lastEventTimestamp
-            ? moment(stream.lastEventTimestamp).format(LOCALIZED_DATE_FORMAT)
-            : localize('AWS.cloudWatchLogs.viewLogStream.workflow.noStreams', '[No Log Events found]'),
-    }))
-}
-
-export class SelectLogStreamWizard extends MultiStepWizard<SelectLogStreamResponse> {
-    private readonly response: Partial<SelectLogStreamResponse>
-
-    public constructor(
-        node: LogGroupNode,
-        private readonly context: SelectLogStreamWizardContext = new DefaultSelectLogStreamWizardContext(
-            node.regionCode,
-            node.logGroup.logGroupName!
-        )
-    ) {
-        super()
-        this.response = {
-            region: node.regionCode,
-            logGroupName: node.logGroup.logGroupName,
-        }
-    }
-
-    protected get startStep(): WizardStep {
-        return this.selectStream
-    }
-
-    protected getResult(): SelectLogStreamResponse | undefined {
-        if (!this.response.region || !this.response.logGroupName || !this.response.logStreamName) {
-            return undefined
-        }
-
-        return {
-            region: this.response.region,
-            logGroupName: this.response.logGroupName,
-            logStreamName: this.response.logStreamName,
-        }
-    }
-
-    private readonly selectStream: WizardStep = async () => {
-        const returnVal = await this.context.pickLogStream()
-
-        // retry on error
-        if (returnVal === picker.IteratingQuickPickController.ERROR_ITEM.label) {
-            return WIZARD_RETRY
-        }
-
-        this.response.logStreamName = returnVal
-
-        return WIZARD_TERMINATE
-    }
-}
diff --git a/src/cloudWatchLogs/document/logStreamCodeLensProvider.ts b/src/cloudWatchLogs/document/logStreamCodeLensProvider.ts
deleted file mode 100644
index 227b4bc499e..00000000000
--- a/src/cloudWatchLogs/document/logStreamCodeLensProvider.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as vscode from 'vscode'
-import { CLOUDWATCH_LOGS_SCHEME } from '../../shared/constants'
-import { LogStreamRegistry } from '../registry/logStreamRegistry'
-
-export class LogStreamCodeLensProvider implements vscode.CodeLensProvider {
-    public constructor(private readonly registry: LogStreamRegistry) {}
-
-    private _onDidChangeCodeLenses = new vscode.EventEmitter<void>()
-    public get onDidChangeCodeLenses(): vscode.Event<void> {
-        return this._onDidChangeCodeLenses.event
-    }
-
-    public provideCodeLenses(
-        document: vscode.TextDocument,
-        token: vscode.CancellationToken
-    ): vscode.ProviderResult<vscode.CodeLens[]> {
-        const uri = document.uri
-        const isBusy = this.registry.getBusyStatus(uri)
-
-        const busyCommand: vscode.Command = {
-            title: localize('AWS.message.loading', 'Loading...'),
-            command: 'aws.doNothingCommand',
-        }
-
-        const codelenses = [
-            // first line of virtual doc: always show "Load Older"
-            {
-                range: new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 0)),
-                isResolved: true,
-                command: isBusy
-                    ? busyCommand
-                    : {
-                          title: localize('AWS.cloudWatchLogs.codeLens.loadOlder', 'Load older events...'),
-                          command: 'aws.addLogEvents',
-                          arguments: [document, this.registry, 'head', this._onDidChangeCodeLenses],
-                      },
-            },
-            // last line of virtual doc: always show "Load Newer"
-            {
-                range: new vscode.Range(
-                    new vscode.Position(document.lineCount - 1, 0),
-                    new vscode.Position(document.lineCount - 1, 0)
-                ),
-                isResolved: true,
-                command: isBusy
-                    ? busyCommand
-                    : {
-                          title: localize('AWS.cloudWatchLogs.codeLens.loadNewer', 'Load newer events...'),
-                          command: 'aws.addLogEvents',
-                          arguments: [document, this.registry, 'tail', this._onDidChangeCodeLenses],
-                      },
-            },
-        ]
-
-        return uri.scheme === CLOUDWATCH_LOGS_SCHEME ? codelenses : []
-    }
-}
diff --git a/src/cloudWatchLogs/document/logStreamDocumentProvider.ts b/src/cloudWatchLogs/document/logStreamDocumentProvider.ts
deleted file mode 100644
index 0979f4b6ab0..00000000000
--- a/src/cloudWatchLogs/document/logStreamDocumentProvider.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { LogStreamRegistry } from '../registry/logStreamRegistry'
-import { getLogger } from '../../shared/logger'
-
-export class LogStreamDocumentProvider implements vscode.TextDocumentContentProvider {
-    // Expose an event to signal changes of _virtual_ documents
-    // to the editor
-    private _onDidChange = new vscode.EventEmitter<vscode.Uri>()
-    public get onDidChange(): vscode.Event<vscode.Uri> {
-        return this._onDidChange.event
-    }
-
-    public constructor(private readonly registry: LogStreamRegistry) {
-        this.registry.onDidChange(uri => {
-            getLogger().debug(`Registry item changed: ${uri.path}`)
-            this._onDidChange.fire(uri)
-        })
-    }
-
-    public provideTextDocumentContent(uri: vscode.Uri): string {
-        // get latest content and return
-        const content = this.registry.getLogContent(uri, { timestamps: true })
-        if (!content) {
-            getLogger().error(`No content found for URI: ${uri}`)
-        }
-
-        return content ?? ''
-    }
-}
diff --git a/src/cloudWatchLogs/explorer/cloudWatchLogsNode.ts b/src/cloudWatchLogs/explorer/cloudWatchLogsNode.ts
deleted file mode 100644
index 8af7e7f7e12..00000000000
--- a/src/cloudWatchLogs/explorer/cloudWatchLogsNode.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import { CloudWatchLogs } from 'aws-sdk'
-import * as vscode from 'vscode'
-
-import { DefaultCloudWatchLogsClient } from '../../shared/clients/cloudWatchLogsClient'
-
-import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
-import { toMap, updateInPlace, toArrayAsync } from '../../shared/utilities/collectionUtils'
-import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
-import { makeChildrenNodes } from '../../shared/treeview/utils'
-import { LogGroupNode } from './logGroupNode'
-
-export abstract class CloudWatchLogsBase extends AWSTreeNodeBase {
-    protected readonly logGroupNodes: Map<string, LogGroupNode>
-    protected abstract readonly placeholderMessage: string
-
-    public constructor(
-        label: string,
-        public override readonly regionCode: string,
-        protected readonly cloudwatchClient: DefaultCloudWatchLogsClient
-    ) {
-        super(label, vscode.TreeItemCollapsibleState.Collapsed)
-        this.logGroupNodes = new Map<string, LogGroupNode>()
-    }
-
-    protected abstract getLogGroups(): Promise<Map<string, CloudWatchLogs.LogGroup>>
-
-    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
-        return await makeChildrenNodes({
-            getChildNodes: async () => {
-                await this.updateChildren()
-
-                return [...this.logGroupNodes.values()]
-            },
-            getNoChildrenPlaceholderNode: async () => new PlaceholderNode(this, this.placeholderMessage),
-            sort: (nodeA, nodeB) => nodeA.name.localeCompare(nodeB.name),
-        })
-    }
-
-    public async updateChildren(): Promise<void> {
-        const logGroups = await this.getLogGroups()
-
-        updateInPlace(
-            this.logGroupNodes,
-            logGroups.keys(),
-            key => this.logGroupNodes.get(key)!.update(logGroups.get(key)!),
-            key => new LogGroupNode(this.regionCode, logGroups.get(key)!)
-        )
-    }
-}
-export class CloudWatchLogsNode extends CloudWatchLogsBase {
-    protected readonly placeholderMessage = localize('AWS.explorerNode.cloudWatchLogs.nologs', '[No log groups found]')
-
-    public constructor(regionCode: string, client = new DefaultCloudWatchLogsClient(regionCode)) {
-        super('CloudWatch Logs', regionCode, client)
-    }
-
-    protected async getLogGroups(): Promise<Map<string, CloudWatchLogs.LogGroup>> {
-        return toMap(
-            await toArrayAsync(this.cloudwatchClient.describeLogGroups()),
-            configuration => configuration.logGroupName
-        )
-    }
-}
diff --git a/src/cloudWatchLogs/explorer/logGroupNode.ts b/src/cloudWatchLogs/explorer/logGroupNode.ts
deleted file mode 100644
index f1968dbb155..00000000000
--- a/src/cloudWatchLogs/explorer/logGroupNode.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { CloudWatchLogs } from 'aws-sdk'
-import * as os from 'os'
-import { AWSResourceNode } from '../../shared/treeview/nodes/awsResourceNode'
-import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
-import { getIcon } from '../../shared/icons'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-
-export const contextValueCloudwatchLog = 'awsCloudWatchLogNode'
-
-export class LogGroupNode extends AWSTreeNodeBase implements AWSResourceNode {
-    public constructor(public override readonly regionCode: string, public logGroup: CloudWatchLogs.LogGroup) {
-        super('')
-        this.update(logGroup)
-        this.iconPath = getIcon('aws-cloudwatch-log-group')
-        this.contextValue = contextValueCloudwatchLog
-        this.command = {
-            command: 'aws.cloudWatchLogs.viewLogStream',
-            title: localize('AWS.command.cloudWatchLogs.viewLogStream', 'View Log Stream'),
-            arguments: [this],
-        }
-    }
-
-    public update(logGroup: CloudWatchLogs.LogGroup): void {
-        this.logGroup = logGroup
-        this.label = this.logGroup.logGroupName || ''
-        this.tooltip = `${this.logGroup.logGroupName}${os.EOL}${this.logGroup.arn}`
-    }
-
-    public get name(): string {
-        return this.logGroup.logGroupName!
-    }
-
-    public get arn(): string {
-        if (this.logGroup.arn === undefined) {
-            throw new Error('Log Group Arn expected but not found')
-        }
-
-        return this.logGroup.arn
-    }
-}
diff --git a/src/cloudWatchLogs/registry/logStreamRegistry.ts b/src/cloudWatchLogs/registry/logStreamRegistry.ts
deleted file mode 100644
index 157fe8e0eca..00000000000
--- a/src/cloudWatchLogs/registry/logStreamRegistry.ts
+++ /dev/null
@@ -1,236 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as moment from 'moment'
-import * as vscode from 'vscode'
-import { CloudWatchLogs } from 'aws-sdk'
-import { CloudWatchLogsSettings, parseCloudWatchLogsUri } from '../cloudWatchLogsUtils'
-import { DefaultCloudWatchLogsClient } from '../../shared/clients/cloudWatchLogsClient'
-
-import { getLogger } from '../../shared/logger'
-import { INSIGHTS_TIMESTAMP_FORMAT } from '../../shared/constants'
-
-// TODO: Add debug logging statements
-
-/**
- * Class which contains CRUD operations and persistence for CloudWatch Logs streams.
- */
-export class LogStreamRegistry {
-    private readonly _onDidChange: vscode.EventEmitter<vscode.Uri> = new vscode.EventEmitter<vscode.Uri>()
-
-    public constructor(
-        private readonly configuration: CloudWatchLogsSettings,
-        private readonly activeStreams: Map<string, CloudWatchLogStreamData> = new Map<
-            string,
-            CloudWatchLogStreamData
-        >()
-    ) {}
-
-    /**
-     * Event fired on log content change
-     */
-    public get onDidChange(): vscode.Event<vscode.Uri> {
-        return this._onDidChange.event
-    }
-
-    /**
-     * Adds an entry to the registry for the given URI.
-     * @param uri Document URI
-     * @param getLogEventsFromUriComponentsFn Override for testing purposes.
-     */
-    public async registerLog(
-        uri: vscode.Uri,
-        getLogEventsFromUriComponentsFn?: (logGroupInfo: {
-            groupName: string
-            streamName: string
-            regionName: string
-        }) => Promise<CloudWatchLogs.GetLogEventsResponse>
-    ): Promise<void> {
-        // ensure this is a CloudWatchLogs URI; don't need the return value, just need to make sure it doesn't throw.
-        parseCloudWatchLogsUri(uri)
-        if (!this.hasLog(uri)) {
-            this.setLog(uri, new CloudWatchLogStreamData())
-            await this.updateLog(uri, 'tail', getLogEventsFromUriComponentsFn)
-        }
-    }
-
-    /**
-     * Returns whether or not the log is registered.
-     * @param uri Document URI
-     */
-    public hasLog(uri: vscode.Uri): boolean {
-        return this.activeStreams.has(uri.path)
-    }
-
-    /**
-     * Returns the currently-held log content for a URI as a formatted string.
-     * @param uri Document URI
-     * @param formatting Optional params for outputting log messages.
-     */
-    public getLogContent(uri: vscode.Uri, formatting?: { timestamps?: boolean }): string | undefined {
-        const inlineNewLineRegex = /((\r\n)|\n|\r)(?!$)/g
-
-        // if no timestamp for some reason, entering a blank of equal length (29 characters long)
-        const timestampSpaceEquivalent = '                             '
-
-        const currData = this.getLog(uri)
-
-        if (!currData) {
-            return undefined
-        }
-
-        let output: string = ''
-        for (const datum of currData.data) {
-            let line: string = datum.message ?? ''
-            if (formatting?.timestamps) {
-                // TODO: Handle different timezones and unix timestamps?
-                const timestamp = datum.timestamp
-                    ? moment(datum.timestamp).format(INSIGHTS_TIMESTAMP_FORMAT)
-                    : timestampSpaceEquivalent
-                line = timestamp.concat('\t', line)
-                // log entries containing newlines are indented to the same length as the timestamp.
-                line = line.replace(inlineNewLineRegex, `\n${timestampSpaceEquivalent}\t`)
-            }
-            if (!line.endsWith('\n')) {
-                line = line.concat('\n')
-            }
-            output = output.concat(line)
-        }
-
-        return output
-    }
-
-    /**
-     * Retrieves the next set of data for a log and adds it to the registry. Data can either be added to the front of the log (`'head'`) or end (`'tail'`)
-     * @param uri Document URI
-     * @param headOrTail Determines update behavior: `'head'` retrieves the most recent previous token and appends data to the top of the log, `'tail'` does the opposite. Default: `'tail'`
-     * @param getLogEventsFromUriComponentsFn Override for testing purposes.
-     */
-    public async updateLog(
-        uri: vscode.Uri,
-        headOrTail: 'head' | 'tail' = 'tail',
-        getLogEventsFromUriComponentsFn?: (
-            logGroupInfo: {
-                groupName: string
-                streamName: string
-                regionName: string
-            },
-            nextToken?: string
-        ) => Promise<CloudWatchLogs.GetLogEventsResponse>
-    ): Promise<void> {
-        const stream = this.getLog(uri)
-        if (!stream) {
-            getLogger().debug(`No registry entry for ${uri.path}`)
-            return
-        }
-        const nextToken = headOrTail === 'head' ? stream.previous?.token : stream.next?.token
-        const logGroupInfo = parseCloudWatchLogsUri(uri)
-        try {
-            // TODO: Consider getPaginatedAwsCallIter? Would need a way to differentiate between head/tail...
-            const logEvents = getLogEventsFromUriComponentsFn
-                ? await getLogEventsFromUriComponentsFn(logGroupInfo, nextToken)
-                : await this.getLogEventsFromUriComponents(logGroupInfo, nextToken)
-            const newData =
-                headOrTail === 'head'
-                    ? (logEvents.events ?? []).concat(stream.data)
-                    : stream.data.concat(logEvents.events ?? [])
-
-            const tokens: Pick<CloudWatchLogStreamData, 'next' | 'previous'> = {}
-            // update if no token exists or if the token is updated in the correct direction.
-            if (!stream.previous || headOrTail === 'head') {
-                tokens.previous = {
-                    token: logEvents.nextBackwardToken ?? '',
-                }
-            }
-            if (!stream.next || headOrTail === 'tail') {
-                tokens.next = {
-                    token: logEvents.nextForwardToken ?? '',
-                }
-            }
-
-            this.setLog(uri, {
-                ...stream,
-                ...tokens,
-                data: newData,
-            })
-
-            this._onDidChange.fire(uri)
-        } catch (e) {
-            const err = e as Error
-            vscode.window.showErrorMessage(
-                localize(
-                    'AWS.cloudWatchLogs.viewLogStream.errorRetrievingLogs',
-                    'Error retrieving logs for Log Stream {0} : {1}',
-                    logGroupInfo.streamName,
-                    err.message
-                )
-            )
-        }
-    }
-
-    /**
-     * Deletes a stream from the registry.
-     * @param uri Document URI
-     */
-    public deregisterLog(uri: vscode.Uri): void {
-        this.activeStreams.delete(uri.path)
-    }
-
-    public setBusyStatus(uri: vscode.Uri, isBusy: boolean): void {
-        const log = this.getLog(uri)
-        if (log) {
-            this.setLog(uri, {
-                ...log,
-                busy: isBusy,
-            })
-        }
-    }
-
-    public getBusyStatus(uri: vscode.Uri): boolean {
-        const log = this.getLog(uri)
-
-        return (log && log.busy) ?? false
-    }
-
-    private setLog(uri: vscode.Uri, stream: CloudWatchLogStreamData): void {
-        this.activeStreams.set(uri.path, stream)
-    }
-
-    private getLog(uri: vscode.Uri): CloudWatchLogStreamData | undefined {
-        return this.activeStreams.get(uri.path)
-    }
-
-    private async getLogEventsFromUriComponents(
-        logGroupInfo: {
-            groupName: string
-            streamName: string
-            regionName: string
-        },
-        nextToken?: string
-    ): Promise<CloudWatchLogs.GetLogEventsResponse> {
-        const client = new DefaultCloudWatchLogsClient(logGroupInfo.regionName)
-
-        return await client.getLogEvents({
-            logGroupName: logGroupInfo.groupName,
-            logStreamName: logGroupInfo.streamName,
-            nextToken,
-            limit: this.configuration.get('limit', 1000),
-        })
-    }
-}
-
-export class CloudWatchLogStreamData {
-    data: CloudWatchLogs.OutputLogEvents = []
-    next?: {
-        token: CloudWatchLogs.NextToken
-    }
-    previous?: {
-        token: CloudWatchLogs.NextToken
-    }
-    busy: boolean = false
-}
diff --git a/src/codecatalyst/activation.ts b/src/codecatalyst/activation.ts
deleted file mode 100644
index 2d71fca1c13..00000000000
--- a/src/codecatalyst/activation.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as uriHandlers from './uriHandlers'
-import * as vscode from 'vscode'
-import * as nls from 'vscode-nls'
-import { ExtContext } from '../shared/extensions'
-import { CodeCatalystRemoteSourceProvider } from './repos/remoteSourceProvider'
-import { CodeCatalystCommands } from './commands'
-import { GitExtension } from '../shared/extensions/git'
-import { CodeCatalystAuthenticationProvider } from './auth'
-import { registerDevfileWatcher } from './devfile'
-import { DevEnvClient } from '../shared/clients/devenvClient'
-import { watchRestartingDevEnvs } from './reconnect'
-import { getCodeCatalystDevEnvId } from '../shared/vscode/env'
-import { PromptSettings } from '../shared/settings'
-import { dontShow } from '../shared/localizedText'
-import { isCloud9 } from '../shared/extensionUtilities'
-import { Commands } from '../shared/vscode/commands2'
-import { getCodeCatalystConfig } from '../shared/clients/codecatalystClient'
-
-const localize = nls.loadMessageBundle()
-
-/**
- * Activate CodeCatalyst functionality.
- */
-export async function activate(ctx: ExtContext): Promise<void> {
-    const authProvider = CodeCatalystAuthenticationProvider.fromContext(ctx.extensionContext)
-    const commands = new CodeCatalystCommands(authProvider)
-    const remoteSourceProvider = new CodeCatalystRemoteSourceProvider(commands, authProvider)
-
-    ctx.extensionContext.subscriptions.push(
-        uriHandlers.register(ctx.uriHandler, CodeCatalystCommands.declared),
-        ...Object.values(CodeCatalystCommands.declared).map(c => c.register(commands))
-    )
-
-    if (!isCloud9()) {
-        GitExtension.instance.registerRemoteSourceProvider(remoteSourceProvider).then(disposable => {
-            ctx.extensionContext.subscriptions.push(disposable)
-        })
-
-        GitExtension.instance
-            .registerCredentialsProvider({
-                getCredentials(uri: vscode.Uri) {
-                    if (uri.authority.endsWith(getCodeCatalystConfig().gitHostname)) {
-                        return commands.withClient(client => authProvider.getCredentialsForGit(client))
-                    }
-                },
-            })
-            .then(disposable => ctx.extensionContext.subscriptions.push(disposable))
-
-        watchRestartingDevEnvs(ctx, authProvider)
-    }
-
-    const devenvClient = new DevEnvClient()
-    if (devenvClient.id) {
-        ctx.extensionContext.subscriptions.push(registerDevfileWatcher(devenvClient))
-    }
-
-    const settings = PromptSettings.instance
-    if (getCodeCatalystDevEnvId()) {
-        if (await settings.isPromptEnabled('remoteConnected')) {
-            const message = localize(
-                'AWS.codecatalyst.connectedMessage',
-                'Welcome to your Amazon CodeCatalyst Dev Environment. For more options and information, view Dev Environment settings (AWS Extension > CodeCatalyst).'
-            )
-            const openDevEnvSettings = localize('AWS.codecatalyst.openDevEnvSettings', 'Open Dev Environment Settings')
-            vscode.window.showInformationMessage(message, dontShow, openDevEnvSettings).then(selection => {
-                if (selection === dontShow) {
-                    settings.disablePrompt('remoteConnected')
-                } else if (selection === openDevEnvSettings) {
-                    CodeCatalystCommands.declared.openDevEnvSettings.execute()
-                }
-            })
-        }
-    }
-
-    Commands.register('aws.codecatalyst.removeConnection', () => {
-        authProvider.removeSavedConnection()
-    })
-}
diff --git a/src/codecatalyst/auth.ts b/src/codecatalyst/auth.ts
deleted file mode 100644
index 50653f4591c..00000000000
--- a/src/codecatalyst/auth.ts
+++ /dev/null
@@ -1,189 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { CodeCatalystClient } from '../shared/clients/codecatalystClient'
-import { isCloud9 } from '../shared/extensionUtilities'
-import {
-    Auth,
-    isBuilderIdConnection,
-    Connection,
-    SsoConnection,
-    codecatalystScopes,
-    hasScopes,
-    createBuilderIdConnection,
-} from '../credentials/auth'
-import { getSecondaryAuth } from '../credentials/secondaryAuth'
-import { getLogger } from '../shared/logger'
-import * as localizedText from '../shared/localizedText'
-import { ToolkitError } from '../shared/errors'
-import { MetricName, MetricShapes, telemetry } from '../shared/telemetry/telemetry'
-
-// Secrets stored on the macOS keychain appear as individual entries for each key
-// This is fine so long as the user has only a few accounts. Otherwise this should
-// store secrets as a map.
-export class CodeCatalystAuthStorage {
-    public constructor(private readonly secrets: vscode.SecretStorage) {}
-
-    public async getPat(username: string): Promise<string | undefined> {
-        return this.secrets.get(`codecatalyst.pat.${username}`)
-    }
-
-    public async storePat(username: string, pat: string): Promise<void> {
-        await this.secrets.store(`codecatalyst.pat.${username}`, pat)
-    }
-}
-
-const isValidCodeCatalystConnection = (conn: Connection): conn is SsoConnection =>
-    isBuilderIdConnection(conn) && hasScopes(conn, codecatalystScopes)
-
-export class CodeCatalystAuthenticationProvider {
-    public readonly onDidChangeActiveConnection = this.secondaryAuth.onDidChangeActiveConnection
-
-    public constructor(
-        protected readonly storage: CodeCatalystAuthStorage,
-        protected readonly memento: vscode.Memento,
-        public readonly auth = Auth.instance,
-        public readonly secondaryAuth = getSecondaryAuth('codecatalyst', 'CodeCatalyst', isValidCodeCatalystConnection)
-    ) {}
-
-    public get activeConnection() {
-        return this.secondaryAuth.activeConnection
-    }
-
-    public get isUsingSavedConnection() {
-        return this.secondaryAuth.isUsingSavedConnection
-    }
-
-    // Get rid of this? Not sure where to put PAT code.
-    public async getPat(client: CodeCatalystClient, username = client.identity.name): Promise<string> {
-        const stored = await this.storage.getPat(username)
-
-        if (stored) {
-            return stored
-        }
-
-        const resp = await client.createAccessToken({ name: 'aws-toolkits-vscode-token' })
-        await this.storage.storePat(username, resp.secret)
-
-        return resp.secret
-    }
-
-    public async getCredentialsForGit(client: CodeCatalystClient) {
-        getLogger().verbose(`codecatalyst (git): attempting to provide credentials`)
-
-        const username = client.identity.name
-
-        try {
-            return {
-                username,
-                password: await this.getPat(client, username),
-            }
-        } catch (err) {
-            getLogger().verbose(`codecatalyst (git): failed to get credentials for user "${username}": %s`, err)
-        }
-    }
-
-    public async removeSavedConnection() {
-        await this.secondaryAuth.removeConnection()
-    }
-
-    public async restore() {
-        await this.secondaryAuth.restoreConnection()
-    }
-
-    public async promptNotConnected(): Promise<SsoConnection> {
-        type ConnectionFlowEvent = Partial<MetricShapes[MetricName]> & {
-            readonly codecatalyst_connectionFlow: 'Create' | 'Switch' | 'Upgrade' // eslint-disable-line @typescript-eslint/naming-convention
-        }
-
-        const conn = (await this.auth.listConnections()).find(isBuilderIdConnection)
-        const isNewUser = conn === undefined
-        const okItem: vscode.MessageItem = { title: localizedText.ok }
-        const cancelItem: vscode.MessageItem = { title: localizedText.cancel, isCloseAffordance: true }
-
-        if (isNewUser || !isValidCodeCatalystConnection(conn)) {
-            // TODO: change to `satisfies` on TS 4.9
-            telemetry.record({ codecatalyst_connectionFlow: isNewUser ? 'Create' : 'Upgrade' } as ConnectionFlowEvent)
-
-            const message = isNewUser
-                ? 'CodeCatalyst requires an AWS Builder ID connection. Creating a connection opens your browser to login.\n\n Create one now?'
-                : 'Your AWS Builder ID connection does not have access to CodeCatalyst. Upgrading the connection requires another login.\n\n Upgrade now?'
-            const resp = await vscode.window.showInformationMessage(message, { modal: true }, okItem, cancelItem)
-            if (resp !== okItem) {
-                throw new ToolkitError('Not connected to CodeCatalyst', { code: 'NoConnection', cancelled: true })
-            }
-
-            const newConn = await createBuilderIdConnection(this.auth)
-            if (this.auth.activeConnection?.id !== newConn.id) {
-                await this.secondaryAuth.useNewConnection(newConn)
-            }
-
-            return newConn
-        }
-
-        if (this.auth.activeConnection?.id !== conn.id) {
-            // TODO: change to `satisfies` on TS 4.9
-            telemetry.record({ codecatalyst_connectionFlow: 'Switch' } as ConnectionFlowEvent)
-
-            const resp = await vscode.window.showInformationMessage(
-                'CodeCatalyst requires an AWS Builder ID connection.\n\n Switch to it now?',
-                { modal: true },
-                okItem,
-                cancelItem
-            )
-            if (resp !== okItem) {
-                throw new ToolkitError('Not connected to CodeCatalyst', { code: 'NoConnection', cancelled: true })
-            }
-
-            await this.secondaryAuth.useNewConnection(conn)
-
-            return conn
-        }
-
-        throw new ToolkitError('Not connected to CodeCatalyst', { code: 'NoConnectionBadState' })
-    }
-
-    private static instance: CodeCatalystAuthenticationProvider
-
-    public static fromContext(ctx: Pick<vscode.ExtensionContext, 'secrets' | 'globalState'>) {
-        const secrets = isCloud9() ? new SecretMemento(ctx.globalState) : ctx.secrets
-
-        return (this.instance ??= new this(new CodeCatalystAuthStorage(secrets), ctx.globalState))
-    }
-}
-
-/**
- * `secrets` API polyfill for C9.
- *
- * For development only. Do NOT use this for anything else.
- */
-class SecretMemento implements vscode.SecretStorage {
-    private readonly onDidChangeEmitter = new vscode.EventEmitter<vscode.SecretStorageChangeEvent>()
-    public readonly onDidChange = this.onDidChangeEmitter.event
-
-    public constructor(private readonly memento: vscode.Memento) {}
-
-    public async get(key: string): Promise<string | undefined> {
-        return this.getSecrets()[key]
-    }
-
-    public async store(key: string, value: string): Promise<void> {
-        const current = this.getSecrets()
-        await this.memento.update('__secrets', { ...current, [key]: value })
-        this.onDidChangeEmitter.fire({ key })
-    }
-
-    public async delete(key: string): Promise<void> {
-        const current = this.getSecrets()
-        delete current[key]
-        await this.memento.update('__secrets', current)
-        this.onDidChangeEmitter.fire({ key })
-    }
-
-    private getSecrets(): Record<string, string | undefined> {
-        return this.memento.get('__secrets', {})
-    }
-}
diff --git a/src/codecatalyst/commands.ts b/src/codecatalyst/commands.ts
deleted file mode 100644
index 0c69acdc489..00000000000
--- a/src/codecatalyst/commands.ts
+++ /dev/null
@@ -1,298 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import globals from '../shared/extensionGlobals'
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as vscode from 'vscode'
-import { selectCodeCatalystResource } from './wizards/selectResource'
-import { openCodeCatalystUrl, recordSource } from './utils'
-import { CodeCatalystAuthenticationProvider } from './auth'
-import { Commands } from '../shared/vscode/commands2'
-import { CodeCatalystClient, CodeCatalystResource, createClient } from '../shared/clients/codecatalystClient'
-import { DevEnvironmentId, getConnectedDevEnv, openDevEnv } from './model'
-import { showConfigureDevEnv } from './vue/configure/backend'
-import { showCreateDevEnv } from './vue/create/backend'
-import { CancellationError } from '../shared/utilities/timeoutUtils'
-import { ToolkitError } from '../shared/errors'
-import { telemetry } from '../shared/telemetry/telemetry'
-import { showConfirmationMessage } from '../shared/utilities/messages'
-import { AccountStatus } from '../shared/telemetry/telemetryClient'
-import { CreateDevEnvironmentRequest } from 'aws-sdk/clients/codecatalyst'
-
-/** "List CodeCatalyst Commands" command. */
-export async function listCommands(): Promise<void> {
-    vscode.commands.executeCommand('workbench.action.quickOpen', '> CodeCatalyst')
-}
-
-/** "Clone CodeCatalyst Repository" command. */
-export async function cloneCodeCatalystRepo(client: CodeCatalystClient, url?: vscode.Uri): Promise<void> {
-    let resource: { name: string; project: string; org: string }
-    if (!url) {
-        const r = await selectCodeCatalystResource(client, 'repo')
-        if (!r) {
-            throw new CancellationError('user')
-        }
-        resource = { name: r.name, project: r.project.name, org: r.org.name }
-    } else {
-        const [_, org, project, repo] = url.path.slice(1).split('/')
-        if (!org || !project || !repo) {
-            throw new Error(`Invalid CodeCatalyst URL: unable to parse repository`)
-        }
-        resource = { name: repo, project, org }
-    }
-
-    const uri = await client.getRepoCloneUrl({
-        spaceName: resource.org,
-        projectName: resource.project,
-        sourceRepositoryName: resource.name,
-    })
-    await vscode.commands.executeCommand('git.clone', uri)
-}
-
-/**
- * Implements commands:
- * - "Open CodeCatalyst Space"
- * - "Open CodeCatalyst Project"
- * - "Open CodeCatalyst Repository"
- */
-export async function openCodeCatalystResource(
-    client: CodeCatalystClient,
-    kind: CodeCatalystResource['type']
-): Promise<void> {
-    const resource = await selectCodeCatalystResource(client, kind)
-
-    if (!resource) {
-        throw new CancellationError('user')
-    }
-
-    openCodeCatalystUrl(resource)
-}
-
-export async function stopDevEnv(
-    client: CodeCatalystClient,
-    devenv: DevEnvironmentId,
-    opts?: { readonly showPrompt?: boolean }
-): Promise<void> {
-    if (opts?.showPrompt) {
-        const confirmed = await showConfirmationMessage({
-            prompt: localize(
-                'aws.codecatalyst.stopDevEnv.confirm',
-                'Stopping the Dev Environment will end all processes. Continue?'
-            ),
-        })
-
-        if (!confirmed) {
-            throw new CancellationError('user')
-        }
-    }
-
-    await client.stopDevEnvironment({
-        id: devenv.id,
-        projectName: devenv.project.name,
-        spaceName: devenv.org.name,
-    })
-}
-
-export async function deleteDevEnv(client: CodeCatalystClient, devenv: DevEnvironmentId): Promise<void> {
-    await client.deleteDevEnvironment({
-        id: devenv.id,
-        projectName: devenv.project.name,
-        spaceName: devenv.org.name,
-    })
-}
-
-export type DevEnvironmentSettings = Pick<
-    CreateDevEnvironmentRequest,
-    'alias' | 'instanceType' | 'inactivityTimeoutMinutes' | 'persistentStorage'
->
-
-export async function updateDevEnv(
-    client: CodeCatalystClient,
-    devenv: DevEnvironmentId,
-    settings: DevEnvironmentSettings
-) {
-    return client.updateDevEnvironment({
-        ...settings,
-        id: devenv.id,
-        projectName: devenv.project.name,
-        spaceName: devenv.org.name,
-    })
-}
-
-function createClientInjector(authProvider: CodeCatalystAuthenticationProvider): ClientInjector {
-    return async (command, ...args) => {
-        telemetry.record({ userId: AccountStatus.NotSet })
-
-        await authProvider.restore()
-        const conn = authProvider.activeConnection ?? (await authProvider.promptNotConnected())
-        const client = await createClient(conn)
-        telemetry.record({ userId: client.identity.id })
-
-        return command(client, ...args)
-    }
-}
-
-function createCommandDecorator(commands: CodeCatalystCommands): CommandDecorator {
-    return command =>
-        (...args) =>
-            commands.withClient(command, ...args)
-}
-
-interface CodeCatalystCommand<T extends any[], U> {
-    (client: CodeCatalystClient, ...args: T): U | Promise<U>
-}
-
-interface ClientInjector {
-    <T extends any[], U>(command: CodeCatalystCommand<T, U>, ...args: T): Promise<U | undefined>
-}
-
-interface CommandDecorator {
-    <T extends any[], U>(command: CodeCatalystCommand<T, U>): (...args: T) => Promise<U | undefined>
-}
-
-type Inject<T, U> = T extends (...args: infer P) => infer R
-    ? P extends [U, ...infer L]
-        ? (...args: L) => R
-        : never
-    : never
-
-type WithClient<T> = Parameters<Inject<T, CodeCatalystClient>>
-
-export class CodeCatalystCommands {
-    public readonly withClient: ClientInjector
-    public readonly bindClient = createCommandDecorator(this)
-
-    public constructor(authProvider: CodeCatalystAuthenticationProvider) {
-        this.withClient = createClientInjector(authProvider)
-    }
-
-    public listCommands() {
-        return listCommands()
-    }
-
-    public cloneRepository(...args: WithClient<typeof cloneCodeCatalystRepo>) {
-        return this.withClient(cloneCodeCatalystRepo, ...args)
-    }
-
-    public createDevEnv(): Promise<void> {
-        return this.withClient(showCreateDevEnv, globals.context, CodeCatalystCommands.declared)
-    }
-
-    public openResource(...args: WithClient<typeof openCodeCatalystResource>) {
-        return this.withClient(openCodeCatalystResource, ...args)
-    }
-
-    public stopDevEnv(...args: WithClient<typeof stopDevEnv>) {
-        return this.withClient(stopDevEnv, ...args).then(() => {
-            vscode.commands.executeCommand('workbench.action.remote.close')
-        })
-    }
-
-    public deleteDevEnv(...args: WithClient<typeof deleteDevEnv>) {
-        return this.withClient(deleteDevEnv, ...args)
-    }
-
-    public updateDevEnv(...args: WithClient<typeof updateDevEnv>) {
-        telemetry.codecatalyst_updateDevEnvironmentSettings.record({
-            codecatalyst_updateDevEnvironmentLocationType: 'remote',
-        })
-
-        return this.withClient(updateDevEnv, ...args)
-    }
-
-    public openSpace() {
-        return this.openResource('org')
-    }
-
-    public openProject() {
-        return this.openResource('project')
-    }
-
-    public openRepository() {
-        return this.openResource('repo')
-    }
-
-    public async openDevfile(uri: vscode.Uri) {
-        await vscode.window.showTextDocument(uri)
-    }
-
-    public async openDevEnv(id?: DevEnvironmentId, targetPath?: string): Promise<void> {
-        if (vscode.env.remoteName === 'ssh-remote') {
-            throw new ToolkitError('Cannot connect from a remote context. Try again from a local VS Code instance.', {
-                code: 'ConnectedToRemote',
-            })
-        }
-
-        const devenv = id ?? (await this.selectDevEnv())
-
-        // TODO(sijaden): add named timestamp markers for granular duration info
-        //
-        // right now this command may prompt the user if they came from the explorer or command palette
-        // need to be careful of mapping explosion so this granular data would either need
-        // to be flattened or we restrict the names to a pre-determined set
-        if (id === undefined) {
-            recordSource('CommandPalette')
-        }
-
-        return this.withClient(openDevEnv, devenv, targetPath)
-    }
-
-    public async openDevEnvSettings(): Promise<void> {
-        const devenv = await this.withClient(getConnectedDevEnv)
-
-        if (!devenv) {
-            throw new Error('No devenv available')
-        }
-
-        return this.withClient(showConfigureDevEnv, globals.context, devenv, CodeCatalystCommands.declared)
-    }
-
-    private async selectDevEnv(): Promise<DevEnvironmentId> {
-        const devenv = await this.withClient(selectCodeCatalystResource, 'devEnvironment' as const)
-
-        if (!devenv) {
-            throw new CancellationError('user')
-        }
-
-        return devenv
-    }
-
-    public static fromContext(ctx: Pick<vscode.ExtensionContext, 'secrets' | 'globalState'>) {
-        const auth = CodeCatalystAuthenticationProvider.fromContext(ctx)
-
-        return new this(auth)
-    }
-
-    public static readonly declared = {
-        openResource: Commands.from(this).declareOpenResource('aws.codecatalyst.openResource'),
-        listCommands: Commands.from(this).declareListCommands('aws.codecatalyst.listCommands'),
-        openSpace: Commands.from(this).declareOpenSpace('aws.codecatalyst.openOrg'),
-        openProject: Commands.from(this).declareOpenProject('aws.codecatalyst.openProject'),
-        openRepository: Commands.from(this).declareOpenRepository('aws.codecatalyst.openRepo'),
-        stopDevEnv: Commands.from(this).declareStopDevEnv('aws.codecatalyst.stopDevEnv'),
-        deleteDevEnv: Commands.from(this).declareDeleteDevEnv('aws.codecatalyst.deleteDevEnv'),
-        openDevEnvSettings: Commands.from(this).declareOpenDevEnvSettings('aws.codecatalyst.openDevEnvSettings'),
-        openDevfile: Commands.from(this).declareOpenDevfile('aws.codecatalyst.openDevfile'),
-        cloneRepo: Commands.from(this).declareCloneRepository({
-            id: 'aws.codecatalyst.cloneRepo',
-            telemetryName: 'codecatalyst_localClone',
-        }),
-        createDevEnv: Commands.from(this).declareCreateDevEnv({
-            id: 'aws.codecatalyst.createDevEnv',
-            telemetryName: 'codecatalyst_createDevEnvironment',
-        }),
-        updateDevEnv: Commands.from(this).declareUpdateDevEnv({
-            id: 'aws.codecatalyst.updateDevEnv',
-            telemetryName: 'codecatalyst_updateDevEnvironmentSettings',
-        }),
-        openDevEnv: Commands.from(this).declareOpenDevEnv({
-            id: 'aws.codecatalyst.openDevEnv',
-            telemetryName: 'codecatalyst_connect',
-        }),
-    } as const
-}
diff --git a/src/codecatalyst/explorer.ts b/src/codecatalyst/explorer.ts
deleted file mode 100644
index d9bf3e3f652..00000000000
--- a/src/codecatalyst/explorer.ts
+++ /dev/null
@@ -1,158 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { RootNode } from '../awsexplorer/localExplorer'
-import { Connection, createBuilderIdConnection, isBuilderIdConnection } from '../credentials/auth'
-import { createClient, DevEnvironment } from '../shared/clients/codecatalystClient'
-import { UnknownError } from '../shared/errors'
-import { isCloud9 } from '../shared/extensionUtilities'
-import { addColor, getIcon } from '../shared/icons'
-import { getLogger } from '../shared/logger/logger'
-import { TreeNode } from '../shared/treeview/resourceTreeDataProvider'
-import { Commands } from '../shared/vscode/commands2'
-import { CodeCatalystAuthenticationProvider } from './auth'
-import { CodeCatalystCommands } from './commands'
-import { ConnectedDevEnv, getConnectedDevEnv, getDevfileLocation } from './model'
-import * as codecatalyst from './model'
-
-const getStartedCommand = Commands.register(
-    'aws.codecatalyst.getStarted',
-    async (authProvider: CodeCatalystAuthenticationProvider) => {
-        const conn = await createBuilderIdConnection(authProvider.auth)
-        await authProvider.secondaryAuth.useNewConnection(conn)
-    }
-)
-
-const learnMoreCommand = Commands.register('aws.learnMore', async (docsUrl: vscode.Uri) => {
-    return vscode.env.openExternal(docsUrl)
-})
-
-// Only used in rare cases on C9
-const reauth = Commands.register(
-    '_aws.codecatalyst.reauthenticate',
-    async (conn: Connection, authProvider: CodeCatalystAuthenticationProvider) => {
-        await authProvider.auth.reauthenticate(conn)
-    }
-)
-
-function getLocalCommands(auth: CodeCatalystAuthenticationProvider) {
-    const docsUrl = isCloud9() ? codecatalyst.docs.cloud9.overview : codecatalyst.docs.vscode.overview
-    if (!isBuilderIdConnection(auth.activeConnection)) {
-        return [
-            getStartedCommand.build(auth).asTreeNode({
-                label: 'Start',
-                iconPath: getIcon('vscode-debug-start'),
-            }),
-            learnMoreCommand.build(docsUrl).asTreeNode({
-                label: 'Learn More about CodeCatalyst',
-                iconPath: getIcon('vscode-question'),
-            }),
-        ]
-    }
-
-    if (isCloud9()) {
-        const item = reauth.build(auth.activeConnection, auth).asTreeNode({
-            label: 'Failed to get the current Dev Environment. Click to try again.',
-            iconPath: getIcon(`vscode-error`),
-        })
-
-        return [item]
-    }
-
-    return [
-        CodeCatalystCommands.declared.cloneRepo.build().asTreeNode({
-            label: 'Clone Repository',
-            iconPath: getIcon('vscode-symbol-namespace'),
-        }),
-        CodeCatalystCommands.declared.openDevEnv.build().asTreeNode({
-            label: 'Open Dev Environment',
-            iconPath: getIcon('vscode-vm-connect'),
-        }),
-        CodeCatalystCommands.declared.createDevEnv.build().asTreeNode({
-            label: 'Create Dev Environment',
-            iconPath: getIcon('vscode-add'),
-        }),
-        CodeCatalystCommands.declared.listCommands.build().asTreeNode({
-            label: 'Show CodeCatalyst Commands',
-            iconPath: getIcon('vscode-list-flat'), // TODO(sijaden): use better icon
-        }),
-    ]
-}
-
-function getRemoteCommands(currentDevEnv: DevEnvironment, devfileLocation: vscode.Uri) {
-    return [
-        CodeCatalystCommands.declared.stopDevEnv.build(currentDevEnv, { showPrompt: true }).asTreeNode({
-            label: 'Stop Dev Environment',
-            iconPath: getIcon('vscode-stop-circle'),
-        }),
-        CodeCatalystCommands.declared.openDevEnvSettings.build().asTreeNode({
-            label: 'Open Settings',
-            iconPath: getIcon('vscode-settings-gear'),
-        }),
-        CodeCatalystCommands.declared.openDevfile.build(devfileLocation).asTreeNode({
-            label: 'Open Devfile',
-            iconPath: getIcon('vscode-symbol-namespace'),
-            description: vscode.workspace.asRelativePath(devfileLocation),
-        }),
-    ]
-}
-
-export class CodeCatalystRootNode implements RootNode {
-    public readonly id = 'codecatalyst'
-    public readonly resource = this.devenv
-
-    private readonly onDidChangeEmitter = new vscode.EventEmitter<void>()
-
-    public readonly onDidChangeVisibility = this.onDidChangeEmitter.event
-    public readonly onDidChangeTreeItem = this.onDidChangeEmitter.event
-    public readonly onDidChangeChildren = this.onDidChangeEmitter.event
-
-    private devenv?: ConnectedDevEnv
-
-    public constructor(private readonly authProvider: CodeCatalystAuthenticationProvider) {
-        this.authProvider.onDidChangeActiveConnection(() => this.onDidChangeEmitter.fire())
-    }
-
-    public async getChildren(): Promise<TreeNode[]> {
-        if (!this.devenv) {
-            return getLocalCommands(this.authProvider)
-        }
-
-        const devfileLocation = await getDevfileLocation(this.devenv.devenvClient)
-
-        return getRemoteCommands(this.devenv.summary, devfileLocation)
-    }
-
-    public async getTreeItem() {
-        this.devenv = await this.getDevEnv()
-
-        const item = new vscode.TreeItem('CodeCatalyst', vscode.TreeItemCollapsibleState.Collapsed)
-        item.contextValue = this.authProvider.isUsingSavedConnection
-            ? 'awsCodeCatalystNodeSaved'
-            : 'awsCodeCatalystNode'
-
-        if (this.devenv !== undefined) {
-            item.description = 'Connected to Dev Environment'
-            item.iconPath = addColor(getIcon('vscode-pass'), 'testing.iconPassed')
-        } else {
-            item.description = this.authProvider.isUsingSavedConnection ? 'AWS Builder ID Connected' : undefined
-        }
-
-        return item
-    }
-
-    private async getDevEnv() {
-        try {
-            await this.authProvider.restore()
-            const conn = this.authProvider.activeConnection
-            const client = conn !== undefined ? await createClient(conn) : undefined
-
-            return client !== undefined ? await getConnectedDevEnv(client) : undefined
-        } catch (err) {
-            getLogger().warn(`codecatalyst: failed to get Dev Environment: ${UnknownError.cast(err).message}`)
-        }
-    }
-}
diff --git a/src/codecatalyst/model.ts b/src/codecatalyst/model.ts
deleted file mode 100644
index d16629bd2b5..00000000000
--- a/src/codecatalyst/model.ts
+++ /dev/null
@@ -1,347 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import globals from '../shared/extensionGlobals'
-
-import * as vscode from 'vscode'
-import * as path from 'path'
-import {
-    CodeCatalystClient,
-    DevEnvironment,
-    CodeCatalystRepo,
-    getCodeCatalystConfig,
-} from '../shared/clients/codecatalystClient'
-import { DevEnvClient } from '../shared/clients/devenvClient'
-import { getLogger } from '../shared/logger'
-import { AsyncCollection, toCollection } from '../shared/utilities/asyncCollection'
-import { getCodeCatalystSpaceName, getCodeCatalystProjectName } from '../shared/vscode/env'
-import { writeFile } from 'fs-extra'
-import { sshAgentSocketVariable, startSshAgent, startVscodeRemote } from '../shared/extensions/ssh'
-import { ChildProcess } from '../shared/utilities/childProcess'
-import { ensureDependencies, hostNamePrefix } from './tools'
-import { isCodeCatalystVSCode } from './utils'
-import { Timeout } from '../shared/utilities/timeoutUtils'
-import { Commands } from '../shared/vscode/commands2'
-import { areEqual } from '../shared/utilities/pathUtils'
-import { fileExists } from '../shared/filesystemUtilities'
-
-export type DevEnvironmentId = Pick<DevEnvironment, 'id' | 'org' | 'project'>
-
-export const docs = {
-    vscode: {
-        main: vscode.Uri.parse('https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/codecatalyst-service'),
-        overview: vscode.Uri.parse(
-            'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/codecatalyst-overview.html'
-        ),
-        devenv: vscode.Uri.parse(
-            'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/codecatalyst-devenvironment.html'
-        ),
-        setup: vscode.Uri.parse(
-            'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/codecatalyst-setup.html'
-        ),
-        troubleshoot: vscode.Uri.parse(
-            'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/codecatalyst-troubleshoot.html'
-        ),
-    },
-    cloud9: {
-        // Working with Amazon CodeCatalyst
-        main: vscode.Uri.parse('https://docs.aws.amazon.com/cloud9/latest/user-guide/ide-toolkits-cloud9'),
-        // Getting Started
-        overview: vscode.Uri.parse(
-            'https://docs.aws.amazon.com/cloud9/latest/user-guide/ide-toolkits-cloud9-getstarted'
-        ),
-        // Opening Dev Environment settings in AWS Cloud9
-        settings: vscode.Uri.parse('https://docs.aws.amazon.com/cloud9/latest/user-guide/ide-toolkits-settings-cloud9'),
-        // Resuming a Dev Environment in AWS Cloud9
-        devenv: vscode.Uri.parse('https://docs.aws.amazon.com/cloud9/latest/user-guide/ide-toolkits-resume-cloud9'),
-        // Creating a Dev Environment in AWS Cloud9
-        devenvCreate: vscode.Uri.parse(
-            'https://docs.aws.amazon.com/cloud9/latest/user-guide/ide-toolkits-create-cloud9'
-        ),
-        // Stopping a Dev Environment in AWS Cloud9
-        devenvStop: vscode.Uri.parse('https://docs.aws.amazon.com/cloud9/latest/user-guide/ide-toolkits-stop-cloud9'),
-        // Deleting a Dev Environment in AWS Cloud9
-        devenvDelete: vscode.Uri.parse(
-            'https://docs.aws.amazon.com/cloud9/latest/user-guide/ide-toolkits-delete-cloud9'
-        ),
-        // Editing the repo devfile for a Dev Environment in AWS Cloud9
-        devfileEdit: vscode.Uri.parse(
-            'https://docs.aws.amazon.com/cloud9/latest/user-guide/ide-toolkits-edit-devfile-cloud9'
-        ),
-        // Cloning a repository in AWS Cloud9
-        cloneRepo: vscode.Uri.parse('https://docs.aws.amazon.com/cloud9/latest/user-guide/ide-toolkits-clone-cloud9'),
-    },
-} as const
-
-export function getCodeCatalystSsmEnv(region: string, ssmPath: string, devenv: DevEnvironmentId): NodeJS.ProcessEnv {
-    return Object.assign(
-        {
-            AWS_REGION: region,
-            AWS_SSM_CLI: ssmPath,
-            CODECATALYST_ENDPOINT: getCodeCatalystConfig().endpoint,
-            BEARER_TOKEN_LOCATION: bearerTokenCacheLocation(devenv.id),
-            LOG_FILE_LOCATION: sshLogFileLocation(devenv.id),
-            SPACE_NAME: devenv.org.name,
-            PROJECT_NAME: devenv.project.name,
-            DEVENV_ID: devenv.id,
-        },
-        process.env
-    )
-}
-
-export function createCodeCatalystEnvProvider(
-    client: CodeCatalystClient,
-    ssmPath: string,
-    devenv: DevEnvironment,
-    useSshAgent: boolean = true
-): EnvProvider {
-    return async () => {
-        await cacheBearerToken(await client.getBearerToken(), devenv.id)
-        const vars = getCodeCatalystSsmEnv(client.regionCode, ssmPath, devenv)
-
-        return useSshAgent ? { [sshAgentSocketVariable]: await startSshAgent(), ...vars } : vars
-    }
-}
-
-type EnvProvider = () => Promise<NodeJS.ProcessEnv>
-
-/**
- * Creates a new {@link ChildProcess} class bound to a specific development environment. All instances of this
- * derived class will have SSM session information injected as environment variables as-needed.
- */
-export function createBoundProcess(envProvider: EnvProvider): typeof ChildProcess {
-    type Run = ChildProcess['run']
-    return class SessionBoundProcess extends ChildProcess {
-        public override async run(...args: Parameters<Run>): ReturnType<Run> {
-            const options = args[0]
-            const envVars = await envProvider()
-            const spawnOptions = {
-                ...options?.spawnOptions,
-                env: { ...envVars, ...options?.spawnOptions?.env },
-            }
-
-            return super.run({ ...options, spawnOptions })
-        }
-    }
-}
-
-export async function cacheBearerToken(bearerToken: string, devenvId: string): Promise<void> {
-    await writeFile(bearerTokenCacheLocation(devenvId), `${bearerToken}`, 'utf8')
-}
-
-export function bearerTokenCacheLocation(devenvId: string): string {
-    return path.join(globals.context.globalStorageUri.fsPath, `codecatalyst.${devenvId}.token`)
-}
-
-export function sshLogFileLocation(devenvId: string): string {
-    return path.join(globals.context.globalStorageUri.fsPath, `codecatalyst.${devenvId}.log`)
-}
-
-export function getHostNameFromEnv(env: DevEnvironmentId): string {
-    return `${hostNamePrefix}${env.id}`
-}
-
-export interface ConnectedDevEnv {
-    readonly summary: DevEnvironment
-    readonly devenvClient: DevEnvClient
-}
-
-export async function getConnectedDevEnv(
-    codeCatalystClient: CodeCatalystClient,
-    devenvClient = new DevEnvClient()
-): Promise<ConnectedDevEnv | undefined> {
-    const devEnvId = devenvClient.id
-    if (!devEnvId || !devenvClient.isCodeCatalystDevEnv()) {
-        return
-    }
-
-    const projectName = getCodeCatalystProjectName()
-    const spaceName = getCodeCatalystSpaceName()
-
-    if (!projectName || !spaceName) {
-        throw new Error('No project or space name found')
-    }
-
-    const summary = await codeCatalystClient.getDevEnvironment({
-        projectName: projectName,
-        spaceName: spaceName,
-        id: devEnvId,
-    })
-
-    return { summary, devenvClient: devenvClient }
-}
-
-/**
- * Everything needed to connect to a development environment via VS Code or `ssh`
- */
-interface DevEnvConnection {
-    readonly sshPath: string
-    readonly vscPath: string
-    readonly hostname: string
-    readonly envProvider: EnvProvider
-    readonly SessionProcess: typeof ChildProcess
-}
-
-export async function prepareDevEnvConnection(
-    client: CodeCatalystClient,
-    { id, org, project }: DevEnvironmentId,
-    { topic, timeout }: { topic?: string; timeout?: Timeout } = {}
-): Promise<DevEnvConnection> {
-    const { ssm, vsc, ssh } = (await ensureDependencies()).unwrap()
-    const runningDevEnv = await client.startDevEnvironmentWithProgress(
-        {
-            id,
-            spaceName: org.name,
-            projectName: project.name,
-        },
-        'RUNNING'
-    )
-
-    const hostname = getHostNameFromEnv({ id, org, project })
-    const logPrefix = topic ? `codecatalyst ${topic} (${id})` : `codecatalyst (${id})`
-    const logger = (data: string) => getLogger().verbose(`${logPrefix}: ${data}`)
-    const envProvider = createCodeCatalystEnvProvider(client, ssm, runningDevEnv)
-    const SessionProcess = createBoundProcess(envProvider).extend({
-        timeout,
-        onStdout: logger,
-        onStderr: logger,
-        rejectOnErrorCode: true,
-    })
-
-    return {
-        hostname,
-        envProvider,
-        sshPath: ssh,
-        vscPath: vsc,
-        SessionProcess,
-    }
-}
-
-/**
- * Starts the given devenv, waits, and connects a new vscode instance when the devenv is ready.
- *
- * @param client CodeCatalyst service client
- * @param devenv DevEnvironment to open
- * @param targetPath vscode workspace (default: "/projects/[repo]")
- */
-export async function openDevEnv(
-    client: CodeCatalystClient,
-    devenv: DevEnvironmentId,
-    targetPath?: string
-): Promise<void> {
-    const { SessionProcess, vscPath } = await prepareDevEnvConnection(client, devenv, { topic: 'connect' })
-    if (!targetPath) {
-        const env = await client.getDevEnvironment({
-            spaceName: devenv.org.name,
-            projectName: devenv.project.name,
-            id: devenv.id,
-        })
-        const repo = env.repositories.length == 1 ? env.repositories[0].repositoryName : undefined
-        targetPath = repo ? `/projects/${repo}` : '/projects'
-    }
-    await startVscodeRemote(SessionProcess, getHostNameFromEnv(devenv), targetPath, vscPath)
-}
-
-// The "codecatalyst_connect" metric should really be splt into two parts:
-// 1. the setup/launch from the local machine
-// 2. toolkit initialization on the remote
-//
-// Recording metrics like this is a lot more involved so for now we'll
-// assume that if the first step succeeds, the user probably succeeded
-// in connecting to the devenv
-export const codeCatalystConnectCommand = Commands.register(
-    {
-        id: '_aws.codecatalyst.connect',
-        telemetryName: 'codecatalyst_connect',
-    },
-    openDevEnv
-)
-
-export async function getDevfileLocation(client: DevEnvClient, root?: vscode.Uri) {
-    const rootDirectory = root ?? vscode.workspace.workspaceFolders?.[0].uri
-    if (!rootDirectory) {
-        throw new Error('No root directory or Dev Environment folder found')
-    }
-
-    async function checkDefaultLocations(rootDirectory: vscode.Uri): Promise<vscode.Uri> {
-        // Check the projects root location
-        const devfileRoot = vscode.Uri.joinPath(vscode.Uri.parse('/projects'), 'devfile.yaml')
-        if (await fileExists(devfileRoot.fsPath)) {
-            return devfileRoot
-        }
-
-        // Check the location relative to the current directory
-        const projectRoot = vscode.Uri.joinPath(rootDirectory, 'devfile.yaml')
-        if (await fileExists(projectRoot.fsPath)) {
-            return projectRoot
-        }
-
-        throw new Error('Devfile location was not found')
-    }
-
-    // TODO(sijaden): should make this load greedily and continously poll
-    // latency is very high for some reason
-    const devfileLocation = await client.getStatus().then(r => r.location)
-    if (!devfileLocation) {
-        return checkDefaultLocations(rootDirectory)
-    }
-
-    if (areEqual(undefined, rootDirectory.fsPath, '/projects')) {
-        return vscode.Uri.joinPath(rootDirectory, devfileLocation)
-    }
-
-    // we have /projects/repo, where MDE may or may not return [repo]/devfile.yaml
-    const repo = path.basename(rootDirectory.fsPath)
-    const splitDevfilePath = devfileLocation.split('/')
-    const devfilePath = vscode.Uri.joinPath(rootDirectory, 'devfile.yaml')
-    if (repo === splitDevfilePath[0] && (await fileExists(devfilePath.fsPath))) {
-        return devfilePath
-    }
-
-    const baseLocation = vscode.Uri.joinPath(rootDirectory, devfileLocation)
-    if (await fileExists(baseLocation.fsPath)) {
-        return baseLocation
-    }
-
-    return checkDefaultLocations(rootDirectory)
-}
-
-/**
- * Given a collection of CodeCatalyst repos, try to find a corresponding devenv, if any
- */
-export function associateDevEnv(
-    client: CodeCatalystClient,
-    repos: AsyncCollection<CodeCatalystRepo>
-): AsyncCollection<CodeCatalystRepo & { devEnv?: DevEnvironment }> {
-    return toCollection(async function* () {
-        const devenvs = await client
-            .listResources('devEnvironment')
-            .flatten()
-            .filter(env => env.repositories.length > 0 && isCodeCatalystVSCode(env.ides))
-            .toMap(env => `${env.org.name}.${env.project.name}.${env.repositories[0].repositoryName}`)
-
-        yield* repos.map(repo => ({
-            ...repo,
-            devEnv: devenvs.get(`${repo.org.name}.${repo.project.name}.${repo.name}`),
-        }))
-    })
-}
-
-export interface DevEnvMemento {
-    /** True if the extension is watching the status of the devenv to try and reconnect. */
-    attemptingReconnect?: boolean
-    /** Unix time of the most recent connection. */
-    previousConnectionTimestamp: number
-    /** Previous open vscode workspace directory. */
-    previousVscodeWorkspace: string
-    /** CodeCatalyst Space (Org) Name */
-    spaceName: string
-    /** CodeCatalyst Project name */
-    projectName: string
-    /** CodeCatalyst Alias */
-    alias: string | undefined
-}
-
-export const codecatalystReconnectKey = 'CODECATALYST_RECONNECT'
diff --git a/src/codecatalyst/reconnect.ts b/src/codecatalyst/reconnect.ts
deleted file mode 100644
index ed6c6bfa141..00000000000
--- a/src/codecatalyst/reconnect.ts
+++ /dev/null
@@ -1,271 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-import * as vscode from 'vscode'
-import { CodeCatalystClient, createClient, DevEnvironment } from '../shared/clients/codecatalystClient'
-import { ExtContext } from '../shared/extensions'
-import { getLogger } from '../shared/logger'
-import { sleep } from '../shared/utilities/timeoutUtils'
-import { DevEnvironmentSettings } from './commands'
-import { codeCatalystConnectCommand, codecatalystReconnectKey, DevEnvironmentId, DevEnvMemento } from './model'
-import { showViewLogsMessage } from '../shared/utilities/messages'
-import { CodeCatalystAuthenticationProvider } from './auth'
-import { getCodeCatalystDevEnvId } from '../shared/vscode/env'
-import globals from '../shared/extensionGlobals'
-import { recordSource } from './utils'
-
-const localize = nls.loadMessageBundle()
-
-const reconnectTimer = 5000
-const maxReconnectTime = 10 * 60 * 1000
-
-export function watchRestartingDevEnvs(ctx: ExtContext, authProvider: CodeCatalystAuthenticationProvider) {
-    let restartHandled = false
-    authProvider.onDidChangeActiveConnection(async conn => {
-        if (restartHandled || conn === undefined) {
-            return
-        }
-
-        const client = await createClient(conn)
-        const envId = getCodeCatalystDevEnvId()
-        handleRestart(client, ctx, envId)
-        restartHandled = true
-    })
-}
-
-function handleRestart(client: CodeCatalystClient, ctx: ExtContext, envId: string | undefined) {
-    if (envId !== undefined) {
-        const memento = ctx.extensionContext.globalState
-        const pendingReconnects = memento.get<Record<string, DevEnvMemento>>(codecatalystReconnectKey, {})
-        if (envId in pendingReconnects) {
-            const devenv = pendingReconnects[envId]
-            const devenvName = getDevEnvName(devenv.alias, envId)
-            getLogger().info(`codecatalyst: ssh session reconnected to devenv: ${devenvName}`)
-            vscode.window.showInformationMessage(
-                localize('AWS.codecatalyst.reconnect.success', 'Reconnected to Dev Environment: {0}', devenvName)
-            )
-            delete pendingReconnects[envId]
-            memento.update(codecatalystReconnectKey, pendingReconnects)
-        }
-    } else {
-        getLogger().info('codecatalyst: attempting to poll development envionments')
-
-        // Reconnect devenvs (if coming from a restart)
-        reconnectDevEnvs(client, ctx).catch(err => {
-            getLogger().error(`codecatalyst: error while resuming devenvs: ${err}`)
-        })
-    }
-}
-
-/**
- * Attempt to poll for connection in all valid devenvs
- * @param client a connected client
- * @param ctx the extension context
- */
-async function reconnectDevEnvs(client: CodeCatalystClient, ctx: ExtContext): Promise<void> {
-    const memento = ctx.extensionContext.globalState
-    const pendingDevEnvs = memento.get<Record<string, DevEnvMemento>>(codecatalystReconnectKey, {})
-    const validDevEnvs = filterInvalidDevEnvs(pendingDevEnvs)
-    if (Object.keys(validDevEnvs).length === 0) {
-        return
-    }
-
-    const devenvNames = []
-    for (const [id, devenv] of Object.entries(validDevEnvs)) {
-        devenvNames.push(getDevEnvName(devenv.alias, id))
-    }
-
-    const polledDevEnvs = devenvNames.join(', ')
-    const progressTitle = localize(
-        'AWS.codecatalyst.reconnect.restarting',
-        'The following devenvs are restarting: {0}',
-        polledDevEnvs
-    )
-    vscode.window.withProgress(
-        {
-            location: vscode.ProgressLocation.Notification,
-        },
-        (progress, token) => {
-            progress.report({ message: progressTitle })
-            return pollDevEnvs(client, progress, token, memento, validDevEnvs)
-        }
-    )
-}
-
-/**
- * Filter out devenvs who are expired OR are already attempting to reconnect.
- * @param devenvs All of the possible in devenvs to check
- */
-function filterInvalidDevEnvs(devenvs: Record<string, DevEnvMemento>) {
-    for (const reconnectDevEnvId in devenvs) {
-        const devenvDetail = devenvs[reconnectDevEnvId]
-        if (isExpired(devenvDetail.previousConnectionTimestamp) || devenvDetail.attemptingReconnect) {
-            delete devenvs[reconnectDevEnvId]
-        }
-    }
-    return devenvs
-}
-
-/**
- * Ensure that all devenvs that are currently being looked at set to attempting to reconnect so that they are not looked at
- * by any other instance of VSCode.
- * @param memento
- * @param devenvs
- */
-function setWatchedDevEnvStatus(memento: vscode.Memento, devenvs: Record<string, DevEnvMemento>, watchStatus: boolean) {
-    for (const [id, detail] of Object.entries(devenvs)) {
-        devenvs[id] = { ...detail, attemptingReconnect: watchStatus }
-    }
-    return memento.update(codecatalystReconnectKey, devenvs)
-}
-
-/**
- * Continuously poll all the devenvs until they are either:
- *      1. Available for re-opening, in which case re-open them automatically
- *      2. In a terminating state or expired, in which case no longer watch the devenv
- *      3. Failed to start, in which case notify the user
- * @param client A connected client
- * @param memento vscode global storage library
- * @param devenvs All VALID devenvs that are not being watched by any other VSCode instance
- */
-async function pollDevEnvs(
-    client: CodeCatalystClient,
-    progress: vscode.Progress<{ message: string }>,
-    token: vscode.CancellationToken,
-    memento: vscode.Memento,
-    devenvs: Record<string, DevEnvMemento>
-) {
-    // Ensure that all devenvs that you want to look at are attempting reconnection
-    // and won't be watched by any other VSCode instance
-    await setWatchedDevEnvStatus(memento, devenvs, true)
-
-    const shouldCloseRootInstance = Object.keys(devenvs).length === 1
-
-    while (Object.keys(devenvs).length > 0) {
-        if (token.isCancellationRequested) {
-            await setWatchedDevEnvStatus(memento, devenvs, false)
-            return
-        }
-
-        for (const id in devenvs) {
-            const details = devenvs[id]
-
-            const devenvName = getDevEnvName(details.alias, id)
-
-            try {
-                const metadata = await client.getDevEnvironment({
-                    id: id,
-                    spaceName: details.spaceName,
-                    projectName: details.projectName,
-                })
-
-                if (metadata?.status === 'RUNNING') {
-                    progress.report({
-                        message: `Dev Environment ${devenvName} is now running. Attempting to reconnect.`,
-                    })
-
-                    openReconnectedDevEnv(client, id, details, shouldCloseRootInstance)
-
-                    // We no longer need to watch this devenv anymore because it's already being re-opened in SSH
-                    delete devenvs[id]
-                } else if (isTerminating(metadata)) {
-                    progress.report({ message: `Dev Environment ${devenvName} is terminating` })
-                    // We no longer need to watch a devenv that is in a terminating state
-                    delete devenvs[id]
-                } else if (isExpired(details.previousConnectionTimestamp)) {
-                    progress.report({ message: `Dev Environment ${devenvName} has expired` })
-                }
-            } catch {
-                await failDevEnv(memento, id)
-                delete devenvs[id]
-                showViewLogsMessage(localize('AWS.codecatalyst.reconnect', 'Unable to reconnect to ${0}', devenvName))
-            }
-        }
-        await sleep(reconnectTimer)
-    }
-}
-
-function isTerminating(devenv: Pick<DevEnvironment, 'status'>): boolean {
-    if (!devenv.status) {
-        return false
-    }
-
-    return devenv.status === 'FAILED' || devenv.status === 'DELETING' || devenv.status === 'DELETED'
-}
-
-function isExpired(previousConnectionTime: number): boolean {
-    return Date.now() - previousConnectionTime > maxReconnectTime
-}
-
-/**
- * When a devenv fails, remove it from the memento so we no longer watch it in the future
- * @param memento The memento instance from vscode
- * @param devenvId the id of the deveng to fail
- */
-function failDevEnv(memento: vscode.Memento, devenvId: string) {
-    const curr = memento.get<Record<string, DevEnvMemento>>(codecatalystReconnectKey, {})
-    delete curr[devenvId]
-    return memento.update(codecatalystReconnectKey, curr)
-}
-
-async function openReconnectedDevEnv(
-    client: CodeCatalystClient,
-    id: string,
-    devenv: DevEnvMemento,
-    closeRootInstance: boolean
-): Promise<void> {
-    const identifier: DevEnvironmentId = {
-        id,
-        org: { name: devenv.spaceName },
-        project: { name: devenv.projectName },
-    }
-
-    recordSource('Reconnect')
-    await codeCatalystConnectCommand.execute(client, identifier, devenv.previousVscodeWorkspace)
-
-    // When we only have 1 devenv to watch we might as well close the local vscode instance
-    if (closeRootInstance) {
-        // A brief delay ensures that metrics are saved from the connect command
-        sleep(5000).then(() => vscode.commands.executeCommand('workbench.action.closeWindow'))
-    }
-}
-
-function getDevEnvName(alias: string | undefined, id: string) {
-    return alias && alias !== '' ? alias : id
-}
-
-export function isLongReconnect(oldSettings: DevEnvironmentSettings, newSettings: DevEnvironmentSettings): boolean {
-    return (
-        newSettings.inactivityTimeoutMinutes !== undefined &&
-        newSettings.instanceType !== undefined &&
-        (oldSettings.inactivityTimeoutMinutes !== newSettings.inactivityTimeoutMinutes ||
-            oldSettings.instanceType !== newSettings.instanceType)
-    )
-}
-
-export function saveReconnectionInformation(devenv: DevEnvironmentId & Pick<DevEnvironment, 'alias'>): Thenable<void> {
-    const memento = globals.context.globalState
-    const pendingReconnects = memento.get<Record<string, DevEnvMemento>>(codecatalystReconnectKey, {})
-    const workspaceFolders = vscode.workspace.workspaceFolders
-    const currentWorkspace =
-        workspaceFolders !== undefined && workspaceFolders.length > 0 ? workspaceFolders[0].uri.fsPath : '/projects'
-    pendingReconnects[devenv.id] = {
-        previousVscodeWorkspace: currentWorkspace,
-        spaceName: devenv.org.name,
-        projectName: devenv.project.name,
-        attemptingReconnect: false,
-        previousConnectionTimestamp: Date.now(),
-        alias: devenv.alias,
-    }
-    return memento.update(codecatalystReconnectKey, pendingReconnects)
-}
-
-export function removeReconnectionInformation(devenv: DevEnvironmentId): Thenable<void> {
-    const memento = globals.context.globalState
-    const pendingReconnects = memento.get<Record<string, DevEnvMemento>>(codecatalystReconnectKey, {})
-    delete pendingReconnects[devenv.id]
-    return memento.update(codecatalystReconnectKey, pendingReconnects)
-}
diff --git a/src/codecatalyst/tools.ts b/src/codecatalyst/tools.ts
deleted file mode 100644
index 12f966fcc15..00000000000
--- a/src/codecatalyst/tools.ts
+++ /dev/null
@@ -1,291 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import globals from '../shared/extensionGlobals'
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as vscode from 'vscode'
-import * as fs from 'fs-extra'
-import * as path from 'path'
-import { getOrInstallCli } from '../shared/utilities/cliUtils'
-import { Result } from '../shared/utilities/result'
-import { isExtensionInstalled, showInstallExtensionMsg } from '../shared/utilities/vsCodeUtils'
-import { SystemUtilities } from '../shared/systemUtilities'
-import { pushIf } from '../shared/utilities/collectionUtils'
-import { ChildProcess } from '../shared/utilities/childProcess'
-import { CancellationError } from '../shared/utilities/timeoutUtils'
-import { fileExists, readFileAsString } from '../shared/filesystemUtilities'
-import { ToolkitError, UnknownError } from '../shared/errors'
-import { getLogger } from '../shared/logger'
-import { getIdeProperties } from '../shared/extensionUtilities'
-import { showConfirmationMessage } from '../shared/utilities/messages'
-import { getSshConfigPath } from '../shared/extensions/ssh'
-
-interface DependencyPaths {
-    readonly vsc: string
-    readonly ssm: string
-    readonly ssh: string
-}
-
-interface MissingTool {
-    readonly name: 'code' | 'ssm' | 'ssh'
-    readonly reason?: string
-}
-
-export const hostNamePrefix = 'aws-devenv-'
-
-export async function ensureDependencies(
-    window = vscode.window
-): Promise<Result<DependencyPaths, CancellationError | Error>> {
-    if (!isExtensionInstalled('ms-vscode-remote.remote-ssh')) {
-        showInstallExtensionMsg('ms-vscode-remote.remote-ssh', 'Remote SSH', 'Connecting to Dev Environment', window)
-
-        return Result.err(
-            new ToolkitError('Remote SSH extension not installed', {
-                cancelled: true,
-                code: 'MissingExtension',
-            })
-        )
-    }
-
-    const tools = await ensureTools()
-    if (tools.isErr()) {
-        const missing = tools
-            .err()
-            .map(d => d.name)
-            .join(', ')
-        const msg = localize(
-            'AWS.codecatalyst.missingRequiredTool',
-            'Failed to connect to Dev Environment, missing required tools: {0}',
-            missing
-        )
-
-        tools.err().forEach(d => {
-            if (d.reason) {
-                getLogger().error(`codecatalyst: failed to get tool "${d.name}": ${d.reason}`)
-            }
-        })
-
-        return Result.err(
-            new ToolkitError(msg, {
-                code: 'MissingTools',
-                details: { missing },
-            })
-        )
-    }
-
-    const config = await ensureCodeCatalystSshConfig(tools.ok().ssh)
-    if (config.isErr()) {
-        const err = config.err()
-        getLogger().error(`codecatalyst: failed to add ssh config section: ${err.message}`)
-
-        return Result.err(err)
-    }
-
-    return tools
-}
-
-export async function ensureConnectScript(context = globals.context): Promise<Result<vscode.Uri, ToolkitError>> {
-    const scriptName = `codecatalyst_connect${process.platform === 'win32' ? '.ps1' : ''}`
-
-    // Script resource path. Includes the Toolkit version string so it changes with each release.
-    const versionedScript = vscode.Uri.joinPath(context.extensionUri, 'resources', scriptName)
-
-    // Copy to globalStorage to ensure a "stable" path (not influenced by Toolkit version string.)
-    const connectScript = vscode.Uri.joinPath(context.globalStorageUri, scriptName)
-
-    try {
-        const exists = await fileExists(connectScript.fsPath)
-        const contents1 = await readFileAsString(versionedScript.fsPath)
-        const contents2 = exists ? await readFileAsString(connectScript.fsPath) : ''
-        const isOutdated = contents1 !== contents2
-
-        if (isOutdated) {
-            await fs.copyFile(versionedScript.fsPath, connectScript.fsPath)
-            getLogger().info('ssh: updated connect script')
-        }
-
-        return Result.ok(connectScript)
-    } catch (e) {
-        const message = localize('AWS.codecatalyst.error.copyScript', 'Failed to update connect script')
-
-        return Result.err(ToolkitError.chain(e, message, { code: 'ConnectScriptUpdateFailed' }))
-    }
-}
-
-async function ensureTools() {
-    const [vsc, ssh, ssm] = await Promise.all([
-        SystemUtilities.getVscodeCliPath(),
-        SystemUtilities.findSshPath(),
-        ensureSsmCli(),
-    ])
-
-    const missing: MissingTool[] = []
-    pushIf(missing, vsc === undefined, { name: 'code' })
-    pushIf(missing, ssh === undefined, { name: 'ssh' })
-
-    if (ssm.isErr()) {
-        missing.push({ name: 'ssm', reason: ssm.err() })
-    }
-
-    if (vsc === undefined || ssh === undefined || ssm.isErr()) {
-        return Result.err(missing)
-    }
-
-    return Result.ok({ vsc, ssh, ssm: ssm.ok() })
-}
-
-/**
- * Checks if the SSM plugin CLI `session-manager-plugin` is available and
- * working, else prompts user to install it.
- *
- * @returns Result object indicating whether the SSH config is working, or failure reason.
- */
-async function ensureSsmCli() {
-    const r = await Result.promise(getOrInstallCli('session-manager-plugin', false))
-
-    return r.mapErr(e => UnknownError.cast(e).message)
-}
-
-/**
- * Checks if the "aws-devenv-*" SSH config hostname pattern is working, else prompts user to add it.
- *
- * @returns Result object indicating whether the SSH config is working, or failure reason.
- */
-async function ensureCodeCatalystSshConfig(sshPath: string) {
-    const iswin = process.platform === 'win32'
-
-    const scriptResult = await ensureConnectScript()
-    if (scriptResult.isErr()) {
-        return scriptResult
-    }
-
-    const connectScript = scriptResult.ok()
-    const proxyCommand = await getProxyCommand(iswin, connectScript.fsPath)
-    if (proxyCommand.isErr()) {
-        return proxyCommand
-    }
-
-    const section = createSSHConfigSection(proxyCommand.unwrap())
-
-    const verifyHost = await verifySSHHost({ sshPath, proxyCommand: proxyCommand.unwrap(), section })
-    if (verifyHost.isErr()) {
-        return verifyHost
-    }
-
-    return Result.ok()
-}
-
-const configHostName = `${hostNamePrefix}*`
-function createSSHConfigSection(proxyCommand: string): string {
-    // "AddKeysToAgent" will automatically add keys used on the server to the local agent. If not set, then `ssh-add`
-    // must be done locally. It's mostly a convenience thing; private keys are _not_ shared with the server.
-
-    return `
-# Created by AWS Toolkit for VSCode. https://github.com/aws/aws-toolkit-vscode
-Host ${configHostName}
-    ForwardAgent yes
-    AddKeysToAgent yes
-    StrictHostKeyChecking accept-new
-    ProxyCommand ${proxyCommand}
-`
-}
-
-// Check if the "aws-devenv-*" hostname pattern is working.
-async function verifySSHHost({
-    sshPath,
-    section,
-    proxyCommand,
-}: {
-    sshPath: string
-    section: string
-    proxyCommand: string
-}) {
-    const matchResult = await matchSshSection(sshPath, `${hostNamePrefix}test`)
-    if (matchResult.isErr()) {
-        return matchResult
-    }
-
-    const configSection = matchResult.ok()
-    const hasProxyCommand = configSection?.includes(proxyCommand)
-
-    if (!hasProxyCommand) {
-        if (configSection !== undefined) {
-            getLogger().warn(
-                `codecatalyst: SSH config: found old/outdated "${configHostName}" section:\n%O`,
-                configSection
-            )
-            const oldConfig = localize(
-                'AWS.codecatalyst.error.oldConfig',
-                'Your ~/.ssh/config has a {0} section that might be out of date. Delete it, then try again.',
-                configHostName
-            )
-
-            const openConfig = localize('AWS.ssh.openConfig', 'Open config...')
-            vscode.window.showWarningMessage(oldConfig, openConfig).then(resp => {
-                if (resp === openConfig) {
-                    vscode.window.showTextDocument(vscode.Uri.file(getSshConfigPath()))
-                }
-            })
-
-            return Result.err(new ToolkitError(oldConfig, { code: 'OldConfig' }))
-        }
-
-        const confirmTitle = localize(
-            'AWS.codecatalyst.confirm.installSshConfig.title',
-            '{0} Toolkit will add host {1} to ~/.ssh/config. This allows you to use SSH with your development envionments',
-            getIdeProperties().company,
-            configHostName
-        )
-        const confirmText = localize('AWS.codecatalyst.confirm.installSshConfig.button', 'Update SSH config')
-        const response = await showConfirmationMessage({ prompt: confirmTitle, confirm: confirmText })
-        if (!response) {
-            return Result.err(new CancellationError('user'))
-        }
-
-        const sshConfigPath = getSshConfigPath()
-        try {
-            await fs.mkdirp(path.dirname(sshConfigPath))
-            await fs.appendFile(sshConfigPath, section)
-        } catch (e) {
-            const message = localize(
-                'AWS.codecatalyst.error.writeFail',
-                'Failed to write SSH config: {0} (permission issue?)',
-                sshConfigPath
-            )
-
-            return Result.err(ToolkitError.chain(e, message, { code: 'ConfigWriteFailed' }))
-        }
-    }
-
-    return Result.ok()
-}
-
-async function matchSshSection(sshPath: string, sshName: string) {
-    const proc = new ChildProcess(sshPath, ['-G', sshName])
-    const r = await proc.run()
-    if (r.exitCode !== 0) {
-        return Result.err(r.error ?? new Error(`ssh check against host failed: ${r.exitCode}`))
-    }
-
-    const matches = r.stdout.match(/proxycommand.{0,1024}codecatalyst_connect(.ps1)?.{0,99}/i)
-    return Result.ok(matches?.[0])
-}
-
-async function getProxyCommand(iswin: boolean, script: string): Promise<Result<string, ToolkitError>> {
-    if (iswin) {
-        // Some older versions of OpenSSH (7.8 and below) have a bug where attempting to use powershell.exe directly will fail without an absolute path
-        const proc = new ChildProcess('powershell.exe', ['-Command', '(get-command powershell.exe).Path'])
-        const r = await proc.run()
-        if (r.exitCode !== 0) {
-            return Result.err(new ToolkitError('Failed to get absolute path for powershell', { cause: r.error }))
-        }
-        return Result.ok(`"${r.stdout}" -ExecutionPolicy RemoteSigned -File "${script}" %h`)
-    } else {
-        return Result.ok(`'${script}' '%h'`)
-    }
-}
diff --git a/src/codecatalyst/uriHandlers.ts b/src/codecatalyst/uriHandlers.ts
deleted file mode 100644
index 1ab5996cc18..00000000000
--- a/src/codecatalyst/uriHandlers.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { SearchParams, UriHandler } from '../shared/vscode/uriHandler'
-import { getCodeCatalystConfig } from '../shared/clients/codecatalystClient'
-import { CodeCatalystCommands } from './commands'
-import { recordSource } from './utils'
-
-export function register(
-    handler: UriHandler,
-    commands: Pick<typeof CodeCatalystCommands.declared, 'cloneRepo' | 'openDevEnv'>
-) {
-    async function cloneHandler(params: ReturnType<typeof parseCloneParams>) {
-        recordSource('UriHandler')
-
-        if (params.url.authority.endsWith(getCodeCatalystConfig().gitHostname)) {
-            await commands.cloneRepo.execute(params.url)
-        } else {
-            await vscode.commands.executeCommand('git.clone', params.url.toString())
-        }
-    }
-
-    async function connectHandler(params: ReturnType<typeof parseConnectParams | typeof parseConnectParamsOld>) {
-        recordSource('UriHandler')
-
-        await commands.openDevEnv.execute({
-            id: params.devEnvironmentId,
-            org: { name: 'spaceName' in params ? params.spaceName : params.organizationName },
-            project: { name: params.projectName },
-        })
-    }
-
-    return vscode.Disposable.from(
-        handler.registerHandler('/clone', cloneHandler, parseCloneParams),
-        handler.registerHandler('/connect/codecatalyst', connectHandler, parseConnectParams),
-        handler.registerHandler('/connect/caws', connectHandler, parseConnectParamsOld) // FIXME: remove this before GA
-    )
-}
-
-function parseCloneParams(query: SearchParams) {
-    return { url: query.getAsOrThrow('url', 'A URL must be provided', v => vscode.Uri.parse(v, true)) }
-}
-
-function parseConnectParams(query: SearchParams) {
-    return query.getFromKeysOrThrow('devEnvironmentId', 'spaceName', 'projectName')
-}
-
-function parseConnectParamsOld(query: SearchParams) {
-    return query.getFromKeysOrThrow('devEnvironmentId', 'organizationName', 'projectName')
-}
diff --git a/src/codecatalyst/utils.ts b/src/codecatalyst/utils.ts
deleted file mode 100644
index 203b1d0abfa..00000000000
--- a/src/codecatalyst/utils.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Ides } from 'aws-sdk/clients/codecatalyst'
-import * as vscode from 'vscode'
-import { CodeCatalystResource, getCodeCatalystConfig } from '../shared/clients/codecatalystClient'
-import { pushIf } from '../shared/utilities/collectionUtils'
-import { telemetry } from '../shared/telemetry/telemetry'
-
-/**
- * Builds a web URL from the given CodeCatalyst object.
- */
-export function toCodeCatalystUrl(resource: CodeCatalystResource): string {
-    const prefix = `https://${getCodeCatalystConfig().hostname}/spaces`
-
-    const format = (org: string, proj?: string, repo?: string, branch?: string) => {
-        const parts = [prefix, org]
-        pushIf(parts, !!proj, 'projects', proj)
-        pushIf(parts, !!repo, 'source-repositories', repo)
-        pushIf(parts, !!branch, 'branch', 'refs', 'heads', branch)
-
-        return parts.concat('view').join('/')
-    }
-
-    switch (resource.type) {
-        case 'org':
-            return format(resource.name)
-        case 'project':
-            return format(resource.org.name, resource.name)
-        case 'repo':
-            return format(resource.org.name, resource.project.name, resource.name)
-        case 'branch':
-            return format(resource.org.name, resource.project.name, resource.repo.name, resource.name)
-        case 'devEnvironment':
-            // There's currently no page to view an individual devenv.
-            // This may be changed to direct to the underlying repository instead
-            return [prefix, resource.org.name, 'projects', resource.project.name, 'dev-environments'].join('/')
-    }
-}
-
-export function getHelpUrl(): string {
-    return `https://${getCodeCatalystConfig().hostname}/help`
-}
-
-/**
- * Builds a web URL from the given CodeCatalyst object.
- */
-export function openCodeCatalystUrl(o: CodeCatalystResource) {
-    const url = toCodeCatalystUrl(o)
-    vscode.env.openExternal(vscode.Uri.parse(url))
-}
-
-export function isCodeCatalystVSCode(ides: Ides | undefined): boolean {
-    return ides !== undefined && ides.findIndex(ide => ide.name === 'VSCode') !== -1
-}
-
-export function recordSource(source: 'Webview' | 'UriHandler' | 'Reconnect' | 'CommandPalette') {
-    // TODO: add `source` (or something similar) as a base component to events
-    telemetry.codecatalyst_connect.record({ source } as any)
-    telemetry.codecatalyst_localClone.record({ source } as any)
-}
diff --git a/src/codecatalyst/vue/configure/backend.ts b/src/codecatalyst/vue/configure/backend.ts
deleted file mode 100644
index 02f64ecba90..00000000000
--- a/src/codecatalyst/vue/configure/backend.ts
+++ /dev/null
@@ -1,211 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as nls from 'vscode-nls'
-import { ConnectedDevEnv, DevEnvironmentId, getDevfileLocation } from '../../model'
-import { CodeCatalystCommands, DevEnvironmentSettings } from '../../commands'
-import { VueWebview } from '../../../webviews/main'
-import { Prompter } from '../../../shared/ui/prompter'
-import { isValidResponse } from '../../../shared/wizards/wizard'
-import { sleep } from '../../../shared/utilities/timeoutUtils'
-import { GetStatusResponse } from '../../../shared/clients/devenvClient'
-import { openCodeCatalystUrl } from '../../utils'
-import { assertHasProps } from '../../../shared/utilities/tsUtils'
-import {
-    createAliasPrompter,
-    createInstancePrompter,
-    createTimeoutPrompter,
-    getAllInstanceDescriptions,
-    isValidSubscriptionType,
-} from '../../wizards/devenvSettings'
-import { updateDevfileCommand } from '../../devfile'
-import { showViewLogsMessage } from '../../../shared/utilities/messages'
-import { isLongReconnect, removeReconnectionInformation, saveReconnectionInformation } from '../../reconnect'
-import { CodeCatalystClient, DevEnvironment } from '../../../shared/clients/codecatalystClient'
-import { isCloud9 } from '../../../shared/extensionUtilities'
-
-const localize = nls.loadMessageBundle()
-
-export class CodeCatalystConfigureWebview extends VueWebview {
-    public readonly id = 'configureCodeCatalyst'
-    public readonly source = 'src/codecatalyst/vue/configure/index.js'
-
-    public readonly onDidChangeDevfile = new vscode.EventEmitter<GetStatusResponse>()
-
-    public constructor(
-        private readonly client: CodeCatalystClient,
-        private readonly devenv: ConnectedDevEnv,
-        private readonly commands: typeof CodeCatalystCommands.declared
-    ) {
-        super()
-    }
-
-    public init() {
-        return this.devenv.summary
-    }
-
-    public getAllInstanceDescriptions() {
-        return getAllInstanceDescriptions()
-    }
-
-    public async getDevfileLocation() {
-        const location = await getDevfileLocation(this.devenv.devenvClient)
-        return vscode.workspace.asRelativePath(location)
-    }
-
-    public async openDevfile() {
-        const location = await getDevfileLocation(this.devenv.devenvClient)
-        return this.commands.openDevfile.execute(location)
-    }
-
-    public async updateDevfile(location: string) {
-        // TODO(sijaden): we should be able to store the absolute URI somewhere?
-        const rootDirectory = vscode.workspace.workspaceFolders?.[0].uri
-        if (!rootDirectory) {
-            throw new Error('No workspace folder found')
-        }
-
-        await updateDevfileCommand.execute(vscode.Uri.joinPath(rootDirectory, location))
-    }
-
-    public async stopDevEnv(id: DevEnvironmentId) {
-        return this.commands.stopDevEnv.execute(id)
-    }
-
-    public async deleteDevEnv(id: DevEnvironmentId) {
-        return this.commands.deleteDevEnv.execute(id)
-    }
-
-    public async updateDevEnv(
-        id: Pick<DevEnvironment, 'id' | 'org' | 'project' | 'alias'>,
-        settings: DevEnvironmentSettings
-    ) {
-        if (isLongReconnect(this.devenv.summary, settings)) {
-            try {
-                await saveReconnectionInformation(id)
-                const resp = await this.commands.updateDevEnv.execute(id, settings)
-                if (resp === undefined) {
-                    await removeReconnectionInformation(id)
-                } else {
-                    reportClosingMessage()
-                }
-
-                return resp
-            } catch (err) {
-                await removeReconnectionInformation(id)
-                throw err
-            }
-        } else {
-            return this.commands.updateDevEnv.execute(id, settings)
-        }
-    }
-
-    public async showLogsMessage(title: string): Promise<string | undefined> {
-        return showViewLogsMessage(title)
-    }
-
-    public async editSetting(
-        settings: DevEnvironmentSettings,
-        key: keyof DevEnvironmentSettings
-    ): Promise<DevEnvironmentSettings> {
-        const spaceName = this.devenv.summary.org.name
-        const subscriptionType = await this.client
-            .getSubscription({ spaceName })
-            .then(resp => (isValidSubscriptionType(resp.subscriptionType) ? resp.subscriptionType : 'FREE'))
-
-        async function prompt(prompter: Prompter<any>) {
-            prompter.recentItem = settings[key]
-            const response = await prompter.prompt()
-
-            if (isValidResponse(response)) {
-                return { ...settings, [key]: response }
-            } else {
-                return settings
-            }
-        }
-
-        switch (key) {
-            case 'alias':
-                return prompt(createAliasPrompter())
-            case 'instanceType':
-                return prompt(createInstancePrompter(subscriptionType))
-            case 'inactivityTimeoutMinutes':
-                return prompt(createTimeoutPrompter())
-            case 'persistentStorage':
-                throw new Error('Persistent storage cannot be changed after creation')
-        }
-    }
-
-    public openBranch(): void {
-        const repo = this.devenv.summary.repositories?.[0]
-        assertHasProps(repo, 'branchName')
-        openCodeCatalystUrl({
-            type: 'branch',
-            name: repo.branchName,
-            repo: { name: repo.repositoryName },
-            org: { name: this.devenv.summary.org.name },
-            project: { name: this.devenv.summary.project.name },
-        })
-    }
-}
-
-const Panel = VueWebview.compilePanel(CodeCatalystConfigureWebview)
-let activePanel: InstanceType<typeof Panel> | undefined
-let subscriptions: vscode.Disposable[] | undefined
-
-export async function showConfigureDevEnv(
-    client: CodeCatalystClient,
-    ctx: vscode.ExtensionContext,
-    devenv: ConnectedDevEnv,
-    commands: typeof CodeCatalystCommands.declared
-): Promise<void> {
-    activePanel ??= new Panel(ctx, client, devenv, commands)
-    const webview = await activePanel.show({
-        title: localize('AWS.view.configureDevEnv.title', 'Dev Environment Settings'),
-        viewColumn: isCloud9() ? vscode.ViewColumn.One : vscode.ViewColumn.Active,
-    })
-
-    if (!subscriptions) {
-        const poller = pollDevfile(devenv, activePanel.server)
-        subscriptions = [
-            poller,
-            webview.onDidDispose(() => {
-                vscode.Disposable.from(...(subscriptions ?? [])).dispose()
-                activePanel = undefined
-                subscriptions = undefined
-            }),
-        ]
-    }
-}
-
-function pollDevfile(devenv: ConnectedDevEnv, server: CodeCatalystConfigureWebview): vscode.Disposable {
-    let done = false
-
-    ;(async () => {
-        while (!done) {
-            const resp = await devenv.devenvClient.getStatus()
-            if (resp.status === 'CHANGED') {
-                server.onDidChangeDevfile.fire({ ...resp, actionId: 'devfile' })
-            }
-            await sleep(2500)
-        }
-    })()
-
-    return { dispose: () => (done = true) }
-}
-
-function reportClosingMessage(): void {
-    vscode.window.withProgress(
-        {
-            location: vscode.ProgressLocation.Notification,
-            title: 'Session ended. Session will restore when the Dev Environment is available again.',
-        },
-        async (progress, token) => {
-            await sleep(2500)
-            vscode.commands.executeCommand('workbench.action.remote.close')
-        }
-    )
-}
diff --git a/src/codecatalyst/vue/configure/index.ts b/src/codecatalyst/vue/configure/index.ts
deleted file mode 100644
index 725f2fdaadb..00000000000
--- a/src/codecatalyst/vue/configure/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { createApp } from 'vue'
-import component from './root.vue'
-
-const create = () => createApp(component)
-const app = create()
-app.mount('#vue-app')
-
-window.addEventListener('remount', () => {
-    app.unmount()
-    create().mount('#vue-app')
-})
diff --git a/src/codecatalyst/vue/create/backend.ts b/src/codecatalyst/vue/create/backend.ts
deleted file mode 100644
index 3130ac30dba..00000000000
--- a/src/codecatalyst/vue/create/backend.ts
+++ /dev/null
@@ -1,229 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as vscode from 'vscode'
-import { CodeCatalystCommands, DevEnvironmentSettings } from '../../commands'
-import { VueWebview } from '../../../webviews/main'
-import { Prompter } from '../../../shared/ui/prompter'
-import { isValidResponse } from '../../../shared/wizards/wizard'
-import {
-    createAliasPrompter,
-    createInstancePrompter,
-    createStoragePrompter,
-    createTimeoutPrompter,
-    getAllInstanceDescriptions,
-    isValidSubscriptionType,
-} from '../../wizards/devenvSettings'
-import { showViewLogsMessage } from '../../../shared/utilities/messages'
-import {
-    CodeCatalystBranch,
-    CodeCatalystOrg,
-    CodeCatalystProject,
-    CodeCatalystClient,
-    DevEnvironment,
-} from '../../../shared/clients/codecatalystClient'
-import { CancellationError } from '../../../shared/utilities/timeoutUtils'
-import { isCloud9 } from '../../../shared/extensionUtilities'
-import { telemetry } from '../../../shared/telemetry/telemetry'
-import { isNonNullable } from '../../../shared/utilities/tsUtils'
-import { recordSource } from '../../utils'
-
-interface LinkedResponse {
-    readonly type: 'linked'
-    readonly selectedProject: CodeCatalystProject
-    readonly selectedBranch: CodeCatalystBranch
-    readonly newBranch: string
-}
-
-interface EmptyResponse {
-    readonly type: 'none'
-    readonly selectedProject: CodeCatalystProject
-}
-
-export type SourceResponse = LinkedResponse | EmptyResponse
-
-export class CodeCatalystCreateWebview extends VueWebview {
-    public readonly id = 'createCodeCatalyst'
-    public readonly source = 'src/codecatalyst/vue/create/index.js'
-
-    public constructor(
-        private readonly client: CodeCatalystClient,
-        private readonly commands: typeof CodeCatalystCommands.declared,
-        private readonly onComplete: (devenv?: DevEnvironment) => void
-    ) {
-        super()
-    }
-
-    public close() {
-        this.dispose()
-        this.onComplete()
-    }
-
-    public async getProjects() {
-        return this.client.listResources('project').flatten().promise()
-    }
-
-    public async getBranches(project: CodeCatalystProject) {
-        const repos = this.client
-            .listSourceRepositories({
-                spaceName: project.org.name,
-                projectName: project.name,
-            })
-            .flatten()
-
-        const branches = repos.map(r =>
-            this.client
-                .listBranches({
-                    spaceName: r.org.name,
-                    projectName: r.project.name,
-                    sourceRepositoryName: r.name,
-                })
-                .flatten()
-                .promise()
-        )
-
-        return branches.flatten().promise()
-    }
-
-    public getAllInstanceDescriptions() {
-        return getAllInstanceDescriptions()
-    }
-
-    public async showLogsMessage(title: string): Promise<string | undefined> {
-        return showViewLogsMessage(title)
-    }
-
-    public async editSetting(
-        settings: DevEnvironmentSettings,
-        key: keyof DevEnvironmentSettings,
-        org?: Pick<CodeCatalystOrg, 'name'>
-    ): Promise<DevEnvironmentSettings> {
-        const subscriptionType = isNonNullable(org)
-            ? await this.client
-                  .getSubscription({ spaceName: org.name })
-                  .then(resp => (isValidSubscriptionType(resp.subscriptionType) ? resp.subscriptionType : 'FREE'))
-            : 'FREE'
-
-        async function prompt(prompter: Prompter<any>) {
-            prompter.recentItem = settings[key]
-            const response = await prompter.prompt()
-
-            if (isValidResponse(response)) {
-                return { ...settings, [key]: response }
-            } else {
-                return settings
-            }
-        }
-
-        switch (key) {
-            case 'alias':
-                return prompt(createAliasPrompter())
-            case 'instanceType':
-                return prompt(createInstancePrompter(subscriptionType))
-            case 'inactivityTimeoutMinutes':
-                return prompt(createTimeoutPrompter())
-            case 'persistentStorage':
-                return prompt(createStoragePrompter(subscriptionType))
-        }
-    }
-
-    public async submit(settings: DevEnvironmentSettings, source: SourceResponse) {
-        const devenv: DevEnvironment = await (() => {
-            switch (source.type) {
-                case 'none':
-                    return this.createEmptyDevEnv(settings, source)
-                case 'linked':
-                    return this.createLinkedDevEnv(settings, source)
-            }
-        })()
-
-        recordSource('Webview')
-        telemetry.codecatalyst_createDevEnvironment.record({ codecatalyst_createDevEnvironmentRepoType: source.type })
-
-        this.onComplete(devenv)
-        this.commands.openDevEnv.execute(devenv)
-    }
-
-    private async createEmptyDevEnv(settings: DevEnvironmentSettings, source: EmptyResponse) {
-        return this.client.createDevEnvironment({
-            ides: [{ name: 'VSCode' }],
-            projectName: source.selectedProject.name,
-            spaceName: source.selectedProject.org.name,
-            ...settings,
-        })
-    }
-
-    private async createLinkedDevEnv(settings: DevEnvironmentSettings, source: LinkedResponse) {
-        const isNewBranch = !!source.newBranch
-        if (isNewBranch) {
-            await this.client.createSourceBranch({
-                name: source.newBranch,
-                spaceName: source.selectedProject.org.name,
-                projectName: source.selectedProject.name,
-                sourceRepositoryName: source.selectedBranch.repo.name,
-                headCommitId: source.selectedBranch.headCommitId,
-            })
-        }
-
-        const branchName = isNewBranch ? source.newBranch : source.selectedBranch.name.replace('refs/heads/', '')
-        return this.client.createDevEnvironment({
-            ides: [{ name: 'VSCode' }],
-            projectName: source.selectedProject.name,
-            spaceName: source.selectedProject.org.name,
-            repositories: [
-                {
-                    repositoryName: source.selectedBranch.repo.name,
-                    branchName,
-                },
-            ],
-            ...settings,
-        })
-    }
-}
-
-// TODO(sijaden): de-dupe this basic init pattern for webviews
-// the logic here is mainly to preserve the same panel in case the
-// user re-runs a command, which is fairly common
-const Panel = VueWebview.compilePanel(CodeCatalystCreateWebview)
-let activePanel: InstanceType<typeof Panel> | undefined
-let subscriptions: vscode.Disposable[] | undefined
-let submitPromise: Promise<void> | undefined
-
-export async function showCreateDevEnv(
-    client: CodeCatalystClient,
-    ctx: vscode.ExtensionContext,
-    commands: typeof CodeCatalystCommands.declared
-): Promise<void> {
-    submitPromise ??= new Promise<void>((resolve, reject) => {
-        activePanel ??= new Panel(ctx, client, commands, devenv => {
-            if (devenv === undefined) {
-                reject(new CancellationError('user'))
-            } else {
-                resolve()
-            }
-        })
-    })
-
-    const webview = await activePanel!.show({
-        title: localize('AWS.view.createDevEnv.title', 'Create a CodeCatalyst Dev Environment'),
-        viewColumn: isCloud9() ? vscode.ViewColumn.One : vscode.ViewColumn.Active,
-    })
-
-    if (!subscriptions) {
-        subscriptions = [
-            webview.onDidDispose(() => {
-                vscode.Disposable.from(...(subscriptions ?? [])).dispose()
-                activePanel = undefined
-                subscriptions = undefined
-                submitPromise = undefined
-            }),
-        ]
-    }
-
-    return submitPromise
-}
diff --git a/src/codecatalyst/vue/create/index.ts b/src/codecatalyst/vue/create/index.ts
deleted file mode 100644
index 725f2fdaadb..00000000000
--- a/src/codecatalyst/vue/create/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { createApp } from 'vue'
-import component from './root.vue'
-
-const create = () => createApp(component)
-const app = create()
-app.mount('#vue-app')
-
-window.addEventListener('remount', () => {
-    app.unmount()
-    create().mount('#vue-app')
-})
diff --git a/src/codecatalyst/vue/create/source.vue b/src/codecatalyst/vue/create/source.vue
deleted file mode 100644
index b8cc6641bdc..00000000000
--- a/src/codecatalyst/vue/create/source.vue
+++ /dev/null
@@ -1,245 +0,0 @@
-<template>
-    <div class="modes mb-16">
-        <label class="mode-container" :data-disabled="model.type !== 'linked'">
-            <input class="radio" type="radio" name="mode" id="from-code-catalyst" v-model="model.type" value="linked" />
-            <span class="ml-8 option-label" style="padding: 0px">Use an existing CodeCatalyst repository</span>
-        </label>
-
-        <label class="mode-container" :data-disabled="model.type !== 'none'">
-            <input class="radio" type="radio" name="mode" id="from-none" v-model="model.type" value="none" />
-            <span class="ml-8 option-label" style="padding: 0px">Create an empty Dev Environment</span>
-        </label>
-    </div>
-
-    <div class="source-pickers" v-if="model.type === 'linked'">
-        <span style="width: 100%">
-            <label class="option-label soft">Project</label>
-            <select class="picker" v-model="model.selectedProject" @input="update">
-                <option disabled :value="undefined">{{ loadingProjects ? 'Loading...' : 'Select a project' }}</option>
-                <option v-for="project in projects" :key="project.name" :value="project">
-                    {{ `${project.org.name} / ${project.name}` }}
-                </option>
-            </select>
-        </span>
-
-        <div class="modes flex-sizing mt-16">
-            <!-- Existing branch -->
-            <span class="flex-sizing">
-                <label class="options-label soft mb-8" style="display: block" for="branch-picker">Branch</label>
-                <select
-                    id="branch-picker"
-                    class="picker"
-                    :disabled="!model.selectedProject"
-                    v-model="model.selectedBranch"
-                    @input="update"
-                >
-                    <option disabled :value="undefined">{{ branchPlaceholder }}</option>
-                    <option v-for="branch in availableBranches" :key="branch.id" :value="branch">
-                        {{ branchName(branch) }}
-                    </option>
-                </select>
-            </span>
-
-            <!-- New Branch -->
-            <span class="flex-sizing">
-                <label class="options-label soft mb-8" style="display: block" for="branch-input"
-                    >Optional - Create a Branch from an Existing Branch</label
-                >
-                <input
-                    id="branch-input"
-                    type="text"
-                    placeholder="branch-name"
-                    v-model="model.newBranch"
-                    @input="update"
-                />
-
-                <div class="input-validation" v-if="branchError">{{ branchError }}</div>
-            </span>
-        </div>
-    </div>
-
-    <div class="source-pickers" v-if="model.type === 'none'">
-        <span style="width: 100%">
-            <label class="option-label soft">Project</label>
-            <select class="picker" v-model="model.selectedProject" @input="update">
-                <option disabled :value="undefined">{{ loadingProjects ? 'Loading...' : 'Select a project' }}</option>
-                <option v-for="project in projects" :key="project.name" :value="project">
-                    {{ `${project.org.name} / ${project.name}` }}
-                </option>
-            </select>
-        </span>
-    </div>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue'
-import { CodeCatalystBranch, CodeCatalystProject } from '../../../shared/clients/codecatalystClient'
-import { WebviewClientFactory } from '../../../webviews/client'
-import { createClass, createType } from '../../../webviews/util'
-import { CodeCatalystCreateWebview, SourceResponse } from './backend'
-
-const client = WebviewClientFactory.create<CodeCatalystCreateWebview>()
-
-type SourceModel = Partial<SourceResponse & { branchError: string }>
-
-export function isValidSource(source: SourceModel): source is SourceResponse {
-    if (source.type === 'linked') {
-        return !!source.selectedProject && !!source.selectedBranch && !source.branchError
-    } else if (source.type === 'none') {
-        return !!source.selectedProject
-    }
-
-    return false
-}
-
-export const VueModel = createClass<SourceModel>({ type: 'linked' })
-
-export default defineComponent({
-    name: 'source-code',
-    props: {
-        modelValue: {
-            type: createType(VueModel),
-            default: new VueModel(),
-        },
-    },
-    data() {
-        return {
-            projects: [] as CodeCatalystProject[],
-            branches: {} as Record<string, CodeCatalystBranch[] | undefined>,
-            loadingProjects: false,
-            loadingBranches: {} as Record<string, boolean | undefined>,
-        }
-    },
-    async created() {
-        this.loadingProjects = true
-        this.projects = await client.getProjects().finally(() => (this.loadingProjects = false))
-    },
-    watch: {
-        async 'model.selectedProject'(project?: CodeCatalystProject) {
-            this.useFirstBranch()
-
-            if (project && !this.branches[project.name]) {
-                this.loadingBranches[project.name] = true
-                this.branches[project.name] ??= await client.getBranches(project).finally(() => {
-                    this.loadingBranches[project.name] = false
-                })
-                this.useFirstBranch()
-            }
-        },
-    },
-    computed: {
-        model() {
-            return this.modelValue
-        },
-        loading() {
-            if (this.model.type !== 'linked' || !this.model.selectedProject) {
-                return false
-            }
-
-            return this.loadingBranches[this.model.selectedProject.name] ?? false
-        },
-        branchPlaceholder() {
-            if (this.loading) {
-                return 'Loading...'
-            }
-
-            return (this.availableBranches?.length ?? 0) === 0 ? 'No branches found' : 'Select a branch'
-        },
-        availableBranches() {
-            if (this.model.type !== 'linked' || !this.model.selectedProject) {
-                return []
-            }
-
-            return this.branches[this.model.selectedProject.name]
-        },
-        branchError() {
-            if (this.model.type !== 'linked' || !this.model.newBranch) {
-                return
-            }
-
-            const branch = this.model.newBranch
-            if (!!branch && this.availableBranches?.find(b => b.name === `refs/heads/${branch}`) !== undefined) {
-                return 'Branch already exists'
-            }
-        },
-    },
-    methods: {
-        update() {
-            this.model.branchError = this.branchError
-            this.$emit('update:modelValue', this.model)
-        },
-        branchName(branch: CodeCatalystBranch) {
-            return `${branch.repo.name} / ${branch.name.replace('refs/heads/', '')}`
-        },
-        useFirstBranch() {
-            if (this.model.type !== 'linked') {
-                return
-            }
-
-            Object.assign<typeof this.model, Partial<SourceModel>>(this.model, {
-                selectedBranch: this.availableBranches?.[0],
-            })
-            this.update()
-        },
-    },
-    emits: {
-        'update:modelValue': (value: InstanceType<typeof VueModel>) => true,
-    },
-})
-</script>
-
-<style scope>
-.picker {
-    min-width: 300px;
-}
-
-.source-pickers {
-    margin-top: 16px;
-    display: flex;
-    flex-flow: wrap;
-    column-gap: 16px;
-}
-
-.modes {
-    display: flex;
-    column-gap: 16px;
-}
-
-.flex-sizing {
-    flex: 1;
-}
-
-.mode-container {
-    display: flex;
-    flex: 1;
-    border: 1px solid gray;
-    padding: 8px;
-    max-width: calc((1 / 3 * 100%) - (2 / 3 * 32px));
-    align-items: center;
-}
-
-.config-item {
-    display: inline;
-    margin-left: 8px;
-}
-
-.mode-container[data-disabled='false'] {
-    border: 1px solid var(--vscode-focusBorder);
-}
-
-body.vscode-dark .mode-container[data-disabled='true'] .config-item {
-    filter: brightness(0.8);
-}
-
-body.vscode-light .mode-container[data-disabled='true'] .config-item {
-    filter: brightness(1.2);
-}
-
-#repository-url {
-    min-width: 300px;
-}
-
-#branch-input {
-    min-width: 300px;
-}
-</style>
diff --git a/src/codecatalyst/wizards/selectResource.ts b/src/codecatalyst/wizards/selectResource.ts
deleted file mode 100644
index ee4859c775d..00000000000
--- a/src/codecatalyst/wizards/selectResource.ts
+++ /dev/null
@@ -1,229 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { isCloud9 } from '../../shared/extensionUtilities'
-import * as codecatalyst from '../../shared/clients/codecatalystClient'
-import { createCommonButtons, createRefreshButton } from '../../shared/ui/buttons'
-import {
-    createQuickPick,
-    DataQuickPickItem,
-    ExtendedQuickPickOptions,
-    QuickPickPrompter,
-} from '../../shared/ui/pickerPrompter'
-import { AsyncCollection } from '../../shared/utilities/asyncCollection'
-import { getRelativeDate } from '../../shared/utilities/textUtilities'
-import { isValidResponse } from '../../shared/wizards/wizard'
-import { associateDevEnv, docs } from '../model'
-import { getHelpUrl, isCodeCatalystVSCode } from '../utils'
-
-export function createRepoLabel(r: codecatalyst.CodeCatalystRepo): string {
-    return `${r.org.name} / ${r.project.name} / ${r.name}`
-}
-
-/**
- * Maps CodeCatalystFoo objects to `vscode.QuickPickItem` objects.
- */
-export function asQuickpickItem<T extends codecatalyst.CodeCatalystResource>(resource: T): DataQuickPickItem<T> {
-    switch (resource.type) {
-        case 'project':
-            return {
-                label: `${resource.org.name} / ${resource.name}`,
-                description: resource.description,
-                data: resource,
-            }
-        case 'repo':
-            return {
-                label: createRepoLabel(resource),
-                description: resource.description,
-                data: resource,
-            }
-        case 'devEnvironment':
-            return { ...fromDevEnv(resource), data: resource }
-        case 'org':
-            return { label: resource.name, detail: resource.description, data: resource }
-        default:
-            return { label: resource.name, data: resource }
-    }
-}
-
-function fromDevEnv(env: codecatalyst.DevEnvironment): Omit<DataQuickPickItem<unknown>, 'data'> {
-    const labelParts = [] as string[]
-
-    if (env.status === 'RUNNING') {
-        labelParts.push('$(pass) ')
-    } else {
-        labelParts.push('$(circle-slash) ') // TODO(sijaden): get actual 'stopped' icon
-    }
-
-    const repo = env.repositories[0]
-
-    if (repo) {
-        const branchName = repo.branchName?.replace('refs/heads/', '')
-        labelParts.push(branchName ? `${repo.repositoryName}/${branchName}` : repo.repositoryName)
-    } else {
-        labelParts.push(`${env.id} (no repository)`)
-    }
-
-    if (env.alias) {
-        labelParts.push(` ${env.alias}`)
-    }
-
-    const lastUsed = `Last used: ${getRelativeDate(env.lastUpdatedTime)}`
-
-    return {
-        label: labelParts.join(''),
-        description: env.status === 'RUNNING' ? 'RUNNING - IN USE' : env.status,
-        detail: `${env.org.name}/${env.project.name}, ${lastUsed}`,
-    }
-}
-
-function createResourcePrompter<T extends codecatalyst.CodeCatalystResource>(
-    resources: AsyncCollection<T[]>,
-    helpUri: vscode.Uri,
-    presentation: Omit<ExtendedQuickPickOptions<T>, 'buttons'>
-): QuickPickPrompter<T> {
-    const refresh = createRefreshButton()
-    const items = resources.map(p => p.map(asQuickpickItem))
-    const prompter = createQuickPick(items, {
-        buttons: [refresh, ...createCommonButtons(helpUri)],
-        ...presentation,
-    })
-
-    refresh.onClick = () => {
-        prompter.clearAndLoadItems(items)
-    }
-
-    return prompter
-}
-
-export function createOrgPrompter(
-    client: codecatalyst.CodeCatalystClient
-): QuickPickPrompter<codecatalyst.CodeCatalystOrg> {
-    const helpUri = isCloud9() ? docs.cloud9.main : docs.vscode.main
-    return createResourcePrompter(client.listSpaces(), helpUri, {
-        title: 'Select a CodeCatalyst Organization',
-        placeholder: 'Search for an Organization',
-    })
-}
-
-export function createProjectPrompter(
-    client: codecatalyst.CodeCatalystClient,
-    org?: codecatalyst.CodeCatalystOrg
-): QuickPickPrompter<codecatalyst.CodeCatalystProject> {
-    const helpUri = isCloud9() ? docs.cloud9.main : docs.vscode.main
-    const projects = org ? client.listProjects({ spaceName: org.name }) : client.listResources('project')
-
-    return createResourcePrompter(projects, helpUri, {
-        title: 'Select a CodeCatalyst Project',
-        placeholder: 'Search for a Project',
-    })
-}
-
-export function createRepoPrompter(
-    client: codecatalyst.CodeCatalystClient,
-    proj?: codecatalyst.CodeCatalystProject
-): QuickPickPrompter<codecatalyst.CodeCatalystRepo> {
-    const helpUri = isCloud9() ? docs.cloud9.cloneRepo : docs.vscode.main
-    const repos = proj
-        ? client.listSourceRepositories({ spaceName: proj.org.name, projectName: proj.name })
-        : client.listResources('repo')
-
-    return createResourcePrompter(repos, helpUri, {
-        title: 'Select a CodeCatalyst Repository',
-        placeholder: 'Search for a Repository',
-    })
-}
-
-export function createDevEnvPrompter(
-    client: codecatalyst.CodeCatalystClient,
-    proj?: codecatalyst.CodeCatalystProject
-): QuickPickPrompter<codecatalyst.DevEnvironment> {
-    const helpUri = isCloud9() ? docs.cloud9.devenv : docs.vscode.devenv
-    const envs = proj ? client.listDevEnvironments(proj) : client.listResources('devEnvironment')
-    const filtered = envs.map(arr => arr.filter(env => isCodeCatalystVSCode(env.ides)))
-    const isData = <T>(obj: T | DataQuickPickItem<T>['data']): obj is T => {
-        return typeof obj !== 'function' && isValidResponse(obj)
-    }
-
-    return createResourcePrompter(filtered, helpUri, {
-        title: 'Select a CodeCatalyst Dev Environment',
-        placeholder: 'Search for a Dev Environment',
-        compare: (a, b) => {
-            if (isData(a.data) && isData(b.data)) {
-                if (a.data.status === b.data.status) {
-                    return b.data.lastUpdatedTime.getTime() - a.data.lastUpdatedTime.getTime()
-                }
-
-                return a.data.status === 'RUNNING' ? 1 : b.data.status === 'RUNNING' ? -1 : 0
-            }
-
-            return 0
-        },
-    })
-}
-
-type ResourceType = codecatalyst.CodeCatalystResource['type']
-
-export async function selectCodeCatalystResource<T extends ResourceType>(
-    client: codecatalyst.CodeCatalystClient,
-    type: T & ResourceType
-): Promise<(codecatalyst.CodeCatalystResource & { type: typeof type }) | undefined> {
-    const prompter = (() => {
-        switch (type as ResourceType) {
-            case 'org':
-                return createOrgPrompter(client)
-            case 'project':
-                return createProjectPrompter(client)
-            case 'repo':
-                return createRepoPrompter(client)
-            case 'branch':
-                throw new Error('Picking a branch is not supported')
-            case 'devEnvironment':
-                return createDevEnvPrompter(client)
-        }
-    })()
-
-    const response = await prompter.prompt()
-    return isValidResponse(response) ? (response as codecatalyst.CodeCatalystResource & { type: T }) : undefined
-}
-
-/**
- * Special-case of {@link createRepoPrompter} for creating a new devenv
- */
-export async function selectRepoForDevEnv(
-    client: codecatalyst.CodeCatalystClient
-): Promise<codecatalyst.CodeCatalystRepo | undefined> {
-    const repos = associateDevEnv(client, client.listResources('repo').flatten())
-
-    const refresh = createRefreshButton()
-    const items = repos.map(repo => [
-        {
-            ...asQuickpickItem(repo),
-            invalidSelection: repo.devEnv !== undefined,
-            description: repo.devEnv ? `Repository already has a Dev Environment` : '',
-        },
-    ])
-
-    const prompter = createQuickPick(items, {
-        buttons: [refresh, ...createCommonButtons(getHelpUrl())],
-        title: 'Select a CodeCatalyst Repository',
-        placeholder: 'Search for a Repository',
-        compare: (a, b) => {
-            if (a.invalidSelection === b.invalidSelection) {
-                return 0
-            }
-
-            return a.invalidSelection ? 1 : b.invalidSelection ? -1 : 0
-        },
-    })
-
-    refresh.onClick = () => {
-        prompter.clearAndLoadItems(items)
-    }
-
-    const response = await prompter.prompt()
-    return isValidResponse(response) ? response : undefined
-}
diff --git a/src/codewhisperer/activation.ts b/src/codewhisperer/activation.ts
deleted file mode 100644
index 25548c38d89..00000000000
--- a/src/codewhisperer/activation.ts
+++ /dev/null
@@ -1,686 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { getTabSizeSetting } from '../shared/utilities/editorUtilities'
-import { KeyStrokeHandler } from './service/keyStrokeHandler'
-import * as EditorContext from './util/editorContext'
-import * as CodeWhispererConstants from './models/constants'
-import { getCompletionItems } from './service/completionProvider'
-import { vsCodeState, ConfigurationEntry } from './models/model'
-import { InlineCompletion } from './service/inlineCompletion'
-import { invokeRecommendation } from './commands/invokeRecommendation'
-import { acceptSuggestion } from './commands/onInlineAcceptance'
-import { resetIntelliSenseState } from './util/globalStateUtil'
-import { CodeWhispererSettings } from './util/codewhispererSettings'
-import { ExtContext } from '../shared/extensions'
-import { TextEditorSelectionChangeKind } from 'vscode'
-import { CodeWhispererTracker } from './tracker/codewhispererTracker'
-import * as codewhispererClient from './client/codewhisperer'
-import { runtimeLanguageContext } from './util/runtimeLanguageContext'
-import { getLogger } from '../shared/logger'
-import { isCloud9 } from '../shared/extensionUtilities'
-import {
-    enableCodeSuggestions,
-    toggleCodeSuggestions,
-    showReferenceLog,
-    set,
-    get,
-    showSecurityScan,
-    showLearnMore,
-    showSsoSignIn,
-    showFreeTierLimit,
-    updateReferenceLog,
-    showIntroduction,
-    showAccessTokenErrorLearnMore,
-} from './commands/basicCommands'
-import { sleep } from '../shared/utilities/timeoutUtils'
-import { ReferenceLogViewProvider } from './service/referenceLogViewProvider'
-import { ReferenceHoverProvider } from './service/referenceHoverProvider'
-import { ReferenceInlineProvider } from './service/referenceInlineProvider'
-import { SecurityPanelViewProvider } from './views/securityPanelViewProvider'
-import { disposeSecurityDiagnostic } from './service/diagnosticsProvider'
-import { RecommendationHandler } from './service/recommendationHandler'
-import { Commands } from '../shared/vscode/commands2'
-import { InlineCompletionService, refreshStatusBar } from './service/inlineCompletionService'
-import { isInlineCompletionEnabled } from './util/commonUtil'
-import { CodeWhispererCodeCoverageTracker } from './tracker/codewhispererCodeCoverageTracker'
-import { AuthUtil, isUpgradeableConnection } from './util/authUtil'
-import { Auth } from '../credentials/auth'
-import { isUserCancelledError } from '../shared/errors'
-import { showViewLogsMessage } from '../shared/utilities/messages'
-import globals from '../shared/extensionGlobals'
-
-const performance = globalThis.performance ?? require('perf_hooks').performance
-
-export async function activate(context: ExtContext): Promise<void> {
-    const codewhispererSettings = CodeWhispererSettings.instance
-    // initialize AuthUtil earlier to make sure it can listen to connection change events.
-    const auth = AuthUtil.instance
-    /**
-     * Enable essential intellisense default settings for AWS C9 IDE
-     */
-
-    if (isCloud9()) {
-        await enableDefaultConfigCloud9()
-    }
-    /**
-     * CodeWhisperer security panel
-     */
-    const securityPanelViewProvider = new SecurityPanelViewProvider(context.extensionContext)
-    activateSecurityScan()
-
-    /**
-     * Service control
-     */
-    const client = new codewhispererClient.DefaultCodeWhispererClient()
-
-    context.extensionContext.subscriptions.push(
-        /**
-         * Configuration change
-         */
-        vscode.workspace.onDidChangeConfiguration(async configurationChangeEvent => {
-            if (configurationChangeEvent.affectsConfiguration('editor.tabSize')) {
-                EditorContext.updateTabSize(getTabSizeSetting())
-            }
-            if (
-                configurationChangeEvent.affectsConfiguration(
-                    'aws.codeWhisperer.includeSuggestionsWithCodeReferences'
-                ) ||
-                configurationChangeEvent.affectsConfiguration('aws.codeWhisperer.shareCodeWhispererContentWithAWS')
-            ) {
-                ReferenceLogViewProvider.instance.update()
-                if (auth.isEnterpriseSsoInUse()) {
-                    await vscode.window
-                        .showInformationMessage(
-                            CodeWhispererConstants.ssoConfigAlertMessage,
-                            CodeWhispererConstants.settingsLearnMore
-                        )
-                        .then(async resp => {
-                            if (resp === CodeWhispererConstants.settingsLearnMore) {
-                                vscode.env.openExternal(vscode.Uri.parse(CodeWhispererConstants.learnMoreUri))
-                            }
-                        })
-                }
-            }
-            if (configurationChangeEvent.affectsConfiguration('editor.inlineSuggest.enabled')) {
-                await vscode.window
-                    .showInformationMessage(
-                        CodeWhispererConstants.reloadWindowPrompt,
-                        CodeWhispererConstants.reloadWindow
-                    )
-                    .then(selected => {
-                        if (selected === CodeWhispererConstants.reloadWindow) {
-                            vscode.commands.executeCommand('workbench.action.reloadWindow')
-                        }
-                    })
-            }
-        }),
-        /**
-         * Accept terms of service
-         */
-        Commands.register('aws.codeWhisperer.acceptTermsOfService', async () => {
-            await set(CodeWhispererConstants.autoTriggerEnabledKey, true, context.extensionContext.globalState)
-            await set(CodeWhispererConstants.termsAcceptedKey, true, context.extensionContext.globalState)
-            await vscode.commands.executeCommand('setContext', CodeWhispererConstants.termsAcceptedKey, true)
-            await vscode.commands.executeCommand('setContext', 'CODEWHISPERER_ENABLED', true)
-            await vscode.commands.executeCommand('aws.codeWhisperer.refresh')
-
-            const isShow = get(CodeWhispererConstants.welcomeMessageKey, context.extensionContext.globalState)
-            if (!isShow) {
-                showCodeWhispererWelcomeMessage()
-                await set(CodeWhispererConstants.welcomeMessageKey, true, context.extensionContext.globalState)
-            }
-            if (!isCloud9()) {
-                setStatusBarOK()
-            }
-        }),
-        /**
-         * Cancel terms of service
-         */
-        Commands.register('aws.codeWhisperer.cancelTermsOfService', async () => {
-            await set(CodeWhispererConstants.autoTriggerEnabledKey, false, context.extensionContext.globalState)
-            await vscode.commands.executeCommand('aws.codeWhisperer.refresh')
-        }),
-        /**
-         * Open Configuration
-         */
-        Commands.register('aws.codeWhisperer.configure', async id => {
-            if (id === 'codewhisperer') {
-                await vscode.commands.executeCommand(
-                    'workbench.action.openSettings',
-                    `@id:aws.codeWhisperer.includeSuggestionsWithCodeReferences`
-                )
-            } else {
-                await vscode.commands.executeCommand('workbench.action.openSettings', `aws.codeWhisperer`)
-            }
-        }),
-        // show introduction
-        showIntroduction.register(),
-        // toggle code suggestions
-        toggleCodeSuggestions.register(context.extensionContext.globalState),
-        // enable code suggestions
-        enableCodeSuggestions.register(context),
-        // code scan
-        showSecurityScan.register(context, securityPanelViewProvider, client),
-        // sign in with sso or AWS ID
-        showSsoSignIn.register(),
-        // learn more about CodeWhisperer
-        showLearnMore.register(),
-        // learn more about CodeWhisperer access token migration
-        showAccessTokenErrorLearnMore.register(),
-        // show free tier limit
-        showFreeTierLimit.register(),
-        // update reference log instance
-        updateReferenceLog.register(),
-        // refresh codewhisperer status bar
-        refreshStatusBar.register(),
-        // manual trigger
-        Commands.register({ id: 'aws.codeWhisperer', autoconnect: true }, async () => {
-            invokeRecommendation(vscode.window.activeTextEditor as vscode.TextEditor, client, await getConfigEntry())
-        }),
-        /**
-         * On recommendation acceptance
-         */
-        acceptSuggestion.register(context),
-        // on text document close.
-        vscode.workspace.onDidCloseTextDocument(e => {
-            if (isInlineCompletionEnabled() && e.uri.fsPath !== InlineCompletionService.instance.filePath()) {
-                return
-            }
-            RecommendationHandler.instance.reportUserDecisionOfRecommendation(vscode.window.activeTextEditor, -1)
-            RecommendationHandler.instance.clearRecommendations()
-        }),
-
-        vscode.languages.registerHoverProvider(
-            [...CodeWhispererConstants.supportedLanguages],
-            ReferenceHoverProvider.instance
-        ),
-        vscode.window.registerWebviewViewProvider(ReferenceLogViewProvider.viewType, ReferenceLogViewProvider.instance),
-        showReferenceLog.register(context),
-        vscode.languages.registerCodeLensProvider(
-            [...CodeWhispererConstants.supportedLanguages],
-            ReferenceInlineProvider.instance
-        )
-    )
-
-    function activateSecurityScan() {
-        context.extensionContext.subscriptions.push(
-            vscode.window.registerWebviewViewProvider(SecurityPanelViewProvider.viewType, securityPanelViewProvider)
-        )
-
-        context.extensionContext.subscriptions.push(
-            vscode.window.onDidChangeActiveTextEditor(editor => {
-                if (isCloud9()) {
-                    if (editor) {
-                        securityPanelViewProvider.setDecoration(editor, editor.document.uri)
-                    }
-                }
-            })
-        )
-    }
-
-    async function showAccessTokenMigrationDialogue() {
-        // TODO: Change the color of the buttons
-        const accessTokenExpired =
-            context.extensionContext.globalState.get<boolean>(CodeWhispererConstants.accessTokenExpriedKey) || false
-
-        if (AuthUtil.instance.hasAccessToken()) {
-            await Auth.instance.tryAutoConnect()
-            const conn = Auth.instance.activeConnection
-            if (isUpgradeableConnection(conn)) {
-                const didUpgrade = await AuthUtil.instance.promptUpgrade(conn, 'passive').catch(err => {
-                    if (!isUserCancelledError(err)) {
-                        getLogger().error('codewhisperer: failed to upgrade connection: %s', err)
-                        showViewLogsMessage('Failed to upgrade current connection.')
-                    }
-
-                    return false
-                })
-
-                if (didUpgrade) {
-                    return
-                }
-            }
-
-            await vscode.commands.executeCommand('aws.codeWhisperer.refreshRootNode')
-            const t = new Date()
-
-            if (t <= CodeWhispererConstants.accessTokenCutOffDate) {
-                maybeShowTokenMigrationWarning()
-            } else {
-                await globals.context.globalState.update(CodeWhispererConstants.accessToken, undefined)
-                await globals.context.globalState.update(CodeWhispererConstants.accessTokenExpriedKey, true)
-                await vscode.commands.executeCommand('aws.codeWhisperer.refreshRootNode')
-                maybeShowTokenMigrationError()
-            }
-        } else if (accessTokenExpired) {
-            maybeShowTokenMigrationError()
-        }
-    }
-
-    function maybeShowTokenMigrationWarning() {
-        const doNotShowAgain =
-            context.extensionContext.globalState.get<boolean>(
-                CodeWhispererConstants.accessTokenMigrationDoNotShowAgainKey
-            ) || false
-        const notificationLastShown: number =
-            context.extensionContext.globalState.get<number | undefined>(
-                CodeWhispererConstants.accessTokenMigrationDoNotShowLastShown
-            ) || 1
-
-        //Add 7 days to notificationLastShown to determine whether warn message should show
-        if (doNotShowAgain || notificationLastShown + 1000 * 60 * 60 * 24 * 7 >= Date.now()) {
-            return
-        }
-
-        vscode.window
-            .showWarningMessage(
-                CodeWhispererConstants.accessTokenMigrationWarningMessage,
-                CodeWhispererConstants.accessTokenMigrationWarningButtonMessage,
-                CodeWhispererConstants.accessTokenMigrationDoNotShowAgain
-            )
-            .then(async resp => {
-                if (resp === CodeWhispererConstants.accessTokenMigrationWarningButtonMessage) {
-                    await vscode.commands.executeCommand('aws.codeWhisperer.refresh')
-                    await showSsoSignIn.execute()
-                } else if (resp === CodeWhispererConstants.accessTokenMigrationDoNotShowAgain) {
-                    await vscode.window.showInformationMessage(
-                        CodeWhispererConstants.accessTokenMigrationDoNotShowAgainInfo,
-                        'OK'
-                    )
-                    await context.extensionContext.globalState.update(
-                        CodeWhispererConstants.accessTokenMigrationDoNotShowAgainKey,
-                        true
-                    )
-                }
-            })
-        context.extensionContext.globalState.update(
-            CodeWhispererConstants.accessTokenMigrationDoNotShowLastShown,
-            Date.now()
-        )
-    }
-
-    function maybeShowTokenMigrationError() {
-        const migrationErrordoNotShowAgain =
-            context.extensionContext.globalState.get<boolean>(
-                CodeWhispererConstants.accessTokenExpiredDoNotShowAgainKey
-            ) || false
-        const migrationErrorLastShown: number =
-            context.extensionContext.globalState.get<number | undefined>(
-                CodeWhispererConstants.accessTokenExpiredDoNotShowLastShown
-            ) || 1
-
-        //Add 7 days to notificationLastShown to determine whether warn message should show
-        if (migrationErrordoNotShowAgain || migrationErrorLastShown + 1000 * 60 * 60 * 24 * 7 >= Date.now()) {
-            return
-        }
-
-        vscode.window
-            .showErrorMessage(
-                CodeWhispererConstants.accessTokenMigrationErrorMessage,
-                CodeWhispererConstants.accessTokenMigrationErrorButtonMessage,
-                CodeWhispererConstants.accessTokenMigrationLearnMore,
-                CodeWhispererConstants.accessTokenMigrationDoNotShowAgain
-            )
-            .then(async resp => {
-                if (resp === CodeWhispererConstants.accessTokenMigrationErrorButtonMessage) {
-                    await vscode.commands.executeCommand('aws.codeWhisperer.refresh')
-                    await showSsoSignIn.execute()
-                } else if (resp === CodeWhispererConstants.accessTokenMigrationDoNotShowAgain) {
-                    await context.extensionContext.globalState.update(
-                        CodeWhispererConstants.accessTokenExpiredDoNotShowAgainKey,
-                        true
-                    )
-                } else if (resp === CodeWhispererConstants.accessTokenMigrationLearnMore) {
-                    await vscode.commands.executeCommand('aws.codeWhisperer.accessTokenErrorLearnMore')
-                }
-            })
-        context.extensionContext.globalState.update(
-            CodeWhispererConstants.accessTokenExpiredDoNotShowLastShown,
-            Date.now()
-        )
-    }
-
-    function setStatusBarOK() {
-        if (isInlineCompletionEnabled()) {
-            InlineCompletionService.instance.setCodeWhispererStatusBarOk()
-        } else {
-            InlineCompletion.instance.setCodeWhispererStatusBarOk()
-        }
-    }
-
-    async function showCodeWhispererWelcomeMessage(): Promise<void> {
-        const filePath = isCloud9()
-            ? context.extensionContext.asAbsolutePath(CodeWhispererConstants.welcomeCodeWhispererCloud9Readme)
-            : context.extensionContext.asAbsolutePath(CodeWhispererConstants.welcomeCodeWhispererReadmeFileSource)
-        const readmeUri = vscode.Uri.file(filePath)
-        await vscode.commands.executeCommand('markdown.showPreviewToSide', readmeUri)
-    }
-
-    async function getManualTriggerStatus(): Promise<boolean> {
-        return context.extensionContext.globalState.get<boolean>(CodeWhispererConstants.termsAcceptedKey) || false
-    }
-
-    function getAutoTriggerStatus(): boolean {
-        return context.extensionContext.globalState.get<boolean>(CodeWhispererConstants.autoTriggerEnabledKey) || false
-    }
-
-    async function getConfigEntry(): Promise<ConfigurationEntry> {
-        const isShowMethodsEnabled: boolean =
-            vscode.workspace.getConfiguration('editor').get('suggest.showMethods') || false
-        const isAutomatedTriggerEnabled: boolean = getAutoTriggerStatus()
-        const isManualTriggerEnabled: boolean = await getManualTriggerStatus()
-        const isSuggestionsWithCodeReferencesEnabled = codewhispererSettings.isSuggestionsWithCodeReferencesEnabled()
-        return {
-            isShowMethodsEnabled,
-            isManualTriggerEnabled,
-            isAutomatedTriggerEnabled,
-            isSuggestionsWithCodeReferencesEnabled,
-        }
-    }
-
-    if (isCloud9()) {
-        setSubscriptionsforCloud9()
-    } else if (isInlineCompletionEnabled()) {
-        await setSubscriptionsforInlineCompletion()
-        await vscode.commands.executeCommand('setContext', 'CODEWHISPERER_ENABLED', await getManualTriggerStatus())
-    } else {
-        await setSubscriptionsforVsCodeInline()
-    }
-    if (!isCloud9()) {
-        showAccessTokenMigrationDialogue()
-    }
-
-    async function setSubscriptionsforInlineCompletion() {
-        /**
-         * Automated trigger
-         */
-        context.extensionContext.subscriptions.push(
-            vscode.window.onDidChangeActiveTextEditor(async editor => {
-                await InlineCompletionService.instance.onEditorChange()
-            }),
-            vscode.window.onDidChangeWindowState(async e => {
-                await InlineCompletionService.instance.onFocusChange()
-            }),
-            vscode.window.onDidChangeTextEditorSelection(async e => {
-                await InlineCompletionService.instance.onCursorChange(e)
-            }),
-            vscode.workspace.onDidChangeTextDocument(async e => {
-                /**
-                 * CodeWhisperer security panel dynamic handling
-                 */
-                if (e.document === vscode.window.activeTextEditor?.document) {
-                    disposeSecurityDiagnostic(e)
-                }
-                /**
-                 * Handle this keystroke event only when
-                 * 1. It is in current non plaintext active editor
-                 * 2. It is not a backspace
-                 * 3. It is not caused by CodeWhisperer editing
-                 * 4. It is not from undo/redo.
-                 */
-                if (
-                    e.document === vscode.window.activeTextEditor?.document &&
-                    runtimeLanguageContext.isLanguageSupported(e.document.languageId) &&
-                    e.contentChanges.length != 0 &&
-                    !vsCodeState.isCodeWhispererEditing
-                ) {
-                    vsCodeState.lastUserModificationTime = performance.now()
-                    /**
-                     * Important:  Doing this sleep(10) is to make sure
-                     * 1. this event is processed by vs code first
-                     * 2. editor.selection.active has been successfully updated by VS Code
-                     * Then this event can be processed by our code.
-                     */
-                    await sleep(CodeWhispererConstants.vsCodeCursorUpdateDelay)
-                    if (!InlineCompletionService.instance.isSuggestionVisible()) {
-                        await KeyStrokeHandler.instance.processKeyStroke(
-                            e,
-                            vscode.window.activeTextEditor,
-                            client,
-                            await getConfigEntry()
-                        )
-                    }
-                }
-            })
-        )
-    }
-
-    async function setSubscriptionsforVsCodeInline() {
-        /**
-         * Automated trigger
-         */
-        context.extensionContext.subscriptions.push(
-            vscode.workspace.onDidChangeTextDocument(async e => {
-                /**
-                 * CodeWhisperer security panel dynamic handling
-                 */
-                if (e.document === vscode.window.activeTextEditor?.document) {
-                    if (isCloud9()) {
-                        securityPanelViewProvider.disposeSecurityPanelItem(e, vscode.window.activeTextEditor)
-                    } else {
-                        disposeSecurityDiagnostic(e)
-                    }
-                }
-
-                const codeCoverageTracker = CodeWhispererCodeCoverageTracker.getTracker(e.document.languageId)
-                codeCoverageTracker?.countTotalTokens(e)
-
-                /**
-                 * Handle this keystroke event only when
-                 * 1. It is in current active editor with cwspr supported file types
-                 * 2. It is not a backspace
-                 * 3. It is not caused by CodeWhisperer editing
-                 * 4. It is not from undo/redo.
-                 */
-                if (
-                    e.document === vscode.window.activeTextEditor?.document &&
-                    runtimeLanguageContext.isLanguageSupported(e.document.languageId) &&
-                    e.contentChanges.length != 0 &&
-                    !vsCodeState.isCodeWhispererEditing &&
-                    !JSON.stringify(e).includes('reason')
-                ) {
-                    vsCodeState.lastUserModificationTime = performance.now()
-                    /**
-                     * Important:  Doing this sleep(10) is to make sure
-                     * 1. this event is processed by vs code first
-                     * 2. editor.selection.active has been successfully updated by VS Code
-                     * Then this event can be processed by our code.
-                     */
-                    await sleep(CodeWhispererConstants.vsCodeCursorUpdateDelay)
-                    if (InlineCompletion.instance.getIsActive) {
-                        await InlineCompletion.instance.setTypeAheadRecommendations(vscode.window.activeTextEditor, e)
-                    } else {
-                        await KeyStrokeHandler.instance.processKeyStroke(
-                            e,
-                            vscode.window.activeTextEditor,
-                            client,
-                            await getConfigEntry()
-                        )
-                    }
-                }
-            }),
-
-            /**
-             * On recommendation rejection
-             */
-            vscode.window.onDidChangeVisibleTextEditors(async e => {
-                await InlineCompletion.instance.rejectRecommendation(vscode.window.activeTextEditor, false, true)
-            }),
-            vscode.window.onDidChangeActiveTextEditor(async e => {
-                await InlineCompletion.instance.rejectRecommendation(vscode.window.activeTextEditor)
-                if (vscode.window.activeTextEditor) {
-                    CodeWhispererCodeCoverageTracker.getTracker(
-                        vscode.window.activeTextEditor.document.languageId
-                    )?.updateAcceptedTokensCount(vscode.window.activeTextEditor)
-                }
-            }),
-            vscode.window.onDidChangeTextEditorSelection(async e => {
-                if (e.kind === TextEditorSelectionChangeKind.Mouse && vscode.window.activeTextEditor) {
-                    await InlineCompletion.instance.rejectRecommendation(vscode.window.activeTextEditor)
-                }
-            }),
-            Commands.register('aws.codeWhisperer.rejectCodeSuggestion', async e => {
-                if (vscode.window.activeTextEditor) {
-                    await InlineCompletion.instance.rejectRecommendation(vscode.window.activeTextEditor)
-                    if (e === 'up') {
-                        await vscode.commands.executeCommand('cursorUp')
-                    } else if (e === 'down') {
-                        await vscode.commands.executeCommand('cursorDown')
-                    } else if (e !== undefined) {
-                        getLogger().warn(`Unexpected argument for rejectCodeSuggestion ${e}`)
-                    }
-                }
-            }),
-            /**
-             * Recommendation navigation
-             */
-            Commands.register('aws.codeWhisperer.nextCodeSuggestion', async () => {
-                if (vscode.window.activeTextEditor) {
-                    InlineCompletion.instance.navigateRecommendation(vscode.window.activeTextEditor, true)
-                }
-            }),
-            Commands.register('aws.codeWhisperer.previousCodeSuggestion', async () => {
-                if (vscode.window.activeTextEditor) {
-                    InlineCompletion.instance.navigateRecommendation(vscode.window.activeTextEditor, false)
-                }
-            }),
-            /**
-             * Recommendation acceptance
-             */
-            Commands.register('aws.codeWhisperer.acceptCodeSuggestion', async () => {
-                if (vscode.window.activeTextEditor) {
-                    await InlineCompletion.instance.acceptRecommendation(vscode.window.activeTextEditor)
-                }
-            })
-        )
-        // If the vscode is refreshed we need to maintain the status bar
-        const acceptedTermsAndEnabledCodeWhisperer: boolean = await getManualTriggerStatus()
-        if (acceptedTermsAndEnabledCodeWhisperer) {
-            InlineCompletion.instance.setCodeWhispererStatusBarOk()
-        }
-    }
-
-    function setSubscriptionsforCloud9() {
-        /**
-         * Manual trigger
-         */
-        context.extensionContext.subscriptions.push(
-            vscode.languages.registerCompletionItemProvider([...CodeWhispererConstants.supportedLanguages], {
-                async provideCompletionItems(
-                    document: vscode.TextDocument,
-                    position: vscode.Position,
-                    token: vscode.CancellationToken,
-                    context: vscode.CompletionContext
-                ) {
-                    const completionList = new vscode.CompletionList(getCompletionItems(document, position), false)
-                    return completionList
-                },
-            }),
-            /**
-             * Automated trigger
-             */
-            vscode.workspace.onDidChangeTextDocument(async e => {
-                /**
-                 * CodeWhisperer security panel dynamic handling
-                 */
-                if (e.document === vscode.window.activeTextEditor?.document) {
-                    if (isCloud9()) {
-                        securityPanelViewProvider.disposeSecurityPanelItem(e, vscode.window.activeTextEditor)
-                    } else {
-                        disposeSecurityDiagnostic(e)
-                    }
-                }
-
-                CodeWhispererCodeCoverageTracker.getTracker(e.document.languageId)?.countTotalTokens(e)
-
-                if (
-                    e.document === vscode.window.activeTextEditor?.document &&
-                    runtimeLanguageContext.isLanguageSupported(e.document.languageId) &&
-                    e.contentChanges.length != 0 &&
-                    !vsCodeState.isCodeWhispererEditing
-                ) {
-                    /**
-                     * Important:  Doing this sleep(10) is to make sure
-                     * 1. this event is processed by vs code first
-                     * 2. editor.selection.active has been successfully updated by VS Code
-                     * Then this event can be processed by our code.
-                     */
-                    await sleep(CodeWhispererConstants.vsCodeCursorUpdateDelay)
-                    await KeyStrokeHandler.instance.processKeyStroke(
-                        e,
-                        vscode.window.activeTextEditor,
-                        client,
-                        await getConfigEntry()
-                    )
-                }
-            }),
-
-            /**
-             * On intelliSense recommendation rejection, reset set intelli sense is active state
-             * Maintaining this variable because VS Code does not expose official intelliSense isActive API
-             */
-            vscode.window.onDidChangeVisibleTextEditors(async e => {
-                resetIntelliSenseState(
-                    await getManualTriggerStatus(),
-                    getAutoTriggerStatus(),
-                    RecommendationHandler.instance.isValidResponse()
-                )
-            }),
-            vscode.window.onDidChangeActiveTextEditor(async e => {
-                resetIntelliSenseState(
-                    await getManualTriggerStatus(),
-                    getAutoTriggerStatus(),
-                    RecommendationHandler.instance.isValidResponse()
-                )
-            }),
-            vscode.window.onDidChangeTextEditorSelection(async e => {
-                if (e.kind === TextEditorSelectionChangeKind.Mouse) {
-                    resetIntelliSenseState(
-                        await getManualTriggerStatus(),
-                        getAutoTriggerStatus(),
-                        RecommendationHandler.instance.isValidResponse()
-                    )
-                }
-            }),
-            vscode.workspace.onDidSaveTextDocument(async e => {
-                resetIntelliSenseState(
-                    await getManualTriggerStatus(),
-                    getAutoTriggerStatus(),
-                    RecommendationHandler.instance.isValidResponse()
-                )
-            })
-        )
-    }
-}
-
-export async function shutdown() {
-    if (isCloud9()) {
-        RecommendationHandler.instance.reportUserDecisionOfRecommendation(vscode.window.activeTextEditor, -1)
-        RecommendationHandler.instance.clearRecommendations()
-    }
-    if (isInlineCompletionEnabled()) {
-        await InlineCompletionService.instance.clearInlineCompletionStates(vscode.window.activeTextEditor)
-    } else {
-        if (vscode.window.activeTextEditor) {
-            await InlineCompletion.instance.resetInlineStates(vscode.window.activeTextEditor)
-        }
-    }
-    CodeWhispererTracker.getTracker().shutdown()
-}
-
-export async function enableDefaultConfigCloud9() {
-    const editorSettings = vscode.workspace.getConfiguration('editor')
-    try {
-        await editorSettings.update('suggest.showMethods', true, vscode.ConfigurationTarget.Global)
-        // suggest.preview is available in vsc 1.57+
-        await editorSettings.update('suggest.preview', true, vscode.ConfigurationTarget.Global)
-        await editorSettings.update('acceptSuggestionOnEnter', 'on', vscode.ConfigurationTarget.Global)
-        await editorSettings.update('snippetSuggestions', 'top', vscode.ConfigurationTarget.Global)
-    } catch (error) {
-        getLogger().error('codewhisperer: Failed to update user settings', error)
-    }
-}
diff --git a/src/codewhisperer/client/codewhisperer.ts b/src/codewhisperer/client/codewhisperer.ts
deleted file mode 100644
index ae9d0eeb650..00000000000
--- a/src/codewhisperer/client/codewhisperer.ts
+++ /dev/null
@@ -1,239 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { AWSError, CognitoIdentityCredentials, Service } from 'aws-sdk'
-import apiConfig = require('./service-2.json')
-import userApiConfig = require('./user-service-2.json')
-import globals from '../../shared/extensionGlobals'
-import * as CodeWhispererClient from './codewhispererclient'
-import * as CodeWhispererUserClient from './codewhispereruserclient'
-import * as CodeWhispererConstants from '../models/constants'
-import { ServiceOptions } from '../../shared/awsClientBuilder'
-import { invalidateAccessToken } from '../util/invalidateToken'
-import { isCloud9 } from '../../shared/extensionUtilities'
-import { CodeWhispererSettings } from '../util/codewhispererSettings'
-import { getCognitoCredentials } from '../util/cognitoIdentity'
-import { PromiseResult } from 'aws-sdk/lib/request'
-import { getLogger } from '../../shared/logger'
-import { throttle } from 'lodash'
-import { Credentials } from 'aws-sdk'
-import { AuthUtil } from '../util/authUtil'
-import { TelemetryHelper } from '../util/telemetryHelper'
-
-const refreshCredentials = throttle(() => {
-    getLogger().verbose('codewhisperer: invalidating expired credentials')
-    globals.awsContext.credentialsShim?.refresh()
-}, 60000)
-
-export type ProgrammingLanguage = Readonly<
-    CodeWhispererClient.ProgrammingLanguage | CodeWhispererUserClient.ProgrammingLanguage
->
-export type FileContext = Readonly<CodeWhispererClient.FileContext | CodeWhispererUserClient.FileContext>
-export type ListRecommendationsRequest = Readonly<
-    CodeWhispererClient.ListRecommendationsRequest | CodeWhispererUserClient.GenerateCompletionsRequest
->
-export type GenerateRecommendationsRequest = Readonly<CodeWhispererClient.GenerateRecommendationsRequest>
-export type RecommendationsList = CodeWhispererClient.RecommendationsList | CodeWhispererUserClient.Completions
-export type ListRecommendationsResponse =
-    | CodeWhispererClient.ListRecommendationsResponse
-    | CodeWhispererUserClient.GenerateCompletionsResponse
-export type GenerateRecommendationsResponse = CodeWhispererClient.GenerateRecommendationsResponse
-export type Recommendation = CodeWhispererClient.Recommendation | CodeWhispererUserClient.Completion
-export type Reference = CodeWhispererClient.Reference | CodeWhispererUserClient.Reference
-export type References = CodeWhispererClient.References | CodeWhispererUserClient.References
-export type CreateUploadUrlRequest = Readonly<
-    CodeWhispererClient.CreateUploadUrlRequest | CodeWhispererUserClient.CreateUploadUrlRequest
->
-export type CreateCodeScanRequest = Readonly<
-    CodeWhispererClient.CreateCodeScanRequest | CodeWhispererUserClient.StartCodeAnalysisRequest
->
-export type GetCodeScanRequest = Readonly<
-    CodeWhispererClient.GetCodeScanRequest | CodeWhispererUserClient.GetCodeAnalysisRequest
->
-export type ListCodeScanFindingsRequest = Readonly<
-    CodeWhispererClient.ListCodeScanFindingsRequest | CodeWhispererUserClient.ListCodeAnalysisFindingsRequest
->
-export type ArtifactType = Readonly<CodeWhispererClient.ArtifactType | CodeWhispererUserClient.ArtifactType>
-export type ArtifactMap = Readonly<CodeWhispererClient.ArtifactMap | CodeWhispererUserClient.ArtifactMap>
-export type ListCodeScanFindingsResponse =
-    | CodeWhispererClient.ListCodeScanFindingsResponse
-    | CodeWhispererUserClient.ListCodeAnalysisFindingsResponse
-export type CreateUploadUrlResponse =
-    | CodeWhispererClient.CreateUploadUrlResponse
-    | CodeWhispererUserClient.CreateUploadUrlResponse
-export type CreateCodeScanResponse =
-    | CodeWhispererClient.CreateCodeScanResponse
-    | CodeWhispererUserClient.StartCodeAnalysisResponse
-
-export class DefaultCodeWhispererClient {
-    private credentials?: CognitoIdentityCredentials
-
-    private async createSdkClient(): Promise<CodeWhispererClient> {
-        try {
-            if (!this.credentials && !isCloud9()) {
-                this.credentials = await getCognitoCredentials()
-            }
-            if (this.credentials && this.credentials.needsRefresh()) {
-                await new Promise<void>((resolve, reject) =>
-                    this.credentials?.refresh(e => (e ? reject(e) : resolve()))
-                )
-            }
-        } catch (e) {
-            getLogger().debug('Error when getting or refreshing Cognito credentials', e)
-            throw new CognitoCredentialsError('Error when getting or refreshing Cognito credentials')
-        }
-
-        const accessToken = globals.context.globalState.get<string | undefined>(CodeWhispererConstants.accessToken)
-        const isOptedOut = CodeWhispererSettings.instance.isOptoutEnabled()
-
-        return (await globals.sdkClientBuilder.createAwsService(
-            Service,
-            {
-                apiConfig: apiConfig,
-                region: CodeWhispererConstants.region,
-                credentials: this.credentials,
-                endpoint: CodeWhispererConstants.endpoint,
-                onRequestSetup: [
-                    req => {
-                        if (!isCloud9() && req.operation !== 'getAccessToken') {
-                            req.on('build', () => {
-                                req.httpRequest.headers['x-amzn-codewhisperer-token'] = accessToken || ''
-                            })
-                            req.on('error', e => {
-                                if (e.code === 'AccessDeniedException') {
-                                    invalidateAccessToken()
-                                }
-                            })
-                        }
-                        if (req.operation === 'listRecommendations') {
-                            req.on('build', () => {
-                                req.httpRequest.headers['x-amzn-codewhisperer-optout'] = `${isOptedOut}`
-                            })
-                        }
-
-                        // This logic is for backward compatability with legacy SDK v2 behavior for refreshing
-                        // credentials. Once the Toolkit adds a file watcher for credentials it won't be needed.
-                        if (isCloud9() && req.operation !== 'getAccessToken') {
-                            req.on('retry', resp => {
-                                if (
-                                    resp.error?.code === 'AccessDeniedException' &&
-                                    resp.error.message.match(/expired/i)
-                                ) {
-                                    refreshCredentials()
-                                    resp.error.retryable = true
-                                }
-                            })
-                        }
-                    },
-                ],
-            } as ServiceOptions,
-            undefined,
-            false
-        )) as CodeWhispererClient
-    }
-
-    async createUserSdkClient(): Promise<CodeWhispererUserClient> {
-        const isOptedOut = CodeWhispererSettings.instance.isOptoutEnabled()
-        TelemetryHelper.instance.setFetchCredentialStartTime()
-        const bearerToken = await AuthUtil.instance.getBearerToken()
-        TelemetryHelper.instance.setSdkApiCallStartTime()
-        return (await globals.sdkClientBuilder.createAwsService(
-            Service,
-            {
-                apiConfig: userApiConfig,
-                region: CodeWhispererConstants.region,
-                endpoint: CodeWhispererConstants.endpoint,
-                credentials: new Credentials({ accessKeyId: 'xxx', secretAccessKey: 'xxx' }),
-                onRequestSetup: [
-                    req => {
-                        req.on('build', ({ httpRequest }) => {
-                            httpRequest.headers['Authorization'] = `Bearer ${bearerToken}`
-                        })
-                        if (req.operation === 'generateCompletions') {
-                            req.on('build', () => {
-                                req.httpRequest.headers['x-amzn-codewhisperer-optout'] = `${isOptedOut}`
-                            })
-                        }
-                    },
-                ],
-            } as ServiceOptions,
-            undefined,
-            false
-        )) as CodeWhispererUserClient
-    }
-
-    private isBearerTokenAuth(): boolean {
-        // return true if access token is cleared because of SSO code path
-        const accessToken = globals.context.globalState.get<string | undefined>(CodeWhispererConstants.accessToken)
-        if (!accessToken) {
-            return true
-        }
-        return AuthUtil.instance.isConnected()
-    }
-
-    public async generateRecommendations(
-        request: GenerateRecommendationsRequest
-    ): Promise<GenerateRecommendationsResponse> {
-        return (await this.createSdkClient()).generateRecommendations(request).promise()
-    }
-
-    public async listRecommendations(request: ListRecommendationsRequest): Promise<ListRecommendationsResponse> {
-        if (this.isBearerTokenAuth()) {
-            return await (await this.createUserSdkClient()).generateCompletions(request).promise()
-        }
-        return (await this.createSdkClient()).listRecommendations(request).promise()
-    }
-
-    public async getAccessToken(
-        request: CodeWhispererClient.GetAccessTokenRequest
-    ): Promise<CodeWhispererClient.GetAccessTokenResponse> {
-        return (await this.createSdkClient()).getAccessToken(request).promise()
-    }
-
-    public async createUploadUrl(
-        request: CreateUploadUrlRequest
-    ): Promise<PromiseResult<CreateUploadUrlResponse, AWSError>> {
-        if (this.isBearerTokenAuth()) {
-            return (await this.createUserSdkClient()).createArtifactUploadUrl(request).promise()
-        }
-        return (await this.createSdkClient()).createUploadUrl(request).promise()
-    }
-
-    public async createCodeScan(
-        request: CreateCodeScanRequest
-    ): Promise<PromiseResult<CreateCodeScanResponse, AWSError>> {
-        if (this.isBearerTokenAuth()) {
-            return (await this.createUserSdkClient()).startCodeAnalysis(request).promise()
-        }
-        return (await this.createSdkClient()).createCodeScan(request).promise()
-    }
-
-    public async getCodeScan(
-        request: GetCodeScanRequest
-    ): Promise<PromiseResult<CodeWhispererClient.GetCodeScanResponse, AWSError>> {
-        if (this.isBearerTokenAuth()) {
-            return (await this.createUserSdkClient()).getCodeAnalysis(request).promise()
-        }
-        return (await this.createSdkClient()).getCodeScan(request).promise()
-    }
-
-    public async listCodeScanFindings(
-        request: ListCodeScanFindingsRequest
-    ): Promise<PromiseResult<ListCodeScanFindingsResponse, AWSError>> {
-        if (this.isBearerTokenAuth()) {
-            const req = {
-                jobId: request.jobId,
-                nextToken: request.nextToken,
-                codeAnalysisFindingsSchema: 'codeanalysis/findings/1.0',
-            } as CodeWhispererUserClient.ListCodeAnalysisFindingsRequest
-            return (await this.createUserSdkClient()).listCodeAnalysisFindings(req).promise()
-        }
-        return (await this.createSdkClient())
-            .listCodeScanFindings(request as CodeWhispererClient.ListCodeScanFindingsRequest)
-            .promise()
-    }
-}
-
-export class CognitoCredentialsError extends Error {}
diff --git a/src/codewhisperer/client/paginators.json b/src/codewhisperer/client/paginators.json
deleted file mode 100644
index 404dab15dd6..00000000000
--- a/src/codewhisperer/client/paginators.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "pagination": {
-        "ListRecommendations": {
-            "input_token": "nextToken",
-            "output_token": "nextToken",
-            "limit_key": "maxResults"
-        },
-        "ListSecurityIssues": {
-            "input_token": "nextToken",
-            "output_token": "nextToken"
-        }
-    }
-}
diff --git a/src/codewhisperer/client/service-2.json b/src/codewhisperer/client/service-2.json
deleted file mode 100644
index 4397786991b..00000000000
--- a/src/codewhisperer/client/service-2.json
+++ /dev/null
@@ -1,698 +0,0 @@
-{
-    "version": "2.0",
-    "metadata": {
-        "apiVersion": "2022-06-15",
-        "endpointPrefix": "codewhisperer",
-        "jsonVersion": "1.0",
-        "protocol": "json",
-        "serviceFullName": "AWS CodeWhisperer",
-        "serviceId": "CodeWhisperer",
-        "signatureVersion": "v4",
-        "signingName": "codewhisperer",
-        "targetPrefix": "AWSCodeWhispererService",
-        "uid": "codewhisperer-2022-06-15"
-    },
-    "operations": {
-        "CreateCodeScan": {
-            "name": "CreateCodeScan",
-            "http": {
-                "method": "POST",
-                "requestUri": "/"
-            },
-            "input": {
-                "shape": "CreateCodeScanRequest"
-            },
-            "output": {
-                "shape": "CreateCodeScanResponse"
-            },
-            "errors": [
-                {
-                    "shape": "ThrottlingException"
-                },
-                {
-                    "shape": "ConflictException"
-                },
-                {
-                    "shape": "ResourceNotFoundException"
-                },
-                {
-                    "shape": "InternalServerException"
-                },
-                {
-                    "shape": "ValidationException"
-                },
-                {
-                    "shape": "AccessDeniedException"
-                }
-            ],
-            "documentation": "<p>Creates a code scan job</p>",
-            "idempotent": true
-        },
-        "CreateUploadUrl": {
-            "name": "CreateUploadUrl",
-            "http": {
-                "method": "POST",
-                "requestUri": "/"
-            },
-            "input": {
-                "shape": "CreateUploadUrlRequest"
-            },
-            "output": {
-                "shape": "CreateUploadUrlResponse"
-            },
-            "errors": [
-                {
-                    "shape": "ThrottlingException"
-                },
-                {
-                    "shape": "InternalServerException"
-                },
-                {
-                    "shape": "ValidationException"
-                },
-                {
-                    "shape": "AccessDeniedException"
-                }
-            ],
-            "documentation": "<p>Creates a pre-signed, S3 write URL for uploading a repository zip archive.</p>",
-            "idempotent": true
-        },
-        "GenerateRecommendations": {
-            "name": "GenerateRecommendations",
-            "http": {
-                "method": "POST",
-                "requestUri": "/"
-            },
-            "input": {
-                "shape": "GenerateRecommendationsRequest"
-            },
-            "output": {
-                "shape": "GenerateRecommendationsResponse"
-            },
-            "errors": [
-                {
-                    "shape": "ThrottlingException"
-                },
-                {
-                    "shape": "InternalServerException"
-                },
-                {
-                    "shape": "ValidationException"
-                },
-                {
-                    "shape": "AccessDeniedException"
-                }
-            ],
-            "documentation": "<p>Generates recommendations based on the provided file context.</p>"
-        },
-        "GetAccessToken": {
-            "name": "GetAccessToken",
-            "http": {
-                "method": "POST",
-                "requestUri": "/"
-            },
-            "input": {
-                "shape": "GetAccessTokenRequest"
-            },
-            "output": {
-                "shape": "GetAccessTokenResponse"
-            },
-            "errors": [
-                {
-                    "shape": "InternalServerException"
-                },
-                {
-                    "shape": "ValidationException"
-                },
-                {
-                    "shape": "AccessDeniedException"
-                }
-            ],
-            "documentation": "<p>Vends an access token, based on the provided identity token, to enable usage of the other CodeWhisperer APIs.</p>"
-        },
-        "GetCodeScan": {
-            "name": "GetCodeScan",
-            "http": {
-                "method": "POST",
-                "requestUri": "/"
-            },
-            "input": {
-                "shape": "GetCodeScanRequest"
-            },
-            "output": {
-                "shape": "GetCodeScanResponse"
-            },
-            "errors": [
-                {
-                    "shape": "ThrottlingException"
-                },
-                {
-                    "shape": "ResourceNotFoundException"
-                },
-                {
-                    "shape": "InternalServerException"
-                },
-                {
-                    "shape": "ValidationException"
-                },
-                {
-                    "shape": "AccessDeniedException"
-                }
-            ],
-            "documentation": "<p>Gets the metadata of a code scan job.</p>"
-        },
-        "ListCodeScanFindings": {
-            "name": "ListCodeScanFindings",
-            "http": {
-                "method": "POST",
-                "requestUri": "/"
-            },
-            "input": {
-                "shape": "ListCodeScanFindingsRequest"
-            },
-            "output": {
-                "shape": "ListCodeScanFindingsResponse"
-            },
-            "errors": [
-                {
-                    "shape": "ThrottlingException"
-                },
-                {
-                    "shape": "ResourceNotFoundException"
-                },
-                {
-                    "shape": "InternalServerException"
-                },
-                {
-                    "shape": "ValidationException"
-                },
-                {
-                    "shape": "AccessDeniedException"
-                }
-            ],
-            "documentation": "<p>Lists the findings from a particular code scan job.</p>"
-        },
-        "ListRecommendations": {
-            "name": "ListRecommendations",
-            "http": {
-                "method": "POST",
-                "requestUri": "/"
-            },
-            "input": {
-                "shape": "ListRecommendationsRequest"
-            },
-            "output": {
-                "shape": "ListRecommendationsResponse"
-            },
-            "errors": [
-                {
-                    "shape": "ThrottlingException"
-                },
-                {
-                    "shape": "InternalServerException"
-                },
-                {
-                    "shape": "ValidationException"
-                },
-                {
-                    "shape": "AccessDeniedException"
-                }
-            ],
-            "documentation": "<p>Lists recommendations based on the provided file context in a paginated response.</p>"
-        }
-    },
-    "shapes": {
-        "AccessDeniedException": {
-            "type": "structure",
-            "required": ["message"],
-            "members": {
-                "message": {
-                    "shape": "String"
-                }
-            },
-            "documentation": "<p>This exception is thrown when the user does not have sufficient access to perform this action.</p>",
-            "exception": true
-        },
-        "ArtifactMap": {
-            "type": "map",
-            "key": {
-                "shape": "ArtifactType"
-            },
-            "value": {
-                "shape": "UploadId"
-            },
-            "max": 64,
-            "min": 1
-        },
-        "ArtifactType": {
-            "type": "string",
-            "enum": ["SourceCode", "BuiltJars"]
-        },
-        "CodeScanFindingsSchema": {
-            "type": "string",
-            "enum": ["codescan/findings/1.0"]
-        },
-        "CodeScanStatus": {
-            "type": "string",
-            "enum": ["Completed", "Pending", "Failed"]
-        },
-        "ConflictException": {
-            "type": "structure",
-            "required": ["message"],
-            "members": {
-                "message": {
-                    "shape": "String"
-                }
-            },
-            "documentation": "<p>This exception is thrown when the action to perform could not be completed because the resource is in a conflicting state.</p>",
-            "exception": true
-        },
-        "CreateCodeScanRequest": {
-            "type": "structure",
-            "required": ["artifacts", "programmingLanguage"],
-            "members": {
-                "artifacts": {
-                    "shape": "ArtifactMap"
-                },
-                "programmingLanguage": {
-                    "shape": "ProgrammingLanguage"
-                },
-                "clientToken": {
-                    "shape": "CreateCodeScanRequestClientTokenString",
-                    "idempotencyToken": true
-                }
-            }
-        },
-        "CreateCodeScanRequestClientTokenString": {
-            "type": "string",
-            "max": 256,
-            "min": 1
-        },
-        "CreateCodeScanResponse": {
-            "type": "structure",
-            "required": ["jobId", "status"],
-            "members": {
-                "jobId": {
-                    "shape": "CreateCodeScanResponseJobIdString"
-                },
-                "status": {
-                    "shape": "CodeScanStatus"
-                },
-                "errorMessage": {
-                    "shape": "String"
-                }
-            }
-        },
-        "CreateCodeScanResponseJobIdString": {
-            "type": "string",
-            "max": 256,
-            "min": 1
-        },
-        "CreateUploadUrlRequest": {
-            "type": "structure",
-            "required": ["contentMd5", "artifactType"],
-            "members": {
-                "contentMd5": {
-                    "shape": "CreateUploadUrlRequestContentMd5String"
-                },
-                "artifactType": {
-                    "shape": "ArtifactType"
-                }
-            }
-        },
-        "CreateUploadUrlRequestContentMd5String": {
-            "type": "string",
-            "max": 128,
-            "min": 1
-        },
-        "CreateUploadUrlResponse": {
-            "type": "structure",
-            "required": ["uploadId", "uploadUrl"],
-            "members": {
-                "uploadId": {
-                    "shape": "UploadId"
-                },
-                "uploadUrl": {
-                    "shape": "PreSignedUrl"
-                }
-            }
-        },
-        "FileContext": {
-            "type": "structure",
-            "required": ["leftFileContent", "rightFileContent", "filename", "programmingLanguage"],
-            "members": {
-                "leftFileContent": {
-                    "shape": "FileContextLeftFileContentString"
-                },
-                "rightFileContent": {
-                    "shape": "FileContextRightFileContentString"
-                },
-                "filename": {
-                    "shape": "FileContextFilenameString"
-                },
-                "programmingLanguage": {
-                    "shape": "ProgrammingLanguage"
-                }
-            }
-        },
-        "FileContextFilenameString": {
-            "type": "string",
-            "max": 1024,
-            "min": 1
-        },
-        "FileContextLeftFileContentString": {
-            "type": "string",
-            "max": 10240,
-            "min": 0,
-            "sensitive": true
-        },
-        "FileContextRightFileContentString": {
-            "type": "string",
-            "max": 10240,
-            "min": 0,
-            "sensitive": true
-        },
-        "GenerateRecommendationsRequest": {
-            "type": "structure",
-            "required": ["fileContext"],
-            "members": {
-                "fileContext": {
-                    "shape": "FileContext"
-                },
-                "maxResults": {
-                    "shape": "GenerateRecommendationsRequestMaxResultsInteger"
-                }
-            }
-        },
-        "GenerateRecommendationsRequestMaxResultsInteger": {
-            "type": "integer",
-            "box": true,
-            "max": 10,
-            "min": 1
-        },
-        "GenerateRecommendationsResponse": {
-            "type": "structure",
-            "members": {
-                "recommendations": {
-                    "shape": "RecommendationsList"
-                }
-            }
-        },
-        "GetAccessTokenRequest": {
-            "type": "structure",
-            "required": ["identityToken"],
-            "members": {
-                "identityToken": {
-                    "shape": "GetAccessTokenRequestIdentityTokenString"
-                }
-            }
-        },
-        "GetAccessTokenRequestIdentityTokenString": {
-            "type": "string",
-            "max": 1024,
-            "min": 0,
-            "sensitive": true
-        },
-        "GetAccessTokenResponse": {
-            "type": "structure",
-            "members": {
-                "accessToken": {
-                    "shape": "SensitiveString"
-                }
-            }
-        },
-        "GetCodeScanRequest": {
-            "type": "structure",
-            "required": ["jobId"],
-            "members": {
-                "jobId": {
-                    "shape": "GetCodeScanRequestJobIdString"
-                }
-            }
-        },
-        "GetCodeScanRequestJobIdString": {
-            "type": "string",
-            "max": 256,
-            "min": 1
-        },
-        "GetCodeScanResponse": {
-            "type": "structure",
-            "required": ["status"],
-            "members": {
-                "status": {
-                    "shape": "CodeScanStatus"
-                },
-                "errorMessage": {
-                    "shape": "String"
-                }
-            }
-        },
-        "InternalServerException": {
-            "type": "structure",
-            "required": ["message"],
-            "members": {
-                "message": {
-                    "shape": "String"
-                }
-            },
-            "documentation": "<p>This exception is thrown when an unexpected error occurred during the processing of a request.</p>",
-            "exception": true,
-            "fault": true,
-            "retryable": {
-                "throttling": false
-            }
-        },
-        "ListCodeScanFindingsRequest": {
-            "type": "structure",
-            "required": ["jobId", "codeScanFindingsSchema"],
-            "members": {
-                "jobId": {
-                    "shape": "ListCodeScanFindingsRequestJobIdString"
-                },
-                "nextToken": {
-                    "shape": "PaginationToken"
-                },
-                "codeScanFindingsSchema": {
-                    "shape": "CodeScanFindingsSchema"
-                }
-            }
-        },
-        "ListCodeScanFindingsRequestJobIdString": {
-            "type": "string",
-            "max": 256,
-            "min": 1
-        },
-        "ListCodeScanFindingsResponse": {
-            "type": "structure",
-            "required": ["codeScanFindings"],
-            "members": {
-                "nextToken": {
-                    "shape": "PaginationToken"
-                },
-                "codeScanFindings": {
-                    "shape": "String"
-                }
-            }
-        },
-        "ListRecommendationsRequest": {
-            "type": "structure",
-            "required": ["fileContext"],
-            "members": {
-                "fileContext": {
-                    "shape": "FileContext"
-                },
-                "maxResults": {
-                    "shape": "ListRecommendationsRequestMaxResultsInteger"
-                },
-                "nextToken": {
-                    "shape": "ListRecommendationsRequestNextTokenString"
-                }
-            },
-            "documentation": "<p>Next Token: { UserIdentifier: { type: &lt;SSO | IAM | ACCT_LESS | SONO&gt; tokenId: <string> }, SessionIdentifier: <UUID-string>, NextRecommendationIndex: <int>, VersionId: <int>, CreationTimeInMillis: <long> } We don't pass NextToken object as it is to MH APIs, instead only fields which are required. The idea is to treat NextToken as ReadOnly to avoid NextToken mutation at multiple places. RTS should be the sole source of NextToken. MH needs userIdentifier, sessionIdentifier and nextRecommendationIndex only, we pass <code>nextRecommendationIndex</code> as it is and the 1st two as a different object all together, requestIdentifier: { userId: hash(UserIdentifier), sessionId: <SessionIdentifier> } In request path, RTS will base64 decode, decrypt and json deserialize <code>nextToken</code>. Then it will extract fields of <code>requestIdentifier</code> and <code>nextRecommendationIndex</code> as only these fileds are required on MH side and receive back recommendations. The idea is to treat NextToken as readonly on MH side to avoid accidental modifications to NextToken</p>"
-        },
-        "ListRecommendationsRequestMaxResultsInteger": {
-            "type": "integer",
-            "box": true,
-            "max": 10,
-            "min": 1
-        },
-        "ListRecommendationsRequestNextTokenString": {
-            "type": "string",
-            "max": 2048,
-            "min": 0,
-            "pattern": "(?:[A-Za-z0-9\\+/]{4})*(?:[A-Za-z0-9\\+/]{2}\\=\\=|[A-Za-z0-9\\+/]{3}\\=)?"
-        },
-        "ListRecommendationsResponse": {
-            "type": "structure",
-            "members": {
-                "recommendations": {
-                    "shape": "RecommendationsList"
-                },
-                "nextToken": {
-                    "shape": "String"
-                }
-            }
-        },
-        "PaginationToken": {
-            "type": "string",
-            "max": 2048,
-            "min": 1,
-            "pattern": "\\S+"
-        },
-        "PreSignedUrl": {
-            "type": "string",
-            "max": 2048,
-            "min": 1
-        },
-        "ProgrammingLanguage": {
-            "type": "structure",
-            "required": ["languageName"],
-            "members": {
-                "languageName": {
-                    "shape": "ProgrammingLanguageLanguageNameString"
-                }
-            }
-        },
-        "ProgrammingLanguageLanguageNameString": {
-            "type": "string",
-            "max": 128,
-            "min": 1,
-            "pattern": "(python|javascript|java)"
-        },
-        "Recommendation": {
-            "type": "structure",
-            "required": ["content"],
-            "members": {
-                "content": {
-                    "shape": "RecommendationContentString"
-                },
-                "references": {
-                    "shape": "References"
-                }
-            }
-        },
-        "RecommendationContentString": {
-            "type": "string",
-            "max": 5120,
-            "min": 1,
-            "sensitive": true
-        },
-        "RecommendationsList": {
-            "type": "list",
-            "member": {
-                "shape": "Recommendation"
-            },
-            "max": 10,
-            "min": 0
-        },
-        "Reference": {
-            "type": "structure",
-            "members": {
-                "licenseName": {
-                    "shape": "ReferenceLicenseNameString"
-                },
-                "repository": {
-                    "shape": "ReferenceRepositoryString"
-                },
-                "url": {
-                    "shape": "ReferenceUrlString"
-                },
-                "recommendationContentSpan": {
-                    "shape": "Span"
-                }
-            }
-        },
-        "ReferenceLicenseNameString": {
-            "type": "string",
-            "max": 1024,
-            "min": 1
-        },
-        "ReferenceRepositoryString": {
-            "type": "string",
-            "max": 1024,
-            "min": 1
-        },
-        "ReferenceUrlString": {
-            "type": "string",
-            "max": 1024,
-            "min": 1
-        },
-        "References": {
-            "type": "list",
-            "member": {
-                "shape": "Reference"
-            },
-            "max": 10,
-            "min": 0
-        },
-        "ResourceNotFoundException": {
-            "type": "structure",
-            "required": ["message"],
-            "members": {
-                "message": {
-                    "shape": "String"
-                }
-            },
-            "documentation": "<p>This exception is thrown when describing a resource that does not exist.</p>",
-            "exception": true
-        },
-        "SensitiveString": {
-            "type": "string",
-            "sensitive": true
-        },
-        "Span": {
-            "type": "structure",
-            "members": {
-                "start": {
-                    "shape": "SpanStartInteger"
-                },
-                "end": {
-                    "shape": "SpanEndInteger"
-                }
-            }
-        },
-        "SpanEndInteger": {
-            "type": "integer",
-            "box": true,
-            "min": 0
-        },
-        "SpanStartInteger": {
-            "type": "integer",
-            "box": true,
-            "min": 0
-        },
-        "String": {
-            "type": "string"
-        },
-        "ThrottlingException": {
-            "type": "structure",
-            "required": ["message"],
-            "members": {
-                "message": {
-                    "shape": "String"
-                }
-            },
-            "documentation": "<p>This exception is thrown when request was denied due to request throttling.</p>",
-            "exception": true,
-            "retryable": {
-                "throttling": false
-            }
-        },
-        "UploadId": {
-            "type": "string",
-            "max": 128,
-            "min": 1
-        },
-        "ValidationException": {
-            "type": "structure",
-            "required": ["message"],
-            "members": {
-                "message": {
-                    "shape": "String"
-                }
-            },
-            "documentation": "<p>This exception is thrown when the input fails to satisfy the constraints specified by the service.</p>",
-            "exception": true
-        }
-    }
-}
diff --git a/src/codewhisperer/client/user-service-2.json b/src/codewhisperer/client/user-service-2.json
deleted file mode 100644
index 4c94adb44ab..00000000000
--- a/src/codewhisperer/client/user-service-2.json
+++ /dev/null
@@ -1,595 +0,0 @@
-{
-    "version": "2.0",
-    "metadata": {
-        "apiVersion": "2022-11-11",
-        "endpointPrefix": "amazoncodewhispererservice",
-        "jsonVersion": "1.0",
-        "protocol": "json",
-        "serviceFullName": "Amazon CodeWhisperer",
-        "serviceId": "CodeWhispererRuntime",
-        "signingName": "amazoncodewhispererservice",
-        "targetPrefix": "AmazonCodeWhispererService",
-        "uid": "codewhispererruntime-2022-11-11"
-    },
-    "operations": {
-        "CreateArtifactUploadUrl": {
-            "name": "CreateArtifactUploadUrl",
-            "http": {
-                "method": "POST",
-                "requestUri": "/"
-            },
-            "input": {
-                "shape": "CreateUploadUrlRequest"
-            },
-            "output": {
-                "shape": "CreateUploadUrlResponse"
-            },
-            "errors": [
-                {
-                    "shape": "ThrottlingException"
-                },
-                {
-                    "shape": "InternalServerException"
-                },
-                {
-                    "shape": "ValidationException"
-                },
-                {
-                    "shape": "AccessDeniedException"
-                }
-            ],
-            "idempotent": true
-        },
-        "GenerateCompletions": {
-            "name": "GenerateCompletions",
-            "http": {
-                "method": "POST",
-                "requestUri": "/"
-            },
-            "input": {
-                "shape": "GenerateCompletionsRequest"
-            },
-            "output": {
-                "shape": "GenerateCompletionsResponse"
-            },
-            "errors": [
-                {
-                    "shape": "ThrottlingException"
-                },
-                {
-                    "shape": "InternalServerException"
-                },
-                {
-                    "shape": "ValidationException"
-                },
-                {
-                    "shape": "AccessDeniedException"
-                }
-            ]
-        },
-        "GetCodeAnalysis": {
-            "name": "GetCodeAnalysis",
-            "http": {
-                "method": "POST",
-                "requestUri": "/"
-            },
-            "input": {
-                "shape": "GetCodeAnalysisRequest"
-            },
-            "output": {
-                "shape": "GetCodeAnalysisResponse"
-            },
-            "errors": [
-                {
-                    "shape": "ThrottlingException"
-                },
-                {
-                    "shape": "ResourceNotFoundException"
-                },
-                {
-                    "shape": "InternalServerException"
-                },
-                {
-                    "shape": "ValidationException"
-                },
-                {
-                    "shape": "AccessDeniedException"
-                }
-            ]
-        },
-        "ListCodeAnalysisFindings": {
-            "name": "ListCodeAnalysisFindings",
-            "http": {
-                "method": "POST",
-                "requestUri": "/"
-            },
-            "input": {
-                "shape": "ListCodeAnalysisFindingsRequest"
-            },
-            "output": {
-                "shape": "ListCodeAnalysisFindingsResponse"
-            },
-            "errors": [
-                {
-                    "shape": "ThrottlingException"
-                },
-                {
-                    "shape": "ResourceNotFoundException"
-                },
-                {
-                    "shape": "InternalServerException"
-                },
-                {
-                    "shape": "ValidationException"
-                },
-                {
-                    "shape": "AccessDeniedException"
-                }
-            ]
-        },
-        "StartCodeAnalysis": {
-            "name": "StartCodeAnalysis",
-            "http": {
-                "method": "POST",
-                "requestUri": "/"
-            },
-            "input": {
-                "shape": "StartCodeAnalysisRequest"
-            },
-            "output": {
-                "shape": "StartCodeAnalysisResponse"
-            },
-            "errors": [
-                {
-                    "shape": "ThrottlingException"
-                },
-                {
-                    "shape": "ConflictException"
-                },
-                {
-                    "shape": "ResourceNotFoundException"
-                },
-                {
-                    "shape": "InternalServerException"
-                },
-                {
-                    "shape": "ValidationException"
-                },
-                {
-                    "shape": "AccessDeniedException"
-                }
-            ],
-            "idempotent": true
-        }
-    },
-    "shapes": {
-        "AccessDeniedException": {
-            "type": "structure",
-            "required": ["message"],
-            "members": {
-                "message": {
-                    "shape": "String"
-                }
-            },
-            "exception": true
-        },
-        "ArtifactMap": {
-            "type": "map",
-            "key": {
-                "shape": "ArtifactType"
-            },
-            "value": {
-                "shape": "UploadId"
-            },
-            "max": 64,
-            "min": 1
-        },
-        "ArtifactType": {
-            "type": "string",
-            "enum": ["SourceCode", "BuiltJars"]
-        },
-        "CodeAnalysisFindingsSchema": {
-            "type": "string",
-            "enum": ["codeanalysis/findings/1.0"]
-        },
-        "CodeAnalysisStatus": {
-            "type": "string",
-            "enum": ["Completed", "Pending", "Failed"]
-        },
-        "Completion": {
-            "type": "structure",
-            "required": ["content"],
-            "members": {
-                "content": {
-                    "shape": "CompletionContentString"
-                },
-                "references": {
-                    "shape": "References"
-                }
-            }
-        },
-        "CompletionContentString": {
-            "type": "string",
-            "max": 5120,
-            "min": 1,
-            "sensitive": true
-        },
-        "Completions": {
-            "type": "list",
-            "member": {
-                "shape": "Completion"
-            },
-            "max": 10,
-            "min": 0
-        },
-        "ConflictException": {
-            "type": "structure",
-            "required": ["message"],
-            "members": {
-                "message": {
-                    "shape": "String"
-                }
-            },
-            "exception": true
-        },
-        "CreateUploadUrlRequest": {
-            "type": "structure",
-            "required": ["contentMd5", "artifactType"],
-            "members": {
-                "contentMd5": {
-                    "shape": "CreateUploadUrlRequestContentMd5String"
-                },
-                "artifactType": {
-                    "shape": "ArtifactType"
-                }
-            }
-        },
-        "CreateUploadUrlRequestContentMd5String": {
-            "type": "string",
-            "max": 128,
-            "min": 1
-        },
-        "CreateUploadUrlResponse": {
-            "type": "structure",
-            "required": ["uploadId", "uploadUrl"],
-            "members": {
-                "uploadId": {
-                    "shape": "UploadId"
-                },
-                "uploadUrl": {
-                    "shape": "PreSignedUrl"
-                }
-            }
-        },
-        "FileContext": {
-            "type": "structure",
-            "required": ["leftFileContent", "rightFileContent", "filename", "programmingLanguage"],
-            "members": {
-                "leftFileContent": {
-                    "shape": "FileContextLeftFileContentString"
-                },
-                "rightFileContent": {
-                    "shape": "FileContextRightFileContentString"
-                },
-                "filename": {
-                    "shape": "FileContextFilenameString"
-                },
-                "programmingLanguage": {
-                    "shape": "ProgrammingLanguage"
-                }
-            }
-        },
-        "FileContextFilenameString": {
-            "type": "string",
-            "max": 1024,
-            "min": 1
-        },
-        "FileContextLeftFileContentString": {
-            "type": "string",
-            "max": 10240,
-            "min": 0,
-            "sensitive": true
-        },
-        "FileContextRightFileContentString": {
-            "type": "string",
-            "max": 10240,
-            "min": 0,
-            "sensitive": true
-        },
-        "GenerateCompletionsRequest": {
-            "type": "structure",
-            "required": ["fileContext"],
-            "members": {
-                "fileContext": {
-                    "shape": "FileContext"
-                },
-                "maxResults": {
-                    "shape": "GenerateCompletionsRequestMaxResultsInteger"
-                },
-                "nextToken": {
-                    "shape": "GenerateCompletionsRequestNextTokenString"
-                },
-                "referenceTrackerConfiguration": {
-                    "shape": "ReferenceTrackerConfiguration"
-                }
-            }
-        },
-        "GenerateCompletionsRequestMaxResultsInteger": {
-            "type": "integer",
-            "box": true,
-            "max": 10,
-            "min": 1
-        },
-        "GenerateCompletionsRequestNextTokenString": {
-            "type": "string",
-            "max": 2048,
-            "min": 0,
-            "pattern": "(?:[A-Za-z0-9\\+/]{4})*(?:[A-Za-z0-9\\+/]{2}\\=\\=|[A-Za-z0-9\\+/]{3}\\=)?"
-        },
-        "GenerateCompletionsResponse": {
-            "type": "structure",
-            "members": {
-                "completions": {
-                    "shape": "Completions"
-                },
-                "nextToken": {
-                    "shape": "String"
-                }
-            }
-        },
-        "GetCodeAnalysisRequest": {
-            "type": "structure",
-            "required": ["jobId"],
-            "members": {
-                "jobId": {
-                    "shape": "GetCodeAnalysisRequestJobIdString"
-                }
-            }
-        },
-        "GetCodeAnalysisRequestJobIdString": {
-            "type": "string",
-            "max": 256,
-            "min": 1
-        },
-        "GetCodeAnalysisResponse": {
-            "type": "structure",
-            "required": ["status"],
-            "members": {
-                "status": {
-                    "shape": "CodeAnalysisStatus"
-                },
-                "errorMessage": {
-                    "shape": "String"
-                }
-            }
-        },
-        "InternalServerException": {
-            "type": "structure",
-            "required": ["message"],
-            "members": {
-                "message": {
-                    "shape": "String"
-                }
-            },
-            "exception": true,
-            "fault": true,
-            "retryable": {
-                "throttling": false
-            }
-        },
-        "ListCodeAnalysisFindingsRequest": {
-            "type": "structure",
-            "required": ["jobId", "codeAnalysisFindingsSchema"],
-            "members": {
-                "jobId": {
-                    "shape": "ListCodeAnalysisFindingsRequestJobIdString"
-                },
-                "nextToken": {
-                    "shape": "PaginationToken"
-                },
-                "codeAnalysisFindingsSchema": {
-                    "shape": "CodeAnalysisFindingsSchema"
-                }
-            }
-        },
-        "ListCodeAnalysisFindingsRequestJobIdString": {
-            "type": "string",
-            "max": 256,
-            "min": 1
-        },
-        "ListCodeAnalysisFindingsResponse": {
-            "type": "structure",
-            "required": ["codeAnalysisFindings"],
-            "members": {
-                "nextToken": {
-                    "shape": "PaginationToken"
-                },
-                "codeAnalysisFindings": {
-                    "shape": "String"
-                }
-            }
-        },
-        "PaginationToken": {
-            "type": "string",
-            "max": 2048,
-            "min": 1,
-            "pattern": "\\S+"
-        },
-        "PreSignedUrl": {
-            "type": "string",
-            "max": 2048,
-            "min": 1
-        },
-        "ProgrammingLanguage": {
-            "type": "structure",
-            "required": ["languageName"],
-            "members": {
-                "languageName": {
-                    "shape": "ProgrammingLanguageLanguageNameString"
-                }
-            }
-        },
-        "ProgrammingLanguageLanguageNameString": {
-            "type": "string",
-            "max": 128,
-            "min": 1,
-            "pattern": "(python|javascript|java|csharp|typescript)"
-        },
-        "RecommendationsWithReferencesPreference": {
-            "type": "string",
-            "enum": ["BLOCK", "ALLOW"]
-        },
-        "Reference": {
-            "type": "structure",
-            "members": {
-                "licenseName": {
-                    "shape": "ReferenceLicenseNameString"
-                },
-                "repository": {
-                    "shape": "ReferenceRepositoryString"
-                },
-                "url": {
-                    "shape": "ReferenceUrlString"
-                },
-                "recommendationContentSpan": {
-                    "shape": "Span"
-                }
-            }
-        },
-        "ReferenceLicenseNameString": {
-            "type": "string",
-            "max": 1024,
-            "min": 1
-        },
-        "ReferenceRepositoryString": {
-            "type": "string",
-            "max": 1024,
-            "min": 1
-        },
-        "ReferenceTrackerConfiguration": {
-            "type": "structure",
-            "required": ["recommendationsWithReferences"],
-            "members": {
-                "recommendationsWithReferences": {
-                    "shape": "RecommendationsWithReferencesPreference"
-                }
-            }
-        },
-        "ReferenceUrlString": {
-            "type": "string",
-            "max": 1024,
-            "min": 1
-        },
-        "References": {
-            "type": "list",
-            "member": {
-                "shape": "Reference"
-            },
-            "max": 10,
-            "min": 0
-        },
-        "ResourceNotFoundException": {
-            "type": "structure",
-            "required": ["message"],
-            "members": {
-                "message": {
-                    "shape": "String"
-                }
-            },
-            "exception": true
-        },
-        "Span": {
-            "type": "structure",
-            "members": {
-                "start": {
-                    "shape": "SpanStartInteger"
-                },
-                "end": {
-                    "shape": "SpanEndInteger"
-                }
-            }
-        },
-        "SpanEndInteger": {
-            "type": "integer",
-            "box": true,
-            "min": 0
-        },
-        "SpanStartInteger": {
-            "type": "integer",
-            "box": true,
-            "min": 0
-        },
-        "StartCodeAnalysisRequest": {
-            "type": "structure",
-            "required": ["artifacts", "programmingLanguage"],
-            "members": {
-                "artifacts": {
-                    "shape": "ArtifactMap"
-                },
-                "programmingLanguage": {
-                    "shape": "ProgrammingLanguage"
-                },
-                "clientToken": {
-                    "shape": "StartCodeAnalysisRequestClientTokenString",
-                    "idempotencyToken": true
-                }
-            }
-        },
-        "StartCodeAnalysisRequestClientTokenString": {
-            "type": "string",
-            "max": 256,
-            "min": 1
-        },
-        "StartCodeAnalysisResponse": {
-            "type": "structure",
-            "required": ["jobId", "status"],
-            "members": {
-                "jobId": {
-                    "shape": "StartCodeAnalysisResponseJobIdString"
-                },
-                "status": {
-                    "shape": "CodeAnalysisStatus"
-                },
-                "errorMessage": {
-                    "shape": "String"
-                }
-            }
-        },
-        "StartCodeAnalysisResponseJobIdString": {
-            "type": "string",
-            "max": 256,
-            "min": 1
-        },
-        "String": {
-            "type": "string"
-        },
-        "ThrottlingException": {
-            "type": "structure",
-            "required": ["message"],
-            "members": {
-                "message": {
-                    "shape": "String"
-                }
-            },
-            "exception": true,
-            "retryable": {
-                "throttling": false
-            }
-        },
-        "UploadId": {
-            "type": "string",
-            "max": 128,
-            "min": 1
-        },
-        "ValidationException": {
-            "type": "structure",
-            "required": ["message"],
-            "members": {
-                "message": {
-                    "shape": "String"
-                }
-            },
-            "exception": true
-        }
-    }
-}
diff --git a/src/codewhisperer/commands/basicCommands.ts b/src/codewhisperer/commands/basicCommands.ts
deleted file mode 100644
index 9564c33465e..00000000000
--- a/src/codewhisperer/commands/basicCommands.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { telemetry } from '../../shared/telemetry/telemetry'
-import { showView } from '../vue/backend'
-import { ExtContext } from '../../shared/extensions'
-import { Commands } from '../../shared/vscode/commands2'
-import * as CodeWhispererConstants from '../models/constants'
-import { getLogger } from '../../shared/logger'
-import { DefaultCodeWhispererClient } from '../client/codewhisperer'
-import { startSecurityScanWithProgress } from './startSecurityScan'
-import { SecurityPanelViewProvider } from '../views/securityPanelViewProvider'
-import { codeScanState } from '../models/model'
-import { showConnectionPrompt } from '../util/showSsoPrompt'
-import { ReferenceLogViewProvider } from '../service/referenceLogViewProvider'
-import { AuthUtil } from '../util/authUtil'
-
-export const toggleCodeSuggestions = Commands.declare(
-    'aws.codeWhisperer.toggleCodeSuggestion',
-    (globalState: vscode.Memento) => async () => {
-        const autoTriggerEnabled: boolean = get(CodeWhispererConstants.autoTriggerEnabledKey, globalState) || false
-        const toSet: boolean = !autoTriggerEnabled
-        await set(CodeWhispererConstants.autoTriggerEnabledKey, toSet, globalState)
-        await vscode.commands.executeCommand('aws.codeWhisperer.refresh')
-        telemetry.aws_modifySetting.emit({
-            settingId: CodeWhispererConstants.autoSuggestionConfig.settingId,
-            settingState: toSet
-                ? CodeWhispererConstants.autoSuggestionConfig.activated
-                : CodeWhispererConstants.autoSuggestionConfig.deactivated,
-        })
-    }
-)
-
-export const enableCodeSuggestions = Commands.declare(
-    'aws.codeWhisperer.enableCodeSuggestions',
-    (context: ExtContext) => async () => {
-        showView(context.extensionContext)
-    }
-)
-
-export const showReferenceLog = Commands.declare(
-    'aws.codeWhisperer.openReferencePanel',
-    (context: ExtContext) => async () => {
-        await vscode.commands.executeCommand('workbench.view.extension.aws-codewhisperer-reference-log')
-    }
-)
-
-export const showIntroduction = Commands.declare('aws.codeWhisperer.introduction', () => async () => {
-    vscode.env.openExternal(vscode.Uri.parse(CodeWhispererConstants.learnMoreUriGeneral))
-})
-
-export const showSecurityScan = Commands.declare(
-    'aws.codeWhisperer.security.scan',
-    (context: ExtContext, securityPanelViewProvider: SecurityPanelViewProvider, client: DefaultCodeWhispererClient) =>
-        async () => {
-            if (AuthUtil.instance.isConnectionExpired()) {
-                await AuthUtil.instance.showReauthenticatePrompt()
-            }
-            const editor = vscode.window.activeTextEditor
-            if (editor) {
-                if (!codeScanState.running) {
-                    codeScanState.running = true
-                    await vscode.commands.executeCommand('aws.codeWhisperer.refresh')
-                    startSecurityScanWithProgress(securityPanelViewProvider, editor, client, context.extensionContext)
-                }
-            } else {
-                vscode.window.showInformationMessage('Open a valid file to scan.')
-            }
-        }
-)
-
-export function get(key: string, context: vscode.Memento): any {
-    return context.get(key)
-}
-
-export async function set(key: string, value: any, context: vscode.Memento): Promise<void> {
-    await context.update(key, value).then(
-        () => {},
-        error => {
-            getLogger().verbose(`Failed to update global state: ${error}`)
-        }
-    )
-}
-
-export const showSsoSignIn = Commands.declare('aws.codeWhisperer.sso', () => async () => {
-    telemetry.ui_click.emit({ elementId: 'cw_signUp_Cta' })
-
-    await showConnectionPrompt()
-})
-
-export const showLearnMore = Commands.declare('aws.codeWhisperer.learnMore', () => async () => {
-    telemetry.ui_click.emit({ elementId: 'cw_learnMore_Cta' })
-
-    vscode.env.openExternal(vscode.Uri.parse(CodeWhispererConstants.learnMoreUriGeneral))
-})
-
-export const showAccessTokenErrorLearnMore = Commands.declare(
-    'aws.codeWhisperer.accessTokenErrorLearnMore',
-    () => async () => {
-        vscode.env.openExternal(vscode.Uri.parse(CodeWhispererConstants.accessTokenMigrationLearnMoreUri))
-    }
-)
-
-// TODO: Use a different URI
-export const showFreeTierLimit = Commands.declare('aws.codeWhisperer.freeTierLimit', () => async () => {
-    vscode.env.openExternal(vscode.Uri.parse(CodeWhispererConstants.learnMoreUri))
-})
-
-export const updateReferenceLog = Commands.declare('aws.codeWhisperer.updateReferenceLog', () => () => {
-    ReferenceLogViewProvider.instance.update()
-})
diff --git a/src/codewhisperer/commands/invokeRecommendation.ts b/src/codewhisperer/commands/invokeRecommendation.ts
deleted file mode 100644
index bd97e22e834..00000000000
--- a/src/codewhisperer/commands/invokeRecommendation.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { vsCodeState, ConfigurationEntry } from '../models/model'
-import { resetIntelliSenseState } from '../util/globalStateUtil'
-import { DefaultCodeWhispererClient } from '../client/codewhisperer'
-import { InlineCompletion } from '../service/inlineCompletion'
-import { isCloud9 } from '../../shared/extensionUtilities'
-import { RecommendationHandler } from '../service/recommendationHandler'
-import { isInlineCompletionEnabled } from '../util/commonUtil'
-import { InlineCompletionService } from '../service/inlineCompletionService'
-import { AuthUtil } from '../util/authUtil'
-import { TelemetryHelper } from '../util/telemetryHelper'
-
-/**
- * This function is for manual trigger CodeWhisperer
- */
-
-export async function invokeRecommendation(
-    editor: vscode.TextEditor,
-    client: DefaultCodeWhispererClient,
-    config: ConfigurationEntry
-) {
-    if (!config.isManualTriggerEnabled) {
-        return
-    }
-    /**
-     * IntelliSense in Cloud9 needs editor.suggest.showMethods
-     */
-    if (!config.isShowMethodsEnabled && isCloud9()) {
-        vscode.window.showWarningMessage('Turn on "editor.suggest.showMethods" to use CodeWhisperer')
-        return
-    }
-    if (editor) {
-        /**
-         * Skip when output channel gains focus and invoke
-         */
-        if (editor.document.languageId === 'Log') {
-            return
-        }
-        /**
-         * When using intelliSense, if invocation position changed, reject previous active recommendations
-         */
-        if (vsCodeState.isIntelliSenseActive && editor.selection.active !== RecommendationHandler.instance.startPos) {
-            resetIntelliSenseState(
-                config.isManualTriggerEnabled,
-                config.isAutomatedTriggerEnabled,
-                RecommendationHandler.instance.isValidResponse()
-            )
-        }
-        if (isCloud9()) {
-            if (RecommendationHandler.instance.isGenerateRecommendationInProgress) {
-                return
-            }
-            vsCodeState.isIntelliSenseActive = false
-            RecommendationHandler.instance.isGenerateRecommendationInProgress = true
-            try {
-                RecommendationHandler.instance.reportUserDecisionOfRecommendation(editor, -1)
-                RecommendationHandler.instance.clearRecommendations()
-                await RecommendationHandler.instance.getRecommendations(
-                    client,
-                    editor,
-                    'OnDemand',
-                    config,
-                    undefined,
-                    false
-                )
-                if (RecommendationHandler.instance.canShowRecommendationInIntelliSense(editor, true)) {
-                    await vscode.commands.executeCommand('editor.action.triggerSuggest').then(() => {
-                        vsCodeState.isIntelliSenseActive = true
-                    })
-                }
-            } finally {
-                RecommendationHandler.instance.isGenerateRecommendationInProgress = false
-            }
-        } else if (isInlineCompletionEnabled()) {
-            if (AuthUtil.instance.isConnectionExpired()) {
-                await AuthUtil.instance.showReauthenticatePrompt()
-            }
-            TelemetryHelper.instance.setInvokeSuggestionStartTime()
-            await InlineCompletionService.instance.getPaginatedRecommendation(client, editor, 'OnDemand', config)
-        } else {
-            if (
-                !vsCodeState.isCodeWhispererEditing &&
-                !InlineCompletion.instance.isPaginationRunning() &&
-                !InlineCompletion.instance.getIsActive
-            ) {
-                await InlineCompletion.instance.resetInlineStates(editor)
-                InlineCompletion.instance.setCodeWhispererStatusBarLoading()
-                InlineCompletion.instance.getPaginatedRecommendation(client, editor, 'OnDemand', config)
-            }
-        }
-    }
-}
diff --git a/src/codewhisperer/commands/onAcceptance.ts b/src/codewhisperer/commands/onAcceptance.ts
deleted file mode 100644
index a20c844b09d..00000000000
--- a/src/codewhisperer/commands/onAcceptance.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as CodeWhispererConstants from '../models/constants'
-import { vsCodeState, OnRecommendationAcceptanceEntry } from '../models/model'
-import { runtimeLanguageContext } from '../util/runtimeLanguageContext'
-import { CodeWhispererTracker } from '../tracker/codewhispererTracker'
-import { CodeWhispererCodeCoverageTracker } from '../tracker/codewhispererCodeCoverageTracker'
-import { TextEdit, WorkspaceEdit, workspace } from 'vscode'
-import { getTabSizeSetting } from '../../shared/utilities/editorUtilities'
-import { getLogger } from '../../shared/logger/logger'
-import { isCloud9 } from '../../shared/extensionUtilities'
-import { handleExtraBrackets } from '../util/closingBracketUtil'
-import { RecommendationHandler } from '../service/recommendationHandler'
-import { InlineCompletion } from '../service/inlineCompletion'
-import { ReferenceLogViewProvider } from '../service/referenceLogViewProvider'
-import { ReferenceHoverProvider } from '../service/referenceHoverProvider'
-
-/**
- * This function is called when user accepts a intelliSense suggestion or an inline suggestion
- */
-export async function onAcceptance(acceptanceEntry: OnRecommendationAcceptanceEntry, globalStorage: vscode.Memento) {
-    RecommendationHandler.instance.cancelPaginatedRequest()
-    /**
-     * Format document
-     */
-    if (acceptanceEntry.editor) {
-        const languageContext = runtimeLanguageContext.getLanguageContext(acceptanceEntry.editor.document.languageId)
-        const start = acceptanceEntry.range.start
-        const end = isCloud9() ? acceptanceEntry.editor.selection.active : acceptanceEntry.range.end
-        const languageId = acceptanceEntry.editor.document.languageId
-        RecommendationHandler.instance.reportUserDecisionOfRecommendation(
-            acceptanceEntry.editor,
-            acceptanceEntry.acceptIndex
-        )
-        // codewhisperer will be doing editing while formatting.
-        // formatting should not trigger consoals auto trigger
-        vsCodeState.isCodeWhispererEditing = true
-        /**
-         * Mitigation to right context handling mainly for auto closing bracket use case
-         */
-        if (!InlineCompletion.instance.isTypeaheadInProgress) {
-            try {
-                await handleExtraBrackets(acceptanceEntry.editor, acceptanceEntry.recommendation, end)
-            } catch (error) {
-                getLogger().error(`${error} in handleAutoClosingBrackets`)
-            }
-        }
-        // move cursor to end of suggestion before doing code format
-        // after formatting, the end position will still be editor.selection.active
-        if (!isCloud9()) {
-            acceptanceEntry.editor.selection = new vscode.Selection(end, end)
-        }
-
-        if (languageId === CodeWhispererConstants.python) {
-            await vscode.commands.executeCommand('editor.action.format')
-        } else {
-            const range = new vscode.Range(start, end)
-            const edits: TextEdit[] | undefined = await vscode.commands.executeCommand(
-                'vscode.executeFormatRangeProvider',
-                acceptanceEntry.editor.document.uri,
-                range,
-                {
-                    tabSize: getTabSizeSetting(),
-                    insertSpaces: true,
-                }
-            )
-            if (edits && acceptanceEntry.editor) {
-                const wEdit = new WorkspaceEdit()
-                wEdit.set(acceptanceEntry.editor.document.uri, edits)
-                await workspace.applyEdit(wEdit)
-            }
-        }
-        /* After formatting, update global variable states.
-         */
-
-        if (isCloud9()) {
-            vsCodeState.isIntelliSenseActive = false
-        } else {
-            InlineCompletion.instance.isTypeaheadInProgress = false
-        }
-        vsCodeState.isCodeWhispererEditing = false
-        CodeWhispererTracker.getTracker().enqueue({
-            time: new Date(),
-            fileUrl: acceptanceEntry.editor.document.uri,
-            originalString: acceptanceEntry.editor.document.getText(new vscode.Range(start, end)),
-            startPosition: start,
-            endPosition: end,
-            requestId: acceptanceEntry.requestId,
-            sessionId: acceptanceEntry.sessionId,
-            index: acceptanceEntry.acceptIndex,
-            triggerType: acceptanceEntry.triggerType,
-            completionType: acceptanceEntry.completionType,
-            language: languageContext.language,
-        })
-        const codeRangeAfterFormat = new vscode.Range(start, acceptanceEntry.editor.selection.active)
-        CodeWhispererCodeCoverageTracker.getTracker(languageContext.language)?.countAcceptedTokens(
-            codeRangeAfterFormat,
-            acceptanceEntry.editor.document.getText(codeRangeAfterFormat),
-            acceptanceEntry.editor.document.fileName
-        )
-        if (acceptanceEntry.references !== undefined) {
-            const referenceLog = ReferenceLogViewProvider.getReferenceLog(
-                acceptanceEntry.recommendation,
-                acceptanceEntry.references,
-                acceptanceEntry.editor
-            )
-            ReferenceLogViewProvider.instance.addReferenceLog(referenceLog)
-            ReferenceHoverProvider.instance.addCodeReferences(
-                acceptanceEntry.recommendation,
-                acceptanceEntry.references
-            )
-        }
-    }
-
-    // at the end of recommendation acceptance, clear recommendations.
-    RecommendationHandler.instance.clearRecommendations()
-}
diff --git a/src/codewhisperer/commands/onInlineAcceptance.ts b/src/codewhisperer/commands/onInlineAcceptance.ts
deleted file mode 100644
index 3ac9b268b27..00000000000
--- a/src/codewhisperer/commands/onInlineAcceptance.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as CodeWhispererConstants from '../models/constants'
-import { vsCodeState, OnRecommendationAcceptanceEntry } from '../models/model'
-import { runtimeLanguageContext } from '../util/runtimeLanguageContext'
-import { CodeWhispererTracker } from '../tracker/codewhispererTracker'
-import { CodeWhispererCodeCoverageTracker } from '../tracker/codewhispererCodeCoverageTracker'
-import { TextEdit, WorkspaceEdit, workspace } from 'vscode'
-import { getTabSizeSetting } from '../../shared/utilities/editorUtilities'
-import { getLogger } from '../../shared/logger/logger'
-import { RecommendationHandler } from '../service/recommendationHandler'
-import { InlineCompletionService } from '../service/inlineCompletionService'
-import { sleep } from '../../shared/utilities/timeoutUtils'
-import { handleExtraBrackets } from '../util/closingBracketUtil'
-import { Commands } from '../../shared/vscode/commands2'
-import { isInlineCompletionEnabled } from '../util/commonUtil'
-import { ExtContext } from '../../shared/extensions'
-import { onAcceptance } from './onAcceptance'
-import * as codewhispererClient from '../client/codewhisperer'
-import {
-    CodewhispererCompletionType,
-    CodewhispererLanguage,
-    CodewhispererTriggerType,
-} from '../../shared/telemetry/telemetry.gen'
-import { ReferenceLogViewProvider } from '../service/referenceLogViewProvider'
-import { ReferenceHoverProvider } from '../service/referenceHoverProvider'
-
-export const acceptSuggestion = Commands.declare(
-    'aws.codeWhisperer.accept',
-    (context: ExtContext) =>
-        async (
-            range: vscode.Range,
-            acceptIndex: number,
-            recommendation: string,
-            requestId: string,
-            sessionId: string,
-            triggerType: CodewhispererTriggerType,
-            completionType: CodewhispererCompletionType,
-            language: CodewhispererLanguage,
-            references: codewhispererClient.References
-        ) => {
-            const editor = vscode.window.activeTextEditor
-            const onAcceptanceFunc = isInlineCompletionEnabled() ? onInlineAcceptance : onAcceptance
-            await onAcceptanceFunc(
-                {
-                    editor,
-                    range,
-                    acceptIndex,
-                    recommendation,
-                    requestId,
-                    sessionId,
-                    triggerType,
-                    completionType,
-                    language,
-                    references,
-                },
-                context.extensionContext.globalState
-            ).finally(async () => {
-                if (isInlineCompletionEnabled()) {
-                    // at the end of recommendation acceptance, clear recommendations.
-                    RecommendationHandler.instance.clearRecommendations()
-                    await InlineCompletionService.instance.clearInlineCompletionStates(editor)
-                }
-            })
-        }
-)
-/**
- * This function is called when user accepts a intelliSense suggestion or an inline suggestion
- */
-export async function onInlineAcceptance(
-    acceptanceEntry: OnRecommendationAcceptanceEntry,
-    globalStorage: vscode.Memento
-) {
-    RecommendationHandler.instance.cancelPaginatedRequest()
-    InlineCompletionService.instance.disposeInlineCompletion()
-
-    if (acceptanceEntry.editor) {
-        await sleep(CodeWhispererConstants.vsCodeCursorUpdateDelay)
-        const languageContext = runtimeLanguageContext.getLanguageContext(acceptanceEntry.editor.document.languageId)
-        const start = acceptanceEntry.range.start
-        const end = acceptanceEntry.editor.selection.active
-        const languageId = acceptanceEntry.editor.document.languageId
-        RecommendationHandler.instance.reportUserDecisionOfRecommendation(
-            acceptanceEntry.editor,
-            acceptanceEntry.acceptIndex
-        )
-        // codewhisperer will be doing editing while formatting.
-        // formatting should not trigger consoals auto trigger
-        vsCodeState.isCodeWhispererEditing = true
-        /**
-         * Mitigation to right context handling mainly for auto closing bracket use case
-         */
-        try {
-            // Do not handle extra bracket if there is a right context merge
-            if (
-                acceptanceEntry.recommendation ===
-                RecommendationHandler.instance.recommendations[acceptanceEntry.acceptIndex].content
-            ) {
-                await handleExtraBrackets(acceptanceEntry.editor, acceptanceEntry.recommendation, end)
-            }
-        } catch (error) {
-            getLogger().error(`${error} in handling right contexts`)
-        }
-        try {
-            if (languageId === CodeWhispererConstants.python) {
-                await vscode.commands.executeCommand('editor.action.format')
-            } else {
-                const range = new vscode.Range(start, end)
-                const edits: TextEdit[] | undefined = await vscode.commands.executeCommand(
-                    'vscode.executeFormatRangeProvider',
-                    acceptanceEntry.editor.document.uri,
-                    range,
-                    {
-                        tabSize: getTabSizeSetting(),
-                        insertSpaces: true,
-                    }
-                )
-                if (edits && acceptanceEntry.editor) {
-                    const wEdit = new WorkspaceEdit()
-                    wEdit.set(acceptanceEntry.editor.document.uri, edits)
-                    await workspace.applyEdit(wEdit)
-                }
-            }
-        } finally {
-            vsCodeState.isCodeWhispererEditing = false
-        }
-
-        CodeWhispererTracker.getTracker().enqueue({
-            time: new Date(),
-            fileUrl: acceptanceEntry.editor.document.uri,
-            originalString: acceptanceEntry.editor.document.getText(new vscode.Range(start, end)),
-            startPosition: start,
-            endPosition: end,
-            requestId: acceptanceEntry.requestId,
-            sessionId: acceptanceEntry.sessionId,
-            index: acceptanceEntry.acceptIndex,
-            triggerType: acceptanceEntry.triggerType,
-            completionType: acceptanceEntry.completionType,
-            language: languageContext.language,
-        })
-        const codeRangeAfterFormat = new vscode.Range(start, acceptanceEntry.editor.selection.active)
-        CodeWhispererCodeCoverageTracker.getTracker(languageContext.language, globalStorage)?.countAcceptedTokens(
-            codeRangeAfterFormat,
-            acceptanceEntry.editor.document.getText(codeRangeAfterFormat),
-            acceptanceEntry.editor.document.fileName
-        )
-        if (acceptanceEntry.references !== undefined) {
-            const referenceLog = ReferenceLogViewProvider.getReferenceLog(
-                acceptanceEntry.recommendation,
-                acceptanceEntry.references,
-                acceptanceEntry.editor
-            )
-            ReferenceLogViewProvider.instance.addReferenceLog(referenceLog)
-            ReferenceHoverProvider.instance.addCodeReferences(
-                acceptanceEntry.recommendation,
-                acceptanceEntry.references
-            )
-        }
-    }
-}
diff --git a/src/codewhisperer/commands/startSecurityScan.ts b/src/codewhisperer/commands/startSecurityScan.ts
deleted file mode 100644
index 40157656ff8..00000000000
--- a/src/codewhisperer/commands/startSecurityScan.ts
+++ /dev/null
@@ -1,212 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { DefaultCodeWhispererClient } from '../client/codewhisperer'
-import { isCloud9 } from '../../shared/extensionUtilities'
-import { initSecurityScanRender } from '../service/diagnosticsProvider'
-import { SecurityPanelViewProvider } from '../views/securityPanelViewProvider'
-import { getLogger } from '../../shared/logger'
-import * as CodeWhispererConstants from '../models/constants'
-import { DependencyGraphFactory } from '../util/dependencyGraph/dependencyGraphFactory'
-import { JavaDependencyGraphError } from '../util/dependencyGraph/javaDependencyGraph'
-import {
-    getPresignedUrlAndUpload,
-    createScanJob,
-    pollScanJobStatus,
-    listScanResults,
-} from '../service/securityScanHandler'
-import { runtimeLanguageContext } from '../util/runtimeLanguageContext'
-import { codeScanState, CodeScanTelemetryEntry } from '../models/model'
-import { openSettings } from '../../shared/settings'
-import { ok, viewSettings } from '../../shared/localizedText'
-import { statSync } from 'fs'
-import { getFileExt } from '../util/commonUtil'
-import { getDirSize } from '../../shared/filesystemUtilities'
-import { telemetry } from '../../shared/telemetry/telemetry'
-import { TelemetryHelper } from '../util/telemetryHelper'
-
-const performance = globalThis.performance ?? require('perf_hooks').performance
-
-export function startSecurityScanWithProgress(
-    securityPanelViewProvider: SecurityPanelViewProvider,
-    editor: vscode.TextEditor,
-    client: DefaultCodeWhispererClient,
-    context: vscode.ExtensionContext
-) {
-    return vscode.window.withProgress(
-        {
-            location: vscode.ProgressLocation.Notification,
-            title: CodeWhispererConstants.runningSecurityScan,
-            cancellable: false,
-        },
-        async () => {
-            await startSecurityScan(securityPanelViewProvider, editor, client, context)
-        }
-    )
-}
-
-export async function startSecurityScan(
-    securityPanelViewProvider: SecurityPanelViewProvider,
-    editor: vscode.TextEditor,
-    client: DefaultCodeWhispererClient,
-    context: vscode.ExtensionContext
-) {
-    /**
-     * Step 0: Initial Code Scan telemetry
-     */
-    const codeScanStartTime = performance.now()
-    let serviceInvocationStartTime = 0
-    const codeScanTelemetryEntry: CodeScanTelemetryEntry = {
-        codewhispererLanguage: runtimeLanguageContext.getLanguageContext(editor.document.languageId).language,
-        codewhispererCodeScanSrcPayloadBytes: 0,
-        codewhispererCodeScanSrcZipFileBytes: 0,
-        codewhispererCodeScanLines: 0,
-        duration: 0,
-        contextTruncationDuration: 0,
-        artifactsUploadDuration: 0,
-        codeScanServiceInvocationsDuration: 0,
-        result: 'Succeeded',
-        codewhispererCodeScanTotalIssues: 0,
-        credentialStartUrl: TelemetryHelper.instance.startUrl,
-    }
-    try {
-        getLogger().verbose(`Starting security scan `)
-        /**
-         * Step 1: Generate context truncations
-         */
-        const dependencyGraph = DependencyGraphFactory.getDependencyGraph(editor.document.languageId)
-        if (dependencyGraph === undefined) {
-            throw new Error(`"${editor.document.languageId}" is not supported for security scan.`)
-        }
-        const uri = dependencyGraph.getRootFile(editor)
-        if (dependencyGraph.reachSizeLimit(statSync(uri.fsPath).size)) {
-            throw new Error(
-                `Selected file larger than ${dependencyGraph.getReadableSizeLimit()}. Try a different file.`
-            )
-        }
-        const projectPath = dependencyGraph.getProjectPath(uri)
-        const projectName = dependencyGraph.getProjectName(uri)
-        if (isCloud9()) {
-            securityPanelViewProvider.startNew(projectName)
-        }
-        const contextTruncationStartTime = performance.now()
-        const truncation = await dependencyGraph.generateTruncationWithTimeout(
-            uri,
-            CodeWhispererConstants.contextTruncationTimeoutSeconds
-        )
-        codeScanTelemetryEntry.contextTruncationDuration = performance.now() - contextTruncationStartTime
-        getLogger().verbose(`Complete project context processing.`)
-        codeScanTelemetryEntry.codewhispererCodeScanSrcPayloadBytes = truncation.src.size
-        codeScanTelemetryEntry.codewhispererCodeScanBuildPayloadBytes = truncation.build.size
-        codeScanTelemetryEntry.codewhispererCodeScanSrcZipFileBytes = truncation.src.zipSize
-        codeScanTelemetryEntry.codewhispererCodeScanBuildZipFileBytes = truncation.build.zipSize
-        codeScanTelemetryEntry.codewhispererCodeScanLines = truncation.lines
-
-        /**
-         * Step 2: Get presigned Url, upload and clean up
-         */
-        let artifactMap
-        const uploadStartTime = performance.now()
-        try {
-            artifactMap = await getPresignedUrlAndUpload(client, truncation)
-        } finally {
-            dependencyGraph.removeTmpFiles(truncation)
-            codeScanTelemetryEntry.artifactsUploadDuration = performance.now() - uploadStartTime
-        }
-
-        /**
-         * Step 3:  Create scan job
-         */
-        serviceInvocationStartTime = performance.now()
-        const scanJob = await createScanJob(client, artifactMap, editor.document.languageId)
-        if (scanJob.status === 'Failed') {
-            throw new Error(scanJob.errorMessage)
-        }
-        getLogger().verbose(`Created security scan job.`)
-        codeScanTelemetryEntry.codewhispererCodeScanJobId = scanJob.jobId
-
-        /**
-         * Step 4:  Polling mechanism on scan job status
-         */
-        const jobStatus = await pollScanJobStatus(client, scanJob.jobId)
-        if (jobStatus === 'Failed') {
-            throw new Error('Security scan job failed.')
-        }
-
-        /**
-         * Step 5: Process and render scan results
-         */
-        getLogger().verbose(`Security scan job succeeded and start processing result.`)
-        const securityRecommendationCollection = await listScanResults(
-            client,
-            scanJob.jobId,
-            CodeWhispererConstants.codeScanFindingsSchema,
-            projectPath
-        )
-        const total = securityRecommendationCollection.reduce((accumulator, current) => {
-            return accumulator + current.issues.length
-        }, 0)
-        codeScanTelemetryEntry.codewhispererCodeScanTotalIssues = total
-        getLogger().verbose(`Security scan totally found ${total} issues.`)
-        if (total > 0) {
-            if (isCloud9()) {
-                securityPanelViewProvider.addLines(securityRecommendationCollection, editor)
-                vscode.commands.executeCommand('workbench.view.extension.aws-codewhisperer-security-panel')
-            } else {
-                initSecurityScanRender(securityRecommendationCollection, context)
-                vscode.commands.executeCommand('workbench.action.problems.focus')
-            }
-        } else {
-            vscode.window.showInformationMessage(`Security scan completed and no issues were found.`)
-        }
-        getLogger().verbose(`Security scan completed.`)
-    } catch (error) {
-        getLogger().error('Security scan failed.', error)
-        errorPromptHelper(error as Error)
-        codeScanTelemetryEntry.result = 'Failed'
-        codeScanTelemetryEntry.reason = (error as Error).message
-    } finally {
-        codeScanState.running = false
-        await vscode.commands.executeCommand('aws.codeWhisperer.refresh')
-        codeScanTelemetryEntry.duration = performance.now() - codeScanStartTime
-        codeScanTelemetryEntry.codeScanServiceInvocationsDuration = performance.now() - serviceInvocationStartTime
-        emitCodeScanTelemetry(editor, codeScanTelemetryEntry)
-    }
-}
-
-export async function emitCodeScanTelemetry(editor: vscode.TextEditor, codeScanTelemetryEntry: CodeScanTelemetryEntry) {
-    const uri = editor.document.uri
-    const workspaceFolder = vscode.workspace.getWorkspaceFolder(uri)
-    const fileExt = getFileExt(editor.document.languageId)
-    if (workspaceFolder !== undefined && fileExt !== undefined) {
-        const projectSize = await getDirSize(
-            workspaceFolder.uri.fsPath,
-            performance.now(),
-            CodeWhispererConstants.projectSizeCalculateTimeoutSeconds * 1000,
-            fileExt
-        )
-        codeScanTelemetryEntry.codewhispererCodeScanProjectBytes = projectSize
-    }
-    telemetry.codewhisperer_securityScan.emit(codeScanTelemetryEntry)
-}
-
-export function errorPromptHelper(error: Error) {
-    if (error instanceof JavaDependencyGraphError) {
-        vscode.window
-            .showWarningMessage(
-                'Try rebuilding the Java project or specify compilation output in Settings.',
-                viewSettings,
-                ok
-            )
-            .then(async resp => {
-                if (resp === viewSettings) {
-                    openSettings('aws.codeWhisperer.javaCompilationOutput')
-                }
-            })
-    } else {
-        vscode.window.showWarningMessage(`Security scan failed. ${error}`, ok)
-    }
-}
diff --git a/src/codewhisperer/explorer/codewhispererChildrenNodes.ts b/src/codewhisperer/explorer/codewhispererChildrenNodes.ts
deleted file mode 100644
index 3948278549b..00000000000
--- a/src/codewhisperer/explorer/codewhispererChildrenNodes.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { getIcon } from '../../shared/icons'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import {
-    enableCodeSuggestions,
-    toggleCodeSuggestions,
-    showReferenceLog,
-    showSecurityScan,
-    showLearnMore,
-    showSsoSignIn,
-    showFreeTierLimit,
-} from '../commands/basicCommands'
-import { codeScanState } from '../models/model'
-
-export const createEnableCodeSuggestionsNode = () =>
-    enableCodeSuggestions.build().asTreeNode({
-        label: localize('AWS.explorerNode.enableCodeWhispererNode.label', 'Enable CodeWhisperer'),
-        iconPath: getIcon('vscode-debug-start'),
-        tooltip: localize('AWS.explorerNode.enableCodeWhispererNode.tooltip', 'Click to Enable CodeWhisperer'),
-    })
-
-export const createAutoSuggestionsNode = (pause: boolean) =>
-    toggleCodeSuggestions.build().asTreeNode(
-        pause
-            ? {
-                  label: localize('AWS.explorerNode.pauseCodeWhispererNode.label', 'Pause Auto-Suggestions'),
-                  iconPath: getIcon('vscode-debug-pause'),
-              }
-            : {
-                  label: localize('AWS.explorerNode.resumeCodeWhispererNode.label', 'Resume Auto-Suggestions'),
-                  iconPath: getIcon('vscode-debug-start'),
-              }
-    )
-
-export const createOpenReferenceLogNode = () =>
-    showReferenceLog.build().asTreeNode({
-        label: localize('AWS.explorerNode.codewhispererOpenReferenceLogNode.label', 'Open Code Reference Log'),
-        iconPath: getIcon('vscode-remote'),
-        tooltip: localize(
-            'AWS.explorerNode.codewhispererOpenReferenceLogNode.tooltip',
-            'Click to open Code Reference Log'
-        ),
-        contextValue: 'awsCodeWhispererOpenReferenceLogNode',
-    })
-
-export const createSecurityScanNode = () => {
-    const prefix = codeScanState.running ? 'Running' : 'Run'
-    return showSecurityScan.build().asTreeNode({
-        label: `${prefix} Security Scan`,
-        iconPath: codeScanState.running ? getIcon('vscode-loading~spin') : getIcon('vscode-debug-alt-small'),
-        tooltip: `${prefix} Security Scan`,
-        contextValue: `awsCodeWhisperer${prefix}SecurityScanNode`,
-    })
-}
-
-export const createSsoSignIn = () =>
-    showSsoSignIn.build().asTreeNode({
-        label: localize('AWS.explorerNode.sSoSignInNode.label', 'Start'),
-        iconPath: getIcon('vscode-debug-start'),
-    })
-
-export const createLearnMore = () =>
-    showLearnMore.build().asTreeNode({
-        label: localize('AWS.explorerNode.codewhispererLearnMore.label', 'Learn More about CodeWhisperer'),
-        iconPath: getIcon('vscode-question'),
-        contextValue: 'awsCodeWhispererLearnMoreNode',
-    })
-
-export const createFreeTierLimitMetNode = () => {
-    const now = new Date()
-    const nextMonth = new Date(now.getFullYear(), now.getMonth() + 1, 1).toLocaleDateString('en-US')
-    return showFreeTierLimit.build().asTreeNode({
-        label: localize('AWS.explorerNode.freeTierLimitMet.label', 'Free Tier Limit Met'),
-        iconPath: getIcon('vscode-error'),
-        description: localize('AWS.explorerNode.freeTierLimitMet.tooltip', `paused until ${nextMonth}`),
-    })
-}
diff --git a/src/codewhisperer/explorer/codewhispererNode.ts b/src/codewhisperer/explorer/codewhispererNode.ts
deleted file mode 100644
index d33e369e1cd..00000000000
--- a/src/codewhisperer/explorer/codewhispererNode.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import globals from '../../shared/extensionGlobals'
-import * as CodeWhispererConstants from '../models/constants'
-import {
-    createEnableCodeSuggestionsNode,
-    createAutoSuggestionsNode,
-    createOpenReferenceLogNode,
-    createSecurityScanNode,
-    createLearnMore,
-    createSsoSignIn,
-    createFreeTierLimitMetNode,
-} from './codewhispererChildrenNodes'
-import { Commands } from '../../shared/vscode/commands2'
-import { RootNode } from '../../awsexplorer/localExplorer'
-import { isCloud9 } from '../../shared/extensionUtilities'
-import { AuthUtil } from '../util/authUtil'
-import { getCodeCatalystDevEnvId } from '../../shared/vscode/env'
-import { getIcon } from '../../shared/icons'
-
-export class CodeWhispererNode implements RootNode {
-    private readonly isAvailable = getCodeCatalystDevEnvId() === undefined
-
-    public readonly id = 'codewhisperer'
-    public readonly resource = this
-    private readonly onDidChangeChildrenEmitter = new vscode.EventEmitter<void>()
-    private readonly onDidChangeTreeItemEmitter = new vscode.EventEmitter<void>()
-    public readonly onDidChangeTreeItem = this.onDidChangeTreeItemEmitter.event
-    public readonly onDidChangeChildren = this.onDidChangeChildrenEmitter.event
-    private readonly onDidChangeVisibilityEmitter = new vscode.EventEmitter<void>()
-    public readonly onDidChangeVisibility = this.onDidChangeVisibilityEmitter.event
-    private _showFreeTierLimitReachedNode = false
-
-    constructor() {}
-
-    public getTreeItem() {
-        if (!this.isAvailable) {
-            const item = new vscode.TreeItem('CodeWhisperer (Preview)')
-            item.description = 'Unavailable in Dev Environment'
-            item.iconPath = getIcon('vscode-circle-slash')
-
-            return item
-        }
-
-        if (!isCloud9()) {
-            AuthUtil.instance.restore()
-        }
-
-        const item = new vscode.TreeItem('CodeWhisperer (Preview)')
-        item.description = this.getDescription()
-        item.collapsibleState = vscode.TreeItemCollapsibleState.Collapsed
-        item.contextValue = AuthUtil.instance.isUsingSavedConnection
-            ? 'awsCodeWhispererNodeSaved'
-            : 'awsCodeWhispererNode'
-
-        return item
-    }
-
-    public refresh(): void {
-        this.onDidChangeChildrenEmitter.fire()
-    }
-
-    public refreshRootNode() {
-        this.onDidChangeTreeItemEmitter.fire()
-    }
-
-    private getDescription(): string {
-        const accessToken = globals.context.globalState.get<string | undefined>(CodeWhispererConstants.accessToken)
-        if (accessToken) {
-            return 'Access Token'
-        }
-        if (AuthUtil.instance.isUsingSavedConnection && AuthUtil.instance.isConnectionValid()) {
-            return AuthUtil.instance.isEnterpriseSsoInUse()
-                ? 'IAM Identity Center Connected'
-                : 'AWS Builder ID Connected'
-        }
-        return ''
-    }
-
-    public getChildren() {
-        if (!this.isAvailable) {
-            return []
-        }
-
-        const termsAccepted = globals.context.globalState.get<boolean>(CodeWhispererConstants.termsAcceptedKey)
-        const autoTriggerEnabled =
-            globals.context.globalState.get<boolean>(CodeWhispererConstants.autoTriggerEnabledKey) || false
-
-        if (isCloud9()) {
-            if (termsAccepted) {
-                return [createAutoSuggestionsNode(autoTriggerEnabled), createOpenReferenceLogNode()]
-            } else {
-                return [createLearnMore(), createEnableCodeSuggestionsNode()]
-            }
-        } else {
-            const accessToken = this.getDescription()
-            if (accessToken || AuthUtil.instance.isConnected()) {
-                if (termsAccepted) {
-                    if (this._showFreeTierLimitReachedNode) {
-                        return [createFreeTierLimitMetNode(), createSecurityScanNode(), createOpenReferenceLogNode()]
-                    } else {
-                        return [
-                            createAutoSuggestionsNode(autoTriggerEnabled),
-                            createSecurityScanNode(),
-                            createOpenReferenceLogNode(),
-                        ]
-                    }
-                } else {
-                    return [createSsoSignIn(), createLearnMore()]
-                }
-            } else {
-                return [createSsoSignIn(), createLearnMore()]
-            }
-        }
-    }
-
-    public updateShowFreeTierLimitReachedNode(show: boolean) {
-        this._showFreeTierLimitReachedNode = show
-    }
-}
-
-export const codewhispererNode = new CodeWhispererNode()
-export const refreshCodeWhisperer = Commands.register('aws.codeWhisperer.refresh', (showFreeTierLimitNode = false) => {
-    codewhispererNode.updateShowFreeTierLimitReachedNode(showFreeTierLimitNode)
-    codewhispererNode.refresh()
-})
-
-export const refreshCodeWhispererRootNode = Commands.register('aws.codeWhisperer.refreshRootNode', () => {
-    codewhispererNode.refreshRootNode()
-})
diff --git a/src/codewhisperer/models/constants.ts b/src/codewhisperer/models/constants.ts
deleted file mode 100644
index f2f0315ae0b..00000000000
--- a/src/codewhisperer/models/constants.ts
+++ /dev/null
@@ -1,265 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * SDK Client
- */
-
-export const endpoint = 'https://codewhisperer.us-east-1.amazonaws.com/'
-
-export const region = 'us-east-1'
-
-/**
- * Automated and manual trigger
- */
-export const invocationTimeIntervalThreshold = 2 // seconds
-
-export const promiseTimeoutLimit = 15 // seconds
-
-export const invocationKeyThreshold = 15
-
-export const idleTimerPollPeriod = 25 // milliseconds
-
-export const showRecommendationTimerPollPeriod = 25
-
-export const specialCharactersList = ['{', '[', '(', ':', '\t', '\n']
-
-export const normalTextChangeRegex = /[A-Za-z0-9]/g
-
-export const autoSuggestionConfig = {
-    settingId: 'codewhisperer_autoSuggestionActivation',
-    activated: 'Activated',
-    deactivated: 'Deactivated',
-}
-
-/**
- * EditorCon context
- */
-export const charactersLimit = 10240
-
-export const filenameCharsLimit = 1024
-
-export const naturalLanguage = 'en-US'
-
-export const maxRecommendations = 1
-
-export const space = ' '
-
-export const lineBreak = '\n'
-
-export const lineBreakWin = '\r\n'
-
-/**
- * Ux of recommendations
- */
-export const labelLength = 20
-
-export const completionDetail = 'CodeWhisperer'
-
-/**
- * CodeWhisperer in configuration
- */
-export const codewhisperer = 'CodeWhisperer'
-
-/**
- * Supported languages
- */
-export const java = 'java'
-
-export const python = 'python'
-
-export const javascript = 'javascript'
-
-export const typescript = 'typescript'
-
-export const plaintext = 'plaintext'
-
-// use vscode languageId here
-export const supportedLanguages = [
-    'java',
-    'python',
-    'javascript',
-    'javascriptreact',
-    'typescript',
-    'typescriptreact',
-    'csharp',
-] as const
-
-export type SupportedLanguage = typeof supportedLanguages[number]
-
-/**
- * Prompt
- */
-export const pendingResponse = 'Waiting for CodeWhisperer...'
-
-export const runningSecurityScan = 'Running security scan...'
-
-export const noSuggestions = 'No suggestions from CodeWhisperer'
-
-export const licenseFilter = 'CodeWhisperer suggestions were filtered due to reference setting'
-
-/**
- * Beta landing page file
- */
-export const welcomeCodeWhispererReadmeFileSource = 'resources/markdown/WelcomeToCodeWhisperer.md'
-
-export const welcomeCodeWhispererCloud9Readme = 'resources/markdown/WelcomeToCodeWhispererCloud9.md'
-
-export const welcomeMessageKey = 'CODEWHISPERER_WELCOME_MESSAGE'
-
-/**
- * Key bindings JSON file path
- */
-export const keyBindingPathMac = 'Library/Application Support/Code/User/keybindings.json'
-
-export const keyBindingPathLinux = '.config/Code/User/keybindings.json'
-
-export const keyBindingPathWin = 'Code/User/keybindings.json'
-
-/**
- * Length of left context preview in output channel
- */
-export const contextPreviewLen = 20
-
-/**
- * Unsupported language cache
- */
-export const unsupportedLanguagesCacheTTL = 10 * 60 * 60 * 1000
-
-export const unsupportedLanguagesKey = 'CODEWHISPERER_UNSUPPORTED_LANGUAGES_KEY'
-
-export const autoTriggerEnabledKey = 'CODEWHISPERER_AUTO_TRIGGER_ENABLED'
-
-export const termsAcceptedKey = 'CODEWHISPERER_TERMS_ACCEPTED'
-
-export const serviceActiveKey = 'CODEWHISPERER_SERVICE_ACTIVE'
-
-export const accessToken = 'CODEWHISPERER_ACCESS_TOKEN'
-
-export const learnMoreUriGeneral = 'https://aws.amazon.com/codewhisperer/'
-
-export const learnMoreUri = 'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/codewhisperer.html'
-
-export const accessTokenMigrationLearnMoreUri =
-    'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/codewhisperer-auth.html'
-
-export const identityPoolID = 'us-east-1:70717e99-906f-4add-908c-bd9074a2f5b9'
-
-/**
- * the interval of the background thread invocation, which is triggered by the timer
- */
-export const defaultCheckPeriodMillis = 1000 * 60 * 5
-
-// suggestion show delay, in milliseconds
-export const suggestionShowDelay = 250
-
-// add 200ms more delay on top of inline default 30-50ms
-export const inlineSuggestionShowDelay = 200
-
-export const referenceLog = 'CodeWhisperer Reference Log'
-
-export const suggestionDetailReferenceText = (licenses: string) =>
-    `Reference code under ${licenses}. View full details in CodeWhisperer reference log.`
-
-export const hoverInlayText = (licenseName: string | undefined, repository: string | undefined) =>
-    `Reference code under the ${licenseName} license from repository ${repository}`
-
-export const referenceLogText = (
-    code: string,
-    license: string,
-    repository: string,
-    filePath: string,
-    lineInfo: string
-) =>
-    `with code ${code} provided with reference under ${license} from repository ${repository}. Added to ${filePath} ${lineInfo}.`
-
-export const referenceLogPromptText = `Don\'t want suggestions that include code with references? Uncheck this option in 
-    <a href="#" onclick="openSettings();return false;">CodeWhisperer Settings</a>`
-
-export const referenceLogPromptTextEnterpriseSSO =
-    'Your organization controls whether suggestions include code with references. To update these settings, please contact your admin.'
-/**
- * Security Scan
- */
-export const codeScanJavaPayloadSizeLimitBytes = Math.pow(2, 20) // 1 MB
-
-export const codeScanPythonPayloadSizeLimitBytes = 200 * Math.pow(2, 10) // 200 KB
-
-export const codeScanJavascriptPayloadSizeLimitBytes = 200 * Math.pow(2, 10) // 200 KB
-
-export const codeScanTruncDirPrefix = 'codewhisperer_scan'
-
-export const codeScanZipExt = '.zip'
-
-export const contextTruncationTimeoutSeconds = 10
-
-export const codeScanJobTimeoutSeconds = 50
-
-export const projectSizeCalculateTimeoutSeconds = 10
-
-export const codeScanJobPollingIntervalSeconds = 5
-
-export const artifactTypeSource = 'SourceCode'
-
-export const artifactTypeBuild = 'BuiltJars'
-
-export const codeScanFindingsSchema = 'codescan/findings/1.0'
-
-// wait time for editor to update editor.selection.active (in milliseconds)
-export const vsCodeCursorUpdateDelay = 3
-
-export const reloadWindow = 'Reload Now'
-
-export const reloadWindowPrompt =
-    'Inline suggestion settings changed. The current window needs to be reloaded for CodeWhisperer to use these changes.'
-
-export const ssoConfigAlertMessage = `This setting is controlled by your organization\’s admin and has been reset to the value they\’ve specified.`
-
-export const settingsLearnMore = 'Learn More about CodeWhisperer Settings'
-
-export const accessTokenCutOffDate = new Date(2023, 0, 31)
-
-export const accessTokenMigrationWarningMessage = `To continue using CodeWhisperer, you must add an AWS Builder ID or AWS IAM Identity Center connection by January 31, 2023.`
-
-export const accessTokenMigrationErrorMessage = `Your Preview Access Code has expired. To continue using CodeWhisperer, connect with AWS Builder ID or AWS IAM Identity center.`
-
-export const accessTokenMigrationWarningButtonMessage = `Connect with AWS to Continue`
-
-export const accessTokenMigrationErrorButtonMessage = `Connect with AWS`
-
-export const connectWithAWSBuilderId = `Connect with AWS`
-
-export const freeTierLimitReached =
-    'Free tier limit for Amazon CodeWhisperer has been met. Features will be disabled until next billing cycle begins.'
-
-export const throttlingLearnMore = `Learn More`
-
-export const throttlingMessage = `Maximum recommendation count reached for this month`
-
-export const connectionChangeMessage = `Keep using CodeWhisperer with `
-
-export const failedToConnectAwsBuilderId = `Failed to connect to AWS Builder ID`
-
-export const failedToConnectIamIdentityCenter = `Failed to connect to IAM Identity Center`
-
-export const connectionExpired = `AWS Toolkit: Connection expired. Reauthenticate to continue.`
-
-export const accessTokenMigrationLearnMore = `Learn More`
-
-export const accessTokenMigrationDoNotShowAgain = `Don\'t Show Again`
-
-export const accessTokenMigrationDoNotShowAgainKey = 'CODEWHISPERER_ACCESS_TOKEN_MIGRATION_DO_NOT_SHOW_AGAIN'
-
-export const accessTokenExpiredDoNotShowAgainKey = 'CODEWHISPERER_ACCESS_TOKEN_EXPIRED_DO_NOT_SHOW_AGAIN'
-
-export const accessTokenExpriedKey = 'CODEWHISPERER_ACCESS_TOKEN_EXPIRED'
-
-export const accessTokenMigrationDoNotShowLastShown =
-    'CODEWHISPERER_ACCESS_TOKEN_MIGRATION_DO_NOT_SHOW_AGAIN_LAST_SHOWN_TIME'
-
-export const accessTokenExpiredDoNotShowLastShown =
-    'CODEWHISPERER_ACCESS_TOKEN_EXPIRED_DO_NOT_SHOW_AGAIN_LAST_SHOWN_TIME'
-
-export const accessTokenMigrationDoNotShowAgainInfo = `You will not receive this notification again. If you would like to continue using CodeWhisperer after January 31, 2023, you can still connect with AWS. [Learn More](https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/codewhisper-setup-general.html).`
diff --git a/src/codewhisperer/models/model.ts b/src/codewhisperer/models/model.ts
deleted file mode 100644
index 38426c1bdea..00000000000
--- a/src/codewhisperer/models/model.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import * as vscode from 'vscode'
-import {
-    CodewhispererCompletionType,
-    CodewhispererLanguage,
-    CodewhispererTriggerType,
-    Result,
-} from '../../shared/telemetry/telemetry'
-import { References } from '../client/codewhisperer'
-
-// unavoidable global variables
-interface VsCodeState {
-    /**
-     * Flag indicates intelli sense pop up is active or not
-     * Adding this since VS Code intelliSense API does not expose this variable
-     */
-    isIntelliSenseActive: boolean
-    /**
-     * Flag indicates whether codewhisperer is doing vscode.TextEditor.edit
-     */
-    isCodeWhispererEditing: boolean
-    /**
-     * Timestamp of previous user edit
-     */
-    lastUserModificationTime: number
-}
-
-export const vsCodeState: VsCodeState = {
-    isIntelliSenseActive: false,
-    isCodeWhispererEditing: false,
-    lastUserModificationTime: 0,
-}
-
-export interface AcceptedSuggestionEntry {
-    readonly time: Date
-    readonly fileUrl: vscode.Uri
-    readonly originalString: string
-    readonly startPosition: vscode.Position
-    readonly endPosition: vscode.Position
-    readonly requestId: string
-    readonly sessionId: string
-    readonly index: number
-    readonly triggerType: CodewhispererTriggerType
-    readonly completionType: CodewhispererCompletionType
-    readonly language: CodewhispererLanguage
-}
-
-export interface OnRecommendationAcceptanceEntry {
-    readonly editor: vscode.TextEditor | undefined
-    readonly range: vscode.Range
-    readonly acceptIndex: number
-    readonly recommendation: string
-    readonly requestId: string
-    readonly sessionId: string
-    readonly triggerType: CodewhispererTriggerType
-    readonly completionType: CodewhispererCompletionType
-    readonly language: CodewhispererLanguage
-    readonly references: References | undefined
-}
-
-export interface ConfigurationEntry {
-    readonly isShowMethodsEnabled: boolean
-    readonly isManualTriggerEnabled: boolean
-    readonly isAutomatedTriggerEnabled: boolean
-    readonly isSuggestionsWithCodeReferencesEnabled: boolean
-}
-
-export interface InlineCompletionItem {
-    content: string
-    index: number
-}
-
-/**
- * Security Scan Interfaces
- */
-
-export interface CodeScanState {
-    running: boolean
-}
-
-export const codeScanState: CodeScanState = {
-    running: false,
-}
-
-export interface CodeScanTelemetryEntry {
-    codewhispererCodeScanJobId?: string
-    codewhispererLanguage: CodewhispererLanguage
-    codewhispererCodeScanProjectBytes?: number
-    codewhispererCodeScanSrcPayloadBytes: number
-    codewhispererCodeScanBuildPayloadBytes?: number
-    codewhispererCodeScanSrcZipFileBytes: number
-    codewhispererCodeScanBuildZipFileBytes?: number
-    codewhispererCodeScanLines: number
-    duration: number
-    contextTruncationDuration: number
-    artifactsUploadDuration: number
-    codeScanServiceInvocationsDuration: number
-    result: Result
-    reason?: string
-    codewhispererCodeScanTotalIssues: number
-    credentialStartUrl: string | undefined
-}
-
-export interface RawCodeScanIssue {
-    filePath: string
-    startLine: number
-    endLine: number
-    title: string
-    description: {
-        text: string
-        markdown: string
-    }
-}
-
-export interface CodeScanIssue {
-    startLine: number
-    endLine: number
-    comment: string
-}
-
-export interface AggregatedCodeScanIssue {
-    filePath: string
-    issues: CodeScanIssue[]
-}
-
-export interface SecurityPanelItem {
-    path: string
-    range: vscode.Range
-    severity: vscode.DiagnosticSeverity
-    message: string
-    issue: CodeScanIssue
-    decoration: vscode.DecorationOptions
-}
-
-export interface SecurityPanelSet {
-    path: string
-    uri: vscode.Uri
-    items: SecurityPanelItem[]
-}
-
-export enum Cloud9AccessState {
-    NoAccess,
-    RequestedAccess,
-    HasAccess,
-}
diff --git a/src/codewhisperer/service/completionProvider.ts b/src/codewhisperer/service/completionProvider.ts
deleted file mode 100644
index 7db2bb536db..00000000000
--- a/src/codewhisperer/service/completionProvider.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as CodeWhispererConstants from '../models/constants'
-import { runtimeLanguageContext } from '../util/runtimeLanguageContext'
-import { Recommendation } from '../client/codewhisperer'
-import { LicenseUtil } from '../util/licenseUtil'
-import { TelemetryHelper } from '../util/telemetryHelper'
-import { RecommendationHandler } from './recommendationHandler'
-/**
- * completion provider for intelliSense popup
- */
-export function getCompletionItems(document: vscode.TextDocument, position: vscode.Position) {
-    const completionItems: vscode.CompletionItem[] = []
-    RecommendationHandler.instance.recommendations.forEach((recommendation, index) => {
-        completionItems.push(getCompletionItem(document, position, recommendation, index))
-        RecommendationHandler.instance.setSuggestionState(index, 'Showed')
-    })
-    return completionItems
-}
-
-export function getCompletionItem(
-    document: vscode.TextDocument,
-    position: vscode.Position,
-    recommendationDetail: Recommendation,
-    recommendationIndex: number
-) {
-    const start = RecommendationHandler.instance.startPos
-    const range = new vscode.Range(start, start)
-    const recommendation = recommendationDetail.content
-    const completionItem = new vscode.CompletionItem(recommendation)
-    completionItem.insertText = new vscode.SnippetString(recommendation)
-    completionItem.documentation = new vscode.MarkdownString().appendCodeblock(recommendation, document.languageId)
-    completionItem.kind = vscode.CompletionItemKind.Method
-    completionItem.detail = CodeWhispererConstants.completionDetail
-    completionItem.keepWhitespace = true
-    completionItem.label = getLabel(recommendation)
-    completionItem.preselect = true
-    completionItem.sortText = String(recommendationIndex + 1).padStart(10, '0')
-    completionItem.range = new vscode.Range(start, position)
-    const languageContext = runtimeLanguageContext.getLanguageContext(document.languageId)
-    let references = undefined
-    if (recommendationDetail.references != undefined && recommendationDetail.references.length > 0) {
-        references = recommendationDetail.references
-        const licenses = [
-            ...new Set(references.map(r => `[${r.licenseName}](${LicenseUtil.getLicenseHtml(r.licenseName)})`)),
-        ].join(', ')
-        completionItem.documentation.appendMarkdown(CodeWhispererConstants.suggestionDetailReferenceText(licenses))
-    }
-    completionItem.command = {
-        command: 'aws.codeWhisperer.accept',
-        title: 'On acceptance',
-        arguments: [
-            range,
-            recommendationIndex,
-            recommendation,
-            RecommendationHandler.instance.requestId,
-            RecommendationHandler.instance.sessionId,
-            TelemetryHelper.instance.triggerType,
-            TelemetryHelper.instance.completionType,
-            languageContext.language,
-            references,
-        ],
-    }
-    return completionItem
-}
-
-export function getLabel(recommendation: string): string {
-    return recommendation.slice(0, CodeWhispererConstants.labelLength) + '..'
-}
diff --git a/src/codewhisperer/service/diagnosticsProvider.ts b/src/codewhisperer/service/diagnosticsProvider.ts
deleted file mode 100644
index 6728ba04526..00000000000
--- a/src/codewhisperer/service/diagnosticsProvider.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { CodeScanIssue, AggregatedCodeScanIssue } from '../models/model'
-
-interface SecurityScanRender {
-    securityDiagnosticCollection: vscode.DiagnosticCollection | undefined
-    initialized: boolean
-}
-
-export const securityScanRender: SecurityScanRender = {
-    securityDiagnosticCollection: undefined,
-    initialized: false,
-}
-
-export function initSecurityScanRender(
-    securityRecommendationList: AggregatedCodeScanIssue[],
-    context: vscode.ExtensionContext
-) {
-    securityScanRender.initialized = false
-    securityScanRender.securityDiagnosticCollection?.clear()
-    securityRecommendationList.forEach(securityRecommendation => {
-        updateSecurityDiagnosticCollection(securityRecommendation)
-    })
-    securityScanRender.initialized = true
-}
-
-export function updateSecurityDiagnosticCollection(securityRecommendation: AggregatedCodeScanIssue) {
-    const filePath = securityRecommendation.filePath
-    const uri = vscode.Uri.file(filePath)
-    const securityDiagnosticCollection = createSecurityDiagnosticCollection()
-    const securityDiagnostics: vscode.Diagnostic[] = vscode.languages.getDiagnostics(uri)
-    securityRecommendation.issues.forEach(securityIssue => {
-        securityDiagnostics.push(createSecurityDiagnostic(securityIssue))
-    })
-    securityDiagnosticCollection.set(uri, securityDiagnostics)
-}
-
-export function createSecurityDiagnostic(securityIssue: CodeScanIssue) {
-    const range = new vscode.Range(securityIssue.startLine, 0, securityIssue.endLine, 0)
-    const securityDiagnostic: vscode.Diagnostic = new vscode.Diagnostic(
-        range,
-        securityIssue.comment,
-        vscode.DiagnosticSeverity.Warning
-    )
-    securityDiagnostic.source = 'Detected by CodeWhisperer '
-    return securityDiagnostic
-}
-
-export function createSecurityDiagnosticCollection() {
-    if (securityScanRender.securityDiagnosticCollection === undefined) {
-        securityScanRender.securityDiagnosticCollection =
-            vscode.languages.createDiagnosticCollection('CodeWhisperer Security Scan')
-    }
-    return securityScanRender.securityDiagnosticCollection
-}
-
-export function disposeSecurityDiagnostic(event: vscode.TextDocumentChangeEvent) {
-    const uri = event.document.uri
-    if (!securityScanRender.initialized || !securityScanRender.securityDiagnosticCollection?.has(uri)) {
-        return
-    }
-    const currentSecurityDiagnostics = securityScanRender.securityDiagnosticCollection?.get(uri)
-    const newSecurityDiagnostics: vscode.Diagnostic[] = []
-    const changedRange = event.contentChanges[0].range
-    const changedText = event.contentChanges[0].text
-    const lineOffset = getLineOffset(changedRange, changedText)
-
-    currentSecurityDiagnostics?.forEach(issue => {
-        const intersection = changedRange.intersection(issue.range)
-        if (
-            issue.severity === vscode.DiagnosticSeverity.Warning &&
-            intersection &&
-            (/\S/.test(changedText) || changedText === '')
-        ) {
-            issue.severity = vscode.DiagnosticSeverity.Information
-            issue.message = 'Re-scan to validate the fix: ' + issue.message
-            issue.range = new vscode.Range(intersection.start, intersection.start)
-        } else if (issue.range.start.line >= changedRange.end.line) {
-            issue.range = new vscode.Range(
-                issue.range.start.line + lineOffset,
-                issue.range.start.character,
-                issue.range.end.line + lineOffset,
-                issue.range.end.character
-            )
-        }
-        newSecurityDiagnostics.push(issue)
-    })
-    securityScanRender.securityDiagnosticCollection?.set(uri, newSecurityDiagnostics)
-}
-
-function getLineOffset(range: vscode.Range, text: string) {
-    const originLines = range.end.line - range.start.line + 1
-    const changedLines = text.split('\n').length
-    return changedLines - originLines
-}
diff --git a/src/codewhisperer/service/inlineCompletion.ts b/src/codewhisperer/service/inlineCompletion.ts
deleted file mode 100644
index d7dbc1a3569..00000000000
--- a/src/codewhisperer/service/inlineCompletion.ts
+++ /dev/null
@@ -1,515 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { ConfigurationEntry, vsCodeState } from '../models/model'
-import * as CodeWhispererConstants from '../models/constants'
-import { runtimeLanguageContext } from '../util/runtimeLanguageContext'
-import { TelemetryHelper } from '../util/telemetryHelper'
-import { ReferenceInlineProvider } from './referenceInlineProvider'
-import { DefaultCodeWhispererClient, Recommendation } from '../client/codewhisperer'
-import { RecommendationHandler } from './recommendationHandler'
-import { showTimedMessage } from '../../shared/utilities/messages'
-import { getLogger } from '../../shared/logger/logger'
-import globals from '../../shared/extensionGlobals'
-import {
-    telemetry,
-    CodewhispererAutomatedTriggerType,
-    CodewhispererTriggerType,
-} from '../../shared/telemetry/telemetry'
-
-const performance = globalThis.performance ?? require('perf_hooks').performance
-
-interface InlineCompletionItem {
-    content: string
-    index: number
-}
-
-/**
- * This class is for TextEditor.edit based inline completion
- */
-export class InlineCompletion {
-    private _range!: vscode.Range
-    private dimDecoration = vscode.window.createTextEditorDecorationType(<vscode.DecorationRenderOptions>{
-        textDecoration: `none; opacity: ${50 / 100}`,
-        light: {
-            color: '#013220',
-        },
-        dark: {
-            color: '#DDDDDD',
-        },
-    })
-    private _maxPage = 100
-    private _pollPeriod = 25
-    public items: InlineCompletionItem[]
-    public origin: Recommendation[]
-    public position: number
-    private typeAhead: string
-    private codewhispererStatusBar: vscode.StatusBarItem
-    public isTypeaheadInProgress: boolean
-    private _timer?: NodeJS.Timer
-    private documentUri: vscode.Uri | undefined
-    /**
-     * Set whenever a document has active inline recommendations
-     */
-    private isInlineActive = false
-
-    constructor() {
-        this.items = []
-        this.origin = []
-        this.position = 0
-        this.typeAhead = ''
-        this.codewhispererStatusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 1)
-        this.isTypeaheadInProgress = false
-        this.documentUri = undefined
-    }
-
-    static #instance: InlineCompletion
-
-    public static get instance() {
-        return (this.#instance ??= new this())
-    }
-
-    async resetInlineStates(editor: vscode.TextEditor) {
-        this.items = []
-        this.origin = []
-        this.position = 0
-        this.typeAhead = ''
-        await vscode.commands.executeCommand('setContext', CodeWhispererConstants.serviceActiveKey, false)
-        this.isInlineActive = false
-        editor.setDecorations(this.dimDecoration, [])
-        this.setCodeWhispererStatusBarOk()
-        this.documentUri = vscode.Uri.file('')
-    }
-
-    setRange(range: vscode.Range) {
-        this._range = range
-    }
-
-    getCompletionItems() {
-        const completionItems: Recommendation[] = []
-        RecommendationHandler.instance.recommendations.forEach(r => {
-            if (r.content.length > 0) {
-                completionItems.push(r)
-            }
-        })
-        return completionItems
-    }
-
-    async acceptRecommendation(editor: vscode.TextEditor) {
-        if (vsCodeState.isCodeWhispererEditing) {
-            return
-        }
-        vsCodeState.isCodeWhispererEditing = true
-        await editor
-            ?.edit(
-                builder => {
-                    builder.replace(this._range, this.items[this.position].content)
-                },
-                { undoStopAfter: false, undoStopBefore: false }
-            )
-            .then(async () => {
-                const languageContext = runtimeLanguageContext.getLanguageContext(editor.document.languageId)
-                const index = this.items[this.position].index
-                const acceptArguments = [
-                    this._range,
-                    this.position,
-                    this.origin[index].content,
-                    RecommendationHandler.instance.requestId,
-                    RecommendationHandler.instance.sessionId,
-                    TelemetryHelper.instance.triggerType,
-                    TelemetryHelper.instance.completionType,
-                    languageContext.language,
-                    this.origin[index].references,
-                ] as const
-                vsCodeState.isCodeWhispererEditing = false
-                ReferenceInlineProvider.instance.removeInlineReference()
-                await vscode.commands.executeCommand('aws.codeWhisperer.accept', ...acceptArguments)
-                await this.resetInlineStates(editor)
-            })
-    }
-    async resetRejectStates(editor: vscode.TextEditor) {
-        vsCodeState.isCodeWhispererEditing = false
-        await this.resetInlineStates(editor)
-
-        RecommendationHandler.instance.cancelPaginatedRequest()
-        // report all recommendation as rejected
-        RecommendationHandler.instance.reportUserDecisionOfRecommendation(editor, -1)
-    }
-
-    async rejectRecommendation(
-        editor: vscode.TextEditor | undefined,
-        isTypeAheadRejection: boolean = false,
-        onDidChangeVisibleTextEditors: boolean = false
-    ) {
-        if (!editor || vsCodeState.isCodeWhispererEditing) {
-            return
-        }
-        if (!isTypeAheadRejection && this.items.length === 0) {
-            return
-        }
-        vsCodeState.isCodeWhispererEditing = true
-        ReferenceInlineProvider.instance.removeInlineReference()
-        if (onDidChangeVisibleTextEditors && this.documentUri && this.documentUri.fsPath.length > 0) {
-            const workEdits = new vscode.WorkspaceEdit()
-            workEdits.set(this.documentUri, [vscode.TextEdit.delete(this._range)])
-            try {
-                await vscode.workspace.applyEdit(workEdits)
-            } finally {
-                await this.resetRejectStates(editor)
-            }
-        } else {
-            await editor
-                ?.edit(
-                    builder => {
-                        builder.delete(this._range)
-                    },
-                    { undoStopAfter: false, undoStopBefore: false }
-                )
-                .then(async () => {
-                    await this.resetRejectStates(editor)
-                })
-        }
-    }
-    // get the typeahead since user invocation position
-    // ignore leading white spaces and TAB
-    getTypedPrefix(editor: vscode.TextEditor): string {
-        const typedPrefix = editor.document.getText(
-            new vscode.Range(
-                RecommendationHandler.instance.startPos.line,
-                RecommendationHandler.instance.startPos.character,
-                editor.selection.active.line,
-                editor.selection.active.character
-            )
-        )
-        let move = 0
-        // when inline is not active, user input space and \t won't be considered as typeahead
-        if (!this.isInlineActive) {
-            for (let i = 0; i < typedPrefix.length; i++) {
-                if (typedPrefix[i] === ' ' || typedPrefix[i] === '\t') {
-                    move++
-                } else {
-                    break
-                }
-            }
-            RecommendationHandler.instance.startPos = new vscode.Position(
-                RecommendationHandler.instance.startPos.line,
-                RecommendationHandler.instance.startPos.character + move
-            )
-        }
-
-        return typedPrefix.substring(move).replace(/\r\n/g, '\n')
-    }
-
-    async setTypeAheadRecommendations(editor: vscode.TextEditor | undefined, event: vscode.TextDocumentChangeEvent) {
-        if (!editor || this.origin.length === 0) {
-            this.isTypeaheadInProgress = false
-            return
-        }
-        // run typeahead logic only when user typed something after the invocation start position
-        if (editor.selection.active.isAfter(RecommendationHandler.instance.startPos)) {
-            const typedPrefix = this.getTypedPrefix(editor)
-            this.items = []
-            this.origin.forEach((item, index) => {
-                if (item.content.startsWith(typedPrefix)) {
-                    this.items.push({ content: item.content.substring(typedPrefix.length), index: index })
-                }
-            })
-            const currentPosition = new vscode.Position(editor.selection.active.line, editor.selection.active.character)
-            let endPosition = new vscode.Position(this._range.end.line, this._range.end.character + 1)
-            // if user input a newline, end line number of recommendation will change.
-            const textChange = event.contentChanges[0].text
-            if (
-                textChange.startsWith(CodeWhispererConstants.lineBreak) ||
-                textChange.startsWith(CodeWhispererConstants.lineBreakWin)
-            ) {
-                endPosition = new vscode.Position(this._range.end.line + 1, this._range.end.character + 1)
-            }
-            this.setRange(new vscode.Range(currentPosition, endPosition))
-            if (this.items.length) {
-                this.isTypeaheadInProgress = true
-                this.position = 0
-                this.typeAhead = typedPrefix
-                await this.showRecommendation(editor)
-            } else {
-                this.isTypeaheadInProgress = false
-                await this.rejectRecommendation(editor, true)
-            }
-        }
-    }
-
-    async showRecommendation(editor: vscode.TextEditor) {
-        vsCodeState.isCodeWhispererEditing = true
-        await editor
-            ?.edit(
-                builder => {
-                    builder.delete(this._range)
-                },
-                { undoStopAfter: false, undoStopBefore: false }
-            )
-            .then(async () => {
-                if (this.items?.length > 0) {
-                    await editor
-                        ?.edit(
-                            builder => {
-                                builder.insert(this._range.start, this.items[this.position].content)
-                            },
-                            { undoStopAfter: false, undoStopBefore: false }
-                        )
-                        .then(async () => {
-                            const pos = new vscode.Position(
-                                editor.selection.active.line,
-                                editor.selection.active.character + 1
-                            )
-                            /*
-                             * When typeAhead is involved we set the position of character with one more character to net let
-                             * last bracket of recommendation to be removed
-                             */
-                            if (this.isTypeaheadInProgress) {
-                                this.setRange(new vscode.Range(this._range.start, pos))
-                            } else {
-                                this.setRange(new vscode.Range(this._range.start, editor.selection.active))
-                            }
-                            editor.setDecorations(this.dimDecoration, [this._range])
-                            // cursor position
-                            const position = editor.selection.active
-                            const newPosition = position.with(this._range.start.line, this._range.start.character)
-                            // set Position
-                            const newSelection = new vscode.Selection(newPosition, newPosition)
-                            editor.selection = newSelection
-
-                            await vscode.commands.executeCommand(
-                                'setContext',
-                                CodeWhispererConstants.serviceActiveKey,
-                                true
-                            )
-                            this.isInlineActive = true
-                            const curItem = this.items[this.position]
-                            ReferenceInlineProvider.instance.setInlineReference(
-                                RecommendationHandler.instance.startPos.line,
-                                curItem.content,
-                                this.origin[curItem.index].references
-                            )
-                            RecommendationHandler.instance.setSuggestionState(curItem.index, 'Showed')
-                        })
-                }
-            })
-        vsCodeState.isCodeWhispererEditing = false
-    }
-
-    async navigateRecommendation(editor: vscode.TextEditor, next: boolean) {
-        if (!this.items?.length || this.items.length === 1 || vsCodeState.isCodeWhispererEditing || !editor) {
-            return
-        }
-        vsCodeState.isCodeWhispererEditing = true
-        if (next) {
-            if (this.position === this.items.length - 1) {
-                vsCodeState.isCodeWhispererEditing = false
-                return
-            }
-            this.position = Math.min(this.position + 1, this.items.length)
-        } else {
-            this.position = this.position - 1
-            if (this.position < 0) {
-                this.position = 0
-                vsCodeState.isCodeWhispererEditing = false
-                return
-            }
-        }
-        this.setRange(new vscode.Range(editor.selection.active, this._range.end))
-        await this.showRecommendation(editor)
-    }
-
-    async getPaginatedRecommendation(
-        client: DefaultCodeWhispererClient,
-        editor: vscode.TextEditor,
-        triggerType: CodewhispererTriggerType,
-        config: ConfigurationEntry,
-        autoTriggerType?: CodewhispererAutomatedTriggerType
-    ) {
-        RecommendationHandler.instance.reportUserDecisionOfRecommendation(editor, -1)
-        RecommendationHandler.instance.clearRecommendations()
-        this.setCodeWhispererStatusBarLoading()
-        const isManualTrigger = triggerType === 'OnDemand'
-        this.startShowRecommendationTimer(
-            isManualTrigger,
-            CodeWhispererConstants.suggestionShowDelay,
-            this._pollPeriod,
-            editor
-        )
-        let page = 0
-        RecommendationHandler.instance.checkAndResetCancellationTokens()
-        this.documentUri = editor.document.uri
-        try {
-            while (page < this._maxPage) {
-                await RecommendationHandler.instance.getRecommendations(
-                    client,
-                    editor,
-                    triggerType,
-                    config,
-                    autoTriggerType,
-                    true,
-                    page
-                )
-                this.setCompletionItems(editor)
-                if (RecommendationHandler.instance.checkAndResetCancellationTokens()) {
-                    RecommendationHandler.instance.reportUserDecisionOfRecommendation(editor, -1)
-                    RecommendationHandler.instance.clearRecommendations()
-                    break
-                }
-                if (!RecommendationHandler.instance.hasNextToken()) {
-                    break
-                }
-                page++
-            }
-        } catch (error) {
-            getLogger().error(`Error ${error} in getPaginatedRecommendation`)
-        }
-        this.setCodeWhispererStatusBarOk()
-    }
-    /*
-     * This startShowRecommendationTimer function is to enforce CodeWhisperer to only show recommendation
-     * after a delay since user last keystroke input
-     */
-    private async startShowRecommendationTimer(
-        isManualTrigger: boolean,
-        showSuggestionDelay: number,
-        pollPeriod: number,
-        editor: vscode.TextEditor
-    ): Promise<void> {
-        if (this._timer !== undefined) {
-            return
-        }
-        this._timer = globals.clock.setTimeout(async () => {
-            const delay = performance.now() - vsCodeState.lastUserModificationTime
-            if (delay < showSuggestionDelay) {
-                this._timer?.refresh()
-            } else {
-                // do not show recommendation if cursor is before invocation position or user opened another document
-                // mark suggestions as Discard and cancel paginated request
-                if (
-                    editor.selection.active.isBefore(RecommendationHandler.instance.startPos) ||
-                    editor.document.uri.fsPath !== this.documentUri?.fsPath
-                ) {
-                    RecommendationHandler.instance.cancelPaginatedRequest()
-                    RecommendationHandler.instance.recommendations.forEach((r, i) => {
-                        RecommendationHandler.instance.setSuggestionState(i, 'Discard')
-                    })
-                    RecommendationHandler.instance.reportUserDecisionOfRecommendation(editor, -1)
-                    RecommendationHandler.instance.clearRecommendations()
-                    if (this._timer !== undefined) {
-                        clearTimeout(this._timer)
-                        this._timer = undefined
-                    }
-                    return
-                }
-                this.setCompletionItems(editor)
-                if (this.items.length > 0) {
-                    this.setRange(new vscode.Range(editor.selection.active, editor.selection.active))
-                    try {
-                        await this.showRecommendation(editor)
-                        const languageContext = runtimeLanguageContext.getLanguageContext(editor.document.languageId)
-                        telemetry.codewhisperer_perceivedLatency.emit({
-                            codewhispererRequestId: RecommendationHandler.instance.requestId,
-                            codewhispererSessionId: RecommendationHandler.instance.sessionId,
-                            codewhispererTriggerType: TelemetryHelper.instance.triggerType,
-                            codewhispererCompletionType: TelemetryHelper.instance.completionType,
-                            codewhispererLanguage: languageContext.language,
-                            duration: performance.now() - RecommendationHandler.instance.lastInvocationTime,
-                            passive: true,
-                            credentialStartUrl: TelemetryHelper.instance.startUrl,
-                        })
-                    } catch (error) {
-                        getLogger().error(`Failed to show suggestion ${error}`)
-                        RecommendationHandler.instance.cancelPaginatedRequest()
-                        RecommendationHandler.instance.recommendations.forEach((r, i) => {
-                            RecommendationHandler.instance.setSuggestionState(i, 'Discard')
-                        })
-                        RecommendationHandler.instance.reportUserDecisionOfRecommendation(editor, -1)
-                        RecommendationHandler.instance.clearRecommendations()
-                    }
-                    if (this._timer !== undefined) {
-                        clearTimeout(this._timer)
-                        this._timer = undefined
-                    }
-                } else {
-                    if (this.isPaginationRunning()) {
-                        this._timer?.refresh()
-                    } else {
-                        if (this._timer !== undefined) {
-                            clearTimeout(this._timer)
-                            this._timer = undefined
-                            if (isManualTrigger && RecommendationHandler.instance.recommendations.length === 0) {
-                                if (RecommendationHandler.instance.errorMessagePrompt !== '') {
-                                    showTimedMessage(RecommendationHandler.instance.errorMessagePrompt, 2000)
-                                } else {
-                                    showTimedMessage(CodeWhispererConstants.noSuggestions, 2000)
-                                }
-                            }
-                            RecommendationHandler.instance.reportUserDecisionOfRecommendation(editor, -1)
-                            RecommendationHandler.instance.clearRecommendations()
-                        }
-                    }
-                }
-            }
-        }, pollPeriod)
-    }
-
-    private setCompletionItems(editor: vscode.TextEditor) {
-        vsCodeState.isCodeWhispererEditing = true
-        this.origin = this.getCompletionItems()
-        this.typeAhead = this.getTypedPrefix(editor)
-        this.setCompletionItemsUnderTypeAhead()
-        vsCodeState.isCodeWhispererEditing = false
-    }
-
-    private setCompletionItemsUnderTypeAhead() {
-        this.items = []
-        if (this.typeAhead.length > 0) {
-            this.origin.forEach((item, index) => {
-                if (
-                    item.content.startsWith(this.typeAhead) &&
-                    RecommendationHandler.instance.getSuggestionState(index) !== 'Filtered'
-                ) {
-                    this.items.push({
-                        content: item.content.substring(this.typeAhead.length),
-                        index: index,
-                    })
-                }
-            })
-        } else {
-            this.origin.forEach((item, index) => {
-                if (RecommendationHandler.instance.getSuggestionState(index) !== 'Filtered') {
-                    this.items.push({
-                        content: item.content,
-                        index: index,
-                    })
-                }
-            })
-        }
-    }
-
-    setCodeWhispererStatusBarLoading() {
-        this.codewhispererStatusBar.text = ` $(loading~spin)CodeWhisperer`
-        this.codewhispererStatusBar.show()
-    }
-
-    setCodeWhispererStatusBarOk() {
-        this.codewhispererStatusBar.text = ` $(check)CodeWhisperer`
-        this.codewhispererStatusBar.show()
-    }
-
-    hideCodeWhispererStatusBar() {
-        this.codewhispererStatusBar.hide()
-    }
-
-    isPaginationRunning() {
-        return this.codewhispererStatusBar.text === ` $(loading~spin)CodeWhisperer`
-    }
-
-    get getIsActive() {
-        return this.isInlineActive
-    }
-}
diff --git a/src/codewhisperer/service/inlineCompletionService.ts b/src/codewhisperer/service/inlineCompletionService.ts
deleted file mode 100644
index 9607cf4d444..00000000000
--- a/src/codewhisperer/service/inlineCompletionService.ts
+++ /dev/null
@@ -1,489 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import * as vscode from 'vscode'
-import { ConfigurationEntry, vsCodeState } from '../models/model'
-import * as CodeWhispererConstants from '../models/constants'
-import { ReferenceInlineProvider } from './referenceInlineProvider'
-import { DefaultCodeWhispererClient, Recommendation } from '../client/codewhisperer'
-import { RecommendationHandler } from './recommendationHandler'
-import {
-    telemetry,
-    CodewhispererAutomatedTriggerType,
-    CodewhispererTriggerType,
-} from '../../shared/telemetry/telemetry'
-import { showTimedMessage } from '../../shared/utilities/messages'
-import { getLogger } from '../../shared/logger/logger'
-import { TelemetryHelper } from '../util/telemetryHelper'
-import { runtimeLanguageContext } from '../util/runtimeLanguageContext'
-import { Commands } from '../../shared/vscode/commands2'
-import { getPrefixSuffixOverlap } from '../util/commonUtil'
-import globals from '../../shared/extensionGlobals'
-import { AuthUtil } from '../util/authUtil'
-import { shared } from '../../shared/utilities/functionUtils'
-
-class CWInlineCompletionItemProvider implements vscode.InlineCompletionItemProvider {
-    private activeItemIndex: number | undefined
-    public nextMove: number
-
-    private _onDidShow: vscode.EventEmitter<void> = new vscode.EventEmitter<void>()
-    public readonly onDidShow: vscode.Event<void> = this._onDidShow.event
-
-    public constructor(itemIndex: number | undefined, firstMove: number) {
-        this.activeItemIndex = itemIndex
-        this.nextMove = firstMove
-    }
-
-    get getActiveItemIndex() {
-        return this.activeItemIndex
-    }
-
-    private getGhostText(prefix: string, suggestion: string): string {
-        const prefixLines = prefix.split(/\r\n|\r|\n/)
-        const n = prefixLines.length
-        if (n <= 1) {
-            return suggestion
-        }
-        let count = 1
-        for (let i = 0; i < suggestion.length; i++) {
-            if (suggestion[i] === '\n') {
-                count++
-            }
-            if (count === n) {
-                return suggestion.slice(i + 1)
-            }
-        }
-        return ''
-    }
-
-    private getGhostTextStartPos(start: vscode.Position, current: vscode.Position): vscode.Position {
-        if (start.line === current.line) {
-            return start
-        }
-        return new vscode.Position(current.line, 0)
-    }
-
-    // iterate suggestions and stop at index 0 or index len - 1
-    private getIteratingIndexes() {
-        const len = RecommendationHandler.instance.recommendations.length
-        const startIndex = this.activeItemIndex ? this.activeItemIndex : 0
-        const index = []
-        if (this.nextMove === 0) {
-            for (let i = 0; i < len; i++) {
-                index.push((startIndex + i) % len)
-            }
-        } else if (this.nextMove === -1) {
-            for (let i = startIndex - 1; i >= 0; i--) {
-                index.push(i)
-            }
-            index.push(startIndex)
-        } else {
-            for (let i = startIndex + 1; i < len; i++) {
-                index.push(i)
-            }
-            index.push(startIndex)
-        }
-        return index
-    }
-
-    truncateOverlapWithRightContext(document: vscode.TextDocument, suggestion: string): string {
-        let rightContextRange: vscode.Range | undefined = undefined
-        const pos = RecommendationHandler.instance.startPos
-        if (suggestion.split(/\r?\n/).length > 1) {
-            rightContextRange = new vscode.Range(pos, document.positionAt(document.offsetAt(pos) + suggestion.length))
-        } else {
-            rightContextRange = new vscode.Range(pos, document.lineAt(pos).range.end)
-        }
-        const rightContext = document.getText(rightContextRange)
-        const overlap = getPrefixSuffixOverlap(suggestion, rightContext)
-        return suggestion.slice(0, suggestion.length - overlap.length)
-    }
-
-    getInlineCompletionItem(
-        document: vscode.TextDocument,
-        r: Recommendation,
-        start: vscode.Position,
-        end: vscode.Position,
-        index: number,
-        prefix: string
-    ): vscode.InlineCompletionItem | undefined {
-        if (!r.content.startsWith(prefix)) {
-            return undefined
-        }
-        const truncatedSuggestion = this.truncateOverlapWithRightContext(document, r.content)
-        if (truncatedSuggestion.length === 0) {
-            if (RecommendationHandler.instance.getSuggestionState(index) !== 'Showed') {
-                RecommendationHandler.instance.setSuggestionState(index, 'Discard')
-            }
-            return undefined
-        }
-        return {
-            insertText: this.getGhostText(prefix, truncatedSuggestion),
-            range: new vscode.Range(this.getGhostTextStartPos(start, end), end),
-            command: {
-                command: 'aws.codeWhisperer.accept',
-                title: 'On acceptance',
-                arguments: [
-                    new vscode.Range(start, end),
-                    index,
-                    truncatedSuggestion,
-                    RecommendationHandler.instance.requestId,
-                    RecommendationHandler.instance.sessionId,
-                    TelemetryHelper.instance.triggerType,
-                    TelemetryHelper.instance.completionType,
-                    runtimeLanguageContext.getLanguageContext(document.languageId).language,
-                    r.references,
-                ],
-            },
-        }
-    }
-
-    // the returned completion items will always only contain one valid item
-    // this is to trace the current index of visible completion item
-    // so that reference tracker can show
-    // This hack can be removed once inlineCompletionAdditions API becomes public
-    provideInlineCompletionItems(
-        document: vscode.TextDocument,
-        position: vscode.Position,
-        context: vscode.InlineCompletionContext,
-        token: vscode.CancellationToken
-    ): vscode.ProviderResult<vscode.InlineCompletionItem[] | vscode.InlineCompletionList> {
-        if (position.line < 0 || position.isBefore(RecommendationHandler.instance.startPos)) {
-            ReferenceInlineProvider.instance.removeInlineReference()
-            this.activeItemIndex = undefined
-            return
-        }
-        const start = RecommendationHandler.instance.startPos
-        const end = position
-        const iteratingIndexes = this.getIteratingIndexes()
-        const prefix = document.getText(new vscode.Range(start, end)).replace(/\r\n/g, '\n')
-        const matchedCount = RecommendationHandler.instance.recommendations.filter(
-            r => r.content.length > 0 && r.content.startsWith(prefix)
-        ).length
-        for (const i of iteratingIndexes) {
-            const r = RecommendationHandler.instance.recommendations[i]
-            const item = this.getInlineCompletionItem(document, r, start, end, i, prefix)
-            if (item === undefined) {
-                continue
-            }
-            this.activeItemIndex = i
-            RecommendationHandler.instance.setSuggestionState(i, 'Showed')
-            ReferenceInlineProvider.instance.setInlineReference(
-                RecommendationHandler.instance.startPos.line,
-                r.content,
-                r.references
-            )
-            this.nextMove = 0
-            TelemetryHelper.instance.setFirstSuggestionShowTime()
-            TelemetryHelper.instance.tryRecordClientComponentLatency(document.languageId)
-            this._onDidShow.fire()
-            if (matchedCount >= 2 || RecommendationHandler.instance.hasNextToken()) {
-                return [item, { insertText: 'x' }]
-            }
-            return [item]
-        }
-        ReferenceInlineProvider.instance.removeInlineReference()
-        this.activeItemIndex = undefined
-        return []
-    }
-}
-
-// below commands override VS Code inline completion commands
-const prevCommand = Commands.declare(
-    'editor.action.inlineSuggest.showPrevious',
-    (service: InlineCompletionService) => async () => {
-        await service.showRecommendation(-1)
-    }
-)
-const nextCommand = Commands.declare(
-    'editor.action.inlineSuggest.showNext',
-    (service: InlineCompletionService) => async () => {
-        await service.showRecommendation(1)
-    }
-)
-
-const hideCommand = Commands.declare(
-    'editor.action.inlineSuggest.hide',
-    (service: InlineCompletionService) => async () => {
-        await service.clearInlineCompletionStates(vscode.window.activeTextEditor)
-    }
-)
-
-export class InlineCompletionService {
-    private inlineCompletionProvider?: CWInlineCompletionItemProvider
-    private inlineCompletionProviderDisposable?: vscode.Disposable
-    private maxPage = 100
-    private statusBar: vscode.StatusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 1)
-    private _timer?: NodeJS.Timer
-    private _showRecommendationTimer?: NodeJS.Timer
-    private documentUri: vscode.Uri | undefined = undefined
-    private hide: vscode.Disposable
-    private next: vscode.Disposable
-    private prev: vscode.Disposable
-    private _isPaginationRunning = false
-
-    constructor() {
-        this.prev = prevCommand.register(this)
-        this.next = nextCommand.register(this)
-        this.hide = hideCommand.register(this)
-        RecommendationHandler.instance.onDidReceiveRecommendation(e => {
-            this.startShowRecommendationTimer()
-        })
-    }
-
-    static #instance: InlineCompletionService
-
-    public static get instance() {
-        return (this.#instance ??= new this())
-    }
-
-    filePath(): string | undefined {
-        return this.documentUri?.fsPath
-    }
-
-    private sharedTryShowRecommendation = shared(this.tryShowRecommendation.bind(this))
-
-    private startShowRecommendationTimer() {
-        if (this._showRecommendationTimer) {
-            clearInterval(this._showRecommendationTimer)
-            this._showRecommendationTimer = undefined
-        }
-        this._showRecommendationTimer = setInterval(() => {
-            const delay = performance.now() - vsCodeState.lastUserModificationTime
-            if (delay < CodeWhispererConstants.inlineSuggestionShowDelay) {
-                return
-            }
-            try {
-                this.sharedTryShowRecommendation()
-            } finally {
-                if (this._showRecommendationTimer) {
-                    clearInterval(this._showRecommendationTimer)
-                    this._showRecommendationTimer = undefined
-                }
-            }
-        }, CodeWhispererConstants.showRecommendationTimerPollPeriod)
-    }
-
-    // These commands override the vs code inline completion commands
-    // They are subscribed when suggestion starts and disposed when suggestion is accepted/rejected
-    // to avoid impacting other plugins or user who uses this API
-    private registerCommandOverrides() {
-        this.prev = prevCommand.register(this)
-        this.next = nextCommand.register(this)
-        this.hide = hideCommand.register(this)
-    }
-
-    subscribeSuggestionCommands() {
-        this.disposeCommandOverrides()
-        this.registerCommandOverrides()
-        globals.context.subscriptions.push(this.prev)
-        globals.context.subscriptions.push(this.next)
-        globals.context.subscriptions.push(this.hide)
-    }
-
-    private disposeCommandOverrides() {
-        this.prev.dispose()
-        this.hide.dispose()
-        this.next.dispose()
-    }
-
-    public disposeInlineCompletion() {
-        this.inlineCompletionProviderDisposable?.dispose()
-        this.inlineCompletionProvider = undefined
-    }
-
-    async onEditorChange() {
-        vsCodeState.isCodeWhispererEditing = false
-        ReferenceInlineProvider.instance.removeInlineReference()
-    }
-
-    async onFocusChange() {
-        vsCodeState.isCodeWhispererEditing = false
-        ReferenceInlineProvider.instance.removeInlineReference()
-    }
-
-    async onCursorChange(e: vscode.TextEditorSelectionChangeEvent) {
-        if (e.kind !== 1 && vscode.window.activeTextEditor === e.textEditor) {
-            ReferenceInlineProvider.instance.removeInlineReference()
-        }
-    }
-
-    async clearInlineCompletionStates(editor: vscode.TextEditor | undefined) {
-        try {
-            vsCodeState.isCodeWhispererEditing = false
-            ReferenceInlineProvider.instance.removeInlineReference()
-            RecommendationHandler.instance.cancelPaginatedRequest()
-            RecommendationHandler.instance.reportUserDecisionOfRecommendation(editor, -1)
-            RecommendationHandler.instance.clearRecommendations()
-            this.disposeInlineCompletion()
-            this.setCodeWhispererStatusBarOk()
-            this.disposeCommandOverrides()
-        } finally {
-            this.clearRejectionTimer()
-        }
-    }
-
-    async tryShowRecommendation() {
-        const editor = vscode.window.activeTextEditor
-        if (this.isSuggestionVisible() || editor === undefined) {
-            return
-        }
-        if (
-            editor.selection.active.isBefore(RecommendationHandler.instance.startPos) ||
-            editor.document.uri.fsPath !== this.documentUri?.fsPath
-        ) {
-            RecommendationHandler.instance.cancelPaginatedRequest()
-            RecommendationHandler.instance.recommendations.forEach((r, i) => {
-                RecommendationHandler.instance.setSuggestionState(i, 'Discard')
-            })
-            RecommendationHandler.instance.reportUserDecisionOfRecommendation(editor, -1)
-            RecommendationHandler.instance.clearRecommendations()
-        } else if (RecommendationHandler.instance.recommendations.length > 0) {
-            RecommendationHandler.instance.moveStartPositionToSkipSpaces(editor)
-            this.subscribeSuggestionCommands()
-            await this.startRejectionTimer(editor)
-            await this.showRecommendation(0, true)
-        }
-    }
-
-    async getPaginatedRecommendation(
-        client: DefaultCodeWhispererClient,
-        editor: vscode.TextEditor,
-        triggerType: CodewhispererTriggerType,
-        config: ConfigurationEntry,
-        autoTriggerType?: CodewhispererAutomatedTriggerType
-    ) {
-        if (vsCodeState.isCodeWhispererEditing || this._isPaginationRunning) {
-            return
-        }
-        await this.clearInlineCompletionStates(editor)
-        this.setCodeWhispererStatusBarLoading()
-        RecommendationHandler.instance.checkAndResetCancellationTokens()
-        this.documentUri = editor.document.uri
-        try {
-            let page = 0
-            while (page < this.maxPage) {
-                await RecommendationHandler.instance.getRecommendations(
-                    client,
-                    editor,
-                    triggerType,
-                    config,
-                    autoTriggerType,
-                    true,
-                    page
-                )
-                if (RecommendationHandler.instance.checkAndResetCancellationTokens()) {
-                    RecommendationHandler.instance.reportUserDecisionOfRecommendation(editor, -1)
-                    RecommendationHandler.instance.clearRecommendations()
-                    this.setCodeWhispererStatusBarOk()
-                    return
-                }
-                if (!RecommendationHandler.instance.hasNextToken()) {
-                    break
-                }
-                page++
-            }
-        } catch (error) {
-            getLogger().error(`Error ${error} in getPaginatedRecommendation`)
-        }
-        this.setCodeWhispererStatusBarOk()
-        if (triggerType === 'OnDemand' && RecommendationHandler.instance.recommendations.length === 0) {
-            if (RecommendationHandler.instance.errorMessagePrompt !== '') {
-                showTimedMessage(RecommendationHandler.instance.errorMessagePrompt, 2000)
-            } else {
-                showTimedMessage(CodeWhispererConstants.noSuggestions, 2000)
-            }
-        }
-        TelemetryHelper.instance.tryRecordClientComponentLatency(editor.document.languageId)
-    }
-
-    async showRecommendation(indexShift: number, isFirstRecommendation: boolean = false) {
-        if (vscode.window.activeTextEditor) {
-            vscode.window.showTextDocument(vscode.window.activeTextEditor.document)
-        }
-        this.inlineCompletionProvider = new CWInlineCompletionItemProvider(
-            this.inlineCompletionProvider?.getActiveItemIndex,
-            indexShift
-        )
-        this.inlineCompletionProviderDisposable?.dispose()
-        // when suggestion is active, registering a new provider will let VS Code invoke inline API automatically
-        this.inlineCompletionProviderDisposable = vscode.languages.registerInlineCompletionItemProvider(
-            Object.assign([], CodeWhispererConstants.supportedLanguages),
-            this.inlineCompletionProvider
-        )
-        if (isFirstRecommendation) {
-            await vscode.commands.executeCommand(`editor.action.inlineSuggest.trigger`)
-            if (vscode.window.activeTextEditor) {
-                const languageContext = runtimeLanguageContext.getLanguageContext(
-                    vscode.window.activeTextEditor.document.languageId
-                )
-                telemetry.codewhisperer_perceivedLatency.emit({
-                    codewhispererRequestId: RecommendationHandler.instance.requestId,
-                    codewhispererSessionId: RecommendationHandler.instance.sessionId,
-                    codewhispererTriggerType: TelemetryHelper.instance.triggerType,
-                    codewhispererCompletionType: TelemetryHelper.instance.completionType,
-                    codewhispererLanguage: languageContext.language,
-                    duration: performance.now() - RecommendationHandler.instance.lastInvocationTime,
-                    passive: true,
-                    credentialStartUrl: TelemetryHelper.instance.startUrl,
-                })
-            }
-        }
-    }
-
-    setCodeWhispererStatusBarLoading() {
-        this._isPaginationRunning = true
-        this.statusBar.text = ` $(loading~spin)CodeWhisperer`
-        this.statusBar.show()
-    }
-
-    setCodeWhispererStatusBarOk() {
-        this._isPaginationRunning = false
-        this.statusBar.text = ` $(check)CodeWhisperer`
-        this.statusBar.show()
-    }
-
-    isPaginationRunning(): boolean {
-        return this._isPaginationRunning
-    }
-
-    hideCodeWhispererStatusBar() {
-        this.statusBar.hide()
-    }
-
-    isSuggestionVisible(): boolean {
-        return this.inlineCompletionProvider?.getActiveItemIndex !== undefined
-    }
-
-    private clearRejectionTimer() {
-        if (this._timer !== undefined) {
-            clearInterval(this._timer)
-            this._timer = undefined
-        }
-    }
-
-    /*
-     * This startRejectionTimer function is to mark recommendation as rejected
-     * when the suggestions are no longer been shown to users for more than 5 seconds
-     */
-    private async startRejectionTimer(editor: vscode.TextEditor): Promise<void> {
-        if (this._timer !== undefined) {
-            return
-        }
-        this._timer = globals.clock.setInterval(async () => {
-            if (!this.isSuggestionVisible()) {
-                getLogger().verbose(`Clearing cached suggestion`)
-                await this.clearInlineCompletionStates(editor)
-            }
-        }, 5 * 1000)
-    }
-}
-
-export const refreshStatusBar = Commands.declare('aws.codeWhisperer.refreshStatusBar', () => () => {
-    if (!AuthUtil.instance.isConnectionValid()) {
-        InlineCompletionService.instance.hideCodeWhispererStatusBar()
-    } else {
-        InlineCompletionService.instance.setCodeWhispererStatusBarOk()
-    }
-})
diff --git a/src/codewhisperer/service/keyStrokeHandler.ts b/src/codewhisperer/service/keyStrokeHandler.ts
deleted file mode 100644
index 25f456b8e0c..00000000000
--- a/src/codewhisperer/service/keyStrokeHandler.ts
+++ /dev/null
@@ -1,318 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { DefaultCodeWhispererClient } from '../client/codewhisperer'
-import * as CodeWhispererConstants from '../models/constants'
-import { vsCodeState, ConfigurationEntry } from '../models/model'
-import { getLogger } from '../../shared/logger'
-import { InlineCompletion } from './inlineCompletion'
-import { isCloud9 } from '../../shared/extensionUtilities'
-import { RecommendationHandler } from './recommendationHandler'
-import { CodewhispererAutomatedTriggerType } from '../../shared/telemetry/telemetry'
-import { getTabSizeSetting } from '../../shared/utilities/editorUtilities'
-import { isInlineCompletionEnabled } from '../util/commonUtil'
-import { InlineCompletionService } from './inlineCompletionService'
-import { TelemetryHelper } from '../util/telemetryHelper'
-
-const performance = globalThis.performance ?? require('perf_hooks').performance
-
-/**
- * This class is for CodeWhisperer auto trigger
- */
-export class KeyStrokeHandler {
-    /**
-     * Speical character which automated triggers codewhisperer
-     */
-    public specialChar: string
-    /**
-     * Key stroke count for automated trigger
-     */
-
-    private idleTriggerTimer?: NodeJS.Timer
-
-    constructor() {
-        this.specialChar = ''
-    }
-
-    static #instance: KeyStrokeHandler
-
-    public static get instance() {
-        return (this.#instance ??= new this())
-    }
-
-    public startIdleTimeTriggerTimer(
-        event: vscode.TextDocumentChangeEvent,
-        editor: vscode.TextEditor,
-        client: DefaultCodeWhispererClient,
-        config: ConfigurationEntry
-    ) {
-        if (this.idleTriggerTimer) {
-            clearInterval(this.idleTriggerTimer)
-            this.idleTriggerTimer = undefined
-        }
-        if (!this.shouldTriggerIdleTime()) {
-            return
-        }
-        this.idleTriggerTimer = setInterval(() => {
-            const duration = (performance.now() - RecommendationHandler.instance.lastInvocationTime) / 1000
-            if (duration < CodeWhispererConstants.invocationTimeIntervalThreshold) {
-                return
-            }
-
-            try {
-                this.invokeAutomatedTrigger('IdleTime', editor, client, config)
-            } finally {
-                if (this.idleTriggerTimer) {
-                    clearInterval(this.idleTriggerTimer)
-                    this.idleTriggerTimer = undefined
-                }
-            }
-        }, CodeWhispererConstants.idleTimerPollPeriod)
-    }
-
-    public shouldTriggerIdleTime(): boolean {
-        if (isCloud9() && RecommendationHandler.instance.isGenerateRecommendationInProgress) {
-            return false
-        }
-        if (isInlineCompletionEnabled() && InlineCompletionService.instance.isPaginationRunning()) {
-            return false
-        }
-        if (InlineCompletion.instance.getIsActive || InlineCompletion.instance.isPaginationRunning()) {
-            return false
-        }
-        return true
-    }
-
-    async processKeyStroke(
-        event: vscode.TextDocumentChangeEvent,
-        editor: vscode.TextEditor,
-        client: DefaultCodeWhispererClient,
-        config: ConfigurationEntry
-    ): Promise<void> {
-        try {
-            if (!config.isAutomatedTriggerEnabled) {
-                return
-            }
-
-            // Skip when output channel gains focus and invoke
-            if (editor.document.languageId === 'Log') {
-                return
-            }
-
-            // Pause automated trigger when typed input matches recommendation prefix for inline suggestion
-            if (InlineCompletion.instance.isTypeaheadInProgress) {
-                return
-            }
-
-            // Skip Cloud9 IntelliSense acceptance event
-            if (
-                isCloud9() &&
-                event.contentChanges.length > 0 &&
-                RecommendationHandler.instance.recommendations.length > 0
-            ) {
-                if (event.contentChanges[0].text === RecommendationHandler.instance.recommendations[0].content) {
-                    return
-                }
-            }
-
-            let triggerType: CodewhispererAutomatedTriggerType | undefined
-            const changedSource = new DefaultDocumentChangedType(event.contentChanges).checkChangeSource()
-            if ([DocumentChangedSource.RegularKey].includes(changedSource)) {
-                this.startIdleTimeTriggerTimer(event, editor, client, config)
-            }
-            switch (changedSource) {
-                case DocumentChangedSource.EnterKey: {
-                    triggerType = 'Enter'
-                    break
-                }
-                case DocumentChangedSource.SpecialCharsKey: {
-                    triggerType = 'SpecialCharacters'
-                    break
-                }
-                case DocumentChangedSource.IntelliSense: {
-                    triggerType = 'IntelliSenseAcceptance'
-                    break
-                }
-                case DocumentChangedSource.RegularKey: {
-                    break
-                }
-                default: {
-                    break
-                }
-            }
-
-            if (triggerType) {
-                this.invokeAutomatedTrigger(triggerType, editor, client, config)
-            }
-        } catch (error) {
-            getLogger().error('Automated Trigger Exception : ', error)
-            getLogger().verbose(`Automated Trigger Exception : ${error}`)
-        }
-    }
-
-    async invokeAutomatedTrigger(
-        autoTriggerType: CodewhispererAutomatedTriggerType,
-        editor: vscode.TextEditor,
-        client: DefaultCodeWhispererClient,
-        config: ConfigurationEntry
-    ): Promise<void> {
-        if (editor) {
-            if (isCloud9()) {
-                if (RecommendationHandler.instance.isGenerateRecommendationInProgress) {
-                    return
-                }
-                vsCodeState.isIntelliSenseActive = false
-                RecommendationHandler.instance.isGenerateRecommendationInProgress = true
-                try {
-                    RecommendationHandler.instance.reportUserDecisionOfRecommendation(editor, -1)
-                    RecommendationHandler.instance.clearRecommendations()
-                    await RecommendationHandler.instance.getRecommendations(
-                        client,
-                        editor,
-                        'AutoTrigger',
-                        config,
-                        autoTriggerType,
-                        false
-                    )
-                    if (RecommendationHandler.instance.canShowRecommendationInIntelliSense(editor, false)) {
-                        await vscode.commands.executeCommand('editor.action.triggerSuggest').then(() => {
-                            vsCodeState.isIntelliSenseActive = true
-                        })
-                    }
-                } finally {
-                    RecommendationHandler.instance.isGenerateRecommendationInProgress = false
-                }
-            } else if (isInlineCompletionEnabled()) {
-                TelemetryHelper.instance.setInvokeSuggestionStartTime()
-                await InlineCompletionService.instance.getPaginatedRecommendation(
-                    client,
-                    editor,
-                    'AutoTrigger',
-                    config,
-                    autoTriggerType
-                )
-            } else {
-                if (!vsCodeState.isCodeWhispererEditing && !InlineCompletion.instance.isPaginationRunning()) {
-                    await InlineCompletion.instance.resetInlineStates(editor)
-                    InlineCompletion.instance.getPaginatedRecommendation(
-                        client,
-                        editor,
-                        'AutoTrigger',
-                        config,
-                        autoTriggerType
-                    )
-                }
-            }
-        }
-    }
-}
-
-export abstract class DocumentChangedType {
-    constructor(protected readonly contentChanges: ReadonlyArray<vscode.TextDocumentContentChangeEvent>) {
-        this.contentChanges = contentChanges
-    }
-
-    abstract checkChangeSource(): DocumentChangedSource
-
-    // Enter key should always start with ONE '\n' or '\r\n' and potentially following spaces due to IDE reformat
-    protected isEnterKey(str: string): boolean {
-        if (str.length === 0) {
-            return false
-        }
-        return (
-            (str.startsWith('\r\n') && str.substring(2).trim() === '') ||
-            (str[0] === '\n' && str.substring(1).trim() === '')
-        )
-    }
-
-    // Tab should consist of space char only ' ' and the length % tabSize should be 0
-    protected isTabKey(str: string): boolean {
-        const tabSize = getTabSizeSetting()
-        if (str.length % tabSize === 0 && str.trim() === '') {
-            return true
-        }
-        return false
-    }
-
-    protected isUserTypingSpecialChar(str: string): boolean {
-        return ['(', '()', '[', '[]', '{', '{}', ':'].includes(str)
-    }
-
-    protected isSingleLine(str: string): boolean {
-        let newLineCounts = 0
-        for (const ch of str) {
-            if (ch === '\n') {
-                newLineCounts += 1
-            }
-        }
-
-        // since pressing Enter key possibly will generate string like '\n        ' due to indention
-        if (this.isEnterKey(str)) {
-            return true
-        }
-        if (newLineCounts >= 1) {
-            return false
-        }
-        return true
-    }
-}
-
-export class DefaultDocumentChangedType extends DocumentChangedType {
-    constructor(contentChanges: ReadonlyArray<vscode.TextDocumentContentChangeEvent>) {
-        super(contentChanges)
-    }
-
-    checkChangeSource(): DocumentChangedSource {
-        if (this.contentChanges.length === 0) {
-            return DocumentChangedSource.Unknown
-        }
-
-        // event.contentChanges.length will be 2 when user press Enter key multiple times
-        if (this.contentChanges.length > 2) {
-            return DocumentChangedSource.Reformatting
-        }
-
-        // Case when event.contentChanges.length === 1
-        const changedText = this.contentChanges[0].text
-
-        if (this.isSingleLine(changedText)) {
-            if (changedText === '') {
-                return DocumentChangedSource.Deletion
-            } else if (this.isEnterKey(changedText)) {
-                return DocumentChangedSource.EnterKey
-            } else if (this.isTabKey(changedText)) {
-                return DocumentChangedSource.TabKey
-            } else if (this.isUserTypingSpecialChar(changedText)) {
-                return DocumentChangedSource.SpecialCharsKey
-            } else if (changedText.length === 1) {
-                return DocumentChangedSource.RegularKey
-            } else if (new RegExp('^[ ]+$').test(changedText)) {
-                // single line && single place reformat should consist of space chars only
-                return DocumentChangedSource.Reformatting
-            } else if (new RegExp('^[\\S]+$').test(changedText) && !isCloud9()) {
-                // match single word only, which is general case for intellisense suggestion, it's still possible intllisense suggest
-                // multi-words code snippets
-                return DocumentChangedSource.IntelliSense
-            } else {
-                return isCloud9() ? DocumentChangedSource.RegularKey : DocumentChangedSource.Unknown
-            }
-        }
-
-        // Won't trigger cwspr on multi-line changes
-        return DocumentChangedSource.Unknown
-    }
-}
-
-export enum DocumentChangedSource {
-    SpecialCharsKey = 'SpecialCharsKey',
-    RegularKey = 'RegularKey',
-    TabKey = 'TabKey',
-    EnterKey = 'EnterKey',
-    IntelliSense = 'IntelliSense',
-    Reformatting = 'Reformatting',
-    Deletion = 'Deletion',
-    Unknown = 'Unknown',
-}
diff --git a/src/codewhisperer/service/recommendationHandler.ts b/src/codewhisperer/service/recommendationHandler.ts
deleted file mode 100644
index b0af7a5f88c..00000000000
--- a/src/codewhisperer/service/recommendationHandler.ts
+++ /dev/null
@@ -1,429 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { extensionVersion } from '../../shared/vscode/env'
-import {
-    RecommendationsList,
-    DefaultCodeWhispererClient,
-    Recommendation,
-    CognitoCredentialsError,
-} from '../client/codewhisperer'
-import * as EditorContext from '../util/editorContext'
-import * as CodeWhispererConstants from '../models/constants'
-import { ConfigurationEntry } from '../models/model'
-import { runtimeLanguageContext } from '../util/runtimeLanguageContext'
-import { AWSError } from 'aws-sdk'
-import { TelemetryHelper } from '../util/telemetryHelper'
-import { getLogger } from '../../shared/logger'
-import { isCloud9 } from '../../shared/extensionUtilities'
-import { asyncCallWithTimeout, isAwsError } from '../util/commonUtil'
-import * as codewhispererClient from '../client/codewhisperer'
-import { showTimedMessage } from '../../shared/utilities/messages'
-import { telemetry } from '../../shared/telemetry/telemetry'
-import {
-    CodewhispererAutomatedTriggerType,
-    CodewhispererCompletionType,
-    CodewhispererTriggerType,
-    Result,
-} from '../../shared/telemetry/telemetry'
-import { CodeWhispererCodeCoverageTracker } from '../tracker/codewhispererCodeCoverageTracker'
-import globals from '../../shared/extensionGlobals'
-
-/**
- * This class is for getRecommendation/listRecommendation API calls and its states
- * It does not contain UI/UX related logic
- */
-
-const performance = globalThis.performance ?? require('perf_hooks').performance
-
-export class RecommendationHandler {
-    public lastInvocationTime: number
-    public requestId: string
-    public sessionId: string
-    private nextToken: string
-    public errorCode: string
-    public recommendations: Recommendation[]
-    private recommendationSuggestionState: Map<number, string>
-    public startPos: vscode.Position
-    private cancellationToken: vscode.CancellationTokenSource
-    public errorMessagePrompt: string
-    public isGenerateRecommendationInProgress: boolean
-    private _onDidReceiveRecommendation: vscode.EventEmitter<void> = new vscode.EventEmitter<void>()
-    public readonly onDidReceiveRecommendation: vscode.Event<void> = this._onDidReceiveRecommendation.event
-
-    constructor() {
-        this.requestId = ''
-        this.sessionId = ''
-        this.nextToken = ''
-        this.errorCode = ''
-        this.recommendations = []
-        this.lastInvocationTime = performance.now() - CodeWhispererConstants.invocationTimeIntervalThreshold * 1000
-        this.startPos = new vscode.Position(0, 0)
-        this.cancellationToken = new vscode.CancellationTokenSource()
-        this.errorMessagePrompt = ''
-        this.recommendationSuggestionState = new Map<number, string>()
-        this.isGenerateRecommendationInProgress = false
-    }
-
-    static #instance: RecommendationHandler
-
-    public static get instance() {
-        return (this.#instance ??= new this())
-    }
-
-    isValidResponse(): boolean {
-        return (
-            this.recommendations !== undefined &&
-            this.recommendations.length > 0 &&
-            this.recommendations.filter(option => option.content.length > 0).length > 0
-        )
-    }
-
-    setSuggestionState(index: number, value: string) {
-        this.recommendationSuggestionState.set(index, value)
-    }
-
-    getSuggestionState(index: number): string | undefined {
-        return this.recommendationSuggestionState.get(index)
-    }
-
-    async getServerResponse(
-        triggerType: CodewhispererTriggerType,
-        isManualTriggerOn: boolean,
-        isFirstPaginationCall: boolean,
-        promise: Promise<any>
-    ): Promise<any> {
-        const timeoutMessage = isCloud9() ? `Generate recommendation timeout.` : `List recommendation timeout`
-        try {
-            if (isManualTriggerOn && triggerType === 'OnDemand' && (isCloud9() || isFirstPaginationCall)) {
-                return vscode.window.withProgress(
-                    {
-                        location: vscode.ProgressLocation.Notification,
-                        title: CodeWhispererConstants.pendingResponse,
-                        cancellable: false,
-                    },
-                    async () => {
-                        return await asyncCallWithTimeout(
-                            promise,
-                            timeoutMessage,
-                            CodeWhispererConstants.promiseTimeoutLimit * 1000
-                        )
-                    }
-                )
-            }
-            return await asyncCallWithTimeout(
-                promise,
-                timeoutMessage,
-                CodeWhispererConstants.promiseTimeoutLimit * 1000
-            )
-        } catch (error) {
-            throw new Error(`${error instanceof Error ? error.message : error}`)
-        }
-    }
-
-    async getRecommendations(
-        client: DefaultCodeWhispererClient,
-        editor: vscode.TextEditor,
-        triggerType: CodewhispererTriggerType,
-        config: ConfigurationEntry,
-        autoTriggerType?: CodewhispererAutomatedTriggerType,
-        pagination: boolean = true,
-        page: number = 0
-    ) {
-        let recommendation: RecommendationsList = []
-        let requestId = ''
-        let sessionId = ''
-        let invocationResult: Result = 'Failed'
-        let reason = ''
-        let completionType: CodewhispererCompletionType = 'Line'
-        let startTime = 0
-        let latency = 0
-        let nextToken = ''
-        let errorCode = ''
-        let req: codewhispererClient.ListRecommendationsRequest | codewhispererClient.GenerateRecommendationsRequest
-        let shouldRecordServiceInvocation = false
-
-        if (pagination) {
-            const accessToken = globals.context.globalState.get<string | undefined>(CodeWhispererConstants.accessToken)
-            req = EditorContext.buildListRecommendationRequest(
-                editor as vscode.TextEditor,
-                this.nextToken,
-                accessToken ? undefined : config.isSuggestionsWithCodeReferencesEnabled
-            )
-        } else {
-            req = EditorContext.buildGenerateRecommendationRequest(editor as vscode.TextEditor)
-        }
-
-        try {
-            startTime = performance.now()
-            this.lastInvocationTime = startTime
-            // set start pos for non pagination call or first pagination call
-            if (!pagination || (pagination && page === 0)) {
-                this.startPos = editor.selection.active
-            }
-            /**
-             * Validate request
-             */
-            if (EditorContext.validateRequest(req)) {
-                const mappedReq = runtimeLanguageContext.mapToRuntimeLanguage(req)
-                const codewhispererPromise = pagination
-                    ? client.listRecommendations(mappedReq)
-                    : client.generateRecommendations(mappedReq)
-                shouldRecordServiceInvocation = true
-                const resp = await this.getServerResponse(
-                    triggerType,
-                    config.isManualTriggerEnabled,
-                    page === 0,
-                    codewhispererPromise
-                )
-                TelemetryHelper.instance.setSdkApiCallEndTime()
-                latency = startTime !== 0 ? performance.now() - startTime : 0
-                if ('recommendations' in resp) {
-                    recommendation = (resp && resp.recommendations) || []
-                } else {
-                    recommendation = (resp && resp.completions) || []
-                }
-                invocationResult = 'Succeeded'
-                TelemetryHelper.instance.triggerType = triggerType
-                TelemetryHelper.instance.CodeWhispererAutomatedtriggerType =
-                    autoTriggerType === undefined ? 'KeyStrokeCount' : autoTriggerType
-                if (
-                    recommendation.length > 0 &&
-                    recommendation[0].content.search(CodeWhispererConstants.lineBreak) !== -1
-                ) {
-                    completionType = 'Block'
-                }
-                TelemetryHelper.instance.completionType = completionType
-                requestId = resp?.$response && resp?.$response?.requestId
-                nextToken = resp?.nextToken ? resp?.nextToken : ''
-                sessionId = resp?.$response?.httpResponse?.headers['x-amzn-sessionid']
-                TelemetryHelper.instance.setFirstResponseRequestId(requestId)
-                TelemetryHelper.instance.setSessionId(sessionId)
-                if (nextToken === '') {
-                    TelemetryHelper.instance.setAllPaginationEndTime()
-                }
-            } else {
-                getLogger().info('Invalid Request : ', JSON.stringify(req, undefined, EditorContext.getTabSize()))
-                getLogger().verbose(`Invalid Request : ${JSON.stringify(req, undefined, EditorContext.getTabSize())}`)
-                errorCode = `Invalid Request`
-                if (!runtimeLanguageContext.isLanguageSupported(req.fileContext.programmingLanguage.languageName)) {
-                    this.errorMessagePrompt = `${req.fileContext.programmingLanguage.languageName} is currently not supported by CodeWhisperer`
-                }
-            }
-        } catch (error) {
-            if (error instanceof CognitoCredentialsError) {
-                shouldRecordServiceInvocation = false
-            }
-            if (latency === 0) {
-                latency = startTime !== 0 ? performance.now() - startTime : 0
-            }
-            getLogger().error('CodeWhisperer Invocation Exception : ', error)
-            getLogger().verbose(`CodeWhisperer Invocation Exception : ${error}`)
-            if (isAwsError(error)) {
-                const awsError = error as AWSError
-                this.errorMessagePrompt = awsError.message
-                requestId = awsError.requestId || ''
-                errorCode = awsError.code
-                reason = `CodeWhisperer Invocation Exception: ${awsError?.code ?? awsError?.name ?? 'unknown'}`
-                await this.onThrottlingException(awsError, triggerType)
-            } else {
-                errorCode = error as string
-                reason = error ? String(error) : 'unknown'
-                this.errorMessagePrompt = errorCode
-            }
-        } finally {
-            const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone
-            const languageContext = runtimeLanguageContext.getLanguageContext(editor.document.languageId)
-            getLogger().verbose(
-                `Request ID: ${requestId}, timestamp(epoch): ${Date.now()}, timezone: ${timezone}, datetime: ${new Date().toLocaleString(
-                    [],
-                    {
-                        timeZone: timezone,
-                    }
-                )}, vscode version: '${
-                    vscode.version
-                }', extension version: '${extensionVersion}', filename: '${EditorContext.getFileName(
-                    editor
-                )}', left context of line:  '${EditorContext.getLeftContext(
-                    editor,
-                    this.startPos.line
-                )}', line number: ${this.startPos.line}, character location: ${
-                    this.startPos.character
-                }, latency: ${latency} ms.`
-            )
-            getLogger().verbose('Recommendations:')
-            recommendation.forEach((item, index) => {
-                getLogger().verbose(`[${index}]\n${item.content.trimRight()}`)
-            })
-            if (shouldRecordServiceInvocation) {
-                telemetry.codewhisperer_serviceInvocation.emit({
-                    codewhispererRequestId: requestId ? requestId : undefined,
-                    codewhispererSessionId: sessionId ? sessionId : undefined,
-                    codewhispererLastSuggestionIndex: this.recommendations.length - 1,
-                    codewhispererTriggerType: triggerType,
-                    codewhispererAutomatedTriggerType: autoTriggerType,
-                    codewhispererCompletionType:
-                        invocationResult == 'Succeeded' ? TelemetryHelper.instance.completionType : undefined,
-                    result: invocationResult,
-                    duration: latency ? latency : 0,
-                    codewhispererLineNumber: this.startPos.line ? this.startPos.line : 0,
-                    codewhispererCursorOffset: TelemetryHelper.instance.cursorOffset
-                        ? TelemetryHelper.instance.cursorOffset
-                        : 0,
-                    codewhispererLanguage: languageContext.language,
-                    reason: reason ? reason.substring(0, 200) : undefined,
-                    credentialStartUrl: TelemetryHelper.instance.startUrl,
-                })
-            }
-            if (invocationResult == 'Succeeded') {
-                CodeWhispererCodeCoverageTracker.getTracker(languageContext.language)?.incrementServiceInvocationCount()
-            }
-        }
-        if (recommendation.length > 0) {
-            const typedPrefix = editor.document
-                .getText(new vscode.Range(this.startPos, editor.selection.active))
-                .replace('\r\n', '\n')
-            // mark suggestions that does not match typeahead when arrival as Discard
-            // these suggestions can be marked as Showed if typeahead can be removed with new inline API
-            recommendation.forEach((r, i) => {
-                if (
-                    (!r.content.startsWith(typedPrefix) &&
-                        this.getSuggestionState(i + this.recommendations.length) === undefined) ||
-                    this.cancellationToken.token.isCancellationRequested
-                ) {
-                    this.setSuggestionState(i + this.recommendations.length, 'Discard')
-                }
-            })
-            this.recommendations = isCloud9() ? recommendation : this.recommendations.concat(recommendation)
-            this._onDidReceiveRecommendation.fire()
-        }
-        // send Empty userDecision event if user receives no recommendations in this session at all.
-        if (this.recommendations.length === 0 && nextToken === '') {
-            TelemetryHelper.instance.recordUserDecisionTelemetryForEmptyList(
-                requestId,
-                sessionId,
-                page,
-                editor.document.languageId
-            )
-        }
-        this.requestId = requestId
-        this.sessionId = sessionId
-        this.nextToken = nextToken
-        this.errorCode = errorCode
-    }
-
-    cancelPaginatedRequest() {
-        this.nextToken = ''
-        this.cancellationToken.cancel()
-    }
-
-    checkAndResetCancellationTokens() {
-        if (this.cancellationToken.token.isCancellationRequested) {
-            this.cancellationToken.dispose()
-            this.cancellationToken = new vscode.CancellationTokenSource()
-            this.nextToken = ''
-            return true
-        }
-        return false
-    }
-    /**
-     * Clear recommendation state
-     */
-    clearRecommendations() {
-        this.recommendations = []
-        this.recommendationSuggestionState = new Map<number, string>()
-        this.errorCode = ''
-        this.requestId = ''
-        this.sessionId = ''
-        this.nextToken = ''
-        this.errorMessagePrompt = ''
-    }
-
-    /**
-     * Emits telemetry reflecting user decision for current recommendation.
-     */
-    reportUserDecisionOfRecommendation(editor: vscode.TextEditor | undefined, acceptIndex: number) {
-        TelemetryHelper.instance.recordUserDecisionTelemetry(
-            this.requestId,
-            this.sessionId,
-            this.recommendations,
-            acceptIndex,
-            editor?.document.languageId,
-            this.recommendations.length,
-            this.recommendationSuggestionState
-        )
-    }
-
-    hasNextToken(): boolean {
-        return this.nextToken !== ''
-    }
-
-    canShowRecommendationInIntelliSense(editor: vscode.TextEditor, showPrompt: boolean = false): boolean {
-        const reject = () => {
-            this.reportUserDecisionOfRecommendation(editor, -1)
-            this.clearRecommendations()
-        }
-        if (!this.isValidResponse()) {
-            if (showPrompt) {
-                showTimedMessage(
-                    this.errorMessagePrompt === '' ? CodeWhispererConstants.noSuggestions : this.errorMessagePrompt,
-                    3000
-                )
-            }
-            reject()
-            return false
-        }
-        // do not show recommendation if cursor is before invocation position
-        // also mark as Discard
-        if (editor.selection.active.isBefore(this.startPos)) {
-            this.recommendations.forEach((r, i) => {
-                this.setSuggestionState(i, 'Discard')
-            })
-            reject()
-            return false
-        }
-
-        // do not show recommendation if typeahead does not match
-        // also mark as Discard
-        const typedPrefix = editor.document.getText(
-            new vscode.Range(
-                this.startPos.line,
-                this.startPos.character,
-                editor.selection.active.line,
-                editor.selection.active.character
-            )
-        )
-        if (!this.recommendations[0].content.startsWith(typedPrefix.trimStart())) {
-            this.recommendations.forEach((r, i) => {
-                this.setSuggestionState(i, 'Discard')
-            })
-            reject()
-            return false
-        }
-        return true
-    }
-
-    moveStartPositionToSkipSpaces(editor: vscode.TextEditor) {
-        const start = this.startPos
-        const prefix = editor.document.getText(new vscode.Range(start, editor.selection.active))
-        // skip space from invocation position
-        if (prefix.length > 0 && prefix.trimStart().length != prefix.length) {
-            this.startPos = start.translate(undefined, prefix.length - prefix.trimStart().length)
-        }
-    }
-
-    async onThrottlingException(awsError: AWSError, triggerType: CodewhispererTriggerType) {
-        if (
-            awsError.code === 'ThrottlingException' &&
-            awsError.message.includes(CodeWhispererConstants.throttlingMessage)
-        ) {
-            if (triggerType === 'OnDemand') {
-                vscode.window.showErrorMessage(CodeWhispererConstants.freeTierLimitReached)
-            }
-            await vscode.commands.executeCommand('aws.codeWhisperer.refresh', true)
-        }
-    }
-}
diff --git a/src/codewhisperer/service/referenceLogViewProvider.ts b/src/codewhisperer/service/referenceLogViewProvider.ts
deleted file mode 100644
index 93a8401b864..00000000000
--- a/src/codewhisperer/service/referenceLogViewProvider.ts
+++ /dev/null
@@ -1,162 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { References } from '../client/codewhisperer'
-import { LicenseUtil } from '../util/licenseUtil'
-import * as CodeWhispererConstants from '../models/constants'
-import { CodeWhispererSettings } from '../util/codewhispererSettings'
-import globals from '../../shared/extensionGlobals'
-import { isCloud9 } from '../../shared/extensionUtilities'
-import { TelemetryHelper } from '../util/telemetryHelper'
-import { AuthUtil } from '../util/authUtil'
-
-export class ReferenceLogViewProvider implements vscode.WebviewViewProvider {
-    public static readonly viewType = 'aws.codeWhisperer.referenceLog'
-    private _view?: vscode.WebviewView
-    private _referenceLogs: string[] = []
-    private _extensionUri: vscode.Uri = globals.context.extensionUri
-    constructor() {}
-    static #instance: ReferenceLogViewProvider
-
-    public static get instance() {
-        return (this.#instance ??= new this())
-    }
-
-    public resolveWebviewView(
-        webviewView: vscode.WebviewView,
-        context: vscode.WebviewViewResolveContext<unknown>,
-        token: vscode.CancellationToken
-    ): void | Thenable<void> {
-        this._view = webviewView
-
-        this._view.webview.options = {
-            // Allow scripts in the webview
-            enableScripts: true,
-            localResourceRoots: [this._extensionUri],
-        }
-        this._view.webview.html = this.getHtml(
-            webviewView.webview,
-            CodeWhispererSettings.instance.isSuggestionsWithCodeReferencesEnabled()
-        )
-        this._view.webview.onDidReceiveMessage(data => {
-            vscode.commands.executeCommand('aws.codeWhisperer.configure', 'codewhisperer')
-        })
-    }
-
-    public async update() {
-        if (this._view) {
-            const showPrompt = CodeWhispererSettings.instance.isSuggestionsWithCodeReferencesEnabled()
-            this._view.webview.html = this.getHtml(this._view.webview, showPrompt)
-        }
-    }
-
-    public static getReferenceLog(recommendation: string, references: References, editor: vscode.TextEditor): string {
-        const filePath = editor.document.uri.path
-        const time = new Date().toLocaleString()
-        let text = ``
-        for (const reference of references) {
-            if (
-                reference.recommendationContentSpan == undefined ||
-                reference.recommendationContentSpan.start == undefined ||
-                reference.recommendationContentSpan.end == undefined
-            ) {
-                continue
-            }
-            const code = recommendation.substring(
-                reference.recommendationContentSpan.start,
-                reference.recommendationContentSpan.end
-            )
-            const firstCharLineNumber =
-                editor.document.positionAt(
-                    TelemetryHelper.instance.cursorOffset + reference.recommendationContentSpan.start
-                ).line + 1
-            const lastCharLineNumber =
-                editor.document.positionAt(
-                    TelemetryHelper.instance.cursorOffset + reference.recommendationContentSpan.end - 1
-                ).line + 1
-            let lineInfo = ``
-            if (firstCharLineNumber === lastCharLineNumber) {
-                lineInfo = `(line at ${firstCharLineNumber})`
-            } else {
-                lineInfo = `(lines from ${firstCharLineNumber} to ${lastCharLineNumber})`
-            }
-            if (text != ``) {
-                text += `And `
-            }
-
-            let license = `<a href=${LicenseUtil.getLicenseHtml(reference.licenseName)}>${reference.licenseName}</a>`
-            let repository = reference.repository?.length ? reference.repository : 'unknown'
-            if (reference.url?.length) {
-                repository = `<a href=${reference.url}>${reference.repository}</a>`
-                license = `<b><i>${reference.licenseName || 'unknown'}</i></b>`
-            }
-
-            text +=
-                CodeWhispererConstants.referenceLogText(
-                    `<br><code>${code}</code><br>`,
-                    license,
-                    repository,
-                    filePath,
-                    lineInfo
-                ) + ' <br>'
-        }
-        if (text === ``) {
-            return ''
-        }
-        return `[${time}] Accepted recommendation ${text}<br>`
-    }
-
-    public addReferenceLog(referenceLog: string) {
-        if (referenceLog !== '') {
-            this._referenceLogs.push(referenceLog)
-        }
-        this.update()
-    }
-    private getHtml(webview: vscode.Webview, showPrompt: boolean): string {
-        const styleVSCodeUri = webview.asWebviewUri(
-            vscode.Uri.joinPath(this._extensionUri, 'src', 'codewhisperer', 'views/css/codewhispererReferenceLog.css')
-        )
-
-        let prompt = ''
-        if (showPrompt) {
-            if (AuthUtil.instance.isEnterpriseSsoInUse()) {
-                prompt = CodeWhispererConstants.referenceLogPromptTextEnterpriseSSO
-            } else {
-                prompt = CodeWhispererConstants.referenceLogPromptText
-            }
-        }
-
-        let csp = ''
-        if (isCloud9()) {
-            csp = `<meta
-            http-equiv="Content-Security-Policy"
-            content=
-                "default-src 'none';
-                img-src https: data:;
-                script-src 'self' 'unsafe-inline';
-                style-src 'self' 'unsafe-inline' ${webview.cspSource};
-                font-src 'self' data:;"
-            >`
-        }
-        return `<!DOCTYPE html>
-            <html lang="en">
-            <head>
-				${csp}
-                <link rel="stylesheet" href="${styleVSCodeUri}">
-            </head>
-            <body>
-                <p>${prompt} </p>
-                <p> ${this._referenceLogs.join('')} </p>
-                <script>
-                const vscode = acquireVsCodeApi();
-                function openSettings() {
-                    vscode.postMessage('aws.explorer.focus')
-                }
-                </script>
-            </body>
-            </html>`
-    }
-}
diff --git a/src/codewhisperer/service/securityScanHandler.ts b/src/codewhisperer/service/securityScanHandler.ts
deleted file mode 100644
index 2735167dbd8..00000000000
--- a/src/codewhisperer/service/securityScanHandler.ts
+++ /dev/null
@@ -1,189 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { DefaultCodeWhispererClient } from '../client/codewhisperer'
-import { getLogger } from '../../shared/logger'
-import { AggregatedCodeScanIssue } from '../models/model'
-import { sleep } from '../../shared/utilities/timeoutUtils'
-import * as codewhispererClient from '../client/codewhisperer'
-import * as CodeWhispererConstants from '../models/constants'
-import { TruncPaths } from '../util/dependencyGraph/dependencyGraph'
-import { existsSync, statSync, readFileSync } from 'fs'
-import { RawCodeScanIssue } from '../models/model'
-import got from 'got'
-import * as crypto from 'crypto'
-import path = require('path')
-import { pageableToCollection } from '../../shared/utilities/collectionUtils'
-
-export async function listScanResults(
-    client: DefaultCodeWhispererClient,
-    jobId: string,
-    codeScanFindingsSchema: string,
-    projectPath: string
-) {
-    const codeScanIssueMap: Map<string, RawCodeScanIssue[]> = new Map()
-    const aggregatedCodeScanIssueList: AggregatedCodeScanIssue[] = []
-    const requester = (request: codewhispererClient.ListCodeScanFindingsRequest) => client.listCodeScanFindings(request)
-    const collection = pageableToCollection(requester, { jobId, codeScanFindingsSchema }, 'nextToken')
-    const issues = await collection
-        .flatten()
-        .map(resp => {
-            getLogger().verbose(`Request id: ${resp.$response.requestId}`)
-            if ('codeScanFindings' in resp) {
-                return resp.codeScanFindings
-            }
-            return resp.codeAnalysisFindings
-        })
-        .promise()
-    issues.forEach(issue => {
-        mapToAggregatedList(codeScanIssueMap, aggregatedCodeScanIssueList, issue, projectPath)
-    })
-    return aggregatedCodeScanIssueList
-}
-
-function mapToAggregatedList(
-    codeScanIssueMap: Map<string, RawCodeScanIssue[]>,
-    aggregatedCodeScanIssueList: AggregatedCodeScanIssue[],
-    json: string,
-    projectPath: string
-) {
-    const codeScanIssues: RawCodeScanIssue[] = JSON.parse(json)
-    codeScanIssues.forEach(issue => {
-        if (codeScanIssueMap.has(issue.filePath)) {
-            const list = codeScanIssueMap.get(issue.filePath)
-            if (list === undefined) {
-                codeScanIssueMap.set(issue.filePath, [issue])
-            } else {
-                list.push(issue)
-                codeScanIssueMap.set(issue.filePath, list)
-            }
-        } else {
-            codeScanIssueMap.set(issue.filePath, [issue])
-        }
-    })
-
-    codeScanIssueMap.forEach((issues, key) => {
-        const filePath = path.join(projectPath, '..', key)
-        if (existsSync(filePath) && statSync(filePath).isFile()) {
-            const aggregatedCodeScanIssue: AggregatedCodeScanIssue = {
-                filePath: filePath,
-                issues: issues.map(issue => {
-                    return {
-                        startLine:
-                            issue.startLine === issue.endLine
-                                ? issue.startLine - 1 >= 0
-                                    ? issue.startLine - 1
-                                    : 0
-                                : issue.endLine,
-                        endLine: issue.endLine,
-                        comment: `${issue.title.trim()}: ${issue.description.text.trim()}`,
-                    }
-                }),
-            }
-            aggregatedCodeScanIssueList.push(aggregatedCodeScanIssue)
-        }
-    })
-}
-
-export async function pollScanJobStatus(client: DefaultCodeWhispererClient, jobId: string) {
-    getLogger().verbose(`Polling scan job status...`)
-    let status: string = 'Pending'
-    let timer: number = 0
-    while (true) {
-        const req: codewhispererClient.GetCodeScanRequest = {
-            jobId: jobId,
-        }
-        const resp = await client.getCodeScan(req)
-        getLogger().verbose(`Request id: ${resp.$response.requestId}`)
-        if (resp.status !== 'Pending') {
-            status = resp.status
-            getLogger().verbose(`Scan job status: ${status}`)
-            getLogger().verbose(`Complete Polling scan job status.`)
-            break
-        }
-        await sleep(CodeWhispererConstants.codeScanJobPollingIntervalSeconds * 1000)
-        timer += CodeWhispererConstants.codeScanJobPollingIntervalSeconds
-        if (timer > CodeWhispererConstants.codeScanJobTimeoutSeconds) {
-            getLogger().verbose(`Scan job status: ${status}`)
-            getLogger().verbose(`Scan job timeout.`)
-            throw new Error('Scan job timeout.')
-        }
-    }
-    return status
-}
-
-export async function createScanJob(
-    client: DefaultCodeWhispererClient,
-    artifactMap: codewhispererClient.ArtifactMap,
-    languageId: string
-) {
-    getLogger().verbose(`Creating scan job...`)
-    const req: codewhispererClient.CreateCodeScanRequest = {
-        artifacts: artifactMap,
-        programmingLanguage: {
-            languageName: languageId,
-        },
-    }
-    const resp = await client.createCodeScan(req)
-    getLogger().verbose(`Request id: ${resp.$response.requestId}`)
-    return resp
-}
-
-export async function getPresignedUrlAndUpload(client: DefaultCodeWhispererClient, truncPaths: TruncPaths) {
-    if (truncPaths.src.zip === '') {
-        throw new Error("Truncation failure: can't find valid source zip.")
-    }
-    const srcReq: codewhispererClient.CreateUploadUrlRequest = {
-        artifactType: CodeWhispererConstants.artifactTypeSource,
-        contentMd5: getMd5(truncPaths.src.zip),
-    }
-    getLogger().verbose(`Prepare for uploading src context...`)
-    const srcResp = await client.createUploadUrl(srcReq)
-    getLogger().verbose(`Request id: ${srcResp.$response.requestId}`)
-    getLogger().verbose(`Complete Getting presigned Url for uploading src context.`)
-    getLogger().verbose(`Uploading src context...`)
-    await uploadArtifactToS3(srcResp.uploadUrl, truncPaths.src.zip)
-    getLogger().verbose(`Complete uploading src context.`)
-    let artifactMap: codewhispererClient.ArtifactMap = {
-        SourceCode: srcResp.uploadId,
-    }
-    if (truncPaths.build.zip !== '') {
-        const buildReq: codewhispererClient.CreateUploadUrlRequest = {
-            artifactType: CodeWhispererConstants.artifactTypeBuild,
-            contentMd5: getMd5(truncPaths.build.zip),
-        }
-        getLogger().verbose(`Prepare for uploading build context...`)
-        const buildResp = await client.createUploadUrl(buildReq)
-        getLogger().verbose(`Request id: ${buildResp.$response.requestId}`)
-        getLogger().verbose(`Complete Getting presigned Url for uploading build context.`)
-        getLogger().verbose(`Uploading build context...`)
-        await uploadArtifactToS3(buildResp.uploadUrl, truncPaths.build.zip)
-        getLogger().verbose(`Complete uploading build context.`)
-        artifactMap = {
-            SourceCode: srcResp.uploadId,
-            BuiltJars: buildResp.uploadId,
-        }
-    }
-    return artifactMap
-}
-
-function getMd5(fileName: string) {
-    const hasher = crypto.createHash('md5')
-    hasher.update(readFileSync(fileName))
-    return hasher.digest('base64')
-}
-
-export async function uploadArtifactToS3(presignedUrl: string, fileName: string) {
-    const response = await got(presignedUrl, {
-        method: 'PUT',
-        body: readFileSync(fileName),
-        headers: {
-            'Content-MD5': getMd5(fileName),
-            'x-amz-server-side-encryption': 'AES256',
-            'Content-Type': 'application/zip',
-        },
-    })
-    getLogger().debug(`StatusCode: ${response.statusCode}`)
-}
diff --git a/src/codewhisperer/tracker/codewhispererCodeCoverageTracker.ts b/src/codewhisperer/tracker/codewhispererCodeCoverageTracker.ts
deleted file mode 100644
index f7c08e4c868..00000000000
--- a/src/codewhisperer/tracker/codewhispererCodeCoverageTracker.ts
+++ /dev/null
@@ -1,236 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { getLogger } from '../../shared/logger/logger'
-import * as CodeWhispererConstants from '../models/constants'
-import globals from '../../shared/extensionGlobals'
-import { vsCodeState } from '../models/model'
-import { distance } from 'fastest-levenshtein'
-import { CodewhispererLanguage, telemetry } from '../../shared/telemetry/telemetry'
-import { runtimeLanguageContext } from '../util/runtimeLanguageContext'
-import { TelemetryHelper } from '../util/telemetryHelper'
-
-interface CodeWhispererToken {
-    range: vscode.Range
-    text: string
-    accepted: number
-}
-
-/**
- * This singleton class is mainly used for calculating the code written by codeWhisperer
- */
-export class CodeWhispererCodeCoverageTracker {
-    private _acceptedTokens: { [key: string]: CodeWhispererToken[] }
-    private _totalTokens: { [key: string]: number }
-    private _timer?: NodeJS.Timer
-    private _startTime: number
-    private _language: CodewhispererLanguage
-    private _serviceInvocationCount: number
-
-    private constructor(language: CodewhispererLanguage, private readonly globals: vscode.Memento) {
-        this._acceptedTokens = {}
-        this._totalTokens = {}
-        this._startTime = 0
-        this._language = language
-        this._serviceInvocationCount = 0
-    }
-
-    public get serviceInvocationCount(): number {
-        return this._serviceInvocationCount
-    }
-
-    public get acceptedTokens(): { [key: string]: CodeWhispererToken[] } {
-        return this._acceptedTokens
-    }
-
-    public get totalTokens(): { [key: string]: number } {
-        return this._totalTokens
-    }
-
-    public isActive(): boolean {
-        const isTermsAccepted = this.globals.get<boolean>(CodeWhispererConstants.termsAcceptedKey) || false
-        return TelemetryHelper.instance.isTelemetryEnabled() && isTermsAccepted
-    }
-
-    public countAcceptedTokens(range: vscode.Range, text: string, filename: string) {
-        if (!this.isActive()) {
-            return
-        }
-        // generate accepted recommendation token and stored in collection
-        this.addAcceptedTokens(filename, { range: range, text: text, accepted: text.length })
-        this.addTotalTokens(filename, text.length)
-    }
-
-    public incrementServiceInvocationCount() {
-        this._serviceInvocationCount += 1
-    }
-
-    public flush() {
-        if (!this.isActive()) {
-            this._totalTokens = {}
-            this._acceptedTokens = {}
-            this.closeTimer()
-            return
-        }
-        try {
-            this.emitCodeWhispererCodeContribution()
-        } catch (error) {
-            getLogger().error(`Encountered ${error} when emitting code contribution metric`)
-        }
-    }
-
-    public updateAcceptedTokensCount(editor: vscode.TextEditor) {
-        const filename = editor.document.fileName
-        if (filename in this._acceptedTokens) {
-            for (let i = 0; i < this._acceptedTokens[filename].length; i++) {
-                const oldText = this._acceptedTokens[filename][i].text
-                const newText = editor.document.getText(this._acceptedTokens[filename][i].range)
-                this._acceptedTokens[filename][i].accepted = this.getUnmodifiedAcceptedTokens(oldText, newText)
-            }
-        }
-    }
-    // With edit distance, complicate usermodification can be considered as simple edit(add, delete, replace),
-    // and thus the unmodified part of recommendation length can be deducted/approximated
-    // ex. (modified > original): originalRecom: foo -> modifiedRecom: fobarbarbaro, distance = 9, delta = 12 - 9 = 3
-    // ex. (modified == original): originalRecom: helloworld -> modifiedRecom: HelloWorld, distance = 2, delta = 10 - 2 = 8
-    // ex. (modified < original): originalRecom: CodeWhisperer -> modifiedRecom: CODE, distance = 12, delta = 13 - 12 = 1
-    public getUnmodifiedAcceptedTokens(origin: string, after: string) {
-        return Math.max(origin.length, after.length) - distance(origin, after)
-    }
-
-    public emitCodeWhispererCodeContribution() {
-        let totalTokens = 0
-        for (const filename in this._totalTokens) {
-            totalTokens += this._totalTokens[filename]
-        }
-        if (vscode.window.activeTextEditor) {
-            this.updateAcceptedTokensCount(vscode.window.activeTextEditor)
-        }
-        let acceptedTokens = 0
-        for (const filename in this._acceptedTokens) {
-            this._acceptedTokens[filename].forEach(v => {
-                if (filename in this._totalTokens && this._totalTokens[filename] >= v.accepted) {
-                    acceptedTokens += v.accepted
-                }
-            })
-        }
-        const percentCount = ((acceptedTokens / totalTokens) * 100).toFixed(2)
-        const percentage = Math.round(parseInt(percentCount))
-        telemetry.codewhisperer_codePercentage.emit({
-            codewhispererTotalTokens: totalTokens,
-            codewhispererLanguage: this._language,
-            codewhispererAcceptedTokens: acceptedTokens,
-            codewhispererPercentage: percentage ? percentage : 0,
-            successCount: this._serviceInvocationCount,
-        })
-    }
-
-    private tryStartTimer() {
-        if (this._timer !== undefined) {
-            return
-        }
-        const currentDate = new globals.clock.Date()
-        this._startTime = currentDate.getTime()
-        this._timer = setTimeout(() => {
-            try {
-                const currentTime = new globals.clock.Date().getTime()
-                const delay: number = CodeWhispererConstants.defaultCheckPeriodMillis
-                const diffTime: number = this._startTime + delay
-                if (diffTime <= currentTime) {
-                    let totalTokens = 0
-                    for (const filename in this._totalTokens) {
-                        totalTokens += this._totalTokens[filename]
-                    }
-                    if (totalTokens > 0) {
-                        this.flush()
-                    } else {
-                        getLogger().debug(
-                            `CodeWhispererCodeCoverageTracker: skipped telemetry due to empty tokens array`
-                        )
-                    }
-                }
-            } catch (e) {
-                getLogger().verbose(`Exception Thrown from CodeWhispererCodeCoverageTracker: ${e}`)
-            } finally {
-                this.resetTracker()
-                this.closeTimer()
-            }
-        }, CodeWhispererConstants.defaultCheckPeriodMillis)
-    }
-
-    private resetTracker() {
-        this._totalTokens = {}
-        this._acceptedTokens = {}
-        this._startTime = 0
-        this._serviceInvocationCount = 0
-    }
-
-    private closeTimer() {
-        if (this._timer !== undefined) {
-            clearTimeout(this._timer)
-            this._timer = undefined
-        }
-    }
-
-    public addAcceptedTokens(filename: string, token: CodeWhispererToken) {
-        if (!(filename in this._acceptedTokens)) {
-            this._acceptedTokens[filename] = []
-        }
-        this._acceptedTokens[filename].push(token)
-    }
-
-    public addTotalTokens(filename: string, count: number) {
-        if (!(filename in this._totalTokens)) {
-            this._totalTokens[filename] = 0
-        }
-        this._totalTokens[filename] += count
-        if (this._totalTokens[filename] < 0) {
-            this._totalTokens[filename] = 0
-        }
-    }
-
-    public countTotalTokens(e: vscode.TextDocumentChangeEvent) {
-        // ignore no contentChanges. ignore contentChanges from other plugins (formatters)
-        // only include contentChanges from user action
-        if (
-            !runtimeLanguageContext.isLanguageSupported(e.document.languageId) ||
-            vsCodeState.isCodeWhispererEditing ||
-            e.contentChanges.length !== 1
-        ) {
-            return
-        }
-        const content = e.contentChanges[0]
-        // do not count user tokens if user copies large chunk of code
-        if (content.text.length > 20) {
-            return
-        }
-        this.tryStartTimer()
-        // deletion events has no text.
-        if (content.text.length === 0) {
-            this.addTotalTokens(e.document.fileName, -content.rangeLength)
-        } else {
-            this.addTotalTokens(e.document.fileName, content.text.length)
-        }
-    }
-
-    public static readonly instances = new Map<string, CodeWhispererCodeCoverageTracker>()
-
-    public static getTracker(
-        language: string,
-        memeto: vscode.Memento = globals.context.globalState
-    ): CodeWhispererCodeCoverageTracker | undefined {
-        if (!runtimeLanguageContext.isLanguageSupported(language)) {
-            return undefined
-        }
-        const cwsprLanguage = runtimeLanguageContext.mapVscLanguageToCodeWhispererLanguage(language)
-        if (!cwsprLanguage) {
-            return undefined
-        }
-        const instance = this.instances.get(language) ?? new this(cwsprLanguage, memeto)
-        this.instances.set(language, instance)
-        return instance
-    }
-}
diff --git a/src/codewhisperer/tracker/codewhispererTracker.ts b/src/codewhisperer/tracker/codewhispererTracker.ts
deleted file mode 100644
index 87b23f8f1e9..00000000000
--- a/src/codewhisperer/tracker/codewhispererTracker.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import globals from '../../shared/extensionGlobals'
-import { distance } from 'fastest-levenshtein'
-import { AcceptedSuggestionEntry } from '../models/model'
-import { getLogger } from '../../shared/logger/logger'
-import { telemetry } from '../../shared/telemetry/telemetry'
-import { TelemetryHelper } from '../util/telemetryHelper'
-
-/**
- * This singleton class is mainly used for calculating the percentage of user modification.
- * The current calculation method is (Levenshtein edit distance / acceptedSuggestion.length).
- */
-export class CodeWhispererTracker {
-    private _eventQueue: AcceptedSuggestionEntry[]
-    private _timer?: NodeJS.Timer
-    private static instance: CodeWhispererTracker
-
-    /**
-     * the interval of the background thread invocation, which is triggered by the timer
-     */
-    private static readonly defaultCheckPeriodMillis = 1000 * 60 * 1 // 1 minute in milliseconds
-    /**
-     * modification should be recorded at least 5 minutes after accepted into the editor
-     */
-    private static readonly defaultModificationIntervalMillis = 1000 * 60 * 5 // 5 minutes in milliseconds
-
-    /**
-     * This is to avoid user overflowing the eventQueue by spamming accepted suggestions
-     */
-    private static readonly defaultMaxQueueSize = 10000
-
-    private constructor() {
-        this._eventQueue = []
-    }
-
-    public enqueue(suggestion: AcceptedSuggestionEntry) {
-        if (!globals.telemetry.telemetryEnabled) {
-            return
-        }
-
-        if (this._eventQueue.length >= 0) {
-            this.startTimer()
-        }
-
-        if (this._eventQueue.length >= CodeWhispererTracker.defaultMaxQueueSize) {
-            this._eventQueue.shift()
-        }
-        this._eventQueue.push(suggestion)
-    }
-
-    public async flush() {
-        if (!globals.telemetry.telemetryEnabled) {
-            this._eventQueue = []
-            this.closeTimer()
-            return
-        }
-
-        const currentTime = new Date()
-        const newEventQueue: AcceptedSuggestionEntry[] = []
-        for (const suggestion of this._eventQueue) {
-            if (
-                currentTime.getTime() - suggestion.time.getTime() >
-                CodeWhispererTracker.defaultModificationIntervalMillis
-            ) {
-                this.emitTelemetryOnSuggestion(suggestion)
-            } else {
-                newEventQueue.push(suggestion)
-            }
-        }
-
-        this._eventQueue = newEventQueue
-        if (this._eventQueue.length === 0) {
-            this.closeTimer()
-        }
-    }
-
-    public async emitTelemetryOnSuggestion(suggestion: AcceptedSuggestionEntry) {
-        let percentage = 1.0
-        try {
-            if (suggestion.fileUrl?.scheme !== '') {
-                const document = await vscode.workspace.openTextDocument(suggestion.fileUrl)
-                if (document) {
-                    const currString = document.getText(
-                        new vscode.Range(suggestion.startPosition, suggestion.endPosition)
-                    )
-                    percentage = this.checkDiff(currString, suggestion.originalString)
-                }
-            }
-        } catch (e) {
-            getLogger().verbose(`Exception Thrown from CodeWhispererTracker: ${e}`)
-        } finally {
-            telemetry.codewhisperer_userModification.emit({
-                codewhispererRequestId: suggestion.requestId ? suggestion.requestId : 'undefined',
-                codewhispererSessionId: suggestion.sessionId ? suggestion.sessionId : undefined,
-                codewhispererTriggerType: suggestion.triggerType,
-                codewhispererSuggestionIndex: suggestion.index ? suggestion.index : 0,
-                codewhispererModificationPercentage: percentage ? percentage : 0,
-                codewhispererCompletionType: suggestion.completionType,
-                codewhispererLanguage: suggestion.language,
-                credentialStartUrl: TelemetryHelper.instance.startUrl,
-            })
-        }
-    }
-
-    /**
-     * This function calculates the Levenshtein edit distance of currString from original accepted String
-     * then return a percentage against the length of accepted string (capped by 1,0)
-     * @param currString the current string in the same location as the previously accepted suggestion
-     * @param acceptedString the accepted suggestion that was inserted into the editor
-     */
-    public checkDiff(currString?: string, acceptedString?: string): number {
-        if (!currString || !acceptedString || currString.length == 0 || acceptedString.length == 0) {
-            return 1.0
-        }
-
-        const diff = distance(currString, acceptedString)
-        return Math.min(1.0, diff / acceptedString.length)
-    }
-
-    public async startTimer() {
-        if (!this._timer) {
-            this._timer = setTimeout(async () => {
-                try {
-                    await this.flush()
-                } finally {
-                    if (this._timer !== undefined) {
-                        this._timer!.refresh()
-                    }
-                }
-            }, CodeWhispererTracker.defaultCheckPeriodMillis)
-        }
-    }
-
-    public closeTimer() {
-        if (this._timer !== undefined) {
-            clearTimeout(this._timer)
-            this._timer = undefined
-        }
-    }
-
-    public async shutdown() {
-        this.closeTimer()
-
-        if (globals.telemetry.telemetryEnabled) {
-            try {
-                this.flush()
-            } finally {
-                this._eventQueue = []
-            }
-        }
-    }
-
-    public static getTracker(): CodeWhispererTracker {
-        if (!CodeWhispererTracker.instance) {
-            CodeWhispererTracker.instance = new CodeWhispererTracker()
-        }
-        return CodeWhispererTracker.instance
-    }
-}
diff --git a/src/codewhisperer/util/authUtil.ts b/src/codewhisperer/util/authUtil.ts
deleted file mode 100644
index a8621e958b9..00000000000
--- a/src/codewhisperer/util/authUtil.ts
+++ /dev/null
@@ -1,207 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import globals from '../../shared/extensionGlobals'
-
-import * as vscode from 'vscode'
-import * as CodeWhispererConstants from '../models/constants'
-import {
-    Auth,
-    createBuilderIdProfile,
-    codewhispererScopes,
-    isBuilderIdConnection,
-    createSsoProfile,
-    isSsoConnection,
-    hasScopes,
-} from '../../credentials/auth'
-import { Connection, SsoConnection } from '../../credentials/auth'
-import { ToolkitError } from '../../shared/errors'
-import { getSecondaryAuth } from '../../credentials/secondaryAuth'
-import { once } from '../../shared/utilities/functionUtils'
-import { Commands } from '../../shared/vscode/commands2'
-import { isCloud9 } from '../../shared/extensionUtilities'
-import { TelemetryHelper } from './telemetryHelper'
-import { CancellationError } from '../../shared/utilities/timeoutUtils'
-import { getCodeCatalystDevEnvId } from '../../shared/vscode/env'
-
-export const awsBuilderIdSsoProfile = createBuilderIdProfile()
-// No connections are valid within C9
-const isValidCodeWhispererConnection = (conn: Connection): conn is SsoConnection =>
-    !isCloud9() && isSsoConnection(conn) && hasScopes(conn, codewhispererScopes)
-
-export class AuthUtil {
-    private readonly isAvailable = getCodeCatalystDevEnvId() === undefined
-    static #instance: AuthUtil
-
-    private usingEnterpriseSSO: boolean = false
-
-    private readonly clearAccessToken = once(() =>
-        globals.context.globalState.update(CodeWhispererConstants.accessToken, undefined)
-    )
-    private readonly secondaryAuth = getSecondaryAuth('codewhisperer', 'CodeWhisperer', isValidCodeWhispererConnection)
-    public readonly restore = () => this.secondaryAuth.restoreConnection()
-
-    public constructor(public readonly auth = Auth.instance) {
-        // codewhisperer uses sigv4 creds on C9
-        if (isCloud9() || !this.isAvailable) {
-            return
-        }
-
-        this.secondaryAuth.onDidChangeActiveConnection(async conn => {
-            if (conn?.type === 'sso') {
-                if (this.auth.getConnectionState(conn) === 'valid') {
-                    await this.clearAccessToken()
-                }
-                this.usingEnterpriseSSO = !isBuilderIdConnection(conn)
-            } else {
-                this.usingEnterpriseSSO = false
-            }
-            TelemetryHelper.instance.startUrl = this.conn?.startUrl
-            await Promise.all([
-                vscode.commands.executeCommand('aws.codeWhisperer.refresh'),
-                vscode.commands.executeCommand('aws.codeWhisperer.refreshRootNode'),
-                vscode.commands.executeCommand('aws.codeWhisperer.refreshStatusBar'),
-                vscode.commands.executeCommand('aws.codeWhisperer.updateReferenceLog'),
-            ])
-        })
-
-        Commands.register('aws.codeWhisperer.removeConnection', () => this.secondaryAuth.removeConnection())
-    }
-
-    // current active cwspr connection
-    public get conn() {
-        return this.isAvailable ? this.secondaryAuth.activeConnection : undefined
-    }
-
-    public get isUsingSavedConnection() {
-        return this.conn !== undefined && this.secondaryAuth.isUsingSavedConnection
-    }
-
-    public isConnected(): boolean {
-        return this.conn !== undefined
-    }
-
-    public isEnterpriseSsoInUse(): boolean {
-        return this.conn !== undefined && this.usingEnterpriseSSO
-    }
-
-    public async connectToAwsBuilderId() {
-        const existingConn = (await this.auth.listConnections()).find(
-            (conn): conn is SsoConnection => isValidCodeWhispererConnection(conn) && isBuilderIdConnection(conn)
-        )
-        const conn = existingConn ?? (await this.auth.createConnection(awsBuilderIdSsoProfile))
-        await this.secondaryAuth.useNewConnection(conn)
-    }
-
-    public async connectToEnterpriseSso(startUrl: string) {
-        const existingConn = (await this.auth.listConnections()).find(
-            (conn): conn is SsoConnection =>
-                isSsoConnection(conn) && conn.startUrl.toLowerCase() === startUrl.toLowerCase()
-        )
-
-        if (!existingConn) {
-            const conn = await this.auth.createConnection(createSsoProfile(startUrl))
-            return this.secondaryAuth.useNewConnection(conn)
-        } else if (isValidCodeWhispererConnection(existingConn)) {
-            return this.secondaryAuth.useNewConnection(existingConn)
-        } else if (isSsoConnection(existingConn)) {
-            return this.promptUpgrade(existingConn, 'startUrl')
-        }
-    }
-
-    public static get instance() {
-        return (this.#instance ??= new this())
-    }
-
-    public async getBearerToken(): Promise<string> {
-        await this.restore()
-
-        if (this.conn === undefined) {
-            throw new ToolkitError('No connection found', { code: 'NoConnection' })
-        }
-
-        const bearerToken = await this.conn.getToken()
-        return bearerToken.accessToken
-    }
-
-    public isConnectionValid(): boolean {
-        return this.conn !== undefined && !this.secondaryAuth.isConnectionExpired
-    }
-
-    public isConnectionExpired(): boolean {
-        return this.secondaryAuth.isConnectionExpired
-    }
-
-    public async reauthenticate() {
-        if (this.isConnectionExpired()) {
-            try {
-                await this.auth.reauthenticate(this.conn!)
-            } catch (err) {
-                throw ToolkitError.chain(err, 'Unable to authenticate connection')
-            }
-        }
-    }
-
-    public async showReauthenticatePrompt() {
-        await vscode.window
-            .showWarningMessage(CodeWhispererConstants.connectionExpired, 'Cancel', 'Learn More', 'Authenticate')
-            .then(async resp => {
-                if (resp === 'Learn More') {
-                    vscode.env.openExternal(vscode.Uri.parse(CodeWhispererConstants.learnMoreUri))
-                } else if (resp === 'Authenticate') {
-                    await this.reauthenticate()
-                }
-            })
-    }
-
-    #hasSeenUpgradeNotification = false
-    public async promptUpgrade(existingConn: SsoConnection, upgradeType: 'current' | 'startUrl' | 'passive') {
-        const modal = upgradeType === 'current' || upgradeType === 'startUrl'
-        if (upgradeType !== 'startUrl' && this.#hasSeenUpgradeNotification) {
-            return false
-        }
-        this.#hasSeenUpgradeNotification = upgradeType === 'startUrl' ? this.#hasSeenUpgradeNotification : true
-
-        const message =
-            upgradeType === 'startUrl'
-                ? 'The provided start URL is associated with a connection that lacks permissions required by CodeWhisperer. Upgrading the connection will require another login.\n\nUpgrade now?'
-                : 'The current connection lacks permissions required by CodeWhisperer. Upgrading the connection will require another login.\n\nUpgrade now?'
-
-        const resp = await vscode.window.showWarningMessage(
-            message,
-            { modal },
-            { title: 'Yes' },
-            { title: 'No', isCloseAffordance: true }
-        )
-        if (resp?.title !== 'Yes') {
-            throw new CancellationError('user')
-        }
-
-        const upgradedConn = await this.auth.createConnection(createSsoProfile(existingConn.startUrl))
-        try {
-            if (this.auth.activeConnection?.id === (existingConn as SsoConnection).id) {
-                await this.auth.useConnection(upgradedConn)
-            } else {
-                await this.secondaryAuth.useNewConnection(upgradedConn)
-            }
-        } catch (err) {
-            // Don't allow duplicates to exist on errors
-            await this.auth.deleteConnection(upgradedConn)
-            throw err
-        }
-
-        // This is non-breaking as codewhisperer is the only thing saving enterprise SSO connections at the moment
-        await this.auth.deleteConnection(existingConn)
-
-        return true
-    }
-
-    public hasAccessToken() {
-        return !!globals.context.globalState.get(CodeWhispererConstants.accessToken)
-    }
-}
-
-export const isUpgradeableConnection = (conn?: Connection): conn is SsoConnection =>
-    !!conn && !isValidCodeWhispererConnection(conn) && isSsoConnection(conn)
diff --git a/src/codewhisperer/util/closingBracketUtil.ts b/src/codewhisperer/util/closingBracketUtil.ts
deleted file mode 100644
index e4bfa403017..00000000000
--- a/src/codewhisperer/util/closingBracketUtil.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { workspace, WorkspaceEdit } from 'vscode'
-import { isCloud9 } from '../../shared/extensionUtilities'
-import * as CodeWhispererConstants from '../models/constants'
-
-interface bracketMapType {
-    [k: string]: string
-}
-
-const bracketMap: bracketMapType = {
-    ')': '(',
-    ']': '[',
-    '}': '{',
-}
-
-export const calculateBracketsLevel = (code: string, isRightContext: boolean = false) => {
-    const bracketCounts: Map<string, number> = new Map([
-        ['(', 0],
-        ['[', 0],
-        ['{', 0],
-    ])
-    const bracketsIndexLevel = []
-
-    for (let i = 0; i < code.length; i++) {
-        const char = code[i]
-        if (bracketCounts.has(char)) {
-            const count = bracketCounts.get(char) || 0
-            const newCount = count + 1
-            bracketCounts.set(char, newCount)
-            bracketsIndexLevel.push({
-                char,
-                count: newCount,
-                idx: i,
-            })
-        } else if (char in bracketMap) {
-            const correspondingBracket = bracketMap[char as keyof bracketMapType]
-            const count = bracketCounts.get(correspondingBracket) || 0
-            const newCount = count === 0 ? 0 : count - 1
-            bracketCounts.set(bracketMap[char], newCount)
-            bracketsIndexLevel.push({
-                char: correspondingBracket,
-                count: newCount,
-                idx: i,
-            })
-        } else if (isRightContext && !(char in bracketMap) && !bracketCounts.has(char) && !/\s/.test(char)) {
-            // we can stop processing right context when we encounter a char that is not a bracket nor white space
-            break
-        }
-    }
-    return bracketsIndexLevel
-}
-
-export const getBracketsToRemove = (recommendation: string, rightContext: string) => {
-    const recommendationBrackets = calculateBracketsLevel(recommendation)
-    const rightContextBrackets = calculateBracketsLevel(rightContext, true)
-    let i = 0
-    let j = 0
-    const toBeRemoved = []
-
-    while (i < recommendationBrackets.length && j < rightContextBrackets.length) {
-        const { char: char1, count: level1 } = recommendationBrackets[i]
-        const { char: char2, count: level2, idx: idx2 } = rightContextBrackets[j]
-        if (char1 !== char2 || level1 !== level2) {
-            i++
-            continue
-        }
-        toBeRemoved.push(idx2)
-        i++
-        j++
-    }
-    return toBeRemoved
-}
-
-export const removeBracketsFromRightContext = async (
-    editor: vscode.TextEditor,
-    idxToRemove: number[],
-    endPosition: vscode.Position
-) => {
-    const offset = editor.document.offsetAt(endPosition)
-
-    if (isCloud9()) {
-        const edits = idxToRemove.map(idx => ({
-            range: new vscode.Range(
-                editor.document.positionAt(offset + idx),
-                editor.document.positionAt(offset + idx + 1)
-            ),
-            newText: '',
-        }))
-        const wEdit = new WorkspaceEdit()
-        wEdit.set(editor.document.uri, [...edits])
-        await workspace.applyEdit(wEdit)
-    } else {
-        await editor.edit(
-            editBuilder => {
-                idxToRemove.forEach(idx => {
-                    const range = new vscode.Range(
-                        editor.document.positionAt(offset + idx),
-                        editor.document.positionAt(offset + idx + 1)
-                    )
-                    editBuilder.delete(range)
-                })
-            },
-            { undoStopAfter: false, undoStopBefore: false }
-        )
-    }
-}
-
-export async function handleExtraBrackets(
-    editor: vscode.TextEditor,
-    recommendation: string,
-    endPosition: vscode.Position
-) {
-    const end = editor.document.offsetAt(endPosition)
-    const rightContext = editor.document.getText(
-        new vscode.Range(
-            editor.document.positionAt(end),
-            editor.document.positionAt(end + CodeWhispererConstants.charactersLimit)
-        )
-    )
-    const bracketsToRemove = getBracketsToRemove(recommendation, rightContext)
-    if (bracketsToRemove.length) {
-        removeBracketsFromRightContext(editor, bracketsToRemove, endPosition)
-    }
-}
diff --git a/src/codewhisperer/util/codewhispererSettings.ts b/src/codewhisperer/util/codewhispererSettings.ts
deleted file mode 100644
index 5ed5120ce48..00000000000
--- a/src/codewhisperer/util/codewhispererSettings.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import { fromExtensionManifest } from '../../shared/settings'
-
-const description = {
-    includeSuggestionsWithCodeReferences: Boolean,
-    shareCodeWhispererContentWithAWS: Boolean,
-}
-export class CodeWhispererSettings extends fromExtensionManifest('aws.codeWhisperer', description) {
-    public isSuggestionsWithCodeReferencesEnabled(): boolean {
-        return this.get(`includeSuggestionsWithCodeReferences`, false)
-    }
-
-    public isOptoutEnabled(): boolean {
-        const value = this.get('shareCodeWhispererContentWithAWS', true)
-        return !value
-    }
-
-    static #instance: CodeWhispererSettings
-
-    public static get instance() {
-        return (this.#instance ??= new this())
-    }
-}
diff --git a/src/codewhisperer/util/cognitoIdentity.ts b/src/codewhisperer/util/cognitoIdentity.ts
deleted file mode 100644
index 1a79bf19fca..00000000000
--- a/src/codewhisperer/util/cognitoIdentity.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import { CognitoIdentity, CognitoIdentityCredentials } from 'aws-sdk'
-import * as CodeWhispererConstants from '../models/constants'
-import globals from '../../shared/extensionGlobals'
-import { getLogger } from '../../shared/logger'
-
-const cognitoIdKey = 'cognitoID'
-
-export const getCognitoCredentials = async (): Promise<CognitoIdentityCredentials> => {
-    const region = CodeWhispererConstants.region
-    try {
-        // grab Cognito identityId
-        const poolId = CodeWhispererConstants.identityPoolID
-        const identityMapJson = globals.context.globalState.get<string>(cognitoIdKey, '[]')
-
-        const identityMap = new Map<string, string>(JSON.parse(identityMapJson) as Iterable<[string, string]>)
-        let identityId = identityMap.get(poolId)
-
-        // if we don't have an identity, get one
-        if (!identityId) {
-            identityId = await getIdentityFromIdentityPool()
-
-            // save it
-            identityMap.set(poolId, identityId)
-            await globals.context.globalState.update(cognitoIdKey, JSON.stringify(Array.from(identityMap.entries())))
-        }
-
-        const credentials = new CognitoIdentityCredentials({ IdentityId: identityId }, { region })
-        return credentials
-    } catch (err) {
-        getLogger().error(`Failed to initialize Cognito identity for CodeWhisperer: ${err} in region: ${region}`)
-        return Promise.reject(`Failed to initialize Cognito identity for CodeWhisperer: ${err}`)
-    }
-}
-
-const getIdentityFromIdentityPool = async (): Promise<string> => {
-    try {
-        const res = await new CognitoIdentity({
-            region: CodeWhispererConstants.region,
-        })
-            .getId({
-                IdentityPoolId: CodeWhispererConstants.identityPoolID,
-            })
-            .promise()
-
-        const err = res.$response.error
-        if (err) {
-            getLogger().error(`Error getting identity from Cognito. Request ID: ${res.$response.requestId}`)
-            return Promise.reject(`SDK error: ${err}`)
-        }
-
-        const { IdentityId } = res
-
-        if (!IdentityId) {
-            getLogger().error(`Identity ID was null from Cognito. Request ID: ${res.$response.requestId}`)
-            return Promise.reject('missing Identity ID')
-        }
-
-        return IdentityId
-    } catch (err) {
-        return Promise.reject(`Failed to get new Cognito identity for CodeWhisperer: ${err}`)
-    }
-}
diff --git a/src/codewhisperer/util/commonUtil.ts b/src/codewhisperer/util/commonUtil.ts
deleted file mode 100644
index 997889f20eb..00000000000
--- a/src/codewhisperer/util/commonUtil.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as semver from 'semver'
-import { isCloud9 } from '../../shared/extensionUtilities'
-import { getInlineSuggestEnabled } from '../../shared/utilities/editorUtilities'
-
-export function getLocalDatetime() {
-    const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone
-    return new Date().toLocaleString([], { timeZone: timezone })
-}
-
-export function asyncCallWithTimeout<T>(asyncPromise: Promise<T>, message: string, timeLimit: number): Promise<T> {
-    let timeoutHandle: NodeJS.Timeout
-    const timeoutPromise = new Promise((_resolve, reject) => {
-        timeoutHandle = setTimeout(() => reject(new Error(message)), timeLimit)
-    })
-    return Promise.race([asyncPromise, timeoutPromise]).then(result => {
-        clearTimeout(timeoutHandle)
-        return result as T
-    })
-}
-
-export function isAwsError(error: any): boolean {
-    return (
-        typeof error?.name === 'string' &&
-        typeof error.message === 'string' &&
-        typeof error.code === 'string' &&
-        error.time instanceof Date
-    )
-}
-
-export function isInlineCompletionEnabled() {
-    return semver.gte(vscode.version, '1.68.0') && getInlineSuggestEnabled() && !isCloud9()
-}
-
-export function getFileExt(languageId: string) {
-    switch (languageId) {
-        case 'java':
-            return '.java'
-        case 'python':
-            return '.py'
-        default:
-            break
-    }
-    return undefined
-}
-
-/**
- * Returns the longest overlap between the Suffix of firstString and Prefix of second string
- * getPrefixSuffixOverlap("adwg31", "31ggrs") = "31"
- */
-export function getPrefixSuffixOverlap(firstString: string, secondString: string) {
-    let i = Math.min(firstString.length, secondString.length)
-    while (i > 0) {
-        if (secondString.slice(0, i) === firstString.slice(-i)) {
-            break
-        }
-        i--
-    }
-    return secondString.slice(0, i)
-}
diff --git a/src/codewhisperer/util/dependencyGraph/dependencyGraph.ts b/src/codewhisperer/util/dependencyGraph/dependencyGraph.ts
deleted file mode 100644
index 3102ad9cd20..00000000000
--- a/src/codewhisperer/util/dependencyGraph/dependencyGraph.ts
+++ /dev/null
@@ -1,190 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as fs from 'fs-extra'
-import * as vscode from 'vscode'
-import * as admZip from 'adm-zip'
-import { existsSync, statSync } from 'fs'
-import { asyncCallWithTimeout } from '../commonUtil'
-import path = require('path')
-import { tempDirPath } from '../../../shared/filesystemUtilities'
-import * as CodeWhispererConstants from '../../models/constants'
-import { getLogger } from '../../../shared/logger'
-
-export interface Truncation {
-    dir: string
-    zip: string
-    size: number
-    zipSize: number
-}
-
-export interface TruncPaths {
-    root: string
-    src: Truncation
-    build: Truncation
-    lines: number
-}
-
-export const DependencyGraphConstants = {
-    /**
-     * Key words
-     */
-    import: 'import',
-    from: 'from',
-    as: 'as',
-    static: 'static',
-    package: 'package',
-    semicolon: ';',
-
-    /**
-     * Regex
-     */
-    newlineRegex: /\r?\n/,
-
-    /**
-     * File extension
-     */
-    pythonExt: '.py',
-    javaExt: '.java',
-    javaBuildExt: '.class',
-    jsExt: '.js',
-}
-
-export abstract class DependencyGraph {
-    protected _languageId: string = ''
-    protected _sysPaths: Set<string> = new Set<string>()
-    protected _parsedStatements: Set<string> = new Set<string>()
-    protected _pickedSourceFiles: Set<string> = new Set<string>()
-    protected _fetchedDirs: Set<string> = new Set<string>()
-    protected _totalSize: number = 0
-    protected _tmpDir: string = tempDirPath
-    protected _truncDir: string = ''
-    protected _totalLines: number = 0
-
-    constructor(languageId: string) {
-        this._languageId = languageId
-    }
-
-    public getRootFile(editor: vscode.TextEditor) {
-        return editor.document.uri
-    }
-
-    public getProjectName(uri: vscode.Uri) {
-        const projectPath = this.getProjectPath(uri)
-        return path.basename(projectPath)
-    }
-
-    public getProjectPath(uri: vscode.Uri) {
-        const workspaceFolder = vscode.workspace.getWorkspaceFolder(uri)
-        if (workspaceFolder === undefined) {
-            return path.dirname(uri.fsPath)
-        }
-        return workspaceFolder.uri.fsPath
-    }
-
-    protected getBaseDirPath(uri: vscode.Uri) {
-        return path.dirname(uri.fsPath)
-    }
-
-    protected getDirPaths(uri: vscode.Uri): string[] {
-        let dirPath = this.getBaseDirPath(uri)
-        const paths: string[] = [dirPath]
-        const projectPath = this.getProjectPath(uri)
-        while (dirPath != projectPath) {
-            dirPath = path.join(dirPath, '..')
-            paths.push(dirPath)
-        }
-        return paths
-    }
-
-    protected copyFileToTmp(uri: vscode.Uri, destDir: string) {
-        const projectName = this.getProjectName(uri)
-        if (projectName) {
-            const pos = uri.path.indexOf(projectName)
-            const dest = path.join(destDir, uri.path.substring(pos))
-            fs.copySync(uri.fsPath, dest)
-        }
-    }
-
-    protected zipDir(dir: string, out: string, extension: string): string {
-        const zip = new admZip()
-        zip.addLocalFolder(dir)
-        zip.writeZip(out + extension)
-        return out + extension
-    }
-
-    protected removeDir(dir: string) {
-        if (existsSync(dir)) {
-            fs.removeSync(dir)
-        }
-    }
-
-    protected removeZip(zipFilePath: string) {
-        if (existsSync(zipFilePath)) {
-            fs.unlinkSync(zipFilePath)
-        }
-    }
-
-    protected getTruncDirPath(uri: vscode.Uri) {
-        if (this._truncDir === '') {
-            this._truncDir = path.join(
-                this._tmpDir,
-                CodeWhispererConstants.codeScanTruncDirPrefix + '_' + new Date().getTime().toString()
-            )
-        }
-        return this._truncDir
-    }
-
-    protected getTruncSourceDirPath(uri: vscode.Uri) {
-        return path.join(this.getTruncDirPath(uri), 'src')
-    }
-
-    protected getTruncBuildDirPath(uri: vscode.Uri) {
-        return path.join(this.getTruncDirPath(uri), 'build')
-    }
-
-    protected getFilesTotalSize(files: string[]) {
-        return files.map(file => statSync(file)).reduce((accumulator, { size }) => accumulator + size, 0)
-    }
-
-    protected copyFilesToTmpDir(files: Set<string> | string[], dir: string) {
-        files.forEach(filePath => {
-            this.copyFileToTmp(vscode.Uri.file(filePath), dir)
-        })
-    }
-
-    public removeTmpFiles(truncation: TruncPaths) {
-        getLogger().verbose(`Cleaning up temporary files...`)
-        this.removeZip(truncation.src.zip)
-        this.removeZip(truncation.build.zip)
-        this.removeDir(truncation.src.dir)
-        this.removeDir(truncation.build.dir)
-        this.removeDir(truncation.root)
-        getLogger().verbose(`Complete cleaning up temporary files.`)
-    }
-
-    public async generateTruncationWithTimeout(uri: vscode.Uri, seconds: number) {
-        getLogger().verbose(`Scanning project for context truncation.`)
-        return await asyncCallWithTimeout(this.generateTruncation(uri), 'Context truncation timeout.', seconds * 1000)
-    }
-
-    abstract generateTruncation(uri: vscode.Uri): Promise<TruncPaths>
-
-    abstract searchDependency(uri: vscode.Uri): Promise<Set<string>>
-
-    abstract traverseDir(dirPath: string): void
-
-    abstract parseImport(importStr: string, dirPaths: string[]): string[]
-
-    abstract updateSysPaths(uri: vscode.Uri): void
-
-    abstract getDependencies(uri: vscode.Uri, imports: string[]): void
-
-    abstract reachSizeLimit(size: number): boolean
-
-    abstract willReachSizeLimit(current: number, adding: number): boolean
-
-    abstract getReadableSizeLimit(): string
-}
diff --git a/src/codewhisperer/util/dependencyGraph/dependencyGraphFactory.ts b/src/codewhisperer/util/dependencyGraph/dependencyGraphFactory.ts
deleted file mode 100644
index e755292f541..00000000000
--- a/src/codewhisperer/util/dependencyGraph/dependencyGraphFactory.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { JavaDependencyGraph } from './javaDependencyGraph'
-import { PythonDependencyGraph } from './pythonDependencyGraph'
-import { JavascriptDependencyGraph } from './javascriptDependencyGraph'
-import * as CodeWhispererConstants from '../../models/constants'
-
-const languageMap = {
-    java: JavaDependencyGraph,
-    python: PythonDependencyGraph,
-    javascript: JavascriptDependencyGraph,
-} as const
-
-type LanguageMap = typeof languageMap
-type Keys = keyof LanguageMap
-type Tuples<T> = T extends Keys ? [T, InstanceType<LanguageMap[T]>] : never
-type ClassType<A extends Keys> = Extract<Tuples<Keys>, [A, any]>[1]
-
-export class DependencyGraphFactory {
-    static getDependencyGraph<K extends Keys>(k: string): ClassType<K> {
-        switch (k) {
-            case CodeWhispererConstants.java:
-                return new languageMap['java'](CodeWhispererConstants.java)
-            case CodeWhispererConstants.python:
-                return new languageMap['python'](CodeWhispererConstants.python)
-            case CodeWhispererConstants.javascript:
-                return new languageMap['javascript'](CodeWhispererConstants.javascript)
-            default:
-                return undefined
-        }
-    }
-}
diff --git a/src/codewhisperer/util/dependencyGraph/javaDependencyGraph.ts b/src/codewhisperer/util/dependencyGraph/javaDependencyGraph.ts
deleted file mode 100644
index 53a2d1de126..00000000000
--- a/src/codewhisperer/util/dependencyGraph/javaDependencyGraph.ts
+++ /dev/null
@@ -1,433 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import { existsSync, statSync, readdirSync, readlinkSync } from 'fs'
-import * as vscode from 'vscode'
-import { DependencyGraphConstants, DependencyGraph, TruncPaths } from './dependencyGraph'
-import { sleep } from '../../../shared/utilities/timeoutUtils'
-import { readFileAsString } from '../../../shared/filesystemUtilities'
-import { getLogger } from '../../../shared/logger'
-import * as CodeWhispererConstants from '../../models/constants'
-import path = require('path')
-
-export interface PackageNode {
-    paths: string[]
-    valid: boolean
-}
-
-export interface JavaStatement {
-    imports: string[]
-    packages: string[]
-}
-
-export const importRegex = /^import(\s+static\s*)?\s+([\w\.]+)\s*;/gm
-export const packageRegex = /^package\s+([\w\.]+)\s*;/gm
-
-export class JavaDependencyGraph extends DependencyGraph {
-    private _outputDirs: Set<string> = new Set<string>()
-    private _outputNonStrictDirs: Set<string> = new Set<string>()
-    private _buildFileRelativePaths: Set<string> = new Set<string>()
-    private _packageStrs: Set<string> = new Set<string>()
-
-    getReadableSizeLimit(): string {
-        return `${CodeWhispererConstants.codeScanJavaPayloadSizeLimitBytes / Math.pow(2, 20)}MB`
-    }
-
-    willReachSizeLimit(current: number, adding: number): boolean {
-        return current + adding > CodeWhispererConstants.codeScanJavaPayloadSizeLimitBytes
-    }
-
-    reachSizeLimit(size: number): boolean {
-        return size > CodeWhispererConstants.codeScanJavaPayloadSizeLimitBytes
-    }
-
-    private extractStatement(content: string): JavaStatement {
-        return {
-            imports: content.match(new RegExp(importRegex)) ?? [],
-            packages: content.match(new RegExp(packageRegex)) ?? [],
-        }
-    }
-
-    private generateSourceFilePath(dirPath: string, importPath: string) {
-        const filePath = path.join(dirPath, importPath + DependencyGraphConstants.javaExt)
-        return existsSync(filePath) ? filePath : ''
-    }
-
-    private generateSourceFilePathsOfAsterisk(dirPath: string, importPath: string) {
-        if (!importPath.endsWith('*')) {
-            throw new Error('Asterisk is not found in import statement.')
-        }
-        const targetDir = path.join(dirPath, importPath.substring(0, importPath.length - 1))
-        const filePaths: string[] = []
-        readdirSync(targetDir, { withFileTypes: true }).forEach(file => {
-            const fileAbsPath = path.join(dirPath, file.name)
-            if (existsSync(fileAbsPath) && file.isFile() && file.name.endsWith(DependencyGraphConstants.javaExt)) {
-                filePaths.push(fileAbsPath)
-            }
-        })
-        return filePaths
-    }
-
-    private generateSourceFilePaths(dirPaths: string[], importPath: string) {
-        const paths: string[] = []
-        dirPaths.forEach(dirPath => {
-            if (importPath.endsWith('*')) {
-                const filePaths = this.generateSourceFilePathsOfAsterisk(dirPath, importPath)
-                filePaths.forEach(path => {
-                    paths.push(path)
-                })
-            } else {
-                const filePath = this.generateSourceFilePath(dirPath, importPath)
-                if (filePath !== '') {
-                    paths.push(filePath)
-                }
-            }
-        })
-        return paths
-    }
-
-    private generatePackagePath(packageStr: string) {
-        const packagePos = packageStr.indexOf(DependencyGraphConstants.package)
-        const semicolonPos = packageStr.indexOf(DependencyGraphConstants.semicolon)
-        const rawPackagePath = packageStr
-            .substring(packagePos + DependencyGraphConstants.package.length, semicolonPos)
-            .trim()
-        this._packageStrs.add(rawPackagePath)
-        let packagePath = ''
-        rawPackagePath.split('.').forEach(rpp => {
-            packagePath = path.join(packagePath, rpp)
-        })
-        return packagePath
-    }
-
-    private generateBuildFileRelativePath(uri: vscode.Uri, projectPath: string, pacakges: RegExpMatchArray) {
-        const packagePath = pacakges.length > 0 ? this.generatePackagePath(pacakges[0]) : ''
-        const sourceFilePath = uri.fsPath
-        if (!sourceFilePath.startsWith(projectPath)) {
-            throw new Error("Invalid source file path which doesn't contain valid workspace.")
-        }
-        let buildFileRelativePath
-        if (packagePath === '') {
-            buildFileRelativePath = path.parse(sourceFilePath).base
-        } else {
-            const pos = sourceFilePath.lastIndexOf(packagePath)
-            buildFileRelativePath = sourceFilePath.substring(pos)
-        }
-        return buildFileRelativePath.replace(path.extname(sourceFilePath), DependencyGraphConstants.javaBuildExt)
-    }
-
-    private getImportPath(importStr: string) {
-        const importPos = importStr.indexOf(DependencyGraphConstants.import)
-        const semicolonPos = importStr.indexOf(DependencyGraphConstants.semicolon)
-        let rawImportPath = importStr.substring(importPos + DependencyGraphConstants.import.length, semicolonPos).trim()
-        if (rawImportPath.startsWith(DependencyGraphConstants.static + ' ')) {
-            const start = DependencyGraphConstants.static.length
-            const end = rawImportPath.lastIndexOf('.')
-            rawImportPath = rawImportPath.substring(start, end).trim()
-        }
-        return path.join(...rawImportPath.split('.'))
-    }
-
-    parseImport(importStr: string, dirPaths: string[]) {
-        if (this._parsedStatements.has(importStr)) {
-            return []
-        }
-        this._parsedStatements.add(importStr)
-        const importPath = this.getImportPath(importStr)
-        const dependencies = this.generateSourceFilePaths(dirPaths, importPath)
-        return dependencies
-    }
-
-    getDependencies(uri: vscode.Uri, imports: string[]) {
-        const dependencies: string[] = []
-        imports.forEach(importStr => {
-            this.updateSysPaths(uri)
-            const findings = this.parseImport(importStr, Array.from(this._sysPaths.values()))
-            const validSourceFiles = findings.filter(finding => !this._pickedSourceFiles.has(finding))
-            validSourceFiles.forEach(file => {
-                if (existsSync(file) && !this.willReachSizeLimit(this._totalSize, statSync(file).size)) {
-                    dependencies.push(file)
-                }
-            })
-        })
-        return dependencies
-    }
-
-    updateSysPaths(uri: vscode.Uri) {
-        this.getDirPaths(uri).forEach(dirPath => {
-            this._sysPaths.add(dirPath)
-        })
-    }
-
-    private async getFileLevelBuildFilePaths(uri: vscode.Uri, projectPath: string) {
-        const filePath = uri.fsPath
-        this._pickedSourceFiles.clear()
-        this._pickedSourceFiles.add(filePath)
-        this._totalSize = statSync(filePath).size
-        const content = await readFileAsString(uri.fsPath)
-        this._totalLines = content.split(DependencyGraphConstants.newlineRegex).length
-        const javaStatement = this.extractStatement(content)
-        this._buildFileRelativePaths.clear()
-        const buildFileRelativePath = this.generateBuildFileRelativePath(uri, projectPath, javaStatement.packages)
-        return this.generateOneBuildFilePaths(buildFileRelativePath)
-    }
-
-    async searchDependency(uri: vscode.Uri): Promise<Set<string>> {
-        const filePath = uri.fsPath
-        const q: string[] = []
-        q.push(filePath)
-        while (q.length > 0) {
-            let count: number = q.length
-            while (count > 0) {
-                if (this.reachSizeLimit(this._totalSize)) {
-                    return this._pickedSourceFiles
-                }
-                count -= 1
-                const currentFilePath = q.shift()
-                if (currentFilePath === undefined) {
-                    throw new Error('"undefined" is invalid for queued file.')
-                }
-                if (!existsSync(currentFilePath)) {
-                    continue
-                }
-                this._pickedSourceFiles.add(currentFilePath)
-                this._totalSize += statSync(currentFilePath).size
-                const uri = vscode.Uri.file(currentFilePath)
-                const content = await readFileAsString(uri.fsPath)
-                this._totalLines += content.split(DependencyGraphConstants.newlineRegex).length
-                const javaStatement = this.extractStatement(content)
-                const buildFileRelativePath = this.generateBuildFileRelativePath(
-                    uri,
-                    this.getProjectPath(uri),
-                    javaStatement.packages
-                )
-                this._buildFileRelativePaths.add(buildFileRelativePath)
-                const dependencies = this.getDependencies(uri, javaStatement.imports)
-                dependencies.forEach(dependency => {
-                    q.push(dependency)
-                })
-            }
-        }
-        return this._pickedSourceFiles
-    }
-
-    async traverseDir(dirPath: string) {
-        if (!existsSync(dirPath) || this.reachSizeLimit(this._totalSize) || this._fetchedDirs.has(dirPath)) {
-            return
-        }
-        readdirSync(dirPath, { withFileTypes: true }).forEach(async file => {
-            const fileAbsPath = path.join(dirPath, file.name)
-            if (file.name.charAt(0) === '.' || !existsSync(fileAbsPath)) {
-                return
-            }
-            if (file.isDirectory()) {
-                await this.traverseDir(fileAbsPath)
-            } else if (file.isFile()) {
-                if (
-                    file.name.endsWith(DependencyGraphConstants.javaExt) &&
-                    !this.reachSizeLimit(this._totalSize) &&
-                    !this.willReachSizeLimit(this._totalSize, statSync(fileAbsPath).size) &&
-                    !this._pickedSourceFiles.has(fileAbsPath)
-                ) {
-                    await this.searchDependency(vscode.Uri.file(fileAbsPath))
-                }
-            }
-        })
-        this._fetchedDirs.add(dirPath)
-    }
-
-    private generateOneBuildFilePaths(buildFileRelativePath: string) {
-        const oneBuildFilePaths: string[] = []
-        this._outputDirs.forEach(dir => {
-            const builFilePath = path.join(dir, buildFileRelativePath)
-            if (existsSync(builFilePath) && oneBuildFilePaths.length == 0) {
-                oneBuildFilePaths.push(builFilePath)
-            }
-        })
-        this._outputNonStrictDirs.forEach(dir => {
-            const builFilePath = path.join(dir, buildFileRelativePath)
-            if (existsSync(builFilePath) && oneBuildFilePaths.length == 0) {
-                oneBuildFilePaths.push(builFilePath)
-            }
-        })
-        if (oneBuildFilePaths.length == 0) {
-            throw new Error(`${buildFileRelativePath} is not found.`)
-        }
-        return oneBuildFilePaths
-    }
-
-    private generateBuildFilePaths() {
-        const buildFiles: Set<string> = new Set<string>()
-        this._buildFileRelativePaths.forEach(relativePath => {
-            let findBuildFile: boolean = false
-            this._outputDirs.forEach(dir => {
-                const builFilePath = path.join(dir, relativePath)
-                if (existsSync(builFilePath) && !findBuildFile) {
-                    buildFiles.add(builFilePath)
-                    findBuildFile = true
-                }
-            })
-            this._outputNonStrictDirs.forEach(dir => {
-                const builFilePath = path.join(dir, relativePath)
-                if (existsSync(builFilePath) && !findBuildFile) {
-                    buildFiles.add(builFilePath)
-                    findBuildFile = true
-                }
-            })
-            if (!findBuildFile) {
-                throw new Error(`${relativePath} is not found.`)
-            }
-        })
-        return Array.from(buildFiles.values())
-    }
-
-    private autoDetectClasspath(projectPath: string, projectName: string, extension: string) {
-        const compileOutput = vscode.workspace.getConfiguration('aws.codeWhisperer').get('javaCompilationOutput')
-        if (compileOutput && typeof compileOutput === 'string') {
-            this._outputDirs.add(compileOutput)
-        }
-        this.detectClasspath(projectPath, projectName, projectName, extension)
-    }
-
-    private detectClasspath(dirPath: string, dirName: string, projectName: string, extension: string): PackageNode {
-        if (!existsSync(dirPath) || dirPath.indexOf(projectName) === -1) {
-            return { paths: [], valid: false }
-        }
-
-        const packageNode: PackageNode = { paths: [], valid: true }
-        let hasBuildFile: boolean = false
-
-        readdirSync(dirPath, { withFileTypes: true }).forEach(file => {
-            const fileAbsPath = path.join(dirPath, file.name)
-            if (file.name.charAt(0) === '.' || !existsSync(fileAbsPath)) {
-                return
-            }
-            if (file.isDirectory()) {
-                const childPackageNode = this.detectClasspath(fileAbsPath, file.name, projectName, extension)
-                childPackageNode.paths.forEach(path => {
-                    packageNode.paths.push(path)
-                })
-                packageNode.valid = packageNode.valid && childPackageNode.valid
-            } else if (file.isSymbolicLink()) {
-                const linkPath = readlinkSync(fileAbsPath)
-                if (existsSync(linkPath) && statSync(linkPath).isDirectory()) {
-                    const childPackageNode = this.detectClasspath(fileAbsPath, file.name, projectName, extension)
-                    childPackageNode.paths.forEach(path => {
-                        packageNode.paths.push(path)
-                    })
-                    packageNode.valid = packageNode.valid && childPackageNode.valid
-                }
-            } else if (file.isFile()) {
-                hasBuildFile = hasBuildFile || file.name.endsWith(extension)
-            }
-
-            if (!packageNode.valid) {
-                return { paths: [], valid: false }
-            }
-        })
-
-        if (this.isValidStrictClasspath(packageNode)) {
-            this._outputDirs.add(dirPath)
-        } else if (this.isValidNonStrictClasspath(packageNode)) {
-            this._outputNonStrictDirs.add(dirPath)
-        }
-
-        if (packageNode.paths.length === 0 && !hasBuildFile) {
-            return { paths: [], valid: false }
-        }
-
-        packageNode.paths = packageNode.paths.map(path => `${dirName}.${path}`)
-        packageNode.paths.push(dirName)
-        packageNode.valid = this.isValidSubClasspath(packageNode)
-        return packageNode
-    }
-
-    private isValidSubClasspath(node: PackageNode) {
-        let valid = false
-        node.paths.forEach(path => {
-            valid =
-                valid ||
-                Array.from(this._packageStrs).filter(s => s.length >= path.length && s.endsWith(path)).length > 0
-        })
-        return valid
-    }
-
-    private isValidNonStrictClasspath(node: PackageNode) {
-        let valid = false
-        Array.from(this._packageStrs).forEach(packageStr => {
-            valid = valid || node.paths.includes(packageStr)
-        })
-        return valid
-    }
-
-    private isValidStrictClasspath(node: PackageNode) {
-        let valid = true
-        Array.from(this._packageStrs).forEach(packageStr => {
-            valid = valid && node.paths.includes(packageStr)
-        })
-        return valid
-    }
-
-    async generateTruncation(uri: vscode.Uri): Promise<TruncPaths> {
-        try {
-            const projectName = this.getProjectName(uri)
-            const projectPath = this.getProjectPath(uri)
-            await this.searchDependency(uri)
-            this._sysPaths.forEach(async dir => await this.traverseDir(dir))
-            await sleep(1000)
-            this.autoDetectClasspath(projectPath, projectName, DependencyGraphConstants.javaBuildExt)
-            if (this._outputDirs.size === 0 && this._outputNonStrictDirs.size === 0) {
-                throw new Error(`Classpath auto-detection failed.`)
-            }
-            let buildFiles: string[] = []
-            try {
-                buildFiles = this.generateBuildFilePaths()
-            } catch (error) {
-                getLogger().debug('Project level compile error:', error)
-                buildFiles = await this.getFileLevelBuildFilePaths(uri, projectPath)
-            }
-            const truncDirPath = this.getTruncDirPath(uri)
-            const truncSourceDirPath = this.getTruncSourceDirPath(uri)
-            const truncBuildDirPath = this.getTruncBuildDirPath(uri)
-            getLogger().debug(`Picked source files:`)
-            this.copyFilesToTmpDir(this._pickedSourceFiles, truncSourceDirPath)
-            getLogger().debug(`Picked build artifacts:`)
-            this.copyFilesToTmpDir(buildFiles, truncBuildDirPath)
-            const totalBuildSize = this.getFilesTotalSize(Array.from(buildFiles.values()))
-            const zipSourcePath = this.zipDir(
-                truncSourceDirPath,
-                truncSourceDirPath,
-                CodeWhispererConstants.codeScanZipExt
-            )
-            const zipBuildPath = this.zipDir(
-                truncBuildDirPath,
-                truncBuildDirPath,
-                CodeWhispererConstants.codeScanZipExt
-            )
-            const zipSourceSize = statSync(zipSourcePath).size
-            const zipBuildSize = statSync(zipBuildPath).size
-            return {
-                root: truncDirPath,
-                src: {
-                    dir: truncSourceDirPath,
-                    zip: zipSourcePath,
-                    size: this._totalSize,
-                    zipSize: zipSourceSize,
-                },
-                build: {
-                    dir: truncBuildDirPath,
-                    zip: zipBuildPath,
-                    size: totalBuildSize,
-                    zipSize: zipBuildSize,
-                },
-                lines: this._totalLines,
-            }
-        } catch (error) {
-            getLogger().error(`${this._languageId} dependency graph error caused by:`, error)
-            throw new JavaDependencyGraphError(`${this._languageId} context processing failed.`)
-        }
-    }
-}
-
-export class JavaDependencyGraphError extends Error {}
diff --git a/src/codewhisperer/util/dependencyGraph/javascriptDependencyGraph.ts b/src/codewhisperer/util/dependencyGraph/javascriptDependencyGraph.ts
deleted file mode 100644
index f3cbe022dbe..00000000000
--- a/src/codewhisperer/util/dependencyGraph/javascriptDependencyGraph.ts
+++ /dev/null
@@ -1,217 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import { existsSync, statSync, readdirSync } from 'fs'
-import * as vscode from 'vscode'
-import { DependencyGraphConstants, DependencyGraph, TruncPaths } from './dependencyGraph'
-import { getLogger } from '../../../shared/logger'
-import { readFileAsString } from '../../../shared/filesystemUtilities'
-import * as CodeWhispererConstants from '../../models/constants'
-import path = require('path')
-import { sleep } from '../../../shared/utilities/timeoutUtils'
-
-export const importRegex = /^[ \t]*import[ \t]+.+;?$/gm
-export const requireRegex = /^[ \t]*.+require[ \t]*\([ \t]*['"][^'"]+['"][ \t]*\)[ \t]*;?/gm
-export const moduleRegex = /["'][^"'\r\n]+["']/gm
-
-export class JavascriptDependencyGraph extends DependencyGraph {
-    private _generatedDirs: Set<string> = new Set(['node_modules', 'dist', 'build', 'cdk.out'])
-
-    getReadableSizeLimit(): string {
-        return `${CodeWhispererConstants.codeScanJavascriptPayloadSizeLimitBytes / Math.pow(2, 10)}KB`
-    }
-
-    willReachSizeLimit(current: number, adding: number): boolean {
-        return current + adding > CodeWhispererConstants.codeScanJavascriptPayloadSizeLimitBytes
-    }
-
-    reachSizeLimit(size: number): boolean {
-        return size > CodeWhispererConstants.codeScanJavascriptPayloadSizeLimitBytes
-    }
-
-    getModulePath(modulePathStr: string) {
-        const matches = modulePathStr.match(moduleRegex)
-        if (matches) {
-            const extract = matches[0]
-            modulePathStr = extract.substring(1, extract.length - 1)
-            return modulePathStr.trim()
-        }
-        return undefined
-    }
-
-    extractModulePaths(importStr: string) {
-        const modulePaths: string[] = []
-        const pos = importStr.indexOf(' ' + DependencyGraphConstants.from + ' ')
-        const modulePathStr =
-            pos === -1
-                ? importStr.substring(DependencyGraphConstants.import.length).trim()
-                : importStr.substring(pos + DependencyGraphConstants.from.length + 1).trim()
-        const modulePath = this.getModulePath(modulePathStr)
-        if (modulePath) {
-            modulePaths.push(modulePath)
-        }
-        return modulePaths
-    }
-
-    generateFilePath(modulePath: string, dirPath: string) {
-        const filePath = modulePath.startsWith('.')
-            ? path.join(dirPath, modulePath + DependencyGraphConstants.jsExt)
-            : modulePath + DependencyGraphConstants.jsExt
-        return filePath.includes(dirPath) && existsSync(filePath) ? filePath : ''
-    }
-
-    generateFilePaths(modulePaths: string[], dirPaths: string[]) {
-        const filePaths: string[] = []
-        modulePaths.forEach(modulePath => {
-            dirPaths.forEach(dirPath => {
-                const filePath = this.generateFilePath(modulePath, dirPath)
-                if (filePath !== '') {
-                    filePaths.push(filePath)
-                }
-            })
-        })
-        return filePaths
-    }
-
-    parseImport(importStr: string, dirPaths: string[]): string[] {
-        if (this._parsedStatements.has(importStr)) {
-            return []
-        }
-        this._parsedStatements.add(importStr)
-        const modulePaths = this.extractModulePaths(importStr)
-        const dependencies = this.generateFilePaths(modulePaths, dirPaths)
-        return dependencies
-    }
-
-    updateSysPaths(uri: vscode.Uri) {
-        throw new Error('Method not implemented.')
-    }
-
-    getDependencies(uri: vscode.Uri, imports: string[]) {
-        const dependencies: string[] = []
-        imports.forEach(importStr => {
-            const findings = this.parseImport(importStr, [this.getBaseDirPath(uri)])
-            const validSourceFiles = findings.filter(finding => !this._pickedSourceFiles.has(finding))
-            validSourceFiles.forEach(file => {
-                if (existsSync(file) && !this.willReachSizeLimit(this._totalSize, statSync(file).size)) {
-                    dependencies.push(file)
-                }
-            })
-        })
-        return dependencies
-    }
-
-    async readImports(uri: vscode.Uri) {
-        const content: string = await readFileAsString(uri.fsPath)
-        this._totalLines += content.split(DependencyGraphConstants.newlineRegex).length
-        const importRegExp = new RegExp(importRegex)
-        const requireRegExp = new RegExp(requireRegex)
-        const importMatches = content.match(importRegExp)
-        const requireMatches = content.match(requireRegExp)
-        const matches: Set<string> = new Set()
-        if (importMatches) {
-            importMatches.forEach(line => {
-                if (!matches.has(line)) {
-                    matches.add(line)
-                }
-            })
-        }
-        if (requireMatches) {
-            requireMatches.forEach(line => {
-                if (!matches.has(line)) {
-                    matches.add(line)
-                }
-            })
-        }
-        return matches.size > 0 ? Array.from(matches) : []
-    }
-
-    async searchDependency(uri: vscode.Uri): Promise<Set<string>> {
-        const filePath = uri.fsPath
-        const q: string[] = []
-        q.push(filePath)
-        while (q.length > 0) {
-            let count: number = q.length
-            while (count > 0) {
-                if (this.reachSizeLimit(this._totalSize)) {
-                    return this._pickedSourceFiles
-                }
-                count -= 1
-                const currentFilePath = q.shift()
-                if (currentFilePath === undefined) {
-                    throw new Error('Invalid file in queue.')
-                }
-                this._pickedSourceFiles.add(currentFilePath)
-                this._totalSize += statSync(currentFilePath).size
-                const uri = vscode.Uri.file(currentFilePath)
-                const imports = await this.readImports(uri)
-                const dependencies = this.getDependencies(uri, imports)
-                dependencies.forEach(dependency => {
-                    q.push(dependency)
-                })
-            }
-        }
-        return this._pickedSourceFiles
-    }
-
-    async traverseDir(dirPath: string) {
-        if (this.reachSizeLimit(this._totalSize)) {
-            return
-        }
-        readdirSync(dirPath, { withFileTypes: true }).forEach(async file => {
-            const absPath = path.join(dirPath, file.name)
-            if (file.name.charAt(0) === '.' || !existsSync(absPath)) {
-                return
-            }
-            if (file.isDirectory() && !this._generatedDirs.has(file.name)) {
-                await this.traverseDir(absPath)
-            } else if (file.isFile()) {
-                if (
-                    file.name.endsWith(DependencyGraphConstants.jsExt) &&
-                    !this.reachSizeLimit(this._totalSize) &&
-                    !this.willReachSizeLimit(this._totalSize, statSync(absPath).size) &&
-                    !this._pickedSourceFiles.has(absPath)
-                ) {
-                    await this.searchDependency(vscode.Uri.file(absPath))
-                }
-            }
-        })
-    }
-
-    async generateTruncation(uri: vscode.Uri): Promise<TruncPaths> {
-        try {
-            const workspaceFolder = vscode.workspace.getWorkspaceFolder(uri)
-            if (workspaceFolder === undefined) {
-                this._pickedSourceFiles.add(uri.fsPath)
-            } else {
-                await this.searchDependency(uri)
-                await this.traverseDir(this.getProjectPath(uri))
-            }
-            await sleep(1000)
-            const truncDirPath = this.getTruncDirPath(uri)
-            this.copyFilesToTmpDir(this._pickedSourceFiles, truncDirPath)
-            const zipFilePath = this.zipDir(truncDirPath, truncDirPath, CodeWhispererConstants.codeScanZipExt)
-            const zipFileSize = statSync(zipFilePath).size
-            return {
-                root: truncDirPath,
-                src: {
-                    dir: truncDirPath,
-                    zip: zipFilePath,
-                    size: this._totalSize,
-                    zipSize: zipFileSize,
-                },
-                build: {
-                    dir: '',
-                    zip: '',
-                    size: 0,
-                    zipSize: 0,
-                },
-                lines: this._totalLines,
-            }
-        } catch (error) {
-            getLogger().error(`${this._languageId} dependency graph error caused by:`, error)
-            throw new Error(`${this._languageId} context processing failed.`)
-        }
-    }
-}
diff --git a/src/codewhisperer/util/dependencyGraph/pythonDependencyGraph.ts b/src/codewhisperer/util/dependencyGraph/pythonDependencyGraph.ts
deleted file mode 100644
index 9eabaab2522..00000000000
--- a/src/codewhisperer/util/dependencyGraph/pythonDependencyGraph.ts
+++ /dev/null
@@ -1,226 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import { existsSync, statSync, readdirSync } from 'fs'
-import * as vscode from 'vscode'
-import { DependencyGraphConstants, DependencyGraph, TruncPaths } from './dependencyGraph'
-import { getLogger } from '../../../shared/logger'
-import { readFileAsString } from '../../../shared/filesystemUtilities'
-import * as CodeWhispererConstants from '../../models/constants'
-import path = require('path')
-import { sleep } from '../../../shared/utilities/timeoutUtils'
-
-export const importRegex =
-    /^(?:from[ ]+(\S+)[ ]+)?import[ ]+(\S+)(?:[ ]+as[ ]+\S+)?[ ]*([,]*[ ]+(\S+)(?:[ ]+as[ ]+\S+)?[ ]*)*$/gm
-
-export class PythonDependencyGraph extends DependencyGraph {
-    getReadableSizeLimit(): string {
-        return `${CodeWhispererConstants.codeScanPythonPayloadSizeLimitBytes / Math.pow(2, 10)}KB`
-    }
-
-    willReachSizeLimit(current: number, adding: number): boolean {
-        return current + adding > CodeWhispererConstants.codeScanPythonPayloadSizeLimitBytes
-    }
-
-    reachSizeLimit(size: number): boolean {
-        return size > CodeWhispererConstants.codeScanPythonPayloadSizeLimitBytes
-    }
-
-    private async readImports(uri: vscode.Uri) {
-        const content: string = await readFileAsString(uri.fsPath)
-        this._totalLines += content.split(DependencyGraphConstants.newlineRegex).length
-        const regExp = new RegExp(importRegex)
-        return content.match(regExp) ?? []
-    }
-
-    private generateFilePath(rawModulePath: string, dirPath: string, importPath: string) {
-        if (importPath === '') {
-            const pos = rawModulePath.lastIndexOf('.')
-            importPath = rawModulePath.substring(pos + 1)
-            rawModulePath = rawModulePath.substring(0, pos)
-        }
-        const modulePath = path.join(...rawModulePath.split('.'))
-        const filePath = path.join(dirPath, modulePath, importPath + DependencyGraphConstants.pythonExt)
-        return existsSync(filePath) ? filePath : ''
-    }
-
-    private generateFilePaths(modulePaths: string[], dirPaths: string[], importPaths: string[]) {
-        const filePaths: string[] = []
-        modulePaths.forEach(modulePath => {
-            dirPaths.forEach(dirPath => {
-                importPaths.forEach(importPath => {
-                    const filePath = this.generateFilePath(modulePath, dirPath, importPath)
-                    if (filePath !== '') {
-                        filePaths.push(filePath)
-                    }
-                })
-            })
-        })
-        return filePaths
-    }
-
-    private getImportPaths(importStr: string) {
-        const importPaths: string[] = ['']
-        if (importStr.startsWith(DependencyGraphConstants.from)) {
-            let pos = importStr.indexOf(DependencyGraphConstants.import)
-            const extractImportStr = importStr.substring(pos + DependencyGraphConstants.import.length).trim()
-            const allImports: string[] = extractImportStr.split(',')
-            allImports.forEach(singleImport => {
-                pos = singleImport.indexOf(' ' + DependencyGraphConstants.as + ' ')
-                if (pos !== -1) {
-                    const importPath = singleImport.substring(0, pos)
-                    importPaths.push(importPath.trim())
-                } else {
-                    importPaths.push(singleImport.trim())
-                }
-            })
-        }
-        return importPaths
-    }
-
-    private getModulePath(modulePathStr: string) {
-        const pos = modulePathStr.indexOf(' ' + DependencyGraphConstants.as + ' ')
-        if (pos !== -1) {
-            modulePathStr = modulePathStr.substring(0, pos)
-        }
-        return modulePathStr.trim()
-    }
-
-    private extractModulePaths(importStr: string) {
-        const modulePaths: string[] = []
-        if (importStr.startsWith(DependencyGraphConstants.from)) {
-            const pos = importStr.indexOf(DependencyGraphConstants.import)
-            const modulePathStr = importStr.substring(DependencyGraphConstants.from.length, pos).trim()
-            modulePaths.push(this.getModulePath(modulePathStr))
-        } else {
-            const pos = importStr.indexOf(DependencyGraphConstants.import)
-            const extractImportStr = importStr.substring(pos + DependencyGraphConstants.import.length).trim()
-            const modulePathStrs: string[] = extractImportStr.split(',')
-            modulePathStrs.forEach(modulePathStr => {
-                modulePaths.push(this.getModulePath(modulePathStr))
-            })
-        }
-        return modulePaths
-    }
-
-    parseImport(importStr: string, dirPaths: string[]) {
-        if (this._parsedStatements.has(importStr)) {
-            return []
-        }
-        this._parsedStatements.add(importStr)
-        const modulePaths = this.extractModulePaths(importStr)
-        const importPaths = this.getImportPaths(importStr)
-        const dependencies = this.generateFilePaths(modulePaths, dirPaths, importPaths)
-        return dependencies
-    }
-
-    updateSysPaths(uri: vscode.Uri) {
-        this.getDirPaths(uri).forEach(dirPath => {
-            this._sysPaths.add(dirPath)
-        })
-    }
-
-    getDependencies(uri: vscode.Uri, imports: string[]) {
-        const dependencies: string[] = []
-        imports.forEach(importStr => {
-            this.updateSysPaths(uri)
-            const findings = this.parseImport(importStr, Array.from(this._sysPaths.values()))
-            const validSourceFiles = findings.filter(finding => !this._pickedSourceFiles.has(finding))
-            validSourceFiles.forEach(file => {
-                if (existsSync(file) && !this.willReachSizeLimit(this._totalSize, statSync(file).size)) {
-                    dependencies.push(file)
-                }
-            })
-        })
-        return dependencies
-    }
-
-    async searchDependency(uri: vscode.Uri): Promise<Set<string>> {
-        const filePath = uri.fsPath
-        const q: string[] = []
-        q.push(filePath)
-        while (q.length > 0) {
-            let count: number = q.length
-            while (count > 0) {
-                if (this.reachSizeLimit(this._totalSize)) {
-                    return this._pickedSourceFiles
-                }
-                count -= 1
-                const currentFilePath = q.shift()
-                if (currentFilePath === undefined) {
-                    throw new Error('"undefined" is invalid for queued file.')
-                }
-                this._pickedSourceFiles.add(currentFilePath)
-                this._totalSize += statSync(currentFilePath).size
-                const uri = vscode.Uri.file(currentFilePath)
-                const imports = await this.readImports(uri)
-                const dependencies = this.getDependencies(uri, imports)
-                dependencies.forEach(dependency => {
-                    q.push(dependency)
-                })
-            }
-        }
-        return this._pickedSourceFiles
-    }
-
-    async traverseDir(dirPath: string) {
-        if (this.reachSizeLimit(this._totalSize)) {
-            return
-        }
-        readdirSync(dirPath, { withFileTypes: true }).forEach(async file => {
-            const absPath = path.join(dirPath, file.name)
-            if (file.name.charAt(0) === '.' || !existsSync(absPath)) {
-                return
-            }
-            if (file.isDirectory()) {
-                await this.traverseDir(absPath)
-            } else if (file.isFile()) {
-                if (
-                    file.name.endsWith(DependencyGraphConstants.pythonExt) &&
-                    !this.reachSizeLimit(this._totalSize) &&
-                    !this.willReachSizeLimit(this._totalSize, statSync(absPath).size) &&
-                    !this._pickedSourceFiles.has(absPath)
-                ) {
-                    await this.searchDependency(vscode.Uri.file(absPath))
-                }
-            }
-        })
-    }
-
-    async generateTruncation(uri: vscode.Uri): Promise<TruncPaths> {
-        try {
-            const workspaceFolder = vscode.workspace.getWorkspaceFolder(uri)
-            if (workspaceFolder === undefined) {
-                this._pickedSourceFiles.add(uri.fsPath)
-            } else {
-                await this.searchDependency(uri)
-                await this.traverseDir(this.getProjectPath(uri))
-            }
-            await sleep(1000)
-            const truncDirPath = this.getTruncDirPath(uri)
-            this.copyFilesToTmpDir(this._pickedSourceFiles, truncDirPath)
-            const zipFilePath = this.zipDir(truncDirPath, truncDirPath, CodeWhispererConstants.codeScanZipExt)
-            const zipFileSize = statSync(zipFilePath).size
-            return {
-                root: truncDirPath,
-                src: {
-                    dir: truncDirPath,
-                    zip: zipFilePath,
-                    size: this._totalSize,
-                    zipSize: zipFileSize,
-                },
-                build: {
-                    dir: '',
-                    zip: '',
-                    size: 0,
-                    zipSize: 0,
-                },
-                lines: this._totalLines,
-            }
-        } catch (error) {
-            getLogger().error(`${this._languageId} dependency graph error caused by:`, error)
-            throw new Error(`${this._languageId} context processing failed.`)
-        }
-    }
-}
diff --git a/src/codewhisperer/util/editorContext.ts b/src/codewhisperer/util/editorContext.ts
deleted file mode 100644
index 62a259c4582..00000000000
--- a/src/codewhisperer/util/editorContext.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as codewhispererClient from '../client/codewhisperer'
-import * as path from 'path'
-import * as CodeWhispererConstants from '../models/constants'
-import { getTabSizeSetting } from '../../shared/utilities/editorUtilities'
-import { TelemetryHelper } from './telemetryHelper'
-import { getLogger } from '../../shared/logger/logger'
-import { runtimeLanguageContext } from './runtimeLanguageContext'
-
-let tabSize: number = getTabSizeSetting()
-
-export function extractContextForCodeWhisperer(editor: vscode.TextEditor): codewhispererClient.FileContext {
-    const document = editor.document
-    const curPos = editor.selection.active
-    const offset = document.offsetAt(curPos)
-    TelemetryHelper.instance.cursorOffset = offset
-
-    const caretLeftFileContext = editor.document.getText(
-        new vscode.Range(
-            document.positionAt(offset - CodeWhispererConstants.charactersLimit),
-            document.positionAt(offset)
-        )
-    )
-
-    const caretRightFileContext = editor.document.getText(
-        new vscode.Range(
-            document.positionAt(offset),
-            document.positionAt(offset + CodeWhispererConstants.charactersLimit)
-        )
-    )
-
-    return {
-        filename: getFileName(editor),
-        programmingLanguage: {
-            languageName:
-                runtimeLanguageContext.mapVscLanguageToCodeWhispererLanguage(editor.document.languageId) ??
-                editor.document.languageId,
-        },
-        leftFileContent: caretLeftFileContext,
-        rightFileContent: caretRightFileContext,
-    } as codewhispererClient.FileContext
-}
-
-export function getFileName(editor: vscode.TextEditor): string {
-    const fileName = path.basename(editor.document.fileName)
-    return fileName.substring(0, CodeWhispererConstants.filenameCharsLimit)
-}
-
-export function buildListRecommendationRequest(
-    editor: vscode.TextEditor,
-    nextToken: string,
-    allowCodeWithReference: boolean | undefined = undefined
-): codewhispererClient.ListRecommendationsRequest {
-    let fileContext: codewhispererClient.FileContext
-    if (editor !== undefined) {
-        fileContext = extractContextForCodeWhisperer(editor)
-    } else {
-        fileContext = {
-            filename: '',
-            programmingLanguage: {
-                languageName: '',
-            },
-            leftFileContent: '',
-            rightFileContent: '',
-        }
-    }
-
-    if (allowCodeWithReference === undefined) {
-        return {
-            fileContext: fileContext,
-            nextToken: nextToken,
-        }
-    }
-    return {
-        fileContext: fileContext,
-        nextToken: nextToken,
-        referenceTrackerConfiguration: {
-            recommendationsWithReferences: allowCodeWithReference ? 'ALLOW' : 'BLOCK',
-        },
-    }
-}
-
-export function buildGenerateRecommendationRequest(
-    editor: vscode.TextEditor
-): codewhispererClient.GenerateRecommendationsRequest {
-    let req: codewhispererClient.GenerateRecommendationsRequest = {
-        fileContext: {
-            filename: '',
-            programmingLanguage: {
-                languageName: '',
-            },
-            leftFileContent: '',
-            rightFileContent: '',
-        },
-        maxResults: CodeWhispererConstants.maxRecommendations,
-    }
-    if (editor !== undefined) {
-        const fileContext = extractContextForCodeWhisperer(editor)
-        req = {
-            fileContext: fileContext,
-            maxResults: CodeWhispererConstants.maxRecommendations,
-        }
-    }
-    return req
-}
-
-export function validateRequest(
-    req: codewhispererClient.ListRecommendationsRequest | codewhispererClient.GenerateRecommendationsRequest
-): boolean {
-    const isLanguageNameValid = !(
-        req.fileContext.programmingLanguage.languageName == undefined ||
-        req.fileContext.programmingLanguage.languageName.length < 1 ||
-        req.fileContext.programmingLanguage.languageName.length > 128 ||
-        !runtimeLanguageContext.isLanguageSupported(req.fileContext.programmingLanguage.languageName)
-    )
-    const isFileNameValid = !(req.fileContext.filename == undefined || req.fileContext.filename.length < 1)
-    const isFileContextValid = !(
-        req.fileContext.leftFileContent.length > CodeWhispererConstants.charactersLimit ||
-        req.fileContext.rightFileContent.length > CodeWhispererConstants.charactersLimit
-    )
-    if (isFileNameValid && isLanguageNameValid && isFileContextValid) {
-        return true
-    }
-    return false
-}
-
-export function updateTabSize(val: number): void {
-    tabSize = val
-}
-
-export function getTabSize(): number {
-    return tabSize
-}
-
-export function getLeftContext(editor: vscode.TextEditor, line: number): string {
-    let lineText = ''
-    try {
-        if (editor && editor.document.lineAt(line)) {
-            lineText = editor.document.lineAt(line).text
-            if (lineText.length > CodeWhispererConstants.contextPreviewLen) {
-                lineText =
-                    '...' +
-                    lineText.substring(
-                        lineText.length - CodeWhispererConstants.contextPreviewLen - 1,
-                        lineText.length - 1
-                    )
-            }
-        }
-    } catch (error) {
-        getLogger().error(`Error when getting left context ${error}`)
-    }
-
-    return lineText
-}
diff --git a/src/codewhisperer/util/getStartUrl.ts b/src/codewhisperer/util/getStartUrl.ts
deleted file mode 100644
index 235cfdf126e..00000000000
--- a/src/codewhisperer/util/getStartUrl.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as CodeWhispererConstants from '../models/constants'
-import { isValidResponse } from '../../shared/wizards/wizard'
-import { AuthUtil } from './authUtil'
-import { CancellationError } from '../../shared/utilities/timeoutUtils'
-import { ToolkitError } from '../../shared/errors'
-import { createStartUrlPrompter } from '../../credentials/auth'
-import { telemetry } from '../../shared/telemetry/telemetry'
-
-export const getStartUrl = async () => {
-    const inputBox = await createStartUrlPrompter('IAM Identity Center', false)
-    const userInput = await inputBox.prompt()
-    if (!isValidResponse(userInput)) {
-        telemetry.ui_click.emit({ elementId: 'connection_optionescapecancel' })
-        throw new CancellationError('user')
-    }
-    telemetry.ui_click.emit({ elementId: 'connection_startUrl' })
-
-    try {
-        await AuthUtil.instance.connectToEnterpriseSso(userInput)
-    } catch (e) {
-        throw ToolkitError.chain(e, CodeWhispererConstants.failedToConnectIamIdentityCenter, {
-            code: 'FailedToConnect',
-        })
-    }
-    await vscode.commands.executeCommand('aws.codeWhisperer.refresh')
-    await vscode.commands.executeCommand('aws.codeWhisperer.enableCodeSuggestions')
-}
diff --git a/src/codewhisperer/util/invalidateToken.ts b/src/codewhisperer/util/invalidateToken.ts
deleted file mode 100644
index 244302046d3..00000000000
--- a/src/codewhisperer/util/invalidateToken.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import globals from '../../shared/extensionGlobals'
-import * as CodeWhispererConstants from '../models/constants'
-
-export const invalidateAccessToken = async () => {
-    await globals.context.globalState.update(CodeWhispererConstants.accessToken, undefined)
-    await vscode.commands.executeCommand('aws.codeWhisperer.refresh')
-}
diff --git a/src/codewhisperer/util/runtimeLanguageContext.ts b/src/codewhisperer/util/runtimeLanguageContext.ts
deleted file mode 100644
index 2f9c1de34fd..00000000000
--- a/src/codewhisperer/util/runtimeLanguageContext.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { CodewhispererLanguage } from '../../shared/telemetry/telemetry.gen'
-import { createConstantMap, ConstantMap } from '../../shared/utilities/tsUtils'
-import * as codewhispererClient from '../client/codewhisperer'
-import * as CodeWhispererConstants from '../models/constants'
-
-export class RuntimeLanguageContext {
-    /**
-     * A map storing cwspr supporting programming language with key: vscLanguageId and value: cwsprLanguageId
-     * Key: vscLanguageId
-     * Value: CodeWhispererLanguageId
-     */
-    private supportedLanguageMap: ConstantMap<CodeWhispererConstants.SupportedLanguage, CodewhispererLanguage>
-
-    // A set contains vscode languageId and CodeWhispererLanguage
-    private supportedLanguageSet = new Set<string>()
-
-    constructor() {
-        this.supportedLanguageMap = createConstantMap<CodeWhispererConstants.SupportedLanguage, CodewhispererLanguage>({
-            java: 'java',
-            python: 'python',
-            javascriptreact: 'jsx',
-            javascript: 'javascript',
-            typescript: 'typescript',
-            typescriptreact: 'tsx',
-            csharp: 'csharp',
-        })
-
-        const values = Array.from(this.supportedLanguageMap.values())
-        const keys = Array.from(this.supportedLanguageMap.keys())
-        values.forEach(item => this.supportedLanguageSet.add(item))
-        keys.forEach(item => this.supportedLanguageSet.add(item))
-    }
-
-    /**
-     *
-     * @param vscLanguageId : official vscode languageId
-     * @returns corresponding CodewhispererLanguage ID if any, otherwise undefined
-     */
-    public mapVscLanguageToCodeWhispererLanguage(vscLanguageId?: string): CodewhispererLanguage | undefined {
-        return this.supportedLanguageMap.get(vscLanguageId) ?? undefined
-    }
-
-    /**
-     * @param vscLanguageId : official vscode languageId
-     * @returns An object with a field language: CodewhispererLanguage, if no corresponding CodewhispererLanguage ID, plaintext is returned
-     */
-    public getLanguageContext(vscLanguageId?: string): { language: CodewhispererLanguage } {
-        return { language: this.mapVscLanguageToCodeWhispererLanguage(vscLanguageId) ?? 'plaintext' }
-    }
-
-    /**
-     * Mapping the field ProgrammingLanguage of codewhisperer generateRecommendationRequest | listRecommendationRequest to
-     * its Codewhisperer runtime language e.g. jsx -> typescript, typescript -> typescript
-     * @param request : cwspr generateRecommendationRequest | ListRecommendationRequest
-     * @returns request with source language name mapped to cwspr runtime language
-     */
-    public mapToRuntimeLanguage<
-        T extends codewhispererClient.ListRecommendationsRequest | codewhispererClient.GenerateRecommendationsRequest
-    >(request: T): T {
-        const fileContext = request.fileContext
-        const childLanguage = request.fileContext.programmingLanguage
-        let parentLanguage: codewhispererClient.ProgrammingLanguage
-        switch (childLanguage.languageName) {
-            case 'tsx':
-                parentLanguage = { languageName: CodeWhispererConstants.typescript }
-                break
-            case 'jsx':
-                parentLanguage = { languageName: CodeWhispererConstants.javascript }
-                break
-            default:
-                parentLanguage = childLanguage
-                break
-        }
-
-        return {
-            ...request,
-            fileContext: {
-                ...fileContext,
-                programmingLanguage: parentLanguage,
-            },
-        }
-    }
-
-    /**
-     *
-     * @param languageId: either vscodeLanguageId or CodewhispererLanguage
-     * @returns ture if the language is supported by CodeWhisperer otherwise false
-     */
-    public isLanguageSupported(languageId: string): boolean {
-        return this.supportedLanguageSet.has(languageId)
-    }
-}
-
-export const runtimeLanguageContext = new RuntimeLanguageContext()
diff --git a/src/codewhisperer/util/showSsoPrompt.ts b/src/codewhisperer/util/showSsoPrompt.ts
deleted file mode 100644
index ab0ea0436ee..00000000000
--- a/src/codewhisperer/util/showSsoPrompt.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { getLogger } from '../../shared/logger'
-import { getStartUrl } from './getStartUrl'
-import { showQuickPick } from '../../shared/ui/pickerPrompter'
-import { AuthUtil, isUpgradeableConnection } from './authUtil'
-import { failedToConnectAwsBuilderId } from '../models/constants'
-import { isValidResponse } from '../../shared/wizards/wizard'
-import { CancellationError } from '../../shared/utilities/timeoutUtils'
-import { isUserCancelledError, ToolkitError } from '../../shared/errors'
-import { createCommonButtons } from '../../shared/ui/buttons'
-import { Auth } from '../../credentials/auth'
-import { showViewLogsMessage } from '../../shared/utilities/messages'
-import { createBuilderIdItem, createIamItem, createSsoItem } from '../../credentials/auth'
-import { telemetry } from '../../shared/telemetry/telemetry'
-
-export const showConnectionPrompt = async () => {
-    const currentConn = Auth.instance.activeConnection
-    if (isUpgradeableConnection(currentConn)) {
-        const didUpgrade = await AuthUtil.instance.promptUpgrade(currentConn, 'current').catch(err => {
-            if (!isUserCancelledError(err)) {
-                getLogger().error('codewhisperer: failed to upgrade connection: %s', err)
-                showViewLogsMessage('Failed to upgrade current connection.')
-            }
-
-            return false
-        })
-
-        if (didUpgrade) {
-            return
-        }
-    }
-
-    const resp = await showQuickPick([createBuilderIdItem(), createSsoItem(), createCodeWhispererIamItem()], {
-        title: 'CodeWhisperer: Add Connection to AWS',
-        placeholder: 'Select a connection option to start using CodeWhisperer',
-        buttons: createCommonButtons() as vscode.QuickInputButton[],
-    })
-
-    if (!isValidResponse(resp)) {
-        telemetry.ui_click.emit({ elementId: 'connection_optionescapecancel' })
-        throw new CancellationError('user')
-    }
-    switch (resp) {
-        case 'iam':
-            throw new Error('IAM is not supported')
-        case 'sso': {
-            return await getStartUrl()
-        }
-        case 'builderId': {
-            return await awsIdSignIn()
-        }
-    }
-}
-
-async function awsIdSignIn() {
-    getLogger().info('selected AWS ID sign in')
-    try {
-        await AuthUtil.instance.connectToAwsBuilderId()
-    } catch (e) {
-        throw ToolkitError.chain(e, failedToConnectAwsBuilderId, { code: 'FailedToConnect' })
-    }
-    await vscode.commands.executeCommand('aws.codeWhisperer.refresh')
-    await vscode.commands.executeCommand('aws.codeWhisperer.enableCodeSuggestions')
-}
-
-export const createCodeWhispererIamItem = () => {
-    const item = createIamItem()
-    item.detail = 'Not supported by CodeWhisperer.'
-    item.description = 'not supported'
-    item.invalidSelection = true
-
-    return item
-}
diff --git a/src/codewhisperer/util/telemetryHelper.ts b/src/codewhisperer/util/telemetryHelper.ts
deleted file mode 100644
index 591ac211ff0..00000000000
--- a/src/codewhisperer/util/telemetryHelper.ts
+++ /dev/null
@@ -1,231 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import globals from '../../shared/extensionGlobals'
-
-import { runtimeLanguageContext } from './runtimeLanguageContext'
-import { RecommendationsList } from '../client/codewhisperer'
-import { LicenseUtil } from './licenseUtil'
-import { telemetry } from '../../shared/telemetry/telemetry'
-import {
-    CodewhispererAutomatedTriggerType,
-    CodewhispererCompletionType,
-    CodewhispererSuggestionState,
-    CodewhispererTriggerType,
-} from '../../shared/telemetry/telemetry'
-
-export class TelemetryHelper {
-    /**
-     * Trigger type for getting CodeWhisperer recommendation
-     */
-    public triggerType: CodewhispererTriggerType
-    /**
-     * Auto Trigger Type for getting event of Automated Trigger
-     */
-    public CodeWhispererAutomatedtriggerType: CodewhispererAutomatedTriggerType
-    /**
-     * completion Type of the CodeWhisperer recommendation, line vs block
-     */
-    public completionType: CodewhispererCompletionType
-    /**
-     * the cursor offset location at invocation time
-     */
-    public cursorOffset: number
-
-    public startUrl: string | undefined
-
-    // variables for client component latency
-    private invokeSuggestionStartTime = 0
-    private fetchCredentialStartTime = 0
-    private sdkApiCallStartTime = 0
-    private sdkApiCallEndTime = 0
-    private firstSuggestionShowTime = 0
-    private allPaginationEndTime = 0
-    private firstResponseRequestId = ''
-    private sessionId = ''
-
-    constructor() {
-        this.triggerType = 'OnDemand'
-        this.CodeWhispererAutomatedtriggerType = 'KeyStrokeCount'
-        this.completionType = 'Line'
-        this.cursorOffset = 0
-        this.startUrl = ''
-        this.sessionId = ''
-    }
-
-    static #instance: TelemetryHelper
-
-    public static get instance() {
-        return (this.#instance ??= new this())
-    }
-
-    public recordUserDecisionTelemetryForEmptyList(
-        requestId: string,
-        sessionId: string,
-        paginationIndex: number,
-        languageId: string
-    ) {
-        const languageContext = runtimeLanguageContext.getLanguageContext(languageId)
-        telemetry.codewhisperer_userDecision.emit({
-            codewhispererRequestId: requestId,
-            codewhispererSessionId: sessionId ? sessionId : undefined,
-            codewhispererPaginationProgress: paginationIndex,
-            codewhispererTriggerType: this.triggerType,
-            codewhispererSuggestionIndex: -1,
-            codewhispererSuggestionState: 'Empty',
-            codewhispererSuggestionReferences: undefined,
-            codewhispererSuggestionReferenceCount: 0,
-            codewhispererCompletionType: this.completionType,
-            codewhispererLanguage: languageContext.language,
-            credentialStartUrl: TelemetryHelper.instance.startUrl,
-        })
-    }
-
-    /**
-     * This function is to record the user decision on each of the suggestion in the list of CodeWhisperer recommendations.
-     * @param recommendations the recommendations
-     * @param acceptIndex the index of the accepted suggestion in the corresponding list of CodeWhisperer response.
-     * If this function is not called on acceptance, then acceptIndex == -1
-     * @param languageId the language ID of the current document in current active editor
-     * @param paginationIndex the index of pagination calls
-     * @param recommendationSuggestionState the key-value mapping from index to suggestion state
-     */
-
-    public recordUserDecisionTelemetry(
-        requestId: string,
-        sessionId: string,
-        recommendations: RecommendationsList,
-        acceptIndex: number,
-        languageId: string | undefined,
-        paginationIndex: number,
-        recommendationSuggestionState?: Map<number, string>
-    ) {
-        const languageContext = runtimeLanguageContext.getLanguageContext(languageId)
-        // emit user decision telemetry
-        recommendations.forEach((_elem, i) => {
-            let uniqueSuggestionReferences: string | undefined = undefined
-            const uniqueLicenseSet = LicenseUtil.getUniqueLicenseNames(_elem.references)
-            if (uniqueLicenseSet.size > 0) {
-                uniqueSuggestionReferences = JSON.stringify(Array.from(uniqueLicenseSet))
-            }
-            if (_elem.content.length === 0) {
-                recommendationSuggestionState?.set(i, 'Empty')
-            }
-            telemetry.codewhisperer_userDecision.emit({
-                codewhispererRequestId: requestId,
-                codewhispererSessionId: sessionId ? sessionId : undefined,
-                codewhispererPaginationProgress: paginationIndex,
-                codewhispererTriggerType: this.triggerType,
-                codewhispererSuggestionIndex: i,
-                codewhispererSuggestionState: this.getSuggestionState(i, acceptIndex, recommendationSuggestionState),
-                codewhispererSuggestionReferences: uniqueSuggestionReferences,
-                codewhispererSuggestionReferenceCount: _elem.references ? _elem.references.length : 0,
-                codewhispererCompletionType: this.completionType,
-                codewhispererLanguage: languageContext.language,
-                credentialStartUrl: TelemetryHelper.instance.startUrl,
-            })
-        })
-    }
-
-    public getSuggestionState(
-        i: number,
-        acceptIndex: number,
-        recommendationSuggestionState?: Map<number, string>
-    ): CodewhispererSuggestionState {
-        const state = recommendationSuggestionState?.get(i)
-        if (state && ['Empty', 'Filter', 'Discard'].includes(state)) {
-            return state as CodewhispererSuggestionState
-        } else if (recommendationSuggestionState !== undefined && recommendationSuggestionState.get(i) !== 'Showed') {
-            return 'Unseen'
-        }
-        if (acceptIndex === -1) {
-            return 'Reject'
-        }
-        return i === acceptIndex ? 'Accept' : 'Ignore'
-    }
-
-    public isTelemetryEnabled(): boolean {
-        return globals.telemetry.telemetryEnabled
-    }
-
-    public resetClientComponentLatencyTime() {
-        this.invokeSuggestionStartTime = 0
-        this.sdkApiCallStartTime = 0
-        this.sdkApiCallEndTime = 0
-        this.fetchCredentialStartTime = 0
-        this.firstSuggestionShowTime = 0
-        this.allPaginationEndTime = 0
-        this.firstResponseRequestId = ''
-        this.sessionId = ''
-    }
-
-    /** This method is assumed to be invoked first at the start of execution **/
-    public setInvokeSuggestionStartTime() {
-         this.resetClientComponentLatencyTime()
-         this.invokeSuggestionStartTime = performance.now()
-    }
-
-    public setFetchCredentialStartTime() {
-        if (this.fetchCredentialStartTime === 0 && this.invokeSuggestionStartTime !== 0) {
-            this.fetchCredentialStartTime = performance.now()
-        }
-    }
-
-    public setSdkApiCallStartTime() {
-        if (this.sdkApiCallStartTime === 0 && this.fetchCredentialStartTime !== 0) {
-            this.sdkApiCallStartTime = performance.now()
-        }
-    }
-
-    public setSdkApiCallEndTime() {
-        if (this.sdkApiCallEndTime === 0 && this.sdkApiCallStartTime !== 0) {
-            this.sdkApiCallEndTime = performance.now()
-        }
-    }
-
-    public setAllPaginationEndTime() {
-        if (this.allPaginationEndTime === 0 && this.sdkApiCallEndTime !== 0) {
-            this.allPaginationEndTime = performance.now()
-        }
-    }
-
-    public setFirstSuggestionShowTime() {
-        if (this.firstSuggestionShowTime === 0 && this.sdkApiCallEndTime !== 0) {
-            this.firstSuggestionShowTime = performance.now()
-        }
-    }
-
-    public setFirstResponseRequestId(requestId: string) {
-        if (this.firstResponseRequestId === '') {
-            this.firstResponseRequestId = requestId
-        }
-    }
-
-    public setSessionId(sessionId: string) {
-        this.sessionId = sessionId
-    }
-
-    // report client component latency after all pagination call finish
-    // and at least one suggestion is shown to the user
-    public tryRecordClientComponentLatency(languageId: string) {
-        if (this.firstSuggestionShowTime === 0 || this.allPaginationEndTime === 0) {
-            return
-        }
-        telemetry.codewhisperer_clientComponentLatency.emit({
-            codewhispererRequestId: this.firstResponseRequestId,
-            codewhispererSessionId: this.sessionId,
-            codewhispererFirstCompletionLatency: this.sdkApiCallEndTime - this.sdkApiCallStartTime,
-            codewhispererEndToEndLatency: this.firstSuggestionShowTime - this.invokeSuggestionStartTime,
-            codewhispererAllCompletionsLatency: this.allPaginationEndTime - this.sdkApiCallStartTime,
-            codewhispererPostprocessingLatency: this.firstSuggestionShowTime - this.sdkApiCallEndTime,
-            codewhispererCredentialFetchingLatency: this.sdkApiCallStartTime - this.fetchCredentialStartTime,
-            codewhispererPreprocessingLatency: this.fetchCredentialStartTime - this.invokeSuggestionStartTime,
-            codewhispererCompletionType: this.completionType,
-            codewhispererTriggerType: this.triggerType,
-            codewhispererLanguage: runtimeLanguageContext.getLanguageContext(languageId).language,
-            credentialStartUrl: this.startUrl,
-        })
-        this.resetClientComponentLatencyTime()
-    }
-}
diff --git a/src/codewhisperer/vue/backend.ts b/src/codewhisperer/vue/backend.ts
deleted file mode 100644
index 8c909a08de5..00000000000
--- a/src/codewhisperer/vue/backend.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { isCloud9 } from '../../shared/extensionUtilities'
-import { telemetry } from '../../shared/telemetry/telemetry'
-import { VueWebview } from '../../webviews/main'
-
-export class CodeWhispererWebview extends VueWebview {
-    public readonly id = 'aws.codeWhisperer.enabledCodeSuggestions'
-    public readonly source = 'src/codewhisperer/vue/index.js'
-
-    public readonly onDidChangeTriggerStatus = new vscode.EventEmitter<boolean>()
-    public readonly onDidChangeKeyBinding = new vscode.EventEmitter<string>()
-
-    public async controlTrigger() {
-        telemetry.ui_click.emit({ elementId: 'cwToS_accept' })
-
-        await vscode.commands.executeCommand('aws.codeWhisperer.acceptTermsOfService')
-        this.dispose()
-    }
-
-    public async cancelCodeSuggestion() {
-        telemetry.ui_click.emit({ elementId: 'cwToS_cancel' })
-
-        await vscode.commands.executeCommand('aws.codeWhisperer.cancelTermsOfService')
-        this.dispose()
-    }
-
-    public isCloud9() {
-        return isCloud9()
-    }
-}
-
-const Panel = VueWebview.compilePanel(CodeWhispererWebview)
-let activeWebview: vscode.WebviewPanel | undefined
-
-export async function showView(context: vscode.ExtensionContext) {
-    if (!activeWebview) {
-        activeWebview = await new Panel(context).show({ title: 'Amazon CodeWhisperer Terms of Service' })
-        activeWebview.onDidDispose(() => (activeWebview = undefined))
-    } else {
-        activeWebview.reveal()
-    }
-}
diff --git a/src/codewhisperer/vue/index.ts b/src/codewhisperer/vue/index.ts
deleted file mode 100644
index 725f2fdaadb..00000000000
--- a/src/codewhisperer/vue/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { createApp } from 'vue'
-import component from './root.vue'
-
-const create = () => createApp(component)
-const app = create()
-app.mount('#vue-app')
-
-window.addEventListener('remount', () => {
-    app.unmount()
-    create().mount('#vue-app')
-})
diff --git a/src/codewhisperer/vue/root.vue b/src/codewhisperer/vue/root.vue
deleted file mode 100644
index 851bce7b9f3..00000000000
--- a/src/codewhisperer/vue/root.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<template id="codewhispererTOSTemplate">
-    <div>
-        <h1 class="codewhisperer-preview-terms">Amazon CodeWhisperer Terms of Service</h1>
-        <div style="width: 100%">
-            <p>
-                The Amazon CodeWhisperer service is provided as a 'Beta Service' and an 'AI Service' as defined in the
-                AWS Service Terms. Usage of the CodeWhisperer Beta Service is governed by your Agreement with AWS and
-                the
-                <a href="https://aws.amazon.com/service-terms/"> AWS Service Terms</a>, as supplemented by these
-                additional terms, which are made part of Section 2 ('Betas and Previews') of the Service Terms. Any term
-                undefined in these CodeWhisperer preview terms will have the meaning assigned to it in the Agreement and
-                Service Terms.
-            </p>
-            <div>
-                Before using the CodeWhisperer Beta Service, please review the Betas and Previews terms found
-                <a href="https://aws.amazon.com/service-terms/"> here</a>. The CodeWhisperer Beta Service uses certain
-                information to provide and/or improve the service, including: <br /><br />
-                <div>
-                    <table class="table-bordered">
-                        <tr>
-                            <th>Data Type</th>
-                            <th>Examples</th>
-                        </tr>
-                        <tr>
-                            <td>Contextual information</td>
-                            <td>file content, filename, programming language, cursor location, active line number</td>
-                        </tr>
-                        <tr>
-                            <td>Feedback</td>
-                            <td>
-                                acceptance or rejection of recommendations, modifications to recommendations, user
-                                settings
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>Telemetry metrics</td>
-                            <td>latency, errors, CodeWhisperer API interactions</td>
-                        </tr>
-                        <tr>
-                            <td>User environment information</td>
-                            <td>which IDE is being used, OS information, transfer protocols</td>
-                        </tr>
-                    </table>
-                </div>
-            </div>
-            <br />
-            <div>
-                <div v-if="isCloud9">
-                    <p>
-                        The CodeWhisperer preview period will help us conduct key testing and research in order to
-                        improve CodeWhisperer and prepare it for general availability. For Your Content processed by the
-                        CodeWhisperer Beta Service (the “CodeWhisperer Content”), you agree and instruct that (a) we may
-                        use and store the CodeWhisperer Content to maintain and provide the CodeWhisperer services
-                        (including development and improvement of the CodeWhisperer services and underlying technology);
-                        (b) we may use and store the CodeWhisperer Content that is not personal data to develop and
-                        improve AWS and affiliate machine-learning and artificial-intelligence technologies; and (c)
-                        solely in connection with the development and improvement described in clauses (a) and (b), we
-                        may store the Content in an AWS region outside of the AWS region where you are using
-                        CodeWhisperer. If you have participated in the CodeWhisperer preview and would like Your Content
-                        deleted, please contact us at
-                        <a href="mailto:codewhisperer@amazon.com"> this link</a>. As part of the CodeWhisperer preview,
-                        we may offer you the option to toggle CodeWhisperer Content sharing on or off through the Beta
-                        Service. If you decline to share CodeWhisperer Content through the Beta Service for an account
-                        or set of credentials, we will refrain from collecting the applicable CodeWhisperer Content for
-                        this purpose and will delete any of that CodeWhisperer Content that we have collected for this
-                        purpose. This paragraph does not apply to Your Content that is processed through CodeWhisperer
-                        via Lambda or Cloud9 interfaces.
-                    </p>
-                    <p>
-                        In addition, we may offer you the option through the Beta Service to limit the collection of
-                        metadata, feedback, or other usage metrics which are not CodeWhisperer Content for service
-                        improvement (for example, whether a recommendation was accepted or rejected, but not the content
-                        of that recommendation).
-                    </p>
-                </div>
-                <div v-else>
-                    The CodeWhisperer preview period will help us conduct key testing and research in order to improve
-                    CodeWhisperer and prepare it for general availability. For Your Content processed by the
-                    CodeWhisperer Beta Service (the “CodeWhisperer Content”), you agree and instruct that (a) we may use
-                    and store the CodeWhisperer Content to maintain and provide the CodeWhisperer services (including
-                    development and improvement of the CodeWhisperer services and underlying technology); (b) we may use
-                    and store the CodeWhisperer Content that is not personal data to develop and improve AWS and
-                    affiliate machine-learning and artificial-intelligence technologies; and (c) solely in connection
-                    with the development and improvement described in clauses (a) and (b), we may store the Content in
-                    an AWS region outside of the AWS region where you are using CodeWhisperer. If you have participated
-                    in the CodeWhisperer preview and would like Your Content deleted, please contact us at
-                    <a href="mailto:codewhisperer@amazon.com"> this link</a>. As part of the CodeWhisperer preview, we
-                    may offer you the option to toggle CodeWhisperer Content sharing on or off through the Beta Service.
-                    If you decline to share CodeWhisperer Content through the Beta Service for an account or set of
-                    credentials, we will refrain from collecting the applicable CodeWhisperer Content for this purpose
-                    and will delete any of that CodeWhisperer Content that we have collected for this purpose. In
-                    addition, we may offer you the option through the Beta Service to limit the collection of metadata,
-                    feedback, or other usage metrics which are not CodeWhisperer Content for service improvement (for
-                    example, whether a recommendation was accepted or rejected, but not the content of that
-                    recommendation).
-                </div>
-            </div>
-            <br />
-            <div>
-                Notwithstanding any other term to the contrary in any agreement between you (or your affiliates) and
-                AWS, and without limitation: <br />
-                <div>
-                    <div v-if="isCloud9">
-                        <ul>
-                            <li>
-                                you acknowledge that CodeWhisperer output is a computational result based on the input
-                                you provide to the Beta Service, and that multiple users may receive the same or similar
-                                output. For clarity, although these computational results are Your Content, the same or
-                                similar outputs are independently created, and AWS will not be restricted from providing
-                                the same or similar output to other customers.
-                            </li>
-                            <li>
-                                if you would like to instruct AWS to refrain from using collected CodeWhisperer Content
-                                for service improvement, you must either: (a) submit a request at the deletion link
-                                identified in these beta terms and refrain from further usage of the CodeWhisperer Beta
-                                Service; or (b) if available, leverage the applicable data sharing toggle option(s)
-                                within the CodeWhisperer Beta Service. This bullet point does not apply to Your Content
-                                that is processed through CodeWhisperer via Lambda or Cloud9 interfaces.
-                            </li>
-                        </ul>
-                    </div>
-                    <div v-else>
-                        <ul>
-                            <li>
-                                you acknowledge that CodeWhisperer output is a computational result based on the input
-                                you provide to the Beta Service, and that multiple users may receive the same or similar
-                                output. For clarity, although these computational results are Your Content, the same or
-                                similar outputs are independently created, and AWS will not be restricted from providing
-                                the same or similar output to other customers.
-                            </li>
-                            <li>
-                                if you would like to instruct AWS to refrain from using collected CodeWhisperer Content
-                                for service improvement, you must either: (a) submit a request at the deletion link
-                                identified in these beta terms and refrain from further usage of the CodeWhisperer Beta
-                                Service; or (b) if available, leverage the applicable data sharing toggle option(s)
-                                within the CodeWhisperer Beta Service.
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-            <p>
-                The Beta Service is subject to change and cancellation.
-                <b
-                    >IF YOU DO NOT AGREE TO THESE TERMS AND CONDITIONS, YOU MAY NOT USE THE CodeWhisperer BETA
-                    SERVICE.</b
-                >
-            </p>
-        </div>
-        <div class="container">
-            <button type="button" id="cancel" class="block" @click="cancelCodeSuggestion">Reject</button>
-            <button type="button" id="accept" @click="acceptCodeSuggestions">Accept and Turn on CodeWhisperer</button>
-        </div>
-    </div>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue'
-import { CodeWhispererWebview } from './backend'
-import { WebviewClientFactory } from '../../webviews/client'
-import saveData from '../../webviews/mixins/saveData'
-const client = WebviewClientFactory.create<CodeWhispererWebview>()
-export default defineComponent({
-    name: 'codewhisperer',
-    // This ensures that everything in `data` is persisted
-    mixins: [saveData],
-    // Everything relating to component state should be returned by this method
-    data() {
-        return {
-            userInput: '',
-            errorMessage: '',
-            autodisabled: false,
-            bindValue: 'alt+c',
-            isCloud9: false,
-        }
-    },
-    // Executed on component creation
-    async created() {
-        client.onDidChangeKeyBinding(val => {
-            this.bindValue = val
-        })
-        client.onDidChangeTriggerStatus(val => {
-            this.autodisabled = val
-        })
-        this.isCloud9 = await client.isCloud9()
-    },
-    methods: {
-        async acceptCodeSuggestions() {
-            client.controlTrigger()
-        },
-        async cancelCodeSuggestion() {
-            client.cancelCodeSuggestion()
-        },
-    },
-})
-</script>
-
-<style scoped>
-/* Styling specific this component can be placed here */
-.container {
-    display: flex;
-    flex-direction: row;
-    column-gap: 2em;
-    justify-content: flex-end;
-    padding-bottom: 1em;
-    background-color: transparent;
-}
-.block {
-    background-color: #464e57;
-}
-.block:hover {
-    background-color: transparent;
-}
-#event-list {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-}
-.binding-style {
-    font-weight: 700;
-    color: #1e90ff;
-}
-#cancel,
-#accept {
-    display: block;
-}
-
-.button-right {
-    float: right;
-}
-.codewhisperer-preview-terms {
-    text-align: center;
-    font-weight: bold;
-    text-decoration-line: underline;
-}
-.table-bordered {
-    border-collapse: collapse;
-}
-table,
-th,
-td {
-    border: 1px solid gray;
-}
-</style>
diff --git a/src/credentials/activation.ts b/src/credentials/activation.ts
deleted file mode 100644
index 60e714529f8..00000000000
--- a/src/credentials/activation.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { AwsContext } from '../shared/awsContext'
-import { Settings } from '../shared/settings'
-import { Auth } from './auth'
-import { LoginManager } from './loginManager'
-import { fromString } from './providers/credentials'
-
-export async function initialize(
-    extensionContext: vscode.ExtensionContext,
-    awsContext: AwsContext,
-    settings: Settings,
-    loginManager: LoginManager
-): Promise<void> {
-    Auth.instance.onDidChangeActiveConnection(conn => {
-        // This logic needs to be moved to `Auth.useConnection` to correctly record `passive`
-        if (conn?.type === 'iam' && conn.state === 'valid') {
-            loginManager.login({ passive: true, providerId: fromString(conn.id) })
-        } else {
-            loginManager.logout()
-        }
-    })
-}
diff --git a/src/credentials/auth.ts b/src/credentials/auth.ts
deleted file mode 100644
index 07f626bd9c1..00000000000
--- a/src/credentials/auth.ts
+++ /dev/null
@@ -1,1063 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import globals from '../shared/extensionGlobals'
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as vscode from 'vscode'
-import * as localizedText from '../shared/localizedText'
-import { Credentials } from '@aws-sdk/types'
-import { SsoAccessTokenProvider } from './sso/ssoAccessTokenProvider'
-import { codicon, getIcon } from '../shared/icons'
-import { Commands } from '../shared/vscode/commands2'
-import { DataQuickPickItem, showQuickPick } from '../shared/ui/pickerPrompter'
-import { isValidResponse } from '../shared/wizards/wizard'
-import { CancellationError } from '../shared/utilities/timeoutUtils'
-import { ToolkitError, UnknownError } from '../shared/errors'
-import { getCache } from './sso/cache'
-import { createFactoryFunction, Mutable } from '../shared/utilities/tsUtils'
-import { SsoToken } from './sso/model'
-import { SsoClient } from './sso/clients'
-import { getLogger } from '../shared/logger'
-import { CredentialsProviderManager } from './providers/credentialsProviderManager'
-import { asString, CredentialsProvider, fromString } from './providers/credentials'
-import { once } from '../shared/utilities/functionUtils'
-import { getResourceFromTreeNode } from '../shared/treeview/utils'
-import { Instance } from '../shared/utilities/typeConstructors'
-import { TreeNode } from '../shared/treeview/resourceTreeDataProvider'
-import { createInputBox } from '../shared/ui/inputPrompter'
-import { CredentialsSettings } from './credentialsUtilities'
-import { telemetry } from '../shared/telemetry/telemetry'
-import { createCommonButtons, createExitButton, createHelpButton } from '../shared/ui/buttons'
-import { getIdeProperties, isCloud9 } from '../shared/extensionUtilities'
-import { getCodeCatalystDevEnvId } from '../shared/vscode/env'
-import { getConfigFilename } from './sharedCredentials'
-import { authHelpUrl } from '../shared/constants'
-
-export const builderIdStartUrl = 'https://view.awsapps.com/start'
-export const ssoScope = 'sso:account:access'
-export const codecatalystScopes = ['codecatalyst:read_write']
-export const ssoAccountAccessScopes = ['sso:account:access']
-export const codewhispererScopes = ['codewhisperer:completions', 'codewhisperer:analysis']
-
-export function createBuilderIdProfile(): SsoProfile & { readonly scopes: string[] } {
-    return {
-        type: 'sso',
-        ssoRegion: 'us-east-1',
-        startUrl: builderIdStartUrl,
-        scopes: [...codecatalystScopes, ...codewhispererScopes],
-    }
-}
-
-export function createSsoProfile(startUrl: string, region = 'us-east-1'): SsoProfile & { readonly scopes: string[] } {
-    return {
-        type: 'sso',
-        startUrl,
-        ssoRegion: region,
-        scopes: codewhispererScopes,
-    }
-}
-
-export function hasScopes(target: SsoConnection | SsoProfile, scopes: string[]): boolean {
-    return scopes?.every(s => target.scopes?.includes(s))
-}
-
-export interface SsoConnection {
-    readonly type: 'sso'
-    readonly id: string
-    readonly label: string
-    readonly startUrl: string
-    readonly scopes?: string[]
-
-    /**
-     * Retrieves a bearer token, refreshing or re-authenticating as-needed.
-     *
-     * This should be called for each new API request sent. It is up to the caller to
-     * handle cases where the service rejects the token.
-     */
-    getToken(): Promise<Pick<SsoToken, 'accessToken' | 'expiresAt'>>
-}
-
-export interface IamConnection {
-    readonly type: 'iam'
-    // Currently equivalent to a serialized `CredentialId`
-    // This may change in the future after refactoring legacy implementations
-    readonly id: string
-    readonly label: string
-    getCredentials(): Promise<Credentials>
-}
-
-export type Connection = IamConnection | SsoConnection
-
-export interface SsoProfile {
-    readonly type: 'sso'
-    readonly ssoRegion: string
-    readonly startUrl: string
-    readonly scopes?: string[]
-}
-
-export interface IamProfile {
-    readonly type: 'iam'
-    readonly name: string
-}
-
-// Placeholder type.
-// Would be expanded over time to support
-// https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-profiles.html
-type Profile = IamProfile | SsoProfile
-
-interface AuthService {
-    /**
-     * Lists all connections known to the Toolkit.
-     */
-    listConnections(): Promise<Connection[]>
-
-    /**
-     * Creates a new connection using a profile.
-     *
-     * This will fail if the profile does not result in a valid connection.
-     */
-    createConnection(profile: Profile): Promise<Connection>
-
-    /**
-     * Deletes the connection, removing all associated stateful resources.
-     */
-    deleteConnection(connection: Pick<Connection, 'id'>): void
-
-    /**
-     * Retrieves a connection from an id if it exists.
-     *
-     * A connection id can be persisted and then later used to restore a previous connection.
-     * The caller is expected to handle the case where the connection no longer exists.
-     */
-    getConnection(connection: Pick<Connection, 'id'>): Promise<Connection | undefined>
-}
-
-interface ConnectionManager {
-    /**
-     * The 'global' connection currently in use by the Toolkit.
-     *
-     * Connections can still be used even if they are not the active connection.
-     */
-    readonly activeConnection: Connection | undefined
-    readonly onDidChangeActiveConnection: vscode.Event<Connection | undefined>
-
-    /**
-     * Changes the current 'active' connection used by the Toolkit.
-     */
-    useConnection(connection: Pick<Connection, 'id'>): Promise<Connection>
-}
-
-interface ProfileMetadata {
-    /**
-     * Labels are used for anything UI related when present.
-     */
-    readonly label?: string
-
-    /**
-     * Used to differentiate various edge-cases that are based off state or state transitions:
-     * * `unauthenticated` -> try to login
-     * * `valid` -> `invalid` -> notify that the credentials are invalid, prompt to login again
-     * * `invalid` -> `invalid` -> immediately throw to stop the user from being spammed
-     */
-    readonly connectionState: 'valid' | 'invalid' | 'unauthenticated' | 'authenticating'
-}
-
-// Difference between "Connection" vs. "Profile":
-// * Profile - A stateless configuration that describes how to get credentials
-// * Connection - A stateful entity that can produce credentials for a specific target
-//
-// Connections are very similar to credential providers used in existing logic. The distinction
-// is that connections are (ideally) identity-orientated whereas credential providers are not.
-
-type StoredProfile<T extends Profile = Profile> = T & { readonly metadata: ProfileMetadata }
-
-export class ProfileStore {
-    public constructor(private readonly memento: vscode.Memento) {}
-
-    public getProfile(id: string): StoredProfile | undefined {
-        return this.getData()[id]
-    }
-
-    public getProfileOrThrow(id: string): StoredProfile {
-        const profile = this.getProfile(id)
-        if (profile === undefined) {
-            throw new Error(`Profile does not exist: ${id}`)
-        }
-
-        return profile
-    }
-
-    public listProfiles(): [id: string, profile: StoredProfile][] {
-        return Object.entries(this.getData())
-    }
-
-    public async addProfile(id: string, profile: SsoProfile): Promise<StoredProfile<SsoProfile>>
-    public async addProfile(id: string, profile: IamProfile): Promise<StoredProfile<IamProfile>>
-    public async addProfile(id: string, profile: Profile): Promise<StoredProfile> {
-        if (this.getProfile(id) !== undefined) {
-            throw new Error(`Profile already exists: ${id}`)
-        }
-
-        return this.putProfile(id, this.initMetadata(profile))
-    }
-
-    public async updateProfile(id: string, metadata: Partial<ProfileMetadata>): Promise<StoredProfile> {
-        const profile = this.getProfileOrThrow(id)
-
-        return this.putProfile(id, { ...profile, metadata: { ...profile.metadata, ...metadata } })
-    }
-
-    public async deleteProfile(id: string): Promise<void> {
-        const data = this.getData()
-        delete (data as Mutable<typeof data>)[id]
-
-        await this.updateData(data)
-    }
-
-    public getCurrentProfileId(): string | undefined {
-        return this.memento.get<string>('auth.currentProfileId')
-    }
-
-    public async setCurrentProfileId(id: string | undefined): Promise<void> {
-        await this.memento.update('auth.currentProfileId', id)
-    }
-
-    private getData() {
-        return this.memento.get<{ readonly [id: string]: StoredProfile }>('auth.profiles', {})
-    }
-
-    private async updateData(state: { readonly [id: string]: StoredProfile | undefined }) {
-        await this.memento.update('auth.profiles', state)
-    }
-
-    private async putProfile(id: string, profile: StoredProfile) {
-        await this.updateData({ ...this.getData(), [id]: profile })
-
-        return profile
-    }
-
-    private initMetadata(profile: Profile): StoredProfile {
-        return {
-            ...profile,
-            metadata: {
-                connectionState: 'unauthenticated',
-            },
-        }
-    }
-}
-
-async function loadIamProfilesIntoStore(store: ProfileStore, manager: CredentialsProviderManager) {
-    const providers = await manager.getCredentialProviderNames()
-    for (const [id, profile] of store.listProfiles()) {
-        if (profile.type === 'iam' && providers[id] === undefined) {
-            await store.deleteProfile(id)
-        }
-    }
-    for (const id of Object.keys(providers)) {
-        if (store.getProfile(id) === undefined) {
-            await store.addProfile(id, { type: 'iam', name: providers[id].credentialTypeId })
-        }
-    }
-}
-
-function keyedDebounce<T, U extends any[], K extends string = string>(
-    fn: (key: K, ...args: U) => Promise<T>
-): typeof fn {
-    const pending = new Map<K, Promise<T>>()
-
-    return (key, ...args) => {
-        if (pending.has(key)) {
-            return pending.get(key)!
-        }
-
-        const promise = fn(key, ...args).finally(() => pending.delete(key))
-        pending.set(key, promise)
-
-        return promise
-    }
-}
-
-// TODO: replace this with `idToken` when available
-export function getSsoProfileKey(profile: Pick<SsoProfile, 'startUrl' | 'scopes'>): string {
-    const scopesFragment = profile.scopes ? `?scopes=${profile.scopes.sort()}` : ''
-
-    return `${profile.startUrl}${scopesFragment}`
-}
-
-function sortProfilesByScope(profiles: StoredProfile<Profile>[]): StoredProfile<SsoProfile>[] {
-    return profiles
-        .filter((c): c is StoredProfile<SsoProfile> => c.type === 'sso')
-        .sort((a, b) => (a.scopes?.length ?? 0) - (b.scopes?.length ?? 0))
-}
-
-// The true connection state can only be known after trying to use the connection
-// So it is not exposed on the `Connection` interface
-type StatefulConnection = Connection & { readonly state: ProfileMetadata['connectionState'] }
-
-export class Auth implements AuthService, ConnectionManager {
-    private readonly ssoCache = getCache()
-    private readonly onDidChangeActiveConnectionEmitter = new vscode.EventEmitter<StatefulConnection | undefined>()
-    public readonly onDidChangeActiveConnection = this.onDidChangeActiveConnectionEmitter.event
-
-    public constructor(
-        private readonly store: ProfileStore,
-        private readonly createTokenProvider = createFactoryFunction(SsoAccessTokenProvider),
-        private readonly iamProfileProvider = CredentialsProviderManager.getInstance()
-    ) {}
-
-    #activeConnection: Mutable<StatefulConnection> | undefined
-    public get activeConnection(): StatefulConnection | undefined {
-        return this.#activeConnection
-    }
-
-    public get hasConnections() {
-        return this.store.listProfiles().length !== 0
-    }
-
-    public async restorePreviousSession(): Promise<Connection | undefined> {
-        const id = this.store.getCurrentProfileId()
-        if (id === undefined) {
-            return
-        }
-
-        try {
-            return await this.useConnection({ id })
-        } catch (err) {
-            getLogger().warn(`auth: failed to restore previous session: %s`, err)
-        }
-    }
-
-    public async reauthenticate({ id }: Pick<Connection, 'id'>): Promise<Connection> {
-        const profile = this.store.getProfileOrThrow(id)
-        if (profile.type === 'sso') {
-            const provider = this.getTokenProvider(id, profile)
-            await this.authenticate(id, () => provider.createToken())
-
-            return this.getSsoConnection(id, profile)
-        } else {
-            const provider = await this.getCredentialsProvider(id)
-            await this.authenticate(id, () => this.createCachedCredentials(provider))
-
-            return this.getIamConnection(id, provider)
-        }
-    }
-
-    public async useConnection({ id }: Pick<SsoConnection, 'id'>): Promise<SsoConnection>
-    public async useConnection({ id }: Pick<Connection, 'id'>): Promise<Connection>
-    public async useConnection({ id }: Pick<Connection, 'id'>): Promise<Connection> {
-        const profile = this.store.getProfile(id)
-        if (profile === undefined) {
-            throw new Error(`Connection does not exist: ${id}`)
-        }
-
-        const validated = await this.validateConnection(id, profile)
-        const conn =
-            validated.type === 'sso'
-                ? this.getSsoConnection(id, validated)
-                : this.getIamConnection(id, await this.getCredentialsProvider(id))
-
-        this.#activeConnection = conn
-        this.onDidChangeActiveConnectionEmitter.fire(conn)
-        await this.store.setCurrentProfileId(id)
-
-        return conn
-    }
-
-    public async logout(): Promise<void> {
-        if (this.activeConnection === undefined) {
-            return
-        }
-
-        await this.store.setCurrentProfileId(undefined)
-        await this.invalidateConnection(this.activeConnection.id)
-        this.#activeConnection = undefined
-        this.onDidChangeActiveConnectionEmitter.fire(undefined)
-    }
-
-    public async listConnections(): Promise<Connection[]> {
-        await loadIamProfilesIntoStore(this.store, this.iamProfileProvider)
-
-        const connections = await Promise.all(
-            this.store.listProfiles().map(async ([id, profile]) => {
-                if (profile.type === 'sso') {
-                    return this.getSsoConnection(id, profile)
-                } else {
-                    return this.getIamConnection(id, await this.getCredentialsProvider(id))
-                }
-            })
-        )
-
-        return connections
-    }
-
-    public async createConnection(profile: SsoProfile): Promise<SsoConnection>
-    public async createConnection(profile: Profile): Promise<Connection> {
-        if (profile.type === 'iam') {
-            throw new Error('Creating IAM connections is not supported')
-        }
-
-        // XXX: Scoped connections must be shared as a workaround
-        const startUrl = profile.startUrl
-        if (profile.scopes) {
-            const sharedProfile = sortProfilesByScope(this.store.listProfiles().map(p => p[1])).find(
-                p => p.startUrl === startUrl
-            )
-            const scopes = Array.from(new Set([...profile.scopes, ...(sharedProfile?.scopes ?? [])]))
-            profile = sharedProfile ? { ...profile, scopes } : profile
-        }
-
-        // XXX: `id` should be based off the resolved `idToken`, _not_ the source profile
-        const id = getSsoProfileKey(profile)
-        const tokenProvider = this.getTokenProvider(id, {
-            ...profile,
-            metadata: { connectionState: 'unauthenticated' },
-        })
-
-        try {
-            ;(await tokenProvider.getToken()) ?? (await tokenProvider.createToken())
-            const storedProfile = await this.store.addProfile(id, profile)
-            await this.updateConnectionState(id, 'valid')
-
-            return this.getSsoConnection(id, storedProfile)
-        } catch (err) {
-            await this.store.deleteProfile(id)
-            throw err
-        }
-    }
-
-    public async deleteConnection(connection: Pick<Connection, 'id'>): Promise<void> {
-        if (connection.id === this.#activeConnection?.id) {
-            await this.logout()
-        } else {
-            await this.invalidateConnection(connection.id)
-        }
-
-        await this.store.deleteProfile(connection.id)
-    }
-
-    public async getConnection(connection: Pick<Connection, 'id'>): Promise<Connection | undefined> {
-        const connections = await this.listConnections()
-
-        return connections.find(c => c.id === connection.id)
-    }
-
-    public getConnectionState(connection: Pick<Connection, 'id'>): StatefulConnection['state'] | undefined {
-        return this.store.getProfile(connection.id)?.metadata.connectionState
-    }
-
-    /**
-     * Attempts to remove all auth state related to the connection.
-     *
-     * For SSO, this involves an API call to clear server-side state. The call happens
-     * before the local token(s) are cleared as they are needed in the request.
-     */
-    private async invalidateConnection(id: Connection['id']) {
-        const profile = this.store.getProfileOrThrow(id)
-
-        if (profile.type === 'sso') {
-            const provider = this.getTokenProvider(id, profile)
-            const client = SsoClient.create(profile.ssoRegion, provider)
-
-            // TODO: this seems to fail on the backend for scoped tokens
-            await client.logout().catch(err => {
-                const name = profile.metadata.label ?? id
-                getLogger().warn(`auth: failed to logout of connection "${name}": %s`, err)
-            })
-
-            return provider.invalidate()
-        } else if (profile.type === 'iam') {
-            globals.loginManager.store.invalidateCredentials(fromString(id))
-        }
-    }
-
-    private async updateConnectionState(id: Connection['id'], connectionState: ProfileMetadata['connectionState']) {
-        const oldProfile = this.store.getProfileOrThrow(id)
-        if (oldProfile.metadata.connectionState === connectionState) {
-            return oldProfile
-        }
-
-        const profile = await this.store.updateProfile(id, { connectionState })
-        if (this.#activeConnection?.id === id) {
-            this.#activeConnection.state = connectionState
-            this.onDidChangeActiveConnectionEmitter.fire(this.#activeConnection)
-        }
-
-        return profile
-    }
-
-    private async validateConnection<T extends Profile>(id: Connection['id'], profile: StoredProfile<T>) {
-        if (profile.type === 'sso') {
-            const provider = this.getTokenProvider(id, profile)
-            if ((await provider.getToken()) === undefined) {
-                return this.updateConnectionState(id, 'invalid')
-            } else {
-                return this.updateConnectionState(id, 'valid')
-            }
-        } else {
-            const provider = await this.getCredentialsProvider(id)
-            try {
-                const credentials = await this.getCachedCredentials(provider)
-                if (credentials !== undefined) {
-                    return this.updateConnectionState(id, 'valid')
-                } else if ((await provider.canAutoConnect()) === true) {
-                    await this.authenticate(id, () => this.createCachedCredentials(provider))
-
-                    return this.store.getProfileOrThrow(id)
-                } else {
-                    return this.updateConnectionState(id, 'invalid')
-                }
-            } catch {
-                return this.updateConnectionState(id, 'invalid')
-            }
-        }
-    }
-
-    private async getCredentialsProvider(id: Connection['id']) {
-        const provider = await this.iamProfileProvider.getCredentialsProvider(fromString(id))
-        if (provider === undefined) {
-            throw new Error(`Credentials provider "${id}" not found`)
-        }
-
-        return provider
-    }
-
-    // XXX: always read from the same location in a dev environment
-    private getSsoSessionName = once(() => {
-        try {
-            const configFile = getConfigFilename()
-            const contents: string = require('fs').readFileSync(configFile, 'utf-8')
-            const identifier = contents.match(/\[sso\-session (.*)\]/)?.[1]
-            if (!identifier) {
-                throw new ToolkitError('No sso-session name found in ~/.aws/config', { code: 'NoSsoSessionName' })
-            }
-
-            return identifier
-        } catch (err) {
-            const defaultName = 'codecatalyst'
-            getLogger().warn(`auth: unable to get an sso session name, defaulting to "${defaultName}": %s`, err)
-
-            return defaultName
-        }
-    })
-
-    private getTokenProvider(id: Connection['id'], profile: StoredProfile<SsoProfile>) {
-        const shouldUseSoftwareStatement =
-            getCodeCatalystDevEnvId() !== undefined && profile.startUrl === builderIdStartUrl
-
-        const tokenIdentifier = shouldUseSoftwareStatement ? this.getSsoSessionName() : id
-
-        return this.createTokenProvider(
-            {
-                identifier: tokenIdentifier,
-                startUrl: profile.startUrl,
-                scopes: profile.scopes,
-                region: profile.ssoRegion,
-            },
-            this.ssoCache
-        )
-    }
-
-    private getIamConnection(id: Connection['id'], provider: CredentialsProvider): IamConnection & StatefulConnection {
-        const profile = this.store.getProfileOrThrow(id)
-
-        return {
-            id,
-            type: 'iam',
-            state: profile.metadata.connectionState,
-            label: profile.metadata.label ?? id,
-            getCredentials: () => this.debouncedGetCredentials(id, provider),
-        }
-    }
-
-    private getSsoConnection(
-        id: Connection['id'],
-        profile: StoredProfile<SsoProfile>
-    ): SsoConnection & StatefulConnection {
-        const provider = this.getTokenProvider(id, profile)
-        const truncatedUrl = profile.startUrl.match(/https?:\/\/(.*)\.awsapps\.com\/start/)?.[1] ?? profile.startUrl
-        const label =
-            profile.startUrl === builderIdStartUrl ? 'AWS Builder ID' : `IAM Identity Center (${truncatedUrl})`
-
-        return {
-            id,
-            type: profile.type,
-            scopes: profile.scopes,
-            startUrl: profile.startUrl,
-            state: profile.metadata.connectionState,
-            label: profile.metadata?.label ?? label,
-            getToken: () => this.debouncedGetToken(id, provider),
-        }
-    }
-
-    private async authenticate<T>(id: Connection['id'], callback: () => Promise<T>): Promise<T> {
-        await this.updateConnectionState(id, 'authenticating')
-
-        try {
-            const result = await callback()
-            await this.updateConnectionState(id, 'valid')
-
-            return result
-        } catch (err) {
-            await this.updateConnectionState(id, 'invalid')
-            throw err
-        }
-    }
-
-    private async createCachedCredentials(provider: CredentialsProvider) {
-        const providerId = provider.getCredentialsId()
-        globals.loginManager.store.invalidateCredentials(providerId)
-        const { credentials } = await globals.loginManager.store.upsertCredentials(providerId, provider)
-        await globals.loginManager.validateCredentials(credentials, provider.getDefaultRegion())
-
-        return credentials
-    }
-
-    private async getCachedCredentials(provider: CredentialsProvider) {
-        const creds = await globals.loginManager.store.getCredentials(provider.getCredentialsId())
-        if (creds !== undefined && creds.credentialsHashCode === provider.getHashCode()) {
-            return creds.credentials
-        }
-    }
-
-    private readonly debouncedGetToken = keyedDebounce(Auth.prototype.getToken.bind(this))
-    private async getToken(id: Connection['id'], provider: SsoAccessTokenProvider): Promise<SsoToken> {
-        const token = await provider.getToken()
-
-        return token ?? this.handleInvalidCredentials(id, () => provider.createToken())
-    }
-
-    private readonly debouncedGetCredentials = keyedDebounce(Auth.prototype.getCredentials.bind(this))
-    private async getCredentials(id: Connection['id'], provider: CredentialsProvider): Promise<Credentials> {
-        const credentials = await this.getCachedCredentials(provider)
-        if (credentials !== undefined) {
-            return credentials
-        } else if ((await provider.canAutoConnect()) === true) {
-            return this.createCachedCredentials(provider)
-        } else {
-            return this.handleInvalidCredentials(id, () => this.createCachedCredentials(provider))
-        }
-    }
-
-    private async handleInvalidCredentials<T>(id: Connection['id'], refresh: () => Promise<T>): Promise<T> {
-        const previousState = this.store.getProfile(id)?.metadata.connectionState
-        await this.updateConnectionState(id, 'invalid')
-
-        if (previousState === 'invalid') {
-            throw new ToolkitError('Connection is invalid or expired. Try logging in again.', {
-                code: 'InvalidConnection',
-            })
-        }
-
-        if (previousState === 'valid') {
-            const message = localize('aws.auth.invalidConnection', 'Connection is invalid or expired, login again?')
-            const resp = await vscode.window.showInformationMessage(message, localizedText.yes, localizedText.no)
-            if (resp !== localizedText.yes) {
-                throw new ToolkitError('User cancelled login', {
-                    cancelled: true,
-                    code: 'InvalidConnection',
-                })
-            }
-        }
-
-        return this.authenticate(id, refresh)
-    }
-
-    public readonly tryAutoConnect = once(async () => {
-        if (this.activeConnection !== undefined) {
-            return
-        }
-
-        // Use the environment token if available
-        if (getCodeCatalystDevEnvId() !== undefined) {
-            const profile = createBuilderIdProfile()
-            const key = getSsoProfileKey(profile)
-            if (this.store.getProfile(key) === undefined) {
-                await this.store.addProfile(key, profile)
-            }
-            await this.store.setCurrentProfileId(key)
-        }
-
-        const conn = await this.restorePreviousSession()
-        if (conn !== undefined) {
-            return
-        }
-
-        const defaultProfileId = asString({ credentialSource: 'profile', credentialTypeId: 'default' })
-        const ec2ProfileId = asString({ credentialSource: 'ec2', credentialTypeId: 'instance' })
-        const ecsProfileId = asString({ credentialSource: 'ecs', credentialTypeId: 'instance' })
-        const legacyProfile = new CredentialsSettings().get('profile', defaultProfileId) || defaultProfileId
-        const tryConnection = async (id: string) => {
-            try {
-                await this.useConnection({ id })
-                return true
-            } catch (err) {
-                getLogger().warn(`auth: failed to auto-connect using "${id}": %s`, err)
-                return false
-            }
-        }
-
-        await loadIamProfilesIntoStore(this.store, this.iamProfileProvider)
-        for (const id of [ec2ProfileId, ecsProfileId, legacyProfile]) {
-            if ((await tryConnection(id)) === true) {
-                getLogger().info(`auth: automatically connected with "${id}"`)
-                // Removes the setting from the UI
-                if (id === legacyProfile) {
-                    new CredentialsSettings().delete('profile')
-                }
-            }
-        }
-    })
-
-    static #instance: Auth | undefined
-    public static get instance() {
-        return (this.#instance ??= new Auth(new ProfileStore(globals.context.globalState)))
-    }
-}
-
-const getConnectionIcon = (conn: Connection) =>
-    conn.type === 'sso' ? getIcon('vscode-account') : getIcon('vscode-key')
-
-function toPickerItem(conn: Connection) {
-    const label = codicon`${getConnectionIcon(conn)} ${conn.label}`
-    const descPrefix = conn.type === 'iam' ? 'IAM Credential' : undefined
-    const descSuffix = conn.id.startsWith('profile:')
-        ? 'configured locally (~/.aws/config)'
-        : 'sourced from the environment'
-
-    return {
-        label,
-        data: conn,
-        description: descPrefix !== undefined ? `${descPrefix}, ${descSuffix}` : undefined,
-    }
-}
-
-export async function promptForConnection(auth: Auth, type?: 'iam' | 'sso') {
-    const addNewConnection = {
-        label: codicon`${getIcon('vscode-plus')} Add New Connection`,
-        data: 'addNewConnection' as const,
-    }
-
-    const editCredentials = {
-        label: codicon`${getIcon('vscode-pencil')} Edit Credentials`,
-        data: 'editCredentials' as const,
-    }
-
-    const items = (async function () {
-        // TODO: list linked connections
-        const connections = await auth.listConnections()
-        connections.sort((a, b) => (a.type === 'sso' ? -1 : b.type === 'sso' ? 1 : a.label.localeCompare(b.label)))
-        const filtered = type !== undefined ? connections.filter(c => c.type === type) : connections
-        const items = [...filtered.map(toPickerItem), addNewConnection]
-        const canShowEdit = connections.filter(isIamConnection).filter(c => c.label.startsWith('profile')).length > 0
-
-        return canShowEdit ? [...items, editCredentials] : items
-    })()
-
-    const placeholder =
-        type === 'iam'
-            ? localize('aws.auth.promptConnection.iam.placeholder', 'Select an IAM credential')
-            : localize('aws.auth.promptConnection.all.placeholder', 'Select a connection')
-
-    const resp = await showQuickPick<Connection | 'addNewConnection' | 'editCredentials'>(items, {
-        placeholder,
-        title: localize('aws.auth.promptConnection.title', 'Switch Connection'),
-        buttons: createCommonButtons(),
-    })
-
-    if (!isValidResponse(resp)) {
-        throw new CancellationError('user')
-    }
-
-    if (resp === 'addNewConnection') {
-        return addConnection.execute()
-    }
-
-    if (resp === 'editCredentials') {
-        return globals.awsContextCommands.onCommandEditCredentials()
-    }
-
-    return resp
-}
-
-export async function promptAndUseConnection(...[auth, type]: Parameters<typeof promptForConnection>) {
-    return telemetry.aws_setCredentials.run(async span => {
-        const resp = await promptForConnection(auth, type)
-        if (!resp) {
-            throw new CancellationError('user')
-        }
-
-        await auth.useConnection(resp)
-    })
-}
-
-const switchConnections = Commands.register('aws.auth.switchConnections', (auth: Auth | unknown) => {
-    telemetry.ui_click.emit({ elementId: 'devtools_connectToAws' })
-
-    if (auth instanceof Auth) {
-        return promptAndUseConnection(auth)
-    } else {
-        return promptAndUseConnection(getResourceFromTreeNode(auth, Instance(Auth)))
-    }
-})
-
-async function signout(auth: Auth) {
-    const conn = auth.activeConnection
-
-    if (conn?.type === 'sso') {
-        // TODO: does deleting the connection make sense UX-wise?
-        // this makes it disappear from the list of available connections
-        await auth.deleteConnection(conn)
-
-        const iamConnections = (await auth.listConnections()).filter(c => c.type === 'iam')
-        const fallbackConn = iamConnections.find(c => c.id === 'profile:default') ?? iamConnections[0]
-        if (fallbackConn !== undefined) {
-            await auth.useConnection(fallbackConn)
-        }
-    } else {
-        await auth.logout()
-
-        const fallbackConn = (await auth.listConnections()).find(c => c.type === 'sso')
-        if (fallbackConn !== undefined) {
-            await auth.useConnection(fallbackConn)
-        }
-    }
-}
-
-export const createBuilderIdItem = () =>
-    ({
-        label: codicon`${getIcon('vscode-person')} ${localize(
-            'aws.auth.builderIdItem.label',
-            'Use a personal email to sign up and sign in with AWS Builder ID'
-        )}`,
-        data: 'builderId',
-        onClick: () => telemetry.ui_click.emit({ elementId: 'connection_optionBuilderID' }),
-        detail: 'AWS Builder ID is a new, personal profile for builders.', // TODO: need a "Learn more" button ?
-    } as DataQuickPickItem<'builderId'>)
-
-export const createSsoItem = () =>
-    ({
-        label: codicon`${getIcon('vscode-organization')} ${localize(
-            'aws.auth.ssoItem.label',
-            'Connect using {0} IAM Identity Center',
-            getIdeProperties().company
-        )}`,
-        data: 'sso',
-        onClick: () => telemetry.ui_click.emit({ elementId: 'connection_optionSSO' }),
-        detail: "Sign in to your company's IAM Identity Center access portal login page.",
-    } as DataQuickPickItem<'sso'>)
-
-export const createIamItem = () =>
-    ({
-        label: codicon`${getIcon('vscode-key')} ${localize('aws.auth.iamItem.label', 'Use IAM Credentials')}`,
-        data: 'iam',
-        onClick: () => telemetry.ui_click.emit({ elementId: 'connection_optionIAM' }),
-        detail: 'Activates working with resources in the Explorer. Not supported by CodeWhisperer. Requires an access key ID and secret access key.',
-    } as DataQuickPickItem<'iam'>)
-
-export const isIamConnection = (conn?: Connection): conn is IamConnection => conn?.type === 'iam'
-export const isSsoConnection = (conn?: Connection): conn is SsoConnection => conn?.type === 'sso'
-export const isBuilderIdConnection = (conn?: Connection): conn is SsoConnection =>
-    isSsoConnection(conn) && conn.startUrl === builderIdStartUrl
-
-export async function createStartUrlPrompter(title: string, ignoreScopes = true) {
-    const existingConnections = (await Auth.instance.listConnections()).filter(isSsoConnection)
-    const requiredScopes = createSsoProfile('').scopes
-
-    function validateSsoUrl(url: string) {
-        if (!url.match(/^(http|https):\/\//i)) {
-            return 'URLs must start with http:// or https://. Example: https://d-xxxxxxxxxx.awsapps.com/start'
-        }
-
-        try {
-            const uri = vscode.Uri.parse(url, true)
-            const isSameAuthority = (a: vscode.Uri, b: vscode.Uri) =>
-                a.authority.toLowerCase() === b.authority.toLowerCase()
-            const oldConn = existingConnections.find(conn => isSameAuthority(vscode.Uri.parse(conn.startUrl), uri))
-
-            if (oldConn && (ignoreScopes || hasScopes(oldConn, requiredScopes))) {
-                return 'A connection for this start URL already exists. Sign out before creating a new one.'
-            }
-        } catch (err) {
-            return `URL is malformed: ${UnknownError.cast(err).message}`
-        }
-    }
-
-    return createInputBox({
-        title: `${title}: Enter Start URL`,
-        placeholder: "Enter start URL for your organization's IAM Identity Center",
-        buttons: [createHelpButton(), createExitButton()],
-        validateInput: validateSsoUrl,
-    })
-}
-
-export async function createBuilderIdConnection(auth: Auth) {
-    const newProfile = createBuilderIdProfile()
-    const existingConn = (await auth.listConnections()).find(isBuilderIdConnection)
-    if (existingConn && !hasScopes(existingConn, newProfile.scopes)) {
-        return migrateBuilderId(auth, existingConn, newProfile)
-    }
-
-    return existingConn ?? (await auth.createConnection(newProfile))
-}
-
-Commands.register('aws.auth.help', async () => {
-    vscode.env.openExternal(vscode.Uri.parse(authHelpUrl))
-    telemetry.aws_help.emit()
-})
-Commands.register('aws.auth.signout', () => {
-    telemetry.ui_click.emit({ elementId: 'devtools_signout' })
-
-    return signout(Auth.instance)
-})
-
-// XXX: right now users can only have 1 builder id connection, so de-dupe
-// This logic can be removed or re-purposed once we have access to identities
-async function migrateBuilderId(auth: Auth, existingConn: SsoConnection, newProfile: SsoProfile) {
-    const newConn = await auth.createConnection(newProfile)
-    const shouldUseConnection = auth.activeConnection?.id === existingConn.id
-    await auth.deleteConnection(existingConn).catch(err => {
-        getLogger().warn(`auth: failed to remove old connection "${existingConn.id}": %s`, err)
-    })
-
-    if (shouldUseConnection) {
-        return auth.useConnection(newConn)
-    }
-
-    return newConn
-}
-
-const addConnection = Commands.register('aws.auth.addConnection', async () => {
-    const c9IamItem = createIamItem()
-    c9IamItem.detail =
-        'Activates working with resources in the Explorer. Requires an access key ID and secret access key.'
-    const items = isCloud9() ? [createSsoItem(), c9IamItem] : [createBuilderIdItem(), createSsoItem(), createIamItem()]
-
-    const resp = await showQuickPick(items, {
-        title: localize('aws.auth.addConnection.title', 'Add a Connection to {0}', getIdeProperties().company),
-        placeholder: localize('aws.auth.addConnection.placeholder', 'Select a connection option'),
-        buttons: createCommonButtons() as vscode.QuickInputButton[],
-    })
-    if (!isValidResponse(resp)) {
-        telemetry.ui_click.emit({ elementId: 'connection_optionescapecancel' })
-        throw new CancellationError('user')
-    }
-
-    switch (resp) {
-        case 'iam':
-            return await globals.awsContextCommands.onCommandCreateCredentialsProfile()
-        case 'sso': {
-            const startUrlPrompter = await createStartUrlPrompter('IAM Identity Center')
-            const startUrl = await startUrlPrompter.prompt()
-            if (!isValidResponse(startUrl)) {
-                throw new CancellationError('user')
-            }
-
-            telemetry.ui_click.emit({ elementId: 'connection_startUrl' })
-
-            const conn = await Auth.instance.createConnection(createSsoProfile(startUrl))
-            return Auth.instance.useConnection(conn)
-        }
-        case 'builderId': {
-            return createBuilderIdConnection(Auth.instance)
-        }
-    }
-})
-
-const reauth = Commands.register('_aws.auth.reauthenticate', async (auth: Auth, conn: Connection) => {
-    try {
-        await auth.reauthenticate(conn)
-    } catch (err) {
-        throw ToolkitError.chain(err, 'Unable to authenticate connection')
-    }
-})
-
-// Used to decouple from the `Commands` implementation
-Commands.register('_aws.auth.autoConnect', () => Auth.instance.tryAutoConnect())
-
-export const useIamCredentials = Commands.register('_aws.auth.useIamCredentials', (auth: Auth) => {
-    telemetry.ui_click.emit({ elementId: 'explorer_IAMselect_VSCode' })
-
-    return promptAndUseConnection(auth, 'iam')
-})
-
-// Legacy commands
-export const login = Commands.register('aws.login', async (auth: Auth = Auth.instance) => {
-    const connections = await auth.listConnections()
-    if (connections.length === 0) {
-        return addConnection.execute()
-    } else {
-        return switchConnections.execute(auth)
-    }
-})
-Commands.register('aws.logout', () => signout(Auth.instance))
-Commands.register('aws.credentials.edit', () => globals.awsContextCommands.onCommandEditCredentials())
-Commands.register('aws.credentials.profile.create', async () => {
-    try {
-        await globals.awsContextCommands.onCommandCreateCredentialsProfile()
-    } finally {
-        telemetry.aws_createCredentials.emit()
-    }
-})
-
-function mapEventType<T, U = void>(event: vscode.Event<T>, fn?: (val: T) => U): vscode.Event<U> {
-    const emitter = new vscode.EventEmitter<U>()
-    event(val => (fn ? emitter.fire(fn(val)) : emitter.fire(undefined as U)))
-
-    return emitter.event
-}
-
-export class AuthNode implements TreeNode<Auth> {
-    public readonly id = 'auth'
-    public readonly onDidChangeTreeItem = mapEventType(this.resource.onDidChangeActiveConnection)
-
-    public constructor(public readonly resource: Auth) {}
-
-    public getTreeItem() {
-        // Calling this here is robust but `TreeShim` must be instantiated lazily to stop side-effects
-        this.resource.tryAutoConnect()
-
-        if (!this.resource.hasConnections) {
-            const item = new vscode.TreeItem(`Connect to ${getIdeProperties().company} to Get Started...`)
-            item.command = addConnection.build().asCommand({ title: 'Add Connection' })
-
-            return item
-        }
-
-        const conn = this.resource.activeConnection
-        const itemLabel =
-            conn?.label !== undefined
-                ? localize('aws.auth.node.connected', `Connected with {0}`, conn.label)
-                : localize('aws.auth.node.selectConnection', 'Select a connection...')
-
-        const item = new vscode.TreeItem(itemLabel)
-        item.contextValue = 'awsAuthNode'
-
-        if (conn !== undefined && conn.state !== 'valid') {
-            item.iconPath = getIcon('vscode-error')
-            if (conn.state === 'authenticating') {
-                this.setDescription(item, 'authenticating...')
-            } else {
-                this.setDescription(item, 'expired or invalid, click to authenticate')
-                item.command = reauth.build(this.resource, conn).asCommand({ title: 'Reauthenticate' })
-            }
-        } else {
-            item.command = switchConnections.build(this.resource).asCommand({ title: 'Login' })
-            item.iconPath = conn !== undefined ? getConnectionIcon(conn) : undefined
-        }
-
-        return item
-    }
-
-    private setDescription(item: vscode.TreeItem, text: string) {
-        if (isCloud9()) {
-            item.tooltip = item.tooltip ?? text
-        } else {
-            item.description = text
-        }
-    }
-}
diff --git a/src/credentials/awsCredentialsStatusBarItem.ts b/src/credentials/awsCredentialsStatusBarItem.ts
deleted file mode 100644
index 3e076a1a2ad..00000000000
--- a/src/credentials/awsCredentialsStatusBarItem.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as vscode from 'vscode'
-import { AwsContext } from '../shared/awsContext'
-import { getIdeProperties } from '../shared/extensionUtilities'
-import { DevSettings } from '../shared/settings'
-import { Auth, login } from './auth'
-
-const statusbarPriority = 1
-
-export async function initializeAwsCredentialsStatusBarItem(
-    awsContext: AwsContext,
-    context: vscode.ExtensionContext
-): Promise<void> {
-    const statusBarItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, statusbarPriority)
-    statusBarItem.command = login.build().asCommand({ title: 'Login' })
-    statusBarItem.show()
-    updateCredentialsStatusBarItem(statusBarItem)
-
-    context.subscriptions.push(statusBarItem)
-
-    const devSettings = DevSettings.instance
-    handleDevSettings(devSettings, statusBarItem)
-
-    context.subscriptions.push(
-        Auth.instance.onDidChangeActiveConnection(conn => {
-            const color = conn?.state === 'invalid' ? new vscode.ThemeColor('statusBarItem.errorBackground') : undefined
-            updateCredentialsStatusBarItem(statusBarItem, conn?.label, color)
-            handleDevSettings(devSettings, statusBarItem)
-        }),
-        devSettings.onDidChangeActiveSettings(() => handleDevSettings(devSettings, statusBarItem))
-    )
-}
-
-function handleDevSettings(devSettings: DevSettings, statusBarItem: vscode.StatusBarItem) {
-    const developerMode = Object.keys(devSettings.activeSettings)
-
-    if (developerMode.length > 0) {
-        ;(statusBarItem as any).backgroundColor ??= new vscode.ThemeColor('statusBarItem.warningBackground')
-
-        const devSettingsStr = developerMode.join('  \n')
-        statusBarItem.tooltip = `Toolkit developer settings:\n${devSettingsStr}`
-    }
-}
-
-// Resolves when the status bar reaches its final state
-export async function updateCredentialsStatusBarItem(
-    statusBarItem: vscode.StatusBarItem,
-    credentialsId?: string,
-    color?: vscode.ThemeColor
-): Promise<void> {
-    const connectedMsg = localize(
-        'AWS.credentials.statusbar.connected',
-        'Connected to {0} with "{1}" (click to change)',
-        getIdeProperties().company,
-        credentialsId
-    )
-    const disconnectedMsg = localize(
-        'AWS.credentials.statusbar.disconnected',
-        'Click to connect to {0}',
-        getIdeProperties().company
-    )
-
-    const company = getIdeProperties().company
-    statusBarItem.tooltip = credentialsId ? connectedMsg : disconnectedMsg
-    statusBarItem.text = credentialsId ? `${company}: ${credentialsId}` : company
-    ;(statusBarItem as any).backgroundColor = color
-}
diff --git a/src/credentials/credentialsCreator.ts b/src/credentials/credentialsCreator.ts
deleted file mode 100644
index dc518b94f53..00000000000
--- a/src/credentials/credentialsCreator.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import { createInputBox, promptUser } from '../shared/ui/input'
-
-const errorMessageUserCancelled = localize('AWS.error.mfa.userCancelled', 'User cancelled entering authentication code')
-
-/**
- * @description Prompts user for MFA token
- *
- * Entered token is passed to the callback.
- * If user cancels out, the callback is passed an error with a fixed message string.
- *
- * @param mfaSerial Serial arn of MFA device
- * @param profileName Name of Credentials profile we are asking an MFA Token for
- * @param callback tokens/errors are passed through here
- */
-export async function getMfaTokenFromUser(mfaSerial: string, profileName: string): Promise<string> {
-    const inputBox = createInputBox({
-        options: {
-            ignoreFocusOut: true,
-            placeHolder: localize('AWS.prompt.mfa.enterCode.placeholder', 'Enter Authentication Code Here'),
-            title: localize('AWS.prompt.mfa.enterCode.title', 'MFA Challenge for {0}', profileName),
-            prompt: localize('AWS.prompt.mfa.enterCode.prompt', 'Enter code for MFA device {0}', mfaSerial),
-        },
-    })
-
-    const token = await promptUser({ inputBox: inputBox })
-
-    // Distinguish user cancel vs code entry issues with the error message
-    if (!token) {
-        throw new Error(errorMessageUserCancelled)
-    }
-
-    return token
-}
diff --git a/src/credentials/credentialsStore.ts b/src/credentials/credentialsStore.ts
deleted file mode 100644
index 1b4c34e7003..00000000000
--- a/src/credentials/credentialsStore.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-/*!
- * Copyright 2019-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as AWS from '@aws-sdk/types'
-import globals from '../shared/extensionGlobals'
-import { getLogger } from '../shared/logger/logger'
-import { asString, CredentialsProvider, CredentialsId } from './providers/credentials'
-import { CredentialsProviderManager } from './providers/credentialsProviderManager'
-
-export interface CachedCredentials {
-    credentials: AWS.Credentials
-    credentialsHashCode: string
-}
-
-/**
- * Simple cache for credentials
- */
-export class CredentialsStore {
-    private readonly credentialsCache: { [key: string]: CachedCredentials }
-
-    public constructor() {
-        this.credentialsCache = {}
-    }
-
-    /**
-     * Checks if the stored credentials are valid. Non-existent or expired credentials returns false.
-     *
-     * If the expiration property does not exist, it is assumed to never expire.
-     */
-    public isValid(key: string): boolean {
-        if (this.credentialsCache[key]) {
-            const expiration = this.credentialsCache[key].credentials.expiration
-            return expiration !== undefined ? expiration >= new globals.clock.Date() : true
-        }
-
-        return false
-    }
-
-    /**
-     * Returns undefined if the specified credentials are expired or not found.
-     */
-    public async getCredentials(credentials: CredentialsId): Promise<CachedCredentials | undefined> {
-        if (this.isValid(asString(credentials))) {
-            return this.credentialsCache[asString(credentials)]
-        } else {
-            return undefined
-        }
-    }
-
-    /**
-     * If credentials are not stored, the credentialsProvider is used to produce credentials (which are then stored).
-     * If the credentials exist but are outdated, the credentials will be invalidated and updated.
-     * Either way, the credentials tied to the credentialsId will then be returned.
-     */
-    public async upsertCredentials(
-        credentialsId: CredentialsId,
-        credentialsProvider: CredentialsProvider
-    ): Promise<CachedCredentials> {
-        let credentials = await this.getCredentials(credentialsId)
-
-        if (!credentials) {
-            credentials = await this.consumeProvider(credentialsId, credentialsProvider)
-        } else if (credentialsProvider.getHashCode() !== credentials.credentialsHashCode) {
-            getLogger().verbose(`Using updated credentials: ${asString(credentialsId)}`)
-            this.invalidateCredentials(credentialsId)
-            credentials = await this.consumeProvider(credentialsId, credentialsProvider)
-        }
-
-        return credentials
-    }
-
-    /**
-     * Evicts credentials from storage
-     */
-    public invalidateCredentials(credentialsId: CredentialsId) {
-        delete this.credentialsCache[asString(credentialsId)]
-    }
-
-    public async setCredentials(credentials: AWS.Credentials, provider: CredentialsProvider): Promise<void> {
-        this.credentialsCache[asString(provider.getCredentialsId())] = {
-            credentials,
-            credentialsHashCode: provider.getHashCode(),
-        }
-    }
-
-    private async consumeProvider(
-        credentialsId: CredentialsId,
-        credentialsProvider: CredentialsProvider
-    ): Promise<CachedCredentials> {
-        const credentials = {
-            credentials: await credentialsProvider.getCredentials(),
-            credentialsHashCode: credentialsProvider.getHashCode(),
-        }
-
-        this.credentialsCache[asString(credentialsId)] = credentials
-
-        return credentials
-    }
-}
-
-/**
- * Gets credentials, and tries to refresh them if necessary.
- */
-export async function getCredentialsFromStore(
-    credentialsId: CredentialsId,
-    credentialsStore: CredentialsStore
-): Promise<AWS.Credentials | undefined> {
-    const provider = await CredentialsProviderManager.getInstance().getCredentialsProvider(credentialsId)
-    if (!provider) {
-        credentialsStore.invalidateCredentials(credentialsId)
-        return undefined
-    }
-
-    const cachedCredentials = await credentialsStore.upsertCredentials(credentialsId, provider)
-    return cachedCredentials.credentials
-}
diff --git a/src/credentials/credentialsUtilities.ts b/src/credentials/credentialsUtilities.ts
deleted file mode 100644
index 27f3e6e2761..00000000000
--- a/src/credentials/credentialsUtilities.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as vscode from 'vscode'
-import { Credentials } from '@aws-sdk/types'
-import { authHelpUrl } from '../shared/constants'
-import { Profile } from '../shared/credentials/credentialsFile'
-import globals from '../shared/extensionGlobals'
-import { isCloud9 } from '../shared/extensionUtilities'
-import { messages, showMessageWithCancel, showViewLogsMessage } from '../shared/utilities/messages'
-import { Timeout, waitTimeout } from '../shared/utilities/timeoutUtils'
-import { fromExtensionManifest } from '../shared/settings'
-
-const credentialsTimeout = 300000 // 5 minutes
-const credentialsProgressDelay = 1000
-
-export function asEnvironmentVariables(credentials: Credentials): NodeJS.ProcessEnv {
-    const environmentVariables: NodeJS.ProcessEnv = {}
-
-    environmentVariables.AWS_ACCESS_KEY = credentials.accessKeyId
-    environmentVariables.AWS_ACCESS_KEY_ID = credentials.accessKeyId
-    environmentVariables.AWS_SECRET_KEY = credentials.secretAccessKey
-    environmentVariables.AWS_SECRET_ACCESS_KEY = credentials.secretAccessKey
-    environmentVariables.AWS_SESSION_TOKEN = credentials.sessionToken
-    environmentVariables.AWS_SECURITY_TOKEN = credentials.sessionToken
-
-    return environmentVariables
-}
-
-export function showLoginFailedMessage(credentialsId: string, errMsg: string): void {
-    const getHelp = localize('AWS.generic.message.getHelp', 'Get Help...')
-    const editCreds = messages.editCredentials(false)
-    // TODO: getHelp page for Cloud9.
-    const buttons = isCloud9() ? [editCreds] : [editCreds, getHelp]
-
-    showViewLogsMessage(
-        localize('AWS.message.credentials.invalid', 'Credentials "{0}" failed to connect: {1}', credentialsId, errMsg),
-        vscode.window,
-        'error',
-        buttons
-    ).then((selection: string | undefined) => {
-        if (selection === getHelp) {
-            vscode.env.openExternal(vscode.Uri.parse(authHelpUrl))
-        }
-        if (selection === editCreds) {
-            vscode.commands.executeCommand('aws.credentials.edit')
-        }
-    })
-}
-
-export function hasProfileProperty(profile: Profile, propertyName: string): boolean {
-    return !!profile[propertyName]
-}
-
-/**
- * Attempts to resolve (or refresh) a provider with a 'Cancel' progress message.
- * User cancellation or timeout expiration will cause rejection.
- *
- * @param profile Profile name to display for the progress message
- * @param provider A promise that resolves in Credentials
- * @param timeout How long to wait for resolution without user intervention (default: 5 minutes)
- *
- * @returns The resolved Credentials or undefined if the the provider was a 'refresh' Promise
- */
-export async function resolveProviderWithCancel(
-    profile: string,
-    provider: Promise<Credentials>,
-    timeout: Timeout | number = credentialsTimeout
-): Promise<Credentials> {
-    if (typeof timeout === 'number') {
-        timeout = new Timeout(timeout)
-    }
-
-    globals.clock.setTimeout(() => {
-        timeout = timeout as Timeout // Typescript lost scope of the correct type here
-        if (timeout.completed !== true) {
-            showMessageWithCancel(
-                localize('AWS.message.credentials.pending', 'Getting credentials for profile: {0}', profile),
-                timeout
-            )
-        }
-    }, credentialsProgressDelay)
-
-    return await waitTimeout(provider, timeout, {
-        allowUndefined: false,
-        onCancel: () => {
-            throw new Error(`Request to get credentials for "${profile}" cancelled`)
-        },
-        onExpire: () => {
-            throw new Error(`Request to get credentials for "${profile}" expired`)
-        },
-    })
-}
-
-export class CredentialsSettings extends fromExtensionManifest('aws', { profile: String }) {}
diff --git a/src/credentials/providers/credentials.ts b/src/credentials/providers/credentials.ts
deleted file mode 100644
index 4d017388ed6..00000000000
--- a/src/credentials/providers/credentials.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as AWS from '@aws-sdk/types'
-import { CredentialSourceId, CredentialType } from '../../shared/telemetry/telemetry'
-
-const credentialsProviderIdSeparator = ':'
-
-/**
- * "Fully-qualified" credentials structure (source + name).
- */
-export interface CredentialsId {
-    /** Credentials source id, e.g. "sharedCredentials". */
-    readonly credentialSource: CredentialsProviderType
-    /** User-defined profile name, e.g. "default". */
-    readonly credentialTypeId: string
-}
-
-/**
- * Gets the string form of the given `CredentialsProvider`.
- *
- * For use in e.g. the statusbar, menus, etc.  Includes:
- * - credentials source kind
- * - instance-identifying information (typically the "profile name")
- *
- * @param credentials  Value to be formatted.
- */
-export function asString(credentials: CredentialsId): string {
-    return [credentials.credentialSource, credentials.credentialTypeId].join(credentialsProviderIdSeparator)
-}
-
-export function fromString(credentials: string): CredentialsId {
-    const separatorPos = credentials.indexOf(credentialsProviderIdSeparator)
-
-    if (separatorPos === -1) {
-        throw new Error(`Unexpected credentialsId format: ${credentials}`)
-    }
-
-    const credSource = credentials.substring(0, separatorPos)
-    if (!credentialsProviderType.includes(credSource as any)) {
-        throw new Error(`unexpected credential source: ${credSource}`)
-    }
-
-    return {
-        credentialSource: credSource as CredentialsProviderType,
-        credentialTypeId: credentials.substring(separatorPos + 1),
-    }
-}
-
-export function isEqual(idA: CredentialsId, idB: CredentialsId): boolean {
-    return idA.credentialSource === idB.credentialSource && idA.credentialTypeId === idB.credentialTypeId
-}
-
-/**
- * Credentials source type, broadly describes the kind of thing that supplied the credentials.
- *
- * - "profile" is the most common, this is understood as a profile defined in
- *   `~/.aws/credentials` or something like it, which may be authenticated via
- *   static values, SSO, MFA, etc.
- * - "ec2" or "ecs" means "instance credentials" given by the EC2/ECS "metadata service"
- *   magic endpoint.
- *   https://docs.aws.amazon.com/sdkref/latest/guide/setting-global-credential_source.html
- * - "env" means we read the credentials from `AWS_XX` environment variables.
- *   https://docs.aws.amazon.com/sdkref/latest/guide/environment-variables.html
- * - "sso" refers to all SSO-based profiles. Currently, any profile with a start URL will
- *   be treated as SSO _by the Toolkit_. Incomplete profiles may be rejected by the SDKs, so
- *   valid SSO profiles may not necessarily be considered valid among all tools.
- *
- * Compare the similar concept `telemetry.CredentialSourceId`.
- */
-export type CredentialsProviderType = typeof credentialsProviderType[number]
-export const credentialsProviderType = ['profile', 'ec2', 'ecs', 'env', 'sso'] as const
-
-/**
- * Lossy map of CredentialsProviderType to telemetry.CredentialSourceId
- */
-export function credentialsProviderToTelemetryType(o: CredentialsProviderType): CredentialSourceId {
-    switch (o) {
-        case 'ec2':
-            return 'ec2'
-        case 'ecs':
-            return 'ecs'
-        case 'env':
-            return 'envVars'
-        case 'profile':
-            return 'sharedCredentials'
-        default:
-            return 'other'
-    }
-}
-
-export interface CredentialsProvider {
-    getCredentialsId(): CredentialsId
-    /**
-     * Gets the credential provider type, a coarser form of
-     * telemetry.CredentialSourceId for use in config files and UIs. #1725
-     *
-     * Compare getCredentialsType(). A single _provider_ serves many types of credentials.
-     *
-     * @see telemetry.CredentialSourceId
-     */
-    getProviderType(): CredentialsProviderType
-    /**
-     * Gets the credential type, for use in telemetry.  This is more granular than
-     *
-     * Compare getCredentialsProviderType() which is type of the _provider_.
-     */
-    getTelemetryType(): CredentialType
-    getDefaultRegion(): string | undefined
-    getHashCode(): string
-    getCredentials(): Promise<AWS.Credentials>
-    /**
-     * Decides if the credential is the kind that may be auto-connected at
-     * first use (in particular, credentials that may prompt, such as SSO/MFA,
-     * should _not_ attempt to auto-connect).
-     */
-    canAutoConnect(): Promise<boolean>
-    /**
-     * Determines if the provider is currently capable of producing credentials.
-     */
-    isAvailable(): Promise<boolean>
-}
diff --git a/src/credentials/providers/credentialsProviderManager.ts b/src/credentials/providers/credentialsProviderManager.ts
deleted file mode 100644
index e9962f978b7..00000000000
--- a/src/credentials/providers/credentialsProviderManager.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { getLogger } from '../../shared/logger'
-import { telemetry } from '../../shared/telemetry/telemetry'
-import {
-    asString,
-    CredentialsProvider,
-    CredentialsId,
-    credentialsProviderToTelemetryType,
-    isEqual,
-} from './credentials'
-import { CredentialsProviderFactory } from './credentialsProviderFactory'
-
-/**
- * Responsible for providing the Toolkit with all available CredentialsProviders.
- * Providers may be registered directly or created with supplied CredentialsProviderFactories.
- */
-export class CredentialsProviderManager {
-    private static INSTANCE: CredentialsProviderManager | undefined
-    private readonly providerFactories: CredentialsProviderFactory[] = []
-    private readonly providers: CredentialsProvider[] = []
-
-    public async getAllCredentialsProviders(): Promise<CredentialsProvider[]> {
-        let providers: CredentialsProvider[] = []
-
-        for (const provider of this.providers) {
-            if (await provider.isAvailable()) {
-                const telemType = credentialsProviderToTelemetryType(provider.getCredentialsId().credentialSource)
-                telemetry.aws_loadCredentials.emit({ credentialSourceId: telemType, value: 1 })
-                providers = providers.concat(provider)
-            } else {
-                getLogger().verbose(
-                    `provider for ${provider.getCredentialsId().credentialTypeId} unavailable in this environment`
-                )
-            }
-        }
-
-        for (const factory of this.providerFactories) {
-            await factory.refresh()
-            const refreshed = factory.listProviders()
-            const providerType = factory.getProviderType()
-            if (!providerType) {
-                continue
-            }
-            const telemType = credentialsProviderToTelemetryType(providerType)
-            telemetry.aws_loadCredentials.emit({ credentialSourceId: telemType, value: refreshed.length })
-            providers = providers.concat(refreshed)
-        }
-
-        return providers
-    }
-
-    /**
-     * Returns a map of `CredentialsProviderId` string-forms to object-forms,
-     * from all credential sources. Only available providers are returned.
-     */
-    public async getCredentialProviderNames(): Promise<{ [key: string]: CredentialsId }> {
-        const m: { [key: string]: CredentialsId } = {}
-        for (const o of await this.getAllCredentialsProviders()) {
-            m[asString(o.getCredentialsId())] = o.getCredentialsId()
-        }
-
-        return m
-    }
-
-    public async getCredentialsProvider(credentials: CredentialsId): Promise<CredentialsProvider | undefined> {
-        for (const provider of this.providers) {
-            if (isEqual(provider.getCredentialsId(), credentials) && (await provider.isAvailable())) {
-                return provider
-            }
-        }
-
-        for (const factory of this.providerFactories) {
-            await factory.refresh()
-
-            for (const provider of factory.listProviders()) {
-                if (isEqual(provider.getCredentialsId(), credentials) && (await provider.isAvailable())) {
-                    return provider
-                }
-            }
-        }
-
-        return undefined
-    }
-
-    public addProvider(provider: CredentialsProvider) {
-        this.providers.push(provider)
-    }
-
-    public addProviders(...provider: CredentialsProvider[]) {
-        this.providers.push(...provider)
-    }
-
-    public addProviderFactory(factory: CredentialsProviderFactory) {
-        this.providerFactories.push(factory)
-    }
-
-    public addProviderFactories(...factory: CredentialsProviderFactory[]) {
-        this.providerFactories.push(...factory)
-    }
-
-    public static getInstance(): CredentialsProviderManager {
-        if (!CredentialsProviderManager.INSTANCE) {
-            CredentialsProviderManager.INSTANCE = new CredentialsProviderManager()
-        }
-
-        return CredentialsProviderManager.INSTANCE
-    }
-}
diff --git a/src/credentials/providers/sharedCredentialsProvider.ts b/src/credentials/providers/sharedCredentialsProvider.ts
deleted file mode 100644
index 2f49f5dc12a..00000000000
--- a/src/credentials/providers/sharedCredentialsProvider.ts
+++ /dev/null
@@ -1,385 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as AWS from '@aws-sdk/types'
-import { AssumeRoleParams, fromIni } from '@aws-sdk/credential-provider-ini'
-import { fromProcess } from '@aws-sdk/credential-provider-process'
-import { ParsedIniData, SharedConfigFiles } from '@aws-sdk/shared-ini-file-loader'
-import { chain } from '@aws-sdk/property-provider'
-import { fromInstanceMetadata, fromContainerMetadata } from '@aws-sdk/credential-provider-imds'
-import { fromEnv } from '@aws-sdk/credential-provider-env'
-import { Profile } from '../../shared/credentials/credentialsFile'
-import { getLogger } from '../../shared/logger'
-import { getStringHash } from '../../shared/utilities/textUtilities'
-import { getMfaTokenFromUser } from '../credentialsCreator'
-import { resolveProviderWithCancel } from '../credentialsUtilities'
-import { CredentialsProvider, CredentialsProviderType, CredentialsId } from './credentials'
-import { CredentialType } from '../../shared/telemetry/telemetry.gen'
-import { getMissingProps, hasProps } from '../../shared/utilities/tsUtils'
-import { DefaultStsClient } from '../../shared/clients/stsClient'
-import { SsoAccessTokenProvider } from '../sso/ssoAccessTokenProvider'
-import { SsoClient } from '../sso/clients'
-import { toRecord } from '../../shared/utilities/collectionUtils'
-
-const sharedCredentialProperties = {
-    AWS_ACCESS_KEY_ID: 'aws_access_key_id',
-    AWS_SECRET_ACCESS_KEY: 'aws_secret_access_key',
-    AWS_SESSION_TOKEN: 'aws_session_token',
-    CREDENTIAL_PROCESS: 'credential_process',
-    CREDENTIAL_SOURCE: 'credential_source',
-    REGION: 'region',
-    ROLE_ARN: 'role_arn',
-    SOURCE_PROFILE: 'source_profile',
-    MFA_SERIAL: 'mfa_serial',
-    SSO_START_URL: 'sso_start_url',
-    SSO_REGION: 'sso_region',
-    SSO_ACCOUNT_ID: 'sso_account_id',
-    SSO_ROLE_NAME: 'sso_role_name',
-} as const
-
-const credentialSources = {
-    ECS_CONTAINER: 'EcsContainer',
-    EC2_INSTANCE_METADATA: 'Ec2InstanceMetadata',
-    ENVIRONMENT: 'Environment',
-}
-
-function validateProfile(profile: Profile, ...props: string[]): string | undefined {
-    const missing = getMissingProps(profile, ...props)
-
-    if (missing.length !== 0) {
-        return `missing properties: ${missing.join(', ')}`
-    }
-}
-
-function isSsoProfile(profile: Profile): boolean {
-    return (
-        hasProps(profile, sharedCredentialProperties.SSO_START_URL) ||
-        hasProps(profile, sharedCredentialProperties.SSO_REGION) ||
-        hasProps(profile, sharedCredentialProperties.SSO_ROLE_NAME) ||
-        hasProps(profile, sharedCredentialProperties.SSO_ACCOUNT_ID)
-    )
-}
-
-/**
- * Represents one profile from the AWS Shared Credentials files.
- */
-export class SharedCredentialsProvider implements CredentialsProvider {
-    private readonly profile: Profile
-
-    public constructor(
-        private readonly profileName: string,
-        private readonly allSharedCredentialProfiles: Map<string, Profile>
-    ) {
-        const profile = this.allSharedCredentialProfiles.get(profileName)
-
-        if (!profile) {
-            throw new Error(`Profile not found: ${profileName}`)
-        }
-
-        this.profile = profile
-    }
-
-    public getCredentialsId(): CredentialsId {
-        return {
-            credentialSource: this.getProviderType(),
-            credentialTypeId: this.profileName,
-        }
-    }
-
-    public static getProviderType(): CredentialsProviderType {
-        return 'profile'
-    }
-
-    public getProviderType(): CredentialsProviderType {
-        return SharedCredentialsProvider.getProviderType()
-    }
-
-    public getTelemetryType(): CredentialType {
-        if (hasProps(this.profile, sharedCredentialProperties.SSO_START_URL)) {
-            return 'ssoProfile'
-        } else if (this.isCredentialSource(credentialSources.EC2_INSTANCE_METADATA)) {
-            return 'ec2Metadata'
-        } else if (this.isCredentialSource(credentialSources.ECS_CONTAINER)) {
-            return 'ecsMetatdata' // TODO: fix telemetry value typo
-        } else if (this.isCredentialSource(credentialSources.ENVIRONMENT)) {
-            return 'other'
-        }
-        return 'staticProfile'
-    }
-
-    public getHashCode(): string {
-        return getStringHash(JSON.stringify(this.profile))
-    }
-
-    public getDefaultRegion(): string | undefined {
-        return this.profile[sharedCredentialProperties.REGION]
-    }
-
-    public async canAutoConnect(): Promise<boolean> {
-        if (isSsoProfile(this.profile)) {
-            const tokenProvider = new SsoAccessTokenProvider({
-                region: this.profile[sharedCredentialProperties.SSO_REGION]!,
-                startUrl: this.profile[sharedCredentialProperties.SSO_START_URL]!,
-            })
-
-            return (await tokenProvider.getToken()) !== undefined
-        }
-
-        return !hasProps(this.profile, sharedCredentialProperties.MFA_SERIAL)
-    }
-
-    public async isAvailable(): Promise<boolean> {
-        const validationMessage = this.validate()
-        if (validationMessage) {
-            getLogger().error(`Profile ${this.profileName} is not a valid Credential Profile: ${validationMessage}`)
-            return false
-        }
-        return true
-    }
-
-    /**
-     * Returns undefined if the Profile is valid, else a string indicating what is invalid
-     */
-    public validate(): string | undefined {
-        if (hasProps(this.profile, sharedCredentialProperties.CREDENTIAL_SOURCE)) {
-            return this.validateSourcedCredentials()
-        } else if (hasProps(this.profile, sharedCredentialProperties.ROLE_ARN)) {
-            return this.validateSourceProfileChain()
-        } else if (hasProps(this.profile, sharedCredentialProperties.CREDENTIAL_PROCESS)) {
-            // No validation. Don't check anything else.
-            return undefined
-        } else if (
-            hasProps(this.profile, sharedCredentialProperties.AWS_ACCESS_KEY_ID) ||
-            hasProps(this.profile, sharedCredentialProperties.AWS_SECRET_ACCESS_KEY) ||
-            hasProps(this.profile, sharedCredentialProperties.AWS_SESSION_TOKEN)
-        ) {
-            return validateProfile(
-                this.profile,
-                sharedCredentialProperties.AWS_ACCESS_KEY_ID,
-                sharedCredentialProperties.AWS_SECRET_ACCESS_KEY
-            )
-        } else if (isSsoProfile(this.profile)) {
-            return validateProfile(
-                this.profile,
-                sharedCredentialProperties.SSO_START_URL,
-                sharedCredentialProperties.SSO_REGION,
-                sharedCredentialProperties.SSO_ROLE_NAME,
-                sharedCredentialProperties.SSO_ACCOUNT_ID
-            )
-        } else {
-            return 'not supported by the Toolkit'
-        }
-    }
-
-    /**
-     * Patches 'source_profile' credentials as static representations, which the SDK can handle in all cases.
-     *
-     * XXX: Returns undefined if no `source_profile` property exists. Else we would prevent the SDK from re-reading
-     * the shared credential files if they were to change. #1953
-     *
-     * The SDK is unable to resolve `source_profile` fields when the source profile uses SSO/MFA/credential_process.
-     * We can handle this resolution ourselves, giving the SDK the resolved credentials by 'pre-loading' them.
-     */
-    private async patchSourceCredentials(): Promise<ParsedIniData | undefined> {
-        if (!hasProps(this.profile, sharedCredentialProperties.SOURCE_PROFILE)) {
-            return undefined
-        }
-
-        const loadedCreds: ParsedIniData = {}
-
-        const source = new SharedCredentialsProvider(
-            this.profile[sharedCredentialProperties.SOURCE_PROFILE]!,
-            this.allSharedCredentialProfiles
-        )
-        const creds = await source.getCredentials()
-        loadedCreds[this.profile[sharedCredentialProperties.SOURCE_PROFILE]!] = {
-            [sharedCredentialProperties.AWS_ACCESS_KEY_ID]: creds.accessKeyId,
-            [sharedCredentialProperties.AWS_SECRET_ACCESS_KEY]: creds.secretAccessKey,
-            [sharedCredentialProperties.AWS_SESSION_TOKEN]: creds.sessionToken,
-        }
-        loadedCreds[this.profileName] = {
-            [sharedCredentialProperties.MFA_SERIAL]: source.profile[sharedCredentialProperties.MFA_SERIAL],
-        }
-
-        loadedCreds[this.profileName] = {
-            ...loadedCreds[this.profileName],
-            ...this.profile,
-        }
-
-        return loadedCreds
-    }
-
-    public async getCredentials(): Promise<AWS.Credentials> {
-        const validationMessage = this.validate()
-        if (validationMessage) {
-            throw new Error(`Profile ${this.profileName} is not a valid Credential Profile: ${validationMessage}`)
-        }
-
-        const loadedCreds = await this.patchSourceCredentials()
-
-        const provider = chain(this.makeCredentialsProvider(loadedCreds))
-        return resolveProviderWithCancel(this.profileName, provider())
-    }
-
-    /**
-     * Returns undefined if the Profile Chain is valid, else a string indicating what is invalid
-     */
-    private validateSourceProfileChain(): string | undefined {
-        const profilesTraversed: string[] = [this.profileName]
-
-        let profile = this.profile
-
-        while (profile[sharedCredentialProperties.SOURCE_PROFILE]) {
-            const profileName = profile[sharedCredentialProperties.SOURCE_PROFILE]!
-
-            // Cycle
-            if (profilesTraversed.includes(profileName)) {
-                profilesTraversed.push(profileName)
-
-                return `Cycle detected within Shared Credentials Profiles. Reference chain: ${profilesTraversed.join(
-                    ' -> '
-                )}`
-            }
-
-            profilesTraversed.push(profileName)
-
-            // Missing reference
-            if (!this.allSharedCredentialProfiles.has(profileName)) {
-                return `Shared Credentials Profile ${profileName} not found. Reference chain: ${profilesTraversed.join(
-                    ' -> '
-                )}`
-            }
-
-            profile = this.allSharedCredentialProfiles.get(profileName)!
-        }
-    }
-
-    private validateSourcedCredentials(): string | undefined {
-        if (hasProps(this.profile, sharedCredentialProperties.SOURCE_PROFILE)) {
-            return `credential_source and source_profile cannot both be set`
-        }
-
-        const source = this.profile[sharedCredentialProperties.CREDENTIAL_SOURCE]!
-        if (!Object.values(credentialSources).includes(source)) {
-            return `Credential source ${this.profile[sharedCredentialProperties.CREDENTIAL_SOURCE]} is not supported`
-        }
-    }
-
-    private makeCredentialsProvider(loadedCreds?: ParsedIniData): AWS.CredentialProvider {
-        const logger = getLogger()
-
-        if (hasProps(this.profile, sharedCredentialProperties.CREDENTIAL_SOURCE)) {
-            logger.verbose(
-                `Profile ${this.profileName} contains ${sharedCredentialProperties.CREDENTIAL_SOURCE} - treating as Environment Credentials`
-            )
-            return this.makeSourcedCredentialsProvider()
-        }
-
-        if (hasProps(this.profile, sharedCredentialProperties.ROLE_ARN)) {
-            logger.verbose(
-                `Profile ${this.profileName} contains ${sharedCredentialProperties.ROLE_ARN} - treating as regular Shared Credentials`
-            )
-
-            return this.makeSharedIniFileCredentialsProvider(loadedCreds)
-        }
-
-        if (hasProps(this.profile, sharedCredentialProperties.CREDENTIAL_PROCESS)) {
-            logger.verbose(
-                `Profile ${this.profileName} contains ${sharedCredentialProperties.CREDENTIAL_PROCESS} - treating as Process Credentials`
-            )
-
-            return fromProcess({ profile: this.profileName })
-        }
-
-        if (hasProps(this.profile, sharedCredentialProperties.AWS_SESSION_TOKEN)) {
-            logger.verbose(
-                `Profile ${this.profileName} contains ${sharedCredentialProperties.AWS_SESSION_TOKEN} - treating as regular Shared Credentials`
-            )
-
-            return this.makeSharedIniFileCredentialsProvider(loadedCreds)
-        }
-
-        if (hasProps(this.profile, sharedCredentialProperties.AWS_ACCESS_KEY_ID)) {
-            logger.verbose(
-                `Profile ${this.profileName} contains ${sharedCredentialProperties.AWS_ACCESS_KEY_ID} - treating as regular Shared Credentials`
-            )
-
-            return this.makeSharedIniFileCredentialsProvider(loadedCreds)
-        }
-
-        if (hasProps(this.profile, sharedCredentialProperties.SSO_START_URL)) {
-            logger.verbose(
-                `Profile ${this.profileName} contains ${sharedCredentialProperties.SSO_START_URL} - treating as SSO Credentials`
-            )
-
-            const region = this.profile[sharedCredentialProperties.SSO_REGION]!
-            const startUrl = this.profile[sharedCredentialProperties.SSO_START_URL]!
-            const accountId = this.profile[sharedCredentialProperties.SSO_ACCOUNT_ID]!
-            const roleName = this.profile[sharedCredentialProperties.SSO_ROLE_NAME]!
-            const tokenProvider = new SsoAccessTokenProvider({ region, startUrl })
-            const client = SsoClient.create(region, tokenProvider)
-
-            return async () => {
-                if ((await tokenProvider.getToken()) === undefined) {
-                    await tokenProvider.createToken()
-                }
-
-                return client.getRoleCredentials({ accountId, roleName })
-            }
-        }
-
-        logger.error(`Profile ${this.profileName} did not contain any supported properties`)
-        throw new Error(`Shared Credentials profile ${this.profileName} is not supported`)
-    }
-
-    private makeSharedIniFileCredentialsProvider(loadedCreds?: ParsedIniData): AWS.CredentialProvider {
-        const assumeRole = async (credentials: AWS.Credentials, params: AssumeRoleParams) => {
-            const region = this.getDefaultRegion() ?? 'us-east-1'
-            const stsClient = new DefaultStsClient(region, credentials)
-            const response = await stsClient.assumeRole(params)
-            return {
-                accessKeyId: response.Credentials!.AccessKeyId!,
-                secretAccessKey: response.Credentials!.SecretAccessKey!,
-                sessionToken: response.Credentials?.SessionToken,
-                expiration: response.Credentials?.Expiration,
-            }
-        }
-
-        // Our credentials logic merges profiles from the credentials and config files but SDK v3 does not
-        // This can cause odd behavior where the Toolkit can switch to a profile but not authenticate with it
-        // So the workaround is to do give the SDK the merged profiles directly
-        const profiles = toRecord(this.allSharedCredentialProfiles.keys(), k => this.allSharedCredentialProfiles.get(k))
-
-        return fromIni({
-            profile: this.profileName,
-            mfaCodeProvider: async mfaSerial => await getMfaTokenFromUser(mfaSerial, this.profileName),
-            roleAssumer: assumeRole,
-            loadedConfig: Promise.resolve({
-                credentialsFile: loadedCreds ?? profiles,
-                configFile: {},
-            } as SharedConfigFiles),
-        })
-    }
-
-    private makeSourcedCredentialsProvider(): AWS.CredentialProvider {
-        if (this.isCredentialSource(credentialSources.EC2_INSTANCE_METADATA)) {
-            return fromInstanceMetadata()
-        } else if (this.isCredentialSource(credentialSources.ECS_CONTAINER)) {
-            return fromContainerMetadata()
-        } else if (this.isCredentialSource(credentialSources.ENVIRONMENT)) {
-            return fromEnv()
-        }
-        throw new Error(
-            `Credential source ${this.profile[sharedCredentialProperties.CREDENTIAL_SOURCE]} is not supported`
-        )
-    }
-
-    private isCredentialSource(source: string): boolean {
-        if (hasProps(this.profile, sharedCredentialProperties.CREDENTIAL_SOURCE)) {
-            return this.profile[sharedCredentialProperties.CREDENTIAL_SOURCE] === source
-        }
-        return false
-    }
-}
diff --git a/src/credentials/providers/sharedCredentialsProviderFactory.ts b/src/credentials/providers/sharedCredentialsProviderFactory.ts
deleted file mode 100644
index 08e821e2074..00000000000
--- a/src/credentials/providers/sharedCredentialsProviderFactory.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as fs from 'fs-extra'
-import { getLogger, Logger } from '../../shared/logger'
-import {
-    getConfigFilename,
-    getCredentialsFilename,
-    loadSharedCredentialsProfiles,
-    updateAwsSdkLoadConfigEnvVar,
-} from '../sharedCredentials'
-import { CredentialsProviderType } from './credentials'
-import { BaseCredentialsProviderFactory } from './credentialsProviderFactory'
-import { SharedCredentialsProvider } from './sharedCredentialsProvider'
-
-export class SharedCredentialsProviderFactory extends BaseCredentialsProviderFactory<SharedCredentialsProvider> {
-    private readonly logger: Logger = getLogger()
-
-    private loadedCredentialsModificationMillis?: number
-    private loadedConfigModificationMillis?: number
-
-    public async refresh(): Promise<void> {
-        if (await this.needsRefresh()) {
-            await this.loadSharedCredentialsProviders()
-        }
-    }
-
-    public override getProviderType(): CredentialsProviderType | undefined {
-        return SharedCredentialsProvider.getProviderType()
-    }
-
-    protected override resetProviders() {
-        this.loadedCredentialsModificationMillis = undefined
-        this.loadedConfigModificationMillis = undefined
-
-        super.resetProviders()
-    }
-
-    private async needsRefresh(): Promise<boolean> {
-        const credentialsLastModMillis = await this.getLastModifiedMillis(getCredentialsFilename())
-        const configLastModMillis = await this.getLastModifiedMillis(getConfigFilename())
-
-        return (
-            this.loadedCredentialsModificationMillis !== credentialsLastModMillis ||
-            this.loadedConfigModificationMillis !== configLastModMillis
-        )
-    }
-
-    private async loadSharedCredentialsProviders(): Promise<void> {
-        this.resetProviders()
-
-        this.logger.verbose('Loading all Shared Credentials Profiles')
-        const allCredentialProfiles = await loadSharedCredentialsProfiles()
-        this.loadedCredentialsModificationMillis = await this.getLastModifiedMillis(getCredentialsFilename())
-        this.loadedConfigModificationMillis = await this.getLastModifiedMillis(getConfigFilename())
-        await updateAwsSdkLoadConfigEnvVar()
-
-        const profileNames = Array.from(allCredentialProfiles.keys())
-        getLogger().verbose(`credentials: found profiles: ${profileNames}`)
-        for (const profileName of profileNames) {
-            const profile = allCredentialProfiles.get(profileName)
-            if (!profile) {
-                continue
-            }
-
-            await this.addProviderIfValid(
-                profileName,
-                new SharedCredentialsProvider(profileName, allCredentialProfiles)
-            )
-        }
-    }
-
-    private async addProviderIfValid(profileName: string, provider: SharedCredentialsProvider): Promise<void> {
-        if (!(await provider.isAvailable())) {
-            this.logger.warn(
-                `Shared Credentials Profile ${profileName} is not valid. It will not be used by the toolkit.`
-            )
-        } else {
-            this.addProvider(provider)
-        }
-    }
-
-    private async getLastModifiedMillis(filepath: string): Promise<number | undefined> {
-        try {
-            const stat = await fs.stat(filepath)
-
-            return stat.mtimeMs
-        } catch (err) {
-            return undefined
-        }
-    }
-}
diff --git a/src/credentials/sdkV2Compat.ts b/src/credentials/sdkV2Compat.ts
deleted file mode 100644
index 949276c4df8..00000000000
--- a/src/credentials/sdkV2Compat.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as AWS from 'aws-sdk'
-import { Token } from 'aws-sdk/lib/token'
-import { Connection } from './auth'
-
-const TokenClass = (AWS as any).Token as typeof Token
-export class TokenProvider extends TokenClass {
-    public constructor(private readonly connection: Connection & { type: 'sso' }) {
-        super({ token: '', expireTime: new Date(0) })
-    }
-
-    public override get(cb: (err?: AWS.AWSError | undefined) => void): void {
-        if (!this.token || this.needsRefresh()) {
-            this.refresh(cb)
-        } else {
-            cb()
-        }
-    }
-
-    public override refresh(cb: (err?: AWS.AWSError | undefined) => void): void {
-        this.connection
-            .getToken()
-            .then(({ accessToken, expiresAt }) => {
-                this.token = accessToken
-                this.expireTime = expiresAt
-                this.expired = false
-                cb()
-            })
-            .catch(cb)
-    }
-}
diff --git a/src/credentials/secondaryAuth.ts b/src/credentials/secondaryAuth.ts
deleted file mode 100644
index 022450613c0..00000000000
--- a/src/credentials/secondaryAuth.ts
+++ /dev/null
@@ -1,198 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import globals from '../shared/extensionGlobals'
-
-import * as vscode from 'vscode'
-import { getLogger } from '../shared/logger'
-import { showQuickPick } from '../shared/ui/pickerPrompter'
-import { cast, Optional } from '../shared/utilities/typeConstructors'
-import { Auth, Connection } from './auth'
-import { once } from '../shared/utilities/functionUtils'
-import { telemetry } from '../shared/telemetry/telemetry'
-import { createExitButton, createHelpButton } from '../shared/ui/buttons'
-
-async function promptUseNewConnection(newConn: Connection, oldConn: Connection, tools: string[], swapNo: boolean) {
-    // Multi-select picker would be better ?
-    const saveConnectionItem = {
-        label: `Yes, keep using ${newConn.label} with ${tools.join(', ')} while using ${
-            oldConn.label
-        } with other services.`,
-        detail: `To remove later, select "Remove Connection from Tool" from the tool's context (right-click) menu.`,
-        data: 'yes',
-    } as const
-
-    const useConnectionItem = {
-        label: `No, switch everything to authenticate with ${(swapNo ? newConn : oldConn).label}.`,
-        detail: 'This will not log you out; you can reconnect at any time by switching connections.',
-        data: 'no',
-    } as const
-
-    const helpButton = createHelpButton()
-    const openLink = helpButton.onClick.bind(helpButton)
-    helpButton.onClick = () => {
-        telemetry.ui_click.emit({ elementId: 'connection_multiple_auths_help' })
-        openLink()
-    }
-
-    const resp = await showQuickPick([saveConnectionItem, useConnectionItem], {
-        title: `Some tools you've been using don't work with ${newConn.label}. Keep using ${newConn.label} in the background while using ${oldConn.label}?`,
-        placeholder: 'Confirm choice',
-        buttons: [helpButton, createExitButton()],
-    })
-
-    switch (resp) {
-        case 'yes':
-            telemetry.ui_click.emit({ elementId: 'connection_multiple_auths_yes' })
-            break
-        case 'no':
-            telemetry.ui_click.emit({ elementId: 'connection_multiple_auths_no' })
-            break
-        default:
-            telemetry.ui_click.emit({ elementId: 'connection_multiple_auths_exit' })
-    }
-
-    return resp
-}
-
-let oldConn: Auth['activeConnection']
-const auths = new Map<string, SecondaryAuth>()
-const registerAuthListener = once(() => {
-    Auth.instance.onDidChangeActiveConnection(async conn => {
-        const potentialConn = oldConn
-        if (conn !== undefined && potentialConn?.state === 'valid') {
-            const saveableAuths = Array.from(auths.values()).filter(
-                a => !a.isUsingSavedConnection && a.isUsable(potentialConn) && !a.isUsable(conn)
-            )
-            const toolNames = saveableAuths.map(a => a.toolLabel)
-            if (
-                saveableAuths.length > 0 &&
-                (await promptUseNewConnection(potentialConn, conn, toolNames, false)) === 'yes'
-            ) {
-                await Promise.all(saveableAuths.map(a => a.saveConnection(potentialConn)))
-            }
-        }
-
-        oldConn = conn
-    })
-})
-
-export function getSecondaryAuth<T extends Connection>(
-    toolId: string,
-    toolLabel: string,
-    isValid: (conn: Connection) => conn is T
-): SecondaryAuth<T> {
-    const auth = new SecondaryAuth(toolId, toolLabel, isValid)
-    auths.set(toolId, auth)
-    registerAuthListener()
-
-    return auth
-}
-
-/**
- * Enables a tool to bind to a connection independently from the global {@link Auth} service.
- *
- * Not all connections are usable by every tool, so callers of this class must provide a function
- * that can identify usable connections. Toolkit users are notified whenever a loss of functionality
- * would occur after switching connections. Users can then choose to save the usable connection to
- * the tool, allowing the global connection to move freely.
- */
-export class SecondaryAuth<T extends Connection = Connection> {
-    #activeConnection: Connection | undefined
-    #savedConnection: T | undefined
-
-    private readonly key = `${this.toolId}.savedConnectionId`
-    private readonly onDidChangeActiveConnectionEmitter = new vscode.EventEmitter<T | undefined>()
-    public readonly onDidChangeActiveConnection = this.onDidChangeActiveConnectionEmitter.event
-
-    public constructor(
-        public readonly toolId: string,
-        public readonly toolLabel: string,
-        public readonly isUsable: (conn: Connection) => conn is T,
-        private readonly auth = Auth.instance,
-        private readonly memento = globals.context.globalState
-    ) {
-        this.auth.onDidChangeActiveConnection(async conn => {
-            if (
-                conn === undefined &&
-                this.#savedConnection &&
-                this.#savedConnection.id === this.#activeConnection?.id
-            ) {
-                await this.removeConnection()
-            } else {
-                this.#activeConnection = conn
-                this.onDidChangeActiveConnectionEmitter.fire(this.activeConnection)
-            }
-        })
-    }
-
-    public get activeConnection(): T | undefined {
-        return (
-            this.#savedConnection ??
-            (this.#activeConnection && this.isUsable(this.#activeConnection) ? this.#activeConnection : undefined)
-        )
-    }
-
-    public get isUsingSavedConnection() {
-        return this.#savedConnection !== undefined
-    }
-
-    public get isConnectionExpired() {
-        return !!this.activeConnection && this.auth.getConnectionState(this.activeConnection) === 'invalid'
-    }
-
-    public async saveConnection(conn: T) {
-        await this.memento.update(this.key, conn.id)
-        this.#savedConnection = conn
-        this.onDidChangeActiveConnectionEmitter.fire(this.activeConnection)
-    }
-
-    public async removeConnection() {
-        await this.memento.update(this.key, undefined)
-        this.#savedConnection = undefined
-        this.onDidChangeActiveConnectionEmitter.fire(this.activeConnection)
-    }
-
-    public async useNewConnection(conn: T) {
-        if (this.auth.activeConnection !== undefined && !this.isUsable(this.auth.activeConnection)) {
-            if ((await promptUseNewConnection(conn, this.auth.activeConnection, [this.toolLabel], true)) === 'yes') {
-                await this.saveConnection(conn)
-            } else {
-                await this.auth.useConnection(conn)
-            }
-        } else {
-            await this.auth.useConnection(conn)
-        }
-    }
-
-    // Used to lazily restore persisted connections.
-    // Kind of clunky. We need an async module loader layer to make things ergonomic.
-    public readonly restoreConnection: () => Promise<T | undefined> = once(async () => {
-        try {
-            await this.auth.tryAutoConnect()
-            this.#savedConnection = await this.loadSavedConnection()
-            this.onDidChangeActiveConnectionEmitter.fire(this.activeConnection)
-
-            return this.#savedConnection
-        } catch (err) {
-            getLogger().warn(`auth (${this.toolId}): failed to restore connection: %s`, err)
-        }
-    })
-
-    private async loadSavedConnection() {
-        const id = cast(this.memento.get(this.key), Optional(String))
-        const conn = id !== undefined ? await this.auth.getConnection({ id }) : undefined
-
-        if (conn === undefined) {
-            getLogger().warn(`auth (${this.toolId}): removing saved connection "${this.key}" as it no longer exists`)
-            await this.memento.update(this.key, undefined)
-        } else if (!this.isUsable(conn)) {
-            getLogger().warn(`auth (${this.toolId}): saved connection "${this.key}" is not valid`)
-            await this.memento.update(this.key, undefined)
-        } else {
-            return conn
-        }
-    }
-}
diff --git a/src/credentials/sharedCredentials.ts b/src/credentials/sharedCredentials.ts
deleted file mode 100644
index 5c72029400d..00000000000
--- a/src/credentials/sharedCredentials.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { join } from 'path'
-import { loadSharedConfigFiles, Profile, SharedConfigFiles } from '../shared/credentials/credentialsFile'
-import { EnvironmentVariables } from '../shared/environmentVariables'
-import { SystemUtilities } from '../shared/systemUtilities'
-import { union } from '../shared/utilities/collectionUtils'
-
-export function getCredentialsFilename(): string {
-    const env = process.env as EnvironmentVariables
-
-    return env.AWS_SHARED_CREDENTIALS_FILE || join(SystemUtilities.getHomeDirectory(), '.aws', 'credentials')
-}
-
-export function getConfigFilename(): string {
-    const env = process.env as EnvironmentVariables
-
-    return env.AWS_CONFIG_FILE || join(SystemUtilities.getHomeDirectory(), '.aws', 'config')
-}
-
-export async function loadSharedCredentialsProfiles(): Promise<Map<string, Profile>> {
-    const profiles = new Map<string, Profile>()
-    // These should eventually be changed to use `parse` to allow for credentials from other file systems
-    const profileData = await loadSharedConfigFiles({
-        config: vscode.Uri.file(getConfigFilename()),
-        credentials: vscode.Uri.file(getCredentialsFilename()),
-    })
-
-    const profileNames = getAllProfileNames(profileData)
-
-    for (const profileName of profileNames) {
-        const profile = mergeProfileProperties(
-            profileData.credentialsFile[profileName],
-            profileData.configFile[profileName]
-        )
-
-        profiles.set(profileName, profile)
-    }
-
-    return profiles
-}
-
-function getAllProfileNames(sharedCredentialsData: SharedConfigFiles): string[] {
-    const profileNames = union(
-        Object.keys(sharedCredentialsData.configFile),
-        Object.keys(sharedCredentialsData.credentialsFile)
-    )
-
-    return [...profileNames]
-}
-
-function mergeProfileProperties(credentialsProfile?: Profile, configProfile?: Profile): Profile {
-    let profile: Profile = {}
-
-    // Start with the config profile (if exists), then apply any credentials profile properties on top
-    if (configProfile) {
-        profile = configProfile
-    }
-
-    if (credentialsProfile) {
-        for (const index of Object.keys(credentialsProfile)) {
-            profile[index] = credentialsProfile[index]
-        }
-    }
-
-    return profile
-}
-
-export async function updateAwsSdkLoadConfigEnvVar(): Promise<void> {
-    const configFileExists = await SystemUtilities.fileExists(getConfigFilename())
-    process.env.AWS_SDK_LOAD_CONFIG = configFileExists ? 'true' : ''
-}
diff --git a/src/credentials/sso/cache.ts b/src/credentials/sso/cache.ts
deleted file mode 100644
index f8e68d4d0ce..00000000000
--- a/src/credentials/sso/cache.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as crypto from 'crypto'
-import { homedir } from 'os'
-import { join } from 'path'
-import { getLogger } from '../../shared/logger/logger'
-import { createDiskCache, KeyedCache, mapCache } from '../../shared/utilities/cacheUtils'
-import { stripUndefined } from '../../shared/utilities/collectionUtils'
-import { hasProps, selectFrom } from '../../shared/utilities/tsUtils'
-import { SsoToken, ClientRegistration } from './model'
-
-interface RegistrationKey {
-    readonly region: string
-    readonly scopes?: string[]
-}
-
-export interface SsoAccess {
-    readonly token: SsoToken
-    readonly region: string
-    readonly startUrl: string
-    readonly registration?: ClientRegistration
-}
-
-export interface SsoCache {
-    readonly token: KeyedCache<SsoAccess>
-    readonly registration: KeyedCache<ClientRegistration, RegistrationKey>
-}
-
-const cacheDir = join(homedir(), '.aws', 'sso', 'cache')
-
-export function getCache(directory = cacheDir): SsoCache {
-    return {
-        token: getTokenCache(directory),
-        registration: getRegistrationCache(directory),
-    }
-}
-
-export function getRegistrationCache(directory = cacheDir): KeyedCache<ClientRegistration, RegistrationKey> {
-    const hashScopes = (scopes: string[]) => {
-        const shasum = crypto.createHash('sha256')
-        scopes.forEach(s => shasum.update(s))
-        return shasum.digest('hex')
-    }
-
-    const getTarget = (key: RegistrationKey) => {
-        const suffix = `${key.region}${key.scopes && key.scopes.length > 0 ? `-${hashScopes(key.scopes)}` : ''}`
-        return join(directory, `aws-toolkit-vscode-client-id-${suffix}.json`)
-    }
-
-    // Compatability for older Toolkit versions (format on disk is unchanged)
-    type StoredRegistration = Omit<ClientRegistration, 'expiresAt'> & { readonly expiresAt: string }
-    const read = (data: StoredRegistration) => ({ ...data, expiresAt: new Date(data.expiresAt) })
-    const write = (data: ClientRegistration) => ({ ...data, expiresAt: data.expiresAt.toISOString() })
-
-    const logger = (message: string) => getLogger().debug(`SSO registration cache: ${message}`)
-    const cache: KeyedCache<StoredRegistration, RegistrationKey> = createDiskCache(getTarget, logger)
-
-    return mapCache(cache, read, write)
-}
-
-export function getTokenCache(directory = cacheDir): KeyedCache<SsoAccess> {
-    // Older specs do not store the registration
-    type MaybeRegistration = Partial<Omit<ClientRegistration, 'expiresAt'> & { readonly registrationExpiresAt: string }>
-
-    // This is the format used by the SDKs (currently)
-    type StoredToken = Omit<SsoToken, 'expiresAt'> &
-        MaybeRegistration & {
-            readonly startUrl: string
-            readonly region: string
-            readonly expiresAt: string
-        }
-
-    function read(data: StoredToken): SsoAccess {
-        const registration = hasProps(data, 'clientId', 'clientSecret', 'registrationExpiresAt')
-            ? {
-                  ...selectFrom(data, 'clientId', 'clientSecret', 'scopes'),
-                  expiresAt: new Date(data.registrationExpiresAt),
-              }
-            : undefined
-
-        const token = {
-            ...selectFrom(data, 'accessToken', 'refreshToken', 'tokenType'),
-            expiresAt: new Date(data.expiresAt),
-        }
-
-        stripUndefined(token)
-
-        return {
-            token,
-            registration,
-            ...selectFrom(data, 'region', 'startUrl'),
-        }
-    }
-
-    function write(data: SsoAccess): StoredToken {
-        const registration =
-            data.registration !== undefined
-                ? selectFrom(data.registration, 'clientId', 'clientSecret', 'scopes')
-                : undefined
-
-        return {
-            ...registration,
-            ...selectFrom(data, 'region', 'startUrl'),
-            ...selectFrom(data.token, 'accessToken', 'refreshToken'),
-            expiresAt: data.token.expiresAt.toISOString(),
-            registrationExpiresAt: data.registration?.expiresAt.toISOString(),
-        }
-    }
-
-    const getTarget = (ssoUrl: string) => {
-        const encoded = encodeURI(ssoUrl)
-        // Per the spec: 'SSO Login Token Flow' the access token must be
-        // cached as the SHA1 hash of the bytes of the UTF-8 encoded
-        // startUrl value with ".json" appended to the end.
-
-        const shasum = crypto.createHash('sha1')
-        // Suppress warning because:
-        //   1. SHA1 is prescribed by the AWS SSO spec
-        //   2. the hashed startUrl value is not a secret
-        shasum.update(encoded) // lgtm[js/weak-cryptographic-algorithm]
-        const hashedUrl = shasum.digest('hex') // lgtm[js/weak-cryptographic-algorithm]
-
-        return join(directory, `${hashedUrl}.json`)
-    }
-
-    const logger = (message: string) => getLogger().debug(`SSO token cache: ${message}`)
-    const cache = createDiskCache<StoredToken, string>(getTarget, logger)
-
-    return mapCache(cache, read, write)
-}
diff --git a/src/credentials/sso/clients.ts b/src/credentials/sso/clients.ts
deleted file mode 100644
index 7d9d34d752c..00000000000
--- a/src/credentials/sso/clients.ts
+++ /dev/null
@@ -1,208 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import globals from '../../shared/extensionGlobals'
-
-import {
-    AccountInfo,
-    GetRoleCredentialsRequest,
-    ListAccountRolesRequest,
-    ListAccountsRequest,
-    LogoutRequest,
-    RoleInfo,
-    SSO,
-    SSOServiceException,
-} from '@aws-sdk/client-sso'
-import {
-    AuthorizationPendingException,
-    CreateTokenRequest,
-    RegisterClientRequest,
-    SlowDownException,
-    SSOOIDC,
-    StartDeviceAuthorizationRequest,
-} from '@aws-sdk/client-sso-oidc'
-import { AsyncCollection } from '../../shared/utilities/asyncCollection'
-import { pageableToCollection } from '../../shared/utilities/collectionUtils'
-import {
-    assertHasProps,
-    hasStringProps,
-    isNonNullable,
-    RequiredProps,
-    selectFrom,
-} from '../../shared/utilities/tsUtils'
-import { getLogger } from '../../shared/logger'
-import { SsoAccessTokenProvider } from './ssoAccessTokenProvider'
-import { sleep } from '../../shared/utilities/timeoutUtils'
-import { isClientFault } from '../../shared/errors'
-import { DevSettings } from '../../shared/settings'
-
-const backoffDelayMs = 5000
-export class OidcClient {
-    public constructor(private readonly client: SSOOIDC, private readonly clock: { Date: typeof Date }) {}
-
-    public async registerClient(request: RegisterClientRequest) {
-        const response = await this.client.registerClient(request)
-        assertHasProps(response, 'clientId', 'clientSecret', 'clientSecretExpiresAt')
-
-        return {
-            scopes: request.scopes,
-            clientId: response.clientId,
-            clientSecret: response.clientSecret,
-            expiresAt: new this.clock.Date(response.clientSecretExpiresAt * 1000),
-        }
-    }
-
-    public async startDeviceAuthorization(request: StartDeviceAuthorizationRequest) {
-        const response = await this.client.startDeviceAuthorization(request)
-        assertHasProps(response, 'expiresIn', 'deviceCode', 'verificationUriComplete')
-
-        return {
-            ...selectFrom(response, 'deviceCode', 'verificationUriComplete'),
-            expiresAt: new this.clock.Date(response.expiresIn * 1000 + this.clock.Date.now()),
-            interval: response.interval ? response.interval * 1000 : undefined,
-        }
-    }
-
-    public async createToken(request: CreateTokenRequest) {
-        const response = await this.client.createToken(request as CreateTokenRequest)
-        assertHasProps(response, 'accessToken', 'expiresIn')
-
-        return {
-            ...selectFrom(response, 'accessToken', 'refreshToken', 'tokenType'),
-            expiresAt: new this.clock.Date(response.expiresIn * 1000 + this.clock.Date.now()),
-        }
-    }
-
-    public async pollForToken(request: CreateTokenRequest, timeout: number, interval = backoffDelayMs) {
-        while (this.clock.Date.now() + interval <= timeout) {
-            try {
-                return await this.createToken(request)
-            } catch (err) {
-                if (!hasStringProps(err, 'name')) {
-                    throw err
-                }
-
-                if (err instanceof SlowDownException) {
-                    interval += backoffDelayMs
-                } else if (!(err instanceof AuthorizationPendingException)) {
-                    throw err
-                }
-            }
-
-            await sleep(interval)
-        }
-
-        throw new Error('Timed-out waiting for authentication token')
-    }
-
-    public static create(region: string) {
-        return new this(
-            new SSOOIDC({
-                region,
-                endpoint: DevSettings.instance.get('endpoints', {})['ssooidc'],
-            }),
-            globals.clock
-        )
-    }
-}
-
-type OmittedProps = 'accessToken' | 'nextToken'
-type ExtractOverload<T, U> = T extends {
-    (...args: infer P1): infer R1
-    (...args: infer P2): infer R2
-    (...args: infer P3): infer R3
-}
-    ? (this: U, ...args: P1) => R1
-    : never
-
-// Removes all methods that use callbacks instead of promises
-type PromisifyClient<T> = {
-    [P in keyof T]: T[P] extends (...args: any[]) => any ? ExtractOverload<T[P], PromisifyClient<T>> : T[P]
-}
-
-export class SsoClient {
-    public constructor(
-        private readonly client: PromisifyClient<SSO>,
-        private readonly provider: SsoAccessTokenProvider
-    ) {}
-
-    public listAccounts(
-        request: Omit<ListAccountsRequest, OmittedProps> = {}
-    ): AsyncCollection<RequiredProps<AccountInfo, 'accountId'>[]> {
-        const requester = (request: Omit<ListAccountsRequest, 'accessToken'>) =>
-            this.call(this.client.listAccounts, request)
-        const collection = pageableToCollection(requester, request, 'nextToken', 'accountList')
-
-        return collection.filter(isNonNullable).map(accounts => accounts.map(a => (assertHasProps(a, 'accountId'), a)))
-    }
-
-    public listAccountRoles(
-        request: Omit<ListAccountRolesRequest, OmittedProps>
-    ): AsyncCollection<Required<RoleInfo>[]> {
-        const requester = (request: Omit<ListAccountRolesRequest, 'accessToken'>) =>
-            this.call(this.client.listAccountRoles, request)
-        const collection = pageableToCollection(requester, request, 'nextToken', 'roleList')
-
-        return collection
-            .filter(isNonNullable)
-            .map(roles => roles.map(r => (assertHasProps(r, 'roleName', 'accountId'), r)))
-    }
-
-    public async getRoleCredentials(request: Omit<GetRoleCredentialsRequest, OmittedProps>) {
-        const response = await this.call(this.client.getRoleCredentials, request)
-
-        assertHasProps(response, 'roleCredentials')
-        assertHasProps(response.roleCredentials, 'accessKeyId', 'secretAccessKey')
-
-        const expiration = response.roleCredentials.expiration
-
-        return {
-            ...response.roleCredentials,
-            expiration: expiration ? new globals.clock.Date(expiration) : undefined,
-        }
-    }
-
-    public async logout(request: Omit<LogoutRequest, OmittedProps> = {}) {
-        await this.call(this.client.logout, request)
-    }
-
-    private call<T extends { accessToken: string | undefined }, U>(
-        method: (this: typeof this.client, request: T) => Promise<U>,
-        request: Omit<T, 'accessToken'>
-    ): Promise<U> {
-        const requester = async (req: T) => {
-            const token = await this.provider.getToken()
-            assertHasProps(token, 'accessToken')
-
-            try {
-                return await method.call(this.client, { ...req, accessToken: token.accessToken })
-            } catch (error) {
-                await this.handleError(error)
-                throw error
-            }
-        }
-
-        return requester(request as T)
-    }
-
-    private async handleError(error: unknown): Promise<never> {
-        if (error instanceof SSOServiceException && isClientFault(error)) {
-            getLogger().warn(`credentials (sso): invalidating stored token: ${error.message}`)
-            await this.provider.invalidate()
-        }
-
-        throw error
-    }
-
-    public static create(region: string, provider: SsoAccessTokenProvider) {
-        return new this(
-            new SSO({
-                region,
-                endpoint: DevSettings.instance.get('endpoints', {})['sso'],
-            }),
-            provider
-        )
-    }
-}
diff --git a/src/credentials/sso/model.ts b/src/credentials/sso/model.ts
deleted file mode 100644
index 266e1000b58..00000000000
--- a/src/credentials/sso/model.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import globals from '../../shared/extensionGlobals'
-
-import * as vscode from 'vscode'
-
-export interface SsoToken {
-    /**
-     * An optional identity associated with this token.
-     */
-    readonly identity?: string
-
-    /**
-     * A base64 encoded string returned by the SSO-OIDC service. This token must be treated as an
-     * opaque UTF-8 string and must not be decoded.
-     */
-    readonly accessToken: string
-
-    /**
-     * The expiration time of the accessToken.
-     */
-    readonly expiresAt: Date
-
-    /**
-     * Should always be `Bearer` if present.
-     */
-    readonly tokenType?: string
-
-    /**
-     * Opaque token that may be used to 'refresh' the authentication session after expiration.
-     */
-    readonly refreshToken?: string
-}
-
-export interface ClientRegistration {
-    /**
-     * Unique registration id.
-     */
-    readonly clientId: string
-
-    /**
-     * Secret key associated with the registration.
-     */
-    readonly clientSecret: string
-
-    /**
-     * The expiration time of the registration.
-     */
-    readonly expiresAt: Date
-
-    /**
-     * Scope of the client registration. Applies to all tokens created using this registration.
-     */
-    readonly scopes?: string[]
-}
-
-export interface SsoProfile {
-    readonly region: string
-    readonly startUrl: string
-    readonly accountId?: string
-    readonly roleName?: string
-    readonly scopes?: string[]
-    readonly identifier?: string
-}
-
-export async function openSsoPortalLink(authorization: { readonly verificationUriComplete: string }): Promise<boolean> {
-    return vscode.env.openExternal(vscode.Uri.parse(authorization.verificationUriComplete))
-}
-
-// Most SSO 'expirables' are fairly long lived, so a one minute buffer is plenty.
-const expirationBufferMs = 60000
-export function isExpired(expirable: { expiresAt: Date }): boolean {
-    return globals.clock.Date.now() + expirationBufferMs >= expirable.expiresAt.getTime()
-}
diff --git a/src/credentials/sso/ssoAccessTokenProvider.ts b/src/credentials/sso/ssoAccessTokenProvider.ts
deleted file mode 100644
index 8ae50b7495b..00000000000
--- a/src/credentials/sso/ssoAccessTokenProvider.ts
+++ /dev/null
@@ -1,179 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import globals from '../../shared/extensionGlobals'
-
-import { SSOOIDCServiceException } from '@aws-sdk/client-sso-oidc'
-import { openSsoPortalLink, SsoToken, ClientRegistration, isExpired, SsoProfile } from './model'
-import { getCache } from './cache'
-import { hasProps, RequiredProps, selectFrom } from '../../shared/utilities/tsUtils'
-import { CancellationError } from '../../shared/utilities/timeoutUtils'
-import { OidcClient } from './clients'
-import { loadOr } from '../../shared/utilities/cacheUtils'
-import { isClientFault } from '../../shared/errors'
-
-const clientRegistrationType = 'public'
-const deviceGrantType = 'urn:ietf:params:oauth:grant-type:device_code'
-const refreshGrantType = 'refresh_token'
-
-/**
- *  SSO flow (RFC: https://tools.ietf.org/html/rfc8628)
- *    1. Get a client id (SSO-OIDC identifier, formatted per RFC6749).
- *       - Toolkit code: {@link SsoAccessTokenProvider.registerClient}
- *          - Calls {@link OidcClient.registerClient}
- *       - RETURNS:
- *         - ClientSecret
- *         - ClientId
- *         - ClientSecretExpiresAt
- *       - Client registration is valid for potentially months and creates state
- *         server-side, so the client SHOULD cache them to disk.
- *    2. Start device authorization.
- *       - Toolkit code: {@link SsoAccessTokenProvider.authorize}
- *          - Calls {@link OidcClient.startDeviceAuthorization}
- *       - RETURNS (RFC: https://tools.ietf.org/html/rfc8628#section-3.2):
- *         - DeviceCode             : Device verification code
- *         - UserCode               : User verification code
- *         - VerificationUri        : User verification URI on the authorization server
- *         - VerificationUriComplete: User verification URI including the `user_code`
- *         - ExpiresIn              : Lifetime (seconds) of `device_code` and `user_code`
- *         - Interval               : Minimum time (seconds) the client SHOULD wait between polling intervals.
- *    3. Poll for the access token.
- *       - Toolkit code: {@link SsoAccessTokenProvider.authorize}
- *          - Calls {@link OidcClient.pollForToken}
- *       - RETURNS:
- *         - AccessToken
- *         - ExpiresIn
- *         - RefreshToken (optional)
- *    4. (Repeat) Tokens SHOULD be refreshed if expired and a refresh token is available.
- *        - Toolkit code: {@link SsoAccessTokenProvider.refreshToken}
- *          - Calls {@link OidcClient.createToken}
- *        - RETURNS:
- *         - AccessToken
- *         - ExpiresIn
- *         - RefreshToken (optional)
- */
-export class SsoAccessTokenProvider {
-    public constructor(
-        private readonly profile: Pick<SsoProfile, 'startUrl' | 'region' | 'scopes' | 'identifier'>,
-        private readonly cache = getCache(),
-        private readonly oidc = OidcClient.create(profile.region)
-    ) {}
-
-    public async invalidate(): Promise<void> {
-        await Promise.all([
-            this.cache.token.clear(this.tokenCacheKey),
-            this.cache.registration.clear(this.registrationCacheKey),
-        ])
-    }
-
-    public async getToken(): Promise<SsoToken | undefined> {
-        const data = await this.cache.token.load(this.tokenCacheKey)
-
-        if (!data || !isExpired(data.token)) {
-            return data?.token
-        }
-
-        if (data.registration && !isExpired(data.registration) && hasProps(data.token, 'refreshToken')) {
-            const refreshed = await this.refreshToken(data.token, data.registration)
-
-            if (refreshed) {
-                await this.cache.token.save(this.tokenCacheKey, refreshed)
-            }
-
-            return refreshed?.token
-        } else {
-            await this.invalidate()
-        }
-    }
-
-    public async createToken(identityProvider?: (token: SsoToken) => Promise<string>): Promise<SsoToken> {
-        const access = await this.runFlow()
-        const identity = (await identityProvider?.(access.token)) ?? this.tokenCacheKey
-        await this.cache.token.save(identity, access)
-
-        return { ...access.token, identity }
-    }
-
-    private async runFlow() {
-        const cacheKey = this.registrationCacheKey
-        const registration = await loadOr(this.cache.registration, cacheKey, () => this.registerClient())
-
-        try {
-            return await this.authorize(registration)
-        } catch (err) {
-            if (err instanceof SSOOIDCServiceException && isClientFault(err)) {
-                await this.cache.registration.clear(cacheKey)
-            }
-
-            throw err
-        }
-    }
-
-    private async refreshToken(token: RequiredProps<SsoToken, 'refreshToken'>, registration: ClientRegistration) {
-        try {
-            const clientInfo = selectFrom(registration, 'clientId', 'clientSecret')
-            const response = await this.oidc.createToken({ ...clientInfo, ...token, grantType: refreshGrantType })
-
-            return this.formatToken(response, registration)
-        } catch (err) {
-            if (err instanceof SSOOIDCServiceException && isClientFault(err)) {
-                await this.cache.token.clear(this.tokenCacheKey)
-            }
-
-            throw err
-        }
-    }
-
-    private formatToken(token: SsoToken, registration: ClientRegistration) {
-        return { token, registration, region: this.profile.region, startUrl: this.profile.startUrl }
-    }
-
-    protected get tokenCacheKey() {
-        return this.profile.identifier ?? this.profile.startUrl
-    }
-
-    private get registrationCacheKey() {
-        return { region: this.profile.region, scopes: this.profile.scopes }
-    }
-
-    private async authorize(registration: ClientRegistration) {
-        const authorization = await this.oidc.startDeviceAuthorization({
-            startUrl: this.profile.startUrl,
-            clientId: registration.clientId,
-            clientSecret: registration.clientSecret,
-        })
-
-        if (!(await openSsoPortalLink(authorization))) {
-            throw new CancellationError('user')
-        }
-
-        const tokenRequest = {
-            clientId: registration.clientId,
-            clientSecret: registration.clientSecret,
-            deviceCode: authorization.deviceCode,
-            grantType: deviceGrantType,
-        }
-
-        const token = await this.oidc.pollForToken(
-            tokenRequest,
-            registration.expiresAt.getTime(),
-            authorization.interval
-        )
-
-        return this.formatToken(token, registration)
-    }
-
-    private async registerClient(): Promise<ClientRegistration> {
-        return this.oidc.registerClient({
-            clientName: `aws-toolkit-vscode-${globals.clock.Date.now()}`,
-            clientType: clientRegistrationType,
-            scopes: this.profile.scopes,
-        })
-    }
-
-    public static create(profile: Pick<SsoProfile, 'startUrl' | 'region' | 'scopes' | 'identifier'>) {
-        return new this(profile)
-    }
-}
diff --git a/src/credentials/wizards/templates.ts b/src/credentials/wizards/templates.ts
deleted file mode 100644
index 4cf18252657..00000000000
--- a/src/credentials/wizards/templates.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import { createInputBox } from '../../shared/ui/inputPrompter'
-import { getIdeProperties } from '../../shared/extensionUtilities'
-import { ProfileTemplateProvider } from './createProfile'
-import { createCommonButtons } from '../../shared/ui/buttons'
-import { credentialHelpUrl } from '../../shared/constants'
-
-// TODO: use this everywhere else
-export enum ProfileKey {
-    AccessKeyId = 'aws_access_key_id',
-    SecretKey = 'aws_secret_access_key',
-    Process = 'credential_process',
-}
-
-function getTitle(profileName: string): string {
-    return localize('AWS.title.createCredentialProfile', 'Creating new profile "{0}"', profileName)
-}
-
-interface StaticProfile {
-    [ProfileKey.AccessKeyId]: string
-    [ProfileKey.SecretKey]: string
-}
-
-const accessKeyPattern = /[\w]{16,128}/
-
-export const staticCredentialsTemplate: ProfileTemplateProvider<StaticProfile> = {
-    label: 'Static Credentials',
-    description: 'Use this for credentials that never expire',
-    prompts: {
-        [ProfileKey.AccessKeyId]: name =>
-            createInputBox({
-                title: getTitle(name),
-                buttons: createCommonButtons(credentialHelpUrl),
-                // Example comes from https://docs.aws.amazon.com/STS/latest/APIReference/API_GetAccessKeyInfo.html
-                placeholder: 'AKIAIOSFODNN7EXAMPLE',
-                prompt: localize(
-                    'AWS.placeHolder.inputAccessKey',
-                    'Input the {0} Access Key',
-                    getIdeProperties().company
-                ),
-                validateInput: accessKey => {
-                    if (accessKey === '') {
-                        return localize('AWS.credentials.error.emptyAccessKey', 'Access key must not be empty')
-                    }
-                    if (!accessKeyPattern.test(accessKey)) {
-                        return localize(
-                            'AWS.credentials.error.emptyAccessKey',
-                            'Access key must be alphanumeric and between 16 and 128 characters'
-                        )
-                    }
-                },
-            }),
-        [ProfileKey.SecretKey]: name =>
-            createInputBox({
-                title: getTitle(name),
-                buttons: createCommonButtons(credentialHelpUrl),
-                // Example comes from https://docs.aws.amazon.com/STS/latest/APIReference/API_GetAccessKeyInfo.html
-                placeholder: 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY',
-                prompt: localize(
-                    'AWS.placeHolder.inputSecretKey',
-                    'Input the {0} Secret Key',
-                    getIdeProperties().company
-                ),
-                validateInput: secretKey => {
-                    if (secretKey === '') {
-                        return localize('AWS.credentials.error.emptySecretKey', 'Secret key must not be empty')
-                    }
-                },
-                password: true,
-            }),
-    },
-}
-
-interface CredentialsProcessProfile {
-    [ProfileKey.Process]: string
-}
-
-export const processCredentialsTemplate: ProfileTemplateProvider<CredentialsProcessProfile> = {
-    label: 'External Process',
-    description: 'Creates a new profile that fetches credentials from a process',
-    prompts: {
-        [ProfileKey.Process]: name =>
-            createInputBox({
-                title: getTitle(name),
-                prompt: 'Enter a command to run',
-                buttons: createCommonButtons(credentialHelpUrl),
-            }),
-    },
-}
diff --git a/src/dev/activation.ts b/src/dev/activation.ts
deleted file mode 100644
index 3a1935505a9..00000000000
--- a/src/dev/activation.ts
+++ /dev/null
@@ -1,278 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as config from './config'
-import { ExtContext } from '../shared/extensions'
-import { createCommonButtons } from '../shared/ui/buttons'
-import { createQuickPick } from '../shared/ui/pickerPrompter'
-import { DevSettings } from '../shared/settings'
-import { FileProvider, VirualFileSystem } from '../shared/virtualFilesystem'
-import { Commands } from '../shared/vscode/commands2'
-import { createInputBox } from '../shared/ui/inputPrompter'
-import { Wizard } from '../shared/wizards/wizard'
-import { deleteDevEnvCommand, installVsixCommand, openTerminalCommand } from './codecatalyst'
-import { watchBetaVSIX } from './beta'
-import { isCloud9 } from '../shared/extensionUtilities'
-import { entries } from '../shared/utilities/tsUtils'
-import { isReleaseVersion } from '../shared/vscode/env'
-
-interface MenuOption {
-    readonly label: string
-    readonly description?: string
-    readonly detail?: string
-    readonly executor: (ctx: ExtContext) => Promise<unknown> | unknown
-}
-
-/**
- * Defines AWS Toolkit developer tools.
- *
- * Options are displayed as quick-pick items. The {@link MenuOption.executor} callback is ran
- * on selection. There is no support for name-spacing. Just add the relevant
- * feature/module as a description so it can be moved around easier.
- */
-const menuOptions: Record<string, MenuOption> = {
-    installVsix: {
-        label: 'Install VSIX on Remote Environment',
-        description: 'CodeCatalyst',
-        detail: 'Automatically upload/install a VSIX to a remote host',
-        executor: installVsixCommand,
-    },
-    openTerminal: {
-        label: 'Open Remote Terminal',
-        description: 'CodeCatalyst',
-        detail: 'Open a new terminal connected to the remote environment',
-        executor: openTerminalCommand,
-    },
-    deleteDevEnv: {
-        label: 'Delete Workspace',
-        description: 'CodeCatalyst',
-        detail: 'Deletes the selected Dev Environment',
-        executor: deleteDevEnvCommand,
-    },
-    editStorage: {
-        label: 'Edit Storage',
-        description: 'VS Code',
-        detail: 'Edit a key in global/secret storage as a JSON document',
-        executor: openStorageFromInput,
-    },
-    showGlobalState: {
-        label: 'Show Global State',
-        description: 'AWS Toolkit',
-        detail: 'Shows various state (including environment variables)',
-        executor: showGlobalState,
-    },
-}
-
-export class GlobalStateDocumentProvider implements vscode.TextDocumentContentProvider {
-    provideTextDocumentContent(uri: vscode.Uri): string {
-        let s = 'Environment variables known to AWS Toolkit:\n'
-        for (const [k, v] of Object.entries(process.env)) {
-            s += `${k}=${v}\n`
-        }
-        return s
-    }
-}
-
-/**
- * Enables internal developer tools.
- *
- * Commands prefixed with `AWS (Developer)` will appear so long as a developer setting is active.
- *
- * See {@link DevSettings} for more information.
- */
-export function activate(ctx: ExtContext): void {
-    const devSettings = DevSettings.instance
-
-    async function updateMode() {
-        const enablement = Object.keys(devSettings.activeSettings).length > 0
-        await vscode.commands.executeCommand('setContext', 'aws.isDevMode', enablement)
-    }
-
-    ctx.extensionContext.subscriptions.push(
-        devSettings.onDidChangeActiveSettings(updateMode),
-        vscode.commands.registerCommand('aws.dev.openMenu', () => openMenu(ctx, menuOptions)),
-        vscode.workspace.registerTextDocumentContentProvider('aws-dev2', new GlobalStateDocumentProvider())
-    )
-
-    updateMode()
-
-    const editor = new ObjectEditor(ctx.extensionContext)
-    ctx.extensionContext.subscriptions.push(openStorageCommand.register(editor))
-
-    if (!isCloud9() && !isReleaseVersion() && config.betaUrl) {
-        ctx.extensionContext.subscriptions.push(watchBetaVSIX(config.betaUrl))
-    }
-}
-
-async function openMenu(ctx: ExtContext, options: typeof menuOptions): Promise<void> {
-    const items = entries(options).map(([_, v]) => ({
-        label: v.label,
-        detail: v.detail,
-        description: v.description,
-        skipEstimate: true,
-        data: v.executor.bind(undefined, ctx),
-    }))
-
-    const prompter = createQuickPick(items, {
-        title: 'Developer Menu',
-        buttons: createCommonButtons(),
-    })
-
-    await prompter.prompt()
-}
-
-function isSecrets(obj: vscode.Memento | vscode.SecretStorage): obj is vscode.SecretStorage {
-    return (obj as vscode.SecretStorage).store !== undefined
-}
-
-class VirtualObjectFile implements FileProvider {
-    private readonly onDidChangeEmitter = new vscode.EventEmitter<void>()
-    public readonly onDidChange = this.onDidChangeEmitter.event
-
-    public constructor(private readonly storage: vscode.Memento | vscode.SecretStorage, private readonly key: string) {}
-
-    public stat(): { ctime: number; mtime: number; size: number } {
-        // This would need to be filled out to track conflicts
-        return { ctime: 0, mtime: 0, size: 0 }
-    }
-
-    public async read(): Promise<Uint8Array> {
-        const encoder = new TextEncoder()
-
-        return encoder.encode(await this.readStore(this.key))
-    }
-
-    public async write(content: Uint8Array): Promise<void> {
-        const decoder = new TextDecoder()
-        const value = JSON.parse(decoder.decode(content))
-
-        await this.updateStore(this.key, value)
-    }
-
-    private async readStore(key: string): Promise<string> {
-        // Could potentially show `undefined` in the editor instead of an empty string
-        if (isSecrets(this.storage)) {
-            const value = (await this.storage.get(key)) ?? ''
-            return JSON.stringify(JSON.parse(value), undefined, 4)
-        } else {
-            return JSON.stringify(this.storage.get(key, {}), undefined, 4)
-        }
-    }
-
-    private async updateStore(key: string, value: unknown): Promise<unknown> {
-        if (isSecrets(this.storage)) {
-            return this.storage.store(key, JSON.stringify(value))
-        } else {
-            return this.storage.update(key, value)
-        }
-    }
-}
-
-interface Tab {
-    readonly editor: vscode.TextEditor
-    dispose(): void
-}
-
-class ObjectEditor {
-    private static readonly scheme = 'aws-dev'
-
-    private readonly fs = new VirualFileSystem()
-    private readonly tabs: Map<string, Tab> = new Map()
-
-    public constructor(private readonly context: vscode.ExtensionContext) {
-        vscode.workspace.onDidCloseTextDocument(doc => {
-            const key = this.fs.uriToKey(doc.uri)
-            this.tabs.get(key)?.dispose()
-            this.tabs.delete(key)
-        })
-
-        vscode.workspace.registerFileSystemProvider(ObjectEditor.scheme, this.fs)
-    }
-
-    public async openStorage(type: 'globals' | 'secrets', key: string): Promise<void> {
-        switch (type) {
-            case 'globals':
-                return this.openState(this.context.globalState, key)
-            case 'secrets':
-                return this.openState(this.context.secrets, key)
-        }
-    }
-
-    private async openState(storage: vscode.Memento | vscode.SecretStorage, key: string): Promise<void> {
-        const uri = this.uriFromKey(key, storage)
-        const tab = this.tabs.get(this.fs.uriToKey(uri))
-
-        if (tab) {
-            await vscode.window.showTextDocument(tab.editor.document)
-        } else {
-            const newTab = await this.createTab(storage, key)
-            const newKey = this.fs.uriToKey(newTab.editor.document.uri)
-            this.tabs.set(newKey, newTab)
-        }
-    }
-
-    private async createTab(storage: vscode.Memento | vscode.SecretStorage, key: string): Promise<Tab> {
-        const uri = this.uriFromKey(key, storage)
-        const disposable = this.fs.registerProvider(uri, new VirtualObjectFile(storage, key))
-        const document = await vscode.workspace.openTextDocument(uri)
-        const withLanguage = await vscode.languages.setTextDocumentLanguage(document, 'json')
-        const editor = await vscode.window.showTextDocument(withLanguage)
-
-        return {
-            editor,
-            dispose: () => disposable.dispose(),
-        }
-    }
-
-    private uriFromKey(key: string, storage: vscode.Memento | vscode.SecretStorage): vscode.Uri {
-        const prefix = isSecrets(storage) ? 'secrets' : 'globals'
-
-        return vscode.Uri.parse(`${ObjectEditor.scheme}:`, true).with({
-            path: `/${prefix}/${key}`,
-        })
-    }
-}
-
-async function openStorageFromInput() {
-    const wizard = new (class extends Wizard<{ target: 'globals' | 'secrets'; key: string }> {
-        constructor() {
-            super()
-
-            this.form.target.bindPrompter(() =>
-                createQuickPick(
-                    [
-                        { label: 'Global State', data: 'globals' },
-                        { label: 'Secrets', data: 'secrets' },
-                    ],
-                    {
-                        title: 'Select a storage type',
-                    }
-                )
-            )
-
-            this.form.key.bindPrompter(({ target }) =>
-                createInputBox({
-                    title: 'Enter a key',
-                    placeholder: target === 'globals' ? 'region' : '',
-                })
-            )
-        }
-    })()
-
-    const response = await wizard.run()
-
-    if (response) {
-        return openStorageCommand.execute(response.target, response.key)
-    }
-}
-
-async function showGlobalState() {
-    const uri = vscode.Uri.parse('aws-dev2:global-state')
-    const doc = await vscode.workspace.openTextDocument(uri)
-    await vscode.window.showTextDocument(doc, { preview: false })
-}
-
-export const openStorageCommand = Commands.from(ObjectEditor).declareOpenStorage('_aws.dev.openStorage')
diff --git a/src/dev/beta.ts b/src/dev/beta.ts
deleted file mode 100644
index 9b6f1c84364..00000000000
--- a/src/dev/beta.ts
+++ /dev/null
@@ -1,171 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as path from 'path'
-import * as nls from 'vscode-nls'
-import * as vscode from 'vscode'
-import * as AdmZip from 'adm-zip'
-import got from 'got'
-import globals from '../shared/extensionGlobals'
-import { getLogger } from '../shared/logger'
-import { VSCODE_EXTENSION_ID } from '../shared/extensions'
-import { makeTemporaryToolkitFolder } from '../shared/filesystemUtilities'
-import { reloadWindowPrompt } from '../shared/utilities/vsCodeUtils'
-import { isUserCancelledError, ToolkitError } from '../shared/errors'
-import { SystemUtilities } from '../shared/systemUtilities'
-import { telemetry } from '../shared/telemetry/telemetry'
-import { cast } from '../shared/utilities/typeConstructors'
-import { CancellationError } from '../shared/utilities/timeoutUtils'
-
-const localize = nls.loadMessageBundle()
-
-const downloadIntervalMs = 1000 * 60 * 60 * 24 // A day in milliseconds
-const betaToolkitKey = 'dev.beta'
-
-interface BetaToolkit {
-    readonly needUpdate: boolean
-    readonly lastCheck: number
-}
-
-function getBetaToolkitData(vsixUrl: string): BetaToolkit | undefined {
-    return globals.context.globalState.get<Record<string, BetaToolkit>>(betaToolkitKey, {})[vsixUrl]
-}
-
-async function updateBetaToolkitData(vsixUrl: string, data: BetaToolkit) {
-    await globals.context.globalState.update(betaToolkitKey, {
-        ...globals.context.globalState.get<Record<string, BetaToolkit>>(betaToolkitKey, {}),
-        [vsixUrl]: data,
-    })
-}
-
-/**
- * Watch the beta VSIX daily for changes.
- * If this is the first time we are watching the beta version or if its been 24 hours since it was last checked then try to prompt for update
- */
-export function watchBetaVSIX(vsixUrl: string): vscode.Disposable {
-    getLogger().info(`dev: watching ${vsixUrl} for beta artifacts`)
-
-    const toolkit = getBetaToolkitData(vsixUrl)
-    if (!toolkit || toolkit.needUpdate || Date.now() - toolkit.lastCheck > downloadIntervalMs) {
-        runAutoUpdate(vsixUrl)
-    }
-
-    const interval = globals.clock.setInterval(() => runAutoUpdate(vsixUrl), downloadIntervalMs)
-    return { dispose: () => clearInterval(interval) }
-}
-
-async function runAutoUpdate(vsixUrl: string) {
-    getLogger().debug(`dev: checking ${vsixUrl} for a new version`)
-
-    try {
-        await telemetry.aws_autoUpdateBeta.run(() => checkBetaUrl(vsixUrl))
-    } catch (e) {
-        if (!isUserCancelledError(e)) {
-            getLogger().warn(`dev: beta extension auto-update failed: %s`, e)
-        }
-    }
-}
-
-/**
- * Prompt to update the beta extension when required
- */
-async function checkBetaUrl(vsixUrl: string): Promise<void> {
-    const resp = await got(vsixUrl).buffer()
-    const latestBetaInfo = await getExtensionInfo(resp)
-    if (VSCODE_EXTENSION_ID.awstoolkit !== `${latestBetaInfo.publisher}.${latestBetaInfo.name}`) {
-        throw new ToolkitError('URL does not point to an AWS Toolkit artifact', { code: 'InvalidExtensionName' })
-    }
-
-    const currentVersion = vscode.extensions.getExtension(VSCODE_EXTENSION_ID.awstoolkit)?.packageJSON.version
-    if (latestBetaInfo.version !== currentVersion) {
-        const tmpFolder = await makeTemporaryToolkitFolder()
-        const betaPath = vscode.Uri.joinPath(vscode.Uri.file(tmpFolder), path.basename(vsixUrl))
-        await SystemUtilities.writeFile(betaPath, resp)
-
-        try {
-            await promptInstallToolkit(betaPath, latestBetaInfo.version, vsixUrl)
-        } finally {
-            await SystemUtilities.remove(tmpFolder)
-        }
-    } else {
-        await updateBetaToolkitData(vsixUrl, {
-            lastCheck: Date.now(),
-            needUpdate: false,
-        })
-    }
-}
-
-interface ExtensionInfo {
-    readonly name: string
-    readonly version: string
-    readonly publisher: string
-}
-
-/**
- * Get information about the extension or error if no version could be found
- *
- * @param extension The URI of the extension on disk or the raw data
- * @returns The version + name of the extension
- * @throws Error if the extension manifest could not be found or parsed
- */
-async function getExtensionInfo(extension: Buffer): Promise<ExtensionInfo>
-async function getExtensionInfo(extensionLocation: vscode.Uri): Promise<ExtensionInfo>
-async function getExtensionInfo(extensionOrLocation: vscode.Uri | Buffer): Promise<ExtensionInfo> {
-    const fileNameOrData = extensionOrLocation instanceof vscode.Uri ? extensionOrLocation.fsPath : extensionOrLocation
-    const packageFile = new AdmZip(fileNameOrData).getEntry('extension/package.json')
-    const packageJSON = packageFile?.getData().toString()
-    if (!packageJSON) {
-        throw new ToolkitError('Extension does not have a `package.json`', { code: 'NoPackageJson' })
-    }
-
-    try {
-        const data = JSON.parse(packageJSON)
-
-        return {
-            name: cast(data.name, String),
-            version: cast(data.version, String),
-            publisher: cast(data.publisher, String),
-        }
-    } catch (e) {
-        throw ToolkitError.chain(e, 'Unable to parse extension data', { code: 'BadParse' })
-    }
-}
-
-async function promptInstallToolkit(pluginPath: vscode.Uri, newVersion: string, vsixUrl: string): Promise<void> {
-    const vsixName = path.basename(pluginPath.fsPath)
-    const installBtn = localize('AWS.missingExtension.install', 'Install...')
-
-    const response = await vscode.window.showInformationMessage(
-        localize(
-            'AWS.dev.beta.updatePrompt',
-            `New version of AWS Toolkit is available at the [beta URL]({0}). Install the new version "{1}" to continue using the beta.`,
-            vsixUrl,
-            newVersion
-        ),
-        installBtn
-    )
-
-    switch (response) {
-        case installBtn:
-            try {
-                getLogger().info(`dev: installing artifact ${vsixName}`)
-                await vscode.commands.executeCommand('workbench.extensions.installExtension', pluginPath)
-                await updateBetaToolkitData(vsixUrl, {
-                    lastCheck: Date.now(),
-                    needUpdate: false,
-                })
-                reloadWindowPrompt(localize('AWS.dev.beta.reloadPrompt', 'Reload now to use the new beta AWS Toolkit.'))
-            } catch (e) {
-                throw ToolkitError.chain(e, `Failed to install ${vsixName}`, { code: 'FailedExtensionInstall' })
-            }
-            break
-        case undefined:
-            await updateBetaToolkitData(vsixUrl, {
-                lastCheck: Date.now(),
-                needUpdate: true,
-            })
-            throw new CancellationError('user')
-    }
-}
diff --git a/src/dev/config.ts b/src/dev/config.ts
deleted file mode 100644
index a6545316a69..00000000000
--- a/src/dev/config.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-// This file is strictly used for private development
-// Nothing in this file should have a truthy value on mainline
-
-export const betaUrl = ''
diff --git a/src/dynamicResources/activation.ts b/src/dynamicResources/activation.ts
deleted file mode 100644
index 1b01e43608b..00000000000
--- a/src/dynamicResources/activation.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as nls from 'vscode-nls'
-import { ResourceCodeLensProvider } from '../shared/codelens/resourceCodeLensProvider'
-import { configureResources } from './commands/configure'
-import { copyIdentifier } from './commands/copyIdentifier'
-import { deleteResource } from './commands/deleteResource'
-import { getDiagnostics, openResource } from './commands/openResource'
-import { saveResource } from './commands/saveResource'
-import { ResourcesNode } from './explorer/nodes/resourcesNode'
-import { ResourceNode } from './explorer/nodes/resourceNode'
-import { ResourceTypeNode } from './explorer/nodes/resourceTypeNode'
-import { resourceFileGlobPattern } from './awsResourceManager'
-import { Commands } from '../shared/vscode/commands2'
-import globals from '../shared/extensionGlobals'
-
-const localize = nls.loadMessageBundle()
-
-/**
- * Activates Resources components.
- */
-export async function activate(context: vscode.ExtensionContext): Promise<void> {
-    const resourceDiagnostics = vscode.languages.createDiagnosticCollection(
-        localize('AWS.explorerNode.resources.label', 'Resources')
-    )
-    const resourceManager = globals.resourceManager
-
-    context.subscriptions.push(
-        vscode.workspace.registerTextDocumentContentProvider('awsResource', new VirtualDocumentProvider()),
-        Commands.register('aws.resources.openResourcePreview', async (node: ResourceNode) => {
-            await openResource({
-                source: node,
-                preview: true,
-                resourceManager,
-                diagnostics: resourceDiagnostics,
-            })
-        }),
-        Commands.register('aws.resources.copyIdentifier', async (node: ResourceNode) => {
-            await copyIdentifier(node.parent.typeName, node.identifier)
-        }),
-        Commands.register('aws.resources.configure', async (node: ResourcesNode) => {
-            if (await configureResources()) {
-                node.refresh()
-            }
-        }),
-        Commands.register('aws.resources.createResource', async (node: ResourceTypeNode) => {
-            await resourceManager.new(node)
-        }),
-        Commands.register('aws.resources.deleteResource', async (node: ResourceNode) => {
-            if (await deleteResource(node.parent.cloudControl, node.parent.typeName, node.identifier)) {
-                await resourceManager.close(resourceManager.toUri(node)!)
-                node.parent.clearChildren()
-                node.parent.refresh()
-            }
-        }),
-        Commands.register('aws.resources.updateResource', async (node: ResourceNode) => {
-            await openResource({
-                source: node,
-                preview: false,
-                resourceManager,
-                diagnostics: resourceDiagnostics,
-            })
-        }),
-        Commands.register('aws.resources.updateResourceInline', async (uri: vscode.Uri) => {
-            await openResource({
-                source: uri,
-                preview: false,
-                resourceManager,
-                diagnostics: resourceDiagnostics,
-            })
-        }),
-        vscode.workspace.onDidSaveTextDocument(async (doc: vscode.TextDocument) => {
-            return await saveResource(doc, resourceManager, resourceDiagnostics)
-        }),
-        Commands.register('aws.resources.saveResource', async (uri: vscode.Uri) => {
-            await vscode.window.showTextDocument(uri)
-            await vscode.commands.executeCommand('workbench.action.files.save')
-        }),
-        Commands.register('aws.resources.closeResource', async (uri: vscode.Uri) => {
-            if (resourceManager.fromUri(uri) instanceof ResourceNode) {
-                await openResource({
-                    source: uri,
-                    preview: true,
-                    resourceManager,
-                    diagnostics: resourceDiagnostics,
-                })
-                resourceDiagnostics.delete(uri)
-            } else {
-                await resourceManager.close(uri)
-            }
-        }),
-        Commands.register('aws.resources.viewDocs', async (node: ResourceTypeNode) => {
-            await vscode.env.openExternal(vscode.Uri.parse(node.metadata.documentation))
-        }),
-        vscode.workspace.onDidChangeTextDocument(textDocumentEvent => {
-            if (resourceDiagnostics.has(textDocumentEvent.document.uri)) {
-                let diagnostics: vscode.Diagnostic[] = []
-                const resource = resourceManager.fromUri(textDocumentEvent.document.uri)
-                if (resource instanceof ResourceNode) {
-                    const schema = resourceManager.getSchema(resource.parent.typeName)
-                    if (schema) {
-                        diagnostics = getDiagnostics(schema, textDocumentEvent.document)
-                    }
-                }
-                resourceDiagnostics.set(textDocumentEvent.document.uri, diagnostics)
-            }
-        }),
-        vscode.workspace.onDidCloseTextDocument(closeDocumentEvent => {
-            resourceManager.close(closeDocumentEvent.uri, true)
-        }),
-        vscode.languages.registerCodeLensProvider(
-            {
-                language: 'json',
-                scheme: 'file',
-                pattern: resourceFileGlobPattern,
-            },
-            new ResourceCodeLensProvider(resourceManager)
-        )
-    )
-}
-
-export class VirtualDocumentProvider implements vscode.TextDocumentContentProvider {
-    provideTextDocumentContent(uri: vscode.Uri): string {
-        return uri.query
-    }
-}
diff --git a/src/dynamicResources/commands/copyIdentifier.ts b/src/dynamicResources/commands/copyIdentifier.ts
deleted file mode 100644
index 79a0bb19d59..00000000000
--- a/src/dynamicResources/commands/copyIdentifier.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Window } from '../../shared/vscode/window'
-import { Env } from '../../shared/vscode/env'
-import { copyToClipboard } from '../../shared/utilities/messages'
-import { telemetry } from '../../shared/telemetry/telemetry'
-
-export async function copyIdentifier(
-    typeName: string,
-    identifier: string,
-    window = Window.vscode(),
-    env = Env.vscode()
-) {
-    copyToClipboard(identifier, 'identifier', window, env)
-    telemetry.dynamicresource_copyIdentifier.emit({ resourceType: typeName })
-}
diff --git a/src/dynamicResources/explorer/nodes/resourceNode.ts b/src/dynamicResources/explorer/nodes/resourceNode.ts
deleted file mode 100644
index f1d03165cea..00000000000
--- a/src/dynamicResources/explorer/nodes/resourceNode.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-
-import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
-import { ResourceTypeNode } from './resourceTypeNode'
-import { parse, validate } from '@aws-sdk/util-arn-parser'
-
-const localize = nls.loadMessageBundle()
-
-export class ResourceNode extends AWSTreeNodeBase {
-    public constructor(
-        public readonly parent: ResourceTypeNode,
-        public readonly identifier: string,
-        public override contextValue?: string
-    ) {
-        super('')
-        this.contextValue = contextValue ?? 'ResourceNode'
-        const friendlyName = this.getFriendlyName(identifier)
-        this.label = friendlyName
-        this.tooltip = identifier
-        this.command = {
-            title: localize('AWS.generic.preview', 'Preview'),
-            command: 'aws.resources.openResourcePreview',
-            arguments: [this],
-        }
-    }
-
-    private getFriendlyName(identifier: string): string {
-        return validate(identifier) ? parse(identifier).resource : identifier
-    }
-}
diff --git a/src/ecr/activation.ts b/src/ecr/activation.ts
deleted file mode 100644
index 90b325a1ef1..00000000000
--- a/src/ecr/activation.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { copyTagUri } from './commands/copyTagUri'
-import { copyRepositoryUri } from './commands/copyRepositoryUri'
-import { createRepository } from './commands/createRepository'
-import { deleteRepository } from './commands/deleteRepository'
-import { EcrNode } from './explorer/ecrNode'
-import { EcrRepositoryNode } from './explorer/ecrRepositoryNode'
-import { EcrTagNode } from './explorer/ecrTagNode'
-import { deleteTag } from './commands/deleteTag'
-import { Commands } from '../shared/vscode/commands2'
-
-/**
- * Activates ECR components.
- */
-export async function activate(extensionContext: vscode.ExtensionContext): Promise<void> {
-    extensionContext.subscriptions.push(
-        Commands.register('aws.ecr.createRepository', async (node: EcrNode) => {
-            await createRepository(node)
-        }),
-        Commands.register('aws.ecr.deleteRepository', async (node: EcrRepositoryNode) => {
-            await deleteRepository(node)
-        }),
-        Commands.register('aws.ecr.copyRepositoryUri', async (node: EcrRepositoryNode) => {
-            await copyRepositoryUri(node)
-        }),
-        Commands.register('aws.ecr.copyTagUri', async (node: EcrTagNode) => {
-            await copyTagUri(node)
-        }),
-        Commands.register('aws.ecr.deleteTag', async (node: EcrTagNode) => {
-            await deleteTag(node)
-        })
-    )
-}
diff --git a/src/ecr/commands/copyRepositoryUri.ts b/src/ecr/commands/copyRepositoryUri.ts
deleted file mode 100644
index 6e5b7f2496f..00000000000
--- a/src/ecr/commands/copyRepositoryUri.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Env } from '../../shared/vscode/env'
-import { copyToClipboard } from '../../shared/utilities/messages'
-import { Window } from '../../shared/vscode/window'
-import { EcrRepositoryNode } from '../explorer/ecrRepositoryNode'
-import { telemetry } from '../../shared/telemetry/telemetry'
-
-export async function copyRepositoryUri(
-    node: EcrRepositoryNode,
-    window = Window.vscode(),
-    env = Env.vscode()
-): Promise<void> {
-    const uri = node.repository.repositoryUri
-    copyToClipboard(uri, 'URI', window, env)
-    telemetry.ecr_copyRepositoryUri.emit()
-}
diff --git a/src/ecr/commands/copyTagUri.ts b/src/ecr/commands/copyTagUri.ts
deleted file mode 100644
index 9b08754abd9..00000000000
--- a/src/ecr/commands/copyTagUri.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { EcrTagNode } from '../explorer/ecrTagNode'
-import { Env } from '../../shared/vscode/env'
-import { copyToClipboard } from '../../shared/utilities/messages'
-import { Window } from '../../shared/vscode/window'
-import { telemetry } from '../../shared/telemetry/telemetry'
-
-export async function copyTagUri(node: EcrTagNode, window = Window.vscode(), env = Env.vscode()): Promise<void> {
-    const uri = `${node.repository.repositoryUri}:${node.tag}`
-    copyToClipboard(uri, 'URI', window, env)
-    telemetry.ecr_copyTagUri.emit()
-}
diff --git a/src/ecr/commands/createRepository.ts b/src/ecr/commands/createRepository.ts
deleted file mode 100644
index 7694f218174..00000000000
--- a/src/ecr/commands/createRepository.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { getLogger } from '../../shared/logger'
-import { EcrNode } from '../explorer/ecrNode'
-import { Commands } from '../../shared/vscode/commands'
-import { Window } from '../../shared/vscode/window'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { showViewLogsMessage } from '../../shared/utilities/messages'
-import { validateRepositoryName } from '../utils'
-import { telemetry } from '../../shared/telemetry/telemetry'
-
-export async function createRepository(
-    node: EcrNode,
-    window = Window.vscode(),
-    commands = Commands.vscode()
-): Promise<void> {
-    getLogger().debug('createRepository called for %O', node)
-
-    const repositoryName = await window.showInputBox({
-        prompt: localize('AWS.ecr.createRepository.prompt', 'Enter a new repository name'),
-        placeHolder: localize('AWS.ecr.createRepository.placeHolder', 'Repository Name'),
-        validateInput: validateRepositoryName,
-    })
-
-    if (!repositoryName) {
-        getLogger().info('createRepository cancelled')
-        telemetry.ecr_createRepository.emit({ result: 'Cancelled' })
-        return
-    }
-
-    getLogger().info(`Creating repository ${repositoryName}`)
-    try {
-        const repository = await node.createRepository(repositoryName)
-
-        getLogger().info('created repository: %O', repository)
-        window.showInformationMessage(
-            localize('AWS.ecr.createRepository.success', 'Created repository: {0}', repositoryName)
-        )
-        telemetry.ecr_createRepository.emit({ result: 'Succeeded' })
-    } catch (e) {
-        getLogger().error(`Failed to create repository ${repositoryName}: %s`, e)
-        showViewLogsMessage(
-            localize('AWS.ecr.createRepository.failure', 'Failed to create repository: {0}', repositoryName),
-            window
-        )
-        telemetry.ecr_createRepository.emit({ result: 'Failed' })
-    } finally {
-        await commands.execute('aws.refreshAwsExplorerNode', node)
-    }
-}
diff --git a/src/ecr/commands/deleteRepository.ts b/src/ecr/commands/deleteRepository.ts
deleted file mode 100644
index 88dda4d3bcb..00000000000
--- a/src/ecr/commands/deleteRepository.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { getLogger } from '../../shared/logger'
-import { EcrRepositoryNode } from '../explorer/ecrRepositoryNode'
-import { Commands } from '../../shared/vscode/commands'
-import { Window } from '../../shared/vscode/window'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { showViewLogsMessage } from '../../shared/utilities/messages'
-import { telemetry } from '../../shared/telemetry/telemetry'
-
-export async function deleteRepository(
-    node: EcrRepositoryNode,
-    window = Window.vscode(),
-    commands = Commands.vscode()
-): Promise<void> {
-    getLogger().debug('DeleteRepository called for %O', node)
-
-    const repositoryName = node.repository.repositoryName
-
-    const isConfirmed = await showConfirmationDialog(repositoryName, window)
-    if (!isConfirmed) {
-        getLogger().info('DeleteRepository cancelled')
-        telemetry.ecr_deleteRepository.emit({ result: 'Cancelled' })
-        return
-    }
-
-    getLogger().info(`Deleting repository ${repositoryName}`)
-    try {
-        await node.deleteRepository()
-
-        getLogger().info(`deleted repository: ${repositoryName}`)
-
-        window.showInformationMessage(
-            localize('AWS.ecr.deleteRepository.success', 'Deleted repository: {0}', repositoryName)
-        )
-        telemetry.ecr_deleteRepository.emit({ result: 'Succeeded' })
-    } catch (e) {
-        getLogger().error(`Failed to delete repository ${repositoryName}: %s`, e)
-        showViewLogsMessage(
-            localize('AWS.ecr.deleteRepository.failure', 'Failed to delete repository: {0}', repositoryName),
-            window
-        )
-        telemetry.ecr_deleteRepository.emit({ result: 'Failed' })
-    } finally {
-        await commands.execute('aws.refreshAwsExplorerNode', node.parent)
-    }
-}
-
-async function showConfirmationDialog(repositoryName: string, window: Window): Promise<boolean> {
-    const prompt = localize('AWS.s3.deleteBucket.prompt', 'Enter {0} to confirm deletion', repositoryName)
-    const confirmationInput = await window.showInputBox({
-        prompt,
-        placeHolder: repositoryName,
-        validateInput: input => (input !== repositoryName ? prompt : undefined),
-    })
-
-    return confirmationInput === repositoryName
-}
diff --git a/src/ecr/commands/deleteTag.ts b/src/ecr/commands/deleteTag.ts
deleted file mode 100644
index c81e8ba776d..00000000000
--- a/src/ecr/commands/deleteTag.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Commands } from '../../shared/vscode/commands'
-import { Window } from '../../shared/vscode/window'
-import { EcrTagNode } from '../explorer/ecrTagNode'
-import { getLogger } from '../../shared/logger'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { showConfirmationMessage, showViewLogsMessage } from '../../shared/utilities/messages'
-import { telemetry } from '../../shared/telemetry/telemetry'
-
-export async function deleteTag(
-    node: EcrTagNode,
-    window = Window.vscode(),
-    commands = Commands.vscode()
-): Promise<void> {
-    getLogger().debug('deleteTag called for %O', node)
-    const ok = await showConfirmationMessage(
-        {
-            prompt: localize(
-                'AWS.ecr.deleteTag.prompt',
-                'Are you sure you want to delete tag {0} from repository {1}',
-                node.tag,
-                node.repository.repositoryName
-            ),
-            confirm: localize('AWS.generic.delete', 'Delete'),
-            cancel: localize('AWS.generic.cancel', 'Cancel'),
-        },
-        window
-    )
-    if (!ok) {
-        getLogger().info(`Cancelled delete tag ${node.tag} from repository ${node.repository.repositoryName}`)
-        telemetry.ecr_deleteTags.emit({ result: 'Cancelled', value: 1 })
-        return
-    }
-    try {
-        await node.deleteTag()
-
-        getLogger().info(`Successfully deleted tag ${node.tag} from repository ${node.repository.repositoryName}`)
-
-        window.showInformationMessage(
-            localize(
-                'AWS.ecr.deleteTag.success',
-                'Deleted tag {0} from repository {1}',
-                node.tag,
-                node.repository.repositoryName
-            )
-        )
-        telemetry.ecr_deleteTags.emit({ result: 'Succeeded', value: 1 })
-    } catch (e) {
-        getLogger().error(`Failed to delete tag ${node.tag} from repository ${node.repository.repositoryName}: %s`, e)
-        showViewLogsMessage(
-            localize(
-                'AWS.ecr.deleteTag.failure',
-                'Failed to delete tag {0} from repository {1}',
-                node.tag,
-                node.repository.repositoryName
-            ),
-            window
-        )
-        telemetry.ecr_deleteTags.emit({ result: 'Failed', value: 1 })
-    } finally {
-        await commands.execute('aws.refreshAwsExplorerNode', node.parent)
-    }
-}
diff --git a/src/ecr/explorer/ecrNode.ts b/src/ecr/explorer/ecrNode.ts
deleted file mode 100644
index ea095d140e1..00000000000
--- a/src/ecr/explorer/ecrNode.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
-import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
-import { makeChildrenNodes } from '../../shared/treeview/utils'
-import { toArrayAsync } from '../../shared/utilities/collectionUtils'
-import { inspect } from 'util'
-import { EcrClient } from '../../shared/clients/ecrClient'
-import { EcrRepositoryNode } from './ecrRepositoryNode'
-
-/**
- * An AWS Explorer node representing S3.
- *
- * Contains buckets for a specific region as child nodes.
- */
-export class EcrNode extends AWSTreeNodeBase {
-    public constructor(private readonly ecr: EcrClient) {
-        super('ECR', vscode.TreeItemCollapsibleState.Collapsed)
-        this.contextValue = 'awsEcrNode'
-    }
-
-    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
-        return await makeChildrenNodes({
-            getChildNodes: async () => {
-                const response = await toArrayAsync(this.ecr.describeRepositories())
-
-                return response.map(item => new EcrRepositoryNode(this, this.ecr, item))
-            },
-            getNoChildrenPlaceholderNode: async () =>
-                new PlaceholderNode(this, localize('AWS.explorerNode.ecr.noRepositories', '[No repositories found]')),
-            sort: (item1, item2) => item1.repository.repositoryName.localeCompare(item2.repository.repositoryName),
-        })
-    }
-
-    public async createRepository(repositoryName: string): Promise<void> {
-        await this.ecr.createRepository(repositoryName)
-    }
-
-    public [inspect.custom](): string {
-        return 'ECRNode'
-    }
-}
diff --git a/src/ecr/explorer/ecrRepositoryNode.ts b/src/ecr/explorer/ecrRepositoryNode.ts
deleted file mode 100644
index 86d0427840a..00000000000
--- a/src/ecr/explorer/ecrRepositoryNode.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { AWSResourceNode } from '../../shared/treeview/nodes/awsResourceNode'
-import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
-import { EcrNode } from './ecrNode'
-import { EcrClient, EcrRepository } from '../../shared/clients/ecrClient'
-
-import { makeChildrenNodes } from '../../shared/treeview/utils'
-import { toArrayAsync } from '../../shared/utilities/collectionUtils'
-import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { EcrTagNode } from './ecrTagNode'
-import { getIcon } from '../../shared/icons'
-
-export class EcrRepositoryNode extends AWSTreeNodeBase implements AWSResourceNode {
-    name: string = this.repository.repositoryName
-    arn: string = this.repository.repositoryArn
-    public override readonly regionCode: string
-
-    constructor(
-        public readonly parent: EcrNode,
-        private readonly ecr: EcrClient,
-        public readonly repository: EcrRepository
-    ) {
-        super(repository.repositoryName, vscode.TreeItemCollapsibleState.Collapsed)
-        this.iconPath = getIcon('aws-ecr-registry')
-        this.contextValue = 'awsEcrRepositoryNode'
-        this.regionCode = ecr.regionCode
-    }
-
-    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
-        return await makeChildrenNodes({
-            getChildNodes: async () => {
-                const response = await toArrayAsync(this.ecr.describeTags(this.repository.repositoryName))
-
-                return response.map(item => new EcrTagNode(this, this.ecr, this.repository, item))
-            },
-            getNoChildrenPlaceholderNode: async () =>
-                new PlaceholderNode(this, localize('AWS.explorerNode.ecr.noTags', '[No tags found]')),
-            sort: (item1, item2) => item1.tag.localeCompare(item2.tag),
-        })
-    }
-
-    public async deleteRepository(): Promise<void> {
-        await this.ecr.deleteRepository(this.repository.repositoryName)
-    }
-}
diff --git a/src/ecr/utils.ts b/src/ecr/utils.ts
deleted file mode 100644
index 2c8b3147c46..00000000000
--- a/src/ecr/utils.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { localize } from '../shared/utilities/vsCodeUtils'
-
-/**
- * Validates an ECR repository name. There are actually more rules, but they aren't documented, so
- * let the service fail the creation if one of the more complicated rules is violated
- *
- * @see https://docs.aws.amazon.com/AmazonECR/latest/APIReference/API_Repository.html
- * @returns undefined if the name passes validation. Otherwise, a localized error message is returned.
- */
-export function validateRepositoryName(name: string): string | undefined {
-    if (!/^[a-z]/.test(name)) {
-        return localize(
-            'AWS.ecr.validateRepoName.error.invalidStart',
-            'Repository name must start with a lowercase letter'
-        )
-    }
-
-    if (!/^[a-z0-9\-_/]+$/.test(name)) {
-        return localize(
-            'AWS.ecr.validateRepoName.error.invalidCharacters',
-            'Repository name must only contain lowercase letters, numbers, hyphens, underscores, and forward slashes'
-        )
-    }
-
-    // See the APIReference document above for the source of this. ^ and $ added to make sure
-    // it matches the whole string
-    if (!/^(?:[a-z0-9]+(?:[._-][a-z0-9]+)*\/)*[a-z0-9]+(?:[._-][a-z0-9]+)*$/.test(name)) {
-        return localize('AWS.ecr.validateRepoName.error.invalidString', 'Invalid repository name')
-    }
-
-    return undefined
-}
diff --git a/src/ecs/activation.ts b/src/ecs/activation.ts
deleted file mode 100644
index 5d2d3334596..00000000000
--- a/src/ecs/activation.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { ExtContext } from '../shared/extensions'
-import { ecsDocumentationUrl } from '../shared/constants'
-import { Commands } from '../shared/vscode/commands2'
-import { openTaskInTerminal, runCommandInContainer, toggleExecuteCommandFlag } from './commands'
-import { getResourceFromTreeNode } from '../shared/treeview/utils'
-import { Instance } from '../shared/utilities/typeConstructors'
-import { Service } from './model'
-import { telemetry } from '../shared/telemetry/telemetry'
-
-export async function activate(ctx: ExtContext): Promise<void> {
-    ctx.extensionContext.subscriptions.push(runCommandInContainer, openTaskInTerminal)
-    ctx.extensionContext.subscriptions.push(
-        Commands.register('aws.ecs.enableEcsExec', (param?: unknown) => {
-            return telemetry.ecs_enableExecuteCommand.run(async () => {
-                const service = getResourceFromTreeNode(param, Instance(Service))
-                await toggleExecuteCommandFlag(service)
-            })
-        }),
-        Commands.register('aws.ecs.disableEcsExec', (param?: unknown) => {
-            return telemetry.ecs_disableExecuteCommand.run(async () => {
-                const service = getResourceFromTreeNode(param, Instance(Service))
-                await toggleExecuteCommandFlag(service)
-            })
-        }),
-        Commands.register('aws.ecs.viewDocumentation', async () => {
-            vscode.env.openExternal(vscode.Uri.parse(ecsDocumentationUrl))
-        })
-    )
-}
diff --git a/src/ecs/commands.ts b/src/ecs/commands.ts
deleted file mode 100644
index 86668c55a0b..00000000000
--- a/src/ecs/commands.ts
+++ /dev/null
@@ -1,179 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as moment from 'moment'
-import * as vscode from 'vscode'
-import { DefaultIamClient } from '../shared/clients/iamClient'
-import { INSIGHTS_TIMESTAMP_FORMAT } from '../shared/constants'
-import globals from '../shared/extensionGlobals'
-import { PromptSettings, Settings } from '../shared/settings'
-import { ChildProcess } from '../shared/utilities/childProcess'
-import { showMessageWithCancel, showOutputMessage } from '../shared/utilities/messages'
-import { removeAnsi } from '../shared/utilities/textUtilities'
-import { CancellationError, Timeout } from '../shared/utilities/timeoutUtils'
-import { Commands } from '../shared/vscode/commands2'
-import { checkPermissionsForSsm, EcsSettings } from './util'
-import { CommandWizard, CommandWizardState } from './wizards/executeCommand'
-import { isUserCancelledError, ToolkitError } from '../shared/errors'
-import { getResourceFromTreeNode } from '../shared/treeview/utils'
-import { Container, Service } from './model'
-import { Instance } from '../shared/utilities/typeConstructors'
-import { telemetry } from '../shared/telemetry/telemetry'
-
-async function runCommandWizard(
-    param?: unknown,
-    command?: string
-): Promise<CommandWizardState & { container: Container }> {
-    const container = getResourceFromTreeNode(param, Instance(Container))
-
-    const wizard = new CommandWizard(container, await PromptSettings.instance.isPromptEnabled('ecsRunCommand'), command)
-    const response = await wizard.run()
-
-    if (!response) {
-        throw new CancellationError('user')
-    }
-
-    if (response.confirmation === 'suppress') {
-        await PromptSettings.instance.disablePrompt('ecsRunCommand')
-    }
-
-    await checkPermissionsForSsm(new DefaultIamClient(globals.regionProvider.defaultRegionId), {
-        taskRoleArn: container.description.taskRoleArn!,
-    })
-
-    return { container, ...response }
-}
-
-export enum EcsRunCommandPrompt {
-    Enable = 'ecsRunCommandEnable',
-    Disable = 'ecsRunCommandDisable',
-}
-
-export async function toggleExecuteCommandFlag(
-    service: Service,
-    window = vscode.window,
-    settings = PromptSettings.instance
-): Promise<void> {
-    const yes = localize('AWS.generic.response.yes', 'Yes')
-    const yesDontAskAgain = localize('AWS.message.prompt.yesDontAskAgain', "Yes, don't ask again")
-    const no = localize('AWS.generic.response.no', 'No')
-
-    const isNotEnabled = service.description.enableExecuteCommand ?? false
-    const prompt = isNotEnabled ? EcsRunCommandPrompt.Enable : EcsRunCommandPrompt.Disable
-
-    const warningMessage = isNotEnabled
-        ? localize(
-              'AWS.command.ecs.runCommandInContainer.warning.enableExecuteFlag',
-              'Enabling command execution will change the state of resources in your AWS account, including but not limited to stopping and restarting the service.\nAltering the state of resources while the Execute Command is enabled can lead to unpredictable results.\n Continue?'
-          )
-        : localize(
-              'AWS.command.ecs.runCommandInContainer.warning.disableExecuteFlag',
-              'Disabling command execution will change the state of resources in your AWS account, including but not limited to stopping and restarting the service.\n Continue?'
-          )
-
-    if (await settings.isPromptEnabled(prompt)) {
-        const choice = await window.showWarningMessage(warningMessage, yes, yesDontAskAgain, no)
-        if (choice === undefined || choice === no) {
-            throw new CancellationError('user')
-        } else if (choice === yesDontAskAgain) {
-            settings.disablePrompt(prompt)
-        }
-    }
-
-    await service.toggleExecuteCommand()
-}
-
-export const runCommandInContainer = Commands.register('aws.ecs.runCommandInContainer', (obj?: unknown) => {
-    return telemetry.ecs_runExecuteCommand.run(async span => {
-        span.record({ ecsExecuteCommandType: 'command' })
-
-        const { container, task, command } = await runCommandWizard(obj)
-        const timeout = new Timeout(600000)
-        showMessageWithCancel('Running command...', timeout)
-
-        try {
-            const { path, args, dispose } = await container.prepareCommandForTask(command, task)
-            showOutputMessage(
-                `${moment().format(INSIGHTS_TIMESTAMP_FORMAT)}:  Container: "${
-                    container.description.name
-                }" Task ID: "${task}" Command: "${command}"`,
-                globals.outputChannel
-            )
-
-            const proc = new ChildProcess(path, args, { logging: 'noparams' })
-            await proc
-                .run({
-                    timeout,
-                    rejectOnError: true,
-                    rejectOnErrorCode: true,
-                    // TODO: `showOutputMessage` should not be writing to the logs...
-                    onStdout: text => {
-                        showOutputMessage(removeAnsi(text), globals.outputChannel)
-                    },
-                    onStderr: text => {
-                        showOutputMessage(removeAnsi(text), globals.outputChannel)
-                    },
-                })
-                .finally(dispose)
-        } catch (err) {
-            if (isUserCancelledError(err)) {
-                showOutputMessage('Cancelled command execution', globals.outputChannel)
-            }
-
-            const failedMessage = localize(
-                'AWS.ecs.runCommandInContainer.error',
-                'Failed to execute command in container.'
-            )
-            throw ToolkitError.chain(err, failedMessage)
-        } finally {
-            timeout.dispose()
-        }
-    })
-})
-
-// VSC is logging args to the PTY host log file if shell integration is enabled :(
-async function withoutShellIntegration<T>(cb: () => T | Promise<T>): Promise<T> {
-    const userValue = Settings.instance.get('terminal.integrated.shellIntegration.enabled', Boolean)
-
-    try {
-        await Settings.instance.update('terminal.integrated.shellIntegration.enabled', false)
-        return await cb()
-    } finally {
-        Settings.instance.update('terminal.integrated.shellIntegration.enabled', userValue)
-    }
-}
-
-export const openTaskInTerminal = Commands.register('aws.ecs.openTaskInTerminal', (obj?: unknown) => {
-    return telemetry.ecs_runExecuteCommand.run(async span => {
-        span.record({ ecsExecuteCommandType: 'shell' })
-
-        const startCommand = new EcsSettings().get('openTerminalCommand')
-        const { container, task, command } = await runCommandWizard(obj, startCommand)
-
-        try {
-            const session = await container.prepareCommandForTask(command, task)
-            await withoutShellIntegration(() => {
-                const terminal = vscode.window.createTerminal({
-                    name: `${container.description.name}/${task}`,
-                    shellPath: session.path,
-                    shellArgs: session.args,
-                })
-
-                const listener = vscode.window.onDidCloseTerminal(t => {
-                    if (t.processId === terminal.processId) {
-                        vscode.Disposable.from(listener, session).dispose()
-                    }
-                })
-
-                terminal.show()
-            })
-        } catch (err) {
-            throw ToolkitError.chain(err, localize('AWS.ecs.openTaskInTerminal.error', 'Failed to open terminal.'))
-        }
-    })
-})
diff --git a/src/ecs/model.ts b/src/ecs/model.ts
deleted file mode 100644
index c26dcab54d3..00000000000
--- a/src/ecs/model.ts
+++ /dev/null
@@ -1,199 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as vscode from 'vscode'
-import { ECS } from 'aws-sdk'
-import { DefaultEcsClient } from '../shared/clients/ecsClient'
-import { ResourceTreeNode } from '../shared/treeview/resource'
-import { getIcon } from '../shared/icons'
-import { AsyncCollection } from '../shared/utilities/asyncCollection'
-import { prepareCommand } from './util'
-
-function createValidTaskFilter(containerName: string) {
-    return function (t: ECS.Task): t is ECS.Task & { taskArn: string } {
-        const managed = !!t.containers?.find(
-            c => c?.name === containerName && c.managedAgents?.find(a => a.name === 'ExecuteCommandAgent')
-        )
-
-        return t.taskArn !== undefined && managed
-    }
-}
-
-interface ContainerDescription extends ECS.ContainerDefinition {
-    readonly clusterArn: string
-    readonly taskRoleArn: string
-    readonly enableExecuteCommand?: boolean
-}
-
-export class Container {
-    public readonly id = this.description.name!
-
-    public constructor(private readonly client: DefaultEcsClient, public readonly description: ContainerDescription) {}
-
-    public async listTasks() {
-        const resp = await this.client.listTasks({ cluster: this.description.clusterArn })
-        const tasks = await this.client.describeTasks(this.description.clusterArn, resp)
-
-        return tasks.filter(createValidTaskFilter(this.description.name!))
-    }
-
-    public prepareCommandForTask(command: string, task: string) {
-        return prepareCommand(this.client, command, {
-            task,
-            container: this.description.name!,
-            cluster: this.description.clusterArn,
-        })
-    }
-
-    public getTreeItem() {
-        const item = new vscode.TreeItem(this.description.name!)
-
-        return Object.assign(item, {
-            iconPath: getIcon('aws-ecs-container'),
-            contextValue: this.description.enableExecuteCommand
-                ? 'awsEcsContainerNodeExecEnabled'
-                : 'awsEcsContainerNodeExecDisabled',
-        })
-    }
-
-    public toTreeNode(): ResourceTreeNode<this> {
-        return new ResourceTreeNode(this)
-    }
-}
-
-export class Service {
-    public readonly id = this.description.serviceArn!
-    public readonly arn = this.description.serviceArn!
-
-    private readonly onDidChangeEmitter = new vscode.EventEmitter<void>()
-    public readonly onDidChangeTreeItem = this.onDidChangeEmitter.event
-
-    public constructor(private readonly client: DefaultEcsClient, public readonly description: ECS.Service) {}
-
-    public async listContainers(): Promise<Container[]> {
-        const definition = await this.getDefinition()
-        const containers = definition.containerDefinitions ?? []
-
-        return containers.map(
-            c =>
-                new Container(this.client, {
-                    ...c,
-                    enableExecuteCommand: this.description.enableExecuteCommand,
-                    taskRoleArn: definition.taskRoleArn!,
-                    clusterArn: this.description.clusterArn!,
-                })
-        )
-    }
-
-    public async getDefinition() {
-        if (!this.description.taskDefinition) {
-            throw new Error(`No task definition found for ECS service ${this.id}`)
-        }
-
-        const resp = await this.client.describeTaskDefinition(this.description.taskDefinition!)
-
-        return resp.taskDefinition!
-    }
-
-    public getTreeItem() {
-        const item = new vscode.TreeItem(this.description.serviceName!)
-        item.description = this.description.status
-        item.iconPath = getIcon('aws-ecs-service')
-        item.tooltip = `${this.description.serviceArn}\nTask Definition: ${this.description.taskDefinition}`
-        item.contextValue = this.description.enableExecuteCommand
-            ? 'awsEcsServiceNode.ENABLED'
-            : 'awsEcsServiceNode.DISABLED'
-
-        return item
-    }
-
-    public async toggleExecuteCommand() {
-        await this.client.updateService({
-            cluster: this.description.clusterArn!,
-            service: this.description.serviceName!,
-            forceNewDeployment: true,
-            enableExecuteCommand: !this.description.enableExecuteCommand,
-        })
-
-        this.description.enableExecuteCommand = !this.description.enableExecuteCommand
-        this.onDidChangeEmitter.fire()
-    }
-
-    public toTreeNode(): ResourceTreeNode<this, Container> {
-        return new ResourceTreeNode(this, {
-            placeholder: localize('AWS.explorerNode.ecs.noContainers', '[No Containers found]'),
-            childrenProvider: {
-                onDidChange: this.onDidChangeEmitter.event,
-                listResources: async () => {
-                    const containers = await this.listContainers()
-
-                    return containers.map(c => c.toTreeNode())
-                },
-            },
-        })
-    }
-}
-
-export class Cluster {
-    public readonly id = this.cluster.clusterArn!
-
-    public constructor(private readonly client: DefaultEcsClient, private readonly cluster: ECS.Cluster) {}
-
-    public listServices(): AsyncCollection<Service[]> {
-        return this.client
-            .listServices({ cluster: this.cluster.clusterArn! })
-            .map(services => services.map(s => new Service(this.client, s)))
-    }
-
-    public getTreeItem() {
-        const item = new vscode.TreeItem(this.cluster.clusterName!)
-        item.tooltip = this.cluster.clusterArn!
-        item.iconPath = getIcon('aws-ecs-cluster')
-        item.contextValue = 'awsEcsClusterNode'
-
-        return item
-    }
-
-    public toTreeNode(): ResourceTreeNode<this, Service> {
-        return new ResourceTreeNode(this, {
-            placeholder: localize('AWS.explorerNode.ecs.noContainers', '[No Containers found]'),
-            childrenProvider: {
-                paginated: true,
-                listResources: () => this.listServices().map(services => services.map(s => s.toTreeNode())),
-            },
-        })
-    }
-}
-
-class Ecs {
-    public readonly id = 'ecs'
-    public constructor(private readonly client: DefaultEcsClient) {}
-
-    public getTreeItem() {
-        const item = new vscode.TreeItem('ECS')
-        item.contextValue = 'awsEcsNode'
-
-        return item
-    }
-
-    public listClusters(): AsyncCollection<Cluster[]> {
-        return this.client.listClusters().map(clusters => clusters.map(c => new Cluster(this.client, c)))
-    }
-}
-
-export function getEcsRootNode(region: string) {
-    const controller = new Ecs(new DefaultEcsClient(region))
-
-    return new ResourceTreeNode(controller, {
-        placeholder: localize('AWS.explorerNode.ecs.noClusters', '[No Clusters found]'),
-        childrenProvider: {
-            paginated: true,
-            listResources: () => controller.listClusters().map(clusters => clusters.map(c => c.toTreeNode())),
-        },
-    })
-}
diff --git a/src/ecs/util.ts b/src/ecs/util.ts
deleted file mode 100644
index 390f039522c..00000000000
--- a/src/ecs/util.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import globals from '../shared/extensionGlobals'
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as vscode from 'vscode'
-import { EcsClient } from '../shared/clients/ecsClient'
-import { IamClient } from '../shared/clients/iamClient'
-import { ToolkitError } from '../shared/errors'
-import { isCloud9 } from '../shared/extensionUtilities'
-import { getOrInstallCli } from '../shared/utilities/cliUtils'
-import { TaskDefinition } from 'aws-sdk/clients/ecs'
-import { getLogger } from '../shared/logger'
-import { SSM } from 'aws-sdk'
-import { fromExtensionManifest } from '../shared/settings'
-
-interface EcsTaskIdentifer {
-    readonly task: string
-    readonly cluster: string
-    readonly container: string
-}
-
-const permissionsDocumentation = vscode.Uri.parse(
-    'https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-exec.html#ecs-exec-enabling-and-using',
-    true
-)
-
-export async function checkPermissionsForSsm(
-    client: IamClient,
-    task: Pick<TaskDefinition, 'taskRoleArn'>
-): Promise<void | never> {
-    if (!task.taskRoleArn) {
-        throw new ToolkitError('Containers must have a task role ARN', {
-            code: 'NoTaskRoleArn',
-            documentationUri: permissionsDocumentation,
-        })
-    }
-
-    const deniedActions = await client.getDeniedActions({
-        PolicySourceArn: task.taskRoleArn,
-        ActionNames: [
-            'ssmmessages:CreateControlChannel',
-            'ssmmessages:CreateDataChannel',
-            'ssmmessages:OpenControlChannel',
-            'ssmmessages:OpenDataChannel',
-        ],
-    })
-
-    if (deniedActions.length !== 0) {
-        const message = localize(
-            'AWS.command.ecs.runCommandInContainer.missingPermissions',
-            'Insufficient permissions to execute command. Configure a task role as described in the documentation.'
-        )
-
-        throw new ToolkitError(message, {
-            code: 'MissingPermissions',
-            documentationUri: permissionsDocumentation,
-            details: { deniedActions: deniedActions.map(a => a.EvalActionName) },
-        })
-    }
-}
-
-export async function prepareCommand(
-    client: EcsClient,
-    command: string,
-    task: EcsTaskIdentifer
-): Promise<{ path: string; args: string[]; dispose: () => void }> {
-    const ssmPlugin = await getOrInstallCli('session-manager-plugin', !isCloud9())
-    const { session } = await client.executeCommand({ ...task, command })
-    const args = [JSON.stringify(session), client.regionCode, 'StartSession']
-
-    async function terminateSession() {
-        const sessionId = session!.sessionId!
-        const ssm = await globals.sdkClientBuilder.createAwsService(SSM, undefined, client.regionCode)
-        ssm.terminateSession({ SessionId: sessionId })
-            .promise()
-            .catch(err => {
-                getLogger().warn(`ecs: failed to terminate session "${sessionId}": %s`, err)
-            })
-    }
-
-    return { path: ssmPlugin, args, dispose: () => void terminateSession() }
-}
-
-export class EcsSettings extends fromExtensionManifest('aws.ecs', { openTerminalCommand: String }) {}
diff --git a/src/eventSchemas/activation.ts b/src/eventSchemas/activation.ts
deleted file mode 100644
index 3ea25e715f3..00000000000
--- a/src/eventSchemas/activation.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { downloadSchemaItemCode } from '../eventSchemas/commands/downloadSchemaItemCode'
-import { createSearchSchemasWebView } from './vue/searchSchemas'
-import { viewSchemaItem } from '../eventSchemas/commands/viewSchemaItem'
-import { RegistryItemNode } from '../eventSchemas/explorer/registryItemNode'
-import { SchemaItemNode } from '../eventSchemas/explorer/schemaItemNode'
-import { SchemasNode } from '../eventSchemas/explorer/schemasNode'
-import { ExtContext } from '../shared/extensions'
-import { Commands } from '../shared/vscode/commands2'
-
-/**
- * Activate Schemas functionality for the extension.
- */
-export async function activate(context: ExtContext): Promise<void> {
-    await registerSchemasCommands(context)
-}
-
-async function registerSchemasCommands(context: ExtContext): Promise<void> {
-    context.extensionContext.subscriptions.push(
-        Commands.register('aws.viewSchemaItem', async (node: SchemaItemNode) => await viewSchemaItem(node)),
-        Commands.register(
-            'aws.downloadSchemaItemCode',
-            async (node: SchemaItemNode) => await downloadSchemaItemCode(node, context.outputChannel)
-        ),
-        Commands.register(
-            'aws.searchSchema',
-            async (node: SchemasNode) => await createSearchSchemasWebView(context, node)
-        ),
-        Commands.register(
-            'aws.searchSchemaPerRegistry',
-            async (node: RegistryItemNode) => await createSearchSchemasWebView(context, node)
-        )
-    )
-}
diff --git a/src/eventSchemas/explorer/registryItemNode.ts b/src/eventSchemas/explorer/registryItemNode.ts
deleted file mode 100644
index 50a8b1af698..00000000000
--- a/src/eventSchemas/explorer/registryItemNode.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import { Schemas } from 'aws-sdk'
-import * as os from 'os'
-import * as vscode from 'vscode'
-
-import { listSchemaItems } from '../utils'
-
-import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
-import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
-import { makeChildrenNodes } from '../../shared/treeview/utils'
-import { toMapAsync, updateInPlace } from '../../shared/utilities/collectionUtils'
-import { SchemaItemNode } from './schemaItemNode'
-import { getIcon } from '../../shared/icons'
-import { SchemaClient } from '../../shared/clients/schemaClient'
-
-export class RegistryItemNode extends AWSTreeNodeBase {
-    private readonly schemaNodes: Map<string, SchemaItemNode>
-    public override readonly regionCode: string = this.client.regionCode
-
-    public constructor(private registryItemOutput: Schemas.RegistrySummary, private readonly client: SchemaClient) {
-        super('', vscode.TreeItemCollapsibleState.Collapsed)
-
-        this.update(registryItemOutput)
-        this.contextValue = 'awsRegistryItemNode'
-        this.schemaNodes = new Map<string, SchemaItemNode>()
-        this.iconPath = getIcon('aws-schemas-registry')
-    }
-
-    public get registryName(): string {
-        return (
-            this.registryItemOutput.RegistryName ||
-            localize('AWS.explorerNode.registry.registryName.Not.Found', 'Registry name not found')
-        )
-    }
-
-    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
-        return await makeChildrenNodes({
-            getChildNodes: async () => {
-                await this.updateChildren()
-
-                return [...this.schemaNodes.values()]
-            },
-            getNoChildrenPlaceholderNode: async () =>
-                new PlaceholderNode(this, localize('AWS.explorerNode.registry.noSchemas', '[No Registry Schemas]')),
-            sort: (nodeA, nodeB) => nodeA.schemaName.localeCompare(nodeB.schemaName),
-        })
-    }
-
-    public update(registryItemOutput: Schemas.RegistrySummary): void {
-        this.registryItemOutput = registryItemOutput
-        this.label = `${this.registryName}`
-        let registryArn = ''
-        if (this.registryItemOutput.RegistryArn) {
-            registryArn = `${os.EOL}${this.registryItemOutput.RegistryArn}`
-        }
-        this.tooltip = `${this.registryName}${registryArn}`
-    }
-
-    public async updateChildren(): Promise<void> {
-        const schemas = await toMapAsync(listSchemaItems(this.client, this.registryName), schema => schema.SchemaName)
-
-        updateInPlace(
-            this.schemaNodes,
-            schemas.keys(),
-            key => this.schemaNodes.get(key)!.update(schemas.get(key)!),
-            key => new SchemaItemNode(schemas.get(key)!, this.client, this.registryName)
-        )
-    }
-}
diff --git a/src/eventSchemas/utils.ts b/src/eventSchemas/utils.ts
deleted file mode 100644
index ddb43aad066..00000000000
--- a/src/eventSchemas/utils.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import { Schemas } from 'aws-sdk'
-import * as vscode from 'vscode'
-import { SchemaClient } from '../shared/clients/schemaClient'
-
-export async function* listRegistryItems(client: SchemaClient): AsyncIterableIterator<Schemas.RegistrySummary> {
-    const status = vscode.window.setStatusBarMessage(
-        localize('AWS.message.statusBar.loading.registries', 'Loading Registry Items...')
-    )
-
-    try {
-        yield* client.listRegistries()
-    } finally {
-        status.dispose()
-    }
-}
-
-export async function* listSchemaItems(
-    client: SchemaClient,
-    registryName: string
-): AsyncIterableIterator<Schemas.SchemaSummary> {
-    const status = vscode.window.setStatusBarMessage(
-        localize('AWS.message.statusBar.loading.schemaItems', 'Loading Schema Items...')
-    )
-
-    try {
-        yield* client.listSchemas(registryName)
-    } finally {
-        status.dispose()
-    }
-}
-
-export async function* searchSchemas(
-    client: SchemaClient,
-    keyword: string,
-    registryName: string
-): AsyncIterableIterator<Schemas.SearchSchemaSummary> {
-    const status = vscode.window.setStatusBarMessage(
-        localize('AWS.message.statusBar.searching.schemas', 'Searching Schemas...')
-    )
-
-    try {
-        yield* client.searchSchemas(keyword, registryName)
-    } finally {
-        status.dispose()
-    }
-}
diff --git a/src/eventSchemas/vue/index.ts b/src/eventSchemas/vue/index.ts
deleted file mode 100644
index a0a33e63e04..00000000000
--- a/src/eventSchemas/vue/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { createApp } from 'vue'
-import component from './searchSchemas.vue'
-
-const create = () => createApp(component)
-const app = create()
-app.mount('#vue-app')
-
-window.addEventListener('remount', () => {
-    app.unmount()
-    create().mount('#vue-app')
-})
diff --git a/src/extension.ts b/src/extension.ts
deleted file mode 100644
index eb6eb6cd07d..00000000000
--- a/src/extension.ts
+++ /dev/null
@@ -1,322 +0,0 @@
-/*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as nls from 'vscode-nls'
-
-import * as codecatalyst from './codecatalyst/activation'
-import { activate as activateAwsExplorer } from './awsexplorer/activation'
-import { activate as activateCloudWatchLogs } from './cloudWatchLogs/activation'
-import { initialize as initializeCredentials } from './credentials/activation'
-import { initializeAwsCredentialsStatusBarItem } from './credentials/awsCredentialsStatusBarItem'
-import { LoginManager } from './credentials/loginManager'
-import { CredentialsProviderManager } from './credentials/providers/credentialsProviderManager'
-import { SharedCredentialsProviderFactory } from './credentials/providers/sharedCredentialsProviderFactory'
-import { activate as activateSchemas } from './eventSchemas/activation'
-import { activate as activateLambda } from './lambda/activation'
-import { DefaultAWSClientBuilder } from './shared/awsClientBuilder'
-import { activate as activateCloudFormationTemplateRegistry } from './shared/cloudformation/activation'
-import { documentationUrl, endpointsFileUrl, githubCreateIssueUrl, githubUrl } from './shared/constants'
-import { DefaultAwsContext } from './shared/awsContext'
-import { AwsContextCommands } from './shared/awsContextCommands'
-import {
-    aboutToolkit,
-    getIdeProperties,
-    getToolkitEnvironmentDetails,
-    initializeComputeRegion,
-    showQuickStartWebview,
-    showWelcomeMessage,
-} from './shared/extensionUtilities'
-import { getLogger, Logger } from './shared/logger/logger'
-import { activate as activateLogger } from './shared/logger/activation'
-import { RegionProvider } from './shared/regions/regionProvider'
-import { EndpointsProvider } from './shared/regions/endpointsProvider'
-import { FileResourceFetcher } from './shared/resourcefetcher/fileResourceFetcher'
-import { HttpResourceFetcher } from './shared/resourcefetcher/httpResourceFetcher'
-import { activate as activateEcr } from './ecr/activation'
-import { activate as activateSam } from './shared/sam/activation'
-import { activate as activateTelemetry } from './shared/telemetry/activation'
-import { activate as activateS3 } from './s3/activation'
-import * as awsFiletypes from './shared/awsFiletypes'
-import { activate as activateCodeWhisperer, shutdown as codewhispererShutdown } from './codewhisperer/activation'
-import { ExtContext } from './shared/extensions'
-import { activate as activateApiGateway } from './apigateway/activation'
-import { activate as activateStepFunctions } from './stepFunctions/activation'
-import { activate as activateSsmDocument } from './ssmDocument/activation'
-import { activate as activateDynamicResources } from './dynamicResources/activation'
-import { activate as activateEcs } from './ecs/activation'
-import { activate as activateAppRunner } from './apprunner/activation'
-import { activate as activateIot } from './iot/activation'
-import { activate as activateDev } from './dev/activation'
-import { CredentialsStore } from './credentials/credentialsStore'
-import { getSamCliContext } from './shared/sam/cli/samCliContext'
-import * as extWindow from './shared/vscode/window'
-import { Ec2CredentialsProvider } from './credentials/providers/ec2CredentialsProvider'
-import { EnvVarsCredentialsProvider } from './credentials/providers/envVarsCredentialsProvider'
-import { EcsCredentialsProvider } from './credentials/providers/ecsCredentialsProvider'
-import { SchemaService } from './shared/schemas'
-import { AwsResourceManager } from './dynamicResources/awsResourceManager'
-import globals, { initialize } from './shared/extensionGlobals'
-import { join } from 'path'
-import { Experiments, Settings } from './shared/settings'
-import { getCodeCatalystDevEnvId, isReleaseVersion } from './shared/vscode/env'
-import { Commands, registerErrorHandler } from './shared/vscode/commands2'
-import { isUserCancelledError, ToolkitError } from './shared/errors'
-import { Logging } from './shared/logger/commands'
-import { UriHandler } from './shared/vscode/uriHandler'
-import { telemetry } from './shared/telemetry/telemetry'
-import { Auth } from './credentials/auth'
-
-let localize: nls.LocalizeFunc
-
-export async function activate(context: vscode.ExtensionContext) {
-    await initializeComputeRegion()
-    const activationStartedOn = Date.now()
-    localize = nls.loadMessageBundle()
-    initialize(context, extWindow.Window.vscode())
-    initializeManifestPaths(context)
-
-    const toolkitOutputChannel = vscode.window.createOutputChannel(
-        localize('AWS.channel.aws.toolkit', '{0} Toolkit', getIdeProperties().company)
-    )
-    await activateLogger(context, toolkitOutputChannel)
-    const remoteInvokeOutputChannel = vscode.window.createOutputChannel(
-        localize('AWS.channel.aws.remoteInvoke', '{0} Remote Invocations', getIdeProperties().company)
-    )
-    globals.outputChannel = toolkitOutputChannel
-
-    registerErrorHandler((info, error) => {
-        const defaultMessage = localize('AWS.generic.message.error', 'Failed to run command: {0}', info.id)
-        handleError(error, info.id, defaultMessage)
-    })
-
-    try {
-        initializeCredentialsProviderManager()
-
-        const endpointsProvider = makeEndpointsProvider()
-
-        const awsContext = new DefaultAwsContext()
-        globals.awsContext = awsContext
-        const regionProvider = RegionProvider.fromEndpointsProvider(endpointsProvider)
-        const credentialsStore = new CredentialsStore()
-        const loginManager = new LoginManager(globals.awsContext, credentialsStore)
-
-        const toolkitEnvDetails = getToolkitEnvironmentDetails()
-        // Splits environment details by new line, filter removes the empty string
-        toolkitEnvDetails
-            .split(/\r?\n/)
-            .filter(x => x)
-            .forEach(line => getLogger().info(line))
-
-        await initializeAwsCredentialsStatusBarItem(awsContext, context)
-        globals.regionProvider = regionProvider
-        globals.loginManager = loginManager
-        globals.awsContextCommands = new AwsContextCommands(regionProvider, Auth.instance)
-        globals.sdkClientBuilder = new DefaultAWSClientBuilder(awsContext)
-        globals.schemaService = new SchemaService(context)
-        globals.resourceManager = new AwsResourceManager(context)
-
-        const settings = Settings.instance
-        const experiments = Experiments.instance
-
-        await initializeCredentials(context, awsContext, settings, loginManager)
-        await activateTelemetry(context, awsContext, settings)
-
-        experiments.onDidChange(({ key }) => {
-            telemetry.aws_experimentActivation.run(span => {
-                // Record the key prior to reading the setting as `get` may throw
-                span.record({ experimentId: key })
-                span.record({ experimentState: experiments.get(key) ? 'activated' : 'deactivated' })
-            })
-        })
-
-        await globals.schemaService.start()
-        awsFiletypes.activate()
-
-        globals.uriHandler = new UriHandler()
-        context.subscriptions.push(vscode.window.registerUriHandler(globals.uriHandler))
-
-        const extContext: ExtContext = {
-            extensionContext: context,
-            awsContext: globals.awsContext,
-            samCliContext: getSamCliContext,
-            regionProvider: regionProvider,
-            outputChannel: toolkitOutputChannel,
-            invokeOutputChannel: remoteInvokeOutputChannel,
-            telemetryService: globals.telemetry,
-            uriHandler: globals.uriHandler,
-            credentialsStore,
-        }
-
-        try {
-            activateDev(extContext)
-        } catch (error) {
-            getLogger().debug(`Developer Tools (internal): failed to activate: ${(error as Error).message}`)
-        }
-
-        context.subscriptions.push(
-            // No-op command used for decoration-only codelenses.
-            vscode.commands.registerCommand('aws.doNothingCommand', () => {}),
-            // "Show AWS Commands..."
-            Commands.register('aws.listCommands', () =>
-                vscode.commands.executeCommand('workbench.action.quickOpen', `> ${getIdeProperties().company}:`)
-            ),
-            // register URLs in extension menu
-            Commands.register('aws.help', async () => {
-                vscode.env.openExternal(vscode.Uri.parse(documentationUrl))
-                telemetry.aws_help.emit()
-            }),
-            Commands.register('aws.github', async () => {
-                vscode.env.openExternal(vscode.Uri.parse(githubUrl))
-                telemetry.aws_showExtensionSource.emit()
-            }),
-            Commands.register('aws.createIssueOnGitHub', async () => {
-                vscode.env.openExternal(vscode.Uri.parse(githubCreateIssueUrl))
-                telemetry.aws_reportPluginIssue.emit()
-            }),
-            Commands.register('aws.quickStart', async () => {
-                try {
-                    await showQuickStartWebview(context)
-                } finally {
-                    telemetry.aws_helpQuickstart.emit({ result: 'Succeeded' })
-                }
-            }),
-            Commands.register('aws.aboutToolkit', async () => {
-                await aboutToolkit()
-            })
-        )
-
-        await codecatalyst.activate(extContext)
-
-        await activateCloudFormationTemplateRegistry(context)
-
-        await activateAwsExplorer({
-            context: extContext,
-            regionProvider,
-            toolkitOutputChannel,
-            remoteInvokeOutputChannel,
-        })
-
-        await activateAppRunner(extContext)
-
-        await activateApiGateway({
-            extContext: extContext,
-            outputChannel: remoteInvokeOutputChannel,
-        })
-
-        await activateLambda(extContext)
-
-        await activateSsmDocument(context, globals.awsContext, regionProvider, toolkitOutputChannel)
-
-        await activateSam(extContext)
-
-        await activateS3(extContext)
-
-        if (getCodeCatalystDevEnvId() === undefined) {
-            await activateCodeWhisperer(extContext)
-        }
-
-        await activateEcr(context)
-
-        await activateCloudWatchLogs(context, settings)
-
-        await activateDynamicResources(context)
-
-        await activateIot(extContext)
-
-        await activateEcs(extContext)
-
-        await activateSchemas(extContext)
-
-        await activateStepFunctions(context, awsContext, toolkitOutputChannel)
-
-        showWelcomeMessage(context)
-
-        recordToolkitInitialization(activationStartedOn, getLogger())
-
-        if (!isReleaseVersion()) {
-            globals.telemetry.assertPassiveTelemetry(globals.didReload)
-        }
-    } catch (error) {
-        const stacktrace = (error as Error).stack?.split('\n')
-        // truncate if the stacktrace is unusually long
-        if (stacktrace !== undefined && stacktrace.length > 40) {
-            stacktrace.length = 40
-        }
-        getLogger('channel').error(
-            localize(
-                'AWS.channel.aws.toolkit.activation.error',
-                'Error Activating {0} Toolkit: {1} \n{2}',
-                getIdeProperties().company,
-                (error as Error).message,
-                stacktrace?.join('\n')
-            )
-        )
-        throw error
-    }
-}
-
-// This is only being used for errors from commands although there's plenty of other places where it
-// could be used. It needs to be apart of some sort of `core` module that is guaranteed to initialize
-// prior to every other Toolkit component. Logging and telemetry would fit well within this core module.
-async function handleError(error: unknown, topic: string, defaultMessage: string) {
-    if (isUserCancelledError(error)) {
-        getLogger().verbose(`${topic}: user cancelled`)
-        return
-    }
-
-    const logsItem = localize('AWS.generic.message.viewLogs', 'View Logs...')
-    const logId = getLogger().error(`${topic}: %s`, error)
-    const message = error instanceof ToolkitError ? error.message : defaultMessage
-
-    await vscode.window.showErrorMessage(message, logsItem).then(async resp => {
-        if (resp === logsItem) {
-            await Logging.declared.viewLogsAtMessage.execute(logId)
-        }
-    })
-}
-
-export async function deactivate() {
-    await codewhispererShutdown()
-    await globals.telemetry.shutdown()
-    await globals.resourceManager.dispose()
-}
-
-function initializeManifestPaths(extensionContext: vscode.ExtensionContext) {
-    globals.manifestPaths.endpoints = extensionContext.asAbsolutePath(join('resources', 'endpoints.json'))
-    globals.manifestPaths.lambdaSampleRequests = extensionContext.asAbsolutePath(
-        join('resources', 'vs-lambda-sample-request-manifest.xml')
-    )
-}
-
-function initializeCredentialsProviderManager() {
-    const manager = CredentialsProviderManager.getInstance()
-    manager.addProviderFactory(new SharedCredentialsProviderFactory())
-    manager.addProviders(new Ec2CredentialsProvider(), new EcsCredentialsProvider(), new EnvVarsCredentialsProvider())
-}
-
-function makeEndpointsProvider(): EndpointsProvider {
-    const localManifestFetcher = new FileResourceFetcher(globals.manifestPaths.endpoints)
-    const remoteManifestFetcher = new HttpResourceFetcher(endpointsFileUrl, { showUrl: true })
-
-    const provider = new EndpointsProvider(localManifestFetcher, remoteManifestFetcher)
-
-    return provider
-}
-
-function recordToolkitInitialization(activationStartedOn: number, logger?: Logger) {
-    try {
-        const activationFinishedOn = Date.now()
-        const duration = activationFinishedOn - activationStartedOn
-
-        telemetry.toolkit_init.emit({ duration })
-    } catch (err) {
-        logger?.error(err as Error)
-    }
-}
-
-// Unique extension entrypoint names, so that they can be obtained from the webpack bundle
-export const awsToolkitActivate = activate
-export const awsToolkitDeactivate = deactivate
diff --git a/src/feedback/vue/index.ts b/src/feedback/vue/index.ts
deleted file mode 100644
index f8cac4b4cb4..00000000000
--- a/src/feedback/vue/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { createApp } from 'vue'
-import component from './submitFeedback.vue'
-
-const create = () => createApp(component)
-const app = create()
-app.mount('#vue-app')
-
-window.addEventListener('remount', () => {
-    app.unmount()
-    create().mount('#vue-app')
-})
diff --git a/src/feedback/vue/submitFeedback.ts b/src/feedback/vue/submitFeedback.ts
deleted file mode 100644
index dcd9625837a..00000000000
--- a/src/feedback/vue/submitFeedback.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import globals from '../../shared/extensionGlobals'
-import { ExtContext } from '../../shared/extensions'
-
-import { getLogger } from '../../shared/logger'
-import * as vscode from 'vscode'
-import { TelemetryService } from '../../shared/telemetry/telemetryService'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { VueWebview, VueWebviewPanel } from '../../webviews/main'
-import { telemetry } from '../../shared/telemetry/telemetry'
-
-export interface FeedbackMessage {
-    comment: string
-    sentiment: string
-}
-
-export class FeedbackWebview extends VueWebview {
-    public readonly id = 'submitFeedback'
-    public readonly source = 'src/feedback/vue/index.js'
-
-    public constructor(private readonly telemetry: TelemetryService) {
-        super()
-    }
-
-    public async submit(message: FeedbackMessage): Promise<string | void> {
-        const logger = getLogger()
-
-        if (!message.sentiment) {
-            return 'Choose a reaction (smile/frown)'
-        }
-
-        try {
-            await this.telemetry.postFeedback({
-                comment: message.comment,
-                sentiment: message.sentiment,
-            })
-        } catch (err) {
-            const errorMessage = (err as Error).message || 'Failed to submit feedback'
-            logger.error(`feedback failed: "${message.sentiment}": ${errorMessage}`)
-
-            telemetry.feedback_result.emit({ result: 'Failed' })
-
-            return errorMessage
-        }
-
-        logger.info(`feedback sent: "${message.sentiment}"`)
-
-        telemetry.feedback_result.emit({ result: 'Succeeded' })
-
-        this.dispose()
-
-        vscode.window.showInformationMessage(
-            localize('AWS.message.info.submitFeedback.success', 'Thanks for the feedback!')
-        )
-    }
-}
-
-const Panel = VueWebview.compilePanel(FeedbackWebview)
-
-let activeWebview: VueWebviewPanel | undefined
-
-export async function submitFeedback(context: ExtContext) {
-    activeWebview ??= new Panel(context.extensionContext, globals.telemetry)
-
-    const webviewPanel = await activeWebview.show({
-        title: localize('AWS.submitFeedback.title', 'Send Feedback'),
-        cssFiles: ['submitFeedback.css'],
-    })
-
-    webviewPanel.onDidDispose(() => (activeWebview = undefined))
-}
diff --git a/src/feedback/vue/submitFeedback.vue b/src/feedback/vue/submitFeedback.vue
deleted file mode 100644
index 4444f2c1223..00000000000
--- a/src/feedback/vue/submitFeedback.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-/*! * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */
-
-<template>
-    <div>
-        <div class="container button-container" style="justify-content: space-between">
-            <h1>Feedback for AWS Toolkit</h1>
-            <div id="error" v-if="error !== ''" style="margin-right: 10px">
-                <strong>{{ error }}</strong>
-            </div>
-            <div>
-                <input v-if="isSubmitting" type="submit" value="Submitting..." disabled />
-                <input v-else type="submit" @click="submitFeedback" :disabled="comment.length > 2000" value="Send" />
-            </div>
-        </div>
-
-        <h3 id="sentiment-heading">How was your experience?</h3>
-        <div>
-            <input id="positive-sentiment" type="radio" value="Positive" v-model="sentiment" />
-            <label for="positive-sentiment"></label>
-            <input id="negative-sentiment" type="radio" value="Negative" v-model="sentiment" />
-            <label for="negative-sentiment"></label>
-        </div>
-
-        <h3 id="feedback-heading">Feedback</h3>
-
-        <div>
-            <div>
-                <div style="margin-bottom: 10px">
-                    <div
-                        style="float: right; font-size: smaller"
-                        id="remaining"
-                        :class="comment.length > 2000 ? 'exceeds-max-length' : ''"
-                    >
-                        {{ 2000 - comment.length }} characters remaining
-                    </div>
-                    <div>
-                        <em
-                            >Feedback is <b>anonymous</b>. If you need a reply,
-                            <a href="https://github.com/aws/aws-toolkit-vscode/issues/new/choose"
-                                >contact us on GitHub</a
-                            >.</em
-                        >
-                    </div>
-                </div>
-            </div>
-            <textarea style="width: 100%; margin-bottom: 10px" rows="10" cols="90" v-model="comment"></textarea>
-        </div>
-    </div>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue'
-import { WebviewClientFactory } from '../../webviews/client'
-import saveData from '../../webviews/mixins/saveData'
-import { FeedbackWebview } from './submitFeedback'
-
-const client = WebviewClientFactory.create<FeedbackWebview>()
-
-export default defineComponent({
-    data() {
-        return {
-            comment: '',
-            sentiment: '',
-            isSubmitting: false,
-            error: '',
-        }
-    },
-    methods: {
-        async submitFeedback() {
-            this.error = ''
-            this.isSubmitting = true
-            console.log('Submitting feedback...')
-
-            const resp = await client.submit({
-                comment: this.comment,
-                sentiment: this.sentiment,
-            })
-
-            this.error = resp ?? ''
-            this.isSubmitting = false
-        },
-    },
-    mixins: [saveData],
-})
-</script>
diff --git a/src/integrationTest/cloudformation/templateRegistry.test.ts b/src/integrationTest/cloudformation/templateRegistry.test.ts
deleted file mode 100644
index e8197a8b032..00000000000
--- a/src/integrationTest/cloudformation/templateRegistry.test.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as path from 'path'
-import * as fs from 'fs-extra'
-
-import { CloudFormationTemplateRegistry } from '../../shared/fs/templateRegistry'
-import { makeSampleSamTemplateYaml, strToYamlFile } from '../../test/shared/cloudformation/cloudformationTestUtils'
-import { getTestWorkspaceFolder } from '../integrationTestsUtilities'
-import { sleep, waitUntil } from '../../shared/utilities/timeoutUtils'
-import { isMinimumVersion } from '../../shared/vscode/env'
-
-/**
- * Note: these tests are pretty shallow right now. They do not test the following:
- * * Adding/removing workspace folders
- */
-describe('CloudFormation Template Registry', async function () {
-    let registry: CloudFormationTemplateRegistry
-    let workspaceDir: string
-    let testDir: string
-    let testDirNested: string
-    let dir: number = 0
-
-    before(async function () {
-        workspaceDir = getTestWorkspaceFolder()
-    })
-
-    beforeEach(async function () {
-        testDir = path.join(workspaceDir, dir.toString())
-        testDirNested = path.join(testDir, 'nested')
-        await fs.mkdirp(testDirNested)
-        registry = new CloudFormationTemplateRegistry()
-        dir++
-    })
-
-    afterEach(async function () {
-        registry.dispose()
-        await fs.remove(testDir)
-    })
-
-    it('adds initial template files with yaml and yml extensions at various nesting levels', async function () {
-        await strToYamlFile(makeSampleSamTemplateYaml(true), path.join(testDir, 'test.yaml'))
-        await strToYamlFile(makeSampleSamTemplateYaml(false), path.join(testDirNested, 'test.yml'))
-
-        await registry.addWatchPattern('**/test.{yaml,yml}')
-
-        await registryHasTargetNumberOfFiles(registry, 2)
-    })
-
-    it('adds dynamically-added template files with yaml and yml extensions at various nesting levels', async function () {
-        if (!isMinimumVersion()) {
-            this.skip()
-        }
-        await registry.addWatchPattern('**/test.{yaml,yml}')
-
-        await strToYamlFile(makeSampleSamTemplateYaml(false), path.join(testDir, 'test.yml'))
-        await strToYamlFile(makeSampleSamTemplateYaml(true), path.join(testDirNested, 'test.yaml'))
-
-        await registryHasTargetNumberOfFiles(registry, 2)
-    })
-
-    it('Ignores templates matching excluded patterns', async function () {
-        await registry.addWatchPattern('**/test.{yaml,yml}')
-        await registry.addExcludedPattern(/.*nested.*/)
-
-        await strToYamlFile(makeSampleSamTemplateYaml(false), path.join(testDir, 'test.yml'))
-        await strToYamlFile(makeSampleSamTemplateYaml(true), path.join(testDirNested, 'test.yaml'))
-
-        await registryHasTargetNumberOfFiles(registry, 1)
-    })
-
-    it('can handle changed files', async function () {
-        const filepath = path.join(testDir, 'changeMe.yml')
-        await strToYamlFile(makeSampleSamTemplateYaml(false), filepath)
-
-        await registry.addWatchPattern('**/changeMe.yml')
-
-        await registryHasTargetNumberOfFiles(registry, 1)
-
-        await queryRegistryForFileWithGlobalsKeyStatus(registry, filepath, false)
-
-        await strToYamlFile(makeSampleSamTemplateYaml(true), filepath)
-
-        await queryRegistryForFileWithGlobalsKeyStatus(registry, filepath, true)
-    })
-
-    it('can handle deleted files', async function () {
-        await registry.addWatchPattern('**/deleteMe.yml')
-
-        // Specifically creating the file after the watcher is added
-        // Otherwise, it seems the file is deleted before the file watcher realizes the file exists
-        // This way, we know that a file watcher detects the create event on this file and thus is tracking it
-        const filepath = path.join(testDir, 'deleteMe.yml')
-        await strToYamlFile(makeSampleSamTemplateYaml(false), filepath)
-
-        await registryHasTargetNumberOfFiles(registry, 1)
-
-        await fs.remove(filepath)
-
-        await registryHasTargetNumberOfFiles(registry, 0)
-    })
-})
-
-async function registryHasTargetNumberOfFiles(registry: CloudFormationTemplateRegistry, target: number) {
-    if (!(await waitUntil(async () => registry.registeredItems.length === target, { timeout: 30000 }))) {
-        throw new Error(
-            `watchedFiles found wrong number files: expected ${target}, got ${registry.registeredItems.length}`
-        )
-    }
-}
-
-async function queryRegistryForFileWithGlobalsKeyStatus(
-    registry: CloudFormationTemplateRegistry,
-    filepath: string,
-    hasGlobals: boolean
-) {
-    let foundMatch = false
-    while (!foundMatch) {
-        await sleep(20)
-        const obj = registry.getRegisteredItem(filepath)
-        if (obj) {
-            foundMatch = Object.keys(obj.item).includes('Globals') === hasGlobals
-        }
-    }
-}
diff --git a/src/integrationTest/globalSetup.test.ts b/src/integrationTest/globalSetup.test.ts
deleted file mode 100644
index a4b922965c8..00000000000
--- a/src/integrationTest/globalSetup.test.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-/*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * Before/After hooks for all integration tests.
- */
-import * as assert from 'assert'
-import { VSCODE_EXTENSION_ID } from '../shared/extensions'
-import { getLogger } from '../shared/logger'
-import { WinstonToolkitLogger } from '../shared/logger/winstonToolkitLogger'
-import { activateExtension } from '../shared/utilities/vsCodeUtils'
-
-// ASSUMPTION: Tests are not run concurrently
-
-const timeout: { id: NodeJS.Timeout | undefined; name: string | undefined } = { id: undefined, name: undefined }
-function clearTestTimeout() {
-    if (timeout.id !== undefined) {
-        clearTimeout(timeout.id)
-        timeout.id = undefined
-        timeout.name = undefined
-    }
-}
-
-/**
- * Used in integration tests to avoid hangs, because Mocha's timeout() does not
- * seem to work.
- *
- * TODO: See if Mocha's timeout() works after upgrading to Mocha
- * 8.x, then this function can be removed.
- */
-export function setTestTimeout(testName: string | undefined, ms: number) {
-    if (!testName) {
-        throw Error()
-    }
-    if (timeout.id !== undefined) {
-        throw Error(`timeout set by previous test was not cleared: "${timeout.name}"`)
-    }
-    timeout.name = testName
-    timeout.id = setTimeout(function () {
-        const name = timeout.name
-        clearTestTimeout()
-        assert.fail(`Exceeded timeout of ${(ms / 1000).toFixed(1)} seconds: "${name}"`)
-    }, ms)
-}
-
-// Before all tests begin, once only:
-before(async function () {
-    console.log('globalSetup: before()')
-    // Needed for getLogger().
-    await activateExtension(VSCODE_EXTENSION_ID.awstoolkit, false)
-
-    // Log as much as possible, useful for debugging integration tests.
-    getLogger().setLogLevel('debug')
-    if (getLogger() instanceof WinstonToolkitLogger) {
-        ;(getLogger() as WinstonToolkitLogger).logToConsole()
-    }
-})
-// After all tests end, once only:
-after(async function () {
-    console.log('globalSetup: after()')
-})
-
-afterEach(function () {
-    clearTestTimeout()
-})
-
-// TODO: migrate to mochaHooks (requires mocha 8.x)
-// https://mochajs.org/#available-root-hooks
-//
-// export mochaHooks = {
-//     // Before all tests begin, once only:
-//     beforeAll(async () => {
-//         // Needed for getLogger().
-//         await activateExtension(VSCODE_EXTENSION_ID.awstoolkit)
-//     }),
-//     // After all tests end, once only:
-//     afterAll(async () => {
-//     }),
-// }
diff --git a/src/integrationTest/index.ts b/src/integrationTest/index.ts
deleted file mode 100644
index bcdf75a2dc1..00000000000
--- a/src/integrationTest/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { runTests } from '../test/testRunner'
-
-export function run(): Promise<void> {
-    return runTests('src/integrationTest', ['src/integrationTest/globalSetup.test.ts'])
-}
diff --git a/src/integrationTest/sam.test.ts b/src/integrationTest/sam.test.ts
deleted file mode 100644
index 04e5a2d9904..00000000000
--- a/src/integrationTest/sam.test.ts
+++ /dev/null
@@ -1,655 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { Runtime } from 'aws-sdk/clients/lambda'
-import { mkdirpSync, mkdtemp } from 'fs-extra'
-import * as path from 'path'
-import * as semver from 'semver'
-import * as vscode from 'vscode'
-import * as vscodeUtils from '../../src/shared/utilities/vsCodeUtils'
-import { DependencyManager } from '../../src/lambda/models/samLambdaRuntime'
-import { helloWorldTemplate } from '../../src/lambda/models/samTemplates'
-import { getSamCliContext } from '../../src/shared/sam/cli/samCliContext'
-import { runSamCliInit, SamCliInitArgs } from '../../src/shared/sam/cli/samCliInit'
-import { Language } from '../shared/codelens/codeLensUtils'
-import { VSCODE_EXTENSION_ID } from '../shared/extensions'
-import { fileExists, tryRemoveFolder } from '../shared/filesystemUtilities'
-import { AddSamDebugConfigurationInput } from '../shared/sam/debugger/commands/addSamDebugConfiguration'
-import { findParentProjectFile } from '../shared/utilities/workspaceUtils'
-import * as testUtils from './integrationTestsUtilities'
-import { setTestTimeout } from './globalSetup.test'
-import { waitUntil } from '../shared/utilities/timeoutUtils'
-import { AwsSamDebuggerConfiguration } from '../shared/sam/debugger/awsSamDebugConfiguration.gen'
-import { AwsSamTargetType } from '../shared/sam/debugger/awsSamDebugConfiguration'
-import { insertTextIntoFile } from '../shared/utilities/textUtilities'
-import { sleep } from '../shared/utilities/timeoutUtils'
-import globals from '../shared/extensionGlobals'
-import { closeAllEditors } from '../test/testUtil'
-
-const projectFolder = testUtils.getTestWorkspaceFolder()
-
-/* Test constants go here */
-const codelensTimeout: number = 60000
-const codelensRetryInterval: number = 200
-// note: this refers to the _test_ timeout, not the invocation timeout
-const debugTimeout: number = 240000
-const noDebugSessionTimeout: number = 5000
-const noDebugSessionInterval: number = 100
-
-/** Go can't handle API tests yet */
-const skipLanguagesOnApi = ['go']
-
-interface TestScenario {
-    displayName: string
-    runtime: Runtime
-    baseImage?: string
-    path: string
-    debugSessionType: string
-    language: Language
-    dependencyManager: DependencyManager
-    /** Minimum vscode version required by the relevant third-party extension. */
-    vscodeMinimum: string
-}
-
-// When testing additional runtimes, consider pulling the docker container in buildspec\linuxIntegrationTests.yml
-// to reduce the chance of automated tests timing out.
-const scenarios: TestScenario[] = [
-    // zips
-    {
-        runtime: 'nodejs14.x',
-        displayName: 'nodejs14.x (ZIP)',
-        path: 'hello-world/app.js',
-        debugSessionType: 'pwa-node',
-        language: 'javascript',
-        dependencyManager: 'npm',
-        vscodeMinimum: '1.50.0',
-    },
-    {
-        runtime: 'nodejs16.x',
-        displayName: 'nodejs16.x (ZIP)',
-        path: 'hello-world/app.js',
-        debugSessionType: 'pwa-node',
-        language: 'javascript',
-        dependencyManager: 'npm',
-        vscodeMinimum: '1.50.0',
-    },
-    {
-        runtime: 'nodejs18.x',
-        displayName: 'nodejs18.x (ZIP)',
-        path: 'hello-world/app.mjs',
-        debugSessionType: 'pwa-node',
-        language: 'javascript',
-        dependencyManager: 'npm',
-        vscodeMinimum: '1.50.0',
-    },
-    // {
-    //     runtime: 'python3.7',
-    //     displayName: 'python3.7 (ZIP)',
-    //     path: 'hello_world/app.py',
-    //     debugSessionType: 'python',
-    //     language: 'python',
-    //     dependencyManager: 'pip',
-    //     vscodeMinimum: '1.50.0',
-    // },
-    // {
-    //     runtime: 'python3.8',
-    //     displayName: 'python3.8 (ZIP)',
-    //     path: 'hello_world/app.py',
-    //     debugSessionType: 'python',
-    //     language: 'python',
-    //     dependencyManager: 'pip',
-    //     vscodeMinimum: '1.50.0',
-    // },
-    // TODO: Add Python3.9 support to integration test hosts
-    // {
-    //     runtime: 'python3.9',
-    //     displayName: 'python3.9 (ZIP)',
-    //     path: 'hello_world/app.py',
-    //     debugSessionType: 'python',
-    //     language: 'python',
-    //     dependencyManager: 'pip',
-    // },
-    {
-        runtime: 'java8',
-        displayName: 'java8 (Gradle ZIP)',
-        path: 'HelloWorldFunction/src/main/java/helloworld/App.java',
-        debugSessionType: 'java',
-        language: 'java',
-        dependencyManager: 'gradle',
-        vscodeMinimum: '1.50.0',
-    },
-    {
-        runtime: 'java8.al2',
-        displayName: 'java8.al2 (Maven ZIP)',
-        path: 'HelloWorldFunction/src/main/java/helloworld/App.java',
-        debugSessionType: 'java',
-        language: 'java',
-        dependencyManager: 'maven',
-        vscodeMinimum: '1.50.0',
-    },
-    {
-        runtime: 'java11',
-        displayName: 'java11 (Gradle ZIP)',
-        path: 'HelloWorldFunction/src/main/java/helloworld/App.java',
-        debugSessionType: 'java',
-        language: 'java',
-        dependencyManager: 'gradle',
-        vscodeMinimum: '1.50.0',
-    },
-    {
-        runtime: 'go1.x',
-        displayName: 'go1.x (ZIP)',
-        path: 'hello-world/main.go',
-        debugSessionType: 'delve',
-        language: 'go',
-        dependencyManager: 'mod',
-        // https://github.com/golang/vscode-go/blob/master/package.json
-        vscodeMinimum: '1.59.0',
-    },
-    // { runtime: 'dotnetcore3.1', path: 'src/HelloWorld/Function.cs', debugSessionType: 'coreclr', language: 'csharp' },
-
-    // images
-    {
-        runtime: 'nodejs14.x',
-        displayName: 'nodejs14.x (Image)',
-        baseImage: `amazon/nodejs14.x-base`,
-        path: 'hello-world/app.js',
-        debugSessionType: 'pwa-node',
-        language: 'javascript',
-        dependencyManager: 'npm',
-        vscodeMinimum: '1.50.0',
-    },
-    {
-        runtime: 'nodejs16.x',
-        displayName: 'nodejs16.x (Image)',
-        baseImage: `amazon/nodejs16.x-base`,
-        path: 'hello-world/app.js',
-        debugSessionType: 'pwa-node',
-        language: 'javascript',
-        dependencyManager: 'npm',
-        vscodeMinimum: '1.50.0',
-    },
-    {
-        runtime: 'nodejs18.x',
-        displayName: 'nodejs18.x (Image)',
-        baseImage: `amazon/nodejs18.x-base`,
-        path: 'hello-world/app.mjs',
-        debugSessionType: 'pwa-node',
-        language: 'javascript',
-        dependencyManager: 'npm',
-        vscodeMinimum: '1.50.0',
-    },
-    // {
-    //     runtime: 'python3.7',
-    //     displayName: 'python3.7 (Image)',
-    //     baseImage: `amazon/python3.7-base`,
-    //     path: 'hello_world/app.py',
-    //     debugSessionType: 'python',
-    //     language: 'python',
-    //     dependencyManager: 'pip',
-    //     vscodeMinimum: '1.50.0',
-    // },
-    // {
-    //     runtime: 'python3.8',
-    //     displayName: 'python3.8 (Image)',
-    //     baseImage: `amazon/python3.8-base`,
-    //     path: 'hello_world/app.py',
-    //     debugSessionType: 'python',
-    //     language: 'python',
-    //     dependencyManager: 'pip',
-    //     vscodeMinimum: '1.50.0',
-    // },
-    // TODO: Add Python3.9 support to integration test hosts
-    // {
-    //     runtime: 'python3.9',
-    //     displayName: 'python3.9 (Image)',
-    //     baseImage: `amazon/python3.9-base`,
-    //     path: 'hello_world/app.py',
-    //     debugSessionType: 'python',
-    //     language: 'python',
-    //     dependencyManager: 'pip',
-    // },
-    {
-        runtime: 'go1.x',
-        displayName: 'go1.x (Image)',
-        baseImage: 'amazon/go1.x-base',
-        path: 'hello-world/main.go',
-        debugSessionType: 'delve',
-        language: 'go',
-        dependencyManager: 'mod',
-        // https://github.com/golang/vscode-go/blob/master/package.json
-        vscodeMinimum: '1.59.0',
-    },
-    {
-        runtime: 'java8',
-        displayName: 'java8 (Maven Image)',
-        path: 'HelloWorldFunction/src/main/java/helloworld/App.java',
-        baseImage: `amazon/java8-base`,
-        debugSessionType: 'java',
-        language: 'java',
-        dependencyManager: 'maven',
-        vscodeMinimum: '1.50.0',
-    },
-    {
-        runtime: 'java8.al2',
-        displayName: 'java8.al2 (Gradle Image)',
-        path: 'HelloWorldFunction/src/main/java/helloworld/App.java',
-        baseImage: `amazon/java8.al2-base`,
-        debugSessionType: 'java',
-        language: 'java',
-        dependencyManager: 'gradle',
-        vscodeMinimum: '1.50.0',
-    },
-    {
-        runtime: 'java11',
-        displayName: 'java11 (Maven Image)',
-        path: 'HelloWorldFunction/src/main/java/helloworld/App.java',
-        baseImage: `amazon/java11-base`,
-        debugSessionType: 'java',
-        language: 'java',
-        dependencyManager: 'maven',
-        vscodeMinimum: '1.50.0',
-    },
-    // { runtime: 'dotnetcore3.1', path: 'src/HelloWorld/Function.cs', debugSessionType: 'coreclr', language: 'csharp' },
-]
-
-async function openSamAppFile(applicationPath: string): Promise<vscode.Uri> {
-    const document = await vscode.workspace.openTextDocument(applicationPath)
-
-    return document.uri
-}
-
-/**
- * Returns a string if there is a validation issue, undefined if there is no issue.
- */
-function validateSamDebugSession(
-    debugSession: vscode.DebugSession,
-    expectedName: string,
-    expectedRuntime: string
-): string | undefined {
-    const runtime = (debugSession.configuration as any).runtime
-    const name = (debugSession.configuration as any).name
-    if (name !== expectedName || runtime !== expectedRuntime) {
-        const failMsg =
-            `Unexpected DebugSession (expected name="${expectedName}" runtime="${expectedRuntime}"):` +
-            `\n${JSON.stringify(debugSession)}`
-        return failMsg
-    }
-}
-
-/**
- * Simulates pressing 'F5' to start debugging. Sets up events to see if debugging was successful
- * or not. Since we are not checking outputs we treat a successful operation as the debug session
- * closing on its own (i.e. the container executable terminated)
- *
- * @param scenario Scenario to run, used for logging information
- * @param scenarioIndex Scenario number, used for logging information
- * @param testConfig Debug configuration to start the debugging with
- * @param testDisposables All events registered by this function are pushed here to be removed later
- * @param sessionLog An array where session logs are stored
- */
-async function startDebugger(
-    scenario: TestScenario,
-    scenarioIndex: number,
-    target: AwsSamTargetType,
-    testConfig: vscode.DebugConfiguration,
-    testDisposables: vscode.Disposable[],
-    sessionLog: string[]
-) {
-    function logSession(startEnd: 'START' | 'END' | 'EXIT' | 'FAIL', name: string) {
-        sessionLog.push(
-            `scenario ${scenarioIndex}.${target.toString()[0]} ${startEnd.padEnd(5, ' ')} ${target}/${
-                scenario.displayName
-            }: ${name}`
-        )
-    }
-
-    // Create a Promise that encapsulates our success critera
-    const success = new Promise<void>((resolve, reject) => {
-        testDisposables.push(
-            vscode.debug.onDidTerminateDebugSession(async session => {
-                logSession('END', session.name)
-                const sessionRuntime = (session.configuration as any).runtime
-                if (!sessionRuntime) {
-                    // It's a coprocess, ignore it.
-                    return
-                }
-                const failMsg = validateSamDebugSession(session, testConfig.name, scenario.runtime)
-                if (failMsg) {
-                    reject(new Error(failMsg))
-                }
-                resolve()
-                await stopDebugger(`${scenario.runtime} / onDidTerminateDebugSession`)
-            })
-        )
-    })
-
-    // Executes the 'F5' action
-    await vscode.debug.startDebugging(undefined, testConfig)
-    if (!vscode.debug.activeDebugSession) {
-        logSession('EXIT', `${testConfig.name} (exited immediately)`)
-        return
-    }
-    logSession('START', vscode.debug.activeDebugSession.name)
-    await sleep(400)
-    await continueDebugger()
-    await sleep(400)
-    await continueDebugger()
-    await sleep(400)
-    await continueDebugger()
-
-    return success
-}
-
-async function continueDebugger(): Promise<void> {
-    await vscode.commands.executeCommand('workbench.action.debug.continue')
-}
-
-async function stopDebugger(logMsg: string | undefined): Promise<void> {
-    if (logMsg) {
-        console.log(`sam.test.ts: stopDebugger(): ${logMsg}`)
-    }
-    await vscode.commands.executeCommand('workbench.action.debug.stop')
-}
-
-async function activateExtensions(): Promise<void> {
-    console.log('Activating extensions...')
-    await vscodeUtils.activateExtension(VSCODE_EXTENSION_ID.python, false)
-    await vscodeUtils.activateExtension(VSCODE_EXTENSION_ID.go, false)
-    await vscodeUtils.activateExtension(VSCODE_EXTENSION_ID.java, false)
-    await vscodeUtils.activateExtension(VSCODE_EXTENSION_ID.javadebug, false)
-    console.log('Extensions activated')
-}
-
-describe('SAM Integration Tests', async function () {
-    const samApplicationName = 'testProject'
-    /**
-     * Breadcrumbs from each process, printed at end of all scenarios to give
-     * us an idea of the timeline.
-     */
-    const sessionLog: string[] = []
-    let javaLanguageSetting: string | undefined
-    const config = vscode.workspace.getConfiguration('java')
-    let testSuiteRoot: string
-
-    before(async function () {
-        javaLanguageSetting = config.get('server.launchMode')
-        config.update('server.launchMode', 'Standard')
-
-        await activateExtensions()
-        await testUtils.configureAwsToolkitExtension()
-        await testUtils.configurePythonExtension()
-        await testUtils.configureGoExtension()
-
-        testSuiteRoot = await mkdtemp(path.join(projectFolder, 'inttest'))
-        console.log('testSuiteRoot: ', testSuiteRoot)
-        mkdirpSync(testSuiteRoot)
-    })
-
-    after(async function () {
-        await tryRemoveFolder(testSuiteRoot)
-        // Print a summary of session that were seen by `onDidStartDebugSession`.
-        const sessionReport = sessionLog.map(x => `    ${x}`).join('\n')
-        config.update('server.launchMode', javaLanguageSetting)
-        console.log(`DebugSessions seen in this run:\n${sessionReport}`)
-    })
-
-    describe('SAM install test', async () => {
-        let runtimeTestRoot: string
-        let randomTestScenario: TestScenario
-
-        before(async function () {
-            if (scenarios.length == 0) {
-                throw new Error('There are no scenarios available.')
-            }
-            randomTestScenario = scenarios[0]
-
-            runtimeTestRoot = path.join(testSuiteRoot, 'randomScenario')
-            mkdirpSync(runtimeTestRoot)
-        })
-
-        after(async function () {
-            await tryRemoveFolder(runtimeTestRoot)
-        })
-
-        it('produces an error when creating a SAM Application to the same location', async function () {
-            await createSamApplication(runtimeTestRoot, randomTestScenario)
-            await assert.rejects(createSamApplication(runtimeTestRoot, randomTestScenario), 'Promise was not rejected')
-        })
-    })
-
-    for (let scenarioIndex = 0; scenarioIndex < scenarios.length; scenarioIndex++) {
-        const scenario = scenarios[scenarioIndex]
-
-        describe(`SAM runtime: ${scenario.displayName}`, async function () {
-            let runtimeTestRoot: string
-
-            before(async function () {
-                runtimeTestRoot = path.join(testSuiteRoot, scenario.runtime)
-                console.log('runtimeTestRoot: ', runtimeTestRoot)
-                mkdirpSync(runtimeTestRoot)
-            })
-
-            after(async function () {
-                // don't clean up after java tests so the java language server doesn't freak out
-                if (scenario.language !== 'java') {
-                    await tryRemoveFolder(runtimeTestRoot)
-                }
-            })
-
-            function log(o: any) {
-                console.log(`sam.test.ts: scenario ${scenarioIndex} (${scenario.displayName}): ${o}`)
-            }
-
-            /**
-             * This suite makes a sam app that all tests operate on.
-             * Cleanup happens at the end of the suite.
-             */
-            describe(`Starting with a newly created ${scenario.displayName} SAM Application...`, async function () {
-                let testDisposables: vscode.Disposable[]
-
-                let testDir: string
-                let samAppCodeUri: vscode.Uri
-                let appPath: string
-                let cfnTemplatePath: string
-
-                before(async function () {
-                    testDir = await mkdtemp(path.join(runtimeTestRoot, 'samapp-'))
-                    log(`testDir: ${testDir}`)
-
-                    await createSamApplication(testDir, scenario)
-                    appPath = path.join(testDir, samApplicationName, scenario.path)
-
-                    cfnTemplatePath = path.join(testDir, samApplicationName, 'template.yaml')
-                    const readmePath = path.join(testDir, samApplicationName, 'README.md')
-                    assert.ok(await fileExists(cfnTemplatePath), `Expected SAM template to exist at ${cfnTemplatePath}`)
-                    assert.ok(await fileExists(readmePath), `Expected SAM App readme to exist at ${readmePath}`)
-
-                    samAppCodeUri = await openSamAppFile(appPath)
-                })
-
-                beforeEach(async function () {
-                    testDisposables = []
-                    await closeAllEditors()
-                })
-
-                afterEach(async function () {
-                    testDisposables.forEach(d => d.dispose())
-                    await stopDebugger(undefined)
-                })
-
-                after(async function () {
-                    // don't clean up after java tests so the java language server doesn't freak out
-                    if (scenario.language !== 'java') {
-                        await tryRemoveFolder(testDir)
-                    }
-                })
-
-                it('produces an Add Debug Configuration codelens', async function () {
-                    if (semver.lt(vscode.version, scenario.vscodeMinimum)) {
-                        this.skip()
-                    }
-
-                    const codeLenses = await testUtils.getAddConfigCodeLens(
-                        samAppCodeUri,
-                        codelensTimeout,
-                        codelensRetryInterval
-                    )
-                    assert.ok(codeLenses && codeLenses.length === 2)
-
-                    let manifestFile: RegExp
-                    switch (scenario.language) {
-                        case 'javascript':
-                            manifestFile = /^package\.json$/
-                            break
-                        case 'python':
-                            manifestFile = /^requirements\.txt$/
-                            break
-                        case 'csharp':
-                            manifestFile = /^.*\.csproj$/
-                            break
-                        case 'go':
-                            manifestFile = /^go\.mod$/
-                            break
-                        case 'java':
-                            if (scenario.dependencyManager === 'maven') {
-                                manifestFile = /^.*pom\.xml$/
-                                break
-                            } else if (scenario.dependencyManager === 'gradle') {
-                                manifestFile = /^.*build\.gradle$/
-                                break
-                            }
-                            assert.fail(`invalid dependency manager for java: ${scenario.dependencyManager}`)
-                            break
-                        default:
-                            assert.fail('invalid scenario language')
-                    }
-
-                    const projectRoot = await findParentProjectFile(samAppCodeUri, manifestFile)
-                    assert.ok(projectRoot, 'projectRoot not found')
-                    for (const codeLens of codeLenses) {
-                        assertCodeLensReferencesHasSameRoot(codeLens, projectRoot!)
-                    }
-                })
-
-                it('target=api: invokes and attaches on debug request (F5)', async function () {
-                    if (skipLanguagesOnApi.includes(scenario.language)) {
-                        this.skip()
-                    }
-
-                    setTestTimeout(this.test?.fullTitle(), debugTimeout)
-                    await testTarget('api', {
-                        api: {
-                            path: '/hello',
-                            httpMethod: 'get',
-                            headers: { 'accept-language': 'fr-FR' },
-                        },
-                    })
-                })
-
-                it('target=template: invokes and attaches on debug request (F5)', async function () {
-                    setTestTimeout(this.test?.fullTitle(), debugTimeout)
-                    await testTarget('template')
-                })
-
-                async function testTarget(target: AwsSamTargetType, extraConfig: any = {}) {
-                    // Allow previous sessions to go away.
-                    await waitUntil(async () => vscode.debug.activeDebugSession === undefined, {
-                        timeout: noDebugSessionTimeout,
-                        interval: noDebugSessionInterval,
-                        truthy: true,
-                    })
-
-                    // We exclude the Node debug type since it causes the most erroneous failures with CI.
-                    // However, the fact that there are sessions from previous tests is still an issue, so
-                    // a warning will be logged under the current session.
-                    if (vscode.debug.activeDebugSession) {
-                        assert.strictEqual(
-                            vscode.debug.activeDebugSession.type,
-                            'pwa-node',
-                            `unexpected debug session in progress: ${JSON.stringify(
-                                vscode.debug.activeDebugSession,
-                                undefined,
-                                2
-                            )}`
-                        )
-
-                        sessionLog.push(`(WARNING) Unexpected debug session ${vscode.debug.activeDebugSession.name}`)
-                    }
-
-                    const testConfig = {
-                        type: 'aws-sam',
-                        request: 'direct-invoke',
-                        name: `test-config-${scenarioIndex}`,
-                        invokeTarget: {
-                            target: target,
-                            // Resource defined in `src/testFixtures/.../template.yaml`.
-                            logicalId: 'HelloWorldFunction',
-                            templatePath: cfnTemplatePath,
-                        },
-                        sam: {
-                            containerBuild: true,
-                        },
-                        ...extraConfig,
-                    } as AwsSamDebuggerConfiguration
-
-                    // runtime is optional for ZIP, but required for image-based
-                    if (scenario.baseImage) {
-                        testConfig.lambda = {
-                            runtime: scenario.runtime,
-                        }
-
-                        // HACK: set GOPROXY=direct or it will fail to build. https://golang.org/ref/mod#module-proxy
-                        // This only applies for our internal systems
-                        if (scenario.language === 'go') {
-                            const dockerfilePath: string = path.join(path.dirname(appPath), 'Dockerfile')
-                            insertTextIntoFile('ENV GOPROXY=direct', dockerfilePath, 1)
-                        }
-                    }
-
-                    // XXX: force load since template registry seems a bit flakey
-                    await globals.templateRegistry.addItemToRegistry(vscode.Uri.file(cfnTemplatePath))
-
-                    await startDebugger(scenario, scenarioIndex, target, testConfig, testDisposables, sessionLog)
-                }
-            })
-        })
-
-        function assertCodeLensReferencesHasSameRoot(codeLens: vscode.CodeLens, expectedUri: vscode.Uri) {
-            assert.ok(codeLens.command, 'CodeLens did not have a command')
-            const command = codeLens.command!
-
-            assert.ok(command.arguments, 'CodeLens command had no arguments')
-            const commandArguments = command.arguments!
-
-            assert.strictEqual(commandArguments.length, 3, 'CodeLens command had unexpected arg count')
-            const params: AddSamDebugConfigurationInput = commandArguments[0]
-            assert.ok(params, 'unexpected non-defined command argument')
-
-            assert.strictEqual(path.dirname(params.rootUri.fsPath), path.dirname(expectedUri.fsPath))
-        }
-    }
-
-    async function createSamApplication(location: string, scenario: TestScenario): Promise<void> {
-        const initArguments: SamCliInitArgs = {
-            name: samApplicationName,
-            location: location,
-            dependencyManager: scenario.dependencyManager,
-        }
-        if (scenario.baseImage) {
-            initArguments.baseImage = scenario.baseImage
-        } else {
-            initArguments.runtime = scenario.runtime
-            initArguments.template = helloWorldTemplate
-        }
-        const samCliContext = getSamCliContext()
-        await runSamCliInit(initArguments, samCliContext)
-        // XXX: Fixes flakiness. Ensures the files from creation of sam
-        // app are processed by code lens file watcher. Otherwise, potential
-        // issues of file not in registry before it is found.
-        await globals.codelensRootRegistry.rebuild()
-    }
-})
diff --git a/src/integrationTest/schema/schema.test.ts b/src/integrationTest/schema/schema.test.ts
deleted file mode 100644
index b496bc9d5ed..00000000000
--- a/src/integrationTest/schema/schema.test.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {
-    getCITestSchemas,
-    JSONObject,
-    unmarshal,
-    assertDefinitionProperty,
-    assertProperty,
-    assertRef,
-    assertDefinition,
-} from '../../test/shared/schema/testUtils'
-
-describe('Sam Schema Regression', function () {
-    let samSchema: JSONObject
-
-    before(async function () {
-        ;({ samSchema } = await getCITestSchemas())
-    })
-
-    it('has Policy Templates', function () {
-        const samPolicyTemplate = 'AWS::Serverless::Function.SAMPolicyTemplate'
-        assertDefinitionProperty(samSchema, samPolicyTemplate, 'S3WritePolicy')
-        assertDefinitionProperty(samSchema, samPolicyTemplate, 'DynamoDBWritePolicy')
-        assertDefinitionProperty(samSchema, samPolicyTemplate, 'SSMParameterReadPolicy')
-        assertDefinitionProperty(samSchema, samPolicyTemplate, 'AWSSecretsManagerGetSecretValuePolicy')
-    })
-
-    it('has property Domain in AWS::Serverless::Api', function () {
-        const domainLocation = unmarshal(
-            samSchema,
-            'definitions',
-            'AWS::Serverless::Api',
-            'properties',
-            'Properties',
-            'properties'
-        )
-        assertProperty(domainLocation, 'Domain')
-        assertRef(unmarshal(domainLocation, 'Domain'), 'Api.DomainConfiguration')
-
-        assertDefinition(samSchema, 'AWS::Serverless::Api.DomainConfiguration')
-        assertDefinition(samSchema, 'AWS::Serverless::Api.MutualTlsAuthentication')
-        assertDefinition(samSchema, 'AWS::Serverless::Api.Route53Configuration')
-    })
-
-    it('has Property Version in AWS::Serverless::Function.IAMPolicyDocument and AWS::Serverless::StateMachine.IAMPolicyDocument', function () {
-        assertDefinitionProperty(samSchema, 'AWS::Serverless::Function.IAMPolicyDocument', 'Version')
-        assertDefinitionProperty(samSchema, 'AWS::Serverless::StateMachine.IAMPolicyDocument', 'Version')
-    })
-
-    it('has Property RequestModel and RequestParameters in AWS::Serverless::Function.ApiEvent', function () {
-        assertDefinitionProperty(samSchema, 'AWS::Serverless::Function.ApiEvent', 'RequestModel')
-        assertDefinitionProperty(samSchema, 'AWS::Serverless::Function.ApiEvent', 'RequestParameters')
-        assertDefinition(samSchema, 'AWS::Serverless::Function.RequestModel')
-        assertDefinition(samSchema, 'AWS::Serverless::Function.RequestParameter')
-    })
-
-    it('has Property AddDefaultAuthorizerToCorsPreflight in AWS::Serverless::Api.Auth', function () {
-        assertDefinitionProperty(samSchema, 'AWS::Serverless::Api.Auth', 'AddDefaultAuthorizerToCorsPreflight')
-    })
-})
diff --git a/src/integrationTest/shared/utilities/workspaceUtils.test.ts b/src/integrationTest/shared/utilities/workspaceUtils.test.ts
deleted file mode 100644
index 3a7d0817014..00000000000
--- a/src/integrationTest/shared/utilities/workspaceUtils.test.ts
+++ /dev/null
@@ -1,157 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { writeFile, mkdirp, remove } from 'fs-extra'
-import * as path from 'path'
-import * as vscode from 'vscode'
-import { findParentProjectFile, getWorkspaceRelativePath } from '../../../shared/utilities/workspaceUtils'
-import { getTestWorkspaceFolder } from '../../integrationTestsUtilities'
-import globals from '../../../shared/extensionGlobals'
-import { CodelensRootRegistry } from '../../../shared/fs/codelensRootRegistry'
-
-describe('findParentProjectFile', async function () {
-    const workspaceDir = getTestWorkspaceFolder()
-    let filesToDelete: vscode.Uri[]
-
-    // Save the global registry and restore it after the test
-    let globalRegistry: CodelensRootRegistry
-
-    const sourceCodeUri = vscode.Uri.file(path.join(workspaceDir, 'someproject', 'src', 'Program.cs'))
-    const projectInSameFolderUri = vscode.Uri.file(path.join(workspaceDir, 'someproject', 'src', 'App.csproj'))
-    const projectInParentFolderUri = vscode.Uri.file(path.join(workspaceDir, 'someproject', 'App.csproj'))
-    const projectInParentParentFolderUri = vscode.Uri.file(path.join(workspaceDir, 'App.csproj'))
-    const projectOutOfParentChainUri = vscode.Uri.file(path.join(workspaceDir, 'someotherproject', 'App.csproj'))
-
-    const testScenarios = [
-        {
-            scenario: 'locates project in same folder',
-            filesToUse: [projectInSameFolderUri],
-            expectedResult: projectInSameFolderUri,
-        },
-        {
-            scenario: 'locates project in parent folder',
-            filesToUse: [projectInParentFolderUri],
-            expectedResult: projectInParentFolderUri,
-        },
-        {
-            scenario: 'locates project two parent folders up',
-            filesToUse: [projectInParentParentFolderUri],
-            expectedResult: projectInParentParentFolderUri,
-        },
-        {
-            scenario: 'selects project in same folder over parent folder',
-            filesToUse: [projectInSameFolderUri, projectInParentFolderUri],
-            expectedResult: projectInSameFolderUri,
-        },
-        {
-            scenario: 'always selects project in same folder over parent folder regardless of order',
-            filesToUse: [projectInParentFolderUri, projectInSameFolderUri],
-            expectedResult: projectInSameFolderUri,
-        },
-        {
-            scenario: 'returns undefined when no project files are located',
-            filesToUse: [],
-            expectedResult: undefined,
-        },
-        {
-            scenario: 'returns undefined when no project files are located in parent chain',
-            filesToUse: [projectOutOfParentChainUri],
-            expectedResult: undefined,
-        },
-    ]
-
-    before(async function () {
-        await mkdirp(path.join(workspaceDir, 'someproject', 'src'))
-        await mkdirp(path.join(workspaceDir, 'someotherproject'))
-        globalRegistry = globals.codelensRootRegistry
-    })
-
-    after(async function () {
-        remove(path.join(workspaceDir, 'someproject'))
-        remove(path.join(workspaceDir, 'someotherproject'))
-        globals.codelensRootRegistry = globalRegistry
-    })
-
-    beforeEach(function () {
-        globals.codelensRootRegistry = new CodelensRootRegistry()
-    })
-
-    afterEach(async function () {
-        for (const file of filesToDelete) {
-            remove(file.fsPath)
-        }
-        filesToDelete = []
-        globals.codelensRootRegistry.dispose()
-    })
-
-    testScenarios.forEach(test => {
-        it(test.scenario, async () => {
-            filesToDelete = test.filesToUse
-            for (const file of test.filesToUse) {
-                await writeFile(file.fsPath, '')
-                // Add it to the registry. The registry is async and we are not
-                // testing the registry in this test, so manually use it
-                await globals.codelensRootRegistry.addItemToRegistry(file)
-            }
-            const projectFile = await findParentProjectFile(sourceCodeUri, /^.*\.csproj$/)
-            if (test.expectedResult) {
-                // doesn't do a deepStrictEqual because VS Code sets a hidden field to `undefined` when returning instead of `null` (when it's created)
-                // for all intents and purposes, if this matches, it's good enough for us.
-                assert.strictEqual(projectFile?.fsPath, test.expectedResult?.fsPath)
-            } else {
-                assert.strictEqual(projectFile, test.expectedResult)
-            }
-        })
-    })
-})
-
-describe('getWorkspaceRelativePath', function () {
-    const parentPath = path.join('/', 'level1', 'level2')
-    const nestedPath = path.join(parentPath, 'level3')
-    const childPath = path.join(nestedPath, 'level4')
-
-    it('returns a path relative to the first parent path it sees', function () {
-        const relativePath = getWorkspaceRelativePath(childPath, {
-            workspaceFolders: [
-                {
-                    index: 0,
-                    name: '',
-                    uri: vscode.Uri.file(nestedPath),
-                },
-                {
-                    index: 1,
-                    name: '',
-                    uri: vscode.Uri.file(parentPath),
-                },
-            ],
-        })
-
-        assert.strictEqual(relativePath, 'level4')
-    })
-
-    it('returns undefined if no workspace folders exist', function () {
-        const relativePath = getWorkspaceRelativePath(childPath, { workspaceFolders: undefined })
-        assert.strictEqual(relativePath, undefined)
-    })
-
-    it('returns undefined if no paths are parents', function () {
-        const relativePath = getWorkspaceRelativePath(childPath, {
-            workspaceFolders: [
-                {
-                    index: 0,
-                    name: '',
-                    uri: vscode.Uri.file(path.join('different', nestedPath)),
-                },
-                {
-                    index: 1,
-                    name: '',
-                    uri: vscode.Uri.file(path.join('different', parentPath)),
-                },
-            ],
-        })
-        assert.strictEqual(relativePath, undefined)
-    })
-})
diff --git a/src/integrationTest/stepFunctions/visualizeStateMachine.test.ts b/src/integrationTest/stepFunctions/visualizeStateMachine.test.ts
deleted file mode 100644
index 081d4f88e0a..00000000000
--- a/src/integrationTest/stepFunctions/visualizeStateMachine.test.ts
+++ /dev/null
@@ -1,263 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as fs from 'fs-extra'
-import * as path from 'path'
-import * as vscode from 'vscode'
-import * as sinon from 'sinon'
-import { MessageObject } from '../../stepFunctions/commands/visualizeStateMachine/aslVisualization'
-import { makeTemporaryToolkitFolder } from '../../shared/filesystemUtilities'
-import { closeAllEditors } from '../../test/testUtil'
-import { previewStateMachineCommand } from '../../stepFunctions/activation'
-import { createTestWindow } from '../../test/shared/vscode/window'
-
-const sampleStateMachine = `
-	 {
-	     "StartAt": "Parallel State",
-	     "States": {
-	         "Parallel State": {
-	             "Type": "Parallel",
-	             "Branches": [
-	                 {
-	                     "StartAt": "AAA",
-	                         "States": {
-	                         "AAA": {
-	                             "Type": "Task",
-	                             "Resource": "arn:aws:states:us-east-1:204340511724:activity:WriteTicket",
-	                             "End": true
-	                         }
-	                     }
-	                 },
-	                 {
-	                     "StartAt": "BBB",
-	                         "States": {
-	                         "BBB": {
-	                             "Type": "Task",
-	                             "Resource": "arn:aws:lambda:us-east-1:204340511724:function:CustomerImpactChimeBot",
-	                             "End": true
-	                         }
-	                     }
-	                 }
-	             ],
-	             "ResultPath" : "$.CommentStatus",
-	             "End": true
-	         }
-	     }
-     }`
-
-const samleStateMachineYaml = `
-    Comment: "A Hello World example of the Amazon States Language using Pass states"
-    StartAt: Hello
-    States:
-    Hello:
-        Type: Pass
-        Result: Hello
-        Next: World
-    World:
-        Type: Pass
-        Result: \$\{Text\}
-        End: true
-`
-
-let tempFolder: string
-
-/**
- * Helper function to create a text file with supplied content and open it with a TextEditor
- *
- * @param fileText The supplied text to fill this file with
- * @param fileName The name of the file to save it as. Include the file extension here.
- *
- * @returns TextEditor that was just opened
- */
-async function openATextEditorWithText(fileText: string, fileName: string): Promise<vscode.TextEditor> {
-    const completeFilePath = path.join(tempFolder, fileName)
-    await fs.writeFile(completeFilePath, fileText)
-
-    const textDocument = await vscode.workspace.openTextDocument(completeFilePath)
-
-    return await vscode.window.showTextDocument(textDocument)
-}
-
-async function waitUntilWebviewIsVisible(webviewPanel: vscode.WebviewPanel | undefined): Promise<void> {
-    return new Promise<void>((resolve, reject) => {
-        if (webviewPanel) {
-            webviewPanel.webview.onDidReceiveMessage((message: MessageObject) => {
-                switch (message.command) {
-                    case 'webviewRendered':
-                        resolve()
-                        break
-                }
-            })
-        } else {
-            reject()
-        }
-    })
-}
-
-describe('visualizeStateMachine', async function () {
-    before(async function () {
-        this.timeout(600000)
-    })
-
-    beforeEach(async function () {
-        // Make a temp folder for all these tests
-        tempFolder = await makeTemporaryToolkitFolder()
-    })
-
-    afterEach(async function () {
-        await fs.remove(tempFolder)
-        sinon.restore()
-    })
-
-    after(async function () {
-        // Test suite cleans up after itself
-        await closeAllEditors()
-    })
-
-    it('opens up a webview when there is an active text editor', async function () {
-        const stateMachineFileText = '{}'
-        const fileName = 'mysamplestatemachine.json'
-        await openATextEditorWithText(stateMachineFileText, fileName)
-
-        const result = await previewStateMachineCommand.execute()
-
-        assert.ok(result)
-    }).timeout(15000) // Give the first test that calls aws.previewStateMachine a chance to download the visualizer
-
-    it('correctly displays content when given a sample state machine', async function () {
-        const fileName = 'mysamplestatemachine.json'
-        const textEditor = await openATextEditorWithText(sampleStateMachine, fileName)
-
-        const result = await previewStateMachineCommand.execute()
-
-        assert.ok(result)
-
-        await waitUntilWebviewIsVisible(result)
-
-        let expectedViewColumn
-        if (textEditor.viewColumn) {
-            expectedViewColumn = textEditor.viewColumn.valueOf() + 1
-        }
-
-        if (result) {
-            assert.deepStrictEqual(result.title, 'Graph: ' + fileName)
-            assert.deepStrictEqual(result.viewColumn, expectedViewColumn)
-            assert.deepStrictEqual(result.viewType, 'stateMachineVisualization')
-            assert.ok(result.webview.html)
-        }
-    })
-
-    it('correctly displays content when given a sample state machine in yaml', async function () {
-        const fileName = 'mysamplestatemachine.asl.yaml'
-        const textEditor = await openATextEditorWithText(samleStateMachineYaml, fileName)
-
-        const result = await previewStateMachineCommand.execute()
-
-        assert.ok(result)
-
-        await waitUntilWebviewIsVisible(result)
-
-        let expectedViewColumn
-        if (textEditor.viewColumn) {
-            expectedViewColumn = textEditor.viewColumn.valueOf() + 1
-        }
-
-        if (result) {
-            assert.deepStrictEqual(result.title, 'Graph: ' + fileName)
-            assert.deepStrictEqual(result.viewColumn, expectedViewColumn)
-            assert.deepStrictEqual(result.viewType, 'stateMachineVisualization')
-            assert.ok(result.webview.html)
-        }
-    })
-
-    it('update webview is triggered when user saves correct text editor', async function () {
-        const stateMachineFileText = '{}'
-        const fileName = 'mysamplestatemachine.json'
-        const textEditor = await openATextEditorWithText(stateMachineFileText, fileName)
-
-        const result = await previewStateMachineCommand.execute()
-
-        assert.ok(result)
-
-        if (result) {
-            const viewStateChanged = new Promise<vscode.WebviewPanelOnDidChangeViewStateEvent>(resolve => {
-                result.onDidChangeViewState(e => {
-                    // Ensure that this event fires after document is saved
-                    assert.ok(e)
-                    resolve(e)
-                })
-            })
-
-            await textEditor.edit(eb => {
-                eb.replace(
-                    new vscode.Range(
-                        textEditor.document.positionAt(0),
-                        textEditor.document.positionAt(textEditor.document.getText().length)
-                    ),
-                    sampleStateMachine
-                )
-            })
-
-            await textEditor.document.save()
-
-            await viewStateChanged
-        }
-    })
-
-    it('throws an error if no active text editor is open', async function () {
-        // Make sure nothing is open from previous tests.
-        await closeAllEditors()
-        assert.strictEqual(vscode.window.activeTextEditor, undefined)
-
-        const testWindow = createTestWindow()
-        sinon.replace(vscode, 'window', testWindow)
-        const errorMessage = testWindow.waitForMessage(/no active text editor/i)
-
-        await Promise.all([previewStateMachineCommand.execute(), errorMessage.then(dialog => dialog.close())])
-    })
-
-    it('doesnt update the graph if a seperate file is opened or modified', async function () {
-        const stateMachineFileText = '{}'
-        const stateMachineDefinitionFile = 'mystatemachine.json'
-        await openATextEditorWithText(stateMachineFileText, stateMachineDefinitionFile)
-
-        const result = await previewStateMachineCommand.execute()
-        assert.ok(result)
-
-        await waitUntilWebviewIsVisible(result)
-
-        // Here we will create a second file unrelated to the existing graph in VS Code.
-        const someOtherFileText = 'Some other file that is not related to state machine.'
-        const someOtherFileName = 'fileTwo'
-
-        const textEditor2 = await openATextEditorWithText(someOtherFileText, someOtherFileName)
-
-        const updatedText = 'updated text'
-
-        const postMessageSpy = sinon.spy()
-        if (result) {
-            // eslint-disable-next-line @typescript-eslint/unbound-method
-            result.webview.postMessage = postMessageSpy
-        }
-
-        // Update and save the file that we are NOT visualizing
-        await textEditor2.edit(eb => {
-            eb.replace(
-                new vscode.Range(
-                    textEditor2.document.positionAt(0),
-                    textEditor2.document.positionAt(textEditor2.document.getText().length)
-                ),
-                updatedText
-            )
-        })
-
-        // Save the file
-        await textEditor2.document.save()
-
-        // The state machine graph should not update.
-        assert(postMessageSpy.notCalled)
-    })
-})
diff --git a/src/iot/activation.ts b/src/iot/activation.ts
deleted file mode 100644
index 485d64a8d7d..00000000000
--- a/src/iot/activation.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { IotThingNode } from './explorer/iotThingNode'
-import { ExtContext } from '../shared/extensions'
-import { IotThingFolderNode } from './explorer/iotThingFolderNode'
-import { createThingCommand } from './commands/createThing'
-import { deleteThingCommand } from './commands/deleteThing'
-import { IotCertificateNode, IotCertWithPoliciesNode, IotThingCertNode } from './explorer/iotCertificateNode'
-import { detachThingCertCommand } from './commands/detachCert'
-import { IotPolicyCertNode, IotPolicyWithVersionsNode } from './explorer/iotPolicyNode'
-import { detachPolicyCommand } from './commands/detachPolicy'
-import { deletePolicyCommand } from './commands/deletePolicy'
-import {
-    activateCertificateCommand,
-    deactivateCertificateCommand,
-    revokeCertificateCommand,
-} from './commands/updateCert'
-import { deleteCertCommand } from './commands/deleteCert'
-import { IotCertsFolderNode } from './explorer/iotCertFolderNode'
-import { createCertificateCommand } from './commands/createCert'
-import { attachCertificateCommand } from './commands/attachCertificate'
-import { attachPolicyCommand } from './commands/attachPolicy'
-import { IotPolicyFolderNode } from './explorer/iotPolicyFolderNode'
-import { createPolicyCommand } from './commands/createPolicy'
-import { IotNode } from './explorer/iotNodes'
-import { copyEndpointCommand } from './commands/copyEndpoint'
-import { IotPolicyVersionNode } from './explorer/iotPolicyVersionNode'
-import { deletePolicyVersionCommand } from './commands/deletePolicyVersion'
-import { setDefaultPolicy } from './commands/setDefaultPolicy'
-import { createPolicyVersionCommand } from './commands/createPolicyVersion'
-import { viewPolicyVersionCommand } from './commands/viewPolicyVersion'
-import { Commands } from '../shared/vscode/commands2'
-
-/**
- * Activate IoT components.
- */
-export async function activate(context: ExtContext): Promise<void> {
-    context.extensionContext.subscriptions.push(
-        Commands.register('aws.iot.createThing', async (node: IotThingFolderNode) => {
-            await createThingCommand(node)
-        }),
-        Commands.register('aws.iot.deleteThing', async (node: IotThingNode) => {
-            await deleteThingCommand(node)
-        }),
-        Commands.register('aws.iot.createCert', async (node: IotCertsFolderNode) => {
-            await createCertificateCommand(node)
-        }),
-        Commands.register('aws.iot.deleteCert', async (node: IotCertWithPoliciesNode) => {
-            await deleteCertCommand(node)
-        }),
-        Commands.register('aws.iot.attachCert', async (node: IotThingNode) => {
-            await attachCertificateCommand(node)
-        }),
-        Commands.register('aws.iot.detachCert', async (node: IotThingCertNode) => {
-            await detachThingCertCommand(node)
-        }),
-        Commands.register('aws.iot.createPolicy', async (node: IotPolicyFolderNode) => {
-            await createPolicyCommand(node)
-        }),
-        Commands.register('aws.iot.deletePolicy', async (node: IotPolicyWithVersionsNode) => {
-            await deletePolicyCommand(node)
-        }),
-        Commands.register('aws.iot.attachPolicy', async (node: IotCertWithPoliciesNode) => {
-            await attachPolicyCommand(node)
-        }),
-        Commands.register('aws.iot.detachPolicy', async (node: IotPolicyCertNode) => {
-            await detachPolicyCommand(node)
-        }),
-        Commands.register('aws.iot.activateCert', async (node: IotCertificateNode) => {
-            await activateCertificateCommand(node)
-        }),
-        Commands.register('aws.iot.deactivateCert', async (node: IotCertificateNode) => {
-            await deactivateCertificateCommand(node)
-        }),
-        Commands.register('aws.iot.revokeCert', async (node: IotCertificateNode) => {
-            await revokeCertificateCommand(node)
-        }),
-        Commands.register('aws.iot.createPolicyVersion', async (node: IotPolicyWithVersionsNode) => {
-            await createPolicyVersionCommand(node)
-        }),
-        Commands.register('aws.iot.deletePolicyVersion', async (node: IotPolicyVersionNode) => {
-            await deletePolicyVersionCommand(node)
-        }),
-        Commands.register('aws.iot.setDefaultPolicy', async (node: IotPolicyVersionNode) => {
-            await setDefaultPolicy(node)
-        }),
-        Commands.register('aws.iot.viewPolicyVersion', async (node: IotPolicyVersionNode) => {
-            await viewPolicyVersionCommand(node)
-        }),
-        Commands.register('aws.iot.copyEndpoint', async (node: IotNode) => {
-            await copyEndpointCommand(node)
-        })
-    )
-}
diff --git a/src/iot/commands/attachCertificate.ts b/src/iot/commands/attachCertificate.ts
deleted file mode 100644
index 6220de02c20..00000000000
--- a/src/iot/commands/attachCertificate.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { getLogger } from '../../shared/logger'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { Commands } from '../../shared/vscode/commands'
-import { Window } from '../../shared/vscode/window'
-import { IotThingNode } from '../explorer/iotThingNode'
-import { showViewLogsMessage } from '../../shared/utilities/messages'
-import { createQuickPick, DataQuickPickItem } from '../../shared/ui/pickerPrompter'
-import { PromptResult } from '../../shared/ui/prompter'
-import { IotClient } from '../../shared/clients/iotClient'
-import { isValidResponse } from '../../shared/wizards/wizard'
-import { Iot } from 'aws-sdk'
-
-export type CertGen = typeof getCertList
-
-/**
- * Attaches a certificate to the thing represented by the given node.
- *
- * Prompts the user to select a certificate
- * Attaches the certificate.
- * Refreshes the thing node.
- */
-export async function attachCertificateCommand(
-    node: IotThingNode,
-    promptFun = promptForCert,
-    window = Window.vscode(),
-    commands = Commands.vscode()
-): Promise<void> {
-    getLogger().debug('AttachCertificate called for %O', node)
-
-    const thingName = node.thing.name
-
-    const cert = await promptFun(node.iot, getCertList, window)
-    if (!isValidResponse(cert)) {
-        getLogger().info('No certificate chosen')
-        return undefined
-    }
-    getLogger().info('Picker returned: %O', cert)
-    try {
-        await node.iot.attachThingPrincipal({ thingName, principal: cert.certificateArn! })
-    } catch (e) {
-        getLogger().error(`Failed to attach certificate ${cert.certificateId}: %s`, e)
-        showViewLogsMessage(
-            localize('AWS.iot.attachCert.error', 'Failed to attach certificate {0}', cert.certificateId),
-            window
-        )
-        return undefined
-    }
-
-    getLogger().debug('Attached certificate %O', cert.certificateId)
-
-    //Refresh the Thing node
-    await node.refreshNode(commands)
-}
-
-/**
- * Prompts the user to pick a certificate to attach.
- */
-async function promptForCert(
-    iot: IotClient,
-    certFetch: CertGen,
-    window?: Window
-): Promise<PromptResult<Iot.Certificate>> {
-    const placeHolder: DataQuickPickItem<Iot.Certificate> = {
-        label: 'No certificates found',
-        data: undefined,
-    }
-    const picker = createQuickPick(certFetch(iot, window), {
-        title: localize('AWS.iot.attachCert', 'Select a certificate'),
-        noItemsFoundItem: placeHolder,
-        buttons: [vscode.QuickInputButtons.Back],
-    })
-    return picker.prompt()
-}
-
-/**
- * Async generator function to get the list of certificates when creating a quick pick.
- */
-async function* getCertList(iot: IotClient, window?: Window) {
-    let marker: string | undefined = undefined
-    let filteredCerts: Iot.Certificate[]
-    do {
-        try {
-            const certResponse: Iot.ListCertificatesResponse = await iot.listCertificates({ marker })
-            marker = certResponse.nextMarker
-
-            /* These fields should always be defined when using the above API,
-             * but we filter here anyway for when we use ! later. */
-            filteredCerts =
-                certResponse.certificates?.filter(
-                    cert => cert.certificateArn && cert.certificateId && cert.status && cert.creationDate
-                ) ?? []
-        } catch (e) {
-            getLogger().error(`Failed to retrieve certificates: %s`, e)
-            showViewLogsMessage(localize('AWS.iot.attachCert.error', 'Failed to retrieve certificates'), window)
-            return
-        }
-        yield filteredCerts.map(cert => ({ label: cert.certificateId!, data: cert }))
-    } while (marker != undefined)
-}
diff --git a/src/iot/commands/attachPolicy.ts b/src/iot/commands/attachPolicy.ts
deleted file mode 100644
index 7e1387ac70c..00000000000
--- a/src/iot/commands/attachPolicy.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { getLogger } from '../../shared/logger'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { Commands } from '../../shared/vscode/commands'
-import { Window } from '../../shared/vscode/window'
-import { showViewLogsMessage } from '../../shared/utilities/messages'
-import { createQuickPick, DataQuickPickItem } from '../../shared/ui/pickerPrompter'
-import { PromptResult } from '../../shared/ui/prompter'
-import { IotClient } from '../../shared/clients/iotClient'
-import { isValidResponse } from '../../shared/wizards/wizard'
-import { IotCertWithPoliciesNode, IotThingCertNode } from '../explorer/iotCertificateNode'
-import { Iot } from 'aws-sdk'
-import { IotNode } from '../explorer/iotNodes'
-
-export type PolicyGen = typeof getPolicyList
-
-/**
- * Attaches a policy to the certificate represented by the given node.
- *
- * Prompts the user to select a policy.
- * Attaches the policy.
- * Refreshes the certificate node.
- */
-export async function attachPolicyCommand(
-    node: IotThingCertNode | IotCertWithPoliciesNode,
-    promptFun = promptForPolicy,
-    window = Window.vscode(),
-    commands = Commands.vscode()
-): Promise<void> {
-    getLogger().debug('AttachPolicy called for %O', node)
-
-    const certArn = node.certificate.arn
-
-    const policy = await promptFun(node.iot, getPolicyList, window)
-    if (!isValidResponse(policy)) {
-        getLogger().info('No policy chosen')
-        return undefined
-    }
-    getLogger().info('Picker returned: %O', policy)
-    try {
-        await node.iot.attachPolicy({ policyName: policy.policyName!, target: certArn })
-    } catch (e) {
-        getLogger().error(`Failed to attach policy ${policy.policyName}: %s`, e)
-        showViewLogsMessage(
-            localize('AWS.iot.attachCert.error', 'Failed to attach policy {0}', policy.policyName),
-            window
-        )
-        return undefined
-    }
-
-    getLogger().debug('Attached policy %O', policy.policyName)
-
-    /* Refresh both things and certificates nodes so the status is updated in
-     * both trees. */
-    const baseNode = getBaseNode(node)
-    await baseNode.thingFolderNode?.refreshNode(commands)
-    await baseNode.certFolderNode?.refreshNode(commands)
-}
-
-/**
- * Gets the node at the root of the IoT tree. This is so nodes in multiple
- * subtrees can be refreshed when an action affects more than one node.
- */
-function getBaseNode(node: IotThingCertNode | IotCertWithPoliciesNode): IotNode {
-    if (node instanceof IotThingCertNode) {
-        return node.parent.parent.parent
-    }
-    return node.parent.parent
-}
-
-/**
- * Prompts the user to pick a policy to attach.
- */
-async function promptForPolicy(
-    iot: IotClient,
-    policyFetch: PolicyGen,
-    window?: Window
-): Promise<PromptResult<Iot.Policy>> {
-    const placeHolder: DataQuickPickItem<Iot.Policy> = {
-        label: 'No policies found',
-        data: undefined,
-    }
-    const picker = createQuickPick(policyFetch(iot, window), {
-        title: localize('AWS.iot.attachPolicy', 'Select a policy'),
-        noItemsFoundItem: placeHolder,
-        buttons: [vscode.QuickInputButtons.Back],
-    })
-    return picker.prompt()
-}
-
-/**
- * Async generator function to get the list of policies when creating a quick pick.
- */
-async function* getPolicyList(iot: IotClient, window?: Window) {
-    let marker: string | undefined = undefined
-    let filteredPolicies: Iot.Policy[]
-    do {
-        try {
-            const policyResponse: Iot.ListPoliciesResponse = await iot.listPolicies({ marker })
-            marker = policyResponse.nextMarker
-
-            /* The policy name and arn should always be defined when using the
-             * above API, but we filter here anyway for when we use ! later. */
-            filteredPolicies = policyResponse.policies?.filter(policy => policy.policyArn && policy.policyName) ?? []
-        } catch (e) {
-            getLogger().error(`Failed to retrieve policies: %s`, e)
-            showViewLogsMessage(localize('AWS.iot.attachPolicy.error', 'Failed to retrieve policies'), window)
-            return
-        }
-        yield filteredPolicies.map(policy => ({ label: policy.policyName!, data: policy }))
-    } while (marker != undefined)
-}
diff --git a/src/iot/commands/copyEndpoint.ts b/src/iot/commands/copyEndpoint.ts
deleted file mode 100644
index 57ed24192d2..00000000000
--- a/src/iot/commands/copyEndpoint.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { IotNode } from '../explorer/iotNodes'
-import { showViewLogsMessage } from '../../shared/utilities/messages'
-import { Env } from '../../shared/vscode/env'
-import { copyToClipboard } from '../../shared/utilities/messages'
-import { Window } from '../../shared/vscode/window'
-import { getLogger } from '../../shared/logger'
-
-/**
- * Copies the path to the folder or file represented by the given node.
- *
- * Note that the path does not contain the bucket name or a leading slash.
- */
-export async function copyEndpointCommand(node: IotNode, window = Window.vscode(), env = Env.vscode()): Promise<void> {
-    getLogger().debug('CopyPath called for %O', node)
-
-    let endpoint: string
-    try {
-        endpoint = await node.getEndpoint()
-    } catch (e) {
-        getLogger().error('Failed to retrieve endpoint: %s', e)
-        showViewLogsMessage(localize('AWS.iot.copyEndpoint.error', 'Failed to retrieve endpoint'), window)
-        return
-    }
-
-    copyToClipboard(endpoint, 'URL', window, env)
-}
diff --git a/src/iot/commands/createCert.ts b/src/iot/commands/createCert.ts
deleted file mode 100644
index ddff3691fe7..00000000000
--- a/src/iot/commands/createCert.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as fs from 'fs-extra'
-import * as path from 'path'
-import { getLogger } from '../../shared/logger'
-import { Commands } from '../../shared/vscode/commands'
-import { Window } from '../../shared/vscode/window'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { showViewLogsMessage } from '../../shared/utilities/messages'
-import { IotCertsFolderNode } from '../explorer/iotCertFolderNode'
-import { fileExists } from '../../shared/filesystemUtilities'
-import { Iot } from 'aws-sdk'
-
-// eslint-disable-next-line @typescript-eslint/naming-convention
-const MODE_RW_R_R = 0o644 //File permission 0644 rw-r--r-- for PEM files.
-// eslint-disable-next-line @typescript-eslint/naming-convention
-const PEM_FILE_ENCODING = 'ascii'
-
-/**
- * Command to create a certificate key pair and save them to the filesystem.
- */
-export async function createCertificateCommand(
-    node: IotCertsFolderNode,
-    promptFunc = promptForSaveLocation,
-    saveFunc = saveCredentials,
-    window = Window.vscode(),
-    commands = Commands.vscode()
-): Promise<void> {
-    getLogger().debug('CreateCertificate called for %O', node)
-
-    const folderLocation = await promptFunc(window)
-    if (!folderLocation) {
-        getLogger().info('CreateCertificate canceled: No folder selected')
-        return
-    }
-
-    let certificate: Iot.CreateKeysAndCertificateResponse
-
-    try {
-        certificate = await node.iot.createCertificateAndKeys({
-            setAsActive: false,
-        })
-    } catch (e) {
-        getLogger().error('Failed to create certificate: %s', e)
-        showViewLogsMessage(localize('AWS.iot.createCert.error', 'Failed to create certificate'), window)
-        return undefined
-    }
-
-    const certId = certificate!.certificateId
-    const certPem = certificate!.certificatePem
-    const privateKey = certificate!.keyPair?.PrivateKey
-    const publicKey = certificate!.keyPair?.PublicKey
-
-    if (!certPem || !privateKey || !publicKey) {
-        getLogger().error('Could not download certificate. Certificate is missing either the PEM or key pair.')
-        showViewLogsMessage(localize('AWS.iot.createCert.error', 'Failed to create certificate'), window)
-        return undefined
-    }
-
-    getLogger().info(`Downloaded certificate ${certId}`)
-    window.showInformationMessage(localize('AWS.iot.createCert.success', 'Created certificate {0}', certId))
-
-    //Save resources
-    const saveSuccessful = await saveFunc(window, folderLocation, certId!, certPem, privateKey, publicKey)
-    if (!saveSuccessful) {
-        //Delete the certificate if the key pair cannot be saved
-        try {
-            await node.iot.deleteCertificate({ certificateId: certId! })
-        } catch (e) {
-            getLogger().error(`Failed to delete Certificate ${certId}: %s`, e)
-            showViewLogsMessage(
-                localize('AWS.iot.deleteCert.error', 'Failed to delete Certificate {0}', certId),
-                window
-            )
-        }
-    }
-
-    //Refresh the Certificate Folder node
-    await node.refreshNode(commands)
-}
-
-/**
- * Prompts for folder in which to save certificate and keys
- */
-async function promptForSaveLocation(window: Window): Promise<vscode.Uri | undefined> {
-    const folderLocation = await window.showOpenDialog({
-        openLabel: localize('AWS.iot.downloadCert.openButton', 'Save certificate here'),
-        canSelectFolders: true,
-        canSelectFiles: false,
-        canSelectMany: false,
-    })
-
-    if (!folderLocation || folderLocation.length == 0) {
-        return undefined
-    }
-
-    return folderLocation[0]
-}
-
-/**
- * Saves certificate and key pair to the file system
- * @returns `true` if writes succeed, else `false`.
- */
-async function saveCredentials(
-    window: Window,
-    basePath: vscode.Uri,
-    certName: string,
-    certPem: string,
-    privateKey: string,
-    publicKey: string
-): Promise<boolean> {
-    const dir = basePath.fsPath
-    const certPath = path.join(dir, `${certName}-certificate.pem.crt`)
-    const privateKeyPath = path.join(dir, `${certName}-private.pem.key`)
-    const publicKeyPath = path.join(dir, `${certName}-public.pem.key`)
-
-    const certExists = await fileExists(certPath)
-    const privateKeyExists = await fileExists(privateKeyPath)
-    const publicKeyExists = await fileExists(publicKeyPath)
-
-    if (certExists) {
-        getLogger().error('Certificate path {0} already exists', certPath)
-        window.showErrorMessage(
-            localize('AWS.iot.createCert.error', 'Failed to create certificate. Path {0} already exists.', certPath)
-        )
-        return false
-    }
-    if (privateKeyExists) {
-        getLogger().error('Key path {0} already exists', privateKeyPath)
-        window.showErrorMessage(
-            localize(
-                'AWS.iot.createCert.error',
-                'Failed to create certificate. Path {0} already exists.',
-                privateKeyPath
-            )
-        )
-        return false
-    }
-    if (publicKeyExists) {
-        getLogger().error('Key path {0} already exists', publicKeyPath)
-        window.showErrorMessage(
-            localize(
-                'AWS.iot.createCert.error',
-                'Failed to create certificate. Path {0} already exists.',
-                publicKeyPath
-            )
-        )
-        return false
-    }
-    try {
-        await fs.writeFile(certPath, certPem, { encoding: PEM_FILE_ENCODING, mode: MODE_RW_R_R })
-        await fs.writeFile(privateKeyPath, privateKey, { encoding: PEM_FILE_ENCODING, mode: MODE_RW_R_R })
-        await fs.writeFile(publicKeyPath, publicKey, { encoding: PEM_FILE_ENCODING, mode: MODE_RW_R_R })
-    } catch (e) {
-        getLogger().error('Could not save certificate: %s', e)
-        showViewLogsMessage(localize('AWS.iot.createCert.saveError', 'Failed to save certificate'), window)
-        return false
-    }
-    return true
-}
diff --git a/src/iot/commands/createPolicy.ts b/src/iot/commands/createPolicy.ts
deleted file mode 100644
index bbc79d19e83..00000000000
--- a/src/iot/commands/createPolicy.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as fs from 'fs-extra'
-import { getLogger } from '../../shared/logger'
-import { Commands } from '../../shared/vscode/commands'
-import { Window } from '../../shared/vscode/window'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { showViewLogsMessage } from '../../shared/utilities/messages'
-import { IotPolicyFolderNode } from '../explorer/iotPolicyFolderNode'
-
-/**
- * Creates a policy from a policy document.
- */
-export async function createPolicyCommand(
-    node: IotPolicyFolderNode,
-    getPolicyDoc = getPolicyDocument,
-    window = Window.vscode(),
-    commands = Commands.vscode()
-): Promise<void> {
-    getLogger().debug('CreatePolicy called for %O', node)
-
-    const data = await getPolicyDoc(window)
-    if (!data) {
-        return
-    }
-
-    const policyName = await window.showInputBox({
-        prompt: localize('AWS.iot.createPolicy.prompt', 'Enter a new policy name'),
-        placeHolder: localize('AWS.iot.createPolicy.placeHolder', 'Policy Name'),
-        validateInput: validatePolicyName,
-    })
-
-    if (!policyName) {
-        getLogger().info('CreatePolicy canceled')
-        return
-    }
-
-    try {
-        //Parse to ensure this is a valid JSON
-        const policyJSON = JSON.parse(data.toString())
-        await node.iot.createPolicy({ policyName, policyDocument: JSON.stringify(policyJSON) })
-        window.showInformationMessage(localize('AWS.iot.createPolicy.success', 'Created Policy {0}', policyName))
-    } catch (e) {
-        getLogger().error('Failed to create policy document: %s', e)
-        showViewLogsMessage(localize('AWS.iot.createPolicy.error', 'Failed to create policy {0}', policyName), window)
-        return
-    }
-
-    //Refresh the Policy Folder node
-    await node.refreshNode(commands)
-}
-
-export async function getPolicyDocument(window: Window): Promise<Buffer | undefined> {
-    const fileLocation = await window.showOpenDialog({
-        canSelectFolders: false,
-        canSelectFiles: true,
-        canSelectMany: false,
-        filters: { JSON: ['json'] },
-    })
-
-    if (!fileLocation || fileLocation.length == 0) {
-        getLogger().info('CreatePolicy canceled: No document selected')
-        return undefined
-    }
-
-    const policyLocation = fileLocation[0]
-
-    let data: Buffer
-    try {
-        data = await fs.readFile(policyLocation.fsPath)
-    } catch (e) {
-        getLogger().error('Failed to read policy document: %s', e)
-        showViewLogsMessage(localize('AWS.iot.createPolicy.error', 'Failed to read policy document'), window)
-        return undefined
-    }
-
-    return data
-}
-
-/**
- * Validates a Policy name for the CreatePolicy API. See
- * https://docs.aws.amazon.com/iot/latest/apireference/API_CreatePolicy.html
- * for more information. Pattern: `[\w+=,.@-]+`.
- */
-function validatePolicyName(name: string): string | undefined {
-    if (name.length < 1 || name.length > 128) {
-        return localize(
-            'AWS.iot.validatePolicyName.error.invalidLength',
-            'Policy name must be between 1 and 128 characters long'
-        )
-    }
-    if (!/^[\w+=,.@-]+$/.test(name)) {
-        return localize(
-            'AWS.iot.validatePolicyName.error.invalidCharacters',
-            'Policy name must contain only alphanumeric characters and/or the following: +=.,@-'
-        )
-    }
-    return undefined
-}
diff --git a/src/iot/commands/createPolicyVersion.ts b/src/iot/commands/createPolicyVersion.ts
deleted file mode 100644
index fb490588df9..00000000000
--- a/src/iot/commands/createPolicyVersion.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { getLogger } from '../../shared/logger'
-import { Commands } from '../../shared/vscode/commands'
-import { Window } from '../../shared/vscode/window'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { showViewLogsMessage } from '../../shared/utilities/messages'
-import { IotPolicyWithVersionsNode } from '../explorer/iotPolicyNode'
-import { getPolicyDocument } from './createPolicy'
-
-/**
- * Creates a new policy version from a policy document.
- */
-export async function createPolicyVersionCommand(
-    node: IotPolicyWithVersionsNode,
-    getPolicyDoc = getPolicyDocument,
-    window = Window.vscode(),
-    commands = Commands.vscode()
-): Promise<void> {
-    getLogger().debug('CreatePolicyVersion called for %O', node)
-
-    const policyName = node.policy.name
-
-    const data = await getPolicyDoc(window)
-    if (!data) {
-        return
-    }
-
-    try {
-        //Parse to ensure this is a valid JSON
-        const policyJSON = JSON.parse(data.toString())
-        await node.iot.createPolicyVersion({
-            policyName,
-            policyDocument: JSON.stringify(policyJSON),
-            setAsDefault: true,
-        })
-        window.showInformationMessage(
-            localize('AWS.iot.createPolicy.success', 'Created new version of {0}', policyName)
-        )
-    } catch (e) {
-        getLogger().error('Failed to create new policy version: %s', e)
-        showViewLogsMessage(
-            localize('AWS.iot.createPolicyVersion.error', 'Failed to create new version of {0}', policyName),
-            window
-        )
-        return
-    }
-
-    //Refresh the node
-    node.refresh()
-}
diff --git a/src/iot/commands/createThing.ts b/src/iot/commands/createThing.ts
deleted file mode 100644
index 309846e6a01..00000000000
--- a/src/iot/commands/createThing.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { getLogger } from '../../shared/logger'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { Commands } from '../../shared/vscode/commands'
-import { Window } from '../../shared/vscode/window'
-import { showViewLogsMessage } from '../../shared/utilities/messages'
-import { IotThingFolderNode } from '../explorer/iotThingFolderNode'
-
-/**
- * Creates an IoT Thing.
- *
- * Prompts the user for the thing name.
- * Creates the thing.
- * Refreshes the node.
- */
-export async function createThingCommand(
-    node: IotThingFolderNode,
-    window = Window.vscode(),
-    commands = Commands.vscode()
-): Promise<void> {
-    getLogger().debug('CreateThing called for: %O', node)
-
-    const thingName = await window.showInputBox({
-        prompt: localize('AWS.iot.createThing.prompt', 'Enter a new Thing name'),
-        placeHolder: localize('AWS.iot.createThing.placeHolder', 'Thing Name'),
-        validateInput: validateThingName,
-    })
-
-    if (!thingName) {
-        getLogger().info('CreateThing canceled')
-        return
-    }
-
-    getLogger().info(`Creating thing: ${thingName}`)
-    try {
-        const thing = await node.iot.createThing({ thingName })
-
-        getLogger().info('Created thing: %O', thing)
-        window.showInformationMessage(localize('AWS.iot.createThing.success', 'Created Thing {0}', thingName))
-    } catch (e) {
-        getLogger().error(`Failed to create Thing ${thingName}: %s`, e)
-        showViewLogsMessage(localize('AWS.iot.createThing.error', 'Failed to create Thing: {0}', thingName), window)
-    }
-
-    //Refresh the Things Folder node
-    await node.refreshNode(commands)
-}
-
-/**
- * Validates a Thing name for the CreateThing API. See
- * https://docs.aws.amazon.com/iot/latest/apireference/API_CreateThing.html
- * for more information. Pattern: `[a-zA-Z0-9:_-]+`.
- */
-function validateThingName(name: string): string | undefined {
-    if (name.length < 1 || name.length > 128) {
-        return localize(
-            'AWS.iot.validateThingName.error.invalidLength',
-            'Thing name must be between 1 and 128 characters long'
-        )
-    }
-    if (!/^[a-zA-Z0-9:_-]+$/.test(name)) {
-        return localize(
-            'AWS.iot.validateThingName.error.invalidCharacters',
-            'Thing name must only contain alphanumeric characters, hyphens, underscores, or colons'
-        )
-    }
-    return undefined
-}
diff --git a/src/iot/commands/deleteCert.ts b/src/iot/commands/deleteCert.ts
deleted file mode 100644
index 90e416fcc20..00000000000
--- a/src/iot/commands/deleteCert.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as localizedText from '../../shared/localizedText'
-import { getLogger } from '../../shared/logger'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { Commands } from '../../shared/vscode/commands'
-import { Window } from '../../shared/vscode/window'
-import { showViewLogsMessage, showConfirmationMessage } from '../../shared/utilities/messages'
-import { IotCertWithPoliciesNode } from '../explorer/iotCertificateNode'
-
-/**
- * Deletes the certificate represented by the given node.
- *
- * Checks if certificate is not attached to any things.
- * Prompts the user for confirmation.
- * Deletes the policy.
- * Refreshes the parent node.
- */
-export async function deleteCertCommand(
-    node: IotCertWithPoliciesNode,
-    window = Window.vscode(),
-    commands = Commands.vscode()
-): Promise<void> {
-    getLogger().debug('DeleteThing called for %O', node)
-
-    const certArn = node.certificate.arn
-
-    if (node.certificate.activeStatus === 'ACTIVE') {
-        getLogger().error('Certificate is active')
-        window.showErrorMessage(localize('AWS.iot.deleteCert.activeError', 'Active certificates cannot be deleted'))
-        return
-    }
-
-    try {
-        const things = await node.iot.listThingsForCert({ principal: certArn })
-        if (things.length > 0) {
-            getLogger().error(`Certificate ${node.certificate.id} has attached Things`)
-            window.showErrorMessage(
-                localize(
-                    'AWS.iot.deleteCert.attachedError',
-                    'Cannot delete certificate. Certificate has attached resources: {0}',
-                    things.join(', ')
-                )
-            )
-            return
-        }
-    } catch (e) {
-        getLogger().error(`Failed to retrieve Things attached to cert ${node.certificate.id}: %s`, e)
-        showViewLogsMessage(
-            localize('AWS.iot.deleteCert.retrieveError', 'Failed to retrieve {0} attached to certificate', 'Things'),
-            window
-        )
-        return
-    }
-
-    const isConfirmed = await showConfirmationMessage(
-        {
-            prompt: localize(
-                'AWS.iot.deleteCert.prompt',
-                'Are you sure you want to delete Certificate {0}?',
-                node.certificate.id
-            ),
-            confirm: localizedText.localizedDelete,
-            cancel: localizedText.cancel,
-        },
-        window
-    )
-    if (!isConfirmed) {
-        getLogger().info('DeleteCert canceled')
-        return
-    }
-
-    let forceDelete: boolean = false
-    try {
-        const policies = (await node.iot.listPrincipalPolicies({ principal: certArn })).policies
-        if (policies?.length ?? 0 > 0) {
-            forceDelete = await showConfirmationMessage(
-                {
-                    prompt: localize(
-                        'AWS.iot.deleteCert.attachedError',
-                        'Certificate has attached {0}',
-                        'policies. Delete anyway?'
-                    ),
-                    confirm: localizedText.localizedDelete,
-                    cancel: localizedText.cancel,
-                },
-                window
-            )
-            if (!forceDelete) {
-                getLogger().info('DeleteCert canceled')
-                return
-            }
-        }
-    } catch (e) {
-        getLogger().error(`Failed to retrieve Policies attached to cert ${node.certificate.id}: %s`, e)
-        showViewLogsMessage(
-            localize('AWS.iot.deleteCert.retrieveError', 'Failed to retrieve {0} attached to certificate', 'policies'),
-            window
-        )
-    }
-
-    getLogger().info(`Deleting certificate ${node.certificate.id}`)
-    try {
-        await node.iot.deleteCertificate({ certificateId: node.certificate.id, forceDelete: forceDelete })
-
-        getLogger().info(`deleted certificate: ${node.certificate.id}`)
-        window.showInformationMessage(
-            localize('AWS.iot.deleteCert.success', 'Deleted certificate: {0}', node.certificate.id)
-        )
-    } catch (e) {
-        getLogger().error(`Failed to delete Certificate ${node.certificate.id}: %s`, e)
-        showViewLogsMessage(
-            localize('AWS.iot.deleteCert.error', 'Failed to delete certificate: {0}', node.certificate.id),
-            window
-        )
-    }
-
-    //Refresh the Certificate Folder node
-    await node.parent.refreshNode(commands)
-}
diff --git a/src/iot/commands/deletePolicy.ts b/src/iot/commands/deletePolicy.ts
deleted file mode 100644
index 040203c746c..00000000000
--- a/src/iot/commands/deletePolicy.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as localizedText from '../../shared/localizedText'
-import { getLogger } from '../../shared/logger'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { Commands } from '../../shared/vscode/commands'
-import { Window } from '../../shared/vscode/window'
-import { IotPolicyWithVersionsNode } from '../explorer/iotPolicyNode'
-import { showViewLogsMessage, showConfirmationMessage } from '../../shared/utilities/messages'
-
-/**
- * Deletes the policy represented by the given node.
- *
- * Checks if policy is not attached to any certificates.
- * Prompts the user for confirmation.
- * Deletes the policy.
- * Refreshes the parent node.
- */
-export async function deletePolicyCommand(
-    node: IotPolicyWithVersionsNode,
-    window = Window.vscode(),
-    commands = Commands.vscode()
-): Promise<void> {
-    getLogger().debug('DeletePolicy called for %O', node)
-
-    const policyName = node.policy.name
-
-    const isConfirmed = await showConfirmationMessage(
-        {
-            prompt: localize('AWS.iot.deletePolicy.prompt', 'Are you sure you want to delete Policy {0}?', policyName),
-            confirm: localizedText.localizedDelete,
-            cancel: localizedText.cancel,
-        },
-        window
-    )
-    if (!isConfirmed) {
-        getLogger().info('DeletePolicy canceled')
-        return
-    }
-
-    getLogger().info(`Deleting policy ${policyName}`)
-    try {
-        const certs = await node.iot.listPolicyTargets({ policyName })
-        if (certs.length > 0) {
-            getLogger().error(`Policy ${policyName} has attached Certificates`)
-            window.showErrorMessage(
-                localize(
-                    'AWS.iot.deletePolicy.attachedError',
-                    'Cannot delete {0}. Policy has attached certificates: {1}',
-                    policyName,
-                    certs.join(', ')
-                )
-            )
-            return
-        }
-        const versions = node.iot.listPolicyVersions({ policyName })
-        let numVersions: number = 0
-        for await (const _version of versions) {
-            numVersions++
-        }
-        if (numVersions != 1) {
-            getLogger().error(`Policy ${policyName} has non-default versions`)
-            window.showErrorMessage(
-                localize('AWS.iot.deletePolicy.versionError', 'Policy {0} has non-default versions', policyName)
-            )
-            return
-        }
-        await node.iot.deletePolicy({ policyName })
-
-        getLogger().info(`deleted Policy: ${policyName}`)
-        window.showInformationMessage(localize('AWS.iot.deletePolicy.success', 'Deleted Policy: {0}', node.policy.name))
-    } catch (e) {
-        getLogger().error(`Failed to delete Policy: ${policyName}: %s`, e)
-        showViewLogsMessage(
-            localize('AWS.iot.deletePolicy.error', 'Failed to delete Policy: {0}', node.policy.name),
-            window
-        )
-    }
-
-    //Refresh the Policy Folder node
-    await node.parent.refreshNode(commands)
-}
diff --git a/src/iot/commands/deletePolicyVersion.ts b/src/iot/commands/deletePolicyVersion.ts
deleted file mode 100644
index 03427134ffc..00000000000
--- a/src/iot/commands/deletePolicyVersion.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as localizedText from '../../shared/localizedText'
-import { getLogger } from '../../shared/logger'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { Commands } from '../../shared/vscode/commands'
-import { Window } from '../../shared/vscode/window'
-import { showViewLogsMessage, showConfirmationMessage } from '../../shared/utilities/messages'
-import { IotPolicyVersionNode } from '../explorer/iotPolicyVersionNode'
-
-/**
- * Deletes the policy version represented by the given node.
- *
- * Prompts the user for confirmation.
- * Deletes the policy version.
- * Refreshes the parent node.
- */
-export async function deletePolicyVersionCommand(
-    node: IotPolicyVersionNode,
-    window = Window.vscode(),
-    commands = Commands.vscode()
-): Promise<void> {
-    getLogger().debug('DeletePolicyVersion called for %O', node)
-
-    const policyName = node.policy.name
-    const policyVersionId = node.version.versionId!
-
-    const isConfirmed = await showConfirmationMessage(
-        {
-            prompt: localize(
-                'AWS.iot.deletePolicyVersion.prompt',
-                'Are you sure you want to delete Version {0} of Policy {1}?',
-                policyVersionId,
-                policyName
-            ),
-            confirm: localizedText.localizedDelete,
-            cancel: localizedText.cancel,
-        },
-        window
-    )
-    if (!isConfirmed) {
-        getLogger().info('DeletePolicyVersion canceled')
-        return
-    }
-
-    getLogger().info(`Deleting version ${policyVersionId} of policy ${policyName}`)
-    try {
-        await node.iot.deletePolicyVersion({ policyName, policyVersionId })
-
-        getLogger().info(`deleted Policy Version: ${policyVersionId}`)
-        window.showInformationMessage(
-            localize(
-                'AWS.iot.deletePolicyVersion.success',
-                'Deleted Version {0} of Policy {1}',
-                policyVersionId,
-                policyName
-            )
-        )
-    } catch (e) {
-        getLogger().error(`Failed to delete Policy Version: ${policyVersionId}: %s`, e)
-        showViewLogsMessage(
-            localize(
-                'AWS.iot.deletePolicyVersion.error',
-                'Failed to delete Version {0} of Policy {1}',
-                policyVersionId,
-                policyName
-            ),
-            window
-        )
-    }
-
-    //Refresh the policy node
-    node.parent.refreshNode(commands)
-}
diff --git a/src/iot/commands/deleteThing.ts b/src/iot/commands/deleteThing.ts
deleted file mode 100644
index d1d18e7adde..00000000000
--- a/src/iot/commands/deleteThing.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as localizedText from '../../shared/localizedText'
-import { getLogger } from '../../shared/logger'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { Commands } from '../../shared/vscode/commands'
-import { Window } from '../../shared/vscode/window'
-import { IotThingNode } from '../explorer/iotThingNode'
-import { showViewLogsMessage, showConfirmationMessage } from '../../shared/utilities/messages'
-
-/**
- * Deletes the thing represented by the given node.
- *
- * Prompts the user for confirmation.
- * Deletes the thing.
- * Refreshes the parent node.
- */
-export async function deleteThingCommand(
-    node: IotThingNode,
-    window = Window.vscode(),
-    commands = Commands.vscode()
-): Promise<void> {
-    getLogger().debug('DeleteThing called for %O', node)
-
-    const thingName = node.thing.name
-
-    const isConfirmed = await showConfirmationMessage(
-        {
-            prompt: localize('AWS.iot.deleteThing.prompt', 'Are you sure you want to delete Thing {0}?', thingName),
-            confirm: localizedText.localizedDelete,
-            cancel: localizedText.cancel,
-        },
-        window
-    )
-    if (!isConfirmed) {
-        getLogger().info('DeleteThing canceled')
-        return
-    }
-
-    getLogger().info(`Deleting thing ${thingName}`)
-    try {
-        const principalList = (await node.iot.listThingPrincipals({ thingName })).principals
-        if (principalList?.length ?? 0 > 0) {
-            getLogger().error(`Thing ${thingName} has attached principals: %O`, principalList)
-            window.showErrorMessage(
-                localize(
-                    'AWS.iot.deleteThing.error',
-                    'Cannot delete Thing {0}. Thing {0} has attached principals: {1}',
-                    thingName,
-                    principalList?.join(', ')
-                )
-            )
-            return undefined
-        }
-        await node.iot.deleteThing({ thingName })
-
-        getLogger().info(`deleted Thing: ${thingName}`)
-        window.showInformationMessage(localize('AWS.iot.deleteThing.success', 'Deleted Thing: {0}', thingName))
-    } catch (e) {
-        getLogger().error(`Failed to delete Thing: ${thingName}: %s`, e)
-        showViewLogsMessage(localize('AWS.iot.deleteThing.error', 'Failed to delete Thing: {0}', thingName), window)
-    }
-
-    //Refresh the Things Folder node
-    node.parent.refreshNode(commands)
-}
diff --git a/src/iot/commands/detachCert.ts b/src/iot/commands/detachCert.ts
deleted file mode 100644
index 729e51bc2a6..00000000000
--- a/src/iot/commands/detachCert.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as localizedText from '../../shared/localizedText'
-import { getLogger } from '../../shared/logger'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { Commands } from '../../shared/vscode/commands'
-import { Window } from '../../shared/vscode/window'
-import { IotThingCertNode } from '../explorer/iotCertificateNode'
-import { showViewLogsMessage, showConfirmationMessage } from '../../shared/utilities/messages'
-
-/**
- * Detaches a certificate from an IoT Thing.
- *
- * Prompts the user for confirmation.
- * Detaches the certificate.
- * Refreshes the parent node.
- */
-export async function detachThingCertCommand(
-    node: IotThingCertNode,
-    window = Window.vscode(),
-    commands = Commands.vscode()
-): Promise<void> {
-    getLogger().debug('DetachCert called for %O', node)
-
-    const certId = node.certificate.id
-    const certArn = node.certificate.arn
-    const thingName = node.parent.thing.name
-
-    const isConfirmed = await showConfirmationMessage(
-        {
-            prompt: localize(
-                'AWS.iot.detachCert.prompt',
-                'Are you sure you want to detach certificate from Thing {0}?',
-                thingName
-            ),
-            confirm: localize('AWS.iot.detachCert.confirm', 'Detach'),
-            cancel: localizedText.cancel,
-        },
-        window
-    )
-    if (!isConfirmed) {
-        getLogger().info('DetachCert canceled')
-        return
-    }
-
-    getLogger().info(`Detaching certificate: ${certId}`)
-    try {
-        await node.iot.detachThingPrincipal({ thingName, principal: certArn })
-
-        getLogger().info(`detached certificate from Thing: ${thingName}`)
-        window.showInformationMessage(localize('AWS.iot.detachCert.success', 'Detached: {0}', certId))
-    } catch (e) {
-        getLogger().error(`Failed to detach certificate: ${certId}: %s`, e)
-        showViewLogsMessage(localize('AWS.iot.detachCert.error', 'Failed to detach: {0}', certId), window)
-    }
-
-    //Refresh the parent Thing node
-    await node.parent.refreshNode(commands)
-}
diff --git a/src/iot/commands/detachPolicy.ts b/src/iot/commands/detachPolicy.ts
deleted file mode 100644
index 69cdeb5f167..00000000000
--- a/src/iot/commands/detachPolicy.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as localizedText from '../../shared/localizedText'
-import { getLogger } from '../../shared/logger'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { Commands } from '../../shared/vscode/commands'
-import { Window } from '../../shared/vscode/window'
-import { showViewLogsMessage, showConfirmationMessage } from '../../shared/utilities/messages'
-import { IotPolicyCertNode } from '../explorer/iotPolicyNode'
-import { IotPolicyFolderNode } from '../explorer/iotPolicyFolderNode'
-import { IotCertificateNode, IotCertWithPoliciesNode, IotThingCertNode } from '../explorer/iotCertificateNode'
-import { IotNode } from '../explorer/iotNodes'
-
-/**
- * Detaches an IoT Policy from a certificate.
- *
- * Prompts the user for confirmation.
- * Detaches the policy.
- * Refreshes the parent node.
- */
-export async function detachPolicyCommand(
-    node: IotPolicyCertNode,
-    window = Window.vscode(),
-    commands = Commands.vscode()
-): Promise<void> {
-    getLogger().debug('DetachPolicy called for %O', node)
-
-    const policyName = node.policy.name
-    if (node.parent instanceof IotPolicyFolderNode) {
-        return undefined
-    }
-    const certId = node.parent.certificate.id
-    const certArn = node.parent.certificate.arn
-
-    const isConfirmed = await showConfirmationMessage(
-        {
-            prompt: localize('AWS.iot.detachPolicy.prompt', 'Are you sure you want to detach policy {0}?', policyName),
-            confirm: localize('AWS.iot.detachCert.confirm', 'Detach'),
-            cancel: localizedText.cancel,
-        },
-        window
-    )
-    if (!isConfirmed) {
-        getLogger().info('DetachCert canceled')
-        return
-    }
-
-    getLogger().info(`Detaching certificate: ${certId}`)
-    try {
-        await node.iot.detachPolicy({ policyName, target: certArn })
-
-        getLogger().info(`detached policy: ${policyName}`)
-        window.showInformationMessage(localize('AWS.iot.detachPolicy.success', 'Detached: {0}', policyName))
-    } catch (e) {
-        getLogger().error(`Failed to detach certificate: ${certId}: %s`, e)
-        showViewLogsMessage(localize('AWS.iot.detachPolicy.error', 'Failed to detach: {0}', policyName), window)
-    }
-
-    /* Refresh both things and certificates nodes so the status is updated in
-     * both trees. */
-    const baseNode = getBaseNode(node.parent)
-    await baseNode?.thingFolderNode?.refreshNode(commands)
-    await baseNode?.certFolderNode?.refreshNode(commands)
-}
-
-/**
- * Gets the node at the root of the IoT tree. This is so nodes in multiple
- * subtrees can be refreshed when an action affects more than one node.
- */
-function getBaseNode(node: IotCertificateNode): IotNode | undefined {
-    if (node instanceof IotThingCertNode) {
-        return node.parent.parent.parent
-    }
-    if (node instanceof IotCertWithPoliciesNode) {
-        return node.parent.parent
-    }
-    return undefined
-}
diff --git a/src/iot/commands/setDefaultPolicy.ts b/src/iot/commands/setDefaultPolicy.ts
deleted file mode 100644
index 3f31aed3b33..00000000000
--- a/src/iot/commands/setDefaultPolicy.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { getLogger } from '../../shared/logger'
-import { Window } from '../../shared/vscode/window'
-import { Commands } from '../../shared/vscode/commands'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { IotPolicyVersionNode } from '../explorer/iotPolicyVersionNode'
-import { showViewLogsMessage } from '../../shared/utilities/messages'
-import { IotPolicyWithVersionsNode } from '../explorer/iotPolicyNode'
-
-/**
- * Copies the path to the folder or file represented by the given node.
- *
- * Note that the path does not contain the bucket name or a leading slash.
- */
-export async function setDefaultPolicy(
-    node: IotPolicyVersionNode,
-    window = Window.vscode(),
-    commands = Commands.vscode()
-): Promise<void> {
-    getLogger().debug('SetDefaultPolicy called for %O', node)
-
-    try {
-        await node.iot.setDefaultPolicyVersion({
-            policyName: node.policy.name,
-            policyVersionId: node.version.versionId!,
-        })
-        window.showInformationMessage(
-            localize(
-                'AWS.iot.setDefaultPolicy.success',
-                'Set {0} as default version of {1}',
-                node.version.versionId,
-                node.policy.name
-            )
-        )
-    } catch (e) {
-        getLogger().error('Failed to set default policy version: %s', e)
-        showViewLogsMessage(localize('AWS.iot.setDefaultPolicy.error', 'Failed to set default policy version'), window)
-    }
-
-    await refreshBase(node.parent, commands)
-}
-
-async function refreshBase(node: IotPolicyWithVersionsNode, commands: Commands): Promise<void> {
-    return commands.execute('aws.refreshAwsExplorerNode', node)
-}
diff --git a/src/iot/commands/updateCert.ts b/src/iot/commands/updateCert.ts
deleted file mode 100644
index 02e32a76ebd..00000000000
--- a/src/iot/commands/updateCert.ts
+++ /dev/null
@@ -1,183 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as localizedText from '../../shared/localizedText'
-import { getLogger } from '../../shared/logger'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { Commands } from '../../shared/vscode/commands'
-import { Window } from '../../shared/vscode/window'
-import { IotCertificateNode } from '../explorer/iotCertificateNode'
-import { showViewLogsMessage, showConfirmationMessage } from '../../shared/utilities/messages'
-import { IotThingNode } from '../explorer/iotThingNode'
-import { IotCertsFolderNode } from '../explorer/iotCertFolderNode'
-import { IotNode } from '../explorer/iotNodes'
-
-const statusRevoked = 'REVOKED'
-const statusActive = 'ACTIVE'
-const statusInactive = 'INACTIVE'
-
-/**
- * Deactivates an active certificate.
- *
- * Prompts the user for confirmation.
- * Deactivates the certificate.
- * Refreshes the parent node.
- */
-export async function deactivateCertificateCommand(
-    node: IotCertificateNode,
-    window = Window.vscode(),
-    commands = Commands.vscode()
-): Promise<void> {
-    getLogger().debug('DeactivateCert called for %O', node)
-
-    const certId = node.certificate.id
-
-    const isConfirmed = await showConfirmationMessage(
-        {
-            prompt: localize(
-                'AWS.iot.deactivateCert.prompt',
-                'Are you sure you want to deactivate certificate {0}?',
-                certId
-            ),
-            confirm: localize('AWS.iot.deactivateCert.confirm', 'Deactivate'),
-            cancel: localizedText.cancel,
-        },
-        window
-    )
-    if (!isConfirmed) {
-        getLogger().info('DeactivateCert canceled')
-        return
-    }
-
-    getLogger().info(`Deactivating certificate ${certId}`)
-    try {
-        await node.iot.updateCertificate({ certificateId: certId, newStatus: statusInactive })
-
-        getLogger().info(`deactivated certificate: ${certId}`)
-        window.showInformationMessage(
-            localize('AWS.iot.deactivateCert.success', 'Deactivated: {0}', node.certificate.id)
-        )
-    } catch (e) {
-        getLogger().error(`Failed to deactivate certificate ${certId}: %s`, e)
-        showViewLogsMessage(
-            localize('AWS.iot.deactivateCert.error', 'Failed to deactivate: {0}', node.certificate.id),
-            window
-        )
-    }
-
-    /* Refresh both things and certificates nodes so the status is updated in
-     * both trees. */
-    const baseNode = getBaseNode(node.parent)
-    await baseNode.thingFolderNode?.refreshNode(commands)
-    await baseNode.certFolderNode?.refreshNode(commands)
-}
-
-/**
- * Activates an inactive certificate.
- *
- * Prompts the user for confirmation.
- * Activates the certificate.
- * Refreshes the parent node.
- */
-export async function activateCertificateCommand(
-    node: IotCertificateNode,
-    window = Window.vscode(),
-    commands = Commands.vscode()
-): Promise<void> {
-    getLogger().debug('ActivateCert called for %O', node)
-
-    const certId = node.certificate.id
-
-    const isConfirmed = await showConfirmationMessage(
-        {
-            prompt: localize(
-                'AWS.iot.activateCert.prompt',
-                'Are you sure you want to activate certificate {0}?',
-                certId
-            ),
-            confirm: localize('AWS.iot.activateCert.confirm', 'Activate'),
-            cancel: localizedText.cancel,
-        },
-        window
-    )
-    if (!isConfirmed) {
-        getLogger().info('ActivateCert canceled')
-        return
-    }
-
-    getLogger().info(`Activating certificate ${certId}`)
-    try {
-        await node.iot.updateCertificate({ certificateId: certId, newStatus: statusActive })
-
-        getLogger().info(`activated certificate: ${certId}`)
-        window.showInformationMessage(localize('AWS.iot.activateCert.success', 'Activated: {0}', node.certificate.id))
-    } catch (e) {
-        getLogger().error(`Failed to activate certificate ${certId}: %s`, e)
-        showViewLogsMessage(
-            localize('AWS.iot.activateCert.error', 'Failed to activate: {0}', node.certificate.id),
-            window
-        )
-    }
-
-    /* Refresh both things and certificates nodes so the status is updated in
-     * both trees. */
-    const baseNode = getBaseNode(node.parent)
-    await baseNode.thingFolderNode?.refreshNode(commands)
-    await baseNode.certFolderNode?.refreshNode(commands)
-}
-
-/**
- * Revokes an active certificate.
- *
- * Prompts the user for confirmation.
- * Revokes the certificate.
- * Refreshes the parent node.
- */
-export async function revokeCertificateCommand(
-    node: IotCertificateNode,
-    window = Window.vscode(),
-    commands = Commands.vscode()
-): Promise<void> {
-    getLogger().debug('RevokeCert called for %O', node)
-
-    const certId = node.certificate.id
-
-    const isConfirmed = await showConfirmationMessage(
-        {
-            prompt: localize('AWS.iot.revokeCert.prompt', 'Are you sure you want to revoke certificate {0}?', certId),
-            confirm: localize('AWS.iot.revokeCert.confirm', 'Revoke'),
-            cancel: localizedText.cancel,
-        },
-        window
-    )
-    if (!isConfirmed) {
-        getLogger().info('RevokeCert canceled')
-        return
-    }
-
-    getLogger().info(`Revoking certificate: ${certId}`)
-    try {
-        await node.iot.updateCertificate({ certificateId: certId, newStatus: statusRevoked })
-
-        getLogger().info(`revoked certificate: ${certId}`)
-        window.showInformationMessage(localize('AWS.iot.revokeCert.success', 'Revoked: {0}', node.certificate.id))
-    } catch (e) {
-        getLogger().error(`Failed to revoke certificate ${certId}: %s`, e)
-        showViewLogsMessage(localize('AWS.iot.revokeCert.error', 'Failed to revoke: {0}', node.certificate.id), window)
-    }
-
-    /* Refresh both things and certificates nodes so the status is updated in
-     * both trees. */
-    const baseNode = getBaseNode(node.parent)
-    await baseNode.thingFolderNode?.refreshNode(commands)
-    await baseNode.certFolderNode?.refreshNode(commands)
-}
-
-function getBaseNode(node: IotThingNode | IotCertsFolderNode): IotNode {
-    if (node instanceof IotThingNode) {
-        return node.parent.parent
-    }
-    return node.parent
-}
diff --git a/src/iot/commands/viewPolicyVersion.ts b/src/iot/commands/viewPolicyVersion.ts
deleted file mode 100644
index 35c36a64d74..00000000000
--- a/src/iot/commands/viewPolicyVersion.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { getLogger } from '../../shared/logger'
-import { getTabSizeSetting } from '../../shared/utilities/editorUtilities'
-import { IotPolicyVersionNode } from '../explorer/iotPolicyVersionNode'
-import { showViewLogsMessage } from '../../shared/utilities/messages'
-
-export async function viewPolicyVersionCommand(node: IotPolicyVersionNode) {
-    getLogger().debug('viewPolicyVersion called for %O', node)
-
-    const policyVersionId = node.version.versionId!
-    const policyName = node.policy.name
-
-    try {
-        const policy = await node.iot.getPolicyVersion({ policyName, policyVersionId })
-        const document = policy.policyDocument!
-
-        await showPolicyContent(document)
-    } catch (e) {
-        getLogger().error('Failed to retrieve policy document')
-        showViewLogsMessage(localize('AWS.iot.viewPolicyVersion.error', 'Failed to retrieve policy document'))
-        return undefined
-    }
-}
-
-export function policyFormatter(rawPolicyContent: string, tabSize: number = getTabSizeSetting()): string {
-    const prettyPolicyContent = JSON.stringify(JSON.parse(rawPolicyContent), undefined, tabSize)
-
-    return prettyPolicyContent
-}
-
-export async function showPolicyContent(
-    rawPolicyContent: string,
-    tabSize: number = getTabSizeSetting()
-): Promise<void> {
-    const prettyPolicyContent = policyFormatter(rawPolicyContent, tabSize)
-    const newDoc = await vscode.workspace.openTextDocument({
-        language: 'json',
-        content: prettyPolicyContent,
-    })
-    await vscode.window.showTextDocument(newDoc, vscode.ViewColumn.One, false)
-}
diff --git a/src/iot/explorer/iotCertFolderNode.ts b/src/iot/explorer/iotCertFolderNode.ts
deleted file mode 100644
index 0a1cf7b8bf9..00000000000
--- a/src/iot/explorer/iotCertFolderNode.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { IotClient } from '../../shared/clients/iotClient'
-import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
-import { LoadMoreNode } from '../../shared/treeview/nodes/loadMoreNode'
-import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
-import { makeChildrenNodes } from '../../shared/treeview/utils'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { ChildNodeLoader } from '../../awsexplorer/childNodeLoader'
-import { ChildNodePage } from '../../awsexplorer/childNodeLoader'
-import { inspect } from 'util'
-import { Workspace } from '../../shared/vscode/workspace'
-import { getLogger } from '../../shared/logger'
-import { IotCertWithPoliciesNode } from './iotCertificateNode'
-import { IotNode } from './iotNodes'
-import { Commands } from '../../shared/vscode/commands'
-
-/**
- * Represents the group of all IoT Certificates.
- */
-export class IotCertsFolderNode extends AWSTreeNodeBase implements LoadMoreNode {
-    private readonly childLoader = new ChildNodeLoader(this, token => this.loadPage(token))
-
-    public constructor(
-        public readonly iot: IotClient,
-        public readonly parent: IotNode,
-        private readonly workspace = Workspace.vscode()
-    ) {
-        super('Certificates', vscode.TreeItemCollapsibleState.Collapsed)
-        this.tooltip = 'IoT Certificates'
-        this.contextValue = 'awsIotCertsNode'
-    }
-
-    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
-        return await makeChildrenNodes({
-            getChildNodes: async () => this.childLoader.getChildren(),
-            getNoChildrenPlaceholderNode: async () =>
-                new PlaceholderNode(this, localize('AWS.explorerNode.iot.noCerts', '[No Certificates found]')),
-        })
-    }
-
-    public async loadMoreChildren(): Promise<void> {
-        await this.childLoader.loadMoreChildren()
-    }
-
-    public isLoadingMoreChildren(): boolean {
-        return this.childLoader.isLoadingMoreChildren()
-    }
-
-    public clearChildren(): void {
-        this.childLoader.clearChildren()
-    }
-
-    private async loadPage(continuationToken: string | undefined): Promise<ChildNodePage<IotCertWithPoliciesNode>> {
-        getLogger().debug(`Loading page for %O using continuationToken %s`, this, continuationToken)
-        const response = await this.iot.listCertificates({
-            marker: continuationToken,
-            pageSize: this.getMaxItemsPerPage(),
-        })
-
-        const newCerts =
-            response.certificates
-                ?.filter(cert => cert.certificateArn && cert.certificateId && cert.status && cert.creationDate)
-                .map(
-                    async cert =>
-                        new IotCertWithPoliciesNode(
-                            {
-                                arn: cert.certificateArn!,
-                                id: cert.certificateId!,
-                                activeStatus: cert.status!,
-                                creationDate: cert.creationDate!,
-                            },
-                            this,
-                            this.iot,
-                            await this.iot.listThingsForCert({ principal: cert.certificateArn! })
-                        )
-                ) ?? []
-
-        const resolvedCerts = await Promise.all(newCerts)
-
-        getLogger().debug(`Loaded certificates: %O`, newCerts)
-        return {
-            newContinuationToken: response.nextMarker ?? undefined,
-            newChildren: [...resolvedCerts],
-        }
-    }
-
-    public async refreshNode(commands: Commands): Promise<void> {
-        this.clearChildren()
-        return commands.execute('aws.refreshAwsExplorerNode', this)
-    }
-
-    public [inspect.custom](): string {
-        return `IotCertificates`
-    }
-
-    private getMaxItemsPerPage(): number | undefined {
-        return this.workspace.getConfiguration('aws').get<number>('iot.maxItemsPerPage')
-    }
-}
diff --git a/src/iot/explorer/iotCertificateNode.ts b/src/iot/explorer/iotCertificateNode.ts
deleted file mode 100644
index 0371c28a314..00000000000
--- a/src/iot/explorer/iotCertificateNode.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as moment from 'moment'
-import { ChildNodePage } from '../../awsexplorer/childNodeLoader'
-import { IotClient, IotCertificate } from '../../shared/clients/iotClient'
-
-import { AWSResourceNode } from '../../shared/treeview/nodes/awsResourceNode'
-import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
-import { LoadMoreNode } from '../../shared/treeview/nodes/loadMoreNode'
-import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
-import { makeChildrenNodes } from '../../shared/treeview/utils'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { ChildNodeLoader } from '../../awsexplorer/childNodeLoader'
-import { Workspace } from '../../shared/vscode/workspace'
-import { inspect } from 'util'
-import { getLogger } from '../../shared/logger'
-import { IotCertsFolderNode } from './iotCertFolderNode'
-import { IotThingNode } from './iotThingNode'
-import { IotPolicyCertNode } from './iotPolicyNode'
-import { LOCALIZED_DATE_FORMAT } from '../../shared/constants'
-import { Commands } from '../../shared/vscode/commands'
-import { getIcon } from '../../shared/icons'
-
-const contextBase = 'awsIotCertificateNode'
-/**
- * Represents an IoT Certificate that may have either a Thing Node or the
- * Certificate Folder Node as a parent.
- */
-export abstract class IotCertificateNode extends AWSTreeNodeBase implements AWSResourceNode {
-    private readonly childLoader = new ChildNodeLoader(this, token => this.loadPage(token))
-
-    public constructor(
-        public readonly certificate: IotCertificate,
-        public readonly parent: IotCertsFolderNode | IotThingNode,
-        public readonly iot: IotClient,
-        collapsibleState: vscode.TreeItemCollapsibleState,
-        public readonly things?: string[],
-        protected readonly workspace = Workspace.vscode()
-    ) {
-        //Show only 8 characters in the explorer instead of the full 64. The entire
-        //ID can be copied from the context menu or viewed when hovered over.
-        super(certificate.id.substring(0, 8).concat('...'), collapsibleState)
-        this.tooltip = localize(
-            'AWS.explorerNode.iot.certTooltip',
-            '{0}\nStatus: {1}\nCreated: {2}{3}',
-            this.certificate.id,
-            this.certificate.activeStatus,
-            moment(this.certificate.creationDate).format(LOCALIZED_DATE_FORMAT),
-            things?.length ?? 0 > 0 ? `\nAttached to: ${things!.join(', ')}` : ''
-        )
-        this.iconPath = getIcon('aws-iot-certificate')
-        this.description = `\t[${this.certificate.activeStatus}]`
-        this.contextValue = `${contextBase}.${this.certificate.activeStatus}`
-    }
-
-    public update(): void {
-        return undefined
-    }
-
-    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
-        return await makeChildrenNodes({
-            getChildNodes: async () => this.childLoader.getChildren(),
-            getNoChildrenPlaceholderNode: async () =>
-                new PlaceholderNode(this, localize('AWS.explorerNode.iot.noPolicy', '[No Policies found]')),
-        })
-    }
-
-    public async loadMoreChildren(): Promise<void> {
-        await this.childLoader.loadMoreChildren()
-    }
-
-    public isLoadingMoreChildren(): boolean {
-        return this.childLoader.isLoadingMoreChildren()
-    }
-
-    public clearChildren(): void {
-        this.childLoader.clearChildren()
-    }
-
-    private async loadPage(continuationToken: string | undefined): Promise<ChildNodePage<IotPolicyCertNode>> {
-        getLogger().debug(`Loading page for %O using continuationToken %s`, this, continuationToken)
-        const response = await this.iot.listPrincipalPolicies({
-            principal: this.certificate.arn,
-            marker: continuationToken,
-            pageSize: this.getMaxItemsPerPage(),
-        })
-
-        const newPolicies =
-            response.policies
-                ?.filter(policy => policy.policyArn && policy.policyName)
-                .map(
-                    policy =>
-                        new IotPolicyCertNode({ arn: policy.policyArn!, name: policy.policyName! }, this, this.iot)
-                ) ?? []
-
-        getLogger().debug(`Loaded policies: %O`, newPolicies)
-        return {
-            newContinuationToken: response.nextMarker ?? undefined,
-            newChildren: [...newPolicies],
-        }
-    }
-
-    public async refreshNode(commands: Commands): Promise<void> {
-        this.clearChildren()
-        return commands.execute('aws.refreshAwsExplorerNode', this)
-    }
-
-    private getMaxItemsPerPage(): number | undefined {
-        return this.workspace.getConfiguration('aws').get<number>('iot.maxItemsPerPage')
-    }
-
-    public get arn(): string {
-        return this.certificate.arn
-    }
-
-    public get name(): string {
-        return this.certificate.id
-    }
-
-    public [inspect.custom](): string {
-        return `IotCertificateNode (certificate=${this.certificate.id})`
-    }
-}
-
-export class IotThingCertNode extends IotCertificateNode {
-    public constructor(
-        public override readonly certificate: IotCertificate,
-        public override readonly parent: IotThingNode,
-        public override readonly iot: IotClient,
-        public override readonly things?: string[],
-        protected override readonly workspace = Workspace.vscode()
-    ) {
-        super(certificate, parent, iot, vscode.TreeItemCollapsibleState.Collapsed, things, workspace)
-        this.contextValue = `${contextBase}.Things.${this.certificate.activeStatus}`
-    }
-}
-
-/**
- * Represents an IoT Certificate with the Certificate Folder Node as parent.
- */
-export class IotCertWithPoliciesNode extends IotCertificateNode implements LoadMoreNode {
-    public constructor(
-        public override readonly certificate: IotCertificate,
-        public override readonly parent: IotCertsFolderNode,
-        public override readonly iot: IotClient,
-        public override readonly things?: string[],
-        protected override readonly workspace = Workspace.vscode()
-    ) {
-        super(certificate, parent, iot, vscode.TreeItemCollapsibleState.Collapsed, things, workspace)
-        this.contextValue = `${contextBase}.Policies.${this.certificate.activeStatus}`
-    }
-}
diff --git a/src/iot/explorer/iotPolicyFolderNode.ts b/src/iot/explorer/iotPolicyFolderNode.ts
deleted file mode 100644
index 6135d681c57..00000000000
--- a/src/iot/explorer/iotPolicyFolderNode.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { IotClient } from '../../shared/clients/iotClient'
-import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
-import { LoadMoreNode } from '../../shared/treeview/nodes/loadMoreNode'
-import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
-import { makeChildrenNodes } from '../../shared/treeview/utils'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { ChildNodeLoader } from '../../awsexplorer/childNodeLoader'
-import { ChildNodePage } from '../../awsexplorer/childNodeLoader'
-import { inspect } from 'util'
-import { Workspace } from '../../shared/vscode/workspace'
-import { getLogger } from '../../shared/logger'
-import { IotPolicyWithVersionsNode } from './iotPolicyNode'
-import { IotNode } from './iotNodes'
-import { Commands } from '../../shared/vscode/commands'
-
-//Length of certificate ID. The certificate ID is the last segment of the ARN.
-const certIdLength = 64
-
-//Number of digits of the certificate ID to show
-const certPreviewLength = 8
-
-/**
- * Represents the group of all IoT Policies.
- */
-export class IotPolicyFolderNode extends AWSTreeNodeBase implements LoadMoreNode {
-    private readonly childLoader = new ChildNodeLoader(this, token => this.loadPage(token))
-
-    public constructor(
-        public readonly iot: IotClient,
-        public readonly parent: IotNode,
-        private readonly workspace = Workspace.vscode()
-    ) {
-        super('Policies', vscode.TreeItemCollapsibleState.Collapsed)
-        this.tooltip = 'IoT Policies'
-        this.contextValue = 'awsIotPoliciesNode'
-    }
-
-    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
-        return await makeChildrenNodes({
-            getChildNodes: async () => this.childLoader.getChildren(),
-            getNoChildrenPlaceholderNode: async () =>
-                new PlaceholderNode(this, localize('AWS.explorerNode.iot.noPolicy', '[No Policies found]')),
-        })
-    }
-
-    public async loadMoreChildren(): Promise<void> {
-        await this.childLoader.loadMoreChildren()
-    }
-
-    public isLoadingMoreChildren(): boolean {
-        return this.childLoader.isLoadingMoreChildren()
-    }
-
-    public clearChildren(): void {
-        this.childLoader.clearChildren()
-    }
-
-    private async loadPage(continuationToken: string | undefined): Promise<ChildNodePage<IotPolicyWithVersionsNode>> {
-        getLogger().debug(`Loading page for %O using continuationToken %s`, this, continuationToken)
-        const response = await this.iot.listPolicies({
-            marker: continuationToken,
-            pageSize: this.getMaxItemsPerPage(),
-        })
-        const newPolicies =
-            response.policies
-                ?.filter(policy => policy.policyArn && policy.policyName)
-                .map(
-                    async policy =>
-                        new IotPolicyWithVersionsNode(
-                            { arn: policy.policyArn!, name: policy.policyName! },
-                            this,
-                            this.iot,
-                            (await this.iot.listPolicyTargets({ policyName: policy.policyName! })).map(certId =>
-                                certId.slice(-certIdLength, -certIdLength + certPreviewLength)
-                            )
-                        )
-                ) ?? []
-
-        const resolvedPolicies = await Promise.all(newPolicies)
-
-        getLogger().debug(`Loaded policies: %O`, newPolicies)
-        return {
-            newContinuationToken: response.nextMarker ?? undefined,
-            newChildren: [...resolvedPolicies],
-        }
-    }
-
-    public async refreshNode(commands: Commands): Promise<void> {
-        this.clearChildren()
-        return commands.execute('aws.refreshAwsExplorerNode', this)
-    }
-
-    public [inspect.custom](): string {
-        return `IotPolicies`
-    }
-
-    private getMaxItemsPerPage(): number | undefined {
-        return this.workspace.getConfiguration('aws').get<number>('iot.maxItemsPerPage')
-    }
-}
diff --git a/src/iot/explorer/iotPolicyNode.ts b/src/iot/explorer/iotPolicyNode.ts
deleted file mode 100644
index 7edf67c34af..00000000000
--- a/src/iot/explorer/iotPolicyNode.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { Iot } from 'aws-sdk'
-import { IotClient, IotPolicy } from '../../shared/clients/iotClient'
-
-import { AWSResourceNode } from '../../shared/treeview/nodes/awsResourceNode'
-import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
-import { Workspace } from '../../shared/vscode/workspace'
-import { inspect } from 'util'
-import { IotPolicyFolderNode } from './iotPolicyFolderNode'
-import { IotCertificateNode } from './iotCertificateNode'
-import { IotPolicyVersionNode } from './iotPolicyVersionNode'
-import { makeChildrenNodes } from '../../shared/treeview/utils'
-import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
-import { toArrayAsync, toMap, updateInPlace } from '../../shared/utilities/collectionUtils'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { Commands } from '../../shared/vscode/commands'
-import { getIcon } from '../../shared/icons'
-
-/**
- * Represents an IoT Policy that may have either a Certificate Node or the
- * Policy Folder Node as a parent.
- */
-export class IotPolicyNode extends AWSTreeNodeBase implements AWSResourceNode {
-    public constructor(
-        public readonly policy: IotPolicy,
-        public readonly parent: IotPolicyFolderNode | IotCertificateNode,
-        public readonly iot: IotClient,
-        collapsibleState: vscode.TreeItemCollapsibleState,
-        certs?: string[],
-        protected readonly workspace = Workspace.vscode()
-    ) {
-        super(policy.name, collapsibleState)
-        this.tooltip = localize(
-            'AWS.explorerNode.iot.policyToolTip',
-            '{0}{1}',
-            policy.name,
-            certs?.length ?? 0 > 0 ? `\nAttached to: ${certs?.join(', ')}` : ''
-        )
-        this.iconPath = getIcon('aws-iot-policy')
-        this.contextValue = 'awsIotPolicyNode.Certificates'
-    }
-
-    public get arn(): string {
-        return this.policy.arn
-    }
-
-    public get name(): string {
-        return this.policy.name
-    }
-
-    public [inspect.custom](): string {
-        return `IotPolicyNode (policy=${this.policy.name})`
-    }
-}
-
-export class IotPolicyCertNode extends IotPolicyNode {
-    public constructor(
-        public override readonly policy: IotPolicy,
-        public override readonly parent: IotCertificateNode,
-        public override readonly iot: IotClient,
-        protected override readonly workspace = Workspace.vscode()
-    ) {
-        super(policy, parent, iot, vscode.TreeItemCollapsibleState.None, undefined, workspace)
-        this.contextValue = 'awsIotPolicyNode.Certificates'
-    }
-}
-
-export class IotPolicyWithVersionsNode extends IotPolicyNode {
-    private readonly versionNodes: Map<string, IotPolicyVersionNode>
-
-    public constructor(
-        public override readonly policy: IotPolicy,
-        public override readonly parent: IotPolicyFolderNode,
-        public override readonly iot: IotClient,
-        certs?: string[],
-        protected override readonly workspace = Workspace.vscode()
-    ) {
-        super(policy, parent, iot, vscode.TreeItemCollapsibleState.Collapsed, certs, workspace)
-        this.contextValue = 'awsIotPolicyNode.WithVersions'
-        this.versionNodes = new Map<string, IotPolicyVersionNode>()
-    }
-
-    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
-        return await makeChildrenNodes({
-            getChildNodes: async () => {
-                await this.updateChildren()
-
-                return [...this.versionNodes.values()]
-            },
-            sort: (a: IotPolicyVersionNode, b: IotPolicyVersionNode) => {
-                return b.version.createDate!.getTime() - a.version.createDate!.getTime()
-            },
-            getNoChildrenPlaceholderNode: async () =>
-                new PlaceholderNode(this, localize('AWS.explorerNode.iot.noVersions', '[No Policy Versions found]')),
-        })
-    }
-
-    public async updateChildren(): Promise<void> {
-        const versions: Map<string, Iot.PolicyVersion> = toMap(
-            await toArrayAsync(this.iot.listPolicyVersions({ policyName: this.policy.name })),
-            version => version.versionId
-        )
-
-        updateInPlace(
-            this.versionNodes,
-            versions.keys(),
-            key => this.versionNodes.get(key)!.update(versions.get(key)!),
-            key => new IotPolicyVersionNode(this.policy, versions.get(key)!, false, this, this.iot)
-        )
-    }
-
-    public async refreshNode(commands: Commands): Promise<void> {
-        return commands.execute('aws.refreshAwsExplorerNode', this)
-    }
-}
diff --git a/src/iot/explorer/iotPolicyVersionNode.ts b/src/iot/explorer/iotPolicyVersionNode.ts
deleted file mode 100644
index fdbc920ab8f..00000000000
--- a/src/iot/explorer/iotPolicyVersionNode.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as moment from 'moment'
-import { Iot } from 'aws-sdk'
-import { IotClient, IotPolicy } from '../../shared/clients/iotClient'
-import { AWSResourceNode } from '../../shared/treeview/nodes/awsResourceNode'
-import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
-import { Workspace } from '../../shared/vscode/workspace'
-import { inspect } from 'util'
-import { IotPolicyWithVersionsNode } from './iotPolicyNode'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { LOCALIZED_DATE_FORMAT } from '../../shared/constants'
-
-/**
- * Represents an IoT Policy that may have either a Certificate Node or the
- * Policy Folder Node as a parent.
- */
-export class IotPolicyVersionNode extends AWSTreeNodeBase implements AWSResourceNode {
-    public constructor(
-        public policy: IotPolicy,
-        public version: Iot.PolicyVersion,
-        public isDefault: boolean,
-        public readonly parent: IotPolicyWithVersionsNode,
-        public readonly iot: IotClient,
-        protected readonly workspace = Workspace.vscode()
-    ) {
-        super(
-            localize(
-                'AWS.explorerNode.iot.versionName',
-                'Version {0}{1}',
-                version.versionId,
-                version.isDefaultVersion ? '*' : ''
-            )
-        )
-        this.update(version)
-    }
-
-    public update(version: Iot.PolicyVersion): void {
-        this.version = version
-        this.isDefault = version.isDefaultVersion ?? false
-        this.tooltip = localize(
-            'AWS.explorerNode.iot.versionTooltip',
-            'Policy: {0}\nVersion: {1}\n{2}Created: {3}',
-            this.policy.name,
-            this.version.versionId,
-            this.isDefault ? 'DEFAULT\n' : '',
-            moment(this.version.createDate).format(LOCALIZED_DATE_FORMAT)
-        )
-        this.label = localize(
-            'AWS.explorerNode.iot.versionName',
-            'Version {0}{1}',
-            version.versionId,
-            version.isDefaultVersion ? '*' : ''
-        )
-        this.contextValue = 'awsIotPolicyVersionNode.' + (this.isDefault ? 'DEFAULT' : 'NONDEFAULT')
-    }
-
-    public get arn(): string {
-        return this.parent.arn
-    }
-
-    public get name(): string {
-        return this.parent.name
-    }
-
-    public [inspect.custom](): string {
-        return `IotPolicyNode (policy=${this.policy.name})`
-    }
-}
diff --git a/src/iot/explorer/iotThingFolderNode.ts b/src/iot/explorer/iotThingFolderNode.ts
deleted file mode 100644
index a9cd3b3ac58..00000000000
--- a/src/iot/explorer/iotThingFolderNode.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { IotClient } from '../../shared/clients/iotClient'
-import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
-import { LoadMoreNode } from '../../shared/treeview/nodes/loadMoreNode'
-import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
-import { makeChildrenNodes } from '../../shared/treeview/utils'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { ChildNodeLoader } from '../../awsexplorer/childNodeLoader'
-import { ChildNodePage } from '../../awsexplorer/childNodeLoader'
-import { IotThingNode } from './iotThingNode'
-import { inspect } from 'util'
-import { Workspace } from '../../shared/vscode/workspace'
-import { getLogger } from '../../shared/logger'
-import { IotNode } from './iotNodes'
-import { Commands } from '../../shared/vscode/commands'
-
-/**
- * Represents the group of all IoT Things.
- */
-export class IotThingFolderNode extends AWSTreeNodeBase implements LoadMoreNode {
-    private readonly childLoader = new ChildNodeLoader(this, token => this.loadPage(token))
-
-    public constructor(
-        public readonly iot: IotClient,
-        public readonly parent: IotNode,
-        private readonly workspace = Workspace.vscode()
-    ) {
-        super('Things', vscode.TreeItemCollapsibleState.Collapsed)
-        this.tooltip = 'IoT Things'
-        this.contextValue = 'awsIotThingsNode'
-    }
-
-    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
-        return await makeChildrenNodes({
-            getChildNodes: async () => this.childLoader.getChildren(),
-            getNoChildrenPlaceholderNode: async () =>
-                new PlaceholderNode(this, localize('AWS.explorerNode.iot.noThings', '[No Things found]')),
-        })
-    }
-
-    public async loadMoreChildren(): Promise<void> {
-        await this.childLoader.loadMoreChildren()
-    }
-
-    public isLoadingMoreChildren(): boolean {
-        return this.childLoader.isLoadingMoreChildren()
-    }
-
-    public clearChildren(): void {
-        this.childLoader.clearChildren()
-    }
-
-    private async loadPage(continuationToken: string | undefined): Promise<ChildNodePage<IotThingNode>> {
-        getLogger().debug(`Loading page for %O using continuationToken %s`, this, continuationToken)
-        const response = await this.iot.listThings({
-            nextToken: continuationToken,
-            maxResults: this.getMaxItemsPerPage(),
-        })
-
-        let newThings: IotThingNode[] = []
-        if (response.things) {
-            newThings = response.things
-                .filter(thing => thing.thingName && thing.thingArn)
-                .map(thing => new IotThingNode({ name: thing.thingName!, arn: thing.thingArn! }, this, this.iot))
-        }
-
-        getLogger().debug(`Loaded things: %O`, newThings)
-        return {
-            newContinuationToken: response.nextToken ?? undefined,
-            newChildren: [...newThings],
-        }
-    }
-
-    public async refreshNode(commands: Commands): Promise<void> {
-        this.clearChildren()
-        return commands.execute('aws.refreshAwsExplorerNode', this)
-    }
-
-    public [inspect.custom](): string {
-        return `IotThings`
-    }
-
-    private getMaxItemsPerPage(): number | undefined {
-        return this.workspace.getConfiguration('aws').get<number>('iot.maxItemsPerPage')
-    }
-}
diff --git a/src/iot/explorer/iotThingNode.ts b/src/iot/explorer/iotThingNode.ts
deleted file mode 100644
index 4e30a01ad5f..00000000000
--- a/src/iot/explorer/iotThingNode.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { ChildNodePage } from '../../awsexplorer/childNodeLoader'
-import { IotThing, IotClient } from '../../shared/clients/iotClient'
-
-import { AWSResourceNode } from '../../shared/treeview/nodes/awsResourceNode'
-import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
-import { LoadMoreNode } from '../../shared/treeview/nodes/loadMoreNode'
-import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
-import { makeChildrenNodes } from '../../shared/treeview/utils'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { ChildNodeLoader } from '../../awsexplorer/childNodeLoader'
-import { Workspace } from '../../shared/vscode/workspace'
-import { inspect } from 'util'
-import { getLogger } from '../../shared/logger'
-import { IotThingFolderNode } from './iotThingFolderNode'
-import { IotThingCertNode } from './iotCertificateNode'
-import { Commands } from '../../shared/vscode/commands'
-import { getIcon } from '../../shared/icons'
-
-/**
- * Represents an IoT Thing that may have attached certificates.
- */
-export class IotThingNode extends AWSTreeNodeBase implements AWSResourceNode, LoadMoreNode {
-    private readonly childLoader = new ChildNodeLoader(this, token => this.loadPage(token))
-
-    public constructor(
-        public readonly thing: IotThing,
-        public readonly parent: IotThingFolderNode,
-        public readonly iot: IotClient,
-        private readonly workspace = Workspace.vscode()
-    ) {
-        super(thing.name, vscode.TreeItemCollapsibleState.Collapsed)
-        this.tooltip = thing.name
-        this.iconPath = getIcon('aws-iot-thing')
-        this.contextValue = 'awsIotThingNode'
-    }
-
-    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
-        return await makeChildrenNodes({
-            getChildNodes: async () => this.childLoader.getChildren(),
-            getNoChildrenPlaceholderNode: async () =>
-                new PlaceholderNode(this, localize('AWS.explorerNode.iot.noCerts', '[No Certificates found]')),
-        })
-    }
-
-    public async loadMoreChildren(): Promise<void> {
-        await this.childLoader.loadMoreChildren()
-    }
-
-    public isLoadingMoreChildren(): boolean {
-        return this.childLoader.isLoadingMoreChildren()
-    }
-
-    public clearChildren(): void {
-        this.childLoader.clearChildren()
-    }
-
-    private async loadPage(continuationToken: string | undefined): Promise<ChildNodePage<IotThingCertNode>> {
-        getLogger().debug(`Loading page for %O using continuationToken %s`, this, continuationToken)
-        const response = await this.iot.listThingCertificates({
-            thingName: this.thing.name,
-            nextToken: continuationToken,
-            maxResults: this.getMaxItemsPerPage(),
-        })
-
-        const newCerts =
-            response.certificates
-                ?.filter(cert => cert.certificateArn && cert.certificateId && cert.status && cert.creationDate)
-                .map(
-                    cert =>
-                        new IotThingCertNode(
-                            {
-                                arn: cert.certificateArn!,
-                                id: cert.certificateId!,
-                                activeStatus: cert.status!,
-                                creationDate: cert.creationDate!,
-                            },
-                            this,
-                            this.iot
-                        )
-                ) ?? []
-
-        getLogger().debug(`Loaded certificates: %O`, newCerts)
-        return {
-            newContinuationToken: response.nextToken ?? undefined,
-            newChildren: [...newCerts],
-        }
-    }
-
-    public get arn(): string {
-        return this.thing.arn
-    }
-
-    public get name(): string {
-        return this.thing.name
-    }
-
-    public async refreshNode(commands: Commands): Promise<void> {
-        this.clearChildren()
-        return commands.execute('aws.refreshAwsExplorerNode', this)
-    }
-
-    public [inspect.custom](): string {
-        return `IotThingNode (thing=${this.thing.name})`
-    }
-
-    private getMaxItemsPerPage(): number | undefined {
-        return this.workspace.getConfiguration('aws').get<number>('iot.maxItemsPerPage')
-    }
-}
diff --git a/src/lambda/activation.ts b/src/lambda/activation.ts
deleted file mode 100644
index 71b5daa06f5..00000000000
--- a/src/lambda/activation.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { deleteLambda } from './commands/deleteLambda'
-import { uploadLambdaCommand } from './commands/uploadLambda'
-import { LambdaFunctionNode } from './explorer/lambdaFunctionNode'
-import { downloadLambdaCommand } from './commands/downloadLambda'
-import { tryRemoveFolder } from '../shared/filesystemUtilities'
-import { ExtContext } from '../shared/extensions'
-import { invokeRemoteLambda } from './vue/remoteInvoke/invokeLambda'
-import { registerSamInvokeVueCommand } from './vue/configEditor/samInvokeBackend'
-import { Commands } from '../shared/vscode/commands2'
-import { DefaultLambdaClient } from '../shared/clients/lambdaClient'
-import { copyLambdaUrl } from './commands/copyLambdaUrl'
-
-/**
- * Activates Lambda components.
- */
-export async function activate(context: ExtContext): Promise<void> {
-    context.extensionContext.subscriptions.push(
-        Commands.register('aws.deleteLambda', async (node: LambdaFunctionNode) => {
-            await deleteLambda(node.configuration, new DefaultLambdaClient(node.regionCode))
-            await vscode.commands.executeCommand('aws.refreshAwsExplorerNode', node.parent)
-        }),
-        Commands.register(
-            'aws.invokeLambda',
-            async (node: LambdaFunctionNode) =>
-                await invokeRemoteLambda(context, { outputChannel: context.outputChannel, functionNode: node })
-        ),
-        // Capture debug finished events, and delete the temporary directory if it exists
-        vscode.debug.onDidTerminateDebugSession(async session => {
-            if (
-                session.configuration?.sam?.buildDir === undefined &&
-                session.configuration?.baseBuildDir !== undefined
-            ) {
-                await tryRemoveFolder(session.configuration.baseBuildDir)
-            }
-        }),
-        Commands.register('aws.downloadLambda', async (node: LambdaFunctionNode) => await downloadLambdaCommand(node)),
-        Commands.register({ id: 'aws.uploadLambda', autoconnect: true }, async (arg?: unknown) => {
-            if (arg instanceof LambdaFunctionNode) {
-                await uploadLambdaCommand({
-                    name: arg.functionName,
-                    region: arg.regionCode,
-                    configuration: arg.configuration,
-                })
-            } else if (arg instanceof vscode.Uri) {
-                await uploadLambdaCommand(undefined, arg)
-            } else {
-                await uploadLambdaCommand()
-            }
-        }),
-        Commands.register(
-            'aws.copyLambdaUrl',
-            async (node: LambdaFunctionNode) => await copyLambdaUrl(node, new DefaultLambdaClient(node.regionCode))
-        ),
-        registerSamInvokeVueCommand(context)
-    )
-}
diff --git a/src/lambda/commands/copyLambdaUrl.ts b/src/lambda/commands/copyLambdaUrl.ts
deleted file mode 100644
index d5405f99086..00000000000
--- a/src/lambda/commands/copyLambdaUrl.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { DefaultLambdaClient, LambdaClient } from '../../shared/clients/lambdaClient'
-import { LambdaFunctionNode } from '../explorer/lambdaFunctionNode'
-import globals from '../../shared/extensionGlobals'
-import { copyToClipboard } from '../../shared/utilities/messages'
-import { addCodiconToString } from '../../shared/utilities/textUtilities'
-import { createQuickPick, QuickPickPrompter } from '../../shared/ui/pickerPrompter'
-import { isValidResponse } from '../../shared/wizards/wizard'
-import { FunctionUrlConfigList } from 'aws-sdk/clients/lambda'
-import { CancellationError } from '../../shared/utilities/timeoutUtils'
-import { lambdaFunctionUrlConfigUrl } from '../../shared/constants'
-
-export const noLambdaFuncMessage = `No URL for Lambda function. [How to create URL.](${lambdaFunctionUrlConfigUrl})`
-
-export async function copyLambdaUrl(
-    node: Pick<LambdaFunctionNode, 'name' | 'regionCode'>,
-    client: LambdaClient = new DefaultLambdaClient(node.regionCode),
-    quickPickUrl = _quickPickUrl
-): Promise<void> {
-    const configs = await client.getFunctionUrlConfigs(node.name)
-
-    if (configs.length == 0) {
-        globals.window.showWarningMessage(noLambdaFuncMessage)
-        globals.window.setStatusBarMessage(addCodiconToString('circle-slash', 'No URL for Lambda function.'), 5000)
-    } else {
-        let url: string | undefined = undefined
-        if (configs.length > 1) {
-            url = await quickPickUrl(configs)
-        } else {
-            url = configs[0].FunctionUrl
-        }
-
-        if (url) {
-            copyToClipboard(url, 'URL')
-        }
-    }
-}
-
-async function _quickPickUrl(configList: FunctionUrlConfigList): Promise<string | undefined> {
-    const res = await createLambdaFuncUrlPrompter(configList).prompt()
-    if (!isValidResponse(res)) {
-        throw new CancellationError('user')
-    }
-    return res
-}
-
-export function createLambdaFuncUrlPrompter(configList: FunctionUrlConfigList): QuickPickPrompter<string> {
-    const items = configList.map(c => ({
-        label: c.FunctionArn,
-        data: c.FunctionUrl,
-    }))
-    return createQuickPick(items, { title: 'Select function to copy url from.' })
-}
diff --git a/src/lambda/commands/deleteCloudFormation.ts b/src/lambda/commands/deleteCloudFormation.ts
deleted file mode 100644
index 917707ead4d..00000000000
--- a/src/lambda/commands/deleteCloudFormation.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as vscode from 'vscode'
-import { DefaultCloudFormationClient } from '../../shared/clients/cloudFormationClient'
-
-import * as localizedText from '../../shared/localizedText'
-import { getLogger, Logger } from '../../shared/logger'
-import { Result } from '../../shared/telemetry/telemetry'
-import { CloudFormationStackNode } from '../explorer/cloudFormationNodes'
-import { showConfirmationMessage } from '../../shared/utilities/messages'
-import { Window } from '../../shared/vscode/window'
-import { getIdeProperties } from '../../shared/extensionUtilities'
-import { telemetry } from '../../shared/telemetry/telemetry'
-
-export async function deleteCloudFormation(refresh: () => void, node?: CloudFormationStackNode) {
-    const logger: Logger = getLogger()
-    let deleteResult: Result = 'Succeeded'
-    const stackName = node?.stackName ?? ''
-    try {
-        if (!node) {
-            deleteResult = 'Failed'
-            vscode.window.showErrorMessage(
-                localize(
-                    'AWS.message.error.cloudFormation.unsupported',
-                    'Unable to delete a CloudFormation Stack. No stack provided.'
-                )
-            )
-
-            return
-        }
-
-        const userResponse = await showConfirmationMessage(
-            {
-                prompt: localize(
-                    'AWS.message.prompt.deleteCloudFormation',
-                    'Are you sure you want to delete {0}?',
-                    stackName
-                ),
-                confirm: localizedText.localizedDelete,
-                cancel: localizedText.cancel,
-            },
-            Window.vscode()
-        )
-
-        if (userResponse) {
-            const client = new DefaultCloudFormationClient(node.regionCode)
-
-            await client.deleteStack(stackName)
-
-            vscode.window.showInformationMessage(
-                localize('AWS.message.info.cloudFormation.delete', 'Deleted CloudFormation Stack {0}', stackName)
-            )
-
-            refresh()
-        }
-    } catch (err) {
-        deleteResult = 'Failed'
-        logger.error(err as Error)
-
-        vscode.window.showInformationMessage(
-            localize(
-                'AWS.message.error.cloudFormation.delete',
-                'An error occurred while deleting {0}. Please check the stack events on the {1} Console',
-                stackName,
-                getIdeProperties().company
-            )
-        )
-    } finally {
-        telemetry.cloudformation_delete.emit({ result: deleteResult })
-    }
-}
diff --git a/src/lambda/commands/deleteLambda.ts b/src/lambda/commands/deleteLambda.ts
deleted file mode 100644
index b8dc072818e..00000000000
--- a/src/lambda/commands/deleteLambda.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as vscode from 'vscode'
-import * as localizedText from '../../shared/localizedText'
-import { DefaultLambdaClient } from '../../shared/clients/lambdaClient'
-import { Result } from '../../shared/telemetry/telemetry'
-import { showConfirmationMessage, showViewLogsMessage } from '../../shared/utilities/messages'
-import { FunctionConfiguration } from 'aws-sdk/clients/lambda'
-import { getLogger } from '../../shared/logger/logger'
-import { telemetry } from '../../shared/telemetry/telemetry'
-
-async function confirmDeletion(functionName: string, window = vscode.window): Promise<boolean> {
-    return showConfirmationMessage(
-        {
-            prompt: localize(
-                'AWS.command.deleteLambda.confirm',
-                "Are you sure you want to delete lambda function '{0}'?",
-                functionName
-            ),
-            confirm: localizedText.localizedDelete,
-            cancel: localizedText.cancel,
-        },
-        window
-    )
-}
-
-export async function deleteLambda(
-    lambda: Pick<FunctionConfiguration, 'FunctionName'>,
-    client: Pick<DefaultLambdaClient, 'deleteFunction'>,
-    window = vscode.window
-): Promise<void> {
-    if (!lambda.FunctionName) {
-        telemetry.lambda_delete.emit({ duration: 0, result: 'Failed' })
-
-        throw new TypeError('Lambda does not have a function name')
-    }
-
-    let deleteResult: Result = 'Succeeded'
-
-    try {
-        if (await confirmDeletion(lambda.FunctionName, window)) {
-            await client.deleteFunction(lambda.FunctionName)
-        } else {
-            deleteResult = 'Cancelled'
-        }
-    } catch (err) {
-        deleteResult = 'Failed'
-        getLogger().error(`Failed to delete lambda function "${lambda.FunctionName}": %s`, err)
-        const message = localize(
-            'AWS.command.deleteLambda.error',
-            "There was an error deleting lambda function '{0}'",
-            lambda.FunctionName
-        )
-
-        showViewLogsMessage(message, window)
-    } finally {
-        telemetry.lambda_delete.emit({
-            result: deleteResult,
-        })
-    }
-}
diff --git a/src/lambda/commands/deploySamApplication.ts b/src/lambda/commands/deploySamApplication.ts
deleted file mode 100644
index 4b5028b9723..00000000000
--- a/src/lambda/commands/deploySamApplication.ts
+++ /dev/null
@@ -1,326 +0,0 @@
-/*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as path from 'path'
-import * as vscode from 'vscode'
-import * as nls from 'vscode-nls'
-
-import { asEnvironmentVariables } from '../../credentials/credentialsUtilities'
-import { AwsContext } from '../../shared/awsContext'
-import globals from '../../shared/extensionGlobals'
-
-import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../../shared/filesystemUtilities'
-import { checklogs } from '../../shared/localizedText'
-import { getLogger } from '../../shared/logger'
-import { SamCliBuildInvocation } from '../../shared/sam/cli/samCliBuild'
-import { SamCliSettings } from '../../shared/sam/cli/samCliSettings'
-import { getSamCliContext, SamCliContext, getSamCliVersion } from '../../shared/sam/cli/samCliContext'
-import { runSamCliDeploy } from '../../shared/sam/cli/samCliDeploy'
-import { SamCliProcessInvoker } from '../../shared/sam/cli/samCliInvokerUtils'
-import { runSamCliPackage } from '../../shared/sam/cli/samCliPackage'
-import { throwAndNotifyIfInvalid } from '../../shared/sam/cli/samCliValidationUtils'
-import { Result } from '../../shared/telemetry/telemetry'
-import { addCodiconToString } from '../../shared/utilities/textUtilities'
-import { SamDeployWizardResponse } from '../wizards/samDeployWizard'
-import { telemetry } from '../../shared/telemetry/telemetry'
-
-const localize = nls.loadMessageBundle()
-
-interface DeploySamApplicationParameters {
-    sourceTemplatePath: string
-    deployRootFolder: string
-    environmentVariables: NodeJS.ProcessEnv
-    region: string
-    packageBucketName: string
-    ecrRepo?: string
-    destinationStackName: string
-    parameterOverrides: Map<string, string>
-}
-
-export interface WindowFunctions {
-    showInformationMessage: typeof vscode.window.showInformationMessage
-    showErrorMessage: typeof vscode.window.showErrorMessage
-    setStatusBarMessage(text: string, hideWhenDone: Thenable<any>): vscode.Disposable
-}
-
-export async function deploySamApplication(
-    {
-        samCliContext = getSamCliContext(),
-        samDeployWizard,
-    }: {
-        samCliContext?: SamCliContext
-        samDeployWizard: () => Promise<SamDeployWizardResponse | undefined>
-    },
-    {
-        awsContext,
-        settings,
-        window = getDefaultWindowFunctions(),
-        refreshFn = () => {
-            // no need to await, doesn't need to block further execution (true -> no telemetry)
-            vscode.commands.executeCommand('aws.refreshAwsExplorer', true)
-        },
-    }: {
-        awsContext: Pick<AwsContext, 'getCredentials' | 'getCredentialProfileName'>
-        settings: SamCliSettings
-        window?: WindowFunctions
-        refreshFn?: () => void
-    }
-): Promise<void> {
-    let deployResult: Result = 'Succeeded'
-    let samVersion: string | undefined
-    let deployFolder: string | undefined
-    try {
-        const credentials = await awsContext.getCredentials()
-        if (!credentials) {
-            throw new Error('No AWS profile selected')
-        }
-
-        throwAndNotifyIfInvalid(await samCliContext.validator.detectValidSamCli())
-
-        const deployWizardResponse = await samDeployWizard()
-
-        if (!deployWizardResponse) {
-            return
-        }
-
-        deployFolder = await makeTemporaryToolkitFolder('samDeploy')
-        samVersion = await getSamCliVersion(samCliContext)
-
-        const deployParameters: DeploySamApplicationParameters = {
-            deployRootFolder: deployFolder,
-            destinationStackName: deployWizardResponse.stackName,
-            packageBucketName: deployWizardResponse.s3Bucket,
-            ecrRepo: deployWizardResponse.ecrRepo?.repositoryUri,
-            parameterOverrides: deployWizardResponse.parameterOverrides,
-            environmentVariables: asEnvironmentVariables(credentials),
-            region: deployWizardResponse.region,
-            sourceTemplatePath: deployWizardResponse.template.fsPath,
-        }
-
-        const deployApplicationPromise = deploy({
-            deployParameters,
-            invoker: samCliContext.invoker,
-            window,
-        })
-
-        window.setStatusBarMessage(
-            addCodiconToString(
-                'cloud-upload',
-                localize(
-                    'AWS.samcli.deploy.statusbar.message',
-                    'Deploying SAM Application to {0}...',
-                    deployWizardResponse.stackName
-                )
-            ),
-            deployApplicationPromise
-        )
-
-        await deployApplicationPromise
-        refreshFn()
-
-        // successful deploy: retain S3 bucket for quick future access
-        const profile = awsContext.getCredentialProfileName()
-        if (profile) {
-            await settings.updateSavedBuckets(profile, deployWizardResponse.region, deployWizardResponse.s3Bucket)
-        } else {
-            getLogger().warn('Profile not provided; cannot write recent buckets.')
-        }
-    } catch (err) {
-        deployResult = 'Failed'
-        outputDeployError(err as Error)
-        vscode.window.showErrorMessage(
-            localize('AWS.samcli.deploy.workflow.error', 'Failed to deploy SAM application.')
-        )
-    } finally {
-        await tryRemoveFolder(deployFolder)
-        telemetry.sam_deploy.emit({ result: deployResult, version: samVersion })
-    }
-}
-
-function getBuildRootFolder(deployRootFolder: string): string {
-    return path.join(deployRootFolder, 'build')
-}
-
-function getBuildTemplatePath(deployRootFolder: string): string {
-    // Assumption: sam build will always produce a template.yaml file.
-    // If that is not the case, revisit this logic.
-    return path.join(getBuildRootFolder(deployRootFolder), 'template.yaml')
-}
-
-function getPackageTemplatePath(deployRootFolder: string): string {
-    return path.join(deployRootFolder, 'template.yaml')
-}
-
-async function buildOperation(params: {
-    deployParameters: DeploySamApplicationParameters
-    invoker: SamCliProcessInvoker
-}): Promise<boolean> {
-    try {
-        getLogger('channel').info(localize('AWS.samcli.deploy.workflow.init', 'Building SAM Application...'))
-
-        const buildDestination = getBuildRootFolder(params.deployParameters.deployRootFolder)
-
-        const build = new SamCliBuildInvocation({
-            buildDir: buildDestination,
-            baseDir: undefined,
-            templatePath: params.deployParameters.sourceTemplatePath,
-            invoker: params.invoker,
-        })
-
-        await build.execute()
-
-        return true
-    } catch (err) {
-        getLogger('channel').warn(
-            localize(
-                'AWS.samcli.build.failedBuild',
-                '"sam build" failed: {0}',
-                params.deployParameters.sourceTemplatePath
-            )
-        )
-        return false
-    }
-}
-
-async function packageOperation(
-    params: {
-        deployParameters: DeploySamApplicationParameters
-        invoker: SamCliProcessInvoker
-    },
-    buildSuccessful: boolean
-): Promise<void> {
-    if (!buildSuccessful) {
-        vscode.window.showInformationMessage(
-            localize(
-                'AWS.samcli.deploy.workflow.packaging.noBuild',
-                'Attempting to package source template directory directly since "sam build" failed'
-            )
-        )
-    }
-
-    getLogger('channel').info(
-        localize(
-            'AWS.samcli.deploy.workflow.packaging',
-            'Packaging SAM Application to S3 Bucket: {0}',
-            params.deployParameters.packageBucketName
-        )
-    )
-
-    // HACK: Attempt to package the initial template if the build fails.
-    const buildTemplatePath = buildSuccessful
-        ? getBuildTemplatePath(params.deployParameters.deployRootFolder)
-        : params.deployParameters.sourceTemplatePath
-    const packageTemplatePath = getPackageTemplatePath(params.deployParameters.deployRootFolder)
-
-    await runSamCliPackage(
-        {
-            sourceTemplateFile: buildTemplatePath,
-            destinationTemplateFile: packageTemplatePath,
-            environmentVariables: params.deployParameters.environmentVariables,
-            region: params.deployParameters.region,
-            s3Bucket: params.deployParameters.packageBucketName,
-            ecrRepo: params.deployParameters.ecrRepo,
-        },
-        params.invoker
-    )
-}
-
-async function deployOperation(params: {
-    deployParameters: DeploySamApplicationParameters
-    invoker: SamCliProcessInvoker
-}): Promise<void> {
-    try {
-        getLogger('channel').info(
-            localize(
-                'AWS.samcli.deploy.workflow.stackName.initiated',
-                'Deploying SAM Application to CloudFormation Stack: {0}',
-                params.deployParameters.destinationStackName
-            )
-        )
-
-        const packageTemplatePath = getPackageTemplatePath(params.deployParameters.deployRootFolder)
-
-        await runSamCliDeploy(
-            {
-                parameterOverrides: params.deployParameters.parameterOverrides,
-                environmentVariables: params.deployParameters.environmentVariables,
-                templateFile: packageTemplatePath,
-                region: params.deployParameters.region,
-                stackName: params.deployParameters.destinationStackName,
-                s3Bucket: params.deployParameters.packageBucketName,
-                ecrRepo: params.deployParameters.ecrRepo,
-            },
-            params.invoker
-        )
-    } catch (err) {
-        // Handle sam deploy Errors to supplement the error message prior to writing it out
-        const error = err as Error
-
-        getLogger().error(error)
-
-        const errorMessage = enhanceAwsCloudFormationInstructions(String(err), params.deployParameters)
-        globals.outputChannel.appendLine(errorMessage)
-
-        throw new Error('Deploy failed')
-    }
-}
-
-async function deploy(params: {
-    deployParameters: DeploySamApplicationParameters
-    invoker: SamCliProcessInvoker
-    window: WindowFunctions
-}): Promise<void> {
-    globals.outputChannel.show(true)
-    getLogger('channel').info(localize('AWS.samcli.deploy.workflow.start', 'Starting SAM Application deployment...'))
-
-    const buildSuccessful = await buildOperation(params)
-    await packageOperation(params, buildSuccessful)
-    await deployOperation(params)
-
-    getLogger('channel').info(
-        localize(
-            'AWS.samcli.deploy.workflow.success',
-            'Deployed SAM Application to CloudFormation Stack: {0}',
-            params.deployParameters.destinationStackName
-        )
-    )
-
-    params.window.showInformationMessage(
-        localize('AWS.samcli.deploy.workflow.success.general', 'SAM Application deployment succeeded.')
-    )
-}
-
-function enhanceAwsCloudFormationInstructions(
-    message: string,
-    deployParameters: DeploySamApplicationParameters
-): string {
-    // detect error message from https://github.com/aws/aws-cli/blob/4ff0cbacbac69a21d4dd701921fe0759cf7852ed/awscli/customizations/cloudformation/exceptions.py#L42
-    // and append region to assist in troubleshooting the error
-    // (command uses CLI configured value--users that don't know this and omit region won't see error)
-    if (
-        message.includes(
-            `aws cloudformation describe-stack-events --stack-name ${deployParameters.destinationStackName}`
-        )
-    ) {
-        message += ` --region ${deployParameters.region}`
-    }
-
-    return message
-}
-
-function outputDeployError(error: Error) {
-    getLogger('channel').error(error)
-
-    globals.outputChannel.show(true)
-    getLogger('channel').error('AWS.samcli.deploy.general.error', 'Error deploying a SAM Application. {0}', checklogs())
-}
-
-function getDefaultWindowFunctions(): WindowFunctions {
-    return {
-        setStatusBarMessage: vscode.window.setStatusBarMessage,
-        showErrorMessage: vscode.window.showErrorMessage,
-        showInformationMessage: vscode.window.showInformationMessage,
-    }
-}
diff --git a/src/lambda/commands/downloadLambda.ts b/src/lambda/commands/downloadLambda.ts
deleted file mode 100644
index 472017f26d7..00000000000
--- a/src/lambda/commands/downloadLambda.ts
+++ /dev/null
@@ -1,234 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as AdmZip from 'adm-zip'
-import * as fs from 'fs-extra'
-import * as _ from 'lodash'
-import * as path from 'path'
-import * as vscode from 'vscode'
-import { LambdaFunctionNode } from '../explorer/lambdaFunctionNode'
-import { showConfirmationMessage } from '../../shared/utilities/messages'
-import { LaunchConfiguration, getReferencedHandlerPaths } from '../../shared/debug/launchConfiguration'
-
-import { makeTemporaryToolkitFolder, fileExists, tryRemoveFolder } from '../../shared/filesystemUtilities'
-import * as localizedText from '../../shared/localizedText'
-import { getLogger } from '../../shared/logger'
-import { HttpResourceFetcher } from '../../shared/resourcefetcher/httpResourceFetcher'
-import { createCodeAwsSamDebugConfig } from '../../shared/sam/debugger/awsSamDebugConfiguration'
-import * as pathutils from '../../shared/utilities/pathUtils'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { addFolderToWorkspace } from '../../shared/utilities/workspaceUtils'
-import { Window } from '../../shared/vscode/window'
-import { promptUserForLocation, WizardContext } from '../../shared/wizards/multiStepWizard'
-import { getLambdaDetails } from '../utils'
-import { Progress } from 'got/dist/source'
-import { DefaultLambdaClient } from '../../shared/clients/lambdaClient'
-import { telemetry } from '../../shared/telemetry/telemetry'
-import { Result, Runtime } from '../../shared/telemetry/telemetry'
-
-export async function downloadLambdaCommand(functionNode: LambdaFunctionNode) {
-    const result = await runDownloadLambda(functionNode)
-
-    telemetry.lambda_import.emit({
-        result,
-        runtime: functionNode.configuration.Runtime as Runtime | undefined,
-    })
-}
-
-async function runDownloadLambda(functionNode: LambdaFunctionNode, window = Window.vscode()): Promise<Result> {
-    const workspaceFolders = vscode.workspace.workspaceFolders || []
-    const functionName = functionNode.configuration.FunctionName!
-
-    if (workspaceFolders.length === 0) {
-        window.showErrorMessage(
-            localize('AWS.lambda.download.noWorkspaceFolders', 'Open a workspace before downloading a Lambda function.')
-        )
-        return 'Cancelled'
-    }
-    const selectedUri = await promptUserForLocation(new WizardContext(), { step: 1, totalSteps: 1 })
-    if (!selectedUri) {
-        return 'Cancelled'
-    }
-
-    const downloadLocation = path.join(selectedUri.fsPath, functionName, path.sep)
-    const downloadLocationName = vscode.workspace.asRelativePath(downloadLocation, true)
-
-    if (await fs.pathExists(downloadLocation)) {
-        const isConfirmed = await showConfirmationMessage(
-            {
-                prompt: localize(
-                    'AWS.lambda.download.prompt',
-                    'Downloading {0} into: {1}\nExisting directory will be overwritten: {0}\nProceed with download?',
-                    functionName,
-                    downloadLocationName
-                ),
-                confirm: localize('AWS.lambda.download.download', 'Download'),
-                cancel: localizedText.cancel,
-            },
-            window
-        )
-
-        if (!isConfirmed) {
-            getLogger().info('DownloadLambda cancelled')
-            return 'Cancelled'
-        }
-    }
-
-    return await window.withProgress<Result>(
-        {
-            location: vscode.ProgressLocation.Notification,
-            cancellable: false,
-            title: localize(
-                'AWS.lambda.download.status',
-                'Downloading Lambda function {0} into {1}...',
-                functionName,
-                downloadLocationName
-            ),
-        },
-        async progress => {
-            let lambdaLocation: string
-
-            try {
-                lambdaLocation = path.join(downloadLocation, getLambdaDetails(functionNode.configuration).fileName)
-                await downloadAndUnzipLambda(progress, functionNode, downloadLocation)
-            } catch (e) {
-                // initial download failed or runtime is unsupported.
-                // show error and return a failure
-                const err = e as Error
-                getLogger().error(err)
-                window.showErrorMessage(
-                    localize(
-                        'AWS.lambda.download.downloadError',
-                        'Error downloading Lambda function {0}: {1}',
-                        functionNode.configuration.FunctionArn!,
-                        err.message
-                    )
-                )
-
-                return 'Failed'
-            }
-
-            try {
-                await openLambdaFile(lambdaLocation)
-                if (
-                    workspaceFolders.filter(val => {
-                        return selectedUri === val.uri
-                    }).length === 0
-                ) {
-                    await addFolderToWorkspace({ uri: selectedUri! }, true)
-                }
-                const workspaceFolder = vscode.workspace.getWorkspaceFolder(vscode.Uri.file(downloadLocation))!
-
-                await addLaunchConfigEntry(lambdaLocation, functionNode, workspaceFolder)
-
-                return 'Succeeded'
-            } catch (e) {
-                // failed to open handler file or add launch config.
-                // not a failure since the function is downloaded to a workspace directory.
-                return 'Succeeded'
-            }
-        }
-    )
-}
-
-async function downloadAndUnzipLambda(
-    progress: vscode.Progress<{
-        message?: string | undefined
-        increment?: number | undefined
-    }>,
-    functionNode: LambdaFunctionNode,
-    extractLocation: string,
-    window = Window.vscode(),
-    lambda = new DefaultLambdaClient(functionNode.regionCode)
-): Promise<void> {
-    const functionArn = functionNode.configuration.FunctionArn!
-    let tempDir: string | undefined
-    try {
-        tempDir = await makeTemporaryToolkitFolder()
-        const downloadLocation = path.join(tempDir, 'function.zip')
-
-        const response = await lambda.getFunction(functionArn)
-        const codeLocation = response.Code!.Location!
-
-        // arbitrary increments since there's no "busy" state for progress bars
-        progress.report({ message: 'Starting download' })
-
-        const fetcher = new HttpResourceFetcher(codeLocation, {
-            showUrl: false,
-            friendlyName: 'Lambda Function .zip file',
-        })
-        const streams = fetcher.get(downloadLocation)
-
-        let last: number = 0
-        streams.requestStream.on('downloadProgress', (p: Progress) => {
-            // I think these are bytes...
-            const message = p.total ? `Downloading ${p.transferred}/${p.total} bytes` : 'Downloading...'
-            const increment = p.total ? ((p.transferred - last) / p.total) * 100 : 0
-            last = p.transferred
-            progress.report({ message, increment })
-        })
-
-        await streams
-        progress.report({ message: 'Extracting...' })
-        new AdmZip(downloadLocation).extractAllTo(extractLocation, true)
-    } finally {
-        tryRemoveFolder(tempDir)
-    }
-}
-
-export async function openLambdaFile(lambdaLocation: string, window = Window.vscode()): Promise<void> {
-    if (!(await fileExists(lambdaLocation))) {
-        const warning = localize(
-            'AWS.lambda.download.fileNotFound',
-            'Handler file {0} not found in downloaded function.',
-            lambdaLocation
-        )
-        getLogger().warn(warning)
-        window.showWarningMessage(warning)
-        throw new Error()
-    }
-    // TODO: move this into Window.vscode()?
-    const doc = await vscode.workspace.openTextDocument(vscode.Uri.file(lambdaLocation))
-    await vscode.window.showTextDocument(doc)
-}
-
-async function addLaunchConfigEntry(
-    lambdaLocation: string,
-    functionNode: LambdaFunctionNode,
-    workspaceFolder: vscode.WorkspaceFolder
-): Promise<void> {
-    const handler = functionNode.configuration.Handler!
-
-    const samDebugConfig = createCodeAwsSamDebugConfig(
-        workspaceFolder,
-        handler,
-        computeLambdaRoot(lambdaLocation, functionNode),
-        functionNode.configuration.Runtime!
-    )
-
-    const launchConfig = new LaunchConfiguration(vscode.Uri.file(lambdaLocation))
-    if (
-        !getReferencedHandlerPaths(launchConfig).has(
-            pathutils.normalize(path.join(path.dirname(lambdaLocation), handler))
-        )
-    ) {
-        await launchConfig.addDebugConfiguration(samDebugConfig)
-    }
-}
-
-/**
- * Computes the Lambda root.
- * We cannot assume that the Lambda root is the dirname since CodeUri is not a required field (can be merged with handler)
- * @param lambdaLocation Lambda handler file location
- * @param functionNode Function node
- */
-function computeLambdaRoot(lambdaLocation: string, functionNode: LambdaFunctionNode): string {
-    const lambdaDetails = getLambdaDetails(functionNode.configuration)
-    const normalizedLocation = pathutils.normalize(lambdaLocation)
-
-    const lambdaIndex = normalizedLocation.indexOf(`/${lambdaDetails.fileName}`)
-
-    return lambdaIndex > -1 ? normalizedLocation.slice(0, lambdaIndex) : path.dirname(normalizedLocation)
-}
diff --git a/src/lambda/config/templates.ts b/src/lambda/config/templates.ts
deleted file mode 100644
index 10304146615..00000000000
--- a/src/lambda/config/templates.ts
+++ /dev/null
@@ -1,441 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-// Use jsonc-parser.parse instead of JSON.parse, as JSONC can handle comments. VS Code uses jsonc-parser
-// under the hood to provide symbols for JSON documents, so this will keep us consistent with VS code.
-import { access, writeFile, ensureDir } from 'fs-extra'
-import * as jsonParser from 'jsonc-parser'
-import * as os from 'os'
-import * as _path from 'path'
-import * as vscode from 'vscode'
-import * as nls from 'vscode-nls'
-import * as fsUtils from '../../shared/filesystemUtilities'
-import { getLogger, Logger } from '../../shared/logger'
-import { ReadonlyJsonObject } from '../../shared/sam/debugger/awsSamDebugConfiguration'
-import { getTabSizeSetting } from '../../shared/utilities/editorUtilities'
-import { getNormalizedRelativePath } from '../../shared/utilities/pathUtils'
-import { saveDocumentIfDirty } from '../../shared/utilities/textDocumentUtilities'
-
-const localize = nls.loadMessageBundle()
-
-export interface TemplatesConfig {
-    templates: {
-        [relativePath: string]: TemplateConfig | undefined
-    }
-}
-
-export interface TemplateConfig {
-    parameterOverrides?: {
-        [key: string]: string | undefined
-    }
-    handlers?: {
-        [handler: string]: HandlerConfig | undefined
-    }
-}
-
-export interface HandlerConfig {
-    event: Record<string, unknown>
-    environmentVariables: {
-        [name: string]: string
-    }
-    dockerNetwork?: string
-    useContainer?: boolean
-}
-
-export function generateDefaultHandlerConfig(): HandlerConfig {
-    return {
-        event: {},
-        environmentVariables: {},
-        dockerNetwork: undefined,
-        useContainer: undefined,
-    }
-}
-
-/**
- * TODO: remove? still needed?
- */
-export async function getHandlerConfig(params: {
-    handlerName: string
-    documentUri: vscode.Uri
-    samTemplate: vscode.Uri
-}): Promise<HandlerConfig> {
-    const workspaceFolder = vscode.workspace.getWorkspaceFolder(params.documentUri)
-    if (!workspaceFolder) {
-        return generateDefaultHandlerConfig()
-    }
-
-    const config: HandlerConfig = await getLocalLambdaConfiguration(
-        workspaceFolder,
-        params.handlerName,
-        params.samTemplate
-    )
-
-    return config
-}
-
-async function getLocalLambdaConfiguration(
-    workspaceFolder: vscode.WorkspaceFolder,
-    handler: string,
-    samTemplate: vscode.Uri
-): Promise<HandlerConfig> {
-    try {
-        const configPath: string = getTemplatesConfigPath(workspaceFolder.uri.fsPath)
-        const templateRelativePath = getNormalizedRelativePath(workspaceFolder.uri.fsPath, samTemplate.fsPath)
-
-        await saveDocumentIfDirty(configPath)
-
-        let rawConfig: string = '{}'
-        if (await fsUtils.fileExists(configPath)) {
-            rawConfig = await fsUtils.readFileAsString(configPath)
-        }
-
-        const configPopulationResult = new TemplatesConfigPopulator(rawConfig)
-            .ensureTemplateHandlerSectionExists(templateRelativePath, handler)
-            .getResults()
-
-        const config: TemplatesConfig = loadTemplatesConfigFromJson(configPopulationResult.json)
-
-        return config.templates[templateRelativePath]!.handlers![handler]!
-    } catch (e) {
-        if (e instanceof TemplatesConfigFieldTypeError) {
-            showTemplatesConfigurationError(e)
-        }
-
-        throw e
-    }
-}
-
-export interface LoadTemplatesConfigContext {
-    fileExists(path: string): Thenable<boolean>
-    readFile(path: string): Thenable<string>
-    saveDocumentIfDirty(editorPath: string): Thenable<void>
-}
-
-export class DefaultLoadTemplatesConfigContext implements LoadTemplatesConfigContext {
-    public readonly fileExists = fsUtils.fileExists
-    public readonly readFile = fsUtils.readFileAsString
-
-    public readonly saveDocumentIfDirty = saveDocumentIfDirty
-}
-
-export function getTemplatesConfigPath(workspaceFolderPath: string): string {
-    return _path.join(workspaceFolderPath, '.aws', 'templates.json')
-}
-
-export async function load(
-    workspaceFolderPath: string,
-    context: LoadTemplatesConfigContext = new DefaultLoadTemplatesConfigContext()
-): Promise<TemplatesConfig> {
-    const templatesConfigPath = getTemplatesConfigPath(workspaceFolderPath)
-
-    return await loadTemplatesConfig(templatesConfigPath, context)
-}
-
-async function loadTemplatesConfig(
-    path: string,
-    context: LoadTemplatesConfigContext = new DefaultLoadTemplatesConfigContext()
-): Promise<TemplatesConfig> {
-    try {
-        await context.saveDocumentIfDirty(path)
-
-        if (!(await context.fileExists(path))) {
-            return {
-                templates: {},
-            }
-        }
-
-        const raw = await context.readFile(path)
-
-        return loadTemplatesConfigFromJson(raw)
-    } catch (err) {
-        if (Array.isArray(err) && (err as any[]).length === 1) {
-            throw new Error(`Could not load .aws/templates.json: ${(err as any[])[0]}`)
-        }
-
-        throw new Error(`Could not load .aws/templates.json: ${err}`)
-    }
-}
-
-export function loadTemplatesConfigFromJson(json: string): TemplatesConfig {
-    const errors: jsonParser.ParseError[] = []
-    const config = jsonParser.parse(json, errors) as TemplatesConfig
-    if (errors.length > 0) {
-        const message =
-            errors.length === 1
-                ? ` ${formatParseError(errors[0])}`
-                : `${os.EOL}${errors.map(formatParseError).join(os.EOL)}`
-
-        throw new Error(`Could not parse .aws/templates.json:${message}`)
-    }
-
-    return config
-}
-
-export function showTemplatesConfigurationError(
-    error: TemplatesConfigFieldTypeError,
-    showErrorMessage: typeof vscode.window.showErrorMessage = vscode.window.showErrorMessage
-): void {
-    const logger: Logger = getLogger()
-
-    showErrorMessage(
-        localize(
-            'AWS.lambda.configure.error.fieldtype',
-            'Your templates.json file has an issue. {0} was detected as {1} instead of one of the following: [{2}]. Please change or remove this field, and try again.',
-            error.jsonPath.join('.'),
-            error.actualType,
-            error.expectedTypes.join(', ')
-        )
-    )
-
-    logger.error(
-        `Error detected in templates.json: ${error.message}. Field: ${error.jsonPath.join(
-            '.'
-        )}, expected one of: [${error.expectedTypes.join(', ')}], was: ${error.actualType}`
-    )
-}
-
-export async function ensureTemplatesConfigFileExists(path: string): Promise<void> {
-    ensureDir(_path.dirname(path))
-    try {
-        await access(path)
-    } catch {
-        await writeFile(path, '{}')
-    }
-}
-
-function formatParseError(error: jsonParser.ParseError) {
-    return `${getParseErrorDescription(error.error)} at offset ${error.offset}, length ${error.length}`
-}
-
-// Reverse enum mappings are only generated for non-const numerical enums,
-// but ParseErrorCode is a const enum. So we have to reverse-map manually.
-function getParseErrorDescription(code: jsonParser.ParseErrorCode): string {
-    switch (code) {
-        case jsonParser.ParseErrorCode.CloseBraceExpected:
-            return 'close brace expected'
-        case jsonParser.ParseErrorCode.CloseBracketExpected:
-            return 'close bracket expected'
-        case jsonParser.ParseErrorCode.ColonExpected:
-            return 'colon expected'
-        case jsonParser.ParseErrorCode.CommaExpected:
-            return 'command expected'
-        case jsonParser.ParseErrorCode.EndOfFileExpected:
-            return 'end of file expected'
-        case jsonParser.ParseErrorCode.InvalidCharacter:
-            return 'invalid character'
-        case jsonParser.ParseErrorCode.InvalidCommentToken:
-            return 'invalid comment token'
-        case jsonParser.ParseErrorCode.InvalidEscapeCharacter:
-            return 'invalid escape character'
-        case jsonParser.ParseErrorCode.InvalidNumberFormat:
-            return 'invalid number format'
-        case jsonParser.ParseErrorCode.InvalidSymbol:
-            return 'invalid symbol'
-        case jsonParser.ParseErrorCode.InvalidUnicode:
-            return 'invalid unicode'
-        case jsonParser.ParseErrorCode.PropertyNameExpected:
-            return 'property name expected'
-        case jsonParser.ParseErrorCode.UnexpectedEndOfComment:
-            return 'unexpected end of comment'
-        case jsonParser.ParseErrorCode.UnexpectedEndOfNumber:
-            return 'unexpected end of number'
-        case jsonParser.ParseErrorCode.UnexpectedEndOfString:
-            return 'unexpected end of string'
-        case jsonParser.ParseErrorCode.ValueExpected:
-            return 'value expected'
-        // By omitting the default case, we force the compiler to yell at us
-        // if any enum members are added/removed/changed.
-    }
-}
-
-export class TemplatesConfigFieldTypeError extends Error {
-    public readonly jsonPath: jsonParser.JSONPath
-    public readonly expectedTypes: jsonParser.NodeType[]
-    public readonly actualType: jsonParser.NodeType
-
-    public constructor(params: {
-        message?: string
-        jsonPath: jsonParser.JSONPath
-        expectedTypes: jsonParser.NodeType[]
-        actualType: jsonParser.NodeType
-    }) {
-        super(params.message)
-
-        this.jsonPath = params.jsonPath
-        this.expectedTypes = params.expectedTypes
-        this.actualType = params.actualType
-    }
-}
-
-export class TemplatesConfigPopulator {
-    private isDirty: boolean = false
-
-    public constructor(
-        private json: string,
-        private readonly modificationOptions: jsonParser.ModificationOptions = {
-            formattingOptions: {
-                insertSpaces: true,
-                tabSize: getTabSizeSetting(),
-            },
-        }
-    ) {}
-
-    public ensureTemplateSectionExists(templateRelativePath: string): TemplatesConfigPopulator {
-        this.ensureTemplatesSectionExists()
-
-        this.ensureJsonPropertyExists(['templates', templateRelativePath], {})
-
-        return this
-    }
-
-    public ensureTemplateHandlerSectionExists(templateRelativePath: string, handler: string): TemplatesConfigPopulator {
-        this.ensureTemplateHandlersSectionExists(templateRelativePath)
-
-        this.ensureJsonPropertyExists(['templates', templateRelativePath, 'handlers', handler], {
-            event: {},
-            environmentVariables: {},
-        })
-
-        return this
-    }
-
-    public ensureTemplateHandlerPropertiesExist(
-        templateRelativePath: string,
-        handler: string
-    ): TemplatesConfigPopulator {
-        this.ensureTemplateHandlerSectionExists(templateRelativePath, handler)
-
-        this.ensureJsonPropertyExists(['templates', templateRelativePath, 'handlers', handler, 'event'], {})
-
-        this.ensureJsonPropertyExists(
-            ['templates', templateRelativePath, 'handlers', handler, 'environmentVariables'],
-            {}
-        )
-
-        return this
-    }
-
-    public ensureTemplateParameterOverrideExists(
-        templateRelativePath: string,
-        parameterName: string
-    ): TemplatesConfigPopulator {
-        this.ensureTemplateParamOverrideSectionExists(templateRelativePath)
-
-        this.ensureJsonPropertyExists(['templates', templateRelativePath, 'parameterOverrides', parameterName], '', [
-            'string',
-            'null',
-        ])
-
-        return this
-    }
-
-    public getResults(): {
-        isDirty: boolean
-        json: string
-    } {
-        return {
-            isDirty: this.isDirty,
-            json: this.json,
-        }
-    }
-
-    private ensureJsonPropertyExists(
-        jsonPath: jsonParser.JSONPath,
-        value: any,
-        allowedTypes: jsonParser.NodeType[] = ['object', 'null']
-    ) {
-        const root = jsonParser.parseTree(this.json)
-        const node = jsonParser.findNodeAtLocation(root!, jsonPath)
-        const allowedTypesSet = new Set(allowedTypes)
-
-        if (node && !allowedTypesSet.has(node.type)) {
-            throw new TemplatesConfigFieldTypeError({
-                message: 'Invalid configuration',
-                jsonPath: jsonPath,
-                actualType: node.type,
-                expectedTypes: allowedTypes,
-            })
-        }
-
-        if (!node || node.type === 'null') {
-            const edits = jsonParser.modify(this.json, jsonPath, value, this.modificationOptions)
-
-            if (edits.length > 0) {
-                this.json = jsonParser.applyEdits(this.json, edits)
-                this.isDirty = true
-            }
-        }
-    }
-
-    private ensureTemplatesSectionExists(): TemplatesConfigPopulator {
-        this.ensureJsonPropertyExists(['templates'], {})
-
-        return this
-    }
-
-    private ensureTemplateHandlersSectionExists(templateRelativePath: string): TemplatesConfigPopulator {
-        this.ensureTemplateSectionExists(templateRelativePath)
-
-        this.ensureJsonPropertyExists(['templates', templateRelativePath, 'handlers'], {})
-
-        return this
-    }
-
-    private ensureTemplateParamOverrideSectionExists(templateRelativePath: string): TemplatesConfigPopulator {
-        this.ensureTemplateSectionExists(templateRelativePath)
-
-        this.ensureJsonPropertyExists(['templates', templateRelativePath, 'parameterOverrides'], {})
-
-        return this
-    }
-}
-
-/**
- * Returns a previously-configured event payload if the following are true (`undefined` if false):
- * * old `.aws/templates.json` file exists and is valid JSON
- * * handler exists in `.aws/templates.json`
- * @param workspaceFolder Current workspace folder
- * @param handler Function's handler
- * @param samTemplate Originating SAM Template
- */
-export async function getExistingConfiguration(
-    workspaceFolder: vscode.WorkspaceFolder,
-    handler: string,
-    samTemplate: vscode.Uri
-): Promise<
-    | {
-          eventJson?: ReadonlyJsonObject
-          environmentVariables?: { [key: string]: string }
-          dockerNetwork?: string
-          useContainer?: boolean
-      }
-    | undefined
-> {
-    const configPath: string = getTemplatesConfigPath(workspaceFolder.uri.fsPath)
-
-    if (await fsUtils.fileExists(configPath)) {
-        const templateRelativePath = getNormalizedRelativePath(workspaceFolder.uri.fsPath, samTemplate.fsPath)
-        try {
-            const json = JSON.parse(await fsUtils.readFileAsString(configPath)) as TemplatesConfig
-            const handlerData = json.templates[templateRelativePath]?.handlers?.[handler]
-            if (handlerData) {
-                return {
-                    eventJson: handlerData.event as any,
-                    environmentVariables: handlerData.environmentVariables,
-                    dockerNetwork: handlerData.dockerNetwork,
-                    useContainer: handlerData.useContainer,
-                }
-            }
-        } catch (e) {
-            // json was not parseable
-            const err = e as Error
-            getLogger().info(`Error parsing the legacy configuration file: ${err.message}`)
-
-            return undefined
-        }
-    }
-
-    return undefined
-}
diff --git a/src/lambda/constants.ts b/src/lambda/constants.ts
deleted file mode 100644
index 0db31e90520..00000000000
--- a/src/lambda/constants.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import { hostedFilesBaseUrl } from '../shared/constants'
-
-export const sampleRequestBase: string = 'LambdaSampleFunctions/SampleRequests'
-export const sampleRequestPath: string = `${hostedFilesBaseUrl}${sampleRequestBase}/`
-export const sampleRequestManifestPath: string = `${hostedFilesBaseUrl}${sampleRequestBase}/manifest.xml`
diff --git a/src/lambda/explorer/lambdaFunctionNode.ts b/src/lambda/explorer/lambdaFunctionNode.ts
deleted file mode 100644
index e0fcb1d4bfa..00000000000
--- a/src/lambda/explorer/lambdaFunctionNode.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Lambda } from 'aws-sdk'
-import * as os from 'os'
-import { getIcon } from '../../shared/icons'
-
-import { AWSResourceNode } from '../../shared/treeview/nodes/awsResourceNode'
-import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
-
-export class LambdaFunctionNode extends AWSTreeNodeBase implements AWSResourceNode {
-    public constructor(
-        public readonly parent: AWSTreeNodeBase,
-        public override readonly regionCode: string,
-        public configuration: Lambda.FunctionConfiguration
-    ) {
-        super('')
-        this.update(configuration)
-        this.iconPath = getIcon('aws-lambda-function')
-    }
-
-    public update(configuration: Lambda.FunctionConfiguration): void {
-        this.configuration = configuration
-        this.label = this.configuration.FunctionName || ''
-        this.tooltip = `${this.configuration.FunctionName}${os.EOL}${this.configuration.FunctionArn}`
-    }
-
-    public get functionName(): string {
-        return this.configuration.FunctionName || ''
-    }
-
-    public get arn(): string {
-        if (this.configuration.FunctionArn === undefined) {
-            throw new Error('FunctionArn expected but not found')
-        }
-
-        return this.configuration.FunctionArn
-    }
-
-    public get name(): string {
-        if (this.configuration.FunctionName === undefined) {
-            throw new Error('FunctionName expected but not found')
-        }
-
-        return this.configuration.FunctionName
-    }
-}
diff --git a/src/lambda/explorer/lambdaNodes.ts b/src/lambda/explorer/lambdaNodes.ts
deleted file mode 100644
index a01711ede15..00000000000
--- a/src/lambda/explorer/lambdaNodes.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import { Lambda } from 'aws-sdk'
-import * as vscode from 'vscode'
-import { DefaultLambdaClient } from '../../shared/clients/lambdaClient'
-
-import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
-import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
-import { makeChildrenNodes } from '../../shared/treeview/utils'
-import { toArrayAsync, toMap, updateInPlace } from '../../shared/utilities/collectionUtils'
-import { listLambdaFunctions } from '../utils'
-import { LambdaFunctionNode } from './lambdaFunctionNode'
-import { samLambdaImportableRuntimes } from '../models/samLambdaRuntime'
-
-export const contextValueLambdaFunction = 'awsRegionFunctionNode'
-export const contextValueLambdaFunctionImportable = 'awsRegionFunctionNodeDownloadable'
-
-/**
- * An AWS Explorer node representing the Lambda Service.
- * Contains Lambda Functions for a specific region as child nodes.
- */
-export class LambdaNode extends AWSTreeNodeBase {
-    private readonly functionNodes: Map<string, LambdaFunctionNode>
-
-    public constructor(
-        public override readonly regionCode: string,
-        private readonly client = new DefaultLambdaClient(regionCode)
-    ) {
-        super('Lambda', vscode.TreeItemCollapsibleState.Collapsed)
-        this.functionNodes = new Map<string, LambdaFunctionNode>()
-        this.contextValue = 'awsLambdaNode'
-    }
-
-    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
-        return await makeChildrenNodes({
-            getChildNodes: async () => {
-                await this.updateChildren()
-
-                return [...this.functionNodes.values()]
-            },
-            getNoChildrenPlaceholderNode: async () =>
-                new PlaceholderNode(this, localize('AWS.explorerNode.lambda.noFunctions', '[No Functions found]')),
-            sort: (nodeA, nodeB) => nodeA.functionName.localeCompare(nodeB.functionName),
-        })
-    }
-
-    public async updateChildren(): Promise<void> {
-        const functions: Map<string, Lambda.FunctionConfiguration> = toMap(
-            await toArrayAsync(listLambdaFunctions(this.client)),
-            configuration => configuration.FunctionName
-        )
-
-        updateInPlace(
-            this.functionNodes,
-            functions.keys(),
-            key => this.functionNodes.get(key)!.update(functions.get(key)!),
-            key => makeLambdaFunctionNode(this, this.regionCode, functions.get(key)!)
-        )
-    }
-}
-
-function makeLambdaFunctionNode(
-    parent: AWSTreeNodeBase,
-    regionCode: string,
-    configuration: Lambda.FunctionConfiguration
-): LambdaFunctionNode {
-    const node = new LambdaFunctionNode(parent, regionCode, configuration)
-    node.contextValue = samLambdaImportableRuntimes.contains(node.configuration.Runtime ?? '')
-        ? contextValueLambdaFunctionImportable
-        : contextValueLambdaFunction
-
-    return node
-}
diff --git a/src/lambda/models/samTemplates.ts b/src/lambda/models/samTemplates.ts
deleted file mode 100644
index 58f2f9c616c..00000000000
--- a/src/lambda/models/samTemplates.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as semver from 'semver'
-import { Runtime } from 'aws-sdk/clients/lambda'
-import { Set as ImmutableSet } from 'immutable'
-import { supportsEventBridgeTemplates } from '../../../src/eventSchemas/models/schemaCodeLangs'
-import { RuntimePackageType } from './samLambdaRuntime'
-import { getIdeProperties } from '../../shared/extensionUtilities'
-
-export let helloWorldTemplate = 'helloWorldUninitialized'
-export let eventBridgeHelloWorldTemplate = 'eventBridgeHelloWorldUninitialized'
-export let eventBridgeStarterAppTemplate = 'eventBridgeStarterAppUnintialized'
-export let stepFunctionsSampleApp = 'stepFunctionsSampleAppUnintialized'
-export const typeScriptBackendTemplate = 'App Backend using TypeScript'
-export const repromptUserForTemplate = 'REQUIRES_AWS_CREDENTIALS_REPROMPT_USER_FOR_TEMPLATE'
-
-export const cliVersionStepFunctionsTemplate = '0.52.0'
-
-export type SamTemplate = string
-
-/**
- * Lazy load strings for SAM template quick picks
- * Need to be lazyloaded as `getIdeProperties` requires IDE activation for Cloud9
- */
-export function lazyLoadSamTemplateStrings(): void {
-    helloWorldTemplate = localize(
-        'AWS.samcli.initWizard.template.helloWorld.name',
-        '{0} SAM Hello World',
-        getIdeProperties().company
-    )
-    eventBridgeHelloWorldTemplate = localize(
-        'AWS.samcli.initWizard.template.helloWorld.name',
-        '{0} SAM EventBridge Hello World',
-        getIdeProperties().company
-    )
-    eventBridgeStarterAppTemplate = localize(
-        'AWS.samcli.initWizard.template.helloWorld.name',
-        '{0} SAM EventBridge App from Scratch',
-        getIdeProperties().company
-    )
-    stepFunctionsSampleApp = localize(
-        'AWS.samcli.initWizard.template.helloWorld.name',
-        '{0} Step Functions Sample App',
-        getIdeProperties().company
-    )
-}
-
-export function getSamTemplateWizardOption(
-    runtime: Runtime,
-    packageType: RuntimePackageType,
-    samCliVersion: string
-): ImmutableSet<SamTemplate> {
-    const templateOptions = Array<SamTemplate>(helloWorldTemplate)
-
-    if (packageType === 'Image') {
-        // only supports hello world for now
-        return ImmutableSet<SamTemplate>(templateOptions)
-    }
-
-    if (supportsEventBridgeTemplates(runtime)) {
-        templateOptions.push(eventBridgeHelloWorldTemplate, eventBridgeStarterAppTemplate)
-    }
-
-    if (supportsStepFuntionsTemplate(samCliVersion)) {
-        templateOptions.push(stepFunctionsSampleApp)
-    }
-
-    if (supportsTypeScriptBackendTemplate(runtime)) {
-        templateOptions.push(typeScriptBackendTemplate)
-    }
-
-    return ImmutableSet<SamTemplate>(templateOptions)
-}
-
-export function getSamCliTemplateParameter(templateSelected: SamTemplate): string {
-    switch (templateSelected) {
-        case helloWorldTemplate:
-            return 'hello-world'
-        case eventBridgeHelloWorldTemplate:
-            return 'eventBridge-hello-world'
-        case eventBridgeStarterAppTemplate:
-            return 'eventBridge-schema-app'
-        case stepFunctionsSampleApp:
-            return 'step-functions-sample-app'
-        case typeScriptBackendTemplate:
-            return 'quick-start-typescript-app'
-        default:
-            throw new Error(`${templateSelected} is not valid sam template`)
-    }
-}
-
-export function getTemplateDescription(template: SamTemplate): string {
-    switch (template) {
-        case helloWorldTemplate:
-            return localize('AWS.samcli.initWizard.template.helloWorld.description', 'A basic SAM app')
-        case eventBridgeHelloWorldTemplate:
-            return localize(
-                'AWS.samcli.initWizard.template.eventBridge_helloWorld.description',
-                'Invokes a Lambda for every EC2 instance state change in your account'
-            )
-        case eventBridgeStarterAppTemplate:
-            return localize(
-                'AWS.samcli.initWizard.template.eventBridge_starterApp.description',
-                'Invokes a Lambda based on a dynamic event trigger for an EventBridge Schema of your choice'
-            )
-        case stepFunctionsSampleApp:
-            return localize(
-                'AWS.samcli.initWizard.template.stepFunctionsSampleApp.description',
-                'Orchestrates multiple Lambdas to execute a stock trading workflow on an hourly schedule'
-            )
-        case typeScriptBackendTemplate:
-            return localize(
-                'AWS.samcli.initWizard.template.typeScriptBackendTemplate.description',
-                'A sample TypeScript backend app with Lambda and DynamoDB'
-            )
-        default:
-            throw new Error(`No description found for template ${template}`)
-    }
-}
-
-export function supportsStepFuntionsTemplate(samCliVersion: string): boolean {
-    if (!samCliVersion) {
-        return false
-    }
-    return semver.gte(samCliVersion, cliVersionStepFunctionsTemplate)
-}
-
-export function supportsTypeScriptBackendTemplate(runtime: Runtime): boolean {
-    return runtime === 'nodejs12.x'
-}
diff --git a/src/lambda/models/sampleRequest.ts b/src/lambda/models/sampleRequest.ts
deleted file mode 100644
index cca2fae3ec8..00000000000
--- a/src/lambda/models/sampleRequest.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-export class SampleRequest {
-    public name: string | undefined
-    public filename: string | undefined
-}
diff --git a/src/lambda/utils.ts b/src/lambda/utils.ts
deleted file mode 100644
index 37b41158353..00000000000
--- a/src/lambda/utils.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import xml2js = require('xml2js')
-import { CloudFormation, Lambda } from 'aws-sdk'
-import * as vscode from 'vscode'
-import { CloudFormationClient } from '../shared/clients/cloudFormationClient'
-import { LambdaClient } from '../shared/clients/lambdaClient'
-import { getFamily, RuntimeFamily } from './models/samLambdaRuntime'
-import { getLogger } from '../shared/logger'
-import { ResourceFetcher } from '../shared/resourcefetcher/resourcefetcher'
-import { CompositeResourceFetcher } from '../shared/resourcefetcher/compositeResourceFetcher'
-import { HttpResourceFetcher } from '../shared/resourcefetcher/httpResourceFetcher'
-import { FileResourceFetcher } from '../shared/resourcefetcher/fileResourceFetcher'
-import { sampleRequestManifestPath } from './constants'
-import globals from '../shared/extensionGlobals'
-
-export async function* listCloudFormationStacks(
-    client: CloudFormationClient
-): AsyncIterableIterator<CloudFormation.StackSummary> {
-    // TODO: this 'loading' message needs to go under each regional entry
-    // in the explorer, and be removed when that region's query completes
-    const status = vscode.window.setStatusBarMessage(
-        localize('AWS.message.statusBar.loading.cloudFormation', 'Loading CloudFormation Stacks...')
-    )
-
-    try {
-        yield* client.listStacks()
-    } finally {
-        status.dispose()
-    }
-}
-
-export async function* listLambdaFunctions(client: LambdaClient): AsyncIterableIterator<Lambda.FunctionConfiguration> {
-    const status = vscode.window.setStatusBarMessage(
-        localize('AWS.message.statusBar.loading.lambda', 'Loading Lambdas...')
-    )
-
-    try {
-        yield* client.listFunctions()
-    } finally {
-        if (status) {
-            status.dispose()
-        }
-    }
-}
-
-/**
- * Returns filename and function name corresponding to a Lambda.FunctionConfiguration
- * Only works for supported languages (Python/JS)
- * @param configuration Lambda configuration object from getFunction
- */
-export function getLambdaDetails(configuration: Lambda.FunctionConfiguration): {
-    fileName: string
-    functionName: string
-} {
-    let runtimeExtension: string
-    switch (getFamily(configuration.Runtime!)) {
-        case RuntimeFamily.Python:
-            runtimeExtension = 'py'
-            break
-        case RuntimeFamily.NodeJS:
-            runtimeExtension = 'js'
-            break
-        default:
-            throw new Error(`Toolkit does not currently support imports for runtime: ${configuration.Runtime}`)
-    }
-
-    const handlerArr = configuration.Handler!.split('.')
-
-    return {
-        fileName: `${handlerArr.slice(0, handlerArr.length - 1).join('.')}.${runtimeExtension}`,
-        functionName: handlerArr[handlerArr.length - 1]!,
-    }
-}
-
-export interface SampleRequest {
-    name: string | undefined
-    filename: string | undefined
-}
-
-interface SampleRequestManifest {
-    requests: {
-        request: SampleRequest[]
-    }
-}
-
-export async function getSampleLambdaPayloads(): Promise<SampleRequest[]> {
-    const logger = getLogger()
-    const sampleInput = await makeSampleRequestManifestResourceFetcher().get()
-
-    if (!sampleInput) {
-        throw new Error('Unable to retrieve Sample Request manifest')
-    }
-
-    logger.debug(`Loaded: ${sampleInput}`)
-
-    const inputs: SampleRequest[] = []
-
-    xml2js.parseString(sampleInput, { explicitArray: false }, (err: Error, result: SampleRequestManifest) => {
-        if (err) {
-            return
-        }
-
-        inputs.push(...result.requests.request)
-    })
-
-    return inputs
-}
-
-function makeSampleRequestManifestResourceFetcher(): ResourceFetcher {
-    return new CompositeResourceFetcher(
-        new HttpResourceFetcher(sampleRequestManifestPath, { showUrl: true }),
-        new FileResourceFetcher(globals.manifestPaths.lambdaSampleRequests)
-    )
-}
diff --git a/src/lambda/vue/configEditor/index.ts b/src/lambda/vue/configEditor/index.ts
deleted file mode 100644
index be39603b7c2..00000000000
--- a/src/lambda/vue/configEditor/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { createApp } from 'vue'
-import component from './samInvokeComponent.vue'
-
-const create = () => createApp(component)
-const app = create()
-app.mount('#vue-app')
-
-window.addEventListener('remount', () => {
-    app.unmount()
-    create().mount('#vue-app')
-})
diff --git a/src/lambda/vue/configEditor/samInvoke.css b/src/lambda/vue/configEditor/samInvoke.css
deleted file mode 100644
index d248e071a90..00000000000
--- a/src/lambda/vue/configEditor/samInvoke.css
+++ /dev/null
@@ -1,53 +0,0 @@
-form {
-    padding: 15px;
-}
-
-.section-header {
-    margin: 0px;
-    margin-bottom: 10px;
-    display: flex;
-    justify-content: flex-start;
-}
-
-textarea {
-    max-width: 100%;
-}
-
-.config-item {
-    border-bottom: 1px solid var(--vscode-menubar-selectionBackground);
-    display: grid;
-    grid-template-columns: 1fr 3fr;
-    padding: 8px 0px;
-}
-
-.col2 {
-    grid-column: 2;
-}
-
-.data-view {
-    display: none;
-    border: dashed rgb(218, 31, 31) 1px;
-    color: rgb(218, 31, 31);
-}
-
-.required {
-    color: red;
-}
-
-#form-title {
-    font-size: large;
-    font-weight: bold;
-}
-
-.form-buttons {
-    margin-left: 20px;
-}
-
-.margin-bottom-16 {
-    margin-bottom: 16px;
-}
-
-#target-type-selector {
-    margin-bottom: 15px;
-    margin-left: 8px;
-}
diff --git a/src/lambda/vue/configEditor/samInvokeBackend.ts b/src/lambda/vue/configEditor/samInvokeBackend.ts
deleted file mode 100644
index 3e49db9e435..00000000000
--- a/src/lambda/vue/configEditor/samInvokeBackend.ts
+++ /dev/null
@@ -1,413 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as fs from 'fs-extra'
-import * as path from 'path'
-import * as vscode from 'vscode'
-import * as nls from 'vscode-nls'
-import { LaunchConfiguration } from '../../../shared/debug/launchConfiguration'
-
-import { ExtContext } from '../../../shared/extensions'
-import { getLogger } from '../../../shared/logger'
-import { HttpResourceFetcher } from '../../../shared/resourcefetcher/httpResourceFetcher'
-import {
-    AwsSamDebuggerConfiguration,
-    isCodeTargetProperties,
-    isTemplateTargetProperties,
-} from '../../../shared/sam/debugger/awsSamDebugConfiguration'
-import {
-    DefaultAwsSamDebugConfigurationValidator,
-    resolveWorkspaceFolderVariable,
-} from '../../../shared/sam/debugger/awsSamDebugConfigurationValidator'
-import * as input from '../../../shared/ui/input'
-import * as picker from '../../../shared/ui/picker'
-import { addCodiconToString } from '../../../shared/utilities/textUtilities'
-import { sampleRequestPath } from '../../constants'
-import { tryGetAbsolutePath } from '../../../shared/utilities/workspaceUtils'
-import { CloudFormation } from '../../../shared/cloudformation/cloudformation'
-import { openLaunchJsonFile } from '../../../shared/sam/debugger/commands/addSamDebugConfiguration'
-import { getSampleLambdaPayloads } from '../../utils'
-import { isCloud9 } from '../../../shared/extensionUtilities'
-import { SamDebugConfigProvider } from '../../../shared/sam/debugger/awsSamDebugger'
-import { samLambdaCreatableRuntimes } from '../../models/samLambdaRuntime'
-import globals from '../../../shared/extensionGlobals'
-import { VueWebview } from '../../../webviews/main'
-import { Commands } from '../../../shared/vscode/commands2'
-import { telemetry } from '../../../shared/telemetry/telemetry'
-
-const localize = nls.loadMessageBundle()
-
-export type AwsSamDebuggerConfigurationLoose = AwsSamDebuggerConfiguration & {
-    invokeTarget: Omit<
-        AwsSamDebuggerConfiguration['invokeTarget'],
-        'templatePath' | 'logicalId' | 'lambdaHandler' | 'projectRoot'
-    > & {
-        templatePath: string
-        logicalId: string
-        lambdaHandler: string
-        projectRoot: string
-    }
-}
-
-interface SampleQuickPickItem extends vscode.QuickPickItem {
-    filename: string
-}
-
-interface LaunchConfigPickItem extends vscode.QuickPickItem {
-    index: number
-    config?: AwsSamDebuggerConfiguration
-}
-
-export class SamInvokeWebview extends VueWebview {
-    public readonly id = 'createLambda'
-    public readonly source = 'src/lambda/vue/configEditor/index.js'
-
-    public constructor(
-        private readonly extContext: ExtContext, // TODO(sijaden): get rid of `ExtContext`
-        private readonly config?: AwsSamDebuggerConfiguration
-    ) {
-        super()
-    }
-
-    public getRuntimes() {
-        return samLambdaCreatableRuntimes().toArray().sort()
-    }
-
-    public init() {
-        return this.config
-    }
-
-    /**
-     * Open a quick pick containing the names of launch configs in the `launch.json` array.
-     * Filter out non-supported launch configs.
-     */
-    public async loadSamLaunchConfig(): Promise<AwsSamDebuggerConfiguration | undefined> {
-        // TODO: Find a better way to infer this. Might need another arg from the frontend (depends on the context in which the launch config is made?)
-        const workspaceFolder = vscode.workspace.workspaceFolders?.length
-            ? vscode.workspace.workspaceFolders[0]
-            : undefined
-        if (!workspaceFolder) {
-            vscode.window.showErrorMessage(localize('AWS.lambda.form.noFolder', 'No workspace folder found.'))
-            return
-        }
-        const uri = workspaceFolder.uri
-        const launchConfig = new LaunchConfiguration(uri)
-        const pickerItems = getLaunchConfigQuickPickItems(launchConfig, uri)
-        if (pickerItems.length === 0) {
-            pickerItems.push({
-                index: -1,
-                label: localize('AWS.lambda.form.noDebugConfigs', 'No aws-sam debug configurations found.'),
-                detail: localize('AWS.picker.dynamic.noItemsFound.detail', 'Click here to go back'),
-            })
-        }
-        const qp = picker.createQuickPick({
-            items: pickerItems,
-            options: {
-                title: localize('AWS.lambda.form.selectDebugConfig', 'Select Debug Configuration'),
-            },
-        })
-
-        const choices = await picker.promptUser({
-            picker: qp,
-        })
-        const pickerResponse = picker.verifySinglePickerOutput<LaunchConfigPickItem>(choices)
-
-        if (!pickerResponse || pickerResponse.index === -1) {
-            return
-        }
-        return pickerResponse.config!
-    }
-
-    /**
-     * Open a quick pick containing upstream sample payloads.
-     * Call back into the webview with the contents of the payload to add to the JSON field.
-     */
-    public async getSamplePayload(): Promise<string | undefined> {
-        try {
-            const inputs: SampleQuickPickItem[] = (await getSampleLambdaPayloads()).map(entry => {
-                return { label: entry.name ?? '', filename: entry.filename ?? '' }
-            })
-
-            const qp = picker.createQuickPick({
-                items: inputs,
-                options: {
-                    title: localize('AWS.lambda.form.pickSampleInput', 'Choose Sample Input'),
-                },
-            })
-
-            const choices = await picker.promptUser({
-                picker: qp,
-            })
-            const pickerResponse = picker.verifySinglePickerOutput<SampleQuickPickItem>(choices)
-
-            if (!pickerResponse) {
-                return
-            }
-            const sampleUrl = `${sampleRequestPath}${pickerResponse.filename}`
-            const sample = (await new HttpResourceFetcher(sampleUrl, { showUrl: true }).get()) ?? ''
-
-            return sample
-        } catch (err) {
-            getLogger().error('Error getting manifest data..: %O', err as Error)
-        }
-    }
-
-    /**
-     * Get all templates in the registry.
-     * Call back into the webview with the registry contents.
-     */
-    public async getTemplate() {
-        const items: (vscode.QuickPickItem & { templatePath: string })[] = []
-        const noTemplate = 'NOTEMPLATEFOUND'
-        for (const template of globals.templateRegistry.registeredItems) {
-            const resources = template.item.Resources
-            if (resources) {
-                for (const resource of Object.keys(resources)) {
-                    if (
-                        resources[resource]?.Type === CloudFormation.LAMBDA_FUNCTION_TYPE ||
-                        resources[resource]?.Type === CloudFormation.SERVERLESS_FUNCTION_TYPE ||
-                        resources[resource]?.Type === CloudFormation.SERVERLESS_API_TYPE
-                    ) {
-                        items.push({
-                            label: resource,
-                            detail: localize('AWS.lambda.form.selectResource.detail', 'Template: {0}', template.path),
-                            templatePath: template.path,
-                        })
-                    }
-                }
-            }
-        }
-
-        if (items.length === 0) {
-            items.push({
-                label: localize(
-                    'AWS.lambda.form.selectResource.noTemplates',
-                    'No templates with valid SAM functions found.'
-                ),
-                detail: localize('AWS.picker.dynamic.noItemsFound.detail', 'Click here to go back'),
-                templatePath: noTemplate,
-            })
-        }
-
-        const qp = picker.createQuickPick({
-            items,
-            options: {
-                title: localize('AWS.lambda.form.selectResource', 'Select Resource'),
-            },
-        })
-
-        const choices = await picker.promptUser({
-            picker: qp,
-        })
-        const selectedTemplate = picker.verifySinglePickerOutput(choices)
-
-        if (!selectedTemplate || selectedTemplate.templatePath === noTemplate) {
-            return
-        }
-
-        return {
-            logicalId: selectedTemplate.label,
-            template: selectedTemplate.templatePath,
-        }
-    }
-
-    /**
-     * Open a quick pick containing the names of launch configs in the `launch.json` array, plus a "Create New Entry" entry.
-     * On selecting a name, overwrite the existing entry in the `launch.json` array and resave the file.
-     * On selecting "Create New Entry", prompt the user for a name and save the contents to the end of the `launch.json` array.
-     * @param config Config to save
-     */
-    public async saveLaunchConfig(config: AwsSamDebuggerConfiguration): Promise<void> {
-        const uri = getUriFromLaunchConfig(config)
-        if (!uri) {
-            // TODO Localize
-            vscode.window.showErrorMessage('Toolkit requires a target resource in order to save a debug configuration')
-            return
-        }
-        const launchConfig = new LaunchConfiguration(uri)
-        const pickerItems = [
-            {
-                label: addCodiconToString(
-                    'add',
-                    localize('AWS.command.addSamDebugConfiguration', 'Add Debug Configuration')
-                ),
-                index: -1,
-                alwaysShow: true,
-            },
-            ...getLaunchConfigQuickPickItems(launchConfig, uri),
-        ]
-
-        const qp = picker.createQuickPick({
-            items: pickerItems,
-            options: {
-                title: localize('AWS.lambda.form.selectDebugConfig', 'Select Debug Configuration'),
-            },
-        })
-
-        const choices = await picker.promptUser({
-            picker: qp,
-        })
-        const pickerResponse = picker.verifySinglePickerOutput<LaunchConfigPickItem>(choices)
-
-        if (!pickerResponse) {
-            return
-        }
-
-        if (pickerResponse.index === -1) {
-            const ib = input.createInputBox({
-                options: {
-                    prompt: localize('AWS.lambda.form.debugConfigName', 'Input Name For Debug Configuration'),
-                },
-            })
-            const response = await input.promptUser({ inputBox: ib })
-            if (response) {
-                launchConfig.addDebugConfiguration(finalizeConfig(config, response))
-                await openLaunchJsonFile()
-            }
-        } else {
-            // use existing label
-            launchConfig.editDebugConfiguration(finalizeConfig(config, pickerResponse.label), pickerResponse.index)
-            await openLaunchJsonFile()
-        }
-    }
-
-    /**
-     * Validate and execute the provided launch config.
-     * TODO: Post validation failures back to webview?
-     * @param config Config to invoke
-     */
-    public async invokeLaunchConfig(config: AwsSamDebuggerConfiguration): Promise<void> {
-        const finalConfig = finalizeConfig(
-            resolveWorkspaceFolderVariable(undefined, config),
-            'Editor-Created Debug Config'
-        )
-        const targetUri = getUriFromLaunchConfig(finalConfig)
-        const folder = targetUri ? vscode.workspace.getWorkspaceFolder(targetUri) : undefined
-
-        // Cloud9 currently can't resolve the `aws-sam` debug config provider.
-        // Directly invoke the config instead.
-        // NOTE: This bypasses the `${workspaceFolder}` resolution, but shouldn't naturally occur in Cloud9
-        // (Cloud9 also doesn't currently have variable resolution support anyways)
-        if (isCloud9()) {
-            const provider = new SamDebugConfigProvider(this.extContext)
-            await provider.resolveDebugConfiguration(folder, finalConfig)
-        } else {
-            // startDebugging on VS Code goes through the whole resolution chain
-            await vscode.debug.startDebugging(folder, finalConfig)
-        }
-    }
-}
-
-const WebviewPanel = VueWebview.compilePanel(SamInvokeWebview)
-
-export function registerSamInvokeVueCommand(context: ExtContext): vscode.Disposable {
-    return Commands.register('aws.launchConfigForm', async (launchConfig?: AwsSamDebuggerConfiguration) => {
-        const webview = new WebviewPanel(context.extensionContext, context, launchConfig)
-        webview.show({
-            title: localize('AWS.command.launchConfigForm.title', 'Edit SAM Debug Configuration'),
-            // TODO: make this only open `Beside` when executed via CodeLens
-            viewColumn: vscode.ViewColumn.Beside,
-        })
-        telemetry.sam_openConfigUi.emit()
-    })
-}
-
-function getUriFromLaunchConfig(config: AwsSamDebuggerConfiguration): vscode.Uri | undefined {
-    let targetPath: string
-    if (isTemplateTargetProperties(config.invokeTarget)) {
-        targetPath = config.invokeTarget.templatePath
-    } else if (isCodeTargetProperties(config.invokeTarget)) {
-        targetPath = config.invokeTarget.projectRoot
-    } else {
-        // error
-        return undefined
-    }
-    if (path.isAbsolute(targetPath)) {
-        return vscode.Uri.file(targetPath)
-    }
-    // TODO: rework this logic (and config variables in general)
-    // we have too many places where we try to resolve these paths when it realistically can be
-    // in a single place. Much less bug-prone when it's centralized.
-    // the following line is a quick-fix for a very narrow edge-case
-    targetPath = targetPath.replace('${workspaceFolder}/', '')
-    const workspaceFolders = vscode.workspace.workspaceFolders || []
-    for (const workspaceFolder of workspaceFolders) {
-        const absolutePath = tryGetAbsolutePath(workspaceFolder, targetPath)
-        if (fs.pathExistsSync(absolutePath)) {
-            return vscode.Uri.file(absolutePath)
-        }
-    }
-
-    return undefined
-}
-
-function getLaunchConfigQuickPickItems(launchConfig: LaunchConfiguration, uri: vscode.Uri): LaunchConfigPickItem[] {
-    const existingConfigs = launchConfig.getDebugConfigurations()
-    const samValidator = new DefaultAwsSamDebugConfigurationValidator(vscode.workspace.getWorkspaceFolder(uri))
-    return existingConfigs
-        .map((val, index) => {
-            return {
-                config: val,
-                index,
-            }
-        })
-        .filter(o => samValidator.validate(o.config as any as AwsSamDebuggerConfiguration, true)?.isValid)
-        .map(val => {
-            return {
-                index: val.index,
-                label: val.config.name,
-                config: val.config as AwsSamDebuggerConfiguration,
-            }
-        })
-}
-
-export function finalizeConfig(config: AwsSamDebuggerConfiguration, name: string): AwsSamDebuggerConfiguration {
-    const newConfig = doTraverseAndPrune(config)
-    newConfig.name = name
-
-    if (isTemplateTargetProperties(config.invokeTarget)) {
-        newConfig.invokeTarget = {
-            target: config.invokeTarget.target,
-            logicalId: config.invokeTarget.logicalId,
-            templatePath: config.invokeTarget.templatePath,
-        }
-    } else if (isCodeTargetProperties(config.invokeTarget)) {
-        newConfig.invokeTarget = {
-            target: config.invokeTarget.target,
-            lambdaHandler: config.invokeTarget.lambdaHandler,
-            projectRoot: config.invokeTarget.projectRoot,
-        }
-    }
-
-    return newConfig
-}
-
-/**
- * Removes empty objects, strings, fields, and arrays from a given object.
- * Use when writing JSON to a file.
- * @param object
- * @returns Pruned object
- */
-function doTraverseAndPrune(object: { [key: string]: any }): any | undefined {
-    const keys = Object.keys(object)
-    const final = JSON.parse(JSON.stringify(object))
-    for (const key of keys) {
-        const val = object[key]
-        if (val === undefined || val === '' || (Array.isArray(val) && val.length === 0)) {
-            delete final[key]
-        } else if (typeof val === 'object') {
-            const pruned = doTraverseAndPrune(val)
-            if (pruned) {
-                final[key] = pruned
-            } else {
-                delete final[key]
-            }
-        }
-    }
-    if (Object.keys(final).length === 0) {
-        return undefined
-    }
-    return final
-}
diff --git a/src/lambda/vue/configEditor/samInvokeComponent.vue b/src/lambda/vue/configEditor/samInvokeComponent.vue
deleted file mode 100644
index 9f58b17a417..00000000000
--- a/src/lambda/vue/configEditor/samInvokeComponent.vue
+++ /dev/null
@@ -1,280 +0,0 @@
-/*! * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */
-
-<script src="./samInvokeFrontend" lang="ts"></script>
-<style scoped src="./samInvoke.css"></style>
-
-<template>
-    <form class="invoke-lambda-form">
-        <h1>Edit SAM Debug Configuration</h1>
-        <div class="container button-container" id="invoke-button-container">
-            <button class="" v-on:click.prevent="launch">Invoke</button>
-            <button class="form-buttons" v-on:click.prevent="loadConfig">Load Existing Config</button>
-            <button class="form-buttons" v-on:click.prevent="save">Save</button>
-        </div>
-        <p>
-            <em>
-                Using this form you can create, edit, and run launch-configs of <code>type:aws-sam</code>. When you
-                <strong>Invoke</strong> the launch config, {{ company }} Toolkit calls SAM CLI and attaches the debugger
-                to the code running in a local Docker container.
-            </em>
-        </p>
-        <settings-panel id="config-panel" title="Configuration" description="">
-            <label for="target-type-selector">Invoke Target Type</label>
-            <select name="target-types" id="target-type-selector" v-model="launchConfig.invokeTarget.target">
-                <option v-bind:value="type.value" v-for="(type, index) in targetTypes" :key="index">
-                    {{ type.name }}
-                </option></select
-            ><span class="data-view">{{ launchConfig.invokeTarget.target }}</span>
-            <div class="target-code" v-if="launchConfig.invokeTarget.target === 'code'">
-                <div class="config-item">
-                    <label for="select-directory">Project Root</label>
-                    <input
-                        id="select-directory"
-                        type="text"
-                        v-model="launchConfig.invokeTarget.projectRoot"
-                        placeholder="Enter a directory"
-                    />
-                    <span class="data-view">the selected directory: {{ launchConfig.invokeTarget.projectRoot }}</span>
-                </div>
-                <div class="config-item">
-                    <label for="lambda-handler">Lambda Handler</label>
-                    <input
-                        type="text"
-                        placeholder="Enter the lambda handler"
-                        name="lambda-handler"
-                        id="lambda-handler"
-                        v-model="launchConfig.invokeTarget.lambdaHandler"
-                    />
-                    <span class="data-view">lamda handler :{{ launchConfig.invokeTarget.lambdaHandler }}</span>
-                </div>
-                <div class="config-item">
-                    <label for="runtime-selector">Runtime</label>
-                    <select name="runtimeType" v-model="launchConfig.lambda.runtime">
-                        <option disabled>Choose a runtime...</option>
-                        <option v-for="(runtime, index) in runtimes" v-bind:value="runtime" :key="index">
-                            {{ runtime }}
-                        </option>
-                    </select>
-                    <span class="data-view">runtime in data: {{ launchConfig.lambda.runtime }}</span>
-                </div>
-            </div>
-            <div class="target-template" v-else-if="launchConfig.invokeTarget.target === 'template'">
-                <button class="margin-bottom-16" v-on:click.prevent="loadResource">Load Resource</button><br />
-                <div class="config-item">
-                    <label for="template-path">Template Path</label>
-                    <input
-                        id="template-path-button"
-                        type="text"
-                        v-model="launchConfig.invokeTarget.templatePath"
-                        placeholder="Enter the template path..."
-                    /><span class="data-view"
-                        >Template path from data: {{ launchConfig.invokeTarget.templatePath }}</span
-                    >
-                </div>
-                <div class="config-item">
-                    <label for="logicalID">Resource (Logical Id)</label>
-                    <input
-                        name="template-logical-id"
-                        id="template-logical-id"
-                        type="text"
-                        placeholder="Enter a resource"
-                        v-model="launchConfig.invokeTarget.logicalId"
-                    /><span class="data-view"> Logical Id from data: {{ launchConfig.invokeTarget.logicalId }}</span>
-                </div>
-                <div class="config-item">
-                    <label for="runtime-selector">Runtime</label>
-                    <select name="runtimeType" v-model="launchConfig.lambda.runtime">
-                        <option disabled>Choose a runtime...</option>
-                        <option v-for="(runtime, index) in runtimes" v-bind:value="runtime" :key="index">
-                            {{ runtime }}
-                        </option>
-                    </select>
-                    <span class="data-view">runtime in data: {{ launchConfig.lambda.runtime }}</span>
-                </div>
-            </div>
-            <div class="target-apigw" v-else-if="launchConfig.invokeTarget.target === 'api'">
-                <button v-on:click.prevent="loadResource">Load Resource</button><br />
-                <div class="config-item">
-                    <label for="template-path">Template Path</label>
-                    <input
-                        id="template-path-button"
-                        type="text"
-                        v-model="launchConfig.invokeTarget.templatePath"
-                        placeholder="Enter the template path..."
-                    /><span class="data-view"
-                        >Template path from data: {{ launchConfig.invokeTarget.templatePath }}</span
-                    >
-                </div>
-                <div class="config-item">
-                    <label for="logicalID">Resource (Logical Id)</label>
-                    <input
-                        name="template-logical-id"
-                        id="template-logical-id"
-                        type="text"
-                        placeholder="Enter a resource"
-                        v-model="launchConfig.invokeTarget.logicalId"
-                    />
-                </div>
-                <div class="config-item">
-                    <label for="runtime-selector">Runtime</label>
-                    <select name="runtimeType" v-model="launchConfig.lambda.runtime">
-                        <option disabled>Choose a runtime...</option>
-                        <option v-for="(runtime, index) in runtimes" v-bind:value="runtime" :key="index">
-                            {{ runtime }}
-                        </option>
-                    </select>
-                    <span class="data-view">runtime in data: {{ launchConfig.lambda.runtime }}</span>
-                </div>
-                <div class="config-item">
-                    <label for="path">Path</label>
-                    <input type="text" v-model="launchConfig.api.path" />
-                </div>
-                <div class="config-item">
-                    <label for="http-method-selector">HTTP Method</label>
-                    <select name="http-method" v-model="launchConfig.api.httpMethod">
-                        <option disabled>Choose an HTTP Method</option>
-                        <option v-for="(method, index) in httpMethods" v-bind:value="method.toLowerCase()" :key="index">
-                            {{ method }}
-                        </option></select
-                    ><span class="data-view">{{ launchConfig.api.httpMethod }}</span>
-                </div>
-                <div class="config-item">
-                    <label for="query-string">Query String</label>
-                    <input
-                        name="query-string"
-                        id="query-string"
-                        type="text"
-                        cols="15"
-                        rows="2"
-                        placeholder="Enter a query"
-                        v-model="launchConfig.api.querystring"
-                    />
-                </div>
-                <div class="config-item">
-                    <label for="headers">Headers</label>
-                    <input
-                        type="text"
-                        v-model="headers.value"
-                        placeholder="Enter as valid JSON"
-                        :data-invalid="!!headers.errorMsg"
-                    />
-                    <div class="input-validation col2" v-if="headers.errorMsg">
-                        Error parsing JSON: {{ headers.errorMsg }}
-                    </div>
-                </div>
-            </div>
-            <div v-else>Select an Invoke Target</div>
-        </settings-panel>
-        <settings-panel id="more-fields-panel" title="Additional Fields" description="" start-collapsed>
-            <h3>aws</h3>
-            <div class="config-item">
-                <label for="awsConnection">Credentials:</label>
-                <input type="text" v-model="launchConfig.aws.credentials" />
-            </div>
-            <div class="config-item">
-                <label for="region">Region</label>
-                <input type="text" v-model="launchConfig.aws.region" />
-            </div>
-            <h3>lambda</h3>
-            <div class="config-item">
-                <label for="">Environment Variables</label>
-                <input
-                    type="text"
-                    placeholder="Enter as valid JSON"
-                    v-model="environmentVariables.value"
-                    :data-invalid="!!environmentVariables.errorMsg"
-                />
-                <div class="input-validation col2" v-if="environmentVariables.errorMsg">
-                    Error parsing JSON: {{ environmentVariables.errorMsg }}
-                </div>
-            </div>
-            <div class="config-item">
-                <label for="memory">Memory (MB)</label>
-                <input type="number" v-model.number="launchConfig.lambda.memoryMb" />
-            </div>
-            <div class="config-item">
-                <label for="timeoutSec">Timeout (s)</label>
-                <input type="number" v-model.number="launchConfig.lambda.timeoutSec" />
-            </div>
-            <!-- <div class="config-item">
-                <label for="pathMappings">Path Mappings</label>
-                <input type="text" v-model="launchConfig.lambda.pathMappings" >
-            </div> -->
-            <h3>sam</h3>
-            <div class="config-item">
-                <label for="buildArguments">Build Arguments</label>
-                <input
-                    type="text"
-                    v-model="launchConfig.sam.buildArguments"
-                    placeholder="Enter as a comma separated list"
-                />
-            </div>
-            <div class="config-item">
-                <label for="containerBuild">Container Build</label>
-                <input type="checkbox" name="containerBuild" id="containerBuild" v-model="containerBuild" />
-            </div>
-            <div class="config-item">
-                <label for="dockerNetwork">Docker Network</label>
-                <input type="text" v-model="launchConfig.sam.dockerNetwork" />
-            </div>
-            <div class="config-item">
-                <label for="localArguments">Local Arguments</label>
-                <input
-                    type="text"
-                    v-model="launchConfig.sam.localArguments"
-                    placeholder="Enter as a comma separated list"
-                />
-            </div>
-            <div class="config-item">
-                <label for="skipNewImageCheck">Skip New Image Check</label>
-                <input type="checkbox" name="skipNewImageCheck" id="skipNewImageCheck" v-model="skipNewImageCheck" />
-            </div>
-            <div class="config-item">
-                <label for="templateParameters">Template - Parameters</label>
-                <input type="text" v-model="parameters.value" :data-invalid="!!parameters.errorMsg" />
-                <div class="input-validation col2" v-if="parameters.errorMsg">
-                    Error parsing JSON: {{ parameters.errorMsg }}
-                </div>
-            </div>
-            <h3>api</h3>
-            <div class="config-item">
-                <label for="querystring">Query String</label>
-                <input type="text" v-model="launchConfig.api.querystring" />
-            </div>
-            <div class="config-item">
-                <label for="stageVariables">Stage Variables</label>
-                <input
-                    type="text"
-                    v-model="stageVariables.value"
-                    :data-invalid="!!stageVariables.errorMsg"
-                    placeholder="Enter as valid JSON"
-                />
-                <div class="input-validation col2" v-if="stageVariables.errorMsg">
-                    Error parsing JSON: {{ stageVariables.errorMsg }}
-                </div>
-            </div>
-            <div class="config-item">
-                <label for="clientCerificateId">Client Certificate ID</label>
-                <input type="text" v-model="launchConfig.api.clientCertificateId" />
-            </div>
-            <div class="config-item">
-                <label for="apiPayload">API Payload</label>
-                <input
-                    type="text"
-                    v-model="apiPayload.value"
-                    placeholder="Enter as valid JSON"
-                    :data-invalid="!!apiPayload.errorMsg"
-                />
-                <div class="input-validation col2" v-if="apiPayload.errorMsg">
-                    Error parsing JSON: {{ apiPayload.errorMsg }}
-                </div>
-            </div>
-        </settings-panel>
-        <settings-panel id="payload-panel" title="Payload" description="" start-collapsed>
-            <button class="margin-bottom-16" v-on:click.prevent="loadPayload">Load Sample Payload</button><br />
-            <textarea name="lambda-payload" id="lambda-payload" cols="60" rows="5" v-model="payload.value"></textarea>
-            <span class="data-view">payload from data: {{ payload }} </span>
-            <div class="input-validation" v-if="payload.errorMsg">Error parsing JSON: {{ payload.errorMsg }}</div>
-        </settings-panel>
-    </form>
-</template>
diff --git a/src/lambda/vue/configEditor/samInvokeFrontend.ts b/src/lambda/vue/configEditor/samInvokeFrontend.ts
deleted file mode 100644
index 85de2b5b344..00000000000
--- a/src/lambda/vue/configEditor/samInvokeFrontend.ts
+++ /dev/null
@@ -1,281 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { defineComponent } from 'vue'
-import { AwsSamDebuggerConfiguration } from '../../../shared/sam/debugger/awsSamDebugConfiguration'
-import { AwsSamDebuggerConfigurationLoose, SamInvokeWebview } from './samInvokeBackend'
-import settingsPanel from '../../../webviews/components/settingsPanel.vue'
-import { WebviewClientFactory } from '../../../webviews/client'
-import saveData from '../../../webviews/mixins/saveData'
-
-const client = WebviewClientFactory.create<SamInvokeWebview>()
-
-interface VueDataLaunchPropertyObject {
-    value: string
-    errorMsg: string
-}
-interface SamInvokeVueData {
-    msg: any
-    targetTypes: { [k: string]: string }[]
-    runtimes: string[]
-    company: string
-    httpMethods: string[]
-    launchConfig: AwsSamDebuggerConfigurationLoose
-    payload: VueDataLaunchPropertyObject
-    apiPayload: VueDataLaunchPropertyObject
-    environmentVariables: VueDataLaunchPropertyObject
-    headers: VueDataLaunchPropertyObject
-    stageVariables: VueDataLaunchPropertyObject
-    parameters: VueDataLaunchPropertyObject
-    containerBuild: boolean
-    skipNewImageCheck: boolean
-}
-
-function newLaunchConfig(existingConfig?: AwsSamDebuggerConfiguration): AwsSamDebuggerConfigurationLoose {
-    return {
-        type: 'aws-sam',
-        request: 'direct-invoke',
-        name: '',
-        aws: {
-            credentials: '',
-            region: '',
-            ...(existingConfig?.aws ? existingConfig.aws : {}),
-        },
-        invokeTarget: {
-            target: 'template',
-            templatePath: '',
-            logicalId: '',
-            lambdaHandler: '',
-            projectRoot: '',
-            ...existingConfig?.invokeTarget,
-        },
-        lambda: {
-            runtime: existingConfig?.lambda?.runtime,
-            memoryMb: undefined,
-            timeoutSec: undefined,
-            environmentVariables: {},
-            ...existingConfig?.lambda,
-            payload: {
-                json: existingConfig?.lambda?.payload?.json ? existingConfig.lambda.payload.json : {},
-                path: existingConfig?.lambda?.payload?.path ? existingConfig.lambda.payload.path : '',
-            },
-
-            // pathMappings: undefined
-        },
-        sam: {
-            buildArguments: undefined,
-            containerBuild: false,
-            dockerNetwork: '',
-            localArguments: undefined,
-            skipNewImageCheck: false,
-            ...(existingConfig?.sam ? existingConfig.sam : {}),
-            template: {
-                parameters: existingConfig?.sam?.template?.parameters ? existingConfig.sam.template.parameters : {},
-            },
-        },
-        api: {
-            path: '',
-            httpMethod: 'get',
-            clientCertificateId: '',
-            querystring: '',
-            headers: {},
-            stageVariables: {},
-            ...(existingConfig?.api ? existingConfig.api : {}),
-            payload: {
-                json: existingConfig?.api?.payload?.json ? existingConfig.api.payload.json : {},
-                path: existingConfig?.api?.payload?.path ? existingConfig.api.payload.path : '',
-            },
-        },
-    }
-}
-
-function initData() {
-    return {
-        containerBuild: false,
-        skipNewImageCheck: false,
-        launchConfig: newLaunchConfig(),
-        payload: { value: '', errorMsg: '' },
-        apiPayload: { value: '', errorMsg: '' },
-        environmentVariables: { value: '', errorMsg: '' },
-        parameters: { value: '', errorMsg: '' },
-        headers: { value: '', errorMsg: '' },
-        stageVariables: { value: '', errorMsg: '' },
-    }
-}
-
-export default defineComponent({
-    name: 'sam-invoke',
-    components: {
-        settingsPanel,
-    },
-    created() {
-        client.init().then(config => this.parseConfig(config))
-
-        client.getRuntimes().then(runtimes => {
-            this.runtimes = runtimes
-        })
-
-        client.getCompanyName().then(o => {
-            this.company = o
-        })
-    },
-    mixins: [saveData],
-    data(): SamInvokeVueData {
-        return {
-            ...initData(),
-            msg: 'Hello',
-            company: '',
-            targetTypes: [
-                { name: 'Code', value: 'code' },
-                { name: 'Template', value: 'template' },
-                { name: 'API Gateway (Template)', value: 'api' },
-            ],
-            runtimes: [],
-            httpMethods: ['GET', 'POST', 'PUT', 'DELETE', 'HEAD', 'OPTIONS', 'PATCH'],
-        }
-    },
-    methods: {
-        resetJsonErrors() {
-            this.payload.errorMsg = ''
-            this.environmentVariables.errorMsg = ''
-            this.headers.errorMsg = ''
-            this.stageVariables.errorMsg = ''
-        },
-        launch() {
-            const config = this.formatConfig()
-            config && client.invokeLaunchConfig(config)
-        },
-        save() {
-            const config = this.formatConfig()
-            config && client.saveLaunchConfig(config)
-        },
-        loadConfig() {
-            client.loadSamLaunchConfig().then(config => this.parseConfig(config))
-        },
-        parseConfig(config?: AwsSamDebuggerConfiguration) {
-            if (!config) {
-                return
-            }
-            const company = this.company
-            this.clearForm()
-            this.launchConfig = newLaunchConfig(config)
-            if (config.lambda?.payload) {
-                this.payload.value = JSON.stringify(config.lambda.payload.json, undefined, 4)
-            }
-            if (config.lambda?.environmentVariables) {
-                this.environmentVariables.value = JSON.stringify(config.lambda?.environmentVariables)
-            }
-            if (config.sam?.template?.parameters) {
-                this.parameters.value = JSON.stringify(config.sam?.template?.parameters)
-            }
-            if (config.api?.headers) {
-                this.headers.value = JSON.stringify(config.api?.headers)
-            }
-            if (config.api?.stageVariables) {
-                this.stageVariables.value = JSON.stringify(config.api?.stageVariables)
-            }
-            this.containerBuild = config.sam?.containerBuild ?? false
-            this.skipNewImageCheck = config.sam?.skipNewImageCheck ?? false
-            this.msg = `Loaded config ${config}`
-            this.company = company
-        },
-        loadPayload() {
-            this.resetJsonErrors()
-            client.getSamplePayload().then(sample => {
-                if (!sample) {
-                    return
-                }
-                this.payload.value = JSON.stringify(JSON.parse(sample), undefined, 4)
-            })
-        },
-        loadResource() {
-            this.resetJsonErrors()
-            client.getTemplate().then(template => {
-                if (!template) {
-                    return
-                }
-                this.launchConfig.invokeTarget.target = 'template'
-                this.launchConfig.invokeTarget.logicalId = template.logicalId
-                this.launchConfig.invokeTarget.templatePath = template.template
-            })
-        },
-        formatFieldToStringArray(field: string | undefined) {
-            if (!field) {
-                return undefined
-            }
-            //Reg ex for a comma with 0 or more whitespace before and/or after
-            const re = /\s*,\s*/g
-            return field.trim().split(re)
-        },
-        formatStringtoJSON(field: VueDataLaunchPropertyObject) {
-            field.errorMsg = ''
-            if (field.value) {
-                try {
-                    return JSON.parse(field.value)
-                } catch (e) {
-                    field.errorMsg = (e as Error).message
-                    throw e
-                }
-            }
-        },
-        formatConfig() {
-            this.resetJsonErrors()
-
-            let payloadJson, environmentVariablesJson, headersJson, stageVariablesJson, parametersJson, apiPayloadJson
-
-            try {
-                payloadJson = this.formatStringtoJSON(this.payload)
-                environmentVariablesJson = this.formatStringtoJSON(this.environmentVariables)
-                headersJson = this.formatStringtoJSON(this.headers)
-                stageVariablesJson = this.formatStringtoJSON(this.stageVariables)
-                parametersJson = this.formatStringtoJSON(this.parameters)
-                apiPayloadJson = this.formatStringtoJSON(this.apiPayload)
-            } catch {
-                return
-            }
-
-            // Vue internally stores a Proxy for all object-like fields, so the spread operator can
-            // propagate those through to the `postMessage` command, causing an error. We can stop
-            // this by recursively accessing all primitive fields (which is what this line does)
-            const launchConfig: AwsSamDebuggerConfigurationLoose = JSON.parse(JSON.stringify(this.launchConfig))
-
-            return {
-                ...launchConfig,
-                lambda: {
-                    ...launchConfig.lambda,
-                    payload: {
-                        ...launchConfig.payload,
-                        json: payloadJson,
-                    },
-                    environmentVariables: environmentVariablesJson,
-                },
-                sam: {
-                    ...launchConfig.sam,
-                    buildArguments: this.formatFieldToStringArray(launchConfig.sam?.buildArguments?.toString()),
-                    localArguments: this.formatFieldToStringArray(launchConfig.sam?.localArguments?.toString()),
-                    containerBuild: this.containerBuild,
-                    skipNewImageCheck: this.skipNewImageCheck,
-                    template: {
-                        parameters: parametersJson,
-                    },
-                },
-                api: launchConfig.api
-                    ? {
-                          ...launchConfig.api,
-                          headers: headersJson,
-                          stageVariables: stageVariablesJson,
-                          payload: {
-                              json: apiPayloadJson,
-                          },
-                      }
-                    : undefined,
-            }
-        },
-        clearForm() {
-            const init = initData()
-            Object.keys(init).forEach(k => (this.$data[k as keyof typeof init] = init[k as keyof typeof init] as any))
-        },
-    },
-})
diff --git a/src/lambda/vue/remoteInvoke/index.ts b/src/lambda/vue/remoteInvoke/index.ts
deleted file mode 100644
index 59a84aafe15..00000000000
--- a/src/lambda/vue/remoteInvoke/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { createApp } from 'vue'
-import component from './remoteInvoke.vue'
-
-const create = () => createApp(component)
-const app = create()
-app.mount('#vue-app')
-
-window.addEventListener('remount', () => {
-    app.unmount()
-    create().mount('#vue-app')
-})
diff --git a/src/lambda/vue/remoteInvoke/invokeLambda.ts b/src/lambda/vue/remoteInvoke/invokeLambda.ts
deleted file mode 100644
index 154417c80db..00000000000
--- a/src/lambda/vue/remoteInvoke/invokeLambda.ts
+++ /dev/null
@@ -1,141 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { _Blob } from 'aws-sdk/clients/lambda'
-import { readFileSync } from 'fs'
-import * as _ from 'lodash'
-import * as vscode from 'vscode'
-import { DefaultLambdaClient, LambdaClient } from '../../../shared/clients/lambdaClient'
-import { ExtContext } from '../../../shared/extensions'
-
-import { getLogger } from '../../../shared/logger'
-import { HttpResourceFetcher } from '../../../shared/resourcefetcher/httpResourceFetcher'
-import { sampleRequestPath } from '../../constants'
-import { LambdaFunctionNode } from '../../explorer/lambdaFunctionNode'
-import { getSampleLambdaPayloads, SampleRequest } from '../../utils'
-
-import * as nls from 'vscode-nls'
-import { VueWebview } from '../../../webviews/main'
-import { telemetry } from '../../../shared/telemetry/telemetry'
-import { Result } from '../../../shared/telemetry/telemetry'
-
-const localize = nls.loadMessageBundle()
-
-export interface InitialData {
-    FunctionName: string
-    FunctionArn: string
-    FunctionRegion: string
-    InputSamples: SampleRequest[]
-}
-
-export interface RemoteInvokeData {
-    initialData: InitialData
-    selectedSampleRequest: string
-    sampleText: string
-    selectedFile: string
-}
-
-export class RemoteInvokeWebview extends VueWebview {
-    public readonly id = 'remoteInvoke'
-    public readonly source = 'src/lambda/vue/remoteInvoke/index.js'
-
-    public constructor(
-        private readonly channel: vscode.OutputChannel,
-        private readonly client: LambdaClient,
-        private readonly data: InitialData
-    ) {
-        super()
-    }
-
-    public init() {
-        return this.data
-    }
-
-    public async invokeLambda(input: string): Promise<void> {
-        let result: Result = 'Succeeded'
-
-        this.channel.show()
-        this.channel.appendLine('Loading response...')
-
-        try {
-            const funcResponse = await this.client.invoke(this.data.FunctionArn, input)
-            const logs = funcResponse.LogResult ? Buffer.from(funcResponse.LogResult, 'base64').toString() : ''
-            const payload = funcResponse.Payload ? funcResponse.Payload : JSON.stringify({})
-
-            this.channel.appendLine(`Invocation result for ${this.data.FunctionArn}`)
-            this.channel.appendLine('Logs:')
-            this.channel.appendLine(logs)
-            this.channel.appendLine('')
-            this.channel.appendLine('Payload:')
-            this.channel.appendLine(payload.toString())
-            this.channel.appendLine('')
-        } catch (e) {
-            const error = e as Error
-            this.channel.appendLine(`There was an error invoking ${this.data.FunctionArn}`)
-            this.channel.appendLine(error.toString())
-            this.channel.appendLine('')
-            result = 'Failed'
-        } finally {
-            telemetry.lambda_invokeRemote.emit({ result, passive: false })
-        }
-    }
-
-    public async getSample(requestName: string) {
-        const sampleUrl = `${sampleRequestPath}${requestName}`
-        const sample = (await new HttpResourceFetcher(sampleUrl, { showUrl: true }).get()) ?? ''
-
-        return sample
-    }
-
-    public async promptFile() {
-        const fileLocations = await vscode.window.showOpenDialog({
-            openLabel: 'Open',
-        })
-
-        if (!fileLocations || fileLocations.length === 0) {
-            return undefined
-        }
-
-        try {
-            const fileContent = readFileSync(fileLocations[0].fsPath, { encoding: 'utf8' })
-
-            return {
-                sample: fileContent,
-                selectedFile: fileLocations[0].path,
-            }
-        } catch (e) {
-            getLogger().error('readFileSync: Failed to read file at path %O', fileLocations[0].fsPath, e)
-            vscode.window.showErrorMessage((e as Error).message)
-        }
-    }
-}
-
-const Panel = VueWebview.compilePanel(RemoteInvokeWebview)
-
-export async function invokeRemoteLambda(
-    context: ExtContext,
-    params: {
-        /* TODO: Instead of vague scope-leaking objects: awsContext & element, it would be cleaner if this took:
-         *  {
-         *      lambdaClient: LambdaClient,         // or just invoke/invokeAsync interface of AWS.Lambda (see: lambda.d.ts)
-         *      invokeParams: {functionArn: string} // or Lambda.Types.InvocationRequest (see: lambda.d.ts)
-         *  }
-         */
-        outputChannel: vscode.OutputChannel
-        functionNode: LambdaFunctionNode
-    }
-) {
-    const inputs = await getSampleLambdaPayloads()
-    const client = new DefaultLambdaClient(params.functionNode.regionCode)
-
-    const wv = new Panel(context.extensionContext, context.outputChannel, client, {
-        FunctionName: params.functionNode.configuration.FunctionName ?? '',
-        FunctionArn: params.functionNode.configuration.FunctionArn ?? '',
-        FunctionRegion: params.functionNode.regionCode,
-        InputSamples: inputs,
-    })
-
-    await wv.show({ title: localize('AWS.invokeLambda.title', 'Invoke Lambda {0}', params.functionNode.functionName) })
-}
diff --git a/src/lambda/vue/remoteInvoke/remoteInvoke.vue b/src/lambda/vue/remoteInvoke/remoteInvoke.vue
deleted file mode 100644
index d5b66227aa9..00000000000
--- a/src/lambda/vue/remoteInvoke/remoteInvoke.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-/*! * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved. * SPDX-License-Identifier: Apache-2.0 */
-
-<template>
-    <div class="container button-container" style="justify-content: space-between">
-        <h1>Function {{ initialData.FunctionName }}</h1>
-        <div><button v-on:click="sendInput">Invoke</button></div>
-    </div>
-
-    <p style="margin-bottom: 5px; margin-top: 10px; margin-right: 5px">ARN: {{ initialData.FunctionArn }}</p>
-
-    <p style="margin-top: 0">Region: {{ initialData.FunctionRegion }}</p>
-
-    <h3>Select a file to use as payload:</h3>
-    <div>
-        <button v-on:click="promptForFileLocation">Choose File</button>
-        &nbsp; {{ selectedFile }}
-    </div>
-    <br />
-    <h3>Or, use a sample request payload from a template:</h3>
-    <select v-model="selectedSampleRequest" v-on:change="newSelection">
-        <option disabled value="">Select an example input</option>
-        <option v-for="item in initialData.InputSamples" :key="item.name" :value="item.filename">
-            {{ item.name }}
-        </option>
-    </select>
-    <br />
-    <br />
-    <textarea style="width: 100%; margin-bottom: 10px" rows="10" cols="90" v-model="sampleText"></textarea>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue'
-import { WebviewClientFactory } from '../../../webviews/client'
-import saveData from '../../../webviews/mixins/saveData'
-import { RemoteInvokeData, RemoteInvokeWebview } from './invokeLambda'
-
-const client = WebviewClientFactory.create<RemoteInvokeWebview>()
-const defaultInitialData = {
-    FunctionName: '',
-    FunctionArn: '',
-    FunctionRegion: '',
-    InputSamples: [],
-}
-
-export default defineComponent({
-    async created() {
-        this.initialData = (await client.init()) ?? this.initialData
-    },
-    data(): RemoteInvokeData {
-        return {
-            initialData: { ...defaultInitialData },
-            selectedSampleRequest: '',
-            sampleText: '',
-            selectedFile: '',
-        }
-    },
-    methods: {
-        async newSelection() {
-            const resp = await client.getSample(this.selectedSampleRequest)
-            this.sampleText = resp
-        },
-        async promptForFileLocation() {
-            const resp = await client.promptFile()
-            if (resp) {
-                this.sampleText = resp.sample
-                this.selectedFile = resp.selectedFile
-            }
-        },
-        sendInput() {
-            client.invokeLambda(this.sampleText)
-        },
-    },
-    mixins: [saveData],
-})
-</script>
diff --git a/src/main.ts b/src/main.ts
deleted file mode 100644
index 5d8dfed569c..00000000000
--- a/src/main.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as extension from './extension'
-import type { ExtensionContext } from 'vscode'
-
-export async function activate(context: ExtensionContext) {
-    return extension.awsToolkitActivate(context)
-}
-
-export async function deactivate() {
-    await extension.awsToolkitDeactivate()
-}
diff --git a/src/s3/activation.ts b/src/s3/activation.ts
deleted file mode 100644
index 70c88af1cc9..00000000000
--- a/src/s3/activation.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { copyPathCommand } from './commands/copyPath'
-import { createBucketCommand } from './commands/createBucket'
-import { createFolderCommand } from './commands/createFolder'
-import { deleteBucketCommand } from './commands/deleteBucket'
-import { deleteFileCommand } from './commands/deleteFile'
-import { downloadFileAsCommand } from './commands/downloadFileAs'
-import { presignedURLCommand } from './commands/presignedURL'
-import { editFileCommand, openFileReadModeCommand } from './commands/openFile'
-import { uploadFileCommand } from './commands/uploadFile'
-import { uploadFileToParentCommand } from './commands/uploadFileToParent'
-import { S3BucketNode } from './explorer/s3BucketNode'
-import { S3FolderNode } from './explorer/s3FolderNode'
-import { S3Node } from './explorer/s3Nodes'
-import { S3FileNode } from './explorer/s3FileNode'
-import { ExtContext } from '../shared/extensions'
-import { S3FileViewerManager, s3EditScheme, s3ReadScheme } from './fileViewerManager'
-import { VirualFileSystem } from '../shared/virtualFilesystem'
-import { Commands } from '../shared/vscode/commands2'
-
-import * as nls from 'vscode-nls'
-import { DefaultS3Client } from '../shared/clients/s3Client'
-const localize = nls.loadMessageBundle()
-
-/**
- * Activates S3 components.
- */
-
-export async function activate(ctx: ExtContext): Promise<void> {
-    const fs = new VirualFileSystem(
-        localize('AWS.s3.fileViewer.genericError', 'Unable to open S3 file, try reopening from the explorer')
-    )
-    const manager = new S3FileViewerManager(region => new DefaultS3Client(region), fs)
-
-    ctx.extensionContext.subscriptions.push(manager)
-    ctx.extensionContext.subscriptions.push(
-        vscode.workspace.registerFileSystemProvider(s3EditScheme, fs),
-        vscode.workspace.registerFileSystemProvider(s3ReadScheme, fs, { isReadonly: true }),
-        Commands.register('aws.s3.copyPath', async (node: S3FolderNode | S3FileNode) => {
-            await copyPathCommand(node)
-        }),
-        Commands.register('aws.s3.presignedURL', async (node: S3FileNode) => {
-            await presignedURLCommand(node)
-        }),
-        Commands.register('aws.s3.downloadFileAs', async (node: S3FileNode) => {
-            await downloadFileAsCommand(node)
-        }),
-        Commands.register('aws.s3.openFile', async (node: S3FileNode) => {
-            await openFileReadModeCommand(node, manager)
-        }),
-        Commands.register('aws.s3.editFile', async (uriOrNode: vscode.Uri | S3FileNode) => {
-            await editFileCommand(uriOrNode, manager)
-        }),
-        Commands.register(
-            { id: 'aws.s3.uploadFile', autoconnect: true },
-            async (node?: S3BucketNode | S3FolderNode) => {
-                if (!node) {
-                    const awsContext = ctx.awsContext
-                    const regionCode = awsContext.getCredentialDefaultRegion()
-                    const s3Client = new DefaultS3Client(regionCode)
-                    const document = vscode.window.activeTextEditor?.document.uri
-                    await uploadFileCommand(s3Client, document)
-                } else {
-                    await uploadFileCommand(node.s3, node)
-                }
-            }
-        ),
-        Commands.register('aws.s3.uploadFileToParent', async (node: S3FileNode) => {
-            await uploadFileToParentCommand(node)
-        }),
-        Commands.register('aws.s3.createBucket', async (node: S3Node) => {
-            await createBucketCommand(node)
-        }),
-        Commands.register('aws.s3.createFolder', async (node: S3BucketNode | S3FolderNode) => {
-            await createFolderCommand(node)
-        }),
-        Commands.register('aws.s3.deleteBucket', async (node: S3BucketNode) => {
-            await deleteBucketCommand(node)
-        }),
-        Commands.register('aws.s3.deleteFile', async (node: S3FileNode) => {
-            await deleteFileCommand(node)
-        })
-    )
-}
diff --git a/src/s3/commands/copyPath.ts b/src/s3/commands/copyPath.ts
deleted file mode 100644
index 6dd59f6239c..00000000000
--- a/src/s3/commands/copyPath.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Env } from '../../shared/vscode/env'
-import { copyToClipboard } from '../../shared/utilities/messages'
-import { Window } from '../../shared/vscode/window'
-import { S3FolderNode } from '../explorer/s3FolderNode'
-import { S3FileNode } from '../explorer/s3FileNode'
-import { telemetry } from '../../shared/telemetry/telemetry'
-
-/**
- * Copies the path to the folder or file represented by the given node.
- *
- * Note that the path does not contain the bucket name or a leading slash.
- */
-export async function copyPathCommand(
-    node: S3FolderNode | S3FileNode,
-    window = Window.vscode(),
-    env = Env.vscode()
-): Promise<void> {
-    await telemetry.s3_copyPath.run(() => copyToClipboard(node.path, 'path', window, env))
-}
diff --git a/src/s3/commands/createBucket.ts b/src/s3/commands/createBucket.ts
deleted file mode 100644
index f145399984a..00000000000
--- a/src/s3/commands/createBucket.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { getLogger } from '../../shared/logger'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { Commands } from '../../shared/vscode/commands'
-import { Window } from '../../shared/vscode/window'
-import { S3Node } from '../explorer/s3Nodes'
-import { validateBucketName } from '../util'
-import { ToolkitError } from '../../shared/errors'
-import { CancellationError } from '../../shared/utilities/timeoutUtils'
-import { telemetry } from '../../shared/telemetry/telemetry'
-
-/**
- * Creates a bucket in the s3 region represented by the given node.
- *
- * Prompts the user for the bucket name, applying basic validations.
- * Creates the bucket.
- * Refreshes the node.
- */
-export async function createBucketCommand(
-    node: S3Node,
-    window = Window.vscode(),
-    commands = Commands.vscode()
-): Promise<void> {
-    await telemetry.s3_createBucket.run(async () => {
-        const bucketName = await window.showInputBox({
-            prompt: localize('AWS.s3.createBucket.prompt', 'Enter a new bucket name'),
-            placeHolder: localize('AWS.s3.createBucket.placeHolder', 'Bucket Name'),
-            validateInput: validateBucketName,
-        })
-
-        if (!bucketName) {
-            throw new CancellationError('user')
-        }
-
-        getLogger().info(`Creating bucket: ${bucketName}`)
-        const bucket = await node
-            .createBucket({ bucketName })
-            .catch(e => {
-                const message = localize(
-                    'AWS.s3.createBucket.error.general',
-                    'Failed to create bucket: {0}',
-                    bucketName
-                )
-                throw ToolkitError.chain(e, message)
-            })
-            .finally(() => refreshNode(node, commands))
-
-        getLogger().info('Created bucket: %O', bucket)
-        window.showInformationMessage(localize('AWS.s3.createBucket.success', 'Created bucket: {0}', bucketName))
-    })
-}
-
-async function refreshNode(node: S3Node, commands: Commands): Promise<void> {
-    return commands.execute('aws.refreshAwsExplorerNode', node)
-}
diff --git a/src/s3/commands/createFolder.ts b/src/s3/commands/createFolder.ts
deleted file mode 100644
index e687f46a07d..00000000000
--- a/src/s3/commands/createFolder.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { DEFAULT_DELIMITER } from '../../shared/clients/s3Client'
-import { getLogger } from '../../shared/logger'
-import { S3BucketNode } from '../explorer/s3BucketNode'
-import { S3FolderNode } from '../explorer/s3FolderNode'
-import { Commands } from '../../shared/vscode/commands'
-import { Window } from '../../shared/vscode/window'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { readablePath } from '../util'
-import { telemetry } from '../../shared/telemetry/telemetry'
-import { CancellationError } from '../../shared/utilities/timeoutUtils'
-import { ToolkitError } from '../../shared/errors'
-
-/**
- * Creates a subfolder in the bucket or folder represented by the given node.
- *
- * Prompts the user for the folder name, applying basic validations.
- * Creates the folder.
- * Refreshes the node.
- *
- * Node that the node is reset to displaying its first page of results.
- * The folder that is created won't necessary fall on the first page.
- * The user may need to load more pages to see the created folder reflected in the tree.
- */
-export async function createFolderCommand(
-    node: S3BucketNode | S3FolderNode,
-    window = Window.vscode(),
-    commands = Commands.vscode()
-): Promise<void> {
-    getLogger().debug('CreateFolder called for %O', node)
-
-    await telemetry.s3_createFolder.run(async () => {
-        const folderName = await window.showInputBox({
-            prompt: localize('AWS.s3.createFolder.prompt', 'Enter a folder to create in {0}', readablePath(node)),
-            placeHolder: localize('AWS.s3.createFolder.placeHolder', 'Folder Name'),
-            validateInput: validateFolderName,
-        })
-
-        if (!folderName) {
-            throw new CancellationError('user')
-        }
-
-        const path = node.path + folderName + DEFAULT_DELIMITER
-        getLogger().info(`Creating folder "${path}" in bucket '${node.bucket.name}'`)
-
-        const { folder } = await node
-            .createFolder({ path, bucketName: node.bucket.name })
-            .catch(e => {
-                const message = localize(
-                    'AWS.s3.createFolder.error.general',
-                    'Failed to create folder: {0}',
-                    folderName
-                )
-                throw ToolkitError.chain(e, message)
-            })
-            .finally(() => refreshNode(node, commands))
-
-        getLogger().info('created folder: %O', folder)
-        window.showInformationMessage(localize('AWS.s3.createFolder.success', 'Created folder: {0}', folderName))
-    })
-}
-
-function validateFolderName(name: string): string | undefined {
-    if (name.includes(DEFAULT_DELIMITER)) {
-        return localize(
-            'AWS.s3.createFolder.error.illegalCharacter',
-            `Folder name must not contain '{0}'`,
-            DEFAULT_DELIMITER
-        )
-    }
-
-    if (name === '') {
-        return localize('AWS.s3.createFolder.error.emptyName', 'Folder name must not be empty')
-    }
-    return undefined
-}
-
-async function refreshNode(node: S3BucketNode | S3FolderNode, commands: Commands): Promise<void> {
-    node.clearChildren()
-    return commands.execute('aws.refreshAwsExplorerNode', node)
-}
diff --git a/src/s3/commands/deleteBucket.ts b/src/s3/commands/deleteBucket.ts
deleted file mode 100644
index 28d85eda54c..00000000000
--- a/src/s3/commands/deleteBucket.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { getLogger } from '../../shared/logger'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { Commands } from '../../shared/vscode/commands'
-import { Window } from '../../shared/vscode/window'
-import { S3BucketNode } from '../explorer/s3BucketNode'
-import { S3Node } from '../explorer/s3Nodes'
-import { telemetry } from '../../shared/telemetry/telemetry'
-import { CancellationError } from '../../shared/utilities/timeoutUtils'
-import { ToolkitError } from '../../shared/errors'
-
-/**
- * Deletes the bucket represented by the given node.
- *
- * Prompts the user for confirmation (user must type the bucket name).
- * Empties and deletes the bucket, showing a progress bar.
- * Refreshes the parent node.
- *
- * Note that this just repeatedly calls list and delete to empty the bucket before deletion.
- * Failures during the emptying or deleting step can leave the bucket in a state where
- * some (or all) objects are deleted, but the bucket remains.
- *
- * This is unfortunate, but it's still a valuable feature and partial failures
- * don't result in a state of too much confusion for the user.
- */
-export async function deleteBucketCommand(
-    node: S3BucketNode,
-    window = Window.vscode(),
-    commands = Commands.vscode()
-): Promise<void> {
-    getLogger().debug('DeleteBucket called for %O', node)
-
-    await telemetry.s3_deleteBucket.run(async () => {
-        const isConfirmed = await showConfirmationDialog(node.bucket.name, window)
-        if (!isConfirmed) {
-            throw new CancellationError('user')
-        }
-
-        getLogger().info(`Deleting bucket: ${node.bucket.name}`)
-        await deleteWithProgress(node, window)
-            .catch(e => {
-                const message = localize(
-                    'AWS.s3.deleteBucket.error.general',
-                    'Failed to delete bucket {0}',
-                    node.bucket.name
-                )
-                throw ToolkitError.chain(e, message)
-            })
-            .finally(() => refreshNode(node.parent, commands))
-        getLogger().info(`deleted bucket: ${node.bucket.name}`)
-    })
-}
-
-async function showConfirmationDialog(bucketName: string, window: Window): Promise<boolean> {
-    const prompt = localize('AWS.s3.deleteBucket.prompt', 'Enter {0} to confirm deletion', bucketName)
-    const confirmationInput = await window.showInputBox({
-        prompt,
-        placeHolder: bucketName,
-        validateInput: input => (input !== bucketName ? prompt : undefined),
-    })
-
-    return confirmationInput === bucketName
-}
-
-async function deleteWithProgress(node: S3BucketNode, window: Window): Promise<void> {
-    return window.withProgress(
-        {
-            location: vscode.ProgressLocation.Notification,
-            title: localize('AWS.s3.deleteBucket.progressTitle', 'Deleting {0}...', node.bucket.name),
-        },
-        () => {
-            return node.deleteBucket()
-        }
-    )
-}
-
-async function refreshNode(node: S3Node, commands: Commands): Promise<void> {
-    return commands.execute('aws.refreshAwsExplorerNode', node)
-}
diff --git a/src/s3/commands/deleteFile.ts b/src/s3/commands/deleteFile.ts
deleted file mode 100644
index f275934a466..00000000000
--- a/src/s3/commands/deleteFile.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as localizedText from '../../shared/localizedText'
-import { getLogger } from '../../shared/logger'
-import { addCodiconToString } from '../../shared/utilities/textUtilities'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { Commands } from '../../shared/vscode/commands'
-import { Window } from '../../shared/vscode/window'
-import { S3BucketNode } from '../explorer/s3BucketNode'
-import { S3FileNode } from '../explorer/s3FileNode'
-import { S3FolderNode } from '../explorer/s3FolderNode'
-import { readablePath } from '../util'
-import { showConfirmationMessage } from '../../shared/utilities/messages'
-import { telemetry } from '../../shared/telemetry/telemetry'
-import { CancellationError } from '../../shared/utilities/timeoutUtils'
-import { ToolkitError } from '../../shared/errors'
-
-const deleteFileDisplayTimeoutMs = 2000
-
-/**
- * Deletes the file represented by the given node.
- *
- * Prompts the user for confirmation.
- * Deletes the file.
- * Shows status bar message.
- * Refreshes the parent node.
- */
-export async function deleteFileCommand(
-    node: S3FileNode,
-    window = Window.vscode(),
-    commands = Commands.vscode()
-): Promise<void> {
-    const filePath = readablePath(node)
-    getLogger().debug('DeleteFile called for %O', node)
-
-    await telemetry.s3_deleteObject.run(async () => {
-        const isConfirmed = await showConfirmationMessage(
-            {
-                prompt: localize('AWS.s3.deleteFile.prompt', 'Are you sure you want to delete file {0}?', filePath),
-                confirm: localizedText.localizedDelete,
-                cancel: localizedText.cancel,
-            },
-            window
-        )
-        if (!isConfirmed) {
-            throw new CancellationError('user')
-        }
-
-        getLogger().info(`Deleting file ${filePath}`)
-
-        await node
-            .deleteFile()
-            .catch(e => {
-                const message = localize('AWS.s3.deleteFile.error.general', 'Failed to delete file {0}', node.file.name)
-                throw ToolkitError.chain(e, message)
-            })
-            .finally(() => refreshNode(node.parent, commands))
-
-        getLogger().info(`deleted file: ${filePath}`)
-        window.setStatusBarMessage(
-            addCodiconToString('trash', localize('AWS.deleteFile.success', 'Deleted: {0}', node.file.name)),
-            deleteFileDisplayTimeoutMs
-        )
-    })
-}
-
-async function refreshNode(node: S3BucketNode | S3FolderNode, commands: Commands): Promise<void> {
-    node.clearChildren()
-    return commands.execute('aws.refreshAwsExplorerNode', node)
-}
diff --git a/src/s3/commands/openFile.ts b/src/s3/commands/openFile.ts
deleted file mode 100644
index f1b91648ec1..00000000000
--- a/src/s3/commands/openFile.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { Window } from '../../shared/vscode/window'
-import { S3FileNode } from '../explorer/s3FileNode'
-import { S3FileViewerManager } from '../fileViewerManager'
-import { downloadFileAsCommand } from './downloadFileAs'
-import { telemetry } from '../../shared/telemetry/telemetry'
-
-const sizeLimit = 50 * Math.pow(10, 6)
-
-export async function openFileReadModeCommand(node: S3FileNode, manager: S3FileViewerManager): Promise<void> {
-    if (await isFileSizeValid(node.file.sizeBytes, node)) {
-        return telemetry.s3_openEditor.run(() => manager.openInReadMode({ bucket: node.bucket, ...node.file }))
-    }
-}
-
-export async function editFileCommand(uriOrNode: vscode.Uri | S3FileNode, manager: S3FileViewerManager): Promise<void> {
-    if (uriOrNode instanceof S3FileNode) {
-        const size = uriOrNode.file.sizeBytes
-
-        if (!(await isFileSizeValid(size, uriOrNode))) {
-            return
-        }
-
-        return telemetry.s3_editObject.run(() =>
-            manager.openInEditMode({ bucket: uriOrNode.bucket, ...uriOrNode.file })
-        )
-    }
-
-    return telemetry.s3_editObject.run(() => manager.openInEditMode(uriOrNode))
-}
-
-async function isFileSizeValid(
-    size: number | undefined,
-    fileNode: S3FileNode,
-    window = Window.vscode()
-): Promise<boolean> {
-    if (size && size > sizeLimit) {
-        const downloadAs = localize('AWS.s3.button.downloadAs', 'Download as..')
-        window
-            .showErrorMessage(
-                localize(
-                    'AWS.s3.fileViewer.error.invalidSize',
-                    'Files over 50MB cannot be viewed and instead must be downloaded manually.'
-                ),
-                downloadAs
-            )
-            .then(async response => {
-                if (response === downloadAs) {
-                    await downloadFileAsCommand(fileNode)
-                }
-            })
-        return false
-    }
-
-    return true
-}
diff --git a/src/s3/commands/presignedURL.ts b/src/s3/commands/presignedURL.ts
deleted file mode 100644
index dbd37f4dfdd..00000000000
--- a/src/s3/commands/presignedURL.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { SignedUrlRequest } from '../../shared/clients/s3Client'
-import { Env } from '../../shared/vscode/env'
-import { copyToClipboard } from '../../shared/utilities/messages'
-import { S3FileNode } from '../explorer/s3FileNode'
-import { Window } from '../../shared/vscode/window'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { invalidNumberWarning } from '../../shared/localizedText'
-import { telemetry } from '../../shared/telemetry/telemetry'
-import { ToolkitError } from '../../shared/errors'
-
-export async function presignedURLCommand(
-    node: S3FileNode,
-    window = Window.vscode(),
-    env = Env.vscode()
-): Promise<void> {
-    await telemetry.s3_copyUrl.run(async span => {
-        span.record({ presigned: true })
-
-        const validTime = await promptTime(node.file.key, window)
-        const s3Client = node.s3
-        const request: SignedUrlRequest = {
-            bucketName: node.bucket.name,
-            key: node.file.key,
-            time: validTime * 60,
-            operation: 'getObject',
-        }
-
-        const url = await s3Client.getSignedUrl(request).catch(e => {
-            throw ToolkitError.chain(
-                e,
-                'Error creating the presigned URL. Make sure you have access to the requested file.'
-            )
-        })
-
-        await copyToClipboard(url, 'URL', window, env)
-    })
-}
-
-export async function promptTime(fileName: string, window = Window.vscode()): Promise<number> {
-    const timeStr = await window.showInputBox({
-        value: '15',
-        prompt: localize(
-            'AWS.s3.promptTime.prompt',
-            'Specify the time (minutes) until URL will expire for path: {0}',
-            fileName
-        ),
-        placeHolder: localize('AWS.s3.promptTime.placeHolder', 'Defaults to 15 minutes'),
-        validateInput: validateTime,
-    })
-
-    const time = Number(timeStr)
-
-    if (isNaN(time) || time < 0) {
-        throw new ToolkitError('The provided expiration time is not a positive number', { code: 'InvalidInput' })
-    }
-
-    return time
-}
-
-function validateTime(time: string): string | undefined {
-    const number = Number(time)
-
-    if (isNaN(Number(time)) || !Number.isSafeInteger(number) || Number(time) <= 0) {
-        return invalidNumberWarning
-    }
-
-    return undefined
-}
diff --git a/src/s3/commands/uploadFile.ts b/src/s3/commands/uploadFile.ts
deleted file mode 100644
index 512c0440d1a..00000000000
--- a/src/s3/commands/uploadFile.ts
+++ /dev/null
@@ -1,538 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as path from 'path'
-import * as mime from 'mime-types'
-import * as vscode from 'vscode'
-import { statSync } from 'fs'
-import { S3 } from 'aws-sdk'
-import { getLogger } from '../../shared/logger'
-import { S3Node } from '../explorer/s3Nodes'
-import { Commands } from '../../shared/vscode/commands'
-import { Window } from '../../shared/vscode/window'
-import { readablePath } from '../util'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { showOutputMessage } from '../../shared/utilities/messages'
-import { createQuickPick, promptUser, verifySinglePickerOutput } from '../../shared/ui/picker'
-import { addCodiconToString } from '../../shared/utilities/textUtilities'
-import { S3Client } from '../../shared/clients/s3Client'
-import { createBucketCommand } from './createBucket'
-import { S3BucketNode } from '../explorer/s3BucketNode'
-import { S3FolderNode } from '../explorer/s3FolderNode'
-import * as localizedText from '../../shared/localizedText'
-import { CancellationError } from '../../shared/utilities/timeoutUtils'
-import { progressReporter } from '../progressReporter'
-import globals from '../../shared/extensionGlobals'
-import { telemetry } from '../../shared/telemetry/telemetry'
-
-export interface FileSizeBytes {
-    /**
-     * Returns the file size in bytes.
-     */
-    (file: vscode.Uri): number
-}
-
-interface UploadRequest {
-    bucketName: string
-    key: string
-    fileLocation: vscode.Uri
-    fileSizeBytes: number
-    s3Client: S3Client
-    window: Window
-    ongoingUpload?: S3.ManagedUpload
-}
-
-/**
- * Wizard to upload a file.
- *
- * @param s3Client account to upload the file to
- * @param nodeOrDocument node to upload to or file currently open, if undefined then there was no active editor
- *
- */
-export async function uploadFileCommand(
-    s3Client: S3Client,
-    nodeOrDocument: S3BucketNode | S3FolderNode | vscode.Uri | undefined,
-    fileSizeBytes: FileSizeBytes = statFile,
-    getBucket = promptUserForBucket,
-    getFile = getFilesToUpload,
-    window = Window.vscode(),
-    outputChannel = globals.outputChannel,
-    commands = Commands.vscode()
-): Promise<void> {
-    let node: S3BucketNode | S3FolderNode | undefined
-    let document: vscode.Uri | undefined
-    const uploadRequests: UploadRequest[] = []
-
-    if (nodeOrDocument) {
-        if (nodeOrDocument instanceof S3BucketNode || nodeOrDocument instanceof S3FolderNode) {
-            node = nodeOrDocument as S3BucketNode | S3FolderNode
-            document = undefined
-        } else {
-            node = undefined
-            document = nodeOrDocument as vscode.Uri
-        }
-    } else {
-        node = undefined
-        document = undefined
-    }
-
-    const fileToUploadRequest = (bucketName: string, key: string, file: vscode.Uri) => ({
-        bucketName,
-        key: key,
-        fileLocation: file,
-        fileSizeBytes: fileSizeBytes(file),
-        s3Client,
-        window,
-    })
-
-    if (node) {
-        const filesToUpload = await getFile(undefined, window)
-
-        if (!filesToUpload) {
-            showOutputMessage(
-                localize('AWS.message.error.uploadFileCommand.noFileSelected', 'No file selected, cancelling upload'),
-                outputChannel
-            )
-            getLogger().info('UploadFile cancelled')
-            telemetry.s3_uploadObject.emit({ result: 'Cancelled' })
-            return
-        }
-
-        uploadRequests.push(
-            ...filesToUpload.map(file => {
-                const key = node!.path + path.basename(file.fsPath)
-                return fileToUploadRequest(node!.bucket.name, key, file)
-            })
-        )
-    } else {
-        while (true) {
-            const filesToUpload = await getFile(document, window)
-
-            if (!filesToUpload || filesToUpload.length === 0) {
-                //if file is undefined, means the back button was pressed(there is no step before) or no file was selected
-                //thus break the loop of the 'wizard'
-                showOutputMessage(
-                    localize(
-                        'AWS.message.error.uploadFileCommand.noFileSelected',
-                        'No file selected, cancelling upload'
-                    ),
-                    outputChannel
-                )
-                getLogger().info('UploadFile cancelled')
-                telemetry.s3_uploadObject.emit({ result: 'Cancelled' })
-                return
-            }
-
-            const bucketResponse = await getBucket(s3Client).catch(e => {})
-
-            if (!bucketResponse) {
-                telemetry.s3_uploadObject.emit({ result: 'Failed' })
-                return
-            }
-
-            if (typeof bucketResponse === 'string') {
-                if (bucketResponse === 'back') {
-                    continue
-                }
-
-                showOutputMessage(
-                    localize(
-                        'AWS.message.error.uploadFileCommand.noBucketSelected',
-                        'No bucket selected, cancelling upload'
-                    ),
-                    outputChannel
-                )
-                getLogger().info('No bucket selected, cancelling upload')
-                telemetry.s3_uploadObject.emit({ result: 'Cancelled' })
-                return
-            }
-
-            const bucketName = bucketResponse.Name
-            if (!bucketName) {
-                throw Error(`bucketResponse is not a S3.Bucket`)
-            }
-
-            uploadRequests.push(
-                ...filesToUpload.map(file => {
-                    const key = path.basename(file.fsPath)
-                    return fileToUploadRequest(bucketName, key, file)
-                })
-            )
-
-            break
-        }
-    }
-
-    await runBatchUploads(uploadRequests, window, outputChannel)
-
-    commands.execute('aws.refreshAwsExplorer', true)
-}
-
-async function promptForFileLocation(window: Window): Promise<vscode.Uri[] | undefined> {
-    const fileLocations = await window.showOpenDialog({
-        canSelectMany: true,
-        openLabel: localize('AWS.s3.uploadFile.openButton', 'Upload'),
-    })
-
-    return fileLocations
-}
-
-function statFile(file: vscode.Uri) {
-    return statSync(file.fsPath).size
-}
-
-/**
- * Continously attempts to upload the files until all succeed or the user cancels.
- */
-async function runBatchUploads(
-    uploadRequests: UploadRequest[],
-    window = Window.vscode(),
-    outputChannel = globals.outputChannel
-): Promise<void> {
-    let failedRequests = await uploadBatchOfFiles(uploadRequests, window, outputChannel)
-
-    showOutputMessage(
-        localize(
-            'AWS.s3.uploadFile.complete',
-            'Uploaded {0}/{1} files',
-            uploadRequests.length - failedRequests.length,
-            uploadRequests.length
-        ),
-        outputChannel
-    )
-
-    while (failedRequests.length > 0) {
-        const failedKeys = failedRequests.map(request => request.key)
-        getLogger().error(`List of requests failed to upload:\n${failedRequests.toString().split(',').join('\n')}`)
-
-        if (failedRequests.length > 5) {
-            showOutputMessage(
-                localize(
-                    'AWS.s3.uploadFile.failedMany',
-                    'Failed uploads:\n{0}\nSee logs for full list of failed items',
-                    failedKeys.toString().split(',').slice(0, 5).join('\n')
-                ),
-                outputChannel
-            )
-        } else {
-            showOutputMessage(
-                localize(
-                    'AWS.s3.uploadFile.failed',
-                    'Failed uploads:\n{0}',
-                    failedKeys.toString().split(',').join('\n')
-                ),
-                outputChannel
-            )
-        }
-        //at least one request failed
-        const response = await window.showErrorMessage(
-            localize(
-                'AWS.s3.uploadFile.retryPrompt',
-                'S3 Upload: {0}/{1} failed.',
-                failedRequests.length,
-                uploadRequests.length
-            ),
-            localizedText.retry,
-            localizedText.skip
-        )
-
-        if (response === localizedText.retry) {
-            // No tail call optimization in node :(
-            failedRequests = await uploadBatchOfFiles(failedRequests, window, outputChannel)
-        } else {
-            break
-        }
-    }
-}
-
-/**
- * Uploads an array of requests to their specified s3 location.
- *
- * @returns array of unsuccessful requests
- */
-
-async function uploadBatchOfFiles(
-    uploadRequests: UploadRequest[],
-    window = Window.vscode(),
-    outputChannel = globals.outputChannel
-): Promise<UploadRequest[]> {
-    const totalBytes = uploadRequests.map(r => r.fileSizeBytes).reduce((a, b) => a + b, 0)
-    const response = await window.withProgress(
-        {
-            cancellable: true,
-            location: vscode.ProgressLocation.Notification,
-            title: localize(
-                'AWS.s3.uploadFile.progressTitle.batch',
-                'Uploading {0} files to {1}',
-                uploadRequests.length,
-                uploadRequests[0].bucketName
-            ),
-        },
-        async (progress, token) => {
-            let requestIdx: number = 0
-            const failedRequests: UploadRequest[] = []
-
-            token.onCancellationRequested(e => {
-                if (uploadRequests[requestIdx].ongoingUpload) {
-                    uploadRequests[requestIdx].ongoingUpload?.abort()
-                }
-                return failedRequests
-            })
-
-            while (!token.isCancellationRequested && requestIdx < uploadRequests.length) {
-                const request = uploadRequests[requestIdx]
-                const fileName = path.basename(request.key)
-                const destinationPath = readablePath({ bucket: { name: request.bucketName }, path: request.key })
-                showOutputMessage(
-                    localize('AWS.s3.uploadFile.startUpload', 'Uploading file {0} to {1}', fileName, destinationPath),
-                    outputChannel
-                )
-
-                let remainder = 0
-                let lastLoaded = 0
-                // TODO: don't use `withProgress`, it makes it hard to have control over the individual outputs
-                // For now we will hide the noisy info to the channel.
-                const progressWithCount: typeof progress = {
-                    report(value) {
-                        const loaded = ((value.increment ?? 0) / 100) * request.fileSizeBytes + remainder
-                        const rounded = Math.floor(loaded)
-                        const increment = ((rounded - lastLoaded) / totalBytes) * 100
-
-                        remainder = loaded - rounded
-                        lastLoaded = rounded
-                        progress.report({ message: `${fileName} (${value.message})`, increment })
-                    },
-                }
-
-                const uploadResult = await uploadWithProgress(request, progressWithCount, token).catch(err => {
-                    showOutputMessage(
-                        localize(
-                            'AWS.s3.uploadFile.error.general',
-                            'Failed to upload file {0}: {1}',
-                            fileName,
-                            err.message
-                        ),
-                        outputChannel
-                    )
-
-                    return request
-                })
-
-                if (uploadResult) {
-                    //this request failed to upload
-                    failedRequests.push(uploadResult)
-                }
-
-                requestIdx += 1
-            }
-
-            return failedRequests.concat(uploadRequests.slice(requestIdx))
-        }
-    )
-
-    telemetry.s3_uploadObject.emit({
-        result: response.length > 0 ? 'Failed' : 'Succeeded',
-        value: uploadRequests.length,
-        failedCount: response.length,
-        successCount: uploadRequests.length - response.length,
-    })
-
-    return response
-}
-
-/**
- * Uploads a single request to s3 with a progress window
- *
- * @param request File to be uploaded
- * @param progress Progress to report to
- * @param token Cancellation token
- * @returns The same request if failed, undefined otherwise
- */
-async function uploadWithProgress(
-    request: UploadRequest,
-    progress: vscode.Progress<{ message?: string; increment?: number }>,
-    token: vscode.CancellationToken
-): Promise<UploadRequest | undefined> {
-    const progressListener = progressReporter(progress, {
-        reportMessage: true,
-        totalBytes: request.fileSizeBytes,
-    })
-
-    const currentStream = await request.s3Client.uploadFile({
-        bucketName: request.bucketName,
-        key: request.key,
-        content: request.fileLocation,
-        progressListener,
-        contentType: mime.contentType(path.extname(request.fileLocation.fsPath)) || undefined,
-    })
-
-    progressListener(0)
-    request.ongoingUpload = currentStream
-
-    const cancelled = new Promise<void>((_, reject) => {
-        token.onCancellationRequested(e => {
-            currentStream.abort()
-            reject(new CancellationError('user'))
-        })
-    })
-
-    await Promise.race([currentStream.promise(), cancelled])
-
-    return (request.ongoingUpload = undefined)
-}
-
-interface BucketQuickPickItem extends vscode.QuickPickItem {
-    bucket: S3.Bucket | undefined
-}
-
-// TODO:: extract and reuse logic from sam deploy wizard (bucket selection)
-/**
- * Will display a quick pick with the list of all buckets owned by the user.
- * @param s3client client to get the list of buckets
- *
- * @returns Bucket selected by the user, 'back' or 'cancel'
- *
- * @throws Error if there is an error calling s3
- */
-export async function promptUserForBucket(
-    s3client: S3Client,
-    window = Window.vscode(),
-    promptUserFunction = promptUser,
-    createBucket = createBucketCommand
-): Promise<S3.Bucket | 'cancel' | 'back'> {
-    let allBuckets: S3.Bucket[]
-    try {
-        allBuckets = await s3client.listAllBuckets()
-    } catch (e) {
-        getLogger().error('Failed to list buckets from client', e)
-        window.showErrorMessage(
-            localize('AWS.message.error.promptUserForBucket.listBuckets', 'Failed to list buckets from client')
-        )
-        throw new Error('Failed to list buckets from client')
-    }
-
-    const s3Buckets = allBuckets.filter(bucket => {
-        return bucket && bucket.Name
-    }) as S3.Bucket[]
-
-    const createNewBucket: BucketQuickPickItem = {
-        label: localize('AWS.command.s3.createBucket', 'Create new bucket'),
-        bucket: undefined,
-    }
-    const bucketItems: BucketQuickPickItem[] = s3Buckets.map(bucket => {
-        return {
-            label: bucket.Name!,
-            bucket,
-        }
-    })
-
-    const picker = createQuickPick({
-        options: {
-            canPickMany: false,
-            ignoreFocusOut: true,
-            title: localize('AWS.message.selectBucket', 'Select an S3 bucket to upload to'),
-            step: 2,
-            totalSteps: 2,
-        },
-        items: [...bucketItems, createNewBucket],
-        buttons: [vscode.QuickInputButtons.Back],
-    })
-    const response = verifySinglePickerOutput(
-        await promptUserFunction({
-            picker: picker,
-            onDidTriggerButton: (button, resolve, reject) => {
-                if (button === vscode.QuickInputButtons.Back) {
-                    resolve([
-                        {
-                            label: 'back',
-                            bucket: undefined,
-                        },
-                    ])
-                }
-            },
-        })
-    )
-
-    if (!response) {
-        return 'cancel'
-    }
-
-    if (!response.bucket) {
-        if (response.label === 'back') {
-            return response.label
-        }
-        if (response.label === 'Create new bucket') {
-            const s3Node = new S3Node(s3client)
-            await createBucket(s3Node, window, Commands.vscode())
-            return promptUserForBucket(s3client)
-        }
-    } else {
-        return response.bucket
-    }
-    return 'cancel'
-}
-
-/**
- * Gets the open file in the current editor
- * Asks the user to browse for more files
- * If no file is open it prompts the user to select file
- * @param document document to use as currently open
- *
- * @returns file selected by the user
- */
-export async function getFilesToUpload(
-    document?: vscode.Uri,
-    window = Window.vscode(),
-    promptUserFunction = promptUser
-): Promise<vscode.Uri[] | undefined> {
-    let fileLocations: vscode.Uri[] | undefined
-
-    if (!document) {
-        fileLocations = await promptForFileLocation(window)
-    } else {
-        fileLocations = [document]
-        const fileNameToDisplay = path.basename(fileLocations[0].fsPath)
-
-        const fileOption: vscode.QuickPickItem = {
-            label: addCodiconToString('file', fileNameToDisplay),
-        }
-        const selectMore: vscode.QuickPickItem = {
-            label: localize('AWS.message.browseMoreFiles', 'Browse for more files...'),
-        }
-
-        const picker = createQuickPick({
-            options: {
-                canPickMany: false,
-                ignoreFocusOut: true,
-                title: localize('AWS.message.selectFileUpload', 'Select a file to upload'),
-                step: 1,
-                totalSteps: 2,
-            },
-            items: [fileOption, selectMore],
-            buttons: [vscode.QuickInputButtons.Back],
-        })
-
-        const response = verifySinglePickerOutput(
-            await promptUserFunction({
-                picker: picker,
-                onDidTriggerButton: (button, resolve, reject) => {
-                    if (button === vscode.QuickInputButtons.Back) {
-                        resolve(undefined)
-                    }
-                },
-            })
-        )
-
-        if (!response) {
-            return
-        }
-
-        if (response.label === selectMore.label) {
-            fileLocations = await promptForFileLocation(window)
-        }
-    }
-
-    return fileLocations
-}
diff --git a/src/s3/explorer/s3BucketNode.ts b/src/s3/explorer/s3BucketNode.ts
deleted file mode 100644
index fe3b6ee8711..00000000000
--- a/src/s3/explorer/s3BucketNode.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { ChildNodePage } from '../../awsexplorer/childNodeLoader'
-import { Bucket, CreateFolderRequest, CreateFolderResponse, S3Client } from '../../shared/clients/s3Client'
-
-import { AWSResourceNode } from '../../shared/treeview/nodes/awsResourceNode'
-import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
-import { LoadMoreNode } from '../../shared/treeview/nodes/loadMoreNode'
-import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
-import { makeChildrenNodes } from '../../shared/treeview/utils'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { ChildNodeLoader } from '../../awsexplorer/childNodeLoader'
-import { Workspace } from '../../shared/vscode/workspace'
-import { S3FileNode } from './s3FileNode'
-import { S3FolderNode } from './s3FolderNode'
-import { inspect } from 'util'
-import { getLogger } from '../../shared/logger'
-import { S3Node } from './s3Nodes'
-import { getIcon } from '../../shared/icons'
-
-/**
- * Represents an S3 bucket that may contain folders and/or objects.
- */
-export class S3BucketNode extends AWSTreeNodeBase implements AWSResourceNode, LoadMoreNode {
-    private readonly childLoader = new ChildNodeLoader(this, token => this.loadPage(token))
-
-    public constructor(
-        public readonly bucket: Bucket,
-        public readonly parent: S3Node,
-        public readonly s3: S3Client,
-        private readonly workspace = Workspace.vscode()
-    ) {
-        super(bucket.name, vscode.TreeItemCollapsibleState.Collapsed)
-        this.tooltip = bucket.name
-        this.iconPath = getIcon('aws-s3-bucket')
-        this.contextValue = 'awsS3BucketNode'
-    }
-
-    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
-        return await makeChildrenNodes({
-            getChildNodes: async () => this.childLoader.getChildren(),
-            getNoChildrenPlaceholderNode: async () =>
-                new PlaceholderNode(this, localize('AWS.explorerNode.s3.noObjects', '[No Objects found]')),
-        })
-    }
-
-    public async loadMoreChildren(): Promise<void> {
-        await this.childLoader.loadMoreChildren()
-    }
-
-    public isLoadingMoreChildren(): boolean {
-        return this.childLoader.isLoadingMoreChildren()
-    }
-
-    public clearChildren(): void {
-        this.childLoader.clearChildren()
-    }
-
-    private async loadPage(continuationToken: string | undefined): Promise<ChildNodePage<S3FolderNode | S3FileNode>> {
-        getLogger().debug(`Loading page for %O using continuationToken %s`, this, continuationToken)
-        const response = await this.s3.listFiles({
-            bucketName: this.bucket.name,
-            continuationToken,
-            maxResults: this.getMaxItemsPerPage(),
-        })
-
-        const newFolders = response.folders.map(folder => new S3FolderNode(this.bucket, folder, this.s3))
-        const newFiles = response.files.map(file => new S3FileNode(this.bucket, file, this, this.s3))
-
-        getLogger().debug(`Loaded folders: %O and files: %O`, newFolders, newFiles)
-        return {
-            newContinuationToken: response.continuationToken,
-            newChildren: [...newFolders, ...newFiles],
-        }
-    }
-
-    /**
-     * See {@link S3Client.createFolder}.
-     */
-    public async createFolder(request: CreateFolderRequest): Promise<CreateFolderResponse> {
-        return this.s3.createFolder(request)
-    }
-
-    /**
-     * See {@link S3Client.deleteBucket}.
-     */
-    public async deleteBucket(): Promise<void> {
-        await this.s3.deleteBucket({ bucketName: this.bucket.name })
-    }
-
-    public get arn(): string {
-        return this.bucket.arn
-    }
-
-    public get name(): string {
-        return this.bucket.name
-    }
-
-    public get path(): string {
-        // Even though the bucket is the "root", there is no '/' prefix on objects inside
-        return ''
-    }
-
-    public [inspect.custom](): string {
-        return `S3BucketNode (bucket=${this.bucket.name})`
-    }
-
-    private getMaxItemsPerPage(): number | undefined {
-        return this.workspace.getConfiguration('aws').get<number>('s3.maxItemsPerPage')
-    }
-}
diff --git a/src/s3/explorer/s3FileNode.ts b/src/s3/explorer/s3FileNode.ts
deleted file mode 100644
index 7094a319cda..00000000000
--- a/src/s3/explorer/s3FileNode.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as moment from 'moment'
-import * as bytes from 'bytes'
-import { Bucket, DownloadFileRequest, File, S3Client } from '../../shared/clients/s3Client'
-import { AWSResourceNode } from '../../shared/treeview/nodes/awsResourceNode'
-import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { inspect } from 'util'
-import { S3BucketNode } from './s3BucketNode'
-import { S3FolderNode } from './s3FolderNode'
-import globals from '../../shared/extensionGlobals'
-import { getRelativeDate } from '../../shared/utilities/textUtilities'
-import { isCloud9 } from '../../shared/extensionUtilities'
-import { getIcon } from '../../shared/icons'
-
-/**
- * Moment format for rendering readable dates for S3.
- *
- * Same format used in the S3 console, but it's also locale-aware.
- *
- * US: Jan 5, 2020 5:30:20 PM GMT-0700
- * GB: 5 Jan 2020 17:30:20 GMT+0100
- */
-export const s3DateFormat = 'll LTS [GMT]ZZ'
-
-/**
- * Represents an object in an S3 bucket.
- */
-export class S3FileNode extends AWSTreeNodeBase implements AWSResourceNode {
-    public constructor(
-        public readonly bucket: Bucket,
-        public readonly file: File,
-        public readonly parent: S3BucketNode | S3FolderNode,
-        public readonly s3: S3Client,
-        now: Date = new globals.clock.Date()
-    ) {
-        super(file.name)
-        if (file.sizeBytes !== undefined && file.lastModified) {
-            const readableSize = formatBytes(file.sizeBytes)
-
-            this.tooltip = localize(
-                'AWS.explorerNode.s3.fileTooltip',
-                '{0}\nSize: {1}\nLast Modified: {2}',
-                this.file.key,
-                readableSize,
-                moment(file.lastModified).format(s3DateFormat)
-            )
-            this.description = `${readableSize}, ${getRelativeDate(file.lastModified, now)}`
-        }
-        this.iconPath = getIcon('vscode-file')
-        this.contextValue = 'awsS3FileNode'
-        this.command = !isCloud9()
-            ? {
-                  command: 'aws.s3.openFile',
-                  title: localize('AWS.command.s3.openFile', 'Open File'),
-                  arguments: [this],
-              }
-            : undefined
-    }
-
-    /**
-     * See {@link S3Client.downloadFile}.
-     */
-    public async downloadFile(request: DownloadFileRequest): Promise<void> {
-        return this.s3.downloadFile(request)
-    }
-
-    /**
-     * See {@link S3Client.deleteFile}.
-     */
-    public async deleteFile(): Promise<void> {
-        await this.s3.deleteObject({ bucketName: this.bucket.name, key: this.file.key })
-    }
-
-    public get arn(): string {
-        return this.file.arn
-    }
-
-    public get name(): string {
-        return this.file.name
-    }
-
-    public get path(): string {
-        return this.file.key
-    }
-
-    public [inspect.custom](): string {
-        return `S3FileNode (bucket=${this.bucket.name}, file=${this.file.key}}`
-    }
-}
-
-function formatBytes(numBytes: number): string {
-    return bytes(numBytes, { unitSeparator: ' ', decimalPlaces: 0 })
-}
diff --git a/src/s3/explorer/s3FolderNode.ts b/src/s3/explorer/s3FolderNode.ts
deleted file mode 100644
index cfed18a8b73..00000000000
--- a/src/s3/explorer/s3FolderNode.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { Bucket, CreateFolderRequest, CreateFolderResponse, Folder, S3Client } from '../../shared/clients/s3Client'
-import { AWSResourceNode } from '../../shared/treeview/nodes/awsResourceNode'
-import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
-import { LoadMoreNode } from '../../shared/treeview/nodes/loadMoreNode'
-import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
-import { makeChildrenNodes } from '../../shared/treeview/utils'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { ChildNodeLoader } from '../../awsexplorer/childNodeLoader'
-import { ChildNodePage } from '../../awsexplorer/childNodeLoader'
-import { S3FileNode } from './s3FileNode'
-import { inspect } from 'util'
-import { Workspace } from '../../shared/vscode/workspace'
-import { getLogger } from '../../shared/logger'
-import { getIcon } from '../../shared/icons'
-
-/**
- * Represents a folder in an S3 bucket that may contain subfolders and/or objects.
- */
-export class S3FolderNode extends AWSTreeNodeBase implements AWSResourceNode, LoadMoreNode {
-    private readonly childLoader = new ChildNodeLoader(this, token => this.loadPage(token))
-
-    public constructor(
-        public readonly bucket: Bucket,
-        public readonly folder: Folder,
-        public readonly s3: S3Client,
-        private readonly workspace = Workspace.vscode()
-    ) {
-        super(folder.name, vscode.TreeItemCollapsibleState.Collapsed)
-        this.tooltip = folder.path
-        this.iconPath = getIcon('vscode-folder')
-        this.contextValue = 'awsS3FolderNode'
-    }
-
-    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
-        return await makeChildrenNodes({
-            getChildNodes: async () => this.childLoader.getChildren(),
-            getNoChildrenPlaceholderNode: async () =>
-                new PlaceholderNode(this, localize('AWS.explorerNode.s3.noObjects', '[No Objects found]')),
-        })
-    }
-
-    public async loadMoreChildren(): Promise<void> {
-        await this.childLoader.loadMoreChildren()
-    }
-
-    public isLoadingMoreChildren(): boolean {
-        return this.childLoader.isLoadingMoreChildren()
-    }
-
-    public clearChildren(): void {
-        this.childLoader.clearChildren()
-    }
-
-    private async loadPage(continuationToken: string | undefined): Promise<ChildNodePage<S3FolderNode | S3FileNode>> {
-        getLogger().debug(`Loading page for %O using continuationToken %s`, this, continuationToken)
-        const response = await this.s3.listFiles({
-            bucketName: this.bucket.name,
-            folderPath: this.folder.path,
-            continuationToken,
-            maxResults: this.getMaxItemsPerPage(),
-        })
-
-        const newFolders = response.folders.map(folder => new S3FolderNode(this.bucket, folder, this.s3))
-        const newFiles = response.files.map(file => new S3FileNode(this.bucket, file, this, this.s3))
-
-        getLogger().debug(`Loaded folders: %O and files: %O`, newFolders, newFiles)
-        return {
-            newContinuationToken: response.continuationToken,
-            newChildren: [...newFolders, ...newFiles],
-        }
-    }
-
-    /**
-     * See {@link S3Client.createFolder}.
-     */
-    public async createFolder(request: CreateFolderRequest): Promise<CreateFolderResponse> {
-        return this.s3.createFolder(request)
-    }
-
-    public get arn(): string {
-        return this.folder.arn
-    }
-
-    public get name(): string {
-        return this.folder.name
-    }
-
-    public get path(): string {
-        return this.folder.path
-    }
-
-    public [inspect.custom](): string {
-        return `S3FolderNode (bucket=${this.bucket.name}, folder=${this.folder.path})`
-    }
-
-    private getMaxItemsPerPage(): number | undefined {
-        return this.workspace.getConfiguration('aws').get<number>('s3.maxItemsPerPage')
-    }
-}
diff --git a/src/s3/explorer/s3Nodes.ts b/src/s3/explorer/s3Nodes.ts
deleted file mode 100644
index 9dd87a0d02d..00000000000
--- a/src/s3/explorer/s3Nodes.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { localize } from '../../shared/utilities/vsCodeUtils'
-import { CreateBucketRequest, CreateBucketResponse, S3Client } from '../../shared/clients/s3Client'
-import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
-import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
-import { makeChildrenNodes } from '../../shared/treeview/utils'
-import { S3BucketNode } from './s3BucketNode'
-import { inspect } from 'util'
-
-/**
- * An AWS Explorer node representing S3.
- *
- * Contains buckets for a specific region as child nodes.
- */
-export class S3Node extends AWSTreeNodeBase {
-    public constructor(private readonly s3: S3Client) {
-        super('S3', vscode.TreeItemCollapsibleState.Collapsed)
-        this.contextValue = 'awsS3Node'
-    }
-
-    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
-        return await makeChildrenNodes({
-            getChildNodes: async () => {
-                const response = await this.s3.listBuckets()
-
-                return response.buckets.map(bucket => new S3BucketNode(bucket, this, this.s3))
-            },
-            getNoChildrenPlaceholderNode: async () =>
-                new PlaceholderNode(this, localize('AWS.explorerNode.s3.noBuckets', '[No Buckets found]')),
-        })
-    }
-
-    /**
-     * See {@link S3Client.createBucket}.
-     */
-    public async createBucket(request: CreateBucketRequest): Promise<CreateBucketResponse> {
-        return this.s3.createBucket(request)
-    }
-
-    public [inspect.custom](): string {
-        return 'S3Node'
-    }
-}
diff --git a/src/s3/util.ts b/src/s3/util.ts
deleted file mode 100644
index 751eeace991..00000000000
--- a/src/s3/util.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { localize } from '../shared/utilities/vsCodeUtils'
-/**
- * Creates a readable path to an s3 bucket or object (e.g. s3://...).
- *
- * This is the format used by AWS CLI.
- * @see https://docs.aws.amazon.com/cli/latest/reference/s3/#path-argument-type
- *
- * @param bucket contains the name of the bucket.
- * @param path to the object, or an empty string if this is the root of the bucket.
- * @returns the readable path to the s3 bucket or object (e.g. s3://...).
- */
-export function readablePath({ bucket, path }: { bucket: { name: string }; path: string }): string {
-    return path ? `s3://${bucket.name}/${path}` : `s3://${bucket.name}`
-}
-
-/**
- * Validates an S3 bucket name.
- *
- * @see https://docs.aws.amazon.com/AmazonS3/latest/dev/BucketRestrictions.html#bucketnamingrules
- * @returns undefined if the name passes validation. Otherwise, an error message is returned.
- */
-export function validateBucketName(name: string): string | undefined {
-    if (name.length < 3 || name.length > 63) {
-        return localize(
-            'AWS.s3.validateBucketName.error.invalidLength',
-            'Bucket name must be between 3 and 63 characters long'
-        )
-    }
-
-    if (!/^[a-z0-9]/.test(name)) {
-        return localize(
-            'AWS.s3.validateBucketName.error.invalidStart',
-            'Bucket name must start with a lowercase letter or number'
-        )
-    }
-
-    if (!/[a-z0-9]$/.test(name)) {
-        return localize(
-            'AWS.s3.validateBucketName.error.invalidEnd',
-            'Bucket name must end with a lowercase letter or number'
-        )
-    }
-
-    if (!/^[a-z0-9\-.]+$/.test(name)) {
-        return localize(
-            'AWS.s3.validateBucketName.error.invalidCharacters',
-            'Bucket name must only contain lowercase letters, numbers, hyphens, and periods'
-        )
-    }
-
-    if (name.includes('..') || name.includes('.-') || name.includes('-.')) {
-        return localize(
-            'AWS.s3.validateBucketName.error.misusedPeriods',
-            'Periods in bucket name must be surrounded by a lowercase letter or number'
-        )
-    }
-
-    if (/^\d{1,3}\.\d{1,3}\.\d{1,3}.\d{1,3}$/.test(name)) {
-        return localize(
-            'AWS.s3.validateBucketName.error.resemblesIpAddress',
-            'Bucket name must not resemble an IP address'
-        )
-    }
-
-    return undefined
-}
diff --git a/src/shared/activationReloadState.ts b/src/shared/activationReloadState.ts
deleted file mode 100644
index 9bb108046b7..00000000000
--- a/src/shared/activationReloadState.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { Runtime } from 'aws-sdk/clients/lambda'
-import globals from './extensionGlobals'
-
-export const activationTemplatePathKey = 'ACTIVATION_TEMPLATE_PATH_KEY'
-export const activationLaunchPathKey = 'ACTIVATION_LAUNCH_PATH_KEY'
-export const samInitRuntimeKey = 'SAM_INIT_RUNTIME_KEY'
-export const samInitImageBooleanKey = 'SAM_INIT_IMAGE_BOOLEAN_KEY'
-export const samInitArchKey = 'SAM_INIT_ARCH_KEY'
-
-export interface SamInitState {
-    template: string | undefined
-    readme: string | undefined
-    runtime: Runtime | undefined
-    architecture: string | undefined
-    isImage: boolean | undefined
-}
-
-/**
- * Manages state that needs to be persisted across extension restart to workflows that mutate the workspace.
- */
-export class ActivationReloadState {
-    public getSamInitState(): SamInitState | undefined {
-        return {
-            template: this.extensionContext.globalState.get<string>(activationTemplatePathKey),
-            readme: this.extensionContext.globalState.get<string>(activationLaunchPathKey),
-            runtime: this.extensionContext.globalState.get<string>(samInitRuntimeKey),
-            architecture: this.extensionContext.globalState.get<string>(samInitArchKey),
-            isImage: this.extensionContext.globalState.get<boolean>(samInitImageBooleanKey),
-        }
-    }
-
-    public setSamInitState(state: SamInitState): void {
-        this.extensionContext.globalState.update(activationTemplatePathKey, state.template)
-        this.extensionContext.globalState.update(activationLaunchPathKey, state.readme)
-        this.extensionContext.globalState.update(samInitRuntimeKey, state.runtime)
-        this.extensionContext.globalState.update(samInitArchKey, state.architecture)
-        this.extensionContext.globalState.update(samInitImageBooleanKey, state.isImage)
-    }
-
-    public clearSamInitState(): void {
-        this.extensionContext.globalState.update(activationTemplatePathKey, undefined)
-        this.extensionContext.globalState.update(activationLaunchPathKey, undefined)
-        this.extensionContext.globalState.update(samInitRuntimeKey, undefined)
-        this.extensionContext.globalState.update(samInitArchKey, undefined)
-        this.extensionContext.globalState.update(samInitImageBooleanKey, undefined)
-    }
-
-    protected get extensionContext(): vscode.ExtensionContext {
-        return globals.context
-    }
-}
diff --git a/src/shared/awsClientBuilder.ts b/src/shared/awsClientBuilder.ts
deleted file mode 100644
index 12802d06627..00000000000
--- a/src/shared/awsClientBuilder.ts
+++ /dev/null
@@ -1,154 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Request, AWSError, Credentials } from 'aws-sdk'
-import { CredentialsOptions } from 'aws-sdk/lib/credentials'
-import { ServiceConfigurationOptions } from 'aws-sdk/lib/service'
-import { env, version } from 'vscode'
-import { AwsContext } from './awsContext'
-import globals from './extensionGlobals'
-import { DevSettings } from './settings'
-import { getClientId } from './telemetry/util'
-import { extensionVersion } from './vscode/env'
-
-// These are not on the public API but are very useful for logging purposes.
-// Tests guard against the possibility that these values change unexpectedly.
-// Since the field names are not prepended with `_` to signify visibility, the
-// fact that they're not in the API may have been an oversight.
-interface RequestExtras {
-    readonly service: AWS.Service
-    readonly operation: string
-    readonly params?: any
-}
-
-type RequestListener = (request: AWS.Request<any, AWSError> & RequestExtras) => void
-export type ServiceOptions = ServiceConfigurationOptions & {
-    /**
-     * The frequency and (lack of) idempotency of events is highly dependent on the SDK implementation
-     * For example, 'error' may fire more than once for a single request
-     *
-     * Example usage:
-     *
-     * ```ts
-     * const service = await builder.createAwsService(FakeService, {
-     *     onRequestSetup: [
-     *         req => {
-     *             console.log('req: %O [%O]', req.operation, req.params)
-     *             req.on('error', e => (errorCount += !e.originalError ? 1 : 0))
-     *         },
-     *     ],
-     * })
-     * ```
-     */
-    onRequestSetup?: RequestListener | RequestListener[]
-}
-
-export interface AWSClientBuilder {
-    /**
-     * Creates AWS service object of the given type, and sets options defaults.
-     *
-     * @param type  AWS service type
-     * @param options  AWS service configuration options
-     * @param region  AWS region override
-     * @param userAgent  Set the Toolkit user agent
-     * @returns
-     */
-    createAwsService<T extends AWS.Service>(
-        type: new (o: ServiceConfigurationOptions) => T,
-        options?: ServiceOptions,
-        region?: string,
-        userAgent?: boolean,
-        settings?: DevSettings
-    ): Promise<T>
-}
-
-export class DefaultAWSClientBuilder implements AWSClientBuilder {
-    public constructor(private readonly awsContext: AwsContext) {}
-
-    public async createAwsService<T extends AWS.Service>(
-        type: new (o: ServiceConfigurationOptions) => T,
-        options?: ServiceOptions,
-        region?: string,
-        userAgent: boolean = true,
-        settings = DevSettings.instance
-    ): Promise<T> {
-        const onRequest = options?.onRequestSetup ?? []
-        const listeners = Array.isArray(onRequest) ? onRequest : [onRequest]
-        const opt = { ...options }
-        delete opt.onRequestSetup
-
-        if (!opt.credentials && !opt.token) {
-            const shim = this.awsContext.credentialsShim
-
-            if (!shim) {
-                throw new Error('Toolkit is not logged-in.')
-            }
-
-            opt.credentials = new (class extends Credentials {
-                public constructor() {
-                    // The class doesn't like being instantiated with empty creds
-                    super({ accessKeyId: '???', secretAccessKey: '???' })
-                }
-
-                public override get(callback: (err?: AWSError) => void): void {
-                    // Always try to fetch the latest creds first, attempting a refresh if needed
-                    // A 'passive' refresh is attempted first, before trying an 'active' one if certain criteria are met
-                    shim.get()
-                        .then(creds => {
-                            this.loadCreds(creds)
-                            this.needsRefresh() ? this.refresh(callback) : callback()
-                        })
-                        .catch(callback)
-                }
-
-                public override refresh(callback: (err?: AWSError) => void): void {
-                    shim.refresh()
-                        .then(creds => {
-                            this.loadCreds(creds)
-                            // The SDK V2 sets `expired` on certain errors so we should only
-                            // unset the flag after acquiring new credentials via `refresh`
-                            this.expired = false
-                            callback()
-                        })
-                        .catch(callback)
-                }
-
-                private loadCreds(creds: CredentialsOptions & { expiration?: Date }) {
-                    this.accessKeyId = creds.accessKeyId
-                    this.secretAccessKey = creds.secretAccessKey
-                    this.sessionToken = creds.sessionToken ?? this.sessionToken
-                    this.expireTime = creds.expiration ?? this.expireTime
-                }
-            })()
-        }
-
-        if (!opt.region && region) {
-            opt.region = region
-        }
-
-        if (userAgent && !opt.customUserAgent) {
-            const platformName = env.appName.replace(/\s/g, '-')
-            const clientId = await getClientId(globals.context.globalState)
-            opt.customUserAgent = `AWS-Toolkit-For-VSCode/${extensionVersion} ${platformName}/${version} ClientId/${clientId}`
-        }
-
-        const apiConfig = (opt as { apiConfig?: { metadata?: Record<string, string> } } | undefined)?.apiConfig
-        const serviceName =
-            apiConfig?.metadata?.serviceId ?? (type as unknown as { serviceIdentifier?: string }).serviceIdentifier
-        if (serviceName) {
-            opt.endpoint = settings.get('endpoints', {})[serviceName.toLowerCase()] ?? opt.endpoint
-        }
-
-        const service = new type(opt)
-        const originalSetup = service.setupRequestListeners.bind(service)
-
-        service.setupRequestListeners = (request: Request<any, AWSError>) => {
-            originalSetup(request)
-            listeners.forEach(l => l(request as AWS.Request<any, AWSError> & RequestExtras))
-        }
-
-        return service
-    }
-}
diff --git a/src/shared/awsFiletypes.ts b/src/shared/awsFiletypes.ts
deleted file mode 100644
index a29b34b9d4c..00000000000
--- a/src/shared/awsFiletypes.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as path from 'path'
-import * as constants from '../shared/constants'
-import * as aslFormats from '../stepFunctions/constants/aslFormats'
-import * as pathutil from '../shared/utilities/pathUtils'
-import * as fsutil from '../shared/filesystemUtilities'
-import * as sysutil from '../shared/systemUtilities'
-import * as collectionUtil from '../shared/utilities/collectionUtils'
-import globals from './extensionGlobals'
-import { telemetry } from './telemetry/telemetry'
-import { AwsFiletype } from './telemetry/telemetry'
-
-/** AWS filetypes: vscode language ids */
-export const awsFiletypeLangIds = {
-    /** vscode language ids registered by AWS Toolkit or other AWS extensions for handling. */
-    awsOwned: [aslFormats.JSON_ASL, aslFormats.YAML_ASL, constants.ssmJson, constants.ssmYaml],
-    /** generic vscode language ids that possibly are AWS filetypes  */
-    ambiguous: ['ini', 'plaintext', aslFormats.JSON_TYPE, aslFormats.YAML_TYPE],
-}
-
-/**
- * Maps vscode language ids to AWS filetypes for telemetry.
- */
-export function langidToAwsFiletype(langId: string): AwsFiletype {
-    switch (langId) {
-        case constants.ssmJson:
-        case constants.ssmYaml:
-            return 'ssmDocument'
-        case aslFormats.JSON_ASL:
-        case aslFormats.YAML_ASL:
-            return 'stepfunctionsAsl'
-        default:
-            return 'other'
-    }
-}
-
-/** Returns true if file `f` is somewhere in `~/.aws`. */
-export function isAwsConfig(f: string): boolean {
-    const awsDir = path.join(sysutil.SystemUtilities.getHomeDirectory(), '.aws')
-    if (fsutil.isInDirectory(awsDir, f)) {
-        return true
-    }
-    return false
-}
-
-export function isAwsFiletype(doc: vscode.TextDocument): boolean | undefined {
-    if (awsFiletypeLangIds.awsOwned.includes(doc.languageId)) {
-        return true
-    }
-    if (isAwsConfig(doc.fileName)) {
-        return true
-    }
-    if (awsFiletypeLangIds.ambiguous.includes(doc.languageId)) {
-        return undefined // Maybe
-    }
-    return false
-}
-
-export function activate(): void {
-    globals.context.subscriptions.push(
-        // TODO: onDidChangeTextDocument ?
-        vscode.workspace.onDidOpenTextDocument(async (doc: vscode.TextDocument) => {
-            const isAwsFileExt = isAwsFiletype(doc)
-            const isSchemaHandled = globals.schemaService.isMapped(doc.uri)
-            const isCfnTemplate = !!globals.templateRegistry.registeredItems.find(
-                t => pathutil.normalize(t.path) === pathutil.normalize(doc.fileName)
-            )
-            if (!isAwsFileExt && !isSchemaHandled && !isCfnTemplate) {
-                return
-            }
-
-            const basename = path.basename(doc.fileName)
-            let fileExt: string | undefined = path.extname(doc.fileName)
-            fileExt = fileExt ? fileExt : undefined // Telemetry client will fail on empty string.
-
-            // TODO: ask templateRegistry if this is SAM or CFN.
-            // TODO: ask schemaService for the precise filetype.
-            let telemKind = isAwsConfig(doc.fileName) ? 'awsCredentials' : langidToAwsFiletype(doc.languageId)
-            if (telemKind === 'other') {
-                telemKind = isCfnTemplate ? 'cloudformationSam' : isSchemaHandled ? 'cloudformation' : 'other'
-            }
-
-            // HACK: for "~/.aws/foo" vscode sometimes _only_ emits "~/.aws/foo.git".
-            if (telemKind === 'awsCredentials' && fileExt === '.git') {
-                fileExt = undefined
-            }
-
-            // Ensure nice syntax highlighting for ~/.aws/ files.
-            if (
-                telemKind === 'awsCredentials' &&
-                doc.languageId !== 'ini' &&
-                (basename === 'credentials' || basename === 'config')
-            ) {
-                vscode.languages.setTextDocumentLanguage(doc, 'ini')
-            }
-
-            if (await isSameMetricPending(telemKind, fileExt)) {
-                return // Avoid redundant/duplicate metrics.
-            }
-
-            telemetry.file_editAwsFile.emit({
-                awsFiletype: telemKind,
-                passive: true,
-                result: 'Succeeded',
-                filenameExt: fileExt,
-            })
-        }, undefined)
-    )
-}
-
-async function isSameMetricPending(filetype: string, fileExt: string | undefined): Promise<boolean> {
-    const pendingMetrics = await collectionUtil.first(
-        globals.telemetry.findIter(m => {
-            const m1 = m.Metadata?.find(o => o.Key === 'awsFiletype')
-            const m2 = m.Metadata?.find(o => o.Key === 'filenameExt')
-            return m.MetricName === 'file_editAwsFile' && m1?.Value === filetype && m2?.Value === fileExt
-        })
-    )
-    return !!pendingMetrics
-}
diff --git a/src/shared/clients/apiGatewayClient.ts b/src/shared/clients/apiGatewayClient.ts
deleted file mode 100644
index ae3a9633d21..00000000000
--- a/src/shared/clients/apiGatewayClient.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { APIGateway } from 'aws-sdk'
-import { RestApi, Stages } from 'aws-sdk/clients/apigateway'
-import globals from '../extensionGlobals'
-import { ClassToInterfaceType } from '../utilities/tsUtils'
-
-export type ApiGatewayClient = ClassToInterfaceType<DefaultApiGatewayClient>
-export class DefaultApiGatewayClient {
-    public constructor(public readonly regionCode: string) {}
-
-    public async *getResourcesForApi(apiId: string): AsyncIterableIterator<APIGateway.Resource> {
-        const client = await this.createSdkClient()
-
-        const request: APIGateway.GetResourcesRequest = {
-            restApiId: apiId,
-        }
-
-        do {
-            const response: APIGateway.Resources = await client.getResources(request).promise()
-
-            if (response.items !== undefined && response.items.length > 0) {
-                yield* response.items
-            }
-
-            request.position = response.position
-        } while (request.position !== undefined)
-    }
-
-    public async getStages(apiId: string): Promise<Stages> {
-        const client = await this.createSdkClient()
-
-        const request: APIGateway.GetResourcesRequest = {
-            restApiId: apiId,
-        }
-
-        return client.getStages(request).promise()
-    }
-
-    public async *listApis(): AsyncIterableIterator<RestApi> {
-        const client = await this.createSdkClient()
-
-        const request: APIGateway.GetRestApisRequest = {}
-
-        do {
-            const response: APIGateway.RestApis = await client.getRestApis(request).promise()
-
-            if (response.items !== undefined && response.items.length > 0) {
-                yield* response.items
-            }
-
-            request.position = response.position
-        } while (request.position !== undefined)
-    }
-
-    public async testInvokeMethod(
-        apiId: string,
-        resourceId: string,
-        method: string,
-        body: string,
-        pathWithQueryString: string | undefined
-    ): Promise<APIGateway.TestInvokeMethodResponse> {
-        const client = await this.createSdkClient()
-        const request: APIGateway.TestInvokeMethodRequest = {
-            restApiId: apiId,
-            resourceId: resourceId,
-            httpMethod: method,
-            body: body,
-        }
-        if (pathWithQueryString) {
-            request.pathWithQueryString = pathWithQueryString
-        }
-
-        return await client.testInvokeMethod(request).promise()
-    }
-
-    private async createSdkClient(): Promise<APIGateway> {
-        return await globals.sdkClientBuilder.createAwsService(APIGateway, undefined, this.regionCode)
-    }
-}
diff --git a/src/shared/clients/apprunnerClient.ts b/src/shared/clients/apprunnerClient.ts
deleted file mode 100644
index 87d5b3f092e..00000000000
--- a/src/shared/clients/apprunnerClient.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { AppRunner } from 'aws-sdk'
-import globals from '../extensionGlobals'
-
-import { ClassToInterfaceType } from '../utilities/tsUtils'
-
-export type AppRunnerClient = ClassToInterfaceType<DefaultAppRunnerClient>
-
-export class DefaultAppRunnerClient {
-    public constructor(public readonly regionCode: string) {}
-
-    public async createService(request: AppRunner.CreateServiceRequest): Promise<AppRunner.CreateServiceResponse> {
-        return (await this.createSdkClient()).createService(request).promise()
-    }
-
-    public async listServices(request: AppRunner.ListServicesRequest): Promise<AppRunner.ListServicesResponse> {
-        return (await this.createSdkClient()).listServices(request).promise()
-    }
-
-    public async pauseService(request: AppRunner.PauseServiceRequest): Promise<AppRunner.PauseServiceResponse> {
-        return (await this.createSdkClient()).pauseService(request).promise()
-    }
-
-    public async resumeService(request: AppRunner.ResumeServiceRequest): Promise<AppRunner.ResumeServiceResponse> {
-        return (await this.createSdkClient()).resumeService(request).promise()
-    }
-
-    public async updateService(request: AppRunner.UpdateServiceRequest): Promise<AppRunner.UpdateServiceResponse> {
-        return (await this.createSdkClient()).updateService(request).promise()
-    }
-
-    public async createConnection(
-        request: AppRunner.CreateConnectionRequest
-    ): Promise<AppRunner.CreateConnectionResponse> {
-        return (await this.createSdkClient()).createConnection(request).promise()
-    }
-
-    public async listConnections(
-        request: AppRunner.ListConnectionsRequest = {}
-    ): Promise<AppRunner.ListConnectionsResponse> {
-        return (await this.createSdkClient()).listConnections(request).promise()
-    }
-
-    public async describeService(
-        request: AppRunner.DescribeServiceRequest
-    ): Promise<AppRunner.DescribeServiceResponse> {
-        return (await this.createSdkClient()).describeService(request).promise()
-    }
-
-    public async startDeployment(
-        request: AppRunner.StartDeploymentRequest
-    ): Promise<AppRunner.StartDeploymentResponse> {
-        return (await this.createSdkClient()).startDeployment(request).promise()
-    }
-
-    public async listOperations(request: AppRunner.ListOperationsRequest): Promise<AppRunner.ListOperationsResponse> {
-        return (await this.createSdkClient()).listOperations(request).promise()
-    }
-
-    public async deleteService(request: AppRunner.DeleteServiceRequest): Promise<AppRunner.DeleteServiceResponse> {
-        return (await this.createSdkClient()).deleteService(request).promise()
-    }
-
-    protected async createSdkClient(): Promise<AppRunner> {
-        return await globals.sdkClientBuilder.createAwsService(AppRunner, undefined, this.regionCode)
-    }
-}
diff --git a/src/shared/clients/cloudControlClient.ts b/src/shared/clients/cloudControlClient.ts
deleted file mode 100644
index 93094f893d7..00000000000
--- a/src/shared/clients/cloudControlClient.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { CloudControl } from 'aws-sdk'
-import globals from '../extensionGlobals'
-import { ClassToInterfaceType } from '../utilities/tsUtils'
-import { localize } from '../utilities/vsCodeUtils'
-
-export type CloudControlClient = ClassToInterfaceType<DefaultCloudControlClient>
-export class DefaultCloudControlClient implements CloudControlClient {
-    public constructor(public readonly regionCode: string) {}
-
-    public async createResource(request: CloudControl.CreateResourceInput): Promise<CloudControl.CreateResourceOutput> {
-        const client = await this.createSdkClient()
-
-        const createResponse = await client.createResource(request).promise()
-
-        await this.pollForCompletion(client, createResponse.ProgressEvent!)
-        return createResponse
-    }
-
-    public async deleteResource(request: CloudControl.DeleteResourceInput): Promise<void> {
-        const client = await this.createSdkClient()
-
-        const deleteResponse = await client.deleteResource(request).promise()
-
-        await this.pollForCompletion(client, deleteResponse.ProgressEvent!)
-    }
-
-    public async listResources(request: CloudControl.ListResourcesInput): Promise<CloudControl.ListResourcesOutput> {
-        const client = await this.createSdkClient()
-
-        return await client.listResources(request).promise()
-    }
-
-    public async getResource(request: CloudControl.GetResourceInput): Promise<CloudControl.GetResourceOutput> {
-        const client = await this.createSdkClient()
-
-        return await client.getResource(request).promise()
-    }
-
-    public async updateResource(request: CloudControl.UpdateResourceInput): Promise<void> {
-        const client = await this.createSdkClient()
-
-        const updateResponse = await client.updateResource(request).promise()
-
-        await this.pollForCompletion(client, updateResponse.ProgressEvent!)
-    }
-
-    private async pollForCompletion(
-        client: CloudControl,
-        progressEvent: CloudControl.ProgressEvent,
-        baseDelay: number = 500,
-        maxRetries: number = 10
-    ): Promise<void> {
-        for (let i = 0; i < maxRetries; i++) {
-            const operationStatus = progressEvent.OperationStatus
-
-            switch (operationStatus) {
-                case 'SUCCESS':
-                    return
-                case 'FAILED':
-                    throw new Error(
-                        localize(
-                            'AWS.message.error.cloudControl.pollResourceStatus.failed',
-                            'Resource operation failed: {0} ({1})',
-                            progressEvent.StatusMessage,
-                            progressEvent.ErrorCode
-                        )
-                    )
-                case 'CANCEL_COMPLETE':
-                    throw new Error(
-                        localize(
-                            'AWS.message.error.cloudControl.pollResourceStatus.cancelled',
-                            'Resource operation cancelled: {0}',
-                            progressEvent.StatusMessage
-                        )
-                    )
-                case 'IN_PROGRESS':
-                case 'CANCEL_IN_PROGRESS':
-                case 'PENDING':
-                    break
-                default:
-                    throw new Error(
-                        localize(
-                            'AWS.message.error.cloudControl.pollResourceStatus.invalidOperationStatus',
-                            'Invalid resource operation status: {0}',
-                            operationStatus
-                        )
-                    )
-            }
-
-            if (i + 1 < maxRetries) {
-                await new Promise<void>(resolve => globals.clock.setTimeout(resolve, baseDelay * 2 ** i))
-                const resourceRequestStatus = await client
-                    .getResourceRequestStatus({
-                        RequestToken: progressEvent.RequestToken!,
-                    })
-                    .promise()
-                progressEvent = resourceRequestStatus.ProgressEvent!
-            }
-        }
-        throw new Error(
-            localize(
-                'AWS.message.error.cloudControl.pollResourceStatus.timeout',
-                'Failed to get terminal resource operation status for {0} before timeout. Please try again later',
-                progressEvent.Identifier
-            )
-        )
-    }
-
-    private async createSdkClient(): Promise<CloudControl> {
-        return await globals.sdkClientBuilder.createAwsService(CloudControl, undefined, this.regionCode)
-    }
-}
diff --git a/src/shared/clients/cloudFormationClient.ts b/src/shared/clients/cloudFormationClient.ts
deleted file mode 100644
index d66088a45f1..00000000000
--- a/src/shared/clients/cloudFormationClient.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { CloudFormation } from 'aws-sdk'
-import globals from '../extensionGlobals'
-import { AsyncCollection } from '../utilities/asyncCollection'
-import { pageableToCollection } from '../utilities/collectionUtils'
-import { ClassToInterfaceType, isNonNullable } from '../utilities/tsUtils'
-
-export type CloudFormationClient = ClassToInterfaceType<DefaultCloudFormationClient>
-export class DefaultCloudFormationClient {
-    public constructor(public readonly regionCode: string) {}
-
-    public async deleteStack(name: string): Promise<void> {
-        const client = await this.createSdkClient()
-
-        await client
-            .deleteStack({
-                StackName: name,
-            })
-            .promise()
-    }
-
-    public async describeType(typeName: string): Promise<CloudFormation.DescribeTypeOutput> {
-        const client = await this.createSdkClient()
-
-        return await client
-            .describeType({
-                Type: 'RESOURCE',
-                TypeName: typeName,
-            })
-            .promise()
-    }
-
-    public async *listStacks(
-        statusFilter: string[] = ['CREATE_COMPLETE', 'UPDATE_COMPLETE']
-    ): AsyncIterableIterator<CloudFormation.StackSummary> {
-        const client = await this.createSdkClient()
-
-        const request: CloudFormation.ListStacksInput = {
-            StackStatusFilter: statusFilter,
-        }
-
-        do {
-            const response: CloudFormation.ListStacksOutput = await client.listStacks(request).promise()
-
-            if (response.StackSummaries) {
-                yield* response.StackSummaries
-            }
-
-            request.NextToken = response.NextToken
-        } while (request.NextToken)
-    }
-
-    public listAllStacks(request: CloudFormation.ListStacksInput = {}): AsyncCollection<CloudFormation.StackSummary[]> {
-        const client = this.createSdkClient()
-        const requester = async (req: CloudFormation.ListStacksInput) => (await client).listStacks(req).promise()
-        const collection = pageableToCollection(requester, request, 'NextToken', 'StackSummaries')
-
-        return collection.filter(isNonNullable)
-    }
-
-    public async *listTypes(): AsyncIterableIterator<CloudFormation.TypeSummary> {
-        const client = await this.createSdkClient()
-
-        const request: CloudFormation.ListTypesInput = {
-            DeprecatedStatus: 'LIVE',
-            Type: 'RESOURCE',
-            Visibility: 'PUBLIC',
-        }
-
-        do {
-            const response: CloudFormation.ListTypesOutput = await client.listTypes(request).promise()
-
-            if (response.TypeSummaries) {
-                yield* response.TypeSummaries
-            }
-
-            request.NextToken = response.NextToken
-        } while (request.NextToken)
-    }
-
-    public async describeStackResources(name: string): Promise<CloudFormation.DescribeStackResourcesOutput> {
-        const client = await this.createSdkClient()
-
-        return await client
-            .describeStackResources({
-                StackName: name,
-            })
-            .promise()
-    }
-
-    private async createSdkClient(): Promise<CloudFormation> {
-        return await globals.sdkClientBuilder.createAwsService(CloudFormation, undefined, this.regionCode)
-    }
-}
diff --git a/src/shared/clients/cloudWatchLogsClient.ts b/src/shared/clients/cloudWatchLogsClient.ts
deleted file mode 100644
index 7d58cf63e81..00000000000
--- a/src/shared/clients/cloudWatchLogsClient.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { CloudWatchLogs } from 'aws-sdk'
-import globals from '../extensionGlobals'
-import { ClassToInterfaceType } from '../utilities/tsUtils'
-
-export type CloudWatchLogsClient = ClassToInterfaceType<DefaultCloudWatchLogsClient>
-export class DefaultCloudWatchLogsClient {
-    public constructor(public readonly regionCode: string) {}
-
-    public async *describeLogGroups(
-        request: CloudWatchLogs.DescribeLogGroupsRequest = {}
-    ): AsyncIterableIterator<CloudWatchLogs.LogGroup> {
-        const sdkClient = await this.createSdkClient()
-        do {
-            const response = await this.invokeDescribeLogGroups(request, sdkClient)
-            if (response.logGroups) {
-                yield* response.logGroups
-            }
-            request.nextToken = response.nextToken
-        } while (request.nextToken)
-    }
-
-    public async describeLogStreams(
-        request: CloudWatchLogs.DescribeLogStreamsRequest
-    ): Promise<CloudWatchLogs.DescribeLogStreamsResponse> {
-        const sdkClient = await this.createSdkClient()
-
-        return sdkClient.describeLogStreams(request).promise()
-    }
-
-    public async getLogEvents(
-        request: CloudWatchLogs.GetLogEventsRequest
-    ): Promise<CloudWatchLogs.GetLogEventsResponse> {
-        const sdkClient = await this.createSdkClient()
-
-        return sdkClient.getLogEvents(request).promise()
-    }
-
-    protected async invokeDescribeLogGroups(
-        request: CloudWatchLogs.DescribeLogGroupsRequest,
-        sdkClient: CloudWatchLogs
-    ): Promise<CloudWatchLogs.DescribeLogGroupsResponse> {
-        return sdkClient.describeLogGroups(request).promise()
-    }
-
-    protected async createSdkClient(): Promise<CloudWatchLogs> {
-        return await globals.sdkClientBuilder.createAwsService(CloudWatchLogs, undefined, this.regionCode)
-    }
-}
diff --git a/src/shared/clients/codecatalystClient.ts b/src/shared/clients/codecatalystClient.ts
deleted file mode 100644
index b887f847ce3..00000000000
--- a/src/shared/clients/codecatalystClient.ts
+++ /dev/null
@@ -1,643 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import globals from '../extensionGlobals'
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as AWS from 'aws-sdk'
-import * as logger from '../logger/logger'
-import { ServiceConfigurationOptions } from 'aws-sdk/lib/service'
-import { Timeout, waitTimeout, waitUntil } from '../utilities/timeoutUtils'
-import { showMessageWithCancel } from '../utilities/messages'
-import { assertHasProps, ClassToInterfaceType, isNonNullable, RequiredProps } from '../utilities/tsUtils'
-import { AsyncCollection, toCollection } from '../utilities/asyncCollection'
-import { pageableToCollection } from '../utilities/collectionUtils'
-import { DevSettings } from '../settings'
-import { CodeCatalyst } from 'aws-sdk'
-import { ToolkitError } from '../errors'
-import { SsoConnection } from '../../credentials/auth'
-import { TokenProvider } from '../../credentials/sdkV2Compat'
-
-// REMOVE ME SOON: only used for development
-interface CodeCatalystConfig {
-    readonly region: string
-    readonly endpoint: string
-    readonly hostname: string
-    readonly gitHostname: string
-}
-
-export function getCodeCatalystConfig(): CodeCatalystConfig {
-    const stage = DevSettings.instance.get('cawsStage', 'prod')
-
-    if (stage === 'gamma') {
-        return {
-            region: 'us-west-2',
-            endpoint: 'https://public.codecatalyst-gamma.global.api.aws',
-            hostname: 'integ.stage.REMOVED.codes',
-            gitHostname: 'git.gamma.source.caws.REMOVED',
-        }
-    } else {
-        return {
-            region: 'us-east-1',
-            endpoint: 'https://public.codecatalyst.global.api.aws',
-            hostname: 'codecatalyst.aws',
-            gitHostname: 'codecatalyst.aws',
-        }
-    }
-}
-
-export interface DevEnvironment extends CodeCatalyst.DevEnvironmentSummary {
-    readonly type: 'devEnvironment'
-    readonly id: string
-    readonly org: Pick<CodeCatalystOrg, 'name'>
-    readonly project: Pick<CodeCatalystProject, 'name'>
-}
-
-/** CodeCatalyst developer environment session. */
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface CodeCatalystDevEnvSession extends CodeCatalyst.StartDevEnvironmentResponse {}
-
-export interface CodeCatalystOrg extends CodeCatalyst.SpaceSummary {
-    readonly type: 'org'
-    readonly name: string
-}
-
-export interface CodeCatalystProject extends CodeCatalyst.ProjectSummary {
-    readonly type: 'project'
-    readonly name: string
-    readonly org: Pick<CodeCatalystOrg, 'name'>
-}
-
-export interface CodeCatalystRepo extends CodeCatalyst.ListSourceRepositoriesItem {
-    readonly type: 'repo'
-    readonly name: string
-    readonly org: Pick<CodeCatalystOrg, 'name'>
-    readonly project: Pick<CodeCatalystProject, 'name'>
-}
-
-export interface CodeCatalystBranch extends CodeCatalyst.ListSourceRepositoryBranchesItem {
-    readonly type: 'branch'
-    readonly name: string
-    readonly repo: Pick<CodeCatalystRepo, 'name'>
-    readonly org: Pick<CodeCatalystOrg, 'name'>
-    readonly project: Pick<CodeCatalystProject, 'name'>
-}
-
-export type CodeCatalystResource =
-    | CodeCatalystOrg
-    | CodeCatalystProject
-    | CodeCatalystRepo
-    | CodeCatalystBranch
-    | DevEnvironment
-
-function toDevEnv(spaceName: string, projectName: string, summary: CodeCatalyst.DevEnvironmentSummary): DevEnvironment {
-    return {
-        type: 'devEnvironment',
-        org: { name: spaceName },
-        project: { name: projectName },
-        ...summary,
-    }
-}
-
-function toBranch(
-    org: string,
-    project: string,
-    repo: string,
-    branch: CodeCatalyst.ListSourceRepositoryBranchesItem
-): CodeCatalystBranch {
-    assertHasProps(branch, 'name')
-
-    return {
-        type: 'branch',
-        repo: { name: repo },
-        org: { name: org },
-        project: { name: project },
-        ...branch,
-    }
-}
-
-async function createCodeCatalystClient(
-    connection: SsoConnection,
-    regionCode = getCodeCatalystConfig().region,
-    endpoint = getCodeCatalystConfig().endpoint
-): Promise<CodeCatalyst> {
-    const c = await globals.sdkClientBuilder.createAwsService(CodeCatalyst, {
-        region: regionCode,
-        correctClockSkew: true,
-        endpoint: endpoint,
-        token: new TokenProvider(connection),
-    } as ServiceConfigurationOptions)
-
-    return c
-}
-
-export type UserDetails = RequiredProps<
-    CodeCatalyst.GetUserDetailsResponse,
-    'userId' | 'userName' | 'displayName' | 'primaryEmail'
->
-
-// CodeCatalyst client has two variants: 'logged-in' and 'not logged-in'
-// The 'not logged-in' variant is a subtype and has restricted functionality
-// These characteristics appear in the Smithy model, but the SDK codegen is unable to model this
-
-export interface CodeCatalystClient extends ClassToInterfaceType<CodeCatalystClientInternal> {
-    readonly identity: { readonly id: string; readonly name: string }
-}
-
-export type CodeCatalystClientFactory = () => Promise<CodeCatalystClient>
-
-/**
- * Factory to create a new `CodeCatalystClient`. Call `onCredentialsChanged()` before making requests.
- */
-export async function createClient(
-    connection: SsoConnection,
-    regionCode = getCodeCatalystConfig().region,
-    endpoint = getCodeCatalystConfig().endpoint
-): Promise<CodeCatalystClient> {
-    const sdkClient = await createCodeCatalystClient(connection, regionCode, endpoint)
-    const c = new CodeCatalystClientInternal(connection, sdkClient)
-    await c.verifySession()
-
-    return c
-}
-
-// XXX: the backend currently rejects empty strings for `alias` so the field must be removed if falsey
-function fixAliasInRequest<
-    T extends CodeCatalyst.CreateDevEnvironmentRequest | CodeCatalyst.UpdateDevEnvironmentRequest
->(request: T): T {
-    if (!request.alias) {
-        delete request.alias
-    }
-
-    return request
-}
-
-class CodeCatalystClientInternal {
-    private userDetails?: UserDetails
-    private readonly log: logger.Logger
-
-    /**
-     * Maps bearer tokens to CAWS identities via `verifySession`
-     *
-     * It's assumed that an identity will never change over the lifetime of a token
-     */
-    private static identityCache = new Map<string, string>()
-
-    /**
-     * Maps CAWS identities to user details via  `getUserDetails`
-     *
-     * User details _might_ change at some point, however, this is an uncommon occurence.
-     * Cached user details are cleared when the access token is refreshed.
-     */
-    private static userDetailsCache = new Map<UserDetails['userId'], UserDetails>()
-
-    public constructor(private readonly connection: SsoConnection, private readonly sdkClient: CodeCatalyst) {
-        this.log = logger.getLogger()
-    }
-
-    public get regionCode() {
-        return this.sdkClient.config.region!
-    }
-
-    public get identity(): CodeCatalystClient['identity'] {
-        if (!this.userDetails) {
-            throw new Error('CodeCatalyst client is not connected')
-        }
-
-        return { id: this.userDetails.userId, name: this.userDetails.userName }
-    }
-
-    private async call<T>(req: AWS.Request<T, AWS.AWSError>, silent: true, defaultVal: T): Promise<T>
-    private async call<T>(req: AWS.Request<T, AWS.AWSError>, silent: false): Promise<T>
-    private async call<T>(req: AWS.Request<T, AWS.AWSError>, silent: boolean, defaultVal?: T): Promise<T> {
-        const log = this.log
-        const bearerToken = (await this.connection.getToken()).accessToken
-        req.httpRequest.headers['Authorization'] = `Bearer ${bearerToken}`
-
-        return new Promise<T>((resolve, reject) => {
-            req.send(function (e, data) {
-                const r = req as any
-                if (e) {
-                    if (e.code === 'AccessDeniedException' || e.statusCode === 401) {
-                        CodeCatalystClientInternal.identityCache.delete(bearerToken)
-                    }
-
-                    const allHeaders = r?.response?.httpResponse?.headers
-                    const logHeaders = {}
-                    // Selected headers which are useful for logging.
-                    const logHeaderNames = [
-                        // 'access-control-expose-headers',
-                        // 'cache-control',
-                        // 'strict-transport-security',
-                        'x-amz-apigw-id',
-                        'x-amz-cf-id',
-                        'x-amz-cf-pop',
-                        'x-amzn-remapped-content-length',
-                        'x-amzn-remapped-x-amzn-requestid',
-                        'x-amzn-requestid',
-                        'x-amzn-served-from',
-                        'x-amzn-trace-id',
-                        'x-cache',
-                        'x-request-id', // <- Request id for caws/fusi!
-                    ]
-                    if (allHeaders && Object.keys(allHeaders).length > 0) {
-                        for (const k of logHeaderNames) {
-                            ;(logHeaders as any)[k] = (k in allHeaders ? allHeaders : logHeaderNames)[k]
-                        }
-                    }
-
-                    // Stack is noisy and useless in production.
-                    const errNoStack = { ...e }
-                    delete errNoStack.stack
-                    // Remove confusing "requestId" field (= "x-amzn-requestid" header)
-                    // because for caws/fusi, "x-request-id" is more relevant.
-                    // All of the various request-ids can be found in the logged headers.
-                    delete errNoStack.requestId
-
-                    if (r.operation || r.params) {
-                        log.error(
-                            'API request failed: %s\nparams: %O\nerror: %O\nheaders: %O',
-                            r.operation,
-                            r.params,
-                            errNoStack,
-                            logHeaders
-                        )
-                    } else {
-                        log.error('API request failed:%O\nheaders: %O', req, logHeaders)
-                    }
-                    if (silent) {
-                        if (defaultVal === undefined) {
-                            throw Error()
-                        }
-                        resolve(defaultVal)
-                    } else {
-                        reject(e)
-                    }
-                    return
-                }
-                log.verbose('API request (%s):\nparams: %O\nresponse: %O', r.operation ?? '?', r.params ?? '?', data)
-                resolve(data)
-            })
-        })
-    }
-
-    /**
-     * Creates a PAT.
-     *
-     * @param args.name Name of the token
-     * @param args.expires PAT expires on this date, or undefined.
-     * @returns PAT secret
-     */
-    public async createAccessToken(
-        args: CodeCatalyst.CreateAccessTokenRequest
-    ): Promise<CodeCatalyst.CreateAccessTokenResponse> {
-        try {
-            return this.call(this.sdkClient.createAccessToken(args), false)
-        } catch (e) {
-            if ((e as Error).name === 'ServiceQuotaExceededException') {
-                throw new ToolkitError('Access token limit exceeded', { code: 'ServiceQuotaExceeded' })
-            }
-            throw e
-        }
-    }
-
-    public async getSubscription(
-        request: CodeCatalyst.GetSubscriptionRequest
-    ): Promise<CodeCatalyst.GetSubscriptionResponse> {
-        return this.call(this.sdkClient.getSubscription(request), false)
-    }
-
-    /**
-     * Gets identity properties of the current authenticated principal, and
-     * stores the id for use in later calls.
-     */
-    public async verifySession(): Promise<UserDetails> {
-        const id = await this.getUserId()
-        this.userDetails = CodeCatalystClientInternal.userDetailsCache.get(id) ?? (await this.getUserDetails({ id }))
-        CodeCatalystClientInternal.userDetailsCache.set(id, this.userDetails)
-
-        return { ...this.userDetails }
-    }
-
-    private async getUserId(): Promise<string> {
-        const { accessToken, expiresAt } = await this.connection.getToken()
-        if (CodeCatalystClientInternal.identityCache.has(accessToken)) {
-            return CodeCatalystClientInternal.identityCache.get(accessToken)!
-        }
-
-        const resp = await this.call(this.sdkClient.verifySession(), false)
-        assertHasProps(resp, 'identity')
-
-        CodeCatalystClientInternal.identityCache.set(accessToken, resp.identity)
-        setTimeout(() => {
-            CodeCatalystClientInternal.identityCache.delete(accessToken)
-            CodeCatalystClientInternal.userDetailsCache.delete(resp.identity)
-        }, expiresAt.getTime() - Date.now())
-
-        return resp.identity
-    }
-
-    public async getBearerToken(): Promise<string> {
-        return (await this.connection.getToken()).accessToken
-    }
-
-    private async getUserDetails(args: CodeCatalyst.GetUserDetailsRequest) {
-        const resp = await this.call(this.sdkClient.getUserDetails(args), false)
-        assertHasProps(resp, 'userId', 'userName', 'displayName', 'primaryEmail')
-
-        return { ...resp, version: resp.version } as const
-    }
-
-    public async getSpace(request: CodeCatalyst.GetSpaceRequest): Promise<CodeCatalystOrg> {
-        const resp = await this.call(this.sdkClient.getSpace(request), false)
-
-        return { ...resp, type: 'org' }
-    }
-
-    public async getProject(request: CodeCatalyst.GetProjectRequest): Promise<CodeCatalystProject> {
-        const resp = await this.call(this.sdkClient.getProject(request), false)
-
-        return { ...resp, type: 'project', org: { name: request.spaceName } }
-    }
-
-    /**
-     * Gets a list of all spaces (orgs) for the current CodeCatalyst user.
-     */
-    public listSpaces(request: CodeCatalyst.ListSpacesRequest = {}): AsyncCollection<CodeCatalystOrg[]> {
-        const requester = async (request: CodeCatalyst.ListSpacesRequest) =>
-            this.call(this.sdkClient.listSpaces(request), true, { items: [] })
-        const collection = pageableToCollection(requester, request, 'nextToken', 'items')
-
-        return collection.map(summaries => summaries?.map(s => ({ type: 'org', ...s })) ?? [])
-    }
-
-    /**
-     * Gets a list of all projects for the given CodeCatalyst user.
-     */
-    public listProjects(request: CodeCatalyst.ListProjectsRequest): AsyncCollection<CodeCatalystProject[]> {
-        const requester = async (request: CodeCatalyst.ListProjectsRequest) =>
-            this.call(this.sdkClient.listProjects(request), true, { items: [] })
-        const collection = pageableToCollection(requester, request, 'nextToken', 'items')
-
-        return collection.map(
-            summaries =>
-                summaries?.map(s => ({
-                    type: 'project',
-                    org: { name: request.spaceName },
-                    ...s,
-                })) ?? []
-        )
-    }
-
-    /**
-     * Gets a flat list of all devenvs for the given CodeCatalyst project.
-     */
-    public listDevEnvironments(proj: CodeCatalystProject): AsyncCollection<DevEnvironment[]> {
-        const initRequest = { spaceName: proj.org.name, projectName: proj.name }
-        const requester = async (request: CodeCatalyst.ListDevEnvironmentsRequest) =>
-            this.call(this.sdkClient.listDevEnvironments(request), true, {
-                // spaceName: proj.org.name,
-                // projectName: proj.name,
-                items: [],
-            })
-        const collection = pageableToCollection(requester, initRequest, 'nextToken', 'items')
-
-        return collection.map(envs => envs.map(s => toDevEnv(proj.org.name, proj.name, s)))
-    }
-
-    /**
-     * Gets a flat list of all repos for the given CodeCatalyst user.
-     */
-    public listSourceRepositories(
-        request: CodeCatalyst.ListSourceRepositoriesRequest
-    ): AsyncCollection<CodeCatalystRepo[]> {
-        const requester = async (request: CodeCatalyst.ListSourceRepositoriesRequest) =>
-            this.call(this.sdkClient.listSourceRepositories(request), true, { items: [] })
-        const collection = pageableToCollection(requester, request, 'nextToken', 'items')
-        return collection.map(
-            summaries =>
-                summaries?.map(s => ({
-                    type: 'repo',
-                    org: { name: request.spaceName },
-                    project: { name: request.projectName },
-                    ...s,
-                })) ?? []
-        )
-    }
-
-    public listBranches(
-        request: CodeCatalyst.ListSourceRepositoryBranchesRequest
-    ): AsyncCollection<CodeCatalystBranch[]> {
-        const requester = async (request: CodeCatalyst.ListSourceRepositoryBranchesRequest) =>
-            this.call(this.sdkClient.listSourceRepositoryBranches(request), true, { items: [] })
-        const collection = pageableToCollection(requester, request, 'nextToken', 'items')
-
-        return collection
-            .filter(isNonNullable)
-            .map(items =>
-                items.map(b => toBranch(request.spaceName, request.projectName, request.sourceRepositoryName, b))
-            )
-    }
-
-    /**
-     * Lists ALL of the given resource in the current account
-     */
-    public listResources(resourceType: 'org'): AsyncCollection<CodeCatalystOrg[]>
-    public listResources(resourceType: 'project'): AsyncCollection<CodeCatalystProject[]>
-    public listResources(resourceType: 'repo'): AsyncCollection<CodeCatalystRepo[]>
-    public listResources(resourceType: 'devEnvironment'): AsyncCollection<DevEnvironment[]>
-    public listResources(resourceType: CodeCatalystResource['type']): AsyncCollection<CodeCatalystResource[]> {
-        // Don't really want to expose this apart of the `AsyncCollection` API yet
-        // The semantics of concatenating async iterables is rather ambiguous
-        // For example, an array of async iterables can be joined either in-order or out-of-order.
-        // In-order concatenations only makes sense for finite iterables, though I'm unaware of any
-        // convention to declare an iterable to be finite.
-        function mapInner<T, U>(
-            collection: AsyncCollection<T[]>,
-            fn: (element: T) => AsyncCollection<U[]>
-        ): AsyncCollection<U[]> {
-            return toCollection(async function* () {
-                for await (const element of await collection.promise()) {
-                    yield* await Promise.all(element.map(e => fn(e).flatten().promise()))
-                }
-            })
-        }
-
-        switch (resourceType) {
-            case 'org':
-                return this.listSpaces()
-            case 'project':
-                return mapInner(this.listResources('org'), o => this.listProjects({ spaceName: o.name }))
-            case 'repo':
-                return mapInner(this.listResources('project'), p =>
-                    this.listSourceRepositories({ projectName: p.name, spaceName: p.org.name })
-                )
-            case 'branch':
-                throw new Error('Listing branches is not currently supported')
-            case 'devEnvironment':
-                return mapInner(this.listResources('project'), p => this.listDevEnvironments(p))
-        }
-    }
-
-    public async createSourceBranch(
-        args: CodeCatalyst.CreateSourceRepositoryBranchRequest
-    ): Promise<CodeCatalyst.CreateSourceRepositoryBranchResponse> {
-        return this.call(this.sdkClient.createSourceRepositoryBranch(args), false)
-    }
-
-    /**
-     * Gets the git source host URL for the given CodeCatalyst repo.
-     */
-    public async getRepoCloneUrl(args: CodeCatalyst.GetSourceRepositoryCloneUrlsRequest): Promise<string> {
-        const r = await this.call(this.sdkClient.getSourceRepositoryCloneUrls(args), false)
-
-        // The git extension skips over credential providers if the username is included in the authority
-        return `https://${r.https.replace(/.*@/, '')}`
-    }
-
-    public async createDevEnvironment(args: CodeCatalyst.CreateDevEnvironmentRequest): Promise<DevEnvironment> {
-        const { id } = await this.call(this.sdkClient.createDevEnvironment(fixAliasInRequest(args)), false)
-
-        return this.getDevEnvironment({
-            id,
-            projectName: args.projectName,
-            spaceName: args.spaceName,
-        })
-    }
-
-    public async startDevEnvironment(
-        args: CodeCatalyst.StartDevEnvironmentRequest
-    ): Promise<CodeCatalyst.StartDevEnvironmentResponse> {
-        return this.call(this.sdkClient.startDevEnvironment(args), false)
-    }
-
-    public async createProject(args: CodeCatalyst.CreateProjectRequest): Promise<CodeCatalystProject> {
-        await this.call(this.sdkClient.createProject(args), false)
-
-        return { ...args, name: args.displayName, type: 'project', org: { name: args.spaceName } }
-    }
-
-    public async startDevEnvironmentSession(
-        args: CodeCatalyst.StartDevEnvironmentSessionRequest
-    ): Promise<CodeCatalyst.StartDevEnvironmentSessionResponse & { sessionId: string }> {
-        const r = await this.call(this.sdkClient.startDevEnvironmentSession(args), false)
-        if (!r.sessionId) {
-            throw new TypeError('Received falsy development environment "sessionId"')
-        }
-        return { ...r, sessionId: r.sessionId }
-    }
-
-    public async stopDevEnvironment(
-        args: CodeCatalyst.StopDevEnvironmentRequest
-    ): Promise<CodeCatalyst.StopDevEnvironmentResponse> {
-        return this.call(this.sdkClient.stopDevEnvironment(args), false)
-    }
-
-    public async getDevEnvironment(args: CodeCatalyst.GetDevEnvironmentRequest): Promise<DevEnvironment> {
-        const a = { ...args }
-        delete (a as any).ides
-        delete (a as any).repositories
-        const r = await this.call(this.sdkClient.getDevEnvironment(a), false)
-
-        return toDevEnv(args.spaceName, args.projectName, { ...args, ...r })
-    }
-
-    public async deleteDevEnvironment(
-        args: CodeCatalyst.DeleteDevEnvironmentRequest
-    ): Promise<CodeCatalyst.DeleteDevEnvironmentResponse> {
-        return this.call(this.sdkClient.deleteDevEnvironment(args), false)
-    }
-
-    public updateDevEnvironment(
-        args: CodeCatalyst.UpdateDevEnvironmentRequest
-    ): Promise<CodeCatalyst.UpdateDevEnvironmentResponse> {
-        return this.call(this.sdkClient.updateDevEnvironment(fixAliasInRequest(args)), false)
-    }
-
-    /**
-     * Best-effort attempt to start a devenv given an ID, showing a progress notification with a cancel button
-     * TODO: may combine this progress stuff into some larger construct
-     *
-     * The cancel button does not abort the start, but rather alerts any callers that any operations that rely
-     * on the development environment starting should not progress.
-     */
-    public async startDevEnvironmentWithProgress(
-        args: CodeCatalyst.StartDevEnvironmentRequest,
-        status: string,
-        timeout: Timeout = new Timeout(180000)
-    ): Promise<DevEnvironment> {
-        let lastStatus: undefined | string
-        try {
-            const devenv = await this.getDevEnvironment(args)
-            lastStatus = devenv.status
-            if (status === 'RUNNING' && lastStatus === 'RUNNING') {
-                // "Debounce" in case caller did not check if the environment was already running.
-                return devenv
-            }
-        } catch {
-            lastStatus = undefined
-        }
-
-        const progress = await showMessageWithCancel(
-            localize('AWS.CodeCatalyst.startMde.message', 'CodeCatalyst'),
-            timeout
-        )
-        progress.report({ message: localize('AWS.CodeCatalyst.startMde.checking', 'checking status...') })
-
-        const pollDevEnv = waitUntil(
-            async () => {
-                this.log.debug(
-                    'devenv not started, waiting (time: %d seconds): %s',
-                    timeout.elapsedTime / 1000,
-                    args.id
-                )
-                // technically this will continue to be called until it reaches its own timeout, need a better way to 'cancel' a `waitUntil`
-                if (timeout.completed) {
-                    return
-                }
-
-                const resp = await this.getDevEnvironment(args)
-                if (lastStatus === 'STARTING' && (resp.status === 'STOPPED' || resp.status === 'STOPPING')) {
-                    throw new ToolkitError('Dev Environment failed to start', { code: 'BadDevEnvState' })
-                }
-
-                if (resp.status === 'STOPPED') {
-                    progress.report({
-                        message: localize('AWS.CodeCatalyst.startMde.stopStart', 'Resuming Dev Environment...'),
-                    })
-                    await this.startDevEnvironment(args)
-                } else if (resp.status === 'STOPPING') {
-                    progress.report({
-                        message: localize(
-                            'AWS.CodeCatalyst.startMde.resuming',
-                            'Waiting for Dev Environment to stop...'
-                        ),
-                    })
-                } else if (resp.status === 'FAILED') {
-                    throw new ToolkitError('Dev Environment failed to start', { code: 'FailedDevEnv' })
-                } else {
-                    progress.report({
-                        message: localize('AWS.CodeCatalyst.startMde.starting', 'Opening Dev Environment...'),
-                    })
-                }
-
-                lastStatus = resp.status
-                return resp.status === 'RUNNING' ? resp : undefined
-            },
-            // note: the `waitUntil` will resolve prior to the real timeout if it is refreshed
-            { interval: 1000, timeout: timeout.remainingTime, truthy: true }
-        )
-
-        const devenv = await waitTimeout(pollDevEnv, timeout)
-        if (!devenv) {
-            throw new ToolkitError('Dev Environment failed to start', { code: 'Timeout' })
-        }
-        this.log.info('devenv started after %d seconds: %s', timeout.elapsedTime / 1000, args.id)
-
-        return devenv
-    }
-}
diff --git a/src/shared/clients/devenvClient.ts b/src/shared/clients/devenvClient.ts
deleted file mode 100644
index 540ed0b7f50..00000000000
--- a/src/shared/clients/devenvClient.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import got from 'got'
-import { getCodeCatalystDevEnvId } from '../vscode/env'
-
-const environmentAuthToken = '__MDE_ENV_API_AUTHORIZATION_TOKEN'
-const environmentEndpoint = 'http://127.0.0.1:1339'
-
-export class DevEnvClient {
-    public constructor(private readonly endpoint: string = environmentEndpoint) {}
-
-    public get id(): string | undefined {
-        return getCodeCatalystDevEnvId()
-    }
-
-    public isCodeCatalystDevEnv(): boolean {
-        return !!this.id
-    }
-
-    // Start an action
-    public async startDevfile(request: StartDevfileRequest): Promise<void> {
-        await this.got.post('start', { json: request })
-    }
-
-    // Create a devfile for the project
-    public async createDevfile(request: CreateDevfileRequest): Promise<CreateDevfileResponse> {
-        const response = await this.got.post<CreateDevfileResponse>('devfile/create', { json: request })
-
-        return response.body
-    }
-
-    // Get status and action type
-    public async getStatus(): Promise<GetStatusResponse> {
-        const response = await this.got<GetStatusResponse>('status')
-
-        return response.body
-    }
-
-    private get authToken(): string | undefined {
-        return process.env[environmentAuthToken]
-    }
-
-    private readonly got = got.extend({
-        prefixUrl: this.endpoint,
-        responseType: 'json',
-        // `Authorization` _should_ have two parameters (RFC 7235), MDE should probably fix that
-        headers: { Authorization: this.authToken },
-    })
-}
-
-export interface GetStatusResponse {
-    actionId?: string
-    message?: string
-    status?: Status
-    location?: string // relative to the currently mounted project
-}
-
-export interface CreateDevfileRequest {
-    path?: string
-}
-
-export interface CreateDevfileResponse {
-    // Location of the created devfile.
-    location?: string
-}
-
-export interface StartDevfileRequest {
-    // The devfile.yaml file path relative to /projects/
-    location?: string
-
-    // The home volumes will be deleted and created again with the content of the '/home' folder of each component container.
-    recreateHomeVolumes?: boolean
-}
-
-export type Status = 'PENDING' | 'STABLE' | 'CHANGED'
diff --git a/src/shared/clients/ec2MetadataClient.ts b/src/shared/clients/ec2MetadataClient.ts
deleted file mode 100644
index e9e201a1313..00000000000
--- a/src/shared/clients/ec2MetadataClient.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { ClassToInterfaceType } from '../utilities/tsUtils'
-import { MetadataService } from 'aws-sdk'
-
-export interface IamInfo {
-    Code: string
-    LastUpdated: string
-    InstanceProfileArn: string
-    InstanceProfileId: string
-}
-
-export interface InstanceIdentity {
-    region: string
-}
-
-export type Ec2MetadataClient = ClassToInterfaceType<DefaultEc2MetadataClient>
-export class DefaultEc2MetadataClient {
-    private static readonly metadataServiceTimeout: number = 500
-
-    public constructor(private metadata: MetadataService = DefaultEc2MetadataClient.getMetadataService()) {}
-
-    public getInstanceIdentity(): Promise<InstanceIdentity> {
-        return this.invoke<InstanceIdentity>('/latest/dynamic/instance-identity/document')
-    }
-
-    public getIamInfo(): Promise<IamInfo> {
-        return this.invoke<IamInfo>('/latest/meta-data/iam/info')
-    }
-
-    public invoke<T>(path: string): Promise<T> {
-        return new Promise((resolve, reject) => {
-            this.metadata.request(path, (err, response) => {
-                if (err) {
-                    reject(err)
-                    return
-                }
-                try {
-                    const jsonResponse: T = JSON.parse(response)
-                    resolve(jsonResponse)
-                } catch (e) {
-                    reject(`Ec2MetadataClient: invalid response from "${path}": ${response}\nerror: ${e}`)
-                }
-            })
-        })
-    }
-
-    private static getMetadataService() {
-        return new MetadataService({
-            httpOptions: {
-                timeout: DefaultEc2MetadataClient.metadataServiceTimeout,
-                connectTimeout: DefaultEc2MetadataClient.metadataServiceTimeout,
-            } as any,
-            // workaround for known bug: https://github.com/aws/aws-sdk-js/issues/3029
-        })
-    }
-}
diff --git a/src/shared/clients/ecrClient.ts b/src/shared/clients/ecrClient.ts
deleted file mode 100644
index 06ff4f5e367..00000000000
--- a/src/shared/clients/ecrClient.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { ECR } from 'aws-sdk'
-import globals from '../extensionGlobals'
-import { AsyncCollection } from '../utilities/asyncCollection'
-import { pageableToCollection } from '../utilities/collectionUtils'
-import { assertHasProps, ClassToInterfaceType, isNonNullable, RequiredProps } from '../utilities/tsUtils'
-
-export type EcrRepository = RequiredProps<ECR.Repository, 'repositoryName' | 'repositoryUri' | 'repositoryArn'>
-
-export type EcrClient = ClassToInterfaceType<DefaultEcrClient>
-export class DefaultEcrClient {
-    public constructor(public readonly regionCode: string) {}
-
-    public async *describeTags(repositoryName: string): AsyncIterableIterator<string> {
-        const sdkClient = await this.createSdkClient()
-        const request: ECR.DescribeImagesRequest = { repositoryName: repositoryName }
-        do {
-            const response = await sdkClient.describeImages(request).promise()
-            if (response.imageDetails) {
-                for (const item of response.imageDetails) {
-                    if (item.imageTags !== undefined) {
-                        for (const tag of item.imageTags) {
-                            yield tag
-                        }
-                    }
-                }
-            }
-            request.nextToken = response.nextToken
-        } while (request.nextToken)
-    }
-
-    public async *describeRepositories(): AsyncIterableIterator<EcrRepository> {
-        const sdkClient = await this.createSdkClient()
-        const request: ECR.DescribeRepositoriesRequest = {}
-        do {
-            const response = await sdkClient.describeRepositories(request).promise()
-            if (response.repositories) {
-                yield* response.repositories
-                    .map(repo => {
-                        // If any of these are not present, the repo returned is not valid. repositoryUri/Arn
-                        // are both based on name, and it's not possible to not have a name
-                        if (!repo.repositoryArn || !repo.repositoryName || !repo.repositoryUri) {
-                            return undefined
-                        } else {
-                            return {
-                                repositoryName: repo.repositoryName,
-                                repositoryUri: repo.repositoryUri,
-                                repositoryArn: repo.repositoryArn,
-                            }
-                        }
-                    })
-                    .filter(item => item !== undefined) as EcrRepository[]
-            }
-            request.nextToken = response.nextToken
-        } while (request.nextToken)
-    }
-
-    public listAllRepositories(): AsyncCollection<EcrRepository[]> {
-        const requester = async (req: ECR.DescribeRepositoriesRequest) =>
-            (await this.createSdkClient()).describeRepositories(req).promise()
-        const collection = pageableToCollection(requester, {}, 'nextToken', 'repositories')
-
-        return collection.filter(isNonNullable).map(list => list.map(repo => (assertHasProps(repo), repo)))
-    }
-
-    public async createRepository(repositoryName: string): Promise<void> {
-        const sdkClient = await this.createSdkClient()
-        await sdkClient.createRepository({ repositoryName: repositoryName }).promise()
-    }
-
-    public async deleteRepository(repositoryName: string): Promise<void> {
-        const sdkClient = await this.createSdkClient()
-        await sdkClient.deleteRepository({ repositoryName: repositoryName }).promise()
-    }
-
-    public async deleteTag(repositoryName: string, tag: string): Promise<void> {
-        const sdkClient = await this.createSdkClient()
-        await sdkClient.batchDeleteImage({ repositoryName: repositoryName, imageIds: [{ imageTag: tag }] }).promise()
-    }
-
-    protected async createSdkClient(): Promise<ECR> {
-        return await globals.sdkClientBuilder.createAwsService(ECR, undefined, this.regionCode)
-    }
-}
diff --git a/src/shared/clients/ecsClient.ts b/src/shared/clients/ecsClient.ts
deleted file mode 100644
index 050cda6212f..00000000000
--- a/src/shared/clients/ecsClient.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { ECS } from 'aws-sdk'
-import globals from '../extensionGlobals'
-import { AsyncCollection } from '../utilities/asyncCollection'
-import { pageableToCollection } from '../utilities/collectionUtils'
-import { ClassToInterfaceType, isNonNullable } from '../utilities/tsUtils'
-
-export type EcsClient = ClassToInterfaceType<DefaultEcsClient>
-
-export type EcsResourceAndToken = {
-    resource: ECS.Cluster[] | ECS.Service[]
-    nextToken?: string
-}
-
-const maxResultsPerResponse = 10
-export class DefaultEcsClient {
-    public constructor(public readonly regionCode: string) {}
-
-    public async getClusters(nextToken?: string): Promise<EcsResourceAndToken> {
-        const sdkClient = await this.createSdkClient()
-        const clusterArnList = await sdkClient.listClusters({ maxResults: maxResultsPerResponse, nextToken }).promise()
-        if (clusterArnList.clusterArns?.length === 0) {
-            return { resource: [] }
-        }
-        const clusterResponse = await sdkClient.describeClusters({ clusters: clusterArnList.clusterArns }).promise()
-        const response: EcsResourceAndToken = {
-            resource: clusterResponse.clusters!,
-            nextToken: clusterArnList.nextToken,
-        }
-        return response
-    }
-
-    public listClusters(request: ECS.ListClustersRequest = {}): AsyncCollection<ECS.Cluster[]> {
-        const client = this.createSdkClient()
-        const requester = async (req: ECS.ListClustersRequest) => (await client).listClusters(req).promise()
-        const collection = pageableToCollection(requester, request, 'nextToken', 'clusterArns')
-
-        return collection.filter(isNonNullable).map(async clusters => {
-            if (clusters.length === 0) {
-                return []
-            }
-
-            const resp = await (await client).describeClusters({ clusters }).promise()
-            return resp.clusters!
-        })
-    }
-
-    public async getServices(cluster: string, nextToken?: string): Promise<EcsResourceAndToken> {
-        const sdkClient = await this.createSdkClient()
-        const serviceArnList = await sdkClient
-            .listServices({ cluster: cluster, maxResults: maxResultsPerResponse, nextToken })
-            .promise()
-        if (serviceArnList.serviceArns?.length === 0) {
-            return { resource: [] }
-        }
-        const services = await this.describeServices(cluster, serviceArnList.serviceArns!)
-        const response: EcsResourceAndToken = {
-            resource: services,
-            nextToken: serviceArnList.nextToken,
-        }
-        return response
-    }
-
-    public listServices(request: ECS.ListServicesRequest = {}): AsyncCollection<ECS.Service[]> {
-        const client = this.createSdkClient()
-        const requester = async (req: ECS.ListServicesRequest) => (await client).listServices(req).promise()
-        const collection = pageableToCollection(requester, request, 'nextToken', 'serviceArns')
-
-        return collection.filter(isNonNullable).map(async services => {
-            if (services.length === 0) {
-                return []
-            }
-
-            const resp = await (await client).describeServices({ cluster: request.cluster, services }).promise()
-            return resp.services!
-        })
-    }
-
-    public async describeTaskDefinition(taskDefinition: string): Promise<ECS.DescribeTaskDefinitionResponse> {
-        const sdkClient = await this.createSdkClient()
-        return await sdkClient.describeTaskDefinition({ taskDefinition }).promise()
-    }
-
-    public async listTasks(args: ECS.ListTasksRequest): Promise<string[]> {
-        const sdkClient = await this.createSdkClient()
-        const listTasksResponse = await sdkClient.listTasks(args).promise()
-        return listTasksResponse.taskArns ?? []
-    }
-
-    public async updateService(request: ECS.UpdateServiceRequest): Promise<void> {
-        const sdkClient = await this.createSdkClient()
-        await sdkClient.updateService(request).promise()
-    }
-
-    public async describeTasks(cluster: string, tasks: string[]): Promise<ECS.Task[]> {
-        const sdkClient = await this.createSdkClient()
-
-        const params: ECS.DescribeTasksRequest = { cluster, tasks }
-        const describedTasks = await sdkClient.describeTasks(params).promise()
-        return describedTasks.tasks ?? []
-    }
-
-    public async describeServices(cluster: string, services: string[]): Promise<ECS.Service[]> {
-        const sdkClient = await this.createSdkClient()
-        return (await sdkClient.describeServices({ cluster, services }).promise()).services ?? []
-    }
-
-    protected async createSdkClient(): Promise<ECS> {
-        return await globals.sdkClientBuilder.createAwsService(ECS, undefined, this.regionCode)
-    }
-
-    public async executeCommand(
-        request: Omit<ECS.ExecuteCommandRequest, 'interactive'>
-    ): Promise<ECS.ExecuteCommandResponse> {
-        const sdkClient = await this.createSdkClient()
-
-        // Currently the 'interactive' flag is required and needs to be true for ExecuteCommand: https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_ExecuteCommand.html
-        // This may change 'in the near future' as explained here: https://aws.amazon.com/blogs/containers/new-using-amazon-ecs-exec-access-your-containers-fargate-ec2/
-        return await sdkClient.executeCommand({ ...request, interactive: true }).promise()
-    }
-
-    public async registerTaskDefinition(request: ECS.RegisterTaskDefinitionRequest) {
-        const sdkClient = await this.createSdkClient()
-        return sdkClient.registerTaskDefinition(request).promise()
-    }
-}
diff --git a/src/shared/clients/iamClient.ts b/src/shared/clients/iamClient.ts
deleted file mode 100644
index 4b50be059d2..00000000000
--- a/src/shared/clients/iamClient.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { IAM } from 'aws-sdk'
-import globals from '../extensionGlobals'
-import { AsyncCollection } from '../utilities/asyncCollection'
-import { pageableToCollection } from '../utilities/collectionUtils'
-import { ClassToInterfaceType } from '../utilities/tsUtils'
-
-export type IamClient = ClassToInterfaceType<DefaultIamClient>
-
-/** Do not pull more than this many pages. */
-const maxPages = 500
-
-export class DefaultIamClient {
-    public constructor(public readonly regionCode: string) {}
-
-    public getRoles(request: IAM.ListRolesRequest = {}): AsyncCollection<IAM.Role[]> {
-        const requester = async (request: IAM.ListRolesRequest) =>
-            (await this.createSdkClient()).listRoles(request).promise()
-        const collection = pageableToCollection(requester, request, 'Marker', 'Roles')
-
-        return collection.limit(maxPages)
-    }
-
-    /** Gets all roles. */
-    public async listRoles(request: IAM.ListRolesRequest = {}): Promise<IAM.Role[]> {
-        return this.getRoles(request).flatten().promise()
-    }
-
-    public async createRole(request: IAM.CreateRoleRequest): Promise<IAM.CreateRoleResponse> {
-        const sdkClient = await this.createSdkClient()
-        const response = await sdkClient.createRole(request).promise()
-
-        return response
-    }
-
-    public async attachRolePolicy(request: IAM.AttachRolePolicyRequest): Promise<void> {
-        const sdkClient = await this.createSdkClient()
-        await sdkClient.attachRolePolicy(request).promise()
-    }
-
-    public async simulatePrincipalPolicy(
-        request: IAM.SimulatePrincipalPolicyRequest
-    ): Promise<IAM.SimulatePolicyResponse> {
-        const sdkClient = await this.createSdkClient()
-        return await sdkClient.simulatePrincipalPolicy(request).promise()
-    }
-
-    /**
-     * Attempts to verify if a role has the provided permissions.
-     */
-    public async getDeniedActions(request: IAM.SimulatePrincipalPolicyRequest): Promise<IAM.EvaluationResult[]> {
-        const permissionResponse = await this.simulatePrincipalPolicy(request)
-        if (!permissionResponse.EvaluationResults) {
-            throw new Error('No evaluation results found')
-        }
-
-        // Ignore deny from Organization SCP.  These can result in false negatives.
-        // See https://github.com/aws/aws-sdk/issues/102
-        return permissionResponse.EvaluationResults.filter(r => r.EvalDecision !== 'allowed' && r.OrganizationsDecisionDetail?.AllowedByOrganizations !== false)
-
-    }
-
-    private async createSdkClient(): Promise<IAM> {
-        return await globals.sdkClientBuilder.createAwsService(IAM, undefined, this.regionCode)
-    }
-}
diff --git a/src/shared/clients/iotClient.ts b/src/shared/clients/iotClient.ts
deleted file mode 100644
index dbe9af59db2..00000000000
--- a/src/shared/clients/iotClient.ts
+++ /dev/null
@@ -1,518 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as _ from 'lodash'
-import { Iot } from 'aws-sdk'
-import { parse } from '@aws-sdk/util-arn-parser'
-import { getLogger } from '../logger'
-import { InterfaceNoSymbol } from '../utilities/tsUtils'
-import globals from '../extensionGlobals'
-
-const defaultMaxThings = 250 // 250 is the maximum allowed by the API
-
-/* ATS is recommended over the deprecated Verisign certificates */
-const iotEndpointType = 'iot:Data-ATS'
-
-export type IotThing = { readonly name: string; readonly arn: string }
-export type IotCertificate = {
-    readonly id: string
-    readonly arn: string
-    readonly activeStatus: string
-    readonly creationDate: Date
-}
-export type IotPolicy = IotThing
-export type IotClient = InterfaceNoSymbol<DefaultIotClient>
-
-const iotServiceArn = 'iot'
-//Pattern to extract the certificate ID from the parsed ARN resource.
-const certArnResourcePattern = /cert\/(\w+)/
-
-export interface ListThingCertificatesResponse {
-    readonly certificates: Iot.CertificateDescription[]
-    readonly nextToken: string | undefined
-}
-
-export class DefaultIotClient {
-    public constructor(
-        private readonly regionCode: string,
-        private readonly iotProvider: (regionCode: string) => Promise<Iot> = createSdkClient
-    ) {}
-
-    /**
-     * Lists Things owned by the client.
-     *
-     * @throws Error if there is an error calling IoT.
-     */
-    public async listThings(request?: Iot.ListThingsRequest): Promise<Iot.ListThingsResponse> {
-        getLogger().debug('ListThings called with request: %O', request)
-        const iot = await this.iotProvider(this.regionCode)
-
-        const output: Iot.ListThingsResponse = await iot
-            .listThings({
-                maxResults: request?.maxResults ?? defaultMaxThings,
-                nextToken: request?.nextToken,
-            })
-            .promise()
-
-        getLogger().debug('ListThings returned response: %O', output)
-        return output
-    }
-
-    /**
-     * Creates an IoT Thing.
-     *
-     * @throws Error if there is an error calling IoT.
-     */
-    public async createThing(request: Iot.CreateThingRequest): Promise<Iot.CreateThingResponse> {
-        getLogger().debug('CreateThing called with request: %O', request)
-        const iot = await this.iotProvider(this.regionCode)
-
-        const output: Iot.CreateThingResponse = await iot.createThing({ thingName: request.thingName }).promise()
-
-        getLogger().debug('CreateThing returned response: %O', output)
-        return output
-    }
-
-    /**
-     * Deletes an IoT Thing.
-     *
-     * @throws Error if there is an error calling IoT.
-     */
-    public async deleteThing(request: Iot.DeleteThingRequest): Promise<void> {
-        getLogger().debug('DeleteThing called with request: %O', request)
-        const iot = await this.iotProvider(this.regionCode)
-
-        await iot.deleteThing({ thingName: request.thingName }).promise()
-
-        getLogger().debug('DeleteThing successful')
-    }
-
-    /**
-     * Lists all IoT certificates in account.
-     *
-     * @throws Error if there is an error calling IoT.
-     */
-    public async listCertificates(request: Iot.ListCertificatesRequest): Promise<Iot.ListCertificatesResponse> {
-        getLogger().debug('ListCertificates called with request: %O', request)
-        const iot = await this.iotProvider(this.regionCode)
-
-        const output: Iot.ListCertificatesResponse = await iot
-            .listCertificates({
-                pageSize: request.pageSize ?? defaultMaxThings,
-                marker: request.marker,
-                ascendingOrder: request.ascendingOrder,
-            })
-            .promise()
-
-        getLogger().debug('ListCertificates returned response: %O', output)
-        return output
-    }
-
-    /**
-     * Lists all principals attached to IoT Thing.
-     *
-     * Returns ARNS of principals that may be X.509 certificates, IAM
-     * users/groups/roles, or Amazon Cognito identities.
-     *
-     * @throws Error if there is an error calling IoT.
-     */
-    public async listThingPrincipals(
-        request: Iot.ListThingPrincipalsRequest
-    ): Promise<Iot.ListThingPrincipalsResponse> {
-        const iot = await this.iotProvider(this.regionCode)
-
-        const output: Iot.ListThingPrincipalsResponse = await iot
-            .listThingPrincipals({
-                thingName: request.thingName,
-                maxResults: request.maxResults ?? defaultMaxThings,
-                nextToken: request.nextToken,
-            })
-            .promise()
-        return output
-    }
-
-    /**
-     * Describes a certificate given the certificate ID.
-     *
-     * @throws Error if there is an error calling IoT.
-     */
-    private async describeCertificate(
-        request: Iot.DescribeCertificateRequest
-    ): Promise<Iot.DescribeCertificateResponse> {
-        const iot = await this.iotProvider(this.regionCode)
-
-        const output: Iot.DescribeCertificateResponse = await iot.describeCertificate(request).promise()
-
-        return output
-    }
-
-    /**
-     * Lists all IoT certificates attached to IoT Thing.
-     *
-     * listThingPrincipals() returns ARNS of principals that may be X.509
-     * certificates, IAM users/groups/roles, or Amazon Cognito identities.
-     * The list is filtered for certificates only, and describeCertificate()
-     * is called to get the information for each certificate.
-     *
-     * @throws Error if there is an error calling IoT.
-     */
-    public async listThingCertificates(
-        request: Iot.ListThingPrincipalsRequest
-    ): Promise<ListThingCertificatesResponse> {
-        getLogger().debug('ListThingCertificates called with request: %O', request)
-
-        const output = await this.listThingPrincipals(request)
-        const iotPrincipals: Iot.Principal[] = output.principals ?? []
-        const nextToken = output.nextToken
-
-        const describedCerts = iotPrincipals.map(async iotPrincipal => {
-            const principalArn = parse(iotPrincipal)
-            const certIdFound = principalArn.resource.match(certArnResourcePattern)
-            if (principalArn.service != iotServiceArn || !certIdFound) {
-                return undefined
-            }
-            const certId = certIdFound[1]
-            return this.describeCertificate({ certificateId: certId })
-        })
-
-        const resolvedCerts = (await Promise.all(describedCerts))
-            .filter(cert => cert?.certificateDescription != undefined)
-            .map(cert => cert?.certificateDescription as Iot.CertificateDescription)
-
-        const response: ListThingCertificatesResponse = { certificates: resolvedCerts, nextToken: nextToken }
-        getLogger().debug('ListThingCertificates returned response: %O', response)
-        return { certificates: resolvedCerts, nextToken: nextToken }
-    }
-
-    /**
-     * Lists Things attached to specified certificate.
-     *
-     * The nextToken output is discarded, since this function is only used
-     * to determine if the number of attached Things is nonzero.
-     *
-     * @throws Error if there is an error calling IoT.
-     */
-    public async listThingsForCert(request: Iot.ListPrincipalThingsRequest): Promise<string[]> {
-        getLogger().debug('ListThingsForCert called with request: %O', request)
-        const iot = await this.iotProvider(this.regionCode)
-
-        const output = await iot
-            .listPrincipalThings({
-                maxResults: request.maxResults ?? defaultMaxThings,
-                nextToken: request.nextToken,
-                principal: request.principal,
-            })
-            .promise()
-        const iotThings: Iot.ThingName[] = output.things ?? []
-
-        getLogger().debug('ListThingsForCert returned response: %O', iotThings)
-        return iotThings
-    }
-
-    /**
-     * Creates an X.509 certificate with a 2048 bit RSA keypair.
-     *
-     * @throws Error if there is an error calling IoT.
-     */
-    public async createCertificateAndKeys(
-        request: Iot.CreateKeysAndCertificateRequest
-    ): Promise<Iot.CreateKeysAndCertificateResponse> {
-        getLogger().debug('CreateCertificate called with request: %O', request)
-        const iot = await this.iotProvider(this.regionCode)
-
-        const output: Iot.CreateKeysAndCertificateResponse = await iot.createKeysAndCertificate(request).promise()
-
-        getLogger().debug('CreateCertificate succeeded')
-        return output
-    }
-
-    /**
-     * Activates, deactivates, or revokes an IoT Certificate.
-     *
-     * @throws Error if there is an error calling IoT.
-     */
-    public async updateCertificate(request: Iot.UpdateCertificateRequest): Promise<void> {
-        getLogger().debug('UpdateCertificate called with request: %O', request)
-        const iot = await this.iotProvider(this.regionCode)
-
-        await iot.updateCertificate({ certificateId: request.certificateId, newStatus: request.newStatus }).promise()
-
-        getLogger().debug('UpdateCertificate successful')
-    }
-
-    /**
-     * Deletes the specified IoT Certificate.
-     *
-     * Note that a certificate cannot be deleted if it is ACTIVE, or has attached
-     * Things or policies. A certificate may be force deleted if it is INACTIVE
-     * and has no attached Things.
-     *
-     * @throws Error if there is an error calling IoT.
-     */
-    public async deleteCertificate(request: Iot.DeleteCertificateRequest): Promise<void> {
-        getLogger().debug('DeleteCertificate called with request: %O', request)
-        const iot = await this.iotProvider(this.regionCode)
-
-        await iot.deleteCertificate(request).promise()
-
-        getLogger().debug('DeleteCertificate successful')
-    }
-
-    /**
-     * Attaches the certificate specified by the principal to the specified Thing.
-     *
-     * @throws Error if there is an error calling IoT.
-     */
-    public async attachThingPrincipal(request: Iot.AttachThingPrincipalRequest): Promise<void> {
-        getLogger().debug('AttachThingPrincipal called with request: %O', request)
-        const iot = await this.iotProvider(this.regionCode)
-
-        await iot.attachThingPrincipal({ thingName: request.thingName, principal: request.principal }).promise()
-
-        getLogger().debug('AttachThingPrincipal successful')
-    }
-
-    /**
-     * Detaches the certificate specified by the principal from the specified Thing.
-     *
-     * @throws Error if there is an error calling IoT.
-     */
-    public async detachThingPrincipal(request: Iot.DetachThingPrincipalRequest): Promise<void> {
-        getLogger().debug('DetachThingPrincipal called with request: %O', request)
-        const iot = await this.iotProvider(this.regionCode)
-
-        await iot.detachThingPrincipal({ thingName: request.thingName, principal: request.principal }).promise()
-
-        getLogger().debug('DetachThingPrincipal successful')
-    }
-
-    /**
-     * Lists all IoT Policies.
-     *
-     * @throws Error if there is an error calling IoT.
-     */
-    public async listPolicies(request: Iot.ListPoliciesRequest): Promise<Iot.ListPoliciesResponse> {
-        getLogger().debug('ListPolicies called with request: %O', request)
-        const iot = await this.iotProvider(this.regionCode)
-
-        const output: Iot.ListPoliciesResponse = await iot
-            .listPolicies({
-                pageSize: request.pageSize ?? defaultMaxThings,
-                marker: request.marker,
-                ascendingOrder: request.ascendingOrder,
-            })
-            .promise()
-
-        getLogger().debug('ListPolicies returned response: %O', output)
-        return output
-    }
-
-    /**
-     * Lists IoT policies for principal.
-     *
-     * @throws Error if there is an error calling IoT.
-     */
-    public async listPrincipalPolicies(request: Iot.ListPrincipalPoliciesRequest): Promise<Iot.ListPoliciesResponse> {
-        getLogger().debug('ListPrincipalPolicies called with request: %O', request)
-        const iot = await this.iotProvider(this.regionCode)
-
-        const output: Iot.ListPrincipalPoliciesResponse = await iot
-            .listPrincipalPolicies({
-                principal: request.principal,
-                pageSize: request.pageSize ?? defaultMaxThings,
-                marker: request.marker,
-                ascendingOrder: request.ascendingOrder,
-            })
-            .promise()
-
-        getLogger().debug('ListPrincipalPolicies returned response: %O', output)
-        return output
-    }
-
-    /**
-     * Lists certificates attached to specified policy.
-     *
-     * The nextMarker output value is discarded, since this function is only
-     * used to determine if the number of attached targets is nonzero.
-     *
-     * @throws Error if there is an error calling IoT.
-     */
-    public async listPolicyTargets(request: Iot.ListTargetsForPolicyRequest): Promise<string[]> {
-        getLogger().debug('ListPolicyTargets called with request: %O', request)
-        const iot = await this.iotProvider(this.regionCode)
-
-        const output = await iot
-            .listTargetsForPolicy({
-                pageSize: request.pageSize ?? defaultMaxThings,
-                marker: request.marker,
-                policyName: request.policyName,
-            })
-            .promise()
-        const arns: Iot.Target[] = output.targets ?? []
-
-        getLogger().debug('ListPolicyTargets returned response: %O', arns)
-        return arns
-    }
-
-    /**
-     * Attaches the specified policy to the specified target certificate.
-     *
-     * @throws Error if there is an error calling IoT.
-     */
-    public async attachPolicy(request: Iot.AttachPolicyRequest): Promise<void> {
-        getLogger().debug('AttachPolicy called with request: %O', request)
-        const iot = await this.iotProvider(this.regionCode)
-
-        await iot.attachPolicy({ policyName: request.policyName, target: request.target }).promise()
-
-        getLogger().debug('AttachPolicy successful')
-    }
-
-    /**
-     * Detaches the specified policy to the specified target certificate.
-     *
-     * @throws Error if there is an error calling IoT.
-     */
-    public async detachPolicy(request: Iot.DetachPolicyRequest): Promise<void> {
-        getLogger().debug('DetachPolicy called with request: %O', request)
-        const iot = await this.iotProvider(this.regionCode)
-
-        await iot.detachPolicy({ policyName: request.policyName, target: request.target }).promise()
-
-        getLogger().debug('DetachPolicy successful')
-    }
-
-    /**
-     * Creates an policy from the given policy document.
-     *
-     * @throws Error if there is an error calling IoT.
-     */
-    public async createPolicy(request: Iot.CreatePolicyRequest): Promise<void> {
-        getLogger().debug('CreatePolicy called with request: %O', request)
-        const iot = await this.iotProvider(this.regionCode)
-
-        const output: Iot.CreatePolicyResponse = await iot.createPolicy(request).promise()
-        getLogger().info(`Created policy: ${output.policyArn}`)
-
-        getLogger().debug('CreatePolicy successful')
-    }
-
-    /**
-     * Deletes an IoT Policy.
-     *
-     * Note that a policy cannot be deleted if it is attached to a certificate,
-     * or has non-default versions. A policy with non default versions must first
-     * delete versions with deletePolicyVersions()
-     *
-     * @throws Error if there is an error calling IoT.
-     */
-    public async deletePolicy(request: Iot.DeletePolicyRequest): Promise<void> {
-        getLogger().debug('DeletePolicy called with request: %O', request)
-        const iot = await this.iotProvider(this.regionCode)
-
-        await iot.deletePolicy({ policyName: request.policyName }).promise()
-
-        getLogger().debug('DeletePolicy successful')
-    }
-
-    /**
-     * Retrieves the account's IoT device data endpoint.
-     *
-     * @throws Error if there is an error calling IoT.
-     */
-    public async getEndpoint(): Promise<string> {
-        getLogger().debug('GetEndpoint called')
-        const iot = await this.iotProvider(this.regionCode)
-
-        const output = await iot.describeEndpoint({ endpointType: iotEndpointType }).promise()
-        if (!output.endpointAddress) {
-            throw new Error('Failed to retrieve endpoint')
-        }
-
-        getLogger().debug('GetEndpoint successful')
-        return output.endpointAddress
-    }
-
-    /**
-     * Lists versions for an IoT Policy
-     *
-     * @throws Error if there is an error calling IoT.
-     */
-    public async *listPolicyVersions(request: Iot.ListPolicyVersionsRequest): AsyncIterableIterator<Iot.PolicyVersion> {
-        const iot = await this.iotProvider(this.regionCode)
-
-        const response = await iot.listPolicyVersions(request).promise()
-
-        if (response.policyVersions) {
-            yield* response.policyVersions
-        }
-    }
-
-    /**
-     * Creates a new version for an IoT policy
-     *
-     * @throws Error if there is an error calling IoT.
-     */
-    public async createPolicyVersion(request: Iot.CreatePolicyVersionRequest): Promise<void> {
-        getLogger().debug('CreatePolicyVersion called with request: %O', request)
-        const iot = await this.iotProvider(this.regionCode)
-
-        const output = await iot.createPolicyVersion(request).promise()
-        getLogger().info(`Created new version ${output.policyVersionId} of ${request.policyName}`)
-
-        getLogger().debug('CreatePolicyVersion successful')
-    }
-
-    /**
-     * Deletes an IoT Policy version.
-     *
-     * Note that a policy cannot be deleted if it is attached to a certificate,
-     * or has non-default versions. A policy with non default versions must first
-     * delete versions with deletePolicyVersions()
-     *
-     * @throws Error if there is an error calling IoT.
-     */
-    public async deletePolicyVersion(request: Iot.DeletePolicyVersionRequest): Promise<void> {
-        getLogger().debug('DeletePolicyVersion called with request: %O', request)
-        const iot = await this.iotProvider(this.regionCode)
-
-        await iot.deletePolicyVersion(request).promise()
-
-        getLogger().debug('DeletePolicyVersion successful')
-    }
-
-    /**
-     * Sets a default version for an Iot Policy.
-     *
-     * @throws Error if there is an error calling IoT.
-     */
-    public async setDefaultPolicyVersion(request: Iot.SetDefaultPolicyVersionRequest): Promise<void> {
-        getLogger().debug('SetDefaultPolicyVersion called with request: %O', request)
-        const iot = await this.iotProvider(this.regionCode)
-
-        await iot.setDefaultPolicyVersion(request).promise()
-
-        getLogger().debug('SetDefaultPolicyVersion successful')
-    }
-
-    /**
-     * Downloads information including document for a specified policy version.
-     *
-     * @throws Error if there is an error calling IoT.
-     */
-    public async getPolicyVersion(request: Iot.GetPolicyVersionRequest): Promise<Iot.GetPolicyVersionResponse> {
-        getLogger().debug('GetPolicyVersion called with request: %O', request)
-        const iot = await this.iotProvider(this.regionCode)
-
-        const output: Iot.GetPolicyVersionResponse = await iot.getPolicyVersion(request).promise()
-
-        getLogger().debug('GetPolicyVersion successful')
-        return output
-    }
-}
-
-async function createSdkClient(regionCode: string): Promise<Iot> {
-    return await globals.sdkClientBuilder.createAwsService(Iot, undefined, regionCode)
-}
diff --git a/src/shared/clients/lambdaClient.ts b/src/shared/clients/lambdaClient.ts
deleted file mode 100644
index bcee86f9156..00000000000
--- a/src/shared/clients/lambdaClient.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Lambda } from 'aws-sdk'
-import { _Blob } from 'aws-sdk/clients/lambda'
-import { ToolkitError } from '../errors'
-import globals from '../extensionGlobals'
-import { getLogger } from '../logger'
-import { ClassToInterfaceType } from '../utilities/tsUtils'
-
-export type LambdaClient = ClassToInterfaceType<DefaultLambdaClient>
-export class DefaultLambdaClient {
-    public constructor(public readonly regionCode: string) {}
-
-    public async deleteFunction(name: string): Promise<void> {
-        const sdkClient = await this.createSdkClient()
-
-        const response = await sdkClient
-            .deleteFunction({
-                FunctionName: name,
-            })
-            .promise()
-
-        if (response.$response.error) {
-            throw response.$response.error
-        }
-    }
-
-    public async invoke(name: string, payload?: _Blob): Promise<Lambda.InvocationResponse> {
-        const sdkClient = await this.createSdkClient()
-
-        const response = await sdkClient
-            .invoke({
-                FunctionName: name,
-                LogType: 'Tail',
-                Payload: payload,
-            })
-            .promise()
-
-        return response
-    }
-
-    public async *listFunctions(): AsyncIterableIterator<Lambda.FunctionConfiguration> {
-        const client = await this.createSdkClient()
-
-        const request: Lambda.ListFunctionsRequest = {}
-        do {
-            const response: Lambda.ListFunctionsResponse = await client.listFunctions(request).promise()
-
-            if (response.Functions) {
-                yield* response.Functions
-            }
-
-            request.Marker = response.NextMarker
-        } while (request.Marker)
-    }
-
-    public async getFunction(name: string): Promise<Lambda.GetFunctionResponse> {
-        getLogger().debug(`GetFunction called for function: ${name}`)
-        const client = await this.createSdkClient()
-
-        try {
-            const response = await client.getFunction({ FunctionName: name }).promise()
-            // prune `Code` from logs so we don't reveal a signed link to customer resources.
-            getLogger().debug('GetFunction returned response (code section pruned): %O', {
-                ...response,
-                Code: 'Pruned',
-            })
-            return response
-        } catch (e) {
-            getLogger().error('Failed to get function: %s', e)
-            throw e
-        }
-    }
-
-    public async getFunctionUrlConfigs(name: string): Promise<Lambda.FunctionUrlConfigList> {
-        getLogger().debug(`GetFunctionUrlConfig called for function: ${name}`)
-        const client = await this.createSdkClient()
-
-        try {
-            const request = client.listFunctionUrlConfigs({ FunctionName: name })
-            const response = await request.promise()
-            // prune `Code` from logs so we don't reveal a signed link to customer resources.
-            getLogger().debug('GetFunctionUrlConfig returned response (code section pruned): %O', {
-                ...response,
-                Code: 'Pruned',
-            })
-            return response.FunctionUrlConfigs
-        } catch (e) {
-            throw ToolkitError.chain(e, 'Failed to get Lambda function URLs')
-        }
-    }
-
-    public async updateFunctionCode(name: string, zipFile: Buffer): Promise<Lambda.FunctionConfiguration> {
-        getLogger().debug(`updateFunctionCode called for function: ${name}`)
-        const client = await this.createSdkClient()
-
-        try {
-            const response = await client
-                .updateFunctionCode({
-                    FunctionName: name,
-                    Publish: true,
-                    ZipFile: zipFile,
-                })
-                .promise()
-            getLogger().debug('updateFunctionCode returned response: %O', response)
-            await client.waitFor('functionUpdated', { FunctionName: name }).promise()
-
-            return response
-        } catch (e) {
-            getLogger().error('Failed to run updateFunctionCode: %s', e)
-            throw e
-        }
-    }
-
-    private async createSdkClient(): Promise<Lambda> {
-        return await globals.sdkClientBuilder.createAwsService(Lambda, undefined, this.regionCode)
-    }
-}
diff --git a/src/shared/clients/s3Client.ts b/src/shared/clients/s3Client.ts
deleted file mode 100644
index 9e09d037e54..00000000000
--- a/src/shared/clients/s3Client.ts
+++ /dev/null
@@ -1,711 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as _ from 'lodash'
-import { AWSError, S3 } from 'aws-sdk'
-import { inspect } from 'util'
-import { getLogger } from '../logger'
-import { bufferToStream, DefaultFileStreams, FileStreams, pipe } from '../utilities/streamUtilities'
-import { assertHasProps, InterfaceNoSymbol, isNonNullable, RequiredProps } from '../utilities/tsUtils'
-import { Readable } from 'stream'
-import globals from '../extensionGlobals'
-import { defaultPartition } from '../regions/regionProvider'
-import { AsyncCollection, toCollection } from '../utilities/asyncCollection'
-import { toStream } from '../utilities/collectionUtils'
-
-export const DEFAULT_MAX_KEYS = 300 // eslint-disable-line @typescript-eslint/naming-convention
-export const DEFAULT_DELIMITER = '/' // eslint-disable-line @typescript-eslint/naming-convention
-
-export type Bucket = InterfaceNoSymbol<DefaultBucket>
-export type Folder = InterfaceNoSymbol<DefaultFolder>
-export type S3Client = InterfaceNoSymbol<DefaultS3Client>
-
-interface S3Object {
-    readonly key: string
-    readonly versionId?: string
-}
-
-export interface ContinuationToken {
-    readonly keyMarker: string
-    readonly versionIdMarker?: string
-}
-
-export interface CreateBucketRequest {
-    readonly bucketName: string
-}
-
-export interface CreateBucketResponse {
-    readonly bucket: Bucket
-}
-
-export interface ListBucketsResponse {
-    readonly buckets: Bucket[]
-}
-
-export interface ListFilesRequest {
-    readonly bucketName: string
-    readonly folderPath?: string
-    readonly continuationToken?: string
-    readonly maxResults?: number // Defaults to DEFAULT_MAX_KEYS
-}
-
-export interface ListFilesResponse {
-    readonly files: File[]
-    readonly folders: Folder[]
-    readonly continuationToken?: string
-}
-
-export interface CreateFolderRequest {
-    readonly bucketName: string
-    readonly path: string
-}
-
-export interface CreateFolderResponse {
-    readonly folder: Folder
-}
-
-export interface DownloadFileRequest {
-    readonly bucketName: string
-    readonly key: string
-    readonly progressListener?: (loadedBytes: number) => void
-    readonly saveLocation: vscode.Uri
-}
-
-export interface SignedUrlRequest {
-    readonly bucketName: string
-    readonly key: string
-    readonly time: number
-    readonly operation?: string
-    readonly body?: string
-}
-
-export interface UploadFileRequest {
-    readonly bucketName: string
-    readonly key: string
-    readonly content: vscode.Uri | Uint8Array
-    readonly contentType?: string
-    readonly progressListener?: (loadedBytes: number) => void
-}
-
-export interface HeadObjectRequest {
-    readonly bucketName: string
-    readonly key: string
-}
-
-export interface CharsetRequest {
-    readonly key: string
-    readonly bucketName: string
-}
-
-export interface ListObjectVersionsRequest {
-    readonly bucketName: string
-    readonly continuationToken?: ContinuationToken
-    readonly maxResults?: number // Defaults to DEFAULT_MAX_KEYS
-}
-
-export interface ListObjectVersionsResponse {
-    readonly objects: S3Object[]
-    readonly continuationToken?: ContinuationToken
-}
-
-export interface DeleteObjectRequest {
-    readonly bucketName: string
-    readonly key: string
-}
-
-export interface DeleteObjectsRequest {
-    readonly bucketName: string
-    readonly objects: { key: string; versionId?: string }[]
-}
-
-export interface DeleteObjectsResponse {
-    readonly errors: S3.Error[]
-}
-
-export interface DeleteBucketRequest {
-    readonly bucketName: string
-}
-
-export class DefaultS3Client {
-    public constructor(
-        public readonly regionCode: string,
-        private readonly partitionId = globals.regionProvider.getPartitionId(regionCode) ?? defaultPartition,
-        private readonly s3Provider: (regionCode: string) => Promise<S3> = createSdkClient,
-        private readonly fileStreams: FileStreams = new DefaultFileStreams()
-    ) {}
-
-    private async createS3(): Promise<S3> {
-        return this.s3Provider(this.regionCode)
-    }
-
-    /**
-     * Creates a bucket in the region of the client.
-     *
-     * @throws Error if there is an error calling S3.
-     */
-    public async createBucket(request: CreateBucketRequest): Promise<CreateBucketResponse> {
-        getLogger().debug('CreateBucket called with request: %O', request)
-        const s3 = await this.createS3()
-
-        await s3
-            .createBucket({
-                Bucket: request.bucketName,
-                // Passing us-east-1 for LocationConstraint breaks creating bucket. To make a bucket in us-east-1, you need to
-                // not pass a region, so check for this case.
-                CreateBucketConfiguration:
-                    this.regionCode == 'us-east-1' ? undefined : { LocationConstraint: this.regionCode },
-            })
-            .promise()
-
-        const response: CreateBucketResponse = {
-            bucket: new DefaultBucket({
-                partitionId: this.partitionId,
-                region: this.regionCode,
-                name: request.bucketName,
-            }),
-        }
-        getLogger().debug('CreateBucket returned response: %O', response)
-        return response
-    }
-
-    /**
-     * Empties and deletes a bucket.
-     *
-     * Note that this just repeatedly calls list and delete to empty the bucket before deletion.
-     * Failures during the emptying or deleting step can leave the bucket in a state where
-     * some (or all) objects are deleted, but the bucket remains.
-     *
-     * @throws Error if there is an error calling S3 to empty or delete the bucket.
-     */
-    public async deleteBucket(request: DeleteBucketRequest): Promise<void> {
-        getLogger().debug('DeleteBucket called with request: %O', request)
-        const { bucketName } = request
-        const s3 = await this.createS3()
-
-        await this.emptyBucket(bucketName)
-        await s3.deleteBucket({ Bucket: bucketName }).promise()
-
-        getLogger().debug('DeleteBucket succeeded')
-    }
-
-    /**
-     * Creates a folder.
-     *
-     * The folder's bucket should reside in the same region as the one configured for the client.
-     *
-     * Note that folders don't actually exist in S3.
-     * Everything in S3 is an object with a key residing in a bucket.
-     * However, S3 allows you to emulate folders by providing a key with delimiters (slashes) in its name.
-     *
-     * To creating empty "folders", you upload an empty object with a trailing slash.
-     *
-     * Creation of folders isn't strictly necessary, as you can just upload keys with delimiters.
-     * However, empty folders make it easier to work with S3 as if it were a filesystem like in the UI.
-     *
-     * @throws Error if there is an error calling S3.
-     */
-    public async createFolder(request: CreateFolderRequest): Promise<CreateFolderResponse> {
-        getLogger().debug('CreateFolder called with request: %O', request)
-        const s3 = await this.createS3()
-
-        const folder = new DefaultFolder({
-            path: request.path,
-            partitionId: this.partitionId,
-            bucketName: request.bucketName,
-        })
-
-        await s3
-            .upload({
-                Bucket: request.bucketName,
-                Key: request.path,
-                Body: '',
-            })
-            .promise()
-
-        const response: CreateFolderResponse = { folder }
-        getLogger().debug('CreateFolder returned response: %O', response)
-        return response
-    }
-
-    /**
-     * Downloads a file to disk.
-     *
-     * The file's bucket should reside in the same region as the one configured for the client.
-     *
-     * Pipes the response (read) stream into the file (write) stream.
-     *
-     * @throws Error if there is an error calling S3 or piping between streams.
-     */
-    public async downloadFile(request: DownloadFileRequest): Promise<void> {
-        getLogger().debug(
-            'DownloadFile called for bucketName: %s, key: %s, saveLocation: %s',
-            request.bucketName,
-            request.key,
-            request.saveLocation
-        )
-        const s3 = await this.createS3()
-
-        // https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/requests-using-stream-objects.html
-        const readStream = s3.getObject({ Bucket: request.bucketName, Key: request.key }).createReadStream()
-
-        const writeStream = this.fileStreams.createWriteStream(request.saveLocation)
-        await pipe(readStream, writeStream, request.progressListener)
-
-        getLogger().debug('DownloadFile succeeded')
-    }
-
-    /**
-     * Lighter version of {@link downloadFile} that just returns the stream.
-     */
-    public async downloadFileStream(bucketName: string, key: string): Promise<Readable> {
-        const s3 = await this.createS3()
-        return s3.getObject({ Bucket: bucketName, Key: key }).createReadStream()
-    }
-
-    public async headObject(request: HeadObjectRequest): Promise<S3.HeadObjectOutput> {
-        const s3 = await this.createS3()
-        getLogger().debug('HeadObject called with request: %O', request)
-        return s3.headObject({ Bucket: request.bucketName, Key: request.key }).promise()
-    }
-
-    /**
-     * Generates a presigned URL for the given file in S3.
-     * Takes a valid time option, which must be in seconds. This is the time the URL will be valid for
-     *
-     * @returns the string of the link to the presigned URL
-     */
-    public async getSignedUrl(request: SignedUrlRequest): Promise<string> {
-        const time = request.time
-        const operation = request.operation ? request.operation : 'getObject'
-        const s3 = await this.createS3()
-
-        const url = await s3.getSignedUrlPromise(operation, {
-            Bucket: request.bucketName,
-            Key: request.key,
-            Body: request.body,
-            Expires: time,
-        })
-        return url
-    }
-
-    /**
-     * Uploads a file from disk.
-     *
-     * The destination bucket should reside in the same region as the one configured for the client.
-     *
-     * Pipes the file (read) stream into the request (write) stream.
-     * Assigns the target content type based on the mime type of the file.
-     * If content type cannot be determined, defaults to {@link DEFAULT_CONTENT_TYPE}.
-     *
-     * @returns The S3.ManagedUpload stream
-     * @throws Error if there is an error calling S3 or piping between streams.
-     */
-    public async uploadFile(request: UploadFileRequest): Promise<S3.ManagedUpload> {
-        getLogger().debug('UploadFile called for bucketName: %s, key: %s', request.bucketName, request.key)
-        const s3 = await this.createS3()
-
-        // https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/s3-example-creating-buckets.html#s3-example-creating-buckets-upload-file
-        const readStream =
-            request.content instanceof vscode.Uri
-                ? this.fileStreams.createReadStream(request.content)
-                : bufferToStream(request.content)
-
-        const managedUploaded = s3.upload({
-            Bucket: request.bucketName,
-            Key: request.key,
-            Body: readStream,
-            ContentType: request.contentType,
-        })
-
-        const progressListener = request.progressListener
-        if (progressListener) {
-            let lastLoaded = 0
-            managedUploaded.on('httpUploadProgress', progress => {
-                progressListener(progress.loaded - lastLoaded)
-                lastLoaded = progress.loaded
-            })
-        }
-
-        return managedUploaded
-    }
-
-    /**
-     * Lists all buckets owned by the client.
-     *
-     *
-     * @throws Error if there is an error calling S3.
-     */
-    public async listAllBuckets(): Promise<S3.Bucket[]> {
-        const s3 = await this.createS3()
-        const output = await s3.listBuckets().promise()
-
-        return output.Buckets ?? []
-    }
-
-    public listAllBucketsIterable(): AsyncCollection<RequiredProps<S3.Bucket, 'Name'> & { readonly region: string }> {
-        async function* fn(this: DefaultS3Client) {
-            const s3 = await this.createS3()
-            const buckets = await this.listAllBuckets()
-
-            yield* toStream(
-                buckets.map(async bucket => {
-                    assertHasProps(bucket, 'Name')
-                    const region = await this.lookupRegion(bucket.Name, s3)
-                    if (region) {
-                        return { ...bucket, region }
-                    }
-                })
-            )
-        }
-
-        return toCollection(fn.bind(this)).filter(isNonNullable)
-    }
-
-    /**
-     * Filters the results of {@link listAllBucketsIterable} to the region of the client
-     */
-    public listBucketsIterable(): AsyncCollection<RequiredProps<S3.Bucket, 'Name'> & { readonly region: string }> {
-        return this.listAllBucketsIterable().filter(b => b.region === this.regionCode)
-    }
-
-    /**
-     * Lists buckets in the region of the client.
-     *
-     * Note that S3 returns all buckets in all regions,
-     * so this incurs the cost of additional S3#getBucketLocation requests for each bucket
-     * to filter out buckets residing outside of the client's region.
-     *
-     * @throws Error if there is an error calling S3.
-     */
-    public async listBuckets(): Promise<ListBucketsResponse> {
-        getLogger().debug('ListBuckets called')
-        const s3 = await this.createS3()
-
-        const s3Buckets: S3.Bucket[] = await this.listAllBuckets()
-
-        // S3#ListBuckets returns buckets across all regions
-        const allBucketPromises: Promise<Bucket | undefined>[] = s3Buckets.map(async s3Bucket => {
-            const bucketName = s3Bucket.Name
-            if (!bucketName) {
-                return undefined
-            }
-            const region = await this.lookupRegion(bucketName, s3)
-            if (!region) {
-                return undefined
-            }
-            return new DefaultBucket({
-                partitionId: this.partitionId,
-                region: region,
-                name: bucketName,
-            })
-        })
-
-        const allBuckets = await Promise.all(allBucketPromises)
-        const bucketsInRegion = _(allBuckets)
-            .reject(bucket => bucket === undefined)
-            // we don't have a filerNotNull so we can filter then cast
-            .map(bucket => bucket as Bucket)
-            .reject(bucket => bucket.region !== this.regionCode)
-            .value()
-
-        const response: ListBucketsResponse = { buckets: bucketsInRegion }
-        getLogger().debug('ListBuckets returned response: %O', response)
-        return { buckets: bucketsInRegion }
-    }
-
-    /**
-     * Lists files and folders in a folder or inside the bucket root.
-     *
-     * The bucket should reside in the same region as the one configured for the client.
-     *
-     * Returns the first {@link ListFilesRequest#maxResults} objects (the first "page").
-     * If there are more results, returns a continuation token that can be passed in a subsequent call
-     * to get the next "page" of results.
-     *
-     * Note that folders don't actually exist in S3.
-     * Everything in S3 is an object with a key residing in a bucket.
-     * However, S3 lets you limit results to those residing at a specific "path" specified by delimiters (slashes).
-     * The list of sub-paths is returned in the result set and can be used in subsequent calls.
-     *
-     * A consequence of the fact that folders don't exist is that folders and files are intermingled across all
-     * of the pages.
-     * It's not possible to retrieve an exhaustive list of all folders without traversing all of the pages.
-     *
-     * @throws Error if there is an error calling S3.
-     */
-    public async listFiles(request: ListFilesRequest): Promise<ListFilesResponse> {
-        getLogger().debug('ListFiles called with request: %O', request)
-
-        const s3 = await this.createS3()
-        const bucket = new DefaultBucket({
-            partitionId: this.partitionId,
-            region: this.regionCode,
-            name: request.bucketName,
-        })
-        const output = await s3
-            .listObjectsV2({
-                Bucket: bucket.name,
-                Delimiter: DEFAULT_DELIMITER,
-                MaxKeys: request.maxResults ?? DEFAULT_MAX_KEYS,
-                Prefix: request.folderPath,
-                ContinuationToken: request.continuationToken,
-            })
-            .promise()
-
-        const files: File[] = _(output.Contents)
-            .reject(file => file.Key === request.folderPath)
-            .map(file => {
-                assertHasProps(file, 'Key')
-                return toFile(bucket, file)
-            })
-            .value()
-
-        const folders: Folder[] = _(output.CommonPrefixes)
-            .map(prefix => prefix.Prefix)
-            .compact()
-            .map(path => new DefaultFolder({ path, partitionId: this.partitionId, bucketName: request.bucketName }))
-            .value()
-
-        const response: ListFilesResponse = {
-            files,
-            folders,
-            continuationToken: output.NextContinuationToken,
-        }
-        getLogger().debug('ListFiles returned response: %O', response)
-        return response
-    }
-
-    /**
-     * Lists versions of all objects inside a bucket.
-     *
-     * The bucket should reside in the same region as the one configured for the client.
-     *
-     * Returns the first {@link ListObjectVersionsRequest#maxResults} versions (the first "page").
-     * If there are more results, returns a continuation token that can be passed in a subsequent call
-     * to get the next "page" of results.
-     *
-     * @throws Error if there is an error calling S3.
-     */
-    public async listObjectVersions(request: ListObjectVersionsRequest): Promise<ListObjectVersionsResponse> {
-        getLogger().debug('ListObjectVersions called with request: %O', request)
-        const s3 = await this.createS3()
-
-        const output = await s3
-            .listObjectVersions({
-                Bucket: request.bucketName,
-                MaxKeys: request.maxResults ?? DEFAULT_MAX_KEYS,
-                KeyMarker: request.continuationToken?.keyMarker,
-                VersionIdMarker: request.continuationToken?.versionIdMarker,
-            })
-            .promise()
-
-        const response: ListObjectVersionsResponse = {
-            objects: (output.Versions ?? []).map(version => ({
-                key: version.Key!,
-                versionId: version.VersionId,
-            })),
-            continuationToken: output.IsTruncated
-                ? { keyMarker: output.NextKeyMarker!, versionIdMarker: output.NextVersionIdMarker }
-                : undefined,
-        }
-        getLogger().debug('ListObjectVersions returned response: %O', response)
-        return response
-    }
-
-    /**
-     * Returns an async iterable over all pages of {@link listObjectVersions}.
-     *
-     * @throws Error from the iterable if there is an error calling S3.
-     */
-    public async *listObjectVersionsIterable(
-        request: ListObjectVersionsRequest
-    ): AsyncIterableIterator<ListObjectVersionsResponse> {
-        let continuationToken: ContinuationToken | undefined = request.continuationToken
-        do {
-            const listObjectVersionsResponse: ListObjectVersionsResponse = await this.listObjectVersions({
-                bucketName: request.bucketName,
-                maxResults: request.maxResults,
-                continuationToken,
-            })
-            continuationToken = listObjectVersionsResponse.continuationToken
-
-            yield listObjectVersionsResponse
-        } while (continuationToken)
-    }
-
-    /**
-     * Deletes an object from a bucket.
-     *
-     * The bucket should reside in the same region as the one configured for the client.
-     *
-     * @throws Error if there is an error calling S3.
-     */
-    public async deleteObject(request: DeleteObjectRequest): Promise<void> {
-        getLogger().debug('DeleteObject called with request: %O', request)
-        const s3 = await this.createS3()
-
-        await s3
-            .deleteObject({
-                Bucket: request.bucketName,
-                Key: request.key,
-            })
-            .promise()
-
-        getLogger().debug('DeleteObject succeeded')
-    }
-
-    /**
-     * Deletes objects from a bucket.
-     *
-     * The bucket should reside in the same region as the one configured for the client.
-     *
-     * Returns a list of Errors that occurred if the delete was only partially completed.
-     *
-     * @throws Error if there is an error calling S3, beyond the partial errors mentioned above.
-     */
-    public async deleteObjects(request: DeleteObjectsRequest): Promise<DeleteObjectsResponse> {
-        getLogger().debug('DeleteObjects called with request: %O', request)
-        const s3 = await this.createS3()
-
-        const output = await s3
-            .deleteObjects({
-                Bucket: request.bucketName,
-                Delete: {
-                    Objects: request.objects.map(({ key: Key, versionId: VersionId }) => ({ Key, VersionId })),
-                    Quiet: true,
-                },
-            })
-            .promise()
-
-        const response: DeleteObjectsResponse = { errors: output.Errors ?? [] }
-        getLogger().debug('DeleteObjects returned response: %O', response)
-        return response
-    }
-
-    /**
-     * Looks up the region for the given bucket
-     *
-     * Use the getBucketLocation API to avoid cross region lookups. #1806
-     */
-    private async lookupRegion(bucketName: string, s3: S3): Promise<string | undefined> {
-        try {
-            const response = await s3.getBucketLocation({ Bucket: bucketName }).promise()
-            // getBucketLocation returns an explicit empty string location contraint for us-east-1
-            const region = response.LocationConstraint === '' ? 'us-east-1' : response.LocationConstraint
-            getLogger().debug('LookupRegion(%s) returned: %s', bucketName, region)
-            return region
-        } catch (e) {
-            getLogger().error('LookupRegion(%s) failed: %s', bucketName, (e as Error).message ?? '?')
-            // Try to recover region from the error
-            return (e as AWSError).region
-        }
-    }
-
-    /**
-     * Empties a bucket by repeatedly listing and deleting all versions of all objects inside.
-     *
-     * Note that this just repeatedly calls list object versions and delete objects to empty the bucket.
-     * Failures can leave the bucket in a state where only some objects are deleted.
-     *
-     * @throws Error if there is an error listing or deleting.
-     */
-    private async emptyBucket(bucketName: string): Promise<void> {
-        for await (const { objects } of this.listObjectVersionsIterable({ bucketName })) {
-            if (_(objects).isEmpty()) {
-                continue
-            }
-
-            const deleteObjectsResponse = await this.deleteObjects({ bucketName, objects })
-            if (!_(deleteObjectsResponse.errors).isEmpty()) {
-                const e = new Error(inspect(deleteObjectsResponse.errors[0]))
-                getLogger().error('Failed to delete %d objects: %O...', deleteObjectsResponse.errors.length, e)
-                throw e
-            }
-        }
-    }
-}
-
-/**
- * @deprecated This should be refactored the same way as {@link toFile}
- */
-export class DefaultBucket {
-    public readonly name: string
-    public readonly region: string
-    public readonly arn: string
-
-    public constructor({ partitionId, region, name }: { partitionId: string; region: string; name: string }) {
-        this.name = name
-        this.region = region
-        this.arn = buildArn({ partitionId, bucketName: name })
-    }
-
-    public [inspect.custom](): string {
-        return `Bucket (name=${this.name}, region=${this.region}, arn=${this.arn})`
-    }
-}
-
-/**
- * @deprecated This should be refactored the same way as {@link toFile}
- */
-export class DefaultFolder {
-    public readonly name: string
-    public readonly path: string
-    public readonly arn: string
-
-    public constructor({ partitionId, bucketName, path }: { partitionId: string; bucketName: string; path: string }) {
-        this.path = path
-        this.arn = buildArn({ partitionId, bucketName, key: path })
-        this.name = _(this.path).split(DEFAULT_DELIMITER).dropRight()!.last()!
-    }
-
-    public [inspect.custom](): string {
-        return `Folder (name=${this.name}, path=${this.path}, arn=${this.arn})`
-    }
-}
-
-export interface File extends S3.Object, S3.HeadObjectOutput {
-    readonly name: string
-    readonly key: string
-    readonly arn: string
-    readonly lastModified?: Date
-    readonly sizeBytes?: number
-    readonly eTag?: string
-}
-
-export function toFile(bucket: Bucket, resp: RequiredProps<S3.Object, 'Key'>, delimiter = DEFAULT_DELIMITER): File {
-    return {
-        key: resp.Key,
-        arn: `${bucket.arn}/${resp.Key}`,
-        name: resp.Key.split(delimiter).pop()!,
-        eTag: resp.ETag,
-        lastModified: resp.LastModified,
-        sizeBytes: resp.Size,
-        ...resp,
-    }
-}
-
-function buildArn({ partitionId, bucketName, key }: { partitionId: string; bucketName: string; key?: string }) {
-    if (key === undefined) {
-        return `arn:${partitionId}:s3:::${bucketName}`
-    }
-
-    return `arn:${partitionId}:s3:::${bucketName}/${key}`
-}
-
-async function createSdkClient(regionCode: string): Promise<S3> {
-    clearInternalBucketCache()
-
-    return await globals.sdkClientBuilder.createAwsService(S3, { computeChecksums: true }, regionCode)
-}
-
-/**
- * Bucket region is cached across invocations without regard to partition
- * If partition changes with same bucket name in both partitions, cache is incorrect
- * @see https://github.com/aws/aws-sdk-js/blob/16a799c0681c01dcafa7b30be5f16894861b3a32/lib/services/s3.js#L919-L924
- */
-function clearInternalBucketCache(): void {
-    ;(S3.prototype as any).bucketRegionCache = {}
-}
diff --git a/src/shared/clients/schemaClient.ts b/src/shared/clients/schemaClient.ts
deleted file mode 100644
index 38e6464350e..00000000000
--- a/src/shared/clients/schemaClient.ts
+++ /dev/null
@@ -1,165 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Schemas } from 'aws-sdk'
-import globals from '../extensionGlobals'
-
-import { ClassToInterfaceType } from '../utilities/tsUtils'
-
-export type SchemaClient = ClassToInterfaceType<DefaultSchemaClient>
-export class DefaultSchemaClient {
-    public constructor(public readonly regionCode: string) {}
-
-    public async *listRegistries(): AsyncIterableIterator<Schemas.RegistrySummary> {
-        const client = await this.createSdkClient()
-
-        const request: Schemas.ListRegistriesRequest = {}
-
-        do {
-            const response: Schemas.ListRegistriesResponse = await client.listRegistries(request).promise()
-
-            if (response.Registries) {
-                yield* response.Registries
-            }
-
-            request.NextToken = response.NextToken
-        } while (request.NextToken)
-    }
-
-    public async *listSchemas(registryName: string): AsyncIterableIterator<Schemas.SchemaSummary> {
-        const client = await this.createSdkClient()
-
-        const request: Schemas.ListSchemasRequest = {
-            RegistryName: registryName,
-        }
-
-        do {
-            const response: Schemas.ListSchemasResponse = await client.listSchemas(request).promise()
-
-            if (response.Schemas) {
-                yield* response.Schemas
-            }
-
-            request.NextToken = response.NextToken
-        } while (request.NextToken)
-    }
-
-    public async describeSchema(
-        registryName: string,
-        schemaName: string,
-        schemaVersion?: string
-    ): Promise<Schemas.DescribeSchemaResponse> {
-        const client = await this.createSdkClient()
-
-        return await client
-            .describeSchema({
-                RegistryName: registryName,
-                SchemaName: schemaName,
-                SchemaVersion: schemaVersion,
-            })
-            .promise()
-    }
-
-    public async *listSchemaVersions(
-        registryName: string,
-        schemaName: string
-    ): AsyncIterableIterator<Schemas.SchemaVersionSummary> {
-        const client = await this.createSdkClient()
-
-        const request: Schemas.ListSchemaVersionsRequest = {
-            RegistryName: registryName,
-            SchemaName: schemaName,
-        }
-
-        do {
-            const response: Schemas.ListSchemaVersionsResponse = await client.listSchemaVersions(request).promise()
-
-            if (response.SchemaVersions) {
-                yield* response.SchemaVersions
-            }
-
-            request.NextToken = response.NextToken
-        } while (request.NextToken)
-    }
-
-    public async *searchSchemas(
-        keywords: string,
-        registryName: string
-    ): AsyncIterableIterator<Schemas.SearchSchemaSummary> {
-        const client = await this.createSdkClient()
-
-        const request: Schemas.SearchSchemasRequest = {
-            Keywords: keywords,
-            RegistryName: registryName,
-        }
-
-        do {
-            const response: Schemas.SearchSchemasResponse = await client.searchSchemas(request).promise()
-
-            if (response.Schemas) {
-                yield* response.Schemas
-            }
-
-            request.NextToken = response.NextToken
-        } while (request.NextToken)
-    }
-
-    public async getCodeBindingSource(
-        language: string,
-        registryName: string,
-        schemaName: string,
-        schemaVersion: string
-    ): Promise<Schemas.GetCodeBindingSourceResponse> {
-        const client = await this.createSdkClient()
-
-        return await client
-            .getCodeBindingSource({
-                Language: language,
-                RegistryName: registryName,
-                SchemaName: schemaName,
-                SchemaVersion: schemaVersion,
-            })
-            .promise()
-    }
-
-    public async putCodeBinding(
-        language: string,
-        registryName: string,
-        schemaName: string,
-        schemaVersion: string
-    ): Promise<Schemas.PutCodeBindingResponse> {
-        const client = await this.createSdkClient()
-
-        return await client
-            .putCodeBinding({
-                Language: language,
-                RegistryName: registryName,
-                SchemaName: schemaName,
-                SchemaVersion: schemaVersion,
-            })
-            .promise()
-    }
-    public async describeCodeBinding(
-        language: string,
-        registryName: string,
-        schemaName: string,
-        schemaVersion: string
-    ): Promise<Schemas.DescribeCodeBindingResponse> {
-        const client = await this.createSdkClient()
-
-        return await client
-            .describeCodeBinding({
-                Language: language,
-                RegistryName: registryName,
-                SchemaName: schemaName,
-                SchemaVersion: schemaVersion,
-            })
-            .promise()
-    }
-
-    private async createSdkClient(): Promise<Schemas> {
-        return await globals.sdkClientBuilder.createAwsService(Schemas, undefined, this.regionCode)
-    }
-}
diff --git a/src/shared/clients/ssmDocumentClient.ts b/src/shared/clients/ssmDocumentClient.ts
deleted file mode 100644
index 3c6c646316e..00000000000
--- a/src/shared/clients/ssmDocumentClient.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { SSM } from 'aws-sdk'
-import globals from '../extensionGlobals'
-
-import { ClassToInterfaceType } from '../utilities/tsUtils'
-
-export type SsmDocumentClient = ClassToInterfaceType<DefaultSsmDocumentClient>
-export class DefaultSsmDocumentClient {
-    public constructor(public readonly regionCode: string) {}
-
-    public async deleteDocument(documentName: string): Promise<SSM.Types.DeleteDocumentResult> {
-        const client = await this.createSdkClient()
-
-        const request: SSM.Types.DeleteDocumentRequest = {
-            Name: documentName,
-        }
-
-        return await client.deleteDocument(request).promise()
-    }
-
-    public async *listDocuments(
-        request: SSM.Types.ListDocumentsRequest = {}
-    ): AsyncIterableIterator<SSM.DocumentIdentifier> {
-        const client = await this.createSdkClient()
-
-        do {
-            const response: SSM.Types.ListDocumentsResult = await client.listDocuments(request).promise()
-
-            if (response.DocumentIdentifiers) {
-                yield* response.DocumentIdentifiers
-            }
-
-            request.NextToken = response.NextToken
-        } while (request.NextToken)
-    }
-
-    public async *listDocumentVersions(documentName: string): AsyncIterableIterator<SSM.Types.DocumentVersionInfo> {
-        const client = await this.createSdkClient()
-
-        const request: SSM.Types.ListDocumentVersionsRequest = {
-            Name: documentName,
-        }
-
-        do {
-            const response: SSM.Types.ListDocumentVersionsResult = await client.listDocumentVersions(request).promise()
-
-            if (response.DocumentVersions) {
-                yield* response.DocumentVersions
-            }
-
-            request.NextToken = response.NextToken
-        } while (request.NextToken)
-    }
-
-    public async describeDocument(documentName: string, documentVersion?: string): Promise<SSM.DescribeDocumentResult> {
-        const client = await this.createSdkClient()
-
-        const request: SSM.Types.DescribeDocumentRequest = {
-            Name: documentName,
-            DocumentVersion: documentVersion,
-        }
-
-        return await client.describeDocument(request).promise()
-    }
-
-    public async getDocument(
-        documentName: string,
-        documentVersion?: string,
-        documentFormat?: string
-    ): Promise<SSM.Types.GetDocumentResult> {
-        const client = await this.createSdkClient()
-
-        const request: SSM.Types.GetDocumentRequest = {
-            Name: documentName,
-            DocumentVersion: documentVersion,
-            DocumentFormat: documentFormat,
-        }
-
-        return await client.getDocument(request).promise()
-    }
-
-    public async createDocument(request: SSM.Types.CreateDocumentRequest): Promise<SSM.Types.CreateDocumentResult> {
-        const client = await this.createSdkClient()
-
-        return await client.createDocument(request).promise()
-    }
-
-    public async updateDocument(request: SSM.Types.UpdateDocumentRequest): Promise<SSM.Types.UpdateDocumentResult> {
-        const client = await this.createSdkClient()
-
-        return await client.updateDocument(request).promise()
-    }
-
-    public async updateDocumentVersion(
-        documentName: string,
-        documentVersion: string
-    ): Promise<SSM.Types.UpdateDocumentDefaultVersionResult> {
-        const client = await this.createSdkClient()
-
-        const request: SSM.Types.UpdateDocumentDefaultVersionRequest = {
-            Name: documentName,
-            DocumentVersion: documentVersion,
-        }
-
-        return await client.updateDocumentDefaultVersion(request).promise()
-    }
-
-    private async createSdkClient(): Promise<SSM> {
-        return await globals.sdkClientBuilder.createAwsService(SSM, undefined, this.regionCode)
-    }
-}
diff --git a/src/shared/clients/stepFunctionsClient.ts b/src/shared/clients/stepFunctionsClient.ts
deleted file mode 100644
index cb421ee400d..00000000000
--- a/src/shared/clients/stepFunctionsClient.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { StepFunctions } from 'aws-sdk'
-import globals from '../extensionGlobals'
-import { ClassToInterfaceType } from '../utilities/tsUtils'
-
-export type StepFunctionsClient = ClassToInterfaceType<DefaultStepFunctionsClient>
-export class DefaultStepFunctionsClient {
-    public constructor(public readonly regionCode: string) {}
-
-    public async *listStateMachines(): AsyncIterableIterator<StepFunctions.StateMachineListItem> {
-        const client = await this.createSdkClient()
-
-        const request: StepFunctions.ListStateMachinesInput = {}
-        do {
-            const response: StepFunctions.ListStateMachinesOutput = await client.listStateMachines(request).promise()
-
-            if (response.stateMachines) {
-                yield* response.stateMachines
-            }
-
-            request.nextToken = response.nextToken
-        } while (request.nextToken)
-    }
-
-    public async getStateMachineDetails(arn: string): Promise<StepFunctions.DescribeStateMachineOutput> {
-        const client = await this.createSdkClient()
-
-        const request: StepFunctions.DescribeStateMachineInput = {
-            stateMachineArn: arn,
-        }
-
-        const response: StepFunctions.DescribeStateMachineOutput = await client.describeStateMachine(request).promise()
-
-        return response
-    }
-
-    public async executeStateMachine(arn: string, input?: string): Promise<StepFunctions.StartExecutionOutput> {
-        const client = await this.createSdkClient()
-
-        const request: StepFunctions.StartExecutionInput = {
-            stateMachineArn: arn,
-            input: input,
-        }
-
-        const response: StepFunctions.StartExecutionOutput = await client.startExecution(request).promise()
-
-        return response
-    }
-
-    public async createStateMachine(
-        params: StepFunctions.CreateStateMachineInput
-    ): Promise<StepFunctions.CreateStateMachineOutput> {
-        const client = await this.createSdkClient()
-
-        return client.createStateMachine(params).promise()
-    }
-
-    public async updateStateMachine(
-        params: StepFunctions.UpdateStateMachineInput
-    ): Promise<StepFunctions.UpdateStateMachineOutput> {
-        const client = await this.createSdkClient()
-
-        return client.updateStateMachine(params).promise()
-    }
-
-    private async createSdkClient(): Promise<StepFunctions> {
-        return await globals.sdkClientBuilder.createAwsService(StepFunctions, undefined, this.regionCode)
-    }
-}
diff --git a/src/shared/clients/stsClient.ts b/src/shared/clients/stsClient.ts
deleted file mode 100644
index abe9f6901a4..00000000000
--- a/src/shared/clients/stsClient.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { STS } from 'aws-sdk'
-import { Credentials } from '@aws-sdk/types'
-import globals from '../extensionGlobals'
-import { ClassToInterfaceType } from '../utilities/tsUtils'
-
-export type StsClient = ClassToInterfaceType<DefaultStsClient>
-export class DefaultStsClient {
-    public constructor(public readonly regionCode: string, private readonly credentials?: Credentials) {}
-
-    public async assumeRole(request: STS.AssumeRoleRequest): Promise<STS.AssumeRoleResponse> {
-        const sdkClient = await this.createSdkClient()
-        const response = await sdkClient.assumeRole(request).promise()
-        return response
-    }
-
-    public async getCallerIdentity(): Promise<STS.GetCallerIdentityResponse> {
-        const sdkClient = await this.createSdkClient()
-        const response = await sdkClient.getCallerIdentity().promise()
-        return response
-    }
-
-    private async createSdkClient(): Promise<STS> {
-        return await globals.sdkClientBuilder.createAwsService(
-            STS,
-            {
-                credentials: this.credentials,
-                stsRegionalEndpoints: 'regional',
-            },
-            this.regionCode
-        )
-    }
-}
diff --git a/src/shared/cloudformation/activation.ts b/src/shared/cloudformation/activation.ts
deleted file mode 100644
index a3c32432636..00000000000
--- a/src/shared/cloudformation/activation.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { getLogger } from '../logger'
-import { localize } from '../utilities/vsCodeUtils'
-
-import { CloudFormationTemplateRegistry } from '../fs/templateRegistry'
-import { getIdeProperties } from '../extensionUtilities'
-import { NoopWatcher } from '../fs/watchedFiles'
-import { createStarterTemplateFile } from './cloudformation'
-import { Commands } from '../vscode/commands2'
-import globals from '../extensionGlobals'
-
-export const templateFileGlobPattern = '**/*.{yaml,yml}'
-
-/**
- * Match any file path that contains a .aws-sam folder. The way this works is:
- * match anything that starts  with a '/' or '\', then '.aws-sam', then either
- * a '/' or '\' followed by any number of characters or end of a string (so it
- * matches both /.aws-sam or /.aws-sam/<any number of characters>)
- */
-export const templateFileExcludePattern = /.*[/\\]\.aws-sam([/\\].*|$)/
-
-export const devfileExcludePattern = /.*devfile\.(yaml|yml)/i
-
-/**
- * Creates a CloudFormationTemplateRegistry which retains the state of CloudFormation templates in a workspace.
- * This also assigns a FileSystemWatcher which will update the registry on any change to tracked templates.
- *
- * @param extensionContext VS Code extension context
- */
-export async function activate(extensionContext: vscode.ExtensionContext): Promise<void> {
-    try {
-        const registry = new CloudFormationTemplateRegistry()
-        globals.templateRegistry = registry
-        await registry.addExcludedPattern(devfileExcludePattern)
-        await registry.addExcludedPattern(templateFileExcludePattern)
-        await registry.addWatchPattern(templateFileGlobPattern)
-        await registry.watchUntitledFiles()
-    } catch (e) {
-        vscode.window.showErrorMessage(
-            localize(
-                'AWS.codelens.failToInitialize',
-                'Failed to activate template registry. {0}} will not appear on SAM template files.',
-                getIdeProperties().codelenses
-            )
-        )
-        getLogger().error('Failed to activate template registry', e)
-        // This prevents us from breaking for any reason later if it fails to load. Since
-        // Noop watcher is always empty, we will get back empty arrays with no issues.
-        globals.templateRegistry = new NoopWatcher() as unknown as CloudFormationTemplateRegistry
-    }
-    // If setting it up worked, add it to subscriptions so it is cleaned up at exit
-    extensionContext.subscriptions.push(
-        globals.templateRegistry,
-        Commands.register('aws.cloudFormation.newTemplate', () => createStarterTemplateFile(false)),
-        Commands.register('aws.sam.newTemplate', () => createStarterTemplateFile(true))
-    )
-}
diff --git a/src/shared/cloudformation/cloudformation.ts b/src/shared/cloudformation/cloudformation.ts
deleted file mode 100644
index d0bf7ec0e37..00000000000
--- a/src/shared/cloudformation/cloudformation.ts
+++ /dev/null
@@ -1,845 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as fs from 'fs-extra'
-import * as vscode from 'vscode'
-import { writeFile } from 'fs-extra'
-import { schema } from 'yaml-cfn'
-import * as yaml from 'js-yaml'
-import * as filesystemUtilities from '../filesystemUtilities'
-import { SystemUtilities } from '../systemUtilities'
-import { getLogger } from '../logger'
-import { lambdaPackageTypeImage } from '../constants'
-import { isCloud9 } from '../extensionUtilities'
-import { Window } from '../vscode/window'
-
-export namespace CloudFormation {
-    export const SERVERLESS_API_TYPE = 'AWS::Serverless::Api' // eslint-disable-line @typescript-eslint/naming-convention
-    export const SERVERLESS_FUNCTION_TYPE = 'AWS::Serverless::Function' // eslint-disable-line @typescript-eslint/naming-convention
-    export const LAMBDA_FUNCTION_TYPE = 'AWS::Lambda::Function' // eslint-disable-line @typescript-eslint/naming-convention
-
-    export function isZipLambdaResource(
-        resource?: ZipResourceProperties | ImageResourceProperties
-    ): resource is ZipResourceProperties {
-        return resource?.PackageType !== 'Image'
-    }
-
-    export function isImageLambdaResource(
-        resource?: ZipResourceProperties | ImageResourceProperties
-    ): resource is ImageResourceProperties {
-        return resource?.PackageType === 'Image'
-    }
-
-    export function validateZipLambdaProperties({
-        Handler,
-        CodeUri,
-        Runtime,
-        ...rest
-    }: Partial<ZipResourceProperties>): ZipResourceProperties {
-        if (!Handler) {
-            throw new Error('Missing value: Handler')
-        }
-
-        if (!CodeUri) {
-            throw new Error('Missing value: CodeUri')
-        }
-
-        if (!Runtime) {
-            throw new Error('Missing value: Runtime')
-        }
-
-        return {
-            Handler,
-            CodeUri,
-            Runtime,
-            ...rest,
-        }
-    }
-
-    export interface LambdaResourceProperties {
-        MemorySize?: number | Ref
-        Timeout?: number | Ref
-        Environment?: Environment
-        Events?: Events
-        PackageType?: 'Image' | 'Zip'
-        Architectures?: ('x86_64' | 'arm64')[]
-        [key: string]: any
-    }
-
-    export interface ZipResourceProperties extends LambdaResourceProperties {
-        Handler: string | Ref
-        CodeUri: string | Ref
-        Runtime?: string | Ref
-        PackageType?: 'Zip'
-    }
-
-    export interface ImageResourceProperties extends LambdaResourceProperties {
-        PackageType: 'Image'
-        ImageConfig?: ImageConfig
-    }
-
-    export interface ImageConfig {
-        EntryPoint?: string[]
-        Command?: string[]
-        WorkingDirectory?: string
-    }
-
-    export interface Ref {
-        Ref: string
-    }
-
-    export interface Environment {
-        Variables?: Variables
-    }
-
-    export interface ApiEventProperties {
-        Path?: string
-        Method?: 'delete' | 'get' | 'head' | 'options' | 'patch' | 'post' | 'put' | 'any'
-        Payload?: {
-            json?: {
-                [k: string]: string | number | boolean
-            }
-        }
-    }
-
-    export interface Event {
-        Type?: 'Api' | 'HttpApi'
-        Properties?: ApiEventProperties
-    }
-
-    export interface Events {
-        [key: string]: Event
-    }
-
-    export interface Variables {
-        [key: string]: any
-    }
-
-    export type ResourceType =
-        | typeof LAMBDA_FUNCTION_TYPE
-        | typeof SERVERLESS_FUNCTION_TYPE
-        | typeof SERVERLESS_API_TYPE
-        | string
-
-    export interface Resource {
-        Type: ResourceType
-        Properties?: ZipResourceProperties | ImageResourceProperties
-        Metadata?: SamImageMetadata
-        // Any other properties are fine to have, we just copy them transparently
-        [key: string]: any
-    }
-
-    export interface SamImageMetadata {
-        Dockerfile: string
-        DockerContext: string
-        // we only care about the two above, but really anything can go here
-        [key: string]: any
-    }
-
-    // TODO: Can we automatically detect changes to the CFN spec and apply them here?
-    // https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/parameters-section-structure.html#parameters-section-structure-properties
-    export type ParameterType =
-        | 'String'
-        | 'Number'
-        | 'List<Number>'
-        | 'CommaDelimitedList'
-        | AWSSpecificParameterType
-        | SSMParameterType
-
-    type ThingType = 'number' | 'string' | 'array'
-    const samParamArrayTypes = ['List<Number>', 'CommaDelimitedList']
-
-    // https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/parameters-section-structure.html#aws-specific-parameter-types
-    type AWSSpecificParameterType =
-        | 'AWS::EC2::AvailabilityZone::Name'
-        | 'AWS::EC2::Image::Id'
-        | 'AWS::EC2::KeyPair::KeyName'
-        | 'AWS::EC2::SecurityGroup::GroupName'
-        | 'AWS::EC2::SecurityGroup::Id'
-        | 'AWS::EC2::Subnet::Id'
-        | 'AWS::EC2::Volume::Id'
-        | 'AWS::EC2::VPC::Id'
-        | 'AWS::Route53::HostedZone::Id'
-        | 'List<AWS::EC2::AvailabilityZone::Name>'
-        | 'List<AWS::EC2::Image::Id>'
-        | 'List<AWS::EC2::Instance::Id>'
-        | 'List<AWS::EC2::SecurityGroup::GroupName>'
-        | 'List<AWS::EC2::SecurityGroup::Id>'
-        | 'List<AWS::EC2::Subnet::Id>'
-        | 'List<AWS::EC2::Volume::Id>'
-        | 'List<AWS::EC2::VPC::Id>'
-        | 'List<AWS::Route53::HostedZone::Id>'
-
-    // https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/parameters-section-structure.html#aws-ssm-parameter-types
-    type SSMParameterType =
-        | 'AWS::SSM::Parameter::Name'
-        | 'AWS::SSM::Parameter::Value<String>'
-        | 'AWS::SSM::Parameter::Value<List<String>>'
-        | 'AWS::SSM::Parameter::Value<CommaDelimitedList>'
-        | 'AWS::SSM::Parameter::Value<AWS::EC2::AvailabilityZone::Name>'
-        | 'AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>'
-        | 'AWS::SSM::Parameter::Value<AWS::EC2::KeyPair::KeyName>'
-        | 'AWS::SSM::Parameter::ValueAWS::EC2::SecurityGroup::GroupName<>'
-        | 'AWS::SSM::Parameter::Value<AWS::EC2::SecurityGroup::Id>'
-        | 'AWS::SSM::Parameter::Value<AWS::EC2::Subnet::Id>'
-        | 'AWS::SSM::Parameter::Value<AWS::EC2::Volume::Id>'
-        | 'AWS::SSM::Parameter::Value<AWS::EC2::VPC::Id>'
-        | 'AWS::SSM::Parameter::Value<AWS::Route53::HostedZone::Id>'
-        | 'AWS::SSM::Parameter::Value<List<AWS::EC2::AvailabilityZone::Name>>'
-        | 'AWS::SSM::Parameter::Value<List<AWS::EC2::Image::Id>>'
-        | 'AWS::SSM::Parameter::Value<List<AWS::EC2::KeyPair::KeyName>>'
-        | 'AWS::SSM::Parameter::Value<List<AWS::EC2::SecurityGroup::GroupName>>'
-        | 'AWS::SSM::Parameter::Value<List<AWS::EC2::SecurityGroup::Id>>'
-        | 'AWS::SSM::Parameter::Value<List<AWS::EC2::Subnet::Id>>'
-        | 'AWS::SSM::Parameter::Value<List<AWS::EC2::Volume::Id>>'
-        | 'AWS::SSM::Parameter::Value<List<AWS::EC2::VPC::Id>>'
-        | 'AWS::SSM::Parameter::Value<List<AWS::Route53::HostedZone::Id>>'
-
-    export interface Parameter {
-        Type: ParameterType
-        AllowedPattern?: string
-        AllowValues?: string[]
-        ConstraintDescription?: string
-        Default?: any
-        Description?: string
-        MaxLength?: number
-        MaxValue?: number
-        MinLength?: number
-        MinValue?: number
-        NoEcho?: boolean
-    }
-
-    export interface Template {
-        AWSTemplateFormatVersion?: string
-
-        Transform?: { properties: any } | string
-
-        Parameters?: {
-            [key: string]: Parameter | undefined
-        }
-
-        Globals?: TemplateGlobals
-
-        Resources?: TemplateResources
-    }
-
-    // Globals section of the template. Provides default values for functions, APIs, HTTP APIs, and SimpleTables.
-    // https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-specification-template-anatomy-globals.html#sam-specification-template-anatomy-globals-supported-resources-and-properties
-    export interface TemplateGlobals {
-        Function?: FunctionGlobals
-        Api?: ApiGlobals
-        HttpApi?: HttpApiGlobals
-        SimpleTable?: SimpleTableGlobals
-    }
-
-    type GlobalType = string | number | Record<string, unknown> | string[] | undefined
-
-    type FunctionKeys =
-        | 'Handler'
-        | 'Runtime'
-        | 'CodeUri'
-        | 'DeadLetterQueue'
-        | 'Description'
-        | 'MemorySize'
-        | 'Timeout'
-        | 'VpcConfig'
-        | 'Environment'
-        | 'Tags'
-        | 'Tracing'
-        | 'KmsKeyArn'
-        | 'Layers'
-        | 'AutoPublishAlias'
-        | 'DeploymentPreference'
-        | 'PermissionsBoundary'
-        | 'ReservedConcurrentExecutions'
-        | 'EventInvokeConfig'
-    const functionKeysSet: Set<string> = new Set([
-        'Handler',
-        'Runtime',
-        'CodeUri',
-        'DeadLetterQueue',
-        'Description',
-        'MemorySize',
-        'Timeout',
-        'VpcConfig',
-        'Environment',
-        'Tags',
-        'Tracing',
-        'KmsKeyArn',
-        'Layers',
-        'AutoPublishAlias',
-        'DeploymentPreference',
-        'PermissionsBoundary',
-        'ReservedConcurrentExecutions',
-        'EventInvokeConfig',
-    ])
-    type FunctionGlobals = {
-        [key in FunctionKeys]?: GlobalType
-    }
-
-    type ApiKeys =
-        | 'Auth'
-        | 'Name'
-        | 'DefinitionUri'
-        | 'CacheClusterEnabled'
-        | 'CacheClusterSize'
-        | 'Variables'
-        | 'EndpointConfiguration'
-        | 'MethodSettings'
-        | 'BinaryMediaTypes'
-        | 'MinimumCompressionSize'
-        | 'Cors'
-        | 'GatewayResponses'
-        | 'AccessLogSetting'
-        | 'CanarySetting'
-        | 'TracingEnabled'
-        | 'OpenApiVersion'
-        | 'Domain'
-    const apiKeysSet: Set<string> = new Set([
-        'Auth',
-        'Name',
-        'DefinitionUri',
-        'CacheClusterEnabled',
-        'CacheClusterSize',
-        'Variables',
-        'EndpointConfiguration',
-        'MethodSettings',
-        'BinaryMediaTypes',
-        'MinimumCompressionSize',
-        'Cors',
-        'GatewayResponses',
-        'AccessLogSetting',
-        'CanarySetting',
-        'TracingEnabled',
-        'OpenApiVersion',
-        'Domain',
-    ])
-    type ApiGlobals = {
-        [key in ApiKeys]?: GlobalType
-    }
-
-    type HttpApiKeys =
-        | 'Auth'
-        | 'CorsConfiguration'
-        | 'AccessLogSettings'
-        | 'Tags'
-        | 'DefaultRouteSettings'
-        | 'RouteSettings'
-        | 'Domain'
-    const HttpApiKeysSet: Set<string> = new Set([
-        'Auth',
-        'CorsConfiguration',
-        'AccessLogSettings',
-        'Tags',
-        'DefaultRouteSettings',
-        'RouteSettings',
-        'Domain',
-    ])
-    type HttpApiGlobals = {
-        [key in HttpApiKeys]?: GlobalType
-    }
-
-    type SimpleTableKeys = 'SSESpecification'
-    const simpleTableKeysSet: Set<string> = new Set(['SSESpecification'])
-    type SimpleTableGlobals = {
-        [key in SimpleTableKeys]?: GlobalType
-    }
-
-    function globalPropForKey(key: string): keyof TemplateGlobals | undefined {
-        if (functionKeysSet.has(key)) {
-            return 'Function'
-        } else if (apiKeysSet.has(key)) {
-            return 'Api'
-        } else if (HttpApiKeysSet.has(key)) {
-            return 'HttpApi'
-        } else if (simpleTableKeysSet.has(key)) {
-            return 'SimpleTable'
-        } else {
-            return undefined
-        }
-    }
-
-    export interface TemplateResources {
-        [key: string]: Resource | undefined
-    }
-
-    export async function load(filename: string, validate: boolean = true): Promise<Template> {
-        if (!(await SystemUtilities.fileExists(filename))) {
-            throw new Error(`Template file not found: ${filename}`)
-        }
-
-        const templateAsYaml: string = await filesystemUtilities.readFileAsString(filename)
-        return loadByContents(templateAsYaml, validate)
-    }
-
-    export async function loadByContents(contents: string, validate: boolean = true): Promise<Template> {
-        const template = yaml.load(contents, {
-            schema: schema as any,
-        }) as Template
-
-        if (validate) {
-            validateTemplate(template)
-        }
-        return template
-    }
-
-    export async function save(template: Template, filename: string): Promise<void> {
-        const templateAsYaml: string = yaml.dump(template)
-
-        await writeFile(filename, templateAsYaml, 'utf8')
-    }
-
-    export function validateTemplate(template: Template): void {
-        if (!template.Resources) {
-            return
-        }
-
-        const lambdaResources = Object.getOwnPropertyNames(template.Resources)
-            .map(key => template.Resources![key]!)
-            .filter(resource => resource.Type === SERVERLESS_FUNCTION_TYPE)
-            .map(resource => resource as Resource)
-
-        if (lambdaResources.length <= 0) {
-            throw new Error('Template does not contain any Lambda resources')
-        }
-
-        for (const lambdaResource of lambdaResources) {
-            validateResource(lambdaResource, template)
-        }
-    }
-
-    /**
-     * Validates whether or not a property is an expected type.
-     * This takes refs into account but doesn't account for value; just whether or not the type is correct.
-     * @param resource
-     * @param template
-     */
-    export function validateResource(resource: Resource, template: Template): void {
-        if (!resource.Type) {
-            throw new Error('Missing or invalid value in Template for key: Type')
-        }
-        if (resource.Properties) {
-            if (resource.Properties.PackageType === lambdaPackageTypeImage) {
-                if (!validatePropertyType(resource.Metadata, 'Dockerfile', template, 'string')) {
-                    throw new Error('Missing or invalid value in Template for key: Metadata.Dockerfile')
-                }
-                if (!validatePropertyType(resource.Metadata, 'DockerContext', template, 'string')) {
-                    throw new Error('Missing or invalid value in Template for key: Metadata.DockerContext')
-                }
-            } else {
-                if (!validatePropertyType(resource.Properties, 'Handler', template, 'string')) {
-                    throw new Error('Missing or invalid value in Template for key: Handler')
-                }
-                if (!resource.Properties.CodeUri) {
-                    // Missing codeUri is allowed, (SAM pulls from the handler instead). Set as empty string.
-                    resource.Properties.CodeUri = ''
-                } else if (!validatePropertyType(resource.Properties, 'CodeUri', template, 'string')) {
-                    throw new Error('Invalid value in Template for key: CodeUri')
-                }
-                if (
-                    !!resource.Properties.Runtime &&
-                    !validatePropertyType(resource.Properties, 'Runtime', template, 'string')
-                ) {
-                    throw new Error('Invalid value in Template for key: Runtime')
-                }
-            }
-
-            if (
-                !!resource.Properties.Timeout &&
-                !validatePropertyType(resource.Properties, 'Timeout', template, 'number')
-            ) {
-                throw new Error('Invalid value in Template for key: Timeout')
-            }
-        }
-    }
-
-    export async function getResourceFromTemplate(
-        {
-            templatePath,
-            handlerName,
-        }: {
-            templatePath: string
-            handlerName: string
-        },
-        context: { loadTemplate: typeof load } = { loadTemplate: load }
-    ): Promise<Resource> {
-        const template = await context.loadTemplate(templatePath)
-
-        return getResourceFromTemplateResources({
-            templateResources: template.Resources,
-            handlerName,
-        })
-    }
-
-    export async function getResourceFromTemplateResources(params: {
-        templateResources?: TemplateResources
-        handlerName: string
-    }): Promise<Resource> {
-        const resources = params.templateResources || {}
-
-        const matches = Object.keys(resources)
-            .filter(key =>
-                matchesHandler({
-                    resource: resources[key],
-                    handlerName: params.handlerName,
-                })
-            )
-            .map(key => resources[key]!)
-
-        if (matches.length < 1) {
-            throw new Error(`Could not find a SAM resource for handler ${params.handlerName}`)
-        }
-
-        if (matches.length > 1) {
-            // TODO: Is this a valid scenario?
-            throw new Error(`Found more than one SAM resource for handler ${params.handlerName}`)
-        }
-
-        return matches[0]
-    }
-
-    function matchesHandler({ resource, handlerName }: { resource?: Resource; handlerName: string }) {
-        return (
-            resource &&
-            resource.Type === SERVERLESS_FUNCTION_TYPE &&
-            isZipLambdaResource(resource.Properties) &&
-            // TODO: `resource.Properties.Handler` is relative to `CodeUri`, but
-            //       `handlerName` is relative to the directory containing the source
-            //       file. To fix, update lambda handler candidate searches for
-            //       interpreted languages to return a handler name relative to the
-            //       `CodeUri`, rather than to the directory containing the source file.
-            resource.Properties.Handler === handlerName
-        )
-    }
-
-    /**
-     * Parameter/Ref helper functions
-     */
-
-    /**
-     * Validates whether or not a property is a valid ref.
-     * @param property Property to validate
-     */
-    function isRef(property: unknown): boolean {
-        return (
-            typeof property === 'object' &&
-            Object.keys(property!).length === 1 &&
-            Object.keys(property!).includes('Ref')
-        )
-    }
-
-    /**
-     * Gets the string value for a property in a template.
-     * If the value is a Ref to a parameter, returns the default value of the ref; this may be undefined.
-     * If the value is not defined in the `targetObj` (`undefined` Ref counts as a definition), will attempt to find a value in Globals.
-     * Returns undefined if the value is not found in `targetObj` or `Globals`.
-     * @param targetObj Object containing a key to check
-     * @param key Key to look up in `targetObj`. If not present in `targetObj`, will fall back to a value in `Globals`.
-     * @param template Full template object. Required for `Ref` and `Globals` lookup.
-     */
-    export function getStringForProperty(
-        targetObj: { [key: string]: GlobalType } | undefined,
-        key: string,
-        template: Template
-    ): string | undefined {
-        return getThingForProperty(targetObj, key, template, 'string') as string | undefined
-    }
-
-    /**
-     * Gets the numeric value for a property in a template.
-     * If the value is a Ref to a parameter, returns the default value of the ref; this may be undefined.
-     * If the value is not defined in the `targetObj` (`undefined` Ref counts as a definition), will attempt to find a value in Globals.
-     * Returns undefined if the value is not found in `targetObj` or `Globals`.
-     * @param targetObj Object containing a key to check
-     * @param key Key to look up in `targetObj`. If not present in `targetObj`, will fall back to a value in `Globals`.
-     * @param template Full template object. Required for `Ref` and `Globals` lookup.
-     */
-    export function getNumberForProperty(
-        targetObj: { [key: string]: string | number | Record<string, unknown> | undefined } | undefined,
-        key: string,
-        template: Template
-    ): number | undefined {
-        return getThingForProperty(targetObj, key, template, 'number') as number | undefined
-    }
-
-    /**
-     * Gets the array value for a property in a template.
-     * As per [the SAM documentation](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/parameters-section-structure.html#parameters-section-structure-properties-type) ,
-     *    this will **always** be a string array.
-     *
-     * TODO: [lists in Globals are **additive** with other fields](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-specification-template-anatomy-globals.html#sam-specification-template-anatomy-globals-overrideable-lists)
-     *
-     * If the value is a Ref to a parameter, returns the default value of the ref; this may be undefined.
-     * If the value is not defined in the `targetObj` (`undefined` Ref counts as a definition), will attempt to find a value in Globals.
-     * Returns undefined if the value is not found in `targetObj` or `Globals`.
-     * @param targetObj Object containing a key to check
-     * @param key Key to look up in `targetObj`. If not present in `targetObj`, will fall back to a value in `Globals`.
-     * @param template Full template object. Required for `Ref` and `Globals` lookup.
-     */
-    export function getArrayForProperty(
-        targetObj: { [key: string]: string | number | Record<string, unknown> | undefined } | undefined,
-        key: string,
-        template: Template
-    ): string[] | undefined {
-        return getThingForProperty(targetObj, key, template, 'array') as string[] | undefined
-    }
-
-    /**
-     * Returns the "thing" that represents the property within `targetObj` or `Globals`:
-     * * string if a string is requested and (the property is a string or if the property is a ref that is not a Number and has a default value)
-     * * number if a number is requested and (the property is a number or if the property is a ref that is Number and has a default value)
-     * * undefined in all other cases
-     *
-     * Ultimately it is up to the caller to ensure the type matches but this should do a more-than-reasonable job.
-     * @param targetObj Object containing a key to check
-     * @param key Key to look up in `targetObj`. If not present in `targetObj`, will fall back to a value in `Globals`.
-     * @param template Full template object. Required for `Ref` and `Globals` lookup.
-     * @param type Type to validate the property's type against
-     * @param globalLookup Whether or not this is currently looking at `Globals` fields. Internal for recursion prevention.
-     */
-    function getThingForProperty(
-        targetObj: { [key: string]: GlobalType } | undefined,
-        key: string,
-        template: Template,
-        type: ThingType,
-        globalLookup?: boolean
-    ): string | number | string[] | undefined {
-        if (!targetObj) {
-            return undefined
-        }
-        const property: unknown = targetObj[key]
-        if (validatePropertyType(targetObj, key, template, type)) {
-            if (typeof property !== 'object' && typeof property === type) {
-                return property as 'string' | 'number'
-            } else if (Array.isArray(property)) {
-                return property as string[]
-            } else if (isRef(property)) {
-                try {
-                    const forcedProperty = property as Ref
-                    return getReffedThing(forcedProperty, template, type)
-                } catch (err) {
-                    getLogger().debug(err as Error)
-                }
-            }
-        }
-
-        // only look if we're not already looking at globals
-        if (!globalLookup) {
-            const globalProp = globalPropForKey(key)
-
-            if (globalProp && template.Globals && template.Globals[globalProp]) {
-                return getThingForProperty(template.Globals![globalProp], key, template, type, true)
-            }
-        }
-
-        return undefined
-    }
-
-    /**
-     * Returns whether or not a property or its underlying ref matches the specified type
-     * Checks `targetObj` and `Globals` in that priority order. Will fail if `targetObj` is not valid but `Globals` is.
-     * Does not validate a default value for a template parameter; just checks the value's type
-     * @param targetObj Object containing a key to check
-     * @param key Key to look up in `targetObj`. If not present in `targetObj`, will fall back to a value in `Globals`.
-     * @param template Full template object. Required for `Ref` and `Globals` lookup.
-     * @param type Type to validate the property's type against
-     * @param globalLookup Whether or not this is currently looking at `Globals` fields. Internal for recursion prevention.
-     */
-    function validatePropertyType(
-        targetObj: { [key: string]: GlobalType } | undefined,
-        key: string,
-        template: Template,
-        type: ThingType,
-        globalLookup?: boolean
-    ): boolean {
-        if (!targetObj) {
-            return false
-        }
-        const property: unknown = targetObj[key]
-        if (typeof property === type || (type === 'array' && Array.isArray(property))) {
-            return true
-        } else if (isRef(property)) {
-            // property has a Ref, force it to abide by that shape
-            const forcedProperty = property as Ref
-            const param = getReffedParam(forcedProperty, template)
-            switch (type) {
-                case 'number':
-                    return param.Type === 'Number'
-                // TODO: gate this on "string" type specifically?
-                case 'string':
-                    return param.Type !== 'Number'
-                case 'array':
-                    return samParamArrayTypes.includes(param.Type)
-            }
-        }
-
-        // only look if we're not already looking at globals
-        if (!globalLookup) {
-            const globalProp = globalPropForKey(key)
-
-            if (globalProp && template.Globals && template.Globals[globalProp]) {
-                return validatePropertyType(template.Globals![globalProp], key, template, type, true)
-            }
-        }
-
-        return false
-    }
-
-    /**
-     * Gets a value (string or number) from a Ref.
-     *
-     * If `thingType == number`...
-     * - it is an error if the resolved value is not a number.
-     * - returns undefined if the Ref does not have a default value but is
-     *   a number.
-     *
-     * @param ref Ref to pull a value from
-     * @param template Template to parse through
-     * @param thingType Type to validate against
-     */
-    function getReffedThing(
-        ref: Ref,
-        template: Template,
-        thingType: ThingType
-    ): number | string | string[] | undefined {
-        const param = getReffedParam(ref, template)
-        // every other type, including List<Number>, is formatted as a string.
-        if (
-            (thingType === 'number' && param.Type === 'Number') ||
-            (thingType === 'string' && param.Type !== 'Number') ||
-            (thingType === 'array' && samParamArrayTypes.includes(param.Type))
-        ) {
-            if (param.Default && (thingType === 'array' ? 'string' : thingType) !== typeof param.Default) {
-                throw new Error(`Default value for Parameter "${ref.Ref}" is not a ${thingType}`)
-            }
-
-            // attempt to convert to str array if array
-            // returns undefined if no default value is present
-            return param.Default && thingType === 'array' ? param.Default.toString().split(',') : param.Default
-        }
-
-        throw new Error(`Parameter ${ref.Ref} is not a ${thingType}`)
-    }
-
-    /**
-     * Given a Ref, pulls the CFN Parameter that the Ref is reffing.
-     * Throws an error if reffed param isn't found.
-     * @param ref Ref containing a reference to a parameter
-     * @param template Template to parse through
-     */
-    function getReffedParam(ref: Ref, template: Template): Parameter {
-        const refParam = ref.Ref
-        const params = template.Parameters
-
-        if (params && Object.keys(params).includes(refParam)) {
-            return params[refParam]!
-        }
-
-        throw new Error(`Parameter not found in template: ${refParam}`)
-    }
-
-    /**
-     * Resolves a value against a list of overrides. Resolution occurs in this order:
-     * * property is not an object = return raw val (possibly undefined)
-     * * property is a Ref object
-     *   * ...with an override = return overridden val
-     *   * ...without an override = return default val (possibly undefined)
-     * * property is a generic object = return undefined
-     * @param property Property to evaluate
-     * @param template Template to parse through
-     * @param overrides Object containing override values
-     */
-    export function resolvePropertyWithOverrides(
-        property: unknown,
-        template: Template,
-        overrides: {
-            [k: string]: string | number
-        } = {}
-    ): string | number | undefined {
-        if (typeof property !== 'object') {
-            return property as string | number | undefined
-        }
-        if (isRef(property)) {
-            try {
-                // property has a Ref, force it to abide by that shape
-                const forcedProperty = property as Ref
-                const refParam = forcedProperty.Ref
-                const param = getReffedParam(forcedProperty, template)
-                if (param) {
-                    // check overrides first--those take precedent
-                    if (Object.keys(overrides).includes(refParam)) {
-                        return param.Type === 'Number'
-                            ? (overrides[refParam] as number)
-                            : (overrides[refParam] as string)
-                    }
-
-                    // return default val. This can be undefined.
-                    return param.Default
-                        ? param.Type === 'Number'
-                            ? (param.Default as number)
-                            : (param.Default as string)
-                        : undefined
-                }
-            } catch (err) {
-                getLogger().debug(err as Error)
-            }
-        }
-
-        return undefined
-    }
-
-    /**
-     * Removes characters disallowed in CFN/SAM logical resource ids.
-     *
-     * Example: "/a/b/c/foo-Bar!_baz{9)=+" => "abcfooBarbaz9"
-     *
-     * Reference: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/resources-section-structure.html
-     * > The logical ID must be alphanumeric (A-Za-z0-9) and unique within the template
-     *
-     * @param filename Filename
-     * @returns  Resource id derived from the input.
-     */
-    export function makeResourceId(s: string) {
-        return s.replace(/[^A-Za-z0-9]/g, '')
-    }
-}
-
-/**
- * Creates a starter YAML template file.
- * @param isSam: Create a SAM template instead of a CFN template
- */
-export async function createStarterTemplateFile(isSam?: boolean, window: Window = Window.vscode()): Promise<void> {
-    const content = createStarterTemplateYaml(isSam)
-    const wsFolder = vscode.workspace.workspaceFolders
-    const loc = await window.showSaveDialog({
-        filters: { YAML: ['yaml'] },
-        defaultUri: wsFolder && wsFolder[0] ? wsFolder[0].uri : undefined,
-    })
-    if (loc) {
-        fs.writeFileSync(loc.fsPath, content)
-        await vscode.commands.executeCommand('vscode.open', loc)
-    }
-}
-
-/**
- * Creates a boilerplate CFN or SAM template that is complete enough to be picked up for JSON schema assignment
- * TODO: Remove `isCloud9` when Cloud9 gets YAML code completion
- * @param isSam Create a SAM or CFN template
- */
-function createStarterTemplateYaml(isSam?: boolean): string {
-    return `AWSTemplateFormatVersion: '2010-09-09'
-${isSam ? 'Transform: AWS::Serverless-2016-10-31\n' : ''}
-Description: <your stack description here>
-${isCloud9() ? '' : '\n# Available top-level fields are listed in code completion\n'}
-# Add Resources Here: uncomment the following lines
-# Resources:
-#   <resource name here>:
-#     Type: # resource type here${isCloud9() ? '' : ' - available resources are listed in code completion'}
-#     # <add resource-specific properties underneath this entry ${
-        isCloud9() ? '' : ' - available properties are listed in code completion'
-    }>
-#     Properties:
-`
-}
diff --git a/src/shared/constants.ts b/src/shared/constants.ts
deleted file mode 100644
index 818cb10afef..00000000000
--- a/src/shared/constants.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-/*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { isCloud9 } from './extensionUtilities'
-
-export const extensionSettingsPrefix = 'aws'
-export const regionSettingKey = 'region'
-export const profileSettingKey = 'profile'
-export const productName: string = 'aws-toolkit-vscode'
-
-export const hostedFilesBaseUrl: string = 'https://d3rrggjwfhwld2.cloudfront.net/'
-export const endpointsFileUrl: string = 'https://idetoolkits.amazonwebservices.com/endpoints.json'
-export const aboutCredentialsFileUrl: string =
-    'https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html'
-export const samAboutInstallUrl: string = 'https://aws.amazon.com/serverless/sam/'
-export const vscodeMarketplaceUrl: string =
-    'https://marketplace.visualstudio.com/items?itemName=AmazonWebServices.aws-toolkit-vscode'
-export const githubUrl: string = 'https://github.com/aws/aws-toolkit-vscode'
-export const githubCreateIssueUrl = `${githubUrl}/issues/new/choose`
-export const documentationUrl: string = isCloud9()
-    ? 'https://docs.aws.amazon.com/cloud9/latest/user-guide/toolkit-welcome.html'
-    : 'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/welcome.html'
-/**
- * General help page to help users understand the different ways of connecting to AWS (AWS ID, IAM credentials, SSO).
- *
- * - alternative?: codecatalyst/latest/userguide/sign-up-create-resources.html
- */
-export const authHelpUrl = 'https://docs.aws.amazon.com/general/latest/gr/differences-aws_builder_id.html'
-export const credentialHelpUrl: string =
-    'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/setup-credentials.html'
-export const ssoCredentialsHelpUrl: string =
-    'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/sso-credentials.html'
-
-export const supportedLambdaRuntimesUrl: string =
-    'https://docs.aws.amazon.com/lambda/latest/dg/runtime-support-policy.html'
-export const createUrlForLambdaFunctionUrl = 'https://docs.aws.amazon.com/lambda/latest/dg/urls-configuration.html'
-// URLs for samInitWizard
-export const samInitDocUrl: string = isCloud9()
-    ? 'https://docs.aws.amazon.com/cloud9/latest/user-guide/serverless-apps-toolkit.html#sam-create'
-    : 'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/serverless-apps.html#serverless-apps-create'
-export const launchConfigDocUrl: string = isCloud9()
-    ? 'https://docs.aws.amazon.com/cloud9/latest/user-guide/sam-debug-config-ref.html'
-    : 'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/serverless-apps-run-debug-config-ref.html'
-// URLs for samDeployWizard
-export const samDeployDocUrl: string = isCloud9()
-    ? 'https://docs.aws.amazon.com/cloud9/latest/user-guide/serverless-apps-toolkit.html#deploy-serverless-app'
-    : 'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/serverless-apps.html#serverless-apps-deploy'
-export const lambdaFunctionUrlConfigUrl: string = 'https://docs.aws.amazon.com/lambda/latest/dg/urls-configuration.html'
-
-// URLs for CDK
-export const cdkProvideFeedbackUrl: string = `${githubUrl}/issues/new/choose`
-export const cdkDocumentationUrl: string = 'https://docs.aws.amazon.com/console/toolkit-for-vscode/aws-cdk-apps'
-
-// TODO : Add valid URL to be accessed from help button in the downloadCodeBindings wizard
-export const eventBridgeSchemasDocUrl: string =
-    'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/eventbridge-schemas.html'
-
-// URLs for Step Functions
-export const sfnCreateIamRoleUrl: string =
-    'https://docs.aws.amazon.com/step-functions/latest/dg/procedure-create-iam-role.html'
-export const sfnCreateStateMachineUrl: string =
-    'https://docs.aws.amazon.com/step-functions/latest/apireference/API_CreateStateMachine.html'
-export const sfnCreateStateMachineNameParamUrl: string =
-    'https://docs.aws.amazon.com/step-functions/latest/apireference/API_CreateStateMachine.html#StepFunctions-CreateStateMachine-request-name'
-export const sfnDeveloperGuideUrl: string = 'https://docs.aws.amazon.com/step-functions/latest/dg/welcome.html'
-export const sfnUpdateStateMachineUrl: string =
-    'https://docs.aws.amazon.com/step-functions/latest/apireference/API_UpdateStateMachine.html'
-export const sfnSupportedRegionsUrl: string =
-    'https://docs.aws.amazon.com/step-functions/latest/dg/welcome.html#supported-regions'
-
-// URLs for SSM Documents
-export const ssmDocumentPublishGuideUrl: string =
-    'https://docs.aws.amazon.com/systems-manager/latest/userguide/create-ssm-doc.html'
-export const ssmJson: string = 'ssm-json'
-export const ssmYaml: string = 'ssm-yaml'
-
-// URL for post-Create SAM App
-export const debugNewSamAppUrl: string = isCloud9()
-    ? 'https://docs.aws.amazon.com/cloud9/latest/user-guide/serverless-apps-toolkit.html#sam-run-debug'
-    : 'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/serverless-apps.html#serverless-apps-debug'
-
-// URLs for ECS Exec
-export const ecsDocumentationUrl: string = 'https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-exec.html'
-export const ecsExecToolkitGuideUrl: string =
-    'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/ecs-exec.html'
-export const ecsRequiredTaskPermissionsUrl: string =
-    'https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-exec.html#ecs-exec-enabling-and-using'
-export const ecsRequiredIamPermissionsUrl: string =
-    'https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-exec.html#ecs-exec-best-practices-limit-access-execute-command'
-
-/**
- * Moment format for rendering readable dates.
- *
- * Same format used in the S3 console, but it's also locale-aware.
- *
- * US: Jan 5, 2020 5:30:20 PM GMT-0700
- * GB: 5 Jan 2020 17:30:20 GMT+0100
- */
-export const LOCALIZED_DATE_FORMAT = 'll LTS [GMT]ZZ' // eslint-disable-line @typescript-eslint/naming-convention
-
-// moment().format() matches Insights console timestamp, e.g.: 2019-03-04T11:40:08.781-08:00
-// TODO: Do we want this this verbose? Log stream just shows HH:mm:ss
-export const INSIGHTS_TIMESTAMP_FORMAT = 'YYYY-MM-DDTHH:mm:ss.SSSZ' // eslint-disable-line @typescript-eslint/naming-convention
-
-/**
- * URI scheme for CloudWatch Logs Virtual Documents
- */
-export const CLOUDWATCH_LOGS_SCHEME = 'awsCloudWatchLogs' // eslint-disable-line @typescript-eslint/naming-convention
-export const AWS_SCHEME = 'aws' // eslint-disable-line @typescript-eslint/naming-convention
-
-export const lambdaPackageTypeImage = 'Image'
-
-// URLs for App Runner
-export const apprunnerConnectionHelpUrl =
-    'https://docs.aws.amazon.com/apprunner/latest/dg/manage-create.html#manage-create.create.github'
-export const apprunnerConfigHelpUrl = 'https://docs.aws.amazon.com/apprunner/latest/dg/manage-configure.html'
-export const apprunnerRuntimeHelpUrl = 'https://docs.aws.amazon.com/apprunner/latest/dg/service-source-code.html'
-export const apprunnerPricingUrl = 'https://aws.amazon.com/apprunner/pricing/'
-export const apprunnerCreateServiceDocsUrl: string = isCloud9()
-    ? 'https://docs.aws.amazon.com/cloud9/latest/user-guide/creating-service-apprunner.html'
-    : 'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/creating-service-apprunner.html'
-
-// URLs for S3
-// TODO: update docs to add the file viewer feature
-export const s3FileViewerHelpUrl = 'https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/s3.html'
diff --git a/src/shared/credentials/credentialsFile.ts b/src/shared/credentials/credentialsFile.ts
deleted file mode 100644
index 0c903f4d86e..00000000000
--- a/src/shared/credentials/credentialsFile.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { SystemUtilities } from '../systemUtilities'
-
-export interface SharedConfigPaths {
-    /**
-     * The path at which to locate the ini credentials file. No data will be read if not provided.
-     */
-    credentials?: vscode.Uri
-
-    /**
-     * The path at which to locate the ini config file. No data will be read if not provided.
-     */
-    config?: vscode.Uri
-}
-
-export interface Profile {
-    [key: string]: string | undefined
-}
-
-export interface ParsedIniData {
-    [key: string]: Profile | undefined
-}
-
-export interface SharedConfigFiles {
-    credentialsFile: ParsedIniData
-    configFile: ParsedIniData
-}
-
-export async function loadSharedConfigFiles(init: SharedConfigPaths = {}): Promise<SharedConfigFiles> {
-    const [configFile, credentialsFile] = await Promise.all([
-        loadConfigFile(init.config),
-        loadCredentialsFile(init.credentials),
-    ])
-
-    return {
-        credentialsFile,
-        configFile,
-    }
-}
-
-async function loadConfigFile(configUri?: vscode.Uri): Promise<ParsedIniData> {
-    if (!configUri || !(await SystemUtilities.fileExists(configUri))) {
-        return {}
-    }
-
-    return normalizeConfigFile(parseIni(await SystemUtilities.readFile(configUri)))
-}
-
-async function loadCredentialsFile(credentialsUri?: vscode.Uri): Promise<ParsedIniData> {
-    if (!credentialsUri || !(await SystemUtilities.fileExists(credentialsUri))) {
-        return {}
-    }
-
-    return parseIni(await SystemUtilities.readFile(credentialsUri))
-}
-
-const profileKeyRegex = /^profile\s(["'])?([^\1]+)\1$/
-function normalizeConfigFile(data: ParsedIniData): ParsedIniData {
-    const map: ParsedIniData = {}
-    for (const key of Object.keys(data)) {
-        if (key === 'default') {
-            map.default = data.default
-        } else {
-            const matches = profileKeyRegex.exec(key)
-            if (matches) {
-                const normalizedKey = matches[2]
-                if (normalizedKey) {
-                    map[normalizedKey] = data[key]
-                }
-            }
-        }
-    }
-
-    return map
-}
-
-function parseIni(iniData: string): ParsedIniData {
-    const map: ParsedIniData = {}
-    let currentSection: string | undefined
-    for (let line of iniData.split(/\r?\n/)) {
-        line = line.split(/(^|\s)[;#]/)[0] // remove comments
-        const section = line.match(/^\s*\[([^\[\]]+)]\s*$/)
-        if (section) {
-            currentSection = section[1]
-        } else if (currentSection) {
-            const item = line.match(/^\s*(.+?)\s*=\s*(.+?)\s*$/)
-            if (item) {
-                const profile = (map[currentSection] ??= {})
-                profile[item[1].toLowerCase()] = item[2]
-            }
-        }
-    }
-
-    return map
-}
diff --git a/src/shared/credentials/credentialsProfileMru.ts b/src/shared/credentials/credentialsProfileMru.ts
deleted file mode 100644
index d6133e9a4f7..00000000000
--- a/src/shared/credentials/credentialsProfileMru.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-
-/**
- * Tracks the credentials selected by the user, ordered by most recent.
- */
-export class CredentialsProfileMru {
-    public static readonly maxCredentialMruSize = 5
-
-    private static readonly configurationStateName: string = 'recentCredentials'
-
-    public constructor(private readonly _context: vscode.ExtensionContext) {}
-
-    /**
-     * @description Returns the most recently used credentials names
-     */
-    public getMruList(): string[] {
-        return this._context.globalState.get<string[]>(CredentialsProfileMru.configurationStateName, [])
-    }
-
-    /**
-     * @description Places a credential at the top of the MRU list
-     * @param profileName The credentials most recently used
-     */
-    public async setMostRecentlyUsedProfile(profileName: string): Promise<void> {
-        const mru: string[] = this.getMruList()
-
-        const currentIndex = mru.indexOf(profileName)
-        if (currentIndex !== -1) {
-            mru.splice(currentIndex, 1)
-        }
-
-        mru.splice(0, 0, profileName)
-
-        mru.splice(CredentialsProfileMru.maxCredentialMruSize)
-
-        await this._context.globalState.update(CredentialsProfileMru.configurationStateName, mru)
-    }
-}
diff --git a/src/shared/credentials/userCredentialsUtils.ts b/src/shared/credentials/userCredentialsUtils.ts
deleted file mode 100644
index 1d991756e44..00000000000
--- a/src/shared/credentials/userCredentialsUtils.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-/*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as path from 'path'
-import * as vscode from 'vscode'
-import { mkdirp, writeFile } from 'fs-extra'
-import { getConfigFilename, getCredentialsFilename } from '../../credentials/sharedCredentials'
-import { fileExists } from '../filesystemUtilities'
-import { SystemUtilities } from '../systemUtilities'
-import { loadSharedConfigFiles, Profile } from './credentialsFile'
-import { SharedCredentialsProvider } from '../../credentials/providers/sharedCredentialsProvider'
-
-const header = `
-# AWS credentials file used by AWS CLI, SDKs, and tools.
-# Created by AWS Toolkit for VS Code. https://aws.amazon.com/visualstudiocode/
-#
-# Each [section] in this file declares a named "profile", which can be selected
-# in tools like AWS Toolkit to choose which credentials you want to use.
-#
-# See also:
-#   https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_access-keys.html
-#   https://docs.aws.amazon.com/cli/latest/userguide/cli-config-files.html
-
-`.trim()
-
-const createNewCredentialsFile = (ctx: CredentialsTemplateContext) =>
-    `
-[${ctx.profileName}]
-# This key identifies your AWS account.
-aws_access_key_id = ${ctx.accessKey}
-# Treat this secret key like a password. Never share it or store it in source
-# control. If your secret key is ever disclosed, immediately use IAM to delete
-# the key pair and create a new one.
-aws_secret_access_key = ${ctx.secretKey}
-
-`.trim()
-
-export interface CredentialsTemplateContext {
-    profileName: string
-    accessKey: string
-    secretKey: string
-}
-
-export interface CredentialsValidationResult {
-    isValid: boolean
-    account?: string
-    invalidMessage?: string
-}
-
-/**
- * @deprecated
- */
-export class UserCredentialsUtils {
-    /**
-     * @description Determines which credentials related files
-     * exist, and returns their filenames.
-     *
-     * @returns array of filenames for files found.
-     */
-    public static async findExistingCredentialsFilenames(isCredentialsRequired = false): Promise<string[]> {
-        const configFilename = getConfigFilename()
-        const credentialsFileName = getCredentialsFilename()
-
-        const configs = await loadSharedConfigFiles({
-            config: vscode.Uri.file(configFilename),
-            credentials: vscode.Uri.file(credentialsFileName),
-        })
-        const credentials = new Map([
-            [credentialsFileName, configs.credentialsFile],
-            [configFilename, configs.configFile],
-        ])
-
-        const credentialFiles = []
-        for (const [filename, profiles] of credentials.entries()) {
-            const exists = await SystemUtilities.fileExists(filename)
-            if (!exists) {
-                continue
-            }
-
-            if (!isCredentialsRequired) {
-                credentialFiles.push(filename)
-                continue
-            }
-
-            // ensure that the given filename has at least one valid profile
-            const validProfiles = []
-            const allProfiles = new Map(Object.entries(profiles).filter(item => item[1] !== undefined)) as Map<
-                string,
-                Profile
-            >
-            for (const profile of Object.keys(profiles)) {
-                const credProvider = new SharedCredentialsProvider(profile, allProfiles)
-                if (await credProvider.isAvailable()) {
-                    validProfiles.push(profile)
-                }
-            }
-
-            if (validProfiles.length !== 0) {
-                credentialFiles.push(filename)
-            }
-        }
-
-        return credentialFiles
-    }
-
-    /**
-     * @description Determines if credentials directory exists
-     * If it doesn't, creates credentials directory
-     * at directory from getCredentialsFilename()
-     */
-    public static async generateCredentialDirectoryIfNonexistent(): Promise<void> {
-        const filepath = path.dirname(getCredentialsFilename())
-        if (!(await fileExists(filepath))) {
-            await mkdirp(filepath)
-        }
-    }
-
-    /**
-     * @param credentialsContext the profile to create in the file
-     */
-    public static async generateCredentialsFile(credentialsContext?: CredentialsTemplateContext): Promise<void> {
-        await this.generateCredentialDirectoryIfNonexistent()
-        const dest = getCredentialsFilename()
-        const contents = credentialsContext ? ['', createNewCredentialsFile(credentialsContext)] : []
-
-        if (await SystemUtilities.fileExists(dest)) {
-            contents.unshift(await SystemUtilities.readFile(dest))
-        } else {
-            contents.unshift(header)
-        }
-
-        await writeFile(dest, contents.join('\n'), {
-            encoding: 'utf8',
-            mode: 0o100600, // basic file (type 100) with 600 permissions
-        })
-    }
-}
diff --git a/src/shared/debug/launchConfiguration.ts b/src/shared/debug/launchConfiguration.ts
deleted file mode 100644
index b83f808a9f9..00000000000
--- a/src/shared/debug/launchConfiguration.ts
+++ /dev/null
@@ -1,198 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as _ from 'lodash'
-import * as nls from 'vscode-nls'
-import * as path from 'path'
-import * as vscode from 'vscode'
-import {
-    AwsSamDebuggerConfiguration,
-    CodeTargetProperties,
-    ensureRelativePaths,
-    isAwsSamDebugConfiguration,
-    isCodeTargetProperties,
-    isTemplateTargetProperties,
-    AwsSamTargetType,
-} from '../sam/debugger/awsSamDebugConfiguration'
-import {
-    AwsSamDebugConfigurationValidator,
-    DefaultAwsSamDebugConfigurationValidator,
-} from '../sam/debugger/awsSamDebugConfigurationValidator'
-import * as pathutils from '../utilities/pathUtils'
-import { tryGetAbsolutePath } from '../utilities/workspaceUtils'
-import { getLogger } from '../logger'
-import * as window from '../../shared/vscode/window'
-import { makeFailedWriteMessage, showViewLogsMessage } from '../utilities/messages'
-import { launchConfigDocUrl } from '../constants'
-
-const localize = nls.loadMessageBundle()
-
-/**
- * Reads and writes DebugConfigurations.
- */
-export interface DebugConfigurationSource {
-    getDebugConfigurations(): vscode.DebugConfiguration[]
-    setDebugConfigurations(value: vscode.DebugConfiguration[]): Promise<void>
-}
-
-/**
- * Wraps read and write operations on launch.json.
- */
-export class LaunchConfiguration {
-    public readonly workspaceFolder: vscode.WorkspaceFolder | undefined
-    /**
-     * Creates a Launch Configuration scoped to the given resource.
-     */
-    public constructor(
-        public readonly scopedResource: vscode.Uri,
-        private readonly configSource: DebugConfigurationSource = new DefaultDebugConfigSource(scopedResource),
-        private readonly samValidator: AwsSamDebugConfigurationValidator = new DefaultAwsSamDebugConfigurationValidator(
-            vscode.workspace.getWorkspaceFolder(scopedResource)
-        )
-    ) {
-        this.workspaceFolder = vscode.workspace.getWorkspaceFolder(scopedResource)
-    }
-
-    public getDebugConfigurations(): vscode.DebugConfiguration[] {
-        const configs = this.configSource.getDebugConfigurations()
-        return configs.map(o => {
-            if (isAwsSamDebugConfiguration(o)) {
-                ensureRelativePaths(undefined, o)
-            }
-            return o
-        })
-    }
-
-    /**
-     * Returns all valid Sam Debug Configurations.
-     */
-    public getSamDebugConfigurations(): AwsSamDebuggerConfiguration[] {
-        const configs = this.getDebugConfigurations().filter(o =>
-            isAwsSamDebugConfiguration(o)
-        ) as AwsSamDebuggerConfiguration[]
-        return configs.filter(o => this.samValidator.validate(o)?.isValid)
-    }
-
-    /**
-     * Adds a collection of debug configurations to the top of the list
-     */
-    public async addDebugConfigurations(debugConfigs: vscode.DebugConfiguration[]): Promise<void> {
-        await this.configSource.setDebugConfigurations([...debugConfigs, ...this.getDebugConfigurations()])
-    }
-
-    /**
-     * Adds a debug configuration to the top of the list.
-     */
-    public async addDebugConfiguration(debugConfig: vscode.DebugConfiguration): Promise<void> {
-        await this.configSource.setDebugConfigurations([debugConfig, ...this.getDebugConfigurations()])
-    }
-
-    /**
-     * Edits a debug configuration at a specfic index by replacing it with a new one.
-     * @param editedDebugConfig Full edited debug configuration
-     * @param index Index in `launch.json` configurations to replace
-     */
-    public async editDebugConfiguration(editedDebugConfig: vscode.DebugConfiguration, index: number): Promise<void> {
-        const configs = this.getDebugConfigurations()
-        configs[index] = editedDebugConfig
-        await this.configSource.setDebugConfigurations(configs)
-    }
-}
-
-class DefaultDebugConfigSource implements DebugConfigurationSource {
-    private readonly launch: vscode.WorkspaceConfiguration
-
-    public constructor(resource: vscode.Uri) {
-        this.launch = vscode.workspace.getConfiguration('launch', resource)
-    }
-
-    public getDebugConfigurations(): vscode.DebugConfiguration[] {
-        return this.launch.get<vscode.DebugConfiguration[]>('configurations') ?? []
-    }
-
-    public async setDebugConfigurations(value: vscode.DebugConfiguration[]): Promise<void> {
-        try {
-            await this.launch.update('configurations', value)
-        } catch (e) {
-            const helpText = localize('AWS.generic.message.getHelp', 'Get Help...')
-            getLogger().error('setDebugConfigurations failed: %O', e as Error)
-            showViewLogsMessage(makeFailedWriteMessage('launch.json'), window.Window.vscode(), 'error', [
-                helpText,
-            ]).then(async buttonText => {
-                if (buttonText === helpText) {
-                    vscode.env.openExternal(vscode.Uri.parse(launchConfigDocUrl))
-                }
-            })
-        }
-    }
-}
-
-function getSamCodeTargets(launchConfig: LaunchConfiguration): CodeTargetProperties[] {
-    return _(launchConfig.getSamDebugConfigurations())
-        .map(samConfig => samConfig.invokeTarget)
-        .filter(isCodeTargetProperties)
-        .value()
-}
-
-/**
- * Gets configs associated with the template.yaml to which `launchConfig` is
- * scoped.
- *
- * @param launchConfig Launch config to check
- * @param type  target type ('api' or 'template'), or undefined for 'both'
- */
-export function getConfigsMappedToTemplates(
-    launchConfig: LaunchConfiguration,
-    type: AwsSamTargetType | undefined
-): Set<AwsSamDebuggerConfiguration> {
-    if (type === 'code') {
-        throw Error()
-    }
-    const folder = launchConfig.workspaceFolder
-    // Launch configs with target=template or target=api.
-    const templateConfigs = launchConfig
-        .getSamDebugConfigurations()
-        .filter(o => isTemplateTargetProperties(o.invokeTarget))
-    const filtered = templateConfigs.filter(
-        t =>
-            (type === undefined || t.invokeTarget.target === type) &&
-            pathutils.areEqual(
-                folder?.uri.fsPath,
-                (t.invokeTarget as any).templatePath,
-                launchConfig.scopedResource.fsPath
-            )
-    )
-    return _(filtered)
-        .thru(array => new Set(array))
-        .value()
-}
-
-/**
- * Gets a set of filepaths pointing to the handler source file for each
- * `target=code` config in launch.json.
- *
- * Each path is the absolute path resolved against `projectRoot`.
- *
- * @param launchConfig Launch config to check
- */
-export function getReferencedHandlerPaths(launchConfig: LaunchConfiguration): Set<string> {
-    const existingSamCodeTargets = getSamCodeTargets(launchConfig)
-
-    return _(existingSamCodeTargets)
-        .map(target => {
-            if (path.isAbsolute(target.projectRoot)) {
-                return pathutils.normalize(path.join(target.projectRoot, target.lambdaHandler))
-            }
-            return pathutils.normalize(
-                path.join(
-                    tryGetAbsolutePath(launchConfig.workspaceFolder, ''),
-                    target.projectRoot,
-                    target.lambdaHandler
-                )
-            )
-        })
-        .thru(array => new Set(array))
-        .value()
-}
diff --git a/src/shared/errors.ts b/src/shared/errors.ts
deleted file mode 100644
index ccd01e0f276..00000000000
--- a/src/shared/errors.ts
+++ /dev/null
@@ -1,299 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Uri } from 'vscode'
-import { AWSError } from 'aws-sdk'
-import { ServiceException } from '@aws-sdk/smithy-client'
-import { isThrottlingError, isTransientError } from '@aws-sdk/service-error-classification'
-import { Result } from './telemetry/telemetry'
-import { CancellationError } from './utilities/timeoutUtils'
-import { isNonNullable } from './utilities/tsUtils'
-
-export interface ErrorInformation {
-    /**
-     * Error names are optional, but if provided they should be generic yet self-explanatory.
-     *
-     * A name does not need to precisely describe why something failed and instead should focus
-     * on the overarching theme or module that caused the problem. For example, VS Code uses
-     * `FileSystemError` for a diverse range of problems relating to their file system API.
-     *
-     * The choice of granularity for an error name largely comes down to what other errors are
-     * possible; names are meant to immediately disambiguate from the potentially thousands of
-     * other causes for a failure. If there is any doubt that a certain name might be confusing,
-     * opt for something more specific and verbose.
-     */
-    readonly name?: string
-
-    /**
-     * An error code is used to describe specific failure modes within entire classes of errors.
-     *
-     * The exact value used here is free-form but should be kept stable whenever possible.
-     * Value stability is especially important if any error handling logic directly relies on
-     * error codes. Prefer using {@link ToolkitError.named} and narrowing this class if any
-     * substantial logic is needed for handling specific error codes.
-     *
-     * As an example, one might choose to describe SSO error codes for extra type-safety:
-     * ```ts
-     * enum CreateTokenErrorCode {
-     *     SlowDown = 'SlowDownException',
-     *     ExpiredToken = 'ExpiredTokenException',
-     *     UnauthorizedClient = 'UnauthorizedClientException',
-     *     AuthorizationPending = 'AuthorizationPendingException',
-     * }
-     *
-     * class CreateTokenError extends ToolkitError.named('CreateTokenError') {
-     *     public constructor(public readonly code: CreateTokenErrorCode) {
-     *         super('Failed to create SSO access token', { code })
-     *     }
-     * }
-     * ```
-     */
-    readonly code?: string
-
-    /**
-     * Used to describe errors with a direct cause-effect relationship.
-     *
-     * See {@link code} for creating descriptive errors without a chainable root cause.
-     */
-    readonly cause?: Error
-
-    /**
-     * Structured information that may be used for logging.
-     *
-     * Consumers should strictly use this field for observability purposes as producers can
-     * put whatever they want here.
-     */
-    readonly details?: Record<string, unknown>
-
-    /**
-     * Flag to determine if the error was from a user-initiated cancellation.
-     */
-    readonly cancelled?: boolean
-
-    /**
-     * A link to documentation relevant to this error.
-     *
-     * TODO: implement this
-     */
-    readonly documentationUri?: Uri
-}
-
-/**
- * Anonymous class with a pre-defined error name.
- */
-interface NamedErrorConstructor {
-    /**
-     * See {@link ToolkitError}
-     */
-    new (message: string, info?: Omit<ErrorInformation, 'name'>): ToolkitError
-
-    /**
-     * See {@link ToolkitError.chain}
-     */
-    chain<T extends this>(
-        this: T,
-        error: unknown,
-        message: string,
-        info?: Omit<ErrorInformation, 'name' | 'cause'>
-    ): InstanceType<T>
-}
-
-/**
- * Generic error class for handling exceptions within the Toolkit.
- */
-export class ToolkitError extends Error implements ErrorInformation {
-    /**
-     * A message that could potentially be shown to the user. This should not contain any
-     * sensitive information and should be limited in technical detail.
-     */
-    public override readonly message: string
-    public readonly code = this.info.code
-    public readonly details = this.info.details
-
-    /**
-     * We guard against mutation to stop a developer from creating a circular chain of errors.
-     * The alternative is to truncate errors to an arbitrary depth though that doesn't address
-     * why the error chain is deep.
-     */
-    readonly #cause = this.info.cause
-    readonly #name = this.info.name ?? super.name
-
-    public constructor(message: string, protected readonly info: ErrorInformation = {}) {
-        super(message)
-        this.message = message
-    }
-
-    /**
-     * The original error that caused this error (if any).
-     */
-    public get cause(): Error | undefined {
-        return this.#cause
-    }
-
-    /**
-     * The name of the error. This is not necessarily the same as the class name.
-     */
-    public override get name(): string {
-        return this.#name
-    }
-
-    /**
-     * See {@link ErrorInformation.cancelled cancelled}.
-     *
-     * Whether or not an error is considered 'cancelled' is determined either by explicit
-     * assignment on construction or by finding a 'cancelled' error within its causal chain.
-     */
-    public get cancelled(): boolean {
-        return this.info.cancelled ?? isUserCancelledError(this.cause)
-    }
-
-    /**
-     * A formatted string that is analogous to a stack trace. While stack traces enumerate every
-     * call site, this trace enumerates every throw site.
-     *
-     * The motivation here is that stack traces are often not very useful to anyone but the original
-     * developers. This is especially true for JavaScript where source maps are needed to parse traces
-     * from bundled applications. We want a trace that is informative but not excessively noisy.
-     */
-    public get trace(): string {
-        const message = formatError(this)
-
-        if (!this.cause) {
-            return message
-        }
-
-        // Stack overflows are only possible if `cause` is changed after instantiation
-        const residual = this.cause instanceof ToolkitError ? this.cause.trace : formatError(this.cause)
-
-        return `${message}\n\t -> ${residual}`
-    }
-
-    /**
-     * Creates a new {@link ToolkitError} instance that was directly caused by another {@link error}.
-     */
-    public static chain(error: unknown, message: string, info?: Omit<ErrorInformation, 'cause'>): ToolkitError {
-        return new this(message, {
-            ...info,
-            cause: UnknownError.cast(error),
-        })
-    }
-
-    /**
-     * Creates a new {@link ToolkitError} _class_ with a constant name.
-     *
-     * Constructor (class) names are not preserved when bundling due to name mangling. Extending off
-     * this new anonymous class will ensure that the specified name is always present.
-     */
-    public static named(name: string): NamedErrorConstructor {
-        return class extends ToolkitError {
-            public override get name() {
-                return name
-            }
-
-            // TypeScript does not allow the use of `this` types for generic prototype methods unfortunately
-            // This implementation is equivalent to re-assignment i.e. an unbound method on the prototype
-            public static override chain<
-                T extends new (...args: ConstructorParameters<NamedErrorConstructor>) => ToolkitError
-            >(this: T, ...args: Parameters<NamedErrorConstructor['chain']>): InstanceType<T> {
-                return ToolkitError.chain.call(this, ...args) as InstanceType<T>
-            }
-        }
-    }
-}
-
-export function formatError(err: Error): string {
-    const code = hasCode(err) && err.code !== err.name ? `[${err.code}]` : undefined
-    const parts = [`${err.name}:`, err.message, code, formatDetails(err)]
-
-    return parts.filter(isNonNullable).join(' ')
-}
-
-function formatDetails(err: Error): string | undefined {
-    const details: Record<string, string | undefined> = {}
-
-    if (err instanceof ToolkitError && err.details !== undefined) {
-        for (const [k, v] of Object.entries(err.details)) {
-            details[k] = String(v)
-        }
-    } else if (isAwsError(err)) {
-        details['statusCode'] = String(err.statusCode ?? '')
-        details['requestId'] = err.requestId
-        details['extendedRequestId'] = err.extendedRequestId
-    }
-
-    if (Object.keys(details).length === 0) {
-        return
-    }
-
-    const joined = Object.entries(details)
-        .filter(([_, v]) => !!v)
-        .map(([k, v]) => `${k}: ${v}`)
-        .join('; ')
-
-    return `(${joined})`
-}
-
-export class UnknownError extends Error {
-    public override readonly name = 'UnknownError'
-
-    public constructor(public readonly cause: unknown) {
-        super(String(cause))
-    }
-
-    public static cast(obj: unknown): Error {
-        return obj instanceof Error ? obj : new UnknownError(obj)
-    }
-}
-
-export function getTelemetryResult(error: unknown | undefined): Result {
-    if (error === undefined) {
-        return 'Succeeded'
-    } else if (isUserCancelledError(error)) {
-        return 'Cancelled'
-    }
-
-    return 'Failed'
-}
-
-export function getTelemetryReason(error: unknown | undefined): string | undefined {
-    // Currently the `code` field is favored over the error name even though both are useful
-    // for describing the reason. We're only using a single `reason` field and it's just simpler
-    // to not encode more information.
-
-    if (error === undefined) {
-        return undefined
-    } else if (error instanceof CancellationError) {
-        return error.agent
-    } else if (error instanceof ToolkitError) {
-        return getTelemetryReason(error.cause) ?? error.code ?? error.name
-    } else if (error instanceof Error) {
-        return (error as { code?: string }).code ?? error.name
-    }
-
-    return 'Unknown'
-}
-
-export function isAwsError(error: unknown | undefined): error is AWSError {
-    if (error === undefined) {
-        return false
-    }
-
-    return error instanceof Error && hasCode(error) && (error as { time?: unknown }).time instanceof Date
-}
-
-function hasCode(error: Error): error is typeof error & { code: string } {
-    return typeof (error as { code?: unknown }).code === 'string'
-}
-
-export function isUserCancelledError(error: unknown): boolean {
-    return CancellationError.isUserCancelled(error) || (error instanceof ToolkitError && error.cancelled)
-}
-
-/**
- * Checks if the AWS SDK v3 error was caused by the client and not due to a service issue.
- */
-export function isClientFault(error: ServiceException): boolean {
-    return error.$fault === 'client' && !(isThrottlingError(error) || isTransientError(error))
-}
diff --git a/src/shared/extensionGlobals.ts b/src/shared/extensionGlobals.ts
deleted file mode 100644
index 29dc5140a43..00000000000
--- a/src/shared/extensionGlobals.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { ExtensionContext, OutputChannel, Uri } from 'vscode'
-import { LoginManager } from '../credentials/loginManager'
-import { AwsResourceManager } from '../dynamicResources/awsResourceManager'
-import { AWSClientBuilder } from './awsClientBuilder'
-import { AwsContext } from './awsContext'
-import { AwsContextCommands } from './awsContextCommands'
-import { RegionProvider } from './regions/regionProvider'
-import { CloudFormationTemplateRegistry } from './fs/templateRegistry'
-import { CodelensRootRegistry } from './fs/codelensRootRegistry'
-import { SchemaService } from './schemas'
-import { TelemetryLogger } from './telemetry/telemetryLogger'
-import { TelemetryService } from './telemetry/telemetryService'
-import { Window } from './vscode/window'
-import { UriHandler } from './vscode/uriHandler'
-
-type Clock = Pick<
-    typeof globalThis,
-    'setTimeout' | 'setImmediate' | 'setInterval' | 'clearTimeout' | 'clearImmediate' | 'clearInterval' | 'Date'
->
-
-/**
- * Copies all *enumerable* properties from the global object.
- * Some properties have to be added manually depending on how they exist on the prototype.
- */
-function copyClock(): Clock {
-    return { ...globalThis, Date, Promise } as Clock
-}
-
-const globals = { clock: copyClock() } as ToolkitGlobals
-
-export function checkDidReload(context: ExtensionContext): boolean {
-    return !!context.globalState.get<string>('ACTIVATION_LAUNCH_PATH_KEY')
-}
-
-export function initialize(context: ExtensionContext, window: Window): ToolkitGlobals {
-    Object.assign(globals, {
-        context,
-        window,
-        clock: copyClock(),
-        didReload: checkDidReload(context),
-        manifestPaths: {} as ToolkitGlobals['manifestPaths'],
-        visualizationResourcePaths: {} as ToolkitGlobals['visualizationResourcePaths'],
-    })
-
-    return globals
-}
-
-export default globals
-
-/**
- * Namespace for common variables used globally in the extension.
- * All variables here must be initialized in the activate() method of extension.ts
- */
-interface ToolkitGlobals {
-    readonly context: ExtensionContext
-    readonly window: Window
-    // TODO: make the rest of these readonly (or delete them)
-    outputChannel: OutputChannel
-    loginManager: LoginManager
-    awsContextCommands: AwsContextCommands
-    awsContext: AwsContext
-    regionProvider: RegionProvider
-    sdkClientBuilder: AWSClientBuilder
-    telemetry: TelemetryService & { logger: TelemetryLogger }
-    templateRegistry: CloudFormationTemplateRegistry
-    schemaService: SchemaService
-    codelensRootRegistry: CodelensRootRegistry
-    resourceManager: AwsResourceManager
-    uriHandler: UriHandler
-
-    /**
-     * Whether the current session was (likely) a reload forced by VSCode during a workspace folder operation.
-     */
-    readonly didReload: boolean
-
-    /**
-     * This is a shallow copy of the global `this` object.
-     *
-     * Using a separate clock from the global one allows us to scope down behavior for testing.
-     * Keep in mind that this clock's `Date` constructor will be different than the global one when mocked.
-     */
-    readonly clock: Clock
-
-    visualizationResourcePaths: {
-        localWebviewScriptsPath: Uri
-        webviewBodyScript: Uri
-        visualizationLibraryCachePath: Uri
-        visualizationLibraryScript: Uri
-        visualizationLibraryCSS: Uri
-        stateMachineCustomThemePath: Uri
-        stateMachineCustomThemeCSS: Uri
-    }
-
-    readonly manifestPaths: {
-        endpoints: string
-        lambdaSampleRequests: string
-    }
-}
diff --git a/src/shared/extensionUtilities.ts b/src/shared/extensionUtilities.ts
deleted file mode 100644
index 44802235f20..00000000000
--- a/src/shared/extensionUtilities.ts
+++ /dev/null
@@ -1,367 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as _ from 'lodash'
-import * as os from 'os'
-import * as path from 'path'
-import * as vscode from 'vscode'
-import * as nls from 'vscode-nls'
-import { readFileAsString } from './filesystemUtilities'
-import { getLogger } from './logger'
-import { VSCODE_EXTENSION_ID, extensionAlphaVersion } from './extensions'
-import { BaseTemplates } from './templates/baseTemplates'
-import { Ec2MetadataClient } from './clients/ec2MetadataClient'
-import { DefaultEc2MetadataClient } from './clients/ec2MetadataClient'
-import { extensionVersion, getCodeCatalystDevEnvId } from './vscode/env'
-import { DevSettings } from './settings'
-
-const localize = nls.loadMessageBundle()
-
-const vscodeAppname = 'Visual Studio Code'
-const cloud9Appname = 'AWS Cloud9'
-const cloud9CnAppname = 'Amazon Cloud9'
-const notInitialized = 'notInitialized'
-
-export const mostRecentVersionKey: string = 'globalsMostRecentVersion'
-
-export enum IDE {
-    vscode,
-    cloud9,
-    unknown,
-}
-
-let computeRegion: string | undefined = notInitialized
-
-export function getIdeType(): IDE {
-    const settings = DevSettings.instance
-    if (
-        vscode.env.appName === cloud9Appname ||
-        vscode.env.appName === cloud9CnAppname ||
-        settings.get('forceCloud9', false)
-    ) {
-        return IDE.cloud9
-    }
-
-    // Theia doesn't necessarily have all env propertie
-    // so we should be defensive and assume appName is nullable.
-    if (vscode.env.appName?.startsWith(vscodeAppname)) {
-        return IDE.vscode
-    }
-
-    return IDE.unknown
-}
-
-interface IdeProperties {
-    shortName: string
-    longName: string
-    commandPalette: string
-    codelens: string
-    codelenses: string
-    company: string
-}
-
-export function getIdeProperties(): IdeProperties {
-    const company = localize('AWS.title', 'AWS')
-    // in a separate const so other IDEs can take from this selectively.
-    const vscodeVals: IdeProperties = {
-        shortName: localize('AWS.vscode.shortName', 'VS Code'),
-        longName: localize('AWS.vscode.longName', 'Visual Studio Code'),
-        commandPalette: localize('AWS.vscode.commandPalette', 'Command Palette'),
-        codelens: localize('AWS.vscode.codelens', 'CodeLens'),
-        codelenses: localize('AWS.vscode.codelenses', 'CodeLenses'),
-        company,
-    }
-
-    switch (getIdeType()) {
-        case IDE.cloud9:
-            if (isCn()) {
-                return createCloud9Properties(localize('AWS.title.cn', 'Amazon'))
-            }
-            return createCloud9Properties(company)
-        // default is IDE.vscode
-        default:
-            return vscodeVals
-    }
-}
-
-function createCloud9Properties(company: string): IdeProperties {
-    return {
-        shortName: localize('AWS.cloud9.shortName', 'Cloud9'),
-        longName: localize('AWS.cloud9.longName', '{0} Cloud9', company),
-        commandPalette: localize('AWS.cloud9.commandPalette', 'Go to Anything Panel'),
-        codelens: localize('AWS.cloud9.codelens', 'Inline Action'),
-        codelenses: localize('AWS.cloud9.codelenses', 'Inline Actions'),
-        company,
-    }
-}
-
-/**
- * Decides if the current system is (the specified flavor of) Cloud9.
- */
-export function isCloud9(flavor: 'classic' | 'codecatalyst' | 'any' = 'any'): boolean {
-    const cloud9 = getIdeType() === IDE.cloud9
-    if (!cloud9 || flavor === 'any') {
-        return cloud9
-    }
-    const codecat = getCodeCatalystDevEnvId() !== undefined
-    return (flavor === 'classic' && !codecat) || (flavor === 'codecatalyst' && codecat)
-}
-
-export function isCn(): boolean {
-    return getComputeRegion()?.startsWith('cn') ?? false
-}
-
-/**
- * Applies function `getFn` to `obj` and returns the result, or fails silently.
- *
- * Example:
- *
- *     function blah(value?: SomeObject) {
- *       safeGet(value, x => x.propertyOfSomeObject)
- *     }
- *
- * @param obj the object to attempt the get function on
- * @param getFn the function to use to determine the mapping value
- */
-export function safeGet<O, T>(obj: O | undefined, getFn: (x: O) => T): T | undefined {
-    if (obj) {
-        try {
-            return getFn(obj)
-        } catch (error) {
-            // ignore
-        }
-    }
-
-    return undefined
-}
-
-/**
- * Helper function to show a webview containing the quick start page
- *
- * @param context VS Code Extension Context
- */
-export async function showQuickStartWebview(context: vscode.ExtensionContext): Promise<void> {
-    try {
-        const view = await createQuickStartWebview(context)
-        view.reveal()
-    } catch {
-        vscode.window.showErrorMessage(
-            localize('AWS.command.quickStart.error', 'There was an error retrieving the Quick Start page')
-        )
-    }
-}
-
-/**
- * Helper function to create a webview containing the quick start page
- * Returns an unfocused vscode.WebviewPanel if the quick start page is renderable.
- *
- * @param context VS Code Extension Context
- * @param page Page to load (use for testing)
- */
-export async function createQuickStartWebview(
-    context: vscode.ExtensionContext,
-    page?: string
-): Promise<vscode.WebviewPanel> {
-    let actualPage: string
-    if (page) {
-        actualPage = page
-    } else if (isCloud9()) {
-        actualPage = `quickStartCloud9${isCn() ? '-cn' : ''}.html`
-    } else {
-        actualPage = 'quickStartVscode.html'
-    }
-    // create hidden webview, leave it up to the caller to show
-    const view = vscode.window.createWebviewPanel(
-        'html',
-        localize('AWS.command.quickStart.title', '{0} Toolkit - Quick Start', getIdeProperties().company),
-        { viewColumn: vscode.ViewColumn.Active, preserveFocus: true },
-        { enableScripts: true }
-    )
-
-    const baseTemplateFn = _.template(BaseTemplates.simpleHtml)
-
-    const htmlBody = convertExtensionRootTokensToPath(
-        await readFileAsString(path.join(context.extensionPath, actualPage)),
-        context.extensionPath,
-        view.webview
-    )
-
-    view.webview.html = baseTemplateFn({
-        cspSource: view.webview.cspSource,
-        content: htmlBody,
-    })
-
-    return view
-}
-
-/**
- * Utility function to search for tokens in a string and convert them to relative paths parseable by VS Code
- * Useful for converting HTML images to webview-usable images
- *
- * @param text Text to scan
- * @param basePath Extension path (from extension context)
- */
-function convertExtensionRootTokensToPath(text: string, basePath: string, webview: vscode.Webview): string {
-    return text.replace(/!!EXTENSIONROOT!!(?<restOfUrl>[-a-zA-Z0-9@:%_\+.~#?&//=]*)/g, (matchedString, restOfUrl) => {
-        return webview.asWebviewUri(vscode.Uri.file(`${basePath}${restOfUrl}`)).toString()
-    })
-}
-
-/**
- * Utility function to determine if the extension version has changed between activations
- * False (versions are identical) if version key exists in global state and matches the current version
- * True (versions are different) if any of the above aren't true
- *
- * TODO: Change the threshold on which we display the welcome page?
- * For instance, if we start building nightlies, only show page for significant updates?
- *
- * @param context VS Code Extension Context
- * @param currVersion Current version to compare stored most recent version against (useful for tests)
- */
-export function isDifferentVersion(context: vscode.ExtensionContext, currVersion: string = extensionVersion): boolean {
-    const mostRecentVersion = context.globalState.get<string>(mostRecentVersionKey)
-    if (mostRecentVersion && mostRecentVersion === currVersion) {
-        return false
-    }
-
-    return true
-}
-
-/**
- * Utility function to update the most recently used extension version
- * Pulls from package.json
- *
- * @param context VS Code Extension Context
- */
-export function setMostRecentVersion(context: vscode.ExtensionContext): void {
-    context.globalState.update(mostRecentVersionKey, extensionVersion)
-}
-
-/**
- * Shows a message with a link to the quickstart page.
- */
-async function promptQuickstart(): Promise<void> {
-    const view = localize('AWS.command.quickStart', 'View Quick Start')
-    const prompt = await vscode.window.showInformationMessage(
-        localize(
-            'AWS.message.prompt.quickStart.toastMessage',
-            'You are now using {0} Toolkit {1}',
-            getIdeProperties().company,
-            extensionVersion
-        ),
-        view
-    )
-    if (prompt === view) {
-        vscode.commands.executeCommand('aws.quickStart')
-    }
-}
-
-/**
- * Shows a "new version" or "alpha version" message.
- *
- * - If extension version is "alpha", shows a warning message.
- * - If extension version was not previously run on this machine, shows a toast
- *   with a link to the quickstart page.
- * - Otherwise does nothing.
- *
- * @param context VS Code Extension Context
- */
-export function showWelcomeMessage(context: vscode.ExtensionContext): void {
-    if (getCodeCatalystDevEnvId() !== undefined) {
-        // Do not show clippy in CodeCatalyst development environments.
-        return
-    }
-    const version = vscode.extensions.getExtension(VSCODE_EXTENSION_ID.awstoolkit)?.packageJSON.version
-    if (version === extensionAlphaVersion) {
-        vscode.window.showWarningMessage(
-            localize(
-                'AWS.startup.toastIfAlpha',
-                '{0} Toolkit PREVIEW. (To get the latest STABLE version, uninstall this version.)',
-                getIdeProperties().company
-            )
-        )
-        return
-    }
-    try {
-        if (isDifferentVersion(context)) {
-            setMostRecentVersion(context)
-            if (!isCloud9()) {
-                promptQuickstart()
-            }
-        }
-    } catch (err) {
-        // swallow error and don't block extension load
-        getLogger().error(err as Error)
-    }
-}
-
-/**
- * Shows info about the extension and its environment.
- */
-export async function aboutToolkit(): Promise<void> {
-    const toolkitEnvDetails = getToolkitEnvironmentDetails()
-    const copyButtonLabel = localize('AWS.message.prompt.copyButtonLabel', 'Copy')
-    const result = await vscode.window.showInformationMessage(toolkitEnvDetails, { modal: true }, copyButtonLabel)
-    if (result === copyButtonLabel) {
-        vscode.env.clipboard.writeText(toolkitEnvDetails)
-    }
-}
-
-/**
- * Returns a string that includes the OS, AWS Toolkit,
- * and VS Code versions.
- */
-export function getToolkitEnvironmentDetails(): string {
-    const osType = os.type()
-    const osArch = os.arch()
-    const osRelease = os.release()
-    const vsCodeVersion = vscode.version
-    const node = process.versions.node ? `node: ${process.versions.node}\n` : 'node: ?\n'
-    const electron = process.versions.electron ? `electron: ${process.versions.electron}\n` : ''
-
-    const envDetails = localize(
-        'AWS.message.toolkitInfo',
-        'OS: {0} {1} {2}\n{3} extension host:  {4}\n{5} Toolkit:  {6}\n{7}{8}',
-        osType,
-        osArch,
-        osRelease,
-        getIdeProperties().longName,
-        vsCodeVersion,
-        getIdeProperties().company,
-        extensionVersion,
-        node,
-        electron
-    )
-
-    return envDetails
-}
-
-/**
- * Returns the Cloud9 compute region or 'unknown' if we can't pull a region, or `undefined` if this is not Cloud9.
- */
-export async function initializeComputeRegion(
-    metadata: Ec2MetadataClient = new DefaultEc2MetadataClient(),
-    isC9: boolean = isCloud9()
-): Promise<void> {
-    if (isC9) {
-        try {
-            const identity = await metadata.getInstanceIdentity()
-            computeRegion = identity.region || 'unknown'
-        } catch (e) {
-            computeRegion = 'unknown'
-        }
-    } else {
-        // not cloud9, region has no meaning
-        computeRegion = undefined
-    }
-}
-
-export function getComputeRegion(): string | undefined {
-    if (computeRegion === notInitialized) {
-        throw new Error('Attempted to get compute region without initializing.')
-    }
-
-    return computeRegion
-}
diff --git a/src/shared/extensions.ts b/src/shared/extensions.ts
deleted file mode 100644
index df869823bc6..00000000000
--- a/src/shared/extensions.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { AwsContext } from './awsContext'
-import { RegionProvider } from './regions/regionProvider'
-import { TelemetryService } from './telemetry/telemetryService'
-import { CredentialsStore } from '../credentials/credentialsStore'
-import { SamCliContext } from './sam/cli/samCliContext'
-import { UriHandler } from './vscode/uriHandler'
-
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export const VSCODE_EXTENSION_ID = {
-    awstoolkit: 'amazonwebservices.aws-toolkit-vscode',
-    python: 'ms-python.python',
-    // python depends on jupyter plugin
-    jupyter: 'ms-toolsai.jupyter',
-    yaml: 'redhat.vscode-yaml',
-    go: 'golang.go',
-    java: 'redhat.java',
-    javadebug: 'vscjava.vscode-java-debug',
-    git: 'vscode.git',
-}
-
-/**
- * Long-lived, extension-scoped, shared globals.
- */
-export interface ExtContext {
-    extensionContext: vscode.ExtensionContext
-    awsContext: AwsContext
-    samCliContext: () => SamCliContext
-    regionProvider: RegionProvider
-    outputChannel: vscode.OutputChannel
-    telemetryService: TelemetryService
-    credentialsStore: CredentialsStore
-    uriHandler: UriHandler
-    invokeOutputChannel: vscode.OutputChannel
-}
-
-/**
- * Version of the .vsix produced by package.ts with the --debug option.
- */
-export const extensionAlphaVersion = '1.99.0-SNAPSHOT'
diff --git a/src/shared/extensions/ssh.ts b/src/shared/extensions/ssh.ts
deleted file mode 100644
index 29ce69b4264..00000000000
--- a/src/shared/extensions/ssh.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as path from 'path'
-import * as nls from 'vscode-nls'
-import { getLogger } from '../logger'
-import { ChildProcess } from '../utilities/childProcess'
-import { SystemUtilities } from '../systemUtilities'
-import { ArrayConstructor, NonNullObject } from '../utilities/typeConstructors'
-import { Settings } from '../settings'
-import { VSCODE_EXTENSION_ID } from '../extensions'
-
-const localize = nls.loadMessageBundle()
-
-export const sshAgentSocketVariable = 'SSH_AUTH_SOCK'
-
-export function getSshConfigPath(): string {
-    const sshConfigDir = path.join(SystemUtilities.getHomeDirectory(), '.ssh')
-    return path.join(sshConfigDir, 'config')
-}
-
-/**
- * Only mac has the agent running by default, other OS we need to start manually
- *
- * @returns `undefined` if agent is already running or on Windows, otherwise the SSH agent socket
- */
-export async function startSshAgent(): Promise<string | undefined> {
-    if (process.env[sshAgentSocketVariable] !== undefined) {
-        return process.env[sshAgentSocketVariable]
-    }
-
-    getLogger().info('Starting SSH agent...')
-
-    try {
-        if (process.platform === 'win32') {
-            const runningMessage = 'Already running'
-            // First check if it's running
-            // if not, try to start it
-            // if that fails, try to set the start-up type to automatic
-            // if that fails, then no agent
-            const script = `
-$info = Get-Service ssh-agent
-if ($info.Status -eq "Running") { 
-    echo "${runningMessage}"
-    exit 0 
-}
-Start-Service ssh-agent
-if (!$?) {
-    Get-Service -Name ssh-agent | Set-Service -StartupType Manual
-    if ($?) { Start-Service ssh-agent }
-}
-exit !$?
-`
-            const options = {
-                rejectOnErrorCode: true,
-                logging: 'noparams',
-            } as const
-            const result = await new ChildProcess('powershell.exe', ['-Command', script], options).run({
-                onStdout: text => getLogger().verbose(`ssh (ssh-agent): ${text}`),
-                onStderr: text => getLogger().verbose(`ssh (ssh-agent): ${text}`),
-            })
-
-            if (!result.stdout.includes(runningMessage) && !result.stderr) {
-                vscode.window.showInformationMessage(
-                    localize('AWS.ssh.ssh-agent.start', 'The SSH agent has been started.')
-                )
-            }
-
-            return
-        }
-
-        // TODO: this command outputs a shell command that you're supposed to execute, for now
-        // we'll just parse the socket out and inject it into the ssh command
-        const r = await new ChildProcess('ssh-agent', ['-s']).run()
-        return (r.stdout.match(/$SSH_AGENT_VAR=(.*?);/) ?? [])[1]
-    } catch (err) {
-        // The 'silent' failure here is not great, though the SSH agent is not necessarily a critical
-        // feature. It would be better to inform the user that the SSH agent could not be started, then
-        // go from there. Many users probably wouldn't care about the agent at all.
-        getLogger().warn('ssh: failed to start SSH agent, clones may not work as expected: %O', err)
-    }
-}
-
-const remoteSshTypes = {
-    path: String,
-    defaultExtensions: ArrayConstructor(String),
-    remotePlatform: NonNullObject,
-    useLocalServer: Boolean,
-}
-
-export class RemoteSshSettings extends Settings.define('remote.SSH', remoteSshTypes) {
-    public async ensureDefaultExtension(extensionId: string): Promise<boolean> {
-        const current = this.get('defaultExtensions', [])
-
-        if (!current.includes(extensionId)) {
-            this.log(`updating remote SSH "defaultExtensions" setting with "${extensionId}"`)
-
-            return this.update('defaultExtensions', [...current, extensionId])
-        }
-
-        return true
-    }
-
-    public async setRemotePlatform(hostname: string, platform: 'linux' | 'windows' | 'macOS'): Promise<boolean> {
-        try {
-            const current = this.getOrThrow('remotePlatform', {})
-            current[hostname] = platform
-            this.log(`updated remote SSH host "${hostname}" with platform "${platform}"`)
-
-            return this.update('remotePlatform', current)
-        } catch (error) {
-            this.log(`failed to read "remotePlatform", no updates will be made`)
-
-            return false
-        }
-    }
-}
-
-export async function startVscodeRemote(
-    ProcessClass: typeof ChildProcess,
-    hostname: string,
-    targetDirectory: string,
-    vscPath: string
-): Promise<void> {
-    const workspaceUri = `vscode-remote://ssh-remote+${hostname}${targetDirectory}`
-
-    const settings = new RemoteSshSettings()
-    settings.ensureDefaultExtension(VSCODE_EXTENSION_ID.awstoolkit)
-
-    if (process.platform === 'win32') {
-        await Promise.all([
-            // TODO(sijaden): we should periodically clean this setting up, maybe
-            // by removing all hostnames that use the `aws-` prefix
-            await settings.setRemotePlatform(hostname, 'linux'),
-
-            // TODO(sijaden): revert this setting back to normal after the user connects
-            await settings.update('useLocalServer', false),
-        ])
-    }
-
-    await new ProcessClass(vscPath, ['--folder-uri', workspaceUri]).run()
-}
diff --git a/src/shared/filesystemUtilities.ts b/src/shared/filesystemUtilities.ts
deleted file mode 100644
index 8454bbd447b..00000000000
--- a/src/shared/filesystemUtilities.ts
+++ /dev/null
@@ -1,253 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { access, mkdtemp, mkdirp, readFile, remove, existsSync, readdir, stat } from 'fs-extra'
-import * as crypto from 'crypto'
-import * as fs from 'fs'
-import * as fsExtra from 'fs-extra'
-import * as os from 'os'
-import * as path from 'path'
-import * as vscode from 'vscode'
-import { getLogger } from './logger'
-import * as pathutils from './utilities/pathUtils'
-import globals from '../shared/extensionGlobals'
-
-const defaultEncoding: BufferEncoding = 'utf8'
-
-export const tempDirPath = path.join(
-    // https://github.com/aws/aws-toolkit-vscode/issues/240
-    os.type() === 'Darwin' ? '/tmp' : os.tmpdir(),
-    'aws-toolkit-vscode'
-)
-
-export async function getDirSize(
-    dirPath: string,
-    startTime: number,
-    duration: number,
-    fileExt: string
-): Promise<number> {
-    if (performance.now() - startTime > duration) {
-        getLogger().warn('getDirSize: exceeds time limit')
-        return 0
-    }
-    const files = await fsExtra.readdir(dirPath, { withFileTypes: true })
-    const fileSizes = files.map(async file => {
-        const filePath = path.join(dirPath, file.name)
-        if (file.isSymbolicLink()) {
-            return 0
-        }
-        if (file.isDirectory()) {
-            return getDirSize(filePath, startTime, duration, fileExt)
-        }
-        if (file.isFile() && file.name.endsWith(fileExt)) {
-            const { size } = await fsExtra.stat(filePath)
-            return size
-        }
-        return 0
-    })
-    return (await Promise.all(fileSizes)).reduce((accumulator, size) => accumulator + size, 0)
-}
-
-export function downloadsDir(): string {
-    const downloadPath = path.join(os.homedir(), 'Downloads')
-    if (existsSync(downloadPath)) {
-        return downloadPath
-    } else {
-        return os.tmpdir()
-    }
-}
-
-/**
- * Checks if file or directory `p` exists.
- *
- * TODO: optionally check read/write permissions and return a granular status.
- */
-export async function fileExists(p: string): Promise<boolean> {
-    try {
-        await access(p)
-    } catch (err) {
-        return false
-    }
-
-    return true
-}
-
-/**
- * @description Wraps readFileAsync and resolves the Buffer to a string for convenience
- *
- * @param filePath filename to read
- * @param encoding Optional - file encoding
- *
- * @returns the contents of the file as a string
- */
-export async function readFileAsString(
-    pathLike: string,
-    options: { encoding: BufferEncoding; flag?: string } = { encoding: defaultEncoding }
-): Promise<string> {
-    return readFile(pathLike, options)
-}
-
-/**
- * Best-effort delete a folder recursively. Will not throw if it fails.
- * @param folder The path to the folder to delete
- */
-export async function tryRemoveFolder(folder?: string): Promise<boolean> {
-    try {
-        // if null or empty, no issues
-        if (!folder) {
-            getLogger().warn('tryRemoveFolder: no folder given')
-            return false
-        }
-        await remove(folder)
-    } catch (err) {
-        getLogger().warn('tryRemoveFolder: failed to delete directory "%s": %O', folder, err as Error)
-        return false
-    }
-    return true
-}
-
-export const makeTemporaryToolkitFolder = async (...relativePathParts: string[]) => {
-    if (relativePathParts.length === 0) {
-        relativePathParts.push('vsctk')
-    }
-
-    const tmpPath = path.join(tempDirPath, ...relativePathParts)
-    const tmpPathParent = path.dirname(tmpPath)
-    // fs.makeTemporaryToolkitFolder fails on OSX if prefix contains path separator
-    // so we must create intermediate dirs if needed
-    await mkdirp(tmpPathParent)
-
-    return await mkdtemp(tmpPath)
-}
-
-/**
- * Returns `true` if path `p` is a descendant of directory `d` (or if they are
- * identical).
- *
- * Only the logical structure is checked; the paths are not checked for
- * existence on the filesystem.
- *
- * @param d  Path to a directory.
- * @param p  Path to file or directory to test.
- */
-export function isInDirectory(d: string, p: string): boolean {
-    if (d === '' || p === '') {
-        return true
-    }
-    const parentDirPieces = pathutils.normalizeSeparator(d).split('/')
-    const containedPathPieces = pathutils.normalizeSeparator(p).split('/')
-
-    if (parentDirPieces.length > containedPathPieces.length) {
-        return false
-    }
-
-    // Remove final empty element(s), if `d` ends with slash(es).
-    while (parentDirPieces.length > 0 && parentDirPieces[parentDirPieces.length - 1] === '') {
-        parentDirPieces.pop()
-    }
-    const caseInsensitive = os.platform() === 'win32'
-
-    return parentDirPieces.every((value, index) => {
-        return caseInsensitive
-            ? value.toLowerCase() === containedPathPieces[index].toLowerCase()
-            : value === containedPathPieces[index]
-    })
-}
-
-/**
- * Returns `name.suffix` if it does not already exist in directory `dir`, else appends
- * a number ("foo-1.txt", "foo-2.txt", etc.).
- *
- * To avoid excessive filesystem activity, if all filenames up to `max` exist,
- * the function instead appends a random string.
- *
- * @param dir  Path to a directory
- * @param name  Filename without extension
- * @param suffix  Filename suffix, typically an extension (".txt"), may be empty
- * @param max  Stop searching if all permutations up to this number exist
- */
-export function getNonexistentFilename(dir: string, name: string, suffix: string, max: number = 99): string {
-    if (!name) {
-        throw new Error(`name is empty`)
-    }
-    if (!fs.existsSync(dir)) {
-        throw new Error(`directory does not exist: ${dir}`)
-    }
-    for (let i = 0; true; i++) {
-        const filename =
-            i == 0 ? `${name}${suffix}` : `${name}-${i < max ? i : crypto.randomBytes(4).toString('hex')}${suffix}`
-        const fullpath = path.join(dir, filename)
-        if (!fs.existsSync(fullpath) || i >= max + 99) {
-            return filename
-        }
-    }
-}
-
-/**
- * Searches for existence of at least one file with the passed suffix
- * @param dir Directory to search
- * @param suffix Suffix to look for (ex.".ts")
- * @param exclude Pattern to ignore
- * @returns True if at least one file is found with given suffix
- */
-export async function hasFileWithSuffix(dir: string, suffix: string, exclude?: vscode.GlobPattern): Promise<boolean> {
-    const searchFolder = `${dir}**/*${suffix}`
-    const matchedFiles = await vscode.workspace.findFiles(searchFolder, exclude, 1)
-    return matchedFiles.length > 0
-}
-
-/**
- * TEMPORARY SHIM for vscode.workspace.findFiles() on Cloud9.
- *
- * @param dir Directory to search
- * @param fileName Name of file to locate
- * @returns  List of one or zero Uris (for compat with vscode.workspace.findFiles())
- */
-export async function cloud9Findfile(dir: string, fileName: string): Promise<vscode.Uri[]> {
-    const files = await readdir(dir)
-    const subDirs: vscode.Uri[] = []
-    for (const file of files) {
-        const filePath = path.join(dir, file)
-        if (filePath === path.join(dir, fileName)) {
-            return [vscode.Uri.file(filePath)]
-        }
-        if ((await stat(filePath)).isDirectory()) {
-            subDirs.push(vscode.Uri.file(filePath))
-        }
-    }
-    for (const d of subDirs) {
-        const found = await cloud9Findfile(d.fsPath, fileName)
-        if (found.length > 0) {
-            return found
-        }
-    }
-    return []
-}
-/**
- * @returns  A string path to the last locally stored download location. If none, returns the users 'Downloads' directory path.
- */
-export function getDefaultDownloadPath(): string {
-    const lastUsedPath = globals.context.globalState.get('aws.downloadPath')
-    if (lastUsedPath) {
-        if (typeof lastUsedPath === 'string') {
-            return lastUsedPath
-        }
-        getLogger().error('Expected "aws.downloadPath" to be string, got %O', typeof lastUsedPath)
-    }
-    return downloadsDir()
-}
-
-export async function setDefaultDownloadPath(downloadPath: string) {
-    try {
-        const savePath = await stat(downloadPath)
-        if (savePath.isDirectory()) {
-            globals.context.globalState.update('aws.downloadPath', downloadPath)
-        } else {
-            globals.context.globalState.update('aws.downloadPath', path.dirname(downloadPath))
-        }
-    } catch (err) {
-        getLogger().error('Error while setting "aws.downloadPath"', err as Error)
-    }
-}
diff --git a/src/shared/fs/templateRegistry.ts b/src/shared/fs/templateRegistry.ts
deleted file mode 100644
index f49d6e84026..00000000000
--- a/src/shared/fs/templateRegistry.ts
+++ /dev/null
@@ -1,250 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { readFileSync } from 'fs'
-import { CloudFormation } from '../cloudformation/cloudformation'
-import * as pathutils from '../utilities/pathUtils'
-import * as path from 'path'
-import { isInDirectory } from '../filesystemUtilities'
-import { dotNetRuntimes, goRuntimes, javaRuntimes } from '../../lambda/models/samLambdaRuntime'
-import { getLambdaDetails } from '../../lambda/utils'
-import { WatchedFiles, WatchedItem } from './watchedFiles'
-import { getLogger } from '../logger'
-import globals from '../extensionGlobals'
-import { isUntitledScheme, normalizeVSCodeUri } from '../utilities/vsCodeUtils'
-
-export class CloudFormationTemplateRegistry extends WatchedFiles<CloudFormation.Template> {
-    protected name: string = 'CloudFormationTemplateRegistry'
-    protected async process(uri: vscode.Uri, contents?: string): Promise<CloudFormation.Template | undefined> {
-        // P0: Assume all template.yaml/yml files are CFN templates and assign correct JSON schema.
-        // P1: Alter registry functionality to search ALL YAML files and apply JSON schemas + add to registry based on validity
-
-        let template: CloudFormation.Template | undefined
-        const path = normalizeVSCodeUri(uri)
-        try {
-            if (isUntitledScheme(uri)) {
-                if (!contents) {
-                    // this error technically just throw us into the catch so the error message isn't used
-                    throw new Error('Contents must be defined for untitled uris')
-                }
-                template = await CloudFormation.loadByContents(contents, false)
-            } else {
-                template = await CloudFormation.load(path, false)
-            }
-        } catch (e) {
-            globals.schemaService.registerMapping({ uri, type: 'yaml', schema: undefined })
-            return undefined
-        }
-
-        // same heuristic used by cfn-lint team:
-        // https://github.com/aws-cloudformation/aws-cfn-lint-visual-studio-code/blob/629de0bac4f36cfc6534e409a6f6766a2240992f/client/src/yaml-support/yaml-schema.ts#L39-L51
-        if (template.AWSTemplateFormatVersion || template.Resources) {
-            if (template.Transform && template.Transform.toString().startsWith('AWS::Serverless')) {
-                // apply serverless schema
-                globals.schemaService.registerMapping({ uri, type: 'yaml', schema: 'sam' })
-            } else {
-                // apply cfn schema
-                globals.schemaService.registerMapping({ uri, type: 'yaml', schema: 'cfn' })
-            }
-
-            return template
-        }
-
-        globals.schemaService.registerMapping({ uri, type: 'yaml', schema: undefined })
-        return undefined
-    }
-
-    // handles delete case
-    public override async remove(uri: vscode.Uri): Promise<void> {
-        globals.schemaService.registerMapping({
-            uri,
-            type: 'yaml',
-            schema: undefined,
-        })
-        await super.remove(uri)
-    }
-}
-
-/**
- * Gets resources and additional metadata for resources tied to a filepath and handler.
- * Checks all registered templates by default; otherwise can operate on a subset TemplateDatum[]
- * @param filepath Handler file's path
- * @param handler Handler function from aforementioned file
- * @param unfilteredTemplates Array containing TemplateDatum objects to filter
- */
-export function getResourcesForHandler(
-    filepath: string,
-    handler: string,
-    unfilteredTemplates: WatchedItem<CloudFormation.Template>[] = globals.templateRegistry.registeredItems
-): { templateDatum: WatchedItem<CloudFormation.Template>; name: string; resourceData: CloudFormation.Resource }[] {
-    // TODO: Array.flat and Array.flatMap not introduced until >= Node11.x -- migrate when VS Code updates Node ver
-    const o = unfilteredTemplates.map(templateDatum => {
-        return getResourcesForHandlerFromTemplateDatum(filepath, handler, templateDatum).map(resource => {
-            return {
-                ...resource,
-                templateDatum,
-            }
-        })
-    })
-    if (o.length === 0) {
-        return []
-    }
-    return o.reduce((acc, cur) => [...acc, ...cur])
-}
-
-/**
- * Returns an array of Cloudformation Resources in a TemplateDatum that is tied to the filepath and handler given.
- * @param filepath Handler file's path
- * @param handler Handler function from aforementioned file
- * @param templateDatum TemplateDatum object to search through
- */
-export function getResourcesForHandlerFromTemplateDatum(
-    filepath: string,
-    handler: string,
-    templateDatum: WatchedItem<CloudFormation.Template>
-): { name: string; resourceData: CloudFormation.Resource }[] {
-    const matchingResources: { name: string; resourceData: CloudFormation.Resource }[] = []
-    const templateDirname = path.dirname(templateDatum.path)
-    // template isn't a parent or sibling of file
-    if (!isInDirectory(templateDirname, path.dirname(filepath))) {
-        return []
-    }
-
-    // no resources
-    const resources = templateDatum.item.Resources
-    if (!resources) {
-        return []
-    }
-
-    for (const key of Object.keys(resources)) {
-        const resource = resources[key]
-        // check if some sort of serverless function
-        if (
-            resource &&
-            [CloudFormation.SERVERLESS_FUNCTION_TYPE, CloudFormation.LAMBDA_FUNCTION_TYPE].includes(resource.Type)
-        ) {
-            // parse template values that could potentially be refs
-            const registeredRuntime = CloudFormation.getStringForProperty(
-                resource.Properties,
-                'Runtime',
-                templateDatum.item
-            )
-            const registeredCodeUri = CloudFormation.getStringForProperty(
-                resource.Properties,
-                'CodeUri',
-                templateDatum.item
-            )
-            const registeredHandler = CloudFormation.getStringForProperty(
-                resource.Properties,
-                'Handler',
-                templateDatum.item
-            )
-
-            // properties for image type templates
-            const registeredPackageType = CloudFormation.getStringForProperty(
-                resource.Properties,
-                'PackageType',
-                templateDatum.item
-            )
-            const registeredDockerContext = CloudFormation.getStringForProperty(
-                resource.Metadata,
-                'DockerContext',
-                templateDatum.item
-            )
-            const registeredDockerFile = CloudFormation.getStringForProperty(
-                resource.Metadata,
-                'Dockerfile',
-                templateDatum.item
-            )
-
-            if (registeredRuntime && registeredHandler && registeredCodeUri) {
-                // Java and .NET are currently special cases in that the filepath and handler aren't specific.
-                // For now: check if handler matches and check if the code URI contains the filepath.
-                // TODO: Can we use Omnisharp or some sort of Java tooling to help guide us better?
-                if (dotNetRuntimes.includes(registeredRuntime) || javaRuntimes.includes(registeredRuntime)) {
-                    if (
-                        handler === registeredHandler &&
-                        isInDirectory(
-                            pathutils.normalize(path.join(templateDirname, registeredCodeUri)),
-                            pathutils.normalize(filepath)
-                        )
-                    ) {
-                        matchingResources.push({ name: key, resourceData: resource })
-                    }
-                } else if (goRuntimes.includes(registeredRuntime)) {
-                    // Go is another special case. The handler merely refers to the compiled binary.
-                    // We ignore checking for a handler name match, since it is not relevant
-                    // See here: https://github.com/aws/aws-lambda-go
-                    if (
-                        isInDirectory(
-                            pathutils.normalize(path.join(templateDirname, registeredCodeUri)),
-                            pathutils.normalize(filepath)
-                        )
-                    ) {
-                        matchingResources.push({ name: key, resourceData: resource })
-                    }
-                } else {
-                    // Interpreted languages all follow the same spec:
-                    // ./path/to/handler/without/file/extension.handlerName
-                    // Check to ensure filename and handler both match.
-                    try {
-                        const parsedLambda = getLambdaDetails({
-                            Handler: registeredHandler,
-                            Runtime: registeredRuntime,
-                        })
-                        const functionName = handler.split('.').pop()
-                        if (
-                            pathutils.normalize(filepath) ===
-                                pathutils.normalize(
-                                    path.join(templateDirname, registeredCodeUri, parsedLambda.fileName)
-                                ) &&
-                            functionName === parsedLambda.functionName
-                        ) {
-                            matchingResources.push({ name: key, resourceData: resource })
-                        }
-                    } catch (e) {
-                        getLogger().warn(
-                            `Resource ${key} in template ${templateDirname} has invalid runtime for handler ${handler}: ${registeredRuntime}`
-                        )
-                    }
-                }
-                // not direct-invoke type, attempt image type
-            } else if (registeredPackageType === 'Image' && registeredDockerContext && registeredDockerFile) {
-                // path must be inside dockerDir
-                const dockerDir = path.join(templateDirname, registeredDockerContext)
-                if (isInDirectory(dockerDir, filepath)) {
-                    let adjustedHandler: string = handler
-                    if (!filepath.endsWith('.cs')) {
-                        // reframe path to be relative to dockerDir instead of package.json
-                        // omit filename and append filename + function name from handler
-                        const relPath = path.relative(dockerDir, path.dirname(filepath))
-                        const handlerParts = pathutils.normalizeSeparator(handler).split('/')
-                        adjustedHandler = pathutils.normalizeSeparator(
-                            path.join(relPath, handlerParts[handlerParts.length - 1])
-                        )
-                    }
-                    try {
-                        // open dockerfile and see if it has a handler that matches the handler represented by this file
-                        const fileText = readFileSync(path.join(dockerDir, registeredDockerFile)).toString()
-                        // exact match within quotes to avoid shorter paths being picked up
-                        if (
-                            new RegExp(`['"]${adjustedHandler}['"]`, 'g').test(pathutils.normalizeSeparator(fileText))
-                        ) {
-                            matchingResources.push({ name: key, resourceData: resource })
-                        }
-                    } catch (e) {
-                        // file read error
-                        getLogger().error(e as Error)
-                    }
-                }
-            } else {
-                getLogger().verbose(`Resource ${key} in template ${templateDirname} does not match handler ${handler}`)
-            }
-        }
-    }
-
-    return matchingResources
-}
diff --git a/src/shared/fs/watchedFiles.ts b/src/shared/fs/watchedFiles.ts
deleted file mode 100644
index a0387430c2b..00000000000
--- a/src/shared/fs/watchedFiles.ts
+++ /dev/null
@@ -1,284 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { getLogger } from '../logger/logger'
-import * as pathutils from '../utilities/pathUtils'
-import * as path from 'path'
-import { isUntitledScheme, normalizeVSCodeUri } from '../utilities/vsCodeUtils'
-
-export interface WatchedItem<T> {
-    /**
-     * The absolute path to the file
-     */
-    path: string
-    /**
-     * An item based on the file and type of WatchedFiles
-     */
-    item: T
-}
-
-/**
- * WatchedFiles lets us index files in the current registry. It is used
- * for CFN templates among other things. WatchedFiles holds a list of pairs of
- * the absolute path to the file or "untitled:" URI along with a transform of it that is useful for
- * where it is used. For example, for templates, it parses the template and stores it.
- */
-export abstract class WatchedFiles<T> implements vscode.Disposable {
-    private readonly disposables: vscode.Disposable[] = []
-    private _isDisposed: boolean = false
-    private readonly globs: vscode.GlobPattern[] = []
-    private readonly excludedFilePatterns: RegExp[] = []
-    private readonly registryData: Map<string, T> = new Map<string, T>()
-
-    /**
-     * Process any incoming URI/content, doing any parsing/validation as required.
-     * If the path does not point to a file on the local file system then contents should be defined.
-     * If it fails, throws
-     * @param path A uri with the absolute path to the detected file
-     */
-    protected abstract process(path: vscode.Uri, contents?: string): Promise<T | undefined>
-
-    /**
-     * Name for logs
-     */
-    protected abstract name: string
-
-    public constructor() {
-        this.disposables.push(
-            vscode.workspace.onDidChangeWorkspaceFolders(async () => {
-                await this.rebuild()
-            })
-        )
-    }
-
-    /**
-     * Creates a watcher across all opened workspace folders (or see below to
-     * watch _outside_ the workspace).
-     *
-     * (since vscode 1.64):
-     * - Watches RECURSIVELY if `pattern` is complex (e.g. contains `**` or
-     *   path segments), else watches NON-RECURSIVELY (i.e. only changes at the
-     *   first level will be reported).
-     *   https://github.com/microsoft/vscode/blob/7da792ae7cb53ee5a22b24016bca5dee31f43d41/src/vscode-dts/vscode.d.ts#L11428
-     * - `globPattern` as _string_ means "watch all opened workspace folders".
-     *   It cannot be used to add more folders for watching, nor will it report
-     *   events outside of workspace folders.
-     * - To watch _outside_ the workspace, pass `vscode.RelativePattern(vscode.Uri(…))`:
-     *   - non-recursive: `addWatchPattern(new RelativePattern(Uri.file(…), '*.js'))`
-     *   - recursive: `addWatchPattern(new RelativePattern(Uri.file(…), '**x/*.js'))`
-     * - **Note** recursive files may be excluded by user configuration
-     *   (`files.watcherExclude`, e.g. "node_modules"). To avoid that, watch
-     *   simple (non-recursive) patterns.
-     *
-     * https://github.com/microsoft/vscode/issues/3025#issuecomment-1007242256
-     *
-     * > we setup recursive watchers for all workspace folders right on startup
-     * > and we don't allow extensions to add additional watchers for the
-     * > workspace, because that would result in multiple watchers on the same
-     * > paths competing against each other.
-     *
-     * @param glob Pattern to match against (across all opened workspace folders)
-     */
-    public async addWatchPattern(glob: vscode.GlobPattern): Promise<void> {
-        if (this._isDisposed) {
-            throw new Error(`${this.name}: manager has already been disposed!`)
-        }
-        if (typeof glob === 'string' && !vscode.workspace.workspaceFolders?.[0]) {
-            getLogger().warn(`${this.name}: addWatchPattern(${glob}): no workspace`)
-        }
-        this.globs.push(glob)
-
-        const watcher = vscode.workspace.createFileSystemWatcher(glob)
-        this.addWatcher(watcher)
-
-        await this.rebuild()
-    }
-
-    /**
-     * Create a special watcher that operates only on untitled files.
-     * To "watch" the in-memory contents of an untitled:/ file we just subscribe to `onDidChangeTextDocument`
-     */
-    public async watchUntitledFiles() {
-        this.disposables.push(
-            vscode.workspace.onDidChangeTextDocument((event: vscode.TextDocumentChangeEvent) => {
-                if (isUntitledScheme(event.document.uri)) {
-                    this.addItemToRegistry(event.document.uri, true, event.document.getText())
-                }
-            }),
-            vscode.workspace.onDidCloseTextDocument((event: vscode.TextDocument) => {
-                if (isUntitledScheme(event.uri)) {
-                    this.remove(event.uri)
-                }
-            })
-        )
-    }
-
-    /**
-     * Adds a regex pattern to ignore paths containing the pattern
-     */
-    public async addExcludedPattern(pattern: RegExp): Promise<void> {
-        if (this._isDisposed) {
-            throw new Error(`${this.name}: manager has already been disposed!`)
-        }
-        this.excludedFilePatterns.push(pattern)
-
-        await this.rebuild()
-    }
-
-    /**
-     * Adds an item to registry. Wipes any existing item in its place with new copy of the data
-     * @param uri vscode.Uri containing the item to load in
-     */
-    public async addItemToRegistry(uri: vscode.Uri, quiet?: boolean, contents?: string): Promise<void> {
-        const excluded = this.excludedFilePatterns.find(pattern => uri.fsPath.match(pattern))
-        if (excluded) {
-            getLogger().verbose(`${this.name}: excluding path (matches "${excluded}"): ${uri.fsPath}`)
-            return
-        }
-        this.assertAbsolute(uri)
-        const pathAsString = normalizeVSCodeUri(uri)
-        try {
-            const item = await this.process(uri, contents)
-            if (item) {
-                this.registryData.set(pathAsString, item)
-            } else {
-                // if value isn't valid for type, remove from registry
-                this.registryData.delete(pathAsString)
-            }
-        } catch (e) {
-            if (!quiet) {
-                throw e
-            }
-            getLogger().verbose(`${this.name}: failed to load(): ${uri}: ${(e as Error).message}`)
-        }
-    }
-
-    /**
-     * Get a specific item's data
-     * Untitled files must be referred to by their URI
-     * @param path Absolute path to item of interest or a vscode.Uri to the item
-     */
-    public getRegisteredItem(path: string | vscode.Uri): WatchedItem<T> | undefined {
-        // fsPath is needed for Windows, it's equivalent to path on mac/linux
-        const normalizedPath = typeof path === 'string' ? pathutils.normalize(path) : normalizeVSCodeUri(path)
-        this.assertAbsolute(normalizedPath)
-        const item = this.registryData.get(normalizedPath)
-        if (!item) {
-            return undefined
-        }
-        return {
-            path: normalizedPath,
-            item: item,
-        }
-    }
-
-    /**
-     * Returns the registry's data as an array of paths to type T objects
-     */
-    public get registeredItems(): WatchedItem<T>[] {
-        const arr: WatchedItem<T>[] = []
-
-        for (const itemPath of this.registryData.keys()) {
-            const item = this.getRegisteredItem(itemPath)
-            if (item) {
-                arr.push(item)
-            }
-        }
-
-        return arr
-    }
-
-    /**
-     * Removes an item from the registry.
-     *
-     * @param path Path to the item
-     */
-    public async remove(path: vscode.Uri): Promise<void> {
-        const pathAsString = normalizeVSCodeUri(path)
-        this.assertAbsolute(pathAsString)
-        this.registryData.delete(pathAsString)
-    }
-
-    /**
-     * Disposes FileRegistry and marks as disposed.
-     */
-    public dispose(): void {
-        if (!this._isDisposed) {
-            while (this.disposables.length > 0) {
-                const disposable = this.disposables.pop()
-                if (disposable) {
-                    disposable.dispose()
-                }
-            }
-            this._isDisposed = true
-        }
-    }
-
-    /**
-     * Rebuilds registry using current glob and exclusion patterns.
-     * All functionality is currently internal to class, but can be made public if we want a manual "refresh" button
-     */
-    public async rebuild(): Promise<void> {
-        this.reset()
-        for (const glob of this.globs) {
-            const itemUris = await vscode.workspace.findFiles(glob)
-            for (const item of itemUris) {
-                await this.addItemToRegistry(item, true)
-            }
-        }
-    }
-
-    /**
-     * Removes all items from the registry.
-     */
-    public reset() {
-        this.registryData.clear()
-    }
-
-    /**
-     * Sets watcher functionality and adds to this.disposables
-     * @param watcher vscode.FileSystemWatcher
-     */
-    private addWatcher(watcher: vscode.FileSystemWatcher): void {
-        this.disposables.push(
-            watcher,
-            watcher.onDidChange(async uri => {
-                getLogger().verbose(`${this.name}: detected change: ${uri.fsPath}`)
-                await this.addItemToRegistry(uri)
-            }),
-            watcher.onDidCreate(async uri => {
-                getLogger().verbose(`${this.name}: detected new file: ${uri.fsPath}`)
-                await this.addItemToRegistry(uri)
-            }),
-            watcher.onDidDelete(async uri => {
-                getLogger().verbose(`${this.name}: detected delete: ${uri.fsPath}`)
-                await this.remove(uri)
-            })
-        )
-    }
-
-    /**
-     * Assert if the path is absolute.
-     * Untitled URIs are considered absolute
-     * @param p The path to verify
-     */
-    private assertAbsolute(p: string | vscode.Uri) {
-        const pathAsString = typeof p === 'string' ? p : p.fsPath
-        if (
-            (typeof p === 'string' && !path.isAbsolute(pathAsString) && !pathAsString.startsWith('untitled:')) ||
-            (typeof p !== 'string' && !path.isAbsolute(pathAsString) && !isUntitledScheme(p))
-        ) {
-            throw new Error(`FileRegistry: path is relative when it should be absolute: ${pathAsString}`)
-        }
-    }
-}
-
-export class NoopWatcher extends WatchedFiles<any> {
-    protected async process(uri: vscode.Uri): Promise<any> {
-        throw new Error(`Attempted to add a file to the NoopWatcher: ${uri.fsPath}`)
-    }
-    protected name: string = 'NoOp'
-}
diff --git a/src/shared/icons.ts b/src/shared/icons.ts
deleted file mode 100644
index 2433081ffa6..00000000000
--- a/src/shared/icons.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import globals from './extensionGlobals'
-
-import type * as packageJson from '../../package.json'
-import * as fs from 'fs'
-import * as path from 'path'
-import { Uri, ThemeIcon, ThemeColor } from 'vscode'
-import { isCloud9 } from './extensionUtilities'
-import { memoize } from './utilities/functionUtils'
-import { getLogger } from './logger/logger'
-
-// Animation:
-// https://code.visualstudio.com/api/references/icons-in-labels#animation
-
-type ContributedIcon = keyof typeof packageJson.contributes.icons
-type IconPath = { light: Uri; dark: Uri } | Icon
-type IconId = `vscode-${string}` | ContributedIcon
-
-/**
- * Gets an icon associated with the specified `id`.
- *
- * May return either {@link ThemeIcon} or URIs to icons. Callers should just pass the result directly
- * to any consuming APIs.
- *
- * Icons contributed by the extension are prefixed based off their location in the `icons` directory.
- *
- * For example, `aws-s3-bucket` refers to `bucket.svg` in `icons/aws/s3`. Note that while identifiers
- * may be derived from their source, that doesn't mean all valid identifiers have locations on disk.
- */
-export const getIcon = memoize(resolveIconId)
-
-/**
- * Convenient way to add icons provided by {@link getIcon} into a string.
- *
- * Invalid icons are simply omitted. This function also removes any leading
- * or trailing white space from the final result.
- *
- * #### Example:
- * ```ts
- * vscode.window.setStatusBarMessage(codicon`${getIcon('vscode-clippy')} Copied to clipboard`)
- * ```
- */
-export function codicon(parts: TemplateStringsArray, ...components: (string | IconPath)[]): string {
-    const canUse = (sub: string | IconPath) => typeof sub === 'string' || (!isCloud9() && sub instanceof Icon)
-    const resolved = components.filter(canUse).map(String)
-
-    return parts
-        .map((v, i) => `${v}${i < resolved.length ? resolved[i] : ''}`)
-        .join('')
-        .trim()
-}
-
-/**
- * See {@link ThemeIcon}.
- *
- * Used to expose the icon identifier which is otherwise hidden.
- */
-export class Icon extends ThemeIcon {
-    public constructor(public readonly id: string, public readonly source?: Uri, public readonly color?: ThemeColor) {
-        super(id)
-    }
-
-    public override toString() {
-        return `$(${this.id})`
-    }
-}
-
-/**
- * Adds a new {@link ThemeColor} to an existing icon.
- *
- * You can find theme color identifiers
- * {@link https://code.visualstudio.com/api/references/contribution-points#contributes.colors here}
- */
-export function addColor(icon: IconPath, color: string | ThemeColor): IconPath {
-    if (isCloud9() || !(icon instanceof Icon)) {
-        return icon
-    }
-
-    return new Icon(icon.id, icon.source, typeof color === 'string' ? new ThemeColor(color) : color)
-}
-
-function resolveIconId(
-    id: IconId,
-    shouldUseCloud9 = isCloud9(),
-    iconsPath = globals.context.asAbsolutePath(path.join('resources', 'icons'))
-): IconPath {
-    const [namespace, ...rest] = id.split('-')
-    const name = rest.join('-')
-
-    // This 'override' logic is to support legacy use-cases, though ideally we wouldn't need it at all
-    const cloud9Override = shouldUseCloud9 ? resolvePathsSync(path.join(iconsPath, 'cloud9'), id) : undefined
-    const override = cloud9Override ?? resolvePathsSync(path.join(iconsPath, namespace), name)
-    if (override) {
-        getLogger().verbose(`icons: using override for "${id}"`)
-        return override
-    }
-
-    // TODO: remove when they support codicons + the contribution point
-    if (shouldUseCloud9) {
-        const generated = resolvePathsSync(path.join(iconsPath, 'cloud9', 'generated'), id)
-
-        if (generated) {
-            return generated
-        }
-    }
-
-    // TODO: potentially embed the icon source in `package.json` to avoid this messy mapping
-    // of course, doing that implies we must always bundle both the original icon files and the font file
-    const source = !['cloud9', 'vscode'].includes(namespace)
-        ? Uri.joinPath(Uri.file(iconsPath), namespace, rest[0], `${rest.slice(1).join('-')}.svg`)
-        : undefined
-
-    return new Icon(namespace === 'vscode' ? name : id, source)
-}
-
-function resolvePathsSync(rootDir: string, target: string): { light: Uri; dark: Uri } | undefined {
-    const darkPath = path.join(rootDir, 'dark', `${target}.svg`)
-    const lightPath = path.join(rootDir, 'light', `${target}.svg`)
-
-    try {
-        if (fs.existsSync(darkPath) && fs.existsSync(lightPath)) {
-            return { dark: Uri.file(darkPath), light: Uri.file(lightPath) }
-        }
-    } catch (error) {
-        getLogger().warn(`icons: path resolution failed for "${target}": %s`, error)
-    }
-}
diff --git a/src/shared/localizedText.ts b/src/shared/localizedText.ts
deleted file mode 100644
index bcac2fb6a62..00000000000
--- a/src/shared/localizedText.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-import { getIdeProperties } from './extensionUtilities'
-const localize = nls.loadMessageBundle()
-
-export const yes = localize('AWS.generic.response.yes', 'Yes')
-export const no = localize('AWS.generic.response.no', 'No')
-export const ok = localize('AWS.generic.response.ok', 'OK')
-export const retry = localize('AWS.generic.response.retry', 'Retry')
-export const skip = localize('AWS.generic.response.skip', 'Skip')
-export const confirm = localize('AWS.generic.confirm', 'Confirm')
-export const invalidArn = localize('AWS.error.invalidArn', 'Invalid ARN')
-export const localizedDelete = localize('AWS.generic.delete', 'Delete')
-export const cancel = localize('AWS.generic.cancel', 'Cancel')
-export const help = localize('AWS.generic.help', 'Help')
-export const invalidNumberWarning = localize('AWS.validateTime.error.invalidNumber', 'Input must be a positive number')
-export const viewDocs = localize('AWS.generic.viewDocs', 'View Documentation')
-export const recentlyUsed = localize('AWS.generic.recentlyUsed', 'recently used')
-export const viewSettings = localize('AWS.generic.viewSettings', 'View Settings')
-export const dontShow = localize('aws.generic.doNotShowAgain', "Don't Show Again")
-export const loadMore = localize('AWS.generic.loadMore', 'Load More')
-
-export function checklogs(): string {
-    const message = localize(
-        'AWS.error.check.logs',
-        'Check the logs by running the "View {0} Toolkit Logs" command from the {1}.',
-        getIdeProperties().company,
-        getIdeProperties().commandPalette
-    )
-
-    return message
-}
diff --git a/src/shared/logger/activation.ts b/src/shared/logger/activation.ts
deleted file mode 100644
index 008fe7ae8ac..00000000000
--- a/src/shared/logger/activation.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as moment from 'moment'
-import * as path from 'path'
-import * as vscode from 'vscode'
-import * as nls from 'vscode-nls'
-import * as fs from 'fs-extra'
-import { Logger, LogLevel, getLogger } from '.'
-import { extensionSettingsPrefix } from '../constants'
-import { setLogger } from './logger'
-import { logOutputChannel } from './outputChannel'
-import { WinstonToolkitLogger } from './winstonToolkitLogger'
-import { waitUntil } from '../utilities/timeoutUtils'
-import { cleanLogFiles } from './util'
-import { Settings } from '../settings'
-import { Logging } from './commands'
-import { SystemUtilities } from '../systemUtilities'
-
-const localize = nls.loadMessageBundle()
-
-const defaultLogLevel: LogLevel = 'info'
-
-/**
- * Activate Logger functionality for the extension.
- */
-export async function activate(
-    extensionContext: vscode.ExtensionContext,
-    outputChannel: vscode.OutputChannel
-): Promise<void> {
-    const chan = logOutputChannel
-    const logUri = vscode.Uri.joinPath(extensionContext.logUri, makeLogFilename())
-
-    await SystemUtilities.createDirectory(extensionContext.logUri)
-
-    const mainLogger = makeLogger(
-        {
-            logPaths: [logUri.fsPath],
-            outputChannels: [chan],
-        },
-        extensionContext.subscriptions
-    )
-
-    setLogger(mainLogger)
-    getLogger().error(`log level: ${getLogLevel()}`)
-
-    // channel logger
-    setLogger(
-        makeLogger(
-            {
-                logPaths: [logUri.fsPath],
-                outputChannels: [outputChannel, chan],
-            },
-            extensionContext.subscriptions
-        ),
-        'channel'
-    )
-
-    // debug channel logger
-    setLogger(
-        makeLogger(
-            {
-                staticLogLevel: 'verbose', // verbose will log anything
-                outputChannels: [outputChannel, chan],
-                useDebugConsole: true,
-            },
-            extensionContext.subscriptions
-        ),
-        'debugConsole'
-    )
-
-    getLogger().debug(`Logging started: ${logUri}`)
-
-    const commands = new Logging(logUri, mainLogger)
-    extensionContext.subscriptions.push(...Object.values(Logging.declared).map(c => c.register(commands)))
-
-    createLogWatcher(logUri)
-        .then(sub => {
-            extensionContext.subscriptions.push(sub)
-        })
-        .catch(err => {
-            getLogger().warn('Failed to start log file watcher: %s', err)
-        })
-
-    cleanLogFiles(path.dirname(logUri.fsPath)).catch(err => {
-        getLogger().warn('Failed to clean-up old logs: %s', err)
-    })
-}
-
-/**
- * Creates a logger off of specified params
- * @param opts Specified parameters, all optional:
- * @param opts.staticLogLevel Static log level, overriding config value. Will persist overridden config value even if the config value changes.
- * @param opts.logPaths Array of paths to output log entries to
- * @param opts.outputChannels Array of output channels to log entries to
- * @param opts.useDebugConsole If true, outputs log entries to currently-active debug console. As per VS Code API, cannot specify a debug console in particular.
- * @param disposables Array of disposables to add a subscription to
- */
-export function makeLogger(
-    opts: {
-        staticLogLevel?: LogLevel
-        logPaths?: string[]
-        outputChannels?: vscode.OutputChannel[]
-        useDebugConsole?: boolean
-    },
-    disposables?: vscode.Disposable[]
-): Logger {
-    const logger = new WinstonToolkitLogger(opts.staticLogLevel ?? getLogLevel())
-    // debug console can show ANSI colors, output channels can not
-    // if we're outputting to an output channel, any other output doesn't need ANSI color codes since we have a better display from them in the IDE
-    // don't alter logfile output for now since that should be more diagnostic. On the fence about this...
-    const stripAnsi = opts.useDebugConsole || false
-    for (const logPath of opts.logPaths ?? []) {
-        logger.logToFile(logPath)
-    }
-    for (const outputChannel of opts.outputChannels ?? []) {
-        logger.logToOutputChannel(outputChannel, stripAnsi)
-    }
-    if (opts.useDebugConsole) {
-        logger.logToDebugConsole()
-    }
-
-    if (!opts.staticLogLevel) {
-        vscode.workspace.onDidChangeConfiguration(
-            configurationChangeEvent => {
-                if (configurationChangeEvent.affectsConfiguration('aws.logLevel')) {
-                    const newLogLevel = getLogLevel()
-                    logger.setLogLevel(newLogLevel)
-                }
-            },
-            undefined,
-            disposables
-        )
-    }
-
-    return logger
-}
-
-function getLogLevel(): LogLevel {
-    const configuration = Settings.instance.getSection(extensionSettingsPrefix)
-
-    return configuration.get('logLevel', defaultLogLevel)
-}
-
-function makeLogFilename(): string {
-    const m = moment()
-    const date = m.format('YYYYMMDD')
-    const time = m.format('HHmmss')
-    // the 'T' matches VS Code's log file name format
-    const datetime = `${date}T${time}`
-
-    return `aws_toolkit_${datetime}.log`
-}
-
-/**
- * Watches for renames on the log file and notifies the user.
- */
-async function createLogWatcher(logFile: vscode.Uri): Promise<vscode.Disposable> {
-    const exists = await waitUntil(() => SystemUtilities.fileExists(logFile), { interval: 1000, timeout: 60000 })
-
-    if (!exists) {
-        getLogger().warn(`Log file ${logFile.path} does not exist!`)
-        return { dispose: () => {} }
-    }
-
-    let checking = false
-    // TODO: fs.watch() has many problems, consider instead:
-    //   - https://github.com/paulmillr/chokidar
-    //   - https://www.npmjs.com/package/fb-watchman
-    const watcher = fs.watch(logFile.fsPath, async eventType => {
-        if (checking || eventType !== 'rename') {
-            return
-        }
-        checking = true
-        if (!(await SystemUtilities.fileExists(logFile))) {
-            vscode.window.showWarningMessage(
-                localize('AWS.log.logFileMove', 'The log file for this session has been moved or deleted.')
-            )
-            watcher.close()
-        }
-        checking = false
-    })
-
-    return { dispose: () => watcher.close() }
-}
diff --git a/src/shared/logger/commands.ts b/src/shared/logger/commands.ts
deleted file mode 100644
index 05f3bc85e7b..00000000000
--- a/src/shared/logger/commands.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { Logger } from '.'
-import { telemetry } from '../telemetry/telemetry'
-import { Commands } from '../vscode/commands2'
-
-function revealLines(editor: vscode.TextEditor, start: number, end: number): void {
-    const startPos = editor.document.lineAt(start).range.start
-    const endPos = editor.document.lineAt(end - 1).range.end
-
-    editor.selection = new vscode.Selection(startPos, endPos)
-    editor.revealRange(new vscode.Range(startPos, endPos))
-}
-
-function clearSelection(editor: vscode.TextEditor): void {
-    const start = new vscode.Position(0, 0)
-
-    editor.selection = new vscode.Selection(start, start)
-}
-
-export class Logging {
-    public static readonly declared = {
-        viewLogs: Commands.from(this).declareOpenLogUri('aws.viewLogs'),
-        viewLogsAtMessage: Commands.from(this).declareOpenLogId('aws.viewLogsAtMessage'),
-    }
-
-    public constructor(private readonly defaultLogUri: vscode.Uri, private readonly logger: Logger) {}
-
-    public async openLogUri(logUri = this.defaultLogUri): Promise<vscode.TextEditor | undefined> {
-        telemetry.toolkit_viewLogs.emit() // Perhaps add additional argument to know which log was viewed?
-
-        return vscode.window.showTextDocument(logUri)
-    }
-
-    public async openLogId(logId: number, logUri = this.defaultLogUri) {
-        const msg = this.logger.getLogById(logId, logUri)
-        const editor = await this.openLogUri(logUri)
-        if (!msg || !editor) {
-            return
-        }
-
-        // Retrieve where the message starts by counting number of newlines
-        const text = editor.document.getText()
-        const textStart = text.indexOf(msg)
-        if (textStart === -1) {
-            this.logger.debug(`logging: unable to find message with id "${logId}"`)
-            return
-        }
-
-        const lineStart = text
-            .slice(0, textStart)
-            .split(/\r?\n/)
-            .filter(x => x).length
-
-        if (lineStart > 0) {
-            const lineEnd = Math.min(editor.document.lineCount, lineStart + msg.split(/\r?\n/).filter(x => x).length)
-            revealLines(editor, lineStart, lineEnd)
-        } else {
-            clearSelection(editor)
-        }
-    }
-}
diff --git a/src/shared/logger/consoleLogTransport.ts b/src/shared/logger/consoleLogTransport.ts
deleted file mode 100644
index 2468244b3c0..00000000000
--- a/src/shared/logger/consoleLogTransport.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as Transport from 'winston-transport'
-import globals from '../extensionGlobals'
-
-const MESSAGE = Symbol.for('message') // eslint-disable-line @typescript-eslint/naming-convention
-
-interface LogEntry {
-    level: string
-    message: string
-    [MESSAGE]: string
-}
-
-/**
- * This transport sends log statements to console.log
- * It is primarily intended for testing, where having the log output could assist in diagnosing issues.
- */
-export class ConsoleLogTransport extends Transport {
-    public constructor(options: Transport.TransportStreamOptions) {
-        super(options)
-    }
-
-    public override log(info: LogEntry, next: () => void): void {
-        globals.clock.setImmediate(() => {
-            this.emit('logged', info)
-            console.log(info[MESSAGE])
-        })
-
-        next()
-    }
-}
diff --git a/src/shared/logger/debugConsoleTransport.ts b/src/shared/logger/debugConsoleTransport.ts
deleted file mode 100644
index c7c1ea6916c..00000000000
--- a/src/shared/logger/debugConsoleTransport.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as Transport from 'winston-transport'
-import globals from '../extensionGlobals'
-
-export const MESSAGE = Symbol.for('message') // eslint-disable-line @typescript-eslint/naming-convention
-
-interface LogEntry {
-    level: string
-    message: string
-    [MESSAGE]: string
-}
-
-export class DebugConsoleTransport extends Transport {
-    public constructor(
-        options: Transport.TransportStreamOptions & {
-            name: string
-        }
-    ) {
-        super(options)
-    }
-
-    public override log(info: LogEntry, next: () => void): void {
-        globals.clock.setImmediate(() => {
-            vscode.debug.activeDebugConsole.append(info[MESSAGE])
-            this.emit('logged', info)
-        })
-
-        next()
-    }
-}
diff --git a/src/shared/logger/index.ts b/src/shared/logger/index.ts
deleted file mode 100644
index adf828660b3..00000000000
--- a/src/shared/logger/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-// This file is the common import file, intended for use by most extension code.
-// It surfaces Logger and related interfaces, types, and retrieval.
-import * as logger from './logger'
-export { showLogOutputChannel } from './outputChannel'
-
-export type Loggable = Error | string
-
-export type Logger = logger.Logger
-export type LogLevel = logger.LogLevel
-export const getLogger = logger.getLogger
-export const getNullLogger = logger.getNullLogger
diff --git a/src/shared/logger/logger.ts b/src/shared/logger/logger.ts
deleted file mode 100644
index 088d908bfd5..00000000000
--- a/src/shared/logger/logger.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Uri } from 'vscode'
-
-const toolkitLoggers: {
-    main: Logger | undefined
-    channel: Logger | undefined
-    debugConsole: Logger | undefined
-} = { main: undefined, channel: undefined, debugConsole: undefined }
-
-export interface Logger {
-    debug(message: string, ...meta: any[]): number
-    debug(error: Error, ...meta: any[]): number
-    verbose(message: string, ...meta: any[]): number
-    verbose(error: Error, ...meta: any[]): number
-    info(message: string, ...meta: any[]): number
-    info(error: Error, ...meta: any[]): number
-    warn(message: string, ...meta: any[]): number
-    warn(error: Error, ...meta: any[]): number
-    error(message: string, ...meta: any[]): number
-    error(error: Error, ...meta: any[]): number
-    setLogLevel(logLevel: LogLevel): void
-    /** Returns true if the given log level is being logged.  */
-    logLevelEnabled(logLevel: LogLevel): boolean
-    getLogById(logID: number, file: Uri): string | undefined
-}
-
-/**
- * Log levels ordered for comparison.
- *
- * See https://github.com/winstonjs/winston#logging-levels :
- * > RFC5424: severity of levels is numerically ascending from most important
- * > to least important.
- */
-const logLevels = new Map<LogLevel, number>([
-    ['error', 1],
-    ['warn', 2],
-    ['info', 3],
-    ['verbose', 4],
-    ['debug', 5],
-])
-
-export type LogLevel = 'error' | 'warn' | 'info' | 'verbose' | 'debug'
-
-/**
- * Compares log levels.
- *
- * @returns
- * - Zero if the log levels are equal
- * - Negative if `l1` is less than `l2`
- * - Positive if `l1` is greater than `l2`
- */
-export function compareLogLevel(l1: LogLevel, l2: LogLevel): number {
-    return logLevels.get(l1)! - logLevels.get(l2)!
-}
-
-/**
- * Gets the logger if it has been initialized
- * @param type Gets the logger type:
- * * `'main'` or `undefined`: Main logger; default impl: logs to log file and log output channel
- * * `'channel'`: Channel Logger; default impl: logs to the `main` channels and the `AWS Toolkit` output channel
- * * `'debug'`: Debug Console Logger; default impl: logs to the `channel` channels and the currently-active VS Code Debug Console pane.
- */
-export function getLogger(type?: keyof typeof toolkitLoggers): Logger {
-    const logger = toolkitLoggers[type ?? 'main']
-    if (!logger) {
-        return new ConsoleLogger()
-    }
-
-    return logger
-}
-
-export class NullLogger implements Logger {
-    public setLogLevel(logLevel: LogLevel) {}
-    public logLevelEnabled(logLevel: LogLevel): boolean {
-        return false
-    }
-    public debug(message: string | Error, ...meta: any[]): number {
-        return 0
-    }
-    public verbose(message: string | Error, ...meta: any[]): number {
-        return 0
-    }
-    public info(message: string | Error, ...meta: any[]): number {
-        return 0
-    }
-    public warn(message: string | Error, ...meta: any[]): number {
-        return 0
-    }
-    public error(message: string | Error, ...meta: any[]): number {
-        return 0
-    }
-    public getLogById(logID: number, file: Uri): string | undefined {
-        return undefined
-    }
-}
-
-/**
- * Fallback to console.log() if getLogger() is requested before logging is fully initialized.
- */
-export class ConsoleLogger implements Logger {
-    public setLogLevel(logLevel: LogLevel) {}
-    public logLevelEnabled(logLevel: LogLevel): boolean {
-        return false
-    }
-    public debug(message: string | Error, ...meta: any[]): number {
-        console.trace(message, meta)
-        return 0
-    }
-    public verbose(message: string | Error, ...meta: any[]): number {
-        console.debug(message, meta)
-        return 0
-    }
-    public info(message: string | Error, ...meta: any[]): number {
-        console.info(message, meta)
-        return 0
-    }
-    public warn(message: string | Error, ...meta: any[]): number {
-        console.warn(message, meta)
-        return 0
-    }
-    public error(message: string | Error, ...meta: any[]): number {
-        console.error(message, meta)
-        return 0
-    }
-    public getLogById(logID: number, file: Uri): string | undefined {
-        return undefined
-    }
-}
-
-export function getNullLogger(type?: 'channel' | 'debugConsole' | 'main'): Logger {
-    return new NullLogger()
-}
-/**
- * Sets (or clears) the logger that is accessible to code.
- * The Extension is expected to call this only once per log type.
- * Tests should call this to set up a logger prior to executing code that accesses a logger.
- */
-export function setLogger(logger: Logger | undefined, type?: 'channel' | 'debugConsole' | 'main') {
-    toolkitLoggers[type ?? 'main'] = logger
-}
diff --git a/src/shared/logger/outputChannel.ts b/src/shared/logger/outputChannel.ts
deleted file mode 100644
index 1da8291eca8..00000000000
--- a/src/shared/logger/outputChannel.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-
-export const logOutputChannel: vscode.OutputChannel = vscode.window.createOutputChannel('AWS Toolkit Logs')
-
-/**
- * Shows the log output channel.
- */
-export function showLogOutputChannel({ preserveFocus = true }: { preserveFocus?: boolean } = {}): void {
-    logOutputChannel.show(preserveFocus)
-}
diff --git a/src/shared/logger/outputChannelTransport.ts b/src/shared/logger/outputChannelTransport.ts
deleted file mode 100644
index 1e39fb23c64..00000000000
--- a/src/shared/logger/outputChannelTransport.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as Transport from 'winston-transport'
-import globals from '../extensionGlobals'
-import { removeAnsi } from '../utilities/textUtilities'
-
-export const MESSAGE = Symbol.for('message') // eslint-disable-line @typescript-eslint/naming-convention
-
-interface LogEntry {
-    level: string
-    message: string
-    [MESSAGE]: string
-    raw: boolean
-}
-
-export class OutputChannelTransport extends Transport {
-    private readonly outputChannel: vscode.OutputChannel
-    private readonly stripAnsi: boolean
-
-    public constructor(
-        options: Transport.TransportStreamOptions & {
-            outputChannel: vscode.OutputChannel
-            stripAnsi: boolean
-            name?: string
-        }
-    ) {
-        super(options)
-
-        this.outputChannel = options.outputChannel
-        this.stripAnsi = options.stripAnsi
-    }
-
-    public override log(info: LogEntry, next: () => void): void {
-        globals.clock.setImmediate(() => {
-            const msg: string = this.stripAnsi ? removeAnsi(info[MESSAGE]) : info[MESSAGE]
-
-            if (info.raw) {
-                this.outputChannel.append(msg)
-            } else {
-                this.outputChannel.appendLine(msg)
-            }
-
-            this.emit('logged', info)
-        })
-
-        next()
-    }
-}
diff --git a/src/shared/logger/util.ts b/src/shared/logger/util.ts
deleted file mode 100644
index aac14c1cc25..00000000000
--- a/src/shared/logger/util.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as fs from 'fs-extra'
-import * as path from 'path'
-import { getLogger } from '.'
-
-const defaultCleanupParams = {
-    maxLogs: 100,
-    maxFileSize: 100000000, // 100 MB
-    maxKeptLogs: 20,
-    minKeptLogs: 2,
-}
-
-/**
- * Deletes the older logs when there are too many or are using too much space.
- */
-export async function cleanLogFiles(logDir: string, params = defaultCleanupParams): Promise<void> {
-    let files = await fs.readdir(logDir)
-
-    if (files.length > params.maxLogs) {
-        await deleteOldLogFiles(logDir, files, params.maxKeptLogs)
-        files = await fs.readdir(logDir)
-    }
-
-    let dirSize = 0
-    const oversizedFiles = []
-    for (const log of files) {
-        const logFullPath = path.join(logDir, log)
-        let logSize: number = 0
-        try {
-            logSize = (await fs.stat(logFullPath)).size
-        } catch (e) {
-            getLogger().error('cleanLogFiles: fs.stat() failed on file "%s": %s', logFullPath, (e as Error).message)
-        }
-        if (logSize > params.maxFileSize) {
-            oversizedFiles.push(log)
-        }
-        dirSize += logSize
-    }
-    // remove any single files over 100MB
-    if (oversizedFiles.length) {
-        await deleteOldLogFiles(logDir, oversizedFiles, 0)
-        files = await fs.readdir(logDir)
-    }
-    if (dirSize > params.maxFileSize) {
-        await deleteOldLogFiles(logDir, files, params.minKeptLogs)
-    }
-}
-
-/**
- * Deletes the oldest created files, leaving the desired quantity of latest files.
- */
-async function deleteOldLogFiles(logDir: string, files: string[], keepLatest: number): Promise<void> {
-    files.sort()
-    // This removes the latest files, leaving only the files to be deleted
-    files.length = files.length >= keepLatest ? files.length - keepLatest : 0
-    if (files.length) {
-        getLogger().info(
-            `Log folder contains more than 100 logs or is over 100MB. Deleted the ${files.length} oldest files`
-        )
-        for (const file of files) {
-            try {
-                await fs.unlink(path.join(logDir, file))
-            } catch (error) {
-                getLogger().error('cleanLogFiles: Failed to delete file: %s', file, (error as Error).message)
-            }
-        }
-    }
-}
diff --git a/src/shared/logger/winstonToolkitLogger.ts b/src/shared/logger/winstonToolkitLogger.ts
deleted file mode 100644
index 27fd9926f40..00000000000
--- a/src/shared/logger/winstonToolkitLogger.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { normalize } from 'path'
-import * as vscode from 'vscode'
-import * as winston from 'winston'
-import { ConsoleLogTransport } from './consoleLogTransport'
-import { DebugConsoleTransport } from './debugConsoleTransport'
-import { Logger, LogLevel, compareLogLevel } from './logger'
-import { OutputChannelTransport } from './outputChannelTransport'
-import { isSourceMappingAvailable } from '../vscode/env'
-import { formatError, ToolkitError, UnknownError } from '../errors'
-
-// Need to limit how many logs are actually tracked
-// LRU cache would work well, currently it just dumps the least recently added log
-const logmapSize: number = 1000
-export class WinstonToolkitLogger implements Logger, vscode.Disposable {
-    private readonly logger: winston.Logger
-    private disposed: boolean = false
-    private idCounter: number = 0
-    private logMap: { [logID: number]: { [filePath: string]: string } } = {}
-
-    public constructor(logLevel: LogLevel) {
-        this.logger = winston.createLogger({
-            format: winston.format.combine(
-                winston.format.splat(),
-                winston.format.timestamp({
-                    format: 'YYYY-MM-DD HH:mm:ss',
-                }),
-                winston.format.errors({ stack: true }),
-                winston.format.printf(info => {
-                    if (info.raw) {
-                        return info.message
-                    }
-
-                    return `${info.timestamp} [${info.level.toUpperCase()}]: ${info.message}`
-                })
-            ),
-            level: logLevel,
-        })
-    }
-
-    public setLogLevel(logLevel: LogLevel) {
-        if (this.logger.level === logLevel) {
-            return
-        }
-        // Log calls are made with explicit levels to ensure the text is output
-        this.logger.level = logLevel
-        this.logger.log(this.logger.level, `Log level: ${this.logger.level}`)
-    }
-
-    public logLevelEnabled(logLevel: LogLevel): boolean {
-        const currentLevel = this.logger.level as LogLevel
-        return compareLogLevel(currentLevel, logLevel) >= 0
-    }
-
-    public logToFile(logPath: string): void {
-        const fileTransport: winston.transport = new winston.transports.File({ filename: logPath })
-        const fileUri: vscode.Uri = vscode.Uri.file(normalize(logPath))
-        fileTransport.on('logged', (obj: any) => this.parseLogObject(fileUri, obj))
-        this.logger.add(fileTransport)
-    }
-
-    public logToOutputChannel(outputChannel: vscode.OutputChannel, stripAnsi: boolean): void {
-        const outputChannelTransport: winston.transport = new OutputChannelTransport({
-            outputChannel,
-            stripAnsi,
-        })
-        const channelUri: vscode.Uri = vscode.Uri.parse(`channel://${outputChannel.name}`)
-        outputChannelTransport.on('logged', (obj: any) => this.parseLogObject(channelUri, obj))
-        this.logger.add(outputChannelTransport)
-    }
-
-    public logToDebugConsole(): void {
-        const debugConsoleTransport: winston.transport = new DebugConsoleTransport({ name: 'ActiveDebugConsole' })
-        const debugConsoleUri: vscode.Uri = vscode.Uri.parse('console://debug')
-        debugConsoleTransport.on('logged', (obj: any) => this.parseLogObject(debugConsoleUri, obj))
-        this.logger.add(debugConsoleTransport)
-    }
-
-    public logToConsole(): void {
-        const consoleLogTransport: winston.transport = new ConsoleLogTransport({})
-        const logConsoleUri: vscode.Uri = vscode.Uri.parse('console://log')
-        consoleLogTransport.on('logged', (obj: any) => this.parseLogObject(logConsoleUri, obj))
-        this.logger.add(consoleLogTransport)
-    }
-
-    public debug(message: string | Error, ...meta: any[]): number {
-        return this.writeToLogs('debug', message, ...meta)
-    }
-
-    public verbose(message: string | Error, ...meta: any[]): number {
-        return this.writeToLogs('verbose', message, ...meta)
-    }
-
-    public info(message: string | Error, ...meta: any[]): number {
-        return this.writeToLogs('info', message, ...meta)
-    }
-
-    public warn(message: string | Error, ...meta: any[]): number {
-        return this.writeToLogs('warn', message, ...meta)
-    }
-
-    public error(message: string | Error, ...meta: any[]): number {
-        return this.writeToLogs('error', message, ...meta)
-    }
-
-    public dispose(): Promise<void> {
-        return this.disposed
-            ? Promise.resolve()
-            : new Promise<void>(resolve => {
-                  this.disposed = true
-                  // The 'finish' event is emitted after all underlying transports have emitted a 'finish' event: https://github.com/winstonjs/winston/blob/36586d3d30dfe32f9dd4fbabbd585e82d47d460d/lib/winston/logger.js#L316-L332
-                  this.logger.once('finish', resolve)
-                  this.logger.end()
-              })
-    }
-
-    private mapError(level: LogLevel, err: Error): Error | string {
-        if (isSourceMappingAvailable() && level === 'error') {
-            return err
-        }
-
-        return err instanceof ToolkitError ? err.trace : formatError(UnknownError.cast(err))
-    }
-
-    private writeToLogs(level: LogLevel, message: string | Error, ...meta: any[]): number {
-        if (this.disposed) {
-            throw new Error('Cannot write to disposed logger')
-        }
-
-        meta = meta.map(o => (o instanceof Error ? this.mapError(level, o) : o))
-
-        if (message instanceof Error) {
-            this.logger.log(level, '%O', message, ...meta, { logID: this.idCounter })
-        } else {
-            this.logger.log(level, message, ...meta, { logID: this.idCounter })
-        }
-
-        this.logMap[this.idCounter % logmapSize] = {}
-        return this.idCounter++
-    }
-
-    /**
-     * Attempts to get the mapped message corresponding to the provided file and logID.
-     * Log messages are considered 'stale' after a constant amount of new logs have been added.
-     *
-     * @param logID  Unique ID associated with every log operation
-     * @param file  Desired output file Uri. Debug console uses the uri 'console://debug' and output channel uses 'channel://output'
-     *
-     * @returns  Final log message. Stale or non-existant logs return undefined
-     */
-    public getLogById(logID: number, file: vscode.Uri): string | undefined {
-        // Not possible, yell at the caller :(
-        if (logID >= this.idCounter || logID < 0) {
-            throw new Error(`Invalid log state, logID=${logID} must be in the range [0, ${this.idCounter})!`)
-        }
-
-        // This prevents callers from getting stale logs
-        if (this.idCounter - logID > logmapSize) {
-            return undefined
-        }
-
-        if (this.logMap[logID % logmapSize]) {
-            return this.logMap[logID % logmapSize][file.toString(true)]
-        }
-    }
-
-    /**
-     * Register this function to a Transport's 'logged' event to parse out the resulting meta data and log ID
-     * Immediately records this log into logMap so it can be collected by an external caller
-     *
-     * @param file  File that was written to
-     * @param obj  Object passed from the event
-     */
-    private parseLogObject(file: vscode.Uri, obj: any): void {
-        const logID: number = parseInt(obj.logID) % logmapSize
-        const symbols: symbol[] = Object.getOwnPropertySymbols(obj)
-        const messageSymbol: symbol | undefined = symbols.find((s: symbol) => s.toString() === 'Symbol(message)')
-
-        if (this.logMap[logID] !== undefined && messageSymbol) {
-            this.logMap[logID][file.toString(true)] = obj[messageSymbol]
-        }
-    }
-}
diff --git a/src/shared/regions/endpoints.ts b/src/shared/regions/endpoints.ts
deleted file mode 100644
index f80e6bd5a92..00000000000
--- a/src/shared/regions/endpoints.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { getLogger } from '../logger'
-
-// Parses the endpoints.json file into a usable structure
-
-export interface Endpoints {
-    partitions: Partition[]
-}
-
-export interface Partition {
-    dnsSuffix: string
-    id: string
-    name: string
-    regions: Region[]
-    services: Service[]
-}
-
-export interface Region {
-    /**
-     * Region Code
-     */
-    id: string
-    /**
-     * Friendly Name
-     */
-    name: string
-}
-
-export interface Service {
-    id: string
-    endpoints: ServiceEndpoints[]
-    isRegionalized?: boolean
-    partitionEndpoint?: string
-}
-
-export interface ServiceEndpoints {
-    regionId: string
-    data: any
-}
-
-// --- JSON Serialization Structures ---
-interface ManifestEndpoints {
-    partitions?: ManifestPartition[]
-}
-
-interface JsonStringMap<T> {
-    [key: string]: T
-}
-
-interface ManifestPartition {
-    dnsSuffix: string
-    partition: string
-    partitionName: string
-    regions?: JsonStringMap<ManifestRegion>
-    services?: JsonStringMap<ManifestService>
-}
-
-interface ManifestRegion {
-    description: string
-}
-
-interface ManifestService {
-    endpoints?: JsonStringMap<any>
-    isRegionalized?: boolean
-    partitionEndpoint?: string
-}
-
-// --- END JSON Serialization Structures ---
-
-export function loadEndpoints(json: string): Endpoints | undefined {
-    try {
-        const manifestEndpoints = JSON.parse(json) as ManifestEndpoints
-
-        return {
-            partitions: manifestEndpoints.partitions?.map(convertToPartition) ?? [],
-        }
-    } catch (err) {
-        const logger = getLogger()
-        logger.error('Failed to load endpoints manifest: %O', err as Error)
-        logger.verbose('endpoints payload was: %s', json)
-
-        return undefined
-    }
-}
-
-function convertToPartition(partition: ManifestPartition): Partition {
-    return {
-        dnsSuffix: partition.dnsSuffix,
-        id: partition.partition,
-        name: partition.partitionName,
-        regions: convertJsonMap(partition.regions, convertToRegion),
-        services: convertJsonMap(partition.services, convertToService),
-    }
-}
-
-function convertJsonMap<TIn, TOut>(
-    jsonMap: JsonStringMap<TIn> | undefined,
-    convertObject: (id: string, obj: TIn) => TOut
-): TOut[] {
-    if (!jsonMap) {
-        return []
-    }
-
-    return Object.keys(jsonMap).map(id => convertObject(id, jsonMap[id]))
-}
-
-function convertToRegion(id: string, region: ManifestRegion): Region {
-    return {
-        id: id,
-        name: region.description,
-    }
-}
-
-function convertToService(id: string, service: ManifestService): Service {
-    return {
-        id: id,
-        isRegionalized: service.isRegionalized,
-        partitionEndpoint: service.partitionEndpoint,
-        endpoints: convertJsonMap(service.endpoints, convertToServiceEndpoint),
-    }
-}
-
-function convertToServiceEndpoint(id: string, data: any): ServiceEndpoints {
-    return {
-        regionId: id,
-        data: data,
-    }
-}
diff --git a/src/shared/regions/endpointsProvider.ts b/src/shared/regions/endpointsProvider.ts
deleted file mode 100644
index 6e252fb1880..00000000000
--- a/src/shared/regions/endpointsProvider.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { getLogger } from '../logger'
-import { ResourceFetcher } from '../resourcefetcher/resourcefetcher'
-import { Endpoints, loadEndpoints } from './endpoints'
-
-export class EndpointsProvider {
-    /**
-     * @param localFetcher Retrieves endpoints manifest from local sources available to the toolkit. Expected
-     *                      to resolve fast, and is both a placeholder until the remote resources are loaded, and
-     *                      is a fallback in case the toolkit is unable to load a remote resource
-     * @param remoteFetcher Retrieves endpoints manifest from remote host
-     */
-    public constructor(
-        private readonly localFetcher: ResourceFetcher,
-        private readonly remoteFetcher: ResourceFetcher
-    ) {}
-
-    public async load(): Promise<Endpoints> {
-        getLogger().info('Retrieving AWS endpoint data')
-        const remoteEndpointsJson = await this.remoteFetcher.get()
-        if (remoteEndpointsJson) {
-            const remoteEndpoints = loadEndpoints(remoteEndpointsJson)
-            if (remoteEndpoints) {
-                return remoteEndpoints
-            }
-        }
-
-        const localEndpointsJson = await this.localFetcher.get()
-        if (localEndpointsJson) {
-            const localEndpoints = loadEndpoints(localEndpointsJson)
-            if (localEndpoints) {
-                return localEndpoints
-            }
-        }
-
-        // If endpoints were never loaded by this point, we have a critical error
-        throw new Error('Failure to load any endpoints manifest data')
-    }
-}
diff --git a/src/shared/regions/regionProvider.ts b/src/shared/regions/regionProvider.ts
deleted file mode 100644
index d63a2891de9..00000000000
--- a/src/shared/regions/regionProvider.ts
+++ /dev/null
@@ -1,179 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import globals from '../extensionGlobals'
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as vscode from 'vscode'
-import { getLogger } from '../logger'
-import { Endpoints, Region } from './endpoints'
-import { EndpointsProvider } from './endpointsProvider'
-import { AWSTreeNodeBase } from '../treeview/nodes/awsTreeNodeBase'
-import { regionSettingKey } from '../constants'
-import { AwsContext } from '../awsContext'
-import { getIdeProperties, isCloud9 } from '../extensionUtilities'
-
-export const defaultRegion = 'us-east-1'
-export const defaultPartition = 'aws'
-export const defaultDnsSuffix = 'amazonaws.com'
-
-interface RegionData {
-    dnsSuffix: string
-    partitionId: string
-    region: Region
-    serviceIds: string[]
-}
-
-export class RegionProvider {
-    private readonly regionData: Map<string, RegionData> = new Map()
-    private readonly onDidChangeEmitter = new vscode.EventEmitter<void>()
-    public readonly onDidChange = this.onDidChangeEmitter.event
-
-    private lastTouchedRegion?: string
-
-    public constructor(
-        endpoints: Endpoints = { partitions: [] },
-        private readonly globalState = globals.context.globalState,
-        private readonly awsContext: Pick<AwsContext, 'getCredentialDefaultRegion'> = globals.awsContext
-    ) {
-        this.loadFromEndpoints(endpoints)
-    }
-
-    public get defaultRegionId() {
-        return this.awsContext.getCredentialDefaultRegion() ?? defaultRegion
-    }
-
-    public get defaultPartitionId() {
-        return this.getPartitionId(this.defaultRegionId)
-    }
-
-    public isServiceInRegion(serviceId: string, regionId: string): boolean {
-        return !!this.regionData.get(regionId)?.serviceIds.find(x => x === serviceId) ?? false
-    }
-
-    public getPartitionId(regionId: string): string | undefined {
-        const partitionId = this.regionData.get(regionId)?.partitionId
-
-        if (!partitionId) {
-            getLogger().warn(`Unable to determine the Partition that Region ${regionId} belongs to`)
-        }
-
-        return partitionId ?? undefined
-    }
-
-    public getDnsSuffixForRegion(regionId: string): string | undefined {
-        const dnsSuffix = this.regionData.get(regionId)?.dnsSuffix
-
-        if (!dnsSuffix) {
-            getLogger().warn(`Unable to find region data for: ${regionId}`)
-        }
-
-        return dnsSuffix ?? undefined
-    }
-
-    public getRegions(partitionId = this.defaultPartitionId): Region[] {
-        return [...this.regionData.values()]
-            .filter(region => region.partitionId === partitionId)
-            .map(region => region.region)
-    }
-
-    public getExplorerRegions(): string[] {
-        return this.globalState.get<string[]>(regionSettingKey, [])
-    }
-
-    public async updateExplorerRegions(regions: string[]): Promise<void> {
-        return this.globalState.update(regionSettingKey, Array.from(new Set(regions)))
-    }
-
-    /**
-     * @param node node on current command.
-     * @returns heuristic for default region based on
-     * last touched region in explorer, wizard response, and node passed in.
-     */
-    public guessDefaultRegion(node?: AWSTreeNodeBase): string {
-        const explorerRegions = this.getExplorerRegions()
-
-        if (node?.regionCode) {
-            return node.regionCode
-        } else if (explorerRegions.length === 1) {
-            return explorerRegions[0]
-        } else if (this.lastTouchedRegion) {
-            return this.lastTouchedRegion
-        } else {
-            const lastWizardResponse = this.globalState.get<Region>('lastSelectedRegion')
-            if (lastWizardResponse && lastWizardResponse.id) {
-                return lastWizardResponse.id
-            } else {
-                return this.defaultRegionId
-            }
-        }
-    }
-
-    public setLastTouchedRegion(region: string | undefined) {
-        if (region) {
-            this.lastTouchedRegion = region
-        }
-    }
-
-    private loadFromEndpoints(endpoints: Endpoints) {
-        endpoints.partitions.forEach(partition => {
-            partition.regions.forEach(region =>
-                this.regionData.set(region.id, {
-                    dnsSuffix: partition.dnsSuffix,
-                    partitionId: partition.id,
-                    region: region,
-                    serviceIds: [],
-                })
-            )
-
-            partition.services.forEach(service => {
-                service.endpoints.forEach(endpoint => {
-                    const regionData = this.regionData.get(endpoint.regionId)
-
-                    if (regionData) {
-                        regionData.serviceIds.push(service.id)
-                    }
-                })
-            })
-        })
-    }
-
-    public static fromEndpointsProvider(endpointsProvider: EndpointsProvider): RegionProvider {
-        const instance = new this()
-
-        endpointsProvider
-            .load()
-            .then(endpoints => {
-                instance.regionData.clear()
-                instance.loadFromEndpoints(endpoints)
-                instance.onDidChangeEmitter.fire()
-            })
-            .catch(err => {
-                getLogger().error('Failure while loading Endpoints Manifest: %s', err)
-
-                vscode.window.showErrorMessage(
-                    `${localize(
-                        'AWS.error.endpoint.load.failure',
-                        'The {0} Toolkit was unable to load endpoints data.',
-                        getIdeProperties().company
-                    )} ${
-                        isCloud9()
-                            ? localize(
-                                  'AWS.error.impactedFunctionalityReset.cloud9',
-                                  'Toolkit functionality may be impacted until the Cloud9 browser tab is refreshed.'
-                              )
-                            : localize(
-                                  'AWS.error.impactedFunctionalityReset.vscode',
-                                  'Toolkit functionality may be impacted until VS Code is restarted.'
-                              )
-                    }`
-                )
-            })
-
-        return instance
-    }
-}
diff --git a/src/shared/resourcefetcher/compositeResourceFetcher.ts b/src/shared/resourcefetcher/compositeResourceFetcher.ts
deleted file mode 100644
index b1b112990bb..00000000000
--- a/src/shared/resourcefetcher/compositeResourceFetcher.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { getLogger, Logger } from '../logger'
-import { ResourceFetcher } from './resourcefetcher'
-
-// TODO: replace this with something more generic like Log.all(...)
-export class CompositeResourceFetcher implements ResourceFetcher {
-    private readonly logger: Logger = getLogger()
-    private readonly fetchers: ResourceFetcher[]
-
-    /**
-     * @param fetchers - resource load is attempted from provided fetchers until one succeeds
-     */
-    public constructor(...fetchers: ResourceFetcher[]) {
-        this.fetchers = fetchers
-    }
-
-    /**
-     * Returns the contents of the resource from the first fetcher that successfully retrieves it, or undefined if the resource could not be retrieved.
-     */
-    public async get(): Promise<string | undefined> {
-        for (const fetcher of this.fetchers) {
-            const contents = await fetcher.get().catch(err => {
-                this.logger.debug('fetch failed: %s', (err as Error).message)
-            })
-            if (contents) {
-                return contents
-            }
-        }
-    }
-}
diff --git a/src/shared/resourcefetcher/httpResourceFetcher.ts b/src/shared/resourcefetcher/httpResourceFetcher.ts
deleted file mode 100644
index 6124a828387..00000000000
--- a/src/shared/resourcefetcher/httpResourceFetcher.ts
+++ /dev/null
@@ -1,177 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as fs from 'fs'
-import * as http from 'http'
-import * as https from 'https'
-import * as stream from 'stream'
-import got, { Response, RequestError, CancelError } from 'got'
-import urlToOptions from 'got/dist/source/core/utils/url-to-options'
-import Request from 'got/dist/source/core'
-import { VSCODE_EXTENSION_ID } from '../extensions'
-import { getLogger, Logger } from '../logger'
-import { ResourceFetcher } from './resourcefetcher'
-import { Timeout, CancellationError, CancelEvent } from '../utilities/timeoutUtils'
-import { isCloud9 } from '../extensionUtilities'
-
-// XXX: patched Got module for compatability with older VS Code versions (e.g. Cloud9)
-// `got` has also deprecated `urlToOptions`
-const patchedGot = got.extend({
-    request: (url, options, callback) => {
-        if (url.protocol === 'https:') {
-            return https.request({ ...options, ...urlToOptions(url) }, callback)
-        }
-        return http.request({ ...options, ...urlToOptions(url) }, callback)
-    },
-})
-
-/** Promise that resolves/rejects when all streams close. Can also access streams directly. */
-type FetcherResult = Promise<void> & {
-    /** Download stream piped to `fsStream`. */
-    requestStream: Request // `got` doesn't add the correct types to 'on' for some reason
-    /** Stream writing to the file system. */
-    fsStream: fs.WriteStream
-}
-
-export class HttpResourceFetcher implements ResourceFetcher {
-    private readonly logger: Logger = getLogger()
-
-    /**
-     *
-     * @param url URL to fetch a response body from via the `get` call
-     * @param params Additional params for the fetcher
-     * @param {boolean} params.showUrl Whether or not to the URL in log statements.
-     * @param {string} params.friendlyName If URL is not shown, replaces the URL with this text.
-     * @param {function} params.onSuccess Function to execute on successful request. No effect if piping to a location.
-     * @param {Timeout} params.timeout Timeout token to abort/cancel the request. Similar to `AbortSignal`.
-     */
-    public constructor(
-        private readonly url: string,
-        private readonly params: {
-            showUrl: boolean
-            friendlyName?: string
-            onSuccess?(contents: string): void
-            timeout?: Timeout
-        }
-    ) {}
-
-    /**
-     * Returns the contents of the resource, or undefined if the resource could not be retrieved.
-     *
-     * @param pipeLocation Optionally pipe the download to a file system location
-     */
-    public get(): Promise<string | undefined>
-    public get(pipeLocation: string): FetcherResult
-    public get(pipeLocation?: string): Promise<string | undefined> | FetcherResult {
-        this.logger.verbose(`downloading: ${this.logText()}`)
-
-        if (pipeLocation) {
-            const result = this.pipeGetRequest(pipeLocation, this.params.timeout)
-            result.fsStream.on('exit', () => {
-                this.logger.verbose(`downloaded: ${this.logText()}`)
-            })
-
-            return result
-        }
-
-        return this.downloadRequest()
-    }
-
-    private async downloadRequest(): Promise<string | undefined> {
-        try {
-            // HACK(?): receiving JSON as a string without `toString` makes it so we can't deserialize later
-            const contents = (await this.getResponseFromGetRequest(this.params.timeout)).body.toString()
-            if (this.params.onSuccess) {
-                this.params.onSuccess(contents)
-            }
-
-            this.logger.verbose(`downloaded: ${this.logText()}`)
-
-            return contents
-        } catch (err) {
-            const error = err as CancelError | RequestError
-            this.logger.verbose(
-                `Error downloading ${this.logText()}: %s`,
-                error.message ?? error.code ?? error.response?.statusMessage ?? error.response?.statusCode
-            )
-            return undefined
-        }
-    }
-
-    private logText(): string {
-        return this.params.showUrl ? this.url : this.params.friendlyName ?? 'resource from URL'
-    }
-
-    private logCancellation(event: CancelEvent) {
-        getLogger().debug(`Download for "${this.logText()}" ${event.agent === 'user' ? 'cancelled' : 'timed out'}`)
-    }
-
-    // TODO: make pipeLocation a vscode.Uri
-    private pipeGetRequest(pipeLocation: string, timeout?: Timeout): FetcherResult {
-        const requester = isCloud9() ? patchedGot : got
-        const requestStream = requester.stream(this.url, { headers: { 'User-Agent': VSCODE_EXTENSION_ID.awstoolkit } })
-        const fsStream = fs.createWriteStream(pipeLocation)
-
-        const done = new Promise<void>((resolve, reject) => {
-            const pipe = stream.pipeline(requestStream, fsStream, err => {
-                if (err instanceof RequestError) {
-                    return reject(Object.assign(new Error('Failed to download file'), { code: err.code }))
-                }
-                err ? reject(err) : resolve()
-            })
-
-            const cancelListener = timeout?.token.onCancellationRequested(event => {
-                this.logCancellation(event)
-                pipe.destroy(new CancellationError(event.agent))
-            })
-
-            pipe.on('close', () => cancelListener?.dispose())
-        })
-
-        return Object.assign(done, { requestStream, fsStream })
-    }
-
-    private async getResponseFromGetRequest(timeout?: Timeout): Promise<Response<string>> {
-        const requester = isCloud9() ? patchedGot : got
-        const promise = requester(this.url, {
-            headers: { 'User-Agent': VSCODE_EXTENSION_ID.awstoolkit },
-        })
-
-        const cancelListener = timeout?.token.onCancellationRequested(event => {
-            this.logCancellation(event)
-            promise.cancel(new CancellationError(event.agent).message)
-        })
-
-        promise.finally(() => cancelListener?.dispose())
-
-        return promise
-    }
-}
-
-/**
- * Retrieves JSON property value from a remote resource
- * @param property property to retrieve
- * @param url url of JSON resource
- * @param fetcher optional HTTP resource fetcher to use
- * @returns property value if available or undefined
- */
-export async function getPropertyFromJsonUrl(
-    url: string,
-    property: string,
-    fetcher?: HttpResourceFetcher
-): Promise<any | undefined> {
-    const resourceFetcher = fetcher ?? new HttpResourceFetcher(url, { showUrl: true })
-    const result = await resourceFetcher.get()
-    if (result) {
-        try {
-            const json = JSON.parse(result)
-            if (json[property]) {
-                return json[property]
-            }
-        } catch (err) {
-            getLogger().error(`JSON parsing failed for "${url}": ${(err as Error).message}`)
-        }
-    }
-}
diff --git a/src/shared/resourcefetcher/resourcefetcher.ts b/src/shared/resourcefetcher/resourcefetcher.ts
deleted file mode 100644
index 44fd8317a72..00000000000
--- a/src/shared/resourcefetcher/resourcefetcher.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-// TODO: this is just a "thunk". Replace it with something more generic.
-export interface ResourceFetcher {
-    /**
-     * Returns the contents of the resource, or undefined if the resource could not be retrieved.
-     * Implementations are expected to handle Errors.
-     */
-    get(): Promise<string | undefined>
-}
diff --git a/src/shared/sam/activation.ts b/src/shared/sam/activation.ts
deleted file mode 100644
index 12730aec2c9..00000000000
--- a/src/shared/sam/activation.ts
+++ /dev/null
@@ -1,410 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import globals from '../extensionGlobals'
-
-import * as vscode from 'vscode'
-import { createNewSamApplication, resumeCreateNewSamApp } from '../../lambda/commands/createNewSamApp'
-import { deploySamApplication } from '../../lambda/commands/deploySamApplication'
-import { SamParameterCompletionItemProvider } from '../../lambda/config/samParameterCompletionItemProvider'
-import {
-    DefaultSamDeployWizardContext,
-    SamDeployWizard,
-    SamDeployWizardResponse,
-} from '../../lambda/wizards/samDeployWizard'
-import * as codelensUtils from '../codelens/codeLensUtils'
-import * as csLensProvider from '../codelens/csharpCodeLensProvider'
-import * as javaLensProvider from '../codelens/javaCodeLensProvider'
-import * as pyLensProvider from '../codelens/pythonCodeLensProvider'
-import * as goLensProvider from '../codelens/goCodeLensProvider'
-import { SamTemplateCodeLensProvider } from '../codelens/samTemplateCodeLensProvider'
-import * as jsLensProvider from '../codelens/typescriptCodeLensProvider'
-import { ExtContext, VSCODE_EXTENSION_ID } from '../extensions'
-import { getIdeProperties, getIdeType, IDE, isCloud9 } from '../extensionUtilities'
-import { getLogger } from '../logger/logger'
-import { TelemetryService } from '../telemetry/telemetryService'
-import { NoopWatcher } from '../fs/watchedFiles'
-import { detectSamCli } from './cli/samCliDetection'
-import { CodelensRootRegistry } from '../fs/codelensRootRegistry'
-import { AWS_SAM_DEBUG_TYPE } from './debugger/awsSamDebugConfiguration'
-import { SamDebugConfigProvider } from './debugger/awsSamDebugger'
-import { addSamDebugConfiguration } from './debugger/commands/addSamDebugConfiguration'
-import { lazyLoadSamTemplateStrings } from '../../lambda/models/samTemplates'
-import { PromptSettings } from '../settings'
-import { shared } from '../utilities/functionUtils'
-import { migrateLegacySettings, SamCliSettings } from './cli/samCliSettings'
-import { Commands } from '../vscode/commands2'
-import { registerSync } from './sync'
-
-const sharedDetectSamCli = shared(detectSamCli)
-
-/**
- * Activate SAM-related functionality.
- */
-export async function activate(ctx: ExtContext): Promise<void> {
-    await createYamlExtensionPrompt()
-    await migrateLegacySettings()
-    const config = SamCliSettings.instance
-
-    ctx.extensionContext.subscriptions.push(
-        ...(await activateCodeLensProviders(ctx, config, ctx.outputChannel, ctx.telemetryService))
-    )
-
-    await registerServerlessCommands(ctx, config)
-
-    ctx.extensionContext.subscriptions.push(
-        vscode.debug.registerDebugConfigurationProvider(AWS_SAM_DEBUG_TYPE, new SamDebugConfigProvider(ctx))
-    )
-
-    ctx.extensionContext.subscriptions.push(
-        vscode.languages.registerCompletionItemProvider(
-            {
-                language: 'json',
-                scheme: 'file',
-                pattern: '**/.aws/parameters.json',
-            },
-            new SamParameterCompletionItemProvider(),
-            '"'
-        )
-    )
-
-    config.onDidChange(event => {
-        if (event.key === 'location') {
-            // This only shows a message (passive=true), does not set anything.
-            sharedDetectSamCli({ passive: true, showMessage: true })
-        }
-    })
-
-    ctx.extensionContext.subscriptions.push(config)
-
-    if (globals.didReload) {
-        await resumeCreateNewSamApp(ctx)
-    }
-
-    registerSync()
-}
-
-async function registerServerlessCommands(ctx: ExtContext, settings: SamCliSettings): Promise<void> {
-    lazyLoadSamTemplateStrings()
-    ctx.extensionContext.subscriptions.push(
-        Commands.register({ id: 'aws.samcli.detect', autoconnect: false }, () =>
-            sharedDetectSamCli({ passive: false, showMessage: true })
-        ),
-        Commands.register({ id: 'aws.lambda.createNewSamApp', autoconnect: false }, async () => {
-            await createNewSamApplication(ctx)
-        }),
-        Commands.register({ id: 'aws.addSamDebugConfiguration', autoconnect: false }, addSamDebugConfiguration),
-        Commands.register(
-            { id: 'aws.pickAddSamDebugConfiguration', autoconnect: false },
-            codelensUtils.pickAddSamDebugConfiguration
-        ),
-        Commands.register({ id: 'aws.deploySamApplication', autoconnect: true }, async arg => {
-            // `arg` is one of :
-            //  - undefined
-            //  - regionNode (selected from AWS Explorer)
-            //  -  Uri to template.yaml (selected from File Explorer)
-
-            const samDeployWizardContext = new DefaultSamDeployWizardContext(ctx)
-            const samDeployWizard = async (): Promise<SamDeployWizardResponse | undefined> => {
-                const wizard = new SamDeployWizard(samDeployWizardContext, arg)
-                return wizard.run()
-            }
-
-            await deploySamApplication(
-                {
-                    samDeployWizard: samDeployWizard,
-                },
-                {
-                    awsContext: ctx.awsContext,
-                    settings,
-                }
-            )
-        })
-    )
-}
-
-async function activateCodeLensRegistry(context: ExtContext) {
-    try {
-        const registry = new CodelensRootRegistry()
-        globals.codelensRootRegistry = registry
-
-        //
-        // "**/…" string patterns watch recursively across _all_ workspace
-        // folders (see documentation for addWatchPattern()).
-        //
-        await registry.addWatchPattern(pyLensProvider.pythonBasePattern)
-        await registry.addWatchPattern(jsLensProvider.javascriptBasePattern)
-        await registry.addWatchPattern(csLensProvider.csharpBasePattern)
-        await registry.addWatchPattern(goLensProvider.goBasePattern)
-        await registry.addWatchPattern(javaLensProvider.gradleBasePattern)
-        await registry.addWatchPattern(javaLensProvider.mavenBasePattern)
-    } catch (e) {
-        vscode.window.showErrorMessage(
-            localize(
-                'AWS.codelens.failToInitializeCode',
-                'Failed to activate Lambda handler {0}',
-                getIdeProperties().codelenses
-            )
-        )
-        getLogger().error('Failed to activate codelens registry', e)
-        // This prevents us from breaking for any reason later if it fails to load. Since
-        // Noop watcher is always empty, we will get back empty arrays with no issues.
-        globals.codelensRootRegistry = new NoopWatcher() as unknown as CodelensRootRegistry
-    }
-    context.extensionContext.subscriptions.push(globals.codelensRootRegistry)
-}
-
-async function activateCodeLensProviders(
-    context: ExtContext,
-    configuration: SamCliSettings,
-    toolkitOutputChannel: vscode.OutputChannel,
-    telemetryService: TelemetryService
-): Promise<vscode.Disposable[]> {
-    const disposables: vscode.Disposable[] = []
-    const tsCodeLensProvider = codelensUtils.makeTypescriptCodeLensProvider(configuration)
-    const pyCodeLensProvider = await codelensUtils.makePythonCodeLensProvider(configuration)
-    const javaCodeLensProvider = await codelensUtils.makeJavaCodeLensProvider(configuration)
-    const csCodeLensProvider = await codelensUtils.makeCSharpCodeLensProvider(configuration)
-    const goCodeLensProvider = await codelensUtils.makeGoCodeLensProvider(configuration)
-
-    // Ideally we should not need to `await` this Promise, but CodeLens providers are currently not implementing
-    // the event to notify on when their results change.
-    await activateCodeLensRegistry(context)
-
-    const supportedLanguages: {
-        [language: string]: codelensUtils.OverridableCodeLensProvider
-    } = {
-        [jsLensProvider.javascriptLanguage]: tsCodeLensProvider,
-        [pyLensProvider.pythonLanguage]: pyCodeLensProvider,
-    }
-
-    if (!isCloud9()) {
-        supportedLanguages[javaLensProvider.javaLanguage] = javaCodeLensProvider
-        supportedLanguages[csLensProvider.csharpLanguage] = csCodeLensProvider
-        supportedLanguages[goLensProvider.goLanguage] = goCodeLensProvider
-        supportedLanguages[jsLensProvider.typescriptLanguage] = tsCodeLensProvider
-    }
-
-    disposables.push(
-        vscode.languages.registerCodeLensProvider(
-            [
-                {
-                    language: 'yaml',
-                    scheme: 'file',
-                    pattern: '**/*template.{yml,yaml}',
-                },
-            ],
-            new SamTemplateCodeLensProvider()
-        )
-    )
-
-    disposables.push(vscode.languages.registerCodeLensProvider(jsLensProvider.typescriptAllFiles, tsCodeLensProvider))
-    disposables.push(vscode.languages.registerCodeLensProvider(pyLensProvider.pythonAllfiles, pyCodeLensProvider))
-    disposables.push(vscode.languages.registerCodeLensProvider(javaLensProvider.javaAllfiles, javaCodeLensProvider))
-    disposables.push(vscode.languages.registerCodeLensProvider(csLensProvider.csharpAllfiles, csCodeLensProvider))
-    disposables.push(vscode.languages.registerCodeLensProvider(goLensProvider.goAllfiles, goCodeLensProvider))
-
-    disposables.push(
-        Commands.register({ id: 'aws.toggleSamCodeLenses', autoconnect: false }, async () => {
-            const toggled = !configuration.get('enableCodeLenses', false)
-            configuration.update('enableCodeLenses', toggled)
-        })
-    )
-
-    disposables.push(
-        Commands.register('aws.addSamDebugConfig', async () => {
-            const activeEditor = vscode.window.activeTextEditor
-            if (!activeEditor) {
-                getLogger().error(`aws.addSamDebugConfig was called without an active text editor`)
-                vscode.window.showErrorMessage(
-                    localize('AWS.pickDebugHandler.noEditor', 'Toolkit could not find an active editor')
-                )
-
-                return
-            }
-            const document = activeEditor.document
-            const provider = supportedLanguages[document.languageId]
-            if (!provider) {
-                getLogger().error(
-                    `aws.addSamDebugConfig called on a document with an invalid language: ${document.languageId}`
-                )
-                vscode.window.showErrorMessage(
-                    localize(
-                        'AWS.pickDebugHandler.invalidLanguage',
-                        'Toolkit cannot detect handlers in language: {0}',
-                        document.languageId
-                    )
-                )
-
-                return
-            }
-
-            const lenses =
-                (await provider.provideCodeLenses(document, new vscode.CancellationTokenSource().token, true)) ?? []
-            codelensUtils.invokeCodeLensCommandPalette(document, lenses)
-        })
-    )
-
-    return disposables
-}
-
-/**
- * Creates a prompt (via toast) to guide users to installing the Red Hat YAML extension.
- * This is necessary for displaying codelenses on templaye YAML files.
- * Will show once per extension activation at most (all prompting triggers are disposed of on first trigger)
- * Will not show if the YAML extension is installed or if a user has permanently dismissed the message.
- */
-async function createYamlExtensionPrompt(): Promise<void> {
-    const settings = PromptSettings.instance
-
-    // Show this only in VSCode since other VSCode-like IDEs (e.g. Theia) may
-    // not have a marketplace or contain the YAML plugin.
-    if (
-        (await settings.isPromptEnabled('yamlExtPrompt')) &&
-        getIdeType() === IDE.vscode &&
-        !vscode.extensions.getExtension(VSCODE_EXTENSION_ID.yaml)
-    ) {
-        // Disposed immediately after showing one, so the user isn't prompted
-        // more than once per session.
-        const yamlPromptDisposables: vscode.Disposable[] = []
-
-        // user opens a template file
-        vscode.workspace.onDidOpenTextDocument(
-            async (doc: vscode.TextDocument) => {
-                promptInstallYamlPluginFromFilename(doc.fileName, yamlPromptDisposables)
-            },
-            undefined,
-            yamlPromptDisposables
-        )
-
-        // user swaps to an already-open template file that didn't have focus
-        vscode.window.onDidChangeActiveTextEditor(
-            async (editor: vscode.TextEditor | undefined) => {
-                await promptInstallYamlPluginFromEditor(editor, yamlPromptDisposables)
-            },
-            undefined,
-            yamlPromptDisposables
-        )
-
-        /**
-         * Prompt the user to install the YAML plugin when AWSTemplateFormatVersion becomes available as a top level key
-         * in the document
-         * @param event An vscode text document change event
-         * @returns nothing
-         */
-        async function promptOnAWSTemplateFormatVersion(event: vscode.TextDocumentChangeEvent): Promise<void> {
-            for (const change of event.contentChanges) {
-                const changedLine = event.document.lineAt(change.range.start.line)
-                if (changedLine.text.includes('AWSTemplateFormatVersion')) {
-                    promptInstallYamlPlugin(yamlPromptDisposables)
-                    return
-                }
-            }
-            return
-        }
-
-        const promptNotifications = new Map<string, Promise<unknown>>()
-        vscode.workspace.onDidChangeTextDocument(
-            (event: vscode.TextDocumentChangeEvent) => {
-                const uri = event.document.uri.toString()
-                if (
-                    event.document.languageId === 'yaml' &&
-                    !vscode.extensions.getExtension(VSCODE_EXTENSION_ID.yaml) &&
-                    !promptNotifications.has(uri)
-                ) {
-                    promptNotifications.set(
-                        uri,
-                        promptOnAWSTemplateFormatVersion(event).finally(() => promptNotifications.delete(uri))
-                    )
-                }
-            },
-            undefined,
-            yamlPromptDisposables
-        )
-
-        vscode.workspace.onDidCloseTextDocument((event: vscode.TextDocument) => {
-            promptNotifications.delete(event.uri.toString())
-        })
-
-        // user already has an open template with focus
-        // prescreen if a template.yaml is current open so we only call once
-        const openTemplateYamls = vscode.window.visibleTextEditors.filter(editor => {
-            const fileName = editor.document.fileName
-            return fileName.endsWith('template.yaml') || fileName.endsWith('template.yml')
-        })
-
-        if (openTemplateYamls.length > 0) {
-            promptInstallYamlPluginFromEditor(openTemplateYamls[0], yamlPromptDisposables)
-        }
-    }
-}
-
-async function promptInstallYamlPluginFromEditor(
-    editor: vscode.TextEditor | undefined,
-    disposables: vscode.Disposable[]
-): Promise<void> {
-    if (editor) {
-        promptInstallYamlPluginFromFilename(editor.document.fileName, disposables)
-    }
-}
-
-/**
- * Prompt user to install YAML plugin for template.yaml and template.yml files
- * @param fileName File name to check against
- * @param disposables List of disposables to dispose of when the filename is a template YAML file
- */
-async function promptInstallYamlPluginFromFilename(fileName: string, disposables: vscode.Disposable[]): Promise<void> {
-    if (fileName.endsWith('template.yaml') || fileName.endsWith('template.yml')) {
-        promptInstallYamlPlugin(disposables)
-    }
-}
-
-/**
- * Show the install YAML extension prompt and dispose other listeners
- * @param disposables
- */
-async function promptInstallYamlPlugin(disposables: vscode.Disposable[]) {
-    // immediately dispose other triggers so it doesn't flash again
-    for (const prompt of disposables) {
-        prompt.dispose()
-    }
-    const settings = PromptSettings.instance
-
-    const installBtn = localize('AWS.missingExtension.install', 'Install...')
-    const permanentlySuppress = localize('AWS.message.info.yaml.suppressPrompt', "Don't show again")
-
-    const response = await vscode.window.showInformationMessage(
-        localize(
-            'AWS.message.info.yaml.prompt',
-            'Install YAML extension for more {0} features in CloudFormation templates',
-            getIdeProperties().company
-        ),
-        installBtn,
-        permanentlySuppress
-    )
-
-    switch (response) {
-        case installBtn:
-            // Available options are:
-            // extension.open: opens extension page in VS Code extension marketplace view
-            // workspace.extension.installPlugin: autoinstalls plugin with no additional feedback
-            // workspace.extension.search: preloads and executes a search in the extension sidebar with the given term
-
-            // not sure if these are 100% stable.
-            // Opting for `extension.open` as this gives the user a good path forward to install while not doing anything potentially unexpected.
-            try {
-                await vscode.commands.executeCommand('extension.open', VSCODE_EXTENSION_ID.yaml)
-            } catch (e) {
-                const err = e as Error
-                getLogger().error(`Extension ${VSCODE_EXTENSION_ID.yaml} could not be opened: `, err.message)
-            }
-            break
-        case permanentlySuppress:
-            settings.disablePrompt('yamlExtPrompt')
-    }
-}
diff --git a/src/shared/sam/cli/samCliDetection.ts b/src/shared/sam/cli/samCliDetection.ts
deleted file mode 100644
index 2a47f738c15..00000000000
--- a/src/shared/sam/cli/samCliDetection.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as nls from 'vscode-nls'
-import { samAboutInstallUrl } from '../../constants'
-import { telemetry } from '../../telemetry/telemetry'
-import { SamCliSettings } from './samCliSettings'
-
-const localize = nls.loadMessageBundle()
-
-const learnMore = localize('AWS.samcli.userChoice.visit.install.url', 'Get SAM CLI')
-const browseToSamCli = localize('AWS.samcli.userChoice.browse', 'Locate SAM CLI...')
-const settingsUpdated = localize('AWS.samcli.detect.settings.updated', 'Settings updated.')
-
-/**
- * Searches for SAM CLI on the system, updates the user setting if
- * `passive=false`, and shows a message if `showMessage=true`.
- *
- * @param args.passive  Controls whether user setting is updated. Also sets the
- * telemetry "passive" flag.
- * @param args.showMessage true: always show message, false: never show
- * message (except if SAM was not found)
- */
-export async function detectSamCli(args: { passive: boolean; showMessage: boolean | undefined }): Promise<void> {
-    const config = SamCliSettings.instance
-
-    if (!args.passive) {
-        // Force getOrDetectSamCli() to search for SAM CLI.
-        await config.delete('location')
-    }
-
-    const sam = await config.getOrDetectSamCli()
-    const notFound = sam.path === ''
-
-    // Update the user setting.
-    //
-    // NOTE: We must NOT _passively_ auto-update the user setting, that
-    // conflicts with VSCode "remote": each VSCode instance will update the
-    // setting based on its local environment, but the user settings are
-    // shared across VSCode instances...
-    if (!args.passive && sam.autoDetected && sam.path) {
-        await config.update('location', sam.path)
-    }
-
-    if (args.showMessage !== false || notFound) {
-        if (notFound) {
-            notifyUserSamCliNotDetected(config)
-        } else if (args.showMessage === true) {
-            vscode.window.showInformationMessage(getSettingsUpdatedMessage(sam.path ?? '?'))
-        }
-    }
-
-    if (!args.passive) {
-        telemetry.sam_detect.emit({ result: sam.path ? 'Succeeded' : 'Failed' })
-    }
-}
-
-function notifyUserSamCliNotDetected(SamCliSettings: SamCliSettings): void {
-    // inform the user, but don't wait for this to complete
-    vscode.window
-        .showErrorMessage(
-            localize(
-                'AWS.samcli.error.notFound',
-                'Cannot find SAM CLI, which is required to create new Serverless Applications and debug them locally. If you have already installed the SAM CLI, update your User Settings by locating it.'
-            ),
-            learnMore,
-            browseToSamCli
-        )
-        .then(async userResponse => {
-            if (userResponse === learnMore) {
-                await vscode.commands.executeCommand('vscode.open', vscode.Uri.parse(samAboutInstallUrl))
-            } else if (userResponse === browseToSamCli) {
-                const location: vscode.Uri[] | undefined = await vscode.window.showOpenDialog({
-                    canSelectFiles: true,
-                    canSelectFolders: false,
-                    canSelectMany: false,
-                    openLabel: 'Apply location to Settings',
-                })
-
-                if (!!location && location.length === 1) {
-                    const path: string = location[0].fsPath
-                    await SamCliSettings.update('location', path)
-                    vscode.window.showInformationMessage(getSettingsUpdatedMessage(path))
-                }
-            }
-        })
-}
-
-function getSettingsUpdatedMessage(location: string): string {
-    const configuredLocation = localize('AWS.samcli.configured.location', 'SAM CLI Location: {0}', location)
-
-    return `${settingsUpdated} ${configuredLocation}`
-}
diff --git a/src/shared/sam/cli/samCliInfo.ts b/src/shared/sam/cli/samCliInfo.ts
deleted file mode 100644
index b0648933701..00000000000
--- a/src/shared/sam/cli/samCliInfo.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { getLogger, Logger } from '../../logger'
-import { ChildProcess } from '../../utilities/childProcess'
-import { logAndThrowIfUnexpectedExitCode } from './samCliInvokerUtils'
-
-/**
- * Maps out the response text from the sam cli command `sam --info`
- */
-export interface SamCliInfoResponse {
-    version: string
-}
-
-export class SamCliInfoInvocation {
-    public constructor(private readonly samPath: string) {}
-
-    public async execute(): Promise<SamCliInfoResponse> {
-        const childProcessResult = await new ChildProcess(this.samPath, ['--info'], { logging: 'no' }).run()
-
-        logAndThrowIfUnexpectedExitCode(childProcessResult, 0)
-        const response = this.convertOutput(childProcessResult.stdout)
-
-        if (!response) {
-            throw new Error('SAM CLI did not return expected data')
-        }
-
-        return response
-    }
-
-    /**
-     * Parses the output into a typed object with expected data
-     * @param text output from a `sam --info` call
-     */
-    protected convertOutput(text: string): SamCliInfoResponse | undefined {
-        const logger: Logger = getLogger()
-        try {
-            return JSON.parse(text) as SamCliInfoResponse
-        } catch (err) {
-            logger.error(err as Error)
-
-            return undefined
-        }
-    }
-}
diff --git a/src/shared/sam/cli/samCliInvokerUtils.ts b/src/shared/sam/cli/samCliInvokerUtils.ts
deleted file mode 100644
index 2edb4c46e2b..00000000000
--- a/src/shared/sam/cli/samCliInvokerUtils.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { SpawnOptions } from 'child_process'
-import { getLogger } from '../../logger'
-import { ChildProcessResult, ChildProcessOptions } from '../../utilities/childProcess'
-
-export interface SamCliProcessInvokeOptions {
-    spawnOptions?: SpawnOptions
-    arguments?: string[]
-    onStdout?: ChildProcessOptions['onStdout']
-    onStderr?: ChildProcessOptions['onStderr']
-    /** Log command invocations (default: true). */
-    logging?: boolean
-}
-
-export function makeRequiredSamCliProcessInvokeOptions(
-    options?: SamCliProcessInvokeOptions
-): Required<Omit<SamCliProcessInvokeOptions, 'channelLogger' | 'onStdout' | 'onStderr' | 'logging'>> {
-    options = options || {}
-
-    return {
-        spawnOptions: options.spawnOptions || {},
-        arguments: options.arguments || [],
-    }
-}
-
-export interface SamCliProcessInvoker {
-    invoke(options?: SamCliProcessInvokeOptions): Promise<ChildProcessResult>
-    stop(): void
-}
-
-export function makeUnexpectedExitCodeError(message: string): Error {
-    return new Error(`Error with child process: ${message}`)
-}
-
-export function logAndThrowIfUnexpectedExitCode(processResult: ChildProcessResult, expectedExitCode: number): void {
-    if (processResult.exitCode === expectedExitCode) {
-        return
-    }
-
-    const logger = getLogger()
-
-    logger.error(`Unexpected exitcode (${processResult.exitCode}), expecting (${expectedExitCode})`)
-    logger.error(`Error: ${processResult.error}`)
-    logger.error(`stderr: ${processResult.stderr}`)
-    logger.error(`stdout: ${processResult.stdout}`)
-
-    let message: string | undefined
-
-    if (processResult.error instanceof Error) {
-        if (processResult.error.message) {
-            message = processResult.error.message
-        }
-    }
-    const usefulErrors = collectAcceptedErrorMessages(processResult.stderr).join('\n')
-    throw makeUnexpectedExitCodeError(message ?? usefulErrors)
-}
-
-/**
- * Collect known errors messages from a sam error message
- * that may have multiple errors in one message.
- * @param errors A string that can have multiple error messages
- */
-export function collectAcceptedErrorMessages(errorMessage: string): string[] {
-    const errors = errorMessage.split('\n')
-    const shouldCollectFuncs = [startsWithEscapeSequence, startsWithError]
-    return errors.filter(error => {
-        return shouldCollectFuncs.some(shouldCollect => {
-            return shouldCollect(error)
-        })
-    })
-}
-
-/**
- * All accepted escape sequences.
- */
-const yellowForeground = '[33m'
-const acceptedSequences = [yellowForeground]
-
-/**
- * Returns true if text starts with an escape
- * sequence with one of the accepted sequences.
- */
-function startsWithEscapeSequence(text: string, sequences = acceptedSequences): boolean {
-    const escapeInDecimal = 27
-    if (text.charCodeAt(0) !== escapeInDecimal) {
-        return false
-    }
-
-    const remainingText = text.substring(1)
-    return sequences.some(code => {
-        return remainingText.startsWith(code)
-    })
-}
-
-function startsWithError(text: string): boolean {
-    return text.startsWith('Error:')
-}
diff --git a/src/shared/sam/cli/samCliLocator.ts b/src/shared/sam/cli/samCliLocator.ts
deleted file mode 100644
index 76f18a120ae..00000000000
--- a/src/shared/sam/cli/samCliLocator.ts
+++ /dev/null
@@ -1,188 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as path from 'path'
-import { EnvironmentVariables } from '../../environmentVariables'
-import * as filesystemUtilities from '../../filesystemUtilities'
-import { getLogger, Logger } from '../../logger'
-import { SamCliInfoInvocation } from './samCliInfo'
-import { DefaultSamCliValidator, SamCliValidatorContext, SamCliVersionValidation } from './samCliValidator'
-
-export interface SamCliLocationProvider {
-    getLocation(): Promise<{ path: string; version: string } | undefined>
-}
-
-export class DefaultSamCliLocationProvider implements SamCliLocationProvider {
-    private static samCliLocator: BaseSamCliLocator | undefined
-
-    public async getLocation() {
-        return DefaultSamCliLocationProvider.getSamCliLocator().getLocation()
-    }
-
-    public static getSamCliLocator(): SamCliLocationProvider {
-        if (!DefaultSamCliLocationProvider.samCliLocator) {
-            if (process.platform === 'win32') {
-                DefaultSamCliLocationProvider.samCliLocator = new WindowsSamCliLocator()
-            } else {
-                DefaultSamCliLocationProvider.samCliLocator = new UnixSamCliLocator()
-            }
-        }
-
-        return DefaultSamCliLocationProvider.samCliLocator
-    }
-}
-
-abstract class BaseSamCliLocator {
-    /** Indicates that findFileInFolders() returned at least once. */
-    static didFind = false
-    protected readonly logger: Logger = getLogger()
-
-    public constructor() {
-        this.verifyOs()
-    }
-
-    // TODO: this method is being called multiple times on my Windows machine and is really slow
-    public async getLocation() {
-        let location = await this.findFileInFolders(this.getExecutableFilenames(), this.getExecutableFolders())
-
-        if (!location) {
-            location = await this.getSystemPathLocation()
-        }
-
-        this.logger.info(`SAM CLI location: ${location}`)
-
-        return location
-    }
-
-    protected abstract verifyOs(): void
-    protected abstract getExecutableFilenames(): string[]
-    protected abstract getExecutableFolders(): string[]
-
-    protected async findFileInFolders(files: string[], folders: string[]) {
-        const fullPaths: string[] = files
-            .map(file => folders.filter(folder => !!folder).map(folder => path.join(folder, file)))
-            .reduce((accumulator, paths) => {
-                accumulator.push(...paths)
-
-                return accumulator
-            })
-
-        for (const fullPath of fullPaths) {
-            if (!BaseSamCliLocator.didFind) {
-                this.logger.verbose(`Searching for SAM CLI in: ${fullPath}`)
-            }
-            const context: SamCliValidatorContext = {
-                samCliLocation: async () => fullPath,
-                getSamCliExecutableId: async () => 'bogus',
-                getSamCliInfo: async () => new SamCliInfoInvocation(fullPath).execute(),
-            }
-            const validator = new DefaultSamCliValidator(context)
-            if (await filesystemUtilities.fileExists(fullPath)) {
-                try {
-                    const validationResult = await validator.getVersionValidatorResult()
-                    if (validationResult.validation === SamCliVersionValidation.Valid) {
-                        BaseSamCliLocator.didFind = true
-                        return { path: fullPath, version: validationResult.version }
-                    }
-                    this.logger.warn(`Found invalid SAM executable (${validationResult.validation}): ${fullPath}`)
-                } catch (e) {
-                    const err = e as Error
-                    this.logger.error(err)
-                }
-            }
-        }
-
-        BaseSamCliLocator.didFind = true
-        return undefined
-    }
-
-    /**
-     * Searches for `getExecutableFilenames()` in `$PATH` and returns the first
-     * path found on the filesystem, if any.
-     */
-    private async getSystemPathLocation() {
-        const envVars = process.env as EnvironmentVariables
-
-        if (envVars.PATH) {
-            const systemPaths: string[] = envVars.PATH.split(path.delimiter).filter(folder => !!folder)
-
-            return await this.findFileInFolders(this.getExecutableFilenames(), systemPaths)
-        }
-
-        return undefined
-    }
-}
-
-class WindowsSamCliLocator extends BaseSamCliLocator {
-    // Do not access locationPaths directly. Use getExecutableFolders()
-    private static locationPaths: string[] | undefined
-
-    private static readonly executableFilenames: string[] = ['sam.cmd', 'sam.exe']
-
-    public constructor() {
-        super()
-    }
-
-    protected verifyOs(): void {
-        if (process.platform !== 'win32') {
-            throw new Error('Wrong platform')
-        }
-    }
-
-    protected getExecutableFilenames(): string[] {
-        return WindowsSamCliLocator.executableFilenames
-    }
-
-    protected getExecutableFolders(): string[] {
-        if (!WindowsSamCliLocator.locationPaths) {
-            WindowsSamCliLocator.locationPaths = []
-
-            const envVars = process.env as EnvironmentVariables
-
-            const programFiles = envVars.PROGRAMFILES
-            if (programFiles) {
-                WindowsSamCliLocator.locationPaths.push(String.raw`${programFiles}\Amazon\AWSSAMCLI\bin`)
-            }
-
-            const programFilesX86 = envVars['PROGRAMFILES(X86)']
-            if (programFilesX86) {
-                WindowsSamCliLocator.locationPaths.push(String.raw`${programFilesX86}\Amazon\AWSSAMCLI\bin`)
-            }
-        }
-
-        return WindowsSamCliLocator.locationPaths
-    }
-}
-
-class UnixSamCliLocator extends BaseSamCliLocator {
-    private static readonly locationPaths: string[] = [
-        '/usr/local/bin',
-        '/usr/bin',
-        // WEIRD BUT TRUE: brew installs to /home/linuxbrew/.linuxbrew if
-        // possible, else to ~/.linuxbrew.  https://docs.brew.sh/Homebrew-on-Linux
-        '/home/linuxbrew/.linuxbrew/bin',
-        `${process.env.HOME}/.linuxbrew/bin`,
-    ]
-
-    private static readonly executableFilenames: string[] = ['sam']
-
-    public constructor() {
-        super()
-    }
-
-    protected verifyOs(): void {
-        if (process.platform === 'win32') {
-            throw new Error('Wrong platform')
-        }
-    }
-
-    protected getExecutableFilenames(): string[] {
-        return UnixSamCliLocator.executableFilenames
-    }
-
-    protected getExecutableFolders(): string[] {
-        return UnixSamCliLocator.locationPaths
-    }
-}
diff --git a/src/shared/sam/cli/samCliSettings.ts b/src/shared/sam/cli/samCliSettings.ts
deleted file mode 100644
index 356230b9074..00000000000
--- a/src/shared/sam/cli/samCliSettings.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { getLogger } from '../../logger'
-import { fromExtensionManifest, migrateSetting, Settings } from '../../settings'
-import { stripUndefined, toRecord } from '../../utilities/collectionUtils'
-import { ClassToInterfaceType, keys } from '../../utilities/tsUtils'
-import { DefaultSamCliLocationProvider, SamCliLocationProvider } from './samCliLocator'
-
-// TODO(sijaden): remove after a few releases
-export async function migrateLegacySettings() {
-    await migrateSetting(
-        {
-            key: 'aws.manuallySelectedBuckets',
-            type: SavedBuckets,
-        },
-        { key: 'aws.samcli.manuallySelectedBuckets' }
-    )
-
-    await migrateSetting(
-        {
-            key: 'aws.sam.enableCodeLenses',
-            type: Boolean,
-        },
-        { key: 'aws.samcli.enableCodeLenses' }
-    )
-
-    await migrateSetting(
-        {
-            key: 'aws.samcli.lambda.timeout',
-            type: Number,
-        },
-        { key: 'aws.samcli.lambdaTimeout' }
-    )
-}
-
-const localTimeoutDefaultMillis: number = 90000
-interface SavedBuckets {
-    [profile: string]: { [region: string]: string }
-}
-
-function SavedBuckets(value: unknown): SavedBuckets {
-    // Legacy code used to save data as strings
-    const buckets = typeof value === 'string' ? JSON.parse(value) : value
-
-    if (typeof buckets !== 'object' || !buckets) {
-        throw new TypeError('Value was not a non-null object')
-    }
-
-    const result = toRecord(keys(buckets), k => {
-        const v = buckets[k]
-
-        if (typeof v !== 'object' || !v) {
-            getLogger().warn(`Settings: removed invalid key "${k}" from saved buckets`)
-            return undefined
-        }
-
-        return toRecord(keys(v), p => {
-            const bucket = v[p]
-
-            if (typeof bucket !== 'string') {
-                getLogger().warn(`Settings: removed invalid key "${k}.${p}" from saved buckets`)
-                return undefined
-            }
-
-            return bucket
-        })
-    })
-
-    stripUndefined(result)
-
-    return result as SavedBuckets
-}
-
-const description = {
-    location: String,
-    lambdaTimeout: Number,
-    enableCodeLenses: Boolean,
-    manuallySelectedBuckets: SavedBuckets,
-    legacyDeploy: Boolean,
-}
-
-export class SamCliSettings extends fromExtensionManifest('aws.samcli', description) {
-    public constructor(
-        private readonly locationProvider: SamCliLocationProvider = new DefaultSamCliLocationProvider(),
-        settings: ClassToInterfaceType<Settings> = Settings.instance
-    ) {
-        super(settings)
-    }
-
-    /**
-     * Gets location of `sam` from user config, or tries to find `sam` on the
-     * system if the user config is invalid.
-     *
-     * @returns `autoDetected=true` if auto-detection was _attempted_.
-     */
-    public async getOrDetectSamCli(): Promise<{ path: string | undefined; autoDetected: boolean }> {
-        const fromConfig = this.get('location', '')
-
-        if (fromConfig) {
-            return { path: fromConfig, autoDetected: false }
-        }
-
-        const fromSearch = await this.locationProvider.getLocation()
-        return { path: fromSearch?.path, autoDetected: true }
-    }
-
-    public getSavedBuckets(): SavedBuckets | undefined {
-        try {
-            return this.get('manuallySelectedBuckets')
-        } catch (error) {
-            this.delete('manuallySelectedBuckets')
-        }
-    }
-
-    /**
-     * Writes a single new saved bucket to the stored buckets setting, combining previous saved data
-     * if it exists. One saved bucket is limited per region per profile.
-     */
-    public async updateSavedBuckets(profile: string, region: string, bucket: string): Promise<boolean> {
-        const oldBuckets = this.getSavedBuckets()
-
-        return this.update('manuallySelectedBuckets', {
-            ...oldBuckets,
-            [profile]: {
-                ...(oldBuckets?.[profile] ?? {}),
-                [region]: bucket,
-            },
-        })
-    }
-
-    public getLocalInvokeTimeout(): number {
-        return this.get('lambdaTimeout', localTimeoutDefaultMillis)
-    }
-
-    static #instance: SamCliSettings
-
-    public static get instance() {
-        return (this.#instance ??= new this())
-    }
-}
diff --git a/src/shared/sam/cli/samCliValidationNotification.ts b/src/shared/sam/cli/samCliValidationNotification.ts
deleted file mode 100644
index d2688e4749f..00000000000
--- a/src/shared/sam/cli/samCliValidationNotification.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as nls from 'vscode-nls'
-
-import { samAboutInstallUrl, vscodeMarketplaceUrl } from '../../constants'
-import { getIdeProperties } from '../../extensionUtilities'
-import { telemetry } from '../../telemetry/telemetry'
-import { CancellationError } from '../../utilities/timeoutUtils'
-import {
-    InvalidSamCliError,
-    InvalidSamCliVersionError,
-    maxSamCliVersionExclusive,
-    minSamCliVersion,
-    SamCliNotFoundError,
-    SamCliVersionValidation,
-    SamCliVersionValidatorResult,
-} from './samCliValidator'
-
-const localize = nls.loadMessageBundle()
-
-// Notification Actions
-export interface SamCliValidationNotificationAction {
-    label: string
-    invoke(): Promise<void>
-}
-
-const actionGoToSamCli: SamCliValidationNotificationAction = {
-    label: localize('AWS.samcli.userChoice.visit.install.url', 'Get SAM CLI'),
-    invoke: async () => {
-        telemetry.aws_openUrl.run(async span => {
-            span.record({ url: samAboutInstallUrl })
-            const didOpen = await vscode.env.openExternal(vscode.Uri.parse(samAboutInstallUrl))
-            if (!didOpen) {
-                throw new CancellationError('user')
-            }
-        })
-    },
-}
-
-const actionGoToVsCodeMarketplace: SamCliValidationNotificationAction = {
-    label: localize('AWS.samcli.userChoice.update.awstoolkit.url', 'Visit Marketplace'),
-    invoke: async () => {
-        // TODO : Switch to the Extension panel in VS Code instead
-        await vscode.env.openExternal(vscode.Uri.parse(vscodeMarketplaceUrl))
-    },
-}
-
-// Notifications
-export interface SamCliValidationNotification {
-    show(): Promise<void>
-}
-
-class DefaultSamCliValidationNotification implements SamCliValidationNotification {
-    public constructor(
-        private readonly message: string,
-        private readonly actions: SamCliValidationNotificationAction[]
-    ) {}
-
-    public async show(): Promise<void> {
-        const userResponse: string | undefined = await vscode.window.showErrorMessage(
-            this.message,
-            ...this.actions.map(action => action.label)
-        )
-
-        if (userResponse) {
-            const responseActions: Promise<void>[] = this.actions
-                .filter(action => action.label === userResponse)
-                .map(async action => action.invoke())
-
-            await Promise.all(responseActions)
-        }
-    }
-}
-
-export async function notifySamCliValidation(samCliValidationError: InvalidSamCliError): Promise<void> {
-    if (!samCliValidationError) {
-        return
-    }
-
-    const notification: SamCliValidationNotification = makeSamCliValidationNotification(samCliValidationError)
-
-    await notification.show()
-}
-
-export function makeSamCliValidationNotification(
-    samCliValidationError: InvalidSamCliError,
-    onCreateNotification: (
-        message: string,
-        actions: SamCliValidationNotificationAction[]
-    ) => SamCliValidationNotification = (message, actions): SamCliValidationNotification =>
-        new DefaultSamCliValidationNotification(message, actions)
-): SamCliValidationNotification {
-    if (samCliValidationError instanceof SamCliNotFoundError) {
-        return onCreateNotification(
-            localize(
-                'AWS.samcli.notification.not.found',
-                'Cannot find SAM CLI. It is required in order to work with Serverless Applications locally.'
-            ),
-            [actionGoToSamCli]
-        )
-    } else if (samCliValidationError instanceof InvalidSamCliVersionError) {
-        return onCreateNotification(
-            makeVersionValidationNotificationMessage(samCliValidationError.versionValidation),
-            makeVersionValidationActions(samCliValidationError.versionValidation.validation)
-        )
-    } else {
-        return onCreateNotification(
-            localize(
-                'AWS.samcli.notification.unexpected.validation.issue',
-                'An unexpected issue occured while validating SAM CLI: {0}',
-                samCliValidationError.message
-            ),
-            []
-        )
-    }
-}
-
-function makeVersionValidationNotificationMessage(validationResult: SamCliVersionValidatorResult): string {
-    const recommendationUpdateToolkit: string = localize(
-        'AWS.samcli.recommend.update.toolkit',
-        'Check the Marketplace for an updated {0} Toolkit.',
-        getIdeProperties().company
-    )
-
-    const recommendationUpdateSamCli: string = localize('AWS.samcli.recommend.update.samcli', 'Update your SAM CLI.')
-
-    const recommendation: string =
-        validationResult.validation === SamCliVersionValidation.VersionTooHigh
-            ? recommendationUpdateToolkit
-            : recommendationUpdateSamCli
-
-    return localize(
-        'AWS.samcli.notification.version.invalid',
-        'Your SAM CLI version {0} does not meet requirements ({1} ≤ version < {2}). {3}',
-        validationResult.version,
-        minSamCliVersion,
-        maxSamCliVersionExclusive,
-        recommendation
-    )
-}
-
-function makeVersionValidationActions(validation: SamCliVersionValidation): SamCliValidationNotificationAction[] {
-    const actions: SamCliValidationNotificationAction[] = []
-
-    if (validation === SamCliVersionValidation.VersionTooHigh) {
-        actions.push(actionGoToVsCodeMarketplace)
-    } else {
-        actions.push(actionGoToSamCli)
-    }
-
-    return actions
-}
diff --git a/src/shared/sam/cli/samCliValidator.ts b/src/shared/sam/cli/samCliValidator.ts
deleted file mode 100644
index 0e8b5b7a1cb..00000000000
--- a/src/shared/sam/cli/samCliValidator.ts
+++ /dev/null
@@ -1,161 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { stat } from 'fs-extra'
-import * as semver from 'semver'
-import { ClassToInterfaceType } from '../../utilities/tsUtils'
-import { SamCliSettings } from './samCliSettings'
-import { SamCliInfoInvocation, SamCliInfoResponse } from './samCliInfo'
-import { ToolkitError } from '../../errors'
-
-export const minSamCliVersion = '0.47.0'
-export const minSamCliVersionForImageSupport = '1.13.0'
-export const maxSamCliVersionExclusive = '2.0.0'
-export const minSamCliVersionForGoSupport = '1.18.1'
-export const minSamCliVersionForArmSupport = '1.33.0'
-export const minSamCliVersionForDotnet31Support = '1.4.0'
-
-// Errors
-export class InvalidSamCliError extends ToolkitError {}
-
-export class SamCliNotFoundError extends InvalidSamCliError {
-    public constructor() {
-        super('SAM CLI was not found', { code: 'MissingSamCli' })
-    }
-}
-
-export class InvalidSamCliVersionError extends InvalidSamCliError {
-    public constructor(public versionValidation: SamCliVersionValidatorResult) {
-        super('SAM CLI has an invalid version', { code: 'InvalidSamCliVersion' })
-    }
-}
-
-// Validation
-export enum SamCliVersionValidation {
-    Valid = 'Valid',
-    VersionTooLow = 'VersionTooLow',
-    VersionTooHigh = 'VersionTooHigh',
-    VersionNotParseable = 'VersionNotParseable',
-}
-
-export type SamCliVersionValidatorResult =
-    | {
-          readonly validation: Exclude<SamCliVersionValidation, SamCliVersionValidation.VersionNotParseable>
-          readonly version: string
-      }
-    | {
-          readonly validation: SamCliVersionValidation.VersionNotParseable
-          readonly version?: string | undefined
-      }
-
-export interface SamCliValidatorResult {
-    samCliFound: boolean
-    versionValidation?: SamCliVersionValidatorResult
-}
-
-export interface SamCliValidator {
-    detectValidSamCli(): Promise<SamCliValidatorResult>
-    getVersionValidatorResult(): Promise<SamCliVersionValidatorResult>
-}
-
-export type SamCliValidatorContext = ClassToInterfaceType<DefaultSamCliValidatorContext>
-
-export class DefaultSamCliValidator implements SamCliValidator {
-    private cachedSamInfoResponse?: SamCliInfoResponse
-    private cachedSamCliVersionId?: string
-
-    public constructor(private readonly context: SamCliValidatorContext) {}
-
-    public async detectValidSamCli(): Promise<SamCliValidatorResult> {
-        const result: SamCliValidatorResult = {
-            samCliFound: false,
-        }
-
-        const sam = await this.context.samCliLocation()
-        if (sam) {
-            result.samCliFound = true
-            result.versionValidation = await this.getVersionValidatorResult()
-        }
-
-        return result
-    }
-
-    public async getVersionValidatorResult(): Promise<SamCliVersionValidatorResult> {
-        const samCliId: string = await this.context.getSamCliExecutableId()
-        if (!this.isSamCliVersionCached(samCliId)) {
-            this.cachedSamInfoResponse = await this.context.getSamCliInfo()
-            this.cachedSamCliVersionId = samCliId
-        }
-
-        const version = this.cachedSamInfoResponse!.version
-
-        return {
-            version,
-            validation: DefaultSamCliValidator.validateSamCliVersion(version),
-        }
-    }
-
-    private isSamCliVersionCached(samCliVersionId: string): boolean {
-        if (!this.cachedSamInfoResponse) {
-            return false
-        }
-        if (!this.cachedSamCliVersionId) {
-            return false
-        }
-
-        return this.cachedSamCliVersionId === samCliVersionId
-    }
-
-    public static validateSamCliVersion(version?: string): SamCliVersionValidation {
-        if (!version) {
-            return SamCliVersionValidation.VersionNotParseable
-        }
-
-        if (!semver.valid(version)) {
-            return SamCliVersionValidation.VersionNotParseable
-        }
-
-        if (semver.lt(version, minSamCliVersion)) {
-            return SamCliVersionValidation.VersionTooLow
-        }
-
-        if (semver.gte(version, maxSamCliVersionExclusive)) {
-            return SamCliVersionValidation.VersionTooHigh
-        }
-
-        return SamCliVersionValidation.Valid
-    }
-}
-
-export class DefaultSamCliValidatorContext implements SamCliValidatorContext {
-    public constructor(private readonly config: SamCliSettings) {}
-
-    public async samCliLocation(): Promise<string | undefined> {
-        return (await this.config.getOrDetectSamCli()).path
-    }
-
-    public async getSamCliExecutableId(): Promise<string> {
-        // Function should never get called if there is no SAM CLI
-        const location = await this.samCliLocation()
-        if (!location) {
-            throw new Error('SAM CLI does not exist')
-        }
-
-        // The modification timestamp of SAM CLI is used as the "distinct executable id"
-        const stats = await stat(location)
-
-        return stats.mtime.valueOf().toString()
-    }
-
-    public async getSamCliInfo(): Promise<SamCliInfoResponse> {
-        const samPath = await this.samCliLocation()
-        if (!samPath) {
-            throw new Error('Unable to get SAM CLI info without an executable path')
-        }
-        const samCliInfo = new SamCliInfoInvocation(samPath)
-
-        return await samCliInfo.execute()
-    }
-}
diff --git a/src/shared/sam/config.ts b/src/shared/sam/config.ts
deleted file mode 100644
index 6e8b669bde9..00000000000
--- a/src/shared/sam/config.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { parse } from '@iarna/toml'
-import { SystemUtilities } from '../systemUtilities'
-import { cast, Optional } from '../utilities/typeConstructors'
-
-export interface Config {
-    readonly environments: Record<string, Omit<Environment, 'name'>>
-}
-
-interface Environment {
-    readonly name: string
-    readonly commands: Record<string, Omit<Command, 'name'> | undefined>
-}
-
-interface Command {
-    readonly name: string
-    readonly parameters?: Record<string, unknown>
-}
-
-// This only handles a subset of possible user configs
-// `@iarna/toml@2.25` supports 0.5.0 of the spec while SAM CLI 1.67.0 supports 1.0.0
-// In practive this is likely good enough for the vast majority of users
-async function parseConfig(contents: string): Promise<Config> {
-    const data = await parse.async(contents)
-    const objs = Object.entries(data).filter(([_, v]) => typeof v === 'object') as [string, Record<string, unknown>][]
-    const environments = {} as Config['environments']
-    for (const [k, v] of objs) {
-        environments[k] = parseEnvironment(v)
-    }
-
-    return { environments }
-}
-
-function parseEnvironment(section: Record<string, unknown>): Omit<Environment, 'name'> {
-    const objs = Object.entries(section).filter(([_, v]) => typeof v === 'object') as [
-        string,
-        Record<string, unknown>
-    ][]
-    const commands = {} as Environment['commands']
-    for (const [k, v] of objs) {
-        commands[k] = parseCommand(v)
-    }
-
-    return { commands }
-}
-
-function parseCommand(section: Record<string, unknown>): Omit<Command, 'name'> {
-    return { parameters: cast(section['parameters'], Optional(Object)) }
-}
-
-export class SamConfig {
-    public constructor(public readonly location: vscode.Uri, private readonly config: Config = { environments: {} }) {}
-
-    public getParam(command: string, key: string, targetEnv = 'default'): unknown {
-        const env = this.config.environments[targetEnv]
-        const primarySection = env?.commands[command]
-        const globalSection = env?.commands['global']
-
-        return primarySection?.parameters?.[key] ?? globalSection?.parameters?.[key]
-    }
-
-    public listEnvironments(): Environment[] {
-        const envs = this.config.environments
-
-        return Object.entries(envs).map(([name, data]) => ({ name, ...data }))
-    }
-
-    public static async fromUri(uri: vscode.Uri) {
-        const contents = await SystemUtilities.readFile(uri)
-        const config = await parseConfig(contents)
-
-        return new this(uri, config)
-    }
-}
diff --git a/src/shared/sam/debugger/javaSamDebug.ts b/src/shared/sam/debugger/javaSamDebug.ts
deleted file mode 100644
index 2d62116e9ca..00000000000
--- a/src/shared/sam/debugger/javaSamDebug.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { getCodeRoot, isImageLambdaConfig } from '../../../lambda/local/debugConfiguration'
-import { RuntimeFamily } from '../../../lambda/models/samLambdaRuntime'
-import { ExtContext } from '../../extensions'
-import { sleep } from '../../utilities/timeoutUtils'
-import { DefaultSamLocalInvokeCommand, waitForDebuggerMessages } from '../cli/samCliLocalInvoke'
-import { runLambdaFunction, waitForPort } from '../localLambdaRunner'
-import { SamLaunchRequestArgs } from './awsSamDebugger'
-
-export async function makeJavaConfig(config: SamLaunchRequestArgs): Promise<SamLaunchRequestArgs> {
-    if (!config.baseBuildDir) {
-        throw Error('invalid state: config.baseBuildDir was not set')
-    }
-
-    config = {
-        ...config,
-        request: config.noDebug ? 'launch' : 'attach',
-    }
-
-    config.codeRoot = getCodeRoot(config.workspaceFolder, config)!
-
-    config.type = 'java'
-    config.runtimeFamily = RuntimeFamily.Java
-
-    if (!config.noDebug) {
-        config.hostName = '127.0.0.1'
-        config.port = config.debugPort
-        if (isImageLambdaConfig(config)) {
-            config.containerEnvVars = {
-                _JAVA_OPTIONS:
-                    // https://github.com/aws/aws-sam-cli/blob/86f88cbd7df365960f7015c5d086b0db7aedd9d5/samcli/local/docker/lambda_debug_settings.py#L53
-                    config.runtime === 'java11'
-                        ? `-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,quiet=y,address=*:${config.debugPort} -XX:MaxHeapSize=2834432k -XX:MaxMetaspaceSize=163840k -XX:ReservedCodeCacheSize=81920k -XX:+UseSerialGC -XX:-TieredCompilation -Djava.net.preferIPv4Stack=true`
-                        : `-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,quiet=y,address=${config.debugPort} -XX:MaxHeapSize=2834432k -XX:MaxMetaspaceSize=163840k -XX:ReservedCodeCacheSize=81920k -XX:+UseSerialGC -XX:-TieredCompilation -Djava.net.preferIPv4Stack=true -Xshare:off`,
-            }
-        }
-    }
-
-    return config
-}
-
-export async function invokeJavaLambda(ctx: ExtContext, config: SamLaunchRequestArgs): Promise<SamLaunchRequestArgs> {
-    config.samLocalInvokeCommand = new DefaultSamLocalInvokeCommand([waitForDebuggerMessages.JAVA])
-    // eslint-disable-next-line @typescript-eslint/unbound-method
-    config.onWillAttachDebugger = async (port, timeout) => {
-        await waitForPort(port, timeout, true)
-        await sleep(1000)
-    }
-    return await runLambdaFunction(ctx, config, async () => {})
-}
diff --git a/src/shared/sam/debugger/pythonSamDebug.ts b/src/shared/sam/debugger/pythonSamDebug.ts
deleted file mode 100644
index 622c6aba9ab..00000000000
--- a/src/shared/sam/debugger/pythonSamDebug.ts
+++ /dev/null
@@ -1,262 +0,0 @@
-/*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Runtime } from 'aws-sdk/clients/lambda'
-import { writeFile } from 'fs-extra'
-import * as os from 'os'
-import * as path from 'path'
-import {
-    isImageLambdaConfig,
-    PythonCloud9DebugConfiguration,
-    PythonDebugConfiguration,
-    PythonPathMapping,
-} from '../../../lambda/local/debugConfiguration'
-import { RuntimeFamily } from '../../../lambda/models/samLambdaRuntime'
-import globals from '../../extensionGlobals'
-import { ExtContext } from '../../extensions'
-import { fileExists, readFileAsString } from '../../filesystemUtilities'
-import { getLogger } from '../../logger'
-import * as pathutil from '../../utilities/pathUtils'
-import { getLocalRootVariants } from '../../utilities/pathUtils'
-import { sleep } from '../../utilities/timeoutUtils'
-import { Timeout } from '../../utilities/timeoutUtils'
-import { getWorkspaceRelativePath } from '../../utilities/workspaceUtils'
-import { DefaultSamLocalInvokeCommand, waitForDebuggerMessages } from '../cli/samCliLocalInvoke'
-import { runLambdaFunction } from '../localLambdaRunner'
-import { SamLaunchRequestArgs } from './awsSamDebugger'
-
-/** SAM will mount the --debugger-path to /tmp/lambci_debug_files */
-const debugpyWrapperPath = '/tmp/lambci_debug_files/py_debug_wrapper.py'
-
-// TODO: Fix this! Implement a more robust/flexible solution. This is just a basic minimal proof of concept.
-export async function getSamProjectDirPathForFile(filepath: string): Promise<string> {
-    return path.dirname(filepath)
-}
-
-// Add create debugging manifest/requirements.txt containing debugpy
-async function makePythonDebugManifest(params: {
-    isImageLambda: boolean
-    samProjectCodeRoot: string
-    outputDir: string
-    useIkpdb: boolean
-}): Promise<string | undefined> {
-    let manifestText = ''
-    const manfestPath = path.join(params.samProjectCodeRoot, 'requirements.txt')
-    // TODO: figure out how to get debugpy in the container without hacking the user's requirements
-    const debugManifestPath = params.isImageLambda ? manfestPath : path.join(params.outputDir, 'debug-requirements.txt')
-    if (await fileExists(manfestPath)) {
-        manifestText = await readFileAsString(manfestPath)
-    }
-    getLogger().debug(`pythonCodeLensProvider.makePythonDebugManifest params: ${JSON.stringify(params, undefined, 2)}`)
-    // TODO: If another module name includes the string "ikp3db", this will be skipped...
-    // HACK: Cloud9-created Lambdas hardcode ikp3db 1.1.4, which only functions with Python 3.6 (which we don't support)
-    //       Remove any ikp3db dependency if it exists and manually add a non-pinned ikp3db dependency.
-    if (params.useIkpdb) {
-        manifestText = manifestText.replace(/[ \t]*ikp3db\b[^\r\n]*/, '')
-        manifestText += `${os.EOL}ikp3db`
-        await writeFile(debugManifestPath, manifestText)
-        return debugManifestPath
-    }
-
-    // TODO: If another module name includes the string "debugpy", this will be skipped...
-    if (!params.useIkpdb && !manifestText.includes('debugpy')) {
-        manifestText += `${os.EOL}debugpy>=1.0,<2`
-        await writeFile(debugManifestPath, manifestText)
-
-        return debugManifestPath
-    }
-    // else we don't need to override the manifest. nothing to return
-}
-
-/**
- * Gathers and sets launch-config info by inspecting the workspace and creating
- * temp files/directories as needed.
- *
- * Does NOT execute/invoke SAM, docker, etc.
- */
-export async function makePythonDebugConfig(
-    config: SamLaunchRequestArgs
-): Promise<PythonDebugConfiguration | PythonCloud9DebugConfiguration> {
-    if (!config.baseBuildDir) {
-        throw Error('invalid state: config.baseBuildDir was not set')
-    }
-    if (!config.codeRoot) {
-        // Last-resort attempt to discover the project root (when there is no
-        // `launch.json` nor `template.yaml`).
-        config.codeRoot = await getSamProjectDirPathForFile(config?.templatePath ?? config.documentUri!.fsPath)
-        if (!config.codeRoot) {
-            // TODO: return error and show it at the caller.
-            throw Error('missing launch.json, template.yaml, and failed to discover project root')
-        }
-    }
-    config.codeRoot = pathutil.normalize(config.codeRoot)
-
-    let manifestPath: string | undefined
-    if (!config.noDebug) {
-        const isImageLambda = isImageLambdaConfig(config)
-
-        if (!config.useIkpdb) {
-            // Mounted in the Docker container as: /tmp/lambci_debug_files
-            config.debuggerPath = globals.context.asAbsolutePath(path.join('resources', 'debugger'))
-            // NOTE: SAM CLI splits on each *single* space in `--debug-args`!
-            //       Extra spaces will be passed as spurious "empty" arguments :(
-            const debugArgs = `${debugpyWrapperPath} --listen 0.0.0.0:${config.debugPort} --wait-for-client --log-to-stderr`
-            if (isImageLambda) {
-                const params = getPythonExeAndBootstrap(config.runtime)
-                config.debugArgs = [`${params.python} ${debugArgs} ${params.bootstrap}`]
-            } else {
-                config.debugArgs = [debugArgs]
-            }
-        } else {
-            // -ikpdb-log:  https://ikpdb.readthedocs.io/en/1.x/api.html?highlight=log#ikpdb.IKPdbLogger
-            //    n,N: Network  (noisy)
-            //    b,B: Breakpoints
-            //    e,E: Expression evaluation
-            //    x,X: Execution
-            //    f,F: Frame
-            //    p,P: Path manipulation
-            //    g,G: Global debugger
-            //
-            // Level "G" is not too noisy, and is required because it emits the
-            // "IKP3db listening on" string (`WAIT_FOR_DEBUGGER_MESSAGES`).
-            const logArg = getLogger().logLevelEnabled('debug') ? '--ikpdb-log=BEXFPG' : '--ikpdb-log=G'
-            const ccwd = pathutil.normalize(
-                getWorkspaceRelativePath(config.codeRoot, { workspaceFolders: [config.workspaceFolder] }) ?? 'error'
-            )
-
-            // NOTE: SAM CLI splits on each *single* space in `--debug-args`!
-            //       Extra spaces will be passed as spurious "empty" arguments :(
-            //
-            // -u: (python arg) unbuffered binary stdout/stderr
-            //
-            // -ik_ccwd: Must be relative to /var/task, because ikpdb tries to
-            //           resolve filepaths in the Docker container and produces
-            //           nonsense as a "fallback". See `ikp3db.py:normalize_path_in()`:
-            //           https://github.com/cmorisse/ikp3db/blob/eda176a1d4e0b1167466705a26ae4dd5c4188d36/ikp3db.py#L659
-            // --ikpdb-protocol=vscode:
-            //           For https://github.com/cmorisse/vscode-ikp3db
-            //           Requires ikp3db 1.5 (unreleased): https://github.com/cmorisse/ikp3db/pull/12
-            const debugArgs = `-m ikp3db --ikpdb-address=0.0.0.0 --ikpdb-port=${config.debugPort} -ik_ccwd=${ccwd} -ik_cwd=/var/task ${logArg}`
-
-            if (isImageLambda) {
-                const params = getPythonExeAndBootstrap(config.runtime)
-                config.debugArgs = [`${params.python} ${debugArgs} ${params.bootstrap}`]
-            } else {
-                config.debugArgs = [debugArgs]
-            }
-        }
-
-        manifestPath = await makePythonDebugManifest({
-            isImageLambda: isImageLambda,
-            samProjectCodeRoot: config.codeRoot,
-            outputDir: config.baseBuildDir,
-            useIkpdb: !!config.useIkpdb,
-        })
-    }
-
-    let pathMappings: PythonPathMapping[]
-    if (config.lambda?.pathMappings !== undefined) {
-        pathMappings = config.lambda.pathMappings
-    } else {
-        pathMappings = getLocalRootVariants(config.codeRoot).map<PythonPathMapping>(variant => {
-            return {
-                localRoot: variant,
-                remoteRoot: '/var/task',
-            }
-        })
-    }
-
-    if (config.useIkpdb) {
-        // Documentation:
-        // https://github.com/cmorisse/vscode-ikp3db/blob/master/documentation/debug_configurations_reference.md
-        return {
-            ...config,
-            type: 'ikp3db',
-            request: config.noDebug ? 'launch' : 'attach',
-            runtimeFamily: RuntimeFamily.Python,
-            manifestPath: manifestPath,
-            sam: {
-                ...config.sam,
-                // Needed to build ikp3db which has a C build step.
-                // https://github.com/aws/aws-sam-cli/issues/1840
-                containerBuild: true,
-            },
-
-            // cloud9 debugger fields:
-            port: config.debugPort ?? -1,
-            localRoot: config.codeRoot,
-            remoteRoot: '/var/task',
-            address: 'localhost',
-        }
-    }
-
-    // Make debugpy output log information if our loglevel is at 'debug'
-    if (!config.noDebug && getLogger().logLevelEnabled('debug')) {
-        config.debugArgs![0] += ' --debug'
-    }
-
-    return {
-        ...config,
-        type: 'python',
-        request: config.noDebug ? 'launch' : 'attach',
-        runtimeFamily: RuntimeFamily.Python,
-
-        //
-        // Python-specific fields.
-        //
-        manifestPath: manifestPath,
-        port: config.debugPort ?? -1,
-        host: 'localhost',
-        pathMappings,
-        // Disable redirectOutput, we collect child process stdout/stderr and
-        // explicitly write to Debug Console.
-        redirectOutput: false,
-    }
-}
-
-/**
- * Launches and attaches debugger to a SAM Python project.
- */
-export async function invokePythonLambda(
-    ctx: ExtContext,
-    config: PythonDebugConfiguration
-): Promise<PythonDebugConfiguration> {
-    config.samLocalInvokeCommand = new DefaultSamLocalInvokeCommand([
-        waitForDebuggerMessages.PYTHON,
-        waitForDebuggerMessages.PYTHON_IKPDB,
-    ])
-
-    // Must not used waitForPort() for ikpdb: the socket consumes
-    // ikpdb's initial message and ikpdb does not have a --wait-for-client
-    // mode, then cloud9 never sees the init message and waits forever.
-    //
-    // eslint-disable-next-line @typescript-eslint/unbound-method
-    config.onWillAttachDebugger = config.useIkpdb ? waitForIkpdb : undefined
-    const c = (await runLambdaFunction(ctx, config, async () => {})) as PythonDebugConfiguration
-    return c
-}
-
-async function waitForIkpdb(debugPort: number, timeout: Timeout) {
-    // HACK:
-    // - We cannot consumed the first message on the socket.
-    // - We must wait for the debugger to be ready, else cloud9 startDebugging() waits forever.
-    getLogger().info('waitForIkpdb: wait 2 seconds')
-    await sleep(2000)
-}
-
-function getPythonExeAndBootstrap(runtime: Runtime) {
-    // unfortunately new 'Image'-base images did not standardize the paths
-    // https://github.com/aws/aws-sam-cli/blob/7d5101a8edeb575b6925f9adecf28f47793c403c/samcli/local/docker/lambda_debug_settings.py
-    switch (runtime) {
-        case 'python3.7':
-            return { python: '/var/lang/bin/python3.7', bootstrap: '/var/runtime/bootstrap' }
-        case 'python3.8':
-            return { python: '/var/lang/bin/python3.8', bootstrap: '/var/runtime/bootstrap.py' }
-        case 'python3.9':
-            return { python: '/var/lang/bin/python3.9', bootstrap: '/var/runtime/bootstrap.py' }
-        default:
-            throw new Error(`Python SAM debug logic ran for invalid Python runtime: ${runtime}`)
-    }
-}
diff --git a/src/shared/sam/sync.ts b/src/shared/sam/sync.ts
deleted file mode 100644
index e7672d484f5..00000000000
--- a/src/shared/sam/sync.ts
+++ /dev/null
@@ -1,616 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import globals from '../extensionGlobals'
-
-import * as vscode from 'vscode'
-import * as path from 'path'
-import * as localizedText from '../localizedText'
-import { DefaultS3Client } from '../clients/s3Client'
-import { Wizard } from '../wizards/wizard'
-import { createQuickPick } from '../ui/pickerPrompter'
-import { DefaultCloudFormationClient } from '../clients/cloudFormationClient'
-import { CloudFormation } from '../cloudformation/cloudformation'
-import { DefaultEcrClient } from '../clients/ecrClient'
-import { createRegionPrompter } from '../ui/common/region'
-import { CancellationError } from '../utilities/timeoutUtils'
-import { ChildProcess, ChildProcessResult } from '../utilities/childProcess'
-import { keys, selectFrom } from '../utilities/tsUtils'
-import { Commands } from '../vscode/commands2'
-import { AWSTreeNodeBase } from '../treeview/nodes/awsTreeNodeBase'
-import { ToolkitError, UnknownError } from '../errors'
-import { telemetry } from '../telemetry/telemetry'
-import { createCommonButtons } from '../ui/buttons'
-import { PromptSettings } from '../settings'
-import { getLogger } from '../logger'
-import { isCloud9 } from '../extensionUtilities'
-import { removeAnsi } from '../utilities/textUtilities'
-import { createExitPrompter } from '../ui/common/exitPrompter'
-import { StackSummary } from 'aws-sdk/clients/cloudformation'
-import { SamCliSettings } from './cli/samCliSettings'
-import { SamConfig } from './config'
-import { cast, Instance, Optional, Union } from '../utilities/typeConstructors'
-import { pushIf, toRecord } from '../utilities/collectionUtils'
-import { Auth, IamConnection } from '../../credentials/auth'
-import { asEnvironmentVariables } from '../../credentials/credentialsUtilities'
-import { SamCliInfoInvocation } from './cli/samCliInfo'
-import { parse } from 'semver'
-import { isAutomation } from '../vscode/env'
-import { getOverriddenParameters } from '../../lambda/config/parameterUtils'
-
-export interface SyncParams {
-    readonly region: string
-    readonly deployType: 'infra' | 'code'
-    readonly projectRoot: vscode.Uri
-    readonly template: TemplateItem
-    readonly stackName: string
-    readonly bucketName: string
-    readonly ecrRepoUri?: string
-    readonly connection: IamConnection
-    readonly skipDependencyLayer?: boolean
-}
-
-export const prefixNewBucketName = (name: string) => `newbucket:${name}`
-
-function createBucketPrompter(client: DefaultS3Client) {
-    const recentBucket = getRecentResponse(client.regionCode, 'bucketName')
-    const items = client.listBucketsIterable().map(b => [
-        {
-            label: b.Name,
-            data: b.Name as SyncParams['bucketName'],
-            recentlyUsed: b.Name === recentBucket,
-        },
-    ])
-
-    return createQuickPick(items, {
-        title: 'Select an S3 Bucket',
-        placeholder: 'Filter or enter a new bucket name',
-        buttons: createCommonButtons(),
-        filterBoxInputSettings: {
-            label: 'Create a New Bucket',
-            // This is basically a hack. I need to refactor `createQuickPick` a bit.
-            transform: v => prefixNewBucketName(v),
-        },
-    })
-}
-
-const canPickStack = (s: StackSummary) => s.StackStatus.endsWith('_COMPLETE')
-const canShowStack = (s: StackSummary) =>
-    (s.StackStatus.endsWith('_COMPLETE') || s.StackStatus.endsWith('_IN_PROGRESS')) && !s.StackStatus.includes('DELETE')
-
-function createStackPrompter(client: DefaultCloudFormationClient) {
-    const recentStack = getRecentResponse(client.regionCode, 'stackName')
-    const items = client.listAllStacks().map(stacks =>
-        stacks.filter(canShowStack).map(s => ({
-            label: s.StackName,
-            data: s.StackName,
-            invalidSelection: !canPickStack(s),
-            recentlyUsed: s.StackName === recentStack,
-            description: !canPickStack(s) ? 'stack create/update already in progress' : undefined,
-        }))
-    )
-
-    return createQuickPick(items, {
-        title: 'Select a CloudFormation Stack',
-        placeholder: 'Filter or enter a new stack name',
-        filterBoxInputSettings: {
-            label: 'Create a New Stack',
-            transform: v => v,
-        },
-        buttons: createCommonButtons(),
-    })
-}
-
-function createEcrPrompter(client: DefaultEcrClient) {
-    const recentEcrRepo = getRecentResponse(client.regionCode, 'ecrRepoUri')
-    const items = client.listAllRepositories().map(list =>
-        list.map(repo => ({
-            label: repo.repositoryName,
-            data: repo.repositoryUri,
-            detail: repo.repositoryArn,
-            recentlyUsed: repo.repositoryUri === recentEcrRepo,
-        }))
-    )
-
-    return createQuickPick(items, {
-        title: 'Select an ECR Repository',
-        placeholder: 'Filter or enter an existing repository URI',
-        buttons: createCommonButtons(),
-        filterBoxInputSettings: {
-            label: 'Existing repository URI',
-            transform: v => v,
-        },
-    })
-}
-
-// TODO: hook this up so it prompts the user when more than 1 environment is present in `samconfig.toml`
-export function createEnvironmentPrompter(config: SamConfig, environments = config.listEnvironments()) {
-    const recentEnvironmentName = getRecentResponse(config.location.fsPath, 'environmentName')
-    const items = environments.map(env => ({
-        label: env.name,
-        data: env,
-        recentlyUsed: env.name === recentEnvironmentName,
-    }))
-
-    return createQuickPick(items, {
-        title: 'Select an Environment to Use',
-        buttons: createCommonButtons(),
-    })
-}
-
-interface TemplateItem {
-    readonly uri: vscode.Uri
-    readonly data: CloudFormation.Template
-}
-
-function createTemplatePrompter() {
-    const folders = new Set<string>()
-    const recentTemplatePath = getRecentResponse('global', 'templatePath')
-    const items = globals.templateRegistry.registeredItems.map(({ item, path: filePath }) => {
-        const uri = vscode.Uri.file(filePath)
-        const workspaceFolder = vscode.workspace.getWorkspaceFolder(uri)
-        const label = workspaceFolder ? path.relative(workspaceFolder.uri.fsPath, uri.fsPath) : uri.fsPath
-        folders.add(workspaceFolder?.name ?? '')
-
-        return {
-            label,
-            data: { uri, data: item },
-            description: workspaceFolder?.name,
-            recentlyUsed: recentTemplatePath === uri.fsPath,
-        }
-    })
-
-    const trimmedItems = folders.size === 1 ? items.map(item => ({ ...item, description: undefined })) : items
-    return createQuickPick(trimmedItems, {
-        title: 'Select a CloudFormation Template',
-        buttons: createCommonButtons(),
-    })
-}
-
-function hasImageBasedResources(template: CloudFormation.Template) {
-    const resources = template.Resources
-
-    return resources === undefined
-        ? false
-        : Object.keys(resources)
-              .filter(key => resources[key]?.Type === 'AWS::Serverless::Function')
-              .map(key => resources[key]?.Properties?.PackageType)
-              .some(it => it === 'Image')
-}
-
-export class SyncWizard extends Wizard<SyncParams> {
-    public constructor(state: Pick<SyncParams, 'deployType'> & Partial<SyncParams>) {
-        super({ initState: state, exitPrompterProvider: createExitPrompter })
-
-        this.form.region.bindPrompter(() => createRegionPrompter().transform(r => r.id))
-        this.form.template.bindPrompter(() => createTemplatePrompter())
-        this.form.stackName.bindPrompter(({ region }) => createStackPrompter(new DefaultCloudFormationClient(region!)))
-        this.form.bucketName.bindPrompter(({ region }) => createBucketPrompter(new DefaultS3Client(region!)))
-        this.form.ecrRepoUri.bindPrompter(({ region }) => createEcrPrompter(new DefaultEcrClient(region!)), {
-            showWhen: ({ template }) => !!template && hasImageBasedResources(template.data),
-        })
-
-        const getProjectRoot = (template: TemplateItem | undefined) =>
-            template ? getWorkspaceUri(template) : undefined
-
-        this.form.projectRoot.setDefault(({ template }) => getProjectRoot(template))
-    }
-}
-
-type BindableData = Record<string, string | boolean | undefined>
-function bindDataToParams<T extends BindableData>(data: T, bindings: { [P in keyof T]-?: string }): string[] {
-    const params = [] as string[]
-
-    for (const [k, v] of Object.entries(data)) {
-        if (v === true) {
-            params.push(bindings[k])
-        } else if (typeof v === 'string') {
-            params.push(bindings[k], v)
-        }
-    }
-
-    return params
-}
-
-async function ensureBucket(resp: Pick<SyncParams, 'region' | 'bucketName'>) {
-    const newBucketName = resp.bucketName.match(/^newbucket:(.*)/)?.[1]
-    if (newBucketName === undefined) {
-        return resp.bucketName
-    }
-
-    try {
-        await new DefaultS3Client(resp.region).createBucket({ bucketName: newBucketName })
-
-        return newBucketName
-    } catch (err) {
-        throw ToolkitError.chain(err, `Failed to create new bucket "${newBucketName}"`)
-    }
-}
-
-async function injectCredentials(conn: IamConnection, env = process.env) {
-    const creds = await conn.getCredentials()
-    return { ...env, ...asEnvironmentVariables(creds) }
-}
-
-async function saveAndBindArgs(args: SyncParams): Promise<{ readonly boundArgs: string[] }> {
-    const data = {
-        codeOnly: args.deployType === 'code',
-        templatePath: args.template.uri.fsPath,
-        bucketName: await ensureBucket(args),
-        ...selectFrom(args, 'stackName', 'ecrRepoUri', 'region', 'skipDependencyLayer'),
-    }
-
-    await Promise.all([
-        updateRecentResponse(args.region, 'stackName', data.stackName),
-        updateRecentResponse(args.region, 'bucketName', data.bucketName),
-        updateRecentResponse(args.region, 'ecrRepoUri', data.ecrRepoUri),
-        updateRecentResponse('global', 'templatePath', data.templatePath),
-    ])
-
-    const boundArgs = bindDataToParams(data, {
-        region: '--region',
-        codeOnly: '--code',
-        templatePath: '--template',
-        stackName: '--stack-name',
-        bucketName: '--s3-bucket',
-        ecrRepoUri: '--image-repository',
-        skipDependencyLayer: '--no-dependency-layer',
-    })
-
-    return { boundArgs }
-}
-
-async function getSamCliPath() {
-    const { path: samCliPath } = await SamCliSettings.instance.getOrDetectSamCli()
-    if (samCliPath === undefined) {
-        throw new ToolkitError('SAM CLI could not be found', { code: 'MissingExecutable' })
-    }
-
-    const info = await new SamCliInfoInvocation(samCliPath).execute()
-    telemetry.record({ version: info.version })
-
-    if (parse(info.version)?.compare('1.53.0') === -1) {
-        throw new ToolkitError('SAM CLI version 1.53.0 or higher is required', { code: 'VersionTooLow' })
-    }
-
-    return samCliPath
-}
-
-let oldTerminal: ProcessTerminal | undefined
-async function runSyncInTerminal(proc: ChildProcess) {
-    const handleResult = (result?: ChildProcessResult) => {
-        if (result && result.exitCode !== 0) {
-            const message = `sam sync exited with a non-zero exit code: ${result.exitCode}`
-            throw ToolkitError.chain(result.error, message, {
-                code: 'NonZeroExitCode',
-            })
-        }
-    }
-
-    // `createTerminal` doesn't work on C9 so we use the output channel instead
-    if (isCloud9()) {
-        globals.outputChannel.show()
-
-        const result = proc.run({
-            onStdout: text => globals.outputChannel.append(removeAnsi(text)),
-            onStderr: text => globals.outputChannel.append(removeAnsi(text)),
-        })
-        proc.send('\n')
-
-        return handleResult(await result)
-    }
-
-    // The most recent terminal won't get garbage collected until the next run
-    if (oldTerminal?.stopped === true) {
-        oldTerminal.close()
-    }
-    const pty = (oldTerminal = new ProcessTerminal(proc))
-    const terminal = vscode.window.createTerminal({ pty, name: 'SAM Sync' })
-    terminal.sendText('\n')
-    terminal.show()
-
-    const result = await new Promise<ChildProcessResult>(resolve => pty.onDidExit(resolve))
-    if (pty.cancelled) {
-        throw result.error !== undefined
-            ? ToolkitError.chain(result.error, 'SAM CLI was cancelled before exiting', { cancelled: true })
-            : new CancellationError('user')
-    } else {
-        return handleResult(result)
-    }
-}
-
-async function loadLegacyParameterOverrides(template: TemplateItem) {
-    try {
-        const params = await getOverriddenParameters(template.uri)
-        if (!params) {
-            return
-        }
-
-        return [...params.entries()].map(([k, v]) => `${k}=${v}`)
-    } catch (err) {
-        getLogger().warn(`sam: unable to load legacy parameter overrides: %s`, err)
-    }
-}
-
-export async function runSamSync(args: SyncParams) {
-    telemetry.record({ lambdaPackageType: args.ecrRepoUri !== undefined ? 'Image' : 'Zip' })
-
-    const samCliPath = await getSamCliPath()
-    const { boundArgs } = await saveAndBindArgs(args)
-    const overrides = await loadLegacyParameterOverrides(args.template)
-    if (overrides !== undefined) {
-        // Leaving this out of the definitions file as this is _very_ niche and specific to the
-        // implementation. Plus we would have to redefine `sam_sync` to add it.
-        telemetry.record({ isUsingTemplatesJson: true } as any)
-        boundArgs.push('--parameter-overrides', ...overrides)
-    }
-
-    const sam = new ChildProcess(samCliPath, ['sync', ...boundArgs], {
-        spawnOptions: {
-            cwd: args.projectRoot.fsPath,
-            env: await injectCredentials(args.connection),
-        },
-    })
-
-    await runSyncInTerminal(sam)
-}
-
-const getWorkspaceUri = (template: TemplateItem) => vscode.workspace.getWorkspaceFolder(template.uri)?.uri
-const getStringParam = (config: SamConfig, key: string) => {
-    try {
-        return cast(config.getParam('sync', key), Optional(String))
-    } catch (err) {
-        throw ToolkitError.chain(err, `Unable to read "${key}" in config file`, {
-            details: { location: config.location.path },
-        })
-    }
-}
-
-const configKeyMapping: Record<string, string | string[]> = {
-    region: 'region',
-    stackName: 'stack_name',
-    bucketName: 's3_bucket',
-    ecrRepoUri: 'image_repository',
-    templatePath: ['template', 'template_file'],
-}
-
-function getSyncParamsFromConfig(config: SamConfig) {
-    const samConfigParams: string[] = []
-    const params = toRecord(keys(configKeyMapping), k => {
-        const key = configKeyMapping[k]
-        if (typeof key === 'string') {
-            const param = getStringParam(config, key)
-            pushIf(samConfigParams, param !== undefined, key)
-
-            return param
-        } else {
-            for (const alt of key) {
-                const param = getStringParam(config, alt)
-                if (param !== undefined) {
-                    samConfigParams.push(alt)
-
-                    return param
-                }
-            }
-        }
-    })
-
-    telemetry.record({ samConfigParams: samConfigParams.join(',') } as any)
-
-    return params
-}
-
-export async function prepareSyncParams(arg: vscode.Uri | AWSTreeNodeBase | undefined): Promise<Partial<SyncParams>> {
-    // Skip creating dependency layers by default for backwards compat
-    const baseParams: Partial<SyncParams> = { skipDependencyLayer: true }
-
-    if (arg instanceof AWSTreeNodeBase) {
-        return { ...baseParams, region: arg.regionCode }
-    } else if (arg instanceof vscode.Uri) {
-        if (arg.path.endsWith('samconfig.toml')) {
-            const config = await SamConfig.fromUri(arg)
-            const params = getSyncParamsFromConfig(config)
-            const projectRoot = vscode.Uri.joinPath(config.location, '..')
-            const templateUri = params.templatePath
-                ? vscode.Uri.file(path.resolve(projectRoot.fsPath, params.templatePath))
-                : undefined
-            const template = templateUri
-                ? {
-                      uri: templateUri,
-                      data: await CloudFormation.load(templateUri.fsPath),
-                  }
-                : undefined
-            // Always use the dependency layer if the user specified to do so
-            const skipDependencyLayer = !config.getParam('sync', 'dependency_layer')
-
-            return { ...baseParams, ...params, template, projectRoot, skipDependencyLayer }
-        }
-
-        const template = {
-            uri: arg,
-            data: await CloudFormation.load(arg.fsPath),
-        }
-
-        return { ...baseParams, template, projectRoot: getWorkspaceUri(template) }
-    }
-
-    return baseParams
-}
-
-export function registerSync() {
-    async function runSync(deployType: SyncParams['deployType'], arg?: unknown) {
-        telemetry.record({ syncedResources: deployType === 'infra' ? 'AllResources' : 'CodeOnly' })
-
-        const connection = Auth.instance.activeConnection
-        if (connection?.type !== 'iam') {
-            throw new ToolkitError('Syncing SAM applications requires IAM credentials', { code: 'NoIAMCredentials' })
-        }
-
-        // Constructor of `vscode.Uri` is marked private but that shouldn't matter when checking the instance type
-        const Uri = vscode.Uri as unknown as abstract new () => vscode.Uri
-        const input = cast(arg, Optional(Union(Instance(Uri), Instance(AWSTreeNodeBase))))
-
-        await confirmDevStack()
-        const params = await new SyncWizard({ deployType, ...(await prepareSyncParams(input)) }).run()
-        if (params === undefined) {
-            throw new CancellationError('user')
-        }
-
-        try {
-            await runSamSync({ ...params, connection })
-        } catch (err) {
-            throw ToolkitError.chain(err, 'Failed to sync SAM application', { details: { ...params } })
-        }
-    }
-
-    Commands.register(
-        {
-            id: 'aws.samcli.sync',
-            autoconnect: true,
-        },
-        (arg?: unknown) => telemetry.sam_sync.run(() => runSync('infra', arg))
-    )
-
-    Commands.register(
-        {
-            id: 'aws.samcli.syncCode',
-            autoconnect: true,
-        },
-        (arg?: unknown) => telemetry.sam_sync.run(() => runSync('code', arg))
-    )
-
-    const settings = SamCliSettings.instance
-    settings.onDidChange(({ key }) => {
-        if (key === 'legacyDeploy') {
-            telemetry.aws_modifySetting.run(span => {
-                span.record({ settingId: 'sam_legacyDeploy' })
-                const state = settings.get('legacyDeploy')
-                span.record({ settingState: state ? 'Enabled' : 'Disabled' })
-            })
-        }
-    })
-}
-
-const mementoRootKey = 'samcli.sync.params'
-function getRecentResponse(region: string, key: string): string | undefined {
-    const root = globals.context.workspaceState.get(mementoRootKey, {} as Record<string, Record<string, string>>)
-
-    return root[region]?.[key]
-}
-
-async function updateRecentResponse(region: string, key: string, value: string | undefined) {
-    try {
-        const root = globals.context.workspaceState.get(mementoRootKey, {} as Record<string, Record<string, string>>)
-        await globals.context.workspaceState.update(mementoRootKey, {
-            ...root,
-            [region]: { ...root[region], [key]: value },
-        })
-    } catch (err) {
-        getLogger().warn(`sam: unable to save response at key "${key}": %s`, err)
-    }
-}
-
-async function confirmDevStack() {
-    const canPrompt = await PromptSettings.instance.isPromptEnabled('samcliConfirmDevStack')
-    if (!canPrompt) {
-        return
-    }
-
-    const message = `
-The SAM CLI will use the AWS Lambda, Amazon API Gateway, and AWS StepFunctions APIs to upload your code without 
-performing a CloudFormation deployment. This will cause drift in your CloudFormation stack.
-**The sync command should only be used against a development stack**. 
-
-Confirm that you are synchronizing a development stack.    
-`.trim()
-
-    const okDontShow = "OK, and don't show this again"
-    const resp = await vscode.window.showInformationMessage(message, { modal: true }, localizedText.ok, okDontShow)
-    if (resp !== localizedText.ok && resp !== okDontShow) {
-        throw new CancellationError('user')
-    }
-
-    if (resp === okDontShow) {
-        await PromptSettings.instance.disablePrompt('samcliConfirmDevStack')
-    }
-}
-
-// This is a decent improvement over using the output channel but it isn't a tty/pty
-// SAM CLI uses `click` which has reduced functionality if `os.isatty` returns false
-// Historically, Windows lack of a pty-equivalent is why it's not available in libuv
-// Maybe it's doable now with the ConPTY API? https://github.com/libuv/libuv/issues/2640
-class ProcessTerminal implements vscode.Pseudoterminal {
-    private readonly onDidCloseEmitter = new vscode.EventEmitter<number | void>()
-    private readonly onDidWriteEmitter = new vscode.EventEmitter<string>()
-    private readonly onDidExitEmitter = new vscode.EventEmitter<ChildProcessResult>()
-    public readonly onDidWrite = this.onDidWriteEmitter.event
-    public readonly onDidClose = this.onDidCloseEmitter.event
-    public readonly onDidExit = this.onDidExitEmitter.event
-
-    public constructor(private readonly process: ChildProcess) {
-        // Used in integration tests
-        if (isAutomation()) {
-            this.onDidWrite(text => console.log(text.trim()))
-        }
-    }
-
-    #cancelled = false
-    public get cancelled() {
-        return this.#cancelled
-    }
-
-    public get stopped() {
-        return this.process.stopped
-    }
-
-    public open(initialDimensions: vscode.TerminalDimensions | undefined): void {
-        this.process
-            .run({
-                onStdout: text => this.mapStdio(text),
-                onStderr: text => this.mapStdio(text),
-            })
-            .then(result => this.onDidExitEmitter.fire(result))
-            .catch(err =>
-                this.onDidExitEmitter.fire({ error: UnknownError.cast(err), exitCode: -1, stderr: '', stdout: '' })
-            )
-            .finally(() => this.onDidWriteEmitter.fire('\r\nPress any key to close this terminal'))
-    }
-
-    public close(): void {
-        this.process.stop()
-        this.onDidCloseEmitter.fire()
-    }
-
-    public handleInput(data: string) {
-        // ETX
-        if (data === '\u0003' || this.process.stopped) {
-            this.#cancelled ||= data === '\u0003'
-            return this.close()
-        }
-
-        // enter
-        if (data === '\u000D') {
-            this.process.send('\n')
-            this.onDidWriteEmitter.fire('\r\n')
-        } else {
-            this.process.send(data)
-            this.onDidWriteEmitter.fire(data)
-        }
-    }
-
-    private mapStdio(text: string): void {
-        const lines = text.split('\n')
-        const first = lines.shift()
-
-        if (first) {
-            this.onDidWriteEmitter.fire(first)
-        }
-
-        for (const line of lines) {
-            this.onDidWriteEmitter.fire('\r\n')
-            this.onDidWriteEmitter.fire(line)
-        }
-    }
-}
diff --git a/src/shared/schemas.ts b/src/shared/schemas.ts
deleted file mode 100644
index a3ac92ef3b2..00000000000
--- a/src/shared/schemas.ts
+++ /dev/null
@@ -1,442 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import globals from './extensionGlobals'
-import { activateYamlExtension, YamlExtension } from './extensions/yaml'
-import * as pathutil from '../shared/utilities/pathUtils'
-import { getLogger } from './logger'
-import { FileResourceFetcher } from './resourcefetcher/fileResourceFetcher'
-import { getPropertyFromJsonUrl, HttpResourceFetcher } from './resourcefetcher/httpResourceFetcher'
-import { Settings } from './settings'
-import { once } from './utilities/functionUtils'
-import { Any, ArrayConstructor } from './utilities/typeConstructors'
-import { AWS_SCHEME } from './constants'
-import { writeFile } from 'fs-extra'
-import { SystemUtilities } from './systemUtilities'
-import { normalizeVSCodeUri } from './utilities/vsCodeUtils'
-
-const goformationManifestUrl = 'https://api.github.com/repos/awslabs/goformation/releases/latest'
-const devfileManifestUrl = 'https://api.github.com/repos/devfile/api/releases/latest'
-const schemaPrefix = `${AWS_SCHEME}://`
-
-export type Schemas = { [key: string]: vscode.Uri }
-export type SchemaType = 'yaml' | 'json'
-
-export interface SchemaMapping {
-    uri: vscode.Uri
-    type: SchemaType
-    schema?: string | vscode.Uri
-}
-
-export interface SchemaHandler {
-    /** Adds or removes a schema mapping to the given `schemas` collection. */
-    handleUpdate(mapping: SchemaMapping, schemas: Schemas): Promise<void>
-    /** Returns true if the given file path is handled by this `SchemaHandler`. */
-    isMapped(f: vscode.Uri | string): boolean
-}
-
-/**
- * Processes the update of schema mappings for files in the workspace
- */
-export class SchemaService {
-    private static readonly defaultUpdatePeriodMillis = 1000
-
-    private updatePeriod: number
-    private timer?: NodeJS.Timer
-
-    private updateQueue: SchemaMapping[] = []
-    private schemas?: Schemas
-    private handlers: Map<SchemaType, SchemaHandler>
-
-    public constructor(
-        private readonly extensionContext: vscode.ExtensionContext,
-        opts?: {
-            /** Assigned in start(). */
-            schemas?: Schemas
-            updatePeriod?: number
-            handlers?: Map<SchemaType, SchemaHandler>
-        }
-    ) {
-        this.updatePeriod = opts?.updatePeriod ?? SchemaService.defaultUpdatePeriodMillis
-        this.schemas = opts?.schemas
-        this.handlers =
-            opts?.handlers ??
-            new Map<SchemaType, SchemaHandler>([
-                ['json', new JsonSchemaHandler()],
-                ['yaml', new YamlSchemaHandler()],
-            ])
-    }
-
-    public isMapped(uri: vscode.Uri): boolean {
-        for (const h of this.handlers.values()) {
-            if (h.isMapped(uri)) {
-                return true
-            }
-        }
-        return false
-    }
-
-    public async start(): Promise<void> {
-        getDefaultSchemas(this.extensionContext).then(schemas => (this.schemas = schemas))
-        await this.startTimer()
-    }
-
-    /**
-     * Registers a schema mapping in the schema service.
-     *
-     * @param mapping
-     * @param flush Flush immediately instead of waiting for timer.
-     */
-    public registerMapping(mapping: SchemaMapping, flush?: boolean): void {
-        this.updateQueue.push(mapping)
-        if (flush === true) {
-            this.processUpdates()
-        }
-    }
-
-    public async processUpdates(): Promise<void> {
-        if (this.updateQueue.length === 0 || !this.schemas) {
-            return
-        }
-
-        const batch = this.updateQueue.splice(0, this.updateQueue.length)
-        for (const mapping of batch) {
-            const { type, schema, uri } = mapping
-            const handler = this.handlers.get(type)
-            if (!handler) {
-                throw new Error(`no registered handler for type ${type}`)
-            }
-            getLogger().debug(
-                'schema service: handle %s mapping: %s -> %s',
-                type,
-                schema?.toString() ?? '[removed]',
-                uri
-            )
-            await handler.handleUpdate(mapping, this.schemas)
-        }
-    }
-
-    // TODO: abstract into a common abstraction for background pollers
-    private async startTimer(): Promise<void> {
-        this.timer = globals.clock.setTimeout(
-            // this is async so that we don't have pseudo-concurrent invocations of the callback
-            async () => {
-                await this.processUpdates()
-                this.timer?.refresh()
-            },
-            this.updatePeriod
-        )
-    }
-}
-
-/**
- * Loads default JSON schemas for CFN and SAM templates.
- * Checks manifest and downloads new schemas if the manifest version has been bumped.
- * Uses local, predownloaded version if up-to-date or network call fails
- * If the user has not previously used the toolkit and cannot pull the manifest, does not provide template autocomplete.
- * @param extensionContext VSCode extension context
- */
-export async function getDefaultSchemas(extensionContext: vscode.ExtensionContext): Promise<Schemas | undefined> {
-    const cfnSchemaUri = vscode.Uri.joinPath(extensionContext.globalStorageUri, 'cloudformation.schema.json')
-    const samSchemaUri = vscode.Uri.joinPath(extensionContext.globalStorageUri, 'sam.schema.json')
-    const devfileSchemaUri = vscode.Uri.joinPath(extensionContext.globalStorageUri, 'devfile.schema.json')
-
-    const goformationSchemaVersion = await getPropertyFromJsonUrl(goformationManifestUrl, 'tag_name')
-    const devfileSchemaVersion = await getPropertyFromJsonUrl(devfileManifestUrl, 'tag_name')
-
-    const schemas: Schemas = {}
-
-    try {
-        await updateSchemaFromRemote({
-            destination: cfnSchemaUri,
-            version: goformationSchemaVersion,
-            url: `https://raw.githubusercontent.com/awslabs/goformation/${goformationSchemaVersion}/schema/cloudformation.schema.json`,
-            cacheKey: 'cfnSchemaVersion',
-            extensionContext,
-            title: schemaPrefix + 'cloudformation.schema.json',
-        })
-        schemas['cfn'] = cfnSchemaUri
-    } catch (e) {
-        getLogger().verbose('Could not download cfn schema: %s', (e as Error).message)
-    }
-
-    try {
-        await updateSchemaFromRemote({
-            destination: samSchemaUri,
-            version: goformationSchemaVersion,
-            url: `https://raw.githubusercontent.com/awslabs/goformation/${goformationSchemaVersion}/schema/sam.schema.json`,
-            cacheKey: 'samSchemaVersion',
-            extensionContext,
-            title: schemaPrefix + 'sam.schema.json',
-        })
-        schemas['sam'] = samSchemaUri
-    } catch (e) {
-        getLogger().verbose('Could not download sam schema: %s', (e as Error).message)
-    }
-
-    try {
-        await updateSchemaFromRemote({
-            destination: devfileSchemaUri,
-            version: devfileSchemaVersion,
-            url: `https://raw.githubusercontent.com/devfile/api/${devfileSchemaVersion}/schemas/latest/devfile.json`,
-            cacheKey: 'devfileSchemaVersion',
-            extensionContext,
-            title: schemaPrefix + 'devfile.schema.json',
-        })
-        schemas['devfile'] = devfileSchemaUri
-    } catch (e) {
-        getLogger().verbose('Could not download devfile schema: %s', (e as Error).message)
-    }
-
-    return schemas
-}
-
-/**
- * Pulls a remote version of file if the local version doesn't match the manifest version (does not check semver increases) or doesn't exist
- * Pulls local version of file if it does. Uses remote as baskup in case local doesn't exist
- * @param params.filepath Path to local file
- * @param params.version Remote version
- * @param params.url Url to fetch from
- * @param params.cacheKey Cache key to check version against
- * @param params.extensionContext VSCode extension context
- */
-export async function updateSchemaFromRemote(params: {
-    destination: vscode.Uri
-    version?: string
-    url: string
-    cacheKey: string
-    extensionContext: vscode.ExtensionContext
-    title: string
-}): Promise<void> {
-    const cachedVersion = params.extensionContext.globalState.get<string>(params.cacheKey)
-    const outdated = params.version && params.version !== cachedVersion
-
-    // Check that the cached file actually can be fetched. Else we might
-    // never update the cache.
-    const fileFetcher = new FileResourceFetcher(params.destination.fsPath)
-    const cachedContent = await fileFetcher.get()
-
-    if (!outdated && cachedContent) {
-        return
-    }
-
-    try {
-        const httpFetcher = new HttpResourceFetcher(params.url, { showUrl: true })
-        const content = await httpFetcher.get()
-
-        if (!content) {
-            throw new Error(`failed to resolve schema: ${params.destination}`)
-        }
-
-        const parsedFile = { ...JSON.parse(content), title: params.title }
-        const dir = vscode.Uri.joinPath(params.destination, '..')
-        await SystemUtilities.createDirectory(dir)
-        await writeFile(params.destination.fsPath, JSON.stringify(parsedFile))
-        await params.extensionContext.globalState.update(params.cacheKey, params.version).then(undefined, err => {
-            getLogger().warn(`schemas: failed to update cache key for "${params.title}": ${err?.message}`)
-        })
-    } catch (err) {
-        if (cachedContent) {
-            getLogger().warn(
-                `schemas: failed to fetch the latest version for "${params.title}": ${
-                    (err as Error).message
-                }. Using cached schema instead.`
-            )
-        } else {
-            throw err
-        }
-    }
-}
-
-/**
- * Adds custom tags to the YAML extension's settings in order to hide error
- * notifications for SAM/CFN intrinsic functions if a user has the YAML extension.
- *
- * Lifted near-verbatim from the cfn-lint VSCode extension.
- * https://github.com/aws-cloudformation/cfn-lint-visual-studio-code/blob/629de0bac4f36cfc6534e409a6f6766a2240992f/client/src/extension.ts#L56
- */
-async function addCustomTags(config = Settings.instance): Promise<void> {
-    const settingName = 'yaml.customTags'
-    const cloudFormationTags = [
-        '!And',
-        '!And sequence',
-        '!If',
-        '!If sequence',
-        '!Not',
-        '!Not sequence',
-        '!Equals',
-        '!Equals sequence',
-        '!Or',
-        '!Or sequence',
-        '!FindInMap',
-        '!FindInMap sequence',
-        '!Base64',
-        '!Join',
-        '!Join sequence',
-        '!Cidr',
-        '!Ref',
-        '!Sub',
-        '!Sub sequence',
-        '!GetAtt',
-        '!GetAZs',
-        '!ImportValue',
-        '!ImportValue sequence',
-        '!Select',
-        '!Select sequence',
-        '!Split',
-        '!Split sequence',
-    ]
-
-    try {
-        const currentTags = config.get(settingName, ArrayConstructor(Any), [])
-        const missingTags = cloudFormationTags.filter(item => !currentTags.includes(item))
-
-        if (missingTags.length > 0) {
-            const updateTags = currentTags.concat(missingTags)
-
-            await config.update(settingName, updateTags)
-        }
-    } catch (error) {
-        getLogger().error('schemas: failed to update setting "%s": %O', settingName, error)
-    }
-}
-
-/**
- * Registers YAML schema mappings with the Red Hat YAML extension
- */
-export class YamlSchemaHandler implements SchemaHandler {
-    public constructor(private yamlExtension?: YamlExtension) {}
-
-    isMapped(file: string | vscode.Uri): boolean {
-        if (!this.yamlExtension) {
-            return false
-        }
-        const uri = typeof file === 'string' ? vscode.Uri.file(file) : file
-        const exists = !!this.yamlExtension?.getSchema(uri)
-        return exists
-    }
-
-    async handleUpdate(mapping: SchemaMapping, schemas: Schemas): Promise<void> {
-        if (!this.yamlExtension) {
-            const ext = await activateYamlExtension()
-            if (!ext) {
-                return
-            }
-            await addCustomTags()
-            this.yamlExtension = ext
-        }
-
-        if (mapping.schema) {
-            this.yamlExtension.assignSchema(mapping.uri, resolveSchema(mapping.schema, schemas))
-        } else {
-            this.yamlExtension.removeSchema(mapping.uri)
-        }
-    }
-}
-
-/**
- * Registers JSON schema mappings with the built-in VSCode JSON schema language server
- */
-export class JsonSchemaHandler implements SchemaHandler {
-    private readonly clean = once(() => this.cleanResourceMappings())
-
-    public constructor(private readonly config = Settings.instance) {}
-
-    public isMapped(file: string | vscode.Uri): boolean {
-        const setting = this.getSettingBy({ file: file })
-        return !!setting
-    }
-
-    /**
-     * Gets a json schema setting by filtering on schema path and/or file path.
-     * @param args.schemaPath Path to the schema file
-     * @param args.file Path to the file being edited by the user
-     */
-    private getSettingBy(args: {
-        schemaPath?: string | vscode.Uri
-        file?: string | vscode.Uri
-    }): JSONSchemaSettings | undefined {
-        const path = typeof args.file === 'string' ? args.file : args.file?.fsPath
-        const schm = typeof args.schemaPath === 'string' ? args.schemaPath : args.schemaPath?.fsPath
-        const settings = this.getJsonSettings()
-        const setting = settings.find(schema => {
-            const schmMatch = schm && schema.url && pathutil.normalize(schema.url) === pathutil.normalize(schm)
-            const fileMatch = path && schema.fileMatch && schema.fileMatch.includes(path)
-            return (!path || fileMatch) && (!schm || schmMatch)
-        })
-        return setting
-    }
-
-    async handleUpdate(mapping: SchemaMapping, schemas: Schemas): Promise<void> {
-        await this.clean()
-
-        let settings = this.getJsonSettings()
-
-        const path = normalizeVSCodeUri(mapping.uri)
-        if (mapping.schema) {
-            const uri = resolveSchema(mapping.schema, schemas).toString()
-            const existing = this.getSettingBy({ schemaPath: uri })
-
-            if (existing) {
-                if (!existing.fileMatch) {
-                    getLogger().debug(`JsonSchemaHandler: skipped setting schema '${uri}'`)
-                } else {
-                    existing.fileMatch.push(path)
-                }
-            } else {
-                settings.push({
-                    fileMatch: [path],
-                    url: uri,
-                })
-            }
-        } else {
-            settings = filterJsonSettings(settings, file => file !== path)
-        }
-
-        await this.config.update('json.schemas', settings)
-    }
-
-    /**
-     * Attempts to find and remove orphaned resource mappings for AWS Resource documents
-     */
-    private async cleanResourceMappings(): Promise<void> {
-        getLogger().debug(`JsonSchemaHandler: cleaning stale schemas`)
-
-        // In the unlikely scenario of an error, we don't want to bubble it up
-        try {
-            const settings = filterJsonSettings(this.getJsonSettings(), file => !file.endsWith('.awsResource.json'))
-            await this.config.update('json.schemas', settings)
-        } catch (error) {
-            getLogger().warn(`JsonSchemaHandler: failed to clean stale schemas: ${error}`)
-        }
-    }
-
-    private getJsonSettings(): JSONSchemaSettings[] {
-        return this.config.get('json.schemas', ArrayConstructor(Object), [])
-    }
-}
-
-function resolveSchema(schema: string | vscode.Uri, schemas: Schemas): vscode.Uri {
-    if (schema instanceof vscode.Uri) {
-        return schema
-    }
-    return schemas[schema]
-}
-
-function filterJsonSettings(settings: JSONSchemaSettings[], predicate: (fileName: string) => boolean) {
-    return settings.filter(schema => {
-        schema.fileMatch = schema.fileMatch?.filter(file => predicate(file))
-
-        // Assumption: `fileMatch` was not empty beforehand
-        return schema.fileMatch === undefined || schema.fileMatch.length > 0
-    })
-}
-
-export interface JSONSchemaSettings {
-    fileMatch?: string[]
-    url?: string
-    schema?: any
-}
diff --git a/src/shared/settings.ts b/src/shared/settings.ts
deleted file mode 100644
index ec1600bdb92..00000000000
--- a/src/shared/settings.ts
+++ /dev/null
@@ -1,663 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as packageJson from '../../package.json'
-import { getLogger } from './logger'
-import { cast, FromDescriptor, Record, TypeConstructor, TypeDescriptor } from './utilities/typeConstructors'
-import { ClassToInterfaceType, keys } from './utilities/tsUtils'
-import { toRecord } from './utilities/collectionUtils'
-import { isNameMangled } from './vscode/env'
-import { once } from './utilities/functionUtils'
-import { ToolkitError } from './errors'
-
-type Workspace = Pick<typeof vscode.workspace, 'getConfiguration' | 'onDidChangeConfiguration'>
-
-/**
- * A class for manipulating VS Code user settings (from all extensions).
- *
- * This is distinct from {@link TypedSettings} which is backed by validation functions.
- * Use this class when very simple reading/writing to settings is needed.
- *
- * When additional logic is needed, prefer {@link fromExtensionManifest} for better encapsulation.
- */
-export class Settings {
-    public constructor(
-        private readonly target = vscode.ConfigurationTarget.Global,
-        private readonly scope: vscode.ConfigurationScope | undefined = undefined,
-        private readonly workspace: Workspace = vscode.workspace
-    ) {}
-
-    /**
-     * Reads a setting, applying the {@link TypeConstructor} if provided.
-     *
-     * Note that the absence of a key is indistinguisable from the absence of a value.
-     * That is, `undefined` looks the same across all calls. Any non-existent values are
-     * simply returned as-is without passing through the type cast.
-     */
-    public get(key: string): unknown
-    public get<T>(key: string, type: TypeConstructor<T>): T | undefined
-    public get<T>(key: string, type: TypeConstructor<T>, defaultValue: T): T
-    public get<T>(key: string, type?: TypeConstructor<T>, defaultValue?: T) {
-        const value = this.getConfig().get(key, defaultValue)
-
-        return !type || value === undefined ? value : cast(value, type)
-    }
-
-    /**
-     * Attempts to write to the settings.
-     *
-     * Settings can only be written to so long as a extension contributes the specified key
-     * in their `package.json`. If no contribution exists, then the write will fail, causing
-     * this method to return false.
-     *
-     * Writing to settings may fail if the user does not have write permissions, or if some
-     * requirement is not met. For example, the `vscode.ConfigurationTarget.Workspace` target
-     * requires a workspace.
-     */
-    public async update(key: string, value: unknown): Promise<boolean> {
-        try {
-            await this.getConfig().update(key, value, this.target)
-
-            return true
-        } catch (error) {
-            getLogger().warn(`Settings: failed to update "${key}": %s`, error)
-
-            return false
-        }
-    }
-
-    /**
-     * Returns a scoped "slice" (or "view") of the settings configuration.
-     *
-     * The returned {@link Settings} interface is limited to the provided section.
-     *
-     * Example:
-     * ```ts
-     * const section = settings.getSection('aws.samcli')
-     * const samCliLocation = section.get('location')
-     *
-     * // Reset all settings under `aws.samcli`
-     * await section.reset()
-     * ```
-     */
-    public getSection(section: string): ResetableMemento {
-        const parts = section.split('.')
-        const targetKey = parts.pop() ?? section
-        const parentSection = parts.join('.')
-
-        return {
-            get: (key, defaultValue?) => this.getConfig(section).get(key, defaultValue),
-            reset: async () => this.getConfig().update(section, undefined, this.target),
-            update: async (key, value) => {
-                // VS Code's settings API can read nested props but not write to them.
-                // We need to write to the parent if we cannot write to the child.
-                //
-                // TODO(sijaden): potentially provide valid keys upfront to avoid needing to
-                // handle this asymmetry with try/catch
-
-                try {
-                    return await this.getConfig(section).update(key, value, this.target)
-                } catch (error) {
-                    const parent = this.getConfig(parentSection)
-                    const val = parent.get(targetKey)
-
-                    if (typeof val === 'object') {
-                        return parent.update(targetKey, { ...val, [key]: value }, this.target)
-                    }
-
-                    throw error
-                }
-            },
-        }
-    }
-
-    /**
-     * Registers an event listener for a particular section of the settings.
-     */
-    public onDidChangeSection(
-        section: string,
-        listener: (event: vscode.ConfigurationChangeEvent) => unknown
-    ): vscode.Disposable {
-        const toRelative = (sub: string) => (section ? [section, sub] : [sub]).join('.')
-
-        return this.workspace.onDidChangeConfiguration(e => {
-            const affectsConfiguration = (section: string) => e.affectsConfiguration(toRelative(section), this.scope)
-
-            if (!section || e.affectsConfiguration(section, this.scope)) {
-                listener({ affectsConfiguration })
-            }
-        })
-    }
-
-    /**
-     * Gets the workspace configuration, optionally scoped to a section.
-     *
-     * The resulting configuration object should not be cached.
-     */
-    private getConfig(section?: string) {
-        return this.workspace.getConfiguration(section, this.scope)
-    }
-
-    /**
-     * Defines a new set of settings from the specified section.
-     *
-     * Only use this for creating 'virtual' settings that don't exist within `package.json`.
-     * Prefer {@link fromExtensionManifest} for most use-cases.
-     */
-    public static define<T extends TypeDescriptor>(section: string, descriptor: T) {
-        return createSettingsClass(section, descriptor)
-    }
-
-    static #instance: Settings
-
-    /**
-     * A singleton scoped to the global configuration target.
-     */
-    public static get instance() {
-        return (this.#instance ??= new this())
-    }
-}
-
-// Keeping a separate function without a return type allows us to infer protected methods
-// TODO(sijaden): we can make this better in TS 4.7
-function createSettingsClass<T extends TypeDescriptor>(section: string, descriptor: T) {
-    type Inner = FromDescriptor<T>
-
-    // Class names are not always stable, especially when bundling
-    function makeLogger(name = 'Settings', loglevel: 'debug' | 'error') {
-        const prefix = `${isNameMangled() ? 'Settings' : name} (${section})`
-        return (message: string, ...meta: any[]) =>
-            loglevel === 'debug'
-                ? getLogger().debug(`${prefix}: ${message}`, ...meta)
-                : getLogger().error(`${prefix}: ${message}`, ...meta)
-    }
-
-    return class AnonymousSettings implements TypedSettings<Inner> {
-        private readonly config = this.settings.getSection(section)
-        private readonly disposables: vscode.Disposable[] = []
-        // TODO(sijaden): add metadata prop to `Logger` so we don't need to make one-off log functions
-        protected readonly log = makeLogger(Object.getPrototypeOf(this)?.constructor?.name, 'debug')
-        protected readonly logErr = makeLogger(Object.getPrototypeOf(this)?.constructor?.name, 'error')
-
-        public constructor(private readonly settings: ClassToInterfaceType<Settings> = Settings.instance) {}
-
-        public get onDidChange() {
-            return this.getChangedEmitter().event
-        }
-
-        public get<K extends keyof Inner>(key: K & string, defaultValue?: Inner[K]) {
-            try {
-                return this.getOrThrow(key, defaultValue)
-            } catch (e) {
-                if (arguments.length === 1) {
-                    throw ToolkitError.chain(e, `Failed to read key "${section}.${key}"`)
-                }
-
-                this.logErr(`using default for key "${key}", read failed: %s`, e)
-
-                return defaultValue as Inner[K]
-            }
-        }
-
-        public async update<K extends keyof Inner>(key: K & string, value: Inner[K]) {
-            try {
-                await this.config.update(key, value)
-
-                return true
-            } catch (error) {
-                this.log(`failed to update field "${key}": %s`, error)
-
-                return false
-            }
-        }
-
-        public async delete(key: keyof Inner & string) {
-            try {
-                await this.config.update(key, undefined)
-
-                return true
-            } catch (error) {
-                this.log(`failed to delete field "${key}": %s`, error)
-
-                return false
-            }
-        }
-
-        public async reset() {
-            try {
-                return await this.config.reset()
-            } catch (error) {
-                this.log(`failed to reset settings: %s`, error)
-            }
-        }
-
-        public dispose() {
-            return vscode.Disposable.from(this.getChangedEmitter(), ...this.disposables).dispose()
-        }
-
-        protected getOrThrow<K extends keyof Inner>(key: K & string, defaultValue?: Inner[K]) {
-            const value = this.config.get(key, defaultValue)
-
-            return cast<Inner[K]>(value, descriptor[key])
-        }
-
-        protected getOrUndefined<K extends keyof Inner>(key: K & string) {
-            const value = this.config.get(key)
-            if (value === undefined) {
-                return value
-            }
-
-            return this.get(key, undefined)
-        }
-
-        private readonly getChangedEmitter = once(() => {
-            // For a setting `aws.foo.bar`:
-            //   - the "section" is `aws.foo`
-            //   - the "key" is `bar`
-            //
-            // So if `aws.foo.bar` changed, this would fire with data `{ key: 'bar' }`
-            //
-            // Note that `undefined` is not a valid JSON value. So using it as a default
-            // value is a valid way to express that the key exists but no (valid) value is set.
-
-            const props = keys(descriptor)
-            const store = toRecord(props, p => this.getOrUndefined(p))
-            const emitter = new vscode.EventEmitter<{ readonly key: keyof T }>()
-            const listener = this.settings.onDidChangeSection(section, event => {
-                const isDifferent = (p: keyof T & string) => {
-                    const isDifferentLazy = () => {
-                        const previous = store[p]
-                        return previous !== (store[p] = this.getOrUndefined(p))
-                    }
-
-                    return event.affectsConfiguration(p) || isDifferentLazy()
-                }
-
-                for (const key of props.filter(isDifferent)) {
-                    this.log(`key "${key}" changed`)
-                    emitter.fire({ key })
-                }
-            })
-
-            this.disposables.push(emitter, listener)
-            return emitter
-        })
-    }
-}
-
-/**
- * A stricter form of {@link vscode.Memento} with type-safe semantics.
- */
-export interface TypedSettings<T extends Record<string, any>> extends Omit<ResetableMemento, 'get' | 'update'> {
-    /**
-     * Gets the value stored at `key`.
-     *
-     * This will always return the expected type, otherwise an error is thrown.
-     */
-    get<K extends keyof T>(key: K, defaultValue?: T[K]): T[K]
-
-    /**
-     * Updates the value stored at `key`.
-     *
-     * Errors are always handled, so any issues will cause this method to return `false`.
-     */
-    update<K extends keyof T>(key: K, value: T[K]): Promise<boolean>
-
-    /**
-     * Deletes a key from the settings.
-     *
-     * This is equivalent to setting the value to `undefined`, though keeping the two
-     * concepts separate helps with catching unexpected behavior.
-     */
-    delete(key: keyof T): Promise<boolean>
-
-    /**
-     * Fired whenever a specific configuration changes.
-     */
-    readonly onDidChange: vscode.Event<{ readonly key: keyof T }>
-}
-
-/**
- * Slightly extended form of {@link vscode.Memento}.
- */
-export interface ResetableMemento extends vscode.Memento {
-    /**
-     * Resets the entire underlying store.
-     *
-     * A reset can be thought of as setting an imaginary 'root' key to `undefined`.
-     */
-    reset(): Promise<void>
-}
-
-// The below types are used to split-out 'sections' from `package.json`
-// Obviously not ideal, but the alternative is to generate the properties
-// from implementations. Using types requires basically no logic but lacks
-// precision. We still need to manually specify what type something should be,
-// at least for anything beyond primitive types.
-const settingsProps = packageJson.contributes.configuration.properties
-
-type SettingsProps = typeof settingsProps
-
-type Split<T, S extends string> = T extends `${infer L}${S}${infer R}` ? [L, ...Split<R, S>] : [T]
-type Pop<T> = T extends [...infer R, infer _] ? R : never
-type Intersection<T> = (T extends any ? (_: T) => any : never) extends (_: infer U) => any ? U : never
-
-type FromParts<T, K> = K extends [infer U, ...infer R]
-    ? [U, R] extends [string, string[]]
-        ? { [P in U & string]: FromParts<T, R> }
-        : T
-    : T
-
-type Format<T> = { [P in keyof T]: FromParts<TypeConstructor, Split<P, '.'>> }[keyof T]
-type Config = Intersection<Format<SettingsProps>>
-
-type Join<T extends string[], S extends string> = T['length'] extends 1
-    ? T[0]
-    : T extends [infer L, ...infer R]
-    ? L extends string
-        ? R extends string[]
-            ? `${L}${S}${Join<R, S>}`
-            : ''
-        : ''
-    : never
-
-type Select<T, K> = K extends [infer L, ...infer R]
-    ? L extends keyof T
-        ? R['length'] extends 0
-            ? T[L]
-            : Select<T[L], R>
-        : never
-    : never
-
-type Sections = { [P in keyof SettingsProps as Join<Pop<Split<P, '.'>>, '.'>]: Select<Config, Pop<Split<P, '.'>>> }
-
-/**
- * Creates a class for manipulating specific sections of settings specified in `package.json`.
- *
- * A 'section' is the combined namespaces of a key, e.g. `aws.foo.bar` is within the section `aws.foo`.
- * From a section, callers can specify which keys they want to use as well as how it should be parsed.
- * The returned class will be a valid implementation of {@link TypedSettings}. Declared settings keys
- * are validated against `package.json` to ensure they exist.
- *
- * ### Examples
- * #### Pass-through:
- * ```
- * export class CloudWatchLogsSettings extends fromExtensionManifest('aws.cloudWatchLogs', { limit: Number }) {}
- *
- * const settings = new CloudWatchLogsSettings()
- * const limit = settings.get('limit', 1000)
- * ```
- *
- * #### Extending:
- * ```
- * export class TelemetryConfig extends fromExtensionManifest('aws', { telemetry: Boolean }) {
- *     public isEnabled(): boolean {
- *         try {
- *             return this.get('telemetry', TELEMETRY_SETTING_DEFAULT)
- *         } catch (error) {
- *              vscode.window.showErrorMessage(
- *                  localize(
- *                      'AWS.message.error.settings.telemetry.invalid_type',
- *                      'The aws.telemetry value must be a boolean'
- *                  )
- *              )
- *
- *              return TELEMETRY_SETTING_DEFAULT
- *         }
- *     }
- * }
- * ```
- *
- * @param section Section used to create the class
- * @param descriptor A {@link TypeDescriptor} that maps keys to a concrete type
- *
- * @returns A class that can be used as-is or inherited from
- */
-export function fromExtensionManifest<T extends TypeDescriptor & Partial<Sections[K]>, K extends keyof Sections>(
-    section: K,
-    descriptor: T
-) {
-    // The function signature is intentionally loose to allow for partial implementations.
-    // Runtime validation is required to ensure things are correct.
-    //
-    // Assumptions:
-    // - `fromExtensionManifest` is called exclusively on module load
-    // - The extension loads all modules before activating
-    //
-    // As long as the above holds true, throwing an error here will always be caught by CI
-
-    const resolved = keys(descriptor).map(k => `${section}.${k}`)
-    const missing = resolved.filter(k => (settingsProps as Record<string, any>)[k] === undefined)
-
-    if (missing.length > 0) {
-        const message = `The following configuration keys were missing from package.json: ${missing.join(', ')}`
-        getLogger().error(`Settings (fromExtensionManifest): missing fields:\n${missing.map(k => `\t${k}`).join('\n')}`)
-
-        throw new Error(message)
-    }
-
-    return Settings.define(section, descriptor)
-}
-
-const prompts = settingsProps['aws.suppressPrompts'].properties
-type PromptName = keyof typeof prompts
-
-/**
- * Controls flags for prompts that allow the user to hide them. Usually this is presented as
- * some variation of "Don't show again".
- *
- * ### Usage:
- * ```
- * if (await settings.isPromptEnabled('myPromptName')) {
- *     // Show some sort of prompt
- *     const userResponse = await promptUser()
- *
- *     // Then check if we should disable it
- *     if (userResponse === "Don't show again") {
- *         settings.disablePrompt('myPromptName')
- *     }
- * }
- * ```
- */
-export class PromptSettings extends Settings.define(
-    'aws.suppressPrompts',
-    toRecord(keys(prompts), () => Boolean)
-) {
-    public async isPromptEnabled(promptName: PromptName): Promise<boolean> {
-        try {
-            return !this.getOrThrow(promptName, false)
-        } catch (error) {
-            this.log(`prompt check for "${promptName}" failed: %s`, error)
-            await this.reset()
-
-            return true
-        }
-    }
-
-    public async disablePrompt(promptName: PromptName): Promise<void> {
-        if (await this.isPromptEnabled(promptName)) {
-            await this.update(promptName, true)
-        }
-    }
-
-    static #instance: PromptSettings
-
-    public static get instance() {
-        return (this.#instance ??= new this())
-    }
-}
-
-const experiments = settingsProps['aws.experiments'].properties
-type ExperimentName = keyof typeof experiments
-
-/**
- * "Experiments" are for features that users must opt-in to use. Experimental implementations
- * should use this class to gate relevant functionality. Certain features, like adding a new
- * node to the tree view, may require notifications based on changes. Use the `onDidChange` event
- * to refresh state as-needed in this scenario.
- *
- * ### Usage:
- * ```
- * function myExperimentalFeature(): void {
- *   if (!(await settings.isExperimentEnabled('myExperimentalFeature'))) {
- *       return
- *   }
- *
- *   // Rest of the feature
- * }
- *
- * settings.onDidChange(({ key }) => {
- *    if (key === 'myExperimentalFeature') {
- *        // Refresh trees, webviews, etc.
- *    }
- * })
- * ```
- */
-export class Experiments extends Settings.define(
-    'aws.experiments',
-    toRecord(keys(experiments), () => Boolean)
-) {
-    public async isExperimentEnabled(name: ExperimentName): Promise<boolean> {
-        try {
-            return this.getOrThrow(name, false)
-        } catch (error) {
-            this.log(`experiment check for ${name} failed: %s`, error)
-            await this.reset()
-
-            return false
-        }
-    }
-
-    static #instance: Experiments
-
-    public static get instance() {
-        return (this.#instance ??= new this())
-    }
-}
-
-const devSettings = {
-    forceCloud9: Boolean,
-    forceDevMode: Boolean,
-    forceInstallTools: Boolean,
-    telemetryEndpoint: String,
-    telemetryUserPool: String,
-    endpoints: Record(String, String),
-    cawsStage: String,
-}
-type ResolvedDevSettings = FromDescriptor<typeof devSettings>
-type AwsDevSetting = keyof ResolvedDevSettings
-
-/**
- * Developer settings are intended to be used by developers of this codebase for anything
- * that may be potentially useful during active development and/or testing. Examples include
- * forcing certain behaviors, changing hard-coded endpoints, emitting extra debug info, etc.
- *
- * These settings should _not_ be placed in `package.json` as they are not meant to be seen by
- * the average user. Instead, add a new field to {@link devSettings this object} with the
- * desired name/type.
- *
- * Note that a default value _must_ be supplied when calling {@link get} because developer
- * settings are intentional deviations from the default. Always using a default helps to
- * ensure that behavior is well-defined and isolated. Calls to {@link get} will not throw
- * an error, even for bad types, unless the code is ran from automated tests. The supplied
- * default will be used in case any errors occur in non-testing environment.
- *
- * ### Usage:
- * ```
- * // Use the `instance` field to retrieve the object
- * const devSettings = DevSettings.instance
- *
- * // Override some endpoint for an SDK client
- * const myEndpoint = devSettings.get('myEndpoint', DEFAULT_ENDPOINT)
- * const myClient = new MyClient({ endpoint: myEndpoint })
- *
- * // Potentially register an event (if needed)
- * devSettings.onDidChange(({ key }) => {
- *     // Do something based off what changed
- * })
- * ```
- */
-export class DevSettings extends Settings.define('aws.dev', devSettings) {
-    private readonly trappedSettings: Partial<ResolvedDevSettings> = {}
-    private readonly onDidChangeActiveSettingsEmitter = new vscode.EventEmitter<void>()
-
-    public readonly onDidChangeActiveSettings = this.onDidChangeActiveSettingsEmitter.event
-
-    public get activeSettings(): Readonly<typeof this.trappedSettings> {
-        return this.trappedSettings
-    }
-
-    public override get<K extends AwsDevSetting>(key: K, defaultValue: ResolvedDevSettings[K]) {
-        const result = super.get(key, defaultValue)
-
-        if (result !== defaultValue) {
-            this.trap(key, result)
-        }
-
-        return result
-    }
-
-    private trap<K extends AwsDevSetting>(key: K, value: ResolvedDevSettings[K]) {
-        if (this.trappedSettings[key] !== value) {
-            this.trappedSettings[key] = value
-            this.onDidChangeActiveSettingsEmitter.fire()
-        }
-    }
-
-    static #instance: DevSettings
-
-    public static get instance() {
-        if (this.#instance === undefined) {
-            this.#instance = new this()
-            this.#instance.get('forceDevMode', false)
-        }
-
-        return this.#instance
-    }
-}
-
-/**
- * Simple utility function to 'migrate' a setting from one key to another.
- *
- * Currently only used for simple migrations where we are not concerned about maintaining the
- * legacy definition. Only migrates to global settings.
- */
-export async function migrateSetting<T, U = T>(
-    from: { key: string; type: TypeConstructor<T> },
-    to: { key: string; transform?: (value: T) => U }
-) {
-    // TODO(sijaden): we should handle other targets besides 'global'
-    const config = vscode.workspace.getConfiguration()
-    const hasLatest = config.inspect(to.key)?.globalValue !== undefined
-    const logPrefix = `Settings migration ("${from.key}" -> "${to.key}")`
-
-    if (hasLatest || !config.has(from.key)) {
-        return true
-    }
-
-    try {
-        const oldVal = cast(config.get(from.key), from.type)
-        const newVal = to.transform?.(oldVal) ?? oldVal
-
-        await config.update(to.key, newVal, vscode.ConfigurationTarget.Global)
-        getLogger().debug(`${logPrefix}: succeeded`)
-
-        return true
-    } catch (error) {
-        getLogger().verbose(`${logPrefix}: failed: %s`, error)
-
-        return false
-    }
-}
-
-/**
- * Opens the settings UI at the specified key.
- *
- * This only works for keys that are considered "top-level", e.g. keys of {@link settingsProps}.
- */
-export async function openSettings<K extends keyof SettingsProps>(key: K): Promise<void> {
-    await vscode.commands.executeCommand('workbench.action.openSettings', `@id:${key}`)
-}
diff --git a/src/shared/systemUtilities.ts b/src/shared/systemUtilities.ts
deleted file mode 100644
index 8fbe5c4d0d8..00000000000
--- a/src/shared/systemUtilities.ts
+++ /dev/null
@@ -1,251 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as fs from 'fs-extra'
-import * as vscode from 'vscode'
-import * as os from 'os'
-import * as path from 'path'
-import { EnvironmentVariables } from './environmentVariables'
-import { ChildProcess } from './utilities/childProcess'
-import { getLogger } from './logger/logger'
-import { GitExtension } from './extensions/git'
-import { isCloud9 } from './extensionUtilities'
-import { Settings } from './settings'
-
-export class SystemUtilities {
-    /** Full path to VSCode CLI. */
-    private static vscPath: string
-    private static sshPath: string
-    private static gitPath: string
-    private static bashPath: string
-    private static fileNotFound = vscode.FileSystemError.FileNotFound().code
-
-    public static getHomeDirectory(): string {
-        const env = process.env as EnvironmentVariables
-
-        if (env.HOME !== undefined) {
-            return env.HOME
-        }
-        if (env.USERPROFILE !== undefined) {
-            return env.USERPROFILE
-        }
-        if (env.HOMEPATH !== undefined) {
-            const homeDrive: string = env.HOMEDRIVE || 'C:'
-
-            return path.join(homeDrive, env.HOMEPATH)
-        }
-
-        return os.homedir()
-    }
-
-    public static async readFile(file: string | vscode.Uri): Promise<string> {
-        const uri = typeof file === 'string' ? vscode.Uri.file(file) : file
-        const decoder = new TextDecoder()
-
-        if (isCloud9()) {
-            return decoder.decode(await fs.readFile(uri.fsPath))
-        }
-
-        return decoder.decode(await vscode.workspace.fs.readFile(uri))
-    }
-
-    public static async writeFile(file: string | vscode.Uri, data: string | Buffer): Promise<void> {
-        const uri = typeof file === 'string' ? vscode.Uri.file(file) : file
-        const content = typeof data === 'string' ? new TextEncoder().encode(data) : data
-
-        if (isCloud9()) {
-            return fs.writeFile(uri.fsPath, content)
-        }
-
-        return vscode.workspace.fs.writeFile(uri, content)
-    }
-
-    public static async remove(dir: string | vscode.Uri): Promise<void> {
-        const uri = typeof dir === 'string' ? vscode.Uri.file(dir) : dir
-
-        if (isCloud9()) {
-            return fs.remove(uri.fsPath)
-        }
-
-        return vscode.workspace.fs.delete(uri, { recursive: true })
-    }
-
-    public static async fileExists(file: string | vscode.Uri): Promise<boolean> {
-        const uri = typeof file === 'string' ? vscode.Uri.file(file) : file
-
-        if (isCloud9()) {
-            return new Promise<boolean>(resolve => fs.access(uri.fsPath, err => resolve(!err)))
-        }
-
-        return vscode.workspace.fs.stat(uri).then(
-            () => true,
-            err => !(err instanceof vscode.FileSystemError && err.code === this.fileNotFound)
-        )
-    }
-
-    public static async createDirectory(file: string | vscode.Uri): Promise<void> {
-        const uri = typeof file === 'string' ? vscode.Uri.file(file) : file
-
-        if (isCloud9()) {
-            return fs.ensureDir(uri.fsPath)
-        }
-
-        return vscode.workspace.fs.createDirectory(uri)
-    }
-
-    /**
-     * Gets the fullpath to `code` (VSCode CLI), or falls back to "code" (not
-     * absolute) if it works.
-     *
-     * @see https://github.com/microsoft/vscode-test/blob/4bdccd4c386813a8158b0f9b96f31cbbecbb3374/lib/util.ts#L133
-     */
-    public static async getVscodeCliPath(): Promise<string | undefined> {
-        if (SystemUtilities.vscPath) {
-            return SystemUtilities.vscPath
-        }
-
-        const vscExe = process.argv0
-        // https://github.com/microsoft/vscode-test/blob/4bdccd4c386813a8158b0f9b96f31cbbecbb3374/lib/util.ts#L133
-        const vscs = [
-            // Note: macOS does not have a separate "code-insiders" binary.
-            path.resolve(`${vscode.env.appRoot}/bin/code`), // macOS
-            path.resolve(`${vscode.env.appRoot}/../../bin/code`), // Windows
-            path.resolve(`${vscode.env.appRoot}/../../bin/code-insiders`), // Windows
-            // Linux example "appRoot": vscode-linux-x64-1.42.0/VSCode-linux-x64/resources/app
-            path.resolve(`${vscode.env.appRoot}/code`),
-            path.resolve(vscExe, '../bin/code-insiders'),
-            path.resolve(vscExe, '../bin/code'),
-            path.resolve(vscExe, '../../bin/code-insiders'),
-            path.resolve(vscExe, '../../bin/code'),
-            '/usr/bin/code',
-            'code', // $PATH
-        ]
-        for (const vsc of vscs) {
-            if (vsc !== 'code' && !fs.existsSync(vsc)) {
-                continue
-            }
-            const proc = new ChildProcess(vsc, ['--version'])
-            const r = await proc.run()
-            if (r.exitCode === 0) {
-                SystemUtilities.vscPath = vsc
-                return vsc
-            }
-            getLogger().warn('getVscodeCliPath: failed: %s', proc)
-        }
-
-        return undefined
-    }
-
-    /**
-     * Searches for `tsc` in the current workspace, or the system (tries `tsc`
-     * using current $PATH).
-     *
-     * @returns fullpath if found in the workspace, "tsc" if found in current $PATH, else undefined.
-     */
-    public static async findTypescriptCompiler(): Promise<string | undefined> {
-        const foundUris = await vscode.workspace.findFiles('**/node_modules/.bin/{tsc,tsc.cmd}', undefined, 1)
-        const tscPaths = []
-        if (foundUris.length > 0) {
-            tscPaths.push(foundUris[0].fsPath)
-        }
-        tscPaths.push('tsc') // Try this last.
-
-        for (const tsc of tscPaths) {
-            // Try to run "tsc -v".
-            const result = await new ChildProcess(tsc, ['-v']).run()
-            if (result.exitCode === 0 && result.stdout.includes('Version')) {
-                return tsc
-            }
-        }
-
-        return undefined
-    }
-
-    /**
-     * Gets the configured `ssh` path, or falls back to "ssh" (not absolute),
-     * or tries common locations, or returns undefined.
-     */
-    public static async findSshPath(): Promise<string | undefined> {
-        if (SystemUtilities.sshPath !== undefined) {
-            return SystemUtilities.sshPath
-        }
-
-        const sshSettingPath = Settings.instance.get('remote.SSH.path', String, '')
-        const paths = [
-            sshSettingPath,
-            'ssh', // Try $PATH _before_ falling back to common paths.
-            '/usr/bin/ssh',
-            'C:/Windows/System32/OpenSSH/ssh.exe',
-            'C:/Program Files/Git/usr/bin/ssh.exe',
-        ]
-        for (const p of paths) {
-            if (!p || ('ssh' !== p && !fs.existsSync(p))) {
-                continue
-            }
-            const proc = new ChildProcess(p, ['-G', 'x'])
-            const r = await proc.run()
-            if (r.exitCode === 0) {
-                SystemUtilities.sshPath = p
-                return p
-            }
-            getLogger().warn('findSshPath: failed: %s', proc)
-        }
-    }
-
-    /**
-     * Gets the configured `git` path, or falls back to "ssh" (not absolute),
-     * or tries common locations, or returns undefined.
-     */
-    public static async findGitPath(): Promise<string | undefined> {
-        if (SystemUtilities.gitPath !== undefined) {
-            return SystemUtilities.gitPath
-        }
-        const git = GitExtension.instance
-
-        const paths = [git.gitPath, 'git']
-        for (const p of paths) {
-            if (!p || ('git' !== p && !fs.existsSync(p))) {
-                continue
-            }
-            const proc = new ChildProcess(p, ['--version'])
-            const r = await proc.run()
-            if (r.exitCode === 0) {
-                SystemUtilities.gitPath = p
-                return p
-            }
-            getLogger().warn('findGitPath: failed: %s', proc)
-        }
-    }
-
-    /**
-     * Gets a working `bash`, or undefined.
-     */
-    public static async findBashPath(): Promise<string | undefined> {
-        if (SystemUtilities.bashPath !== undefined) {
-            return SystemUtilities.bashPath
-        }
-
-        const paths = ['bash', 'C:/Program Files/Git/usr/bin/bash.exe', 'C:/Program Files (x86)/Git/usr/bin/bash.exe']
-        for (const p of paths) {
-            if (!p || ('bash' !== p && !fs.existsSync(p))) {
-                continue
-            }
-            const proc = new ChildProcess(p, ['--version'])
-            const r = await proc.run()
-            if (r.exitCode === 0) {
-                SystemUtilities.bashPath = p
-                return p
-            }
-            getLogger().warn('findBashPath: failed: %s', proc)
-        }
-    }
-
-    /**
-     * Returns true if the current build is running on CI (build server).
-     */
-    public static isCI(): boolean {
-        return undefined !== process.env['CODEBUILD_BUILD_ID']
-    }
-}
diff --git a/src/shared/telemetry/README b/src/shared/telemetry/README
deleted file mode 100644
index 009b46a8db1..00000000000
--- a/src/shared/telemetry/README
+++ /dev/null
@@ -1,11 +0,0 @@
-This is the core of the telemetry service client for the AWS Toolkit for Visual Studio Code
-
-service-2.json is generated internally.
-
-clienttelemetry.d.ts is autogenerated from service-2.json using the AWS JS SDK. This is incorporated into the
-`postinstall` npm step.
-
-\build-scripts\generateServiceClient.ts automates the process of generating clienttelemetry.d.ts
-
-Client ID is generated and stored/retrieved in `createDefaultPublisher()`:
-https://github.com/aws/aws-toolkit-vscode/blob/d3cd90c114b5be6b2cfabad4bfa5670f0b7adf60/src/shared/telemetry/defaultTelemetryService.ts#L163-L168
diff --git a/src/shared/telemetry/activation.ts b/src/shared/telemetry/activation.ts
deleted file mode 100644
index c5e7a98df49..00000000000
--- a/src/shared/telemetry/activation.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import globals from '../extensionGlobals'
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as vscode from 'vscode'
-import { AwsContext } from '../awsContext'
-import { DefaultTelemetryService } from './telemetryService'
-import { getLogger } from '../logger'
-import { getComputeRegion, getIdeProperties, isCloud9 } from '../extensionUtilities'
-import { openSettings, Settings } from '../settings'
-import { TelemetryConfig } from './util'
-import { isAutomation, isReleaseVersion } from '../vscode/env'
-
-export const noticeResponseViewSettings = localize('AWS.telemetry.notificationViewSettings', 'Settings')
-export const noticeResponseOk = localize('AWS.telemetry.notificationOk', 'OK')
-
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export const TELEMETRY_NOTICE_VERSION_ACKNOWLEDGED = 'awsTelemetryNoticeVersionAck'
-
-// Telemetry Notice Versions
-// Versioning the users' notice acknowledgement is forward looking, and allows us to better
-// track scenarios when we may need to re-prompt the user about telemetry.
-// Version 1 was the original notice, allowing users to enable/disable/defer telemetry
-// Version 2 states that there is metrics gathering, which can be adjusted in the options
-const CURRENT_TELEMETRY_NOTICE_VERSION = 2 // eslint-disable-line @typescript-eslint/naming-convention
-
-/**
- * Sets up the Metrics system and initializes globals.telemetry
- */
-export async function activate(extensionContext: vscode.ExtensionContext, awsContext: AwsContext, settings: Settings) {
-    const config = new TelemetryConfig(settings)
-    globals.telemetry = new DefaultTelemetryService(extensionContext, awsContext, getComputeRegion())
-
-    try {
-        globals.telemetry.telemetryEnabled = config.isEnabled()
-
-        extensionContext.subscriptions.push(
-            config.onDidChange(event => {
-                if (event.key === 'telemetry') {
-                    globals.telemetry.telemetryEnabled = config.isEnabled()
-                }
-            })
-        )
-
-        // Prompt user about telemetry if they haven't been
-        if (!isCloud9() && !hasUserSeenTelemetryNotice(extensionContext)) {
-            showTelemetryNotice(extensionContext)
-        }
-
-        await globals.telemetry.start()
-    } catch (e) {
-        // Only throw in a production build because:
-        //   1. Telemetry must never prevent normal Toolkit operation.
-        //   2. We want to know if something is not working ASAP during development.
-        if (isAutomation() || !isReleaseVersion()) {
-            throw e
-        }
-
-        getLogger().error(`telemetry: failed to activate: %s`, e)
-    }
-}
-
-export function hasUserSeenTelemetryNotice(extensionContext: vscode.ExtensionContext): boolean {
-    return (
-        extensionContext.globalState.get<number>(TELEMETRY_NOTICE_VERSION_ACKNOWLEDGED, 0) >=
-        CURRENT_TELEMETRY_NOTICE_VERSION
-    )
-}
-
-export async function setHasUserSeenTelemetryNotice(extensionContext: vscode.ExtensionContext): Promise<void> {
-    await extensionContext.globalState.update(TELEMETRY_NOTICE_VERSION_ACKNOWLEDGED, CURRENT_TELEMETRY_NOTICE_VERSION)
-    getLogger().verbose('Telemetry notice has been shown')
-}
-
-/**
- * Prompts user to Enable/Disable/Defer on Telemetry, then
- * handles the response appropriately.
- */
-function showTelemetryNotice(extensionContext: vscode.ExtensionContext) {
-    getLogger().verbose('Showing telemetry notice')
-
-    const telemetryNoticeText: string = localize(
-        'AWS.telemetry.notificationMessage',
-        '{0} Toolkit collects anonymous usage metrics to help drive toolkit improvements. This can be changed in the settings.',
-        getIdeProperties().company
-    )
-
-    // Don't wait for a response
-    vscode.window
-        .showInformationMessage(telemetryNoticeText, noticeResponseViewSettings, noticeResponseOk)
-        .then(async response => handleTelemetryNoticeResponse(response, extensionContext))
-}
-
-export async function handleTelemetryNoticeResponse(
-    response: string | undefined,
-    extensionContext: vscode.ExtensionContext
-) {
-    try {
-        getLogger().verbose(`Telemetry notice response: ${response}`)
-
-        if (!response) {
-            // undefined == user discarded notice
-            return
-        }
-
-        setHasUserSeenTelemetryNotice(extensionContext)
-
-        // noticeResponseOk is a no-op
-
-        if (response === noticeResponseViewSettings) {
-            openSettings('aws.telemetry')
-        }
-    } catch (err) {
-        getLogger().error('Error while handling response from telemetry notice: %O', err as Error)
-    }
-}
diff --git a/src/shared/telemetry/service-2.json b/src/shared/telemetry/service-2.json
deleted file mode 100644
index fd2bd50ddf9..00000000000
--- a/src/shared/telemetry/service-2.json
+++ /dev/null
@@ -1,235 +0,0 @@
-{
-  "version":"2.0",
-  "metadata":{
-    "apiVersion":"2017-07-25",
-    "endpointPrefix":"client-telemetry",
-    "jsonVersion":"1.1",
-    "protocol":"rest-json",
-    "serviceAbbreviation":"ToolkitTelemetry",
-    "serviceFullName":"A beautiful and amazing ToolkitTelemetry",
-    "serviceId":"ToolkitTelemetry",
-    "signatureVersion":"v4",
-    "signingName":"execute-api"
-  },
-  "operations":{
-    "PostErrorReport":{
-      "name":"PostErrorReport",
-      "http":{
-        "method":"POST",
-        "requestUri":"/errorReport"
-      },
-      "input":{"shape":"PostErrorReportRequest"}
-    },
-    "PostFeedback":{
-      "name":"PostFeedback",
-      "http":{
-        "method":"POST",
-        "requestUri":"/feedback"
-      },
-      "input":{"shape":"PostFeedbackRequest"}
-    },
-    "PostMetrics":{
-      "name":"PostMetrics",
-      "http":{
-        "method":"POST",
-        "requestUri":"/metrics"
-      },
-      "input":{"shape":"PostMetricsRequest"}
-    }
-  },
-  "shapes":{
-    "AWSProduct":{
-      "type":"string",
-      "enum":[
-        "canary",
-        "AWS Toolkit For JetBrains",
-        "AWS Toolkit For Eclipse",
-        "AWS Toolkit For VisualStudio",
-        "AWS Toolkit For VS Code"
-      ]
-    },
-    "AWSProductVersion":{
-      "type":"string",
-      "pattern":"^[\\w+-.]{1,512}$"
-    },
-    "ClientID":{
-      "type":"string",
-      "pattern":"^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}$"
-    },
-    "Command":{
-      "type":"string",
-      "max":2000
-    },
-    "Comment":{
-      "type":"string",
-      "max":2000
-    },
-    "Datapoint":{
-      "type":"double",
-      "min":0
-    },
-    "Email":{
-      "type":"string",
-      "pattern":"^[a-zA-Z0-9.!#$%&amp;'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$"
-    },
-    "EpochTimestamp":{
-      "type":"long",
-      "min":0
-    },
-    "ErrorDetails":{
-      "type":"structure",
-      "required":[
-        "Command",
-        "EpochTimestamp",
-        "Type",
-        "StackTrace"
-      ],
-      "members":{
-        "Command":{"shape":"Command"},
-        "EpochTimestamp":{"shape":"EpochTimestamp"},
-        "Type":{"shape":"Type"},
-        "Message":{"shape":"Message"},
-        "StackTrace":{"shape":"StackTrace"}
-      }
-    },
-    "Key":{
-      "type":"string",
-      "pattern":"^\\w[\\w\\.]{0,149}$"
-    },
-    "Message":{
-      "type":"string",
-      "max":2048
-    },
-    "Metadata":{
-      "type":"list",
-      "member":{"shape":"MetadataEntry"}
-    },
-    "MetadataEntry":{
-      "type":"structure",
-      "members":{
-        "Key":{"shape":"Key"},
-        "Value":{"shape":"Value"}
-      }
-    },
-    "MetricData":{
-      "type":"list",
-      "member":{"shape":"MetricDatum"},
-      "max":20,
-      "min":1
-    },
-    "MetricDatum":{
-      "type":"structure",
-      "required":[
-        "MetricName",
-        "EpochTimestamp",
-        "Unit",
-        "Value"
-      ],
-      "members":{
-        "MetricName":{"shape":"MetricName"},
-        "EpochTimestamp":{"shape":"EpochTimestamp"},
-        "Unit":{"shape":"Unit"},
-        "Value":{"shape":"Datapoint"},
-        "Metadata":{"shape":"Metadata"},
-        "Passive":{"shape":"Passive"}
-      }
-    },
-    "MetricName":{
-      "type":"string",
-      "pattern":"^[\\w+-.:]{1,255}$"
-    },
-    "Passive":{"type":"boolean"},
-    "PostErrorReportRequest":{
-      "type":"structure",
-      "required":[
-        "AWSProduct",
-        "AWSProductVersion",
-        "ErrorDetails"
-      ],
-      "members":{
-        "AWSProduct":{"shape":"AWSProduct"},
-        "AWSProductVersion":{"shape":"AWSProductVersion"},
-        "Metadata":{"shape":"Metadata"},
-        "Userdata":{"shape":"Userdata"},
-        "ErrorDetails":{"shape":"ErrorDetails"}
-      }
-    },
-    "PostFeedbackRequest":{
-      "type":"structure",
-      "required":[
-        "AWSProduct",
-        "AWSProductVersion",
-        "ParentProduct",
-        "ParentProductVersion",
-        "Sentiment",
-        "Comment"
-      ],
-      "members":{
-        "AWSProduct":{"shape":"AWSProduct"},
-        "AWSProductVersion":{"shape":"AWSProductVersion"},
-        "OS":{"shape":"Value"},
-        "OSVersion":{"shape":"Value"},
-        "ParentProduct":{"shape":"Value"},
-        "ParentProductVersion":{"shape":"Value"},
-        "Metadata":{"shape":"Metadata"},
-        "Sentiment":{"shape":"Sentiment"},
-        "Comment":{"shape":"Comment"}
-      }
-    },
-    "PostMetricsRequest":{
-      "type":"structure",
-      "required":[
-        "AWSProduct",
-        "AWSProductVersion",
-        "ClientID",
-        "MetricData"
-      ],
-      "members":{
-        "AWSProduct":{"shape":"AWSProduct"},
-        "AWSProductVersion":{"shape":"AWSProductVersion"},
-        "ClientID":{"shape":"ClientID"},
-        "OS":{"shape":"Value"},
-        "OSVersion":{"shape":"Value"},
-        "ParentProduct":{"shape":"Value"},
-        "ParentProductVersion":{"shape":"Value"},
-        "MetricData":{"shape":"MetricData"}
-      }
-    },
-    "Sentiment":{
-      "type":"string",
-      "enum":[
-        "Positive",
-        "Negative"
-      ]
-    },
-    "StackTrace":{
-      "type":"string",
-      "max":16384
-    },
-    "Type":{
-      "type":"string",
-      "max":1024
-    },
-    "Unit":{
-      "type":"string",
-      "enum":[
-        "Milliseconds",
-        "Bytes",
-        "Percent",
-        "Count",
-        "None"
-      ]
-    },
-    "Userdata":{
-      "type":"structure",
-      "members":{
-        "Email":{"shape":"Email"},
-        "Comment":{"shape":"Comment"}
-      }
-    },
-    "Value":{
-      "type":"string",
-      "max":65536
-    }
-  }
-}
diff --git a/src/shared/telemetry/spans.ts b/src/shared/telemetry/spans.ts
deleted file mode 100644
index 6a82a934dde..00000000000
--- a/src/shared/telemetry/spans.ts
+++ /dev/null
@@ -1,287 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import globals from '../extensionGlobals'
-
-import type { AsyncLocalStorage as AsyncLocalStorageClass } from 'async_hooks'
-import {
-    definitions,
-    Metric,
-    MetricBase,
-    MetricDefinition,
-    MetricName,
-    MetricShapes,
-    TelemetryBase,
-} from './telemetry.gen'
-import { getTelemetryReason, getTelemetryResult } from '../errors'
-
-const AsyncLocalStorage: typeof AsyncLocalStorageClass =
-    require('async_hooks').AsyncLocalStorage ??
-    class<T> {
-        readonly #store: T[] = []
-        #disabled = false
-
-        public disable() {
-            this.#disabled = true
-        }
-
-        public getStore() {
-            return this.#disabled ? undefined : this.#store[0]
-        }
-
-        public run<R>(store: T, callback: (...args: any[]) => R, ...args: any[]): R {
-            this.#disabled = false
-            this.#store.unshift(store)
-
-            try {
-                const result = callback(...args)
-                if (result instanceof Promise) {
-                    return result.finally(() => this.#store.shift()) as unknown as R
-                }
-                this.#store.shift()
-                return result
-            } catch (err) {
-                this.#store.shift()
-                throw err
-            }
-        }
-
-        public exit<R>(callback: (...args: any[]) => R, ...args: any[]): R {
-            const saved = this.#store.shift()
-
-            try {
-                const result = callback(...args)
-                if (result instanceof Promise) {
-                    return result.finally(() => saved !== undefined && this.#store.unshift(saved)) as unknown as R
-                }
-                saved !== undefined && this.#store.unshift(saved)
-                return result
-            } catch (err) {
-                saved !== undefined && this.#store.unshift(saved)
-                throw err
-            }
-        }
-
-        public enterWith(store: T): void {
-            // XXX: you need hooks into async resource lifecycles to implement this correctly
-            this.#store.shift()
-            this.#store.unshift(store)
-        }
-    }
-
-function getValidatedState(state: Partial<MetricBase>, definition: MetricDefinition) {
-    const missingFields: string[] = []
-
-    for (const key of definition.requiredMetadata) {
-        if (state[key as keyof typeof state] === undefined) {
-            missingFields.push(key)
-        }
-    }
-
-    return missingFields.length !== 0 ? Object.assign({ missingFields }, state) : state
-}
-
-export class TelemetrySpan {
-    #startTime: Date | undefined = undefined
-    private readonly state: Partial<MetricBase> = {}
-    private readonly definition = definitions[this.name] ?? {
-        unit: 'None',
-        passive: true,
-        requiredMetadata: [],
-    }
-
-    /**
-     * These fields appear on the base metric instead of the 'metadata' and
-     * so they should be filtered out from the metadata.
-     */
-    static readonly #excludedFields = ['passive', 'value']
-
-    public constructor(public readonly name: string) {}
-
-    public get startTime(): Date | undefined {
-        return this.#startTime
-    }
-
-    public record(data: Partial<MetricBase>): this {
-        Object.assign(this.state, data)
-        return this
-    }
-
-    public emit(data?: MetricBase): void {
-        const state = getValidatedState({ ...this.state, ...data }, this.definition)
-        const metadata = Object.entries(state)
-            .filter(([_, v]) => v !== '') // XXX: the telemetry service currently rejects empty strings :/
-            .filter(([k, v]) => v !== undefined && !TelemetrySpan.#excludedFields.includes(k))
-            .map(([k, v]) => ({ Key: k, Value: String(v) }))
-
-        globals.telemetry.record({
-            Metadata: metadata,
-            MetricName: this.name,
-            Value: state.value ?? 1,
-            Unit: this.definition.unit,
-            Passive: state.passive ?? this.definition.passive,
-            EpochTimestamp: (this.startTime ?? new globals.clock.Date()).getTime(),
-        })
-    }
-
-    /**
-     * Puts the span in a 'running' state.
-     */
-    public start(): this {
-        this.#startTime = new globals.clock.Date()
-        return this
-    }
-
-    /**
-     * Immediately emits the span, adding a duration/result/reason to the final output if applicable.
-     *
-     * This places the span in a 'stopped' state but does not mutate the information held by the span.
-     */
-    public stop(err?: unknown): void {
-        const duration = this.startTime !== undefined ? globals.clock.Date.now() - this.startTime.getTime() : undefined
-
-        this.emit({
-            duration,
-            result: getTelemetryResult(err),
-            reason: getTelemetryReason(err),
-        })
-
-        this.#startTime = undefined
-    }
-
-    /**
-     * Creates a copy of the span with an uninitialized start time.
-     */
-    public clone(): TelemetrySpan {
-        return new TelemetrySpan(this.name).record(this.state)
-    }
-}
-
-interface TelemetryContext {
-    readonly spans: TelemetrySpan[]
-    readonly activeSpan?: TelemetrySpan
-}
-
-// This class is called 'Telemetry' but really it can be used for any kind of tracing
-// You would need to make `Span` a template type and reduce the interface to just create/start/stop
-export class TelemetryTracer extends TelemetryBase {
-    readonly #context = new AsyncLocalStorage<TelemetryContext>()
-
-    /**
-     * Returns all spans present in the current execution context.
-     */
-    public get spans(): readonly TelemetrySpan[] {
-        return this.#context.getStore()?.spans ?? []
-    }
-
-    /**
-     * Returns the most recently used span in the current execution context.
-     *
-     * Note that only {@link run} will change the active span. Recording information
-     * on existing spans has no effect on the active span.
-     */
-    public get activeSpan(): TelemetrySpan | undefined {
-        return this.#context.getStore()?.activeSpan
-    }
-
-    /**
-     * Records information on all spans in the current execution context.
-     *
-     * This is merged in with the current state present in each span, **overwriting**
-     * any existing values for a given key.
-     */
-    public record(data: Partial<MetricShapes[MetricName]>): void {
-        for (const span of this.spans) {
-            span.record(data)
-        }
-    }
-
-    /**
-     * Executes the provided callback function with a named span.
-     *
-     * Spans that already exist in the current context are re-used and brought
-     * forward, becoming the active span. A new span is created if none exist.
-     *
-     * On completion of the callback, the span is emitted and the context reverts
-     * to how it was prior to calling `run`. Modifications made to pre-existing
-     * spans within the execution are not preserved.
-     */
-    public run<T, U extends MetricName>(name: U, fn: (span: Metric<MetricShapes[U]>) => T): T {
-        const span = this.getClonedSpan(name).start()
-        const frame = this.switchContext(span)
-
-        try {
-            const result = this.#context.run(frame, fn, span)
-
-            if (result instanceof Promise) {
-                return result
-                    .then(v => (span.stop(), v))
-                    .catch(e => {
-                        span.stop(e)
-                        throw e
-                    }) as unknown as T
-            }
-
-            span.stop()
-            return result
-        } catch (e) {
-            span.stop(e)
-            throw e
-        }
-    }
-
-    /**
-     * Wraps a function with {@link run}.
-     *
-     * This can be used when immediate execution of the function is not desirable.
-     */
-    public instrument<T extends any[], U, R>(name: string, fn: (this: U, ...args: T) => R): (this: U, ...args: T) => R {
-        const run = this.run.bind(this)
-
-        return function (...args) {
-            // Typescript's `bind` overloading doesn't work well for parameter types
-            return run(name as MetricName, (fn as (this: U, ...args: any[]) => R).bind(this, ...args))
-        }
-    }
-
-    protected getMetric(name: string): Metric {
-        const getSpan = () => {
-            const span = this.getSpan(name)
-            if (!this.spans.includes(span)) {
-                this.#context.enterWith({ ...this.#context.getStore(), spans: [span, ...this.spans] })
-            }
-
-            return span
-        }
-
-        return {
-            name,
-            emit: data => this.getSpan(name).emit(data),
-            record: data => void getSpan().record(data),
-            run: fn => this.run(name as MetricName, fn),
-        }
-    }
-
-    private getSpan(name: string): TelemetrySpan {
-        return this.spans.find(s => s.name === name) ?? new TelemetrySpan(name)
-    }
-
-    private getClonedSpan(name: string): TelemetrySpan {
-        return this.spans.find(s => s.name === name)?.clone() ?? new TelemetrySpan(name)
-    }
-
-    private switchContext(span: TelemetrySpan): TelemetryContext {
-        const spans = [...this.spans]
-        const previousSpanIndex = spans.findIndex(s => s.name === span.name)
-
-        if (previousSpanIndex !== -1) {
-            spans.splice(previousSpanIndex, 1, span)
-        } else {
-            spans.unshift(span)
-        }
-
-        return { spans, activeSpan: span }
-    }
-}
diff --git a/src/shared/telemetry/telemetry.ts b/src/shared/telemetry/telemetry.ts
deleted file mode 100644
index f8bc899de08..00000000000
--- a/src/shared/telemetry/telemetry.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { TelemetryTracer } from './spans'
-
-// This file makes it so you can import 'telemetry' and not 'telemetry.gen'
-export * from './telemetry.gen'
-
-export function millisecondsSince(date: Date): number {
-    return Date.now() - date.getTime()
-}
-
-export const telemetry = new TelemetryTracer()
diff --git a/src/shared/telemetry/telemetryLogger.ts b/src/shared/telemetry/telemetryLogger.ts
deleted file mode 100644
index 324507fd932..00000000000
--- a/src/shared/telemetry/telemetryLogger.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { getLogger } from '../logger'
-import { isReleaseVersion } from '../vscode/env'
-import { MetricDatum, MetadataEntry } from './clienttelemetry'
-
-export interface MetricQuery {
-    /**
-     * Metric name to look up in the log
-     */
-    readonly metricName: string
-
-    /**
-     * Exclude metadata items matching these keys.
-     */
-    readonly excludeKeys?: string[]
-}
-
-interface Metadata {
-    [key: string]: string | undefined
-}
-
-function isValidEntry(datum: MetadataEntry): datum is Required<MetadataEntry> {
-    return datum.Key !== undefined && datum.Value !== undefined
-}
-
-/**
- * Telemetry currently sends metadata as an array of key/value pairs, but this is unintuitive for JS
- */
-const mapMetadata = (excludeKeys: string[]) => (metadata: Required<MetricDatum>['Metadata']) => {
-    const result: Metadata = {}
-    return metadata
-        .filter(isValidEntry)
-        .filter(a => !excludeKeys.includes(a.Key))
-        .reduce((a, b) => ((a[b.Key] = b.Value), a), result)
-}
-
-/**
- * Simple class to log queryable metrics.
- *
- * Does not track any other telemetry APIs such as feedback.
- */
-export class TelemetryLogger {
-    private readonly _metrics: MetricDatum[] = []
-
-    public get metricCount(): number {
-        return this._metrics.length
-    }
-
-    public clear(): void {
-        this._metrics.length = 0
-    }
-
-    public log(metric: MetricDatum): void {
-        const msg = `telemetry: emitted metric "${metric.MetricName}"`
-
-        if (!isReleaseVersion()) {
-            this._metrics.push(metric)
-            const stringified = JSON.stringify(metric)
-            getLogger().debug(`${msg} -> ${stringified}`)
-
-            if (this.metricCount > 1000) {
-                this.clear()
-                getLogger().debug('telemetry: cleared buffered metrics')
-            }
-        } else {
-            getLogger().debug(msg)
-        }
-    }
-
-    /**
-     * Queries against the log, returning matched entries.
-     * Only returns the metadata. See {@link queryFull} for getting the entire metric.
-     *
-     * **All metadata values are casted to strings by the telemetry client**
-     */
-    public query(query: MetricQuery): Metadata[] {
-        return this.queryFull(query)
-            .map(m => m.Metadata ?? [])
-            .map(mapMetadata(query.excludeKeys ?? []))
-    }
-
-    /**
-     * Queries telemetry for metrics, returning the entire structure.
-     */
-    public queryFull(query: MetricQuery): MetricDatum[] {
-        return this._metrics.filter(m => m.MetricName === query.metricName)
-    }
-}
diff --git a/src/shared/telemetry/telemetryService.ts b/src/shared/telemetry/telemetryService.ts
deleted file mode 100644
index 8cdb1472819..00000000000
--- a/src/shared/telemetry/telemetryService.ts
+++ /dev/null
@@ -1,360 +0,0 @@
-/*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as fs from 'fs'
-import { writeFile } from 'fs-extra'
-import * as path from 'path'
-import { ExtensionContext } from 'vscode'
-import { AwsContext } from '../awsContext'
-import { isReleaseVersion, isAutomation } from '../vscode/env'
-import { getLogger } from '../logger'
-import { MetricDatum } from './clienttelemetry'
-import { DefaultTelemetryClient, regionKey } from './telemetryClient'
-import { DefaultTelemetryPublisher } from './telemetryPublisher'
-import { TelemetryFeedback } from './telemetryClient'
-import { TelemetryPublisher } from './telemetryPublisher'
-import { accountMetadataKey, AccountStatus, computeRegionKey } from './telemetryClient'
-import { TelemetryLogger } from './telemetryLogger'
-import globals from '../extensionGlobals'
-import { ClassToInterfaceType } from '../utilities/tsUtils'
-import { getClientId } from './util'
-import { telemetry } from './telemetry'
-
-export type TelemetryService = ClassToInterfaceType<DefaultTelemetryService>
-
-export class DefaultTelemetryService {
-    public static readonly telemetryCognitoIdKey = 'telemetryId'
-    public static readonly defaultFlushPeriodMillis = 1000 * 60 * 5 // 5 minutes in milliseconds
-
-    public startTime: Date
-    public readonly persistFilePath: string
-    private _telemetryEnabled: boolean = false
-
-    private _flushPeriod: number
-    private _timer?: NodeJS.Timer
-    private publisher?: TelemetryPublisher
-    private readonly _eventQueue: MetricDatum[]
-    private readonly _telemetryLogger = new TelemetryLogger()
-    /**
-     * Last metric (if any) loaded from cached telemetry from a previous
-     * session.
-     *
-     * We cannot infer this from "session_start" because there can in theory be
-     * multiple "session_start" metrics cached from multiple sessions.
-     */
-    private _endOfCache: MetricDatum | undefined
-
-    public constructor(
-        private readonly context: ExtensionContext,
-        private readonly awsContext: AwsContext,
-        private readonly computeRegion?: string,
-        publisher?: TelemetryPublisher
-    ) {
-        const persistPath = context.globalStorageUri.fsPath
-        this.persistFilePath = path.join(persistPath, 'telemetryCache')
-
-        if (!fs.existsSync(persistPath)) {
-            fs.mkdirSync(persistPath)
-        }
-
-        this.startTime = new globals.clock.Date()
-
-        this._eventQueue = []
-        this._flushPeriod = DefaultTelemetryService.defaultFlushPeriodMillis
-
-        if (publisher !== undefined) {
-            this.publisher = publisher
-        }
-    }
-
-    public get logger(): TelemetryLogger {
-        return this._telemetryLogger
-    }
-
-    public async start(): Promise<void> {
-        // TODO: `readEventsFromCache` should be async
-        this._eventQueue.push(...DefaultTelemetryService.readEventsFromCache(this.persistFilePath))
-        this._endOfCache = this._eventQueue[this._eventQueue.length - 1]
-        telemetry.session_start.emit()
-        this.startTimer()
-    }
-
-    public async shutdown(): Promise<void> {
-        if (this._timer !== undefined) {
-            globals.clock.clearTimeout(this._timer)
-            this._timer = undefined
-        }
-
-        // Only write events to disk at shutdown time if:
-        //   1. telemetry is enabled
-        //   2. we are not in CI or a test suite run
-        if (this.telemetryEnabled && !isAutomation()) {
-            const currTime = new globals.clock.Date()
-            // This is noisy when running tests in vscode.
-            telemetry.session_end.emit({ value: currTime.getTime() - this.startTime.getTime() })
-
-            try {
-                await writeFile(this.persistFilePath, JSON.stringify(this._eventQueue))
-            } catch {}
-        }
-    }
-
-    public get telemetryEnabled(): boolean {
-        return this._telemetryEnabled
-    }
-    public set telemetryEnabled(value: boolean) {
-        if (this._telemetryEnabled !== value) {
-            getLogger().verbose(`Telemetry is now ${value ? 'enabled' : 'disabled'}`)
-        }
-
-        // clear the queue on explicit disable
-        if (!value) {
-            this.clearRecords()
-        }
-        this._telemetryEnabled = value
-    }
-
-    public get timer(): NodeJS.Timer | undefined {
-        return this._timer
-    }
-
-    public set flushPeriod(period: number) {
-        this._flushPeriod = period
-    }
-
-    public async postFeedback(feedback: TelemetryFeedback): Promise<void> {
-        if (this.publisher === undefined) {
-            await this.createDefaultPublisherAndClient()
-        }
-
-        if (this.publisher === undefined) {
-            throw new Error('Failed to initialize telemetry publisher')
-        }
-
-        return this.publisher.postFeedback(feedback)
-    }
-
-    public record(event: MetricDatum, awsContext?: AwsContext): void {
-        if (this.telemetryEnabled) {
-            const actualAwsContext = awsContext || this.awsContext
-            const eventWithCommonMetadata = this.injectCommonMetadata(event, actualAwsContext)
-            this._eventQueue.push(eventWithCommonMetadata)
-            this._telemetryLogger.log(eventWithCommonMetadata)
-        }
-    }
-
-    public clearRecords(): void {
-        this._eventQueue.length = 0
-    }
-
-    private async flushRecords(): Promise<void> {
-        if (this.telemetryEnabled) {
-            if (this.publisher === undefined) {
-                await this.createDefaultPublisherAndClient()
-            }
-            if (this.publisher !== undefined) {
-                this.publisher.enqueue(...this._eventQueue)
-                await this.publisher.flush()
-                this.clearRecords()
-            }
-        }
-    }
-
-    private startTimer(): void {
-        // The timer is not reset until after the flush as completed
-        this._timer = globals.clock.setTimeout(async () => {
-            await this.flushRecords()
-            this._timer?.refresh()
-        }, this._flushPeriod)
-    }
-
-    private async createDefaultPublisher(): Promise<TelemetryPublisher | undefined> {
-        try {
-            // grab our clientId and generate one if it doesn't exist
-            const clientId = await getClientId(this.context.globalState)
-            // grab our Cognito identityId
-            const poolId = DefaultTelemetryClient.config.identityPool
-            const identityMapJson = this.context.globalState.get<string>(
-                DefaultTelemetryService.telemetryCognitoIdKey,
-                '[]'
-            )
-            // Maps don't cleanly de/serialize with JSON.parse/stringify so we need to do it ourselves
-            const identityMap = new Map<string, string>(JSON.parse(identityMapJson) as Iterable<[string, string]>)
-            // convert the value to a map
-            const identity = identityMap.get(poolId)
-
-            // if we don't have an identity, get one
-            if (!identity) {
-                const identityPublisherTuple = await DefaultTelemetryPublisher.fromDefaultIdentityPool(clientId)
-
-                // save it
-                identityMap.set(poolId, identityPublisherTuple.cognitoIdentityId)
-                await this.context.globalState.update(
-                    DefaultTelemetryService.telemetryCognitoIdKey,
-                    JSON.stringify(Array.from(identityMap.entries()))
-                )
-
-                // return the publisher
-                return identityPublisherTuple.publisher
-            } else {
-                return DefaultTelemetryPublisher.fromIdentityId(clientId, identity)
-            }
-        } catch (err) {
-            console.error(`Got ${err} while initializing telemetry publisher`)
-        }
-    }
-
-    private async createDefaultPublisherAndClient(): Promise<void> {
-        this.publisher = await this.createDefaultPublisher()
-        if (this.publisher !== undefined) {
-            await this.publisher.init()
-        }
-    }
-
-    private injectCommonMetadata(event: MetricDatum, awsContext: AwsContext): MetricDatum {
-        let accountValue: string | AccountStatus
-        // The AWS account ID is not set on session start. This matches JetBrains' functionality.
-        if (event.MetricName === 'session_end' || event.MetricName === 'session_start') {
-            accountValue = AccountStatus.NotApplicable
-        } else {
-            const account = awsContext.getCredentialAccountId()
-            if (account) {
-                const accountIdRegex = /[0-9]{12}/
-                if (accountIdRegex.test(account)) {
-                    // account is valid
-                    accountValue = account
-                } else {
-                    // account is not valid, we can use any non-12-digit string as our stored value to trigger this.
-                    // JetBrains uses this value if you're running a sam local invoke with an invalid profile.
-                    // no direct calls to production AWS should ever have this value.
-                    accountValue = AccountStatus.Invalid
-                }
-            } else {
-                // user isn't logged in
-                accountValue = AccountStatus.NotSet
-            }
-        }
-
-        const commonMetadata = [{ Key: accountMetadataKey, Value: accountValue }]
-        if (this.computeRegion) {
-            commonMetadata.push({ Key: computeRegionKey, Value: this.computeRegion })
-        }
-        if (!event?.Metadata?.some((m: any) => m?.Key == regionKey)) {
-            commonMetadata.push({ Key: regionKey, Value: globals.regionProvider.guessDefaultRegion() })
-        }
-
-        if (event.Metadata) {
-            event.Metadata.push(...commonMetadata)
-        } else {
-            event.Metadata = commonMetadata
-        }
-
-        return event
-    }
-
-    private static readEventsFromCache(cachePath: string): MetricDatum[] {
-        try {
-            if (!fs.existsSync(cachePath)) {
-                getLogger().info(`telemetry cache not found: '${cachePath}'`)
-
-                return []
-            }
-            const input = JSON.parse(fs.readFileSync(cachePath, 'utf-8'))
-            const events = filterTelemetryCacheEvents(input)
-
-            return events
-        } catch (error) {
-            getLogger().error(error as Error)
-
-            return []
-        }
-    }
-
-    /**
-     * Only passive telemetry is allowed during startup (except for some known
-     * special-cases).
-     */
-    public assertPassiveTelemetry(didReload: boolean) {
-        // Special case: these may be non-passive during a VSCode "reload". #1592
-        const maybeActiveOnReload = ['sam_init']
-        // Metrics from the previous session can be arbitrary: we can't reason
-        // about whether they should be passive/active.
-        let readingCache = true
-
-        // Array for..of is in-order:
-        // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/forEach
-        for (const metric of this._eventQueue) {
-            if (readingCache) {
-                readingCache = metric !== this._endOfCache
-                // Skip cached metrics.
-                continue
-            }
-            if (metric.Passive || (didReload && maybeActiveOnReload.includes(metric.MetricName))) {
-                continue
-            }
-            const msg = `non-passive metric emitted at startup: ${metric.MetricName}`
-            if (isReleaseVersion()) {
-                getLogger().error(msg)
-            } else {
-                throw Error(msg)
-            }
-        }
-    }
-
-    /**
-     * Queries the current pending (not flushed) metrics.
-     *
-     * @note The underlying metrics queue may be updated or flushed at any time while this iterates.
-     */
-    public async *findIter(predicate: (m: MetricDatum) => boolean): AsyncIterable<MetricDatum> {
-        for (const m of this._eventQueue) {
-            if (predicate(m)) {
-                yield m
-            }
-        }
-    }
-}
-
-export function filterTelemetryCacheEvents(input: any): MetricDatum[] {
-    if (!Array.isArray(input)) {
-        getLogger().error(`Input into filterTelemetryCacheEvents:\n${input}\nis not an array!`)
-
-        return []
-    }
-    const arr = input as any[]
-
-    return arr
-        .filter((item: any) => {
-            // Make sure the item is an object
-            if (item !== Object(item)) {
-                getLogger().error(`Item in telemetry cache:\n${item}\nis not an object! skipping!`)
-
-                return false
-            }
-
-            return true
-        })
-        .filter((item: any) => {
-            // Only accept objects that have the required telemetry data
-            if (
-                !Object.prototype.hasOwnProperty.call(item, 'Value') ||
-                !Object.prototype.hasOwnProperty.call(item, 'MetricName') ||
-                !Object.prototype.hasOwnProperty.call(item, 'EpochTimestamp') ||
-                !Object.prototype.hasOwnProperty.call(item, 'Unit')
-            ) {
-                getLogger().warn(`skipping invalid item in telemetry cache: ${JSON.stringify(item)}\n`)
-
-                return false
-            }
-
-            if ((item as any)?.Metadata?.some((m: any) => m?.Value === undefined || m.Value === '')) {
-                getLogger().warn(`telemetry: skipping cached item with null/empty metadata field:\n${item}`)
-
-                return false
-            }
-
-            return true
-        })
-}
diff --git a/src/shared/telemetry/util.ts b/src/shared/telemetry/util.ts
deleted file mode 100644
index 5abb1e67bd9..00000000000
--- a/src/shared/telemetry/util.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Memento } from 'vscode'
-import { getLogger } from '../logger'
-import { fromExtensionManifest } from '../settings'
-import { shared } from '../utilities/functionUtils'
-import { isAutomation } from '../vscode/env'
-import { v4 as uuidv4 } from 'uuid'
-import { addTypeName } from '../utilities/typeConstructors'
-
-const legacySettingsTelemetryValueDisable = 'Disable'
-const legacySettingsTelemetryValueEnable = 'Enable'
-
-const TelemetryFlag = addTypeName('boolean', convertLegacy)
-
-export class TelemetryConfig extends fromExtensionManifest('aws', { telemetry: TelemetryFlag }) {
-    public isEnabled(): boolean {
-        return this.get('telemetry', true)
-    }
-}
-
-export function convertLegacy(value: unknown): boolean {
-    if (typeof value === 'boolean') {
-        return value
-    }
-
-    // Set telemetry value to boolean if the current value matches the legacy value
-    if (value === legacySettingsTelemetryValueDisable) {
-        return false
-    } else if (value === legacySettingsTelemetryValueEnable) {
-        return true
-    } else {
-        throw new TypeError(`Unknown telemetry setting: ${value}`)
-    }
-}
-
-export const getClientId = shared(
-    async (globalState: Memento, isTelemetryEnabled = new TelemetryConfig().isEnabled(), isTest?: false) => {
-        if (isTest ?? isAutomation()) {
-            return 'ffffffff-ffff-ffff-ffff-ffffffffffff'
-        }
-        if (!isTelemetryEnabled) {
-            return '11111111-1111-1111-1111-111111111111'
-        }
-        try {
-            let clientId = globalState.get<string>('telemetryClientId')
-            if (!clientId) {
-                clientId = uuidv4()
-                await globalState.update('telemetryClientId', clientId)
-            }
-            return clientId
-        } catch (error) {
-            const clientId = '00000000-0000-0000-0000-000000000000'
-            getLogger().error('Could not create a client id. Reason: %O ', error)
-            return clientId
-        }
-    }
-)
diff --git a/src/shared/telemetry/vscodeTelemetry.json b/src/shared/telemetry/vscodeTelemetry.json
deleted file mode 100644
index 25604dab92b..00000000000
--- a/src/shared/telemetry/vscodeTelemetry.json
+++ /dev/null
@@ -1,249 +0,0 @@
-{
-    "types": [
-        {
-            "name": "documentFormat",
-            "type": "string",
-            "allowedValues": ["JSON, YAML"],
-            "description": "SSM Create document format selection"
-        },
-        {
-            "name": "ssmOperation",
-            "type": "string",
-            "allowedValues": ["Create", "Update"],
-            "description": "SSM Publish Document operation type"
-        },
-        {
-            "name": "starterTemplate",
-            "type": "string",
-            "description": "Starter template chosen during create document"
-        },
-        {
-            "name": "command",
-            "type": "string",
-            "description": "The id of a VS Code command"
-        },
-        {
-            "name": "debounceCount",
-            "type": "int",
-            "description": "Number of times the telemetry event was debounced before emission"
-        },
-        {
-            "name": "cli",
-            "type": "string",
-            "description": "Installed CLI"
-        }
-    ],
-    "metrics": [
-        {
-            "name": "vscode_executeCommand",
-            "description": "Emitted whenever a registered Toolkit command is executed",
-            "passive": true,
-            "metadata": [
-                { "type": "command" },
-                { "type": "debounceCount" },
-                { "type": "duration" },
-                { "type": "result" },
-                {
-                    "type": "reason",
-                    "required": false
-                }
-            ]
-        },
-        {
-            "name": "aws_autoUpdateBeta",
-            "description": "Emitted whenever the Toolkit checks, and potentially installs, a beta version",
-            "passive": true
-        },
-        {
-            "name": "aws_installCli",
-            "description": "Called after attempting to install a local copy of a missing CLI",
-            "metadata": [{ "type": "result" }, { "type": "cli" }]
-        },
-        {
-            "name": "aws_refreshCredentials",
-            "description": "Emitted when credentials are automatically refreshed by the AWS SDK",
-            "passive": true,
-            "metadata": [
-                {
-                    "type": "result"
-                },
-                {
-                    "type": "credentialType",
-                    "required": false
-                },
-                {
-                    "type": "credentialSourceId",
-                    "required": false
-                }
-            ]
-        },
-        {
-            "name": "ssm_createDocument",
-            "description": "An SSM Document is created locally",
-            "unit": "None",
-            "metadata": [
-                {
-                    "type": "result"
-                },
-                {
-                    "type": "documentFormat",
-                    "required": false
-                },
-                {
-                    "type": "starterTemplate",
-                    "required": false
-                }
-            ]
-        },
-        {
-            "name": "ssm_deleteDocument",
-            "description": "An SSM Document is deleted",
-            "unit": "None",
-            "metadata": [
-                {
-                    "type": "result"
-                }
-            ]
-        },
-        {
-            "name": "ssm_executeDocument",
-            "description": "An SSM Document is deleted",
-            "unit": "None",
-            "metadata": [
-                {
-                    "type": "result"
-                }
-            ]
-        },
-        {
-            "name": "ssm_openDocument",
-            "description": "An SSM Document is opened locally",
-            "unit": "None",
-            "metadata": [
-                {
-                    "type": "result"
-                }
-            ]
-        },
-        {
-            "name": "ssm_publishDocument",
-            "description": "SSM Document related metrics for create and update",
-            "unit": "None",
-            "metadata": [
-                {
-                    "type": "result"
-                },
-                {
-                    "type": "ssmOperation"
-                }
-            ]
-        },
-        {
-            "name": "ssm_updateDocumentVersion",
-            "description": "SSM Document related metrics for updating document default version",
-            "unit": "None",
-            "metadata": [
-                {
-                    "type": "result"
-                }
-            ]
-        },
-        {
-            "name": "stepfunctions_createStateMachineFromTemplate",
-            "description": ""
-        },
-        {
-            "name": "stepfunctions_downloadStateMachineDefinition",
-            "description": "",
-            "unit": "None",
-            "metadata": [
-                {
-                    "type": "result"
-                }
-            ]
-        },
-        {
-            "name": "stepfunctions_executeStateMachine",
-            "description": "",
-            "unit": "None",
-            "metadata": [
-                {
-                    "type": "result"
-                }
-            ]
-        },
-        {
-            "name": "stepfunctions_executeStateMachineView",
-            "description": ""
-        },
-        {
-            "name": "stepfunctions_previewstatemachine",
-            "description": ""
-        },
-        {
-            "name": "vscode_activeRegions",
-            "description": "Record the number of active regions at startup and when regions are added/removed",
-            "unit": "Count",
-            "passive": true
-        },
-        {
-            "name": "aws_showExplorerErrorDetails",
-            "description": "Called when getting more details about errors thrown by the explorer",
-            "metadata": [{ "type": "result" }]
-        },
-        {
-            "name": "aws_showRegion",
-            "description": "Records a call to add a region to the explorer"
-        },
-        {
-            "name": "aws_hideRegion",
-            "description": "Records a call to remove a region from the explorer"
-        },
-        {
-            "name": "sam_detect",
-            "description": "Called when detecting the location of the SAM CLI",
-            "metadata": [{ "type": "result" }],
-            "passive": true
-        },
-        {
-            "name": "cdk_explorerDisabled",
-            "description": "Called when expanding the CDK explorer is disabled"
-        },
-        {
-            "name": "cdk_explorerEnabled",
-            "description": "Called when the CDK explorer is enabled"
-        },
-        {
-            "name": "cdk_appExpanded",
-            "description": "Called when the CDK explorer is expanded"
-        },
-        {
-            "name": "cdk_provideFeedback",
-            "description": "Called when providing feedback for CDK"
-        },
-        {
-            "name": "cdk_help",
-            "description": "Called when clicking on help for CDK"
-        },
-        {
-            "name": "cdk_refreshExplorer",
-            "description": "Called when refreshing the CDK explorer"
-        },
-        {
-            "name": "sam_attachDebugger",
-            "description": "Called after trying to attach a debugger to a local sam invoke",
-            "metadata": [
-                { "type": "result" },
-                { "type": "lambdaPackageType" },
-                { "type": "runtime" },
-                { "type": "attempts" },
-                { "type": "duration" },
-                { "type": "lambdaArchitecture", "required": false }
-            ]
-        },
-        {
-            "name": "sam_openConfigUi",
-            "description": "Called after opening the SAM Config UI"
-        }
-    ]
-}
diff --git a/src/shared/treeview/awsTreeProvider.ts b/src/shared/treeview/awsTreeProvider.ts
deleted file mode 100644
index 3cfd45ad5bd..00000000000
--- a/src/shared/treeview/awsTreeProvider.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-interface AwsTreeProvider {
-    viewProviderId: string
-}
-
-export interface RefreshableAwsTreeProvider extends AwsTreeProvider {
-    refresh(): void
-}
diff --git a/src/shared/treeview/nodes/awsResourceNode.ts b/src/shared/treeview/nodes/awsResourceNode.ts
deleted file mode 100644
index 59508f34137..00000000000
--- a/src/shared/treeview/nodes/awsResourceNode.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-export interface AWSResourceNode {
-    /**
-     * Returns the ARN of the AWS resource. All nodes should return an ARN or throw an Error if not found.
-     */
-    readonly arn: string
-
-    /**
-     * Returns the name of the AWS resource.
-     */
-    readonly name: string
-}
diff --git a/src/shared/treeview/nodes/awsTreeNodeBase.ts b/src/shared/treeview/nodes/awsTreeNodeBase.ts
deleted file mode 100644
index 2109535dea1..00000000000
--- a/src/shared/treeview/nodes/awsTreeNodeBase.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { TreeItem, TreeItemCollapsibleState, commands } from 'vscode'
-import { isCloud9 } from '../../extensionUtilities'
-
-export abstract class AWSTreeNodeBase extends TreeItem {
-    public readonly regionCode?: string
-
-    public constructor(label: string, collapsibleState?: TreeItemCollapsibleState) {
-        super(label, collapsibleState)
-    }
-
-    public getChildren(): Thenable<AWSTreeNodeBase[]> {
-        return Promise.resolve([])
-    }
-
-    public refresh(): void {
-        if (isCloud9()) {
-            commands.executeCommand('aws.refreshAwsExplorer', true)
-        } else {
-            commands.executeCommand('aws.refreshAwsExplorerNode', this)
-        }
-    }
-}
diff --git a/src/shared/treeview/nodes/placeholderNode.ts b/src/shared/treeview/nodes/placeholderNode.ts
deleted file mode 100644
index c2d45b934f4..00000000000
--- a/src/shared/treeview/nodes/placeholderNode.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { AWSTreeNodeBase } from './awsTreeNodeBase'
-
-// Can be used to add a child node in an explorer when a region has no resources
-// relevant to the explorer type.
-export class PlaceholderNode extends AWSTreeNodeBase {
-    public constructor(public readonly parent: AWSTreeNodeBase, label: string, tooltip?: string) {
-        super(label)
-        this.tooltip = tooltip
-    }
-}
diff --git a/src/shared/treeview/utils.ts b/src/shared/treeview/utils.ts
deleted file mode 100644
index ad80c0743de..00000000000
--- a/src/shared/treeview/utils.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as vscode from 'vscode'
-import { getLogger } from '../logger'
-import { AWSTreeNodeBase } from './nodes/awsTreeNodeBase'
-import { UnknownError } from '../errors'
-import { Logging } from '../logger/commands'
-import { isTreeNode, TreeNode } from './resourceTreeDataProvider'
-import { assign } from '../utilities/collectionUtils'
-import { addColor, getIcon } from '../icons'
-import { cast, TypeConstructor } from '../utilities/typeConstructors'
-
-/**
- * Produces a list of child nodes using handlers to consistently populate the
- * list when errors occur or if the list would otherwise be empty.
- */
-export async function makeChildrenNodes<T extends AWSTreeNodeBase, P extends AWSTreeNodeBase>(parameters: {
-    getChildNodes(): Promise<T[]>
-    getNoChildrenPlaceholderNode?(): Promise<P>
-    sort?: (a: T, b: T) => number
-    getErrorNode?: (error: Error) => AWSTreeNodeBase
-}): Promise<T[] | [P] | [AWSTreeNodeBase]> {
-    try {
-        const nodes = await parameters.getChildNodes()
-
-        if (nodes.length === 0 && parameters.getNoChildrenPlaceholderNode) {
-            return [await parameters.getNoChildrenPlaceholderNode()]
-        }
-
-        if (parameters.sort) {
-            nodes.sort((a, b) => parameters.sort!(a, b))
-        }
-
-        return nodes
-    } catch (error) {
-        const converted = UnknownError.cast(error)
-
-        return [parameters.getErrorNode?.(converted) ?? new TreeShim(createErrorItem(converted))]
-    }
-}
-
-export function createErrorItem(error: Error, message?: string): TreeNode {
-    const command = Logging.declared.viewLogsAtMessage
-    const logId = message ? getLogger().error(`${message}: %s`, error) : getLogger().error(error)
-
-    return command.build(logId).asTreeNode({
-        label: localize('AWS.explorerNode.error.label', 'Failed to load resources (click for logs)'),
-        tooltip: `${error.name}: ${error.message}`,
-        iconPath: addColor(getIcon('vscode-error'), 'testing.iconErrored'),
-        contextValue: 'awsErrorNode',
-    })
-}
-
-export function createPlaceholderItem(message: string): TreeNode {
-    return {
-        id: 'placeholder',
-        resource: message,
-        getTreeItem: () => new vscode.TreeItem(message, vscode.TreeItemCollapsibleState.None),
-    }
-}
-
-export function unboxTreeNode<T>(node: TreeNode, predicate: (resource: unknown) => resource is T): T {
-    if (!predicate(node.resource)) {
-        throw new TypeError(`Unexpected tree node resource for node: ${node.id}`)
-    }
-
-    return node.resource
-}
-
-/**
- * Wrapper that allows a {@link TreeNode} to be used in the legacy explorer.
- *
- * Any new or existing code needs to account for this additional layer as the shim
- * would be passed in as-is.
- */
-export class TreeShim<T = unknown> extends AWSTreeNodeBase {
-    private children?: AWSTreeNodeBase[]
-
-    public constructor(public readonly node: TreeNode<T>) {
-        super('Loading...')
-        this.updateTreeItem()
-
-        this.node.onDidChangeChildren?.(() => {
-            this.children = undefined
-            this.refresh()
-        })
-
-        this.node.onDidChangeTreeItem?.(async () => {
-            const { didRefresh } = await this.updateTreeItem()
-            !didRefresh && this.refresh()
-        })
-    }
-
-    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
-        if (this.children) {
-            return this.children
-        }
-
-        const children = (await this.node.getChildren?.()) ?? []
-
-        return (this.children = children.map(n => new TreeShim(n)))
-    }
-
-    private update(item: vscode.TreeItem) {
-        // We need to explicitly clear state as `vscode.TreeItem` does not need
-        // to have these keys present
-        this.label = undefined
-        this.command = undefined
-        this.tooltip = undefined
-        this.iconPath = undefined
-        this.description = undefined
-        this.contextValue = undefined
-        assign(item, this)
-    }
-
-    private async updateTreeItem(): Promise<{ readonly didRefresh: boolean }> {
-        const item = this.node.getTreeItem()
-        if (item instanceof Promise) {
-            this.update(await item)
-            this.refresh()
-
-            return { didRefresh: true }
-        }
-
-        this.update(item)
-        return { didRefresh: false }
-    }
-}
-
-export function getResourceFromTreeNode<T = unknown>(input: unknown, type: TypeConstructor<T>): T {
-    if (input instanceof TreeShim) {
-        input = input.node
-    }
-
-    if (!isTreeNode(input)) {
-        throw new TypeError('Input was not a tree node')
-    }
-
-    return cast(input.resource, type)
-}
diff --git a/src/shared/ui/common/region.ts b/src/shared/ui/common/region.ts
deleted file mode 100644
index 6b0f521ec20..00000000000
--- a/src/shared/ui/common/region.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import globals from '../../extensionGlobals'
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as vscode from 'vscode'
-import { getLogger } from '../../logger/logger'
-import { Region } from '../../regions/endpoints'
-import { createCommonButtons, PrompterButtons } from '../buttons'
-import { createQuickPick, QuickPickPrompter } from '../pickerPrompter'
-
-interface RegionPrompterOptions {
-    readonly defaultRegion?: string
-    readonly title?: string
-    readonly buttons?: PrompterButtons<Region>
-    readonly serviceFilter?: string
-    readonly helpUrl?: string | vscode.Uri
-}
-
-export function createRegionPrompter(
-    regions = globals.regionProvider.getRegions(),
-    options: RegionPrompterOptions = {}
-): QuickPickPrompter<Region> {
-    const lastRegionKey = 'lastSelectedRegion'
-    const defaultRegion = options.defaultRegion ?? globals.regionProvider.defaultRegionId
-    const filteredRegions = regions.filter(
-        r => !options.serviceFilter || globals.regionProvider.isServiceInRegion(options.serviceFilter, r.id)
-    )
-
-    const lastRegion = globals.context.globalState.get<Region>(lastRegionKey)
-    const items = filteredRegions.map(region => ({
-        label: region.name,
-        detail: region.id,
-        data: region,
-        skipEstimate: true,
-        description: '',
-        recentlyUsed: region.id === lastRegion?.id,
-    }))
-
-    const defaultRegionItem = items.find(item => item.detail === defaultRegion)
-
-    if (defaultRegionItem !== undefined) {
-        defaultRegionItem.description = localize('AWS.generic.defaultRegion', '(default region)')
-    }
-
-    const prompter = createQuickPick(items, {
-        title: options.title ?? localize('AWS.generic.selectRegion', 'Select a region'),
-        buttons: options.buttons ?? createCommonButtons(options.helpUrl),
-        matchOnDetail: true,
-        compare: (a, b) => {
-            return a.detail === defaultRegion ? -1 : b.detail === defaultRegion ? 1 : 0
-        },
-    })
-
-    return prompter.transform(item => {
-        getLogger().debug('createRegionPrompter: selected %O', item)
-        globals.context.globalState.update(lastRegionKey, item)
-        return item
-    })
-}
diff --git a/src/shared/ui/common/roles.ts b/src/shared/ui/common/roles.ts
deleted file mode 100644
index c64e5a14631..00000000000
--- a/src/shared/ui/common/roles.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { IAM } from 'aws-sdk'
-import { IamClient } from '../../clients/iamClient'
-import { createCommonButtons, createPlusButton, createRefreshButton } from '../buttons'
-import { createQuickPick, DataQuickPickItem, QuickPickPrompter } from '../pickerPrompter'
-import * as nls from 'vscode-nls'
-import * as vscode from 'vscode'
-import { getLogger } from '../../logger/logger'
-import { showViewLogsMessage } from '../../utilities/messages'
-import { WIZARD_BACK } from '../../wizards/wizard'
-
-const localize = nls.loadMessageBundle()
-
-const createRoleTooltip = localize('AWS.generic.createRole', 'Create Role...')
-
-interface RolePrompterOptions {
-    readonly title?: string
-    readonly helpUrl?: string | vscode.Uri
-    readonly noRoleDetail?: string
-    readonly roleFilter?: (role: IAM.Role) => boolean
-    readonly createRole?: () => Promise<IAM.Role>
-}
-
-export function createRolePrompter(client: IamClient, options: RolePrompterOptions = {}): QuickPickPrompter<IAM.Role> {
-    const placeholderItem: DataQuickPickItem<IAM.Role> = {
-        label: localize('AWS.rolePrompter.noRoles.title', 'No valid roles found'),
-        data: WIZARD_BACK,
-        detail: options.noRoleDetail,
-    }
-
-    const loadItems = () => {
-        const filterRoles = (roles: IAM.Role[]) => (options.roleFilter ? roles.filter(options.roleFilter) : roles)
-
-        return client
-            .getRoles()
-            .map(filterRoles)
-            .map(roles =>
-                roles.map(r => ({
-                    label: r.RoleName,
-                    data: r,
-                }))
-            )
-    }
-
-    const buttons = [
-        { ...createRefreshButton(), onClick: () => void prompter.clearAndLoadItems(loadItems()) },
-        ...createCommonButtons(options.helpUrl),
-    ]
-
-    const prompter = createQuickPick(loadItems(), {
-        buttons,
-        title: options.title,
-        noItemsFoundItem: placeholderItem,
-        placeholder: localize('AWS.rolePrompter.placeholder', 'Select an IAM role'),
-    })
-
-    return addCreateRoleButton(prompter, options.createRole)
-}
-
-function addCreateRoleButton(
-    prompter: QuickPickPrompter<IAM.Role>,
-    createRole: RolePrompterOptions['createRole']
-): typeof prompter {
-    if (!createRole) {
-        return prompter
-    }
-
-    const makeRole = () => {
-        const items = createRole()
-            .then(role => [{ label: role.RoleName, data: role }])
-            .catch(err => {
-                getLogger().error('role prompter: Failed to create new role: %s', err)
-                showViewLogsMessage(localize('AWS.rolePrompter.createRole.failed', 'Failed to create new role'))
-                return []
-            })
-
-        prompter.loadItems(items)
-    }
-
-    prompter.quickPick.buttons = [
-        {
-            ...createPlusButton(createRoleTooltip),
-            onClick: makeRole,
-        },
-        ...prompter.quickPick.buttons,
-    ]
-
-    return prompter
-}
diff --git a/src/shared/ui/common/variablesPrompter.ts b/src/shared/ui/common/variablesPrompter.ts
deleted file mode 100644
index 7ce51a7ff3e..00000000000
--- a/src/shared/ui/common/variablesPrompter.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as fs from 'fs-extra'
-import { showViewLogsMessage } from '../../utilities/messages'
-import { WIZARD_RETRY } from '../../wizards/wizard'
-import { createQuickPick, DataQuickPickItem, QuickPickPrompter } from '../pickerPrompter'
-import * as nls from 'vscode-nls'
-import { PrompterButtons } from '../buttons'
-import { promisifyThenable } from '../../utilities/vsCodeUtils'
-
-const localize = nls.loadMessageBundle()
-
-function isMatchArray(obj: any): obj is RegExpMatchArray {
-    return obj !== undefined && (obj.groups !== undefined || Array.isArray(obj))
-}
-
-function unquote(str: string): string {
-    const isSingleQuoted = str[0] === "'" && str[str.length - 1] === "'"
-    const isDoubleQuoted = str[0] === '"' && str[str.length - 1] === '"'
-
-    if (isSingleQuoted || isDoubleQuoted) {
-        str = str.slice(1, -1)
-    }
-
-    if (isDoubleQuoted) {
-        str = str.replace(/\\n/g, '\n')
-    }
-
-    return str
-}
-
-function parseEnvFile(contents: string): { [key: string]: string } {
-    return contents
-        .split(/\r?\n/)
-        .map(line => line.match(/^\s*([\w.-]+)\s*=\s*(.*)?\s*$/))
-        .filter(isMatchArray)
-        .map(match => ({ [match[1]]: unquote(match[2] ?? '').trim() }))
-        .reduce((a, b) => Object.assign(a, b))
-}
-
-// TODO: create key/value pair prompter
-// Format:
-// [TITLE]       [+][-][?]
-// + button calls new prompter to set key/value pair
-// - button removes currently highlighted pair
-// also add a 'load from file' button (always show)
-// there will be a 'Done' button that returns the resulting list (always show)
-// each input would be label: key description: value
-
-/**
- * Creates a optional prompt for environment variables.
- *
- * Currently, the only accepted file format are `.env` files:
- * KEY1=VALUE2
- * KEY2=VALUE2
- * ...
- *
- * @param buttons Optional buttons to add
- * @returns A {@link QuickPickPrompter} that returns data in the shape of Node's process `env` variable
- */
-export function createVariablesPrompter(
-    buttons?: PrompterButtons<string>
-): QuickPickPrompter<{ [name: string]: string }> {
-    const openDialog = () => {
-        return promisifyThenable(vscode.window.showOpenDialog({ canSelectMany: false }))
-            .then(resp => {
-                if (resp === undefined) {
-                    throw new Error('Closed dialog')
-                }
-
-                return resp[0].fsPath
-            })
-            .then(path => fs.promises.readFile(path))
-            .then(contents => parseEnvFile(contents.toString()))
-            .catch(err => {
-                if (err.message !== 'Closed dialog') {
-                    showViewLogsMessage(
-                        localize('AWS.environmentVariables.prompt.failed', 'Failed to read environment variables')
-                    )
-                }
-
-                return WIZARD_RETRY
-            })
-    }
-
-    const items: DataQuickPickItem<{ [name: string]: string }>[] = [
-        { label: localize('AWS.generic.skip', 'Skip'), data: {} },
-        { label: localize('AWS.generic.useFile', 'Use file...'), data: openDialog, skipEstimate: true },
-    ]
-
-    return createQuickPick<{ [name: string]: string }>(items, {
-        title: localize('AWS.environmentVariables.prompt.title', 'Configure environment variables'),
-        buttons: buttons,
-    })
-}
diff --git a/src/shared/ui/inputPrompter.ts b/src/shared/ui/inputPrompter.ts
deleted file mode 100644
index c5b651fc946..00000000000
--- a/src/shared/ui/inputPrompter.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { assign } from '../utilities/collectionUtils'
-import { isValidResponse, StepEstimator, WIZARD_BACK, WIZARD_EXIT } from '../wizards/wizard'
-import { QuickInputButton, PrompterButtons } from './buttons'
-import { Prompter, PromptResult } from './prompter'
-
-// TODO: allow `validateInput` to return a Thenable so we don't need to omit it from the options
-/** Additional options to configure the `InputBox` beyond the standard API */
-export type ExtendedInputBoxOptions = Omit<vscode.InputBoxOptions, 'validateInput' | 'placeHolder'> & {
-    title?: string
-    step?: number
-    placeholder?: string
-    totalSteps?: number
-    buttons?: PrompterButtons<string>
-    validateInput?(value: string): string | undefined
-}
-
-export type InputBox = Omit<vscode.InputBox, 'buttons'> & { buttons: PrompterButtons<string> }
-
-export const defaultInputboxOptions: vscode.InputBoxOptions = {
-    ignoreFocusOut: true,
-}
-
-/**
- * Creates a new input box UI element.
- *
- * @param options Customizes the InputBox and InputBoxPrompter.
- * @returns An {@link InputBoxPrompter}. This can be used directly with the `prompt` method or can be fed into a Wizard.
- */
-export function createInputBox(options?: ExtendedInputBoxOptions): InputBoxPrompter {
-    const inputBox = vscode.window.createInputBox() as InputBox
-    assign({ ...defaultInputboxOptions, ...options }, inputBox)
-    inputBox.buttons = options?.buttons ?? []
-
-    const prompter = new InputBoxPrompter(inputBox)
-
-    if (options?.validateInput !== undefined) {
-        prompter.setValidation(input => options.validateInput!(input))
-    }
-
-    return prompter
-}
-
-export async function showInputBox(options?: ExtendedInputBoxOptions): Promise<string | undefined> {
-    const prompter = createInputBox(options)
-    const response = await prompter.prompt()
-
-    return isValidResponse(response) ? response : undefined
-}
-
-/**
- * UI element that accepts user-inputted text. Wraps around {@link vscode.InputBox InputBox}.
- *
- * See {@link createInputBox} for easy creation of instances of this class.
- */
-export class InputBoxPrompter extends Prompter<string> {
-    private _lastResponse?: string
-    private validateEvents: vscode.Disposable[] = []
-
-    public set recentItem(response: string | undefined) {
-        this._lastResponse = typeof response === 'string' ? response : this._lastResponse
-        this.inputBox.value = this._lastResponse ?? ''
-    }
-
-    public get recentItem(): string | undefined {
-        return this._lastResponse
-    }
-
-    constructor(public readonly inputBox: InputBox, protected readonly options: ExtendedInputBoxOptions = {}) {
-        super()
-    }
-
-    public setSteps(current: number, total: number): void {
-        this.inputBox.step = current
-        this.inputBox.totalSteps = total
-    }
-
-    /**
-     * Sets a validation hook into the InputBox, checking whenever the input changes or when the user
-     * attempts to submit their response.
-     *
-     * @param validate Validator function
-     */
-    public setValidation(validate: (value: string) => string | undefined): void {
-        this.validateEvents.forEach(d => d.dispose())
-        this.validateEvents = []
-
-        this.inputBox.onDidChangeValue(
-            value => (this.inputBox.validationMessage = validate(value)),
-            undefined,
-            this.validateEvents
-        )
-        this.inputBox.onDidAccept(
-            () => (this.inputBox.validationMessage = validate(this.inputBox.value)),
-            undefined,
-            this.validateEvents
-        )
-    }
-
-    protected async promptUser(): Promise<PromptResult<string>> {
-        const promptPromise = new Promise<PromptResult<string>>(resolve => {
-            this.inputBox.onDidAccept(() => {
-                this.recentItem = this.inputBox.value
-                if (!this.inputBox.validationMessage) {
-                    resolve(this.inputBox.value)
-                }
-            })
-            this.inputBox.onDidHide(() => resolve(WIZARD_EXIT))
-            this.inputBox.onDidTriggerButton(button => {
-                if (button === vscode.QuickInputButtons.Back) {
-                    resolve(WIZARD_BACK)
-                } else if ((button as QuickInputButton<string>).onClick !== undefined) {
-                    const response = (button as QuickInputButton<string>).onClick!()
-                    if (response !== undefined) {
-                        resolve(response)
-                    }
-                }
-            })
-            this.inputBox.show()
-        }).finally(() => {
-            // TODO: remove the .hide() call when Cloud9 implements dispose
-            this.inputBox.hide()
-            this.inputBox.dispose()
-        })
-
-        return await promptPromise
-    }
-
-    public setStepEstimator(estimator: StepEstimator<string>): void {
-        // TODO: implement this
-    }
-}
diff --git a/src/shared/ui/pickerPrompter.ts b/src/shared/ui/pickerPrompter.ts
deleted file mode 100644
index c74810c62cb..00000000000
--- a/src/shared/ui/pickerPrompter.ts
+++ /dev/null
@@ -1,632 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as nls from 'vscode-nls'
-
-import { isValidResponse, StepEstimator, WIZARD_BACK, WIZARD_EXIT } from '../wizards/wizard'
-import { QuickInputButton, PrompterButtons } from './buttons'
-import { Prompter, PromptResult, Transform } from './prompter'
-import { assign, isAsyncIterable } from '../utilities/collectionUtils'
-import { recentlyUsed } from '../localizedText'
-import { getLogger } from '../logger/logger'
-
-const localize = nls.loadMessageBundle()
-
-/** Settings applied when using a QuickPickPrompter in 'filter-box input' mode. */
-interface FilterBoxInputSettings<T> {
-    /** The label of the new QuickPickItem generated by the user's input. */
-    label: string
-    /** Parses the user's input into a the desired type. */
-    transform: (v: string) => PromptResult<T>
-    /** The inverse must be provided if using implicit state. */
-    inverse?: (output: PromptResult<T>) => string
-    /**
-     * Checks for any errors in the input.
-     * Returned strings are shown in the 'detail' part of the user-input QuickPickItem.
-     */
-    validator?: (input: string) => string | undefined
-}
-
-/**
- * Options to configure the `QuickPick` beyond `vscode.QuickPickOptions`.
- *
- * @note Use transform() instead of onDidSelectItem().
- *
- */
-export type ExtendedQuickPickOptions<T> = Omit<
-    vscode.QuickPickOptions,
-    // TODO: remove 'canPickMany' from Omit and implement/test functionality with multiple QuickPick items.
-    'canPickMany' | 'placeHolder' | 'onDidSelectItem'
-> & {
-    title?: string
-    value?: string
-    step?: number
-    placeholder?: string
-    totalSteps?: number
-    buttons?: PrompterButtons<T>
-    /**
-     * Setting this option will enable 'filter-box input' mode, allowing the user to create their own QuickInputItem
-     * using the filter box as input.
-     */
-    filterBoxInputSettings?: FilterBoxInputSettings<T>
-    /** Used to sort QuickPick items after loading new ones */
-    compare?: (a: DataQuickPickItem<T>, b: DataQuickPickItem<T>) => number
-    /** [NOT IMPLEMENTED] Item to show while items are loading */
-    loadingItem?: DataQuickPickItem<T>
-    /** Item to show if no items were loaded */
-    noItemsFoundItem?: DataQuickPickItem<T>
-    // TODO: this could optionally be a callback accepting the error and returning an item
-    /** Item to show if there was an error loading items */
-    errorItem?: DataQuickPickItem<T>
-}
-
-/** See {@link ExtendedQuickPickOptions.noItemsFoundItem noItemsFoundItem} for setting a different item */
-const defaultNoItemsItem = {
-    label: localize('AWS.picker.dynamic.noItemsFound.label', '[No items found]'),
-    detail: localize('AWS.picker.dynamic.noItemsFound.detail', 'Click here to go back'),
-    alwaysShow: true,
-    data: WIZARD_BACK,
-}
-
-/** See {@link ExtendedQuickPickOptions.errorItem errorItem} for setting a different error item */
-const defaultErrorItem = {
-    // TODO: add icon, check for C9
-    label: localize('AWS.picker.dynamic.error.label', '[Error loading items]'),
-    alwaysShow: true,
-    data: WIZARD_BACK,
-}
-
-export const defaultQuickpickOptions: ExtendedQuickPickOptions<any> = {
-    ignoreFocusOut: true,
-    noItemsFoundItem: defaultNoItemsItem,
-    errorItem: defaultErrorItem,
-}
-
-type QuickPickData<T> = PromptResult<T> | (() => Promise<PromptResult<T>>)
-type LabelQuickPickItem<T> = vscode.QuickPickItem & { label: T }
-
-/**
- * Attaches additional information as `data` to a QuickPickItem. Alternatively, `data` can be a function that
- * returns a Promise, evaluated after the user selects the item.
- */
-export type DataQuickPickItem<T> = vscode.QuickPickItem & {
-    data: QuickPickData<T>
-    invalidSelection?: boolean
-    onClick?: () => any | Promise<any>
-    /** Stops the QuickPick from estimating how many steps an item would add in a Wizard flow */
-    skipEstimate?: boolean
-    recentlyUsed?: boolean
-}
-
-export type DataQuickPick<T> = Omit<vscode.QuickPick<DataQuickPickItem<T>>, 'buttons'> & { buttons: PrompterButtons<T> }
-
-export const customUserInput = Symbol()
-
-export function isDataQuickPickItem(obj: any): obj is DataQuickPickItem<any> {
-    return typeof obj === 'object' && typeof (obj as vscode.QuickPickItem).label === 'string' && 'data' in obj
-}
-
-/**
- * QuickPick prompts currently support loading:
- * * A plain array of items
- * * A promise for an array of items
- * * An AsyncIterable that generates an array of items every iteration
- */
-type ItemLoadTypes<T> = Promise<DataQuickPickItem<T>[]> | DataQuickPickItem<T>[] | AsyncIterable<DataQuickPickItem<T>[]>
-
-/**
- * Creates a UI element that presents a list of items. Information that should be returned when the user selects an
- * item must be placed in the `data` property of each item. If only the `label` is desired, use
- * {@link createLabelQuickPick} instead.
- *
- * @param items An array or a Promise for items.
- * @param options Customizes the QuickPick and QuickPickPrompter.
- * @returns A {@link QuickPickPrompter}. This can be used directly with the `prompt` method or can be fed into a Wizard.
- */
-export function createQuickPick<T>(
-    items: ItemLoadTypes<T>,
-    options?: ExtendedQuickPickOptions<T>
-): QuickPickPrompter<T> {
-    const picker = vscode.window.createQuickPick<DataQuickPickItem<T>>() as DataQuickPick<T>
-    const mergedOptions = { ...defaultQuickpickOptions, ...options }
-    assign(mergedOptions, picker)
-    picker.buttons = mergedOptions.buttons ?? []
-
-    const prompter =
-        mergedOptions.filterBoxInputSettings !== undefined
-            ? new FilterBoxQuickPickPrompter<T>(picker, mergedOptions.filterBoxInputSettings)
-            : new QuickPickPrompter<T>(picker, mergedOptions)
-
-    prompter.loadItems(items)
-
-    return prompter
-}
-
-export async function showQuickPick<T>(
-    items: ItemLoadTypes<T>,
-    options?: ExtendedQuickPickOptions<T>
-): Promise<T | undefined> {
-    const prompter = createQuickPick(items, options)
-    const response = await prompter.prompt()
-
-    return isValidResponse(response) ? response : undefined
-}
-
-// Note: the generic type used in `createLabelQuickPick` is needed to infer the correct type when using string
-// literal types. Otherwise the narrowness of the type would be lost.
-/** Creates a QuickPick from normal QuickPickItems, using the `label` as the return value. */
-export function createLabelQuickPick<T extends string>(
-    items: LabelQuickPickItem<T>[] | Promise<LabelQuickPickItem<T>[]>,
-    options?: ExtendedQuickPickOptions<T>
-): QuickPickPrompter<T> {
-    if (items instanceof Promise) {
-        return createQuickPick(
-            items.then(items => items.map(item => ({ data: item.label, ...item }))),
-            options
-        )
-    }
-    return createQuickPick(
-        items.map(item => ({ data: item.label, ...item })),
-        options
-    )
-}
-
-function acceptItems<T>(picker: DataQuickPick<T>, resolve: (items: DataQuickPickItem<T>[]) => void): void {
-    if (picker.selectedItems.length === 0) {
-        return
-    }
-
-    picker.selectedItems.forEach(item => (item.onClick !== undefined ? item.onClick() : undefined))
-
-    if (picker.selectedItems.some(item => item.invalidSelection)) {
-        return
-    }
-
-    // TODO: if data is a function => Promise then we need to invoke the function and wait for the Promise
-    // to resolve, then we can return (and we should set the picker to be busy/disabled)
-
-    resolve(Array.from(picker.selectedItems))
-}
-
-function castDatumToItems<T>(...datum: T[]): DataQuickPickItem<T>[] {
-    return datum.map(data => ({ label: '', data }))
-}
-
-/**
- * Sets up the QuickPick events. Reject is intentionally not used since errors should be handled through
- * control signals, not exceptions.
- */
-function promptUser<T>(
-    picker: DataQuickPick<T>,
-    onDidShowEmitter: vscode.EventEmitter<void>
-): Promise<DataQuickPickItem<T>[] | undefined> {
-    return new Promise<DataQuickPickItem<T>[] | undefined>(resolve => {
-        picker.onDidAccept(() => acceptItems(picker, resolve))
-        picker.onDidHide(() => resolve(castDatumToItems(WIZARD_EXIT)))
-        picker.onDidTriggerButton(button => {
-            if (button === vscode.QuickInputButtons.Back) {
-                resolve(castDatumToItems(WIZARD_BACK))
-            } else if ((button as QuickInputButton<T>).onClick !== undefined) {
-                const response = (button as QuickInputButton<T>).onClick!()
-                if (response !== undefined) {
-                    resolve(castDatumToItems(response))
-                }
-            }
-        })
-        picker.show()
-        onDidShowEmitter.fire()
-    }).finally(() => picker.dispose())
-}
-
-/**
- * Atempts to recover a QuickPick item given an already processed response.
- *
- * This is generally required when the prompter is being used in a 'saved' state, such as when updating forms
- * that were already submitted. Failed recoveries simply return undefined, which means that the recent item
- * is unknown (generally the default in this case is to select the first item).
- */
-function recoverItemFromData<T>(data: T, items: readonly DataQuickPickItem<T>[]): DataQuickPickItem<T> | undefined {
-    const stringified = JSON.stringify(data)
-
-    return items.find(item => {
-        if (typeof item.data === 'object') {
-            return stringified === JSON.stringify(item.data)
-        }
-
-        return typeof item.data === 'function' ? false : data === item.data
-    })
-}
-
-/**
- * A generic UI element that presents a list of items for the user to select. Wraps around {@link vscode.QuickPick QuickPick}.
- */
-export class QuickPickPrompter<T> extends Prompter<T> {
-    protected _estimator?: StepEstimator<T>
-    protected _lastPicked?: DataQuickPickItem<T>
-    private onDidShowEmitter = new vscode.EventEmitter<void>()
-    private onDidChangeBusyEmitter = new vscode.EventEmitter<boolean>()
-    private onDidChangeEnablementEmitter = new vscode.EventEmitter<boolean>()
-    // Placeholder can be any 'ephemeral' item such as `noItemsItem` or `errorItem` that should be removed on refresh
-    private isShowingPlaceholder?: boolean
-    /** Event that is fired immediately after the prompter is shown. */
-    public onDidShow = this.onDidShowEmitter.event
-    /** Event that is fired whenever the prompter changes 'busy' state. */
-    public onDidChangeBusy = this.onDidChangeBusyEmitter.event
-    /** Event that is fired whenever the prompter changes 'enabled' state. */
-    public onDidChangeEnablement = this.onDidChangeEnablementEmitter.event
-
-    /**
-     * Sets the "last selected/accepted" item or input, moves it to the start
-     * of the items and makes it the active selection.
-     */
-    public set recentItem(response: T | DataQuickPickItem<T> | undefined) {
-        this.setRecentItem(response)
-    }
-
-    public get recentItem() {
-        return this._lastPicked
-    }
-
-    public set busy(state: boolean) {
-        const prev = this.quickPick.busy
-        this.quickPick.busy = state
-        if (prev !== state) {
-            this.onDidChangeBusyEmitter.fire(state)
-        }
-    }
-
-    public get busy(): boolean {
-        return this.quickPick.busy
-    }
-
-    public set enabled(state: boolean) {
-        const prev = this.quickPick.enabled
-        this.quickPick.enabled = state
-        if (prev !== state) {
-            this.onDidChangeEnablementEmitter.fire(state)
-        }
-    }
-
-    public get enabled(): boolean {
-        return this.quickPick.enabled
-    }
-
-    constructor(
-        public readonly quickPick: DataQuickPick<T>,
-        protected readonly options: ExtendedQuickPickOptions<T> = {}
-    ) {
-        super()
-    }
-
-    public override transform<R>(callback: Transform<T, R>): QuickPickPrompter<R> {
-        return super.transform(callback) as QuickPickPrompter<R>
-    }
-
-    public setSteps(current: number, total: number): void {
-        this.quickPick.step = current
-        this.quickPick.totalSteps = total
-    }
-
-    public clearItems(): void {
-        this.quickPick.items = []
-        this.isShowingPlaceholder = false
-    }
-
-    /**
-     * Attempts to set the currently selected items. If no matching items were found, the first item in
-     * the QuickPick is selected.
-     *
-     * @param items The items to look for
-     */
-    public selectItems(...items: DataQuickPickItem<T>[]): void {
-        const selected = new Set(items.map(item => item.label))
-
-        // Note: activeItems refer to the 'highlighted' items in a QuickPick, while selectedItems only
-        // changes _after_ the user hits enter or clicks something. For a multi-select QuickPick,
-        // selectedItems will change as options are clicked (and not when accepting).
-        this.quickPick.activeItems = this.quickPick.items.filter(item => selected.has(item.label))
-
-        if (!items.length || (this.quickPick.activeItems.length === 0 && this.quickPick.items.length > 0)) {
-            this.quickPick.activeItems = [this.quickPick.items[0]]
-        }
-    }
-
-    /**
-     * Appends items to the current array, keeping track of the previous selection
-     */
-    private appendItems(items: DataQuickPickItem<T>[]): void {
-        const picker = this.quickPick
-        const recent = picker.activeItems
-        const mergedItems = picker.items.concat(items)
-
-        const recentlyUsedItem = mergedItems.find(item => item.recentlyUsed)
-        if (recentlyUsedItem !== undefined) {
-            if (items.includes(recentlyUsedItem)) {
-                const prefix = recentlyUsedItem.description
-                recentlyUsedItem.description = prefix ? `${prefix} (${recentlyUsed})` : `(${recentlyUsed})`
-            }
-
-            picker.items = mergedItems.sort((a, b) => {
-                if (a === recentlyUsedItem) {
-                    return -1
-                } else if (b === recentlyUsedItem) {
-                    return 1
-                } else {
-                    return this.options.compare?.(a, b) ?? 0
-                }
-            })
-
-            picker.activeItems = [recentlyUsedItem]
-        } else {
-            picker.items = mergedItems.sort(this.options.compare)
-
-            if (picker.items.length === 0 && !this.busy) {
-                this.isShowingPlaceholder = true
-                picker.items = this.options.noItemsFoundItem !== undefined ? [this.options.noItemsFoundItem] : []
-            }
-
-            this.selectItems(...recent.filter(i => !i.invalidSelection))
-        }
-    }
-
-    // TODO: add options to this to clear items _before_ loading them
-    /**
-     * Loads items into the QuickPick. Can accept an array or a Promise for items. Promises will cause the
-     * QuickPick to become 'busy', disabling user-input until loading is finished. Items are appended to
-     * the current set of items. Use `clearItems` prior to loading if this behavior is not desired. The
-     * previously selected item will remain selected if it still exists after loading.
-     *
-     * @param items DataQuickPickItems or a promise for said items
-     * @param disableInput Disables the prompter until the items have been loaded, only relevant for async loads (default: true)
-     * @returns A promise that is resolved when loading has finished
-     */
-    public async loadItems(items: ItemLoadTypes<T>, disableInput: boolean = false): Promise<void> {
-        // This code block assumes that callers never try to load items in parallel
-        // For now this okay since we don't have any pickers that require that capability
-
-        if (this.isShowingPlaceholder) {
-            this.clearItems()
-        }
-
-        const addErrorItem = (err: Error) => {
-            if (this.options.errorItem === undefined) {
-                return
-            }
-            this.isShowingPlaceholder = true
-            const errorWithMessage = { detail: err.message, ...this.options.errorItem }
-            this.appendItems([errorWithMessage])
-        }
-
-        this.busy = true
-        this.enabled = !disableInput
-
-        if (isAsyncIterable(items)) {
-            // Technically AsyncIterators have three types: one for yield, one for return, and one
-            // for parameters to `next`. We only care about the first two, where the yield type will
-            // always be the same as the AsyncIterable type variable, and the second will potentially
-            // be undefined
-            const iterator = items[Symbol.asyncIterator]() as AsyncIterator<
-                DataQuickPickItem<T>[],
-                DataQuickPickItem<T>[] | undefined
-            >
-            // Any caching of the iterator should be handled externally; we will not keep track of
-            // where we left off when the prompt has been hidden
-            let hidden = false
-            const checkHidden = this.quickPick.onDidHide(() => (hidden = true))
-            while (!hidden) {
-                try {
-                    const { value, done } = await iterator.next()
-                    if (value) {
-                        this.appendItems(value)
-                    }
-                    if (done) {
-                        break
-                    }
-                } catch (err) {
-                    getLogger().error('QuickPickPrompter: loading items from AsyncIterable failed: %s', err)
-                    addErrorItem(err as Error)
-                    break
-                }
-            }
-            checkHidden.dispose()
-        } else if (items instanceof Promise) {
-            try {
-                this.appendItems(await items)
-            } catch (err) {
-                getLogger().error('QuickPickPrompter: loading items from Promise failed: %s', err)
-                addErrorItem(err as Error)
-            }
-        } else {
-            this.appendItems(items)
-        }
-
-        this.busy = false
-        this.enabled = true
-
-        // Currently needed for the cases where async loads did not load any items, forcing a `noItemsFoundItem`
-        this.appendItems([])
-    }
-
-    /**
-     * Clears the prompter, then loads new items. Will automatically attempt to select the previously
-     * selected items. This is a combination of {@link QuickPickPrompter.loadItems loadItems} and
-     * {@link QuickPickPrompter.clearItems clearItems}.
-     *
-     * @param items Items to load
-     * @returns Promise that is resolved upon completion
-     */
-    public async clearAndLoadItems(items: ItemLoadTypes<T>): Promise<void> {
-        const previousSelected = [...this.quickPick.activeItems]
-        this.clearItems()
-        await this.loadItems(items)
-        this.selectItems(...previousSelected)
-    }
-
-    protected async promptUser(): Promise<PromptResult<T>> {
-        await this.setEstimatorHook()
-        const choices = await promptUser(this.quickPick, this.onDidShowEmitter)
-        this.onDidShowEmitter.dispose()
-
-        if (choices === undefined) {
-            return choices
-        }
-
-        this._lastPicked = choices[0]
-        const result = choices[0].data
-
-        return result instanceof Function ? await result() : result
-    }
-
-    /**
-     * Sets the "last selected/accepted" item or input and makes it the active selection.
-     *
-     * @param picked  Recent item.
-     */
-    protected setRecentItem(picked: T | DataQuickPickItem<T> | undefined): void {
-        // TODO: figure out how to recover from implicit responses
-        if (picked === undefined) {
-            return
-        } else if (!isDataQuickPickItem(picked)) {
-            const recovered = recoverItemFromData(picked, this.quickPick.items)
-            this.quickPick.activeItems = this.quickPick.items.filter(item => item.label === recovered?.label)
-        } else {
-            this.quickPick.activeItems = this.quickPick.items.filter(item => item.label === picked.label)
-        }
-
-        if (this.quickPick.activeItems.length === 0) {
-            this.quickPick.activeItems = this.quickPick.items.length > 0 ? [this.quickPick.items[0]] : []
-        }
-    }
-
-    public setStepEstimator(estimator: StepEstimator<T>): void {
-        this._estimator = estimator
-    }
-
-    private async setEstimatorHook(): Promise<void> {
-        if (this._estimator === undefined) {
-            return
-        }
-
-        function hashItem(item: DataQuickPickItem<any>): string {
-            return `${item.label}:${item.description ?? ''}:${item.detail ?? ''}`
-        }
-
-        const estimates = new Map<string, number>()
-
-        const setEstimate = (item: DataQuickPickItem<T>) => {
-            if (item.skipEstimate) {
-                return
-            }
-
-            if (item.data instanceof Function) {
-                return item
-                    .data()
-                    .then(data => this.applyTransforms(data))
-                    .then(result => this._estimator!(result))
-                    .then(estimate => estimates.set(hashItem(item), estimate))
-            } else {
-                const transformed = this.applyTransforms(item.data)
-                const estimate = this._estimator!(transformed)
-                estimates.set(hashItem(item), estimate)
-            }
-        }
-
-        const promises = this.quickPick.items.map(setEstimate)
-
-        const current: number = this.quickPick.step!
-        const total: number = this.quickPick.totalSteps!
-
-        this.quickPick.onDidChangeActive(async active => {
-            if (active.length === 0) {
-                return
-            }
-
-            const sets = active.filter(item => !estimates.has(hashItem(item))).map(setEstimate)
-            await sets[0]
-            const estimate = estimates.get(hashItem(active[0])) ?? 0
-            this.setSteps(current, total + estimate)
-        })
-
-        // We await the first promise before returning to guarantee that there is no 'stutter'
-        // when showing the current/total step numbers
-        if (promises.length > 0) {
-            await promises[0]
-            this.setSteps(current, total + estimates.get(hashItem(this.quickPick.items[0]))!)
-        }
-    }
-}
-
-/**
- * Allows the prompter to accept the QuickPick filter box as input, shown as a QuickPickItem.
- *
- * It is recommended to use `createQuickPick` instead of instantiating this class in isolation.
- *
- * @param label The label of the QuickPickItem that shows the user's input
- * @param transform Required when the expected type is not a string, transforming the input into the expected type or a control signal.
- */
-export class FilterBoxQuickPickPrompter<T> extends QuickPickPrompter<T> {
-    private onChangeValue?: vscode.Disposable
-
-    public override set recentItem(response: T | DataQuickPickItem<T> | undefined) {
-        if (this.isUserInput(response)) {
-            this.quickPick.value = response.description ?? ''
-        } else {
-            super.recentItem = response
-        }
-    }
-
-    constructor(quickPick: DataQuickPick<T>, private readonly settings: FilterBoxInputSettings<T>) {
-        super(quickPick)
-
-        this.transform(selection => {
-            if ((selection as T | typeof customUserInput) === customUserInput) {
-                return settings.transform(quickPick.value) ?? selection
-            }
-            return selection
-        })
-    }
-
-    public override async loadItems(items: ItemLoadTypes<T>): Promise<void> {
-        if (this.onChangeValue) {
-            this.onChangeValue.dispose()
-        }
-
-        await super.loadItems(items)
-        this.addFilterBoxInput()
-    }
-
-    private addFilterBoxInput(): void {
-        const picker = this.quickPick as DataQuickPick<T | symbol>
-        const validator = (input: string) =>
-            this.settings.validator !== undefined ? this.settings.validator(input) : undefined
-        const items = picker.items.filter(item => item.data !== customUserInput)
-        const { label } = this.settings
-
-        function update(value: string = '') {
-            if (value !== '') {
-                const customUserInputItem = {
-                    label,
-                    description: value,
-                    alwaysShow: true,
-                    data: customUserInput,
-                    invalidSelection: validator(value) !== undefined,
-                    detail: validator(value),
-                } as DataQuickPickItem<T | symbol>
-
-                picker.items = [customUserInputItem, ...items]
-            } else {
-                picker.items = items
-            }
-        }
-
-        this.onChangeValue = picker.onDidChangeValue(update)
-        update(picker.value)
-    }
-
-    private isUserInput(picked: any): picked is DataQuickPickItem<symbol> {
-        return picked !== undefined && picked.data === customUserInput
-    }
-}
diff --git a/src/shared/ui/prompter.ts b/src/shared/ui/prompter.ts
deleted file mode 100644
index da52d559255..00000000000
--- a/src/shared/ui/prompter.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { isValidResponse, StepEstimator, WizardControl } from '../wizards/wizard'
-
-export type QuickPickDataType<T> = T | WizardControl | undefined
-
-export type MultiQuickPickResult<T> = T[] | WizardControl | undefined
-export type PromptResult<T> = T | WizardControl | undefined
-
-export type Transform<T, R = T> = (result: T) => R
-
-/**
- * A generic abstraction of 'prompt' UIs. Returns the user's input by calling the {@link Prompter.prompt prompt}
- * method. Can apply a series of deferred transformation callbacks to the input via {@link Prompter.transform transform}.
- */
-export abstract class Prompter<T> {
-    private disposed = false
-    protected transforms: Transform<T, any>[] = []
-
-    constructor() {}
-
-    /** The total number of steps that occured during the prompt */
-    public get totalSteps(): number {
-        return 1
-    }
-
-    // TODO: add this to have a standard title across prompts
-    // public abstract set title(title: string)
-
-    /** Implementing classes should use this to show the user what they previously selected (if applicable). */
-    public abstract get recentItem(): any
-    /** Implementing classes should return the user's response _before_ transforming into into type T. */
-    public abstract set recentItem(response: any)
-
-    // TODO: we need the inverse transform to recover inputs across flows
-    /** Type-helper, allows Prompters to be mapped to different shapes */
-    public transform<R>(callback: Transform<T, R>): Prompter<R> {
-        this.transforms.push(callback)
-        return this as unknown as Prompter<R>
-    }
-
-    /** Applies transformations to the user response in the order in which they were added */
-    protected applyTransforms(result: PromptResult<T>): PromptResult<T> {
-        for (const cb of this.transforms) {
-            if (!isValidResponse(result)) {
-                return result
-            }
-            const transform: T | undefined = cb(result)
-            if (transform !== undefined) {
-                result = transform
-            }
-        }
-
-        return result
-    }
-
-    /**
-     * Opens a dialog for the user to respond to.
-     * @returns The user-response, undefined, or a special control-signal used in Wizards.
-     */
-    public async prompt(): Promise<PromptResult<T>> {
-        if (this.disposed) {
-            throw new Error('Cannot call "prompt" multiple times')
-        }
-        this.disposed = true
-        return this.applyTransforms(await this.promptUser())
-    }
-
-    /** Sets a 'step estimator' function used to predict how many steps are remaining in a given flow */
-    public abstract setStepEstimator(estimator: StepEstimator<T>): void
-    protected abstract promptUser(): Promise<PromptResult<T>>
-    public abstract setSteps(current: number, total: number): void
-}
diff --git a/src/shared/ui/wizardPrompter.ts b/src/shared/ui/wizardPrompter.ts
deleted file mode 100644
index e513a2b8f19..00000000000
--- a/src/shared/ui/wizardPrompter.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { StepEstimator, Wizard } from '../wizards/wizard'
-import { Prompter, PromptResult } from './prompter'
-
-/**
- * Wraps {@link Wizard} object into its own {@link Prompter}, allowing wizards to use other
- * wizards in their flows.
- */
-export class WizardPrompter<T> extends Prompter<T> {
-    public get recentItem(): any {
-        return undefined
-    }
-    public set recentItem(response: any) {}
-
-    private stepOffset: number = 0
-    private response: T | undefined
-
-    constructor(private readonly wizard: Wizard<T>) {
-        super()
-    }
-
-    public setSteps(current: number, total: number): void {
-        if (this.wizard.currentStep === 1) {
-            this.wizard.stepOffset = [current - 1, total - 1]
-        }
-
-        this.stepOffset = total - 1
-    }
-
-    public override get totalSteps(): number {
-        return this.wizard.totalSteps - this.stepOffset
-    }
-
-    public setStepEstimator(estimator: StepEstimator<T>): void {
-        const estimates = new Map<string, number>()
-
-        this.wizard.parentEstimator = state => {
-            const key = JSON.stringify(state)
-            const transformed = this.applyTransforms(state)
-            const estimate = estimator(transformed)
-
-            estimates.set(key, estimate)
-
-            return estimate
-        }
-    }
-
-    protected async promptUser(): Promise<PromptResult<T>> {
-        this.response = await this.wizard.run()
-        return this.response
-    }
-}
diff --git a/src/shared/utilities/asyncCollection.ts b/src/shared/utilities/asyncCollection.ts
deleted file mode 100644
index e67e662a666..00000000000
--- a/src/shared/utilities/asyncCollection.ts
+++ /dev/null
@@ -1,227 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Coalesce } from './tsUtils'
-
-/**
- * High-level abstraction over async generator functions of the form `async function*` {@link AsyncGenerator}
- */
-export interface AsyncCollection<T> extends AsyncIterable<T> {
-    /**
-     * Flattens the collection 1-level deep.
-     */
-    flatten(): AsyncCollection<SafeUnboxIterable<T>>
-
-    /**
-     * Applies a mapping transform to the output generator.
-     */
-    map<U>(fn: (obj: T) => Promise<U> | U): AsyncCollection<U>
-
-    /**
-     * Filters out results which will _not_ be passed on to further transformations.
-     */
-    filter<U extends T>(predicate: (item: T) => item is U): AsyncCollection<U>
-    filter<U extends T>(predicate: (item: T) => boolean): AsyncCollection<U>
-
-    /**
-     * Uses only the first 'count' number of values returned by the generator.
-     */
-    limit(count: number): AsyncCollection<T>
-
-    /**
-     * Converts the collection to a Promise, resolving to an array of all values returned by the generator.
-     */
-    promise(): Promise<T[]>
-
-    /**
-     * Converts the collection to a Map, using either a property of the item or a function to select keys
-     */
-    toMap<K extends StringProperty<T>, U extends string = never>(
-        selector: KeySelector<T, U> | K
-    ): Promise<Map<Coalesce<U, T[K]>, T>>
-
-    /**
-     * Returns an iterator directly from the underlying generator, preserving values returned.
-     */
-    iterator(): AsyncIterator<T, T | void>
-}
-
-const asyncCollection = Symbol('asyncCollection')
-
-/**
- * Converts an async generator function to an {@link AsyncCollection}
- *
- * Generation is "lazy", i.e. the generator is not called until a resolving operation:
- *  * Iterating over them using `for await (...)`
- *  * Iterating over them using `.next()`
- *  * Calling one of the conversion functions `toMap` or `promise`
- *
- * Collections are *immutable* in the sense that any transformation will not consume the underlying generator
- * function. That is, any 'final' operation uses its own contextually bound generator function separate from
- * any predecessor collections.
- */
-export function toCollection<T>(generator: () => AsyncGenerator<T, T | undefined | void>): AsyncCollection<T> {
-    async function* unboxIter() {
-        const last = yield* generator()
-        if (last !== undefined) {
-            yield last
-        }
-    }
-
-    const iterable: AsyncIterable<T> = {
-        [Symbol.asyncIterator]: unboxIter,
-    }
-
-    return Object.assign(iterable, {
-        [asyncCollection]: true,
-        flatten: () => toCollection<SafeUnboxIterable<T>>(() => delegateGenerator(generator(), flatten)),
-        filter: <U extends T>(predicate: Predicate<T, U>) =>
-            toCollection<U>(() => filterGenerator<T, U>(generator(), predicate)),
-        map: <U>(fn: (item: T) => Promise<U> | U) => toCollection<U>(() => mapGenerator(generator(), fn)),
-        limit: (count: number) => toCollection(() => delegateGenerator(generator(), takeFrom(count))),
-        promise: () => promise(iterable),
-        toMap: <U extends string = never, K extends StringProperty<T> = never>(selector: KeySelector<T, U> | K) =>
-            asyncIterableToMap(iterable, selector),
-        iterator: generator,
-    })
-}
-
-export function isAsyncCollection<T>(iterable: AsyncIterable<T>): iterable is AsyncCollection<T> {
-    return asyncCollection in iterable
-}
-
-async function* mapGenerator<T, U, R = T>(
-    generator: AsyncGenerator<T, R | undefined | void>,
-    fn: (item: T | R) => Promise<U> | U
-): AsyncGenerator<U, U | undefined> {
-    while (true) {
-        const { value, done } = await generator.next()
-        if (done) {
-            return value !== undefined ? (fn(value) as Awaited<U>) : undefined
-        }
-        if (value !== undefined) {
-            yield fn(value)
-        }
-    }
-}
-
-type Predicate<T, U extends T> = (item: T) => item is U
-
-async function* filterGenerator<T, U extends T, R = T>(
-    generator: AsyncGenerator<T, R | undefined | void>,
-    predicate: Predicate<T | R, U> | ((item: T | R) => boolean)
-): AsyncGenerator<U, U | void> {
-    while (true) {
-        const { value, done } = await generator.next()
-
-        if (done) {
-            if (value !== undefined && predicate(value)) {
-                return value as unknown as Awaited<U>
-            }
-            break
-        }
-
-        if (predicate(value)) {
-            yield value
-        }
-    }
-}
-
-async function* delegateGenerator<T, U, R = T>(
-    generator: AsyncGenerator<T, R | undefined | void>,
-    fn: (item: T | R, ret: () => void) => AsyncGenerator<U, void>
-): AsyncGenerator<U, U | undefined> {
-    type LastValue = Readonly<{ isSet: false; value?: undefined } | { isSet: true; value: Awaited<U> }>
-    let last: LastValue = { isSet: false }
-
-    while (true) {
-        const { value, done } = await generator.next()
-        if (value !== undefined) {
-            const delegate = fn(value, generator.return.bind(generator))
-            while (true) {
-                const sub = await delegate.next()
-                if (sub.done) {
-                    break
-                }
-                if (last.isSet) {
-                    yield last.value
-                }
-                last = { isSet: true, value: sub.value as Awaited<U> }
-            }
-        }
-        if (done) {
-            break
-        }
-    }
-
-    // The last value is buffered by one step to ensure it is returned here
-    // rather than yielded in the while loops.
-    return last.value
-}
-
-async function* flatten<T, U extends SafeUnboxIterable<T>>(item: T) {
-    if (isIterable<U>(item)) {
-        yield* item
-    } else {
-        yield item as unknown as U
-    }
-}
-
-function takeFrom<T>(count: number) {
-    return async function* (item: T, ret: () => void) {
-        if (--count < 0) {
-            return ret()
-        }
-        yield item
-    }
-}
-
-/**
- * Either 'unbox' an Iterable value or leave it as-is if it's not an Iterable
- */
-type SafeUnboxIterable<T> = T extends Iterable<infer U> ? U : T
-
-export function isIterable<T>(obj: any): obj is Iterable<T> {
-    return obj !== undefined && typeof obj[Symbol.iterator] === 'function'
-}
-
-async function promise<T>(iterable: AsyncIterable<T>): Promise<T[]> {
-    const result: T[] = []
-
-    for await (const item of iterable) {
-        result.push(item)
-    }
-
-    return result
-}
-
-function addToMap<T, U extends string>(map: Map<string, T>, selector: KeySelector<T, U> | StringProperty<T>, item: T) {
-    const key = typeof selector === 'function' ? selector(item) : item[selector]
-    if (key) {
-        if (map.has(key as keyof typeof map['keys'])) {
-            throw new Error(`Duplicate key found when converting AsyncIterable to map: ${key}`)
-        }
-
-        map.set(key as keyof typeof map['keys'], item)
-    }
-}
-
-// Type 'U' is constrained to be either a key of 'T' or a string returned by a function parsing 'T'
-type KeySelector<T, U extends string> = (item: T) => U | undefined
-type StringProperty<T> = { [P in keyof T]: T[P] extends string ? P : never }[keyof T]
-
-// TODO: apply this to different iterables and replace the old 'map' code
-async function asyncIterableToMap<T, K extends StringProperty<T>, U extends string = never>(
-    iterable: AsyncIterable<T>,
-    selector: KeySelector<T, U> | K
-): Promise<Map<Coalesce<U, T[K]>, T>> {
-    const result = new Map<Coalesce<U, T[K] & string>, T>()
-
-    for await (const item of iterable) {
-        addToMap(result, selector, item)
-    }
-
-    return result
-}
diff --git a/src/shared/utilities/cacheUtils.ts b/src/shared/utilities/cacheUtils.ts
deleted file mode 100644
index 727c0c8b242..00000000000
--- a/src/shared/utilities/cacheUtils.ts
+++ /dev/null
@@ -1,217 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as fs from 'fs-extra'
-import * as vscode from 'vscode'
-import { dirname } from 'path'
-
-// TODO(sijaden): further generalize this concept over async references (maybe create a library?)
-// It's pretty clear that this interface (and VSC's `Memento`) reduce down to what is essentially
-// a "pointer" with RW operations that return futures.
-
-/**
- * A general, basic interface for a cache with key associativity.
- */
-export interface KeyedCache<T, K = string> {
-    /**
-     * Attempts to read data stored at {@link key}.
-     *
-     * @param key Target key to read from.
-     * @returns `T` on success, `undefined` if {@link key} doesn't exist.
-     */
-    load(key: K): Promise<T | undefined>
-
-    /**
-     * Writes {@link data} to {@link key}.
-     *
-     * @param key Target key to write to.
-     * @param data Data to write.
-     *
-     * @returns `true` on success, `false` otherwise.
-     */
-    save(key: K, data: T): Promise<boolean>
-
-    /**
-     * Removes the data stored at {@link key}, if any.
-     *
-     * @param key Target key to clear.
-     *
-     * @returns `true` on success, `false` otherwise.
-     */
-    clear(key: K): Promise<boolean>
-}
-
-/**
- * Loads {@link key} from the cache.
- *
- * If the item does not exist, {@link fn} is executed. The result is saved using {@link key}.
- */
-export async function loadOr<T, K>(cache: KeyedCache<T, K>, key: K, fn: () => Promise<T>): Promise<T> {
-    const data = await cache.load(key)
-
-    if (data === undefined) {
-        const computed = await fn()
-        await cache.save(key, computed)
-
-        return computed
-    }
-
-    return data
-}
-
-/**
- * Maps a cache by transforming all inputs and outputs.
- *
- * Transform functions are not invoked if the specified key does not exist in the cache.
- *
- * @param cache Target cache. The original is _not_ affected.
- * @param get Function applied to all **read** operations from the cache.
- * @param set Function applied to all **write** operations from the cache.
- */
-export function mapCache<T, U, K>(cache: KeyedCache<T, K>, get: (data: T) => U, set: (data: U) => T): KeyedCache<U, K> {
-    const getIf = (data?: T) => (data !== undefined ? get(data) : undefined)
-
-    return {
-        clear: key => cache.clear(key),
-        load: key => cache.load(key).then(getIf),
-        save: (key, data) => cache.save(key, set(data)),
-    }
-}
-
-/**
- * Creates a new {@link KeyedCache} backed by the file system.
- *
- * No optimization is performed. Every method call results in direct calls to `fs`.
- * Errors are always caught, meaning a failed `load` operation looks the same as a
- * cache miss.
- *
- * @param mapKey Function that should describe how a key `K` is mapped to the file system.
- * @param logger Optional logger callback. Omitting this parameter disables logging.
- */
-export function createDiskCache<T, K>(
-    mapKey: (key: K) => string,
-    logger?: (message: string) => void
-): KeyedCache<T, K> {
-    function logSuccess(prefix: string, key: K): void {
-        if (logger) {
-            const keyMessage = typeof key === 'object' ? JSON.stringify(key) : key
-            logger(`${prefix} for key '${keyMessage}'`)
-        }
-    }
-
-    function logFailure(prefix: string, key: K, error: unknown): void {
-        if (logger) {
-            const errorMessage = error instanceof Error ? error.message : error
-            const keyMessage = typeof key === 'object' ? JSON.stringify(key) : key
-            logger(`${prefix} for key '${keyMessage}': ${errorMessage}`)
-        }
-    }
-
-    return {
-        load: async key => {
-            try {
-                const target = mapKey(key)
-
-                if (
-                    !(await fs.access(target).then(
-                        () => true,
-                        () => false
-                    ))
-                ) {
-                    logSuccess('load missed', key)
-                    return
-                }
-
-                const result = JSON.parse(await fs.readFile(target, 'utf-8'))
-                logSuccess('load succeeded', key)
-                return result
-            } catch (error) {
-                logFailure('load failed', key, error)
-            }
-        },
-        save: async (key, data) => {
-            try {
-                const target = mapKey(key)
-                await fs.mkdirp(dirname(target))
-                await fs.writeFile(target, JSON.stringify(data), { mode: 0o600 })
-            } catch (error) {
-                logFailure('save failed', key, error)
-                return false
-            }
-
-            logSuccess('save succeeded', key)
-            return true
-        },
-        clear: async key => {
-            try {
-                await fs.unlink(mapKey(key))
-            } catch (error) {
-                logFailure('clear failed', key, error)
-                return false
-            }
-
-            logSuccess('clear succeeded', key)
-            return true
-        },
-    }
-}
-
-export function createSecretsCache(
-    secrets: vscode.SecretStorage,
-    logger?: (message: string) => void
-): KeyedCache<string> {
-    function logSuccess(prefix: string, key: string): void {
-        if (logger) {
-            logger(`${prefix} for key '${key}'`)
-        }
-    }
-
-    function logFailure(prefix: string, key: string, error: unknown): void {
-        if (logger) {
-            const errorMessage = error instanceof Error ? error.message : error
-            logger(`${prefix} for key '${key}': ${errorMessage}`)
-        }
-    }
-
-    return {
-        load: async key => {
-            try {
-                const value = await secrets.get(key)
-
-                if (value === undefined) {
-                    logSuccess('load missed', key)
-                    return
-                }
-
-                logSuccess('load succeeded', key)
-                return value
-            } catch (error) {
-                logFailure('load failed', key, error)
-            }
-        },
-        save: async (key, data) => {
-            try {
-                await secrets.store(key, data)
-            } catch (error) {
-                logFailure('save failed', key, error)
-                return false
-            }
-
-            logSuccess('save succeeded', key)
-            return true
-        },
-        clear: async key => {
-            try {
-                await secrets.delete(key)
-            } catch (error) {
-                logFailure('clear failed', key, error)
-                return false
-            }
-
-            logSuccess('clear succeeded', key)
-            return true
-        },
-    }
-}
diff --git a/src/shared/utilities/childProcess.ts b/src/shared/utilities/childProcess.ts
deleted file mode 100644
index dddcee45cae..00000000000
--- a/src/shared/utilities/childProcess.ts
+++ /dev/null
@@ -1,361 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as child_process from 'child_process'
-import * as crossSpawn from 'cross-spawn'
-import * as logger from '../logger'
-import { Timeout, CancellationError, waitUntil } from './timeoutUtils'
-
-interface RunParameterContext {
-    /** Reports an error parsed from the stdin/stdout streams. */
-    reportError(err: string | Error): void
-    /** Attempts to stop the running process. See {@link ChildProcess.stop}. */
-    stop(force?: boolean, signal?: string): void
-    /** The active `Timeout` object (if applicable). */
-    readonly timeout?: Timeout
-    /** The logger being used by the process. */
-    readonly logger: logger.Logger
-}
-
-export interface ChildProcessOptions {
-    /** Sets the logging behavior. (default: 'yes') */
-    logging?: 'yes' | 'no' | 'noparams'
-    /** Controls whether stdout/stderr is collected and returned in the `ChildProcessResult`. (default: true) */
-    collect?: boolean
-    /** Wait until streams close to resolve the process result. (default: true) */
-    waitForStreams?: boolean
-    /** Forcefully kill the process on an error. (default: false) */
-    useForceStop?: boolean
-    /** Rejects the Promise on any error. Can also use a callback for custom errors. (default: false) */
-    rejectOnError?: boolean | ((error: Error) => Error)
-    /** Rejects the Promise on non-zero exit codes. Can also use a callback for custom errors. (default: false) */
-    rejectOnErrorCode?: boolean | ((code: number) => Error)
-    /** A `Timeout` token. The running process will be terminated on expiration or cancellation. */
-    timeout?: Timeout
-    /** Options sent to the `spawn` command. This is merged in with the base options if they exist. */
-    spawnOptions?: child_process.SpawnOptions
-    /** Callback for intercepting text from the stdout stream. */
-    onStdout?: (text: string, context: RunParameterContext) => void
-    /** Callback for intercepting text from the stderr stream. */
-    onStderr?: (text: string, context: RunParameterContext) => void
-}
-
-export interface ChildProcessRunOptions extends Omit<ChildProcessOptions, 'logging'> {
-    /** Arguments applied in addition to the ones used in construction. */
-    extraArgs?: string[]
-}
-
-export interface ChildProcessResult {
-    exitCode: number
-    error: Error | undefined
-    /** All output emitted by the process, if it was started with `collect=true`, else empty. */
-    stdout: string
-    /** All stderr data emitted by the process, if it was started with `collect=true`, else empty. */
-    stderr: string
-    signal?: string
-}
-
-export const eof = Symbol('EOF')
-
-/**
- * Convenience class to manage a child process
- * To use:
- * - instantiate
- * - call and await run to get the results (pass or fail)
- */
-export class ChildProcess {
-    private static runningProcesses: Map<number, ChildProcess> = new Map()
-    private childProcess: child_process.ChildProcess | undefined
-    private processErrors: Error[] = []
-    private processResult: ChildProcessResult | undefined
-    private log: logger.Logger
-
-    /** Collects stdout data if the process was started with `collect=true`. */
-    private stdoutChunks: string[] = []
-    /** Collects stderr data if the process was started with `collect=true`. */
-    private stderrChunks: string[] = []
-
-    private makeResult(code: number, signal?: NodeJS.Signals): ChildProcessResult {
-        return {
-            exitCode: code,
-            stdout: this.stdoutChunks.join('').trim(),
-            stderr: this.stderrChunks.join('').trim(),
-            error: this.processErrors[0], // Only use the first since that one usually cascades.
-            signal,
-        }
-    }
-
-    public constructor(
-        private readonly command: string,
-        private readonly args: string[] = [],
-        private readonly baseOptions: ChildProcessOptions = {}
-    ) {
-        // TODO: allow caller to use the various loggers instead of just the single one
-        this.log = baseOptions.logging !== 'no' ? logger.getLogger() : logger.getNullLogger()
-    }
-
-    // Inspired by 'got'
-    /**
-     * Creates a one-off {@link ChildProcess} class that always uses the specified options.
-     */
-    public static extend(options: ChildProcessOptions) {
-        return class extends this {
-            public constructor(command: string, args: string[] = []) {
-                super(command, args, options)
-            }
-        }
-    }
-
-    /**
-     * Runs the child process. Options passed here are merged with the options passed in during construction.
-     * Priority is given to `run` options, overriding the previous value.
-     */
-    public async run(params: ChildProcessRunOptions = {}): Promise<ChildProcessResult> {
-        if (this.childProcess) {
-            throw new Error('process already started')
-        }
-
-        const options = {
-            collect: true,
-            waitForStreams: true,
-            ...this.baseOptions,
-            ...params,
-            spawnOptions: { ...this.baseOptions.spawnOptions, ...params.spawnOptions },
-        }
-
-        const { rejectOnError, rejectOnErrorCode, timeout } = options
-        const args = this.args.concat(options.extraArgs ?? [])
-
-        const debugDetail = this.log.logLevelEnabled('debug')
-            ? ` (running processes: ${ChildProcess.runningProcesses.size})`
-            : ''
-        this.log.info(`Command: ${this.toString(options.logging === 'noparams')}${debugDetail}`)
-
-        const cleanup = () => {
-            this.childProcess?.stdout?.removeAllListeners()
-            this.childProcess?.stderr?.removeAllListeners()
-        }
-
-        return new Promise<ChildProcessResult>((resolve, reject) => {
-            const errorHandler = (error: Error, force = options.useForceStop) => {
-                this.processErrors.push(error)
-                if (!this.stopped) {
-                    this.stop(force)
-                }
-                if (rejectOnError) {
-                    if (typeof rejectOnError === 'function') {
-                        reject(rejectOnError(error))
-                    } else {
-                        reject(error)
-                    }
-                }
-            }
-
-            const paramsContext: RunParameterContext = {
-                timeout,
-                logger: this.log,
-                stop: this.stop.bind(this),
-                reportError: err => errorHandler(err instanceof Error ? err : new Error(err)),
-            }
-
-            if (timeout && timeout?.completed) {
-                throw new Error('Timeout token was already completed.')
-            }
-
-            // Async.
-            // See also crossSpawn.spawnSync().
-            // Arguments are forwarded[1] to node `child_process` module, see its documentation[2].
-            // [1] https://github.com/moxystudio/node-cross-spawn/blob/master/index.js
-            // [2] https://nodejs.org/api/child_process.html
-            try {
-                this.childProcess = crossSpawn.spawn(this.command, args, options.spawnOptions)
-                this.registerLifecycleListeners(this.childProcess, errorHandler, options)
-            } catch (err) {
-                return reject(err)
-            }
-
-            // Emitted whenever:
-            //  1. Process could not be spawned, or
-            //  2. Process could not be killed, or
-            //  3. Sending a message to the child process failed.
-            // https://nodejs.org/api/child_process.html#child_process_class_childprocess
-            // We also register error event handlers on the output/error streams in case a lower level library fails
-            this.childProcess.on('error', errorHandler)
-            this.childProcess.stdout?.on('error', errorHandler)
-            this.childProcess.stderr?.on('error', errorHandler)
-
-            this.childProcess.stdout?.on('data', (data: { toString(): string }) => {
-                if (options.collect) {
-                    this.stdoutChunks.push(data.toString())
-                }
-
-                options.onStdout?.(data.toString(), paramsContext)
-            })
-
-            this.childProcess.stderr?.on('data', (data: { toString(): string }) => {
-                if (options.collect) {
-                    this.stderrChunks.push(data.toString())
-                }
-
-                options.onStderr?.(data.toString(), paramsContext)
-            })
-
-            // Emitted when streams are closed.
-            // This will not be fired if `waitForStreams` is false
-            this.childProcess.once('close', (code, signal) => {
-                this.processResult = this.makeResult(code ?? -1, signal ?? undefined)
-                resolve(this.processResult)
-            })
-
-            // Emitted when process exits or terminates.
-            // https://nodejs.org/api/child_process.html#child_process_class_childprocess
-            // - If the process exited, `code` is the final exit code of the process, else null.
-            // - If the process terminated because of a signal, `signal` is the name of the signal, else null.
-            // - One of `code` or `signal` will always be non-null.
-            this.childProcess.once('exit', (code, signal) => {
-                this.processResult = this.makeResult(
-                    typeof code === 'number' ? code : -1,
-                    typeof signal === 'string' ? signal : undefined
-                )
-                if (code && rejectOnErrorCode) {
-                    if (typeof rejectOnErrorCode === 'function') {
-                        reject(rejectOnErrorCode(code))
-                    } else {
-                        reject(new Error(`Command exited with non-zero code: ${code}`))
-                    }
-                }
-                if (options.waitForStreams === false) {
-                    resolve(this.processResult)
-                }
-            })
-        }).finally(() => cleanup())
-    }
-
-    /**
-     * Gets the `run()` result after the child process has finished.
-     *
-     * stdout/stderr will be empty unless the process was started with `collect=true`.
-     *
-     * @returns `run()` result, or undefined if the process has not yet started or is still running.
-     */
-    public result(): ChildProcessResult | undefined {
-        return this.processResult
-    }
-
-    public pid(): number {
-        return this.childProcess?.pid ?? -1
-    }
-
-    public exitCode(): number {
-        return this.childProcess?.exitCode ?? -1
-    }
-
-    /**
-     * Stops the process.
-     *
-     * SIGTERM won't kill a terminal process, use SIGHUP instead.
-     *
-     * @param force  Tries SIGKILL if the process is not stopped after a few seconds.
-     * @param signal  Signal to send, defaults to SIGTERM (node default).
-     *
-     */
-    public stop(force: boolean = false, signal?: NodeJS.Signals): void {
-        const child = this.childProcess
-        if (!child || child.stdin?.destroyed) {
-            return
-        }
-        const command = this.command
-        const pid = this.pid()
-        if (!this.stopped) {
-            child.kill(signal)
-
-            if (force === true) {
-                waitUntil(async () => this.stopped, { timeout: 3000, interval: 200, truthy: true })
-                    .then(stopped => {
-                        if (!stopped) {
-                            child.kill('SIGKILL')
-                        }
-                    })
-                    .catch(e => {
-                        this.log.warn(`stop(): SIGKILL failed: pid=${pid} command=${command}`)
-                    })
-            }
-        } else {
-            throw new Error('Attempting to kill a process that has already been killed')
-        }
-    }
-
-    private registerLifecycleListeners(
-        process: child_process.ChildProcess,
-        errorHandler: (error: Error, forceStop?: boolean) => void,
-        options?: ChildProcessOptions
-    ): void {
-        const pid = process.pid
-        ChildProcess.runningProcesses.set(pid, this)
-
-        const timeoutListener = options?.timeout?.token.onCancellationRequested(({ agent }) => {
-            const message = agent == 'user' ? 'Cancelled: ' : 'Timed out: '
-            this.log.verbose(`${message}${this.toString(options?.logging === 'noparams')}`)
-            errorHandler(new CancellationError(agent), true)
-        })
-
-        const dispose = () => {
-            timeoutListener?.dispose()
-            ChildProcess.runningProcesses.delete(pid)
-        }
-
-        process.on('exit', dispose)
-        process.on('error', dispose)
-    }
-
-    /**
-     * Sends data to the process
-     *
-     * This throws if the process hasn't started or if the write fails.
-     */
-    public async send(input: string | Buffer | typeof eof) {
-        if (this.childProcess === undefined) {
-            throw new Error('Cannot write to non-existent process')
-        }
-
-        const stdin = this.childProcess.stdin
-        if (!stdin) {
-            throw new Error('Cannot write to non-existent stdin')
-        }
-
-        if (input === eof) {
-            return new Promise<void>(resolve => stdin.end('', resolve))
-        }
-
-        return new Promise<void>((resolve, reject) => stdin.write(input, e => (e ? reject(e) : resolve())))
-    }
-
-    /**
-     * Returns true if the process has ended, or false if the process was not
-     * started or is still running.
-     *
-     * "Ended" means any of:
-     * - error prevented start, or
-     * - streams closed, or
-     * - process exited, or
-     * - exit-code was set.
-     */
-    public get stopped(): boolean {
-        if (!this.childProcess) {
-            return false // Not started yet.
-        }
-        return !!this.processResult
-    }
-
-    /**
-     * Gets a string representation of the process invocation.
-     *
-     * @param noparams Omit parameters in the result (to protect sensitive info).
-     */
-    public toString(noparams = false): string {
-        const pid = this.pid() > 0 ? `PID ${this.pid()}:` : '(not started)'
-        return `${pid} [${this.command} ${noparams ? '...' : this.args.join(' ')}]`
-    }
-}
diff --git a/src/shared/utilities/cliUtils.ts b/src/shared/utilities/cliUtils.ts
deleted file mode 100644
index dba97129031..00000000000
--- a/src/shared/utilities/cliUtils.ts
+++ /dev/null
@@ -1,466 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import globals from '../extensionGlobals'
-
-import * as admZip from 'adm-zip'
-import * as fs from 'fs-extra'
-import * as path from 'path'
-import * as vscode from 'vscode'
-import { getIdeProperties } from '../extensionUtilities'
-import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../filesystemUtilities'
-import { getLogger } from '../logger'
-import { HttpResourceFetcher } from '../resourcefetcher/httpResourceFetcher'
-import { ChildProcess } from '../utilities/childProcess'
-import { Window } from '../vscode/window'
-
-import * as nls from 'vscode-nls'
-import { Timeout, CancellationError } from './timeoutUtils'
-import { showMessageWithCancel } from './messages'
-import { DevSettings } from '../settings'
-import { telemetry } from '../telemetry/telemetry'
-import { Result, ToolId } from '../telemetry/telemetry'
-const localize = nls.loadMessageBundle()
-
-const msgDownloading = localize('AWS.installProgress.downloading', 'downloading...')
-const msgInstallingLocal = localize('AWS.installProgress.installingLocal', 'installing local copy...')
-
-export class InstallerError extends Error {}
-export class InvalidPlatformError extends Error {}
-
-interface Cli {
-    command: {
-        unix: string
-        windows: string
-    }
-    source: {
-        macos: string
-        windows: string
-        linux: string
-    }
-    manualInstallLink: string
-    name: string
-}
-
-type AwsClis = Extract<ToolId, 'session-manager-plugin'>
-
-/**
- * CLIs and their full filenames and download paths for their respective OSes
- * TODO: Add SAM? Other CLIs?
- */
-export const awsClis: { [cli in AwsClis]: Cli } = {
-    'session-manager-plugin': {
-        command: {
-            unix: path.join('sessionmanagerplugin', 'bin', 'session-manager-plugin'),
-            windows: path.join('sessionmanagerplugin', 'bin', 'session-manager-plugin.exe'),
-        },
-        source: {
-            // use pkg: zip is unsigned
-            macos: 'https://s3.amazonaws.com/session-manager-downloads/plugin/latest/mac/session-manager-plugin.pkg',
-            windows:
-                'https://session-manager-downloads.s3.amazonaws.com/plugin/latest/windows/SessionManagerPlugin.zip',
-            linux: 'https://s3.amazonaws.com/session-manager-downloads/plugin/latest/ubuntu_64bit/session-manager-plugin.deb',
-        },
-        name: 'Session Manager Plugin',
-        manualInstallLink:
-            'https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html',
-    },
-}
-
-/**
- * Installs a selected CLI: wraps confirmation, cleanup, and telemetry logic.
- * @param cli CLI to install
- * @param confirmBefore Prompt before starting install?
- * @returns CLI Path
- */
-export async function installCli(
-    cli: AwsClis,
-    confirm: boolean,
-    window: Window = Window.vscode()
-): Promise<string | never> {
-    const cliToInstall = awsClis[cli]
-    if (!cliToInstall) {
-        throw new InstallerError(`Invalid not found for CLI: ${cli}`)
-    }
-    let result: Result = 'Succeeded'
-
-    let tempDir: string | undefined
-    const manualInstall = localize('AWS.cli.manualInstall', 'Install manually...')
-    try {
-        const install = localize('AWS.generic.install', 'Install')
-        const selection = !confirm
-            ? install
-            : await window.showInformationMessage(
-                  localize(
-                      'AWS.cli.installCliPrompt',
-                      '{0} could not find {1} CLI. Install a local copy?',
-                      localize('AWS.channel.aws.toolkit', '{0} Toolkit', getIdeProperties().company),
-                      cliToInstall.name
-                  ),
-                  install,
-                  manualInstall
-              )
-
-        if (selection !== install) {
-            if (selection === manualInstall) {
-                vscode.env.openExternal(vscode.Uri.parse(cliToInstall.manualInstallLink))
-            }
-            throw new CancellationError('user')
-        }
-
-        const timeout = new Timeout(600000)
-        const progress = await showMessageWithCancel(
-            localize('AWS.cli.installProgress', 'Installing: {0} CLI', cliToInstall.name),
-            timeout
-        )
-
-        tempDir = await makeTemporaryToolkitFolder()
-        let cliPath: string
-        try {
-            switch (cli) {
-                case 'session-manager-plugin':
-                    cliPath = await installSsmCli(tempDir, progress, timeout)
-                    break
-                default:
-                    throw new InstallerError(`Invalid not found for CLI: ${cli}`)
-            }
-        } finally {
-            timeout.dispose()
-        }
-        // validate
-        if (!(await hasCliCommand(cliToInstall, false))) {
-            throw new InstallerError('Could not verify installed CLIs')
-        }
-
-        return cliPath
-    } catch (err) {
-        if (CancellationError.isUserCancelled(err)) {
-            result = 'Cancelled'
-            getLogger().info(`Cancelled installation for: ${cli}`)
-            throw err
-        }
-
-        result = 'Failed'
-
-        window
-            .showErrorMessage(
-                localize('AWS.cli.failedInstall', 'Installation of the {0} CLI failed.', cliToInstall.name),
-                manualInstall
-            )
-            .then(button => {
-                if (button === manualInstall) {
-                    vscode.env.openExternal(vscode.Uri.parse(cliToInstall.manualInstallLink))
-                }
-            })
-
-        throw err
-    } finally {
-        if (tempDir) {
-            getLogger().info('Cleaning up installer...')
-            // nonblocking: use `then`
-            tryRemoveFolder(tempDir).then(success => {
-                if (success) {
-                    getLogger().info('Removed installer.')
-                } else {
-                    getLogger().warn(`Failed to clean up installer in temp directory: ${tempDir}`)
-                }
-            })
-        }
-
-        telemetry.aws_toolInstallation.emit({ result, toolId: cli })
-    }
-}
-
-/**
- * Returns a path to a runnable CLI. Returns global path, local path, or undefined in that order.
- * @param cli CLI to detect
- * @returns Executable path, or undefined if not available
- */
-export async function getCliCommand(cli: Cli): Promise<string | undefined> {
-    const globalCommand = await hasCliCommand(cli, true)
-
-    return globalCommand ?? (await hasCliCommand(cli, false))
-}
-
-/**
- * Returns whether or not a command is accessible on the user's $PATH
- * @param command CLI Command name
- */
-async function hasCliCommand(cli: Cli, global: boolean): Promise<string | undefined> {
-    const command = global ? path.parse(getOsCommand(cli)).base : path.join(getToolkitLocalCliPath(), getOsCommand(cli))
-    const result = await new ChildProcess(command, ['--version']).run()
-
-    return result.exitCode === 0 ? command : undefined
-}
-
-function getOsCommand(cli: Cli): string {
-    return process.platform === 'win32' ? cli.command.windows : cli.command.unix
-}
-
-function getOsCliSource(cli: Cli): string {
-    switch (process.platform) {
-        case 'win32':
-            return cli.source.windows
-        case 'darwin':
-            return cli.source.macos
-        case 'linux':
-            return cli.source.linux
-        default:
-            throw new InvalidPlatformError(`Platform ${process.platform} is not supported for CLI autoinstallation.`)
-    }
-}
-
-async function downloadCliSource(cli: Cli, tempDir: string, timeout: Timeout): Promise<string> {
-    const installerSource = getOsCliSource(cli)
-    const destinationFile = path.join(tempDir, path.parse(getOsCliSource(cli)).base)
-    const fetcher = new HttpResourceFetcher(installerSource, { showUrl: true, timeout })
-    getLogger().info(`Downloading installer from ${installerSource}...`)
-    await fetcher.get(destinationFile)
-
-    return destinationFile
-}
-
-function getToolkitCliDir(): string {
-    return path.join(globals.context.globalStorageUri.fsPath, 'tools')
-}
-
-/**
- * Gets the toolkit local CLI path
- * Instantiated as a function instead of a const to prevent being called before `ext.context` is set
- */
-function getToolkitLocalCliPath(): string {
-    return path.join(getToolkitCliDir(), 'Amazon')
-}
-
-function handleError<T extends Promise<unknown>>(promise: T): T {
-    return promise.catch<never>(err => {
-        if (
-            !(err instanceof CancellationError || err instanceof InstallerError || err instanceof InvalidPlatformError)
-        ) {
-            throw new InstallerError((err as Error).message)
-        }
-        throw err
-    }) as T
-}
-
-async function installSsmCli(
-    tempDir: string,
-    progress: vscode.Progress<{ message?: string; increment?: number }>,
-    timeout: Timeout
-): Promise<string> {
-    progress.report({ message: msgDownloading })
-
-    const ssmInstaller = await downloadCliSource(awsClis['session-manager-plugin'], tempDir, timeout)
-    const outDir = path.join(getToolkitLocalCliPath(), 'sessionmanagerplugin')
-    const finalPath = path.join(getToolkitLocalCliPath(), getOsCommand(awsClis['session-manager-plugin']))
-    const TimedProcess = ChildProcess.extend({ timeout, rejectOnError: true, rejectOnErrorCode: true })
-
-    getLogger('channel').info(`Installing SSM CLI from ${ssmInstaller} to ${outDir}...`)
-    progress.report({ message: msgInstallingLocal })
-
-    return handleError(install())
-
-    async function install() {
-        switch (process.platform) {
-            case 'darwin':
-                return installOnMac()
-            case 'win32':
-                return installOnWindows()
-            case 'linux':
-                return installOnLinux()
-            default:
-                throw new InvalidPlatformError(
-                    `Platform ${process.platform} is not supported for CLI autoinstallation.`
-                )
-        }
-    }
-
-    async function installOnMac() {
-        const tempPath = path.join(tempDir, 'tmp')
-        const pkgArgs = ['--expand', 'session-manager-plugin.pkg', tempPath]
-        const tarArgs = ['-xzf', path.join(tempPath, 'Payload')]
-        await new TimedProcess('pkgutil', pkgArgs).run({ spawnOptions: { cwd: tempDir } })
-        await new TimedProcess('tar', tarArgs).run({ spawnOptions: { cwd: tempPath } })
-
-        fs.copySync(path.join(tempPath, 'usr', 'local', 'sessionmanagerplugin'), outDir, {
-            recursive: true,
-        })
-
-        return finalPath
-    }
-
-    async function installOnWindows() {
-        new admZip(ssmInstaller).extractAllTo(tempDir, true)
-        const secondZip = path.join(tempDir, 'package.zip')
-        new admZip(secondZip).extractAllTo(outDir, true)
-
-        return finalPath
-    }
-
-    async function installOnLinux() {
-        const ssmDir = path.dirname(ssmInstaller)
-        // extract deb file (using ar) to ssmInstaller dir
-        await new TimedProcess('ar', ['-x', ssmInstaller]).run({ spawnOptions: { cwd: ssmDir } })
-        // extract data.tar.gz to CLI dir
-        const tarArgs = ['-xzf', path.join(ssmDir, 'data.tar.gz')]
-        await new TimedProcess('tar', tarArgs).run({ spawnOptions: { cwd: ssmDir } }),
-            fs.mkdirSync(outDir, { recursive: true })
-        fs.copySync(path.join(ssmDir, 'usr', 'local', 'sessionmanagerplugin'), outDir, {
-            recursive: true,
-        })
-
-        return finalPath
-    }
-}
-
-/**
- * @throws {@link CancellationError} if the install times out or the user cancels
- */
-export async function getOrInstallCli(
-    cli: AwsClis,
-    confirm: boolean,
-    window: Window = Window.vscode()
-): Promise<string> {
-    if (DevSettings.instance.get('forceInstallTools', false)) {
-        return installCli(cli, confirm, window)
-    } else {
-        return (await getCliCommand(awsClis[cli])) ?? installCli(cli, confirm, window)
-    }
-}
-
-// TODO: uncomment for AWS CLI installation
-
-/**
- * TODO: AWS CLI install on Linux requires sudo!!!
- */
-// async function installAwsCli(
-//     tempDir: string,
-//     progress: vscode.Progress<{ message?: string; increment?: number }>
-// ): Promise<string> {
-//     progress.report({ message: msgDownloading })
-//     const awsInstaller = await downloadCliSource(AWS_CLIS.aws, tempDir)
-//     fs.chmodSync(awsInstaller, 0o700)
-
-//     getLogger('channel').info(`Installing AWS CLI from ${awsInstaller} to ${getToolkitCliDir()}...`)
-//     progress.report({ message: msgInstallingLocal })
-//     switch (process.platform) {
-//         case 'win32': {
-//             return await installToolkitLocalMsi(awsInstaller)
-//         }
-//         case 'darwin': {
-//             // edit config file: https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2-mac.html#cliv2-mac-install-cmd-current-user
-//             const xmlPath = path.join(tempDir, 'choices.xml')
-//             fs.writeFileSync(
-//                 xmlPath,
-//                 `<?xml version="1.0" encoding="UTF-8"?>
-//             <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-//             <plist version="1.0">
-//                 <array>
-//                 <dict>
-//                     <key>choiceAttribute</key>
-//                     <string>customLocation</string>
-//                     <key>attributeSetting</key>
-//                     <string>${getToolkitLocalCliPath()}</string>
-//                     <key>choiceIdentifier</key>
-//                     <string>default</string>
-//                 </dict>
-//                 </array>
-//             </plist>`
-//             )
-//             // install
-//             return await installToolkitLocalPkg(
-//                 awsInstaller,
-//                 '--target',
-//                 'CurrentUserHomeDirectory',
-//                 '--applyChoiceChangesXML',
-//                 xmlPath
-//             )
-//         }
-//         case 'linux': {
-//             return await installToolkitLocalLinuxAwsCli(awsInstaller)
-//         }
-//         default: {
-//             throw new InvalidPlatformError(`Unsupported platform for CLI installation: ${process.platform}`)
-//         }
-//     }
-// }
-
-// async function installToolkitLocalMsi(msiPath: string): Promise<string> {
-//     if (process.platform !== 'win32') {
-//         throw new InvalidPlatformError(`Cannot install MSI files on operating system: ${process.platform}`)
-//     }
-//     const result = await new ChildProcess(
-//         true,
-//         'msiexec',
-//         undefined,
-//         '/a',
-//         msiPath,
-//         '/quiet',
-//         // use base dir: installer installs to ./Amazon/AWSCLIV2
-//         `TARGETDIR=${vscode.Uri.file(getToolkitCliDir()).fsPath}`
-//     ).run()
-//     if (result.exitCode !== 0) {
-//         throw new InstallerError(`Installation of MSI file ${msiPath} failed: Error Code ${result.exitCode}`)
-//     }
-
-//     return path.join(getToolkitCliDir(), getOsCommand(AWS_CLIS.aws))
-// }
-
-// async function installToolkitLocalPkg(pkgPath: string, ...args: string[]): Promise<string> {
-//     if (process.platform !== 'darwin') {
-//         throw new InvalidPlatformError(`Cannot install pkg files on operating system: ${process.platform}`)
-//     }
-//     const result = await new ChildProcess(true, 'installer', undefined, '--pkg', pkgPath, ...args).run()
-//     if (result.exitCode !== 0) {
-//         throw new InstallerError(`Installation of PKG file ${pkgPath} failed: Error Code ${result.exitCode}`)
-//     }
-
-//     return path.join(getToolkitCliDir(), getOsCommand(AWS_CLIS.aws))
-// }
-
-/**
- * TODO: THIS REQUIRES SUDO!!! Potentially drop support or look into adding; unsure how we would handle having to input a password.
- */
-// async function installToolkitLocalLinuxAwsCli(archivePath: string): Promise<string> {
-//     if (process.platform !== 'linux') {
-//         throw new InvalidPlatformError(`Cannot use Linux installer on operating system: ${process.platform}`)
-//     }
-//     const dirname = path.join(path.parse(archivePath).dir, path.parse(archivePath).name)
-//     const installDir = path.join(getToolkitCliDir(), 'Amazon', 'AWSCLIV2')
-//     new admZip(archivePath).extractAllTo(dirname, true)
-//     const result = await new ChildProcess(
-//         true,
-//         'sh',
-//         undefined,
-//         path.join(dirname, 'aws', 'install'),
-//         '-i',
-//         installDir,
-//         '-b',
-//         installDir
-//     ).run()
-//     if (result.exitCode !== 0) {
-//         throw new InstallerError(
-//             `Installation of Linux CLI archive ${archivePath} failed: Error Code ${result.exitCode}`
-//         )
-//     }
-
-//     return path.join(getToolkitCliDir(), getOsCommand(AWS_CLIS.aws))
-// }
-
-// export async function hardLinkToCliDir(dir: string, command: Cli): Promise<void> {
-//     const existingPath = path.join(dir, getOsCommand(command))
-//     const newPath = getCliPath(command)
-//     return new Promise((resolve, reject) => {
-//         getLogger().debug(`Attempting to hard link ${existingPath} to ${newPath}...`)
-//         fs.link(existingPath, newPath, err => {
-//             if (err) {
-//                 const message = `Toolkit could not create a hard link for ${existingPath} to ${newPath}`
-//                 getLogger().error(`${message}: %s`, err)
-//                 reject(new InstallerError(message))
-//             }
-//             resolve()
-//         })
-//     })
-// }
diff --git a/src/shared/utilities/collectionUtils.ts b/src/shared/utilities/collectionUtils.ts
deleted file mode 100644
index a5ac506888a..00000000000
--- a/src/shared/utilities/collectionUtils.ts
+++ /dev/null
@@ -1,366 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { AsyncCollection, toCollection } from './asyncCollection'
-import { SharedProp, AccumulableKeys, Coalesce } from './tsUtils'
-
-export function union<T>(a: Iterable<T>, b: Iterable<T>): Set<T> {
-    const result = new Set<T>()
-
-    for (const item of a) {
-        result.add(item)
-    }
-
-    for (const item of b) {
-        result.add(item)
-    }
-
-    return result
-}
-
-export function intersection<T>(sequence1: Iterable<T>, sequence2: Iterable<T>): Set<T> {
-    const set2 = new Set(sequence2)
-
-    return new Set(filter(sequence1, item => set2.has(item)))
-}
-
-export function difference<T>(sequence1: Iterable<T>, sequence2: Iterable<T>): Set<T> {
-    const set2 = new Set(sequence2)
-
-    return new Set(filter(sequence1, item => !set2.has(item)))
-}
-
-export function complement<T>(sequence1: Iterable<T>, sequence2: Iterable<T>): Set<T> {
-    const set1 = new Set(sequence1)
-
-    return new Set(filter(sequence2, item => !set1.has(item)))
-}
-
-export async function toArrayAsync<T>(items: AsyncIterable<T>): Promise<T[]> {
-    const result: T[] = []
-
-    for await (const item of items) {
-        result.push(item)
-    }
-
-    return result
-}
-
-export function toMap<TKey, TValue>(
-    items: Iterable<TValue>,
-    keySelector: (item: TValue) => TKey | undefined
-): Map<TKey, TValue> {
-    const result = new Map<TKey, TValue>()
-
-    for (const item of items) {
-        const key = keySelector(item)
-        if (key) {
-            if (result.has(key)) {
-                throw new Error(`Conflict: Multiple items have the key '${key}'`)
-            }
-
-            result.set(key, item)
-        }
-    }
-
-    return result
-}
-
-export function toRecord<T, K extends PropertyKey>(keys: Iterable<K>, fn: (key: K) => T): { [P in K]: T } {
-    const result = {} as Record<K, T>
-
-    for (const key of keys) {
-        result[key] = fn(key)
-    }
-
-    return result
-}
-
-export async function toMapAsync<TKey, TValue>(
-    items: AsyncIterable<TValue>,
-    keySelector: (item: TValue) => TKey | undefined
-): Promise<Map<TKey, TValue>> {
-    const result = new Map<TKey, TValue>()
-
-    for await (const item of items) {
-        const key = keySelector(item)
-        if (key) {
-            if (result.has(key)) {
-                throw new Error(`Conflict: Multiple items have the key '${key}'`)
-            }
-
-            result.set(key, item)
-        }
-    }
-
-    return result
-}
-
-export function updateInPlace<TKey, TValue>(
-    target: Map<TKey, TValue>,
-    keys: Iterable<TKey>,
-    update: (key: TKey) => void,
-    create: (key: TKey) => TValue
-) {
-    const keySet = new Set(keys)
-
-    for (const key of difference(target.keys(), keySet)) {
-        target.delete(key)
-    }
-
-    for (const key of target.keys()) {
-        update(key)
-    }
-
-    for (const key of complement(target.keys(), keySet)) {
-        target.set(key, create(key))
-    }
-}
-
-export function* map<TIn, TOut>(sequence: Iterable<TIn>, selector: (item: TIn) => TOut): IterableIterator<TOut> {
-    for (const item of sequence) {
-        yield selector(item)
-    }
-}
-
-export function filter<T>(sequence: Iterable<T>, condition: (item: T) => boolean): T[] {
-    const result: T[] = []
-
-    for (const item of sequence) {
-        if (condition(item)) {
-            result.push(item)
-        }
-    }
-
-    return result
-}
-
-/**
- * Gets the first item matching predicate, or undefined.
- */
-export async function findAsync<T>(
-    sequence: Iterable<T>,
-    predicate: (item: T) => Promise<boolean>
-): Promise<T | undefined> {
-    for (const item of sequence) {
-        if (await predicate(item)) {
-            return item
-        }
-    }
-    return undefined
-}
-
-export async function* filterAsync<T>(
-    sequence: Iterable<T>,
-    condition: (item: T) => Promise<boolean>
-): AsyncIterable<T> {
-    for (const item of sequence) {
-        if (await condition(item)) {
-            yield item
-        }
-    }
-}
-
-export async function first<T>(sequence: AsyncIterable<T>): Promise<T | undefined> {
-    const head = await take(sequence, 1)
-
-    return head.length > 0 ? head[0] : undefined
-}
-
-export async function take<T>(sequence: AsyncIterable<T>, count: number): Promise<T[]> {
-    if (count <= 0) {
-        return []
-    }
-
-    const result: T[] = []
-
-    for await (const item of sequence) {
-        result.push(item)
-
-        if (result.length >= count) {
-            break
-        }
-    }
-
-    return result
-}
-
-export interface getPaginatedAwsCallIterParams<TRequest, TResponse> {
-    awsCall: (request: TRequest) => Promise<TResponse>
-    nextTokenNames: {
-        request: keyof TRequest
-        response: keyof TResponse
-    }
-    request: TRequest
-}
-
-/**
- * Generates an iterator representing a paginated AWS call from a request and an AWS SDK call
- * Each next() call will make a new request with the previous request's nextToken.
- * @param params Iterator params
- */
-export async function* getPaginatedAwsCallIter<TRequest, TResponse>(
-    params: getPaginatedAwsCallIterParams<TRequest, TResponse>
-): AsyncIterator<TResponse> {
-    let nextToken: string | undefined = undefined
-
-    while (true) {
-        const response: TResponse = await params.awsCall({
-            ...params.request,
-            [params.nextTokenNames.request]: nextToken,
-        })
-        if (response[params.nextTokenNames.response]) {
-            nextToken = response[params.nextTokenNames.response] as any as string
-        } else {
-            // done; returns last response with { done: true }
-            return response
-        }
-
-        yield response
-    }
-}
-
-/**
- * Represents an iterator that tranforms another iterator into an array of QuickPickItems.
- * Additionally, has a reset functionality to reset the iterator to its initial state.
- * @template TIteratorOutput Iterator output value type
- * @template TTransformerOutput Transformer output value type
- */
-export class IteratorTransformer<TIteratorOutput, TTransformerOutput> {
-    /**
-     * @param iteratorFactory Function that returns an iterator, with all default state values set. E.g. `collectionUtils.getPaginatedAwsCallIter`
-     * @param transform Function which transforms a response from the iterator into an array of `vscode.QuickPickItem`s.
-     */
-    public constructor(
-        private readonly iteratorFactory: () => AsyncIterator<TIteratorOutput>,
-        private readonly transform: (response: TIteratorOutput) => TTransformerOutput[]
-    ) {}
-
-    /**
-     * Generates an iterator which returns an array of formatted QuickPickItems on `.next()`
-     */
-    public async *createPickIterator(): AsyncIterator<TTransformerOutput[]> {
-        const iterator = this.iteratorFactory()
-        while (true) {
-            const nextResult = await iterator.next()
-            const transformedResult = this.transform(nextResult.value)
-
-            // return (instead of yield) marks final value as done
-            if (nextResult.done) {
-                return transformedResult
-            }
-
-            yield transformedResult
-        }
-    }
-}
-
-/**
- * Push if condition is true, useful for adding CLI arguments, and avoiding this kind of situation:
- * if (x && y) {
- *     arr.push(item2)
- *     if(z) {
- *         arr.push(item)
- *     }
- * }
- * @param arr The array to push to
- * @param condition conditional that determines if we will push to the array
- * @param elements The additional items to append to the array
- */
-export function pushIf<T>(arr: T[], condition: boolean, ...elements: T[]): T[] {
-    if (condition) {
-        arr.push(...elements)
-    }
-    return arr
-}
-
-/**
- * Nearly equivalent to {@link Object.assign} except that `undefined` values are ignored.
- *
- * Directly mutates {@link target}. The function signature should be read as assigning {@link data}
- * _into_ {@link target}.
- */
-export function assign<T extends Record<any, any>, U extends Partial<T>>(data: T, target: U): asserts target is T & U {
-    for (const [k, v] of Object.entries(data)) {
-        if (v !== undefined) {
-            target[k as keyof U] = v
-        }
-    }
-}
-
-/** Recursively delete undefined key/value pairs */
-export function stripUndefined<T extends Record<string, any>>(
-    obj: T
-): asserts obj is { [P in keyof T]-?: NonNullable<T[P]> } {
-    Object.keys(obj).forEach(key => {
-        if (obj[key] === undefined) {
-            delete obj[key]
-        } else if (typeof obj[key] === 'object') {
-            stripUndefined(obj[key])
-        }
-    })
-}
-
-export function isAsyncIterable(obj: any): obj is AsyncIterable<unknown> {
-    return obj && typeof obj === 'object' && typeof obj[Symbol.asyncIterator] === 'function'
-}
-
-/**
- * Converts a 'paged' API request to a collection of sequential API requests
- * based off a 'mark' (the paginated token field) and a `prop` which is an
- * Accumulable property on the response interface.
- *
- * @param requester Asynchronous function to make the API requests with
- * @param request Initial request to apply to the API calls
- * @param mark A property name of the paginated token field shared by the input/output shapes
- * @param prop A property name of an 'Accumulable' field in the output shape
- * @returns An {@link AsyncCollection} resolving to the type described by the `prop` field
- */
-export function pageableToCollection<
-    TRequest,
-    TResponse,
-    TTokenProp extends SharedProp<TRequest, TResponse>,
-    TTokenType extends TRequest[TTokenProp] & TResponse[TTokenProp],
-    TResult extends AccumulableKeys<TResponse> = never
->(
-    requester: (request: TRequest) => Promise<TResponse>,
-    request: TRequest,
-    mark: TTokenProp,
-    prop?: TResult
-): AsyncCollection<Coalesce<TResponse[TResult], TResponse>> {
-    async function* gen() {
-        do {
-            const response: TResponse = await requester(request)
-            const result = (prop ? response[prop] : response) as Coalesce<TResponse[TResult], TResponse>
-            if (!response[mark]) {
-                return result
-            }
-            yield result
-            request[mark] = response[mark] as TTokenType
-        } while (request[mark])
-    }
-
-    return toCollection(gen)
-}
-
-/**
- * Converts an iterable of promises into an unordered stream of values.
- *
- * The resulting stream will throw if any of the promises are rejected.
- */
-export async function* toStream<T>(values: Iterable<Promise<T>>): AsyncGenerator<T, void> {
-    const unresolved = new Map<number, Promise<T>>()
-    for (const promise of values) {
-        const index = unresolved.size
-        unresolved.set(
-            index,
-            promise.then(val => (unresolved.delete(index), val))
-        )
-    }
-
-    while (unresolved.size > 0) {
-        yield Promise.race(unresolved.values())
-    }
-}
diff --git a/src/shared/utilities/debuggerUtils.ts b/src/shared/utilities/debuggerUtils.ts
deleted file mode 100644
index 111e4e83916..00000000000
--- a/src/shared/utilities/debuggerUtils.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import { getPortPromise } from 'portfinder'
-
-export async function getStartPort(port: number = 5858): Promise<number> {
-    return getPortPromise({ port: port })
-}
diff --git a/src/shared/utilities/editorUtilities.ts b/src/shared/utilities/editorUtilities.ts
deleted file mode 100644
index 3c8c93fb1a6..00000000000
--- a/src/shared/utilities/editorUtilities.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as _path from 'path'
-import { Settings } from '../settings'
-
-const defaultTabSize = 4
-
-export function getTabSizeSetting(): number {
-    return Settings.instance.getSection('editor').get('tabSize', defaultTabSize)
-}
-
-export function getInlineSuggestEnabled(): boolean {
-    return Settings.instance.getSection('editor').get('inlineSuggest.enabled', true)
-}
diff --git a/src/shared/utilities/functionUtils.ts b/src/shared/utilities/functionUtils.ts
deleted file mode 100644
index 3bf7f1ac45d..00000000000
--- a/src/shared/utilities/functionUtils.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * Creates a function that always returns a 'shared' Promise.
- *
- * This is essentially a 'debounce' or unkeyed 'lock' for async functions.
- *
- * #### Example
- * ```ts
- * const foo = shared(async () => console.log('bar'))
- *
- * const f1 = foo() // 'bar' is printed
- * const f2 = foo() // nothing happens
- *
- * // Same event loop, equal by reference
- * assert.strictEqual(f1, f2)
- *
- * // The promise is not freed until the next event loop
- * await f1
- *
- * const f3 = foo() // 'bar' is printed
- * assert.notStrictEqual(f1, f3)
- * ```
- */
-export function shared<T, U extends any[]>(fn: (...args: U) => Promise<T>): (...args: U) => Promise<T> {
-    let p: Promise<T> | undefined
-
-    return (...args) => (p ??= fn(...args).finally(() => (p = undefined)))
-}
-
-/**
- * Special-case of `memoize`. Ensures a function is executed only once.
- */
-export function once<T>(fn: () => T): () => T {
-    let val: T
-    let ran = false
-
-    return () => (ran ? val : ((val = fn()), (ran = true), val))
-}
-
-/**
- * Creates a new function that stores the result of a call.
- *
- * ### Important
- * This currently uses an extremely simple mechanism for creating keys from parameters.
- * Objects are effectively treated as a single key, while primitive values will behave as
- * expected with a few very uncommon exceptions.
- */
-export function memoize<T, U extends any[]>(fn: (...args: U) => T): (...args: U) => T {
-    const cache: { [key: string]: T | undefined } = {}
-
-    return (...args) => (cache[args.map(String).join(':')] ??= fn(...args))
-}
diff --git a/src/shared/utilities/messages.ts b/src/shared/utilities/messages.ts
deleted file mode 100644
index 9d4c967b800..00000000000
--- a/src/shared/utilities/messages.ts
+++ /dev/null
@@ -1,221 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as nls from 'vscode-nls'
-import * as localizedText from '../localizedText'
-import { getLogger, showLogOutputChannel } from '../../shared/logger'
-import { Window } from '../../shared/vscode/window'
-import { Env } from '../../shared/vscode/env'
-import globals from '../extensionGlobals'
-import { getIdeProperties, isCloud9 } from '../extensionUtilities'
-import { sleep } from './timeoutUtils'
-import { Timeout } from './timeoutUtils'
-import { addCodiconToString } from './textUtilities'
-import { getIcon, codicon } from '../icons'
-
-export const messages = {
-    editCredentials(icon: boolean) {
-        // codicons are not supported in showInformationMessage. (vscode 1.71)
-        const icon_ = icon ? codicon`${getIcon('vscode-edit')}` + ' ' : ''
-        return localize('AWS.credentials.edit', '{0}Edit Credentials', icon_)
-    },
-}
-
-const localize = nls.loadMessageBundle()
-
-export function makeFailedWriteMessage(filename: string): string {
-    const message = localize('AWS.failedToWrite', '{0}: Failed to write "{1}".', getIdeProperties().company, filename)
-
-    return message
-}
-
-function showMessageWithItems(
-    message: string,
-    kind: 'info' | 'warn' | 'error' = 'error',
-    items: string[] = [],
-    window: Window = globals.window
-): Thenable<string | undefined> {
-    switch (kind) {
-        case 'info':
-            return window.showInformationMessage(message, ...items)
-        case 'warn':
-            return window.showWarningMessage(message, ...items)
-        case 'error':
-        default:
-            return window.showErrorMessage(message, ...items)
-    }
-}
-
-/**
- * Shows a non-modal message with a linkbutton.
- *
- * @param message  Message text
- * @param url URL to visit when `urlItem` is clicked
- * @param urlItem URL button text (default: "View Documentation")
- * @param kind  Kind of message to show
- * @param extraItems  Extra buttons shown _before_ the "View Documentation" button
- * @returns Promise that resolves when a button is clicked or the message is
- * dismissed, and returns the selected button text.
- */
-export async function showMessageWithUrl(
-    message: string,
-    url: string | vscode.Uri,
-    urlItem: string = localizedText.viewDocs,
-    kind: 'info' | 'warn' | 'error' = 'error',
-    extraItems: string[] = []
-): Promise<string | undefined> {
-    const uri = typeof url === 'string' ? vscode.Uri.parse(url) : url
-    const items = [...extraItems, urlItem]
-
-    const p = showMessageWithItems(message, kind, items)
-    return p.then<string | undefined>(selection => {
-        if (selection === urlItem) {
-            vscode.env.openExternal(uri)
-        }
-        return selection
-    })
-}
-
-/**
- * Shows a non-modal message with a "View Logs" button.
- *
- * @param message  Message text
- * @param window  Window
- * @param kind  Kind of message to show
- * @param extraItems  Extra buttons shown _before_ the "View Logs" button
- * @returns	Promise that resolves when a button is clicked or the message is
- * dismissed, and returns the selected button text.
- */
-export async function showViewLogsMessage(
-    message: string,
-    window: Window = globals.window,
-    kind: 'info' | 'warn' | 'error' = 'error',
-    extraItems: string[] = []
-): Promise<string | undefined> {
-    const logsItem = localize('AWS.generic.message.viewLogs', 'View Logs...')
-    const items = [...extraItems, logsItem]
-
-    const p = showMessageWithItems(message, kind, items, window)
-    return p.then<string | undefined>(selection => {
-        if (selection === logsItem) {
-            showLogOutputChannel()
-        }
-        return selection
-    })
-}
-
-/**
- * Shows a modal confirmation (warning) message with buttons to confirm or cancel.
- *
- * @param prompt the message to show.
- * @param confirm the confirmation button text.
- * @param cancel the cancel button text.
- * @param window the window.
- */
-export async function showConfirmationMessage(
-    { prompt, confirm, cancel, type }: { prompt: string; confirm?: string; cancel?: string; type?: 'info' | 'warning' },
-    window: Window = globals.window
-): Promise<boolean> {
-    const confirmItem: vscode.MessageItem = { title: confirm ?? localizedText.confirm }
-    const cancelItem: vscode.MessageItem = { title: cancel ?? localizedText.cancel, isCloseAffordance: true }
-
-    if (type === 'info') {
-        const selection = await window.showInformationMessage(prompt, { modal: true }, confirmItem, cancelItem)
-        return selection?.title === confirmItem.title
-    } else {
-        const selection = await window.showWarningMessage(prompt, { modal: true }, confirmItem, cancelItem)
-        return selection?.title === confirmItem.title
-    }
-}
-
-/**
- * Shows an output channel and writes a line to it and also to the logs (as info).
- *
- * @param message the line to write.
- * @param outputChannel the output channel to write to.
- */
-export function showOutputMessage(message: string, outputChannel: vscode.OutputChannel) {
-    outputChannel.show(true)
-    outputChannel.appendLine(message)
-    getLogger().info(message)
-}
-
-/**
- * Attaches a Timeout object to VS Code's Progress notification system.
- * Not exported since it isn't used (yet)
- * @see showMessageWithCancel for an example usage
- */
-async function showProgressWithTimeout(
-    options: vscode.ProgressOptions,
-    timeout: Timeout,
-    window: Window = globals.window
-): Promise<vscode.Progress<{ message?: string; increment?: number }>> {
-    // Cloud9 doesn't support Progress notifications. User won't be able to cancel.
-    if (isCloud9()) {
-        options.location = vscode.ProgressLocation.Window
-    }
-
-    const progressPromise: Promise<vscode.Progress<{ message?: string; increment?: number }>> = new Promise(resolve => {
-        window.withProgress(options, function (progress, token) {
-            token.onCancellationRequested(() => timeout.cancel())
-            resolve(progress)
-            return new Promise(timeout.onCompletion)
-        })
-    })
-
-    return progressPromise
-}
-
-/**
- * Presents the user with a notification to cancel a pending process.
- *
- * @param message Message to display
- * @param timeout Timeout object that will be killed if the user clicks 'Cancel'
- * @param window Window to display the message on (default: globals.window)
- *
- * @returns Progress object allowing the caller to update progress status
- */
-export async function showMessageWithCancel(
-    message: string,
-    timeout: Timeout,
-    window: Window = globals.window
-): Promise<vscode.Progress<{ message?: string; increment?: number }>> {
-    const progressOptions = { location: vscode.ProgressLocation.Notification, title: message, cancellable: true }
-    return showProgressWithTimeout(progressOptions, timeout, window)
-}
-
-/**
- * Shows a "spinner" / progress message for `duration` milliseconds.
- *
- * @param message Message to display
- * @param duration Timeout duration (milliseconds)
- *
- * @returns prompts message to user on with progress
- */
-export async function showTimedMessage(message: string, duration: number) {
-    vscode.window.withProgress(
-        {
-            location: vscode.ProgressLocation.Notification,
-            title: message,
-            cancellable: false,
-        },
-        async () => {
-            await sleep(duration)
-        }
-    )
-}
-
-export async function copyToClipboard(
-    data: string,
-    label?: string,
-    window: Window = vscode.window,
-    env: Env = vscode.env
-): Promise<void> {
-    await env.clipboard.writeText(data)
-    const message = localize('AWS.explorerNode.copiedToClipboard', 'Copied {0} to clipboard', label)
-    window.setStatusBarMessage(addCodiconToString('clippy', message), 5000)
-    getLogger().verbose('copied %s to clipboard: %O', label ?? '', data)
-}
diff --git a/src/shared/utilities/textDocumentUtilities.ts b/src/shared/utilities/textDocumentUtilities.ts
deleted file mode 100644
index 1594245fcdf..00000000000
--- a/src/shared/utilities/textDocumentUtilities.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as _path from 'path'
-import * as vscode from 'vscode'
-import { getTabSizeSetting } from './editorUtilities'
-
-/**
- * If the specified document is currently open, and marked as dirty, it is saved.
- */
-export async function saveDocumentIfDirty(documentPath: string): Promise<void> {
-    const path = _path.normalize(vscode.Uri.file(documentPath).fsPath)
-    const document = vscode.workspace.textDocuments.find(doc => {
-        if (!doc.isDirty) {
-            return false
-        }
-
-        if (_path.normalize(doc.uri.fsPath) !== path) {
-            return false
-        }
-
-        return true
-    })
-
-    if (document) {
-        await document.save()
-    }
-}
-
-/**
- * Determine the tab width used by the editor.
- *
- * @param editor The editor for which to determine the tab width.
- */
-export function getTabSize(editor?: vscode.TextEditor): number {
-    const tabSize = !editor ? undefined : editor.options.tabSize
-
-    switch (typeof tabSize) {
-        case 'number':
-            return tabSize
-        case 'string':
-            return Number.parseInt(tabSize, 10)
-        default:
-            return getTabSizeSetting()
-    }
-}
diff --git a/src/shared/utilities/textUtilities.ts b/src/shared/utilities/textUtilities.ts
deleted file mode 100644
index bf35ecdd180..00000000000
--- a/src/shared/utilities/textUtilities.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as crypto from 'crypto'
-import * as fs from 'fs'
-import * as moment from 'moment'
-import { default as stripAnsi } from 'strip-ansi'
-import { isCloud9 } from '../extensionUtilities'
-import { getLogger } from '../logger'
-
-export function removeAnsi(text: string): string {
-    try {
-        return stripAnsi(text)
-    } catch (err) {
-        getLogger().error('Unexpected error while removing Ansi from text: %O', err as Error)
-
-        // Fall back to original text so callers aren't impacted
-        return text
-    }
-}
-
-/**
- * Hashes are not guaranteed to be stable across toolkit versions. We may change the implementation.
- */
-export function getStringHash(text: string): string {
-    const hash = crypto.createHash('sha256')
-
-    hash.update(text)
-
-    return hash.digest('hex')
-}
-
-/**
- * Temporary util while Cloud9 does not have codicon support
- */
-export function addCodiconToString(codiconName: string, text: string): string {
-    return isCloud9() ? text : `$(${codiconName}) ${text}`
-}
-
-/**
- * Go allows function signatures to be multi-line, so we should parse these into something more usable.
- *
- * @param text String to parse
- *
- * @returns Final output without any new lines or comments
- */
-export function stripNewLinesAndComments(text: string): string {
-    const blockCommentRegExp = /\/\*.*\*\//
-    let result: string = ''
-
-    text.split(/\r|\n/).map(s => {
-        const commentStart: number = s.search(/\/\//)
-        s = s.replace(blockCommentRegExp, '')
-        result += commentStart === -1 ? s : s.substring(0, commentStart)
-    })
-
-    return result
-}
-
-/**
- * Inserts some text into a file.
- * Very slow for large files so don't use it for that purpose.
- *
- * @param filePath Path to the file to write to
- * @param text String that will be inserted
- * @param line Optional line number to use (0 indexed)
- */
-export async function insertTextIntoFile(text: string, filePath: string, line: number = 0) {
-    const oldData: Buffer = fs.readFileSync(filePath)
-    const lines: string[] = oldData.toString().split(/\r?\n/)
-    lines.splice(line, 0, text)
-
-    const newData: Buffer = Buffer.from(lines.join('\n'))
-    const fd: number = fs.openSync(filePath, 'w+')
-
-    fs.writeSync(fd, newData, 0, newData.length, 0)
-
-    fs.close(fd, err => {
-        if (err) {
-            throw err
-        }
-    })
-}
-
-export function toTitleCase(str: string): string {
-    return str.charAt(0).toUpperCase().concat(str.slice(1))
-}
-
-export function getRelativeDate(from: Date, now: Date = new Date()): string {
-    // Prevent clock skew showing future date
-    return moment(from).subtract(5, 'second').from(now)
-}
diff --git a/src/shared/utilities/timeoutUtils.ts b/src/shared/utilities/timeoutUtils.ts
deleted file mode 100644
index 85ea34fbd49..00000000000
--- a/src/shared/utilities/timeoutUtils.ts
+++ /dev/null
@@ -1,281 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import globals from '../extensionGlobals'
-import { CancellationToken, EventEmitter, Event } from 'vscode'
-
-export const timeoutExpiredMessage = 'Timeout token expired'
-export const timeoutCancelledMessage = 'Timeout token cancelled'
-export const timeoutUnexpectedResolve = 'Promise resolved with an unexpected object'
-
-type CancellationAgent = 'user' | 'timeout'
-export class CancellationError extends Error {
-    public constructor(public readonly agent: CancellationAgent) {
-        super(agent === 'user' ? timeoutCancelledMessage : timeoutExpiredMessage)
-    }
-
-    public static isUserCancelled(err: any): err is CancellationError & { agent: 'user' } {
-        return err instanceof CancellationError && err.agent === 'user'
-    }
-
-    public static isExpired(err: any): err is CancellationError & { agent: 'timeout' } {
-        return err instanceof CancellationError && err.agent === 'timeout'
-    }
-}
-
-export interface CancelEvent {
-    readonly agent: CancellationAgent
-}
-
-/** A {@link CancellationToken} that provides a reason for the cancellation event. */
-interface TypedCancellationToken extends CancellationToken {
-    readonly onCancellationRequested: Event<CancelEvent>
-}
-
-/**
- * Timeout that can handle both cancellation token-style and time limit-style timeout situations. Timeouts
- * cannot be used after 'complete' has been called or if the Timeout expired.
- *
- * @param timeoutLength Length of timeout duration (in ms)
- */
-export class Timeout {
-    private _startTime: number
-    private _endTime: number
-    private readonly _timeoutLength: number
-    private _timerTimeout: NodeJS.Timeout
-    private _completionReason?: CancellationAgent | 'completed'
-    private readonly _token: TypedCancellationToken
-    private readonly _onCancellationRequestedEmitter = new EventEmitter<CancelEvent>()
-    private readonly _onCompletionEmitter = new EventEmitter<void>()
-    public readonly onCompletion = this._onCompletionEmitter.event
-
-    public constructor(timeoutLength: number) {
-        this._startTime = globals.clock.Date.now()
-        this._endTime = this._startTime + timeoutLength
-        this._timeoutLength = timeoutLength
-
-        this._token = {
-            isCancellationRequested: false,
-            onCancellationRequested: this._onCancellationRequestedEmitter.event,
-        }
-
-        Object.defineProperty(this._token, 'isCancellationRequested', {
-            get: () => this._completionReason === 'user' || this._completionReason === 'timeout',
-        })
-
-        this._timerTimeout = globals.clock.setTimeout(() => this.stop('timeout'), timeoutLength)
-    }
-
-    /**
-     * Time (in milliseconds) remaining since this Timeout object was initialized.
-     *
-     * Minimum is 0.
-     */
-    public get remainingTime(): number {
-        const remainingTime = this._endTime - globals.clock.Date.now()
-
-        return remainingTime > 0 ? remainingTime : 0
-    }
-
-    /**
-     * True when the Timeout has completed
-     */
-    public get completed(): boolean {
-        return !!this._completionReason
-    }
-
-    /**
-     * Updates the timer to timeout in timeout length from now
-     */
-    public refresh() {
-        if (this.completed) {
-            return
-        }
-
-        // These will not align, but we don't have visibility into a NodeJS.Timeout
-        // so remainingtime will be approximate. Timers are approximate anyway and are
-        // not highly accurate in when they fire.
-        this._endTime = globals.clock.Date.now() + this._timeoutLength
-        this._timerTimeout = this._timerTimeout.refresh()
-    }
-
-    /**
-     * Returns a token suitable for use in-place of VS Code's {@link CancellationToken}
-     */
-    public get token(): TypedCancellationToken {
-        return this._token
-    }
-
-    /**
-     * Returns the elapsed time (ms) from the initial Timeout object creation
-     */
-    public get elapsedTime(): number {
-        return (this.completed ? this._endTime : globals.clock.Date.now()) - this._startTime
-    }
-
-    private stop(type: CancellationAgent | 'completed'): void {
-        if (this.completed) {
-            return
-        }
-
-        this._completionReason = type
-        this._endTime = globals.clock.Date.now()
-        globals.clock.clearTimeout(this._timerTimeout)
-
-        if (type !== 'completed') {
-            this._onCancellationRequestedEmitter.fire({ agent: type })
-        }
-
-        this._onCancellationRequestedEmitter.dispose()
-        this._onCompletionEmitter.fire()
-        this._onCompletionEmitter.dispose()
-    }
-
-    /**
-     * Cancels the timer, notifying any subscribing of the cancellation and locking in the time.
-     *
-     * This always assumes cancellation was caused by the user. Use {@link dispose} when the Timeout is no longer needed.
-     */
-    public cancel(): void {
-        this.stop('user')
-    }
-
-    /**
-     * Marks the Timeout token as being completed, preventing further use and locking in the elapsed time.
-     *
-     * Any listeners still using this token will receive a 'cancelled' event.
-     */
-    public dispose(): void {
-        this.stop('completed')
-    }
-
-    /**
-     * Turns the `Timeout` object into a Promise that resolves on completion or rejects on cancellation/expiration.
-     *
-     * Prefer using {@link token} when possible as using Promises is not as robust.
-     */
-    public promisify(): Promise<void | never> {
-        if (this._completionReason === 'completed') {
-            return Promise.resolve()
-        } else if (this._completionReason) {
-            return Promise.reject(new CancellationError(this._completionReason))
-        }
-
-        return new Promise((resolve, reject) => {
-            this._onCompletionEmitter.event(resolve)
-            this._onCancellationRequestedEmitter.event(({ agent }) => reject(new CancellationError(agent)))
-        })
-    }
-}
-
-interface WaitUntilOptions {
-    /** Timeout in ms (default: 5000) */
-    readonly timeout?: number
-    /** Interval in ms between fn() checks (default: 500) */
-    readonly interval?: number
-    /** Wait for "truthy" result, else wait for any defined result including `false` (default: true) */
-    readonly truthy?: boolean
-}
-
-/**
- * Invokes `fn()` until it returns a non-undefined value.
- *
- * @param fn  Function whose result is checked
- * @param options  See {@link WaitUntilOptions}
- *
- * @returns Result of `fn()`, or `undefined` if timeout was reached.
- */
-export async function waitUntil<T>(fn: () => Promise<T>, options: WaitUntilOptions): Promise<T | undefined> {
-    const opt = { timeout: 5000, interval: 500, truthy: true, ...options }
-    for (let i = 0; true; i++) {
-        const start: number = globals.clock.Date.now()
-        let result: T
-
-        // Needed in case a caller uses a 0 timeout (function is only called once)
-        if (opt.timeout > 0) {
-            result = await Promise.race([fn(), new Promise<T>(r => globals.clock.setTimeout(r, opt.timeout))])
-        } else {
-            result = await fn()
-        }
-
-        // Ensures that we never overrun the timeout
-        opt.timeout -= globals.clock.Date.now() - start
-
-        if ((opt.truthy && result) || (!opt.truthy && result !== undefined)) {
-            return result
-        }
-        if (i * opt.interval >= opt.timeout) {
-            return undefined
-        }
-
-        await sleep(opt.interval)
-    }
-}
-
-/**
- * @deprecated Prefer using event-driven timeout mechanisms over racing promises.
- *
- * Race a Timeout object against a Promise. Handles Timeout expiration and cancellation, exposing access through
- * the use of callbacks. Timeout tokens are cleaned up automatically after completion. Set `opt.completeTimeout`
- * to false if this is not desired.
- *
- * @param promise Promise or a function that evaluates to a promise
- * @param timeout Timeout token that will race against the promise
- * @param opt.allowUndefined Output promise can resolve undefined (default: true)
- * @param opt.onExpire Callback for when the promise expired. The callback can return a value
- * @param opt.onCancel Callback for when the promise was cancelled. The callback can return a value
- * @param opt.completeTimeout Automatically completes the Timeout upon resolution (default: true)
- *
- * @returns A Promise that returns if successful, or rejects when the Timeout was cancelled or expired.
- */
-export async function waitTimeout<T, R = void, B extends boolean = true>(
-    promise: Promise<T> | (() => Promise<T>),
-    timeout: Timeout,
-    opt: {
-        allowUndefined?: B
-        onExpire?: () => R
-        onCancel?: () => R
-        completeTimeout?: boolean
-    } = {}
-): Promise<T | R | (true extends typeof opt.allowUndefined ? undefined : never)> {
-    if (typeof promise === 'function') {
-        promise = promise()
-    }
-
-    const result = await Promise.race([promise, timeout.promisify()])
-        .catch(e => (e instanceof Error ? e : new Error(`unknown error: ${e}`)))
-        .finally(() => {
-            if ((opt.completeTimeout ?? true) === true) {
-                timeout.dispose()
-            }
-        })
-
-    if (result instanceof Error) {
-        if (opt.onExpire && CancellationError.isExpired(result)) {
-            return opt.onExpire()
-        }
-        if (opt.onCancel && CancellationError.isUserCancelled(result)) {
-            return opt.onCancel()
-        }
-        throw result
-    }
-
-    if (result === undefined && (opt.allowUndefined ?? true) !== true) {
-        throw new Error(timeoutUnexpectedResolve)
-    }
-
-    return result as T
-}
-
-/**
- * Sleeps for the specified duration in milliseconds. Note that a duration of 0 will always wait 1 event loop.
- *
- * Attempts to use the extension-scoped `setTimeout` if it exists, otherwise will fallback to the global scheduler.
- */
-
-export function sleep(duration: number = 0): Promise<void> {
-    const schedule = globals?.clock?.setTimeout ?? setTimeout
-    return new Promise(r => schedule(r, Math.max(duration, 0)))
-}
diff --git a/src/shared/utilities/tsUtils.ts b/src/shared/utilities/tsUtils.ts
deleted file mode 100644
index e381a914767..00000000000
--- a/src/shared/utilities/tsUtils.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-export function getMissingProps<T>(obj: T, ...props: (keyof T)[]): typeof props {
-    return props.filter(prop => obj[prop] === undefined)
-}
-
-export function hasProps<T, K extends keyof T>(obj: T, ...props: K[]): obj is Readonly<RequiredProps<T, K>> {
-    return getMissingProps(obj, ...props).length === 0
-}
-
-export function hasStringProps<T, K extends PropertyKey>(obj: T, ...props: K[]): obj is T & { [P in K]: string } {
-    return props.filter(prop => typeof (obj as unknown as Record<K, unknown>)[prop] !== 'string').length === 0
-}
-
-export function assertHasProps<T, K extends keyof T>(
-    obj: T | undefined,
-    ...props: K[]
-): asserts obj is Readonly<RequiredProps<T, K>> {
-    if (!isNonNullable(obj)) {
-        throw new TypeError(`Object was null or undefined, expected properties: ${props.join(', ')}`)
-    }
-
-    const missing = getMissingProps(obj, ...props)
-    if (missing.length > 0) {
-        throw new TypeError(`Object was missing properties: ${missing.join(', ')}`)
-    }
-
-    // May be easier/cleaner to just copy the object rather than freezing it
-    // Should also check the properties and make sure they're all data descriptors
-    Object.freeze(obj)
-}
-
-export function selectFrom<T, K extends keyof T>(obj: T, ...props: K[]): { [P in K]: T[P] } {
-    return props.map(p => [p, obj[p]] as const).reduce((a, [k, v]) => ((a[k] = v), a), {} as { [P in K]: T[P] })
-}
-
-export function isNonNullable<T>(obj: T): obj is NonNullable<T> {
-    // eslint-disable-next-line no-null/no-null
-    return obj !== undefined && obj !== null
-}
-
-/**
- * Stricter form of {@link Object.keys} that gives slightly better types for object literals.
- */
-export function keys<T extends Record<string, any>>(obj: T): [keyof T & string] {
-    return Object.keys(obj) as [keyof T & string]
-}
-
-/**
- * Stricter form of {@link Object.entries} that gives slightly better types for object literals.
- */
-export function entries<T extends Record<string, U>, U>(obj: T): { [P in keyof T]: [P, T[P]] }[keyof T][] {
-    return Object.entries(obj) as { [P in keyof T]: [P, T[P]] }[keyof T][]
-}
-
-export function isThenable<T>(obj: unknown): obj is Thenable<T> {
-    return isNonNullable(obj) && typeof (obj as Thenable<T>).then === 'function'
-}
-
-export type ConstantMap<K, V> = Omit<ReadonlyMap<K, V>, 'get' | 'has'> & {
-    get(key: K): V
-    get(key: any): V | undefined
-    has(key: any): key is K
-}
-
-export function createConstantMap<T extends PropertyKey, U extends PropertyKey>(obj: {
-    readonly [P in T]: U
-}): ConstantMap<T, U> {
-    return new Map<T, U>(Object.entries(obj) as [T, U][]) as unknown as ConstantMap<T, U>
-}
-
-export function createFactoryFunction<T extends new (...args: any[]) => any>(ctor: T): FactoryFunction<T> {
-    return (...args) => new ctor(...args)
-}
-
-type NoSymbols<T> = { [Property in keyof T]: Property extends symbol ? never : Property }[keyof T]
-export type InterfaceNoSymbol<T> = Pick<T, NoSymbols<T>>
-/**
- * Narrows a type from the public keys of class T, which is _semantically_ an interface (and behaviorly, in almost all cases).
- *
- * Note: TypeScript types are purely structural so externally the result looks the same as
- * one declared with the `interface` keyword. The only difference from a literal `interface`
- * is that it cannot be re-declared for extension.
- */
-export type ClassToInterfaceType<T> = Pick<T, keyof T>
-
-type Expand<T> = T extends infer O ? { [K in keyof O]+?: O[K] } : never
-/**
- * Forces a type to be resolved into its literal types.
- *
- * Normally imported types are left 'as-is' and are unable to be mapped. This alias uses
- * type inference to effectively generate a type literal of the target type.
- *
- */
-export type ExpandWithObject<T> = Expand<T> extends Record<string, unknown> ? Expand<T> : never
-
-/**
- * Given two types, this yields a type that includes only the fields where both types were the exact same
- * This is _almost_ equivalent to (T1 | T2) & T2 & T2, except that this type is distributive
- */
-export type SharedTypes<T1, T2> = {
-    [P in keyof T1 & keyof T2]: (T1[P] | T2[P]) & T1[P] & T2[P]
-}
-
-/* All of the string keys of the shared type */
-export type SharedProp<T1, T2> = string & keyof SharedTypes<T1, T2>
-
-/* Any key that can be accumulated (i.e. an array) */
-export type AccumulableKeys<T> = NonNullable<
-    {
-        [P in keyof T]: NonNullable<T[P]> extends any[] ? P : never
-    }[keyof T]
->
-
-/** Similar to the nullish coalescing operator, but for types that can never occur */
-export type Coalesce<T, U> = [T] extends [never] ? U : T
-
-/** Makes all keys `K` of `T` non-nullable */
-export type RequiredProps<T, K extends keyof T> = T & { [P in K]-?: NonNullable<T[P]> }
-
-/** Analagous to shifting an array but for tuples */
-export type Shift<T extends any[]> = T extends [infer _, ...infer U] ? U : []
-
-/** Transforms a type into a mutable version */
-export type Mutable<T> = { -readonly [P in keyof T]: T[P] }
-
-export type FactoryFunction<T extends abstract new (...args: any[]) => any> = (
-    ...args: ConstructorParameters<T>
-) => InstanceType<T>
diff --git a/src/shared/utilities/vsCodeUtils.ts b/src/shared/utilities/vsCodeUtils.ts
deleted file mode 100644
index d85cd037ab8..00000000000
--- a/src/shared/utilities/vsCodeUtils.ts
+++ /dev/null
@@ -1,167 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as nls from 'vscode-nls'
-import globals from '../extensionGlobals'
-import { getIdeProperties } from '../extensionUtilities'
-import * as pathutils from './pathUtils'
-import { getLogger } from '../logger/logger'
-import { Window } from '../vscode/window'
-import { Timeout, waitTimeout, waitUntil } from './timeoutUtils'
-
-// TODO: Consider NLS initialization/configuration here & have packages to import localize from here
-export const localize = nls.loadMessageBundle()
-
-/**
- * Executes the close all editors command and waits for all visible editors to disappear
- */
-export async function closeAllEditors() {
-    await vscode.commands.executeCommand('workbench.action.closeAllEditors')
-
-    // The output channel counts as an editor, but you can't really close that...
-    const noVisibleEditor: boolean | undefined = await waitUntil(
-        async () => {
-            const visibleEditors = vscode.window.visibleTextEditors.filter(
-                editor => !editor.document.fileName.includes('extension-output') // Output channels are named with the prefix 'extension-output'
-            )
-
-            return visibleEditors.length === 0
-        },
-        {
-            timeout: 2500, // Arbitrary values. Should succeed except when VS Code is lagging heavily.
-            interval: 250,
-            truthy: true,
-        }
-    )
-
-    if (!noVisibleEditor) {
-        throw new Error(
-            `Editor "${
-                vscode.window.activeTextEditor!.document.fileName
-            }" was still open after executing "closeAllEditors"`
-        )
-    }
-}
-
-/**
- * Checks if an extension is installed and active.
- */
-export function isExtensionActive(extId: string): boolean {
-    const extension = vscode.extensions.getExtension(extId)
-    return !!extension && extension.isActive
-}
-
-export function isExtensionInstalled(extId: string): boolean {
-    return !!vscode.extensions.getExtension(extId)
-}
-
-/**
- * Checks if an extension is installed, and shows a message if not.
- */
-export function showInstallExtensionMsg(
-    extId: string,
-    extName: string,
-    feat = `${getIdeProperties().company} Toolkit`,
-    window: Window = globals.window
-): boolean {
-    if (vscode.extensions.getExtension(extId)) {
-        return true
-    }
-
-    const msg = localize(
-        'AWS.missingExtension',
-        '{0} requires the {1} extension ({2}) to be installed and enabled.',
-        feat,
-        extName,
-        extId
-    )
-
-    const installBtn = localize('AWS.missingExtension.install', 'Install...')
-    const items = [installBtn]
-
-    const p = window.showErrorMessage(msg, ...items)
-    p.then<string | undefined>(selection => {
-        if (selection === installBtn) {
-            vscode.commands.executeCommand('extension.open', extId)
-        }
-        return selection
-    })
-    return false
-}
-
-/**
- * Activates an extension and returns it, or does nothing if the extension is
- * not installed.
- *
- * @param extId Extension id
- * @param silent Return undefined on failure, instead of throwing
- * @returns Extension, or undefined on failure if `silent`
- */
-export async function activateExtension<T>(
-    extId: string,
-    silent: boolean = true,
-    log = (s: string, ...rest: any[]) => {
-        getLogger().debug(s, ...rest)
-    }
-): Promise<vscode.Extension<T> | undefined> {
-    const extension = vscode.extensions.getExtension<T>(extId)
-    if (!extension) {
-        if (silent) {
-            return undefined
-        }
-        throw new Error(`Extension not found: ${extId}`)
-    }
-
-    if (!extension.isActive) {
-        log('Activating extension: %s', extId)
-        try {
-            const activate = (async () => {
-                await extension.activate()
-                log('Extension activated: %s', extId)
-                return vscode.extensions.getExtension<T>(extId)
-            })()
-
-            return await waitTimeout(activate, new Timeout(60000))
-        } catch (err) {
-            log('Extension failed to activate: %s: %O', extId, err as Error)
-            if (!silent) {
-                throw err
-            }
-            return undefined
-        }
-    }
-
-    return extension
-}
-
-/**
- * Convenience function to make a Thenable into a Promise.
- */
-export function promisifyThenable<T>(thenable: Thenable<T>): Promise<T> {
-    return new Promise((resolve, reject) => thenable.then(resolve, reject))
-}
-
-export function isUntitledScheme(uri: vscode.Uri): boolean {
-    return uri.scheme === 'untitled'
-}
-
-// If the VSCode URI is not a file then return the string representation, otherwise normalize the filesystem path
-export function normalizeVSCodeUri(uri: vscode.Uri): string {
-    if (uri.scheme !== 'file') {
-        return uri.toString()
-    }
-    return pathutils.normalize(uri.fsPath)
-}
-
-export function reloadWindowPrompt(message: string): void {
-    const reload = 'Reload'
-
-    vscode.window.showInformationMessage(message, reload).then(selected => {
-        if (selected === reload) {
-            vscode.commands.executeCommand('workbench.action.reloadWindow')
-        }
-    })
-}
diff --git a/src/shared/utilities/workspaceUtils.ts b/src/shared/utilities/workspaceUtils.ts
deleted file mode 100644
index 477adffe883..00000000000
--- a/src/shared/utilities/workspaceUtils.ts
+++ /dev/null
@@ -1,171 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as path from 'path'
-import { getLogger } from '../logger'
-import { isInDirectory } from '../filesystemUtilities'
-import { normalizedDirnameWithTrailingSlash, normalize } from './pathUtils'
-import globals from '../extensionGlobals'
-
-/**
- * Resolves `relPath` against parent `workspaceFolder`, or returns `relPath` if
- * already absolute or the operation fails.
- */
-export function tryGetAbsolutePath(folder: vscode.WorkspaceFolder | undefined, relPath: string): string {
-    return path.resolve(folder?.uri ? folder.uri.fsPath + '/' : '', relPath)
-}
-
-/**
- * Encapsulates adding a folder to the VS Code Workspace.
- *
- * After the folder is added, this method waits until VS Code signals that the workspace has been updated.
- *
- * CALLER BEWARE: As of VS Code 1.36.00, any behavior that changes the first workspace folder causes VS Code to restart
- * in order to reopen the "workspace", which halts code and re-activates the extension. In this case, this function
- * will not return.
- *
- * Caller is responsible for validating whether or not the folder should be added to the workspace.
- *
- * @param folder - Folder to add to the VS Code Workspace
- *
- * @returns true if folder was added, false otherwise
- */
-export async function addFolderToWorkspace(
-    folder: { uri: vscode.Uri; name?: string },
-    skipExisting?: boolean
-): Promise<boolean> {
-    const disposables: vscode.Disposable[] = []
-    const logger = getLogger()
-
-    if (skipExisting && vscode.workspace.getWorkspaceFolder(folder.uri)) {
-        return true
-    }
-
-    try {
-        // Wait for the WorkspaceFolders changed notification for the folder of interest before returning to caller
-        return await new Promise<boolean>(resolve => {
-            vscode.workspace.onDidChangeWorkspaceFolders(
-                workspaceFoldersChanged => {
-                    if (
-                        workspaceFoldersChanged.added.some(addedFolder => addedFolder.uri.fsPath === folder.uri.fsPath)
-                    ) {
-                        resolve(true)
-                    }
-                },
-                undefined,
-                disposables
-            )
-
-            if (
-                !vscode.workspace.updateWorkspaceFolders(
-                    // Add new folder to the end of the list rather than the beginning, to avoid VS Code
-                    // terminating and reinitializing our extension.
-                    (vscode.workspace.workspaceFolders || []).length,
-                    0,
-                    folder
-                )
-            ) {
-                resolve(false)
-            }
-        })
-    } catch (err) {
-        logger.error(`Unexpected error adding folder ${folder.uri.fsPath} to workspace: %O`, err as Error)
-
-        return false
-    } finally {
-        for (const disposable of disposables) {
-            disposable.dispose()
-        }
-    }
-}
-
-/**
- * Finds the closest file (specified by the search pattern) to the specified source file.
- * Checks parent directories up until the top level workspace folder for the source file.
- * Returns undefined if the file isn't found in any directories between the sourceCodeUri directory and the workspace folder
- * @param sourceCodeUri Source file to look upwards from
- * @param projectFile File to find in same folder or parent, up until the source file's top level workspace folder. Accepts wildcards.
- */
-export async function findParentProjectFile(
-    sourceCodeUri: vscode.Uri,
-    projectFile: RegExp
-): Promise<vscode.Uri | undefined> {
-    const workspaceFolder = vscode.workspace.getWorkspaceFolder(sourceCodeUri)
-    if (!workspaceFolder) {
-        return undefined
-    }
-
-    const workspaceProjectFiles = globals.codelensRootRegistry.registeredItems
-        .filter(item => item.item.match(projectFile))
-        .map(item => item.path)
-
-    // Use the project file "closest" in the parent chain to sourceCodeUri
-    const parentProjectFiles = workspaceProjectFiles
-        .filter(uri => {
-            const dirname = normalizedDirnameWithTrailingSlash(uri)
-
-            return normalize(sourceCodeUri.fsPath).startsWith(dirname)
-        })
-        .sort((a, b) => {
-            if (isInDirectory(path.parse(a).dir, path.parse(b).dir)) {
-                return 1
-            }
-
-            return -1
-        })
-
-    if (parentProjectFiles.length === 0) {
-        return undefined
-    }
-
-    return vscode.Uri.file(parentProjectFiles[0])
-}
-
-/**
- * Finds the file specified by `filenameGlob` in the VSCode workspace, opens
- * it in an editor tab, returns it as a `TextDocument`.
- *
- * @returns `TextDocument`, or undefined if the file could not be found.
- */
-export async function openTextDocument(filenameGlob: vscode.GlobPattern): Promise<vscode.TextDocument | undefined> {
-    const found = await vscode.workspace.findFiles(filenameGlob)
-    if (found.length === 0) {
-        return undefined
-    }
-    await vscode.commands.executeCommand('vscode.open', found[0])
-    const textDocument = vscode.workspace.textDocuments.find(o => o.uri.fsPath.includes(found[0].fsPath))
-    return textDocument
-}
-
-/**
- * Returns a path relative to the first workspace folder found that is a parent of the defined path.
- * Returns undefined if there are no applicable workspace folders.
- * @param childPath Path to derive relative path from
- */
-export function getWorkspaceRelativePath(
-    childPath: string,
-    override: {
-        workspaceFolders?: readonly vscode.WorkspaceFolder[]
-    } = {
-        workspaceFolders: vscode.workspace.workspaceFolders,
-    }
-): string | undefined {
-    if (!override.workspaceFolders) {
-        return
-    }
-    for (const folder of override.workspaceFolders) {
-        if (isInDirectory(folder.uri.fsPath, childPath)) {
-            return path.relative(folder.uri.fsPath, childPath)
-        }
-    }
-}
-
-/**
- * This only checks text documents; the API does not expose webviews.
- */
-export function checkUnsavedChanges(): boolean {
-    return vscode.workspace.textDocuments.some(doc => doc.isDirty)
-}
diff --git a/src/shared/vscode/commands.ts b/src/shared/vscode/commands.ts
deleted file mode 100644
index f7e6bc96996..00000000000
--- a/src/shared/vscode/commands.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-
-/**
- * Components associated with {@link module:vscode.commands}.
- */
-export interface Commands {
-    /**
-     * See {@link module:vscode.commands.executeCommand}.
-     */
-    execute<T>(command: string, ...rest: any[]): Thenable<T | undefined>
-}
-
-/**
- * @deprecated Use `./commands2.ts` instead when possible.
- */
-export namespace Commands {
-    export function vscode(): Commands {
-        return new DefaultCommands()
-    }
-}
-
-class DefaultCommands implements Commands {
-    public execute<T>(command: string, ...rest: any[]): Thenable<T | undefined> {
-        return vscode.commands.executeCommand(command, ...rest)
-    }
-}
diff --git a/src/shared/vscode/commands2.ts b/src/shared/vscode/commands2.ts
deleted file mode 100644
index 8e50d6e8c5c..00000000000
--- a/src/shared/vscode/commands2.ts
+++ /dev/null
@@ -1,408 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { toTitleCase } from '../utilities/textUtilities'
-import { isAutomation, isNameMangled } from './env'
-import { getTelemetryReason, getTelemetryResult } from '../errors'
-import { getLogger, NullLogger } from '../logger/logger'
-import { FunctionKeys, Functions, getFunctions } from '../utilities/classUtils'
-import { TreeItemContent, TreeNode } from '../treeview/resourceTreeDataProvider'
-import { telemetry, Metric, MetricName, VscodeExecuteCommand } from '../telemetry/telemetry'
-
-type Callback = (...args: any[]) => any
-type CommandFactory<T extends Callback, U extends any[]> = (...parameters: U) => T
-
-/**
- * A handle for a generic "command" that is registered (or will be registered) through
- * VS Code's `commands` API.
- *
- * Not to be confused with the {@link vscode.Command UI representation} of a command.
- */
-export interface Command<T extends Callback = Callback> {
-    /**
-     * Unique identifier associated with the command, e.g. `aws.viewLogs`.
-     */
-    readonly id: string
-
-    /**
-     * Entry-point to derive objects that directly or indirectly use the command.
-     *
-     * This includes many UI-related components such as tree nodes or code lenses.
-     */
-    build(...args: Parameters<T>): Builder
-
-    /**
-     * Executes the command.
-     *
-     * Only commands registered via {@link Commands} have certain guarantees such as
-     * logging and error-handling.
-     */
-    execute(...parameters: Parameters<T>): Promise<ReturnType<T> | undefined>
-}
-
-interface RegisteredCommand<T extends Callback = Callback> extends Command<T> {
-    dispose(): void
-}
-
-interface DeclaredCommand<T extends Callback = Callback, U extends any[] = any> extends Command<T> {
-    register(...dependencies: U): RegisteredCommand<T>
-}
-
-/**
- * Minimal wrapper around VS Code's `commands` API to give structure around commands registered
- * and consumed by the extension.
- */
-export class Commands {
-    private readonly resources: Map<string, CommandResource<() => unknown, any>> = new Map()
-
-    public constructor(private readonly commands = vscode.commands) {}
-
-    /**
-     * Returns a {@link Command} if the ID is currently registered within VS Code.
-     */
-    public async get(id: string): Promise<Command | undefined> {
-        const registeredCommands = await this.commands.getCommands()
-
-        if (registeredCommands.includes(id)) {
-            const throwOnRegister = () => {
-                throw new Error(`Command "${id}" cannot be re-registered`)
-            }
-
-            const info = { id }
-            return new CommandResource<Callback>({ info, factory: throwOnRegister }, this.commands)
-        }
-    }
-
-    /**
-     * Registers a new command with the VS Code API.
-     *
-     * @param info command id (string) or {@link CommandInfo} object
-     * @param callback command implementation
-     */
-    public register<T extends Callback>(
-        info: string | Omit<CommandInfo<T>, 'args' | 'label'>,
-        callback: T
-    ): RegisteredCommand<T> {
-        const resource = new CommandResource(
-            {
-                info: typeof info === 'string' ? { id: info } : info,
-                factory: () => callback,
-            },
-            this.commands
-        )
-
-        return this.addResource(resource).register()
-    }
-
-    /**
-     * Declares the _intent_ to register a command.
-     *
-     * Forward declaration adds one level of indirection. This allows for explicit annotation of
-     * not just the command signature but also its immediate dependencies.
-     */
-    public declare<T extends Callback, D extends any[]>(
-        id: string | Omit<CommandInfo<T>, 'args' | 'label'>,
-        factory: CommandFactory<T, D>
-    ): DeclaredCommand<T, D> {
-        const resource = typeof id === 'string' ? { info: { id }, factory } : { info: { ...id }, factory }
-
-        return this.addResource(new CommandResource(resource, this.commands))
-    }
-
-    /**
-     * Convenience method to declare commands directly from a class.
-     *
-     * Mostly used when many commands are associated with the same long-lived context.
-     * Functions are currently bound at declaration time for simplicity, though this
-     * may change in the future.
-     *
-     * #### Example
-     * ```ts
-     * class Foo {
-     *     public square(n: number): number {
-     *         return n * n
-     *     }
-     * }
-     *
-     * const square = Commands.instance.from(Foo).declareSquare('aws.square')
-     * await square.register(new Foo()).execute(5)
-     * ```
-     */
-    public from<T>(target: new (...args: any[]) => T): Declarables<T> {
-        type Id = Parameters<Declare<T, Callback>>[0]
-        const result = {} as Record<string, Declare<T, Callback>>
-
-        for (const [k, v] of Object.entries<Callback>(getFunctions(target))) {
-            const mappedKey = `declare${toTitleCase(k)}`
-            const name = !isNameMangled() ? `${target.name}.${k}` : undefined
-            const mapInfo = (id: Id) => (typeof id === 'string' ? { id, name } : { name, ...id })
-
-            result[mappedKey] = id => this.declare(mapInfo(id), (instance: T) => v.bind(instance))
-        }
-
-        return result as unknown as Declarables<T>
-    }
-
-    public dispose(): void {
-        vscode.Disposable.from(...this.resources.values()).dispose()
-    }
-
-    private addResource<T extends Callback, U extends any[]>(resource: CommandResource<T, U>): CommandResource<T, U> {
-        const previous = this.resources.get(resource.id)
-
-        if (previous !== undefined) {
-            throw new Error(`Command "${resource.id}" has already been declared by the Toolkit`)
-        }
-
-        this.resources.set(resource.id, resource)
-        return resource
-    }
-
-    /**
-     * The default instance of {@link Commands}.
-     */
-    public static readonly instance = new Commands()
-
-    /**
-     * Returns {@link Commands.get} using the default instance.
-     */
-    public static readonly get = this.instance.get.bind(this.instance)
-
-    /**
-     * Returns {@link Commands.register} using the default instance.
-     */
-    public static readonly register = this.instance.register.bind(this.instance)
-
-    /**
-     * Returns {@link Commands.declare} using the default instance.
-     */
-    public static readonly declare = this.instance.declare.bind(this.instance)
-
-    /**
-     * Returns {@link Commands.from} using the default instance.
-     */
-    public static readonly from = this.instance.from.bind(this.instance)
-}
-
-interface Declare<T, F extends Callback> {
-    (id: string | Omit<CommandInfo<F>, 'args' | 'label'>): DeclaredCommand<F, [target: T]>
-}
-
-type Declarables<T> = {
-    [P in FunctionKeys<T> as `declare${Capitalize<P & string>}`]: Declare<T, Functions<T>[P]>
-}
-
-type PartialCommand = Omit<vscode.Command, 'arguments' | 'command'>
-type PartialTreeItem = Omit<TreeItemContent, 'command'>
-
-interface Builder {
-    asUri(): vscode.Uri
-    asCommand(content: PartialCommand): vscode.Command
-    asTreeNode(content: PartialTreeItem): TreeNode<Command>
-    asCodeLens(range: vscode.Range, content: PartialCommand): vscode.CodeLens
-}
-
-interface Deferred<T extends Callback, U extends any[]> {
-    readonly info: Omit<CommandInfo<T>, 'args' | 'label'>
-    readonly factory: CommandFactory<T, U>
-}
-
-/**
- * Contains the command implementation and properties.
- *
- * `CommandResources` are registered on the {@link Commands} singleton. This class does not
- * differentiate between 'registered' and 'declared' commands; that abstraction is handled
- * by the singleton.
- */
-class CommandResource<T extends Callback = Callback, U extends any[] = any[]> {
-    private subscription: vscode.Disposable | undefined
-    private idCounter = 0
-    public readonly id = this.resource.info.id
-
-    public constructor(private readonly resource: Deferred<T, U>, private readonly commands = vscode.commands) {}
-
-    public get registered() {
-        return !!this.subscription
-    }
-
-    public build(...args: Parameters<T>): Builder {
-        const id = this.resource.info.id
-
-        return {
-            asUri: this.buildUri(id, args),
-            asCommand: this.buildCommand(id, args),
-            asCodeLens: this.buildCodeLens(id, args),
-            asTreeNode: this.buildTreeNode(id, args),
-        }
-    }
-
-    public register(...args: U): RegisteredCommand<T> {
-        const { id, name } = this.resource.info
-        const label = name ? `"${name}" (id: ${id})` : `"${id}"`
-        const target = this.resource.factory(...args)
-        const instrumented = (...args: Parameters<T>) => {
-            const info: CommandInfo<T> = {
-                ...this.resource.info,
-                id: id,
-                label: label,
-                args: args,
-            }
-            return runCommand(target, info)
-        }
-        this.subscription = this.commands.registerCommand(this.resource.info.id, instrumented)
-
-        return this
-    }
-
-    public async execute(...args: Parameters<T>): Promise<ReturnType<T> | undefined> {
-        return this.commands.executeCommand<ReturnType<T>>(this.resource.info.id, ...args)
-    }
-
-    public dispose(): void {
-        this.subscription?.dispose()
-        this.subscription = undefined
-    }
-
-    private buildUri(id: string, args: unknown[]) {
-        return () => vscode.Uri.parse(`command:${id}?${encodeURIComponent(JSON.stringify(args))}`)
-    }
-
-    private buildCommand(id: string, args: unknown[]) {
-        return (content: PartialCommand) => ({ ...content, command: id, arguments: args })
-    }
-
-    private buildCodeLens(id: string, args: unknown[]) {
-        return (range: vscode.Range, content: PartialCommand) => {
-            return new vscode.CodeLens(range, this.buildCommand(id, args)(content))
-        }
-    }
-
-    private buildTreeNode(id: string, args: unknown[]) {
-        return (content: PartialTreeItem) => {
-            const treeItem = new vscode.TreeItem(content.label, vscode.TreeItemCollapsibleState.None)
-            Object.assign(treeItem, {
-                ...content,
-                command: { command: id, arguments: args, title: content.label },
-            })
-
-            return {
-                id: `${id}-${(this.idCounter += 1)}`,
-                resource: this,
-                getTreeItem: () => treeItem,
-            }
-        }
-    }
-}
-
-interface CommandInfo<T extends Callback> {
-    readonly id: string
-    readonly name?: string
-    /** Display label, generated from id + name. */
-    readonly label?: string
-    readonly args: Parameters<T>
-    readonly logging?: boolean
-    /** Does the command require credentials? (default: false) */
-    readonly autoconnect?: boolean
-
-    /**
-     * The telemetry metric associated with this command.
-     *
-     * Metadata can be added during execution like so:
-     * ```ts
-     * telemetry.aws_foo.record({ exampleMetadata: 'bar' })
-     * ```
-     *
-     * Any metadata is sent with the metric on completion.
-     */
-    readonly telemetryName?: MetricName
-}
-
-// This debouncing is a temporary safe-guard to mitigate the risk of instrumenting all
-// commands with telemetry at once. The alternative is to do a gradual rollout although
-// it's not much safer in terms of weeding out problematic commands.
-const emitInfo = new Map<string, { token: number; startTime: number; debounceCounter: number }>()
-const emitTokens: Record<string, number> = {}
-
-function startRecordCommand(id: string, threshold: number): number {
-    const currentTime = Date.now()
-    const previousEmit = emitInfo.get(id)
-    const token = (emitTokens[id] = (emitTokens[id] ?? 0) + 1)
-
-    if (previousEmit?.startTime !== undefined && currentTime - previousEmit.startTime < threshold) {
-        emitInfo.set(id, { ...previousEmit, debounceCounter: previousEmit.debounceCounter + 1 })
-        return token
-    }
-
-    emitInfo.set(id, { token, startTime: currentTime, debounceCounter: previousEmit?.debounceCounter ?? 0 })
-    return token
-}
-
-function endRecordCommand(id: string, token: number, name?: MetricName, err?: unknown) {
-    const data = emitInfo.get(id)
-    const currentTime = Date.now()
-
-    if (token !== data?.token) {
-        getLogger().debug(`commands: skipped telemetry for "${id}"`)
-        return
-    }
-
-    emitInfo.set(id, { ...data, debounceCounter: 0 })
-
-    const metric = name ? (telemetry[name] as Metric<VscodeExecuteCommand>) : telemetry.vscode_executeCommand
-    metric.emit({
-        command: id,
-        debounceCount: data.debounceCounter,
-        result: getTelemetryResult(err),
-        reason: getTelemetryReason(err),
-        duration: currentTime - data.startTime,
-    })
-}
-
-async function runCommand<T extends Callback>(fn: T, info: CommandInfo<T>): Promise<ReturnType<T> | void> {
-    const { args, label, logging } = { logging: true, ...info }
-    const logger = logging ? getLogger() : new NullLogger()
-    const withArgs = args.length > 0 ? ` with arguments [${args.map(String).join(', ')}]` : ''
-    const threshold = isAutomation() || info.telemetryName ? 0 : 300_000 // 5 minutes
-    const telemetryToken = startRecordCommand(info.id, threshold)
-
-    logger.debug(`command: running ${label}${withArgs}`)
-
-    if (info.telemetryName !== undefined) {
-        telemetry[info.telemetryName].record({ command: info.id })
-    }
-
-    try {
-        if (info.autoconnect === true) {
-            await vscode.commands.executeCommand('_aws.auth.autoConnect')
-        }
-
-        const result = await fn(...args)
-        logging && endRecordCommand(info.id, telemetryToken, info.telemetryName)
-
-        return result
-    } catch (error) {
-        logging && endRecordCommand(info.id, telemetryToken, info.telemetryName, error)
-
-        if (errorHandler !== undefined) {
-            errorHandler(info, error)
-        } else {
-            logger.error(`command: ${label} failed without error handler: %s`, error)
-            throw error
-        }
-    }
-}
-
-// Error handling may involve other Toolkit modules and so it must be defined and registered at
-// the extension entry-point. `Commands` form the backbone of everything else in the Toolkit.
-// This file should contain as little application-specific logic as possible.
-let errorHandler: (info: Omit<CommandInfo<any>, 'args'>, error: unknown) => void
-export function registerErrorHandler(handler: typeof errorHandler): void {
-    if (errorHandler !== undefined) {
-        throw new TypeError('Error handler has already been registered')
-    }
-
-    errorHandler = handler
-}
diff --git a/src/shared/vscode/env.ts b/src/shared/vscode/env.ts
deleted file mode 100644
index 368c919176b..00000000000
--- a/src/shared/vscode/env.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as semver from 'semver'
-import * as vscode from 'vscode'
-import * as packageJson from '../../../package.json'
-
-/**
- * Components associated with {@link module:vscode.env}.
- */
-export interface Env {
-    clipboard: Clipboard
-}
-
-export namespace Env {
-    export function vscode(): Env {
-        return new DefaultEnv()
-    }
-}
-
-export interface Clipboard {
-    /**
-     * See {@link module:vscode.Clipboard.writeText}.
-     */
-    writeText(message: string): Thenable<void>
-}
-
-class DefaultEnv implements Env {
-    public get clipboard(): Clipboard {
-        return vscode.env.clipboard
-    }
-}
-
-/**
- * Returns true if the current build is running on CI (build server).
- */
-export function isCI(): boolean {
-    return undefined !== process.env['CODEBUILD_BUILD_ID']
-}
-
-/** Variable added via webpack */
-declare let EXTENSION_VERSION: string // eslint-disable-line @typescript-eslint/naming-convention
-const testVersion = 'testPluginVersion'
-
-/** The current extension version. If not built via Webpack, this defaults to {@link testVersion}. */
-let extensionVersion = testVersion
-try {
-    extensionVersion = EXTENSION_VERSION
-} catch (e) {} // Just a reference error
-
-/**
- * Returns true if the current build is a production build (as opposed to a
- * prerelease/test/nightly build)
- */
-export function isReleaseVersion(prereleaseOk: boolean = false): boolean {
-    return (prereleaseOk || !semver.prerelease(extensionVersion)) && extensionVersion !== testVersion
-}
-
-/**
- * Returns true when source mapping is available
- */
-export function isSourceMappingAvailable(): boolean {
-    return extensionVersion === testVersion
-}
-
-/**
- * Returns true if the extension is being ran from automation.
- */
-export function isAutomation(): boolean {
-    return isCI() || !!process.env['AWS_TOOLKIT_AUTOMATION']
-}
-
-/**
- * Returns true if name mangling has occured to the extension source code.
- */
-export function isNameMangled(): boolean {
-    return isNameMangled.name !== 'isNameMangled'
-}
-
-export { extensionVersion }
-
-/**
- * Returns true if the extension is being ran on the minimum version of VS Code as defined
- * by the `engines` field in `package.json`
- */
-export function isMinimumVersion(): boolean {
-    return vscode.version.startsWith(getMinVscodeVersion())
-}
-
-/**
- * Returns the minimum vscode "engine" version declared in `package.json`.
- */
-export function getMinVscodeVersion(): string {
-    return packageJson.engines.vscode.replace(/[^~]/, '')
-}
-
-/**
- * Returns the minimum nodejs version declared in `package.json`.
- */
-export function getMinNodejsVersion(): string {
-    return packageJson.devDependencies['@types/node'].replace(/[^~]/, '')
-}
-
-export function getCodeCatalystDevEnvId(): string | undefined {
-    return process.env['__DEV_ENVIRONMENT_ID']
-}
-
-export function getCodeCatalystProjectName(): string | undefined {
-    return process.env['__DEV_ENVIRONMENT_PROJECT_NAME']
-}
-
-export function getCodeCatalystSpaceName(): string | undefined {
-    // TODO: remove legacy __DEV_ENVIRONMENT_ORGANIZATION_NAME
-    return process.env['__DEV_ENVIRONMENT_SPACE_NAME'] || process.env['__DEV_ENVIRONMENT_ORGANIZATION_NAME']
-}
diff --git a/src/shared/vscode/inlineCompletion.ts b/src/shared/vscode/inlineCompletion.ts
deleted file mode 100644
index 17d9e874b6a..00000000000
--- a/src/shared/vscode/inlineCompletion.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-// Sourced from https://github.com/microsoft/vscode/blob/main/src/vscode-dts/vscode.d.ts
-// This API was added in 1.68.0. Not supported in Cloud9.
-declare module 'vscode' {
-    /**
-     * The inline completion item provider interface defines the contract between extensions and
-     * the inline completion feature.
-     *
-     * Providers are asked for completions either explicitly by a user gesture or implicitly when typing.
-     */
-    export interface InlineCompletionItemProvider {
-        /**
-         * Provides inline completion items for the given position and document.
-         * If inline completions are enabled, this method will be called whenever the user stopped typing.
-         * It will also be called when the user explicitly triggers inline completions or explicitly asks for the next or previous inline completion.
-         * In that case, all available inline completions should be returned.
-         * `context.triggerKind` can be used to distinguish between these scenarios.
-         *
-         * @param document The document inline completions are requested for.
-         * @param position The position inline completions are requested for.
-         * @param context A context object with additional information.
-         * @param token A cancellation token.
-         * @return An array of completion items or a thenable that resolves to an array of completion items.
-         */
-        provideInlineCompletionItems(
-            document: TextDocument,
-            position: Position,
-            context: InlineCompletionContext,
-            token: CancellationToken
-        ): ProviderResult<InlineCompletionItem[] | InlineCompletionList>
-    }
-
-    /**
-     * Represents a collection of {@link InlineCompletionItem inline completion items} to be presented
-     * in the editor.
-     */
-    export class InlineCompletionList {
-        /**
-         * The inline completion items.
-         */
-        items: InlineCompletionItem[]
-
-        /**
-         * Creates a new list of inline completion items.
-         */
-        constructor(items: InlineCompletionItem[])
-    }
-
-    /**
-     * Provides information about the context in which an inline completion was requested.
-     */
-    export interface InlineCompletionContext {
-        /**
-         * Describes how the inline completion was triggered.
-         */
-        readonly triggerKind: InlineCompletionTriggerKind
-
-        /**
-         * Provides information about the currently selected item in the autocomplete widget if it is visible.
-         *
-         * If set, provided inline completions must extend the text of the selected item
-         * and use the same range, otherwise they are not shown as preview.
-         * As an example, if the document text is `console.` and the selected item is `.log` replacing the `.` in the document,
-         * the inline completion must also replace `.` and start with `.log`, for example `.log()`.
-         *
-         * Inline completion providers are requested again whenever the selected item changes.
-         */
-        readonly selectedCompletionInfo: SelectedCompletionInfo | undefined
-    }
-
-    /**
-     * Describes the currently selected completion item.
-     */
-    export interface SelectedCompletionInfo {
-        /**
-         * The range that will be replaced if this completion item is accepted.
-         */
-        readonly range: Range
-
-        /**
-         * The text the range will be replaced with if this completion is accepted.
-         */
-        readonly text: string
-    }
-
-    /**
-     * Describes how an {@link InlineCompletionItemProvider inline completion provider} was triggered.
-     */
-    export enum InlineCompletionTriggerKind {
-        /**
-         * Completion was triggered explicitly by a user gesture.
-         * Return multiple completion items to enable cycling through them.
-         */
-        Invoke = 0,
-
-        /**
-         * Completion was triggered automatically while editing.
-         * It is sufficient to return a single completion item in this case.
-         */
-        Automatic = 1,
-    }
-
-    /**
-     * An inline completion item represents a text snippet that is proposed inline to complete text that is being typed.
-     *
-     * @see {@link InlineCompletionItemProvider.provideInlineCompletionItems}
-     */
-    export class InlineCompletionItem {
-        /**
-         * The text to replace the range with. Must be set.
-         * Is used both for the preview and the accept operation.
-         */
-        insertText: string | SnippetString
-
-        /**
-         * A text that is used to decide if this inline completion should be shown. When `falsy`
-         * the {@link InlineCompletionItem.insertText} is used.
-         *
-         * An inline completion is shown if the text to replace is a prefix of the filter text.
-         */
-        filterText?: string
-
-        /**
-         * The range to replace.
-         * Must begin and end on the same line.
-         *
-         * Prefer replacements over insertions to provide a better experience when the user deletes typed text.
-         */
-        range?: Range
-
-        /**
-         * An optional {@link Command} that is executed *after* inserting this completion.
-         */
-        command?: Command
-
-        /**
-         * Creates a new inline completion item.
-         *
-         * @param insertText The text to replace the range with.
-         * @param range The range to replace. If not set, the word at the requested position will be used.
-         * @param command An optional {@link Command} that is executed *after* inserting this completion.
-         */
-        constructor(insertText: string | SnippetString, range?: Range, command?: Command)
-    }
-    export namespace languages {
-        /**
-         * Registers an inline completion provider.
-         *
-         * Multiple providers can be registered for a language. In that case providers are asked in
-         * parallel and the results are merged. A failing provider (rejected promise or exception) will
-         * not cause a failure of the whole operation.
-         *
-         * @param selector A selector that defines the documents this provider is applicable to.
-         * @param provider An inline completion provider.
-         * @return A {@link Disposable} that unregisters this provider when being disposed.
-         */
-        export function registerInlineCompletionItemProvider(
-            selector: DocumentSelector,
-            provider: InlineCompletionItemProvider
-        ): Disposable
-    }
-}
diff --git a/src/shared/vscode/secrets.ts b/src/shared/vscode/secrets.ts
deleted file mode 100644
index ce0a18a088f..00000000000
--- a/src/shared/vscode/secrets.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-// Sourced from https://github.com/microsoft/vscode/blob/238c19cc7727511d495d67d2ce1e0ec0638de2ce/src/vscode-dts/vscode.d.ts
-// This API was added in 1.53. Not supported in Cloud9.
-declare module 'vscode' {
-    export interface ExtensionContext {
-        /**
-         * A storage utility for secrets. Secrets are persisted across reloads and are independent of the
-         * current opened {@link workspace.workspaceFolders workspace}.
-         */
-        readonly secrets: SecretStorage
-    }
-
-    /**
-     * The event data that is fired when a secret is added or removed.
-     */
-    export interface SecretStorageChangeEvent {
-        /**
-         * The key of the secret that has changed.
-         */
-        readonly key: string
-    }
-
-    /**
-     * Represents a storage utility for secrets, information that is
-     * sensitive.
-     */
-    export interface SecretStorage {
-        /**
-         * Retrieve a secret that was stored with key. Returns undefined if there
-         * is no password matching that key.
-         * @param key The key the secret was stored under.
-         * @returns The stored value or `undefined`.
-         */
-        get(key: string): Thenable<string | undefined>
-
-        /**
-         * Store a secret under a given key.
-         * @param key The key to store the secret under.
-         * @param value The secret.
-         */
-        store(key: string, value: string): Thenable<void>
-
-        /**
-         * Remove a secret from storage.
-         * @param key The key the secret was stored under.
-         */
-        delete(key: string): Thenable<void>
-
-        /**
-         * Fires when a secret is stored or deleted.
-         */
-        onDidChange: Event<SecretStorageChangeEvent>
-    }
-}
diff --git a/src/shared/vscode/uriHandler.ts b/src/shared/vscode/uriHandler.ts
deleted file mode 100644
index bae0a6e3375..00000000000
--- a/src/shared/vscode/uriHandler.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { getLogger } from '../logger/logger'
-
-import * as nls from 'vscode-nls'
-import { showViewLogsMessage } from '../utilities/messages'
-import globals from '../extensionGlobals'
-import { URL, URLSearchParams } from 'url'
-
-const localize = nls.loadMessageBundle()
-
-/** Handles an external URI targeting the extension */
-export type PathHandler<T> = (query: T) => Promise<void> | void
-/** Parses the 'query' or arguments from a URI */
-export type QueryParser<T> = (params: SearchParams) => Promise<T> | T | never
-
-interface HandlerWithParser<T> {
-    handler: PathHandler<T>
-    parser?: QueryParser<T>
-}
-
-export class UriHandler implements vscode.UriHandler {
-    public constructor(private readonly window = vscode.window) {}
-
-    private handlers: Map<string, HandlerWithParser<any>> = new Map()
-
-    public async handleUri(uri: vscode.Uri): Promise<void> {
-        getLogger().verbose(`UriHandler: received request on path "${uri.path}"`)
-
-        const uriNoQuery = uri.with({ query: '' }).toString()
-
-        if (!this.handlers.has(uri.path)) {
-            globals.window.showErrorMessage(
-                localize('AWS.uriHandler.nohandler', 'No handler found for: {0}', uriNoQuery)
-            )
-            getLogger().verbose(`UriHandler: no valid handler found for "${uri.path}"`)
-            return
-        }
-
-        const { handler, parser } = this.handlers.get(uri.path)!
-        let parsedQuery: Parameters<typeof handler>[0]
-
-        const url = new URL(uri.toString(true))
-        const params = new SearchParams(url.searchParams)
-
-        try {
-            parsedQuery = parser ? await parser(params) : params
-        } catch (err) {
-            const failedParsedMessage = localize(
-                'AWS.uriHandler.parser.failed',
-                'Failed to parse URI query: {0}',
-                uriNoQuery
-            )
-            showViewLogsMessage(failedParsedMessage, this.window)
-            getLogger().error(`UriHandler: query parsing failed for path "${uri.path}": %O`, err)
-            return
-        }
-
-        try {
-            // This await is needed to catch unhandled rejected Promises
-            return await handler(parsedQuery)
-        } catch (err) {
-            const failedResolvedMessage = localize(
-                'AWS.uriHandler.handler.failed',
-                'Failed to handle URI: {0}',
-                uriNoQuery
-            )
-            showViewLogsMessage(failedResolvedMessage, this.window)
-            getLogger().error(`UriHandler: unexpected exception when handling "${uri.path}": %O`, err)
-        }
-    }
-
-    /**
-     * Registers a new handler for external URIs targeting the extension.
-     *
-     * @param path Target 'path', e.g. '/foo/bar'
-     * @param handler Callback fired when the extension receives a URI that matches the path
-     * @param parser Optional callback to parse the URI parameters prior to calling the handler
-     *
-     * @returns A disposable to remove the handler
-     * @throws When a handler has already been registered
-     */
-    public registerHandler<U extends T, T = URLSearchParams>(
-        path: string,
-        handler: PathHandler<U>,
-        parser?: QueryParser<T>
-    ): vscode.Disposable {
-        if (this.handlers.has(path)) {
-            throw new Error(`UriHandler: "${path}" has already been registered`)
-        }
-
-        this.handlers.set(path, { handler, parser })
-        return { dispose: () => this.handlers.delete(path) }
-    }
-}
-
-/**
- * Minimal wrapper around {@link URLSearchParams} for better ergonomics.
- */
-export class SearchParams extends URLSearchParams {
-    public getAs<T>(name: string, mapper: (v: string) => T): T | undefined {
-        return super.has(name) ? mapper(super.get(name)!) : undefined
-    }
-
-    public getOrThrow(name: string, message: string | Error): string {
-        this.assertHas(name, message)
-        return super.get(name)!
-    }
-
-    public getAsOrThrow<T>(name: string, message: string | Error, mapper: (v: string) => T): T {
-        this.assertHas(name, message)
-        return this.getAs(name, mapper)!
-    }
-
-    public getFromKeys<T extends readonly string[]>(...keys: T): { [P in T[number]]: string | undefined } {
-        return keys.reduce(
-            (a, b: T[number]) => ((a[b] = super.get(b) ?? undefined), a),
-            {} as { [P in T[number]]: string | undefined }
-        )
-    }
-
-    public getFromKeysOrThrow<T extends readonly string[]>(...keys: T): { [P in T[number]]: string } {
-        return keys.reduce(
-            (a, b: T[number]) => ((a[b] = this.getOrThrow(b, `"${b}" must be provided`)), a),
-            {} as { [P in T[number]]: string }
-        )
-    }
-
-    private assertHas(name: string, message: string | Error): void | never {
-        if (!super.has(name)) {
-            throw message instanceof Error ? message : new Error(message)
-        }
-    }
-}
diff --git a/src/shared/vscode/window.ts b/src/shared/vscode/window.ts
deleted file mode 100644
index 1a48a869d1e..00000000000
--- a/src/shared/vscode/window.ts
+++ /dev/null
@@ -1,175 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import globals from '../extensionGlobals'
-
-interface ProgressEntry {
-    message?: string
-    increment?: number
-}
-
-/**
- * Components associated with {@link module:vscode.window}.
- */
-export interface Window {
-    /**
-     * See {@link module:vscode.window.setStatusBarMessage}.
-     */
-    setStatusBarMessage(message: string, hideAfterTimeout: number): vscode.Disposable
-
-    /**
-     * See {@link module:vscode.window.showInputBox}.
-     */
-    showInputBox(options?: vscode.InputBoxOptions, token?: vscode.CancellationToken): Thenable<string | undefined>
-
-    /**
-     * See {@link module:vscode.window.showInformationMessage}.
-     */
-    showInformationMessage(message: string, ...items: string[]): Thenable<string | undefined>
-    showInformationMessage(
-        message: string,
-        options: vscode.MessageOptions,
-        ...items: string[]
-    ): Thenable<string | undefined>
-    showInformationMessage<T extends vscode.MessageItem>(message: string, ...items: T[]): Thenable<T | undefined>
-    showInformationMessage<T extends vscode.MessageItem>(
-        message: string,
-        options: vscode.MessageOptions,
-        ...items: T[]
-    ): Thenable<T | undefined>
-
-    /**
-     * See {@link module:vscode.window.showWarningMessage}.
-     */
-    showWarningMessage(message: string, ...items: string[]): Thenable<string | undefined>
-    showWarningMessage(
-        message: string,
-        options: vscode.MessageOptions,
-        ...items: string[]
-    ): Thenable<string | undefined>
-    showWarningMessage<T extends vscode.MessageItem>(message: string, ...items: T[]): Thenable<T | undefined>
-    showWarningMessage<T extends vscode.MessageItem>(
-        message: string,
-        options: vscode.MessageOptions,
-        ...items: T[]
-    ): Thenable<T | undefined>
-
-    /**
-     * See {@link module:vscode.window.showErrorMessage}.
-     */
-    showErrorMessage(message: string, ...items: string[]): Thenable<string | undefined>
-    showErrorMessage(message: string, options: vscode.MessageOptions, ...items: string[]): Thenable<string | undefined>
-    showErrorMessage<T extends vscode.MessageItem>(message: string, ...items: T[]): Thenable<T | undefined>
-    showErrorMessage<T extends vscode.MessageItem>(
-        message: string,
-        options: vscode.MessageOptions,
-        ...items: T[]
-    ): Thenable<T | undefined>
-
-    /**
-     * See {@link module:vscode.window.withProgress}.
-     */
-    withProgress<R>(
-        options: vscode.ProgressOptions,
-        task: (progress: vscode.Progress<ProgressEntry>, token: vscode.CancellationToken) => Thenable<R>
-    ): Thenable<R>
-
-    /**
-     * See {@link module:vscode.window.showOpenDialog}.
-     */
-    showOpenDialog(options: vscode.OpenDialogOptions): Thenable<vscode.Uri[] | undefined>
-
-    /**
-     * See {@link module:vscode.window.showSaveDialog}.
-     */
-    showSaveDialog(options: vscode.SaveDialogOptions): Thenable<vscode.Uri | undefined>
-}
-
-export namespace Window {
-    export function vscode(): Window {
-        return new DefaultWindow()
-    }
-}
-
-class DefaultWindow implements Window {
-    public setStatusBarMessage(message: string, hideAfterTimeout: number): vscode.Disposable {
-        return vscode.window.setStatusBarMessage(message, hideAfterTimeout)
-    }
-
-    public showInputBox(
-        options?: vscode.InputBoxOptions,
-        token?: vscode.CancellationToken
-    ): Thenable<string | undefined> {
-        return vscode.window.showInputBox(options, token)
-    }
-
-    public showInformationMessage(...args: any[]): Thenable<any | undefined> {
-        // @ts-ignore
-        return vscode.window.showInformationMessage(...args)
-    }
-
-    public showWarningMessage(...args: any[]): Thenable<any | undefined> {
-        // @ts-ignore
-        return vscode.window.showWarningMessage(...args)
-    }
-
-    public showErrorMessage(...args: any[]): Thenable<any | undefined> {
-        // @ts-ignore
-        return vscode.window.showErrorMessage(...args)
-    }
-
-    /**
-     * Wraps the `vscode.window.withProgress` functionality with functionality that also writes to the output channel.
-     * Params match `vscode.window.withProgress` API; documentation follows:
-     *
-     * Show progress in the editor. Progress is shown while running the given callback and while the promise it returned isn't resolved nor rejected. The location at which progress should show (and other details) is defined via the passed ProgressOptions.
-     *
-     *  @param task
-     *  A callback returning a promise. Progress state can be reported with the provided progress-object.
-     *
-     *  To report discrete progress, use increment to indicate how much work has been completed. Each call with a increment value will be summed up and reflected as overall progress until 100% is reached (a value of e.g. 10 accounts for 10% of work done). Note that currently only ProgressLocation.Notification is capable of showing discrete progress.
-     *
-     *  To monitor if the operation has been cancelled by the user, use the provided CancellationToken. Note that currently only ProgressLocation.Notification is supporting to show a cancel button to cancel the long running operation.
-     *
-     *  @return — The thenable the task-callback returned.
-     */
-    public withProgress<R>(
-        options: vscode.ProgressOptions,
-        task: (progress: vscode.Progress<ProgressEntry>, token: vscode.CancellationToken) => Thenable<R>
-    ): Thenable<R> {
-        if (options.title) {
-            globals.outputChannel.appendLine(options.title)
-        }
-
-        // hijack the returned task to wrap progress with an output channel adapter
-        const newTask: (progress: vscode.Progress<ProgressEntry>, token: vscode.CancellationToken) => Thenable<R> = (
-            progress: vscode.Progress<ProgressEntry>,
-            token: vscode.CancellationToken
-        ) => {
-            const newProgress: vscode.Progress<ProgressEntry> = {
-                ...progress,
-                report: (value: ProgressEntry) => {
-                    if (value.message) {
-                        globals.outputChannel.appendLine(value.message)
-                    }
-                    progress.report(value)
-                },
-            }
-
-            return task(newProgress, token)
-        }
-
-        return vscode.window.withProgress(options, newTask)
-    }
-
-    public showOpenDialog(options: vscode.OpenDialogOptions): Thenable<vscode.Uri[] | undefined> {
-        return vscode.window.showOpenDialog(options)
-    }
-
-    public showSaveDialog(options: vscode.SaveDialogOptions): Thenable<vscode.Uri | undefined> {
-        return vscode.window.showSaveDialog(options)
-    }
-}
diff --git a/src/shared/vscode/workspace.ts b/src/shared/vscode/workspace.ts
deleted file mode 100644
index 78870205cb8..00000000000
--- a/src/shared/vscode/workspace.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-
-/**
- * Components associated with {@link module:vscode.workspace}.
- */
-export interface Workspace {
-    /**
-     * See {@link module:vscode.workspace.getConfiguration}.
-     */
-    getConfiguration(section?: string, resource?: vscode.Uri | null): WorkspaceConfiguration
-}
-
-export namespace Workspace {
-    export function vscode(): Workspace {
-        return new DefaultWorkspace()
-    }
-}
-
-export interface WorkspaceConfiguration {
-    /**
-     * See {@link module:vscode.WorkspaceConfiguration.get}.
-     */
-    get<T>(key: string): T | undefined
-
-    update(
-        key: string,
-        value: any,
-        configurationTarget?: boolean | vscode.ConfigurationTarget | undefined,
-        overrideInLanguage?: boolean | undefined
-    ): Thenable<void>
-}
-
-class DefaultWorkspace implements Workspace {
-    public getConfiguration(section?: string, resource?: vscode.Uri | null): WorkspaceConfiguration {
-        return vscode.workspace.getConfiguration(section, resource)
-    }
-}
diff --git a/src/shared/wizards/wizard.ts b/src/shared/wizards/wizard.ts
deleted file mode 100644
index e5534d7b9e3..00000000000
--- a/src/shared/wizards/wizard.ts
+++ /dev/null
@@ -1,252 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Branch, ControlSignal, StateMachineController, StepFunction } from './stateController'
-import * as _ from 'lodash'
-import { Prompter, PromptResult } from '../../shared/ui/prompter'
-import { PrompterProvider, WizardForm } from './wizardForm'
-
-/** Checks if the user response is valid (i.e. not undefined and not a control signal) */
-export function isValidResponse<T>(response: PromptResult<T>): response is T {
-    return response !== undefined && !isWizardControl(response)
-}
-
-type ObjectKeys<T> = {
-    [Property in keyof T]: T[Property] extends Record<string, unknown> ? Property : never
-}[keyof T]
-
-type NonObjectKeys<T> = {
-    [Property in keyof T]: T[Property] extends Record<string, unknown> ? never : Property
-}[keyof T]
-
-/**
- * Reserved type. Currently makes all object-like fields required and everything else
- * optional.
- */
-export type WizardState<T> = {
-    [Property in ObjectKeys<T>]-?: T[Property] extends Record<string, unknown>
-        ? WizardState<Required<T[Property]>>
-        : never
-} & {
-    [Property in NonObjectKeys<T>]+?: T[Property] extends Record<string, unknown> ? never : T[Property]
-}
-
-// We use a symbol to safe-guard against collisions (alternatively this can be a class and use 'instanceof')
-const WIZARD_CONTROL = Symbol() // eslint-disable-line @typescript-eslint/naming-convention
-const makeControlString = (type: string) => `[WIZARD_CONTROL] ${type}`
-
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export const WIZARD_RETRY = {
-    id: WIZARD_CONTROL,
-    type: ControlSignal.Retry,
-    toString: () => makeControlString('Retry'),
-}
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export const WIZARD_BACK = { id: WIZARD_CONTROL, type: ControlSignal.Back, toString: () => makeControlString('Back') }
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export const WIZARD_EXIT = { id: WIZARD_CONTROL, type: ControlSignal.Exit, toString: () => makeControlString('Exit') }
-
-/** Control signals allow for alterations of the normal wizard flow */
-export type WizardControl = typeof WIZARD_RETRY | typeof WIZARD_BACK | typeof WIZARD_EXIT
-
-export function isWizardControl(obj: any): obj is WizardControl {
-    return obj !== undefined && obj.id === WIZARD_CONTROL
-}
-
-export interface StepEstimator<T> {
-    (response: PromptResult<T>): number
-}
-
-// Persistent storage that exists on a per-property basis, side effects may occur here
-type StepCache = { picked?: any; stepOffset?: [number, number] } & { [key: string]: any }
-export type StateWithCache<TState, TProp> = TState & { stepCache: StepCache; estimator: StepEstimator<TProp> }
-
-export interface WizardOptions<TState> {
-    readonly initForm?: WizardForm<TState>
-    readonly initState?: Partial<TState>
-    /** Provides a way to apply inputs to Prompters as if the user has already responded */
-    readonly implicitState?: Partial<TState>
-    readonly exitPrompterProvider?: (state: TState) => Prompter<boolean>
-}
-
-/**
- * A generic wizard that consumes data from a series of {@link Prompter prompters}. The 'form' public property
- * exposes functionality to add prompters to the wizard with optional context, utilizing the {@link WizardForm}
- * class. Wizards will modify a single property of their internal state with each prompt.
- */
-export class Wizard<TState extends Partial<Record<keyof TState, unknown>>> {
-    protected readonly _form: WizardForm<TState>
-    protected readonly boundSteps: Map<string, StepFunction<TState>> = new Map()
-    protected stateController: StateMachineController<TState>
-    private _stepOffset: [number, number] = [0, 0]
-    private _exitStep?: StepFunction<TState>
-
-    /**
-     * The offset is applied to both the current step and total number of steps. Useful if the wizard is
-     * apart of some overarching flow.
-     */
-    public set stepOffset(offset: [number, number]) {
-        this._stepOffset = offset
-    }
-    public get currentStep(): number {
-        return this._stepOffset[0] + this.stateController.currentStep
-    }
-    public get totalSteps(): number {
-        return this._stepOffset[1] + this.stateController.totalSteps
-    }
-
-    public get form() {
-        return this._form.body
-    }
-
-    /** The internal wizard form with bound prompters. This can be applied to other wizards. */
-    public get boundForm() {
-        return this._form
-    }
-
-    public get initialState(): Readonly<Partial<TState>> | undefined {
-        return this.options.initState
-    }
-
-    private _estimator: ((state: TState) => number) | undefined
-    public set parentEstimator(estimator: (state: TState) => number) {
-        this._estimator = estimator
-    }
-
-    public constructor(private readonly options: WizardOptions<TState> = {}) {
-        this.stateController = new StateMachineController(options.initState as TState)
-        this._form = options.initForm ?? new WizardForm()
-        this._exitStep =
-            options.exitPrompterProvider !== undefined ? this.createExitStep(options.exitPrompterProvider) : undefined
-    }
-
-    private assignSteps(): void {
-        this._form.properties.forEach(prop => {
-            const provider = this._form.getPrompterProvider(prop)
-            if (!this.boundSteps.has(prop) && provider !== undefined) {
-                this.boundSteps.set(prop, this.createBoundStep(prop, provider))
-            }
-        })
-    }
-
-    public async run(): Promise<TState | undefined> {
-        this.assignSteps()
-        this.resolveNextSteps((this.options.initState ?? {}) as TState).forEach(step =>
-            this.stateController.addStep(step)
-        )
-
-        const outputState = await this.stateController.run()
-
-        return outputState !== undefined ? this._form.applyDefaults(outputState) : undefined
-    }
-
-    private createStepEstimator<TProp>(state: TState, prop: string): StepEstimator<TProp> {
-        state = _.cloneDeep(state)
-
-        return response => {
-            if (response !== undefined && !isValidResponse(response)) {
-                return 0
-            }
-
-            _.set(state, prop, response)
-            const estimate = this.resolveNextSteps(state).length
-            const parentEstimate = this._estimator !== undefined ? this._estimator(state) : 0
-            _.set(state, prop, undefined)
-
-            return estimate + parentEstimate
-        }
-    }
-
-    private createExitStep(provider: NonNullable<WizardOptions<TState>['exitPrompterProvider']>): StepFunction<TState> {
-        return async state => {
-            const prompter = provider(state)
-            prompter.setSteps(this.currentStep, this.totalSteps)
-            const didExit = await prompter.prompt()
-
-            return {
-                nextState: state,
-                controlSignal: didExit ? ControlSignal.Exit : ControlSignal.Back,
-            }
-        }
-    }
-
-    private createBoundStep<TProp>(prop: string, provider: PrompterProvider<TState, TProp>): StepFunction<TState> {
-        const stepCache: StepCache = {}
-
-        return async state => {
-            const stateWithCache = Object.assign(
-                { stepCache: stepCache, estimator: this.createStepEstimator(state, prop) },
-                this._form.applyDefaults(state)
-            )
-            const impliedResponse = _.get(this.options.implicitState ?? {}, prop)
-            const response = await this.promptUser(stateWithCache, provider, impliedResponse)
-
-            if (response === WIZARD_EXIT && this._exitStep !== undefined) {
-                return {
-                    nextState: state,
-                    nextSteps: [this._exitStep],
-                }
-            }
-
-            return {
-                nextState: isValidResponse(response) ? _.set(state, prop, response) : state,
-                nextSteps: this.resolveNextSteps(state),
-                controlSignal: isWizardControl(response) ? response.type : undefined,
-            }
-        }
-    }
-
-    protected resolveNextSteps(state: TState): Branch<TState> {
-        const nextSteps: Branch<TState> = []
-        const defaultState = this._form.applyDefaults(state)
-        this.boundSteps.forEach((step, targetProp) => {
-            if (
-                this._form.canShowProperty(targetProp, state, defaultState) &&
-                !this.stateController.containsStep(step)
-            ) {
-                nextSteps.push(step)
-            }
-        })
-        return nextSteps
-    }
-
-    private async promptUser<TProp>(
-        state: StateWithCache<TState, TProp>,
-        provider: PrompterProvider<TState, TProp>,
-        impliedResponse?: TProp
-    ): Promise<PromptResult<TProp>> {
-        const prompter = provider(state as StateWithCache<WizardState<TState>, TProp>)
-
-        this._stepOffset = state.stepCache.stepOffset ?? this._stepOffset
-        state.stepCache.stepOffset = this._stepOffset
-        prompter.setSteps(this.currentStep, this.totalSteps)
-        prompter.setStepEstimator(state.estimator)
-
-        if (state.stepCache.picked !== undefined) {
-            prompter.recentItem = state.stepCache.picked
-        } else if (impliedResponse !== undefined) {
-            prompter.recentItem = impliedResponse
-        }
-
-        const answer = await prompter.prompt()
-
-        if (isValidResponse(answer)) {
-            state.stepCache.picked = prompter.recentItem
-        }
-
-        if (!isValidResponse(answer)) {
-            delete state.stepCache.stepOffset
-        }
-
-        this._stepOffset = [
-            this._stepOffset[0] + prompter.totalSteps - 1,
-            this._stepOffset[1] + prompter.totalSteps - 1,
-        ]
-
-        // Legacy code used 'undefined' to represent back, we will support the use-case
-        // but moving forward wizard implementations will explicity use 'WIZARD_BACK'
-        return answer ?? WIZARD_BACK
-    }
-}
diff --git a/src/ssmDocument/activation.ts b/src/ssmDocument/activation.ts
deleted file mode 100644
index aa9c263d0b2..00000000000
--- a/src/ssmDocument/activation.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { activate as activateSSMLanguageServer } from './ssm/ssmClient'
-import { AwsContext } from '../shared/awsContext'
-
-import { createSsmDocumentFromTemplate } from './commands/createDocumentFromTemplate'
-import { publishSSMDocument } from './commands/publishDocument'
-import { RegionProvider } from '../shared/regions/regionProvider'
-import { openDocumentItem, openDocumentItemJson, openDocumentItemYaml } from './commands/openDocumentItem'
-import { DocumentItemNode } from './explorer/documentItemNode'
-import { deleteDocument } from './commands/deleteDocument'
-import { DocumentItemNodeWriteable } from './explorer/documentItemNodeWriteable'
-import { updateDocumentVersion } from './commands/updateDocumentVersion'
-import { Commands } from '../shared/vscode/commands2'
-
-// Activate SSM Document related functionality for the extension.
-export async function activate(
-    extensionContext: vscode.ExtensionContext,
-    awsContext: AwsContext,
-    regionProvider: RegionProvider,
-    outputChannel: vscode.OutputChannel
-): Promise<void> {
-    await registerSsmDocumentCommands(extensionContext, awsContext, regionProvider, outputChannel)
-    await activateSSMLanguageServer(extensionContext)
-}
-
-async function registerSsmDocumentCommands(
-    extensionContext: vscode.ExtensionContext,
-    awsContext: AwsContext,
-    regionProvider: RegionProvider,
-    outputChannel: vscode.OutputChannel
-): Promise<void> {
-    extensionContext.subscriptions.push(
-        Commands.register('aws.ssmDocument.createLocalDocument', async () => {
-            await createSsmDocumentFromTemplate(extensionContext)
-        }),
-        Commands.register('aws.ssmDocument.deleteDocument', async (node: DocumentItemNodeWriteable) => {
-            await deleteDocument(node)
-        }),
-        Commands.register('aws.ssmDocument.openLocalDocument', async (node: DocumentItemNode) => {
-            await openDocumentItem(node, awsContext)
-        }),
-        Commands.register('aws.ssmDocument.openLocalDocumentJson', async (node: DocumentItemNode) => {
-            await openDocumentItemJson(node, awsContext)
-        }),
-        Commands.register('aws.ssmDocument.openLocalDocumentYaml', async (node: DocumentItemNode) => {
-            await openDocumentItemYaml(node, awsContext)
-        }),
-        Commands.register('aws.ssmDocument.publishDocument', async () => {
-            await publishSSMDocument(awsContext, regionProvider)
-        }),
-        Commands.register('aws.ssmDocument.updateDocumentVersion', async (node: DocumentItemNodeWriteable) => {
-            await updateDocumentVersion(node, awsContext)
-        })
-    )
-}
diff --git a/src/ssmDocument/commands/deleteDocument.ts b/src/ssmDocument/commands/deleteDocument.ts
deleted file mode 100644
index b32a6294c60..00000000000
--- a/src/ssmDocument/commands/deleteDocument.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as vscode from 'vscode'
-import { getLogger, Logger } from '../../shared/logger'
-import { DocumentItemNodeWriteable } from '../explorer/documentItemNodeWriteable'
-import { RegistryItemNode } from '../explorer/registryItemNode'
-import { showConfirmationMessage } from '../util/util'
-import * as localizedText from '../../shared/localizedText'
-import { Window } from '../../shared/vscode/window'
-import { Commands } from '../../shared/vscode/commands'
-import { showViewLogsMessage } from '../../shared/utilities/messages'
-import { telemetry } from '../../shared/telemetry/telemetry'
-import { Result } from '../../shared/telemetry/telemetry'
-
-export async function deleteDocument(
-    node: DocumentItemNodeWriteable,
-    window = Window.vscode(),
-    commands = Commands.vscode()
-) {
-    const logger: Logger = getLogger()
-
-    let result: Result = 'Succeeded'
-    const isConfirmed = await showConfirmationMessage(
-        {
-            prompt: localize(
-                'AWS.ssmDocument.deleteDocument.prompt',
-                'Are you sure you want to delete document {0}?',
-                node.documentName
-            ),
-            confirm: localizedText.localizedDelete,
-            cancel: localizedText.cancel,
-        },
-        window
-    )
-    if (!isConfirmed) {
-        logger.info('DeleteDocument cancelled')
-        telemetry.ssm_deleteDocument.emit({ result: 'Cancelled' })
-        return
-    }
-
-    try {
-        const deleteDocumentResult = await node.deleteDocument()
-        if (!deleteDocumentResult) {
-            result = 'Failed'
-            logger.error(`Delete document failed: Empty document name`)
-            vscode.window.showErrorMessage(
-                localize(
-                    'AWS.message.info.ssmDocument.deleteDocument.failed.empty_document_name',
-                    'Delete document failed: Empty document name'
-                )
-            )
-        } else {
-            logger.info(`Deleted Systems Manager Document: ${node.documentName}`)
-            vscode.window.showInformationMessage(
-                localize(
-                    'AWS.message.info.ssmDocument.deleteDocument.delete_success',
-                    'Deleted document: {0}',
-                    node.documentName
-                )
-            )
-            await refreshNode(node.parent, commands)
-        }
-    } catch (err) {
-        result = 'Failed'
-        const error = err as Error
-        logger.error('Error on deleting document: %0', error)
-        showViewLogsMessage(
-            localize(
-                'AWS.message.error.ssmDocument.deleteDocument.could_not_delete',
-                'Could not delete document {0}.',
-                error.message
-            ),
-            vscode.window
-        )
-    } finally {
-        telemetry.ssm_deleteDocument.emit({ result: result })
-    }
-}
-
-async function refreshNode(node: RegistryItemNode, commands: Commands): Promise<void> {
-    return commands.execute('aws.refreshAwsExplorerNode', node)
-}
diff --git a/src/ssmDocument/commands/publishDocument.ts b/src/ssmDocument/commands/publishDocument.ts
deleted file mode 100644
index 77da916b14e..00000000000
--- a/src/ssmDocument/commands/publishDocument.ts
+++ /dev/null
@@ -1,167 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { SSM } from 'aws-sdk'
-import * as vscode from 'vscode'
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-import { AwsContext } from '../../shared/awsContext'
-import { DefaultSsmDocumentClient, SsmDocumentClient } from '../../shared/clients/ssmDocumentClient'
-import { ssmJson, ssmYaml } from '../../shared/constants'
-
-import * as localizedText from '../../shared/localizedText'
-import { getLogger, Logger } from '../../shared/logger'
-import { RegionProvider } from '../../shared/regions/regionProvider'
-import { PublishSSMDocumentWizard, PublishSSMDocumentWizardResponse } from '../wizards/publishDocumentWizard'
-import { Window } from '../../shared/vscode/window'
-import { showConfirmationMessage } from '../util/util'
-import { telemetry } from '../../shared/telemetry/telemetry'
-import { Result, SsmOperation } from '../../shared/telemetry/telemetry'
-
-export async function publishSSMDocument(awsContext: AwsContext, regionProvider: RegionProvider): Promise<void> {
-    const logger: Logger = getLogger()
-
-    const textDocument = vscode.window.activeTextEditor?.document
-    if (!textDocument) {
-        const errorMsg = 'Could not get active text editor for local Systems Manager Document definition'
-        logger.error(errorMsg)
-        vscode.window.showErrorMessage(
-            localize(
-                'AWS.message.error.ssmDocument.publishDocument.could_not_open',
-                'Could not get active text editor for local Systems Manager Document definition'
-            )
-        )
-        return
-    }
-
-    if (textDocument.languageId !== ssmJson && textDocument.languageId !== ssmYaml) {
-        const supportedFormats = [ssmJson, ssmYaml]
-        const errorMsg = 'Current editor language does not match the supported formats: ' + supportedFormats.join(', ')
-        logger.error(errorMsg)
-        vscode.window.showErrorMessage(
-            localize(
-                'AWS.message.error.ssmDocument.publishDocument.invalid_format',
-                'Current editor language does not match the supported formats: {0}',
-                supportedFormats.join(', ')
-            )
-        )
-        return
-    }
-
-    try {
-        const response = await new PublishSSMDocumentWizard().run()
-        if (response?.action == 'Create') {
-            await createDocument(response, textDocument)
-        } else if (response?.action == 'Update') {
-            await updateDocument(response, textDocument)
-        }
-    } catch (err) {
-        logger.error(err as Error)
-    }
-}
-
-export async function createDocument(
-    wizardResponse: PublishSSMDocumentWizardResponse,
-    textDocument: vscode.TextDocument,
-    client: SsmDocumentClient = new DefaultSsmDocumentClient(wizardResponse.region)
-) {
-    let result: Result = 'Succeeded'
-    const ssmOperation = wizardResponse.action as SsmOperation
-
-    const logger: Logger = getLogger()
-    logger.info(`Creating Systems Manager Document '${wizardResponse.name}'`)
-
-    try {
-        const request: SSM.CreateDocumentRequest = {
-            Content: textDocument.getText(),
-            Name: wizardResponse.name,
-            DocumentType: wizardResponse.documentType,
-            DocumentFormat: textDocument.languageId === ssmYaml ? 'YAML' : 'JSON',
-        }
-
-        const createResult = await client.createDocument(request)
-        logger.info(`Created Systems Manager Document: ${JSON.stringify(createResult.DocumentDescription)}`)
-        vscode.window.showInformationMessage(`Created Systems Manager Document: ${wizardResponse.name}`)
-    } catch (err) {
-        const error = err as Error
-        logger.error(`Failed to create Systems Manager Document "${wizardResponse.name}": %s`, error.message)
-        result = 'Failed'
-        vscode.window.showErrorMessage(
-            `Failed to create Systems Manager Document '${wizardResponse.name}'. \n${error.message}`
-        )
-    } finally {
-        telemetry.ssm_publishDocument.emit({ result, ssmOperation })
-    }
-}
-
-export async function updateDocument(
-    wizardResponse: PublishSSMDocumentWizardResponse,
-    textDocument: vscode.TextDocument,
-    client: SsmDocumentClient = new DefaultSsmDocumentClient(wizardResponse.region),
-    window = Window.vscode()
-) {
-    let result: Result = 'Succeeded'
-    const ssmOperation = wizardResponse.action as SsmOperation
-
-    const logger: Logger = getLogger()
-    logger.info(`Updating Systems Manager Document '${wizardResponse.name}'`)
-
-    try {
-        const request: SSM.UpdateDocumentRequest = {
-            Content: textDocument.getText(),
-            Name: wizardResponse.name,
-            DocumentVersion: '$LATEST',
-            DocumentFormat: textDocument.languageId === ssmYaml ? 'YAML' : 'JSON',
-        }
-
-        const updateResult = await client.updateDocument(request)
-
-        logger.info(`Updated Systems Manager Document: ${JSON.stringify(updateResult.DocumentDescription)}`)
-        vscode.window.showInformationMessage(`Updated Systems Manager Document: ${wizardResponse.name}`)
-
-        const isConfirmed = await showConfirmationMessage(
-            {
-                prompt: localize(
-                    'AWS.ssmDocument.publishDocument.updateVersion.prompt',
-                    'Would you like to make this the default version for {0}?',
-                    wizardResponse.name
-                ),
-                confirm: localizedText.yes,
-                cancel: localizedText.no,
-            },
-            window
-        )
-
-        if (!isConfirmed) {
-            logger.info('Declined update default version on update document success.')
-        } else {
-            try {
-                const documentVersion: string | undefined = updateResult.DocumentDescription?.DocumentVersion
-                if (documentVersion !== undefined) {
-                    await client.updateDocumentVersion(wizardResponse.name, documentVersion)
-                    logger.info('Updated Systems Manager Document default version')
-                    vscode.window.showInformationMessage('Updated Systems Manager Document default version')
-                }
-            } catch (err) {
-                logger.error(
-                    `Failed to update Systems Manager Document default version for "${wizardResponse.name}": %s`,
-                    (err as Error).message
-                )
-                vscode.window.showErrorMessage(
-                    `Failed to update Systems Manager Document default version for: ${wizardResponse.name}`
-                )
-            }
-        }
-    } catch (err) {
-        const error = err as Error
-        logger.error(`Failed to update Systems Manager Document '${wizardResponse.name}'. %0`, error)
-        result = 'Failed'
-        vscode.window.showErrorMessage(
-            `Failed to update Systems Manager Document '${wizardResponse.name}'. \n${error.message}`
-        )
-    } finally {
-        telemetry.ssm_publishDocument.emit({ result, ssmOperation })
-    }
-}
diff --git a/src/ssmDocument/explorer/documentItemNodeWriteable.ts b/src/ssmDocument/explorer/documentItemNodeWriteable.ts
deleted file mode 100644
index f03474217b9..00000000000
--- a/src/ssmDocument/explorer/documentItemNodeWriteable.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { SSM } from 'aws-sdk'
-import { RegistryItemNode } from './registryItemNode'
-import { SsmDocumentClient } from '../../shared/clients/ssmDocumentClient'
-import { DocumentItemNode } from './documentItemNode'
-
-export class DocumentItemNodeWriteable extends DocumentItemNode {
-    public constructor(
-        documentItem: SSM.Types.DocumentIdentifier,
-        public override readonly client: SsmDocumentClient,
-        public override readonly regionCode: string,
-        public readonly parent: RegistryItemNode
-    ) {
-        super(documentItem, client, regionCode)
-        this.contextValue = 'awsDocumentItemNodeWriteable'
-        this.parent = parent
-    }
-
-    public async deleteDocument(): Promise<SSM.Types.DeleteDocumentResult> {
-        if (!this.documentName || !this.documentName.length) {
-            return Promise.resolve({})
-        }
-
-        return await this.client.deleteDocument(this.documentName)
-    }
-
-    public async updateDocumentVersion(
-        documentVersion?: string
-    ): Promise<SSM.Types.UpdateDocumentDefaultVersionResult> {
-        if (!documentVersion || !documentVersion.length) {
-            return Promise.resolve({})
-        }
-        return await this.client.updateDocumentVersion(this.documentName, documentVersion)
-    }
-}
diff --git a/src/ssmDocument/explorer/registryItemNode.ts b/src/ssmDocument/explorer/registryItemNode.ts
deleted file mode 100644
index 31db6334d30..00000000000
--- a/src/ssmDocument/explorer/registryItemNode.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import { SSM } from 'aws-sdk'
-import * as vscode from 'vscode'
-
-import { DefaultSsmDocumentClient, SsmDocumentClient } from '../../shared/clients/ssmDocumentClient'
-
-import { AWSTreeNodeBase } from '../../shared/treeview/nodes/awsTreeNodeBase'
-import { PlaceholderNode } from '../../shared/treeview/nodes/placeholderNode'
-import { makeChildrenNodes } from '../../shared/treeview/utils'
-import { toArrayAsync, updateInPlace } from '../../shared/utilities/collectionUtils'
-import { DocumentItemNode } from './documentItemNode'
-import { DocumentItemNodeWriteable } from './documentItemNodeWriteable'
-
-export const amazonRegistryName = localize('AWS.explorerNode.registry.name.amazon', 'Owned by Amazon')
-export const userRegistryName = localize('AWS.explorerNode.registry.name.self', 'Owned by me')
-export const sharedRegistryName = localize('AWS.explorerNode.registry.name.shared', 'Shared with me')
-
-export class RegistryItemNode extends AWSTreeNodeBase {
-    private readonly documentNodes: Map<string, DocumentItemNode>
-
-    public constructor(
-        public override readonly regionCode: string,
-        public registryName: string,
-        readonly documentType: string,
-        private readonly client = new DefaultSsmDocumentClient(regionCode)
-    ) {
-        super('', vscode.TreeItemCollapsibleState.Collapsed)
-
-        this.setLabel()
-
-        this.documentNodes = new Map<string, DocumentItemNode>()
-    }
-
-    private setLabel() {
-        this.label = this.registryName
-        this.iconPath = ''
-    }
-
-    public update(registryName: string): void {
-        this.registryName = registryName
-        this.setLabel()
-    }
-
-    public override async getChildren(): Promise<AWSTreeNodeBase[]> {
-        return await makeChildrenNodes({
-            getChildNodes: async () => {
-                await this.updateChildren()
-
-                return [...this.documentNodes.values()]
-            },
-            getNoChildrenPlaceholderNode: async () =>
-                new PlaceholderNode(
-                    this,
-                    localize('AWS.explorerNode.documentType.noSsmDocument', `[No documents found]`)
-                ),
-            sort: (nodeA, nodeB) => nodeA.documentName.localeCompare(nodeB.documentName),
-        })
-    }
-
-    private async getDocumentByOwner(client: SsmDocumentClient): Promise<SSM.DocumentIdentifier[]> {
-        const request: SSM.ListDocumentsRequest = {
-            Filters: [
-                {
-                    Key: 'DocumentType',
-                    Values: [this.documentType],
-                },
-            ],
-        }
-
-        if (this.registryName === userRegistryName) {
-            request.Filters?.push({
-                Key: 'Owner',
-                Values: ['Self'],
-            })
-        } else if (this.registryName === sharedRegistryName) {
-            request.Filters?.push({
-                Key: 'Owner',
-                Values: ['Private'],
-            })
-        } else if (this.registryName === amazonRegistryName) {
-            request.Filters?.push({
-                Key: 'Owner',
-                Values: ['Amazon'],
-            })
-        }
-
-        return toArrayAsync(client.listDocuments(request))
-    }
-
-    public async updateChildren(): Promise<void> {
-        const documents = new Map<string, SSM.Types.DocumentIdentifier>()
-
-        const docs = await this.getDocumentByOwner(this.client)
-        docs.forEach(doc => {
-            documents.set(doc.Name!, doc)
-        })
-
-        if (this.registryName === userRegistryName) {
-            updateInPlace(
-                this.documentNodes,
-                documents.keys(),
-                key => this.documentNodes.get(key)!.update(documents.get(key)!),
-                key => new DocumentItemNodeWriteable(documents.get(key)!, this.client, this.regionCode, this)
-            )
-        } else {
-            updateInPlace(
-                this.documentNodes,
-                documents.keys(),
-                key => this.documentNodes.get(key)!.update(documents.get(key)!),
-                key => new DocumentItemNode(documents.get(key)!, this.client, this.regionCode)
-            )
-        }
-    }
-}
diff --git a/src/ssmDocument/util/util.ts b/src/ssmDocument/util/util.ts
deleted file mode 100644
index 2ac2b9b7ded..00000000000
--- a/src/ssmDocument/util/util.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as vscode from 'vscode'
-import * as picker from '../../shared/ui/picker'
-import { Window } from '../../shared/vscode/window'
-
-export async function promptUserForDocumentFormat(
-    formats: string[],
-    params?: { step?: number; totalSteps?: number }
-): Promise<string | undefined> {
-    // Prompt user to pick document format
-    const quickPickItems: vscode.QuickPickItem[] = formats.map(format => {
-        return {
-            label: format,
-            description: `Download document as ${format}`,
-        }
-    })
-
-    const formatPick = picker.createQuickPick({
-        options: {
-            ignoreFocusOut: true,
-            title: localize('AWS.message.prompt.selectSsmDocumentFormat.placeholder', 'Select a document format'),
-            step: params?.step,
-            totalSteps: params?.totalSteps,
-        },
-        items: quickPickItems,
-    })
-
-    const formatChoices = await picker.promptUser({
-        picker: formatPick,
-    })
-
-    const formatSelection = picker.verifySinglePickerOutput(formatChoices)
-
-    // User pressed escape and didn't select a template
-    if (formatSelection === undefined) {
-        return undefined
-    }
-
-    return formatSelection.label
-}
-
-export async function showConfirmationMessage(
-    { prompt, confirm, cancel }: { prompt: string; confirm: string; cancel: string },
-    window: Window
-): Promise<boolean> {
-    const confirmItem: vscode.MessageItem = { title: confirm }
-    const cancelItem: vscode.MessageItem = { title: cancel, isCloseAffordance: true }
-
-    const selection = await window.showWarningMessage(prompt, { modal: true }, confirmItem, cancelItem)
-    return selection === confirmItem
-}
diff --git a/src/stepFunctions/activation.ts b/src/stepFunctions/activation.ts
deleted file mode 100644
index 15bd6ae9c47..00000000000
--- a/src/stepFunctions/activation.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import globals from '../shared/extensionGlobals'
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import { join } from 'path'
-import * as vscode from 'vscode'
-import { AwsContext } from '../shared/awsContext'
-import { activate as activateASL } from './asl/client'
-import { createStateMachineFromTemplate } from './commands/createStateMachineFromTemplate'
-import { publishStateMachine } from './commands/publishStateMachine'
-import { AslVisualizationManager } from './commands/visualizeStateMachine/aslVisualizationManager'
-import { Commands } from '../shared/vscode/commands2'
-
-import { ASL_FORMATS, YAML_ASL, JSON_ASL } from './constants/aslFormats'
-import { AslVisualizationCDKManager } from './commands/visualizeStateMachine/aslVisualizationCDKManager'
-import { renderCdkStateMachineGraph } from './commands/visualizeStateMachine/renderStateMachineGraphCDK'
-import { ToolkitError } from '../shared/errors'
-import { telemetry } from '../shared/telemetry/telemetry'
-
-/**
- * Activate Step Functions related functionality for the extension.
- */
-export async function activate(
-    extensionContext: vscode.ExtensionContext,
-    awsContext: AwsContext,
-    outputChannel: vscode.OutputChannel
-): Promise<void> {
-    globals.visualizationResourcePaths = initalizeWebviewPaths(extensionContext)
-
-    setImmediate(() => activateASL(extensionContext))
-    await registerStepFunctionCommands(extensionContext, awsContext, outputChannel)
-    initializeCodeLens(extensionContext)
-}
-
-/*
- * TODO: Determine behaviour when command is run against bad input, or
- * non-json files. Determine if we want to limit the command to only a
- * specifc subset of file types ( .json only, custom .states extension, etc...)
- * Ensure tests are written for this use case as well.
- */
-export const previewStateMachineCommand = Commands.declare(
-    'aws.previewStateMachine',
-    (globalState: vscode.Memento, manager: AslVisualizationManager) => async (arg?: vscode.TextEditor | vscode.Uri) => {
-        try {
-            arg ??= vscode.window.activeTextEditor
-            const input = arg instanceof vscode.Uri ? arg : arg?.document
-
-            if (!input) {
-                throw new ToolkitError('No active text editor or document found')
-            }
-
-            return await manager.visualizeStateMachine(globalState, input)
-        } finally {
-            // TODO: Consider making the metric reflect the success/failure of the above call
-            telemetry.stepfunctions_previewstatemachine.emit()
-        }
-    }
-)
-
-async function registerStepFunctionCommands(
-    extensionContext: vscode.ExtensionContext,
-    awsContext: AwsContext,
-    outputChannel: vscode.OutputChannel
-): Promise<void> {
-    const visualizationManager = new AslVisualizationManager(extensionContext)
-    const cdkVisualizationManager = new AslVisualizationCDKManager(extensionContext)
-
-    extensionContext.subscriptions.push(
-        previewStateMachineCommand.register(extensionContext.globalState, visualizationManager),
-        renderCdkStateMachineGraph.register(extensionContext.globalState, cdkVisualizationManager),
-        Commands.register('aws.stepfunctions.createStateMachineFromTemplate', async () => {
-            try {
-                await createStateMachineFromTemplate(extensionContext)
-            } finally {
-                telemetry.stepfunctions_createStateMachineFromTemplate.emit()
-            }
-        }),
-        Commands.register('aws.stepfunctions.publishStateMachine', async (node?: any) => {
-            const region: string | undefined = node?.regionCode
-            await publishStateMachine(awsContext, outputChannel, region)
-        })
-    )
-}
-
-export function initalizeWebviewPaths(context: vscode.ExtensionContext): typeof globals['visualizationResourcePaths'] {
-    // Location for script in body of webview that handles input from user
-    // and calls the code to render state machine graph
-
-    // Locations for script and css that render the state machine
-    const visualizationLibraryCache = join(context.globalStorageUri.fsPath, 'visualization')
-
-    return {
-        localWebviewScriptsPath: vscode.Uri.file(context.asAbsolutePath(join('resources', 'js'))),
-        webviewBodyScript: vscode.Uri.file(context.asAbsolutePath(join('resources', 'js', 'graphStateMachine.js'))),
-        visualizationLibraryCachePath: vscode.Uri.file(visualizationLibraryCache),
-        visualizationLibraryScript: vscode.Uri.file(join(visualizationLibraryCache, 'graph.js')),
-        visualizationLibraryCSS: vscode.Uri.file(join(visualizationLibraryCache, 'graph.css')),
-        // Locations for an additional stylesheet to add Light/Dark/High-Contrast theme support
-        stateMachineCustomThemePath: vscode.Uri.file(context.asAbsolutePath(join('resources', 'css'))),
-        stateMachineCustomThemeCSS: vscode.Uri.file(
-            context.asAbsolutePath(join('resources', 'css', 'stateMachineRender.css'))
-        ),
-    }
-}
-
-function initializeCodeLens(context: vscode.ExtensionContext) {
-    class StepFunctionsCodeLensProvider implements vscode.CodeLensProvider {
-        public async provideCodeLenses(document: vscode.TextDocument): Promise<vscode.CodeLens[]> {
-            const topOfDocument = new vscode.Range(0, 0, 0, 0)
-
-            const renderCodeLens = previewStateMachineCommand.build().asCodeLens(topOfDocument, {
-                title: localize('AWS.stepFunctions.render', 'Render graph'),
-            })
-
-            if (ASL_FORMATS.includes(document.languageId)) {
-                const publishCommand: vscode.Command = {
-                    command: 'aws.stepfunctions.publishStateMachine',
-                    title: localize('AWS.stepFunctions.publish', 'Publish to Step Functions'),
-                }
-                const publishCodeLens = new vscode.CodeLens(topOfDocument, publishCommand)
-
-                return [publishCodeLens, renderCodeLens]
-            } else {
-                return [renderCodeLens]
-            }
-        }
-    }
-
-    const docSelector = [{ language: JSON_ASL }, { language: YAML_ASL }]
-
-    const codeLensProviderDisposable = vscode.languages.registerCodeLensProvider(
-        docSelector,
-        new StepFunctionsCodeLensProvider()
-    )
-
-    context.subscriptions.push(codeLensProviderDisposable)
-}
diff --git a/src/stepFunctions/asl/client.ts b/src/stepFunctions/asl/client.ts
deleted file mode 100644
index 63fad3aff00..00000000000
--- a/src/stepFunctions/asl/client.ts
+++ /dev/null
@@ -1,182 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*!
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- */
-
-import * as path from 'path'
-import * as nls from 'vscode-nls'
-
-const localize = nls.loadMessageBundle()
-
-import {
-    CancellationToken,
-    Disposable,
-    ExtensionContext,
-    FormattingOptions,
-    LanguageConfiguration,
-    languages,
-    ProviderResult,
-    Range,
-    TextDocument,
-    TextEdit,
-    window,
-    workspace,
-} from 'vscode'
-
-import {
-    DidChangeConfigurationNotification,
-    DocumentRangeFormattingParams,
-    DocumentRangeFormattingRequest,
-    LanguageClient,
-    LanguageClientOptions,
-    NotificationType,
-    ServerOptions,
-    TransportKind,
-} from 'vscode-languageclient'
-
-import { YAML_ASL, JSON_ASL, ASL_FORMATS } from '../constants/aslFormats'
-import { StepFunctionsSettings } from '../utils'
-
-namespace ResultLimitReachedNotification {
-    export const type: NotificationType<string, any> = new NotificationType('asl/resultLimitReached')
-}
-
-interface Settings {
-    asl?: {
-        format?: { enable: boolean }
-        resultLimit?: number
-    }
-}
-
-export async function activate(extensionContext: ExtensionContext) {
-    const config = new StepFunctionsSettings()
-    const toDispose = extensionContext.subscriptions
-
-    let rangeFormatting: Disposable | undefined
-
-    // The server is implemented in node
-    const serverModule = extensionContext.asAbsolutePath(path.join('dist/src/stepFunctions/asl/', 'aslServer.js'))
-    // The debug options for the server
-    // --inspect=6009: runs the server in Node's Inspector mode so VS Code can attach to the server for debugging
-    const debugOptions = { execArgv: ['--nolazy', '--inspect=6009', '--preserve-symlinks'] }
-
-    // If the extension is launch in debug mode the debug server options are use
-    // Otherwise the run options are used
-    const serverOptions: ServerOptions = {
-        run: { module: serverModule, transport: TransportKind.ipc },
-        debug: { module: serverModule, transport: TransportKind.ipc, options: debugOptions },
-    }
-
-    const documentSelector = [
-        { schema: 'file', language: JSON_ASL },
-        { schema: 'untitled', language: JSON_ASL },
-        { schema: 'file', language: YAML_ASL },
-        { schema: 'untitled', language: YAML_ASL },
-    ]
-
-    // Options to control the language client
-    const clientOptions: LanguageClientOptions = {
-        // Register the server for json documents
-        documentSelector,
-        initializationOptions: {
-            handledSchemaProtocols: ['file', 'untitled'], // language server only loads file-URI. Fetching schemas with other protocols ('http'...) are made on the client.
-            provideFormatter: false, // tell the server to not provide formatting capability and ignore the `aws.stepfunctions.asl.format.enable` setting.
-        },
-        synchronize: {
-            // Synchronize the setting section 'json' to the server
-            configurationSection: ASL_FORMATS,
-            fileEvents: workspace.createFileSystemWatcher('**/*.{asl,asl.json,asl.yml,asl.yaml}'),
-        },
-        middleware: {
-            workspace: {
-                didChangeConfiguration: () =>
-                    client.sendNotification(DidChangeConfigurationNotification.type, { settings: getSettings(config) }),
-            },
-        },
-    }
-
-    // Create the language client and start the client.
-    const client = new LanguageClient(
-        'asl',
-        localize('asl.server.name', 'Amazon States Language Server'),
-        serverOptions,
-        clientOptions
-    )
-    client.registerProposedFeatures()
-
-    const disposable = client.start()
-    toDispose.push(disposable)
-
-    const languageConfiguration: LanguageConfiguration = {
-        wordPattern: /("(?:[^\\\"]*(?:\\.)?)*"?)|[^\s{}\[\],:]+/,
-        indentationRules: {
-            increaseIndentPattern: /({+(?=([^"]*"[^"]*")*[^"}]*$))|(\[+(?=([^"]*"[^"]*")*[^"\]]*$))/,
-            decreaseIndentPattern: /^\s*[}\]],?\s*$/,
-        },
-    }
-    languages.setLanguageConfiguration('asl', languageConfiguration)
-
-    function updateFormatterRegistration() {
-        const formatEnabled = config.get('format.enable', false)
-        if (!formatEnabled && rangeFormatting) {
-            rangeFormatting.dispose()
-            rangeFormatting = undefined
-        } else if (formatEnabled && !rangeFormatting) {
-            rangeFormatting = languages.registerDocumentRangeFormattingEditProvider(documentSelector, {
-                provideDocumentRangeFormattingEdits(
-                    document: TextDocument,
-                    range: Range,
-                    options: FormattingOptions,
-                    token: CancellationToken
-                ): ProviderResult<TextEdit[]> {
-                    const params: DocumentRangeFormattingParams = {
-                        textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document),
-                        range: client.code2ProtocolConverter.asRange(range),
-                        options: client.code2ProtocolConverter.asFormattingOptions(options),
-                    }
-
-                    return client.sendRequest(DocumentRangeFormattingRequest.type, params, token).then(
-                        response => client.protocol2CodeConverter.asTextEdits(response),
-                        async error => {
-                            client.logFailedRequest(DocumentRangeFormattingRequest.type, error)
-
-                            return Promise.resolve([])
-                        }
-                    )
-                },
-            })
-        }
-    }
-
-    return client.onReady().then(() => {
-        updateFormatterRegistration()
-        const disposableFunc = { dispose: () => rangeFormatting?.dispose() as void }
-        toDispose.push(disposableFunc)
-        toDispose.push(config.onDidChange(({ key }) => key === 'format.enable' && updateFormatterRegistration()))
-
-        client.onNotification(ResultLimitReachedNotification.type, message => {
-            window.showInformationMessage(
-                `${message}\nUse setting 'aws.stepfunctions.asl.maxItemsComputed' to configure the limit.`
-            )
-        })
-    })
-}
-
-export async function deactivate(): Promise<any> {
-    return Promise.resolve(undefined)
-}
-
-function getSettings(config: StepFunctionsSettings): Settings {
-    const resultLimit = config.get('maxItemsComputed', 5000)
-
-    return {
-        asl: {
-            resultLimit,
-        },
-    }
-}
diff --git a/src/stepFunctions/commands/downloadStateMachineDefinition.ts b/src/stepFunctions/commands/downloadStateMachineDefinition.ts
deleted file mode 100644
index 77ab5a8da52..00000000000
--- a/src/stepFunctions/commands/downloadStateMachineDefinition.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-import * as os from 'os'
-const localize = nls.loadMessageBundle()
-
-import { StepFunctions } from 'aws-sdk'
-import * as fs from 'fs-extra'
-import * as path from 'path'
-import * as vscode from 'vscode'
-import { DefaultStepFunctionsClient, StepFunctionsClient } from '../../shared/clients/stepFunctionsClient'
-
-import { getLogger, Logger } from '../../shared/logger'
-import { Result } from '../../shared/telemetry/telemetry'
-import { StateMachineNode } from '../explorer/stepFunctionsNodes'
-import { previewStateMachineCommand } from '../activation'
-import { telemetry } from '../../shared/telemetry/telemetry'
-
-export async function downloadStateMachineDefinition(params: {
-    outputChannel: vscode.OutputChannel
-    stateMachineNode: StateMachineNode
-    isPreviewAndRender?: boolean
-}) {
-    const logger: Logger = getLogger()
-    let downloadResult: Result = 'Succeeded'
-    const stateMachineName = params.stateMachineNode.details.name
-    try {
-        const client: StepFunctionsClient = new DefaultStepFunctionsClient(params.stateMachineNode.regionCode)
-        const stateMachineDetails: StepFunctions.DescribeStateMachineOutput = await client.getStateMachineDetails(
-            params.stateMachineNode.details.stateMachineArn
-        )
-
-        if (params.isPreviewAndRender) {
-            const doc = await vscode.workspace.openTextDocument({
-                language: 'asl',
-                content: stateMachineDetails.definition,
-            })
-
-            const textEditor = await vscode.window.showTextDocument(doc)
-            await previewStateMachineCommand.execute(textEditor)
-        } else {
-            const wsPath = vscode.workspace.workspaceFolders
-                ? vscode.workspace.workspaceFolders[0].uri.fsPath
-                : os.homedir()
-            const defaultFilePath = path.join(wsPath, params.stateMachineNode.details.name + '.asl.json')
-            const fileInfo = await vscode.window.showSaveDialog({ defaultUri: vscode.Uri.file(defaultFilePath) })
-
-            if (fileInfo) {
-                const filePath = fileInfo.fsPath
-                fs.writeFileSync(filePath, stateMachineDetails.definition, 'utf8')
-                const openPath = vscode.Uri.file(filePath)
-                const doc = await vscode.workspace.openTextDocument(openPath)
-                vscode.window.showTextDocument(doc)
-            }
-        }
-    } catch (err) {
-        const error = err as Error
-        logger.error(error)
-        downloadResult = 'Failed'
-        params.outputChannel.show(true)
-        params.outputChannel.appendLine(
-            localize(
-                'AWS.message.error.stepfunctions.downloadStateMachineDefinition',
-                "Unable to download state machine '{0}', check logs for details.",
-                stateMachineName
-            )
-        )
-        params.outputChannel.appendLine(error.message)
-        params.outputChannel.appendLine('')
-    } finally {
-        telemetry.stepfunctions_downloadStateMachineDefinition.emit({ result: downloadResult })
-    }
-}
diff --git a/src/stepFunctions/commands/publishStateMachine.ts b/src/stepFunctions/commands/publishStateMachine.ts
deleted file mode 100644
index 4ea0eab1172..00000000000
--- a/src/stepFunctions/commands/publishStateMachine.ts
+++ /dev/null
@@ -1,163 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { load } from 'js-yaml'
-import * as vscode from 'vscode'
-import * as nls from 'vscode-nls'
-import { AwsContext } from '../../shared/awsContext'
-import { DefaultStepFunctionsClient, StepFunctionsClient } from '../../shared/clients/stepFunctionsClient'
-import { getLogger, Logger } from '../../shared/logger'
-import { showViewLogsMessage } from '../../shared/utilities/messages'
-import { VALID_SFN_PUBLISH_FORMATS, YAML_FORMATS } from '../constants/aslFormats'
-import { refreshStepFunctionsTree } from '../explorer/stepFunctionsNodes'
-import { PublishStateMachineWizard, PublishStateMachineWizardState } from '../wizards/publishStateMachineWizard'
-const localize = nls.loadMessageBundle()
-
-export async function publishStateMachine(
-    awsContext: AwsContext,
-    outputChannel: vscode.OutputChannel,
-    region: string | undefined
-) {
-    const logger: Logger = getLogger()
-
-    const textDocument = vscode.window.activeTextEditor?.document
-
-    if (!textDocument) {
-        logger.error('Could not get active text editor for state machine definition')
-        throw new Error('Could not get active text editor for state machine definition')
-    }
-
-    let text = textDocument.getText()
-
-    if (!VALID_SFN_PUBLISH_FORMATS.includes(textDocument.languageId)) {
-        const errorMessage = `Cannot publish state machine from "${textDocument.languageId}" file`
-        logger.error(errorMessage)
-        throw new Error(errorMessage)
-    }
-
-    if (YAML_FORMATS.includes(textDocument.languageId)) {
-        try {
-            text = JSON.stringify(load(text), undefined, '  ')
-        } catch (error) {
-            const localizedMsg = localize(
-                'AWS.message.error.stepFunctions.publishStateMachine.invalidYAML',
-                'Cannot publish invalid YAML file'
-            )
-
-            logger.error(error as Error)
-            showViewLogsMessage(localizedMsg)
-            return
-        }
-    }
-
-    try {
-        const response = await new PublishStateMachineWizard(region).run()
-        if (!response) {
-            return
-        }
-        const client = new DefaultStepFunctionsClient(response.region)
-
-        if (response?.createResponse) {
-            await createStateMachine(response.createResponse, text, outputChannel, response.region, client)
-            refreshStepFunctionsTree(response.region)
-        } else if (response?.updateResponse) {
-            await updateStateMachine(response.updateResponse, text, outputChannel, response.region, client)
-        }
-    } catch (err) {
-        logger.error(err as Error)
-    }
-}
-
-async function createStateMachine(
-    wizardResponse: NonNullable<PublishStateMachineWizardState['createResponse']>,
-    definition: string,
-    outputChannel: vscode.OutputChannel,
-    region: string,
-    client: StepFunctionsClient
-) {
-    const logger: Logger = getLogger()
-    logger.info(`Creating state machine '${wizardResponse.name}'`)
-    outputChannel.show()
-    outputChannel.appendLine(
-        localize(
-            'AWS.message.info.stepFunctions.publishStateMachine.creating',
-            "Creating state machine '{0}' in {1}...",
-            wizardResponse.name,
-            region
-        )
-    )
-    try {
-        const result = await client.createStateMachine({
-            definition,
-            name: wizardResponse.name,
-            roleArn: wizardResponse.roleArn,
-        })
-        outputChannel.appendLine(
-            localize(
-                'AWS.message.info.stepFunctions.publishStateMachine.createSuccess',
-                'Created state machine "{0}"',
-                wizardResponse.name
-            )
-        )
-        outputChannel.appendLine(result.stateMachineArn)
-        logger.info(`Created "${result.stateMachineArn}"`)
-        outputChannel.appendLine('')
-    } catch (err) {
-        const msg = localize(
-            'AWS.message.error.stepFunctions.publishStateMachine.createFailure',
-            'Failed to create state machine: {0}',
-            wizardResponse.name
-        )
-        showViewLogsMessage(msg)
-        outputChannel.appendLine(msg)
-        outputChannel.appendLine('')
-        logger.error(`Failed to create state machine '${wizardResponse.name}': %O`, err as Error)
-    }
-}
-
-async function updateStateMachine(
-    wizardResponse: NonNullable<PublishStateMachineWizardState['updateResponse']>,
-    definition: string,
-    outputChannel: vscode.OutputChannel,
-    region: string,
-    client: StepFunctionsClient
-) {
-    const logger: Logger = getLogger()
-    logger.info(`Updating state machine ${wizardResponse.stateMachineArn}`)
-    outputChannel.show()
-    outputChannel.appendLine(
-        localize(
-            'AWS.message.info.stepFunctions.publishStateMachine.updating',
-            "Updating state machine '{0}' in {1}...",
-            wizardResponse.stateMachineArn,
-            region
-        )
-    )
-    try {
-        await client.updateStateMachine({
-            definition,
-            stateMachineArn: wizardResponse.stateMachineArn,
-        })
-        outputChannel.appendLine(
-            localize(
-                'AWS.message.info.stepFunctions.publishStateMachine.updateSuccess',
-                'Updated state machine: {0}',
-                wizardResponse.stateMachineArn
-            )
-        )
-        logger.info(`Updated ${wizardResponse.stateMachineArn}`)
-        outputChannel.appendLine('')
-    } catch (err) {
-        const msg = localize(
-            'AWS.message.error.stepFunctions.publishStateMachine.updateFailure',
-            'Failed to update state machine: {0}',
-            wizardResponse.stateMachineArn
-        )
-        showViewLogsMessage(msg)
-        outputChannel.appendLine(msg)
-        outputChannel.appendLine('')
-        logger.error(`Failed to update state machine '${wizardResponse.stateMachineArn}': %O`, err as Error)
-    }
-}
diff --git a/src/stepFunctions/commands/visualizeStateMachine/abstractAslVisualizationManager.ts b/src/stepFunctions/commands/visualizeStateMachine/abstractAslVisualizationManager.ts
deleted file mode 100644
index 78db9b98ff7..00000000000
--- a/src/stepFunctions/commands/visualizeStateMachine/abstractAslVisualizationManager.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as nls from 'vscode-nls'
-import { StateMachineGraphCache } from '../../utils'
-
-import { Logger } from '../../../shared/logger'
-import { AslVisualization } from './aslVisualization'
-
-const localize = nls.loadMessageBundle()
-
-export abstract class AbstractAslVisualizationManager<T extends AslVisualization = AslVisualization> {
-    protected abstract readonly name: string
-    protected readonly managedVisualizations = new Map<string, T>()
-    protected readonly cache = new StateMachineGraphCache()
-
-    public constructor(private readonly extensionContext: vscode.ExtensionContext) {}
-
-    public abstract visualizeStateMachine(
-        globalStorage: vscode.Memento,
-        uri: vscode.Uri
-    ): Promise<vscode.WebviewPanel | undefined>
-
-    protected pushToExtensionContextSubscriptions(visualizationDisposable: vscode.Disposable): void {
-        this.extensionContext.subscriptions.push(visualizationDisposable)
-    }
-
-    protected handleErr(err: Error, logger: Logger): void {
-        vscode.window.showInformationMessage(
-            localize(
-                'AWS.stepfunctions.visualisation.errors.rendering',
-                'There was an error rendering State Machine Graph, check logs for details.'
-            )
-        )
-
-        logger.debug(`${this.name}: Unable to setup webview panel.`)
-        logger.error(`${this.name}: unexpected exception: %s`, err)
-    }
-
-    public getManagedVisualizations(): Map<string, T> {
-        return this.managedVisualizations
-    }
-
-    protected handleNewVisualization(key: string, visualization: T): void {
-        this.managedVisualizations.set(key, visualization)
-
-        const visualizationDisposable = visualization.onVisualizationDisposeEvent(() => {
-            this.managedVisualizations.delete(key)
-        })
-        this.pushToExtensionContextSubscriptions(visualizationDisposable)
-    }
-
-    protected getExistingVisualization(key: string): T | undefined {
-        return this.managedVisualizations.get(key)
-    }
-}
diff --git a/src/stepFunctions/commands/visualizeStateMachine/aslVisualization.ts b/src/stepFunctions/commands/visualizeStateMachine/aslVisualization.ts
deleted file mode 100644
index ecebb6c833b..00000000000
--- a/src/stepFunctions/commands/visualizeStateMachine/aslVisualization.ts
+++ /dev/null
@@ -1,309 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-import { debounce } from 'lodash'
-import * as path from 'path'
-import * as vscode from 'vscode'
-import { getLogger, Logger } from '../../../shared/logger'
-import { isDocumentValid } from '../../utils'
-import * as yaml from 'yaml'
-
-import { YAML_FORMATS } from '../../constants/aslFormats'
-import globals from '../../../shared/extensionGlobals'
-
-const yamlOptions: yaml.Options = {
-    merge: false,
-    maxAliasCount: 0,
-    schema: 'yaml-1.1',
-    version: '1.1',
-    prettyErrors: true,
-}
-
-export interface MessageObject {
-    command: string
-    text: string
-    error?: string
-    stateMachineData: string
-}
-
-export class AslVisualization {
-    public readonly documentUri: vscode.Uri
-    public readonly webviewPanel: vscode.WebviewPanel
-    protected readonly disposables: vscode.Disposable[] = []
-    protected isPanelDisposed = false
-    private readonly onVisualizationDisposeEmitter = new vscode.EventEmitter<void>()
-
-    public constructor(textDocument: vscode.TextDocument) {
-        this.documentUri = textDocument.uri
-        this.webviewPanel = this.setupWebviewPanel(textDocument)
-    }
-
-    public get onVisualizationDisposeEvent(): vscode.Event<void> {
-        return this.onVisualizationDisposeEmitter.event
-    }
-
-    public getPanel(): vscode.WebviewPanel | undefined {
-        if (!this.isPanelDisposed) {
-            return this.webviewPanel
-        }
-    }
-
-    public getWebview(): vscode.Webview | undefined {
-        if (!this.isPanelDisposed) {
-            return this.webviewPanel?.webview
-        }
-    }
-
-    public showPanel(): void {
-        this.getPanel()?.reveal()
-    }
-
-    public async sendUpdateMessage(updatedTextDocument: vscode.TextDocument) {
-        const logger: Logger = getLogger()
-        const isYaml = YAML_FORMATS.includes(updatedTextDocument.languageId)
-        const text = this.getText(updatedTextDocument)
-        let stateMachineData = text
-        let yamlErrors: string[] = []
-
-        if (isYaml) {
-            const parsed = yaml.parseDocument(text, yamlOptions)
-            yamlErrors = parsed.errors.map(error => error.message)
-            let json: any
-
-            try {
-                json = parsed.toJSON()
-            } catch (e) {
-                yamlErrors.push((e as Error).message)
-            }
-
-            stateMachineData = JSON.stringify(json)
-        }
-
-        const isValid = (await isDocumentValid(stateMachineData, updatedTextDocument)) && !yamlErrors.length
-
-        const webview = this.getWebview()
-        if (this.isPanelDisposed || !webview) {
-            return
-        }
-
-        logger.debug('Sending update message to webview.')
-
-        webview.postMessage({
-            command: 'update',
-            stateMachineData,
-            isValid,
-            errors: yamlErrors,
-        })
-    }
-
-    protected getText(textDocument: vscode.TextDocument): string {
-        return textDocument.getText()
-    }
-
-    private setupWebviewPanel(textDocument: vscode.TextDocument): vscode.WebviewPanel {
-        const documentUri = textDocument.uri
-        const logger: Logger = getLogger()
-
-        // Create and show panel
-        const panel = this.createVisualizationWebviewPanel(documentUri)
-
-        // Set the initial html for the webpage
-        panel.webview.html = this.getWebviewContent(
-            panel.webview.asWebviewUri(globals.visualizationResourcePaths.webviewBodyScript),
-            panel.webview.asWebviewUri(globals.visualizationResourcePaths.visualizationLibraryScript),
-            panel.webview.asWebviewUri(globals.visualizationResourcePaths.visualizationLibraryCSS),
-            panel.webview.asWebviewUri(globals.visualizationResourcePaths.stateMachineCustomThemeCSS),
-            panel.webview.cspSource,
-            {
-                inSync: localize(
-                    'AWS.stepFunctions.graph.status.inSync',
-                    'Previewing ASL document. <a href="" style="text-decoration:none;">View</a>'
-                ),
-                notInSync: localize('AWS.stepFunctions.graph.status.notInSync', 'Errors detected. Cannot preview.'),
-                syncing: localize('AWS.stepFunctions.graph.status.syncing', 'Rendering ASL graph...'),
-            }
-        )
-
-        // Add listener function to update the graph on document save
-        this.disposables.push(
-            vscode.workspace.onDidSaveTextDocument(async savedTextDocument => {
-                if (savedTextDocument && savedTextDocument.uri.path === documentUri.path) {
-                    await this.sendUpdateMessage(savedTextDocument)
-                }
-            })
-        )
-
-        // If documentUri being tracked is no longer found (due to file closure or rename), close the panel.
-        this.disposables.push(
-            vscode.workspace.onDidCloseTextDocument(documentWillSaveEvent => {
-                if (!this.trackedDocumentDoesExist(documentUri) && !this.isPanelDisposed) {
-                    panel.dispose()
-                    vscode.window.showInformationMessage(
-                        localize(
-                            'AWS.stepfunctions.visualisation.errors.rename',
-                            'State machine visualization closed due to file renaming or closure.'
-                        )
-                    )
-                }
-            })
-        )
-
-        const debouncedUpdate = debounce(this.sendUpdateMessage.bind(this), 500)
-
-        this.disposables.push(
-            vscode.workspace.onDidChangeTextDocument(async textDocumentEvent => {
-                if (textDocumentEvent.document.uri.path === documentUri.path) {
-                    await debouncedUpdate(textDocumentEvent.document)
-                }
-            })
-        )
-
-        // Handle messages from the webview
-        this.disposables.push(
-            panel.webview.onDidReceiveMessage(async (message: MessageObject) => {
-                switch (message.command) {
-                    case 'updateResult':
-                        logger.debug(message.text)
-                        if (message.error) {
-                            logger.error(message.error)
-                        }
-                        break
-                    case 'webviewRendered': {
-                        // Webview has finished rendering, so now we can give it our
-                        // initial state machine definition.
-                        await this.sendUpdateMessage(textDocument)
-                        break
-                    }
-
-                    case 'viewDocument':
-                        try {
-                            const document = await vscode.workspace.openTextDocument(documentUri)
-                            vscode.window.showTextDocument(document, vscode.ViewColumn.One)
-                        } catch (e) {
-                            logger.error(e as Error)
-                        }
-                        break
-                }
-            })
-        )
-
-        // When the panel is closed, dispose of any disposables/remove subscriptions
-        const disposePanel = () => {
-            if (this.isPanelDisposed) {
-                return
-            }
-            this.isPanelDisposed = true
-            debouncedUpdate.cancel()
-            this.onVisualizationDisposeEmitter.fire()
-            this.disposables.forEach(disposable => {
-                disposable.dispose()
-            })
-            this.onVisualizationDisposeEmitter.dispose()
-        }
-
-        this.disposables.push(
-            panel.onDidDispose(() => {
-                disposePanel()
-            })
-        )
-
-        return panel
-    }
-
-    private createVisualizationWebviewPanel(documentUri: vscode.Uri): vscode.WebviewPanel {
-        return vscode.window.createWebviewPanel(
-            'stateMachineVisualization',
-            localize('AWS.stepFunctions.graph.titlePrefix', 'Graph: {0}', path.basename(documentUri.fsPath)),
-            {
-                preserveFocus: true,
-                viewColumn: vscode.ViewColumn.Beside,
-            },
-            {
-                enableScripts: true,
-                localResourceRoots: [
-                    globals.visualizationResourcePaths.localWebviewScriptsPath,
-                    globals.visualizationResourcePaths.visualizationLibraryCachePath,
-                    globals.visualizationResourcePaths.stateMachineCustomThemePath,
-                ],
-                retainContextWhenHidden: true,
-            }
-        )
-    }
-
-    private getWebviewContent(
-        webviewBodyScript: vscode.Uri,
-        graphStateMachineLibrary: vscode.Uri,
-        vsCodeCustomStyling: vscode.Uri,
-        graphStateMachineDefaultStyles: vscode.Uri,
-        cspSource: string,
-        statusTexts: {
-            syncing: string
-            notInSync: string
-            inSync: string
-        }
-    ): string {
-        return `
-    <!DOCTYPE html>
-    <html>
-        <head>
-            <meta http-equiv="Content-Security-Policy"
-            content="default-src 'none';
-            img-src ${cspSource} https: data:;
-            script-src ${cspSource} 'self';
-            style-src ${cspSource};"
-            >
-            <meta charset="UTF-8">
-            <link rel="stylesheet" href='${graphStateMachineDefaultStyles}'>
-            <link rel="stylesheet" href='${vsCodeCustomStyling}'>
-            <script src='${graphStateMachineLibrary}'></script>
-        </head>
-
-        <body>
-            <div id="svgcontainer" class="workflowgraph">
-                <svg></svg>
-            </div>
-            <div class="status-info">
-                <svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
-                    <circle cx="50" cy="50" r="42" stroke-width="4" />
-                </svg>
-                <div class="status-messages">
-                    <span class="previewing-asl-message">${statusTexts.inSync}</span>
-                    <span class="rendering-asl-message">${statusTexts.syncing}</span>
-                    <span class="error-asl-message">${statusTexts.notInSync}</span>
-                </div>
-            </div>
-            <div class="graph-buttons-container">
-                <button id="zoomin">
-                    <svg focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-                        <line x1="8" y1="1" x2="8" y2="15"></line>
-                        <line x1="15" y1="8" x2="1" y2="8"></line>
-                    </svg>
-                </button>
-                <button id="zoomout">
-                    <svg focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-                        <line x1="15" y1="8" x2="1" y2="8"></line>
-                    </svg>
-                </button>
-                <button id="center">
-                    <svg focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-                        <circle cx="8" cy="8" r="7" stroke-width="2" />
-                        <circle cx="8" cy="8" r="1" stroke-width="2" />
-                    </svg>
-                </button>
-            </div>
-
-            <script src='${webviewBodyScript}'></script>
-        </body>
-    </html>`
-    }
-
-    private trackedDocumentDoesExist(trackedDocumentURI: vscode.Uri): boolean {
-        const document = vscode.workspace.textDocuments.find(doc => doc.fileName === trackedDocumentURI.fsPath)
-
-        return document !== undefined
-    }
-}
diff --git a/src/stepFunctions/commands/visualizeStateMachine/aslVisualizationCDK.ts b/src/stepFunctions/commands/visualizeStateMachine/aslVisualizationCDK.ts
deleted file mode 100644
index 556e9dcb7dc..00000000000
--- a/src/stepFunctions/commands/visualizeStateMachine/aslVisualizationCDK.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { AslVisualization } from './aslVisualization'
-import {
-    getStateMachineDefinitionFromCfnTemplate,
-    toUnescapedAslJsonString,
-} from './getStateMachineDefinitionFromCfnTemplate'
-
-export class AslVisualizationCDK extends AslVisualization {
-    public constructor(
-        textDocument: vscode.TextDocument,
-        public readonly templatePath: string,
-        public readonly stateMachineName: string
-    ) {
-        super(textDocument)
-        this.templatePath = templatePath
-        this.stateMachineName = stateMachineName
-    }
-
-    protected override getText(textDocument: vscode.TextDocument): string {
-        this.updateWebviewTitle()
-        const definitionString = getStateMachineDefinitionFromCfnTemplate(this.stateMachineName, this.templatePath)
-        return toUnescapedAslJsonString(definitionString ? definitionString : '')
-    }
-
-    protected updateWebviewTitle(): void {
-        if (this.getPanel()) {
-            this.getPanel()!.title = this.stateMachineName
-        }
-    }
-}
diff --git a/src/stepFunctions/commands/visualizeStateMachine/aslVisualizationCDKManager.ts b/src/stepFunctions/commands/visualizeStateMachine/aslVisualizationCDKManager.ts
deleted file mode 100644
index f4a4404b326..00000000000
--- a/src/stepFunctions/commands/visualizeStateMachine/aslVisualizationCDKManager.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-
-import { AslVisualizationCDK } from './aslVisualizationCDK'
-import { AbstractAslVisualizationManager } from './abstractAslVisualizationManager'
-import { getLogger } from '../../../shared/logger'
-
-export class AslVisualizationCDKManager extends AbstractAslVisualizationManager<AslVisualizationCDK> {
-    protected readonly name: string = 'AslVisualizationCDKManager'
-
-    public constructor(extensionContext: vscode.ExtensionContext) {
-        super(extensionContext)
-    }
-
-    public async visualizeStateMachine(
-        globalStorage: vscode.Memento,
-        uri: vscode.Uri
-    ): Promise<vscode.WebviewPanel | undefined> {
-        const logger = getLogger()
-        const existingVisualization = this.getExistingVisualization(this.getKey(uri))
-
-        if (existingVisualization) {
-            existingVisualization.showPanel()
-
-            return existingVisualization.getPanel()
-        }
-
-        const [appName, resourceName] = uri.fragment.split('/')
-        const cdkOutPath = vscode.Uri.joinPath(uri, '..')
-        const templateUri = vscode.Uri.joinPath(cdkOutPath, `${appName}.template.json`)
-
-        try {
-            await this.cache.updateCache(globalStorage)
-
-            const textDocument = await vscode.workspace.openTextDocument(templateUri.with({ fragment: '' }))
-            const newVisualization = new AslVisualizationCDK(textDocument, templateUri.fsPath, resourceName)
-            this.handleNewVisualization(this.getKey(uri), newVisualization)
-
-            return newVisualization.getPanel()
-        } catch (err) {
-            this.handleErr(err as Error, logger)
-        }
-    }
-
-    private getKey(uri: vscode.Uri): string {
-        return `${uri.path}#${uri.fragment}`
-    }
-}
diff --git a/src/stepFunctions/commands/visualizeStateMachine/aslVisualizationManager.ts b/src/stepFunctions/commands/visualizeStateMachine/aslVisualizationManager.ts
deleted file mode 100644
index 62a4bad3b16..00000000000
--- a/src/stepFunctions/commands/visualizeStateMachine/aslVisualizationManager.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-
-import { AbstractAslVisualizationManager } from './abstractAslVisualizationManager'
-import { AslVisualization } from './aslVisualization'
-import { getLogger, Logger } from '../../../shared/logger'
-
-export class AslVisualizationManager extends AbstractAslVisualizationManager {
-    protected readonly name: string = 'AslVisualizationManager'
-
-    public constructor(extensionContext: vscode.ExtensionContext) {
-        super(extensionContext)
-    }
-
-    public async visualizeStateMachine(
-        globalStorage: vscode.Memento,
-        target: vscode.TextDocument | vscode.Uri
-    ): Promise<vscode.WebviewPanel | undefined> {
-        const logger: Logger = getLogger()
-        const document = target instanceof vscode.Uri ? await vscode.workspace.openTextDocument(target) : target
-
-        // Attempt to retrieve existing visualization if it exists.
-        const existingVisualization = this.getExistingVisualization(document.uri.fsPath)
-        if (existingVisualization) {
-            existingVisualization.showPanel()
-
-            return existingVisualization.getPanel()
-        }
-
-        // Existing visualization does not exist, construct new visualization
-        try {
-            await this.cache.updateCache(globalStorage)
-
-            const newVisualization = new AslVisualization(document)
-            this.handleNewVisualization(document.uri.fsPath, newVisualization)
-
-            return newVisualization.getPanel()
-        } catch (err) {
-            this.handleErr(err as Error, logger)
-        }
-    }
-}
diff --git a/src/stepFunctions/commands/visualizeStateMachine/renderStateMachineGraphCDK.ts b/src/stepFunctions/commands/visualizeStateMachine/renderStateMachineGraphCDK.ts
deleted file mode 100644
index 4224ceff98d..00000000000
--- a/src/stepFunctions/commands/visualizeStateMachine/renderStateMachineGraphCDK.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-
-import { AslVisualizationCDKManager } from './aslVisualizationCDKManager'
-import { PreviewStateMachineCDKWizard } from '../../wizards/previewStateMachineCDKWizard'
-import { Commands } from '../../../shared/vscode/commands2'
-import { isTreeNode } from '../../../shared/treeview/resourceTreeDataProvider'
-import { unboxTreeNode } from '../../../shared/treeview/utils'
-
-function isLocationResource(obj: unknown): obj is { location: vscode.Uri } {
-    return !!obj && typeof obj === 'object' && (obj as any).location instanceof vscode.Uri
-}
-
-/**
- * Renders a state graph of the state machine.
- *
- * If given a {@link TreeNode}, it should contain a resource with a URI pointing to the `tree.json`.
- * URIs should have a fragment with the resource path in order to locate it within the CFN template.
- */
-export const renderCdkStateMachineGraph = Commands.declare(
-    'aws.cdk.renderStateMachineGraph',
-    (memento: vscode.Memento, manager: AslVisualizationCDKManager) => async (input?: unknown) => {
-        const resource = isTreeNode(input) ? unboxTreeNode(input, isLocationResource) : undefined
-        const resourceUri = resource?.location ?? (await new PreviewStateMachineCDKWizard().run())?.resource.location
-
-        if (!resourceUri) {
-            return
-        }
-
-        await manager.visualizeStateMachine(memento, resourceUri)
-    }
-)
diff --git a/src/stepFunctions/utils.ts b/src/stepFunctions/utils.ts
deleted file mode 100644
index 38a6701d0cb..00000000000
--- a/src/stepFunctions/utils.ts
+++ /dev/null
@@ -1,210 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import { IAM, StepFunctions } from 'aws-sdk'
-import { mkdir, writeFile } from 'fs-extra'
-import * as vscode from 'vscode'
-import { StepFunctionsClient } from '../shared/clients/stepFunctionsClient'
-import { fileExists } from '../shared/filesystemUtilities'
-import { getLogger, Logger } from '../shared/logger'
-import {
-    DiagnosticSeverity,
-    DocumentLanguageSettings,
-    getLanguageService,
-    TextDocument as ASLTextDocument,
-} from 'amazon-states-language-service'
-import { HttpResourceFetcher } from '../shared/resourcefetcher/httpResourceFetcher'
-import globals from '../shared/extensionGlobals'
-import { fromExtensionManifest } from '../shared/settings'
-
-const documentSettings: DocumentLanguageSettings = { comments: 'error', trailingCommas: 'error' }
-const languageService = getLanguageService({})
-
-const visualizationScriptUrl = 'https://do0of8uwbahzz.cloudfront.net/sfn-0.1.5.js'
-const visualizationCssUrl = 'https://do0of8uwbahzz.cloudfront.net/graph-0.1.5.css'
-
-const scriptsLastDownloadedUrl = 'SCRIPT_LAST_DOWNLOADED_URL'
-const cssLastDownloadedUrl = 'CSS_LAST_DOWNLOADED_URL'
-
-export interface UpdateCachedScriptOptions {
-    globalStorage: vscode.Memento
-    lastDownloadedURLKey: string
-    currentURL: string
-    filePath: string
-}
-
-export interface StateMachineGraphCacheOptions {
-    cssFilePath?: string
-    jsFilePath?: string
-    dirPath?: string
-    scriptUrl?: string
-    cssUrl?: string
-    writeFile?(path: string, data: string, encoding: string): Promise<void>
-    makeDir?(path: string): Promise<void>
-    getFileData?(url: string): Promise<string>
-    fileExists?(path: string): Promise<boolean>
-}
-
-export class StateMachineGraphCache {
-    protected makeDir: (path: string) => Promise<void>
-    protected writeFile: (path: string, data: string, encoding: string) => Promise<void>
-    protected getFileData: (url: string) => Promise<string>
-    protected fileExists: (path: string) => Promise<boolean>
-    protected logger: Logger
-    protected cssFilePath: string
-    protected jsFilePath: string
-    protected dirPath: string
-
-    public constructor(options: StateMachineGraphCacheOptions = {}) {
-        // eslint-disable-next-line @typescript-eslint/unbound-method
-        const { makeDir, writeFile: writeFileCustom, getFileData, fileExists: fileExistsCustom } = options
-
-        this.makeDir = makeDir ?? mkdir
-        this.writeFile = writeFileCustom ?? writeFile
-        this.logger = getLogger()
-        this.getFileData = getFileData ?? httpsGetRequestWrapper
-        this.cssFilePath = options.cssFilePath ?? globals.visualizationResourcePaths.visualizationLibraryCSS.fsPath
-        this.jsFilePath = options.jsFilePath ?? globals.visualizationResourcePaths.visualizationLibraryScript.fsPath
-        this.dirPath = options.dirPath ?? globals.visualizationResourcePaths.visualizationLibraryCachePath.fsPath
-        this.fileExists = fileExistsCustom ?? fileExists
-    }
-
-    public async updateCache(globalStorage: vscode.Memento): Promise<void> {
-        const scriptUpdate = this.updateCachedFile({
-            globalStorage,
-            lastDownloadedURLKey: scriptsLastDownloadedUrl,
-            currentURL: visualizationScriptUrl,
-            filePath: this.jsFilePath,
-        }).catch(error => {
-            this.logger.error('Failed to update State Machine Graph script assets')
-            this.logger.error(error as Error)
-
-            throw error
-        })
-
-        const cssUpdate = this.updateCachedFile({
-            globalStorage,
-            lastDownloadedURLKey: cssLastDownloadedUrl,
-            currentURL: visualizationCssUrl,
-            filePath: this.cssFilePath,
-        }).catch(error => {
-            this.logger.error('Failed to update State Machine Graph css assets')
-            this.logger.error(error as Error)
-
-            throw error
-        })
-
-        await Promise.all([scriptUpdate, cssUpdate])
-    }
-
-    public async updateCachedFile(options: UpdateCachedScriptOptions) {
-        const downloadedUrl = options.globalStorage.get<string>(options.lastDownloadedURLKey)
-        const cachedFileExists = await this.fileExists(options.filePath)
-
-        // if current url is different than url that was previously used to download the assets
-        // or if the file assets do not exist
-        // download and cache the assets
-        if (downloadedUrl !== options.currentURL || !cachedFileExists) {
-            const response = await this.getFileData(options.currentURL)
-            await this.writeToLocalStorage(options.filePath, response)
-
-            // save the url of the downloaded and cached assets
-            options.globalStorage.update(options.lastDownloadedURLKey, options.currentURL)
-        }
-    }
-
-    protected async writeToLocalStorage(destinationPath: string, data: string): Promise<void> {
-        const storageFolder = this.dirPath
-
-        try {
-            this.logger.debug('stepFunctions: creating directory: %O', storageFolder)
-            await this.makeDir(storageFolder)
-        } catch (err) {
-            const error = err as Error & { code?: string }
-            this.logger.verbose(error)
-            // EEXIST failure is non-fatal. This function is called as part of
-            // a Promise.all() group of tasks wanting to create the same directory.
-            if (error.code && error.code !== 'EEXIST') {
-                throw err
-            }
-        }
-
-        try {
-            await this.writeFile(destinationPath, data, 'utf8')
-        } catch (err) {
-            /*
-             * Was able to download the required files,
-             * but there was an error trying to write them to this extensions globalStorage location.
-             */
-            this.logger.error(err as Error)
-            throw err
-        }
-    }
-}
-
-async function httpsGetRequestWrapper(url: string): Promise<string> {
-    const logger = getLogger()
-    logger.verbose('Step Functions is getting content...')
-
-    const fetcher = new HttpResourceFetcher(url, { showUrl: true })
-    const val = await fetcher.get()
-
-    if (!val) {
-        const message = 'Step Functions was unable to get content.'
-        logger.verbose(message)
-        throw new Error(message)
-    }
-
-    return val
-}
-
-export async function* listStateMachines(
-    client: StepFunctionsClient
-): AsyncIterableIterator<StepFunctions.StateMachineListItem> {
-    const status = vscode.window.setStatusBarMessage(
-        localize('AWS.message.statusBar.loading.statemachines', 'Loading State Machines...')
-    )
-
-    try {
-        yield* client.listStateMachines()
-    } finally {
-        if (status) {
-            status.dispose()
-        }
-    }
-}
-
-/**
- * Checks if the given IAM Role is assumable by AWS Step Functions.
- * @param role The IAM role to check
- */
-export function isStepFunctionsRole(role: IAM.Role): boolean {
-    const stepFunctionsSevicePrincipal: string = 'states.amazonaws.com'
-    const assumeRolePolicyDocument: string | undefined = role.AssumeRolePolicyDocument
-
-    return !!assumeRolePolicyDocument?.includes(stepFunctionsSevicePrincipal)
-}
-
-export async function isDocumentValid(text: string, textDocument?: vscode.TextDocument): Promise<boolean> {
-    if (!textDocument || !text) {
-        return false
-    }
-
-    const doc = ASLTextDocument.create(textDocument.uri.path, textDocument.languageId, textDocument.version, text)
-    const jsonDocument = languageService.parseJSONDocument(doc)
-    const diagnostics = await languageService.doValidation(doc, jsonDocument, documentSettings)
-    const isValid = !diagnostics.some(diagnostic => diagnostic.severity === DiagnosticSeverity.Error)
-
-    return isValid
-}
-
-const descriptor = {
-    maxItemsComputed: (v: unknown) => Math.trunc(Math.max(0, Number(v))),
-    ['format.enable']: Boolean,
-}
-
-export class StepFunctionsSettings extends fromExtensionManifest('aws.stepfunctions.asl', descriptor) {}
diff --git a/src/stepFunctions/vue/executeStateMachine/executeStateMachine.ts b/src/stepFunctions/vue/executeStateMachine/executeStateMachine.ts
deleted file mode 100644
index f76bf96fb56..00000000000
--- a/src/stepFunctions/vue/executeStateMachine/executeStateMachine.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import { DefaultStepFunctionsClient } from '../../../shared/clients/stepFunctionsClient'
-
-import { getLogger } from '../../../shared/logger'
-import { Result } from '../../../shared/telemetry/telemetry'
-import { StateMachineNode } from '../../explorer/stepFunctionsNodes'
-import { ExtContext } from '../../../shared/extensions'
-import { VueWebview } from '../../../webviews/main'
-import * as vscode from 'vscode'
-import { telemetry } from '../../../shared/telemetry/telemetry'
-
-interface StateMachine {
-    arn: string
-    name: string
-    region: string
-}
-
-export class ExecuteStateMachineWebview extends VueWebview {
-    public readonly id = 'remoteInvoke'
-    public readonly source = 'src/stepFunctions/vue/executeStateMachine/index.js'
-    private readonly logger = getLogger()
-
-    public constructor(private readonly channel: vscode.OutputChannel, private readonly stateMachine: StateMachine) {
-        super()
-    }
-
-    public init() {
-        return this.stateMachine
-    }
-
-    public async executeStateMachine(input: string) {
-        let executeResult: Result = 'Succeeded'
-        this.logger.info('Starting Step Functions State Machine execution')
-
-        this.channel.show()
-        this.channel.appendLine(
-            localize(
-                'AWS.message.info.stepFunctions.executeStateMachine.executing',
-                'Executing {0} in {1}...',
-                this.stateMachine.name,
-                this.stateMachine.region
-            )
-        )
-        this.channel.appendLine('')
-
-        try {
-            const client = new DefaultStepFunctionsClient(this.stateMachine.region)
-            const startExecResponse = await client.executeStateMachine(this.stateMachine.arn, input)
-            this.logger.info('started execution for Step Functions State Machine')
-            this.channel.appendLine(
-                localize('AWS.message.info.stepFunctions.executeStateMachine.started', 'Execution started')
-            )
-            this.channel.appendLine(startExecResponse.executionArn)
-        } catch (e) {
-            executeResult = 'Failed'
-            const error = e as Error
-            this.logger.error('Error starting execution for Step Functions State Machine: %s', error)
-            this.channel.appendLine(
-                localize(
-                    'AWS.message.error.stepFunctions.executeStateMachine.failed_to_start',
-                    'There was an error starting execution for {0}, check logs for more information.',
-                    this.stateMachine.arn
-                )
-            )
-            this.channel.appendLine('')
-        } finally {
-            telemetry.stepfunctions_executeStateMachine.emit({ result: executeResult })
-        }
-    }
-}
-
-const Panel = VueWebview.compilePanel(ExecuteStateMachineWebview)
-
-export async function executeStateMachine(context: ExtContext, node: StateMachineNode): Promise<void> {
-    const wv = new Panel(context.extensionContext, context.outputChannel, {
-        arn: node.details.stateMachineArn,
-        name: node.details.name,
-        region: node.regionCode,
-    })
-
-    await wv.show({
-        title: localize('AWS.executeStateMachine.title', 'Start Execution'),
-        cssFiles: ['executeStateMachine.css'],
-    })
-    telemetry.stepfunctions_executeStateMachineView.emit()
-}
diff --git a/src/stepFunctions/vue/executeStateMachine/index.ts b/src/stepFunctions/vue/executeStateMachine/index.ts
deleted file mode 100644
index 09b44caf169..00000000000
--- a/src/stepFunctions/vue/executeStateMachine/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { createApp } from 'vue'
-import component from './executeStateMachine.vue'
-
-const create = () => createApp(component)
-const app = create()
-app.mount('#vue-app')
-
-window.addEventListener('remount', () => {
-    app.unmount()
-    create().mount('#vue-app')
-})
diff --git a/src/test/apigateway/commands/copyUrl.test.ts b/src/test/apigateway/commands/copyUrl.test.ts
deleted file mode 100644
index b42c9586d50..00000000000
--- a/src/test/apigateway/commands/copyUrl.test.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { buildDefaultApiInvokeUrl } from '../../../apigateway/commands/copyUrl'
-
-describe('buildDefaultApiInvokeUrl', function () {
-    it('builds a url', async function () {
-        const expected = 'https://1234567ab.execute-api.us-east-1.amazonaws.com/stagename'
-
-        assert.deepStrictEqual(
-            buildDefaultApiInvokeUrl('1234567ab', 'us-east-1', 'amazonaws.com', 'stagename'),
-            expected
-        )
-    })
-})
diff --git a/src/test/apigateway/explorer/apiGatewayNodes.test.ts b/src/test/apigateway/explorer/apiGatewayNodes.test.ts
deleted file mode 100644
index f04210c4787..00000000000
--- a/src/test/apigateway/explorer/apiGatewayNodes.test.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import {
-    assertNodeListOnlyHasErrorNode,
-    assertNodeListOnlyHasPlaceholderNode,
-} from '../../utilities/explorerNodeAssertions'
-import { asyncGenerator } from '../../utilities/collectionUtils'
-import { ApiGatewayNode } from '../../../apigateway/explorer/apiGatewayNodes'
-import { RestApiNode } from '../../../apigateway/explorer/apiNodes'
-import { DefaultApiGatewayClient } from '../../../shared/clients/apiGatewayClient'
-import { stub } from '../../utilities/stubber'
-
-const fakePartitionId = 'aws'
-const fakeRegionCode = 'someregioncode'
-const unsortedText = [
-    { name: 'zebra', id: "it's zee not zed" },
-    { name: 'zebra', id: "it's actually zed" },
-    { name: 'Antelope', id: 'anti-antelope' },
-    { name: 'aardvark', id: 'a-a-r-d-vark' },
-    { name: 'elephant', id: 'trunk capacity' },
-]
-const sortedText = [
-    'aardvark (a-a-r-d-vark)',
-    'Antelope (anti-antelope)',
-    'elephant (trunk capacity)',
-    "zebra (it's actually zed)",
-    "zebra (it's zee not zed)",
-]
-
-describe('ApiGatewayNode', function () {
-    let testNode: ApiGatewayNode
-
-    let apiNames: { name: string; id: string }[]
-
-    function createClient() {
-        const client = stub(DefaultApiGatewayClient, { regionCode: fakeRegionCode })
-        client.listApis.callsFake(() => asyncGenerator(apiNames))
-
-        return client
-    }
-
-    beforeEach(function () {
-        apiNames = [
-            { name: 'api1', id: '11111' },
-            { name: 'api2', id: '22222' },
-        ]
-
-        testNode = new ApiGatewayNode(fakePartitionId, fakeRegionCode, createClient())
-    })
-
-    it('returns placeholder node if no children are present', async function () {
-        apiNames = []
-
-        const childNodes = await testNode.getChildren()
-
-        assertNodeListOnlyHasPlaceholderNode(childNodes)
-    })
-
-    it('has RestApi child nodes', async function () {
-        const childNodes = await testNode.getChildren()
-
-        assert.strictEqual(childNodes.length, apiNames.length, 'Unexpected child count')
-
-        childNodes.forEach(node => assert.ok(node instanceof RestApiNode, 'Expected child node to be RestApiNode'))
-    })
-
-    it('sorts child nodes', async function () {
-        apiNames = unsortedText
-
-        const childNodes = await testNode.getChildren()
-
-        const actualChildOrder = childNodes.map(node => node.label)
-        assert.deepStrictEqual(actualChildOrder, sortedText, 'Unexpected child sort order')
-    })
-
-    it('has an error node for a child if an error happens during loading', async function () {
-        const client = createClient()
-        client.listApis.throws(new Error())
-
-        const node = new ApiGatewayNode(fakePartitionId, fakeRegionCode, client)
-        assertNodeListOnlyHasErrorNode(await node.getChildren())
-    })
-})
diff --git a/src/test/apprunner/explorer/apprunnerNode.test.ts b/src/test/apprunner/explorer/apprunnerNode.test.ts
deleted file mode 100644
index 4f6648fd346..00000000000
--- a/src/test/apprunner/explorer/apprunnerNode.test.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as FakeTimers from '@sinonjs/fake-timers'
-import * as sinon from 'sinon'
-import { AppRunner } from 'aws-sdk'
-import { verify, anything, instance, mock, when } from 'ts-mockito'
-import { AppRunnerNode } from '../../../apprunner/explorer/apprunnerNode'
-import { AppRunnerServiceNode } from '../../../apprunner/explorer/apprunnerServiceNode'
-import { AppRunnerClient } from '../../../shared/clients/apprunnerClient'
-import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
-import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
-import { installFakeClock } from '../../testUtil'
-
-describe('AppRunnerNode', function () {
-    let mockApprunnerClient: AppRunnerClient
-    let node: AppRunnerNode
-    let clock: FakeTimers.InstalledClock
-    let refreshStub: sinon.SinonStub<[], void>
-
-    const exampleSummaries: AppRunner.ServiceSummaryList = [
-        {
-            ServiceName: 'test1',
-            Status: 'RUNNING',
-            ServiceArn: 'test-arn1',
-        },
-    ]
-
-    before(function () {
-        clock = installFakeClock()
-        refreshStub = sinon.stub(AWSTreeNodeBase.prototype, 'refresh')
-    })
-
-    beforeEach(function () {
-        mockApprunnerClient = mock()
-        node = new AppRunnerNode('', instance(mockApprunnerClient))
-        when(mockApprunnerClient.listServices(anything())).thenResolve({ ServiceSummaryList: exampleSummaries })
-        when(mockApprunnerClient.listOperations(anything())).thenResolve({ OperationSummaryList: [] })
-        clock.reset()
-    })
-
-    after(function () {
-        clock.uninstall()
-        sinon.restore()
-    })
-
-    it('creates AppRunnerServiceNodes', async function () {
-        const children = await node.getChildren()
-        assert.ok(children[0] instanceof AppRunnerServiceNode)
-    })
-
-    it('updates AppRunnerServiceNodes', async function () {
-        const childNode = (await node.getChildren())[0] as AppRunnerServiceNode
-
-        const updatedSummary = { ...exampleSummaries[0], Status: 'PAUSED' }
-        when(mockApprunnerClient.listServices(anything())).thenResolve({ ServiceSummaryList: [updatedSummary] })
-
-        await node.getChildren()
-        assert.strictEqual(childNode.info.Status, 'PAUSED')
-    })
-
-    it('deletes AppRunnerServiceNodes', async function () {
-        await node.getChildren()
-        when(mockApprunnerClient.listServices(anything())).thenResolve({ ServiceSummaryList: [] })
-
-        assert.ok((await node.getChildren())[0] instanceof PlaceholderNode)
-    })
-
-    it('polls children nodes', async function () {
-        const transientService = { ...exampleSummaries[0], Status: 'OPERATION_IN_PROGRESS' }
-        when(mockApprunnerClient.listServices(anything())).thenResolve({ ServiceSummaryList: [transientService] })
-        when(mockApprunnerClient.listOperations(anything())).thenResolve({
-            OperationSummaryList: [{ Id: 'test-id', Type: 'PAUSE_SERVICE' }],
-        })
-
-        const childNode = (await node.getChildren())[0] as AppRunnerServiceNode
-        const pausedService = { ...transientService, Status: 'PAUSED' }
-        await clock.tickAsync(100000)
-        when(mockApprunnerClient.listServices(anything())).thenResolve({ ServiceSummaryList: [pausedService] })
-        sinon.assert.calledOn(refreshStub, node)
-        await node.getChildren()
-        await clock.tickAsync(100000)
-        verify(mockApprunnerClient.listServices(anything())).times(2)
-
-        assert.strictEqual(childNode.info.Status, 'PAUSED')
-    })
-})
diff --git a/src/test/apprunner/explorer/apprunnerServiceNode.test.ts b/src/test/apprunner/explorer/apprunnerServiceNode.test.ts
deleted file mode 100644
index 29d55d61652..00000000000
--- a/src/test/apprunner/explorer/apprunnerServiceNode.test.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as sinon from 'sinon'
-import { AppRunner } from 'aws-sdk'
-import { verify, instance, mock } from 'ts-mockito'
-import { AppRunnerNode } from '../../../apprunner/explorer/apprunnerNode'
-import { AppRunnerServiceNode } from '../../../apprunner/explorer/apprunnerServiceNode'
-import { DefaultAppRunnerClient } from '../../../shared/clients/apprunnerClient'
-import { DefaultCloudWatchLogsClient } from '../../../shared/clients/cloudWatchLogsClient'
-import { asyncGenerator } from '../../utilities/collectionUtils'
-import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
-import { stub } from '../../utilities/stubber'
-
-describe('AppRunnerServiceNode', function () {
-    let mockApprunnerClient: ReturnType<typeof stub<DefaultAppRunnerClient>>
-    let mockParentNode: AppRunnerNode
-    let node: AppRunnerServiceNode
-
-    const exampleInfo: AppRunner.Service = {
-        ServiceName: 'test1',
-        Status: 'RUNNING',
-        ServiceArn: 'test-arn1',
-        ServiceUrl: '',
-        ServiceId: 'id',
-    } as any
-
-    before(function () {
-        sinon.stub(AWSTreeNodeBase.prototype, 'refresh')
-    })
-
-    beforeEach(function () {
-        const cloudwatchClient = stub(DefaultCloudWatchLogsClient, { regionCode: 'us-east-1' })
-        cloudwatchClient.describeLogGroups.returns(asyncGenerator([{ logGroupName: 'logs' }]))
-
-        mockApprunnerClient = stub(DefaultAppRunnerClient, { regionCode: 'us-east-1' })
-        mockApprunnerClient.listOperations.resolves({ OperationSummaryList: [] })
-        mockParentNode = mock()
-        node = new AppRunnerServiceNode(
-            instance(mockParentNode),
-            mockApprunnerClient,
-            exampleInfo,
-            {},
-            cloudwatchClient
-        )
-    })
-
-    after(function () {
-        sinon.restore()
-    })
-
-    it('can pause', async function () {
-        mockApprunnerClient.pauseService.resolves({ Service: { ...exampleInfo, Status: 'PAUSED' } })
-        await node.pause()
-        assert.ok(node.label?.includes('Paused'))
-    })
-
-    it('can resume', async function () {
-        node.update({ ...exampleInfo, Status: 'PAUSED' })
-        mockApprunnerClient.resumeService.resolves({ Service: { ...exampleInfo, Status: 'RUNNING' } })
-        await node.resume()
-        assert.ok(node.label?.includes('Running'))
-    })
-
-    it('can deploy', async function () {
-        mockApprunnerClient.startDeployment.resolves({ OperationId: '123' })
-        node.update({ ...exampleInfo, Status: 'OPERATION_IN_PROGRESS' })
-        await node.deploy()
-        assert.ok(node.label?.includes('Deploying'))
-    })
-
-    it('can describe', async function () {
-        mockApprunnerClient.describeService.resolves({ Service: { ...exampleInfo, Status: 'CREATE_FAILED' } })
-        assert.strictEqual((await node.describe()).Status, 'CREATE_FAILED')
-        assert.ok(node.label?.includes('Create failed'))
-    })
-
-    it('can update', async function () {
-        mockApprunnerClient.updateService.resolves({
-            Service: { ...exampleInfo, Status: 'OPERATION_IN_PROGRESS' },
-            OperationId: '123',
-        })
-        await node.updateService({} as any)
-        assert.ok(node.label?.includes('Updating'))
-    })
-
-    it('can delete', async function () {
-        mockApprunnerClient.deleteService.resolves({
-            Service: { ...exampleInfo, Status: 'DELETED' },
-            OperationId: '123',
-        })
-        await node.delete()
-        verify(mockParentNode.deleteNode(exampleInfo.ServiceArn))
-    })
-
-    it('can log', async function () {
-        const logs = await node.getChildren()
-        assert.strictEqual(logs[0]?.label, 'logs')
-    })
-})
diff --git a/src/test/apprunner/wizards/codeRepositoryWizard.test.ts b/src/test/apprunner/wizards/codeRepositoryWizard.test.ts
deleted file mode 100644
index 13b19eba79f..00000000000
--- a/src/test/apprunner/wizards/codeRepositoryWizard.test.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as sinon from 'sinon'
-import * as assert from 'assert'
-import { AppRunner } from 'aws-sdk'
-import { createWizardTester, WizardTester } from '../../shared/wizards/wizardTestUtils'
-import {
-    AppRunnerCodeRepositoryWizard,
-    createConnectionPrompter,
-} from '../../../apprunner/wizards/codeRepositoryWizard'
-import { DefaultAppRunnerClient } from '../../../shared/clients/apprunnerClient'
-import { ConnectionSummary } from 'aws-sdk/clients/apprunner'
-import { WIZARD_EXIT } from '../../../shared/wizards/wizard'
-import { apprunnerConnectionHelpUrl } from '../../../shared/constants'
-import { createQuickPickTester, QuickPickTester } from '../../shared/ui/testUtils'
-import { stub } from '../../utilities/stubber'
-
-describe('AppRunnerCodeRepositoryWizard', function () {
-    let tester: WizardTester<AppRunner.SourceConfiguration>
-    let repoTester: WizardTester<AppRunner.CodeRepository>
-
-    beforeEach(function () {
-        // apprunner client and git api will never be called
-        const wizard = new AppRunnerCodeRepositoryWizard({} as any, {} as any)
-        tester = createWizardTester(wizard)
-        repoTester = tester.CodeRepository
-    })
-
-    it('prompts for GitHub connection first', function () {
-        tester.AuthenticationConfiguration.ConnectionArn.assertShowFirst()
-    })
-
-    it('prompts for repository URL and branch', function () {
-        repoTester.RepositoryUrl.assertShow()
-        repoTester.SourceCodeVersion.Value.assertShow()
-        repoTester.SourceCodeVersion.Type.assertValue('BRANCH')
-    })
-
-    it('does not prompt for code configuration if "API" is not set', function () {
-        repoTester.CodeConfiguration.ConfigurationSource.applyInput('REPOSITORY')
-        repoTester.CodeConfiguration.CodeConfigurationValues.assertDoesNotShowAny()
-    })
-
-    it('adds all steps under CodeConfigurationValues if "API" is set', function () {
-        const codeconfig = repoTester.CodeConfiguration
-        const codevalues = codeconfig.CodeConfigurationValues
-
-        codevalues.assertDoesNotShowAny()
-        codeconfig.ConfigurationSource.applyInput('API')
-        codevalues.BuildCommand.assertShow()
-        codevalues.Runtime.assertShow()
-        codevalues.RuntimeEnvironmentVariables.assertShow()
-        codevalues.StartCommand.assertShow()
-        codevalues.Port.assertShow()
-    })
-
-    it('sets "AutoDeploymentsEnabled" to false by default', function () {
-        tester.AutoDeploymentsEnabled.assertValue(false)
-    })
-})
-
-type ConnectionStatus = 'AVAILABLE' | 'PENDING_HANDSHAKE' | 'ERROR' | 'DELETED'
-
-describe('createConnectionPrompter', function () {
-    let openExternal: sinon.SinonSpy<Parameters<typeof vscode.env.openExternal>>
-
-    const defaultConnections = [
-        makeConnection('connection-name-1', 'connection-arn-1'),
-        makeConnection('connection-name-2', 'connection-arn-2'),
-    ]
-
-    function makeTester(connections = defaultConnections): QuickPickTester<ConnectionSummary> {
-        const client = stub(DefaultAppRunnerClient, { regionCode: '' })
-        client.listConnections.resolves({ ConnectionSummaryList: connections })
-
-        return createQuickPickTester(createConnectionPrompter(client))
-    }
-
-    function makeConnection(name: string, arn: string, status: ConnectionStatus = 'AVAILABLE'): ConnectionSummary {
-        return {
-            ConnectionName: name,
-            ConnectionArn: arn,
-            Status: status,
-        }
-    }
-
-    beforeEach(function () {
-        openExternal = sinon.stub(vscode.env, 'openExternal')
-    })
-
-    afterEach(function () {
-        sinon.restore()
-    })
-
-    it('lists connections', async function () {
-        const tester = makeTester()
-        tester.assertItems(['connection-name-1', 'connection-name-2'])
-        tester.acceptItem('connection-name-2')
-        await tester.result(defaultConnections[1])
-    })
-
-    it('lists only available connections', async function () {
-        const connections = [...defaultConnections]
-        connections.push(makeConnection('pending', 'pending', 'PENDING_HANDSHAKE'))
-        connections.push(makeConnection('error', 'error', 'ERROR'))
-        connections.unshift(makeConnection('deleted', 'deleted', 'DELETED'))
-
-        const tester = makeTester(connections)
-        tester.assertItems(['connection-name-1', 'connection-name-2'])
-        tester.hide()
-        await tester.result()
-    })
-
-    it('can refresh connections', async function () {
-        const connections = [...defaultConnections]
-        const newConnection = makeConnection('new-connection', 'new-arn')
-        const tester = makeTester(connections)
-
-        tester.addCallback(() => connections.push(newConnection))
-        tester.pressButton('Refresh')
-        tester.assertItems(['connection-name-1', 'connection-name-2', 'new-connection'])
-        tester.acceptItem('new-connection')
-        await tester.result(newConnection)
-    })
-
-    it('shows an option to go to documentation when no connections are available', async function () {
-        const tester = makeTester([])
-        tester.assertItems(['No connections found'])
-        tester.acceptItem('No connections found')
-        tester.hide()
-        await tester.result(WIZARD_EXIT)
-        assert.strictEqual(openExternal.firstCall.args[0].toString(), apprunnerConnectionHelpUrl)
-    })
-})
diff --git a/src/test/apprunner/wizards/createServiceWizard.test.ts b/src/test/apprunner/wizards/createServiceWizard.test.ts
deleted file mode 100644
index 3eeedac1d7c..00000000000
--- a/src/test/apprunner/wizards/createServiceWizard.test.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { createWizardTester, WizardTester } from '../../../test/shared/wizards/wizardTestUtils'
-import { AppRunner } from 'aws-sdk'
-import { CreateAppRunnerServiceWizard } from '../../../apprunner/wizards/apprunnerCreateServiceWizard'
-import { stub } from '../../utilities/stubber'
-import { DefaultIamClient } from '../../../shared/clients/iamClient'
-import { DefaultEcrClient } from '../../../shared/clients/ecrClient'
-import { DefaultAppRunnerClient } from '../../../shared/clients/apprunnerClient'
-
-describe('CreateServiceWizard', function () {
-    let tester: WizardTester<AppRunner.CreateServiceRequest>
-
-    beforeEach(function () {
-        const regionCode = 'us-east-1'
-        const wizard = new CreateAppRunnerServiceWizard(
-            regionCode,
-            {},
-            {},
-            {
-                iam: stub(DefaultIamClient, { regionCode }),
-                ecr: stub(DefaultEcrClient, { regionCode }),
-                apprunner: stub(DefaultAppRunnerClient, { regionCode }),
-            }
-        )
-
-        tester = createWizardTester(wizard)
-    })
-
-    describe('CreateAppRunnerServiceWizard', function () {
-        it('prompts for source first', function () {
-            tester.SourceConfiguration.assertShowFirst()
-        })
-
-        it('prompts for role ARN if choosing private ECR', function () {
-            tester.SourceConfiguration.applyInput({ ImageRepository: { ImageRepositoryType: 'ECR' } as any })
-            tester.SourceConfiguration.AuthenticationConfiguration.AccessRoleArn.assertShow()
-        })
-
-        it('prompts for connection ARN if choosing Repository', function () {
-            tester.SourceConfiguration.applyInput({ CodeRepository: {} as any })
-            tester.SourceConfiguration.AuthenticationConfiguration.ConnectionArn.assertShow()
-        })
-
-        it('prompts for name before instance', function () {
-            tester.ServiceName.assertShowSecond() // TODO: write a 'assertShowBefore' that accepts another form element as input
-            tester.InstanceConfiguration.assertShowThird()
-        })
-
-        it('sets auto-deployment to "off" by default', function () {
-            tester.SourceConfiguration.AutoDeploymentsEnabled.assertValue(false)
-        })
-
-        it('prompts for ECR or GitHub repository', function () {
-            tester.SourceConfiguration.assertShow()
-            tester.SourceConfiguration.CodeRepository.assertDoesNotShowAny()
-            tester.SourceConfiguration.ImageRepository.assertDoesNotShowAny()
-
-            tester.SourceConfiguration.applyInput({ CodeRepository: {} as any })
-            tester.SourceConfiguration.CodeRepository.assertShowAny()
-
-            tester.SourceConfiguration.applyInput({ ImageRepository: {} as any })
-            tester.SourceConfiguration.ImageRepository.assertShowAny()
-        })
-    })
-})
diff --git a/src/test/awsExplorer/commands/copyArn.test.ts b/src/test/awsExplorer/commands/copyArn.test.ts
deleted file mode 100644
index cb3e04826ca..00000000000
--- a/src/test/awsExplorer/commands/copyArn.test.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { TreeItem } from 'vscode'
-import { copyArnCommand } from '../../../awsexplorer/commands/copyArn'
-import { AWSResourceNode } from '../../../shared/treeview/nodes/awsResourceNode'
-import { TreeShim } from '../../../shared/treeview/utils'
-import { FakeEnv } from '../../shared/vscode/fakeEnv'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-
-describe('copyArnCommand', function () {
-    let window: FakeWindow
-    let env: FakeEnv
-
-    beforeEach(function () {
-        window = new FakeWindow()
-        env = new FakeEnv()
-    })
-
-    it('copies arn to clipboard and shows status bar confirmation', async function () {
-        const node: AWSResourceNode = {
-            arn: 'arn',
-            name: 'name',
-        }
-
-        await copyArnCommand(node, window, env)
-
-        assert.strictEqual(env.clipboard.text, 'arn')
-        assert.strictEqual(window.message.error, undefined)
-    })
-
-    it('shows error message on failure', async function () {
-        await copyArnCommand(new NoArnNode(), window, env)
-
-        assert.strictEqual(env.clipboard.text, undefined)
-        assert.strictEqual(window.statusBar.message, undefined)
-        assert.ok(window.message.error?.includes('Could not find an ARN'))
-    })
-
-    it('handles `TreeShim`', async function () {
-        const node = new TreeShim({
-            id: 'shim',
-            resource: { name: 'resource', arn: 'arn' },
-            getTreeItem: () => new TreeItem(''),
-        })
-
-        await copyArnCommand(node, window, env)
-        assert.strictEqual(env.clipboard.text, 'arn')
-    })
-})
-
-class NoArnNode implements AWSResourceNode {
-    public name = 'name'
-
-    public get arn(): string {
-        throw new Error('Expected failure')
-    }
-}
diff --git a/src/test/awsExplorer/commands/copyName.test.ts b/src/test/awsExplorer/commands/copyName.test.ts
deleted file mode 100644
index d3bd11335d6..00000000000
--- a/src/test/awsExplorer/commands/copyName.test.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { TreeItem } from 'vscode'
-import { copyNameCommand } from '../../../awsexplorer/commands/copyName'
-import { AWSResourceNode } from '../../../shared/treeview/nodes/awsResourceNode'
-import { TreeShim } from '../../../shared/treeview/utils'
-import { FakeEnv } from '../../shared/vscode/fakeEnv'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-
-describe('copyNameCommand', function () {
-    it('copies name to clipboard and shows status bar confirmation', async function () {
-        const node: AWSResourceNode = {
-            arn: 'arn',
-            name: 'name',
-        }
-
-        const window = new FakeWindow()
-        const env = new FakeEnv()
-        await copyNameCommand(node, window, env)
-
-        assert.strictEqual(env.clipboard.text, 'name')
-    })
-
-    it('handles `TreeShim`', async function () {
-        const node = new TreeShim({
-            id: 'shim',
-            resource: { name: 'resource', arn: 'arn' },
-            getTreeItem: () => new TreeItem(''),
-        })
-
-        const window = new FakeWindow()
-        const env = new FakeEnv()
-        await copyNameCommand(node, window, env)
-        assert.strictEqual(env.clipboard.text, 'resource')
-    })
-})
diff --git a/src/test/awsExplorer/commands/loadMoreChildren.test.ts b/src/test/awsExplorer/commands/loadMoreChildren.test.ts
deleted file mode 100644
index 9f9ad64f6e6..00000000000
--- a/src/test/awsExplorer/commands/loadMoreChildren.test.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { AwsExplorer } from '../../../awsexplorer/awsExplorer'
-import { loadMoreChildren } from '../../../awsexplorer/commands/loadMoreChildren'
-import { ToolkitError } from '../../../shared/errors'
-import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
-import { LoadMoreNode } from '../../../shared/treeview/nodes/loadMoreNode'
-import { verify, instance, mock, when } from '../../utilities/mockito'
-
-describe('loadMoreChildren', function () {
-    let mockNode: AWSTreeNodeBase & LoadMoreNode
-    let mockAwsExplorer: AwsExplorer
-
-    beforeEach(function () {
-        mockNode = mock()
-        mockAwsExplorer = mock()
-    })
-
-    it('loads more children and refreshes the node', async function () {
-        when(mockNode.isLoadingMoreChildren()).thenReturn(false)
-
-        await loadMoreChildren(instance(mockAwsExplorer), instance(mockNode))
-
-        verify(mockNode.isLoadingMoreChildren()).once()
-        verify(mockNode.loadMoreChildren()).once()
-        verify(mockAwsExplorer.refresh(instance(mockNode))).once()
-    })
-
-    it('ignores invocation when load more is already in progress', async function () {
-        when(mockNode.isLoadingMoreChildren()).thenReturn(true)
-
-        await loadMoreChildren(instance(mockAwsExplorer), instance(mockNode))
-
-        verify(mockNode.loadMoreChildren()).never()
-        verify(mockAwsExplorer.refresh(instance(mockNode))).never()
-    })
-
-    it('shows an error message and refreshes the node on failure', async function () {
-        when(mockNode.isLoadingMoreChildren()).thenReturn(false)
-        when(mockNode.loadMoreChildren()).thenThrow(new Error('Expected failure'))
-
-        await assert.rejects(() => loadMoreChildren(instance(mockAwsExplorer), instance(mockNode)), ToolkitError)
-
-        verify(mockNode.loadMoreChildren()).once()
-        verify(mockAwsExplorer.refresh(instance(mockNode))).once()
-    })
-})
diff --git a/src/test/caws/codecatalystClient.test.ts b/src/test/caws/codecatalystClient.test.ts
deleted file mode 100644
index e3978307367..00000000000
--- a/src/test/caws/codecatalystClient.test.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { toCodeCatalystUrl } from '../../codecatalyst/utils'
-import * as codecatalyst from '../../shared/clients/codecatalystClient'
-
-describe('codeCatalystClient', function () {
-    it('toCodeCatalystUrl()', async function () {
-        const org: codecatalyst.CodeCatalystOrg = {
-            type: 'org',
-            name: 'org1',
-            regionName: 'region',
-        }
-        const project: codecatalyst.CodeCatalystProject = {
-            type: 'project',
-            org: org,
-            name: 'project1',
-        }
-        const repo: codecatalyst.CodeCatalystRepo = {
-            type: 'repo',
-            org: org,
-            project: project,
-            id: 'repoid1',
-            name: 'repo1',
-            lastUpdatedTime: new Date(),
-            createdTime: new Date(),
-        }
-        const prefix = `https://${codecatalyst.getCodeCatalystConfig().hostname}/spaces`
-        assert.deepStrictEqual(toCodeCatalystUrl(org), `${prefix}/org1/view`)
-        assert.deepStrictEqual(toCodeCatalystUrl(project), `${prefix}/org1/projects/project1/view`)
-        assert.deepStrictEqual(
-            toCodeCatalystUrl(repo),
-            `${prefix}/org1/projects/project1/source-repositories/repo1/view`
-        )
-    })
-})
diff --git a/src/test/caws/tools.test.ts b/src/test/caws/tools.test.ts
deleted file mode 100644
index 0b82a101197..00000000000
--- a/src/test/caws/tools.test.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as path from 'path'
-import * as http from 'http'
-import * as assert from 'assert'
-import { fileExists, makeTemporaryToolkitFolder } from '../../shared/filesystemUtilities'
-import { ChildProcess } from '../../shared/utilities/childProcess'
-import { FakeExtensionContext } from '../fakeExtensionContext'
-import { startSshAgent } from '../../shared/extensions/ssh'
-import { ensureConnectScript } from '../../codecatalyst/tools'
-import {
-    bearerTokenCacheLocation,
-    DevEnvironmentId,
-    getCodeCatalystSsmEnv,
-    sshLogFileLocation,
-} from '../../codecatalyst/model'
-import { readFile, writeFile } from 'fs-extra'
-import { StartDevEnvironmentSessionRequest } from 'aws-sdk/clients/codecatalyst'
-
-describe('SSH Agent', function () {
-    it('can start the agent on windows', async function () {
-        // TODO: we should also skip this test if not running in CI
-        // Local machines probably won't have admin permissions in the spawned processes
-        if (process.platform !== 'win32') {
-            this.skip()
-        }
-
-        const runCommand = (command: string) => {
-            const args = ['-Command', command]
-            return new ChildProcess('powershell.exe', args).run({ rejectOnErrorCode: true })
-        }
-
-        const getStatus = () => {
-            return runCommand('echo (Get-Service ssh-agent).Status').then(o => o.stdout)
-        }
-
-        await runCommand('Stop-Service ssh-agent')
-        assert.strictEqual(await getStatus(), 'Stopped')
-        await startSshAgent()
-        assert.strictEqual(await getStatus(), 'Running')
-    })
-})
-
-describe('Connect Script', function () {
-    let context: FakeExtensionContext
-
-    function isWithin(path1: string, path2: string): boolean {
-        const rel = path.relative(path1, path2)
-        return !path.isAbsolute(rel) && !rel.startsWith('..') && !!rel
-    }
-
-    beforeEach(async function () {
-        context = await FakeExtensionContext.create()
-        context.globalStorageUri = vscode.Uri.file(await makeTemporaryToolkitFolder())
-    })
-
-    it('can get a connect script path, adding a copy to global storage', async function () {
-        const script = (await ensureConnectScript(context)).unwrap().fsPath
-        assert.ok(await fileExists(script))
-        assert.ok(isWithin(context.globalStorageUri.fsPath, script))
-    })
-
-    function createFakeServer(testDevEnv: DevEnvironmentId) {
-        return http.createServer(async (req, resp) => {
-            try {
-                const data = await new Promise<string>((resolve, reject) => {
-                    req.on('error', reject)
-                    req.on('data', d => resolve(d.toString()))
-                })
-
-                const body = JSON.parse(data)
-                const expected: Pick<StartDevEnvironmentSessionRequest, 'sessionConfiguration'> = {
-                    sessionConfiguration: { sessionType: 'SSH' },
-                }
-
-                const expectedPath = `/v1/spaces/${testDevEnv.org.name}/projects/${testDevEnv.project.name}/devEnvironments/${testDevEnv.id}/session`
-
-                assert.deepStrictEqual(body, expected)
-                assert.strictEqual(req.url, expectedPath)
-            } catch (e) {
-                resp.writeHead(400, { 'Content-Type': 'application/json' })
-                resp.end(JSON.stringify({ name: 'ValidationException', message: (e as Error).message }))
-
-                return
-            }
-
-            resp.writeHead(200, { 'Content-Type': 'application/json' })
-            resp.end(
-                JSON.stringify({
-                    tokenValue: 'a token',
-                    streamUrl: 'some url',
-                    sessionId: 'an id',
-                })
-            )
-        })
-    }
-
-    it('can run the script with environment variables', async function () {
-        const testDevEnv: DevEnvironmentId = {
-            id: '01234567890',
-            project: { name: 'project' },
-            org: { name: 'org' },
-        }
-
-        const server = createFakeServer(testDevEnv)
-        const address = await new Promise<string>((resolve, reject) => {
-            server.on('error', reject)
-            server.listen({ host: 'localhost', port: 28142 }, () => resolve(`http://localhost:28142`))
-        })
-
-        await writeFile(bearerTokenCacheLocation(testDevEnv.id), 'token')
-        const script = (await ensureConnectScript(context)).unwrap().fsPath
-        const env = getCodeCatalystSsmEnv('us-weast-1', 'echo', testDevEnv)
-        env.CODECATALYST_ENDPOINT = address
-
-        // This could be de-duped
-        const isWindows = process.platform === 'win32'
-        const cmd = isWindows ? 'powershell.exe' : script
-        const args = isWindows ? ['-ExecutionPolicy', 'Bypass', '-File', script, 'bar'] : [script, 'bar']
-
-        const output = await new ChildProcess(cmd, args).run({ spawnOptions: { env } })
-        if (output.exitCode !== 0) {
-            const logOutput = sshLogFileLocation(testDevEnv.id)
-            const message = `stderr:\n${output.stderr}\n\nlogs:\n${await readFile(logOutput)}`
-
-            assert.fail(`Connect script should exit with a zero status:\n${message}`)
-        }
-    })
-})
diff --git a/src/test/caws/uriHandlers.test.ts b/src/test/caws/uriHandlers.test.ts
deleted file mode 100644
index fc69fa6e5ec..00000000000
--- a/src/test/caws/uriHandlers.test.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as sinon from 'sinon'
-import * as vscode from 'vscode'
-import * as assert from 'assert'
-import { register } from '../../codecatalyst/uriHandlers'
-import { UriHandler } from '../../shared/vscode/uriHandler'
-import { VSCODE_EXTENSION_ID } from '../../shared/extensions'
-import { CodeCatalystClient } from '../../shared/clients/codecatalystClient'
-import { anything, mock, reset, when } from 'ts-mockito'
-import { createTestWindow, TestWindow } from '../shared/vscode/window'
-import { SeverityLevel } from '../shared/vscode/message'
-import { DevEnvironmentId } from '../../codecatalyst/model'
-
-type Stub<T extends (...args: any[]) => any> = sinon.SinonStub<Parameters<T>, ReturnType<T>>
-
-function createCloneUri(target: string): vscode.Uri {
-    return vscode.Uri.parse(`vscode://${VSCODE_EXTENSION_ID.awstoolkit}/clone?url=${encodeURIComponent(target)}`)
-}
-
-function createConnectUri(env: DevEnvironmentId): vscode.Uri {
-    const params = {
-        devEnvironmentId: env.id,
-        spaceName: env.org.name,
-        projectName: env.project.name,
-    }
-    const encoded = Object.entries(params)
-        .map(([k, v]) => `${encodeURIComponent(k)}=${encodeURIComponent(v)}`)
-        .join('&')
-    return vscode.Uri.parse(`vscode://${VSCODE_EXTENSION_ID.awstoolkit}/connect/codecatalyst?${encoded}`)
-}
-
-// Tests involving `UriHandler` should _not_ couple the URI paths to the implementation.
-// The path is apart of our public API! They should not be easy to change.
-
-describe('CodeCatalyst handlers', function () {
-    let handler: UriHandler
-    let testWindow: TestWindow
-    let commandStub: Stub<typeof vscode.commands.executeCommand>
-    const client = mock<CodeCatalystClient>()
-
-    beforeEach(function () {
-        handler = new UriHandler((testWindow = createTestWindow()))
-        register(handler, {
-            openDevEnv: {
-                execute: async () => undefined,
-            } as any,
-            cloneRepo: {
-                execute: async () => undefined,
-            } as any,
-        })
-        commandStub = sinon.stub(vscode.commands, 'executeCommand')
-    })
-
-    afterEach(function () {
-        sinon.restore()
-        reset(client)
-    })
-
-    describe('clone', function () {
-        it('registers for "/clone"', function () {
-            assert.throws(() => handler.registerHandler('/clone', () => {}))
-        })
-
-        it('ignores requests without a url', async function () {
-            await handler.handleUri(createCloneUri('').with({ query: '' }))
-            assert.strictEqual(commandStub.called, false)
-        })
-
-        it('does a normal git clone if not a CodeCatalyst URL', async function () {
-            const target = 'https://github.com/antlr/grammars-v4.git'
-            await handler.handleUri(createCloneUri(target))
-            assert.ok(commandStub.calledWith('git.clone', target))
-        })
-    })
-
-    describe('connect', function () {
-        const devenvId = {
-            id: 'somefoo',
-            org: { name: 'org' },
-            project: { name: 'project' },
-        }
-
-        it('checks that the environment exists', async function () {
-            // This test is not accurate anymore because dependencies are checked prior to API calls
-            // Unit tests are ran without other extensions activated, so this fails on the SSH extension check
-            this.skip()
-
-            const errorMessage = testWindow.waitForMessage(/Failed to handle/).then(message => {
-                message.assertSeverity(SeverityLevel.Error)
-            })
-
-            when(client.getDevEnvironment(anything())).thenReject(new Error('No development environment found'))
-            await handler.handleUri(createConnectUri(devenvId))
-            await errorMessage
-        })
-    })
-})
diff --git a/src/test/caws/wizards/selectResource.test.ts b/src/test/caws/wizards/selectResource.test.ts
deleted file mode 100644
index 5ec891a8416..00000000000
--- a/src/test/caws/wizards/selectResource.test.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { instance, when } from 'ts-mockito'
-import { createOrgPrompter } from '../../../codecatalyst/wizards/selectResource'
-import { CodeCatalystOrg, CodeCatalystClient } from '../../../shared/clients/codecatalystClient'
-import { AsyncCollection, toCollection } from '../../../shared/utilities/asyncCollection'
-import { createQuickPickTester } from '../../shared/ui/testUtils'
-import { mock } from '../../utilities/mockito'
-
-// TODO: move to test utils
-function intoCollection<T>(arr: T[]): AsyncCollection<T> {
-    return toCollection(async function* () {
-        yield* arr
-    })
-}
-
-describe('Prompts', function () {
-    let orgs: CodeCatalystOrg[]
-
-    beforeEach(function () {
-        orgs = [{ type: 'org', name: 'MyOrg', description: 'My Description', regionName: 'region' }]
-    })
-
-    function mockClient(): CodeCatalystClient {
-        const client = mock<CodeCatalystClient>()
-
-        when(client.listSpaces()).thenReturn(intoCollection([orgs]))
-
-        return instance(client)
-    }
-
-    it('can list spaces (organizations)', async function () {
-        const prompt = createOrgPrompter(mockClient())
-        const tester = createQuickPickTester(prompt)
-
-        tester.assertItems([{ label: 'MyOrg', detail: 'My Description', data: orgs[0] }])
-        tester.acceptItem('MyOrg')
-
-        await tester.result()
-    })
-
-    it('can refresh spaces (organizations)', async function () {
-        const prompt = createOrgPrompter(mockClient())
-        const tester = createQuickPickTester(prompt)
-        const newOrg = { type: 'org', name: 'AnotherOrg', description: 'More Text', regionName: 'region' } as const
-
-        tester.assertItems([{ label: 'MyOrg', detail: 'My Description', data: orgs[0] }])
-        tester.addCallback(() => orgs.push(newOrg))
-        tester.pressButton('Refresh')
-        tester.assertItems(['MyOrg', 'AnotherOrg'])
-        tester.acceptItem('AnotherOrg')
-
-        await tester.result(newOrg)
-    })
-})
diff --git a/src/test/cdk/explorer/appNode.test.ts b/src/test/cdk/explorer/appNode.test.ts
deleted file mode 100644
index a31ab2753e6..00000000000
--- a/src/test/cdk/explorer/appNode.test.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as path from 'path'
-import * as sinon from 'sinon'
-import * as vscode from 'vscode'
-import * as app from '../../../cdk/explorer/cdkProject'
-import * as appNode from '../../../cdk/explorer/nodes/appNode'
-import { ConstructNode } from '../../../cdk/explorer/nodes/constructNode'
-import { getTestWorkspaceFolder } from '../../../integrationTest/integrationTestsUtilities'
-import { getIcon } from '../../../shared/icons'
-import * as treeUtils from '../treeTestUtils'
-
-describe('AppNode', function () {
-    afterEach(function () {
-        sinon.restore()
-    })
-
-    const workspaceFolderPath = getTestWorkspaceFolder()
-    const workspaceFolderName = 'cdk-test-folder'
-    const cdkJsonPath = path.join(getTestWorkspaceFolder(), workspaceFolderName, 'cdk.json')
-    const treePath = path.join(cdkJsonPath, '..', 'cdk.out', 'tree.json')
-
-    it('uses the `cdk.json` uri as its id', async function () {
-        const testNode = getTestNode()
-
-        assert.strictEqual(testNode.id, vscode.Uri.file(cdkJsonPath).toString())
-    })
-
-    it('initializes label, tooltip, and icon', async function () {
-        const testNode = getTestNode().getTreeItem()
-
-        assert.strictEqual(testNode.label, path.relative(workspaceFolderPath, path.dirname(cdkJsonPath)))
-        assert.strictEqual(testNode.tooltip, vscode.Uri.file(cdkJsonPath).path)
-        assert.strictEqual(testNode.iconPath, getIcon('aws-cdk-logo'))
-    })
-
-    it('returns placeholder node when app contains no stacks', async function () {
-        const testNode = getTestNode()
-        sinon.stub(app, 'getApp').resolves({
-            constructTree: treeUtils.getTreeWithNoStack(),
-            location: testNode.resource,
-        })
-
-        const childNodes = await testNode.getChildren()
-
-        assert.strictEqual(childNodes.length, 1)
-        assert.ok((await childNodes[0].getTreeItem()).label?.includes('No stacks'))
-    })
-
-    it('returns construct node when app has stacks', async function () {
-        const testNode = getTestNode()
-        sinon.stub(app, 'getApp').resolves({
-            constructTree: treeUtils.getTree(),
-            location: testNode.resource,
-        })
-
-        const childNodes = await testNode.getChildren()
-
-        assert.strictEqual(childNodes.length, 1)
-        assert.strictEqual(childNodes[0] instanceof ConstructNode, true)
-    })
-
-    it('returns placeholder node when tree.json cannot be loaded', async function () {
-        const testNode = getTestNode()
-        sinon.stub(app, 'getApp').throws()
-
-        const childNodes = await testNode.getChildren()
-
-        assert.strictEqual(childNodes.length, 1)
-        assert.ok((await childNodes[0].getTreeItem()).label?.includes('Unable to load construct tree'))
-    })
-
-    function getTestNode(): appNode.AppNode {
-        const appLocation: app.CdkAppLocation = {
-            cdkJsonUri: vscode.Uri.file(cdkJsonPath),
-            treeUri: vscode.Uri.file(treePath),
-        }
-
-        return new appNode.AppNode(appLocation)
-    }
-})
diff --git a/src/test/cdk/explorer/awsCdkExplorer.test.ts b/src/test/cdk/explorer/awsCdkExplorer.test.ts
deleted file mode 100644
index 25e0d71c140..00000000000
--- a/src/test/cdk/explorer/awsCdkExplorer.test.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-import * as sinon from 'sinon'
-import * as detectCdkProjects from '../../../cdk/explorer/detectCdkProjects'
-import { CdkAppLocation } from '../../../cdk/explorer/cdkProject'
-import { CdkRootNode } from '../../../cdk/explorer/rootNode'
-
-describe('CdkRootNode', function () {
-    it('shows CDK projects', async function () {
-        const appLocation: CdkAppLocation = {
-            cdkJsonUri: vscode.Uri.file('/cdk.json'),
-            treeUri: vscode.Uri.file('/cdk.out/tree.json'),
-        }
-
-        sinon.stub(detectCdkProjects, 'detectCdkProjects').resolves([appLocation])
-
-        const rootNode = new CdkRootNode()
-        const treeNodes = await rootNode.getChildren()
-        assert.strictEqual(treeNodes.length, 1)
-        assert.deepStrictEqual(treeNodes[0].resource, appLocation)
-    })
-})
diff --git a/src/test/cdk/explorer/propertyNode.test.ts b/src/test/cdk/explorer/propertyNode.test.ts
deleted file mode 100644
index 2d14e3e61fc..00000000000
--- a/src/test/cdk/explorer/propertyNode.test.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { PropertyNode } from '../../../cdk/explorer/nodes/propertyNode'
-
-describe('PropertyNode', function () {
-    const label = 'myProperty'
-
-    it('initializes label', async function () {
-        const testNode = new PropertyNode(label, 'blue').getTreeItem()
-        assert.strictEqual(testNode.label, `${label}: blue`)
-    })
-
-    it('returns no children when property does not have nested values', async function () {
-        const testNode = new PropertyNode(label, 'purple')
-
-        const childNodes = await testNode.getChildren()
-
-        assert.strictEqual(childNodes.length, 0, 'Expected no child nodes for a property with non-nested properties')
-    })
-
-    it('returns single child when property has a string value', async function () {
-        const value = 'string value'
-        const children: { [key: string]: any } = { key: value }
-        const testNode = new PropertyNode(label, children)
-
-        const childNodes = await testNode.getChildren()
-
-        assert.strictEqual(childNodes.length, 1, 'Expected a single property node for a string property')
-        assert.strictEqual((await childNodes[0].getTreeItem()).label, `key: ${value}`)
-    })
-
-    it('returns single child when property has a boolean value', async function () {
-        const children: { [key: string]: any } = { key: true }
-        const testNode = new PropertyNode(label, children)
-
-        const childNodes = await testNode.getChildren()
-
-        assert.strictEqual(childNodes.length, 1, 'Expected a single property node for a boolean property')
-        assert.strictEqual((await childNodes[0].getTreeItem()).label, 'key: true')
-    })
-
-    it('returns single child when property has an int value', async function () {
-        const value = 100
-        const children: { [key: string]: any } = { key: value }
-        const testNode = new PropertyNode(label, children)
-
-        const childNodes = await testNode.getChildren()
-
-        assert.strictEqual(childNodes.length, 1, 'Expected a single property node for an int property')
-        assert.strictEqual(
-            (await childNodes[0].getTreeItem()).label,
-            `key: ${value}`,
-            'Unexpected label on PropertyNode'
-        )
-    })
-
-    it('returns a nested property node with a property node for each value in the array', async function () {
-        const values = ['one', 'two', 'three']
-        const children: { [key: string]: any } = { key: values }
-
-        const testNode = new PropertyNode(label, children)
-
-        const childNodes = await testNode.getChildren()
-        assert.strictEqual(childNodes.length, 1, 'expected nested property to have a child node for array')
-        assert.strictEqual((await childNodes[0].getTreeItem()).label, 'key', 'Unexpected label on node')
-
-        const childPropertyNodes = await childNodes[0].getChildren?.()
-        assert.strictEqual(childPropertyNodes?.length, 3, 'Expected each value in nested array to have a child node')
-    })
-
-    it('returns a nested property node with nested object as child property nodes', async function () {
-        const nestedObject = {
-            evenMoreNested: 'nestedValue',
-        }
-        const value = {
-            nestedKey: nestedObject,
-        }
-
-        const children: { [key: string]: any } = { key: value }
-        const testNode = new PropertyNode(label, children)
-
-        const childNodes = await testNode.getChildren()
-
-        assert.strictEqual(childNodes.length, 1, 'Expected nested property of object type to have child nodes')
-        assert.strictEqual((await childNodes[0].getTreeItem()).label, 'key')
-
-        const grandChildren = await childNodes[0]?.getChildren?.()
-        assert.strictEqual(grandChildren?.length, 1, 'Expected nested property of object type to have grandchild nodes')
-        assert.strictEqual((await grandChildren[0].getTreeItem()).label, 'nestedKey')
-    })
-})
diff --git a/src/test/cloudWatchLogs/commands/addLogEvents.test.ts b/src/test/cloudWatchLogs/commands/addLogEvents.test.ts
deleted file mode 100644
index 5bcb446300e..00000000000
--- a/src/test/cloudWatchLogs/commands/addLogEvents.test.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { CloudWatchLogs } from 'aws-sdk'
-import * as FakeTimers from '@sinonjs/fake-timers'
-import * as sinon from 'sinon'
-import * as vscode from 'vscode'
-import { addLogEvents } from '../../../cloudWatchLogs/commands/addLogEvents'
-import { LogStreamRegistry } from '../../../cloudWatchLogs/registry/logStreamRegistry'
-import { CLOUDWATCH_LOGS_SCHEME } from '../../../shared/constants'
-import { installFakeClock } from '../../testUtil'
-
-describe('addLogEvents', async function () {
-    let sandbox: sinon.SinonSandbox
-    let clock: FakeTimers.InstalledClock
-
-    before(function () {
-        clock = installFakeClock()
-    })
-
-    beforeEach(function () {
-        sandbox = sinon.createSandbox()
-    })
-
-    afterEach(function () {
-        clock.reset()
-        sandbox.restore()
-    })
-
-    after(function () {
-        clock.uninstall()
-    })
-
-    it('runs updateLog and sets busy status correctly', async function () {
-        const uri = vscode.Uri.parse(`${CLOUDWATCH_LOGS_SCHEME}:group:stream:region`)
-        const setBusyStatus = sandbox.stub<[vscode.Uri, boolean], void>()
-        const updateLog = sandbox.stub<
-            [
-                vscode.Uri,
-                ('head' | 'tail' | undefined)?,
-                (
-                    | ((
-                          logGroupInfo: {
-                              groupName: string
-                              streamName: string
-                              regionName: string
-                          },
-                          nextToken?: string | undefined
-                      ) => Promise<CloudWatchLogs.GetLogEventsResponse>)
-                    | undefined
-                )?
-            ]
-        >()
-
-        const document: vscode.TextDocument = {
-            uri: uri,
-        } as any as vscode.TextDocument
-
-        const fakeRegistry: LogStreamRegistry = {
-            setBusyStatus: setBusyStatus,
-            updateLog: updateLog,
-        } as any as LogStreamRegistry
-
-        const fakeEvent = sandbox.createStubInstance(vscode.EventEmitter)
-
-        await addLogEvents(document, fakeRegistry, 'head', fakeEvent)
-
-        sandbox.assert.calledTwice(setBusyStatus)
-        sandbox.assert.calledWith(setBusyStatus.firstCall, uri, true)
-        sandbox.assert.calledWith(setBusyStatus.secondCall, uri, false)
-        // eslint-disable-next-line @typescript-eslint/unbound-method
-        sandbox.assert.calledTwice(fakeEvent.fire)
-        sandbox.assert.calledWith(setBusyStatus.secondCall, uri, false)
-        sandbox.assert.calledOnce(updateLog)
-        sandbox.assert.calledWith(updateLog.firstCall, uri, 'head')
-    })
-
-    it('async-locks to prevent more than one execution at a time', async function () {
-        const uri = vscode.Uri.parse(`${CLOUDWATCH_LOGS_SCHEME}:group:stream:region`)
-        const setBusyStatus = sandbox.stub<[vscode.Uri, boolean], void>()
-        const updateLog = sandbox.stub<
-            [
-                vscode.Uri,
-                ('head' | 'tail' | undefined)?,
-                (
-                    | ((
-                          logGroupInfo: {
-                              groupName: string
-                              streamName: string
-                              regionName: string
-                          },
-                          nextToken?: string | undefined
-                      ) => Promise<CloudWatchLogs.GetLogEventsResponse>)
-                    | undefined
-                )?
-            ]
-        >()
-
-        // simulates a long network call. Doesn't need to do anything otherwise
-        updateLog.onFirstCall().callsFake(async () => {
-            clock.setTimeout(() => {}, 5000)
-        })
-        // simulates another network call. Shorter so that way this one triggers before the initial lock is over
-        updateLog.onThirdCall().callsFake(async () => {
-            clock.setTimeout(() => {}, 500)
-        })
-        // simulates another network call. Shorter so that way this one triggers  before the initial lock is over
-        updateLog.onSecondCall().callsFake(async () => {
-            clock.setTimeout(() => {}, 100)
-        })
-
-        const document: vscode.TextDocument = {
-            uri: uri,
-        } as any as vscode.TextDocument
-
-        const fakeRegistry: LogStreamRegistry = {
-            setBusyStatus: setBusyStatus,
-            updateLog: updateLog,
-        } as any as LogStreamRegistry
-
-        const fakeEvent = sandbox.createStubInstance(vscode.EventEmitter)
-
-        addLogEvents(document, fakeRegistry, 'head', fakeEvent)
-
-        addLogEvents(document, fakeRegistry, 'head', fakeEvent)
-
-        addLogEvents(document, fakeRegistry, 'head', fakeEvent)
-
-        new Promise<void>(resolve => {
-            clock.setTimeout(() => {
-                sandbox.assert.calledTwice(setBusyStatus)
-                sandbox.assert.calledWith(setBusyStatus.firstCall, uri, true)
-                sandbox.assert.calledWith(setBusyStatus.secondCall, uri, false)
-                // eslint-disable-next-line @typescript-eslint/unbound-method
-                sandbox.assert.calledTwice(fakeEvent.fire)
-                sandbox.assert.calledWith(setBusyStatus.secondCall, uri, false)
-                sandbox.assert.calledOnce(updateLog)
-                sandbox.assert.calledWith(updateLog.firstCall, uri, 'head')
-                resolve()
-            }, 10000)
-        })
-        await clock.nextAsync()
-        await clock.nextAsync()
-        await clock.nextAsync()
-        await clock.nextAsync()
-        await clock.nextAsync()
-    })
-})
diff --git a/src/test/cloudWatchLogs/commands/copyLogStreamName.test.ts b/src/test/cloudWatchLogs/commands/copyLogStreamName.test.ts
deleted file mode 100644
index c98d864373d..00000000000
--- a/src/test/cloudWatchLogs/commands/copyLogStreamName.test.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-import { copyLogStreamName } from '../../../cloudWatchLogs/commands/copyLogStreamName'
-import { CLOUDWATCH_LOGS_SCHEME } from '../../../shared/constants'
-
-describe('copyLogStreamName', async function () {
-    beforeEach(async function () {
-        await vscode.env.clipboard.writeText('')
-    })
-
-    afterEach(async function () {
-        await vscode.env.clipboard.writeText('')
-    })
-
-    it('copies stream names from valid URIs and does not copy anything new if the URI is invalid', async function () {
-        const streamName = 'stream'
-        await copyLogStreamName(vscode.Uri.parse(`${CLOUDWATCH_LOGS_SCHEME}:group:${streamName}:account`))
-
-        assert.strictEqual(await vscode.env.clipboard.readText(), streamName)
-        await copyLogStreamName(vscode.Uri.parse(`notCloudWatch:hahahaha`))
-
-        assert.strictEqual(await vscode.env.clipboard.readText(), streamName)
-    })
-})
diff --git a/src/test/cloudWatchLogs/commands/saveCurrentLogStreamContent.test.ts b/src/test/cloudWatchLogs/commands/saveCurrentLogStreamContent.test.ts
deleted file mode 100644
index dec4397e210..00000000000
--- a/src/test/cloudWatchLogs/commands/saveCurrentLogStreamContent.test.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as path from 'path'
-import * as vscode from 'vscode'
-import * as fs from 'fs-extra'
-
-import { saveCurrentLogStreamContent } from '../../../cloudWatchLogs/commands/saveCurrentLogStreamContent'
-import { LogStreamRegistry } from '../../../cloudWatchLogs/registry/logStreamRegistry'
-import { CLOUDWATCH_LOGS_SCHEME } from '../../../shared/constants'
-import { fileExists, makeTemporaryToolkitFolder, readFileAsString } from '../../../shared/filesystemUtilities'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-
-describe('saveCurrentLogStreamContent', async function () {
-    const logContent = 'shutdown is imminent'
-    let filename: string
-    let fakeRegistry: LogStreamRegistry
-    let tempDir: string
-
-    beforeEach(async function () {
-        tempDir = await makeTemporaryToolkitFolder()
-        filename = path.join(tempDir, 'bobLoblawsLawB.log')
-        fakeRegistry = ({
-            getLogContent: (uri: vscode.Uri, formatting?: { timestamps?: boolean }) => {
-                return logContent
-            },
-        } as any) as LogStreamRegistry
-    })
-
-    afterEach(async function () {
-        await fs.remove(tempDir)
-    })
-
-    it('saves log content to a file', async function () {
-        await saveCurrentLogStreamContent(
-            vscode.Uri.parse(`${CLOUDWATCH_LOGS_SCHEME}:g:s:r`),
-            fakeRegistry,
-            new FakeWindow({
-                dialog: {
-                    saveSelection: vscode.Uri.file(filename),
-                },
-            })
-        )
-
-        assert.ok(await fileExists(filename))
-        assert.strictEqual(await readFileAsString(filename), logContent)
-    })
-
-    it('does not do anything if the URI is invalid', async function () {
-        await saveCurrentLogStreamContent(
-            vscode.Uri.parse(`notCloudWatch:hahahaha`),
-            fakeRegistry,
-            new FakeWindow({
-                dialog: {
-                    saveSelection: vscode.Uri.file(filename),
-                },
-            })
-        )
-        assert.strictEqual(await fileExists(filename), false)
-    })
-
-    // TODO: Add test for fs.writeFile failure. Apparently `fs.chmod` doesn't work on Windows?
-})
diff --git a/src/test/cloudWatchLogs/commands/viewLogStream.test.ts b/src/test/cloudWatchLogs/commands/viewLogStream.test.ts
deleted file mode 100644
index 5a4be728abf..00000000000
--- a/src/test/cloudWatchLogs/commands/viewLogStream.test.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as nls from 'vscode-nls'
-const localize = nls.loadMessageBundle()
-
-import * as assert from 'assert'
-import * as moment from 'moment'
-import {
-    SelectLogStreamWizardContext,
-    SelectLogStreamWizard,
-    convertDescribeLogToQuickPickItems,
-} from '../../../cloudWatchLogs/commands/viewLogStream'
-import { LogGroupNode } from '../../../cloudWatchLogs/explorer/logGroupNode'
-import { LOCALIZED_DATE_FORMAT } from '../../../shared/constants'
-import globals from '../../../shared/extensionGlobals'
-
-class MockSelectLogStreamWizardContext implements SelectLogStreamWizardContext {
-    public constructor(private readonly pickLogStreamResponses: (string | undefined)[] = []) {
-        this.pickLogStreamResponses = pickLogStreamResponses.reverse()
-    }
-
-    public async pickLogStream(): Promise<string | undefined> {
-        if (this.pickLogStreamResponses.length <= 0) {
-            throw new Error('pickLogStream was called more times than expected')
-        }
-
-        const response = this.pickLogStreamResponses.pop()
-        if (!response) {
-            return undefined
-        }
-
-        return response
-    }
-}
-
-describe('viewLogStreamWizard', async function () {
-    it('exits when cancelled', async function () {
-        const wizard = new SelectLogStreamWizard(
-            new LogGroupNode('region', {}),
-            new MockSelectLogStreamWizardContext([undefined])
-        )
-        const result = await wizard.run()
-
-        assert.ok(!result)
-    })
-
-    it('returns the selected log stream name', async function () {
-        const streamName = 'stream/name'
-        const region = 'us-weast-99'
-        const groupName = 'grouper'
-        const wizard = new SelectLogStreamWizard(
-            new LogGroupNode(region, { logGroupName: groupName }),
-            new MockSelectLogStreamWizardContext([streamName])
-        )
-        const result = await wizard.run()
-
-        assert.ok(result)
-        assert.strictEqual(result?.logGroupName, groupName)
-        assert.strictEqual(result?.logStreamName, streamName)
-        assert.strictEqual(result?.region, region)
-    })
-})
-
-describe('convertDescribeLogToQuickPickItems', function () {
-    it('converts things correctly', function () {
-        const time = new globals.clock.Date().getTime()
-        const results = convertDescribeLogToQuickPickItems({
-            logStreams: [
-                {
-                    logStreamName: 'streamWithoutTimestamp',
-                },
-                {
-                    logStreamName: 'streamWithTimestamp',
-                    lastEventTimestamp: time,
-                },
-            ],
-        })
-
-        assert.strictEqual(results.length, 2)
-        assert.deepStrictEqual(results[0], {
-            label: 'streamWithoutTimestamp',
-            detail: localize('AWS.cloudWatchLogs.viewLogStream.workflow.noStreams', '[No Log Events found]'),
-        })
-        assert.deepStrictEqual(results[1], {
-            label: 'streamWithTimestamp',
-            detail: moment(time).format(LOCALIZED_DATE_FORMAT),
-        })
-        const noResults = convertDescribeLogToQuickPickItems({})
-        assert.strictEqual(noResults.length, 0)
-    })
-})
diff --git a/src/test/cloudWatchLogs/document/logStreamDocumentProvider.test.ts b/src/test/cloudWatchLogs/document/logStreamDocumentProvider.test.ts
deleted file mode 100644
index c0f44666ddb..00000000000
--- a/src/test/cloudWatchLogs/document/logStreamDocumentProvider.test.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-import { CloudWatchLogsSettings } from '../../../cloudWatchLogs/cloudWatchLogsUtils'
-import { LogStreamDocumentProvider } from '../../../cloudWatchLogs/document/logStreamDocumentProvider'
-import { LogStreamRegistry, CloudWatchLogStreamData } from '../../../cloudWatchLogs/registry/logStreamRegistry'
-import { Settings } from '../../../shared/settings'
-
-describe('LogStreamDocumentProvider', function () {
-    let registry: LogStreamRegistry
-    let map: Map<string, CloudWatchLogStreamData>
-    let provider: LogStreamDocumentProvider
-
-    const config = new Settings(vscode.ConfigurationTarget.Workspace)
-
-    const registeredUri = vscode.Uri.parse('has:This')
-    // TODO: Make this less flaky when we add manual timestamp controls.
-    const message = "i'm just putting something here because it's a friday"
-    const stream: CloudWatchLogStreamData = {
-        data: [
-            {
-                message,
-            },
-        ],
-        busy: false,
-    }
-
-    beforeEach(function () {
-        map = new Map<string, CloudWatchLogStreamData>()
-        map.set(registeredUri.path, stream)
-        registry = new LogStreamRegistry(new CloudWatchLogsSettings(config), map)
-        provider = new LogStreamDocumentProvider(registry)
-    })
-
-    it('provides content if it exists and a blank string if it does not', function () {
-        assert.strictEqual(
-            provider.provideTextDocumentContent(registeredUri),
-            `                             \t${message}\n`
-        )
-        assert.strictEqual(provider.provideTextDocumentContent(vscode.Uri.parse('has:Not')), '')
-    })
-})
diff --git a/src/test/cloudWatchLogs/explorer/cloudWatchLogsNode.test.ts b/src/test/cloudWatchLogs/explorer/cloudWatchLogsNode.test.ts
deleted file mode 100644
index 2f3f121c687..00000000000
--- a/src/test/cloudWatchLogs/explorer/cloudWatchLogsNode.test.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { contextValueCloudwatchLog, LogGroupNode } from '../../../cloudWatchLogs/explorer/logGroupNode'
-import { CloudWatchLogsNode } from '../../../cloudWatchLogs/explorer/cloudWatchLogsNode'
-import { asyncGenerator } from '../../utilities/collectionUtils'
-import {
-    assertNodeListOnlyHasErrorNode,
-    assertNodeListOnlyHasPlaceholderNode,
-} from '../../utilities/explorerNodeAssertions'
-import { DefaultCloudWatchLogsClient } from '../../../shared/clients/cloudWatchLogsClient'
-import { stub } from '../../utilities/stubber'
-
-const fakeRegionCode = 'someregioncode'
-const unsortedText = ['zebra', 'Antelope', 'aardvark', 'elephant']
-const sortedText = ['aardvark', 'Antelope', 'elephant', 'zebra']
-
-describe('CloudWatchLogsNode', function () {
-    let testNode: CloudWatchLogsNode
-
-    // Mocked Lambda Client returns Log Groups for anything listed in logGroupNames
-    let logGroupNames: string[]
-
-    function createClient() {
-        const client = stub(DefaultCloudWatchLogsClient, { regionCode: fakeRegionCode })
-        client.describeLogGroups.callsFake(() => asyncGenerator(logGroupNames.map(name => ({ logGroupName: name }))))
-
-        return client
-    }
-
-    beforeEach(function () {
-        logGroupNames = ['group1', 'group2']
-        testNode = new CloudWatchLogsNode(fakeRegionCode, createClient())
-    })
-
-    it('returns placeholder node if no children are present', async function () {
-        logGroupNames = []
-
-        const childNodes = await testNode.getChildren()
-
-        assertNodeListOnlyHasPlaceholderNode(childNodes)
-    })
-
-    it('has LogGroupNode child nodes', async function () {
-        const childNodes = await testNode.getChildren()
-
-        assert.strictEqual(childNodes.length, logGroupNames.length, 'Unexpected child count')
-
-        childNodes.forEach(node => assert.ok(node instanceof LogGroupNode, 'Expected child node to be LogGroupNode'))
-    })
-
-    it('has child nodes with CloudWatch Log contextValue', async function () {
-        const childNodes = await testNode.getChildren()
-
-        childNodes.forEach(node =>
-            assert.strictEqual(
-                node.contextValue,
-                contextValueCloudwatchLog,
-                'expected the node to have a CloudWatch Log contextValue'
-            )
-        )
-    })
-
-    it('sorts child nodes', async function () {
-        logGroupNames = unsortedText
-
-        const childNodes = await testNode.getChildren()
-
-        const actualChildOrder = childNodes.map(node => node.label)
-        assert.deepStrictEqual(actualChildOrder, sortedText, 'Unexpected child sort order')
-    })
-
-    it('has an error node for a child if an error happens during loading', async function () {
-        const client = createClient()
-        client.describeLogGroups.throws(new Error())
-
-        const node = new CloudWatchLogsNode(fakeRegionCode, client)
-        assertNodeListOnlyHasErrorNode(await node.getChildren())
-    })
-})
diff --git a/src/test/cloudWatchLogs/registry/logStreamRegistry.test.ts b/src/test/cloudWatchLogs/registry/logStreamRegistry.test.ts
deleted file mode 100644
index 734512680a7..00000000000
--- a/src/test/cloudWatchLogs/registry/logStreamRegistry.test.ts
+++ /dev/null
@@ -1,177 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as moment from 'moment'
-import * as vscode from 'vscode'
-import { CloudWatchLogs } from 'aws-sdk'
-import { CloudWatchLogStreamData, LogStreamRegistry } from '../../../cloudWatchLogs/registry/logStreamRegistry'
-import { CLOUDWATCH_LOGS_SCHEME, INSIGHTS_TIMESTAMP_FORMAT } from '../../../shared/constants'
-import { Settings } from '../../../shared/settings'
-import { CloudWatchLogsSettings } from '../../../cloudWatchLogs/cloudWatchLogsUtils'
-
-describe('LogStreamRegistry', async function () {
-    let registry: LogStreamRegistry
-    let map: Map<string, CloudWatchLogStreamData>
-
-    const config = new Settings(vscode.ConfigurationTarget.Workspace)
-
-    const stream: CloudWatchLogStreamData = {
-        data: [
-            {
-                timestamp: 1,
-                message: 'is the loneliest number\n',
-            },
-            {
-                timestamp: 2,
-                message: 'can be as sad as one\n',
-            },
-            {
-                timestamp: 3,
-                message: '...dog night covered this song\n',
-            },
-            {
-                message: 'does anybody really know what time it is? does anybody really care?\n',
-            },
-        ],
-        busy: false,
-    }
-
-    const simplerStream: CloudWatchLogStreamData = {
-        data: [
-            {
-                message: 'short and sweet\n',
-            },
-        ],
-        busy: false,
-    }
-
-    const newLineStream: CloudWatchLogStreamData = {
-        data: [
-            {
-                timestamp: 12745641600000,
-                message: 'the\nline\rmust\r\nbe\ndrawn\rHERE\nright\nhere\r\nno\nfurther\n',
-            },
-        ],
-        busy: false,
-    }
-
-    const newText = 'a little longer now\n'
-    const getLogEventsFromUriComponentsFn = async (): Promise<CloudWatchLogs.GetLogEventsResponse> => {
-        return {
-            events: [
-                {
-                    message: newText,
-                },
-            ],
-        }
-    }
-
-    const registeredUri = vscode.Uri.parse(`${CLOUDWATCH_LOGS_SCHEME}:This:Is:Registered`)
-    const shorterRegisteredUri = vscode.Uri.parse(`${CLOUDWATCH_LOGS_SCHEME}:Less:Is:More`)
-    const missingRegisteredUri = vscode.Uri.parse(`${CLOUDWATCH_LOGS_SCHEME}:Not:Here:Dude`)
-    const newLineUri = vscode.Uri.parse(`${CLOUDWATCH_LOGS_SCHEME}:ANOTHER:LINE:PIEEEECCCEEEEEE`)
-
-    beforeEach(function () {
-        map = new Map<string, CloudWatchLogStreamData>()
-        map.set(registeredUri.path, stream)
-        map.set(shorterRegisteredUri.path, simplerStream)
-        map.set(newLineUri.path, newLineStream)
-        registry = new LogStreamRegistry(new CloudWatchLogsSettings(config), map)
-    })
-
-    describe('hasLog', function () {
-        it('correctly returns whether or not the log is registered', function () {
-            assert.strictEqual(registry.hasLog(registeredUri), true)
-            assert.strictEqual(registry.hasLog(missingRegisteredUri), false)
-        })
-    })
-
-    describe('registerLog', async function () {
-        it("registers logs and doesn't overwrite existing logs", async () => {
-            await registry.registerLog(missingRegisteredUri, getLogEventsFromUriComponentsFn)
-            const blankPostRegister = registry.getLogContent(missingRegisteredUri)
-            assert.strictEqual(blankPostRegister, newText)
-
-            await registry.registerLog(shorterRegisteredUri, getLogEventsFromUriComponentsFn)
-            const preregisteredLog = registry.getLogContent(shorterRegisteredUri)
-            assert.strictEqual(preregisteredLog, `${simplerStream.data[0].message}`)
-        })
-    })
-
-    describe('getLogContent', function () {
-        it('gets unformatted log content', function () {
-            const text = registry.getLogContent(registeredUri)
-
-            assert.strictEqual(
-                text,
-                `${stream.data[0].message}${stream.data[1].message}${stream.data[2].message}${stream.data[3].message}`
-            )
-        })
-
-        it('gets log content formatted to show timestamps', function () {
-            const text = registry.getLogContent(registeredUri, { timestamps: true })
-
-            assert.strictEqual(
-                text,
-                `${moment(1).format(INSIGHTS_TIMESTAMP_FORMAT)}${'\t'}${stream.data[0].message}${moment(2).format(
-                    INSIGHTS_TIMESTAMP_FORMAT
-                )}${'\t'}${stream.data[1].message}${moment(3).format(INSIGHTS_TIMESTAMP_FORMAT)}${'\t'}${
-                    stream.data[2].message
-                }                             ${'\t'}${stream.data[3].message}`
-            )
-        })
-
-        it('indents log entries with newlines of all flavors if timestamps are shown but otherwise does not act on them', function () {
-            const timestampText = registry.getLogContent(newLineUri, { timestamps: true })
-            const noTimestampText = registry.getLogContent(newLineUri)
-
-            assert.strictEqual(noTimestampText, newLineStream.data[0].message)
-            assert.strictEqual(
-                timestampText,
-                `${moment(newLineStream.data[0].timestamp).format(
-                    INSIGHTS_TIMESTAMP_FORMAT
-                )}${'\t'}the${'\n'}                             ${'\t'}line${'\n'}                             ${'\t'}must${'\n'}                             ${'\t'}be${'\n'}                             ${'\t'}drawn${'\n'}                             ${'\t'}HERE${'\n'}                             ${'\t'}right${'\n'}                             ${'\t'}here${'\n'}                             ${'\t'}no${'\n'}                             ${'\t'}further\n`
-            )
-        })
-    })
-
-    describe('updateLog', async function () {
-        it("adds content to existing streams at both head and tail ends and doesn't do anything if the log isn't registered", async () => {
-            await registry.updateLog(shorterRegisteredUri, 'tail', getLogEventsFromUriComponentsFn)
-            const initialWithTail = registry.getLogContent(shorterRegisteredUri)
-            assert.strictEqual(initialWithTail, `${simplerStream.data[0].message}${newText}`)
-            await registry.updateLog(shorterRegisteredUri, 'head', getLogEventsFromUriComponentsFn)
-            const initialWithHeadAndTail = registry.getLogContent(shorterRegisteredUri)
-            assert.strictEqual(initialWithHeadAndTail, `${newText}${simplerStream.data[0].message}${newText}`)
-
-            await registry.updateLog(missingRegisteredUri, 'tail', getLogEventsFromUriComponentsFn)
-            const unregisteredGet = registry.getLogContent(missingRegisteredUri)
-            assert.strictEqual(unregisteredGet, undefined)
-        })
-    })
-
-    describe('deregisterLog', function () {
-        it('deletes a log', function () {
-            assert.strictEqual(registry.hasLog(registeredUri), true)
-            registry.deregisterLog(registeredUri)
-            assert.strictEqual(registry.hasLog(registeredUri), false)
-        })
-
-        it('does not error if the log does not exist in the registry', function () {
-            assert.strictEqual(registry.hasLog(missingRegisteredUri), false)
-            registry.deregisterLog(missingRegisteredUri)
-            assert.strictEqual(registry.hasLog(missingRegisteredUri), false)
-        })
-    })
-
-    describe('Timestamp', function () {
-        it('matches CloudWatch insights timestamps', function () {
-            const time = 1624201162222 // 2021-06-20 14:59:22.222 GMT+0
-            const timestamp = moment.utc(time).format(INSIGHTS_TIMESTAMP_FORMAT)
-            assert.strictEqual(timestamp, '2021-06-20T14:59:22.222+00:00')
-        })
-    })
-})
diff --git a/src/test/cloudWatchLogs/utils.test.ts b/src/test/cloudWatchLogs/utils.test.ts
deleted file mode 100644
index 5bc8a1af616..00000000000
--- a/src/test/cloudWatchLogs/utils.test.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-import { convertLogGroupInfoToUri, parseCloudWatchLogsUri } from '../../cloudWatchLogs/cloudWatchLogsUtils'
-import { CLOUDWATCH_LOGS_SCHEME } from '../../shared/constants'
-
-const goodComponents = {
-    groupName: 'theBeeGees',
-    streamName: 'islandsInTheStream',
-    regionName: 'ap-southeast-2',
-}
-const goodUri = vscode.Uri.parse(
-    `${CLOUDWATCH_LOGS_SCHEME}:${goodComponents.groupName}:${goodComponents.streamName}:${goodComponents.regionName}`
-)
-
-describe('convertUriToLogGroupInfo', async function () {
-    it('converts a valid URI to components', function () {
-        assert.deepStrictEqual(parseCloudWatchLogsUri(goodUri), goodComponents)
-    })
-
-    it('does not convert URIs with an invalid scheme', async function () {
-        assert.throws(() => {
-            parseCloudWatchLogsUri(vscode.Uri.parse('wrong:scheme'))
-        })
-    })
-
-    it('does not convert URIs with more or less than three elements', async function () {
-        assert.throws(() => {
-            parseCloudWatchLogsUri(vscode.Uri.parse(`${CLOUDWATCH_LOGS_SCHEME}:elementOne:elementTwo`))
-        })
-
-        assert.throws(() => {
-            parseCloudWatchLogsUri(
-                vscode.Uri.parse(`${CLOUDWATCH_LOGS_SCHEME}:elementOne:elementTwo:elementThree:whoopsAllElements`)
-            )
-        })
-    })
-})
-
-describe('convertLogGroupInfoToUri', function () {
-    it('converts components to a valid URI', function () {
-        assert.deepStrictEqual(
-            convertLogGroupInfoToUri(goodComponents.groupName, goodComponents.streamName, goodComponents.regionName),
-            goodUri
-        )
-    })
-})
diff --git a/src/test/codewhisperer/commands/basicCommands.test.ts b/src/test/codewhisperer/commands/basicCommands.test.ts
deleted file mode 100644
index 1e2cdb71019..00000000000
--- a/src/test/codewhisperer/commands/basicCommands.test.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as assert from 'assert'
-import { beforeEach } from 'mocha'
-import * as sinon from 'sinon'
-import { resetCodeWhispererGlobalVariables } from '../testUtil'
-import { assertTelemetryCurried } from '../../testUtil'
-import * as CodeWhispererConstants from '../../../codewhisperer/models/constants'
-import { toggleCodeSuggestions, get, set } from '../../../codewhisperer/commands/basicCommands'
-import { FakeMemento } from '../../fakeExtensionContext'
-import { testCommand } from '../../shared/vscode/testUtils'
-import { Command } from '../../../shared/vscode/commands2'
-
-describe('CodeWhisperer-basicCommands', function () {
-    let targetCommand: Command<any> & vscode.Disposable
-
-    beforeEach(function () {
-        resetCodeWhispererGlobalVariables()
-    })
-
-    afterEach(function () {
-        targetCommand?.dispose()
-        sinon.restore()
-    })
-
-    it('test get()', async function () {
-        const fakeMemeto = new FakeMemento()
-        fakeMemeto.update(CodeWhispererConstants.autoTriggerEnabledKey, true)
-
-        let res = get(CodeWhispererConstants.autoTriggerEnabledKey, fakeMemeto)
-        assert.strictEqual(res, true)
-
-        fakeMemeto.update(CodeWhispererConstants.autoTriggerEnabledKey, undefined)
-        res = get(CodeWhispererConstants.autoTriggerEnabledKey, fakeMemeto)
-        assert.strictEqual(res, undefined)
-
-        fakeMemeto.update(CodeWhispererConstants.autoTriggerEnabledKey, false)
-        res = get(CodeWhispererConstants.autoTriggerEnabledKey, fakeMemeto)
-        assert.strictEqual(res, false)
-    })
-
-    it('test set()', async function () {
-        const fakeMemeto = new FakeMemento()
-        set(CodeWhispererConstants.autoTriggerEnabledKey, true, fakeMemeto)
-        assert.strictEqual(fakeMemeto.get(CodeWhispererConstants.autoTriggerEnabledKey), true)
-
-        set(CodeWhispererConstants.autoTriggerEnabledKey, false, fakeMemeto)
-        assert.strictEqual(fakeMemeto.get(CodeWhispererConstants.autoTriggerEnabledKey), false)
-    })
-
-    describe('toggleCodeSuggestion', function () {
-        beforeEach(function () {
-            resetCodeWhispererGlobalVariables()
-        })
-
-        it('should emit aws_modifySetting event on user toggling autoSuggestion - deactivate', async function () {
-            const fakeMemeto = new FakeMemento()
-            targetCommand = testCommand(toggleCodeSuggestions, fakeMemeto)
-            fakeMemeto.update(CodeWhispererConstants.autoTriggerEnabledKey, true)
-            assert.strictEqual(fakeMemeto.get(CodeWhispererConstants.autoTriggerEnabledKey), true)
-
-            await targetCommand.execute()
-            const res = fakeMemeto.get(CodeWhispererConstants.autoTriggerEnabledKey)
-            assert.strictEqual(res, false)
-            assertTelemetryCurried('aws_modifySetting')({
-                settingId: CodeWhispererConstants.autoSuggestionConfig.settingId,
-                settingState: CodeWhispererConstants.autoSuggestionConfig.deactivated,
-            })
-        })
-
-        it('should emit aws_modifySetting event on user toggling autoSuggestion -- activate', async function () {
-            const fakeMemeto = new FakeMemento()
-            targetCommand = testCommand(toggleCodeSuggestions, fakeMemeto)
-
-            assert.strictEqual(fakeMemeto.get(CodeWhispererConstants.autoTriggerEnabledKey), undefined)
-            await targetCommand.execute()
-            const res = fakeMemeto.get(CodeWhispererConstants.autoTriggerEnabledKey)
-            assert.strictEqual(res, true)
-            assertTelemetryCurried('aws_modifySetting')({
-                settingId: CodeWhispererConstants.autoSuggestionConfig.settingId,
-                settingState: CodeWhispererConstants.autoSuggestionConfig.activated,
-            })
-        })
-    })
-})
diff --git a/src/test/codewhisperer/commands/invokeRecommendation.test.ts b/src/test/codewhisperer/commands/invokeRecommendation.test.ts
deleted file mode 100644
index 692c65d392e..00000000000
--- a/src/test/codewhisperer/commands/invokeRecommendation.test.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as sinon from 'sinon'
-import * as codewhispererSdkClient from '../../../codewhisperer/client/codewhisperer'
-import { resetCodeWhispererGlobalVariables, createMockTextEditor } from '../testUtil'
-import { ConfigurationEntry } from '../../../codewhisperer/models/model'
-import { invokeRecommendation } from '../../../codewhisperer/commands/invokeRecommendation'
-import { InlineCompletion } from '../../../codewhisperer/service/inlineCompletion'
-import { InlineCompletionService } from '../../../codewhisperer/service/inlineCompletionService'
-
-describe('invokeRecommendation', function () {
-    describe('invokeRecommendation', function () {
-        let getRecommendationStub: sinon.SinonStub
-        let oldGetRecommendationStub: sinon.SinonStub
-        let mockClient: codewhispererSdkClient.DefaultCodeWhispererClient
-
-        beforeEach(function () {
-            resetCodeWhispererGlobalVariables()
-            getRecommendationStub = sinon.stub(InlineCompletion.instance, 'getPaginatedRecommendation')
-            oldGetRecommendationStub = sinon.stub(InlineCompletionService.instance, 'getPaginatedRecommendation')
-        })
-
-        afterEach(function () {
-            sinon.restore()
-        })
-
-        it('Should call getPaginatedRecommendation with OnDemand as trigger type', async function () {
-            const mockEditor = createMockTextEditor()
-            const config: ConfigurationEntry = {
-                isShowMethodsEnabled: true,
-                isManualTriggerEnabled: true,
-                isAutomatedTriggerEnabled: true,
-                isSuggestionsWithCodeReferencesEnabled: true,
-            }
-            await invokeRecommendation(mockEditor, mockClient, config)
-            assert.ok(getRecommendationStub.called || oldGetRecommendationStub.called)
-        })
-    })
-})
diff --git a/src/test/codewhisperer/commands/onAcceptance.test.ts b/src/test/codewhisperer/commands/onAcceptance.test.ts
deleted file mode 100644
index a308e1d109e..00000000000
--- a/src/test/codewhisperer/commands/onAcceptance.test.ts
+++ /dev/null
@@ -1,165 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-import * as sinon from 'sinon'
-import { onAcceptance } from '../../../codewhisperer/commands/onAcceptance'
-import { resetCodeWhispererGlobalVariables, createMockTextEditor } from '../testUtil'
-import { CodeWhispererTracker } from '../../../codewhisperer/tracker/codewhispererTracker'
-import { assertTelemetryCurried } from '../../testUtil'
-import { FakeExtensionContext } from '../../fakeExtensionContext'
-import { TelemetryHelper } from '../../../codewhisperer/util/telemetryHelper'
-import { RecommendationHandler } from '../../../codewhisperer/service/recommendationHandler'
-
-describe('onAcceptance', function () {
-    describe('onAcceptance', function () {
-        beforeEach(function () {
-            resetCodeWhispererGlobalVariables()
-        })
-
-        afterEach(function () {
-            sinon.restore()
-        })
-
-        it('Should format python code with command editor.action.format when current active document is python', async function () {
-            const mockEditor = createMockTextEditor()
-            const commandSpy = sinon.spy(vscode.commands, 'executeCommand')
-            const extensionContext = await FakeExtensionContext.create()
-            await onAcceptance(
-                {
-                    editor: mockEditor,
-                    range: new vscode.Range(new vscode.Position(1, 0), new vscode.Position(1, 21)),
-                    acceptIndex: 0,
-                    recommendation: "print('Hello World!')",
-                    requestId: '',
-                    sessionId: '',
-                    triggerType: 'OnDemand',
-                    completionType: 'Line',
-                    language: 'python',
-                    references: undefined,
-                },
-                extensionContext.globalState
-            )
-            assert.ok(commandSpy.calledWith('editor.action.format'))
-        })
-
-        it('Should format code selection with command vscode.executeFormatRangeProvider when current active document is not python', async function () {
-            const mockEditor = createMockTextEditor("console.log('Hello')", 'test.js', 'javascript', 1, 0)
-            const commandStub = sinon.stub(vscode.commands, 'executeCommand')
-            const extensionContext = await FakeExtensionContext.create()
-            const fakeReferences = [
-                {
-                    message: '',
-                    licenseName: 'MIT',
-                    repository: 'http://github.com/fake',
-                    recommendationContentSpan: {
-                        start: 0,
-                        end: 10,
-                    },
-                },
-            ]
-            await onAcceptance(
-                {
-                    editor: mockEditor,
-                    range: new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 27)),
-                    acceptIndex: 0,
-                    recommendation: "console.log('Hello World!')",
-                    requestId: '',
-                    sessionId: '',
-                    triggerType: 'OnDemand',
-                    completionType: 'Line',
-                    language: 'javascript',
-                    references: fakeReferences,
-                },
-                extensionContext.globalState
-            )
-            assert.ok(commandStub.calledWith('vscode.executeFormatRangeProvider'))
-        })
-
-        it('Should enqueue an event object to tracker', async function () {
-            const mockEditor = createMockTextEditor()
-            const trackerSpy = sinon.spy(CodeWhispererTracker.prototype, 'enqueue')
-            const extensionContext = await FakeExtensionContext.create()
-            const fakeReferences = [
-                {
-                    message: '',
-                    licenseName: 'MIT',
-                    repository: 'http://github.com/fake',
-                    recommendationContentSpan: {
-                        start: 0,
-                        end: 10,
-                    },
-                },
-            ]
-            await onAcceptance(
-                {
-                    editor: mockEditor,
-                    range: new vscode.Range(new vscode.Position(1, 0), new vscode.Position(1, 26)),
-                    acceptIndex: 0,
-                    recommendation: "print('Hello World!')",
-                    requestId: '',
-                    sessionId: '',
-                    triggerType: 'OnDemand',
-                    completionType: 'Line',
-                    language: 'python',
-                    references: fakeReferences,
-                },
-                extensionContext.globalState
-            )
-            const actualArg = trackerSpy.getCall(0).args[0]
-            assert.ok(trackerSpy.calledOnce)
-            assert.strictEqual(actualArg.originalString, 'def two_sum(nums, target):')
-            assert.strictEqual(actualArg.requestId, '')
-            assert.strictEqual(actualArg.sessionId, '')
-            assert.strictEqual(actualArg.triggerType, 'OnDemand')
-            assert.strictEqual(actualArg.completionType, 'Line')
-            assert.strictEqual(actualArg.language, 'python')
-            assert.deepStrictEqual(actualArg.startPosition, new vscode.Position(1, 0))
-            assert.deepStrictEqual(actualArg.endPosition, new vscode.Position(1, 26))
-            assert.strictEqual(actualArg.index, 0)
-        })
-
-        it('Should report telemetry that records this user decision event', async function () {
-            const mockEditor = createMockTextEditor()
-            RecommendationHandler.instance.requestId = 'test'
-            RecommendationHandler.instance.sessionId = 'test'
-            RecommendationHandler.instance.startPos = new vscode.Position(1, 0)
-            mockEditor.selection = new vscode.Selection(new vscode.Position(1, 0), new vscode.Position(1, 0))
-            RecommendationHandler.instance.recommendations = [{ content: "print('Hello World!')" }]
-            RecommendationHandler.instance.setSuggestionState(0, 'Showed')
-            TelemetryHelper.instance.triggerType = 'OnDemand'
-            TelemetryHelper.instance.completionType = 'Line'
-            const assertTelemetry = assertTelemetryCurried('codewhisperer_userDecision')
-            const extensionContext = await FakeExtensionContext.create()
-            await onAcceptance(
-                {
-                    editor: mockEditor,
-                    range: new vscode.Range(new vscode.Position(1, 0), new vscode.Position(1, 21)),
-                    acceptIndex: 0,
-                    recommendation: "print('Hello World!')",
-                    requestId: '',
-                    sessionId: '',
-                    triggerType: 'OnDemand',
-                    completionType: 'Line',
-                    language: 'python',
-                    references: undefined,
-                },
-                extensionContext.globalState
-            )
-            assertTelemetry({
-                codewhispererRequestId: 'test',
-                codewhispererSessionId: 'test',
-                codewhispererPaginationProgress: 1,
-                codewhispererTriggerType: 'OnDemand',
-                codewhispererSuggestionIndex: 0,
-                codewhispererSuggestionState: 'Accept',
-                codewhispererSuggestionReferenceCount: 0,
-                codewhispererCompletionType: 'Line',
-                codewhispererLanguage: 'python',
-            })
-        })
-    })
-})
diff --git a/src/test/codewhisperer/commands/onInlineAcceptance.test.ts b/src/test/codewhisperer/commands/onInlineAcceptance.test.ts
deleted file mode 100644
index 9fc58743e31..00000000000
--- a/src/test/codewhisperer/commands/onInlineAcceptance.test.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-import * as sinon from 'sinon'
-import { onInlineAcceptance } from '../../../codewhisperer/commands/onInlineAcceptance'
-import { InlineCompletionService } from '../../../codewhisperer/service/inlineCompletionService'
-import { resetCodeWhispererGlobalVariables, createMockTextEditor } from '../testUtil'
-import { assertTelemetryCurried } from '../../testUtil'
-import { FakeMemento } from '../../fakeExtensionContext'
-import { TelemetryHelper } from '../../../codewhisperer/util/telemetryHelper'
-import { RecommendationHandler } from '../../../codewhisperer/service/recommendationHandler'
-
-describe('onInlineAcceptance', function () {
-    describe('onInlineAcceptance', function () {
-        beforeEach(function () {
-            resetCodeWhispererGlobalVariables()
-        })
-
-        afterEach(function () {
-            sinon.restore()
-        })
-
-        it('Should dispose inline completion provider', async function () {
-            const mockEditor = createMockTextEditor()
-            const spy = sinon.spy(InlineCompletionService.instance, 'disposeInlineCompletion')
-            const globalState = new FakeMemento()
-            await onInlineAcceptance(
-                {
-                    editor: mockEditor,
-                    range: new vscode.Range(new vscode.Position(1, 0), new vscode.Position(1, 21)),
-                    acceptIndex: 0,
-                    recommendation: "print('Hello World!')",
-                    requestId: '',
-                    sessionId: '',
-                    triggerType: 'OnDemand',
-                    completionType: 'Line',
-                    language: 'python',
-                    references: undefined,
-                },
-                globalState
-            )
-            assert.ok(spy.calledWith())
-        })
-
-        it('Should format python code with command editor.action.format when current active document is python', async function () {
-            const mockEditor = createMockTextEditor()
-            const commandSpy = sinon.spy(vscode.commands, 'executeCommand')
-            const globalState = new FakeMemento()
-            await onInlineAcceptance(
-                {
-                    editor: mockEditor,
-                    range: new vscode.Range(new vscode.Position(1, 0), new vscode.Position(1, 21)),
-                    acceptIndex: 0,
-                    recommendation: "print('Hello World!')",
-                    requestId: '',
-                    sessionId: '',
-                    triggerType: 'OnDemand',
-                    completionType: 'Line',
-                    language: 'python',
-                    references: undefined,
-                },
-                globalState
-            )
-            assert.ok(commandSpy.calledWith('editor.action.format'))
-        })
-
-        it('Should format code selection with command vscode.executeFormatRangeProvider when current active document is not python', async function () {
-            const mockEditor = createMockTextEditor("console.log('Hello')", 'test.js', 'javascript', 1, 0)
-            const commandStub = sinon.stub(vscode.commands, 'executeCommand')
-            const globalState = new FakeMemento()
-            const fakeReferences = [
-                {
-                    message: '',
-                    licenseName: 'MIT',
-                    repository: 'http://github.com/fake',
-                    recommendationContentSpan: {
-                        start: 0,
-                        end: 10,
-                    },
-                },
-            ]
-            await onInlineAcceptance(
-                {
-                    editor: mockEditor,
-                    range: new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 27)),
-                    acceptIndex: 0,
-                    recommendation: "console.log('Hello World!')",
-                    requestId: '',
-                    sessionId: '',
-                    triggerType: 'OnDemand',
-                    completionType: 'Line',
-                    language: 'javascript',
-                    references: fakeReferences,
-                },
-                globalState
-            )
-            assert.ok(commandStub.calledWith('vscode.executeFormatRangeProvider'))
-        })
-
-        it('Should report telemetry that records this user decision event', async function () {
-            const mockEditor = createMockTextEditor()
-            RecommendationHandler.instance.requestId = 'test'
-            RecommendationHandler.instance.sessionId = 'test'
-            RecommendationHandler.instance.startPos = new vscode.Position(1, 0)
-            mockEditor.selection = new vscode.Selection(new vscode.Position(1, 0), new vscode.Position(1, 0))
-            RecommendationHandler.instance.recommendations = [{ content: "print('Hello World!')" }]
-            RecommendationHandler.instance.setSuggestionState(0, 'Showed')
-            TelemetryHelper.instance.triggerType = 'OnDemand'
-            TelemetryHelper.instance.completionType = 'Line'
-            const assertTelemetry = assertTelemetryCurried('codewhisperer_userDecision')
-            const globalState = new FakeMemento()
-            await onInlineAcceptance(
-                {
-                    editor: mockEditor,
-                    range: new vscode.Range(new vscode.Position(1, 0), new vscode.Position(1, 21)),
-                    acceptIndex: 0,
-                    recommendation: "print('Hello World!')",
-                    requestId: '',
-                    sessionId: '',
-                    triggerType: 'OnDemand',
-                    completionType: 'Line',
-                    language: 'python',
-                    references: undefined,
-                },
-                globalState
-            )
-            assertTelemetry({
-                codewhispererRequestId: 'test',
-                codewhispererSessionId: 'test',
-                codewhispererPaginationProgress: 1,
-                codewhispererTriggerType: 'OnDemand',
-                codewhispererSuggestionIndex: 0,
-                codewhispererSuggestionState: 'Accept',
-                codewhispererSuggestionReferenceCount: 0,
-                codewhispererCompletionType: 'Line',
-                codewhispererLanguage: 'python',
-            })
-        })
-    })
-})
diff --git a/src/test/codewhisperer/commands/startSecurityScan.test.ts b/src/test/codewhisperer/commands/startSecurityScan.test.ts
deleted file mode 100644
index 9cbf72b31ec..00000000000
--- a/src/test/codewhisperer/commands/startSecurityScan.test.ts
+++ /dev/null
@@ -1,167 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-import * as sinon from 'sinon'
-import * as got from 'got'
-import { DefaultCodeWhispererClient } from '../../../codewhisperer/client/codewhisperer'
-import * as startSecurityScan from '../../../codewhisperer/commands/startSecurityScan'
-import { SecurityPanelViewProvider } from '../../../codewhisperer/views/securityPanelViewProvider'
-import { FakeExtensionContext } from '../../fakeExtensionContext'
-import * as diagnosticsProvider from '../../../codewhisperer/service/diagnosticsProvider'
-import { getTestWorkspaceFolder } from '../../../integrationTest/integrationTestsUtilities'
-import { join } from 'path'
-import { closeAllEditors } from '../../testUtil'
-import { stub } from '../../utilities/stubber'
-import { HttpResponse } from 'aws-sdk'
-
-const mockCreateCodeScanResponse = {
-    $response: {
-        data: {
-            jobId: 'jobId',
-            status: 'Pending',
-        },
-        requestId: 'requestId',
-        hasNextPage: () => false,
-        error: undefined,
-        nextPage: () => undefined,
-        redirectCount: 0,
-        retryCount: 0,
-        httpResponse: new HttpResponse(),
-    },
-    jobId: 'jobId',
-    status: 'Pending',
-}
-
-const mockCreateUploadUrlResponse = {
-    $response: {
-        data: {
-            uploadId: 'uploadId',
-            uploadUrl: 'uploadUrl',
-        },
-        requestId: 'requestId',
-        hasNextPage: () => false,
-        error: undefined,
-        nextPage: () => undefined,
-        redirectCount: 0,
-        retryCount: 0,
-        httpResponse: new HttpResponse(),
-    },
-    uploadId: 'uploadId',
-    uploadUrl: 'https://test.com',
-}
-
-const mockGetCodeScanResponse = {
-    $response: {
-        data: {
-            status: 'Completed',
-        },
-        requestId: 'requestId',
-        hasNextPage: () => false,
-        error: undefined,
-        nextPage: () => undefined,
-        redirectCount: 0,
-        retryCount: 0,
-        httpResponse: new HttpResponse(),
-    },
-    status: 'Completed',
-}
-
-const mockCodeScanFindings = JSON.stringify([
-    {
-        filePath: '/workspaceFolder/python3.7-plain-sam-app/hello_world/app.py',
-        startLine: 1,
-        endLine: 1,
-        title: 'title',
-        description: {
-            text: 'text',
-            markdown: 'markdown',
-        },
-    },
-])
-
-const mockListCodeScanFindingsResponse = {
-    $response: {
-        data: {
-            codeScanFindings: mockCodeScanFindings,
-        },
-        requestId: 'requestId',
-        hasNextPage: () => false,
-        error: undefined,
-        nextPage: () => undefined,
-        redirectCount: 0,
-        retryCount: 0,
-        httpResponse: new HttpResponse(),
-    },
-    codeScanFindings: mockCodeScanFindings,
-}
-
-describe('startSecurityScan', function () {
-    const workspaceFolder = getTestWorkspaceFolder()
-
-    afterEach(function () {
-        sinon.restore()
-    })
-    after(function () {
-        closeAllEditors()
-    })
-    const createClient = () => {
-        const mockClient = stub(DefaultCodeWhispererClient)
-
-        mockClient.createCodeScan.resolves(mockCreateCodeScanResponse)
-        mockClient.createUploadUrl.resolves(mockCreateUploadUrlResponse)
-        mockClient.getCodeScan.resolves(mockGetCodeScanResponse)
-        mockClient.listCodeScanFindings.resolves(mockListCodeScanFindingsResponse)
-        return mockClient
-    }
-
-    const openTestFile = async (filePath: string) => {
-        const doc = await vscode.workspace.openTextDocument(filePath)
-        return await vscode.window.showTextDocument(doc, {
-            selection: new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 1)),
-        })
-    }
-
-    it('Should prompt warning message if language is not supported', async function () {
-        const extensionContext = await FakeExtensionContext.create()
-        const mockSecurityPanelViewProvider = new SecurityPanelViewProvider(extensionContext)
-        const spy = sinon.spy(vscode.window, 'showWarningMessage')
-        const appRoot = join(workspaceFolder, 'go1-plain-sam-app')
-        const appCodePath = join(appRoot, 'hello-world', 'main.go')
-        const editor = await openTestFile(appCodePath)
-
-        await startSecurityScan.startSecurityScan(
-            mockSecurityPanelViewProvider,
-            editor,
-            stub(DefaultCodeWhispererClient),
-            extensionContext
-        )
-        assert.ok(spy.calledOnce)
-    })
-
-    it('Should render security scan result', async function () {
-        const extensionContext = await FakeExtensionContext.create()
-        const mockSecurityPanelViewProvider = new SecurityPanelViewProvider(extensionContext)
-        const appRoot = join(workspaceFolder, 'python3.7-plain-sam-app')
-        const appCodePath = join(appRoot, 'hello_world', 'app.py')
-        const editor = await openTestFile(appCodePath)
-
-        sinon.stub(got, 'default').resolves({ statusCode: 200 })
-        const commandSpy = sinon.spy(vscode.commands, 'executeCommand')
-        const securityScanRenderSpy = sinon.spy(diagnosticsProvider, 'initSecurityScanRender')
-        const warningSpy = sinon.spy(vscode.window, 'showWarningMessage')
-
-        await startSecurityScan.startSecurityScan(
-            mockSecurityPanelViewProvider,
-            editor,
-            createClient(),
-            extensionContext
-        )
-        assert.ok(commandSpy.calledWith('workbench.action.problems.focus'))
-        assert.ok(securityScanRenderSpy.calledOnce)
-        assert.ok(warningSpy.notCalled)
-    })
-})
diff --git a/src/test/codewhisperer/service/completionProvider.test.ts b/src/test/codewhisperer/service/completionProvider.test.ts
deleted file mode 100644
index 6999a2b5dea..00000000000
--- a/src/test/codewhisperer/service/completionProvider.test.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-
-import { getCompletionItems, getCompletionItem, getLabel } from '../../../codewhisperer/service/completionProvider'
-import { createMockDocument, resetCodeWhispererGlobalVariables } from '../testUtil'
-import { Recommendation } from '../../../codewhisperer/client/codewhisperer'
-import { RecommendationHandler } from '../../../codewhisperer/service/recommendationHandler'
-
-describe('completionProviderService', function () {
-    beforeEach(function () {
-        resetCodeWhispererGlobalVariables()
-    })
-
-    describe('getLabel', function () {
-        it('should return correct label given recommendation longer than Constants.LABEL_LENGTH', function () {
-            const mockLongRecommendation = `
-            const metaDataFile = path.join(__dirname, 'nls.metadata.json');
-            const locale = getUserDefinedLocale(argvConfig);`
-            const expected = '\n            const m..'
-            assert.strictEqual(getLabel(mockLongRecommendation), expected)
-        })
-
-        it('should return correct label given short recommendation', function () {
-            const mockShortRecommendation = 'function onReady()'
-            const expected = 'function onReady()..'
-            assert.strictEqual(getLabel(mockShortRecommendation), expected)
-        })
-    })
-
-    describe('getCompletionItem', function () {
-        it('should return targetCompletionItem given input', function () {
-            RecommendationHandler.instance.startPos = new vscode.Position(0, 0)
-            RecommendationHandler.instance.requestId = 'mock_requestId_getCompletionItem'
-            RecommendationHandler.instance.sessionId = 'mock_sessionId_getCompletionItem'
-            const mockPosition = new vscode.Position(0, 1)
-            const mockRecommendationDetail: Recommendation = {
-                content: "\n\t\tconsole.log('Hello world!');\n\t}",
-            }
-            const mockRecommendationIndex = 1
-            const mockDocument = createMockDocument('', 'test.ts', 'typescript')
-            const expected: vscode.CompletionItem = {
-                label: "\n\t\tconsole.log('Hell..",
-                kind: 1,
-                detail: 'CodeWhisperer',
-                documentation: new vscode.MarkdownString().appendCodeblock(
-                    "\n\t\tconsole.log('Hello world!');\n\t}",
-                    'typescript'
-                ),
-                sortText: '0000000002',
-                preselect: true,
-                insertText: new vscode.SnippetString("\n\t\tconsole.log('Hello world!');\n\t}"),
-                keepWhitespace: true,
-                command: {
-                    command: 'aws.codeWhisperer.accept',
-                    title: 'On acceptance',
-                    arguments: [
-                        new vscode.Range(0, 0, 0, 0),
-                        1,
-                        "\n\t\tconsole.log('Hello world!');\n\t}",
-                        'mock_requestId_getCompletionItem',
-                        'mock_sessionId_getCompletionItem',
-                        'OnDemand',
-                        'Line',
-                        'typescript',
-                        undefined,
-                    ],
-                },
-            }
-            const actual = getCompletionItem(
-                mockDocument,
-                mockPosition,
-                mockRecommendationDetail,
-                mockRecommendationIndex
-            )
-            assert.deepStrictEqual(actual.command, expected.command)
-            assert.strictEqual(actual.sortText, expected.sortText)
-            assert.strictEqual(actual.label, expected.label)
-            assert.strictEqual(actual.kind, expected.kind)
-            assert.strictEqual(actual.preselect, expected.preselect)
-            assert.strictEqual(actual.keepWhitespace, expected.keepWhitespace)
-            assert.strictEqual(JSON.stringify(actual.documentation), JSON.stringify(expected.documentation))
-            assert.strictEqual(JSON.stringify(actual.insertText), JSON.stringify(expected.insertText))
-        })
-    })
-
-    describe('getCompletionItems', function () {
-        it('should return completion items for each non-empty recommendation', async function () {
-            RecommendationHandler.instance.recommendations = [
-                { content: "\n\t\tconsole.log('Hello world!');\n\t}" },
-                { content: '\nvar a = 10' },
-            ]
-            const mockPosition = new vscode.Position(0, 0)
-            const mockDocument = createMockDocument('', 'test.ts', 'typescript')
-            const actual = getCompletionItems(mockDocument, mockPosition)
-            assert.strictEqual(actual.length, 2)
-        })
-
-        it('should return empty completion items when recommendation is empty', async function () {
-            RecommendationHandler.instance.recommendations = []
-            const mockPosition = new vscode.Position(14, 83)
-            const mockDocument = createMockDocument()
-            const actual = getCompletionItems(mockDocument, mockPosition)
-            const expected: vscode.CompletionItem[] = []
-            assert.deepStrictEqual(actual, expected)
-        })
-    })
-})
diff --git a/src/test/codewhisperer/service/inlineCompletion.test.ts b/src/test/codewhisperer/service/inlineCompletion.test.ts
deleted file mode 100644
index 1abe4a96fa5..00000000000
--- a/src/test/codewhisperer/service/inlineCompletion.test.ts
+++ /dev/null
@@ -1,312 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as assert from 'assert'
-import * as sinon from 'sinon'
-import { InlineCompletion } from '../../../codewhisperer/service/inlineCompletion'
-import { createMockTextEditor, resetCodeWhispererGlobalVariables } from '../testUtil'
-import { ConfigurationEntry, vsCodeState } from '../../../codewhisperer/models/model'
-import * as codewhispererSdkClient from '../../../codewhisperer/client/codewhisperer'
-import { RecommendationHandler } from '../../../codewhisperer/service/recommendationHandler'
-import * as CodeWhispererConstants from '../../../codewhisperer/models/constants'
-import globals from '../../../shared/extensionGlobals'
-
-describe('inlineCompletion', function () {
-    beforeEach(function () {
-        resetCodeWhispererGlobalVariables()
-    })
-    describe('resetInlineStates', async function () {
-        it('should reset inline arrays and length be 0', async function () {
-            const mockEditor = createMockTextEditor()
-            // Set values to some
-            InlineCompletion.instance.items = [
-                { content: 'def two_sum(nums, target):\n for i in nums', index: 1 },
-                { content: 'def two_sum(x, y):\n return x + y', index: 2 },
-            ]
-            InlineCompletion.instance.origin = [{ content: 'def two_sum(nums, target):\n for i in nums' }]
-            InlineCompletion.instance.position = 1
-            await InlineCompletion.instance.resetInlineStates(mockEditor)
-            assert.strictEqual(InlineCompletion.instance.items.length, 0)
-            assert.strictEqual(InlineCompletion.instance.origin.length, 0)
-            assert.strictEqual(InlineCompletion.instance.position, 0)
-        })
-    })
-
-    describe('acceptRecommendation', async function () {
-        let invokeSpy: sinon.SinonStub
-
-        afterEach(function () {
-            sinon.restore()
-        })
-
-        it('should not call editor.edit when CodeWhisperer is editing', async function () {
-            const mockEditor = createMockTextEditor()
-            invokeSpy = sinon.stub(mockEditor, 'edit')
-            // Set isCodeWhispererEditing to true
-            vsCodeState.isCodeWhispererEditing = true
-            await InlineCompletion.instance.acceptRecommendation(mockEditor)
-            assert.ok(!invokeSpy.called)
-            // Set it back to false
-            vsCodeState.isCodeWhispererEditing = false
-        })
-
-        it('should reset CodeWhispererConstants.serviceActiveKey after acceptance', async function () {
-            const mockEditor = createMockTextEditor()
-            invokeSpy = sinon.stub(mockEditor, 'edit').resolves()
-            InlineCompletion.instance.items = [
-                { content: 'def two_sum(nums, target):\n for i in nums', index: 1 },
-                { content: 'def two_sum(x, y):\n return x + y', index: 2 },
-            ]
-            InlineCompletion.instance.origin = [
-                { content: 'def two_sum(nums, target):\n for i in nums' },
-                { content: 'def two_sum(x, y):\n return x + y' },
-            ]
-            await vscode.commands.executeCommand('setContext', CodeWhispererConstants.serviceActiveKey, true)
-            InlineCompletion.instance.position = 0
-            const mockPosition = new vscode.Position(0, 0)
-            InlineCompletion.instance.setRange(new vscode.Range(mockPosition, mockPosition))
-            await InlineCompletion.instance.acceptRecommendation(mockEditor)
-            const ServiceKey =
-                globals.context.globalState.get<boolean>(CodeWhispererConstants.serviceActiveKey) || false
-            assert.ok(invokeSpy.called)
-            assert.strictEqual(ServiceKey, false)
-        })
-    })
-
-    describe('rejectRecommendation', async function () {
-        let invokeSpy: sinon.SinonStub
-        afterEach(function () {
-            sinon.restore()
-            InlineCompletion.instance.items = [
-                { content: 'def two_sum(nums, target):\n for i in nums', index: 1 },
-                { content: 'def two_sum(x, y):\n return x + y', index: 2 },
-            ]
-            InlineCompletion.instance.origin = [
-                { content: 'def two_sum(nums, target):\n for i in nums' },
-                { content: 'def two_sum(x, y):\n return x + y' },
-            ]
-            InlineCompletion.instance.position = 0
-        })
-
-        it('should not call editor.edit when CodeWhisperer is editing', async function () {
-            const mockEditor = createMockTextEditor()
-            invokeSpy = sinon.stub(mockEditor, 'edit')
-            // Set isCodeWhispererEditing to true
-            vsCodeState.isCodeWhispererEditing = true
-            await InlineCompletion.instance.rejectRecommendation(mockEditor)
-            assert.ok(!invokeSpy.called)
-            // Set it back to false
-            vsCodeState.isCodeWhispererEditing = false
-        })
-
-        it('should reset CodeWhispererConstants.serviceActiveKey after rejectRecommendation', async function () {
-            const mockEditor = createMockTextEditor()
-            invokeSpy = sinon.stub(mockEditor, 'edit').resolves()
-            const mockPosition = new vscode.Position(0, 0)
-            InlineCompletion.instance.setRange(new vscode.Range(mockPosition, mockPosition))
-            await vscode.commands.executeCommand('setContext', CodeWhispererConstants.serviceActiveKey, true)
-            await InlineCompletion.instance.rejectRecommendation(mockEditor)
-            const ServiceKey =
-                globals.context.globalState.get<boolean>(CodeWhispererConstants.serviceActiveKey) || false
-            assert.ok(invokeSpy.called)
-            assert.strictEqual(ServiceKey, false)
-        })
-
-        it('should call cancelPaginatedRequest once when reject is successful', async function () {
-            const mockEditor = createMockTextEditor()
-            invokeSpy = sinon.stub(RecommendationHandler.instance, 'cancelPaginatedRequest')
-            const mockPosition = new vscode.Position(0, 0)
-            InlineCompletion.instance.setRange(new vscode.Range(mockPosition, mockPosition))
-            await InlineCompletion.instance.rejectRecommendation(mockEditor)
-            assert.ok(invokeSpy.calledOnce)
-        })
-    })
-
-    describe('setTypeAheadRecommendations', async function () {
-        let invokeSpy: sinon.SinonStub
-
-        afterEach(function () {
-            sinon.restore()
-            InlineCompletion.instance.items = [
-                { content: 'def two_sum(nums, target):\n for i in nums', index: 1 },
-                { content: 'two_sum(x, y):\n return x + y', index: 2 },
-            ]
-            InlineCompletion.instance.origin = [
-                { content: 'def two_sum(nums, target):\n for i in nums' },
-                { content: 'two_sum(x, y):\n return x + y' },
-            ]
-            InlineCompletion.instance.position = 0
-            RecommendationHandler.instance.startPos = new vscode.Position(0, 0)
-        })
-
-        it('should not call getTypedPrefix when recommendation are null', async function () {
-            const mockEditor = createMockTextEditor()
-            const mockEvent: vscode.TextDocumentChangeEvent = createTextDocumentChangeEvent(
-                mockEditor.document,
-                new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 1)),
-                'd'
-            )
-            invokeSpy = sinon.stub(InlineCompletion.instance, 'getTypedPrefix')
-            InlineCompletion.instance.origin = []
-            await InlineCompletion.instance.setTypeAheadRecommendations(mockEditor, mockEvent)
-            assert.ok(!invokeSpy.called)
-        })
-
-        it('should set items to 1 when typedPrefix matches', async function () {
-            const mockEditor = createMockTextEditor(
-                'def two_sum(nums, target):\n for i in nums',
-                'test.py',
-                'python',
-                0,
-                0
-            )
-            const mockEvent: vscode.TextDocumentChangeEvent = createTextDocumentChangeEvent(
-                mockEditor.document,
-                new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 1)),
-                'd'
-            )
-            mockEditor.selection.active = new vscode.Position(0, 1)
-            await InlineCompletion.instance.setTypeAheadRecommendations(mockEditor, mockEvent)
-            assert.strictEqual(InlineCompletion.instance.items.length, 1)
-        })
-
-        it('should call rejectRecommendation when typedPrefix does not match', async function () {
-            const mockEditor = createMockTextEditor('if', 'test.py', 'python', 0, 0)
-            const mockEvent: vscode.TextDocumentChangeEvent = createTextDocumentChangeEvent(
-                mockEditor.document,
-                new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 1)),
-                'd'
-            )
-            invokeSpy = sinon.stub(InlineCompletion.instance, 'rejectRecommendation')
-            mockEditor.selection.active = new vscode.Position(0, 1)
-            await InlineCompletion.instance.setTypeAheadRecommendations(mockEditor, mockEvent)
-            assert.ok(invokeSpy.called)
-        })
-    })
-
-    describe('getPaginatedRecommendation', function () {
-        const config: ConfigurationEntry = {
-            isShowMethodsEnabled: true,
-            isManualTriggerEnabled: true,
-            isAutomatedTriggerEnabled: true,
-            isSuggestionsWithCodeReferencesEnabled: true,
-        }
-        const invokeSpy = sinon.stub(RecommendationHandler.instance, 'getRecommendations')
-        let mockClient: codewhispererSdkClient.DefaultCodeWhispererClient
-        beforeEach(function () {
-            mockClient = new codewhispererSdkClient.DefaultCodeWhispererClient()
-            resetCodeWhispererGlobalVariables()
-        })
-        it('should call clear Recommendation before showing inline recommendation', async function () {
-            const mockEditor = createMockTextEditor()
-            invokeSpy.resolves()
-            const clearRecommendationStub = sinon.stub(RecommendationHandler.instance, 'clearRecommendations')
-            RecommendationHandler.instance.recommendations = [
-                { content: "\n\t\tconsole.log('Hello world!');\n\t}" },
-                { content: '' },
-            ]
-            InlineCompletion.instance.getPaginatedRecommendation(mockClient, mockEditor, 'OnDemand', config)
-            assert.ok(clearRecommendationStub.called)
-        })
-        it('should call checkAndResetCancellationTokens before showing inline and next token to be null', async function () {
-            const mockEditor = createMockTextEditor()
-            invokeSpy.resolves()
-            const checkAndResetCancellationTokensStub = sinon.stub(
-                RecommendationHandler.instance,
-                'checkAndResetCancellationTokens'
-            )
-            RecommendationHandler.instance.recommendations = [
-                { content: "\n\t\tconsole.log('Hello world!');\n\t}" },
-                { content: '' },
-            ]
-            InlineCompletion.instance.getPaginatedRecommendation(mockClient, mockEditor, 'OnDemand', config)
-
-            assert.ok(checkAndResetCancellationTokensStub.called)
-            assert.strictEqual(RecommendationHandler.instance.hasNextToken(), false)
-        })
-    })
-
-    describe('navigateRecommendation', async function () {
-        let invokeSpy: sinon.SinonStub
-
-        beforeEach(function () {
-            sinon.restore()
-            InlineCompletion.instance.items = [
-                { content: 'def two_sum(nums, target):\n for i in nums', index: 1 },
-                { content: 'two_sum(x, y):\n return x + y', index: 2 },
-            ]
-            InlineCompletion.instance.origin = [
-                { content: 'def two_sum(nums, target):\n for i in nums' },
-                { content: 'two_sum(x, y):\n return x + y' },
-            ]
-            InlineCompletion.instance.position = 0
-        })
-
-        it('should not call showRecommendation when CodeWhisperer is editing', async function () {
-            const mockEditor = createMockTextEditor()
-            // sinon.restore()
-            invokeSpy = sinon.stub(InlineCompletion.instance, 'showRecommendation')
-            // Set isCodeWhispererEditing to true
-            vsCodeState.isCodeWhispererEditing = true
-            await InlineCompletion.instance.navigateRecommendation(mockEditor, true)
-            assert.ok(!invokeSpy.called)
-            // Set it back to false
-            vsCodeState.isCodeWhispererEditing = false
-        })
-        it('should set position to 1 when called with next', async function () {
-            const mockEditor = createMockTextEditor()
-            // sinon.restore()
-            invokeSpy = sinon.stub(InlineCompletion.instance, 'showRecommendation')
-            await InlineCompletion.instance.navigateRecommendation(mockEditor, true)
-            assert.strictEqual(InlineCompletion.instance.position, 1)
-            assert.ok(invokeSpy.called)
-        })
-
-        it('should set position to 0 when called with next as false', async function () {
-            const mockEditor = createMockTextEditor()
-            // sinon.restore()
-            invokeSpy = sinon.stub(InlineCompletion.instance, 'showRecommendation')
-            InlineCompletion.instance.position = 1
-            await InlineCompletion.instance.navigateRecommendation(mockEditor, false)
-            assert.strictEqual(InlineCompletion.instance.position, 0)
-            assert.ok(invokeSpy.called)
-        })
-
-        it('should check no circular navigation when previous is pressed', async function () {
-            const mockEditor = createMockTextEditor()
-            // sinon.restore()
-            invokeSpy = sinon.stub(InlineCompletion.instance, 'showRecommendation')
-            await InlineCompletion.instance.navigateRecommendation(mockEditor, false)
-            assert.strictEqual(InlineCompletion.instance.position, 0)
-            // If position is not changed then showRecommendation shuuld not be called
-            assert.ok(!invokeSpy.called)
-        })
-
-        it('should check no circular navigation when next is pressed', async function () {
-            const mockEditor = createMockTextEditor()
-            // sinon.restore()
-            invokeSpy = sinon.stub(InlineCompletion.instance, 'showRecommendation')
-            InlineCompletion.instance.position = 1
-            await InlineCompletion.instance.navigateRecommendation(mockEditor, true)
-            assert.strictEqual(InlineCompletion.instance.position, 1)
-            assert.ok(!invokeSpy.called)
-        })
-    })
-})
-
-export function createTextDocumentChangeEvent(document: vscode.TextDocument, range: vscode.Range, text: string) {
-    return {
-        document: document,
-        contentChanges: [
-            {
-                range: range,
-                rangeOffset: 1,
-                rangeLength: 1,
-                text: text,
-            },
-        ],
-    }
-}
diff --git a/src/test/codewhisperer/service/inlineCompletionService.test.ts b/src/test/codewhisperer/service/inlineCompletionService.test.ts
deleted file mode 100644
index c4b7c0f0de4..00000000000
--- a/src/test/codewhisperer/service/inlineCompletionService.test.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as assert from 'assert'
-import * as sinon from 'sinon'
-import { InlineCompletionService } from '../../../codewhisperer/service/inlineCompletionService'
-import { createMockTextEditor, resetCodeWhispererGlobalVariables } from '../testUtil'
-import { ReferenceInlineProvider } from '../../../codewhisperer/service/referenceInlineProvider'
-import { RecommendationHandler } from '../../../codewhisperer/service/recommendationHandler'
-import * as codewhispererSdkClient from '../../../codewhisperer/client/codewhisperer'
-import { ConfigurationEntry } from '../../../codewhisperer/models/model'
-
-describe('inlineCompletionService', function () {
-    beforeEach(function () {
-        resetCodeWhispererGlobalVariables()
-    })
-
-    describe('getPaginatedRecommendation', function () {
-        const config: ConfigurationEntry = {
-            isShowMethodsEnabled: true,
-            isManualTriggerEnabled: true,
-            isAutomatedTriggerEnabled: true,
-            isSuggestionsWithCodeReferencesEnabled: true,
-        }
-
-        let mockClient: codewhispererSdkClient.DefaultCodeWhispererClient
-
-        beforeEach(function () {
-            mockClient = new codewhispererSdkClient.DefaultCodeWhispererClient()
-            resetCodeWhispererGlobalVariables()
-        })
-
-        afterEach(function () {
-            sinon.restore()
-        })
-
-        it('should clear previous recommendation before showing inline recommendation', async function () {
-            const mockEditor = createMockTextEditor()
-            sinon.stub(RecommendationHandler.instance, 'getRecommendations').resolves()
-            RecommendationHandler.instance.recommendations = [
-                { content: "\n\t\tconsole.log('Hello world!');\n\t}" },
-                { content: '' },
-            ]
-            await InlineCompletionService.instance.getPaginatedRecommendation(
-                mockClient,
-                mockEditor,
-                'OnDemand',
-                config
-            )
-            assert.strictEqual(RecommendationHandler.instance.recommendations.length, 0)
-        })
-
-        it('should call checkAndResetCancellationTokens before showing inline and next token to be null', async function () {
-            const mockEditor = createMockTextEditor()
-            sinon.stub(RecommendationHandler.instance, 'getRecommendations').resolves()
-            const checkAndResetCancellationTokensStub = sinon.stub(
-                RecommendationHandler.instance,
-                'checkAndResetCancellationTokens'
-            )
-            RecommendationHandler.instance.recommendations = [
-                { content: "\n\t\tconsole.log('Hello world!');\n\t}" },
-                { content: '' },
-            ]
-            await InlineCompletionService.instance.getPaginatedRecommendation(
-                mockClient,
-                mockEditor,
-                'OnDemand',
-                config
-            )
-            assert.ok(checkAndResetCancellationTokensStub.called)
-            assert.strictEqual(RecommendationHandler.instance.hasNextToken(), false)
-        })
-    })
-
-    describe('clearInlineCompletionStates', function () {
-        it('should remove inline reference and recommendations', async function () {
-            const fakeReferences = [
-                {
-                    message: '',
-                    licenseName: 'MIT',
-                    repository: 'http://github.com/fake',
-                    recommendationContentSpan: {
-                        start: 0,
-                        end: 10,
-                    },
-                },
-            ]
-            ReferenceInlineProvider.instance.setInlineReference(1, 'test', fakeReferences)
-            RecommendationHandler.instance.recommendations = [
-                { content: "\n\t\tconsole.log('Hello world!');\n\t}" },
-                { content: '' },
-            ]
-            await InlineCompletionService.instance.clearInlineCompletionStates(createMockTextEditor())
-            assert.strictEqual(ReferenceInlineProvider.instance.refs.length, 0)
-            assert.strictEqual(RecommendationHandler.instance.recommendations.length, 0)
-        })
-    })
-
-    describe('on event change', async function () {
-        beforeEach(function () {
-            const fakeReferences = [
-                {
-                    message: '',
-                    licenseName: 'MIT',
-                    repository: 'http://github.com/fake',
-                    recommendationContentSpan: {
-                        start: 0,
-                        end: 10,
-                    },
-                },
-            ]
-            ReferenceInlineProvider.instance.setInlineReference(1, 'test', fakeReferences)
-        })
-
-        it('should remove inline reference onEditorChange', async function () {
-            await InlineCompletionService.instance.onEditorChange()
-            assert.strictEqual(ReferenceInlineProvider.instance.refs.length, 0)
-        })
-        it('should remove inline reference onFocusChange', async function () {
-            await InlineCompletionService.instance.onFocusChange()
-            assert.strictEqual(ReferenceInlineProvider.instance.refs.length, 0)
-        })
-        it('should not remove inline reference on cursor change from typing', async function () {
-            await InlineCompletionService.instance.onCursorChange({
-                textEditor: createMockTextEditor(),
-                selections: [],
-                kind: vscode.TextEditorSelectionChangeKind.Keyboard,
-            })
-            assert.strictEqual(ReferenceInlineProvider.instance.refs.length, 1)
-        })
-
-        it('should remove inline reference on cursor change from mouse movement', async function () {
-            await InlineCompletionService.instance.onCursorChange({
-                textEditor: vscode.window.activeTextEditor!,
-                selections: [],
-                kind: vscode.TextEditorSelectionChangeKind.Mouse,
-            })
-            assert.strictEqual(ReferenceInlineProvider.instance.refs.length, 0)
-        })
-    })
-})
diff --git a/src/test/codewhisperer/service/keyStrokeHandler.test.ts b/src/test/codewhisperer/service/keyStrokeHandler.test.ts
deleted file mode 100644
index e378365b82f..00000000000
--- a/src/test/codewhisperer/service/keyStrokeHandler.test.ts
+++ /dev/null
@@ -1,293 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-import * as sinon from 'sinon'
-import * as codewhispererSdkClient from '../../../codewhisperer/client/codewhisperer'
-import { vsCodeState, ConfigurationEntry } from '../../../codewhisperer/models/model'
-import {
-    DocumentChangedSource,
-    KeyStrokeHandler,
-    DefaultDocumentChangedType,
-} from '../../../codewhisperer/service/keyStrokeHandler'
-import { InlineCompletion } from '../../../codewhisperer/service/inlineCompletion'
-import { createMockTextEditor, createTextDocumentChangeEvent, resetCodeWhispererGlobalVariables } from '../testUtil'
-import { InlineCompletionService } from '../../../codewhisperer/service/inlineCompletionService'
-import * as EditorContext from '../../../codewhisperer/util/editorContext'
-import { RecommendationHandler } from '../../../codewhisperer/service/recommendationHandler'
-
-const performance = globalThis.performance ?? require('perf_hooks').performance
-
-describe('keyStrokeHandler', function () {
-    const config: ConfigurationEntry = {
-        isShowMethodsEnabled: true,
-        isManualTriggerEnabled: true,
-        isAutomatedTriggerEnabled: true,
-        isSuggestionsWithCodeReferencesEnabled: true,
-    }
-    beforeEach(function () {
-        resetCodeWhispererGlobalVariables()
-    })
-    describe('processKeyStroke', async function () {
-        let invokeSpy: sinon.SinonStub
-        let startTimerSpy: sinon.SinonStub
-        let mockClient: codewhispererSdkClient.DefaultCodeWhispererClient
-        beforeEach(function () {
-            invokeSpy = sinon.stub(KeyStrokeHandler.instance, 'invokeAutomatedTrigger')
-            startTimerSpy = sinon.stub(KeyStrokeHandler.instance, 'startIdleTimeTriggerTimer')
-            sinon.spy(RecommendationHandler.instance, 'getRecommendations')
-            mockClient = new codewhispererSdkClient.DefaultCodeWhispererClient()
-            resetCodeWhispererGlobalVariables()
-            sinon.stub(mockClient, 'listRecommendations')
-            sinon.stub(mockClient, 'generateRecommendations')
-        })
-        afterEach(function () {
-            sinon.restore()
-        })
-
-        it('Whatever the input is, should skip when automatic trigger is turned off, should not call invokeAutomatedTrigger', async function () {
-            const mockEditor = createMockTextEditor()
-            const mockEvent: vscode.TextDocumentChangeEvent = createTextDocumentChangeEvent(
-                mockEditor.document,
-                new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 1)),
-                ' '
-            )
-            const cfg: ConfigurationEntry = {
-                isShowMethodsEnabled: true,
-                isManualTriggerEnabled: true,
-                isAutomatedTriggerEnabled: false,
-                isSuggestionsWithCodeReferencesEnabled: true,
-            }
-            const keyStrokeHandler = new KeyStrokeHandler()
-            await keyStrokeHandler.processKeyStroke(mockEvent, mockEditor, mockClient, cfg)
-            assert.ok(!invokeSpy.called)
-            assert.ok(!startTimerSpy.called)
-        })
-
-        it('Should not call invokeAutomatedTrigger when changed text matches active recommendation prefix', async function () {
-            const mockEditor = createMockTextEditor()
-            const mockEvent: vscode.TextDocumentChangeEvent = createTextDocumentChangeEvent(
-                mockEditor.document,
-                new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 1)),
-                'd'
-            )
-            vsCodeState.isIntelliSenseActive = true
-            RecommendationHandler.instance.startPos = new vscode.Position(1, 0)
-            RecommendationHandler.instance.recommendations = [{ content: 'def two_sum(nums, target):\n for i in nums' }]
-            await KeyStrokeHandler.instance.processKeyStroke(mockEvent, mockEditor, mockClient, config)
-            assert.ok(!invokeSpy.called)
-        })
-
-        it('Should not call invokeAutomatedTrigger when changed text across multiple lines', async function () {
-            const mockEditor = createMockTextEditor()
-            const mockEvent: vscode.TextDocumentChangeEvent = createTextDocumentChangeEvent(
-                mockEditor.document,
-                new vscode.Range(new vscode.Position(0, 0), new vscode.Position(1, 0)),
-                '\nprint(n'
-            )
-            await KeyStrokeHandler.instance.processKeyStroke(mockEvent, mockEditor, mockClient, config)
-            assert.ok(!invokeSpy.called)
-            assert.ok(!startTimerSpy.called)
-        })
-
-        it('Should not call invokeAutomatedTrigger when doing delete or undo (empty changed text)', async function () {
-            const mockEditor = createMockTextEditor()
-            const mockEvent: vscode.TextDocumentChangeEvent = createTextDocumentChangeEvent(
-                mockEditor.document,
-                new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 1)),
-                ''
-            )
-            await KeyStrokeHandler.instance.processKeyStroke(mockEvent, mockEditor, mockClient, config)
-            assert.ok(!invokeSpy.called)
-            assert.ok(!startTimerSpy.called)
-        })
-
-        it('Should call invokeAutomatedTrigger if previous text input is within 2 seconds but the new input is new line', async function () {
-            const mockEditor = createMockTextEditor()
-            const mockEvent: vscode.TextDocumentChangeEvent = createTextDocumentChangeEvent(
-                mockEditor.document,
-                new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 1)),
-                '\n'
-            )
-            RecommendationHandler.instance.lastInvocationTime = performance.now() - 1500
-            await KeyStrokeHandler.instance.processKeyStroke(mockEvent, mockEditor, mockClient, config)
-            assert.ok(invokeSpy.called)
-        })
-
-        it('Should call invokeAutomatedTrigger if previous text input is within 2 seconds but the new input is a specialcharacter', async function () {
-            const mockEditor = createMockTextEditor()
-            const mockEvent: vscode.TextDocumentChangeEvent = createTextDocumentChangeEvent(
-                mockEditor.document,
-                new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 1)),
-                '('
-            )
-            RecommendationHandler.instance.lastInvocationTime = performance.now() - 1500
-            await KeyStrokeHandler.instance.processKeyStroke(mockEvent, mockEditor, mockClient, config)
-            assert.ok(invokeSpy.called)
-        })
-
-        it('Should call invokeAutomatedTrigger with Enter when inputing \n', async function () {
-            const mockEditor = createMockTextEditor()
-            const mockEvent: vscode.TextDocumentChangeEvent = createTextDocumentChangeEvent(
-                mockEditor.document,
-                new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 1)),
-                '\n'
-            )
-            await KeyStrokeHandler.instance.processKeyStroke(mockEvent, mockEditor, mockClient, config)
-            invokeSpy('Enter', mockEditor, mockClient)
-            assert.ok(invokeSpy.called)
-        })
-
-        it('Should call invokeAutomatedTrigger with Enter when inputing \r\n', async function () {
-            const mockEditor = createMockTextEditor()
-            const mockEvent: vscode.TextDocumentChangeEvent = createTextDocumentChangeEvent(
-                mockEditor.document,
-                new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 2)),
-                '\r\n'
-            )
-            await KeyStrokeHandler.instance.processKeyStroke(mockEvent, mockEditor, mockClient, config)
-            invokeSpy('Enter', mockEditor, mockClient)
-            assert.ok(invokeSpy.called)
-        })
-
-        it('Should call invokeAutomatedTrigger with SpecialCharacter when inputing {', async function () {
-            const mockEditor = createMockTextEditor()
-            const mockEvent: vscode.TextDocumentChangeEvent = createTextDocumentChangeEvent(
-                mockEditor.document,
-                new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 1)),
-                '{'
-            )
-            await KeyStrokeHandler.instance.processKeyStroke(mockEvent, mockEditor, mockClient, config)
-            invokeSpy('SpecialCharacters', mockEditor, mockClient)
-            assert.ok(invokeSpy.called)
-        })
-
-        it('Should call invokeAutomatedTrigger with SpecialCharacter when inputing spaces equivalent to \t', async function () {
-            const mockEditor = createMockTextEditor()
-            const mockEvent: vscode.TextDocumentChangeEvent = createTextDocumentChangeEvent(
-                mockEditor.document,
-                new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 1)),
-                '  '
-            )
-            EditorContext.updateTabSize(2)
-            await KeyStrokeHandler.instance.processKeyStroke(mockEvent, mockEditor, mockClient, config)
-            invokeSpy('SpecialCharacters', mockEditor, mockClient)
-            assert.ok(invokeSpy.called)
-        })
-
-        it('Should not call invokeAutomatedTrigger with SpecialCharacter when inputing spaces not equivalent to \t', async function () {
-            const mockEditor = createMockTextEditor()
-            const mockEvent: vscode.TextDocumentChangeEvent = createTextDocumentChangeEvent(
-                mockEditor.document,
-                new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 1)),
-                '   '
-            )
-            EditorContext.updateTabSize(2)
-            await KeyStrokeHandler.instance.processKeyStroke(mockEvent, mockEditor, mockClient, config)
-            assert.ok(!invokeSpy.called)
-        })
-
-        it('Should not start idle trigger timer when inputing special characters', async function () {
-            const mockEditor = createMockTextEditor()
-            const mockEvent: vscode.TextDocumentChangeEvent = createTextDocumentChangeEvent(
-                mockEditor.document,
-                new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 1)),
-                '('
-            )
-            await KeyStrokeHandler.instance.processKeyStroke(mockEvent, mockEditor, mockClient, config)
-            assert.ok(!startTimerSpy.called)
-        })
-
-        it('Should start idle trigger timer when inputing non-special characters', async function () {
-            const mockEditor = createMockTextEditor()
-            const mockEvent: vscode.TextDocumentChangeEvent = createTextDocumentChangeEvent(
-                mockEditor.document,
-                new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 1)),
-                'a'
-            )
-            await KeyStrokeHandler.instance.processKeyStroke(mockEvent, mockEditor, mockClient, config)
-            assert.ok(startTimerSpy.called)
-        })
-    })
-
-    describe('invokeAutomatedTrigger', function () {
-        let mockClient: codewhispererSdkClient.DefaultCodeWhispererClient
-        beforeEach(function () {
-            sinon.restore()
-            mockClient = new codewhispererSdkClient.DefaultCodeWhispererClient()
-            resetCodeWhispererGlobalVariables()
-            sinon.stub(mockClient, 'listRecommendations')
-            sinon.stub(mockClient, 'generateRecommendations')
-        })
-        afterEach(function () {
-            sinon.restore()
-        })
-
-        it('should call getPaginatedRecommendation', async function () {
-            const mockEditor = createMockTextEditor()
-            const keyStrokeHandler = new KeyStrokeHandler()
-            InlineCompletion.instance.setCodeWhispererStatusBarOk()
-            const oldGetRecommendationsStub = sinon.stub(InlineCompletion.instance, 'getPaginatedRecommendation')
-            const getRecommendationsStub = sinon.stub(InlineCompletionService.instance, 'getPaginatedRecommendation')
-            await keyStrokeHandler.invokeAutomatedTrigger('Enter', mockEditor, mockClient, config)
-            assert.ok(getRecommendationsStub.calledOnce || oldGetRecommendationsStub.calledOnce)
-        })
-    })
-
-    describe('shouldTriggerIdleTime', function () {
-        it('should return false when inline is enabled and inline completion is in progress ', function () {
-            const keyStrokeHandler = new KeyStrokeHandler()
-            sinon.stub(InlineCompletionService.instance, 'isPaginationRunning').returns(true)
-            sinon.stub(InlineCompletion.instance, 'isPaginationRunning').returns(true)
-            const result = keyStrokeHandler.shouldTriggerIdleTime()
-            assert.strictEqual(result, false)
-        })
-    })
-
-    describe('test checkChangeSource', function () {
-        const tabStr = ' '.repeat(EditorContext.getTabSize())
-
-        const cases: [string, DocumentChangedSource][] = [
-            ['\n          ', DocumentChangedSource.EnterKey],
-            ['\n', DocumentChangedSource.EnterKey],
-            ['(', DocumentChangedSource.SpecialCharsKey],
-            ['()', DocumentChangedSource.SpecialCharsKey],
-            ['{}', DocumentChangedSource.SpecialCharsKey],
-            ['(a, b):', DocumentChangedSource.Unknown],
-            [':', DocumentChangedSource.SpecialCharsKey],
-            ['a', DocumentChangedSource.RegularKey],
-            [tabStr, DocumentChangedSource.TabKey],
-            ['__str__', DocumentChangedSource.IntelliSense],
-            ['toString()', DocumentChangedSource.IntelliSense],
-            ['</p>', DocumentChangedSource.IntelliSense],
-            ['   ', DocumentChangedSource.Reformatting],
-            ['def add(a,b):\n    return a + b\n', DocumentChangedSource.Unknown],
-            ['function suggestedByIntelliSense():', DocumentChangedSource.Unknown],
-        ]
-
-        cases.forEach(tuple => {
-            const input = tuple[0]
-            const expected = tuple[1]
-            it(`test input ${input} should return ${expected}`, function () {
-                const actual = new DefaultDocumentChangedType(
-                    createFakeDocumentChangeEvent(tuple[0])
-                ).checkChangeSource()
-                assert.strictEqual(actual, expected)
-            })
-        })
-
-        function createFakeDocumentChangeEvent(str: string): ReadonlyArray<vscode.TextDocumentContentChangeEvent> {
-            return [
-                {
-                    range: new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 5)),
-                    rangeOffset: 0,
-                    rangeLength: 0,
-                    text: str,
-                },
-            ]
-        }
-    })
-})
diff --git a/src/test/codewhisperer/service/recommendationHandler.test.ts b/src/test/codewhisperer/service/recommendationHandler.test.ts
deleted file mode 100644
index 928c6ff89a4..00000000000
--- a/src/test/codewhisperer/service/recommendationHandler.test.ts
+++ /dev/null
@@ -1,196 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-import * as sinon from 'sinon'
-import { DefaultCodeWhispererClient } from '../../../codewhisperer/client/codewhisperer'
-import { assertTelemetryCurried } from '../../testUtil'
-import { RecommendationsList } from '../../../codewhisperer/client/codewhisperer'
-import { ConfigurationEntry } from '../../../codewhisperer/models/model'
-import { createMockTextEditor, resetCodeWhispererGlobalVariables } from '../testUtil'
-import { TelemetryHelper } from '../../../codewhisperer/util/telemetryHelper'
-import { RecommendationHandler } from '../../../codewhisperer/service/recommendationHandler'
-import { stub } from '../../utilities/stubber'
-import { CodeWhispererCodeCoverageTracker } from '../../../codewhisperer/tracker/codewhispererCodeCoverageTracker'
-import { FakeMemento } from '../../fakeExtensionContext'
-
-const performance = globalThis.performance ?? require('perf_hooks').performance
-
-describe('recommendationHandler', function () {
-    const config: ConfigurationEntry = {
-        isShowMethodsEnabled: true,
-        isManualTriggerEnabled: true,
-        isAutomatedTriggerEnabled: true,
-        isSuggestionsWithCodeReferencesEnabled: true,
-    }
-    beforeEach(function () {
-        resetCodeWhispererGlobalVariables()
-    })
-
-    describe('getRecommendations', async function () {
-        const fakeMemeto = new FakeMemento()
-        const mockClient = stub(DefaultCodeWhispererClient)
-        const mockEditor = createMockTextEditor()
-
-        beforeEach(function () {
-            sinon.restore()
-            resetCodeWhispererGlobalVariables()
-            mockClient.listRecommendations.resolves({})
-            mockClient.generateRecommendations.resolves({})
-        })
-
-        afterEach(function () {
-            sinon.restore()
-        })
-
-        it('should assign correct recommendations given input', async function () {
-            assert.strictEqual(CodeWhispererCodeCoverageTracker.instances.size, 0)
-            assert.strictEqual(
-                CodeWhispererCodeCoverageTracker.getTracker(mockEditor.document.languageId, fakeMemeto)
-                    ?.serviceInvocationCount,
-                0
-            )
-
-            const mockServerResult = {
-                recommendations: [{ content: "print('Hello World!')" }, { content: '' }],
-                $response: {
-                    requestId: 'test_request',
-                    httpResponse: {
-                        headers: {
-                            'x-amzn-sessionid': 'test_request',
-                        },
-                    },
-                },
-            }
-            const handler = new RecommendationHandler()
-            sinon.stub(handler, 'getServerResponse').resolves(mockServerResult)
-            await handler.getRecommendations(mockClient, mockEditor, 'AutoTrigger', config, 'Enter', false)
-            const actual = handler.recommendations
-            const expected: RecommendationsList = [{ content: "print('Hello World!')" }, { content: '' }]
-            assert.deepStrictEqual(actual, expected)
-            assert.strictEqual(
-                CodeWhispererCodeCoverageTracker.getTracker(mockEditor.document.languageId, fakeMemeto)
-                    ?.serviceInvocationCount,
-                1
-            )
-        })
-
-        it('should assign request id correctly', async function () {
-            const mockServerResult = {
-                recommendations: [{ content: "print('Hello World!')" }, { content: '' }],
-                $response: {
-                    requestId: 'test_request',
-                    httpResponse: {
-                        headers: {
-                            'x-amzn-sessionid': 'test_request',
-                        },
-                    },
-                },
-            }
-            const handler = new RecommendationHandler()
-            sinon.stub(handler, 'getServerResponse').resolves(mockServerResult)
-            await handler.getRecommendations(mockClient, mockEditor, 'AutoTrigger', config, 'Enter', false)
-            assert.strictEqual(handler.requestId, 'test_request')
-            assert.strictEqual(handler.sessionId, 'test_request')
-            assert.strictEqual(TelemetryHelper.instance.triggerType, 'AutoTrigger')
-        })
-
-        it('should call telemetry function that records a CodeWhisperer service invocation', async function () {
-            const mockServerResult = {
-                recommendations: [{ content: "print('Hello World!')" }, { content: '' }],
-                $response: {
-                    requestId: 'test_request',
-                    httpResponse: {
-                        headers: {
-                            'x-amzn-sessionid': 'test_request',
-                        },
-                    },
-                },
-            }
-            const handler = new RecommendationHandler()
-            sinon.stub(handler, 'getServerResponse').resolves(mockServerResult)
-            sinon.stub(performance, 'now').returns(0.0)
-            handler.startPos = new vscode.Position(1, 0)
-            TelemetryHelper.instance.cursorOffset = 2
-            await handler.getRecommendations(mockClient, mockEditor, 'AutoTrigger', config, 'Enter')
-            const assertTelemetry = assertTelemetryCurried('codewhisperer_serviceInvocation')
-            assertTelemetry({
-                codewhispererRequestId: 'test_request',
-                codewhispererSessionId: 'test_request',
-                codewhispererLastSuggestionIndex: -1,
-                codewhispererTriggerType: 'AutoTrigger',
-                codewhispererAutomatedTriggerType: 'Enter',
-                codewhispererCompletionType: 'Line',
-                result: 'Succeeded',
-                codewhispererLineNumber: 1,
-                codewhispererCursorOffset: 38,
-                codewhispererLanguage: 'python',
-            })
-        })
-
-        it('should call telemetry function that records a Empty userDecision event', async function () {
-            const mockServerResult = {
-                recommendations: [],
-                nextToken: '',
-                $response: {
-                    requestId: 'test_request_empty',
-                    httpResponse: {
-                        headers: {
-                            'x-amzn-sessionid': 'test_request_empty',
-                        },
-                    },
-                },
-            }
-            const handler = new RecommendationHandler()
-            sinon.stub(handler, 'getServerResponse').resolves(mockServerResult)
-            sinon.stub(performance, 'now').returns(0.0)
-            handler.startPos = new vscode.Position(1, 0)
-            TelemetryHelper.instance.cursorOffset = 2
-            await handler.getRecommendations(mockClient, mockEditor, 'AutoTrigger', config, 'Enter')
-            const assertTelemetry = assertTelemetryCurried('codewhisperer_userDecision')
-            assertTelemetry({
-                codewhispererRequestId: 'test_request_empty',
-                codewhispererSessionId: 'test_request_empty',
-                codewhispererPaginationProgress: 0,
-                codewhispererTriggerType: 'AutoTrigger',
-                codewhispererSuggestionIndex: -1,
-                codewhispererSuggestionState: 'Empty',
-                codewhispererSuggestionReferenceCount: 0,
-                codewhispererCompletionType: 'Line',
-                codewhispererLanguage: 'python',
-            })
-        })
-    })
-
-    describe('isValidResponse', function () {
-        afterEach(function () {
-            sinon.restore()
-        })
-        it('should return true if any response is not empty', function () {
-            const handler = new RecommendationHandler()
-            handler.recommendations = [
-                {
-                    content:
-                        '\n    // Use the console to output debug info…n of the command with the "command" variable',
-                },
-                { content: '' },
-            ]
-            assert.ok(handler.isValidResponse())
-        })
-
-        it('should return false if response is empty', function () {
-            const handler = new RecommendationHandler()
-            handler.recommendations = []
-            assert.ok(!handler.isValidResponse())
-        })
-
-        it('should return false if all response has no string length', function () {
-            const handler = new RecommendationHandler()
-            handler.recommendations = [{ content: '' }, { content: '' }]
-            assert.ok(!handler.isValidResponse())
-        })
-    })
-})
diff --git a/src/test/codewhisperer/service/referenceInlineProvider.test.ts b/src/test/codewhisperer/service/referenceInlineProvider.test.ts
deleted file mode 100644
index 952b77075b8..00000000000
--- a/src/test/codewhisperer/service/referenceInlineProvider.test.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import * as assert from 'assert'
-import { resetCodeWhispererGlobalVariables } from '../testUtil'
-import { ReferenceInlineProvider } from '../../../codewhisperer/service/referenceInlineProvider'
-
-describe('referenceInlineProvider', function () {
-    beforeEach(function () {
-        resetCodeWhispererGlobalVariables()
-    })
-    describe('setInlineReference', async function () {
-        it('Reference codelens message should contain license name and CodeWhisperer reference log', function () {
-            const referenceInlineProvider = new ReferenceInlineProvider()
-            const fakeReferences = [
-                {
-                    message: '',
-                    licenseName: 'TEST_LICENSE',
-                    repository: 'TEST_REPO',
-                    recommendationContentSpan: {
-                        start: 0,
-                        end: 10,
-                    },
-                },
-            ]
-            referenceInlineProvider.setInlineReference(1, `def two_sum(nums, target):`, fakeReferences)
-            assert.ok(referenceInlineProvider.refs[0].includes(`TEST_LICENSE`))
-            assert.ok(referenceInlineProvider.refs[0].includes(`reference log`))
-        })
-    })
-})
diff --git a/src/test/codewhisperer/service/referenceLogViewProvider.test.ts b/src/test/codewhisperer/service/referenceLogViewProvider.test.ts
deleted file mode 100644
index e60bafc541c..00000000000
--- a/src/test/codewhisperer/service/referenceLogViewProvider.test.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import * as assert from 'assert'
-import { createMockTextEditor, resetCodeWhispererGlobalVariables } from '../testUtil'
-import { ReferenceLogViewProvider } from '../../../codewhisperer/service/referenceLogViewProvider'
-import { LicenseUtil } from '../../../codewhisperer/util/licenseUtil'
-
-describe('referenceLogViewProvider', function () {
-    beforeEach(function () {
-        resetCodeWhispererGlobalVariables()
-    })
-    describe('getReferenceLog', async function () {
-        it('Should return expected reference log string with link to license if there is no url', function () {
-            const currentTime = new Date()
-            const currentTimeString = currentTime.toLocaleString()
-            currentTime.setSeconds(currentTime.getSeconds() + 1)
-            const nextTimeString = currentTime.toLocaleString()
-            const mockEditor = createMockTextEditor()
-            const recommendation = `def two_sum(nums, target):`
-            const fakeReferences = [
-                {
-                    message: '',
-                    licenseName: 'MIT',
-                    repository: 'TEST_REPO',
-                    recommendationContentSpan: {
-                        start: 0,
-                        end: 10,
-                    },
-                },
-            ]
-            const actual = ReferenceLogViewProvider.getReferenceLog(recommendation, fakeReferences, mockEditor)
-            const actualTime = actual.substring(1, actual.indexOf(']'))
-            assert.ok(actualTime === currentTimeString || actualTime === nextTimeString)
-            assert.ok(actual.includes('MIT'))
-            assert.ok(actual.includes('def two_su'))
-            assert.ok(actual.includes(LicenseUtil.getLicenseHtml('MIT')))
-        })
-
-        it('Should return expected reference log string with link to the repo url if present', function () {
-            const currentTime = new Date()
-            const currentTimeString = currentTime.toLocaleString()
-            currentTime.setSeconds(currentTime.getSeconds() + 1)
-            const nextTimeString = currentTime.toLocaleString()
-            const mockEditor = createMockTextEditor()
-            const recommendation = `def two_sum(nums, target):`
-            const mockUrl = 'https://www.amazon.com'
-            const fakeReferences = [
-                {
-                    message: '',
-                    licenseName: 'MIT',
-                    repository: 'TEST_REPO',
-                    url: mockUrl,
-                    recommendationContentSpan: {
-                        start: 0,
-                        end: 10,
-                    },
-                },
-            ]
-            const actual = ReferenceLogViewProvider.getReferenceLog(recommendation, fakeReferences, mockEditor)
-            const actualTime = actual.substring(1, actual.indexOf(']'))
-            assert.ok(actualTime === currentTimeString || actualTime === nextTimeString)
-            assert.ok(actual.includes('MIT'))
-            assert.ok(actual.includes('def two_su'))
-            assert.ok(actual.includes(mockUrl))
-            assert.ok(!actual.includes(LicenseUtil.getLicenseHtml('MIT')))
-        })
-    })
-})
diff --git a/src/test/codewhisperer/testUtil.ts b/src/test/codewhisperer/testUtil.ts
deleted file mode 100644
index e7df0b33cbc..00000000000
--- a/src/test/codewhisperer/testUtil.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as sinon from 'sinon'
-import * as codewhispererClient from '../../codewhisperer/client/codewhisperer'
-import { vsCodeState, AcceptedSuggestionEntry } from '../../codewhisperer/models/model'
-import { MockDocument } from '../fake/fakeDocument'
-import { getLogger } from '../../shared/logger'
-import { CodeWhispererCodeCoverageTracker } from '../../codewhisperer/tracker/codewhispererCodeCoverageTracker'
-import globals from '../../shared/extensionGlobals'
-
-export function resetCodeWhispererGlobalVariables() {
-    vsCodeState.isIntelliSenseActive = false
-    vsCodeState.isCodeWhispererEditing = false
-    CodeWhispererCodeCoverageTracker.instances.clear()
-    globals.telemetry.logger.clear()
-}
-
-export function createMockDocument(
-    doc = 'import math\ndef two_sum(nums, target):\n',
-    filename = 'test.py',
-    language = 'python'
-): MockDocument {
-    return new MockDocument(doc, filename, sinon.spy(), language)
-}
-
-export function createMockTextEditor(
-    doc = 'import math\ndef two_sum(nums, target):\n',
-    filename = 'test.py',
-    language = 'python',
-    line = 1,
-    character = 26
-): vscode.TextEditor {
-    const mockTextEditor: vscode.TextEditor = {
-        document: createMockDocument(doc, filename, language),
-        selection: createMockSelection(line, character),
-        selections: [],
-        visibleRanges: [],
-        options: {},
-        insertSnippet: sinon.spy(),
-        setDecorations: sinon.spy(),
-        revealRange: sinon.spy(),
-        show: sinon.spy(),
-        hide: sinon.spy(),
-        edit: function (
-            resolve: (editBuilder: vscode.TextEditorEdit) => void,
-            options?: { undoStopBefore: boolean; undoStopAfter: boolean } | undefined
-        ) {
-            return new Promise(r => {
-                const editor: vscode.TextEditorEdit = {
-                    replace: sinon.spy(),
-                    insert: sinon.spy(),
-                    setEndOfLine: sinon.spy(),
-                    delete: function (_location: vscode.Selection | vscode.Range): void {
-                        getLogger().info(`delete ${JSON.stringify(_location)}`)
-                    },
-                }
-                resolve(editor)
-                r(true)
-            })
-        },
-    }
-    return mockTextEditor
-}
-
-export function createMockSelection(line: number, character: number): vscode.Selection {
-    const selection: vscode.Selection = {
-        anchor: new vscode.Position(line, character),
-        active: new vscode.Position(line, character),
-        end: new vscode.Position(line, character),
-        isEmpty: false,
-        isReversed: false,
-        isSingleLine: false,
-        start: new vscode.Position(line, character),
-        contains: sinon.spy(),
-        intersection: sinon.spy(),
-        isEqual: sinon.spy(),
-        union: sinon.spy(),
-        with: sinon.spy(),
-    }
-    return selection
-}
-
-export function createMockClientRequest(): codewhispererClient.ListRecommendationsRequest {
-    const req: codewhispererClient.ListRecommendationsRequest = {
-        fileContext: {
-            filename: 'test.py',
-            programmingLanguage: {
-                languageName: 'python',
-            },
-            leftFileContent: 'def add',
-            rightFileContent: '',
-        },
-    }
-    return req
-}
-
-export function createAcceptedSuggestionEntry(time = new Date()): AcceptedSuggestionEntry {
-    return {
-        time: time,
-        fileUrl: {
-            scheme: '',
-            authority: 'Amazon',
-            path: '',
-            query: '',
-            fragment: '',
-            fsPath: '',
-            with: sinon.spy(),
-            toJSON: sinon.spy(),
-        },
-        originalString: 'x',
-        startPosition: new vscode.Position(1, 1),
-        endPosition: new vscode.Position(1, 1),
-        requestId: 'test',
-        sessionId: 'test',
-        index: 1,
-        triggerType: 'OnDemand',
-        completionType: 'Line',
-        language: 'java',
-    }
-}
-
-export function createTextDocumentChangeEvent(document: vscode.TextDocument, range: vscode.Range, text: string) {
-    return {
-        document: document,
-        contentChanges: [
-            {
-                range: range,
-                rangeOffset: 1,
-                rangeLength: 1,
-                text: text,
-            },
-        ],
-    }
-}
diff --git a/src/test/codewhisperer/tracker/codewhispererCodeCoverageTracker.test.ts b/src/test/codewhisperer/tracker/codewhispererCodeCoverageTracker.test.ts
deleted file mode 100644
index 2addc8cffd7..00000000000
--- a/src/test/codewhisperer/tracker/codewhispererCodeCoverageTracker.test.ts
+++ /dev/null
@@ -1,402 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as sinon from 'sinon'
-import * as vscode from 'vscode'
-import { CodeWhispererCodeCoverageTracker } from '../../../codewhisperer/tracker/codewhispererCodeCoverageTracker'
-import { createMockDocument, createMockTextEditor, resetCodeWhispererGlobalVariables } from '../testUtil'
-import globals from '../../../shared/extensionGlobals'
-import { assertTelemetryCurried } from '../../testUtil'
-import { vsCodeState } from '../../../codewhisperer/models/model'
-import { FakeMemento } from '../../fakeExtensionContext'
-import * as CodeWhispererConstants from '../../../codewhisperer/models/constants'
-import { TelemetryHelper } from '../../../codewhisperer/util/telemetryHelper'
-
-describe('codewhispererCodecoverageTracker', function () {
-    const language = 'python'
-
-    describe('test getTracker', function () {
-        afterEach(function () {
-            resetCodeWhispererGlobalVariables()
-            CodeWhispererCodeCoverageTracker.instances.clear()
-        })
-
-        it('unsupported language', function () {
-            assert.strictEqual(CodeWhispererCodeCoverageTracker.getTracker('cpp'), undefined)
-            assert.strictEqual(CodeWhispererCodeCoverageTracker.getTracker('ruby'), undefined)
-            assert.strictEqual(CodeWhispererCodeCoverageTracker.getTracker('go'), undefined)
-        })
-
-        it('supported language', function () {
-            assert.notStrictEqual(CodeWhispererCodeCoverageTracker.getTracker('python'), undefined)
-            assert.notStrictEqual(CodeWhispererCodeCoverageTracker.getTracker('javascriptreact'), undefined)
-            assert.notStrictEqual(CodeWhispererCodeCoverageTracker.getTracker('java'), undefined)
-            assert.notStrictEqual(CodeWhispererCodeCoverageTracker.getTracker('javascript'), undefined)
-        })
-
-        it('supported language and should return singleton object per language', function () {
-            let instance1: CodeWhispererCodeCoverageTracker | undefined
-            let instance2: CodeWhispererCodeCoverageTracker | undefined
-            instance1 = CodeWhispererCodeCoverageTracker.getTracker('java')
-            instance2 = CodeWhispererCodeCoverageTracker.getTracker('java')
-            assert.notStrictEqual(instance1, undefined)
-            assert.strictEqual(Object.is(instance1, instance2), true)
-
-            instance1 = CodeWhispererCodeCoverageTracker.getTracker('python')
-            instance2 = CodeWhispererCodeCoverageTracker.getTracker('python')
-            assert.notStrictEqual(instance1, undefined)
-            assert.strictEqual(Object.is(instance1, instance2), true)
-
-            instance1 = CodeWhispererCodeCoverageTracker.getTracker('javascriptreact')
-            instance2 = CodeWhispererCodeCoverageTracker.getTracker('javascriptreact')
-            assert.notStrictEqual(instance1, undefined)
-            assert.strictEqual(Object.is(instance1, instance2), true)
-        })
-    })
-
-    describe('test isActive', function () {
-        const fakeMemeto = new FakeMemento()
-        let tracker: CodeWhispererCodeCoverageTracker | undefined
-
-        afterEach(function () {
-            resetCodeWhispererGlobalVariables()
-            CodeWhispererCodeCoverageTracker.instances.clear()
-            fakeMemeto.update(CodeWhispererConstants.termsAcceptedKey, undefined)
-            sinon.restore()
-        })
-
-        it('inactive case: telemetryEnable = true, termsAccepted = undefined | false', function () {
-            sinon.stub(TelemetryHelper.instance, 'isTelemetryEnabled').returns(true)
-
-            tracker = CodeWhispererCodeCoverageTracker.getTracker('python', fakeMemeto)
-            if (!tracker) {
-                assert.fail()
-            }
-            assert.strictEqual(tracker.isActive(), false)
-
-            fakeMemeto.update(CodeWhispererConstants.termsAcceptedKey, false)
-            assert.strictEqual(tracker.isActive(), false)
-        })
-
-        it('inactive case: telemetryEnabled = false, termsAccepted = undefined | false', function () {
-            sinon.stub(TelemetryHelper.instance, 'isTelemetryEnabled').returns(false)
-
-            tracker = CodeWhispererCodeCoverageTracker.getTracker('java', fakeMemeto)
-            if (!tracker) {
-                assert.fail()
-            }
-            assert.strictEqual(tracker.isActive(), false)
-
-            fakeMemeto.update(CodeWhispererConstants.termsAcceptedKey, false)
-            assert.strictEqual(tracker.isActive(), false)
-        })
-
-        it('active case: telemetryEnabled = true, termsAccepted = true', function () {
-            fakeMemeto.update(CodeWhispererConstants.termsAcceptedKey, true)
-            sinon.stub(TelemetryHelper.instance, 'isTelemetryEnabled').returns(true)
-
-            tracker = CodeWhispererCodeCoverageTracker.getTracker('javascript', fakeMemeto)
-            if (!tracker) {
-                assert.fail()
-            }
-            assert.strictEqual(tracker.isActive(), true)
-        })
-    })
-
-    describe('updateAcceptedTokensCount', function () {
-        let tracker: CodeWhispererCodeCoverageTracker | undefined
-
-        beforeEach(function () {
-            resetCodeWhispererGlobalVariables()
-            tracker = CodeWhispererCodeCoverageTracker.getTracker(language)
-            if (tracker) {
-                sinon.stub(tracker, 'isActive').returns(true)
-            }
-        })
-
-        afterEach(function () {
-            sinon.restore()
-            CodeWhispererCodeCoverageTracker.instances.clear()
-        })
-
-        it('Should compute edit distance to update the accepted tokens', function () {
-            if (!tracker) {
-                assert.fail()
-            }
-            const editor = createMockTextEditor('def addTwoNumbers(a, b):\n')
-
-            tracker.addAcceptedTokens(editor.document.fileName, {
-                range: new vscode.Range(0, 0, 0, 25),
-                text: `def addTwoNumbers(x, y):\n`,
-                accepted: 25,
-            })
-            tracker.addTotalTokens(editor.document.fileName, 100)
-            tracker.updateAcceptedTokensCount(editor)
-            assert.strictEqual(tracker?.acceptedTokens[editor.document.fileName][0].accepted, 23)
-        })
-    })
-
-    describe('getUnmodifiedAcceptedTokens', function () {
-        let tracker: CodeWhispererCodeCoverageTracker | undefined
-
-        beforeEach(function () {
-            resetCodeWhispererGlobalVariables()
-            tracker = CodeWhispererCodeCoverageTracker.getTracker(language)
-            if (tracker) {
-                sinon.stub(tracker, 'isActive').returns(true)
-            }
-        })
-
-        afterEach(function () {
-            sinon.restore()
-            CodeWhispererCodeCoverageTracker.instances.clear()
-        })
-
-        it('Should return correct unmodified accepted tokens count', function () {
-            const tracker = CodeWhispererCodeCoverageTracker.getTracker(language)
-            assert.strictEqual(tracker?.getUnmodifiedAcceptedTokens('foo', 'fou'), 2)
-            assert.strictEqual(tracker?.getUnmodifiedAcceptedTokens('foo', 'f11111oo'), 3)
-            assert.strictEqual(tracker?.getUnmodifiedAcceptedTokens('foo', 'fo'), 2)
-            assert.strictEqual(tracker?.getUnmodifiedAcceptedTokens('helloworld', 'HelloWorld'), 8)
-            assert.strictEqual(tracker?.getUnmodifiedAcceptedTokens('helloworld', 'World'), 4)
-            assert.strictEqual(tracker?.getUnmodifiedAcceptedTokens('CodeWhisperer', 'CODE'), 1)
-            assert.strictEqual(tracker?.getUnmodifiedAcceptedTokens('CodeWhisperer', 'CodeWhispererGood'), 13)
-        })
-    })
-
-    describe('countAcceptedTokens', function () {
-        let tracker: CodeWhispererCodeCoverageTracker | undefined
-
-        beforeEach(function () {
-            resetCodeWhispererGlobalVariables()
-            tracker = CodeWhispererCodeCoverageTracker.getTracker(language)
-            if (tracker) {
-                sinon.stub(tracker, 'isActive').returns(true)
-            }
-        })
-
-        afterEach(function () {
-            sinon.restore()
-            CodeWhispererCodeCoverageTracker.instances.clear()
-        })
-
-        it('Should skip when tracker is not active', function () {
-            if (!tracker) {
-                assert.fail()
-            }
-            tracker.countAcceptedTokens(new vscode.Range(0, 0, 0, 1), 'a', 'test.py')
-            const spy = sinon.spy(CodeWhispererCodeCoverageTracker.prototype, 'addAcceptedTokens')
-            assert.ok(!spy.called)
-        })
-
-        it('Should increase both AcceptedTokens and TotalTokens', function () {
-            if (!tracker) {
-                assert.fail()
-            }
-            tracker.countAcceptedTokens(new vscode.Range(0, 0, 0, 1), 'a', 'test.py')
-            assert.deepStrictEqual(tracker.acceptedTokens['test.py'][0], {
-                range: new vscode.Range(0, 0, 0, 1),
-                text: 'a',
-                accepted: 1,
-            })
-            assert.strictEqual(tracker.totalTokens['test.py'], 1)
-        })
-    })
-
-    describe('countTotalTokens', function () {
-        let tracker: CodeWhispererCodeCoverageTracker | undefined
-
-        beforeEach(function () {
-            resetCodeWhispererGlobalVariables()
-            tracker = CodeWhispererCodeCoverageTracker.getTracker(language)
-            if (tracker) {
-                sinon.stub(tracker, 'isActive').returns(true)
-            }
-        })
-
-        afterEach(function () {
-            sinon.restore()
-            CodeWhispererCodeCoverageTracker.instances.clear()
-        })
-
-        it('Should skip when user copy large files', function () {
-            if (!tracker) {
-                assert.fail()
-            }
-            tracker.countTotalTokens({
-                document: createMockDocument(),
-                contentChanges: [
-                    {
-                        range: new vscode.Range(0, 0, 0, 30),
-                        rangeOffset: 0,
-                        rangeLength: 30,
-                        text: 'def twoSum(nums, target):\nfor',
-                    },
-                ],
-            })
-
-            const startedSpy = sinon.spy(CodeWhispererCodeCoverageTracker.prototype, 'addTotalTokens')
-            assert.ok(!startedSpy.called)
-        })
-
-        it('Should skip when CodeWhisperer is editing', function () {
-            if (!tracker) {
-                assert.fail()
-            }
-            vsCodeState.isCodeWhispererEditing = true
-            tracker.countTotalTokens({
-                document: createMockDocument(),
-                contentChanges: [
-                    {
-                        range: new vscode.Range(0, 0, 0, 30),
-                        rangeOffset: 0,
-                        rangeLength: 30,
-                        text: 'def twoSum(nums, target):\nfor',
-                    },
-                ],
-            })
-            const startedSpy = sinon.spy(CodeWhispererCodeCoverageTracker.prototype, 'addTotalTokens')
-            assert.ok(!startedSpy.called)
-        })
-
-        it('Should reduce tokens when delete', function () {
-            if (!tracker) {
-                assert.fail()
-            }
-            const doc = createMockDocument('import math', 'test.py', 'python')
-            tracker.countTotalTokens({
-                document: doc,
-                contentChanges: [
-                    {
-                        range: new vscode.Range(0, 0, 0, 3),
-                        rangeOffset: 0,
-                        rangeLength: 0,
-                        text: 'aaa',
-                    },
-                ],
-            })
-            tracker.countTotalTokens({
-                document: doc,
-                contentChanges: [
-                    {
-                        range: new vscode.Range(0, 0, 0, 1),
-                        rangeOffset: 1,
-                        rangeLength: 1,
-                        text: '',
-                    },
-                ],
-            })
-            assert.strictEqual(tracker?.totalTokens[doc.fileName], 2)
-        })
-
-        it('Should add tokens when type', function () {
-            if (!tracker) {
-                assert.fail()
-            }
-            const doc = createMockDocument('import math', 'test.py', 'python')
-            tracker.countTotalTokens({
-                document: doc,
-                contentChanges: [
-                    {
-                        range: new vscode.Range(0, 0, 0, 1),
-                        rangeOffset: 0,
-                        rangeLength: 0,
-                        text: 'a',
-                    },
-                ],
-            })
-            assert.strictEqual(tracker?.totalTokens[doc.fileName], 1)
-        })
-    })
-
-    describe('flush', function () {
-        let tracker: CodeWhispererCodeCoverageTracker | undefined
-
-        beforeEach(function () {
-            resetCodeWhispererGlobalVariables()
-            tracker = CodeWhispererCodeCoverageTracker.getTracker(language)
-            if (tracker) {
-                sinon.stub(tracker, 'isActive').returns(true)
-            }
-        })
-
-        afterEach(function () {
-            sinon.restore()
-            CodeWhispererCodeCoverageTracker.instances.clear()
-        })
-
-        it('Should not send codecoverage telemetry if tracker is not active', function () {
-            if (!tracker) {
-                assert.fail()
-            }
-            sinon.restore()
-            sinon.stub(tracker, 'isActive').returns(false)
-
-            tracker.addAcceptedTokens(`test.py`, { range: new vscode.Range(0, 0, 0, 7), text: `print()`, accepted: 7 })
-            tracker.addTotalTokens(`test.py`, 100)
-            tracker.flush()
-            const data = globals.telemetry.logger.query({
-                metricName: 'codewhisperer_codePercentage',
-                excludeKeys: ['awsAccount'],
-            })
-            assert.strictEqual(data.length, 0)
-        })
-    })
-
-    describe('emitCodeWhispererCodeContribution', function () {
-        let tracker: CodeWhispererCodeCoverageTracker | undefined
-
-        beforeEach(function () {
-            resetCodeWhispererGlobalVariables()
-            tracker = CodeWhispererCodeCoverageTracker.getTracker(language)
-            if (tracker) {
-                sinon.stub(tracker, 'isActive').returns(true)
-            }
-        })
-
-        afterEach(function () {
-            sinon.restore()
-            CodeWhispererCodeCoverageTracker.instances.clear()
-        })
-
-        it('should emit correct code coverage telemetry in python file', function () {
-            const tracker = CodeWhispererCodeCoverageTracker.getTracker(language)
-
-            const assertTelemetry = assertTelemetryCurried('codewhisperer_codePercentage')
-            tracker?.addAcceptedTokens(`test.py`, { range: new vscode.Range(0, 0, 0, 7), text: `print()`, accepted: 7 })
-            tracker?.addTotalTokens(`test.py`, 100)
-            tracker?.emitCodeWhispererCodeContribution()
-
-            assertTelemetry({
-                codewhispererTotalTokens: 100,
-                codewhispererLanguage: language,
-                codewhispererAcceptedTokens: 7,
-                codewhispererPercentage: 7,
-                successCount: 0,
-            })
-        })
-
-        it('should emit correct code coverage telemetry in java file', function () {
-            const tracker = CodeWhispererCodeCoverageTracker.getTracker('java')
-
-            const assertTelemetry = assertTelemetryCurried('codewhisperer_codePercentage')
-            tracker?.addAcceptedTokens(`test.java`, {
-                range: new vscode.Range(0, 0, 0, 18),
-                text: `public static main`,
-                accepted: 18,
-            })
-            tracker?.addTotalTokens(`test.java`, 30)
-            tracker?.emitCodeWhispererCodeContribution()
-            assertTelemetry({
-                codewhispererTotalTokens: 30,
-                codewhispererLanguage: 'java',
-                codewhispererAcceptedTokens: 18,
-                codewhispererPercentage: 60,
-                successCount: 0,
-            })
-        })
-    })
-})
diff --git a/src/test/codewhisperer/tracker/codewhispererTracker.test.ts b/src/test/codewhisperer/tracker/codewhispererTracker.test.ts
deleted file mode 100644
index 25fa4e956ca..00000000000
--- a/src/test/codewhisperer/tracker/codewhispererTracker.test.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as sinon from 'sinon'
-import globals from '../../../shared/extensionGlobals'
-import { assertTelemetryCurried } from '../../testUtil'
-import { CodeWhispererTracker } from '../../../codewhisperer/tracker/codewhispererTracker'
-import { resetCodeWhispererGlobalVariables, createAcceptedSuggestionEntry } from '../testUtil'
-
-describe('codewhispererTracker', function () {
-    describe('enqueue', function () {
-        beforeEach(function () {
-            resetCodeWhispererGlobalVariables()
-            CodeWhispererTracker.getTracker().shutdown()
-        })
-
-        afterEach(function () {
-            sinon.restore()
-        })
-
-        it('Should put suggestion in queue', function () {
-            const suggestion = createAcceptedSuggestionEntry()
-            const pushSpy = sinon.spy(Array.prototype, 'push')
-            CodeWhispererTracker.getTracker().enqueue(suggestion)
-            assert.ok(!pushSpy.neverCalledWith(suggestion))
-        })
-
-        it('Should not enque when telemetry is disabled', function () {
-            globals.telemetry.telemetryEnabled = false
-            const suggestion = createAcceptedSuggestionEntry()
-            const pushSpy = sinon.spy(Array.prototype, 'push')
-            CodeWhispererTracker.getTracker().enqueue(suggestion)
-            assert.ok(pushSpy.neverCalledWith(suggestion))
-            globals.telemetry.telemetryEnabled = true
-        })
-    })
-
-    describe('flush', function () {
-        beforeEach(function () {
-            resetCodeWhispererGlobalVariables()
-            CodeWhispererTracker.getTracker().shutdown()
-        })
-
-        afterEach(function () {
-            sinon.restore()
-        })
-
-        it('Should call emit telemetry for event existed longer than 5 min, put back to queue if less than 5 min', async function () {
-            const suggestion1 = createAcceptedSuggestionEntry(new Date())
-            const suggestion2 = createAcceptedSuggestionEntry(new Date(Date.now() - 6 * 60 * 1000))
-            const emitSpy = sinon.spy(CodeWhispererTracker.prototype, 'emitTelemetryOnSuggestion')
-            CodeWhispererTracker.getTracker().enqueue(suggestion1)
-            CodeWhispererTracker.getTracker().enqueue(suggestion2)
-            await CodeWhispererTracker.getTracker().flush()
-            assert.ok(emitSpy.calledOnce)
-            assert.ok(!emitSpy.neverCalledWith(suggestion2))
-            assert.ok(emitSpy.neverCalledWith(suggestion1))
-        })
-
-        it('Should skip if telemetry is disabled', async function () {
-            const getTimeSpy = sinon.spy(Date.prototype, 'getTime')
-            await CodeWhispererTracker.getTracker().flush()
-            assert.ok(!getTimeSpy.called)
-        })
-    })
-
-    describe('checkDiff', function () {
-        it('Should return 1.0 distance for invalid input strings', function () {
-            assert.strictEqual(CodeWhispererTracker.getTracker().checkDiff('', 'aabcd'), 1.0)
-            assert.strictEqual(CodeWhispererTracker.getTracker().checkDiff('abbbacd', ''), 1.0)
-        })
-
-        it('Should return 1/levenshtein distance for valid input strings', function () {
-            assert.strictEqual(CodeWhispererTracker.getTracker().checkDiff('abccd', 'aabcd'), 0.4)
-        })
-    })
-
-    describe('emitTelemetryOnSuggestion', function () {
-        it('Should call recordCodewhispererUserModification with suggestion event', async function () {
-            const suggestion = createAcceptedSuggestionEntry()
-            const assertTelemetry = assertTelemetryCurried('codewhisperer_userModification')
-            await CodeWhispererTracker.getTracker().emitTelemetryOnSuggestion(suggestion)
-            assertTelemetry({
-                codewhispererRequestId: 'test',
-                codewhispererSessionId: 'test',
-                codewhispererTriggerType: 'OnDemand',
-                codewhispererSuggestionIndex: 1,
-                codewhispererModificationPercentage: 1,
-                codewhispererCompletionType: 'Line',
-                codewhispererLanguage: 'java',
-            })
-        })
-    })
-})
diff --git a/src/test/codewhisperer/util/closingBracketUtil.test.ts b/src/test/codewhisperer/util/closingBracketUtil.test.ts
deleted file mode 100644
index d57c9e34240..00000000000
--- a/src/test/codewhisperer/util/closingBracketUtil.test.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as sinon from 'sinon'
-import {
-    calculateBracketsLevel,
-    getBracketsToRemove,
-    removeBracketsFromRightContext,
-} from '../../../codewhisperer/util/closingBracketUtil'
-import { createMockTextEditor } from '../testUtil'
-import { getLogger } from '../../../shared/logger/logger'
-import { Position } from 'vscode'
-
-describe('closingBracketUtil', function () {
-    describe('calculateBracketsLevel', function () {
-        it('Should return expected bracket level with index', function () {
-            const actual = calculateBracketsLevel('{{()')
-            const expected = [
-                {
-                    char: '{',
-                    count: 1,
-                    idx: 0,
-                },
-                {
-                    char: '{',
-                    count: 2,
-                    idx: 1,
-                },
-                {
-                    char: '(',
-                    count: 1,
-                    idx: 2,
-                },
-                {
-                    char: '(',
-                    count: 0,
-                    idx: 3,
-                },
-            ]
-            assert.deepStrictEqual(expected, actual)
-        })
-    })
-
-    describe('removeBracketsFromRightContext', function () {
-        afterEach(function () {
-            sinon.restore()
-        })
-        it('Should remove the brackets from corresponding index', async function () {
-            const mockEditor = createMockTextEditor()
-            const mockPosition = new Position(0, 0)
-            const mockIdx = [0, 1]
-
-            const loggerSpy = sinon.spy(getLogger(), 'info')
-            await removeBracketsFromRightContext(mockEditor, mockIdx, mockPosition)
-            assert.ok(loggerSpy.called)
-            const actual = loggerSpy.getCall(0).args[0]
-            assert.strictEqual(actual, `delete [{"line":0,"character":0},{"line":0,"character":1}]`)
-        })
-    })
-
-    describe('getBracketsToRemove', function () {
-        it('Should return an empty array if there is no extra bracket matched', function () {
-            const actual = getBracketsToRemove('return a+b}', '')
-            assert.ok(actual.length === 0)
-        })
-        it('Should return expected bracket to remove', function () {
-            const actual = getBracketsToRemove('{return a+b}', '}')
-            const expected = [0]
-            assert.deepStrictEqual(actual, expected)
-        })
-        it('Should return expected bracket to remove if there are multiple matches', function () {
-            const actual = getBracketsToRemove(') {return a+b}', '){}')
-            const expected = [0, 1, 2]
-            assert.deepStrictEqual(actual, expected)
-        })
-    })
-})
diff --git a/src/test/codewhisperer/util/commonUtil.test.ts b/src/test/codewhisperer/util/commonUtil.test.ts
deleted file mode 100644
index 432599207d0..00000000000
--- a/src/test/codewhisperer/util/commonUtil.test.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { getPrefixSuffixOverlap } from '../../../codewhisperer/util/commonUtil'
-
-describe('commonUtil', function () {
-    describe('getPrefixSuffixOverlap', function () {
-        it('Should return correct overlap', async function () {
-            assert.strictEqual(getPrefixSuffixOverlap('32rasdgvdsg', 'sg462ydfgbs'), `sg`)
-            assert.strictEqual(getPrefixSuffixOverlap('32rasdgbreh', 'brehsega'), `breh`)
-            assert.strictEqual(getPrefixSuffixOverlap('42y24hsd', '42y24hsdzqq23'), `42y24hsd`)
-            assert.strictEqual(getPrefixSuffixOverlap('ge23yt1', 'ge23yt1'), `ge23yt1`)
-            assert.strictEqual(getPrefixSuffixOverlap('1sgdbsfbwsergsa', 'a1sgdbsfbwsergs'), `a`)
-            assert.strictEqual(getPrefixSuffixOverlap('xxa', 'xa'), `xa`)
-        })
-
-        it('Should return empty overlap for prefix suffix not matching cases', async function () {
-            assert.strictEqual(getPrefixSuffixOverlap('1sgdbsfbwsergsa', '1sgdbsfbwsergs'), ``)
-            assert.strictEqual(getPrefixSuffixOverlap('1sgdbsfbwsergsab', '1sgdbsfbwsergs'), ``)
-            assert.strictEqual(getPrefixSuffixOverlap('2135t12', 'v2135t12'), ``)
-            assert.strictEqual(getPrefixSuffixOverlap('2135t12', 'zv2135t12'), ``)
-            assert.strictEqual(getPrefixSuffixOverlap('xa', 'xxa'), ``)
-        })
-
-        it('Should return empty overlap for empty string input', async function () {
-            assert.strictEqual(getPrefixSuffixOverlap('ergwsghws', ''), ``)
-            assert.strictEqual(getPrefixSuffixOverlap('', 'asfegw4eh'), ``)
-        })
-    })
-})
diff --git a/src/test/codewhisperer/util/dependencyGraph/javaDependencyGraph.test.ts b/src/test/codewhisperer/util/dependencyGraph/javaDependencyGraph.test.ts
deleted file mode 100644
index 8383a698874..00000000000
--- a/src/test/codewhisperer/util/dependencyGraph/javaDependencyGraph.test.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-import * as sinon from 'sinon'
-import * as fs from 'fs'
-import { JavaDependencyGraph } from '../../../../codewhisperer/util/dependencyGraph/javaDependencyGraph'
-import { getTestWorkspaceFolder } from '../../../../integrationTest/integrationTestsUtilities'
-import { join } from 'path'
-import * as CodeWhispererConstants from '../../../../codewhisperer/models/constants'
-
-describe('javaDependencyGraph', function () {
-    const languageId = 'java'
-    const workspaceFolder = getTestWorkspaceFolder()
-    const appRoot = join(workspaceFolder, 'java11-plain-maven-sam-app')
-    const appCodePath = join(appRoot, 'HelloWorldFunction', 'src', 'main', 'java', 'helloworld', 'App.java')
-
-    describe('parseImport', function () {
-        beforeEach(function () {
-            sinon.stub(fs, 'existsSync').returns(true)
-        })
-        afterEach(function () {
-            sinon.restore()
-        })
-        it('Should parse and generate dependencies ', function () {
-            const javaDependencyGraph = new JavaDependencyGraph(languageId)
-            const dependencies = javaDependencyGraph.parseImport(
-                'import com.amazon.aws.vector.consolas.runtimeservice;',
-                ['dirPath1', 'dirPath2']
-            )
-            assert.deepStrictEqual(dependencies, [
-                join('dirPath1', 'com', 'amazon', 'aws', 'vector', 'consolas', 'runtimeservice.java'),
-                join('dirPath2', 'com', 'amazon', 'aws', 'vector', 'consolas', 'runtimeservice.java'),
-            ])
-        })
-    })
-
-    describe('getDependencies', function () {
-        it('Should return expected dependencies', function () {
-            const importStr = 'import java11-plain-maven-sam-app.HelloWorldFunction.src.main.java.helloworld.App;'
-            const javaDependencyGraph = new JavaDependencyGraph(languageId)
-            const dependencies = javaDependencyGraph.getDependencies(vscode.Uri.parse(appRoot), [importStr])
-            assert.strictEqual(dependencies.length, 1)
-            assert.ok(appCodePath.includes(dependencies[0]))
-        })
-    })
-
-    describe('searchDependency', function () {
-        it('Should search dependencies and return expected picked source file', async function () {
-            const javaDependencyGraph = new JavaDependencyGraph(languageId)
-            const sourceFiles = await javaDependencyGraph.searchDependency(vscode.Uri.parse(appCodePath))
-            assert.strictEqual(sourceFiles.size, 1)
-            const [firstFile] = sourceFiles
-            assert.ok(appCodePath.includes(firstFile))
-        })
-    })
-
-    describe('generateTruncation', function () {
-        beforeEach(function () {
-            sinon.stub(JavaDependencyGraph.prototype, <any>'generateBuildFilePaths').returns([appCodePath])
-        })
-        afterEach(function () {
-            sinon.restore()
-        })
-        it('Should generate and return expected truncation', async function () {
-            const javaDependencyGraph = new JavaDependencyGraph(languageId)
-            sinon.stub(javaDependencyGraph, <any>'_outputDirs').value(new Set<string>('build'))
-            const truncation = await javaDependencyGraph.generateTruncation(vscode.Uri.parse(appCodePath))
-            assert.ok(truncation.lines > 0)
-            assert.ok(truncation.root.includes(CodeWhispererConstants.codeScanTruncDirPrefix))
-            assert.ok(truncation.src.size > 0)
-            assert.ok(truncation.src.dir.includes(CodeWhispererConstants.codeScanTruncDirPrefix))
-            assert.ok(truncation.src.zip.includes(CodeWhispererConstants.codeScanTruncDirPrefix))
-        })
-    })
-})
diff --git a/src/test/codewhisperer/util/dependencyGraph/javascriptDependencyGraph.test.ts b/src/test/codewhisperer/util/dependencyGraph/javascriptDependencyGraph.test.ts
deleted file mode 100644
index 89fb273a929..00000000000
--- a/src/test/codewhisperer/util/dependencyGraph/javascriptDependencyGraph.test.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-import * as sinon from 'sinon'
-import * as fs from 'fs'
-import { getTestWorkspaceFolder } from '../../../../integrationTest/integrationTestsUtilities'
-import { join } from 'path'
-import * as CodeWhispererConstants from '../../../../codewhisperer/models/constants'
-import { JavascriptDependencyGraph } from '../../../../codewhisperer/util/dependencyGraph/javascriptDependencyGraph'
-
-describe('javascriptDependencyGraph', function () {
-    const workspaceFolder = getTestWorkspaceFolder()
-    const appRoot = join(workspaceFolder, 'js-plain-sam-app')
-    const appCodePath = join(appRoot, 'src', 'app.js')
-
-    describe('parseImport', function () {
-        beforeEach(function () {
-            sinon.stub(fs, 'existsSync').returns(true)
-        })
-        afterEach(function () {
-            sinon.restore()
-        })
-        it('Should parse and generate dependencies ', function () {
-            const javascriptDependencyGraph = new JavascriptDependencyGraph(CodeWhispererConstants.javascript)
-            const dependencies = javascriptDependencyGraph.parseImport("import * as app from './app'", [
-                'dirPath1',
-                'dirPath2',
-            ])
-            assert.strictEqual(dependencies.length, 2)
-            assert.deepStrictEqual(dependencies, [join('dirPath1', 'app.js'), join('dirPath2', 'app.js')])
-        })
-    })
-
-    describe('getDependencies', function () {
-        it('Should return expected dependencies', function () {
-            const javascriptDependencyGraph = new JavascriptDependencyGraph(CodeWhispererConstants.javascript)
-            const dependencies = javascriptDependencyGraph.getDependencies(vscode.Uri.parse(appCodePath), [
-                "import * as app from './app'",
-            ])
-            assert.strictEqual(dependencies.length, 1)
-            assert.ok(appCodePath.includes(dependencies[0]))
-        })
-    })
-
-    describe('searchDependency', function () {
-        it('Should search dependencies and return expected picked source file', async function () {
-            const javascriptDependencyGraph = new JavascriptDependencyGraph(CodeWhispererConstants.javascript)
-            const sourceFiles = await javascriptDependencyGraph.searchDependency(vscode.Uri.parse(appCodePath))
-            assert.strictEqual(sourceFiles.size, 1)
-            const [firstFile] = sourceFiles
-            assert.ok(appCodePath.includes(firstFile))
-        })
-    })
-
-    describe('generateTruncation', function () {
-        it('Should generate and return expected truncation', async function () {
-            const javascriptDependencyGraph = new JavascriptDependencyGraph(CodeWhispererConstants.javascript)
-            const truncation = await javascriptDependencyGraph.generateTruncation(vscode.Uri.file(appCodePath))
-            assert.ok(truncation.root.includes(CodeWhispererConstants.codeScanTruncDirPrefix))
-            assert.ok(truncation.src.dir.includes(CodeWhispererConstants.codeScanTruncDirPrefix))
-            assert.ok(truncation.src.zip.includes(CodeWhispererConstants.codeScanTruncDirPrefix))
-            assert.ok(truncation.lines > 0)
-            assert.ok(truncation.src.size > 0)
-        })
-    })
-})
diff --git a/src/test/codewhisperer/util/dependencyGraph/pythonDependencyGraph.test.ts b/src/test/codewhisperer/util/dependencyGraph/pythonDependencyGraph.test.ts
deleted file mode 100644
index bd7074bf42b..00000000000
--- a/src/test/codewhisperer/util/dependencyGraph/pythonDependencyGraph.test.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-import * as sinon from 'sinon'
-import * as fs from 'fs'
-import { PythonDependencyGraph } from '../../../../codewhisperer/util/dependencyGraph/pythonDependencyGraph'
-import { getTestWorkspaceFolder } from '../../../../integrationTest/integrationTestsUtilities'
-import { join } from 'path'
-import * as CodeWhispererConstants from '../../../../codewhisperer/models/constants'
-
-describe('pythonDependencyGraph', function () {
-    const languageId = 'python'
-    const workspaceFolder = getTestWorkspaceFolder()
-    const appRoot = join(workspaceFolder, 'python3.7-plain-sam-app')
-    const appCodePath = join(appRoot, 'hello_world', 'app.py')
-
-    describe('parseImport', function () {
-        beforeEach(function () {
-            sinon.stub(fs, 'existsSync').returns(true)
-        })
-        afterEach(function () {
-            sinon.restore()
-        })
-        it('Should parse and generate dependencies ', function () {
-            const pythonDependencyGraph = new PythonDependencyGraph(languageId)
-            const dependencies = pythonDependencyGraph.parseImport('from example import test', ['dirPath1', 'dirPath2'])
-            assert.strictEqual(dependencies.length, 4)
-            assert.deepStrictEqual(dependencies, [
-                join('dirPath1', 'example.py'),
-                join('dirPath1', 'example', 'test.py'),
-                join('dirPath2', 'example.py'),
-                join('dirPath2', 'example', 'test.py'),
-            ])
-        })
-    })
-
-    describe('getDependencies', function () {
-        it('Should return expected dependencies', function () {
-            const pythonDependencyGraph = new PythonDependencyGraph(languageId)
-            const dependencies = pythonDependencyGraph.getDependencies(vscode.Uri.parse(appCodePath), ['import app'])
-            assert.strictEqual(dependencies.length, 1)
-            assert.ok(appCodePath.includes(dependencies[0]))
-        })
-    })
-
-    describe('searchDependency', function () {
-        it('Should search dependencies and return expected picked source file', async function () {
-            const pythonDependencyGraph = new PythonDependencyGraph(languageId)
-            const sourceFiles = await pythonDependencyGraph.searchDependency(vscode.Uri.parse(appCodePath))
-            assert.strictEqual(sourceFiles.size, 1)
-            const [firstFile] = sourceFiles
-            assert.ok(appCodePath.includes(firstFile))
-        })
-    })
-
-    describe('generateTruncation', function () {
-        it('Should generate and return expected truncation', async function () {
-            const pythonDependencyGraph = new PythonDependencyGraph(languageId)
-            const truncation = await pythonDependencyGraph.generateTruncation(vscode.Uri.file(appCodePath))
-            assert.ok(truncation.root.includes(CodeWhispererConstants.codeScanTruncDirPrefix))
-            assert.ok(truncation.src.dir.includes(CodeWhispererConstants.codeScanTruncDirPrefix))
-            assert.ok(truncation.src.zip.includes(CodeWhispererConstants.codeScanTruncDirPrefix))
-            assert.ok(truncation.lines > 0)
-            assert.ok(truncation.src.size > 0)
-        })
-    })
-})
diff --git a/src/test/codewhisperer/util/editorContext.test.ts b/src/test/codewhisperer/util/editorContext.test.ts
deleted file mode 100644
index 81ae85b5939..00000000000
--- a/src/test/codewhisperer/util/editorContext.test.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as codewhispererClient from '../../../codewhisperer/client/codewhisperer'
-import * as EditorContext from '../../../codewhisperer/util/editorContext'
-import { createMockTextEditor, createMockClientRequest, resetCodeWhispererGlobalVariables } from '../testUtil'
-
-describe('editorContext', function () {
-    beforeEach(function () {
-        resetCodeWhispererGlobalVariables()
-    })
-    describe('extractContextForCodeWhisperer', function () {
-        it('Should return expected context', function () {
-            const editor = createMockTextEditor('import math\ndef two_sum(nums, target):\n', 'test.py', 'python', 1, 17)
-            const actual = EditorContext.extractContextForCodeWhisperer(editor)
-            const expected: codewhispererClient.FileContext = {
-                filename: 'test.py',
-                programmingLanguage: {
-                    languageName: 'python',
-                },
-                leftFileContent: 'import math\ndef two_sum(nums,',
-                rightFileContent: ' target):\n',
-            }
-            assert.deepStrictEqual(actual, expected)
-        })
-
-        it('Should return expected context within max char limit', function () {
-            const editor = createMockTextEditor(
-                'import math\ndef ' + 'a'.repeat(10340) + 'two_sum(nums, target):\n',
-                'test.py',
-                'python',
-                1,
-                17
-            )
-            const actual = EditorContext.extractContextForCodeWhisperer(editor)
-            const expected: codewhispererClient.FileContext = {
-                filename: 'test.py',
-                programmingLanguage: {
-                    languageName: 'python',
-                },
-                leftFileContent: 'import math\ndef aaaaaaaaaaaaa',
-                rightFileContent: 'a'.repeat(10240),
-            }
-            assert.deepStrictEqual(actual, expected)
-        })
-    })
-
-    describe('getFileName', function () {
-        it('Should return expected filename given a document reading test.py', function () {
-            const editor = createMockTextEditor('', 'test.py', 'python', 1, 17)
-            const actual = EditorContext.getFileName(editor)
-            const expected = 'test.py'
-            assert.strictEqual(actual, expected)
-        })
-
-        it('Should return expected filename for a long filename', function () {
-            const editor = createMockTextEditor('', 'a'.repeat(1500), 'python', 1, 17)
-            const actual = EditorContext.getFileName(editor)
-            const expected = 'a'.repeat(1024)
-            assert.strictEqual(actual, expected)
-        })
-    })
-
-    describe('validateRequest', function () {
-        it('Should return false if request filename.length is invalid', function () {
-            const req = createMockClientRequest()
-            req.fileContext.filename = ''
-            assert.ok(!EditorContext.validateRequest(req))
-        })
-
-        it('Should return false if request programming language is invalid', function () {
-            const req = createMockClientRequest()
-            req.fileContext.programmingLanguage.languageName = ''
-            assert.ok(!EditorContext.validateRequest(req))
-            req.fileContext.programmingLanguage.languageName = 'a'.repeat(200)
-            assert.ok(!EditorContext.validateRequest(req))
-        })
-
-        it('Should return false if request left or right context exceeds max length', function () {
-            const req = createMockClientRequest()
-            req.fileContext.leftFileContent = 'a'.repeat(256000)
-            assert.ok(!EditorContext.validateRequest(req))
-            req.fileContext.leftFileContent = 'a'
-            req.fileContext.rightFileContent = 'a'.repeat(256000)
-            assert.ok(!EditorContext.validateRequest(req))
-        })
-
-        it('Should return true if above conditions are not met', function () {
-            const req = createMockClientRequest()
-            assert.ok(EditorContext.validateRequest(req))
-        })
-    })
-
-    describe('getLeftContext', function () {
-        it('Should return expected left context', function () {
-            const editor = createMockTextEditor('import math\ndef two_sum(nums, target):\n', 'test.py', 'python', 1, 17)
-            const actual = EditorContext.getLeftContext(editor, 1)
-            const expected = '...wo_sum(nums, target)'
-            assert.strictEqual(actual, expected)
-        })
-    })
-})
diff --git a/src/test/codewhisperer/util/globalStateUtil.test.ts b/src/test/codewhisperer/util/globalStateUtil.test.ts
deleted file mode 100644
index 2adc354e2e2..00000000000
--- a/src/test/codewhisperer/util/globalStateUtil.test.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as sinon from 'sinon'
-import { vsCodeState } from '../../../codewhisperer/models/model'
-import { resetIntelliSenseState } from '../../../codewhisperer/util/globalStateUtil'
-import { resetCodeWhispererGlobalVariables } from '../testUtil'
-import { getLogger } from '../../../shared/logger/logger'
-
-describe('globalStateUtil', function () {
-    let loggerSpy: sinon.SinonSpy
-
-    beforeEach(function () {
-        resetCodeWhispererGlobalVariables()
-        vsCodeState.isIntelliSenseActive = true
-        loggerSpy = sinon.spy(getLogger(), 'info')
-    })
-
-    this.afterEach(function () {
-        sinon.restore()
-    })
-
-    it('Should skip when CodeWhisperer is turned off', async function () {
-        const isManualTriggerEnabled = false
-        const isAutomatedTriggerEnabled = false
-        resetIntelliSenseState(isManualTriggerEnabled, isAutomatedTriggerEnabled, true)
-        assert.ok(!loggerSpy.called)
-    })
-
-    it('Should skip when invocationContext is not active', async function () {
-        vsCodeState.isIntelliSenseActive = false
-        resetIntelliSenseState(false, false, true)
-        assert.ok(!loggerSpy.called)
-    })
-
-    it('Should skip when no valid recommendations', async function () {
-        resetIntelliSenseState(true, true, false)
-        assert.ok(!loggerSpy.called)
-    })
-})
diff --git a/src/test/codewhisperer/util/runtimeLanguageContext.test.ts b/src/test/codewhisperer/util/runtimeLanguageContext.test.ts
deleted file mode 100644
index 9b8b864eb86..00000000000
--- a/src/test/codewhisperer/util/runtimeLanguageContext.test.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { resetCodeWhispererGlobalVariables } from '../testUtil'
-import { runtimeLanguageContext, RuntimeLanguageContext } from '../../../codewhisperer/util/runtimeLanguageContext'
-import * as codewhispererClient from '../../../codewhisperer/client/codewhispererclient'
-
-describe('runtimeLanguageContext', function () {
-    const languageContext = new RuntimeLanguageContext()
-
-    describe('test isLanguageSupported', function () {
-        const cases: [string, boolean][] = [
-            ['java', true],
-            ['javascript', true],
-            ['typescript', true],
-            ['jsx', true],
-            ['javascriptreact', true],
-            ['typescriptreact', true],
-            ['tsx', true],
-            ['csharp', true],
-            ['python', true],
-            ['ruby', false],
-            ['plaintext', false],
-            ['cpp', false],
-        ]
-
-        beforeEach(function () {
-            resetCodeWhispererGlobalVariables()
-        })
-
-        cases.forEach(tuple => {
-            const languageId = tuple[0]
-            const expected = tuple[1]
-
-            it(`should ${expected ? '' : 'not'} support ${languageId}`, function () {
-                const actual = languageContext.isLanguageSupported(languageId)
-                assert.strictEqual(actual, expected)
-            })
-        })
-    })
-
-    describe('test getLanguageContext', function () {
-        const cases = [
-            ['java', 'java'],
-            ['python', 'python'],
-            ['javascript', 'javascript'],
-            ['typescript', 'typescript'],
-            ['javascriptreact', 'jsx'],
-            ['typescriptreact', 'tsx'],
-            ['csharp', 'csharp'],
-            ['plaintext', 'plaintext'],
-            ['ruby', 'plaintext'],
-            ['cpp', 'plaintext'],
-            ['c', 'plaintext'],
-            [undefined, 'plaintext'],
-        ]
-
-        cases.forEach(tuple => {
-            const vscLanguageId = tuple[0]
-            const expectedCwsprLanguageId = tuple[1]
-            it(`given vscLanguage ${vscLanguageId} should return ${expectedCwsprLanguageId}`, function () {
-                const result = runtimeLanguageContext.getLanguageContext(vscLanguageId)
-                assert.strictEqual(result.language as string, expectedCwsprLanguageId)
-            })
-        })
-    })
-
-    describe('mapVscLanguageToCodeWhispererLanguage', function () {
-        const cases = [
-            [undefined, undefined],
-            ['typescript', 'typescript'],
-            ['javascriptreact', 'jsx'],
-            ['typescriptreact', 'tsx'],
-            ['csharp', 'csharp'],
-            ['go', undefined],
-            ['java', 'java'],
-            ['javascript', 'javascript'],
-            ['python', 'python'],
-            ['c', undefined],
-            ['cpp', undefined],
-        ]
-
-        beforeEach(function () {
-            resetCodeWhispererGlobalVariables()
-        })
-
-        for (const [languageId, expected] of cases) {
-            it(`should return ${expected} if languageId is ${languageId}`, function () {
-                const actual = languageContext.mapVscLanguageToCodeWhispererLanguage(languageId)
-                assert.strictEqual(actual, expected)
-            })
-        }
-    })
-
-    // for now we will only jsx mapped to javascript, tsx mapped to typescript, all other language should remain the same
-    describe('test covertCwsprRequest', function () {
-        const leftFileContent = 'left'
-        const rightFileContent = 'right'
-        const filename = 'test'
-        const cases: [originalLanguage: string, mappedLanguage: string][] = [
-            ['java', 'java'],
-            ['python', 'python'],
-            ['javascript', 'javascript'],
-            ['jsx', 'javascript'],
-            ['typescript', 'typescript'],
-            ['tsx', 'typescript'],
-            ['csharp', 'csharp'],
-            ['plaintext', 'plaintext'],
-            ['arbitrary string', 'arbitrary string'],
-        ]
-
-        this.beforeEach(function () {
-            resetCodeWhispererGlobalVariables()
-        })
-
-        for (const [originalLanguage, mappedLanguage] of cases) {
-            it(`convert ListRecommendationRequest - ${originalLanguage} should map to ${mappedLanguage}`, function () {
-                const originalRequest: codewhispererClient.ListRecommendationsRequest = {
-                    fileContext: {
-                        leftFileContent: leftFileContent,
-                        rightFileContent: rightFileContent,
-                        filename: filename,
-                        programmingLanguage: { languageName: originalLanguage },
-                    },
-                    maxResults: 1,
-                    nextToken: 'token',
-                }
-                const actual = languageContext.mapToRuntimeLanguage(originalRequest)
-                const expected: codewhispererClient.ListRecommendationsRequest = {
-                    ...originalRequest,
-                    fileContext: {
-                        ...originalRequest.fileContext,
-                        programmingLanguage: { languageName: mappedLanguage },
-                    },
-                }
-                assert.deepStrictEqual(actual, expected)
-            })
-
-            it(`convert GenerateRecommendationsRequest - ${originalLanguage} should map to ${mappedLanguage}`, function () {
-                const originalRequest: codewhispererClient.GenerateRecommendationsRequest = {
-                    fileContext: {
-                        leftFileContent: leftFileContent,
-                        rightFileContent: rightFileContent,
-                        filename: filename,
-                        programmingLanguage: { languageName: originalLanguage },
-                    },
-                    maxResults: 1,
-                }
-                const actual = languageContext.mapToRuntimeLanguage(originalRequest)
-                const expected: codewhispererClient.GenerateRecommendationsRequest = {
-                    ...originalRequest,
-                    fileContext: {
-                        ...originalRequest.fileContext,
-                        programmingLanguage: { languageName: mappedLanguage },
-                    },
-                }
-                assert.deepStrictEqual(actual, expected)
-            })
-        }
-    })
-})
diff --git a/src/test/codewhisperer/util/telemetryHelper.test.ts b/src/test/codewhisperer/util/telemetryHelper.test.ts
deleted file mode 100644
index 9d0a83a47d6..00000000000
--- a/src/test/codewhisperer/util/telemetryHelper.test.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { assertTelemetryCurried } from '../../testUtil'
-import { resetCodeWhispererGlobalVariables } from '../testUtil'
-import { TelemetryHelper } from '../../../codewhisperer/util/telemetryHelper'
-
-describe('telemetryHelper', function () {
-    describe('getSuggestionState', function () {
-        let telemetryHelper = new TelemetryHelper()
-        beforeEach(function () {
-            resetCodeWhispererGlobalVariables()
-            telemetryHelper = new TelemetryHelper()
-        })
-
-        it('user event is discard when recommendation state is Discarded with accept index = -1', function () {
-            const actual = telemetryHelper.getSuggestionState(0, -1, new Map([[0, 'Discard']]))
-            assert.strictEqual(actual, 'Discard')
-        })
-
-        it('user event is reject when recommendation state is Showed with accept index = -1', function () {
-            const actual = telemetryHelper.getSuggestionState(0, -1, new Map([[0, 'Showed']]))
-            assert.strictEqual(actual, 'Reject')
-        })
-
-        it('user event is Accept when recommendation state is Showed with accept index matches', function () {
-            const actual = telemetryHelper.getSuggestionState(0, 0, new Map([[0, 'Showed']]))
-            assert.strictEqual(actual, 'Accept')
-        })
-
-        it('user event is Ignore when recommendation state is Showed with accept index does not match', function () {
-            const actual = telemetryHelper.getSuggestionState(0, 1, new Map([[0, 'Showed']]))
-            assert.strictEqual(actual, 'Ignore')
-        })
-
-        it('user event is Unseen when recommendation state is not Showed, is not Unseen when recommendation is showed', function () {
-            const actual0 = telemetryHelper.getSuggestionState(0, 1, new Map([[1, 'Showed']]))
-            assert.strictEqual(actual0, 'Unseen')
-            const actual1 = telemetryHelper.getSuggestionState(1, 1, new Map([[1, 'Showed']]))
-            assert.strictEqual(actual1, 'Accept')
-        })
-
-        it('user event is Filter when recommendation state is Filter', function () {
-            const actual = telemetryHelper.getSuggestionState(0, 1, new Map([[0, 'Filter']]))
-            assert.strictEqual(actual, 'Filter')
-        })
-
-        it('user event is Empty when recommendation state is Empty', function () {
-            const actual = telemetryHelper.getSuggestionState(0, 1, new Map([[0, 'Empty']]))
-            assert.strictEqual(actual, 'Empty')
-        })
-    })
-
-    describe('recordUserDecisionTelemetry', function () {
-        beforeEach(function () {
-            resetCodeWhispererGlobalVariables()
-        })
-        it('Should call telemetry record for each recommendations with proper arguments', async function () {
-            const telemetryHelper = new TelemetryHelper()
-            const response = [{ content: "print('Hello')" }]
-            const requestId = 'test_x'
-            const sessionId = 'test_x'
-            telemetryHelper.completionType = 'Line'
-            telemetryHelper.triggerType = 'AutoTrigger'
-            const assertTelemetry = assertTelemetryCurried('codewhisperer_userDecision')
-            const suggestionState = new Map<number, string>([[0, 'Showed']])
-            telemetryHelper.recordUserDecisionTelemetry(requestId, sessionId, response, 0, 'python', 0, suggestionState)
-            assertTelemetry({
-                codewhispererRequestId: 'test_x',
-                codewhispererSessionId: 'test_x',
-                codewhispererPaginationProgress: 0,
-                codewhispererTriggerType: 'AutoTrigger',
-                codewhispererSuggestionIndex: 0,
-                codewhispererSuggestionState: 'Accept',
-                codewhispererSuggestionReferenceCount: 0,
-                codewhispererCompletionType: 'Line',
-                codewhispererLanguage: 'python',
-            })
-        })
-    })
-})
diff --git a/src/test/credentials/auth.test.ts b/src/test/credentials/auth.test.ts
deleted file mode 100644
index 584611536a2..00000000000
--- a/src/test/credentials/auth.test.ts
+++ /dev/null
@@ -1,252 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as sinon from 'sinon'
-import * as vscode from 'vscode'
-import { Auth, AuthNode, getSsoProfileKey, ProfileStore, SsoConnection, SsoProfile } from '../../credentials/auth'
-import { CredentialsProviderManager } from '../../credentials/providers/credentialsProviderManager'
-import { SsoClient } from '../../credentials/sso/clients'
-import { SsoToken } from '../../credentials/sso/model'
-import { SsoAccessTokenProvider } from '../../credentials/sso/ssoAccessTokenProvider'
-import { ToolkitError } from '../../shared/errors'
-import { FakeMemento } from '../fakeExtensionContext'
-import { assertTreeItem } from '../shared/treeview/testUtil'
-import { createTestWindow } from '../shared/vscode/window'
-import { captureEvent } from '../testUtil'
-import { stub } from '../utilities/stubber'
-
-function createSsoProfile(props?: Partial<Omit<SsoProfile, 'type'>>): SsoProfile {
-    return {
-        type: 'sso',
-        ssoRegion: 'us-east-1',
-        startUrl: 'https://d-0123456789.awsapps.com/start',
-        ...props,
-    }
-}
-
-const ssoProfile = createSsoProfile()
-const scopedSsoProfile = createSsoProfile({ scopes: ['foo'] })
-
-describe('Auth', function () {
-    const tokenProviders = new Map<string, ReturnType<typeof createTestTokenProvider>>()
-
-    function createTestTokenProvider() {
-        let token: SsoToken | undefined
-        const provider = stub(SsoAccessTokenProvider)
-        provider.getToken.callsFake(async () => token)
-        provider.createToken.callsFake(
-            async () => (token = { accessToken: '123', expiresAt: new Date(Date.now() + 1000000) })
-        )
-        provider.invalidate.callsFake(async () => (token = undefined))
-
-        return provider
-    }
-
-    function getTestTokenProvider(...[profile]: ConstructorParameters<typeof SsoAccessTokenProvider>) {
-        const key = getSsoProfileKey(profile)
-        const cachedProvider = tokenProviders.get(key)
-        if (cachedProvider !== undefined) {
-            return cachedProvider
-        }
-
-        const provider = createTestTokenProvider()
-        tokenProviders.set(key, provider)
-
-        return provider
-    }
-
-    async function invalidateConnection(profile: SsoProfile) {
-        const provider = tokenProviders.get(getSsoProfileKey(profile))
-        await provider?.invalidate()
-
-        return provider
-    }
-
-    async function setupInvalidSsoConnection(auth: Auth, profile: SsoProfile) {
-        const conn = await auth.createConnection(profile)
-        await invalidateConnection(profile)
-
-        return conn
-    }
-
-    let auth: Auth
-    let store: ProfileStore
-
-    afterEach(function () {
-        tokenProviders.clear()
-        sinon.restore()
-    })
-
-    beforeEach(function () {
-        store = new ProfileStore(new FakeMemento())
-        auth = new Auth(store, getTestTokenProvider, new CredentialsProviderManager())
-
-        sinon.replace(SsoClient, 'create', () => {
-            const s = stub(SsoClient)
-            s.logout.resolves()
-
-            return s
-        })
-    })
-
-    it('can create a new sso connection', async function () {
-        const conn = await auth.createConnection(ssoProfile)
-        assert.strictEqual(conn.type, 'sso')
-    })
-
-    it('can list connections', async function () {
-        const conn1 = await auth.createConnection(ssoProfile)
-        const conn2 = await auth.createConnection(scopedSsoProfile)
-        assert.deepStrictEqual(
-            (await auth.listConnections()).map(c => c.id),
-            [conn1.id, conn2.id]
-        )
-    })
-
-    it('can get a connection', async function () {
-        const conn = await auth.createConnection(ssoProfile)
-        assert.ok(await auth.getConnection({ id: conn.id }))
-    })
-
-    it('can delete a connection', async function () {
-        const conn = await auth.createConnection(ssoProfile)
-        await auth.deleteConnection({ id: conn.id })
-        assert.strictEqual((await auth.listConnections()).length, 0)
-    })
-
-    it('can delete an active connection', async function () {
-        const conn = await auth.createConnection(ssoProfile)
-        await auth.useConnection(conn)
-        assert.ok(auth.activeConnection)
-        await auth.deleteConnection(auth.activeConnection)
-        assert.strictEqual((await auth.listConnections()).length, 0)
-        assert.strictEqual(auth.activeConnection, undefined)
-    })
-
-    it('throws when creating a duplicate connection', async function () {
-        await auth.createConnection(ssoProfile)
-        await assert.rejects(() => auth.createConnection(ssoProfile))
-    })
-
-    it('throws when using an invalid connection that was deleted', async function () {
-        const conn = await setupInvalidSsoConnection(auth, ssoProfile)
-        await auth.deleteConnection(conn)
-        await assert.rejects(() => conn.getToken())
-    })
-
-    it('can logout and fires an event', async function () {
-        const conn = await auth.createConnection(ssoProfile)
-        const events = captureEvent(auth.onDidChangeActiveConnection)
-        await auth.useConnection(conn)
-        assert.strictEqual(auth.activeConnection?.id, conn.id)
-        await auth.logout()
-        assert.strictEqual(auth.activeConnection, undefined)
-        assert.strictEqual(events.last, undefined)
-    })
-
-    describe('useConnection', function () {
-        it('does not reauthenticate if the connection is invalid', async function () {
-            const conn = await setupInvalidSsoConnection(auth, ssoProfile)
-            await auth.useConnection(conn)
-            assert.strictEqual(auth.activeConnection?.state, 'invalid')
-        })
-
-        it('fires an event', async function () {
-            const conn = await auth.createConnection(ssoProfile)
-            const events = captureEvent(auth.onDidChangeActiveConnection)
-            await auth.useConnection(conn)
-            assert.strictEqual(events.emits[0]?.id, conn.id)
-        })
-    })
-
-    it('can login and fires an event', async function () {
-        const conn = await auth.createConnection(ssoProfile)
-        const events = captureEvent(auth.onDidChangeActiveConnection)
-        await auth.useConnection(conn)
-        assert.strictEqual(auth.activeConnection?.id, conn.id)
-        assert.strictEqual(auth.activeConnection.state, 'valid')
-        assert.strictEqual(events.emits[0]?.id, conn.id)
-    })
-
-    it('uses the persisted connection if available (valid)', async function () {
-        const conn = await auth.createConnection(ssoProfile)
-        await store.setCurrentProfileId(conn.id)
-        await auth.restorePreviousSession()
-        assert.strictEqual(auth.activeConnection?.state, 'valid')
-    })
-
-    it('uses the persisted connection if available (invalid)', async function () {
-        const conn = await setupInvalidSsoConnection(auth, ssoProfile)
-        tokenProviders.get(getSsoProfileKey(ssoProfile))?.getToken.resolves(undefined)
-        await store.setCurrentProfileId(conn.id)
-        await auth.restorePreviousSession()
-        assert.strictEqual(auth.activeConnection?.state, 'invalid')
-    })
-
-    describe('SSO Connections', function () {
-        async function runExpiredGetTokenFlow(conn: SsoConnection, selection: string | RegExp) {
-            const testWindow = createTestWindow()
-            sinon.replace(vscode, 'window', testWindow)
-
-            const token = conn.getToken()
-            const message = await testWindow.waitForMessage(/connection is invalid or expired/i)
-            message.selectItem(selection)
-
-            return token
-        }
-
-        it('creates a new token if one does not exist', async function () {
-            const conn = await auth.createConnection(ssoProfile)
-            const provider = tokenProviders.get(getSsoProfileKey(ssoProfile))
-            assert.deepStrictEqual(await provider?.getToken(), await conn.getToken())
-        })
-
-        it('prompts the user if the token is invalid or expired', async function () {
-            const conn = await setupInvalidSsoConnection(auth, ssoProfile)
-            const token = await runExpiredGetTokenFlow(conn, /yes/i)
-            assert.notStrictEqual(token, undefined)
-        })
-
-        it('using the connection lazily updates the state', async function () {
-            const conn = await auth.createConnection(ssoProfile)
-            await auth.useConnection(conn)
-            await invalidateConnection(ssoProfile)
-
-            const token = runExpiredGetTokenFlow(conn, /no/i)
-            await assert.rejects(token, ToolkitError)
-
-            assert.strictEqual(auth.activeConnection?.state, 'invalid')
-        })
-    })
-
-    describe('AuthNode', function () {
-        it('shows a message to create a connection if no connections exist', async function () {
-            const node = new AuthNode(auth)
-            await assertTreeItem(node, { label: 'Connect to AWS to Get Started...' })
-        })
-
-        it('shows a login message if not connected', async function () {
-            await auth.createConnection(ssoProfile)
-            const node = new AuthNode(auth)
-            await assertTreeItem(node, { label: 'Select a connection...' })
-        })
-
-        it('shows the connection if valid', async function () {
-            const node = new AuthNode(auth)
-            const conn = await auth.createConnection(ssoProfile)
-            await auth.useConnection(conn)
-            await assertTreeItem(node, { label: `Connected with ${conn.label}` })
-        })
-
-        it('shows an error if the connection is invalid', async function () {
-            const node = new AuthNode(auth)
-            const conn = await setupInvalidSsoConnection(auth, ssoProfile)
-            tokenProviders.get(getSsoProfileKey(ssoProfile))?.getToken.resolves(undefined)
-            await auth.useConnection(conn)
-            await assertTreeItem(node, { description: 'expired or invalid, click to authenticate' })
-        })
-    })
-})
diff --git a/src/test/credentials/awsCredentialsStatusBarItem.test.ts b/src/test/credentials/awsCredentialsStatusBarItem.test.ts
deleted file mode 100644
index 4b7ae7e9499..00000000000
--- a/src/test/credentials/awsCredentialsStatusBarItem.test.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-import * as FakeTimers from '@sinonjs/fake-timers'
-import { updateCredentialsStatusBarItem } from '../../credentials/awsCredentialsStatusBarItem'
-import { installFakeClock, tickPromise } from '../testUtil'
-
-describe('updateCredentialsStatusBarItem', async function () {
-    let statusBarItem: vscode.StatusBarItem
-    let clock: FakeTimers.InstalledClock
-
-    before(function () {
-        clock = installFakeClock()
-    })
-
-    after(function () {
-        clock.uninstall()
-    })
-
-    beforeEach(async function () {
-        statusBarItem = {
-            text: '',
-        } as any as vscode.StatusBarItem
-    })
-
-    it('updates text with credentials id', async function () {
-        const credentialId = 'qwerty'
-
-        await tickPromise(updateCredentialsStatusBarItem(statusBarItem, credentialId), clock, 2000)
-        assert.ok(
-            statusBarItem.text.includes(credentialId),
-            'expected statusbar item text to contain the credentials id'
-        )
-    })
-
-    it('updates text with placeholder when there is no credentials id', async function () {
-        await tickPromise(updateCredentialsStatusBarItem(statusBarItem, undefined), clock, 2000)
-        assert(statusBarItem.tooltip)
-        assert.deepStrictEqual(statusBarItem.tooltip, 'Click to connect to AWS')
-    })
-})
diff --git a/src/test/credentials/provider/ec2CredentialsProvider.test.ts b/src/test/credentials/provider/ec2CredentialsProvider.test.ts
deleted file mode 100644
index 8a1b609c5c2..00000000000
--- a/src/test/credentials/provider/ec2CredentialsProvider.test.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { Ec2MetadataClient, IamInfo, InstanceIdentity } from '../../../shared/clients/ec2MetadataClient'
-import { Ec2CredentialsProvider } from '../../../credentials/providers/ec2CredentialsProvider'
-import { instance, mock, verify, when } from '../../utilities/mockito'
-
-describe('Ec2CredentialsProvider', function () {
-    const dummyRegion = 'dummmyRegion'
-
-    const mockIdentity = {
-        region: dummyRegion,
-    } as InstanceIdentity
-
-    let mockMetadata: Ec2MetadataClient
-    let credentialsProvider: Ec2CredentialsProvider
-
-    beforeEach(function () {
-        mockMetadata = mock()
-        credentialsProvider = new Ec2CredentialsProvider(instance(mockMetadata))
-    })
-
-    it('is valid if EC2 metadata service resolves valid IAM status', async function () {
-        mockClient({
-            identity: {} as InstanceIdentity,
-            validIam: true,
-        })
-        assert.strictEqual(await credentialsProvider.isAvailable(), true)
-    })
-
-    it('is invalid if EC2 metadata resolves invalid IAM status', async function () {
-        mockClient({
-            validIam: false,
-        })
-        assert.strictEqual(await credentialsProvider.isAvailable(), false)
-    })
-
-    it('is invalid if EC2 metadata service fails to resolve', async function () {
-        mockClient({
-            fail: true,
-        })
-        assert.strictEqual(await credentialsProvider.isAvailable(), false)
-    })
-
-    it('only validates once per instance', async function () {
-        mockClient({
-            identity: mockIdentity,
-            validIam: true,
-        })
-        await credentialsProvider.isAvailable()
-        await credentialsProvider.isAvailable()
-        verify(mockMetadata.getIamInfo()).once()
-    })
-
-    it('returns EC2 retrieved region if available', async function () {
-        mockClient({
-            identity: mockIdentity,
-            validIam: true,
-        })
-
-        await credentialsProvider.isAvailable()
-        assert.strictEqual(credentialsProvider.getDefaultRegion(), dummyRegion)
-    })
-
-    it('returns undefined region when not available', async function () {
-        mockClient({
-            identity: {} as InstanceIdentity,
-            validIam: true,
-        })
-
-        await credentialsProvider.isAvailable()
-        assert.strictEqual(credentialsProvider.getDefaultRegion(), undefined)
-    })
-
-    function mockClient(opts: { fail?: boolean; identity?: InstanceIdentity; validIam?: boolean }) {
-        if (opts.fail) {
-            when(mockMetadata.getInstanceIdentity()).thenReject(new Error('foo'))
-        } else if (opts.identity) {
-            when(mockMetadata.getInstanceIdentity()).thenResolve(opts.identity)
-        }
-
-        const mockIamInfo = {
-            Code: opts.validIam ? 'Success' : 'Failure',
-        } as IamInfo
-        when(mockMetadata.getIamInfo()).thenResolve(mockIamInfo)
-    }
-})
diff --git a/src/test/credentials/provider/sharedCredentialsProvider.test.ts b/src/test/credentials/provider/sharedCredentialsProvider.test.ts
deleted file mode 100644
index e9437d33d52..00000000000
--- a/src/test/credentials/provider/sharedCredentialsProvider.test.ts
+++ /dev/null
@@ -1,332 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as FakeTimers from '@sinonjs/fake-timers'
-import * as sinon from 'sinon'
-import { SharedCredentialsProvider } from '../../../credentials/providers/sharedCredentialsProvider'
-import { Profile } from '../../../shared/credentials/credentialsFile'
-import { stripUndefined } from '../../../shared/utilities/collectionUtils'
-import * as process from '@aws-sdk/credential-provider-process'
-import { ParsedIniData } from '@aws-sdk/shared-ini-file-loader'
-import { installFakeClock } from '../../testUtil'
-
-const missingPropertiesFragment = 'missing properties'
-
-describe('SharedCredentialsProvider', async function () {
-    let clock: FakeTimers.InstalledClock
-    let sandbox: sinon.SinonSandbox
-
-    before(function () {
-        sandbox = sinon.createSandbox()
-        clock = installFakeClock()
-    })
-
-    after(function () {
-        clock.uninstall()
-    })
-
-    afterEach(function () {
-        clock.reset()
-        sandbox.restore()
-    })
-
-    it('constructor fails if profile does not exist', async function () {
-        assert.throws(() => {
-            // @ts-ignore - sut is unused, we expect the constructor to throw
-            const sut = new SharedCredentialsProvider(
-                'some-other-profile',
-                new Map<string, Profile>([['default', { aws_access_key_id: 'x', aws_secret_access_key: 'y' }]])
-            )
-        })
-    })
-
-    it('produces a CredentialsProviderId', async function () {
-        const sut = new SharedCredentialsProvider(
-            'default',
-            new Map<string, Profile>([['default', { aws_access_key_id: 'x', aws_secret_access_key: 'y' }]])
-        )
-
-        assert.deepStrictEqual(sut.getCredentialsId(), {
-            credentialSource: 'profile',
-            credentialTypeId: 'default',
-        })
-    })
-
-    it('gets profile properties', async function () {
-        const sut = new SharedCredentialsProvider(
-            'default',
-            new Map<string, Profile>([
-                ['default', { aws_access_key_id: 'x', aws_secret_access_key: 'y', region: 'foo' }],
-            ])
-        )
-
-        assert.strictEqual(sut.getDefaultRegion(), 'foo')
-        assert.strictEqual(await sut.canAutoConnect(), true)
-    })
-
-    it('profile properties may be undefined', async function () {
-        const sut = new SharedCredentialsProvider(
-            'default',
-            new Map<string, Profile>([['default', { aws_access_key_id: 'x', aws_secret_access_key: 'y' }]])
-        )
-
-        assert.strictEqual(sut.getDefaultRegion(), undefined)
-    })
-
-    it('validation identifies a source_profile reference that does not exist', async function () {
-        const sut = new SharedCredentialsProvider(
-            'default',
-            new Map<string, Profile>([['default', { role_arn: 'x', source_profile: 'fakeprofile' }]])
-        )
-
-        assert.notStrictEqual(sut.validate(), undefined)
-        assertSubstringsInText(sut.validate(), 'not found')
-    })
-
-    it('validation identifies a source_profile reference cycle', async function () {
-        const sut = new SharedCredentialsProvider(
-            'profileA',
-            new Map<string, Profile>([
-                ['profileA', { role_arn: 'x', source_profile: 'profileB' }],
-                ['profileB', { role_arn: 'x', source_profile: 'profileC' }],
-                ['profileC', { role_arn: 'x', source_profile: 'profileA' }],
-            ])
-        )
-
-        assert.notStrictEqual(sut.validate(), undefined)
-        assertSubstringsInText(sut.validate(), 'Cycle detected', 'profileA', 'profileB', 'profileC')
-    })
-
-    it('validation identifies when access key id is missing a corresponding secret key', async function () {
-        const sut = new SharedCredentialsProvider(
-            'default',
-            new Map<string, Profile>([['default', { aws_access_key_id: 'x' }]])
-        )
-
-        assert.notStrictEqual(sut.validate(), undefined)
-        assertSubstringsInText(sut.validate(), missingPropertiesFragment, 'aws_secret_access_key')
-    })
-
-    it('validation identifies when session_token is missing a corresponding access key id', async function () {
-        const sut = new SharedCredentialsProvider(
-            'default',
-            new Map<string, Profile>([['default', { aws_secret_access_key: 'y', aws_session_token: 'z' }]])
-        )
-
-        assert.notStrictEqual(sut.validate(), undefined)
-        assertSubstringsInText(sut.validate(), missingPropertiesFragment, 'aws_access_key_id')
-    })
-
-    it('validation identifies when session_token is missing a corresponding secret key', async function () {
-        const sut = new SharedCredentialsProvider(
-            'default',
-            new Map<string, Profile>([['default', { aws_access_key_id: 'x', aws_session_token: 'z' }]])
-        )
-
-        assert.notStrictEqual(sut.validate(), undefined)
-        assertSubstringsInText(sut.validate(), missingPropertiesFragment, 'aws_secret_access_key')
-    })
-
-    it('validation identifies when the profile contains no supported properties', async function () {
-        const sut = new SharedCredentialsProvider(
-            'default',
-            new Map<string, Profile>([['default', { hello: 'world' }]])
-        )
-
-        assert.notStrictEqual(sut.validate(), undefined)
-        assertSubstringsInText(sut.validate(), 'not supported')
-    })
-
-    it('validation identifies an invalid credential_source', async function () {
-        const sut = new SharedCredentialsProvider(
-            'default',
-            new Map<string, Profile>([['default', { credential_source: 'invalidSource' }]])
-        )
-
-        assert.notStrictEqual(sut.validate(), undefined)
-        assertSubstringsInText(sut.validate(), 'is not supported', 'invalidSource')
-    })
-
-    it('validation identifies credential_source and source_profile both set', async function () {
-        const sut = new SharedCredentialsProvider(
-            'default',
-            new Map<string, Profile>([['default', { credential_source: 'EcsContainer', source_profile: 'profile' }]])
-        )
-
-        assert.notStrictEqual(sut.validate(), undefined)
-        assertSubstringsInText(sut.validate(), 'cannot both be set')
-    })
-
-    it('validates a valid profile with an access key', async function () {
-        const sut = new SharedCredentialsProvider(
-            'default',
-            new Map<string, Profile>([['default', { aws_access_key_id: 'x', aws_secret_access_key: 'y' }]])
-        )
-
-        assert.strictEqual(sut.validate(), undefined)
-    })
-
-    it('validates a valid profile with a session token', async function () {
-        const sut = new SharedCredentialsProvider(
-            'default',
-            new Map<string, Profile>([
-                ['default', { aws_access_key_id: 'x', aws_secret_access_key: 'y', aws_session_token: 'z' }],
-            ])
-        )
-
-        assert.strictEqual(sut.validate(), undefined)
-    })
-
-    it('validates a valid profile with credential_process', async function () {
-        const sut = new SharedCredentialsProvider(
-            'default',
-            new Map<string, Profile>([['default', { credential_process: 'x' }]])
-        )
-
-        assert.strictEqual(sut.validate(), undefined)
-    })
-
-    it('validates a valid profile with role_arn', async function () {
-        const sut = new SharedCredentialsProvider('default', new Map<string, Profile>([['default', { role_arn: 'x' }]]))
-
-        assert.strictEqual(sut.validate(), undefined)
-    })
-
-    it('validates a valid profile with role_arn and source_profile', async function () {
-        const sut = new SharedCredentialsProvider(
-            'default',
-            new Map<string, Profile>([
-                ['default', { role_arn: 'x', source_profile: 'B' }],
-                ['B', { aws_access_key_id: 'x', aws_secret_access_key: 'y' }],
-            ])
-        )
-
-        assert.strictEqual(sut.validate(), undefined)
-    })
-
-    it('validates a valid profile with credential_source', async function () {
-        const sut = new SharedCredentialsProvider(
-            'default',
-            new Map<string, Profile>([['default', { credential_source: 'EcsContainer' }]])
-        )
-
-        assert.strictEqual(sut.validate(), undefined)
-    })
-
-    it('isAvailable false when the profile is not valid', async function () {
-        const sut = new SharedCredentialsProvider(
-            'default',
-            new Map<string, Profile>([['default', { aws_access_key_id: 'x' }]])
-        )
-
-        assert.strictEqual(await sut.isAvailable(), false)
-    })
-
-    it('getCredentials throws when unsupported credential source', async function () {
-        const sut = new SharedCredentialsProvider(
-            'default',
-            new Map<string, Profile>([['default', { credential_source: 'Invalid' }]])
-        )
-        try {
-            await sut.getCredentials()
-            assert.fail('expected exception')
-        } catch (err) {}
-    })
-
-    describe('patchSourceCredentials', async function () {
-        let childProfile: { [key: string]: string } = {}
-        let resolvedBaseProfile: { [key: string]: string } = {}
-
-        beforeEach(function () {
-            childProfile = {
-                source_profile: 'base',
-                role_arn: 'testarn',
-            }
-            resolvedBaseProfile = {
-                aws_access_key_id: 'id',
-                aws_secret_access_key: 'secret',
-            }
-        })
-
-        async function assertIniProviderResolves(
-            sut: SharedCredentialsProvider,
-            resolvedProfile: ParsedIniData
-        ): Promise<void> {
-            const makeIni = sandbox.stub(sut as any, 'makeSharedIniFileCredentialsProvider').callsFake(profile => {
-                // The SDK does not care if fields are undefined, but we need to remove them to test
-                stripUndefined(profile)
-                assert.deepStrictEqual(profile, resolvedProfile)
-                return () => Promise.resolve({})
-            })
-
-            await sut.getCredentials()
-            assert.ok(makeIni.calledOnce)
-        }
-
-        it('resolves profile with source_profile as credential_process', async function () {
-            const resolvedProfile = {
-                base: resolvedBaseProfile,
-                child: childProfile,
-            }
-            const sut = new SharedCredentialsProvider(
-                'child',
-                new Map<string, Profile>([
-                    ['base', { credential_process: 'test_process' }],
-                    ['child', { ...childProfile }],
-                ])
-            )
-
-            sandbox.stub(process, 'fromProcess').returns(() =>
-                Promise.resolve({
-                    accessKeyId: resolvedBaseProfile['aws_access_key_id'],
-                    secretAccessKey: resolvedBaseProfile['aws_secret_access_key'],
-                })
-            )
-
-            await assertIniProviderResolves(sut, resolvedProfile)
-        })
-
-        it('resolves profile with source_profile and MFA', async function () {
-            const mfaSerial = 'serial'
-            const resolvedProfile = {
-                base: resolvedBaseProfile,
-                child: {
-                    ...childProfile,
-                    mfa_serial: mfaSerial,
-                },
-            }
-            const sut = new SharedCredentialsProvider(
-                'child',
-                new Map<string, Profile>([
-                    [
-                        'base',
-                        {
-                            credential_process: 'test_process',
-                            mfa_serial: mfaSerial,
-                        },
-                    ],
-                    ['child', { ...childProfile }],
-                ])
-            )
-
-            // We use 'credential_process' here to simulate static credentials since we can't
-            // stub out 'makeSharedIniFileCredentialsProvider' as it is already stubbed
-            sandbox.stub(process, 'fromProcess').returns(() =>
-                Promise.resolve({
-                    accessKeyId: resolvedBaseProfile['aws_access_key_id'],
-                    secretAccessKey: resolvedBaseProfile['aws_secret_access_key'],
-                })
-            )
-
-            await assertIniProviderResolves(sut, resolvedProfile)
-        })
-    })
-})
-
-function assertSubstringsInText(text: string | undefined, ...substrings: string[]) {
-    assert.ok(text)
-    substrings.forEach(substring => assert.notStrictEqual(text!.indexOf(substring), -1))
-}
diff --git a/src/test/credentials/provider/sharedCredentialsProviderFactory.test.ts b/src/test/credentials/provider/sharedCredentialsProviderFactory.test.ts
deleted file mode 100644
index 342ece6c38e..00000000000
--- a/src/test/credentials/provider/sharedCredentialsProviderFactory.test.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as fs from 'fs-extra'
-import * as sinon from 'sinon'
-import { isEqual } from '../../../credentials/providers/credentials'
-import { SharedCredentialsProviderFactory } from '../../../credentials/providers/sharedCredentialsProviderFactory'
-import * as sharedCredentials from '../../../credentials/sharedCredentials'
-import { Profile } from '../../../shared/credentials/credentialsFile'
-
-describe('SharedCredentialsProviderFactory', async function () {
-    let sandbox: sinon.SinonSandbox
-    let loadSharedCredentialsProfilesStub: sinon.SinonStub<[], Promise<Map<string, Profile>>>
-
-    let sharedCredentialsLastModifiedMillis: number
-
-    let sharedCredentialProfiles: Map<string, Profile>
-
-    const validProfile: Profile = {
-        aws_access_key_id: 'x',
-        aws_secret_access_key: 'y',
-    }
-
-    const inValidProfile: Profile = {
-        aws_access_key_id: 'x',
-    }
-
-    const validProfileName1 = 'default'
-    const validProfileName2 = 'alt'
-    const invalidProfileName = 'gary'
-
-    beforeEach(async function () {
-        sandbox = sinon.createSandbox()
-
-        sharedCredentialsLastModifiedMillis = 1
-        sandbox.stub(fs, 'stat').callsFake(async () => {
-            return {
-                mtimeMs: sharedCredentialsLastModifiedMillis,
-            } as any as fs.Stats
-        })
-
-        sharedCredentialProfiles = new Map<string, Profile>()
-        sharedCredentialProfiles.set(validProfileName1, validProfile)
-        sharedCredentialProfiles.set(validProfileName2, validProfile)
-
-        loadSharedCredentialsProfilesStub = sandbox
-            .stub(sharedCredentials, 'loadSharedCredentialsProfiles')
-            .callsFake(async () => sharedCredentialProfiles)
-    })
-
-    afterEach(async function () {
-        sandbox.restore()
-    })
-
-    it('produces credential providers from shared credentials profiles', async function () {
-        const sut = new SharedCredentialsProviderFactory()
-
-        await sut.refresh()
-
-        const providers = sut.listProviders()
-
-        assert.strictEqual(providers.length, 2, 'Expected two providers to be created')
-        assert.ok(
-            providers.find(p =>
-                isEqual(p.getCredentialsId(), {
-                    credentialSource: 'profile',
-                    credentialTypeId: validProfileName1,
-                })
-            ),
-            'Expected to find the first profile'
-        )
-        assert.ok(
-            providers.find(p =>
-                isEqual(p.getCredentialsId(), {
-                    credentialSource: 'profile',
-                    credentialTypeId: validProfileName2,
-                })
-            ),
-
-            'Expected to find the second profile'
-        )
-    })
-
-    it('does not load providers for invalid profiles', async function () {
-        sharedCredentialProfiles.set(invalidProfileName, inValidProfile)
-
-        const sut = new SharedCredentialsProviderFactory()
-
-        await sut.refresh()
-
-        const providers = sut.listProviders()
-
-        assert.strictEqual(providers.length, 2, 'Expected two providers to be created') // the valid ones
-        assert.strictEqual(
-            sut.getProvider({
-                credentialSource: 'profile',
-                credentialTypeId: invalidProfileName,
-            }),
-            undefined
-        )
-    })
-
-    it('refresh does not reload from file if the file has not changed', async function () {
-        const sut = new SharedCredentialsProviderFactory()
-
-        // First load
-        await sut.refresh()
-
-        // Expect: No reload
-        await sut.refresh()
-
-        assert.ok(
-            loadSharedCredentialsProfilesStub.calledOnce,
-            'Credentials should have only been loaded from disk once'
-        )
-    })
-
-    it('refresh reloads from file if the file has changed', async function () {
-        const sut = new SharedCredentialsProviderFactory()
-
-        // First load
-        await sut.refresh()
-
-        // Simulate modifying files
-        sharedCredentialsLastModifiedMillis++
-
-        // Expect: Reload
-        await sut.refresh()
-
-        assert.ok(loadSharedCredentialsProfilesStub.calledTwice, 'Credentials should have been loaded from disk twice')
-    })
-})
diff --git a/src/test/credentials/sso/ssoAccessTokenProvider.test.ts b/src/test/credentials/sso/ssoAccessTokenProvider.test.ts
deleted file mode 100644
index 95cb2d173a0..00000000000
--- a/src/test/credentials/sso/ssoAccessTokenProvider.test.ts
+++ /dev/null
@@ -1,268 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as FakeTimers from '@sinonjs/fake-timers'
-import * as sinon from 'sinon'
-import { SsoAccessTokenProvider } from '../../../credentials/sso/ssoAccessTokenProvider'
-import { installFakeClock } from '../../testUtil'
-import { getCache } from '../../../credentials/sso/cache'
-import * as vscode from 'vscode'
-
-import { instance, mock, when, anything, reset } from '../../utilities/mockito'
-import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../../../shared/filesystemUtilities'
-import { ClientRegistration, SsoToken } from '../../../credentials/sso/model'
-import { OidcClient } from '../../../credentials/sso/clients'
-import { CancellationError } from '../../../shared/utilities/timeoutUtils'
-import { InternalServerException, InvalidClientException, UnauthorizedClientException } from '@aws-sdk/client-sso-oidc'
-
-const hourInMs = 3600000
-
-describe('SsoAccessTokenProvider', function () {
-    const region = 'fakeRegion'
-    const startUrl = 'fakeUrl'
-    const oidcClient = mock(OidcClient)
-
-    let sut: SsoAccessTokenProvider
-    let cache: ReturnType<typeof getCache>
-    let clock: FakeTimers.InstalledClock
-    let tempDir: string
-
-    function createToken(timeDelta: number, extras: Partial<SsoToken> = {}) {
-        return {
-            accessToken: 'dummyAccessToken',
-            expiresAt: new clock.Date(clock.Date.now() + timeDelta),
-            ...extras,
-        }
-    }
-
-    function createRegistration(timeDelta: number, extras: Partial<ClientRegistration> = {}) {
-        return {
-            scopes: [],
-            clientId: 'dummyClientId',
-            clientSecret: 'dummyClientSecret',
-            expiresAt: new clock.Date(clock.Date.now() + timeDelta),
-            ...extras,
-        }
-    }
-
-    function createAuthorization(timeDelta: number) {
-        return {
-            interval: 1,
-            deviceCode: 'dummyCode',
-            verificationUriComplete: 'dummyLink',
-            expiresAt: new clock.Date(clock.Date.now() + timeDelta),
-        }
-    }
-
-    before(function () {
-        clock = installFakeClock()
-    })
-
-    after(function () {
-        clock.uninstall()
-    })
-
-    beforeEach(async function () {
-        tempDir = await makeTemporaryToolkitFolder()
-        cache = getCache(tempDir)
-        sut = new SsoAccessTokenProvider({ region, startUrl }, cache, instance(oidcClient))
-    })
-
-    afterEach(async function () {
-        sinon.restore()
-        clock.reset()
-        reset(oidcClient)
-        await tryRemoveFolder(tempDir)
-    })
-
-    describe('invalidate', function () {
-        it('removes cached tokens and registrations', async function () {
-            const validToken = createToken(hourInMs)
-            await cache.token.save(startUrl, { region, startUrl, token: validToken })
-            await cache.registration.save({ region }, createRegistration(hourInMs))
-            await sut.invalidate()
-
-            assert.strictEqual(await cache.token.load(startUrl), undefined)
-            assert.strictEqual(await cache.registration.load({ region }), undefined)
-        })
-    })
-
-    describe('getToken', function () {
-        it('returns a cached token', async function () {
-            const validToken = createToken(hourInMs)
-            await cache.token.save(startUrl, { region, startUrl, token: validToken })
-
-            assert.deepStrictEqual(await sut.getToken(), validToken)
-        })
-
-        it('invalidates expired tokens', async function () {
-            const expiredToken = createToken(-hourInMs)
-            await cache.token.save(startUrl, { region, startUrl, token: expiredToken })
-            await sut.getToken()
-
-            assert.strictEqual(await cache.token.load(startUrl), undefined)
-        })
-
-        it('returns `undefined` for expired tokens that cannot be refreshed', async function () {
-            const expiredToken = createToken(-hourInMs)
-            await cache.token.save(startUrl, { region, startUrl, token: expiredToken })
-
-            assert.strictEqual(await sut.getToken(), undefined)
-        })
-
-        it('refreshes expired tokens', async function () {
-            const refreshedToken = createToken(hourInMs, { accessToken: 'newToken' })
-            when(oidcClient.createToken(anything())).thenResolve(refreshedToken)
-
-            const refreshableToken = createToken(-hourInMs, { refreshToken: 'refreshToken' })
-            const validRegistation = createRegistration(hourInMs)
-            const access = { region, startUrl, token: refreshableToken, registration: validRegistation }
-            await cache.token.save(startUrl, access)
-            assert.deepStrictEqual(await sut.getToken(), refreshedToken)
-
-            const cachedToken = await cache.token.load(startUrl).then(a => a?.token)
-            assert.deepStrictEqual(cachedToken, refreshedToken)
-        })
-
-        it('does not refresh if missing a client registration', async function () {
-            const refreshableToken = createToken(-hourInMs, { refreshToken: 'refreshToken' })
-            await cache.token.save(startUrl, { region, startUrl, token: refreshableToken })
-
-            assert.strictEqual(await sut.getToken(), undefined)
-
-            const cachedToken = await cache.token.load(startUrl).then(a => a?.token)
-            assert.strictEqual(cachedToken, undefined)
-        })
-
-        describe('Exceptions', function () {
-            it('drops expired tokens if failure was a client-fault', async function () {
-                const exception = new UnauthorizedClientException({ message: '', $metadata: {} })
-                when(oidcClient.createToken(anything())).thenReject(exception)
-
-                const refreshableToken = createToken(-hourInMs, { refreshToken: 'refreshToken' })
-                const validRegistation = createRegistration(hourInMs)
-                const access = { region, startUrl, token: refreshableToken, registration: validRegistation }
-                await cache.token.save(startUrl, access)
-                await assert.rejects(sut.getToken())
-
-                const cachedToken = await cache.token.load(startUrl)
-                assert.strictEqual(cachedToken, undefined)
-            })
-
-            it('preserves expired tokens if failure was not a client-fault', async function () {
-                const exception = new InternalServerException({ message: '', $metadata: {} })
-                when(oidcClient.createToken(anything())).thenReject(exception)
-
-                const refreshableToken = createToken(-hourInMs, { refreshToken: 'refreshToken' })
-                const validRegistation = createRegistration(hourInMs)
-                const access = { region, startUrl, token: refreshableToken, registration: validRegistation }
-                await cache.token.save(startUrl, access)
-                await assert.rejects(sut.getToken())
-
-                const cachedToken = await cache.token.load(startUrl).then(a => a?.token)
-                assert.deepStrictEqual(cachedToken, refreshableToken)
-            })
-        })
-    })
-
-    describe('createToken', function () {
-        function stubOpen(userClicked = true) {
-            sinon.stub(vscode.env, 'openExternal').callsFake(async () => userClicked)
-        }
-
-        function setupFlow() {
-            const token = createToken(hourInMs)
-            const registration = createRegistration(hourInMs)
-            const authorization = createAuthorization(hourInMs)
-
-            when(oidcClient.registerClient(anything())).thenResolve(registration)
-            when(oidcClient.startDeviceAuthorization(anything())).thenResolve(authorization)
-            when(oidcClient.pollForToken(anything(), anything(), anything())).thenResolve(token)
-
-            return { token, registration, authorization }
-        }
-
-        it('runs the full SSO flow', async function () {
-            const { token, registration } = setupFlow()
-            stubOpen()
-
-            assert.deepStrictEqual(await sut.createToken(), { ...token, identity: startUrl })
-            const cachedToken = await cache.token.load(startUrl).then(a => a?.token)
-            assert.deepStrictEqual(cachedToken, token)
-            assert.deepStrictEqual(await cache.registration.load({ region }), registration)
-        })
-
-        it('always creates a new token, even if already cached', async function () {
-            const { token } = setupFlow()
-            stubOpen()
-
-            const cachedToken = createToken(hourInMs, { accessToken: 'someOtherToken' })
-            await cache.token.save(startUrl, { region, startUrl, token: cachedToken })
-
-            assert.deepStrictEqual(await sut.getToken(), cachedToken)
-            assert.deepStrictEqual(await sut.createToken(), { ...token, identity: startUrl })
-            assert.deepStrictEqual(await sut.getToken(), token)
-            assert.notDeepStrictEqual(await sut.getToken(), cachedToken)
-        })
-
-        describe('Exceptions', function () {
-            it('removes the client registration cache on client faults', async function () {
-                const exception = new UnauthorizedClientException({ message: '', $metadata: {} })
-                const registration = createRegistration(hourInMs)
-
-                when(oidcClient.registerClient(anything())).thenResolve(registration)
-                when(oidcClient.startDeviceAuthorization(anything())).thenReject(exception)
-
-                await assert.rejects(sut.createToken(), exception)
-                assert.strictEqual(await cache.registration.load({ region }), undefined)
-            })
-
-            it('removes the client registration cache on client faults (token step)', async function () {
-                const exception = new InvalidClientException({ message: '', $metadata: {} })
-                const registration = createRegistration(hourInMs)
-
-                when(oidcClient.registerClient(anything())).thenResolve(registration)
-                when(oidcClient.startDeviceAuthorization(anything())).thenResolve(createAuthorization(hourInMs))
-                when(oidcClient.pollForToken(anything(), anything(), anything())).thenReject(exception)
-
-                stubOpen()
-
-                await assert.rejects(sut.createToken(), exception)
-                assert.strictEqual(await cache.registration.load({ region }), undefined)
-            })
-
-            it('preserves the client registration cache on server faults', async function () {
-                const exception = new InternalServerException({ message: '', $metadata: {} })
-                const registration = createRegistration(hourInMs)
-
-                when(oidcClient.registerClient(anything())).thenResolve(registration)
-                when(oidcClient.startDeviceAuthorization(anything())).thenReject(exception)
-
-                await assert.rejects(sut.createToken(), exception)
-                assert.deepStrictEqual(await cache.registration.load({ region }), registration)
-            })
-        })
-
-        describe('Cancellation', function () {
-            beforeEach(function () {
-                stubOpen(false)
-                setupFlow()
-            })
-
-            it('stops the flow if user does not click the link', async function () {
-                await assert.rejects(sut.createToken(), CancellationError)
-            })
-
-            it('saves the client registration even when cancelled', async function () {
-                const registration = createRegistration(hourInMs)
-                await cache.registration.save({ region }, registration)
-                await assert.rejects(sut.createToken(), CancellationError)
-                const cached = await cache.registration.load({ region })
-                assert.deepStrictEqual(cached, registration)
-            })
-        })
-    })
-})
diff --git a/src/test/credentials/wizards/createProfile.test.ts b/src/test/credentials/wizards/createProfile.test.ts
deleted file mode 100644
index 39bd9773f4e..00000000000
--- a/src/test/credentials/wizards/createProfile.test.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { createWizardTester } from '../../shared/wizards/wizardTestUtils'
-import { CreateProfileWizard, ProfileTemplateProvider } from '../../../credentials/wizards/createProfile'
-import {
-    processCredentialsTemplate,
-    ProfileKey,
-    staticCredentialsTemplate,
-} from '../../../credentials/wizards/templates'
-import { Prompter, PromptResult } from '../../../shared/ui/prompter'
-import { StepEstimator } from '../../../shared/wizards/wizard'
-import { Profile } from '../../../shared/credentials/credentialsFile'
-
-class TestPrompter extends Prompter<string | undefined> {
-    public constructor(private readonly name: string, private readonly profile: Profile) {
-        super()
-    }
-
-    protected async promptUser(): Promise<PromptResult<string>> {
-        return JSON.stringify({ [this.name]: this.profile })
-    }
-
-    public setStepEstimator(estimator: StepEstimator<string>): void {}
-    public setSteps(current: number, total: number): void {}
-    public set recentItem(response: any) {}
-    public get recentItem(): any {
-        return
-    }
-}
-
-describe('CreateProfileWizard', function () {
-    it('prompts for profile name, access key, secret, and then validates (static)', function () {
-        const tester = createWizardTester(new CreateProfileWizard({ foo: {} }, staticCredentialsTemplate))
-        tester.name.assertShowFirst()
-        tester.profile[ProfileKey.AccessKeyId].assertShowSecond()
-        tester.profile[ProfileKey.SecretKey].assertShowThird()
-        tester.accountId.assertShow(4)
-    })
-
-    it('prompts for profile name, command, and then validates (credential_process)', function () {
-        const tester = createWizardTester(new CreateProfileWizard({ foo: {} }, processCredentialsTemplate))
-        tester.name.assertShowFirst()
-        tester.profile[ProfileKey.Process].assertShowSecond()
-        tester.accountId.assertShowThird()
-    })
-
-    it('skips profile name step (and uses "default") if starting with no profiles', function () {
-        const tester = createWizardTester(new CreateProfileWizard({}, processCredentialsTemplate))
-        tester.name.assertDoesNotShow()
-        tester.name.assertValue('default')
-        tester.assertShowCount(2)
-    })
-
-    it('passes in the profile name + state to template prompts', async function () {
-        const template: ProfileTemplateProvider<Profile> = {
-            label: '',
-            description: '',
-            prompts: {
-                step1: (name, profile) => new TestPrompter(name, profile),
-                step2: (name, profile) => new TestPrompter(name, profile),
-            },
-        }
-
-        const wizard = new CreateProfileWizard({}, template)
-        wizard.form.name.bindPrompter(() => new TestPrompter('test', {}).transform(r => Object.keys(JSON.parse(r!))[0]))
-        wizard.form.accountId.bindPrompter(() => new TestPrompter('', {}).transform(r => r!))
-
-        const result = await wizard.run()
-        const step1 = result?.profile?.['step1']
-        const step2 = result?.profile?.['step2']
-        assert.ok(step1)
-        assert.ok(step2)
-        assert.deepStrictEqual(JSON.parse(step1), { test: {} })
-        assert.deepStrictEqual(JSON.parse(step2), { test: { step1 } })
-    })
-})
diff --git a/src/test/credentials/wizards/sso.test.ts b/src/test/credentials/wizards/sso.test.ts
deleted file mode 100644
index 85a0a93491e..00000000000
--- a/src/test/credentials/wizards/sso.test.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { createWizardTester, WizardTester } from '../../../test/shared/wizards/wizardTestUtils'
-import { SsoWizard, SsoWizardState } from '../../../credentials/wizards/sso'
-
-describe('SSO Wizard', function () {
-    let tester: WizardTester<SsoWizardState>
-
-    beforeEach(function () {
-        tester = createWizardTester(new SsoWizard())
-    })
-
-    it('prompts for region, start URL, account ID, and role name', function () {
-        tester.region.assertShow(1)
-        tester.startUrl.assertShow(2)
-
-        // "hidden" step in the flow that validates the token
-        tester.tokenProvider.assertShow(3)
-
-        tester.accountId.assertShow(4)
-        tester.roleName.assertShow(5)
-    })
-})
diff --git a/src/test/dynamicResources/commands/configure.test.ts b/src/test/dynamicResources/commands/configure.test.ts
deleted file mode 100644
index 7faf31daa3a..00000000000
--- a/src/test/dynamicResources/commands/configure.test.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as sinon from 'sinon'
-import * as vscode from 'vscode'
-import { configureResources, ResourcesSettings } from '../../../dynamicResources/commands/configure'
-import { Settings } from '../../../shared/settings'
-
-describe('configureCommand', function () {
-    let settings: ResourcesSettings
-
-    beforeEach(async function () {
-        const workspaceSettings = new Settings(vscode.ConfigurationTarget.Workspace)
-        settings = new ResourcesSettings(workspaceSettings)
-        await settings.reset()
-    })
-
-    afterEach(function () {
-        sinon.restore()
-    })
-
-    it('maps selected services to configuration', async function () {
-        const testItems: vscode.QuickPickItem[] = [{ label: 'Foo' }, { label: 'Bar' }, { label: 'Baz' }]
-
-        sinon.stub(vscode.window, 'showQuickPick' as any).returns(Promise.resolve(testItems))
-        await configureResources(settings)
-
-        assert.deepStrictEqual(settings.get('enabledResources'), ['Foo', 'Bar', 'Baz'])
-    })
-})
diff --git a/src/test/dynamicResources/commands/copyIdentifier.test.ts b/src/test/dynamicResources/commands/copyIdentifier.test.ts
deleted file mode 100644
index 71eb2c95cd2..00000000000
--- a/src/test/dynamicResources/commands/copyIdentifier.test.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { copyIdentifier } from '../../../dynamicResources/commands/copyIdentifier'
-import { FakeEnv } from '../../shared/vscode/fakeEnv'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-
-describe('copyIdentifierCommand', function () {
-    let window: FakeWindow
-    let env: FakeEnv
-
-    beforeEach(function () {
-        window = new FakeWindow()
-        env = new FakeEnv()
-    })
-
-    it('copies identifier to clipboard and shows status bar confirmation', async function () {
-        const fakeIdentifier = 'resource1'
-
-        await copyIdentifier('fakeResourceType', fakeIdentifier, window, env)
-
-        assert.strictEqual(env.clipboard.text, fakeIdentifier)
-        assert.strictEqual(window.message.error, undefined)
-    })
-})
diff --git a/src/test/dynamicResources/commands/deleteResource.test.ts b/src/test/dynamicResources/commands/deleteResource.test.ts
deleted file mode 100644
index 26e7c0c8e2d..00000000000
--- a/src/test/dynamicResources/commands/deleteResource.test.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as sinon from 'sinon'
-import * as assert from 'assert'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { deleteResource } from '../../../dynamicResources/commands/deleteResource'
-import { DefaultCloudControlClient } from '../../../shared/clients/cloudControlClient'
-
-describe('deleteResource', function () {
-    const fakeType = 'fakeType'
-    const fakeIdentifier = 'fakeIdentifier'
-    const cloudControl = new DefaultCloudControlClient('')
-    let sandbox: sinon.SinonSandbox
-
-    beforeEach(function () {
-        sandbox = sinon.createSandbox()
-    })
-
-    afterEach(function () {
-        sandbox.restore()
-    })
-
-    it('confirms deletion, deletes resources, shows progress and confirmation', async function () {
-        const window = new FakeWindow({ message: { warningSelection: 'Delete' } })
-        const stub = sandbox
-            .stub(cloudControl, 'deleteResource')
-            .callsFake(async ({ TypeName: typeName, Identifier: identifier }) => {
-                assert.strictEqual(typeName, fakeType)
-                assert.strictEqual(identifier, fakeIdentifier)
-            })
-
-        await deleteResource(cloudControl, fakeType, fakeIdentifier, window)
-
-        assert.strictEqual(window.message.warning, `Delete resource ${fakeIdentifier} (${fakeType})?`)
-
-        assert.strictEqual(stub.calledOnce, true)
-
-        assert.strictEqual(window.progress.options?.location, vscode.ProgressLocation.Notification)
-        assert.strictEqual(window.progress.options?.cancellable, false)
-        assert.deepStrictEqual(window.progress.reported, [
-            { message: `Deleting resource ${fakeIdentifier} (${fakeType})...` },
-        ])
-
-        assert.ok(window.message.information?.startsWith(`Deleted resource ${fakeIdentifier} (${fakeType})`))
-    })
-
-    it('does nothing when deletion is cancelled', async function () {
-        const window = new FakeWindow({ message: { warningSelection: 'Cancel' } })
-        const spy = sandbox.spy(cloudControl, 'deleteResource')
-
-        await deleteResource(cloudControl, fakeType, fakeIdentifier, window)
-
-        assert.strictEqual(spy.notCalled, true)
-
-        assert.strictEqual(window.statusBar.message, undefined)
-        assert.strictEqual(window.message.error, undefined)
-    })
-
-    it('shows an error message when resource deletion fails', async function () {
-        sandbox.stub(cloudControl, 'deleteResource').callsFake(async () => {
-            throw new Error('fake exception')
-        })
-
-        const window = new FakeWindow({ message: { warningSelection: 'Delete' } })
-
-        await deleteResource(cloudControl, fakeType, fakeIdentifier, window)
-
-        assert.ok(window.message.error?.startsWith(`Failed to delete resource ${fakeIdentifier} (${fakeType})`))
-    })
-
-    it('shows a warning if unsupported action', async function () {
-        sandbox.stub(cloudControl, 'deleteResource').callsFake(async () => {
-            const error = new Error('fake exception')
-            error.name = 'UnsupportedActionException'
-            throw error
-        })
-
-        const window = new FakeWindow({ message: { warningSelection: 'Delete' } })
-
-        await deleteResource(cloudControl, fakeType, fakeIdentifier, window)
-
-        assert.ok(window.message.warning?.startsWith(`Resource type ${fakeType} does not currently support delete`))
-    })
-})
diff --git a/src/test/dynamicResources/commands/openResource.test.ts b/src/test/dynamicResources/commands/openResource.test.ts
deleted file mode 100644
index 5e15e6a8c00..00000000000
--- a/src/test/dynamicResources/commands/openResource.test.ts
+++ /dev/null
@@ -1,176 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as assert from 'assert'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { AwsResourceManager, TypeSchema } from '../../../dynamicResources/awsResourceManager'
-import { instance, mock } from 'ts-mockito'
-import { when, verify } from '../../utilities/mockito'
-import { ResourceNode } from '../../../dynamicResources/explorer/nodes/resourceNode'
-import { ResourceTypeNode } from '../../../dynamicResources/explorer/nodes/resourceTypeNode'
-import { getDiagnostics, openResource } from '../../../dynamicResources/commands/openResource'
-
-describe('openResource', function () {
-    const fakeType = 'fakeType'
-    const fakeIdentifier = 'fakeIdentifier'
-    let mockResourceManager: AwsResourceManager
-    let mockDiagnosticCollection: vscode.DiagnosticCollection
-    const fakeResourceNode = new ResourceNode({ typeName: fakeType } as ResourceTypeNode, fakeIdentifier)
-
-    beforeEach(function () {
-        mockResourceManager = mock()
-        mockDiagnosticCollection = mock()
-    })
-
-    it('shows progress', async function () {
-        const window = new FakeWindow()
-        when(mockResourceManager.open(fakeResourceNode, false)).thenResolve()
-        await openResource(
-            {
-                source: fakeResourceNode,
-                preview: false,
-                resourceManager: instance(mockResourceManager),
-                diagnostics: mockDiagnosticCollection,
-            },
-            window
-        )
-        assert.strictEqual(window.progress.options?.location, vscode.ProgressLocation.Notification)
-        assert.strictEqual(window.progress.options?.cancellable, false)
-        assert.deepStrictEqual(window.progress.reported, [
-            { message: `Opening resource ${fakeIdentifier} (${fakeType})...` },
-        ])
-    })
-
-    it('shows an error message when opening resource fails', async function () {
-        const window = new FakeWindow()
-        when(mockResourceManager.open(fakeResourceNode, false)).thenThrow(new Error())
-        await openResource(
-            {
-                source: fakeResourceNode,
-                preview: false,
-                resourceManager: instance(mockResourceManager),
-                diagnostics: mockDiagnosticCollection,
-            },
-            window
-        )
-        assert.ok(window.message.error?.startsWith(`Failed to open resource ${fakeIdentifier} (${fakeType})`))
-    })
-
-    it('handles opening ResourceNodes', async function () {
-        const window = new FakeWindow()
-        when(mockResourceManager.open(fakeResourceNode, false)).thenResolve()
-        await openResource(
-            {
-                source: fakeResourceNode,
-                preview: false,
-                resourceManager: instance(mockResourceManager),
-                diagnostics: mockDiagnosticCollection,
-            },
-            window
-        )
-        verify(mockResourceManager.open(fakeResourceNode, false)).once()
-    })
-
-    it('handles opening uris', async function () {
-        const window = new FakeWindow()
-        const fakeUri = vscode.Uri.parse('foo')
-        when(mockResourceManager.fromUri(fakeUri)).thenReturn(fakeResourceNode)
-        when(mockResourceManager.open(fakeResourceNode, false)).thenResolve()
-        await openResource(
-            {
-                source: fakeUri,
-                preview: false,
-                resourceManager: instance(mockResourceManager),
-                diagnostics: mockDiagnosticCollection,
-            },
-            window
-        )
-        verify(mockResourceManager.fromUri(fakeUri)).once()
-        verify(mockResourceManager.open(fakeResourceNode, false)).once()
-    })
-
-    it('can open in preview mode', async function () {
-        const window = new FakeWindow()
-        when(mockResourceManager.open(fakeResourceNode, true)).thenResolve()
-        await openResource(
-            {
-                source: fakeResourceNode,
-                preview: true,
-                resourceManager: instance(mockResourceManager),
-                diagnostics: mockDiagnosticCollection,
-            },
-            window
-        )
-        verify(mockResourceManager.open(fakeResourceNode, true)).once()
-    })
-
-    it('generates diagnostics for read-only properties', async function () {
-        const schema = getFakeTypeSchema({ readOnlyProperties: ['fooProperty'] })
-        const fakeDefinition = JSON.stringify({
-            fooProperty: 'foo',
-            barProperty: 'bar',
-        })
-        const document = await vscode.workspace.openTextDocument({
-            content: fakeDefinition,
-        })
-
-        const diagnostics = getDiagnostics(schema, document)
-        assert.strictEqual(diagnostics.length, 1)
-
-        const diagnostic = diagnostics[0]
-        assert.strictEqual(diagnostic.severity, vscode.DiagnosticSeverity.Information)
-        assert.strictEqual(diagnostic.message, '"fooProperty" is a read-only property and cannot be modified')
-    })
-
-    it('generates diagnostics for create-only properties', async function () {
-        const schema = getFakeTypeSchema({ createOnlyProperties: ['barProperty'] })
-        const fakeDefinition = JSON.stringify({
-            fooProperty: 'foo',
-            barProperty: 'bar',
-        })
-        const document = await vscode.workspace.openTextDocument({
-            content: fakeDefinition,
-        })
-
-        const diagnostics = getDiagnostics(schema, document)
-        assert.strictEqual(diagnostics.length, 1)
-
-        const diagnostic = diagnostics[0]
-        assert.strictEqual(diagnostic.severity, vscode.DiagnosticSeverity.Information)
-        assert.strictEqual(
-            diagnostic.message,
-            '"barProperty" is a create-only property and cannot be modified on an existing resource'
-        )
-    })
-
-    it('returns no diagnostics for no matching properties', async function () {
-        const schema = getFakeTypeSchema({ createOnlyProperties: ['bazProperty'] })
-        const fakeDefinition = JSON.stringify({
-            fooProperty: 'foo',
-            barProperty: 'bar',
-        })
-        const document = await vscode.workspace.openTextDocument({
-            content: fakeDefinition,
-        })
-
-        const diagnostics = getDiagnostics(schema, document)
-        assert.strictEqual(diagnostics.length, 0)
-    })
-})
-
-function getFakeTypeSchema(opts: { readOnlyProperties?: string[]; createOnlyProperties?: string[] }): TypeSchema {
-    return {
-        typeName: '',
-        description: '',
-        properties: undefined,
-        definitions: undefined,
-        readOnlyProperties: opts.readOnlyProperties ?? [],
-        createOnlyProperties: opts.createOnlyProperties ?? [],
-        writeOnlyProperties: [],
-        required: [],
-        primaryIdentifier: [],
-    }
-}
diff --git a/src/test/dynamicResources/commands/saveResource.test.ts b/src/test/dynamicResources/commands/saveResource.test.ts
deleted file mode 100644
index 3398ca2c800..00000000000
--- a/src/test/dynamicResources/commands/saveResource.test.ts
+++ /dev/null
@@ -1,204 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as assert from 'assert'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { instance, mock, when, verify, anything, deepEqual } from 'ts-mockito'
-import { createResource, updateResource } from '../../../dynamicResources/commands/saveResource'
-import { AddOperation } from 'fast-json-patch'
-import { CloudControlClient } from '../../../shared/clients/cloudControlClient'
-
-describe('createResource', function () {
-    const fakeType = 'fakeType'
-    const fakeDefinition = '{}'
-
-    let mockCloudControl: CloudControlClient
-
-    beforeEach(function () {
-        mockCloudControl = mock()
-    })
-
-    it('creates resources, shows progress and confirmation', async function () {
-        const window = new FakeWindow()
-        const newIdentifier = 'newIdentifier'
-
-        when(
-            mockCloudControl.createResource(
-                deepEqual({
-                    TypeName: fakeType,
-                    DesiredState: fakeDefinition,
-                })
-            )
-        ).thenResolve({
-            ProgressEvent: {
-                Identifier: newIdentifier,
-            },
-        })
-
-        await createResource(fakeType, fakeDefinition, instance(mockCloudControl), window)
-
-        verify(
-            mockCloudControl.createResource(
-                deepEqual({
-                    TypeName: fakeType,
-                    DesiredState: fakeDefinition,
-                })
-            )
-        ).once()
-        assert.strictEqual(window.progress.options?.location, vscode.ProgressLocation.Notification)
-        assert.strictEqual(window.progress.options?.cancellable, false)
-        assert.deepStrictEqual(window.progress.reported, [{ message: `Creating resource (${fakeType})...` }])
-
-        assert.ok(window.message.information?.startsWith(`Created resource ${newIdentifier} (${fakeType})`))
-    })
-
-    it('shows an error message when resource creation fails', async function () {
-        when(
-            mockCloudControl.createResource(
-                deepEqual({
-                    TypeName: fakeType,
-                    DesiredState: fakeDefinition,
-                })
-            )
-        ).thenReject(new Error())
-        const window = new FakeWindow()
-
-        try {
-            await createResource(fakeType, fakeDefinition, instance(mockCloudControl), window)
-        } catch (err) {
-            assert.ok(window.message.error?.startsWith(`Failed to create resource (${fakeType})`))
-            return
-        }
-        assert.fail('Expected exception, but none was thrown.')
-    })
-
-    it('shows an error message when definition is not valid json', async function () {
-        const window = new FakeWindow()
-        try {
-            await createResource(fakeType, 'foo', instance(mockCloudControl), window)
-        } catch (err) {
-            verify(mockCloudControl.createResource(anything())).never()
-            assert.ok(window.message.error?.startsWith(`Failed to create resource (${fakeType})`))
-            return
-        }
-        assert.fail('Expected exception, but none was thrown.')
-    })
-
-    it('shows a warning if unsupported action', async function () {
-        const error = new Error('fake exception')
-        error.name = 'UnsupportedActionException'
-        when(
-            mockCloudControl.createResource(
-                deepEqual({
-                    TypeName: fakeType,
-                    DesiredState: fakeDefinition,
-                })
-            )
-        ).thenReject(error)
-        const window = new FakeWindow()
-
-        await createResource(fakeType, fakeDefinition, instance(mockCloudControl), window)
-
-        assert.ok(window.message.warning?.startsWith(`${fakeType} does not currently support resource creation`))
-    })
-})
-
-describe('updateResource', function () {
-    const fakeType = 'fakeType'
-    const fakeIdentifier = 'fakeIdentifier'
-    const fakeDefinition = '{}'
-    const fakeOperation = { op: 'add', value: 'Foo' } as AddOperation<string>
-    const fakeDiff = [fakeOperation]
-
-    let mockCloudControl: CloudControlClient
-
-    beforeEach(function () {
-        mockCloudControl = mock()
-    })
-
-    it('updates resources, shows progress and confirmation', async function () {
-        const window = new FakeWindow()
-        const patchJson = JSON.stringify(fakeDiff)
-
-        when(
-            mockCloudControl.updateResource(
-                deepEqual({
-                    TypeName: fakeType,
-                    Identifier: fakeIdentifier,
-                    PatchDocument: patchJson,
-                })
-            )
-        ).thenResolve()
-
-        await updateResource(fakeType, fakeIdentifier, fakeDefinition, instance(mockCloudControl), window, fakeDiff)
-
-        verify(
-            mockCloudControl.updateResource(
-                deepEqual({
-                    TypeName: fakeType,
-                    Identifier: fakeIdentifier,
-                    PatchDocument: patchJson,
-                })
-            )
-        ).once()
-        assert.strictEqual(window.progress.options?.location, vscode.ProgressLocation.Notification)
-        assert.strictEqual(window.progress.options?.cancellable, false)
-        assert.deepStrictEqual(window.progress.reported, [
-            { message: `Updating resource ${fakeIdentifier} (${fakeType})...` },
-        ])
-
-        assert.ok(window.message.information?.startsWith(`Updated resource ${fakeIdentifier} (${fakeType})`))
-    })
-
-    it('shows an error message when resource update fails', async function () {
-        const patchJson = JSON.stringify(fakeDiff)
-        when(
-            mockCloudControl.updateResource(
-                deepEqual({
-                    TypeName: fakeType,
-                    Identifier: fakeIdentifier,
-                    PatchDocument: patchJson,
-                })
-            )
-        ).thenReject(new Error())
-        const window = new FakeWindow()
-
-        try {
-            await updateResource(fakeType, fakeIdentifier, fakeDefinition, instance(mockCloudControl), window, fakeDiff)
-        } catch (err) {
-            assert.ok(window.message.error?.startsWith(`Failed to update resource ${fakeIdentifier} (${fakeType})`))
-            return
-        }
-        assert.fail('Expected exception, but none was thrown.')
-    })
-
-    it('shows a warning message when there is no diff', async function () {
-        const window = new FakeWindow()
-
-        await updateResource(fakeType, fakeIdentifier, fakeDefinition, instance(mockCloudControl), window, [])
-
-        verify(mockCloudControl.updateResource(anything())).never()
-        assert.ok(window.message.warning?.startsWith(`Update cancelled`))
-    })
-
-    it('shows a warning if unsupported action', async function () {
-        const patchJson = JSON.stringify(fakeDiff)
-        const error = new Error('fake exception')
-        error.name = 'UnsupportedActionException'
-        when(
-            mockCloudControl.updateResource(
-                deepEqual({
-                    TypeName: fakeType,
-                    Identifier: fakeIdentifier,
-                    PatchDocument: patchJson,
-                })
-            )
-        ).thenReject(error)
-        const window = new FakeWindow()
-        await updateResource(fakeType, fakeIdentifier, fakeDefinition, instance(mockCloudControl), window, fakeDiff)
-        assert.ok(window.message.warning?.startsWith(`${fakeType} does not currently support resource updating`))
-    })
-})
diff --git a/src/test/dynamicResources/explorer/resourceNode.test.ts b/src/test/dynamicResources/explorer/resourceNode.test.ts
deleted file mode 100644
index 07eff289928..00000000000
--- a/src/test/dynamicResources/explorer/resourceNode.test.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { ResourceTypeNode } from '../../../dynamicResources/explorer/nodes/resourceTypeNode'
-import { ResourceNode } from '../../../dynamicResources/explorer/nodes/resourceNode'
-
-const fakeIdentifier = 'someidentifier'
-const fakeArn = 'arn:fooPartion:fooService:fooRegion:1234:fooType/someidentifier'
-const fakeContextValue = 'FooContext'
-
-describe('ResourceNode', function () {
-    it('initializes name and tooltip', async function () {
-        const testNode = new ResourceNode({} as ResourceTypeNode, fakeIdentifier)
-        assert.strictEqual(testNode.label, fakeIdentifier)
-        assert.strictEqual(testNode.tooltip, fakeIdentifier)
-        assert.strictEqual(testNode.identifier, fakeIdentifier)
-    })
-
-    it('parses resource ARN to get friendly name for label', async function () {
-        const testNode = new ResourceNode({} as ResourceTypeNode, fakeArn)
-        assert.strictEqual(testNode.label, 'fooType/someidentifier')
-    })
-
-    it('uses full ARN for tooltip', async function () {
-        const testNode = new ResourceNode({} as ResourceTypeNode, fakeArn)
-        assert.strictEqual(testNode.tooltip, fakeArn)
-    })
-
-    it('uses provided contextValue', async function () {
-        const testNode = new ResourceNode({} as ResourceTypeNode, fakeArn, fakeContextValue)
-        assert.strictEqual(testNode.contextValue, fakeContextValue)
-    })
-
-    it('uses default contextValue if none is provided', async function () {
-        const testNode = new ResourceNode({} as ResourceTypeNode, fakeArn)
-        assert.strictEqual(testNode.contextValue, 'ResourceNode')
-    })
-})
diff --git a/src/test/dynamicResources/explorer/resourceTypeNode.test.ts b/src/test/dynamicResources/explorer/resourceTypeNode.test.ts
deleted file mode 100644
index d2f30dbec1f..00000000000
--- a/src/test/dynamicResources/explorer/resourceTypeNode.test.ts
+++ /dev/null
@@ -1,202 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as assert from 'assert'
-import { anything } from 'ts-mockito'
-import { ResourcesNode } from '../../../dynamicResources/explorer/nodes/resourcesNode'
-import { ResourceNode } from '../../../dynamicResources/explorer/nodes/resourceNode'
-import { ResourceTypeNode } from '../../../dynamicResources/explorer/nodes/resourceTypeNode'
-import {
-    assertNodeListOnlyHasErrorNode,
-    assertNodeListOnlyHasPlaceholderNode,
-} from '../../utilities/explorerNodeAssertions'
-import { deepEqual, instance, mock, when } from '../../utilities/mockito'
-import { CloudControlClient } from '../../../shared/clients/cloudControlClient'
-import { CloudControl } from 'aws-sdk'
-import { ResourceTypeMetadata } from '../../../dynamicResources/model/resources'
-
-const fakeTypeName = 'sometype'
-const unsortedText = ['zebra', 'Antelope', 'aardvark', 'elephant']
-const sortedText = ['aardvark', 'Antelope', 'elephant', 'zebra']
-
-describe('ResourceTypeNode', function () {
-    let testNode: ResourceTypeNode
-
-    let resourceIdentifiers: string[]
-    let cloudControl: CloudControlClient
-
-    beforeEach(function () {
-        cloudControl = mock()
-
-        resourceIdentifiers = ['resource1', 'resource2', 'resource3']
-        mockCloudControlClient(resourceIdentifiers)
-
-        testNode = generateTestNode(instance(cloudControl))
-    })
-
-    it('initializes name and tooltip', async function () {
-        assert.strictEqual(testNode.label, fakeTypeName)
-        assert.strictEqual(testNode.tooltip, fakeTypeName)
-    })
-
-    it('returns placeholder node if no resources are found', async function () {
-        const resourceIdentifiers: string[] = []
-        mockCloudControlClient(resourceIdentifiers)
-
-        testNode = generateTestNode(instance(cloudControl))
-
-        const childNodes = await testNode.getChildren()
-
-        assertNodeListOnlyHasPlaceholderNode(childNodes)
-    })
-
-    it('has ResourceNode child nodes', async function () {
-        const childNodes = await testNode.getChildren()
-
-        assert.strictEqual(childNodes.length, resourceIdentifiers.length, 'Unexpected child count')
-
-        childNodes.forEach(node => assert.ok(node instanceof ResourceNode, 'Expected child node to be ResourceNode'))
-    })
-
-    it('has child nodes with all operations contextValue when unknown operations', async function () {
-        const childNodes = await testNode.getChildren()
-
-        childNodes.forEach(node =>
-            assert.strictEqual(
-                node.contextValue,
-                'CreatableDeletableUpdatableResourceNode',
-                'expected the node to have a ResourceNode contextValue'
-            )
-        )
-    })
-
-    it('has child nodes with ResourceNode contextValue including single supported operation', async function () {
-        testNode = generateTestNode(instance(cloudControl), ['CREATE'])
-        const childNodes = await testNode.getChildren()
-
-        childNodes.forEach(node =>
-            assert.strictEqual(
-                node.contextValue,
-                'CreatableResourceNode',
-                'expected the node to have a CreatableResourceNode contextValue'
-            )
-        )
-    })
-
-    it('has child nodes with ResourceNode contextValue including multiple supported operations', async function () {
-        testNode = generateTestNode(instance(cloudControl), ['CREATE', 'DELETE'])
-        const childNodes = await testNode.getChildren()
-
-        childNodes.forEach(node =>
-            assert.strictEqual(
-                node.contextValue,
-                'CreatableDeletableResourceNode',
-                'expected the node to have a CreatableDeletableResourceNode contextValue'
-            )
-        )
-    })
-
-    it('sorts child nodes', async function () {
-        resourceIdentifiers = unsortedText
-        mockCloudControlClient(resourceIdentifiers)
-
-        testNode = generateTestNode(instance(cloudControl))
-
-        const childNodes = await testNode.getChildren()
-
-        const actualChildOrder = childNodes.map(node => node.label)
-        assert.deepStrictEqual(actualChildOrder, sortedText, 'Unexpected child sort order')
-    })
-
-    it('has an error node for a child if an error happens during loading', async function () {
-        cloudControl = mock()
-        when(cloudControl.listResources(anything())).thenThrow(new Error('foo'))
-        testNode = generateTestNode(instance(cloudControl))
-
-        const childNodes = await testNode.getChildren()
-        assertNodeListOnlyHasErrorNode(childNodes)
-    })
-
-    it('has a placeholder node for a child if unsupported action', async function () {
-        cloudControl = mock()
-        const error = new Error('foo')
-        error.name = 'UnsupportedActionException'
-        when(cloudControl.listResources(anything())).thenThrow(error)
-        testNode = generateTestNode(instance(cloudControl))
-
-        const childNodes = await testNode.getChildren()
-        assertNodeListOnlyHasPlaceholderNode(childNodes)
-    })
-
-    it('has Documented contextValue if documentation available', function () {
-        mockCloudControlClient(resourceIdentifiers)
-
-        testNode = generateTestNode(instance(cloudControl), [], 'fooDocs')
-        assert.strictEqual(testNode.contextValue, 'DocumentedResourceTypeNode')
-    })
-
-    it('has Creatable contextValue if create operation present', function () {
-        mockCloudControlClient(resourceIdentifiers)
-
-        testNode = generateTestNode(instance(cloudControl), ['CREATE'])
-        assert.strictEqual(testNode.contextValue, 'CreatableResourceTypeNode')
-    })
-
-    it('is non expandable if not available', function () {
-        mockCloudControlClient(resourceIdentifiers)
-
-        testNode = generateTestNode(instance(cloudControl), undefined, undefined, false)
-        assert.strictEqual(testNode.collapsibleState, vscode.TreeItemCollapsibleState.None)
-    })
-
-    it('has a suitable description if not available', function () {
-        mockCloudControlClient(resourceIdentifiers)
-
-        testNode = generateTestNode(instance(cloudControl), undefined, undefined, false)
-        assert.strictEqual(testNode.description, 'Unavailable in region')
-    })
-
-    it('has UnavailableResourceTypeNode contextValue if not available', function () {
-        mockCloudControlClient(resourceIdentifiers)
-
-        testNode = generateTestNode(instance(cloudControl), undefined, undefined, false)
-        assert.strictEqual(testNode.contextValue, 'UnavailableResourceTypeNode')
-    })
-
-    function generateTestNode(
-        client: CloudControlClient,
-        supportedOperations?: string[],
-        documentation?: string,
-        available?: boolean
-    ): ResourceTypeNode {
-        const metadata = {
-            operations: supportedOperations,
-            documentation,
-            available: available ?? true,
-        } as ResourceTypeMetadata
-        return new ResourceTypeNode({} as ResourcesNode, fakeTypeName, client, metadata)
-    }
-
-    function mockCloudControlClient(resourceIdentifiers: string[]): void {
-        when(
-            cloudControl.listResources(
-                deepEqual({
-                    TypeName: fakeTypeName,
-                    NextToken: anything(),
-                })
-            )
-        ).thenResolve({
-            TypeName: fakeTypeName,
-            NextToken: undefined,
-            ResourceDescriptions: resourceIdentifiers.map<CloudControl.ResourceDescription>(identifier => {
-                return {
-                    Identifier: identifier,
-                    ResourceModel: '',
-                }
-            }),
-        })
-    }
-})
diff --git a/src/test/ecr/commands/copyRepositoryUri.test.ts b/src/test/ecr/commands/copyRepositoryUri.test.ts
deleted file mode 100644
index c4ca3cea308..00000000000
--- a/src/test/ecr/commands/copyRepositoryUri.test.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { EcrRepositoryNode } from '../../../ecr/explorer/ecrRepositoryNode'
-import { FakeEnv } from '../../shared/vscode/fakeEnv'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { EcrNode } from '../../../ecr/explorer/ecrNode'
-import { EcrClient, EcrRepository } from '../../../shared/clients/ecrClient'
-import { copyRepositoryUri } from '../../../ecr/commands/copyRepositoryUri'
-
-describe('copyUriCommand', function () {
-    it('Copies URI to clipboard and shows in the status bar', async function () {
-        const node = new EcrRepositoryNode(
-            {} as EcrNode,
-            {} as EcrClient,
-            { repositoryUri: 'www.amazon.com' } as EcrRepository
-        )
-
-        const window = new FakeWindow()
-        const env = new FakeEnv()
-
-        await copyRepositoryUri(node, window, env)
-
-        assert.strictEqual(env.clipboard.text, 'www.amazon.com')
-
-        assert.strictEqual(window.statusBar.message, '$(clippy) Copied URI to clipboard')
-    })
-})
diff --git a/src/test/ecr/commands/copyTagUri.test.ts b/src/test/ecr/commands/copyTagUri.test.ts
deleted file mode 100644
index 0b181b657c5..00000000000
--- a/src/test/ecr/commands/copyTagUri.test.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { EcrRepositoryNode } from '../../../ecr/explorer/ecrRepositoryNode'
-import { FakeEnv } from '../../shared/vscode/fakeEnv'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { EcrClient, EcrRepository } from '../../../shared/clients/ecrClient'
-import { EcrTagNode } from '../../../ecr/explorer/ecrTagNode'
-import { copyTagUri } from '../../../ecr/commands/copyTagUri'
-
-describe('copyTagUriCommand', function () {
-    it('Copies URI to clipboard and shows in the status bar', async function () {
-        const parentNode = {} as EcrRepositoryNode
-        const node = new EcrTagNode(
-            parentNode,
-            {} as EcrClient,
-            { repositoryUri: 'www.amazon.com' } as EcrRepository,
-            'tag'
-        )
-
-        const window = new FakeWindow()
-        const env = new FakeEnv()
-
-        await copyTagUri(node, window, env)
-
-        assert.strictEqual(env.clipboard.text, 'www.amazon.com:tag')
-
-        assert.strictEqual(window.statusBar.message, '$(clippy) Copied URI to clipboard')
-    })
-})
diff --git a/src/test/ecr/commands/createRepository.test.ts b/src/test/ecr/commands/createRepository.test.ts
deleted file mode 100644
index 4f8c3865aa7..00000000000
--- a/src/test/ecr/commands/createRepository.test.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as sinon from 'sinon'
-import * as assert from 'assert'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { EcrNode } from '../../../ecr/explorer/ecrNode'
-import { DefaultEcrClient } from '../../../shared/clients/ecrClient'
-import { createRepository } from '../../../ecr/commands/createRepository'
-import { FakeCommands } from '../../shared/vscode/fakeCommands'
-
-describe('createRepositoryCommand', function () {
-    const ecr = new DefaultEcrClient('')
-    let node: EcrNode
-    let sandbox: sinon.SinonSandbox
-
-    beforeEach(function () {
-        sandbox = sinon.createSandbox()
-        node = new EcrNode(ecr)
-    })
-
-    afterEach(function () {
-        sandbox.restore()
-    })
-
-    it('prompts for repo name, creates repo, shows success, and refreshes node', async function () {
-        const repoName = 'amazingecrrepo'
-
-        const stub = sandbox.stub(ecr, 'createRepository').callsFake(async name => {
-            assert.strictEqual(name, repoName)
-        })
-
-        const window = new FakeWindow({ inputBox: { input: repoName } })
-        const commands = new FakeCommands()
-        await createRepository(node, window, commands)
-
-        assert.strictEqual(window.inputBox.options?.prompt, 'Enter a new repository name')
-        assert.strictEqual(window.inputBox.options?.placeHolder, 'Repository Name')
-
-        assert.strictEqual(window.message.information, `Created repository: ${repoName}`)
-        assert.ok(stub.calledOnce)
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [node])
-    })
-
-    it('does nothing when prompt is cancelled', async function () {
-        const spy = sandbox.spy(ecr, 'createRepository')
-
-        await createRepository(node, new FakeWindow(), new FakeCommands())
-
-        assert.ok(spy.notCalled)
-    })
-
-    it('Shows an error message and refreshes node when repository creation fails', async function () {
-        sandbox.stub(ecr, 'createRepository').callsFake(async () => {
-            throw Error('Network busted')
-        })
-
-        const window = new FakeWindow({ inputBox: { input: 'input' } })
-        const commands = new FakeCommands()
-        await createRepository(node, window, commands)
-
-        assert.ok(window.message.error?.includes('Failed to create repository'))
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [node])
-    })
-
-    it('Warns when repository name is invalid', async function () {
-        const window = new FakeWindow({ inputBox: { input: '404' } })
-
-        await createRepository(node, window, new FakeCommands())
-
-        assert.strictEqual(window.inputBox.errorMessage, 'Repository name must start with a lowercase letter')
-    })
-})
diff --git a/src/test/ecr/commands/deleteRepository.test.ts b/src/test/ecr/commands/deleteRepository.test.ts
deleted file mode 100644
index 3f2b3ebe398..00000000000
--- a/src/test/ecr/commands/deleteRepository.test.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as sinon from 'sinon'
-import * as assert from 'assert'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { EcrNode } from '../../../ecr/explorer/ecrNode'
-import { DefaultEcrClient, EcrRepository } from '../../../shared/clients/ecrClient'
-import { FakeCommands } from '../../shared/vscode/fakeCommands'
-import { EcrRepositoryNode } from '../../../ecr/explorer/ecrRepositoryNode'
-import { deleteRepository } from '../../../ecr/commands/deleteRepository'
-
-describe('deleteRepositoryCommand', function () {
-    const repositoryName = 'reponame'
-    const parentNode: EcrNode = {} as EcrNode
-    const ecr = new DefaultEcrClient('')
-    let node: EcrRepositoryNode
-    let sandbox: sinon.SinonSandbox
-
-    beforeEach(function () {
-        sandbox = sinon.createSandbox()
-        node = new EcrRepositoryNode(parentNode, ecr, { repositoryName: repositoryName } as EcrRepository)
-    })
-
-    afterEach(function () {
-        sandbox.restore()
-    })
-
-    it('Confirms deletion, deletes repository, shows progress bar, and refreshes parent node', async function () {
-        const window = new FakeWindow({ inputBox: { input: repositoryName } })
-        const commands = new FakeCommands()
-        const stub = sandbox.stub(ecr, 'deleteRepository').callsFake(async name => {
-            assert.strictEqual(name, repositoryName)
-        })
-
-        await deleteRepository(node, window, commands)
-
-        assert.strictEqual(window.inputBox.options?.prompt, `Enter ${repositoryName} to confirm deletion`)
-        assert.strictEqual(window.inputBox.options?.placeHolder, repositoryName)
-
-        assert.ok(window.message.information?.startsWith(`Deleted repository: ${repositoryName}`))
-
-        assert.strictEqual(stub.calledOnce, true)
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [parentNode])
-    })
-
-    it('Does nothing when deletion is cancelled', async function () {
-        const spy = sandbox.spy(ecr, 'deleteRepository')
-
-        await deleteRepository(node, new FakeWindow(), new FakeCommands())
-
-        assert.ok(spy.notCalled)
-    })
-
-    it('shows an error message and refreshes node when repository deletion fails', async function () {
-        sandbox.stub(ecr, 'deleteRepository').callsFake(async () => {
-            throw Error('Network busted')
-        })
-
-        const window = new FakeWindow({ inputBox: { input: repositoryName } })
-        const commands = new FakeCommands()
-        await deleteRepository(node, window, commands)
-
-        assert.ok(window.message.error?.startsWith(`Failed to delete repository: ${repositoryName}`))
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [parentNode])
-    })
-
-    it('Warns when confirmation is invalid', async function () {
-        const window = new FakeWindow({ inputBox: { input: 'something other than the repo name' } })
-        const commands = new FakeCommands()
-
-        await deleteRepository(node, window, commands)
-
-        assert.strictEqual(window.inputBox.errorMessage, `Enter ${repositoryName} to confirm deletion`)
-    })
-})
diff --git a/src/test/ecr/commands/deleteTag.test.ts b/src/test/ecr/commands/deleteTag.test.ts
deleted file mode 100644
index dee5d960afc..00000000000
--- a/src/test/ecr/commands/deleteTag.test.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as sinon from 'sinon'
-import * as assert from 'assert'
-import { EcrTagNode } from '../../../ecr/explorer/ecrTagNode'
-import { FakeCommands } from '../../shared/vscode/fakeCommands'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { EcrRepositoryNode } from '../../../ecr/explorer/ecrRepositoryNode'
-import { DefaultEcrClient, EcrRepository } from '../../../shared/clients/ecrClient'
-import { deleteTag } from '../../../ecr/commands/deleteTag'
-
-describe('deleteTag', function () {
-    const repositoryName = 'reponame'
-    const tagName = 'tag'
-    const parentNode = {} as EcrRepositoryNode
-    const ecr = new DefaultEcrClient('')
-    let node: EcrTagNode
-    let sandbox: sinon.SinonSandbox
-
-    beforeEach(function () {
-        sandbox = sinon.createSandbox()
-        node = new EcrTagNode(parentNode, ecr, { repositoryName: repositoryName } as EcrRepository, tagName)
-    })
-
-    afterEach(function () {
-        sandbox.restore()
-    })
-
-    it('confirms deletion, deletes file, shows status bar confirmation, and refreshes parent node', async function () {
-        const window = new FakeWindow({ message: { warningSelection: 'Delete' } })
-        const commands = new FakeCommands()
-        const stub = sandbox.stub(ecr, 'deleteTag').callsFake(async (name, tag) => {
-            assert.strictEqual(name, repositoryName)
-            assert.strictEqual(tag, tagName)
-        })
-
-        await deleteTag(node, window, commands)
-
-        assert.strictEqual(window.message.warning, 'Are you sure you want to delete tag tag from repository reponame')
-
-        assert.strictEqual(stub.calledOnce, true)
-
-        assert.ok(window.message.information?.startsWith(`Deleted tag ${tagName} from repository ${repositoryName}`))
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [parentNode])
-    })
-
-    it('does nothing when deletion is cancelled', async function () {
-        const window = new FakeWindow({ message: { warningSelection: 'Cancel' } })
-        const commands = new FakeCommands()
-        const spy = sandbox.spy(ecr, 'deleteTag')
-
-        await deleteTag(node, window, commands)
-
-        assert.strictEqual(spy.notCalled, true)
-
-        assert.strictEqual(window.statusBar.message, undefined)
-        assert.strictEqual(window.message.error, undefined)
-        assert.strictEqual(commands.command, undefined)
-    })
-
-    it('shows an error message and refreshes node when file deletion fails', async function () {
-        sandbox.stub(ecr, 'deleteTag').callsFake(async () => {
-            throw new Error('network broke')
-        })
-
-        const window = new FakeWindow({ message: { warningSelection: 'Delete' } })
-        const commands = new FakeCommands()
-
-        await deleteTag(node, window, commands)
-
-        assert.ok(window.message.error?.startsWith(`Failed to delete tag ${tagName}`))
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [parentNode])
-    })
-})
diff --git a/src/test/ecr/utils.test.ts b/src/test/ecr/utils.test.ts
deleted file mode 100644
index a104b742cca..00000000000
--- a/src/test/ecr/utils.test.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { validateRepositoryName } from '../../ecr/utils'
-
-describe('createRepositoryCommand', function () {
-    it('Validates repository name starts with a lowercase letter', function () {
-        const message = validateRepositoryName('404')
-        assert.strictEqual(message, 'Repository name must start with a lowercase letter')
-    })
-
-    it('Validates repository name does not contain uppercase characters', function () {
-        const message = validateRepositoryName('abcDEF')
-        assert.strictEqual(
-            message,
-            'Repository name must only contain lowercase letters, numbers, hyphens, underscores, and forward slashes'
-        )
-    })
-
-    it('Validates repository name against large regex the service uses', function () {
-        ;['abc--a', 'abc//a', 'abc__a', 'abc-', 'abc/', 'abc_'].forEach(item =>
-            assert.strictEqual(validateRepositoryName(item), 'Invalid repository name')
-        )
-    })
-
-    it('Allows lowercase names with slashes, underscores, and dashes', function () {
-        const message = validateRepositoryName('abc1/def2/hij3_klmno-p5')
-        assert.strictEqual(message, undefined)
-    })
-})
diff --git a/src/test/ecs/commands.test.ts b/src/test/ecs/commands.test.ts
deleted file mode 100644
index a576402e178..00000000000
--- a/src/test/ecs/commands.test.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-import { DefaultEcsClient } from '../../shared/clients/ecsClient'
-import { TestSettings } from '../utilities/testSettingsConfiguration'
-import { PromptSettings } from '../../shared/settings'
-import { Service } from '../../ecs/model'
-import { stub } from '../utilities/stubber'
-import { EcsRunCommandPrompt, toggleExecuteCommandFlag } from '../../ecs/commands'
-
-describe('toggleExecuteCommandFlag', async function () {
-    const settings = new PromptSettings(new TestSettings())
-
-    before(async function () {
-        await settings.disablePrompt(EcsRunCommandPrompt.Enable)
-        await settings.disablePrompt(EcsRunCommandPrompt.Disable)
-    })
-
-    it('attempts to enable service', async function () {
-        const client = stub(DefaultEcsClient, { regionCode: '' })
-        client.updateService.callsFake(async request => assert.strictEqual(request.enableExecuteCommand, true))
-        const service = new Service(client, {})
-        const didChange = new Promise<boolean>(resolve => {
-            service.onDidChangeTreeItem(() => resolve(true))
-            setTimeout(() => resolve(false), 1000)
-        })
-
-        await toggleExecuteCommandFlag(service, vscode.window, settings)
-        assert.ok(client.updateService.calledOnce)
-        assert.ok(await didChange)
-    })
-
-    it('attempts to disable service', async function () {
-        const client = stub(DefaultEcsClient, { regionCode: '' })
-        client.updateService.callsFake(async request => assert.strictEqual(request.enableExecuteCommand, false))
-        const service = new Service(client, { enableExecuteCommand: true })
-        const didChange = new Promise<boolean>(resolve => {
-            service.onDidChangeTreeItem(() => resolve(true))
-            setTimeout(() => resolve(false), 1000)
-        })
-
-        await toggleExecuteCommandFlag(service, vscode.window, settings)
-        assert.ok(client.updateService.calledOnce)
-        assert.ok(await didChange)
-    })
-})
-
-describe('openTaskInTerminal', async function () {
-    const settings = new PromptSettings(new TestSettings())
-
-    before(async function () {
-        await settings.disablePrompt(EcsRunCommandPrompt.Enable)
-        await settings.disablePrompt(EcsRunCommandPrompt.Disable)
-    })
-
-    it('attempts to enable service', async function () {
-        const client = stub(DefaultEcsClient, { regionCode: '' })
-        client.updateService.callsFake(async request => assert.strictEqual(request.enableExecuteCommand, true))
-        const service = new Service(client, {})
-        const didChange = new Promise<boolean>(resolve => {
-            service.onDidChangeTreeItem(() => resolve(true))
-            setTimeout(() => resolve(false), 1000)
-        })
-
-        await toggleExecuteCommandFlag(service, vscode.window, settings)
-        assert.ok(client.updateService.calledOnce)
-        assert.ok(await didChange)
-    })
-
-    it('attempts to disable service', async function () {
-        const client = stub(DefaultEcsClient, { regionCode: '' })
-        client.updateService.callsFake(async request => assert.strictEqual(request.enableExecuteCommand, false))
-        const service = new Service(client, { enableExecuteCommand: true })
-        const didChange = new Promise<boolean>(resolve => {
-            service.onDidChangeTreeItem(() => resolve(true))
-            setTimeout(() => resolve(false), 1000)
-        })
-
-        await toggleExecuteCommandFlag(service, vscode.window, settings)
-        assert.ok(client.updateService.calledOnce)
-        assert.ok(await didChange)
-    })
-})
diff --git a/src/test/ecs/model.test.ts b/src/test/ecs/model.test.ts
deleted file mode 100644
index 69f97987162..00000000000
--- a/src/test/ecs/model.test.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Cluster, Container, Service } from '../../ecs/model'
-import { DefaultEcsClient } from '../../shared/clients/ecsClient'
-import { assertChildren, assertTreeItem } from '../shared/treeview/testUtil'
-import { createCollectionFromPages } from '../utilities/collectionUtils'
-import { stub } from '../utilities/stubber'
-
-const clusterData = {
-    clusterArn: 'arn:aws:ecs:us-east-1:012345678910:cluster/my-cluster',
-    clusterName: 'my-cluster',
-}
-
-const serviceData = {
-    serviceArn: 'arn:aws:ecs:us-east-1:012345678910:service/my-cluster/my-service',
-    serviceName: 'my-service',
-    taskDefinition: 'arn:aws:ecs:us-east-1:012345678910:task-definition/my-task:1',
-}
-
-const containerData = {
-    name: 'my-container',
-    clusterArn: clusterData.clusterArn,
-    taskRoleArn: 'arn:aws:iam::012345678910:role/my-role',
-}
-
-const getClient = () => stub(DefaultEcsClient, { regionCode: 'us-east-1' })
-
-describe('Container', function () {
-    it('has a tree item', async function () {
-        const container = new Container(getClient(), containerData)
-
-        await assertTreeItem(container, {
-            label: containerData.name,
-            contextValue: 'awsEcsContainerNodeExecDisabled',
-        })
-    })
-
-    it('has a tree item when "enableExecuteCommand" is set', async function () {
-        const container = new Container(getClient(), { ...containerData, enableExecuteCommand: true })
-
-        await assertTreeItem(container, {
-            label: containerData.name,
-            contextValue: 'awsEcsContainerNodeExecEnabled',
-        })
-    })
-})
-
-describe('Service', function () {
-    it('has a tree item', async function () {
-        const service = new Service(getClient(), serviceData)
-
-        await assertTreeItem(service, {
-            label: serviceData.serviceName,
-            contextValue: 'awsEcsServiceNode.DISABLED',
-        })
-    })
-
-    it('lists containers', async function () {
-        const client = getClient()
-        client.describeTaskDefinition.resolves({ taskDefinition: { containerDefinitions: [containerData] } })
-
-        const cluster = new Service(client, serviceData)
-        await assertChildren(cluster, containerData.name)
-    })
-})
-
-describe('Cluster', function () {
-    it('has a tree item', async function () {
-        const cluster = new Cluster(getClient(), clusterData)
-
-        await assertTreeItem(cluster, {
-            label: clusterData.clusterName,
-            tooltip: clusterData.clusterArn,
-            contextValue: 'awsEcsClusterNode',
-        })
-    })
-
-    it('lists services', async function () {
-        const client = getClient()
-        client.listServices.returns(createCollectionFromPages([serviceData]))
-
-        const cluster = new Cluster(client, clusterData)
-        await assertChildren(cluster, serviceData.serviceName)
-    })
-})
diff --git a/src/test/ecs/util.test.ts b/src/test/ecs/util.test.ts
deleted file mode 100644
index d01a2f72d87..00000000000
--- a/src/test/ecs/util.test.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { stub } from '../utilities/stubber'
-import { checkPermissionsForSsm } from '../../ecs/util'
-import { DefaultIamClient } from '../../shared/clients/iamClient'
-
-describe('checkPermissionsForSsm', function () {
-    const getClient = () => stub(DefaultIamClient, { regionCode: '' })
-
-    it('rejects task definitions without a role', async function () {
-        await assert.rejects(() => checkPermissionsForSsm(getClient(), {}), /must have a task role/i)
-    })
-
-    it('rejects roles if any permissions are rejected', async function () {
-        const client = getClient()
-        client.getDeniedActions.resolves([{ EvalActionName: 'foo', EvalDecision: 'explicitDeny' }])
-        await assert.rejects(() => checkPermissionsForSsm(client, { taskRoleArn: 'bar' }), /insufficient permissions/i)
-    })
-
-    it('returns successfully if no permissions are rejected', async function () {
-        const client = getClient()
-        client.getDeniedActions.resolves([])
-        await checkPermissionsForSsm(client, { taskRoleArn: 'bar' })
-    })
-})
diff --git a/src/test/ecs/wizards/executeCommand.test.ts b/src/test/ecs/wizards/executeCommand.test.ts
deleted file mode 100644
index 7a04fbf641d..00000000000
--- a/src/test/ecs/wizards/executeCommand.test.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { createWizardTester, WizardTester } from '../../../test/shared/wizards/wizardTestUtils'
-import { CommandWizard, CommandWizardState } from '../../../ecs/wizards/executeCommand'
-import { Container } from '../../../ecs/model'
-import { stub } from '../../utilities/stubber'
-import { DefaultEcsClient } from '../../../shared/clients/ecsClient'
-
-describe('CreateServiceWizard', function () {
-    let tester: WizardTester<CommandWizardState>
-
-    const createContainer = () =>
-        new Container(stub(DefaultEcsClient, { regionCode: '' }), { clusterArn: '', taskRoleArn: '' })
-
-    beforeEach(function () {
-        tester = createWizardTester(new CommandWizard(createContainer(), false))
-    })
-
-    it('should prompt for tasks and then command', function () {
-        tester.task.assertShowFirst()
-        tester.command.assertShowSecond()
-    })
-
-    it('should ask for confirmation last', function () {
-        tester = createWizardTester(new CommandWizard(createContainer(), true))
-        tester.task.assertShowFirst()
-        tester.command.assertShowSecond()
-        tester.confirmation.assertShowThird()
-    })
-
-    it('should not ask for confirmation if suppressed', function () {
-        tester.confirmation.assertDoesNotShow()
-    })
-})
diff --git a/src/test/eventSchemas/explorer/registryItemNode.test.ts b/src/test/eventSchemas/explorer/registryItemNode.test.ts
deleted file mode 100644
index f5f3796f92f..00000000000
--- a/src/test/eventSchemas/explorer/registryItemNode.test.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-/*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as os from 'os'
-import * as sinon from 'sinon'
-import { Schemas } from 'aws-sdk'
-import { RegistryItemNode } from '../../../eventSchemas/explorer/registryItemNode'
-import { SchemaItemNode } from '../../../eventSchemas/explorer/schemaItemNode'
-import { SchemasNode } from '../../../eventSchemas/explorer/schemasNode'
-import { DefaultSchemaClient } from '../../../shared/clients/schemaClient'
-import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
-import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
-import {
-    assertNodeListOnlyHasErrorNode,
-    assertNodeListOnlyHasPlaceholderNode,
-} from '../../utilities/explorerNodeAssertions'
-import { asyncGenerator } from '../../utilities/collectionUtils'
-import { getIcon } from '../../../shared/icons'
-import { stub } from '../../utilities/stubber'
-
-function createSchemaClient(data?: { schemas?: Schemas.SchemaSummary[]; registries?: Schemas.RegistrySummary[] }) {
-    const client = stub(DefaultSchemaClient, { regionCode: 'code' })
-    client.listSchemas.callsFake(() => asyncGenerator(data?.schemas ?? []))
-    client.listRegistries.callsFake(() => asyncGenerator(data?.registries ?? []))
-
-    return client
-}
-
-describe('RegistryItemNode', function () {
-    let fakeRegistry: Schemas.RegistrySummary
-
-    before(function () {
-        fakeRegistry = {
-            RegistryName: 'myRegistry',
-            RegistryArn: 'arn:aws:schemas:us-west-2:434418839121:registry/myRegistry',
-        }
-    })
-
-    // Validates we tagged the node correctly.
-    it('initializes name, tooltip, and icon', async function () {
-        const testNode: RegistryItemNode = generateTestNode()
-
-        assert.strictEqual(testNode.label, `${fakeRegistry.RegistryName}`)
-        assert.strictEqual(testNode.tooltip, `${fakeRegistry.RegistryName}${os.EOL}${fakeRegistry.RegistryArn}`)
-        assert.strictEqual(testNode.iconPath, getIcon('aws-schemas-registry'))
-    })
-
-    it('returns placeholder node if no children are present', async function () {
-        const testNode = generateTestNode()
-        const childNodes = await testNode.getChildren()
-
-        assert(childNodes !== undefined)
-        assert.strictEqual(childNodes.length, 1)
-        assert.strictEqual(childNodes[0] instanceof PlaceholderNode, true)
-    })
-
-    it('returns schemas that belong to Registry', async function () {
-        const schema1Item: Schemas.SchemaSummary = {
-            SchemaArn: 'arn:schema1',
-            SchemaName: 'schema1Name',
-        }
-
-        const schema2Item: Schemas.SchemaSummary = {
-            SchemaArn: 'arn:schema1',
-            SchemaName: 'schema2Name',
-        }
-
-        const schema3Item: Schemas.SchemaSummary = {
-            SchemaArn: 'arn:schema1',
-            SchemaName: 'schema3Name',
-        }
-
-        const schemaClient = createSchemaClient({ schemas: [schema1Item, schema2Item, schema3Item] })
-        const testNode: RegistryItemNode = generateTestNode(schemaClient)
-
-        const childNodes = await testNode.getChildren()
-        assert(childNodes !== undefined)
-        assert.strictEqual(childNodes.length, 3)
-
-        assert(childNodes[0] instanceof SchemaItemNode)
-        assert.strictEqual((childNodes[0] as SchemaItemNode).label, schema1Item.SchemaName)
-
-        assert(childNodes[1] instanceof SchemaItemNode)
-        assert.strictEqual((childNodes[1] as SchemaItemNode).label, schema2Item.SchemaName)
-
-        assert(childNodes[1] instanceof SchemaItemNode)
-        assert.strictEqual((childNodes[2] as SchemaItemNode).label, schema3Item.SchemaName)
-    })
-
-    function generateTestNode(client = createSchemaClient()): RegistryItemNode {
-        return new RegistryItemNode(fakeRegistry, client)
-    }
-})
-
-describe('DefaultRegistryNode', function () {
-    afterEach(function () {
-        sinon.restore()
-    })
-
-    it('Sorts Registries', async function () {
-        const inputRegistryNames: string[] = ['zebra', 'Antelope', 'aardvark', 'elephant']
-        const client = createSchemaClient({
-            registries: inputRegistryNames.map(name => ({ RegistryName: name })),
-        })
-
-        const schemasNode = new SchemasNode(client)
-        const children = await schemasNode.getChildren()
-
-        assert.ok(children, 'Expected to get Registry node children')
-        assert.strictEqual(
-            inputRegistryNames.length,
-            children.length,
-            `Expected ${inputRegistryNames.length} Registry children, got ${children.length}`
-        )
-
-        function assertChildNodeRegistryName(actualChildNode: AWSTreeNodeBase, expectedNodeText: string) {
-            assert.strictEqual(actualChildNode instanceof RegistryItemNode, true, 'Child node was not a Registry Node')
-
-            const node: RegistryItemNode = actualChildNode as RegistryItemNode
-            assert.strictEqual(
-                node.registryName,
-                expectedNodeText,
-                `Expected child node to have registry ${expectedNodeText} but got ${node.registryName}`
-            )
-        }
-
-        assertChildNodeRegistryName(children[0], 'aardvark')
-        assertChildNodeRegistryName(children[1], 'Antelope')
-        assertChildNodeRegistryName(children[2], 'elephant')
-        assertChildNodeRegistryName(children[3], 'zebra')
-    })
-
-    it('returns placeholder node if no children are present', async function () {
-        const schemasNode = new SchemasNode(createSchemaClient())
-        const childNodes = await schemasNode.getChildren()
-
-        assertNodeListOnlyHasPlaceholderNode(childNodes)
-    })
-
-    it('handles error', async function () {
-        //typo in the name of the method
-        class ThrowErrorDefaultSchemaRegistrynNode extends SchemasNode {
-            public constructor() {
-                super(createSchemaClient())
-            }
-
-            public override async updateChildren(): Promise<void> {
-                throw new Error('Hello there!')
-            }
-        }
-
-        const testNode: ThrowErrorDefaultSchemaRegistrynNode = new ThrowErrorDefaultSchemaRegistrynNode()
-
-        const childNodes = await testNode.getChildren()
-        assertNodeListOnlyHasErrorNode(childNodes)
-    })
-})
diff --git a/src/test/fake/fakeEnvironmentVariableCollection.ts b/src/test/fake/fakeEnvironmentVariableCollection.ts
deleted file mode 100644
index b0e921d36c8..00000000000
--- a/src/test/fake/fakeEnvironmentVariableCollection.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-
-/**
- * copied from https://github.com/microsoft/vscode/blob/e9d40443a2a09e4efa1ffc5c182b57f8485080da/src/vs/workbench/api/common/extHostTerminalService.ts#L832
- */
-export class FakeEnvironmentVariableCollection implements vscode.EnvironmentVariableCollection {
-    readonly map: Map<string, vscode.EnvironmentVariableMutator> = new Map()
-    private _persistent: boolean = true
-
-    public get persistent(): boolean {
-        return this._persistent
-    }
-    public set persistent(value: boolean) {
-        this._persistent = value
-        this._onDidChangeCollection.fire()
-    }
-
-    protected readonly _onDidChangeCollection: vscode.EventEmitter<void> = new vscode.EventEmitter<void>()
-    get onDidChangeCollection(): vscode.Event<void> {
-        return this._onDidChangeCollection && this._onDidChangeCollection.event
-    }
-
-    constructor() {
-        this.map = new Map()
-    }
-
-    get size(): number {
-        return this.map.size
-    }
-
-    replace(variable: string, value: string): void {
-        this._setIfDiffers(variable, { value, type: vscode.EnvironmentVariableMutatorType.Replace })
-    }
-
-    append(variable: string, value: string): void {
-        this._setIfDiffers(variable, { value, type: vscode.EnvironmentVariableMutatorType.Append })
-    }
-
-    prepend(variable: string, value: string): void {
-        this._setIfDiffers(variable, { value, type: vscode.EnvironmentVariableMutatorType.Prepend })
-    }
-
-    private _setIfDiffers(variable: string, mutator: vscode.EnvironmentVariableMutator): void {
-        const current = this.map.get(variable)
-        if (!current || current.value !== mutator.value || current.type !== mutator.type) {
-            this.map.set(variable, mutator)
-            this._onDidChangeCollection.fire()
-        }
-    }
-
-    get(variable: string): vscode.EnvironmentVariableMutator | undefined {
-        return this.map.get(variable)
-    }
-
-    forEach(
-        callback: (
-            variable: string,
-            mutator: vscode.EnvironmentVariableMutator,
-            collection: vscode.EnvironmentVariableCollection
-        ) => any,
-        thisArg?: any
-    ): void {
-        this.map.forEach((value, key) => callback.call(thisArg, key, value, this))
-    }
-
-    delete(variable: string): void {
-        this.map.delete(variable)
-        this._onDidChangeCollection.fire()
-    }
-
-    clear(): void {
-        this.map.clear()
-        this._onDidChangeCollection.fire()
-    }
-}
diff --git a/src/test/feedback/commands/submitFeedbackListener.test.ts b/src/test/feedback/commands/submitFeedbackListener.test.ts
deleted file mode 100644
index 97468b89136..00000000000
--- a/src/test/feedback/commands/submitFeedbackListener.test.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { anything, deepEqual, instance, mock, verify, when } from '../../utilities/mockito'
-import { TelemetryService } from '../../../shared/telemetry/telemetryService'
-import * as assert from 'assert'
-import { FeedbackWebview } from '../../../feedback/vue/submitFeedback'
-
-const comment = 'comment'
-const sentiment = 'Positive'
-const message = { command: 'submitFeedback', comment: comment, sentiment: sentiment }
-
-describe('submitFeedbackListener', function () {
-    let mockTelemetry: TelemetryService
-
-    beforeEach(function () {
-        mockTelemetry = mock()
-    })
-
-    it('submits feedback, disposes, and shows message on success', async function () {
-        const webview = new FeedbackWebview(instance(mockTelemetry))
-        await webview.submit(message)
-
-        verify(mockTelemetry.postFeedback(deepEqual({ comment: comment, sentiment: sentiment }))).once()
-        assert.ok(webview.isDisposed)
-    })
-
-    it('submits feedback and posts failure message on failure', async function () {
-        const error = 'Expected failure'
-
-        when(mockTelemetry.postFeedback(anything())).thenThrow(new Error(error))
-
-        const webview = new FeedbackWebview(instance(mockTelemetry))
-        const result = await webview.submit(message)
-
-        assert.strictEqual(result, error)
-    })
-})
diff --git a/src/test/globalSetup.test.ts b/src/test/globalSetup.test.ts
deleted file mode 100644
index 8ec30ddb2ee..00000000000
--- a/src/test/globalSetup.test.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-/*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * Before/After hooks for all "unit" tests
- */
-import * as assert from 'assert'
-import { appendFileSync, mkdirpSync, remove } from 'fs-extra'
-import { join } from 'path'
-import { format } from 'util'
-import globals from '../shared/extensionGlobals'
-import { VSCODE_EXTENSION_ID } from '../shared/extensions'
-import { CodelensRootRegistry } from '../shared/fs/codelensRootRegistry'
-import { CloudFormationTemplateRegistry } from '../shared/fs/templateRegistry'
-import { getLogger, LogLevel } from '../shared/logger'
-import { setLogger } from '../shared/logger/logger'
-import { activateExtension } from '../shared/utilities/vsCodeUtils'
-import { FakeExtensionContext, FakeMemento } from './fakeExtensionContext'
-import { TestLogger } from './testLogger'
-import * as testUtil from './testUtil'
-
-const testReportDir = join(__dirname, '../../../.test-reports')
-const testLogOutput = join(testReportDir, 'testLog.log')
-
-// Expectation: Tests are not run concurrently
-let testLogger: TestLogger | undefined
-
-before(async function () {
-    // Clean up and set up test logs
-    try {
-        await remove(testLogOutput)
-    } catch (e) {}
-    mkdirpSync(testReportDir)
-
-    // Extension activation has many side-effects such as changing globals
-    // For stability in tests we will wait until the extension has activated prior to injecting mocks
-    const activationLogger = (msg: string, ...meta: any[]) => console.log(format(msg, ...meta))
-    await activateExtension(VSCODE_EXTENSION_ID.awstoolkit, false, activationLogger)
-    const fakeContext = await FakeExtensionContext.create()
-    fakeContext.globalStorageUri = (await testUtil.createTestWorkspaceFolder('globalStoragePath')).uri
-    fakeContext.extensionPath = globals.context.extensionPath
-    Object.assign(globals, { context: fakeContext })
-})
-
-after(async function () {
-    testUtil.deleteTestTempDirs()
-})
-
-beforeEach(async function () {
-    // Set every test up so that TestLogger is the logger used by toolkit code
-    testLogger = setupTestLogger()
-    globals.templateRegistry = new CloudFormationTemplateRegistry()
-    globals.codelensRootRegistry = new CodelensRootRegistry()
-
-    // Enable telemetry features for tests. The metrics won't actually be posted.
-    globals.telemetry.telemetryEnabled = true
-    globals.telemetry.clearRecords()
-    globals.telemetry.logger.clear()
-    ;(globals.context as FakeExtensionContext).globalState = new FakeMemento()
-
-    await testUtil.closeAllEditors()
-})
-
-afterEach(function () {
-    // Prevent other tests from using the same TestLogger instance
-    teardownTestLogger(this.currentTest?.fullTitle() as string)
-    testLogger = undefined
-    globals.templateRegistry.dispose()
-    globals.codelensRootRegistry.dispose()
-})
-
-/**
- * Provides the TestLogger to tests that want to access it.
- * Verifies that the TestLogger instance is still the one set as the toolkit's logger.
- */
-export function getTestLogger(): TestLogger {
-    const logger = getLogger()
-    assert.strictEqual(logger, testLogger, 'The expected test logger is not the current logger')
-    assert.ok(testLogger, 'TestLogger was expected to exist')
-
-    return logger!
-}
-
-function setupTestLogger(): TestLogger {
-    // write the same logger to each channel.
-    // That way, we don't have to worry about which channel is being logged to for inspection.
-    const logger = new TestLogger()
-    setLogger(logger, 'main')
-    setLogger(logger, 'channel')
-    setLogger(logger, 'debugConsole')
-
-    return logger
-}
-
-function teardownTestLogger(testName: string) {
-    writeLogsToFile(testName)
-
-    setLogger(undefined, 'main')
-    setLogger(undefined, 'channel')
-    setLogger(undefined, 'debugConsole')
-}
-
-function writeLogsToFile(testName: string) {
-    const entries = testLogger?.getLoggedEntries()
-    entries?.unshift(`=== Starting test "${testName}" ===`)
-    entries?.push(`=== Ending test "${testName}" ===\n\n`)
-    appendFileSync(testLogOutput, entries?.join('\n') ?? '', 'utf8')
-}
-
-export function assertLogsContain(text: string, exactMatch: boolean, severity: LogLevel) {
-    assert.ok(
-        getTestLogger()
-            .getLoggedEntries(severity)
-            .some(e =>
-                e instanceof Error
-                    ? exactMatch
-                        ? e.message === text
-                        : e.message.includes(text)
-                    : exactMatch
-                    ? e === text
-                    : e.includes(text)
-            ),
-        `Expected to find "${text}" in the logs as type "${severity}"`
-    )
-}
diff --git a/src/test/index.ts b/src/test/index.ts
deleted file mode 100644
index ac8a9d68e4a..00000000000
--- a/src/test/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { runTests } from './testRunner'
-
-export function run(): Promise<void> {
-    return runTests('src/test', ['src/test/globalSetup.test.ts'])
-}
diff --git a/src/test/iot/commands/attachCertificate.test.ts b/src/test/iot/commands/attachCertificate.test.ts
deleted file mode 100644
index c71003a1f15..00000000000
--- a/src/test/iot/commands/attachCertificate.test.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { Iot } from 'aws-sdk'
-import { attachCertificateCommand, CertGen } from '../../../iot/commands/attachCertificate'
-import { IotThingFolderNode } from '../../../iot/explorer/iotThingFolderNode'
-import { IotThingNode } from '../../../iot/explorer/iotThingNode'
-import { IotClient } from '../../../shared/clients/iotClient'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { anything, mock, instance, when, deepEqual, verify } from '../../utilities/mockito'
-import { FakeCommands } from '../../shared/vscode/fakeCommands'
-import { DataQuickPickItem } from '../../../shared/ui/pickerPrompter'
-import { PromptResult } from '../../../shared/ui/prompter'
-import { Window } from '../../../shared/vscode/window'
-import globals from '../../../shared/extensionGlobals'
-
-describe('attachCertCommand', function () {
-    const thingName = 'iot-thing'
-    let iot: IotClient
-    let certs: Iot.Certificate[]
-    let thingNode: IotThingNode
-    let window: FakeWindow
-    let selection: number = 0
-
-    const prompt: (iot: IotClient, certFetch: CertGen, window?: Window) => Promise<PromptResult<Iot.Certificate>> =
-        async (iot, certFetch) => {
-            const iterable = certFetch(iot, window)
-            const responses: DataQuickPickItem<Iot.Certificate>[] = []
-            for await (const response of iterable) {
-                responses.push(...response)
-            }
-            return selection > -1 ? (responses[selection].data as Iot.Certificate) : undefined
-        }
-
-    beforeEach(function () {
-        iot = mock()
-        thingNode = new IotThingNode({ name: thingName, arn: 'arn' }, {} as IotThingFolderNode, instance(iot))
-        certs = [
-            {
-                certificateId: 'cert1',
-                certificateArn: 'arn1',
-                status: 'ACTIVE',
-                creationDate: new globals.clock.Date(),
-            },
-            {
-                certificateId: 'cert2',
-                certificateArn: 'arn2',
-                status: 'INACTIVE',
-                creationDate: new globals.clock.Date(),
-            },
-            { certificateId: 'cert3', certificateArn: 'arn3', status: 'ACTIVE' },
-        ]
-        window = new FakeWindow()
-    })
-
-    it('attaches selected certificate', async function () {
-        selection = 0
-        const commands = new FakeCommands()
-        when(iot.listCertificates(anything())).thenResolve({ certificates: certs })
-        await attachCertificateCommand(thingNode, prompt, window, commands)
-
-        verify(iot.attachThingPrincipal(deepEqual({ thingName, principal: 'arn1' }))).once()
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [thingNode])
-    })
-
-    it('shows an error message if certificates are not fetched', async function () {
-        when(iot.listCertificates(anything())).thenReject(new Error('Expected failure'))
-
-        selection = -1
-        const commands = new FakeCommands()
-        await attachCertificateCommand(thingNode, prompt, window, commands)
-
-        verify(iot.attachThingPrincipal(anything())).never()
-
-        assert.ok(window.message.error?.includes('Failed to retrieve certificate'))
-
-        assert.strictEqual(commands.command, undefined)
-    })
-
-    it('shows an error message if attaching certificate fails', async function () {
-        selection = 1
-        when(iot.listCertificates(anything())).thenResolve({ certificates: certs })
-        when(iot.attachThingPrincipal(anything())).thenReject(new Error('Expected failure'))
-
-        const commands = new FakeCommands()
-        await attachCertificateCommand(thingNode, prompt, window, commands)
-
-        assert.ok(window.message.error?.includes('Failed to attach certificate cert2'))
-
-        assert.strictEqual(commands.command, undefined)
-    })
-
-    it('Does nothing if no certificate is chosen', async function () {
-        selection = -1
-        when(iot.listCertificates(anything())).thenResolve({ certificates: certs })
-
-        const commands = new FakeCommands()
-        await attachCertificateCommand(thingNode, prompt, window, commands)
-
-        verify(iot.attachThingPrincipal(anything())).never()
-
-        assert.strictEqual(commands.command, undefined)
-    })
-})
diff --git a/src/test/iot/commands/attachPolicy.test.ts b/src/test/iot/commands/attachPolicy.test.ts
deleted file mode 100644
index a8341c827e9..00000000000
--- a/src/test/iot/commands/attachPolicy.test.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { Iot } from 'aws-sdk'
-import { attachPolicyCommand, PolicyGen } from '../../../iot/commands/attachPolicy'
-import { IotCertsFolderNode } from '../../../iot/explorer/iotCertFolderNode'
-import { IotCertWithPoliciesNode } from '../../../iot/explorer/iotCertificateNode'
-import { IotClient } from '../../../shared/clients/iotClient'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { anything, mock, instance, when, deepEqual, verify } from '../../utilities/mockito'
-import { FakeCommands } from '../../shared/vscode/fakeCommands'
-import { DataQuickPickItem } from '../../../shared/ui/pickerPrompter'
-import { PromptResult } from '../../../shared/ui/prompter'
-import { Window } from '../../../shared/vscode/window'
-import { IotNode } from '../../../iot/explorer/iotNodes'
-import globals from '../../../shared/extensionGlobals'
-
-describe('attachPolicyCommand', function () {
-    const certId = 'iot-certificate'
-    let iot: IotClient
-    let policies: Iot.Policy[]
-    let certNode: IotCertWithPoliciesNode
-    let window: FakeWindow
-    let selection: number = 0
-    const prompt: (iot: IotClient, policyFetch: PolicyGen, window?: Window) => Promise<PromptResult<Iot.Policy>> =
-        async (iot, policyFetch) => {
-            const iterable = policyFetch(iot, window)
-            const responses: DataQuickPickItem<Iot.Policy>[] = []
-            for await (const response of iterable) {
-                responses.push(...response)
-            }
-            return selection > -1 ? (responses[selection].data as Iot.Policy) : undefined
-        }
-
-    beforeEach(function () {
-        iot = mock()
-        certNode = new IotCertWithPoliciesNode(
-            { id: certId, arn: 'arn', activeStatus: 'ACTIVE', creationDate: new globals.clock.Date() },
-            new IotCertsFolderNode(instance(iot), new IotNode(instance(iot))),
-            instance(iot)
-        )
-        policies = [
-            { policyName: 'policy1', policyArn: 'arn1' },
-            { policyName: 'policy2', policyArn: 'arn2' },
-        ]
-        window = new FakeWindow()
-    })
-
-    it('attaches selected policy', async function () {
-        selection = 0
-        const commands = new FakeCommands()
-        when(iot.listPolicies(anything())).thenResolve({ policies })
-        await attachPolicyCommand(certNode, prompt, window, commands)
-
-        verify(iot.attachPolicy(deepEqual({ policyName: 'policy1', target: 'arn' }))).once()
-    })
-
-    it('shows an error message if policies are not fetched', async function () {
-        when(iot.listPolicies(anything())).thenReject(new Error('Expected failure'))
-
-        selection = -1
-        const commands = new FakeCommands()
-        await attachPolicyCommand(certNode, prompt, window, commands)
-
-        verify(iot.attachPolicy(anything())).never()
-
-        assert.ok(window.message.error?.includes('Failed to retrieve policies'))
-
-        assert.strictEqual(commands.command, undefined)
-    })
-
-    it('shows an error message if attaching policy fails', async function () {
-        selection = 1
-        when(iot.listPolicies(anything())).thenResolve({ policies })
-        when(iot.attachPolicy(anything())).thenReject(new Error('Expected failure'))
-
-        const commands = new FakeCommands()
-        await attachPolicyCommand(certNode, prompt, window, commands)
-
-        assert.ok(window.message.error?.includes('Failed to attach policy policy2'))
-
-        assert.strictEqual(commands.command, undefined)
-    })
-
-    it('Does nothing if no policy is chosen', async function () {
-        selection = -1
-        when(iot.listPolicies(anything())).thenResolve({ policies })
-
-        const commands = new FakeCommands()
-        await attachPolicyCommand(certNode, prompt, window, commands)
-
-        verify(iot.attachPolicy(anything())).never()
-
-        assert.strictEqual(commands.command, undefined)
-    })
-})
diff --git a/src/test/iot/commands/copyEndpoint.test.ts b/src/test/iot/commands/copyEndpoint.test.ts
deleted file mode 100644
index 5b7f1852d2d..00000000000
--- a/src/test/iot/commands/copyEndpoint.test.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { copyEndpointCommand } from '../../../iot/commands/copyEndpoint'
-import { IotNode } from '../../../iot/explorer/iotNodes'
-import { IotClient } from '../../../shared/clients/iotClient'
-import { FakeEnv } from '../../shared/vscode/fakeEnv'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { mock, instance, when } from '../../utilities/mockito'
-
-describe('copyEndpointCommand', function () {
-    let iot: IotClient
-    let node: IotNode
-
-    beforeEach(function () {
-        iot = mock()
-        node = new IotNode(instance(iot))
-    })
-
-    it('copies endpoint to clipboard', async function () {
-        when(iot.getEndpoint()).thenResolve('endpoint')
-
-        const window = new FakeWindow()
-        const env = new FakeEnv()
-        await copyEndpointCommand(node, window, env)
-
-        assert.strictEqual(env.clipboard.text, 'endpoint')
-    })
-
-    it('shows an error message when retrieval fails', async function () {
-        when(iot.getEndpoint()).thenReject(new Error('Expected failure'))
-
-        const window = new FakeWindow()
-        const env = new FakeEnv()
-        await copyEndpointCommand(node, window, env)
-
-        assert.strictEqual(window.message.error, 'Failed to retrieve endpoint')
-    })
-})
diff --git a/src/test/iot/commands/createCert.test.ts b/src/test/iot/commands/createCert.test.ts
deleted file mode 100644
index e419e5ac123..00000000000
--- a/src/test/iot/commands/createCert.test.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-import { createCertificateCommand } from '../../../iot/commands/createCert'
-import { IotNode } from '../../../iot/explorer/iotNodes'
-import { IotClient } from '../../../shared/clients/iotClient'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { anything, mock, instance, when, deepEqual, verify } from '../../utilities/mockito'
-import { FakeCommands } from '../../shared/vscode/fakeCommands'
-import { Window } from '../../../shared/vscode/window'
-import { IotCertsFolderNode } from '../../../iot/explorer/iotCertFolderNode'
-import { Iot } from 'aws-sdk'
-
-describe('createCertificateCommand', function () {
-    const certificateId = 'new-certificate'
-    const certificateArn = 'arn'
-    const certificatePem = 'certPem'
-    const keyPair = { PrivateKey: 'private', PublicKey: 'public' }
-    const certificate: Iot.CreateKeysAndCertificateResponse = { certificateId, certificateArn, certificatePem, keyPair }
-    let iot: IotClient
-    let node: IotCertsFolderNode
-    let saveLocation: vscode.Uri | undefined = vscode.Uri.file('/certificate.txt')
-    let saveSuccess: boolean
-    const promptFolder: (window: Window) => Promise<vscode.Uri | undefined> = async window => {
-        return saveLocation
-    }
-    const saveFiles: (
-        window: Window,
-        basePath: vscode.Uri,
-        certId: string,
-        certPem: string,
-        privateKey: string,
-        publicKey: string
-    ) => Promise<boolean> = async (window, basePath, certId, certPem, privateKey, publicKey) => {
-        return saveSuccess
-    }
-
-    beforeEach(function () {
-        iot = mock()
-        node = new IotCertsFolderNode(instance(iot), new IotNode(instance(iot)))
-        saveLocation = vscode.Uri.file('/certificate')
-        saveSuccess = true
-    })
-
-    it('prompts for save location, creates certificate, and saves to filesystem', async function () {
-        when(iot.createCertificateAndKeys(deepEqual({ setAsActive: false }))).thenResolve(certificate)
-
-        const window = new FakeWindow()
-        const commands = new FakeCommands()
-        await createCertificateCommand(node, promptFolder, saveFiles, window, commands)
-
-        assert.strictEqual(window.message.information, 'Created certificate new-certificate')
-
-        verify(iot.deleteCertificate(anything())).never()
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [node])
-    })
-
-    it('does nothing when no save folder is selected', async function () {
-        saveLocation = undefined
-        const window = new FakeWindow()
-        const commands = new FakeCommands()
-        await createCertificateCommand(node, promptFolder, saveFiles, window, commands)
-
-        verify(iot.createCertificateAndKeys(anything())).never()
-        assert.strictEqual(commands.command, undefined)
-    })
-
-    it('shows an error message if creating certificate fails', async function () {
-        when(iot.createCertificateAndKeys(anything())).thenReject(new Error('Expected failure'))
-
-        const window = new FakeWindow()
-        const commands = new FakeCommands()
-        await createCertificateCommand(node, promptFolder, saveFiles, window, commands)
-
-        assert.ok(window.message.error?.includes('Failed to create certificate'))
-
-        assert.strictEqual(commands.command, undefined)
-    })
-
-    it('shows an error message if created certificate is invalid', async function () {
-        when(iot.createCertificateAndKeys(deepEqual({ setAsActive: false }))).thenResolve({})
-
-        const window = new FakeWindow()
-        const commands = new FakeCommands()
-        await createCertificateCommand(node, promptFolder, saveFiles, window, commands)
-
-        assert.ok(window.message.error?.includes('Failed to create certificate'))
-
-        assert.strictEqual(commands.command, undefined)
-    })
-
-    it('deletes certificate if it cannot be saved', async function () {
-        when(iot.createCertificateAndKeys(deepEqual({ setAsActive: false }))).thenResolve(certificate)
-        saveSuccess = false
-
-        const window = new FakeWindow()
-        const commands = new FakeCommands()
-        await createCertificateCommand(node, promptFolder, saveFiles, window, commands)
-
-        assert.strictEqual(window.message.information, 'Created certificate new-certificate')
-
-        verify(iot.deleteCertificate(deepEqual({ certificateId }))).once()
-    })
-
-    it('shows an error message if certificate cannot be deleted', async function () {
-        when(iot.createCertificateAndKeys(deepEqual({ setAsActive: false }))).thenResolve(certificate)
-        when(iot.deleteCertificate(anything())).thenReject(new Error('Expected failure'))
-        saveSuccess = false
-
-        const window = new FakeWindow()
-        const commands = new FakeCommands()
-        await createCertificateCommand(node, promptFolder, saveFiles, window, commands)
-
-        assert.strictEqual(window.message.information, 'Created certificate new-certificate')
-        assert.ok(window.message.error?.includes('Failed to delete Certificate new-certificate'))
-    })
-})
diff --git a/src/test/iot/commands/createPolicy.test.ts b/src/test/iot/commands/createPolicy.test.ts
deleted file mode 100644
index cb5cc58e817..00000000000
--- a/src/test/iot/commands/createPolicy.test.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { createPolicyCommand } from '../../../iot/commands/createPolicy'
-import { IotNode } from '../../../iot/explorer/iotNodes'
-import { IotClient } from '../../../shared/clients/iotClient'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { anything, mock, instance, when, deepEqual, verify } from '../../utilities/mockito'
-import { FakeCommands } from '../../shared/vscode/fakeCommands'
-import { Window } from '../../../shared/vscode/window'
-import { IotPolicyFolderNode } from '../../../iot/explorer/iotPolicyFolderNode'
-
-describe('createPolicyCommand', function () {
-    const policyName = 'test-policy'
-    let iot: IotClient
-    let policyObject: any
-    let policyDocument: string
-    let node: IotPolicyFolderNode
-    let returnUndefined: boolean = false
-    const getPolicy: (window: Window) => Promise<Buffer | undefined> = async window => {
-        if (returnUndefined) {
-            return undefined
-        }
-        return Buffer.from(policyDocument, 'utf-8')
-    }
-
-    beforeEach(function () {
-        iot = mock()
-        node = new IotPolicyFolderNode(instance(iot), new IotNode(instance(iot)))
-        policyObject = { Version: '2012-10-17', Statement: '' }
-        policyDocument = JSON.stringify(policyObject)
-        returnUndefined = false
-    })
-
-    it('prompts for policy name, creates policy, and shows success', async function () {
-        const window = new FakeWindow({ inputBox: { input: policyName } })
-        const commands = new FakeCommands()
-        returnUndefined = false
-        await createPolicyCommand(node, getPolicy, window, commands)
-
-        assert.strictEqual(window.inputBox.options?.prompt, 'Enter a new policy name')
-        assert.strictEqual(window.inputBox.options?.placeHolder, 'Policy Name')
-
-        assert.strictEqual(window.message.information, 'Created Policy test-policy')
-
-        verify(iot.createPolicy(deepEqual({ policyName, policyDocument }))).once()
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [node])
-    })
-
-    it('does nothing when prompt is canceled', async function () {
-        await createPolicyCommand(node, getPolicy, new FakeWindow(), new FakeCommands())
-
-        verify(iot.createPolicy(anything())).never()
-    })
-
-    it('warns when policy name has invalid length', async function () {
-        const window = new FakeWindow({ inputBox: { input: '' } })
-        const commands = new FakeCommands()
-        await createPolicyCommand(node, getPolicy, window, commands)
-
-        assert.strictEqual(window.inputBox.errorMessage, 'Policy name must be between 1 and 128 characters long')
-    })
-
-    it('warns when policy name has invalid characters', async function () {
-        const window = new FakeWindow({ inputBox: { input: 'illegal/characters' } })
-        const commands = new FakeCommands()
-        await createPolicyCommand(node, getPolicy, window, commands)
-
-        assert.strictEqual(
-            window.inputBox.errorMessage,
-            'Policy name must contain only alphanumeric characters and/or the following: +=.,@-'
-        )
-    })
-
-    it('does nothing when policy document is not read', async function () {
-        returnUndefined = true
-        const window = new FakeWindow({ inputBox: { input: policyName } })
-        const commands = new FakeCommands()
-        await createPolicyCommand(node, getPolicy, window, commands)
-
-        verify(iot.createPolicy(anything())).never()
-        assert.strictEqual(commands.command, undefined)
-    })
-
-    it('shows an error message when JSON is invalid', async function () {
-        const window = new FakeWindow({ inputBox: { input: policyName } })
-        const commands = new FakeCommands()
-        returnUndefined = false
-        policyDocument = 'not a JSON'
-        await createPolicyCommand(node, getPolicy, window, commands)
-
-        assert.ok(window.message.error?.includes('Failed to create policy test-policy'))
-
-        verify(iot.createPolicy(anything())).never()
-
-        assert.strictEqual(commands.command, undefined)
-    })
-
-    it('shows an error message if creating policy fails', async function () {
-        returnUndefined = false
-        when(iot.createPolicy(anything())).thenReject(new Error('Expected failure'))
-
-        const window = new FakeWindow({ inputBox: { input: policyName } })
-        const commands = new FakeCommands()
-        await createPolicyCommand(node, getPolicy, window, commands)
-
-        assert.ok(window.message.error?.includes('Failed to create policy test-policy'))
-
-        assert.strictEqual(commands.command, undefined)
-    })
-})
diff --git a/src/test/iot/commands/createPolicyVersion.test.ts b/src/test/iot/commands/createPolicyVersion.test.ts
deleted file mode 100644
index 4fb42e01330..00000000000
--- a/src/test/iot/commands/createPolicyVersion.test.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { createPolicyVersionCommand } from '../../../iot/commands/createPolicyVersion'
-import { IotNode } from '../../../iot/explorer/iotNodes'
-import { IotClient } from '../../../shared/clients/iotClient'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { anything, mock, instance, when, deepEqual, verify } from '../../utilities/mockito'
-import { FakeCommands } from '../../shared/vscode/fakeCommands'
-import { Window } from '../../../shared/vscode/window'
-import { IotPolicyFolderNode } from '../../../iot/explorer/iotPolicyFolderNode'
-import { IotPolicyWithVersionsNode } from '../../../iot/explorer/iotPolicyNode'
-
-describe('createPolicyVersionCommand', function () {
-    const policyName = 'test-policy'
-    let iot: IotClient
-    let policyObject: any
-    let policyDocument: string
-    let node: IotPolicyWithVersionsNode
-    let parentNode: IotPolicyFolderNode
-    let window: FakeWindow
-    let returnUndefined: boolean = false
-    const getPolicy: (window: Window) => Promise<Buffer | undefined> = async window => {
-        if (returnUndefined) {
-            return undefined
-        }
-        return Buffer.from(policyDocument, 'utf-8')
-    }
-
-    beforeEach(function () {
-        iot = mock()
-        parentNode = new IotPolicyFolderNode(instance(iot), new IotNode(instance(iot)))
-        node = new IotPolicyWithVersionsNode({ name: policyName, arn: 'arn' }, parentNode, instance(iot))
-        window = new FakeWindow()
-        policyObject = { Version: '2012-10-17', Statement: '' }
-        policyDocument = JSON.stringify(policyObject)
-        returnUndefined = false
-    })
-
-    it('creates new policy version and shows success', async function () {
-        const commands = new FakeCommands()
-        returnUndefined = false
-        await createPolicyVersionCommand(node, getPolicy, window, commands)
-
-        assert.strictEqual(window.message.information, 'Created new version of test-policy')
-
-        verify(iot.createPolicyVersion(deepEqual({ policyName, policyDocument, setAsDefault: true }))).once()
-    })
-
-    it('does nothing when policy document is not read', async function () {
-        returnUndefined = true
-        const commands = new FakeCommands()
-        await createPolicyVersionCommand(node, getPolicy, window, commands)
-
-        verify(iot.createPolicyVersion(anything())).never()
-    })
-
-    it('shows an error message when JSON is invalid', async function () {
-        const commands = new FakeCommands()
-        returnUndefined = false
-        policyDocument = 'not a JSON'
-        await createPolicyVersionCommand(node, getPolicy, window, commands)
-
-        assert.ok(window.message.error?.includes('Failed to create new version of test-policy'))
-
-        verify(iot.createPolicyVersion(anything())).never()
-    })
-
-    it('shows an error message if creating version fails', async function () {
-        returnUndefined = false
-        when(iot.createPolicyVersion(anything())).thenReject(new Error('Expected failure'))
-
-        const commands = new FakeCommands()
-        await createPolicyVersionCommand(node, getPolicy, window, commands)
-
-        assert.ok(window.message.error?.includes('Failed to create new version of test-policy'))
-    })
-})
diff --git a/src/test/iot/commands/createThing.test.ts b/src/test/iot/commands/createThing.test.ts
deleted file mode 100644
index 1dfe95e3adc..00000000000
--- a/src/test/iot/commands/createThing.test.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { createThingCommand } from '../../../iot/commands/createThing'
-import { IotThingFolderNode } from '../../../iot/explorer/iotThingFolderNode'
-import { IotNode } from '../../../iot/explorer/iotNodes'
-import { IotClient } from '../../../shared/clients/iotClient'
-import { FakeCommands } from '../../shared/vscode/fakeCommands'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { anything, mock, instance, when, deepEqual, verify } from '../../utilities/mockito'
-
-describe('createThingCommand', function () {
-    const thingName = 'newIotThing'
-    let iot: IotClient
-    let node: IotThingFolderNode
-
-    beforeEach(function () {
-        iot = mock()
-        node = new IotThingFolderNode(instance(iot), new IotNode(instance(iot)))
-    })
-
-    it('prompts for thing name, creates thing, shows success, and refreshes node', async function () {
-        when(iot.createThing(deepEqual({ thingName }))).thenResolve({
-            thingName: thingName,
-        })
-
-        const window = new FakeWindow({ inputBox: { input: thingName } })
-        const commands = new FakeCommands()
-        await createThingCommand(node, window, commands)
-
-        assert.strictEqual(window.inputBox.options?.prompt, 'Enter a new Thing name')
-        assert.strictEqual(window.inputBox.options?.placeHolder, 'Thing Name')
-
-        assert.strictEqual(window.message.information, 'Created Thing newIotThing')
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [node])
-    })
-
-    it('does nothing when prompt is cancelled', async function () {
-        await createThingCommand(node, new FakeWindow(), new FakeCommands())
-
-        verify(iot.createThing(anything())).never()
-    })
-
-    it('warns when thing name has invalid length', async function () {
-        const window = new FakeWindow({ inputBox: { input: '' } })
-        const commands = new FakeCommands()
-        await createThingCommand(node, window, commands)
-
-        assert.strictEqual(window.inputBox.errorMessage, 'Thing name must be between 1 and 128 characters long')
-    })
-
-    it('warns when thing name has invalid characters', async function () {
-        const window = new FakeWindow({ inputBox: { input: 'illegal/characters' } })
-        const commands = new FakeCommands()
-        await createThingCommand(node, window, commands)
-
-        assert.strictEqual(
-            window.inputBox.errorMessage,
-            'Thing name must only contain alphanumeric characters, hyphens, underscores, or colons'
-        )
-    })
-
-    it('shows an error message and refreshes node when thing creation fails', async function () {
-        when(iot.createThing(anything())).thenReject(new Error('Expected failure'))
-
-        const window = new FakeWindow({ inputBox: { input: thingName } })
-        const commands = new FakeCommands()
-        await createThingCommand(node, window, commands)
-
-        assert.ok(window.message.error?.includes('Failed to create Thing'))
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [node])
-    })
-})
diff --git a/src/test/iot/commands/deleteCert.test.ts b/src/test/iot/commands/deleteCert.test.ts
deleted file mode 100644
index 8a3d35e2fba..00000000000
--- a/src/test/iot/commands/deleteCert.test.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { deleteCertCommand } from '../../../iot/commands/deleteCert'
-import { IotCertWithPoliciesNode } from '../../../iot/explorer/iotCertificateNode'
-import { IotCertsFolderNode } from '../../../iot/explorer/iotCertFolderNode'
-import { IotNode } from '../../../iot/explorer/iotNodes'
-import { IotClient } from '../../../shared/clients/iotClient'
-import { FakeCommands } from '../../shared/vscode/fakeCommands'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { anything, mock, instance, when, deepEqual, verify } from '../../utilities/mockito'
-import globals from '../../../shared/extensionGlobals'
-
-describe('deleteCertCommand', function () {
-    const certificateId = 'test-cert'
-    const status = 'INACTIVE'
-    let iot: IotClient
-    let node: IotCertWithPoliciesNode
-    let parentNode: IotCertsFolderNode
-
-    beforeEach(function () {
-        iot = mock()
-        parentNode = new IotCertsFolderNode(instance(iot), new IotNode(instance(iot)))
-        node = new IotCertWithPoliciesNode(
-            { id: certificateId, arn: 'arn', activeStatus: status, creationDate: new globals.clock.Date() },
-            parentNode,
-            instance(iot)
-        )
-    })
-
-    it('confirms deletion, deletes cert, and refreshes node', async function () {
-        when(iot.listThingsForCert(deepEqual({ principal: 'arn' }))).thenResolve([])
-        when(iot.listPrincipalPolicies(deepEqual({ principal: 'arn' }))).thenResolve({ policies: [] })
-
-        const window = new FakeWindow({ message: { warningSelection: 'Delete' } })
-        const commands = new FakeCommands()
-        await deleteCertCommand(node, window, commands)
-
-        assert.strictEqual(window.message.warning, 'Are you sure you want to delete Certificate test-cert?')
-
-        verify(iot.deleteCertificate(deepEqual({ certificateId, forceDelete: false }))).once()
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [parentNode])
-    })
-
-    it('does nothing if things are attached', async function () {
-        when(iot.listThingsForCert(deepEqual({ principal: 'arn' }))).thenResolve(['iot-thing'])
-
-        const window = new FakeWindow({ message: { warningSelection: 'Delete' } })
-        const commands = new FakeCommands()
-        await deleteCertCommand(node, window, commands)
-
-        assert.ok(window.message.error?.includes('Certificate has attached resources: iot-thing'))
-
-        assert.strictEqual(commands.command, undefined)
-    })
-
-    it('does nothing when deletion is cancelled', async function () {
-        when(iot.listThingsForCert(deepEqual({ principal: 'arn' }))).thenResolve([])
-        const window = new FakeWindow({ message: { warningSelection: 'Cancel' } })
-        await deleteCertCommand(node, window, new FakeCommands())
-
-        verify(iot.deleteCertificate(anything())).never()
-    })
-
-    it('does nothing if certificate is active', async function () {
-        node = new IotCertWithPoliciesNode(
-            { id: certificateId, arn: 'arn', activeStatus: 'ACTIVE', creationDate: new globals.clock.Date() },
-            parentNode,
-            instance(iot)
-        )
-        const window = new FakeWindow({ message: { warningSelection: 'Delete' } })
-        await deleteCertCommand(node, window, new FakeCommands())
-
-        verify(iot.deleteCertificate(anything())).never()
-    })
-
-    it('shows an error message and refreshes node when certificate deletion fails', async function () {
-        when(iot.listThingsForCert(deepEqual({ principal: 'arn' }))).thenResolve([])
-        when(iot.listPrincipalPolicies(deepEqual({ principal: 'arn' }))).thenResolve({ policies: [] })
-        when(iot.deleteCertificate(anything())).thenReject(new Error('Expected failure'))
-
-        const window = new FakeWindow({ message: { warningSelection: 'Delete' } })
-        const commands = new FakeCommands()
-        await deleteCertCommand(node, window, commands)
-
-        assert.ok(window.message.error?.includes('Failed to delete certificate: test-cert'))
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [parentNode])
-    })
-
-    it('shows an error message if Things are not fetched', async function () {
-        when(iot.listThingsForCert(anything())).thenReject(new Error('Expected failure'))
-
-        const window = new FakeWindow({ message: { warningSelection: 'Delete' } })
-        const commands = new FakeCommands()
-        await deleteCertCommand(node, window, commands)
-
-        verify(iot.deleteCertificate(anything())).never()
-
-        assert.ok(window.message.error?.includes('Failed to retrieve Things attached to certificate'))
-
-        assert.strictEqual(commands.command, undefined)
-    })
-
-    it('confirms force deletion if policies are attached', async function () {
-        when(iot.listThingsForCert(deepEqual({ principal: 'arn' }))).thenResolve([])
-        when(iot.listPrincipalPolicies(deepEqual({ principal: 'arn' }))).thenResolve({
-            policies: [{ policyName: 'policy' }],
-        })
-
-        const window = new FakeWindow({ message: { warningSelection: 'Delete' } })
-        const commands = new FakeCommands()
-        await deleteCertCommand(node, window, commands)
-
-        assert.strictEqual(window.message.warning, 'Certificate has attached policies. Delete anyway?')
-
-        verify(iot.deleteCertificate(deepEqual({ certificateId, forceDelete: true }))).once()
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [parentNode])
-    })
-
-    it('shows an error message but refreshes node if policies are not fetched', async function () {
-        when(iot.listThingsForCert(deepEqual({ principal: 'arn' }))).thenResolve([])
-        when(iot.listPrincipalPolicies(anything())).thenReject(new Error('Expected failure'))
-
-        const window = new FakeWindow({ message: { warningSelection: 'Delete' } })
-        const commands = new FakeCommands()
-        await deleteCertCommand(node, window, commands)
-
-        assert.strictEqual(window.message.error, 'Failed to retrieve policies attached to certificate')
-        verify(iot.deleteCertificate(deepEqual({ certificateId, forceDelete: false }))).once()
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [parentNode])
-    })
-})
diff --git a/src/test/iot/commands/deletePolicy.test.ts b/src/test/iot/commands/deletePolicy.test.ts
deleted file mode 100644
index 43863726c26..00000000000
--- a/src/test/iot/commands/deletePolicy.test.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { Iot } from 'aws-sdk'
-import { deletePolicyCommand } from '../../../iot/commands/deletePolicy'
-import { IotPolicyFolderNode } from '../../../iot/explorer/iotPolicyFolderNode'
-import { IotPolicyWithVersionsNode } from '../../../iot/explorer/iotPolicyNode'
-import { IotNode } from '../../../iot/explorer/iotNodes'
-import { IotClient } from '../../../shared/clients/iotClient'
-import { FakeCommands } from '../../shared/vscode/fakeCommands'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { asyncGenerator } from '../../utilities/collectionUtils'
-import { anything, mock, instance, when, deepEqual, verify } from '../../utilities/mockito'
-
-describe('deletePolicyCommand', function () {
-    const policyName = 'test-policy'
-    let iot: IotClient
-    let node: IotPolicyWithVersionsNode
-    let parentNode: IotPolicyFolderNode
-
-    beforeEach(function () {
-        iot = mock()
-        parentNode = new IotPolicyFolderNode(instance(iot), new IotNode(instance(iot)))
-        node = new IotPolicyWithVersionsNode({ name: policyName, arn: 'arn' }, parentNode, instance(iot))
-    })
-
-    it('confirms deletion, deletes policy, and refreshes node', async function () {
-        when(iot.listPolicyTargets(deepEqual({ policyName }))).thenResolve([])
-        const policyVersions = ['1']
-        when(iot.listPolicyVersions(anything())).thenReturn(
-            asyncGenerator<Iot.PolicyVersion>(
-                policyVersions.map<Iot.PolicyVersion>(versionId => {
-                    return {
-                        versionId: versionId,
-                    }
-                })
-            )
-        )
-
-        const window = new FakeWindow({ message: { warningSelection: 'Delete' } })
-        const commands = new FakeCommands()
-        await deletePolicyCommand(node, window, commands)
-
-        assert.strictEqual(window.message.warning, 'Are you sure you want to delete Policy test-policy?')
-
-        verify(iot.deletePolicy(deepEqual({ policyName }))).once()
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [parentNode])
-    })
-
-    it('does nothing when certificates are attached', async function () {
-        when(iot.listPolicyTargets(deepEqual({ policyName }))).thenResolve(['cert'])
-        const window = new FakeWindow({ message: { warningSelection: 'Delete' } })
-        const commands = new FakeCommands()
-        await deletePolicyCommand(node, window, commands)
-
-        assert.ok(window.message.error?.includes('Policy has attached certificates: cert'))
-
-        verify(iot.deletePolicy(anything())).never()
-    })
-
-    it('does nothing when multiple versions are present', async function () {
-        when(iot.listPolicyTargets(deepEqual({ policyName }))).thenResolve([])
-        const policyVersions = ['1', '2']
-        when(iot.listPolicyVersions(anything())).thenReturn(
-            asyncGenerator<Iot.PolicyVersion>(
-                policyVersions.map<Iot.PolicyVersion>(versionId => {
-                    return {
-                        versionId: versionId,
-                    }
-                })
-            )
-        )
-        const window = new FakeWindow({ message: { warningSelection: 'Delete' } })
-        const commands = new FakeCommands()
-        await deletePolicyCommand(node, window, commands)
-
-        verify(iot.deletePolicy(anything())).never()
-    })
-
-    it('does nothing when deletion is cancelled', async function () {
-        const window = new FakeWindow({ message: { warningSelection: 'Cancel' } })
-        await deletePolicyCommand(node, window, new FakeCommands())
-
-        verify(iot.deletePolicy(anything())).never()
-    })
-
-    it('shows an error message and refreshes node when policy deletion fails', async function () {
-        when(iot.deletePolicy(anything())).thenReject(new Error('Expected failure'))
-
-        const window = new FakeWindow({ message: { warningSelection: 'Delete' } })
-        const commands = new FakeCommands()
-        await deletePolicyCommand(node, window, commands)
-
-        assert.ok(window.message.error?.includes('Failed to delete Policy: test-policy'))
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [parentNode])
-    })
-})
diff --git a/src/test/iot/commands/deletePolicyVersion.test.ts b/src/test/iot/commands/deletePolicyVersion.test.ts
deleted file mode 100644
index d5bbafd9625..00000000000
--- a/src/test/iot/commands/deletePolicyVersion.test.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { deletePolicyVersionCommand } from '../../../iot/commands/deletePolicyVersion'
-import { IotPolicyFolderNode } from '../../../iot/explorer/iotPolicyFolderNode'
-import { IotPolicyWithVersionsNode } from '../../../iot/explorer/iotPolicyNode'
-import { IotPolicyVersionNode } from '../../../iot/explorer/iotPolicyVersionNode'
-import { IotClient } from '../../../shared/clients/iotClient'
-import { FakeCommands } from '../../shared/vscode/fakeCommands'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { anything, mock, instance, when, deepEqual, verify } from '../../utilities/mockito'
-
-describe('deletePolicyVersionCommand', function () {
-    const policyName = 'test-policy'
-    let iot: IotClient
-    let node: IotPolicyVersionNode
-    let parentNode: IotPolicyWithVersionsNode
-
-    beforeEach(function () {
-        iot = mock()
-        parentNode = new IotPolicyWithVersionsNode(
-            { name: policyName, arn: 'arn' },
-            {} as IotPolicyFolderNode,
-            instance(iot)
-        )
-        node = new IotPolicyVersionNode(
-            { name: policyName, arn: 'arn' },
-            { versionId: 'V1', isDefaultVersion: false },
-            false,
-            parentNode,
-            instance(iot)
-        )
-    })
-
-    it('confirms deletion, deletes policy, and refreshes node', async function () {
-        const window = new FakeWindow({ message: { warningSelection: 'Delete' } })
-        const commands = new FakeCommands()
-        await deletePolicyVersionCommand(node, window, commands)
-
-        assert.strictEqual(window.message.warning, 'Are you sure you want to delete Version V1 of Policy test-policy?')
-
-        verify(iot.deletePolicyVersion(deepEqual({ policyName, policyVersionId: 'V1' }))).once()
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-    })
-
-    it('does nothing when deletion is cancelled', async function () {
-        const window = new FakeWindow({ message: { warningSelection: 'Cancel' } })
-        await deletePolicyVersionCommand(node, window, new FakeCommands())
-
-        verify(iot.deletePolicyVersion(anything())).never()
-    })
-
-    it('shows an error message and refreshes node when deletion fails', async function () {
-        when(iot.deletePolicyVersion(anything())).thenReject(new Error('Expected failure'))
-
-        const window = new FakeWindow({ message: { warningSelection: 'Delete' } })
-        const commands = new FakeCommands()
-        await deletePolicyVersionCommand(node, window, commands)
-
-        assert.ok(window.message.error?.includes('Failed to delete Version V1 of Policy test-policy'))
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-    })
-})
diff --git a/src/test/iot/commands/deleteThing.test.ts b/src/test/iot/commands/deleteThing.test.ts
deleted file mode 100644
index 32d63c9a31e..00000000000
--- a/src/test/iot/commands/deleteThing.test.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { deleteThingCommand } from '../../../iot/commands/deleteThing'
-import { IotThingFolderNode } from '../../../iot/explorer/iotThingFolderNode'
-import { IotThingNode } from '../../../iot/explorer/iotThingNode'
-import { IotNode } from '../../../iot/explorer/iotNodes'
-import { IotClient } from '../../../shared/clients/iotClient'
-import { FakeCommands } from '../../shared/vscode/fakeCommands'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { anything, mock, instance, when, deepEqual, verify } from '../../utilities/mockito'
-
-describe('deleteThingCommand', function () {
-    const thingName = 'iot-thing'
-    let iot: IotClient
-    let node: IotThingNode
-    let parentNode: IotThingFolderNode
-
-    beforeEach(function () {
-        iot = mock()
-        parentNode = new IotThingFolderNode(instance(iot), new IotNode(instance(iot)))
-        node = new IotThingNode({ name: thingName, arn: 'arn' }, parentNode, instance(iot))
-    })
-
-    it('confirms deletion, deletes thing, and refreshes node', async function () {
-        when(iot.listThingPrincipals(deepEqual({ thingName }))).thenResolve({ principals: [] })
-
-        const window = new FakeWindow({ message: { warningSelection: 'Delete' } })
-        const commands = new FakeCommands()
-        await deleteThingCommand(node, window, commands)
-
-        assert.strictEqual(window.message.warning, 'Are you sure you want to delete Thing iot-thing?')
-
-        verify(iot.deleteThing(deepEqual({ thingName }))).once()
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [parentNode])
-    })
-
-    it('does nothing if thing principals are attached', async function () {
-        when(iot.listThingPrincipals(deepEqual({ thingName }))).thenResolve({ principals: ['string'] })
-
-        const window = new FakeWindow({ message: { warningSelection: 'Delete' } })
-        const commands = new FakeCommands()
-        await deleteThingCommand(node, window, commands)
-
-        assert.ok(window.message.error?.includes('Cannot delete Thing iot-thing'))
-
-        assert.strictEqual(commands.command, undefined)
-    })
-
-    it('does nothing when deletion is cancelled', async function () {
-        const window = new FakeWindow({ message: { warningSelection: 'Cancel' } })
-        await deleteThingCommand(node, window, new FakeCommands())
-
-        verify(iot.deleteThing(anything())).never()
-    })
-
-    it('shows an error message and refreshes node when thing deletion fails', async function () {
-        when(iot.deleteThing(anything())).thenReject(new Error('Expected failure'))
-
-        const window = new FakeWindow({ message: { warningSelection: 'Delete' } })
-        const commands = new FakeCommands()
-        await deleteThingCommand(node, window, commands)
-
-        assert.ok(window.message.error?.includes('Failed to delete Thing: iot-thing'))
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [parentNode])
-    })
-
-    it('shows an error message and refreshes node if principals are not fetched', async function () {
-        when(iot.listThingPrincipals(anything())).thenReject(new Error('Expected failure'))
-
-        const window = new FakeWindow({ message: { warningSelection: 'Delete' } })
-        const commands = new FakeCommands()
-        await deleteThingCommand(node, window, commands)
-
-        assert.ok(window.message.error?.includes('Failed to delete Thing: iot-thing'))
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [parentNode])
-    })
-})
diff --git a/src/test/iot/commands/detachCert.test.ts b/src/test/iot/commands/detachCert.test.ts
deleted file mode 100644
index 2386f9469b7..00000000000
--- a/src/test/iot/commands/detachCert.test.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { detachThingCertCommand } from '../../../iot/commands/detachCert'
-import { IotThingFolderNode } from '../../../iot/explorer/iotThingFolderNode'
-import { IotThingNode } from '../../../iot/explorer/iotThingNode'
-import { IotThingCertNode } from '../../../iot/explorer/iotCertificateNode'
-import { IotClient } from '../../../shared/clients/iotClient'
-import { FakeCommands } from '../../shared/vscode/fakeCommands'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { anything, mock, instance, when, deepEqual, verify } from '../../utilities/mockito'
-import globals from '../../../shared/extensionGlobals'
-
-describe('detachThingCertCommand', function () {
-    const certificateId = 'test-certificate'
-    const principal = 'cert:arn'
-    const thingName = 'iot-thing'
-    let iot: IotClient
-    let node: IotThingCertNode
-    let parentNode: IotThingNode
-
-    beforeEach(function () {
-        iot = mock()
-        parentNode = new IotThingNode({ name: thingName, arn: 'arn' }, {} as IotThingFolderNode, instance(iot))
-        node = new IotThingCertNode(
-            { id: certificateId, arn: principal, activeStatus: 'ACTIVE', creationDate: new globals.clock.Date() },
-            parentNode,
-            instance(iot)
-        )
-    })
-
-    it('confirms detach, detaches certificate, and refreshes node', async function () {
-        const window = new FakeWindow({ message: { warningSelection: 'Detach' } })
-        const commands = new FakeCommands()
-        await detachThingCertCommand(node, window, commands)
-
-        assert.strictEqual(window.message.warning, 'Are you sure you want to detach certificate from Thing iot-thing?')
-
-        verify(iot.detachThingPrincipal(deepEqual({ thingName, principal }))).once()
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [parentNode])
-    })
-
-    it('does nothing when cancelled', async function () {
-        const window = new FakeWindow({ message: { warningSelection: 'Cancel' } })
-        await detachThingCertCommand(node, window, new FakeCommands())
-
-        verify(iot.detachThingPrincipal(anything())).never()
-    })
-
-    it('shows an error message and refreshes node when thing detachment fails', async function () {
-        when(iot.detachThingPrincipal(anything())).thenReject(new Error('Expected failure'))
-
-        const window = new FakeWindow({ message: { warningSelection: 'Detach' } })
-        const commands = new FakeCommands()
-        await detachThingCertCommand(node, window, commands)
-
-        assert.ok(window.message.error?.includes('Failed to detach: test-certificate'))
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [parentNode])
-    })
-})
diff --git a/src/test/iot/commands/detachPolicy.test.ts b/src/test/iot/commands/detachPolicy.test.ts
deleted file mode 100644
index 2475b80a947..00000000000
--- a/src/test/iot/commands/detachPolicy.test.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { detachPolicyCommand } from '../../../iot/commands/detachPolicy'
-import { IotCertWithPoliciesNode } from '../../../iot/explorer/iotCertificateNode'
-import { IotCertsFolderNode } from '../../../iot/explorer/iotCertFolderNode'
-import { IotPolicyCertNode } from '../../../iot/explorer/iotPolicyNode'
-import { IotClient } from '../../../shared/clients/iotClient'
-import { FakeCommands } from '../../shared/vscode/fakeCommands'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { anything, mock, instance, when, deepEqual, verify } from '../../utilities/mockito'
-import { IotNode } from '../../../iot/explorer/iotNodes'
-import globals from '../../../shared/extensionGlobals'
-
-describe('detachPolicyCommand', function () {
-    const policyName = 'test-policy'
-    const target = 'cert:arn'
-    let iot: IotClient
-    let node: IotPolicyCertNode
-    let parentNode: IotCertWithPoliciesNode
-
-    beforeEach(function () {
-        iot = mock()
-        parentNode = new IotCertWithPoliciesNode(
-            { id: 'id', arn: target, activeStatus: 'ACTIVE', creationDate: new globals.clock.Date() },
-            new IotCertsFolderNode(instance(iot), new IotNode(instance(iot))),
-            instance(iot)
-        )
-        node = new IotPolicyCertNode({ name: policyName, arn: 'arn' }, parentNode, instance(iot))
-    })
-
-    it('confirms detach, detaches policy, and refreshes node', async function () {
-        const window = new FakeWindow({ message: { warningSelection: 'Detach' } })
-        const commands = new FakeCommands()
-        await detachPolicyCommand(node, window, commands)
-
-        assert.strictEqual(window.message.warning, 'Are you sure you want to detach policy test-policy?')
-
-        verify(iot.detachPolicy(deepEqual({ policyName, target }))).once()
-    })
-
-    it('does nothing when cancelled', async function () {
-        const window = new FakeWindow({ message: { warningSelection: 'Cancel' } })
-        await detachPolicyCommand(node, window, new FakeCommands())
-
-        verify(iot.detachPolicy(anything())).never()
-    })
-
-    it('shows an error message and refreshes node when thing detachment fails', async function () {
-        when(iot.detachPolicy(anything())).thenReject(new Error('Expected failure'))
-
-        const window = new FakeWindow({ message: { warningSelection: 'Detach' } })
-        const commands = new FakeCommands()
-        await detachPolicyCommand(node, window, commands)
-
-        assert.ok(window.message.error?.includes('Failed to detach: test-policy'))
-    })
-})
diff --git a/src/test/iot/commands/setDefaultPolicy.test.ts b/src/test/iot/commands/setDefaultPolicy.test.ts
deleted file mode 100644
index d3c5d692926..00000000000
--- a/src/test/iot/commands/setDefaultPolicy.test.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { setDefaultPolicy } from '../../../iot/commands/setDefaultPolicy'
-import { IotNode } from '../../../iot/explorer/iotNodes'
-import { IotPolicyFolderNode } from '../../../iot/explorer/iotPolicyFolderNode'
-import { IotPolicyWithVersionsNode } from '../../../iot/explorer/iotPolicyNode'
-import { IotPolicyVersionNode } from '../../../iot/explorer/iotPolicyVersionNode'
-import { IotClient } from '../../../shared/clients/iotClient'
-import { FakeCommands } from '../../shared/vscode/fakeCommands'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { anything, mock, instance, when, deepEqual, verify } from '../../utilities/mockito'
-
-describe('setDefaultPolicy', function () {
-    const policyName = 'test-policy'
-    let iot: IotClient
-    let node: IotPolicyVersionNode
-    let parentNode: IotPolicyWithVersionsNode
-    let parentParentNode: IotPolicyFolderNode
-    let window: FakeWindow
-    let commands: FakeCommands
-
-    beforeEach(function () {
-        iot = mock()
-        parentParentNode = new IotPolicyFolderNode(instance(iot), new IotNode(instance(iot)))
-        parentNode = new IotPolicyWithVersionsNode({ name: policyName, arn: 'arn' }, parentParentNode, instance(iot))
-        node = new IotPolicyVersionNode(
-            { name: policyName, arn: 'arn' },
-            { versionId: 'V1', isDefaultVersion: false },
-            false,
-            parentNode,
-            instance(iot)
-        )
-        window = new FakeWindow()
-        commands = new FakeCommands()
-    })
-
-    it('sets default version and refreshes node', async function () {
-        await setDefaultPolicy(node, window, commands)
-
-        assert.strictEqual(window.message.information, 'Set V1 as default version of test-policy')
-        verify(iot.setDefaultPolicyVersion(deepEqual({ policyName, policyVersionId: 'V1' }))).once()
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-    })
-
-    it('shows an error message and refreshes node when deletion fails', async function () {
-        when(iot.setDefaultPolicyVersion(anything())).thenReject(new Error('Expected failure'))
-        await setDefaultPolicy(node, window, commands)
-
-        assert.ok(window.message.error?.includes('Failed to set default policy version'))
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-    })
-})
diff --git a/src/test/iot/commands/updateCert.test.ts b/src/test/iot/commands/updateCert.test.ts
deleted file mode 100644
index 840e48ff302..00000000000
--- a/src/test/iot/commands/updateCert.test.ts
+++ /dev/null
@@ -1,152 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import {
-    deactivateCertificateCommand,
-    activateCertificateCommand,
-    revokeCertificateCommand,
-} from '../../../iot/commands/updateCert'
-import { IotCertWithPoliciesNode } from '../../../iot/explorer/iotCertificateNode'
-import { IotCertsFolderNode } from '../../../iot/explorer/iotCertFolderNode'
-import { IotThingCertNode } from '../../../iot/explorer/iotCertificateNode'
-import { IotThingNode } from '../../../iot/explorer/iotThingNode'
-import { IotThingFolderNode } from '../../../iot/explorer/iotThingFolderNode'
-import { IotNode } from '../../../iot/explorer/iotNodes'
-import { IotClient } from '../../../shared/clients/iotClient'
-import { FakeCommands } from '../../shared/vscode/fakeCommands'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { anything, mock, instance, when, deepEqual, verify } from '../../utilities/mockito'
-import globals from '../../../shared/extensionGlobals'
-
-describe('updateCertificate', function () {
-    const certificateId = 'test-cert'
-    let iot: IotClient
-    let node: IotCertWithPoliciesNode | IotThingCertNode
-    let parentNode: IotCertsFolderNode
-    let thingParentNode: IotThingNode
-
-    beforeEach(function () {
-        iot = mock()
-    })
-
-    describe('deactivateCommand', function () {
-        this.beforeEach(function () {
-            parentNode = new IotCertsFolderNode(instance(iot), new IotNode(instance(iot)))
-            node = new IotCertWithPoliciesNode(
-                { id: certificateId, arn: 'arn', activeStatus: 'ACTIVE', creationDate: new globals.clock.Date() },
-                parentNode,
-                instance(iot)
-            )
-        })
-
-        it('confirms deactivation, deactivates cert, and refreshes tree', async function () {
-            const window = new FakeWindow({ message: { warningSelection: 'Deactivate' } })
-            const commands = new FakeCommands()
-            await deactivateCertificateCommand(node, window, commands)
-
-            assert.strictEqual(window.message.warning, 'Are you sure you want to deactivate certificate test-cert?')
-            assert.strictEqual(window.message.information, 'Deactivated: test-cert')
-
-            verify(iot.updateCertificate(deepEqual({ certificateId, newStatus: 'INACTIVE' }))).once()
-        })
-
-        it('does nothing when deactivation is cancelled', async function () {
-            const window = new FakeWindow({ message: { warningSelection: 'Cancel' } })
-            await deactivateCertificateCommand(node, window, new FakeCommands())
-
-            verify(iot.updateCertificate(anything())).never()
-        })
-
-        it('shows an error message if deactivating the certificate fails', async function () {
-            when(iot.updateCertificate(anything())).thenReject(new Error('Expected failure'))
-            const window = new FakeWindow({ message: { warningSelection: 'Deactivate' } })
-            const commands = new FakeCommands()
-            await deactivateCertificateCommand(node, window, commands)
-
-            assert.ok(window.message.error?.includes('Failed to deactivate: test-cert'))
-        })
-    })
-
-    describe('activateCommand', function () {
-        this.beforeEach(function () {
-            thingParentNode = new IotThingNode(
-                { name: 'iot-thing', arn: 'thingArn' },
-                new IotThingFolderNode(instance(iot), new IotNode(instance(iot))),
-                instance(iot)
-            )
-            node = new IotThingCertNode(
-                { id: certificateId, arn: 'arn', activeStatus: 'INACTIVE', creationDate: new globals.clock.Date() },
-                thingParentNode,
-                instance(iot)
-            )
-        })
-
-        it('confirms activation, activates cert, and refreshes tree', async function () {
-            const window = new FakeWindow({ message: { warningSelection: 'Activate' } })
-            const commands = new FakeCommands()
-            await activateCertificateCommand(node, window, commands)
-
-            assert.strictEqual(window.message.warning, 'Are you sure you want to activate certificate test-cert?')
-            assert.strictEqual(window.message.information, 'Activated: test-cert')
-
-            verify(iot.updateCertificate(deepEqual({ certificateId, newStatus: 'ACTIVE' }))).once()
-        })
-
-        it('does nothing when activation is cancelled', async function () {
-            const window = new FakeWindow({ message: { warningSelection: 'Cancel' } })
-            await activateCertificateCommand(node, window, new FakeCommands())
-
-            verify(iot.updateCertificate(anything())).never()
-        })
-
-        it('shows an error message if deactivating the certificate fails', async function () {
-            when(iot.updateCertificate(anything())).thenReject(new Error('Expected failure'))
-            const window = new FakeWindow({ message: { warningSelection: 'Activate' } })
-            const commands = new FakeCommands()
-            await activateCertificateCommand(node, window, commands)
-
-            assert.ok(window.message.error?.includes('Failed to activate: test-cert'))
-        })
-    })
-
-    describe('revoke', function () {
-        this.beforeEach(function () {
-            parentNode = new IotCertsFolderNode(instance(iot), new IotNode(instance(iot)))
-            node = new IotCertWithPoliciesNode(
-                { id: certificateId, arn: 'arn', activeStatus: 'ACTIVE', creationDate: new globals.clock.Date() },
-                parentNode,
-                instance(iot)
-            )
-        })
-
-        it('confirms revocation, revokes cert, and refreshes tree', async function () {
-            const window = new FakeWindow({ message: { warningSelection: 'Revoke' } })
-            const commands = new FakeCommands()
-            await revokeCertificateCommand(node, window, commands)
-
-            assert.strictEqual(window.message.warning, 'Are you sure you want to revoke certificate test-cert?')
-            assert.strictEqual(window.message.information, 'Revoked: test-cert')
-
-            verify(iot.updateCertificate(deepEqual({ certificateId, newStatus: 'REVOKED' }))).once()
-        })
-
-        it('does nothing when revocation is cancelled', async function () {
-            const window = new FakeWindow({ message: { warningSelection: 'Cancel' } })
-            await revokeCertificateCommand(node, window, new FakeCommands())
-
-            verify(iot.updateCertificate(anything())).never()
-        })
-
-        it('shows an error message if revoking the certificate fails', async function () {
-            when(iot.updateCertificate(anything())).thenReject(new Error('Expected failure'))
-            const window = new FakeWindow({ message: { warningSelection: 'Revoke' } })
-            const commands = new FakeCommands()
-            await revokeCertificateCommand(node, window, commands)
-
-            assert.ok(window.message.error?.includes('Failed to revoke: test-cert'))
-        })
-    })
-})
diff --git a/src/test/iot/commands/viewPolicyVersion.test.ts b/src/test/iot/commands/viewPolicyVersion.test.ts
deleted file mode 100644
index 71058c993ce..00000000000
--- a/src/test/iot/commands/viewPolicyVersion.test.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as sinon from 'sinon'
-import * as vscode from 'vscode'
-import { viewPolicyVersionCommand } from '../../../iot/commands/viewPolicyVersion'
-import { IotPolicyFolderNode } from '../../../iot/explorer/iotPolicyFolderNode'
-import { IotPolicyWithVersionsNode } from '../../../iot/explorer/iotPolicyNode'
-import { IotPolicyVersionNode } from '../../../iot/explorer/iotPolicyVersionNode'
-import { IotClient } from '../../../shared/clients/iotClient'
-import { anything, mock, instance, when, deepEqual } from '../../utilities/mockito'
-import { getTabSizeSetting } from '../../../shared/utilities/editorUtilities'
-
-const awsIotExamplePolicy =
-    '{ "Version": "2012-10-17", "Statement": [ {"Effect": "Allow", "Action": "*", "Resource": "*" } ] }'
-
-const expectedPolicy = JSON.stringify(JSON.parse(awsIotExamplePolicy), undefined, getTabSizeSetting())
-
-describe('viewPolicyVersionCommand', function () {
-    const policyName = 'test-policy'
-    let iot: IotClient
-    let node: IotPolicyVersionNode
-    let parentNode: IotPolicyWithVersionsNode
-    let sandbox: sinon.SinonSandbox
-
-    beforeEach(function () {
-        iot = mock()
-        parentNode = new IotPolicyWithVersionsNode(
-            { name: policyName, arn: 'arn' },
-            {} as IotPolicyFolderNode,
-            instance(iot)
-        )
-        node = new IotPolicyVersionNode(
-            { name: policyName, arn: 'arn' },
-            { versionId: 'V1', isDefaultVersion: false },
-            false,
-            parentNode,
-            instance(iot)
-        )
-        sandbox = sinon.createSandbox()
-    })
-
-    this.afterEach(function () {
-        sandbox.restore()
-    })
-
-    it('inserts policy document into editor', async function () {
-        const textEditor = {} as vscode.TextDocument
-        const openTextDocumentStub = sandbox
-            .stub(vscode.workspace, 'openTextDocument')
-            .returns(Promise.resolve(textEditor))
-        const showTextDocumentStub = sandbox.stub(vscode.window, 'showTextDocument').resolves({} as vscode.TextEditor)
-
-        when(iot.getPolicyVersion(deepEqual({ policyName, policyVersionId: 'V1' }))).thenResolve({
-            policyDocument: awsIotExamplePolicy,
-        })
-        await viewPolicyVersionCommand(node)
-
-        assert.strictEqual(openTextDocumentStub.calledOnce, true, 'should be called once')
-        assert.deepStrictEqual(
-            openTextDocumentStub.getCalls()[0].args[0],
-            {
-                language: 'json',
-                content: expectedPolicy,
-            },
-            'should open with correct content and language'
-        )
-
-        assert.strictEqual(showTextDocumentStub.calledOnce, true, 'should be called once')
-        assert.strictEqual(showTextDocumentStub.getCall(0).args[0], textEditor)
-    })
-
-    it('does nothing when policy retrieval fails', async function () {
-        const openTextDocumentStub = sandbox
-            .stub(vscode.workspace, 'openTextDocument')
-            .returns(Promise.resolve({} as vscode.TextDocument))
-        when(iot.getPolicyVersion(anything())).thenReject(new Error('Expected failure'))
-
-        await viewPolicyVersionCommand(node)
-
-        assert.strictEqual(openTextDocumentStub.notCalled, true, 'should not be called')
-    })
-})
diff --git a/src/test/iot/explorer/iotCertFolderNode.test.ts b/src/test/iot/explorer/iotCertFolderNode.test.ts
deleted file mode 100644
index c89333f8c82..00000000000
--- a/src/test/iot/explorer/iotCertFolderNode.test.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { MoreResultsNode } from '../../../awsexplorer/moreResultsNode'
-import { IotNode } from '../../../iot/explorer/iotNodes'
-import { IotCertificate, IotClient } from '../../../shared/clients/iotClient'
-import { Iot } from 'aws-sdk'
-import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
-import { deepEqual, instance, mock, when } from '../../utilities/mockito'
-import { FakeWorkspace } from '../../shared/vscode/fakeWorkspace'
-import { IotCertWithPoliciesNode } from '../../../iot/explorer/iotCertificateNode'
-import { IotCertsFolderNode } from '../../../iot/explorer/iotCertFolderNode'
-
-describe('IotCertFolderNode', function () {
-    const nextMarker = 'nextToken'
-    const pageSize = 250
-
-    let iot: IotClient
-    const cert: Iot.Certificate = {
-        certificateId: 'cert',
-        certificateArn: 'arn',
-        status: 'ACTIVE',
-        creationDate: new Date(0),
-    }
-    const expectedCert: IotCertificate = {
-        id: 'cert',
-        arn: 'arn',
-        activeStatus: 'ACTIVE',
-        creationDate: new Date(0),
-    }
-
-    function assertCertNode(node: AWSTreeNodeBase, expectedCert: IotCertificate): void {
-        assert.ok(node instanceof IotCertWithPoliciesNode, `Node ${node} should be a Certificate Node`)
-        assert.deepStrictEqual((node as IotCertWithPoliciesNode).certificate, expectedCert)
-    }
-
-    function assertMoreResultsNode(node: AWSTreeNodeBase): void {
-        assert.ok(node instanceof MoreResultsNode, `Node ${node} should be a More Results Node`)
-    }
-
-    beforeEach(function () {
-        iot = mock()
-    })
-
-    describe('getChildren', function () {
-        it('gets children', async function () {
-            when(iot.listCertificates(deepEqual({ marker: undefined, pageSize }))).thenResolve({
-                certificates: [cert],
-                nextMarker: undefined,
-            })
-            when(iot.listThingsForCert(deepEqual({ principal: 'arn' }))).thenResolve([])
-
-            const workspace = new FakeWorkspace({
-                section: 'aws',
-                configuration: { key: 'iot.maxItemsPerPage', value: pageSize },
-            })
-            const node = new IotCertsFolderNode(instance(iot), new IotNode(instance(iot)), workspace)
-            const [certNode, ...otherNodes] = await node.getChildren()
-
-            assertCertNode(certNode, expectedCert)
-            assert.strictEqual(otherNodes.length, 0)
-        })
-
-        it('gets children with node for loading more results', async function () {
-            when(iot.listCertificates(deepEqual({ marker: undefined, pageSize }))).thenResolve({
-                certificates: [cert],
-                nextMarker,
-            })
-            when(iot.listPolicyTargets(deepEqual({ policyName: 'policy' }))).thenResolve([])
-
-            const workspace = new FakeWorkspace({
-                section: 'aws',
-                configuration: { key: 'iot.maxItemsPerPage', value: pageSize },
-            })
-            const node = new IotCertsFolderNode(instance(iot), new IotNode(instance(iot)), workspace)
-            const [certNode, moreResultsNode, ...otherNodes] = await node.getChildren()
-
-            assertCertNode(certNode, expectedCert)
-            assertMoreResultsNode(moreResultsNode)
-            assert.strictEqual(otherNodes.length, 0)
-        })
-    })
-})
diff --git a/src/test/iot/explorer/iotCertificateNode.test.ts b/src/test/iot/explorer/iotCertificateNode.test.ts
deleted file mode 100644
index b57eb1ecd3d..00000000000
--- a/src/test/iot/explorer/iotCertificateNode.test.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { MoreResultsNode } from '../../../awsexplorer/moreResultsNode'
-import { IotClient, IotPolicy } from '../../../shared/clients/iotClient'
-import { Iot } from 'aws-sdk'
-import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
-import { deepEqual, instance, mock, when } from '../../utilities/mockito'
-import { FakeWorkspace } from '../../shared/vscode/fakeWorkspace'
-import { IotPolicyCertNode } from '../../../iot/explorer/iotPolicyNode'
-import { IotCertWithPoliciesNode } from '../../../iot/explorer/iotCertificateNode'
-import { IotCertsFolderNode } from '../../../iot/explorer/iotCertFolderNode'
-
-describe('IotCertificateNode', function () {
-    const nextMarker = 'nextMarker'
-    const pageSize = 250
-
-    let iot: IotClient
-    const certArn = 'certArn'
-    const cert = { id: 'cert', arn: certArn, activeStatus: 'ACTIVE', creationDate: new Date(0) }
-    const policy: Iot.Policy = { policyName: 'policy', policyArn: 'arn' }
-    const expectedPolicy: IotPolicy = { name: 'policy', arn: 'arn' }
-
-    function assertPolicyNode(node: AWSTreeNodeBase, expectedPolicy: IotPolicy): void {
-        assert.ok(node instanceof IotPolicyCertNode, `Node ${node} should be a Policy Node`)
-        assert.deepStrictEqual((node as IotPolicyCertNode).policy, expectedPolicy)
-    }
-
-    function assertMoreResultsNode(node: AWSTreeNodeBase): void {
-        assert.ok(node instanceof MoreResultsNode, `Node ${node} should be a More Results Node`)
-    }
-
-    beforeEach(function () {
-        iot = mock()
-    })
-
-    describe('getChildren', function () {
-        it('gets children', async function () {
-            when(iot.listPrincipalPolicies(deepEqual({ principal: certArn, marker: undefined, pageSize }))).thenResolve(
-                {
-                    policies: [policy],
-                    nextMarker: undefined,
-                }
-            )
-
-            const workspace = new FakeWorkspace({
-                section: 'aws',
-                configuration: { key: 'iot.maxItemsPerPage', value: pageSize },
-            })
-            const node = new IotCertWithPoliciesNode(
-                cert,
-                {} as IotCertsFolderNode,
-                instance(iot),
-                undefined,
-                workspace
-            )
-            const [policyNode, ...otherNodes] = await node.getChildren()
-
-            assertPolicyNode(policyNode, expectedPolicy)
-            assert.strictEqual(otherNodes.length, 0)
-        })
-
-        it('gets children with node for loading more results', async function () {
-            when(iot.listPrincipalPolicies(deepEqual({ principal: certArn, marker: undefined, pageSize }))).thenResolve(
-                {
-                    policies: [policy],
-                    nextMarker,
-                }
-            )
-
-            const workspace = new FakeWorkspace({
-                section: 'aws',
-                configuration: { key: 'iot.maxItemsPerPage', value: pageSize },
-            })
-            const node = new IotCertWithPoliciesNode(
-                cert,
-                {} as IotCertsFolderNode,
-                instance(iot),
-                undefined,
-                workspace
-            )
-            const [policyNode, moreResultsNode, ...otherNodes] = await node.getChildren()
-
-            assertPolicyNode(policyNode, expectedPolicy)
-            assertMoreResultsNode(moreResultsNode)
-            assert.strictEqual(otherNodes.length, 0)
-        })
-    })
-})
diff --git a/src/test/iot/explorer/iotNodes.test.ts b/src/test/iot/explorer/iotNodes.test.ts
deleted file mode 100644
index f4c7e8fbc4e..00000000000
--- a/src/test/iot/explorer/iotNodes.test.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { IotNode } from '../../../iot/explorer/iotNodes'
-import { IotClient } from '../../../shared/clients/iotClient'
-import { instance, mock } from '../../utilities/mockito'
-
-describe('IotNode', function () {
-    let iot: IotClient
-
-    beforeEach(function () {
-        iot = mock()
-    })
-
-    it('gets children', async function () {
-        const node = new IotNode(instance(iot))
-        const [thingFolder, certFolder, policyFolder] = await node.getChildren()
-
-        assert.strictEqual(thingFolder, node.thingFolderNode)
-        assert.strictEqual(certFolder, node.certFolderNode)
-        assert.strictEqual(policyFolder, node.policyFolderNode)
-    })
-})
diff --git a/src/test/iot/explorer/iotPolicyFolderNode.test.ts b/src/test/iot/explorer/iotPolicyFolderNode.test.ts
deleted file mode 100644
index eb88d9425ba..00000000000
--- a/src/test/iot/explorer/iotPolicyFolderNode.test.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { MoreResultsNode } from '../../../awsexplorer/moreResultsNode'
-import { IotNode } from '../../../iot/explorer/iotNodes'
-import { IotClient, IotPolicy } from '../../../shared/clients/iotClient'
-import { Iot } from 'aws-sdk'
-import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
-import { deepEqual, instance, mock, when } from '../../utilities/mockito'
-import { FakeWorkspace } from '../../shared/vscode/fakeWorkspace'
-import { IotPolicyWithVersionsNode } from '../../../iot/explorer/iotPolicyNode'
-import { IotPolicyFolderNode } from '../../../iot/explorer/iotPolicyFolderNode'
-
-describe('IotPolicyFolderNode', function () {
-    const nextMarker = 'nextMarker'
-    const pageSize = 250
-
-    let iot: IotClient
-    const policy: Iot.Policy = { policyName: 'policy', policyArn: 'arn' }
-    const expectedPolicy: IotPolicy = { name: 'policy', arn: 'arn' }
-
-    function assertPolicyNode(node: AWSTreeNodeBase, expectedPolicy: IotPolicy): void {
-        assert.ok(node instanceof IotPolicyWithVersionsNode, `Node ${node} should be a Policy Node`)
-        assert.deepStrictEqual((node as IotPolicyWithVersionsNode).policy, expectedPolicy)
-    }
-
-    function assertMoreResultsNode(node: AWSTreeNodeBase): void {
-        assert.ok(node instanceof MoreResultsNode, `Node ${node} should be a More Results Node`)
-    }
-
-    beforeEach(function () {
-        iot = mock()
-    })
-
-    describe('getChildren', function () {
-        it('gets children', async function () {
-            when(iot.listPolicies(deepEqual({ marker: undefined, pageSize }))).thenResolve({
-                policies: [policy],
-                nextMarker: undefined,
-            })
-            when(iot.listPolicyTargets(deepEqual({ policyName: 'policy' }))).thenResolve([])
-
-            const workspace = new FakeWorkspace({
-                section: 'aws',
-                configuration: { key: 'iot.maxItemsPerPage', value: pageSize },
-            })
-            const node = new IotPolicyFolderNode(instance(iot), new IotNode(instance(iot)), workspace)
-            const [policyNode, ...otherNodes] = await node.getChildren()
-
-            assertPolicyNode(policyNode, expectedPolicy)
-            assert.strictEqual(otherNodes.length, 0)
-        })
-
-        it('gets children with node for loading more results', async function () {
-            when(iot.listPolicies(deepEqual({ marker: undefined, pageSize }))).thenResolve({
-                policies: [policy],
-                nextMarker,
-            })
-            when(iot.listPolicyTargets(deepEqual({ policyName: 'policy' }))).thenResolve([])
-
-            const workspace = new FakeWorkspace({
-                section: 'aws',
-                configuration: { key: 'iot.maxItemsPerPage', value: pageSize },
-            })
-            const node = new IotPolicyFolderNode(instance(iot), new IotNode(instance(iot)), workspace)
-            const [policyNode, moreResultsNode, ...otherNodes] = await node.getChildren()
-
-            assertPolicyNode(policyNode, expectedPolicy)
-            assertMoreResultsNode(moreResultsNode)
-            assert.strictEqual(otherNodes.length, 0)
-        })
-    })
-})
diff --git a/src/test/iot/explorer/iotPolicyNode.test.ts b/src/test/iot/explorer/iotPolicyNode.test.ts
deleted file mode 100644
index 260e13fbe46..00000000000
--- a/src/test/iot/explorer/iotPolicyNode.test.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { IotClient, IotPolicy } from '../../../shared/clients/iotClient'
-import { Iot } from 'aws-sdk'
-import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
-import { deepEqual, instance, mock, when } from '../../utilities/mockito'
-import { FakeWorkspace } from '../../shared/vscode/fakeWorkspace'
-import { asyncGenerator } from '../../utilities/collectionUtils'
-import { IotPolicyWithVersionsNode } from '../../../iot/explorer/iotPolicyNode'
-import { IotPolicyVersionNode } from '../../../iot/explorer/iotPolicyVersionNode'
-import { IotPolicyFolderNode } from '../../../iot/explorer/iotPolicyFolderNode'
-
-describe('IotPolicyNode', function () {
-    let iot: IotClient
-    const policyName = 'policy'
-    const expectedPolicy: IotPolicy = { name: policyName, arn: 'arn' }
-    const policyVersion: Iot.PolicyVersion = { versionId: 'V1', isDefaultVersion: true }
-
-    function assertPolicyVersionNode(
-        node: AWSTreeNodeBase,
-        expectedPolicy: IotPolicy,
-        expectedVersion: Iot.PolicyVersion
-    ): void {
-        assert.ok(node instanceof IotPolicyVersionNode, `Node ${node} should be a Policy Version Node`)
-        assert.deepStrictEqual((node as IotPolicyVersionNode).version, expectedVersion)
-        assert.deepStrictEqual((node as IotPolicyVersionNode).policy, expectedPolicy)
-    }
-
-    beforeEach(function () {
-        iot = mock()
-    })
-
-    describe('getChildren', function () {
-        it('gets children', async function () {
-            const versions = [{ versionId: 'V1', isDefaultVersion: true }]
-            when(iot.listPolicyVersions(deepEqual({ policyName }))).thenReturn(
-                asyncGenerator<Iot.PolicyVersion>(versions)
-            )
-
-            const workspace = new FakeWorkspace({
-                section: 'aws',
-            })
-            const node = new IotPolicyWithVersionsNode(
-                expectedPolicy,
-                {} as IotPolicyFolderNode,
-                instance(iot),
-                undefined,
-                workspace
-            )
-            const [policyVersionNode, ...otherNodes] = await node.getChildren()
-
-            assertPolicyVersionNode(policyVersionNode, expectedPolicy, policyVersion)
-            assert.strictEqual(otherNodes.length, 0)
-        })
-    })
-})
diff --git a/src/test/iot/explorer/iotPolicyVersionNode.test.ts b/src/test/iot/explorer/iotPolicyVersionNode.test.ts
deleted file mode 100644
index ff37eb5e044..00000000000
--- a/src/test/iot/explorer/iotPolicyVersionNode.test.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { IotClient, IotPolicy } from '../../../shared/clients/iotClient'
-import { Iot } from 'aws-sdk'
-import { IotPolicyWithVersionsNode } from '../../../iot/explorer/iotPolicyNode'
-import { IotPolicyVersionNode } from '../../../iot/explorer/iotPolicyVersionNode'
-import * as moment from 'moment'
-import { LOCALIZED_DATE_FORMAT } from '../../../shared/constants'
-
-describe('IotPolicyVersionNode', function () {
-    const policyName = 'policy'
-    const expectedPolicy: IotPolicy = { name: policyName, arn: 'arn' }
-    const createDate = new Date(2021, 1, 1)
-    const createDateFormatted = moment(createDate).format(LOCALIZED_DATE_FORMAT)
-    const policyVersion: Iot.PolicyVersion = { versionId: 'V1', isDefaultVersion: true, createDate }
-    const nonDefaultVersion: Iot.PolicyVersion = { versionId: 'V2', isDefaultVersion: false, createDate }
-
-    it('creates an IoT Policy Version Node for default version', async function () {
-        const node = new IotPolicyVersionNode(
-            expectedPolicy,
-            policyVersion,
-            policyVersion.isDefaultVersion!,
-            {} as IotPolicyWithVersionsNode,
-            {} as IotClient
-        )
-
-        assert.ok(
-            node.tooltip?.startsWith(`Policy: ${policyName}\nVersion: V1\nDEFAULT\nCreated: ${createDateFormatted}`)
-        )
-        assert.strictEqual(node.label, 'Version V1*')
-    })
-
-    it('creates an IoT Policy Version Node for non-default version', async function () {
-        const node = new IotPolicyVersionNode(
-            expectedPolicy,
-            nonDefaultVersion,
-            nonDefaultVersion.isDefaultVersion!,
-            {} as IotPolicyWithVersionsNode,
-            {} as IotClient
-        )
-
-        assert.ok(node.tooltip?.startsWith(`Policy: ${policyName}\nVersion: V2\nCreated: ${createDateFormatted}`))
-        assert.strictEqual(node.label, 'Version V2')
-    })
-})
diff --git a/src/test/iot/explorer/iotThingFolderNode.test.ts b/src/test/iot/explorer/iotThingFolderNode.test.ts
deleted file mode 100644
index 2bb14cc027a..00000000000
--- a/src/test/iot/explorer/iotThingFolderNode.test.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { MoreResultsNode } from '../../../awsexplorer/moreResultsNode'
-import { IotNode } from '../../../iot/explorer/iotNodes'
-import { IotThingFolderNode } from '../../../iot/explorer/iotThingFolderNode'
-import { IotThingNode } from '../../../iot/explorer/iotThingNode'
-import { IotClient, IotThing } from '../../../shared/clients/iotClient'
-import { Iot } from 'aws-sdk'
-import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
-import { deepEqual, instance, mock, when } from '../../utilities/mockito'
-import { FakeWorkspace } from '../../shared/vscode/fakeWorkspace'
-
-describe('IotThingFolderNode', function () {
-    const nextToken = 'nextToken'
-    const maxResults = 150
-
-    let iot: IotClient
-    const thing: Iot.ThingAttribute = { thingName: 'thing', thingArn: 'arn' }
-    const expectedThing: IotThing = { name: 'thing', arn: 'arn' }
-
-    function assertThingNode(node: AWSTreeNodeBase, expectedThing: IotThing): void {
-        assert.ok(node instanceof IotThingNode, `Node ${node} should be a Thing Node`)
-        assert.deepStrictEqual((node as IotThingNode).thing, expectedThing)
-    }
-
-    function assertMoreResultsNode(node: AWSTreeNodeBase): void {
-        assert.ok(node instanceof MoreResultsNode, `Node ${node} should be a More Results Node`)
-    }
-
-    beforeEach(function () {
-        iot = mock()
-    })
-
-    describe('getChildren', function () {
-        it('gets children', async function () {
-            when(iot.listThings(deepEqual({ nextToken: undefined, maxResults }))).thenResolve({
-                things: [thing],
-                nextToken: undefined,
-            })
-
-            const workspace = new FakeWorkspace({
-                section: 'aws',
-                configuration: { key: 'iot.maxItemsPerPage', value: maxResults },
-            })
-            const node = new IotThingFolderNode(instance(iot), new IotNode(instance(iot)), workspace)
-            const [thingNode, ...otherNodes] = await node.getChildren()
-
-            assertThingNode(thingNode, expectedThing)
-            assert.strictEqual(otherNodes.length, 0)
-        })
-
-        it('gets children with node for loading more results', async function () {
-            when(iot.listThings(deepEqual({ nextToken: undefined, maxResults }))).thenResolve({
-                things: [thing],
-                nextToken,
-            })
-
-            const workspace = new FakeWorkspace({
-                section: 'aws',
-                configuration: { key: 'iot.maxItemsPerPage', value: maxResults },
-            })
-            const node = new IotThingFolderNode(instance(iot), new IotNode(instance(iot)), workspace)
-            const [thingNode, moreResultsNode, ...otherNodes] = await node.getChildren()
-
-            assertThingNode(thingNode, expectedThing)
-            assertMoreResultsNode(moreResultsNode)
-            assert.strictEqual(otherNodes.length, 0)
-        })
-    })
-})
diff --git a/src/test/iot/explorer/iotThingNode.test.ts b/src/test/iot/explorer/iotThingNode.test.ts
deleted file mode 100644
index 7b787a2280b..00000000000
--- a/src/test/iot/explorer/iotThingNode.test.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { MoreResultsNode } from '../../../awsexplorer/moreResultsNode'
-import { IotCertificate, IotClient } from '../../../shared/clients/iotClient'
-import { Iot } from 'aws-sdk'
-import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
-import { deepEqual, instance, mock, when } from '../../utilities/mockito'
-import { FakeWorkspace } from '../../shared/vscode/fakeWorkspace'
-import { IotThingCertNode } from '../../../iot/explorer/iotCertificateNode'
-import { IotThingNode } from '../../../iot/explorer/iotThingNode'
-import { IotThingFolderNode } from '../../../iot/explorer/iotThingFolderNode'
-
-describe('IotThingNode', function () {
-    const nextToken = 'nextToken'
-    const maxResults = 250
-
-    let iot: IotClient
-    const thingName = 'thing'
-    const thing = { name: thingName, arn: 'thingArn' }
-    const cert: Iot.Certificate = {
-        certificateId: 'cert',
-        certificateArn: 'arn',
-        status: 'ACTIVE',
-        creationDate: new Date(0),
-    }
-    const expectedCert: IotCertificate = {
-        id: 'cert',
-        arn: 'arn',
-        activeStatus: 'ACTIVE',
-        creationDate: new Date(0),
-    }
-
-    function assertCertNode(node: AWSTreeNodeBase, expectedCert: IotCertificate): void {
-        assert.ok(node instanceof IotThingCertNode, `Node ${node} should be a Certificate Node`)
-        assert.deepStrictEqual((node as IotThingCertNode).certificate, expectedCert)
-    }
-
-    function assertMoreResultsNode(node: AWSTreeNodeBase): void {
-        assert.ok(node instanceof MoreResultsNode, `Node ${node} should be a More Results Node`)
-    }
-
-    beforeEach(function () {
-        iot = mock()
-    })
-
-    describe('getChildren', function () {
-        it('gets children', async function () {
-            when(iot.listThingCertificates(deepEqual({ thingName, nextToken: undefined, maxResults }))).thenResolve({
-                certificates: [cert],
-                nextToken: undefined,
-            })
-
-            const workspace = new FakeWorkspace({
-                section: 'aws',
-                configuration: { key: 'iot.maxItemsPerPage', value: maxResults },
-            })
-            const node = new IotThingNode(thing, {} as IotThingFolderNode, instance(iot), workspace)
-            const [certNode, ...otherNodes] = await node.getChildren()
-
-            assertCertNode(certNode, expectedCert)
-            assert.strictEqual(otherNodes.length, 0)
-        })
-
-        it('gets children with node for loading more results', async function () {
-            when(iot.listThingCertificates(deepEqual({ thingName, nextToken: undefined, maxResults }))).thenResolve({
-                certificates: [cert],
-                nextToken,
-            })
-
-            const workspace = new FakeWorkspace({
-                section: 'aws',
-                configuration: { key: 'iot.maxItemsPerPage', value: maxResults },
-            })
-            const node = new IotThingNode(thing, {} as IotThingFolderNode, instance(iot), workspace)
-            const [certNode, moreResultsNode, ...otherNodes] = await node.getChildren()
-
-            assertCertNode(certNode, expectedCert)
-            assertMoreResultsNode(moreResultsNode)
-            assert.strictEqual(otherNodes.length, 0)
-        })
-    })
-})
diff --git a/src/test/lambda/commands/copyLambdaUrl.test.ts b/src/test/lambda/commands/copyLambdaUrl.test.ts
deleted file mode 100644
index f29516eda35..00000000000
--- a/src/test/lambda/commands/copyLambdaUrl.test.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { createStubInstance, SinonStubbedInstance, stub, SinonStub, spy, SinonSpy } from 'sinon'
-import { copyLambdaUrl, createLambdaFuncUrlPrompter, noLambdaFuncMessage } from '../../../lambda/commands/copyLambdaUrl'
-import { LambdaFunctionNode } from '../../../lambda/explorer/lambdaFunctionNode'
-import { DefaultLambdaClient, LambdaClient } from '../../../shared/clients/lambdaClient'
-import globals from '../../../shared/extensionGlobals'
-import { addCodiconToString } from '../../../shared/utilities/textUtilities'
-import { env } from 'vscode'
-import { FunctionUrlConfig } from 'aws-sdk/clients/lambda'
-import { createQuickPickTester } from '../../shared/ui/testUtils'
-
-/**
- * Builds an instance of {@link FunctionUrlConfig} without the
- * need to define all values.
- *
- * @param options key + value of {@link FunctionUrlConfig}
- */
-export function buildFunctionUrlConfig(options: Partial<FunctionUrlConfig>): FunctionUrlConfig {
-    return {
-        AuthType: options.AuthType ?? '',
-        CreationTime: options.CreationTime ?? '',
-        FunctionArn: options.FunctionArn ?? '',
-        FunctionUrl: options.FunctionUrl ?? '',
-        LastModifiedTime: options.LastModifiedTime ?? '',
-    }
-}
-
-describe('copy lambda function URL to clipboard', async () => {
-    let client: SinonStubbedInstance<LambdaClient>
-    let node: Pick<LambdaFunctionNode, 'name' | 'regionCode'>
-    let quickPickUrlFunc: SinonStub
-
-    const nodeName = 'my-node-name'
-
-    beforeEach(async () => {
-        client = createStubInstance(DefaultLambdaClient)
-        quickPickUrlFunc = stub()
-
-        node = { name: nodeName, regionCode: 'myRegion' }
-    })
-
-    it('Single URL exists', async () => {
-        const urlConfig = buildFunctionUrlConfig({ FunctionUrl: 'url1', FunctionArn: 'arn1' })
-        client.getFunctionUrlConfigs.resolves([urlConfig])
-
-        await copyLambdaUrl(node, client)
-
-        assert.strictEqual(await env.clipboard.readText(), urlConfig.FunctionUrl)
-    })
-
-    it('Multiple URLs exists', async () => {
-        const expectedConfig = buildFunctionUrlConfig({ FunctionUrl: 'url1', FunctionArn: 'arn1' })
-        const urlConfigs = [expectedConfig, buildFunctionUrlConfig({ FunctionUrl: 'url2', FunctionArn: 'arn2' })]
-        client.getFunctionUrlConfigs.resolves(urlConfigs)
-        quickPickUrlFunc.resolves(expectedConfig.FunctionUrl)
-
-        await copyLambdaUrl(node, client, quickPickUrlFunc)
-
-        assert.deepStrictEqual(quickPickUrlFunc.args, [[urlConfigs]])
-        assert.strictEqual(await env.clipboard.readText(), expectedConfig.FunctionUrl)
-    })
-
-    describe("URL doesn't exist", async () => {
-        let spiedInformationMessage: SinonSpy
-        let spiedStatusBarMessage: SinonSpy
-
-        before(async () => {
-            await env.clipboard.writeText('') // clear clipboard
-            spiedInformationMessage = spy(globals.window, 'showWarningMessage')
-            spiedStatusBarMessage = spy(globals.window, 'setStatusBarMessage')
-        })
-
-        afterEach(async () => {
-            spiedInformationMessage.resetHistory()
-            spiedStatusBarMessage.resetHistory()
-        })
-
-        it(`URL doesn't exist`, async () => {
-            client.getFunctionUrlConfigs.resolves([])
-
-            await copyLambdaUrl(node, client)
-
-            assert.strictEqual(await env.clipboard.readText(), '')
-            assert.deepStrictEqual(spiedInformationMessage.args, [[noLambdaFuncMessage]])
-            assert.deepStrictEqual(spiedStatusBarMessage.args, [
-                [addCodiconToString('circle-slash', 'No URL for Lambda function.'), 5000],
-            ])
-        })
-    })
-})
-
-describe('lambda func url prompter', async () => {
-    it('prompts for lambda function ARN', async () => {
-        const configList: FunctionUrlConfig[] = [
-            <FunctionUrlConfig>{ FunctionUrl: 'url1', FunctionArn: 'arn1' },
-            <FunctionUrlConfig>{ FunctionUrl: 'url2', FunctionArn: 'arn2' },
-        ]
-        const prompter = createLambdaFuncUrlPrompter(configList)
-        const tester = createQuickPickTester(prompter)
-        tester.assertItems(
-            configList.map(c => {
-                return { label: c.FunctionArn, data: c.FunctionUrl } // order matters
-            })
-        )
-        tester.acceptItem(configList[1].FunctionArn)
-        await tester.result(configList[1].FunctionUrl)
-    })
-})
diff --git a/src/test/lambda/commands/deleteLambda.test.ts b/src/test/lambda/commands/deleteLambda.test.ts
deleted file mode 100644
index 93f01747db3..00000000000
--- a/src/test/lambda/commands/deleteLambda.test.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { deleteLambda } from '../../../lambda/commands/deleteLambda'
-import { DefaultLambdaClient } from '../../../shared/clients/lambdaClient'
-import { createTestWindow } from '../../shared/vscode/window'
-import { stub } from '../../utilities/stubber'
-
-describe('deleteLambda', async function () {
-    function createLambdaClient() {
-        const client = stub(DefaultLambdaClient, { regionCode: 'region-1' })
-        client.deleteFunction.resolves()
-
-        return client
-    }
-
-    const buildDeleteRegExp = (name: string) => new RegExp(`delete.*${name}`)
-
-    it('throws if there is no function name', async function () {
-        await assert.rejects(deleteLambda({}, createLambdaClient()))
-    })
-
-    it('should delete lambda when confirmed', async function () {
-        const client = createLambdaClient()
-        const testWindow = createTestWindow()
-        const confirmDialog = testWindow.waitForMessage(buildDeleteRegExp('my-function'))
-
-        await Promise.all([
-            confirmDialog.then(dialog => dialog.selectItem('Delete')),
-            deleteLambda({ FunctionName: 'my-function' }, client, testWindow),
-        ])
-
-        assert.strictEqual(client.deleteFunction.callCount, 1)
-
-        // TODO(sijaden): remove `duration` from metric metadata (it's not metadata?)
-        // assertTelemetry('lambda_delete', { result: 'Succeeded' })
-    })
-
-    it('should not delete lambda when cancelled', async function () {
-        const client = createLambdaClient()
-        const testWindow = createTestWindow()
-        const confirmDialog = testWindow.waitForMessage(buildDeleteRegExp('another-function'))
-
-        await Promise.all([
-            confirmDialog.then(dialog => dialog.close()),
-            deleteLambda({ FunctionName: 'another-function' }, client, testWindow),
-        ])
-
-        assert.strictEqual(client.deleteFunction.callCount, 0)
-        // assertTelemetry('lambda_delete', { result: 'Cancelled' })
-    })
-
-    it('should handles errors gracefully', async function () {
-        const client = createLambdaClient()
-        const testWindow = createTestWindow()
-        const confirmDialog = testWindow.waitForMessage(buildDeleteRegExp('bad-name'))
-        const viewLogs = testWindow.waitForMessage(/There was an error/)
-
-        client.deleteFunction.rejects(new Error('Lambda function does not exist'))
-
-        await Promise.all([
-            viewLogs.then(dialog => dialog.close()),
-            confirmDialog.then(dialog => dialog.selectItem('Delete')),
-            deleteLambda({ FunctionName: 'bad-name' }, client, testWindow),
-        ])
-
-        // assertTelemetry('lambda_delete', { result: 'Failed' })
-    })
-})
diff --git a/src/test/lambda/commands/deploySamApplication.test.ts b/src/test/lambda/commands/deploySamApplication.test.ts
deleted file mode 100644
index bca747e1100..00000000000
--- a/src/test/lambda/commands/deploySamApplication.test.ts
+++ /dev/null
@@ -1,592 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as fs from 'fs-extra'
-import * as path from 'path'
-import globals from '../../../shared/extensionGlobals'
-import * as vscode from 'vscode'
-import { deploySamApplication, WindowFunctions } from '../../../lambda/commands/deploySamApplication'
-import { SamDeployWizardResponse } from '../../../lambda/wizards/samDeployWizard'
-import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
-import { SamCliContext } from '../../../shared/sam/cli/samCliContext'
-import { SamCliProcessInvoker } from '../../../shared/sam/cli/samCliInvokerUtils'
-import {
-    SamCliValidator,
-    SamCliValidatorResult,
-    SamCliVersionValidation,
-    SamCliVersionValidatorResult,
-} from '../../../shared/sam/cli/samCliValidator'
-import { ChildProcessResult } from '../../../shared/utilities/childProcess'
-import { assertLogsContain, getTestLogger } from '../../globalSetup.test'
-import { FakeChildProcessResult, TestSamCliProcessInvoker } from '../../shared/sam/cli/testSamCliProcessInvoker'
-import { TestSettings } from '../../utilities/testSettingsConfiguration'
-import { Settings } from '../../../shared/settings'
-import { SamCliSettings } from '../../../shared/sam/cli/samCliSettings'
-import { FakeAwsContext } from '../../utilities/fakeAwsContext'
-
-describe('deploySamApplication', async function () {
-    // Bad Validator
-
-    const badValidatorResult: SamCliValidatorResult = {
-        samCliFound: false,
-    }
-
-    const badValidator: SamCliValidator = {
-        detectValidSamCli: async (): Promise<SamCliValidatorResult> => badValidatorResult,
-        getVersionValidatorResult: async (): Promise<SamCliVersionValidatorResult> => {
-            return { validation: SamCliVersionValidation.VersionNotParseable }
-        },
-    }
-
-    // Bad Invoker
-
-    const badSamCliProcessInvoker = {} as any as SamCliProcessInvoker
-
-    const invalidSamCliContext: SamCliContext = {
-        invoker: badSamCliProcessInvoker,
-        validator: badValidator,
-    }
-
-    // Good Validator
-
-    const goodValidatorResult: SamCliValidatorResult = {
-        samCliFound: true,
-        versionValidation: {
-            version: '',
-            validation: SamCliVersionValidation.Valid,
-        },
-    }
-
-    const goodValidator: SamCliValidator = {
-        detectValidSamCli: async (): Promise<SamCliValidatorResult> => goodValidatorResult,
-        getVersionValidatorResult: async (): Promise<SamCliVersionValidatorResult> => {
-            return { validation: SamCliVersionValidation.Valid, version: '' }
-        },
-    }
-
-    // Good Invoker
-
-    let invokerCalledCount: number
-    let goodSamCliProcessInvoker = new TestSamCliProcessInvoker((spawnOptions, args: any[]): ChildProcessResult => {
-        invokerCalledCount++
-
-        return new FakeChildProcessResult({})
-    })
-
-    const goodSamCliContext = (): SamCliContext => {
-        return {
-            invoker: goodSamCliProcessInvoker,
-            validator: goodValidator,
-        }
-    }
-
-    // vscode window stubs
-
-    function showMessage(message: string, ...items: string[]): Thenable<string | undefined>
-    function showMessage(
-        message: string,
-        options: vscode.MessageOptions,
-        ...items: string[]
-    ): Thenable<string | undefined>
-    async function showMessage<T extends vscode.MessageItem>(message: string, ...items: T[]): Promise<T | undefined> {
-        return undefined
-    }
-
-    let runningDeployProcess: Thenable<any> | undefined
-    function setStatusBarMessage(text: string, hideWhenDone: Thenable<any>): vscode.Disposable {
-        runningDeployProcess = hideWhenDone
-
-        return new vscode.Disposable(() => {})
-    }
-
-    const window: WindowFunctions = {
-        setStatusBarMessage,
-        showErrorMessage: showMessage,
-        showInformationMessage: showMessage,
-    }
-
-    // Other support stubs
-    const placeholderCredentials = {} as any as AWS.Credentials
-    let testCredentials: AWS.Credentials | undefined
-    let profile: string = ''
-    let settings: Settings
-    let config: SamCliSettings
-    let templatePath: string
-    let tempToolkitFolder: string
-    let samDeployWizardResponse: SamDeployWizardResponse | undefined
-    const samDeployWizard = async (): Promise<SamDeployWizardResponse | undefined> => {
-        return samDeployWizardResponse
-    }
-
-    const awsContext = new FakeAwsContext()
-    awsContext.getCredentials = async () => testCredentials
-    awsContext.getCredentialProfileName = () => profile
-
-    // Fake "aws.refreshAwsExplorer" command. 50b5a28b8e35 #1665
-    let didRefreshExplorer = false
-    function refreshFn() {
-        didRefreshExplorer = true
-    }
-
-    beforeEach(async function () {
-        didRefreshExplorer = false
-        settings = new TestSettings() as any
-        config = new SamCliSettings({ getLocation: async () => ({ path: '', version: '' }) }, settings)
-        profile = 'testAcct'
-        tempToolkitFolder = await makeTemporaryToolkitFolder()
-        templatePath = path.join(tempToolkitFolder, 'template.yaml')
-        writeFile(templatePath)
-
-        // TODO: is this safe? will add output channel across all tests
-        // we are using this pattern in other tests...
-        globals.outputChannel = vscode.window.createOutputChannel('test channel')
-
-        testCredentials = placeholderCredentials
-        invokerCalledCount = 0
-        samDeployWizardResponse = {
-            parameterOverrides: new Map<string, string>(),
-            region: 'region',
-            s3Bucket: 'bucket',
-            stackName: 'stack',
-            template: vscode.Uri.file(templatePath),
-        }
-
-        runningDeployProcess = undefined
-    })
-
-    afterEach(async function () {
-        await fs.remove(tempToolkitFolder)
-    })
-
-    it('deploys with the happy path', async function () {
-        await deploySamApplication(
-            {
-                samCliContext: goodSamCliContext(),
-                samDeployWizard,
-            },
-            {
-                awsContext,
-                settings: config,
-                window,
-                refreshFn,
-            }
-        )
-
-        await waitForDeployToComplete()
-        assert.strictEqual(invokerCalledCount, 3, 'Unexpected sam cli invoke count')
-        assert.deepStrictEqual(config.getSavedBuckets(), {
-            [profile]: { region: 'bucket' },
-        })
-        assert.ok(didRefreshExplorer)
-    })
-
-    it('handles previously stored stringified buckets', async () => {
-        const testSavedBuckets = {
-            profile1: {
-                region1: 'mybucket1',
-                region2: 'mybucket2',
-            },
-            profile2: {
-                region1: 'mybucket3',
-                region3: 'mybucket4',
-            },
-        }
-        await settings.update('aws.samcli.manuallySelectedBuckets', JSON.stringify(testSavedBuckets))
-
-        await deploySamApplication(
-            {
-                samCliContext: goodSamCliContext(),
-                samDeployWizard,
-            },
-            {
-                awsContext,
-                settings: config,
-                window,
-                refreshFn,
-            }
-        )
-
-        await waitForDeployToComplete()
-        assert.strictEqual(invokerCalledCount, 3, 'Unexpected sam cli invoke count')
-        assert.deepStrictEqual(config.getSavedBuckets(), { ...testSavedBuckets, [profile]: { region: 'bucket' } })
-        assert.ok(didRefreshExplorer)
-    })
-
-    it('handles malformed stored buckets', async () => {
-        await settings.update('aws.samcli.manuallySelectedBuckets', 'ilovebuckets')
-
-        await deploySamApplication(
-            {
-                samCliContext: goodSamCliContext(),
-                samDeployWizard,
-            },
-            {
-                awsContext,
-                settings: config,
-                window,
-                refreshFn,
-            }
-        )
-
-        await waitForDeployToComplete()
-        assert.deepStrictEqual(config.getSavedBuckets(), { [profile]: { region: 'bucket' } })
-        assert.ok(didRefreshExplorer)
-    })
-
-    it('overwrites recently selected bucket', async () => {
-        await config.updateSavedBuckets(profile, 'region', 'oldBucket')
-
-        await deploySamApplication(
-            {
-                samCliContext: goodSamCliContext(),
-                samDeployWizard,
-            },
-            {
-                awsContext,
-                settings: config,
-                window,
-                refreshFn,
-            }
-        )
-
-        await waitForDeployToComplete()
-        assert.strictEqual(invokerCalledCount, 3, 'Unexpected sam cli invoke count')
-        assert.deepStrictEqual(config.getSavedBuckets(), { [profile]: { region: 'bucket' } })
-        assert.ok(didRefreshExplorer)
-    })
-
-    it('saves one bucket max to multiple regions', async () => {
-        samDeployWizardResponse = {
-            parameterOverrides: new Map<string, string>(),
-            region: 'region0',
-            s3Bucket: 'bucket0',
-            stackName: 'stack',
-            template: vscode.Uri.file(templatePath),
-        }
-
-        await deploySamApplication(
-            {
-                samCliContext: goodSamCliContext(),
-                samDeployWizard,
-            },
-            {
-                awsContext,
-                settings: config,
-                window,
-                refreshFn,
-            }
-        )
-
-        await waitForDeployToComplete()
-        samDeployWizardResponse = {
-            parameterOverrides: new Map<string, string>(),
-            region: 'region1',
-            s3Bucket: 'bucket1',
-            stackName: 'stack',
-            template: vscode.Uri.file(templatePath),
-        }
-        await deploySamApplication(
-            {
-                samCliContext: goodSamCliContext(),
-                samDeployWizard,
-            },
-            {
-                awsContext,
-                settings: config,
-                window,
-                refreshFn,
-            }
-        )
-
-        await waitForDeployToComplete()
-        samDeployWizardResponse = {
-            parameterOverrides: new Map<string, string>(),
-            region: 'region2',
-            s3Bucket: 'bucket2',
-            stackName: 'stack',
-            template: vscode.Uri.file(templatePath),
-        }
-        await deploySamApplication(
-            {
-                samCliContext: goodSamCliContext(),
-                samDeployWizard,
-            },
-            {
-                awsContext,
-                settings: config,
-                window,
-                refreshFn,
-            }
-        )
-
-        await waitForDeployToComplete()
-        samDeployWizardResponse = {
-            parameterOverrides: new Map<string, string>(),
-            region: 'region0',
-            s3Bucket: 'bucket3',
-            stackName: 'stack',
-            template: vscode.Uri.file(templatePath),
-        }
-        await deploySamApplication(
-            {
-                samCliContext: goodSamCliContext(),
-                samDeployWizard,
-            },
-            {
-                awsContext,
-                settings: config,
-                window,
-                refreshFn,
-            }
-        )
-
-        await waitForDeployToComplete()
-        assert.strictEqual(invokerCalledCount, 12, 'Unexpected sam cli invoke count')
-        assert.deepStrictEqual(config.getSavedBuckets(), {
-            [profile]: {
-                region0: 'bucket3',
-                region1: 'bucket1',
-                region2: 'bucket2',
-            },
-        })
-        assert.ok(didRefreshExplorer)
-    })
-
-    it('saves one bucket per region per profile', async () => {
-        profile = 'testAcct0'
-        samDeployWizardResponse = {
-            parameterOverrides: new Map<string, string>(),
-            region: 'region0',
-            s3Bucket: 'bucket0',
-            stackName: 'stack',
-            template: vscode.Uri.file(templatePath),
-        }
-
-        await deploySamApplication(
-            {
-                samCliContext: goodSamCliContext(),
-                samDeployWizard,
-            },
-            {
-                awsContext,
-                settings: config,
-                window,
-                refreshFn,
-            }
-        )
-
-        await waitForDeployToComplete()
-        profile = 'testAcct1'
-        samDeployWizardResponse = {
-            parameterOverrides: new Map<string, string>(),
-            region: 'region0',
-            s3Bucket: 'bucket1',
-            stackName: 'stack',
-            template: vscode.Uri.file(templatePath),
-        }
-        await deploySamApplication(
-            {
-                samCliContext: goodSamCliContext(),
-                samDeployWizard,
-            },
-            {
-                awsContext,
-                settings: config,
-                window,
-                refreshFn,
-            }
-        )
-
-        await waitForDeployToComplete()
-        assert.strictEqual(invokerCalledCount, 6, 'Unexpected sam cli invoke count')
-        assert.deepStrictEqual(config.getSavedBuckets(), {
-            testAcct0: {
-                region0: 'bucket0',
-            },
-            testAcct1: {
-                region0: 'bucket1',
-            },
-        })
-    })
-
-    it('informs user of error when user is not logged in', async function () {
-        testCredentials = undefined
-
-        await deploySamApplication(
-            {
-                samCliContext: goodSamCliContext(),
-                samDeployWizard,
-            },
-            {
-                awsContext,
-                settings: config,
-                window,
-                refreshFn,
-            }
-        )
-
-        assertGeneralErrorLogged()
-        // Deploy aborted, so this is false.
-        assert.ok(!didRefreshExplorer)
-    })
-
-    it('informs user of error when sam cli is invalid', async function () {
-        await deploySamApplication(
-            {
-                samCliContext: invalidSamCliContext,
-                samDeployWizard,
-            },
-            {
-                awsContext,
-                settings: config,
-                window,
-                refreshFn,
-            }
-        )
-
-        assertGeneralErrorLogged()
-        // Deploy aborted, so this is false.
-        assert.ok(!didRefreshExplorer)
-    })
-
-    it('exits if the wizard is cancelled', async function () {
-        samDeployWizardResponse = undefined
-
-        await deploySamApplication(
-            {
-                samCliContext: goodSamCliContext(),
-                samDeployWizard,
-            },
-            {
-                awsContext,
-                settings: config,
-                window,
-                refreshFn,
-            }
-        )
-
-        assert.strictEqual(invokerCalledCount, 0, 'Did not expect sam cli to get invoked')
-        // Deploy aborted, so this is false.
-        assert.ok(!didRefreshExplorer)
-    })
-
-    it('continues deploying with initial template if invoking sam build fails', async function () {
-        goodSamCliProcessInvoker = new TestSamCliProcessInvoker((spawnOptions, args: any[]): ChildProcessResult => {
-            invokerCalledCount++
-
-            const isDeployInvoke = args.some(arg => arg === 'build')
-
-            return new FakeChildProcessResult({
-                exitCode: isDeployInvoke ? -1 : 0,
-                error: isDeployInvoke ? new Error('broken build') : undefined,
-            })
-        })
-
-        await deploySamApplication(
-            {
-                samCliContext: goodSamCliContext(),
-                samDeployWizard,
-            },
-            {
-                awsContext,
-                settings: config,
-                window,
-                refreshFn,
-            }
-        )
-
-        await waitForDeployToComplete()
-        assert.strictEqual(invokerCalledCount, 3, 'Unexpected sam cli invoke count')
-        assertErrorLogsSwallowed('broken build', false)
-        assert.ok(didRefreshExplorer)
-    })
-
-    it('informs user of error if invoking sam package fails', async function () {
-        goodSamCliProcessInvoker = new TestSamCliProcessInvoker((spawnOptions, args: any[]): ChildProcessResult => {
-            invokerCalledCount++
-
-            const isDeployInvoke = args.some(arg => arg === 'package')
-
-            return new FakeChildProcessResult({
-                exitCode: isDeployInvoke ? -1 : 0,
-                error: isDeployInvoke ? new Error('broken package') : undefined,
-            })
-        })
-
-        await deploySamApplication(
-            {
-                samCliContext: goodSamCliContext(),
-                samDeployWizard,
-            },
-            {
-                awsContext,
-                settings: config,
-                window,
-                refreshFn,
-            }
-        )
-
-        assert.strictEqual(invokerCalledCount, 2, 'Unexpected sam cli invoke count')
-        assertLogsContain('broken package', false, 'error')
-        assertGeneralErrorLogged()
-        // Deploy aborted, so this is false.
-        assert.ok(!didRefreshExplorer)
-    })
-
-    it('informs user of error if invoking sam deploy fails', async function () {
-        goodSamCliProcessInvoker = new TestSamCliProcessInvoker((spawnOptions, args: any[]): ChildProcessResult => {
-            invokerCalledCount++
-
-            const isDeployInvoke = args.some(arg => arg === 'deploy')
-
-            return new FakeChildProcessResult({
-                exitCode: isDeployInvoke ? -1 : 0,
-                error: isDeployInvoke ? new Error('broken deploy') : undefined,
-            })
-        })
-
-        await deploySamApplication(
-            {
-                samCliContext: goodSamCliContext(),
-                samDeployWizard,
-            },
-            {
-                awsContext,
-                settings: config,
-                window,
-                refreshFn,
-            }
-        )
-
-        assert.strictEqual(invokerCalledCount, 3, 'Unexpected sam cli invoke count')
-        assertLogsContain('broken deploy', false, 'error')
-        assertGeneralErrorLogged()
-        assert.strictEqual(config.getSavedBuckets(), undefined)
-    })
-
-    async function waitForDeployToComplete(): Promise<void> {
-        assert.ok(runningDeployProcess)
-        await runningDeployProcess
-    }
-})
-
-function assertGeneralErrorLogged() {
-    // match string 'AWS.samcli.deploy.general.error'
-    assertLogsContain('Error deploying a SAM Application.', false, 'error')
-}
-
-function assertErrorLogsSwallowed(text: string, exactMatch: boolean) {
-    assert.ok(
-        getTestLogger()
-            .getLoggedEntries('error')
-            .some(e => !(e instanceof Error) && (exactMatch ? e === text : e.includes(text))),
-        `Expected to find "${text}" in the error logs, but not as a thrown error`
-    )
-}
-
-function writeFile(filename: string): void {
-    fs.writeFileSync(filename, '')
-}
diff --git a/src/test/lambda/commands/uploadLambda.test.ts b/src/test/lambda/commands/uploadLambda.test.ts
deleted file mode 100644
index 6985323d612..00000000000
--- a/src/test/lambda/commands/uploadLambda.test.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-import * as vscode from 'vscode'
-import * as assert from 'assert'
-import * as fs from 'fs-extra'
-import * as path from 'path'
-import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
-import { findApplicationJsonFile, getFunctionNames } from '../../../lambda/commands/uploadLambda'
-import { assertEqualPaths, toFile } from '../../testUtil'
-
-describe('uploadLambda', async function () {
-    let tempFolder: string
-    let folderUri: vscode.Uri
-    const dotApplicationJsonData = `{
-        "DeploymentMethod": "lambda",
-        "Functions": {
-            "sampleFunction": {
-                "PhysicalId": {
-                    "us-west-2": "sampleFunction-w2",
-                    "us-east-1": "sampleFunction-e1"
-                }
-            },
-            "differentFunction": {
-                "PhysicalId": {
-                    "us-east-1": "differentFunction-e1"
-                }
-            }
-        }
-    }`
-    beforeEach(async function () {
-        tempFolder = await makeTemporaryToolkitFolder()
-        folderUri = vscode.Uri.file(tempFolder)
-    })
-    afterEach(async function () {
-        await fs.remove(tempFolder)
-    })
-
-    it('finds application.json file from dir path - flat', async function () {
-        toFile('top secret data', path.join(tempFolder, '.application.json'))
-        assertEqualPaths(
-            (await findApplicationJsonFile(folderUri))?.fsPath ?? '',
-            path.join(tempFolder, '.application.json')
-        )
-        // Also test Cloud9 temporary workaround.
-        assertEqualPaths(
-            (await findApplicationJsonFile(folderUri, true))?.fsPath ?? '',
-            path.join(tempFolder, '.application.json')
-        )
-    })
-
-    it('finds application.json file from dir path - nested', async function () {
-        const subfolder = path.join(tempFolder, 'one', 'two')
-        const appjsonPath = path.join(subfolder, '.application.json')
-        toFile('top secret data', appjsonPath)
-
-        assertEqualPaths((await findApplicationJsonFile(folderUri))?.fsPath ?? '', appjsonPath)
-        // Also test Cloud9 temporary workaround.
-        assertEqualPaths((await findApplicationJsonFile(folderUri, true))?.fsPath ?? '', appjsonPath)
-    })
-
-    it('finds application.json file from template file path', async function () {
-        const templateUri = vscode.Uri.file(path.join(tempFolder, 'template.yaml'))
-        const appjsonPath = path.join(tempFolder, '.application.json')
-        toFile('SAM stuff...', templateUri.fsPath)
-        toFile('top secret data', appjsonPath)
-
-        assertEqualPaths((await findApplicationJsonFile(templateUri))?.fsPath ?? '', appjsonPath)
-        // Also test Cloud9 temporary workaround.
-        assertEqualPaths((await findApplicationJsonFile(templateUri, true))?.fsPath ?? '', appjsonPath)
-    })
-
-    it('lists functions from .application.json', async function () {
-        const filePath = path.join(tempFolder, '.application.json')
-        toFile(dotApplicationJsonData, filePath)
-        const foundFunctions1 = getFunctionNames(vscode.Uri.file(filePath), 'us-west-2')
-        const foundFunctions2 = getFunctionNames(vscode.Uri.file(filePath), 'us-east-1')
-        assert.deepStrictEqual(foundFunctions1, ['sampleFunction-w2'])
-        assert.deepStrictEqual(foundFunctions2, ['sampleFunction-e1', 'differentFunction-e1'])
-    })
-
-    it('invalid .application.json', async function () {
-        const filePath = path.join(tempFolder, '.application.json')
-        const invalidJson = '{ "DeploymentMethod": "lambda", "Functions": { ?? } }'
-        toFile(invalidJson, filePath)
-        assert.deepStrictEqual(getFunctionNames(vscode.Uri.file(filePath), 'us-west-2'), undefined)
-        assert.deepStrictEqual(getFunctionNames(vscode.Uri.file(filePath), 'us-east-1'), undefined)
-    })
-})
diff --git a/src/test/lambda/config/samParameterCompletionItemProvider.test.ts b/src/test/lambda/config/samParameterCompletionItemProvider.test.ts
deleted file mode 100644
index 0014896990b..00000000000
--- a/src/test/lambda/config/samParameterCompletionItemProvider.test.ts
+++ /dev/null
@@ -1,449 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as path from 'path'
-import * as vscode from 'vscode'
-import {
-    SamParameterCompletionItemProvider,
-    SamParameterCompletionItemProviderContext,
-} from '../../../lambda/config/samParameterCompletionItemProvider'
-import { CloudFormation } from '../../../shared/cloudformation/cloudformation'
-import { Logger } from '../../../shared/logger'
-
-function createTemplatesSymbol({
-    uri = vscode.Uri.file(path.join('my', 'template', 'uri')),
-    includeOverrides = false,
-    parameterName,
-}: {
-    uri?: vscode.Uri
-    includeOverrides?: boolean
-    parameterName?: string
-}) {
-    const templatesSymbol = new vscode.DocumentSymbol(
-        'templates',
-        'myDetail',
-        vscode.SymbolKind.Object,
-        new vscode.Range(0, 0, 10, 0),
-        new vscode.Range(0, 0, 0, 10)
-    )
-
-    if (!uri) {
-        return templatesSymbol
-    }
-
-    const templateSymbol = new vscode.DocumentSymbol(
-        uri.fsPath,
-        'myDetail',
-        vscode.SymbolKind.Object,
-        new vscode.Range(1, 0, 9, 0),
-        new vscode.Range(1, 0, 1, 10)
-    )
-    templatesSymbol.children.push(templateSymbol)
-
-    if (!includeOverrides) {
-        return templatesSymbol
-    }
-
-    const parameterOverridesSymbol = new vscode.DocumentSymbol(
-        'parameterOverrides',
-        'myDetail',
-        vscode.SymbolKind.Object,
-        new vscode.Range(2, 0, 8, 0),
-        new vscode.Range(2, 0, 2, 10)
-    )
-    templateSymbol.children.push(parameterOverridesSymbol)
-
-    if (!parameterName) {
-        return templatesSymbol
-    }
-
-    const parameterOverrideSymbol = new vscode.DocumentSymbol(
-        parameterName,
-        'myDetail',
-        vscode.SymbolKind.Property,
-        new vscode.Range(3, 0, 7, 0),
-        new vscode.Range(3, 0, 3, 10)
-    )
-    parameterOverridesSymbol.children.push(parameterOverrideSymbol)
-
-    return templatesSymbol
-}
-
-class MockSamParamComplItemProviderContext implements SamParameterCompletionItemProviderContext {
-    public readonly logger: Pick<Logger, 'warn'>
-    public readonly getWorkspaceFolder: typeof vscode.workspace.getWorkspaceFolder
-    public readonly executeCommand: typeof vscode.commands.executeCommand
-    public readonly loadTemplate: typeof CloudFormation.load
-
-    public constructor({
-        logger = {
-            warn(...message: (Error | string)[]): number {
-                return 0
-            },
-        },
-        getWorkspaceFolder = uri => undefined,
-        executeCommand = async (command, ...rest) => undefined,
-        loadTemplate = async () => ({}),
-    }: Partial<SamParameterCompletionItemProviderContext>) {
-        this.logger = logger
-        this.getWorkspaceFolder = getWorkspaceFolder
-        this.executeCommand = executeCommand
-        this.loadTemplate = loadTemplate
-    }
-}
-
-describe('SamParameterCompletionItemProvider', async function () {
-    it('recovers gracefully if document is not in a workspace', async function () {
-        const warnArgs: (Error | string)[][] = []
-        const provider = new SamParameterCompletionItemProvider(
-            new MockSamParamComplItemProviderContext({
-                logger: {
-                    warn(...message: (Error | string)[]) {
-                        warnArgs.push(message)
-                        return 0
-                    },
-                },
-            })
-        )
-
-        const document: vscode.TextDocument = {
-            uri: vscode.Uri.file(path.join('my', 'path')),
-        } as any as vscode.TextDocument
-        const actualItems = await provider.provideCompletionItems(
-            document,
-            new vscode.Position(0, 0),
-            {} as any as vscode.CancellationToken,
-            {} as any as vscode.CompletionContext
-        )
-
-        assert.ok(actualItems)
-        assert.strictEqual(actualItems.length, 0)
-        assert.strictEqual(warnArgs.length, 1)
-        assert.strictEqual(warnArgs[0].length, 1)
-        assert.strictEqual(
-            warnArgs[0][0],
-            `Cannot provide completion items for '${document.uri.fsPath}' beacuse it is not in the workspace.`
-        )
-    })
-
-    it('does not provide suggestions if document symbols could not be loaded', async function () {
-        const provider = new SamParameterCompletionItemProvider(
-            new MockSamParamComplItemProviderContext({
-                executeCommand: async () => undefined,
-                getWorkspaceFolder: () => ({ uri: vscode.Uri.file('') } as any as vscode.WorkspaceFolder),
-            })
-        )
-
-        const document: vscode.TextDocument = {
-            uri: vscode.Uri.file(path.join('my', 'path')),
-        } as any as vscode.TextDocument
-        const actualItems = await provider.provideCompletionItems(
-            document,
-            new vscode.Position(0, 0),
-            {} as any as vscode.CancellationToken,
-            {} as any as vscode.CompletionContext
-        )
-
-        assert.ok(actualItems)
-        assert.strictEqual(actualItems.length, 0)
-    })
-
-    it('does not provide suggestions if no matching template is found', async function () {
-        const provider = new SamParameterCompletionItemProvider(
-            new MockSamParamComplItemProviderContext({
-                executeCommand: async <T>() => [] as any as T,
-                getWorkspaceFolder: () => ({ uri: vscode.Uri.file('') } as any as vscode.WorkspaceFolder),
-            })
-        )
-
-        const document: vscode.TextDocument = {
-            uri: vscode.Uri.file(path.join('my', 'path')),
-        } as any as vscode.TextDocument
-        const actualItems = await provider.provideCompletionItems(
-            document,
-            new vscode.Position(0, 0),
-            {} as any as vscode.CancellationToken,
-            {} as any as vscode.CompletionContext
-        )
-
-        assert.ok(actualItems)
-        assert.strictEqual(actualItems.length, 0)
-    })
-
-    it('suggests all parameter names if user has not started typing the parameter name', async function () {
-        const templatesSymbol = createTemplatesSymbol({
-            includeOverrides: true,
-            parameterName: 'myParamName',
-        })
-
-        const provider = new SamParameterCompletionItemProvider(
-            new MockSamParamComplItemProviderContext({
-                executeCommand: async <T>() => [templatesSymbol] as any as T,
-                getWorkspaceFolder: () => ({ uri: vscode.Uri.file('') } as any as vscode.WorkspaceFolder),
-                loadTemplate: async () => ({
-                    Parameters: {
-                        MyParamName1: {
-                            Type: 'String',
-                        },
-                        MyParamName2: {
-                            Type: 'String',
-                        },
-                    },
-                }),
-            })
-        )
-
-        const document: vscode.TextDocument = {
-            uri: vscode.Uri.file(path.join('.aws', 'templates.json')),
-            getWordRangeAtPosition: () => new vscode.Range(3, 0, 3, 10),
-            getText: () => '',
-        } as any as vscode.TextDocument
-
-        const actualItems = await provider.provideCompletionItems(
-            document,
-            new vscode.Position(3, 0),
-            {} as any as vscode.CancellationToken,
-            {} as any as vscode.CompletionContext
-        )
-
-        assert.ok(actualItems)
-        assert.strictEqual(actualItems.length, 2)
-        assert.strictEqual(actualItems[0].insertText, 'MyParamName1')
-        assert.strictEqual(actualItems[1].insertText, 'MyParamName2')
-    })
-
-    it('suggests only matching parameter names if user has started typing the parameter name', async function () {
-        const templatesSymbol = createTemplatesSymbol({
-            includeOverrides: true,
-            parameterName: 'myParamName',
-        })
-
-        const provider = new SamParameterCompletionItemProvider(
-            new MockSamParamComplItemProviderContext({
-                executeCommand: async <T>() => [templatesSymbol] as any as T,
-                getWorkspaceFolder: () => ({ uri: vscode.Uri.file('') } as any as vscode.WorkspaceFolder),
-                loadTemplate: async () => ({
-                    Parameters: {
-                        MyParamName1: {
-                            Type: 'String',
-                        },
-                        MyParamName2: {
-                            Type: 'String',
-                        },
-                        MyOtherParamName: {
-                            Type: 'String',
-                        },
-                    },
-                }),
-            })
-        )
-
-        const document: vscode.TextDocument = {
-            uri: vscode.Uri.file(path.join('.aws', 'templates.json')),
-            getWordRangeAtPosition: () => new vscode.Range(3, 0, 3, 10),
-            getText: () => 'MyParamName',
-        } as any as vscode.TextDocument
-
-        const actualItems = await provider.provideCompletionItems(
-            document,
-            new vscode.Position(3, 0),
-            {} as any as vscode.CancellationToken,
-            {} as any as vscode.CompletionContext
-        )
-
-        assert.ok(actualItems)
-        assert.strictEqual(actualItems.length, 2)
-        assert.strictEqual(actualItems[0].insertText, 'MyParamName1')
-        assert.strictEqual(actualItems[1].insertText, 'MyParamName2')
-    })
-
-    it('recovers gracefully if templates.json is empty or invalid', async function () {
-        const provider = new SamParameterCompletionItemProvider(
-            new MockSamParamComplItemProviderContext({
-                executeCommand: async <T>() => undefined,
-                getWorkspaceFolder: () => ({ uri: vscode.Uri.file('') } as any as vscode.WorkspaceFolder),
-            })
-        )
-
-        const actualItems = await provider.provideCompletionItems(
-            { uri: vscode.Uri.file(path.join('.aws', 'templates.json')) } as any as vscode.TextDocument,
-            new vscode.Position(0, 0),
-            {} as any as vscode.CancellationToken,
-            {} as any as vscode.CompletionContext
-        )
-
-        assert.ok(actualItems)
-        assert.strictEqual(actualItems.length, 0)
-    })
-
-    it('recovers gracefully if cursor is not within the `templates` property', async function () {
-        const templatesSymbol = createTemplatesSymbol({
-            includeOverrides: true,
-            parameterName: 'myParamName',
-        })
-
-        const provider = new SamParameterCompletionItemProvider(
-            new MockSamParamComplItemProviderContext({
-                executeCommand: async <T>() => [templatesSymbol] as any as T,
-                getWorkspaceFolder: () => ({ uri: vscode.Uri.file('') } as any as vscode.WorkspaceFolder),
-                loadTemplate: async () => ({
-                    Parameters: {
-                        MyParamName1: {
-                            Type: 'String',
-                        },
-                        MyParamName2: {
-                            Type: 'String',
-                        },
-                        MyOtherParamName: {
-                            Type: 'String',
-                        },
-                    },
-                }),
-            })
-        )
-
-        const document: vscode.TextDocument = {
-            uri: vscode.Uri.file(path.join('.aws', 'templates.json')),
-            getWordRangeAtPosition: () => new vscode.Range(3, 0, 3, 10),
-            getText: () => 'MyParamName',
-        } as any as vscode.TextDocument
-
-        const actualItems = await provider.provideCompletionItems(
-            document,
-            new vscode.Position(11, 0),
-            {} as any as vscode.CancellationToken,
-            {} as any as vscode.CompletionContext
-        )
-
-        assert.ok(actualItems)
-        assert.strictEqual(actualItems.length, 0)
-    })
-
-    it('recovers gracefully if `parameterOverrides` is not defined for this template', async function () {
-        const templatesSymbol = createTemplatesSymbol({})
-        const provider = new SamParameterCompletionItemProvider(
-            new MockSamParamComplItemProviderContext({
-                executeCommand: async <T>() => [templatesSymbol] as any as T,
-                getWorkspaceFolder: () => ({ uri: vscode.Uri.file('') } as any as vscode.WorkspaceFolder),
-                loadTemplate: async () => ({
-                    Parameters: {
-                        MyParamName1: {
-                            Type: 'String',
-                        },
-                        MyParamName2: {
-                            Type: 'String',
-                        },
-                        MyOtherParamName: {
-                            Type: 'String',
-                        },
-                    },
-                }),
-            })
-        )
-
-        const document: vscode.TextDocument = {
-            uri: vscode.Uri.file(path.join('.aws', 'templates.json')),
-            getWordRangeAtPosition: () => new vscode.Range(3, 0, 3, 10),
-            getText: () => 'MyParamName',
-        } as any as vscode.TextDocument
-
-        const actualItems = await provider.provideCompletionItems(
-            document,
-            new vscode.Position(11, 0),
-            {} as any as vscode.CancellationToken,
-            {} as any as vscode.CompletionContext
-        )
-
-        assert.ok(actualItems)
-        assert.strictEqual(actualItems.length, 0)
-    })
-
-    it('recovers gracefully if cursor is not within the `parameterOverrides` property', async function () {
-        const templatesSymbol = createTemplatesSymbol({
-            includeOverrides: true,
-            parameterName: 'myParamName',
-        })
-
-        const provider = new SamParameterCompletionItemProvider(
-            new MockSamParamComplItemProviderContext({
-                executeCommand: async <T>() => [templatesSymbol] as any as T,
-                getWorkspaceFolder: () => ({ uri: vscode.Uri.file('') } as any as vscode.WorkspaceFolder),
-                loadTemplate: async () => ({
-                    Parameters: {
-                        MyParamName1: {
-                            Type: 'String',
-                        },
-                        MyParamName2: {
-                            Type: 'String',
-                        },
-                        MyOtherParamName: {
-                            Type: 'String',
-                        },
-                    },
-                }),
-            })
-        )
-
-        const document: vscode.TextDocument = {
-            uri: vscode.Uri.file(path.join('.aws', 'templates.json')),
-            getWordRangeAtPosition: () => new vscode.Range(3, 0, 3, 10),
-            getText: () => 'MyParamName',
-        } as any as vscode.TextDocument
-
-        const actualItems = await provider.provideCompletionItems(
-            document,
-            new vscode.Position(9, 0),
-            {} as any as vscode.CancellationToken,
-            {} as any as vscode.CompletionContext
-        )
-
-        assert.ok(actualItems)
-        assert.strictEqual(actualItems.length, 0)
-    })
-
-    it('recovers gracefully if cursor is not within a property name within `parameterOverrides`', async function () {
-        const templatesSymbol = createTemplatesSymbol({
-            includeOverrides: true,
-            parameterName: 'myParamName',
-        })
-
-        const provider = new SamParameterCompletionItemProvider(
-            new MockSamParamComplItemProviderContext({
-                executeCommand: async <T>() => [templatesSymbol] as any as T,
-                getWorkspaceFolder: () => ({ uri: vscode.Uri.file('') } as any as vscode.WorkspaceFolder),
-                loadTemplate: async () => ({
-                    Parameters: {
-                        MyParamName1: {
-                            Type: 'String',
-                        },
-                        MyParamName2: {
-                            Type: 'String',
-                        },
-                        MyOtherParamName: {
-                            Type: 'String',
-                        },
-                    },
-                }),
-            })
-        )
-
-        const document: vscode.TextDocument = {
-            uri: vscode.Uri.file(path.join('.aws', 'templates.json')),
-            getWordRangeAtPosition: () => new vscode.Range(3, 0, 3, 10),
-            getText: () => 'MyParamName',
-        } as any as vscode.TextDocument
-
-        const actualItems = await provider.provideCompletionItems(
-            document,
-            new vscode.Position(4, 0),
-            {} as any as vscode.CancellationToken,
-            {} as any as vscode.CompletionContext
-        )
-
-        assert.ok(actualItems)
-        assert.strictEqual(actualItems.length, 0)
-    })
-})
diff --git a/src/test/lambda/explorer/lambdaFunctionNode.test.ts b/src/test/lambda/explorer/lambdaFunctionNode.test.ts
deleted file mode 100644
index 91e8339751d..00000000000
--- a/src/test/lambda/explorer/lambdaFunctionNode.test.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { Lambda } from 'aws-sdk'
-import * as os from 'os'
-import { LambdaFunctionNode } from '../../../lambda/explorer/lambdaFunctionNode'
-import { TestAWSTreeNode } from '../../shared/treeview/nodes/testAWSTreeNode'
-
-describe('LambdaFunctionNode', function () {
-    const parentNode = new TestAWSTreeNode('test node')
-    let testNode: LambdaFunctionNode
-    let fakeFunctionConfig: Lambda.FunctionConfiguration
-
-    before(function () {
-        fakeFunctionConfig = {
-            FunctionName: 'testFunctionName',
-            FunctionArn: 'testFunctionARN',
-        }
-
-        testNode = new LambdaFunctionNode(parentNode, 'someregioncode', fakeFunctionConfig)
-    })
-
-    it('instantiates without issue', async function () {
-        assert.ok(testNode)
-    })
-
-    it('initializes the parent node', async function () {
-        assert.strictEqual(testNode.parent, parentNode, 'unexpected parent node')
-    })
-
-    it('initializes the region code', async function () {
-        assert.strictEqual(testNode.regionCode, 'someregioncode')
-    })
-
-    it('initializes the label', async function () {
-        assert.strictEqual(testNode.label, fakeFunctionConfig.FunctionName)
-    })
-
-    it('initializes the functionName', async function () {
-        assert.strictEqual(testNode.functionName, fakeFunctionConfig.FunctionName)
-    })
-
-    it('initializes the tooltip', async function () {
-        assert.strictEqual(
-            testNode.tooltip,
-            `${fakeFunctionConfig.FunctionName}${os.EOL}${fakeFunctionConfig.FunctionArn}`
-        )
-    })
-
-    it('has no children', async function () {
-        const childNodes = await testNode.getChildren()
-        assert.ok(childNodes)
-        assert.strictEqual(childNodes.length, 0, 'Expected node to have no children')
-    })
-})
diff --git a/src/test/lambda/local/util.ts b/src/test/lambda/local/util.ts
deleted file mode 100644
index cccb52b3520..00000000000
--- a/src/test/lambda/local/util.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { writeFile } from 'fs-extra'
-import { EOL } from 'os'
-import { CloudFormation } from '../../../shared/cloudformation/cloudformation'
-
-export async function saveTemplate(templatePath: string, runtime: string, ...functionNames: string[]) {
-    const functionResources = functionNames
-        .map(
-            functionName => `    ${functionName}:
-        Type: ${CloudFormation.SERVERLESS_FUNCTION_TYPE}
-        Properties:
-            CodeUri: hello_world/
-            Handler: app.lambdaHandler
-            Runtime: ${runtime}
-            Environment:
-                Variables:
-                    PARAM1: VALUE
-            Events:
-                HelloWorld:
-                    Type: Api
-                    Properties:
-                        Path: /hello
-                        Method: get`
-        )
-        .join(EOL)
-
-    const templateContent = `AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: >
-    my-sam-app
-
-    Sample SAM Template for my-sam-app
-
-Globals:
-  Function:
-    Timeout: 3
-
-Resources:
-${functionResources}
-
-Outputs:
-
-    HelloWorldApi:
-        Description: "API Gateway endpoint URL for Prod stage for Hello World function"
-        Value: !Sub "https://\${ServerlessRestApi}.execute-api.\${AWS::Region}.amazonaws.com/Prod/hello/"
-
-    HelloWorldFunction:
-        Description: "Hello World Lambda Function ARN"
-        Value: !GetAtt HelloWorldFunction.Arn
-
-    HelloWorldFunctionIamRole:
-        Description: "Implicit IAM Role created for Hello World function"
-        Value: !GetAtt HelloWorldFunctionRole.Arn
-`
-
-    await writeFile(templatePath, templateContent, 'utf8')
-}
diff --git a/src/test/lambda/models/samLambdaRuntime.test.ts b/src/test/lambda/models/samLambdaRuntime.test.ts
deleted file mode 100644
index 94518ad9367..00000000000
--- a/src/test/lambda/models/samLambdaRuntime.test.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { Runtime } from 'aws-sdk/clients/lambda'
-import {
-    compareSamLambdaRuntime,
-    getDependencyManager,
-    getFamily,
-    samZipLambdaRuntimes,
-    RuntimeFamily,
-    samImageLambdaRuntimes,
-    samLambdaCreatableRuntimes,
-} from '../../../lambda/models/samLambdaRuntime'
-
-describe('compareSamLambdaRuntime', async function () {
-    const scenarios: {
-        lowerRuntime: Runtime
-        higherRuntime: Runtime
-    }[] = [
-        { lowerRuntime: 'nodejs12.x', higherRuntime: 'nodejs14.x' },
-        { lowerRuntime: 'nodejs14.x', higherRuntime: 'nodejs14.x (Image)' },
-        { lowerRuntime: 'nodejs12.x (Image)', higherRuntime: 'nodejs14.x' },
-    ]
-
-    scenarios.forEach(scenario => {
-        it(`${scenario.lowerRuntime} < ${scenario.higherRuntime}`, () => {
-            assert.ok(compareSamLambdaRuntime(scenario.lowerRuntime, scenario.higherRuntime) < 0)
-        })
-
-        it(`${scenario.higherRuntime} > ${scenario.lowerRuntime}`, () => {
-            assert.ok(compareSamLambdaRuntime(scenario.higherRuntime, scenario.lowerRuntime) > 0)
-        })
-    })
-})
-
-describe('getDependencyManager', function () {
-    it('all runtimes are handled', function () {
-        samZipLambdaRuntimes.forEach(runtime => {
-            assert.ok(getDependencyManager(runtime))
-        })
-    })
-    it('throws on deprecated runtimes', function () {
-        assert.throws(() => getDependencyManager('nodejs'))
-    })
-    it('throws on unknown runtimes', function () {
-        assert.throws(() => getDependencyManager('BASIC'))
-    })
-})
-
-describe('getFamily', function () {
-    it('unknown runtime name', function () {
-        assert.strictEqual(getFamily('foo'), RuntimeFamily.Unknown)
-    })
-    it('handles all known runtimes', function () {
-        samZipLambdaRuntimes.forEach(runtime => {
-            assert.notStrictEqual(getFamily(runtime), RuntimeFamily.Unknown)
-        })
-    })
-    it('throws on deprecated runtimes', function () {
-        assert.throws(() => getFamily('nodejs'))
-    })
-})
-
-describe('runtimes', function () {
-    it('cloud9', function () {
-        assert.deepStrictEqual(samLambdaCreatableRuntimes(true).toArray().sort(), [
-            'nodejs12.x',
-            'nodejs14.x',
-            'nodejs16.x',
-            'nodejs18.x',
-            'python3.7',
-            'python3.8',
-            'python3.9',
-        ])
-        assert.deepStrictEqual(samImageLambdaRuntimes(true).toArray().sort(), [
-            'nodejs12.x',
-            'nodejs14.x',
-            'nodejs16.x',
-            'nodejs18.x',
-            'python3.7',
-            'python3.8',
-            'python3.9',
-        ])
-    })
-    it('vscode', function () {
-        assert.deepStrictEqual(samLambdaCreatableRuntimes(false).toArray().sort(), [
-            'dotnet6',
-            'dotnetcore3.1',
-            'go1.x',
-            'java11',
-            'java8',
-            'java8.al2',
-            'nodejs12.x',
-            'nodejs14.x',
-            'nodejs16.x',
-            'nodejs18.x',
-            'python3.7',
-            'python3.8',
-            'python3.9',
-        ])
-        assert.deepStrictEqual(samImageLambdaRuntimes(false).toArray().sort(), [
-            'dotnet5.0',
-            'dotnet6',
-            'dotnetcore3.1',
-            'go1.x',
-            'java11',
-            'java8',
-            'java8.al2',
-            'nodejs12.x',
-            'nodejs14.x',
-            'nodejs16.x',
-            'nodejs18.x',
-            'python3.7',
-            'python3.8',
-            'python3.9',
-        ])
-    })
-})
diff --git a/src/test/lambda/utils.test.ts b/src/test/lambda/utils.test.ts
deleted file mode 100644
index aa7f27ea2f1..00000000000
--- a/src/test/lambda/utils.test.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { getLambdaDetails } from '../../lambda/utils'
-
-describe('lambda utils', async function () {
-    describe('getLambdaDetails', function () {
-        it('returns valid filenames and function names', function () {
-            const jsNonNestedParsedName = getLambdaDetails({
-                Runtime: 'nodejs12.x',
-                Handler: 'app.lambda_handler',
-            })
-            const pyNonNestedParsedName = getLambdaDetails({
-                Runtime: 'python3.8',
-                Handler: 'app.lambda_handler',
-            })
-            const jsNestedParsedName = getLambdaDetails({
-                Runtime: 'nodejs12.x',
-                Handler: 'asdf/jkl/app.lambda_handler',
-            })
-            const PyNestedParsedName = getLambdaDetails({
-                Runtime: 'python3.8',
-                Handler: 'asdf/jkl/app.lambda_handler',
-            })
-            assert(jsNonNestedParsedName.fileName, 'app.js')
-            assert(pyNonNestedParsedName.fileName, 'app.py')
-            assert(jsNestedParsedName.fileName, 'asdf/jkl/app.js')
-            assert(PyNestedParsedName.fileName, 'asdf/jkl/app.py')
-            assert(jsNonNestedParsedName.functionName, 'lambda_handler')
-            assert(pyNonNestedParsedName.functionName, 'lambda_handler')
-            assert(jsNestedParsedName.functionName, 'lambda_handler')
-            assert(PyNestedParsedName.functionName, 'lambda_handler')
-        })
-
-        it('throws if the handler is not a supported runtime', async function () {
-            // unsupported runtime for import
-            assert.throws(() =>
-                getLambdaDetails({
-                    Runtime: 'dotnetcore3.1',
-                    Handler: 'HelloWorld::HelloWorld.Function::FunctionHandler',
-                })
-            )
-            // runtime that isn't present, period
-            assert.throws(() => getLambdaDetails({ Runtime: 'COBOL-60', Handler: 'asdf.asdf' }))
-        })
-    })
-})
diff --git a/src/test/s3/commands/copyPath.test.ts b/src/test/s3/commands/copyPath.test.ts
deleted file mode 100644
index 55ccebe4424..00000000000
--- a/src/test/s3/commands/copyPath.test.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { copyPathCommand } from '../../../s3/commands/copyPath'
-import { S3FolderNode } from '../../../s3/explorer/s3FolderNode'
-import { S3Client } from '../../../shared/clients/s3Client'
-import { FakeEnv } from '../../shared/vscode/fakeEnv'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-
-describe('copyPathCommand', function () {
-    it('copies path to clipboard and shows status bar confirmation', async function () {
-        const node = createS3FolderNode()
-
-        const window = new FakeWindow()
-        const env = new FakeEnv()
-        await copyPathCommand(node, window, env)
-
-        assert.strictEqual(env.clipboard.text, 'path')
-    })
-})
-
-function createS3FolderNode(): S3FolderNode {
-    return new S3FolderNode(
-        { name: 'name', region: 'region', arn: 'arn' },
-        { name: 'name', path: 'path', arn: 'arn ' },
-        {} as S3Client
-    )
-}
diff --git a/src/test/s3/commands/createBucket.test.ts b/src/test/s3/commands/createBucket.test.ts
deleted file mode 100644
index 20136d5ae75..00000000000
--- a/src/test/s3/commands/createBucket.test.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { createBucketCommand } from '../../../s3/commands/createBucket'
-import { S3Node } from '../../../s3/explorer/s3Nodes'
-import { S3Client } from '../../../shared/clients/s3Client'
-import { CancellationError } from '../../../shared/utilities/timeoutUtils'
-import { FakeCommands } from '../../shared/vscode/fakeCommands'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { anything, mock, instance, when, deepEqual, verify } from '../../utilities/mockito'
-
-describe('createBucketCommand', function () {
-    const bucketName = 'buc.ket-n4.m3'
-    let s3: S3Client
-    let node: S3Node
-
-    beforeEach(function () {
-        s3 = mock()
-        node = new S3Node(instance(s3))
-    })
-
-    it('prompts for bucket name, creates bucket, shows success, and refreshes node', async function () {
-        when(s3.createBucket(deepEqual({ bucketName }))).thenResolve({
-            bucket: { name: bucketName, region: 'region', arn: 'arn' },
-        })
-
-        const window = new FakeWindow({ inputBox: { input: bucketName } })
-        const commands = new FakeCommands()
-        await createBucketCommand(node, window, commands)
-
-        assert.strictEqual(window.inputBox.options?.prompt, 'Enter a new bucket name')
-        assert.strictEqual(window.inputBox.options?.placeHolder, 'Bucket Name')
-
-        assert.strictEqual(window.message.information, 'Created bucket: buc.ket-n4.m3')
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [node])
-    })
-
-    it('does nothing when prompt is cancelled', async function () {
-        await assert.rejects(() => createBucketCommand(node, new FakeWindow(), new FakeCommands()), CancellationError)
-
-        verify(s3.createFolder(anything())).never()
-    })
-
-    it('throws an error and refreshes node when bucket creation fails', async function () {
-        when(s3.createBucket(anything())).thenReject(new Error('Expected failure'))
-
-        const window = new FakeWindow({ inputBox: { input: bucketName } })
-        const commands = new FakeCommands()
-        await assert.rejects(() => createBucketCommand(node, window, commands), /Failed to create bucket/)
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [node])
-    })
-})
diff --git a/src/test/s3/commands/createFolder.test.ts b/src/test/s3/commands/createFolder.test.ts
deleted file mode 100644
index 544a9547943..00000000000
--- a/src/test/s3/commands/createFolder.test.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { createFolderCommand } from '../../../s3/commands/createFolder'
-import { S3BucketNode } from '../../../s3/explorer/s3BucketNode'
-import { S3Node } from '../../../s3/explorer/s3Nodes'
-import { S3Client } from '../../../shared/clients/s3Client'
-import { FakeCommands } from '../../shared/vscode/fakeCommands'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { anything, mock, instance, when, deepEqual } from '../../utilities/mockito'
-
-describe('createFolderCommand', function () {
-    const invalidFolderNames: { folderName: string; error: string }[] = [
-        { folderName: 'contains/delimiter', error: `Folder name must not contain '/'` },
-        { folderName: '', error: 'Folder name must not be empty' },
-    ]
-
-    const folderName = 'foo'
-    const folderPath = 'foo/'
-    const bucketName = 'bucket-name'
-
-    let s3: S3Client
-    let node: S3BucketNode
-
-    beforeEach(function () {
-        s3 = mock()
-        node = new S3BucketNode(
-            { name: bucketName, region: 'region', arn: 'arn' },
-            new S3Node(instance(s3)),
-            instance(s3)
-        )
-    })
-
-    it('prompts for folder name, creates folder, shows success, and refreshes node', async function () {
-        when(s3.createFolder(deepEqual({ path: folderPath, bucketName }))).thenResolve({
-            folder: { name: folderName, path: folderPath, arn: 'arn' },
-        })
-
-        const window = new FakeWindow({ inputBox: { input: folderName } })
-        const commands = new FakeCommands()
-        await createFolderCommand(node, window, commands)
-
-        assert.strictEqual(window.inputBox.options?.prompt, 'Enter a folder to create in s3://bucket-name')
-        assert.strictEqual(window.inputBox.options?.placeHolder, 'Folder Name')
-
-        assert.strictEqual(window.message.information, 'Created folder: foo')
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [node])
-    })
-
-    it('does nothing when prompt is cancelled', async function () {
-        await assert.rejects(() => createFolderCommand(node, new FakeWindow(), new FakeCommands()), /cancelled/i)
-    })
-
-    it('shows an error message and refreshes node when folder creation fails', async function () {
-        when(s3.createFolder(anything())).thenReject(new Error('Expected failure'))
-
-        const window = new FakeWindow({ inputBox: { input: folderName } })
-        const commands = new FakeCommands()
-        await assert.rejects(() => createFolderCommand(node, window, commands), /failed to create folder/i)
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [node])
-    })
-
-    invalidFolderNames.forEach(invalid => {
-        it(`warns '${invalid.error}' when folder name is '${invalid.folderName}'`, async () => {
-            const window = new FakeWindow({ inputBox: { input: invalid.folderName } })
-            const commands = new FakeCommands()
-            await assert.rejects(() => createFolderCommand(node, window, commands))
-
-            assert.strictEqual(window.inputBox.errorMessage, invalid.error)
-        })
-    })
-})
diff --git a/src/test/s3/commands/deleteBucket.test.ts b/src/test/s3/commands/deleteBucket.test.ts
deleted file mode 100644
index 6bd97092c68..00000000000
--- a/src/test/s3/commands/deleteBucket.test.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-import { deleteBucketCommand } from '../../../s3/commands/deleteBucket'
-import { S3BucketNode } from '../../../s3/explorer/s3BucketNode'
-import { S3Node } from '../../../s3/explorer/s3Nodes'
-import { S3Client } from '../../../shared/clients/s3Client'
-import { FakeCommands } from '../../shared/vscode/fakeCommands'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { anything, mock, instance, when, deepEqual, verify } from '../../utilities/mockito'
-
-describe('deleteBucketCommand', function () {
-    const bucketName = 'bucket-name'
-
-    let s3: S3Client
-    let parentNode: S3Node
-    let node: S3BucketNode
-
-    beforeEach(function () {
-        s3 = mock()
-        parentNode = new S3Node(instance(s3))
-        node = new S3BucketNode({ name: bucketName, region: 'region', arn: 'arn' }, parentNode, instance(s3))
-    })
-
-    it('confirms deletion, deletes bucket, shows progress bar, and refreshes parent node', async function () {
-        const window = new FakeWindow({ inputBox: { input: bucketName } })
-        const commands = new FakeCommands()
-        await deleteBucketCommand(node, window, commands)
-
-        assert.strictEqual(window.inputBox.options?.prompt, 'Enter bucket-name to confirm deletion')
-        assert.strictEqual(window.inputBox.options?.placeHolder, bucketName)
-
-        verify(s3.deleteBucket(deepEqual({ bucketName }))).once()
-
-        assert.strictEqual(window.progress.options?.location, vscode.ProgressLocation.Notification)
-        assert.strictEqual(window.progress.options?.title, 'Deleting bucket-name...')
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [parentNode])
-    })
-
-    it('does nothing when deletion is cancelled', async function () {
-        const window = new FakeWindow()
-        const commands = new FakeCommands()
-        await assert.rejects(() => deleteBucketCommand(node, window, commands), /cancelled/i)
-
-        verify(s3.deleteBucket(anything())).never()
-
-        assert.strictEqual(window.message.error, undefined)
-        assert.strictEqual(commands.command, undefined)
-    })
-
-    it('shows an error message and refreshes node when bucket deletion fails', async function () {
-        when(s3.deleteBucket(anything())).thenReject(new Error('Expected failure'))
-
-        const window = new FakeWindow({ inputBox: { input: bucketName } })
-        const commands = new FakeCommands()
-        await assert.rejects(() => deleteBucketCommand(node, window, commands), /failed to delete bucket bucket-name/i)
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [parentNode])
-    })
-
-    it('warns when confirmation is invalid', async function () {
-        const window = new FakeWindow({ inputBox: { input: 'something other than the bucket name' } })
-        const commands = new FakeCommands()
-        await assert.rejects(() => deleteBucketCommand(node, window, commands))
-
-        assert.strictEqual(window.inputBox.errorMessage, 'Enter bucket-name to confirm deletion')
-    })
-})
diff --git a/src/test/s3/commands/deleteFile.test.ts b/src/test/s3/commands/deleteFile.test.ts
deleted file mode 100644
index e5ba6fa371a..00000000000
--- a/src/test/s3/commands/deleteFile.test.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { deleteFileCommand } from '../../../s3/commands/deleteFile'
-import { S3BucketNode } from '../../../s3/explorer/s3BucketNode'
-import { S3FileNode } from '../../../s3/explorer/s3FileNode'
-import { S3Node } from '../../../s3/explorer/s3Nodes'
-import { Bucket, S3Client } from '../../../shared/clients/s3Client'
-import { FakeCommands } from '../../shared/vscode/fakeCommands'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { anything, mock, instance, when, deepEqual, verify } from '../../utilities/mockito'
-
-describe('deleteFileCommand', function () {
-    const key = 'foo/bar.jpg'
-    const name = 'bar.jpg'
-    const bucketName = 'bucket-name'
-    const bucket: Bucket = { name: bucketName, region: 'region', arn: 'arn' }
-
-    let s3: S3Client
-    let parentNode: S3BucketNode
-    let node: S3FileNode
-
-    beforeEach(function () {
-        s3 = mock()
-        parentNode = new S3BucketNode(bucket, {} as S3Node, instance(s3))
-        node = new S3FileNode(bucket, { name, key, arn: 'arn' }, parentNode, instance(s3))
-    })
-
-    it('confirms deletion, deletes file, shows status bar confirmation, and refreshes parent node', async function () {
-        const window = new FakeWindow({ message: { warningSelection: 'Delete' } })
-        const commands = new FakeCommands()
-        await deleteFileCommand(node, window, commands)
-
-        assert.strictEqual(window.message.warning, 'Are you sure you want to delete file s3://bucket-name/foo/bar.jpg?')
-
-        verify(s3.deleteObject(deepEqual({ bucketName, key }))).once()
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [parentNode])
-    })
-
-    it('does nothing when deletion is cancelled', async function () {
-        const window = new FakeWindow({ message: { warningSelection: 'Cancel' } })
-        const commands = new FakeCommands()
-        await assert.rejects(() => deleteFileCommand(node, window, commands), /cancelled/i)
-
-        verify(s3.deleteObject(anything())).never()
-        assert.strictEqual(window.statusBar.message, undefined)
-        assert.strictEqual(window.message.error, undefined)
-        assert.strictEqual(commands.command, undefined)
-    })
-
-    it('shows an error message and refreshes node when file deletion fails', async function () {
-        when(s3.deleteObject(anything())).thenReject(new Error('Expected failure'))
-
-        const window = new FakeWindow({ message: { warningSelection: 'Delete' } })
-        const commands = new FakeCommands()
-        await assert.rejects(() => deleteFileCommand(node, window, commands), /failed to delete file bar.jpg/i)
-
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [parentNode])
-    })
-})
diff --git a/src/test/s3/commands/downloadFileAs.test.ts b/src/test/s3/commands/downloadFileAs.test.ts
deleted file mode 100644
index 295d62a7b87..00000000000
--- a/src/test/s3/commands/downloadFileAs.test.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-import * as path from 'path'
-import { downloadFileAsCommand } from '../../../s3/commands/downloadFileAs'
-import { S3BucketNode } from '../../../s3/explorer/s3BucketNode'
-import { S3FileNode } from '../../../s3/explorer/s3FileNode'
-import { S3Node } from '../../../s3/explorer/s3Nodes'
-import { Bucket, S3Client } from '../../../shared/clients/s3Client'
-import { bufferToStream } from '../../../shared/utilities/streamUtilities'
-import { MockOutputChannel } from '../../mockOutputChannel'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { anything, mock, instance, when, verify } from '../../utilities/mockito'
-import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
-import globals from '../../../shared/extensionGlobals'
-import { assertEqualPaths } from '../../testUtil'
-
-describe('downloadFileAsCommand', function () {
-    const bucketName = 'bucket-name'
-    const key = 'path/to/file.jpg'
-    const fileName = 'file.jpg'
-    const lastModified = new Date(2020, 5, 4)
-    const sizeBytes = 16
-
-    let s3: S3Client
-    let temp: string
-    let saveLocation: vscode.Uri
-    let bucketNode: S3BucketNode
-    let node: S3FileNode
-
-    before(async function () {
-        // TODO: write separate test code for the progress report behavior
-        temp = await makeTemporaryToolkitFolder()
-        saveLocation = vscode.Uri.file(path.join(temp, 'file.jpg'))
-    })
-
-    beforeEach(function () {
-        s3 = mock()
-
-        const bucket: Bucket = { name: bucketName, region: 'region', arn: 'arn' }
-        bucketNode = new S3BucketNode(bucket, {} as S3Node, instance(s3))
-        node = new S3FileNode(
-            bucket,
-            { name: fileName, key: key, arn: 'arn', lastModified, sizeBytes },
-            bucketNode,
-            instance(s3)
-        )
-    })
-
-    it('prompts for save location, downloads file with progress, and shows output channel', async function () {
-        const window = new FakeWindow({ dialog: { saveSelection: saveLocation } })
-        const outputChannel = new MockOutputChannel()
-        globals.context.globalState.update('aws.downloadPath', temp)
-
-        when(s3.downloadFileStream(anything(), anything())).thenResolve(bufferToStream(Buffer.alloc(16)))
-
-        await downloadFileAsCommand(node, window, outputChannel)
-
-        assert.ok(window.dialog.saveOptions?.defaultUri?.fsPath)
-        assertEqualPaths(window.dialog.saveOptions.defaultUri.fsPath, path.join(temp, 'file.jpg'))
-
-        assert.strictEqual(window.dialog.saveOptions?.saveLabel, 'Download')
-        assert.deepStrictEqual(window.dialog.saveOptions?.filters, { 'All Files': ['*'], '*.jpg': ['jpg'] })
-
-        assert.deepStrictEqual(outputChannel.lines, [
-            `Downloading "s3://bucket-name/path/to/file.jpg" to: ${saveLocation}`,
-            `Downloaded: ${saveLocation}`,
-        ])
-        assert.strictEqual(outputChannel.isShown, true)
-        assert.strictEqual(outputChannel.isFocused, false)
-    })
-
-    it('does nothing when prompt is cancelled', async function () {
-        await assert.rejects(() => downloadFileAsCommand(node, new FakeWindow()), /cancelled/i)
-
-        verify(s3.downloadFileStream(anything(), anything())).never()
-    })
-
-    it('throws when download fails', async function () {
-        when(s3.downloadFileStream(anything(), anything())).thenReject(new Error('Expected failure'))
-
-        const window = new FakeWindow({ dialog: { saveSelection: saveLocation } })
-        await assert.rejects(() => downloadFileAsCommand(node, window, new MockOutputChannel()), /Failed to download/)
-    })
-})
diff --git a/src/test/s3/commands/presignedURL.test.ts b/src/test/s3/commands/presignedURL.test.ts
deleted file mode 100644
index 49c46aeb1ae..00000000000
--- a/src/test/s3/commands/presignedURL.test.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import {} from '../../../shared/vscode/env'
-import { copyToClipboard } from '../../../shared/utilities/messages'
-import { presignedURLCommand } from '../../../s3/commands/presignedURL'
-import { S3BucketNode } from '../../../s3/explorer/s3BucketNode'
-import { S3FileNode } from '../../../s3/explorer/s3FileNode'
-import { S3Node } from '../../../s3/explorer/s3Nodes'
-import { Bucket, S3Client } from '../../../shared/clients/s3Client'
-import { Window } from '../../../shared/vscode/window'
-import { FakeEnv } from '../../shared/vscode/fakeEnv'
-import { anything, instance, mock, when } from '../../utilities/mockito'
-
-describe('presignedURLCommand', function () {
-    const bucketName = 'bucket-name'
-    const key = 'file.jpg'
-    const testUrl = 'https://presigned-url.com'
-
-    let env: FakeEnv
-    let node: S3FileNode
-    let s3: S3Client
-    let bucketNode: S3BucketNode
-    let window: Window
-
-    beforeEach(function () {
-        s3 = mock()
-        window = mock()
-        env = new FakeEnv()
-
-        const bucket: Bucket = { name: bucketName, region: 'region', arn: 'arn' }
-        bucketNode = new S3BucketNode(bucket, {} as S3Node, instance(s3))
-        node = new S3FileNode(bucket, { name: key, key: key, arn: 'arn' }, bucketNode, instance(s3))
-    })
-
-    it('calls S3 to get the URL', async function () {
-        when(window.showInputBox(anything())).thenReturn(Promise.resolve('20'))
-        when(s3.getSignedUrl(anything())).thenResolve(testUrl)
-
-        await presignedURLCommand(node, instance(window), env)
-
-        assert.deepStrictEqual(env.clipboard.text, testUrl)
-    })
-
-    it('copies a given URL to the clipboard', async function () {
-        await copyToClipboard(testUrl, 'URL', undefined, env)
-        assert.deepStrictEqual(env.clipboard.text, testUrl)
-    })
-})
diff --git a/src/test/s3/commands/uploadFile.test.ts b/src/test/s3/commands/uploadFile.test.ts
deleted file mode 100644
index 10a06e8bbcf..00000000000
--- a/src/test/s3/commands/uploadFile.test.ts
+++ /dev/null
@@ -1,421 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-import { S3 } from 'aws-sdk'
-import {
-    FileSizeBytes,
-    getFilesToUpload,
-    promptUserForBucket,
-    uploadFileCommand,
-} from '../../../s3/commands/uploadFile'
-import { S3Node } from '../../../s3/explorer/s3Nodes'
-import { S3BucketNode } from '../../../s3/explorer/s3BucketNode'
-import { S3Client } from '../../../shared/clients/s3Client'
-import { MockOutputChannel } from '../../mockOutputChannel'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { anything, mock, instance, when, capture } from '../../utilities/mockito'
-import { Commands } from '../../../shared/vscode/commands'
-import { Window } from '../../../shared/vscode/window'
-import { FakeCommands } from '../../shared/vscode/fakeCommands'
-
-describe('uploadFileCommand', function () {
-    const bucketName = 'bucket-name'
-    const key = 'file.jpg'
-    const sizeBytes = 16
-    const fileLocation = vscode.Uri.file('/file.jpg')
-    const statFile: FileSizeBytes = _file => sizeBytes
-    let outputChannel: MockOutputChannel
-    let s3: S3Client
-    let bucketNode: S3BucketNode
-    let window: FakeWindow
-    let getBucket: (s3client: S3Client, window?: Window) => Promise<S3.Bucket | 'cancel' | 'back'>
-    let getFile: (document?: vscode.Uri, window?: Window) => Promise<vscode.Uri[] | undefined>
-    let commands: Commands
-    let mockedUpload: S3.ManagedUpload
-
-    beforeEach(function () {
-        mockedUpload = mock()
-        s3 = mock()
-        commands = new FakeCommands()
-        bucketNode = new S3BucketNode(
-            { name: bucketName, region: 'region', arn: 'arn' },
-            new S3Node(instance(s3)),
-            instance(s3)
-        )
-        window = new FakeWindow({ dialog: { openSelections: [fileLocation] } })
-        outputChannel = new MockOutputChannel()
-    })
-
-    describe('with node parameter', async function () {
-        this.beforeEach(function () {
-            s3 = mock()
-            commands = new FakeCommands()
-            bucketNode = new S3BucketNode(
-                { name: bucketName, region: 'region', arn: 'arn' },
-                new S3Node(instance(s3)),
-                instance(s3)
-            )
-            window = new FakeWindow({ dialog: { openSelections: [fileLocation] } })
-            outputChannel = new MockOutputChannel()
-        })
-
-        it('uploads successfully', async function () {
-            when(s3.uploadFile(anything())).thenResolve(instance(mockedUpload))
-            when(mockedUpload.promise()).thenResolve()
-
-            window = new FakeWindow({ dialog: { openSelections: [fileLocation] } })
-
-            getFile = (document, window) => {
-                return new Promise((resolve, reject) => {
-                    resolve([fileLocation])
-                })
-            }
-
-            await uploadFileCommand(
-                instance(s3),
-                bucketNode,
-                statFile,
-                undefined,
-                getFile,
-                window,
-                outputChannel,
-                commands
-            )
-
-            // eslint-disable-next-line @typescript-eslint/unbound-method
-            const [uploadFileRequest] = capture(s3.uploadFile).last()
-
-            assert.strictEqual(uploadFileRequest.bucketName, bucketName)
-            assert.strictEqual(uploadFileRequest.key, key)
-            assert.strictEqual(uploadFileRequest.content, fileLocation)
-
-            assert.deepStrictEqual(outputChannel.lines, [
-                'Uploading file file.jpg to s3://bucket-name/file.jpg',
-                'Uploaded 1/1 files',
-            ])
-        })
-
-        it('cancels and displays a message if a user does not select a file', async function () {
-            window = new FakeWindow({ dialog: { openSelections: undefined } })
-
-            getFile = (document, window) => {
-                return new Promise((resolve, reject) => {
-                    resolve(undefined)
-                })
-            }
-
-            await uploadFileCommand(
-                instance(s3),
-                bucketNode,
-                statFile,
-                undefined,
-                getFile,
-                window,
-                outputChannel,
-                commands
-            )
-            assert.deepStrictEqual(outputChannel.lines, ['No file selected, cancelling upload'])
-        })
-    })
-
-    describe('without node parameter', async function () {
-        this.beforeEach(function () {
-            s3 = mock()
-            window = new FakeWindow({ dialog: { openSelections: [fileLocation] } })
-            outputChannel = new MockOutputChannel()
-            commands = new FakeCommands()
-            getFile = (document, window) => {
-                return new Promise((resolve, reject) => {
-                    resolve([fileLocation])
-                })
-            }
-
-            getBucket = s3Client => {
-                return new Promise((resolve, reject) => {
-                    resolve({ Name: bucketName })
-                })
-            }
-        })
-
-        it('uploads if user provides file and bucket', async function () {
-            when(s3.uploadFile(anything())).thenResolve(instance(mockedUpload))
-            when(mockedUpload.promise()).thenResolve()
-
-            await uploadFileCommand(
-                instance(s3),
-                undefined,
-                statFile,
-                getBucket,
-                getFile,
-                window,
-                outputChannel,
-                commands
-            )
-
-            assert.deepStrictEqual(outputChannel.lines, [
-                'Uploading file file.jpg to s3://bucket-name/file.jpg',
-                'Uploaded 1/1 files',
-            ])
-        })
-
-        it('cancels if user does not provide bucket', async function () {
-            getBucket = s3Client => {
-                return new Promise((resolve, reject) => {
-                    resolve('cancel')
-                })
-            }
-
-            await uploadFileCommand(
-                instance(s3),
-                undefined,
-                statFile,
-                getBucket,
-                getFile,
-                window,
-                outputChannel,
-                commands
-            )
-            assert.deepStrictEqual(outputChannel.lines, ['No bucket selected, cancelling upload'])
-        })
-
-        it('cancels if user does not select file', async function () {
-            getFile = (document, window) => {
-                return new Promise((resolve, reject) => {
-                    resolve(undefined)
-                })
-            }
-
-            await uploadFileCommand(
-                instance(s3),
-                undefined,
-                statFile,
-                getBucket,
-                getFile,
-                window,
-                outputChannel,
-                commands
-            )
-            assert.deepStrictEqual(outputChannel.lines, ['No file selected, cancelling upload'])
-        })
-    })
-
-    getFile = (document, window) => {
-        return new Promise((resolve, reject) => {
-            resolve([fileLocation])
-        })
-    }
-
-    getBucket = s3Client => {
-        return new Promise((resolve, reject) => {
-            resolve({ Name: bucketName })
-        })
-    }
-
-    it('successfully upload file', async function () {
-        when(s3.uploadFile(anything())).thenResolve(instance(mockedUpload))
-        when(mockedUpload.promise()).thenResolve()
-
-        window = new FakeWindow({ dialog: { openSelections: [fileLocation] } })
-
-        await uploadFileCommand(
-            instance(s3),
-            fileLocation,
-            statFile,
-            getBucket,
-            getFile,
-            window,
-            outputChannel,
-            commands
-        )
-
-        assert.deepStrictEqual(outputChannel.lines, [
-            'Uploading file file.jpg to s3://bucket-name/file.jpg',
-            `Uploaded 1/1 files`,
-        ])
-    })
-
-    it('errors when s3 call fails', async function () {
-        when(s3.uploadFile(anything())).thenThrow(new Error('Expected failure'))
-
-        window = new FakeWindow({ dialog: { openSelections: [fileLocation] } })
-        outputChannel = new MockOutputChannel()
-        await uploadFileCommand(
-            instance(s3),
-            fileLocation,
-            statFile,
-            getBucket,
-            getFile,
-            window,
-            outputChannel,
-            commands
-        )
-
-        assert.deepStrictEqual(outputChannel.lines, [
-            'Uploading file file.jpg to s3://bucket-name/file.jpg',
-            `Failed to upload file file.jpg: Expected failure`,
-            'Uploaded 0/1 files',
-            'Failed uploads:',
-            `${key}`,
-        ])
-    })
-})
-
-describe('getFileToUpload', function () {
-    const fileLocation = vscode.Uri.file('/file.jpg')
-    let window: FakeWindow
-
-    const selection: any = { label: 'Browse for more files...' }
-    const prompt: <T extends vscode.QuickPickItem>(opts: {
-        picker: vscode.QuickPick<T>
-        onDidTriggerButton?(
-            button: vscode.QuickInputButton,
-            resolve: (value: T[] | PromiseLike<T[] | undefined> | undefined) => void,
-            reject: (reason?: any) => void
-        ): void
-    }) => Promise<T[] | undefined> = () => {
-        return new Promise((resolve, reject) => {
-            resolve([selection])
-        })
-    }
-
-    beforeEach(function () {
-        window = new FakeWindow({ dialog: { openSelections: [fileLocation] } })
-    })
-
-    it('directly asks user for file if no active editor', async function () {
-        const response = await getFilesToUpload(undefined, window, prompt)
-        assert.deepStrictEqual(response, [fileLocation])
-    })
-
-    it('Returns undefined if no file is selected on first prompt', async function () {
-        window = new FakeWindow({ dialog: { openSelections: undefined } })
-
-        const response = await getFilesToUpload(undefined, window, prompt)
-        assert.strictEqual(response, undefined)
-    })
-
-    it('opens the current file if a user selects it from the prompt', async function () {
-        const alreadyOpenedUri = vscode.Uri.file('/alreadyOpened.txt')
-        selection.label = alreadyOpenedUri.fsPath
-
-        const response = await getFilesToUpload(alreadyOpenedUri, window, prompt)
-        assert.deepStrictEqual(response, [alreadyOpenedUri])
-    })
-
-    it('opens the file prompt if a user selects to browse for more files', async function () {
-        selection.label = 'Browse for more files...'
-
-        const response = await getFilesToUpload(fileLocation, window, prompt)
-        assert.deepStrictEqual(response, [fileLocation])
-    })
-
-    it('returns undefined if the user does not select a file through the file browser', async function () {
-        selection.label = 'Browse for more files...'
-        window = new FakeWindow({ dialog: { openSelections: undefined } })
-
-        const response = await getFilesToUpload(fileLocation, window, prompt)
-
-        assert.strictEqual(response, undefined)
-    })
-})
-
-describe('promptUserForBucket', async function () {
-    const fileLocation = vscode.Uri.file('/file.jpg')
-
-    let s3: S3Client
-    let buckets: S3.Bucket[]
-    let window: FakeWindow
-
-    const promptUndef: <T extends vscode.QuickPickItem>(opts: {
-        picker: vscode.QuickPick<T>
-        onDidTriggerButton?(
-            button: vscode.QuickInputButton,
-            resolve: (value: T[] | PromiseLike<T[] | undefined> | undefined) => void,
-            reject: (reason?: any) => void
-        ): void
-    }) => Promise<T[] | undefined> = () => {
-        return new Promise((resolve, reject) => {
-            resolve(undefined)
-        })
-    }
-    const selection: any = {
-        label: 'bucket selected',
-        bucket: { Name: 'bucket 1' },
-    }
-    const promptSelect: <T extends vscode.QuickPickItem>(opts: {
-        picker: vscode.QuickPick<T>
-        onDidTriggerButton?(
-            button: vscode.QuickInputButton,
-            resolve: (value: T[] | PromiseLike<T[] | undefined> | undefined) => void,
-            reject: (reason?: any) => void
-        ): void
-    }) => Promise<T[] | undefined> = () => {
-        return new Promise((resolve, reject) => {
-            resolve([selection])
-        })
-    }
-
-    beforeEach(function () {
-        s3 = mock()
-        buckets = [{ Name: 'bucket 1' }, { Name: 'bucket 2' }, { Name: 'bucket 3' }]
-        window = new FakeWindow({ dialog: { openSelections: [fileLocation] } })
-    })
-
-    it('Returns selected bucket', async function () {
-        when(s3.listAllBuckets()).thenResolve(buckets)
-
-        const response = await promptUserForBucket(instance(s3), window, promptSelect)
-        assert.deepStrictEqual(response, buckets[0])
-    })
-
-    it('Returns "back" when selected', async function () {
-        when(s3.listAllBuckets()).thenResolve(buckets)
-
-        selection.label = 'back'
-        selection.bucket = undefined
-
-        const response = await promptUserForBucket(instance(s3), window, promptSelect)
-        assert.strictEqual(response, 'back')
-    })
-
-    it('Lets the user create a new bucket', async function () {
-        when(s3.listAllBuckets()).thenResolve(buckets)
-
-        selection.label = 'Create new bucket'
-        selection.bucket = undefined
-
-        const createBucket: (node?: S3Node, window?: Window, commands?: Commands) => Promise<void> = () => {
-            window.showErrorMessage('Error expected')
-            throw new Error('Error expected')
-        }
-        try {
-            await promptUserForBucket(instance(s3), window, promptSelect, createBucket)
-            assert.fail()
-        } catch (e) {
-            assert.ok(window.message.error?.includes('Error expected'))
-        }
-    })
-
-    it('Returns "cancel" when user doesn\'t select a bucket', async function () {
-        when(s3.listAllBuckets()).thenResolve(buckets)
-
-        const response = await promptUserForBucket(instance(s3), window, promptUndef)
-        assert.strictEqual(response, 'cancel')
-    })
-
-    it('Throws error when it is not possible to list buckets from client', async function () {
-        when(s3.listAllBuckets()).thenReject(new Error('Expected failure'))
-
-        const window = new FakeWindow({ dialog: { openSelections: [fileLocation] } })
-        try {
-            await promptUserForBucket(instance(s3), window)
-            assert.fail() // fails if promptUserForBucket does not throw
-        } catch (e) {
-            assert.ok(window.message.error?.includes('Failed to list buckets from client'))
-        }
-    })
-})
diff --git a/src/test/s3/explorer/s3BucketNode.test.ts b/src/test/s3/explorer/s3BucketNode.test.ts
deleted file mode 100644
index e0fe69b8c51..00000000000
--- a/src/test/s3/explorer/s3BucketNode.test.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { MoreResultsNode } from '../../../awsexplorer/moreResultsNode'
-import { S3BucketNode } from '../../../s3/explorer/s3BucketNode'
-import { S3FileNode } from '../../../s3/explorer/s3FileNode'
-import { S3FolderNode } from '../../../s3/explorer/s3FolderNode'
-import { S3Node } from '../../../s3/explorer/s3Nodes'
-import { S3Client, File, Folder, Bucket } from '../../../shared/clients/s3Client'
-import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
-import { LoadMoreNode } from '../../../shared/treeview/nodes/loadMoreNode'
-import { deepEqual, instance, mock, when } from '../../utilities/mockito'
-import { FakeWorkspace } from '../../shared/vscode/fakeWorkspace'
-
-describe('S3BucketNode', function () {
-    const name = 'bucket-name'
-    const continuationToken = 'continuationToken'
-    const bucket: Bucket = { name, region: 'region', arn: 'arn' }
-    const file: File = { name: 'name', key: 'key', arn: 'arn' }
-    const folder: Folder = { name: 'folder', path: 'path', arn: 'arn' }
-    const maxResults = 200
-    let s3: S3Client
-
-    function assertBucketNode(node: LoadMoreNode): void {
-        assert.ok(node instanceof S3BucketNode, `Node ${node} should be a Bucket Node`)
-        assert.deepStrictEqual((node as S3BucketNode).bucket, bucket)
-    }
-
-    function assertFolderNode(node: AWSTreeNodeBase, expectedFolder: Folder): void {
-        assert.ok(node instanceof S3FolderNode, `Node ${node} should be a Folder Node`)
-        assert.deepStrictEqual((node as S3FolderNode).bucket, bucket)
-        assert.deepStrictEqual((node as S3FolderNode).folder, expectedFolder)
-    }
-
-    function assertFileNode(node: AWSTreeNodeBase, expectedFile: File): void {
-        assert.ok(node instanceof S3FileNode, `Node ${node} should be a File Node`)
-        assert.deepStrictEqual((node as S3FileNode).bucket, bucket)
-        assert.deepStrictEqual((node as S3FileNode).file, expectedFile)
-    }
-
-    function assertMoreResultsNode(node: AWSTreeNodeBase): void {
-        assert.ok(node instanceof MoreResultsNode, `Node ${node} should be a More Results Node`)
-        assertBucketNode((node as MoreResultsNode).parent)
-    }
-
-    beforeEach(function () {
-        s3 = mock()
-    })
-
-    describe('getChildren', function () {
-        it('gets children', async function () {
-            when(s3.listFiles(deepEqual({ bucketName: name, continuationToken: undefined, maxResults }))).thenResolve({
-                folders: [folder],
-                files: [file],
-                continuationToken: undefined,
-            })
-
-            const workspace = new FakeWorkspace({
-                section: 'aws',
-                configuration: { key: 's3.maxItemsPerPage', value: maxResults },
-            })
-            const node = new S3BucketNode(bucket, new S3Node(instance(s3)), instance(s3), workspace)
-            const [folderNode, fileNode, ...otherNodes] = await node.getChildren()
-
-            assertFolderNode(folderNode, folder)
-            assertFileNode(fileNode, file)
-            assert.strictEqual(otherNodes.length, 0)
-        })
-
-        it('gets children with node for loading more results', async function () {
-            when(s3.listFiles(deepEqual({ bucketName: name, continuationToken: undefined, maxResults }))).thenResolve({
-                folders: [folder],
-                files: [file],
-                continuationToken,
-            })
-
-            const workspace = new FakeWorkspace({
-                section: 'aws',
-                configuration: { key: 's3.maxItemsPerPage', value: maxResults },
-            })
-            const node = new S3BucketNode(bucket, new S3Node(instance(s3)), instance(s3), workspace)
-            const [folderNode, fileNode, moreResultsNode, ...otherNodes] = await node.getChildren()
-
-            assertFolderNode(folderNode, folder)
-            assertFileNode(fileNode, file)
-            assertMoreResultsNode(moreResultsNode)
-            assert.strictEqual(otherNodes.length, 0)
-        })
-    })
-})
diff --git a/src/test/s3/explorer/s3FileNode.test.ts b/src/test/s3/explorer/s3FileNode.test.ts
deleted file mode 100644
index 81af9b8a2cf..00000000000
--- a/src/test/s3/explorer/s3FileNode.test.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as moment from 'moment'
-import { S3BucketNode } from '../../../s3/explorer/s3BucketNode'
-import { s3DateFormat, S3FileNode } from '../../../s3/explorer/s3FileNode'
-import { S3Client } from '../../../shared/clients/s3Client'
-
-describe('S3FileNode', function () {
-    const arn = 'arn'
-    const name = 'file.jpg'
-    const key = 'path/to/file.jpg'
-    const sizeBytes = 1024
-    const lastModified = new Date(2020, 5, 4, 3, 2, 1)
-    const now = new Date(2020, 6, 4)
-    const lastModifiedReadable = moment(lastModified).format(s3DateFormat)
-
-    it('creates an S3 File Node', async function () {
-        const node = new S3FileNode(
-            { name: 'bucket-name', region: 'region', arn: 'arn' },
-            { name, key, arn, sizeBytes, lastModified },
-            {} as S3BucketNode,
-            {} as S3Client,
-            now
-        )
-
-        assert.ok(node.tooltip?.startsWith(`path/to/file.jpg\nSize: 1 KB\nLast Modified: ${lastModifiedReadable}`))
-        assert.ok((node.description as string).startsWith('1 KB, a month ago'))
-    })
-})
diff --git a/src/test/s3/explorer/s3FolderNode.test.ts b/src/test/s3/explorer/s3FolderNode.test.ts
deleted file mode 100644
index 7fafc3c3720..00000000000
--- a/src/test/s3/explorer/s3FolderNode.test.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { MoreResultsNode } from '../../../awsexplorer/moreResultsNode'
-import { S3FileNode } from '../../../s3/explorer/s3FileNode'
-import { S3FolderNode } from '../../../s3/explorer/s3FolderNode'
-import { S3Client, File, Folder, Bucket } from '../../../shared/clients/s3Client'
-import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
-import { LoadMoreNode } from '../../../shared/treeview/nodes/loadMoreNode'
-import { deepEqual, instance, mock, when } from '../../utilities/mockito'
-import { FakeWorkspace } from '../../shared/vscode/fakeWorkspace'
-
-describe('S3FolderNode', function () {
-    const bucketName = 'bucket-name'
-    const path = 'folder/path'
-    const continuationToken = 'continuationToken'
-    const bucket: Bucket = { name: bucketName, region: 'region', arn: 'arn' }
-    const file: File = { name: 'name', key: 'key', arn: 'arn' }
-    const folder: Folder = { name: 'folder', path, arn: 'arn' }
-    const subFolder: Folder = { name: 'subFolder', path: 'subPath', arn: 'subArn' }
-    const maxResults = 200
-    const workspace = new FakeWorkspace({
-        section: 'aws',
-        configuration: { key: 's3.maxItemsPerPage', value: maxResults },
-    })
-
-    let s3: S3Client
-
-    function assertFolderNode(node: AWSTreeNodeBase | LoadMoreNode, expectedFolder: Folder): void {
-        assert.ok(node instanceof S3FolderNode, `Node ${node} should be a Folder Node`)
-        assert.deepStrictEqual((node as S3FolderNode).bucket, bucket)
-        assert.deepStrictEqual((node as S3FolderNode).folder, expectedFolder)
-    }
-
-    function assertFileNode(node: AWSTreeNodeBase, expectedFile: File): void {
-        assert.ok(node instanceof S3FileNode, `Node ${node} should be a File Node`)
-        assert.deepStrictEqual((node as S3FileNode).bucket, bucket)
-        assert.deepStrictEqual((node as S3FileNode).file, expectedFile)
-    }
-
-    function assertMoreResultsNode(node: AWSTreeNodeBase): void {
-        assert.ok(node instanceof MoreResultsNode, `Node ${node} should be a More Results Node`)
-        assertFolderNode((node as MoreResultsNode).parent, folder)
-    }
-
-    beforeEach(function () {
-        s3 = mock()
-    })
-
-    describe('getChildren', function () {
-        it('gets children', async function () {
-            when(
-                s3.listFiles(deepEqual({ bucketName, folderPath: path, continuationToken: undefined, maxResults }))
-            ).thenResolve({
-                folders: [subFolder],
-                files: [file],
-                continuationToken: undefined,
-            })
-
-            const node = new S3FolderNode(bucket, folder, instance(s3), workspace)
-            const [subFolderNode, fileNode, ...otherNodes] = await node.getChildren()
-
-            assertFolderNode(subFolderNode, subFolder)
-            assertFileNode(fileNode, file)
-            assert.strictEqual(otherNodes.length, 0)
-        })
-
-        it('gets children with node for loading more results', async function () {
-            when(
-                s3.listFiles(deepEqual({ bucketName, folderPath: path, continuationToken: undefined, maxResults }))
-            ).thenResolve({
-                folders: [subFolder],
-                files: [file],
-                continuationToken,
-            })
-
-            const node = new S3FolderNode(bucket, folder, instance(s3), workspace)
-            const [subFolderNode, fileNode, moreResultsNode, ...otherNodes] = await node.getChildren()
-
-            assertFolderNode(subFolderNode, subFolder)
-            assertFileNode(fileNode, file)
-            assertMoreResultsNode(moreResultsNode)
-            assert.strictEqual(otherNodes.length, 0)
-        })
-    })
-})
diff --git a/src/test/s3/explorer/s3Nodes.test.ts b/src/test/s3/explorer/s3Nodes.test.ts
deleted file mode 100644
index d85fd359256..00000000000
--- a/src/test/s3/explorer/s3Nodes.test.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { S3BucketNode } from '../../../s3/explorer/s3BucketNode'
-import { S3Node } from '../../../s3/explorer/s3Nodes'
-import { S3Client, Bucket } from '../../../shared/clients/s3Client'
-import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
-import { instance, mock, when } from '../../utilities/mockito'
-
-describe('S3Node', function () {
-    const firstBucket: Bucket = { name: 'first-bucket-name', region: 'firstRegion', arn: 'firstArn' }
-    const secondBucket: Bucket = { name: 'second-bucket-name', region: 'secondRegion', arn: 'secondArn' }
-
-    let s3: S3Client
-
-    function assertBucketNode(node: AWSTreeNodeBase, expectedBucket: Bucket): void {
-        assert.ok(node instanceof S3BucketNode, `Node ${node} should be a Bucket Node`)
-        assert.deepStrictEqual((node as S3BucketNode).bucket, expectedBucket)
-    }
-
-    beforeEach(function () {
-        s3 = mock()
-    })
-
-    it('gets children', async function () {
-        when(s3.listBuckets()).thenResolve({
-            buckets: [firstBucket, secondBucket],
-        })
-
-        const node = new S3Node(instance(s3))
-        const [firstBucketNode, secondBucketNode, ...otherNodes] = await node.getChildren()
-
-        assertBucketNode(firstBucketNode, firstBucket)
-        assertBucketNode(secondBucketNode, secondBucket)
-        assert.strictEqual(otherNodes.length, 0)
-    })
-})
diff --git a/src/test/s3/util/fileViewerManager.test.ts b/src/test/s3/util/fileViewerManager.test.ts
deleted file mode 100644
index d15b2a4b294..00000000000
--- a/src/test/s3/util/fileViewerManager.test.ts
+++ /dev/null
@@ -1,303 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { ManagedUpload } from 'aws-sdk/clients/s3'
-import * as vscode from 'vscode'
-import { S3FileProvider, S3FileViewerManager } from '../../../s3/fileViewerManager'
-import { DefaultBucket, DefaultS3Client, File, toFile } from '../../../shared/clients/s3Client'
-import globals from '../../../shared/extensionGlobals'
-import { VirualFileSystem } from '../../../shared/virtualFilesystem'
-import { bufferToStream } from '../../../shared/utilities/streamUtilities'
-import { createTestWindow, TestWindow } from '../../shared/vscode/window'
-import { MockOutputChannel } from '../../mockOutputChannel'
-import { SeverityLevel } from '../../shared/vscode/message'
-import { assertTelemetry, assertTextEditorContains, closeAllEditors } from '../../testUtil'
-import { PromptSettings } from '../../../shared/settings'
-import { stub } from '../../utilities/stubber'
-import { assertHasProps } from '../../../shared/utilities/tsUtils'
-import { ToolkitError } from '../../../shared/errors'
-
-const bucket = new DefaultBucket({
-    name: 'bucket-name',
-    region: 'us-west-2',
-    partitionId: 'aws',
-})
-
-const bigImage = toFile(bucket, {
-    ETag: '12345',
-    Key: 'big-image.jpg',
-    Size: 5 * Math.pow(10, 6),
-})
-
-const computeTag = (content: Buffer) => content.toString()
-const makeFile = (key: string, content: Buffer) => {
-    return Object.assign(
-        toFile(bucket, {
-            Key: key,
-            ETag: computeTag(content),
-            Size: content.byteLength,
-            LastModified: new Date(),
-        }),
-        { content }
-    )
-}
-
-type DataFile = File & { readonly content: Buffer }
-function createS3() {
-    const files = new Map<string, DataFile>()
-    const client = stub(DefaultS3Client, { regionCode: bucket.region })
-    client.downloadFileStream.callsFake(async (_, key) => bufferToStream(getFile(key).content))
-    client.headObject.callsFake(async req => getFile(req.key))
-    client.uploadFile.callsFake(async req => {
-        if (req.content instanceof vscode.Uri) {
-            throw new Error('Did not expect a URI, expected a Buffer')
-        }
-        const newFile = {
-            ...makeFile(req.key, Buffer.from(req.content)),
-            ContentType: req.contentType,
-        }
-        assertHasProps(newFile, 'Key', 'ETag')
-        files.set(newFile.key, newFile)
-
-        const upload = stub(ManagedUpload)
-        upload.promise.resolves({
-            ...newFile,
-            Bucket: bucket.name,
-            Location: newFile.key,
-        })
-
-        return upload
-    })
-
-    function getFile(key: string) {
-        const file = files.get(key)
-        assert.ok(file, `No file found for key "${key}"`)
-
-        return file
-    }
-
-    function addFile(file: DataFile) {
-        assert.strictEqual(files.get(file.key), undefined, `File "${file.key}" already exists`)
-        files.set(file.key, file)
-    }
-
-    return { client, addFile, getFile }
-}
-
-describe('S3FileProvider', function () {
-    const textFile = makeFile('file.txt', Buffer.from('content', 'utf-8'))
-    let provider: S3FileProvider
-    let s3: ReturnType<typeof createS3>
-
-    function createProvider(file: DataFile) {
-        return new S3FileProvider(s3.client, { ...file, bucket })
-    }
-
-    before(function () {
-        // TODO: fix this dependency
-        globals.outputChannel ??= new MockOutputChannel()
-    })
-
-    beforeEach(function () {
-        s3 = createS3()
-        s3.addFile(textFile)
-        provider = createProvider(textFile)
-    })
-
-    it('can read contents from s3', async function () {
-        const content = await provider.read()
-        assert.deepStrictEqual(content, s3.getFile(textFile.key).content)
-    })
-
-    it('can upload to s3', async function () {
-        const newContent = Buffer.from('new content', 'utf-8')
-        await provider.write(newContent)
-        assert.deepStrictEqual(await provider.read(), newContent)
-    })
-
-    it('can use `stat`', async function () {
-        const stats = await provider.stat()
-        assert.deepStrictEqual(stats, {
-            ctime: 0,
-            size: textFile.sizeBytes,
-            mtime: textFile.lastModified?.getTime(),
-        })
-    })
-
-    it('fires an event when the eTag changes', async function () {
-        const changed = new Promise<void>((resolve, reject) => {
-            provider.onDidChange(resolve)
-            setTimeout(() => reject(new Error('Event did not fire')), 1000)
-        })
-        await provider.write(Buffer.from('some text'))
-        await changed
-    })
-
-    it('uses mime type if no content type exists', async function () {
-        await provider.refresh()
-        await provider.write(Buffer.from('some text'))
-        assert.strictEqual(s3.getFile(textFile.key).ContentType, 'text/plain; charset=utf-8')
-    })
-
-    it('preserves content types if present', async function () {
-        const jsonFile = {
-            ...makeFile('json-blob', Buffer.from('{}')),
-            ContentType: 'application/json',
-        }
-        s3.addFile(jsonFile)
-        const newData = Buffer.from(JSON.stringify({ foo: 'bar' }))
-        const provider = createProvider(jsonFile)
-        await provider.refresh()
-        await provider.write(newData)
-
-        const result = s3.getFile(jsonFile.key)
-        assert.deepStrictEqual(result.content, newData)
-        assert.deepStrictEqual(result.ContentType, jsonFile.ContentType)
-    })
-
-    it('emits telemetry when downloading', async function () {
-        await provider.read()
-        assertTelemetry('s3_downloadObject', {
-            component: 'viewer',
-            result: 'Succeeded',
-        })
-    })
-
-    it('emits telemetry when uploading', async function () {
-        await provider.write(Buffer.from('111', 'utf-8'))
-        assertTelemetry('s3_uploadObject', {
-            component: 'viewer',
-            result: 'Succeeded',
-        })
-    })
-})
-
-describe('FileViewerManager', function () {
-    const readScheme = 's3-read-test'
-    const editScheme = 's3-edit-test'
-    let s3: ReturnType<typeof createS3>
-    let fs: VirualFileSystem
-    let fileViewerManager: S3FileViewerManager
-    let testWindow: TestWindow
-    let disposables: vscode.Disposable[]
-
-    function findEditors(documentName: string, window = vscode.window) {
-        return window.visibleTextEditors.filter(e => e.document.fileName.endsWith(documentName))
-    }
-
-    beforeEach(function () {
-        s3 = createS3()
-        fs = new VirualFileSystem()
-        const window = (testWindow = createTestWindow())
-
-        fileViewerManager = new S3FileViewerManager(() => s3.client, fs, window, new PromptSettings(), {
-            read: readScheme,
-            edit: editScheme,
-        })
-
-        disposables = [
-            vscode.workspace.registerFileSystemProvider(editScheme, fs),
-            vscode.workspace.registerFileSystemProvider(readScheme, fs, { isReadonly: true }),
-        ]
-    })
-
-    afterEach(async function () {
-        await closeAllEditors()
-        vscode.Disposable.from(...disposables).dispose()
-    })
-
-    it('prompts if file size is greater than 4MB', async function () {
-        fileViewerManager.openInReadMode({ ...bigImage, bucket })
-        await testWindow.waitForMessage(/File size is more than 4MB/).then(message => message.selectItem(/Continue/))
-    })
-
-    it('throws if the user cancels a download', async function () {
-        const didOpen = fileViewerManager.openInReadMode({ ...bigImage, bucket })
-        await testWindow.waitForMessage(/File size is more than 4MB/).then(message => message.selectItem(/Cancel/))
-        await assert.rejects(didOpen)
-    })
-
-    describe('opens text files', function () {
-        const textFile1Contents = Buffer.from('test1 contents', 'utf-8')
-        const textFile1 = makeFile('test1.txt', textFile1Contents)
-        const textFile2Contents = Buffer.from('test2 contents', 'utf-8')
-        const textFile2 = makeFile('test2.txt', textFile2Contents)
-
-        beforeEach(function () {
-            s3.addFile(textFile1)
-            s3.addFile(textFile2)
-        })
-
-        it('opens a new editor if no document exists', async function () {
-            await fileViewerManager.openInReadMode({ ...textFile1, bucket })
-            await assertTextEditorContains(textFile1.content.toString())
-        })
-
-        it('closes the read-only tab when opening in edit mode', async function () {
-            await fileViewerManager.openInReadMode({ ...textFile1, bucket })
-            await fileViewerManager.openInEditMode({ ...textFile1, bucket })
-            const editors = findEditors(textFile1.name)
-            assert.strictEqual(editors.length, 1)
-            assert.strictEqual(findEditors(textFile1.name)[0]?.document.uri.scheme, editScheme)
-        })
-
-        it('re-uses tabs in edit mode when opening as read-only', async function () {
-            await fileViewerManager.openInEditMode({ ...textFile1, bucket })
-            await fileViewerManager.openInReadMode({ ...textFile1, bucket })
-            const editors = findEditors(textFile1.name)
-            assert.strictEqual(editors.length, 1)
-            assert.strictEqual(findEditors(textFile1.name)[0]?.document.uri.scheme, editScheme)
-        })
-
-        it('can open in edit mode, showing a warning with two options', async function () {
-            const shownMessage = testWindow.waitForMessage(/You are now editing an S3 file./).then(message => {
-                message.assertSeverity(SeverityLevel.Warning)
-                assert.strictEqual(message.items.length, 2)
-                return message
-            })
-
-            await fileViewerManager.openInEditMode({ ...textFile1, bucket })
-
-            await assertTextEditorContains(textFile1.content.toString())
-            await shownMessage
-        })
-
-        it('re-uses an editor if already opened, focusing it', async function () {
-            await fileViewerManager.openInReadMode({ ...textFile1, bucket })
-            await fileViewerManager.openInReadMode({ ...textFile2, bucket })
-
-            await assertTextEditorContains(textFile2.content.toString())
-
-            await fileViewerManager.openInReadMode({ ...textFile1, bucket })
-            await assertTextEditorContains(textFile1.content.toString())
-            assert.strictEqual(findEditors(textFile1.name).length, 1)
-        })
-
-        it('can open an S3 file with reserved URI characters', async function () {
-            const contents = Buffer.from('text', 'utf-8')
-            const file = makeFile('us-west-2:3cff280c/file.txt', contents)
-            s3.addFile(file)
-
-            await fileViewerManager.openInReadMode({ ...file, bucket })
-            await assertTextEditorContains(contents.toString())
-        })
-
-        it('can open files with no file extension', async function () {
-            const contents = Buffer.from('text', 'utf-8')
-            const file = makeFile('us-west-2:3cff280c/file', contents)
-            s3.addFile(file)
-
-            await fileViewerManager.openInReadMode({ ...file, bucket })
-            await assertTextEditorContains(contents.toString())
-        })
-
-        it('rejects if the file does not exist', async function () {
-            const file = makeFile('foo.txt', Buffer.from('0', 'utf-8'))
-            const err = await fileViewerManager.openInReadMode({ ...file, bucket }).catch(e => e)
-            assert.ok(err instanceof ToolkitError)
-        })
-    })
-})
diff --git a/src/test/s3/util/progressReporter.test.ts b/src/test/s3/util/progressReporter.test.ts
deleted file mode 100644
index a838064d7b0..00000000000
--- a/src/test/s3/util/progressReporter.test.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-import { progressReporter } from '../../../s3/progressReporter'
-import { deepEqual, mock, verify, anyNumber, instance } from '../../utilities/mockito'
-
-describe('progressReporter', function () {
-    let progress: vscode.Progress<{ message?: string; increment?: number }>
-
-    beforeEach(function () {
-        progress = mock()
-    })
-
-    it('does not round', function () {
-        const reporter = progressReporter(instance(progress), { totalBytes: 3, minIntervalMillis: 0 })
-
-        reporter(1)
-        verify(progress.report(deepEqual({ message: undefined, increment: (1 / 3) * 100 }))).once()
-
-        reporter(2)
-        verify(progress.report(deepEqual({ message: undefined, increment: (2 / 3) * 100 }))).once()
-    })
-
-    it('reports incremental percentage when total is provided', function () {
-        const reporter = progressReporter(instance(progress), { totalBytes: 16, minIntervalMillis: 0 })
-
-        reporter(4)
-        verify(progress.report(deepEqual({ message: undefined, increment: 25 }))).once()
-
-        reporter(8)
-        verify(progress.report(deepEqual({ message: undefined, increment: 50 }))).once()
-    })
-
-    it('reports a formatted message if `reportMessage` is set', function () {
-        const reporter = progressReporter(instance(progress), {
-            totalBytes: 16,
-            minIntervalMillis: 0,
-            reportMessage: true,
-        })
-
-        reporter(4)
-        verify(progress.report(deepEqual({ message: `4 B / 16 B`, increment: 25 }))).once()
-
-        reporter(8)
-        verify(progress.report(deepEqual({ message: `12 B / 16 B`, increment: 50 }))).once()
-    })
-
-    it('throttles progress updates when update frequency exceeds throttle interval', function () {
-        const reporter = progressReporter(instance(progress), {
-            totalBytes: 16,
-            minIntervalMillis: 99999,
-        })
-
-        reporter(4) // should fire as leading edge of interval (4/16 - 0/16 = 4/16 = +25%)
-        verify(
-            progress.report(
-                deepEqual({
-                    message: undefined,
-                    increment: 25,
-                })
-            )
-        ).once()
-
-        reporter(4) // shouldn't fire
-        reporter(8) // should fire, since this puts progress at 100%
-
-        verify(
-            progress.report(
-                deepEqual({
-                    message: undefined,
-                    increment: 75,
-                })
-            )
-        ).once()
-    })
-
-    it('reports no incremental percentage when total is not provided', function () {
-        const reporter = progressReporter(instance(progress), { minIntervalMillis: 0 })
-
-        reporter(4)
-        reporter(8)
-        verify(progress.report(anyNumber())).never()
-    })
-
-    it('throws an error if total bytes is not an integer', function () {
-        assert.throws(
-            () => progressReporter(instance(progress), { totalBytes: 1.5, minIntervalMillis: 0 }),
-            /must be an integer/
-        )
-    })
-
-    it('throws an error if total bytes is negative', function () {
-        assert.throws(
-            () => progressReporter(instance(progress), { totalBytes: -5, minIntervalMillis: 0 }),
-            /cannot be negative/
-        )
-    })
-
-    it('throws an error if updated with non integer bytes', function () {
-        const reporter = progressReporter(instance(progress), { totalBytes: 5, minIntervalMillis: 0 })
-
-        assert.throws(() => reporter(1.5), /must be an integer/)
-    })
-
-    it('throws an error if updated with negative bytes', function () {
-        const reporter = progressReporter(instance(progress), { totalBytes: 5, minIntervalMillis: 0 })
-
-        assert.throws(() => reporter(-5), /cannot be negative/)
-    })
-
-    it('throws an error if updated with bytes greater than total bytes', function () {
-        const reporter = progressReporter(instance(progress), { totalBytes: 2, minIntervalMillis: 0 })
-
-        assert.throws(() => reporter(5), /cannot be greater than totalBytes/)
-    })
-})
diff --git a/src/test/s3/util/util.test.ts b/src/test/s3/util/util.test.ts
deleted file mode 100644
index 71bfc70821b..00000000000
--- a/src/test/s3/util/util.test.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { readablePath } from '../../../s3/util'
-
-describe('messages', function () {
-    describe('readablePath', function () {
-        const bucketName = 'bucket-name'
-        const bucketPath = ''
-        const objectPath = 'path/to/object'
-
-        it('creates a readable path for an S3 bucket', function () {
-            const path = readablePath({ bucket: { name: bucketName }, path: bucketPath })
-
-            assert.strictEqual(path, 's3://bucket-name')
-        })
-
-        it('creates a readable path for an object in an S3 bucket', function () {
-            const path = readablePath({ bucket: { name: bucketName }, path: objectPath })
-
-            assert.strictEqual(path, 's3://bucket-name/path/to/object')
-        })
-    })
-})
diff --git a/src/test/shared/activationReloadState.test.ts b/src/test/shared/activationReloadState.test.ts
deleted file mode 100644
index 3b655d3d7bf..00000000000
--- a/src/test/shared/activationReloadState.test.ts
+++ /dev/null
@@ -1,250 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-'use strict'
-
-import * as assert from 'assert'
-import {
-    activationLaunchPathKey,
-    ActivationReloadState,
-    samInitRuntimeKey,
-    samInitImageBooleanKey,
-    activationTemplatePathKey,
-} from '../../shared/activationReloadState'
-import globals, { checkDidReload } from '../../shared/extensionGlobals'
-
-describe('ActivationReloadState', async function () {
-    const activationReloadState = new ActivationReloadState()
-
-    beforeEach(function () {
-        activationReloadState.clearSamInitState()
-    })
-
-    afterEach(function () {
-        activationReloadState.clearSamInitState()
-    })
-
-    it('decides globals.didReload', async function () {
-        await globals.context.globalState.update(activationLaunchPathKey, undefined)
-        assert.strictEqual(checkDidReload(globals.context), false)
-
-        await globals.context.globalState.update(activationLaunchPathKey, '/some/path')
-        assert.strictEqual(checkDidReload(globals.context), true)
-    })
-
-    describe('setSamInitState', async function () {
-        it('without runtime', async function () {
-            activationReloadState.setSamInitState({
-                template: 'sometemplate',
-                readme: 'somepath',
-                runtime: undefined,
-                isImage: false,
-                architecture: 'arm64',
-            })
-
-            assert.strictEqual(
-                globals.context.globalState.get(activationLaunchPathKey),
-                'somepath',
-                'Unexpected Launch Path value was set'
-            )
-            assert.strictEqual(
-                globals.context.globalState.get(activationTemplatePathKey),
-                'sometemplate',
-                'Unexpected Template Path value was set'
-            )
-            assert.strictEqual(
-                globals.context.globalState.get(samInitRuntimeKey),
-                undefined,
-                'Unexpected init runtime key value was set'
-            )
-            assert.strictEqual(
-                globals.context.globalState.get(samInitImageBooleanKey),
-                false,
-                'Unexpected init image boolean value was set'
-            )
-        })
-
-        it('with runtime', async function () {
-            activationReloadState.setSamInitState({
-                template: 'sometemplate',
-                readme: 'somepath',
-                runtime: 'someruntime',
-                isImage: false,
-                architecture: 'arm64',
-            })
-
-            assert.strictEqual(
-                globals.context.globalState.get(activationLaunchPathKey),
-                'somepath',
-                'Unexpected Launch Path value was set'
-            )
-            assert.strictEqual(
-                globals.context.globalState.get(activationTemplatePathKey),
-                'sometemplate',
-                'Unexpected Template Path value was set'
-            )
-            assert.strictEqual(
-                globals.context.globalState.get(samInitRuntimeKey),
-                'someruntime',
-                'Unexpected init runtime value was set'
-            )
-            assert.strictEqual(
-                globals.context.globalState.get(samInitImageBooleanKey),
-                false,
-                'Unexpected init image boolean value was set'
-            )
-        })
-
-        it('with image', async function () {
-            activationReloadState.setSamInitState({
-                template: 'sometemplate',
-                readme: 'somepath',
-                runtime: 'someruntime',
-                isImage: true,
-                architecture: 'arm64',
-            })
-
-            assert.strictEqual(
-                globals.context.globalState.get(activationLaunchPathKey),
-                'somepath',
-                'Unexpected Launch Path value was set'
-            )
-            assert.strictEqual(
-                globals.context.globalState.get(activationTemplatePathKey),
-                'sometemplate',
-                'Unexpected Template Path value was set'
-            )
-            assert.strictEqual(
-                globals.context.globalState.get(samInitRuntimeKey),
-                'someruntime',
-                'Unexpected init runtime value was set'
-            )
-            assert.strictEqual(
-                globals.context.globalState.get(samInitImageBooleanKey),
-                true,
-                'Unexpected init image boolean value was set'
-            )
-        })
-    })
-
-    describe('getSamInitState', async function () {
-        it('path defined, without runtime', async function () {
-            await globals.context.globalState.update(activationLaunchPathKey, 'getsomepath')
-            await globals.context.globalState.update(activationTemplatePathKey, 'gettemplatepath')
-            await globals.context.globalState.update(samInitRuntimeKey, undefined)
-
-            assert.strictEqual(
-                activationReloadState.getSamInitState()?.readme,
-                'getsomepath',
-                'Unexpected Launch Path value was retrieved'
-            )
-            assert.strictEqual(
-                activationReloadState.getSamInitState()?.template,
-                'gettemplatepath',
-                'Unexpected Template Path value was retrieved'
-            )
-            assert.strictEqual(
-                activationReloadState.getSamInitState()?.runtime,
-                undefined,
-                'Unexpected init runtime value was retrieved'
-            )
-            assert.strictEqual(
-                activationReloadState.getSamInitState()?.isImage,
-                undefined,
-                'Unexpected init image boolean value was retrieved'
-            )
-        })
-
-        it('path defined, with runtime', async function () {
-            await globals.context.globalState.update(activationLaunchPathKey, 'getsomepath')
-            await globals.context.globalState.update(activationTemplatePathKey, 'gettemplatepath')
-            await globals.context.globalState.update(samInitRuntimeKey, 'getsomeruntime')
-
-            assert.strictEqual(
-                activationReloadState.getSamInitState()?.readme,
-                'getsomepath',
-                'Unexpected Launch Path value was retrieved'
-            )
-            assert.strictEqual(
-                activationReloadState.getSamInitState()?.template,
-                'gettemplatepath',
-                'Unexpected Template Path value was retrieved'
-            )
-            assert.strictEqual(
-                activationReloadState.getSamInitState()?.runtime,
-                'getsomeruntime',
-                'Unexpected init runtime value was retrieved'
-            )
-            assert.strictEqual(
-                activationReloadState.getSamInitState()?.isImage,
-                undefined,
-                'Unexpected init image boolean value was retrieved'
-            )
-        })
-
-        it('path defined, with runtime and isImage', async function () {
-            await globals.context.globalState.update(activationLaunchPathKey, 'getsomepath')
-            await globals.context.globalState.update(activationTemplatePathKey, 'gettemplatepath')
-            await globals.context.globalState.update(samInitRuntimeKey, 'getsomeruntime')
-            await globals.context.globalState.update(samInitImageBooleanKey, true)
-
-            assert.strictEqual(
-                activationReloadState.getSamInitState()?.readme,
-                'getsomepath',
-                'Unexpected Launch Path value was retrieved'
-            )
-            assert.strictEqual(
-                activationReloadState.getSamInitState()?.template,
-                'gettemplatepath',
-                'Unexpected Template Path value was retrieved'
-            )
-            assert.strictEqual(
-                activationReloadState.getSamInitState()?.runtime,
-                'getsomeruntime',
-                'Unexpected init runtime value was retrieved'
-            )
-            assert.strictEqual(
-                activationReloadState.getSamInitState()?.isImage,
-                true,
-                'Unexpected init image boolean value was retrieved'
-            )
-        })
-    })
-
-    it('clearLaunchPath', async function () {
-        activationReloadState.setSamInitState({
-            template: 'sometemplate',
-            readme: 'somepath',
-            runtime: 'someruntime',
-            isImage: true,
-            architecture: 'x86_64',
-        })
-        activationReloadState.clearSamInitState()
-
-        assert.strictEqual(
-            globals.context.globalState.get(activationLaunchPathKey),
-            undefined,
-            'Expected launch path to be cleared (undefined)'
-        )
-
-        assert.strictEqual(
-            globals.context.globalState.get(activationTemplatePathKey),
-            undefined,
-            'Expected template path to be cleared (undefined)'
-        )
-
-        assert.strictEqual(
-            globals.context.globalState.get(samInitRuntimeKey),
-            undefined,
-            'Expected runtime key to be cleared (undefined)'
-        )
-
-        assert.strictEqual(
-            globals.context.globalState.get(samInitImageBooleanKey),
-            undefined,
-            'Expected isImage key to be cleared (undefined)'
-        )
-    })
-})
diff --git a/src/test/shared/awsFiletypes.test.ts b/src/test/shared/awsFiletypes.test.ts
deleted file mode 100644
index 7c77771d45d..00000000000
--- a/src/test/shared/awsFiletypes.test.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as assert from 'assert'
-import * as path from 'path'
-import globals from '../../shared/extensionGlobals'
-import * as sysutil from '../../shared/systemUtilities'
-import * as testUtil from '../testUtil'
-import * as workspaceUtils from '../../shared/utilities/workspaceUtils'
-import { toArrayAsync } from '../../shared/utilities/collectionUtils'
-import { waitUntil } from '../../shared/utilities/timeoutUtils'
-
-describe('awsFiletypes', function () {
-    let awsConfigUri: vscode.Uri | undefined
-    let cfnUri: vscode.Uri | undefined
-
-    beforeEach(async function () {
-        testUtil.closeAllEditors()
-
-        // Create a dummy file in ~/.aws on the system.
-        // Note: We consider _any_ file in ~/.aws to be an "AWS config" file,
-        // so this will trigger "file_editAwsFile" telemetry.
-        const awsConfigFile = path.join(sysutil.SystemUtilities.getHomeDirectory(), '.aws/test_awstoolkit')
-        awsConfigUri = vscode.Uri.file(awsConfigFile)
-        testUtil.toFile('Test file from the aws-toolkit-vscode test suite.', awsConfigFile)
-
-        const cfnFile = workspaceUtils.tryGetAbsolutePath(
-            vscode.workspace.workspaceFolders?.[0],
-            'python3.7-plain-sam-app/template.yaml'
-        )
-        cfnUri = vscode.Uri.file(cfnFile)
-    })
-
-    after(async function () {
-        testUtil.closeAllEditors()
-    })
-
-    it('emit telemetry when opened by user', async function () {
-        await globals.templateRegistry.addItemToRegistry(cfnUri!)
-        await vscode.commands.executeCommand('vscode.open', cfnUri)
-        await vscode.commands.executeCommand('vscode.open', awsConfigUri)
-        await vscode.workspace.openTextDocument({
-            content: 'test content for SSM JSON',
-            language: 'ssm-json',
-        })
-
-        const r = await waitUntil(
-            async () => {
-                const metrics = await toArrayAsync(
-                    globals.telemetry.findIter(m => {
-                        return m.MetricName === 'file_editAwsFile'
-                    })
-                )
-                return metrics.length >= 3 ? metrics : undefined
-            },
-            { interval: 200, timeout: 5000 }
-        )
-
-        assert(r, 'did not emit expected telemetry')
-        assert(r.length === 3, 'emitted file_editAwsFile too many times')
-        const m1filetype = r[0].Metadata?.find(o => o.Key === 'awsFiletype')?.Value
-        const m2filetype = r[1].Metadata?.find(o => o.Key === 'awsFiletype')?.Value
-        const m3filetype = r[2].Metadata?.find(o => o.Key === 'awsFiletype')?.Value
-        assert.strictEqual(m1filetype, 'cloudformationSam')
-        assert.strictEqual(m2filetype, 'awsCredentials')
-        assert.strictEqual(m3filetype, 'ssmDocument')
-    })
-
-    it('emit telemetry exactly once per filetype in a given flush window', async function () {
-        await globals.templateRegistry.addItemToRegistry(cfnUri!)
-        await vscode.commands.executeCommand('vscode.open', cfnUri)
-        async function getMetrics() {
-            return await waitUntil(
-                async () => {
-                    const metrics = await toArrayAsync(
-                        globals.telemetry.findIter(m => {
-                            return m.MetricName === 'file_editAwsFile'
-                        })
-                    )
-                    return metrics.length > 0 ? metrics : undefined
-                },
-                { interval: 200, timeout: 5000 }
-            )
-        }
-        // Wait for metrics...
-        await getMetrics()
-        testUtil.closeAllEditors()
-        await vscode.commands.executeCommand('vscode.open', cfnUri)
-        await vscode.commands.executeCommand('vscode.open', cfnUri)
-
-        // Get metrics again (result should be the same)...
-        const r = await getMetrics()
-        assert.notStrictEqual(r, undefined, 'did not emit expected telemetry')
-        assert.strictEqual(r?.length, 1, 'emitted file_editAwsFile too many times')
-    })
-})
diff --git a/src/test/shared/clients/defaultIotClient.test.ts b/src/test/shared/clients/defaultIotClient.test.ts
deleted file mode 100644
index b87fc95d98f..00000000000
--- a/src/test/shared/clients/defaultIotClient.test.ts
+++ /dev/null
@@ -1,568 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { AWSError, Request, Iot } from 'aws-sdk'
-import { anything, deepEqual, instance, mock, verify, when } from '../../utilities/mockito'
-import { DefaultIotClient, ListThingCertificatesResponse } from '../../../shared/clients/iotClient'
-
-class FakeAwsError extends Error {
-    public region: string = 'us-west-2'
-
-    public constructor(message: string) {
-        super(message)
-    }
-}
-
-describe('DefaultIotClient', function () {
-    const region = 'us-west-2'
-    const thingName = 'thing'
-    const policyName = 'policy'
-    const policyDocument = '{ "key": "value" }'
-    const nextToken = 'nextToken'
-    const marker = nextToken
-    const maxResults = 10
-    const pageSize = maxResults
-    let mockIot: Iot
-
-    beforeEach(function () {
-        mockIot = mock()
-    })
-
-    const error: AWSError = new FakeAwsError('Expected failure') as AWSError
-
-    function success<T>(output?: T): Request<T, AWSError> {
-        return {
-            promise: () => Promise.resolve(output),
-        } as Request<any, AWSError>
-    }
-
-    function failure(): Request<any, AWSError> {
-        return {
-            promise: () => Promise.reject(error),
-        } as Request<any, AWSError>
-    }
-
-    function createClient({ regionCode = region }: { regionCode?: string } = {}): DefaultIotClient {
-        return new DefaultIotClient(regionCode, () => Promise.resolve(instance(mockIot)))
-    }
-
-    /* Functions that create or retrieve resources. */
-
-    describe('createThing', function () {
-        const expectedResponse: Iot.CreateThingResponse = { thingName: thingName, thingArn: 'arn' }
-        it('creates a thing', async function () {
-            when(
-                mockIot.createThing(
-                    deepEqual({
-                        thingName: thingName,
-                    })
-                )
-            ).thenReturn(success(expectedResponse))
-
-            const response = await createClient().createThing({ thingName })
-
-            assert.deepStrictEqual(response, expectedResponse)
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockIot.createThing(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().createThing({ thingName }), error)
-        })
-    })
-
-    describe('createCertificateAndKeys', function () {
-        const certificateId = 'cert1'
-        const input: Iot.CreateKeysAndCertificateRequest = { setAsActive: undefined }
-        const expectedResponse: Iot.CreateKeysAndCertificateResponse = {
-            certificateId,
-            certificateArn: 'arn',
-            certificatePem: 'pem',
-            keyPair: { PublicKey: 'publicKey', PrivateKey: 'privateKey' },
-        }
-
-        it('creates Certificate and Key Pair', async function () {
-            when(mockIot.createKeysAndCertificate(deepEqual(input))).thenReturn(success(expectedResponse))
-
-            const response = await createClient().createCertificateAndKeys(input)
-
-            assert.deepStrictEqual(response, expectedResponse)
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockIot.createKeysAndCertificate(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().createCertificateAndKeys(input), error)
-        })
-    })
-
-    describe('getEndpoint', function () {
-        const input: Iot.DescribeEndpointRequest = { endpointType: 'iot:Data-ATS' }
-        const endpointAddress = 'address'
-        const describeResponse: Iot.DescribeEndpointResponse = { endpointAddress }
-
-        it('gets endpoint', async function () {
-            when(mockIot.describeEndpoint(deepEqual(input))).thenReturn(success(describeResponse))
-
-            const response = await createClient().getEndpoint()
-
-            assert.deepStrictEqual(response, endpointAddress)
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockIot.describeEndpoint(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().getEndpoint(), error)
-        })
-    })
-
-    describe('getPolicyVersion', function () {
-        const input: Iot.GetPolicyVersionRequest = { policyName, policyVersionId: '1' }
-        const expectedResponse: Iot.GetPolicyVersionResponse = {
-            policyName,
-            policyDocument,
-            policyArn: 'arn1',
-            policyVersionId: '1',
-        }
-
-        it('gets policy document for version', async function () {
-            when(mockIot.getPolicyVersion(deepEqual(input))).thenReturn(success(expectedResponse))
-
-            const response = await createClient().getPolicyVersion(input)
-
-            assert.deepStrictEqual(response, expectedResponse)
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockIot.getPolicyVersion(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().getPolicyVersion(input), error)
-        })
-    })
-
-    /* Functions that return void .*/
-
-    describe('deleteThing', function () {
-        const input: Iot.DeleteThingRequest = { thingName }
-
-        it('deletes a thing', async function () {
-            when(
-                mockIot.deleteThing(
-                    deepEqual({
-                        thingName: thingName,
-                    })
-                )
-            ).thenReturn(success({} as Iot.DeleteThingResponse))
-
-            await createClient().deleteThing({ thingName })
-
-            verify(mockIot.deleteThing(deepEqual(input))).once()
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockIot.deleteThing(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().deleteThing({ thingName }), error)
-        })
-    })
-
-    describe('deleteCertificate', function () {
-        const certificateId = 'cert1'
-        const input: Iot.DeleteCertificateRequest = { certificateId, forceDelete: undefined }
-
-        it('deletes a certificate', async function () {
-            when(mockIot.deleteCertificate(deepEqual(input))).thenReturn(success())
-
-            await createClient().deleteCertificate(input)
-
-            verify(mockIot.deleteCertificate(deepEqual(input))).once()
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockIot.deleteCertificate(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().deleteCertificate(input), error)
-        })
-    })
-
-    describe('updateCertificate', function () {
-        const certificateId = 'cert1'
-        const input: Iot.UpdateCertificateRequest = { certificateId, newStatus: 'ACTIVE' }
-
-        it('updates a certificate', async function () {
-            when(mockIot.updateCertificate(deepEqual(input))).thenReturn(success())
-
-            await createClient().updateCertificate(input)
-
-            verify(mockIot.updateCertificate(deepEqual(input))).once()
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockIot.updateCertificate(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().updateCertificate(input), error)
-        })
-    })
-
-    describe('attachThingPrincipal', function () {
-        const input: Iot.AttachThingPrincipalRequest = { thingName, principal: 'arn1' }
-
-        it('attaches a certificate to a Thing', async function () {
-            when(mockIot.attachThingPrincipal(deepEqual(input))).thenReturn(success())
-
-            await createClient().attachThingPrincipal(input)
-
-            verify(mockIot.attachThingPrincipal(deepEqual(input))).once()
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockIot.attachThingPrincipal(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().attachThingPrincipal(input), error)
-        })
-    })
-
-    describe('detachThingPrincipal', function () {
-        const input: Iot.DetachThingPrincipalRequest = { thingName, principal: 'arn1' }
-
-        it('detaches a certificate from a Thing', async function () {
-            when(mockIot.detachThingPrincipal(deepEqual(input))).thenReturn(success())
-
-            await createClient().detachThingPrincipal(input)
-
-            verify(mockIot.detachThingPrincipal(deepEqual(input))).once()
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockIot.detachThingPrincipal(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().detachThingPrincipal(input), error)
-        })
-    })
-
-    describe('attachPolicy', function () {
-        const input: Iot.AttachPolicyRequest = { policyName, target: 'arn1' }
-
-        it('attaches a policy to a certificate', async function () {
-            when(mockIot.attachPolicy(deepEqual(input))).thenReturn(success())
-
-            await createClient().attachPolicy(input)
-
-            verify(mockIot.attachPolicy(deepEqual(input))).once()
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockIot.attachPolicy(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().attachPolicy(input), error)
-        })
-    })
-
-    describe('detachPolicy', function () {
-        const input: Iot.DetachPolicyRequest = { policyName, target: 'arn1' }
-
-        it('detaches a policy from a certificate', async function () {
-            when(mockIot.detachPolicy(deepEqual(input))).thenReturn(success())
-
-            await createClient().detachPolicy(input)
-
-            verify(mockIot.detachPolicy(deepEqual(input))).once()
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockIot.detachPolicy(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().detachPolicy(input), error)
-        })
-    })
-
-    describe('createPolicy', function () {
-        const input: Iot.CreatePolicyRequest = { policyName, policyDocument }
-        const expectedResponse: Iot.CreatePolicyResponse = { policyName, policyDocument, policyArn: 'arn1' }
-
-        it('creates a policy from a document', async function () {
-            when(mockIot.createPolicy(deepEqual(input))).thenReturn(success(expectedResponse))
-
-            await createClient().createPolicy(input)
-
-            verify(mockIot.createPolicy(deepEqual(input))).once()
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockIot.createPolicy(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().createPolicy(input), error)
-        })
-    })
-
-    describe('deletePolicy', function () {
-        const input: Iot.DeletePolicyRequest = { policyName }
-
-        it('deletes a policy', async function () {
-            when(mockIot.deletePolicy(deepEqual(input))).thenReturn(success())
-
-            await createClient().deletePolicy(input)
-
-            verify(mockIot.deletePolicy(deepEqual(input))).once()
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockIot.deletePolicy(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().deletePolicy(input), error)
-        })
-    })
-
-    describe('createPolicyVersion', function () {
-        const input: Iot.CreatePolicyVersionRequest = { policyName, policyDocument }
-        const expectedResponse: Iot.CreatePolicyVersionResponse = { policyDocument, policyArn: 'arn1' }
-
-        it('creates a policy version from a document', async function () {
-            when(mockIot.createPolicyVersion(deepEqual(input))).thenReturn(success(expectedResponse))
-
-            await createClient().createPolicyVersion(input)
-
-            verify(mockIot.createPolicyVersion(deepEqual(input))).once()
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockIot.createPolicyVersion(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().createPolicyVersion(input), error)
-        })
-    })
-
-    describe('deletePolicyVersion', function () {
-        const input: Iot.DeletePolicyVersionRequest = { policyName, policyVersionId: '1' }
-
-        it('deletes a policy version', async function () {
-            when(mockIot.deletePolicyVersion(deepEqual(input))).thenReturn(success())
-
-            await createClient().deletePolicyVersion(input)
-
-            verify(mockIot.deletePolicyVersion(deepEqual(input))).once()
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockIot.deletePolicyVersion(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().deletePolicyVersion(input), error)
-        })
-    })
-
-    describe('setDefaultPolicyVersion', function () {
-        const input: Iot.SetDefaultPolicyVersionRequest = { policyName, policyVersionId: '1' }
-
-        it('deletes a policy version', async function () {
-            when(mockIot.setDefaultPolicyVersion(deepEqual(input))).thenReturn(success())
-
-            await createClient().setDefaultPolicyVersion(input)
-
-            verify(mockIot.setDefaultPolicyVersion(deepEqual(input))).once()
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockIot.setDefaultPolicyVersion(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().setDefaultPolicyVersion(input), error)
-        })
-    })
-
-    /* Functions that list resources. */
-
-    describe('listThings', function () {
-        const input: Iot.ListThingsRequest = { maxResults, nextToken }
-        const expectedResponse: Iot.ListThingsResponse = { things: [{ thingName: 'thing1' }], nextToken }
-
-        it('lists things', async function () {
-            when(mockIot.listThings(deepEqual(input))).thenReturn(success(expectedResponse))
-
-            const response = await createClient().listThings(input)
-
-            assert.deepStrictEqual(response, expectedResponse)
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockIot.listThings(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().listThings(input), error)
-        })
-    })
-
-    describe('listCertificates', function () {
-        const input: Iot.ListCertificatesRequest = { pageSize, marker, ascendingOrder: undefined }
-        const expectedResponse: Iot.ListCertificatesResponse = {
-            certificates: [{ certificateId: 'cert1' }],
-            nextMarker: marker,
-        }
-
-        it('lists certificates', async function () {
-            when(mockIot.listCertificates(deepEqual(input))).thenReturn(success(expectedResponse))
-
-            const response = await createClient().listCertificates(input)
-
-            assert.deepStrictEqual(response, expectedResponse)
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockIot.listCertificates(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().listCertificates(input), error)
-        })
-    })
-
-    describe('listThingCertificates', function () {
-        const certificateId = 'cert1'
-        const certArn = 'arn:aws:iot:us-west-2:0123456789:cert/cert1'
-        const input: Iot.ListThingPrincipalsRequest = { thingName, maxResults, nextToken }
-        const principalsResponse: Iot.ListThingPrincipalsResponse = { principals: [certArn], nextToken }
-
-        const describeInput: Iot.DescribeCertificateRequest = { certificateId }
-        const describeResponse: Iot.DescribeCertificateResponse = {
-            certificateDescription: { certificateId, certificateArn: certArn },
-        }
-
-        const expectedResponse: ListThingCertificatesResponse = {
-            certificates: [{ certificateId, certificateArn: certArn }],
-            nextToken: nextToken,
-        }
-
-        it('lists certificates', async function () {
-            when(mockIot.listThingPrincipals(deepEqual(input))).thenReturn(success(principalsResponse))
-            when(mockIot.describeCertificate(deepEqual(describeInput))).thenReturn(success(describeResponse))
-
-            const response = await createClient().listThingCertificates(input)
-
-            assert.deepStrictEqual(response, expectedResponse)
-        })
-
-        it('throws an Error when certificate listing fails', async function () {
-            when(mockIot.listThingPrincipals(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().listThingCertificates(input), error)
-        })
-
-        it('throws an Error when certificate description fails', async function () {
-            when(mockIot.listThingPrincipals(deepEqual(input))).thenReturn(success(principalsResponse))
-            when(mockIot.describeCertificate(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().listThingCertificates(input), error)
-        })
-    })
-
-    describe('listThingsForCert', function () {
-        const input: Iot.ListPrincipalThingsRequest = { principal: 'arn1', maxResults, nextToken }
-        const listResponse: Iot.ListPrincipalThingsResponse = { things: [thingName], nextToken }
-        const expectedResponse = [thingName]
-
-        it('lists things', async function () {
-            when(mockIot.listPrincipalThings(deepEqual(input))).thenReturn(success(listResponse))
-
-            const response = await createClient().listThingsForCert(input)
-
-            assert.deepStrictEqual(response, expectedResponse)
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockIot.listPrincipalThings(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().listThingsForCert(input), error)
-        })
-    })
-
-    describe('listPolicies', function () {
-        const input: Iot.ListPoliciesRequest = { pageSize, marker, ascendingOrder: undefined }
-        const expectedResponse: Iot.ListPoliciesResponse = { policies: [{ policyName }], nextMarker: marker }
-
-        it('lists policies', async function () {
-            when(mockIot.listPolicies(deepEqual(input))).thenReturn(success(expectedResponse))
-
-            const response = await createClient().listPolicies(input)
-
-            assert.deepStrictEqual(response, expectedResponse)
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockIot.listPolicies(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().listPolicies(input), error)
-        })
-    })
-
-    describe('listPrincipalPolicies', function () {
-        const input: Iot.ListPrincipalPoliciesRequest = {
-            pageSize,
-            marker,
-            ascendingOrder: undefined,
-            principal: 'arn1',
-        }
-        const expectedResponse: Iot.ListPoliciesResponse = { policies: [{ policyName }], nextMarker: marker }
-
-        it('lists policies for certificate', async function () {
-            when(mockIot.listPrincipalPolicies(deepEqual(input))).thenReturn(success(expectedResponse))
-
-            const response = await createClient().listPrincipalPolicies(input)
-
-            assert.deepStrictEqual(response, expectedResponse)
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockIot.listPrincipalPolicies(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().listPrincipalPolicies(input), error)
-        })
-    })
-
-    describe('listPolicyTargets', function () {
-        const targets = ['arn1', 'arn2']
-        const input: Iot.ListTargetsForPolicyRequest = { policyName, pageSize, marker }
-        const listResponse: Iot.ListTargetsForPolicyResponse = { targets, nextMarker: marker }
-
-        it('lists certificates', async function () {
-            when(mockIot.listTargetsForPolicy(deepEqual(input))).thenReturn(success(listResponse))
-
-            const response = await createClient().listPolicyTargets(input)
-
-            assert.deepStrictEqual(response, targets)
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockIot.listTargetsForPolicy(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().listPolicyTargets(input), error)
-        })
-    })
-
-    describe('listPolicyVersions', function () {
-        const input: Iot.ListPolicyVersionsRequest = { policyName }
-        const expectedVersion1: Iot.PolicyVersion = { versionId: '1' }
-        const expectedVersion2: Iot.PolicyVersion = { versionId: '2' }
-        const listResponse: Iot.ListPolicyVersionsResponse = { policyVersions: [expectedVersion1, expectedVersion2] }
-
-        it('lists policy versions', async function () {
-            when(mockIot.listPolicyVersions(deepEqual(input))).thenReturn(success(listResponse))
-
-            const iterable = createClient().listPolicyVersions(input)
-            const responses = []
-            for await (const response of iterable) {
-                responses.push(response)
-            }
-
-            const [firstVersion, secondVersion, ...otherVersions] = responses
-
-            assert.deepStrictEqual(firstVersion, expectedVersion1)
-            assert.deepStrictEqual(secondVersion, expectedVersion2)
-            assert.deepStrictEqual(otherVersions, [])
-        })
-
-        it('throws an Error on iterate failure', async function () {
-            when(mockIot.listPolicyVersions(anything())).thenReturn(failure())
-
-            const iterable = createClient().listPolicyVersions(input)
-            await assert.rejects(iterable.next(), error)
-        })
-    })
-})
diff --git a/src/test/shared/clients/defaultS3Client.test.ts b/src/test/shared/clients/defaultS3Client.test.ts
deleted file mode 100644
index 8072aa0f692..00000000000
--- a/src/test/shared/clients/defaultS3Client.test.ts
+++ /dev/null
@@ -1,650 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { AWSError, Request, S3 } from 'aws-sdk'
-import { DeleteObjectsRequest, ListObjectVersionsOutput, ListObjectVersionsRequest } from 'aws-sdk/clients/s3'
-import { ManagedUpload } from 'aws-sdk/lib/s3/managed_upload'
-import { FileStreams } from '../../../shared/utilities/streamUtilities'
-import { anyFunction, anything, capture, deepEqual, instance, mock, verify, when } from '../../utilities/mockito'
-import * as vscode from 'vscode'
-import { DefaultBucket, DefaultFolder, DefaultS3Client, toFile } from '../../../shared/clients/s3Client'
-import { DEFAULT_DELIMITER, DEFAULT_MAX_KEYS } from '../../../shared/clients/s3Client'
-import { FakeFileStreams } from './fakeFileStreams'
-import globals from '../../../shared/extensionGlobals'
-
-class FakeProgressCaptor {
-    public progress = 0
-
-    public listener(): (loadedBytes: number) => void {
-        return loadedBytes => {
-            this.progress += loadedBytes
-        }
-    }
-}
-
-class FakeAwsError extends Error {
-    public region: string = 'us-west-2'
-
-    public constructor(message: string) {
-        super(message)
-    }
-}
-
-describe('DefaultS3Client', function () {
-    const partition = 'aws'
-    const region = 'us-west-2'
-    const bucketName = 'bucketName'
-    const outOfRegionBucketName = 'outOfRegionBucketName'
-    const folderPath = 'foo/bar/'
-    const folderVersionId = 'folderVersionId'
-    const subFolderPath = 'foo/bar/subFolder/'
-    const emptySubFolderPath = 'foo/bar//'
-    const fileKey = 'foo/bar/file.jpg'
-    const fileVersionId = 'fileVersionId'
-    const fileSizeBytes = 5
-    const fileLastModified = new Date(2020, 5, 4)
-    const fileData = 'fileData'
-    const fileLocation = vscode.Uri.file('/file.jpg')
-    const continuationToken = 'continuationToken'
-    const nextContinuationToken = 'nextContinuationToken'
-    const maxResults = 20
-    const nextKeyMarker = 'nextKeyMarker'
-    const nextVersionIdMarker = 'nextVersionIdMarker'
-    const error: AWSError = new FakeAwsError('Expected failure') as AWSError
-    const bucket = new DefaultBucket({ partitionId: partition, name: bucketName, region })
-
-    let mockS3: S3
-
-    class ListObjectVersionsFixtures {
-        public readonly firstPageRequest: ListObjectVersionsRequest = {
-            Bucket: bucketName,
-            MaxKeys: DEFAULT_MAX_KEYS,
-            KeyMarker: undefined,
-            VersionIdMarker: undefined,
-        }
-
-        public readonly firstPageResponse: ListObjectVersionsOutput = {
-            Versions: [
-                { Key: folderPath, VersionId: folderVersionId },
-                { Key: fileKey, VersionId: fileVersionId },
-            ],
-            IsTruncated: true,
-            NextKeyMarker: nextKeyMarker,
-            NextVersionIdMarker: nextVersionIdMarker,
-        }
-
-        public readonly secondPageRequest: ListObjectVersionsRequest = {
-            Bucket: bucketName,
-            MaxKeys: DEFAULT_MAX_KEYS,
-            KeyMarker: nextKeyMarker,
-            VersionIdMarker: nextVersionIdMarker,
-        }
-
-        public readonly secondPageResponse: ListObjectVersionsOutput = {
-            Versions: [{ Key: fileKey, VersionId: undefined }],
-            IsTruncated: false,
-        }
-    }
-
-    class DeleteObjectsFixtures {
-        public readonly firstRequest: DeleteObjectsRequest = {
-            Bucket: bucketName,
-            Delete: {
-                Objects: [
-                    { Key: folderPath, VersionId: folderVersionId },
-                    { Key: fileKey, VersionId: fileVersionId },
-                ],
-                Quiet: true,
-            },
-        }
-
-        public readonly secondRequest: DeleteObjectsRequest = {
-            Bucket: bucketName,
-            Delete: {
-                Objects: [{ Key: fileKey, VersionId: undefined }],
-                Quiet: true,
-            },
-        }
-    }
-
-    beforeEach(function () {
-        mockS3 = mock()
-    })
-
-    function success<T>(output?: T): Request<T, AWSError> {
-        return {
-            promise: () => Promise.resolve(output),
-            createReadStream() {
-                return FakeFileStreams.readStreamFrom(fileData)
-            },
-        } as Request<any, AWSError>
-    }
-
-    function failure(): Request<any, AWSError> {
-        return {
-            promise: () => Promise.reject(error),
-            createReadStream() {
-                const readStream = FakeFileStreams.readStreamFrom(fileData)
-                readStream.destroy(error)
-                return readStream
-            },
-        } as Request<any, AWSError>
-    }
-
-    function createClient({
-        regionCode = region,
-        partitionId = partition,
-        fileStreams = new FakeFileStreams(),
-    }: { regionCode?: string; partitionId?: string; fileStreams?: FileStreams } = {}): DefaultS3Client {
-        return new DefaultS3Client(regionCode, partitionId, () => Promise.resolve(instance(mockS3)), fileStreams)
-    }
-
-    describe('createBucket', function () {
-        it('creates a bucket', async function () {
-            when(
-                mockS3.createBucket(
-                    deepEqual({
-                        Bucket: bucketName,
-                        CreateBucketConfiguration: { LocationConstraint: region },
-                    })
-                )
-            ).thenReturn(success())
-
-            const response = await createClient().createBucket({ bucketName })
-
-            assert.deepStrictEqual(response, {
-                bucket: new DefaultBucket({ partitionId: partition, region, name: bucketName }),
-            })
-        })
-
-        it('removes the region code for us-east-1', async function () {
-            when(
-                mockS3.createBucket(
-                    deepEqual({
-                        Bucket: bucketName,
-                        CreateBucketConfiguration: undefined,
-                    })
-                )
-            ).thenReturn(success())
-
-            const response = await createClient({ regionCode: 'us-east-1' }).createBucket({ bucketName })
-
-            assert.deepStrictEqual(response, {
-                bucket: new DefaultBucket({ partitionId: partition, region: 'us-east-1', name: bucketName }),
-            })
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockS3.createBucket(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().createBucket({ bucketName }), error)
-        })
-    })
-
-    describe('deleteBucket', function () {
-        const {
-            firstPageRequest: firstList,
-            secondPageRequest: secondList,
-            firstPageResponse: firstListResponse,
-            secondPageResponse: secondListResponse,
-        } = new ListObjectVersionsFixtures()
-        const anyListResponse = secondListResponse
-        const { firstRequest: firstDelete, secondRequest: secondDelete } = new DeleteObjectsFixtures()
-
-        it('empties a bucket and deletes it', async function () {
-            when(mockS3.listObjectVersions(deepEqual(firstList))).thenReturn(success(firstListResponse))
-            when(mockS3.deleteObjects(deepEqual(firstDelete))).thenReturn(success({}))
-
-            when(mockS3.listObjectVersions(deepEqual(secondList))).thenReturn(success(secondListResponse))
-            when(mockS3.deleteObjects(deepEqual(secondDelete))).thenReturn(success({}))
-
-            when(mockS3.deleteBucket(deepEqual({ Bucket: bucketName }))).thenReturn(success({}))
-
-            await createClient().deleteBucket({ bucketName })
-
-            verify(mockS3.listObjectVersions(anything())).twice()
-            verify(mockS3.deleteObjects(anything())).twice()
-            verify(mockS3.deleteBucket(anything())).once()
-        })
-
-        it('throws an Error on listObjectVersions failure', async function () {
-            when(mockS3.listObjectVersions(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().deleteBucket({ bucketName }), error)
-
-            verify(mockS3.deleteObjects(anything())).never()
-            verify(mockS3.deleteBucket(anything())).never()
-        })
-
-        it('throws an Error on deleteObjects failure', async function () {
-            when(mockS3.listObjectVersions(anything())).thenReturn(success(anyListResponse))
-            when(mockS3.deleteObjects(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().deleteBucket({ bucketName }), error)
-
-            verify(mockS3.deleteBucket(anything())).never()
-        })
-
-        it('throws an Error on deleteBucket failure', async function () {
-            when(mockS3.listObjectVersions(anything())).thenReturn(success(anyListResponse))
-            when(mockS3.deleteObjects(anything())).thenReturn(success({}))
-            when(mockS3.deleteBucket(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().deleteBucket({ bucketName }), error)
-        })
-    })
-
-    describe('createFolder', function () {
-        it('creates a folder', async function () {
-            when(mockS3.upload(deepEqual({ Bucket: bucketName, Key: folderPath, Body: '' }))).thenReturn(success())
-
-            const response = await createClient().createFolder({ bucketName, path: folderPath })
-
-            assert.deepStrictEqual(response, {
-                folder: new DefaultFolder({ partitionId: partition, bucketName, path: folderPath }),
-            })
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockS3.upload(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().createFolder({ bucketName, path: folderPath }), error)
-        })
-    })
-
-    describe('downloadFile', function () {
-        it('downloads a file', async function () {
-            when(mockS3.getObject(deepEqual({ Bucket: bucketName, Key: fileKey }))).thenReturn(success())
-
-            const fileStreams = new FakeFileStreams({ readData: fileData })
-            const progressCaptor = new FakeProgressCaptor()
-
-            await createClient({ fileStreams }).downloadFile({
-                bucketName,
-                key: fileKey,
-                saveLocation: fileLocation,
-                progressListener: progressCaptor.listener(),
-            })
-
-            assert.deepStrictEqual(fileStreams.writtenLocation, fileLocation)
-            assert.strictEqual(fileStreams.writtenData, fileData)
-            assert.ok(progressCaptor.progress > 0)
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockS3.getObject(anything())).thenReturn(failure())
-
-            await assert.rejects(
-                createClient().downloadFile({
-                    bucketName,
-                    key: fileKey,
-                    saveLocation: fileLocation,
-                }),
-                error
-            )
-        })
-    })
-
-    describe('uploadFile', function () {
-        it('uploads a file', async function () {
-            const mockManagedUpload: ManagedUpload = mock()
-            when(mockManagedUpload.promise()).thenReturn(
-                Promise.resolve({ Location: '', ETag: '', Bucket: '', Key: '' })
-            )
-            when(mockManagedUpload.on('httpUploadProgress', anyFunction())).thenReturn(undefined)
-            when(mockS3.upload(anything())).thenReturn(instance(mockManagedUpload))
-
-            const fileStreams = new FakeFileStreams({ readData: fileData, readAutomatically: true })
-            const progressCaptor = new FakeProgressCaptor()
-
-            await createClient({ fileStreams }).uploadFile({
-                bucketName,
-                key: fileKey,
-                content: fileLocation,
-                progressListener: progressCaptor.listener(),
-                contentType: 'image/jpeg',
-            })
-
-            verify(mockS3.upload(anything())).once()
-            // eslint-disable-next-line @typescript-eslint/unbound-method
-            const [{ Bucket, Key, Body, ContentType }] = capture(mockS3.upload).last()
-            assert.strictEqual(Bucket, bucketName)
-            assert.strictEqual(Key, fileKey)
-            assert.strictEqual(ContentType, 'image/jpeg')
-            assert.strictEqual(Body, fileStreams.readStream)
-
-            // eslint-disable-next-line @typescript-eslint/unbound-method
-            const [, listener] = capture(mockManagedUpload.on).last()
-            listener({ loaded: 1, total: 100 })
-            listener({ loaded: 2, total: 100 })
-            assert.strictEqual(progressCaptor.progress, 2)
-        })
-
-        it('throws an Error on failure', async function () {
-            // TODO: rejected promise here since the impl. does not await the upload anymore
-            const managedMocked: S3.ManagedUpload = mock()
-            const expectedError = new Error('Expected an error')
-            when(mockS3.upload(anything())).thenReturn(instance(managedMocked))
-            when(managedMocked.promise()).thenReject(expectedError)
-
-            const managedUpload = await createClient().uploadFile({
-                bucketName,
-                key: fileKey,
-                content: fileLocation,
-            })
-            try {
-                await managedUpload.promise()
-            } catch (e) {
-                assert.strictEqual(e, expectedError)
-            }
-        })
-    })
-
-    describe('listBuckets', function () {
-        it('lists a bucket', async function () {
-            when(mockS3.listBuckets()).thenReturn(
-                success({ Buckets: [{ Name: bucketName }, { Name: outOfRegionBucketName }] })
-            )
-            when(mockS3.getBucketLocation(deepEqual({ Bucket: bucketName }))).thenReturn(
-                success({ LocationConstraint: region })
-            )
-            when(mockS3.getBucketLocation(deepEqual({ Bucket: outOfRegionBucketName }))).thenReturn(
-                success({ LocationConstraint: 'outOfRegion' })
-            )
-
-            const response = await createClient().listBuckets()
-            assert.deepStrictEqual(response, {
-                buckets: [
-                    new DefaultBucket({
-                        partitionId: partition,
-                        region,
-                        name: bucketName,
-                    }),
-                ],
-            })
-        })
-
-        it('Filters buckets with no name', async function () {
-            when(mockS3.listBuckets()).thenReturn(
-                success({ Buckets: [{ Name: undefined }, { Name: outOfRegionBucketName }] })
-            )
-            when(mockS3.getBucketLocation(deepEqual({ Bucket: bucketName }))).thenReturn(
-                success({ LocationConstraint: region })
-            )
-
-            const response = await createClient().listBuckets()
-            assert.deepStrictEqual(response, {
-                buckets: [],
-            })
-        })
-
-        it(`Filters buckets when it can't get region`, async () => {
-            const mockResponse: Request<any, AWSError> = mock()
-            when(mockS3.listBuckets()).thenReturn(success({ Buckets: [{ Name: bucketName }] }))
-            // eslint-disable-next-line @typescript-eslint/unbound-method
-            when(mockResponse.promise).thenReject(undefined as any as Error)
-            when(mockS3.getBucketLocation(anything())).thenReturn(mockResponse)
-
-            const response = await createClient().listBuckets()
-            assert.deepStrictEqual(response, {
-                buckets: [],
-            })
-        })
-
-        it('throws an Error on listBuckets failure', async function () {
-            when(mockS3.listBuckets()).thenReturn(failure())
-
-            await assert.rejects(createClient().listBuckets(), error)
-
-            verify(mockS3.getBucketLocation(anything())).never()
-        })
-
-        it('returns region from exception on getBucketLocation failure', async function () {
-            when(mockS3.listBuckets()).thenReturn(success({ Buckets: [{ Name: bucketName }] }))
-            when(mockS3.getBucketLocation(anything())).thenReturn(failure())
-
-            const response = await createClient().listBuckets()
-            assert.deepStrictEqual(response, {
-                buckets: [
-                    new DefaultBucket({
-                        partitionId: partition,
-                        region,
-                        name: bucketName,
-                    }),
-                ],
-            })
-        })
-
-        it('maps empty string getBucketLocation response to us-east-1', async function () {
-            when(mockS3.listBuckets()).thenReturn(
-                success({ Buckets: [{ Name: bucketName }, { Name: outOfRegionBucketName }] })
-            )
-            when(mockS3.getBucketLocation(deepEqual({ Bucket: bucketName }))).thenReturn(
-                success({ LocationConstraint: '' })
-            )
-
-            const response = await createClient({ regionCode: 'us-east-1' }).listBuckets()
-            assert.deepStrictEqual(response, {
-                buckets: [
-                    new DefaultBucket({
-                        partitionId: partition,
-                        region: 'us-east-1',
-                        name: bucketName,
-                    }),
-                ],
-            })
-        })
-    })
-
-    describe('listFiles', function () {
-        it('lists files and folders', async function () {
-            const folder = { Key: folderPath, Size: fileSizeBytes, LastModified: fileLastModified }
-            const file = { Key: fileKey, Size: fileSizeBytes, LastModified: fileLastModified }
-            when(
-                mockS3.listObjectsV2(
-                    deepEqual({
-                        Bucket: bucketName,
-                        Delimiter: DEFAULT_DELIMITER,
-                        MaxKeys: maxResults,
-                        Prefix: folderPath,
-                        ContinuationToken: continuationToken,
-                    })
-                )
-            ).thenReturn(
-                success({
-                    Contents: [folder, file],
-                    CommonPrefixes: [{ Prefix: subFolderPath }, { Prefix: emptySubFolderPath }],
-                    NextContinuationToken: nextContinuationToken,
-                })
-            )
-
-            const response = await createClient().listFiles({ bucketName, folderPath, continuationToken, maxResults })
-            assert.deepStrictEqual(response, {
-                files: [toFile(bucket, file)],
-                folders: [
-                    new DefaultFolder({ partitionId: partition, bucketName, path: subFolderPath }),
-                    new DefaultFolder({ partitionId: partition, bucketName, path: emptySubFolderPath }),
-                ],
-                continuationToken: nextContinuationToken,
-            })
-        })
-
-        it('throws an Error on listFiles failure', async function () {
-            when(mockS3.listObjectsV2(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().listFiles({ bucketName, folderPath, continuationToken }), error)
-        })
-    })
-
-    describe('listObjectVersions', function () {
-        const { firstPageRequest, secondPageRequest, firstPageResponse, secondPageResponse } =
-            new ListObjectVersionsFixtures()
-
-        it('lists objects and their versions with a continuation token for the next page of results', async function () {
-            when(mockS3.listObjectVersions(deepEqual(firstPageRequest))).thenReturn(success(firstPageResponse))
-
-            const response = await createClient().listObjectVersions({ bucketName })
-
-            assert.deepStrictEqual(response, {
-                objects: [
-                    { key: folderPath, versionId: folderVersionId },
-                    { key: fileKey, versionId: fileVersionId },
-                ],
-                continuationToken: { keyMarker: nextKeyMarker, versionIdMarker: nextVersionIdMarker },
-            })
-        })
-
-        it('throws an Error on listObjectVersions failure', async function () {
-            when(mockS3.listObjectVersions(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().listObjectVersions({ bucketName }), error)
-        })
-
-        it('returns pages from listObjectVersionsIterable', async function () {
-            when(mockS3.listObjectVersions(deepEqual(firstPageRequest))).thenReturn(success(firstPageResponse))
-            when(mockS3.listObjectVersions(deepEqual(secondPageRequest))).thenReturn(success(secondPageResponse))
-
-            const iterable = createClient().listObjectVersionsIterable({ bucketName })
-
-            const responses = []
-            for await (const response of iterable) {
-                responses.push(response)
-            }
-            const [firstPage, secondPage, ...otherPages] = responses
-
-            assert.deepStrictEqual(firstPage.objects, [
-                { key: folderPath, versionId: folderVersionId },
-                { key: fileKey, versionId: fileVersionId },
-            ])
-            assert.deepStrictEqual(secondPage.objects, [{ key: fileKey, versionId: undefined }])
-            assert.deepStrictEqual(otherPages, [])
-        })
-
-        it('throws an Error on listObjectVersionsIterable iterate failure', async function () {
-            when(mockS3.listObjectVersions(anything())).thenReturn(failure())
-
-            const iterable = createClient().listObjectVersionsIterable({ bucketName })
-            await assert.rejects(iterable.next(), error)
-        })
-    })
-
-    describe('deleteObject', function () {
-        it('deletes an object', async function () {
-            when(mockS3.deleteObject(deepEqual({ Bucket: bucketName, Key: fileKey }))).thenReturn(success({}))
-
-            await createClient().deleteObject({ bucketName, key: fileKey })
-
-            verify(mockS3.deleteObject(anything())).once()
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockS3.deleteObject(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().deleteObject({ bucketName, key: fileKey }), error)
-        })
-    })
-
-    describe('deleteObjects', function () {
-        it('deletes objects', async function () {
-            when(
-                mockS3.deleteObjects(
-                    deepEqual({
-                        Bucket: bucketName,
-                        Delete: {
-                            Objects: [
-                                {
-                                    Key: folderPath,
-                                    VersionId: folderVersionId,
-                                },
-                                {
-                                    Key: fileKey,
-                                    VersionId: undefined,
-                                },
-                            ],
-                            Quiet: true,
-                        },
-                    })
-                )
-            ).thenReturn(success({}))
-
-            const response = await createClient().deleteObjects({
-                bucketName,
-                objects: [{ key: folderPath, versionId: folderVersionId }, { key: fileKey }],
-            })
-
-            verify(mockS3.deleteObjects(anything())).once()
-
-            assert.deepStrictEqual(response, { errors: [] })
-        })
-
-        it('returns a list of errors on partial failure', async function () {
-            const error: S3.Error = {
-                Key: folderPath,
-                VersionId: folderVersionId,
-                Code: '404',
-                Message: 'Expected failure',
-            }
-
-            when(mockS3.deleteObjects(anything())).thenReturn(success({ Errors: [error] }))
-
-            const response = await createClient().deleteObjects({
-                bucketName,
-                objects: [{ key: folderPath, versionId: folderVersionId }, { key: fileKey }],
-            })
-
-            verify(mockS3.deleteObjects(anything())).once()
-            assert.deepStrictEqual(response, { errors: [error] })
-        })
-
-        it('throws an Error on failure', async function () {
-            when(mockS3.deleteObjects(anything())).thenReturn(failure())
-
-            await assert.rejects(createClient().deleteObjects({ bucketName, objects: [{ key: fileKey }] }), error)
-        })
-    })
-})
-
-describe('DefaultBucket', function () {
-    it('properly constructs an instance', function () {
-        const bucket = new DefaultBucket({ partitionId: 'partitionId', region: 'region', name: 'name' })
-        assert.strictEqual(bucket.name, 'name')
-        assert.strictEqual(bucket.region, 'region')
-        assert.strictEqual(bucket.arn, 'arn:partitionId:s3:::name')
-    })
-})
-
-describe('DefaultFolder', function () {
-    it('properly constructs an instance', function () {
-        const folder = new DefaultFolder({
-            partitionId: 'partitionId',
-            bucketName: 'bucketName',
-            path: 'path/to/folder/',
-        })
-        assert.strictEqual(folder.name, 'folder')
-        assert.strictEqual(folder.path, 'path/to/folder/')
-        assert.strictEqual(folder.arn, 'arn:partitionId:s3:::bucketName/path/to/folder/')
-    })
-})
-
-describe('toFile', function () {
-    it('properly constructs an instance', function () {
-        const bucket = new DefaultBucket({
-            name: 'bucketName',
-            region: 'us-west-2',
-            partitionId: 'partitionId',
-        })
-        const file = toFile(bucket, {
-            Size: 1337,
-            Key: 'key/for/file.jpg',
-            LastModified: new globals.clock.Date(2020, 5, 4),
-        })
-        assert.strictEqual(file.name, 'file.jpg')
-        assert.strictEqual(file.key, 'key/for/file.jpg')
-        assert.strictEqual(file.arn, 'arn:partitionId:s3:::bucketName/key/for/file.jpg')
-        assert.strictEqual(file.lastModified?.toString(), new globals.clock.Date(2020, 5, 4).toString())
-        assert.strictEqual(file.sizeBytes, 1337)
-    })
-})
diff --git a/src/test/shared/clients/iamClient.test.ts b/src/test/shared/clients/iamClient.test.ts
deleted file mode 100644
index b55ee154833..00000000000
--- a/src/test/shared/clients/iamClient.test.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { IAM } from 'aws-sdk'
-import * as assert from 'assert'
-import * as sinon from 'sinon'
-import { DefaultIamClient, IamClient } from '../../../shared/clients/iamClient'
-
-describe('iamClient', function () {
-    describe('getDeniedActions', async function () {
-        const iamClient: IamClient = new DefaultIamClient('us-west-2')
-        const request: IAM.SimulatePrincipalPolicyRequest = {
-            PolicySourceArn: 'taskRoleArn1234',
-            ActionNames: ['example:permission'],
-        }
-        const correctPermissionsResponse = {
-            EvaluationResults: [{ EvalActionName: 'example:permission', EvalDecision: 'allowed' }],
-        }
-        const incorrectPermissionsResponse = {
-            EvaluationResults: [{ EvalActionName: 'example:permission', EvalDecision: 'denied' }],
-        }
-        const organizationsDenyPermissionsResponse = {
-            EvaluationResults: [{
-                EvalActionName: 'example:permission',
-                EvalDecision: 'implicitDeny',
-                OrganizationsDecisionDetail: { "AllowedByOrganizations": false },
-            }],
-        }
-
-        afterEach(function () {
-            sinon.restore()
-        })
-
-        it('returns incorrect task permissions', async function () {
-            sinon.stub(iamClient, 'simulatePrincipalPolicy').resolves(incorrectPermissionsResponse)
-            assert.deepStrictEqual(
-                await iamClient.getDeniedActions(request),
-                incorrectPermissionsResponse.EvaluationResults
-            )
-        })
-
-        it('does not return correct task permissions', async function () {
-            sinon.stub(iamClient, 'simulatePrincipalPolicy').resolves(correctPermissionsResponse)
-            assert.deepStrictEqual(await iamClient.getDeniedActions(request), [])
-        })
-
-        it('does not return possibly false organizational implicitDeny', async function () {
-            sinon.stub(iamClient, 'simulatePrincipalPolicy').resolves(organizationsDenyPermissionsResponse)
-            assert.deepStrictEqual(await iamClient.getDeniedActions(request), [])
-        })
-    })
-})
diff --git a/src/test/shared/cloudformation/templateSymbolResolver.test.ts b/src/test/shared/cloudformation/templateSymbolResolver.test.ts
deleted file mode 100644
index 80769597758..00000000000
--- a/src/test/shared/cloudformation/templateSymbolResolver.test.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { instance, mock, when, anything } from 'ts-mockito'
-import * as vscode from 'vscode'
-import {
-    TemplateFunctionResource,
-    TemplateSymbolProvider,
-    TemplateSymbolResolver,
-} from '../../../shared/cloudformation/templateSymbolResolver'
-
-const range = new vscode.Range(0, 0, 0, 0)
-
-const firstFunctionType = string('Type')
-const firstFunction = module('Function1', [firstFunctionType])
-
-const secondFunctionType = string('Type')
-const secondFunction = module('Function2', [secondFunctionType])
-
-const looksLikeFunctionType = string('Type')
-const looksLikeFunction = module('LooksLikeFunction', [looksLikeFunctionType])
-
-const symbols: vscode.DocumentSymbol[] = [
-    module('Globals'),
-    module('Resources', [
-        firstFunction,
-        module('NumberType', [number('Type')]),
-        secondFunction,
-        module('MissingType', [string('Missing')]),
-        module('AnotherResource'),
-        looksLikeFunction,
-    ]),
-]
-
-function module(name: string, children: vscode.DocumentSymbol[] = []) {
-    return symbol(name, vscode.SymbolKind.Module, children)
-}
-
-function string(name: string, children: vscode.DocumentSymbol[] = []) {
-    return symbol(name, vscode.SymbolKind.String, children)
-}
-
-function number(name: string, children: vscode.DocumentSymbol[] = []) {
-    return symbol(name, vscode.SymbolKind.Number, children)
-}
-
-function symbol(name: string, kind: vscode.SymbolKind, children: vscode.DocumentSymbol[] = []) {
-    const newSymbol = new vscode.DocumentSymbol(name, 'detail', kind, range, range)
-    newSymbol.children = children
-
-    return newSymbol
-}
-
-describe('TemplateSymbolResolver', function () {
-    let mockDocument: vscode.TextDocument
-    let document: vscode.TextDocument
-
-    let mockSymbolProvider: TemplateSymbolProvider
-    let symbolProvider: TemplateSymbolProvider
-
-    beforeEach(function () {
-        mockDocument = mock()
-        document = instance(mockDocument)
-
-        mockSymbolProvider = mock()
-        symbolProvider = instance(mockSymbolProvider)
-
-        when(mockSymbolProvider.getSymbols(document, anything())).thenResolve(symbols)
-        when(mockSymbolProvider.getText(firstFunctionType, document)).thenReturn('"Type": "AWS::Serverless::Function"')
-        when(mockSymbolProvider.getText(secondFunctionType, document)).thenReturn('Type: AWS::Serverless::Function')
-        when(mockSymbolProvider.getText(looksLikeFunctionType, document)).thenReturn('Type: NotActuallyAFunction')
-    })
-
-    it('gets function resources', async function () {
-        const symbolResolver = new TemplateSymbolResolver(document, symbolProvider)
-        const functionResources = await symbolResolver.getResourcesOfKind('function', false)
-
-        const expectedResources: TemplateFunctionResource[] = [
-            {
-                name: firstFunction.name,
-                range: firstFunction.range,
-                kind: 'function',
-            },
-            {
-                name: secondFunction.name,
-                range: secondFunction.range,
-                kind: 'function',
-            },
-        ]
-
-        assert.deepStrictEqual(functionResources, expectedResources)
-    })
-})
diff --git a/src/test/shared/credentials/loginManager.test.ts b/src/test/shared/credentials/loginManager.test.ts
deleted file mode 100644
index bc4208bc1f8..00000000000
--- a/src/test/shared/credentials/loginManager.test.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as AWS from '@aws-sdk/types'
-import * as assert from 'assert'
-import * as sinon from 'sinon'
-import { LoginManager } from '../../../credentials/loginManager'
-import { CredentialsProvider, CredentialsId } from '../../../credentials/providers/credentials'
-import { CredentialsProviderManager } from '../../../credentials/providers/credentialsProviderManager'
-import { AwsContext } from '../../../shared/awsContext'
-import { CredentialsStore } from '../../../credentials/credentialsStore'
-import { assertTelemetryCurried } from '../../testUtil'
-import { DefaultStsClient } from '../../../shared/clients/stsClient'
-
-describe('LoginManager', async function () {
-    let sandbox: sinon.SinonSandbox
-
-    const awsContext = {
-        setCredentials: () => {
-            throw new Error('This test was not initialized')
-        },
-        getExplorerRegions: () => [],
-    } as any as AwsContext
-    const sampleCredentials = {} as any as AWS.Credentials
-    const sampleCredentialsId: CredentialsId = {
-        credentialSource: 'profile',
-        credentialTypeId: 'someId',
-    }
-    const credentialType = 'staticProfile'
-    const credentialSourceId = 'sharedCredentials'
-
-    const credentialsStore = new CredentialsStore()
-
-    let loginManager: LoginManager
-    let credentialsProvider: CredentialsProvider
-    let getAccountIdStub: sinon.SinonStub<[], Promise<{ Account?: string } | undefined>>
-    let getCredentialsProviderStub: sinon.SinonStub<[CredentialsId], Promise<CredentialsProvider | undefined>>
-
-    beforeEach(async function () {
-        sandbox = sinon.createSandbox()
-
-        loginManager = new LoginManager(awsContext, credentialsStore)
-        credentialsProvider = {
-            getCredentials: sandbox.stub().resolves(sampleCredentials),
-            getProviderType: sandbox.stub().returns('profile'),
-            getTelemetryType: sandbox.stub().returns('staticProfile'),
-            getCredentialsId: sandbox.stub().returns(sampleCredentialsId),
-            getDefaultRegion: sandbox.stub().returns('someRegion'),
-            getHashCode: sandbox.stub().returns('1234'),
-            canAutoConnect: sandbox.stub().returns(true),
-            isAvailable: sandbox.stub().returns(Promise.resolve(true)),
-        }
-
-        getAccountIdStub = sandbox.stub(DefaultStsClient.prototype, 'getCallerIdentity').resolves({
-            Account: 'AccountId1234',
-        })
-
-        getCredentialsProviderStub = sandbox.stub(CredentialsProviderManager.getInstance(), 'getCredentialsProvider')
-        getCredentialsProviderStub.resolves(credentialsProvider)
-    })
-
-    afterEach(async function () {
-        sandbox.restore()
-    })
-
-    const assertTelemetry = assertTelemetryCurried('aws_validateCredentials')
-
-    it('passive login sends telemetry with passive=true', async function () {
-        const passive = true
-        const setCredentialsStub = sandbox.stub(awsContext, 'setCredentials')
-        await loginManager.login({ passive, providerId: sampleCredentialsId })
-
-        assert.strictEqual(setCredentialsStub.callCount, 1)
-        assertTelemetry({ result: 'Succeeded', passive, credentialType, credentialSourceId })
-    })
-
-    it('non-passive login sends telemetry', async function () {
-        const passive = false
-        const setCredentialsStub = sandbox.stub(awsContext, 'setCredentials')
-        await loginManager.login({ passive, providerId: sampleCredentialsId })
-
-        assert.strictEqual(setCredentialsStub.callCount, 1)
-        assertTelemetry({ result: 'Succeeded', passive, credentialType, credentialSourceId })
-    })
-
-    it('logs in with credentials (happy path)', async function () {
-        const passive = false
-        const setCredentialsStub = sandbox.stub(awsContext, 'setCredentials')
-
-        await loginManager.login({ passive, providerId: sampleCredentialsId })
-        assert.strictEqual(setCredentialsStub.callCount, 1, 'Expected awsContext setCredentials to be called once')
-        assertTelemetry({ result: 'Succeeded', passive, credentialType, credentialSourceId })
-    })
-
-    it('logs out (happy path)', async function () {
-        const passive = false
-        const setCredentialsStub = sandbox.stub(awsContext, 'setCredentials')
-
-        await loginManager.login({ passive, providerId: sampleCredentialsId })
-        await loginManager.logout()
-        assert.strictEqual(setCredentialsStub.callCount, 2, 'Expected awsContext setCredentials to be called twice')
-        assertTelemetry({ result: 'Succeeded', passive, credentialType, credentialSourceId })
-    })
-
-    it('logs out if credentials could not be retrieved', async function () {
-        const passive = true
-        getCredentialsProviderStub.reset()
-        getCredentialsProviderStub.resolves(undefined)
-        const setCredentialsStub = sandbox.stub(awsContext, 'setCredentials').callsFake(async credentials => {
-            // Verify that logout is called
-            assert.strictEqual(credentials, undefined)
-        })
-
-        await loginManager.login({ passive, providerId: sampleCredentialsId })
-        assert.strictEqual(setCredentialsStub.callCount, 1, 'Expected awsContext setCredentials to be called once')
-        assertTelemetry({ result: 'Failed', passive })
-    })
-
-    it('logs out if an account Id could not be determined', async function () {
-        const passive = false
-        getAccountIdStub.reset()
-        getAccountIdStub.resolves(undefined)
-        const setCredentialsStub = sandbox.stub(awsContext, 'setCredentials').callsFake(async credentials => {
-            // Verify that logout is called
-            assert.strictEqual(credentials, undefined)
-        })
-
-        await loginManager.login({ passive, providerId: sampleCredentialsId })
-        assert.strictEqual(setCredentialsStub.callCount, 1, 'Expected awsContext setCredentials to be called once')
-        assertTelemetry({ result: 'Failed', passive, credentialType, credentialSourceId })
-    })
-
-    it('logs out if getting an account Id throws an Error', async function () {
-        const passive = false
-        getAccountIdStub.reset()
-        getAccountIdStub.throws('Simulating getAccountId throwing an Error')
-        const setCredentialsStub = sandbox.stub(awsContext, 'setCredentials').callsFake(async credentials => {
-            // Verify that logout is called
-            assert.strictEqual(credentials, undefined)
-        })
-
-        await loginManager.login({ passive, providerId: sampleCredentialsId })
-        assert.strictEqual(setCredentialsStub.callCount, 1, 'Expected awsContext setCredentials to be called once')
-        assertTelemetry({ result: 'Failed', passive, credentialType, credentialSourceId })
-    })
-})
diff --git a/src/test/shared/credentials/userCredentialsUtils.test.ts b/src/test/shared/credentials/userCredentialsUtils.test.ts
deleted file mode 100644
index 29bb564f2e9..00000000000
--- a/src/test/shared/credentials/userCredentialsUtils.test.ts
+++ /dev/null
@@ -1,226 +0,0 @@
-/*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as fs from 'fs-extra'
-import * as path from 'path'
-import * as sinon from 'sinon'
-
-/* eslint @typescript-eslint/naming-convention: 0 */
-
-import { Uri } from 'vscode'
-import { loadSharedConfigFiles } from '../../../shared/credentials/credentialsFile'
-import { UserCredentialsUtils } from '../../../shared/credentials/userCredentialsUtils'
-import { EnvironmentVariables } from '../../../shared/environmentVariables'
-import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
-
-describe('UserCredentialsUtils', function () {
-    let tempFolder: string
-
-    before(async function () {
-        // Make a temp folder for all these tests
-        // Stick some temp credentials files in there to load from
-        tempFolder = await makeTemporaryToolkitFolder()
-    })
-
-    afterEach(async function () {
-        sinon.restore()
-    })
-
-    after(async function () {
-        await fs.remove(tempFolder)
-    })
-
-    describe('findExistingCredentialsFilenames', function () {
-        it('returns both filenames if both files exist', async function () {
-            const credentialsFilename = path.join(tempFolder, 'credentials-both-exist-test')
-            const configFilename = path.join(tempFolder, 'config-both-exist-test')
-
-            sinon.stub(process, 'env').value({
-                AWS_SHARED_CREDENTIALS_FILE: credentialsFilename,
-                AWS_CONFIG_FILE: configFilename,
-            } as EnvironmentVariables)
-
-            createCredentialsFile(credentialsFilename, ['default'])
-            createCredentialsFile(configFilename, ['default'])
-
-            const foundFiles: string[] = await UserCredentialsUtils.findExistingCredentialsFilenames()
-            assert.strictEqual(foundFiles.length, 2)
-        })
-
-        it('returns credentials file if it exists and config file does not exist', async function () {
-            const credentialsFilename = path.join(tempFolder, 'credentials-exist-test')
-            const configFilename = path.join(tempFolder, 'config-not-exist-test')
-
-            sinon.stub(process, 'env').value({
-                AWS_SHARED_CREDENTIALS_FILE: credentialsFilename,
-                AWS_CONFIG_FILE: configFilename,
-            } as EnvironmentVariables)
-
-            createCredentialsFile(credentialsFilename, ['default'])
-
-            const foundFiles: string[] = await UserCredentialsUtils.findExistingCredentialsFilenames()
-            assert.strictEqual(foundFiles.length, 1)
-            assert.strictEqual(foundFiles[0], credentialsFilename)
-        })
-
-        it('returns config file if it exists and credentials file does not exist', async function () {
-            const credentialsFilename = path.join(tempFolder, 'credentials-not-exist-test')
-            const configFilename = path.join(tempFolder, 'config-exist-test')
-
-            sinon.stub(process, 'env').value({
-                AWS_SHARED_CREDENTIALS_FILE: credentialsFilename,
-                AWS_CONFIG_FILE: configFilename,
-            } as EnvironmentVariables)
-
-            createCredentialsFile(configFilename, ['default'])
-
-            const foundFiles: string[] = await UserCredentialsUtils.findExistingCredentialsFilenames()
-            assert.strictEqual(foundFiles.length, 1)
-            assert.strictEqual(foundFiles[0], configFilename)
-        })
-
-        it('returns empty result if neither file exists', async function () {
-            const credentialsFilename = path.join(tempFolder, 'credentials-not-exist-test')
-            const configFilename = path.join(tempFolder, 'config-not-exist-test')
-
-            sinon.stub(process, 'env').value({
-                AWS_SHARED_CREDENTIALS_FILE: credentialsFilename,
-                AWS_CONFIG_FILE: configFilename,
-            } as EnvironmentVariables)
-
-            const foundFiles: string[] = await UserCredentialsUtils.findExistingCredentialsFilenames()
-            assert.strictEqual(foundFiles.length, 0)
-        })
-
-        it('returns credentials files if profiles are required and config does not exist', async function () {
-            const credentialsFilename = path.join(tempFolder, 'credentials-exists-profiles-required-no-config-test')
-            const configFilename = path.join(tempFolder, 'config-not-exist-profiles-required-but-no-config-test')
-
-            sinon.stub(process, 'env').value({
-                AWS_SHARED_CREDENTIALS_FILE: credentialsFilename,
-                AWS_CONFIG_FILE: configFilename,
-            } as EnvironmentVariables)
-
-            createCredentialsFile(credentialsFilename, ['default'])
-
-            const foundFiles: string[] = await UserCredentialsUtils.findExistingCredentialsFilenames(true)
-            assert.strictEqual(foundFiles.length, 1)
-        })
-
-        it('returns config files if profiles are required and credentials does not exist', async function () {
-            const credentialsFilename = path.join(
-                tempFolder,
-                'credentials-exists-profiles-required-no-credentials-test'
-            )
-            const configFilename = path.join(tempFolder, 'config-not-exist-profiles-required-but-no-credentials-test')
-
-            sinon.stub(process, 'env').value({
-                AWS_SHARED_CREDENTIALS_FILE: credentialsFilename,
-                AWS_CONFIG_FILE: configFilename,
-            } as EnvironmentVariables)
-
-            createCredentialsFile(configFilename, ['default'])
-
-            const foundFiles: string[] = await UserCredentialsUtils.findExistingCredentialsFilenames(true)
-            assert.strictEqual(foundFiles.length, 1)
-        })
-
-        it('returns empty result if files dont contain credentials', async function () {
-            const credentialsFilename = path.join(tempFolder, 'credentials-both-exist-but-no-credentials-test')
-            const configFilename = path.join(tempFolder, 'config-both-exist-but-no-credentials-test')
-
-            sinon.stub(process, 'env').value({
-                AWS_SHARED_CREDENTIALS_FILE: credentialsFilename,
-                AWS_CONFIG_FILE: configFilename,
-            } as EnvironmentVariables)
-
-            createCredentialsFile(credentialsFilename, [])
-            createCredentialsFile(configFilename, [])
-
-            const foundFiles: string[] = await UserCredentialsUtils.findExistingCredentialsFilenames(true)
-            assert.strictEqual(foundFiles.length, 0)
-        })
-
-        it('returns empty result if files contains nonsense', async function () {
-            const credentialsFilename = path.join(tempFolder, 'credentials-both-exist-but-contain-nonsense-test')
-            const configFilename = path.join(tempFolder, 'config-both-exist-but-contain-nonsense-test')
-
-            sinon.stub(process, 'env').value({
-                AWS_SHARED_CREDENTIALS_FILE: credentialsFilename,
-                AWS_CONFIG_FILE: configFilename,
-            } as EnvironmentVariables)
-
-            fs.writeFileSync(credentialsFilename, 'adfadfgwergsdfgsdfgjsdifgsdfugi')
-            fs.writeFileSync(configFilename, 'adfadfgwergsdfgsdfgjsdifgsdfugi')
-
-            const foundFiles: string[] = await UserCredentialsUtils.findExistingCredentialsFilenames(true)
-            assert.strictEqual(foundFiles.length, 0)
-        })
-    })
-
-    describe('generateCredentialsFile', function () {
-        it('generates a valid credentials file', async function () {
-            const credentialsFilename = path.join(tempFolder, 'credentials-generation-test')
-            const profileName = 'someRandomProfileName'
-
-            sinon.stub(process, 'env').value({
-                AWS_SHARED_CREDENTIALS_FILE: credentialsFilename,
-            } as EnvironmentVariables)
-            const creds = {
-                accessKey: '123',
-                profileName: profileName,
-                secretKey: 'ABC',
-            }
-            await UserCredentialsUtils.generateCredentialsFile(creds)
-
-            const sharedConfigFiles = await loadSharedConfigFiles({ credentials: Uri.file(credentialsFilename) })
-            assert(typeof sharedConfigFiles === 'object', 'sharedConfigFiles should be an object')
-            const profiles = sharedConfigFiles.credentialsFile
-            assert(typeof profiles === 'object', 'profiles should be an object')
-            const profile = profiles[profileName]
-            assert.ok(profile)
-            assert.strictEqual(
-                profile.aws_access_key_id,
-                creds.accessKey,
-                `creds.accessKey: "${profile.aws_access_key_id}" !== "${creds.accessKey}"`
-            )
-            assert.strictEqual(
-                profile.aws_secret_access_key,
-                creds.secretKey,
-                `creds.secretKey: "${profile.aws_access_key_id}" !== "${creds.secretKey}"`
-            )
-            await fs.access(credentialsFilename, fs.constants.R_OK).catch(_err => assert(false, 'Should be readable'))
-            await fs.access(credentialsFilename, fs.constants.W_OK).catch(_err => assert(false, 'Should be writeable'))
-        })
-    })
-
-    describe('loadSharedConfigFiles', function () {
-        it('normalizes fields by making them lowercase', async function () {
-            const credentialsFilename = path.join(tempFolder, 'credentials-generation-test')
-            const profileName = 'someRandomProfileName'
-
-            createCredentialsFile(credentialsFilename, [profileName])
-
-            const sharedConfigFiles = await loadSharedConfigFiles({ credentials: Uri.file(credentialsFilename) })
-            const profiles = sharedConfigFiles.credentialsFile
-            assert.strictEqual(profiles[profileName]?.region, 'us-weast-3')
-        })
-    })
-
-    function createCredentialsFile(filename: string, profileNames: string[]): void {
-        let fileContents = ''
-
-        profileNames.forEach(profileName => {
-            fileContents += `[${profileName}]
-aws_access_key_id = FAKEKEY
-aws_SecRet_aCCess_key = FAKESECRET
-REGION = us-weast-3
-`
-        })
-
-        fs.writeFileSync(filename, fileContents)
-    }
-})
diff --git a/src/test/shared/defaultAwsClientBuilder.test.ts b/src/test/shared/defaultAwsClientBuilder.test.ts
deleted file mode 100644
index 71ad13897b7..00000000000
--- a/src/test/shared/defaultAwsClientBuilder.test.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-/*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { AWSError, Request, Service } from 'aws-sdk'
-import { version } from 'vscode'
-import { AWSClientBuilder, DefaultAWSClientBuilder } from '../../shared/awsClientBuilder'
-import { DevSettings } from '../../shared/settings'
-import { getClientId } from '../../shared/telemetry/util'
-import { FakeMemento } from '../fakeExtensionContext'
-import { FakeAwsContext } from '../utilities/fakeAwsContext'
-import { TestSettings } from '../utilities/testSettingsConfiguration'
-
-describe('DefaultAwsClientBuilder', function () {
-    let builder: AWSClientBuilder
-
-    beforeEach(function () {
-        builder = new DefaultAWSClientBuilder(new FakeAwsContext())
-    })
-
-    describe('createAndConfigureSdkClient', function () {
-        it('includes Toolkit user-agent if no options are specified', async function () {
-            const service = await builder.createAwsService(Service)
-            const clientId = await getClientId(new FakeMemento())
-
-            assert.strictEqual(!!service.config.customUserAgent, true)
-            assert.strictEqual(
-                service.config.customUserAgent!.replace('---Insiders', ''),
-                `AWS-Toolkit-For-VSCode/testPluginVersion Visual-Studio-Code/${version} ClientId/${clientId}`
-            )
-        })
-
-        it('adds Client-Id to user agent', async function () {
-            const service = await builder.createAwsService(Service)
-            const clientId = await getClientId(new FakeMemento())
-            const regex = new RegExp(`ClientId/${clientId}`)
-            assert.ok(service.config.customUserAgent?.match(regex))
-        })
-
-        it('does not override custom user-agent if specified in options', async function () {
-            const service = await builder.createAwsService(Service, {
-                customUserAgent: 'CUSTOM USER AGENT',
-            })
-
-            assert.strictEqual(service.config.customUserAgent, 'CUSTOM USER AGENT')
-        })
-
-        it('can use endpoint override', async function () {
-            const settings = new TestSettings()
-            await settings.update('aws.dev.endpoints', { foo: 'http://example.com' })
-
-            const service = await builder.createAwsService(
-                Service,
-                {
-                    customUserAgent: 'CUSTOM USER AGENT',
-                    apiConfig: { metadata: { serviceId: 'foo' } },
-                } as any,
-                undefined,
-                undefined,
-                new DevSettings(settings)
-            )
-
-            assert.strictEqual(service.config.endpoint, 'http://example.com')
-        })
-
-        it('does not clobber endpoint setting if no override is present', async function () {
-            const settings = new TestSettings()
-
-            const service = await builder.createAwsService(
-                Service,
-                {
-                    customUserAgent: 'CUSTOM USER AGENT',
-                    apiConfig: { metadata: { serviceId: 'foo' } },
-                    endpoint: 'http://example.com',
-                } as any,
-                undefined,
-                undefined,
-                new DevSettings(settings)
-            )
-
-            assert.strictEqual(service.config.endpoint, 'http://example.com')
-        })
-
-        describe('request listeners', function () {
-            type WithConfig = Parameters<typeof builder['createAwsService']>[1] & { apiConfig: Record<string, any> }
-
-            it('calls listener with correct type', async function () {
-                const service = await builder.createAwsService(Service, {
-                    apiConfig: { operations: { FakeOperation: {} } },
-                    onRequestSetup: [
-                        request => {
-                            assert.ok(request.service instanceof Service)
-                            assert.strictEqual(request.operation, 'FakeOperation')
-                            assert.deepStrictEqual(request.params, { foo: 'bar' })
-
-                            request.on(
-                                'validate',
-                                () => {
-                                    throw new Error()
-                                },
-                                true
-                            )
-                        },
-                    ],
-                } as WithConfig)
-
-                const request = service.makeRequest('FakeOperation', { foo: 'bar' }).promise()
-                await assert.rejects(request)
-            })
-
-            it('can add listeners without affecting the original class', async function () {
-                let callCount = 0
-
-                const getDescriptors = (ctor: new (...args: any[]) => any) =>
-                    Object.getOwnPropertyDescriptors(ctor.prototype)
-
-                const base = class extends Service {
-                    public override setupRequestListeners(request: Request<any, AWSError>): void {
-                        callCount += 1
-                    }
-                }
-
-                // Pretty gross but we're dealing with old school JS inheritance here
-                function factory(...args: any[]) {
-                    const instance = new Service(...args)
-                    const proto = Object.create(Object.getPrototypeOf(instance), getDescriptors(base))
-                    Object.setPrototypeOf(instance, proto)
-
-                    return instance
-                }
-                const ctor = factory as unknown as typeof base
-
-                const expected = getDescriptors(ctor)
-                const service = await builder.createAwsService(ctor, {
-                    apiConfig: { operations: { Foo: {} } },
-                    onRequestSetup: () => {},
-                } as WithConfig)
-
-                assert.deepStrictEqual(getDescriptors(ctor), expected)
-                assert.ok(service instanceof Service)
-
-                // This is just a reference compare. Unbound methods don't matter here.
-                // eslint-disable-next-line @typescript-eslint/unbound-method
-                assert.notStrictEqual(service.setupRequestListeners, base.prototype.setupRequestListeners)
-
-                await assert.rejects(service.makeRequest('Foo').promise())
-                assert.strictEqual(callCount, 1)
-            })
-        })
-    })
-})
diff --git a/src/test/shared/defaultAwsContext.test.ts b/src/test/shared/defaultAwsContext.test.ts
deleted file mode 100644
index f2c9459fe54..00000000000
--- a/src/test/shared/defaultAwsContext.test.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-/*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as AWS from 'aws-sdk'
-import { AwsContextCredentials } from '../../shared/awsContext'
-import { DefaultAwsContext } from '../../shared/awsContext'
-
-describe('DefaultAwsContext', function () {
-    const testAccountIdValue: string = '123456789012'
-
-    it('instantiates with no credentials', async function () {
-        const testContext = new DefaultAwsContext()
-
-        assert.strictEqual(testContext.getCredentialProfileName(), undefined)
-        assert.strictEqual(testContext.getCredentialAccountId(), undefined)
-        assert.strictEqual(await testContext.getCredentials(), undefined)
-    })
-
-    it('sets credentials and gets credentialsId', async function () {
-        const awsCredentials = makeSampleAwsContextCredentials()
-
-        const testContext = new DefaultAwsContext()
-
-        await testContext.setCredentials(awsCredentials)
-        assert.strictEqual(testContext.getCredentialProfileName(), awsCredentials.credentialsId)
-    })
-
-    it('sets undefined credentials and gets credentialsId', async function () {
-        const testContext = new DefaultAwsContext()
-
-        await testContext.setCredentials(undefined)
-        assert.strictEqual(testContext.getCredentialProfileName(), undefined)
-    })
-
-    it('sets credentials and gets accountId', async function () {
-        const awsCredentials = makeSampleAwsContextCredentials()
-
-        const testContext = new DefaultAwsContext()
-
-        await testContext.setCredentials(awsCredentials)
-        assert.strictEqual(testContext.getCredentialAccountId(), awsCredentials.accountId)
-    })
-
-    it('sets undefined credentials and gets accountId', async function () {
-        const testContext = new DefaultAwsContext()
-
-        await testContext.setCredentials(undefined)
-        assert.strictEqual(testContext.getCredentialAccountId(), undefined)
-    })
-
-    it('sets credentials and gets credentials', async function () {
-        const awsCredentials = makeSampleAwsContextCredentials()
-
-        const testContext = new DefaultAwsContext()
-
-        await testContext.setCredentials(awsCredentials)
-        assert.strictEqual(await testContext.getCredentials(), awsCredentials.credentials)
-    })
-
-    it('sets undefined credentials and gets credentials', async function () {
-        const testContext = new DefaultAwsContext()
-
-        await testContext.setCredentials(undefined)
-        assert.strictEqual(await testContext.getCredentials(), undefined)
-    })
-
-    it('fires event on credentials change', async function () {
-        const testContext = new DefaultAwsContext()
-
-        const awsCredentials = makeSampleAwsContextCredentials()
-
-        await new Promise<void>(async resolve => {
-            testContext.onDidChangeContext(awsContextChangedEvent => {
-                assert.strictEqual(awsContextChangedEvent.profileName, awsCredentials.credentialsId)
-                assert.strictEqual(awsContextChangedEvent.accountId, awsCredentials.accountId)
-                resolve()
-            })
-
-            await testContext.setCredentials(awsCredentials)
-        })
-    })
-
-    function makeSampleAwsContextCredentials(): AwsContextCredentials {
-        return {
-            credentials: {} as any as AWS.Credentials,
-            credentialsId: 'qwerty',
-            accountId: testAccountIdValue,
-        }
-    }
-})
diff --git a/src/test/shared/errors.test.ts b/src/test/shared/errors.test.ts
deleted file mode 100644
index c6617206ed9..00000000000
--- a/src/test/shared/errors.test.ts
+++ /dev/null
@@ -1,221 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { getTelemetryReason, getTelemetryResult, ToolkitError } from '../../shared/errors'
-import { CancellationError } from '../../shared/utilities/timeoutUtils'
-import { UnauthorizedException } from '@aws-sdk/client-sso'
-
-describe('ToolkitError', function () {
-    it('can store an error message', function () {
-        const error = new ToolkitError('uh oh!')
-        assert.strictEqual(error.message, 'uh oh!')
-    })
-
-    it('can store an error name', function () {
-        const error = new ToolkitError('uh oh!', { name: 'MyError' })
-        assert.strictEqual(error.name, 'MyError')
-    })
-
-    it('can store an error code', function () {
-        const error = new ToolkitError('uh oh!', { code: 'BrokeStuff' })
-        assert.strictEqual(error.code, 'BrokeStuff')
-    })
-
-    it('can store detailed information', function () {
-        const error = new ToolkitError('uh oh!', { details: { why: 'something broke' } })
-        assert.strictEqual(error.details?.why, 'something broke')
-    })
-
-    it('can chain errors together', function () {
-        const error1 = new Error()
-        const error2 = new ToolkitError('uh oh!', { cause: error1 })
-        assert.strictEqual(error2.cause, error1)
-    })
-
-    describe('immutability', function () {
-        it('throws if trying to assign to `cause` after instantiation', function () {
-            const error = new ToolkitError('uh oh!')
-            assert.throws(() => Object.assign(error, { cause: new Error() }))
-        })
-
-        it('does not use the indirect `cause` reference passed in during construction', function () {
-            const info = { cause: new Error() }
-            const error = new ToolkitError('uh oh!', info)
-            assert.strictEqual(error.cause, info.cause)
-
-            info.cause = new Error()
-            assert.notStrictEqual(error.cause, info.cause)
-        })
-    })
-
-    describe('cancels', function () {
-        it('treats `user` cancellations as cancelled', function () {
-            const error = new ToolkitError('', { cause: new CancellationError('user') })
-            assert.strictEqual(error.cancelled, true)
-        })
-
-        it('does not treat `timeout` cancellations as cancelled', function () {
-            const error = new ToolkitError('', { cause: new CancellationError('timeout') })
-            assert.strictEqual(error.cancelled, false)
-        })
-
-        it('traverses the error chain to determine cancellation', function () {
-            const error1 = new ToolkitError('', { cause: new CancellationError('user') })
-            const error2 = new ToolkitError('', { cause: error1 })
-            assert.strictEqual(error2.cancelled, true)
-        })
-
-        it('uses explicit `cancellation` flag if set to `true`', function () {
-            const error = new ToolkitError('', {
-                cancelled: true,
-                cause: new CancellationError('timeout'),
-            })
-            assert.strictEqual(error.cancelled, true)
-        })
-
-        it('uses explicit `cancellation` flag if set to `false`', function () {
-            const error = new ToolkitError('', {
-                cancelled: false,
-                cause: new CancellationError('user'),
-            })
-            assert.strictEqual(error.cancelled, false)
-        })
-    })
-
-    describe('traces', function () {
-        it('uses the error message + name', function () {
-            const error = new ToolkitError('uh oh!', { name: 'MyError' })
-            assert.strictEqual(error.trace, `MyError: uh oh!`)
-        })
-
-        it('formats error details and appends the result to the end of the message', function () {
-            const error = new ToolkitError('oops', { details: { foo: 'Foo', bar: 'Bar' } })
-            assert.strictEqual(error.trace, `Error: oops (foo: Foo; bar: Bar)`)
-        })
-
-        it('adds the error code if available', function () {
-            const error = new ToolkitError('oops', { code: 'MyBad', details: { foo: 'Foo' } })
-            assert.strictEqual(error.trace, `Error: oops [MyBad] (foo: Foo)`)
-        })
-
-        it('does not include the code when it is equal to the name', function () {
-            const error = new ToolkitError('oops', { code: 'MyBad', name: 'MyBad' })
-            assert.strictEqual(error.trace, `MyBad: oops`)
-        })
-
-        it('formats chains of errors', function () {
-            const first = new ToolkitError('oops', { code: 'MyBad' })
-            const second = ToolkitError.chain(first, 'uh oh!', { name: 'MyError' })
-            const third = ToolkitError.chain(second, 'something broke')
-
-            assert.strictEqual(third.trace, `Error: something broke\n\t -> MyError: uh oh!\n\t -> Error: oops [MyBad]`)
-        })
-
-        it('includes extra information for AWS errors', function () {
-            const original = Object.assign(new Error('Access Denied'), {
-                statusCode: 403,
-                time: new Date(),
-                name: 'AccessDeniedException',
-                code: 'AccessDeniedException',
-            })
-
-            const error = ToolkitError.chain(original, 'uh oh!')
-            assert.strictEqual(
-                error.trace,
-                `Error: uh oh!\n\t -> AccessDeniedException: Access Denied (statusCode: 403)`
-            )
-        })
-    })
-
-    describe('named', function () {
-        it('can be extended with a constant name', function () {
-            const MyError = ToolkitError.named('MyError')
-            assert.strictEqual(new MyError('uh oh!').name, 'MyError')
-        })
-
-        it('maintains the prototype chain with a constructor', function () {
-            const OopsieError = class extends ToolkitError.named('OopsieError') {
-                public constructor() {
-                    super('oopsies')
-                }
-            }
-
-            const error = OopsieError.chain(new Error('oops'), 'uh oh!')
-            assert.ok(error instanceof ToolkitError)
-            assert.ok(error instanceof OopsieError)
-            assert.strictEqual(error.cause, undefined)
-            assert.strictEqual(error.message, 'oopsies')
-        })
-
-        it('maintains the prototype chain without a constructor', function () {
-            const MyError = ToolkitError.named('MyError')
-            const MyOtherError = class extends MyError {
-                public readonly fault = 'foo'
-            }
-
-            const error = MyOtherError.chain(new Error('oops'), 'uh oh!')
-            assert.ok(error instanceof ToolkitError)
-            assert.ok(error instanceof MyError)
-            assert.ok(error instanceof MyOtherError)
-            assert.strictEqual(error.name, 'MyError')
-            assert.strictEqual(error.fault, 'foo')
-            assert.strictEqual(error.cause?.message, 'oops')
-        })
-    })
-})
-
-describe('Telemetry', function () {
-    describe('getTelemetryResult', function () {
-        it('returns `Succeeded` if no error is given', function () {
-            assert.strictEqual(getTelemetryResult(undefined), 'Succeeded')
-        })
-
-        it('returns `Cancelled` for user cancellation errors', function () {
-            assert.strictEqual(getTelemetryResult(new CancellationError('user')), 'Cancelled')
-        })
-
-        it('returns `Cancelled` for a cancelled `ToolkitError`', function () {
-            const error = ToolkitError.chain(new CancellationError('user'), '')
-            assert.strictEqual(getTelemetryResult(error), 'Cancelled')
-        })
-
-        it('returns `Failed` for timeout errors', function () {
-            assert.strictEqual(getTelemetryResult(new CancellationError('timeout')), 'Failed')
-        })
-
-        it('returns `Failed` for generic errors', function () {
-            assert.strictEqual(getTelemetryResult(new Error()), 'Failed')
-        })
-    })
-
-    describe('getTelemetryReason', function () {
-        it('uses the error name if there is no error chain', function () {
-            const error = new ToolkitError('', { name: 'MyError' })
-            assert.strictEqual(getTelemetryReason(error), 'MyError')
-        })
-
-        it('uses the error `code` instead of the name', function () {
-            const error = new ToolkitError('', { name: 'MyError', code: 'ErrorCode' })
-            assert.strictEqual(getTelemetryReason(error), 'ErrorCode')
-        })
-
-        it('can handle AWS errors (JS SDK v2)', function () {
-            const error = Object.assign(new Error(), { code: 'AccessDeniedException', time: new Date() })
-            assert.strictEqual(getTelemetryReason(error), 'AccessDeniedException')
-        })
-
-        it('can handle AWS errors (JS SDK v3)', function () {
-            const error = new UnauthorizedException({ message: '', $metadata: {} })
-            assert.strictEqual(getTelemetryReason(error), 'UnauthorizedException')
-        })
-
-        it('traverses the error chain for the root cause', function () {
-            const error1 = new ToolkitError('', { code: 'ErrorCode' })
-            const error2 = new ToolkitError('', { cause: error1 })
-            assert.strictEqual(getTelemetryReason(error2), 'ErrorCode')
-        })
-    })
-})
diff --git a/src/test/shared/extensionUtilities.test.ts b/src/test/shared/extensionUtilities.test.ts
deleted file mode 100644
index 52692f706e4..00000000000
--- a/src/test/shared/extensionUtilities.test.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-
-import { AWSError } from 'aws-sdk'
-import { writeFile, remove } from 'fs-extra'
-import * as path from 'path'
-import * as sinon from 'sinon'
-import { DefaultEc2MetadataClient } from '../../shared/clients/ec2MetadataClient'
-import * as vscode from 'vscode'
-import { getComputeRegion, initializeComputeRegion, mostRecentVersionKey } from '../../shared/extensionUtilities'
-import {
-    createQuickStartWebview,
-    isDifferentVersion,
-    safeGet,
-    setMostRecentVersion,
-} from '../../shared/extensionUtilities'
-import * as filesystemUtilities from '../../shared/filesystemUtilities'
-import { FakeExtensionContext } from '../fakeExtensionContext'
-import { InstanceIdentity } from '../../shared/clients/ec2MetadataClient'
-import { extensionVersion } from '../../shared/vscode/env'
-
-describe('extensionUtilities', function () {
-    describe('safeGet', function () {
-        class Blah {
-            public someProp?: string
-
-            public constructor(someProp?: string) {
-                this.someProp = someProp
-            }
-        }
-
-        it('can access sub-property', function () {
-            assert.strictEqual(
-                safeGet(new Blah('hello!'), x => x.someProp),
-                'hello!'
-            )
-            assert.strictEqual(
-                safeGet(new Blah(), x => x.someProp),
-                undefined
-            )
-            assert.strictEqual(
-                safeGet(undefined as Blah | undefined, x => x.someProp),
-                undefined
-            )
-        })
-    })
-
-    describe('createQuickStartWebview', async function () {
-        const context = await FakeExtensionContext.create()
-        let tempDir: string | undefined
-
-        beforeEach(async function () {
-            tempDir = await filesystemUtilities.makeTemporaryToolkitFolder()
-            context.extensionPath = tempDir
-        })
-
-        afterEach(async function () {
-            if (tempDir) {
-                await remove(tempDir)
-            }
-        })
-
-        it("throws error if a quick start page doesn't exist", async () => {
-            await assert.rejects(createQuickStartWebview(context, 'irresponsibly-named-file'))
-        })
-
-        it('returns a webview with unaltered text if a valid file is passed without tokens', async function () {
-            const filetext = 'this temp page does not have any tokens'
-            const filepath = 'tokenless'
-            await writeFile(path.join(context.extensionPath, filepath), filetext)
-            const webview = await createQuickStartWebview(context, filepath)
-
-            assert.strictEqual(typeof webview, 'object')
-            const forcedWebview = webview as vscode.WebviewPanel
-            assert.strictEqual(forcedWebview.webview.html.includes(filetext), true)
-        })
-
-        it('returns a webview with tokens replaced', async function () {
-            const token = '!!EXTENSIONROOT!!'
-            const basetext = 'this temp page has tokens: '
-            const filetext = basetext + token
-            const filepath = 'tokenless'
-            await writeFile(path.join(context.extensionPath, filepath), filetext)
-            const webview = await createQuickStartWebview(context, filepath)
-
-            assert.strictEqual(typeof webview, 'object')
-            const forcedWebview = webview as vscode.WebviewPanel
-
-            const pathAsVsCodeResource = forcedWebview.webview.asWebviewUri(vscode.Uri.file(context.extensionPath))
-            assert.strictEqual(forcedWebview.webview.html.includes(`${basetext}${pathAsVsCodeResource}`), true)
-        })
-    })
-
-    describe('isDifferentVersion', function () {
-        it('returns false if the version exists and matches the existing version exactly', async function () {
-            const goodVersion = '1.2.3'
-            const extContext = await FakeExtensionContext.create()
-            extContext.globalState.update(mostRecentVersionKey, goodVersion)
-
-            assert.strictEqual(isDifferentVersion(extContext, goodVersion), false)
-        })
-
-        it("returns true if a most recent version isn't set", async () => {
-            const extContext = await FakeExtensionContext.create()
-
-            assert.ok(isDifferentVersion(extContext))
-        })
-
-        it("returns true if a most recent version doesn't match the current version", async () => {
-            const oldVersion = '1.2.3'
-            const newVersion = '4.5.6'
-            const extContext = await FakeExtensionContext.create()
-            extContext.globalState.update(mostRecentVersionKey, oldVersion)
-
-            assert.ok(isDifferentVersion(extContext, newVersion))
-        })
-    })
-
-    describe('setMostRecentVersion', function () {
-        it('sets the most recent version', async function () {
-            const extContext = await FakeExtensionContext.create()
-            setMostRecentVersion(extContext)
-
-            assert.strictEqual(extContext.globalState.get<string>(mostRecentVersionKey), extensionVersion)
-        })
-    })
-})
-
-describe('initializeComputeRegion, getComputeRegion', async function () {
-    const metadataService = new DefaultEc2MetadataClient()
-
-    let sandbox: sinon.SinonSandbox
-
-    before(function () {
-        sandbox = sinon.createSandbox()
-    })
-
-    afterEach(function () {
-        sandbox.restore()
-    })
-
-    it('throws if the region has not been set', async function () {
-        // not quite a pure test: we call activate during the test load so this value will always be set
-        // manually hack in the notInitialized value to trigger the error
-        sandbox.stub(metadataService, 'getInstanceIdentity').resolves({ region: 'notInitialized' })
-
-        await initializeComputeRegion(metadataService, true)
-        assert.throws(getComputeRegion)
-    })
-
-    it('returns a compute region', async function () {
-        sandbox.stub(metadataService, 'getInstanceIdentity').resolves({ region: 'us-weast-1' })
-
-        await initializeComputeRegion(metadataService, true)
-        assert.strictEqual(getComputeRegion(), 'us-weast-1')
-    })
-
-    it('returns "unknown" if cloud9 and the MetadataService request fails', async function () {
-        sandbox.stub(metadataService, 'getInstanceIdentity').rejects({} as AWSError)
-
-        await initializeComputeRegion(metadataService, true)
-        assert.strictEqual(getComputeRegion(), 'unknown')
-    })
-
-    it('returns "unknown" if cloud9 and can not find a region', async function () {
-        sandbox.stub(metadataService, 'getInstanceIdentity').resolves({} as InstanceIdentity)
-
-        await initializeComputeRegion(metadataService, true)
-        assert.strictEqual(getComputeRegion(), 'unknown')
-    })
-
-    it('returns undefined if not cloud9', async function () {
-        sandbox.stub(metadataService, 'getInstanceIdentity').callsArgWith(1, undefined, 'lol')
-
-        await initializeComputeRegion(metadataService, false)
-        assert.strictEqual(getComputeRegion(), undefined)
-    })
-
-    it('handles invalid endpoint or invalid response', async function () {
-        await assert.rejects(metadataService.invoke('/bogus/path'))
-    })
-})
diff --git a/src/test/shared/filesystemUtilities.test.ts b/src/test/shared/filesystemUtilities.test.ts
deleted file mode 100644
index 3218a4e7cd7..00000000000
--- a/src/test/shared/filesystemUtilities.test.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as os from 'os'
-import { writeFile, remove } from 'fs-extra'
-import * as path from 'path'
-import {
-    fileExists,
-    getNonexistentFilename,
-    isInDirectory,
-    makeTemporaryToolkitFolder,
-    tempDirPath,
-} from '../../shared/filesystemUtilities'
-
-describe('filesystemUtilities', function () {
-    const targetFilename = 'findThisFile12345.txt'
-    let targetFilePath: string
-    let tempFolder: string
-    const foldersToCleanUp: string[] = []
-
-    beforeEach(async function () {
-        // Make a temp folder for all these tests
-        tempFolder = await makeTemporaryToolkitFolder()
-        targetFilePath = path.join(tempFolder, targetFilename)
-
-        await writeFile(targetFilePath, 'Hello, World!', 'utf8')
-
-        foldersToCleanUp.push(tempFolder)
-    })
-
-    afterEach(async function () {
-        for (const folder of foldersToCleanUp) {
-            await remove(folder)
-        }
-    })
-
-    describe('getNonexistentFilename()', function () {
-        it('failure modes', async function () {
-            assert.throws(() => {
-                getNonexistentFilename('/bogus/directory/', 'foo', '.txt', 99)
-            })
-            assert.throws(() => {
-                getNonexistentFilename('', 'foo', '.txt', 99)
-            })
-        })
-        it('returns a filename that does not exist in the directory', async function () {
-            const dir = tempFolder
-            await writeFile(path.join(dir, 'foo.txt'), '', 'utf8')
-            await writeFile(path.join(dir, 'foo-0.txt'), '', 'utf8')
-            await writeFile(path.join(dir, 'foo-1.txt'), '', 'utf8')
-            await writeFile(path.join(dir, 'foo-2.txt'), '', 'utf8')
-            assert.strictEqual(getNonexistentFilename(dir, 'foo', '.txt', 99), 'foo-3.txt')
-            assert.strictEqual(getNonexistentFilename(dir, 'foo', '', 99), 'foo')
-        })
-        it('returns "foo-RANDOM.txt" if max is reached', async function () {
-            const dir = tempFolder
-            await writeFile(path.join(dir, 'foo.txt'), '', 'utf8')
-            await writeFile(path.join(dir, 'foo-1.txt'), '', 'utf8')
-            // Looks like "foo-75446d5d.txt".
-            assert.ok(/^foo-[a-fA-F0-9]{8}.txt$/.test(getNonexistentFilename(dir, 'foo', '.txt', 1)))
-        })
-    })
-
-    describe('makeTemporaryToolkitFolder()', function () {
-        it(`makes temp dirs as children to filesystemUtilities.tempDirPath ('${tempDirPath}')`, async () => {
-            const parentFolder = path.dirname(tempFolder)
-
-            assert.strictEqual(
-                parentFolder,
-                tempDirPath,
-                `expected tempFolder ('${tempFolder}') to be in tempDirPath ('${tempDirPath}')`
-            )
-        })
-
-        it('creates a folder', async function () {
-            assert.ok(await fileExists(tempFolder), `expected folder to exist: ${tempFolder}`)
-        })
-
-        it('makes nested temp dirs', async function () {
-            const nestedTempDirPath = await makeTemporaryToolkitFolder('nestedSubfolder', 'moreNestedSubfolder')
-
-            foldersToCleanUp.push(nestedTempDirPath)
-            foldersToCleanUp.push(path.join(tempDirPath, 'nestedSubfolder'))
-
-            assert(
-                nestedTempDirPath.startsWith(tempDirPath),
-                `expected nestedTempDirPath ('${nestedTempDirPath}') to be in tempDirPath ('${tempDirPath}')`
-            )
-            const tmpDirExists = await fileExists(nestedTempDirPath)
-            assert(tmpDirExists, `tempFolder should exist: '${nestedTempDirPath}'`)
-        })
-    })
-
-    it('isInDirectory()', function () {
-        const basePath = path.join('this', 'is', 'the', 'way')
-        const extendedPath = path.join(basePath, 'forward')
-        const filename = 'yadayadayada.log'
-
-        assert.ok(isInDirectory(basePath, basePath))
-        assert.ok(isInDirectory(basePath, extendedPath))
-        assert.ok(isInDirectory(basePath, path.join(basePath, filename)))
-        assert.ok(isInDirectory(basePath, path.join(extendedPath, filename)))
-        assert.ok(!isInDirectory(basePath, path.join('what', 'are', 'you', 'looking', 'at')))
-        assert.ok(!isInDirectory(basePath, `${basePath}point`))
-        assert.ok(isInDirectory('/foo/bar/baz/', '/foo/bar/baz/a.txt'))
-        assert.ok(isInDirectory('/foo/bar/baz/', ''))
-        assert.ok(isInDirectory('/', ''))
-        assert.ok(isInDirectory('', 'foo'))
-        assert.ok(isInDirectory('foo', 'foo'))
-
-        if (os.platform() === 'win32') {
-            assert.ok(isInDirectory('/foo/bar/baz/', '/FOO/BAR/BAZ/A.TXT'))
-            assert.ok(isInDirectory('C:\\foo\\bar\\baz\\', 'C:/FOO/BAR/BAZ/A.TXT'))
-            assert.ok(isInDirectory('C:\\foo\\bar\\baz', 'C:\\foo\\bar\\baz\\a.txt'))
-        } else {
-            assert.ok(!isInDirectory('/foo/bar/baz/', '/FOO/BAR/BAZ/A.TXT'))
-        }
-    })
-})
diff --git a/src/test/shared/fs/templateRegistry.test.ts b/src/test/shared/fs/templateRegistry.test.ts
deleted file mode 100644
index 534359e02a0..00000000000
--- a/src/test/shared/fs/templateRegistry.test.ts
+++ /dev/null
@@ -1,533 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as path from 'path'
-import * as vscode from 'vscode'
-import * as fs from 'fs-extra'
-
-import {
-    CloudFormationTemplateRegistry,
-    getResourcesForHandler,
-    getResourcesForHandlerFromTemplateDatum,
-} from '../../../shared/fs/templateRegistry'
-import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
-import { badYaml, makeSampleSamTemplateYaml, strToYamlFile } from '../cloudformation/cloudformationTestUtils'
-import { assertEqualPaths, toFile } from '../../testUtil'
-import { CloudFormation } from '../../../shared/cloudformation/cloudformation'
-import { WatchedItem } from '../../../shared/fs/watchedFiles'
-
-// TODO almost all of these tests should be moved to test WatchedFiles instead
-describe('CloudFormation Template Registry', async function () {
-    const goodYaml1 = makeSampleSamTemplateYaml(false)
-
-    describe('CloudFormationTemplateRegistry', async function () {
-        let testRegistry: CloudFormationTemplateRegistry
-        let tempFolder: string
-
-        beforeEach(async function () {
-            tempFolder = await makeTemporaryToolkitFolder()
-            testRegistry = new CloudFormationTemplateRegistry()
-        })
-
-        afterEach(async function () {
-            await fs.remove(tempFolder)
-        })
-
-        describe('addItemToRegistry', async function () {
-            it("adds data from a template to the registry and can receive the template's data", async () => {
-                const filename = vscode.Uri.file(path.join(tempFolder, 'template.yaml'))
-                await strToYamlFile(goodYaml1, filename.fsPath)
-                await testRegistry.addItemToRegistry(filename)
-
-                assert.strictEqual(testRegistry.registeredItems.length, 1)
-
-                const data = testRegistry.getRegisteredItem(filename.fsPath)
-
-                assertValidTestTemplate(data, filename.fsPath)
-            })
-
-            it('throws an error if the file to add is not a CF template', async function () {
-                const filename = vscode.Uri.file(path.join(tempFolder, 'template.yaml'))
-                await strToYamlFile(badYaml, filename.fsPath)
-
-                assert.strictEqual(await testRegistry.addItemToRegistry(vscode.Uri.file(filename.fsPath)), undefined)
-            })
-        })
-
-        // other get cases are tested in the add section
-        describe('registeredItems', async function () {
-            it('returns an empty array if the registry has no registered templates', function () {
-                assert.strictEqual(testRegistry.registeredItems.length, 0)
-            })
-        })
-
-        // other get cases are tested in the add section
-        describe('getRegisteredItem', async function () {
-            it('Returns the item from the VSCode URI', async function () {
-                const filename = vscode.Uri.file(path.join(tempFolder, 'template.yaml'))
-                await strToYamlFile(goodYaml1, filename.fsPath)
-                await testRegistry.addItemToRegistry(filename)
-
-                const data = testRegistry.getRegisteredItem(filename)
-
-                assertValidTestTemplate(data, filename.fsPath)
-            })
-
-            it('returns undefined if the registry has no registered templates', function () {
-                assert.strictEqual(testRegistry.getRegisteredItem('/template.yaml'), undefined)
-            })
-
-            it('returns undefined if the registry does not contain the template in question', async function () {
-                const filename = vscode.Uri.file(path.join(tempFolder, 'template.yaml'))
-                await strToYamlFile(goodYaml1, filename.fsPath)
-                await testRegistry.addItemToRegistry(vscode.Uri.file(filename.fsPath))
-
-                assert.strictEqual(testRegistry.getRegisteredItem('/not-the-template.yaml'), undefined)
-            })
-        })
-
-        describe('removeTemplateFromRegistry', async function () {
-            it('removes an added template', async function () {
-                const filename = vscode.Uri.file(path.join(tempFolder, 'template.yaml'))
-                await strToYamlFile(goodYaml1, filename.fsPath)
-                await testRegistry.addItemToRegistry(vscode.Uri.file(filename.fsPath))
-                assert.strictEqual(testRegistry.registeredItems.length, 1)
-
-                await testRegistry.remove(filename)
-                assert.strictEqual(testRegistry.registeredItems.length, 0)
-            })
-
-            it('does not affect the registry if a nonexistant template is removed', async function () {
-                const filename = vscode.Uri.file(path.join(tempFolder, 'template.yaml'))
-                await strToYamlFile(goodYaml1, filename.fsPath)
-                await testRegistry.addItemToRegistry(vscode.Uri.file(filename.fsPath))
-                assert.strictEqual(testRegistry.registeredItems.length, 1)
-
-                await testRegistry.remove(vscode.Uri.file(path.join(tempFolder, 'wrong-template.yaml')))
-                assert.strictEqual(testRegistry.registeredItems.length, 1)
-            })
-        })
-    })
-
-    // Consts for the non-class functions
-    const rootPath = path.join('i', 'am', 'your', 'father')
-    const nestedPath = path.join('s', 'brothers', 'nephews', 'cousins', 'former', 'roommate')
-    const otherPath = path.join('obi-wan', 'killed', 'your', 'father')
-    const matchingResource: {
-        Type: 'AWS::Serverless::Function'
-        Properties: CloudFormation.ZipResourceProperties
-    } = {
-        Type: 'AWS::Serverless::Function',
-        Properties: {
-            Handler: 'index.handler',
-            CodeUri: path.join(nestedPath),
-            Runtime: 'nodejs12.x',
-        },
-    }
-    const nonParentTemplate = {
-        path: path.join(otherPath, 'template.yaml'),
-        item: {},
-    }
-    const workingTemplate = {
-        path: path.join(rootPath, 'template.yaml'),
-        item: {
-            Resources: {
-                resource1: matchingResource,
-            },
-        },
-    }
-    const noResourceTemplate = {
-        path: path.join(rootPath, 'template.yaml'),
-        item: {
-            Resources: {},
-        },
-    }
-    const compiledResource: {
-        Type: 'AWS::Serverless::Function'
-        Properties: CloudFormation.ZipResourceProperties
-    } = {
-        Type: 'AWS::Serverless::Function',
-        Properties: {
-            Handler: 'Asdf::Asdf.Function::FunctionHandler',
-            CodeUri: path.join(nestedPath),
-            Runtime: 'dotnetcore3.1',
-        },
-    }
-    const dotNetTemplate = {
-        path: path.join(rootPath, 'template.yaml'),
-        item: {
-            Resources: {
-                resource1: compiledResource,
-            },
-        },
-    }
-    const multiResourceTemplate = {
-        path: path.join(rootPath, 'template.yaml'),
-        item: {
-            Resources: {
-                resource1: matchingResource,
-                resource2: {
-                    ...matchingResource,
-                    Properties: {
-                        ...matchingResource.Properties,
-                        Timeout: 5000,
-                    },
-                },
-            },
-        },
-    }
-    const badRuntimeTemplate = {
-        path: path.join(rootPath, 'template.yaml'),
-        item: {
-            Resources: {
-                badResource: {
-                    ...matchingResource,
-                    Properties: {
-                        ...matchingResource.Properties,
-                        Runtime: 'COBOL-60',
-                    },
-                },
-                goodResource: matchingResource,
-            },
-        },
-    }
-
-    describe('getResourcesForHandler', function () {
-        it('handles empty input', function () {
-            // Empty `unfilteredTemplates` input:
-            assert.deepStrictEqual(
-                getResourcesForHandler(path.join(rootPath, nestedPath, 'index.js'), 'handler', []),
-                []
-            )
-        })
-
-        it('returns an array containing resources that contain references to the handler in question', function () {
-            const val = getResourcesForHandler(path.join(rootPath, nestedPath, 'index.js'), 'handler', [
-                nonParentTemplate,
-                workingTemplate,
-                noResourceTemplate,
-                dotNetTemplate,
-                multiResourceTemplate,
-                badRuntimeTemplate,
-            ])
-
-            assert.deepStrictEqual(val, [
-                {
-                    name: 'resource1',
-                    resourceData: matchingResource,
-                    templateDatum: workingTemplate,
-                },
-                {
-                    name: 'resource1',
-                    resourceData: matchingResource,
-                    templateDatum: multiResourceTemplate,
-                },
-                {
-                    name: 'resource2',
-                    resourceData: {
-                        ...matchingResource,
-                        Properties: {
-                            ...matchingResource.Properties,
-                            Timeout: 5000,
-                        },
-                    },
-                    templateDatum: multiResourceTemplate,
-                },
-                {
-                    name: 'goodResource',
-                    resourceData: matchingResource,
-                    templateDatum: badRuntimeTemplate,
-                },
-            ])
-        })
-    })
-
-    describe('getResourcesForHandlerFromTemplateDatum', function () {
-        it('returns an empty array if the given template is not a parent of the handler file in question', function () {
-            const val = getResourcesForHandlerFromTemplateDatum(
-                path.join(rootPath, 'index.js'),
-                'handler',
-                nonParentTemplate
-            )
-
-            assert.deepStrictEqual(val, [])
-        })
-
-        it('returns an empty array if the template has no resources', function () {
-            const val = getResourcesForHandlerFromTemplateDatum(
-                path.join(rootPath, nestedPath, 'index.js'),
-                'handler',
-                noResourceTemplate
-            )
-
-            assert.deepStrictEqual(val, [])
-        })
-
-        it('returns a template resource if it has a matching handler', function () {
-            const val = getResourcesForHandlerFromTemplateDatum(
-                path.join(rootPath, nestedPath, 'index.js'),
-                'handler',
-                workingTemplate
-            )
-
-            assert.deepStrictEqual(val, [
-                {
-                    name: 'resource1',
-                    resourceData: matchingResource,
-                },
-            ])
-        })
-
-        it('ignores path handling if using a compiled language', function () {
-            const val = getResourcesForHandlerFromTemplateDatum(
-                path.join(rootPath, nestedPath, 'index.cs'),
-                'Asdf::Asdf.Function::FunctionHandler',
-                dotNetTemplate
-            )
-
-            assert.deepStrictEqual(val, [
-                {
-                    name: 'resource1',
-                    resourceData: compiledResource,
-                },
-            ])
-        })
-
-        it('returns all template resources if it has multiple matching handlers', function () {
-            const val = getResourcesForHandlerFromTemplateDatum(
-                path.join(rootPath, nestedPath, 'index.js'),
-                'handler',
-                multiResourceTemplate
-            )
-
-            assert.deepStrictEqual(val, [
-                {
-                    name: 'resource1',
-                    resourceData: matchingResource,
-                },
-                {
-                    name: 'resource2',
-                    resourceData: {
-                        ...matchingResource,
-                        Properties: {
-                            ...matchingResource.Properties,
-                            Timeout: 5000,
-                        },
-                    },
-                },
-            ])
-        })
-
-        it('does not break if the resource has a non-parseable runtime', function () {
-            const val = getResourcesForHandlerFromTemplateDatum(
-                path.join(rootPath, nestedPath, 'index.js'),
-                'handler',
-                badRuntimeTemplate
-            )
-
-            assert.deepStrictEqual(val, [
-                {
-                    name: 'goodResource',
-                    resourceData: matchingResource,
-                },
-            ])
-        })
-    })
-
-    describe('getResourcesForHandlerFromTemplateDatum (image tests)', async function () {
-        let tempFolder: string
-        let helloPath: string
-        let nestedPath: string
-
-        beforeEach(async function () {
-            tempFolder = await makeTemporaryToolkitFolder()
-            helloPath = path.join(tempFolder, 'hello-world')
-            nestedPath = path.join(helloPath, 'nested')
-        })
-
-        afterEach(async function () {
-            await fs.remove(tempFolder)
-        })
-
-        const resource: {
-            Type: 'AWS::Serverless::Function'
-            Properties: CloudFormation.ImageResourceProperties
-        } = {
-            Type: 'AWS::Serverless::Function',
-            Properties: {
-                PackageType: 'Image',
-                Events: {
-                    HelloWorld: {
-                        Type: 'Api',
-                        Properties: {
-                            Path: '/hello',
-                            Method: 'get',
-                        },
-                    },
-                },
-            },
-        }
-
-        it('checks for an exact handler match to a relative path in a Dockerfile for image functions', async function () {
-            toFile('CMD: ["index.handler"]', path.join(helloPath, 'Dockerfile'))
-            toFile('CMD: ["index.handler"]', path.join(nestedPath, 'Dockerfile'))
-
-            const helloWorldResource = {
-                ...resource,
-                ...{
-                    Metadata: {
-                        DockerTag: 'nodejs12.x-v1',
-                        DockerContext: './hello-world',
-                        Dockerfile: 'Dockerfile',
-                    },
-                },
-            }
-
-            const helloWorldNestedResource = {
-                ...resource,
-                ...{
-                    Metadata: {
-                        DockerTag: 'nodejs12.x-v1',
-                        DockerContext: './hello-world/nested',
-                        Dockerfile: 'Dockerfile',
-                    },
-                },
-            }
-
-            const template = {
-                path: path.join(tempFolder, 'template.yaml'),
-                item: {
-                    Resources: {
-                        helloWorldResource,
-                        helloWorldNestedResource,
-                    },
-                },
-            }
-            const val = getResourcesForHandlerFromTemplateDatum(
-                path.join(helloPath, 'index.js'),
-                'index.handler',
-                template
-            )
-
-            assert.deepStrictEqual(
-                val,
-                [
-                    {
-                        name: 'helloWorldResource',
-                        resourceData: helloWorldResource,
-                    },
-                ],
-                'non-nested case failed'
-            )
-
-            const val2 = getResourcesForHandlerFromTemplateDatum(
-                path.join(nestedPath, 'index.js'),
-                'index.handler',
-                template
-            )
-
-            assert.deepStrictEqual(
-                val2,
-                [
-                    {
-                        name: 'helloWorldNestedResource',
-                        resourceData: helloWorldNestedResource,
-                    },
-                ],
-                'nested case failed'
-            )
-        })
-
-        it('checks for an exact handler match for C# files in a Dockerfile for image functions', async function () {
-            toFile('CMD: ["HelloWorld::HelloWorld.Function::FunctionHandler"]', path.join(helloPath, 'Dockerfile'))
-            toFile('CMD: ["HelloWorld::HelloWorld.Function::FunctionHandler"]', path.join(nestedPath, 'Dockerfile'))
-
-            const helloWorldResource = {
-                ...resource,
-                ...{
-                    Metadata: {
-                        DockerTag: 'dotnetcore3.1-v1',
-                        DockerContext: './hello-world',
-                        Dockerfile: 'Dockerfile',
-                        DockerBuildArgs: {
-                            SAM_BUILD_MODE: 'run',
-                        },
-                    },
-                },
-            }
-
-            const helloWorldNestedResource = {
-                ...resource,
-                ...{
-                    Metadata: {
-                        DockerTag: 'dotnetcore3.1-v1',
-                        DockerContext: './hello-world/nested',
-                        Dockerfile: 'Dockerfile',
-                        DockerBuildArgs: {
-                            SAM_BUILD_MODE: 'run',
-                        },
-                    },
-                },
-            }
-
-            const template = {
-                path: path.join(tempFolder, 'template.yaml'),
-                item: {
-                    Resources: {
-                        helloWorldResource,
-                        helloWorldNestedResource,
-                    },
-                },
-            }
-            const val = getResourcesForHandlerFromTemplateDatum(
-                path.join(helloPath, 'HelloWorld.cs'),
-                'HelloWorld::HelloWorld.Function::FunctionHandler',
-                template
-            )
-
-            assert.deepStrictEqual(
-                val,
-                [
-                    {
-                        name: 'helloWorldResource',
-                        resourceData: helloWorldResource,
-                    },
-                ],
-                'non-nested case failed'
-            )
-
-            const val2 = getResourcesForHandlerFromTemplateDatum(
-                path.join(nestedPath, 'HelloWorld.cs'),
-                'HelloWorld::HelloWorld.Function::FunctionHandler',
-                template
-            )
-
-            // checks all Dockerfiles in parent paths
-            assert.deepStrictEqual(
-                val2,
-                [
-                    {
-                        name: 'helloWorldResource',
-                        resourceData: helloWorldResource,
-                    },
-                    {
-                        name: 'helloWorldNestedResource',
-                        resourceData: helloWorldNestedResource,
-                    },
-                ],
-                'nested case failed'
-            )
-        })
-    })
-})
-
-function assertValidTestTemplate(data: WatchedItem<CloudFormation.Template> | undefined, filename: string): void {
-    assert.ok(data)
-    if (data) {
-        assertEqualPaths(data.path, filename)
-        assert.ok(data.item.Resources?.TestResource)
-    }
-}
diff --git a/src/test/shared/icons.test.ts b/src/test/shared/icons.test.ts
deleted file mode 100644
index 71d7120a33f..00000000000
--- a/src/test/shared/icons.test.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as fs from 'fs-extra'
-import * as path from 'path'
-import { Uri, ThemeIcon } from 'vscode'
-import { codicon, getIcon } from '../../shared/icons'
-import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../../shared/filesystemUtilities'
-
-describe('getIcon', function () {
-    it('returns a ThemeIcon for `vscode` codicons', function () {
-        const icon = getIcon('vscode-gear', false)
-
-        assert.ok(icon instanceof ThemeIcon)
-        assert.strictEqual(icon.id, 'gear')
-    })
-
-    it('returns a ThemeIcon for `aws` icons', function () {
-        const icon = getIcon('aws-cdk-logo', false)
-
-        assert.ok(icon instanceof ThemeIcon)
-        assert.strictEqual(icon.id, 'aws-cdk-logo')
-    })
-
-    it('returns icon URIs for non-codicon icons', function () {
-        const icon = getIcon('vscode-help', false)
-
-        assert.ok(!(icon instanceof ThemeIcon))
-        assert.ok(icon.dark.path.endsWith('/resources/icons/vscode/dark/help.svg'))
-        assert.ok(icon.light.path.endsWith('/resources/icons/vscode/light/help.svg'))
-    })
-
-    it('can use specific icons for Cloud9', function () {
-        const icon = getIcon('vscode-help', true)
-
-        assert.ok(!(icon instanceof ThemeIcon))
-        assert.ok(icon.dark.path.endsWith('/resources/icons/cloud9/dark/vscode-help.svg'))
-        assert.ok(icon.light.path.endsWith('/resources/icons/cloud9/light/vscode-help.svg'))
-    })
-
-    it('can use generated icons for Cloud9', function () {
-        const icon = getIcon('aws-cdk-logo', true)
-
-        assert.ok(!(icon instanceof ThemeIcon))
-        assert.ok(icon.dark.path.endsWith('/resources/icons/cloud9/generated/dark/aws-cdk-logo.svg'))
-        assert.ok(icon.light.path.endsWith('/resources/icons/cloud9/generated/light/aws-cdk-logo.svg'))
-    })
-
-    it('can use codicons for Cloud9', function () {
-        const icon = getIcon('vscode-gear', true)
-
-        assert.ok(!(icon instanceof ThemeIcon))
-        assert.ok(icon.dark.path.endsWith('/resources/icons/cloud9/generated/dark/vscode-gear.svg'))
-        assert.ok(icon.light.path.endsWith('/resources/icons/cloud9/generated/light/vscode-gear.svg'))
-    })
-
-    it('can use overrides for contributed icons', async function () {
-        const tempDir = await makeTemporaryToolkitFolder()
-
-        const paths = [
-            path.join(tempDir, 'aws', 'cdk', 'logo.svg'),
-            path.join(tempDir, 'aws', 'dark', 'cdk-logo.svg'),
-            path.join(tempDir, 'aws', 'light', 'cdk-logo.svg'),
-        ]
-
-        try {
-            for (const p of paths) {
-                await fs.mkdirp(path.dirname(p))
-                await fs.writeFile(p, '<svg></svg>')
-            }
-
-            const icon = getIcon('aws-cdk-logo', false, tempDir)
-
-            assert.ok(!(icon instanceof ThemeIcon))
-            assert.strictEqual(icon.dark.fsPath, Uri.file(paths[1]).fsPath)
-            assert.strictEqual(icon.light.fsPath, Uri.file(paths[2]).fsPath)
-        } finally {
-            await tryRemoveFolder(tempDir)
-        }
-    })
-
-    it('provides the icon source if available', async function () {
-        const tempDir = await makeTemporaryToolkitFolder()
-        const logoPath = path.join(tempDir, 'aws', 'cdk', 'logo.svg')
-
-        try {
-            await fs.mkdirp(path.dirname(logoPath))
-            await fs.writeFile(logoPath, '<svg></svg>')
-
-            const icon = getIcon('aws-cdk-logo', false, tempDir)
-
-            assert.ok(icon instanceof ThemeIcon)
-            assert.strictEqual(icon.source?.fsPath, Uri.file(logoPath).fsPath)
-        } finally {
-            await tryRemoveFolder(tempDir)
-        }
-    })
-})
-
-describe('codicon', function () {
-    it('inserts icon ids', function () {
-        const result = codicon`my icon: ${getIcon('vscode-gear')}`
-        assert.strictEqual(result, 'my icon: $(gear)')
-    })
-
-    it('skips adding icons if no icon font is available', function () {
-        const result = codicon`my icon: ${getIcon('vscode-help')}`
-        assert.strictEqual(result, 'my icon:')
-    })
-
-    it('trims the resulting string', function () {
-        const result = codicon`  some text ${getIcon('vscode-help')}      `
-        assert.strictEqual(result, 'some text')
-    })
-})
diff --git a/src/test/shared/logger/activation.test.ts b/src/test/shared/logger/activation.test.ts
deleted file mode 100644
index 3f265ee9879..00000000000
--- a/src/test/shared/logger/activation.test.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as fs from 'fs-extra'
-import { join } from 'path'
-import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
-import { Logger } from '../../../shared/logger'
-import { makeLogger } from '../../../shared/logger/activation'
-import { WinstonToolkitLogger } from '../../../shared/logger/winstonToolkitLogger'
-
-describe('makeLogger', function () {
-    let tempFolder: string
-    let testLogger: Logger | undefined
-
-    before(async function () {
-        tempFolder = await makeTemporaryToolkitFolder()
-        testLogger = makeLogger({ staticLogLevel: 'debug', logPaths: [join(tempFolder, 'log.txt')] })
-    })
-
-    after(async function () {
-        if (testLogger && testLogger instanceof WinstonToolkitLogger) {
-            testLogger.dispose()
-        }
-
-        testLogger = undefined
-        await fs.remove(tempFolder)
-    })
-
-    it('creates a logger object', function () {
-        assert.notStrictEqual(testLogger, undefined)
-        assert.ok(testLogger instanceof WinstonToolkitLogger)
-    })
-})
diff --git a/src/test/shared/logger/util.test.ts b/src/test/shared/logger/util.test.ts
deleted file mode 100644
index 2cf575573ed..00000000000
--- a/src/test/shared/logger/util.test.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as fs from 'fs-extra'
-import * as path from 'path'
-import * as assert from 'assert'
-import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
-import { cleanLogFiles } from '../../../shared/logger/util'
-
-describe('cleanLogFiles', function () {
-    let logDir: string
-    const testParameters = {
-        maxLogs: 5,
-        maxFileSize: 100,
-        maxKeptLogs: 4,
-        minKeptLogs: 2,
-    }
-
-    beforeEach(async function () {
-        logDir = await makeTemporaryToolkitFolder()
-    })
-
-    afterEach(async function () {
-        await fs.remove(logDir)
-    })
-
-    const makeLogName = (id: number) => `log-${id}.log`
-    const createNames = (count: number) =>
-        Array(count)
-            .fill(0)
-            .map((_, i) => makeLogName(i))
-    async function populate(names: string[], content: string = '') {
-        await Promise.all(names.map(f => fs.writeFile(path.join(logDir, f), content)))
-    }
-
-    async function assertLogs(expected: string[]) {
-        const logs = await fs.readdir(logDir)
-        assert.strictEqual(logs.length, expected.length)
-        logs.sort().forEach((f, i) => assert.strictEqual(f, expected[i]))
-    }
-
-    it('keeps logs if not at the max', async function () {
-        const names = createNames(testParameters.maxKeptLogs)
-        await populate(names)
-        await cleanLogFiles(logDir, testParameters)
-        await assertLogs(createNames(testParameters.maxKeptLogs))
-    })
-
-    it("cleans up old logs when there's too many", async function () {
-        const count = testParameters.maxLogs + 1
-        const names = createNames(count)
-        await populate(names)
-        await cleanLogFiles(logDir, testParameters)
-        await assertLogs(names.slice(count - testParameters.maxKeptLogs))
-    })
-
-    it("deletes logs if they're too big", async function () {
-        const names = createNames(2)
-        await populate([names[0]], Buffer.alloc(testParameters.maxFileSize + 1).toString())
-        await populate([names[1]])
-        await cleanLogFiles(logDir, testParameters)
-        await assertLogs(names.slice(1))
-    })
-
-    it('deletes logs down to the minimum for big directories', async function () {
-        const names = createNames(5)
-        await populate(names, Buffer.alloc(25).toString())
-        await cleanLogFiles(logDir, testParameters)
-        await assertLogs(names.slice(3))
-    })
-})
diff --git a/src/test/shared/logger/winstonToolkitLogger.test.ts b/src/test/shared/logger/winstonToolkitLogger.test.ts
deleted file mode 100644
index 0113ba27e48..00000000000
--- a/src/test/shared/logger/winstonToolkitLogger.test.ts
+++ /dev/null
@@ -1,388 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as fs from 'fs-extra'
-import * as assert from 'assert'
-import * as path from 'path'
-import * as filesystemUtilities from '../../../shared/filesystemUtilities'
-import * as vscode from 'vscode'
-import { WinstonToolkitLogger } from '../../../shared/logger/winstonToolkitLogger'
-import { MockOutputChannel } from '../../mockOutputChannel'
-import { waitUntil } from '../../../shared/utilities/timeoutUtils'
-
-/**
- * Disposes the logger then waits for the write streams to flush. The `expected` and `unexpected` arrays just look
- * for any occurence within the file, passing if all expected strings were found or failing if any unexpected strings
- * were found.
- */
-async function checkFile(
-    logger: WinstonToolkitLogger,
-    logPath: string,
-    expected: string[],
-    unexpected: string[] = []
-): Promise<void> {
-    const check = new Promise<void>((resolve, reject) => {
-        const watcher = fs.watch(path.dirname(logPath), {}, (_, name) => {
-            if (name === path.basename(logPath)) {
-                checkText()
-            }
-        })
-
-        function checkText() {
-            const contents = fs.readFileSync(logPath)
-            const errorMsg = unexpected
-                .filter(t => contents.includes(t))
-                .reduce((a, b) => a + `Unexpected message in log: ${b}\n`, '')
-
-            if (errorMsg) {
-                watcher.close()
-                return reject(new Error(errorMsg))
-            }
-
-            expected = expected.filter(t => !contents.includes(t))
-            if (expected.length === 0) {
-                watcher.close()
-                resolve()
-            }
-        }
-
-        setTimeout(() => reject(new Error('Timed out waiting for log message')), 10000)
-    })
-
-    return logger.dispose().then(() => check)
-}
-
-describe('WinstonToolkitLogger', function () {
-    let tempFolder: string
-
-    before(async function () {
-        tempFolder = await filesystemUtilities.makeTemporaryToolkitFolder()
-    })
-
-    after(async function () {
-        await filesystemUtilities.tryRemoveFolder(tempFolder)
-    })
-
-    it('logLevelEnabled()', function () {
-        const logger = new WinstonToolkitLogger('info')
-        // winston complains if we don't log to something
-        logger.logToOutputChannel(new MockOutputChannel(), false)
-
-        assert.strictEqual(true, logger.logLevelEnabled('error'))
-        assert.strictEqual(true, logger.logLevelEnabled('warn'))
-        assert.strictEqual(true, logger.logLevelEnabled('info'))
-        assert.strictEqual(false, logger.logLevelEnabled('verbose'))
-        assert.strictEqual(false, logger.logLevelEnabled('debug'))
-
-        logger.setLogLevel('error')
-        assert.strictEqual(true, logger.logLevelEnabled('error'))
-        assert.strictEqual(false, logger.logLevelEnabled('warn'))
-        assert.strictEqual(false, logger.logLevelEnabled('info'))
-        assert.strictEqual(false, logger.logLevelEnabled('verbose'))
-        assert.strictEqual(false, logger.logLevelEnabled('debug'))
-
-        logger.setLogLevel('debug')
-        assert.strictEqual(true, logger.logLevelEnabled('error'))
-        assert.strictEqual(true, logger.logLevelEnabled('warn'))
-        assert.strictEqual(true, logger.logLevelEnabled('info'))
-        assert.strictEqual(true, logger.logLevelEnabled('verbose'))
-        assert.strictEqual(true, logger.logLevelEnabled('debug'))
-    })
-
-    it('creates an object', function () {
-        assert.notStrictEqual(new WinstonToolkitLogger('info'), undefined)
-    })
-
-    it('throws when logging to a disposed object', async function () {
-        const logger = new WinstonToolkitLogger('info')
-        logger.dispose()
-
-        assert.throws(() => logger.info('This should not log'))
-    })
-
-    const happyLogScenarios = [
-        {
-            name: 'logs debug',
-            logMessage: (logger: WinstonToolkitLogger, message: string) => {
-                logger.debug(message)
-            },
-        },
-        {
-            name: 'logs verbose',
-            logMessage: (logger: WinstonToolkitLogger, message: string) => {
-                logger.verbose(message)
-            },
-        },
-        {
-            name: 'logs info',
-            logMessage: (logger: WinstonToolkitLogger, message: string) => {
-                logger.info(message)
-            },
-        },
-        {
-            name: 'logs warn',
-            logMessage: (logger: WinstonToolkitLogger, message: string) => {
-                logger.warn(message)
-            },
-        },
-        {
-            name: 'logs error',
-            logMessage: (logger: WinstonToolkitLogger, message: string) => {
-                logger.error(message)
-            },
-        },
-    ]
-
-    describe('logs to a file', async function () {
-        let tempLogPath: string
-        let tempFileCounter = 0
-        let testLogger: WinstonToolkitLogger | undefined
-
-        beforeEach(async function () {
-            tempLogPath = path.join(tempFolder, `temp-${++tempFileCounter}.log`)
-        })
-
-        it('does not log a lower level', async function () {
-            const debugMessage = 'debug message'
-            const errorMessage = 'error message'
-
-            testLogger = new WinstonToolkitLogger('error')
-            testLogger.logToFile(tempLogPath)
-
-            testLogger.debug(debugMessage)
-            testLogger.error(errorMessage)
-
-            await checkFile(testLogger, tempLogPath, [errorMessage], [debugMessage])
-        })
-
-        it('supports updating the log type', async function () {
-            const nonLoggedVerboseEntry = 'verbose entry should not be logged'
-            const loggedVerboseEntry = 'verbose entry should be logged'
-
-            testLogger = new WinstonToolkitLogger('info')
-            testLogger.logToFile(tempLogPath)
-
-            testLogger.verbose(nonLoggedVerboseEntry)
-            testLogger.setLogLevel('verbose')
-            testLogger.verbose(loggedVerboseEntry)
-
-            await checkFile(testLogger, tempLogPath, [loggedVerboseEntry], [nonLoggedVerboseEntry])
-        })
-
-        happyLogScenarios.forEach(scenario => {
-            it(scenario.name, async () => {
-                const message = `message for ${scenario.name}`
-                testLogger = new WinstonToolkitLogger('debug')
-                testLogger.logToFile(tempLogPath)
-
-                scenario.logMessage(testLogger, message)
-
-                await checkFile(testLogger, tempLogPath, [message])
-            })
-        })
-    })
-
-    describe('logs to an OutputChannel', async function () {
-        let testLogger: WinstonToolkitLogger | undefined
-        let outputChannel: MockOutputChannel
-
-        beforeEach(async function () {
-            outputChannel = new MockOutputChannel()
-        })
-
-        afterEach(async function () {
-            if (testLogger) {
-                testLogger.dispose()
-                testLogger = undefined
-            }
-        })
-
-        it('does not log a lower level', async function () {
-            const debugMessage = 'debug message'
-            const errorMessage = 'error message'
-
-            testLogger = new WinstonToolkitLogger('error')
-            testLogger.logToOutputChannel(outputChannel, false)
-
-            const waitForMessage = waitForLoggedTextByCount(1)
-
-            testLogger.debug(debugMessage)
-            testLogger.error(errorMessage)
-
-            assert.ok((await waitForMessage).includes(errorMessage), 'Expected error message to be logged')
-        })
-
-        it('supports updating the log type', async function () {
-            const nonLoggedVerboseEntry = 'verbose entry should not be logged'
-            const loggedVerboseEntry = 'verbose entry should be logged'
-
-            testLogger = new WinstonToolkitLogger('info')
-            testLogger.logToOutputChannel(outputChannel, false)
-
-            testLogger.verbose(nonLoggedVerboseEntry)
-            testLogger.setLogLevel('verbose')
-            testLogger.verbose(loggedVerboseEntry)
-
-            const waitForMessage = waitForLoggedTextByContents(loggedVerboseEntry)
-            assert.ok((await waitForMessage).includes(loggedVerboseEntry), 'Expected error message to be logged')
-            assert.ok(!(await waitForMessage).includes(nonLoggedVerboseEntry), 'unexpected message in log')
-        })
-
-        happyLogScenarios.forEach(scenario => {
-            it(scenario.name, async () => {
-                const message = `message for ${scenario.name}`
-                testLogger = new WinstonToolkitLogger('debug')
-                testLogger.logToOutputChannel(outputChannel, false)
-
-                const waitForMessage = waitForLoggedTextByCount(1)
-
-                scenario.logMessage(testLogger, message)
-
-                assert.ok((await waitForMessage).includes(message), 'Expected error message to be logged')
-            })
-        })
-
-        // Logger writes to OutputChannel in async manner.
-        async function waitForLoggedTextByCount(entries: number): Promise<string> {
-            return new Promise<string>((resolve, reject) => {
-                let loggedEntries = 0
-                let loggedText = ''
-
-                const appendTextEvent = outputChannel.onDidAppendText(text => {
-                    loggedText += text
-                    loggedEntries++
-
-                    if (loggedEntries >= entries) {
-                        appendTextEvent.dispose()
-                        resolve(loggedText)
-                    }
-                })
-            })
-        }
-
-        // Logger writes to OutputChannel in async manner.
-        async function waitForLoggedTextByContents(expectedText: string): Promise<string> {
-            return new Promise<string>((resolve, reject) => {
-                let loggedText = ''
-
-                const appendTextEvent = outputChannel.onDidAppendText(text => {
-                    loggedText += text
-
-                    if (text.includes(expectedText)) {
-                        appendTextEvent.dispose()
-                        resolve(loggedText)
-                    }
-                })
-            })
-        }
-    })
-
-    // Log tracking functionality testing
-    describe('log tracking', function () {
-        let tempLogPath: string
-        let tempFileCounter: number = 0
-        let testLogger: WinstonToolkitLogger
-
-        beforeEach(async function () {
-            testLogger = new WinstonToolkitLogger('info')
-            tempLogPath = path.join(tempFolder, `temp-tracker-${tempFileCounter++}.log`)
-            testLogger.logToFile(tempLogPath)
-        })
-
-        afterEach(function () {
-            testLogger.dispose()
-        })
-
-        it('get info log message', async function () {
-            const logID: number = testLogger.info('test')
-            await checkFile(testLogger, tempLogPath, ['test'])
-            assert.notStrictEqual(testLogger.getLogById(logID, vscode.Uri.file(tempLogPath)), undefined)
-        })
-
-        it('debug log message is undefined', async function () {
-            const logID: number = testLogger.debug('debug test')
-            await checkFile(testLogger, tempLogPath, [], ['debug test'])
-            assert.strictEqual(testLogger.getLogById(logID, vscode.Uri.file(tempLogPath)), undefined)
-        })
-
-        it('retrieve multiple unique logs with other logs', async function () {
-            const idMap = new Map<number, string>()
-            const expected: string[] = []
-            const unexpected: string[] = []
-
-            for (let i = 0; i < 5; i++) {
-                const logInfo = `log ${i}`
-                const logError = `error log ${i}`
-                const logDebug = `debug log ${i}`
-                expected.push(logInfo, logError)
-                unexpected.push(logDebug)
-                testLogger.error(logError)
-                testLogger.debug(logDebug)
-                idMap.set(testLogger.info(logInfo), logInfo)
-            }
-
-            await checkFile(testLogger, tempLogPath, expected, unexpected)
-            idMap.forEach((msg, id) =>
-                assert.ok(testLogger.getLogById(id, vscode.Uri.file(tempLogPath))?.includes(msg))
-            )
-        })
-
-        it('can find log from multiple files', async function () {
-            const logIDs: number[] = []
-            const filePaths: string[] = []
-            const expected: string[] = []
-
-            // Make a bunch of files
-            for (let i = 0; i < 4; i++) {
-                tempLogPath = path.join(tempFolder, `temp-tracker-${tempFileCounter++}.log`)
-                testLogger.logToFile(tempLogPath)
-                filePaths.push(tempLogPath)
-            }
-
-            for (let i = 0; i < 10; i++) {
-                const errorLog = `error message ${i}`
-                logIDs.push(testLogger.error(errorLog))
-                expected.push(errorLog)
-            }
-
-            await Promise.all(filePaths.map(log => checkFile(testLogger, log, expected)))
-
-            const middleFile: string = filePaths[Math.floor(filePaths.length / 2)]
-            const middleMsg = testLogger.getLogById(logIDs[Math.floor(logIDs.length / 2)], vscode.Uri.file(middleFile))
-            assert.notStrictEqual(middleMsg, undefined)
-        })
-
-        it('can find log from channel', async function () {
-            const outputChannel: MockOutputChannel = new MockOutputChannel()
-            testLogger.logToOutputChannel(outputChannel, true)
-            const logID: number = testLogger.error('Test error')
-
-            const msg: string | undefined = await waitUntil(
-                async () => testLogger.getLogById(logID, vscode.Uri.parse(`channel://${outputChannel.name}`)),
-                { timeout: 2000, interval: 5, truthy: false }
-            )
-
-            assert.notStrictEqual(msg, undefined)
-        })
-
-        it('invalid log id raises exception', async function () {
-            // Log ID counter will be at 3 after these
-            testLogger.error('error log')
-            testLogger.debug('debug log')
-
-            assert.throws(
-                () => testLogger.getLogById(-1, vscode.Uri.file('')),
-                Error,
-                'Invalid log state, logID=-1 must be in the range [0, 3)!'
-            )
-
-            assert.throws(
-                () => testLogger.getLogById(3, vscode.Uri.file('')),
-                Error,
-                'Invalid log state, logID=3 must be in the range [0, 3)!'
-            )
-        })
-    })
-})
diff --git a/src/test/shared/regions/endpointsProvider.test.ts b/src/test/shared/regions/endpointsProvider.test.ts
deleted file mode 100644
index c19c2e90282..00000000000
--- a/src/test/shared/regions/endpointsProvider.test.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { EndpointsProvider } from '../../../shared/regions/endpointsProvider'
-import { ResourceFetcher } from '../../../shared/resourcefetcher/resourcefetcher'
-
-describe('EndpointsProvider', async function () {
-    const data1 = '{}'
-    const data2 = JSON.stringify({
-        partitions: [
-            {
-                partition: 'aws',
-                partitionName: 'Standard',
-            },
-        ],
-    })
-
-    const fetcher1: ResourceFetcher = {
-        get: async () => data1,
-    }
-
-    const fetcher2: ResourceFetcher = {
-        get: async () => data2,
-    }
-
-    const undefinedFetcher: ResourceFetcher = {
-        get: async () => undefined,
-    }
-
-    it('loads from local fetcher', async function () {
-        const provider = new EndpointsProvider(fetcher1, undefinedFetcher)
-        const endpoints = await provider.load()
-
-        assert.strictEqual(endpoints.partitions.length, 0)
-    })
-
-    it('loads from remote fetcher', async function () {
-        const provider = new EndpointsProvider(undefinedFetcher, fetcher2)
-        const endpoints = await provider.load()
-
-        assert.strictEqual(endpoints.partitions.length, 1)
-    })
-
-    it('prefers remote fetcher over local fetcher', async function () {
-        const provider = new EndpointsProvider(fetcher1, fetcher2)
-        const endpoints = await provider.load()
-
-        assert.strictEqual(endpoints.partitions.length, 1)
-    })
-})
diff --git a/src/test/shared/regions/regionProvider.test.ts b/src/test/shared/regions/regionProvider.test.ts
deleted file mode 100644
index bea3b044132..00000000000
--- a/src/test/shared/regions/regionProvider.test.ts
+++ /dev/null
@@ -1,198 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { RegionProvider } from '../../../shared/regions/regionProvider'
-import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
-import { createRegionPrompter } from '../../../shared/ui/common/region'
-import { FakeMemento } from '../../fakeExtensionContext'
-import { createQuickPickTester } from '../ui/testUtils'
-
-const regionCode = 'someRegion'
-const serviceId = 'someService'
-const endpoints = {
-    partitions: [
-        {
-            dnsSuffix: 'totallyLegit.tld',
-            id: 'aws',
-            name: 'AWS',
-            regions: [
-                {
-                    id: regionCode,
-                    name: 'Some Region',
-                },
-            ],
-            services: [
-                {
-                    id: serviceId,
-                    endpoints: [
-                        {
-                            regionId: regionCode,
-                            data: {},
-                        },
-                    ],
-                },
-            ],
-        },
-        {
-            dnsSuffix: 'totallyLegit.cn',
-            id: 'aws-cn',
-            name: 'China',
-            regions: [
-                {
-                    id: 'awscnregion1',
-                    name: '',
-                    description: 'aws-cn region one',
-                },
-            ],
-            services: [],
-        },
-    ],
-}
-
-describe('RegionProvider', async function () {
-    describe('isServiceInRegion', async function () {
-        it('indicates when a service is in a region', async function () {
-            const regionProvider = new RegionProvider(endpoints)
-
-            assert.ok(regionProvider.isServiceInRegion(serviceId, regionCode), 'Expected service to be in region')
-        })
-
-        it('indicates when a service is not in a region', async function () {
-            const regionProvider = new RegionProvider(endpoints)
-
-            assert.ok(
-                !regionProvider.isServiceInRegion(`${serviceId}x`, regionCode),
-                'Expected service not to be in region'
-            )
-        })
-    })
-
-    describe('getDnsSuffixForRegion', async function () {
-        let regionProvider: RegionProvider
-
-        beforeEach(async function () {
-            regionProvider = new RegionProvider(endpoints)
-        })
-
-        it('gets DNS suffix for a known region', async function () {
-            const partitionId = regionProvider.getDnsSuffixForRegion(regionCode)
-            assert.strictEqual(partitionId, 'totallyLegit.tld')
-        })
-
-        it('returns undefined for an unknown region', async function () {
-            const partitionId = regionProvider.getDnsSuffixForRegion('foo')
-            assert.strictEqual(partitionId, undefined)
-        })
-    })
-
-    describe('getPartitionId', async function () {
-        let regionProvider: RegionProvider
-
-        beforeEach(async function () {
-            regionProvider = new RegionProvider(endpoints)
-        })
-
-        it('gets partition for a known region', async function () {
-            const partitionId = regionProvider.getPartitionId('awscnregion1')
-            assert.strictEqual(partitionId, 'aws-cn')
-        })
-
-        it('returns undefined for an unknown region', async function () {
-            const partitionId = regionProvider.getPartitionId('foo')
-            assert.strictEqual(partitionId, undefined)
-        })
-    })
-
-    describe('getRegions', async function () {
-        let regionProvider: RegionProvider
-
-        beforeEach(async function () {
-            regionProvider = new RegionProvider(endpoints)
-        })
-
-        it('gets regions for a known partition', async function () {
-            const regions = regionProvider.getRegions('aws')
-            assert.deepStrictEqual(regions, [{ id: 'someRegion', name: 'Some Region' }])
-        })
-
-        it('returns empty array for an unknown partition', async function () {
-            const regions = regionProvider.getRegions('foo')
-            assert.strictEqual(regions?.length, 0, 'Unexpected regions returned')
-        })
-    })
-
-    describe('updateExplorerRegions', function () {
-        let regionProvider: RegionProvider
-
-        beforeEach(function () {
-            regionProvider = new RegionProvider(endpoints, new FakeMemento())
-        })
-
-        it('remembers saved regions', async function () {
-            assert.deepStrictEqual(regionProvider.getExplorerRegions(), [])
-            await regionProvider.updateExplorerRegions(['foo', 'bar'])
-            assert.deepStrictEqual(regionProvider.getExplorerRegions(), ['foo', 'bar'])
-        })
-
-        it('removes duplicate regions', async function () {
-            await regionProvider.updateExplorerRegions(['foo', 'bar', 'foo'])
-            assert.deepStrictEqual(regionProvider.getExplorerRegions(), ['foo', 'bar'])
-        })
-    })
-
-    describe('guessDefaultRegion', function () {
-        it('sets default region to last region from prompter', async function () {
-            const regionProvider = new RegionProvider()
-            const originalRegion = regionProvider.guessDefaultRegion()
-
-            const regions = [
-                { id: 'us-west-2', name: 'PDX' },
-                { id: 'us-east-1', name: 'IAD' },
-                { id: 'foo-bar-1', name: 'FOO' },
-            ]
-
-            const p = createRegionPrompter(regions, { defaultRegion: 'foo-bar-1' })
-            const tester = createQuickPickTester(p)
-            const selection = regions[2]
-            tester.acceptItem(selection.name)
-            await tester.result(selection)
-
-            const newRegion = regionProvider.guessDefaultRegion()
-            assert.notStrictEqual(
-                originalRegion,
-                newRegion,
-                `Region Prompter failed to update value of guessDefaultRegion from ${originalRegion}.`
-            )
-            assert.strictEqual(
-                newRegion,
-                selection.id,
-                `guessDefaultRegion gave region ${newRegion} while selection is region ${selection.id}`
-            )
-        })
-
-        it('prioritizes the AWS explorer region if there is only one', async function () {
-            const regionProvider = new RegionProvider(endpoints, new FakeMemento())
-            await regionProvider.updateExplorerRegions(['us-east-2'])
-            regionProvider.setLastTouchedRegion('us-west-1')
-            assert.strictEqual(regionProvider.guessDefaultRegion(), 'us-east-2')
-        })
-
-        it('chooses AWS node region when more than one exists in explorer', async function () {
-            const regionProvider = new RegionProvider(endpoints, new FakeMemento())
-            await regionProvider.updateExplorerRegions(['us-east-1', 'us-east-2'])
-            regionProvider.setLastTouchedRegion('us-west-1')
-
-            const node = new (class extends AWSTreeNodeBase {
-                public override readonly regionCode = 'us-west-2'
-                public constructor() {
-                    super('')
-                }
-            })()
-
-            assert.strictEqual(regionProvider.guessDefaultRegion(node), 'us-west-2')
-        })
-    })
-})
diff --git a/src/test/shared/regions/testUtil.ts b/src/test/shared/regions/testUtil.ts
deleted file mode 100644
index f8ce6ec8651..00000000000
--- a/src/test/shared/regions/testUtil.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Memento } from 'vscode'
-import { AwsContext } from '../../../shared/awsContext'
-import { RegionProvider } from '../../../shared/regions/regionProvider'
-
-export const DEFAULT_TEST_REGION_CODE = 'someRegion' // eslint-disable-line @typescript-eslint/naming-convention
-export const DEFAULT_TEST_REGION_NAME = 'Some Region' // eslint-disable-line @typescript-eslint/naming-convention
-
-const endpoints = {
-    partitions: [
-        {
-            dnsSuffix: 'totallyLegit.tld',
-            id: 'aws',
-            name: 'AWS',
-            regions: [
-                {
-                    id: DEFAULT_TEST_REGION_CODE,
-                    name: DEFAULT_TEST_REGION_NAME,
-                },
-                {
-                    id: 'us-west-2',
-                    name: 'US West (N. California)',
-                },
-            ],
-            services: [
-                {
-                    id: 'someService',
-                    endpoints: [
-                        {
-                            regionId: DEFAULT_TEST_REGION_CODE,
-                            data: {},
-                        },
-                    ],
-                },
-            ],
-        },
-    ],
-}
-
-export function createTestRegionProvider(opts?: { globalState?: Memento; awsContext?: AwsContext }): RegionProvider {
-    return new RegionProvider(endpoints, opts?.globalState, opts?.awsContext)
-}
diff --git a/src/test/shared/resourceFetcher/compositeResourceFetcher.test.ts b/src/test/shared/resourceFetcher/compositeResourceFetcher.test.ts
deleted file mode 100644
index 2a679bcf8c0..00000000000
--- a/src/test/shared/resourceFetcher/compositeResourceFetcher.test.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { CompositeResourceFetcher } from '../../../shared/resourcefetcher/compositeResourceFetcher'
-
-describe('CompositeResourceFetcher', async function () {
-    const expectedContents = 'Hello World!\n12345'
-
-    it('loads from a resource fetcher', async function () {
-        const fetcher = {
-            get: async () => expectedContents,
-        }
-
-        const sut = new CompositeResourceFetcher(fetcher)
-
-        const contents = await sut.get()
-        assert.strictEqual(contents, expectedContents)
-    })
-
-    it('loads from the first resource fetcher to return contents', async function () {
-        const fetcher1 = {
-            get: async () => undefined,
-        }
-
-        const fetcher2 = {
-            get: async () => expectedContents,
-        }
-
-        const fetcher3 = {
-            get: async () => {
-                assert.fail('This should never be called')
-            },
-        }
-
-        const sut = new CompositeResourceFetcher(fetcher1, fetcher2, fetcher3)
-
-        const contents = await sut.get()
-        assert.strictEqual(contents, expectedContents)
-    })
-
-    it('tries to load from the next resource fetcher when one raises an error', async function () {
-        const fetcher1 = {
-            get: async () => {
-                assert.fail('Error, load from the next fetcher')
-            },
-        }
-
-        const fetcher2 = {
-            get: async () => expectedContents,
-        }
-
-        const sut = new CompositeResourceFetcher(fetcher1, fetcher2)
-
-        const contents = await sut.get()
-        assert.strictEqual(contents, expectedContents)
-    })
-
-    it('returns undefined if no resource fetcher returns contents', async function () {
-        let timesCalled = 0
-        const fetcher = {
-            get: async () => {
-                timesCalled++
-
-                return undefined
-            },
-        }
-
-        const sut = new CompositeResourceFetcher(fetcher, fetcher)
-
-        const contents = await sut.get()
-        assert.strictEqual(contents, undefined)
-        assert.strictEqual(timesCalled, 2, 'fetcher was not called the expected amount of times')
-    })
-})
diff --git a/src/test/shared/resourceFetcher/httpResourceFetcher.test.ts b/src/test/shared/resourceFetcher/httpResourceFetcher.test.ts
deleted file mode 100644
index 922a0462c73..00000000000
--- a/src/test/shared/resourceFetcher/httpResourceFetcher.test.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { mock, when, instance } from 'ts-mockito'
-import { HttpResourceFetcher, getPropertyFromJsonUrl } from '../../../shared/resourcefetcher/httpResourceFetcher'
-
-describe('getPropertyFromJsonUrl', function () {
-    let mockFetcher: HttpResourceFetcher
-    const dummyUrl = 'url'
-    const dummyProperty = 'property'
-
-    beforeEach(function () {
-        mockFetcher = mock()
-    })
-
-    it('undefined if resource is not present', async function () {
-        when(mockFetcher.get()).thenResolve(undefined)
-        assert.strictEqual(await getPropertyFromJsonUrl(dummyUrl, dummyProperty, instance(mockFetcher)), undefined)
-    })
-
-    it('undefined if resource is not JSON', async function () {
-        when(mockFetcher.get()).thenResolve('foo')
-        assert.strictEqual(await getPropertyFromJsonUrl(dummyUrl, dummyProperty, instance(mockFetcher)), undefined)
-    })
-
-    it('undefined if property is not present', async function () {
-        when(mockFetcher.get()).thenResolve('{"foo": "bar"}')
-        assert.strictEqual(await getPropertyFromJsonUrl(dummyUrl, dummyProperty, instance(mockFetcher)), undefined)
-    })
-
-    it('returns value if property is present', async function () {
-        when(mockFetcher.get()).thenResolve('{"property": "111"}')
-        const value = await getPropertyFromJsonUrl(dummyUrl, dummyProperty, instance(mockFetcher))
-        assert.strictEqual(value, '111')
-    })
-})
diff --git a/src/test/shared/sam/cli/samCliInvokerUtils.test.ts b/src/test/shared/sam/cli/samCliInvokerUtils.test.ts
deleted file mode 100644
index 7e60653d701..00000000000
--- a/src/test/shared/sam/cli/samCliInvokerUtils.test.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import {
-    collectAcceptedErrorMessages,
-    logAndThrowIfUnexpectedExitCode,
-    makeUnexpectedExitCodeError,
-} from '../../../../shared/sam/cli/samCliInvokerUtils'
-import { getTestLogger } from '../../../globalSetup.test'
-import { assertLogContainsBadExitInformation } from './testSamCliProcessInvoker'
-
-describe('logAndThrowIfUnexpectedExitCode', async function () {
-    it('does not throw on expected exit code', async function () {
-        logAndThrowIfUnexpectedExitCode(
-            {
-                exitCode: 123,
-                error: undefined,
-                stderr: '',
-                stdout: '',
-            },
-            123
-        )
-    })
-
-    it('throws on unexpected exit code', async function () {
-        const exitError = new Error('bad result')
-        const finalError = makeUnexpectedExitCodeError(exitError.message)
-        const childProcessResult = {
-            exitCode: 123,
-            error: exitError,
-            stderr: 'stderr text',
-            stdout: 'stdout text',
-        }
-
-        assert.throws(
-            () => logAndThrowIfUnexpectedExitCode(childProcessResult, 456),
-            finalError,
-            'Correct error was not thrown'
-        )
-        await assertLogContainsBadExitInformation(getTestLogger(), childProcessResult, 456)
-    })
-})
-
-/**
- * Returns a string with the 'Escape' character
- * prepended to the given text.
- *
- * This exists because using '\e' does not
- * work.
- */
-function prependEscapeCode(text: string): string {
-    return String.fromCharCode(27) + text
-}
-
-describe('collectAcceptedErrorMessages()', async () => {
-    let result: string[]
-
-    before(async () => {
-        const input = [
-            prependEscapeCode('[33m This is an accepted escape sequence'),
-            prependEscapeCode('[100m This is not an accepted escape sequence'),
-            'This will be ignored',
-            'Error: This is accepted due to the prefix',
-        ].join('\n')
-        result = collectAcceptedErrorMessages(input)
-    })
-
-    it('has the expected amount of messages', async () => {
-        assert.strictEqual(result.length, 2)
-    })
-    it('collects the "Error:" prefix', async () => {
-        assert(result.includes('Error: This is accepted due to the prefix'))
-    })
-    it('collects accepted escape sequence prefixes', async () => {
-        assert(result.includes(prependEscapeCode('[33m This is an accepted escape sequence')))
-    })
-    it('ignores non-accepted escape sequence prefixes', async () => {
-        assert(!result.includes(prependEscapeCode('[100m This is not an accepted escape sequence')))
-    })
-})
diff --git a/src/test/shared/sam/cli/samCliLocalInvoke.test.ts b/src/test/shared/sam/cli/samCliLocalInvoke.test.ts
deleted file mode 100644
index 04eebb1e409..00000000000
--- a/src/test/shared/sam/cli/samCliLocalInvoke.test.ts
+++ /dev/null
@@ -1,294 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { writeFile, remove } from 'fs-extra'
-import * as path from 'path'
-import { makeTemporaryToolkitFolder } from '../../../../shared/filesystemUtilities'
-import {
-    SamCliLocalInvokeInvocation,
-    SamLocalInvokeCommand,
-    SamLocalInvokeCommandArgs,
-} from '../../../../shared/sam/cli/samCliLocalInvoke'
-import { ChildProcess } from '../../../../shared/utilities/childProcess'
-import { assertArgIsPresent, assertArgNotPresent, assertArgsContainArgument } from './samCliTestUtils'
-
-describe('SamCliLocalInvokeInvocation', async function () {
-    class TestSamLocalInvokeCommand implements SamLocalInvokeCommand {
-        public constructor(private readonly onInvoke: ({ ...params }: SamLocalInvokeCommandArgs) => void) {}
-
-        public async invoke({ ...params }: SamLocalInvokeCommandArgs): Promise<ChildProcess> {
-            this.onInvoke(params)
-            return {} as ChildProcess // Fake, not used by tests.
-        }
-    }
-
-    let tempFolder: string
-    let placeholderTemplateFile: string
-    let placeholderEventFile: string
-    const nonRelevantArg = 'arg is not of interest to this test'
-
-    beforeEach(async function () {
-        tempFolder = await makeTemporaryToolkitFolder()
-        placeholderTemplateFile = path.join(tempFolder, 'template.yaml')
-        placeholderEventFile = path.join(tempFolder, 'event.json')
-        await writeFile(placeholderTemplateFile, '')
-        await writeFile(placeholderEventFile, '')
-    })
-
-    afterEach(async function () {
-        await remove(tempFolder)
-    })
-
-    it('invokes `sam local` with args', async function () {
-        const taskInvoker: SamLocalInvokeCommand = new TestSamLocalInvokeCommand(
-            (invokeArgs: SamLocalInvokeCommandArgs) => {
-                assert.ok(invokeArgs.args.length >= 2, 'Expected args to be present')
-                assert.strictEqual(invokeArgs.args[0], 'local')
-                assert.strictEqual(invokeArgs.args[1], 'invoke')
-                // --debug is present because tests run with "debug" log-level. #1403
-                assert.strictEqual(invokeArgs.args[2], '--debug')
-                assert.strictEqual(invokeArgs.args[4], '--template')
-                assert.strictEqual(invokeArgs.args[6], '--event')
-                assert.strictEqual(invokeArgs.args[8], '--env-vars')
-
-                // `extraArgs` are appended to the end.
-                assert.strictEqual(invokeArgs.args[10], '--build-dir')
-                assert.strictEqual(invokeArgs.args[11], 'my/build/dir/')
-            }
-        )
-
-        await new SamCliLocalInvokeInvocation({
-            templateResourceName: nonRelevantArg,
-            templatePath: placeholderTemplateFile,
-            eventPath: placeholderEventFile,
-            environmentVariablePath: nonRelevantArg,
-            invoker: taskInvoker,
-            extraArgs: ['--build-dir', 'my/build/dir/'],
-        }).execute()
-    })
-
-    it('Passes template resource name to sam cli', async function () {
-        const expectedResourceName = 'HelloWorldResource'
-        const taskInvoker: SamLocalInvokeCommand = new TestSamLocalInvokeCommand(
-            (invokeArgs: SamLocalInvokeCommandArgs) => {
-                assertArgIsPresent(invokeArgs.args, expectedResourceName)
-            }
-        )
-
-        await new SamCliLocalInvokeInvocation({
-            templateResourceName: expectedResourceName,
-            templatePath: placeholderTemplateFile,
-            eventPath: placeholderEventFile,
-            environmentVariablePath: nonRelevantArg,
-            invoker: taskInvoker,
-        }).execute()
-    })
-
-    it('Passes template path to sam cli', async function () {
-        const taskInvoker: SamLocalInvokeCommand = new TestSamLocalInvokeCommand(
-            (invokeArgs: SamLocalInvokeCommandArgs) => {
-                assertArgsContainArgument(invokeArgs.args, '--template', placeholderTemplateFile)
-            }
-        )
-
-        await new SamCliLocalInvokeInvocation({
-            templateResourceName: nonRelevantArg,
-            templatePath: placeholderTemplateFile,
-            eventPath: placeholderEventFile,
-            environmentVariablePath: nonRelevantArg,
-            invoker: taskInvoker,
-        }).execute()
-    })
-
-    it('Passes event path to sam cli', async function () {
-        const taskInvoker: SamLocalInvokeCommand = new TestSamLocalInvokeCommand(
-            (invokeArgs: SamLocalInvokeCommandArgs) => {
-                assertArgsContainArgument(invokeArgs.args, '--event', placeholderEventFile)
-            }
-        )
-
-        await new SamCliLocalInvokeInvocation({
-            templateResourceName: nonRelevantArg,
-            templatePath: placeholderTemplateFile,
-            eventPath: placeholderEventFile,
-            environmentVariablePath: nonRelevantArg,
-            invoker: taskInvoker,
-        }).execute()
-    })
-
-    it('Passes env-vars path to sam cli', async function () {
-        const expectedEnvVarsPath = 'envvars.json'
-        const taskInvoker: SamLocalInvokeCommand = new TestSamLocalInvokeCommand(
-            (invokeArgs: SamLocalInvokeCommandArgs) => {
-                assertArgsContainArgument(invokeArgs.args, '--env-vars', expectedEnvVarsPath)
-            }
-        )
-
-        await new SamCliLocalInvokeInvocation({
-            templateResourceName: nonRelevantArg,
-            templatePath: placeholderTemplateFile,
-            eventPath: placeholderEventFile,
-            environmentVariablePath: expectedEnvVarsPath,
-            invoker: taskInvoker,
-        }).execute()
-    })
-
-    it('Passes debug port to sam cli', async function () {
-        const expectedDebugPort = '1234'
-        const taskInvoker: SamLocalInvokeCommand = new TestSamLocalInvokeCommand(
-            (invokeArgs: SamLocalInvokeCommandArgs) => {
-                assertArgsContainArgument(invokeArgs.args, '-d', expectedDebugPort)
-            }
-        )
-
-        await new SamCliLocalInvokeInvocation({
-            templateResourceName: nonRelevantArg,
-            templatePath: placeholderTemplateFile,
-            eventPath: placeholderEventFile,
-            environmentVariablePath: nonRelevantArg,
-            debugPort: expectedDebugPort,
-            invoker: taskInvoker,
-        }).execute()
-    })
-
-    it('undefined debug port does not pass to sam cli', async function () {
-        const taskInvoker: SamLocalInvokeCommand = new TestSamLocalInvokeCommand(
-            (invokeArgs: SamLocalInvokeCommandArgs) => {
-                assertArgNotPresent(invokeArgs.args, '-d')
-            }
-        )
-
-        await new SamCliLocalInvokeInvocation({
-            templateResourceName: nonRelevantArg,
-            templatePath: placeholderTemplateFile,
-            eventPath: placeholderEventFile,
-            environmentVariablePath: nonRelevantArg,
-            debugPort: undefined,
-            invoker: taskInvoker,
-        }).execute()
-    })
-
-    it('Passes docker network to sam cli', async function () {
-        const expectedDockerNetwork = 'hello-world'
-        const taskInvoker: SamLocalInvokeCommand = new TestSamLocalInvokeCommand(
-            (invokeArgs: SamLocalInvokeCommandArgs) => {
-                assertArgsContainArgument(invokeArgs.args, '--docker-network', expectedDockerNetwork)
-            }
-        )
-
-        await new SamCliLocalInvokeInvocation({
-            templateResourceName: nonRelevantArg,
-            templatePath: placeholderTemplateFile,
-            eventPath: placeholderEventFile,
-            environmentVariablePath: nonRelevantArg,
-            invoker: taskInvoker,
-            dockerNetwork: expectedDockerNetwork,
-        }).execute()
-    })
-
-    it('Does not pass docker network to sam cli when undefined', async function () {
-        const taskInvoker: SamLocalInvokeCommand = new TestSamLocalInvokeCommand(
-            (invokeArgs: SamLocalInvokeCommandArgs) => {
-                assertArgNotPresent(invokeArgs.args, '--docker-network')
-            }
-        )
-
-        await new SamCliLocalInvokeInvocation({
-            templateResourceName: nonRelevantArg,
-            templatePath: placeholderTemplateFile,
-            eventPath: placeholderEventFile,
-            environmentVariablePath: nonRelevantArg,
-            invoker: taskInvoker,
-            dockerNetwork: undefined,
-        }).execute()
-    })
-
-    it('passes --skip-pull-image to sam cli if skipPullImage is true', async function () {
-        const taskInvoker: SamLocalInvokeCommand = new TestSamLocalInvokeCommand(
-            (invokeArgs: SamLocalInvokeCommandArgs) => {
-                assertArgIsPresent(invokeArgs.args, '--skip-pull-image')
-            }
-        )
-
-        await new SamCliLocalInvokeInvocation({
-            templateResourceName: nonRelevantArg,
-            templatePath: placeholderTemplateFile,
-            eventPath: placeholderEventFile,
-            environmentVariablePath: nonRelevantArg,
-            invoker: taskInvoker,
-            skipPullImage: true,
-        }).execute()
-    })
-
-    it('does not pass --skip-pull-image to sam cli if skipPullImage is false', async function () {
-        const taskInvoker: SamLocalInvokeCommand = new TestSamLocalInvokeCommand(
-            (invokeArgs: SamLocalInvokeCommandArgs) => {
-                assertArgNotPresent(invokeArgs.args, '--skip-pull-image')
-            }
-        )
-
-        await new SamCliLocalInvokeInvocation({
-            templateResourceName: nonRelevantArg,
-            templatePath: placeholderTemplateFile,
-            eventPath: placeholderEventFile,
-            environmentVariablePath: nonRelevantArg,
-            invoker: taskInvoker,
-            skipPullImage: false,
-        }).execute()
-    })
-
-    it('does not pass --skip-pull-image to sam cli if skipPullImage is undefined', async function () {
-        const taskInvoker: SamLocalInvokeCommand = new TestSamLocalInvokeCommand(
-            (invokeArgs: SamLocalInvokeCommandArgs) => {
-                assertArgNotPresent(invokeArgs.args, '--skip-pull-image')
-            }
-        )
-
-        await new SamCliLocalInvokeInvocation({
-            templateResourceName: nonRelevantArg,
-            templatePath: placeholderTemplateFile,
-            eventPath: placeholderEventFile,
-            environmentVariablePath: nonRelevantArg,
-            invoker: taskInvoker,
-            skipPullImage: undefined,
-        }).execute()
-    })
-
-    it('Passes debuggerPath to sam cli', async function () {
-        const expectedDebuggerPath = path.join('foo', 'bar')
-
-        const taskInvoker: SamLocalInvokeCommand = new TestSamLocalInvokeCommand(
-            (invokeArgs: SamLocalInvokeCommandArgs) => {
-                assertArgsContainArgument(invokeArgs.args, '--debugger-path', expectedDebuggerPath)
-            }
-        )
-
-        await new SamCliLocalInvokeInvocation({
-            templateResourceName: nonRelevantArg,
-            templatePath: placeholderTemplateFile,
-            eventPath: placeholderEventFile,
-            environmentVariablePath: nonRelevantArg,
-            invoker: taskInvoker,
-            debuggerPath: expectedDebuggerPath,
-        }).execute()
-    })
-
-    it('Does not pass debuggerPath to sam cli when undefined', async function () {
-        const taskInvoker: SamLocalInvokeCommand = new TestSamLocalInvokeCommand(
-            (invokeArgs: SamLocalInvokeCommandArgs) => {
-                assertArgNotPresent(invokeArgs.args, '--debugger-path')
-            }
-        )
-
-        await new SamCliLocalInvokeInvocation({
-            templateResourceName: nonRelevantArg,
-            templatePath: placeholderTemplateFile,
-            eventPath: placeholderEventFile,
-            environmentVariablePath: nonRelevantArg,
-            invoker: taskInvoker,
-        }).execute()
-    })
-})
diff --git a/src/test/shared/sam/cli/samCliValidationNotification.test.ts b/src/test/shared/sam/cli/samCliValidationNotification.test.ts
deleted file mode 100644
index f98d46604d2..00000000000
--- a/src/test/shared/sam/cli/samCliValidationNotification.test.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-
-import {
-    InvalidSamCliError,
-    InvalidSamCliVersionError,
-    SamCliNotFoundError,
-    SamCliVersionValidation,
-    SamCliVersionValidatorResult,
-} from '../../../../shared/sam/cli/samCliValidator'
-import {
-    SamCliValidationNotification,
-    SamCliValidationNotificationAction,
-    makeSamCliValidationNotification,
-} from '../../../../shared/sam/cli/samCliValidationNotification'
-
-describe('makeSamCliValidationNotification', async function () {
-    const fakeSamCliValidationNotification: SamCliValidationNotification = {
-        show: () => {
-            throw new Error('show is unused')
-        },
-    }
-    const actionLabelUpdateSamCli = 'Get SAM CLI'
-    const actionLabelUpdateToolkit = 'Visit Marketplace'
-
-    it('handles SamCliNotFoundError', async function () {
-        makeSamCliValidationNotification(
-            new SamCliNotFoundError(),
-            (message: string, actions: SamCliValidationNotificationAction[]): SamCliValidationNotification => {
-                assert.ok(message.includes('Cannot find SAM CLI'), `unexpected validation message: ${message}`)
-                assert.strictEqual(actions.length, 1, 'unexpected action count')
-                assert.strictEqual(
-                    actions[0].label,
-                    actionLabelUpdateSamCli,
-                    `unexpected action label: ${actions[0].label}`
-                )
-
-                return fakeSamCliValidationNotification
-            }
-        )
-    })
-
-    const versionValidationTestScenarios = [
-        {
-            situation: 'SAM CLI Version is too low',
-            versionValidation: SamCliVersionValidation.VersionTooLow,
-            messageFragment: 'Update your SAM CLI.',
-            actionLabel: actionLabelUpdateSamCli,
-        },
-        {
-            situation: 'SAM CLI Version is too high',
-            versionValidation: SamCliVersionValidation.VersionTooHigh,
-            messageFragment: 'Check the Marketplace for an updated AWS Toolkit.',
-            actionLabel: actionLabelUpdateToolkit,
-        },
-        {
-            situation: 'SAM CLI Version is unparsable',
-            versionValidation: SamCliVersionValidation.VersionNotParseable,
-            messageFragment: 'Update your SAM CLI.',
-            actionLabel: actionLabelUpdateSamCli,
-        },
-    ]
-
-    versionValidationTestScenarios.forEach(test => {
-        it(`handles InvalidSamCliVersionError - ${test.situation}`, async () => {
-            const validatorResult: SamCliVersionValidatorResult = {
-                version: '1.2.3',
-                validation: test.versionValidation,
-            }
-            const error = new InvalidSamCliVersionError(validatorResult)
-
-            makeSamCliValidationNotification(
-                error,
-                (message: string, actions: SamCliValidationNotificationAction[]): SamCliValidationNotification => {
-                    assert.ok(
-                        message.includes(test.messageFragment) && message.includes(validatorResult.version!),
-                        `unexpected validation message: ${message}`
-                    )
-                    assert.strictEqual(actions.length, 1, 'unexpected action count')
-                    assert.strictEqual(
-                        actions[0].label,
-                        test.actionLabel,
-                        `unexpected action label: ${actions[0].label}`
-                    )
-
-                    return fakeSamCliValidationNotification
-                }
-            )
-        })
-    })
-
-    it('handles Unexpected input', async function () {
-        makeSamCliValidationNotification(
-            new InvalidSamCliError('different error'),
-            (message: string, actions: SamCliValidationNotificationAction[]): SamCliValidationNotification => {
-                assert.ok(
-                    message.includes('An unexpected issue') && message.includes('different error'),
-                    `unexpected validation message: ${message}`
-                )
-                assert.strictEqual(actions.length, 0, 'unexpected actions found')
-
-                return fakeSamCliValidationNotification
-            }
-        )
-    })
-})
diff --git a/src/test/shared/sam/cli/samCliValidator.test.ts b/src/test/shared/sam/cli/samCliValidator.test.ts
deleted file mode 100644
index de2caf91ee9..00000000000
--- a/src/test/shared/sam/cli/samCliValidator.test.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import globals from '../../../../shared/extensionGlobals'
-import { SamCliInfoResponse } from '../../../../shared/sam/cli/samCliInfo'
-import {
-    DefaultSamCliValidator,
-    maxSamCliVersionExclusive,
-    minSamCliVersion,
-    SamCliValidatorContext,
-    SamCliVersionValidation,
-} from '../../../../shared/sam/cli/samCliValidator'
-
-describe('DefaultSamCliValidator', async function () {
-    class TestSamCliValidatorContext implements SamCliValidatorContext {
-        public samCliVersionId: string = new globals.clock.Date().valueOf().toString()
-        public getInfoCallCount: number = 0
-        public mockSamLocation: string = ''
-
-        public constructor(public samCliVersion: string) {}
-
-        public async samCliLocation(): Promise<string> {
-            return this.mockSamLocation
-        }
-
-        public async getSamCliExecutableId(): Promise<string> {
-            return this.samCliVersionId
-        }
-        public async getSamCliInfo(): Promise<SamCliInfoResponse> {
-            this.getInfoCallCount++
-
-            return {
-                version: this.samCliVersion,
-            }
-        }
-    }
-
-    const samCliVersionTestScenarios = [
-        {
-            situation: 'SAM CLI Version is valid',
-            version: minSamCliVersion,
-            expectedVersionValidation: SamCliVersionValidation.Valid,
-        },
-        {
-            situation: 'SAM CLI Version is too low',
-            version: '0.1.0',
-            expectedVersionValidation: SamCliVersionValidation.VersionTooLow,
-        },
-        {
-            situation: 'SAM CLI Version is too high',
-            version: maxSamCliVersionExclusive,
-            expectedVersionValidation: SamCliVersionValidation.VersionTooHigh,
-        },
-        {
-            situation: 'SAM CLI Version is unparsable - empty string',
-            version: '',
-            expectedVersionValidation: SamCliVersionValidation.VersionNotParseable,
-        },
-        {
-            situation: 'SAM CLI Version is unparsable - random text',
-            version: 'what.in.tarnation',
-            expectedVersionValidation: SamCliVersionValidation.VersionNotParseable,
-        },
-    ]
-
-    describe('detectValidSamCli', async function () {
-        samCliVersionTestScenarios.forEach(test => {
-            it(`handles case where SAM CLI exists and ${test.situation}`, async () => {
-                const validatorContext = new TestSamCliValidatorContext(test.version)
-                validatorContext.mockSamLocation = 'somesamclipath'
-                const samCliValidator = new DefaultSamCliValidator(validatorContext)
-
-                const validatorResult = await samCliValidator.detectValidSamCli()
-
-                assert.ok(validatorResult)
-                assert.strictEqual(validatorResult.samCliFound, true, 'Expected to find sam cli')
-                assert.ok(validatorResult.versionValidation)
-                assert.strictEqual(validatorResult.versionValidation!.version, test.version, 'sam cli version mismatch')
-                assert.strictEqual(
-                    validatorResult.versionValidation!.validation,
-                    test.expectedVersionValidation,
-                    'sam cli version validation mismatch'
-                )
-            })
-        })
-
-        it('handles case where SAM CLI is not found', async function () {
-            const validatorContext = new TestSamCliValidatorContext('')
-            validatorContext.mockSamLocation = ''
-            const samCliValidator = new DefaultSamCliValidator(validatorContext)
-
-            const validatorResult = await samCliValidator.detectValidSamCli()
-
-            assert.ok(validatorResult)
-            assert.strictEqual(validatorResult.samCliFound, false, 'Expected sam cli to be not found')
-        })
-    })
-
-    describe('getVersionValidatorResult', async function () {
-        samCliVersionTestScenarios.forEach(test => {
-            it(`Validates SAM CLI binary for the case: ${test.situation}`, async () => {
-                const validatorContext = new TestSamCliValidatorContext(test.version)
-                const samCliValidator = new DefaultSamCliValidator(validatorContext)
-
-                const validatorResult = await samCliValidator.getVersionValidatorResult()
-
-                assert.ok(validatorResult)
-                assert.strictEqual(validatorResult.version, test.version, 'sam cli version mismatch')
-                assert.strictEqual(
-                    validatorResult.validation,
-                    test.expectedVersionValidation,
-                    'sam cli version validation mismatch'
-                )
-            })
-        })
-
-        it('Uses the cached validation result', async function () {
-            const validatorContext = new TestSamCliValidatorContext(minSamCliVersion)
-            const samCliValidator = new DefaultSamCliValidator(validatorContext)
-
-            await samCliValidator.getVersionValidatorResult()
-            await samCliValidator.getVersionValidatorResult()
-
-            assert.strictEqual(validatorContext.getInfoCallCount, 1, 'getInfo called more than once')
-        })
-
-        it('Does not use the cached validation result if the SAM CLI timestamp changed', async function () {
-            const validatorContext = new TestSamCliValidatorContext(minSamCliVersion)
-            const samCliValidator = new DefaultSamCliValidator(validatorContext)
-
-            await samCliValidator.getVersionValidatorResult()
-
-            // Oh look, a new SAM CLI timestamp
-            validatorContext.samCliVersionId = validatorContext.samCliVersionId + 'x'
-            await samCliValidator.getVersionValidatorResult()
-
-            assert.strictEqual(validatorContext.getInfoCallCount, 2, 'getInfo was not called both times')
-        })
-    })
-
-    describe('validateSamCliVersion', async function () {
-        samCliVersionTestScenarios.forEach(test => {
-            it(`validates when ${test.situation}`, async () => {
-                const validation: SamCliVersionValidation = DefaultSamCliValidator.validateSamCliVersion(test.version)
-
-                assert.strictEqual(validation, test.expectedVersionValidation, 'Unexpected version validation')
-            })
-        })
-    })
-})
diff --git a/src/test/shared/sam/debugger/awsSamDebugConfigurationValidator.test.ts b/src/test/shared/sam/debugger/awsSamDebugConfigurationValidator.test.ts
deleted file mode 100644
index 019a1da8518..00000000000
--- a/src/test/shared/sam/debugger/awsSamDebugConfigurationValidator.test.ts
+++ /dev/null
@@ -1,214 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-import { instance, mock, when } from 'ts-mockito'
-
-import { CloudFormation } from '../../../../shared/cloudformation/cloudformation'
-import { CloudFormationTemplateRegistry } from '../../../../shared/fs/templateRegistry'
-import {
-    AwsSamDebuggerConfiguration,
-    TemplateTargetProperties,
-} from '../../../../shared/sam/debugger/awsSamDebugConfiguration'
-import { DefaultAwsSamDebugConfigurationValidator } from '../../../../shared/sam/debugger/awsSamDebugConfigurationValidator'
-import { createBaseTemplate } from '../../cloudformation/cloudformationTestUtils'
-import globals from '../../../../shared/extensionGlobals'
-import { WatchedItem } from '../../../../shared/fs/watchedFiles'
-
-function createTemplateConfig(): AwsSamDebuggerConfiguration {
-    return {
-        type: 'aws-sam',
-        name: 'name',
-        request: 'direct-invoke',
-        invokeTarget: {
-            target: 'template',
-            templatePath: '/',
-            logicalId: 'TestResource',
-        },
-    }
-}
-
-function createImageTemplateConfig(): AwsSamDebuggerConfiguration {
-    return {
-        type: 'aws-sam',
-        name: 'name',
-        request: 'direct-invoke',
-        invokeTarget: {
-            target: 'template',
-            templatePath: '/image',
-            logicalId: 'TestResource',
-        },
-        lambda: {
-            runtime: 'nodejs12.x',
-        },
-    }
-}
-
-function createCodeConfig(): AwsSamDebuggerConfiguration {
-    return {
-        type: 'aws-sam',
-        name: 'name',
-        request: 'direct-invoke',
-        invokeTarget: {
-            target: 'code',
-            lambdaHandler: 'foo',
-            projectRoot: 'bar',
-        },
-    }
-}
-
-function createApiConfig(): AwsSamDebuggerConfiguration {
-    return {
-        type: 'aws-sam',
-        name: 'name',
-        request: 'direct-invoke',
-        invokeTarget: {
-            target: 'api',
-            templatePath: '/',
-            logicalId: 'TestResource',
-        },
-        api: {
-            path: '/',
-            httpMethod: 'get',
-        },
-    }
-}
-
-function createTemplateData(): WatchedItem<CloudFormation.Template> {
-    return {
-        path: '/',
-        item: createBaseTemplate(),
-    }
-}
-
-function createImageTemplateData(): WatchedItem<CloudFormation.Template> {
-    return {
-        path: '/image',
-        item: createBaseTemplate(),
-    }
-}
-
-describe('DefaultAwsSamDebugConfigurationValidator', function () {
-    const templateConfig = createTemplateConfig()
-    const imageTemplateConfig = createImageTemplateConfig()
-    const codeConfig = createCodeConfig()
-    const apiConfig = createApiConfig()
-    const templateData = createTemplateData()
-    const imageTemplateData = createImageTemplateData()
-
-    const mockRegistry: CloudFormationTemplateRegistry = mock()
-    const mockFolder: vscode.WorkspaceFolder = mock()
-
-    let validator: DefaultAwsSamDebugConfigurationValidator
-
-    let savedRegistry: CloudFormationTemplateRegistry
-
-    before(function () {
-        savedRegistry = globals.templateRegistry
-    })
-
-    after(function () {
-        globals.templateRegistry = savedRegistry
-    })
-
-    beforeEach(function () {
-        when(mockRegistry.getRegisteredItem('/')).thenReturn(templateData)
-        when(mockRegistry.getRegisteredItem('/image')).thenReturn(imageTemplateData)
-
-        globals.templateRegistry = mockRegistry
-
-        validator = new DefaultAwsSamDebugConfigurationValidator(instance(mockFolder))
-    })
-
-    it('returns invalid when resolving debug configurations with an invalid request type', function () {
-        templateConfig.request = 'not-direct-invoke'
-
-        const result = validator.validate(templateConfig)
-        assert.strictEqual(result.isValid, false)
-    })
-
-    it('returns invalid when resolving debug configurations with an invalid target type', function () {
-        templateConfig.invokeTarget.target = 'not-valid' as any
-
-        const result = validator.validate(templateConfig as any)
-        assert.strictEqual(result.isValid, false)
-    })
-
-    it("returns invalid when resolving template debug configurations with a template that isn't in the registry", () => {
-        const mockEmptyRegistry: CloudFormationTemplateRegistry = mock()
-        when(mockEmptyRegistry.getRegisteredItem('/')).thenReturn(undefined)
-
-        validator = new DefaultAwsSamDebugConfigurationValidator(instance(mockFolder))
-
-        const result = validator.validate(templateConfig)
-        assert.strictEqual(result.isValid, false)
-    })
-
-    it("returns invalid when resolving template debug configurations with a template that doesn't have the set resource", () => {
-        const target = templateConfig.invokeTarget as TemplateTargetProperties
-        target.logicalId = 'wrong'
-
-        const result = validator.validate(templateConfig)
-        assert.strictEqual(result.isValid, false)
-    })
-
-    it("returns invalid when resolving template debug configurations with a template that isn't serverless", () => {
-        const target = templateConfig.invokeTarget as TemplateTargetProperties
-        target.logicalId = 'OtherResource'
-
-        const result = validator.validate(templateConfig)
-        assert.strictEqual(result.isValid, false)
-    })
-
-    it('returns undefined when resolving template debug configurations with a resource that has an invalid runtime in template', function () {
-        const properties = templateData.item.Resources?.TestResource?.Properties as CloudFormation.ZipResourceProperties
-        properties.Runtime = 'invalid'
-
-        const result = validator.validate(templateConfig)
-        assert.strictEqual(result.isValid, false)
-    })
-
-    it("API config returns invalid when resolving with a template that isn't serverless", () => {
-        const target = templateConfig.invokeTarget as TemplateTargetProperties
-        target.logicalId = 'OtherResource'
-
-        const result = validator.validate(apiConfig)
-        assert.strictEqual(result.isValid, false)
-    })
-
-    it('API config is invalid when it does not have an API field', function () {
-        const config = createApiConfig()
-        config.api = undefined
-
-        const result = validator.validate(config)
-        assert.strictEqual(result.isValid, false)
-    })
-
-    it("API config is invalid when its path does not start with a '/'", () => {
-        const config = createApiConfig()
-
-        config.api!.path = 'noleadingslash'
-
-        const result = validator.validate(config)
-        assert.strictEqual(result.isValid, false)
-    })
-
-    it('returns invalid when resolving code debug configurations with invalid runtimes', function () {
-        codeConfig.lambda = { runtime: 'asd' }
-
-        const result = validator.validate(codeConfig)
-        assert.strictEqual(result.isValid, false)
-    })
-
-    it('returns invalid when Image app does not declare runtime', function () {
-        const lambda = imageTemplateConfig.lambda
-
-        delete lambda?.runtime
-
-        const result = validator.validate(templateConfig)
-        assert.strictEqual(result.isValid, false)
-    })
-})
diff --git a/src/test/shared/sam/sync.test.ts b/src/test/shared/sam/sync.test.ts
deleted file mode 100644
index 9d7a1417389..00000000000
--- a/src/test/shared/sam/sync.test.ts
+++ /dev/null
@@ -1,191 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as assert from 'assert'
-import { prepareSyncParams, SyncParams, SyncWizard } from '../../../shared/sam/sync'
-import {
-    createBaseImageTemplate,
-    createBaseTemplate,
-    makeSampleSamTemplateYaml,
-} from '../cloudformation/cloudformationTestUtils'
-import { createWizardTester } from '../wizards/wizardTestUtils'
-import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
-import { makeTemporaryToolkitFolder } from '../../../shared/filesystemUtilities'
-import { SystemUtilities } from '../../../shared/systemUtilities'
-import { ToolkitError } from '../../../shared/errors'
-
-describe('SyncWizard', function () {
-    const createTester = (params?: Partial<SyncParams>) =>
-        createWizardTester(new SyncWizard({ deployType: 'code', ...params }))
-
-    it('prompts for region -> template -> stackName -> bucketName', function () {
-        const tester = createTester()
-        tester.region.assertShowFirst()
-        tester.template.assertShowSecond()
-        tester.stackName.assertShowThird()
-        tester.bucketName.assertShow(4)
-    })
-
-    it('prompts for ECR repo if template has image-based resource', function () {
-        const template = { uri: vscode.Uri.file('/'), data: createBaseImageTemplate() }
-        const tester = createTester({ template })
-        tester.ecrRepoUri.assertShow()
-    })
-
-    it('skips prompt for ECR repo if template has no image-based resources', function () {
-        const template = { uri: vscode.Uri.file('/'), data: createBaseTemplate() }
-        const tester = createTester({ template })
-        tester.ecrRepoUri.assertDoesNotShow()
-    })
-
-    it("uses the template's workspace as the project root is not set", function () {
-        const workspaceUri = vscode.workspace.workspaceFolders?.[0]?.uri
-        assert.ok(workspaceUri)
-
-        const templateUri = vscode.Uri.joinPath(workspaceUri, 'my', 'template.yaml')
-        const template = { uri: templateUri, data: createBaseTemplate() }
-        const tester = createTester({ template })
-        tester.projectRoot.assertValue(workspaceUri)
-    })
-})
-
-describe('prepareSyncParams', function () {
-    let tempDir: vscode.Uri
-
-    beforeEach(async function () {
-        tempDir = vscode.Uri.file(await makeTemporaryToolkitFolder())
-    })
-
-    afterEach(async function () {
-        await SystemUtilities.remove(tempDir)
-    })
-
-    it('uses region if given a tree node', async function () {
-        const params = await prepareSyncParams(
-            new (class extends AWSTreeNodeBase {
-                public override readonly regionCode = 'foo'
-            })('')
-        )
-
-        assert.strictEqual(params.region, 'foo')
-    })
-
-    async function makeTemplateItem(dir: vscode.Uri) {
-        const uri = vscode.Uri.joinPath(dir, 'template.yaml')
-        const data = makeSampleSamTemplateYaml(true)
-        await SystemUtilities.writeFile(uri, JSON.stringify(data))
-
-        return { uri, data }
-    }
-
-    it('loads template if given a URI', async function () {
-        const template = await makeTemplateItem(tempDir)
-
-        const params = await prepareSyncParams(template.uri)
-        assert.strictEqual(params.template?.uri.fsPath, template.uri.fsPath)
-        assert.deepStrictEqual(params.template?.data, template.data)
-    })
-
-    it('skips dependency layers by default', async function () {
-        const template = await makeTemplateItem(tempDir)
-
-        const params = await prepareSyncParams(template.uri)
-        assert.strictEqual(params.skipDependencyLayer, true)
-    })
-
-    describe('samconfig.toml', function () {
-        async function makeDefaultConfig(dir: vscode.Uri, body: string) {
-            const uri = vscode.Uri.joinPath(dir, 'samconfig.toml')
-            const data = `
-            [default.sync.parameters]
-            ${body}
-`
-            await SystemUtilities.writeFile(uri, data)
-
-            return uri
-        }
-
-        async function getParams(body: string, dir = tempDir) {
-            const config = await makeDefaultConfig(dir, body)
-
-            return prepareSyncParams(config)
-        }
-
-        it('throws on non-string values', async function () {
-            await assert.rejects(() => getParams(`region = 0`), ToolkitError)
-        })
-
-        it('does not fail on missing values', async function () {
-            const params = await getParams(`region = "bar"`)
-            assert.strictEqual(params.region, 'bar')
-        })
-
-        it('sets the project root as the parent directory', async function () {
-            const params = await getParams(`region = "bar"`, tempDir)
-            assert.strictEqual(params.projectRoot?.fsPath, tempDir.fsPath)
-        })
-
-        it('uses the depdency layer option if provided', async function () {
-            const params = await getParams(`dependency_layer = true`, tempDir)
-            assert.strictEqual(params.skipDependencyLayer, false)
-        })
-
-        it('can load a relative template param', async function () {
-            const template = await makeTemplateItem(tempDir)
-            const params = await getParams(`template = "./template.yaml"`)
-            assert.deepStrictEqual(params.template?.data, template.data)
-        })
-
-        it('can load an absolute template param', async function () {
-            const template = await makeTemplateItem(tempDir)
-            const params = await getParams(`template = '${template.uri.fsPath}'`)
-            assert.deepStrictEqual(params.template?.data, template.data)
-        })
-
-        it('can load a relative template param without a path seperator', async function () {
-            const template = await makeTemplateItem(tempDir)
-            const params = await getParams(`template = "template.yaml"`)
-            assert.deepStrictEqual(params.template?.data, template.data)
-        })
-
-        it('can load a template param using an alternate key', async function () {
-            const template = await makeTemplateItem(tempDir)
-            const params = await getParams(`template_file = "template.yaml"`)
-            assert.deepStrictEqual(params.template?.data, template.data)
-        })
-
-        it('can use global params', async function () {
-            const params = await getParams(`
-            region = "bar"
-            [default.global.parameters]
-            stack_name = "my-app"
-            `)
-            assert.strictEqual(params.stackName, 'my-app')
-        })
-
-        it('prefers using the sync section over globals', async function () {
-            const params = await getParams(`
-            stack_name = "my-sync-app"
-            [default.global.parameters]
-            stack_name = "my-app"
-            `)
-            assert.strictEqual(params.stackName, 'my-sync-app')
-        })
-
-        it('loads all values if found', async function () {
-            const params = await getParams(`
-            region = "bar"
-            stack_name = "my-app"
-            s3_bucket = "my-bucket"
-            image_repository = "12345679010.dkr.ecr.bar.amazonaws.com/repo"
-            `)
-            assert.strictEqual(params.region, 'bar')
-            assert.strictEqual(params.stackName, 'my-app')
-            assert.strictEqual(params.bucketName, 'my-bucket')
-            assert.strictEqual(params.ecrRepoUri, '12345679010.dkr.ecr.bar.amazonaws.com/repo')
-        })
-    })
-})
diff --git a/src/test/shared/schema/testUtils.ts b/src/test/shared/schema/testUtils.ts
deleted file mode 100644
index 69a8f1cd54b..00000000000
--- a/src/test/shared/schema/testUtils.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as path from 'path'
-import { GitExtension } from '../../../shared/extensions/git'
-
-export type JSONValue = string | boolean | number | null | JSONValue[] | JSONObject
-
-export interface JSONObject {
-    [key: string]: JSONValue
-}
-
-export interface TestSchemas {
-    samSchema: JSONObject
-    cfnSchema: JSONObject
-}
-
-export async function getCITestSchemas(): Promise<TestSchemas> {
-    const fetchUrl = 'https://github.com/awslabs/goformation'
-    const repo = await GitExtension.instance.listAllRemoteFiles({
-        fetchUrl,
-    })
-
-    const samFilePath = path.join('schema', 'sam.schema.json')
-    const samSchemaFile = await repo.files.find(f => f.name === samFilePath)?.read()
-    if (!samSchemaFile) {
-        throw new Error(`Unable to find the sam schema file in path ${samFilePath} in repository ${fetchUrl}`)
-    }
-
-    const cfnFilePath = path.join('schema', 'cloudformation.schema.json')
-    const cfnSchemaFile = await repo.files.find(f => f.name === cfnFilePath)?.read()
-    if (!cfnSchemaFile) {
-        throw new Error(
-            `Unable to find the cloudformation schema file in path ${cfnFilePath} in repository ${fetchUrl}`
-        )
-    }
-
-    repo.dispose()
-
-    const samSchema = JSON.parse(samSchemaFile)
-    const cfnSchema = JSON.parse(cfnSchemaFile)
-    return {
-        samSchema,
-        cfnSchema,
-    }
-}
-
-/**
- * Assert whether or not name exists under definitionName in the JSON schema
- * @param schema The JSON schema
- * @param definitionName The name of the definition to use
- * @param name The name of the property to look for
- */
-export function assertDefinitionProperty(schema: JSONObject, definitionName: string, name: string): void | never {
-    const definitionProperties = unmarshal(schema, 'definitions', definitionName, 'properties')
-    assertProperty(definitionProperties, name)
-}
-
-/**
- * Assert whether name exists at an arbitary location in the JSON schema
- * @param arbitrarySchemaLocation An arbitary location in the JSON schema
- * @param name The name of the property to look for
- */
-export function assertProperty(arbitrarySchemaLocation: JSONObject, name: string): void | never {
-    assert.ok(name in arbitrarySchemaLocation, `Property ${name} was not found in the "Properties" object`)
-}
-
-/**
- * Assert whether a reference exists at definitionLocation to referenceName in the JSON Schema
- * @param definitionLocation A location in the JSON schema
- * @param referenceName A name of a reference to look for
- */
-export function assertRef(definitionLocation: JSONObject, referenceName: string): void | never {
-    const definitionRef = definitionLocation['$ref']
-    if (definitionRef !== `#/definitions/AWS::Serverless::${referenceName}`) {
-        assert.fail(`The reference for ${definitionRef} did not point to ${referenceName}`)
-    }
-}
-
-/**
- * Assert that definitionName is in the JSON schemas definitions
- * @param schema The JSON schema to use
- * @param definitionName The name of the definition to check
- */
-export function assertDefinition(schema: JSONObject, definitionName: string): void | never {
-    if (!(definitionName in (schema['definitions'] as JSONObject))) {
-        assert.fail(`Definition for ${definitionName} not found`)
-    }
-}
-
-/**
- * Traverse through the initial JSON object, visiting all of the properties.
- * Only suitable for accessing JSON objects.
- * @param initialObject the object you want to start the traversal at
- * @param properties the properties you want to visit and traverse into
- * @returns The location in initialObject after visiting all of properties
- */
-export function unmarshal(initialObject: JSONObject, ...properties: string[]) {
-    let processedObject = initialObject
-    for (const propertyName of properties) {
-        processedObject = processedObject[propertyName] as JSONObject
-    }
-    return processedObject
-}
diff --git a/src/test/shared/schemas.test.ts b/src/test/shared/schemas.test.ts
deleted file mode 100644
index 3488fccf466..00000000000
--- a/src/test/shared/schemas.test.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as assert from 'assert'
-import { anything, deepEqual, instance, mock, verify } from '../utilities/mockito'
-import { ExtensionContext } from 'vscode'
-import { YamlExtension } from '../../shared/extensions/yaml'
-import {
-    JsonSchemaHandler,
-    JSONSchemaSettings,
-    SchemaHandler,
-    SchemaService,
-    SchemaType,
-    YamlSchemaHandler,
-} from '../../shared/schemas'
-import { FakeExtensionContext } from '../fakeExtensionContext'
-import { Settings } from '../../shared/settings'
-
-describe('SchemaService', function () {
-    let service: SchemaService
-    let fakeExtensionContext: ExtensionContext
-    let config: Settings
-    let fakeYamlExtension: YamlExtension
-    const cfnSchema = vscode.Uri.file('cfn')
-    const samSchema = vscode.Uri.file('sam')
-
-    beforeEach(async function () {
-        fakeExtensionContext = await FakeExtensionContext.create()
-        fakeYamlExtension = mock()
-        config = new Settings(vscode.ConfigurationTarget.Workspace)
-
-        service = new SchemaService(fakeExtensionContext, {
-            schemas: {
-                cfn: cfnSchema,
-                sam: samSchema,
-            },
-            handlers: new Map<SchemaType, SchemaHandler>([
-                ['json', new JsonSchemaHandler(config)],
-                ['yaml', new YamlSchemaHandler(instance(fakeYamlExtension))],
-            ]),
-        })
-    })
-
-    it('assigns schemas to the yaml extension', async function () {
-        service.registerMapping({
-            uri: vscode.Uri.parse('/foo'),
-            type: 'yaml',
-            schema: 'cfn',
-        })
-        service.registerMapping({
-            uri: vscode.Uri.parse('/bar'),
-            type: 'yaml',
-            schema: 'sam',
-        })
-        await service.processUpdates()
-        verify(fakeYamlExtension.assignSchema(deepEqual(vscode.Uri.file('/foo')), cfnSchema)).once()
-        verify(fakeYamlExtension.assignSchema(deepEqual(vscode.Uri.file('/bar')), samSchema)).once()
-    })
-
-    it('removes schemas from the yaml extension', async function () {
-        service.registerMapping({
-            uri: vscode.Uri.parse('/foo'),
-            type: 'yaml',
-            schema: undefined,
-        })
-        await service.processUpdates()
-        verify(fakeYamlExtension.removeSchema(deepEqual(vscode.Uri.file('/foo')))).once()
-    })
-
-    it('registers schemas to json configuration', async function () {
-        service.registerMapping({
-            uri: vscode.Uri.parse('/foo'),
-            type: 'json',
-            schema: 'cfn',
-        })
-        await service.processUpdates()
-
-        const mappings = config.get('json.schemas')
-        assert.ok(Array.isArray(mappings))
-
-        const added = mappings.find((s: JSONSchemaSettings) => s.url === cfnSchema.toString())
-        assert.ok(added)
-
-        assert.strictEqual(added.fileMatch?.length, 1)
-        assert.strictEqual(added.fileMatch[0], '/foo')
-    })
-
-    it('removes schemas from json configuration', async function () {
-        service.registerMapping({
-            uri: vscode.Uri.parse('/foo'),
-            type: 'json',
-            schema: undefined,
-        })
-        await service.processUpdates()
-
-        const mappings = config.get('json.schemas')
-        assert.ok(Array.isArray(mappings))
-
-        const added = mappings.find((s: JSONSchemaSettings) => s.url === cfnSchema.toString())
-        assert.strictEqual(added, undefined)
-    })
-
-    it('processes no updates if schemas are unavailable', async function () {
-        fakeYamlExtension = mock()
-        service = new SchemaService(fakeExtensionContext, {
-            handlers: new Map<SchemaType, SchemaHandler>([
-                ['json', new JsonSchemaHandler()],
-                ['yaml', new YamlSchemaHandler(instance(fakeYamlExtension))],
-            ]),
-        })
-
-        service.registerMapping({
-            uri: vscode.Uri.parse('/foo'),
-            type: 'yaml',
-            schema: 'cfn',
-        })
-        await service.processUpdates()
-        verify(fakeYamlExtension.assignSchema(anything(), anything())).never()
-    })
-
-    it('processes no updates if yaml extension unavailable', async function () {
-        fakeYamlExtension = mock()
-        service = new SchemaService(fakeExtensionContext)
-
-        service.registerMapping({
-            uri: vscode.Uri.parse('/foo'),
-            type: 'yaml',
-            schema: 'cfn',
-        })
-        await service.processUpdates()
-        verify(fakeYamlExtension.assignSchema(anything(), anything())).never()
-    })
-})
diff --git a/src/test/shared/settingsConfiguration.test.ts b/src/test/shared/settingsConfiguration.test.ts
deleted file mode 100644
index 62dad0adf1d..00000000000
--- a/src/test/shared/settingsConfiguration.test.ts
+++ /dev/null
@@ -1,345 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-import { DevSettings, Experiments, fromExtensionManifest, PromptSettings, Settings } from '../../shared/settings'
-import { TestSettings } from '../utilities/testSettingsConfiguration'
-import { ClassToInterfaceType } from '../../shared/utilities/tsUtils'
-import { Optional } from '../../shared/utilities/typeConstructors'
-
-const settingsTarget = vscode.ConfigurationTarget.Workspace
-
-describe('Settings', function () {
-    // These tests use an actual extension setting, because vscode.WorkspaceConfiguration fails when
-    // you attempt to update one that isn't defined in package.json. We will restore the setting value
-    // at the end of the tests.
-    const settingKey = 'aws.samcli.lambdaTimeout'
-
-    let sut: Settings
-
-    beforeEach(async function () {
-        sut = new Settings(settingsTarget)
-        await sut.update(settingKey, undefined)
-    })
-
-    const scenarios = [
-        { testValue: 1234, desc: 'number' },
-        { testValue: 0, desc: 'default number' },
-        { testValue: 'hello world', desc: 'string' },
-        { testValue: '', desc: 'default string' },
-        { testValue: true, desc: 'true' },
-        { testValue: false, desc: 'false' },
-        { testValue: [], desc: 'empty array' },
-        { testValue: [{ value: 'foo' }, { value: 'bar' }], desc: 'array' },
-        // Empty objects cause pass-through to the global scope; clear your settings if the below test fails
-        { testValue: {}, desc: 'empty object' },
-        { testValue: { value: 'foo' }, desc: 'object' },
-        // Note: we don't test undefined because retrieval returns the package.json configured default value, if there is one
-    ]
-
-    describe('get', function () {
-        let settings: vscode.WorkspaceConfiguration
-
-        beforeEach(function () {
-            settings = vscode.workspace.getConfiguration()
-        })
-
-        scenarios.forEach(scenario => {
-            it(scenario.desc, async () => {
-                await settings.update(settingKey, scenario.testValue, settingsTarget)
-
-                const actualValue = sut.get(settingKey)
-                assert.deepStrictEqual(actualValue, scenario.testValue)
-            })
-        })
-
-        it('failure modes', async () => {
-            //
-            // Missing setting:
-            //
-            const testSetting = 'aws.bogusSetting'
-            assert.strictEqual(sut.get(testSetting), undefined)
-            assert.strictEqual(sut.get(testSetting, Boolean), undefined)
-            assert.strictEqual(sut.get(testSetting, Boolean, true), true)
-
-            //
-            // Setting exists but has wrong type:
-            //
-            await settings.update(settingKey, 123, settingsTarget)
-            assert.throws(() => sut.get(settingKey, String))
-            assert.throws(() => sut.get(settingKey, Object))
-            assert.throws(() => sut.get(settingKey, Boolean))
-        })
-    })
-
-    describe('update', function () {
-        scenarios.forEach(scenario => {
-            it(scenario.desc, async () => {
-                await sut.update(settingKey, scenario.testValue)
-
-                // Write tests need to retrieve vscode.WorkspaceConfiguration after writing the value
-                // because they seem to cache values.
-                const savedValue = vscode.workspace.getConfiguration().get(settingKey)
-
-                assert.deepStrictEqual(savedValue, scenario.testValue)
-            })
-        })
-    })
-
-    describe('onDidChangeSection', function () {
-        const rootSection = settingKey.split('.').shift() ?? ''
-
-        it('fires after a section changes', async function () {
-            let eventCount = 0
-            sut.onDidChangeSection(rootSection, () => (eventCount += 1))
-
-            await sut.update('editor.tabSize', 4)
-            assert.strictEqual(eventCount, 0)
-
-            await sut.update(settingKey, false)
-            assert.strictEqual(eventCount, 1)
-
-            await sut.update(settingKey, true)
-            assert.strictEqual(eventCount, 2)
-        })
-
-        it('scopes the event to the affected section', async function () {
-            const changedEvent = new Promise<vscode.ConfigurationChangeEvent>((resolve, reject) => {
-                setTimeout(() => reject(new Error('Timed out')), 1000)
-                sut.onDidChangeSection(rootSection, resolve)
-            })
-
-            await sut.update(settingKey, true)
-
-            const subKey = settingKey.replace(`${rootSection}.`, '')
-            const affectsConfiguration = await changedEvent.then(e => e.affectsConfiguration.bind(e))
-
-            assert.strictEqual(affectsConfiguration('foo'), false)
-            assert.strictEqual(affectsConfiguration(subKey), true)
-        })
-    })
-
-    describe('fromExtensionManifest', function () {
-        const ProfileSettings = fromExtensionManifest('aws', { profile: String })
-        let settings: TestSettings
-        let instance: InstanceType<typeof ProfileSettings>
-
-        beforeEach(function () {
-            settings = new TestSettings()
-            instance = new ProfileSettings(settings)
-        })
-
-        it('throws if the setting does not exist', function () {
-            assert.throws(() => fromExtensionManifest('aws', { foo: Boolean }))
-        })
-
-        it('can use a default value', function () {
-            assert.strictEqual(instance.get('profile', 'bar'), 'bar')
-        })
-
-        it('can use `undefined` as a default value', function () {
-            const OptionalProfile = fromExtensionManifest('aws', { profile: Optional(String) })
-            assert.strictEqual(new OptionalProfile(settings).get('profile', undefined), undefined)
-        })
-
-        it('can use a saved setting', async function () {
-            await settings.update('aws.profile', 'foo')
-            assert.strictEqual(instance.get('profile'), 'foo')
-        })
-
-        it('ignores the default value if the setting exists', async function () {
-            await settings.update('aws.profile', 'foo')
-            assert.strictEqual(instance.get('profile', 'bar'), 'foo')
-        })
-
-        it('uses the default value if the setting is invalid', async function () {
-            await settings.update('aws.profile', true)
-            assert.strictEqual(instance.get('profile', 'foo'), 'foo')
-        })
-
-        it('throws when the types do not match', async function () {
-            assert.throws(() => instance.get('profile'))
-
-            await settings.update('aws.profile', true)
-            assert.throws(() => instance.get('profile'))
-
-            await settings.update('aws.profile', 123)
-            assert.throws(() => instance.get('profile'))
-        })
-    })
-})
-
-describe('DevSetting', function () {
-    const testSetting = 'forceCloud9'
-
-    let settings: ClassToInterfaceType<Settings>
-    let sut: DevSettings
-
-    beforeEach(function () {
-        settings = new TestSettings()
-        sut = new DevSettings(settings)
-    })
-
-    it('can read settings', async function () {
-        assert.strictEqual(sut.get(testSetting, false), false)
-        await settings.update(`aws.dev.${testSetting}`, true)
-        assert.strictEqual(sut.get(testSetting, false), true)
-    })
-
-    it('only changes active settings if a value exists', function () {
-        assert.strictEqual(sut.get(testSetting, true), true)
-        assert.deepStrictEqual(sut.activeSettings, {})
-    })
-
-    it('only changes active settings if the value is not the default', async function () {
-        await settings.update(`aws.dev.${testSetting}`, false)
-        assert.strictEqual(sut.get(testSetting, false), false)
-        assert.deepStrictEqual(sut.activeSettings, {})
-    })
-
-    it('can notify listeners when a setting is retrieved', async function () {
-        const state = new Promise((resolve, reject) => {
-            setTimeout(() => reject(new Error('Timed out waiting for event')), 1000)
-            sut.onDidChangeActiveSettings(() => resolve(sut.activeSettings))
-        })
-
-        await settings.update(`aws.dev.${testSetting}`, true)
-        assert.strictEqual(sut.get(testSetting, false), true)
-        assert.deepStrictEqual(await state, { [testSetting]: true })
-    })
-})
-
-describe('PromptSetting', function () {
-    const promptSettingKey = 'aws.suppressPrompts'
-    const target = vscode.ConfigurationTarget.Workspace
-
-    let settings: Settings
-    let sut: PromptSettings
-
-    beforeEach(async function () {
-        settings = new Settings(target)
-        sut = new PromptSettings(settings)
-        await sut.reset()
-    })
-
-    describe('disablePrompt', async function () {
-        const promptName = 'apprunnerNotifyPricing'
-
-        const scenarios = [
-            {
-                testValue: { apprunnerNotifyPricing: true, other: false },
-                expected: { apprunnerNotifyPricing: true, other: false },
-                desc: 'stays suppressed',
-            },
-            {
-                testValue: { apprunnerNotifyPricing: false },
-                expected: { apprunnerNotifyPricing: true },
-                desc: 'suppresses prompt',
-            },
-        ]
-        scenarios.forEach(scenario => {
-            it(scenario.desc, async () => {
-                const defaultSetting = settings.get(promptSettingKey, Object)
-                await settings.update(promptSettingKey, scenario.testValue)
-                await sut.disablePrompt(promptName)
-                const actual = settings.get(promptSettingKey)
-                const expected = { ...defaultSetting, ...scenario.expected }
-                assert.deepStrictEqual(actual, expected)
-            })
-        })
-    })
-
-    describe('isPromptEnabled', async function () {
-        const promptName = 'apprunnerNotifyPricing'
-
-        const scenarios = [
-            {
-                testValue: { apprunnerNotifyPricing: false },
-                expected: true,
-                promptAfter: { apprunnerNotifyPricing: false },
-                desc: 'true when not suppressed',
-            },
-            {
-                testValue: { apprunnerNotifyPricing: true },
-                expected: false,
-                promptAfter: { apprunnerNotifyPricing: true },
-                desc: 'false when suppressed',
-            },
-            {
-                testValue: { wrongName: false },
-                expected: true,
-                promptAfter: { wrongName: false },
-                desc: 'true when not found',
-            },
-            {
-                testValue: { apprunnerNotifyPricing: 7 },
-                expected: true,
-                promptAfter: {},
-                desc: 'true when prompt has wrong type',
-            },
-        ]
-
-        scenarios.forEach(scenario => {
-            it(scenario.desc, async () => {
-                await settings.update(promptSettingKey, scenario.testValue)
-                const before = settings.get(promptSettingKey, Object, {})
-                const result = await sut.isPromptEnabled(promptName)
-
-                assert.deepStrictEqual(result, scenario.expected)
-                assert.deepStrictEqual(
-                    { ...before, ...settings.get(promptSettingKey, Object) },
-                    { ...before, ...scenario.promptAfter }
-                )
-            })
-        })
-    })
-})
-
-describe('Experiments', function () {
-    let sut: Experiments
-
-    beforeEach(async function () {
-        sut = new Experiments(new TestSettings())
-        await sut.reset()
-    })
-
-    // The `Experiments` class is basically an immutable form of `PromptSettings`
-
-    it('returns false when the setting is missing', async function () {
-        assert.strictEqual(await sut.isExperimentEnabled('jsonResourceModification'), false)
-    })
-
-    it('returns false for invalid types', async function () {
-        await sut.update('jsonResourceModification', 'definitely a boolean' as unknown as boolean)
-        assert.strictEqual(await sut.isExperimentEnabled('jsonResourceModification'), false)
-    })
-
-    it('returns true when the flag is set', async function () {
-        await sut.update('jsonResourceModification', true)
-        assert.strictEqual(await sut.isExperimentEnabled('jsonResourceModification'), true)
-    })
-
-    it('fires events from nested settings', async function () {
-        const info = vscode.workspace.getConfiguration().inspect('aws.experiments.jsonResourceModification')
-        if (info?.globalValue) {
-            this.skip()
-        }
-
-        const experiments = new Experiments(new Settings(vscode.ConfigurationTarget.Workspace))
-
-        try {
-            const key = new Promise<string>((resolve, reject) => {
-                experiments.onDidChange(event => resolve(event.key))
-                setTimeout(() => reject(new Error('Timed out waiting for settings event')), 5000)
-            })
-
-            await experiments.update('jsonResourceModification', true)
-            assert.strictEqual(await key, 'jsonResourceModification')
-        } finally {
-            await experiments.reset()
-        }
-    })
-})
diff --git a/src/test/shared/systemUtilities.test.ts b/src/test/shared/systemUtilities.test.ts
deleted file mode 100644
index 7773bd880fa..00000000000
--- a/src/test/shared/systemUtilities.test.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-import * as fs from 'fs-extra'
-import * as os from 'os'
-import * as path from 'path'
-
-import { EnvironmentVariables } from '../../shared/environmentVariables'
-import { makeTemporaryToolkitFolder } from '../../shared/filesystemUtilities'
-import { SystemUtilities } from '../../shared/systemUtilities'
-import * as testutil from '../testUtil'
-
-describe('SystemUtilities', function () {
-    let tempFolder: string
-
-    before(async function () {
-        // Make a temp folder for all these tests
-        // Stick some temp credentials files in there to load from
-        tempFolder = await makeTemporaryToolkitFolder()
-    })
-
-    after(async function () {
-        await fs.remove(tempFolder)
-    })
-
-    describe('getHomeDirectory', function () {
-        it('gets HOME if set', async function () {
-            const env = process.env as EnvironmentVariables
-
-            env.HOME = 'c:\\qwerty'
-            assert.strictEqual(SystemUtilities.getHomeDirectory(), 'c:\\qwerty')
-        })
-
-        it('gets USERPROFILE if set and HOME is not set', async function () {
-            const env = process.env as EnvironmentVariables
-
-            delete env.HOME
-            env.USERPROFILE = 'c:\\profiles\\qwerty'
-            assert.strictEqual(SystemUtilities.getHomeDirectory(), 'c:\\profiles\\qwerty')
-        })
-
-        it('gets HOMEPATH if set and HOME and USERPROFILE are not set', async function () {
-            const env = process.env as EnvironmentVariables
-
-            delete env.HOME
-            delete env.USERPROFILE
-            delete env.HOMEDRIVE
-            env.HOMEPATH = `${path.sep}users${path.sep}homepath`
-            assert.strictEqual(
-                SystemUtilities.getHomeDirectory().toLowerCase(),
-                `c:${path.sep}users${path.sep}homepath`
-            )
-        })
-
-        it('prefixes result with HOMEDRIVE if set', async function () {
-            const env = process.env as EnvironmentVariables
-
-            delete env.HOME
-            delete env.USERPROFILE
-            env.HOMEPATH = `${path.sep}users${path.sep}homepath`
-            env.HOMEDRIVE = 'x:'
-            assert.strictEqual(SystemUtilities.getHomeDirectory(), `x:${path.sep}users${path.sep}homepath`)
-        })
-
-        it('falls back on os.homedir if no environment variables are set', async function () {
-            const env = process.env as EnvironmentVariables
-
-            delete env.HOME
-            delete env.USERPROFILE
-            delete env.HOMEPATH
-            delete env.HOMEDRIVE
-
-            assert.strictEqual(SystemUtilities.getHomeDirectory(), os.homedir())
-        })
-    })
-
-    describe('fileExists', function () {
-        it('returns true if file exists', async function () {
-            const filename: string = path.join(tempFolder, 'existing-file.txt')
-
-            fs.writeFileSync(filename, 'hello world', 'utf8')
-
-            assert.strictEqual(await SystemUtilities.fileExists(filename), true)
-        })
-
-        it('returns false if file does not exist', async function () {
-            const filename: string = path.join(tempFolder, 'non-existing-file.txt')
-            assert.strictEqual(await SystemUtilities.fileExists(filename), false)
-        })
-    })
-
-    it('findTypescriptCompiler()', async function () {
-        const iswin = process.platform === 'win32'
-        const workspace = vscode.workspace.workspaceFolders![0]
-        const tscNodemodules = path.join(workspace.uri.fsPath, `foo/bar/node_modules/.bin/tsc${iswin ? '.cmd' : ''}`)
-        fs.removeSync(tscNodemodules)
-
-        // The test workspace normally doesn't have node_modules so this will
-        // be undefined or it will find the globally-installed "tsc".
-        const tscGlobal = await SystemUtilities.findTypescriptCompiler()
-        assert.ok(tscGlobal === undefined || tscGlobal === 'tsc')
-
-        // Create a fake "node_modules/.bin/tsc" in the test workspace.
-        testutil.createExecutableFile(tscNodemodules, 'echo "typescript Version 42"')
-
-        const result = await SystemUtilities.findTypescriptCompiler()
-        assert(result !== undefined)
-        testutil.assertEqualPaths(result, tscNodemodules)
-        fs.removeSync(tscNodemodules)
-    })
-
-    it('getVscodeCliPath()', async function () {
-        if (os.platform() === 'linux') {
-            this.skip()
-        }
-        const vscPath = await SystemUtilities.getVscodeCliPath()
-        assert(vscPath)
-        const regex = /bin[\\\/](code|code-insiders)$/
-        assert.ok(regex.test(vscPath), `expected regex ${regex} to match: "${vscPath}"`)
-    })
-})
diff --git a/src/test/shared/telemetry/activation.test.ts b/src/test/shared/telemetry/activation.test.ts
deleted file mode 100644
index 2eb524603aa..00000000000
--- a/src/test/shared/telemetry/activation.test.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as sinon from 'sinon'
-import * as vscode from 'vscode'
-
-import { FakeExtensionContext } from '../../fakeExtensionContext'
-import {
-    handleTelemetryNoticeResponse,
-    noticeResponseViewSettings,
-    noticeResponseOk,
-    TELEMETRY_NOTICE_VERSION_ACKNOWLEDGED,
-    hasUserSeenTelemetryNotice,
-    setHasUserSeenTelemetryNotice,
-} from '../../../shared/telemetry/activation'
-
-describe('handleTelemetryNoticeResponse', function () {
-    let extensionContext: vscode.ExtensionContext
-    let sandbox: sinon.SinonSandbox
-
-    before(function () {
-        sandbox = sinon.createSandbox()
-    })
-
-    after(function () {
-        sandbox.restore()
-    })
-
-    beforeEach(async function () {
-        extensionContext = await FakeExtensionContext.create()
-    })
-
-    it('does nothing when notice is discarded', async function () {
-        await handleTelemetryNoticeResponse(undefined, extensionContext)
-
-        assert.strictEqual(
-            extensionContext.globalState.get(TELEMETRY_NOTICE_VERSION_ACKNOWLEDGED),
-            undefined,
-            'Expected opt out shown state to remain unchanged'
-        )
-    })
-
-    it('handles View Settings response', async function () {
-        const executeCommand = sandbox.stub(vscode.commands, 'executeCommand')
-
-        await handleTelemetryNoticeResponse(noticeResponseViewSettings, extensionContext)
-
-        assert.ok(executeCommand.calledOnce, 'Expected to trigger View Settings')
-        assert.strictEqual(
-            extensionContext.globalState.get(TELEMETRY_NOTICE_VERSION_ACKNOWLEDGED),
-            2,
-            'Expected opt out shown state to be set'
-        )
-    })
-
-    it('handles Ok response', async function () {
-        await handleTelemetryNoticeResponse(noticeResponseOk, extensionContext)
-
-        assert.strictEqual(
-            extensionContext.globalState.get(TELEMETRY_NOTICE_VERSION_ACKNOWLEDGED),
-            2,
-            'Expected opt out shown state to be set'
-        )
-    })
-})
-
-describe('hasUserSeenTelemetryNotice', async function () {
-    let extensionContext: vscode.ExtensionContext
-    let sandbox: sinon.SinonSandbox
-
-    before(function () {
-        sandbox = sinon.createSandbox()
-    })
-
-    after(function () {
-        sandbox.restore()
-    })
-
-    beforeEach(async function () {
-        extensionContext = await FakeExtensionContext.create()
-    })
-
-    it('is affected by setHasUserSeenTelemetryNotice', async function () {
-        assert.ok(!hasUserSeenTelemetryNotice(extensionContext))
-        await setHasUserSeenTelemetryNotice(extensionContext)
-        assert.ok(hasUserSeenTelemetryNotice(extensionContext))
-    })
-
-    const scenarios = [
-        { currentState: undefined, expectedHasSeen: false, desc: 'never seen before' },
-        { currentState: 0, expectedHasSeen: false, desc: 'seen an older version' },
-        { currentState: 2, expectedHasSeen: true, desc: 'seen the current version' },
-        { currentState: 9999, expectedHasSeen: true, desc: 'seen a future version' },
-    ]
-
-    scenarios.forEach(scenario => {
-        it(scenario.desc, async () => {
-            await extensionContext.globalState.update(TELEMETRY_NOTICE_VERSION_ACKNOWLEDGED, scenario.currentState)
-            assert.strictEqual(hasUserSeenTelemetryNotice(extensionContext), scenario.expectedHasSeen)
-        })
-    })
-})
diff --git a/src/test/shared/telemetry/spans.test.ts b/src/test/shared/telemetry/spans.test.ts
deleted file mode 100644
index 6efdf991b73..00000000000
--- a/src/test/shared/telemetry/spans.test.ts
+++ /dev/null
@@ -1,248 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { ToolkitError } from '../../../shared/errors'
-import { TelemetrySpan, TelemetryTracer } from '../../../shared/telemetry/spans'
-import { MetricName, MetricShapes } from '../../../shared/telemetry/telemetry'
-import { assertTelemetry, getMetrics, installFakeClock } from '../../testUtil'
-
-describe('TelemetrySpan', function () {
-    let clock: ReturnType<typeof installFakeClock>
-
-    beforeEach(function () {
-        clock = installFakeClock()
-    })
-
-    afterEach(function () {
-        clock.uninstall()
-    })
-
-    it('removes passive and value from the metadata', function () {
-        new TelemetrySpan('foo').emit({ passive: false, value: 100, reason: 'bar' })
-
-        assert.deepStrictEqual(getMetrics('foo' as MetricName)[0], { reason: 'bar' })
-    })
-
-    it('records duration if a start time is available', function () {
-        const span = new TelemetrySpan('foo').start()
-        clock.tick(100)
-        span.stop()
-
-        assert.deepStrictEqual(getMetrics('foo' as MetricName)[0], {
-            result: 'Succeeded',
-            duration: '100',
-        })
-    })
-
-    it('records failure reason if available', function () {
-        new TelemetrySpan('foo').start().stop(new ToolkitError('', { code: 'Foo' }))
-
-        assert.deepStrictEqual(getMetrics('foo' as MetricName)[0], {
-            result: 'Failed',
-            reason: 'Foo',
-            duration: '0',
-        })
-    })
-
-    it('reports missing required fields', function () {
-        new TelemetrySpan('vscode_executeCommand').emit()
-
-        assert.deepStrictEqual(getMetrics('vscode_executeCommand')[0], {
-            missingFields: String(['command', 'debounceCount']),
-        })
-    })
-
-    it('can create clones that do not copy the start time', function () {
-        const span = new TelemetrySpan('foo').record({ reason: 'bar' }).start()
-        clock.tick(100)
-        span.clone().emit({ result: 'Failed' })
-        span.stop()
-
-        const metrics = getMetrics('foo' as MetricName)
-        assert.deepStrictEqual(metrics[0], { result: 'Failed', reason: 'bar' })
-        assert.deepStrictEqual(metrics[1], { result: 'Succeeded', duration: '100' })
-    })
-})
-
-describe('TelemetryTracer', function () {
-    const metricName = 'test_metric' as MetricName
-
-    describe('record', function () {
-        it('writes data to all spans in the current context', function () {
-            const tracer = new TelemetryTracer()
-            tracer.apigateway_copyUrl.record({})
-            tracer.run(metricName, () => tracer.record({ source: 'bar' }))
-            tracer.spans[0]?.emit()
-
-            assertTelemetry(metricName, { result: 'Succeeded', source: 'bar' })
-            assertTelemetry('apigateway_copyUrl', { source: 'bar' } as MetricShapes['apigateway_copyUrl'])
-        })
-    })
-
-    describe('instrument', function () {
-        async function assertPositive(n: number): Promise<number> {
-            if (n <= 0) {
-                throw new Error()
-            }
-
-            return n
-        }
-
-        it('can instrument a function', async function () {
-            const tracer = new TelemetryTracer()
-            const fn = tracer.instrument(metricName, assertPositive)
-
-            assert.strictEqual(await fn(1), 1)
-            assertTelemetry(metricName, { result: 'Succeeded' })
-        })
-
-        it('can instrument a function that fails', async function () {
-            const tracer = new TelemetryTracer()
-            const fn = tracer.instrument(metricName, assertPositive)
-
-            await assert.rejects(() => fn(-1))
-            assertTelemetry(metricName, { result: 'Failed', reason: 'Error' })
-        })
-    })
-
-    describe('metrics', function () {
-        it('adds the span to the current context', function () {
-            const tracer = new TelemetryTracer()
-            tracer.vscode_executeCommand.record({ command: 'foo', debounceCount: 1 })
-
-            assert.strictEqual(tracer.spans[0].name, 'vscode_executeCommand')
-        })
-
-        it('does not change the context when emitting', function () {
-            const tracer = new TelemetryTracer()
-            tracer.vscode_executeCommand.emit({ command: 'foo', debounceCount: 1 })
-
-            assert.strictEqual(tracer.activeSpan, undefined)
-            assert.strictEqual(tracer.spans.length, 0)
-        })
-
-        it('does not change the active span when using a different span', function () {
-            const tracer = new TelemetryTracer()
-            tracer.run(metricName, span => {
-                tracer.vscode_executeCommand.record({ command: 'foo', debounceCount: 1 })
-                assert.strictEqual(tracer.activeSpan, span)
-            })
-
-            assertTelemetry(metricName, { result: 'Succeeded' })
-            assert.strictEqual(tracer.activeSpan, undefined)
-        })
-
-        it('re-uses existing spans if available', function () {
-            const tracer = new TelemetryTracer()
-            tracer.vscode_executeCommand.record({ command: 'foo' })
-            tracer.vscode_executeCommand.run(span => span.record({ debounceCount: 100 }))
-
-            assertTelemetry('vscode_executeCommand', {
-                result: 'Succeeded',
-                command: 'foo',
-                debounceCount: 100,
-            })
-        })
-
-        it('does not persist changes made to the span when switching contexts', function () {
-            const tracer = new TelemetryTracer()
-            tracer.vscode_executeCommand.record({ command: 'foo' })
-            tracer.vscode_executeCommand.run(span => span.record({ debounceCount: 100 }))
-            tracer.spans[0]?.emit()
-
-            const metrics = getMetrics('vscode_executeCommand', 'duration', 'result', 'missingFields')
-            assert.deepStrictEqual(metrics[1], { command: 'foo' })
-            assert.deepStrictEqual(metrics[0], { command: 'foo', debounceCount: '100' })
-        })
-    })
-
-    describe('run', function () {
-        it('returns the result of the function', function () {
-            const tracer = new TelemetryTracer()
-            const result = tracer.run(metricName, () => 'foo')
-
-            assert.strictEqual(result, 'foo')
-        })
-
-        it('sets the active span', function () {
-            const tracer = new TelemetryTracer()
-            const checkSpan = () => tracer.run(metricName, span => assert.strictEqual(tracer.activeSpan, span))
-
-            assert.doesNotThrow(checkSpan)
-        })
-
-        it('uses a span over a telemetry metric', function () {
-            const tracer = new TelemetryTracer()
-            tracer.run(metricName, span => span.record({ source: 'bar' }))
-
-            assertTelemetry(metricName, { result: 'Succeeded', source: 'bar' })
-        })
-
-        describe('nested run', function () {
-            const nestedName = 'nested_metric' as MetricName
-
-            it('can record metadata in nested spans', function () {
-                const tracer = new TelemetryTracer()
-
-                tracer.run(metricName, span1 => {
-                    span1.record({ source: 'bar' })
-
-                    tracer.run(nestedName, span2 => {
-                        span1.record({ attempts: 1 })
-                        span2.record({ source: 'foo' })
-                    })
-                })
-
-                assertTelemetry(metricName, { result: 'Succeeded', source: 'bar', attempts: 1 })
-                assertTelemetry(nestedName, { result: 'Succeeded', source: 'foo' })
-            })
-
-            it('removes spans when exiting an execution context', function () {
-                const tracer = new TelemetryTracer()
-
-                tracer.run(metricName, () => {
-                    tracer.run(nestedName, () => {
-                        assert.strictEqual(tracer.spans.length, 2)
-                    })
-
-                    assert.strictEqual(tracer.spans.length, 1)
-                })
-            })
-
-            it('adds spans during a nested execution', function () {
-                const tracer = new TelemetryTracer()
-
-                tracer.run(metricName, () => {
-                    tracer.run(nestedName, () => {
-                        assert.strictEqual(tracer.spans.length, 2)
-                        tracer.apigateway_copyUrl.record({})
-                        assert.strictEqual(tracer.spans.length, 3)
-                    })
-
-                    assert.strictEqual(tracer.spans.length, 1)
-                })
-            })
-
-            it('closes spans after exiting nested executions', function () {
-                const tracer = new TelemetryTracer()
-
-                tracer.run(metricName, () => {
-                    tracer.apigateway_copyUrl.record({})
-
-                    tracer.run(nestedName, () => {
-                        assert.strictEqual(tracer.spans.length, 3)
-                        tracer.apigateway_copyUrl.record({})
-                        assert.strictEqual(tracer.spans.length, 3)
-                    })
-
-                    assert.strictEqual(tracer.spans.length, 2)
-                })
-
-                assert.strictEqual(tracer.spans.length, 0)
-            })
-        })
-    })
-})
diff --git a/src/test/shared/telemetry/telemetryService.test.ts b/src/test/shared/telemetry/telemetryService.test.ts
deleted file mode 100644
index 6bdfcd15e0e..00000000000
--- a/src/test/shared/telemetry/telemetryService.test.ts
+++ /dev/null
@@ -1,247 +0,0 @@
-/*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as FakeTimers from '@sinonjs/fake-timers'
-import * as sinon from 'sinon'
-import * as fs from 'fs-extra'
-import { DefaultTelemetryService } from '../../../shared/telemetry/telemetryService'
-import { AccountStatus } from '../../../shared/telemetry/telemetryClient'
-import { FakeExtensionContext } from '../../fakeExtensionContext'
-
-import {
-    defaultTestAccountId,
-    FakeAwsContext,
-    makeFakeAwsContextWithPlaceholderIds,
-} from '../../utilities/fakeAwsContext'
-import { FakeTelemetryPublisher } from '../../fake/fakeTelemetryService'
-import ClientTelemetry = require('../../../shared/telemetry/clienttelemetry')
-import { installFakeClock } from '../../testUtil'
-import { TelemetryLogger } from '../../../shared/telemetry/telemetryLogger'
-import globals from '../../../shared/extensionGlobals'
-import { toArrayAsync } from '../../../shared/utilities/collectionUtils'
-
-type Metric = { [P in keyof ClientTelemetry.MetricDatum as Uncapitalize<P>]: ClientTelemetry.MetricDatum[P] }
-
-export function fakeMetric(metric: Partial<Metric> = {}): ClientTelemetry.MetricDatum {
-    return {
-        Passive: metric.passive ?? true,
-        MetricName: metric.metricName ?? `metric${metric.value ?? ''}`,
-        Value: metric.value ?? 1,
-        Unit: metric.unit ?? 'None',
-        EpochTimestamp: metric.epochTimestamp ?? new globals.clock.Date().getTime(),
-    }
-}
-
-describe('DefaultTelemetryService', function () {
-    const testFlushPeriod = 10
-    let clock: FakeTimers.InstalledClock
-    let sandbox: sinon.SinonSandbox
-    let mockContext: FakeExtensionContext
-    let mockPublisher: FakeTelemetryPublisher
-    let service: DefaultTelemetryService
-    let logger: TelemetryLogger
-
-    function initService(awsContext = new FakeAwsContext()): DefaultTelemetryService {
-        const newService = new DefaultTelemetryService(mockContext, awsContext, undefined, mockPublisher)
-        newService.flushPeriod = testFlushPeriod
-        newService.telemetryEnabled = true
-
-        return newService
-    }
-
-    function stubGlobal() {
-        // TODO: don't record session stop/start using the global object so we don't have to do this
-        sandbox.stub(globals, 'telemetry').value(service)
-    }
-
-    before(function () {
-        sandbox = sinon.createSandbox()
-    })
-
-    beforeEach(async function () {
-        mockContext = await FakeExtensionContext.create()
-        mockPublisher = new FakeTelemetryPublisher()
-        service = initService()
-        logger = service.logger
-        clock = installFakeClock()
-    })
-
-    afterEach(async function () {
-        await fs.remove(service.persistFilePath)
-        sandbox.restore()
-        clock.uninstall()
-    })
-
-    after(function () {
-        clock.uninstall()
-    })
-
-    it('posts feedback', async function () {
-        service.telemetryEnabled = false
-        const feedback = { comment: '', sentiment: '' }
-        await service.postFeedback(feedback)
-
-        assert.strictEqual(mockPublisher.feedback, feedback)
-    })
-
-    it('assertPassiveTelemetry() throws if active, non-cached metric is emitted during startup', async function () {
-        // Simulate cached telemetry by prepopulating records before start().
-        // (Normally readEventsFromCache() does this.)
-        service.record(fakeMetric({ value: 1, passive: true }))
-        service.record(fakeMetric({ value: 2, passive: true }))
-        // Active *cached* metric.
-        service.record(fakeMetric({ value: 4, passive: false }))
-        await service.start()
-
-        // Passive *non-cached* metric.
-        service.record(fakeMetric({ value: 5, passive: true }))
-
-        // Must *not* throw.
-        service.assertPassiveTelemetry(false)
-
-        // Active *non-cached* metric.
-        service.record(fakeMetric({ value: 6, passive: false }))
-
-        // Must throw.
-        assert.throws(() => {
-            service.assertPassiveTelemetry(false)
-        })
-
-        await service.shutdown()
-    })
-
-    it('findIter() queries pending metric items', async function () {
-        await service.start()
-        const m1 = fakeMetric({ value: 1, passive: true })
-        const m2 = fakeMetric({ value: 2, passive: true })
-        const m3 = fakeMetric({ value: 4, passive: false })
-        const m4 = fakeMetric({ value: 5, passive: false })
-        const m5 = fakeMetric({ value: 6, passive: true })
-        service.record(m1)
-        service.record(m2)
-        service.record(m3)
-        service.record(m4)
-        service.record(m5)
-
-        assert.deepStrictEqual(
-            await toArrayAsync(
-                service.findIter(m => {
-                    return m.MetricName === 'bogus'
-                })
-            ),
-            []
-        )
-        assert.deepStrictEqual(
-            await toArrayAsync(
-                service.findIter(m => {
-                    return m.MetricName === 'metric1'
-                })
-            ),
-            [m1]
-        )
-        assert.deepStrictEqual(
-            await toArrayAsync(
-                service.findIter(m => {
-                    return !!m.Passive
-                })
-            ),
-            [m1, m2, m5]
-        )
-
-        await service.shutdown()
-    })
-
-    it('publishes periodically if user has said ok', async function () {
-        stubGlobal()
-
-        service.record(fakeMetric())
-
-        await service.start()
-        assert.notStrictEqual(service.timer, undefined)
-
-        clock.tick(testFlushPeriod)
-        await service.shutdown()
-
-        assert.strictEqual(mockPublisher.flushCount, 1)
-        assert.strictEqual(mockPublisher.queue.length, 2)
-    })
-
-    it('events automatically inject the active account id into the metadata', async function () {
-        service = initService(makeFakeAwsContextWithPlaceholderIds({} as any as AWS.Credentials))
-        logger = service.logger
-        service.record(fakeMetric({ metricName: 'name' }))
-
-        assert.strictEqual(logger.metricCount, 1)
-
-        const metrics = logger.queryFull({ metricName: 'name' })
-        assertMetadataContainsTestAccount(metrics[0], defaultTestAccountId)
-    })
-
-    it('events with `session` namespace do not have an account tied to them', async function () {
-        stubGlobal()
-
-        await service.start()
-        await service.shutdown()
-
-        assert.strictEqual(logger.metricCount, 1)
-        const startEvents = logger.queryFull({ metricName: 'session_start' })
-        assertMetadataContainsTestAccount(startEvents[0], AccountStatus.NotApplicable)
-
-        const shutdownEvents = logger.queryFull({ metricName: 'session_start' })
-        assertMetadataContainsTestAccount(shutdownEvents[0], AccountStatus.NotApplicable)
-    })
-
-    it('events created with a bad active account produce metadata mentioning the bad account', async function () {
-        service = initService({ getCredentialAccountId: () => 'this is bad!' } as unknown as FakeAwsContext)
-        logger = service.logger
-
-        service.record(fakeMetric({ metricName: 'name' }))
-        assert.strictEqual(logger.metricCount, 1)
-
-        const metricDatum = logger.queryFull({ metricName: 'name' })
-        assertMetadataContainsTestAccount(metricDatum[0], AccountStatus.Invalid)
-    })
-
-    it('events created prior to signing in do not have an account attached', async function () {
-        service.record(fakeMetric({ metricName: 'name' }))
-        assert.strictEqual(logger.metricCount, 1)
-
-        const metricData = logger.queryFull({ metricName: 'name' })
-        assertMetadataContainsTestAccount(metricData[0], AccountStatus.NotSet)
-    })
-
-    it('events are never recorded if telemetry has been disabled', async function () {
-        stubGlobal()
-
-        service.telemetryEnabled = false
-        await service.start()
-
-        // telemetry off: events are never recorded
-        service.record(fakeMetric({ metricName: 'name' }))
-        await service.shutdown()
-        await clock.tickAsync(testFlushPeriod * 2)
-
-        // events are never flushed
-        assert.strictEqual(mockPublisher.flushCount, 0)
-        assert.strictEqual(mockPublisher.enqueueCount, 0)
-        assert.strictEqual(mockPublisher.queue.length, 0)
-        // and events are not kept in memory
-        assert.strictEqual(logger.metricCount, 0)
-    })
-
-    function assertMetadataContainsTestAccount(
-        metricDatum: ClientTelemetry.MetricDatum | undefined,
-        expectedAccountId: string
-    ) {
-        assert.ok(metricDatum, 'Metric datum was undefined')
-        const metadata = metricDatum.Metadata
-        assert.ok(metadata, 'Metric metadata was undefined')
-        assert.ok(
-            metadata.some(item => item.Key === 'awsAccount' && item.Value === expectedAccountId),
-            'Expected metadata to contain the test account'
-        )
-    }
-})
diff --git a/src/test/shared/telemetry/util.test.ts b/src/test/shared/telemetry/util.test.ts
deleted file mode 100644
index 9c067d7e8b4..00000000000
--- a/src/test/shared/telemetry/util.test.ts
+++ /dev/null
@@ -1,159 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { Memento, ConfigurationTarget } from 'vscode'
-import { Settings } from '../../../shared/settings'
-import { convertLegacy, getClientId, TelemetryConfig } from '../../../shared/telemetry/util'
-import { FakeMemento } from '../../fakeExtensionContext'
-
-describe('TelemetryConfig', function () {
-    const settingKey = 'aws.telemetry'
-    const settings = new Settings(ConfigurationTarget.Workspace)
-
-    let sut: TelemetryConfig
-
-    beforeEach(function () {
-        sut = new TelemetryConfig(settings)
-    })
-
-    afterEach(async function () {
-        await sut.reset()
-    })
-
-    const scenarios = [
-        {
-            initialSettingValue: 'Enable',
-            expectedIsEnabledValue: true,
-            desc: 'Original opt-in value',
-            expectedSanitizedValue: true,
-        },
-        {
-            initialSettingValue: 'Disable',
-            expectedIsEnabledValue: false,
-            desc: 'Original opt-out value',
-            expectedSanitizedValue: false,
-        },
-        {
-            initialSettingValue: 'Use IDE settings',
-            expectedIsEnabledValue: true,
-            desc: 'Original deferral value',
-            expectedSanitizedValue: 'Use IDE settings',
-        },
-        { initialSettingValue: true, expectedIsEnabledValue: true, desc: 'Opt in', expectedSanitizedValue: true },
-        { initialSettingValue: false, expectedIsEnabledValue: false, desc: 'Opt out', expectedSanitizedValue: false },
-        {
-            initialSettingValue: 1234,
-            expectedIsEnabledValue: true,
-            desc: 'Unexpected numbers',
-            expectedSanitizedValue: 1234,
-        },
-        {
-            initialSettingValue: { label: 'garbageData' },
-            expectedIsEnabledValue: true,
-            desc: 'Unexpected object',
-            expectedSanitizedValue: { label: 'garbageData' },
-        },
-        {
-            initialSettingValue: [{ label: 'garbageDataList' }],
-            expectedIsEnabledValue: true,
-            desc: 'Unexpected array',
-            expectedSanitizedValue: [{ label: 'garbageDataList' }],
-        },
-        {
-            initialSettingValue: undefined,
-            expectedIsEnabledValue: true,
-            desc: 'Unset value',
-            expectedSanitizedValue: undefined,
-        },
-    ]
-
-    describe('isTelemetryEnabled', function () {
-        scenarios.forEach(scenario => {
-            it(scenario.desc, async () => {
-                await settings.update(settingKey, scenario.initialSettingValue)
-
-                assert.strictEqual(sut.isEnabled(), scenario.expectedIsEnabledValue)
-            })
-        })
-    })
-
-    describe('sanitizeTelemetrySetting', function () {
-        scenarios.forEach(scenario => {
-            it(scenario.desc, () => {
-                const tryConvert = () => {
-                    try {
-                        return convertLegacy(scenario.initialSettingValue)
-                    } catch {
-                        return scenario.initialSettingValue
-                    }
-                }
-
-                assert.deepStrictEqual(tryConvert(), scenario.expectedSanitizedValue)
-            })
-        })
-    })
-})
-
-describe('getClientId', function () {
-    it('should generate a unique id', async function () {
-        const c1 = await getClientId(new FakeMemento(), true, false)
-        const c2 = await getClientId(new FakeMemento(), true, false)
-        assert.notStrictEqual(c1, c2)
-    })
-
-    it('returns the same value across the calls', async function () {
-        const memento = new FakeMemento()
-        const c1 = getClientId(memento, true, false)
-        const c2 = getClientId(memento, true, false)
-        assert.strictEqual(await c1, await c2, 'Expected client ids to be same')
-    })
-
-    it('returns the same value across the calls sequentially', async function () {
-        const memento = new FakeMemento()
-        const c1 = await getClientId(memento, true, false)
-        const c2 = await getClientId(memento, true, false)
-        assert.strictEqual(c1, c2)
-    })
-
-    it('returns the nil UUID if it fails to save generated UUID', async function () {
-        const mememto: Memento = {
-            get(key) {
-                return undefined
-            },
-            update(key, value) {
-                throw new Error()
-            },
-        }
-        const clientId = await getClientId(mememto, true, false)
-        assert.strictEqual(clientId, '00000000-0000-0000-0000-000000000000')
-    })
-
-    it('returns the nil UUID if fails to retrive a saved UUID.', async function () {
-        const mememto: Memento = {
-            get(key) {
-                throw new Error()
-            },
-            async update(key, value) {},
-        }
-        const clientId = await getClientId(mememto, true, false)
-        assert.strictEqual(clientId, '00000000-0000-0000-0000-000000000000')
-    })
-
-    it('should be ffffffff-ffff-ffff-ffff-ffffffffffff if in test enviroment', async function () {
-        const clientId = await getClientId(new FakeMemento(), true)
-        assert.strictEqual(clientId, 'ffffffff-ffff-ffff-ffff-ffffffffffff')
-    })
-
-    it('should be ffffffff-ffff-ffff-ffff-ffffffffffff if telemetry is not enabled in test enviroment', async function () {
-        const clientId = await getClientId(new FakeMemento(), false)
-        assert.strictEqual(clientId, 'ffffffff-ffff-ffff-ffff-ffffffffffff')
-    })
-
-    it('should be 11111111-1111-1111-1111-111111111111 if telemetry is not enabled', async function () {
-        const clientId = await getClientId(new FakeMemento(), false, false)
-        assert.strictEqual(clientId, '11111111-1111-1111-1111-111111111111')
-    })
-})
diff --git a/src/test/shared/treeview/testUtil.ts b/src/test/shared/treeview/testUtil.ts
deleted file mode 100644
index 8f9cf2fe9ff..00000000000
--- a/src/test/shared/treeview/testUtil.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as assert from 'assert'
-import { selectFrom, keys } from '../../../shared/utilities/tsUtils'
-import { TreeNode } from '../../../shared/treeview/resourceTreeDataProvider'
-
-type Nodeable = { toTreeNode: () => TreeNode }
-type Node = TreeNode | Nodeable
-type Matcher = string | { [P in keyof vscode.TreeItem]: vscode.TreeItem[P] }
-
-const resolveNode = (node: Node) =>
-    (node as Nodeable).toTreeNode !== undefined ? (node as Nodeable).toTreeNode() : (node as TreeNode)
-
-const applyMatcher = (item: vscode.TreeItem, matcher: Matcher | undefined) =>
-    !!matcher && typeof matcher !== 'string' ? selectFrom(item, ...keys(matcher)) : item.label
-
-/**
- * Checks if the explorer tree node produces an item that matches the expected properties.
- *
- * Only fields specified will be checked. Everything else on the item is ignored.
- */
-export async function assertTreeItem(model: Node, expected: Exclude<Matcher, string>): Promise<void | never> {
-    const item = await resolveNode(model).getTreeItem()
-    assert.deepStrictEqual(applyMatcher(item, expected), expected)
-}
-
-/**
- * Checks if the explorer tree node produces the expected children.
- *
- * Children can be matched either by their label or by an object of expected properties.
- */
-export async function assertChildren(model: Node, ...expected: Matcher[]): Promise<void | never> {
-    const children = await resolveNode(model).getChildren?.()
-    assert.ok(children, 'Expected tree node to have children')
-
-    const items = await Promise.all(children.map(child => child.getTreeItem()))
-    const matched = items.map((item, i) => applyMatcher(item, expected[i]))
-    assert.deepStrictEqual(matched, expected)
-}
diff --git a/src/test/shared/ui/input.test.ts b/src/test/shared/ui/input.test.ts
deleted file mode 100644
index cbed4ca8dcb..00000000000
--- a/src/test/shared/ui/input.test.ts
+++ /dev/null
@@ -1,280 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-import * as input from '../../../shared/ui/input'
-
-export class TestInputBox implements vscode.InputBox {
-    private _value: string = ''
-    public placeholder: string | undefined
-    public password: boolean = false
-    public readonly onDidChangeValue: vscode.Event<string>
-    public readonly onDidAccept: vscode.Event<void>
-    public readonly onDidHide: vscode.Event<void>
-    public buttons: readonly vscode.QuickInputButton[] = []
-    public readonly onDidTriggerButton: vscode.Event<vscode.QuickInputButton>
-    public prompt: string | undefined
-    public validationMessage: string | undefined
-    public title: string | undefined
-    public step: number | undefined
-    public totalSteps: number | undefined
-    public enabled: boolean = true
-    public busy: boolean = false
-    public ignoreFocusOut: boolean = false
-
-    public isShowing: boolean = false
-
-    private readonly onDidHideEmitter: vscode.EventEmitter<void> = new vscode.EventEmitter()
-    private readonly onDidAcceptEmitter: vscode.EventEmitter<void> = new vscode.EventEmitter()
-    private readonly onDidChangeValueEmitter: vscode.EventEmitter<string> = new vscode.EventEmitter()
-    private readonly onDidTriggerButtonEmitter: vscode.EventEmitter<vscode.QuickInputButton> = new vscode.EventEmitter()
-
-    public constructor() {
-        this.onDidHide = this.onDidHideEmitter.event
-        this.onDidAccept = this.onDidAcceptEmitter.event
-        this.onDidChangeValue = this.onDidChangeValueEmitter.event
-        this.onDidTriggerButton = this.onDidTriggerButtonEmitter.event
-    }
-
-    public show(): void {
-        this.isShowing = true
-    }
-    public hide(): void {
-        this.onDidHideEmitter.fire()
-        this.isShowing = false
-    }
-    public accept(value: string = this._value) {
-        this._value = value
-        this.onDidAcceptEmitter.fire()
-    }
-    public dispose(): void {}
-
-    public pressButton(button: vscode.QuickInputButton) {
-        this.onDidTriggerButtonEmitter.fire(button)
-    }
-
-    public get value(): string {
-        return this._value
-    }
-    public set value(value: string) {
-        this.onDidChangeValueEmitter.fire(value)
-        this._value = value
-    }
-}
-
-describe('createInputBox', async function () {
-    let testInput: vscode.InputBox | undefined
-
-    afterEach(function () {
-        if (testInput) {
-            testInput.dispose()
-            testInput = undefined
-        }
-    })
-
-    it('Sets buttons', async function () {
-        const buttons: vscode.QuickInputButton[] = [vscode.QuickInputButtons.Back]
-
-        testInput = input.createInputBox({
-            buttons: buttons,
-        })
-
-        assert.deepStrictEqual(testInput.buttons, buttons)
-    })
-
-    it('Sets Options', async function () {
-        const options = {
-            title: 'title',
-            placeHolder: 'placeholder',
-            ignoreFocusOut: true,
-        }
-
-        testInput = input.createInputBox({
-            options: options,
-        })
-
-        assertInputBoxOptions(testInput, options)
-    })
-
-    it('Sets boolean Options to false values', async function () {
-        const options = {
-            ignoreFocusOut: false,
-        }
-
-        testInput = input.createInputBox({
-            options: options,
-        })
-
-        assertInputBoxOptions(testInput, options)
-    })
-
-    it('Sets Options to undefined values', async function () {
-        const options = {}
-
-        testInput = input.createInputBox({
-            options: options,
-        })
-
-        assertInputBoxOptions(testInput, options)
-    })
-
-    it('Does not set Options', async function () {
-        testInput = input.createInputBox({})
-
-        assertInputBoxOptions(testInput, {})
-    })
-
-    function assertInputBoxOptions(
-        actualInput: vscode.InputBox,
-        expectedOptions: vscode.InputBoxOptions & input.AdditionalInputBoxOptions
-    ) {
-        assert.strictEqual(
-            actualInput.title,
-            expectedOptions.title,
-            `InputBox title mismatch, expected ${expectedOptions.title}, got ${actualInput.title}`
-        )
-
-        assert.strictEqual(
-            actualInput.placeholder,
-            expectedOptions.placeHolder,
-            `InputBox placeHolder mismatch, expected ${expectedOptions.placeHolder}, got ${actualInput.placeholder}`
-        )
-
-        // vscode.window.createInputBox defaults ignoreFocusOut to true
-        const expectedIgnoreFocusOut =
-            expectedOptions.ignoreFocusOut !== undefined ? expectedOptions.ignoreFocusOut : true
-        assert.strictEqual(
-            actualInput.ignoreFocusOut,
-            expectedIgnoreFocusOut,
-            `InputBox ignoreFocusOut mismatch, expected ${expectedIgnoreFocusOut},` +
-                ` got ${actualInput.ignoreFocusOut}`
-        )
-
-        // TODO : Test more options as they are added in the InputBox
-    }
-})
-
-describe('promptUser', async function () {
-    let sampleInput: TestInputBox
-
-    beforeEach(async function () {
-        sampleInput = new TestInputBox()
-    })
-
-    afterEach(async function () {
-        sampleInput.dispose()
-    })
-
-    it('Accepted value is returned', async function () {
-        const promptPromise = input.promptUser({
-            inputBox: sampleInput,
-        })
-
-        sampleInput.accept('hello world')
-
-        const promptResult: string | undefined = await promptPromise
-
-        assert.ok(promptResult, 'Expected a non-undefined response')
-        assert.strictEqual(promptResult, 'hello world', 'InputBox accepted value was not expected value')
-    })
-
-    it('Hide returns undefined', async function () {
-        const promptPromise = input.promptUser({
-            inputBox: sampleInput,
-        })
-
-        sampleInput.hide()
-
-        const result = await promptPromise
-
-        assert.strictEqual(result, undefined, `Expected calling hide() on prompt to return undefined, got ${result}`)
-    })
-
-    it('Button can cancel and return undefined', async function () {
-        const buttonOfInterest = vscode.QuickInputButtons.Back
-        sampleInput.buttons = [buttonOfInterest]
-
-        const promptPromise = input.promptUser({
-            inputBox: sampleInput,
-            onDidTriggerButton: (button, resolve, reject) => {
-                assert.strictEqual(
-                    button,
-                    buttonOfInterest,
-                    `Expected button ${JSON.stringify(buttonOfInterest)} ` +
-                        `but got button ${JSON.stringify(buttonOfInterest)}`
-                )
-
-                sampleInput.hide()
-            },
-        })
-
-        sampleInput.pressButton(sampleInput.buttons[0])
-
-        const result = await promptPromise
-        assert.strictEqual(
-            result,
-            undefined,
-            `Expected button calling hide() on prompt to return undefined, got ${result} `
-        )
-    })
-
-    it('Button can return a value', async function () {
-        const buttonOfInterest = vscode.QuickInputButtons.Back
-        const expectedValue = 'hello world'
-        sampleInput.buttons = [buttonOfInterest]
-
-        const promptPromise = input.promptUser({
-            inputBox: sampleInput,
-            onDidTriggerButton: (button, resolve, reject) => {
-                assert.strictEqual(
-                    button,
-                    buttonOfInterest,
-                    `Expected button ${JSON.stringify(buttonOfInterest)} ` +
-                        `but got button ${JSON.stringify(buttonOfInterest)}`
-                )
-
-                sampleInput.accept(expectedValue)
-            },
-        })
-
-        sampleInput.pressButton(sampleInput.buttons[0])
-
-        const promptResult = await promptPromise
-
-        assert.ok(promptResult, 'Expected a non-undefined response')
-        assert.strictEqual(promptResult, expectedValue, 'InputBox accepted value was not expected value')
-    })
-
-    it('Button can do something and leave input box open', async function () {
-        const buttonOfInterest = vscode.QuickInputButtons.Back
-        sampleInput.buttons = [buttonOfInterest]
-        let handledButtonPress: boolean = false
-
-        const promptUserPromise = input.promptUser({
-            inputBox: sampleInput,
-            onDidTriggerButton: (button, resolve, reject) => {
-                assert.strictEqual(
-                    button,
-                    buttonOfInterest,
-                    `Expected button ${JSON.stringify(buttonOfInterest)} ` +
-                        `but got button ${JSON.stringify(buttonOfInterest)}`
-                )
-
-                // do something that is not accept/cancel
-                handledButtonPress = true
-            },
-        })
-
-        sampleInput.pressButton(buttonOfInterest)
-
-        assert.strictEqual(handledButtonPress, true, 'Expected button handler to trigger')
-        assert.strictEqual(sampleInput.isShowing, true, 'Expected input box to still be showing')
-
-        // Cleanup - this is to satisfy the linter
-        sampleInput.hide()
-        await promptUserPromise
-    })
-})
diff --git a/src/test/shared/ui/inputPrompter.test.ts b/src/test/shared/ui/inputPrompter.test.ts
deleted file mode 100644
index 8a81823995c..00000000000
--- a/src/test/shared/ui/inputPrompter.test.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { createBackButton, QuickInputButton } from '../../../shared/ui/buttons'
-import { WIZARD_BACK } from '../../../shared/wizards/wizard'
-import * as vscode from 'vscode'
-import { createInputBox, defaultInputboxOptions, InputBoxPrompter } from '../../../shared/ui/inputPrompter'
-import { exposeEmitters, ExposeEmitters } from '../vscode/testUtils'
-
-describe('createInputBox', function () {
-    it('creates a new prompter with options', async function () {
-        const prompter = createInputBox({ title: 'test' })
-        assert.strictEqual(prompter.inputBox.title, 'test')
-    })
-
-    it('applies default options', async function () {
-        const prompter = createInputBox()
-        const inputBox = prompter.inputBox
-
-        Object.keys(defaultInputboxOptions).forEach(key => {
-            assert.strictEqual(inputBox[key as keyof vscode.InputBox], (defaultInputboxOptions as any)[key])
-        })
-    })
-})
-
-describe('InputBoxPrompter', function () {
-    let inputBox: ExposeEmitters<vscode.InputBox, 'onDidAccept' | 'onDidChangeValue' | 'onDidTriggerButton'>
-    let testPrompter: InputBoxPrompter
-
-    beforeEach(function () {
-        inputBox = exposeEmitters(vscode.window.createInputBox(), [
-            'onDidAccept',
-            'onDidChangeValue',
-            'onDidTriggerButton',
-        ])
-        testPrompter = new InputBoxPrompter(inputBox)
-    })
-
-    /** Sets the input box's value then fires an accept event */
-    function accept(value: string): void {
-        inputBox.value = value
-        inputBox.fireOnDidAccept()
-    }
-
-    it('accepts user input', async function () {
-        const result = testPrompter.prompt()
-        accept('input')
-        assert.strictEqual(await result, 'input')
-    })
-
-    it('steps can be set', async function () {
-        testPrompter.setSteps(1, 2)
-        assert.strictEqual(inputBox.step, 1)
-        assert.strictEqual(inputBox.totalSteps, 2)
-    })
-
-    it('returns last response', async function () {
-        const result = testPrompter.prompt()
-        accept('input')
-        assert.strictEqual(await result, 'input')
-        assert.strictEqual(testPrompter.recentItem, 'input')
-    })
-
-    it('can set last response', async function () {
-        testPrompter.recentItem = 'last response'
-        assert.strictEqual(inputBox.value, 'last response')
-    })
-
-    describe('buttons', function () {
-        it('back button returns control signal', async function () {
-            const back = createBackButton()
-            inputBox.buttons = [back]
-
-            const result = testPrompter.prompt()
-            inputBox.fireOnDidTriggerButton(back)
-
-            assert.strictEqual(await result, WIZARD_BACK)
-        })
-
-        it('buttons can return values', async function () {
-            const button: QuickInputButton<string> = {
-                iconPath: vscode.Uri.parse(''),
-                onClick: () => 'answer',
-            }
-            inputBox.buttons = [button]
-
-            const result = testPrompter.prompt()
-            inputBox.fireOnDidTriggerButton(button)
-
-            assert.strictEqual(await result, 'answer')
-        })
-
-        it('buttons with void return type do not close the prompter', async function () {
-            const button: QuickInputButton<void> = {
-                iconPath: vscode.Uri.parse(''),
-                onClick: () => {},
-            }
-            inputBox.buttons = [button]
-
-            const result = testPrompter.prompt()
-            inputBox.fireOnDidTriggerButton(button)
-            accept('answer')
-
-            assert.strictEqual(await result, 'answer')
-        })
-    })
-
-    describe('validation', function () {
-        it('will not accept input if validation message is showing', async function () {
-            const result = testPrompter.prompt()
-            inputBox.validationMessage = 'bad input'
-            accept('hello')
-            inputBox.validationMessage = undefined
-            accept('goodbye')
-
-            assert.strictEqual(await result, 'goodbye')
-        })
-
-        it('shows validation message and updates after accept', async function () {
-            const validateInput = (resp: string) => (Number.isNaN(Number.parseInt(resp)) ? 'NaN' : undefined)
-            testPrompter.setValidation(validateInput)
-            const result = testPrompter.prompt()
-
-            inputBox.fireOnDidChangeValue('hello')
-            assert.strictEqual(inputBox.validationMessage, 'NaN')
-            inputBox.fireOnDidChangeValue('100')
-            assert.strictEqual(inputBox.validationMessage, undefined)
-            accept('we cannot accept this message')
-            accept('200')
-            assert.strictEqual(await result, '200')
-        })
-    })
-})
diff --git a/src/test/shared/ui/picker.test.ts b/src/test/shared/ui/picker.test.ts
deleted file mode 100644
index 8e96bd6e854..00000000000
--- a/src/test/shared/ui/picker.test.ts
+++ /dev/null
@@ -1,726 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as FakeTimers from '@sinonjs/fake-timers'
-import * as sinon from 'sinon'
-import * as vscode from 'vscode'
-import * as picker from '../../../shared/ui/picker'
-import { IteratorTransformer } from '../../../shared/utilities/collectionUtils'
-import { installFakeClock } from '../../testUtil'
-
-export class TestQuickPick<T extends vscode.QuickPickItem> implements vscode.QuickPick<T> {
-    public _value: string = ''
-    public placeholder: string | undefined
-    public readonly onDidChangeValue: vscode.Event<string>
-    public readonly onDidAccept: vscode.Event<void>
-    public readonly onDidHide: vscode.Event<void>
-    public buttons: readonly vscode.QuickInputButton[] = []
-    public readonly onDidTriggerButton: vscode.Event<vscode.QuickInputButton>
-    public items: readonly T[] = []
-    public canSelectMany: boolean = false
-    public matchOnDescription: boolean = false
-    public matchOnDetail: boolean = false
-    public activeItems: readonly T[] = []
-    public readonly onDidChangeActive: vscode.Event<T[]>
-    public _selectedItems: readonly T[] = []
-    public readonly onDidChangeSelection: vscode.Event<T[]>
-    public title: string | undefined
-    public step: number | undefined
-    public totalSteps: number | undefined
-    public enabled: boolean = true
-    public busy: boolean = false
-    public ignoreFocusOut: boolean = false
-
-    public isShowing: boolean = false
-
-    private readonly onDidHideEmitter: vscode.EventEmitter<void> = new vscode.EventEmitter()
-    private readonly onDidAcceptEmitter: vscode.EventEmitter<void> = new vscode.EventEmitter()
-    private readonly onDidChangeValueEmitter: vscode.EventEmitter<string> = new vscode.EventEmitter()
-    private readonly onDidChangeActiveEmitter: vscode.EventEmitter<T[]> = new vscode.EventEmitter()
-    private readonly onDidChangeSelectionEmitter: vscode.EventEmitter<T[]> = new vscode.EventEmitter()
-    private readonly onDidTriggerButtonEmitter: vscode.EventEmitter<vscode.QuickInputButton> = new vscode.EventEmitter()
-
-    public constructor() {
-        this.onDidHide = this.onDidHideEmitter.event
-        this.onDidAccept = this.onDidAcceptEmitter.event
-        this.onDidChangeValue = this.onDidChangeValueEmitter.event
-        this.onDidChangeActive = this.onDidChangeActiveEmitter.event
-        this.onDidChangeSelection = this.onDidChangeSelectionEmitter.event
-        this.onDidTriggerButton = this.onDidTriggerButtonEmitter.event
-    }
-
-    public show(): void {
-        this.isShowing = true
-    }
-    public hide(): void {
-        this.onDidHideEmitter.fire()
-        this.isShowing = false
-    }
-    public accept(value: readonly T[]) {
-        this._selectedItems = value
-        this.onDidAcceptEmitter.fire()
-        this.isShowing = false
-    }
-    public dispose(): void {}
-
-    public pressButton(button: vscode.QuickInputButton) {
-        this.onDidTriggerButtonEmitter.fire(button)
-    }
-
-    public get value(): string {
-        return this._value
-    }
-    public set value(value: string) {
-        this.onDidChangeValueEmitter.fire(value)
-        this._value = value
-        this.filterItems()
-    }
-
-    public get selectedItems(): readonly T[] {
-        return this._selectedItems
-    }
-
-    public set selectedItems(items: readonly T[]) {
-        this.accept(items)
-    }
-
-    private filterItems(): void {
-        this.activeItems = this.items.filter(
-            item =>
-                item.label.includes(this._value) ||
-                (item.description ?? '').includes(this._value) ||
-                (item.detail ?? ''.includes(this._value))
-        )
-    }
-}
-
-describe('createQuickPick', async function () {
-    let testPicker: vscode.QuickPick<vscode.QuickPickItem> | undefined
-
-    afterEach(function () {
-        if (testPicker) {
-            testPicker.dispose()
-            testPicker = undefined
-        }
-    })
-
-    it('Sets items', async function () {
-        const items: vscode.QuickPickItem[] = [{ label: 'item one' }, { label: 'item two' }, { label: 'item triangle' }]
-
-        testPicker = picker.createQuickPick({
-            items: items,
-        })
-
-        assert.deepStrictEqual(testPicker.items, items)
-    })
-
-    it('Sets item options', async function () {
-        const items: vscode.QuickPickItem[] = [
-            {
-                label: 'label',
-                detail: 'detail',
-                alwaysShow: true,
-                description: 'description',
-            },
-        ]
-
-        testPicker = picker.createQuickPick({ items: items })
-
-        assert.deepStrictEqual(testPicker.items, items)
-    })
-
-    it('Sets buttons', async function () {
-        const buttons: vscode.QuickInputButton[] = [vscode.QuickInputButtons.Back]
-
-        testPicker = picker.createQuickPick({
-            buttons: buttons,
-        })
-
-        assert.deepStrictEqual(testPicker.buttons, buttons)
-    })
-
-    it('Sets Options', async function () {
-        const options = {
-            title: 'title',
-            placeHolder: 'placeholder',
-            matchOnDescription: true,
-            matchOnDetail: true,
-            ignoreFocusOut: true,
-            value: 'test value',
-        }
-
-        testPicker = picker.createQuickPick({
-            options: options,
-        })
-
-        assertPickerOptions(testPicker, options)
-    })
-
-    it('Sets boolean Options to false values', async function () {
-        const options = {
-            matchOnDescription: false,
-            matchOnDetail: false,
-            ignoreFocusOut: false,
-        }
-
-        testPicker = picker.createQuickPick({
-            options: options,
-        })
-
-        assertPickerOptions(testPicker, options)
-    })
-
-    it('Sets Options to undefined values', async function () {
-        const options = {}
-
-        testPicker = picker.createQuickPick({
-            options: options,
-        })
-
-        assertPickerOptions(testPicker, options)
-    })
-
-    it('Does not set Options', async function () {
-        testPicker = picker.createQuickPick({})
-
-        assertPickerOptions(testPicker, {})
-    })
-
-    function assertPickerOptions(
-        actualPicker: vscode.QuickPick<vscode.QuickPickItem>,
-        expectedOptions: vscode.QuickPickOptions & picker.AdditionalQuickPickOptions
-    ) {
-        assert.strictEqual(
-            actualPicker.title,
-            expectedOptions.title,
-            `Picker title mismatch, expected ${expectedOptions.title}, got ${actualPicker.title}`
-        )
-
-        assert.strictEqual(
-            actualPicker.placeholder,
-            expectedOptions.placeHolder,
-            `Picker placeHolder mismatch, expected ${expectedOptions.placeHolder}, got ${actualPicker.placeholder}`
-        )
-
-        // vscode.window.createQuickPick defaults matchOnDescription to true
-        const expectedMatchOnDescription = getValueOrDefault(expectedOptions.matchOnDescription, true)
-        assert.strictEqual(
-            actualPicker.matchOnDescription,
-            expectedMatchOnDescription,
-            `Picker matchOnDescription mismatch, expected ${expectedMatchOnDescription},` +
-                ` got ${actualPicker.matchOnDescription}`
-        )
-
-        // vscode.window.createQuickPick defaults matchOnDetail to true
-        const expectedMatchOnDetail = getValueOrDefault(expectedOptions.matchOnDetail, true)
-        assert.strictEqual(
-            actualPicker.matchOnDetail,
-            expectedMatchOnDetail,
-            `Picker matchOnDetail mismatch, expected ${expectedMatchOnDetail},` + ` got ${actualPicker.matchOnDetail}`
-        )
-
-        // vscode.window.createQuickPick defaults ignoreFocusOut to true
-        const expectedIgnoreFocusOut = getValueOrDefault(expectedOptions.ignoreFocusOut, true)
-        assert.strictEqual(
-            actualPicker.ignoreFocusOut,
-            expectedIgnoreFocusOut,
-            `Picker ignoreFocusOut mismatch, expected ${expectedIgnoreFocusOut},` +
-                ` got ${actualPicker.ignoreFocusOut}`
-        )
-
-        // TODO : Test more options as they are added in the picker
-    }
-
-    function getValueOrDefault<T>(value: T | undefined, defaultValue: T) {
-        if (value !== undefined) {
-            return value
-        }
-
-        return defaultValue
-    }
-})
-
-describe('promptUser', async function () {
-    let samplePicker: TestQuickPick<vscode.QuickPickItem>
-
-    beforeEach(async function () {
-        samplePicker = createSamplePicker()
-    })
-
-    afterEach(async function () {
-        samplePicker.dispose()
-    })
-
-    it('Accepted value is returned', async function () {
-        const selectedItem = [samplePicker.items[0]]
-
-        const promptPromise = picker.promptUser({
-            picker: samplePicker,
-        })
-
-        samplePicker.accept(selectedItem)
-
-        const promptResult: vscode.QuickPickItem[] | undefined = await promptPromise
-
-        assertPromptResultEquals(promptResult, selectedItem)
-    })
-
-    it('Hide returns undefined', async function () {
-        const promptPromise = picker.promptUser({
-            picker: samplePicker,
-        })
-
-        samplePicker.hide()
-
-        const result = await promptPromise
-
-        assert.strictEqual(result, undefined, `Expected calling hide() on prompt to return undefined, got ${result}`)
-    })
-
-    it('Button can cancel and return undefined', async function () {
-        const buttonOfInterest = vscode.QuickInputButtons.Back
-        samplePicker.buttons = [buttonOfInterest]
-
-        const promptPromise = picker.promptUser({
-            picker: samplePicker,
-            onDidTriggerButton: (button, resolve, reject) => {
-                assert.strictEqual(
-                    button,
-                    buttonOfInterest,
-                    `Expected button ${JSON.stringify(buttonOfInterest)} ` +
-                        `but got button ${JSON.stringify(buttonOfInterest)}`
-                )
-
-                samplePicker.hide()
-            },
-        })
-
-        samplePicker.pressButton(samplePicker.buttons[0])
-
-        const result = await promptPromise
-        assert.strictEqual(
-            result,
-            undefined,
-            `Expected button calling hide() on prompt to return undefined, got ${result} `
-        )
-    })
-
-    it('Button can return a value', async function () {
-        const buttonOfInterest = vscode.QuickInputButtons.Back
-        const selectedItem = [samplePicker.items[0]]
-        samplePicker.buttons = [buttonOfInterest]
-
-        const promptPromise = picker.promptUser({
-            picker: samplePicker,
-            onDidTriggerButton: (button, resolve, reject) => {
-                assert.strictEqual(
-                    button,
-                    buttonOfInterest,
-                    `Expected button ${JSON.stringify(buttonOfInterest)} ` +
-                        `but got button ${JSON.stringify(buttonOfInterest)}`
-                )
-
-                samplePicker.accept(selectedItem)
-            },
-        })
-
-        samplePicker.pressButton(samplePicker.buttons[0])
-
-        const promptResult = await promptPromise
-
-        assertPromptResultEquals(promptResult, selectedItem)
-    })
-
-    it('Button can do something and leave picker open', async function () {
-        const buttonOfInterest = vscode.QuickInputButtons.Back
-        samplePicker.buttons = [buttonOfInterest]
-        let handledButtonPress: boolean = false
-
-        const promptUserPromise = picker.promptUser({
-            picker: samplePicker,
-            onDidTriggerButton: (button, resolve, reject) => {
-                assert.strictEqual(
-                    button,
-                    buttonOfInterest,
-                    `Expected button ${JSON.stringify(buttonOfInterest)} ` +
-                        `but got button ${JSON.stringify(buttonOfInterest)}`
-                )
-
-                // do something that is not accept/cancel
-                handledButtonPress = true
-            },
-        })
-
-        samplePicker.pressButton(buttonOfInterest)
-
-        assert.strictEqual(handledButtonPress, true, 'Expected button handler to trigger')
-        assert.strictEqual(samplePicker.isShowing, true, 'Expected picker to still be showing')
-
-        // Cleanup - this is to satisfy the linter
-        samplePicker.hide()
-        await promptUserPromise
-    })
-
-    function assertPromptResultEquals(
-        actualResult: vscode.QuickPickItem[] | undefined,
-        expectedResult: vscode.QuickPickItem[]
-    ) {
-        assert.notStrictEqual(actualResult, undefined, 'Expected result to be not undefined')
-
-        const resultItems = actualResult as vscode.QuickPickItem[]
-
-        assert.strictEqual(
-            resultItems.length,
-            expectedResult.length,
-            `Expected result array of size ${expectedResult.length}, got ${resultItems.length}`
-        )
-
-        for (let i = 0; i < resultItems.length; i++) {
-            assert.strictEqual(
-                resultItems[i],
-                expectedResult[i],
-                `Expected ${expectedResult[i]}, got ${resultItems[i]} at element ${i}`
-            )
-        }
-    }
-
-    function createSamplePicker(): TestQuickPick<vscode.QuickPickItem> {
-        const pickerDialog = new TestQuickPick<vscode.QuickPickItem>()
-        pickerDialog.items = [{ label: 'item 1' }, { label: 'item 2' }, { label: 'item 3' }, { label: 'item 4' }]
-
-        return pickerDialog
-    }
-})
-
-describe('IteratingQuickPickController', async function () {
-    const values = ['a', 'b', 'c']
-    const result = [{ label: 'A' }, { label: 'B' }, { label: 'C' }]
-    const errMessage = 'ahhhhhhhhh!!!'
-    const interval = 30
-
-    let quickPick: vscode.QuickPick<vscode.QuickPickItem>
-    let clock: FakeTimers.InstalledClock
-
-    before(function () {
-        clock = installFakeClock()
-    })
-
-    after(function () {
-        clock.uninstall()
-    })
-
-    beforeEach(function () {
-        clock.reset()
-        quickPick = picker.createQuickPick<vscode.QuickPickItem>({})
-    })
-
-    afterEach(function () {
-        quickPick.dispose()
-    })
-
-    async function* iteratorFn(): AsyncIterator<string> {
-        for (const [i, value] of values.entries()) {
-            await new Promise<void>(resolve => {
-                clock.setTimeout(() => {
-                    resolve()
-                }, interval)
-            })
-            if (i === values.length - 1) {
-                return value
-            }
-            yield value
-        }
-    }
-
-    function converter(val: string): vscode.QuickPickItem[] {
-        if (val) {
-            return [{ label: val.toUpperCase() }]
-        }
-
-        return []
-    }
-
-    async function* errIteratorFn(): AsyncIterator<string> {
-        throw new Error(errMessage)
-        yield 'nope'
-    }
-
-    async function* blankIteratorFn(): AsyncIterator<string> {}
-
-    it('appends a refresh button to the quickPick', function () {
-        new picker.IteratingQuickPickController(
-            quickPick,
-            new IteratorTransformer<string, vscode.QuickPickItem>(() => iteratorFn(), converter)
-        )
-
-        assert.strictEqual(quickPick.buttons.length, 1)
-        assert.strictEqual(quickPick.buttons[0].tooltip, 'Refresh')
-    })
-
-    it('returns iterated values on start and on reset', async function () {
-        const controller = new picker.IteratingQuickPickController(
-            quickPick,
-            new IteratorTransformer<string, vscode.QuickPickItem>(() => iteratorFn(), converter)
-        )
-
-        controller.startRequests()
-
-        await clock.nextAsync()
-        await clock.nextAsync()
-        await clock.nextAsync()
-        new Promise<void>(resolve => {
-            clock.setTimeout(() => {
-                assert.strictEqual(quickPick.items.length, 3)
-                assert.deepStrictEqual(quickPick.items, result)
-                resolve()
-            }, interval - 15)
-        })
-        await clock.nextAsync()
-
-        controller.reset()
-        controller.startRequests()
-
-        await clock.nextAsync()
-        new Promise<void>(resolve => {
-            clock.setTimeout(() => {
-                assert.strictEqual(quickPick.items.length, 1)
-                assert.deepStrictEqual(quickPick.items, [{ label: 'A' }])
-                resolve()
-            }, interval - 15)
-        })
-        await clock.nextAsync()
-        await clock.nextAsync()
-        await clock.nextAsync()
-        await clock.nextAsync()
-        new Promise<void>(resolve => {
-            clock.setTimeout(() => {
-                assert.strictEqual(quickPick.items.length, 3)
-                assert.deepStrictEqual(quickPick.items, result)
-                resolve()
-            }, interval - 15)
-        })
-        await clock.nextAsync()
-    })
-
-    it('does not return additional values if start is called on a finished iterator', async function () {
-        const controller = new picker.IteratingQuickPickController(
-            quickPick,
-            new IteratorTransformer<string, vscode.QuickPickItem>(() => iteratorFn(), converter)
-        )
-
-        controller.startRequests()
-
-        await clock.nextAsync()
-        await clock.nextAsync()
-        await clock.nextAsync()
-        new Promise<void>(resolve => {
-            clock.setTimeout(() => {
-                assert.strictEqual(quickPick.items.length, 3)
-                assert.deepStrictEqual(quickPick.items, result)
-                resolve()
-            }, interval - 15)
-        })
-        await clock.nextAsync()
-
-        controller.startRequests()
-        await clock.nextAsync()
-        new Promise<void>(resolve => {
-            clock.setTimeout(() => {
-                assert.strictEqual(quickPick.items.length, 3)
-                assert.deepStrictEqual(quickPick.items, result)
-                resolve()
-            }, interval - 15)
-        })
-        await clock.nextAsync()
-    })
-
-    it('pauses and restarts iteration', async function () {
-        const controller = new picker.IteratingQuickPickController(
-            quickPick,
-            new IteratorTransformer<string, vscode.QuickPickItem>(() => iteratorFn(), converter)
-        )
-
-        // pause almost immediately. This should cause this to output a single item.
-        controller.startRequests()
-        new Promise<void>(resolve => {
-            clock.setTimeout(() => {
-                controller.pauseRequests()
-                resolve()
-            }, interval - 15)
-        })
-        await clock.nextAsync()
-        await clock.nextAsync()
-        new Promise<void>(resolve => {
-            clock.setTimeout(() => {
-                assert.deepStrictEqual(quickPick.items, [{ label: 'A' }], `items at pause are: ${quickPick.items}`)
-                resolve()
-            }, interval - 15)
-        })
-        await clock.nextAsync()
-
-        controller.startRequests()
-        await clock.nextAsync()
-        await clock.nextAsync()
-        await clock.nextAsync()
-        new Promise<void>(resolve => {
-            clock.setTimeout(() => {
-                assert.deepStrictEqual(quickPick.items, result, `items at end are: ${quickPick.items}`)
-                resolve()
-            }, interval - 15)
-        })
-        await clock.nextAsync()
-    })
-
-    it('appends an error item', async function () {
-        const controller = new picker.IteratingQuickPickController(
-            quickPick,
-            new IteratorTransformer<string, vscode.QuickPickItem>(() => errIteratorFn(), converter)
-        )
-
-        controller.startRequests()
-        await clock.nextAsync()
-        await clock.nextAsync()
-        new Promise<void>(resolve => {
-            clock.setTimeout(() => {
-                assert.deepStrictEqual(quickPick.items, [
-                    {
-                        ...picker.IteratingQuickPickController.ERROR_ITEM,
-                        detail: errMessage,
-                    },
-                ])
-                resolve()
-            }, interval - 15)
-        })
-        await clock.nextAsync()
-    })
-
-    it('appends a no items item', async function () {
-        const controller = new picker.IteratingQuickPickController(
-            quickPick,
-            new IteratorTransformer<string, vscode.QuickPickItem>(() => blankIteratorFn(), converter)
-        )
-
-        controller.startRequests()
-        await clock.nextAsync()
-        new Promise<void>(resolve => {
-            clock.setTimeout(() => {
-                assert.deepStrictEqual(quickPick.items, [picker.IteratingQuickPickController.NO_ITEMS_ITEM])
-                resolve()
-            }, interval - 15)
-        })
-        await clock.nextAsync()
-    })
-
-    it('only appends values from the current refresh cycle', async function () {
-        const controller = new picker.IteratingQuickPickController(
-            quickPick,
-            new IteratorTransformer<string, vscode.QuickPickItem>(() => iteratorFn(), converter)
-        )
-
-        controller.startRequests()
-        await clock.nextAsync()
-        await clock.nextAsync()
-        await clock.nextAsync()
-        await clock.nextAsync()
-        controller.reset()
-        controller.startRequests()
-        await clock.nextAsync()
-        await clock.nextAsync()
-        await clock.nextAsync()
-        await clock.nextAsync()
-        controller.reset()
-        controller.startRequests()
-        await clock.nextAsync()
-        await clock.nextAsync()
-        await clock.nextAsync()
-        await clock.nextAsync()
-        controller.reset()
-        controller.startRequests()
-        await clock.nextAsync()
-        await clock.nextAsync()
-        await clock.nextAsync()
-        await clock.nextAsync()
-        controller.reset()
-        controller.startRequests()
-        await clock.nextAsync()
-        await clock.nextAsync()
-        await clock.nextAsync()
-        await clock.nextAsync()
-
-        new Promise<void>(resolve => {
-            clock.setTimeout(() => {
-                assert.deepStrictEqual(quickPick.items, result)
-                resolve()
-            }, interval - 15)
-        })
-        await clock.nextAsync()
-    })
-
-    describe('iteratingOnDidTriggerButton', async function () {
-        class fakeIteratingQuickPickController extends picker.IteratingQuickPickController<undefined> {
-            public constructor(
-                private readonly spy: sinon.SinonSpy,
-                callback?: () => Promise<vscode.QuickPickItem[] | undefined>
-            ) {
-                super(
-                    picker.createQuickPick({}),
-                    new IteratorTransformer(
-                        () => {
-                            return {
-                                next: async () => {
-                                    return { value: undefined, done: true }
-                                },
-                            }
-                        },
-                        () => []
-                    ),
-                    callback
-                )
-            }
-            public override async reset(): Promise<void> {
-                this.spy()
-            }
-        }
-
-        let sandbox: sinon.SinonSandbox
-
-        beforeEach(function () {
-            sandbox = sinon.createSandbox()
-        })
-
-        afterEach(function () {
-            sandbox.restore()
-        })
-
-        it('returns undefined if no override is provided', async function () {
-            const spy = sandbox.spy()
-            const controller = new fakeIteratingQuickPickController(spy)
-            const out = await controller.iteratingOnDidTriggerButton(
-                { iconPath: new vscode.ThemeIcon('squirrel') },
-                () => {},
-                () => {}
-            )
-            assert.strictEqual(out, undefined)
-            assert.ok(spy.notCalled)
-        })
-
-        it('returns a value from the override function', async function () {
-            const spy = sandbox.spy()
-            const callback = async () => {
-                return items
-            }
-            const controller = new fakeIteratingQuickPickController(spy, callback)
-            const items: vscode.QuickPickItem[] = [{ label: 'asdf' }, { label: 'jkl;' }]
-            const out = await controller.iteratingOnDidTriggerButton(
-                { iconPath: new vscode.ThemeIcon('squirrel') },
-                () => {},
-                () => {}
-            )
-            assert.deepStrictEqual(out, items)
-            assert.ok(spy.notCalled)
-        })
-    })
-})
diff --git a/src/test/shared/ui/pickerPrompter.test.ts b/src/test/shared/ui/pickerPrompter.test.ts
deleted file mode 100644
index 64139e749e7..00000000000
--- a/src/test/shared/ui/pickerPrompter.test.ts
+++ /dev/null
@@ -1,407 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-import { createBackButton } from '../../../shared/ui/buttons'
-import {
-    createLabelQuickPick,
-    createQuickPick,
-    FilterBoxQuickPickPrompter,
-    DataQuickPick,
-    DataQuickPickItem,
-    defaultQuickpickOptions,
-    QuickPickPrompter,
-    customUserInput,
-} from '../../../shared/ui/pickerPrompter'
-import { WIZARD_BACK } from '../../../shared/wizards/wizard'
-import { exposeEmitters, ExposeEmitters } from '../vscode/testUtils'
-
-describe('createQuickPick', function () {
-    const items: DataQuickPickItem<string>[] = [
-        { label: 'item1', data: 'yes' },
-        { label: 'item2', data: 'no' },
-    ]
-
-    it('applies default options', async function () {
-        const prompter = createQuickPick([])
-        const picker = prompter.quickPick
-
-        Object.keys(picker).forEach(key => {
-            const defaultValue = (defaultQuickpickOptions as Record<string, any>)[key]
-            if (defaultValue !== undefined) {
-                assert.strictEqual(picker[key as keyof vscode.QuickPick<any>], defaultValue)
-            }
-        })
-    })
-
-    it('creates a new prompter with options', async function () {
-        const prompter = createQuickPick(items, { title: 'test' })
-        assert.strictEqual(prompter.quickPick.title, 'test')
-    })
-
-    it('creates a new prompter when given a promise for items', async function () {
-        let resolveItems!: (items: DataQuickPickItem<string>[]) => void
-        const itemsPromise = new Promise<DataQuickPickItem<string>[]>(resolve => (resolveItems = resolve))
-        const prompter = createQuickPick(itemsPromise)
-        prompter.prompt()
-        assert.strictEqual(prompter.quickPick.busy, true)
-
-        resolveItems(items)
-        await itemsPromise
-
-        assert.strictEqual(prompter.quickPick.busy, false)
-        assert.deepStrictEqual(prompter.quickPick.items, items)
-    })
-
-    it('creates a new prompter when given an AsyncIterable', async function () {
-        let r1!: (v?: any) => void
-        let r2!: (v?: any) => void
-        const p1 = new Promise(r => (r1 = r))
-        const p2 = new Promise(r => (r2 = r))
-
-        async function* generator() {
-            for (const item of items) {
-                if (item === items[0]) {
-                    await p1
-                } else {
-                    await p2
-                }
-                yield [item]
-            }
-        }
-
-        const prompter = createQuickPick(generator())
-        r1()
-        await new Promise(r => setImmediate(r))
-        assert.deepStrictEqual(prompter.quickPick.items, [items[0]])
-        assert.strictEqual(prompter.quickPick.busy, true)
-        r2()
-        await new Promise(r => setImmediate(r))
-        assert.deepStrictEqual(prompter.quickPick.items, items)
-        assert.strictEqual(prompter.quickPick.busy, false)
-    })
-})
-
-describe('createLabelQuickPick', function () {
-    it('creates a new prompter using just labels', async function () {
-        const labelItems = [{ label: 'name1' }, { label: 'name2' }]
-        const prompter = createLabelQuickPick(labelItems)
-        assert.deepStrictEqual(
-            prompter.quickPick.items,
-            labelItems.map(item => ({ label: item.label, data: item.label }))
-        )
-    })
-
-    it('can use promises', async function () {
-        const labelItems = [{ label: 'name1' }, { label: 'name2' }]
-        const itemsPromise = Promise.resolve(labelItems)
-
-        const prompter = createLabelQuickPick(itemsPromise)
-
-        assert.strictEqual(prompter.quickPick.busy, true)
-    })
-})
-
-describe('QuickPickPrompter', function () {
-    const testItems = [
-        { label: 'item1', data: 0 },
-        { label: 'item2', data: 1 },
-        { label: 'item3', data: 2 },
-    ]
-    let picker: ExposeEmitters<DataQuickPick<number>, 'onDidChangeValue' | 'onDidTriggerButton' | 'onDidHide'>
-    let testPrompter: QuickPickPrompter<number>
-
-    beforeEach(function () {
-        picker = exposeEmitters(vscode.window.createQuickPick(), [
-            'onDidChangeValue',
-            'onDidTriggerButton',
-            'onDidHide',
-        ])
-        picker.items = testItems
-        testPrompter = new QuickPickPrompter(picker)
-    })
-
-    it('can select an item', async function () {
-        testPrompter.onDidShow(() => (picker.selectedItems = [testItems[0]]))
-        const result = testPrompter.prompt()
-        assert.strictEqual(await result, testItems[0].data)
-    })
-
-    it('steps can be set', function () {
-        testPrompter.setSteps(1, 2)
-        assert.strictEqual(picker.step, 1)
-        assert.strictEqual(picker.totalSteps, 2)
-    })
-
-    it('can handle back button', async function () {
-        testPrompter.onDidShow(() => picker.fireOnDidTriggerButton(createBackButton()))
-        assert.strictEqual(await testPrompter.prompt(), WIZARD_BACK)
-    })
-
-    it('can accept input from buttons', async function () {
-        const testButton = { iconPath: vscode.Uri.parse(''), onClick: () => 5 }
-        testPrompter.onDidShow(() => picker.fireOnDidTriggerButton(testButton))
-        assert.strictEqual(await testPrompter.prompt(), 5)
-    })
-
-    it('can selectively enable input when loading', async function () {
-        const p = testPrompter.loadItems(new Promise(r => setImmediate(() => r([]))), false)
-        assert.strictEqual(testPrompter.quickPick.enabled, true)
-        await p
-        assert.strictEqual(testPrompter.quickPick.enabled, true)
-    })
-
-    it('does not close if button does not return anything', async function () {
-        const testButton = { iconPath: vscode.Uri.parse(''), onClick: () => {} }
-        testPrompter.onDidShow(() => {
-            picker.fireOnDidTriggerButton(testButton)
-            picker.selectedItems = [testItems[0]]
-        })
-        assert.strictEqual(await testPrompter.prompt(), testItems[0].data)
-    })
-
-    it('returns recent item', async function () {
-        testPrompter.onDidShow(() => (picker.selectedItems = [testItems[1]]))
-        const result = testPrompter.prompt()
-        assert.strictEqual(await result, testItems[1].data)
-        assert.strictEqual(testPrompter.recentItem, testItems[1])
-    })
-
-    it('can set recent item', async function () {
-        testPrompter.recentItem = testItems[2]
-        assert.deepStrictEqual(picker.activeItems, [testItems[2]])
-    })
-
-    it('tries to recover recent item from partial data', async function () {
-        testPrompter.recentItem = 2
-        assert.deepStrictEqual(picker.activeItems, [testItems[2]])
-    })
-
-    it('shows first item if recent item does not exist', async function () {
-        testPrompter.recentItem = { label: 'item4', data: 3 }
-        assert.deepStrictEqual(picker.activeItems, [testItems[0]])
-    })
-
-    it('shows a `noItemsFound` item if no items are loaded', async function () {
-        const noItemsFoundItem = { label: 'placeholder', data: 0 }
-        testPrompter = new QuickPickPrompter(picker, { noItemsFoundItem })
-        testPrompter.clearAndLoadItems([])
-        assert.deepStrictEqual(picker.items, [noItemsFoundItem])
-    })
-
-    it('does not show a `noItemsFound` item if busy', async function () {
-        let resolveItems!: (items: DataQuickPickItem<number>[]) => void
-        const itemsPromise = new Promise<DataQuickPickItem<number>[]>(resolve => (resolveItems = resolve))
-        const noItemsFoundItem = { label: 'placeholder', data: 0 }
-
-        testPrompter = new QuickPickPrompter(picker, { noItemsFoundItem })
-        testPrompter.clearAndLoadItems(itemsPromise)
-        assert.strictEqual(picker.items.length, 0)
-        assert.strictEqual(picker.busy, true)
-        resolveItems(testItems)
-    })
-
-    it('shows an error item if a Promise fails to load things', async function () {
-        const badPromise = Promise.reject(new Error('my error'))
-        const errorItem = { label: 'error', data: 0 }
-        testPrompter = new QuickPickPrompter(picker, { errorItem })
-        await testPrompter.clearAndLoadItems(badPromise)
-        assert.deepStrictEqual(picker.items, [{ detail: 'my error', ...errorItem }])
-    })
-
-    it('handles AsyncIterables that return something', async function () {
-        async function* generator() {
-            for (const item of testItems.slice(0, -1)) {
-                yield [item]
-            }
-
-            return testItems.slice(-1)
-        }
-
-        await testPrompter.clearAndLoadItems(generator())
-        assert.strictEqual(picker.items.length, 3)
-    })
-
-    it('handles AsyncIterables that yield empty arrays', async function () {
-        async function* generator() {
-            for (const _ of testItems) {
-                yield []
-            }
-        }
-        const noItemsFoundItem = { label: 'placeholder', data: 0 }
-        testPrompter = new QuickPickPrompter(picker, { noItemsFoundItem })
-
-        await testPrompter.clearAndLoadItems(generator())
-        assert.deepStrictEqual(testPrompter.quickPick.items, [noItemsFoundItem])
-    })
-
-    it('handles AsyncIterables that throw', async function () {
-        const errorItem = { label: 'error', data: 0 }
-        testPrompter = new QuickPickPrompter(picker, { errorItem })
-
-        async function* generator() {
-            for (const item of testItems.slice(0, -1)) {
-                yield [item]
-            }
-
-            throw new Error('my error')
-        }
-
-        await testPrompter.clearAndLoadItems(generator())
-        assert.strictEqual(picker.items.length, 3)
-        assert.strictEqual(picker.items[picker.items.length - 1].detail, 'my error')
-    })
-
-    it('stops requesting from an AsyncIterable when hidden', async function () {
-        let unlock!: () => void
-        let lock = new Promise<void>(r => (unlock = r))
-        async function* generator() {
-            for (const item of testItems) {
-                await lock
-                yield [item]
-                lock = new Promise<void>(r => (unlock = r))
-            }
-        }
-
-        testPrompter.clearAndLoadItems(generator())
-        picker.fireOnDidHide()
-        unlock()
-        await new Promise(r => setImmediate(r))
-        assert.strictEqual(picker.items.length, 1)
-        unlock()
-        await new Promise(r => setImmediate(r))
-        assert.strictEqual(picker.items.length, 1)
-    })
-
-    it('loads `recentlyUsed` items at the top', async function () {
-        await testPrompter.loadItems([{ label: 'item4', data: 4, recentlyUsed: true }])
-        assert.strictEqual(picker.items[0].label, 'item4')
-        await testPrompter.loadItems([{ label: 'item5', data: 5 }])
-        assert.strictEqual(picker.items[0].label, 'item4')
-        assert.strictEqual(picker.items.length, 5)
-    })
-})
-
-describe('FilterBoxQuickPickPrompter', function () {
-    const testTimeout = 5000
-    const testItems = [
-        { label: 'item1', data: 0 },
-        { label: 'item2', data: 1 },
-        { label: 'item3', data: 2 },
-    ]
-    const filterBoxInputSettings = {
-        label: 'Enter a number',
-        transform: (resp: string) => Number.parseInt(resp),
-        validator: (resp: string) => (Number.isNaN(Number.parseInt(resp)) ? 'NaN' : undefined),
-    }
-
-    let picker: ExposeEmitters<DataQuickPick<number>, 'onDidChangeValue' | 'onDidAccept'>
-    let testPrompter: FilterBoxQuickPickPrompter<number>
-
-    function addTimeout(): void {
-        setTimeout(picker.dispose.bind(picker), testTimeout)
-    }
-
-    function loadAndPrompt(): ReturnType<typeof testPrompter.prompt> {
-        return testPrompter.loadItems(testItems).then(() => testPrompter.prompt())
-    }
-
-    beforeEach(function () {
-        picker = exposeEmitters(vscode.window.createQuickPick(), ['onDidChangeValue', 'onDidAccept'])
-        testPrompter = new FilterBoxQuickPickPrompter(picker, filterBoxInputSettings)
-        addTimeout()
-    })
-
-    it('adds a new item based off the filter box', async function () {
-        const input = '123'
-
-        picker.onDidChangeActive(items => {
-            if (items[0]?.description !== undefined) {
-                picker.selectedItems = [items[0]]
-            }
-        })
-
-        testPrompter.onDidShow(() => {
-            // Note: VSC 1.42 will _not_ fire the change value event when setting `picker.value`
-            // TODO: check 1.44.2 or make a different test.
-            // TODO: our min is 1.50 now, does that change anything here?
-            picker.value = input
-            picker.fireOnDidChangeValue(input)
-        })
-
-        assert.strictEqual(await loadAndPrompt(), Number(input))
-    })
-
-    it('can handle additional items being added', async function () {
-        const input = '456'
-
-        picker.onDidChangeActive(items => {
-            if (items[0]?.description !== undefined) {
-                picker.selectedItems = [items[0]]
-            }
-        })
-
-        testPrompter.onDidShow(async () => {
-            picker.value = input
-            picker.fireOnDidChangeValue(input)
-
-            const newItems = [{ label: 'item4', data: 3 }]
-            const newItemsPromise = Promise.resolve(newItems)
-
-            await testPrompter.loadItems(newItems)
-            await testPrompter.loadItems(newItemsPromise)
-        })
-
-        assert.strictEqual(await loadAndPrompt(), Number(input))
-    })
-
-    it('can accept custom input as a last response', async function () {
-        const input = '123'
-
-        testPrompter.onDidShow(() => {
-            picker.onDidChangeActive(active => {
-                if (active[0]?.description !== undefined) {
-                    picker.selectedItems = [active[0]]
-                    picker.fireOnDidAccept()
-                }
-            })
-
-            testPrompter.recentItem = { data: customUserInput, description: input } as any
-            picker.fireOnDidChangeValue(input)
-        })
-
-        assert.strictEqual(await loadAndPrompt(), Number(input))
-    })
-
-    it('validates the custom input', async function () {
-        const input = 'not a number'
-
-        testPrompter.onDidShow(() => {
-            const disposable = picker.onDidChangeActive(items => {
-                if (
-                    items[0]?.description === input &&
-                    items[0]?.detail?.includes('NaN') &&
-                    items[0]?.invalidSelection
-                ) {
-                    picker.onDidChangeActive(items => {
-                        if (items.length > 0) {
-                            picker.selectedItems = [picker.items[0]]
-                        }
-                    })
-                    picker.selectedItems = [picker.items[0]]
-                    disposable.dispose()
-                    picker.value = ''
-                    picker.fireOnDidChangeValue('')
-                }
-            })
-
-            picker.value = input
-            picker.fireOnDidChangeValue(input)
-        })
-
-        assert.strictEqual(await loadAndPrompt(), testItems[0].data)
-    })
-})
diff --git a/src/test/shared/ui/prompter.test.ts b/src/test/shared/ui/prompter.test.ts
deleted file mode 100644
index 6e76818fca1..00000000000
--- a/src/test/shared/ui/prompter.test.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { Prompter, PromptResult } from '../../../shared/ui/prompter'
-import { StepEstimator } from '../../../shared/wizards/wizard'
-
-export class SimplePrompter<T> extends Prompter<T> {
-    constructor(private readonly input: T | PromptResult<T>) {
-        super()
-    }
-    protected async promptUser(): Promise<PromptResult<T>> {
-        return this.input
-    }
-    public setSteps(current: number, total: number): void {}
-    public setStepEstimator(estimator: StepEstimator<T>): void {}
-    public set recentItem(response: any) {}
-    public get recentItem(): any {
-        return undefined
-    }
-}
-
-describe('Prompter', function () {
-    it('returns a value', async function () {
-        const prompter = new SimplePrompter(1)
-        assert.strictEqual(await prompter.prompt(), 1)
-    })
-
-    it('can map one type to another', async function () {
-        const prompter = new SimplePrompter(1).transform(resp => resp.toString())
-        assert.strictEqual(await prompter.prompt(), '1')
-    })
-
-    it('throws error if calling prompt multiple times', async function () {
-        const prompter = new SimplePrompter(1)
-        await prompter.prompt()
-        await assert.rejects(prompter.prompt())
-    })
-
-    it('can attach multiple transformations', async function () {
-        const prompter = new SimplePrompter(1)
-        prompter
-            .transform(resp => resp * 2)
-            .transform(resp => resp + 2)
-            .transform(resp => resp * 2)
-            .transform(resp => resp - 2)
-            .transform(resp => resp.toString())
-            .transform(resp => `result: ${resp}`)
-        assert.strictEqual(await prompter.prompt(), 'result: 6')
-    })
-})
diff --git a/src/test/shared/ui/prompters/roles.test.ts b/src/test/shared/ui/prompters/roles.test.ts
deleted file mode 100644
index 57ddb51b861..00000000000
--- a/src/test/shared/ui/prompters/roles.test.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as sinon from 'sinon'
-import * as assert from 'assert'
-import { IAM } from 'aws-sdk'
-import { DefaultIamClient } from '../../../../shared/clients/iamClient'
-import { createQuickPickTester, QuickPickTester } from '../testUtils'
-import { createRolePrompter } from '../../../../shared/ui/common/roles'
-import { toCollection } from '../../../../shared/utilities/asyncCollection'
-import { stub } from '../../../utilities/stubber'
-
-const helpUri = vscode.Uri.parse('https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles.html')
-
-describe('createRolePrompter', function () {
-    let roles: IAM.Role[]
-    let newRole: IAM.Role
-    let tester: QuickPickTester<IAM.Role>
-
-    beforeEach(function () {
-        roles = [
-            {
-                RoleName: 'test-role1',
-                Arn: 'test-arn1',
-            } as any,
-        ]
-
-        newRole = {
-            RoleName: 'new-role',
-            Arn: 'new-arn',
-        } as any
-
-        const client = stub(DefaultIamClient, { regionCode: 'region-1' })
-        client.getRoles.returns(
-            toCollection(async function* () {
-                yield roles
-            })
-        )
-
-        const prompter = createRolePrompter(client, {
-            createRole: () => Promise.resolve(newRole),
-            helpUrl: helpUri,
-        })
-
-        tester = createQuickPickTester(prompter)
-    })
-
-    afterEach(function () {
-        sinon.restore()
-    })
-
-    it('prompts for role', async function () {
-        tester.acceptItem('test-role1')
-        await tester.result(roles[0])
-    })
-
-    it('can refresh', async function () {
-        const role2 = { RoleName: 'test-role2', Arn: 'test-arn2' } as any
-        tester.addCallback(() => roles.push(role2))
-        tester.pressButton('Refresh')
-        tester.assertItems(['test-role1', 'test-role2'])
-        tester.acceptItem('test-role2')
-        await tester.result(role2)
-    })
-
-    it('can create a new role', async function () {
-        tester.pressButton('Create Role...')
-        tester.assertItems(['test-role1', 'new-role'])
-        tester.acceptItem('new-role')
-        await tester.result(newRole)
-    })
-
-    it('can open documentation', async function () {
-        const openStub = sinon.stub(vscode.env, 'openExternal')
-        tester.pressButton('View Toolkit Documentation')
-        tester.addCallback(() => assert.ok(openStub.calledWith(helpUri)))
-        tester.hide()
-        await tester.result()
-    })
-})
diff --git a/src/test/shared/ui/testUtils.ts b/src/test/shared/ui/testUtils.ts
deleted file mode 100644
index 5a3418589c9..00000000000
--- a/src/test/shared/ui/testUtils.ts
+++ /dev/null
@@ -1,342 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-// Common prompter testing utilities
-
-import { AssertionError, deepStrictEqual } from 'assert'
-import { QuickInputButton } from '../../../shared/ui/buttons'
-import { DataQuickPickItem, QuickPickPrompter } from '../../../shared/ui/pickerPrompter'
-import { PromptResult } from '../../../shared/ui/prompter'
-import { exposeEmitters } from '../vscode/testUtils'
-
-type QuickPickTesterMethods<T> = {
-    /**
-     * Presses a button.
-     * Can either use the exact button object or pass in a string to search for a tooltip.
-     * The tooltip string must be an exact match.
-     */
-    pressButton(button: string | QuickInputButton<T>): void
-    /**
-     * Attempts to accept the given item.
-     * If a string is given, then the item will be matched based off label. Otherwise a deep compare will be performed.
-     * Only exact matches will be accepted.
-     */
-    acceptItem(item: string | DataQuickPickItem<T>): void
-    /**
-     * Asserts that the given items are loaded in the QuickPick, in the given order.
-     * Must include all visible items. Filtered items will not be considered.
-     */
-    assertItems(items: string[] | DataQuickPickItem<T>[]): void
-    /**
-     * Asserts that the given items are loaded in the QuickPick, in the given order.
-     * This can be a subset of the currently visible items.
-     */
-    assertContainsItems(...items: (string | DataQuickPickItem<T>)[]): void
-    /**
-     * Asserts that the items are currently selected. Not applicable to single-item pickers.
-     * Order does not matter, but it must be the same items. Filtering is not applied.
-     */
-    assertSelectedItems(...items: (string | DataQuickPickItem<T>)[]): void
-    /**
-     * Asserts that the items are currently active.
-     * Order does not matter, but it must be the same items.
-     */
-    assertActiveItems(...items: (string | DataQuickPickItem<T>)[]): void
-    /**
-     * Hides the picker.
-     */
-    hide(): void
-    /**
-     * Runs the given inputs and waits for the result or timeout.
-     * Can optionally pass in an expected return value.
-     *
-     * This **must** be called and awaited, otherwise errors will not be surfaced correctly.
-     */
-    result(exptected?: PromptResult<T>): Promise<PromptResult<T>>
-    /**
-     * Executes the callback with a snapshot of the prompter in a given moment.
-     *
-     * This can be used for things such as setting up external state, asserting side-effects, or
-     * inspecting the picker at test time.
-     */
-    addCallback(callback: (prompter?: QuickPickPrompter<T>) => Promise<any> | any): void
-    /**
-     * Sets the Quick Pick's filter. `undefined` removes any applied filters.
-     *
-     * This will affect what items are considered 'visible' by the tester depending on which
-     * 'matchOn___' fields have been set in the picker.
-     */
-    setFilter(value?: string): void
-}
-
-export type QuickPickTester<T> = QuickPickTesterMethods<T> & QuickPickPrompter<T>
-
-type Action<T> = {
-    [P in keyof QuickPickTesterMethods<T>]: [P, Parameters<QuickPickTesterMethods<T>[P]>]
-}[keyof QuickPickTesterMethods<T>]
-
-interface TestOptions {
-    /** Amount of time to wait per action before stopping the test. */
-    timeout?: number
-    // TODO: add formatting options?
-}
-
-const testDefaults: Required<TestOptions> = {
-    timeout: 5000,
-}
-
-/**
- * Creates a tester for quick picks.
- *
- * Tests are constructed as a series of 'actions' that are executed sequentially. Any action that
- * fails will immediately stop the test. The first action will always occur after the prompter is
- * both visible and enabled. Actions will always wait until the prompter is not busy/disabled before
- * continuing.
- *
- * @param prompter Prompter to test.
- * @param options Additional test options.
- *
- * @returns A {@link QuickPickTester}
- */
-export function createQuickPickTester<T>(
-    prompter: QuickPickPrompter<T>,
-    options: TestOptions = {}
-): QuickPickTester<T> {
-    type AssertionParams = ConstructorParameters<typeof AssertionError>[0]
-    const actions: Action<T>[] = []
-    const errors: Error[] = []
-    const traces: AssertionParams[] = []
-    const testPicker = exposeEmitters(prompter.quickPick, ['onDidAccept', 'onDidTriggerButton'])
-    const resolvedOptions = { ...testDefaults, ...options }
-
-    /* Waits until the picker is both enabled and not busy. */
-    function whenReady(): Promise<void[]> {
-        return Promise.all([
-            new Promise<void>(r => {
-                if (testPicker.enabled) {
-                    return r()
-                }
-
-                const d = prompter.onDidChangeEnablement(e => e && d.dispose(), r())
-            }),
-            new Promise<void>(r => {
-                if (!testPicker.busy) {
-                    return r()
-                }
-
-                const d = prompter.onDidChangeBusy(e => !e && (d.dispose(), r()))
-            }),
-        ])
-    }
-
-    // 'activeItems' will change twice after applying a filter
-    /* Waits until the filter has been applied to the picker */
-    async function whenAppliedFilter(): Promise<void> {
-        await new Promise<void>(r => {
-            const d = testPicker.onDidChangeActive(() => (d.dispose(), r()))
-        })
-        await new Promise(r => setImmediate(r))
-        await new Promise<void>(r => {
-            const d = testPicker.onDidChangeActive(() => (d.dispose(), r()))
-        })
-    }
-
-    /* Simulates the filtering of items. We do not have access to the picker's internal representation */
-    function filterItems(): DataQuickPickItem<T>[] {
-        const val = testPicker.value
-        const filter = (item: DataQuickPickItem<T>) => {
-            if (!item.label.match(val)) {
-                return (
-                    (testPicker.matchOnDescription && (item.description ?? '').match(val)) ||
-                    (testPicker.matchOnDetail && (item.detail ?? '').match(val))
-                )
-            }
-            return true
-        }
-        return testPicker.items.filter(filter)
-    }
-
-    /* Returns all items from source that are in target. Strings are matched based off label. Items are only matched once. */
-    function matchItems(
-        source: DataQuickPickItem<T>[],
-        target: (string | DataQuickPickItem<T>)[]
-    ): DataQuickPickItem<T>[] {
-        return source.filter(item => {
-            const index = target.findIndex(t =>
-                typeof t === 'string' ? item.label === t : JSON.stringify(item) === JSON.stringify(t)
-            )
-            if (index !== -1) {
-                return (target = target.slice(0, index).concat(target.slice(index + 1)))
-            }
-        })
-    }
-
-    function throwErrorWithTrace(trace: AssertionParams, message: string, actual?: any, expected?: any) {
-        errors.push(new AssertionError({ ...trace, message, actual, expected }))
-        testPicker.hide()
-    }
-
-    /* Executes a test action. Immediately hides the picker on any error */
-    async function executeAction(action: Action<T>, trace: AssertionParams): Promise<void> {
-        const throwError = throwErrorWithTrace.bind(undefined, trace)
-
-        function assertItems(actual: DataQuickPickItem<T>[], expected: (string | DataQuickPickItem<T>)[]): void {
-            if (actual.length !== expected.length) {
-                return throwError('Picker had different number of items')
-            }
-
-            actual.forEach((actualItem, index) => {
-                const expectedItem = expected[index]
-                const type = typeof expectedItem === 'string' ? 'label' : 'item'
-                if (
-                    (type === 'label' && actualItem.label !== expectedItem) ||
-                    (type === 'item' && JSON.stringify(actualItem) !== JSON.stringify(expectedItem))
-                ) {
-                    const actual = type === 'item' ? actualItem : actualItem.label
-                    throwError(`Unexpected ${type} found at index ${index}`, actual, expectedItem)
-                }
-            })
-        }
-
-        switch (action[0]) {
-            case 'pressButton': {
-                const target =
-                    typeof action[1][0] === 'string'
-                        ? testPicker.buttons.filter(b => b.tooltip === action[1][0])[0]
-                        : action[1][0]
-                if (target === undefined) {
-                    throwError(`Unable to find button: ${action[1][0]}`)
-                }
-                testPicker.fireOnDidTriggerButton(target)
-                break
-            }
-            case 'acceptItem': {
-                const filteredItems = filterItems()
-                const match = matchItems(filteredItems, [action[1][0]])
-                if (match.length === 0) {
-                    throwError(`Unable to find item: ${JSON.stringify(action[1][0])}`) // TODO: add ways to format
-                }
-                testPicker.selectedItems = match
-                break
-            }
-            case 'assertItems': {
-                const filteredItems = filterItems()
-                assertItems(filteredItems, action[1][0])
-                break
-            }
-            case 'assertContainsItems': {
-                const filteredItems = filterItems()
-                const match = matchItems(filteredItems, action[1])
-                // Check length here first for better error output
-                if (match.length !== action[1].length) {
-                    return throwError(`Did not find all items`, match, action[1])
-                }
-                assertItems(match, action[1])
-                break
-            }
-            case 'assertSelectedItems': {
-                // Filtered items can still be selected for multi-item pickers
-                const sortedSelected = [...testPicker.selectedItems].sort((a, b) => a.label.localeCompare(b.label))
-                const sortedExpected = [...action[1]].sort((a, b) => {
-                    const labelA = typeof a === 'string' ? a : a.label
-                    const labelB = typeof b === 'string' ? b : b.label
-                    return labelA.localeCompare(labelB)
-                })
-                assertItems(sortedSelected, sortedExpected)
-                break
-            }
-            case 'assertActiveItems': {
-                const filteredActive = filterItems().filter(i => testPicker.activeItems.includes(i))
-                const sortedActive = [...filteredActive].sort((a, b) => a.label.localeCompare(b.label))
-                const sortedExpected = [...action[1]].sort((a, b) => {
-                    const labelA = typeof a === 'string' ? a : a.label
-                    const labelB = typeof b === 'string' ? b : b.label
-                    return labelA.localeCompare(labelB)
-                })
-                assertItems(sortedActive, sortedExpected)
-                break
-            }
-            case 'addCallback': {
-                try {
-                    await action[1][0](prompter)
-                } catch (err) {
-                    throwError(`Callback threw: ${(err as Error).message}`)
-                }
-                break
-            }
-            case 'setFilter':
-                testPicker.value = action[1][0] ?? ''
-                await whenAppliedFilter()
-                break
-            case 'hide': {
-                testPicker.hide()
-                break
-            }
-        }
-    }
-
-    async function start(): Promise<void> {
-        while (actions.length > 0) {
-            const trace = traces.shift()!
-            const timeout = setTimeout(() => throwErrorWithTrace(trace, 'Timed out'), resolvedOptions.timeout)
-            await whenReady()
-            await executeAction(actions.shift()!, trace)
-            clearTimeout(timeout)
-        }
-    }
-
-    async function result(expected?: PromptResult<T>): Promise<PromptResult<T>> {
-        const result = await prompter.prompt()
-        if (errors.length > 0) {
-            // TODO: combine errors into a single one
-            throw errors[0]
-        }
-        if (arguments.length > 0) {
-            deepStrictEqual(result, expected)
-        }
-        return result
-    }
-
-    const withTrace = <T extends (...args: any[]) => any>(f: T, name: string) => {
-        const traceWrapper = (...args: any[]) => {
-            traces.push({ stackStartFn: traceWrapper, operator: name, message: name })
-            f(...args)
-        }
-        return Object.defineProperty(traceWrapper, 'name', { value: name, configurable: true, writable: false })
-    }
-
-    /**
-     * Remaps stack traces to point to the action that caused the test to fail.
-     */
-    function wrapTraces<T extends { [key: string]: any }>(obj: T, exclude: (keyof T)[] = []): T {
-        Object.keys(obj).forEach(key => {
-            if (obj[key] instanceof Function && exclude.indexOf(key) === -1) {
-                Object.assign(obj, { [key]: withTrace(obj[key], key) })
-            }
-        })
-        return obj
-    }
-
-    // initialize prompter
-    prompter.onDidShow(start)
-
-    return Object.assign(
-        prompter,
-        wrapTraces(
-            {
-                pressButton: button => actions.push(['pressButton', [button]]),
-                acceptItem: item => actions.push(['acceptItem', [item]]),
-                assertItems: items => actions.push(['assertItems', [items]]),
-                assertContainsItems: (...items) => actions.push(['assertContainsItems', items]),
-                assertSelectedItems: (...items) => actions.push(['assertSelectedItems', items]),
-                assertActiveItems: (...items) => actions.push(['assertActiveItems', items]),
-                addCallback: callback => actions.push(['addCallback', [callback]]),
-                setFilter: value => actions.push(['setFilter', [value]]),
-                hide: () => actions.push(['hide', []]),
-                result,
-            } as QuickPickTesterMethods<T>,
-            ['result', 'hide']
-        )
-    )
-}
diff --git a/src/test/shared/utilities/asyncCollection.test.ts b/src/test/shared/utilities/asyncCollection.test.ts
deleted file mode 100644
index 2c29ce182bf..00000000000
--- a/src/test/shared/utilities/asyncCollection.test.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { toCollection } from '../../../shared/utilities/asyncCollection'
-
-describe('AsyncCollection', function () {
-    const items = [
-        { name: 'item1', data: 0 },
-        { name: 'item2', data: 1 },
-        { name: 'item3', data: 2 },
-    ]
-
-    async function* gen() {
-        yield 0
-        yield 1
-        yield 2
-    }
-
-    async function* returnGen() {
-        yield 0
-        yield 1
-        return 2
-    }
-
-    async function* genPage() {
-        yield [0, 1, 2]
-        yield [3, 4, 5]
-        yield [6, 7, 8]
-    }
-
-    async function* genItem() {
-        yield items[0]
-        yield items[1]
-        yield items[2]
-    }
-
-    it('can be iterated over', async function () {
-        const collection = toCollection(gen)
-        const expected = [0, 1, 2]
-        for await (const o of collection) {
-            assert.strictEqual(o, expected.shift())
-        }
-    })
-
-    it('can turn into a Promise', async function () {
-        const promise = toCollection(gen).promise()
-        assert.deepStrictEqual(await promise, [0, 1, 2])
-    })
-
-    it('can turn into a map using property key', async function () {
-        const map = await toCollection(genItem).toMap('name')
-        items.forEach(v => assert.strictEqual(map.get(v.name), v))
-    })
-
-    it('can turn into a map using function', async function () {
-        const map = await toCollection(genItem).toMap(i => i.data.toString())
-        items.forEach(v => assert.strictEqual(map.get(v.data.toString()), v))
-    })
-
-    it('can map', async function () {
-        const mapped = toCollection(gen)
-            .map(o => o + 1)
-            .map(o => o.toString())
-            .map(s => `${s}!`)
-        assert.deepStrictEqual(await mapped.promise(), ['1!', '2!', '3!'])
-    })
-
-    it('can flatten', async function () {
-        const flat = toCollection(genPage).flatten()
-        const expected = Array(9)
-            .fill(0)
-            .map((_, i) => i)
-        assert.deepStrictEqual(await flat.promise(), expected)
-    })
-
-    it('can flatten generators that return things', async function () {
-        const collection = toCollection(async function* () {
-            yield await toCollection(returnGen).promise()
-            yield await toCollection(returnGen)
-                .map(i => i + 1)
-                .promise()
-            return await toCollection(returnGen)
-                .map(i => i + 2)
-                .promise()
-        })
-
-        const flat = collection.flatten().map(i => i * 2)
-        const expected = 0 + 2 + 4 + (2 + 4 + 6) + (4 + 6 + 8) // Writing it all out for readability
-        const actual = (await flat.promise()).reduce((a, b) => a + b, 0)
-        assert.deepStrictEqual(actual, expected)
-    })
-
-    it('can filter', async function () {
-        const filtered = toCollection(genPage)
-            .filter(o => o.includes(5))
-            .flatten()
-        const expected = [3, 4, 5]
-        assert.deepStrictEqual(await filtered.promise(), expected)
-    })
-
-    it('can limit', async function () {
-        const limited = toCollection(gen).limit(2)
-        assert.deepStrictEqual(await limited.promise(), [0, 1])
-    })
-
-    it('returns nothing if using non-positive limit count', async function () {
-        const limitZero = toCollection(gen).limit(0)
-        const limitNeg1 = toCollection(gen).limit(-1)
-        assert.deepStrictEqual(await limitZero.promise(), [])
-        assert.deepStrictEqual(await limitNeg1.promise(), [])
-    })
-
-    it('is immutable', async function () {
-        const x = toCollection(gen)
-        const y = x.map(o => o + 1)
-        const z = y
-            .filter(o => o !== 1)
-            .map(o => [o, o])
-            .flatten()
-
-        assert.deepStrictEqual(await x.promise(), [0, 1, 2])
-        assert.deepStrictEqual(await y.promise(), [1, 2, 3])
-        assert.deepStrictEqual(await z.promise(), [2, 2, 3, 3])
-    })
-
-    it('can map with async functions', async function () {
-        const double = async (n: number) => 2 * n
-
-        const mapped = toCollection(gen)
-            .map(o => o + 1)
-            .map(double)
-            .map(o => o - 1)
-            .map(double)
-            .map(o => `${o}!`)
-
-        assert.deepStrictEqual(await mapped.promise(), ['2!', '6!', '10!'])
-    })
-
-    it('does not iterate over the generator when applying transformations', async function () {
-        let callCount = 0
-        async function* count() {
-            while (callCount < 1000) {
-                yield callCount++
-            }
-        }
-
-        const x = toCollection(count)
-            .filter(o => o > 1)
-            .map(o => [o, o * o])
-            .flatten()
-        await new Promise(r => setImmediate(r))
-        assert.strictEqual(callCount, 0)
-        assert.deepStrictEqual(await x.limit(6).promise(), [2, 4, 3, 9, 4, 16])
-        assert.strictEqual(callCount, 6)
-    })
-
-    describe('errors', function () {
-        async function* error() {
-            throw new Error()
-            yield 0
-        }
-
-        it('bubbles errors up when using a promise', async function () {
-            const errorPromise = toCollection(error)
-                .map(o => o)
-                .filter(_ => true)
-                .flatten()
-                .promise()
-            await assert.rejects(errorPromise)
-        })
-
-        it('bubbles errors up when iterating', async function () {
-            const errorIter = toCollection(error)
-                .map(o => o)
-                .filter(_ => true)
-                .flatten()
-            const iterate = async () => {
-                for await (const _ of errorIter) {
-                }
-            }
-            await assert.rejects(iterate)
-        })
-    })
-})
diff --git a/src/test/shared/utilities/childProcess.test.ts b/src/test/shared/utilities/childProcess.test.ts
deleted file mode 100644
index 35d1e7d41a0..00000000000
--- a/src/test/shared/utilities/childProcess.test.ts
+++ /dev/null
@@ -1,338 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as fs from 'fs-extra'
-import * as os from 'os'
-import * as path from 'path'
-import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../../../shared/filesystemUtilities'
-import { ChildProcess, eof } from '../../../shared/utilities/childProcess'
-import { sleep } from '../../../shared/utilities/timeoutUtils'
-import { Timeout, waitUntil } from '../../../shared/utilities/timeoutUtils'
-
-describe('ChildProcess', async function () {
-    let tempFolder: string
-
-    beforeEach(async function () {
-        // Make a temp folder for all these tests
-        // Stick some temp credentials files in there to load from
-        tempFolder = await makeTemporaryToolkitFolder()
-    })
-
-    afterEach(async function () {
-        await tryRemoveFolder(tempFolder)
-    })
-
-    describe('run', async function () {
-        async function assertRegularRun(childProcess: ChildProcess): Promise<void> {
-            const result = await childProcess.run()
-            assert.strictEqual(result.exitCode, 0, 'Unexpected close code')
-            assert.strictEqual(result.stdout, 'hi', 'Unexpected stdout')
-        }
-
-        if (process.platform === 'win32') {
-            it('starts and captures stdout - windows', async function () {
-                const batchFile = path.join(tempFolder, 'test-script.bat')
-                writeBatchFile(batchFile)
-
-                const childProcess = new ChildProcess(batchFile)
-
-                await assertRegularRun(childProcess)
-            })
-
-            it('runs cmd files containing a space in the filename and folder', async function () {
-                const subfolder: string = path.join(tempFolder, 'sub folder')
-                const command: string = path.join(subfolder, 'test script.cmd')
-
-                fs.mkdirSync(subfolder)
-
-                writeWindowsCommandFile(command)
-
-                const childProcess = new ChildProcess(command)
-
-                await assertRegularRun(childProcess)
-            })
-
-            it('errs when starting twice - windows', async function () {
-                const batchFile = path.join(tempFolder, 'test-script.bat')
-                writeBatchFile(batchFile)
-
-                const childProcess = new ChildProcess(batchFile)
-
-                // We want to verify that the error is thrown even if the first
-                // invocation is still in progress, so we don't await the promise.
-                childProcess.run()
-
-                try {
-                    await childProcess.run()
-                } catch (err) {
-                    return
-                }
-
-                assert.fail('Expected exception, but none was thrown.')
-            })
-        } // END Windows only tests
-
-        if (process.platform !== 'win32') {
-            it('runs and captures stdout - unix', async function () {
-                const scriptFile = path.join(tempFolder, 'test-script.sh')
-                writeShellFile(scriptFile)
-
-                const childProcess = new ChildProcess(scriptFile)
-
-                await assertRegularRun(childProcess)
-            })
-
-            it('errs when starting twice - unix', async function () {
-                const scriptFile = path.join(tempFolder, 'test-script.sh')
-                writeShellFile(scriptFile)
-
-                const childProcess = new ChildProcess(scriptFile)
-
-                // We want to verify that the error is thrown even if the first
-                // invocation is still in progress, so we don't await the promise.
-                childProcess.run()
-
-                try {
-                    await childProcess.run()
-                } catch (err) {
-                    return
-                }
-
-                assert.fail('Expected exception, but none was thrown.')
-            })
-        } // END Linux only tests
-
-        it('runs scripts containing a space in the filename and folder', async function () {
-            const subfolder: string = path.join(tempFolder, 'sub folder')
-            let command: string
-
-            fs.mkdirSync(subfolder)
-
-            if (process.platform === 'win32') {
-                command = path.join(subfolder, 'test script.bat')
-                writeBatchFile(command)
-            } else {
-                command = path.join(subfolder, 'test script.sh')
-                writeShellFile(command)
-            }
-
-            const childProcess = new ChildProcess(command)
-
-            await assertRegularRun(childProcess)
-        })
-
-        it('reports error for missing executable', async function () {
-            const batchFile = path.join(tempFolder, 'nonExistentScript')
-
-            const childProcess = new ChildProcess(batchFile)
-
-            const result = await childProcess.run()
-            assert.notStrictEqual(result.exitCode, 0, 'Expected an error close code')
-        })
-
-        describe('Extra options', function () {
-            let childProcess: ChildProcess
-
-            beforeEach(function () {
-                const isWindows = process.platform === 'win32'
-                const command = path.join(tempFolder, `test-script.${isWindows ? 'bat' : 'sh'}`)
-
-                if (isWindows) {
-                    writeBatchFile(command, ['@echo %1', '@echo %2', '@echo "%3"', 'SLEEP 20', 'exit 1'].join(os.EOL))
-                } else {
-                    writeShellFile(command, ['echo $1', 'echo $2', 'echo "$3"', 'sleep 20', 'exit 1'].join(os.EOL))
-                }
-
-                childProcess = new ChildProcess(command, ['1', '2'], { collect: false })
-            })
-
-            it('can report errors', async function () {
-                const result = childProcess.run({
-                    rejectOnError: true,
-                    useForceStop: true,
-                    onStdout: (text, context) => {
-                        if (text.includes('2')) {
-                            context.reportError('Got 2')
-                        }
-                    },
-                })
-
-                return assert.rejects(result, { message: 'Got 2' })
-            })
-
-            it('can reject on errors if `rejectOnError` is set', async function () {
-                return await assert.rejects(() =>
-                    childProcess.run({
-                        rejectOnError: true,
-                        onStdout: (text, context) => {
-                            context.reportError('An error')
-                        },
-                    })
-                )
-            })
-
-            it('kills the process if an error is reported', async function () {
-                const result = await childProcess.run({
-                    waitForStreams: false,
-                    onStdout: (text, context) => {
-                        context.reportError('An error')
-                    },
-                })
-                assert.notStrictEqual(result.exitCode, 1)
-            })
-
-            it('can merge with base options', async function () {
-                const result = await childProcess.run({
-                    collect: true,
-                    waitForStreams: false,
-                    extraArgs: ['4'],
-                    onStdout: (text, context) => {
-                        if (text.includes('4')) {
-                            context.reportError('Got 4')
-                        }
-                    },
-                })
-                assert.ok(result.stdout.length !== 0)
-                assert.ok(result.error?.message.includes('Got 4'))
-            })
-
-            it('uses `Timeout` objects', async function () {
-                await childProcess.run({
-                    waitForStreams: false,
-                    timeout: new Timeout(10),
-                })
-                assert.strictEqual(childProcess.result()?.signal, 'SIGTERM')
-                assert.notStrictEqual(childProcess.result()?.error, undefined)
-            })
-
-            it('still runs if the timer completed (not rejected) after starting', async function () {
-                const timer = new Timeout(10)
-                setTimeout(() => timer.dispose())
-                await childProcess.run({
-                    waitForStreams: false,
-                    onStdout: (text, context) => {
-                        context.reportError('Got stuff')
-                    },
-                })
-
-                assert.strictEqual(childProcess.result()?.error?.message, 'Got stuff')
-            })
-
-            it('rejects if using a completed timer', async function () {
-                const timer = new Timeout(10)
-                timer.dispose()
-                await assert.rejects(childProcess.run({ timeout: timer }))
-                assert.strictEqual(childProcess.result(), undefined)
-                // Just make sure no process was ever ran
-                await sleep(20)
-                assert.strictEqual(childProcess.result(), undefined)
-            })
-        })
-    })
-
-    describe('stop()', async function () {
-        if (process.platform === 'win32') {
-            it('detects running processes and successfully stops a running process - Windows', async function () {
-                const batchFile = path.join(tempFolder, 'test-script.bat')
-                writeBatchFileWithDelays(batchFile)
-
-                const childProcess = new ChildProcess(batchFile)
-
-                // `await` is intentionally not used, we want to check the process while it runs.
-                childProcess.run()
-
-                assert.strictEqual(childProcess.stopped, false)
-                childProcess.stop()
-                await waitUntil(async () => childProcess.stopped, { timeout: 1000, interval: 100, truthy: true })
-                assert.strictEqual(childProcess.stopped, true)
-            })
-
-            it('can stop() previously stopped processes - Windows', async function () {
-                const batchFile = path.join(tempFolder, 'test-script.bat')
-                writeBatchFileWithDelays(batchFile)
-
-                const childProcess = new ChildProcess(batchFile)
-
-                // `await` is intentionally not used, we want to check the process while it runs.
-                childProcess.run()
-
-                childProcess.stop()
-                await waitUntil(async () => childProcess.stopped, { timeout: 1000, interval: 100, truthy: true })
-                assert.strictEqual(childProcess.stopped, true)
-                assert.doesNotThrow(() => childProcess.stop())
-            })
-        } // END Windows-only tests
-
-        if (process.platform !== 'win32') {
-            it('detects running processes and successfully stops a running process - Unix', async function () {
-                const scriptFile = path.join(tempFolder, 'test-script.sh')
-                writeShellFileWithDelays(scriptFile)
-
-                const childProcess = new ChildProcess('sh', [scriptFile])
-                const result = childProcess.run()
-
-                assert.strictEqual(childProcess.stopped, false)
-                childProcess.stop()
-                await result
-
-                assert.strictEqual(childProcess.stopped, true)
-            })
-
-            it('can stop() previously stopped processes - Unix', async function () {
-                const scriptFile = path.join(tempFolder, 'test-script.sh')
-                writeShellFileWithDelays(scriptFile)
-
-                const childProcess = new ChildProcess(scriptFile)
-
-                const result = childProcess.run()
-
-                childProcess.stop()
-                await result
-
-                assert.strictEqual(childProcess.stopped, true)
-                assert.doesNotThrow(() => childProcess.stop())
-            })
-
-            it('can send input - Unix', async function () {
-                const childProcess = new ChildProcess('cat')
-                const result = childProcess.run()
-                await childProcess.send('foo')
-                await childProcess.send(eof)
-                const { stdout } = await result
-                assert.strictEqual(stdout, 'foo')
-            })
-        } // END Unix-only tests
-    })
-
-    function writeBatchFile(filename: string, contents?: string): void {
-        fs.writeFileSync(filename, contents ?? '@echo hi')
-    }
-
-    function writeBatchFileWithDelays(filename: string): void {
-        const file = `
-        @echo hi
-        SLEEP 20
-        @echo bye`
-        fs.writeFileSync(filename, file)
-    }
-
-    function writeWindowsCommandFile(filename: string): void {
-        fs.writeFileSync(filename, `@echo OFF${os.EOL}echo hi`)
-    }
-
-    function writeShellFile(filename: string, contents = 'echo hi'): void {
-        fs.writeFileSync(filename, `#!/bin/sh\n${contents}`)
-        fs.chmodSync(filename, 0o744)
-    }
-
-    function writeShellFileWithDelays(filename: string): void {
-        const file = `
-        echo hi
-        sleep 20
-        echo bye`
-        writeShellFile(filename, file)
-    }
-})
diff --git a/src/test/shared/utilities/cliUtils.test.ts b/src/test/shared/utilities/cliUtils.test.ts
deleted file mode 100644
index ea0ab59aa18..00000000000
--- a/src/test/shared/utilities/cliUtils.test.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as fs from 'fs-extra'
-import * as path from 'path'
-import { installCli } from '../../../shared/utilities/cliUtils'
-import globals from '../../../shared/extensionGlobals'
-import { ChildProcess } from '../../../shared/utilities/childProcess'
-import { createTestWindow } from '../vscode/window'
-import { SeverityLevel } from '../vscode/message'
-import { assertTelemetryCurried } from '../../testUtil'
-
-describe('cliUtils', async function () {
-    let testWindow: ReturnType<typeof createTestWindow>
-
-    beforeEach(function () {
-        testWindow = createTestWindow()
-    })
-
-    afterEach(async function () {
-        fs.remove(path.join(globals.context.globalStorageUri.fsPath, 'tools'))
-    })
-
-    describe('installCli', async function () {
-        async function hasFunctionalCli(cliPath: string): Promise<boolean> {
-            const { exitCode } = await new ChildProcess(cliPath).run()
-
-            return exitCode === 0
-        }
-
-        const assertTelemetry = assertTelemetryCurried('aws_toolInstallation')
-
-        it('downloads and installs the SSM CLI automatically', async function () {
-            const ssmCli = await installCli('session-manager-plugin', false, testWindow)
-            assert.ok(await hasFunctionalCli(ssmCli))
-            assertTelemetry({
-                result: 'Succeeded',
-                toolId: 'session-manager-plugin',
-            })
-        })
-
-        it('downloads and installs the SSM CLI if prompted and accepted', async function () {
-            const ssmCli = installCli('session-manager-plugin', true, testWindow)
-            const message = await testWindow.waitForMessage(/Install/)
-            message.assertSeverity(SeverityLevel.Information)
-            message.selectItem('Install')
-
-            assert.ok(await hasFunctionalCli(await ssmCli))
-            assertTelemetry({
-                result: 'Succeeded',
-                toolId: 'session-manager-plugin',
-            })
-        })
-
-        it('does not install a CLI if the user is prompted and opts out', async function () {
-            const ssmCli = installCli('session-manager-plugin', true, testWindow)
-            const message = await testWindow.waitForMessage(/Install/)
-            message.close()
-
-            await assert.rejects(ssmCli, /cancelled/)
-            assertTelemetry({
-                result: 'Cancelled',
-                toolId: 'session-manager-plugin',
-            })
-        })
-    })
-})
diff --git a/src/test/shared/utilities/collectionUtils.test.ts b/src/test/shared/utilities/collectionUtils.test.ts
deleted file mode 100644
index aba52eb8669..00000000000
--- a/src/test/shared/utilities/collectionUtils.test.ts
+++ /dev/null
@@ -1,541 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { CloudWatchLogs } from 'aws-sdk'
-import * as sinon from 'sinon'
-import * as vscode from 'vscode'
-import { AsyncCollection } from '../../../shared/utilities/asyncCollection'
-import {
-    complement,
-    difference,
-    filter,
-    filterAsync,
-    first,
-    intersection,
-    take,
-    toArrayAsync,
-    toMap,
-    toMapAsync,
-    union,
-    updateInPlace,
-    getPaginatedAwsCallIter,
-    getPaginatedAwsCallIterParams,
-    IteratorTransformer,
-    stripUndefined,
-    pageableToCollection,
-} from '../../../shared/utilities/collectionUtils'
-
-import { asyncGenerator } from '../../utilities/collectionUtils'
-
-describe('CollectionUtils', async function () {
-    let sandbox: sinon.SinonSandbox
-    beforeEach(function () {
-        sandbox = sinon.createSandbox()
-    })
-
-    afterEach(function () {
-        sandbox.restore()
-    })
-
-    describe('union', async function () {
-        it('returns an empty set if both inputs are empty', async function () {
-            const result = union([], [])
-
-            assert.ok(result)
-            assert.strictEqual(result.size, 0)
-        })
-
-        it('includes all elements from both inputs', async function () {
-            const result = union(['a', 'b'], ['b', 'c'])
-
-            assert.ok(result)
-            assert.strictEqual(result.size, 3)
-            assert.ok(result.has('a'))
-            assert.ok(result.has('b'))
-            assert.ok(result.has('c'))
-        })
-    })
-
-    describe('intersection', async function () {
-        it('returns an empty set if both insputs are empty', async function () {
-            const result = intersection([], [])
-
-            assert.ok(result)
-            assert.strictEqual(result.size, 0)
-        })
-
-        it('returns an empty set if inputs have no elements in common', async function () {
-            const result = intersection(['a'], ['b'])
-
-            assert.ok(result)
-            assert.strictEqual(result.size, 0)
-        })
-
-        it('returns only elements that are present in both inputs', async function () {
-            const result = intersection(['a', 'b'], ['b', 'c'])
-
-            assert.ok(result)
-            assert.strictEqual(result.size, 1)
-            assert.ok(result.has('b'))
-        })
-    })
-
-    describe('difference', async function () {
-        it('returns an empty set if the first input is empty', async function () {
-            const result = difference([], ['a'])
-
-            assert.ok(result)
-            assert.strictEqual(result.size, 0)
-        })
-
-        it('returns the elements in the first input if the second input is empty', async function () {
-            const result = difference(['a'], [])
-
-            assert.ok(result)
-            assert.strictEqual(result.size, 1)
-            assert.ok(result.has('a'))
-        })
-
-        it('does not return elements that are present in the second input', async function () {
-            const result = difference(['a', 'b'], ['b'])
-
-            assert.ok(result)
-            assert.strictEqual(result.size, 1)
-            assert.ok(result.has('a'))
-        })
-    })
-
-    describe('complement', async function () {
-        it('returns an empty set if the second input is empty', async function () {
-            const result = complement(['a'], [])
-
-            assert.ok(result)
-            assert.strictEqual(result.size, 0)
-        })
-
-        it('returns the elements in the second input if the first input is empty', async function () {
-            const result = complement([], ['a'])
-
-            assert.ok(result)
-            assert.strictEqual(result.size, 1)
-            assert.ok(result.has('a'))
-        })
-
-        it('does not return elements that are present in the first input', async function () {
-            const result = complement(['b'], ['a', 'b'])
-
-            assert.ok(result)
-            assert.strictEqual(result.size, 1)
-            assert.ok(result.has('a'))
-        })
-    })
-
-    describe('toArrayAsync', async function () {
-        it('returns an empty array if input is empty', async function () {
-            const result = await toArrayAsync(asyncGenerator([]))
-
-            assert.ok(result)
-            assert.strictEqual(result.length, 0)
-        })
-
-        it('returns each item in input', async function () {
-            const result = await toArrayAsync(asyncGenerator(['a', 'b']))
-
-            assert.ok(result)
-            assert.strictEqual(result.length, 2)
-            assert.ok(result.find(item => item === 'a'))
-            assert.ok(result.find(item => item === 'b'))
-        })
-    })
-
-    describe('toMap', async function () {
-        it('returns an empty map if the input is empty', async function () {
-            const result = toMap<string, { key: string }>([], item => item.key)
-
-            assert.ok(result)
-            assert.strictEqual(result.size, 0)
-        })
-
-        it('uses selector to choose keys', async function () {
-            const result = toMap<string, { key: string }>([{ key: 'a' }, { key: 'b' }, { key: 'c' }], item => item.key)
-
-            assert.ok(result)
-            assert.strictEqual(result.size, 3)
-            assert.ok(result.has('a'))
-            assert.ok(result.has('b'))
-            assert.ok(result.has('c'))
-        })
-
-        it('throws an error on duplicate keys', async function () {
-            assert.throws(() =>
-                toMap<string, { key: string }>(
-                    [{ key: 'a' }, { key: 'b' }, { key: 'b' }, { key: 'c' }],
-                    item => item.key
-                )
-            )
-        })
-    })
-
-    describe('toMapAsync', async function () {
-        it('returns an empty map if the input is empty', async function () {
-            const result = await toMapAsync<string, { key: string }>(asyncGenerator([]), item => item.key)
-
-            assert.ok(result)
-            assert.strictEqual(result.size, 0)
-        })
-
-        it('uses selector to choose keys', async function () {
-            const result = await toMapAsync(
-                asyncGenerator([{ key: 'a' }, { key: 'b' }, { key: 'c' }]),
-                item => item.key
-            )
-
-            assert.ok(result)
-            assert.strictEqual(result.size, 3)
-            assert.ok(result.has('a'))
-            assert.ok(result.has('b'))
-            assert.ok(result.has('c'))
-        })
-
-        it('throws an error on duplicate keys', async function () {
-            await assert.rejects(
-                toMapAsync<string, { key: string }>(
-                    asyncGenerator([{ key: 'a' }, { key: 'b' }, { key: 'b' }, { key: 'c' }]),
-                    item => item.key
-                )
-            )
-        })
-    })
-
-    describe('updateInPlace', async function () {
-        it('removes items that are present in the original map, but not the input', async function () {
-            const map = new Map<string, number>()
-            map.set('a', 1)
-
-            updateInPlace(
-                map,
-                [],
-                key => assert.fail(),
-                key => assert.fail()
-            )
-
-            assert.ok(map)
-            assert.strictEqual(map.size, 0)
-        })
-
-        it('updates items that are present in both the original map and the input', async function () {
-            const map = new Map<string, number>()
-            map.set('a', 1)
-            map.set('b', 2)
-
-            updateInPlace(
-                map,
-                ['b'],
-                key => {
-                    assert.strictEqual(key, 'b')
-                    map.set(key, 42)
-                },
-                key => assert.fail()
-            )
-
-            assert.ok(map)
-            assert.strictEqual(map.size, 1)
-            assert.strictEqual(map.get('b'), 42)
-        })
-
-        it('adds items that are present in the input, but not the original map', async function () {
-            const map = new Map<string, number>()
-
-            updateInPlace(
-                map,
-                ['a'],
-                key => assert.fail(),
-                key => {
-                    assert.strictEqual(key, 'a')
-
-                    return 42
-                }
-            )
-
-            assert.ok(map)
-            assert.strictEqual(map.size, 1)
-            assert.strictEqual(map.get('a'), 42)
-        })
-    })
-
-    describe('first', async function () {
-        it('returns the first item the sequence is not empty', async function () {
-            const result = await first(asyncGenerator(['first']))
-
-            assert.strictEqual(result, 'first')
-        })
-
-        it('returns undefined if the sequence is empty', async function () {
-            const result = await first(asyncGenerator([]))
-
-            assert.strictEqual(result, undefined)
-        })
-
-        it('lazily iterates the sequence', async function () {
-            async function* generator(): AsyncIterable<string> {
-                yield 'first'
-                assert.fail('generator iterated too far')
-            }
-
-            const result = await first(generator())
-
-            assert.strictEqual(result, 'first')
-        })
-    })
-
-    describe('take', async function () {
-        it('returns the first <count> items if sequence contains at least that many items', async function () {
-            const result = await take(asyncGenerator(['first', 'second', 'third']), 2)
-
-            assert.ok(result)
-            assert.strictEqual(result.length, 2)
-        })
-
-        it('returns the first <sequence.length> items if sequence contains fewer than <count> items', async function () {
-            const result = await take(asyncGenerator(['first', 'second']), 3)
-
-            assert.ok(result)
-            assert.strictEqual(result.length, 2)
-        })
-
-        it('returns an empty array if sequence is empty', async function () {
-            const result = await take(asyncGenerator([]), 1)
-
-            assert.ok(result)
-            assert.strictEqual(result.length, 0)
-        })
-
-        it('returns an empty array if count is 0', async function () {
-            const result = await take(asyncGenerator(['first']), 0)
-
-            assert.ok(result)
-            assert.strictEqual(result.length, 0)
-        })
-
-        it('lazily iterates the sequence', async function () {
-            async function* generator(): AsyncIterable<string> {
-                yield 'first'
-                yield 'second'
-                assert.fail('generator iterated too far')
-            }
-
-            const result = await take(generator(), 2)
-
-            assert.ok(result)
-            assert.strictEqual(result.length, 2)
-        })
-    })
-
-    describe('filter', async function () {
-        it('returns the original sequence filtered by the predicate', async function () {
-            const input: Iterable<number> = [1, 2]
-            const result = filter(input, i => i % 2 === 0)
-
-            assert.ok(result)
-            assert.strictEqual(result.length, 1)
-            assert.strictEqual(result[0], 2)
-        })
-    })
-
-    describe('filterAsync', async function () {
-        it('returns the original sequence filtered by the predicate', async function () {
-            const result = await toArrayAsync(filterAsync([1, 2], async i => i % 2 === 0))
-
-            assert.ok(result)
-            assert.strictEqual(result.length, 1)
-            assert.strictEqual(result[0], 2)
-        })
-    })
-
-    describe('getPaginatedAwsCallIter', async function () {
-        it('iterates as long as results are present', async function () {
-            const fakeCall = sandbox.stub<
-                [CloudWatchLogs.DescribeLogStreamsRequest],
-                CloudWatchLogs.DescribeLogStreamsResponse
-            >()
-            const responses: CloudWatchLogs.LogStreams[] = [
-                [{ logStreamName: 'stream1' }, { logStreamName: 'stream2' }, { logStreamName: 'stream3' }],
-                [{ logStreamName: 'stream4' }, { logStreamName: 'stream5' }, { logStreamName: 'stream6' }],
-                [{ logStreamName: 'stream7' }, { logStreamName: 'stream8' }, { logStreamName: 'stream9' }],
-            ]
-            fakeCall
-                .onCall(0)
-                .returns({
-                    logStreams: responses[0],
-                    nextToken: 'gotAToken',
-                })
-                .onCall(1)
-                .returns({
-                    logStreams: responses[1],
-                    nextToken: 'gotAnotherToken',
-                })
-                .onCall(2)
-                .returns({
-                    logStreams: responses[2],
-                })
-                .onCall(3)
-                .returns({})
-            const params: getPaginatedAwsCallIterParams<
-                CloudWatchLogs.DescribeLogStreamsRequest,
-                CloudWatchLogs.DescribeLogStreamsResponse
-            > = {
-                awsCall: async req => fakeCall(req),
-                nextTokenNames: {
-                    request: 'nextToken',
-                    response: 'nextToken',
-                },
-                request: {
-                    logGroupName: 'imJustHereSoIWontGetFined',
-                },
-            }
-            const iter: AsyncIterator<CloudWatchLogs.DescribeLogStreamsResponse> = getPaginatedAwsCallIter(params)
-            const firstResult = await iter.next()
-            const secondResult = await iter.next()
-            const thirdResult = await iter.next()
-            const fourthResult = await iter.next()
-            assert.deepStrictEqual(firstResult.value.logStreams, responses[0])
-            assert.deepStrictEqual(secondResult.value.logStreams, responses[1])
-            assert.deepStrictEqual(thirdResult.value.logStreams, responses[2])
-            assert.deepStrictEqual(fourthResult, { done: true, value: undefined })
-        })
-    })
-
-    describe('IteratorTransformer', async function () {
-        it('transforms values from the iterator and does not carry state over when creating another iterator', async function () {
-            const values = ['a', 'b', 'c']
-            async function* iteratorFn(): AsyncIterator<string> {
-                for (const val of values) {
-                    yield val
-                }
-            }
-            const populator = new IteratorTransformer<string, vscode.QuickPickItem>(
-                () => iteratorFn(),
-                val => {
-                    if (val) {
-                        return [{ label: val.toUpperCase() }]
-                    }
-
-                    return []
-                }
-            )
-
-            const firstIter = populator.createPickIterator()
-            let firstI = 0
-            let firstItem = await firstIter.next()
-            while (!firstItem.done) {
-                assert.ok(Array.isArray(firstItem.value)),
-                    assert.strictEqual(firstItem.value.length, 1),
-                    assert.deepStrictEqual(firstItem.value[0], { label: values[firstI].toUpperCase() })
-                firstI++
-                firstItem = await firstIter.next()
-            }
-
-            const secondIter = populator.createPickIterator()
-            let secondI = 0
-            let secondItem = await secondIter.next()
-            while (!secondItem.done) {
-                assert.ok(Array.isArray(secondItem.value)),
-                    assert.strictEqual(secondItem.value.length, 1),
-                    assert.deepStrictEqual(secondItem.value[0], { label: values[secondI].toUpperCase() })
-                secondI++
-                secondItem = await secondIter.next()
-            }
-        })
-    })
-
-    describe('stripUndefined', function () {
-        it('removes undefined from objects', function () {
-            const obj = {
-                prop1: undefined,
-                prop2: 0,
-                prop3: {
-                    prop4: false,
-                    prop5: undefined,
-                    prop6: { prop7: '' },
-                },
-            }
-
-            stripUndefined(obj)
-            assert.deepStrictEqual(obj, {
-                prop2: 0,
-                prop3: {
-                    prop4: false,
-                    prop6: { prop7: '' },
-                },
-            })
-        })
-    })
-
-    describe('pageableToCollection', function () {
-        const pages: { [page: string]: { data: number[]; next?: string } } = {
-            page1: {
-                data: [0, 1, 2],
-                next: 'page2',
-            },
-            page2: {
-                data: [3, 4],
-                next: 'page3',
-            },
-            page3: {
-                data: [5],
-                next: 'page4',
-            },
-            page4: {
-                data: [],
-            },
-            secretPage: {
-                data: [-1],
-            },
-            falsePage: {
-                data: [],
-                next: '', // some APIs will return empty strings rather than undefined
-            },
-        }
-
-        const requester = async (request: { next?: string }) => pages[request.next ?? 'page1']
-
-        it('creates a new AsyncCollection', async function () {
-            const collection = pageableToCollection(requester, {}, 'next', 'data')
-            assert.deepStrictEqual(await collection.promise(), [[0, 1, 2], [3, 4], [5], []])
-        })
-
-        it('uses initial request', async function () {
-            const collection = pageableToCollection(requester, { next: 'secretPage' }, 'next', 'data')
-            assert.deepStrictEqual(await collection.promise(), [[-1]])
-        })
-
-        it('terminates when `next` is an empty string', async function () {
-            const collection = pageableToCollection(requester, { next: 'falsePage' }, 'next', 'data')
-            assert.deepStrictEqual(await collection.promise(), [[]])
-        })
-
-        async function last<T>(iterable: AsyncCollection<T>): Promise<T | undefined> {
-            const iterator = iterable.iterator()
-            while (true) {
-                const { value, done } = await iterator.next()
-                if (done) {
-                    if (value === undefined) {
-                        break
-                    }
-                    return value
-                }
-            }
-        }
-
-        describe('last', function () {
-            it('it persists last element when mapped', async function () {
-                const collection = pageableToCollection(requester, {}, 'next', 'data')
-                const mapped = collection.map(i => i[0] ?? -1)
-                assert.strictEqual(await last(mapped), -1)
-            })
-        })
-    })
-})
diff --git a/src/test/shared/utilities/functionUtils.test.ts b/src/test/shared/utilities/functionUtils.test.ts
deleted file mode 100644
index 95cb2d9fb9f..00000000000
--- a/src/test/shared/utilities/functionUtils.test.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { once } from '../../../shared/utilities/functionUtils'
-
-describe('once', function () {
-    it('does not execute sync functions returning void more than once', function () {
-        let counter = 0
-        const fn = once(() => void counter++)
-
-        fn()
-        assert.strictEqual(counter, 1)
-
-        fn()
-        assert.strictEqual(counter, 1)
-    })
-})
diff --git a/src/test/shared/utilities/messageUtilities.test.ts b/src/test/shared/utilities/messageUtilities.test.ts
deleted file mode 100644
index afe455617c7..00000000000
--- a/src/test/shared/utilities/messageUtilities.test.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { showConfirmationMessage, showViewLogsMessage, showOutputMessage } from '../../../shared/utilities/messages'
-import { MockOutputChannel } from '../../mockOutputChannel'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { createTestWindow } from '../vscode/window'
-
-describe('messages', function () {
-    const window = createTestWindow()
-
-    describe('showConfirmationMessage', function () {
-        const prompt = 'prompt'
-        const confirm = 'confirm'
-        const cancel = 'cancel'
-
-        it('confirms warning message when the user clicks confirm', async function () {
-            const isConfirmed = showConfirmationMessage({ prompt, confirm, cancel }, window)
-            await window.waitForMessage(prompt).then(message => message.selectItem(confirm))
-
-            assert.strictEqual(await isConfirmed, true)
-        })
-
-        it('cancels warning message when the user clicks cancel', async function () {
-            const isConfirmed = showConfirmationMessage({ prompt, confirm, cancel }, window)
-            await window.waitForMessage(prompt).then(message => message.selectItem(cancel))
-
-            assert.strictEqual(await isConfirmed, false)
-        })
-
-        it('cancels warning message on close', async function () {
-            const isConfirmed = showConfirmationMessage({ prompt, confirm, cancel }, window)
-            await window.waitForMessage(prompt).then(message => message.close())
-
-            assert.strictEqual(await isConfirmed, false)
-        })
-    })
-
-    describe('showOutputMessage', function () {
-        it('shows and appends line to output channel', function () {
-            const outputChannel = new MockOutputChannel()
-            showOutputMessage('message', outputChannel)
-
-            assert.strictEqual(outputChannel.isFocused, false)
-            assert.strictEqual(outputChannel.isShown, true)
-            assert.strictEqual(outputChannel.value, 'message\n')
-        })
-    })
-
-    describe('showErrorWithLogs', function () {
-        const message = 'message'
-
-        it('shows error message with a button to view logs', async function () {
-            const window = new FakeWindow({ message: { errorSelection: 'View Logs...' } })
-            await showViewLogsMessage(message, window)
-            assert.strictEqual(window.message.error, message)
-        })
-    })
-})
diff --git a/src/test/shared/utilities/textUtilities.test.ts b/src/test/shared/utilities/textUtilities.test.ts
deleted file mode 100644
index 8d7d96998ae..00000000000
--- a/src/test/shared/utilities/textUtilities.test.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { getRelativeDate, getStringHash, removeAnsi } from '../../../shared/utilities/textUtilities'
-
-describe('removeAnsi', async function () {
-    it('removes ansi code from text', async function () {
-        assert.strictEqual(removeAnsi('\u001b[31mHello World'), 'Hello World')
-    })
-
-    it('text without ansi code remains as-is', async function () {
-        const text = 'Hello World 123!'
-        assert.strictEqual(removeAnsi(text), text)
-    })
-})
-
-describe('getStringHash', async function () {
-    it('produces a hash', async function () {
-        assert.ok(getStringHash('hello'))
-    })
-
-    it('produces a different hash for different strings', async function () {
-        assert.notStrictEqual(getStringHash('hello'), getStringHash('hello '))
-    })
-})
-
-describe('getRelativeDate', function () {
-    const now = new Date(2020, 2, 2, 2, 2, 2)
-    it('produces readable dates', function () {
-        const year = getRelativeDate(new Date(2019, 2, 2, 2, 2, 2), now)
-        const month = getRelativeDate(new Date(2020, 1, 2, 2, 2, 2), now)
-        const day = getRelativeDate(new Date(2020, 2, 1, 2, 2, 2), now)
-        const hour = getRelativeDate(new Date(2020, 2, 2, 1, 2, 2), now)
-        const minute = getRelativeDate(new Date(2020, 2, 2, 2, 1, 2), now)
-
-        assert.strictEqual(year, 'a year ago')
-        assert.strictEqual(month, 'a month ago')
-        assert.strictEqual(day, 'a day ago')
-        assert.strictEqual(hour, 'an hour ago')
-        assert.strictEqual(minute, 'a minute ago')
-    })
-})
diff --git a/src/test/shared/utilities/timeoutUtils.test.ts b/src/test/shared/utilities/timeoutUtils.test.ts
deleted file mode 100644
index 11e44c3b452..00000000000
--- a/src/test/shared/utilities/timeoutUtils.test.ts
+++ /dev/null
@@ -1,406 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as FakeTimers from '@sinonjs/fake-timers'
-import * as timeoutUtils from '../../../shared/utilities/timeoutUtils'
-import { installFakeClock, tickPromise } from '../../../test/testUtil'
-import { sleep } from '../../../shared/utilities/timeoutUtils'
-
-describe('timeoutUtils', async function () {
-    let clock: FakeTimers.InstalledClock
-
-    before(function () {
-        clock = installFakeClock()
-    })
-
-    after(function () {
-        clock.uninstall()
-    })
-
-    afterEach(function () {
-        clock.reset()
-        this.timer?.dispose()
-    })
-
-    describe('Timeout', async function () {
-        it('returns > 0 if the timer is still active', async function () {
-            const timerLengthMs = 100
-            const longTimer = (this.timer = new timeoutUtils.Timeout(timerLengthMs))
-            clock.tick(timerLengthMs / 2)
-            assert.strictEqual(longTimer.remainingTime > 0, true)
-        })
-
-        it('returns 0 if timer is expired', async function () {
-            const timerLengthMs = 10
-            const shortTimer = (this.timer = new timeoutUtils.Timeout(timerLengthMs))
-            clock.tick(timerLengthMs + 1)
-            assert.strictEqual(shortTimer.remainingTime, 0)
-        })
-
-        it('returns a Promise if a timer is active', async function () {
-            const longTimer = (this.timer = new timeoutUtils.Timeout(300))
-            assert.strictEqual(longTimer.promisify() instanceof Promise, true)
-        })
-
-        it('timer object rejects if a timer is expired', async function () {
-            const timerLengthMs = 10
-            const shortTimer = (this.timer = new timeoutUtils.Timeout(timerLengthMs))
-            clock.tick(timerLengthMs + 1)
-            await assert.rejects(
-                shortTimer.promisify(),
-                new Error(timeoutUtils.timeoutExpiredMessage),
-                'Timer did not reject due to timeout'
-            )
-        })
-
-        it('expiration error does not happen when refreshing a completed timer', async function () {
-            const timerLengthMs = 10
-            const shortTimer = (this.timer = new timeoutUtils.Timeout(timerLengthMs))
-            shortTimer.dispose()
-            clock.tick(timerLengthMs + 1)
-            shortTimer.refresh()
-            await tickPromise(assert.doesNotReject(shortTimer.promisify()), clock, timerLengthMs + 1)
-        })
-
-        it('successfully kills active timers', async function () {
-            const longTimer = (this.timer = new timeoutUtils.Timeout(300))
-            // make sure this is an active Promise
-            assert.strictEqual(longTimer.promisify() instanceof Promise, true)
-            longTimer.dispose()
-            clock.tick(400)
-
-            // if the timer was not killed, promise will reject
-            await longTimer.promisify()
-        })
-
-        it('correctly reports an elapsed time', async function () {
-            const checkTimerMs = 50
-            const longTimer = (this.timer = new timeoutUtils.Timeout(checkTimerMs * 6))
-
-            // Simulate a small amount of time, then measure elapsed time
-            clock.tick(checkTimerMs)
-
-            assert.strictEqual(longTimer.elapsedTime, checkTimerMs)
-        })
-
-        it('correctly reports an elapsed time after completion', async function () {
-            const checkTimerMs = 50
-            const longTimer = (this.timer = new timeoutUtils.Timeout(checkTimerMs * 6))
-
-            clock.tick(checkTimerMs)
-            longTimer.dispose()
-            clock.tick(checkTimerMs)
-
-            assert.strictEqual(longTimer.elapsedTime, checkTimerMs)
-        })
-
-        it('Correctly reports elapsed time with refresh', async function () {
-            // TODO: fake timers `refresh` is not implemented correctly for the non-global case
-            this.skip()
-
-            const longTimer = (this.timer = new timeoutUtils.Timeout(10))
-            clock.tick(5)
-            longTimer.refresh()
-            assert.strictEqual(longTimer.remainingTime, 10)
-
-            clock.tick(10)
-            assert.strictEqual(longTimer.elapsedTime, 15)
-            assert.strictEqual(longTimer.remainingTime, 5)
-
-            clock = installFakeClock()
-        })
-
-        it('Refresh pushes back the start time', async function () {
-            const longTimer = (this.timer = new timeoutUtils.Timeout(10))
-            clock.tick(5)
-            longTimer.refresh()
-            assert.strictEqual(longTimer.remainingTime, 10)
-        })
-
-        it('does not reject if refreshed', async function () {
-            this.skip()
-
-            const longTimer = (this.timer = new timeoutUtils.Timeout(10))
-            clock.tick(5)
-            longTimer.refresh()
-            clock.tick(6)
-            longTimer.dispose()
-            clock.tick(10)
-            await longTimer.promisify()
-        })
-
-        describe('onCompletion', function () {
-            const checkTimerMs = 10
-            let timer: timeoutUtils.Timeout
-            let completion: Promise<void>
-
-            beforeEach(function () {
-                timer = this.timer = new timeoutUtils.Timeout(checkTimerMs * 6)
-                completion = new Promise<void>((resolve, reject) => {
-                    timer.onCompletion(resolve)
-                    setTimeout(() => reject(new Error('Timed out waiting for event')), 10000)
-                })
-            })
-
-            it('fires when completed', async function () {
-                timer.dispose()
-                await completion
-            })
-
-            it('fires when cancelled', async function () {
-                timer.cancel()
-                await completion
-            })
-
-            it('fires when expired', async function () {
-                clock.tick(checkTimerMs * 10)
-                await completion
-            })
-        })
-
-        describe('token', function () {
-            const checkTimerMs = 10
-            let timer: timeoutUtils.Timeout
-            let cancellation: Promise<'user' | 'timeout' | 'completed'>
-
-            beforeEach(function () {
-                timer = this.timer = new timeoutUtils.Timeout(checkTimerMs * 6)
-                cancellation = new Promise<'user' | 'timeout' | 'completed'>((resolve, reject) => {
-                    timer.token.onCancellationRequested(({ agent }) => resolve(agent))
-                    timer.onCompletion(() => resolve('completed'))
-                    setTimeout(() => reject(new Error('Timed out waiting for event')), 1000)
-                })
-            })
-
-            it('shows that a cancellation is requested after cancel', async function () {
-                assert.strictEqual(timer.token.isCancellationRequested, false)
-                timer.cancel()
-                assert.strictEqual(timer.token.isCancellationRequested, true)
-                assert.strictEqual(await cancellation, 'user')
-            })
-
-            it('shows that a cancellation is requested after expiration', async function () {
-                assert.strictEqual(timer.token.isCancellationRequested, false)
-                clock.tick(checkTimerMs * 10)
-                assert.strictEqual(timer.token.isCancellationRequested, true)
-                assert.strictEqual(await cancellation, 'timeout')
-            })
-
-            it('does not show that a cancellation is requested after completion', async function () {
-                assert.strictEqual(timer.token.isCancellationRequested, false)
-                timer.dispose()
-                assert.strictEqual(timer.token.isCancellationRequested, false)
-                assert.strictEqual(await cancellation, 'completed')
-            })
-        })
-    })
-
-    describe('waitUntil', async function () {
-        const testSettings = {
-            callCounter: 0,
-            callGoal: 0,
-            functionDelay: 10,
-            clockInterval: 1,
-            clockSpeed: 5,
-        }
-
-        let fastClock: NodeJS.Timeout
-
-        // Test function, increments a counter every time it is called
-        async function testFunction(): Promise<number | undefined> {
-            if (++testSettings.callCounter >= testSettings.callGoal) {
-                return testSettings.callGoal
-            } else {
-                return undefined
-            }
-        }
-
-        // Simple wrapper that waits until calling testFunction
-        async function slowTestFunction(): Promise<number | undefined> {
-            await sleep(testSettings.functionDelay)
-            return testFunction()
-        }
-
-        before(function () {
-            clock.uninstall()
-
-            // Makes a clock that runs clockSpeed times as fast as a normal clock (uses 1ms intervals)
-            // This works since we create an interval with the system clock, then trigger our fake clock with it
-            fastClock = setInterval(() => {
-                clock.tick(testSettings.clockSpeed * testSettings.clockInterval)
-            }, testSettings.clockInterval)
-
-            clock = installFakeClock()
-        })
-
-        after(function () {
-            clearInterval(fastClock)
-        })
-
-        beforeEach(function () {
-            testSettings.callCounter = 0
-            testSettings.functionDelay = 10
-        })
-
-        it('returns value after multiple function calls', async function () {
-            testSettings.callGoal = 4
-            const returnValue: number | undefined = await timeoutUtils.waitUntil(testFunction, {
-                timeout: 10000,
-                interval: 10,
-                truthy: false,
-            })
-            assert.strictEqual(returnValue, testSettings.callGoal)
-        })
-
-        it('timeout before function returns defined value', async function () {
-            testSettings.callGoal = 7
-            const returnValue: number | undefined = await timeoutUtils.waitUntil(testFunction, {
-                timeout: 30,
-                interval: 10,
-                truthy: false,
-            })
-            assert.strictEqual(returnValue, undefined)
-        })
-
-        it('returns true/false values correctly', async function () {
-            assert.strictEqual(
-                true,
-                await timeoutUtils.waitUntil(async () => true, { timeout: 10000, interval: 10, truthy: false })
-            )
-            assert.strictEqual(
-                false,
-                await timeoutUtils.waitUntil(async () => false, { timeout: 10000, interval: 10, truthy: false })
-            )
-        })
-
-        it('timeout when function takes longer than timeout parameter', async function () {
-            testSettings.functionDelay = 100
-            const returnValue: number | undefined = await timeoutUtils.waitUntil(slowTestFunction, {
-                timeout: 50,
-                interval: 10,
-                truthy: false,
-            })
-            assert.strictEqual(returnValue, undefined)
-        })
-
-        it('timeout from slow function calls', async function () {
-            testSettings.callGoal = 10
-            const returnValue: number | undefined = await timeoutUtils.waitUntil(slowTestFunction, {
-                timeout: 50,
-                interval: 10,
-                truthy: false,
-            })
-            assert.strictEqual(returnValue, undefined)
-        })
-
-        it('returns value with after multiple calls and function delay ', async function () {
-            testSettings.callGoal = 3
-            testSettings.functionDelay = 5
-            const returnValue: number | undefined = await timeoutUtils.waitUntil(slowTestFunction, {
-                timeout: 10000,
-                interval: 5,
-                truthy: false,
-            })
-            assert.strictEqual(returnValue, testSettings.callGoal)
-        })
-
-        it('returns value after setting truthy parameter to true', async function () {
-            let counter: number = 0
-            const result: boolean | undefined = await timeoutUtils.waitUntil(async () => counter++ == 5, {
-                timeout: 1000,
-                interval: 5,
-                truthy: true,
-            })
-            assert.strictEqual(result, true)
-        })
-
-        it('timeout after setting truthy parameter to true', async function () {
-            let counter: number = 0
-            const result: boolean | undefined = await timeoutUtils.waitUntil(async () => counter++ == 5, {
-                timeout: 15,
-                interval: 5,
-                truthy: true,
-            })
-            assert.strictEqual(result, undefined)
-        })
-    })
-
-    describe('waitTimeout', async function () {
-        let clock: FakeTimers.InstalledClock
-
-        before(function () {
-            clock = installFakeClock()
-        })
-
-        after(function () {
-            clock.uninstall()
-        })
-
-        afterEach(function () {
-            clock.reset()
-        })
-
-        async function testFunction(delay: number = 500, error?: Error) {
-            await sleep(delay)
-
-            if (error) {
-                throw error
-            }
-
-            return 'test'
-        }
-
-        it('triggers "onExpire" callback', async function () {
-            const timeout = new timeoutUtils.Timeout(200)
-            const timedPromise = timeoutUtils.waitTimeout(testFunction(), timeout, { onExpire: () => 'expire' })
-            clock.tick(300)
-            assert.strictEqual(await timedPromise, 'expire')
-        })
-
-        it('triggers "onCancel" callback', async function () {
-            const timeout = new timeoutUtils.Timeout(400)
-            const timedPromise = timeoutUtils.waitTimeout(testFunction(), timeout, { onCancel: () => 'cancel' })
-            clock.tick(200)
-            timeout.cancel()
-            assert.strictEqual(await timedPromise, 'cancel')
-        })
-
-        it('propagates exception from function', async function () {
-            const timeout = new timeoutUtils.Timeout(400)
-            const testError = new Error('test error')
-            const timedPromise = timeoutUtils.waitTimeout(testFunction(200, testError), timeout)
-            clock.tick(300)
-            await assert.rejects(timedPromise, testError)
-        })
-
-        it('timer does not reject when function finishes in time', async function () {
-            const timeout = new timeoutUtils.Timeout(400)
-            const timedPromise = timeoutUtils.waitTimeout(testFunction(200), timeout)
-            clock.tick(300)
-            timeout.dispose()
-            clock.tick(200)
-            await assert.doesNotReject(timedPromise)
-        })
-
-        it('"allowUndefined" option set to false with undefined resolve throws error', async function () {
-            const timeout = new timeoutUtils.Timeout(400)
-            const timedPromise = timeoutUtils.waitTimeout(testFunction(500), timeout, { allowUndefined: false })
-            clock.tick(300)
-            timeout.dispose() // Promise now resolves undefined
-            clock.tick(200)
-            await assert.rejects(timedPromise, new Error(timeoutUtils.timeoutUnexpectedResolve))
-        })
-
-        it('"completeTimeout" option set to false throws expired error', async function () {
-            const timeout = new timeoutUtils.Timeout(800)
-            const timedPromise = timeoutUtils.waitTimeout(testFunction(500), timeout, { completeTimeout: false })
-            clock.tick(600)
-            await timedPromise
-            clock.tick(300)
-            await assert.rejects(timeout.promisify(), new Error(timeoutUtils.timeoutExpiredMessage))
-        })
-    })
-})
diff --git a/src/test/shared/utilities/vscodeUtils.test.ts b/src/test/shared/utilities/vscodeUtils.test.ts
deleted file mode 100644
index 15380773244..00000000000
--- a/src/test/shared/utilities/vscodeUtils.test.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { VSCODE_EXTENSION_ID } from '../../../shared/extensions'
-import * as vscodeUtil from '../../../shared/utilities/vsCodeUtils'
-
-describe('vscodeUtils', async function () {
-    it('activateExtension(), isExtensionActive()', async function () {
-        assert.deepStrictEqual(await vscodeUtil.activateExtension('invalid.extension'), undefined)
-        await assert.rejects(async () => {
-            await vscodeUtil.activateExtension('invalid', false)
-        })
-
-        assert.deepStrictEqual(vscodeUtil.isExtensionActive('invalid.extension'), false)
-
-        await vscodeUtil.activateExtension(VSCODE_EXTENSION_ID.awstoolkit, false)
-        assert.deepStrictEqual(vscodeUtil.isExtensionActive(VSCODE_EXTENSION_ID.awstoolkit), true)
-    })
-})
diff --git a/src/test/shared/vscode/commands.test.ts b/src/test/shared/vscode/commands.test.ts
deleted file mode 100644
index b7d15de146a..00000000000
--- a/src/test/shared/vscode/commands.test.ts
+++ /dev/null
@@ -1,212 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-import { Commands } from '../../../shared/vscode/commands2'
-
-describe('Commands', function () {
-    let commands: Commands
-    let from: Commands['from']
-
-    beforeEach(function () {
-        commands = new Commands()
-        from = commands.from.bind(commands)
-    })
-
-    afterEach(function () {
-        commands.dispose()
-    })
-
-    describe('get', function () {
-        it('returns a command if it exists', async function () {
-            const command = await commands.get('vscode.open')
-            assert.strictEqual(command?.id, 'vscode.open')
-        })
-
-        it('returns `undefined` when the command does not exist', async function () {
-            const command = await commands.get('aws.foo')
-            assert.strictEqual(command, undefined)
-        })
-    })
-
-    describe('declare', function () {
-        function sum(a: number, b: number) {
-            return a + b
-        }
-
-        const add = (a: number) => (b: number) => sum(a, b)
-
-        it('uses the provided factory function', async function () {
-            const declared = commands.declare('add3', add)
-            const registered = declared.register(3)
-
-            assert.strictEqual(await registered.execute(4), 7)
-        })
-
-        it('throws when declaring a declared id', function () {
-            commands.declare('add', add)
-            assert.throws(() => commands.declare('add', add))
-        })
-
-        it('throws when declaring a registered id', function () {
-            commands.register('add', add(0))
-            assert.throws(() => commands.declare('add', add))
-        })
-
-        it('can be built while not registered', async function () {
-            const declared = commands.declare('add3', add)
-            const built = declared.build(7).asCommand({ title: 'Add 3 to 7' })
-            const registered = declared.register(3)
-
-            assert.strictEqual(await registered.execute(7), 10)
-            assert.deepStrictEqual(built, {
-                title: 'Add 3 to 7',
-                command: 'add3',
-                arguments: [7],
-            })
-        })
-    })
-
-    describe('register', function () {
-        function sum(a: number, b: number) {
-            return a + b
-        }
-
-        it('uses the provided id', async function () {
-            const previous = await commands.get('sum')
-            commands.register('sum', sum)
-
-            assert.strictEqual(previous, undefined)
-            assert.ok(await commands.get('sum'))
-        })
-
-        it('can execute a command', async function () {
-            const registered = commands.register('sum', sum)
-            assert.strictEqual(await registered.execute(2, 2), 4)
-        })
-
-        it('throws when registering a command multiple times', function () {
-            commands.register('sum', sum)
-            assert.throws(() => commands.register('sum', sum))
-        })
-
-        describe('Command', function () {
-            it('can build a command with a title', function () {
-                const registered = commands.register('sum', sum)
-                const built = registered.build(1, 2).asCommand({ title: 'Sum' })
-
-                assert.deepStrictEqual(built, {
-                    title: 'Sum',
-                    command: 'sum',
-                    arguments: [1, 2],
-                })
-            })
-
-            it('can build a command with a tooltip', function () {
-                const registered = commands.register('sum', sum)
-                const built = registered.build(2, 3).asCommand({ title: '2 + 3', tooltip: 'Add 2 + 3' })
-
-                assert.deepStrictEqual(built, {
-                    title: '2 + 3',
-                    command: 'sum',
-                    tooltip: 'Add 2 + 3',
-                    arguments: [2, 3],
-                })
-            })
-        })
-
-        describe('Uri', function () {
-            it('can build a command uri', function () {
-                const registered = commands.register('sum', sum)
-                const built = registered.build(2, 3).asUri()
-
-                assert.strictEqual(built.toString(true), 'command:sum?[2,3]')
-            })
-
-            it('encodes arguments appropriately', function () {
-                const registered = commands.register('pass', (input: string) => input)
-                const built = registered.build('https://github.com/aws/aws-toolkit-vscode').asUri()
-
-                assert.strictEqual(built.toString(true), 'command:pass?["https://github.com/aws/aws-toolkit-vscode"]')
-            })
-        })
-
-        describe('TreeItem', function () {
-            it('can build a tree node', function () {
-                const registered = commands.register('sum', sum)
-                const built = registered.build(5, 4).asTreeNode({ label: 'Sum' })
-                const item = built.getTreeItem()
-
-                assert.ok(item instanceof vscode.TreeItem)
-                assert.strictEqual(item.label, 'Sum')
-                assert.strictEqual(item.command?.command, 'sum')
-                assert.deepStrictEqual(item.command?.arguments, [5, 4])
-                assert.strictEqual(built.resource, registered)
-            })
-        })
-    })
-
-    describe('from', function () {
-        class Foo {
-            public bar(p: number): string {
-                return this.s.repeat(p)
-            }
-            public constructor(protected readonly s: string) {}
-        }
-
-        it('can register a declared command', function () {
-            const declared = from(Foo).declareBar('my.command')
-            declared.register(new Foo('boo'))
-        })
-
-        it('can execute a declared command', async function () {
-            const declared = from(Foo).declareBar('my.command')
-            const registered = declared.register(new Foo('moo'))
-            assert.strictEqual(await registered.execute(2), 'moomoo')
-        })
-
-        it('works with inheritance (no override)', async function () {
-            class Foo2 extends Foo {
-                public bar2(): number {
-                    return this.s.length
-                }
-            }
-
-            const bar1 = from(Foo2).declareBar('my.command1')
-            const bar2 = from(Foo2).declareBar2('my.command2')
-
-            const instance = new Foo2('zero')
-            assert.strictEqual(await bar1.register(instance).execute(2), 'zerozero')
-            assert.strictEqual(await bar2.register(instance).execute(), 4)
-        })
-
-        it('works with inheritance (override)', async function () {
-            class Foo2 extends Foo {
-                public override bar(p: number): string {
-                    return this.s.toUpperCase().repeat(p)
-                }
-            }
-
-            // The current implementation operates more like "traditional" inheritance
-            // in that method bindings are static. Declaring a command from a class
-            // results in that exact implementation being executed, not whatever
-            // implementation exists at runtime. Dispatch at runtime would flip the results
-            // of these these two cases, making the first lowercase and the other uppercase.
-            //
-            // While runtime dispatch is nice for ad-hoc behavioral changes, it can also
-            // make things harder to reason about. Commands are not really meant to be
-            // dynamic, so any kind of differing behavior should rely on composition or
-            // parametric polymorphism rather than classical polymorphism.
-            const declared1 = from(Foo2).declareBar('my.command')
-            const command1 = declared1.register(new Foo('one'))
-            assert.strictEqual(await command1.execute(2), 'ONEONE')
-
-            const declared2 = from(Foo).declareBar('my.command2')
-            const command2 = declared2.register(new Foo2('one'))
-            assert.strictEqual(await command2.execute(3), 'oneoneone')
-        })
-    })
-})
diff --git a/src/test/shared/vscode/fakeCommands.ts b/src/test/shared/vscode/fakeCommands.ts
deleted file mode 100644
index 992db4650c0..00000000000
--- a/src/test/shared/vscode/fakeCommands.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Commands } from '../../../shared/vscode/commands'
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface FakeCommandsOptions {}
-
-export class FakeCommands implements Commands {
-    private _command: string | undefined
-    private _args: any[] | undefined
-
-    /**
-     * The command that was executed, in any.
-     */
-    public get command(): string | undefined {
-        return this._command
-    }
-
-    /**
-     * The arguments to the command that was executed, if any.
-     */
-    public get args(): any[] | undefined {
-        return this._args
-    }
-
-    public constructor(_items: FakeCommandsOptions = {}) {}
-
-    /**
-     * Records the command that was executed, along with its arguments.
-     *
-     * @returns an empty Promise.
-     */
-    public async execute<T>(command: string, ...rest: any[]): Promise<T | undefined> {
-        this._command = command
-        this._args = rest
-
-        return undefined
-    }
-}
diff --git a/src/test/shared/vscode/fakeEnv.ts b/src/test/shared/vscode/fakeEnv.ts
deleted file mode 100644
index 48c1ee39d00..00000000000
--- a/src/test/shared/vscode/fakeEnv.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Env, Clipboard } from '../../../shared/vscode/env'
-
-export interface FakeEnvOptions {
-    clipboard?: ClipboardOptions
-}
-
-export class FakeEnv implements Env {
-    private readonly _clipboard: DefaultFakeClipboard
-
-    public get clipboard(): FakeClipboard {
-        return this._clipboard
-    }
-
-    public constructor({ clipboard }: FakeEnvOptions = {}) {
-        this._clipboard = new DefaultFakeClipboard(clipboard)
-    }
-}
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface ClipboardOptions {}
-
-export interface FakeClipboard extends Clipboard {
-    /**
-     * The text that was written, if any.
-     */
-    readonly text: string | undefined
-}
-
-class DefaultFakeClipboard implements FakeClipboard {
-    public text: string | undefined
-
-    /**
-     * Records the text that was written.
-     *
-     * @returns an empty Promise.
-     */
-    public async writeText(text: string): Promise<void> {
-        this.text = text
-    }
-
-    public constructor(_options: ClipboardOptions = {}) {}
-}
diff --git a/src/test/shared/vscode/fakeWindow.ts b/src/test/shared/vscode/fakeWindow.ts
deleted file mode 100644
index 1581173b0b7..00000000000
--- a/src/test/shared/vscode/fakeWindow.ts
+++ /dev/null
@@ -1,389 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as _ from 'lodash'
-import { Window } from '../../../shared/vscode/window'
-import { inspect } from 'util'
-
-export interface FakeWindowOptions {
-    statusBar?: StatusBarOptions
-    inputBox?: InputBoxOptions
-    message?: MessageOptions
-    progress?: ProgressOptions
-    dialog?: DialogOptions
-}
-
-export class FakeWindow implements Window {
-    private readonly _statusBar: DefaultFakeStatusBar
-    private readonly _inputBox: DefaultFakeInputBox
-    private readonly _message: DefaultFakeMessage
-    private readonly _progress: DefaultFakeProgress
-    private readonly _dialog: DefaultFakeDialog
-
-    public get statusBar(): FakeStatusBar {
-        return this._statusBar
-    }
-
-    public get inputBox(): FakeInputBox {
-        return this._inputBox
-    }
-
-    public get message(): FakeMessage {
-        return this._message
-    }
-
-    public get progress(): FakeProgress {
-        return this._progress
-    }
-
-    public get dialog(): FakeDialog {
-        return this._dialog
-    }
-
-    public setStatusBarMessage(message: string, hideAfterTimeout: number): vscode.Disposable {
-        return this._statusBar.setMessage(message)
-    }
-
-    public showInputBox(
-        options?: vscode.InputBoxOptions,
-        token?: vscode.CancellationToken
-    ): Thenable<string | undefined> {
-        return this._inputBox.show(options)
-    }
-
-    public showInformationMessage(message: string, ...args: any[]): Thenable<any | undefined> {
-        return this._message.showInformation(message, ...args)
-    }
-
-    public showWarningMessage(message: string, ...args: any[]): Thenable<any | undefined> {
-        return this._message.showWarning(message, ...args)
-    }
-
-    public showErrorMessage(message: string, ...args: any[]): Thenable<any | undefined> {
-        return this._message.showError(message, ...args)
-    }
-
-    public withProgress<R>(
-        options: vscode.ProgressOptions,
-        task: (
-            progress: vscode.Progress<{ message?: string; increment?: number }>,
-            token: vscode.CancellationToken
-        ) => Thenable<R>
-    ): Thenable<R> {
-        return this._progress.show(options, task)
-    }
-
-    public showOpenDialog(options: vscode.OpenDialogOptions): Thenable<vscode.Uri[] | undefined> {
-        return this._dialog.showOpen(options)
-    }
-
-    public showSaveDialog(options: vscode.SaveDialogOptions): Thenable<vscode.Uri | undefined> {
-        return this._dialog.showSave(options)
-    }
-
-    public constructor({ statusBar, inputBox, message, progress, dialog }: FakeWindowOptions = {}) {
-        this._statusBar = new DefaultFakeStatusBar(statusBar)
-        this._inputBox = new DefaultFakeInputBox(inputBox)
-        this._message = new DefaultFakeMessage(message)
-        this._progress = new DefaultFakeProgress(progress)
-        this._dialog = new DefaultFakeDialog(dialog)
-    }
-}
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface StatusBarOptions {}
-
-export interface FakeStatusBar {
-    /**
-     * The message that was set, if any.
-     */
-    readonly message: string | undefined
-}
-
-class DefaultFakeStatusBar implements FakeStatusBar {
-    public message: string | undefined
-
-    /**
-     * Records the message that was set.
-     *
-     * @returns a no-op Disposable
-     */
-    public setMessage(message: string): vscode.Disposable {
-        this.message = message
-        return new vscode.Disposable(() => undefined)
-    }
-
-    public constructor(_options: StatusBarOptions = {}) {}
-}
-
-export interface InputBoxOptions {
-    /**
-     * The input to respond with, if any.
-     */
-    input?: string | undefined
-}
-
-export interface FakeInputBox {
-    /**
-     * The options shown, if any.
-     */
-    readonly options: vscode.InputBoxOptions | undefined
-
-    /**
-     * The message returned from the validateInput function, if any.
-     */
-    readonly errorMessage: string | undefined
-}
-
-class DefaultFakeInputBox implements FakeInputBox {
-    private readonly input: string | undefined
-
-    public errorMessage: string | undefined
-    public options: vscode.InputBoxOptions | undefined
-
-    /**
-     * Passes the {@link input} to the {@link vscode.InputBoxOptions.validateInput} and records the {@link errorMessage}, if any.
-     * If validation fails, acts as though the user cancelled after the failure (by returning an empty Promise).
-     *
-     * @returns a Promise of the {@link input} if validation succeeds or no validation was set,
-     * otherwise returns an empty Promise.
-     */
-    public async show(options?: vscode.InputBoxOptions): Promise<string | undefined> {
-        this.options = options
-        if (this.input !== undefined && options?.validateInput) {
-            this.errorMessage = (await options.validateInput(this.input)) ?? undefined
-
-            if (this.errorMessage) {
-                return Promise.resolve(undefined)
-            }
-        }
-
-        return Promise.resolve(this.input)
-    }
-
-    public constructor({ input }: InputBoxOptions = {}) {
-        this.input = input
-    }
-}
-
-export interface MessageOptions {
-    /**
-     * The information message selection to choose, if any.
-     */
-    informationSelection?: string | undefined
-
-    /**
-     * The warning message selection to choose, if any.
-     */
-    warningSelection?: string | undefined
-
-    /**
-     * The error message selection to choose, if any.
-     */
-    errorSelection?: string | undefined
-}
-
-export interface FakeMessage {
-    /**
-     * The information message that was shown, if any.
-     */
-    readonly information: string | undefined
-
-    /**
-     * The warning message that was shown, if any.
-     */
-    readonly warning: string | undefined
-
-    /**
-     * The error message that was shown, if any.
-     */
-    readonly error: string | undefined
-}
-
-class DefaultFakeMessage implements FakeMessage {
-    private readonly informationSelection: string | undefined
-    private readonly warningSelection: string | undefined
-    private readonly errorSelection: string | undefined
-
-    public information: string | undefined
-    public warning: string | undefined
-    public error: string | undefined
-
-    /**
-     * Records the information message that was shown and selects the given informationSelection, if any.
-     *
-     * @returns the selected item, or undefined if no selection is made.
-     */
-    public async showInformation(message: string, ...rest: any[]): Promise<any | undefined> {
-        this.information = message
-        return DefaultFakeMessage.extractSelectedItem(this.informationSelection, rest)
-    }
-
-    /**
-     * Records the warning message that was shown and selects the given warningSelection if any.
-     *
-     * @returns the selected item, or undefined if no selection is made.
-     */
-    public async showWarning(message: string, ...rest: any[]): Promise<any | undefined> {
-        this.warning = message
-        return DefaultFakeMessage.extractSelectedItem(this.warningSelection, rest)
-    }
-
-    /**
-     * Records the error message that was shown and selects the given errorSelection, if any.
-     *
-     * @returns the selected item, or undefined if no selection is made.
-     */
-    public async showError(message: string, ...rest: any[]): Promise<any | undefined> {
-        this.error = message
-        return DefaultFakeMessage.extractSelectedItem(this.errorSelection, rest)
-    }
-
-    public constructor({ informationSelection, warningSelection, errorSelection }: MessageOptions = {}) {
-        this.informationSelection = informationSelection
-        this.warningSelection = warningSelection
-        this.errorSelection = errorSelection
-    }
-
-    private static extractSelectedItem(
-        selection: string | undefined,
-        args: any[]
-    ): string | vscode.MessageItem | undefined {
-        const items = this.getItems(args)
-        if (!items || !selection) {
-            return undefined
-        }
-
-        const selectedItem = items.find(item => this.getTitle(item) === selection)
-        if (!selectedItem) {
-            throw new Error(`Cannot select '${selection}' from the shown items: ${inspect(items)}`)
-        }
-        return selectedItem
-    }
-
-    private static getItems(args: any[]): (string | vscode.MessageItem)[] | undefined {
-        const items: (string | vscode.MessageItem)[] = _(args)
-            .takeRightWhile(item => _(item).isString() || DefaultFakeMessage.isMessageItem(item))
-            .value()
-
-        return _(items).isEmpty() ? undefined : items
-    }
-
-    private static getTitle(item: string | vscode.MessageItem): string {
-        return _.isString(item) ? item : item.title
-    }
-
-    private static isMessageItem(item: any): item is vscode.MessageItem {
-        return item && item.title
-    }
-}
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface ProgressOptions {}
-
-export interface FakeProgress {
-    /**
-     * The progress that was reported, if any.
-     */
-    readonly reported: { message?: string; increment?: number }[]
-
-    /**
-     * The options that were shown, if any.
-     */
-    readonly options: vscode.ProgressOptions | undefined
-}
-
-class DefaultFakeProgress implements FakeProgress {
-    public reported: { message?: string; increment?: number }[] = []
-    public options: vscode.ProgressOptions | undefined
-
-    /**
-     * Records the options and progress that were reported, if any.
-     *
-     * @returns the output of the task.
-     */
-    public async show<R>(
-        options: vscode.ProgressOptions,
-        task: (
-            progress: vscode.Progress<{ message?: string; increment?: number }>,
-            token: vscode.CancellationToken
-        ) => Thenable<R>
-    ): Promise<R> {
-        this.options = options
-
-        const reporter: vscode.Progress<{ message?: string; increment?: number }> = {
-            report: item => {
-                this.reported.push(item)
-            },
-        }
-
-        const token: vscode.CancellationToken = {
-            isCancellationRequested: false,
-            onCancellationRequested: new vscode.EventEmitter().event,
-        }
-
-        return task(reporter, token)
-    }
-
-    public constructor(_options: ProgressOptions = {}) {}
-}
-
-export interface DialogOptions {
-    /**
-     * The file to select in the open dialog, if any.
-     */
-    openSelections?: vscode.Uri[] | undefined
-
-    /**
-     * The file to select in the save dialog, if any.
-     */
-    saveSelection?: vscode.Uri | undefined
-}
-
-export interface FakeDialog {
-    /**
-     * The open options that were shown, if any.
-     */
-    readonly openOptions: vscode.OpenDialogOptions | undefined
-
-    /**
-     * The save options that were shown, if any.
-     */
-    readonly saveOptions: vscode.SaveDialogOptions | undefined
-}
-
-class DefaultFakeDialog implements FakeDialog {
-    private readonly openSelections: vscode.Uri[] | undefined
-    private readonly saveSelection: vscode.Uri | undefined
-
-    public openOptions: vscode.OpenDialogOptions | undefined
-    public saveOptions: vscode.SaveDialogOptions | undefined
-
-    /**
-     * Selects the file(s) specified in the {@link openSelections}, if any.
-     *
-     * @returns a Promise of the {@link openSelections}.
-     */
-    public async showOpen(options: vscode.OpenDialogOptions): Promise<vscode.Uri[] | undefined> {
-        this.openOptions = options
-        return Promise.resolve(this.openSelections)
-    }
-
-    /**
-     * Selects the file specified in the {@link saveSelection}, if any.
-     *
-     * @returns a Promise of the {@link saveSelection}.
-     */
-    public async showSave(options: vscode.SaveDialogOptions): Promise<vscode.Uri | undefined> {
-        this.saveOptions = options
-        return Promise.resolve(this.saveSelection)
-    }
-
-    public constructor({ openSelections, saveSelection }: DialogOptions = {}) {
-        this.openSelections = openSelections
-        this.saveSelection = saveSelection
-    }
-}
diff --git a/src/test/shared/vscode/fakeWorkspace.ts b/src/test/shared/vscode/fakeWorkspace.ts
deleted file mode 100644
index 84647418684..00000000000
--- a/src/test/shared/vscode/fakeWorkspace.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { Workspace, WorkspaceConfiguration } from '../../../shared/vscode/workspace'
-
-export interface FakeWorkspaceOptions {
-    section?: string
-    configuration?: ConfigurationOptions
-}
-
-export class FakeWorkspace implements Workspace {
-    private readonly _section: string | undefined
-    private readonly _configuration: DefaultFakeConfiguration
-
-    public get configuration(): FakeConfiguration {
-        return this._configuration
-    }
-
-    public getConfiguration(section?: string, resource?: vscode.Uri | null): WorkspaceConfiguration {
-        if (section === this._section) {
-            return this._configuration
-        }
-
-        return new DefaultFakeConfiguration()
-    }
-
-    public constructor({ section, configuration }: FakeWorkspaceOptions = {}) {
-        this._section = section
-        this._configuration = new DefaultFakeConfiguration(configuration)
-    }
-}
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface ConfigurationOptions {
-    /**
-     * The configuration key to
-     */
-    key?: string
-
-    /**
-     * The configuration value to respond with, if any.
-     */
-    value?: any
-}
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface FakeConfiguration {}
-
-class DefaultFakeConfiguration implements WorkspaceConfiguration, FakeConfiguration {
-    private readonly map: Map<string, any> = new Map<string, any>()
-
-    /**
-     * @returns the {@link value}.
-     */
-    public get<T>(key: string): T | undefined {
-        if (this.map.has(key)) {
-            return this.map.get(key) as T | undefined
-        }
-
-        return undefined
-    }
-
-    public async update(key: string, value: any): Promise<void> {
-        this.map.set(key, value)
-    }
-
-    public constructor({ key, value }: ConfigurationOptions = {}) {
-        if (key) {
-            this.map.set(key, value)
-        }
-    }
-}
diff --git a/src/test/shared/vscode/message.ts b/src/test/shared/vscode/message.ts
deleted file mode 100644
index ecab20d2dee..00000000000
--- a/src/test/shared/vscode/message.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import * as assert from 'assert'
-
-// this is roughly how VS Code models things internally
-export enum SeverityLevel {
-    Information,
-    Warning,
-    Error,
-}
-
-interface MessageOptions<T extends vscode.MessageItem> extends vscode.MessageOptions {
-    readonly severity?: SeverityLevel
-    readonly items?: T[]
-}
-
-type Window = typeof vscode.window
-type ShowMessage = Window['showInformationMessage'] | Window['showWarningMessage'] | Window['showErrorMessage']
-export type ShownMessage = Omit<TestMessage, 'show'> & { items: ReturnType<TestMessage['show']> }
-
-/**
- * In-memory model of vscode's message/notification UI element
- */
-export class TestMessage<T extends vscode.MessageItem = vscode.MessageItem> {
-    public readonly modal: boolean
-    public readonly severity: SeverityLevel
-    public readonly onDidSelectItem: vscode.Event<T | undefined>
-    private _showing: boolean = false
-    private _disposed: boolean = false
-    private _selected: T | undefined
-    private _onDidSelectItem = new vscode.EventEmitter<T | undefined>()
-
-    public constructor(public readonly message: string, private readonly options?: MessageOptions<T>) {
-        this.modal = !!options?.modal
-        this.severity = options?.severity ?? SeverityLevel.Information
-        this.onDidSelectItem = this._onDidSelectItem.event
-    }
-
-    public get visible() {
-        return this._showing
-    }
-
-    public assertMessage(expected: string): void {
-        assert.strictEqual(this.message, expected)
-    }
-
-    public assertSeverity(expected: SeverityLevel): void {
-        assert.strictEqual(this.severity, expected)
-    }
-
-    public assertSelected(expected: T): void {
-        assert.deepStrictEqual(this._selected, expected)
-    }
-
-    public assertShowing(): void {
-        assert.ok(this._showing)
-    }
-
-    public assertNotShowing(): void {
-        assert.ok(!this._showing)
-    }
-
-    public dispose(): void {
-        this._disposed = true
-        this._showing = false
-    }
-
-    public close(): void {
-        const selected = this.options?.items?.find(item => item.isCloseAffordance)
-
-        if (selected) {
-            this.selectItem(selected)
-        } else {
-            this.dispose()
-            this._onDidSelectItem.fire(undefined)
-        }
-    }
-
-    public selectItem(item: string | RegExp | T): void {
-        if (this._disposed) {
-            throw new Error('Attempted to select from a disposed message')
-        }
-
-        const selected =
-            typeof item === 'string' || item instanceof RegExp
-                ? this.options?.items?.find(i => i.title.match(item))
-                : this.options?.items?.find(i => i === item)
-
-        if (!selected) {
-            throw new Error(`Could not find the specified item: ${item}`)
-        }
-
-        this.dispose()
-        this._selected = selected
-        this._onDidSelectItem.fire(this._selected)
-    }
-
-    public show(): (T & { select(): void })[] {
-        this._showing = true
-
-        return (this.options?.items ?? []).map(item => {
-            return {
-                ...item,
-                select: () => this.selectItem(item),
-            }
-        })
-    }
-
-    public static isMessageItem(obj: any): obj is vscode.MessageItem {
-        return typeof obj?.title === 'string'
-    }
-
-    /**
-     * Creates a new function to show a test message based off severity.
-     *
-     * Optionally takes a callback to notifiy when the message is shown.
-     *
-     * @param severity
-     * @param callback
-     */
-    public static create(severity: SeverityLevel, callback?: (message: ShownMessage) => void): ShowMessage {
-        return async <T extends vscode.MessageItem>(
-            message: string,
-            ...rest: [string | T | vscode.MessageOptions, ...(string | T)[]]
-        ) => {
-            const firstRest = rest[0]
-            const stringMode = typeof firstRest === 'string'
-            const opt = !stringMode && !TestMessage.isMessageItem(firstRest) ? firstRest : {}
-            const items = (stringMode ? rest : rest.slice(1)) as (string | T)[]
-            const mappedItems = items.map(i => (typeof i === 'string' ? { title: i } : i))
-            const testMessage = new TestMessage(message, {
-                severity,
-                modal: opt.modal,
-                items: mappedItems,
-            })
-
-            return new Promise<vscode.MessageItem | T | string | undefined>(resolve => {
-                const d = testMessage.onDidSelectItem(i => (resolve(stringMode ? i?.title : i), d.dispose()))
-                const shownItems = testMessage.show()
-                callback?.(Object.assign(testMessage, { items: shownItems }))
-            })
-        }
-    }
-}
diff --git a/src/test/shared/vscode/runCommand.test.ts b/src/test/shared/vscode/runCommand.test.ts
deleted file mode 100644
index 5a3338b773f..00000000000
--- a/src/test/shared/vscode/runCommand.test.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-/*!
- * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import globals from '../../../shared/extensionGlobals'
-
-import * as sinon from 'sinon'
-import * as vscode from 'vscode'
-import * as env from '../../../shared/vscode/env'
-import * as assert from 'assert'
-import { ToolkitError } from '../../../shared/errors'
-import { CancellationError } from '../../../shared/utilities/timeoutUtils'
-import { Commands } from '../../../shared/vscode/commands2'
-import { assertTelemetry } from '../../testUtil'
-import { createTestWindow } from './window'
-
-async function throwMe(error?: unknown): Promise<void | never> {
-    if (error) {
-        throw error
-    }
-}
-
-const testCommand = Commands.register('_test.throwable', throwMe)
-
-describe('runCommand', function () {
-    afterEach(function () {
-        sinon.restore()
-    })
-
-    it('emits a telemetry metric after the command terminates (success)', async function () {
-        await testCommand.execute()
-
-        assertTelemetry('vscode_executeCommand', {
-            passive: true,
-            debounceCount: 0,
-            command: testCommand.id,
-            result: 'Succeeded',
-        })
-    })
-
-    it('emits a telemetry metric after the command terminates (cancel)', async function () {
-        await testCommand.execute(new CancellationError('user'))
-
-        assertTelemetry('vscode_executeCommand', {
-            passive: true,
-            debounceCount: 0,
-            command: testCommand.id,
-            result: 'Cancelled',
-            reason: 'user',
-        })
-    })
-
-    it('emits a telemetry metric after the command terminates (failure)', async function () {
-        const testWindow = createTestWindow()
-        sinon.replace(vscode, 'window', testWindow)
-
-        const viewLogsDialog = testWindow.waitForMessage(/Something failed/)
-
-        await Promise.all([
-            viewLogsDialog.then(dialog => dialog.close()),
-            testCommand.execute(new ToolkitError('Something failed', { code: 'SomethingFailed' })),
-        ])
-
-        assertTelemetry('vscode_executeCommand', {
-            passive: true,
-            debounceCount: 0,
-            command: testCommand.id,
-            result: 'Failed',
-            reason: 'SomethingFailed',
-        })
-    })
-
-    describe('telemetry throttling', function () {
-        before(function () {
-            sinon.stub(env, 'isAutomation').returns(false)
-        })
-
-        after(function () {
-            sinon.restore()
-        })
-
-        it('collapses events that occur within a brief period of time', async function () {
-            const comand = Commands.register('_test.telemetry', () => {})
-            await comand.execute()
-            await comand.execute()
-            await comand.execute()
-
-            const events = globals.telemetry.logger
-                .query({ metricName: 'vscode_executeCommand' })
-                .filter(event => event.command === comand.id)
-
-            assert.strictEqual(events.length, 1)
-        })
-
-        it('does not collapse events marked with a telemetry name', async function () {
-            const comand = Commands.register({ id: '_test.telemetryName', telemetryName: 'aws_help' }, () => {})
-            await comand.execute()
-            await comand.execute()
-            await comand.execute()
-
-            const events = globals.telemetry.logger.query({ metricName: 'aws_help' })
-            assert.strictEqual(events.length, 3)
-        })
-    })
-})
diff --git a/src/test/shared/vscode/testUtils.ts b/src/test/shared/vscode/testUtils.ts
deleted file mode 100644
index 29e1bf7c88c..00000000000
--- a/src/test/shared/vscode/testUtils.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { toTitleCase } from '../../../shared/utilities/textUtilities'
-import { Command, Commands } from '../../../shared/vscode/commands2'
-
-type EventEmitters<T> = {
-    [P in keyof T]: T[P] extends vscode.Event<any> ? P & string : never
-}[keyof T]
-
-type InterceptEmitters<T, K extends keyof T> = {
-    [P in K as `fire${Capitalize<P & string>}`]: T[P] extends vscode.Event<infer R>
-        ? vscode.EventEmitter<R>['fire']
-        : never
-} & T // prettier really wants to keep this T separate
-type FilteredKeys<T> = { [P in keyof T]: T[P] extends never ? never : P }[keyof T]
-type NoNever<T> = Pick<T, FilteredKeys<T>>
-
-/**
- * Adds references to event emitters for all known public events as specified by the generic K type.
- * New methods are shown with 'fire' prepended to the capitalized event name.
- */
-export type ExposeEmitters<T, K extends EventEmitters<T>> = NoNever<InterceptEmitters<T, K>>
-
-/**
- * Exposes private event emitters of the object. This should exclusively be used for testing purposes since there
- * is no guarantee that the emitters are named 1:1 with their public counterparts. The majority of UI events in
- * VS code are triggered from user interaction, so firing these programmatically should be safe. It is highly
- * recommended to limit the amount of accumulated state when firing these events.
- *
- * @params obj Target object
- * @params keys Events to expose emitters for
- * @returns The extended object with {@link ExposeEmitters exposed methods}
- * @throws Throws an error listing any events that did not have matching emitters
- */
-export function exposeEmitters<T extends Record<string, any>, K extends EventEmitters<T>>(
-    obj: T,
-    keys: K[]
-): ExposeEmitters<T, K> {
-    Object.entries(obj).forEach(([key, value]) => {
-        if (key.startsWith('_onDid') && value instanceof vscode.EventEmitter) {
-            const targetEvent = key.slice(1).replace('Emitter', '')
-            keys = keys.filter(k => k !== targetEvent)
-            Object.assign(obj, { [`fire${toTitleCase(targetEvent)}`]: value.fire.bind(value) })
-        }
-    })
-
-    // Patch in emitters if they weren't found
-    // The patched `fire___` method won't work on listeners
-    // subscribed prior to `exposeEmitters` being called
-    for (const key of keys) {
-        const event = obj[key] as vscode.Event<any>
-        const emitter = new vscode.EventEmitter<T[K]>()
-        event(v => emitter.fire(v))
-
-        Object.assign(obj, {
-            [key]: emitter.event,
-            [`fire${toTitleCase(key)}`]: emitter.fire.bind(emitter),
-        })
-    }
-
-    return obj as any
-}
-
-/**
- * Creates a copy of the target command, injecting dependencies and registering it with a new id.
- *
- * ### Example
- * ```ts
- * const foo = Commands.declare('aws.foo', (memento: vscode.Memento) => () => memento.get<string>('foo'))
- * const testMemento = new FakeMemento()
- * const testFoo = testCommand(foo, testMemento)
- *
- * // Test commands are always prefixed with 'test.'
- * assert.strictEqual(testFoo.id, 'test.aws.foo')
- *
- * await testMemento.update('foo', 'bar')
- * assert.strictEqual(await testFoo.execute(), 'bar')
- *
- * // Clean-up the command afterwards
- * testFoo.dispose()
- * ```
- */
-export function testCommand<T extends (...args: any[]) => unknown, U extends any[]>(
-    command: ReturnType<typeof Commands.declare<T, U>>,
-    ...args: U
-): Command<T> & vscode.Disposable {
-    const testCommands = new Commands()
-    const testId = `test.${command.id}`
-    // `command` refers to the hidden 'CommandResource' class in 'commands2.ts'
-    const resource = (command as any).resource as { id: string; factory: (...args: U) => any; info: any }
-
-    return testCommands.register({ ...resource.info, id: testId }, resource.factory(...args))
-}
diff --git a/src/test/shared/vscode/uriHandler.test.ts b/src/test/shared/vscode/uriHandler.test.ts
deleted file mode 100644
index 8cd2b397140..00000000000
--- a/src/test/shared/vscode/uriHandler.test.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as vscode from 'vscode'
-import { SearchParams, UriHandler } from '../../../shared/vscode/uriHandler'
-
-describe('UriHandler', function () {
-    const testPath = '/my/path'
-    let uriHandler: UriHandler
-
-    function makeUri(query?: string): vscode.Uri {
-        return vscode.Uri.parse(`scheme://authority${testPath}${query !== undefined ? `?${query}` : ''}`)
-    }
-
-    beforeEach(function () {
-        uriHandler = new UriHandler()
-    })
-
-    it('can register a handler', async function () {
-        uriHandler.registerHandler(testPath, q => assert.strictEqual(q.get('key'), 'value'))
-        return uriHandler.handleUri(makeUri('key=value'))
-    })
-
-    it('uses parser if available', async function () {
-        uriHandler.registerHandler(
-            testPath,
-            q => assert.strictEqual(q.myNumber, 123),
-            (q: SearchParams) => ({ myNumber: Number(q.get('myString')) })
-        )
-        return uriHandler.handleUri(makeUri('myString=123'))
-    })
-
-    it('can handle lists', async function () {
-        uriHandler.registerHandler(testPath, q => assert.deepStrictEqual(q.get('list'), ['1', '2', '3']))
-        return uriHandler.handleUri(makeUri('list=1&list=2&list=3'))
-    })
-
-    it('can dispose handlers', async function () {
-        return new Promise((resolve, reject) => {
-            uriHandler.registerHandler(testPath, () => reject(new Error('this should not be called'))).dispose()
-            uriHandler.handleUri(makeUri()).then(resolve)
-        })
-    })
-
-    it('throws when registering handler for same path', function () {
-        uriHandler.registerHandler(testPath, () => {})
-        assert.throws(() => uriHandler.registerHandler(testPath, () => {}))
-    })
-
-    it('catches errors thrown by the parser', function (done) {
-        const handler = () => done(new Error('this should not be called'))
-        const parser = () => {
-            throw new Error()
-        }
-
-        uriHandler.registerHandler(testPath, handler, parser)
-        assert.doesNotReject(uriHandler.handleUri(makeUri('key=value'))).then(done, done)
-    })
-
-    it('catches errors thrown by the handler', async function () {
-        const handler = () => {
-            throw new Error()
-        }
-
-        uriHandler.registerHandler(testPath, handler)
-        return assert.doesNotReject(uriHandler.handleUri(makeUri()))
-    })
-})
-
-describe('SearchParams', function () {
-    const params = new SearchParams({ foo: 'bar', baz: 'qaz', number: '1' })
-
-    it('can map params', function () {
-        assert.strictEqual(params.getAs('number', Number), 1)
-    })
-
-    it('can convert keys to an object', function () {
-        assert.deepStrictEqual(params.getFromKeys('foo', 'baz', 'xyz'), { foo: 'bar', baz: 'qaz', xyz: undefined })
-    })
-
-    it('can throw if the parameter does not exist', function () {
-        assert.throws(() => params.getOrThrow('foob', ''))
-        assert.throws(() => params.getOrThrow('foob', new Error()))
-    })
-})
diff --git a/src/test/shared/vscode/window.ts b/src/test/shared/vscode/window.ts
deleted file mode 100644
index ba39d4184f1..00000000000
--- a/src/test/shared/vscode/window.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { SeverityLevel, ShownMessage, TestMessage } from './message'
-
-type Window = typeof vscode.window
-
-export interface TestWindow {
-    onDidShowMessage: vscode.Event<ShownMessage>
-    waitForMessage(expected: string | RegExp, timeout?: number): Promise<ShownMessage>
-}
-
-/**
- * A test window proxies {@link vscode.window}, intercepting calls whilst
- * allowing for introspection and mocking as-needed.
- */
-export function createTestWindow(): Window & TestWindow {
-    // TODO: write mix-in Proxy factory function
-    const onDidShowMessageEmitter = new vscode.EventEmitter<ShownMessage>()
-    const shownMessages: ShownMessage[] = []
-
-    function fireOnDidShowMessage(message: ShownMessage) {
-        shownMessages.push(message)
-        onDidShowMessageEmitter.fire(message)
-    }
-
-    return new Proxy(vscode.window, {
-        get: (target, prop, recv) => {
-            if (prop === 'onDidShowMessage') {
-                return onDidShowMessageEmitter.event
-            }
-            if (prop === 'waitForMessage') {
-                return (expected: string | RegExp, timeout: number = 5000) => {
-                    return new Promise<ShownMessage>((resolve, reject) => {
-                        const alreadyShown = shownMessages.find(m => m.visible && m.message.match(expected))
-                        if (alreadyShown) {
-                            return resolve(alreadyShown)
-                        }
-
-                        const d = onDidShowMessageEmitter.event(shownMessage => {
-                            if (shownMessage.message.match(expected)) {
-                                d.dispose()
-                                resolve(shownMessage)
-                            }
-                        })
-                        setTimeout(() => {
-                            d.dispose()
-                            reject(new Error(`Timed out waiting for message: ${expected}`))
-                        }, timeout)
-                    })
-                }
-            }
-            if (prop === 'showInformationMessage') {
-                return TestMessage.create(SeverityLevel.Information, fireOnDidShowMessage)
-            }
-            if (prop === 'showWarningMessage') {
-                return TestMessage.create(SeverityLevel.Warning, fireOnDidShowMessage)
-            }
-            if (prop === 'showErrorMessage') {
-                return TestMessage.create(SeverityLevel.Error, fireOnDidShowMessage)
-            }
-            return Reflect.get(target, prop, recv)
-        },
-    }) as any
-}
diff --git a/src/test/shared/wizards/wizard.test.ts b/src/test/shared/wizards/wizard.test.ts
deleted file mode 100644
index 934aa3d4b56..00000000000
--- a/src/test/shared/wizards/wizard.test.ts
+++ /dev/null
@@ -1,370 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { Prompter, PromptResult } from '../../../shared/ui/prompter'
-import {
-    isWizardControl,
-    StateWithCache,
-    StepEstimator,
-    Wizard,
-    WizardState,
-    WIZARD_BACK,
-    WIZARD_EXIT,
-} from '../../../shared/wizards/wizard'
-
-interface TestWizardForm {
-    prop1: string
-    prop2?: number
-    prop3: string
-    prop4: string
-    nestedProp: {
-        prop1: string
-        prop2?: boolean
-    }
-}
-
-interface AssertStepMethods {
-    /** Order is 1-indexed, e.g. onCall(1) === onFirstCall() */
-    onCall(...order: number[]): void
-    onFirstCall(): void
-    onSecondCall(): void
-    onThirdCall(): void
-    onFourthCall(): void
-    onEveryCall(): void
-}
-
-type StepTuple = [current: number, total: number]
-type StateResponse<T, S> = (state: StateWithCache<S, T>) => PromptResult<T>
-type TestResponse<T, S> = PromptResult<T> | StateResponse<T, S>
-
-function makeGreen(s: string): string {
-    return `\u001b[32m${s}\u001b[0m`
-}
-
-function makeExpectedError(message: string, actual: any, expected: any): string {
-    return `${message}\n\tActual: ${actual}\n\t${makeGreen(`Expected: ${expected}`)}`
-}
-
-// TODO: rewrite this prompter to be a 'provider' type
-
-/**
- * Note: This class should be used within this test file. Use 'FormTester' instead for testing wizard implementations since
- * it can test behavior irrespective of prompter ordering.
- *
- * Test prompters are instantiated with a finite set of responses. Responses can be raw data or functions applied to the
- * current state of the wizard. A developer-friendly name can be added using 'setName'.
- */
-class TestPrompter<T, S = any> extends Prompter<T> {
-    private readonly responses: TestResponse<T, S>[]
-    private readonly acceptedStates: StateWithCache<S, T>[] = []
-    private readonly acceptedSteps: [current: number, total: number][] = []
-    private readonly acceptedEstimators: StepEstimator<T>[] = []
-    private _totalSteps: number = 1
-    private _lastResponse: PromptResult<T>
-    private promptCount: number = 0
-    private name: string = 'Test Prompter'
-
-    public get recentItem(): PromptResult<T> {
-        return this._lastResponse
-    }
-    public set recentItem(response: PromptResult<T>) {
-        if (response !== this._lastResponse) {
-            this.fail(
-                makeExpectedError('Received unexpected cached response from wizard', response, this._lastResponse)
-            )
-        }
-    }
-
-    public override get totalSteps(): number {
-        return this._totalSteps
-    }
-
-    constructor(...responses: TestResponse<T, S>[]) {
-        super()
-        this.responses = responses
-    }
-
-    public override async prompt(): Promise<PromptResult<T>> {
-        if (this.responses.length === this.promptCount) {
-            this.fail('Ran out of responses')
-        }
-        const resp = this.convertFunctionResponse(this.promptCount++)
-        this._lastResponse = !isWizardControl(resp) ? resp : this._lastResponse
-
-        return resp
-    }
-
-    protected promptUser(): Promise<PromptResult<T>> {
-        throw new Error('Do not call this')
-    }
-
-    public setSteps(current: number, total: number): void {
-        this.acceptedSteps.push([current, total])
-    }
-
-    public setStepEstimator(estimator: StepEstimator<T>): void {
-        this.acceptedEstimators.push(estimator)
-    }
-
-    //----------------------------Test helper methods go below this line----------------------------//
-
-    public acceptState(state: StateWithCache<S, T>): this {
-        this.acceptedStates[this.promptCount] = state
-        return this
-    }
-
-    private fail(message: string): void {
-        assert.fail(this.makeErrorMessage(message))
-    }
-
-    private makeErrorMessage(message: string): string {
-        return `[${this.name}]: ${message}`
-    }
-
-    public setName(name: string): this {
-        this.name = name
-        return this
-    }
-
-    public setTotalSteps(total: number): void {
-        this._totalSteps = total
-    }
-
-    private convertFunctionResponse(count: number = this.promptCount): PromptResult<T> {
-        let response = this.responses[count]
-        if (typeof response === 'function') {
-            if (this.acceptedStates[count] === undefined) {
-                this.fail(`Undefined state, did you forget to bind the prompter with "acceptState"?`)
-            }
-            response = (response as StateResponse<T, S>)(this.acceptedStates[count])
-        }
-        return response
-    }
-
-    private checkEstimate(input: T, expected: number, when: number): void {
-        if (when > this.acceptedEstimators.length) {
-            this.fail('Cannot check estimate for a step that did not occur')
-        }
-
-        const estimator = this.acceptedEstimators[when - 1]
-        const actual = estimator(input)
-
-        if (actual !== expected) {
-            this.fail(makeExpectedError(`Estimator did not provide the expected steps: `, actual, expected))
-        }
-    }
-
-    public assertStepEstimate(input: T, expected: number): AssertStepMethods {
-        return {
-            onCall: (...order: number[]) => order.forEach(i => this.checkEstimate(input, expected, i)),
-            onFirstCall: () => this.checkEstimate(input, expected, 1),
-            onSecondCall: () => this.checkEstimate(input, expected, 2),
-            onThirdCall: () => this.checkEstimate(input, expected, 3),
-            onFourthCall: () => this.checkEstimate(input, expected, 4),
-            onEveryCall: () => this.acceptedStates.forEach((_, i) => this.checkEstimate(input, expected, i + 1)),
-        } as AssertStepMethods
-    }
-
-    private checkSteps(expected: StepTuple, when: number): void {
-        if (when > this.acceptedSteps.length) {
-            this.fail(`Cannot check step counts for a step that did not occur`)
-        }
-
-        const actual = this.acceptedSteps[when - 1]
-
-        if (expected !== undefined) {
-            assert.strictEqual(actual[0], expected[0], this.makeErrorMessage('Incorrect current step'))
-            assert.strictEqual(actual[1], expected[1], this.makeErrorMessage('Incorrect total steps'))
-        }
-    }
-
-    /** Check if the prompter was given the expected steps */
-    public assertSteps(current: number, total: number): AssertStepMethods {
-        return {
-            onCall: (...order: number[]) => order.forEach(i => this.checkSteps([current, total], i)),
-            onFirstCall: () => this.checkSteps([current, total], 1),
-            onSecondCall: () => this.checkSteps([current, total], 2),
-            onThirdCall: () => this.checkSteps([current, total], 3),
-            onFourthCall: () => this.checkSteps([current, total], 4),
-            onEveryCall: () => this.acceptedSteps.forEach((_, i) => this.checkSteps([current, total], i + 1)),
-        } as AssertStepMethods
-    }
-
-    public assertCallCount(count: number): void {
-        assert.strictEqual(this.promptCount, count, this.makeErrorMessage('Called an unexpected number of times'))
-    }
-}
-
-// We only need to test execution of prompters provided by the wizard form
-describe('Wizard', function () {
-    let wizard: Wizard<TestWizardForm>
-    let helloPrompter: TestPrompter<string>
-
-    beforeEach(function () {
-        wizard = new Wizard()
-        helloPrompter = new TestPrompter(...Array(100).fill('hello')).setName('Hello')
-    })
-
-    it('binds prompter to property', async function () {
-        wizard.form.prop1.bindPrompter(() => helloPrompter)
-
-        assert.strictEqual((await wizard.run())?.prop1, 'hello')
-    })
-
-    it('initializes state to empty object if not provided', async function () {
-        wizard.form.prop1.bindPrompter(() => helloPrompter, { showWhen: state => state !== undefined })
-
-        assert.strictEqual((await wizard.run())?.prop1, 'hello')
-    })
-
-    it('processes exit signal', async function () {
-        wizard.form.prop1.bindPrompter(() => helloPrompter)
-        wizard.form.prop3.bindPrompter(() => new TestPrompter<string>(WIZARD_EXIT).setName('Exit'))
-
-        assert.strictEqual(await wizard.run(), undefined)
-        helloPrompter.assertCallCount(1)
-    })
-
-    it('users exit prompter if provided', async function () {
-        const checkForHello = (state: TestWizardForm) => state.prop1 !== 'hello'
-        const exitPrompter = new TestPrompter(checkForHello, true).setName('Exit Dialog')
-        const exitSignalPrompter = new TestPrompter<string>(WIZARD_EXIT, WIZARD_EXIT).setName('Exit Signal')
-        wizard = new Wizard({ exitPrompterProvider: state => exitPrompter.acceptState(state as any) })
-        wizard.form.prop1.bindPrompter(() => helloPrompter)
-        wizard.form.prop3.bindPrompter(() => exitSignalPrompter)
-
-        assert.strictEqual(await wizard.run(), undefined)
-        helloPrompter.assertCallCount(1)
-        exitPrompter.assertCallCount(2)
-        exitSignalPrompter.assertCallCount(2)
-    })
-
-    // test is mostly redundant (state controller handles this logic) but good to have
-    it('regenerates prompters when going back', async function () {
-        const testPrompter = new TestPrompter(WIZARD_BACK, 'goodbye').setName('Goodbye')
-
-        wizard.form.prop1.bindPrompter(() => helloPrompter)
-        wizard.form.prop3.bindPrompter(() => testPrompter)
-
-        assert.deepStrictEqual(await wizard.run(), { prop1: 'hello', prop3: 'goodbye' })
-        helloPrompter.assertCallCount(2)
-        testPrompter.assertCallCount(2)
-    })
-
-    it('applies step offset', async function () {
-        const testPrompter = new TestPrompter('1')
-        wizard.stepOffset = [4, 5]
-
-        wizard.form.prop1.bindPrompter(() => testPrompter)
-
-        assert.deepStrictEqual(await wizard.run(), { prop1: '1' })
-        testPrompter.assertSteps(5, 6).onFirstCall()
-    })
-
-    it('provides a step estimator', async function () {
-        const firstStep = new TestPrompter('0')
-        const secondStep = new TestPrompter('1')
-
-        wizard.form.prop1.bindPrompter(state => firstStep.acceptState(state))
-        wizard.form.prop3.bindPrompter(() => secondStep, { showWhen: state => state.prop1 === '1' })
-
-        assert.deepStrictEqual(await wizard.run(), { prop1: '0' })
-        firstStep.assertStepEstimate('0', 0).onFirstCall()
-        firstStep.assertStepEstimate('1', 1).onFirstCall()
-    })
-
-    it('uses a parent estimator if provided', async function () {
-        const parentEstimator = (state: TestWizardForm) => (state.prop1 === '1' ? (state.prop3 === '1' ? 2 : 1) : 0)
-        const firstStep = new TestPrompter('1', '0', '1')
-        const secondStep = new TestPrompter<string>(WIZARD_BACK, '1')
-        const thirdStep = new TestPrompter(WIZARD_BACK, 1)
-
-        wizard.parentEstimator = parentEstimator
-        wizard.form.prop1.bindPrompter(state => firstStep.acceptState(state))
-        wizard.form.prop3.bindPrompter(state => secondStep.acceptState(state), {
-            showWhen: state => state.prop1 === '1',
-        })
-        wizard.form.prop2.bindPrompter(state => thirdStep.acceptState(state))
-
-        assert.deepStrictEqual(await wizard.run(), { prop1: '1', prop2: 1, prop3: '1' })
-        firstStep.assertStepEstimate('0', 0).onEveryCall()
-        secondStep.assertStepEstimate('1', 2).onSecondCall()
-    })
-
-    it('does not apply control values to state when going back', async function () {
-        const noWizardControl = (state: StateWithCache<WizardState<TestWizardForm>, string>) => {
-            assert.strictEqual(
-                isWizardControl(state.prop2),
-                false,
-                'Wizard flow control should not appear in wizard state'
-            )
-            return 'good'
-        }
-
-        const testPrompter1 = new TestPrompter('first', noWizardControl).setName('Test 1')
-        const testPrompter2 = new TestPrompter(WIZARD_BACK, 22).setName('Test 2')
-
-        wizard.form.prop1.bindPrompter(state => testPrompter1.acceptState(state))
-        wizard.form.prop2.bindPrompter(() => testPrompter2)
-
-        assert.deepStrictEqual(await wizard.run(), { prop1: 'good', prop2: 22 })
-    })
-
-    describe('prompter state', function () {
-        // Execution order: 1 -> 2 -> 1 -> 2
-        it('accurately assigns current/total steps', async function () {
-            const testPrompter1 = new TestPrompter('1', '2', '3').setName('Test 1')
-            const testPrompter2 = new TestPrompter(WIZARD_BACK, 4).setName('Test 2')
-
-            testPrompter1.setTotalSteps(2)
-
-            wizard.form.prop1.bindPrompter(() => testPrompter1)
-            wizard.form.prop2.bindPrompter(() => testPrompter2)
-
-            assert.deepStrictEqual(await wizard.run(), { prop1: '2', prop2: 4 })
-            testPrompter1.assertCallCount(2)
-            testPrompter2.assertCallCount(2)
-            testPrompter1.assertSteps(1, 2).onFirstCall()
-            testPrompter2.assertSteps(3, 3).onSecondCall()
-        })
-
-        //       A --> Path 1
-        //      /             \
-        // Start               End
-        //      \             /
-        //       B --> Path 2
-        //
-        // Execution order:
-        // Start -> Path 1 -> End -> Path 1 -> Start -> Path 2 -> Start -> Path 1 -> Start -> Path 2 -> End -> Path 2 -> End
-        it('sets total steps correctly when branching', async function () {
-            const helloFunction = (state: WizardState<TestWizardForm>) =>
-                state.prop1 === 'B' ? `hello ${state.prop3}` : `extra step`
-            const testPrompterStart = new TestPrompter('A', 'B', 'A', 'B').setName('Start')
-            const testPrompterPath1 = new TestPrompter(99, WIZARD_BACK, WIZARD_BACK, 10).setName('Path 1')
-            const testPrompterPath2 = new TestPrompter(WIZARD_BACK, 'alice', 'bob').setName('Path 2')
-            const testPrompterEnd = new TestPrompter(WIZARD_BACK, WIZARD_BACK, helloFunction).setName('End')
-
-            testPrompterPath1.setTotalSteps(2)
-            testPrompterPath2.setTotalSteps(3)
-
-            wizard.form.prop1.bindPrompter(() => testPrompterStart)
-            wizard.form.prop2.bindPrompter(() => testPrompterPath1, { showWhen: state => state.prop1 === 'A' })
-            wizard.form.prop3.bindPrompter(() => testPrompterPath2, { showWhen: state => state.prop1 === 'B' })
-            wizard.form.prop4.bindPrompter(state => testPrompterEnd.acceptState(state))
-
-            assert.deepStrictEqual(await wizard.run(), { prop1: 'B', prop3: 'bob', prop4: 'hello bob' })
-            testPrompterStart.assertCallCount(4)
-            testPrompterPath1.assertCallCount(3)
-            testPrompterPath2.assertCallCount(3)
-            testPrompterEnd.assertCallCount(3)
-            testPrompterStart.assertSteps(1, 2).onEveryCall()
-            testPrompterPath1.assertSteps(2, 3).onEveryCall()
-            testPrompterPath2.assertSteps(2, 3).onEveryCall()
-            testPrompterEnd.assertSteps(4, 4).onFirstCall()
-            testPrompterEnd.assertSteps(5, 5).onCall(2, 3)
-        })
-    })
-})
diff --git a/src/test/ssmDocument/commands/deleteDocument.test.ts b/src/test/ssmDocument/commands/deleteDocument.test.ts
deleted file mode 100644
index 4641900f475..00000000000
--- a/src/test/ssmDocument/commands/deleteDocument.test.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { DocumentItemNodeWriteable } from '../../../ssmDocument/explorer/documentItemNodeWriteable'
-import { SsmDocumentClient } from '../../../shared/clients/ssmDocumentClient'
-import { deleteDocument } from '../../../ssmDocument/commands/deleteDocument'
-import { mock } from '../../utilities/mockito'
-import { FakeCommands } from '../../shared/vscode/fakeCommands'
-import { FakeWindow } from '../../shared/vscode/fakeWindow'
-import { RegistryItemNode } from '../../../ssmDocument/explorer/registryItemNode'
-import { SSM } from 'aws-sdk'
-
-describe('deleteDocument', async function () {
-    let ssmClient: SsmDocumentClient
-    let node: DocumentItemNodeWriteable
-    let parentNode: RegistryItemNode
-    const fakeName: string = 'testDocument'
-
-    const fakeDoc: SSM.Types.DocumentIdentifier = {
-        Name: fakeName,
-        DocumentFormat: 'json',
-        DocumentType: 'Automation',
-        Owner: 'Amazon',
-    }
-
-    const fakeRegion: string = 'us-east-1'
-
-    beforeEach(function () {
-        ssmClient = mock()
-        parentNode = mock()
-        node = new DocumentItemNodeWriteable(fakeDoc, ssmClient, fakeRegion, parentNode)
-    })
-
-    it('confirms deletion, deletes file, and refreshes parent node', async function () {
-        const window = new FakeWindow({ message: { warningSelection: 'Delete' } })
-        const commands = new FakeCommands()
-        await deleteDocument(node, window, commands)
-        assert.strictEqual(window.message.warning, 'Are you sure you want to delete document testDocument?')
-        assert.strictEqual(commands.command, 'aws.refreshAwsExplorerNode')
-        assert.deepStrictEqual(commands.args, [parentNode])
-    })
-})
diff --git a/src/test/ssmDocument/commands/publishDocument.test.ts b/src/test/ssmDocument/commands/publishDocument.test.ts
deleted file mode 100644
index 5d256426b6d..00000000000
--- a/src/test/ssmDocument/commands/publishDocument.test.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { SSM } from 'aws-sdk'
-
-import * as assert from 'assert'
-import * as sinon from 'sinon'
-import * as vscode from 'vscode'
-
-import { DefaultSsmDocumentClient } from '../../../shared/clients/ssmDocumentClient'
-import * as publish from '../../../ssmDocument/commands/publishDocument'
-import * as ssmUtils from '../../../ssmDocument/util/util'
-import {
-    PublishSSMDocumentAction,
-    PublishSSMDocumentWizardResponse,
-} from '../../../ssmDocument/wizards/publishDocumentWizard'
-import { closeAllEditors } from '../../testUtil'
-import { stub } from '../../utilities/stubber'
-
-describe('publishDocument', async function () {
-    let wizardResponse: PublishSSMDocumentWizardResponse
-    let textDocument: vscode.TextDocument
-    let result: SSM.CreateDocumentResult | SSM.UpdateDocumentResult
-
-    const fakeCreateRequest: SSM.CreateDocumentRequest = {
-        Content: 'foo',
-        DocumentFormat: 'JSON',
-        DocumentType: 'Automation',
-        Name: 'test',
-    }
-    const fakeUpdateRequest: SSM.UpdateDocumentRequest = {
-        Content: 'foo',
-        DocumentFormat: 'JSON',
-        DocumentVersion: '$LATEST',
-        Name: 'test',
-    }
-
-    before(async function () {
-        textDocument = await vscode.workspace.openTextDocument({ content: 'foo', language: 'ssm-json' })
-        await vscode.window.showTextDocument(textDocument)
-    })
-
-    after(async function () {
-        await closeAllEditors()
-    })
-
-    beforeEach(async function () {
-        wizardResponse = {
-            action: PublishSSMDocumentAction.QuickUpdate,
-            name: 'test',
-            documentType: 'Automation',
-            region: '',
-        }
-        result = {
-            DocumentDescription: {
-                Name: 'testName',
-            },
-        }
-    })
-
-    afterEach(function () {
-        sinon.restore()
-    })
-
-    describe('createDocument', async function () {
-        it('createDocument API returns successfully', async function () {
-            wizardResponse = {
-                action: PublishSSMDocumentAction.QuickCreate,
-                name: 'test',
-                documentType: 'Automation',
-                region: '',
-            }
-
-            const client = stub(DefaultSsmDocumentClient, { regionCode: 'region-1' })
-            client.createDocument.resolves(result)
-
-            await publish.createDocument(wizardResponse, textDocument, client)
-
-            assert(client.createDocument.calledOnce)
-            assert(client.createDocument.calledWith(fakeCreateRequest))
-        })
-
-        it('createDocument API failed', async function () {
-            const client = stub(DefaultSsmDocumentClient, { regionCode: 'region-1' })
-            client.getDocument.rejects(new Error('Create Error'))
-
-            const createErrorSpy = sinon.spy(vscode.window, 'showErrorMessage')
-            await publish.createDocument(wizardResponse, textDocument, client)
-            assert(createErrorSpy.calledOnce)
-            assert(
-                createErrorSpy.getCall(0).args[0],
-                "Failed to create Systems Manager Document 'test'. \nCreate Error"
-            )
-        })
-    })
-
-    describe('updateDocument', async function () {
-        it('updateDocument API returns successfully', async function () {
-            const client = stub(DefaultSsmDocumentClient, { regionCode: 'region-1' })
-            client.updateDocument.resolves(result)
-
-            sinon.stub(ssmUtils, 'showConfirmationMessage').resolves(false)
-            await publish.updateDocument(wizardResponse, textDocument, client)
-
-            assert(client.updateDocument.calledOnce)
-            assert(client.updateDocument.calledWith(fakeUpdateRequest))
-        })
-
-        it('updateDocument API failed', async function () {
-            const client = stub(DefaultSsmDocumentClient, { regionCode: 'region-1' })
-            client.updateDocument.rejects(new Error('Update Error'))
-
-            const updateErrorSpy = sinon.spy(vscode.window, 'showErrorMessage')
-            sinon.stub(ssmUtils, 'showConfirmationMessage').resolves(false)
-            await publish.updateDocument(wizardResponse, textDocument, client)
-            assert(updateErrorSpy.calledOnce)
-            assert(
-                updateErrorSpy.getCall(0).args[0],
-                "Failed to update Systems Manager Document 'test'. \nUpdate Error"
-            )
-        })
-    })
-})
diff --git a/src/test/ssmDocument/commands/updateDocumentVersion.test.ts b/src/test/ssmDocument/commands/updateDocumentVersion.test.ts
deleted file mode 100644
index 7df70db5a84..00000000000
--- a/src/test/ssmDocument/commands/updateDocumentVersion.test.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { SSM } from 'aws-sdk'
-import * as sinon from 'sinon'
-import * as assert from 'assert'
-
-import { updateDocumentVersion } from '../../../ssmDocument/commands/updateDocumentVersion'
-import { DocumentItemNodeWriteable } from '../../../ssmDocument/explorer/documentItemNodeWriteable'
-
-import * as picker from '../../../shared/ui/picker'
-import { FakeAwsContext } from '../../utilities/fakeAwsContext'
-import { mock } from '../../utilities/mockito'
-import { DefaultSsmDocumentClient } from '../../../shared/clients/ssmDocumentClient'
-import { stub } from '../../utilities/stubber'
-
-describe('openDocumentItem', async function () {
-    afterEach(function () {
-        sinon.restore()
-    })
-
-    const fakeDoc: SSM.Types.DocumentIdentifier = {
-        Name: 'testDocument',
-        DocumentFormat: 'json',
-        DocumentType: 'Command',
-        Owner: 'Amazon',
-    }
-
-    const fakeAwsContext = new FakeAwsContext()
-
-    const fakeRegion = 'us-east-1'
-
-    const fakeSchemaList: SSM.DocumentVersionInfo[] = [
-        {
-            Name: 'testDocument',
-            DocumentVersion: '1',
-        },
-        {
-            Name: 'testDocument',
-            DocumentVersion: '2',
-        },
-    ]
-
-    const fakeVersionSelectionResult = {
-        label: '2',
-        description: 'default',
-    }
-
-    it('updateDocumentVersion with correct name and version', async function () {
-        sinon.stub(picker, 'promptUser').onFirstCall().resolves(undefined)
-        sinon.stub(picker, 'verifySinglePickerOutput').onFirstCall().returns(fakeVersionSelectionResult)
-        sinon.stub(fakeAwsContext, 'getCredentialAccountId').returns('Amazon')
-        const ssmClient = stub(DefaultSsmDocumentClient, { regionCode: 'region-1' })
-        const documentNode = new DocumentItemNodeWriteable(fakeDoc, ssmClient, fakeRegion, mock())
-        sinon.stub(documentNode, 'listSchemaVersion').resolves(fakeSchemaList)
-        const updateVersionStub = sinon.stub(documentNode, 'updateDocumentVersion')
-        await updateDocumentVersion(documentNode, fakeAwsContext)
-        assert.strictEqual(updateVersionStub.getCall(0).args[0], '2')
-    })
-})
diff --git a/src/test/ssmDocument/explorer/registryItemNode.test.ts b/src/test/ssmDocument/explorer/registryItemNode.test.ts
deleted file mode 100644
index 4faa701f867..00000000000
--- a/src/test/ssmDocument/explorer/registryItemNode.test.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { RegistryItemNode } from '../../../ssmDocument/explorer/registryItemNode'
-import { assertNodeListOnlyHasErrorNode } from '../../utilities/explorerNodeAssertions'
-import { asyncGenerator } from '../../utilities/collectionUtils'
-import { DefaultSsmDocumentClient } from '../../../shared/clients/ssmDocumentClient'
-import { stub } from '../../utilities/stubber'
-
-describe('RegistryItemNode', function () {
-    const regionCode = 'testRegion'
-    const documentType = 'Automation'
-    const registryNames = ['Owned by me', 'Owned by Amazon', 'Shared with me']
-
-    it('handles error', async function () {
-        const client = stub(DefaultSsmDocumentClient, { regionCode })
-        client.listDocuments.throws('error')
-
-        const testNode = new RegistryItemNode(regionCode, 'Owned by me', documentType, client)
-        const childNodes = await testNode.getChildren()
-
-        assertNodeListOnlyHasErrorNode(childNodes)
-    })
-
-    it('puts documents into right registry', async function () {
-        return Promise.all(
-            registryNames.map(async registry => {
-                let owner: string
-                if (registry === 'Owned by Amazon') {
-                    owner = 'Amazon'
-                } else if (registry === 'Owned by me') {
-                    owner = '123456789012'
-                } else {
-                    owner = '987654321012'
-                }
-
-                const client = stub(DefaultSsmDocumentClient, { regionCode })
-                client.listDocuments.callsFake(() => {
-                    return asyncGenerator([
-                        {
-                            Name: `${owner}doc`,
-                            Owner: `${owner}`,
-                            DocumentType: `${documentType}`,
-                        },
-                    ])
-                })
-
-                const testNode: RegistryItemNode = new RegistryItemNode(regionCode, registry, documentType, client)
-                const childNode = await testNode.getChildren()
-                const expectedNodeNames = [`${owner}doc`]
-
-                assert.strictEqual(childNode.length, expectedNodeNames.length)
-                childNode.forEach((node, index) => {
-                    assert.strictEqual(node.label, expectedNodeNames[index])
-                })
-            })
-        )
-    })
-})
diff --git a/src/test/stepFunctions/commands/visualizeStateMachine.test.ts b/src/test/stepFunctions/commands/visualizeStateMachine.test.ts
deleted file mode 100644
index ea6cec77ecc..00000000000
--- a/src/test/stepFunctions/commands/visualizeStateMachine.test.ts
+++ /dev/null
@@ -1,251 +0,0 @@
-/*!
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as sinon from 'sinon'
-import * as vscode from 'vscode'
-import { Disposable } from 'vscode-languageclient'
-import { AslVisualization } from '../../../../src/stepFunctions/commands/visualizeStateMachine/aslVisualization'
-import { AslVisualizationManager } from '../../../../src/stepFunctions/commands/visualizeStateMachine/aslVisualizationManager'
-
-import { StateMachineGraphCache } from '../../../stepFunctions/utils'
-
-import { YAML_ASL, JSON_ASL } from '../../../../src/stepFunctions/constants/aslFormats'
-import { FakeExtensionContext } from '../../fakeExtensionContext'
-import { closeAllEditors } from '../../testUtil'
-import { getLogger } from '../../../shared/logger'
-
-// Top level defintions
-let aslVisualizationManager: AslVisualizationManager
-
-const mockGlobalStorage: vscode.Memento = {
-    update: sinon.spy(),
-    get: sinon.stub().returns(undefined),
-}
-
-const mockDataJson =
-    '{"Comment":"A Hello World example of the Amazon States Language using Pass states","StartAt":"Hello","States":{"Hello":{"Type":"Pass","Result":"Hello","Next":"World"},"World":{"Type":"Pass","Result":"${Text}","End":true}}}'
-
-const mockDataYaml = `
-Comment: "A Hello World example of the Amazon States Language using Pass states"
-StartAt: Hello
-States:
-  Hello:
-    Type: Pass
-    Result: Hello
-    Next: World
-  World:
-    Type: Pass
-    Result: \$\{Text\}
-    End: true
-`
-
-describe('StepFunctions VisualizeStateMachine', async function () {
-    async function getDocument(content = '', language?: string): Promise<vscode.TextDocument> {
-        return await vscode.workspace.openTextDocument({ content, language })
-    }
-
-    const getDoc1 = () => getDocument('TextOne', 'IdOne')
-    const getDoc2 = () => getDocument('TextTwo', 'IdTwo')
-    const getYamlDoc = () => getDocument(mockDataYaml, YAML_ASL)
-    const getJsonDoc = () => getDocument(mockDataJson, JSON_ASL)
-
-    before(function () {
-        sinon.stub(StateMachineGraphCache.prototype, 'updateCachedFile').resolves()
-    })
-
-    beforeEach(async function () {
-        const fakeExtCtx = await FakeExtensionContext.create()
-        fakeExtCtx.globalState = mockGlobalStorage
-        fakeExtCtx.workspaceState = mockGlobalStorage
-        aslVisualizationManager = new AslVisualizationManager(fakeExtCtx)
-    })
-
-    after(async function () {
-        sinon.restore()
-        await closeAllEditors().catch(e => getLogger().warn(`closeAllEditors failed: ${e}`))
-    })
-
-    it('Test AslVisualization on setup all properties are correct', async function () {
-        const doc = await getDoc1()
-        const vis = new MockAslVisualization(doc)
-
-        assert.deepStrictEqual(vis.documentUri, doc.uri)
-        assert.strictEqual(vis.getIsPanelDisposed(), false)
-        assert.strictEqual(vis.getDisposables().length, 5)
-
-        let panel = vis.getPanel()
-        assert.ok(panel)
-        panel = panel as vscode.WebviewPanel
-        assert.ok(panel.title.length > 0)
-        assert.strictEqual(panel.viewType, 'stateMachineVisualization')
-
-        let webview = vis.getWebview()
-        assert.ok(webview)
-        webview = webview as vscode.Webview
-        assert.ok(webview.html)
-    })
-
-    it('Test AslVisualizationManager on setup managedVisualizations set is empty', function () {
-        assert.strictEqual(aslVisualizationManager.getManagedVisualizations().size, 0)
-    })
-
-    it('Test AslVisualizationManager managedVisualizations set has one AslVis on first preview', async function () {
-        const doc = await getDoc1()
-        assert.strictEqual(aslVisualizationManager.getManagedVisualizations().size, 0)
-
-        await aslVisualizationManager.visualizeStateMachine(mockGlobalStorage, doc)
-        assert.strictEqual(aslVisualizationManager.getManagedVisualizations().size, 1)
-
-        const managedVisualizations = aslVisualizationManager.getManagedVisualizations()
-        assert.ok(managedVisualizations.get(doc.uri.fsPath))
-    })
-
-    it('Test AslVisualizationManager managedVisualizations set does not add second Vis on duplicate preview', async function () {
-        const doc = await getDoc1()
-        assert.strictEqual(aslVisualizationManager.getManagedVisualizations().size, 0)
-
-        await aslVisualizationManager.visualizeStateMachine(mockGlobalStorage, doc)
-        assert.strictEqual(aslVisualizationManager.getManagedVisualizations().size, 1)
-
-        await aslVisualizationManager.visualizeStateMachine(mockGlobalStorage, doc)
-        assert.strictEqual(aslVisualizationManager.getManagedVisualizations().size, 1)
-
-        const managedVisualizations = aslVisualizationManager.getManagedVisualizations()
-        assert.ok(managedVisualizations.get(doc.uri.fsPath))
-    })
-
-    it('Test AslVisualizationManager managedVisualizations set adds second Vis on different preview', async function () {
-        const doc1 = await getDoc1()
-        const doc2 = await getDoc2()
-
-        assert.strictEqual(aslVisualizationManager.getManagedVisualizations().size, 0)
-
-        await aslVisualizationManager.visualizeStateMachine(mockGlobalStorage, doc1)
-        assert.strictEqual(aslVisualizationManager.getManagedVisualizations().size, 1)
-
-        await aslVisualizationManager.visualizeStateMachine(mockGlobalStorage, doc2)
-        assert.strictEqual(aslVisualizationManager.getManagedVisualizations().size, 2)
-
-        const managedVisualizations = aslVisualizationManager.getManagedVisualizations()
-        assert.ok(managedVisualizations.get(doc1.uri.fsPath))
-        assert.ok(managedVisualizations.get(doc2.uri.fsPath))
-    })
-
-    it('Test AslVisualizationManager managedVisualizations set does not add duplicate renders when multiple Vis active', async function () {
-        const doc1 = await getDoc1()
-        const doc2 = await getDoc2()
-
-        assert.strictEqual(aslVisualizationManager.getManagedVisualizations().size, 0)
-
-        await aslVisualizationManager.visualizeStateMachine(mockGlobalStorage, doc1)
-        assert.strictEqual(aslVisualizationManager.getManagedVisualizations().size, 1)
-
-        await aslVisualizationManager.visualizeStateMachine(mockGlobalStorage, doc2)
-        assert.strictEqual(aslVisualizationManager.getManagedVisualizations().size, 2)
-
-        await aslVisualizationManager.visualizeStateMachine(mockGlobalStorage, doc1)
-        assert.strictEqual(aslVisualizationManager.getManagedVisualizations().size, 2)
-
-        await aslVisualizationManager.visualizeStateMachine(mockGlobalStorage, doc2)
-        assert.strictEqual(aslVisualizationManager.getManagedVisualizations().size, 2)
-
-        const managedVisualizations = aslVisualizationManager.getManagedVisualizations()
-        assert.ok(managedVisualizations.get(doc1.uri.fsPath))
-        assert.ok(managedVisualizations.get(doc2.uri.fsPath))
-    })
-
-    it('Test AslVisualizationManager managedVisualizations set removes visualization on visualization dispose, single vis', async function () {
-        assert.strictEqual(aslVisualizationManager.getManagedVisualizations().size, 0)
-
-        let panel = await aslVisualizationManager.visualizeStateMachine(mockGlobalStorage, await getDoc1())
-        assert.strictEqual(aslVisualizationManager.getManagedVisualizations().size, 1)
-
-        // Dispose of visualization panel
-        assert.ok(panel, 'Panel was not successfully generated')
-        panel = panel as vscode.WebviewPanel
-        panel.dispose()
-
-        assert.strictEqual(aslVisualizationManager.getManagedVisualizations().size, 0)
-    })
-
-    it('Test AslVisualizationManager managedVisualizations set removes correct visualization on visualization dispose, multiple vis', async function () {
-        const doc1 = await getDoc1()
-        const doc2 = await getDoc2()
-
-        assert.strictEqual(aslVisualizationManager.getManagedVisualizations().size, 0)
-
-        let panel = await aslVisualizationManager.visualizeStateMachine(mockGlobalStorage, doc1)
-        assert.strictEqual(aslVisualizationManager.getManagedVisualizations().size, 1)
-
-        await aslVisualizationManager.visualizeStateMachine(mockGlobalStorage, doc2)
-        assert.strictEqual(aslVisualizationManager.getManagedVisualizations().size, 2)
-
-        // Dispose of first visualization panel
-        assert.ok(panel, 'Panel was not successfully generated')
-        panel = panel as vscode.WebviewPanel
-        panel.dispose()
-
-        assert.strictEqual(aslVisualizationManager.getManagedVisualizations().size, 1)
-    })
-
-    it('Test AslVisualisation sendUpdateMessage posts a correct update message for YAML files', async function () {
-        const yamlDoc = await getYamlDoc()
-        const postMessage = sinon.spy()
-        class MockAslVisualizationYaml extends AslVisualization {
-            public override getWebview(): vscode.Webview | undefined {
-                return { postMessage } as unknown as vscode.Webview
-            }
-        }
-
-        const visualisation = new MockAslVisualizationYaml(yamlDoc)
-
-        await visualisation.sendUpdateMessage(yamlDoc)
-
-        const message = {
-            command: 'update',
-            stateMachineData: mockDataJson,
-            isValid: true,
-            errors: [],
-        }
-
-        assert.ok(postMessage.calledOnce)
-        assert.deepEqual(postMessage.firstCall.args, [message])
-    })
-
-    it('Test AslVisualisation sendUpdateMessage posts a correct update message for ASL files', async function () {
-        const jsonDoc = await getJsonDoc()
-        const postMessage = sinon.spy()
-        class MockAslVisualizationJson extends AslVisualization {
-            public override getWebview(): vscode.Webview | undefined {
-                return { postMessage } as unknown as vscode.Webview
-            }
-        }
-
-        const visualisation = new MockAslVisualizationJson(jsonDoc)
-
-        await visualisation.sendUpdateMessage(jsonDoc)
-
-        const message = {
-            command: 'update',
-            stateMachineData: mockDataJson,
-            isValid: true,
-            errors: [],
-        }
-
-        assert.ok(postMessage.calledOnce)
-        assert.deepEqual(postMessage.firstCall.args, [message])
-    })
-})
-
-class MockAslVisualization extends AslVisualization {
-    public getIsPanelDisposed(): boolean {
-        return this.isPanelDisposed
-    }
-
-    public getDisposables(): Disposable[] {
-        return this.disposables
-    }
-}
diff --git a/src/test/stepFunctions/utils.test.ts b/src/test/stepFunctions/utils.test.ts
deleted file mode 100644
index 18d877bc503..00000000000
--- a/src/test/stepFunctions/utils.test.ts
+++ /dev/null
@@ -1,271 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import { IAM } from 'aws-sdk'
-import * as fs from 'fs-extra'
-import * as sinon from 'sinon'
-import * as vscode from 'vscode'
-import { makeTemporaryToolkitFolder } from '../../shared/filesystemUtilities'
-import { isDocumentValid, isStepFunctionsRole, StateMachineGraphCache } from '../../stepFunctions/utils'
-
-const requestBody = 'request body string'
-const assetUrl = 'https://something'
-const filePath = '/some/path'
-const storageKey = 'KEY'
-let tempFolder = ''
-
-describe('StateMachineGraphCache', function () {
-    before(async function () {
-        tempFolder = await makeTemporaryToolkitFolder()
-    })
-
-    after(async function () {
-        await fs.remove(tempFolder)
-    })
-
-    describe('updateCachedFile', function () {
-        it('downloads a file when it is not in cache and stores it', async function () {
-            const globalStorage = {
-                update: sinon.spy(),
-                get: sinon.stub().returns(undefined),
-            }
-
-            const getFileData = sinon.stub().resolves(requestBody)
-            const fileExists = sinon.stub().onFirstCall().resolves(false).onSecondCall().resolves(true)
-
-            const writeFile = sinon.spy()
-
-            const cache = new StateMachineGraphCache({
-                getFileData,
-                fileExists,
-                writeFile,
-                cssFilePath: '',
-                jsFilePath: '',
-                dirPath: tempFolder,
-            })
-
-            await cache.updateCachedFile({
-                globalStorage,
-                lastDownloadedURLKey: storageKey,
-                currentURL: assetUrl,
-                filePath: filePath,
-            })
-
-            assert.ok(globalStorage.update.calledWith(storageKey, assetUrl))
-            assert.ok(writeFile.calledWith(filePath, requestBody))
-        })
-
-        it('downloads and stores a file when cached file exists but url has been updated', async function () {
-            const globalStorage = {
-                update: sinon.spy(),
-                get: sinon.stub().returns('https://old-url'),
-            }
-
-            const getFileData = sinon.stub().resolves(requestBody)
-            const fileExists = sinon.stub().onFirstCall().resolves(true).onSecondCall().resolves(true)
-
-            const writeFile = sinon.spy()
-
-            const cache = new StateMachineGraphCache({
-                getFileData,
-                fileExists,
-                writeFile,
-                cssFilePath: '',
-                jsFilePath: '',
-                dirPath: tempFolder,
-            })
-
-            await cache.updateCachedFile({
-                globalStorage,
-                lastDownloadedURLKey: storageKey,
-                currentURL: assetUrl,
-                filePath: filePath,
-            })
-
-            assert.ok(globalStorage.update.calledWith(storageKey, assetUrl))
-            assert.ok(writeFile.calledWith(filePath, requestBody))
-        })
-
-        it('it does not store data when file exists and url for it is same', async function () {
-            const globalStorage = {
-                update: sinon.spy(),
-                get: sinon.stub().returns(assetUrl),
-            }
-
-            const getFileData = sinon.stub().resolves(requestBody)
-            const fileExists = sinon.stub().onFirstCall().resolves(true).onSecondCall().resolves(true)
-
-            const writeFile = sinon.spy()
-
-            const cache = new StateMachineGraphCache({
-                getFileData,
-                fileExists,
-                writeFile,
-                cssFilePath: '',
-                jsFilePath: '',
-                dirPath: '',
-            })
-
-            await cache.updateCachedFile({
-                globalStorage,
-                lastDownloadedURLKey: storageKey,
-                currentURL: assetUrl,
-                filePath: filePath,
-            })
-
-            assert.ok(globalStorage.update.notCalled)
-            assert.ok(writeFile.notCalled)
-        })
-
-        it('creates assets directory when it does not exist', async function () {
-            const globalStorage = {
-                update: sinon.spy(),
-                get: sinon.stub().returns(undefined),
-            }
-
-            const getFileData = sinon.stub().resolves(requestBody)
-            const fileExists = sinon.stub().onFirstCall().resolves(false).onSecondCall().resolves(false)
-
-            const writeFile = sinon.spy()
-            const makeDir = sinon.spy()
-
-            const dirPath = '/path/to/assets'
-
-            const cache = new StateMachineGraphCache({
-                getFileData,
-                fileExists,
-                writeFile,
-                makeDir,
-                cssFilePath: '',
-                jsFilePath: '',
-                dirPath,
-            })
-
-            await cache.updateCachedFile({
-                globalStorage,
-                lastDownloadedURLKey: storageKey,
-                currentURL: assetUrl,
-                filePath: filePath,
-            })
-
-            assert.ok(globalStorage.update.calledWith(storageKey, assetUrl))
-            assert.ok(writeFile.calledWith(filePath, requestBody))
-            assert.ok(makeDir.calledWith(dirPath))
-        })
-    })
-})
-
-describe('isStepFunctionsRole', function () {
-    const baseIamRole: IAM.Role = {
-        Path: '',
-        RoleName: '',
-        RoleId: 'myRole',
-        Arn: 'arn:aws:iam::123456789012:role/myRole',
-        CreateDate: new Date(),
-    }
-
-    it('return true if the Step Functions service principal is in the AssumeRolePolicyDocument', function () {
-        const role: IAM.Role = {
-            ...baseIamRole,
-            AssumeRolePolicyDocument: JSON.stringify({
-                Version: '2012-10-17',
-                Statement: [
-                    {
-                        Effect: 'Allow',
-                        Principal: {
-                            Service: ['states.amazonaws.com'],
-                        },
-                        Action: ['sts:AssumeRole'],
-                    },
-                ],
-            }),
-        }
-        assert.ok(isStepFunctionsRole(role))
-    })
-
-    it('returns false if the role does not have an AssumeRolePolicyDocument', function () {
-        assert.ok(!isStepFunctionsRole(baseIamRole))
-    })
-
-    it("returns false if the AssumeRolePolicyDocument does not contain Step Functions' service principal", () => {
-        const role: IAM.Role = {
-            ...baseIamRole,
-            AssumeRolePolicyDocument: JSON.stringify({
-                Version: '2012-10-17',
-                Statement: [
-                    {
-                        Effect: 'Allow',
-                        Principal: {
-                            Service: ['lambda.amazonaws.com'],
-                        },
-                        Action: ['sts:AssumeRole'],
-                    },
-                ],
-            }),
-        }
-        assert.ok(!isStepFunctionsRole(role))
-    })
-})
-
-describe('isDocumentValid', async function () {
-    it('returns true for valid ASL', async function () {
-        const aslText = `
-            {
-                "StartAt": "FirstMatchState",
-                "States": {
-                    "FirstMatchState": {
-                        "Type": "Task",
-                        "Resource": "arn:aws:lambda:us-west-2:000000000000:function:OnFirstMatch",
-                        "End": true
-                    }
-                }
-            } `
-
-        const textDocument = await vscode.workspace.openTextDocument({ language: 'asl' })
-
-        const isValid = await isDocumentValid(aslText, textDocument)
-        assert.ok(isValid)
-    })
-
-    it('returns true for ASL with invalid arns', async function () {
-        const aslText = `
-            {
-                "StartAt": "FirstMatchState",
-                "States": {
-                    "FirstMatchState": {
-                        "Type": "Task",
-                        "Resource": "arn:aws:lambda:REGION:ACCOUNT_ID:function:OnFirstMatch",
-                        "End": true
-                    }
-                }
-            } `
-
-        const textDocument = await vscode.workspace.openTextDocument({ language: 'asl' })
-
-        const isValid = await isDocumentValid(aslText, textDocument)
-        assert.ok(isValid)
-    })
-
-    it('returns false for invalid ASL', async function () {
-        const aslText = `
-            {
-                "StartAt": "Does not exist",
-                "States": {
-                    "FirstMatchState": {
-                        "Type": "Task",
-                        "Resource": "arn:aws:lambda:us-west-2:000000000000:function:OnFirstMatch",
-                        "End": true
-                    }
-                }
-            } `
-
-        const textDocument = await vscode.workspace.openTextDocument({ language: 'asl' })
-
-        const isValid = await isDocumentValid(aslText, textDocument)
-
-        assert.ok(!isValid)
-    })
-})
diff --git a/src/test/techdebt.test.ts b/src/test/techdebt.test.ts
deleted file mode 100644
index 157223dfb7f..00000000000
--- a/src/test/techdebt.test.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as semver from 'semver'
-import * as env from '../shared/vscode/env'
-
-// Checks project config and dependencies, to remind us to remove old things
-// when possible.
-describe('tech debt', function () {
-    it('vscode minimum version', async function () {
-        const minVscode = env.getMinVscodeVersion()
-
-        assert.ok(
-            semver.lt(minVscode, '1.53.0'),
-            'remove src/shared/vscode/secrets.ts wrapper from https://github.com/aws/aws-toolkit-vscode/pull/2626'
-        )
-
-        assert.ok(
-            semver.lt(minVscode, '1.53.0'),
-            'remove `SecretMemento` from src/codecatalyst/auth.ts added in https://github.com/aws/aws-toolkit-vscode-staging/pull/466'
-        )
-
-        assert.ok(
-            semver.lt(minVscode, '1.51.0'),
-            'remove filesystemUtilities.findFile(), use vscode.workspace.findFiles() instead'
-        )
-
-        assert.ok(semver.lt(minVscode, '1.64.0'), 'remove QuickPickItemKind stub in pickCredentialProfile()')
-
-        assert.ok(
-            semver.lt(minVscode, '1.56.0'),
-            'remove AsyncLocalStorage polyfill used in `spans.ts` if Cloud9 is on node 14+'
-        )
-    })
-
-    it('nodejs minimum version', async function () {
-        const minNodejs = env.getMinNodejsVersion()
-
-        assert.ok(
-            semver.lt(minNodejs, '16.0.0'),
-            'remove require("perf_hooks").performance workarounds, use globalThis.performance instead (always available since nodejs 16.x)'
-        )
-
-        assert.ok(
-            semver.lt(minNodejs, '16.0.0'),
-            'with node16+, we can now use AbortController to cancel Node things (child processes, HTTP requests, etc.)'
-        )
-    })
-})
diff --git a/src/test/testLogger.ts b/src/test/testLogger.ts
deleted file mode 100644
index a6d9c19afdf..00000000000
--- a/src/test/testLogger.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Loggable, Logger, LogLevel } from '../shared/logger'
-import { compareLogLevel } from '../shared/logger/logger'
-import { Uri } from 'vscode'
-
-/**
- * In-memory Logger implementation suitable for use by tests.
- */
-export class TestLogger implements Logger {
-    private readonly loggedEntries: {
-        logLevel: LogLevel
-        entry: Loggable
-    }[] = []
-    private count: number = 0
-    public constructor(private logLevel: LogLevel = 'debug') {}
-
-    public debug(...message: Loggable[]): number {
-        return this.addLoggedEntries('debug', message)
-    }
-
-    public verbose(...message: Loggable[]): number {
-        return this.addLoggedEntries('verbose', message)
-    }
-
-    public info(...message: Loggable[]): number {
-        return this.addLoggedEntries('info', message)
-    }
-
-    public warn(...message: Loggable[]): number {
-        return this.addLoggedEntries('warn', message)
-    }
-
-    public error(...message: Loggable[]): number {
-        return this.addLoggedEntries('error', message)
-    }
-
-    public getLoggedEntries(...logLevels: LogLevel[]): Loggable[] {
-        return this.loggedEntries
-            .filter(loggedEntry => logLevels.length === 0 || logLevels.includes(loggedEntry.logLevel))
-            .map(loggedEntry => loggedEntry.entry)
-    }
-
-    private addLoggedEntries(logLevel: LogLevel, entries: Loggable[]): number {
-        entries.forEach(entry => {
-            this.loggedEntries.push({
-                logLevel,
-                entry,
-            })
-        })
-
-        return this.count++
-    }
-
-    // No need to actually implement this. Log tracking is tested in winstonToolkitLogger.test.ts
-    public getLogById(logID: number, file: Uri): string | undefined {
-        return undefined
-    }
-
-    public setLogLevel(logLevel: LogLevel) {
-        this.logLevel = logLevel
-    }
-
-    public logLevelEnabled(logLevel: LogLevel): boolean {
-        const currentLevel = this.logLevel as LogLevel
-        return compareLogLevel(currentLevel, logLevel) >= 0
-    }
-}
diff --git a/src/test/testRunner.ts b/src/test/testRunner.ts
deleted file mode 100644
index 1aa92966910..00000000000
--- a/src/test/testRunner.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import '@cspotcode/source-map-support/register'
-import * as path from 'path'
-import * as Mocha from 'mocha'
-import * as glob from 'glob'
-import * as fs from 'fs-extra'
-
-/**
- * @param initTests List of relative paths to test files to run before all discovered tests.
- */
-export async function runTests(testFolder: string, initTests: string[] = [], testFiles?: string[]): Promise<void> {
-    if (!process.env['AWS_TOOLKIT_AUTOMATION']) {
-        throw new Error('Expected the "AWS_TOOLKIT_AUTOMATION" environment variable to be set for tests.')
-    }
-
-    function getRoot(): string {
-        const abs = process.env['DEVELOPMENT_PATH'] ?? process.cwd()
-
-        if (process.platform !== 'win32') {
-            return abs
-        }
-
-        // Force all drive letters (or whatever else is before the first colon) to be lowercase.
-        //
-        // Node's `require` will always cache modules based off case-sensitive paths, regardless
-        // of the underlying file system. This is normally not a problem, but VS Code also happens
-        // to normalize paths on Windows to use lowercase drive letters when using its bootstrap loader.
-        // This means that each module ends up getting loaded twice, once by the extension and once
-        // by any test code, causing all sorts of bizarre behavior during tests.
-        const [drive, ...rest] = abs.split(':')
-        return rest.length === 0 ? abs : [drive.toLowerCase(), ...rest].join(':')
-    }
-
-    const root = getRoot()
-    const outputFile = path.resolve(root, '.test-reports', 'report.xml')
-    const colorOutput = !process.env['AWS_TOOLKIT_TEST_NO_COLOR']
-
-    // Create the mocha test
-    const mocha = new Mocha({
-        ui: 'bdd',
-        color: colorOutput,
-        reporter: 'mocha-multi-reporters',
-        reporterOptions: {
-            reporterEnabled: 'mocha-junit-reporter, spec',
-            mochaJunitReporterReporterOptions: {
-                mochaFile: outputFile,
-            },
-        },
-        timeout: 0,
-    })
-
-    const dist = path.resolve(root, 'dist')
-    const testFile = process.env['TEST_FILE']?.replace('.ts', '.js')
-    const testFilePath = testFile ? path.resolve(dist, testFile) : undefined
-
-    if (testFile && testFiles) {
-        throw new Error('Individual file and list of files given to run tests on. One must be chosen.')
-    }
-
-    // Explicitly add additional tests (globalSetup) as the first tests.
-    // TODO: migrate to mochaHooks (requires mocha 8.x).
-    // https://mochajs.org/#available-root-hooks
-    initTests.forEach(relativePath => {
-        const fullPath = path.join(dist, relativePath).replace('.ts', '.js')
-        if (!fs.pathExistsSync(fullPath)) {
-            console.error(`error: missing ${fullPath}`)
-            throw Error(`missing ${fullPath}`)
-        }
-
-        mocha.addFile(fullPath)
-    })
-
-    function runMocha(files: string[]): Promise<void> {
-        files.forEach(f => mocha.addFile(path.resolve(dist, f)))
-        return new Promise<void>((resolve, reject) => {
-            mocha.run(failures => {
-                if (failures > 0) {
-                    reject(new Error(`${failures} tests failed.`))
-                } else {
-                    resolve()
-                }
-            })
-        })
-    }
-
-    async function writeCoverage(): Promise<void> {
-        const coverage = (globalThis as typeof globalThis & { __coverage__?: any }).__coverage__
-
-        if (coverage) {
-            const dst = path.resolve(root, '.nyc_output', 'out.json')
-            console.log(`Writing test coverage to "${dst}"`)
-            await fs.ensureDir(path.dirname(dst))
-            await fs.writeFile(dst, JSON.stringify(coverage))
-        } else {
-            console.log('No test coverage found')
-        }
-    }
-    const files =
-        testFiles ??
-        (await new Promise<string[]>((resolve, reject) => {
-            glob(testFilePath ?? `**/${testFolder}/**/**.test.js`, { cwd: dist }, (err, files) => {
-                if (err) {
-                    reject(err)
-                } else {
-                    resolve(files)
-                }
-            })
-        }))
-
-    await runMocha(files)
-    await writeCoverage()
-}
diff --git a/src/test/testUtil.ts b/src/test/testUtil.ts
deleted file mode 100644
index bd2eb41d85d..00000000000
--- a/src/test/testUtil.ts
+++ /dev/null
@@ -1,311 +0,0 @@
-/*!
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as assert from 'assert'
-import * as path from 'path'
-import * as fs from 'fs-extra'
-import * as vscode from 'vscode'
-import * as fsextra from 'fs-extra'
-import * as FakeTimers from '@sinonjs/fake-timers'
-import * as pathutil from '../shared/utilities/pathUtils'
-import { makeTemporaryToolkitFolder, tryRemoveFolder } from '../shared/filesystemUtilities'
-import globals from '../shared/extensionGlobals'
-import { waitUntil } from '../shared/utilities/timeoutUtils'
-import { isMinimumVersion, isReleaseVersion } from '../shared/vscode/env'
-import { MetricName, MetricShapes } from '../shared/telemetry/telemetry'
-
-const testTempDirs: string[] = []
-
-/**
- * Writes the string form of `o` to `filepath` as UTF-8 text.
- *
- * Creates parent directories in `filepath`, if necessary.
- */
-export function toFile(o: any, filepath: string) {
-    const text = o ? o.toString() : ''
-    const dir = path.dirname(filepath)
-    fsextra.mkdirpSync(dir)
-    fsextra.writeFileSync(filepath, text, 'utf8')
-}
-
-/**
- * Gets the contents of `filepath` as UTF-8 encoded string.
- */
-export function fromFile(filepath: string): string {
-    return fsextra.readFileSync(filepath, { encoding: 'utf8' })
-}
-
-/** Gets the full path to the Toolkit source root on this machine. */
-export function getProjectDir(): string {
-    return path.join(__dirname, '../')
-}
-
-/** Instantiates a `WorkspaceFolder` object for use in tests. */
-export function getWorkspaceFolder(dir: string): vscode.WorkspaceFolder {
-    const folder = {
-        uri: vscode.Uri.file(dir),
-        name: 'test-workspace-folder',
-        index: 0,
-    }
-    return folder
-}
-
-/**
- * Creates a random, temporary workspace folder on the filesystem and returns a
- * `WorkspaceFolder` object.
- *
- * @param name  Optional name, defaults to "test-workspace-folder".
- */
-export async function createTestWorkspaceFolder(name?: string): Promise<vscode.WorkspaceFolder> {
-    const tempFolder = await makeTemporaryToolkitFolder()
-    testTempDirs.push(tempFolder)
-    return {
-        uri: vscode.Uri.file(tempFolder),
-        name: name ?? 'test-workspace-folder',
-        index: 0,
-    }
-}
-
-export async function deleteTestTempDirs(): Promise<void> {
-    let failed = 0
-    for (const s of testTempDirs) {
-        if (!tryRemoveFolder(s)) {
-            failed += 1
-        }
-    }
-    if (failed > 0) {
-        console.error('deleteTestTempDirs: failed to delete %d/%d test temp dirs', failed, testTempDirs.length)
-    } else {
-        console.error('deleteTestTempDirs: deleted %d test temp dirs', testTempDirs.length)
-    }
-}
-
-/**
- * Asserts that filepaths are equal, after normalizing for platform differences.
- */
-export function assertEqualPaths(actual: string, expected: string, message?: string | Error) {
-    assert.strictEqual(pathutil.normalize(actual), pathutil.normalize(expected), message)
-}
-
-/**
- * Asserts that UTF-8 contents of `file` are equal to `expected`.
- */
-export function assertFileText(file: string, expected: string, message?: string | Error) {
-    const actualContents = fsextra.readFileSync(file, 'utf-8')
-    assert.strictEqual(actualContents, expected, message)
-}
-
-/** A lot of code will create a Promise, tick the clock, then wait for resolution. This function turns 3 lines into 1. */
-export async function tickPromise<T>(promise: Promise<T>, clock: FakeTimers.InstalledClock, t: number): Promise<T> {
-    clock.tick(t)
-    return await promise
-}
-
-/**
- * Creates an executable file (including any parent directories) with the given contents.
- */
-export function createExecutableFile(filepath: string, contents: string): void {
-    fs.mkdirpSync(path.dirname(filepath))
-    if (process.platform === 'win32') {
-        fs.writeFileSync(filepath, `@echo OFF$\r\n${contents}\r\n`)
-    } else {
-        fs.writeFileSync(filepath, `#!/bin/sh\n${contents}`)
-        fs.chmodSync(filepath, 0o744)
-    }
-}
-
-/**
- * Installs a fake clock, making sure to set a flag to clear real timers.
- *
- * Always uses the extension-scoped clock instead of the real one.
- *
- * **Implementations must use `globals.clock` to be correctly tested**
- */
-export function installFakeClock(): FakeTimers.InstalledClock {
-    return FakeTimers.withGlobal(globals.clock).install({
-        shouldClearNativeTimers: true,
-        shouldAdvanceTime: false,
-    })
-}
-
-/**
- * Gets all recorded metrics with the corresponding name.
- *
- * Unlike {@link assertTelemetry}, this function does not do any transformations to
- * handle fields being converted into strings. It will also not return `passive` or `value`.
- */
-export function getMetrics<K extends MetricName>(
-    name: K,
-    ...excludeKeys: string[]
-): readonly Partial<MetricShapes[K]>[] {
-    const query = { metricName: name, excludeKeys: ['awsAccount', 'awsRegion', ...excludeKeys] }
-
-    return globals.telemetry.logger.query(query) as unknown as Partial<MetricShapes[K]>[]
-}
-
-/*
- * Finds the first emitted telemetry metric with the given name, then checks if the metadata fields
- * match the expected values.
- */
-export function assertTelemetry<K extends MetricName>(name: K, expected: MetricShapes[K]): void | never {
-    const expectedCopy = { ...expected } as { -readonly [P in keyof MetricShapes[K]]: MetricShapes[K][P] }
-    const passive = expectedCopy?.passive
-    const query = { metricName: name, excludeKeys: ['awsAccount', 'duration'] }
-    delete expectedCopy['passive']
-
-    Object.keys(expectedCopy).forEach(
-        k => ((expectedCopy as any)[k] = (expectedCopy as Record<string, any>)[k]?.toString())
-    )
-
-    // Telemetry client should add awsRegion to all metrics.
-    ;(expectedCopy as any)['awsRegion'] = globals.regionProvider.guessDefaultRegion()
-
-    const metadata = globals.telemetry.logger.query(query)
-    assert.ok(metadata.length > 0, `Telemetry did not contain any metrics with the name "${name}"`)
-    assert.deepStrictEqual(metadata[0], expectedCopy)
-
-    if (passive !== undefined) {
-        const metric = globals.telemetry.logger.queryFull(query)
-        assert.strictEqual(metric[0].Passive, passive)
-    }
-}
-
-/**
- * Curried form of {@link assertTelemetry} for when you want partial application.
- */
-export const assertTelemetryCurried =
-    <K extends MetricName>(name: K) =>
-    (expected: MetricShapes[K]) =>
-        assertTelemetry(name, expected)
-
-/**
- * Waits for _any_ active text editor to appear and have the desired contents.
- * This is important since there may be delays between showing a new document and
- * updates to the `activeTextEditor` field.
- *
- * Assumes that only a single document will be edited while polling. The contents of
- * the document must match exactly to the text editor at some point, otherwise this
- * function will timeout.
- */
-export async function assertTextEditorContains(contents: string): Promise<void | never> {
-    const editor = await waitUntil(
-        async () => {
-            if (vscode.window.activeTextEditor?.document.getText() === contents) {
-                return vscode.window.activeTextEditor
-            }
-        },
-        { interval: 5 }
-    )
-
-    if (!vscode.window.activeTextEditor) {
-        throw new Error('No active text editor found')
-    }
-
-    if (!editor) {
-        const actual = vscode.window.activeTextEditor.document
-        const documentName = actual.uri.toString(true)
-        const message = `Document "${documentName}" contained "${actual.getText()}", expected: "${contents}"`
-        assert.strictEqual(actual.getText(), contents, message)
-    }
-}
-
-/**
- * Executes the "openEditors.closeAll" command and asserts that all visible
- * editors were closed after waiting.
- */
-export async function closeAllEditors(): Promise<void> {
-    const hasCloseAll = (await vscode.commands.getCommands()).includes('openEditors.closeAll')
-    // Derived by inspecting 'Keyboard Shortcuts' via command `>Preferences: Open Keyboard Shortcuts`
-    // `workbench.action.closeAllEditors` is unreliable and should not be used if possible
-    const closeAllCmd = hasCloseAll ? 'openEditors.closeAll' : 'workbench.action.closeAllEditors'
-    if (hasCloseAll) {
-        if (isMinimumVersion() && !isReleaseVersion()) {
-            throw Error(
-                '"openEditors.closeAll" is available in min version, remove use of "workbench.action.closeAllEditors"!'
-            )
-        }
-    }
-
-    // Output channels are named with the prefix 'extension-output'
-    // Maybe we can close these with a command?
-    const ignorePatterns = [/extension-output/, /tasks/]
-
-    const noVisibleEditor: boolean | undefined = await waitUntil(
-        async () => {
-            // Race: documents could appear after the call to closeAllEditors(), so retry.
-            await vscode.commands.executeCommand(closeAllCmd)
-            const visibleEditors = vscode.window.visibleTextEditors.filter(
-                editor => !ignorePatterns.find(p => p.test(editor.document.fileName))
-            )
-
-            return visibleEditors.length === 0
-        },
-        {
-            timeout: 2500, // Arbitrary values. Should succeed except when VS Code is lagging heavily.
-            interval: 250,
-            truthy: true,
-        }
-    )
-
-    if (!noVisibleEditor) {
-        const editors = vscode.window.visibleTextEditors.map(editor => `\t${editor.document.fileName}`)
-
-        throw new Error(`The following editors were still open after closeAllEditors():\n${editors.join('\n')}`)
-    }
-}
-
-export interface EventCapturer<T = unknown> extends vscode.Disposable {
-    /**
-     * All events captured after instrumentation
-     */
-    readonly emits: readonly T[]
-
-    /**
-     * The most recently emitted event
-     */
-    readonly last: T | undefined
-
-    /**
-     * Waits for the next event to be emitted
-     */
-    next(timeout?: number): Promise<T>
-}
-
-/**
- * Instruments an event for easier inspection.
- */
-export function captureEvent<T>(event: vscode.Event<T>): EventCapturer<T> {
-    let disposed = false
-    const emits: T[] = []
-    const listeners: vscode.Disposable[] = []
-    listeners.push(event(data => emits.push(data)))
-
-    return {
-        emits,
-        get last() {
-            return emits[emits.length - 1]
-        },
-        next: (timeout?: number) => {
-            if (disposed) {
-                throw new Error('Capturer has been disposed')
-            }
-
-            return new Promise<T>((resolve, reject) => {
-                const stop = () => reject(new Error('Timed out waiting for event'))
-                const disposable = event(data => resolve(data))
-
-                if (timeout !== undefined) {
-                    setTimeout(stop, timeout)
-                }
-
-                listeners.push({ dispose: () => (disposable.dispose(), stop()) })
-            })
-        },
-        dispose: () => {
-            disposed = true
-            vscode.Disposable.from(...listeners).dispose()
-        },
-    }
-}
diff --git a/src/test/utilities/collectionUtils.ts b/src/test/utilities/collectionUtils.ts
deleted file mode 100644
index 31941d695c5..00000000000
--- a/src/test/utilities/collectionUtils.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/*!
- * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { AsyncCollection, toCollection } from '../../shared/utilities/asyncCollection'
-
-// TODO: what is the point of this? should it live in src/shared/utilities/collectionUtils.ts ?
-export async function* asyncGenerator<T>(items: T[]): AsyncIterableIterator<T> {
-    yield* items
-}
-
-export function createCollectionFromPages<T>(...pages: T[]): AsyncCollection<T> {
-    return toCollection(async function* () {
-        for (let i = 0; i < pages.length - 1; i++) {
-            yield pages[i]
-        }
-
-        return pages[pages.length - 1]
-    })
-}
diff --git a/src/test/utilities/mockito.ts b/src/test/utilities/mockito.ts
deleted file mode 100644
index b7c2dee6efc..00000000000
--- a/src/test/utilities/mockito.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as mockito from 'ts-mockito'
-import { Mocker } from 'ts-mockito/lib/Mock'
-
-// Workaround https://github.com/NagRock/ts-mockito/issues/163
-export function mock<T>(clazz?: new (...args: any[]) => T): T {
-    const mocker = new Mocker(clazz)
-    mocker['excludedPropertyNames'] += 'then'
-
-    return mocker.getMock()
-}
-
-export const spy = mockito.spy
-export const verify = mockito.verify
-export const when = mockito.when
-export const instance = mockito.instance
-export const capture = mockito.capture
-export const reset = mockito.reset
-export const resetCalls = mockito.resetCalls
-export const anyOfClass = mockito.anyOfClass
-export const anyFunction = mockito.anyFunction
-export const anyNumber = mockito.anyNumber
-export const anyString = mockito.anyString
-export const anything = mockito.anything
-export const between = mockito.between
-export const deepEqual = mockito.deepEqual
-export const notNull = mockito.notNull
-export const strictEqual = mockito.strictEqual
-export const match = mockito.match
-export const objectContaining = mockito.objectContaining
diff --git a/src/testFixtures/workspaceFolder/deeper-projects/js-plain-sam-app/template.yaml b/src/testFixtures/workspaceFolder/deeper-projects/js-plain-sam-app/template.yaml
deleted file mode 100644
index 94e68345a7e..00000000000
--- a/src/testFixtures/workspaceFolder/deeper-projects/js-plain-sam-app/template.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-Resources:
-    SourceCodeBesidePackageJson:
-        Type: AWS::Serverless::Function
-        Properties:
-            CodeUri: src
-            Handler: app.projectDeepInWorkspace
-            Runtime: nodejs14.x
diff --git a/src/testFixtures/workspaceFolder/java11-image-gradle-sam-app/HelloWorldFunction/Dockerfile b/src/testFixtures/workspaceFolder/java11-image-gradle-sam-app/HelloWorldFunction/Dockerfile
deleted file mode 100644
index 76117f3ba8f..00000000000
--- a/src/testFixtures/workspaceFolder/java11-image-gradle-sam-app/HelloWorldFunction/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-FROM public.ecr.aws/lambda/java:11 as build-image
-
-ARG SCRATCH_DIR=/var/task/build
-
-COPY src/ src/
-COPY gradle/ gradle/
-COPY build.gradle gradlew ./
-
-RUN mkdir build
-COPY gradle/lambda-build-init.gradle ./build
-
-RUN ./gradlew --project-cache-dir $SCRATCH_DIR/gradle-cache -Dsoftware.amazon.aws.lambdabuilders.scratch-dir=$SCRATCH_DIR --init-script $SCRATCH_DIR/lambda-build-init.gradle build
-RUN rm -r $SCRATCH_DIR/gradle-cache
-RUN rm -r $SCRATCH_DIR/lambda-build-init.gradle
-RUN cp -r $SCRATCH_DIR/*/build/distributions/lambda-build/* .
-
-FROM public.ecr.aws/lambda/java:11
-
-COPY --from=build-image /var/task/META-INF ./
-COPY --from=build-image /var/task/helloworld ./helloworld
-COPY --from=build-image /var/task/lib/ ./lib
-# Command can be overwritten by providing a different command in the template directly.
-CMD ["helloworld.App::handleRequest"]
\ No newline at end of file
diff --git a/src/testFixtures/workspaceFolder/java11-image-gradle-sam-app/HelloWorldFunction/build.gradle b/src/testFixtures/workspaceFolder/java11-image-gradle-sam-app/HelloWorldFunction/build.gradle
deleted file mode 100644
index fb87903e5d0..00000000000
--- a/src/testFixtures/workspaceFolder/java11-image-gradle-sam-app/HelloWorldFunction/build.gradle
+++ /dev/null
@@ -1,13 +0,0 @@
-plugins {
-    id 'java'
-}
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    implementation 'com.amazonaws:aws-lambda-java-core:1.2.1'
-    implementation 'com.amazonaws:aws-lambda-java-events:3.1.0'
-    testImplementation 'junit:junit:4.12'
-}
diff --git a/src/testFixtures/workspaceFolder/java11-image-gradle-sam-app/HelloWorldFunction/gradle/wrapper/gradle-wrapper.properties b/src/testFixtures/workspaceFolder/java11-image-gradle-sam-app/HelloWorldFunction/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 558870dad58..00000000000
--- a/src/testFixtures/workspaceFolder/java11-image-gradle-sam-app/HelloWorldFunction/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/src/testFixtures/workspaceFolder/java11-image-gradle-sam-app/HelloWorldFunction/lambda-build-init.gradle b/src/testFixtures/workspaceFolder/java11-image-gradle-sam-app/HelloWorldFunction/lambda-build-init.gradle
deleted file mode 100644
index d98d7263539..00000000000
--- a/src/testFixtures/workspaceFolder/java11-image-gradle-sam-app/HelloWorldFunction/lambda-build-init.gradle
+++ /dev/null
@@ -1,105 +0,0 @@
-import groovy.io.FileType
-import java.nio.file.FileAlreadyExistsException
-import java.nio.file.Files
-import java.nio.file.FileVisitOption
-import java.nio.file.FileVisitResult
-import java.nio.file.Path
-import java.nio.file.Paths
-import java.nio.file.SimpleFileVisitor
-import java.security.MessageDigest
-import java.util.zip.ZipInputStream
-import java.util.zip.ZipOutputStream
-import java.util.zip.ZipEntry
-
-gradle.ext.SCRATCH_DIR_PROPERTY = 'software.amazon.aws.lambdabuilders.scratch-dir'
-
-// Called after the project has been evaluated
-gradle.afterProject({p ->
-    def buildDir = buildDirForProject(p)
-    p.buildDir = buildDir
-})
-
-gradle.taskGraph.afterTask{ t ->
-    if (t.name != 'build') {
-        return;
-    }
-
-    def artifactJars = t.project.configurations.archives.artifacts.files.files
-
-    def runtimeCpJars = t.project.configurations.runtimeClasspath.files
-
-    def artifactDir = createArtifactDir(t.project)
-
-    copyToArtifactDir(artifactDir, artifactJars, runtimeCpJars)
-}
-
-def buildDirForProject(p) {
-    def scratchDir = System.properties[SCRATCH_DIR_PROPERTY]
-    if (scratchDir == null) {
-        throw new RuntimeException("Missing '${SCRATCH_DIR_PROPERTY}' value")
-    }
-    return Paths.get(scratchDir, scratchDirForProject(p), 'build')
-}
-
-def scratchDirForProject(p) {
-    def sha1 = MessageDigest.getInstance('SHA-1')
-    return sha1.digest(p.projectDir.toString().getBytes('UTF-8')).encodeHex().toString()
-}
-
-def assertExpectedBuildDir(p) {
-    def expected = buildDirForProject(p)
-    if (!expected.equals(p.buildDir.toPath())) {
-        throw new RuntimeException("Project buildDir was changed by the project build script! Expected $expected but found ${p.buildDir}")
-    }
-}
-
-def createArtifactDir(project) {
-    def distsDir = project.buildDir.toPath().resolve(project.distsDirName).resolve('lambda-build')
-    return makeDirs(distsDir)
-}
-
-def copyToArtifactDir(artifactDir, artifactJars, classPathJars) {
-    artifactJars.each {
-        it.withInputStream({ jis ->
-            def zipIs = new ZipInputStream(jis)
-            for (def e = zipIs.getNextEntry(); e != null; e = zipIs.getNextEntry()) {
-                def entryPath = artifactDir.resolve(e.name)
-                if (e.isDirectory()) {
-                    makeDirs(entryPath)
-                } else {
-                    copyToFile(zipIs, entryPath)
-                }
-                zipIs.closeEntry()
-            }
-            zipIs.close()
-        })
-    }
-
-    def libDir = artifactDir.resolve('lib')
-    makeDirs(libDir)
-    classPathJars.each {
-        def jarPath = libDir.resolve(it.name)
-        it.withInputStream({ jIs ->
-            copyToFile(jIs, jarPath)
-        })
-    }
-}
-
-def makeDirs(p) {
-    try {
-        Files.createDirectories(p)
-    } catch (FileAlreadyExistsException e) {
-        // ignored
-    }
-    return p
-}
-
-def copyToFile(zipIs, path) {
-    path.withOutputStream({ fos ->
-        byte[] buff = new byte[4096]
-        int bytesRead
-        while ((bytesRead = zipIs.read(buff)) != -1) {
-            fos.write(buff, 0, bytesRead)
-        }
-    })
-}
diff --git a/src/testFixtures/workspaceFolder/java11-image-gradle-sam-app/template.yaml b/src/testFixtures/workspaceFolder/java11-image-gradle-sam-app/template.yaml
deleted file mode 100644
index be3fa163169..00000000000
--- a/src/testFixtures/workspaceFolder/java11-image-gradle-sam-app/template.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: >
-    java11-image-gradle-sam-app
-
-    Sample SAM Template for java11-image-gradle-sam-app
-
-# More info about Globals: https://github.com/awslabs/serverless-application-model/blob/master/docs/globals.rst
-Globals:
-    Function:
-        Timeout: 20
-
-Resources:
-    HelloWorldFunction:
-        Type: AWS::Serverless::Function # More info about Function Resource: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-        Properties:
-            PackageType: Image
-            Events:
-                HelloWorld:
-                    Type: Api # More info about API Event Source: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
-                    Properties:
-                        Path: /hello
-                        Method: get
-        Metadata:
-            DockerTag: java11-gradle-v1
-            DockerContext: ./HelloWorldFunction
-            Dockerfile: Dockerfile
diff --git a/src/testFixtures/workspaceFolder/java11-plain-gradle-sam-app/HelloWorldFunction/build.gradle b/src/testFixtures/workspaceFolder/java11-plain-gradle-sam-app/HelloWorldFunction/build.gradle
deleted file mode 100644
index 2c6cb3650f5..00000000000
--- a/src/testFixtures/workspaceFolder/java11-plain-gradle-sam-app/HelloWorldFunction/build.gradle
+++ /dev/null
@@ -1,13 +0,0 @@
-plugins {
-    id 'java'
-}
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    implementation 'com.amazonaws:aws-lambda-java-core:1.2.1'
-    implementation 'com.amazonaws:aws-lambda-java-events:3.6.0'
-    testImplementation 'junit:junit:4.13.1'
-}
diff --git a/src/testFixtures/workspaceFolder/java11-plain-gradle-sam-app/HelloWorldFunction/gradle/wrapper/gradle-wrapper.properties b/src/testFixtures/workspaceFolder/java11-plain-gradle-sam-app/HelloWorldFunction/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 558870dad58..00000000000
--- a/src/testFixtures/workspaceFolder/java11-plain-gradle-sam-app/HelloWorldFunction/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/src/testFixtures/workspaceFolder/java11-plain-gradle-sam-app/HelloWorldFunction/gradlew b/src/testFixtures/workspaceFolder/java11-plain-gradle-sam-app/HelloWorldFunction/gradlew
deleted file mode 100644
index af6708ff229..00000000000
--- a/src/testFixtures/workspaceFolder/java11-plain-gradle-sam-app/HelloWorldFunction/gradlew
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"
diff --git a/src/testFixtures/workspaceFolder/java11-plain-gradle-sam-app/HelloWorldFunction/gradlew.bat b/src/testFixtures/workspaceFolder/java11-plain-gradle-sam-app/HelloWorldFunction/gradlew.bat
deleted file mode 100644
index 6d57edc706c..00000000000
--- a/src/testFixtures/workspaceFolder/java11-plain-gradle-sam-app/HelloWorldFunction/gradlew.bat
+++ /dev/null
@@ -1,84 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/src/testFixtures/workspaceFolder/java11-plain-gradle-sam-app/HelloWorldFunction/src/test/java/helloworld/AppTest.java b/src/testFixtures/workspaceFolder/java11-plain-gradle-sam-app/HelloWorldFunction/src/test/java/helloworld/AppTest.java
deleted file mode 100644
index b9d1e423ab7..00000000000
--- a/src/testFixtures/workspaceFolder/java11-plain-gradle-sam-app/HelloWorldFunction/src/test/java/helloworld/AppTest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package helloworld;
-
-import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
-
-public class AppTest {
-  @Test
-  public void successfulResponse() {
-    App app = new App();
-    APIGatewayProxyResponseEvent result = app.handleRequest(null, null);
-    assertEquals(result.getStatusCode().intValue(), 200);
-    assertEquals(result.getHeaders().get("Content-Type"), "application/json");
-    String content = result.getBody();
-    assertNotNull(content);
-    assertTrue(content.contains("\"message\""));
-    assertTrue(content.contains("\"hello world\""));
-    assertTrue(content.contains("\"location\""));
-  }
-}
diff --git a/src/testFixtures/workspaceFolder/java11-plain-gradle-sam-app/template.yaml b/src/testFixtures/workspaceFolder/java11-plain-gradle-sam-app/template.yaml
deleted file mode 100644
index 33254a1d019..00000000000
--- a/src/testFixtures/workspaceFolder/java11-plain-gradle-sam-app/template.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: >
-    java11-plain-gradle-sam-app
-
-    Sample SAM Template for java11-plain-gradle-sam-app
-
-# More info about Globals: https://github.com/awslabs/serverless-application-model/blob/master/docs/globals.rst
-Globals:
-    Function:
-        Timeout: 20
-
-Resources:
-    HelloWorldFunction:
-        Type: AWS::Serverless::Function # More info about Function Resource: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
-        Properties:
-            CodeUri: HelloWorldFunction
-            Handler: helloworld.App::handleRequest
-            Runtime: java11
-            MemorySize: 512
-            Events:
-                HelloWorld:
-                    Type: Api # More info about API Event Source: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
-                    Properties:
-                        Path: /hello
-                        Method: get
diff --git a/src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/HelloWorldFunction/src/test/java/helloworld/AppTest.java b/src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/HelloWorldFunction/src/test/java/helloworld/AppTest.java
deleted file mode 100644
index b9d1e423ab7..00000000000
--- a/src/testFixtures/workspaceFolder/java11-plain-maven-sam-app/HelloWorldFunction/src/test/java/helloworld/AppTest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package helloworld;
-
-import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
-
-public class AppTest {
-  @Test
-  public void successfulResponse() {
-    App app = new App();
-    APIGatewayProxyResponseEvent result = app.handleRequest(null, null);
-    assertEquals(result.getStatusCode().intValue(), 200);
-    assertEquals(result.getHeaders().get("Content-Type"), "application/json");
-    String content = result.getBody();
-    assertNotNull(content);
-    assertTrue(content.contains("\"message\""));
-    assertTrue(content.contains("\"hello world\""));
-    assertTrue(content.contains("\"location\""));
-  }
-}
diff --git a/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/Dockerfile b/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/Dockerfile
deleted file mode 100644
index ab7d741e684..00000000000
--- a/src/testFixtures/workspaceFolder/js-image-sam-app/hello-world/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM public.ecr.aws/lambda/nodejs:12
-
-COPY app.js package.json ./
-
-RUN npm install
-
-# Command can be overwritten by providing a different command in the template directly.
-CMD ["app.lambdaHandler"]
diff --git a/src/testFixtures/workspaceFolder/js-image-sam-app/template.yaml b/src/testFixtures/workspaceFolder/js-image-sam-app/template.yaml
deleted file mode 100644
index 42e943c3cd6..00000000000
--- a/src/testFixtures/workspaceFolder/js-image-sam-app/template.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-AWSTemplateFormatVersion: '2010-09-09'
-Transform: AWS::Serverless-2016-10-31
-Description: >
-    js-image-sam-app
-
-    Sample SAM Template for js-image-sam-app
-
-# More info about Globals: https://github.com/awslabs/serverless-application-model/blob/master/docs/globals.rst
-Globals:
-    Function:
-        Timeout: 3
-
-Resources:
-    HelloWorldFunction:
-        Type: AWS::Serverless::Function
-        Properties:
-            PackageType: Image
-            # ImageConfig:
-            # Uncomment this to override command here from the Dockerfile
-            # Command: ["app.lambdaHandler"]
-            Events:
-                HelloWorld:
-                    Type: Api
-                    Properties:
-                        Path: /hello
-                        Method: get
-        Metadata:
-            DockerTag: nodejs14.x-v1
-            DockerContext: ./hello-world
-            Dockerfile: Dockerfile
-
diff --git a/src/testFixtures/workspaceFolder/js-manifest-in-root/template.yaml b/src/testFixtures/workspaceFolder/js-manifest-in-root/template.yaml
deleted file mode 100644
index 6a0214ac2f6..00000000000
--- a/src/testFixtures/workspaceFolder/js-manifest-in-root/template.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-Resources:
-    SourceCodeTwoFoldersDeep:
-        Type: AWS::Serverless::Function
-        Properties:
-            CodeUri: .
-            Handler: src/subfolder/app.handlerTwoFoldersDeep
-            Runtime: nodejs14.x
diff --git a/src/testFixtures/workspaceFolder/js-manifest-in-subfolder/template.yaml b/src/testFixtures/workspaceFolder/js-manifest-in-subfolder/template.yaml
deleted file mode 100644
index 5cd48472c3a..00000000000
--- a/src/testFixtures/workspaceFolder/js-manifest-in-subfolder/template.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-Resources:
-    SourceCodeInSubfolderToManifest:
-        Type: AWS::Serverless::Function
-        Properties:
-            CodeUri: src/
-            Handler: subfolder/app.handlerInManifestSubfolder
-            Runtime: nodejs14.x
diff --git a/src/testFixtures/workspaceFolder/js-plain-sam-app/template.yaml b/src/testFixtures/workspaceFolder/js-plain-sam-app/template.yaml
deleted file mode 100644
index b6f7348431f..00000000000
--- a/src/testFixtures/workspaceFolder/js-plain-sam-app/template.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-Resources:
-    SourceCodeBesidePackageJson:
-        Type: AWS::Serverless::Function
-        Properties:
-            CodeUri: src
-            Handler: app.handlerBesidePackageJson
-            Runtime: nodejs14.x
diff --git a/src/testFixtures/workspaceFolder/ts-plain-sam-app/template.yaml b/src/testFixtures/workspaceFolder/ts-plain-sam-app/template.yaml
deleted file mode 100644
index aac6148bd70..00000000000
--- a/src/testFixtures/workspaceFolder/ts-plain-sam-app/template.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-Resources:
-    TypeScriptApplication:
-        Type: AWS::Serverless::Function
-        Properties:
-            CodeUri: src
-            Handler: dist/app.handler
-            Runtime: nodejs12.x
diff --git a/src/webviews/client.ts b/src/webviews/client.ts
deleted file mode 100644
index fe8829186a4..00000000000
--- a/src/webviews/client.ts
+++ /dev/null
@@ -1,208 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { EventEmitter } from 'vscode'
-import { WebviewApi } from 'vscode-webview'
-import { ClassToProtocol, VueWebview } from './main'
-import { Protocol } from './server'
-
-declare const vscode: WebviewApi<any>
-
-interface MessageBase<U extends string = string> {
-    id: string
-    command: U
-}
-
-export interface Message<T = any, U extends string = string> extends MessageBase<U> {
-    data: T | Error
-    event?: false
-    error?: boolean
-}
-
-interface EventMessage<T = any, U extends string = string> extends MessageBase<U> {
-    event: true
-    data: T
-    command: U
-}
-
-/**
- * Message used for delivering errors. The `data` field is a stringified `Error`.
- * Currently only `Error` instances are rebuilt, though it is possible to extend this.
- */
-interface ErrorMessage<U extends string = string> extends MessageBase<U> {
-    error: true
-    data: string
-    command: U
-}
-
-type ClientCommands<T> = {
-    readonly [P in keyof T]: T[P] extends EventEmitter<infer P>
-        ? (listener: (e: P) => void) => Promise<{ dispose: () => void }>
-        : OmitThisParameter<T[P]> extends (...args: infer P) => infer R
-        ? (...args: P) => R extends Promise<any> ? R : Promise<R>
-        : never
-}
-
-export type WebviewClient<T> = ClientCommands<T>
-/**
- * Used to create a new 'WebviewClient' to communicate with the backend.
- */
-export class WebviewClientFactory {
-    /** Used to generate unique ids per request/message. */
-    private static counter = 0
-    /** Set to true the first time a client is created. */
-    private static initialized = false
-    /** All listeners (except the 'global' commands) registered to `message`. */
-    private static messageListeners: Set<() => any> = new Set()
-
-    /**
-     * Sets up 'global' commands used internally for special functionality that is otherwise
-     * not exposed to the frontend or backend code.
-     */
-    private static registerGlobalCommands() {
-        const remountEvent = new Event('remount')
-
-        window.addEventListener('message', (event: { data: Message }) => {
-            const { command } = event.data
-            if (command === '$clear') {
-                vscode.setState({})
-                this.messageListeners.forEach(listener => this.removeListener(listener))
-                window.dispatchEvent(remountEvent)
-            }
-        })
-    }
-
-    /**
-     * Adds a new listener to the `message` event.
-     */
-    private static addListener(listener: (...args: any) => void): void {
-        this.messageListeners.add(listener)
-        window.addEventListener('message', listener)
-    }
-
-    /**
-     * Removes the listener from the backing store and unregisters it from the window.
-     */
-    private static removeListener(listener: (...args: any) => void): void {
-        this.messageListeners.delete(listener)
-        window.removeEventListener('message', listener)
-    }
-
-    /**
-     * Sends a request to the backend server. This effectively wraps a 'message' event into a Promise.
-     * Registered listeners are automatically disposed of after receiving the desired message. Arguments
-     * are 'de-proxied' and parsed into plain objects.
-     *
-     * If no response has been received after 5 minutes, the Promise is rejected and listener removed.
-     *
-     * @param id Message ID. Should be unique to each individual request.
-     * @param command Identifier associated with the backend command.
-     * @param args Arguments to pass to the backend command.
-     *
-     * @returns The backend's response as a Promise.
-     */
-    private static sendRequest<T extends any[], R, U extends string>(
-        id: string,
-        command: U,
-        args: T
-    ): Promise<R | { dispose: () => void }> {
-        const deproxied = JSON.parse(JSON.stringify(args))
-        const response = new Promise<R | { dispose: () => void }>((resolve, reject) => {
-            const listener = (event: { data: Message<R, U> | ErrorMessage<U> }) => {
-                const message = event.data
-
-                if (id !== message.id) {
-                    return
-                }
-
-                this.removeListener(listener)
-                window.clearTimeout(timeout)
-
-                if (message.error === true) {
-                    const revived = JSON.parse(message.data as string)
-                    reject(new Error(revived.message))
-                } else if (message.event) {
-                    if (typeof args[0] !== 'function') {
-                        reject(new Error(`Expected frontend event handler to be a function: ${command}`))
-                    }
-                    resolve(this.registerEventHandler(command, args[0]))
-                } else {
-                    resolve(message.data as R) // TODO: interfaces need a bit of refinement in terms of types
-                }
-            }
-
-            const timeout = setTimeout(() => {
-                this.removeListener(listener)
-                reject(new Error(`Timed out while waiting for response: id: ${id}, command: ${command}`))
-            }, 300000)
-
-            this.addListener(listener)
-        })
-
-        vscode.postMessage({ id, command, data: deproxied } as Message<T, U>)
-        return response
-    }
-
-    private static registerEventHandler<T extends (e: R) => void, R, U extends string>(
-        command: U,
-        args: T
-    ): { dispose: () => void } {
-        const listener = (event: { data: Message<R, U> | EventMessage<R, U> }) => {
-            const message = event.data
-
-            if (message.command !== command) {
-                return
-            }
-
-            if (!message.event) {
-                throw new Error(`Expected backend handler to be an event emitter: ${command}`)
-            }
-
-            args(message.data)
-        }
-        this.addListener(listener)
-
-        return { dispose: () => this.removeListener(listener) }
-    }
-
-    /**
-     * Creates a new client. These clients are defined by their types; they do not have any knowledge
-     * of the backend protocol other than the specified type.
-     */
-    public static create<T extends VueWebview>(): WebviewClient<ClassToProtocol<T>>
-    public static create<T extends ClientCommands<T>>(): WebviewClient<T>
-    public static create<T extends Protocol>(): WebviewClient<T> {
-        if (!this.initialized) {
-            this.initialized = true
-            this.registerGlobalCommands()
-        }
-
-        return new Proxy(
-            {},
-            {
-                set: () => {
-                    throw new TypeError('Cannot set property to webview client')
-                },
-                get: (_, prop) => {
-                    if (typeof prop !== 'string') {
-                        console.warn(`Tried to index webview client with non-string property: ${String(prop)}`)
-                        return
-                    }
-
-                    if (prop === 'init') {
-                        const state = vscode.getState() ?? {}
-                        if (state['__once']) {
-                            return () => Promise.resolve()
-                        }
-                        vscode.setState(Object.assign(state, { __once: true }))
-                    }
-
-                    const id = (this.counter++).toString()
-                    return (...args: any) => this.sendRequest(id, prop, args)
-                },
-            }
-        ) as WebviewClient<T>
-    }
-}
diff --git a/src/webviews/main.ts b/src/webviews/main.ts
deleted file mode 100644
index 1f7c8d00d5c..00000000000
--- a/src/webviews/main.ts
+++ /dev/null
@@ -1,443 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { isCloud9 } from '../shared/extensionUtilities'
-import { Protocol, registerWebviewServer } from './server'
-import { getIdeProperties } from '../shared/extensionUtilities'
-import { getFunctions } from '../shared/utilities/classUtils'
-
-interface WebviewParams {
-    /**
-     * The entry-point into the webview.
-     */
-    webviewJs: string
-
-    /**
-     * Stylesheets to use in addition to "base.css".
-     */
-    cssFiles?: string[]
-
-    /**
-     * Additional JS files to loaded in.
-     */
-    libFiles?: string[]
-}
-
-interface WebviewPanelParams extends WebviewParams {
-    /**
-     * ID of the webview which should be globally unique per view.
-     */
-    id: string
-
-    /**
-     * Title of the webview panel. This is shown in the editor tab.
-     */
-    title: string
-
-    /**
-     * Preserves the webview when not focused by the user.
-     *
-     * This has a performance penalty and should be avoided.
-     */
-    retainContextWhenHidden?: boolean
-
-    /**
-     * View column to initally show the view in. Defaults to split view.
-     */
-    viewColumn?: vscode.ViewColumn
-}
-
-interface WebviewViewParams extends WebviewParams {
-    /**
-     * ID of the webview which must be the same as the one used in `package.json`.
-     */
-    id: string
-
-    /**
-     * Title of the view. Defaults to the title set in `package.json` is not provided.
-     */
-    title?: string
-
-    /**
-     * Optional 'description' text applied to the title.
-     */
-    description?: string
-}
-
-export interface VueWebviewPanel<T extends VueWebview = VueWebview> {
-    /**
-     * Shows the webview with the given parameters.
-     *
-     * @returns A Promise that is resolved once the view is closed.
-     */
-    show(params: Omit<WebviewPanelParams, 'id' | 'webviewJs'>): Promise<vscode.WebviewPanel>
-
-    /**
-     * Forces a reload of the Vue runtime, resetting saved state without reloading the whole webview.
-     */
-    clear(): Promise<boolean>
-
-    /**
-     * The backend {@link VueWebview proxy} connected to this instance
-     */
-    readonly server: T
-}
-
-export interface VueWebviewView<T extends VueWebview = VueWebview> {
-    /**
-     * Registers the webview with VS Code.
-     *
-     * The view will not be rendered untl this is called.
-     */
-    register(params?: Partial<Omit<WebviewViewParams, 'id' | 'webviewJs'>>): vscode.Disposable
-
-    /**
-     * Event fired whenever the associated view is resolved.
-     *
-     * This can happen when the view first becomes visisble or when it is hidden and revealed again.
-     */
-    readonly onDidResolveView: vscode.Event<vscode.WebviewView>
-
-    /**
-     * The backend {@link VueWebview proxy} connected to this instance
-     */
-    readonly server: T
-}
-
-/**
- * Base class used to define client/server bindings for webviews.
- *
- * Sub-classes can be used to create new classes with fully-resolved bindings:
- * ```ts
- * class MyVueWebview extends VueWebview {
- *     public readonly id = 'foo'
- *     public readonly source = 'foo.js'
- *
- *     public constructor(private readonly myData: string) {
- *         super()
- *     }
- *
- *     public getMyData() {
- *         return this.myData
- *     }
- * }
- *
- * const Panel = VueWebview.compilePanel(MyVueWebview)
- * const view = new Panel(context, 'data')
- * view.show({ title: 'Foo' })
- * ```
- *
- * The unbound class type should then be used on the frontend:
- * ```ts
- * const client = WebviewClientFactory.create<MyVueWebview>()
- *
- * defineComponent({
- *   async created() {
- *       const data = await client.getMyData()
- *       console.log(data)
- *   },
- * })
- * ```
- *
- */
-export abstract class VueWebview {
-    /**
-     * A unique identifier to associate with the webview.
-     *
-     * This must be the same as the `id` in `package.json` when using a WebviewView.
-     */
-    public abstract readonly id: string
-
-    /**
-     * The relative location, from the repository root, to the frontend entrypoint.
-     */
-    public abstract readonly source: string
-
-    private readonly protocol: Protocol
-    private readonly onDidDisposeEmitter = new vscode.EventEmitter<void>()
-    private readonly onDidDispose = this.onDidDisposeEmitter.event
-
-    private disposed = false
-    private context?: vscode.ExtensionContext
-
-    public constructor() {
-        const commands: Record<string, (...args: any[]) => unknown> = {}
-        const ctor = this.constructor as new (...args: any[]) => any
-
-        for (const [k, v] of Object.entries(getFunctions(ctor))) {
-            commands[k] = v.bind(this)
-        }
-
-        this.protocol = commands
-    }
-
-    public get isDisposed() {
-        return this.disposed
-    }
-
-    public getCompanyName(): string {
-        return getIdeProperties().company
-    }
-
-    protected dispose(): void {
-        this.disposed = true
-        this.onDidDisposeEmitter.fire()
-    }
-
-    protected getContext(): vscode.ExtensionContext {
-        if (!this.context) {
-            throw new Error('Webview was not initialized with "ExtContext"')
-        }
-
-        return this.context
-    }
-
-    public static compilePanel<T extends new (...args: any[]) => VueWebview>(
-        target: T
-    ): new (context: vscode.ExtensionContext, ...args: ConstructorParameters<T>) => VueWebviewPanel<InstanceType<T>> {
-        return class Panel {
-            private readonly instance: InstanceType<T>
-            private panel?: vscode.WebviewPanel
-
-            public constructor(protected readonly context: vscode.ExtensionContext, ...args: ConstructorParameters<T>) {
-                this.instance = new target(...args) as InstanceType<T>
-
-                for (const [prop, val] of Object.entries(this.instance)) {
-                    if (val instanceof vscode.EventEmitter) {
-                        Object.assign(this.instance.protocol, { [prop]: val })
-                    }
-                }
-            }
-
-            public get server() {
-                return this.instance
-            }
-
-            public async show(params: Omit<WebviewPanelParams, 'id' | 'webviewJs'>): Promise<vscode.WebviewPanel> {
-                if (this.panel) {
-                    this.panel.reveal(params.viewColumn, false)
-                    return this.panel
-                }
-
-                const panel = createWebviewPanel(this.context, {
-                    id: this.instance.id,
-                    webviewJs: this.instance.source,
-                    ...params,
-                })
-                const server = registerWebviewServer(panel.webview, this.instance.protocol)
-                this.instance.onDidDispose(() => {
-                    server.dispose()
-                    this.panel?.dispose()
-                    this.panel = undefined
-                })
-
-                return (this.panel = panel)
-            }
-
-            public async clear(): Promise<boolean> {
-                return this.panel?.webview.postMessage({ command: '$clear' }) ?? false
-            }
-        }
-    }
-
-    public static compileView<T extends new (...args: any[]) => VueWebview>(
-        target: T
-    ): new (context: vscode.ExtensionContext, ...args: ConstructorParameters<T>) => VueWebviewView<InstanceType<T>> {
-        return class View {
-            private readonly onDidResolveViewEmitter = new vscode.EventEmitter<vscode.WebviewView>()
-            private readonly instance: InstanceType<T>
-            private resolvedView?: vscode.WebviewView
-
-            public readonly onDidResolveView = this.onDidResolveViewEmitter.event
-
-            public constructor(protected readonly context: vscode.ExtensionContext, ...args: ConstructorParameters<T>) {
-                this.instance = new target(...args) as InstanceType<T>
-
-                for (const [prop, val] of Object.entries(this.instance)) {
-                    if (val instanceof vscode.EventEmitter) {
-                        Object.assign(this.instance.protocol, { [prop]: val })
-                    }
-                }
-
-                this.instance.context = this.context
-            }
-
-            public get server() {
-                return this.instance
-            }
-
-            public register(params: Omit<WebviewViewParams, 'id' | 'webviewJs'>): vscode.Disposable {
-                return vscode.window.registerWebviewViewProvider(this.instance.id, {
-                    resolveWebviewView: async view => {
-                        view.title = params.title ?? view.title
-                        view.description = params.description ?? view.description
-                        updateWebview(this.context, view.webview, {
-                            ...params,
-                            webviewJs: this.instance.source,
-                        })
-
-                        if (!this.resolvedView) {
-                            this.resolvedView = view
-
-                            const server = registerWebviewServer(this.resolvedView.webview, this.instance.protocol)
-                            this.resolvedView.onDidDispose(() => {
-                                server.dispose()
-                                this.resolvedView = undefined
-                            })
-                        }
-
-                        this.onDidResolveViewEmitter.fire(view)
-                    },
-                })
-            }
-        }
-    }
-}
-
-type FilteredKeys<T> = { [P in keyof T]: unknown extends T[P] ? never : P }[keyof T]
-type FilterUnknown<T> = Pick<T, FilteredKeys<T>>
-type Commands<T extends VueWebview> = {
-    [P in keyof T]: T[P] extends (...args: any[]) => any ? T[P] : unknown
-}
-type Events<T extends VueWebview> = {
-    [P in keyof T]: T[P] extends vscode.EventEmitter<any> ? T[P] : unknown
-}
-export type ClassToProtocol<T extends VueWebview> = FilterUnknown<Commands<T> & Events<T>>
-
-/**
- * This is the {@link vscode.WebviewView} version of {@link compileVueWebview}.
- *
- * The biggest difference is that only a single view per-id can exist at a time, while multiple panels can exist per-id.
- * Views also cannot register handlers for `submit`; any `submit` commands made by the fronend are ignored.
- *
- * @param params Required parameters are defined by {@link WebviewViewParams}, optional parameters are defined by {@link WebviewCompileOptions}
- *
- * @returns An anonymous class that can instantiate instances of {@link VueWebviewView}.
- */
-
-/**
- * Creates a brand new webview panel, setting some basic initial parameters and updating the webview.
- */
-function createWebviewPanel(ctx: vscode.ExtensionContext, params: WebviewPanelParams): vscode.WebviewPanel {
-    // C9 doesn't support 'Beside'. The next best thing is always using the second column.
-    const viewColumn =
-        isCloud9() && params.viewColumn === vscode.ViewColumn.Beside
-            ? vscode.ViewColumn.Two
-            : params.viewColumn ?? vscode.ViewColumn.Active
-
-    const panel = vscode.window.createWebviewPanel(
-        params.id,
-        params.title,
-        { viewColumn },
-        {
-            // The redundancy here is to correct a bug with Cloud9's Webview implementation
-            // We need to assign certain things on instantiation, otherwise they'll never be applied to the view
-            enableScripts: true,
-            enableCommandUris: true,
-            retainContextWhenHidden: isCloud9() || params.retainContextWhenHidden,
-        }
-    )
-    updateWebview(ctx, panel.webview, params)
-
-    return panel
-}
-
-function resolveRelative(webview: vscode.Webview, rootUri: vscode.Uri, files: string[]): vscode.Uri[] {
-    return files.map(f => webview.asWebviewUri(vscode.Uri.joinPath(rootUri, f)))
-}
-
-/**
- * Mutates a webview, applying various options and a static HTML page to bootstrap the Vue code.
- */
-function updateWebview(ctx: vscode.ExtensionContext, webview: vscode.Webview, params: WebviewParams): vscode.Webview {
-    const dist = vscode.Uri.joinPath(ctx.extensionUri, 'dist')
-    const resources = vscode.Uri.joinPath(ctx.extensionUri, 'resources')
-
-    webview.options = {
-        enableScripts: true,
-        enableCommandUris: true,
-        localResourceRoots: [dist, resources],
-    }
-
-    const libs = resolveRelative(webview, vscode.Uri.joinPath(dist, 'libs'), [
-        'vscode.js',
-        'vue.min.js',
-        ...(params.libFiles ?? []),
-    ])
-
-    const css = resolveRelative(webview, vscode.Uri.joinPath(resources, 'css'), [
-        isCloud9() ? 'base-cloud9.css' : 'base.css',
-        ...(params.cssFiles ?? []),
-    ])
-
-    const mainScript = webview.asWebviewUri(vscode.Uri.joinPath(dist, params.webviewJs))
-
-    webview.html = resolveWebviewHtml({
-        scripts: libs.map(p => `<script src="${p}"></script>`).join('\n'),
-        stylesheets: css.map(p => `<link rel="stylesheet" href="${p}">\n`).join('\n'),
-        main: mainScript,
-        webviewJs: params.webviewJs,
-        cspSource: updateCspSource(webview.cspSource),
-    })
-
-    return webview
-}
-
-/**
- * Resolves the webview HTML based off whether we're running from a development server or bundled extension.
- */
-function resolveWebviewHtml(params: {
-    scripts: string
-    stylesheets: string
-    cspSource: string
-    webviewJs: string
-    main: vscode.Uri
-}): string {
-    const resolvedParams = { ...params, connectSource: `'none'` }
-    const localServer = process.env.WEBPACK_DEVELOPER_SERVER
-
-    if (localServer) {
-        const local = vscode.Uri.parse(localServer)
-        resolvedParams.cspSource = `${params.cspSource} ${local.toString()}`
-        resolvedParams.main = local.with({ path: `/${params.webviewJs}` })
-        resolvedParams.connectSource = `'self' ws:`
-    }
-
-    return `<html>
-    <head>
-        <meta charset="UTF-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-        <meta
-            http-equiv="Content-Security-Policy"
-            content=
-                "default-src 'none';
-                connect-src ${resolvedParams.connectSource};
-                img-src ${resolvedParams.cspSource} https: data:;
-                script-src ${resolvedParams.cspSource};
-                style-src ${resolvedParams.cspSource} 'unsafe-inline';
-                font-src ${resolvedParams.cspSource} 'self' data:;"
-        >
-    </head>
-    <body>
-        <div id="vue-app"></div>
-        <!-- Dependencies -->
-        ${resolvedParams.scripts}
-        ${resolvedParams.stylesheets}
-        <!-- Main -->
-        <script src="${resolvedParams.main}"></script>
-    </body>
-</html>`
-}
-
-/**
- * Updates the CSP source for webviews with an allowed source for AWS endpoints when running in
- * Cloud9 environments. Possible this can be further scoped to specific C9 CDNs or removed entirely
- * if C9 injects this.
- */
-export function updateCspSource(baseSource: string) {
-    return isCloud9() ? `https://*.amazonaws.com ${baseSource}` : baseSource
-}
diff --git a/src/webviews/server.ts b/src/webviews/server.ts
deleted file mode 100644
index 5988e88055f..00000000000
--- a/src/webviews/server.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as vscode from 'vscode'
-import { getLogger } from '../shared/logger'
-import { Message } from './client'
-
-interface Command<T extends any[] = any, R = any> {
-    (...args: T): R | never
-}
-
-export interface Protocol {
-    [key: string]: Command | vscode.EventEmitter<any> | undefined
-}
-
-/**
- * Sets up an event listener for the webview to call registered commands.
- *
- * @param webview Target webview to add the event hook.
- * @param commands Commands to register.
- */
-export function registerWebviewServer(webview: vscode.Webview, commands: Protocol): vscode.Disposable {
-    const eventListeners: vscode.Disposable[] = []
-    const disposeListeners = () => {
-        while (eventListeners.length) {
-            eventListeners.pop()?.dispose()
-        }
-    }
-
-    const messageListener = webview.onDidReceiveMessage(async (event: Message) => {
-        const { id, command, data } = event
-        const metadata: Omit<Message, 'id' | 'command' | 'data'> = {}
-
-        const handler = commands[command]
-
-        if (!handler) {
-            return getLogger().warn(`Received invalid message from client: ${command}`)
-        }
-
-        if (id === '0') {
-            disposeListeners() // Webview reloaded, dispose all listeners
-        }
-
-        if (handler instanceof vscode.EventEmitter) {
-            // TODO: make server dipose of event if client calls `dispose`
-            eventListeners.push(handler.event(e => webview.postMessage({ command, event: true, data: e })))
-            getLogger().verbose(`Registered event handler for: ${command}`)
-            return webview.postMessage({ id, command, event: true })
-        }
-
-        // TODO: these commands could potentially have sensitive data, we don't want to log in that case
-        getLogger().debug(`Webview called command "${command}" with args: %O`, data)
-
-        let result: any
-        try {
-            result = await handler.call(webview, ...data)
-        } catch (err) {
-            if (!(err instanceof Error)) {
-                getLogger().debug(`Webview server threw on comamnd "${command}" but it was not an error: `, err)
-                return
-            }
-            result = JSON.stringify(err, Object.getOwnPropertyNames(err))
-            delete result.stack // Not relevant to frontend code, we only care about the message
-            metadata.error = true
-            getLogger().debug(`Webview server failed on command "${command}": %s`, err.message)
-        }
-
-        // TODO: check if webview has been disposed of before posting message (not necessary but nice)
-        // We also get a boolean value back, maybe retry sending on false?
-        webview.postMessage({ id, command, data: result, ...metadata })
-    })
-
-    return { dispose: () => (messageListener.dispose(), disposeListeners()) }
-}
diff --git a/src/webviews/util.ts b/src/webviews/util.ts
deleted file mode 100644
index f73911488b1..00000000000
--- a/src/webviews/util.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { PropType } from 'vue'
-
-/**
- * Creates an anonymous class whose constructor automatically applies default values.
- *
- * Mostly just used for Vue as the types expect a class. Otherwise one would need to
- * manually describe constructor parameters and assignments for every field.
- *
- * Example (type inferred):
- * ```ts
- * export const MyClass = createClass({
- *     foo: 0,
- *     bar: 'a' as 'a' | 'b',
- * })
- * ```
- *
- * @param defaults Defaults to use during construction.
- *
- * @returns Anonymous class. Use `typeof MyClass` to extract its type.
- */
-export function createClass<T>(defaults: T): { new (initial?: Partial<T>): T }
-export function createClass<T>(defaults: Partial<T>, required: true): { new (initial: T): T }
-export function createClass<T>(defaults: T): { new (initial?: Partial<T>): T } | { new (initial: T): T } {
-    return class {
-        constructor(initial: T | Partial<T> = {}) {
-            Object.assign(this, defaults, initial)
-        }
-    } as any
-}
-
-/**
- * Creates a Vue 'type' from a class. Note that nothing is actually created; a type is only inferred from the `Model`.
- *
- * @param Model Model class, usually created from {@link createClass}.
- *
- * @returns The {@link Object} class with the typed coerced as a {@link PropType} for the `Model` instance.
- */
-export function createType<T extends new (obj: any) => any>(Model: T): PropType<InstanceType<T>> {
-    return Object
-}
diff --git a/tsconfig.json b/tsconfig.json
index d7d8bea55b3..c1c1b0ee221 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,24 +1,21 @@
+// This tsconfig is for root TS scripts, e.g. those in scripts/
+// If you are looking for the base config for subprojects, see packages/tsconfig.packages.json
 {
     "compilerOptions": {
-        "baseUrl": ".",
-        "paths": {
-            "*": ["types/*"],
-            "@sinonjs/fake-timers": ["node_modules/@types/sinonjs__fake-timers"]
-        },
-        "incremental": true,
-        "module": "commonjs",
-        "target": "es6",
-        "outDir": "dist",
-        "sourceMap": true,
-        "moduleResolution": "node",
+        "module": "node16",
+        "target": "es2021",
+        "moduleResolution": "node16",
         "rootDir": ".",
         "resolveJsonModule": true,
         "strict": true,
         "noUnusedLocals": true,
         "noImplicitOverride": true,
-        "lib": ["dom", "es6", "esnext.asynciterable"],
-        "skipLibCheck": true,
-        "jsx": "preserve"
-    },
-    "exclude": ["node_modules", ".vscode-test", "src/testFixtures", "dist"]
+        "lib": ["dom", "es2021"],
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "preserve",
+        "esModuleInterop": true,
+        "incremental": true,
+        "noEmitOnError": false,
+        "skipLibCheck": true
+    }
 }
diff --git a/types/cloudformation-schema-js-yaml.d.ts b/types/cloudformation-schema-js-yaml.d.ts
deleted file mode 100644
index 51b732bdb3b..00000000000
--- a/types/cloudformation-schema-js-yaml.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-declare module 'cloudformation-schema-js-yaml'
diff --git a/types/vue-types.d.ts b/types/vue-types.d.ts
deleted file mode 100644
index 46368529e03..00000000000
--- a/types/vue-types.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*!
- * Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-// temporary ambient declaration
-// this does not really extract types from vue components
-// it just prevents TSC from complaining when trying to import them
-declare module '*.vue' {
-    import { defineComponent } from 'vue'
-    const Component: ReturnType<typeof defineComponent>
-    export default Component
-}
diff --git a/webpack.config.js b/webpack.config.js
deleted file mode 100644
index 0a9a105a272..00000000000
--- a/webpack.config.js
+++ /dev/null
@@ -1,156 +0,0 @@
-/*!
- * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-//@ts-check
-
-'use strict'
-
-const path = require('path')
-const glob = require('glob')
-const webpack = require('webpack')
-const { ESBuildMinifyPlugin } = require('esbuild-loader')
-const fs = require('fs')
-const { NLSBundlePlugin } = require('vscode-nls-dev/lib/webpack-bundler')
-const CircularDependencyPlugin = require('circular-dependency-plugin')
-const packageJsonFile = path.join(__dirname, 'package.json')
-const packageJson = JSON.parse(fs.readFileSync(packageJsonFile, 'utf8'))
-const packageId = `${packageJson.publisher}.${packageJson.name}`
-const { VueLoaderPlugin } = require('vue-loader')
-
-/**@type {import('webpack').Configuration}*/
-const baseConfig = {
-    name: 'main',
-    target: 'node',
-    entry: {
-        'src/main': './src/main.ts',
-        'src/stepFunctions/asl/aslServer': './src/stepFunctions/asl/aslServer.ts',
-    },
-    output: {
-        path: path.resolve(__dirname, 'dist'),
-        filename: '[name].js',
-        libraryTarget: 'commonjs2',
-        devtoolModuleFilenameTemplate: '../[resource-path]',
-    },
-    devtool: 'source-map',
-    externals: {
-        vscode: 'commonjs vscode',
-        vue: 'root Vue',
-    },
-    resolve: {
-        extensions: ['.ts', '.js'],
-    },
-    node: {
-        __dirname: false, //preserve the default node.js behavior for __dirname
-    },
-    module: {
-        rules: [
-            {
-                test: /\.ts$/,
-                exclude: /node_modules|testFixtures/,
-                use: [
-                    {
-                        loader: 'vscode-nls-dev/lib/webpack-loader',
-                        options: {
-                            base: path.join(__dirname, 'src'),
-                        },
-                    },
-                    {
-                        loader: 'esbuild-loader',
-                        options: {
-                            loader: 'ts',
-                            target: 'es2018',
-                        },
-                    },
-                ],
-            },
-            {
-                test: /node_modules[\\|/](amazon-states-language-service|vscode-json-languageservice)/,
-                use: { loader: 'umd-compat-loader' },
-            },
-        ],
-    },
-    plugins: [
-        new NLSBundlePlugin(packageId),
-        new webpack.DefinePlugin({
-            EXTENSION_VERSION: JSON.stringify(packageJson.version),
-        }),
-        new CircularDependencyPlugin({
-            exclude: /node_modules|testFixtures/,
-            failOnError: true,
-        }),
-    ],
-    optimization: {
-        minimize: true,
-        minimizer: [
-            new ESBuildMinifyPlugin({
-                target: 'es2018',
-            }),
-        ],
-    },
-}
-
-/**
- * Renames all Vue entry files to be `index`, located within the same directory.
- * Example: `src/lambda/vue/index.ts` -> `dist/src/lambda/vue/index.js`
- * @param {string} file
- */
-const createVueBundleName = file => {
-    return path.relative(__dirname, file).split('.').slice(0, -1).join(path.sep)
-}
-
-/**
- * Generates Vue entry points if the filename is matches `targetPattern` (default: index.ts)
- * and is under a `vue` directory.
- */
-const createVueEntries = (targetPattern = 'index.ts') => {
-    return glob
-        .sync(path.resolve(__dirname, 'src', '**', 'vue', '**', targetPattern))
-        .map(f => ({ name: createVueBundleName(f), path: f }))
-        .reduce((a, b) => ((a[b.name] = b.path), a), {})
-}
-
-const vueConfig = {
-    ...baseConfig,
-    name: 'vue',
-    target: 'web',
-    entry: createVueEntries(),
-    output: {
-        ...baseConfig.output,
-        libraryTarget: 'this',
-    },
-    module: {
-        rules: baseConfig.module.rules.concat(
-            {
-                test: /\.vue$/,
-                loader: 'vue-loader',
-            },
-            {
-                test: /\.css$/,
-                use: ['vue-style-loader', 'css-loader'],
-            }
-        ),
-    },
-    plugins: baseConfig.plugins.concat(new VueLoaderPlugin()),
-}
-
-const vueHotReload = {
-    ...vueConfig,
-    name: 'vue-hmr',
-    devServer: {
-        static: {
-            directory: path.resolve(__dirname, 'dist'),
-        },
-        // This is not ideal, but since we're only running the server locally it's not too bad
-        // The webview debugger tries to establish a websocket with a GUID as its origin, so not much of a workaround
-        allowedHosts: 'all',
-    },
-    // Normally we want to exclude Vue from the bundle, but for hot reloads we need it
-    externals: {
-        vscode: 'commonjs vscode',
-    },
-}
-
-module.exports =
-    process.env.npm_lifecycle_event === 'serve' ? [baseConfig, vueConfig, vueHotReload] : [baseConfig, vueConfig]